diff --git a/COPYING.LESSER b/COPYING.LESSER
new file mode 100644
index 0000000..65c5ca8
--- /dev/null
+++ b/COPYING.LESSER
@@ -0,0 +1,165 @@
+                   GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+  This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+  0. Additional Definitions.
+
+  As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+  "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+  An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+  A "Combined Work" is a work produced by combining or linking an
+Application with the Library.  The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+  The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+  The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+  1. Exception to Section 3 of the GNU GPL.
+
+  You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+  2. Conveying Modified Versions.
+
+  If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+   a) under this License, provided that you make a good faith effort to
+   ensure that, in the event an Application does not supply the
+   function or data, the facility still operates, and performs
+   whatever part of its purpose remains meaningful, or
+
+   b) under the GNU GPL, with none of the additional permissions of
+   this License applicable to that copy.
+
+  3. Object Code Incorporating Material from Library Header Files.
+
+  The object code form of an Application may incorporate material from
+a header file that is part of the Library.  You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+   a) Give prominent notice with each copy of the object code that the
+   Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the object code with a copy of the GNU GPL and this license
+   document.
+
+  4. Combined Works.
+
+  You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+   a) Give prominent notice with each copy of the Combined Work that
+   the Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+   document.
+
+   c) For a Combined Work that displays copyright notices during
+   execution, include the copyright notice for the Library among
+   these notices, as well as a reference directing the user to the
+   copies of the GNU GPL and this license document.
+
+   d) Do one of the following:
+
+       0) Convey the Minimal Corresponding Source under the terms of this
+       License, and the Corresponding Application Code in a form
+       suitable for, and under terms that permit, the user to
+       recombine or relink the Application with a modified version of
+       the Linked Version to produce a modified Combined Work, in the
+       manner specified by section 6 of the GNU GPL for conveying
+       Corresponding Source.
+
+       1) Use a suitable shared library mechanism for linking with the
+       Library.  A suitable mechanism is one that (a) uses at run time
+       a copy of the Library already present on the user's computer
+       system, and (b) will operate properly with a modified version
+       of the Library that is interface-compatible with the Linked
+       Version.
+
+   e) Provide Installation Information, but only if you would otherwise
+   be required to provide such information under section 6 of the
+   GNU GPL, and only to the extent that such information is
+   necessary to install and execute a modified version of the
+   Combined Work produced by recombining or relinking the
+   Application with a modified version of the Linked Version. (If
+   you use option 4d0, the Installation Information must accompany
+   the Minimal Corresponding Source and Corresponding Application
+   Code. If you use option 4d1, you must provide the Installation
+   Information in the manner specified by section 6 of the GNU GPL
+   for conveying Corresponding Source.)
+
+  5. Combined Libraries.
+
+  You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+   a) Accompany the combined library with a copy of the same work based
+   on the Library, uncombined with any other library facilities,
+   conveyed under the terms of this License.
+
+   b) Give prominent notice with the combined library that part of it
+   is a work based on the Library, and explaining where to find the
+   accompanying uncombined form of the same work.
+
+  6. Revised Versions of the GNU Lesser General Public License.
+
+  The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+  Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+  If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.
diff --git a/README.md b/README.md
index 151f1a1..876df9a 100644
--- a/README.md
+++ b/README.md
@@ -3,106 +3,9 @@ IfcOpenShell
 open source (LGPL) software library for working with the IFC file format
 
 
-http://IfcOpenShell.org
+http://ifcopenshell.org
+http://academy.ifcopenshell.org
 
-About this repository
-=====================
-
-This is an initiative to expose the functionality of IfcOpenShell for parsing and writing IFC files to a Python interface. The creation of a topological representation for building elements using Open Cascade is also wrapped by returning a string serialization of the Open Cascade TopoDS_Shape. Using SWIG, a wrapper is obtained for a C++ Class which evaluates its Express attribute names at runtime. The functions created by the SWIG wrapper closely resemble the C++ structure. An additional Python wrapper around these functions is created that is more idiomatic to Python.
-
-The following interactive session illustrates its use:
-
-    >>> import ifc
-    >>> f = ifc.open("Duplex_A_20110907_optimized.ifc")
-    >>> f.by_type("ifcwall")[:2]
-    [#91=IfcWallStandardCase('2O2Fr$t4X7Zf8NOew3FL9r',#1,'Basic Wall:Interior - Partition (92mm Stud):144586',$,'Basic Wall:Interior - Partition (92mm Stud):128360',#5198,#18806,'144586'), #92=IfcWallStandardCase('2O2Fr$t4X7Zf8NOew3FLIE',#1,'Basic Wall:Interior - Partition (92mm Stud):143921',$,'Basic Wall:Interior - Partition (92mm Stud):128360',#5206,#18805,'143921')]
-    >>> wall = _[0]
-    >>> brep_data = ifc.create_shape(wall, ifc.SEW_SHELLS)
-    >>> len(wall) # number of EXPRESS attributes
-    8
-    >>> wall.GlobalId
-    '2O2Fr$t4X7Zf8NOew3FL9r'
-    >>> wall.Name = "My wall"
-    >>> wall.NonExistingAttr
-    Traceback (most recent call last):
-      File "<stdin>", line 1, in <module>
-      File ".\ifc.py", line 14, in __getattr__
-        except: raise AttributeError("entity instance of type '%s' has no attribute'%s'"%(self.wrapped_data.is_a(), name)) from None
-    AttributeError: entity instance of type 'IfcWallStandardCase' has no attribute 'NonExistingAttr'
-    >>> wall.GlobalId = 3
-    Traceback (most recent call last):
-      File "<stdin>", line 1, in <module>
-      File ".\ifc.py", line 26, in __setattr__
-        self[self.wrapped_data.get_argument_index(key)] = value
-      File ".\ifc.py", line 30, in __setitem__
-        self.wrapped_data.set_argument(idx, entity_instance.map_value(value))
-      File ".\ifc_wrapper.py", line 118, in <lambda>
-        set_argument = lambda self,x,y: self._set_argument(x) if y is None else self
-    ._set_argument(x,y)
-      File ".\ifc_wrapper.py", line 114, in _set_argument
-        def _set_argument(self, *args): return _ifc_wrapper.entity_instance__set_argument(self, *args)
-    RuntimeError: INT is not a valid type for 'GlobalId'
-    >>> f.createIfcCartesianPoint(Coordinates=(1.0,1.5,2.0))
-    #27530=IfcCartesianPoint((1.,1.5,2.))
-    >>> import uuid
-    >>> ifc.guid.compress(uuid.uuid1().hex)
-    '3x4C8Q_6qHuv$P$FYkANRX'
-    >>> new_guid = _
-    >>> owner_hist = f.by_type("IfcOwnerHistory")[0]
-    >>> new_wall = f.createIfcWallStandardCase(new_guid, owner_hist, None, None, Tag='my_tag')
-    >>> new_wall.ObjectType = ''
-    >>> new_wall.ObjectPlacement = new_wall.Representation = None
-    >>> f[92]
-    #92=IfcWallStandardCase('2O2Fr$t4X7Zf8NOew3FLIE',#1,'Basic Wall:Interior - Partition (92mm Stud):143921',$,'Basic Wall:Interior - Partition (92mm Stud):128360',#5206,#18805,'143921')
-    >>> f['2O2Fr$t4X7Zf8NOew3FLIE']
-    #92=IfcWallStandardCase('2O2Fr$t4X7Zf8NOew3FLIE',#1,'Basic Wall:Interior - Partition (92mm Stud):143921',$,'Basic Wall:Interior - Partition (92mm Stud):128360',#5206,#18805,'143921')
-    >>> f.write("out.ifc")
-
-
-Compiling on Windows
-====================
-Users are advised to use the Visual Studio .sln file in the win/ folder.
-For Windows users a prebuilt Open CASCADE version is available from the
-http://opencascade.org website. Download and install this version and
-provide the paths to the Open CASCADE header and library files to MS
-Visual Studio C++.
-
-For building the Autodesk 3ds Max plugin, the 3ds Max SDK needs to be
-installed as well as 3ds Max itself. Please provide the include and
-library paths to Visual Studio.
-
-For building the IfcPython wrapper, SWIG needs to be installed. Please
-download the latest swigwin version from http://www.swig.org/download.html.
-After extracting the .zip file, please add the extracted folder to the PATH
-environment variable. Python needs to be installed, please provide the
-include and library paths to Visual Studio.
-
-
-
-Compiling on *nix
-====================
-Users are advised to build IfcOpenShell using the cmake file provided in
-the cmake/ folder. There might be an Open CASCADE package in your operating
-system's software repository. If not, you will need to compile Open 
-CASCADE yourself. See http://opencascade.org.
-
-For building the IfcPython wrapper, SWIG and Python development are
-required.
-
-    To build IfcOpenShell please take the following steps:
-    $ cd /path/to/IfcOpenShell/cmake
-    $ mkdir build
-    $ cd build
-    Optionally:
-      $ OCC_INCLUDE_PATH="/path/to/OpenCASCADE/include"
-      $ OCC_LIBRARY_PATH="/path/to/OpenCASCADE/lib"
-      $ export OCC_INCLUDE_PATH
-      $ export OCC_LIBRARY_PATH
-    $ cmake ../
-    $ make
-
-If all worked out correctly you can now use IfcOpenShell. For example:
-    $ wget ftp://ftp.dds.no/pub/ifc/Munkerud/Munkerud_hus6_BE.zip
-    $ unzip Munkerud_hus6_BE.zip
-    $ ./IfcObj Munkerud_hus6_BE.ifc
-    $ less Munkerud_hus6_BE.obj
+Outdated
+========
+This is an old repository that has been superseded by [https://github.com/IfcOpenShell/IfcOpenShell/](https://github.com/IfcOPenShell/IfcOpenShell/).
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
index 4cd45bb..48d0212 100644
--- a/cmake/CMakeLists.txt
+++ b/cmake/CMakeLists.txt
@@ -123,21 +123,20 @@ ENDIF(MSVC)
 
 INCLUDE_DIRECTORIES(${INCLUDE_DIRECTORIES} ${OCC_INCLUDE_DIR} ${OPENCOLLADA_INCLUDE_DIRS} /usr/inc /usr/local/inc /usr/local/include/oce ${ICU_INCLUDE_DIR} ${Boost_INCLUDE_DIRS})
 
-ADD_LIBRARY(IfcParse STATIC 
+ADD_LIBRARY(IfcParse STATIC
+  ../src/ifcparse/Ifc2x3-latebound.cpp
   ../src/ifcparse/Ifc2x3.cpp
+  ../src/ifcparse/Ifc4-latebound.cpp
   ../src/ifcparse/Ifc4.cpp
-  ../src/ifcparse/IfcUtil.cpp
-  ../src/ifcparse/IfcParse.cpp
   ../src/ifcparse/IfcCharacterDecoder.cpp
-  
-  ../src/ifcparse/IfcWrite.cpp
   ../src/ifcparse/IfcGuidHelper.cpp
-  
   ../src/ifcparse/IfcHierarchyHelper.cpp
-  
-  ../src/ifcparse/Ifc2x3-rt.cpp
-  ../src/ifcparse/Ifc4-rt.cpp
-  ../src/ifcparse/IfcUntypedEntity.cpp
+  ../src/ifcparse/IfcLateBoundEntity.cpp
+  ../src/ifcparse/IfcParse.cpp
+  ../src/ifcparse/IfcSIPrefix.cpp
+  ../src/ifcparse/IfcSpfHeader.cpp
+  ../src/ifcparse/IfcUtil.cpp
+  ../src/ifcparse/IfcWrite.cpp
 )
 
 ADD_LIBRARY(IfcGeom STATIC
@@ -145,8 +144,9 @@ ADD_LIBRARY(IfcGeom STATIC
   ../src/ifcgeom/IfcGeomFaces.cpp
   ../src/ifcgeom/IfcGeomFunctions.cpp
   ../src/ifcgeom/IfcGeomHelpers.cpp
-  ../src/ifcgeom/IfcGeomObjects.cpp
+  ../src/ifcgeom/IfcGeomMaterial.cpp
   ../src/ifcgeom/IfcGeomRenderStyles.cpp
+  ../src/ifcgeom/IfcGeomRepresentation.cpp
   ../src/ifcgeom/IfcGeomShapes.cpp
   ../src/ifcgeom/IfcGeomWires.cpp
   ../src/ifcgeom/IfcRegister.cpp
@@ -160,11 +160,12 @@ TARGET_LINK_LIBRARIES(IfcGeom IfcParse)
 
 LINK_DIRECTORIES (${LINK_DIRECTORIES} ${IfcOpenShell_BINARY_DIR} ${OCC_LIBRARY_DIR} ${OPENCOLLADA_LIBRARY_DIR} /usr/lib /usr/lib64 /usr/local/lib /usr/local/lib64 ${ICU_LIBRARY_DIR} ${Boost_LIBRARY_DIRS}) 
 
-ADD_EXECUTABLE(IfcConvert 
+ADD_EXECUTABLE(IfcConvert
     ../src/ifcconvert/ColladaSerializer.cpp
     ../src/ifcconvert/IfcConvert.cpp
     ../src/ifcconvert/OpenCascadeBasedSerializer.cpp
-    ../src/ifcconvert/WavefrontObjSerializer.cpp   
+    ../src/ifcconvert/WavefrontObjSerializer.cpp
+    ../src/ifcconvert/XmlSerializer.cpp
 )
 
 TARGET_LINK_LIBRARIES (IfcConvert IfcParse IfcGeom TKernel TKMath TKBRep TKGeomBase TKGeomAlgo TKG3d TKG2d TKShHealing TKTopAlgo TKMesh TKPrim TKBool TKBO TKFillet TKSTEP TKSTEPBase TKSTEPAttr TKXSBase TKSTEP209 TKIGES TKOffset ${Boost_LIBRARIES} ${OPENCOLLADA_LIBRARIES})
@@ -186,8 +187,12 @@ ADD_SUBDIRECTORY(../src/examples examples)
 # CMake installation targets
 SET(include_files_geom
     ../src/ifcgeom/IfcGeom.h
-    ../src/ifcgeom/IfcGeomObjects.h
+    ../src/ifcgeom/IfcGeomElement.h
+    ../src/ifcgeom/IfcGeomIterator.h
+    ../src/ifcgeom/IfcGeomIteratorSettings.h
+    ../src/ifcgeom/IfcGeomMaterial.h
     ../src/ifcgeom/IfcGeomRenderStyles.h
+    ../src/ifcgeom/IfcGeomRepresentation.h
     ../src/ifcgeom/IfcRegister.h
     ../src/ifcgeom/IfcRegisterConvertCurve.h
     ../src/ifcgeom/IfcRegisterConvertFace.h
@@ -200,29 +205,29 @@ SET(include_files_geom
     ../src/ifcgeom/IfcRegisterIsShapeCollection.h
     ../src/ifcgeom/IfcRegisterPurgeCache.h
     ../src/ifcgeom/IfcRegisterUndef.h
-    ../src/ifcgeom/IfcGeomRenderStyles.h
     ../src/ifcgeom/IfcRepresentationShapeItem.h
 )
 SET(include_files_parse
+    ../src/ifcparse/Ifc2x3-latebound.h
     ../src/ifcparse/Ifc2x3.h
     ../src/ifcparse/Ifc2x3enum.h
+    ../src/ifcparse/Ifc4-latebound.h
     ../src/ifcparse/Ifc4.h
     ../src/ifcparse/Ifc4enum.h
     ../src/ifcparse/IfcCharacterDecoder.h
+    ../src/ifcparse/IfcEntityDescriptor.h
     ../src/ifcparse/IfcException.h
     ../src/ifcparse/IfcFile.h
     ../src/ifcparse/IfcHierarchyHelper.h
+    ../src/ifcparse/IfcLateBoundEntity.h
     ../src/ifcparse/IfcParse.h
+    ../src/ifcparse/IfcSIPrefix.h
+    ../src/ifcparse/IfcSpfHeader.h
+    ../src/ifcparse/IfcSpfStream.h
     ../src/ifcparse/IfcUtil.h
-    ../src/ifcparse/SharedPointer.h
-    
-    ../src/ifcparse/IfcWrite.h
     ../src/ifcparse/IfcWritableEntity.h
-
-    ../src/ifcparse/Ifc2x3-rt.h
-    ../src/ifcparse/Ifc4-rt.h
-    ../src/ifcparse/IfcUntypedEntity.h
-    ../src/ifcparse/IfcEntityDescriptor.h
+    ../src/ifcparse/IfcWrite.h
+    ../src/ifcparse/SharedPointer.h
 )
 INSTALL(FILES ${include_files_geom} DESTINATION include/ifcgeom)
 INSTALL(FILES ${include_files_parse} DESTINATION include/ifcparse)
diff --git a/src/bimserver_plugin/.classpath b/src/bimserver_plugin/.classpath
deleted file mode 100644
index befbd75..0000000
--- a/src/bimserver_plugin/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/Shared"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/src/bimserver_plugin/.project b/src/bimserver_plugin/.project
deleted file mode 100644
index 1a20de4..0000000
--- a/src/bimserver_plugin/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>IfcOpenShellPlugin</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/src/bimserver_plugin/lib/32/IfcJni.dll b/src/bimserver_plugin/lib/32/IfcJni.dll
deleted file mode 100644
index 1c29797..0000000
Binary files a/src/bimserver_plugin/lib/32/IfcJni.dll and /dev/null differ
diff --git a/src/bimserver_plugin/lib/32/libIfcJni.dylib b/src/bimserver_plugin/lib/32/libIfcJni.dylib
deleted file mode 100644
index 67d9a25..0000000
Binary files a/src/bimserver_plugin/lib/32/libIfcJni.dylib and /dev/null differ
diff --git a/src/bimserver_plugin/lib/32/libIfcJni.so b/src/bimserver_plugin/lib/32/libIfcJni.so
deleted file mode 100644
index 968647d..0000000
Binary files a/src/bimserver_plugin/lib/32/libIfcJni.so and /dev/null differ
diff --git a/src/bimserver_plugin/lib/64/IfcJni.dll b/src/bimserver_plugin/lib/64/IfcJni.dll
deleted file mode 100644
index f1471da..0000000
Binary files a/src/bimserver_plugin/lib/64/IfcJni.dll and /dev/null differ
diff --git a/src/bimserver_plugin/lib/64/libIfcJni.dylib b/src/bimserver_plugin/lib/64/libIfcJni.dylib
deleted file mode 100644
index b39ae6d..0000000
Binary files a/src/bimserver_plugin/lib/64/libIfcJni.dylib and /dev/null differ
diff --git a/src/bimserver_plugin/lib/64/libIfcJni.so b/src/bimserver_plugin/lib/64/libIfcJni.so
deleted file mode 100644
index fc6da5f..0000000
Binary files a/src/bimserver_plugin/lib/64/libIfcJni.so and /dev/null differ
diff --git a/src/bimserver_plugin/plugin/plugin.xml b/src/bimserver_plugin/plugin/plugin.xml
deleted file mode 100644
index 6af07c5..0000000
--- a/src/bimserver_plugin/plugin/plugin.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<PluginDescriptor>              
-        <PluginImplementation>
-                <interfaceClass>org.bimserver.plugins.ifcengine.IfcEnginePlugin</interfaceClass>
-                <implementationClass>org.ifcopenshell.IfcOpenShellEnginePlugin</implementationClass>
-        </PluginImplementation>
-</PluginDescriptor>
\ No newline at end of file
diff --git a/src/bimserver_plugin/src/org/ifcopenshell/IfcGeomObject.java b/src/bimserver_plugin/src/org/ifcopenshell/IfcGeomObject.java
deleted file mode 100644
index 3a22f56..0000000
--- a/src/bimserver_plugin/src/org/ifcopenshell/IfcGeomObject.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
-*                                                                              *
-* This file is part of IfcOpenShell.                                           *
-*                                                                              *
-* IfcOpenShell is free software: you can redistribute it and/or modify         *
-* it under the terms of the Lesser GNU General Public License as published by  *
-* the Free Software Foundation, either version 3.0 of the License, or          *
-* (at your option) any later version.                                          *
-*                                                                              *
-* IfcOpenShell 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                 *
-* Lesser GNU General Public License for more details.                          *
-*                                                                              *
-* You should have received a copy of the Lesser GNU General Public License     *
-* along with this program. If not, see <http://www.gnu.org/licenses/>.         *
-*                                                                              *
-********************************************************************************/
-
-/*******************************************************************************
-*                                                                              *
-* This class is a literal translation of the interface class IfcGeomObject in  *
-* the C++ implementation of IfcOpenShell, these babies are returned from the   *
-* JNI interface.                                                               *
-*                                                                              *
-********************************************************************************/
-
-package org.ifcopenshell;
-
-public class IfcGeomObject {
-	public int id;
-	public String name;
-	public String type;
-	public String guid;
-	public int[] indices;
-	public float[] vertices;
-	public float[] normals;
-	
-	public IfcGeomObject(int i, String nm, String t, String g, int[] is, float[] vs, float[] ns) {
-		id = i;
-		name = nm;
-		type = t;
-		guid = g;
-		indices = is;
-		vertices = vs;
-		normals = ns;
-	}
-}
diff --git a/src/bimserver_plugin/src/org/ifcopenshell/IfcOpenShellEngine.java b/src/bimserver_plugin/src/org/ifcopenshell/IfcOpenShellEngine.java
deleted file mode 100644
index 0361f36..0000000
--- a/src/bimserver_plugin/src/org/ifcopenshell/IfcOpenShellEngine.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*******************************************************************************
-*                                                                              *
-* This file is part of IfcOpenShell.                                           *
-*                                                                              *
-* IfcOpenShell is free software: you can redistribute it and/or modify         *
-* it under the terms of the Lesser GNU General Public License as published by  *
-* the Free Software Foundation, either version 3.0 of the License, or          *
-* (at your option) any later version.                                          *
-*                                                                              *
-* IfcOpenShell 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                 *
-* Lesser GNU General Public License for more details.                          *
-*                                                                              *
-* You should have received a copy of the Lesser GNU General Public License     *
-* along with this program. If not, see <http://www.gnu.org/licenses/>.         *
-*                                                                              *
-********************************************************************************/
-
-/*******************************************************************************
-*                                                                              *
-* An intermediate between the Plugin implementation and the Model              *
-* implementation, nothing fancy going on here.                                 *
-*                                                                              *
-********************************************************************************/
-
-package org.ifcopenshell;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.bimserver.plugins.ifcengine.IfcEngine;
-import org.bimserver.plugins.ifcengine.IfcEngineException;
-import org.bimserver.plugins.ifcengine.IfcEngineModel;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class IfcOpenShellEngine implements IfcEngine {
-	private static final Logger LOGGER = LoggerFactory.getLogger(IfcOpenShellEngine.class);
-	public static final Boolean debug = false;
-	private String filename;
-
-	public IfcOpenShellEngine(String fn) throws IOException {
-		filename = fn;
-	}
-
-	@Override
-	public void init() throws IfcEngineException {
-		LOGGER.info("Initializing IfcOpenShell engine");
-	}
-	
-	@Override
-	public void close() {
-		LOGGER.info("Closing IfcOpenShell engine");
-	}
-
-	@Override
-	public IfcEngineModel openModel(File ifcFile) throws IfcEngineException {
-		try {
-			return openModel(new FileInputStream(ifcFile),(int)ifcFile.length());
-		} catch (IOException e) {
-			throw new IfcEngineException("Failed to open model");		
-		}
-	}
-
-	@Override
-	public IfcEngineModel openModel(InputStream inputStream, int size) throws IfcEngineException {
-		try {
-			byte[] bytes = new byte[size];
-			inputStream.read(bytes);
-			return openModel(bytes);
-		} catch (IOException e) {
-			throw new IfcEngineException("Failed to open model");
-		}
-	}
-
-	@Override
-	public IfcEngineModel openModel(byte[] bytes) throws IfcEngineException {
-		return new IfcOpenShellModel(filename,bytes);
-	}
-}
\ No newline at end of file
diff --git a/src/bimserver_plugin/src/org/ifcopenshell/IfcOpenShellEnginePlugin.java b/src/bimserver_plugin/src/org/ifcopenshell/IfcOpenShellEnginePlugin.java
deleted file mode 100644
index f410e3d..0000000
--- a/src/bimserver_plugin/src/org/ifcopenshell/IfcOpenShellEnginePlugin.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*******************************************************************************
-*                                                                              *
-* This file is part of IfcOpenShell.                                           *
-*                                                                              *
-* IfcOpenShell is free software: you can redistribute it and/or modify         *
-* it under the terms of the Lesser GNU General Public License as published by  *
-* the Free Software Foundation, either version 3.0 of the License, or          *
-* (at your option) any later version.                                          *
-*                                                                              *
-* IfcOpenShell 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                 *
-* Lesser GNU General Public License for more details.                          *
-*                                                                              *
-* You should have received a copy of the Lesser GNU General Public License     *
-* along with this program. If not, see <http://www.gnu.org/licenses/>.         *
-*                                                                              *
-********************************************************************************/
-
-/*******************************************************************************
-*                                                                              *
-* This class ensures that a valid binary is available for the platform the     *
-* code is running on.                                                          *
-*                                                                              *
-********************************************************************************/
-
-package org.ifcopenshell;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.io.IOUtils;
-import org.bimserver.models.store.ObjectDefinition;
-import org.bimserver.plugins.PluginContext;
-import org.bimserver.plugins.PluginManager;
-import org.bimserver.plugins.ifcengine.IfcEngine;
-import org.bimserver.plugins.ifcengine.IfcEngineException;
-import org.bimserver.plugins.ifcengine.IfcEnginePlugin;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class IfcOpenShellEnginePlugin implements IfcEnginePlugin {
-	private static final Logger LOGGER = LoggerFactory.getLogger(IfcOpenShellEnginePlugin.class);
-	private boolean initialized = false;
-	private String filename;
-
-	@Override
-	public IfcEngine createIfcEngine() throws IfcEngineException {
-		try {
-			return new IfcOpenShellEngine(filename);
-		} catch (IOException e) {
-			throw new IfcEngineException(e);
-		}
-	}
-
-	@Override
-	public String getDescription() {
-		return "Open source IFC geometry engine<br>visit <a href='http://ifcopenshell.org'>ifcopenshell.org</a>";
-	}
-	
-	public static String getVersionStatic() {
-		return "0.3.0-rc3";
-	}
-
-	@Override
-	public String getVersion() {
-		return getVersionStatic();
-	}
-
-	@Override
-	public void init(PluginManager pluginManager) {
-		PluginContext pluginContext = pluginManager.getPluginContext(this);
-		String os = System.getProperty("os.name").toLowerCase();
-		String libraryName = "";
-		if (os.contains("windows")) {
-			libraryName = "IfcJni.dll";
-		} else if (os.contains("osx") || os.contains("os x") || os.contains("darwin")) {
-			libraryName = "libIfcJni.dylib";
-		} else if (os.contains("linux")) {
-			libraryName = "libIfcJni.so";
-		}
-		InputStream inputStream = pluginContext.getResourceAsInputStream("lib/" + System.getProperty("sun.arch.data.model") + "/" + libraryName);
-		if (inputStream != null) {
-			File nativeFolder = new File(pluginManager.getTempDir(), "IfcOpenShellEngine");
-			try {
-				if (nativeFolder.exists()) {
-					try {
-						FileUtils.deleteDirectory(nativeFolder);
-					} catch (IOException e) {
-						// Ignore
-					}
-				}
-				FileUtils.forceMkdir(nativeFolder);
-				File file = new File(nativeFolder, libraryName);
-				IOUtils.copy(inputStream, new FileOutputStream(file));
-				this.filename = file.getAbsolutePath();
-				initialized = new File(filename).exists();
-			} catch (IOException e) {
-				LOGGER.error("", e);
-			}
-		}
-	}
-
-	@Override
-	public boolean isInitialized() {
-		return initialized;
-	}
-
-	@Override
-	public String getDefaultName() {
-		return "IfcOpenShell Engine";
-	}
-
-	@Override
-	public ObjectDefinition getSettingsDefinition() {
-		return null;
-	}
-}
diff --git a/src/bimserver_plugin/src/org/ifcopenshell/IfcOpenShellEntityInstance.java b/src/bimserver_plugin/src/org/ifcopenshell/IfcOpenShellEntityInstance.java
deleted file mode 100644
index 68c7803..0000000
--- a/src/bimserver_plugin/src/org/ifcopenshell/IfcOpenShellEntityInstance.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
-*                                                                              *
-* This file is part of IfcOpenShell.                                           *
-*                                                                              *
-* IfcOpenShell is free software: you can redistribute it and/or modify         *
-* it under the terms of the Lesser GNU General Public License as published by  *
-* the Free Software Foundation, either version 3.0 of the License, or          *
-* (at your option) any later version.                                          *
-*                                                                              *
-* IfcOpenShell 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                 *
-* Lesser GNU General Public License for more details.                          *
-*                                                                              *
-* You should have received a copy of the Lesser GNU General Public License     *
-* along with this program. If not, see <http://www.gnu.org/licenses/>.         *
-*                                                                              *
-********************************************************************************/
-
-package org.ifcopenshell;
-
-import org.bimserver.plugins.ifcengine.IfcEngineException;
-import org.bimserver.plugins.ifcengine.IfcEngineInstance;
-import org.bimserver.plugins.ifcengine.IfcEngineInstanceVisualisationProperties;
-
-public class IfcOpenShellEntityInstance implements IfcEngineInstance {
-	private int startVertex;
-	private int startIndex;
-	private int primitiveCount;
-
-	public IfcOpenShellEntityInstance(int startVertex, int startIndex, int primitiveCount) {
-		this.startVertex = startVertex;
-		this.startIndex = startIndex;
-		this.primitiveCount = primitiveCount;		
-	}
-	@Override
-	public IfcEngineInstanceVisualisationProperties getVisualisationProperties()
-			throws IfcEngineException {
-		return new IfcEngineInstanceVisualisationProperties(startVertex, startIndex, primitiveCount);
-	}
-
-}
diff --git a/src/bimserver_plugin/src/org/ifcopenshell/IfcOpenShellModel.java b/src/bimserver_plugin/src/org/ifcopenshell/IfcOpenShellModel.java
deleted file mode 100644
index a65e40b..0000000
--- a/src/bimserver_plugin/src/org/ifcopenshell/IfcOpenShellModel.java
+++ /dev/null
@@ -1,198 +0,0 @@
-/*******************************************************************************
-*                                                                              *
-* This file is part of IfcOpenShell.                                           *
-*                                                                              *
-* IfcOpenShell is free software: you can redistribute it and/or modify         *
-* it under the terms of the Lesser GNU General Public License as published by  *
-* the Free Software Foundation, either version 3.0 of the License, or          *
-* (at your option) any later version.                                          *
-*                                                                              *
-* IfcOpenShell 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                 *
-* Lesser GNU General Public License for more details.                          *
-*                                                                              *
-* You should have received a copy of the Lesser GNU General Public License     *
-* along with this program. If not, see <http://www.gnu.org/licenses/>.         *
-*                                                                              *
-********************************************************************************/
-
-/*******************************************************************************
-*                                                                              *
-* This class communicates with the JNI wrapper of IfcOpenShell. Note that,     *
-* contrary to the Bonsma IFC engine, if the wrapper crashes it will take the   *
-* BIMserver down with her. Since loading the wrapper involves loading a        *
-* considerable binary into memory, it would have been better to make the       *
-* System.load() call somewhere in IfcOpenShellEngine.java.                     *
-*                                                                              *
-********************************************************************************/
-
-package org.ifcopenshell;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Set;
-
-import org.bimserver.plugins.ifcengine.IfcEngineClash;
-import org.bimserver.plugins.ifcengine.IfcEngineException;
-import org.bimserver.plugins.ifcengine.IfcEngineGeometry;
-import org.bimserver.plugins.ifcengine.IfcEngineInstance;
-import org.bimserver.plugins.ifcengine.IfcEngineModel;
-import org.bimserver.plugins.ifcengine.IfcEngineSurfaceProperties;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class IfcOpenShellModel implements IfcEngineModel {
-	private static final Logger LOGGER = LoggerFactory.getLogger(IfcOpenShellModel.class);
-	private Boolean validModel = false;
-	private HashMap<String,List<IfcOpenShellEntityInstance>> instances;
-	private HashMap<Integer,IfcOpenShellEntityInstance> instances_byid;
-	
-	// Native C++ functions implemented in IfcOpenShell
-	private native IfcGeomObject getGeometry();
-	private native boolean setIfcData(byte[] b);
-	private native String getPluginVersion();
-
-	// Convenience functions to concatenate arrays
-	private static float[] concatFloatArray(float[] a, float[] b) {
-		if ( a == null ) return b;
-		float[] r = new float[a.length+b.length];
-		System.arraycopy(a,0,r,0,a.length);
-		System.arraycopy(b,0,r,a.length,b.length);
-		return r;
-	}	
-	private static int[] concatIntArray(int[] a, int[] b) {
-		if ( a == null ) return b;
-		int[] r = new int[a.length+b.length];
-		System.arraycopy(a,0,r,0,a.length);
-		System.arraycopy(b,0,r,a.length,b.length);
-		return r;
-	}
-	
-	// Load the binary and pass the IFC data to IfcOpenShell
-	public IfcOpenShellModel(String fn, byte[] input) throws IfcEngineException {
-		try {
-			System.load(fn);
-		} catch ( Throwable e ) {
-			e.printStackTrace();
-			throw new IfcEngineException("Failed to load IfcOpenShell library");
-		}
-		String java_version = IfcOpenShellEnginePlugin.getVersionStatic();
-		String cpp_version = "";
-		try {
-			cpp_version = getPluginVersion();
-		} catch ( UnsatisfiedLinkError e ) {
-			throw new IfcEngineException("Unable to determine IfcOpenShell version");
-		}
-		if ( !java_version.equalsIgnoreCase(cpp_version) ) {
-			throw new IfcEngineException(String.format("Version mismatch: Plugin version %s does not match IfcOpenShell version %s",java_version,cpp_version));
-		}
-		validModel = setIfcData(input);
-	}
-
-	@Override
-	public void close() throws IfcEngineException {
-		validModel = false;
-	}
-
-	@Override
-	public IfcEngineGeometry finalizeModelling(
-			IfcEngineSurfaceProperties surfaceProperties)
-			throws IfcEngineException {
-		
-		if ( ! validModel ) throw new IfcEngineException("No valid model supplied");
-		
-		int[] indices = null;
-		float[] normals = null;
-		float[] vertices = null;
-		
-		// We keep track of instances ourselves
-		instances = new HashMap<String,List<IfcOpenShellEntityInstance>>();
-		
-		instances_byid = new HashMap<Integer,IfcOpenShellEntityInstance>();
-		
-		while ( true ) {
-			// Get the geometry from IfcOpenShell, this goes one instance at a time
-			IfcGeomObject obj = getGeometry();
-			if (obj == null) break;
-			
-			// Store the instance in our dictionary
-			List<IfcOpenShellEntityInstance> entity_list;
-			String type = obj.type.toUpperCase();
-			if ( ! instances.containsKey(type) ) {
-				entity_list = new ArrayList<IfcOpenShellEntityInstance>();
-				instances.put(type, entity_list);
-			} else {
-				entity_list = instances.get(type);
-			}
-			
-			int start_vertex = vertices == null ? 0 : vertices.length;
-			int start_index = indices == null ? 0 : indices.length;
-			int fcount = obj.indices.length / 3;
-			
-			// The indices have to take previous entities into account
-			for ( int i = 0; i < obj.indices.length; ++ i ) {
-				obj.indices[i] += start_vertex / 3;
-			}
-			
-			indices = concatIntArray(indices,obj.indices);
-			vertices = concatFloatArray(vertices,obj.vertices);
-			normals = concatFloatArray(normals,obj.normals);
-			
-			IfcOpenShellEntityInstance instance = new IfcOpenShellEntityInstance(start_vertex,start_index,fcount);
-			entity_list.add(instance);			
-			instances_byid.put(obj.id, instance);
-		}
-		return new IfcEngineGeometry(indices,vertices,normals);
-	}
-
-	@Override
-	public Set<IfcEngineClash> findClashesWithEids(double d)
-			throws IfcEngineException {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	@Override
-	public Set<IfcEngineClash> findClashesWithGuids(double d)
-			throws IfcEngineException {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	@Override
-	public List<? extends IfcEngineInstance> getInstances(String name)
-			throws IfcEngineException {
-		if ( instances.containsKey(name)) return instances.get(name);
-		else return new ArrayList<IfcOpenShellEntityInstance>();
-	}
-
-	@Override
-	public IfcEngineSurfaceProperties initializeModelling()
-			throws IfcEngineException {
-		return null;
-	}
-
-	@Override
-	public void setPostProcessing(boolean postProcessing)
-			throws IfcEngineException {
-	}
-	@Override
-	public IfcEngineInstance getInstanceFromExpressId(int oid)
-			throws IfcEngineException {
-		if ( instances_byid.containsKey(oid) ) {
-			return instances_byid.get(oid);
-		} else {
-			// Probably something went wrong with the processing of this element in
-			// the IfcOpenShell binary, as it has not been included in the enumerated
-			// set of elements with geometry.
-			LOGGER.warn(String.format("Entity #%d not found in model", oid));
-			return new IfcOpenShellEntityInstance(0,0,0);			
-		}
-	}
-	@Override
-	public void setFormat(int format, int mask) throws IfcEngineException {
-	}
-
-}
diff --git a/src/examples/IfcOpenHouse.cpp b/src/examples/IfcOpenHouse.cpp
index 907b52b..cb96d92 100644
--- a/src/examples/IfcOpenHouse.cpp
+++ b/src/examples/IfcOpenHouse.cpp
@@ -55,7 +55,7 @@ int main(int argc, char** argv) {
 	// The IfcHierarchyHelper is a subclass of the regular IfcFile that provides several
 	// convenience functions for working with geometry in IFC files.
 	IfcHierarchyHelper file;
-	file.filename("IfcOpenHouse.ifc");
+	file.header().file_name().name("IfcOpenHouse.ifc");
 
 	// Start by adding a wall to the file, initially leaving most attributes blank.
 	IfcSchema::IfcWallStandardCase* south_wall = new IfcSchema::IfcWallStandardCase(
@@ -83,17 +83,23 @@ int main(int argc, char** argv) {
 	// An IfcOwnerHistory has been initialized as well, which should be assigned to the wall.
 	south_wall->setOwnerHistory(file.getSingle<IfcSchema::IfcOwnerHistory>());
 
-	// The wall will be shaped as a box, with the dimensions specified in millimeters.
-	IfcSchema::IfcProductDefinitionShape* south_wall_shape = file.addBox(10000, 360, 3000);
+	// The wall will be shaped as a box, with the dimensions specified in millimeters. The resulting
+	// product definition will consist of both a body representation as well as an axis representation
+	// that runs over the centerline of the box in the X-axis.
+	IfcSchema::IfcProductDefinitionShape* south_wall_shape = file.addAxisBox(10000, 360, 3000);
+
+	// Obtain a reference to the placement of the IfcBuildingStorey in order to create a hierarchy
+	// of placements for the products
+	IfcSchema::IfcObjectPlacement* storey_placement = file.getSingle<IfcSchema::IfcBuildingStorey>()->ObjectPlacement();
 
 	// The shape has to be assigned to the representation of the wall and is placed at the origin
 	// of the coordinate system.
 	south_wall->setRepresentation(south_wall_shape);
-	south_wall->setObjectPlacement(file.addLocalPlacement());
+	south_wall->setObjectPlacement(file.addLocalPlacement(storey_placement));
 
 	// A pale white colour is assigned to the wall.
 	IfcSchema::IfcPresentationStyleAssignment* wall_colour = file.setSurfaceColour(
-		south_wall->Representation(), 0.75, 0.73, 0.68);
+		south_wall_shape, 0.75, 0.73, 0.68);
 
 	// Now create a footing for the wall to rest on.
 	IfcSchema::IfcFooting* footing = new IfcSchema::IfcFooting(guid(), file.getSingle<IfcSchema::IfcOwnerHistory>(),
@@ -104,122 +110,158 @@ int main(int argc, char** argv) {
 	// The footing will span the entire floor plan of our building. The IfcRepresentationContext is
 	// something that has been created automatically as well, but representations could have been 
 	// assigned to a specific context, for example to add a two dimensional plan representation as well.
-	footing->setRepresentation(file.addBox(10100, 5460, 2000, 0, 0, 0, file.getSingle<IfcSchema::IfcRepresentationContext>()));
-	footing->setObjectPlacement(file.addLocalPlacement(0, 2500, -2000));
+	footing->setRepresentation(file.addBox(10100, 5460, 2000));
+	footing->setObjectPlacement(file.addLocalPlacement(storey_placement, 0, 2500, -2000));
 	// The footing will have a dark gray colour
 	IfcSchema::IfcPresentationStyleAssignment* footing_colour = file.setSurfaceColour(footing->Representation(), 0.26, 0.22, 0.18);
 
 	// IFC has two ways to apply boolean operations to geometry. IfcBooleanResults are commonly used 
 	// to clip geometry to a surface, for example to a slanted roof. For openings that are filled 
 	// with another element, for example a door or a window, an IfcOpeningElement is used instead.
-	// An opening element is created with rectangular geometry
+
+	// An opening element is created with rectangular geometry:
 	IfcSchema::IfcOpeningElement* west_opening = new IfcSchema::IfcOpeningElement(guid(), file.getSingle<IfcSchema::IfcOwnerHistory>(),
-		null, null, null, file.addLocalPlacement(-2500, 0, 400),
-		file.addBox(6000, 3630, 1600, 0, 0, 0, file.getSingle<IfcSchema::IfcRepresentationContext>()), null
+		null, null, null, file.addLocalPlacement(south_wall->ObjectPlacement(), -2500, 0, 400),
+		file.addBox(6000, 3630, 1600), null
 #ifdef USE_IFC4
 		, IfcSchema::IfcOpeningElementTypeEnum::IfcOpeningElementType_OPENING
 #endif
 	);
-	file.AddEntity(west_opening);
+	file.addEntity(west_opening);
 
 	// Relate the opening element to the wall.
 	IfcSchema::IfcRelVoidsElement* void_element = new IfcSchema::IfcRelVoidsElement(guid(), file.getSingle<IfcSchema::IfcOwnerHistory>(),
 		null, null, south_wall, west_opening);
-	file.AddEntity(void_element);
+	file.addEntity(void_element);
 
 	// Now create an additional opening
 	IfcSchema::IfcOpeningElement* south_opening = new IfcSchema::IfcOpeningElement(guid(), file.getSingle<IfcSchema::IfcOwnerHistory>(),
-		null, null, null, file.addLocalPlacement(3000, 0, 400),
-		file.addBox(1860, 3000, 1600, 0, 0, 0, file.getSingle<IfcSchema::IfcRepresentationContext>()), null
+		null, null, null, file.addLocalPlacement(storey_placement, 3000, 0, 400),
+		file.addBox(1860, 3000, 1600), null
 #ifdef USE_IFC4
 		, IfcSchema::IfcOpeningElementTypeEnum::IfcOpeningElementType_OPENING
 #endif
 	);
-	file.AddEntity(south_opening);
-	file.AddEntity(new IfcSchema::IfcRelVoidsElement(guid(), file.getSingle<IfcSchema::IfcOwnerHistory>(), null, null, south_wall, south_opening));
-	
-	// Create a roof element
-	IfcSchema::IfcRoof* south_roof = new IfcSchema::IfcRoof(guid(), file.getSingle<IfcSchema::IfcOwnerHistory>(), S("South roof"), null, null, 
-		0, 0, null, IfcSchema::IfcRoofTypeEnum::IfcRoofType_GABLE_ROOF);
+	file.addEntity(south_opening);
+	file.addEntity(new IfcSchema::IfcRelVoidsElement(guid(), file.getSingle<IfcSchema::IfcOwnerHistory>(), null, null, south_wall, south_opening));
 	
+	// Create a roof element that will consist of two slabs:
+	IfcSchema::IfcRoof* roof = new IfcSchema::IfcRoof(guid(), file.getSingle<IfcSchema::IfcOwnerHistory>(), S("Roof"), null, null,
+		file.addLocalPlacement(storey_placement), 0, null, IfcSchema::IfcRoofTypeEnum::IfcRoofType_GABLE_ROOF);
+
 	// The roof geometry is slanted 45 degrees by specifying a direction for the box extrusion
-	south_roof->setRepresentation(file.addBox(10200, 360, sqrt(2.0*2900*2900), 0, file.addPlacement3d(0, 0, 0, 0, 1, 0),
-		file.addTriplet<IfcSchema::IfcDirection>(0, -sqrt(0.5), sqrt(0.5)), file.getSingle<IfcSchema::IfcRepresentationContext>()));
-	south_roof->setObjectPlacement(file.addLocalPlacement(0, -400, 2700));
-	file.addBuildingProduct(south_roof);
+	IfcSchema::IfcShapeRepresentation* roof_rep = file.addEmptyRepresentation();
+	file.addBox(roof_rep, 10200, 360, sqrt(2.0*2900*2900), 0, file.addPlacement3d(0, 0, 0, 0, 1, 0),
+		file.addTriplet<IfcSchema::IfcDirection>(0, -sqrt(0.5), sqrt(0.5)));
 
+	// CV-2x3-144: Roofs are aggregates and shall have at least one contained element and no own geometry
+	IfcSchema::IfcSlab* south_roof_part = new IfcSchema::IfcSlab(guid(), file.getSingle<IfcSchema::IfcOwnerHistory>(), S("South roof"), 
+		null, null, 0, 0, null, IfcSchema::IfcSlabTypeEnum::IfcSlabType_ROOF);
+	
+	// The geometry is instantiated by using IfcMappedItems. This way geometry definitions can
+	// be reused while maintaining the cardinality constraint that the ShapeOfProduct relation
+	// imposes on the IfcProductDefinitionShape. Note that this constrained is lifted in IFC4.
+	south_roof_part->setRepresentation(file.addMappedItem(roof_rep));
+	south_roof_part->setObjectPlacement(file.addLocalPlacement(roof->ObjectPlacement(), 0, -400, 2700));
+	
 	// The same roof geometry is re-used on the north side of the roof, by inverting the X-axis of
 	// the local placement the roof is rotated 180 degrees around the Z-axis
-	IfcSchema::IfcRoof* north_roof = new IfcSchema::IfcRoof(guid(), file.getSingle<IfcSchema::IfcOwnerHistory>(), S("North roof"),
-		null, null, 0, 0, null, IfcSchema::IfcRoofTypeEnum::IfcRoofType_GABLE_ROOF);
-	north_roof->setOwnerHistory(file.getSingle<IfcSchema::IfcOwnerHistory>());
-	north_roof->setRepresentation(south_roof->Representation());
-	north_roof->setObjectPlacement(file.addLocalPlacement(0, 5400, 2700, 0, 0, 1, -1, 0, 0));
-	file.addBuildingProduct(north_roof);
+	IfcSchema::IfcSlab* north_roof_part = new IfcSchema::IfcSlab(guid(), file.getSingle<IfcSchema::IfcOwnerHistory>(), S("North roof"),
+		null, null, 0, 0, null, IfcSchema::IfcSlabTypeEnum::IfcSlabType_ROOF);
+	north_roof_part->setOwnerHistory(file.getSingle<IfcSchema::IfcOwnerHistory>());
+	north_roof_part->setRepresentation(file.addMappedItem(roof_rep));
+	north_roof_part->setObjectPlacement(file.addLocalPlacement(roof->ObjectPlacement(), 0, 5400, 2700, 0, 0, 1, -1, 0, 0));
+	
+	IfcSchema::IfcObjectDefinition::list::ptr roof_parts(new IfcSchema::IfcObjectDefinition::list);
+	roof_parts->push(south_roof_part);
+	roof_parts->push(north_roof_part);
+	IfcSchema::IfcRelDecomposes* roof_decomposition = new IfcSchema::IfcRelAggregates(guid(), file.getSingle<IfcSchema::IfcOwnerHistory>(),
+			null, null, roof, roof_parts);
+	file.addEntity(roof_decomposition);
+
+	file.addBuildingProduct(south_roof_part);
+	file.addBuildingProduct(north_roof_part);
+	file.addBuildingProduct(roof);
 
-	// By specifying a surface style for the south part of the roof, it gets assigned to the other 
-	// roof part as well, because they share the same representation.
-	file.setSurfaceColour(south_roof->Representation(), 0.24, 0.08, 0.04);
+	file.setSurfaceColour(roof_rep, 0.24, 0.08, 0.04);
 
 	// Copy the south wall to the north
-	file.addBuildingProduct(new IfcSchema::IfcWallStandardCase(guid(), file.getSingle<IfcSchema::IfcOwnerHistory>(), S("North wall"),
-		null, null, file.addLocalPlacement(0, 5000, 0), south_wall->Representation(), null
+	IfcSchema::IfcWallStandardCase* north_wall = new IfcSchema::IfcWallStandardCase(guid(), file.getSingle<IfcSchema::IfcOwnerHistory>(), S("North wall"),
+		null, null, file.addLocalPlacement(storey_placement, 0, 5000, 0), file.addAxisBox(10000, 360, 3000), null
 #ifdef USE_IFC4
 		, IfcSchema::IfcWallTypeEnum::IfcWallType_STANDARD
 #endif	
-	));
+	);
+	file.addBuildingProduct(north_wall);
+	file.setSurfaceColour(north_wall->Representation(), wall_colour);
+
+	IfcSchema::IfcShapeRepresentation* clipped_wall_body_rep = file.addEmptyRepresentation();
+	file.addBox(clipped_wall_body_rep, 5000, 360, 6000);
+	// The east wall geometry is clipped using two IfcHalfSpaceSolids, created from an 
+	// 'axis 3d placement' that specifies the plane against which the geometry is clipped.
+	file.clipRepresentation(clipped_wall_body_rep, file.addPlacement3d(-2500, 0, 3000, -1, 0, 1), false);
+	file.clipRepresentation(clipped_wall_body_rep, file.addPlacement3d(2500, 0, 3000, 1, 0, 1), false);
 
 	// Now create a wall on the east of the building, again starting with just a box shape
 	IfcSchema::IfcWallStandardCase* east_wall = new IfcSchema::IfcWallStandardCase(guid(), file.getSingle<IfcSchema::IfcOwnerHistory>(),
-		S("East wall"), null, null, file.addLocalPlacement(4820, 2500, 0, 0, 0, 1, 0, 1, 0), file.addBox(5000, 360, 6000), null
+		S("East wall"), null, null, file.addLocalPlacement(storey_placement, 4820, 2500, 0, 0, 0, 1, 0, 1, 0), file.addMappedItem(clipped_wall_body_rep), null
 #ifdef USE_IFC4
 		, IfcSchema::IfcWallTypeEnum::IfcWallType_STANDARD
 #endif	
 	);
 	file.addBuildingProduct(east_wall);
 
-	// The east wall geometry is clipped using two IfcHalfSpaceSolids, created from an 
-	// 'axis 3d placement' that specifies the plane against which the geometry is clipped.
-	file.clipRepresentation(east_wall->Representation(), file.addPlacement3d(-2500, 0, 3000, -1, 0, 1), false);
-	file.clipRepresentation(east_wall->Representation(), file.addPlacement3d(2500, 0, 3000, 1, 0, 1), false);
-
-	file.setSurfaceColour(east_wall->Representation(), wall_colour);
+	file.setSurfaceColour(clipped_wall_body_rep, wall_colour);
 
 	// The east wall is copied to the west location of the house
 	IfcSchema::IfcWallStandardCase* west_wall = new IfcSchema::IfcWallStandardCase(guid(), file.getSingle<IfcSchema::IfcOwnerHistory>(),
-		S("West wall"), null, null, file.addLocalPlacement(-4820, 2500, 0, 0, 0, 1, 0, -1, 0), east_wall->Representation(), null
+		S("West wall"), null, null, file.addLocalPlacement(storey_placement, -4820, 2500, 0, 0, 0, 1, 0, -1, 0), file.addMappedItem(clipped_wall_body_rep), null
 #ifdef USE_IFC4
 		, IfcSchema::IfcWallTypeEnum::IfcWallType_STANDARD
 #endif	
 	);
 	file.addBuildingProduct(west_wall);
 
+	for (int i = 0; i < 2; ++i) {
+		// CV-2x3-161: MappedItems are not allowed for Axis representations
+		IfcSchema::IfcWallStandardCase* wall = i == 0 ? east_wall : west_wall;
+		IfcSchema::IfcShapeRepresentation* wall_axis_rep = file.addEmptyRepresentation("Axis", "Curve2D");
+		file.addAxis(wall_axis_rep, 5000);
+		IfcSchema::IfcRepresentation::list::ptr reps = wall->Representation()->Representations();
+		reps->push(wall_axis_rep);
+		wall->Representation()->setRepresentations(reps);
+	}
+
 	// The west wall is assigned an opening element we created for the south wall, opening elements are
 	// not shared accross building elements, even if they share the same representation. Hence, the east
 	// wall will not feature this opening.
 	// NB: an Opening Element can only be used to create a single void within a single Element, as per:
 	// http://www.buildingsmart-tech.org/ifc/IFC2x3/TC1/html/ifcproductextension/lexical/ifcfeatureelementsubtraction.htm
+
+	// Not all viewers support opening elements with mapped representations, hence an exact copy of the
+	// same subtraction box is instantiated for the otherwise identical opening element.
 	IfcSchema::IfcOpeningElement* west_opening_copy = new IfcSchema::IfcOpeningElement(guid(), file.getSingle<IfcSchema::IfcOwnerHistory>(),
-		null, null, null, west_opening->ObjectPlacement(), west_opening->Representation(), null
+		null, null, null, file.addLocalPlacement(west_wall->ObjectPlacement(), 2500, -2500+4820, 400, 0, 0, 1, 0, 1, 0),
+		file.addBox(6000, 3630, 1600), null
 #ifdef USE_IFC4
 		, IfcSchema::IfcOpeningElementTypeEnum::IfcOpeningElementType_OPENING
 #endif	
 	);
-	file.AddEntity(west_opening_copy);
-	file.AddEntity(new IfcSchema::IfcRelVoidsElement(guid(), file.getSingle<IfcSchema::IfcOwnerHistory>(), null, null, west_wall, west_opening_copy));
+	file.addEntity(west_opening_copy);
+	file.addEntity(new IfcSchema::IfcRelVoidsElement(guid(), file.getSingle<IfcSchema::IfcOwnerHistory>(), null, null, west_wall, west_opening_copy));
 	
 	// Up until now we have only used simple extrusions for the creation of the geometry. For the 
 	// ground mesh of the IfcSite we will use a Nurbs surface created in Open Cascade. The surface 
 	// will be tesselated using the deflection specified.
 	TopoDS_Shape shape;
 	createGroundShape(shape);
-	IfcEntities geometrical_entities(new IfcEntityList());
+	IfcEntityList::ptr geometrical_entities(new IfcEntityList);
 	IfcSchema::IfcProductDefinitionShape* ground_representation = IfcGeom::tesselate(shape, 100., geometrical_entities);
 	file.getSingle<IfcSchema::IfcSite>()->setRepresentation(ground_representation);
-	file.AddEntities(geometrical_entities);
-	IfcSchema::IfcShapeRepresentation::list ground_reps = geometrical_entities->as<IfcSchema::IfcShapeRepresentation>();
-	for (IfcSchema::IfcShapeRepresentation::it it = ground_reps->begin(); it != ground_reps->end(); ++it) {
-		(*it)->setContextOfItems(file.getSingle<IfcSchema::IfcRepresentationContext>());
+	file.addEntities(geometrical_entities);
+	IfcSchema::IfcShapeRepresentation::list::ptr ground_reps = geometrical_entities->as<IfcSchema::IfcShapeRepresentation>();
+	for (IfcSchema::IfcShapeRepresentation::list::it it = ground_reps->begin(); it != ground_reps->end(); ++it) {
+		(*it)->setContextOfItems(file.getRepresentationContext("Model"));
 	}
 	file.setSurfaceColour(ground_representation, 0.15, 0.25, 0.05);
 
@@ -246,7 +288,7 @@ int main(int argc, char** argv) {
 		, null
 #endif
 	);
-	IfcSchema::IfcMaterialLayer::list layers (new IfcTemplatedEntityList<IfcSchema::IfcMaterialLayer>());
+	IfcSchema::IfcMaterialLayer::list::ptr layers (new IfcTemplatedEntityList<IfcSchema::IfcMaterialLayer>());
 	layers->push(layer);
 	IfcSchema::IfcMaterialLayerSet* layer_set = new IfcSchema::IfcMaterialLayerSet(
 		layers, 
@@ -271,17 +313,17 @@ int main(int argc, char** argv) {
 		null, 
 		null,
 #ifdef USE_IFC4
-		file.EntitiesByType<IfcSchema::IfcWallStandardCase>()->generalize(),
+		file.entitiesByType<IfcSchema::IfcWallStandardCase>()->generalize(),
 #else
-		file.EntitiesByType<IfcSchema::IfcWallStandardCase>()->as<IfcSchema::IfcRoot>(),
+		file.entitiesByType<IfcSchema::IfcWallStandardCase>()->as<IfcSchema::IfcRoot>(),
 #endif
 		layer_usage);
 
-	file.AddEntity(material);
-	file.AddEntity(layer);
-	file.AddEntity(layer_set);	
-	file.AddEntity(layer_usage);
-	file.AddEntity(associates_material);
+	file.addEntity(material);
+	file.addEntity(layer);
+	file.addEntity(layer_set);	
+	file.addEntity(layer_usage);
+	file.addEntity(associates_material);
 
 	// In addition, another common way to represent geometry in IFC files is to use extrusions of
 	// planar areas bounded by a polygon.
@@ -293,7 +335,7 @@ int main(int argc, char** argv) {
 	stair_points.push_back(XY(500, 400));
 	stair_points.push_back(XY(  0, 400));
 	IfcSchema::IfcStairFlight* stair = new IfcSchema::IfcStairFlight(guid(), file.getSingle<IfcSchema::IfcOwnerHistory>(),
-		null, null, null, file.addLocalPlacement(5050, 1000, 0, 0, 1, 0, 1, 0, 0),
+		null, null, null, file.addLocalPlacement(storey_placement, 5050, 1000, 0, 0, 1, 0, 1, 0, 0),
 		file.addExtrudedPolyline(stair_points, 1200), null, 2, 2, 0.2, 0.25
 #ifdef USE_IFC4
 		, IfcSchema::IfcStairFlightTypeEnum::IfcStairFlightType_STRAIGHT
@@ -304,19 +346,19 @@ int main(int argc, char** argv) {
 	file.setSurfaceColour(stair->Representation(), footing_colour);
 
 	IfcSchema::IfcOpeningElement* door_opening = new IfcSchema::IfcOpeningElement(guid(), file.getSingle<IfcSchema::IfcOwnerHistory>(),
-		null, null, null, file.addLocalPlacement(5000-180, 2500-900, 0), file.addBox(1000, 1000, 2200), null
+		null, null, null, file.addLocalPlacement(storey_placement, 5000-180, 2500-900, 0), file.addBox(1000, 1000, 2200), null
 #ifdef USE_IFC4
 		, IfcSchema::IfcOpeningElementTypeEnum::IfcOpeningElementType_OPENING
 #endif	
 	);
-	file.AddEntity(door_opening);
-	file.AddEntity(new IfcSchema::IfcRelVoidsElement(guid(), file.getSingle<IfcSchema::IfcOwnerHistory>(), null, null, east_wall, door_opening));
+	file.addEntity(door_opening);
+	file.addEntity(new IfcSchema::IfcRelVoidsElement(guid(), file.getSingle<IfcSchema::IfcOwnerHistory>(), null, null, east_wall, door_opening));
 
 	// A single shape representation can contain multiple representiation items. This way a product
 	// can be a composition of multiple solids. The following door will be composed of four boxes
 	// which constitute the door and its frame.
 	IfcSchema::IfcDoor* door = new IfcSchema::IfcDoor(guid(), file.getSingle<IfcSchema::IfcOwnerHistory>(), null, null, null,
-		file.addLocalPlacement(4800, 1600, 0, 0, 0, 1, 0, 1, 0), 0, null, 2200, 1000
+		file.addLocalPlacement(storey_placement, 4800, 1600, 0, 0, 0, 1, 0, 1, 0), 0, null, 2200, 1000
 #ifdef USE_IFC4
 		, IfcSchema::IfcDoorTypeEnum::IfcDoorType_DOOR
 		, IfcSchema::IfcDoorTypeOperationEnum::IfcDoorTypeOperation_SINGLE_SWING_LEFT
@@ -324,9 +366,9 @@ int main(int argc, char** argv) {
 #endif
 	);
 	door->setRepresentation(file.addBox(80, 80, 2120, 0, file.addPlacement3d(460, 0, 0)));
-	IfcSchema::IfcRepresentation::list door_representations = door->Representation()->Representations();
+	IfcSchema::IfcRepresentation::list::ptr door_representations = door->Representation()->Representations();
 	IfcSchema::IfcShapeRepresentation* door_body = 0;
-	for (IfcSchema::IfcRepresentation::it i = door_representations->begin(); i != door_representations->end(); ++i) {
+	for (IfcSchema::IfcRepresentation::list::it i = door_representations->begin(); i != door_representations->end(); ++i) {
 		IfcSchema::IfcRepresentation* rep = *i;
 		if (rep->is(IfcSchema::Type::IfcShapeRepresentation) && rep->RepresentationIdentifier() == "Body") {
 			door_body = (IfcSchema::IfcShapeRepresentation*) rep;
@@ -337,7 +379,7 @@ int main(int argc, char** argv) {
 	file.addBox(door_body, 860, 30, 2120);
 	file.addBuildingProduct(door);
 	file.setSurfaceColour(door->Representation(), 0.9, 0.9, 0.9);
-	file.AddEntity(new IfcSchema::IfcRelFillsElement(guid(), file.getSingle<IfcSchema::IfcOwnerHistory>(), null, null, door_opening, door));
+	file.addEntity(new IfcSchema::IfcRelFillsElement(guid(), file.getSingle<IfcSchema::IfcOwnerHistory>(), null, null, door_opening, door));
 
 	// Surface styles are assigned to representation items, hence there is no real limitation to
 	// assign different colours within the same representation. However, some viewers have 
@@ -350,32 +392,39 @@ int main(int argc, char** argv) {
 	// Therefore the OverallWidth and OverallHeight of the window attributes will need to
 	// match the bounding box of the representation. Furthermore, the window placement needs
 	// to align with the lowerleft corner of the constituent parts.
-	IfcSchema::IfcProductDefinitionShape::list frame_representations (new IfcTemplatedEntityList<IfcSchema::IfcProductDefinitionShape>());
-	frame_representations->push(file.addBox(1860, 90, 90));
-	frame_representations->push(*frame_representations->begin()); // Add a reference to the shape created above
-	frame_representations->push(file.addBox(90, 90, 1420));
-	frame_representations->push(*(frame_representations->end()-1)); // Add a reference to the shape created above
+	IfcSchema::IfcShapeRepresentation::list::ptr frame_representations(new IfcSchema::IfcShapeRepresentation::list);
+	
+	IfcSchema::IfcShapeRepresentation* horizontal_bar = file.addEmptyRepresentation();
+	IfcSchema::IfcShapeRepresentation* vertical_bar = file.addEmptyRepresentation();
+	file.addBox(horizontal_bar, 1860, 90, 90);
+	file.addBox(vertical_bar, 90, 90, 1420);
+
+	frame_representations->push(horizontal_bar);
+	frame_representations->push(horizontal_bar); // Add another reference to the horizontal bar created above
+	frame_representations->push(vertical_bar);
+	frame_representations->push(vertical_bar); // Add another reference to the vertical bar created above
 
 	// The beams all have the same surface style assigned
 	IfcSchema::IfcPresentationStyleAssignment* frame_style = 0;
-	for (IfcSchema::IfcProductDefinitionShape::it i = frame_representations->begin(); i != frame_representations->end(); ++i) {
+	for (IfcSchema::IfcShapeRepresentation::list::it i = frame_representations->begin(); i != frame_representations->end(); i += 2) {
 		if (frame_style) {
 			file.setSurfaceColour(*i, frame_style);
 		} else {
 			frame_style = file.setSurfaceColour(*i, 0.5, 0.4, 0.3);
 		}
+		// Because of the duplication the iterator is incremented twice
 	}
 
 	// This window will be placed at five locations within the building. A list of placements is 
 	// created and is iterated over to create all window instances.
-	IfcSchema::IfcLocalPlacement::list window_placements (new IfcTemplatedEntityList<IfcSchema::IfcLocalPlacement>());
-	window_placements->push(file.addLocalPlacement(2*-1770-430-930,   -45, 400));
-	window_placements->push(file.addLocalPlacement(  -1770-430-930,   -45, 400));
-	window_placements->push(file.addLocalPlacement(       -430-930,   -45, 400));
-	window_placements->push(file.addLocalPlacement(       3000-930,   -45, 400));
-	window_placements->push(file.addLocalPlacement(      -4855+45, 885-930, 400, 0, 0, 1, 0, 1, 0));
+	IfcSchema::IfcLocalPlacement::list::ptr window_placements (new IfcSchema::IfcLocalPlacement::list);
+	window_placements->push(file.addLocalPlacement(storey_placement, 2*-1770-430-930,   -45, 400));
+	window_placements->push(file.addLocalPlacement(storey_placement,   -1770-430-930,   -45, 400));
+	window_placements->push(file.addLocalPlacement(storey_placement,        -430-930,   -45, 400));
+	window_placements->push(file.addLocalPlacement(storey_placement,        3000-930,   -45, 400));
+	window_placements->push(file.addLocalPlacement(storey_placement, -4855+45, 885-930, 400, 0, 0, 1, 0, 1, 0));
 	
-	for (IfcSchema::IfcLocalPlacement::it it = window_placements->begin(); it != window_placements->end(); ++it) {
+	for (IfcSchema::IfcLocalPlacement::list::it it = window_placements->begin(); it != window_placements->end(); ++it) {
 		
 		// Create the window at the current location
 		IfcSchema::IfcLocalPlacement* place = *it;
@@ -390,42 +439,42 @@ int main(int argc, char** argv) {
 		file.addBuildingProduct(window);		
 
 		// Initalize a list of parts for the window to be composed of
-		IfcSchema::IfcObjectDefinition::list window_parts(new IfcTemplatedEntityList<IfcSchema::IfcObjectDefinition>());
+		IfcSchema::IfcObjectDefinition::list::ptr window_parts(new IfcTemplatedEntityList<IfcSchema::IfcObjectDefinition>());
 
 		// The placements for the beams are not shared accross the different windows because every
 		// beam is placed relative to its parent window entity.
-		IfcSchema::IfcLocalPlacement::list frame_placements (new IfcTemplatedEntityList<IfcSchema::IfcLocalPlacement>());
-		frame_placements->push(file.addLocalPlacement( 930,45));
-		frame_placements->push(file.addLocalPlacement( 930, 45, 1510));
-		frame_placements->push(file.addLocalPlacement(-885+930, 45,  90));
-		frame_placements->push(file.addLocalPlacement( 885+930, 45,  90));
+		IfcSchema::IfcLocalPlacement::list::ptr frame_placements (new IfcTemplatedEntityList<IfcSchema::IfcLocalPlacement>());
+		frame_placements->push(file.addLocalPlacement(storey_placement,  930,45));
+		frame_placements->push(file.addLocalPlacement(storey_placement,  930, 45, 1510));
+		frame_placements->push(file.addLocalPlacement(storey_placement, -885+930, 45,  90));
+		frame_placements->push(file.addLocalPlacement(storey_placement,  885+930, 45,  90));
 		
 		// Now iterate over the placements and representations of the beam and add them to list of parts
-		IfcSchema::IfcLocalPlacement::it frame_placement;
-		IfcSchema::IfcProductDefinitionShape::it frame_representation;
+		IfcSchema::IfcLocalPlacement::list::it frame_placement;
+		IfcSchema::IfcShapeRepresentation::list::it frame_representation;
 		for (frame_placement = frame_placements->begin(), frame_representation = frame_representations->begin();
 			frame_placement != frame_placements->end() && frame_representation != frame_representations->end();
 			++frame_placement, ++frame_representation)
 		{
 			IfcSchema::IfcMember* frame_part = new IfcSchema::IfcMember(guid(), file.getSingle<IfcSchema::IfcOwnerHistory>(),
-				null, null, null, *frame_placement, *frame_representation, null
+				null, null, null, *frame_placement, file.addMappedItem(*frame_representation), null
 #ifdef USE_IFC4
 				, IfcSchema::IfcMemberTypeEnum::IfcMemberType_MULLION
 #endif
 			);
-			file.AddEntity(frame_part);
+			file.addEntity(frame_part);
 			window_parts->push(frame_part);
 			file.relatePlacements(window, frame_part);
 		}
 
 		// Add the glass plate to the list of parts
 		IfcSchema::IfcPlate* glass_part = new IfcSchema::IfcPlate(guid(), file.getSingle<IfcSchema::IfcOwnerHistory>(), null,
-			null, null, file.addLocalPlacement(930, 45, 90), file.addBox(1680, 10, 1420), null
+			null, null, file.addLocalPlacement(storey_placement, 930, 45, 90), file.addBox(1680, 10, 1420), null
 #ifdef USE_IFC4
 			, IfcSchema::IfcPlateTypeEnum::IfcPlateType_SHEET
 #endif
 		);
-		file.AddEntity(glass_part);
+		file.addEntity(glass_part);
 		window_parts->push(glass_part);
 		file.relatePlacements(window, glass_part);
 		file.setSurfaceColour(glass_part->Representation(), 0.6, 0.7, 0.75, 0.1);
@@ -434,7 +483,7 @@ int main(int argc, char** argv) {
 		// tools will consider the window a single entity that can be selected as a whole.
 		IfcSchema::IfcRelDecomposes* decomposition = new IfcSchema::IfcRelAggregates(guid(), file.getSingle<IfcSchema::IfcOwnerHistory>(),
 			null, null, window, window_parts);
-		file.AddEntity(decomposition);		
+		file.addEntity(decomposition);		
 	}
 
 	// Finally create a file stream for our output and write the IFC file to it.
@@ -479,6 +528,6 @@ void createGroundShape(TopoDS_Shape& shape) {
 #if OCC_VERSION_HEX < 0x60502
 	shape = BRepBuilderAPI_MakeFace(surf);
 #else
-	shape = BRepBuilderAPI_MakeFace(surf, 1);
+	shape = BRepBuilderAPI_MakeFace(surf, Precision::Confusion());
 #endif
 }
diff --git a/src/examples/IfcParseExamples.cpp b/src/examples/IfcParseExamples.cpp
index e6e8712..0fac9b3 100644
--- a/src/examples/IfcParseExamples.cpp
+++ b/src/examples/IfcParseExamples.cpp
@@ -17,7 +17,6 @@
  *                                                                              *
  ********************************************************************************/
 
-#include "../ifcparse/IfcParse.h"
 #include "../ifcparse/IfcFile.h"
 
 using namespace IfcSchema;
@@ -41,7 +40,7 @@ int main(int argc, char** argv) {
 
 	// Lets get a list of IfcBuildingElements, this is the parent
 	// type of things like walls, windows and doors.
-	// EntitiesByType is a templated function and returns a
+	// entitiesByType is a templated function and returns a
 	// templated class that behaves like a std::vector.
 	// Note that the return types are all typedef'ed as members of
 	// the generated classes, ::list for the templated vector class,
@@ -55,17 +54,17 @@ int main(int argc, char** argv) {
 	// we need to cast them to IfcWindows. Since these properties 
 	// are optional we need to make sure the properties are 
 	// defined for the window in question before accessing them.
-	IfcBuildingElement::list elements = file.EntitiesByType<IfcBuildingElement>();
+	IfcBuildingElement::list::ptr elements = file.entitiesByType<IfcBuildingElement>();
 
-	std::cout << "Found " << elements->Size() << " elements in " << argv[1] << ":" << std::endl;
+	std::cout << "Found " << elements->size() << " elements in " << argv[1] << ":" << std::endl;
 	
-	for ( IfcBuildingElement::it it = elements->begin(); it != elements->end(); ++ it ) {
+	for ( IfcBuildingElement::list::it it = elements->begin(); it != elements->end(); ++ it ) {
 		
-		const IfcBuildingElement::ptr element = *it;
+		const IfcBuildingElement* element = *it;
 		std::cout << element->entity->toString() << std::endl;
 		
 		if ( element->is(IfcWindow::Class()) ) {
-			const IfcWindow::ptr window = reinterpret_pointer_cast<IfcBuildingElement,IfcWindow>(element);
+			const IfcWindow* window = (IfcWindow*)element;
 			
 			if ( window->hasOverallWidth() && window->hasOverallHeight() ) {
 				const double area = window->OverallWidth()*window->OverallHeight();
diff --git a/src/examples/arbitrary_open_profile_def.cpp b/src/examples/arbitrary_open_profile_def.cpp
index f20b4d8..20ae1bb 100644
--- a/src/examples/arbitrary_open_profile_def.cpp
+++ b/src/examples/arbitrary_open_profile_def.cpp
@@ -51,7 +51,7 @@ void create_product_from_item(IfcHierarchyHelper& file, IfcSchema::IfcRepresenta
 
 	if (s == "GeometricSet") {
 		IfcSchema::IfcGeometricSet* set = new IfcSchema::IfcGeometricSet(items->generalize());
-		file.AddEntity(set);
+		file.addEntity(set);
 		items = IfcSchema::IfcRepresentationItem::list(new IfcTemplatedEntityList<IfcSchema::IfcRepresentationItem>());
 		items->push(set);
 	}
@@ -61,20 +61,20 @@ void create_product_from_item(IfcHierarchyHelper& file, IfcSchema::IfcRepresenta
 	reps->push(rep);
 
 	IfcSchema::IfcProductDefinitionShape* shape = new IfcSchema::IfcProductDefinitionShape(0, 0, reps);
-	file.AddEntity(rep);
-	file.AddEntity(shape);
+	file.addEntity(rep);
+	file.addEntity(shape);
 		
 	product->setRepresentation(shape);
 }
 
 void create_surfaces_from_profile(IfcHierarchyHelper& file, IfcSchema::IfcProfileDef* profile) {
 	IfcSchema::IfcSurfaceOfLinearExtrusion* extrusion = new IfcSchema::IfcSurfaceOfLinearExtrusion(profile, file.addPlacement3d(), file.addTriplet<IfcSchema::IfcDirection>(0, 0, 1), 100.);
-	file.AddEntity(extrusion);
+	file.addEntity(extrusion);
 
 	IfcSchema::IfcAxis1Placement* ax1 = new IfcSchema::IfcAxis1Placement(file.addTriplet<IfcSchema::IfcCartesianPoint>(0,100,0), file.addTriplet<IfcSchema::IfcDirection>(1,0,0));
 	IfcSchema::IfcSurfaceOfRevolution* revolution = new IfcSchema::IfcSurfaceOfRevolution(profile, file.addPlacement3d(), ax1);
-	file.AddEntity(ax1);
-	file.AddEntity(revolution);
+	file.addEntity(ax1);
+	file.addEntity(revolution);
 
 	create_product_from_item(file, extrusion, "GeometricSet");
 	create_product_from_item(file, revolution, "GeometricSet");
@@ -82,14 +82,14 @@ void create_surfaces_from_profile(IfcHierarchyHelper& file, IfcSchema::IfcProfil
 
 void create_solids_from_profile(IfcHierarchyHelper& file, IfcSchema::IfcProfileDef* profile) {
 	IfcSchema::IfcExtrudedAreaSolid* extrusion = new IfcSchema::IfcExtrudedAreaSolid(profile, file.addPlacement3d(), file.addTriplet<IfcSchema::IfcDirection>(0, 0, 1), 100.);
-	file.AddEntity(extrusion);
+	file.addEntity(extrusion);
 
 	IfcSchema::IfcAxis1Placement* ax1 = new IfcSchema::IfcAxis1Placement(file.addTriplet<IfcSchema::IfcCartesianPoint>(0,100,0), file.addTriplet<IfcSchema::IfcDirection>(1,0,0));
 	IfcSchema::IfcRevolvedAreaSolid* revolution1 = new IfcSchema::IfcRevolvedAreaSolid(profile, file.addPlacement3d(), ax1, 360.);
 	IfcSchema::IfcRevolvedAreaSolid* revolution2 = new IfcSchema::IfcRevolvedAreaSolid(profile, file.addPlacement3d(), ax1, 90.);
-	file.AddEntity(ax1);
-	file.AddEntity(revolution1);
-	file.AddEntity(revolution2);
+	file.addEntity(ax1);
+	file.addEntity(revolution1);
+	file.addEntity(revolution2);
 
 	create_product_from_item(file, extrusion, "SweptSolid");
 	create_product_from_item(file, revolution1, "SweptSolid");
@@ -99,8 +99,8 @@ void create_solids_from_profile(IfcHierarchyHelper& file, IfcSchema::IfcProfileD
 void create_products_from_curve(IfcHierarchyHelper& file, IfcSchema::IfcBoundedCurve* curve) {
 	IfcSchema::IfcArbitraryOpenProfileDef* open = new IfcSchema::IfcArbitraryOpenProfileDef(IfcSchema::IfcProfileTypeEnum::IfcProfileType_CURVE, null, curve);
 	IfcSchema::IfcCenterLineProfileDef* center_line = new IfcSchema::IfcCenterLineProfileDef(IfcSchema::IfcProfileTypeEnum::IfcProfileType_AREA, null, curve, 10.);
-	file.AddEntity(open);
-	file.AddEntity(center_line);
+	file.addEntity(open);
+	file.addEntity(center_line);
 
 	create_surfaces_from_profile(file, open);
 	create_solids_from_profile(file, center_line);
@@ -116,20 +116,20 @@ int main(int argc, char** argv) {
 	IfcSchema::IfcCartesianPoint::list points (new IfcTemplatedEntityList<IfcSchema::IfcCartesianPoint>());
 	points->push(new IfcSchema::IfcCartesianPoint(std::vector<double>(coords1, coords1+2)));
 	points->push(new IfcSchema::IfcCartesianPoint(std::vector<double>(coords2, coords2+2)));
-	file.AddEntities(points->generalize());
+	file.addEntities(points->generalize());
 	IfcSchema::IfcPolyline* poly = new IfcSchema::IfcPolyline(points);
-	file.AddEntity(poly);
+	file.addEntity(poly);
 
 	create_products_from_curve(file, poly);
 
 	IfcSchema::IfcEllipse* ellipse = new IfcSchema::IfcEllipse(file.addPlacement2d(), 50., 25.);
-	file.AddEntity(ellipse);
-	IfcEntities trim1(new IfcEntityList());
-	IfcEntities trim2(new IfcEntityList());
+	file.addEntity(ellipse);
+	IfcEntityList::ptr trim1(new IfcEntityList);
+	IfcEntityList::ptr trim2(new IfcEntityList);
 	trim1->push(new IfcWrite::IfcSelectHelper(  0., Ifc2x3::Type::IfcParameterValue));
 	trim2->push(new IfcWrite::IfcSelectHelper(180., Ifc2x3::Type::IfcParameterValue));
 	IfcSchema::IfcTrimmedCurve* trim = new IfcSchema::IfcTrimmedCurve(ellipse, trim1, trim2, true, IfcSchema::IfcTrimmingPreference::IfcTrimmingPreference_PARAMETER);
-	file.AddEntity(trim);
+	file.addEntity(trim);
 
 	create_products_from_curve(file, trim);
 
diff --git a/src/examples/composite_profile_def.cpp b/src/examples/composite_profile_def.cpp
index fa84c5c..8e495e9 100644
--- a/src/examples/composite_profile_def.cpp
+++ b/src/examples/composite_profile_def.cpp
@@ -65,11 +65,11 @@ int main(int argc, char** argv) {
 		IfcSchema::IfcProfileTypeEnum::IfcProfileType_AREA,
 		null, file.addPlacement2d(80.),    50.0,    25.0,     5.0,    10.0,     2.0,    null);
 
-	file.AddEntity(p2);
-	file.AddEntity(p3);
+	file.addEntity(p2);
+	file.addEntity(p3);
 	
-	file.AddEntity(transform1);
-	file.AddEntity(transform2);
+	file.addEntity(transform1);
+	file.addEntity(transform2);
 	
 	IfcSchema::IfcDerivedProfileDef* p5 = new IfcSchema::IfcDerivedProfileDef(IfcSchema::IfcProfileTypeEnum::IfcProfileType_AREA, null, p2, transform1, null);
 	IfcSchema::IfcDerivedProfileDef* p6 = new IfcSchema::IfcDerivedProfileDef(IfcSchema::IfcProfileTypeEnum::IfcProfileType_AREA, null, p3, transform2, null);
@@ -79,7 +79,7 @@ int main(int argc, char** argv) {
 	profiles->push(p6);
 	profiles->push(p4);
 
-	file.AddEntities(profiles->generalize());
+	file.addEntities(profiles->generalize());
 
 	IfcSchema::IfcCompositeProfileDef* composite = new IfcSchema::IfcCompositeProfileDef(IfcSchema::IfcProfileTypeEnum::IfcProfileType_AREA, S("IFC"), profiles, null);
 
@@ -95,8 +95,8 @@ int main(int argc, char** argv) {
 	IfcSchema::IfcExtrudedAreaSolid* solid = new IfcSchema::IfcExtrudedAreaSolid(composite,
 		file.addPlacement3d(), file.addTriplet<IfcSchema::IfcDirection>(0, 0, 1), 20.0);
 
-	file.AddEntity(composite);
-	file.AddEntity(solid);
+	file.addEntity(composite);
+	file.addEntity(solid);
 		
 	IfcSchema::IfcRepresentation::list reps (new IfcTemplatedEntityList<IfcSchema::IfcRepresentation>());
 	IfcSchema::IfcRepresentationItem::list items (new IfcTemplatedEntityList<IfcSchema::IfcRepresentationItem>());
@@ -107,8 +107,8 @@ int main(int argc, char** argv) {
 	reps->push(rep);
 
 	IfcSchema::IfcProductDefinitionShape* shape = new IfcSchema::IfcProductDefinitionShape(0, 0, reps);
-	file.AddEntity(rep);
-	file.AddEntity(shape);
+	file.addEntity(rep);
+	file.addEntity(shape);
 		
 	product->setRepresentation(shape);
 
diff --git a/src/examples/csg_primitive.cpp b/src/examples/csg_primitive.cpp
index ced4635..d849a1c 100644
--- a/src/examples/csg_primitive.cpp
+++ b/src/examples/csg_primitive.cpp
@@ -127,7 +127,7 @@ class Node {
 			}
 			my = new IfcSchema::IfcBooleanResult(o, left->serialize(file), right->serialize(file));
 		}
-		file.AddEntity(my);
+		file.addEntity(my);
 		return my;
 	}
 };
@@ -181,8 +181,8 @@ int main(int argc, char** argv) {
 	reps->push(rep);
 
 	IfcSchema::IfcProductDefinitionShape* shape = new IfcSchema::IfcProductDefinitionShape(0, 0, reps);
-	file.AddEntity(rep);
-	file.AddEntity(shape);
+	file.addEntity(rep);
+	file.addEntity(shape);
 		
 	product->setRepresentation(shape);
 
diff --git a/src/examples/ellipse_pies.cpp b/src/examples/ellipse_pies.cpp
index 967eb2c..eeef6cc 100644
--- a/src/examples/ellipse_pies.cpp
+++ b/src/examples/ellipse_pies.cpp
@@ -62,13 +62,13 @@ void create_testcase_for(IfcHierarchyHelper& file, const EllipsePie& pie, Ifc2x3
 	points->push(p3);
 	points->push(p1);
 	points->push(p2);
-	file.AddEntities(points->generalize());
+	file.addEntities(points->generalize());
 
 	
 	Ifc2x3::IfcEllipse* ellipse = new Ifc2x3::IfcEllipse(file.addPlacement2d(), pie.r1, pie.r2);
-	file.AddEntity(ellipse);
-	IfcEntities trim1(new IfcEntityList());
-	IfcEntities trim2(new IfcEntityList());
+	file.addEntity(ellipse);
+	IfcEntityList::ptr trim1(new IfcEntityList);
+	IfcEntityList::ptr trim2(new IfcEntityList);
 	if (pref == Ifc2x3::IfcTrimmingPreference::IfcTrimmingPreference_PARAMETER) {
 		trim1->push(new IfcWrite::IfcSelectHelper(pie.t1, Ifc2x3::Type::IfcParameterValue));
 		trim2->push(new IfcWrite::IfcSelectHelper(pie.t2, Ifc2x3::Type::IfcParameterValue));
@@ -77,23 +77,23 @@ void create_testcase_for(IfcHierarchyHelper& file, const EllipsePie& pie, Ifc2x3
 		trim2->push(p3);
 	}
 	Ifc2x3::IfcTrimmedCurve* trim = new Ifc2x3::IfcTrimmedCurve(ellipse, trim1, trim2, true, pref);
-	file.AddEntity(trim);
+	file.addEntity(trim);
 	
 	Ifc2x3::IfcCompositeCurveSegment::list segments(new IfcTemplatedEntityList<Ifc2x3::IfcCompositeCurveSegment>());
 	Ifc2x3::IfcCompositeCurveSegment* s2 = new Ifc2x3::IfcCompositeCurveSegment(Ifc2x3::IfcTransitionCode::IfcTransitionCode_CONTINUOUS, true, trim);
 	
 	Ifc2x3::IfcPolyline* poly = new Ifc2x3::IfcPolyline(points);	
-	file.AddEntity(poly);
+	file.addEntity(poly);
 	Ifc2x3::IfcCompositeCurveSegment* s1 = new Ifc2x3::IfcCompositeCurveSegment(Ifc2x3::IfcTransitionCode::IfcTransitionCode_CONTINUOUS, true, poly);
 	segments->push(s1);
 	
 	segments->push(s2);
-	file.AddEntities(segments->generalize());
+	file.addEntities(segments->generalize());
 	
 	Ifc2x3::IfcCompositeCurve* ccurve = new Ifc2x3::IfcCompositeCurve(segments, false);
 	Ifc2x3::IfcArbitraryClosedProfileDef* profile = new Ifc2x3::IfcArbitraryClosedProfileDef(Ifc2x3::IfcProfileTypeEnum::IfcProfileType_AREA, null, ccurve);
-	file.AddEntity(ccurve);
-	file.AddEntity(profile);
+	file.addEntity(ccurve);
+	file.addEntity(profile);
 
 	IfcSchema::IfcBuildingElementProxy* product = new IfcSchema::IfcBuildingElementProxy(
 		guid(), 0, S("profile"), null, null, 0, 0, null, null);
@@ -105,7 +105,7 @@ void create_testcase_for(IfcHierarchyHelper& file, const EllipsePie& pie, Ifc2x3
 	IfcSchema::IfcExtrudedAreaSolid* solid = new IfcSchema::IfcExtrudedAreaSolid(profile,
 		file.addPlacement3d(), file.addTriplet<IfcSchema::IfcDirection>(0, 0, 1), 20.0);
 
-	file.AddEntity(solid);
+	file.addEntity(solid);
 		
 	IfcSchema::IfcRepresentation::list reps (new IfcTemplatedEntityList<IfcSchema::IfcRepresentation>());
 	IfcSchema::IfcRepresentationItem::list items (new IfcTemplatedEntityList<IfcSchema::IfcRepresentationItem>());
@@ -116,8 +116,8 @@ void create_testcase_for(IfcHierarchyHelper& file, const EllipsePie& pie, Ifc2x3
 	reps->push(rep);
 
 	IfcSchema::IfcProductDefinitionShape* shape = new IfcSchema::IfcProductDefinitionShape(0, 0, reps);
-	file.AddEntity(rep);
-	file.AddEntity(shape);
+	file.addEntity(rep);
+	file.addEntity(shape);
 		
 	product->setRepresentation(shape);
 }
diff --git a/src/examples/profiles.cpp b/src/examples/profiles.cpp
index 3092648..d171745 100644
--- a/src/examples/profiles.cpp
+++ b/src/examples/profiles.cpp
@@ -35,7 +35,7 @@ typedef std::string S;
 typedef IfcWrite::IfcGuidHelper guid;
 boost::none_t const null = (static_cast<boost::none_t>(0));
 
-void create_testcase_for(IfcSchema::IfcProfileDef::list profiles) {
+void create_testcase_for(IfcSchema::IfcProfileDef::list::ptr profiles) {
 	IfcSchema::IfcProfileDef* profile = *profiles->begin();
 	const std::string profile_type = IfcSchema::Type::ToString(profile->type());
 	const std::string filename = profile_type + ".ifc";
@@ -44,7 +44,7 @@ void create_testcase_for(IfcSchema::IfcProfileDef::list profiles) {
 	file.filename(filename);
 	
 	int i = 0;
-	for (IfcSchema::IfcProfileDef::it it = profiles->begin(); it != profiles->end(); ++it, ++i) {
+	for (IfcSchema::IfcProfileDef::list::it it = profiles->begin(); it != profiles->end(); ++it, ++i) {
 		IfcSchema::IfcProfileDef* profile = *it;
 		IfcSchema::IfcBuildingElementProxy* product = new IfcSchema::IfcBuildingElementProxy(
 			guid(), 0, S("profile"), null, null, 0, 0, null, null);
@@ -52,7 +52,7 @@ void create_testcase_for(IfcSchema::IfcProfileDef::list profiles) {
 		file.getSingle<IfcSchema::IfcProject>()->setName(profile_type);
 		product->setOwnerHistory(file.getSingle<IfcSchema::IfcOwnerHistory>());
 
-		product->setObjectPlacement(file.addLocalPlacement(100 * i));
+		product->setObjectPlacement(file.addLocalPlacement(0, 100. * i));
 
 		if (profile->is(IfcSchema::Type::IfcParameterizedProfileDef)) {
 			((IfcSchema::IfcParameterizedProfileDef*) profile)->setPosition(file.addPlacement2d());
@@ -61,11 +61,11 @@ void create_testcase_for(IfcSchema::IfcProfileDef::list profiles) {
 		IfcSchema::IfcExtrudedAreaSolid* solid = new IfcSchema::IfcExtrudedAreaSolid(profile,
 			file.addPlacement3d(), file.addTriplet<IfcSchema::IfcDirection>(0, 0, 1), 20.0);
 
-		file.AddEntity(profile);
-		file.AddEntity(solid);
+		file.addEntity(profile);
+		file.addEntity(solid);
 		
-		IfcSchema::IfcRepresentation::list reps (new IfcTemplatedEntityList<IfcSchema::IfcRepresentation>());
-		IfcSchema::IfcRepresentationItem::list items (new IfcTemplatedEntityList<IfcSchema::IfcRepresentationItem>());
+		IfcSchema::IfcRepresentation::list::ptr reps (new IfcSchema::IfcRepresentation::list);
+		IfcSchema::IfcRepresentationItem::list::ptr items (new IfcSchema::IfcRepresentationItem::list);
 		
 		items->push(solid);
 		IfcSchema::IfcShapeRepresentation* rep = new IfcSchema::IfcShapeRepresentation(
@@ -73,8 +73,8 @@ void create_testcase_for(IfcSchema::IfcProfileDef::list profiles) {
 		reps->push(rep);
 
 		IfcSchema::IfcProductDefinitionShape* shape = new IfcSchema::IfcProductDefinitionShape(0, 0, reps);
-		file.AddEntity(rep);
-		file.AddEntity(shape);
+		file.addEntity(rep);
+		file.addEntity(shape);
 		
 		product->setRepresentation(shape);
 	}
@@ -84,7 +84,7 @@ void create_testcase_for(IfcSchema::IfcProfileDef::list profiles) {
 }
 
 int main(int argc, char** argv) {
-	{ IfcSchema::IfcProfileDef::list profiles (new IfcTemplatedEntityList<IfcSchema::IfcProfileDef>());
+	{ IfcSchema::IfcProfileDef::list::ptr profiles (new IfcSchema::IfcProfileDef::list);
 	profiles->push(new Ifc2x3::IfcUShapeProfileDef(
 		IfcSchema::IfcProfileTypeEnum::IfcProfileType_AREA,
 		null, 0,    50.0,    25.0,     5.0,     5.0,    null,    null,    null,    null));
@@ -99,7 +99,7 @@ int main(int argc, char** argv) {
 		null, 0,    50.0,    25.0,     5.0,     5.0,     1.0,     3.0,     6.0,    null));
 	create_testcase_for(profiles); }
 	
-    { IfcSchema::IfcProfileDef::list profiles (new IfcTemplatedEntityList<IfcSchema::IfcProfileDef>());
+    { IfcSchema::IfcProfileDef::list::ptr profiles (new IfcSchema::IfcProfileDef::list);
 	profiles->push(new Ifc2x3::IfcTShapeProfileDef(
 		IfcSchema::IfcProfileTypeEnum::IfcProfileType_AREA,
 		null, 0,    50.0,    25.0,     5.0,     5.0,    null,    null,    null,    null,    null,    null));
@@ -114,7 +114,7 @@ int main(int argc, char** argv) {
 		null, 0,    50.0,    25.0,     5.0,     5.0,     3.0,     2.0,     1.0,     2.0,     2.0,    null));
 	create_testcase_for(profiles); }
 	
-    { IfcSchema::IfcProfileDef::list profiles (new IfcTemplatedEntityList<IfcSchema::IfcProfileDef>());
+    { IfcSchema::IfcProfileDef::list::ptr profiles (new IfcSchema::IfcProfileDef::list);
 	profiles->push(new Ifc2x3::IfcZShapeProfileDef(
 		IfcSchema::IfcProfileTypeEnum::IfcProfileType_AREA,
 		null, 0,    50.0,    25.0,     5.0,     5.0,    null,    null));
@@ -123,7 +123,7 @@ int main(int argc, char** argv) {
 		null, 0,    50.0,    25.0,     5.0,     5.0,     2.0,     2.0));
 	create_testcase_for(profiles); }
 	
-    { IfcSchema::IfcProfileDef::list profiles (new IfcTemplatedEntityList<IfcSchema::IfcProfileDef>());
+    { IfcSchema::IfcProfileDef::list::ptr profiles (new IfcSchema::IfcProfileDef::list);
 	profiles->push(new Ifc2x3::IfcEllipseProfileDef(
 		IfcSchema::IfcProfileTypeEnum::IfcProfileType_AREA,
 		null, 0,    25.0,    15.0));
@@ -132,16 +132,19 @@ int main(int argc, char** argv) {
 		null, 0,    15.0,    25.0));
 	create_testcase_for(profiles); }
 	
-    { IfcSchema::IfcProfileDef::list profiles (new IfcTemplatedEntityList<IfcSchema::IfcProfileDef>());
+    { IfcSchema::IfcProfileDef::list::ptr profiles (new IfcSchema::IfcProfileDef::list);
 	profiles->push(new Ifc2x3::IfcIShapeProfileDef(
 		IfcSchema::IfcProfileTypeEnum::IfcProfileType_AREA,
 		null, 0,    25.0,    50.0,     5.0,     5.0,    null));
 	profiles->push(new Ifc2x3::IfcIShapeProfileDef(
 		IfcSchema::IfcProfileTypeEnum::IfcProfileType_AREA,
 		null, 0,    25.0,    50.0,     5.0,     5.0,     2.0));
+	profiles->push(new Ifc2x3::IfcAsymmetricIShapeProfileDef(
+		IfcSchema::IfcProfileTypeEnum::IfcProfileType_AREA,
+		null, 0,    25.0,    50.0,     5.0,     5.0,     2.0, 20.0, 10.0, 5.0, null));
 	create_testcase_for(profiles); }
 
-    { IfcSchema::IfcProfileDef::list profiles (new IfcTemplatedEntityList<IfcSchema::IfcProfileDef>());
+    { IfcSchema::IfcProfileDef::list::ptr profiles (new IfcSchema::IfcProfileDef::list);
 	profiles->push(new Ifc2x3::IfcLShapeProfileDef(
 		IfcSchema::IfcProfileTypeEnum::IfcProfileType_AREA,
 		null, 0,    50.0,    25.0,     5.0,     null,    null,    null,    null,    null));
@@ -156,7 +159,7 @@ int main(int argc, char** argv) {
 		null, 0,    50.0,    25.0,     5.0,      1.0,     2.0,     2.0,    null,    null));
 	create_testcase_for(profiles); }
 	
-    { IfcSchema::IfcProfileDef::list profiles (new IfcTemplatedEntityList<IfcSchema::IfcProfileDef>());
+    { IfcSchema::IfcProfileDef::list::ptr profiles (new IfcSchema::IfcProfileDef::list);
 	profiles->push(new Ifc2x3::IfcCShapeProfileDef(
 		IfcSchema::IfcProfileTypeEnum::IfcProfileType_AREA,
 		null, 0,    50.0,    25.0,     5.0,    10.0,    null,    null));
@@ -165,7 +168,7 @@ int main(int argc, char** argv) {
 		null, 0,    50.0,    25.0,     5.0,    10.0,     2.0,    null));
 	create_testcase_for(profiles); }
 
-    { IfcSchema::IfcProfileDef::list profiles (new IfcTemplatedEntityList<IfcSchema::IfcProfileDef>());
+    { IfcSchema::IfcProfileDef::list::ptr profiles (new IfcSchema::IfcProfileDef::list);
 	profiles->push(new Ifc2x3::IfcCircleProfileDef(
 		IfcSchema::IfcProfileTypeEnum::IfcProfileType_AREA,
 		null, 0,    25.0));
@@ -174,7 +177,7 @@ int main(int argc, char** argv) {
 		null, 0,    25.0,     5.0));
 	create_testcase_for(profiles); }
 	
-    { IfcSchema::IfcProfileDef::list profiles (new IfcTemplatedEntityList<IfcSchema::IfcProfileDef>());
+    { IfcSchema::IfcProfileDef::list::ptr profiles (new IfcSchema::IfcProfileDef::list);
 	profiles->push(new Ifc2x3::IfcRectangleProfileDef(
 		IfcSchema::IfcProfileTypeEnum::IfcProfileType_AREA,
 		null, 0,    50.0,    25.0));
@@ -189,7 +192,7 @@ int main(int argc, char** argv) {
 		null, 0,    50.0,    25.0,     5.0,     2.0,     4.0));
 	create_testcase_for(profiles); }
 	
-    { IfcSchema::IfcProfileDef::list profiles (new IfcTemplatedEntityList<IfcSchema::IfcProfileDef>());
+    { IfcSchema::IfcProfileDef::list::ptr profiles (new IfcSchema::IfcProfileDef::list);
 	profiles->push(new Ifc2x3::IfcTrapeziumProfileDef(
 		IfcSchema::IfcProfileTypeEnum::IfcProfileType_AREA,
 		null, 0,    50.0,    30.0,    25.0,     0.0));
diff --git a/src/ifcblender/io_import_scene_ifc/__init__.py b/src/ifcblender/io_import_scene_ifc/__init__.py
index 9a5b29b..b5493fa 100644
--- a/src/ifcblender/io_import_scene_ifc/__init__.py
+++ b/src/ifcblender/io_import_scene_ifc/__init__.py
@@ -30,27 +30,16 @@
     "description": "Import files in the "\
         "Industry Foundation Classes (.ifc) file format",
     "author": "Thomas Krijnen, IfcOpenShell",
-    "blender": (2, 5, 8),
-    "api": 37702,
+    "blender": (2, 73, 0),
     "location": "File > Import",
-    "warning": "",
-    "wiki_url": "http://sourceforge.net/apps/"\
-        "mediawiki/ifcopenshell/index.php",
-    "tracker_url": "http://sourceforge.net/tracker/?group_id=543113",
+    "tracker_url": "https://sourceforge.net/p/ifcopenshell/"\
+        "_list/tickets?source=navbar",
     "category": "Import-Export"}
 
-import sys   
-max_unicode = 0x110000-1 if sys.platform[0:5] == 'linux' else 0x10000-1
-wrong_unicode = max_unicode != sys.maxunicode
-if wrong_unicode:
-    print("\nWarning: wrong unicode representation detected, switching to "\
-        "compatibility layer for text transferral, may result in undefined "\
-        "behaviour, please use offical release from http://blender.org\n")
-    
 if "bpy" in locals():
     import imp
-    if "IfcImport" in locals():
-        imp.reload(IfcImport)
+    if "ifcopenshell" in locals():
+        imp.reload(ifcopenshell)
 
 import bpy
 import mathutils
@@ -70,54 +59,64 @@
     description="The STEP Datatype keyword")
 
 
-def import_ifc(filename, use_names, process_relations):
-    global wrong_unicode
-    from . import IfcImport
+def import_ifc(filename, use_names, process_relations, blender_booleans):
+    from . import ifcopenshell
+    from .ifcopenshell import geom as ifcopenshell_geom
     print("Reading %s..."%bpy.path.basename(filename))
-    if wrong_unicode:
-        valid_file = IfcImport.InitUCS2( 
-            ''.join(['\0']+['\0%s'%s for s in filename]+['\0\0'])
-        )
-    else:
-        valid_file = IfcImport.Init(filename)
+    settings = ifcopenshell_geom.settings()
+    settings.set(settings.DISABLE_OPENING_SUBTRACTIONS, blender_booleans)
+    iterator = ifcopenshell_geom.iterator(settings, filename)
+    valid_file = iterator.findContext()
     if not valid_file:
-        IfcImport.CleanUp()
         return False
     print("Done reading file")
     id_to_object = {}
     id_to_parent = {}
     id_to_matrix = {}
+    openings = []
     old_progress = -1
     print("Creating geometry...")
     while True:
-        ob = IfcImport.Get()
-        
-        if wrong_unicode:
-            ob_name = ''.join([chr(c) for c in ob.name_as_intvector()])
-            ob_type = ''.join([chr(c) for c in ob.type_as_intvector()])
-            ob_guid = ''.join([chr(c) for c in ob.guid_as_intvector()])
-        else:
-            ob_name, ob_type, ob_guid = ob.name, ob.type, ob.guid
-        
-        f = ob.mesh.faces
-        v = ob.mesh.verts
-        m = ob.matrix
-        t = ob_type[0:21]
-        nm = ob_name if len(ob_name) and use_names else ob_guid
+        ob = iterator.get()
+ 
+        f = ob.geometry.faces
+        v = ob.geometry.verts
+        mats = ob.geometry.materials
+        matids = ob.geometry.material_ids
+        m = ob.transformation.matrix.data
+        t = ob.type[0:21]
+        nm = ob.name if len(ob.name) and use_names else ob.guid
 
         verts = [[v[i], v[i + 1], v[i + 2]] \
             for i in range(0, len(v), 3)]
         faces = [[f[i], f[i + 1], f[i + 2]] \
             for i in range(0, len(f), 3)]
 
-        me = bpy.data.meshes.new('mesh%d' % ob.mesh.id)
+        me = bpy.data.meshes.new('mesh%d' % ob.geometry.id)
         me.from_pydata(verts, [], faces)
-        if t in bpy.data.materials:
-            mat = bpy.data.materials[t]
-            mat.use_fake_user = True
-        else:
-            mat = bpy.data.materials.new(t)
-        me.materials.append(mat)
+        
+        def add_material(mname, props):
+            if mname in bpy.data.materials:
+                mat = bpy.data.materials[mname]
+                mat.use_fake_user = True
+            else:
+                mat = bpy.data.materials.new(mname)
+                for k,v in props.items():
+                    setattr(mat, k, v)
+            me.materials.append(mat)
+                
+        needs_default = -1 in matids
+        if needs_default: add_material(t, {})
+        
+        for mat in mats:
+            props = {}
+            if mat.has_diffuse: props['diffuse_color'] = mat.diffuse
+            if mat.has_specular: props['specular_color'] = mat.specular
+            if mat.has_transparency and mat.transparency > 0:
+                props['alpha'] = 1.0 - mat.transparency
+                props['use_transparency'] = True
+            if mat.has_specularity: props['specular_hardness'] = mat.specularity
+            add_material(mat.name, props)
 
         bob = bpy.data.objects.new(nm, me)
         mat = mathutils.Matrix(([m[0], m[1], m[2], 0],
@@ -138,10 +137,12 @@ def import_ifc(filename, use_names, process_relations):
         bpy.ops.object.mode_set(mode='OBJECT')
 
         bob.ifc_id, bob.ifc_guid, bob.ifc_name, bob.ifc_type = \
-            ob.id, ob_guid, ob_name, ob_type
+            ob.id, ob.guid, ob.name, ob.type
 
-        bob.hide = ob_type == 'IfcSpace' or ob_type == 'IfcOpeningElement'
-        bob.hide_render = bob.hide
+        if ob.type == 'IfcSpace' or ob.type == 'IfcOpeningElement':
+            if not (ob.type == 'IfcOpeningElement' and blender_booleans):
+                bob.hide = bob.hide_render = True
+            bob.draw_type = 'WIRE'
         
         if ob.id not in id_to_object: id_to_object[ob.id] = []
         id_to_object[ob.id].append(bob)
@@ -149,11 +150,19 @@ def import_ifc(filename, use_names, process_relations):
         if ob.parent_id > 0:
             id_to_parent[ob.id] = ob.parent_id
             
-        progress = IfcImport.Progress() // 2
+        if blender_booleans and ob.type == 'IfcOpeningElement':
+            openings.append(ob.id)
+            
+        faces = me.polygons if hasattr(me, 'polygons') else me.faces
+        if len(faces) == len(matids):
+            for face, matid in zip(faces, matids):
+                face.material_index = matid + (1 if needs_default else 0)
+            
+        progress = iterator.progress() // 2
         if progress > old_progress:
             print("\r[" + "#" * progress + " " * (50 - progress) + "]", end="")
             old_progress = progress
-        if not IfcImport.Next():
+        if not iterator.next():
             break
 
     print("\rDone creating geometry" + " " * 30)
@@ -169,24 +178,13 @@ def import_ifc(filename, use_names, process_relations):
         if parent_id in id_to_object:
             bob = id_to_object[parent_id][0]
         else:
-            parent_ob = IfcImport.GetObject(parent_id)
+            parent_ob = iterator.getObject(parent_id)
             if parent_ob.id == -1:
                 bob = None
             else:
-                if wrong_unicode:
-                    parent_ob_name = ''.join(
-                        [chr(c) for c in parent_ob.name_as_intvector()])
-                    parent_ob_type = ''.join(
-                        [chr(c) for c in parent_ob.type_as_intvector()])
-                    parent_ob_guid = ''.join(
-                        [chr(c) for c in parent_ob.guid_as_intvector()])
-                else:
-                    parent_ob_name, parent_ob_type, parent_ob_guid = \
-                        parent_ob.name, parent_ob.type, parent_ob.guid
-                    
-                m = parent_ob.matrix
-                nm = parent_ob_name if len(parent_ob_name) and use_names \
-                    else parent_ob_guid
+                m = parent_ob.transformation.matrix.data
+                nm = parent_ob.name if len(parent_ob.name) and use_names \
+                    else parent_ob.guid
                 bob = bpy.data.objects.new(nm, None)
                 
                 mat = mathutils.Matrix((
@@ -201,7 +199,7 @@ def import_ifc(filename, use_names, process_relations):
 
                 bob.ifc_id = parent_ob.id
                 bob.ifc_name, bob.ifc_type, bob.ifc_guid = \
-                    parent_ob_name, parent_ob_type, parent_ob_guid
+                    parent_ob.name, parent_ob.type, parent_ob.guid
 
                 if parent_ob.parent_id > 0:
                     id_to_parent[parent_id] = parent_ob.parent_id
@@ -226,13 +224,19 @@ def import_ifc(filename, use_names, process_relations):
             
     if process_relations:
         print("Done processing relations")
-    
-    if not wrong_unicode:
-        txt = bpy.data.texts.new("%s.log"%bpy.path.basename(filename))
-        txt.from_string(IfcImport.GetLog())
+        
+    for opening_id in openings:
+        parent_id = id_to_parent[opening_id]
+        if parent_id in id_to_object:
+            parent_ob = id_to_object[parent_id][0]
+            for opening_ob in id_to_object[opening_id]:
+                mod = parent_ob.modifiers.new("opening", "BOOLEAN")
+                mod.operation = "DIFFERENCE"
+                mod.object = opening_ob
+        
+    txt = bpy.data.texts.new("%s.log"%bpy.path.basename(filename))
+    txt.from_string(iterator.getLog())
 
-    IfcImport.CleanUp()
-    
     return True
 
 
@@ -251,15 +255,13 @@ class ImportIFC(bpy.types.Operator, ImportHelper):
             " relations to parenting" \
             " (warning: may be slow on large files)",
         default=False)
+    blender_booleans = BoolProperty(name="Use Blender booleans",
+        description="Use Blender boolean modifiers for opening" \
+            " elements",
+        default=False)
 
     def execute(self, context):
-        global wrong_unicode
-        if wrong_unicode and sys.platform[0:5] != 'linux':
-            self.report({'ERROR'},
-                'Your version of Blender is incompatible with IfcBlender\n' \
-                'Please use the offical release from http://blender.org instead'
-            )
-        elif not import_ifc(self.filepath, self.use_names, self.process_relations):
+        if not import_ifc(self.filepath, self.use_names, self.process_relations, self.blender_booleans):
             self.report({'ERROR'},
                 'Unable to parse .ifc file or no geometrical entities found'
             )
diff --git a/src/ifcconvert/ColladaSerializer.cpp b/src/ifcconvert/ColladaSerializer.cpp
index 908022a..7f69d2d 100644
--- a/src/ifcconvert/ColladaSerializer.cpp
+++ b/src/ifcconvert/ColladaSerializer.cpp
@@ -35,7 +35,7 @@ std::string collada_id(const std::string& s) {
 	return id;
 }
 
-void ColladaSerializer::ColladaExporter::ColladaGeometries::addFloatSource(const std::string& mesh_id, const std::string& suffix, const std::vector<float>& floats, const char* coords /* = "XYZ" */) {
+void ColladaSerializer::ColladaExporter::ColladaGeometries::addFloatSource(const std::string& mesh_id, const std::string& suffix, const std::vector<double>& floats, const char* coords /* = "XYZ" */) {
 	COLLADASW::FloatSource source(mSW);
 	source.setId(mesh_id + suffix);
 	source.setArrayId(mesh_id + suffix + COLLADASW::LibraryGeometries::ARRAY_ID_SUFFIX);
@@ -45,13 +45,18 @@ void ColladaSerializer::ColladaExporter::ColladaGeometries::addFloatSource(const
 		source.getParameterNameList().push_back(std::string(1, coords[i]));
 	}
 	source.prepareToAppendValues();
-	for (std::vector<float>::const_iterator it = floats.begin(); it != floats.end(); ++it) {
+	for (std::vector<double>::const_iterator it = floats.begin(); it != floats.end(); ++it) {
 		source.appendValues(*it);
 	}
 	source.finish();
 }
 			
-void ColladaSerializer::ColladaExporter::ColladaGeometries::write(const std::string mesh_id, const std::string& default_material_name, const std::vector<float>& positions, const std::vector<float>& normals, const std::vector<int>& indices, const std::vector<int> material_ids, const std::vector<IfcGeomObjects::Material>& materials) {
+void ColladaSerializer::ColladaExporter::ColladaGeometries::write(const std::string mesh_id, const std::string& default_material_name, const std::vector<double>& positions, const std::vector<double>& normals, const std::vector<int>& indices, const std::vector<int> material_ids, const std::vector<IfcGeom::Material>& materials) {
+	// The goal of the IfcGeom::Iterator is to filter out empty geometries, but
+	// since this function would crash trying to deference the material_ids in
+	// that case, a hard return statement is added just in case.
+	if (indices.empty()) return;
+
 	openMesh(mesh_id);
 
 	// The normals vector can be empty for example when the WELD_VERTICES setting is used.
@@ -70,17 +75,13 @@ void ColladaSerializer::ColladaExporter::ColladaGeometries::write(const std::str
 	
 	std::vector<int>::const_iterator index_range_start = indices.begin();
 	std::vector<int>::const_iterator material_it = material_ids.begin();
-	int previous_material_id = -2;
+	int previous_material_id = -1;
 	for (std::vector<int>::const_iterator it = indices.begin(); ; it += 3) {
-		const int current_material_id = material_it == material_ids.end()
-			? -3
-			: *(material_it++);
+		const int current_material_id = *(material_it++);
 		const int num_triangles = std::distance(index_range_start, it) / 3;
 		if ((previous_material_id != current_material_id && num_triangles > 0) || (it == indices.end())) {
 			COLLADASW::Triangles triangles(mSW);
-			triangles.setMaterial(collada_id(previous_material_id < 0
-				? default_material_name
-				: materials[previous_material_id].name()));
+			triangles.setMaterial(materials[previous_material_id].name());
 			triangles.setCount(num_triangles);
 			int offset = 0;
 			triangles.getInputList().push_back(COLLADASW::Input(COLLADASW::InputSemantic::VERTEX,"#" + mesh_id + COLLADASW::LibraryGeometries::VERTICES_ID_SUFFIX, offset++ ) );
@@ -113,7 +114,7 @@ void ColladaSerializer::ColladaExporter::ColladaGeometries::close() {
 	closeLibrary();
 }
 			
-void ColladaSerializer::ColladaExporter::ColladaScene::add(const std::string& node_id, const std::string& node_name, const std::string& geom_name, const std::vector<std::string>& material_ids, const std::vector<float>& matrix) {
+void ColladaSerializer::ColladaExporter::ColladaScene::add(const std::string& node_id, const std::string& node_name, const std::string& geom_name, const std::vector<std::string>& material_ids, const std::vector<double>& matrix) {
 	if (!scene_opened) {
 		openVisualScene(scene_id);
 		scene_opened = true;
@@ -155,7 +156,7 @@ void ColladaSerializer::ColladaExporter::ColladaScene::write() {
 	}
 }
 		
-void ColladaSerializer::ColladaExporter::ColladaMaterials::ColladaEffects::write(const IfcGeomObjects::Material& material) {
+void ColladaSerializer::ColladaExporter::ColladaMaterials::ColladaEffects::write(const IfcGeom::Material& material) {
 	openEffect(collada_id(material.name()) + "-fx");
 	COLLADASW::EffectProfile effect(mSW);
 	effect.setShaderType(COLLADASW::EffectProfile::LAMBERT);
@@ -186,20 +187,20 @@ void ColladaSerializer::ColladaExporter::ColladaMaterials::ColladaEffects::close
 	closeLibrary();
 }
 			
-void ColladaSerializer::ColladaExporter::ColladaMaterials::add(const IfcGeomObjects::Material& material) {
+void ColladaSerializer::ColladaExporter::ColladaMaterials::add(const IfcGeom::Material& material) {
 	if (!contains(material)) {
 		effects.write(material);
 		materials.push_back(material);
 	}
 }
 
-bool ColladaSerializer::ColladaExporter::ColladaMaterials::contains(const IfcGeomObjects::Material& material) {
+bool ColladaSerializer::ColladaExporter::ColladaMaterials::contains(const IfcGeom::Material& material) {
 	return std::find(materials.begin(), materials.end(), material) != materials.end();
 }
 
 void ColladaSerializer::ColladaExporter::ColladaMaterials::write() {
 	effects.close();
-	for (std::vector<IfcGeomObjects::Material>::const_iterator it = materials.begin(); it != materials.end(); ++it) {
+	for (std::vector<IfcGeom::Material>::const_iterator it = materials.begin(); it != materials.end(); ++it) {
 		const std::string& material_name = collada_id((*it).name());
 		openMaterial(material_name);
 		addInstanceEffect("#" + material_name + "-fx");
@@ -218,18 +219,10 @@ void ColladaSerializer::ColladaExporter::startDocument(const std::string& unit_n
 	asset.add();
 }
 
-void ColladaSerializer::ColladaExporter::writeTesselated(const std::string& guid, const std::string& name, const std::string& type, int obj_id, const std::vector<float>& matrix, const std::vector<float>& vertices, const std::vector<float>& normals, const std::vector<int>& indices, const std::vector<int>& material_ids, const std::vector<IfcGeomObjects::Material>& _materials) {
-	const IfcGeomObjects::Material default_for_type = IfcGeomObjects::Material(IfcGeom::get_default_style(type));
+void ColladaSerializer::ColladaExporter::write(const std::string& guid, const std::string& name, const std::string& type, int obj_id, const std::vector<double>& matrix, const std::vector<double>& vertices, const std::vector<double>& normals, const std::vector<int>& indices, const std::vector<int>& material_ids, const std::vector<IfcGeom::Material>& _materials) {
 	std::vector<std::string> material_references;
-	const bool needs_default = std::find(material_ids.begin(), material_ids.end(), -1) != material_ids.end();
-	if (needs_default) {
-		if (!materials.contains(default_for_type)) {
-			materials.add(default_for_type);
-		}
-		material_references.push_back(collada_id(default_for_type.name()));
-	}	
-	for (std::vector<IfcGeomObjects::Material>::const_iterator it = _materials.begin(); it != _materials.end(); ++it) {
-		const IfcGeomObjects::Material& material = *it;
+	for (std::vector<IfcGeom::Material>::const_iterator it = _materials.begin(); it != _materials.end(); ++it) {
+		const IfcGeom::Material& material = *it;
 		if (!materials.contains(material)) {
 			materials.add(material);
 		}
@@ -273,9 +266,9 @@ void ColladaSerializer::writeHeader() {
 	exporter.startDocument(unit_name, unit_magnitude);
 }
 
-void ColladaSerializer::writeTesselated(const IfcGeomObjects::IfcGeomObject* o) {
-	const IfcGeomObjects::IfcRepresentationTriangulation& mesh = o->mesh();
-	exporter.writeTesselated(o->guid(), o->name(), o->type(), o->id(), o->matrix(), mesh.verts(), mesh.normals(), mesh.faces(), mesh.material_ids(), mesh.materials());
+void ColladaSerializer::write(const IfcGeom::TriangulationElement<double>* o) {
+	const IfcGeom::Representation::Triangulation<double>& mesh = o->geometry();
+	exporter.write(o->guid(), o->name(), o->type(), o->id(), o->transformation().matrix().data(), mesh.verts(), mesh.normals(), mesh.faces(), mesh.material_ids(), mesh.materials());
 }
 
 void ColladaSerializer::finalize() {
diff --git a/src/ifcconvert/ColladaSerializer.h b/src/ifcconvert/ColladaSerializer.h
index 7bb7f80..6c3618f 100644
--- a/src/ifcconvert/ColladaSerializer.h
+++ b/src/ifcconvert/ColladaSerializer.h
@@ -35,7 +35,7 @@
 #include <COLLADASWBaseInputElement.h>
 #include <COLLADASWAsset.h>
 
-#include "../ifcgeom/IfcGeomObjects.h"
+#include "../ifcgeom/IfcGeomIterator.h"
 
 #include "../ifcconvert/GeometrySerializer.h"
 
@@ -51,8 +51,8 @@ class ColladaSerializer : public GeometrySerializer
 			explicit ColladaGeometries(COLLADASW::StreamWriter& stream)
 				: COLLADASW::LibraryGeometries(&stream)
 			{}
-			void addFloatSource(const std::string& mesh_id, const std::string& suffix, const std::vector<float>& floats, const char* coords = "XYZ");
-			void write(const std::string mesh_id, const std::string& default_material_name, const std::vector<float>& positions, const std::vector<float>& normals, const std::vector<int>& indices, const std::vector<int> material_ids, const std::vector<IfcGeomObjects::Material>& materials);
+			void addFloatSource(const std::string& mesh_id, const std::string& suffix, const std::vector<double>& floats, const char* coords = "XYZ");
+			void write(const std::string mesh_id, const std::string& default_material_name, const std::vector<double>& positions, const std::vector<double>& normals, const std::vector<int>& indices, const std::vector<int> material_ids, const std::vector<IfcGeom::Material>& materials);
 			void close();
 		};
 		class ColladaScene : public COLLADASW::LibraryVisualScenes
@@ -66,7 +66,7 @@ class ColladaSerializer : public GeometrySerializer
 				, scene_id(scene_id)
 				, scene_opened(false)			
 			{}
-			void add(const std::string& node_id, const std::string& node_name, const std::string& geom_name, const std::vector<std::string>& material_ids, const std::vector<float>& matrix);
+			void add(const std::string& node_id, const std::string& node_name, const std::string& geom_name, const std::vector<std::string>& material_ids, const std::vector<double>& matrix);
 			void write();
 		};
 		class ColladaMaterials : public COLLADASW::LibraryMaterials
@@ -78,34 +78,34 @@ class ColladaSerializer : public GeometrySerializer
 				explicit ColladaEffects(COLLADASW::StreamWriter& stream)
 					: COLLADASW::LibraryEffects(&stream)
 				{}
-				void write(const IfcGeomObjects::Material& material);
+				void write(const IfcGeom::Material& material);
 				void close();
 			};
-			std::vector<IfcGeomObjects::Material> materials;
+			std::vector<IfcGeom::Material> materials;
 			ColladaEffects effects;
 		public:
 			explicit ColladaMaterials(COLLADASW::StreamWriter& stream)
 				: COLLADASW::LibraryMaterials(&stream)
 				, effects(stream)
 			{}
-			void add(const IfcGeomObjects::Material& material);
-			bool contains(const IfcGeomObjects::Material& material);
+			void add(const IfcGeom::Material& material);
+			bool contains(const IfcGeom::Material& material);
 			void write();
 		};
 		class DeferredObject {
 		public:
 			std::string guid, name, type;
 			int obj_id;
-			std::vector<float> matrix;
-			std::vector<float> vertices;
-			std::vector<float> normals;
+			std::vector<double> matrix;
+			std::vector<double> vertices;
+			std::vector<double> normals;
 			std::vector<int> indices;
 			std::vector<int> material_ids;
-			std::vector<IfcGeomObjects::Material> materials;
+			std::vector<IfcGeom::Material> materials;
 			std::vector<std::string> material_references;
-			DeferredObject(const std::string& guid, const std::string& name, const std::string& type, int obj_id, const std::vector<float>& matrix, const std::vector<float>& vertices,
-				const std::vector<float>& normals, const std::vector<int>& indices, const std::vector<int>& material_ids, 
-				const std::vector<IfcGeomObjects::Material>& materials, const std::vector<std::string>& material_references)
+			DeferredObject(const std::string& guid, const std::string& name, const std::string& type, int obj_id, const std::vector<double>& matrix, const std::vector<double>& vertices,
+				const std::vector<double>& normals, const std::vector<int>& indices, const std::vector<int>& material_ids, 
+				const std::vector<IfcGeom::Material>& materials, const std::vector<std::string>& material_references)
 				: guid(guid)
 				, name(name)
 				, type(type)
@@ -136,7 +136,7 @@ class ColladaSerializer : public GeometrySerializer
 		std::vector<DeferredObject> deferreds;
 		virtual ~ColladaExporter() {}
 		void startDocument(const std::string& unit_name, float unit_magnitude);
-		void writeTesselated(const std::string& guid, const std::string& name, const std::string& type, int obj_id, const std::vector<float>& matrix, const std::vector<float>& vertices, const std::vector<float>& normals, const std::vector<int>& indices, const std::vector<int>& material_ids, const std::vector<IfcGeomObjects::Material>& materials);
+		void write(const std::string& guid, const std::string& name, const std::string& type, int obj_id, const std::vector<double>& matrix, const std::vector<double>& vertices, const std::vector<double>& normals, const std::vector<int>& indices, const std::vector<int>& material_ids, const std::vector<IfcGeom::Material>& materials);
 		void endDocument();
 	};
 	ColladaExporter exporter;
@@ -149,14 +149,15 @@ class ColladaSerializer : public GeometrySerializer
 	{}
 	bool ready();
 	void writeHeader();
-	void writeTesselated(const IfcGeomObjects::IfcGeomObject* o);
-	void writeShapeModel(const IfcGeomObjects::IfcGeomShapeModelObject* o) {}
+	void write(const IfcGeom::TriangulationElement<double>* o);
+	void write(const IfcGeom::BRepElement<double>* o) {}
 	void finalize();
 	bool isTesselated() const { return true; }
 	void setUnitNameAndMagnitude(const std::string& name, float magnitude) {
 		unit_name = name;
 		unit_magnitude = magnitude;
 	}
+	void setFile(IfcParse::IfcFile*) {}
 };
 
 #endif
diff --git a/src/ifcconvert/GeometrySerializer.h b/src/ifcconvert/GeometrySerializer.h
index c489506..0a62def 100644
--- a/src/ifcconvert/GeometrySerializer.h
+++ b/src/ifcconvert/GeometrySerializer.h
@@ -20,17 +20,16 @@
 #ifndef GEOMETRYSERIALIZER_H
 #define GEOMETRYSERIALIZER_H
 
-#include "../ifcgeom/IfcGeomObjects.h"
+#include "../ifcconvert/Serializer.h"
+#include "../ifcgeom/IfcGeomIterator.h"
 
-class GeometrySerializer {
+class GeometrySerializer : public Serializer {
 public:
-	virtual bool ready() = 0;
-	virtual void writeHeader() = 0;
-	virtual void finalize() = 0;
-	virtual bool isTesselated() const = 0;
 	virtual ~GeometrySerializer() {} 
-	virtual void writeTesselated(const IfcGeomObjects::IfcGeomObject* o) = 0;
-	virtual void writeShapeModel(const IfcGeomObjects::IfcGeomShapeModelObject* o) = 0;
+
+	virtual bool isTesselated() const = 0;
+	virtual void write(const IfcGeom::TriangulationElement<double>* o) = 0;
+	virtual void write(const IfcGeom::BRepElement<double>* o) = 0;
 	virtual void setUnitNameAndMagnitude(const std::string& name, float magnitude) = 0;
 };
 
diff --git a/src/ifcconvert/IfcConvert.cpp b/src/ifcconvert/IfcConvert.cpp
index f700e93..12dd686 100644
--- a/src/ifcconvert/IfcConvert.cpp
+++ b/src/ifcconvert/IfcConvert.cpp
@@ -33,12 +33,13 @@
 
 #include <boost/program_options.hpp>
 
-#include "../ifcgeom/IfcGeomObjects.h"
+#include "../ifcgeom/IfcGeomIterator.h"
 
 #include "../ifcconvert/ColladaSerializer.h"
 #include "../ifcconvert/IgesSerializer.h"
 #include "../ifcconvert/StepSerializer.h"
 #include "../ifcconvert/WavefrontObjSerializer.h"
+#include "../ifcconvert/XmlSerializer.h"
 
 void printVersion() {
 	std::cerr << "IfcOpenShell IfcConvert " << IFCOPENSHELL_VERSION << std::endl;
@@ -55,6 +56,7 @@ void printUsage(const boost::program_options::options_description& generic_optio
 #endif
 	std::cerr << "  .stp   STEP           Standard for the Exchange of Product Data" << std::endl
 	          << "  .igs   IGES           Initial Graphics Exchange Specification" << std::endl
+	          << "  .xml   XML            Property definitions and decomposition tree" << std::endl
 	          << std::endl
 	          << "Command line options" << std::endl << generic_options << std::endl
 	          << "Advanced options" << std::endl << geom_options << std::endl;
@@ -84,35 +86,48 @@ int main(int argc, char** argv) {
 		("input-file", boost::program_options::value<std::string>(), "input IFC file")
 		("output-file", boost::program_options::value<std::string>(), "output geometry file");
 
-	std::vector<std::string> ignore_types_vector;
+	std::vector<std::string> entity_vector;
 	boost::program_options::options_description geom_options;
 	geom_options.add_options()
-		("weld-vertices", "Specifies whether vertices are welded, meaning that the coordinates "
-						  "vector will only contain unique xyz-triplets. This results in a "
-					      "manifold mesh which is useful for modelling applications, but might "
-					      "result in unwanted shading artifacts in rendering applications.")
-		("use-world-coords", "Specifies whether to apply the local placements of building elements "
-						     "directly to the coordinates of the representation mesh rather than "
-						     "to represent the local placement in the 4x3 matrix, which will in that "
-						     "case be the identity matrix.")
-		("convert-back-units", "Specifies whether to convert back geometrical output back to the "
-							   "unit of measure in which it is defined in the IFC file. Default is "
-							   "to use meters.")
-		("sew-shells", "Specifies whether to sew the faces of IfcConnectedFaceSets together. This is a "
-					   "potentially time consuming operation, but guarantees a consistent orientation "
-					   "of surface normals, even if the faces are not properly oriented in the IFC file.")
-		("merge-boolean-operands", "Specifies whether to merge all IfcOpeningElement operands into a single "
-								   "operand before applying the subtraction operation. This may "
-								   "introduce a performance improvement at the risk of failing, in "
-								   "which case the subtraction is applied one-by-one.")
-		("force-ccw-face-orientation", "Recompute topological face normals using Newell's Method to "
-									   "guarantee that face vertices are defined in a Counter Clock "
-									   "Wise order, even if the faces are not part of a closed shell.")
-		("disable-opening-subtractions", "Specifies whether to disable the boolean subtraction of "
-										 "IfcOpeningElement Representations from their RelatingElements.")
-		("ignore-types", boost::program_options::value< std::vector<std::string> >(&ignore_types_vector)->multitoken(), 
-			"A list of IFC datatype keywords that should not be included in the geometrical output. "
-			"Defaults to IfcOpeningElement and IfcSpace");
+		("weld-vertices",
+			"Specifies whether vertices are welded, meaning that the coordinates "
+			"vector will only contain unique xyz-triplets. This results in a "
+			"manifold mesh which is useful for modelling applications, but might "
+			"result in unwanted shading artefacts in rendering applications.")
+		("use-world-coords", 
+			"Specifies whether to apply the local placements of building elements "
+			"directly to the coordinates of the representation mesh rather than "
+			"to represent the local placement in the 4x3 matrix, which will in that "
+			"case be the identity matrix.")
+		("convert-back-units",
+			"Specifies whether to convert back geometrical output back to the "
+			"unit of measure in which it is defined in the IFC file. Default is "
+			"to use meters.")
+		("sew-shells", 
+			"Specifies whether to sew the faces of IfcConnectedFaceSets together. "
+			"This is a potentially time consuming operation, but guarantees a "
+			"consistent orientation of surface normals, even if the faces are not "
+			"properly oriented in the IFC file.")
+		("merge-boolean-operands", 
+			"Specifies whether to merge all IfcOpeningElement operands into a single "
+			"operand before applying the subtraction operation. This may "
+			"introduce a performance improvement at the risk of failing, in "
+			"which case the subtraction is applied one-by-one.")
+		("force-ccw-face-orientation", 
+			"Recompute topological face normals using Newell's Method to "
+			"guarantee that face vertices are defined in a Counter Clock "
+			"Wise order, even if the faces are not part of a closed shell.")
+		("disable-opening-subtractions", 
+			"Specifies whether to disable the boolean subtraction of "
+			"IfcOpeningElement Representations from their RelatingElements.")
+		("include", 
+			"Specifies that the entities listed after --entities are to be included")
+		("exclude", 
+			"Specifies that the entities listed after --entities are to be excluded")
+		("entities", boost::program_options::value< std::vector<std::string> >(&entity_vector)->multitoken(), 
+			"A list of entities that should be included in or excluded from the "
+			"geometrical output, depending on whether --ignore or --include is "
+			"specified. Defaults to IfcOpeningElement and IfcSpace to be excluded.");
 	
 	boost::program_options::options_description cmdline_options;
 	cmdline_options.add(generic_options).add(fileio_options).add(geom_options);
@@ -128,13 +143,19 @@ int main(int argc, char** argv) {
 	} catch (const boost::program_options::unknown_option& e) {
 		std::cerr << "[Error] Unknown option '" << e.get_option_name() << "'" << std::endl << std::endl;
 		// Usage information will be emitted below
+	} catch (...) {
+		// Catch other errors such as invalid command line syntax
 	}
 	boost::program_options::notify(vmap);
 
 	if (vmap.count("version")) {
 		printVersion();
-		return 1;
+		return 0;
 	} else if (vmap.count("help") || !vmap.count("input-file")) {
+		printUsage(generic_options, geom_options);
+		return vmap.count("help") ? 0 : 1;
+	} else if (vmap.count("include") && vmap.count("exclude")) {
+		std::cerr << "[Error] --include and --ignore can not be specified together" << std::endl;
 		printUsage(generic_options, geom_options);
 		return 1;
 	}
@@ -147,20 +168,22 @@ int main(int argc, char** argv) {
 	const bool merge_boolean_operands = vmap.count("merge-boolean-operands") != 0;
 	const bool force_ccw_face_orientation = vmap.count("force-ccw-face-orientation") != 0;
 	const bool disable_opening_subtractions = vmap.count("disable-opening-subtractions") != 0;
+	const bool include_entities = vmap.count("include") != 0;
 
 	// Gets the set ifc types to be ignored from the command line. 
-	std::set<std::string> ignore_types;
-	for (std::vector<std::string>::const_iterator it = ignore_types_vector.begin(); it != ignore_types_vector.end(); ++it) {
+	std::set<std::string> entities;
+	for (std::vector<std::string>::const_iterator it = entity_vector.begin(); it != entity_vector.end(); ++it) {
 		std::string lowercase_type = *it;
 		for (std::string::iterator c = lowercase_type.begin(); c != lowercase_type.end(); ++c) {
 			*c = tolower(*c);
 		}
-		ignore_types.insert(lowercase_type);
+		entities.insert(lowercase_type);
 	}
-	// If none are specified these are the defaults to skip from output
-	if (ignore_types_vector.empty()) {
-		ignore_types.insert("ifcopeningelement");
-		ignore_types.insert("ifcspace");
+
+	// If no entities are specified these are the defaults to skip from output
+	if (entity_vector.empty()) {
+		entities.insert("ifcopeningelement");
+		entities.insert("ifcspace");
 	}
 	
 	const std::string input_filename = vmap["input-file"].as<std::string>();
@@ -175,14 +198,6 @@ int main(int argc, char** argv) {
 		return 1;
 	}
 
-	IfcGeomObjects::Settings(IfcGeomObjects::USE_WORLD_COORDS, use_world_coords);
-	IfcGeomObjects::Settings(IfcGeomObjects::WELD_VERTICES, weld_vertices);
-	IfcGeomObjects::Settings(IfcGeomObjects::SEW_SHELLS, sew_shells);
-	IfcGeomObjects::Settings(IfcGeomObjects::CONVERT_BACK_UNITS, convert_back_units);
-	IfcGeomObjects::Settings(IfcGeomObjects::FASTER_BOOLEANS, merge_boolean_operands);
-	IfcGeomObjects::Settings(IfcGeomObjects::FORCE_CCW_FACE_ORIENTATION, force_ccw_face_orientation);
-	IfcGeomObjects::Settings(IfcGeomObjects::DISABLE_OPENING_SUBTRACTIONS, disable_opening_subtractions);
-
 	std::string output_extension = output_filename.substr(output_filename.size()-4);
 	for (std::string::iterator c = output_extension.begin(); c != output_extension.end(); ++c) {
 		*c = tolower(*c);
@@ -191,12 +206,40 @@ int main(int argc, char** argv) {
 	Logger::SetOutput(&std::cout, &log_stream);
 	Logger::Verbosity(verbose ? Logger::LOG_NOTICE : Logger::LOG_ERROR);
 
+	if (output_extension == ".xml") {
+		int exit_code = 1;
+		try {
+			XmlSerializer s(output_filename);
+			IfcParse::IfcFile f;
+			if (!f.Init(input_filename)) {
+				Logger::Message(Logger::LOG_ERROR, "Unable to parse .ifc file");
+			} else {
+				s.setFile(&f);
+				s.finalize();
+				exit_code = 0;
+			}
+		} catch (...) {}
+		write_log();
+		return exit_code;
+	}
+
+	IfcGeom::IteratorSettings settings;
+
+	settings.set(IfcGeom::IteratorSettings::APPLY_DEFAULT_MATERIALS,      true);
+	settings.set(IfcGeom::IteratorSettings::USE_WORLD_COORDS,             use_world_coords);
+	settings.set(IfcGeom::IteratorSettings::WELD_VERTICES,                weld_vertices);
+	settings.set(IfcGeom::IteratorSettings::SEW_SHELLS,                   sew_shells);
+	settings.set(IfcGeom::IteratorSettings::CONVERT_BACK_UNITS,           convert_back_units);
+	settings.set(IfcGeom::IteratorSettings::FASTER_BOOLEANS,              merge_boolean_operands);
+	settings.set(IfcGeom::IteratorSettings::FORCE_CCW_FACE_ORIENTATION,   force_ccw_face_orientation);
+	settings.set(IfcGeom::IteratorSettings::DISABLE_OPENING_SUBTRACTIONS, disable_opening_subtractions);
+
 	GeometrySerializer* serializer;
 	if (output_extension == ".obj") {
 		const std::string mtl_filename = output_filename.substr(0,output_filename.size()-3) + "mtl";
 		if (!use_world_coords) {
 			Logger::Message(Logger::LOG_NOTICE, "Using world coords when writing WaveFront OBJ files");
-			IfcGeomObjects::Settings(IfcGeomObjects::USE_WORLD_COORDS, true);
+			settings.set(IfcGeom::IteratorSettings::USE_WORLD_COORDS, true);
 		}
 		serializer = new WaveFrontOBJSerializer(output_filename, mtl_filename);
 #ifdef WITH_OPENCOLLADA
@@ -217,30 +260,43 @@ int main(int argc, char** argv) {
 		return 1;
 	}
 
-	if (!serializer->ready()) {
-		Logger::Message(Logger::LOG_ERROR, "Unable to open output file for writing");
-		write_log();
-		return 1;
-	}
-
 	if (!serializer->isTesselated()) {
-		IfcGeomObjects::Settings(IfcGeomObjects::DISABLE_TRIANGULATION, true);
 		if (weld_vertices) {
 			Logger::Message(Logger::LOG_NOTICE, "Weld vertices setting ignored when writing STEP or IGES files");
 		}
+		settings.disable_triangulation() = true;
+	}
+
+	IfcGeom::Iterator<double> context_iterator(settings, input_filename);
+
+	try {
+		if (include_entities) {
+			context_iterator.includeEntities(entities);
+		} else {
+			context_iterator.excludeEntities(entities);
+		}
+	} catch (const IfcParse::IfcException& e) {
+		std::cout << "[Error] " << e.what() << std::endl;
+		return 1;
+	}
+
+	if (!serializer->ready()) {
+		Logger::Message(Logger::LOG_ERROR, "Unable to open output file for writing");
+		write_log();
+		return 1;
 	}
 
 	time_t start,end;
 	time(&start);
-	// Parse the file supplied in argv[1]. Returns true on succes.
-	if ( ! IfcGeomObjects::Init(input_filename, &std::cout, &log_stream) ) {
+	
+	if (!context_iterator.findContext()) {
 		Logger::Message(Logger::LOG_ERROR, "Unable to parse .ifc file or no geometrical entities found");
 		write_log();
 		return 1;
 	}
 
 	if (convert_back_units) {
-		serializer->setUnitNameAndMagnitude(IfcGeomObjects::GetUnitName(), IfcGeomObjects::GetUnitMagnitude());
+		serializer->setUnitNameAndMagnitude(context_iterator.getUnitName(), static_cast<const float>(context_iterator.getUnitMagnitude()));
 	} else {
 		serializer->setUnitNameAndMagnitude("METER", 1.0f);
 	}
@@ -252,35 +308,30 @@ int main(int argc, char** argv) {
 	int old_progress = -1;
 	Logger::Status("Creating geometry...");
 
-	// The functions IfcGeomObjects::Get() and IfcGeomObjects::Next() wrap an iterator of all geometrical entities in the Ifc file.
-	// IfcGeomObjects::Get() returns an IfcGeomObjects::IfcGeomObject (see IfcGeomObjects.h for definition)
-	// IfcGeomObjects::Next() is used to poll whether more geometrical entities are available    
+	// The functions IfcGeom::Iterator::get() and IfcGeom::Iterator::next() 
+	// wrap an iterator of all geometrical products in the Ifc file. 
+	// IfcGeom::Iterator::get() returns an IfcGeom::TriangulationElement or 
+	// -BRepElement pointer, based on current settings. (see IfcGeomIterator.h 
+	// for definition) IfcGeom::Iterator::next() is used to poll whether more 
+	// geometrical entities are available. None of these functions throw 
+	// exceptions, neither for parsing errors or geometrical errors. Upon 
+	// calling next() the entity to be returned has already been processed, a 
+	// true return value guarantees that a successfully processed product is 
+	// available. 
 	do {
-		const IfcGeomObjects::IfcObject* geom_object;
+		const IfcGeom::Element<double>* geom_object = context_iterator.get();
 		
 		if (serializer->isTesselated()) {
-			geom_object = IfcGeomObjects::Get();
-		} else {
-			geom_object = IfcGeomObjects::GetShapeModel();
-		}
-
-		std::string lowercase_type = geom_object->type();
-		for (std::string::iterator c = lowercase_type.begin(); c != lowercase_type.end(); ++c) {
-			*c = tolower(*c);
-		}
-		if (ignore_types.find(lowercase_type) != ignore_types.end()) continue;
-
-		if (serializer->isTesselated()) {
-			serializer->writeTesselated(static_cast<const IfcGeomObjects::IfcGeomObject*>(geom_object));
+			serializer->write(static_cast<const IfcGeom::TriangulationElement<double>*>(geom_object));
 		} else {
-			serializer->writeShapeModel(static_cast<const IfcGeomObjects::IfcGeomShapeModelObject*>(geom_object));
+			serializer->write(static_cast<const IfcGeom::BRepElement<double>*>(geom_object));
 		}
-
-		const int progress = IfcGeomObjects::Progress() / 2;
-		if ( old_progress!= progress ) Logger::ProgressBar(progress);
+		
+		const int progress = context_iterator.progress() / 2;
+		if (old_progress!= progress) Logger::ProgressBar(progress);
 		old_progress = progress;
 	
-	} while ( IfcGeomObjects::Next() );
+	} while (context_iterator.next());
 
 	serializer->finalize();
 	delete serializer;
@@ -292,6 +343,8 @@ int main(int argc, char** argv) {
 	time(&end);
 	int dif = (int) difftime (end,start);	
 	printf ("\nConversion took %d seconds\n", dif );
+
+	return 0;
 }
 
 void write_log() {
diff --git a/src/ifcconvert/IgesSerializer.h b/src/ifcconvert/IgesSerializer.h
index d18082c..8591af9 100644
--- a/src/ifcconvert/IgesSerializer.h
+++ b/src/ifcconvert/IgesSerializer.h
@@ -24,7 +24,7 @@
 #include <IGESControl_Writer.hxx>
 #include <Interface_Static.hxx>
 
-#include "../ifcgeom/IfcGeomObjects.h"
+#include "../ifcgeom/IfcGeomIterator.h"
 
 #include "../ifcconvert/OpenCascadeBasedSerializer.h"
 
diff --git a/src/ifcconvert/OpenCascadeBasedSerializer.cpp b/src/ifcconvert/OpenCascadeBasedSerializer.cpp
index 0bf3f0c..77bc7e7 100644
--- a/src/ifcconvert/OpenCascadeBasedSerializer.cpp
+++ b/src/ifcconvert/OpenCascadeBasedSerializer.cpp
@@ -24,6 +24,8 @@
 #include <BRepBuilderAPI_GTransform.hxx>
 #include <BRepBuilderAPI_Transform.hxx>
 
+#include <Standard_Version.hxx>
+
 #include "OpenCascadeBasedSerializer.h"
 
 bool OpenCascadeBasedSerializer::ready() {
@@ -34,18 +36,25 @@ bool OpenCascadeBasedSerializer::ready() {
 	return succeeded;
 }
 
-void OpenCascadeBasedSerializer::writeShapeModel(const IfcGeomObjects::IfcGeomShapeModelObject* o) {		
-	for (IfcGeom::IfcRepresentationShapeItems::const_iterator it = o->mesh().begin(); it != o->mesh().end(); ++ it) {
+void OpenCascadeBasedSerializer::write(const IfcGeom::BRepElement<double>* o) {		
+	for (IfcGeom::IfcRepresentationShapeItems::const_iterator it = o->geometry().begin(); it != o->geometry().end(); ++ it) {
 		gp_GTrsf gtrsf = it->Placement();
+
+		const std::vector<double>& matrix = o->transformation().matrix().data();
 		
-		// TODO:
-		gp_GTrsf o_trsf;
-		int k = 0;
-		for( int i = 1; i < 5; ++ i )
-			for ( int j = 1; j < 4; ++ j )
-				o_trsf.SetValue(j, i, o->matrix()[k++]);
-		
+		// Convert the matrix back into a transformation object. The tolerance values
+		// are taken into consideration to reconstruct the form of the transformation.
+		gp_Trsf o_trsf;
+		o_trsf.SetValues(
+			matrix[0], matrix[3], matrix[6], matrix[ 9],
+			matrix[1], matrix[4], matrix[7], matrix[10], 
+			matrix[2], matrix[5], matrix[8], matrix[11]
+#if OCC_VERSION_HEX < 0x60800
+			, Precision::Angular(), Precision::Confusion()
+#endif
+		);
 		gtrsf.PreMultiply(o_trsf);
+		
 		const TopoDS_Shape& s = it->Shape();			
 			
 		bool trsf_valid = false;
@@ -64,18 +73,18 @@ void OpenCascadeBasedSerializer::writeShapeModel(const IfcGeomObjects::IfcGeomSh
 }
 
 #define RATHER_SMALL (1e-3)
-#define ALMOST_THE_SAME(a,b) (fabs(a-b) < RATHER_SMALL)
+#define APPROXIMATELY_THE_SAME(a,b) (fabs(a-b) < RATHER_SMALL)
 
 const char* OpenCascadeBasedSerializer::getSymbolForUnitMagnitude(float mag) {
-	if (ALMOST_THE_SAME(mag, 0.001f)) {
+	if (APPROXIMATELY_THE_SAME(mag, 0.001f)) {
 		return "MM";
-	} else if (ALMOST_THE_SAME(mag, 0.01f)) {
+	} else if (APPROXIMATELY_THE_SAME(mag, 0.01f)) {
 		return "CM";
-	} else if (ALMOST_THE_SAME(mag, 1.0f)) {
+	} else if (APPROXIMATELY_THE_SAME(mag, 1.0f)) {
 		return "M";
-	} else if (ALMOST_THE_SAME(mag, 0.3048f)) {
+	} else if (APPROXIMATELY_THE_SAME(mag, 0.3048f)) {
 		return "FT";
-	} else if (ALMOST_THE_SAME(mag, 0.0254f)) {
+	} else if (APPROXIMATELY_THE_SAME(mag, 0.0254f)) {
 		return "INCH";
 	} else {
 		return 0;
diff --git a/src/ifcconvert/OpenCascadeBasedSerializer.h b/src/ifcconvert/OpenCascadeBasedSerializer.h
index 1547236..74a76ca 100644
--- a/src/ifcconvert/OpenCascadeBasedSerializer.h
+++ b/src/ifcconvert/OpenCascadeBasedSerializer.h
@@ -20,7 +20,7 @@
 #ifndef OPENCASCADEBASEDSERIALIZER_H
 #define OPENCASCADEBASEDSERIALIZER_H
 
-#include "../ifcgeom/IfcGeomObjects.h"
+#include "../ifcgeom/IfcGeomIterator.h"
 
 #include "../ifcconvert/GeometrySerializer.h"
 
@@ -38,9 +38,10 @@ class OpenCascadeBasedSerializer : public GeometrySerializer {
 	void writeMaterial(const IfcGeom::SurfaceStyle& style) {}
 	bool ready();
 	virtual void writeShape(const TopoDS_Shape& shape) = 0;
-	void writeTesselated(const IfcGeomObjects::IfcGeomObject* o) {}
-	void writeShapeModel(const IfcGeomObjects::IfcGeomShapeModelObject* o);
+	void write(const IfcGeom::TriangulationElement<double>* o) {}
+	void write(const IfcGeom::BRepElement<double>* o);
 	bool isTesselated() const { return false; }
+	void setFile(IfcParse::IfcFile*) {}
 };
 
 #endif
\ No newline at end of file
diff --git a/src/ifcconvert/Serializer.h b/src/ifcconvert/Serializer.h
new file mode 100644
index 0000000..ba5d6fa
--- /dev/null
+++ b/src/ifcconvert/Serializer.h
@@ -0,0 +1,35 @@
+/********************************************************************************
+ *                                                                              *
+ * This file is part of IfcOpenShell.                                           *
+ *                                                                              *
+ * IfcOpenShell is free software: you can redistribute it and/or modify         *
+ * it under the terms of the Lesser GNU General Public License as published by  *
+ * the Free Software Foundation, either version 3.0 of the License, or          *
+ * (at your option) any later version.                                          *
+ *                                                                              *
+ * IfcOpenShell 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                 *
+ * Lesser GNU General Public License for more details.                          *
+ *                                                                              *
+ * You should have received a copy of the Lesser GNU General Public License     *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.         *
+ *                                                                              *
+ ********************************************************************************/
+
+#ifndef SERIALIZER_H
+#define SERIALIZER_H
+
+#include "../ifcparse/IfcFile.h"
+
+class Serializer {
+public:
+	virtual ~Serializer() {}
+
+	virtual bool ready() = 0;
+	virtual void writeHeader() = 0;
+	virtual void finalize() = 0;
+	virtual void setFile(IfcParse::IfcFile*) = 0;
+};
+
+#endif
\ No newline at end of file
diff --git a/src/ifcconvert/StepSerializer.h b/src/ifcconvert/StepSerializer.h
index d0db600..4667104 100644
--- a/src/ifcconvert/StepSerializer.h
+++ b/src/ifcconvert/StepSerializer.h
@@ -24,7 +24,7 @@
 #include <STEPControl_Writer.hxx>
 #include <Interface_Static.hxx>
 
-#include "../ifcgeom/IfcGeomObjects.h"
+#include "../ifcgeom/IfcGeomIterator.h"
 
 #include "../ifcconvert/OpenCascadeBasedSerializer.h"
 
diff --git a/src/ifcconvert/WavefrontObjSerializer.cpp b/src/ifcconvert/WavefrontObjSerializer.cpp
index 60dea65..a931a30 100644
--- a/src/ifcconvert/WavefrontObjSerializer.cpp
+++ b/src/ifcconvert/WavefrontObjSerializer.cpp
@@ -43,7 +43,7 @@ void WaveFrontOBJSerializer::writeHeader() {
 	mtl_stream << "# File generated by IfcOpenShell " << IFCOPENSHELL_VERSION << "\n";	
 }
 
-void WaveFrontOBJSerializer::writeMaterial(const IfcGeomObjects::Material& style) {			
+void WaveFrontOBJSerializer::writeMaterial(const IfcGeom::Material& style) {			
 	mtl_stream << "newmtl " << style.name() << "\n";
 	if (style.hasDiffuse()) {
 		const double* diffuse = style.diffuse();
@@ -65,7 +65,7 @@ void WaveFrontOBJSerializer::writeMaterial(const IfcGeomObjects::Material& style
 		}
 	}
 }
-void WaveFrontOBJSerializer::writeTesselated(const IfcGeomObjects::IfcGeomObject* o) {
+void WaveFrontOBJSerializer::write(const IfcGeom::TriangulationElement<double>* o) {
 
 	std::string tmp = o->name().empty() ? o->guid() : o->name();
 
@@ -74,16 +74,16 @@ void WaveFrontOBJSerializer::writeTesselated(const IfcGeomObjects::IfcGeomObject
 	obj_stream << "g " << name << "\n";
 	obj_stream << "s 1" << "\n";
 
-	const IfcGeomObjects::IfcRepresentationTriangulation& mesh = o->mesh();
+	const IfcGeom::Representation::Triangulation<double>& mesh = o->geometry();
 	
 	const int vcount = mesh.verts().size() / 3;
-	for ( std::vector<float>::const_iterator it = mesh.verts().begin(); it != mesh.verts().end(); ) {
+	for ( std::vector<double>::const_iterator it = mesh.verts().begin(); it != mesh.verts().end(); ) {
 		const double x = *(it++);
 		const double y = *(it++);
 		const double z = *(it++);
 		obj_stream << "v " << x << " " << y << " " << z << "\n";
 	}
-	for ( std::vector<float>::const_iterator it = mesh.normals().begin(); it != mesh.normals().end(); ) {
+	for ( std::vector<double>::const_iterator it = mesh.normals().begin(); it != mesh.normals().end(); ) {
 		const double x = *(it++);
 		const double y = *(it++);
 		const double z = *(it++);
@@ -97,12 +97,7 @@ void WaveFrontOBJSerializer::writeTesselated(const IfcGeomObjects::IfcGeomObject
 		
 		const int material_id = *(material_it++);
 		if (material_id != previous_material_id) {
-			IfcGeomObjects::Material material(0);
-			if (material_id >= 0) {
-				material = mesh.materials()[material_id];
-			} else {
-				material = IfcGeomObjects::Material(IfcGeom::get_default_style(o->type()));
-			}
+			const IfcGeom::Material& material = mesh.materials()[material_id];
 			const std::string material_name = material.name();
 			obj_stream << "usemtl " << material_name << "\n";
 			if (materials.find(material_name) == materials.end()) {
diff --git a/src/ifcconvert/WavefrontObjSerializer.h b/src/ifcconvert/WavefrontObjSerializer.h
index b31dcc1..7cb6790 100644
--- a/src/ifcconvert/WavefrontObjSerializer.h
+++ b/src/ifcconvert/WavefrontObjSerializer.h
@@ -44,12 +44,13 @@ class WaveFrontOBJSerializer : public GeometrySerializer {
 	virtual ~WaveFrontOBJSerializer() {}
 	bool ready();
 	void writeHeader();
-	void writeMaterial(const IfcGeomObjects::Material& style);
-	void writeTesselated(const IfcGeomObjects::IfcGeomObject* o);
-	void writeShapeModel(const IfcGeomObjects::IfcGeomShapeModelObject* o) {}
+	void writeMaterial(const IfcGeom::Material& style);
+	void write(const IfcGeom::TriangulationElement<double>* o);
+	void write(const IfcGeom::BRepElement<double>* o) {}
 	void finalize() {}
 	bool isTesselated() const { return true; }
 	void setUnitNameAndMagnitude(const std::string& name, float magnitude) {}
+	void setFile(IfcParse::IfcFile*) {}
 };
 
 #endif
\ No newline at end of file
diff --git a/src/ifcconvert/XmlSerializer.cpp b/src/ifcconvert/XmlSerializer.cpp
new file mode 100644
index 0000000..bdfbc66
--- /dev/null
+++ b/src/ifcconvert/XmlSerializer.cpp
@@ -0,0 +1,257 @@
+#include <map>
+
+#include <boost/property_tree/ptree.hpp>
+#include <boost/property_tree/xml_parser.hpp>
+#include <boost/foreach.hpp>
+#include <boost/version.hpp>
+
+#include "XmlSerializer.h"
+
+using boost::property_tree::ptree;
+using namespace IfcSchema;
+
+static std::map<std::string, std::string> argument_name_map;
+
+// Format an IFC attribute and maybe returns as string. Only literal scalar 
+// values are converted. Things like entity instances and lists are omitted.
+boost::optional<std::string> format_attribute(const Argument* argument, IfcUtil::ArgumentType argument_type) {
+	boost::optional<std::string> value;
+	switch(argument_type) {
+		case IfcUtil::Argument_BOOL: {
+			const bool b = *argument;
+			value = b ? "true" : "false";
+			break; }
+		case IfcUtil::Argument_DOUBLE: {
+			const double d = *argument;
+			std::stringstream stream;
+			stream << d;
+			value = stream.str();
+			break; }
+		case IfcUtil::Argument_STRING:
+		case IfcUtil::Argument_ENUMERATION: {
+			value = static_cast<std::string>(*argument);
+			break; }
+		case IfcUtil::Argument_INT: {
+			const int v = *argument;
+			std::stringstream stream;
+			stream << v;
+			value = stream.str();
+			break; }
+		case IfcUtil::Argument_ENTITY: {
+			IfcUtil::IfcBaseClass* e = *argument;
+			if (Type::IsSimple(e->type())) {
+				IfcUtil::IfcBaseType* f = (IfcUtil::IfcBaseType*) e;
+				value = format_attribute(f->getArgument(0), f->getArgumentType(0));
+			} else if (e->is(IfcSchema::Type::IfcSIUnit) || e->is(IfcSchema::Type::IfcConversionBasedUnit)) {
+				// Some string concatenation to have a unit name as a XML attribute.
+
+				std::string unit_name;
+
+				if (e->is(IfcSchema::Type::IfcSIUnit)) {
+					IfcSchema::IfcSIUnit* unit = (IfcSchema::IfcSIUnit*) e;
+					unit_name = IfcSchema::IfcSIUnitName::ToString(unit->Name());
+					if (unit->hasPrefix()) {
+						unit_name = IfcSchema::IfcSIPrefix::ToString(unit->Prefix()) + unit_name;
+					}
+				} else {
+					IfcSchema::IfcConversionBasedUnit* unit = (IfcSchema::IfcConversionBasedUnit*) e;
+					unit_name = unit->Name();
+				}
+
+				for (std::string::iterator c = unit_name.begin(); c != unit_name.end(); ++c) *c = tolower(*c);
+
+				value = unit_name;
+			}
+			break; }
+	}
+	return value;
+}
+
+// Formats an entity instances as a ptree node, and insert into the DOM. Recurses
+// over the entity attributes and writes them as xml attributes of the node.
+ptree& format_entity_instance(IfcUtil::IfcBaseEntity* instance, ptree& tree, bool as_link = false) {
+	ptree child;
+	const unsigned n = instance->getArgumentCount();
+	for (unsigned i = 0; i < n; ++i) {
+		const Argument* argument = instance->getArgument(i);
+		if (argument->isNull()) continue;
+
+		std::string argument_name = instance->getArgumentName(i);
+		std::map<std::string, std::string>::const_iterator argument_name_it;
+		argument_name_it = argument_name_map.find(argument_name);
+		if (argument_name_it != argument_name_map.end()) {
+			argument_name = argument_name_it->second;
+		}
+		const IfcUtil::ArgumentType argument_type = instance->getArgumentType(i);
+
+		boost::optional<std::string> value;
+		try {
+			value = format_attribute(argument, argument_type);
+		} catch (...) {}
+
+		if (value) {
+			if (as_link) {
+				if (argument_name == "id") {
+					child.put("<xmlattr>.xlink:href", std::string("#") + *value);
+				}
+			} else {
+				std::stringstream stream;
+				stream << "<xmlattr>." << argument_name;
+				child.put(stream.str(), *value);
+			}
+		}
+	}
+	return tree.add_child(Type::ToString(instance->type()), child);
+}
+
+// A function to be called recursively. Template specialization is used 
+// to descend into decomposition, containment and property relationships.
+template <typename A>
+void descend(A* instance, ptree& tree) {
+	format_entity_instance(instance, tree);
+}
+
+// Returns related entity instances using IFC's objectified relationship
+// model. The second and third argument require a member function pointer.
+template <typename T, typename U, typename V, typename F, typename G>
+typename V::list::ptr get_related(T* t, F f, G g) {
+	typename U::list::ptr li = (*t.*f)()->template as<U>();
+	typename V::list::ptr acc(new typename V::list);
+	for (typename U::list::it it = li->begin(); it != li->end(); ++it) {
+		U* u = *it;
+		acc->push((*u.*g)());
+	}
+	return acc;
+}
+
+// Descends into the tree by recursing into IfcRelContainedInSpatialStructure,
+// IfcRelDecomposes and IfcRelDefinesByProperties relations.
+template <>
+void descend(IfcProduct* product, ptree& tree) {
+	ptree& child = format_entity_instance(product, tree);
+	
+	if (product->is(Type::IfcSpatialStructureElement)) {
+		IfcSpatialStructureElement* structure = (IfcSpatialStructureElement*) product;
+
+		IfcProduct::list::ptr elements = get_related
+			<IfcSpatialStructureElement, IfcRelContainedInSpatialStructure, IfcProduct>
+			(structure, &IfcSpatialStructureElement::ContainsElements, &IfcRelContainedInSpatialStructure::RelatedElements);
+	
+		for (IfcProduct::list::it it = elements->begin(); it != elements->end(); ++it) {
+			descend(*it, child);
+		}
+	}
+
+	IfcObjectDefinition::list::ptr structures = get_related
+		<IfcProduct, IfcRelDecomposes, IfcObjectDefinition>
+		(product, &IfcProduct::IsDecomposedBy, &IfcRelDecomposes::RelatedObjects);
+
+	for (IfcObjectDefinition::list::it it = structures->begin(); it != structures->end(); ++it) {
+		IfcObjectDefinition* ob = *it;
+		if (ob->is(Type::IfcSpatialStructureElement)) {
+			descend((IfcProduct*)ob, child);
+		} else {
+			descend(ob, child);
+		}
+	}
+
+	IfcPropertySetDefinition::list::ptr property_sets = get_related
+		<IfcProduct, IfcRelDefinesByProperties, IfcPropertySetDefinition>
+		(product, &IfcProduct::IsDefinedBy, &IfcRelDefinesByProperties::RelatingPropertyDefinition);
+
+	for (IfcPropertySetDefinition::list::it it = property_sets->begin(); it != property_sets->end(); ++it) {
+		IfcPropertySetDefinition* pset = *it;
+		if (pset->is(Type::IfcPropertySet)) {
+			format_entity_instance(pset, child, true);
+		}
+	}
+}
+
+// Descends into the tree by recursing into IfcRelDecomposes relations.
+template <>
+void descend(IfcProject* project, ptree& tree) {
+	ptree& child = format_entity_instance(project, tree);
+	
+	IfcObjectDefinition::list::ptr structures = get_related
+		<IfcProject, IfcRelDecomposes, IfcObjectDefinition>
+		(project, &IfcProject::IsDecomposedBy, &IfcRelDecomposes::RelatedObjects);
+	
+	for (IfcObjectDefinition::list::it it = structures->begin(); it != structures->end(); ++it) {
+		IfcObjectDefinition* ob = *it;
+		if (ob->is(Type::IfcSpatialStructureElement)) {
+			descend((IfcProduct*)ob, child);
+		} else {
+			descend(ob, child);
+		}
+	}
+}
+
+// Format IfcProperty instances and insert into the DOM. IfcComplexProperties are flattened out.
+void format_properties(IfcProperty::list::ptr properties, ptree& node) {
+	for (IfcProperty::list::it it = properties->begin(); it != properties->end(); ++it) {
+		IfcProperty* p = *it;
+		if (p->is(Type::IfcComplexProperty)) {
+			IfcComplexProperty* complex = (IfcComplexProperty*) p;
+			format_properties(complex->HasProperties(), node);
+		} else {
+			format_entity_instance(p, node);
+		}
+	}
+}
+
+void XmlSerializer::finalize() {
+	argument_name_map.insert(std::make_pair("GlobalId", "id"));
+
+	IfcProject::list::ptr projects = file->entitiesByType<IfcProject>();
+	if (projects->size() != 1) {
+		Logger::Message(Logger::LOG_ERROR, "Expected a single IfcProject");
+		return;
+	}
+	IfcProject* project = *projects->begin();
+
+	ptree root, header, decomposition, properties;
+	
+	// Write the SPF header as XML nodes.
+	BOOST_FOREACH(const std::string& s, file->header().file_description().description()) {
+		header.add_child("file_description.description", ptree(s));
+	}
+	BOOST_FOREACH(const std::string& s, file->header().file_name().author()) {
+		header.add_child("file_name.author", ptree(s));
+	}
+	BOOST_FOREACH(const std::string& s, file->header().file_name().organization()) {
+		header.add_child("file_name.organization", ptree(s));
+	}
+	BOOST_FOREACH(const std::string& s, file->header().file_schema().schema_identifiers()) {
+		header.add_child("file_schema.schema_identifiers", ptree(s));
+	}
+	header.put("file_description.implementation_level", file->header().file_description().implementation_level());
+	header.put("file_name.name",                        file->header().file_name().name());
+	header.put("file_name.time_stamp",                  file->header().file_name().time_stamp());
+	header.put("file_name.preprocessor_version",        file->header().file_name().preprocessor_version());
+	header.put("file_name.originating_system",          file->header().file_name().originating_system());
+	header.put("file_name.authorization",               file->header().file_name().authorization());
+	
+	// Descend into the decomposition structure of the IFC file.
+	descend(project, decomposition);
+
+	// Write all property sets and values as XML nodes.
+	IfcPropertySet::list::ptr psets = file->entitiesByType<IfcPropertySet>();
+	for (IfcPropertySet::list::it it = psets->begin(); it != psets->end(); ++it) {
+		IfcPropertySet* pset = *it;
+		ptree& node = format_entity_instance(pset, properties);
+		format_properties(pset->HasProperties(), node);
+	}
+
+	root.add_child("ifc.header",        header);
+	root.add_child("ifc.properties",    properties);
+	root.add_child("ifc.decomposition", decomposition);
+
+	root.put("ifc.<xmlattr>.xmlns:xlink", "http://www.w3.org/1999/xlink");
+
+#if BOOST_VERSION >= 105600
+	boost::property_tree::xml_writer_settings<ptree::key_type> settings = boost::property_tree::xml_writer_make_settings<ptree::key_type>('\t', 1);
+#else
+	boost::property_tree::xml_writer_settings<char> settings('\t', 1);
+#endif
+	boost::property_tree::write_xml(xml_filename, root, std::locale(), settings);
+}
\ No newline at end of file
diff --git a/src/ifcconvert/XmlSerializer.h b/src/ifcconvert/XmlSerializer.h
new file mode 100644
index 0000000..bd8b856
--- /dev/null
+++ b/src/ifcconvert/XmlSerializer.h
@@ -0,0 +1,41 @@
+/********************************************************************************
+ *                                                                              *
+ * This file is part of IfcOpenShell.                                           *
+ *                                                                              *
+ * IfcOpenShell is free software: you can redistribute it and/or modify         *
+ * it under the terms of the Lesser GNU General Public License as published by  *
+ * the Free Software Foundation, either version 3.0 of the License, or          *
+ * (at your option) any later version.                                          *
+ *                                                                              *
+ * IfcOpenShell 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                 *
+ * Lesser GNU General Public License for more details.                          *
+ *                                                                              *
+ * You should have received a copy of the Lesser GNU General Public License     *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.         *
+ *                                                                              *
+ ********************************************************************************/
+
+#ifndef XMLSERIALIZER_H
+#define XMLSERIALIZER_H
+
+#include "../ifcconvert/Serializer.h"
+
+class XmlSerializer : public Serializer {
+private:
+	IfcParse::IfcFile* file;
+	std::string xml_filename;
+public:
+	XmlSerializer(const std::string& xml_filename)
+		: Serializer()
+		, xml_filename(xml_filename)
+	{}
+
+	bool ready() { return true; }
+	void writeHeader() {}
+	void finalize();
+	void setFile(IfcParse::IfcFile* f) { file = f; }
+};
+
+#endif
\ No newline at end of file
diff --git a/src/ifcexpressparser/IfcDocumentation.py b/src/ifcexpressparser/IfcDocumentation.py
deleted file mode 100644
index 49284e7..0000000
--- a/src/ifcexpressparser/IfcDocumentation.py
+++ /dev/null
@@ -1,71 +0,0 @@
-###############################################################################
-#                                                                             #
-# This file is part of IfcOpenShell.                                          #
-#                                                                             #
-# IfcOpenShell is free software: you can redistribute it and/or modify        #
-# it under the terms of the Lesser GNU General Public License as published by #
-# the Free Software Foundation, either version 3.0 of the License, or         #
-# (at your option) any later version.                                         #
-#                                                                             #
-# IfcOpenShell 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                #
-# Lesser GNU General Public License for more details.                         #
-#                                                                             #
-# You should have received a copy of the Lesser GNU General Public License    #
-# along with this program. If not, see <http://www.gnu.org/licenses/>.        #
-#                                                                             #
-###############################################################################
-
-###############################################################################
-#                                                                             #
-# This files uses the documentation files from buildingSMART to generate      #
-# descriptions from EXPRESS names that are suitable for comments in the C++   #
-# code. The .csv files used by this file are generated from the MS Office     #
-# Access database, which in turn has been generated from the IFC baseline     #
-# documentation by the IFCDOC utility provided by buildingSMART.              #
-#                                                                             #
-###############################################################################
-
-import re,csv
-import csv
-try: from html.entities import entitydefs
-except: from htmlentitydefs import entitydefs
-
-name_to_oid = {}
-oid_to_desc = {}
-oid_to_name = {}
-oid_to_pid = {}
-regices = list(zip([re.compile(s,re.M) for s in [r'<[\w\n=" \-/\.;_\t:%#,\?\(\)]+>',r'(\n[\t ]*){2,}',r'^[\t ]+','^']],['','\n\n','  ','/// ']))
-
-definition_files = ['DocEntity.csv', 'DocEnumeration.csv', 'DocDefined.csv', 'DocSelect.csv']
-for fn in definition_files:
-    with open(fn) as f:
-        for oid, name, desc in csv.reader(f, delimiter=';', quotechar='"'):
-            name_to_oid[name] = oid
-            oid_to_name[oid] = name
-            oid_to_desc[oid] = desc
-
-with open('DocEntityAttributes.csv') as f:
-    for pid, x, oid in csv.reader(f, delimiter=';', quotechar='"'):
-        oid_to_pid[oid] = pid
-        
-with open('DocAttribute.csv') as f:
-    for oid, name, desc in csv.reader(f, delimiter=';', quotechar='"'):
-        pid = oid_to_pid[oid]
-        pname = oid_to_name[pid]
-        name_to_oid[(pname, name)] = oid
-        oid_to_desc[oid] = desc
-        
-def description(item):
-    global name_to_oid, oid_to_desc, oid_to_name, oid_to_pid
-    oid = name_to_oid.get(item,0)
-    desc = oid_to_desc.get(oid,None)
-    if desc:
-        for a,b in entitydefs.items(): desc = desc.replace("&%s;"%a,b)
-        desc = desc.replace("\r","")
-        for r,s in regices[:-1]: desc = r.sub(s,desc)
-        desc = desc.strip()
-        r,s = regices[-1]
-        desc = r.sub(s,desc)
-    return desc
\ No newline at end of file
diff --git a/src/ifcexpressparser/IfcExpressParser.py b/src/ifcexpressparser/IfcExpressParser.py
deleted file mode 100644
index 38ae43a..0000000
--- a/src/ifcexpressparser/IfcExpressParser.py
+++ /dev/null
@@ -1,779 +0,0 @@
-header = """
-/********************************************************************************
- *                                                                              *
- * This file is part of IfcOpenShell.                                           *
- *                                                                              *
- * IfcOpenShell is free software: you can redistribute it and/or modify         *
- * it under the terms of the Lesser GNU General Public License as published by  *
- * the Free Software Foundation, either version 3.0 of the License, or          *
- * (at your option) any later version.                                          *
- *                                                                              *
- * IfcOpenShell 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                 *
- * Lesser GNU General Public License for more details.                          *
- *                                                                              *
- * You should have received a copy of the Lesser GNU General Public License     *
- * along with this program. If not, see <http://www.gnu.org/licenses/>.         *
- *                                                                              *
- ********************************************************************************/
- """.strip()
-
-###############################################################################
-#                                                                             #
-# This file can be used to generate C++ code from Express schema files. The   #
-# generated code works alongside the IfcOpenShell IfcParse library. This      #
-# script has only been tested on IFC2X3_TC1.exp and will most probably not    #
-# work on any other schemas.                                                  #
-#                                                                             #
-# Note this script uses funcparserlib, which is available at:                 #
-# http://code.google.com/p/funcparserlib/                                     #
-# The script only works with revision 30f7ee896bc9 because it uses the some() #
-# parser and is incompatible with other changes as well.                      #
-#                                                                             #
-###############################################################################
-
-import os, sys
-import IfcDocumentation
-
-filename = sys.argv[1]
-
-#
-# A class to split the Express schema files into seperate tokens
-#
-class Tokenizer(object):
-    comment = ['(*','*)']
-    termchars = ',;()=[]:'
-    def __init__(self, fn):
-        if hasattr(fn,'read'): object.__setattr__(self,'f',fn)
-        else: object.__setattr__(self,'f',open(fn,'rb'))
-    def __getattr__(self, name):
-        return getattr(self.f, name)
-    def __setattr__(self, name, value):
-        setattr(self.f, name, value)
-    def __iter__(self): return self
-    def next(self):
-        def get():
-            buffer = ''
-            in_comment = False
-            in_string = False
-            offset = self.tell()
-            while True:
-                c = self.read(2)
-                if len(c) < 2: raise StopIteration
-                if c in Tokenizer.comment:
-                    in_comment = c == Tokenizer.comment[0]
-                    continue
-                if in_string and c == "''":
-                    buffer += "'"
-                    continue
-                self.seek(-1,1)
-                if not in_string and c[0].isspace():
-                    if ( len(buffer) ): return buffer
-                    else:
-                        offset = self.tell()
-                        continue
-                if not in_comment:
-                    if len(buffer) and (c[0] in Tokenizer.termchars or buffer[-1] in Tokenizer.termchars):
-                        self.seek(-1,1)
-                        return buffer
-                    buffer += c[0]
-        return get()
-
-#
-# Some global variables to keep track of variable names
-#
-express_to_cpp = {
-    'BOOLEAN':'bool',
-    'LOGICAL':'bool',
-    'INTEGER':'int',
-    'REAL':'double',
-    'NUMBER':'double',
-    'STRING':'std::string'
-}
-schema_version = ''
-enumerations = set()
-selections = set()
-entity_names = set()
-simple_types = {}
-selectable_simple_types = set()
-argument_count = {}
-parent_relations = {}
-argument_names_and_types = {}
-entity_map = {}
-
-#
-# Since inherited arguments of Express entities are placed in sequence before the 
-# non-inherited ones, we need to keep track of how many inherited arguments exist
-#
-def argument_start(c):
-    if c not in parent_relations: return 0
-    i = 0
-    while True:
-        c = parent_relations[c]
-        i += argument_count[c] if c in argument_count else 0
-        if not (c in parent_relations): break
-    return i
-    
-def parent_arguments(c):
-    if c not in parent_relations: return []
-    l = []
-    while True:
-        c = parent_relations[c]
-        i += argument_count[c] if c in argument_count else 0
-        if not (c in parent_relations): break
-    return []
-
-#
-# Every constructor also initializes their parent class members, hence they
-# need be stored as well.
-#    
-def parent_arguments(c):
-    if c not in parent_relations: return []
-    l = []
-    while True:
-        c = parent_relations[c]
-        i += argument_count[c] if c in argument_count else 0
-        if not (c in parent_relations): break
-    return []
-
-#
-# Several classes to generate code from Express types and entities
-#
-class ArrayType:
-    def __init__(self,l): 
-        self.type = express_to_cpp.get(l[3],l[3])
-        self.upper = l[2]
-        self.lower = l[1]
-    def is_select_list(self): return self.type in selections
-    def __str__(self):
-        if self.type in entity_names:
-            return "SHARED_PTR< IfcTemplatedEntityList< %s > >"%self.type
-        elif self.type in selections:
-            return "SHARED_PTR< IfcTemplatedEntityList< IfcAbstractSelect > >"
-        else:
-            return "std::vector< %(type)s > /*[%(lower)s:%(upper)s]*/"%self.__dict__
-    def is_shared_ptr(self): return self.type in entity_names or self.type in selections
-    def type_enum(self):
-        if self.type in simple_types:
-            t = simple_types[self.type].type_enum()
-        else:
-            t = self.type
-        if t in entity_names or t == "Argument_ENTITY":
-            return "Argument_ENTITY_LIST"
-        elif t in selections:
-            return "Argument_ENTITY_LIST"
-        elif t == "int":
-            return "Argument_VECTOR_INT"
-        elif t == "double" or t == "Argument_DOUBLE":
-            return "Argument_VECTOR_DOUBLE"
-        elif t == "std::string" or t == "Argument_STRING":
-            return "Argument_VECTOR_STRING"
-        elif isinstance(t, BinaryType):
-            return "Argument_UNKNOWN"
-        else:
-            assert False, t
-        
-class ScalarType:
-    def __init__(self,l): self.type = express_to_cpp.get(l,l)
-    def __str__(self): return self.type
-    def is_select_list(self): return False
-    def type_enum(self):
-        if self.type in simple_types:
-            return simple_types[self.type].type_enum()
-        elif self.type in entity_names:
-            return "Argument_ENTITY"
-        else:
-            return { "bool":"Argument_BOOL","int":"Argument_INT","double":"Argument_DOUBLE","std::string":"Argument_STRING"}[self.type]
-class EnumType:
-    def __init__(self,l):
-        self.v = [(x,'%s_%s'%('%(fancy_name)s',x)) for x in l]
-        self.maxlen = max([len(v) for v in self.v])
-    def __str__(self): 
-        if generator_mode == 'HEADER':
-            return "enum {%s}"%", ".join([v2 for v1,v2 in self.v])
-        elif generator_mode == 'SOURCE_TO':
-            return '{ "%s" }'%'","'.join([v1 for v1,v2 in self.v])
-        elif generator_mode == 'SOURCE_FROM':
-            return "".join(['    if(s=="%s"%s) return ::%s::%s::%s;\n'%(v1.upper()," "*(self.maxlen-len(v1)),schema_version,"%(name)s",v2) for v1,v2 in self.v])
-    def is_select_list(self): return False
-    def __len__(self): return len(self.v)
-    def type_enum(self):
-        return "Argument_ENUMERATION"
-class SelectType:
-    def __init__(self,l): 
-        for x in l: 
-            if x in simple_types: selectable_simple_types.add(x)
-    def __str__(self): return "IfcSchemaEntity"
-    def is_select_list(self): return False
-    def type_enum(self): return "Argument_ENTITY"
-class BinaryType:
-    def __init__(self,l): self.l = int(l)
-    def __str__(self): return "char[%s]"%self.l
-    def is_select_list(self): return False
-    def type_enum(self): raise NotImplementedError()
-class InverseType:
-    def __init__(self,l):
-        self.name, self.type, self.reference = l
-    def type_enum(self): return "Argument_ENTITY"
-    def is_select_list(self): return False
-class Typedef:
-    def __init__(self,l):
-        self.name,self.type=l[1:3]
-        self.fancy_name = self.name[:-4] if self.name.endswith("Enum") else self.name
-        if isinstance(self.type,EnumType): 
-            enumerations.add(self.name)
-            self.len = len(self.type)
-        elif isinstance(self.type,SelectType): selections.add(self.name)
-        simple_types[self.name] = self
-        comment = IfcDocumentation.description(self.name)
-        self.comment = comment+"\n" if comment else ''
-    def __str__(self):
-        global generator_mode
-        if generator_mode == 'HEADER' and isinstance(self.type,EnumType):
-            return ("namespace %(name)s {\n%(comment)stypedef %(type)s %(name)s;\nconst char* ToString(%(name)s v);\n%(name)s FromString(const std::string& s);\n}"%self.__dict__)%self.__dict__
-        elif generator_mode == 'HEADER':
-            return "%stypedef %s %s;"%(self.comment,self.type,self.name)
-        elif generator_mode == 'SOURCE' and isinstance(self.type,EnumType):
-            generator_mode = 'SOURCE_TO'
-            s =  "const char* %(name)s::ToString(%(name)s v) {\n    if ( v < 0 || v >= %(len)d ) throw IfcException(\"Unable to find find keyword in schema\");\n    const char* names[] = %(type)s;\n    return names[v];\n}\n"%self.__dict__
-            generator_mode = 'SOURCE_FROM'
-            s += ("%(name)s::%(name)s %(name)s::FromString(const std::string& s) {\n%(type)s    throw IfcException(\"Unable to find find keyword in schema\");\n}"%self.__dict__)%self.__dict__
-            generator_mode = 'SOURCE'
-            return s
-    def type_enum(self):
-        return self.type.type_enum()
-class Argument(object):
-    def __init__(self,l):
-        self.name, self.optional, self.type = l
-    def is_enum(self): return str(self.type) in enumerations
-    def type_str(self):
-        if self.type.is_select_list():
-            # This is extremely hackish indeed
-            return "optional< IfcEntities >" if self.optional else "IfcEntities"
-        elif str(self.type) in entity_names:
-            return "%(type)s*"%self.__dict__
-        else:
-            t = "%(type)s::%(type)s"%self.__dict__ if self.is_enum() else self.type
-            return "optional< %s >"%t if self.optional else t
-class ArgumentList:
-    def __init__(self,l):
-        self.l = [Argument(a) for a in l]
-        self.argstart = 0
-    def __len__(self): return len(self.l)
-    def __str__(self):
-        s = ""
-        argv = self.argstart
-        for a in self.l:
-            class_name = indent = comment = optional_comment = ""
-            is_array = isinstance(a.type,ArrayType) and a.type.is_shared_ptr()
-            return_type = str(a.type)
-            if generator_mode == 'SOURCE':
-                class_name = "%(class_name)s::"
-                if isinstance(a.type,BinaryType) or (isinstance(a.type,ArrayType) and isinstance(a.type.type,BinaryType)):
-                    function_body = " { throw; /* Not implemented argument*/ }"
-                elif isinstance(a.type,ArrayType) and str(a.type.type) in entity_names:
-                    function_body = " { RETURN_AS_LIST(%s,%d) }"%(a.type.type,argv)
-                elif isinstance(a.type,ArrayType) and str(a.type.type) in selections:
-                    function_body = " { RETURN_AS_LIST(IfcAbstractSelect,%d) }"%(argv)
-                elif return_type in entity_names:
-                    function_body = " { return reinterpret_pointer_cast<IfcBaseClass,%s>(*entity->getArgument(%d)); }"%(return_type,argv)
-                elif return_type in enumerations:
-                    function_body = " { return %s::FromString(*entity->getArgument(%d)); }"%(return_type,argv)
-                else:
-                    function_body = " { return *entity->getArgument(%d); }"%argv
-                function_body2 = " { return !entity->getArgument(%d)->isNull(); }"%argv
-                if isinstance(a.type,BinaryType) or (isinstance(a.type,ArrayType) and isinstance(a.type.type,BinaryType)):
-                    function_body3 = " { if ( ! entity->isWritable() ) { throw; } }"
-                elif return_type in enumerations:
-                    function_body3 = " { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(%d,v%s,%s::ToString(v)); }"%(argv,"->generalize()" if is_array else "",return_type)
-                else:
-                    function_body3 = " { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(%d,v%s); }"%(argv,"->generalize()" if is_array else "")
-            else:
-                indent = "    "
-                function_body = function_body2 = function_body3 = ";"
-                comment = IfcDocumentation.description((self.class_name,a.name))
-                comment = comment+"\n" if comment else ''
-                comment = comment.replace("///","%s///"%indent)
-                optional_comment = "%s/// Whether the optional attribute %s is defined for this %s\n"%(indent,a.name,self.class_name)
-            if a.optional: s += "\n%s%sbool %shas%s()%s"%(optional_comment,indent,class_name,a.name,function_body2)
-            if ( str(a.type) in enumerations ):
-                return_type = "%(type)s::%(type)s"%a.__dict__
-            elif ( str(a.type) in entity_names ):
-                return_type = "%(type)s*"%a.__dict__
-            s += "\n%s%s%s %s%s()%s"%(comment,indent,return_type,class_name,a.name,function_body)
-            s += "\n%svoid %sset%s(%s v)%s"%(indent,class_name,a.name,return_type,function_body3)
-            argv += 1
-
-        if generator_mode == 'HEADER':
-            s += "\n virtual unsigned int getArgumentCount() const { return %(n_arguments)d; }" % dict(class_name=self.class_name, n_arguments=len(self.l) + argument_start(self.class_name))
-
-            s += "\n virtual ArgumentType getArgumentType(unsigned int i) const {"
-            if len(self.l):
-                s += " switch (i) {"
-                for i, a in enumerate(self.l):
-                    s += "case %d: " % (i + argument_start(self.class_name))
-                    s += "return %s; " % a.type.type_enum()
-                s += "}"
-            if self.parent_class is not None:
-                s += " return %s::getArgumentType(i); }" % self.parent_class
-            else:
-                s += " throw IfcException(\"argument out of range\"); }"
-
-            s += "\n virtual const char* getArgumentName(unsigned int i) const {"
-            if len(self.l):
-                s += " switch (i) {"
-                for i, a in enumerate(self.l):
-                    s += "case %d: " % (i + argument_start(self.class_name))
-                    s += "return \"%s\"; " % a.name
-                s += "}"
-            if self.parent_class is not None:
-                s += " return %s::getArgumentName(i); }" % self.parent_class
-            else:
-                s += " throw IfcException(\"argument out of range\"); }"
-
-            s += "\n virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }"
-        return s
-class InverseList:
-    def __init__(self,l):
-        self.l = l
-    def __str__(self):
-        if self.l is None: return ""
-        s = ""
-        for i in self.l:
-            if generator_mode == 'HEADER':
-                s += "\n    SHARED_PTR< IfcTemplatedEntityList< %s > > %s(); // INVERSE %s::%s"%(i.type.type,i.name,i.type.type,i.reference)
-            elif generator_mode == 'SOURCE':
-                s += "\n%s::list %s::%s() { RETURN_INVERSE(%s) }"%(i.type.type,"%(class_name)s",i.name,i.type.type)
-        return s
-class Classdef:
-    def __init__(self,l):
-        self.class_name, self.parent_class, self.arguments, self.inverse = l
-        self.arguments.class_name = self.class_name
-        self.arguments.parent_class = self.parent_class
-        entity_names.add(self.class_name)
-        parent_relations[self.class_name] = self.parent_class
-        argument_count[self.class_name] = len(self.arguments)
-        entity_map[self.class_name] = self
-    def get_attributes(self, get_parent=True):
-        s = entity_map[self.parent_class].get_attributes() if get_parent and self.parent_class else []
-        s += [(a.name,not not a.optional,a.type.type_enum(),a.type.type if a.is_enum() else None) for a in self.arguments.l]
-        return s
-    def get_constructor_args(self):
-        s = entity_map[self.parent_class].get_constructor_args() if self.parent_class else []
-        i = len(s) + 1
-        s += ["%s v%d_%s"%(a.type_str(),b+i,a.name) for a,b in zip(self.arguments.l,range(len(self.arguments)))]
-        return s
-    def get_constructor_implementation(self):
-        s = entity_map[self.parent_class].get_constructor_implementation() if self.parent_class else []
-        i = len(s) + 1
-        b = 0
-        for a in self.arguments.l:
-            is_enumeration = str(a.type) in enumerations
-            # boost::optional is not used for pointer types, because they are set to NULL using 0
-            use_boost_optional = a.optional and str(a.type) not in entity_names
-            # boost::optional types need to be dereferenced before passing to the writable entity
-            dereference = "*" if use_boost_optional else ""
-            generalize = "->generalize()" if (isinstance(a.type,ArrayType) and a.type.is_shared_ptr() and not a.type.is_select_list()) else ""
-            if isinstance(a.type,BinaryType) or (isinstance(a.type,ArrayType) and isinstance(a.type.type,BinaryType)):
-                continue
-            if is_enumeration:
-                impl = "e->setArgument(%d,%sv%d_%s,%s::ToString(%sv%d_%s))"%(b+i-1,dereference,b+i,a.name,str(a.type),dereference,b+i,a.name)
-            else:
-                impl = "e->setArgument(%d,(%sv%d_%s)%s)"%(b+i-1,dereference,b+i,a.name,generalize)            
-            if use_boost_optional:
-                s.append("if (v%d_%s) { %s; } else { e->setArgument(%d); } "%(b+i,a.name,impl,b+i-1))
-            else: s.append(impl)
-            b += 1
-        return s#"; ".join(s)
-    def __str__(self):
-        self.constructor_args_list = self.get_constructor_args()
-        self.constructor_args = ", ".join(self.constructor_args_list)
-        if generator_mode == 'HEADER':            
-            comment = IfcDocumentation.description(self.class_name)
-            comment = comment+"\n" if comment else ''
-            return "%sclass %s : public %s {\npublic:%s%s%s\n};" % (comment,self.class_name,
-                "IfcBaseEntity" if self.parent_class is None else self.parent_class,
-                self.arguments,
-                self.inverse,
-                ("\n    bool is(Type::Enum v) const;"+
-                "\n    Type::Enum type() const;"+
-                "\n    static Type::Enum Class();"+
-                "\n    %(class_name)s (IfcAbstractEntityPtr e = IfcAbstractEntityPtr());"+
-               ("\n    %(class_name)s (%(constructor_args)s);" if len(self.constructor_args_list) else "")+
-                "\n    typedef %(class_name)s* ptr;"+
-                "\n    typedef SHARED_PTR< IfcTemplatedEntityList< %(class_name)s > > list;"+
-                "\n    typedef IfcTemplatedEntityList< %(class_name)s >::it it;")%self.__dict__
-            )
-        elif generator_mode == 'SOURCE':
-            self.arguments.argstart = argument_start(self.class_name)
-            self.constructor_implementation = "; ".join(self.get_constructor_implementation())
-            return (("\n// Function implementations for %(class_name)s"+str(self.arguments)+str(self.inverse)+
-            ("\nbool %(class_name)s::is(Type::Enum v) const { return v == Type::%(class_name)s; }" if self.parent_class is None else
-            "\nbool %(class_name)s::is(Type::Enum v) const { return v == Type::%(class_name)s || %(parent_class)s::is(v); }")+
-            "\nType::Enum %(class_name)s::type() const { return Type::%(class_name)s; }"+
-            "\nType::Enum %(class_name)s::Class() { return Type::%(class_name)s; }"+
-            "\n%(class_name)s::%(class_name)s(IfcAbstractEntityPtr e) { if (!is(Type::%(class_name)s)) throw IfcException(\"Unable to find find keyword in schema\"); entity = e; }"+
-            ("\n%(class_name)s::%(class_name)s(%(constructor_args)s) { IfcWritableEntity* e = new IfcWritableEntity(Class()); %(constructor_implementation)s; entity = e; EntityBuffer::Add(this); }"  if len(self.constructor_args_list) else "")
-            )%self.__dict__)%self.__dict__
-
-
-from funcparserlib.parser import a, skip, many, maybe, some
-
-#
-# Lambda functions to map combinator output to classes
-# 
-array_type = lambda t: ArrayType(t)
-scalar_type = lambda t: ScalarType(t)
-enum_type = lambda t: EnumType(t)
-select_type = lambda t: SelectType(t)
-binary_type = lambda t: BinaryType(t)
-inverse_type = lambda t: InverseType(t)
-format_type = lambda t: Typedef(t)
-argument_list = lambda t: ArgumentList(t)
-inverse_list = lambda t: InverseList(t)
-format_options = lambda t: [t[0]]+t[1]
-
-#
-# The actual grammar definition
-#
-s = some(lambda t: not t in ['UNIQUE','WHERE','END_ENTITY','END_TYPE','INVERSE','DERIVE'])
-x = lambda s:skip(a(s))
-list_or_array = a('ARRAY') | a('LIST') | a('SET')
-binary = x('BINARY')+x('(') + s + x(')') >> binary_type
-array = list_or_array + x('[') + s + x(':') + s + x(']') + x('OF') + skip(maybe(a('UNIQUE'))) + (binary|s) >> array_type
-options = x('(') + s + many(x(',')+s) + x(')') >> format_options
-enum = x('ENUMERATION') + x('OF') + options >> enum_type
-select = x('SELECT') + options >> select_type
-single = s + skip(maybe(x('(')+s+x(')')) + maybe(a('FIXED'))) >> scalar_type
-type_type = array | enum | select | single
-type_start = a('TYPE') + s + x('=') + type_type + x(';')
-type_end = a('END_TYPE') + x(';')
-
-to_end = many(some(lambda t: t != ';'))
-clause = s + x(':') + to_end + x(';')
-where = a('WHERE') + many(clause)
-
-type = type_start + maybe(where) + type_end >> format_type
-
-subtype = x('SUBTYPE') + x('OF') + x('(') + s + x(')')
-supertype = maybe(x('ABSTRACT')) + x('SUPERTYPE') + x('OF') + x('(') + x('ONEOF') + options + x(')')
-entity_start = x('ENTITY') + s + skip(maybe(supertype)) + maybe(subtype) + x(';')
-entity_end = x('END_ENTITY') + x(';')
-key_value = s + x(':') + maybe(a('OPTIONAL')) + (array|binary|single) + x(';')
-arguments = many(key_value) >> argument_list
-unique_value = s + x(':') + s + many(a(',')+s) + a(';')
-unique = skip(a('UNIQUE') + many(unique_value))
-inverse_def = s + x(':') + (array|single) + x('FOR') + s + x(';') >> inverse_type
-inverse = maybe(x('INVERSE') + many( inverse_def )) >> inverse_list
-derive = skip(a('DERIVE') + many(clause))
-
-entity = entity_start + arguments + skip(maybe(unique)) + skip(maybe(derive)) + inverse + skip(maybe(where)) + entity_end >> Classdef
-
-schema = skip(a('SCHEMA')) + s + x(';')
-
-express = schema + many(type) + many(entity)
-schema_version,types,entities = express.parse(list(Tokenizer(filename)))
-schema_version = schema_version.capitalize()
-
-#
-# Writing of the three generated files starts here
-#
-h_file = open("%s.h"%schema_version,'w')
-h2_file = open("%s-rt.h"%schema_version,'w')
-enumh_file = open("%senum.h"%schema_version,'w')
-cpp_file = open("%s.cpp"%schema_version,'w')
-cpp2_file = open("%s-rt.cpp"%schema_version,'w')
-
-header += """
-
-/********************************************************************************
- *                                                                              *
- * This file has been generated from %s. Do not make modifications  *
- * but instead modify the python script that has been used to generate this.    *
- *                                                                              *
- ********************************************************************************/
- """%filename
-
-generator_mode = 'HEADER'
- 
-print >>h_file, header
-print >>h2_file, header
-print >>enumh_file, header
-print >>cpp_file, header
-print >>cpp2_file, header
-print >>h_file, """#ifndef %(schema_upper)s_H
-#define %(schema_upper)s_H
-
-#include <string>
-#include <vector>
-#include <map>
-#include <set>
-
-#include <boost/optional.hpp>
-
-#include "../ifcparse/IfcUtil.h"
-#include "../ifcparse/IfcException.h"
-#include "../ifcparse/ArgumentType.h"
-#include "../ifcparse/%(schema)senum.h"
-
-using namespace IfcUtil;
-using IfcParse::IfcException;
-using boost::optional;
-
-#define RETURN_INVERSE(T) \\
-    IfcEntities e = entity->getInverse(T::Class()); \\
-    SHARED_PTR< IfcTemplatedEntityList<T> > l ( new IfcTemplatedEntityList<T>() ); \\
-    for ( IfcEntityList::it it = e->begin(); it != e->end(); ++ it ) { \\
-        l->push(reinterpret_pointer_cast<IfcBaseClass,T>(*it)); \\
-    } \\
-    return l;
-
-#define RETURN_AS_SINGLE(T,a) \\
-    return reinterpret_pointer_cast<IfcBaseClass,T>(*entity->getArgument(a));
-
-#define RETURN_AS_LIST(T,a)  \\
-    IfcEntities e = *entity->getArgument(a);  \\
-    SHARED_PTR< IfcTemplatedEntityList<T> > l ( new IfcTemplatedEntityList<T>() );  \\
-    for ( IfcEntityList::it it = e->begin(); it != e->end(); ++ it ) {  \\
-        l->push(reinterpret_pointer_cast<IfcBaseClass,T>(*it)); \\
-    }  \\
-    return l;
-
-namespace %(schema)s {
-"""%{'schema_upper':schema_version.upper(),'schema':schema_version}
-
-simple_enumerations = sorted(simple_types)
-entity_enumerations = sorted(entity_names)
-all_enumerations = simple_enumerations + entity_enumerations
-
-print >>enumh_file, """#ifndef IFC2X3ENUM_H
-#define IFC2X3ENUM_H
-
-#include "../ifcparse/ArgumentType.h"
-
-namespace Ifc2x3 {
-
-namespace Type {
-    typedef enum {
-        %(enum)s
-    } Enum;
-    Enum Parent(Enum v);
-    Enum FromString(const std::string& s);
-    std::string ToString(Enum v);
-    bool IsSimple(Enum v);
-}
-
-}
-
-#endif
-"""%{'schema_upper':schema_version.upper(),'schema':schema_version,'enum':", ".join(all_enumerations + ["ALL"])}
-print >>h2_file, """#ifndef IFC2X3RT_H
-#define IFC2X3RT_H
-
-#include "../ifcparse/ArgumentType.h"
-
-namespace Ifc2x3 {
-namespace Type {
-    int GetAttributeCount(Enum t);
-    int GetAttributeIndex(Enum t, const std::string& a);
-    IfcUtil::ArgumentType GetAttributeType(Enum t, unsigned char a);
-    const std::string& GetAttributeName(Enum t, unsigned char a);
-    bool GetAttributeOptional(Enum t, unsigned char a);
-    std::pair<const char*, int> GetEnumerationIndex(Enum t, const std::string& a);
-    Enum GetAttributeEnumerationClass(Enum t, unsigned char a);
-}}
-
-#endif
-"""
-
-defined_types = set(express_to_cpp.values())
-deferred_types = []
-
-for t in [T for T in types if not (isinstance(T.type,EnumType) or isinstance(T.type,SelectType))]:
-    if isinstance(t.type,ScalarType) and str(t.type) not in defined_types:
-        deferred_types.append(t)
-    else:
-        print >>h_file, t
-for t in [T for T in types if isinstance(T.type,SelectType)]:
-    print >>h_file, t
-for t in deferred_types:
-    print >>h_file, t
-for t in [T for T in types if isinstance(T.type,EnumType)]:
-    print >>h_file, t
-    
-print >>h_file, "// Forward definitions"
-print >>h_file, "class %s;\n"%"; class ".join([e.class_name for e in entities])
-
-defined_classes = set()
-while True:
-    classes = [c for c in entities if c.class_name not in defined_classes]
-    if not len(classes): break
-    for c in classes:
-        if c.parent_class is None or c.parent_class in defined_classes:
-            defined_classes.add(c.class_name)
-            print >>h_file, c
-
-print >>h_file, "void InitStringMap();"
-print >>h_file, "IfcSchemaEntity SchemaEntity(IfcAbstractEntityPtr e = 0);"
-
-print >>h_file, "}\n\n#endif"
-
-generator_mode = 'SOURCE'
-print >>cpp2_file, """#include "../ifcparse/%(schema)s.h"
-#include "../ifcparse/%(schema)s-rt.h"
-#include "../ifcparse/IfcException.h"
-#include "../ifcparse/IfcWrite.h"
-#include "../ifcparse/IfcWritableEntity.h"
-#include "../ifcparse/ArgumentType.h"
-
-using namespace %(schema)s;
-using namespace IfcParse;
-using namespace IfcWrite;"""%{'schema':schema_version}
-print >>cpp_file, """#include "../ifcparse/%(schema)s.h"
-#include "../ifcparse/IfcException.h"
-#include "../ifcparse/IfcWrite.h"
-#include "../ifcparse/IfcWritableEntity.h"
-#include "../ifcparse/ArgumentType.h"
-
-using namespace %(schema)s;
-using namespace IfcParse;
-using namespace IfcWrite;
-
-IfcSchemaEntity %(schema)s::SchemaEntity(IfcAbstractEntityPtr e) {
-    switch(e->type()){"""%{'schema':schema_version}
-
-for e in simple_enumerations:
-    print >>cpp_file, "        case Type::%s: return new IfcEntitySelect(e); break;"%e
-for e in entity_enumerations:
-    print >>cpp_file, "        case Type::%s: return new %s(e); break;"%(e,e)
-print >>cpp_file, "        default: throw IfcException(\"Unable to find find keyword in schema\"); break; "
-print >>cpp_file, "    }\n}"
-print >>cpp_file
-print >>cpp_file, "std::string Type::ToString(Enum v) {"
-print >>cpp_file, "    if (v < 0 || v >= %d) throw IfcException(\"Unable to find find keyword in schema\");"%len(all_enumerations)
-print >>cpp_file, '    const char* names[] = { "%s" };'%'","'.join(all_enumerations)
-print >>cpp_file, '    return names[v];'
-print >>cpp_file, "}"
-print >>cpp_file
-
-print >>cpp_file, "std::map<std::string,Type::Enum> string_map;"
-print >>cpp2_file, "std::map<Type::Enum,IfcEntityDescriptor*> entity_descriptor_map;"
-print >>cpp2_file, "std::map<Type::Enum,IfcEnumerationDescriptor*> enumeration_descriptor_map;"
-maxlen = max([len(e) for e in all_enumerations])
-string_map,attribute_count_map,attribute_index_map,attribute_name_map,attribute_optional_map,attribute_type_map = [""]*6
-print >>cpp2_file, "void InitDescriptorMap() {"
-print >>cpp2_file, "    IfcEntityDescriptor* current;"
-for k,v in simple_types.items():
-    if k in enumerations or k in selections: continue
-    print >>cpp2_file, "    current = entity_descriptor_map[Type::%s] = new IfcEntityDescriptor(Type::%s,0);"%(k,k)
-    print >>cpp2_file, "    current->add(\"wrappedValue\",false,%s);"%(v.type_enum())
-rt_entities = set()
-while True:
-    todo = [e for e in entities if e.class_name not in rt_entities]
-    if len(todo) == 0: break
-    for e in todo:
-        if e.parent_class and e.parent_class not in rt_entities: continue
-        rt_entities.add(e.class_name)
-        args = e.get_attributes(False)
-        parent_descriptor = ("entity_descriptor_map.find(Type::%s)->second"%e.parent_class) if e.parent_class else "0" 
-        print >>cpp2_file, "    current = entity_descriptor_map[Type::%s] = new IfcEntityDescriptor(Type::%s,%s);"%(e.class_name,e.class_name,parent_descriptor)
-        for a,i in zip(args,range(len(args))):
-            name,optional,type,enum_class = a
-            if enum_class:
-                print >>cpp2_file, "    current->add(\"%s\",%s,%s,Type::%s);"%(name,"true" if optional else "false",type,enum_class)
-            else:
-                print >>cpp2_file, "    current->add(\"%s\",%s,%s);"%(name,"true" if optional else "false",type)
-print >>cpp2_file, "    // Enumerations"
-print >>cpp2_file, "    IfcEnumerationDescriptor* current_enum;"
-print >>cpp2_file, "    std::vector<std::string> values;"
-for e, name in [(e, name) for name, e in simple_types.items() if name in enumerations]:
-    print >>cpp2_file, "    values.clear(); values.reserve(128);"
-    for value in e.type.v:
-        print >>cpp2_file, "    values.push_back(\"%s\");"%value[0]
-    print >>cpp2_file, "    current_enum = enumeration_descriptor_map[Type::%s] = new IfcEnumerationDescriptor(Type::%s, values);"%(name,name)
-print >>cpp2_file, "}"
-        
-for e in all_enumerations:
-    string_map += '    string_map["%s"%s] = Type::%s;\n'%(e.upper()," "*(maxlen-len(e)),e)
-print >>cpp_file, """void Ifc2x3::InitStringMap() {
-    %(string_map)s
-}"""%locals()
-
-print >>cpp_file, """Type::Enum Type::FromString(const std::string& s) {
-    if (string_map.empty()) ::Ifc2x3::InitStringMap();
-    std::map<std::string,Type::Enum>::const_iterator it = string_map.find(s);
-    if ( it == string_map.end() ) throw IfcException("Unable to find find keyword in schema");
-    else return it->second;
-}"""
-
-print >>cpp_file, "Type::Enum Type::Parent(Enum v){"
-print >>cpp_file, "    if (v < 0 || v >= %d) return (Enum)-1;"%len(all_enumerations)
-for e in entity_enumerations:
-    if e not in parent_relations or parent_relations[e] is None: continue
-    print >>cpp_file, '    if(v==%s%s) { return %s; }'%(e," "*(maxlen-len(e)),parent_relations[e])
-print >>cpp_file, "    return (Enum)-1;"
-print >>cpp_file, "}"
-
-print >>cpp_file, "bool Type::IsSimple(Enum v){"
-print >>cpp_file, "    return v == Type::%s;"%" || v == Type::".join(simple_enumerations)
-print >>cpp_file, "}"
-
-for t in [T for T in types if isinstance(T.type,EnumType)]:
-    print >>cpp_file, t
-for e in entities: print >>cpp_file, e,
-print >>cpp_file, ""
-
-print >>cpp2_file, """int Type::GetAttributeIndex(Enum t, const std::string& a) {
-    if (entity_descriptor_map.empty()) ::InitDescriptorMap();
-    std::map<Type::Enum,IfcEntityDescriptor*>::const_iterator i = entity_descriptor_map.find(t);
-    if ( i == entity_descriptor_map.end() ) throw IfcException("Type not found");
-    else return i->second->getArgumentIndex(a);
-}
-
-int Type::GetAttributeCount(Enum t) {
-    if (entity_descriptor_map.empty()) ::InitDescriptorMap();
-    std::map<Type::Enum,IfcEntityDescriptor*>::const_iterator i = entity_descriptor_map.find(t);
-    if ( i == entity_descriptor_map.end() ) throw IfcException("Type not found");
-    else return i->second->getArgumentCount();
-}
-
-ArgumentType Type::GetAttributeType(Enum t, unsigned char a) {
-    if (entity_descriptor_map.empty()) ::InitDescriptorMap();
-    std::map<Type::Enum,IfcEntityDescriptor*>::const_iterator i = entity_descriptor_map.find(t);
-    if ( i == entity_descriptor_map.end() ) throw IfcException("Type not found");
-    else return i->second->getArgumentType(a);
-}
-
-const std::string& Type::GetAttributeName(Enum t, unsigned char a) {
-    if (entity_descriptor_map.empty()) ::InitDescriptorMap();
-    std::map<Type::Enum,IfcEntityDescriptor*>::const_iterator i = entity_descriptor_map.find(t);
-    if ( i == entity_descriptor_map.end() ) throw IfcException("Type not found");
-    else return i->second->getArgumentName(a);
-}
-
-bool Type::GetAttributeOptional(Enum t, unsigned char a) {
-    if (entity_descriptor_map.empty()) ::InitDescriptorMap();
-    std::map<Type::Enum,IfcEntityDescriptor*>::const_iterator i = entity_descriptor_map.find(t);
-    if ( i == entity_descriptor_map.end() ) throw IfcException("Type not found");
-    else return i->second->getArgumentOptional(a);
-}
-
-std::pair<const char*, int> Type::GetEnumerationIndex(Enum t, const std::string& a) {
-    if (enumeration_descriptor_map.empty()) ::InitDescriptorMap();
-    std::map<Type::Enum,IfcEnumerationDescriptor*>::const_iterator i = enumeration_descriptor_map.find(t);
-    if ( i == enumeration_descriptor_map.end() ) throw IfcException("Value not found");
-    else return i->second->getIndex(a);
-}
-
-Type::Enum Type::GetAttributeEnumerationClass(Enum t, unsigned char a) {
-    if (entity_descriptor_map.empty()) ::InitDescriptorMap();
-    std::map<Type::Enum,IfcEntityDescriptor*>::const_iterator i = entity_descriptor_map.find(t);
-    if ( i == entity_descriptor_map.end() ) throw IfcException("Type not found");
-    else {
-        Type::Enum t = i->second->getArgumentEnumerationClass(a);
-        if ( t == Type::ALL ) throw IfcException("Not an enumeration");
-        else return t;
-    }
-}
-"""
\ No newline at end of file
diff --git a/src/ifcexpressparser/bootstrap.py b/src/ifcexpressparser/bootstrap.py
index dd59a02..41e2d52 100644
--- a/src/ifcexpressparser/bootstrap.py
+++ b/src/ifcexpressparser/bootstrap.py
@@ -170,8 +170,8 @@ def find_keywords(expr, li = None):
 import header
 import enum_header
 import implementation
-import rt_header
-import rt_implementation
+import latebound_header
+import latebound_implementation
 
 syntax.ignore(Regex(r"\((?:\*(?:[^*]*\*+)+?\))"))
 ast = syntax.parseFile(sys.argv[1])
@@ -181,13 +181,6 @@ def find_keywords(expr, li = None):
 header.Header(mapping).emit()
 enum_header.EnumHeader(mapping).emit()
 implementation.Implementation(mapping).emit()
-rt_header.RuntimeTypingHeader(mapping).emit()
-rt_implementation.RuntimeTypingImplementation(mapping).emit()
-
-def retry():
-    import imp
-    imp.reload(rt_header)
-    imp.reload(rt_implementation)
-    rt_header.RuntimeTypingHeader(mapping).emit()
-    rt_implementation.RuntimeTypingImplementation(mapping).emit()
+latebound_header.LateBoundHeader(mapping).emit()
+latebound_implementation.LateBoundImplementation(mapping).emit()
 """%('\n'.join(statements)))
diff --git a/src/ifcexpressparser/header.py b/src/ifcexpressparser/header.py
index 89554d0..da29c0e 100644
--- a/src/ifcexpressparser/header.py
+++ b/src/ifcexpressparser/header.py
@@ -22,34 +22,34 @@
 
 class Header:
     def __init__(self, mapping):
-        emitted_types = set(mapping.express_to_cpp_typemapping.values())
         declarations = []
 
         write = lambda str, **kwargs: declarations.append(str%dict({
             'documentation': templates.multi_line_comment(documentation.description(kwargs['name']))}, **kwargs))
-
-        for name, type in mapping.schema.simpletypes.items():
-            type_str = mapping.make_type_string(type)
-            type_dep = mapping.get_type_dep(type)
-            if type_dep in emitted_types:
-                write(templates.simpletype, name=name, type=type_str)
-                emitted_types.add(name)
-
+            
+        forward_names = list(mapping.schema.entities.keys()) + list(mapping.schema.simpletypes.keys())
+        forward_definitions = "".join(["class %s; "%n for n in forward_names])
+        
         for name, type in mapping.schema.selects.items():
             write(templates.select, name=name)
-            emitted_types.add(name)
-
-        for name, type in mapping.schema.simpletypes.items():
-            if name not in emitted_types:
-                type_str = mapping.make_type_string(type)
-                write(templates.simpletype, name=name, type=type_str)
-                emitted_types.add(name)
 
         for name, type in mapping.schema.enumerations.items():
             short_name = name[:-4] if name.endswith("Enum") else name
             write(templates.enumeration, name=name, values=", ".join(["%s_%s"%(short_name, v) for v in type.values]))
-
-        forward_definitions = "".join(["class %s; "%n for n in mapping.schema.entities.keys()])
+        
+        emitted_simpletypes = set()
+        while len(emitted_simpletypes) < len(mapping.schema.simpletypes):
+            for name, type in mapping.schema.simpletypes.items():
+                if name in emitted_simpletypes: continue
+                type_str = mapping.make_type_string(mapping.flatten_type_string(type))
+                attr_type = mapping.make_argument_type(type)
+                superclass = mapping.simple_type_parent(name)
+                if superclass is None: 
+                    superclass = "IfcUtil::IfcBaseType"
+                elif superclass not in emitted_simpletypes:
+                    continue
+                emitted_simpletypes.add(name)
+                write(templates.simpletype, name=name, type=type_str, attr_type=attr_type, superclass=superclass)
 
         class_definitions = []
 
@@ -65,11 +65,11 @@ def __init__(self, mapping):
                     def write_method(attr):
                         if attr.optional:
                             attr_lines.append(templates.optional_attribute_description % (attr.name, name))
-                            attr_lines.append("bool has%s();"%(attr.name))
+                            attr_lines.append("bool has%s() const;"%(attr.name))
                         attr_lines.extend(["/// %s"%d for d in documentation.description((name, attr.name))])
                         type_str = mapping.get_parameter_type(attr, allow_optional=False, allow_entities=False)
                         if mapping.make_argument_type(attr) != "IfcUtil::Argument_UNKNOWN":
-                            attr_lines.append("%s %s();"%(type_str, attr.name))
+                            attr_lines.append("%s %s() const;"%(type_str, attr.name))
                             attr_lines.append("void set%s(%s v);"%(attr.name, type_str))
 
                     [write_method(attr) for attr in type.attributes]
@@ -103,6 +103,11 @@ def write_inverse(attr):
                     argument_type_function_body_tail = (" return %s::getArgumentType(i); "%type.supertypes[0]) if len(type.supertypes) == 1 else ' throw IfcParse::IfcException("argument out of range"); '
 
                     argument_type_function_body = argument_type_function_body_switch_stmt + argument_type_function_body_tail
+                    
+                    argument_entity_function_body_switch_stmt = " switch (i) {%s}"%("".join(['case %d: return %s; '%(i+argument_start, mapping.make_argument_entity(attr)) for i, attr in enumerate(type.attributes)])) if len(type.attributes) else ""
+                    argument_entity_function_body_tail = (" return %s::getArgumentEntity(i); "%type.supertypes[0]) if len(type.supertypes) == 1 else ' throw IfcParse::IfcException("argument out of range"); '
+
+                    argument_entity_function_body = argument_entity_function_body_switch_stmt + argument_entity_function_body_tail
 
                     constructor_arguments = ", ".join("%(full_type)s v%(index)d_%(name)s"%a for a in mapping.get_assignable_arguments(type))
 
diff --git a/src/ifcexpressparser/implementation.py b/src/ifcexpressparser/implementation.py
index 8a7445a..94aed1a 100644
--- a/src/ifcexpressparser/implementation.py
+++ b/src/ifcexpressparser/implementation.py
@@ -61,17 +61,27 @@ def __init__(self, mapping):
                 if not arg['is_inherited'] and not arg['is_derived']:
                     if arg['is_optional']:
                         write_attr(
-                            templates.function,
+                            templates.const_function,
                             class_name  = name,
                             name        = 'has%s'%arg['name'],
                             arguments   = '',
                             return_type = 'bool',
                             body        = templates.optional_attr_stmt % {'index':arg['index']-1}
                         )
-
-                    tmpl = templates.get_attr_stmt_enum if arg['is_enum'] else templates.get_attr_stmt_array if arg['is_array'] and not mapping.schema.is_simpletype(arg['list_instance_type']) and arg['list_instance_type'] not in mapping.express_to_cpp_typemapping else templates.get_attr_stmt_entity if arg['non_optional_type'].endswith('*') else templates.get_attr_stmt
+                        
+                    def find_template(arg):
+                        simple = mapping.schema.is_simpletype(arg['list_instance_type'])
+                        select = arg['list_instance_type'] == "IfcUtil::IfcBaseClass"
+                        express = arg['list_instance_type'] in mapping.express_to_cpp_typemapping
+                        if arg['is_enum']: return templates.get_attr_stmt_enum
+                        elif arg['is_nested']: return templates.get_attr_stmt_nested_array
+                        elif arg['is_array'] and not (select or simple or express): return templates.get_attr_stmt_array
+                        elif arg['non_optional_type'].endswith('*'): return templates.get_attr_stmt_entity
+                        else: return templates.get_attr_stmt
+
+                    tmpl = find_template(arg)
                     write_attr(
-                        templates.function,
+                        templates.const_function,
                         class_name  = name,
                         name        = arg['name'],
                         arguments   = '',
@@ -80,8 +90,16 @@ def __init__(self, mapping):
                                               'type' : arg['non_optional_type'].split('::')[0],
                                               'list_instance_type' : arg['list_instance_type']}
                     )
-
-                    tmpl = templates.set_attr_stmt_enum if arg['is_enum'] else templates.set_attr_stmt_array if arg['is_array'] and not mapping.schema.is_simpletype(arg['list_instance_type']) and arg['list_instance_type'] not in mapping.express_to_cpp_typemapping else templates.set_attr_stmt
+                    
+                    def find_template(arg):
+                        simple = mapping.schema.is_simpletype(arg['list_instance_type'])
+                        select = arg['list_instance_type'] == "IfcUtil::IfcBaseClass"
+                        express = arg['list_instance_type'] in mapping.express_to_cpp_typemapping
+                        if arg['is_enum']: return templates.set_attr_stmt_enum
+                        elif arg['is_array'] and not (select or simple or express): return templates.set_attr_stmt_array
+                        else: return templates.set_attr_stmt
+
+                    tmpl = find_template(arg)
                     write_attr(
                         templates.function,
                         class_name  = name,
@@ -110,16 +128,20 @@ def __init__(self, mapping):
                                                             'index' : arg['index']-1,
                                                             'stmt'  : impl}
                     constructor_implementations.append(impl)
+                    
+            def get_attribute_index(entity, attr_name):
+                related_entity = mapping.schema.entities[entity]
+                return [a['name'] for a in mapping.get_assignable_arguments(related_entity, include_derived=True)].index(attr_name)
 
-            inverse = [templates.function % {
+            inverse = [templates.const_function % {
                 'class_name'  : name,
                 'name'        : i.name,
                 'arguments'   : '',
-                'return_type' : '%s::list' % i.entity,
-                'body'        : templates.get_inverse % {'type': i.entity}
+                'return_type' : '%s::list::ptr' % i.entity,
+                'body'        : templates.get_inverse % {'type': i.entity, 'index':get_attribute_index(i.entity, i.attribute)}
             } for i in (type.inverse.elements if type.inverse else [])]
 
-            superclass = "%s((IfcAbstractEntityPtr)0)" % type.supertypes[0] if len(type.supertypes) == 1 else 'IfcUtil::IfcBaseEntity()'
+            superclass = "%s((IfcAbstractEntity*)0)" % type.supertypes[0] if len(type.supertypes) == 1 else 'IfcUtil::IfcBaseEntity()'
 
             write(
                 templates.entity_implementation,
@@ -133,7 +155,7 @@ def __init__(self, mapping):
             )
 
         selectable_simple_types = sorted(set(sum([b.values for a,b in mapping.schema.selects.items()], [])) & set(mapping.schema.types.keys()))
-        schema_entity_statements += [templates.schema_simple_stmt%locals() for name in selectable_simple_types]
+        schema_entity_statements += [templates.schema_entity_stmt%locals() for name, type in mapping.schema.simpletypes.items()]
         schema_entity_statements += [templates.schema_entity_stmt%locals() for name, type in mapping.schema.entities.items()]
 
         enumerable_types = sorted(set([name for name, type in mapping.schema.types.items()] + [name for name, type in mapping.schema.entities.items()]))
@@ -154,6 +176,37 @@ def __init__(self, mapping):
         max_id = len(enumerable_types)
 
         simple_type_statements = cator("v == Type::%s"%name for name in selectable_simple_types)
+        
+        simple_type_impl = []
+        for class_name, type in mapping.schema.simpletypes.items():
+            type_str = mapping.make_type_string(mapping.flatten_type_string(type))
+            attr_type = mapping.make_argument_type(type)
+            superclass = mapping.simple_type_parent(class_name)
+            
+            simpletype_impl_is = templates.simpletype_impl_is_with_supertype if superclass \
+                else templates.simpletype_impl_is_without_supertype
+                
+            constructor = templates.constructor_single_initlist if superclass \
+                else templates.constructor
+            
+            def compose(params):
+                class_name, attr_type, superclass, superclass_init, name, tmpl, return_type, args, body = params
+                arguments = ",".join(args)
+                body = body % locals()
+                return tmpl % locals()
+                
+            simple_type_impl.append(templates.simpletype_impl_comment % {'name': class_name})
+            simple_type_impl.extend(map(compose, map(lambda x: (class_name, attr_type, superclass, "(IfcAbstractEntity*)0")+x, (
+                ('getArgumentType', templates.const_function,       'IfcUtil::ArgumentType', ('unsigned int i',),       templates.simpletype_impl_argument_type       ),
+                ('getArgument',     templates.const_function,       'Argument*',             ('unsigned int i',),       templates.simpletype_impl_argument            ),
+                ('is',              templates.const_function,       'bool',                  ('Type::Enum v',),                   simpletype_impl_is                  ),
+                ('type',            templates.const_function,       'Type::Enum',            (),                        templates.simpletype_impl_type                ),
+                ('Class',           templates.function,             'Type::Enum',            (),                        templates.simpletype_impl_class               ),
+                ('',                          constructor,          '',                      ('IfcAbstractEntity* e',), templates.simpletype_impl_explicit_constructor),
+                ('',                          constructor,          '',                      ("%s v" % type_str,),      templates.simpletype_impl_constructor         ),
+                ('',                templates.cast_function,        type_str,                (),                        templates.simpletype_impl_cast                )
+            ))))
+            simple_type_impl.append('')
 
         self.str = templates.implementation % {
             'schema_name_upper'        : mapping.schema.name.upper(),
@@ -165,7 +218,8 @@ def __init__(self, mapping):
             'string_map_statements'    : catnl(string_map_statements),
             'simple_type_statement'    : simple_type_statements,
             'parent_type_statements'   : catnl(parent_type_statements),
-            'entity_implementations'   : catnl(entity_implementations)
+            'entity_implementations'   : catnl(entity_implementations),
+            'simple_type_impl'         : catnl(simple_type_impl)
         }
 
         self.schema_name = mapping.schema.name.capitalize()
diff --git a/src/ifcexpressparser/rt_header.py b/src/ifcexpressparser/latebound_header.py
similarity index 92%
rename from src/ifcexpressparser/rt_header.py
rename to src/ifcexpressparser/latebound_header.py
index eff7cc9..bf2db78 100644
--- a/src/ifcexpressparser/rt_header.py
+++ b/src/ifcexpressparser/latebound_header.py
@@ -19,9 +19,9 @@
 
 import templates
 
-class RuntimeTypingHeader:
+class LateBoundHeader:
     def __init__(self, mapping):
-        self.str = templates.rt_header % {
+        self.str = templates.lb_header % {
             'schema_name_upper' : mapping.schema.name.upper(),
             'schema_name'       : mapping.schema.name.capitalize()
         }
@@ -30,6 +30,6 @@ def __init__(self, mapping):
     def __repr__(self):
         return self.str
     def emit(self):
-        f = open('%s-rt.h'%self.schema_name, 'w', encoding='utf-8')
+        f = open('%s-latebound.h'%self.schema_name, 'w', encoding='utf-8')
         f.write(str(self))
         f.close()
diff --git a/src/ifcexpressparser/rt_implementation.py b/src/ifcexpressparser/latebound_implementation.py
similarity index 89%
rename from src/ifcexpressparser/rt_implementation.py
rename to src/ifcexpressparser/latebound_implementation.py
index a46e562..fe9e600 100644
--- a/src/ifcexpressparser/rt_implementation.py
+++ b/src/ifcexpressparser/latebound_implementation.py
@@ -19,7 +19,7 @@
 
 import templates
 
-class RuntimeTypingImplementation:
+class LateBoundImplementation:
     def __init__(self, mapping):
         schema_name = mapping.schema.name.capitalize()
         
@@ -32,7 +32,7 @@ def __init__(self, mapping):
             entity_descriptors.append(templates.entity_descriptor % {
                 'type'                         : name,
                 'parent_statement'             : '0',
-                'entity_descriptor_attributes' : templates.entity_descriptor_attribute % {
+                'entity_descriptor_attributes' : templates.entity_descriptor_attribute_without_entity % {
                     'name'     : 'wrappedValue',
                     'optional' : 'false',
                     'type'     : mapping.make_argument_type(mapping.schema.types[name].type)
@@ -49,12 +49,14 @@ def __init__(self, mapping):
                     entity_descriptor_attributes = []
                     for arg in constructor_arguments:
                         if not arg['is_inherited']:
-                            tmpl = templates.entity_descriptor_attribute_enum if arg['argument_type_enum'] == 'IfcUtil::Argument_ENUMERATION' else templates.entity_descriptor_attribute
+                            is_enumeration = arg['argument_type_enum'] == 'IfcUtil::Argument_ENUMERATION'
+                            tmpl = templates.entity_descriptor_attribute_with_entity
+                            entity_name = arg['argument_type'] if is_enumeration else arg['argument_entity'].split('::')[1]
                             entity_descriptor_attributes.append(tmpl % {
-                                'name'      : arg['name'],
-                                'optional'  : 'true' if arg['is_optional'] else 'false',
-                                'type'      : arg['argument_type_enum'],
-                                'enum_type' : arg['argument_type']
+                                'name'       : arg['name'],
+                                'optional'   : 'true' if arg['is_optional'] else 'false',
+                                'type'       : arg['argument_type_enum'],
+                                'entity_name': entity_name
                             })
                         
                     emitted_entities.add(name)
@@ -98,7 +100,7 @@ def __init__(self, mapping):
                         'index'        : related_attrs.index(attr.attribute)
                     })
 
-        self.str = templates.rt_implementation % {
+        self.str = templates.lb_implementation % {
             'schema_name_upper'        : mapping.schema.name.upper(),
             'schema_name'              : mapping.schema.name.capitalize(),
             'entity_descriptors'       : '\n'.join(entity_descriptors),
@@ -111,7 +113,7 @@ def __init__(self, mapping):
     def __repr__(self):
         return self.str
     def emit(self):
-        f = open('%s-rt.cpp'%self.schema_name, 'w', encoding='utf-8')
+        f = open('%s-latebound.cpp'%self.schema_name, 'w', encoding='utf-8')
         f.write(str(self))
         f.close()
 
diff --git a/src/ifcexpressparser/mapping.py b/src/ifcexpressparser/mapping.py
index 371816f..be6a493 100644
--- a/src/ifcexpressparser/mapping.py
+++ b/src/ifcexpressparser/mapping.py
@@ -33,13 +33,26 @@ class Mapping:
 
     def __init__(self, schema):
         self.schema = schema
+        
+    def flatten_type_string(self, type):
+        return self.flatten_type_string(self.schema.types[type].type.type) if self.schema.is_simpletype(type) else type
+        
+    def flatten_type(self, type):
+        res = self.flatten_type(self.schema.types[type].type.type) if self.schema.is_simpletype(type) else type
+        return res
+        
+    def simple_type_parent(self, type):
+        parent = self.schema.types[type].type.type
+        if isinstance(parent, nodes.AggregationType): parent = None
+        return None if parent in self.express_to_cpp_typemapping else parent
 
     def make_type_string(self, type):
         if isinstance(type, str):
             return self.express_to_cpp_typemapping.get(type, type)
         else:
             is_list = self.schema.is_entity(type.type)
-            tmpl = templates.list_type if is_list else templates.array_type
+            is_nested_list = isinstance(type.type, nodes.AggregationType)
+            tmpl = templates.list_list_type if is_nested_list else templates.list_type if is_list else templates.array_type
             return tmpl % {
                 'instance_type' : self.make_type_string(type.type),
                 'lower'         : type.bounds.lower,
@@ -53,6 +66,12 @@ def is_array(self, type):
             return self.is_array(self.schema.types[type].type.type)
         else:
             return False
+            
+    def make_argument_entity(self, attr):
+        type = attr.type if hasattr(attr, 'type') else attr
+        while isinstance(type, nodes.AggregationType): type = type.type
+        if type in self.express_to_cpp_typemapping or isinstance(type, nodes.BinaryType): return "Type::UNDEFINED"
+        else: return "Type::%s" % type        
 
     def make_argument_type(self, attr):
         def _make_argument_type(type):
@@ -71,10 +90,10 @@ def _make_argument_type(type):
             elif isinstance(type, nodes.AggregationType):
                 ty = _make_argument_type(type.type)
                 if ty == "UNKNOWN": return "UNKNOWN"
-                return "ENTITY_LIST" if ty == "ENTITY" else ("VECTOR_%s"%ty)
+                return "%s_LIST"%ty if ty.startswith("ENTITY") else ("VECTOR_%s"%ty)
             else: raise ValueError
-        supported = {'INT', 'BOOL', 'DOUBLE', 'STRING', 'VECTOR_INT', 'VECTOR_DOUBLE', 'VECTOR_STRING', 'ENTITY', 'ENTITY_LIST', 'ENUMERATION'}
-        ty = _make_argument_type(attr.type)
+        supported = {'INT', 'BOOL', 'DOUBLE', 'STRING', 'VECTOR_INT', 'VECTOR_DOUBLE', 'VECTOR_STRING', 'ENTITY', 'ENTITY_LIST', 'ENTITY_LIST_LIST', 'ENUMERATION'}
+        ty = _make_argument_type(attr.type if hasattr(attr, 'type') else attr)
         if ty not in supported: ty = 'UNKNOWN'
         return "IfcUtil::Argument_%s" % ty
 
@@ -85,29 +104,35 @@ def get_type_dep(self, type):
             return self.get_type_dep(type.type)
 
     def get_parameter_type(self, attr, allow_optional, allow_entities, allow_pointer = True):
-        type_str = self.express_to_cpp_typemapping.get(str(attr.type), attr.type)
+        
+        attr_type = self.flatten_type(attr.type)
+        type_str = self.express_to_cpp_typemapping.get(str(attr_type), attr_type)
+        
         is_ptr = False
-        if self.schema.is_enumeration(attr.type):
-            type_str = '%s::%s'%(attr.type, attr.type)
+        
+        if self.schema.is_enumeration(attr_type):
+            type_str = '%s::%s'%(attr_type, attr_type)
         elif isinstance(type_str, nodes.AggregationType):
-            ty = self.get_parameter_type(attr.type, False, allow_entities, allow_pointer=False)
-            if allow_entities and self.schema.is_select(attr.type.type):
+            is_nested_list = isinstance(attr_type.type, nodes.AggregationType)
+            ty = self.get_parameter_type(attr_type.type if is_nested_list else attr_type, False, allow_entities, False)
+            if True and self.schema.is_select(attr_type.type):
                 type_str = templates.untyped_list
             elif self.schema.is_simpletype(ty) or ty in self.express_to_cpp_typemapping.values():
                 type_str = templates.array_type % {
                     'instance_type' : ty,
-                    'lower'         : attr.type.bounds.lower,
-                    'upper'         : attr.type.bounds.upper
+                    'lower'         : attr_type.bounds.lower,
+                    'upper'         : attr_type.bounds.upper
                 }
             else:
-                type_str = templates.list_type % {
+                tmpl = templates.list_list_type if is_nested_list else templates.list_type
+                type_str = tmpl % {
                     'instance_type': ty
                 }
-        elif allow_pointer and self.schema.is_entity(type_str):
+        elif allow_pointer and (self.schema.is_entity(type_str) or self.schema.is_select(type_str)):
             type_str += '*'
             is_ptr = True
         elif not allow_pointer and self.schema.is_select(type_str):
-            type_str = "IfcUtil::IfcAbstractSelect"
+            type_str = "IfcUtil::IfcBaseClass*"
             is_ptr = True
         if allow_optional and attr.optional and not is_ptr:
             type_str = "boost::optional< %s >"%type_str
@@ -126,19 +151,24 @@ def derived_in_supertype(self, t):
         return c + ([str(s) for s in t.derive.elements] if t.derive else [])
 
     def list_instance_type(self, attr):
-        f = lambda v : 'IfcUtil::IfcAbstractSelect' if self.schema.is_select(v) else v
-        if self.is_array(attr.type) and not isinstance(attr.type, str):
-            return f(attr.type.type)
-        elif self.is_array(attr.type) and isinstance(attr.type, str):
-            return f(attr.type)
-        else: return None
+        f = lambda v : 'IfcUtil::IfcBaseClass' if self.schema.is_select(v) else v
+        if self.is_array(attr.type):
+            if not isinstance(attr.type, str) and self.is_array(attr.type.type):
+                if isinstance(attr.type.type, str):
+                    return f(attr.type.type)
+                else: return f(attr.type.type.type)
+            else:
+                if isinstance(attr.type, str):
+                    return f(attr.type)
+                else: return f(attr.type.type)
+        return None
 
     def is_templated_list(self, attr):
         ty = self.list_instance_type(attr)
         arr = self.is_array(attr.type)
         simple = self.schema.is_simpletype(ty)
         express = ty in self.express_to_cpp_typemapping
-        select = ty == 'IfcUtil::IfcAbstractSelect'
+        select = ty == 'IfcUtil::IfcBaseClass'
         return arr and not simple and not express and not select
 
     def get_assignable_arguments(self, t, include_derived = False):
@@ -163,9 +193,11 @@ def include(attr):
             'is_inherited'       : i < num_inherited,
             'is_enum'            : attr.type in self.schema.enumerations,
             'is_array'           : self.is_array(attr.type),
+            'is_nested'          : self.is_array(attr.type) and not isinstance(attr.type, str) and self.is_array(attr.type.type),
             'is_derived'         : attr.name in derived,
             'is_templated_list'  : self.is_templated_list(attr),
             'argument_type_enum' : self.make_argument_type(attr),
+            'argument_entity'    : self.make_argument_entity(attr),
             'argument_type'      : attr.type
         } for i, attr in attrs if include(attr)]
 
diff --git a/src/ifcexpressparser/templates.py b/src/ifcexpressparser/templates.py
index 6f139c6..b01f335 100644
--- a/src/ifcexpressparser/templates.py
+++ b/src/ifcexpressparser/templates.py
@@ -35,6 +35,8 @@
 
 namespace %(schema_name)s {
 
+const char* const Identifier = "%(schema_name_upper)s";
+
 // Forward definitions
 %(forward_definitions)s
 
@@ -42,7 +44,7 @@
 
 %(class_definitions)s
 void InitStringMap();
-IfcUtil::IfcSchemaEntity SchemaEntity(IfcAbstractEntityPtr e = 0);
+IfcUtil::IfcBaseClass* SchemaEntity(IfcAbstractEntity* e = 0);
 }
 
 #endif
@@ -58,7 +60,7 @@
 
 namespace Type {
     typedef enum {
-        %(types)s, ALL
+        %(types)s, UNDEFINED
     } Enum;
     Enum Parent(Enum v);
     Enum FromString(const std::string& s);
@@ -71,7 +73,7 @@
 #endif
 """
 
-rt_header = """
+lb_header = """
 #ifndef %(schema_name_upper)sRT_H
 #define %(schema_name_upper)sRT_H
 
@@ -86,11 +88,13 @@
     int GetAttributeCount(Enum t);
     int GetAttributeIndex(Enum t, const std::string& a);
     IfcUtil::ArgumentType GetAttributeType(Enum t, unsigned char a);
+    Enum GetAttributeEntity(Enum t, unsigned char a);
     const std::string& GetAttributeName(Enum t, unsigned char a);
     bool GetAttributeOptional(Enum t, unsigned char a);
+    bool GetAttributeDerived(Enum t, unsigned char a);
     std::pair<const char*, int> GetEnumerationIndex(Enum t, const std::string& a);
     std::pair<Enum, unsigned> GetInverseAttribute(Enum t, const std::string& a);
-    Enum GetAttributeEnumerationClass(Enum t, unsigned char a);
+    std::set<std::string> GetInverseAttributeNames(Enum t);
     void PopulateDerivedFields(IfcWrite::IfcWritableEntity* e);
 }}
 
@@ -107,7 +111,7 @@
 using namespace IfcParse;
 using namespace IfcWrite;
 
-IfcUtil::IfcSchemaEntity %(schema_name)s::SchemaEntity(IfcAbstractEntityPtr e) {
+IfcUtil::IfcBaseClass* %(schema_name)s::SchemaEntity(IfcAbstractEntity* e) {
     switch(e->type()) {
 %(schema_entity_statements)s
         default: throw IfcException("Unable to find find keyword in schema"); break;
@@ -144,31 +148,16 @@
 
 %(enumeration_functions)s
 
-#define RETURN_INVERSE(T) \
-    IfcEntities e = entity->getInverse(T::Class()); \
-    SHARED_PTR< IfcTemplatedEntityList<T> > l ( new IfcTemplatedEntityList<T>() ); \
-    for ( IfcEntityList::it it = e->begin(); it != e->end(); ++ it ) { \
-        l->push(reinterpret_pointer_cast<IfcBaseClass,T>(*it)); \
-    } \
-    return l;
-
-#define RETURN_AS_SINGLE(T,a) \
-    return reinterpret_pointer_cast<IfcBaseClass,T>(*entity->getArgument(a));
-
-#define RETURN_AS_LIST(T,a)  \
-    IfcEntities e = *entity->getArgument(a);  \
-    SHARED_PTR< IfcTemplatedEntityList<T> > l ( new IfcTemplatedEntityList<T>() );  \
-    for ( IfcEntityList::it it = e->begin(); it != e->end(); ++ it ) {  \
-        l->push(reinterpret_pointer_cast<IfcBaseClass,T>(*it)); \
-    }  \
-    return l;
+%(simple_type_impl)s
 
 %(entity_implementations)s
 """
 
-rt_implementation = """
+lb_implementation = """
+#include <set>
+
 #include "../ifcparse/%(schema_name)s.h"
-#include "../ifcparse/%(schema_name)s-rt.h"
+#include "../ifcparse/%(schema_name)s-latebound.h"
 #include "../ifcparse/IfcException.h"
 #include "../ifcparse/IfcWrite.h"
 #include "../ifcparse/IfcWritableEntity.h"
@@ -180,9 +169,21 @@
 using namespace IfcWrite;
 using namespace IfcUtil;
 
-std::map<Type::Enum,IfcEntityDescriptor*> entity_descriptor_map;
-std::map<Type::Enum,IfcEnumerationDescriptor*> enumeration_descriptor_map;
-std::map<std::pair<Type::Enum, std::string>, std::pair<Type::Enum, int> > inverse_map;
+typedef std::map<Type::Enum,IfcEntityDescriptor*> entity_descriptor_map_t;
+typedef std::map<Type::Enum,IfcEnumerationDescriptor*> enumeration_descriptor_map_t;
+typedef std::map<Type::Enum, std::map<std::string, std::pair<Type::Enum, int> > > inverse_map_t;
+typedef std::map<Type::Enum,std::set<int> > derived_map_t;
+
+entity_descriptor_map_t entity_descriptor_map;
+enumeration_descriptor_map_t enumeration_descriptor_map;
+inverse_map_t inverse_map;
+derived_map_t derived_map;
+
+
+#ifdef _MSC_VER
+#  pragma optimize( "", off )
+#endif
+
 void InitDescriptorMap() {
     IfcEntityDescriptor* current;
 %(entity_descriptors)s
@@ -192,10 +193,18 @@
 %(enumeration_descriptors)s
 }
 
+#ifdef _MSC_VER
+#  pragma optimize( "", on )
+#endif
+
 void InitInverseMap() {
 %(inverse_implementations)s
 }
 
+void InitDerivedMap() {
+%(derived_field_statements)s
+}
+
 int Type::GetAttributeIndex(Enum t, const std::string& a) {
     if (entity_descriptor_map.empty()) ::InitDescriptorMap();
     std::map<Type::Enum,IfcEntityDescriptor*>::const_iterator i = entity_descriptor_map.find(t);
@@ -217,6 +226,13 @@
     else return i->second->getArgumentType(a);
 }
 
+Type::Enum Type::GetAttributeEntity(Enum t, unsigned char a) {
+    if (entity_descriptor_map.empty()) ::InitDescriptorMap();
+    std::map<Type::Enum,IfcEntityDescriptor*>::const_iterator i = entity_descriptor_map.find(t);
+    if ( i == entity_descriptor_map.end() ) throw IfcException("Type not found");
+    else return i->second->getArgumentEntity(a);
+}
+
 const std::string& Type::GetAttributeName(Enum t, unsigned char a) {
     if (entity_descriptor_map.empty()) ::InitDescriptorMap();
     std::map<Type::Enum,IfcEntityDescriptor*>::const_iterator i = entity_descriptor_map.find(t);
@@ -231,6 +247,12 @@
     else return i->second->getArgumentOptional(a);
 }
 
+bool Type::GetAttributeDerived(Enum t, unsigned char a) {
+    if (derived_map.empty()) ::InitDerivedMap();
+    std::map<Type::Enum,std::set<int> >::const_iterator i = derived_map.find(t);
+    return i != derived_map.end() && i->second.find(a) != i->second.end();
+}
+
 std::pair<const char*, int> Type::GetEnumerationIndex(Enum t, const std::string& a) {
     if (enumeration_descriptor_map.empty()) ::InitDescriptorMap();
     std::map<Type::Enum,IfcEnumerationDescriptor*>::const_iterator i = enumeration_descriptor_map.find(t);
@@ -240,30 +262,48 @@
 
 std::pair<Type::Enum, unsigned> Type::GetInverseAttribute(Enum t, const std::string& a) {
 	if (inverse_map.empty()) ::InitInverseMap();
-	std::map<std::pair<Type::Enum, std::string>, std::pair<Type::Enum, int> >::const_iterator it;
-    std::pair<Type::Enum, std::string> key = std::make_pair(t, a);
+	inverse_map_t::const_iterator it;
+	inverse_map_t::mapped_type::const_iterator jt;
     while (true) {
-        it = inverse_map.find(key);
-        if (it != inverse_map.end()) return it->second;
-        if ((key.first = Parent(key.first)) == -1) break;
+        it = inverse_map.find(t);
+        if (it != inverse_map.end()) {
+			jt = it->second.find(a);
+			if (jt != it->second.end()) {
+				return jt->second;
+			}
+		}
+        if ((t = Parent(t)) == -1) break;
     }
     throw IfcException("Attribute not found");
 }
 
-Type::Enum Type::GetAttributeEnumerationClass(Enum t, unsigned char a) {
-    if (entity_descriptor_map.empty()) ::InitDescriptorMap();
-    std::map<Type::Enum,IfcEntityDescriptor*>::const_iterator i = entity_descriptor_map.find(t);
-    if ( i == entity_descriptor_map.end() ) throw IfcException("Type not found");
-    else {
-        Type::Enum t = i->second->getArgumentEnumerationClass(a);
-        if ( t == Type::ALL ) throw IfcException("Not an enumeration");
-        else return t;
+std::set<std::string> Type::GetInverseAttributeNames(Enum t) {
+	if (inverse_map.empty()) ::InitInverseMap();
+	inverse_map_t::const_iterator it;
+	inverse_map_t::mapped_type::const_iterator jt;
+
+	std::set<std::string> return_value;
+
+    while (true) {
+        it = inverse_map.find(t);
+        if (it != inverse_map.end()) {
+			for (jt = it->second.begin(); jt != it->second.end(); ++jt) {
+				return_value.insert(jt->first);
+			}
+		}
+        if ((t = Parent(t)) == -1) break;
     }
+    
+	return return_value;
 }
 
 void Type::PopulateDerivedFields(IfcWrite::IfcWritableEntity* e) {
-    Type::Enum type = e->type();
-%(derived_field_statements)s
+    std::map<Type::Enum, std::set<int> >::const_iterator i = derived_map.find(e->type());
+	if (i != derived_map.end()) {
+		for (std::set<int>::const_iterator it = i->second.begin(); it != i->second.end(); ++it) {
+			e->setArgumentDerived(*it);
+		}
+	}
 }
 """
 
@@ -271,8 +311,8 @@
 %(entity_descriptor_attributes)s"""
 
 entity_descriptor_parent = "entity_descriptor_map.find(Type::%(type)s)->second"
-entity_descriptor_attribute = '    current->add("%(name)s",%(optional)s,%(type)s);'
-entity_descriptor_attribute_enum = '    current->add("%(name)s",%(optional)s,%(type)s,Type::%(enum_type)s);'
+entity_descriptor_attribute_without_entity = '    current->add("%(name)s",%(optional)s,%(type)s);'
+entity_descriptor_attribute_with_entity = '    current->add("%(name)s",%(optional)s,%(type)s,Type::%(entity_name)s);'
 
 enumeration_descriptor = """    values.clear(); values.reserve(128);
 %(enumeration_descriptor_values)s
@@ -280,15 +320,36 @@
 
 enumeration_descriptor_value = '    values.push_back("%(name)s");'
 
-derived_field_statement = '    if (type == Type::%(type)s) { %(statements)s}';
-derived_field_statement_attrs = 'e->setArgumentDerived(%d); '
+derived_field_statement = '    {std::set<int> idxs; %(statements)sderived_map[Type::%(type)s] = idxs;}';
+derived_field_statement_attrs = 'idxs.insert(%d); '
 
 simpletype = """%(documentation)s
-typedef %(type)s %(name)s;
+class %(name)s : public %(superclass)s {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit %(name)s (IfcAbstractEntity* e);
+    %(name)s (%(type)s v);
+    operator %(type)s() const;
+};
 """
 
+simpletype_impl_comment = "// Function implementations for %(name)s"
+simpletype_impl_argument_type = "if (i == 0) { return %(attr_type)s; } else { throw IfcParse::IfcException(\"argument out of range\"); }"
+simpletype_impl_argument = "return entity->getArgument(i);"
+simpletype_impl_is_with_supertype = "return v == Type::%(class_name)s || %(superclass)s::is(v);"
+simpletype_impl_is_without_supertype = "return v == %(class_name)s::Class();"
+simpletype_impl_type = "return Type::%(class_name)s;"
+simpletype_impl_class = "return Type::%(class_name)s;"
+simpletype_impl_explicit_constructor = "entity = e;"
+simpletype_impl_constructor = "IfcWritableEntity* e = new IfcWritableEntity(Type::%(class_name)s); e->setArgument(0, v); entity = e;"
+simpletype_impl_cast = "return *entity->getArgument(0);"    
+    
 select = """%(documentation)s
-typedef IfcUtil::IfcSchemaEntity %(name)s;
+typedef IfcUtil::IfcBaseClass %(name)s;
 """
 
 enumeration = """namespace %(name)s {
@@ -304,16 +365,15 @@ class %(name)s %(superclass)s{
 public:
 %(attributes)s    virtual unsigned int getArgumentCount() const { return %(argument_count)d; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const {%(argument_type_function_body)s}
+    virtual Type::Enum getArgumentEntity(unsigned int i) const {%(argument_entity_function_body)s}
     virtual const char* getArgumentName(unsigned int i) const {%(argument_name_function_body)s}
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
 %(inverse)s    bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    %(name)s (IfcAbstractEntityPtr e);
+    %(name)s (IfcAbstractEntity* e);
     %(name)s (%(constructor_arguments)s);
-    typedef %(name)s* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< %(name)s > > list;
-    typedef IfcTemplatedEntityList< %(name)s >::it it;
+    typedef IfcTemplatedEntityList< %(name)s > list;
 };
 """
 
@@ -334,18 +394,23 @@ class %(name)s %(superclass)s{
 %(attributes)s%(inverse)sbool %(name)s::is(Type::Enum v) const { return v == Type::%(name)s%(parent_type_test)s; }
 Type::Enum %(name)s::type() const { return Type::%(name)s; }
 Type::Enum %(name)s::Class() { return Type::%(name)s; }
-%(name)s::%(name)s(IfcAbstractEntityPtr e) : %(superclass)s { if (!e) return; if (!e->is(Type::%(name)s)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+%(name)s::%(name)s(IfcAbstractEntity* e) : %(superclass)s { if (!e) return; if (!e->is(Type::%(name)s)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
 %(name)s::%(name)s(%(constructor_arguments)s) : %(superclass)s { IfcWritableEntity* e = new IfcWritableEntity(Class());%(constructor_implementation)s entity = e; EntityBuffer::Add(this); }
 """
 
 optional_attribute_description = "/// Whether the optional attribute %s is defined for this %s"
 
 function = "%(return_type)s %(class_name)s::%(name)s(%(arguments)s) { %(body)s }"
+const_function = "%(return_type)s %(class_name)s::%(name)s(%(arguments)s) const { %(body)s }"
+constructor = "%(class_name)s::%(class_name)s(%(arguments)s) { %(body)s }"
+constructor_single_initlist = "%(class_name)s::%(class_name)s(%(arguments)s) : %(superclass)s(%(superclass_init)s) { %(body)s }"
+cast_function = "%(class_name)s::operator %(return_type)s() const { %(body)s }"
 
 array_type = "std::vector< %(instance_type)s > /*[%(lower)s:%(upper)s]*/"
-list_type = "SHARED_PTR< IfcTemplatedEntityList< %(instance_type)s > >"
-untyped_list = "IfcEntities"
-inverse_attr = "SHARED_PTR< IfcTemplatedEntityList< %(entity)s > > %(name)s(); // INVERSE %(entity)s::%(attribute)s"
+list_type = "IfcTemplatedEntityList< %(instance_type)s >::ptr"
+list_list_type = "IfcTemplatedEntityListList< %(instance_type)s >::ptr"
+untyped_list = "IfcEntityList::ptr"
+inverse_attr = "IfcTemplatedEntityList< %(entity)s >::ptr %(name)s() const; // INVERSE %(entity)s::%(attribute)s"
 
 enum_from_string_stmt = '    if (s == "%(value)s") return ::%(schema_name)s::%(name)s::%(short_name)s_%(value)s;'
 
@@ -360,10 +425,11 @@ class %(name)s %(superclass)s{
 
 get_attr_stmt = "return *entity->getArgument(%(index)d);"
 get_attr_stmt_enum = "return %(type)s::FromString(*entity->getArgument(%(index)d));"
-get_attr_stmt_entity = "return (%(type)s)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(%(index)d)));"
-get_attr_stmt_array = "RETURN_AS_LIST(%(list_instance_type)s,%(index)d)"
+get_attr_stmt_entity = "return (%(type)s)((IfcUtil::IfcBaseClass*)(*entity->getArgument(%(index)d)));"
+get_attr_stmt_array = "IfcEntityList::ptr es = *entity->getArgument(%(index)d); return es->as<%(list_instance_type)s>();"
+get_attr_stmt_nested_array = "IfcEntityListList::ptr es = *entity->getArgument(%(index)d); return es->as<%(list_instance_type)s>();"
 
-get_inverse = "RETURN_INVERSE(%(type)s)"
+get_inverse = "return entity->getInverse(Type::%(type)s, %(index)d)->as<%(type)s>();"
 
 set_attr_stmt = "if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(%(index)d,v);"
 set_attr_stmt_enum = "if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(%(index)d,v,%(type)s::ToString(v));"
@@ -375,7 +441,7 @@ class %(name)s %(superclass)s{
 constructor_stmt_optional = " if (%(name)s) {%(stmt)s } else { e->setArgument(%(index)d); }"
 constructor_stmt_derived = " e->setArgumentDerived(%(index)d);"
 
-inverse_implementation = "    inverse_map.insert(std::make_pair(std::make_pair(Type::%(type)s, \"%(name)s\"), std::make_pair(Type::%(related_type)s, %(index)d)));"
+inverse_implementation = "    inverse_map[Type::%(type)s].insert(std::make_pair(\"%(name)s\", std::make_pair(Type::%(related_type)s, %(index)d)));"
 
 def multi_line_comment(li):
     return ("/// %s"%("\n/// ".join(li))) if len(li) else ""
diff --git a/src/ifcgeom/IfcGeom.h b/src/ifcgeom/IfcGeom.h
index 954ce70..4ddae46 100644
--- a/src/ifcgeom/IfcGeom.h
+++ b/src/ifcgeom/IfcGeom.h
@@ -36,14 +36,32 @@
 #include <TopoDS_Face.hxx>
 #include <Geom_Curve.hxx>
 #include <gp_Pln.hxx>
+#include <TColgp_SequenceOfPnt.hxx>
 
 #include "../ifcparse/IfcParse.h"
 #include "../ifcparse/IfcUtil.h"
 
+#include "../ifcgeom/IfcGeomElement.h" 
+#include "../ifcgeom/IfcGeomRepresentation.h" 
 #include "../ifcgeom/IfcRepresentationShapeItem.h"
 
+#define IN_CACHE(T,E,t,e) std::map<int,t>::const_iterator it = cache.T.find(E->entity->id());\
+if ( it != cache.T.end() ) { e = it->second; return true; }
+#define CACHE(T,E,e) cache.T[E->entity->id()] = e;
+
 namespace IfcGeom {
 
+class Cache {
+public:
+#include "IfcRegisterCreateCache.h"
+	std::map<int, SurfaceStyle> Style;
+	std::map<int, TopoDS_Shape> Shape;
+};
+
+class Kernel {
+private:
+	Cache cache;
+public:
 	// Tolerances and settings for various geometrical operations:
 	enum GeomValue {
 		// Specifies the deflection of the mesher
@@ -79,20 +97,17 @@ namespace IfcGeom {
 		GV_PRECISION
 	};
 
-	const int DISABLE_OPENING_SUBTRACTIONS = 1 << 0;
-	const int DISABLE_OBJECT_PLACEMENT     = 1 << 1;
-	const int SEW_SHELLS                   = 1 << 2;
-	
 	bool convert_wire_to_face(const TopoDS_Wire& wire, TopoDS_Face& face);
 	bool convert_curve_to_wire(const Handle(Geom_Curve)& curve, TopoDS_Wire& wire);
 	bool convert_shapes(const IfcUtil::IfcBaseClass* L, IfcRepresentationShapeItems& result);
 	bool is_shape_collection(const IfcUtil::IfcBaseClass* L);
 	bool convert_shape(const IfcUtil::IfcBaseClass* L, TopoDS_Shape& result);
+	bool flatten_shape_list(const IfcGeom::IfcRepresentationShapeItems& shapes, TopoDS_Shape& result, bool fuse);
 	bool convert_wire(const IfcUtil::IfcBaseClass* L, TopoDS_Wire& result);
 	bool convert_curve(const IfcUtil::IfcBaseClass* L, Handle(Geom_Curve)& result);
 	bool convert_face(const IfcUtil::IfcBaseClass* L, TopoDS_Shape& result);
-	bool convert_openings(const IfcSchema::IfcProduct::ptr entity, const IfcSchema::IfcRelVoidsElement::list& openings, const IfcRepresentationShapeItems& entity_shapes, const gp_Trsf& entity_trsf, IfcRepresentationShapeItems& cut_shapes);
-	bool convert_openings_fast(const IfcSchema::IfcProduct::ptr entity, const IfcSchema::IfcRelVoidsElement::list& openings, const IfcRepresentationShapeItems& entity_shapes, const gp_Trsf& entity_trsf, IfcRepresentationShapeItems& cut_shapes);
+	bool convert_openings(const IfcSchema::IfcProduct* entity, const IfcSchema::IfcRelVoidsElement::list::ptr& openings, const IfcRepresentationShapeItems& entity_shapes, const gp_Trsf& entity_trsf, IfcRepresentationShapeItems& cut_shapes);
+	bool convert_openings_fast(const IfcSchema::IfcProduct* entity, const IfcSchema::IfcRelVoidsElement::list::ptr& openings, const IfcRepresentationShapeItems& entity_shapes, const gp_Trsf& entity_trsf, IfcRepresentationShapeItems& cut_shapes);
 	IfcSchema::IfcSurfaceStyleShading* get_surface_style(IfcSchema::IfcRepresentationItem* item);
 	bool create_solid_from_compound(const TopoDS_Shape& compound, TopoDS_Shape& solid);
 	bool is_compound(const TopoDS_Shape& shape);
@@ -105,18 +120,65 @@ namespace IfcGeom {
 	double shape_volume(const TopoDS_Shape& s);
 	double face_area(const TopoDS_Face& f);
 	void apply_tolerance(TopoDS_Shape& s, double t);
-	void SetValue(GeomValue var, double value);
-	double GetValue(GeomValue var);
-	std::string create_brep_data(Ifc2x3::IfcProduct* s, unsigned int settings);
-    bool fill_nonmanifold_wires_with_planar_faces(TopoDS_Shape& shape);
-	IfcSchema::IfcProductDefinitionShape* tesselate(TopoDS_Shape& shape, double deflection, IfcEntities es);
+	void setValue(GeomValue var, double value);
+	double getValue(GeomValue var);
+	bool fill_nonmanifold_wires_with_planar_faces(TopoDS_Shape& shape);
+	void remove_redundant_points_from_loop(TColgp_SequenceOfPnt& polygon, bool closed, double tol=-1.);
 
+	std::pair<std::string, double> initializeUnits(IfcSchema::IfcUnitAssignment*);
+
+	IfcSchema::IfcObjectDefinition* get_decomposing_entity(IfcSchema::IfcProduct*);
+
+	template <typename P>
+	IfcGeom::BRepElement<P>* create_brep_for_representation_and_product(const IteratorSettings&, IfcSchema::IfcRepresentation*, IfcSchema::IfcProduct*);
+
+	const SurfaceStyle* get_style(const IfcSchema::IfcRepresentationItem* representation_item);
 	
-	
-	namespace Cache {
-		void Purge();
-		void PurgeShapeCache();
+	template <typename T> std::pair<IfcSchema::IfcSurfaceStyle*, T*> get_surface_style(const IfcSchema::IfcRepresentationItem* representation_item) {
+		IfcSchema::IfcStyledItem::list::ptr styled_items = representation_item->StyledByItem();
+		for (IfcSchema::IfcStyledItem::list::it jt = styled_items->begin(); jt != styled_items->end(); ++jt) {
+#ifdef USE_IFC4
+			IfcUtil::IfcAbstractSelect::list::ptr style_assignments = (*jt)->Styles();
+			for (IfcUtil::IfcAbstractSelect::list::it kt = style_assignments->begin(); kt != style_assignments->end(); ++kt) {
+				if (!(*kt)->is(IfcSchema::Type::IfcPresentationStyleAssignment)) {
+					continue;
+				}
+				IfcSchema::IfcPresentationStyleAssignment* style_assignment = (IfcSchema::IfcPresentationStyleAssignment*) *kt;
+#else
+			IfcSchema::IfcPresentationStyleAssignment::list::ptr style_assignments = (*jt)->Styles();
+			for (IfcSchema::IfcPresentationStyleAssignment::list::it kt = style_assignments->begin(); kt != style_assignments->end(); ++kt) {
+				IfcSchema::IfcPresentationStyleAssignment* style_assignment = *kt;
+#endif
+				IfcEntityList::ptr styles = style_assignment->Styles();
+				for (IfcEntityList::it lt = styles->begin(); lt != styles->end(); ++lt) {
+					IfcUtil::IfcBaseClass* style = *lt;
+					if (style->is(IfcSchema::Type::IfcSurfaceStyle)) {
+						IfcSchema::IfcSurfaceStyle* surface_style = (IfcSchema::IfcSurfaceStyle*) style;
+						if (surface_style->Side() != IfcSchema::IfcSurfaceSide::IfcSurfaceSide_NEGATIVE) {
+							IfcEntityList::ptr styles_elements = surface_style->Styles();
+							for (IfcEntityList::it mt = styles_elements->begin(); mt != styles_elements->end(); ++mt) {
+								if ((*mt)->is(T::Class())) {
+									return std::make_pair(surface_style, (T*) *mt);
+								}
+							}
+						}
+					}
+				}
+			}
+
+			// StyledByItem is a SET [0:1] OF IfcStyledItem, so we
+			// break after encountering the first IfcStyledItem
+			break;
+		}
+
+		return std::make_pair<IfcSchema::IfcSurfaceStyle*, T*>(0,0);
 	}
+
 #include "IfcRegisterGeomHeader.h"
+
+};
+
+IfcSchema::IfcProductDefinitionShape* tesselate(TopoDS_Shape& shape, double deflection, IfcEntityList::ptr es);
+
 }
 #endif
diff --git a/src/ifcgeom/IfcGeomCurves.cpp b/src/ifcgeom/IfcGeomCurves.cpp
index b205932..7705a08 100644
--- a/src/ifcgeom/IfcGeomCurves.cpp
+++ b/src/ifcgeom/IfcGeomCurves.cpp
@@ -79,28 +79,28 @@
 
 #include "../ifcgeom/IfcGeom.h"
 
-bool IfcGeom::convert(const IfcSchema::IfcCircle::ptr l, Handle(Geom_Curve)& curve) {
-	const double r = l->Radius() * IfcGeom::GetValue(GV_LENGTH_UNIT);
+bool IfcGeom::Kernel::convert(const IfcSchema::IfcCircle* l, Handle(Geom_Curve)& curve) {
+	const double r = l->Radius() * getValue(GV_LENGTH_UNIT);
 	if ( r < ALMOST_ZERO ) { 
 		Logger::Message(Logger::LOG_ERROR, "Radius not greater than zero for:", l->entity);
 		return false;
 	}
 	gp_Trsf trsf;
-	IfcSchema::IfcAxis2Placement placement = l->Position();
+	IfcSchema::IfcAxis2Placement* placement = l->Position();
 	if (placement->is(IfcSchema::Type::IfcAxis2Placement3D)) {
-		IfcGeom::convert((IfcSchema::IfcAxis2Placement3D*)placement,trsf);
+		IfcGeom::Kernel::convert((IfcSchema::IfcAxis2Placement3D*)placement,trsf);
 	} else {
 		gp_Trsf2d trsf2d;
-		IfcGeom::convert((IfcAxis2Placement2D*)placement,trsf2d);
+		IfcGeom::Kernel::convert((IfcSchema::IfcAxis2Placement2D*)placement,trsf2d);
 		trsf = trsf2d;
 	}
 	gp_Ax2 ax = gp_Ax2().Transformed(trsf);
 	curve = new Geom_Circle(ax, r);
 	return true;
 }
-bool IfcGeom::convert(const IfcSchema::IfcEllipse::ptr l, Handle(Geom_Curve)& curve) {
-	double x = l->SemiAxis1() * IfcGeom::GetValue(GV_LENGTH_UNIT);
-	double y = l->SemiAxis2() * IfcGeom::GetValue(GV_LENGTH_UNIT);
+bool IfcGeom::Kernel::convert(const IfcSchema::IfcEllipse* l, Handle(Geom_Curve)& curve) {
+	double x = l->SemiAxis1() * getValue(GV_LENGTH_UNIT);
+	double y = l->SemiAxis2() * getValue(GV_LENGTH_UNIT);
 	if (x < ALMOST_ZERO || y < ALMOST_ZERO) { 
 		Logger::Message(Logger::LOG_ERROR, "Radius not greater than zero for:", l->entity);
 		return false;
@@ -111,12 +111,12 @@ bool IfcGeom::convert(const IfcSchema::IfcEllipse::ptr l, Handle(Geom_Curve)& cu
 	// when creating a trimmed curve off of an ellipse like this.
 	const bool rotated = y > x;
 	gp_Trsf trsf;
-	IfcSchema::IfcAxis2Placement placement = l->Position();
+	IfcSchema::IfcAxis2Placement* placement = l->Position();
 	if (placement->is(IfcSchema::Type::IfcAxis2Placement3D)) {
-		IfcGeom::convert((IfcSchema::IfcAxis2Placement3D*)placement,trsf);
+		convert((IfcSchema::IfcAxis2Placement3D*)placement,trsf);
 	} else {
 		gp_Trsf2d trsf2d;
-		IfcGeom::convert((IfcSchema::IfcAxis2Placement2D*)placement,trsf2d);
+		convert((IfcSchema::IfcAxis2Placement2D*)placement,trsf2d);
 		trsf = trsf2d;
 	}
 	gp_Ax2 ax = gp_Ax2();
@@ -128,10 +128,10 @@ bool IfcGeom::convert(const IfcSchema::IfcEllipse::ptr l, Handle(Geom_Curve)& cu
 	curve = new Geom_Ellipse(ax, x, y);
 	return true;
 }
-bool IfcGeom::convert(const IfcSchema::IfcLine::ptr l, Handle(Geom_Curve)& curve) {
+bool IfcGeom::Kernel::convert(const IfcSchema::IfcLine* l, Handle(Geom_Curve)& curve) {
 	gp_Pnt pnt;gp_Vec vec;
-	IfcGeom::convert(l->Pnt(),pnt);
-	IfcGeom::convert(l->Dir(),vec);	
+	convert(l->Pnt(),pnt);
+	convert(l->Dir(),vec);	
 	// See note at IfcGeomWires.cpp:237
 	curve = new Geom_Line(pnt,vec);
 	return true;
diff --git a/src/ifcgeom/IfcGeomElement.h b/src/ifcgeom/IfcGeomElement.h
new file mode 100644
index 0000000..c44fd8d
--- /dev/null
+++ b/src/ifcgeom/IfcGeomElement.h
@@ -0,0 +1,144 @@
+/********************************************************************************
+ *                                                                              *
+ * This file is part of IfcOpenShell.                                           *
+ *                                                                              *
+ * IfcOpenShell is free software: you can redistribute it and/or modify         *
+ * it under the terms of the Lesser GNU General Public License as published by  *
+ * the Free Software Foundation, either version 3.0 of the License, or          *
+ * (at your option) any later version.                                          *
+ *                                                                              *
+ * IfcOpenShell 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                 *
+ * Lesser GNU General Public License for more details.                          *
+ *                                                                              *
+ * You should have received a copy of the Lesser GNU General Public License     *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.         *
+ *                                                                              *
+ ********************************************************************************/
+
+#ifndef IFCGEOMELEMENT_H
+#define IFCGEOMELEMENT_H
+
+#include "../ifcgeom/IfcGeomRepresentation.h"
+#include "../ifcgeom/IfcGeomIteratorSettings.h"
+
+
+namespace IfcGeom {
+
+	template <typename P>
+	class Matrix {
+	private:
+		std::vector<P> _data;
+	public:
+		Matrix(const ElementSettings& settings, const gp_Trsf& trsf) {
+			// Convert the gp_Trsf into a 4x3 Matrix
+			// Note that in case the CONVERT_BACK_UNITS setting is enabled
+			// the translation component of the matrix needs to be divided
+			// by the magnitude of the IFC model length unit because
+			// internally in IfcOpenShell everything is measured in meters.
+			for(int i = 1; i < 5; ++i) {
+				for (int j = 1; j < 4; ++j) {
+					const double trsf_value = trsf.Value(j,i);
+					const double matrix_value = i == 4 && settings.convert_back_units()
+						? trsf_value / settings.unit_magnitude()
+						: trsf_value;
+					_data.push_back(static_cast<P>(matrix_value));
+				}
+			}
+		}
+		const std::vector<P>& data() const { return _data; }
+	};
+
+	template <typename P>
+	class Transformation {
+	private:
+		gp_Trsf trsf;
+		Matrix<P> _matrix;
+	public:
+		Transformation(const ElementSettings& settings, const gp_Trsf& trsf)
+			: trsf(trsf)
+			, _matrix(settings, trsf) 
+		{}
+		const gp_Trsf& data() const { return trsf; }
+		const Matrix<P>& matrix() const { return _matrix; }
+	};
+
+	template <typename P>
+	class Element {
+	private:
+		int _id;
+		int _parent_id;
+		std::string _name;
+		std::string _type;
+		std::string _guid;
+		Transformation<P> _transformation;
+	public:
+		int id() const { return _id; }
+		int parent_id() const { return _parent_id; }
+		const std::string& name() const { return _name; }
+		const std::string& type() const { return _type; }
+		const std::string& guid() const { return _guid; }
+		const Transformation<P>& transformation() const { return _transformation; }
+		Element(const ElementSettings& settings, int id, int parent_id, const std::string& name, const std::string& type, const std::string& guid, const gp_Trsf& trsf)
+			: _id(id), _parent_id(parent_id), _name(name), _type(type), _guid(guid), _transformation(settings, trsf)
+		{}
+		virtual ~Element() {}
+	};
+
+	template <typename P>
+	class BRepElement : public Element<P> {
+	private:
+		Representation::BRep* _geometry;
+	public:
+		const Representation::BRep& geometry() const { return *_geometry; }
+		BRepElement(int id, int parent_id, const std::string& name, const std::string& type, const std::string& guid, const gp_Trsf& trsf, Representation::BRep* geometry)
+			: Element<P>(geometry->settings(),id,parent_id,name,type,guid,trsf)
+			, _geometry(geometry)
+		{}
+		virtual ~BRepElement() {
+			delete _geometry;
+		}
+	private:
+		BRepElement(const BRepElement& other);
+		BRepElement& operator=(const BRepElement& other);		
+	};
+
+	template <typename P>
+	class TriangulationElement : public Element<P> {
+	private:
+		Representation::Triangulation<P>* _geometry;
+	public:
+		const Representation::Triangulation<P>& geometry() const { return *_geometry; }
+		TriangulationElement(const BRepElement<P>& shape_model)
+			: Element<P>(shape_model)
+			, _geometry(new Representation::Triangulation<P>(shape_model.geometry()))
+		{}
+		virtual ~TriangulationElement() {
+			delete _geometry;
+		}
+	private:
+		TriangulationElement(const TriangulationElement& other);
+		TriangulationElement& operator=(const TriangulationElement& other);
+	};
+
+	template <typename P>
+	class SerializedElement : public Element<P> {
+	private:
+		Representation::Serialization* _geometry;
+	public:
+		const Representation::Serialization& geometry() const { return *_geometry; }
+		SerializedElement(const BRepElement<P>& shape_model)
+			: Element<P>(shape_model)
+			, _geometry(new Representation::Serialization(shape_model.geometry()))
+		{}
+		virtual ~SerializedElement() {
+			delete _geometry;
+		}
+	private:
+		SerializedElement(const SerializedElement& other);
+		SerializedElement& operator=(const SerializedElement& other);
+	};
+}
+
+#endif
\ No newline at end of file
diff --git a/src/ifcgeom/IfcGeomFaces.cpp b/src/ifcgeom/IfcGeomFaces.cpp
index 76d8b0d..bfd429a 100644
--- a/src/ifcgeom/IfcGeomFaces.cpp
+++ b/src/ifcgeom/IfcGeomFaces.cpp
@@ -85,14 +85,24 @@
 #include <BRep_Tool.hxx>
 #include <BRepBuilderAPI_Transform.hxx>
 
+#ifdef USE_IFC4
+#include <Geom_BSplineSurface.hxx>
+#include <TColgp_Array2OfPnt.hxx>
+#include <TColStd_Array1OfReal.hxx>
+#include <TColStd_Array1OfInteger.hxx>
+
+#include <Geom_Plane.hxx>
+#include <BRepCheck_Face.hxx>
+#endif
+
 #include "../ifcgeom/IfcGeom.h"
 
-bool IfcGeom::convert(const IfcSchema::IfcFace::ptr l, TopoDS_Shape& face) {
-	IfcSchema::IfcFaceBound::list bounds = l->Bounds();
-	IfcSchema::IfcFaceBound::it it = bounds->begin();
-	IfcSchema::IfcLoop::ptr loop = (*it)->Bound();
+bool IfcGeom::Kernel::convert(const IfcSchema::IfcFace* l, TopoDS_Shape& face) {
+	IfcSchema::IfcFaceBound::list::ptr bounds = l->Bounds();
+	IfcSchema::IfcFaceBound::list::it it = bounds->begin();
+	IfcSchema::IfcLoop* loop = (*it)->Bound();
 	TopoDS_Wire outer_wire;
-	if ( ! IfcGeom::convert_wire(loop,outer_wire) ) return false;
+	if ( ! convert_wire(loop,outer_wire) ) return false;
 	BRepBuilderAPI_MakeFace mf (outer_wire);
 	BRepBuilderAPI_FaceError er = mf.Error();
 	if ( er == BRepBuilderAPI_NotPlanar ) {
@@ -103,13 +113,13 @@ bool IfcGeom::convert(const IfcSchema::IfcFace::ptr l, TopoDS_Shape& face) {
 		er = mf.Error();
 	}
 	if ( er != BRepBuilderAPI_FaceDone ) return false;
-	if ( bounds->Size() == 1 ) {
+	if ( bounds->size() == 1 ) {
 		face = mf.Face();
 	} else {
 		for( ++it; it != bounds->end(); ++ it) {
-			IfcSchema::IfcLoop::ptr loop = (*it)->Bound();
+			IfcSchema::IfcLoop* loop = (*it)->Bound();
 			TopoDS_Wire wire;
-			if ( ! IfcGeom::convert_wire(loop,wire) ) return false;
+			if ( ! convert_wire(loop,wire) ) return false;
 			mf.Add(wire);
 		}
 		if ( mf.IsDone() ) {
@@ -127,7 +137,7 @@ bool IfcGeom::convert(const IfcSchema::IfcFace::ptr l, TopoDS_Shape& face) {
 		}
 	}
 
-	if ( IfcGeom::GetValue(GV_FORCE_CCW_FACE_ORIENTATION)>0 ) { 
+	if ( getValue(GV_FORCE_CCW_FACE_ORIENTATION)>0 ) { 
 	// Check the orientation of the face by comparing the 
 	// normal of the topological surface to the Newell's Method's
 	// normal. Newell's Method is used for the normal calculation
@@ -179,9 +189,12 @@ bool IfcGeom::convert(const IfcSchema::IfcFace::ptr l, TopoDS_Shape& face) {
 	// as the topological face normal the face orientation is
 	// reversed
 	gp_Vec face_normal2(x,y,z);
-	if ( face_normal1.Dot(face_normal2) < 0 ) {
-		TopAbs_Orientation o = face.Orientation();
-		face.Orientation(o == TopAbs_FORWARD ? TopAbs_REVERSED : TopAbs_FORWARD);
+
+	if (face_normal2.Magnitude() > ALMOST_ZERO) {
+		if ( face_normal1.Dot(face_normal2) < 0 ) {
+			TopAbs_Orientation o = face.Orientation();
+			face.Orientation(o == TopAbs_FORWARD ? TopAbs_REVERSED : TopAbs_FORWARD);
+		}
 	}
 	}
 	
@@ -193,24 +206,24 @@ bool IfcGeom::convert(const IfcSchema::IfcFace::ptr l, TopoDS_Shape& face) {
 	return true;
 }
 
-bool IfcGeom::convert(const IfcSchema::IfcArbitraryClosedProfileDef::ptr l, TopoDS_Shape& face) {
+bool IfcGeom::Kernel::convert(const IfcSchema::IfcArbitraryClosedProfileDef* l, TopoDS_Shape& face) {
 	TopoDS_Wire wire;
-	if ( ! IfcGeom::convert_wire(l->OuterCurve(),wire) ) return false;
+	if ( ! convert_wire(l->OuterCurve(),wire) ) return false;
 
 	TopoDS_Face f;
-	bool success = IfcGeom::convert_wire_to_face(wire, f);
+	bool success = convert_wire_to_face(wire, f);
 	if (success) face = f;
 	return success;
 }
 
-bool IfcGeom::convert(const IfcSchema::IfcArbitraryProfileDefWithVoids::ptr l, TopoDS_Shape& face) {
+bool IfcGeom::Kernel::convert(const IfcSchema::IfcArbitraryProfileDefWithVoids* l, TopoDS_Shape& face) {
 	TopoDS_Wire profile;
-	if ( ! IfcGeom::convert_wire(l->OuterCurve(),profile) ) return false;
+	if ( ! convert_wire(l->OuterCurve(),profile) ) return false;
 	BRepBuilderAPI_MakeFace mf(profile);
-	IfcSchema::IfcCurve::list voids = l->InnerCurves();
-	for( IfcSchema::IfcCurve::it it = voids->begin(); it != voids->end(); ++ it ) {
+	IfcSchema::IfcCurve::list::ptr voids = l->InnerCurves();
+	for( IfcSchema::IfcCurve::list::it it = voids->begin(); it != voids->end(); ++ it ) {
 		TopoDS_Wire hole;
-		if ( IfcGeom::convert_wire(*it,hole) ) {
+		if ( convert_wire(*it,hole) ) {
 			mf.Add(hole);
 		}
 	}
@@ -220,9 +233,9 @@ bool IfcGeom::convert(const IfcSchema::IfcArbitraryProfileDefWithVoids::ptr l, T
 	return true;
 }
 
-bool IfcGeom::convert(const IfcSchema::IfcRectangleProfileDef::ptr l, TopoDS_Shape& face) {
-	const double x = l->XDim() / 2.0f * IfcGeom::GetValue(GV_LENGTH_UNIT);
-	const double y = l->YDim() / 2.0f  * IfcGeom::GetValue(GV_LENGTH_UNIT);
+bool IfcGeom::Kernel::convert(const IfcSchema::IfcRectangleProfileDef* l, TopoDS_Shape& face) {
+	const double x = l->XDim() / 2.0f * getValue(GV_LENGTH_UNIT);
+	const double y = l->YDim() / 2.0f  * getValue(GV_LENGTH_UNIT);
 
 	if ( x < ALMOST_ZERO || y < ALMOST_ZERO ) {
 		Logger::Message(Logger::LOG_NOTICE,"Skipping zero sized profile:",l->entity);
@@ -230,15 +243,15 @@ bool IfcGeom::convert(const IfcSchema::IfcRectangleProfileDef::ptr l, TopoDS_Sha
 	}
 
 	gp_Trsf2d trsf2d;
-	IfcGeom::convert(l->Position(),trsf2d);
+	IfcGeom::Kernel::convert(l->Position(),trsf2d);
 	double coords[8] = {-x,-y,x,-y,x,y,-x,y};
-	return IfcGeom::profile_helper(4,coords,0,0,0,trsf2d,face);
+	return profile_helper(4,coords,0,0,0,trsf2d,face);
 }
 
-bool IfcGeom::convert(const IfcSchema::IfcRoundedRectangleProfileDef::ptr l, TopoDS_Shape& face) {
-	const double x = l->XDim() / 2.0f * IfcGeom::GetValue(GV_LENGTH_UNIT);
-	const double y = l->YDim() / 2.0f  * IfcGeom::GetValue(GV_LENGTH_UNIT);
-	const double r = l->RoundingRadius() * IfcGeom::GetValue(GV_LENGTH_UNIT);
+bool IfcGeom::Kernel::convert(const IfcSchema::IfcRoundedRectangleProfileDef* l, TopoDS_Shape& face) {
+	const double x = l->XDim() / 2.0f * getValue(GV_LENGTH_UNIT);
+	const double y = l->YDim() / 2.0f  * getValue(GV_LENGTH_UNIT);
+	const double r = l->RoundingRadius() * getValue(GV_LENGTH_UNIT);
 
 	if ( x < ALMOST_ZERO || y < ALMOST_ZERO || r < ALMOST_ZERO ) {
 		Logger::Message(Logger::LOG_NOTICE,"Skipping zero sized profile:",l->entity);
@@ -246,23 +259,23 @@ bool IfcGeom::convert(const IfcSchema::IfcRoundedRectangleProfileDef::ptr l, Top
 	}
 
 	gp_Trsf2d trsf2d;
-	IfcGeom::convert(l->Position(),trsf2d);
+	IfcGeom::Kernel::convert(l->Position(),trsf2d);
 	double coords[8] = {-x,-y, x,-y, x,y, -x,y};
 	int fillets[4] = {0,1,2,3};
 	double radii[4] = {r,r,r,r};
-	return IfcGeom::profile_helper(4,coords,4,fillets,radii,trsf2d,face);
+	return profile_helper(4,coords,4,fillets,radii,trsf2d,face);
 }
 
-bool IfcGeom::convert(const IfcSchema::IfcRectangleHollowProfileDef::ptr l, TopoDS_Shape& face) {
-	const double x = l->XDim() / 2.0f * IfcGeom::GetValue(GV_LENGTH_UNIT);
-	const double y = l->YDim() / 2.0f  * IfcGeom::GetValue(GV_LENGTH_UNIT);
-	const double d = l->WallThickness() * IfcGeom::GetValue(GV_LENGTH_UNIT);
+bool IfcGeom::Kernel::convert(const IfcSchema::IfcRectangleHollowProfileDef* l, TopoDS_Shape& face) {
+	const double x = l->XDim() / 2.0f * getValue(GV_LENGTH_UNIT);
+	const double y = l->YDim() / 2.0f  * getValue(GV_LENGTH_UNIT);
+	const double d = l->WallThickness() * getValue(GV_LENGTH_UNIT);
 
-	const bool fr1 = l->hasInnerFilletRadius();
+	const bool fr1 = l->hasOuterFilletRadius();
 	const bool fr2 = l->hasInnerFilletRadius();
 
-	const double r1 = fr2 ? l->OuterFilletRadius() * IfcGeom::GetValue(GV_LENGTH_UNIT) : 0.;
-	const double r2 = fr1 ? l->InnerFilletRadius() * IfcGeom::GetValue(GV_LENGTH_UNIT) : 0.;
+	const double r1 = fr1 ? l->OuterFilletRadius() * getValue(GV_LENGTH_UNIT) : 0.;
+	const double r2 = fr2 ? l->InnerFilletRadius() * getValue(GV_LENGTH_UNIT) : 0.;
 	
 	if ( x < ALMOST_ZERO || y < ALMOST_ZERO ) {
 		Logger::Message(Logger::LOG_NOTICE,"Skipping zero sized profile:",l->entity);
@@ -273,15 +286,15 @@ bool IfcGeom::convert(const IfcSchema::IfcRectangleHollowProfileDef::ptr l, Topo
 	TopoDS_Face f2;
 
 	gp_Trsf2d trsf2d;
-	IfcGeom::convert(l->Position(),trsf2d);
+	IfcGeom::Kernel::convert(l->Position(),trsf2d);
 	double coords1[8] = {-x  ,-y,   x  ,-y,   x,  y,   -x,  y  };
 	double coords2[8] = {-x+d,-y+d, x-d,-y+d, x-d,y-d, -x+d,y-d};
 	double radii1[4] = {r1,r1,r1,r1};
 	double radii2[4] = {r2,r2,r2,r2};
 	int fillets[4] = {0,1,2,3};
 
-	bool s1 = IfcGeom::profile_helper(4,coords1,fr1 ? 4 : 0,fillets,radii1,trsf2d,f1);
-	bool s2 = IfcGeom::profile_helper(4,coords2,fr2 ? 4 : 0,fillets,radii2,trsf2d,f2);
+	bool s1 = profile_helper(4,coords1,fr1 ? 4 : 0,fillets,radii1,trsf2d,f1);
+	bool s2 = profile_helper(4,coords2,fr2 ? 4 : 0,fillets,radii2,trsf2d,f2);
 
 	if (!s1 || !s2) return false;
 
@@ -300,11 +313,11 @@ bool IfcGeom::convert(const IfcSchema::IfcRectangleHollowProfileDef::ptr l, Topo
 	return true;
 }
 
-bool IfcGeom::convert(const IfcSchema::IfcTrapeziumProfileDef::ptr l, TopoDS_Shape& face) {
-	const double x1 = l->BottomXDim() / 2.0f * IfcGeom::GetValue(GV_LENGTH_UNIT);
-	const double w = l->TopXDim() * IfcGeom::GetValue(GV_LENGTH_UNIT);
-	const double dx = l->TopXOffset() * IfcGeom::GetValue(GV_LENGTH_UNIT);
-	const double y = l->YDim() / 2.0f  * IfcGeom::GetValue(GV_LENGTH_UNIT);
+bool IfcGeom::Kernel::convert(const IfcSchema::IfcTrapeziumProfileDef* l, TopoDS_Shape& face) {
+	const double x1 = l->BottomXDim() / 2.0f * getValue(GV_LENGTH_UNIT);
+	const double w = l->TopXDim() * getValue(GV_LENGTH_UNIT);
+	const double dx = l->TopXOffset() * getValue(GV_LENGTH_UNIT);
+	const double y = l->YDim() / 2.0f  * getValue(GV_LENGTH_UNIT);
 
 	if ( x1 < ALMOST_ZERO || w < ALMOST_ZERO || y < ALMOST_ZERO ) {
 		Logger::Message(Logger::LOG_NOTICE,"Skipping zero sized profile:",l->entity);
@@ -312,41 +325,57 @@ bool IfcGeom::convert(const IfcSchema::IfcTrapeziumProfileDef::ptr l, TopoDS_Sha
 	}
 
 	gp_Trsf2d trsf2d;
-	IfcGeom::convert(l->Position(),trsf2d);
+	IfcGeom::Kernel::convert(l->Position(),trsf2d);
 	double coords[8] = {-x1,-y, x1,-y, dx+w-x1,y, dx-x1,y};
-	return IfcGeom::profile_helper(4,coords,0,0,0,trsf2d,face);
+	return profile_helper(4,coords,0,0,0,trsf2d,face);
 }
 
-bool IfcGeom::convert(const IfcSchema::IfcIShapeProfileDef::ptr l, TopoDS_Shape& face) {
-	const double x = l->OverallWidth() / 2.0f * IfcGeom::GetValue(GV_LENGTH_UNIT);
-	const double y = l->OverallDepth() / 2.0f * IfcGeom::GetValue(GV_LENGTH_UNIT);
-	const double d1 = l->WebThickness() / 2.0f  * IfcGeom::GetValue(GV_LENGTH_UNIT);
-	const double d2 = l->FlangeThickness() * IfcGeom::GetValue(GV_LENGTH_UNIT);
-	bool doFillet = l->hasFilletRadius();
-	double f = 0.;
-	if ( doFillet ) {
-		f = l->FilletRadius() * IfcGeom::GetValue(GV_LENGTH_UNIT);
+bool IfcGeom::Kernel::convert(const IfcSchema::IfcIShapeProfileDef* l, TopoDS_Shape& face) {
+	const double x1 = l->OverallWidth() / 2.0f * getValue(GV_LENGTH_UNIT);
+	const double y = l->OverallDepth() / 2.0f * getValue(GV_LENGTH_UNIT);
+	const double d1 = l->WebThickness() / 2.0f  * getValue(GV_LENGTH_UNIT);
+	const double dy1 = l->FlangeThickness() * getValue(GV_LENGTH_UNIT);
+
+	bool doFillet1 = l->hasFilletRadius();
+	double f1 = 0.;
+	if ( doFillet1 ) {
+		f1 = l->FilletRadius() * getValue(GV_LENGTH_UNIT);
 	}
 
-	if ( x == 0.0f || y == 0.0f || d1 == 0.0f || d2 == 0.0f ) {
+	bool doFillet2 = doFillet1;
+	double x2 = x1, dy2 = dy1, f2 = f1;
+
+	if (l->is(IfcSchema::Type::IfcAsymmetricIShapeProfileDef)) {
+		IfcSchema::IfcAsymmetricIShapeProfileDef* assym = (IfcSchema::IfcAsymmetricIShapeProfileDef*) l;
+		x2 = assym->TopFlangeWidth() / 2. * getValue(GV_LENGTH_UNIT);
+		doFillet2 = assym->hasTopFlangeFilletRadius();
+		if (doFillet2) {
+			f2 = assym->TopFlangeFilletRadius() * getValue(GV_LENGTH_UNIT);
+		}
+		if (assym->hasTopFlangeThickness()) {
+			dy2 = assym->TopFlangeThickness() * getValue(GV_LENGTH_UNIT);
+		}
+	}	
+
+	if ( x1 < ALMOST_ZERO || x2 < ALMOST_ZERO || y < ALMOST_ZERO || d1 < ALMOST_ZERO || dy1 < ALMOST_ZERO || dy2 < ALMOST_ZERO ) {
 		Logger::Message(Logger::LOG_NOTICE,"Skipping zero sized profile:",l->entity);
 		return false;
 	}
 
 	gp_Trsf2d trsf2d;
-	IfcGeom::convert(l->Position(),trsf2d);
+	convert(l->Position(),trsf2d);
 
-	double coords[24] = {-x,-y,x,-y,x,-y+d2,d1,-y+d2,d1,y-d2,x,y-d2,x,y,-x,y,-x,y-d2,-d1,y-d2,-d1,-y+d2,-x,-y+d2};
+	double coords[24] = {-x1,-y, x1,-y, x1,-y+dy1, d1,-y+dy1, d1,y-dy2, x2,y-dy2, x2,y, -x2,y, -x2,y-dy2, -d1,y-dy2, -d1,-y+dy1, -x1,-y+dy1};
 	int fillets[4] = {3,4,9,10};
-	double radii[4] = {f,f,f,f};
-	return IfcGeom::profile_helper(12,coords,doFillet ? 4 : 0,fillets,radii,trsf2d,face);
+	double radii[4] = {f1,f1,f2,f2};
+	return profile_helper(12,coords,(doFillet1||doFillet2) ? 4 : 0,fillets,radii,trsf2d,face);
 }
 
-bool IfcGeom::convert(const IfcSchema::IfcZShapeProfileDef::ptr l, TopoDS_Shape& face) {
-	const double x = l->FlangeWidth() * IfcGeom::GetValue(GV_LENGTH_UNIT);
-	const double y = l->Depth() / 2.0f * IfcGeom::GetValue(GV_LENGTH_UNIT);
-	const double dx = l->WebThickness() / 2.0f  * IfcGeom::GetValue(GV_LENGTH_UNIT);
-	const double dy = l->FlangeThickness() * IfcGeom::GetValue(GV_LENGTH_UNIT);
+bool IfcGeom::Kernel::convert(const IfcSchema::IfcZShapeProfileDef* l, TopoDS_Shape& face) {
+	const double x = l->FlangeWidth() * getValue(GV_LENGTH_UNIT);
+	const double y = l->Depth() / 2.0f * getValue(GV_LENGTH_UNIT);
+	const double dx = l->WebThickness() / 2.0f  * getValue(GV_LENGTH_UNIT);
+	const double dy = l->FlangeThickness() * getValue(GV_LENGTH_UNIT);
 
 	bool doFillet = l->hasFilletRadius();
 	bool doEdgeFillet = l->hasEdgeRadius();
@@ -355,10 +384,10 @@ bool IfcGeom::convert(const IfcSchema::IfcZShapeProfileDef::ptr l, TopoDS_Shape&
 	double f2 = 0.;
 
 	if ( doFillet ) {
-		f1 = l->FilletRadius() * IfcGeom::GetValue(GV_LENGTH_UNIT);
+		f1 = l->FilletRadius() * getValue(GV_LENGTH_UNIT);
 	}
 	if ( doEdgeFillet ) {
-		f2 = l->EdgeRadius() * IfcGeom::GetValue(GV_LENGTH_UNIT);
+		f2 = l->EdgeRadius() * getValue(GV_LENGTH_UNIT);
 	}
 
 	if ( x == 0.0f || y == 0.0f || dx == 0.0f || dy == 0.0f ) {
@@ -367,24 +396,24 @@ bool IfcGeom::convert(const IfcSchema::IfcZShapeProfileDef::ptr l, TopoDS_Shape&
 	}
 
 	gp_Trsf2d trsf2d;
-	IfcGeom::convert(l->Position(),trsf2d);
+	IfcGeom::Kernel::convert(l->Position(),trsf2d);
 
 	double coords[16] = {-dx,-y, x,-y, x,-y+dy, dx,-y+dy, dx,y, -x,y, -x,y-dy, -dx,y-dy};
 	int fillets[4] = {2,3,6,7};
 	double radii[4] = {f2,f1,f2,f1};
-	return IfcGeom::profile_helper(8,coords,(doFillet || doEdgeFillet) ? 4 : 0,fillets,radii,trsf2d,face);
+	return profile_helper(8,coords,(doFillet || doEdgeFillet) ? 4 : 0,fillets,radii,trsf2d,face);
 }
 
-bool IfcGeom::convert(const IfcSchema::IfcCShapeProfileDef::ptr l, TopoDS_Shape& face) {
-	const double y = l->Depth() / 2.0f * IfcGeom::GetValue(GV_LENGTH_UNIT);
-	const double x = l->Width() / 2.0f * IfcGeom::GetValue(GV_LENGTH_UNIT);
-	const double d1 = l->WallThickness() * IfcGeom::GetValue(GV_LENGTH_UNIT);
-	const double d2 = l->Girth() * IfcGeom::GetValue(GV_LENGTH_UNIT);
+bool IfcGeom::Kernel::convert(const IfcSchema::IfcCShapeProfileDef* l, TopoDS_Shape& face) {
+	const double y = l->Depth() / 2.0f * getValue(GV_LENGTH_UNIT);
+	const double x = l->Width() / 2.0f * getValue(GV_LENGTH_UNIT);
+	const double d1 = l->WallThickness() * getValue(GV_LENGTH_UNIT);
+	const double d2 = l->Girth() * getValue(GV_LENGTH_UNIT);
 	bool doFillet = l->hasInternalFilletRadius();
 	double f1 = 0;
 	double f2 = 0;
 	if ( doFillet ) {
-		f1 = l->InternalFilletRadius() * IfcGeom::GetValue(GV_LENGTH_UNIT);
+		f1 = l->InternalFilletRadius() * getValue(GV_LENGTH_UNIT);
 		f2 = f1 + d1;
 	}
 
@@ -394,31 +423,31 @@ bool IfcGeom::convert(const IfcSchema::IfcCShapeProfileDef::ptr l, TopoDS_Shape&
 	}
 
 	gp_Trsf2d trsf2d;
-	IfcGeom::convert(l->Position(),trsf2d);
+	IfcGeom::Kernel::convert(l->Position(),trsf2d);
 
 	double coords[24] = {-x,-y,x,-y,x,-y+d2,x-d1,-y+d2,x-d1,-y+d1,-x+d1,-y+d1,-x+d1,y-d1,x-d1,y-d1,x-d1,y-d2,x,y-d2,x,y,-x,y};
 	int fillets[8] = {0,1,4,5,6,7,10,11};
 	double radii[8] = {f2,f2,f1,f1,f1,f1,f2,f2};
-	return IfcGeom::profile_helper(12,coords,doFillet ? 8 : 0,fillets,radii,trsf2d,face);
+	return profile_helper(12,coords,doFillet ? 8 : 0,fillets,radii,trsf2d,face);
 }
 
-bool IfcGeom::convert(const IfcSchema::IfcLShapeProfileDef::ptr l, TopoDS_Shape& face) {
+bool IfcGeom::Kernel::convert(const IfcSchema::IfcLShapeProfileDef* l, TopoDS_Shape& face) {
 	const bool hasSlope = l->hasLegSlope();
 	const bool doEdgeFillet = l->hasEdgeRadius();
 	const bool doFillet = l->hasFilletRadius();
 
-	const double y = l->Depth() / 2.0f * IfcGeom::GetValue(GV_LENGTH_UNIT);
-	const double x = (l->hasWidth() ? l->Width() : l->Depth()) / 2.0f * IfcGeom::GetValue(GV_LENGTH_UNIT);
-	const double d = l->Thickness() * IfcGeom::GetValue(GV_LENGTH_UNIT);
-	const double slope = hasSlope ? (l->LegSlope() * IfcGeom::GetValue(GV_PLANEANGLE_UNIT)) : 0.;
+	const double y = l->Depth() / 2.0f * getValue(GV_LENGTH_UNIT);
+	const double x = (l->hasWidth() ? l->Width() : l->Depth()) / 2.0f * getValue(GV_LENGTH_UNIT);
+	const double d = l->Thickness() * getValue(GV_LENGTH_UNIT);
+	const double slope = hasSlope ? (l->LegSlope() * getValue(GV_PLANEANGLE_UNIT)) : 0.;
 	
 	double f1 = 0.0f;
 	double f2 = 0.0f;
 	if (doFillet) {
-		f1 = l->FilletRadius() * IfcGeom::GetValue(GV_LENGTH_UNIT);
+		f1 = l->FilletRadius() * getValue(GV_LENGTH_UNIT);
 	}
 	if ( doEdgeFillet) {
-		f2 = l->EdgeRadius() * IfcGeom::GetValue(GV_LENGTH_UNIT);
+		f2 = l->EdgeRadius() * getValue(GV_LENGTH_UNIT);
 	}
 
 	if ( x < ALMOST_ZERO || y < ALMOST_ZERO || d < ALMOST_ZERO ) {
@@ -463,24 +492,24 @@ bool IfcGeom::convert(const IfcSchema::IfcLShapeProfileDef::ptr l, TopoDS_Shape&
 	}
 
 	gp_Trsf2d trsf2d;
-	IfcGeom::convert(l->Position(),trsf2d);
+	convert(l->Position(),trsf2d);
 
 	double coords[12] = {-x,-y, x,-y, x,-y+d-dy1, xx, xy, -x+d-dx1,y, -x,y};
 	int fillets[3] = {2,3,4};
 	double radii[3] = {f2,f1,f2};
-	return IfcGeom::profile_helper(6,coords,doFillet ? 3 : 0,fillets,radii,trsf2d,face);
+	return profile_helper(6,coords,doFillet ? 3 : 0,fillets,radii,trsf2d,face);
 }
 
-bool IfcGeom::convert(const IfcSchema::IfcUShapeProfileDef::ptr l, TopoDS_Shape& face) {
+bool IfcGeom::Kernel::convert(const IfcSchema::IfcUShapeProfileDef* l, TopoDS_Shape& face) {
 	const bool doEdgeFillet = l->hasEdgeRadius();
 	const bool doFillet = l->hasFilletRadius();
 	const bool hasSlope = l->hasFlangeSlope();
 
-	const double y = l->Depth() / 2.0f * IfcGeom::GetValue(GV_LENGTH_UNIT);
-	const double x = l->FlangeWidth() / 2.0f * IfcGeom::GetValue(GV_LENGTH_UNIT);
-	const double d1 = l->WebThickness() * IfcGeom::GetValue(GV_LENGTH_UNIT);
-	const double d2 = l->FlangeThickness() * IfcGeom::GetValue(GV_LENGTH_UNIT);
-	const double slope = hasSlope ? (l->FlangeSlope() * IfcGeom::GetValue(GV_PLANEANGLE_UNIT)) : 0.;
+	const double y = l->Depth() / 2.0f * getValue(GV_LENGTH_UNIT);
+	const double x = l->FlangeWidth() / 2.0f * getValue(GV_LENGTH_UNIT);
+	const double d1 = l->WebThickness() * getValue(GV_LENGTH_UNIT);
+	const double d2 = l->FlangeThickness() * getValue(GV_LENGTH_UNIT);
+	const double slope = hasSlope ? (l->FlangeSlope() * getValue(GV_PLANEANGLE_UNIT)) : 0.;
 	
 	double dy1 = 0.0f;
 	double dy2 = 0.0f;
@@ -488,10 +517,10 @@ bool IfcGeom::convert(const IfcSchema::IfcUShapeProfileDef::ptr l, TopoDS_Shape&
 	double f2 = 0.0f;
 
 	if (doFillet) {
-		f1 = l->FilletRadius() * IfcGeom::GetValue(GV_LENGTH_UNIT);
+		f1 = l->FilletRadius() * getValue(GV_LENGTH_UNIT);
 	}
 	if (doEdgeFillet) {
-		f2 = l->EdgeRadius() * IfcGeom::GetValue(GV_LENGTH_UNIT);
+		f2 = l->EdgeRadius() * getValue(GV_LENGTH_UNIT);
 	}
 
 	if (hasSlope) {
@@ -505,27 +534,27 @@ bool IfcGeom::convert(const IfcSchema::IfcUShapeProfileDef::ptr l, TopoDS_Shape&
 	}
 
 	gp_Trsf2d trsf2d;
-	IfcGeom::convert(l->Position(),trsf2d);
+	convert(l->Position(),trsf2d);
 
 	double coords[16] = {-x,-y, x,-y, x,-y+d2-dy2, -x+d1,-y+d2+dy1, -x+d1,y-d2-dy1, x,y-d2+dy2, x,y, -x,y};
 	int fillets[4] = {2,3,4,5};
 	double radii[4] = {f2,f1,f1,f2};
-	return IfcGeom::profile_helper(8, coords, (doFillet || doEdgeFillet) ? 4 : 0, fillets, radii, trsf2d, face);
+	return profile_helper(8, coords, (doFillet || doEdgeFillet) ? 4 : 0, fillets, radii, trsf2d, face);
 }
 
-bool IfcGeom::convert(const IfcSchema::IfcTShapeProfileDef::ptr l, TopoDS_Shape& face) {
+bool IfcGeom::Kernel::convert(const IfcSchema::IfcTShapeProfileDef* l, TopoDS_Shape& face) {
 	const bool doFlangeEdgeFillet = l->hasFlangeEdgeRadius();
 	const bool doWebEdgeFillet = l->hasWebEdgeRadius();
 	const bool doFillet = l->hasFilletRadius();
 	const bool hasFlangeSlope = l->hasFlangeSlope();
 	const bool hasWebSlope = l->hasWebSlope();
 
-	const double y = l->Depth() / 2.0f * IfcGeom::GetValue(GV_LENGTH_UNIT);
-	const double x = l->FlangeWidth() / 2.0f * IfcGeom::GetValue(GV_LENGTH_UNIT);
-	const double d1 = l->WebThickness() * IfcGeom::GetValue(GV_LENGTH_UNIT);
-	const double d2 = l->FlangeThickness() * IfcGeom::GetValue(GV_LENGTH_UNIT);
-	const double flangeSlope = hasFlangeSlope ? (l->FlangeSlope() * IfcGeom::GetValue(GV_PLANEANGLE_UNIT)) : 0.;
-	const double webSlope = hasWebSlope ? (l->WebSlope() * IfcGeom::GetValue(GV_PLANEANGLE_UNIT)) : 0.;
+	const double y = l->Depth() / 2.0f * getValue(GV_LENGTH_UNIT);
+	const double x = l->FlangeWidth() / 2.0f * getValue(GV_LENGTH_UNIT);
+	const double d1 = l->WebThickness() * getValue(GV_LENGTH_UNIT);
+	const double d2 = l->FlangeThickness() * getValue(GV_LENGTH_UNIT);
+	const double flangeSlope = hasFlangeSlope ? (l->FlangeSlope() * getValue(GV_PLANEANGLE_UNIT)) : 0.;
+	const double webSlope = hasWebSlope ? (l->WebSlope() * getValue(GV_PLANEANGLE_UNIT)) : 0.;
 
 	if ( x < ALMOST_ZERO || y < ALMOST_ZERO || d1 < ALMOST_ZERO || d2 < ALMOST_ZERO ) {
 		Logger::Message(Logger::LOG_NOTICE,"Skipping zero sized profile:",l->entity);
@@ -541,13 +570,13 @@ bool IfcGeom::convert(const IfcSchema::IfcTShapeProfileDef::ptr l, TopoDS_Shape&
 	double f3 = 0.0f;
 
 	if (doFillet) {
-		f1 = l->FilletRadius() * IfcGeom::GetValue(GV_LENGTH_UNIT);
+		f1 = l->FilletRadius() * getValue(GV_LENGTH_UNIT);
 	}
 	if (doWebEdgeFillet) {
-		f2 = l->WebEdgeRadius() * IfcGeom::GetValue(GV_LENGTH_UNIT);
+		f2 = l->WebEdgeRadius() * getValue(GV_LENGTH_UNIT);
 	}
 	if (doFlangeEdgeFillet) {
-		f3 = l->FlangeEdgeRadius() * IfcGeom::GetValue(GV_LENGTH_UNIT);
+		f3 = l->FlangeEdgeRadius() * getValue(GV_LENGTH_UNIT);
 	}
 
 	double xx, xy;
@@ -588,23 +617,23 @@ bool IfcGeom::convert(const IfcSchema::IfcTShapeProfileDef::ptr l, TopoDS_Shape&
 	}
 
 	gp_Trsf2d trsf2d;
-	IfcGeom::convert(l->Position(),trsf2d);
+	convert(l->Position(),trsf2d);
 
 	double coords[16] = {d1/2.-dx2,-y, xx,xy, x,y-d2+dy2, x,y, -x,y, -x,y-d2+dy2, -xx,xy, -d1/2.+dx2,-y};
 	int fillets[6] = {0,1,2,5,6,7};
 	double radii[6] = {f2,f1,f3,f3,f1,f2};
-	return IfcGeom::profile_helper(8, coords, (doFillet || doWebEdgeFillet || doFlangeEdgeFillet) ? 6 : 0, fillets, radii, trsf2d, face);
+	return profile_helper(8, coords, (doFillet || doWebEdgeFillet || doFlangeEdgeFillet) ? 6 : 0, fillets, radii, trsf2d, face);
 }
 
-bool IfcGeom::convert(const IfcSchema::IfcCircleProfileDef::ptr l, TopoDS_Shape& face) {
-	const double r = l->Radius() * IfcGeom::GetValue(GV_LENGTH_UNIT);
+bool IfcGeom::Kernel::convert(const IfcSchema::IfcCircleProfileDef* l, TopoDS_Shape& face) {
+	const double r = l->Radius() * getValue(GV_LENGTH_UNIT);
 	if ( r == 0.0f ) {
 		Logger::Message(Logger::LOG_NOTICE,"Skipping zero sized profile:",l->entity);
 		return false;
 	}
 	
 	gp_Trsf2d trsf;	
-	IfcGeom::convert(l->Position(),trsf);
+	convert(l->Position(),trsf);
 
 	BRepBuilderAPI_MakeWire w;
 	gp_Ax2 ax = gp_Ax2().Transformed(trsf);
@@ -613,14 +642,14 @@ bool IfcGeom::convert(const IfcSchema::IfcCircleProfileDef::ptr l, TopoDS_Shape&
 	w.Add(edge);
 
 	TopoDS_Face f;
-	bool success = IfcGeom::convert_wire_to_face(w, f);
+	bool success = convert_wire_to_face(w, f);
 	if (success) face = f;
 	return success;
 }
 
-bool IfcGeom::convert(const IfcSchema::IfcCircleHollowProfileDef::ptr l, TopoDS_Shape& face) {
-	const double r = l->Radius() * IfcGeom::GetValue(GV_LENGTH_UNIT);
-	const double t = l->WallThickness() * IfcGeom::GetValue(GV_LENGTH_UNIT);
+bool IfcGeom::Kernel::convert(const IfcSchema::IfcCircleHollowProfileDef* l, TopoDS_Shape& face) {
+	const double r = l->Radius() * getValue(GV_LENGTH_UNIT);
+	const double t = l->WallThickness() * getValue(GV_LENGTH_UNIT);
 	
 	if ( r == 0.0f || t == 0.0f ) {
 		Logger::Message(Logger::LOG_NOTICE,"Skipping zero sized profile:",l->entity);
@@ -628,7 +657,7 @@ bool IfcGeom::convert(const IfcSchema::IfcCircleHollowProfileDef::ptr l, TopoDS_
 	}
 	
 	gp_Trsf2d trsf;	
-	IfcGeom::convert(l->Position(),trsf);
+	convert(l->Position(),trsf);
 	gp_Ax2 ax = gp_Ax2().Transformed(trsf);
 
 	BRepBuilderAPI_MakeWire outer;	
@@ -647,9 +676,9 @@ bool IfcGeom::convert(const IfcSchema::IfcCircleHollowProfileDef::ptr l, TopoDS_
 	return true;		
 }
 
-bool IfcGeom::convert(const IfcSchema::IfcEllipseProfileDef::ptr l, TopoDS_Shape& face) {
-	double rx = l->SemiAxis1() * IfcGeom::GetValue(GV_LENGTH_UNIT);
-	double ry = l->SemiAxis2() * IfcGeom::GetValue(GV_LENGTH_UNIT);
+bool IfcGeom::Kernel::convert(const IfcSchema::IfcEllipseProfileDef* l, TopoDS_Shape& face) {
+	double rx = l->SemiAxis1() * getValue(GV_LENGTH_UNIT);
+	double ry = l->SemiAxis2() * getValue(GV_LENGTH_UNIT);
 
 	if ( rx < ALMOST_ZERO || ry < ALMOST_ZERO ) {
 		Logger::Message(Logger::LOG_NOTICE,"Skipping zero sized profile:",l->entity);
@@ -658,7 +687,7 @@ bool IfcGeom::convert(const IfcSchema::IfcEllipseProfileDef::ptr l, TopoDS_Shape
 
 	const bool rotated = ry > rx;
 	gp_Trsf2d trsf;	
-	IfcGeom::convert(l->Position(),trsf);
+	convert(l->Position(),trsf);
 
 	gp_Ax2 ax = gp_Ax2();
 	if (rotated) {
@@ -673,16 +702,16 @@ bool IfcGeom::convert(const IfcSchema::IfcEllipseProfileDef::ptr l, TopoDS_Shape
 	w.Add(edge);
 
 	TopoDS_Face f;
-	bool success = IfcGeom::convert_wire_to_face(w, f);
+	bool success = convert_wire_to_face(w, f);
 	if (success) face = f;
 	return success;
 }
 
-bool IfcGeom::convert(const IfcSchema::IfcCenterLineProfileDef::ptr l, TopoDS_Shape& face) {
-	const double d = l->Thickness() * IfcGeom::GetValue(GV_LENGTH_UNIT) / 2.;
+bool IfcGeom::Kernel::convert(const IfcSchema::IfcCenterLineProfileDef* l, TopoDS_Shape& face) {
+	const double d = l->Thickness() * getValue(GV_LENGTH_UNIT) / 2.;
 
 	TopoDS_Wire wire;
-	if (!IfcGeom::convert_wire(l->Curve(), wire)) return false;
+	if (!convert_wire(l->Curve(), wire)) return false;
 
 	// BRepOffsetAPI_MakeOffset insists on creating circular arc
 	// segments for joining the curves that constitute the center
@@ -727,18 +756,18 @@ bool IfcGeom::convert(const IfcSchema::IfcCenterLineProfileDef::ptr l, TopoDS_Sh
 	return true;
 }
 
-bool IfcGeom::convert(const IfcSchema::IfcCompositeProfileDef::ptr l, TopoDS_Shape& face) {
+bool IfcGeom::Kernel::convert(const IfcSchema::IfcCompositeProfileDef* l, TopoDS_Shape& face) {
 	// BRepBuilderAPI_MakeFace mf;
 
 	TopoDS_Compound compound;
 	BRep_Builder builder;
 	builder.MakeCompound(compound);
 
-	IfcSchema::IfcProfileDef::list profiles = l->Profiles();
+	IfcSchema::IfcProfileDef::list::ptr profiles = l->Profiles();
 	bool first = true;
-	for (IfcSchema::IfcProfileDef::it it = profiles->begin(); it != profiles->end(); ++it) {
+	for (IfcSchema::IfcProfileDef::list::it it = profiles->begin(); it != profiles->end(); ++it) {
 		TopoDS_Face f;
-		if (IfcGeom::convert_face(*it, f)) {
+		if (convert_face(*it, f)) {
 			builder.Add(compound, f);
 			/* TopExp_Explorer exp(f, TopAbs_WIRE);
 			for (; exp.More(); exp.Next()) {
@@ -757,10 +786,10 @@ bool IfcGeom::convert(const IfcSchema::IfcCompositeProfileDef::ptr l, TopoDS_Sha
 	return !face.IsNull();
 }
 
-bool IfcGeom::convert(const IfcSchema::IfcDerivedProfileDef::ptr l, TopoDS_Shape& face) {
+bool IfcGeom::Kernel::convert(const IfcSchema::IfcDerivedProfileDef* l, TopoDS_Shape& face) {
 	TopoDS_Face f;
 	gp_Trsf2d trsf2d;
-	if (IfcGeom::convert_face(l->ParentProfile(), f) && IfcGeom::convert(l->Operator(), trsf2d)) {
+	if (convert_face(l->ParentProfile(), f) && IfcGeom::Kernel::convert(l->Operator(), trsf2d)) {
 		gp_Trsf trsf = trsf2d;
 		face = TopoDS::Face(BRepBuilderAPI_Transform(f, trsf));
 		return true;
@@ -768,3 +797,97 @@ bool IfcGeom::convert(const IfcSchema::IfcDerivedProfileDef::ptr l, TopoDS_Shape
 		return false;
 	}
 }
+
+#ifdef USE_IFC4
+
+bool convert_surf(IfcSchema::IfcBSplineSurfaceWithKnots* l, Handle_Geom_Surface& surf) {
+	SHARED_PTR< IfcTemplatedEntityListList<IfcSchema::IfcCartesianPoint> > cps = l->ControlPointsList();
+	std::vector<double> uknots = l->UKnots();
+	std::vector<double> vknots = l->VKnots();
+	std::vector<int> umults = l->UMultiplicities();
+	std::vector<int> vmults = l->VMultiplicities();
+
+	TColgp_Array2OfPnt Poles (0, cps->size() - 1, 0, (*cps->begin()).size() - 1);
+	TColStd_Array1OfReal UKnots(0, uknots.size() - 1);
+	TColStd_Array1OfReal VKnots(0, vknots.size() - 1);
+	TColStd_Array1OfInteger UMults(0, umults.size() - 1);
+	TColStd_Array1OfInteger VMults(0, vmults.size() - 1);
+	Standard_Integer UDegree = l->UDegree();
+	Standard_Integer VDegree = l->VDegree();
+
+	int i = 0, j;
+	for (IfcTemplatedEntityListList<IfcSchema::IfcCartesianPoint>::outer_it it = cps->begin(); it != cps->end(); ++it, ++i) {
+		j = 0;
+		for (IfcTemplatedEntityListList<IfcSchema::IfcCartesianPoint>::inner_it jt = (*it).begin(); jt != (*it).end(); ++jt, ++j) {
+			IfcSchema::IfcCartesianPoint* p = *jt;
+			gp_Pnt pnt;
+			if (!convert(p, pnt)) return false;
+			Poles(i, j) = pnt;
+		}
+	}
+	i = 0;
+	for (std::vector<double>::const_iterator it = uknots.begin(); it != uknots.end(); ++it, ++i) {
+		UKnots(i) = *it;
+	}
+	i = 0;
+	for (std::vector<double>::const_iterator it = vknots.begin(); it != vknots.end(); ++it, ++i) {
+		VKnots(i) = *it;
+	}
+	i = 0;
+	for (std::vector<int>::const_iterator it = umults.begin(); it != umults.end(); ++it, ++i) {
+		UMults(i) = *it;
+	}
+	i = 0;
+	for (std::vector<int>::const_iterator it = vmults.begin(); it != vmults.end(); ++it, ++i) {
+		VMults(i) = *it;
+	}
+	surf = new Geom_BSplineSurface(Poles, UKnots, VKnots, UMults, VMults, UDegree, VDegree);
+	return true;
+}
+
+bool convert_surf(IfcSchema::IfcPlane* l, Handle_Geom_Surface& surf) {
+	gp_Pln pln;
+	convert(l, pln);
+	surf = new Geom_Plane(pln);
+	return true;
+}
+
+bool IfcGeom::Kernel::convert(const IfcSchema::IfcAdvancedFace* l, TopoDS_Shape& face) {
+	IfcSchema::IfcSurface* s = l->FaceSurface();
+	Handle_Geom_Surface surf(0);
+	if (s->is(IfcSchema::Type::IfcBSplineSurfaceWithKnots)) {
+		convert_surf((IfcSchema::IfcBSplineSurfaceWithKnots*)s, surf);
+	} else if (s->is(IfcSchema::Type::IfcPlane)) {
+		convert_surf((IfcSchema::IfcPlane*)s, surf);
+	} else {
+		return false;
+	}
+
+	BRepBuilderAPI_MakeFace mf(surf, Precision::Confusion());
+	IfcSchema::IfcFaceBound::list::ptr bounds = l->Bounds();
+	for (IfcSchema::IfcFaceBound::list::it it = bounds->begin(); it != bounds->end(); ++it) {
+		IfcSchema::IfcLoop* loop = (*it)->Bound();
+		TopoDS_Wire outer_wire;
+		if (!convert_wire(loop, outer_wire)) return false;
+
+		TopoDS_Face temp = BRepBuilderAPI_MakeFace(surf, outer_wire);
+
+		if (BRepCheck_Face(temp).OrientationOfWires() == BRepCheck_BadOrientationOfSubshape) {
+			outer_wire.Reverse();			
+			ShapeFix_Face fix(BRepBuilderAPI_MakeFace(surf, outer_wire).Face());
+			fix.FixOrientation();
+			fix.Perform();
+			TopoDS_Face temp = fix.Face();			
+			TopExp_Explorer exp(temp, TopAbs_WIRE);
+			outer_wire = TopoDS::Wire(exp.Current());
+		}
+
+		mf.Add(outer_wire);
+	}
+
+	face = mf.Face();
+
+	return true;
+}
+
+#endif
\ No newline at end of file
diff --git a/src/ifcgeom/IfcGeomFunctions.cpp b/src/ifcgeom/IfcGeomFunctions.cpp
index c5056d4..3097fae 100644
--- a/src/ifcgeom/IfcGeomFunctions.cpp
+++ b/src/ifcgeom/IfcGeomFunctions.cpp
@@ -25,6 +25,7 @@
 
 #include <set>
 #include <cassert>
+#include <algorithm>
 
 #include <gp_Pnt.hxx>
 #include <gp_Vec.hxx>
@@ -69,6 +70,7 @@
 #include <BRepBuilderAPI_MakeSolid.hxx>
 #include <BRepPrimAPI_MakeHalfSpace.hxx>
 #include <BRepAlgoAPI_Cut.hxx>
+#include <BRepAlgoAPI_Fuse.hxx>
 
 #include <ShapeFix_Shape.hxx>
 #include <ShapeFix_ShapeTolerance.hxx>
@@ -87,26 +89,25 @@
 
 #include <BRepGProp_Face.hxx>
 
-#include <BRepMesh.hxx>
+#include <BRepMesh_IncrementalMesh.hxx>
 #include <BRepTools.hxx>
 
 #include <Poly_Triangulation.hxx>
 #include <Poly_Array1OfTriangle.hxx>
 
-#include <BRepTools.hxx>
-
 #include <TopExp.hxx>
 #include <TopTools_IndexedMapOfShape.hxx>
 #include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
 #include <TopTools_ListIteratorOfListOfShape.hxx>
 
+#include "../ifcparse/IfcSIPrefix.h"
 #include "../ifcgeom/IfcGeom.h"
 
-bool IfcGeom::create_solid_from_compound(const TopoDS_Shape& compound, TopoDS_Shape& shape) {
+bool IfcGeom::Kernel::create_solid_from_compound(const TopoDS_Shape& compound, TopoDS_Shape& shape) {
 	BRepOffsetAPI_Sewing builder;
-	builder.SetTolerance(GetValue(GV_POINT_EQUALITY_TOLERANCE));
-	builder.SetMaxTolerance(GetValue(GV_POINT_EQUALITY_TOLERANCE));
-	builder.SetMinTolerance(GetValue(GV_POINT_EQUALITY_TOLERANCE));
+	builder.SetTolerance(getValue(GV_POINT_EQUALITY_TOLERANCE));
+	builder.SetMaxTolerance(getValue(GV_POINT_EQUALITY_TOLERANCE));
+	builder.SetMinTolerance(getValue(GV_POINT_EQUALITY_TOLERANCE));
 	TopExp_Explorer exp(compound,TopAbs_FACE);
 	if ( ! exp.More() ) return false;
 	for ( ; exp.More(); exp.Next() ) {
@@ -117,13 +118,13 @@ bool IfcGeom::create_solid_from_compound(const TopoDS_Shape& compound, TopoDS_Sh
 	shape = builder.SewedShape();
 	try {
 	ShapeFix_Solid sf_solid;
-	sf_solid.LimitTolerance(GetValue(GV_POINT_EQUALITY_TOLERANCE));
+	sf_solid.LimitTolerance(getValue(GV_POINT_EQUALITY_TOLERANCE));
 	shape = sf_solid.SolidFromShell(TopoDS::Shell(shape));
 	} catch(...) {}
 	return true;
 }
 
-bool IfcGeom::is_compound(const TopoDS_Shape& shape) {
+bool IfcGeom::Kernel::is_compound(const TopoDS_Shape& shape) {
 	bool has_solids = TopExp_Explorer(shape,TopAbs_SOLID).More() != 0;
 	bool has_shells = TopExp_Explorer(shape,TopAbs_SHELL).More() != 0;
 	bool has_compounds = TopExp_Explorer(shape,TopAbs_COMPOUND).More() != 0;
@@ -131,35 +132,41 @@ bool IfcGeom::is_compound(const TopoDS_Shape& shape) {
 	return has_compounds && has_faces && !has_solids && !has_shells;
 }
 
-const TopoDS_Shape& IfcGeom::ensure_fit_for_subtraction(const TopoDS_Shape& shape, TopoDS_Shape& solid) {
-	const bool is_comp = IfcGeom::is_compound(shape);
+const TopoDS_Shape& IfcGeom::Kernel::ensure_fit_for_subtraction(const TopoDS_Shape& shape, TopoDS_Shape& solid) {
+	const bool is_comp = is_compound(shape);
 	if ( ! is_comp ) return shape;
-	IfcGeom::create_solid_from_compound(shape,solid);
+	create_solid_from_compound(shape, solid);
+	
+	// If the SEW_SHELLS option had been set this precision had been applied
+	// at the end of the generic convert_shape() call.
+	const double precision = getValue(GV_PRECISION);
+	apply_tolerance(solid, precision);
+	
 	return solid;
 }
 
-bool IfcGeom::convert_openings(const IfcSchema::IfcProduct::ptr entity, const IfcSchema::IfcRelVoidsElement::list& openings, 
-							   const IfcRepresentationShapeItems& entity_shapes, const gp_Trsf& entity_trsf, IfcRepresentationShapeItems& cut_shapes) {
+bool IfcGeom::Kernel::convert_openings(const IfcSchema::IfcProduct* entity, const IfcSchema::IfcRelVoidsElement::list::ptr& openings, 
+							   const IfcGeom::IfcRepresentationShapeItems& entity_shapes, const gp_Trsf& entity_trsf, IfcGeom::IfcRepresentationShapeItems& cut_shapes) {
 	// Iterate over IfcOpeningElements
 	IfcGeom::IfcRepresentationShapeItems opening_shapes;
 	unsigned int last_size = 0;
-	for ( IfcSchema::IfcRelVoidsElement::it it = openings->begin(); it != openings->end(); ++ it ) {
-		IfcSchema::IfcRelVoidsElement::ptr v = *it;
-		IfcSchema::IfcFeatureElementSubtraction::ptr fes = v->RelatedOpeningElement();
+	for ( IfcSchema::IfcRelVoidsElement::list::it it = openings->begin(); it != openings->end(); ++ it ) {
+		IfcSchema::IfcRelVoidsElement* v = *it;
+		IfcSchema::IfcFeatureElementSubtraction* fes = v->RelatedOpeningElement();
 		if ( fes->is(IfcSchema::Type::IfcOpeningElement) ) {
 
 			// Convert the IfcRepresentation of the IfcOpeningElement
 			gp_Trsf opening_trsf;
-			IfcGeom::convert(fes->ObjectPlacement(),opening_trsf);
+			IfcGeom::Kernel::convert(fes->ObjectPlacement(),opening_trsf);
 
 			// Move the opening into the coordinate system of the IfcProduct
 			opening_trsf.PreMultiply(entity_trsf.Inverted());
 
-			IfcSchema::IfcProductRepresentation::ptr prodrep = fes->Representation();
-			IfcSchema::IfcRepresentation::list reps = prodrep->Representations();
+			IfcSchema::IfcProductRepresentation* prodrep = fes->Representation();
+			IfcSchema::IfcRepresentation::list::ptr reps = prodrep->Representations();
 						
-			for ( IfcSchema::IfcRepresentation::it it2 = reps->begin(); it2 != reps->end(); ++ it2 ) {
-				IfcGeom::convert_shapes(*it2,opening_shapes);
+			for ( IfcSchema::IfcRepresentation::list::it it2 = reps->begin(); it2 != reps->end(); ++ it2 ) {
+				convert_shapes(*it2,opening_shapes);
 			}
 
 			const unsigned int current_size = (const unsigned int) opening_shapes.size();
@@ -173,7 +180,7 @@ bool IfcGeom::convert_openings(const IfcSchema::IfcProduct::ptr entity, const If
 	// Iterate over the shapes of the IfcProduct
 	for ( IfcGeom::IfcRepresentationShapeItems::const_iterator it3 = entity_shapes.begin(); it3 != entity_shapes.end(); ++ it3 ) {
 		TopoDS_Shape entity_shape_solid;
-		const TopoDS_Shape& entity_shape_unlocated = IfcGeom::ensure_fit_for_subtraction(it3->Shape(),entity_shape_solid);
+		const TopoDS_Shape& entity_shape_unlocated = ensure_fit_for_subtraction(it3->Shape(),entity_shape_solid);
 		const gp_GTrsf& entity_shape_gtrsf = it3->Placement();
 		TopoDS_Shape entity_shape;
 		if ( entity_shape_gtrsf.Form() == gp_Other ) {
@@ -186,7 +193,7 @@ bool IfcGeom::convert_openings(const IfcSchema::IfcProduct::ptr entity, const If
 		// Iterate over the shapes of the IfcOpeningElements
 		for ( IfcGeom::IfcRepresentationShapeItems::const_iterator it4 = opening_shapes.begin(); it4 != opening_shapes.end(); ++ it4 ) {
 			TopoDS_Shape opening_shape_solid;
-			const TopoDS_Shape& opening_shape_unlocated = IfcGeom::ensure_fit_for_subtraction(it4->Shape(),opening_shape_solid);
+			const TopoDS_Shape& opening_shape_unlocated = ensure_fit_for_subtraction(it4->Shape(),opening_shape_solid);
 			const gp_GTrsf& opening_shape_gtrsf = it4->Placement();
 			if ( opening_shape_gtrsf.Form() == gp_Other ) {
 				Logger::Message(Logger::LOG_WARNING,"Applying non uniform transformation to opening of:",entity->entity);
@@ -202,27 +209,65 @@ bool IfcGeom::convert_openings(const IfcSchema::IfcProduct::ptr entity, const If
 					Logger::Message(Logger::LOG_WARNING,"Empty opening for:",entity->entity);
 				original_shape_volume = shape_volume(entity_shape);
 			}
-			
-			BRepAlgoAPI_Cut brep_cut(entity_shape,opening_shape);
 
-			if ( brep_cut.IsDone() ) {
-				TopoDS_Shape brep_cut_result = brep_cut;
+			if (entity_shape.ShapeType() == TopAbs_COMPSOLID) {
+
+				// For compound solids process the subtraction for the constituent
+				// solids individually and write the result back as a compound solid.
+
+				TopoDS_CompSolid compound;
+				BRep_Builder builder;
+				builder.MakeCompSolid(compound);
+
+				TopExp_Explorer exp(entity_shape, TopAbs_SOLID);
+
+				for (; exp.More(); exp.Next()) {
+					BRepAlgoAPI_Cut brep_cut(exp.Current(), opening_shape);
+					bool added = false;
+					if ( brep_cut.IsDone() ) {
+						TopoDS_Shape brep_cut_result = brep_cut;
+						BRepCheck_Analyzer analyser(brep_cut_result);
+						bool is_valid = analyser.IsValid() != 0;
+						if (is_valid) {
+							TopExp_Explorer exp(brep_cut_result, TopAbs_SOLID);
+							for (; exp.More(); exp.Next()) {
+								builder.Add(compound, exp.Current());
+								added = true;
+							}
+						}
+					}
+					if (!added) {
+						// Add the original in case subtraction fails
+						builder.Add(compound, exp.Current());
+					} else {
+						Logger::Message(Logger::LOG_ERROR,"Failed to process subtraction:",entity->entity);
+					}
+				}
+
+				entity_shape = compound;
+
+			} else {
+				BRepAlgoAPI_Cut brep_cut(entity_shape,opening_shape);
+
+				if ( brep_cut.IsDone() ) {
+					TopoDS_Shape brep_cut_result = brep_cut;
 				
-				BRepCheck_Analyzer analyser(brep_cut_result);
-				bool is_valid = analyser.IsValid() != 0;
-				if ( is_valid ) {
-					entity_shape = brep_cut;
-					if ( Logger::Verbosity() >= Logger::LOG_WARNING ) {
-						const double volume_after_subtraction = shape_volume(entity_shape);
+					BRepCheck_Analyzer analyser(brep_cut_result);
+					bool is_valid = analyser.IsValid() != 0;
+					if ( is_valid ) {
+						entity_shape = brep_cut;
+						if ( Logger::Verbosity() >= Logger::LOG_WARNING ) {
+							const double volume_after_subtraction = shape_volume(entity_shape);
 					
-						if ( ALMOST_THE_SAME(original_shape_volume,volume_after_subtraction) )
-							Logger::Message(Logger::LOG_WARNING,"Subtraction yields unchanged volume:",entity->entity);
+							if ( ALMOST_THE_SAME(original_shape_volume,volume_after_subtraction) )
+								Logger::Message(Logger::LOG_WARNING,"Subtraction yields unchanged volume:",entity->entity);
+						}
+					} else {
+						Logger::Message(Logger::LOG_ERROR,"Invalid result from subtraction:",entity->entity);
 					}
 				} else {
-					Logger::Message(Logger::LOG_ERROR,"Invalid result from subtraction:",entity->entity);
+					Logger::Message(Logger::LOG_ERROR,"Failed to process subtraction:",entity->entity);
 				}
-			} else {
-				Logger::Message(Logger::LOG_ERROR,"Failed to process subtraction:",entity->entity);
 			}
 
 		}
@@ -232,33 +277,33 @@ bool IfcGeom::convert_openings(const IfcSchema::IfcProduct::ptr entity, const If
 	return true;
 }
 
-bool IfcGeom::convert_openings_fast(const IfcSchema::IfcProduct::ptr entity, const IfcSchema::IfcRelVoidsElement::list& openings, 
-							   const IfcRepresentationShapeItems& entity_shapes, const gp_Trsf& entity_trsf, IfcRepresentationShapeItems& cut_shapes) {
+bool IfcGeom::Kernel::convert_openings_fast(const IfcSchema::IfcProduct* entity, const IfcSchema::IfcRelVoidsElement::list::ptr& openings, 
+							   const IfcGeom::IfcRepresentationShapeItems& entity_shapes, const gp_Trsf& entity_trsf, IfcGeom::IfcRepresentationShapeItems& cut_shapes) {
 	
 	// Create a compound of all opening shapes in order to speed up the boolean operations
 	TopoDS_Compound opening_compound;
 	BRep_Builder builder;
 	builder.MakeCompound(opening_compound);
 
-	for ( IfcSchema::IfcRelVoidsElement::it it = openings->begin(); it != openings->end(); ++ it ) {
-		IfcSchema::IfcRelVoidsElement::ptr v = *it;
-		IfcSchema::IfcFeatureElementSubtraction::ptr fes = v->RelatedOpeningElement();
+	for ( IfcSchema::IfcRelVoidsElement::list::it it = openings->begin(); it != openings->end(); ++ it ) {
+		IfcSchema::IfcRelVoidsElement* v = *it;
+		IfcSchema::IfcFeatureElementSubtraction* fes = v->RelatedOpeningElement();
 		if ( fes->is(IfcSchema::Type::IfcOpeningElement) ) {
 
 			// Convert the IfcRepresentation of the IfcOpeningElement
 			gp_Trsf opening_trsf;
-			IfcGeom::convert(fes->ObjectPlacement(),opening_trsf);
+			IfcGeom::Kernel::convert(fes->ObjectPlacement(),opening_trsf);
 
 			// Move the opening into the coordinate system of the IfcProduct
 			opening_trsf.PreMultiply(entity_trsf.Inverted());
 
-			IfcSchema::IfcProductRepresentation::ptr prodrep = fes->Representation();
-			IfcSchema::IfcRepresentation::list reps = prodrep->Representations();
+			IfcSchema::IfcProductRepresentation* prodrep = fes->Representation();
+			IfcSchema::IfcRepresentation::list::ptr reps = prodrep->Representations();
 
 			IfcGeom::IfcRepresentationShapeItems opening_shapes;
 						
-			for ( IfcSchema::IfcRepresentation::it it2 = reps->begin(); it2 != reps->end(); ++ it2 ) {
-				IfcGeom::convert_shapes(*it2,opening_shapes);
+			for ( IfcSchema::IfcRepresentation::list::it it2 = reps->begin(); it2 != reps->end(); ++ it2 ) {
+				convert_shapes(*it2,opening_shapes);
 			}
 
 			for ( unsigned int i = 0; i < opening_shapes.size(); ++ i ) {
@@ -276,7 +321,7 @@ bool IfcGeom::convert_openings_fast(const IfcSchema::IfcProduct::ptr entity, con
 	// Iterate over the shapes of the IfcProduct
 	for ( IfcGeom::IfcRepresentationShapeItems::const_iterator it3 = entity_shapes.begin(); it3 != entity_shapes.end(); ++ it3 ) {
 		TopoDS_Shape entity_shape_solid;
-		const TopoDS_Shape& entity_shape_unlocated = IfcGeom::ensure_fit_for_subtraction(it3->Shape(),entity_shape_solid);
+		const TopoDS_Shape& entity_shape_unlocated = ensure_fit_for_subtraction(it3->Shape(),entity_shape_solid);
 		const gp_GTrsf& entity_shape_gtrsf = it3->Placement();
 		TopoDS_Shape entity_shape;
 		if ( entity_shape_gtrsf.Form() == gp_Other ) {
@@ -309,7 +354,7 @@ bool IfcGeom::convert_openings_fast(const IfcSchema::IfcProduct::ptr entity, con
 	return true;
 }
 
-bool IfcGeom::convert_wire_to_face(const TopoDS_Wire& wire, TopoDS_Face& face) {
+bool IfcGeom::Kernel::convert_wire_to_face(const TopoDS_Wire& wire, TopoDS_Face& face) {
 	BRepBuilderAPI_MakeFace mf(wire, false);
 	BRepBuilderAPI_FaceError er = mf.Error();
 	if ( er == BRepBuilderAPI_NotPlanar ) {
@@ -324,12 +369,12 @@ bool IfcGeom::convert_wire_to_face(const TopoDS_Wire& wire, TopoDS_Face& face) {
 	return true;
 }
 
-bool IfcGeom::convert_curve_to_wire(const Handle(Geom_Curve)& curve, TopoDS_Wire& wire) {
+bool IfcGeom::Kernel::convert_curve_to_wire(const Handle(Geom_Curve)& curve, TopoDS_Wire& wire) {
 	wire = BRepBuilderAPI_MakeWire(BRepBuilderAPI_MakeEdge(curve));
 	return true;
 }
 
-bool IfcGeom::profile_helper(int numVerts, double* verts, int numFillets, int* filletIndices, double* filletRadii, gp_Trsf2d trsf, TopoDS_Shape& face_shape) {
+bool IfcGeom::Kernel::profile_helper(int numVerts, double* verts, int numFillets, int* filletIndices, double* filletRadii, gp_Trsf2d trsf, TopoDS_Shape& face_shape) {
 	TopoDS_Vertex* vertices = new TopoDS_Vertex[numVerts];
 	
 	for ( int i = 0; i < numVerts; i ++ ) {
@@ -343,17 +388,21 @@ bool IfcGeom::profile_helper(int numVerts, double* verts, int numFillets, int* f
 		w.Add(BRepBuilderAPI_MakeEdge(vertices[i],vertices[(i+1)%numVerts]));
 
 	TopoDS_Face face;
-	IfcGeom::convert_wire_to_face(w.Wire(),face);
+	convert_wire_to_face(w.Wire(),face);
 
-	if ( numFillets ) {
+	if ( numFillets && *std::max_element(filletRadii, filletRadii + numFillets) > ALMOST_ZERO ) {
 		BRepFilletAPI_MakeFillet2d fillet (face);
 		for ( int i = 0; i < numFillets; i ++ ) {
 			const double radius = filletRadii[i];
-			if ( radius < ALMOST_ZERO ) continue;
+			if ( radius <= ALMOST_ZERO ) continue;
 			fillet.AddFillet(vertices[filletIndices[i]],radius);
 		}
 		fillet.Build();
-		face = TopoDS::Face(fillet.Shape());
+		if (fillet.IsDone()) {
+			face = TopoDS::Face(fillet.Shape());
+		} else {
+			Logger::Message(Logger::LOG_WARNING, "Failed to process profile fillets");
+		}
 	}
 
 	face_shape = face;
@@ -361,17 +410,17 @@ bool IfcGeom::profile_helper(int numVerts, double* verts, int numFillets, int* f
 	delete[] vertices;
 	return true;
 }
-double IfcGeom::shape_volume(const TopoDS_Shape& s) {
+double IfcGeom::Kernel::shape_volume(const TopoDS_Shape& s) {
 	GProp_GProps prop;
 	BRepGProp::VolumeProperties(s, prop);
 	return prop.Mass();
 }
-double IfcGeom::face_area(const TopoDS_Face& f) {
+double IfcGeom::Kernel::face_area(const TopoDS_Face& f) {
 	GProp_GProps prop;
 	BRepGProp::SurfaceProperties(f,prop);
 	return prop.Mass();
 }
-bool IfcGeom::is_convex(const TopoDS_Wire& wire) {
+bool IfcGeom::Kernel::is_convex(const TopoDS_Wire& wire) {
 	for ( TopExp_Explorer exp1(wire,TopAbs_VERTEX); exp1.More(); exp1.Next() ) {
 		TopoDS_Vertex V1 = TopoDS::Vertex(exp1.Current());
 		gp_Pnt P1 = BRep_Tool::Pnt(V1);
@@ -386,8 +435,8 @@ bool IfcGeom::is_convex(const TopoDS_Wire& wire) {
 				edge_points.push_back(P2);
 			}
 			if ( edge_points.size() != 2 ) continue;
-			if ( edge_points[0].IsEqual(P1,GetValue(GV_POINT_EQUALITY_TOLERANCE))) neighbors.push_back(edge_points[1]);
-			else if ( edge_points[1].IsEqual(P1, GetValue(GV_POINT_EQUALITY_TOLERANCE))) neighbors.push_back(edge_points[0]);
+			if ( edge_points[0].IsEqual(P1,getValue(GV_POINT_EQUALITY_TOLERANCE))) neighbors.push_back(edge_points[1]);
+			else if ( edge_points[1].IsEqual(P1, getValue(GV_POINT_EQUALITY_TOLERANCE))) neighbors.push_back(edge_points[0]);
 		}
 		// There should be two of these
 		if ( neighbors.size() != 2 ) return false;
@@ -396,10 +445,10 @@ bool IfcGeom::is_convex(const TopoDS_Wire& wire) {
 		for ( TopExp_Explorer exp2(wire,TopAbs_VERTEX); exp2.More(); exp2.Next() ) {
 			TopoDS_Vertex V2 = TopoDS::Vertex(exp2.Current());
 			gp_Pnt P2 = BRep_Tool::Pnt(V2);
-			if ( P1.IsEqual(P2,GetValue(GV_POINT_EQUALITY_TOLERANCE)) ) continue;
+			if ( P1.IsEqual(P2,getValue(GV_POINT_EQUALITY_TOLERANCE)) ) continue;
 			bool found = false;
 			for( std::vector<gp_Pnt>::const_iterator it = neighbors.begin(); it != neighbors.end(); ++ it ) {
-				if ( (*it).IsEqual(P2,GetValue(GV_POINT_EQUALITY_TOLERANCE)) ) { found = true; break; }
+				if ( (*it).IsEqual(P2,getValue(GV_POINT_EQUALITY_TOLERANCE)) ) { found = true; break; }
 			}
 			if ( ! found ) non_neighbors.push_back(P2);
 		}
@@ -417,11 +466,11 @@ bool IfcGeom::is_convex(const TopoDS_Wire& wire) {
 	}
 	return true;
 }
-TopoDS_Shape IfcGeom::halfspace_from_plane(const gp_Pln& pln,const gp_Pnt& cent) {
+TopoDS_Shape IfcGeom::Kernel::halfspace_from_plane(const gp_Pln& pln,const gp_Pnt& cent) {
 	TopoDS_Face face = BRepBuilderAPI_MakeFace(pln).Face();
 	return BRepPrimAPI_MakeHalfSpace(face,cent).Solid();
 }
-gp_Pln IfcGeom::plane_from_face(const TopoDS_Face& face) {
+gp_Pln IfcGeom::Kernel::plane_from_face(const TopoDS_Face& face) {
 	BRepGProp_Face prop(face);
 	Standard_Real u1,u2,v1,v2;
 	prop.Bounds(u1,u2,v1,v2);
@@ -432,7 +481,7 @@ gp_Pln IfcGeom::plane_from_face(const TopoDS_Face& face) {
 	prop.Normal(u,v,p,n);
 	return gp_Pln(p,n);
 }
-gp_Pnt IfcGeom::point_above_plane(const gp_Pln& pln, bool agree) {
+gp_Pnt IfcGeom::Kernel::point_above_plane(const gp_Pln& pln, bool agree) {
 	if ( agree ) {
 		return pln.Location().Translated(pln.Axis().Direction());
 	} else {
@@ -440,7 +489,7 @@ gp_Pnt IfcGeom::point_above_plane(const gp_Pln& pln, bool agree) {
 	}
 }
 
-void IfcGeom::apply_tolerance(TopoDS_Shape& s, double t) {
+void IfcGeom::Kernel::apply_tolerance(TopoDS_Shape& s, double t) {
 	ShapeFix_ShapeTolerance tol;
 	tol.SetTolerance(s, t);
 }
@@ -455,7 +504,7 @@ static double ifc_planeangle_unit = -1.0;
 static double force_ccw_face_orientation = -1.0;
 static double modelling_precision = 0.00001;
 
-void IfcGeom::SetValue(GeomValue var, double value) {
+void IfcGeom::Kernel::setValue(GeomValue var, double value) {
 	switch (var) {
 	case GV_DEFLECTION_TOLERANCE:
 		deflection_tolerance = value;
@@ -489,7 +538,7 @@ void IfcGeom::SetValue(GeomValue var, double value) {
 	}
 }
 
-double IfcGeom::GetValue(GeomValue var) {
+double IfcGeom::Kernel::getValue(GeomValue var) {
 	switch (var) {
 	case GV_DEFLECTION_TOLERANCE:
 		return deflection_tolerance;
@@ -518,10 +567,10 @@ double IfcGeom::GetValue(GeomValue var) {
 	return 0;
 }
 
-IfcSchema::IfcProductDefinitionShape* IfcGeom::tesselate(TopoDS_Shape& shape, double deflection, IfcEntities es) {
-	BRepMesh::Mesh(shape, deflection);
+IfcSchema::IfcProductDefinitionShape* IfcGeom::tesselate(TopoDS_Shape& shape, double deflection, IfcEntityList::ptr es) {
+	BRepMesh_IncrementalMesh(shape, deflection);
 
-	IfcSchema::IfcFace::list faces (new IfcTemplatedEntityList<IfcSchema::IfcFace>());
+	IfcSchema::IfcFace::list::ptr faces (new IfcSchema::IfcFace::list);
 
 	for (TopExp_Explorer exp(shape, TopAbs_FACE); exp.More(); exp.Next()) {
 		const TopoDS_Face& face = TopoDS::Face(exp.Current());
@@ -542,13 +591,13 @@ IfcSchema::IfcProductDefinitionShape* IfcGeom::tesselate(TopoDS_Shape& shape, do
 			for (int i = 1; i <= triangles.Length(); ++ i) {
 				int n1, n2, n3;
 				triangles(i).Get(n1, n2, n3);
-				IfcSchema::IfcCartesianPoint::list points (new IfcTemplatedEntityList<IfcSchema::IfcCartesianPoint>());
+				IfcSchema::IfcCartesianPoint::list::ptr points (new IfcSchema::IfcCartesianPoint::list);
 				points->push(vertices[n1-1]);
 				points->push(vertices[n2-1]);
 				points->push(vertices[n3-1]);
 				IfcSchema::IfcPolyLoop* loop = new IfcSchema::IfcPolyLoop(points);
 				IfcSchema::IfcFaceOuterBound* bound = new IfcSchema::IfcFaceOuterBound(loop, face.Orientation() != TopAbs_REVERSED);
-				IfcSchema::IfcFaceBound::list bounds (new IfcTemplatedEntityList<IfcSchema::IfcFaceBound>());
+				IfcSchema::IfcFaceBound::list::ptr bounds (new IfcSchema::IfcFaceBound::list);
 				bounds->push(bound);
 				IfcSchema::IfcFace* face = new IfcSchema::IfcFace(bounds);
 				es->push(loop);
@@ -559,12 +608,12 @@ IfcSchema::IfcProductDefinitionShape* IfcGeom::tesselate(TopoDS_Shape& shape, do
 		}
 	}
 	IfcSchema::IfcOpenShell* shell = new IfcSchema::IfcOpenShell(faces);
-	IfcSchema::IfcConnectedFaceSet::list shells (new IfcTemplatedEntityList<IfcSchema::IfcConnectedFaceSet>());
+	IfcSchema::IfcConnectedFaceSet::list::ptr shells (new IfcSchema::IfcConnectedFaceSet::list);
 	shells->push(shell);
 	IfcSchema::IfcFaceBasedSurfaceModel* surface_model = new IfcSchema::IfcFaceBasedSurfaceModel(shells);
 
-	IfcSchema::IfcRepresentation::list reps (new IfcTemplatedEntityList<IfcSchema::IfcRepresentation>());
-	IfcSchema::IfcRepresentationItem::list items (new IfcTemplatedEntityList<IfcSchema::IfcRepresentationItem>());
+	IfcSchema::IfcRepresentation::list::ptr reps (new IfcSchema::IfcRepresentation::list);
+	IfcSchema::IfcRepresentationItem::list::ptr items (new IfcSchema::IfcRepresentationItem::list);
 
 	items->push(surface_model);
 
@@ -607,7 +656,7 @@ TopoDS_Edge find_next(const TopTools_IndexedMapOfShape& edge_set, const TopTools
 	return TopoDS_Edge();
 }
 
-bool IfcGeom::fill_nonmanifold_wires_with_planar_faces(TopoDS_Shape& shape) {
+bool IfcGeom::Kernel::fill_nonmanifold_wires_with_planar_faces(TopoDS_Shape& shape) {
 	BRepOffsetAPI_Sewing sew;
 	sew.Add(shape);
 
@@ -682,112 +731,314 @@ bool IfcGeom::fill_nonmanifold_wires_with_planar_faces(TopoDS_Shape& shape) {
 
 	try {
 		ShapeFix_Solid solid;
-		solid.LimitTolerance(GetValue(GV_POINT_EQUALITY_TOLERANCE));
+		solid.LimitTolerance(getValue(GV_POINT_EQUALITY_TOLERANCE));
 		shape = solid.SolidFromShell(TopoDS::Shell(shape));
 	} catch(...) {}
 
 	return true;
 }
 
-std::string IfcGeom::create_brep_data(Ifc2x3::IfcProduct* ifc_product, unsigned int settings) {
-	const bool no_openings = !!(settings & DISABLE_OPENING_SUBTRACTIONS);
-	const bool no_placement = !!(settings & DISABLE_OBJECT_PLACEMENT);
-	const bool sew_shells = !!(settings & SEW_SHELLS);
+bool IfcGeom::Kernel::flatten_shape_list(const IfcGeom::IfcRepresentationShapeItems& shapes, TopoDS_Shape& result, bool fuse) {
+	TopoDS_Compound compound;
+	BRep_Builder builder;
+	builder.MakeCompound(compound);
+
+	result = TopoDS_Shape();
+			
+	for ( IfcGeom::IfcRepresentationShapeItems::const_iterator it = shapes.begin(); it != shapes.end(); ++ it ) {
+		TopoDS_Shape merged;
+		const TopoDS_Shape& s = it->Shape();
+		if (fuse) {
+			ensure_fit_for_subtraction(s, merged);
+		} else {
+			merged = s;
+		}
+		const gp_GTrsf& trsf = it->Placement();
+		bool trsf_valid = false;
+		gp_Trsf _trsf;
+		try {
+			_trsf = trsf.Trsf();
+			trsf_valid = true;
+		} catch (...) {}
+		const TopoDS_Shape moved_shape = trsf_valid ? merged.Moved(_trsf) :
+			BRepBuilderAPI_GTransform(merged,trsf,true).Shape();
+
+		if (shapes.size() == 1) {
+			result = moved_shape;
+			const double precision = getValue(GV_PRECISION);
+			apply_tolerance(result, precision);
+			return true;
+		}
 
-	const double old_max_faces_to_sew = GetValue(GV_MAX_FACES_TO_SEW);
-	const double inf = std::numeric_limits<double>::infinity();
-	SetValue(GV_MAX_FACES_TO_SEW, sew_shells ? inf : -inf);
+		if (fuse) {
+			if (result.IsNull()) {
+				result = moved_shape;
+			} else {
+				BRepAlgoAPI_Fuse brep_fuse(result, moved_shape);
+				if ( brep_fuse.IsDone() ) {
+					TopoDS_Shape fused = brep_fuse;
 
-	std::string brep_data = "";
+					ShapeFix_Shape fix(result);
+					fix.Perform();
+					result = fix.Shape();
+		
+					bool is_valid = BRepCheck_Analyzer(result).IsValid() != 0;
+					if ( is_valid ) {
+						result = fused;
+					} 
+				}
+			}
+		} else {
+			builder.Add(compound,moved_shape);
+		}
+	}
 
-	if (ifc_product->hasRepresentation()) {
+	const bool success = !result.IsNull();
+	if (success) {
+		const double precision = getValue(GV_PRECISION);
+		apply_tolerance(result, precision);
+	}
 
-		Ifc2x3::IfcProductRepresentation* prod_rep = ifc_product->Representation();
-		Ifc2x3::IfcRepresentation::list li = prod_rep->Representations();
-		Ifc2x3::IfcShapeRepresentation* shape_rep = 0;
-		for (Ifc2x3::IfcRepresentation::it i = li->begin(); i != li->end(); ++i) {
-			const std::string representation_identifier = (*i)->RepresentationIdentifier();
-			if ((*i)->is(Ifc2x3::Type::IfcShapeRepresentation) && (representation_identifier == "Body" || representation_identifier == "Facetation")) {
-				shape_rep = (Ifc2x3::IfcShapeRepresentation*) *i;
+	return success;
+}
+	
+void IfcGeom::Kernel::remove_redundant_points_from_loop(TColgp_SequenceOfPnt& polygon, bool closed, double tol) {
+	if (tol <= 0.) tol = getValue(GV_POINT_EQUALITY_TOLERANCE);
+	tol *= tol;
+
+	while (true) {
+		bool removed = false;
+		int n = polygon.Length() - (closed ? 0 : 1);
+		for (int i = 1; i <= n; ++i) {
+			// wrap around to the first point in case of a closed loop
+			int j = (i % polygon.Length()) + 1;
+			double dist = polygon.Value(i).SquareDistance(polygon.Value(j));
+			if (dist < tol) {
+				// do not remove the first or last point to
+				// maintain connectivity with other wires
+				if ((closed && j == 1) || (!closed && j == n)) polygon.Remove(i);
+				else polygon.Remove(j);
+				removed = true;
 				break;
 			}
 		}
+		if (!removed) break;
+	}
+}
 
-		if (!!shape_rep) {
+template <typename P>
+IfcGeom::BRepElement<P>* IfcGeom::Kernel::create_brep_for_representation_and_product(const IteratorSettings& settings, IfcSchema::IfcRepresentation* representation, IfcSchema::IfcProduct* product) {
+	IfcGeom::Representation::BRep* shape;
+	IfcGeom::IfcRepresentationShapeItems shapes;
 
-			IfcGeom::IfcRepresentationShapeItems shapes;
-			if (IfcGeom::convert_shapes(shape_rep,shapes)) {
+	if ( !convert_shapes(representation,shapes) ) {
+		return 0;
+	}
+
+	int parent_id = -1;
+	try {
+		IfcSchema::IfcObjectDefinition* parent_object = get_decomposing_entity(product);
+		if (parent_object) {
+			parent_id = parent_object->entity->id();
+		}
+	} catch (...) {}
 		
-				gp_Trsf trsf;
-				try {
-					IfcGeom::convert(ifc_product->ObjectPlacement(),trsf);
-				} catch (...) {}
-
-				// Does the IfcElement have any IfcOpenings?
-				// Note that openings for IfcOpeningElements are not processed
-				IfcSchema::IfcRelVoidsElement::list openings = IfcSchema::IfcRelVoidsElement::list();
-				if ( ifc_product->is(IfcSchema::Type::IfcElement) && !ifc_product->is(IfcSchema::Type::IfcOpeningElement) ) {
-					IfcSchema::IfcElement::ptr element = reinterpret_pointer_cast<IfcSchema::IfcProduct,IfcSchema::IfcElement>(ifc_product);
-					openings = element->HasOpenings();
-				}
-				// Is the IfcElement a decomposition of an IfcElement with any IfcOpeningElements?
-				if ( ifc_product->is(IfcSchema::Type::IfcBuildingElementPart ) ) {
-					IfcSchema::IfcBuildingElementPart::ptr part = reinterpret_pointer_cast<IfcSchema::IfcProduct,IfcSchema::IfcBuildingElementPart>(ifc_product);
+	const std::string name = product->hasName() ? product->Name() : "";
+	const std::string guid = product->GlobalId();
+		
+	gp_Trsf trsf;
+	try {
+		convert(product->ObjectPlacement(),trsf);
+	} catch (...) {}
+
+	// Does the IfcElement have any IfcOpenings?
+	// Note that openings for IfcOpeningElements are not processed
+	IfcSchema::IfcRelVoidsElement::list::ptr openings;
+	if ( product->is(IfcSchema::Type::IfcElement) && !product->is(IfcSchema::Type::IfcOpeningElement) ) {
+		IfcSchema::IfcElement* element = (IfcSchema::IfcElement*)product;
+		openings = element->HasOpenings();
+	}
+	// Is the IfcElement a decomposition of an IfcElement with any IfcOpeningElements?
+	if ( product->is(IfcSchema::Type::IfcBuildingElementPart ) ) {
+		IfcSchema::IfcBuildingElementPart* part = (IfcSchema::IfcBuildingElementPart*)product;
 #ifdef USE_IFC4
-					IfcSchema::IfcRelAggregates::list decomposes = part->Decomposes();
-					for ( IfcSchema::IfcRelAggregates::it it = decomposes->begin(); it != decomposes->end(); ++ it ) {
+		IfcSchema::IfcRelAggregates::list::ptr decomposes = part->Decomposes();
+		for ( IfcSchema::IfcRelAggregates::list::it it = decomposes->begin(); it != decomposes->end(); ++ it ) {
 #else
-					IfcSchema::IfcRelDecomposes::list decomposes = part->Decomposes();
-					for ( IfcSchema::IfcRelDecomposes::it it = decomposes->begin(); it != decomposes->end(); ++ it ) {
+		IfcSchema::IfcRelDecomposes::list::ptr decomposes = part->Decomposes();
+		for ( IfcSchema::IfcRelDecomposes::list::it it = decomposes->begin(); it != decomposes->end(); ++ it ) {
 #endif
-						IfcSchema::IfcObjectDefinition::ptr obdef = (*it)->RelatingObject();
-						if ( obdef->is(IfcSchema::Type::IfcElement) ) {
-							IfcSchema::IfcElement::ptr element = reinterpret_pointer_cast<IfcSchema::IfcObjectDefinition,IfcSchema::IfcElement>(obdef);
-							openings->push(element->HasOpenings());
-						}
-					}
-				}
+			IfcSchema::IfcObjectDefinition* obdef = (*it)->RelatingObject();
+			if ( obdef->is(IfcSchema::Type::IfcElement) ) {
+				IfcSchema::IfcElement* element = (IfcSchema::IfcElement*)obdef;
+				openings->push(element->HasOpenings());
+			}
+		}
+	}
 
-				if (openings && openings->Size() && !no_openings) {
-					IfcGeom::IfcRepresentationShapeItems opened_shapes;
-					try {
-						IfcGeom::convert_openings(ifc_product,openings,shapes,trsf,opened_shapes);
-					} catch(...) { 
-						Logger::Message(Logger::LOG_ERROR,"Error processing openings for:",ifc_product->entity); 
-					}
-					shapes = opened_shapes;
+	const std::string product_type = IfcSchema::Type::ToString(product->type());
+	ElementSettings element_settings(settings, getValue(GV_LENGTH_UNIT), product_type);
+
+	if ( !settings.disable_opening_subtractions() && openings && openings->size() ) {
+		IfcGeom::IfcRepresentationShapeItems opened_shapes;
+		try {
+			if ( settings.faster_booleans() ) {
+				bool succes = convert_openings_fast(product,openings,shapes,trsf,opened_shapes);
+				if ( ! succes ) {
+					opened_shapes.clear();
+					convert_openings(product,openings,shapes,trsf,opened_shapes);
 				}
+			} else {
+				convert_openings(product,openings,shapes,trsf,opened_shapes);
+			}
+		} catch(...) { 
+			Logger::Message(Logger::LOG_ERROR,"Error processing openings for:",product->entity); 
+		}
+		if ( settings.use_world_coords() ) {
+			for ( IfcGeom::IfcRepresentationShapeItems::iterator it = opened_shapes.begin(); it != opened_shapes.end(); ++ it ) {
+				it->prepend(trsf);
+			}
+			trsf = gp_Trsf();
+		}
+		shape = new IfcGeom::Representation::BRep(element_settings, representation->entity->id(), opened_shapes);
+	} else if ( settings.use_world_coords() ) {
+		for ( IfcGeom::IfcRepresentationShapeItems::iterator it = shapes.begin(); it != shapes.end(); ++ it ) {
+			it->prepend(trsf);
+		}
+		trsf = gp_Trsf();
+		shape = new IfcGeom::Representation::BRep(element_settings, representation->entity->id(), shapes);
+	} else {
+		shape = new IfcGeom::Representation::BRep(element_settings, representation->entity->id(), shapes);
+	}
+
+	return new BRepElement<P>(
+		product->entity->id(),
+		parent_id,
+		name, 
+		product_type,
+		guid,
+		trsf,
+		shape
+	);
+}
+
+IfcSchema::IfcObjectDefinition* IfcGeom::Kernel::get_decomposing_entity(IfcSchema::IfcProduct* product) {
+	IfcSchema::IfcObjectDefinition* parent = 0;
 
-				if (!no_placement) {
-					for ( IfcGeom::IfcRepresentationShapeItems::iterator it = shapes.begin(); it != shapes.end(); ++ it ) {
-						it->prepend(trsf);
+	// In case of an opening element, parent to the RelatingBuildingElement
+	if ( product->is(IfcSchema::Type::IfcOpeningElement ) ) {
+		IfcSchema::IfcOpeningElement* opening = (IfcSchema::IfcOpeningElement*)product;
+		IfcSchema::IfcRelVoidsElement::list::ptr voids = opening->VoidsElements();
+		if ( voids->size() ) {
+			IfcSchema::IfcRelVoidsElement* ifc_void = *voids->begin();
+			parent = ifc_void->RelatingBuildingElement();
+		}
+	} else if ( product->is(IfcSchema::Type::IfcElement ) ) {
+		IfcSchema::IfcElement* element = (IfcSchema::IfcElement*)product;
+		IfcSchema::IfcRelFillsElement::list::ptr fills = element->FillsVoids();
+		// Incase of a RelatedBuildingElement parent to the opening element
+		if ( fills->size() ) {
+			for ( IfcSchema::IfcRelFillsElement::list::it it = fills->begin(); it != fills->end(); ++ it ) {
+				IfcSchema::IfcRelFillsElement* fill = *it;
+				IfcSchema::IfcObjectDefinition* ifc_objectdef = fill->RelatingOpeningElement();
+				if ( product == ifc_objectdef ) continue;
+				parent = ifc_objectdef;
+			}
+		} 
+		// Else simply parent to the containing structure
+		if (!parent) {
+			IfcSchema::IfcRelContainedInSpatialStructure::list::ptr parents = element->ContainedInStructure();
+			if ( parents->size() ) {
+				IfcSchema::IfcRelContainedInSpatialStructure* container = *parents->begin();
+				parent = container->RelatingStructure();
+			}
+		}
+	}
+	// Parent decompositions to the RelatingObject
+	if (!parent) {
+		IfcEntityList::ptr parents = product->entity->getInverse(IfcSchema::Type::IfcRelAggregates, -1);
+		parents->push(product->entity->getInverse(IfcSchema::Type::IfcRelNests, -1));
+		for ( IfcEntityList::it it = parents->begin(); it != parents->end(); ++ it ) {
+			IfcSchema::IfcRelDecomposes* decompose = (IfcSchema::IfcRelDecomposes*)*it;
+			IfcSchema::IfcObjectDefinition* ifc_objectdef;
+#ifdef USE_IFC4
+			if (decompose->is(IfcSchema::Type::IfcRelAggregates)) {
+				ifc_objectdef = ((IfcSchema::IfcRelAggregates*)decompose)->RelatingObject();
+			} else {
+				continue;
+			}
+#else
+			ifc_objectdef = decompose->RelatingObject();
+#endif
+			if ( product == ifc_objectdef ) continue;
+			parent = ifc_objectdef;
+		}
+	}
+	return parent;
+}
+
+template IfcGeom::BRepElement<float>* IfcGeom::Kernel::create_brep_for_representation_and_product<float>(const IteratorSettings& settings, IfcSchema::IfcRepresentation* representation, IfcSchema::IfcProduct* product);
+template IfcGeom::BRepElement<double>* IfcGeom::Kernel::create_brep_for_representation_and_product<double>(const IteratorSettings& settings, IfcSchema::IfcRepresentation* representation, IfcSchema::IfcProduct* product);
+
+std::pair<std::string, double> IfcGeom::Kernel::initializeUnits(IfcSchema::IfcUnitAssignment* unit_assignment) {
+	// Set default units, set length to meters, angles to undefined
+	setValue(IfcGeom::Kernel::GV_LENGTH_UNIT, 1.0);
+	setValue(IfcGeom::Kernel::GV_PLANEANGLE_UNIT, -1.0);
+
+	std::string unit_name = "METER";
+	double unit_magnitude = 1.;
+
+	try {
+		IfcEntityList::ptr units = unit_assignment->Units();
+		if (!units || !units->size()) {
+			Logger::Message(Logger::LOG_ERROR, "No unit information found");
+		} else {
+			for ( IfcEntityList::it it = units->begin(); it != units->end(); ++ it ) {
+				std::string current_unit_name = "";
+				IfcUtil::IfcBaseClass* base = *it;
+				IfcSchema::IfcSIUnit* unit = 0;
+				double value = 1.f;
+				if ( base->is(IfcSchema::Type::IfcConversionBasedUnit) ) {
+					IfcSchema::IfcConversionBasedUnit* u = (IfcSchema::IfcConversionBasedUnit*)base;
+					current_unit_name = u->Name();
+					IfcSchema::IfcMeasureWithUnit* u2 = u->ConversionFactor();
+					IfcSchema::IfcUnit* u3 = u2->UnitComponent();
+					if ( u3->is(IfcSchema::Type::IfcSIUnit) ) {
+						unit = (IfcSchema::IfcSIUnit*) u3;
 					}
+					IfcSchema::IfcValue* v = u2->ValueComponent();
+					// Quick hack to get the numeric value from an IfcValue:
+					const double f = *v->entity->getArgument(0);
+					value *= f;
+				} else if ( base->is(IfcSchema::Type::IfcSIUnit) ) {
+					unit = (IfcSchema::IfcSIUnit*)base;
 				}
-
-				TopoDS_Compound compound;
-				BRep_Builder builder;
-				builder.MakeCompound(compound);
-				for ( IfcGeom::IfcRepresentationShapeItems::const_iterator it = shapes.begin(); it != shapes.end(); ++ it ) {
-					const TopoDS_Shape& s = it->Shape();
-					const gp_GTrsf& trsf = it->Placement();
-					bool trsf_valid = false;
-					gp_Trsf _trsf;
-					try {
-						_trsf = trsf.Trsf();
-						trsf_valid = true;
-					} catch (...) {}
-					const TopoDS_Shape moved_shape = trsf_valid ? s.Moved(_trsf) :
-						BRepBuilderAPI_GTransform(s,trsf,true).Shape();
-					builder.Add(compound,moved_shape);
+				if ( unit ) {
+					if ( unit->hasPrefix() ) {
+						value *= IfcParse::IfcSIPrefixToValue(unit->Prefix());
+					}
+					IfcSchema::IfcUnitEnum::IfcUnitEnum type = unit->UnitType();
+					if ( type == IfcSchema::IfcUnitEnum::IfcUnit_LENGTHUNIT ) {
+						setValue(IfcGeom::Kernel::GV_LENGTH_UNIT,value);
+						if (current_unit_name.empty()) {
+							if (unit->hasPrefix()) {
+								current_unit_name = IfcSchema::IfcSIPrefix::ToString(unit->Prefix());
+							}
+							current_unit_name += IfcSchema::IfcSIUnitName::ToString(unit->Name());
+						}
+						unit_magnitude = value;
+						unit_name = current_unit_name;
+					} else if ( type == IfcSchema::IfcUnitEnum::IfcUnit_PLANEANGLEUNIT ) {
+						setValue(IfcGeom::Kernel::GV_PLANEANGLE_UNIT, value);
+					}
 				}
-				std::stringstream sstream;
-				BRepTools::Write(compound,sstream);
-				brep_data = sstream.str();
 			}
 		}
+	} catch (const IfcParse::IfcException& ex) {
+		std::stringstream ss;
+		ss << "Failed to determine unit information '" << ex.what() << "'";
+		Logger::Message(Logger::LOG_ERROR, ss.str());
 	}
-	
-	SetValue(GV_MAX_FACES_TO_SEW, old_max_faces_to_sew);
-	
-	return brep_data;
+
+	return std::pair<std::string, double>(unit_name, unit_magnitude);
 }
\ No newline at end of file
diff --git a/src/ifcgeom/IfcGeomHelpers.cpp b/src/ifcgeom/IfcGeomHelpers.cpp
index b2246ce..23738cd 100644
--- a/src/ifcgeom/IfcGeomHelpers.cpp
+++ b/src/ifcgeom/IfcGeomHelpers.cpp
@@ -77,29 +77,19 @@
 
 #include "../ifcgeom/IfcGeom.h"
 
-
-namespace IfcGeom {
-	namespace Cache {
-#include "IfcRegisterCreateCache.h"
-	}
-}
-#define IN_CACHE(T,E,t,e) std::map<int,t>::const_iterator it = Cache::T.find(E->entity->id());\
-	if ( it != Cache::T.end() ) { e = it->second; return true; }
-#define CACHE(T,E,e) Cache::T[E->entity->id()] = e;
-
-bool IfcGeom::convert(const IfcSchema::IfcCartesianPoint::ptr l, gp_Pnt& point) {
+bool IfcGeom::Kernel::convert(const IfcSchema::IfcCartesianPoint* l, gp_Pnt& point) {
 	IN_CACHE(IfcCartesianPoint,l,gp_Pnt,point)
 	std::vector<double> xyz = l->Coordinates();
 	point = gp_Pnt(
-		xyz.size()     ? (xyz[0]*IfcGeom::GetValue(GV_LENGTH_UNIT)) : 0.0f,
-		xyz.size() > 1 ? (xyz[1]*IfcGeom::GetValue(GV_LENGTH_UNIT)) : 0.0f,
-		xyz.size() > 2 ? (xyz[2]*IfcGeom::GetValue(GV_LENGTH_UNIT)) : 0.0f
+		xyz.size()     ? (xyz[0]*getValue(GV_LENGTH_UNIT)) : 0.0f,
+		xyz.size() > 1 ? (xyz[1]*getValue(GV_LENGTH_UNIT)) : 0.0f,
+		xyz.size() > 2 ? (xyz[2]*getValue(GV_LENGTH_UNIT)) : 0.0f
 	);
 	CACHE(IfcCartesianPoint,l,point)
 	return true;
 }
 
-bool IfcGeom::convert(const IfcSchema::IfcDirection::ptr l, gp_Dir& dir) {
+bool IfcGeom::Kernel::convert(const IfcSchema::IfcDirection* l, gp_Dir& dir) {
 	IN_CACHE(IfcDirection,l,gp_Dir,dir)
 	std::vector<double> xyz = l->DirectionRatios();
 	dir = gp_Dir(
@@ -111,22 +101,22 @@ bool IfcGeom::convert(const IfcSchema::IfcDirection::ptr l, gp_Dir& dir) {
 	return true;
 }
 
-bool IfcGeom::convert(const IfcSchema::IfcVector::ptr l, gp_Vec& v) {
+bool IfcGeom::Kernel::convert(const IfcSchema::IfcVector* l, gp_Vec& v) {
 	IN_CACHE(IfcVector,l,gp_Vec,v)
 	gp_Dir d;
-	IfcGeom::convert(l->Orientation(),d);
-	v = l->Magnitude() * IfcGeom::GetValue(GV_LENGTH_UNIT) * d;
+	IfcGeom::Kernel::convert(l->Orientation(),d);
+	v = l->Magnitude() * getValue(GV_LENGTH_UNIT) * d;
 	CACHE(IfcVector,l,v)
 	return true;
 }
 
-bool IfcGeom::convert(const IfcSchema::IfcAxis2Placement3D::ptr l, gp_Trsf& trsf) {
+bool IfcGeom::Kernel::convert(const IfcSchema::IfcAxis2Placement3D* l, gp_Trsf& trsf) {
 	IN_CACHE(IfcAxis2Placement3D,l,gp_Trsf,trsf)
 	gp_Pnt o;gp_Dir axis = gp_Dir(0,0,1);gp_Dir refDirection;
-	IfcGeom::convert(l->Location(),o);
+	IfcGeom::Kernel::convert(l->Location(),o);
 	bool hasRef = l->hasRefDirection();
-	if ( l->hasAxis() ) IfcGeom::convert(l->Axis(),axis);
-	if ( hasRef ) IfcGeom::convert(l->RefDirection(),refDirection);
+	if ( l->hasAxis() ) IfcGeom::Kernel::convert(l->Axis(),axis);
+	if ( hasRef ) IfcGeom::Kernel::convert(l->RefDirection(),refDirection);
 	gp_Ax3 ax3;
 	if ( hasRef ) ax3 = gp_Ax3(o,axis,refDirection);
 	else ax3 = gp_Ax3(o,axis);
@@ -135,27 +125,26 @@ bool IfcGeom::convert(const IfcSchema::IfcAxis2Placement3D::ptr l, gp_Trsf& trsf
 	return true;
 }
 
-bool IfcGeom::convert(const IfcSchema::IfcAxis1Placement::ptr l, gp_Ax1& ax) {
+bool IfcGeom::Kernel::convert(const IfcSchema::IfcAxis1Placement* l, gp_Ax1& ax) {
 	IN_CACHE(IfcAxis1Placement,l,gp_Ax1,ax)
 	gp_Pnt o;gp_Dir axis = gp_Dir(0,0,1);
-	IfcGeom::convert(l->Location(),o);
-	if ( l->hasAxis() ) IfcGeom::convert(l->Axis(), axis);
+	IfcGeom::Kernel::convert(l->Location(),o);
+	if ( l->hasAxis() ) IfcGeom::Kernel::convert(l->Axis(), axis);
 	ax = gp_Ax1(o, axis);
 	CACHE(IfcAxis1Placement,l,ax)
 	return true;
 }
 
-bool IfcGeom::convert(const IfcSchema::IfcCartesianTransformationOperator3D::ptr l, gp_Trsf& trsf) {
+bool IfcGeom::Kernel::convert(const IfcSchema::IfcCartesianTransformationOperator3D* l, gp_Trsf& trsf) {
 	IN_CACHE(IfcCartesianTransformationOperator3D,l,gp_Trsf,trsf)
 	gp_Pnt origin;
-	IfcGeom::convert(l->LocalOrigin(),origin);
+	IfcGeom::Kernel::convert(l->LocalOrigin(),origin);
 	gp_Dir axis1 (1.,0.,0.);
 	gp_Dir axis2 (0.,1.,0.);
-	gp_Dir axis3;
-	if ( l->hasAxis1() ) IfcGeom::convert(l->Axis1(),axis1);
-	if ( l->hasAxis2() ) IfcGeom::convert(l->Axis2(),axis2);
-	if ( l->hasAxis3() ) IfcGeom::convert(l->Axis3(),axis3);
-	else axis3 = axis1.Crossed(axis2);
+	gp_Dir axis3 (0.,0.,1.);
+	if ( l->hasAxis1() ) IfcGeom::Kernel::convert(l->Axis1(),axis1);
+	if ( l->hasAxis2() ) IfcGeom::Kernel::convert(l->Axis2(),axis2);
+	if ( l->hasAxis3() ) IfcGeom::Kernel::convert(l->Axis3(),axis3);
 	gp_Ax3 ax3 (origin,axis3,axis1);
 	if ( axis2.Dot(ax3.YDirection()) < 0 ) ax3.YReverse();
 	trsf.SetTransformation(ax3);
@@ -165,16 +154,16 @@ bool IfcGeom::convert(const IfcSchema::IfcCartesianTransformationOperator3D::ptr
 	return true;
 }
 
-bool IfcGeom::convert(const IfcSchema::IfcCartesianTransformationOperator2D::ptr l, gp_Trsf2d& trsf) {
+bool IfcGeom::Kernel::convert(const IfcSchema::IfcCartesianTransformationOperator2D* l, gp_Trsf2d& trsf) {
 	IN_CACHE(IfcCartesianTransformationOperator2D,l,gp_Trsf2d,trsf)
 
 	gp_Pnt origin;
 	gp_Dir axis1 (1.,0.,0.);
 	gp_Dir axis2 (0.,1.,0.);
 	
-	IfcGeom::convert(l->LocalOrigin(),origin);
-	if ( l->hasAxis1() ) IfcGeom::convert(l->Axis1(),axis1);
-	if ( l->hasAxis2() ) IfcGeom::convert(l->Axis2(),axis2);
+	IfcGeom::Kernel::convert(l->LocalOrigin(),origin);
+	if ( l->hasAxis1() ) IfcGeom::Kernel::convert(l->Axis1(),axis1);
+	if ( l->hasAxis2() ) IfcGeom::Kernel::convert(l->Axis2(),axis2);
 	
 	const gp_Pnt2d origin2d(origin.X(), origin.Y());
 	const gp_Dir2d axis12d(axis1.X(), axis1.Y());
@@ -199,18 +188,17 @@ bool IfcGeom::convert(const IfcSchema::IfcCartesianTransformationOperator2D::ptr
 	return true;
 }
 
-bool IfcGeom::convert(const IfcSchema::IfcCartesianTransformationOperator3DnonUniform::ptr l, gp_GTrsf& gtrsf) {
+bool IfcGeom::Kernel::convert(const IfcSchema::IfcCartesianTransformationOperator3DnonUniform* l, gp_GTrsf& gtrsf) {
 	IN_CACHE(IfcCartesianTransformationOperator3DnonUniform,l,gp_GTrsf,gtrsf)
 	gp_Trsf trsf;
 	gp_Pnt origin;
-	IfcGeom::convert(l->LocalOrigin(),origin);
+	IfcGeom::Kernel::convert(l->LocalOrigin(),origin);
 	gp_Dir axis1 (1.,0.,0.);
 	gp_Dir axis2 (0.,1.,0.);
-	gp_Dir axis3;
-	if ( l->hasAxis1() ) IfcGeom::convert(l->Axis1(),axis1);
-	if ( l->hasAxis2() ) IfcGeom::convert(l->Axis2(),axis2);
-	if ( l->hasAxis3() ) IfcGeom::convert(l->Axis3(),axis3);
-	else axis3 = axis1.Crossed(axis2);
+	gp_Dir axis3 (0.,0.,1.);
+	if ( l->hasAxis1() ) IfcGeom::Kernel::convert(l->Axis1(),axis1);
+	if ( l->hasAxis2() ) IfcGeom::Kernel::convert(l->Axis2(),axis2);
+	if ( l->hasAxis3() ) IfcGeom::Kernel::convert(l->Axis3(),axis3);
 	gp_Ax3 ax3 (origin,axis3,axis1);
 	if ( axis2.Dot(ax3.YDirection()) < 0 ) ax3.YReverse();
 	trsf.SetTransformation(ax3);
@@ -227,7 +215,7 @@ bool IfcGeom::convert(const IfcSchema::IfcCartesianTransformationOperator3DnonUn
 	return true;
 }
 
-bool IfcGeom::convert(const IfcSchema::IfcCartesianTransformationOperator2DnonUniform::ptr l, gp_GTrsf2d& gtrsf) {
+bool IfcGeom::Kernel::convert(const IfcSchema::IfcCartesianTransformationOperator2DnonUniform* l, gp_GTrsf2d& gtrsf) {
 	IN_CACHE(IfcCartesianTransformationOperator2DnonUniform,l,gp_GTrsf2d,gtrsf)
 
 	gp_Trsf2d trsf;
@@ -235,9 +223,9 @@ bool IfcGeom::convert(const IfcSchema::IfcCartesianTransformationOperator2DnonUn
 	gp_Dir axis1 (1.,0.,0.);
 	gp_Dir axis2 (0.,1.,0.);
 	
-	IfcGeom::convert(l->LocalOrigin(),origin);
-	if ( l->hasAxis1() ) IfcGeom::convert(l->Axis1(),axis1);
-	if ( l->hasAxis2() ) IfcGeom::convert(l->Axis2(),axis2);
+	IfcGeom::Kernel::convert(l->LocalOrigin(),origin);
+	if ( l->hasAxis1() ) IfcGeom::Kernel::convert(l->Axis1(),axis1);
+	if ( l->hasAxis2() ) IfcGeom::Kernel::convert(l->Axis2(),axis2);
 
 	const gp_Pnt2d origin2d(origin.X(), origin.Y());
 	const gp_Dir2d axis12d(axis1.X(), axis1.Y());
@@ -263,14 +251,14 @@ bool IfcGeom::convert(const IfcSchema::IfcCartesianTransformationOperator2DnonUn
 	return true;
 }
 
-bool IfcGeom::convert(const IfcSchema::IfcPlane::ptr pln, gp_Pln& plane) {
+bool IfcGeom::Kernel::convert(const IfcSchema::IfcPlane* pln, gp_Pln& plane) {
 	IN_CACHE(IfcPlane,pln,gp_Pln,plane)
-	IfcSchema::IfcAxis2Placement3D::ptr l = pln->Position();
+	IfcSchema::IfcAxis2Placement3D* l = pln->Position();
 	gp_Pnt o;gp_Dir axis = gp_Dir(0,0,1);gp_Dir refDirection;
-	IfcGeom::convert(l->Location(),o);
+	IfcGeom::Kernel::convert(l->Location(),o);
 	bool hasRef = l->hasRefDirection();
-	if ( l->hasAxis() ) IfcGeom::convert(l->Axis(),axis);
-	if ( hasRef ) IfcGeom::convert(l->RefDirection(),refDirection);
+	if ( l->hasAxis() ) IfcGeom::Kernel::convert(l->Axis(),axis);
+	if ( hasRef ) IfcGeom::Kernel::convert(l->RefDirection(),refDirection);
 	gp_Ax3 ax3;
 	if ( hasRef ) ax3 = gp_Ax3(o,axis,refDirection);
 	else ax3 = gp_Ax3(o,axis);
@@ -279,12 +267,12 @@ bool IfcGeom::convert(const IfcSchema::IfcPlane::ptr pln, gp_Pln& plane) {
 	return true;
 }
 
-bool IfcGeom::convert(const IfcSchema::IfcAxis2Placement2D::ptr l, gp_Trsf2d& trsf) {
+bool IfcGeom::Kernel::convert(const IfcSchema::IfcAxis2Placement2D* l, gp_Trsf2d& trsf) {
 	IN_CACHE(IfcAxis2Placement2D,l,gp_Trsf2d,trsf)
 	gp_Pnt P; gp_Dir V (1,0,0);
-	IfcGeom::convert(l->Location(),P);
+	IfcGeom::Kernel::convert(l->Location(),P);
 	if ( l->hasRefDirection() )
-		IfcGeom::convert(l->RefDirection(),V);
+		IfcGeom::Kernel::convert(l->RefDirection(),V);
 
 	gp_Ax2d axis(gp_Pnt2d(P.X(),P.Y()),gp_Dir2d(V.X(),V.Y()));
 	trsf.SetTransformation(axis,gp_Ax2d());
@@ -292,32 +280,27 @@ bool IfcGeom::convert(const IfcSchema::IfcAxis2Placement2D::ptr l, gp_Trsf2d& tr
 	return true;
 }
 
-bool IfcGeom::convert(const IfcSchema::IfcObjectPlacement::ptr l, gp_Trsf& trsf) {
+bool IfcGeom::Kernel::convert(const IfcSchema::IfcObjectPlacement* l, gp_Trsf& trsf) {
 	IN_CACHE(IfcObjectPlacement,l,gp_Trsf,trsf)
 	if ( ! l->is(IfcSchema::Type::IfcLocalPlacement) ) {
 		Logger::Message(Logger::LOG_ERROR, "Unsupported IfcObjectPlacement:", l->entity);
 		return false; 		
 	}
-	IfcSchema::IfcLocalPlacement::ptr current = reinterpret_pointer_cast<IfcSchema::IfcObjectPlacement,IfcSchema::IfcLocalPlacement>(l);
+	IfcSchema::IfcLocalPlacement* current = (IfcSchema::IfcLocalPlacement*)l;
 	while (1) {
 		gp_Trsf trsf2;
-		IfcSchema::IfcAxis2Placement relplacement = current->RelativePlacement();
+		IfcSchema::IfcAxis2Placement* relplacement = current->RelativePlacement();
 		if ( relplacement->is(IfcSchema::Type::IfcAxis2Placement3D) ) {
-			IfcGeom::convert((IfcSchema::IfcAxis2Placement3D*)relplacement,trsf2);
+			IfcGeom::Kernel::convert((IfcSchema::IfcAxis2Placement3D*)relplacement,trsf2);
 			trsf.PreMultiply(trsf2);
 		}
 		if ( current->hasPlacementRelTo() ) {
-			IfcSchema::IfcObjectPlacement::ptr relto = current->PlacementRelTo();
+			IfcSchema::IfcObjectPlacement* relto = current->PlacementRelTo();
 			if ( relto->is(IfcSchema::Type::IfcLocalPlacement) )
-				current = reinterpret_pointer_cast<IfcSchema::IfcObjectPlacement,IfcSchema::IfcLocalPlacement>(current->PlacementRelTo());
+				current = (IfcSchema::IfcLocalPlacement*)current->PlacementRelTo();
 			else break;			
 		} else break;
 	}
 	CACHE(IfcObjectPlacement,l,trsf)
 	return true;
-}
-
-void IfcGeom::Cache::Purge() {
-#include "IfcRegisterPurgeCache.h"
-	IfcGeom::Cache::PurgeShapeCache();
 }
\ No newline at end of file
diff --git a/src/ifcgeom/IfcGeomIterator.h b/src/ifcgeom/IfcGeomIterator.h
new file mode 100644
index 0000000..81c4519
--- /dev/null
+++ b/src/ifcgeom/IfcGeomIterator.h
@@ -0,0 +1,493 @@
+/********************************************************************************
+ *                                                                              *
+ * This file is part of IfcOpenShell.                                           *
+ *                                                                              *
+ * IfcOpenShell is free software: you can redistribute it and/or modify         *
+ * it under the terms of the Lesser GNU General Public License as published by  *
+ * the Free Software Foundation, either version 3.0 of the License, or          *
+ * (at your option) any later version.                                          *
+ *                                                                              *
+ * IfcOpenShell 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                 *
+ * Lesser GNU General Public License for more details.                          *
+ *                                                                              *
+ * You should have received a copy of the Lesser GNU General Public License     *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.         *
+ *                                                                              *
+ ********************************************************************************/
+
+/********************************************************************************
+ *                                                                              *
+ * Geometrical data in an IFC file consists of shapes (IfcShapeRepresentation)  *
+ * and instances (SUBTYPE OF IfcBuildingElement e.g. IfcWindow).                *
+ *                                                                              *
+ * IfcGeom::Representation::Triangulation is a class that represents a          *
+ * triangulated IfcShapeRepresentation.                                         *
+ *   Triangulation.verts is a 1 dimensional vector of float defining the        *
+ *      cartesian coordinates of the vertices of the triangulated shape in the  *
+ *      format of [x1,y1,z1,..,xn,yn,zn]                                        *
+ *   Triangulation.faces is a 1 dimensional vector of int containing the        *
+ *     indices of the triangles referencing positions in Triangulation.verts    *
+ *   Triangulation.edges is a 1 dimensional vector of int in {0,1} that dictates*
+ *	   the visibility of the edges that span the faces in Triangulation.faces   *
+ *                                                                              *
+ * IfcGeom::Element represents the actual IfcBuildingElements.                  *
+ *   IfcGeomObject.name is the GUID of the element                              *
+ *   IfcGeomObject.type is the datatype of the element e.g. IfcWindow           *
+ *   IfcGeomObject.mesh is a pointer to an IfcMesh                              *
+ *   IfcGeomObject.transformation.matrix is a 4x3 matrix that defines the       *
+ *     orientation and translation of the mesh in relation to the world origin  *
+ *                                                                              *
+ * IfcGeom::Iterator::findContext()                                             *
+ *   finds the most suitable representation contexts. Returns true iff          *
+ *   at least a single representation will process successfully                 *
+ *                                                                              *
+ * IfcGeom::Iterator::get()                                                     *
+ *   returns a pointer to the current IfcGeom::Element                          *
+ *                                                                              * 
+ * IfcGeom::Iterator::next()                                                    *
+ *   returns true iff a following entity is available for a successive call to  *
+ *   IfcGeom::Iterator::get()                                                   *
+ *                                                                              *
+ * IfcGeom::Iterator::progress()                                                *
+ *   returns an int in [0..100] that indicates the overall progress             *
+ *                                                                              *
+ ********************************************************************************/
+
+#ifndef IFCGEOMITERATOR_H
+#define IFCGEOMITERATOR_H
+
+#include <map>
+#include <set>
+#include <vector>
+#include <limits>
+#include <algorithm>
+
+#include <gp_Mat.hxx>
+#include <gp_Mat2d.hxx>
+#include <gp_GTrsf.hxx>
+#include <gp_GTrsf2d.hxx>
+#include <gp_Trsf.hxx>
+#include <gp_Trsf2d.hxx>
+
+#include "../ifcparse/IfcFile.h"
+
+#include "../ifcgeom/IfcGeom.h"
+#include "../ifcgeom/IfcGeomElement.h"
+#include "../ifcgeom/IfcGeomMaterial.h"
+#include "../ifcgeom/IfcGeomIteratorSettings.h"
+#include "../ifcgeom/IfcRepresentationShapeItem.h"
+
+namespace IfcGeom {
+	
+	template <typename P>
+	class Iterator {
+	private:
+		Kernel kernel;
+		IteratorSettings settings;
+
+		IfcParse::IfcFile* ifc_file;
+
+		// A container and iterator for IfcRepresentations
+		IfcSchema::IfcRepresentation::list::ptr representations;
+		IfcSchema::IfcRepresentation::list::it representation_iterator;
+
+		// The object is fetched beforehand to be sure that get() returns a valid element
+		TriangulationElement<P>* current_triangulation;
+		BRepElement<P>* current_shape_model;
+		SerializedElement<P>* current_serialization;
+		
+		// A container and iterator for IfcBuildingElements for the current IfcRepresentation referenced by *representation_iterator
+		IfcSchema::IfcProduct::list::ptr ifcproducts;
+		IfcSchema::IfcProduct::list::it ifcproduct_iterator;
+
+		int done;
+		int total;
+
+		std::string unit_name;
+		// double?
+		P unit_magnitude;
+
+		void initUnits() {
+			IfcSchema::IfcProject::list::ptr projects = ifc_file->entitiesByType<IfcSchema::IfcProject>();
+			if (projects->size() == 1) {
+				IfcSchema::IfcProject* project = *projects->begin();
+				std::pair<std::string, double> length_unit = kernel.initializeUnits(project->UnitsInContext());
+				unit_name = length_unit.first;
+				unit_magnitude = static_cast<P>(length_unit.second);
+			}
+		}
+
+		std::set<IfcSchema::Type::Enum> entities_to_include_or_exclude;
+		bool include_entities_in_processing;
+
+		void populate_set(const std::set<std::string>& include_or_ignore) {
+			entities_to_include_or_exclude.clear();
+			for (std::set<std::string>::const_iterator it = include_or_ignore.begin(); it != include_or_ignore.end(); ++it) {
+				std::string uppercase_type = *it;
+				for (std::string::iterator c = uppercase_type.begin(); c != uppercase_type.end(); ++c) {
+					*c = toupper(*c);
+				}
+				IfcSchema::Type::Enum ty;
+				try {
+					ty = IfcSchema::Type::FromString(uppercase_type);
+				} catch (const IfcParse::IfcException&) {
+					std::stringstream ss;
+					ss << "'" << *it << "' does not name a valid IFC entity";
+					throw IfcParse::IfcException(ss.str());
+				}
+				entities_to_include_or_exclude.insert(ty);
+				// TODO: Add child classes so that containment in set can be in O(log n)
+			}
+		}
+
+	public:
+		bool findContext() {
+			try {
+				initUnits();
+			} catch (...) {}
+
+			// Really this should only be 'Model', as per 
+			// the standard 'Design' is deprecated. So,
+			// just for backwards compatibility:
+			std::set<std::string> context_types;
+			context_types.insert("model");
+			context_types.insert("design");
+			// DDS likes to output 'model view'
+			context_types.insert("model view");
+
+			double lowest_precision_encountered = std::numeric_limits<double>::infinity();
+			bool any_precision_encountered = false;
+
+			representations = IfcSchema::IfcRepresentation::list::ptr(new IfcSchema::IfcRepresentation::list);
+
+			IfcSchema::IfcGeometricRepresentationContext::list::it it;
+			IfcSchema::IfcGeometricRepresentationSubContext::list::it jt;
+			IfcSchema::IfcGeometricRepresentationContext::list::ptr contexts = 
+				ifc_file->entitiesByType<IfcSchema::IfcGeometricRepresentationContext>();
+
+			IfcSchema::IfcGeometricRepresentationContext::list::ptr filtered_contexts (new IfcSchema::IfcGeometricRepresentationContext::list);
+
+ 			for (it = contexts->begin(); it != contexts->end(); ++it) {
+				IfcSchema::IfcGeometricRepresentationContext* context = *it;
+				if (context->is(IfcSchema::Type::IfcGeometricRepresentationSubContext)) {
+					// Continue, as the list of subcontexts will be considered
+					// by the parent's context inverse attributes.
+					continue;
+				}
+				if (context->hasContextType()) {
+					std::string context_type_lc = context->ContextType();
+					for (std::string::iterator c = context_type_lc.begin(); c != context_type_lc.end(); ++c) {
+						*c = tolower(*c);
+					}
+					if (context_types.find(context_type_lc) != context_types.end()) {
+						filtered_contexts->push(context);
+					}
+				}
+			}
+
+			if (filtered_contexts->size() == 0) {
+				filtered_contexts = contexts;
+			}
+
+			for (it = filtered_contexts->begin(); it != filtered_contexts->end(); ++it) {
+				IfcSchema::IfcGeometricRepresentationContext* context = *it;
+
+				representations->push(context->RepresentationsInContext());
+				if (context->hasPrecision() && context->Precision() < lowest_precision_encountered) {
+					lowest_precision_encountered = context->Precision();
+					any_precision_encountered = true;
+				}
+				IfcSchema::IfcGeometricRepresentationSubContext::list::ptr sub_contexts = context->HasSubContexts();
+				for (jt = sub_contexts->begin(); jt != sub_contexts->end(); ++jt) {
+					representations->push((*jt)->RepresentationsInContext());
+				}
+				// There is no need for full recursion as the following is governed by the schema:
+				// WR31: The parent context shall not be another geometric representation sub context. 
+			}
+
+			if (any_precision_encountered) {
+				// Some arbitrary factor that has proven to work better for the models in the set of test files.
+				lowest_precision_encountered *= 10.;
+
+				lowest_precision_encountered *= unit_magnitude;
+				if (lowest_precision_encountered < 1.e-7) {
+					Logger::Message(Logger::LOG_WARNING, "Precision lower than 0.0000001 meter not enforced");
+					kernel.setValue(IfcGeom::Kernel::GV_PRECISION, 1.e-7);
+				} else {
+					kernel.setValue(IfcGeom::Kernel::GV_PRECISION, lowest_precision_encountered);
+				}
+			} else {
+				kernel.setValue(IfcGeom::Kernel::GV_PRECISION, 1.e-5);
+			}
+
+			if (representations->size() == 0) return false;
+
+			representation_iterator = representations->begin();
+			ifcproducts.reset();
+
+			if (!create()) {
+				return false;
+			}
+
+			done = 0;
+			total = representations->size();
+
+			return true;
+		}
+
+		int progress() {
+			return 100 * done / total;
+		}
+
+		const std::string& getUnitName() {
+			return unit_name;
+		}
+
+		const P getUnitMagnitude() {
+			return unit_magnitude;
+		}
+	
+		const std::string getLog() {
+			return Logger::GetLog();
+		}
+
+		IfcParse::IfcFile* getFile() {
+			return ifc_file;
+		}
+
+		void includeEntities(const std::set<std::string>& entities) {
+			populate_set(entities);
+			include_entities_in_processing = true;
+		}
+
+		void excludeEntities(const std::set<std::string>& entities) {
+			populate_set(entities);
+			include_entities_in_processing = false;
+		}
+
+	private:
+		// Move to the next IfcRepresentation
+		void _nextShape() {
+			ifcproducts.reset();
+			++ representation_iterator;
+			++ done;
+		}
+
+		BRepElement<P>* create_shape_model_for_next_entity() {
+			while ( true ) {
+				IfcSchema::IfcRepresentation* representation;
+
+				// Have we reached the end of our list of representations?
+				if ( representation_iterator == representations->end() ) {
+					representations.reset();
+					return 0;
+				}
+				representation = *representation_iterator;
+
+				// Has the list of IfcProducts for this representation been initialized?
+				if (!ifcproducts) {
+					
+					IfcSchema::IfcProductRepresentation::list::ptr prodreps = representation->OfProductRepresentation();
+					ifcproducts = IfcSchema::IfcProduct::list::ptr(new IfcSchema::IfcProduct::list);
+					IfcSchema::IfcProduct::list::ptr unfiltered_products(new IfcSchema::IfcProduct::list);
+
+					for ( IfcSchema::IfcProductRepresentation::list::it it = prodreps->begin(); it != prodreps->end(); ++it ) {
+						if ( (*it)->is(IfcSchema::Type::IfcProductDefinitionShape) ) {
+							IfcSchema::IfcProductDefinitionShape* pds = (IfcSchema::IfcProductDefinitionShape*)*it;
+							unfiltered_products->push(pds->ShapeOfProduct());
+						} else {
+							// http://buildingsmart-tech.org/ifc/IFC2x3/TC1/html/ifcrepresentationresource/lexical/ifcproductrepresentation.htm
+							// IFC2x Edition 3 NOTE  Users should not instantiate the entity IfcProductRepresentation from IFC2x Edition 3 onwards. 
+							// It will be changed into an ABSTRACT supertype in future releases of IFC.
+
+							// IfcProductRepresentation also lacks the INVERSE relation to IfcProduct
+							// Let's find the IfcProducts that reference the IfcProductRepresentation anyway
+							unfiltered_products->push((*it)->entity->getInverse(IfcSchema::Type::IfcProduct, -1)->as<IfcSchema::IfcProduct>());
+						}
+
+						// Filter the products based on the set of entities being included or excluded for
+						// processing. The set is iterated over te able to filter on subtypes.
+						for ( IfcSchema::IfcProduct::list::it it = unfiltered_products->begin(); it != unfiltered_products->end(); ++it ) {
+							bool found = false;
+							for (std::set<IfcSchema::Type::Enum>::const_iterator jt = entities_to_include_or_exclude.begin(); jt != entities_to_include_or_exclude.end(); ++jt) {
+								if ((*it)->is(*jt)) {
+									found = true;
+									break;
+								}
+							}
+							if (found == include_entities_in_processing) {
+								ifcproducts->push(*it);
+							}
+						}
+
+					}
+					// Does this representation have any IfcProducts?
+					if (!ifcproducts->size()) {
+						_nextShape();
+						continue;
+					}
+					ifcproduct_iterator = ifcproducts->begin();
+				}
+				// Have we reached the end of our list of IfcProducts?
+				if ( ifcproduct_iterator == ifcproducts->end() ) {
+					_nextShape();
+					continue;
+				}
+
+				IfcSchema::IfcProduct* product = *ifcproduct_iterator;
+
+				BRepElement<P>* element = kernel.create_brep_for_representation_and_product<P>(settings, representation, product);
+
+				if ( !element ) {
+					_nextShape();
+					continue;
+				}
+
+				return element;
+			}	
+		}
+
+		public:
+
+		bool next() {
+			// Free all possible representations of the current geometrical entity
+			delete current_triangulation;
+			current_triangulation = 0;
+			delete current_serialization;
+			current_serialization = 0;
+			delete current_shape_model;
+			current_shape_model = 0;
+			
+			// Increment the iterator over the list of products using the current
+			// shape representation
+			if (ifcproducts) {
+				++ifcproduct_iterator;
+			}
+
+			return create();
+		}
+
+		Element<P>* get() {
+			// TODO: Test settings and throw
+			if (current_triangulation) return current_triangulation;
+			else if (current_serialization) return current_serialization;
+			else if (current_shape_model) return current_shape_model;
+			else return 0;
+		}
+
+		const Element<P>* getObject(int id) {
+
+			gp_Trsf trsf;
+			int parent_id = -1;
+			std::string instance_type, product_name, product_guid;
+			
+			try {
+				const IfcUtil::IfcBaseClass* ifc_entity = ifc_file->entityById(id);
+				instance_type = IfcSchema::Type::ToString(ifc_entity->type());
+				if ( ifc_entity->is(IfcSchema::Type::IfcProduct) ) {
+					IfcSchema::IfcProduct* ifc_product = (IfcSchema::IfcProduct*)ifc_entity;
+					
+					product_guid = ifc_product->GlobalId();
+					product_name = ifc_product->hasName() ? ifc_product->Name() : "";
+					
+					parent_id = -1;
+					try {
+						IfcSchema::IfcObjectDefinition* parent_object = kernel.get_decomposing_entity(ifc_product);
+						if (parent_object) {
+							parent_id = parent_object->entity->id();
+						}
+					} catch (...) {}
+					
+					try {
+						kernel.convert(ifc_product->ObjectPlacement(), trsf);
+					} catch (...) {}
+				}
+			} catch(...) {}
+
+			ElementSettings element_settings(settings, unit_magnitude, instance_type);
+			Element<P>* ifc_object = new Element<P>(element_settings, id, parent_id, product_name, instance_type, product_guid, trsf);
+			
+			return ifc_object;
+		}
+
+		bool create() {
+			try {
+				current_shape_model = create_shape_model_for_next_entity();
+			} catch (...) {}
+			if (!current_shape_model) return false;
+			if (settings.use_brep_data()) {
+				try {
+					current_serialization = new SerializedElement<P>(*current_shape_model);
+				} catch (...) {}
+				return !!current_serialization;
+			} else if (!settings.disable_triangulation()) {
+				try {
+					current_triangulation = new TriangulationElement<P>(*current_shape_model);
+				} catch (...) {}
+				return !!current_triangulation;
+			} else {
+				return true;
+			}
+		}
+	private:
+		void initialize() {
+			current_triangulation = 0;
+			current_shape_model = 0;
+			current_serialization = 0;
+
+			// Upon initialisation, the (empty) set of entity names,
+			// should be excluded, or no products would be processed.
+			include_entities_in_processing = false;
+		
+			unit_name = "METER";
+			unit_magnitude = 1.f;
+
+			kernel.setValue(IfcGeom::Kernel::GV_MAX_FACES_TO_SEW, settings.sew_shells() ? 1000 : -1);
+			kernel.setValue(IfcGeom::Kernel::GV_FORCE_CCW_FACE_ORIENTATION, settings.force_ccw_face_orientation() ? 1 : -1);
+		}
+	public:
+		Iterator(const IteratorSettings& settings, IfcParse::IfcFile* file)
+			: settings(settings)
+			, ifc_file(file)
+		{
+			initialize();
+		}
+		Iterator(const IteratorSettings& settings, const std::string& filename)
+			: settings(settings)
+			, ifc_file(new IfcParse::IfcFile)
+		{
+			ifc_file->Init(filename);
+			initialize();
+		}
+		Iterator(const IteratorSettings& settings, void* data, int length)
+			: settings(settings)
+			, ifc_file(new IfcParse::IfcFile)
+		{
+			ifc_file->Init(data, length);
+			initialize();
+		}
+		Iterator(const IteratorSettings& settings, std::istream& filestream, int length)
+			: settings(settings)
+			, ifc_file(new IfcParse::IfcFile)
+		{
+			ifc_file->Init(filestream, length);
+			initialize();
+		}
+
+		~Iterator() {
+			// TODO: Correctly implement destructor for IfcFile
+			delete ifc_file;
+
+			delete current_triangulation;
+			current_triangulation = 0;
+			delete current_serialization;
+			current_serialization = 0;
+			delete current_shape_model;
+			current_shape_model = 0;
+		}
+	};
+}
+
+#endif
diff --git a/src/ifcgeom/IfcGeomIteratorSettings.h b/src/ifcgeom/IfcGeomIteratorSettings.h
new file mode 100644
index 0000000..f34e729
--- /dev/null
+++ b/src/ifcgeom/IfcGeomIteratorSettings.h
@@ -0,0 +1,172 @@
+/********************************************************************************
+ *                                                                              *
+ * This file is part of IfcOpenShell.                                           *
+ *                                                                              *
+ * IfcOpenShell is free software: you can redistribute it and/or modify         *
+ * it under the terms of the Lesser GNU General Public License as published by  *
+ * the Free Software Foundation, either version 3.0 of the License, or          *
+ * (at your option) any later version.                                          *
+ *                                                                              *
+ * IfcOpenShell 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                 *
+ * Lesser GNU General Public License for more details.                          *
+ *                                                                              *
+ * You should have received a copy of the Lesser GNU General Public License     *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.         *
+ *                                                                              *
+ ********************************************************************************/
+
+#ifndef IFCGEOMITERATORSETTINGS_H
+#define IFCGEOMITERATORSETTINGS_H
+
+#include <string>
+
+#include "../ifcparse/IfcException.h"
+
+namespace IfcGeom {
+
+	class IteratorSettings {
+	public:
+		// Enumeration of setting identifiers. These settings define the
+		// behaviour of various aspects of IfcOpenShell.
+
+		// Specifies whether vertices are welded, meaning that the coordinates
+		// vector will only contain unique xyz-triplets. This results in a 
+		// manifold mesh which is useful for modelling applications, but might 
+		// result in unwanted shading artifacts in rendering applications.
+		static const int WELD_VERTICES = 1;
+		// Specifies whether to apply the local placements of building elements
+		// directly to the coordinates of the representation mesh rather than
+		// to represent the local placement in the 4x3 matrix, which will in that
+		// case be the identity matrix.
+		static const int USE_WORLD_COORDS = 2;
+		// Internally IfcOpenShell measures everything in meters. This settings
+		// specifies whether to convert IfcGeomObjects back to the units in which
+		// the geometry in the IFC file is specified.
+		static const int CONVERT_BACK_UNITS = 3;
+		// Specifies whether to use the Open Cascade BREP format for representation
+		// items rather than to create triangle meshes. This is useful is IfcOpenShell
+		// is used as a library in an application that is also built on Open Cascade.
+		static const int USE_BREP_DATA = 4;
+		// Specifies whether to sew IfcConnectedFaceSets (open and closed shells) to
+		// TopoDS_Shells or whether to keep them as a loose collection of faces.
+		static const int SEW_SHELLS = 5;
+		// Specifies whether to compose IfcOpeningElements into a single compound
+		// in order to speed up the processing of opening subtractions.
+		static const int FASTER_BOOLEANS = 6;
+		// By default singular faces have no explicitly defined orientation, to
+		// force faces to be defined CounterClockWise set this to true.
+		static const int FORCE_CCW_FACE_ORIENTATION = 7;
+		// Disables the subtraction of IfcOpeningElement representations from
+		// the related building element representations.
+		static const int DISABLE_OPENING_SUBTRACTIONS = 8;
+		// Disables the triangulation of the topological representations. Useful if
+		// the client application understands Open Cascade's native format.
+		static const int DISABLE_TRIANGULATION = 9;
+		// Applies default materials to entity instances without a surface style.
+		static const int APPLY_DEFAULT_MATERIALS = 10;
+
+		// End of settings enumeration.
+
+	private:
+		bool _weld_vertices, _use_world_coords, _convert_back_units, _use_brep_data, _sew_shells, _faster_booleans, _force_ccw_face_orientation, _disable_opening_subtractions, _disable_triangulation, _apply_default_materials;
+		double _deflection_tolerance;
+	public:
+		IteratorSettings()
+			: _weld_vertices(true)
+			, _use_world_coords(false)
+			, _convert_back_units(false)
+			, _use_brep_data(false)
+			, _sew_shells(false)
+			, _faster_booleans(false)
+			, _force_ccw_face_orientation(false)
+			, _disable_opening_subtractions(false)
+			, _disable_triangulation(false)
+			, _apply_default_materials(false)
+			// TODO: Make deflection tolerance into a command line argument
+			// For now, stick to one millimeter. Note that this is independent of the IFC length unit.
+			, _deflection_tolerance(1.e-3)
+		{}
+
+		const bool& weld_vertices() const { return _weld_vertices; }
+		bool& weld_vertices() { return _weld_vertices; }
+		const bool& use_world_coords() const { return _use_world_coords; }
+		bool& use_world_coords() { return _use_world_coords; }
+		const bool& convert_back_units() const { return _convert_back_units; }
+		bool& convert_back_units() { return _convert_back_units; }
+		const bool& use_brep_data() const { return _use_brep_data; }
+		bool& use_brep_data() { return _use_brep_data; }
+		const bool& sew_shells() const { return _sew_shells; }
+		bool& sew_shells() { return _sew_shells; }
+		const bool& faster_booleans() const { return _faster_booleans; }
+		bool& faster_booleans() { return _faster_booleans; }
+		const bool& force_ccw_face_orientation() const { return _force_ccw_face_orientation; }
+		bool& force_ccw_face_orientation() { return _force_ccw_face_orientation; }
+		const bool& disable_opening_subtractions() const { return _disable_opening_subtractions; }
+		bool& disable_opening_subtractions() { return _disable_opening_subtractions; }
+		const bool& disable_triangulation() const { return _disable_triangulation; }
+		bool& disable_triangulation() { return _disable_triangulation; }
+		const bool& apply_default_materials() const { return _apply_default_materials; }
+		bool& apply_default_materials() { return _apply_default_materials; }
+		
+		const double& deflection_tolerance() const { return _deflection_tolerance; }
+		double& deflection_tolerance() { return _deflection_tolerance; }
+		
+		void set(int setting, bool value) {
+			switch (setting) {
+			case USE_WORLD_COORDS:
+				_use_world_coords = value;
+				break;
+			case WELD_VERTICES:
+				_weld_vertices = value;
+				break;
+			case CONVERT_BACK_UNITS:
+				_convert_back_units = value;
+				break;
+			case USE_BREP_DATA:
+				_use_brep_data = value;
+				break;
+			case FASTER_BOOLEANS:
+				_faster_booleans = value;
+				break;
+			case SEW_SHELLS:
+				_sew_shells = value;
+				break;
+			case FORCE_CCW_FACE_ORIENTATION:
+				_force_ccw_face_orientation = value;
+				break;
+			case DISABLE_OPENING_SUBTRACTIONS:
+				_disable_opening_subtractions = value;
+				break;
+			case DISABLE_TRIANGULATION:
+				_disable_triangulation = value;
+				break;
+			case APPLY_DEFAULT_MATERIALS:
+				_apply_default_materials = value;
+				break;
+			default: throw IfcParse::IfcException("Invalid IteratorSetting");
+			}
+		}
+	};
+	
+	class ElementSettings : public IteratorSettings {
+	private:
+		double _unit_magnitude;
+		std::string _element_type;
+	public:
+		ElementSettings(const IteratorSettings& settings,
+			double unit_magnitude,
+			const std::string& element_type)
+			: IteratorSettings(settings)
+			, _unit_magnitude(unit_magnitude)
+			, _element_type(element_type)
+		{}
+
+		const double& unit_magnitude() const { return _unit_magnitude; }
+		const std::string& element_type() const { return _element_type; }
+	};
+
+}
+
+#endif
\ No newline at end of file
diff --git a/src/ifcgeom/IfcGeomMaterial.cpp b/src/ifcgeom/IfcGeomMaterial.cpp
new file mode 100644
index 0000000..b96eeeb
--- /dev/null
+++ b/src/ifcgeom/IfcGeomMaterial.cpp
@@ -0,0 +1,34 @@
+/********************************************************************************
+ *                                                                              *
+ * This file is part of IfcOpenShell.                                           *
+ *                                                                              *
+ * IfcOpenShell is free software: you can redistribute it and/or modify         *
+ * it under the terms of the Lesser GNU General Public License as published by  *
+ * the Free Software Foundation, either version 3.0 of the License, or          *
+ * (at your option) any later version.                                          *
+ *                                                                              *
+ * IfcOpenShell 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                 *
+ * Lesser GNU General Public License for more details.                          *
+ *                                                                              *
+ * You should have received a copy of the Lesser GNU General Public License     *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.         *
+ *                                                                              *
+ ********************************************************************************/
+
+#include "IfcGeomMaterial.h"
+
+static double black[3] = {0.,0.,0.};
+
+IfcGeom::Material::Material(const IfcGeom::SurfaceStyle* style) : style(style) {}
+bool IfcGeom::Material::hasDiffuse() const { return style->Diffuse() ? true : false; }
+bool IfcGeom::Material::hasSpecular() const { return style->Specular() ? true : false; }
+bool IfcGeom::Material::hasTransparency() const { return style->Transparency() ? true : false; }
+bool IfcGeom::Material::hasSpecularity() const { return style->Specularity() ? true : false; }
+const double* IfcGeom::Material::diffuse() const { if (hasDiffuse()) return &((*style->Diffuse()).R()); else return black; }
+const double* IfcGeom::Material::specular() const { if (hasSpecular()) return &((*style->Specular()).R()); else return black; }
+double IfcGeom::Material::transparency() const { if (hasTransparency()) return *style->Transparency(); else return 0; }
+double IfcGeom::Material::specularity() const { if (hasSpecularity()) return *style->Specularity(); else return 0; }
+const std::string IfcGeom::Material::name() const { return style->Name(); }
+bool IfcGeom::Material::operator==(const IfcGeom::Material& other) const { return style == other.style; }
diff --git a/src/ifcgeom/IfcGeomMaterial.h b/src/ifcgeom/IfcGeomMaterial.h
new file mode 100644
index 0000000..43228c2
--- /dev/null
+++ b/src/ifcgeom/IfcGeomMaterial.h
@@ -0,0 +1,50 @@
+/********************************************************************************
+ *                                                                              *
+ * This file is part of IfcOpenShell.                                           *
+ *                                                                              *
+ * IfcOpenShell is free software: you can redistribute it and/or modify         *
+ * it under the terms of the Lesser GNU General Public License as published by  *
+ * the Free Software Foundation, either version 3.0 of the License, or          *
+ * (at your option) any later version.                                          *
+ *                                                                              *
+ * IfcOpenShell 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                 *
+ * Lesser GNU General Public License for more details.                          *
+ *                                                                              *
+ * You should have received a copy of the Lesser GNU General Public License     *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.         *
+ *                                                                              *
+ ********************************************************************************/
+
+#ifndef IFCGEOMMATERIAL_H
+#define IFCGEOMMATERIAL_H
+
+#include <string>
+
+#include "../ifcgeom/IfcGeomRenderStyles.h"
+
+namespace IfcGeom {	
+
+	class Material {
+	private:
+		const IfcGeom::SurfaceStyle* style;
+	public:
+		explicit Material(const IfcGeom::SurfaceStyle* style = 0); // TODO default constructor for vector?
+		// Material(const Material& other);
+		// Material& operator=(const Material& other);
+		bool hasDiffuse() const;
+		bool hasSpecular() const;
+		bool hasTransparency() const;
+		bool hasSpecularity() const;
+		const double* diffuse() const;
+		const double* specular() const;
+		double transparency() const;
+		double specularity() const;
+		const std::string name() const;
+		bool operator==(const Material& other) const;
+	};
+
+}
+
+#endif
\ No newline at end of file
diff --git a/src/ifcgeom/IfcGeomObjects.cpp b/src/ifcgeom/IfcGeomObjects.cpp
deleted file mode 100644
index 686107e..0000000
--- a/src/ifcgeom/IfcGeomObjects.cpp
+++ /dev/null
@@ -1,853 +0,0 @@
-/********************************************************************************
- *                                                                              *
- * This file is part of IfcOpenShell.                                           *
- *                                                                              *
- * IfcOpenShell is free software: you can redistribute it and/or modify         *
- * it under the terms of the Lesser GNU General Public License as published by  *
- * the Free Software Foundation, either version 3.0 of the License, or          *
- * (at your option) any later version.                                          *
- *                                                                              *
- * IfcOpenShell 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                 *
- * Lesser GNU General Public License for more details.                          *
- *                                                                              *
- * You should have received a copy of the Lesser GNU General Public License     *
- * along with this program. If not, see <http://www.gnu.org/licenses/>.         *
- *                                                                              *
- ********************************************************************************/
-
-#include <map>
-#include <stdexcept>
-#include <limits>
-
-#include <gp_Mat.hxx>
-#include <gp_Mat2d.hxx>
-#include <gp_GTrsf.hxx>
-#include <gp_GTrsf2d.hxx>
-#include <gp_Trsf.hxx>
-#include <gp_Trsf2d.hxx>
-#include <TopoDS_Compound.hxx>
-#include <BRep_Builder.hxx>
-#include <BRepTools.hxx>
-#include <BRep_Tool.hxx>
-#include <TopExp_Explorer.hxx>
-#include <BRepMesh.hxx>
-#include <Poly_Triangulation.hxx>
-#include <Poly_PolygonOnTriangulation.hxx>
-#include <TColgp_Array1OfPnt.hxx>
-#include <TColgp_Array1OfPnt2d.hxx>
-#include <TShort_Array1OfShortReal.hxx>
-#include <Poly_Array1OfTriangle.hxx>
-#include <StdFail_NotDone.hxx>
-#include <BRepGProp_Face.hxx>
-#include <BRepBuilderAPI_GTransform.hxx>
-
-#include "../ifcparse/IfcException.h"
-#include "../ifcparse/IfcFile.h"
-#include "../ifcgeom/IfcGeomObjects.h"
-#include "../ifcgeom/IfcGeom.h"
-
-// Welds vertices that belong to different faces
-static bool weld_vertices = true;
-
-static bool convert_back_units = false;
-static bool use_faster_booleans = false;
-static bool disable_subtractions = false;
-static bool disable_triangulation = false;
-
-int IfcGeomObjects::IfcRepresentationTriangulation::addvert(int material_index, const gp_XYZ& p) {
-	const float X = convert_back_units ? (float) (p.X() / IfcGeom::GetValue(IfcGeom::GV_LENGTH_UNIT)) : (float)p.X();
-	const float Y = convert_back_units ? (float) (p.Y() / IfcGeom::GetValue(IfcGeom::GV_LENGTH_UNIT)) : (float)p.Y();
-	const float Z = convert_back_units ? (float) (p.Z() / IfcGeom::GetValue(IfcGeom::GV_LENGTH_UNIT)) : (float)p.Z();
-	int i = (int) _verts.size() / 3;
-	if ( weld_vertices ) {
-		const VertKey key = std::make_pair(material_index, std::make_pair(X, std::make_pair(Y, Z)));
-		VertKeyMap::const_iterator it = welds.find(key);
-		if ( it != welds.end() ) return it->second;
-		i = (int) welds.size();
-		welds[key] = i;
-	}
-	_verts.push_back(X);
-	_verts.push_back(Y);
-	_verts.push_back(Z);
-	return i;
-}
-
-static bool use_world_coords = false;
-static bool use_brep_data = false;
-
-static IfcParse::IfcFile* ifc_file = 0;
-
-IfcGeomObjects::IfcRepresentationBrepData::IfcRepresentationBrepData(const IfcRepresentationShapeModel& shapes)
-	: _id(shapes.getId()) 
-{
-	try {
-		TopoDS_Compound compound;
-		BRep_Builder builder;
-		builder.MakeCompound(compound);
-		for ( IfcGeom::IfcRepresentationShapeItems::const_iterator it = shapes.begin(); it != shapes.end(); ++ it ) {
-			const TopoDS_Shape& s = it->Shape();
-			gp_GTrsf trsf = it->Placement();
-			if (convert_back_units) {
-				gp_Trsf scale;
-				scale.SetScaleFactor(1.0 / IfcGeom::GetValue(IfcGeom::GV_LENGTH_UNIT));
-				trsf.PreMultiply(scale);
-			}
-			bool trsf_valid = false;
-			gp_Trsf _trsf;
-			try {
-				_trsf = trsf.Trsf();
-				trsf_valid = true;
-			} catch (...) {}
-			const TopoDS_Shape moved_shape = trsf_valid ? s.Moved(_trsf) :
-				BRepBuilderAPI_GTransform(s,trsf,true).Shape();
-			builder.Add(compound,moved_shape);
-		}
-		std::stringstream sstream;
-		BRepTools::Write(compound,sstream);
-		_brep_data = sstream.str();
-	} catch(...) {
-		Logger::Message(Logger::LOG_ERROR,"Failed to serialize shape:",ifc_file->EntityById(_id)->entity);
-	}
-}
-
-IfcGeomObjects::IfcRepresentationTriangulation::IfcRepresentationTriangulation(const IfcRepresentationShapeModel& shapes)
-	: _id(shapes.getId()) 
-{
-	for ( IfcGeom::IfcRepresentationShapeItems::const_iterator it = shapes.begin(); it != shapes.end(); ++ it ) {
-
-		int surface_style_id = -1;
-		if (it->hasStyle()) {
-			Material adapter(&it->Style());
-			std::vector<Material>::const_iterator jt = std::find(_materials.begin(), _materials.end(), adapter);
-			if (jt == _materials.end()) {
-				surface_style_id = _materials.size();
-				_materials.push_back(adapter);
-			} else {
-				surface_style_id = jt - _materials.begin();
-			}
-		}
-
-		const TopoDS_Shape& s = it->Shape();
-		const gp_GTrsf& trsf = it->Placement();
-
-		// Triangulate the shape
-		try {
-			// BRepTools::Clean(s);
-			BRepMesh::Mesh(s, IfcGeom::GetValue(IfcGeom::GV_DEFLECTION_TOLERANCE));
-		} catch(...) {
-			Logger::Message(Logger::LOG_ERROR,"Failed to triangulate shape:",ifc_file->EntityById(_id)->entity);
-			continue;
-		}
-		TopExp_Explorer exp;
-
-		// Iterates over the faces of the shape
-		for ( exp.Init(s,TopAbs_FACE); exp.More(); exp.Next() ) {
-			TopoDS_Face face = TopoDS::Face(exp.Current());
-			TopLoc_Location loc;
-			Handle_Poly_Triangulation tri = BRep_Tool::Triangulation(face,loc);
-
-			if ( ! tri.IsNull() ) {
-
-				// A 3x3 matrix to rotate the vertex normals
-				const gp_Mat rotation_matrix = trsf.VectorialPart();
-			
-				// Keep track of the number of times an edge is used
-				// Manifold edges (i.e. edges used twice) are deemed invisible
-				std::map<std::pair<int,int>,int> edgecount;
-				std::vector<std::pair<int,int> > edges_temp;
-
-				const TColgp_Array1OfPnt& nodes = tri->Nodes();
-				const TColgp_Array1OfPnt2d& uvs = tri->UVNodes();
-				std::vector<gp_XYZ> coords;
-				BRepGProp_Face prop(face);
-				std::map<int,int> dict;
-
-				// Vertex normals are only calculated if vertices are not welded
-				const bool calculate_normals = ! weld_vertices;
-
-				for( int i = 1; i <= nodes.Length(); ++ i ) {
-					coords.push_back(nodes(i).Transformed(loc).XYZ());
-					trsf.Transforms(*coords.rbegin());
-					dict[i] = addvert(surface_style_id, *coords.rbegin());
-					
-					if ( calculate_normals ) {
-						const gp_Pnt2d& uv = uvs(i);
-						gp_Pnt p;
-						gp_Vec normal_direction;
-						prop.Normal(uv.X(),uv.Y(),p,normal_direction);
-						gp_Vec normal(0., 0., 0.);
-						if (normal_direction.Magnitude() > ALMOST_ZERO) {
-							normal = gp_Dir(normal_direction.XYZ() * rotation_matrix);
-						}
-						_normals.push_back((float)normal.X());
-						_normals.push_back((float)normal.Y());
-						_normals.push_back((float)normal.Z());
-					}
-				}
-
-				const Poly_Array1OfTriangle& triangles = tri->Triangles();			
-				for( int i = 1; i <= triangles.Length(); ++ i ) {
-					int n1,n2,n3;
-					if ( face.Orientation() == TopAbs_REVERSED )
-						triangles(i).Get(n3,n2,n1);
-					else triangles(i).Get(n1,n2,n3);
-
-					/* An alternative would be to calculate normals based
-					 * on the coordinates of the mesh vertices */
-					/*
-					const gp_XYZ pt1 = coords[n1-1];
-					const gp_XYZ pt2 = coords[n2-1];
-					const gp_XYZ pt3 = coords[n3-1];
-					const gp_XYZ v1 = pt2-pt1;
-					const gp_XYZ v2 = pt3-pt2;
-					gp_Dir normal = gp_Dir(v1^v2);
-					_normals.push_back((float)normal.X());
-					_normals.push_back((float)normal.Y());
-					_normals.push_back((float)normal.Z());
-					*/
-
-					_faces.push_back(dict[n1]);
-					_faces.push_back(dict[n2]);
-					_faces.push_back(dict[n3]);
-
-					_material_ids.push_back(surface_style_id);
-
-					addedge(n1,n2,edgecount,edges_temp);
-					addedge(n2,n3,edgecount,edges_temp);
-					addedge(n3,n1,edgecount,edges_temp);
-				}
-				for ( std::vector<std::pair<int,int> >::const_iterator it = edges_temp.begin(); it != edges_temp.end(); ++it ) {
-					_edges.push_back(edgecount[*it]==1);
-				}
-			}
-		}
-	}
-}
-
-IfcGeomObjects::IfcObject::IfcObject(
-	int id, 
-	int parent_id, 
-	const std::string& name, 
-	const std::string& type, 
-	const std::string& guid, 
-	const gp_Trsf& trsf)
-		: _id(id)
-		, _parent_id(parent_id)
-		, _name(name)
-		, _type(type)
-		, _guid(guid)
-{
-	// Convert the gp_Trsf into a 4x3 Matrix
-	// Note that in case the CONVERT_BACK_UNITS setting is enabled
-	// the translation component of the matrix needs to be divided
-	// by the magnitude of the IFC model length unit because
-	// internally in IfcOpenShell everything is measured in meters.
-	for(int i = 1; i < 5; ++i) {
-		for (int j = 1; j < 4; ++j) {
-			const double trsf_value = trsf.Value(j,i);
-			const double matrix_value = i == 4 && convert_back_units
-				? trsf_value / IfcGeom::GetValue(IfcGeom::GV_LENGTH_UNIT)
-				: trsf_value;
-			_matrix.push_back(static_cast<float>(matrix_value));
-		}
-	}
-}
-
-IfcGeomObjects::IfcGeomShapeModelObject::IfcGeomShapeModelObject(
-	int id, 
-	int parent_id, 
-	const std::string& name, 
-	const std::string& type, 
-	const std::string& guid,
-	const gp_Trsf& trsf, 
-	IfcRepresentationShapeModel* shapes) 
-		: IfcObject(id,parent_id,name,type,guid,trsf)
-		, _mesh(shapes)
-{}
-
-IfcGeomObjects::IfcGeomBrepDataObject::IfcGeomBrepDataObject(
-	const IfcGeomShapeModelObject& shape_model)
-		: IfcObject(shape_model)
-		, _mesh(new IfcRepresentationBrepData(shape_model.mesh()))
-{}
-
-IfcGeomObjects::IfcGeomObject::IfcGeomObject(
-	const IfcGeomShapeModelObject& shape_model)
-		: IfcObject(shape_model)
-		, _mesh(new IfcRepresentationTriangulation(shape_model.mesh()))
-{}
-
-// A container and iterator for IfcShapeRepresentations
-static IfcSchema::IfcShapeRepresentation::list shapereps;
-static IfcSchema::IfcShapeRepresentation::it shaperep_iterator;
-
-// The object is fetched beforehand to be positive an entity actually exists
-static IfcGeomObjects::IfcGeomObject* current_geom_obj = 0;
-static IfcGeomObjects::IfcGeomShapeModelObject* current_shape_model_obj = 0;
-static IfcGeomObjects::IfcGeomBrepDataObject* current_brep_data_obj = 0;
-
-// A container and iterator for IfcBuildingElements for the current IfcShapeRepresentation referenced by *shaperep_iterator
-static IfcSchema::IfcProduct::list entities;
-static IfcSchema::IfcProduct::it ifcproduct_iterator;
-
-static int done;
-static int total;
-
-// Move the the next IfcShapeRepresentation
-void _nextShape() {
-	entities.reset();
-	++ shaperep_iterator;
-	++ done;
-}
-
-int _getParentId(const IfcSchema::IfcProduct::ptr ifc_product) {
-	int parent_id = -1;
-	// In case of an opening element, parent to the RelatingBuildingElement
-	if ( ifc_product->is(IfcSchema::Type::IfcOpeningElement ) ) {
-		IfcSchema::IfcOpeningElement::ptr opening = reinterpret_pointer_cast<IfcSchema::IfcProduct,IfcSchema::IfcOpeningElement>(ifc_product);
-		IfcSchema::IfcRelVoidsElement::list voids = opening->VoidsElements();
-		if ( voids->Size() ) {
-			IfcSchema::IfcRelVoidsElement::ptr ifc_void = *voids->begin();
-			parent_id = ifc_void->RelatingBuildingElement()->entity->id();
-		}
-	} else if ( ifc_product->is(IfcSchema::Type::IfcElement ) ) {
-		IfcSchema::IfcElement::ptr element = reinterpret_pointer_cast<IfcSchema::IfcProduct,IfcSchema::IfcElement>(ifc_product);
-		IfcSchema::IfcRelFillsElement::list fills = element->FillsVoids();
-		// Incase of a RelatedBuildingElement parent to the opening element
-		if ( fills->Size() ) {
-			for ( IfcSchema::IfcRelFillsElement::it it = fills->begin(); it != fills->end(); ++ it ) {
-				IfcSchema::IfcRelFillsElement::ptr fill = *it;
-				IfcSchema::IfcObjectDefinition* ifc_objectdef = fill->RelatingOpeningElement();
-				if ( ifc_product == ifc_objectdef ) continue;
-				parent_id = ifc_objectdef->entity->id();
-			}
-		} 
-		// Else simply parent to the containing structure
-		if ( parent_id == -1 ) {
-			IfcSchema::IfcRelContainedInSpatialStructure::list parents = element->ContainedInStructure();
-			if ( parents->Size() ) {
-				IfcSchema::IfcRelContainedInSpatialStructure::ptr parent = *parents->begin();
-				parent_id = parent->RelatingStructure()->entity->id();
-			}
-		}
-	}
-	// Parent decompositions to the RelatingObject
-	if ( parent_id == -1 ) {
-		IfcEntities parents = ifc_product->entity->getInverse(IfcSchema::Type::IfcRelAggregates);
-		parents->push(ifc_product->entity->getInverse(IfcSchema::Type::IfcRelNests));
-		for ( IfcEntityList::it it = parents->begin(); it != parents->end(); ++ it ) {
-			IfcSchema::IfcRelDecomposes::ptr decompose = reinterpret_pointer_cast<IfcUtil::IfcBaseClass,IfcSchema::IfcRelDecomposes>(*it);
-			IfcSchema::IfcObjectDefinition* ifc_objectdef;
-#ifdef USE_IFC4
-			if (decompose->is(IfcSchema::Type::IfcRelAggregates)) {
-				ifc_objectdef = ((IfcSchema::IfcRelAggregates*)decompose)->RelatingObject();
-			} else {
-				continue;
-			}
-#else
-			ifc_objectdef = decompose->RelatingObject();
-#endif
-			if ( ifc_product == ifc_objectdef ) continue;
-			parent_id = ifc_objectdef->entity->id();
-		}
-	}
-	return parent_id;
-}
-
-IfcGeomObjects::IfcGeomShapeModelObject* create_shape_model_for_next_entity() {
-	while ( true ) {
-		IfcSchema::IfcShapeRepresentation::ptr shaperep;
-
-		// Have we reached the end of our list of representations?
-		if ( shaperep_iterator == shapereps->end() ) {
-			shapereps.reset();
-			return 0;
-		}
-		shaperep = *shaperep_iterator;
-
-		// Has the list of IfcProducts for this representation been initialized?
-		if ( ! entities ) {
-			if ( shaperep->hasRepresentationIdentifier() ) {
-				const std::string representation_identifier = shaperep->RepresentationIdentifier();
-				if ( shaperep->hasRepresentationType() && representation_identifier == "IAI" && shaperep->RepresentationType() != "BoundingBox" ) {
-					// Allow for Ifc 2x compatibility
-				} else if ( representation_identifier != "Body" &&
-					representation_identifier != "Facetation" ) {
-						_nextShape();
-						continue;
-				}
-			}
-			IfcSchema::IfcProductRepresentation::list prodreps = shaperep->OfProductRepresentation();
-			entities = IfcSchema::IfcProduct::list( new IfcTemplatedEntityList<IfcSchema::IfcProduct>() );
-			for ( IfcSchema::IfcProductRepresentation::it it = prodreps->begin(); it != prodreps->end(); ++it ) {
-				if ( (*it)->is(IfcSchema::Type::IfcProductDefinitionShape) ) {
-					IfcSchema::IfcProductDefinitionShape::ptr pds = reinterpret_pointer_cast<IfcSchema::IfcProductRepresentation,IfcSchema::IfcProductDefinitionShape>(*it);
-					entities->push(pds->ShapeOfProduct());
-				} else {
-					// http://buildingsmart-tech.org/ifc/IFC2x3/TC1/html/ifcrepresentationresource/lexical/ifcproductrepresentation.htm
-					// IFC2x Edition 3 NOTE  Users should not instantiate the entity IfcProductRepresentation from IFC2x Edition 3 onwards. 
-					// It will be changed into an ABSTRACT supertype in future releases of IFC.
-
-					// IfcProductRepresentation also lacks the INVERSE relation to IfcProduct
-					// Let's find the IfcProducts that reference the IfcProductRepresentation anyway
-					IfcEntities products = (*it)->entity->getInverse(IfcSchema::Type::IfcProduct);
-					for ( IfcEntityList::it it = products->begin(); it != products->end(); ++ it ) {
-						entities->push(reinterpret_pointer_cast<IfcUtil::IfcBaseClass,IfcSchema::IfcProduct>(*it));
-					}
-				}
-			}
-			// Does this representation have any IfcProducts?
-			if ( ! entities->Size() ) {
-				_nextShape();
-				continue;
-			}
-			ifcproduct_iterator = entities->begin();
-		}
-		// Have we reached the end of our list of IfcProducts?
-		if ( ifcproduct_iterator == entities->end() ) {
-			_nextShape();
-			continue;
-		}
-		
-		IfcGeomObjects::IfcRepresentationShapeModel* shape;
-		IfcGeom::IfcRepresentationShapeItems shapes;
-
-		if ( !IfcGeom::convert_shapes(shaperep,shapes) ) {
-			_nextShape();
-			continue;
-		}
-
-		IfcSchema::IfcProduct::ptr ifc_product = *ifcproduct_iterator;
-
-		int parent_id = -1;
-		try {
-			parent_id = _getParentId(ifc_product);
-		} catch (...) {}
-		
-		const std::string name = ifc_product->hasName() ? ifc_product->Name() : "";
-		const std::string guid = ifc_product->GlobalId();
-		
-		gp_Trsf trsf;
-		try {
-			IfcGeom::convert(ifc_product->ObjectPlacement(),trsf);
-		} catch (...) {}
-
-		// Does the IfcElement have any IfcOpenings?
-		// Note that openings for IfcOpeningElements are not processed
-		IfcSchema::IfcRelVoidsElement::list openings = IfcSchema::IfcRelVoidsElement::list();
-		if ( ifc_product->is(IfcSchema::Type::IfcElement) && !ifc_product->is(IfcSchema::Type::IfcOpeningElement) ) {
-			IfcSchema::IfcElement::ptr element = reinterpret_pointer_cast<IfcSchema::IfcProduct,IfcSchema::IfcElement>(ifc_product);
-			openings = element->HasOpenings();
-		}
-		// Is the IfcElement a decomposition of an IfcElement with any IfcOpeningElements?
-		if ( ifc_product->is(IfcSchema::Type::IfcBuildingElementPart ) ) {
-			IfcSchema::IfcBuildingElementPart::ptr part = reinterpret_pointer_cast<IfcSchema::IfcProduct,IfcSchema::IfcBuildingElementPart>(ifc_product);
-#ifdef USE_IFC4
-			IfcSchema::IfcRelAggregates::list decomposes = part->Decomposes();
-			for ( IfcSchema::IfcRelAggregates::it it = decomposes->begin(); it != decomposes->end(); ++ it ) {
-#else
-			IfcSchema::IfcRelDecomposes::list decomposes = part->Decomposes();
-			for ( IfcSchema::IfcRelDecomposes::it it = decomposes->begin(); it != decomposes->end(); ++ it ) {
-#endif
-				IfcSchema::IfcObjectDefinition::ptr obdef = (*it)->RelatingObject();
-				if ( obdef->is(IfcSchema::Type::IfcElement) ) {
-					IfcSchema::IfcElement::ptr element = reinterpret_pointer_cast<IfcSchema::IfcObjectDefinition,IfcSchema::IfcElement>(obdef);
-					openings->push(element->HasOpenings());
-				}
-			}
-		}
-
-		if ( !disable_subtractions && openings && openings->Size() ) {
-			IfcGeom::IfcRepresentationShapeItems opened_shapes;
-			try {
-				if ( use_faster_booleans ) {
-					bool succes = IfcGeom::convert_openings_fast(ifc_product,openings,shapes,trsf,opened_shapes);
-					if ( ! succes ) {
-						opened_shapes.clear();
-						IfcGeom::convert_openings(ifc_product,openings,shapes,trsf,opened_shapes);
-					}
-				} else {
-					IfcGeom::convert_openings(ifc_product,openings,shapes,trsf,opened_shapes);
-				}
-			} catch(...) { 
-				Logger::Message(Logger::LOG_ERROR,"Error processing openings for:",ifc_product->entity); 
-			}
-			if ( use_world_coords ) {
-				for ( IfcGeom::IfcRepresentationShapeItems::iterator it = opened_shapes.begin(); it != opened_shapes.end(); ++ it ) {
-					it->prepend(trsf);
-				}
-				trsf = gp_Trsf();
-			}
-			shape = new IfcGeomObjects::IfcRepresentationShapeModel(shaperep->entity->id(),opened_shapes);
-		} else if ( use_world_coords ) {
-			for ( IfcGeom::IfcRepresentationShapeItems::iterator it = shapes.begin(); it != shapes.end(); ++ it ) {
-				it->prepend(trsf);
-			}
-			trsf = gp_Trsf();
-			shape = new IfcGeomObjects::IfcRepresentationShapeModel(shaperep->entity->id(),shapes);
-		} else {
-			shape = new IfcGeomObjects::IfcRepresentationShapeModel(shaperep->entity->id(),shapes);
-		}
-
-		return new IfcGeomObjects::IfcGeomShapeModelObject(ifc_product->entity->id(), parent_id, name, 
-			IfcSchema::Type::ToString(ifc_product->type()), guid, trsf, shape);
-	}	
-}
-
-bool try_and_create_representations_for_current_entity() {
-	current_shape_model_obj = create_shape_model_for_next_entity();
-	if (current_shape_model_obj == 0) {
-		return false;
-	}
-	
-	if (use_brep_data) {
-		current_brep_data_obj = new IfcGeomObjects::IfcGeomBrepDataObject(*current_shape_model_obj);
-		if (current_brep_data_obj == 0) {
-			return false;
-		}
-	}
-
-	if (!disable_triangulation) {
-		current_geom_obj = new IfcGeomObjects::IfcGeomObject(*current_shape_model_obj);
-		if (current_geom_obj == 0) {
-			return false;
-		}
-	}
-
-	return true;
-}
-
-bool IfcGeomObjects::Next() {
-	// Free all possible representations of the current geometrical entity
-	delete current_geom_obj;
-	delete current_brep_data_obj;
-	delete current_shape_model_obj;
-	current_geom_obj = 0;
-	current_brep_data_obj = 0;
-	current_shape_model_obj = 0;
-
-	// Increment the iterator over the list of products using the current
-	// shape representation
-	if (entities) {
-		++ifcproduct_iterator;
-	}
-
-	return try_and_create_representations_for_current_entity();
-}
-
-static std::vector<IfcGeomObjects::IfcObject*> returned_objects;
-bool IfcGeomObjects::CleanUp() {
-	// TODO: Correctly implement destructor for IfcFile
-	delete ifc_file;
-	IfcGeom::Cache::Purge();
-	std::vector<IfcGeomObjects::IfcObject*>::const_iterator it;
-	for (it = returned_objects.begin(); it != returned_objects.end(); ++ it ) {
-		delete *it;
-	}
-	returned_objects.clear();
-	return true;
-}
-const IfcGeomObjects::IfcObject* IfcGeomObjects::GetObject(int id) {
-	IfcObject* ifc_object = 0;
-	try {
-		const IfcParse::IfcEntity& ifc_entity = ifc_file->EntityById(id);
-		if ( ifc_entity->is(IfcSchema::Type::IfcProduct) ) {
-			IfcSchema::IfcProduct::ptr ifc_product = reinterpret_pointer_cast<IfcUtil::IfcBaseClass,IfcSchema::IfcProduct>(ifc_entity);
-			int parent_id = -1;
-			try {
-				parent_id = _getParentId(ifc_product);
-			} catch (...) {}
-			const std::string name = ifc_product->hasName() ? ifc_product->Name() : "";
-			gp_Trsf trsf;
-			try {
-				IfcGeom::convert(ifc_product->ObjectPlacement(),trsf);
-			} catch (...) {}
-			ifc_object = new IfcObject(ifc_product->entity->id(),parent_id,name,
-				IfcSchema::Type::ToString(ifc_product->type()),ifc_product->GlobalId(),trsf);
-		}
-	} catch(...) {}
-	if ( !ifc_object ) ifc_object = new IfcObject(-1,-1,"","","",gp_Trsf());
-	returned_objects.push_back(ifc_object);
-	return ifc_object;
-}
-const IfcGeomObjects::IfcGeomObject* IfcGeomObjects::Get() {
-	if (disable_triangulation) {
-		throw std::runtime_error("No triangulation available");
-	}
-	return current_geom_obj;
-}
-const IfcGeomObjects::IfcGeomShapeModelObject* IfcGeomObjects::GetShapeModel() {
-	return current_shape_model_obj;
-}
-const IfcGeomObjects::IfcGeomBrepDataObject* IfcGeomObjects::GetBrepData() {
-	if (!use_brep_data) {
-		throw std::runtime_error("No BRep data available");
-	}
-	return current_brep_data_obj;
-}
-double UnitPrefixToValue( IfcSchema::IfcSIPrefix::IfcSIPrefix v ) {
-	if ( v == IfcSchema::IfcSIPrefix::IfcSIPrefix_EXA   ) return (double) 1e18;
-	else if ( v == IfcSchema::IfcSIPrefix::IfcSIPrefix_PETA  ) return (double) 1e15;
-	else if ( v == IfcSchema::IfcSIPrefix::IfcSIPrefix_TERA  ) return (double) 1e12;
-	else if ( v == IfcSchema::IfcSIPrefix::IfcSIPrefix_GIGA  ) return (double) 1e9;
-	else if ( v == IfcSchema::IfcSIPrefix::IfcSIPrefix_MEGA  ) return (double) 1e6;
-	else if ( v == IfcSchema::IfcSIPrefix::IfcSIPrefix_KILO  ) return (double) 1e3;
-	else if ( v == IfcSchema::IfcSIPrefix::IfcSIPrefix_HECTO ) return (double) 1e2;
-	else if ( v == IfcSchema::IfcSIPrefix::IfcSIPrefix_DECA  ) return (double) 1;
-	else if ( v == IfcSchema::IfcSIPrefix::IfcSIPrefix_DECI  ) return (double) 1e-1;
-	else if ( v == IfcSchema::IfcSIPrefix::IfcSIPrefix_CENTI ) return (double) 1e-2;
-	else if ( v == IfcSchema::IfcSIPrefix::IfcSIPrefix_MILLI ) return (double) 1e-3;
-	else if ( v == IfcSchema::IfcSIPrefix::IfcSIPrefix_MICRO ) return (double) 1e-6;
-	else if ( v == IfcSchema::IfcSIPrefix::IfcSIPrefix_NANO  ) return (double) 1e-9;
-	else if ( v == IfcSchema::IfcSIPrefix::IfcSIPrefix_PICO  ) return (double) 1e-12;
-	else if ( v == IfcSchema::IfcSIPrefix::IfcSIPrefix_FEMTO ) return (double) 1e-15;
-	else if ( v == IfcSchema::IfcSIPrefix::IfcSIPrefix_ATTO  ) return (double) 1e-18;
-	else return 1.0f;
-}
-
-void IfcGeomObjects::InitPrecision() {
-	IfcGeom::SetValue(IfcGeom::GV_PRECISION, 0.00001);
-
-	try {
-		IfcSchema::IfcGeometricRepresentationContext::list rep_contexts = ifc_file->EntitiesByType<IfcSchema::IfcGeometricRepresentationContext>();
-		// Currently, IfcGeometricRepresentationContext aren't used as much as they should be
-		// in the evaluation of shape representations, hence, we try to find the one with the
-		// lowest precision. Typically, a value of 1e-5 is encountered. This value is applied
-		// to all TopoDS_Shapes generated by one of the IfcGeom::convert() functions.
-		// TODO: Many of the empirically found tolerances should probably be substituted by
-		// one that is defined in the model file.
-		double lowest_precision_encountered = std::numeric_limits<double>::infinity();
-		bool any_precision_encountered = false;
-		for (IfcSchema::IfcGeometricRepresentationContext::it it = rep_contexts->begin(); it != rep_contexts->end(); ++it) {
-			IfcSchema::IfcGeometricRepresentationContext* rep_context = *it;
-			if (rep_context->is(IfcSchema::Type::IfcGeometricRepresentationSubContext)) continue;
-			if (rep_context->hasPrecision()) {
-				const double precision = rep_context->Precision();
-				if (precision < lowest_precision_encountered) {
-					any_precision_encountered = true;
-					lowest_precision_encountered = precision;
-				}
-			}
-		}
-		if (any_precision_encountered) {
-			IfcGeom::SetValue(IfcGeom::GV_PRECISION, lowest_precision_encountered);
-		}
-	} catch (const IfcParse::IfcException& ex) {
-		std::stringstream ss;
-		ss << "Failed to determine precision value '" << ex.what() << "'";
-		Logger::Message(Logger::LOG_ERROR, ss.str());
-	}
-}
-
-static std::string unit_name = "METER";
-static float unit_magnitude = 1.0f;
-
-void IfcGeomObjects::InitUnits() {
-	// Set default units, set length to meters, angles to undefined
-	IfcGeom::SetValue(IfcGeom::GV_LENGTH_UNIT,1.0);
-	IfcGeom::SetValue(IfcGeom::GV_PLANEANGLE_UNIT,-1.0);
-	
-	IfcSchema::IfcUnitAssignment::list unit_assignments = ifc_file->EntitiesByType<IfcSchema::IfcUnitAssignment>();
-	IfcUtil::IfcAbstractSelect::list units = IfcUtil::IfcAbstractSelect::list();
-	try {
-		if ( unit_assignments->Size() ) {
-			IfcSchema::IfcUnitAssignment::ptr unit_assignment = *unit_assignments->begin();
-			units = unit_assignment->Units();
-		}
-	} catch (const IfcParse::IfcException&) {}
-
-	if (!units) {
-		// No units eh... Since tolerances and deflection are specified internally in meters
-		// we will try to find another indication of the model size.
-		IfcSchema::IfcExtrudedAreaSolid::list extrusions = ifc_file->EntitiesByType<IfcSchema::IfcExtrudedAreaSolid>();
-		if ( ! extrusions->Size() ) return;
-		double max_height = -1.0f;
-		for ( IfcSchema::IfcExtrudedAreaSolid::it it = extrusions->begin(); it != extrusions->end(); ++ it ) {
-			try {
-				const double depth = (*it)->Depth();
-				if ( depth > max_height ) max_height = depth;
-			} catch (const IfcParse::IfcException&) {}
-		}
-		if ( max_height > 100.0f ) {
-			IfcGeom::SetValue(IfcGeom::GV_LENGTH_UNIT,0.001);
-			Logger::Message(Logger::LOG_NOTICE, "Guessed length unit to be in millimeters based on extrusion depth");
-		}
-		return;
-	}
-
-	try {
-		for ( IfcUtil::IfcAbstractSelect::it it = units->begin(); it != units->end(); ++ it ) {
-			std::string current_unit_name = "";
-			const IfcUtil::IfcAbstractSelect::ptr base = *it;
-			IfcSchema::IfcSIUnit::ptr unit = IfcSchema::IfcSIUnit::ptr();
-			double value = 1.0f;
-			if ( base->is(IfcSchema::Type::IfcConversionBasedUnit) ) {
-				const IfcSchema::IfcConversionBasedUnit::ptr u = reinterpret_pointer_cast<IfcUtil::IfcAbstractSelect,IfcSchema::IfcConversionBasedUnit>(base);
-				current_unit_name = u->Name();
-				const IfcSchema::IfcMeasureWithUnit::ptr u2 = u->ConversionFactor();
-				IfcSchema::IfcUnit u3 = u2->UnitComponent();
-				if ( u3->is(IfcSchema::Type::IfcSIUnit) ) {
-					unit = (IfcSchema::IfcSIUnit*) u3;
-				}
-				IfcSchema::IfcValue v = u2->ValueComponent();
-				IfcUtil::IfcArgumentSelect* v2 = (IfcUtil::IfcArgumentSelect*) v;
-				const double f = *v2->wrappedValue();
-				value *= f;
-			} else if ( base->is(IfcSchema::Type::IfcSIUnit) ) {
-				unit = reinterpret_pointer_cast<IfcUtil::IfcAbstractSelect,IfcSchema::IfcSIUnit>(base);
-			}
-			if ( unit ) {
-				if ( unit->hasPrefix() ) {
-					value *= UnitPrefixToValue(unit->Prefix());
-				}
-				IfcSchema::IfcUnitEnum::IfcUnitEnum type = unit->UnitType();
-				if ( type == IfcSchema::IfcUnitEnum::IfcUnit_LENGTHUNIT ) {
-					IfcGeom::SetValue(IfcGeom::GV_LENGTH_UNIT,value);
-					if (current_unit_name.empty()) {
-						if (unit->hasPrefix()) {
-							current_unit_name = IfcSchema::IfcSIPrefix::ToString(unit->Prefix());
-						}
-						current_unit_name += IfcSchema::IfcSIUnitName::ToString(unit->Name());
-					}
-					unit_magnitude = value;
-					unit_name = current_unit_name;
-				} else if ( type == IfcSchema::IfcUnitEnum::IfcUnit_PLANEANGLEUNIT ) {
-					IfcGeom::SetValue(IfcGeom::GV_PLANEANGLE_UNIT,value);
-				}
-			}
-		}
-	} catch (const IfcParse::IfcException& ex) {
-		std::stringstream ss;
-		ss << "Failed to determine unit information '" << ex.what() << "'";
-		Logger::Message(Logger::LOG_ERROR, ss.str());
-	}
-}
-
-bool IfcGeomObjects::Init(const std::string fn) {
-	return IfcGeomObjects::Init(fn, 0, 0);
-}
-bool _Init() {
-	IfcGeomObjects::InitUnits();
-	IfcGeomObjects::InitPrecision();
-
-	shapereps = ifc_file->EntitiesByType<IfcSchema::IfcShapeRepresentation>();
-	if ( ! shapereps ) return false;
-	
-	shaperep_iterator = shapereps->begin();
-	entities.reset();
-
-	if (!try_and_create_representations_for_current_entity()) {
-		return false;
-	}
-
-	done = 0;
-	total = shapereps->Size();
-	return true;
-}
-bool IfcGeomObjects::Init(const std::string fn, std::ostream* log1, std::ostream* log2) {
-	Logger::SetOutput(log1,log2);
-	ifc_file = new IfcParse::IfcFile();
-	if ( !ifc_file->Init(fn) ) return false;
-	return _Init();	
-}
-bool IfcGeomObjects::Init(std::istream& f, int len, std::ostream* log1, std::ostream* log2) {
-	Logger::SetOutput(log1,log2);
-	ifc_file = new IfcParse::IfcFile();
-	if ( !ifc_file->Init(f, len) ) return false;
-	return _Init();
-}
-bool IfcGeomObjects::Init(void* data, int len) {
-	Logger::SetOutput(0,0);
-	ifc_file = new IfcParse::IfcFile();
-	if ( !ifc_file->Init(data, len) ) return false;
-	return _Init();
-}
-void IfcGeomObjects::Settings(int setting, bool value) {
-	switch ( setting ) {
-	case USE_WORLD_COORDS:
-		use_world_coords = value;
-		break;
-	case WELD_VERTICES:
-		weld_vertices = value;
-		break;
-	case CONVERT_BACK_UNITS:
-		convert_back_units = value;
-		break;
-	case USE_BREP_DATA:
-		use_brep_data = value;
-		break;
-	case FASTER_BOOLEANS:
-		use_faster_booleans = value;
-		break;
-	case SEW_SHELLS:
-		IfcGeom::SetValue(IfcGeom::GV_MAX_FACES_TO_SEW,value ? 1000 : -1);
-		break;
-	case FORCE_CCW_FACE_ORIENTATION:
-		IfcGeom::SetValue(IfcGeom::GV_FORCE_CCW_FACE_ORIENTATION,value ? 1 : -1);
-		break;
-    case DISABLE_OPENING_SUBTRACTIONS:
-        disable_subtractions = value;
-        break;
-	case DISABLE_TRIANGULATION:
-        disable_triangulation = value;
-        break;
-	}
-}
-int IfcGeomObjects::Progress() {
-	return 100 * done / total;
-}
-
-const std::string& IfcGeomObjects::GetUnitName() {
-	return unit_name;
-}
-
-const float IfcGeomObjects::GetUnitMagnitude() {
-	return unit_magnitude;
-}
-
-const std::string IfcGeomObjects::GetLog() {
-	return Logger::GetLog();
-}
-
-IfcParse::IfcFile* IfcGeomObjects::GetFile() {
-  return ifc_file;
-}
-
-static double black[3] = {0,0,0};
-
-IfcGeomObjects::Material::Material(const IfcGeom::SurfaceStyle* style) : style(style) {}
-bool IfcGeomObjects::Material::hasDiffuse() const { return style->Diffuse(); }
-bool IfcGeomObjects::Material::hasSpecular() const { return style->Specular(); }
-bool IfcGeomObjects::Material::hasTransparency() const { return style->Transparency(); }
-bool IfcGeomObjects::Material::hasSpecularity() const { return style->Specularity(); }
-const double* IfcGeomObjects::Material::diffuse() const { if (hasDiffuse()) return &((*style->Diffuse()).R()); else return black; }
-const double* IfcGeomObjects::Material::specular() const { if (hasSpecular()) return &((*style->Specular()).R()); else return black; }
-double IfcGeomObjects::Material::transparency() const { if (hasTransparency()) return *style->Transparency(); else return 0; }
-double IfcGeomObjects::Material::specularity() const { if (hasSpecularity()) return *style->Specularity(); else return 0; }
-const std::string IfcGeomObjects::Material::name() const { return style->Name(); }
-bool IfcGeomObjects::Material::operator==(const IfcGeomObjects::Material& other) const { return style == other.style; }
-
-int IfcGeomObjects::IfcRepresentationBrepData::id() const { return _id; }
-const std::string& IfcGeomObjects::IfcRepresentationBrepData::brep_data() const { return _brep_data; }
-
-int IfcGeomObjects::IfcRepresentationTriangulation::id() const { return _id; }
-const std::vector<float>& IfcGeomObjects::IfcRepresentationTriangulation::verts() const { return _verts; }
-const std::vector<int>& IfcGeomObjects::IfcRepresentationTriangulation::faces() const { return _faces; }
-const std::vector<int>& IfcGeomObjects::IfcRepresentationTriangulation::edges() const { return _edges; }
-const std::vector<float>& IfcGeomObjects::IfcRepresentationTriangulation::normals() const { return _normals; }
-const std::vector<int>& IfcGeomObjects::IfcRepresentationTriangulation::material_ids() const { return _material_ids; }
-const std::vector<IfcGeomObjects::Material>& IfcGeomObjects::IfcRepresentationTriangulation::materials() const { return _materials; }
-
-int IfcGeomObjects::IfcObject::id() const { return _id; }
-int IfcGeomObjects::IfcObject::parent_id() const { return _parent_id; }
-const std::string& IfcGeomObjects::IfcObject::name() const { return _name; }
-const std::string& IfcGeomObjects::IfcObject::type() const { return _type; }
-const std::string& IfcGeomObjects::IfcObject::guid() const { return _guid; }
-const std::vector<float>& IfcGeomObjects::IfcObject::matrix() const { return _matrix; }
-
-const IfcGeomObjects::IfcRepresentationShapeModel& IfcGeomObjects::IfcGeomShapeModelObject::mesh() const { return *_mesh; }
-const IfcGeomObjects::IfcRepresentationTriangulation& IfcGeomObjects::IfcGeomObject::mesh() const { return *_mesh; }
-const IfcGeomObjects::IfcRepresentationBrepData& IfcGeomObjects::IfcGeomBrepDataObject::mesh() const { return *_mesh; }
-
diff --git a/src/ifcgeom/IfcGeomObjects.h b/src/ifcgeom/IfcGeomObjects.h
deleted file mode 100644
index cae6f29..0000000
--- a/src/ifcgeom/IfcGeomObjects.h
+++ /dev/null
@@ -1,286 +0,0 @@
-/********************************************************************************
- *                                                                              *
- * This file is part of IfcOpenShell.                                           *
- *                                                                              *
- * IfcOpenShell is free software: you can redistribute it and/or modify         *
- * it under the terms of the Lesser GNU General Public License as published by  *
- * the Free Software Foundation, either version 3.0 of the License, or          *
- * (at your option) any later version.                                          *
- *                                                                              *
- * IfcOpenShell 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                 *
- * Lesser GNU General Public License for more details.                          *
- *                                                                              *
- * You should have received a copy of the Lesser GNU General Public License     *
- * along with this program. If not, see <http://www.gnu.org/licenses/>.         *
- *                                                                              *
- ********************************************************************************/
-
-/********************************************************************************
- *                                                                              *
- * Geometrical data in an IFC file consists of shapes (IfcShapeRepresentation)  *
- * and instances (SUBTYPE OF IfcBuildingElement e.g. IfcWindow).                *
- *                                                                              *
- * IfcMesh is a class that represents a triangulated IfcShapeRepresentation.    *
- *   IfcMesh.verts is a 1 dimensional vector of float defining the cartesian    *
- *      coordinates of the vertices of the triangulated shape in the format of  *
- *      [x1,y1,z1,..,xn,yn,zn]                                                  *
- *   IfcMesh.faces is a 1 dimensional vector of int containing the indices of   *
- *     the triangles referencing positions in IfcMesh.verts                     *
- *   IfcMesh.edges is a 1 dimensional vector of int in {0,1} that dictates      *
- *	   the visibility of the edges that span the faces in IfcMesh.faces         *
- *                                                                              *
- * IfcGeomObject represents the actual IfcBuildingElements.                     *
- *   IfcGeomObject.name is the GUID of the element                              *
- *   IfcGeomObject.type is the datatype of the element e.g. IfcWindow           *
- *   IfcGeomObject.mesh is a pointer to an IfcMesh                              *
- *   IfcGeomObject.matrix is a 4x3 matrix that defines the orientation and      *
- *     translation of the mesh in relation to the world origin                  *
- *                                                                              *
- * Init(char* fn) parses the IFC file in fn, returns true on succes.            *
- *                                                                              *
- * Get() returns a pointer to the current IfcGeomObject                         *
- *                                                                              * 
- * Next() returns true if there is an entity yet available                      *
- *                                                                              *
- * Progress() returns an int in [0..100] that indicates the overall progress    *
- *                                                                              *
- ********************************************************************************/
-
-#ifndef IFCOBJECTS_H
-#define IFCOBJECTS_H
-
-#include <map>
-#include <vector>
-#include <algorithm>
-
-#include <gp_Mat.hxx>
-#include <gp_Mat2d.hxx>
-#include <gp_GTrsf.hxx>
-#include <gp_GTrsf2d.hxx>
-#include <gp_Trsf.hxx>
-#include <gp_Trsf2d.hxx>
-
-#include "../ifcparse/IfcParse.h"
-#include "../ifcgeom/IfcRepresentationShapeItem.h"
-
-namespace IfcGeomObjects {
-
-	// Enumeration of setting identifiers. These settings define the
-	// behaviour of various aspects of IfcOpenShell.
-
-	// Specifies whether vertices are welded, meaning that the coordinates
-	// vector will only contain unique xyz-triplets. This results in a 
-	// manifold mesh which is useful for modelling applications, but might 
-	// result in unwanted shading artifacts in rendering applications.
-	const int WELD_VERTICES = 1;
-	// Specifies whether to apply the local placements of building elements
-	// directly to the coordinates of the representation mesh rather than
-	// to represent the local placement in the 4x3 matrix, which will in that
-	// case be the identity matrix.
-	const int USE_WORLD_COORDS = 2;
-	// Internally IfcOpenShell measures everything in meters. This settings
-	// specifies whether to convert IfcGeomObjects back to the units in which
-	// the geometry in the IFC file is specified.
-	const int CONVERT_BACK_UNITS = 3;
-	// Specifies whether to use the Open Cascade BREP format for representation
-	// items rather than to create triangle meshes. This is useful is IfcOpenShell
-	// is used as a library in an application that is also built on Open Cascade.
-	const int USE_BREP_DATA = 4;
-	// Specifies whether to sew IfcConnectedFaceSets (open and closed shells) to
-	// TopoDS_Shells or whether to keep them as a loose collection of faces.
-	const int SEW_SHELLS = 5;
-	// Specifies whether to compose IfcOpeningElements into a single compound
-	// in order to speed up the processing of opening subtractions.
-	const int FASTER_BOOLEANS = 6;
-	// By default singular faces have no explicitly defined orientation, to
-	// force faces to be defined CounterClockWise set this to true.
-	const int FORCE_CCW_FACE_ORIENTATION = 7;
-    // Disables the subtraction of IfcOpeningElement representations from
-    // the related building element representations.
-    const int DISABLE_OPENING_SUBTRACTIONS = 8;
-	// Disables the triangulation of the topological representations. Useful if
-	// the client application understands Open Cascade's native format.
-    const int DISABLE_TRIANGULATION = 9;
-
-	// End of settings enumeration.
-
-	// A nested pair of floats and a material index to be able to store an XYZ coordinate in a map.
-	// TODO: Make this a std::tuple when compilers add support for that.
-	typedef std::pair<int, std::pair<float,std::pair<float,float> > > VertKey;
-	typedef std::map<VertKey,int> VertKeyMap;
-	typedef std::pair<int,int> Edge;
-
-	class Material {
-	private:
-		const IfcGeom::SurfaceStyle* style;
-	public:
-		explicit Material(const IfcGeom::SurfaceStyle* style);
-		// Material(const Material& other);
-		// Material& operator=(const Material& other);
-		bool hasDiffuse() const;
-		bool hasSpecular() const;
-		bool hasTransparency() const;
-		bool hasSpecularity() const;
-		const double* diffuse() const;
-		const double* specular() const;
-		double transparency() const;
-		double specularity() const;
-		const std::string name() const;
-		bool operator==(const Material& other) const;
-	};
-
-	class IfcRepresentationShapeModel {
-	private:
-		unsigned int id;
-		const IfcGeom::IfcRepresentationShapeItems shapes;
-		IfcRepresentationShapeModel(const IfcRepresentationShapeModel& other);
-		IfcRepresentationShapeModel& operator=(const IfcRepresentationShapeModel& other);
-	public:
-		IfcRepresentationShapeModel(unsigned int id, const IfcGeom::IfcRepresentationShapeItems& shapes)
-			: id(id)
-			, shapes(shapes)
-		{}
-		virtual ~IfcRepresentationShapeModel() {}
-		IfcGeom::IfcRepresentationShapeItems::const_iterator begin() const { return shapes.begin(); }
-		IfcGeom::IfcRepresentationShapeItems::const_iterator end() const { return shapes.end(); }
-		const unsigned int& getId() const { return id; }
-	};
-
-	class IfcRepresentationBrepData {
-	private:
-		int _id;
-		std::string _brep_data;
-	public:
-		int id() const;
-		const std::string& brep_data() const;
-		IfcRepresentationBrepData(const IfcRepresentationShapeModel& s);
-		virtual ~IfcRepresentationBrepData() {}
-	private:
-		IfcRepresentationBrepData();
-		IfcRepresentationBrepData(const IfcRepresentationBrepData&);
-		IfcRepresentationBrepData& operator=(const IfcRepresentationBrepData&);
-	};
-
-	class IfcRepresentationTriangulation {
-	private:
-		int _id;
-		std::vector<float> _verts;
-		std::vector<int> _faces;
-		std::vector<int> _edges;
-		std::vector<float> _normals;
-		std::vector<int> _material_ids;
-		std::vector<Material> _materials;
-		VertKeyMap welds;
-	public:
-		int id() const;
-		const std::vector<float>& verts() const;
-		const std::vector<int>& faces() const;
-		const std::vector<int>& edges() const;
-		const std::vector<float>& normals() const;
-		const std::vector<int>& material_ids() const;
-		const std::vector<Material>& materials() const;
-		IfcRepresentationTriangulation(const IfcRepresentationShapeModel& s);
-		virtual ~IfcRepresentationTriangulation() {}
-	private:
-		int addvert(int material_index, const gp_XYZ& p);
-		inline void addedge(int n1, int n2, std::map<std::pair<int,int>,int>& edgecount, std::vector<std::pair<int,int> >& edges_temp) {
-			const Edge e = Edge( (std::min)(n1,n2),(std::max)(n1,n2) );
-			if ( edgecount.find(e) == edgecount.end() ) edgecount[e] = 1;
-			else edgecount[e] ++;
-			edges_temp.push_back(e);
-		}
-		IfcRepresentationTriangulation();
-		IfcRepresentationTriangulation(const IfcRepresentationTriangulation&);
-		IfcRepresentationTriangulation& operator=(const IfcRepresentationTriangulation&);
-	};
-
-	class IfcObject {
-	private:
-		int _id;
-		int _parent_id;
-		std::string _name;
-		std::string _type;
-		std::string _guid;
-		std::vector<float> _matrix;
-	public:
-		int id() const;
-		int parent_id() const;
-		const std::string& name() const;
-		const std::string& type() const;
-		const std::string& guid() const;
-		const std::vector<float>& matrix() const;
-		IfcObject(int id, int parent_id, const std::string& name, const std::string& type, const std::string& guid, const gp_Trsf& trsf);
-		virtual ~IfcObject() {}
-	};
-
-	class IfcGeomShapeModelObject : public IfcObject {
-	private:
-		IfcRepresentationShapeModel* _mesh;
-	public:
-		const IfcRepresentationShapeModel& mesh() const;
-		IfcGeomShapeModelObject(int id, int parent_id, const std::string& name, const std::string& type, const std::string& guid, const gp_Trsf& trsf, IfcRepresentationShapeModel* mesh);
-		virtual ~IfcGeomShapeModelObject() {
-			delete _mesh;
-		}
-	private:
-		IfcGeomShapeModelObject(const IfcGeomShapeModelObject& other);
-		IfcGeomShapeModelObject& operator=(const IfcGeomShapeModelObject& other);		
-	};
-
-	class IfcGeomObject : public IfcObject {
-	private:
-		IfcRepresentationTriangulation* _mesh;
-	public:
-		const IfcRepresentationTriangulation& mesh() const;
-		IfcGeomObject(const IfcGeomShapeModelObject& shape_model);
-		virtual ~IfcGeomObject() {
-			delete _mesh;
-		}
-	private:
-		IfcGeomObject(const IfcGeomObject& other);
-		IfcGeomObject& operator=(const IfcGeomObject& other);
-	};
-
-	class IfcGeomBrepDataObject : public IfcObject {
-	private:
-		IfcRepresentationBrepData* _mesh;
-	public:
-		const IfcRepresentationBrepData& mesh() const;
-		IfcGeomBrepDataObject(const IfcGeomShapeModelObject& shape_model);
-		virtual ~IfcGeomBrepDataObject() {
-			delete _mesh;
-		}
-	private:
-		IfcGeomBrepDataObject(const IfcGeomBrepDataObject& other);
-		IfcGeomBrepDataObject& operator=(const IfcGeomBrepDataObject& other);
-	};
-
-	bool Init(const std::string fn);
-	bool Init(void* data, int len);
-	bool Init(const std::string fn, std::ostream* log1= 0, std::ostream* log2= 0);
-	bool Init(std::istream& f, int len, std::ostream* log1= 0, std::ostream* log2= 0);
-	
-	void Settings(int setting, bool value);
-	void InitUnits();
-	void InitPrecision();
-	
-	const IfcGeomObject* Get();
-	const IfcObject* GetObject(int id);
-	const IfcGeomBrepDataObject* GetBrepData();
-	const IfcGeomShapeModelObject* GetShapeModel();
-	
-	bool Next();
-	int Progress();
-
-	const std::string& GetUnitName();
-	const float GetUnitMagnitude();
-	
-	const std::string GetLog();
-	IfcParse::IfcFile* GetFile();
-
-	bool CleanUp();
-}
-
-#endif
diff --git a/src/ifcgeom/IfcGeomRenderStyles.cpp b/src/ifcgeom/IfcGeomRenderStyles.cpp
index c44453a..f873039 100644
--- a/src/ifcgeom/IfcGeomRenderStyles.cpp
+++ b/src/ifcgeom/IfcGeomRenderStyles.cpp
@@ -19,16 +19,7 @@
 
 #include <map>
 
-#include "IfcGeomRenderStyles.h"
-
-namespace IfcGeom {
-	namespace Cache {
-		std::map<int,SurfaceStyle> Style;
-		void PurgeStyleCache() {
-			Style.clear();
-		}
-	}
-}
+#include "IfcGeom.h"
 
 bool process_colour(IfcSchema::IfcColourRgb* colour, std::tr1::array<double, 3>& rgb) {
 	if (colour != 0) {
@@ -39,34 +30,34 @@ bool process_colour(IfcSchema::IfcColourRgb* colour, std::tr1::array<double, 3>&
 	return colour != 0;
 }
 
-bool process_colour(IfcUtil::IfcBaseEntity* factor, std::tr1::array<double, 3>& rgb) {
+bool process_colour(IfcSchema::IfcNormalisedRatioMeasure* factor, std::tr1::array<double, 3>& rgb) {
 	if (factor != 0) {
-		const double f = *factor->entity->getArgument(0);
+		const double f = *factor;
 		rgb[0] = rgb[1] = rgb[2] = f;
 	}
 	return factor != 0;
 }
 
-bool process_colour(IfcSchema::IfcColourOrFactor colour_or_factor, std::tr1::array<double, 3>& rgb) {
+bool process_colour(IfcSchema::IfcColourOrFactor* colour_or_factor, std::tr1::array<double, 3>& rgb) {
 	if (colour_or_factor == 0) {
 		return false;
 	} else if (colour_or_factor->is(IfcSchema::Type::IfcColourRgb)) {
 		return process_colour(static_cast<IfcSchema::IfcColourRgb*>(colour_or_factor), rgb);
 	} else if (colour_or_factor->is(IfcSchema::Type::IfcNormalisedRatioMeasure)) {
-		return process_colour(static_cast<IfcUtil::IfcBaseEntity*>(colour_or_factor), rgb);
+		return process_colour(static_cast<IfcSchema::IfcNormalisedRatioMeasure*>(colour_or_factor), rgb);
 	} else {
 		return false;
 	}
 }
 
-const IfcGeom::SurfaceStyle* IfcGeom::get_style(IfcSchema::IfcRepresentationItem* item) {
+const IfcGeom::SurfaceStyle* IfcGeom::Kernel::get_style(const IfcSchema::IfcRepresentationItem* item) {
 	std::pair<IfcSchema::IfcSurfaceStyle*, IfcSchema::IfcSurfaceStyleShading*> shading_styles = get_surface_style<IfcSchema::IfcSurfaceStyleShading>(item);
 	if (shading_styles.second == 0) {
 		return 0;
 	}
 	int surface_style_id = shading_styles.first->entity->id();
-	std::map<int,SurfaceStyle>::const_iterator it = Cache::Style.find(surface_style_id);
-	if (it != Cache::Style.end()) {
+	std::map<int,SurfaceStyle>::const_iterator it = cache.Style.find(surface_style_id);
+	if (it != cache.Style.end()) {
 		return &(it->second);
 	}
 	SurfaceStyle surface_style;
@@ -95,7 +86,15 @@ const IfcGeom::SurfaceStyle* IfcGeom::get_style(IfcSchema::IfcRepresentationItem
 			surface_style.Specular().reset(SurfaceStyle::ColorComponent(rgb[0], rgb[1], rgb[2]));
 		}
 		if (rendering_style->hasSpecularHighlight()) {
-			// Not supported
+			IfcSchema::IfcSpecularHighlightSelect* highlight = rendering_style->SpecularHighlight();
+			if (highlight->is(IfcSchema::Type::IfcSpecularRoughness)) {
+				double roughness = *((IfcSchema::IfcSpecularRoughness*)highlight);
+				if (roughness >= 1e-9) {
+					surface_style.Specularity().reset(1.0 / roughness);
+				}
+			} else if (highlight->is(IfcSchema::Type::IfcSpecularExponent)) {
+				surface_style.Specularity().reset(*((IfcSchema::IfcSpecularExponent*)highlight));
+			}
 		}
 		if (rendering_style->hasTransmissionColour()) {
 			// Not supported
@@ -105,7 +104,7 @@ const IfcGeom::SurfaceStyle* IfcGeom::get_style(IfcSchema::IfcRepresentationItem
 			surface_style.Transparency().reset(d);
 		}
 	}
-	return &(Cache::Style[surface_style_id] = surface_style);
+	return &(cache.Style[surface_style_id] = surface_style);
 }
 
 static std::map<std::string, IfcGeom::SurfaceStyle> default_materials;
@@ -153,9 +152,11 @@ void InitDefaultMaterials() {
 const IfcGeom::SurfaceStyle* IfcGeom::get_default_style(const std::string& s) {
 	if (!default_materials_initialized) InitDefaultMaterials();
 	std::map<std::string, IfcGeom::SurfaceStyle>::const_iterator it = default_materials.find(s);
-	if (it == default_materials.end()) return &default_material;
-	else {
-		const IfcGeom::SurfaceStyle& surface_style = it->second;
-		return &surface_style;
+	if (it == default_materials.end()) {
+		default_materials.insert(std::make_pair(s, IfcGeom::SurfaceStyle(s)));
+		default_materials[s].Diffuse().reset(*default_material.Diffuse());
+		it = default_materials.find(s);
 	}
+	const IfcGeom::SurfaceStyle& surface_style = it->second;
+	return &surface_style;
 }
diff --git a/src/ifcgeom/IfcGeomRenderStyles.h b/src/ifcgeom/IfcGeomRenderStyles.h
index 08e08fd..08d27bb 100644
--- a/src/ifcgeom/IfcGeomRenderStyles.h
+++ b/src/ifcgeom/IfcGeomRenderStyles.h
@@ -56,10 +56,20 @@ namespace IfcGeom {
 		boost::optional<double> transparency;
 		boost::optional<double> specularity;
 	public:
-		SurfaceStyle() {}
-		SurfaceStyle(int id) : id(id) {}
+		SurfaceStyle() {
+			this->name = "IfcSurfaceStyleShading";
+		}
+		SurfaceStyle(int id) : id(id) {
+			std::stringstream sstr; 
+			sstr << "IfcSurfaceStyleShading_" << id; 
+			this->name = sstr.str(); 
+		}
 		SurfaceStyle(const std::string& name) : name(name) {}
-		SurfaceStyle(int id, const std::string& name) : id(id), name(name) {}
+		SurfaceStyle(int id, const std::string& name) : id(id) {
+			std::stringstream sstr; 
+			sstr << id << "_" << name;
+			this->name = sstr.str(); 
+		}
 		
 		// Not used at this point. In fact, equality testing in the current
 		// architecture can just as easily be accomplished by comparing the
@@ -75,21 +85,7 @@ namespace IfcGeom {
 			}
 		}
 		
-		const std::string Name() const { 
-			if (name && id) {
-				std::stringstream sstr; 
-				sstr << (*id) << "_" << (*name);
-				return sstr.str(); 
-			} else if (name) { 
-				return *name; 
-			} else if (id) { 
-				std::stringstream sstr; 
-				sstr << "IfcSurfaceStyleShading_" << (*id); 
-				return sstr.str(); 
-			} else {
-				return "IfcSurfaceStyleShading";
-			}
-		}
+		const std::string& Name() const { return *name; }
 
 		const boost::optional<ColorComponent>& Diffuse() const { return diffuse; }
 		const boost::optional<ColorComponent>& Specular() const { return specular; }
@@ -101,52 +97,7 @@ namespace IfcGeom {
 		boost::optional<double>& Specularity() { return specularity; }
 	};
 
-	template <typename T> std::pair<IfcSchema::IfcSurfaceStyle*, T*> get_surface_style(IfcSchema::IfcRepresentationItem* representation_item) {
-		IfcSchema::IfcStyledItem::list styled_items = representation_item->StyledByItem();
-		for (IfcSchema::IfcStyledItem::it jt = styled_items->begin(); jt != styled_items->end(); ++jt) {
-#ifdef USE_IFC4
-			IfcUtil::IfcAbstractSelect::list style_assignments = (*jt)->Styles();
-			for (IfcUtil::IfcAbstractSelect::it kt = style_assignments->begin(); kt != style_assignments->end(); ++kt) {
-				if (!(*kt)->is(IfcSchema::Type::IfcPresentationStyleAssignment)) {
-					continue;
-				}
-				IfcSchema::IfcPresentationStyleAssignment::ptr style_assignment = (IfcSchema::IfcPresentationStyleAssignment::ptr) *kt;
-#else
-			IfcSchema::IfcPresentationStyleAssignment::list style_assignments = (*jt)->Styles();
-			for (IfcSchema::IfcPresentationStyleAssignment::it kt = style_assignments->begin(); kt != style_assignments->end(); ++kt) {
-				IfcSchema::IfcPresentationStyleAssignment::ptr style_assignment = *kt;
-#endif
-				IfcUtil::IfcAbstractSelect::list styles = style_assignment->Styles();
-				for (IfcUtil::IfcAbstractSelect::it lt = styles->begin(); lt != styles->end(); ++lt) {
-					IfcUtil::IfcAbstractSelect::ptr style = *lt;
-					if (style->is(IfcSchema::Type::IfcSurfaceStyle)) {
-						IfcSchema::IfcSurfaceStyle* surface_style = (IfcSchema::IfcSurfaceStyle*) style;
-						if (surface_style->Side() != IfcSchema::IfcSurfaceSide::IfcSurfaceSide_NEGATIVE) {
-							IfcUtil::IfcAbstractSelect::list styles_elements = surface_style->Styles();
-							for (IfcUtil::IfcAbstractSelect::it mt = styles_elements->begin(); mt != styles_elements->end(); ++mt) {
-								if ((*mt)->is(T::Class())) {
-									return std::make_pair(surface_style, (T*) *mt);
-								}
-							}
-						}
-					}
-				}
-			}
-
-			// StyledByItem is a SET [0:1] OF IfcStyledItem, so we
-			// break after encountering the first IfcStyledItem
-			break;
-		}
-
-		return std::make_pair<IfcSchema::IfcSurfaceStyle*, T*>(0,0);
-	}
-
-	const SurfaceStyle* get_style(IfcSchema::IfcRepresentationItem* representation_item);
 	const SurfaceStyle* get_default_style(const std::string& ifc_type);
-	
-	namespace Cache {
-		void PurgeStyleCache();
-	}
 }
 
 #endif
\ No newline at end of file
diff --git a/src/ifcgeom/IfcGeomRepresentation.cpp b/src/ifcgeom/IfcGeomRepresentation.cpp
new file mode 100644
index 0000000..1580126
--- /dev/null
+++ b/src/ifcgeom/IfcGeomRepresentation.cpp
@@ -0,0 +1,59 @@
+/********************************************************************************
+ *                                                                              *
+ * This file is part of IfcOpenShell.                                           *
+ *                                                                              *
+ * IfcOpenShell is free software: you can redistribute it and/or modify         *
+ * it under the terms of the Lesser GNU General Public License as published by  *
+ * the Free Software Foundation, either version 3.0 of the License, or          *
+ * (at your option) any later version.                                          *
+ *                                                                              *
+ * IfcOpenShell 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                 *
+ * Lesser GNU General Public License for more details.                          *
+ *                                                                              *
+ * You should have received a copy of the Lesser GNU General Public License     *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.         *
+ *                                                                              *
+ ********************************************************************************/
+
+#include <BRep_Tool.hxx>
+#include <BRepTools.hxx>
+#include <BRep_Builder.hxx>
+
+#include <TopoDS_Compound.hxx>
+#include <BRepBuilderAPI_GTransform.hxx>
+
+#include "../ifcgeom/IfcGeom.h"
+
+#include "IfcGeomRepresentation.h"
+
+IfcGeom::Representation::Serialization::Serialization(const BRep& brep)
+	: Representation(brep.settings())
+	, _id(brep.getId())
+{
+	TopoDS_Compound compound;
+	BRep_Builder builder;
+	builder.MakeCompound(compound);
+	for (IfcGeom::IfcRepresentationShapeItems::const_iterator it = brep.begin(); it != brep.end(); ++ it) {
+		const TopoDS_Shape& s = it->Shape();
+		gp_GTrsf trsf = it->Placement();
+		if (settings().convert_back_units()) {
+			gp_Trsf scale;
+			scale.SetScaleFactor(1.0 / settings().unit_magnitude());
+			trsf.PreMultiply(scale);
+		}
+		bool trsf_valid = false;
+		gp_Trsf _trsf;
+		try {
+			_trsf = trsf.Trsf();
+			trsf_valid = true;
+		} catch (...) {}
+		const TopoDS_Shape moved_shape = trsf_valid ? s.Moved(_trsf) :
+			BRepBuilderAPI_GTransform(s,trsf,true).Shape();
+		builder.Add(compound,moved_shape);
+	}
+	std::stringstream sstream;
+	BRepTools::Write(compound,sstream);
+	_brep_data = sstream.str();
+}
\ No newline at end of file
diff --git a/src/ifcgeom/IfcGeomRepresentation.h b/src/ifcgeom/IfcGeomRepresentation.h
new file mode 100644
index 0000000..b151b29
--- /dev/null
+++ b/src/ifcgeom/IfcGeomRepresentation.h
@@ -0,0 +1,272 @@
+/********************************************************************************
+ *                                                                              *
+ * This file is part of IfcOpenShell.                                           *
+ *                                                                              *
+ * IfcOpenShell is free software: you can redistribute it and/or modify         *
+ * it under the terms of the Lesser GNU General Public License as published by  *
+ * the Free Software Foundation, either version 3.0 of the License, or          *
+ * (at your option) any later version.                                          *
+ *                                                                              *
+ * IfcOpenShell 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                 *
+ * Lesser GNU General Public License for more details.                          *
+ *                                                                              *
+ * You should have received a copy of the Lesser GNU General Public License     *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.         *
+ *                                                                              *
+ ********************************************************************************/
+
+#ifndef IFCGEOMREPRESENTATION_H
+#define IFCGEOMREPRESENTATION_H
+
+#include <BRepMesh_IncrementalMesh.hxx>
+#include <BRepGProp_Face.hxx>
+
+#include <Poly_Triangulation.hxx>
+#include <TColgp_Array1OfPnt.hxx>
+#include <TColgp_Array1OfPnt2d.hxx>
+
+#include <TopExp_Explorer.hxx>
+
+#include "../ifcgeom/IfcGeomIteratorSettings.h"
+#include "../ifcgeom/IfcGeomMaterial.h"
+#include "../ifcgeom/IfcRepresentationShapeItem.h"
+
+namespace IfcGeom {
+
+	namespace Representation {
+
+		class Representation {
+		protected:
+			const ElementSettings _settings;
+		public:
+			explicit Representation(const ElementSettings& settings)
+				: _settings(settings) 
+			{}
+			const ElementSettings& settings() const { return _settings; }
+			virtual ~Representation() {}
+		};
+
+		class BRep : public Representation {
+		private:
+			unsigned int id;
+			const IfcGeom::IfcRepresentationShapeItems shapes;
+			BRep(const BRep& other);
+			BRep& operator=(const BRep& other);
+		public:
+			BRep(const ElementSettings& settings, unsigned int id, const IfcGeom::IfcRepresentationShapeItems& shapes)
+				: Representation(settings)
+				, id(id)
+				, shapes(shapes)
+			{}
+			virtual ~BRep() {}
+			IfcGeom::IfcRepresentationShapeItems::const_iterator begin() const { return shapes.begin(); }
+			IfcGeom::IfcRepresentationShapeItems::const_iterator end() const { return shapes.end(); }
+			const unsigned int& getId() const { return id; }
+		};
+
+		class Serialization : public Representation  {
+		private:
+			int _id;
+			std::string _brep_data;
+		public:
+			int id() const { return _id; }
+			const std::string& brep_data() const { return _brep_data; }
+			Serialization(const BRep& brep);
+			virtual ~Serialization() {}
+		private:
+			Serialization();
+			Serialization(const Serialization&);
+			Serialization& operator=(const Serialization&);
+		};
+
+		template <typename P>
+		class Triangulation : public Representation {
+		private:
+			// A nested pair of floats and a material index to be able to store an XYZ coordinate in a map.
+			// TODO: Make this a std::tuple when compilers add support for that.
+			typedef typename std::pair<P, std::pair<P, P> > Coordinate;
+			typedef typename std::pair<int, Coordinate> VertexKey;
+			typedef std::map<VertexKey, int> VertexKeyMap;
+			typedef std::pair<int, int> Edge;
+
+			int _id;
+			std::vector<P> _verts;
+			std::vector<int> _faces;
+			std::vector<int> _edges;
+			std::vector<P> _normals;
+			std::vector<int> _material_ids;
+			std::vector<Material> _materials;
+			VertexKeyMap welds;
+
+		public:
+			int id() const { return _id; }
+			const std::vector<P>& verts() const { return _verts; }
+			const std::vector<int>& faces() const { return _faces; }
+			const std::vector<int>& edges() const { return _edges; }
+			const std::vector<P>& normals() const { return _normals; }
+			const std::vector<int>& material_ids() const { return _material_ids; }
+			const std::vector<Material>& materials() const { return _materials; }
+			Triangulation(const BRep& shape_model)
+					: Representation(shape_model.settings())
+					, _id(shape_model.getId())
+			{
+				for ( IfcGeom::IfcRepresentationShapeItems::const_iterator it = shape_model.begin(); it != shape_model.end(); ++ it ) {
+
+					int surface_style_id = -1;
+					if (it->hasStyle()) {
+						Material adapter(&it->Style());
+						std::vector<Material>::const_iterator jt = std::find(_materials.begin(), _materials.end(), adapter);
+						if (jt == _materials.end()) {
+							surface_style_id = _materials.size();
+							_materials.push_back(adapter);
+						} else {
+							surface_style_id = jt - _materials.begin();
+						}
+					}
+
+					if (settings().apply_default_materials() && surface_style_id == -1) {
+						Material material(IfcGeom::get_default_style(settings().element_type()));
+						std::vector<Material>::const_iterator it = std::find(_materials.begin(), _materials.end(), material);
+						if (it == _materials.end()) {
+							surface_style_id = _materials.size();
+							_materials.push_back(material);
+						} else {
+							surface_style_id = it - _materials.begin();
+						}
+					}
+
+					const TopoDS_Shape& s = it->Shape();
+					const gp_GTrsf& trsf = it->Placement();
+
+					// Triangulate the shape
+					try {
+						BRepMesh_IncrementalMesh(s, settings().deflection_tolerance());
+					} catch(...) {
+
+						// TODO: Catch outside
+						// Logger::Message(Logger::LOG_ERROR,"Failed to triangulate shape:",ifc_file->entityById(_id)->entity);
+						Logger::Message(Logger::LOG_ERROR,"Failed to triangulate shape");
+						continue;
+					}
+					TopExp_Explorer exp;
+
+					// Iterates over the faces of the shape
+					for ( exp.Init(s,TopAbs_FACE); exp.More(); exp.Next() ) {
+						TopoDS_Face face = TopoDS::Face(exp.Current());
+						TopLoc_Location loc;
+						Handle_Poly_Triangulation tri = BRep_Tool::Triangulation(face,loc);
+
+						if ( ! tri.IsNull() ) {
+
+							// A 3x3 matrix to rotate the vertex normals
+							const gp_Mat rotation_matrix = trsf.VectorialPart();
+			
+							// Keep track of the number of times an edge is used
+							// Manifold edges (i.e. edges used twice) are deemed invisible
+							std::map<std::pair<int,int>,int> edgecount;
+							std::vector<std::pair<int,int> > edges_temp;
+
+							const TColgp_Array1OfPnt& nodes = tri->Nodes();
+							const TColgp_Array1OfPnt2d& uvs = tri->UVNodes();
+							std::vector<gp_XYZ> coords;
+							BRepGProp_Face prop(face);
+							std::map<int,int> dict;
+
+							// Vertex normals are only calculated if vertices are not welded
+							const bool calculate_normals = !settings().weld_vertices();
+
+							for( int i = 1; i <= nodes.Length(); ++ i ) {
+								coords.push_back(nodes(i).Transformed(loc).XYZ());
+								trsf.Transforms(*coords.rbegin());
+								dict[i] = addVertex(surface_style_id, *coords.rbegin());
+					
+								if ( calculate_normals ) {
+									const gp_Pnt2d& uv = uvs(i);
+									gp_Pnt p;
+									gp_Vec normal_direction;
+									prop.Normal(uv.X(),uv.Y(),p,normal_direction);
+									gp_Vec normal(0., 0., 0.);
+									if (normal_direction.Magnitude() > ALMOST_ZERO) {
+										normal = gp_Dir(normal_direction.XYZ() * rotation_matrix);
+									}
+									_normals.push_back((float)normal.X());
+									_normals.push_back((float)normal.Y());
+									_normals.push_back((float)normal.Z());
+								}
+							}
+
+							const Poly_Array1OfTriangle& triangles = tri->Triangles();			
+							for( int i = 1; i <= triangles.Length(); ++ i ) {
+								int n1,n2,n3;
+								if ( face.Orientation() == TopAbs_REVERSED )
+									triangles(i).Get(n3,n2,n1);
+								else triangles(i).Get(n1,n2,n3);
+
+								/* An alternative would be to calculate normals based
+									* on the coordinates of the mesh vertices */
+								/*
+								const gp_XYZ pt1 = coords[n1-1];
+								const gp_XYZ pt2 = coords[n2-1];
+								const gp_XYZ pt3 = coords[n3-1];
+								const gp_XYZ v1 = pt2-pt1;
+								const gp_XYZ v2 = pt3-pt2;
+								gp_Dir normal = gp_Dir(v1^v2);
+								_normals.push_back((float)normal.X());
+								_normals.push_back((float)normal.Y());
+								_normals.push_back((float)normal.Z());
+								*/
+
+								_faces.push_back(dict[n1]);
+								_faces.push_back(dict[n2]);
+								_faces.push_back(dict[n3]);
+
+								_material_ids.push_back(surface_style_id);
+
+								addEdge(n1,n2,edgecount,edges_temp);
+								addEdge(n2,n3,edgecount,edges_temp);
+								addEdge(n3,n1,edgecount,edges_temp);
+							}
+							for ( std::vector<std::pair<int,int> >::const_iterator it = edges_temp.begin(); it != edges_temp.end(); ++it ) {
+								_edges.push_back(edgecount[*it]==1);
+							}
+						}
+					}
+				}
+			}
+			virtual ~Triangulation() {}
+		private:
+			// Welds vertices that belong to different faces
+			int addVertex(int material_index, const gp_XYZ& p) {
+				const P X = static_cast<P>(settings().convert_back_units() ? (p.X() / settings().unit_magnitude()) : p.X());
+				const P Y = static_cast<P>(settings().convert_back_units() ? (p.Y() / settings().unit_magnitude()) : p.Y());
+				const P Z = static_cast<P>(settings().convert_back_units() ? (p.Z() / settings().unit_magnitude()) : p.Z());
+				int i = (int) _verts.size() / 3;
+				if (settings().weld_vertices()) {
+					const VertexKey key = std::make_pair(material_index, std::make_pair(X, std::make_pair(Y, Z)));
+					typename VertexKeyMap::const_iterator it = welds.find(key);
+					if ( it != welds.end() ) return it->second;
+					i = (int) welds.size();
+					welds[key] = i;
+				}
+				_verts.push_back(X);
+				_verts.push_back(Y);
+				_verts.push_back(Z);
+				return i;
+			}
+			inline void addEdge(int n1, int n2, std::map<std::pair<int,int>,int>& edgecount, std::vector<std::pair<int,int> >& edges_temp) {
+				const Edge e = Edge( (std::min)(n1,n2),(std::max)(n1,n2) );
+				if ( edgecount.find(e) == edgecount.end() ) edgecount[e] = 1;
+				else edgecount[e] ++;
+				edges_temp.push_back(e);
+			}
+			Triangulation();
+			Triangulation(const Triangulation&);
+			Triangulation& operator=(const Triangulation&);
+		};
+
+	}
+}
+
+#endif
\ No newline at end of file
diff --git a/src/ifcgeom/IfcGeomShapes.cpp b/src/ifcgeom/IfcGeomShapes.cpp
index b343b1c..f2255ff 100644
--- a/src/ifcgeom/IfcGeomShapes.cpp
+++ b/src/ifcgeom/IfcGeomShapes.cpp
@@ -91,35 +91,66 @@
 #include <TopLoc_Location.hxx>
 
 #include <BRepCheck_Analyzer.hxx>
+#include <BRepClass3d_SolidClassifier.hxx>
+
+#include <Standard_Version.hxx>
 
 #include "../ifcgeom/IfcGeom.h"
 
-bool IfcGeom::convert(const IfcSchema::IfcExtrudedAreaSolid::ptr l, TopoDS_Shape& shape) {
-	TopoDS_Face face;
-	if ( ! IfcGeom::convert_face(l->SweptArea(),face) ) return false;
-	const double height = l->Depth() * IfcGeom::GetValue(GV_LENGTH_UNIT);
+bool IfcGeom::Kernel::convert(const IfcSchema::IfcExtrudedAreaSolid* l, TopoDS_Shape& shape) {
+	TopoDS_Shape face;
+	if ( !convert_face(l->SweptArea(),face) ) return false;
+
+	const double height = l->Depth() * getValue(GV_LENGTH_UNIT);
 	gp_Trsf trsf;
-	IfcGeom::convert(l->Position(),trsf);
+	IfcGeom::Kernel::convert(l->Position(),trsf);
 
 	gp_Dir dir;
 	convert(l->ExtrudedDirection(),dir);
 
-	shape = BRepPrimAPI_MakePrism(face,height*dir);
+	shape.Nullify();
+
+	if (face.ShapeType() == TopAbs_COMPOUND) {
+		
+		// For compounds (most likely the result of a IfcCompositeProfileDef) 
+		// create a compound solid shape.
+		
+		TopExp_Explorer exp(face, TopAbs_FACE);
+		
+		TopoDS_CompSolid compound;
+		BRep_Builder builder;
+		builder.MakeCompSolid(compound);
+		
+		int num_faces_extruded = 0;
+		for (; exp.More(); exp.Next(), ++num_faces_extruded) {
+			builder.Add(compound, BRepPrimAPI_MakePrism(exp.Current(), height*dir));
+		}
+
+		if (num_faces_extruded) {
+			shape = compound;
+		}
+
+	}
+	
+	if (shape.IsNull()) {	
+		shape = BRepPrimAPI_MakePrism(face, height*dir);
+	}
+
 	shape.Move(trsf);
 	return ! shape.IsNull();
 }
 
-bool IfcGeom::convert(const IfcSchema::IfcSurfaceOfLinearExtrusion::ptr l, TopoDS_Shape& shape) {
+bool IfcGeom::Kernel::convert(const IfcSchema::IfcSurfaceOfLinearExtrusion* l, TopoDS_Shape& shape) {
 	TopoDS_Wire wire;
-	if ( !IfcGeom::convert_wire(l->SweptCurve(), wire) ) {
+	if ( !convert_wire(l->SweptCurve(), wire) ) {
 		TopoDS_Face face;
-		if ( !IfcGeom::convert_face(l->SweptCurve(),face) ) return false;
+		if ( !convert_face(l->SweptCurve(),face) ) return false;
 		TopExp_Explorer exp(face, TopAbs_WIRE);
 		wire = TopoDS::Wire(exp.Current());
 	}
-	const double height = l->Depth() * IfcGeom::GetValue(GV_LENGTH_UNIT);
+	const double height = l->Depth() * getValue(GV_LENGTH_UNIT);
 	gp_Trsf trsf;
-	IfcGeom::convert(l->Position(),trsf);
+	IfcGeom::Kernel::convert(l->Position(),trsf);
 
 	gp_Dir dir;
 	convert(l->ExtrudedDirection(),dir);
@@ -129,20 +160,20 @@ bool IfcGeom::convert(const IfcSchema::IfcSurfaceOfLinearExtrusion::ptr l, TopoD
 	return !shape.IsNull();
 }
 
-bool IfcGeom::convert(const IfcSchema::IfcSurfaceOfRevolution::ptr l, TopoDS_Shape& shape) {
+bool IfcGeom::Kernel::convert(const IfcSchema::IfcSurfaceOfRevolution* l, TopoDS_Shape& shape) {
 	TopoDS_Wire wire;
-	if ( !IfcGeom::convert_wire(l->SweptCurve(), wire) ) {
+	if ( !convert_wire(l->SweptCurve(), wire) ) {
 		TopoDS_Face face;
-		if ( !IfcGeom::convert_face(l->SweptCurve(),face) ) return false;
+		if ( !convert_face(l->SweptCurve(),face) ) return false;
 		TopExp_Explorer exp(face, TopAbs_WIRE);
 		wire = TopoDS::Wire(exp.Current());
 	}
 
 	gp_Ax1 ax1;
-	IfcGeom::convert(l->AxisPosition(), ax1);
+	IfcGeom::Kernel::convert(l->AxisPosition(), ax1);
 
 	gp_Trsf trsf;
-	IfcGeom::convert(l->Position(),trsf);
+	IfcGeom::Kernel::convert(l->Position(),trsf);
 	
 	shape = BRepPrimAPI_MakeRevol(wire, ax1);
 
@@ -150,17 +181,17 @@ bool IfcGeom::convert(const IfcSchema::IfcSurfaceOfRevolution::ptr l, TopoDS_Sha
 	return !shape.IsNull();
 }
 
-bool IfcGeom::convert(const IfcSchema::IfcRevolvedAreaSolid::ptr l, TopoDS_Shape& shape) {
-	const double ang = l->Angle() * IfcGeom::GetValue(GV_PLANEANGLE_UNIT);
+bool IfcGeom::Kernel::convert(const IfcSchema::IfcRevolvedAreaSolid* l, TopoDS_Shape& shape) {
+	const double ang = l->Angle() * getValue(GV_PLANEANGLE_UNIT);
 
 	TopoDS_Face face;
-	if ( ! IfcGeom::convert_face(l->SweptArea(),face) ) return false;
+	if ( ! convert_face(l->SweptArea(),face) ) return false;
 
 	gp_Ax1 ax1;
-	IfcGeom::convert(l->Axis(), ax1);
+	IfcGeom::Kernel::convert(l->Axis(), ax1);
 
 	gp_Trsf trsf;
-	IfcGeom::convert(l->Position(),trsf);
+	IfcGeom::Kernel::convert(l->Position(),trsf);
 
 	if (ang >= M_PI * 2. - ALMOST_ZERO) {
 		shape = BRepPrimAPI_MakeRevol(face, ax1);
@@ -172,10 +203,10 @@ bool IfcGeom::convert(const IfcSchema::IfcRevolvedAreaSolid::ptr l, TopoDS_Shape
 	return !shape.IsNull();
 }
 
-bool IfcGeom::convert(const IfcSchema::IfcFacetedBrep::ptr l, IfcRepresentationShapeItems& shape) {
+bool IfcGeom::Kernel::convert(const IfcSchema::IfcFacetedBrep* l, IfcRepresentationShapeItems& shape) {
 	TopoDS_Shape s;
 	const SurfaceStyle* collective_style = get_style(l);
-	if (IfcGeom::convert_shape(l->Outer(),s) ) {
+	if (convert_shape(l->Outer(),s) ) {
 		const SurfaceStyle* indiv_style = get_style(l->Outer());
 		shape.push_back(IfcRepresentationShapeItem(s, indiv_style ? indiv_style : collective_style));
 		return true;
@@ -183,37 +214,37 @@ bool IfcGeom::convert(const IfcSchema::IfcFacetedBrep::ptr l, IfcRepresentationS
 	return false;
 }
 
-bool IfcGeom::convert(const IfcSchema::IfcFaceBasedSurfaceModel::ptr l, IfcRepresentationShapeItems& shapes) {
-	IfcSchema::IfcConnectedFaceSet::list facesets = l->FbsmFaces();
+bool IfcGeom::Kernel::convert(const IfcSchema::IfcFaceBasedSurfaceModel* l, IfcRepresentationShapeItems& shapes) {
+	IfcSchema::IfcConnectedFaceSet::list::ptr facesets = l->FbsmFaces();
 	const SurfaceStyle* collective_style = get_style(l);
-	for( IfcSchema::IfcConnectedFaceSet::it it = facesets->begin(); it != facesets->end(); ++ it ) {
+	for( IfcSchema::IfcConnectedFaceSet::list::it it = facesets->begin(); it != facesets->end(); ++ it ) {
 		TopoDS_Shape s;
 		const SurfaceStyle* shell_style = get_style(*it);
-		if (IfcGeom::convert_shape(*it,s)) {
+		if (convert_shape(*it,s)) {
 			shapes.push_back(IfcRepresentationShapeItem(s, shell_style ? shell_style : collective_style));
 		}
 	}
 	return true;
 }
 
-bool IfcGeom::convert(const IfcSchema::IfcHalfSpaceSolid::ptr l, TopoDS_Shape& shape) {
-	IfcSchema::IfcSurface::ptr surface = l->BaseSurface();
+bool IfcGeom::Kernel::convert(const IfcSchema::IfcHalfSpaceSolid* l, TopoDS_Shape& shape) {
+	IfcSchema::IfcSurface* surface = l->BaseSurface();
 	if ( ! surface->is(IfcSchema::Type::IfcPlane) ) {
 		Logger::Message(Logger::LOG_ERROR, "Unsupported BaseSurface:", surface->entity);
 		return false;
 	}
 	gp_Pln pln;
-	IfcGeom::convert(reinterpret_pointer_cast<IfcSchema::IfcSurface,IfcSchema::IfcPlane>(surface),pln);
+	IfcGeom::Kernel::convert((IfcSchema::IfcPlane*)surface,pln);
 	const gp_Pnt pnt = pln.Location().Translated( l->AgreementFlag() ? -pln.Axis().Direction() : pln.Axis().Direction());
 	shape = BRepPrimAPI_MakeHalfSpace(BRepBuilderAPI_MakeFace(pln),pnt).Solid();
 	return true;
 }
 
-bool IfcGeom::convert(const IfcSchema::IfcPolygonalBoundedHalfSpace::ptr l, TopoDS_Shape& shape) {
+bool IfcGeom::Kernel::convert(const IfcSchema::IfcPolygonalBoundedHalfSpace* l, TopoDS_Shape& shape) {
 	TopoDS_Shape halfspace;
-	if ( ! IfcGeom::convert(reinterpret_pointer_cast<IfcSchema::IfcPolygonalBoundedHalfSpace,IfcSchema::IfcHalfSpaceSolid>(l),halfspace) ) return false;	
+	if ( ! IfcGeom::Kernel::convert((IfcSchema::IfcHalfSpaceSolid*)l,halfspace) ) return false;	
 	TopoDS_Wire wire;
-	if ( ! IfcGeom::convert_wire(l->PolygonalBoundary(),wire) || ! wire.Closed() ) return false;	
+	if ( ! convert_wire(l->PolygonalBoundary(),wire) || ! wire.Closed() ) return false;	
 	gp_Trsf trsf;
 	convert(l->Position(),trsf);
 	TopoDS_Shape prism = BRepPrimAPI_MakePrism(BRepBuilderAPI_MakeFace(wire),gp_Vec(0,0,200));
@@ -223,43 +254,64 @@ bool IfcGeom::convert(const IfcSchema::IfcPolygonalBoundedHalfSpace::ptr l, Topo
 	return true;
 }
 
-bool IfcGeom::convert(const IfcSchema::IfcShellBasedSurfaceModel::ptr l, IfcRepresentationShapeItems& shapes) {
-	IfcUtil::IfcAbstractSelect::list shells = l->SbsmBoundary();
+bool IfcGeom::Kernel::convert(const IfcSchema::IfcShellBasedSurfaceModel* l, IfcRepresentationShapeItems& shapes) {
+	IfcEntityList::ptr shells = l->SbsmBoundary();
 	const SurfaceStyle* collective_style = get_style(l);
-	for( IfcUtil::IfcAbstractSelect::it it = shells->begin(); it != shells->end(); ++ it ) {
+	for( IfcEntityList::it it = shells->begin(); it != shells->end(); ++ it ) {
 		TopoDS_Shape s;
 		const SurfaceStyle* shell_style = 0;
 		if ((*it)->is(IfcSchema::Type::IfcRepresentationItem)) {
 			shell_style = get_style((IfcSchema::IfcRepresentationItem*)*it);
 		}
-		if (IfcGeom::convert_shape(*it,s)) {
+		if (convert_shape(*it,s)) {
 			shapes.push_back(IfcRepresentationShapeItem(s, shell_style ? shell_style : collective_style));
 		}
 	}
 	return true;
 }
 
-bool IfcGeom::convert(const IfcSchema::IfcBooleanResult::ptr l, TopoDS_Shape& shape) {
+bool IfcGeom::Kernel::convert(const IfcSchema::IfcBooleanResult* l, TopoDS_Shape& shape) {
 	TopoDS_Shape s1, s2;
+	IfcRepresentationShapeItems items1, items2;
 	TopoDS_Wire boundary_wire;
-	IfcSchema::IfcBooleanOperand operand1 = l->FirstOperand();
-	IfcSchema::IfcBooleanOperand operand2 = l->SecondOperand();
+	IfcSchema::IfcBooleanOperand* operand1 = l->FirstOperand();
+	IfcSchema::IfcBooleanOperand* operand2 = l->SecondOperand();
 	bool is_halfspace = operand2->is(IfcSchema::Type::IfcHalfSpaceSolid);
 
-	if ( ! IfcGeom::convert_shape(operand1,s1) )
-		return false;
+	if ( is_shape_collection(operand1) ) {
+		if (!(convert_shapes(operand1, items1) && flatten_shape_list(items1, s1, true))) {
+			return false;
+		}
+	} else {
+		if ( ! convert_shape(operand1, s1) ) {
+			return false;
+		}
+		{ TopoDS_Solid temp_solid;
+		s1 = ensure_fit_for_subtraction(s1, temp_solid); }
+	}
 
 	const double first_operand_volume = shape_volume(s1);
 	if ( first_operand_volume <= ALMOST_ZERO )
 		Logger::Message(Logger::LOG_WARNING,"Empty solid for:",l->FirstOperand()->entity);
 
-	if ( !IfcGeom::convert_shape(l->SecondOperand(),s2) ) {
+	bool shape2_processed = false;
+	if ( is_shape_collection(operand2) ) {
+		shape2_processed = convert_shapes(operand2, items2) && flatten_shape_list(items2, s2, true);
+	} else {
+		shape2_processed = convert_shape(operand2,s2);
+		if (shape2_processed && !is_halfspace) {
+			TopoDS_Solid temp_solid;
+			s2 = ensure_fit_for_subtraction(s2, temp_solid);
+		}
+	}
+
+	if (!shape2_processed) {
 		shape = s1;
 		Logger::Message(Logger::LOG_ERROR,"Failed to convert SecondOperand of:",l->entity);
 		return true;
 	}
 
-	if ( ! is_halfspace ) {
+	if (!is_halfspace) {
 		const double second_operand_volume = shape_volume(s2);
 		if ( second_operand_volume <= ALMOST_ZERO )
 			Logger::Message(Logger::LOG_WARNING,"Empty solid for:",operand2->entity);
@@ -275,8 +327,12 @@ bool IfcGeom::convert(const IfcSchema::IfcBooleanResult::ptr l, TopoDS_Shape& sh
 			TopoDS_Shape result = brep_cut;
 
 			ShapeFix_Shape fix(result);
-			fix.Perform();
-			result = fix.Shape();
+			try {
+				fix.Perform();
+				result = fix.Shape();
+			} catch (...) {
+				Logger::Message(Logger::LOG_WARNING, "Shape healing failed on boolean result", l->entity);
+			}
 		
 			bool is_valid = BRepCheck_Analyzer(result).IsValid() != 0;
 			if ( is_valid ) {
@@ -309,10 +365,9 @@ bool IfcGeom::convert(const IfcSchema::IfcBooleanResult::ptr l, TopoDS_Shape& sh
 			bool is_valid = BRepCheck_Analyzer(result).IsValid() != 0;
 			if ( is_valid ) {
 				shape = result;
+				return true;
 			} 
-		}
-
-		return true;
+		}	
 
 	} else if (op == IfcSchema::IfcBooleanOperator::IfcBooleanOperator_INTERSECTION) {
 
@@ -327,28 +382,31 @@ bool IfcGeom::convert(const IfcSchema::IfcBooleanResult::ptr l, TopoDS_Shape& sh
 			bool is_valid = BRepCheck_Analyzer(result).IsValid() != 0;
 			if ( is_valid ) {
 				shape = result;
+				return true;
 			} 
 		}
 
-		return true;
-
-	} else {
-		return false;
 	}
+	return false;
 }
 
-bool IfcGeom::convert(const IfcSchema::IfcConnectedFaceSet::ptr l, TopoDS_Shape& shape) {
-	IfcSchema::IfcFace::list faces = l->CfsFaces();
+bool IfcGeom::Kernel::convert(const IfcSchema::IfcConnectedFaceSet* l, TopoDS_Shape& shape) {
+	IfcSchema::IfcFace::list::ptr faces = l->CfsFaces();
 	bool facesAdded = false;
-	const unsigned int num_faces = faces->Size();
-	if ( num_faces < GetValue(GV_MAX_FACES_TO_SEW) ) {
+	const unsigned int num_faces = faces->size();
+	bool valid_shell = false;
+	if ( num_faces < getValue(GV_MAX_FACES_TO_SEW) ) {
 		BRepOffsetAPI_Sewing builder;
-		builder.SetTolerance(GetValue(GV_POINT_EQUALITY_TOLERANCE));
-		builder.SetMaxTolerance(GetValue(GV_POINT_EQUALITY_TOLERANCE));
-		builder.SetMinTolerance(GetValue(GV_POINT_EQUALITY_TOLERANCE));
-		for( IfcSchema::IfcFace::it it = faces->begin(); it != faces->end(); ++ it ) {
+		builder.SetTolerance(getValue(GV_POINT_EQUALITY_TOLERANCE));
+		builder.SetMaxTolerance(getValue(GV_POINT_EQUALITY_TOLERANCE));
+		builder.SetMinTolerance(getValue(GV_POINT_EQUALITY_TOLERANCE));
+		for( IfcSchema::IfcFace::list::it it = faces->begin(); it != faces->end(); ++ it ) {
 			TopoDS_Face face;
-			if ( IfcGeom::convert_face(*it,face) && face_area(face) > GetValue(GV_MINIMAL_FACE_AREA) ) {
+			bool converted_face = false;
+			try {
+				converted_face = convert_face(*it,face);
+			} catch (...) {}
+			if ( converted_face && face_area(face) > getValue(GV_MINIMAL_FACE_AREA) ) {
 				builder.Add(face);
 				facesAdded = true;
 			} else {
@@ -356,20 +414,38 @@ bool IfcGeom::convert(const IfcSchema::IfcConnectedFaceSet::ptr l, TopoDS_Shape&
 			}
 		}
 		if ( ! facesAdded ) return false;
-		builder.Perform();
-		shape = builder.SewedShape();
 		try {
-			ShapeFix_Solid solid;
-			solid.LimitTolerance(GetValue(GV_POINT_EQUALITY_TOLERANCE));
-			shape = solid.SolidFromShell(TopoDS::Shell(shape));
+			builder.Perform();
+			shape = builder.SewedShape();
+			valid_shell = BRepCheck_Analyzer(shape).IsValid();
 		} catch(...) {}
-	} else {
+		if (valid_shell) {
+			try {
+				ShapeFix_Solid solid;
+				solid.LimitTolerance(getValue(GV_POINT_EQUALITY_TOLERANCE));
+				TopoDS_Solid solid_shape = solid.SolidFromShell(TopoDS::Shell(shape));
+				if (!solid_shape.IsNull()) {
+					try {
+						BRepClass3d_SolidClassifier classifier(solid_shape);
+						shape = solid_shape;
+					} catch (...) {}
+				}
+			} catch(...) {}
+		} else {
+			Logger::Message(Logger::LOG_WARNING,"Failed to sew faceset:",l->entity);
+		}
+	}
+	if (!valid_shell) {
 		TopoDS_Compound compound;
 		BRep_Builder builder;
 		builder.MakeCompound(compound);
-		for( IfcSchema::IfcFace::it it = faces->begin(); it != faces->end(); ++ it ) {
+		for( IfcSchema::IfcFace::list::it it = faces->begin(); it != faces->end(); ++ it ) {
 			TopoDS_Face face;
-			if ( IfcGeom::convert_face(*it,face) && face_area(face) > GetValue(GV_MINIMAL_FACE_AREA) ) {
+			bool converted_face = false;
+			try {
+				converted_face = convert_face(*it,face);
+			} catch (...) {}
+			if ( converted_face && face_area(face) > getValue(GV_MINIMAL_FACE_AREA) ) {
 				builder.Add(compound,face);
 				facesAdded = true;
 			} else {
@@ -382,162 +458,170 @@ bool IfcGeom::convert(const IfcSchema::IfcConnectedFaceSet::ptr l, TopoDS_Shape&
 	return true;
 }
 
-bool IfcGeom::convert(const IfcSchema::IfcMappedItem::ptr l, IfcRepresentationShapeItems& shapes) {
+bool IfcGeom::Kernel::convert(const IfcSchema::IfcMappedItem* l, IfcRepresentationShapeItems& shapes) {
 	gp_GTrsf gtrsf;
-	IfcSchema::IfcCartesianTransformationOperator::ptr transform = l->MappingTarget();
+	IfcSchema::IfcCartesianTransformationOperator* transform = l->MappingTarget();
 	if ( transform->is(IfcSchema::Type::IfcCartesianTransformationOperator3DnonUniform) ) {
-		IfcGeom::convert(reinterpret_pointer_cast<IfcSchema::IfcCartesianTransformationOperator,
-			IfcSchema::IfcCartesianTransformationOperator3DnonUniform>(transform),gtrsf);
+		IfcGeom::Kernel::convert((IfcSchema::IfcCartesianTransformationOperator3DnonUniform*)transform,gtrsf);
 	} else if ( transform->is(IfcSchema::Type::IfcCartesianTransformationOperator2DnonUniform) ) {
 		Logger::Message(Logger::LOG_ERROR, "Unsupported MappingTarget:", transform->entity);
 		return false;
 	} else if ( transform->is(IfcSchema::Type::IfcCartesianTransformationOperator3D) ) {
 		gp_Trsf trsf;
-		IfcGeom::convert(reinterpret_pointer_cast<IfcSchema::IfcCartesianTransformationOperator,
-			IfcSchema::IfcCartesianTransformationOperator3D>(transform),trsf);
+		IfcGeom::Kernel::convert((IfcSchema::IfcCartesianTransformationOperator3D*)transform,trsf);
 		gtrsf = trsf;
 	} else if ( transform->is(IfcSchema::Type::IfcCartesianTransformationOperator2D) ) {
 		gp_Trsf2d trsf_2d;
-		IfcGeom::convert(reinterpret_pointer_cast<IfcSchema::IfcCartesianTransformationOperator,
-			IfcSchema::IfcCartesianTransformationOperator2D>(transform),trsf_2d);
+		IfcGeom::Kernel::convert((IfcSchema::IfcCartesianTransformationOperator2D*)transform,trsf_2d);
 		gtrsf = (gp_Trsf) trsf_2d;
 	}
-	IfcSchema::IfcRepresentationMap::ptr map = l->MappingSource();
-	IfcSchema::IfcAxis2Placement placement = map->MappingOrigin();
+	IfcSchema::IfcRepresentationMap* map = l->MappingSource();
+	IfcSchema::IfcAxis2Placement* placement = map->MappingOrigin();
 	gp_Trsf trsf;
 	if (placement->is(IfcSchema::Type::IfcAxis2Placement3D)) {
-		IfcGeom::convert((IfcSchema::IfcAxis2Placement3D*)placement,trsf);
+		IfcGeom::Kernel::convert((IfcSchema::IfcAxis2Placement3D*)placement,trsf);
 	} else {
 		gp_Trsf2d trsf_2d;
-		IfcGeom::convert((IfcSchema::IfcAxis2Placement2D*)placement,trsf_2d);
+		IfcGeom::Kernel::convert((IfcSchema::IfcAxis2Placement2D*)placement,trsf_2d);
 		trsf = trsf_2d;
 	}
 	gtrsf.Multiply(trsf);
 	const unsigned int previous_size = (const unsigned int) shapes.size();
-	bool b = IfcGeom::convert_shapes(map->MappedRepresentation(),shapes);
+	bool b = convert_shapes(map->MappedRepresentation(),shapes);
 	for ( unsigned int i = previous_size; i < shapes.size(); ++ i ) {
 		shapes[i].append(gtrsf);
 	}
 	return b;
 }
 
-bool IfcGeom::convert(const IfcSchema::IfcShapeRepresentation::ptr l, IfcRepresentationShapeItems& shapes) {
-	IfcSchema::IfcRepresentationItem::list items = l->Items();
-	if ( ! items->Size() ) return false;
-	for ( IfcSchema::IfcRepresentationItem::it it = items->begin(); it != items->end(); ++ it ) {
-		IfcSchema::IfcRepresentationItem* representation_item = *it;
-		if ( IfcGeom::is_shape_collection(representation_item) ) IfcGeom::convert_shapes(*it,shapes);
-		else {
-			TopoDS_Shape s;
-			if (IfcGeom::convert_shape(representation_item,s)) {
-				shapes.push_back(IfcRepresentationShapeItem(s, get_style(representation_item)));
+bool IfcGeom::Kernel::convert(const IfcSchema::IfcShapeRepresentation* l, IfcRepresentationShapeItems& shapes) {
+	IfcSchema::IfcRepresentationItem::list::ptr items = l->Items();
+	bool part_succes = false;
+	if ( items->size() ) {
+		for ( IfcSchema::IfcRepresentationItem::list::it it = items->begin(); it != items->end(); ++ it ) {
+			IfcSchema::IfcRepresentationItem* representation_item = *it;
+			if ( is_shape_collection(representation_item) ) {
+				part_succes |= convert_shapes(*it, shapes);
+			} else {
+				TopoDS_Shape s;
+				if (convert_shape(representation_item,s)) {
+					shapes.push_back(IfcRepresentationShapeItem(s, get_style(representation_item)));
+					part_succes |= true;
+				}
 			}
 		}
 	}
-	return true;
+	return part_succes;
 }
 
-bool IfcGeom::convert(const IfcSchema::IfcGeometricSet::ptr l, IfcRepresentationShapeItems& shapes) {
-	IfcUtil::IfcAbstractSelect::list elements = l->Elements();
-	if ( !elements->Size() ) return false;
+bool IfcGeom::Kernel::convert(const IfcSchema::IfcGeometricSet* l, IfcRepresentationShapeItems& shapes) {
+	IfcEntityList::ptr elements = l->Elements();
+	if ( !elements->size() ) return false;
+	bool part_succes = false;
 	const IfcGeom::SurfaceStyle* parent_style = get_style(l);
-	for ( IfcUtil::IfcAbstractSelect::it it = elements->begin(); it != elements->end(); ++ it ) {
-		IfcSchema::IfcGeometricSetSelect element = *it;
+	for ( IfcEntityList::it it = elements->begin(); it != elements->end(); ++ it ) {
+		IfcSchema::IfcGeometricSetSelect* element = *it;
 		if (element->is(IfcSchema::Type::IfcSurface)) {
 			IfcSchema::IfcSurface* surface = (IfcSchema::IfcSurface*) element;
 			TopoDS_Shape s;
-			if (IfcGeom::convert_shape(surface, s)) {
+			if (convert_shape(surface, s)) {
+				part_succes = true;
 				const IfcGeom::SurfaceStyle* style = get_style(surface);
 				shapes.push_back(IfcRepresentationShapeItem(s, style ? style : parent_style));
 			}
 		}
 	}
-	return true;
+	return part_succes;
 }
 
-bool IfcGeom::convert(const IfcSchema::IfcBlock::ptr l, TopoDS_Shape& shape) {
-	const double dx = l->XLength() * IfcGeom::GetValue(GV_LENGTH_UNIT);
-	const double dy = l->YLength() * IfcGeom::GetValue(GV_LENGTH_UNIT);
-	const double dz = l->ZLength() * IfcGeom::GetValue(GV_LENGTH_UNIT);
+bool IfcGeom::Kernel::convert(const IfcSchema::IfcBlock* l, TopoDS_Shape& shape) {
+	const double dx = l->XLength() * getValue(GV_LENGTH_UNIT);
+	const double dy = l->YLength() * getValue(GV_LENGTH_UNIT);
+	const double dz = l->ZLength() * getValue(GV_LENGTH_UNIT);
 
 	BRepPrimAPI_MakeBox builder(dx, dy, dz);
 	gp_Trsf trsf;
-	IfcGeom::convert(l->Position(),trsf);
+	IfcGeom::Kernel::convert(l->Position(),trsf);
 	shape = builder.Solid().Moved(trsf);
 	return true;
 }
 
-bool IfcGeom::convert(const IfcSchema::IfcRectangularPyramid::ptr l, TopoDS_Shape& shape) {
-	const double dx = l->XLength() * IfcGeom::GetValue(GV_LENGTH_UNIT);
-	const double dy = l->YLength() * IfcGeom::GetValue(GV_LENGTH_UNIT);
-	const double dz = l->Height() * IfcGeom::GetValue(GV_LENGTH_UNIT);
+bool IfcGeom::Kernel::convert(const IfcSchema::IfcRectangularPyramid* l, TopoDS_Shape& shape) {
+	const double dx = l->XLength() * getValue(GV_LENGTH_UNIT);
+	const double dy = l->YLength() * getValue(GV_LENGTH_UNIT);
+	const double dz = l->Height() * getValue(GV_LENGTH_UNIT);
 	
 	BRepPrimAPI_MakeWedge builder(dx, dz, dy, dx / 2., dy / 2., dx / 2., dy / 2.);
 	
 	gp_Trsf trsf1, trsf2;
-	trsf2.SetValues(1, 0, 0, 0,
-					0, 0, 1, 0,
-					0, 1, 0, 0, Precision::Confusion(), Precision::Confusion());
+	trsf2.SetValues(
+		1, 0, 0, 0,
+		0, 0, 1, 0,
+		0, 1, 0, 0
+#if OCC_VERSION_HEX < 0x60800
+		, Precision::Angular(), Precision::Confusion()
+#endif			
+	);
 	
-	IfcGeom::convert(l->Position(), trsf1);
+	IfcGeom::Kernel::convert(l->Position(), trsf1);
 	shape = BRepBuilderAPI_Transform(builder.Solid(), trsf1 * trsf2);
 	return true;
 }
 
-bool IfcGeom::convert(const IfcSchema::IfcRightCircularCylinder::ptr l, TopoDS_Shape& shape) {
-	const double r = l->Radius() * IfcGeom::GetValue(GV_LENGTH_UNIT);
-	const double h = l->Height() * IfcGeom::GetValue(GV_LENGTH_UNIT);
+bool IfcGeom::Kernel::convert(const IfcSchema::IfcRightCircularCylinder* l, TopoDS_Shape& shape) {
+	const double r = l->Radius() * getValue(GV_LENGTH_UNIT);
+	const double h = l->Height() * getValue(GV_LENGTH_UNIT);
 
 	BRepPrimAPI_MakeCylinder builder(r, h);
 	gp_Trsf trsf;
-	IfcGeom::convert(l->Position(),trsf);
+	IfcGeom::Kernel::convert(l->Position(),trsf);
 	shape = builder.Solid().Moved(trsf);
 	return true;
 }
 
-bool IfcGeom::convert(const IfcSchema::IfcRightCircularCone::ptr l, TopoDS_Shape& shape) {
-	const double r = l->BottomRadius() * IfcGeom::GetValue(GV_LENGTH_UNIT);
-	const double h = l->Height() * IfcGeom::GetValue(GV_LENGTH_UNIT);
+bool IfcGeom::Kernel::convert(const IfcSchema::IfcRightCircularCone* l, TopoDS_Shape& shape) {
+	const double r = l->BottomRadius() * getValue(GV_LENGTH_UNIT);
+	const double h = l->Height() * getValue(GV_LENGTH_UNIT);
 
 	BRepPrimAPI_MakeCone builder(r, 0., h);
 	gp_Trsf trsf;
-	IfcGeom::convert(l->Position(),trsf);
+	IfcGeom::Kernel::convert(l->Position(),trsf);
 	shape = builder.Solid().Moved(trsf);
 	return true;
 }
 
-bool IfcGeom::convert(const IfcSchema::IfcSphere::ptr l, TopoDS_Shape& shape) {
-	const double r = l->Radius() * IfcGeom::GetValue(GV_LENGTH_UNIT);
+bool IfcGeom::Kernel::convert(const IfcSchema::IfcSphere* l, TopoDS_Shape& shape) {
+	const double r = l->Radius() * getValue(GV_LENGTH_UNIT);
 	
 	BRepPrimAPI_MakeSphere builder(r);
 	gp_Trsf trsf;
-	IfcGeom::convert(l->Position(),trsf);
+	IfcGeom::Kernel::convert(l->Position(),trsf);
 	shape = builder.Solid().Moved(trsf);
 	return true;
 }
 
-bool IfcGeom::convert(const IfcSchema::IfcCsgSolid::ptr l, TopoDS_Shape& shape) {
-	return IfcGeom::convert_shape(l->TreeRootExpression(), shape);
+bool IfcGeom::Kernel::convert(const IfcSchema::IfcCsgSolid* l, TopoDS_Shape& shape) {
+	return convert_shape(l->TreeRootExpression(), shape);
 }
 
-bool IfcGeom::convert(const IfcSchema::IfcCurveBoundedPlane::ptr l, TopoDS_Shape& face) {
+bool IfcGeom::Kernel::convert(const IfcSchema::IfcCurveBoundedPlane* l, TopoDS_Shape& face) {
 	gp_Pln pln;
-	IfcGeom::convert(l->BasisSurface(), pln);
+	IfcGeom::Kernel::convert(l->BasisSurface(), pln);
 
 	gp_Trsf trsf;
 	trsf.SetTransformation(pln.Position());
 	
 	TopoDS_Wire outer;
-	IfcGeom::convert_wire(l->OuterBoundary(), outer);
+	convert_wire(l->OuterBoundary(), outer);
 	
 	BRepBuilderAPI_MakeFace mf (outer);
 	mf.Add(outer);
 
-	IfcSchema::IfcCurve::list inner = l->InnerBoundaries();
+	IfcSchema::IfcCurve::list::ptr inner = l->InnerBoundaries();
 
-	for (IfcSchema::IfcCurve::it it = inner->begin(); it != inner->end(); ++it) {
+	for (IfcSchema::IfcCurve::list::it it = inner->begin(); it != inner->end(); ++it) {
 		TopoDS_Wire inner;
-		IfcGeom::convert_wire(*it, inner);
+		convert_wire(*it, inner);
 		
 		mf.Add(inner);
 	}
@@ -549,13 +633,13 @@ bool IfcGeom::convert(const IfcSchema::IfcCurveBoundedPlane::ptr l, TopoDS_Shape
 	return true;
 }
 
-bool IfcGeom::convert(const IfcSchema::IfcRectangularTrimmedSurface::ptr l, TopoDS_Shape& face) {
+bool IfcGeom::Kernel::convert(const IfcSchema::IfcRectangularTrimmedSurface* l, TopoDS_Shape& face) {
 	if (!l->BasisSurface()->is(IfcSchema::Type::IfcPlane)) {
 		Logger::Message(Logger::LOG_ERROR, "Unsupported BasisSurface:", l->BasisSurface()->entity);
 		return false;
 	}
 	gp_Pln pln;
-	IfcGeom::convert((IfcSchema::IfcPlane*) l->BasisSurface(), pln);
+	IfcGeom::Kernel::convert((IfcSchema::IfcPlane*) l->BasisSurface(), pln);
 
 	BRepBuilderAPI_MakeFace mf(pln, l->U1(), l->U2(), l->V1(), l->V2());
 
@@ -564,7 +648,7 @@ bool IfcGeom::convert(const IfcSchema::IfcRectangularTrimmedSurface::ptr l, Topo
 	return true;
 }
 
-bool IfcGeom::convert(const IfcSchema::IfcSurfaceCurveSweptAreaSolid::ptr l, TopoDS_Shape& shape) {
+bool IfcGeom::Kernel::convert(const IfcSchema::IfcSurfaceCurveSweptAreaSolid* l, TopoDS_Shape& shape) {
 	gp_Trsf directrix, position;
 	TopoDS_Shape face;
 	TopoDS_Wire wire, section;
@@ -574,9 +658,9 @@ bool IfcGeom::convert(const IfcSchema::IfcSurfaceCurveSweptAreaSolid::ptr l, Top
 		return false;
 	}
 	
-	if (!IfcGeom::convert(l->Position(), position)   || 
-		!IfcGeom::convert_face(l->SweptArea(), face) || 
-		!IfcGeom::convert_wire(l->Directrix(), wire)    ) {
+	if (!IfcGeom::Kernel::convert(l->Position(), position)   || 
+		!convert_face(l->SweptArea(), face) || 
+		!convert_wire(l->Directrix(), wire)    ) {
 		return false;
 	}
 
@@ -584,7 +668,7 @@ bool IfcGeom::convert(const IfcSchema::IfcSurfaceCurveSweptAreaSolid::ptr l, Top
 	gp_Pnt directrix_origin;
 	gp_Vec directrix_tangent;
 	bool directrix_on_plane = true;
-	IfcGeom::convert((IfcSchema::IfcPlane*) l->ReferenceSurface(), pln);
+	IfcGeom::Kernel::convert((IfcSchema::IfcPlane*) l->ReferenceSurface(), pln);
 
 	// As per Informal propositions 2: The Directrix shall lie on the ReferenceSurface.
 	// This is not always the case with the test files in the repository. I am not sure
@@ -637,12 +721,12 @@ bool IfcGeom::convert(const IfcSchema::IfcSurfaceCurveSweptAreaSolid::ptr l, Top
 	return true;
 }
 
-bool IfcGeom::convert(const IfcSchema::IfcSweptDiskSolid::ptr l, TopoDS_Shape& shape) {
+bool IfcGeom::Kernel::convert(const IfcSchema::IfcSweptDiskSolid* l, TopoDS_Shape& shape) {
 	TopoDS_Wire wire, section1, section2;
 
-	const bool hasInnerRadius = l->hasInnerRadius();
+	bool hasInnerRadius = l->hasInnerRadius();
 
-	if (!IfcGeom::convert_wire(l->Directrix(), wire)) {
+	if (!convert_wire(l->Directrix(), wire)) {
 		return false;
 	}
 	
@@ -658,14 +742,19 @@ bool IfcGeom::convert(const IfcSchema::IfcSweptDiskSolid::ptr l, TopoDS_Shape& s
 		directrix = gp_Ax2(directrix_origin, directrix_tangent);
 	}
 
-	const double r1 = l->Radius() * IfcGeom::GetValue(GV_LENGTH_UNIT);
+	const double r1 = l->Radius() * getValue(GV_LENGTH_UNIT);
 	Handle(Geom_Circle) circle = new Geom_Circle(directrix, r1);
 	section1 = BRepBuilderAPI_MakeWire(BRepBuilderAPI_MakeEdge(circle));
 
 	if (hasInnerRadius) {
-		const double r2 = l->InnerRadius() * IfcGeom::GetValue(GV_LENGTH_UNIT);
-		Handle(Geom_Circle) circle = new Geom_Circle(directrix, r2);
-		section2 = BRepBuilderAPI_MakeWire(BRepBuilderAPI_MakeEdge(circle));
+		const double r2 = l->InnerRadius() * getValue(GV_LENGTH_UNIT);
+		if (r2 < getValue(GV_PRECISION)) {
+			// Subtraction of pipes with small radii is unstable.
+			hasInnerRadius = false;
+		} else {
+			Handle(Geom_Circle) circle = new Geom_Circle(directrix, r2);
+			section2 = BRepBuilderAPI_MakeWire(BRepBuilderAPI_MakeEdge(circle));
+		}
 	}
 
 	// NB: Note that StartParam and EndParam param are ignored and the assumption is
@@ -714,12 +803,16 @@ bool IfcGeom::convert(const IfcSchema::IfcSweptDiskSolid::ptr l, TopoDS_Shape& s
 
 #ifdef USE_IFC4
 
-bool IfcGeom::convert(const IfcSchema::IfcCylindricalSurface::ptr l, TopoDS_Shape& face) {
+bool IfcGeom::Kernel::convert(const IfcSchema::IfcCylindricalSurface* l, TopoDS_Shape& face) {
 	gp_Trsf trsf;
-	IfcGeom::convert(l->Position(),trsf);
+	IfcGeom::Kernel::convert(l->Position(),trsf);
 	
-	face = BRepBuilderAPI_MakeFace(new Geom_CylindricalSurface(gp::XOY(), l->Radius()), GetValue(GV_PRECISION)).Face().Moved(trsf);
+	face = BRepBuilderAPI_MakeFace(new Geom_CylindricalSurface(gp::XOY(), l->Radius()), getValue(GV_PRECISION)).Face().Moved(trsf);
 	return true;
 }
 
-#endif
\ No newline at end of file
+bool IfcGeom::Kernel::convert(const IfcSchema::IfcAdvancedBrep* l, TopoDS_Shape& shape) {
+	return convert(l->Outer(), shape);
+}
+
+#endif
diff --git a/src/ifcgeom/IfcGeomWires.cpp b/src/ifcgeom/IfcGeomWires.cpp
index 1bc7f9c..4ffc1cd 100644
--- a/src/ifcgeom/IfcGeomWires.cpp
+++ b/src/ifcgeom/IfcGeomWires.cpp
@@ -47,15 +47,18 @@
 #include <TColgp_Array1OfPnt2d.hxx>
 #include <TColStd_Array1OfReal.hxx>
 #include <TColStd_Array1OfInteger.hxx>
+
 #include <Geom_Line.hxx>
 #include <Geom_Circle.hxx>
 #include <Geom_Ellipse.hxx>
 #include <Geom_TrimmedCurve.hxx>
 
-#include <BRepOffsetAPI_Sewing.hxx>
+#include <BRepBuilderAPI_MakeVertex.hxx>
 #include <BRepBuilderAPI_MakeFace.hxx>
 #include <BRepBuilderAPI_MakeEdge.hxx>
 #include <BRepBuilderAPI_MakeWire.hxx>
+#include <BRepBuilderAPI_MakeShell.hxx>
+#include <BRepBuilderAPI_MakeSolid.hxx>
 #include <BRepBuilderAPI_MakePolygon.hxx>
 #include <BRepBuilderAPI_MakeVertex.hxx>
 
@@ -63,31 +66,29 @@
 #include <TopoDS_Wire.hxx>
 #include <TopoDS_Face.hxx>
 #include <TopExp_Explorer.hxx>
+#include <TopLoc_Location.hxx>
+#include <TopTools_ListOfShape.hxx>
 
+#include <BRepAlgoAPI_Cut.hxx>
+#include <BRepOffsetAPI_Sewing.hxx>
 #include <BRepPrimAPI_MakePrism.hxx>
-#include <BRepBuilderAPI_MakeShell.hxx>
-#include <BRepBuilderAPI_MakeSolid.hxx>
 #include <BRepPrimAPI_MakeHalfSpace.hxx>
-#include <BRepAlgoAPI_Cut.hxx>
+#include <BRepFilletAPI_MakeFillet2d.hxx>
+
+#include <BRep_Tool.hxx>
 
 #include <ShapeFix_Shape.hxx>
 #include <ShapeFix_ShapeTolerance.hxx>
 #include <ShapeFix_Solid.hxx>
 
-#include <BRepFilletAPI_MakeFillet2d.hxx>
-
-#include <TopLoc_Location.hxx>
-
-#include <BRep_Tool.hxx>
-
 #include "../ifcgeom/IfcGeom.h"
 
-bool IfcGeom::convert(const IfcSchema::IfcCompositeCurve::ptr l, TopoDS_Wire& wire) {
-	if ( IfcGeom::GetValue(GV_PLANEANGLE_UNIT)<0 ) {
+bool IfcGeom::Kernel::convert(const IfcSchema::IfcCompositeCurve* l, TopoDS_Wire& wire) {
+	if ( getValue(GV_PLANEANGLE_UNIT)<0 ) {
 		Logger::Message(Logger::LOG_WARNING,"Creating a composite curve without unit information:",l->entity);
 
 		// Temporarily pretend we do have unit information
-		IfcGeom::SetValue(GV_PLANEANGLE_UNIT,1.0);
+		setValue(GV_PLANEANGLE_UNIT,1.0);
 		
 		bool succes_radians = false;
         bool succes_degrees = false;
@@ -97,17 +98,17 @@ bool IfcGeom::convert(const IfcSchema::IfcCompositeCurve::ptr l, TopoDS_Wire& wi
 		// First try radians
 		TopoDS_Wire wire_radians, wire_degrees;
         try {
-		    succes_radians = IfcGeom::convert(l,wire_radians);
+		    succes_radians = IfcGeom::Kernel::convert(l,wire_radians);
         } catch (...) {}
 
 		// Now try degrees
-		IfcGeom::SetValue(GV_PLANEANGLE_UNIT,0.0174532925199433);
+		setValue(GV_PLANEANGLE_UNIT,0.0174532925199433);
         try {
-		    succes_degrees = IfcGeom::convert(l,wire_degrees);
+		    succes_degrees = IfcGeom::Kernel::convert(l,wire_degrees);
         } catch (...) {}
 
 		// Restore to unknown unit state
-		IfcGeom::SetValue(GV_PLANEANGLE_UNIT,-1.0);
+		setValue(GV_PLANEANGLE_UNIT,-1.0);
 
 		if ( succes_degrees && ! succes_radians ) {
 			use_degrees = true;
@@ -138,19 +139,19 @@ bool IfcGeom::convert(const IfcSchema::IfcCompositeCurve::ptr l, TopoDS_Wire& wi
 
 		return use_radians || use_degrees;
 	}
-	IfcSchema::IfcCompositeCurveSegment::list segments = l->Segments();
+	IfcSchema::IfcCompositeCurveSegment::list::ptr segments = l->Segments();
 	BRepBuilderAPI_MakeWire w;
 	//TopoDS_Vertex last_vertex;
-	for( IfcSchema::IfcCompositeCurveSegment::it it = segments->begin(); it != segments->end(); ++ it ) {
-		const IfcSchema::IfcCurve::ptr curve = (*it)->ParentCurve();
+	for( IfcSchema::IfcCompositeCurveSegment::list::it it = segments->begin(); it != segments->end(); ++ it ) {
+		IfcSchema::IfcCurve* curve = (*it)->ParentCurve();
 		TopoDS_Wire wire2;
-		if ( ! IfcGeom::convert_wire(curve,wire2) ) {
+		if ( !convert_wire(curve,wire2) ) {
 			Logger::Message(Logger::LOG_ERROR,"Failed to convert curve:",curve->entity);
 			continue;
 		}
 		if ( ! (*it)->SameSense() ) wire2.Reverse();
 		ShapeFix_ShapeTolerance FTol;
-		FTol.SetTolerance(wire2, GetValue(GV_WIRE_CREATION_TOLERANCE), TopAbs_WIRE);
+		FTol.SetTolerance(wire2, getValue(GV_WIRE_CREATION_TOLERANCE), TopAbs_WIRE);
 		/*if ( it != segments->begin() ) {
 			TopExp_Explorer exp (wire2,TopAbs_VERTEX);
 			const TopoDS_Vertex& first_vertex = TopoDS::Vertex(exp.Current());
@@ -171,15 +172,16 @@ bool IfcGeom::convert(const IfcSchema::IfcCompositeCurve::ptr l, TopoDS_Wire& wi
 	wire = w.Wire();
 	return true;
 }
-bool IfcGeom::convert(const IfcSchema::IfcTrimmedCurve::ptr l, TopoDS_Wire& wire) {
-	IfcSchema::IfcCurve::ptr basis_curve = l->BasisCurve();
+
+bool IfcGeom::Kernel::convert(const IfcSchema::IfcTrimmedCurve* l, TopoDS_Wire& wire) {
+	IfcSchema::IfcCurve* basis_curve = l->BasisCurve();
 	bool isConic = basis_curve->is(IfcSchema::Type::IfcConic);
-	double parameterFactor = isConic ? IfcGeom::GetValue(GV_PLANEANGLE_UNIT) : IfcGeom::GetValue(GV_LENGTH_UNIT);
+	double parameterFactor = isConic ? getValue(GV_PLANEANGLE_UNIT) : getValue(GV_LENGTH_UNIT);
 	Handle(Geom_Curve) curve;
-	if ( ! IfcGeom::convert_curve(basis_curve,curve) ) return false;
+	if ( !convert_curve(basis_curve,curve) ) return false;
 	bool trim_cartesian = l->MasterRepresentation() == IfcSchema::IfcTrimmingPreference::IfcTrimmingPreference_CARTESIAN;
-	IfcUtil::IfcAbstractSelect::list trims1 = l->Trim1();
-	IfcUtil::IfcAbstractSelect::list trims2 = l->Trim2();
+	IfcEntityList::ptr trims1 = l->Trim1();
+	IfcEntityList::ptr trims2 = l->Trim2();
 	bool trimmed1 = false;
 	bool trimmed2 = false;
 	unsigned sense_agreement = l->SenseAgreement() ? 0 : 1;
@@ -188,24 +190,24 @@ bool IfcGeom::convert(const IfcSchema::IfcTrimmedCurve::ptr l, TopoDS_Wire& wire
 	bool has_flts[2] = {false,false};
 	bool has_pnts[2] = {false,false};
 	BRepBuilderAPI_MakeWire w;
-	for ( IfcUtil::IfcAbstractSelect::it it = trims1->begin(); it != trims1->end(); it ++ ) {
-		const IfcUtil::IfcAbstractSelect::ptr i = *it;
+	for ( IfcEntityList::it it = trims1->begin(); it != trims1->end(); it ++ ) {
+		IfcUtil::IfcBaseClass* i = *it;
 		if ( i->is(IfcSchema::Type::IfcCartesianPoint) ) {
-			IfcGeom::convert(reinterpret_pointer_cast<IfcUtil::IfcAbstractSelect,IfcSchema::IfcCartesianPoint>(i), pnts[sense_agreement] );
+			IfcGeom::Kernel::convert((IfcSchema::IfcCartesianPoint*)i, pnts[sense_agreement] );
 			has_pnts[sense_agreement] = true;
 		} else if ( i->is(IfcSchema::Type::IfcParameterValue) ) {
-			const double value = *((IfcUtil::IfcBaseEntity*)i)->entity->getArgument(0);
+			const double value = *((IfcSchema::IfcParameterValue*)i);
 			flts[sense_agreement] = value * parameterFactor;
 			has_flts[sense_agreement] = true;
 		}
 	}
-	for ( IfcUtil::IfcAbstractSelect::it it = trims2->begin(); it != trims2->end(); it ++ ) {
-		const IfcUtil::IfcAbstractSelect::ptr i = *it;
+	for ( IfcEntityList::it it = trims2->begin(); it != trims2->end(); it ++ ) {
+		IfcUtil::IfcBaseClass* i = *it;
 		if ( i->is(IfcSchema::Type::IfcCartesianPoint) ) {
-			IfcGeom::convert(reinterpret_pointer_cast<IfcUtil::IfcAbstractSelect,IfcSchema::IfcCartesianPoint>(i), pnts[1-sense_agreement] );
+			IfcGeom::Kernel::convert((IfcSchema::IfcCartesianPoint*)i, pnts[1-sense_agreement] );
 			has_pnts[1-sense_agreement] = true;
 		} else if ( i->is(IfcSchema::Type::IfcParameterValue) ) {
-			const double value = *((IfcUtil::IfcBaseEntity*)i)->entity->getArgument(0);
+			const double value = *((IfcSchema::IfcParameterValue*)i);
 			flts[1-sense_agreement] = value * parameterFactor;
 			has_flts[1-sense_agreement] = true;
 		}
@@ -213,15 +215,15 @@ bool IfcGeom::convert(const IfcSchema::IfcTrimmedCurve::ptr l, TopoDS_Wire& wire
 	trim_cartesian &= has_pnts[0] && has_pnts[1];
 	bool trim_cartesian_failed = !trim_cartesian;
 	if ( trim_cartesian ) {
-		if ( pnts[0].Distance(pnts[1]) < GetValue(GV_WIRE_CREATION_TOLERANCE) ) {
+		if ( pnts[0].Distance(pnts[1]) < getValue(GV_WIRE_CREATION_TOLERANCE) ) {
 			Logger::Message(Logger::LOG_WARNING,"Skipping segment with length below tolerance level:",l->entity);
 			return false;
 		}
 		ShapeFix_ShapeTolerance FTol;
 		TopoDS_Vertex v1 = BRepBuilderAPI_MakeVertex(pnts[0]);
 		TopoDS_Vertex v2 = BRepBuilderAPI_MakeVertex(pnts[1]);
-		FTol.SetTolerance(v1, GetValue(GV_WIRE_CREATION_TOLERANCE), TopAbs_VERTEX);
-		FTol.SetTolerance(v2, GetValue(GV_WIRE_CREATION_TOLERANCE), TopAbs_VERTEX);
+		FTol.SetTolerance(v1, getValue(GV_WIRE_CREATION_TOLERANCE), TopAbs_VERTEX);
+		FTol.SetTolerance(v2, getValue(GV_WIRE_CREATION_TOLERANCE), TopAbs_VERTEX);
 		BRepBuilderAPI_MakeEdge e (curve,v1,v2);
 		if ( ! e.IsDone() ) {
 			BRepBuilderAPI_EdgeError err = e.Error();
@@ -245,8 +247,8 @@ bool IfcGeom::convert(const IfcSchema::IfcTrimmedCurve::ptr l, TopoDS_Wire& wire
 		}
 		if ( basis_curve->is(IfcSchema::Type::IfcEllipse) ) {
 			IfcSchema::IfcEllipse* ellipse = static_cast<IfcSchema::IfcEllipse*>(basis_curve);
-			double x = ellipse->SemiAxis1() * IfcGeom::GetValue(GV_LENGTH_UNIT);
-			double y = ellipse->SemiAxis2() * IfcGeom::GetValue(GV_LENGTH_UNIT);
+			double x = ellipse->SemiAxis1() * getValue(GV_LENGTH_UNIT);
+			double y = ellipse->SemiAxis2() * getValue(GV_LENGTH_UNIT);
 			const bool rotated = y > x;
 			if (rotated) {
 				flts[0] -= M_PI / 2.;
@@ -269,44 +271,167 @@ bool IfcGeom::convert(const IfcSchema::IfcTrimmedCurve::ptr l, TopoDS_Wire& wire
 		return false;
 	}
 }
-bool IfcGeom::convert(const IfcSchema::IfcPolyline::ptr l, TopoDS_Wire& result) {
-	IfcSchema::IfcCartesianPoint::list points = l->Points();
 
-	BRepBuilderAPI_MakeWire w;
-	gp_Pnt P1;gp_Pnt P2;
-	for( IfcSchema::IfcCartesianPoint::it it = points->begin(); it != points->end(); ++ it ) {
-		IfcGeom::convert(*it,P2);
-		if ( it != points->begin() && ( !P1.IsEqual(P2,GetValue(GV_POINT_EQUALITY_TOLERANCE)) ) )
-			w.Add(BRepBuilderAPI_MakeEdge(P1,P2));
-		P1 = P2;
+bool IfcGeom::Kernel::convert(const IfcSchema::IfcPolyline* l, TopoDS_Wire& result) {
+	IfcSchema::IfcCartesianPoint::list::ptr points = l->Points();
+
+	// Parse and store the points in a sequence
+	TColgp_SequenceOfPnt polygon;
+	for(IfcSchema::IfcCartesianPoint::list::it it = points->begin(); it != points->end(); ++ it) {
+		gp_Pnt pnt;
+		IfcGeom::Kernel::convert(*it, pnt);
+		polygon.Append(pnt);
+	}
+
+	// Remove points that are too close to one another
+	remove_redundant_points_from_loop(polygon, false);
+	
+	BRepBuilderAPI_MakePolygon w;
+	for (int i = 1; i <= polygon.Length(); ++i) {
+		w.Add(polygon.Value(i));
 	}
 
 	result = w.Wire();
 	return true;
 }
-bool IfcGeom::convert(const IfcSchema::IfcPolyLoop::ptr l, TopoDS_Wire& result) {
-	IfcSchema::IfcCartesianPoint::list points = l->Polygon();
 
-	BRepBuilderAPI_MakeWire w;
-	gp_Pnt P1;gp_Pnt P2;gp_Pnt F;
-	int count = 0;
-	for( IfcSchema::IfcCartesianPoint::it it = points->begin(); it != points->end(); ++ it ) {
-		IfcGeom::convert(*it,P2);
-		if ( it != points->begin() && ( !P1.IsEqual(P2,GetValue(GV_POINT_EQUALITY_TOLERANCE)) ) ) {
-			w.Add(BRepBuilderAPI_MakeEdge(P1,P2));
-			count ++;
-		} else if ( ! count ) F = P2;		
-		P1 = P2;
+bool IfcGeom::Kernel::convert(const IfcSchema::IfcPolyLoop* l, TopoDS_Wire& result) {
+	IfcSchema::IfcCartesianPoint::list::ptr points = l->Polygon();
+
+	// Parse and store the points in a sequence
+	TColgp_SequenceOfPnt polygon;
+	for(IfcSchema::IfcCartesianPoint::list::it it = points->begin(); it != points->end(); ++ it) {
+		gp_Pnt pnt;
+		IfcGeom::Kernel::convert(*it, pnt);
+		polygon.Append(pnt);
 	}
-	if ( !P1.IsEqual(F,GetValue(GV_POINT_EQUALITY_TOLERANCE)) ) {
-		w.Add(BRepBuilderAPI_MakeEdge(P1,F));
-		count ++;
+
+	// A loop should consist of at least three vertices
+	int original_count = polygon.Length();
+	if (original_count < 3) {
+		Logger::Message(Logger::LOG_ERROR, "Not enough edges for:", l->entity);
+		return false;
 	}
-	if ( count < 3 ) return false;
 
-	result = w.Wire();
+	// Remove points that are too close to one another
+	remove_redundant_points_from_loop(polygon, true);
+
+	int count = polygon.Length();
+	if (original_count - count != 0) {
+		std::stringstream ss; ss << (original_count - count) << " edges removed for:"; 
+		Logger::Message(Logger::LOG_WARNING, ss.str(), l->entity);
+	}
+
+	if (count < 3) {
+		Logger::Message(Logger::LOG_ERROR, "Not enough edges for:", l->entity);
+		return false;
+	}
+
+	BRepBuilderAPI_MakePolygon w;
+	for (int i = 1; i <= polygon.Length(); ++i) {
+		w.Add(polygon.Value(i));
+	}
+	w.Close();
+
+	result = w.Wire();	
 	return true;
 }
-bool IfcGeom::convert(const IfcSchema::IfcArbitraryOpenProfileDef::ptr l, TopoDS_Wire& result) {
-	return IfcGeom::convert_wire(l->Curve(), result);
+
+bool IfcGeom::Kernel::convert(const IfcSchema::IfcArbitraryOpenProfileDef* l, TopoDS_Wire& result) {
+	return convert_wire(l->Curve(), result);
+}
+
+bool IfcGeom::Kernel::convert(const IfcSchema::IfcEdgeCurve* l, TopoDS_Wire& result) {
+	IfcSchema::IfcPoint* pnt1 = ((IfcSchema::IfcVertexPoint*) l->EdgeStart())->VertexGeometry();
+	IfcSchema::IfcPoint* pnt2 = ((IfcSchema::IfcVertexPoint*) l->EdgeEnd())->VertexGeometry();
+	if (!pnt1->is(IfcSchema::Type::IfcCartesianPoint) || !pnt2->is(IfcSchema::Type::IfcCartesianPoint)) {
+		Logger::Message(Logger::LOG_ERROR, "Only IfcCartesianPoints are supported for VertexGeometry", l->entity);
+		return false;
+	}
+	
+	gp_Pnt p1, p2;
+	if (!IfcGeom::Kernel::convert(((IfcSchema::IfcCartesianPoint*)pnt1), p1) ||
+		!IfcGeom::Kernel::convert(((IfcSchema::IfcCartesianPoint*)pnt2), p2))
+	{
+		return false;
+	}
+	
+	BRepBuilderAPI_MakeWire mw;
+	Handle_Geom_Curve crv;
+
+	// The lack of a clear separation between topological and geometrical entities
+	// is starting to get problematic. If the underlying curve is bounded it is
+	// assumed that a topological wire can be crafted from it. After which an
+	// attempt is made to reconstruct it from the individual curves and the vertices
+	// of the IfcEdgeCurve.
+	const bool is_bounded = l->EdgeGeometry()->is(IfcSchema::Type::IfcBoundedCurve);
+
+	if (!is_bounded && convert_curve(l->EdgeGeometry(), crv)) {
+		mw.Add(BRepBuilderAPI_MakeEdge(crv, p1, p2));
+		result = mw;
+		return true;
+	} else if (is_bounded && convert_wire(l->EdgeGeometry(), result)) {
+		if (!l->SameSense()) std::swap(pnt1, pnt2);
+		TopExp_Explorer exp(result, TopAbs_EDGE);
+		bool first = true;
+		while (exp.More()) {
+			const TopoDS_Edge& ed = TopoDS::Edge(exp.Current());
+			Standard_Real u1, u2;
+			Handle(Geom_Curve) ecrv = BRep_Tool::Curve(ed, u1, u2);
+			exp.Next();
+			const bool last = !exp.More();
+			first = false;
+			if (first && last) {
+				mw.Add(BRepBuilderAPI_MakeEdge(ecrv, p1, p2));
+			} else if (first) {
+				gp_Pnt pu;
+				ecrv->D0(u2, pu);
+				mw.Add(BRepBuilderAPI_MakeEdge(ecrv, p1, pu));
+			} else if (last) {
+				gp_Pnt pu;
+				ecrv->D0(u1, pu);
+				mw.Add(BRepBuilderAPI_MakeEdge(ecrv, pu, p2));
+			} else {
+				mw.Add(BRepBuilderAPI_MakeEdge(ecrv, u1, u2));
+			}
+		}
+		result = mw;
+		return true;
+	} else {
+		return false;
+	}
+}
+
+bool IfcGeom::Kernel::convert(const IfcSchema::IfcEdgeLoop* l, TopoDS_Wire& result) {
+	IfcSchema::IfcOrientedEdge::list::ptr li = l->EdgeList();
+	BRepBuilderAPI_MakeWire mw;
+	for (IfcSchema::IfcOrientedEdge::list::it it = li->begin(); it != li->end(); ++it) {
+		IfcSchema::IfcOrientedEdge* e = *it;
+
+		IfcSchema::IfcPoint* pnt1 = ((IfcSchema::IfcVertexPoint*) e->EdgeStart())->VertexGeometry();
+		IfcSchema::IfcPoint* pnt2 = ((IfcSchema::IfcVertexPoint*) e->EdgeEnd())->VertexGeometry();
+		if (!pnt1->is(IfcSchema::Type::IfcCartesianPoint) || !pnt2->is(IfcSchema::Type::IfcCartesianPoint)) {
+			Logger::Message(Logger::LOG_ERROR, "Only IfcCartesianPoints are supported for VertexGeometry", l->entity);
+			return false;
+		}
+	
+		gp_Pnt p1, p2;
+		if (!IfcGeom::Kernel::convert(((IfcSchema::IfcCartesianPoint*)pnt1), p1) ||
+			!IfcGeom::Kernel::convert(((IfcSchema::IfcCartesianPoint*)pnt2), p2))
+		{
+			return false;
+		}
+
+		mw.Add(BRepBuilderAPI_MakeEdge(p1, p2));
+		continue;
+		
+		IfcSchema::IfcEdge* base = e->EdgeElement();
+		TopoDS_Wire w;
+		if (convert_wire(e->EdgeElement(), w)) {
+			if (!e->Orientation()) w.Reverse();
+			mw.Add(w);
+		}
+	}
+	result = mw;
+	return true;
 }
diff --git a/src/ifcgeom/IfcRegister.cpp b/src/ifcgeom/IfcRegister.cpp
index c968113..f483c99 100644
--- a/src/ifcgeom/IfcRegister.cpp
+++ b/src/ifcgeom/IfcRegister.cpp
@@ -19,58 +19,54 @@
 
 #include "IfcGeom.h"
 
-namespace IfcGeom {
-	namespace Cache {
-		std::map<int,TopoDS_Shape> Shape;
-		void PurgeShapeCache() {
-			Shape.clear();
-		}
-	}
-}
-
 using namespace IfcSchema;
 using namespace IfcUtil;
 
-bool IfcGeom::convert_shapes(const IfcBaseClass* l, IfcRepresentationShapeItems& r) {
+bool IfcGeom::Kernel::convert_shapes(const IfcBaseClass* l, IfcRepresentationShapeItems& r) {
 #include "IfcRegisterConvertShapes.h"
 	Logger::Message(Logger::LOG_ERROR,"No operation defined for:",l->entity);
 	return false;
 }
-bool IfcGeom::is_shape_collection(const IfcBaseClass* l) {
+
+bool IfcGeom::Kernel::is_shape_collection(const IfcBaseClass* l) {
 #include "IfcRegisterIsShapeCollection.h"
 	return false;
 }
-bool IfcGeom::convert_shape(const IfcBaseClass* l, TopoDS_Shape& r) {
+
+bool IfcGeom::Kernel::convert_shape(const IfcBaseClass* l, TopoDS_Shape& r) {
 	const unsigned int id = l->entity->id();
 	bool success = false;
 	bool processed = false;
-	std::map<int,TopoDS_Shape>::const_iterator it = Cache::Shape.find(id);
-	if ( it != Cache::Shape.end() ) { r = it->second; return true; }
+	std::map<int,TopoDS_Shape>::const_iterator it = cache.Shape.find(id);
+	if ( it != cache.Shape.end() ) { r = it->second; return true; }
 #include "IfcRegisterConvertShape.h"
 	if ( processed ) { 
-		const double precision = IfcGeom::GetValue(GV_PRECISION);
-		IfcGeom::apply_tolerance(r, precision);
-		Cache::Shape[id] = r;
+		const double precision = getValue(GV_PRECISION);
+		apply_tolerance(r, precision);
+		cache.Shape[id] = r;
 	} else {
 		Logger::Message(Logger::LOG_ERROR,"No operation defined for:",l->entity);
 	}
 	return success;
 }
-bool IfcGeom::convert_wire(const IfcBaseClass* l, TopoDS_Wire& r) {
+
+bool IfcGeom::Kernel::convert_wire(const IfcBaseClass* l, TopoDS_Wire& r) {
 #include "IfcRegisterConvertWire.h"
 	Handle(Geom_Curve) curve;
-	if (IfcGeom::convert_curve(l, curve)) {
-		return IfcGeom::convert_curve_to_wire(curve, r);
+	if (IfcGeom::Kernel::convert_curve(l, curve)) {
+		return IfcGeom::Kernel::convert_curve_to_wire(curve, r);
 	}
 	Logger::Message(Logger::LOG_ERROR,"No operation defined for:",l->entity);
 	return false;
 }
-bool IfcGeom::convert_face(const IfcBaseClass* l, TopoDS_Shape& r) {
+
+bool IfcGeom::Kernel::convert_face(const IfcBaseClass* l, TopoDS_Shape& r) {
 #include "IfcRegisterConvertFace.h"
 	Logger::Message(Logger::LOG_ERROR,"No operation defined for:",l->entity);
 	return false;
 }
-bool IfcGeom::convert_curve(const IfcBaseClass* l, Handle(Geom_Curve)& r) {
+
+bool IfcGeom::Kernel::convert_curve(const IfcBaseClass* l, Handle(Geom_Curve)& r) {
 #include "IfcRegisterConvertCurve.h"
 	Logger::Message(Logger::LOG_ERROR,"No operation defined for:",l->entity);
 	return false;
diff --git a/src/ifcgeom/IfcRegister.h b/src/ifcgeom/IfcRegister.h
index 5b6a5fa..8d1be30 100644
--- a/src/ifcgeom/IfcRegister.h
+++ b/src/ifcgeom/IfcRegister.h
@@ -41,8 +41,6 @@
 #include "../ifcparse/IfcUtil.h"
 #include "../ifcparse/IfcParse.h"
 
-using namespace IfcSchema;
-
 SHAPES(IfcShellBasedSurfaceModel);
 SHAPES(IfcFaceBasedSurfaceModel);
 SHAPES(IfcShapeRepresentation);
@@ -50,6 +48,10 @@ SHAPES(IfcMappedItem);
 SHAPES(IfcFacetedBrep);
 SHAPES(IfcGeometricSet);
 
+#ifdef USE_IFC4
+SHAPE(IfcCylindricalSurface);
+SHAPE(IfcAdvancedBrep);
+#endif
 SHAPE(IfcExtrudedAreaSolid);
 SHAPE(IfcRevolvedAreaSolid);
 SHAPE(IfcConnectedFaceSet);
@@ -68,10 +70,10 @@ SHAPE(IfcCurveBoundedPlane);
 SHAPE(IfcRectangularTrimmedSurface);
 SHAPE(IfcSurfaceCurveSweptAreaSolid);
 SHAPE(IfcSweptDiskSolid);
+
 #ifdef USE_IFC4
-SHAPE(IfcCylindricalSurface);
+FACE(IfcAdvancedFace);
 #endif
-
 FACE(IfcArbitraryProfileDefWithVoids);
 FACE(IfcArbitraryClosedProfileDef);
 FACE(IfcRoundedRectangleProfileDef);
@@ -79,6 +81,7 @@ FACE(IfcRectangleHollowProfileDef);
 FACE(IfcRectangleProfileDef);
 FACE(IfcTrapeziumProfileDef)
 FACE(IfcCShapeProfileDef);
+// IfcAsymmetricIShapeProfileDef included
 FACE(IfcIShapeProfileDef);
 FACE(IfcLShapeProfileDef);
 FACE(IfcTShapeProfileDef);
@@ -92,6 +95,8 @@ FACE(IfcCompositeProfileDef);
 FACE(IfcDerivedProfileDef);
 FACE(IfcFace);
 
+WIRE(IfcEdgeCurve);
+WIRE(IfcEdgeLoop);
 WIRE(IfcPolyline);
 WIRE(IfcPolyLoop);
 WIRE(IfcCompositeCurve);
diff --git a/src/ifcgeom/IfcRegisterConvertShapes.h b/src/ifcgeom/IfcRegisterConvertShapes.h
index 5713e5e..c6fbfc2 100644
--- a/src/ifcgeom/IfcRegisterConvertShapes.h
+++ b/src/ifcgeom/IfcRegisterConvertShapes.h
@@ -2,7 +2,7 @@
 #define SHAPES(T) \
 	if ( l->is(T::Class()) ) { \
 		try { \
-			return IfcGeom::convert((T*)l,r); \
+			return convert((T*)l,r); \
 		} catch (...) { } \
 		Logger::Message(Logger::LOG_ERROR,"Failed to convert:",l->entity); \
 		return false; \
diff --git a/src/ifcgeom/IfcRegisterGeomHeader.h b/src/ifcgeom/IfcRegisterGeomHeader.h
index 5d23003..92ac6e3 100644
--- a/src/ifcgeom/IfcRegisterGeomHeader.h
+++ b/src/ifcgeom/IfcRegisterGeomHeader.h
@@ -1,5 +1,5 @@
 #include "IfcRegisterUndef.h"
-#define CLASS(T,V) bool convert(const T::ptr L, V& r);
+#define CLASS(T,V) bool convert(const IfcSchema::T* L, V& r);
 #define SHAPES(T) CLASS(T,IfcRepresentationShapeItems)
 #define SHAPE(T) CLASS(T,TopoDS_Shape)
 #define WIRE(T) CLASS(T,TopoDS_Wire)
diff --git a/src/ifcgeomserver/IfcGeomServer.cpp b/src/ifcgeomserver/IfcGeomServer.cpp
index 125b2e9..fcd0e27 100644
--- a/src/ifcgeomserver/IfcGeomServer.cpp
+++ b/src/ifcgeomserver/IfcGeomServer.cpp
@@ -35,7 +35,7 @@
 #include <fcntl.h>
 #endif
 
-#include "../ifcgeom/IfcGeomObjects.h"
+#include "../ifcgeom/IfcGeomIterator.h"
 
 using namespace boost;
 
@@ -186,7 +186,7 @@ class WriteLog : public Command {
 
 class Entity : public Command {
 private:
-	const IfcGeomObjects::IfcGeomObject* geom;
+	const IfcGeom::TriangulationElement<float>* geom;
 protected:
 	void read_content(std::istream& s) {}
 	void write_content(std::ostream& s) {
@@ -195,7 +195,7 @@ class Entity : public Command {
 		swrite(s, geom->name());
 		swrite(s, geom->type());
 		swrite<int32_t>(s, geom->parent_id());
-		const std::vector<float>& m = geom->matrix();
+		const std::vector<float>& m = geom->transformation().matrix().data();
 		const float matrix_array[16] = {
 			m[0], m[3], m[6], m[ 9],
 			m[1], m[4], m[7], m[10],
@@ -203,17 +203,17 @@ class Entity : public Command {
 			   0,    0,    0,     1
 		};
 		swrite(s, std::string((char*)matrix_array, 16 * sizeof(float)));
-		swrite<int32_t>(s, geom->mesh().id());
-		swrite(s, std::string((char*)geom->mesh().verts().data(), geom->mesh().verts().size() * sizeof(float)));
-		swrite(s, std::string((char*)geom->mesh().normals().data(), geom->mesh().normals().size() * sizeof(float)));
+		swrite<int32_t>(s, geom->geometry().id());
+		swrite(s, std::string((char*)geom->geometry().verts().data(), geom->geometry().verts().size() * sizeof(float)));
+		swrite(s, std::string((char*)geom->geometry().normals().data(), geom->geometry().normals().size() * sizeof(float)));
 		{ std::vector<int32_t> indices;
-		for (std::vector<int>::const_iterator it = geom->mesh().faces().begin(); it != geom->mesh().faces().end(); ++it) {
+		for (std::vector<int>::const_iterator it = geom->geometry().faces().begin(); it != geom->geometry().faces().end(); ++it) {
 			indices.push_back(*it);
 		} 
 		swrite(s, std::string((char*) indices.data(), indices.size() * sizeof(int32_t))); }
 		{ std::vector<float> diffuse_color_array;
-		for (std::vector<IfcGeomObjects::Material>::const_iterator it = geom->mesh().materials().begin(); it != geom->mesh().materials().end(); ++it) {
-			const IfcGeomObjects::Material& m = *it;
+		for (std::vector<IfcGeom::Material>::const_iterator it = geom->geometry().materials().begin(); it != geom->geometry().materials().end(); ++it) {
+			const IfcGeom::Material& m = *it;
 			if (m.hasDiffuse()) {
 				const double* color = m.diffuse();
 				diffuse_color_array.push_back(static_cast<float>(color[0]));
@@ -232,13 +232,13 @@ class Entity : public Command {
 		}
 		swrite(s, std::string((char*) diffuse_color_array.data(), diffuse_color_array.size() * sizeof(float))); }
 		{ std::vector<int32_t> material_indices;
-		for (std::vector<int>::const_iterator it = geom->mesh().material_ids().begin(); it != geom->mesh().material_ids().end(); ++it) {
+		for (std::vector<int>::const_iterator it = geom->geometry().material_ids().begin(); it != geom->geometry().material_ids().end(); ++it) {
 			material_indices.push_back(*it);
 		} 
 		swrite(s, std::string((char*) material_indices.data(), material_indices.size() * sizeof(int32_t))); }
 	}
 public:
-	Entity(const IfcGeomObjects::IfcGeomObject* geom) : Command(ENTITY), geom(geom) {};
+	Entity(const IfcGeom::TriangulationElement<float>* geom) : Command(ENTITY), geom(geom) {};
 };
 
 class Next : public Command {
@@ -278,6 +278,8 @@ int main (int argc, char** argv) {
 
 	bool has_more = false;
 
+	IfcGeom::Iterator<float>* iterator = 0;
+
 	Hello().write(std::cout);
 
 	int exit_code = 0;
@@ -290,12 +292,15 @@ int main (int argc, char** argv) {
 			char* data = new char[len];
 			memcpy(data, m.string().c_str(), len);
 
-			IfcGeomObjects::Settings(IfcGeomObjects::USE_WORLD_COORDS, false);
-			IfcGeomObjects::Settings(IfcGeomObjects::WELD_VERTICES, false);
-			IfcGeomObjects::Settings(IfcGeomObjects::CONVERT_BACK_UNITS, true);
-			IfcGeomObjects::Settings(IfcGeomObjects::FORCE_CCW_FACE_ORIENTATION, true);
+			IfcGeom::IteratorSettings settings;
+			settings.use_world_coords() = false;
+			settings.weld_vertices() = false;
+			settings.convert_back_units() = true;
+			settings.force_ccw_face_orientation() = true;
+
+			iterator = new IfcGeom::Iterator<float>(settings, data, len);
+			has_more = iterator->findContext();
 
-			has_more = IfcGeomObjects::Init(data, len);
 			More(has_more).write(std::cout);
 			continue;
 		}
@@ -305,22 +310,23 @@ int main (int argc, char** argv) {
 				exit_code = 1;
 				break;
 			}
-			const IfcGeomObjects::IfcGeomObject* geom = IfcGeomObjects::Get();
+			const IfcGeom::TriangulationElement<float>* geom = static_cast<const IfcGeom::TriangulationElement<float>*>(iterator->get());
 			Entity(geom).write(std::cout);
 			continue;
 		}
 		case NEXT: {
 			Next n; n.read(std::cin);
-			has_more = IfcGeomObjects::Next();
+			has_more = iterator->next();
 			if (!has_more) {
-				IfcGeomObjects::CleanUp();
+				delete iterator;
+				iterator = 0;
 			}
 			More(has_more).write(std::cout);
 			continue;
 		}
 		case GET_LOG: {
 			GetLog gl; gl.read(std::cin);
-			WriteLog(IfcGeomObjects::GetLog()).write(std::cout);
+			WriteLog(iterator->getLog()).write(std::cout);
 			continue;
 		}
 		case BYE: {
diff --git a/src/ifcmax/IfcMax.cpp b/src/ifcmax/IfcMax.cpp
index f6947c4..86e14be 100644
--- a/src/ifcmax/IfcMax.cpp
+++ b/src/ifcmax/IfcMax.cpp
@@ -22,7 +22,7 @@
 #include <istdplug.h>
 
 #include "../ifcmax/IfcMax.h"
-#include "../ifcgeom/IfcGeomObjects.h"
+#include "../ifcgeom/IfcGeomIterator.h"
 
 static const int NUM_MATERIAL_SLOTS = 24;
 
@@ -119,7 +119,7 @@ Mtl* FindMaterialByName(MtlBaseLib* library, const std::string& material_name) {
 	return m;
 }
 
-Mtl* FindOrCreateMaterial(MtlBaseLib* library, Interface* max_interface, int& slot, const IfcGeomObjects::Material& material) {
+Mtl* FindOrCreateMaterial(MtlBaseLib* library, Interface* max_interface, int& slot, const IfcGeom::Material& material) {
 	Mtl* m = FindMaterialByName(library, material.name());
 	if (m == 0) {
 		StdMat2* stdm = NewDefaultStdMat();
@@ -148,7 +148,7 @@ Mtl* FindOrCreateMaterial(MtlBaseLib* library, Interface* max_interface, int& sl
 	return m;
 }
 
-Mtl* ComposeMultiMaterial(std::map<std::vector<std::string>, Mtl*>& multi_mats, MtlBaseLib* library, Interface* max_interface, int& slot, const std::vector<IfcGeomObjects::Material>& materials, const std::string& object_type, const std::vector<int>& material_ids) {
+Mtl* ComposeMultiMaterial(std::map<std::vector<std::string>, Mtl*>& multi_mats, MtlBaseLib* library, Interface* max_interface, int& slot, const std::vector<IfcGeom::Material>& materials, const std::string& object_type, const std::vector<int>& material_ids) {
 	std::vector<std::string> material_names;
 	bool needs_default = std::find(material_ids.begin(), material_ids.end(), -1) != material_ids.end();
 	if (needs_default) {
@@ -200,9 +200,10 @@ Mtl* ComposeMultiMaterial(std::map<std::vector<std::string>, Mtl*>& multi_mats,
 
 int IFCImp::DoImport(const TCHAR *name, ImpInterface *impitfc, Interface *itfc, BOOL suppressPrompts) {
 
-	IfcGeomObjects::Settings(IfcGeomObjects::USE_WORLD_COORDS,false);
-	IfcGeomObjects::Settings(IfcGeomObjects::WELD_VERTICES,true);
-	IfcGeomObjects::Settings(IfcGeomObjects::SEW_SHELLS,true);
+	IfcGeom::IteratorSettings settings;
+	settings.use_world_coords() = false;
+	settings.weld_vertices() = true;
+	settings.sew_shells() = true;
 
 #ifdef _UNICODE
 	int fn_buffer_size = WideCharToMultiByte(CP_UTF8, 0, name, -1, 0, 0, 0, 0);
@@ -212,7 +213,9 @@ int IFCImp::DoImport(const TCHAR *name, ImpInterface *impitfc, Interface *itfc,
 	const char* fn_mb = name;
 #endif
 
-	if ( ! IfcGeomObjects::Init(fn_mb,0,0) ) return false;
+	IfcGeom::Iterator<float> iterator(settings, fn_mb);
+
+	if (!iterator.findContext()) return false;
 
 	itfc->ProgressStart(_T("Importing file..."), TRUE, fn, NULL);
 
@@ -222,30 +225,29 @@ int IFCImp::DoImport(const TCHAR *name, ImpInterface *impitfc, Interface *itfc,
 	std::map<std::vector<std::string>, Mtl*> material_cache;
 
 	do{
-
-		const IfcGeomObjects::IfcGeomObject* o = IfcGeomObjects::Get();
+		const IfcGeom::TriangulationElement<float>* o = static_cast<const IfcGeom::TriangulationElement<float>*>(iterator.get());
 
 		TSTR o_type = S(o->type());
 		TSTR o_guid = S(o->guid());
 
-		Mtl *m = ComposeMultiMaterial(material_cache, mats, itfc, slot, o->mesh().materials(), o->type(), o->mesh().material_ids());
+		Mtl *m = ComposeMultiMaterial(material_cache, mats, itfc, slot, o->geometry().materials(), o->type(), o->geometry().material_ids());
 
 		TriObject* tri = CreateNewTriObject();
 
-		const int numVerts = o->mesh().verts().size()/3;
+		const int numVerts = o->geometry().verts().size()/3;
 		tri->mesh.setNumVerts(numVerts);
 		for( int i = 0; i < numVerts; i ++ ) {
-			tri->mesh.setVert(i,o->mesh().verts()[3*i+0],o->mesh().verts()[3*i+1],o->mesh().verts()[3*i+2]);
+			tri->mesh.setVert(i,o->geometry().verts()[3*i+0],o->geometry().verts()[3*i+1],o->geometry().verts()[3*i+2]);
 		}
-		const int numFaces = o->mesh().faces().size()/3;
+		const int numFaces = o->geometry().faces().size()/3;
 		tri->mesh.setNumFaces(numFaces);
 
-		bool needs_default = std::find(o->mesh().material_ids().begin(), o->mesh().material_ids().end(), -1) != o->mesh().material_ids().end();
+		bool needs_default = std::find(o->geometry().material_ids().begin(), o->geometry().material_ids().end(), -1) != o->geometry().material_ids().end();
 
 		for( int i = 0; i < numFaces; i ++ ) {
-			tri->mesh.faces[i].setVerts(o->mesh().faces()[3*i+0],o->mesh().faces()[3*i+1],o->mesh().faces()[3*i+2]);
-			tri->mesh.faces[i].setEdgeVisFlags(o->mesh().edges()[3*i+0],o->mesh().edges()[3*i+1],o->mesh().edges()[3*i+2]);
-			MtlID mtlid = o->mesh().material_ids()[i];
+			tri->mesh.faces[i].setVerts(o->geometry().faces()[3*i+0],o->geometry().faces()[3*i+1],o->geometry().faces()[3*i+2]);
+			tri->mesh.faces[i].setEdgeVisFlags(o->geometry().edges()[3*i+0],o->geometry().edges()[3*i+1],o->geometry().edges()[3*i+2]);
+			MtlID mtlid = o->geometry().material_ids()[i];
 			if (needs_default) mtlid ++;
 			tri->mesh.faces[i].setMatID(mtlid);
 		}
@@ -267,15 +269,14 @@ int IFCImp::DoImport(const TCHAR *name, ImpInterface *impitfc, Interface *itfc,
 		if (m) {
 			node->GetINode()->SetMtl(m);
 		}
-		node->SetTransform(0,Matrix3 ( Point3(o->matrix()[0],o->matrix()[1],o->matrix()[2]),Point3(o->matrix()[3],o->matrix()[4],o->matrix()[5]),
-			Point3(o->matrix()[6],o->matrix()[7],o->matrix()[8]),Point3(o->matrix()[9],o->matrix()[10],o->matrix()[11]) ));
+		const std::vector<float>& matrix_data = o->transformation().matrix().data();
+		node->SetTransform(0,Matrix3 ( Point3(matrix_data[0],matrix_data[1],matrix_data[2]),Point3(matrix_data[3],matrix_data[4],matrix_data[5]),
+			Point3(matrix_data[6],matrix_data[7],matrix_data[8]),Point3(matrix_data[9],matrix_data[10],matrix_data[11]) ));
 		impitfc->AddNodeToScene(node);
 
-		itfc->ProgressUpdate(IfcGeomObjects::Progress(),true,_T(""));
-
-	} while ( IfcGeomObjects::Next() );
+		itfc->ProgressUpdate(iterator.progress(), true, _T(""));
 
-	IfcGeomObjects::CleanUp();
+	} while (iterator.next());
 
 	itfc->ProgressEnd();
 	
diff --git a/src/ifcmax/MaxMaterials.h b/src/ifcmax/MaxMaterials.h
deleted file mode 100644
index 1b9730a..0000000
--- a/src/ifcmax/MaxMaterials.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/********************************************************************************
- *                                                                              *
- * This file is part of IfcOpenShell.                                           *
- *                                                                              *
- * IfcOpenShell is free software: you can redistribute it and/or modify         *
- * it under the terms of the Lesser GNU General Public License as published by  *
- * the Free Software Foundation, either version 3.0 of the License, or          *
- * (at your option) any later version.                                          *
- *                                                                              *
- * IfcOpenShell 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                 *
- * Lesser GNU General Public License for more details.                          *
- *                                                                              *
- * You should have received a copy of the Lesser GNU General Public License     *
- * along with this program. If not, see <http://www.gnu.org/licenses/>.         *
- *                                                                              *
- ********************************************************************************/
-
-/********************************************************************************
- *                                                                              *
- * This file defines materials for use in 3ds Max for several IFC datatypes     *
- *                                                                              *
- ********************************************************************************/
-
-#include <string>
-
-#include "Max.h"
-#include "stdmat.h"
-
-StdMat2* GetMaterial(const std::string& s) {
-	StdMat2* mat = NewDefaultStdMat();
-	TimeValue t (-1);
-	mat->SetSpecular(Color(0.2f,0.2f,0.2f),t);
-	mat->SetAmbient(Color(0.1f,0.1f,0.1f),t);
-	mat->SetWire( s == "IfcSpace" || s == "IfcOpeningElement" );
-	if ( s == "IfcSite" ) { mat->SetDiffuse(Color(0.75f,0.8f,0.65f),t); }
-	if ( s == "IfcSlab" ) { mat->SetDiffuse(Color(0.4f,0.4f,0.4f),t); }
-	if ( s == "IfcWallStandardCase" ) { mat->SetDiffuse(Color(0.9f,0.9f,0.9f),t); }
-	if ( s == "IfcWall" ) { mat->SetDiffuse(Color(0.9f,0.9f,0.9f),t); }
-	if ( s == "IfcWindow" ) { mat->SetDiffuse(Color(0.75f,0.8f,0.75f),t); mat->SetSpecular(Color(1.0f,1.0f,1.0f),t); 
-	mat->SetAmbient(Color(0.0f,0.0f,0.0f),t); mat->SetShininess(500.0f,t); mat->SetOpacity(0.3f,t); }
-	if ( s == "IfcDoor" ) { mat->SetDiffuse(Color(0.55f,0.3f,0.15f),t); }
-	if ( s == "IfcBeam" ) { mat->SetDiffuse(Color(0.75f,0.7f,0.7f),t); }
-	if ( s == "IfcRailing" ) { mat->SetDiffuse(Color(0.75f,0.7f,0.7f),t); }
-	if ( s == "IfcMember" ) { mat->SetDiffuse(Color(0.75f,0.7f,0.7f),t); }
-	return mat;
-}
\ No newline at end of file
diff --git a/src/ifcobj/IfcObj.cpp b/src/ifcobj/IfcObj.cpp
deleted file mode 100644
index b2fc94d..0000000
--- a/src/ifcobj/IfcObj.cpp
+++ /dev/null
@@ -1,127 +0,0 @@
-/********************************************************************************
- *                                                                              *
- * This file is part of IfcOpenShell.                                           *
- *                                                                              *
- * IfcOpenShell is free software: you can redistribute it and/or modify         *
- * it under the terms of the Lesser GNU General Public License as published by  *
- * the Free Software Foundation, either version 3.0 of the License, or          *
- * (at your option) any later version.                                          *
- *                                                                              *
- * IfcOpenShell 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                 *
- * Lesser GNU General Public License for more details.                          *
- *                                                                              *
- * You should have received a copy of the Lesser GNU General Public License     *
- * along with this program. If not, see <http://www.gnu.org/licenses/>.         *
- *                                                                              *
- ********************************************************************************/
-
-/********************************************************************************
- *                                                                              *
- * This is a brief example of how IfcOpenShell can be interfaced from within    *
- * a C++ context. The application reads an .ifc file and outputs geometry in    *
- * the Wavefront .obj file format.                                              *
- *                                                                              *
- ********************************************************************************/
-
-#include <fstream>
-#include <sstream>
-#include <set>
-#include <time.h>
-
-#include "../ifcgeom/IfcGeomObjects.h"
-#include "../ifcobj/ObjMaterials.h"
-
-int main ( int argc, char** argv ) {
-	if ( argc != 2 ) {
-		std::cout << "usage: IfcObj <filename.ifc>" << std::endl;
-		return 1;
-	}
-	const std::string fnObj = std::string(argv[1]) + ".obj";
-	const std::string fnMtl = std::string(argv[1]) + ".mtl";
-	ofstream fObj(fnObj.c_str());
-	ofstream fMtl(fnMtl.c_str());
-	if ( ! ( fObj.is_open() && fMtl.is_open() ) ) {
-		std::cout << "[Error] unable to open output file for writing" << std::endl;
-		return 1;
-	}
-
-	IfcGeomObjects::Settings(IfcGeomObjects::USE_WORLD_COORDS,true);
-	IfcGeomObjects::Settings(IfcGeomObjects::WELD_VERTICES,false);
-	IfcGeomObjects::Settings(IfcGeomObjects::SEW_SHELLS,true);
-
-	// Stream for log messages, we don't want to interupt our new progress bar...
-	std::stringstream ss;
-
-	// Parse the file supplied in argv[1]. Returns true on succes.
-	if ( ! IfcGeomObjects::Init(argv[1],&std::cout,&ss) ) {
-		std::cout << "[Error] unable to parse .ifc file or no geometrical entities found" << std::endl;
-		return 1;
-	}
-
-	fObj << "# File generated by IfcOpenShell " << IFCOPENSHELL_VERSION << std::endl;
-	fObj << "mtllib " << fnMtl << std::endl;
-	std::set<std::string> materials;
-
-	time_t start,end;
-	time(&start);
-	int old_progress = -1;
-	std::cout << "Creating geometry..." << std::endl;
-
-	// The functions IfcGeomObjects::Get() and IfcGeomObjects::Next() wrap an iterator of all geometrical entities in the Ifc file.
-	// IfcGeomObjects::Get() returns an IfcGeomObjects::IfcGeomObject (see IfcObjects.h for definition)
-	// IfcGeomObjects::Next() is used to poll whether more geometrical entities are available
-    int vcount_total = 1;
-	do {
-		const IfcGeomObjects::IfcGeomObject* o = IfcGeomObjects::Get();
-		if ( o->type == "IfcSpace" || o->type == "IfcOpeningElement" ) continue;
-		const std::string name = o->name.empty() ? o->guid : o->name;
-		fObj << "g " << name << std::endl;
-		fObj << "s 1" << std::endl;
-		fObj << "usemtl " << o->type << std::endl;
-		materials.insert(o->type);
-		const int vcount = o->mesh->verts.size() / 3;
-		for ( IfcGeomObjects::FltIt it = o->mesh->verts.begin(); it != o->mesh->verts.end(); ) {
-			const double x = *(it++);
-			const double y = *(it++);
-			const double z = *(it++);
-			fObj << "v " << x << " " << y << " " << z << std::endl;
-		}
-		for ( IfcGeomObjects::FltIt it = o->mesh->normals.begin(); it != o->mesh->normals.end(); ) {
-			const double x = *(it++);
-			const double y = *(it++);
-			const double z = *(it++);
-			fObj << "vn " << x << " " << y << " " << z << std::endl;
-		}
-		for ( IfcGeomObjects::IntIt it = o->mesh->faces.begin(); it != o->mesh->faces.end(); ) {
-			const int v1 = *(it++)+vcount_total;
-			const int v2 = *(it++)+vcount_total;
-			const int v3 = *(it++)+vcount_total;
-			fObj << "f " << v1 << "//" << v1 << " " << v2 << "//" << v2 << " " << v3 << "//" << v3 << std::endl;
-		}
-        vcount_total += vcount;
-
-		const int progress = IfcGeomObjects::Progress() / 2;
-		if ( old_progress!= progress ) std::cout << "\r[" << std::string(progress,'#') << std::string(50 - progress,' ') << "]" << std::flush;
-		old_progress = progress;
-	
-	} while ( IfcGeomObjects::Next() );
-	std::cout << "\rDone creating geometry                                " << std::endl;
-
-	// Writes the material settings, defined in Materials.h
-	fMtl << "# File generated by IfcOpenShell " << IFCOPENSHELL_VERSION << std::endl;
-	for( std::set<std::string>::iterator it = materials.begin(); it != materials.end(); ++ it ) {
-		fMtl << GetMaterial(*it);
-	}
-
-	std::string log = ss.str();
-	if ( log.size() ) {
-		std::cout << std::endl << "Log:" << std::endl;
-		std::cout << ss.str();
-	}
-
-	time(&end);
-	int dif = (int) difftime (end,start);	
-	printf ("\nConversion took %d seconds\n", dif );
-}
diff --git a/src/ifcobj/Materials.cpp b/src/ifcobj/Materials.cpp
deleted file mode 100644
index 5a40436..0000000
--- a/src/ifcobj/Materials.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "../IfcObj/Materials.h"
-
-void InitMaterials() {
-	materials["IFCSITE"] = ObjMaterial("IFCSITE",0.7f,0.8f,0.5f);
-}
\ No newline at end of file
diff --git a/src/ifcobj/ObjMaterials.h b/src/ifcobj/ObjMaterials.h
deleted file mode 100644
index 5c6692f..0000000
--- a/src/ifcobj/ObjMaterials.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/********************************************************************************
- *                                                                              *
- * This file is part of IfcOpenShell.                                           *
- *                                                                              *
- * IfcOpenShell is free software: you can redistribute it and/or modify         *
- * it under the terms of the Lesser GNU General Public License as published by  *
- * the Free Software Foundation, either version 3.0 of the License, or          *
- * (at your option) any later version.                                          *
- *                                                                              *
- * IfcOpenShell 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                 *
- * Lesser GNU General Public License for more details.                          *
- *                                                                              *
- * You should have received a copy of the Lesser GNU General Public License     *
- * along with this program. If not, see <http://www.gnu.org/licenses/>.         *
- *                                                                              *
- ********************************************************************************/
-
-/********************************************************************************
- *                                                                              *
- * This file defines materials in .mtl format for several IFC datatypes         *
- *                                                                              *
- ********************************************************************************/
-
-#include <string>
-#include <sstream>
-
-class ObjMaterial {
-private:
-	std::string data;
-public:
-	ObjMaterial(const std::string& name,
-		double Kd_r = 0.7f,double Kd_g = 0.7f,double Kd_b = 0.7f,
-		double Ks_r = 0.2f,double Ks_g = 0.2f,double Ks_b = 0.2f, 
-		double Ka_r = 0.1f,double Ka_g = 0.1f,double Ka_b = 0.1f,
-		double Ns = 10.0f, double Tr = 1.0f) {
-			std::stringstream ss;
-			ss << "newmtl " << name << std::endl;
-			ss << "Kd " << Kd_r << " " << Kd_g << " " << Kd_b << std::endl;
-			ss << "Ks " << Ks_r << " " << Ks_g << " " << Ks_b << std::endl;
-			ss << "Ka " << Ka_r << " " << Ka_g << " " << Ka_b << std::endl;
-			ss << "Ns " << Ns << std::endl;
-			ss << "Tr " << Tr << std::endl;
-			ss << "d " << Tr << std::endl;
-			ss << "D " << Tr << std::endl;
-			data = ss.str();
-	}
-	friend ostream& operator<<(ostream& o, const ObjMaterial& m) {o << m.data; return o;}
-};
-
-ObjMaterial GetMaterial(const std::string& s) {
-	if ( s == "IfcSite" ) { return ObjMaterial("IfcSite",0.75f,0.8f,0.65f); }
-	if ( s == "IfcSlab" ) { return ObjMaterial("IfcSlab",0.4f,0.4f,0.4f); }
-	if ( s == "IfcWallStandardCase" ) { return ObjMaterial("IfcWallStandardCase",0.9f,0.9f,0.9f); }
-	if ( s == "IfcWall" ) { return ObjMaterial("IfcWall",0.9f,0.9f,0.9f); }
-	if ( s == "IfcWindow" ) { return ObjMaterial("IfcWindow",0.75f,0.8f,0.75f,1.0f,1.0f,1.0f,0.0f,0.0f,0.0f,500.0f,0.3f); }
-	if ( s == "IfcDoor" ) { return ObjMaterial("IfcDoor",0.55f,0.3f,0.15f); }
-	if ( s == "IfcBeam" ) { return ObjMaterial("IfcBeam",0.75f,0.7f,0.7f); }
-	if ( s == "IfcRailing" ) { return ObjMaterial("IfcRailing",0.65f,0.6f,0.6f); }
-	if ( s == "IfcMember" ) { return ObjMaterial("IfcMember",0.65f,0.6f,0.6f); }
-	if ( s == "IfcPlate" ) { return ObjMaterial("IfcPlate",0.8f,0.8f,0.8f); }
-	return ObjMaterial(s);
-}
\ No newline at end of file
diff --git a/src/ifcopenshell-python/ifcopenshell/__init__.py b/src/ifcopenshell-python/ifcopenshell/__init__.py
new file mode 100644
index 0000000..301f028
--- /dev/null
+++ b/src/ifcopenshell-python/ifcopenshell/__init__.py
@@ -0,0 +1,133 @@
+###############################################################################
+#                                                                             #
+# This file is part of IfcOpenShell.                                          #
+#                                                                             #
+# IfcOpenShell is free software: you can redistribute it and/or modify        #
+# it under the terms of the Lesser GNU General Public License as published by #
+# the Free Software Foundation, either version 3.0 of the License, or         #
+# (at your option) any later version.                                         #
+#                                                                             #
+# IfcOpenShell 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                #
+# Lesser GNU General Public License for more details.                         #
+#                                                                             #
+# You should have received a copy of the Lesser GNU General Public License    #
+# along with this program. If not, see <http://www.gnu.org/licenses/>.        #
+#                                                                             #
+###############################################################################
+
+import os
+import sys
+import platform
+import functools
+import itertools
+
+from functools import reduce
+
+from . import guid
+
+python_distribution = os.path.join(platform.system().lower(),
+	platform.architecture()[0],
+	'python%s.%s' % platform.python_version_tuple()[:2])
+sys.path.append(os.path.abspath(os.path.join(
+	os.path.dirname(__file__),
+	'lib', python_distribution)))
+
+try:
+	from . import ifcopenshell_wrapper
+except:
+	raise ImportError("IfcOpenShell not built for '%s'" % python_distribution)
+
+class entity_instance(object):
+	def __init__(self, e):
+		super(entity_instance, self).__setattr__('wrapped_data', e)
+	def __getattr__(self, name):
+		try: return entity_instance.wrap_value(self.wrapped_data.get_argument(self.wrapped_data.get_argument_index(name)))
+		except:
+			try: return entity_instance.wrap_value(self.wrapped_data.get_inverse(name))
+			except: raise AttributeError("entity instance of type '%s' has no attribute '%s'"%(self.wrapped_data.is_a(), name))
+	@staticmethod
+	def map_value(v):
+		if isinstance(v, entity_instance): return v.wrapped_data
+		elif isinstance(v, (tuple, list)) and len(v):
+			classes = list(map(type, v))
+			if float in classes: return ifcopenshell_wrapper.double_vector(v)
+			elif int in classes: return ifcopenshell_wrapper.int_vector(v)
+			elif str in classes: return ifcopenshell_wrapper.string_vector(v)
+			elif entity_instance in classes: return list(map(lambda e: e.wrapped_data, v))
+		return v
+	@staticmethod
+	def wrap_value(v):
+		wrap = lambda e: entity_instance(e)
+		if isinstance(v, ifcopenshell_wrapper.entity_instance): return wrap(v)
+		elif isinstance(v, (tuple, list)) and len(v):
+			classes = list(map(type, v))
+			if ifcopenshell_wrapper.entity_instance in classes: return list(map(wrap, v))
+		return v
+	def attribute_type(self, attr):
+		attr_idx = attr if isinstance(attr, int) else self.wrapped_data.get_argument_index(attr)
+		return self.wrapped_data.get_argument_type(attr_idx)
+	def attribute_name(self, attr_idx):
+		return self.wrapped_data.get_argument_name(attr_idx)
+	def __setattr__(self, key, value):
+		self[self.wrapped_data.get_argument_index(key)] = value
+	def __getitem__(self, key):
+		return entity_instance.wrap_value(self.wrapped_data.get_argument(key))
+	def __setitem__(self, idx, value):
+		self.wrapped_data.set_argument(idx, entity_instance.map_value(value))
+	def __len__(self): return len(self.wrapped_data)
+	def __repr__(self): return repr(self.wrapped_data)
+	def is_a(self, *args): return self.wrapped_data.is_a(*args)
+	def id(self): return self.wrapped_data.id()
+	def __dir__(self):
+		return sorted(set(itertools.chain(
+			dir(type(self)),
+			self.wrapped_data.get_attribute_names(),
+			self.wrapped_data.get_inverse_attribute_names()
+		)))
+
+
+class file(object):
+	def __init__(self, f=None):
+		self.wrapped_data = f or ifcopenshell_wrapper.file(True)
+	def create_entity(self,type,*args,**kwargs):
+		e = entity_instance(ifcopenshell_wrapper.entity_instance(type))
+		attrs = list(enumerate(args)) + \
+			[(e.wrapped_data.get_argument_index(name), arg) for name, arg in kwargs.items()]
+		for idx, arg in attrs: e[idx] = arg
+		self.wrapped_data.add(e.wrapped_data)
+		e.wrapped_data.this.disown()
+		return e
+	def __getattr__(self, attr):
+		if attr[0:6] == 'create': return functools.partial(self.create_entity,attr[6:])
+		else: return getattr(self.wrapped_data, attr)
+	def __getitem__(self, key):
+		if isinstance(key, int):
+			return entity_instance(self.wrapped_data.by_id(key))
+		elif isinstance(key, str):
+			return entity_instance(self.wrapped_data.by_guid(key))
+	def add(self, inst):
+		inst.wrapped_data.this.disown()
+		return entity_instance(self.wrapped_data.add(inst.wrapped_data))
+	def by_type(self, type):
+		return [entity_instance(e) for e in self.wrapped_data.by_type(type)]
+	def traverse(self, inst):
+		return [entity_instance(e) for e in self.wrapped_data.traverse(inst.wrapped_data)]
+	def remove(self, inst):
+		return self.wrapped_data.remove(inst.wrapped_data)
+	def __iter__(self):
+		return iter(self[id] for id in self.wrapped_data.entity_names())
+
+
+def open(fn=None):
+	return file(ifcopenshell_wrapper.open(os.path.abspath(fn))) if fn else file()
+
+
+def create_entity(type,*args,**kwargs):
+	e = entity_instance(ifcopenshell_wrapper.entity_instance(type))
+	attrs = list(enumerate(args)) + \
+		[(e.wrapped_data.get_argument_index(name), arg) for name, arg in kwargs.items()]
+	for idx, arg in attrs: e[idx] = arg
+	return e
+
diff --git a/src/ifcopenshell-python/ifcopenshell/geom/__init__.py b/src/ifcopenshell-python/ifcopenshell/geom/__init__.py
new file mode 100644
index 0000000..d160bf8
--- /dev/null
+++ b/src/ifcopenshell-python/ifcopenshell/geom/__init__.py
@@ -0,0 +1,82 @@
+###############################################################################
+#                                                                             #
+# This file is part of IfcOpenShell.                                          #
+#                                                                             #
+# IfcOpenShell is free software: you can redistribute it and/or modify        #
+# it under the terms of the Lesser GNU General Public License as published by #
+# the Free Software Foundation, either version 3.0 of the License, or         #
+# (at your option) any later version.                                         #
+#                                                                             #
+# IfcOpenShell 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                #
+# Lesser GNU General Public License for more details.                         #
+#                                                                             #
+# You should have received a copy of the Lesser GNU General Public License    #
+# along with this program. If not, see <http://www.gnu.org/licenses/>.        #
+#                                                                             #
+###############################################################################
+
+import os
+import sys
+
+from .. import ifcopenshell_wrapper
+
+def has_occ():
+    try: import OCC.BRepTools
+    except: return False
+    return True
+
+
+has_occ = has_occ()
+wrap_shape_creation = lambda settings, shape: shape
+if has_occ:
+    import occ_utils as utils
+    wrap_shape_creation = lambda settings, shape: utils.create_shape_from_serialization(shape) if getattr(settings, 'use_python_opencascade', False) else shape
+
+
+# Subclass the settings module to provide an additional
+# setting to enable pythonOCC when available
+class settings(ifcopenshell_wrapper.settings):
+    if has_occ:
+        USE_PYTHON_OPENCASCADE = -1
+        def set(self, *args):
+            setting, value = args
+            if setting == settings.USE_PYTHON_OPENCASCADE:
+                self.set(settings.USE_BREP_DATA, value)
+                self.set(settings.USE_WORLD_COORDS, value)
+                self.set(settings.DISABLE_TRIANGULATION, value)
+                self.use_python_opencascade = value
+            else:
+                ifcopenshell_wrapper.settings.set(self, *args)
+
+
+# Hide templating precision to the user by choosing based on Python's 
+# internal float type. This is probably always going to be a double.
+for ty in (ifcopenshell_wrapper.iterator_single_precision, ifcopenshell_wrapper.iterator_double_precision):
+    if ty.mantissa_size() == sys.float_info.mant_dig: 
+        _iterator = ty
+
+
+# Make sure people are able to use python's platform agnostic paths
+class iterator(_iterator):
+    def __init__(self, settings, filename):
+        self.settings = settings
+        _iterator.__init__(self, settings, os.path.abspath(filename))
+    if has_occ:
+        def get(self):
+            return wrap_shape_creation(self.settings, _iterator.get(self))
+
+
+def create_shape(settings, inst): 
+    return wrap_shape_creation(settings, ifcopenshell_wrapper.create_shape(settings, inst.wrapped_data))
+
+
+def iterate(settings, filename):
+    it = iterator(settings, filename)
+    if it.findContext():
+        while True:
+            yield it.get()
+            if not it.next(): break
+
+
diff --git a/src/ifcopenshell-python/ifcopenshell/geom/occ_utils.py b/src/ifcopenshell-python/ifcopenshell/geom/occ_utils.py
new file mode 100644
index 0000000..be5c93e
--- /dev/null
+++ b/src/ifcopenshell-python/ifcopenshell/geom/occ_utils.py
@@ -0,0 +1,66 @@
+import random
+from collections import namedtuple
+
+import OCC.gp
+import OCC.V3d
+import OCC.Quantity
+import OCC.BRepTools
+import OCC.Display.SimpleGui
+
+tuple = namedtuple('shape', ('data', 'geometry'))
+
+handle, main_loop, add_menu, add_function_to_menu = None, None, None, None
+
+def initialize_display():
+    global handle, main_loop, add_menu, add_function_to_menu
+    handle, main_loop, add_menu, add_function_to_menu = OCC.Display.SimpleGui.init_display()
+
+    def setup():
+        viewer_handle = handle.GetViewer()
+        viewer = viewer_handle.GetObject()
+        while True:
+            viewer.InitActiveLights()
+            try: active_light = viewer.ActiveLight()
+            except: break
+            viewer.DelLight(active_light)
+            viewer.NextActiveLights()
+        for dir in [(1,2,-3), (-2,-1,1)]:
+            light = OCC.V3d.V3d_DirectionalLight(viewer_handle)
+            light.SetDirection(*dir)
+            viewer.SetLightOn(light.GetHandle())
+    setup()
+    return handle
+
+
+def display_shape(shape, clr=None):
+    if not clr: 
+        r = lambda: random.random() * 0.3 + 0.7
+        clr = OCC.Quantity.Quantity_Color(r(), r(), r(), OCC.Quantity.Quantity_TOC_RGB)
+    return handle.DisplayShape(shape, color=clr, update=True)
+
+
+def set_shape_transparency(ais, t):
+    handle.Context.SetTransparency(ais, t)
+
+
+def get_bounding_box_center(bbox):
+    bbmin = [0.]*3; bbmax = [0.]*3
+    bbmin[0], bbmin[1], bbmin[2], bbmax[0], bbmax[1], bbmax[2] = bbox.Get()
+    return OCC.gp.gp_Pnt(*map(lambda xy: (xy[0]+xy[1])/2., zip(bbmin, bbmax)))
+
+
+def create_shape_from_serialization(brep_object):
+    brep_data, occ_shape = None, None
+    
+    try: brep_data = brep_object.geometry.brep_data
+    except: pass    
+    if not brep_data: return tuple(brep_object, None)
+    
+    try:
+        ss = OCC.BRepTools.BRepTools_ShapeSet()
+        ss.ReadFromString(brep_data)
+        occ_shape = ss.Shape(ss.NbShapes())
+    except: pass
+    
+    return tuple(brep_object, occ_shape)
+
diff --git a/src/ifcopenshell-python/ifcopenshell/guid.py b/src/ifcopenshell-python/ifcopenshell/guid.py
new file mode 100644
index 0000000..ddc9569
--- /dev/null
+++ b/src/ifcopenshell-python/ifcopenshell/guid.py
@@ -0,0 +1,43 @@
+###############################################################################
+#                                                                             #
+# This file is part of IfcOpenShell.                                          #
+#                                                                             #
+# IfcOpenShell is free software: you can redistribute it and/or modify        #
+# it under the terms of the Lesser GNU General Public License as published by #
+# the Free Software Foundation, either version 3.0 of the License, or         #
+# (at your option) any later version.                                         #
+#                                                                             #
+# IfcOpenShell 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                #
+# Lesser GNU General Public License for more details.                         #
+#                                                                             #
+# You should have received a copy of the Lesser GNU General Public License    #
+# along with this program. If not, see <http://www.gnu.org/licenses/>.        #
+#                                                                             #
+###############################################################################
+
+import string
+
+from functools import reduce
+
+chars = string.digits + string.ascii_uppercase + string.ascii_lowercase + '_$'
+
+def compress(g):
+    bs = [int(g[i:i+2], 16) for i in range(0, len(g), 2)]
+    def b64(v, l=4):
+        return ''.join([chars[(v // (64**i))%64] for i in range(l)][::-1])
+    return ''.join([b64(bs[0], 2)] + [b64((bs[i] << 16) + (bs[i+1] << 8) + bs[i+2]) for i in range(1,16,3)])
+
+def expand(g):
+    def b64(v):
+        return reduce(lambda a, b: a * 64 + b, map(lambda c: chars.index(c), v))
+    bs = [b64(g[0:2])]
+    for i in range(5):
+        d = b64(g[2+4*i:6+4*i])
+        bs += [(d >> (8*(2-j)))%256 for j in range(3)]
+    return ''.join(['%02x'%b for b in bs])
+
+def split(g):
+    return '{%s-%s-%s-%s-%s}'%(g[:8], g[8:12], g[12:16], g[16:20], g[20:])
+
diff --git a/src/ifcparse/Ifc2x3-rt.cpp b/src/ifcparse/Ifc2x3-latebound.cpp
similarity index 75%
rename from src/ifcparse/Ifc2x3-rt.cpp
rename to src/ifcparse/Ifc2x3-latebound.cpp
index 92c15a1..642cee8 100644
--- a/src/ifcparse/Ifc2x3-rt.cpp
+++ b/src/ifcparse/Ifc2x3-latebound.cpp
@@ -23,11 +23,13 @@
  * but instead modify the python script that has been used to generate this.    *
  *                                                                              *
  ********************************************************************************/
- 
+
 #ifndef USE_IFC4
 
+#include <set>
+
 #include "../ifcparse/Ifc2x3.h"
-#include "../ifcparse/Ifc2x3-rt.h"
+#include "../ifcparse/Ifc2x3-latebound.h"
 #include "../ifcparse/IfcException.h"
 #include "../ifcparse/IfcWrite.h"
 #include "../ifcparse/IfcWritableEntity.h"
@@ -39,9 +41,21 @@ using namespace IfcParse;
 using namespace IfcWrite;
 using namespace IfcUtil;
 
-std::map<Type::Enum,IfcEntityDescriptor*> entity_descriptor_map;
-std::map<Type::Enum,IfcEnumerationDescriptor*> enumeration_descriptor_map;
-std::map<std::pair<Type::Enum, std::string>, std::pair<Type::Enum, int> > inverse_map;
+typedef std::map<Type::Enum,IfcEntityDescriptor*> entity_descriptor_map_t;
+typedef std::map<Type::Enum,IfcEnumerationDescriptor*> enumeration_descriptor_map_t;
+typedef std::map<Type::Enum, std::map<std::string, std::pair<Type::Enum, int> > > inverse_map_t;
+typedef std::map<Type::Enum,std::set<int> > derived_map_t;
+
+entity_descriptor_map_t entity_descriptor_map;
+enumeration_descriptor_map_t enumeration_descriptor_map;
+inverse_map_t inverse_map;
+derived_map_t derived_map;
+
+
+#ifdef _MSC_VER
+#  pragma optimize( "", off )
+#endif
+
 void InitDescriptorMap() {
     IfcEntityDescriptor* current;
     current = entity_descriptor_map[Type::IfcAbsorbedDoseMeasure] = new IfcEntityDescriptor(Type::IfcAbsorbedDoseMeasure,0);
@@ -280,208 +294,208 @@ void InitDescriptorMap() {
     current->add("wrappedValue",false,IfcUtil::Argument_INT);
     current = entity_descriptor_map[Type::IfcActorRole] = new IfcEntityDescriptor(Type::IfcActorRole,0);
     current->add("Role",false,IfcUtil::Argument_ENUMERATION,Type::IfcRoleEnum);
-    current->add("UserDefinedRole",true,IfcUtil::Argument_STRING);
-    current->add("Description",true,IfcUtil::Argument_STRING);
+    current->add("UserDefinedRole",true,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("Description",true,IfcUtil::Argument_STRING,Type::IfcText);
     current = entity_descriptor_map[Type::IfcAddress] = new IfcEntityDescriptor(Type::IfcAddress,0);
     current->add("Purpose",true,IfcUtil::Argument_ENUMERATION,Type::IfcAddressTypeEnum);
-    current->add("Description",true,IfcUtil::Argument_STRING);
-    current->add("UserDefinedPurpose",true,IfcUtil::Argument_STRING);
+    current->add("Description",true,IfcUtil::Argument_STRING,Type::IfcText);
+    current->add("UserDefinedPurpose",true,IfcUtil::Argument_STRING,Type::IfcLabel);
     current = entity_descriptor_map[Type::IfcApplication] = new IfcEntityDescriptor(Type::IfcApplication,0);
-    current->add("ApplicationDeveloper",false,IfcUtil::Argument_ENTITY);
-    current->add("Version",false,IfcUtil::Argument_STRING);
-    current->add("ApplicationFullName",false,IfcUtil::Argument_STRING);
-    current->add("ApplicationIdentifier",false,IfcUtil::Argument_STRING);
+    current->add("ApplicationDeveloper",false,IfcUtil::Argument_ENTITY,Type::IfcOrganization);
+    current->add("Version",false,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("ApplicationFullName",false,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("ApplicationIdentifier",false,IfcUtil::Argument_STRING,Type::IfcIdentifier);
     current = entity_descriptor_map[Type::IfcAppliedValue] = new IfcEntityDescriptor(Type::IfcAppliedValue,0);
-    current->add("Name",true,IfcUtil::Argument_STRING);
-    current->add("Description",true,IfcUtil::Argument_STRING);
-    current->add("AppliedValue",true,IfcUtil::Argument_ENTITY);
-    current->add("UnitBasis",true,IfcUtil::Argument_ENTITY);
-    current->add("ApplicableDate",true,IfcUtil::Argument_ENTITY);
-    current->add("FixedUntilDate",true,IfcUtil::Argument_ENTITY);
+    current->add("Name",true,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("Description",true,IfcUtil::Argument_STRING,Type::IfcText);
+    current->add("AppliedValue",true,IfcUtil::Argument_ENTITY,Type::IfcAppliedValueSelect);
+    current->add("UnitBasis",true,IfcUtil::Argument_ENTITY,Type::IfcMeasureWithUnit);
+    current->add("ApplicableDate",true,IfcUtil::Argument_ENTITY,Type::IfcDateTimeSelect);
+    current->add("FixedUntilDate",true,IfcUtil::Argument_ENTITY,Type::IfcDateTimeSelect);
     current = entity_descriptor_map[Type::IfcAppliedValueRelationship] = new IfcEntityDescriptor(Type::IfcAppliedValueRelationship,0);
-    current->add("ComponentOfTotal",false,IfcUtil::Argument_ENTITY);
-    current->add("Components",false,IfcUtil::Argument_ENTITY_LIST);
+    current->add("ComponentOfTotal",false,IfcUtil::Argument_ENTITY,Type::IfcAppliedValue);
+    current->add("Components",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcAppliedValue);
     current->add("ArithmeticOperator",false,IfcUtil::Argument_ENUMERATION,Type::IfcArithmeticOperatorEnum);
-    current->add("Name",true,IfcUtil::Argument_STRING);
-    current->add("Description",true,IfcUtil::Argument_STRING);
+    current->add("Name",true,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("Description",true,IfcUtil::Argument_STRING,Type::IfcText);
     current = entity_descriptor_map[Type::IfcApproval] = new IfcEntityDescriptor(Type::IfcApproval,0);
-    current->add("Description",true,IfcUtil::Argument_STRING);
-    current->add("ApprovalDateTime",false,IfcUtil::Argument_ENTITY);
-    current->add("ApprovalStatus",true,IfcUtil::Argument_STRING);
-    current->add("ApprovalLevel",true,IfcUtil::Argument_STRING);
-    current->add("ApprovalQualifier",true,IfcUtil::Argument_STRING);
-    current->add("Name",false,IfcUtil::Argument_STRING);
-    current->add("Identifier",false,IfcUtil::Argument_STRING);
+    current->add("Description",true,IfcUtil::Argument_STRING,Type::IfcText);
+    current->add("ApprovalDateTime",false,IfcUtil::Argument_ENTITY,Type::IfcDateTimeSelect);
+    current->add("ApprovalStatus",true,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("ApprovalLevel",true,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("ApprovalQualifier",true,IfcUtil::Argument_STRING,Type::IfcText);
+    current->add("Name",false,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("Identifier",false,IfcUtil::Argument_STRING,Type::IfcIdentifier);
     current = entity_descriptor_map[Type::IfcApprovalActorRelationship] = new IfcEntityDescriptor(Type::IfcApprovalActorRelationship,0);
-    current->add("Actor",false,IfcUtil::Argument_ENTITY);
-    current->add("Approval",false,IfcUtil::Argument_ENTITY);
-    current->add("Role",false,IfcUtil::Argument_ENTITY);
+    current->add("Actor",false,IfcUtil::Argument_ENTITY,Type::IfcActorSelect);
+    current->add("Approval",false,IfcUtil::Argument_ENTITY,Type::IfcApproval);
+    current->add("Role",false,IfcUtil::Argument_ENTITY,Type::IfcActorRole);
     current = entity_descriptor_map[Type::IfcApprovalPropertyRelationship] = new IfcEntityDescriptor(Type::IfcApprovalPropertyRelationship,0);
-    current->add("ApprovedProperties",false,IfcUtil::Argument_ENTITY_LIST);
-    current->add("Approval",false,IfcUtil::Argument_ENTITY);
+    current->add("ApprovedProperties",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcProperty);
+    current->add("Approval",false,IfcUtil::Argument_ENTITY,Type::IfcApproval);
     current = entity_descriptor_map[Type::IfcApprovalRelationship] = new IfcEntityDescriptor(Type::IfcApprovalRelationship,0);
-    current->add("RelatedApproval",false,IfcUtil::Argument_ENTITY);
-    current->add("RelatingApproval",false,IfcUtil::Argument_ENTITY);
-    current->add("Description",true,IfcUtil::Argument_STRING);
-    current->add("Name",false,IfcUtil::Argument_STRING);
+    current->add("RelatedApproval",false,IfcUtil::Argument_ENTITY,Type::IfcApproval);
+    current->add("RelatingApproval",false,IfcUtil::Argument_ENTITY,Type::IfcApproval);
+    current->add("Description",true,IfcUtil::Argument_STRING,Type::IfcText);
+    current->add("Name",false,IfcUtil::Argument_STRING,Type::IfcLabel);
     current = entity_descriptor_map[Type::IfcBoundaryCondition] = new IfcEntityDescriptor(Type::IfcBoundaryCondition,0);
-    current->add("Name",true,IfcUtil::Argument_STRING);
+    current->add("Name",true,IfcUtil::Argument_STRING,Type::IfcLabel);
     current = entity_descriptor_map[Type::IfcBoundaryEdgeCondition] = new IfcEntityDescriptor(Type::IfcBoundaryEdgeCondition,entity_descriptor_map.find(Type::IfcBoundaryCondition)->second);
-    current->add("LinearStiffnessByLengthX",true,IfcUtil::Argument_DOUBLE);
-    current->add("LinearStiffnessByLengthY",true,IfcUtil::Argument_DOUBLE);
-    current->add("LinearStiffnessByLengthZ",true,IfcUtil::Argument_DOUBLE);
-    current->add("RotationalStiffnessByLengthX",true,IfcUtil::Argument_DOUBLE);
-    current->add("RotationalStiffnessByLengthY",true,IfcUtil::Argument_DOUBLE);
-    current->add("RotationalStiffnessByLengthZ",true,IfcUtil::Argument_DOUBLE);
+    current->add("LinearStiffnessByLengthX",true,IfcUtil::Argument_DOUBLE,Type::IfcModulusOfLinearSubgradeReactionMeasure);
+    current->add("LinearStiffnessByLengthY",true,IfcUtil::Argument_DOUBLE,Type::IfcModulusOfLinearSubgradeReactionMeasure);
+    current->add("LinearStiffnessByLengthZ",true,IfcUtil::Argument_DOUBLE,Type::IfcModulusOfLinearSubgradeReactionMeasure);
+    current->add("RotationalStiffnessByLengthX",true,IfcUtil::Argument_DOUBLE,Type::IfcModulusOfRotationalSubgradeReactionMeasure);
+    current->add("RotationalStiffnessByLengthY",true,IfcUtil::Argument_DOUBLE,Type::IfcModulusOfRotationalSubgradeReactionMeasure);
+    current->add("RotationalStiffnessByLengthZ",true,IfcUtil::Argument_DOUBLE,Type::IfcModulusOfRotationalSubgradeReactionMeasure);
     current = entity_descriptor_map[Type::IfcBoundaryFaceCondition] = new IfcEntityDescriptor(Type::IfcBoundaryFaceCondition,entity_descriptor_map.find(Type::IfcBoundaryCondition)->second);
-    current->add("LinearStiffnessByAreaX",true,IfcUtil::Argument_DOUBLE);
-    current->add("LinearStiffnessByAreaY",true,IfcUtil::Argument_DOUBLE);
-    current->add("LinearStiffnessByAreaZ",true,IfcUtil::Argument_DOUBLE);
+    current->add("LinearStiffnessByAreaX",true,IfcUtil::Argument_DOUBLE,Type::IfcModulusOfSubgradeReactionMeasure);
+    current->add("LinearStiffnessByAreaY",true,IfcUtil::Argument_DOUBLE,Type::IfcModulusOfSubgradeReactionMeasure);
+    current->add("LinearStiffnessByAreaZ",true,IfcUtil::Argument_DOUBLE,Type::IfcModulusOfSubgradeReactionMeasure);
     current = entity_descriptor_map[Type::IfcBoundaryNodeCondition] = new IfcEntityDescriptor(Type::IfcBoundaryNodeCondition,entity_descriptor_map.find(Type::IfcBoundaryCondition)->second);
-    current->add("LinearStiffnessX",true,IfcUtil::Argument_DOUBLE);
-    current->add("LinearStiffnessY",true,IfcUtil::Argument_DOUBLE);
-    current->add("LinearStiffnessZ",true,IfcUtil::Argument_DOUBLE);
-    current->add("RotationalStiffnessX",true,IfcUtil::Argument_DOUBLE);
-    current->add("RotationalStiffnessY",true,IfcUtil::Argument_DOUBLE);
-    current->add("RotationalStiffnessZ",true,IfcUtil::Argument_DOUBLE);
+    current->add("LinearStiffnessX",true,IfcUtil::Argument_DOUBLE,Type::IfcLinearStiffnessMeasure);
+    current->add("LinearStiffnessY",true,IfcUtil::Argument_DOUBLE,Type::IfcLinearStiffnessMeasure);
+    current->add("LinearStiffnessZ",true,IfcUtil::Argument_DOUBLE,Type::IfcLinearStiffnessMeasure);
+    current->add("RotationalStiffnessX",true,IfcUtil::Argument_DOUBLE,Type::IfcRotationalStiffnessMeasure);
+    current->add("RotationalStiffnessY",true,IfcUtil::Argument_DOUBLE,Type::IfcRotationalStiffnessMeasure);
+    current->add("RotationalStiffnessZ",true,IfcUtil::Argument_DOUBLE,Type::IfcRotationalStiffnessMeasure);
     current = entity_descriptor_map[Type::IfcBoundaryNodeConditionWarping] = new IfcEntityDescriptor(Type::IfcBoundaryNodeConditionWarping,entity_descriptor_map.find(Type::IfcBoundaryNodeCondition)->second);
-    current->add("WarpingStiffness",true,IfcUtil::Argument_DOUBLE);
+    current->add("WarpingStiffness",true,IfcUtil::Argument_DOUBLE,Type::IfcWarpingMomentMeasure);
     current = entity_descriptor_map[Type::IfcCalendarDate] = new IfcEntityDescriptor(Type::IfcCalendarDate,0);
-    current->add("DayComponent",false,IfcUtil::Argument_INT);
-    current->add("MonthComponent",false,IfcUtil::Argument_INT);
-    current->add("YearComponent",false,IfcUtil::Argument_INT);
+    current->add("DayComponent",false,IfcUtil::Argument_INT,Type::IfcDayInMonthNumber);
+    current->add("MonthComponent",false,IfcUtil::Argument_INT,Type::IfcMonthInYearNumber);
+    current->add("YearComponent",false,IfcUtil::Argument_INT,Type::IfcYearNumber);
     current = entity_descriptor_map[Type::IfcClassification] = new IfcEntityDescriptor(Type::IfcClassification,0);
-    current->add("Source",false,IfcUtil::Argument_STRING);
-    current->add("Edition",false,IfcUtil::Argument_STRING);
-    current->add("EditionDate",true,IfcUtil::Argument_ENTITY);
-    current->add("Name",false,IfcUtil::Argument_STRING);
+    current->add("Source",false,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("Edition",false,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("EditionDate",true,IfcUtil::Argument_ENTITY,Type::IfcCalendarDate);
+    current->add("Name",false,IfcUtil::Argument_STRING,Type::IfcLabel);
     current = entity_descriptor_map[Type::IfcClassificationItem] = new IfcEntityDescriptor(Type::IfcClassificationItem,0);
-    current->add("Notation",false,IfcUtil::Argument_ENTITY);
-    current->add("ItemOf",true,IfcUtil::Argument_ENTITY);
-    current->add("Title",false,IfcUtil::Argument_STRING);
+    current->add("Notation",false,IfcUtil::Argument_ENTITY,Type::IfcClassificationNotationFacet);
+    current->add("ItemOf",true,IfcUtil::Argument_ENTITY,Type::IfcClassification);
+    current->add("Title",false,IfcUtil::Argument_STRING,Type::IfcLabel);
     current = entity_descriptor_map[Type::IfcClassificationItemRelationship] = new IfcEntityDescriptor(Type::IfcClassificationItemRelationship,0);
-    current->add("RelatingItem",false,IfcUtil::Argument_ENTITY);
-    current->add("RelatedItems",false,IfcUtil::Argument_ENTITY_LIST);
+    current->add("RelatingItem",false,IfcUtil::Argument_ENTITY,Type::IfcClassificationItem);
+    current->add("RelatedItems",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcClassificationItem);
     current = entity_descriptor_map[Type::IfcClassificationNotation] = new IfcEntityDescriptor(Type::IfcClassificationNotation,0);
-    current->add("NotationFacets",false,IfcUtil::Argument_ENTITY_LIST);
+    current->add("NotationFacets",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcClassificationNotationFacet);
     current = entity_descriptor_map[Type::IfcClassificationNotationFacet] = new IfcEntityDescriptor(Type::IfcClassificationNotationFacet,0);
-    current->add("NotationValue",false,IfcUtil::Argument_STRING);
+    current->add("NotationValue",false,IfcUtil::Argument_STRING,Type::IfcLabel);
     current = entity_descriptor_map[Type::IfcColourSpecification] = new IfcEntityDescriptor(Type::IfcColourSpecification,0);
-    current->add("Name",true,IfcUtil::Argument_STRING);
+    current->add("Name",true,IfcUtil::Argument_STRING,Type::IfcLabel);
     current = entity_descriptor_map[Type::IfcConnectionGeometry] = new IfcEntityDescriptor(Type::IfcConnectionGeometry,0);
 
     current = entity_descriptor_map[Type::IfcConnectionPointGeometry] = new IfcEntityDescriptor(Type::IfcConnectionPointGeometry,entity_descriptor_map.find(Type::IfcConnectionGeometry)->second);
-    current->add("PointOnRelatingElement",false,IfcUtil::Argument_ENTITY);
-    current->add("PointOnRelatedElement",true,IfcUtil::Argument_ENTITY);
+    current->add("PointOnRelatingElement",false,IfcUtil::Argument_ENTITY,Type::IfcPointOrVertexPoint);
+    current->add("PointOnRelatedElement",true,IfcUtil::Argument_ENTITY,Type::IfcPointOrVertexPoint);
     current = entity_descriptor_map[Type::IfcConnectionPortGeometry] = new IfcEntityDescriptor(Type::IfcConnectionPortGeometry,entity_descriptor_map.find(Type::IfcConnectionGeometry)->second);
-    current->add("LocationAtRelatingElement",false,IfcUtil::Argument_ENTITY);
-    current->add("LocationAtRelatedElement",true,IfcUtil::Argument_ENTITY);
-    current->add("ProfileOfPort",false,IfcUtil::Argument_ENTITY);
+    current->add("LocationAtRelatingElement",false,IfcUtil::Argument_ENTITY,Type::IfcAxis2Placement);
+    current->add("LocationAtRelatedElement",true,IfcUtil::Argument_ENTITY,Type::IfcAxis2Placement);
+    current->add("ProfileOfPort",false,IfcUtil::Argument_ENTITY,Type::IfcProfileDef);
     current = entity_descriptor_map[Type::IfcConnectionSurfaceGeometry] = new IfcEntityDescriptor(Type::IfcConnectionSurfaceGeometry,entity_descriptor_map.find(Type::IfcConnectionGeometry)->second);
-    current->add("SurfaceOnRelatingElement",false,IfcUtil::Argument_ENTITY);
-    current->add("SurfaceOnRelatedElement",true,IfcUtil::Argument_ENTITY);
+    current->add("SurfaceOnRelatingElement",false,IfcUtil::Argument_ENTITY,Type::IfcSurfaceOrFaceSurface);
+    current->add("SurfaceOnRelatedElement",true,IfcUtil::Argument_ENTITY,Type::IfcSurfaceOrFaceSurface);
     current = entity_descriptor_map[Type::IfcConstraint] = new IfcEntityDescriptor(Type::IfcConstraint,0);
-    current->add("Name",false,IfcUtil::Argument_STRING);
-    current->add("Description",true,IfcUtil::Argument_STRING);
+    current->add("Name",false,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("Description",true,IfcUtil::Argument_STRING,Type::IfcText);
     current->add("ConstraintGrade",false,IfcUtil::Argument_ENUMERATION,Type::IfcConstraintEnum);
-    current->add("ConstraintSource",true,IfcUtil::Argument_STRING);
-    current->add("CreatingActor",true,IfcUtil::Argument_ENTITY);
-    current->add("CreationTime",true,IfcUtil::Argument_ENTITY);
-    current->add("UserDefinedGrade",true,IfcUtil::Argument_STRING);
+    current->add("ConstraintSource",true,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("CreatingActor",true,IfcUtil::Argument_ENTITY,Type::IfcActorSelect);
+    current->add("CreationTime",true,IfcUtil::Argument_ENTITY,Type::IfcDateTimeSelect);
+    current->add("UserDefinedGrade",true,IfcUtil::Argument_STRING,Type::IfcLabel);
     current = entity_descriptor_map[Type::IfcConstraintAggregationRelationship] = new IfcEntityDescriptor(Type::IfcConstraintAggregationRelationship,0);
-    current->add("Name",true,IfcUtil::Argument_STRING);
-    current->add("Description",true,IfcUtil::Argument_STRING);
-    current->add("RelatingConstraint",false,IfcUtil::Argument_ENTITY);
-    current->add("RelatedConstraints",false,IfcUtil::Argument_ENTITY_LIST);
+    current->add("Name",true,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("Description",true,IfcUtil::Argument_STRING,Type::IfcText);
+    current->add("RelatingConstraint",false,IfcUtil::Argument_ENTITY,Type::IfcConstraint);
+    current->add("RelatedConstraints",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcConstraint);
     current->add("LogicalAggregator",false,IfcUtil::Argument_ENUMERATION,Type::IfcLogicalOperatorEnum);
     current = entity_descriptor_map[Type::IfcConstraintClassificationRelationship] = new IfcEntityDescriptor(Type::IfcConstraintClassificationRelationship,0);
-    current->add("ClassifiedConstraint",false,IfcUtil::Argument_ENTITY);
-    current->add("RelatedClassifications",false,IfcUtil::Argument_ENTITY_LIST);
+    current->add("ClassifiedConstraint",false,IfcUtil::Argument_ENTITY,Type::IfcConstraint);
+    current->add("RelatedClassifications",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcClassificationNotationSelect);
     current = entity_descriptor_map[Type::IfcConstraintRelationship] = new IfcEntityDescriptor(Type::IfcConstraintRelationship,0);
-    current->add("Name",true,IfcUtil::Argument_STRING);
-    current->add("Description",true,IfcUtil::Argument_STRING);
-    current->add("RelatingConstraint",false,IfcUtil::Argument_ENTITY);
-    current->add("RelatedConstraints",false,IfcUtil::Argument_ENTITY_LIST);
+    current->add("Name",true,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("Description",true,IfcUtil::Argument_STRING,Type::IfcText);
+    current->add("RelatingConstraint",false,IfcUtil::Argument_ENTITY,Type::IfcConstraint);
+    current->add("RelatedConstraints",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcConstraint);
     current = entity_descriptor_map[Type::IfcCoordinatedUniversalTimeOffset] = new IfcEntityDescriptor(Type::IfcCoordinatedUniversalTimeOffset,0);
-    current->add("HourOffset",false,IfcUtil::Argument_INT);
-    current->add("MinuteOffset",true,IfcUtil::Argument_INT);
+    current->add("HourOffset",false,IfcUtil::Argument_INT,Type::IfcHourInDay);
+    current->add("MinuteOffset",true,IfcUtil::Argument_INT,Type::IfcMinuteInHour);
     current->add("Sense",false,IfcUtil::Argument_ENUMERATION,Type::IfcAheadOrBehind);
     current = entity_descriptor_map[Type::IfcCostValue] = new IfcEntityDescriptor(Type::IfcCostValue,entity_descriptor_map.find(Type::IfcAppliedValue)->second);
-    current->add("CostType",false,IfcUtil::Argument_STRING);
-    current->add("Condition",true,IfcUtil::Argument_STRING);
+    current->add("CostType",false,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("Condition",true,IfcUtil::Argument_STRING,Type::IfcText);
     current = entity_descriptor_map[Type::IfcCurrencyRelationship] = new IfcEntityDescriptor(Type::IfcCurrencyRelationship,0);
-    current->add("RelatingMonetaryUnit",false,IfcUtil::Argument_ENTITY);
-    current->add("RelatedMonetaryUnit",false,IfcUtil::Argument_ENTITY);
-    current->add("ExchangeRate",false,IfcUtil::Argument_DOUBLE);
-    current->add("RateDateTime",false,IfcUtil::Argument_ENTITY);
-    current->add("RateSource",true,IfcUtil::Argument_ENTITY);
+    current->add("RelatingMonetaryUnit",false,IfcUtil::Argument_ENTITY,Type::IfcMonetaryUnit);
+    current->add("RelatedMonetaryUnit",false,IfcUtil::Argument_ENTITY,Type::IfcMonetaryUnit);
+    current->add("ExchangeRate",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveRatioMeasure);
+    current->add("RateDateTime",false,IfcUtil::Argument_ENTITY,Type::IfcDateAndTime);
+    current->add("RateSource",true,IfcUtil::Argument_ENTITY,Type::IfcLibraryInformation);
     current = entity_descriptor_map[Type::IfcCurveStyleFont] = new IfcEntityDescriptor(Type::IfcCurveStyleFont,0);
-    current->add("Name",true,IfcUtil::Argument_STRING);
-    current->add("PatternList",false,IfcUtil::Argument_ENTITY_LIST);
+    current->add("Name",true,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("PatternList",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcCurveStyleFontPattern);
     current = entity_descriptor_map[Type::IfcCurveStyleFontAndScaling] = new IfcEntityDescriptor(Type::IfcCurveStyleFontAndScaling,0);
-    current->add("Name",true,IfcUtil::Argument_STRING);
-    current->add("CurveFont",false,IfcUtil::Argument_ENTITY);
-    current->add("CurveFontScaling",false,IfcUtil::Argument_DOUBLE);
+    current->add("Name",true,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("CurveFont",false,IfcUtil::Argument_ENTITY,Type::IfcCurveStyleFontSelect);
+    current->add("CurveFontScaling",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveRatioMeasure);
     current = entity_descriptor_map[Type::IfcCurveStyleFontPattern] = new IfcEntityDescriptor(Type::IfcCurveStyleFontPattern,0);
-    current->add("VisibleSegmentLength",false,IfcUtil::Argument_DOUBLE);
-    current->add("InvisibleSegmentLength",false,IfcUtil::Argument_DOUBLE);
+    current->add("VisibleSegmentLength",false,IfcUtil::Argument_DOUBLE,Type::IfcLengthMeasure);
+    current->add("InvisibleSegmentLength",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
     current = entity_descriptor_map[Type::IfcDateAndTime] = new IfcEntityDescriptor(Type::IfcDateAndTime,0);
-    current->add("DateComponent",false,IfcUtil::Argument_ENTITY);
-    current->add("TimeComponent",false,IfcUtil::Argument_ENTITY);
+    current->add("DateComponent",false,IfcUtil::Argument_ENTITY,Type::IfcCalendarDate);
+    current->add("TimeComponent",false,IfcUtil::Argument_ENTITY,Type::IfcLocalTime);
     current = entity_descriptor_map[Type::IfcDerivedUnit] = new IfcEntityDescriptor(Type::IfcDerivedUnit,0);
-    current->add("Elements",false,IfcUtil::Argument_ENTITY_LIST);
+    current->add("Elements",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcDerivedUnitElement);
     current->add("UnitType",false,IfcUtil::Argument_ENUMERATION,Type::IfcDerivedUnitEnum);
-    current->add("UserDefinedType",true,IfcUtil::Argument_STRING);
+    current->add("UserDefinedType",true,IfcUtil::Argument_STRING,Type::IfcLabel);
     current = entity_descriptor_map[Type::IfcDerivedUnitElement] = new IfcEntityDescriptor(Type::IfcDerivedUnitElement,0);
-    current->add("Unit",false,IfcUtil::Argument_ENTITY);
-    current->add("Exponent",false,IfcUtil::Argument_INT);
+    current->add("Unit",false,IfcUtil::Argument_ENTITY,Type::IfcNamedUnit);
+    current->add("Exponent",false,IfcUtil::Argument_INT,Type::UNDEFINED);
     current = entity_descriptor_map[Type::IfcDimensionalExponents] = new IfcEntityDescriptor(Type::IfcDimensionalExponents,0);
-    current->add("LengthExponent",false,IfcUtil::Argument_INT);
-    current->add("MassExponent",false,IfcUtil::Argument_INT);
-    current->add("TimeExponent",false,IfcUtil::Argument_INT);
-    current->add("ElectricCurrentExponent",false,IfcUtil::Argument_INT);
-    current->add("ThermodynamicTemperatureExponent",false,IfcUtil::Argument_INT);
-    current->add("AmountOfSubstanceExponent",false,IfcUtil::Argument_INT);
-    current->add("LuminousIntensityExponent",false,IfcUtil::Argument_INT);
+    current->add("LengthExponent",false,IfcUtil::Argument_INT,Type::UNDEFINED);
+    current->add("MassExponent",false,IfcUtil::Argument_INT,Type::UNDEFINED);
+    current->add("TimeExponent",false,IfcUtil::Argument_INT,Type::UNDEFINED);
+    current->add("ElectricCurrentExponent",false,IfcUtil::Argument_INT,Type::UNDEFINED);
+    current->add("ThermodynamicTemperatureExponent",false,IfcUtil::Argument_INT,Type::UNDEFINED);
+    current->add("AmountOfSubstanceExponent",false,IfcUtil::Argument_INT,Type::UNDEFINED);
+    current->add("LuminousIntensityExponent",false,IfcUtil::Argument_INT,Type::UNDEFINED);
     current = entity_descriptor_map[Type::IfcDocumentElectronicFormat] = new IfcEntityDescriptor(Type::IfcDocumentElectronicFormat,0);
-    current->add("FileExtension",true,IfcUtil::Argument_STRING);
-    current->add("MimeContentType",true,IfcUtil::Argument_STRING);
-    current->add("MimeSubtype",true,IfcUtil::Argument_STRING);
+    current->add("FileExtension",true,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("MimeContentType",true,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("MimeSubtype",true,IfcUtil::Argument_STRING,Type::IfcLabel);
     current = entity_descriptor_map[Type::IfcDocumentInformation] = new IfcEntityDescriptor(Type::IfcDocumentInformation,0);
-    current->add("DocumentId",false,IfcUtil::Argument_STRING);
-    current->add("Name",false,IfcUtil::Argument_STRING);
-    current->add("Description",true,IfcUtil::Argument_STRING);
-    current->add("DocumentReferences",true,IfcUtil::Argument_ENTITY_LIST);
-    current->add("Purpose",true,IfcUtil::Argument_STRING);
-    current->add("IntendedUse",true,IfcUtil::Argument_STRING);
-    current->add("Scope",true,IfcUtil::Argument_STRING);
-    current->add("Revision",true,IfcUtil::Argument_STRING);
-    current->add("DocumentOwner",true,IfcUtil::Argument_ENTITY);
-    current->add("Editors",true,IfcUtil::Argument_ENTITY_LIST);
-    current->add("CreationTime",true,IfcUtil::Argument_ENTITY);
-    current->add("LastRevisionTime",true,IfcUtil::Argument_ENTITY);
-    current->add("ElectronicFormat",true,IfcUtil::Argument_ENTITY);
-    current->add("ValidFrom",true,IfcUtil::Argument_ENTITY);
-    current->add("ValidUntil",true,IfcUtil::Argument_ENTITY);
+    current->add("DocumentId",false,IfcUtil::Argument_STRING,Type::IfcIdentifier);
+    current->add("Name",false,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("Description",true,IfcUtil::Argument_STRING,Type::IfcText);
+    current->add("DocumentReferences",true,IfcUtil::Argument_ENTITY_LIST,Type::IfcDocumentReference);
+    current->add("Purpose",true,IfcUtil::Argument_STRING,Type::IfcText);
+    current->add("IntendedUse",true,IfcUtil::Argument_STRING,Type::IfcText);
+    current->add("Scope",true,IfcUtil::Argument_STRING,Type::IfcText);
+    current->add("Revision",true,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("DocumentOwner",true,IfcUtil::Argument_ENTITY,Type::IfcActorSelect);
+    current->add("Editors",true,IfcUtil::Argument_ENTITY_LIST,Type::IfcActorSelect);
+    current->add("CreationTime",true,IfcUtil::Argument_ENTITY,Type::IfcDateAndTime);
+    current->add("LastRevisionTime",true,IfcUtil::Argument_ENTITY,Type::IfcDateAndTime);
+    current->add("ElectronicFormat",true,IfcUtil::Argument_ENTITY,Type::IfcDocumentElectronicFormat);
+    current->add("ValidFrom",true,IfcUtil::Argument_ENTITY,Type::IfcCalendarDate);
+    current->add("ValidUntil",true,IfcUtil::Argument_ENTITY,Type::IfcCalendarDate);
     current->add("Confidentiality",true,IfcUtil::Argument_ENUMERATION,Type::IfcDocumentConfidentialityEnum);
     current->add("Status",true,IfcUtil::Argument_ENUMERATION,Type::IfcDocumentStatusEnum);
     current = entity_descriptor_map[Type::IfcDocumentInformationRelationship] = new IfcEntityDescriptor(Type::IfcDocumentInformationRelationship,0);
-    current->add("RelatingDocument",false,IfcUtil::Argument_ENTITY);
-    current->add("RelatedDocuments",false,IfcUtil::Argument_ENTITY_LIST);
-    current->add("RelationshipType",true,IfcUtil::Argument_STRING);
+    current->add("RelatingDocument",false,IfcUtil::Argument_ENTITY,Type::IfcDocumentInformation);
+    current->add("RelatedDocuments",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcDocumentInformation);
+    current->add("RelationshipType",true,IfcUtil::Argument_STRING,Type::IfcLabel);
     current = entity_descriptor_map[Type::IfcDraughtingCalloutRelationship] = new IfcEntityDescriptor(Type::IfcDraughtingCalloutRelationship,0);
-    current->add("Name",true,IfcUtil::Argument_STRING);
-    current->add("Description",true,IfcUtil::Argument_STRING);
-    current->add("RelatingDraughtingCallout",false,IfcUtil::Argument_ENTITY);
-    current->add("RelatedDraughtingCallout",false,IfcUtil::Argument_ENTITY);
+    current->add("Name",true,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("Description",true,IfcUtil::Argument_STRING,Type::IfcText);
+    current->add("RelatingDraughtingCallout",false,IfcUtil::Argument_ENTITY,Type::IfcDraughtingCallout);
+    current->add("RelatedDraughtingCallout",false,IfcUtil::Argument_ENTITY,Type::IfcDraughtingCallout);
     current = entity_descriptor_map[Type::IfcEnvironmentalImpactValue] = new IfcEntityDescriptor(Type::IfcEnvironmentalImpactValue,entity_descriptor_map.find(Type::IfcAppliedValue)->second);
-    current->add("ImpactType",false,IfcUtil::Argument_STRING);
+    current->add("ImpactType",false,IfcUtil::Argument_STRING,Type::IfcLabel);
     current->add("Category",false,IfcUtil::Argument_ENUMERATION,Type::IfcEnvironmentalImpactCategoryEnum);
-    current->add("UserDefinedCategory",true,IfcUtil::Argument_STRING);
+    current->add("UserDefinedCategory",true,IfcUtil::Argument_STRING,Type::IfcLabel);
     current = entity_descriptor_map[Type::IfcExternalReference] = new IfcEntityDescriptor(Type::IfcExternalReference,0);
-    current->add("Location",true,IfcUtil::Argument_STRING);
-    current->add("ItemReference",true,IfcUtil::Argument_STRING);
-    current->add("Name",true,IfcUtil::Argument_STRING);
+    current->add("Location",true,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("ItemReference",true,IfcUtil::Argument_STRING,Type::IfcIdentifier);
+    current->add("Name",true,IfcUtil::Argument_STRING,Type::IfcLabel);
     current = entity_descriptor_map[Type::IfcExternallyDefinedHatchStyle] = new IfcEntityDescriptor(Type::IfcExternallyDefinedHatchStyle,entity_descriptor_map.find(Type::IfcExternalReference)->second);
 
     current = entity_descriptor_map[Type::IfcExternallyDefinedSurfaceStyle] = new IfcEntityDescriptor(Type::IfcExternallyDefinedSurfaceStyle,entity_descriptor_map.find(Type::IfcExternalReference)->second);
@@ -491,145 +505,145 @@ void InitDescriptorMap() {
     current = entity_descriptor_map[Type::IfcExternallyDefinedTextFont] = new IfcEntityDescriptor(Type::IfcExternallyDefinedTextFont,entity_descriptor_map.find(Type::IfcExternalReference)->second);
 
     current = entity_descriptor_map[Type::IfcGridAxis] = new IfcEntityDescriptor(Type::IfcGridAxis,0);
-    current->add("AxisTag",true,IfcUtil::Argument_STRING);
-    current->add("AxisCurve",false,IfcUtil::Argument_ENTITY);
-    current->add("SameSense",false,IfcUtil::Argument_BOOL);
+    current->add("AxisTag",true,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("AxisCurve",false,IfcUtil::Argument_ENTITY,Type::IfcCurve);
+    current->add("SameSense",false,IfcUtil::Argument_BOOL,Type::IfcBoolean);
     current = entity_descriptor_map[Type::IfcIrregularTimeSeriesValue] = new IfcEntityDescriptor(Type::IfcIrregularTimeSeriesValue,0);
-    current->add("TimeStamp",false,IfcUtil::Argument_ENTITY);
-    current->add("ListValues",false,IfcUtil::Argument_ENTITY_LIST);
+    current->add("TimeStamp",false,IfcUtil::Argument_ENTITY,Type::IfcDateTimeSelect);
+    current->add("ListValues",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcValue);
     current = entity_descriptor_map[Type::IfcLibraryInformation] = new IfcEntityDescriptor(Type::IfcLibraryInformation,0);
-    current->add("Name",false,IfcUtil::Argument_STRING);
-    current->add("Version",true,IfcUtil::Argument_STRING);
-    current->add("Publisher",true,IfcUtil::Argument_ENTITY);
-    current->add("VersionDate",true,IfcUtil::Argument_ENTITY);
-    current->add("LibraryReference",true,IfcUtil::Argument_ENTITY_LIST);
+    current->add("Name",false,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("Version",true,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("Publisher",true,IfcUtil::Argument_ENTITY,Type::IfcOrganization);
+    current->add("VersionDate",true,IfcUtil::Argument_ENTITY,Type::IfcCalendarDate);
+    current->add("LibraryReference",true,IfcUtil::Argument_ENTITY_LIST,Type::IfcLibraryReference);
     current = entity_descriptor_map[Type::IfcLibraryReference] = new IfcEntityDescriptor(Type::IfcLibraryReference,entity_descriptor_map.find(Type::IfcExternalReference)->second);
 
     current = entity_descriptor_map[Type::IfcLightDistributionData] = new IfcEntityDescriptor(Type::IfcLightDistributionData,0);
-    current->add("MainPlaneAngle",false,IfcUtil::Argument_DOUBLE);
-    current->add("SecondaryPlaneAngle",false,IfcUtil::Argument_VECTOR_DOUBLE);
-    current->add("LuminousIntensity",false,IfcUtil::Argument_VECTOR_DOUBLE);
+    current->add("MainPlaneAngle",false,IfcUtil::Argument_DOUBLE,Type::IfcPlaneAngleMeasure);
+    current->add("SecondaryPlaneAngle",false,IfcUtil::Argument_VECTOR_DOUBLE,Type::IfcPlaneAngleMeasure);
+    current->add("LuminousIntensity",false,IfcUtil::Argument_VECTOR_DOUBLE,Type::IfcLuminousIntensityDistributionMeasure);
     current = entity_descriptor_map[Type::IfcLightIntensityDistribution] = new IfcEntityDescriptor(Type::IfcLightIntensityDistribution,0);
     current->add("LightDistributionCurve",false,IfcUtil::Argument_ENUMERATION,Type::IfcLightDistributionCurveEnum);
-    current->add("DistributionData",false,IfcUtil::Argument_ENTITY_LIST);
+    current->add("DistributionData",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcLightDistributionData);
     current = entity_descriptor_map[Type::IfcLocalTime] = new IfcEntityDescriptor(Type::IfcLocalTime,0);
-    current->add("HourComponent",false,IfcUtil::Argument_INT);
-    current->add("MinuteComponent",true,IfcUtil::Argument_INT);
-    current->add("SecondComponent",true,IfcUtil::Argument_DOUBLE);
-    current->add("Zone",true,IfcUtil::Argument_ENTITY);
-    current->add("DaylightSavingOffset",true,IfcUtil::Argument_INT);
+    current->add("HourComponent",false,IfcUtil::Argument_INT,Type::IfcHourInDay);
+    current->add("MinuteComponent",true,IfcUtil::Argument_INT,Type::IfcMinuteInHour);
+    current->add("SecondComponent",true,IfcUtil::Argument_DOUBLE,Type::IfcSecondInMinute);
+    current->add("Zone",true,IfcUtil::Argument_ENTITY,Type::IfcCoordinatedUniversalTimeOffset);
+    current->add("DaylightSavingOffset",true,IfcUtil::Argument_INT,Type::IfcDaylightSavingHour);
     current = entity_descriptor_map[Type::IfcMaterial] = new IfcEntityDescriptor(Type::IfcMaterial,0);
-    current->add("Name",false,IfcUtil::Argument_STRING);
+    current->add("Name",false,IfcUtil::Argument_STRING,Type::IfcLabel);
     current = entity_descriptor_map[Type::IfcMaterialClassificationRelationship] = new IfcEntityDescriptor(Type::IfcMaterialClassificationRelationship,0);
-    current->add("MaterialClassifications",false,IfcUtil::Argument_ENTITY_LIST);
-    current->add("ClassifiedMaterial",false,IfcUtil::Argument_ENTITY);
+    current->add("MaterialClassifications",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcClassificationNotationSelect);
+    current->add("ClassifiedMaterial",false,IfcUtil::Argument_ENTITY,Type::IfcMaterial);
     current = entity_descriptor_map[Type::IfcMaterialLayer] = new IfcEntityDescriptor(Type::IfcMaterialLayer,0);
-    current->add("Material",true,IfcUtil::Argument_ENTITY);
-    current->add("LayerThickness",false,IfcUtil::Argument_DOUBLE);
-    current->add("IsVentilated",true,IfcUtil::Argument_BOOL);
+    current->add("Material",true,IfcUtil::Argument_ENTITY,Type::IfcMaterial);
+    current->add("LayerThickness",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("IsVentilated",true,IfcUtil::Argument_BOOL,Type::IfcLogical);
     current = entity_descriptor_map[Type::IfcMaterialLayerSet] = new IfcEntityDescriptor(Type::IfcMaterialLayerSet,0);
-    current->add("MaterialLayers",false,IfcUtil::Argument_ENTITY_LIST);
-    current->add("LayerSetName",true,IfcUtil::Argument_STRING);
+    current->add("MaterialLayers",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcMaterialLayer);
+    current->add("LayerSetName",true,IfcUtil::Argument_STRING,Type::IfcLabel);
     current = entity_descriptor_map[Type::IfcMaterialLayerSetUsage] = new IfcEntityDescriptor(Type::IfcMaterialLayerSetUsage,0);
-    current->add("ForLayerSet",false,IfcUtil::Argument_ENTITY);
+    current->add("ForLayerSet",false,IfcUtil::Argument_ENTITY,Type::IfcMaterialLayerSet);
     current->add("LayerSetDirection",false,IfcUtil::Argument_ENUMERATION,Type::IfcLayerSetDirectionEnum);
     current->add("DirectionSense",false,IfcUtil::Argument_ENUMERATION,Type::IfcDirectionSenseEnum);
-    current->add("OffsetFromReferenceLine",false,IfcUtil::Argument_DOUBLE);
+    current->add("OffsetFromReferenceLine",false,IfcUtil::Argument_DOUBLE,Type::IfcLengthMeasure);
     current = entity_descriptor_map[Type::IfcMaterialList] = new IfcEntityDescriptor(Type::IfcMaterialList,0);
-    current->add("Materials",false,IfcUtil::Argument_ENTITY_LIST);
+    current->add("Materials",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcMaterial);
     current = entity_descriptor_map[Type::IfcMaterialProperties] = new IfcEntityDescriptor(Type::IfcMaterialProperties,0);
-    current->add("Material",false,IfcUtil::Argument_ENTITY);
+    current->add("Material",false,IfcUtil::Argument_ENTITY,Type::IfcMaterial);
     current = entity_descriptor_map[Type::IfcMeasureWithUnit] = new IfcEntityDescriptor(Type::IfcMeasureWithUnit,0);
-    current->add("ValueComponent",false,IfcUtil::Argument_ENTITY);
-    current->add("UnitComponent",false,IfcUtil::Argument_ENTITY);
+    current->add("ValueComponent",false,IfcUtil::Argument_ENTITY,Type::IfcValue);
+    current->add("UnitComponent",false,IfcUtil::Argument_ENTITY,Type::IfcUnit);
     current = entity_descriptor_map[Type::IfcMechanicalMaterialProperties] = new IfcEntityDescriptor(Type::IfcMechanicalMaterialProperties,entity_descriptor_map.find(Type::IfcMaterialProperties)->second);
-    current->add("DynamicViscosity",true,IfcUtil::Argument_DOUBLE);
-    current->add("YoungModulus",true,IfcUtil::Argument_DOUBLE);
-    current->add("ShearModulus",true,IfcUtil::Argument_DOUBLE);
-    current->add("PoissonRatio",true,IfcUtil::Argument_DOUBLE);
-    current->add("ThermalExpansionCoefficient",true,IfcUtil::Argument_DOUBLE);
+    current->add("DynamicViscosity",true,IfcUtil::Argument_DOUBLE,Type::IfcDynamicViscosityMeasure);
+    current->add("YoungModulus",true,IfcUtil::Argument_DOUBLE,Type::IfcModulusOfElasticityMeasure);
+    current->add("ShearModulus",true,IfcUtil::Argument_DOUBLE,Type::IfcModulusOfElasticityMeasure);
+    current->add("PoissonRatio",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveRatioMeasure);
+    current->add("ThermalExpansionCoefficient",true,IfcUtil::Argument_DOUBLE,Type::IfcThermalExpansionCoefficientMeasure);
     current = entity_descriptor_map[Type::IfcMechanicalSteelMaterialProperties] = new IfcEntityDescriptor(Type::IfcMechanicalSteelMaterialProperties,entity_descriptor_map.find(Type::IfcMechanicalMaterialProperties)->second);
-    current->add("YieldStress",true,IfcUtil::Argument_DOUBLE);
-    current->add("UltimateStress",true,IfcUtil::Argument_DOUBLE);
-    current->add("UltimateStrain",true,IfcUtil::Argument_DOUBLE);
-    current->add("HardeningModule",true,IfcUtil::Argument_DOUBLE);
-    current->add("ProportionalStress",true,IfcUtil::Argument_DOUBLE);
-    current->add("PlasticStrain",true,IfcUtil::Argument_DOUBLE);
-    current->add("Relaxations",true,IfcUtil::Argument_ENTITY_LIST);
+    current->add("YieldStress",true,IfcUtil::Argument_DOUBLE,Type::IfcPressureMeasure);
+    current->add("UltimateStress",true,IfcUtil::Argument_DOUBLE,Type::IfcPressureMeasure);
+    current->add("UltimateStrain",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveRatioMeasure);
+    current->add("HardeningModule",true,IfcUtil::Argument_DOUBLE,Type::IfcModulusOfElasticityMeasure);
+    current->add("ProportionalStress",true,IfcUtil::Argument_DOUBLE,Type::IfcPressureMeasure);
+    current->add("PlasticStrain",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveRatioMeasure);
+    current->add("Relaxations",true,IfcUtil::Argument_ENTITY_LIST,Type::IfcRelaxation);
     current = entity_descriptor_map[Type::IfcMetric] = new IfcEntityDescriptor(Type::IfcMetric,entity_descriptor_map.find(Type::IfcConstraint)->second);
     current->add("Benchmark",false,IfcUtil::Argument_ENUMERATION,Type::IfcBenchmarkEnum);
-    current->add("ValueSource",true,IfcUtil::Argument_STRING);
-    current->add("DataValue",false,IfcUtil::Argument_ENTITY);
+    current->add("ValueSource",true,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("DataValue",false,IfcUtil::Argument_ENTITY,Type::IfcMetricValueSelect);
     current = entity_descriptor_map[Type::IfcMonetaryUnit] = new IfcEntityDescriptor(Type::IfcMonetaryUnit,0);
     current->add("Currency",false,IfcUtil::Argument_ENUMERATION,Type::IfcCurrencyEnum);
     current = entity_descriptor_map[Type::IfcNamedUnit] = new IfcEntityDescriptor(Type::IfcNamedUnit,0);
-    current->add("Dimensions",false,IfcUtil::Argument_ENTITY);
+    current->add("Dimensions",false,IfcUtil::Argument_ENTITY,Type::IfcDimensionalExponents);
     current->add("UnitType",false,IfcUtil::Argument_ENUMERATION,Type::IfcUnitEnum);
     current = entity_descriptor_map[Type::IfcObjectPlacement] = new IfcEntityDescriptor(Type::IfcObjectPlacement,0);
 
     current = entity_descriptor_map[Type::IfcObjective] = new IfcEntityDescriptor(Type::IfcObjective,entity_descriptor_map.find(Type::IfcConstraint)->second);
-    current->add("BenchmarkValues",true,IfcUtil::Argument_ENTITY);
-    current->add("ResultValues",true,IfcUtil::Argument_ENTITY);
+    current->add("BenchmarkValues",true,IfcUtil::Argument_ENTITY,Type::IfcMetric);
+    current->add("ResultValues",true,IfcUtil::Argument_ENTITY,Type::IfcMetric);
     current->add("ObjectiveQualifier",false,IfcUtil::Argument_ENUMERATION,Type::IfcObjectiveEnum);
-    current->add("UserDefinedQualifier",true,IfcUtil::Argument_STRING);
+    current->add("UserDefinedQualifier",true,IfcUtil::Argument_STRING,Type::IfcLabel);
     current = entity_descriptor_map[Type::IfcOpticalMaterialProperties] = new IfcEntityDescriptor(Type::IfcOpticalMaterialProperties,entity_descriptor_map.find(Type::IfcMaterialProperties)->second);
-    current->add("VisibleTransmittance",true,IfcUtil::Argument_DOUBLE);
-    current->add("SolarTransmittance",true,IfcUtil::Argument_DOUBLE);
-    current->add("ThermalIrTransmittance",true,IfcUtil::Argument_DOUBLE);
-    current->add("ThermalIrEmissivityBack",true,IfcUtil::Argument_DOUBLE);
-    current->add("ThermalIrEmissivityFront",true,IfcUtil::Argument_DOUBLE);
-    current->add("VisibleReflectanceBack",true,IfcUtil::Argument_DOUBLE);
-    current->add("VisibleReflectanceFront",true,IfcUtil::Argument_DOUBLE);
-    current->add("SolarReflectanceFront",true,IfcUtil::Argument_DOUBLE);
-    current->add("SolarReflectanceBack",true,IfcUtil::Argument_DOUBLE);
+    current->add("VisibleTransmittance",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveRatioMeasure);
+    current->add("SolarTransmittance",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveRatioMeasure);
+    current->add("ThermalIrTransmittance",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveRatioMeasure);
+    current->add("ThermalIrEmissivityBack",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveRatioMeasure);
+    current->add("ThermalIrEmissivityFront",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveRatioMeasure);
+    current->add("VisibleReflectanceBack",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveRatioMeasure);
+    current->add("VisibleReflectanceFront",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveRatioMeasure);
+    current->add("SolarReflectanceFront",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveRatioMeasure);
+    current->add("SolarReflectanceBack",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveRatioMeasure);
     current = entity_descriptor_map[Type::IfcOrganization] = new IfcEntityDescriptor(Type::IfcOrganization,0);
-    current->add("Id",true,IfcUtil::Argument_STRING);
-    current->add("Name",false,IfcUtil::Argument_STRING);
-    current->add("Description",true,IfcUtil::Argument_STRING);
-    current->add("Roles",true,IfcUtil::Argument_ENTITY_LIST);
-    current->add("Addresses",true,IfcUtil::Argument_ENTITY_LIST);
+    current->add("Id",true,IfcUtil::Argument_STRING,Type::IfcIdentifier);
+    current->add("Name",false,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("Description",true,IfcUtil::Argument_STRING,Type::IfcText);
+    current->add("Roles",true,IfcUtil::Argument_ENTITY_LIST,Type::IfcActorRole);
+    current->add("Addresses",true,IfcUtil::Argument_ENTITY_LIST,Type::IfcAddress);
     current = entity_descriptor_map[Type::IfcOrganizationRelationship] = new IfcEntityDescriptor(Type::IfcOrganizationRelationship,0);
-    current->add("Name",false,IfcUtil::Argument_STRING);
-    current->add("Description",true,IfcUtil::Argument_STRING);
-    current->add("RelatingOrganization",false,IfcUtil::Argument_ENTITY);
-    current->add("RelatedOrganizations",false,IfcUtil::Argument_ENTITY_LIST);
+    current->add("Name",false,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("Description",true,IfcUtil::Argument_STRING,Type::IfcText);
+    current->add("RelatingOrganization",false,IfcUtil::Argument_ENTITY,Type::IfcOrganization);
+    current->add("RelatedOrganizations",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcOrganization);
     current = entity_descriptor_map[Type::IfcOwnerHistory] = new IfcEntityDescriptor(Type::IfcOwnerHistory,0);
-    current->add("OwningUser",false,IfcUtil::Argument_ENTITY);
-    current->add("OwningApplication",false,IfcUtil::Argument_ENTITY);
+    current->add("OwningUser",false,IfcUtil::Argument_ENTITY,Type::IfcPersonAndOrganization);
+    current->add("OwningApplication",false,IfcUtil::Argument_ENTITY,Type::IfcApplication);
     current->add("State",true,IfcUtil::Argument_ENUMERATION,Type::IfcStateEnum);
     current->add("ChangeAction",false,IfcUtil::Argument_ENUMERATION,Type::IfcChangeActionEnum);
-    current->add("LastModifiedDate",true,IfcUtil::Argument_INT);
-    current->add("LastModifyingUser",true,IfcUtil::Argument_ENTITY);
-    current->add("LastModifyingApplication",true,IfcUtil::Argument_ENTITY);
-    current->add("CreationDate",false,IfcUtil::Argument_INT);
+    current->add("LastModifiedDate",true,IfcUtil::Argument_INT,Type::IfcTimeStamp);
+    current->add("LastModifyingUser",true,IfcUtil::Argument_ENTITY,Type::IfcPersonAndOrganization);
+    current->add("LastModifyingApplication",true,IfcUtil::Argument_ENTITY,Type::IfcApplication);
+    current->add("CreationDate",false,IfcUtil::Argument_INT,Type::IfcTimeStamp);
     current = entity_descriptor_map[Type::IfcPerson] = new IfcEntityDescriptor(Type::IfcPerson,0);
-    current->add("Id",true,IfcUtil::Argument_STRING);
-    current->add("FamilyName",true,IfcUtil::Argument_STRING);
-    current->add("GivenName",true,IfcUtil::Argument_STRING);
-    current->add("MiddleNames",true,IfcUtil::Argument_VECTOR_STRING);
-    current->add("PrefixTitles",true,IfcUtil::Argument_VECTOR_STRING);
-    current->add("SuffixTitles",true,IfcUtil::Argument_VECTOR_STRING);
-    current->add("Roles",true,IfcUtil::Argument_ENTITY_LIST);
-    current->add("Addresses",true,IfcUtil::Argument_ENTITY_LIST);
+    current->add("Id",true,IfcUtil::Argument_STRING,Type::IfcIdentifier);
+    current->add("FamilyName",true,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("GivenName",true,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("MiddleNames",true,IfcUtil::Argument_VECTOR_STRING,Type::IfcLabel);
+    current->add("PrefixTitles",true,IfcUtil::Argument_VECTOR_STRING,Type::IfcLabel);
+    current->add("SuffixTitles",true,IfcUtil::Argument_VECTOR_STRING,Type::IfcLabel);
+    current->add("Roles",true,IfcUtil::Argument_ENTITY_LIST,Type::IfcActorRole);
+    current->add("Addresses",true,IfcUtil::Argument_ENTITY_LIST,Type::IfcAddress);
     current = entity_descriptor_map[Type::IfcPersonAndOrganization] = new IfcEntityDescriptor(Type::IfcPersonAndOrganization,0);
-    current->add("ThePerson",false,IfcUtil::Argument_ENTITY);
-    current->add("TheOrganization",false,IfcUtil::Argument_ENTITY);
-    current->add("Roles",true,IfcUtil::Argument_ENTITY_LIST);
+    current->add("ThePerson",false,IfcUtil::Argument_ENTITY,Type::IfcPerson);
+    current->add("TheOrganization",false,IfcUtil::Argument_ENTITY,Type::IfcOrganization);
+    current->add("Roles",true,IfcUtil::Argument_ENTITY_LIST,Type::IfcActorRole);
     current = entity_descriptor_map[Type::IfcPhysicalQuantity] = new IfcEntityDescriptor(Type::IfcPhysicalQuantity,0);
-    current->add("Name",false,IfcUtil::Argument_STRING);
-    current->add("Description",true,IfcUtil::Argument_STRING);
+    current->add("Name",false,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("Description",true,IfcUtil::Argument_STRING,Type::IfcText);
     current = entity_descriptor_map[Type::IfcPhysicalSimpleQuantity] = new IfcEntityDescriptor(Type::IfcPhysicalSimpleQuantity,entity_descriptor_map.find(Type::IfcPhysicalQuantity)->second);
-    current->add("Unit",true,IfcUtil::Argument_ENTITY);
+    current->add("Unit",true,IfcUtil::Argument_ENTITY,Type::IfcNamedUnit);
     current = entity_descriptor_map[Type::IfcPostalAddress] = new IfcEntityDescriptor(Type::IfcPostalAddress,entity_descriptor_map.find(Type::IfcAddress)->second);
-    current->add("InternalLocation",true,IfcUtil::Argument_STRING);
-    current->add("AddressLines",true,IfcUtil::Argument_VECTOR_STRING);
-    current->add("PostalBox",true,IfcUtil::Argument_STRING);
-    current->add("Town",true,IfcUtil::Argument_STRING);
-    current->add("Region",true,IfcUtil::Argument_STRING);
-    current->add("PostalCode",true,IfcUtil::Argument_STRING);
-    current->add("Country",true,IfcUtil::Argument_STRING);
+    current->add("InternalLocation",true,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("AddressLines",true,IfcUtil::Argument_VECTOR_STRING,Type::IfcLabel);
+    current->add("PostalBox",true,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("Town",true,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("Region",true,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("PostalCode",true,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("Country",true,IfcUtil::Argument_STRING,Type::IfcLabel);
     current = entity_descriptor_map[Type::IfcPreDefinedItem] = new IfcEntityDescriptor(Type::IfcPreDefinedItem,0);
-    current->add("Name",false,IfcUtil::Argument_STRING);
+    current->add("Name",false,IfcUtil::Argument_STRING,Type::IfcLabel);
     current = entity_descriptor_map[Type::IfcPreDefinedSymbol] = new IfcEntityDescriptor(Type::IfcPreDefinedSymbol,entity_descriptor_map.find(Type::IfcPreDefinedItem)->second);
 
     current = entity_descriptor_map[Type::IfcPreDefinedTerminatorSymbol] = new IfcEntityDescriptor(Type::IfcPreDefinedTerminatorSymbol,entity_descriptor_map.find(Type::IfcPreDefinedSymbol)->second);
@@ -637,123 +651,123 @@ void InitDescriptorMap() {
     current = entity_descriptor_map[Type::IfcPreDefinedTextFont] = new IfcEntityDescriptor(Type::IfcPreDefinedTextFont,entity_descriptor_map.find(Type::IfcPreDefinedItem)->second);
 
     current = entity_descriptor_map[Type::IfcPresentationLayerAssignment] = new IfcEntityDescriptor(Type::IfcPresentationLayerAssignment,0);
-    current->add("Name",false,IfcUtil::Argument_STRING);
-    current->add("Description",true,IfcUtil::Argument_STRING);
-    current->add("AssignedItems",false,IfcUtil::Argument_ENTITY_LIST);
-    current->add("Identifier",true,IfcUtil::Argument_STRING);
+    current->add("Name",false,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("Description",true,IfcUtil::Argument_STRING,Type::IfcText);
+    current->add("AssignedItems",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcLayeredItem);
+    current->add("Identifier",true,IfcUtil::Argument_STRING,Type::IfcIdentifier);
     current = entity_descriptor_map[Type::IfcPresentationLayerWithStyle] = new IfcEntityDescriptor(Type::IfcPresentationLayerWithStyle,entity_descriptor_map.find(Type::IfcPresentationLayerAssignment)->second);
-    current->add("LayerOn",false,IfcUtil::Argument_BOOL);
-    current->add("LayerFrozen",false,IfcUtil::Argument_BOOL);
-    current->add("LayerBlocked",false,IfcUtil::Argument_BOOL);
-    current->add("LayerStyles",false,IfcUtil::Argument_ENTITY_LIST);
+    current->add("LayerOn",false,IfcUtil::Argument_BOOL,Type::UNDEFINED);
+    current->add("LayerFrozen",false,IfcUtil::Argument_BOOL,Type::UNDEFINED);
+    current->add("LayerBlocked",false,IfcUtil::Argument_BOOL,Type::UNDEFINED);
+    current->add("LayerStyles",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcPresentationStyleSelect);
     current = entity_descriptor_map[Type::IfcPresentationStyle] = new IfcEntityDescriptor(Type::IfcPresentationStyle,0);
-    current->add("Name",true,IfcUtil::Argument_STRING);
+    current->add("Name",true,IfcUtil::Argument_STRING,Type::IfcLabel);
     current = entity_descriptor_map[Type::IfcPresentationStyleAssignment] = new IfcEntityDescriptor(Type::IfcPresentationStyleAssignment,0);
-    current->add("Styles",false,IfcUtil::Argument_ENTITY_LIST);
+    current->add("Styles",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcPresentationStyleSelect);
     current = entity_descriptor_map[Type::IfcProductRepresentation] = new IfcEntityDescriptor(Type::IfcProductRepresentation,0);
-    current->add("Name",true,IfcUtil::Argument_STRING);
-    current->add("Description",true,IfcUtil::Argument_STRING);
-    current->add("Representations",false,IfcUtil::Argument_ENTITY_LIST);
+    current->add("Name",true,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("Description",true,IfcUtil::Argument_STRING,Type::IfcText);
+    current->add("Representations",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcRepresentation);
     current = entity_descriptor_map[Type::IfcProductsOfCombustionProperties] = new IfcEntityDescriptor(Type::IfcProductsOfCombustionProperties,entity_descriptor_map.find(Type::IfcMaterialProperties)->second);
-    current->add("SpecificHeatCapacity",true,IfcUtil::Argument_DOUBLE);
-    current->add("N20Content",true,IfcUtil::Argument_DOUBLE);
-    current->add("COContent",true,IfcUtil::Argument_DOUBLE);
-    current->add("CO2Content",true,IfcUtil::Argument_DOUBLE);
+    current->add("SpecificHeatCapacity",true,IfcUtil::Argument_DOUBLE,Type::IfcSpecificHeatCapacityMeasure);
+    current->add("N20Content",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveRatioMeasure);
+    current->add("COContent",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveRatioMeasure);
+    current->add("CO2Content",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveRatioMeasure);
     current = entity_descriptor_map[Type::IfcProfileDef] = new IfcEntityDescriptor(Type::IfcProfileDef,0);
     current->add("ProfileType",false,IfcUtil::Argument_ENUMERATION,Type::IfcProfileTypeEnum);
-    current->add("ProfileName",true,IfcUtil::Argument_STRING);
+    current->add("ProfileName",true,IfcUtil::Argument_STRING,Type::IfcLabel);
     current = entity_descriptor_map[Type::IfcProfileProperties] = new IfcEntityDescriptor(Type::IfcProfileProperties,0);
-    current->add("ProfileName",true,IfcUtil::Argument_STRING);
-    current->add("ProfileDefinition",true,IfcUtil::Argument_ENTITY);
+    current->add("ProfileName",true,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("ProfileDefinition",true,IfcUtil::Argument_ENTITY,Type::IfcProfileDef);
     current = entity_descriptor_map[Type::IfcProperty] = new IfcEntityDescriptor(Type::IfcProperty,0);
-    current->add("Name",false,IfcUtil::Argument_STRING);
-    current->add("Description",true,IfcUtil::Argument_STRING);
+    current->add("Name",false,IfcUtil::Argument_STRING,Type::IfcIdentifier);
+    current->add("Description",true,IfcUtil::Argument_STRING,Type::IfcText);
     current = entity_descriptor_map[Type::IfcPropertyConstraintRelationship] = new IfcEntityDescriptor(Type::IfcPropertyConstraintRelationship,0);
-    current->add("RelatingConstraint",false,IfcUtil::Argument_ENTITY);
-    current->add("RelatedProperties",false,IfcUtil::Argument_ENTITY_LIST);
-    current->add("Name",true,IfcUtil::Argument_STRING);
-    current->add("Description",true,IfcUtil::Argument_STRING);
+    current->add("RelatingConstraint",false,IfcUtil::Argument_ENTITY,Type::IfcConstraint);
+    current->add("RelatedProperties",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcProperty);
+    current->add("Name",true,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("Description",true,IfcUtil::Argument_STRING,Type::IfcText);
     current = entity_descriptor_map[Type::IfcPropertyDependencyRelationship] = new IfcEntityDescriptor(Type::IfcPropertyDependencyRelationship,0);
-    current->add("DependingProperty",false,IfcUtil::Argument_ENTITY);
-    current->add("DependantProperty",false,IfcUtil::Argument_ENTITY);
-    current->add("Name",true,IfcUtil::Argument_STRING);
-    current->add("Description",true,IfcUtil::Argument_STRING);
-    current->add("Expression",true,IfcUtil::Argument_STRING);
+    current->add("DependingProperty",false,IfcUtil::Argument_ENTITY,Type::IfcProperty);
+    current->add("DependantProperty",false,IfcUtil::Argument_ENTITY,Type::IfcProperty);
+    current->add("Name",true,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("Description",true,IfcUtil::Argument_STRING,Type::IfcText);
+    current->add("Expression",true,IfcUtil::Argument_STRING,Type::IfcText);
     current = entity_descriptor_map[Type::IfcPropertyEnumeration] = new IfcEntityDescriptor(Type::IfcPropertyEnumeration,0);
-    current->add("Name",false,IfcUtil::Argument_STRING);
-    current->add("EnumerationValues",false,IfcUtil::Argument_ENTITY_LIST);
-    current->add("Unit",true,IfcUtil::Argument_ENTITY);
+    current->add("Name",false,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("EnumerationValues",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcValue);
+    current->add("Unit",true,IfcUtil::Argument_ENTITY,Type::IfcUnit);
     current = entity_descriptor_map[Type::IfcQuantityArea] = new IfcEntityDescriptor(Type::IfcQuantityArea,entity_descriptor_map.find(Type::IfcPhysicalSimpleQuantity)->second);
-    current->add("AreaValue",false,IfcUtil::Argument_DOUBLE);
+    current->add("AreaValue",false,IfcUtil::Argument_DOUBLE,Type::IfcAreaMeasure);
     current = entity_descriptor_map[Type::IfcQuantityCount] = new IfcEntityDescriptor(Type::IfcQuantityCount,entity_descriptor_map.find(Type::IfcPhysicalSimpleQuantity)->second);
-    current->add("CountValue",false,IfcUtil::Argument_DOUBLE);
+    current->add("CountValue",false,IfcUtil::Argument_DOUBLE,Type::IfcCountMeasure);
     current = entity_descriptor_map[Type::IfcQuantityLength] = new IfcEntityDescriptor(Type::IfcQuantityLength,entity_descriptor_map.find(Type::IfcPhysicalSimpleQuantity)->second);
-    current->add("LengthValue",false,IfcUtil::Argument_DOUBLE);
+    current->add("LengthValue",false,IfcUtil::Argument_DOUBLE,Type::IfcLengthMeasure);
     current = entity_descriptor_map[Type::IfcQuantityTime] = new IfcEntityDescriptor(Type::IfcQuantityTime,entity_descriptor_map.find(Type::IfcPhysicalSimpleQuantity)->second);
-    current->add("TimeValue",false,IfcUtil::Argument_DOUBLE);
+    current->add("TimeValue",false,IfcUtil::Argument_DOUBLE,Type::IfcTimeMeasure);
     current = entity_descriptor_map[Type::IfcQuantityVolume] = new IfcEntityDescriptor(Type::IfcQuantityVolume,entity_descriptor_map.find(Type::IfcPhysicalSimpleQuantity)->second);
-    current->add("VolumeValue",false,IfcUtil::Argument_DOUBLE);
+    current->add("VolumeValue",false,IfcUtil::Argument_DOUBLE,Type::IfcVolumeMeasure);
     current = entity_descriptor_map[Type::IfcQuantityWeight] = new IfcEntityDescriptor(Type::IfcQuantityWeight,entity_descriptor_map.find(Type::IfcPhysicalSimpleQuantity)->second);
-    current->add("WeightValue",false,IfcUtil::Argument_DOUBLE);
+    current->add("WeightValue",false,IfcUtil::Argument_DOUBLE,Type::IfcMassMeasure);
     current = entity_descriptor_map[Type::IfcReferencesValueDocument] = new IfcEntityDescriptor(Type::IfcReferencesValueDocument,0);
-    current->add("ReferencedDocument",false,IfcUtil::Argument_ENTITY);
-    current->add("ReferencingValues",false,IfcUtil::Argument_ENTITY_LIST);
-    current->add("Name",true,IfcUtil::Argument_STRING);
-    current->add("Description",true,IfcUtil::Argument_STRING);
+    current->add("ReferencedDocument",false,IfcUtil::Argument_ENTITY,Type::IfcDocumentSelect);
+    current->add("ReferencingValues",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcAppliedValue);
+    current->add("Name",true,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("Description",true,IfcUtil::Argument_STRING,Type::IfcText);
     current = entity_descriptor_map[Type::IfcReinforcementBarProperties] = new IfcEntityDescriptor(Type::IfcReinforcementBarProperties,0);
-    current->add("TotalCrossSectionArea",false,IfcUtil::Argument_DOUBLE);
-    current->add("SteelGrade",false,IfcUtil::Argument_STRING);
+    current->add("TotalCrossSectionArea",false,IfcUtil::Argument_DOUBLE,Type::IfcAreaMeasure);
+    current->add("SteelGrade",false,IfcUtil::Argument_STRING,Type::IfcLabel);
     current->add("BarSurface",true,IfcUtil::Argument_ENUMERATION,Type::IfcReinforcingBarSurfaceEnum);
-    current->add("EffectiveDepth",true,IfcUtil::Argument_DOUBLE);
-    current->add("NominalBarDiameter",true,IfcUtil::Argument_DOUBLE);
-    current->add("BarCount",true,IfcUtil::Argument_DOUBLE);
+    current->add("EffectiveDepth",true,IfcUtil::Argument_DOUBLE,Type::IfcLengthMeasure);
+    current->add("NominalBarDiameter",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("BarCount",true,IfcUtil::Argument_DOUBLE,Type::IfcCountMeasure);
     current = entity_descriptor_map[Type::IfcRelaxation] = new IfcEntityDescriptor(Type::IfcRelaxation,0);
-    current->add("RelaxationValue",false,IfcUtil::Argument_DOUBLE);
-    current->add("InitialStress",false,IfcUtil::Argument_DOUBLE);
+    current->add("RelaxationValue",false,IfcUtil::Argument_DOUBLE,Type::IfcNormalisedRatioMeasure);
+    current->add("InitialStress",false,IfcUtil::Argument_DOUBLE,Type::IfcNormalisedRatioMeasure);
     current = entity_descriptor_map[Type::IfcRepresentation] = new IfcEntityDescriptor(Type::IfcRepresentation,0);
-    current->add("ContextOfItems",false,IfcUtil::Argument_ENTITY);
-    current->add("RepresentationIdentifier",true,IfcUtil::Argument_STRING);
-    current->add("RepresentationType",true,IfcUtil::Argument_STRING);
-    current->add("Items",false,IfcUtil::Argument_ENTITY_LIST);
+    current->add("ContextOfItems",false,IfcUtil::Argument_ENTITY,Type::IfcRepresentationContext);
+    current->add("RepresentationIdentifier",true,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("RepresentationType",true,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("Items",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcRepresentationItem);
     current = entity_descriptor_map[Type::IfcRepresentationContext] = new IfcEntityDescriptor(Type::IfcRepresentationContext,0);
-    current->add("ContextIdentifier",true,IfcUtil::Argument_STRING);
-    current->add("ContextType",true,IfcUtil::Argument_STRING);
+    current->add("ContextIdentifier",true,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("ContextType",true,IfcUtil::Argument_STRING,Type::IfcLabel);
     current = entity_descriptor_map[Type::IfcRepresentationItem] = new IfcEntityDescriptor(Type::IfcRepresentationItem,0);
 
     current = entity_descriptor_map[Type::IfcRepresentationMap] = new IfcEntityDescriptor(Type::IfcRepresentationMap,0);
-    current->add("MappingOrigin",false,IfcUtil::Argument_ENTITY);
-    current->add("MappedRepresentation",false,IfcUtil::Argument_ENTITY);
+    current->add("MappingOrigin",false,IfcUtil::Argument_ENTITY,Type::IfcAxis2Placement);
+    current->add("MappedRepresentation",false,IfcUtil::Argument_ENTITY,Type::IfcRepresentation);
     current = entity_descriptor_map[Type::IfcRibPlateProfileProperties] = new IfcEntityDescriptor(Type::IfcRibPlateProfileProperties,entity_descriptor_map.find(Type::IfcProfileProperties)->second);
-    current->add("Thickness",true,IfcUtil::Argument_DOUBLE);
-    current->add("RibHeight",true,IfcUtil::Argument_DOUBLE);
-    current->add("RibWidth",true,IfcUtil::Argument_DOUBLE);
-    current->add("RibSpacing",true,IfcUtil::Argument_DOUBLE);
+    current->add("Thickness",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("RibHeight",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("RibWidth",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("RibSpacing",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
     current->add("Direction",false,IfcUtil::Argument_ENUMERATION,Type::IfcRibPlateDirectionEnum);
     current = entity_descriptor_map[Type::IfcRoot] = new IfcEntityDescriptor(Type::IfcRoot,0);
-    current->add("GlobalId",false,IfcUtil::Argument_STRING);
-    current->add("OwnerHistory",false,IfcUtil::Argument_ENTITY);
-    current->add("Name",true,IfcUtil::Argument_STRING);
-    current->add("Description",true,IfcUtil::Argument_STRING);
+    current->add("GlobalId",false,IfcUtil::Argument_STRING,Type::IfcGloballyUniqueId);
+    current->add("OwnerHistory",false,IfcUtil::Argument_ENTITY,Type::IfcOwnerHistory);
+    current->add("Name",true,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("Description",true,IfcUtil::Argument_STRING,Type::IfcText);
     current = entity_descriptor_map[Type::IfcSIUnit] = new IfcEntityDescriptor(Type::IfcSIUnit,entity_descriptor_map.find(Type::IfcNamedUnit)->second);
     current->add("Prefix",true,IfcUtil::Argument_ENUMERATION,Type::IfcSIPrefix);
     current->add("Name",false,IfcUtil::Argument_ENUMERATION,Type::IfcSIUnitName);
     current = entity_descriptor_map[Type::IfcSectionProperties] = new IfcEntityDescriptor(Type::IfcSectionProperties,0);
     current->add("SectionType",false,IfcUtil::Argument_ENUMERATION,Type::IfcSectionTypeEnum);
-    current->add("StartProfile",false,IfcUtil::Argument_ENTITY);
-    current->add("EndProfile",true,IfcUtil::Argument_ENTITY);
+    current->add("StartProfile",false,IfcUtil::Argument_ENTITY,Type::IfcProfileDef);
+    current->add("EndProfile",true,IfcUtil::Argument_ENTITY,Type::IfcProfileDef);
     current = entity_descriptor_map[Type::IfcSectionReinforcementProperties] = new IfcEntityDescriptor(Type::IfcSectionReinforcementProperties,0);
-    current->add("LongitudinalStartPosition",false,IfcUtil::Argument_DOUBLE);
-    current->add("LongitudinalEndPosition",false,IfcUtil::Argument_DOUBLE);
-    current->add("TransversePosition",true,IfcUtil::Argument_DOUBLE);
+    current->add("LongitudinalStartPosition",false,IfcUtil::Argument_DOUBLE,Type::IfcLengthMeasure);
+    current->add("LongitudinalEndPosition",false,IfcUtil::Argument_DOUBLE,Type::IfcLengthMeasure);
+    current->add("TransversePosition",true,IfcUtil::Argument_DOUBLE,Type::IfcLengthMeasure);
     current->add("ReinforcementRole",false,IfcUtil::Argument_ENUMERATION,Type::IfcReinforcingBarRoleEnum);
-    current->add("SectionDefinition",false,IfcUtil::Argument_ENTITY);
-    current->add("CrossSectionReinforcementDefinitions",false,IfcUtil::Argument_ENTITY_LIST);
+    current->add("SectionDefinition",false,IfcUtil::Argument_ENTITY,Type::IfcSectionProperties);
+    current->add("CrossSectionReinforcementDefinitions",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcReinforcementBarProperties);
     current = entity_descriptor_map[Type::IfcShapeAspect] = new IfcEntityDescriptor(Type::IfcShapeAspect,0);
-    current->add("ShapeRepresentations",false,IfcUtil::Argument_ENTITY_LIST);
-    current->add("Name",true,IfcUtil::Argument_STRING);
-    current->add("Description",true,IfcUtil::Argument_STRING);
-    current->add("ProductDefinitional",false,IfcUtil::Argument_BOOL);
-    current->add("PartOfProductDefinitionShape",false,IfcUtil::Argument_ENTITY);
+    current->add("ShapeRepresentations",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcShapeModel);
+    current->add("Name",true,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("Description",true,IfcUtil::Argument_STRING,Type::IfcText);
+    current->add("ProductDefinitional",false,IfcUtil::Argument_BOOL,Type::UNDEFINED);
+    current->add("PartOfProductDefinitionShape",false,IfcUtil::Argument_ENTITY,Type::IfcProductDefinitionShape);
     current = entity_descriptor_map[Type::IfcShapeModel] = new IfcEntityDescriptor(Type::IfcShapeModel,entity_descriptor_map.find(Type::IfcRepresentation)->second);
 
     current = entity_descriptor_map[Type::IfcShapeRepresentation] = new IfcEntityDescriptor(Type::IfcShapeRepresentation,entity_descriptor_map.find(Type::IfcShapeModel)->second);
@@ -761,136 +775,136 @@ void InitDescriptorMap() {
     current = entity_descriptor_map[Type::IfcSimpleProperty] = new IfcEntityDescriptor(Type::IfcSimpleProperty,entity_descriptor_map.find(Type::IfcProperty)->second);
 
     current = entity_descriptor_map[Type::IfcStructuralConnectionCondition] = new IfcEntityDescriptor(Type::IfcStructuralConnectionCondition,0);
-    current->add("Name",true,IfcUtil::Argument_STRING);
+    current->add("Name",true,IfcUtil::Argument_STRING,Type::IfcLabel);
     current = entity_descriptor_map[Type::IfcStructuralLoad] = new IfcEntityDescriptor(Type::IfcStructuralLoad,0);
-    current->add("Name",true,IfcUtil::Argument_STRING);
+    current->add("Name",true,IfcUtil::Argument_STRING,Type::IfcLabel);
     current = entity_descriptor_map[Type::IfcStructuralLoadStatic] = new IfcEntityDescriptor(Type::IfcStructuralLoadStatic,entity_descriptor_map.find(Type::IfcStructuralLoad)->second);
 
     current = entity_descriptor_map[Type::IfcStructuralLoadTemperature] = new IfcEntityDescriptor(Type::IfcStructuralLoadTemperature,entity_descriptor_map.find(Type::IfcStructuralLoadStatic)->second);
-    current->add("DeltaT_Constant",true,IfcUtil::Argument_DOUBLE);
-    current->add("DeltaT_Y",true,IfcUtil::Argument_DOUBLE);
-    current->add("DeltaT_Z",true,IfcUtil::Argument_DOUBLE);
+    current->add("DeltaT_Constant",true,IfcUtil::Argument_DOUBLE,Type::IfcThermodynamicTemperatureMeasure);
+    current->add("DeltaT_Y",true,IfcUtil::Argument_DOUBLE,Type::IfcThermodynamicTemperatureMeasure);
+    current->add("DeltaT_Z",true,IfcUtil::Argument_DOUBLE,Type::IfcThermodynamicTemperatureMeasure);
     current = entity_descriptor_map[Type::IfcStyleModel] = new IfcEntityDescriptor(Type::IfcStyleModel,entity_descriptor_map.find(Type::IfcRepresentation)->second);
 
     current = entity_descriptor_map[Type::IfcStyledItem] = new IfcEntityDescriptor(Type::IfcStyledItem,entity_descriptor_map.find(Type::IfcRepresentationItem)->second);
-    current->add("Item",true,IfcUtil::Argument_ENTITY);
-    current->add("Styles",false,IfcUtil::Argument_ENTITY_LIST);
-    current->add("Name",true,IfcUtil::Argument_STRING);
+    current->add("Item",true,IfcUtil::Argument_ENTITY,Type::IfcRepresentationItem);
+    current->add("Styles",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcPresentationStyleAssignment);
+    current->add("Name",true,IfcUtil::Argument_STRING,Type::IfcLabel);
     current = entity_descriptor_map[Type::IfcStyledRepresentation] = new IfcEntityDescriptor(Type::IfcStyledRepresentation,entity_descriptor_map.find(Type::IfcStyleModel)->second);
 
     current = entity_descriptor_map[Type::IfcSurfaceStyle] = new IfcEntityDescriptor(Type::IfcSurfaceStyle,entity_descriptor_map.find(Type::IfcPresentationStyle)->second);
     current->add("Side",false,IfcUtil::Argument_ENUMERATION,Type::IfcSurfaceSide);
-    current->add("Styles",false,IfcUtil::Argument_ENTITY_LIST);
+    current->add("Styles",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcSurfaceStyleElementSelect);
     current = entity_descriptor_map[Type::IfcSurfaceStyleLighting] = new IfcEntityDescriptor(Type::IfcSurfaceStyleLighting,0);
-    current->add("DiffuseTransmissionColour",false,IfcUtil::Argument_ENTITY);
-    current->add("DiffuseReflectionColour",false,IfcUtil::Argument_ENTITY);
-    current->add("TransmissionColour",false,IfcUtil::Argument_ENTITY);
-    current->add("ReflectanceColour",false,IfcUtil::Argument_ENTITY);
+    current->add("DiffuseTransmissionColour",false,IfcUtil::Argument_ENTITY,Type::IfcColourRgb);
+    current->add("DiffuseReflectionColour",false,IfcUtil::Argument_ENTITY,Type::IfcColourRgb);
+    current->add("TransmissionColour",false,IfcUtil::Argument_ENTITY,Type::IfcColourRgb);
+    current->add("ReflectanceColour",false,IfcUtil::Argument_ENTITY,Type::IfcColourRgb);
     current = entity_descriptor_map[Type::IfcSurfaceStyleRefraction] = new IfcEntityDescriptor(Type::IfcSurfaceStyleRefraction,0);
-    current->add("RefractionIndex",true,IfcUtil::Argument_DOUBLE);
-    current->add("DispersionFactor",true,IfcUtil::Argument_DOUBLE);
+    current->add("RefractionIndex",true,IfcUtil::Argument_DOUBLE,Type::IfcReal);
+    current->add("DispersionFactor",true,IfcUtil::Argument_DOUBLE,Type::IfcReal);
     current = entity_descriptor_map[Type::IfcSurfaceStyleShading] = new IfcEntityDescriptor(Type::IfcSurfaceStyleShading,0);
-    current->add("SurfaceColour",false,IfcUtil::Argument_ENTITY);
+    current->add("SurfaceColour",false,IfcUtil::Argument_ENTITY,Type::IfcColourRgb);
     current = entity_descriptor_map[Type::IfcSurfaceStyleWithTextures] = new IfcEntityDescriptor(Type::IfcSurfaceStyleWithTextures,0);
-    current->add("Textures",false,IfcUtil::Argument_ENTITY_LIST);
+    current->add("Textures",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcSurfaceTexture);
     current = entity_descriptor_map[Type::IfcSurfaceTexture] = new IfcEntityDescriptor(Type::IfcSurfaceTexture,0);
-    current->add("RepeatS",false,IfcUtil::Argument_BOOL);
-    current->add("RepeatT",false,IfcUtil::Argument_BOOL);
+    current->add("RepeatS",false,IfcUtil::Argument_BOOL,Type::UNDEFINED);
+    current->add("RepeatT",false,IfcUtil::Argument_BOOL,Type::UNDEFINED);
     current->add("TextureType",false,IfcUtil::Argument_ENUMERATION,Type::IfcSurfaceTextureEnum);
-    current->add("TextureTransform",true,IfcUtil::Argument_ENTITY);
+    current->add("TextureTransform",true,IfcUtil::Argument_ENTITY,Type::IfcCartesianTransformationOperator2D);
     current = entity_descriptor_map[Type::IfcSymbolStyle] = new IfcEntityDescriptor(Type::IfcSymbolStyle,entity_descriptor_map.find(Type::IfcPresentationStyle)->second);
-    current->add("StyleOfSymbol",false,IfcUtil::Argument_ENTITY);
+    current->add("StyleOfSymbol",false,IfcUtil::Argument_ENTITY,Type::IfcSymbolStyleSelect);
     current = entity_descriptor_map[Type::IfcTable] = new IfcEntityDescriptor(Type::IfcTable,0);
-    current->add("Name",false,IfcUtil::Argument_STRING);
-    current->add("Rows",false,IfcUtil::Argument_ENTITY_LIST);
+    current->add("Name",false,IfcUtil::Argument_STRING,Type::UNDEFINED);
+    current->add("Rows",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcTableRow);
     current = entity_descriptor_map[Type::IfcTableRow] = new IfcEntityDescriptor(Type::IfcTableRow,0);
-    current->add("RowCells",false,IfcUtil::Argument_ENTITY_LIST);
-    current->add("IsHeading",false,IfcUtil::Argument_BOOL);
+    current->add("RowCells",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcValue);
+    current->add("IsHeading",false,IfcUtil::Argument_BOOL,Type::UNDEFINED);
     current = entity_descriptor_map[Type::IfcTelecomAddress] = new IfcEntityDescriptor(Type::IfcTelecomAddress,entity_descriptor_map.find(Type::IfcAddress)->second);
-    current->add("TelephoneNumbers",true,IfcUtil::Argument_VECTOR_STRING);
-    current->add("FacsimileNumbers",true,IfcUtil::Argument_VECTOR_STRING);
-    current->add("PagerNumber",true,IfcUtil::Argument_STRING);
-    current->add("ElectronicMailAddresses",true,IfcUtil::Argument_VECTOR_STRING);
-    current->add("WWWHomePageURL",true,IfcUtil::Argument_STRING);
+    current->add("TelephoneNumbers",true,IfcUtil::Argument_VECTOR_STRING,Type::IfcLabel);
+    current->add("FacsimileNumbers",true,IfcUtil::Argument_VECTOR_STRING,Type::IfcLabel);
+    current->add("PagerNumber",true,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("ElectronicMailAddresses",true,IfcUtil::Argument_VECTOR_STRING,Type::IfcLabel);
+    current->add("WWWHomePageURL",true,IfcUtil::Argument_STRING,Type::IfcLabel);
     current = entity_descriptor_map[Type::IfcTextStyle] = new IfcEntityDescriptor(Type::IfcTextStyle,entity_descriptor_map.find(Type::IfcPresentationStyle)->second);
-    current->add("TextCharacterAppearance",true,IfcUtil::Argument_ENTITY);
-    current->add("TextStyle",true,IfcUtil::Argument_ENTITY);
-    current->add("TextFontStyle",false,IfcUtil::Argument_ENTITY);
+    current->add("TextCharacterAppearance",true,IfcUtil::Argument_ENTITY,Type::IfcCharacterStyleSelect);
+    current->add("TextStyle",true,IfcUtil::Argument_ENTITY,Type::IfcTextStyleSelect);
+    current->add("TextFontStyle",false,IfcUtil::Argument_ENTITY,Type::IfcTextFontSelect);
     current = entity_descriptor_map[Type::IfcTextStyleFontModel] = new IfcEntityDescriptor(Type::IfcTextStyleFontModel,entity_descriptor_map.find(Type::IfcPreDefinedTextFont)->second);
-    current->add("FontFamily",true,IfcUtil::Argument_VECTOR_STRING);
-    current->add("FontStyle",true,IfcUtil::Argument_STRING);
-    current->add("FontVariant",true,IfcUtil::Argument_STRING);
-    current->add("FontWeight",true,IfcUtil::Argument_STRING);
-    current->add("FontSize",false,IfcUtil::Argument_ENTITY);
+    current->add("FontFamily",true,IfcUtil::Argument_VECTOR_STRING,Type::IfcTextFontName);
+    current->add("FontStyle",true,IfcUtil::Argument_STRING,Type::IfcFontStyle);
+    current->add("FontVariant",true,IfcUtil::Argument_STRING,Type::IfcFontVariant);
+    current->add("FontWeight",true,IfcUtil::Argument_STRING,Type::IfcFontWeight);
+    current->add("FontSize",false,IfcUtil::Argument_ENTITY,Type::IfcSizeSelect);
     current = entity_descriptor_map[Type::IfcTextStyleForDefinedFont] = new IfcEntityDescriptor(Type::IfcTextStyleForDefinedFont,0);
-    current->add("Colour",false,IfcUtil::Argument_ENTITY);
-    current->add("BackgroundColour",true,IfcUtil::Argument_ENTITY);
+    current->add("Colour",false,IfcUtil::Argument_ENTITY,Type::IfcColour);
+    current->add("BackgroundColour",true,IfcUtil::Argument_ENTITY,Type::IfcColour);
     current = entity_descriptor_map[Type::IfcTextStyleTextModel] = new IfcEntityDescriptor(Type::IfcTextStyleTextModel,0);
-    current->add("TextIndent",true,IfcUtil::Argument_ENTITY);
-    current->add("TextAlign",true,IfcUtil::Argument_STRING);
-    current->add("TextDecoration",true,IfcUtil::Argument_STRING);
-    current->add("LetterSpacing",true,IfcUtil::Argument_ENTITY);
-    current->add("WordSpacing",true,IfcUtil::Argument_ENTITY);
-    current->add("TextTransform",true,IfcUtil::Argument_STRING);
-    current->add("LineHeight",true,IfcUtil::Argument_ENTITY);
+    current->add("TextIndent",true,IfcUtil::Argument_ENTITY,Type::IfcSizeSelect);
+    current->add("TextAlign",true,IfcUtil::Argument_STRING,Type::IfcTextAlignment);
+    current->add("TextDecoration",true,IfcUtil::Argument_STRING,Type::IfcTextDecoration);
+    current->add("LetterSpacing",true,IfcUtil::Argument_ENTITY,Type::IfcSizeSelect);
+    current->add("WordSpacing",true,IfcUtil::Argument_ENTITY,Type::IfcSizeSelect);
+    current->add("TextTransform",true,IfcUtil::Argument_STRING,Type::IfcTextTransformation);
+    current->add("LineHeight",true,IfcUtil::Argument_ENTITY,Type::IfcSizeSelect);
     current = entity_descriptor_map[Type::IfcTextStyleWithBoxCharacteristics] = new IfcEntityDescriptor(Type::IfcTextStyleWithBoxCharacteristics,0);
-    current->add("BoxHeight",true,IfcUtil::Argument_DOUBLE);
-    current->add("BoxWidth",true,IfcUtil::Argument_DOUBLE);
-    current->add("BoxSlantAngle",true,IfcUtil::Argument_DOUBLE);
-    current->add("BoxRotateAngle",true,IfcUtil::Argument_DOUBLE);
-    current->add("CharacterSpacing",true,IfcUtil::Argument_ENTITY);
+    current->add("BoxHeight",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("BoxWidth",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("BoxSlantAngle",true,IfcUtil::Argument_DOUBLE,Type::IfcPlaneAngleMeasure);
+    current->add("BoxRotateAngle",true,IfcUtil::Argument_DOUBLE,Type::IfcPlaneAngleMeasure);
+    current->add("CharacterSpacing",true,IfcUtil::Argument_ENTITY,Type::IfcSizeSelect);
     current = entity_descriptor_map[Type::IfcTextureCoordinate] = new IfcEntityDescriptor(Type::IfcTextureCoordinate,0);
 
     current = entity_descriptor_map[Type::IfcTextureCoordinateGenerator] = new IfcEntityDescriptor(Type::IfcTextureCoordinateGenerator,entity_descriptor_map.find(Type::IfcTextureCoordinate)->second);
-    current->add("Mode",false,IfcUtil::Argument_STRING);
-    current->add("Parameter",false,IfcUtil::Argument_ENTITY_LIST);
+    current->add("Mode",false,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("Parameter",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcSimpleValue);
     current = entity_descriptor_map[Type::IfcTextureMap] = new IfcEntityDescriptor(Type::IfcTextureMap,entity_descriptor_map.find(Type::IfcTextureCoordinate)->second);
-    current->add("TextureMaps",false,IfcUtil::Argument_ENTITY_LIST);
+    current->add("TextureMaps",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcVertexBasedTextureMap);
     current = entity_descriptor_map[Type::IfcTextureVertex] = new IfcEntityDescriptor(Type::IfcTextureVertex,0);
-    current->add("Coordinates",false,IfcUtil::Argument_VECTOR_DOUBLE);
+    current->add("Coordinates",false,IfcUtil::Argument_VECTOR_DOUBLE,Type::IfcParameterValue);
     current = entity_descriptor_map[Type::IfcThermalMaterialProperties] = new IfcEntityDescriptor(Type::IfcThermalMaterialProperties,entity_descriptor_map.find(Type::IfcMaterialProperties)->second);
-    current->add("SpecificHeatCapacity",true,IfcUtil::Argument_DOUBLE);
-    current->add("BoilingPoint",true,IfcUtil::Argument_DOUBLE);
-    current->add("FreezingPoint",true,IfcUtil::Argument_DOUBLE);
-    current->add("ThermalConductivity",true,IfcUtil::Argument_DOUBLE);
+    current->add("SpecificHeatCapacity",true,IfcUtil::Argument_DOUBLE,Type::IfcSpecificHeatCapacityMeasure);
+    current->add("BoilingPoint",true,IfcUtil::Argument_DOUBLE,Type::IfcThermodynamicTemperatureMeasure);
+    current->add("FreezingPoint",true,IfcUtil::Argument_DOUBLE,Type::IfcThermodynamicTemperatureMeasure);
+    current->add("ThermalConductivity",true,IfcUtil::Argument_DOUBLE,Type::IfcThermalConductivityMeasure);
     current = entity_descriptor_map[Type::IfcTimeSeries] = new IfcEntityDescriptor(Type::IfcTimeSeries,0);
-    current->add("Name",false,IfcUtil::Argument_STRING);
-    current->add("Description",true,IfcUtil::Argument_STRING);
-    current->add("StartTime",false,IfcUtil::Argument_ENTITY);
-    current->add("EndTime",false,IfcUtil::Argument_ENTITY);
+    current->add("Name",false,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("Description",true,IfcUtil::Argument_STRING,Type::IfcText);
+    current->add("StartTime",false,IfcUtil::Argument_ENTITY,Type::IfcDateTimeSelect);
+    current->add("EndTime",false,IfcUtil::Argument_ENTITY,Type::IfcDateTimeSelect);
     current->add("TimeSeriesDataType",false,IfcUtil::Argument_ENUMERATION,Type::IfcTimeSeriesDataTypeEnum);
     current->add("DataOrigin",false,IfcUtil::Argument_ENUMERATION,Type::IfcDataOriginEnum);
-    current->add("UserDefinedDataOrigin",true,IfcUtil::Argument_STRING);
-    current->add("Unit",true,IfcUtil::Argument_ENTITY);
+    current->add("UserDefinedDataOrigin",true,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("Unit",true,IfcUtil::Argument_ENTITY,Type::IfcUnit);
     current = entity_descriptor_map[Type::IfcTimeSeriesReferenceRelationship] = new IfcEntityDescriptor(Type::IfcTimeSeriesReferenceRelationship,0);
-    current->add("ReferencedTimeSeries",false,IfcUtil::Argument_ENTITY);
-    current->add("TimeSeriesReferences",false,IfcUtil::Argument_ENTITY_LIST);
+    current->add("ReferencedTimeSeries",false,IfcUtil::Argument_ENTITY,Type::IfcTimeSeries);
+    current->add("TimeSeriesReferences",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcDocumentSelect);
     current = entity_descriptor_map[Type::IfcTimeSeriesValue] = new IfcEntityDescriptor(Type::IfcTimeSeriesValue,0);
-    current->add("ListValues",false,IfcUtil::Argument_ENTITY_LIST);
+    current->add("ListValues",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcValue);
     current = entity_descriptor_map[Type::IfcTopologicalRepresentationItem] = new IfcEntityDescriptor(Type::IfcTopologicalRepresentationItem,entity_descriptor_map.find(Type::IfcRepresentationItem)->second);
 
     current = entity_descriptor_map[Type::IfcTopologyRepresentation] = new IfcEntityDescriptor(Type::IfcTopologyRepresentation,entity_descriptor_map.find(Type::IfcShapeModel)->second);
 
     current = entity_descriptor_map[Type::IfcUnitAssignment] = new IfcEntityDescriptor(Type::IfcUnitAssignment,0);
-    current->add("Units",false,IfcUtil::Argument_ENTITY_LIST);
+    current->add("Units",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcUnit);
     current = entity_descriptor_map[Type::IfcVertex] = new IfcEntityDescriptor(Type::IfcVertex,entity_descriptor_map.find(Type::IfcTopologicalRepresentationItem)->second);
 
     current = entity_descriptor_map[Type::IfcVertexBasedTextureMap] = new IfcEntityDescriptor(Type::IfcVertexBasedTextureMap,0);
-    current->add("TextureVertices",false,IfcUtil::Argument_ENTITY_LIST);
-    current->add("TexturePoints",false,IfcUtil::Argument_ENTITY_LIST);
+    current->add("TextureVertices",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcTextureVertex);
+    current->add("TexturePoints",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcCartesianPoint);
     current = entity_descriptor_map[Type::IfcVertexPoint] = new IfcEntityDescriptor(Type::IfcVertexPoint,entity_descriptor_map.find(Type::IfcVertex)->second);
-    current->add("VertexGeometry",false,IfcUtil::Argument_ENTITY);
+    current->add("VertexGeometry",false,IfcUtil::Argument_ENTITY,Type::IfcPoint);
     current = entity_descriptor_map[Type::IfcVirtualGridIntersection] = new IfcEntityDescriptor(Type::IfcVirtualGridIntersection,0);
-    current->add("IntersectingAxes",false,IfcUtil::Argument_ENTITY_LIST);
-    current->add("OffsetDistances",false,IfcUtil::Argument_VECTOR_DOUBLE);
+    current->add("IntersectingAxes",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcGridAxis);
+    current->add("OffsetDistances",false,IfcUtil::Argument_VECTOR_DOUBLE,Type::IfcLengthMeasure);
     current = entity_descriptor_map[Type::IfcWaterProperties] = new IfcEntityDescriptor(Type::IfcWaterProperties,entity_descriptor_map.find(Type::IfcMaterialProperties)->second);
-    current->add("IsPotable",true,IfcUtil::Argument_BOOL);
-    current->add("Hardness",true,IfcUtil::Argument_DOUBLE);
-    current->add("AlkalinityConcentration",true,IfcUtil::Argument_DOUBLE);
-    current->add("AcidityConcentration",true,IfcUtil::Argument_DOUBLE);
-    current->add("ImpuritiesContent",true,IfcUtil::Argument_DOUBLE);
-    current->add("PHLevel",true,IfcUtil::Argument_DOUBLE);
-    current->add("DissolvedSolidsContent",true,IfcUtil::Argument_DOUBLE);
+    current->add("IsPotable",true,IfcUtil::Argument_BOOL,Type::UNDEFINED);
+    current->add("Hardness",true,IfcUtil::Argument_DOUBLE,Type::IfcIonConcentrationMeasure);
+    current->add("AlkalinityConcentration",true,IfcUtil::Argument_DOUBLE,Type::IfcIonConcentrationMeasure);
+    current->add("AcidityConcentration",true,IfcUtil::Argument_DOUBLE,Type::IfcIonConcentrationMeasure);
+    current->add("ImpuritiesContent",true,IfcUtil::Argument_DOUBLE,Type::IfcNormalisedRatioMeasure);
+    current->add("PHLevel",true,IfcUtil::Argument_DOUBLE,Type::IfcPHMeasure);
+    current->add("DissolvedSolidsContent",true,IfcUtil::Argument_DOUBLE,Type::IfcNormalisedRatioMeasure);
     current = entity_descriptor_map[Type::IfcAnnotationOccurrence] = new IfcEntityDescriptor(Type::IfcAnnotationOccurrence,entity_descriptor_map.find(Type::IfcStyledItem)->second);
 
     current = entity_descriptor_map[Type::IfcAnnotationSurfaceOccurrence] = new IfcEntityDescriptor(Type::IfcAnnotationSurfaceOccurrence,entity_descriptor_map.find(Type::IfcAnnotationOccurrence)->second);
@@ -900,50 +914,50 @@ void InitDescriptorMap() {
     current = entity_descriptor_map[Type::IfcAnnotationTextOccurrence] = new IfcEntityDescriptor(Type::IfcAnnotationTextOccurrence,entity_descriptor_map.find(Type::IfcAnnotationOccurrence)->second);
 
     current = entity_descriptor_map[Type::IfcArbitraryClosedProfileDef] = new IfcEntityDescriptor(Type::IfcArbitraryClosedProfileDef,entity_descriptor_map.find(Type::IfcProfileDef)->second);
-    current->add("OuterCurve",false,IfcUtil::Argument_ENTITY);
+    current->add("OuterCurve",false,IfcUtil::Argument_ENTITY,Type::IfcCurve);
     current = entity_descriptor_map[Type::IfcArbitraryOpenProfileDef] = new IfcEntityDescriptor(Type::IfcArbitraryOpenProfileDef,entity_descriptor_map.find(Type::IfcProfileDef)->second);
-    current->add("Curve",false,IfcUtil::Argument_ENTITY);
+    current->add("Curve",false,IfcUtil::Argument_ENTITY,Type::IfcBoundedCurve);
     current = entity_descriptor_map[Type::IfcArbitraryProfileDefWithVoids] = new IfcEntityDescriptor(Type::IfcArbitraryProfileDefWithVoids,entity_descriptor_map.find(Type::IfcArbitraryClosedProfileDef)->second);
-    current->add("InnerCurves",false,IfcUtil::Argument_ENTITY_LIST);
+    current->add("InnerCurves",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcCurve);
     current = entity_descriptor_map[Type::IfcBlobTexture] = new IfcEntityDescriptor(Type::IfcBlobTexture,entity_descriptor_map.find(Type::IfcSurfaceTexture)->second);
-    current->add("RasterFormat",false,IfcUtil::Argument_STRING);
-    current->add("RasterCode",false,IfcUtil::Argument_BOOL);
+    current->add("RasterFormat",false,IfcUtil::Argument_STRING,Type::IfcIdentifier);
+    current->add("RasterCode",false,IfcUtil::Argument_BOOL,Type::UNDEFINED);
     current = entity_descriptor_map[Type::IfcCenterLineProfileDef] = new IfcEntityDescriptor(Type::IfcCenterLineProfileDef,entity_descriptor_map.find(Type::IfcArbitraryOpenProfileDef)->second);
-    current->add("Thickness",false,IfcUtil::Argument_DOUBLE);
+    current->add("Thickness",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
     current = entity_descriptor_map[Type::IfcClassificationReference] = new IfcEntityDescriptor(Type::IfcClassificationReference,entity_descriptor_map.find(Type::IfcExternalReference)->second);
-    current->add("ReferencedSource",true,IfcUtil::Argument_ENTITY);
+    current->add("ReferencedSource",true,IfcUtil::Argument_ENTITY,Type::IfcClassification);
     current = entity_descriptor_map[Type::IfcColourRgb] = new IfcEntityDescriptor(Type::IfcColourRgb,entity_descriptor_map.find(Type::IfcColourSpecification)->second);
-    current->add("Red",false,IfcUtil::Argument_DOUBLE);
-    current->add("Green",false,IfcUtil::Argument_DOUBLE);
-    current->add("Blue",false,IfcUtil::Argument_DOUBLE);
+    current->add("Red",false,IfcUtil::Argument_DOUBLE,Type::IfcNormalisedRatioMeasure);
+    current->add("Green",false,IfcUtil::Argument_DOUBLE,Type::IfcNormalisedRatioMeasure);
+    current->add("Blue",false,IfcUtil::Argument_DOUBLE,Type::IfcNormalisedRatioMeasure);
     current = entity_descriptor_map[Type::IfcComplexProperty] = new IfcEntityDescriptor(Type::IfcComplexProperty,entity_descriptor_map.find(Type::IfcProperty)->second);
-    current->add("UsageName",false,IfcUtil::Argument_STRING);
-    current->add("HasProperties",false,IfcUtil::Argument_ENTITY_LIST);
+    current->add("UsageName",false,IfcUtil::Argument_STRING,Type::IfcIdentifier);
+    current->add("HasProperties",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcProperty);
     current = entity_descriptor_map[Type::IfcCompositeProfileDef] = new IfcEntityDescriptor(Type::IfcCompositeProfileDef,entity_descriptor_map.find(Type::IfcProfileDef)->second);
-    current->add("Profiles",false,IfcUtil::Argument_ENTITY_LIST);
-    current->add("Label",true,IfcUtil::Argument_STRING);
+    current->add("Profiles",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcProfileDef);
+    current->add("Label",true,IfcUtil::Argument_STRING,Type::IfcLabel);
     current = entity_descriptor_map[Type::IfcConnectedFaceSet] = new IfcEntityDescriptor(Type::IfcConnectedFaceSet,entity_descriptor_map.find(Type::IfcTopologicalRepresentationItem)->second);
-    current->add("CfsFaces",false,IfcUtil::Argument_ENTITY_LIST);
+    current->add("CfsFaces",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcFace);
     current = entity_descriptor_map[Type::IfcConnectionCurveGeometry] = new IfcEntityDescriptor(Type::IfcConnectionCurveGeometry,entity_descriptor_map.find(Type::IfcConnectionGeometry)->second);
-    current->add("CurveOnRelatingElement",false,IfcUtil::Argument_ENTITY);
-    current->add("CurveOnRelatedElement",true,IfcUtil::Argument_ENTITY);
+    current->add("CurveOnRelatingElement",false,IfcUtil::Argument_ENTITY,Type::IfcCurveOrEdgeCurve);
+    current->add("CurveOnRelatedElement",true,IfcUtil::Argument_ENTITY,Type::IfcCurveOrEdgeCurve);
     current = entity_descriptor_map[Type::IfcConnectionPointEccentricity] = new IfcEntityDescriptor(Type::IfcConnectionPointEccentricity,entity_descriptor_map.find(Type::IfcConnectionPointGeometry)->second);
-    current->add("EccentricityInX",true,IfcUtil::Argument_DOUBLE);
-    current->add("EccentricityInY",true,IfcUtil::Argument_DOUBLE);
-    current->add("EccentricityInZ",true,IfcUtil::Argument_DOUBLE);
+    current->add("EccentricityInX",true,IfcUtil::Argument_DOUBLE,Type::IfcLengthMeasure);
+    current->add("EccentricityInY",true,IfcUtil::Argument_DOUBLE,Type::IfcLengthMeasure);
+    current->add("EccentricityInZ",true,IfcUtil::Argument_DOUBLE,Type::IfcLengthMeasure);
     current = entity_descriptor_map[Type::IfcContextDependentUnit] = new IfcEntityDescriptor(Type::IfcContextDependentUnit,entity_descriptor_map.find(Type::IfcNamedUnit)->second);
-    current->add("Name",false,IfcUtil::Argument_STRING);
+    current->add("Name",false,IfcUtil::Argument_STRING,Type::IfcLabel);
     current = entity_descriptor_map[Type::IfcConversionBasedUnit] = new IfcEntityDescriptor(Type::IfcConversionBasedUnit,entity_descriptor_map.find(Type::IfcNamedUnit)->second);
-    current->add("Name",false,IfcUtil::Argument_STRING);
-    current->add("ConversionFactor",false,IfcUtil::Argument_ENTITY);
+    current->add("Name",false,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("ConversionFactor",false,IfcUtil::Argument_ENTITY,Type::IfcMeasureWithUnit);
     current = entity_descriptor_map[Type::IfcCurveStyle] = new IfcEntityDescriptor(Type::IfcCurveStyle,entity_descriptor_map.find(Type::IfcPresentationStyle)->second);
-    current->add("CurveFont",true,IfcUtil::Argument_ENTITY);
-    current->add("CurveWidth",true,IfcUtil::Argument_ENTITY);
-    current->add("CurveColour",true,IfcUtil::Argument_ENTITY);
+    current->add("CurveFont",true,IfcUtil::Argument_ENTITY,Type::IfcCurveFontOrScaledCurveFontSelect);
+    current->add("CurveWidth",true,IfcUtil::Argument_ENTITY,Type::IfcSizeSelect);
+    current->add("CurveColour",true,IfcUtil::Argument_ENTITY,Type::IfcColour);
     current = entity_descriptor_map[Type::IfcDerivedProfileDef] = new IfcEntityDescriptor(Type::IfcDerivedProfileDef,entity_descriptor_map.find(Type::IfcProfileDef)->second);
-    current->add("ParentProfile",false,IfcUtil::Argument_ENTITY);
-    current->add("Operator",false,IfcUtil::Argument_ENTITY);
-    current->add("Label",true,IfcUtil::Argument_STRING);
+    current->add("ParentProfile",false,IfcUtil::Argument_ENTITY,Type::IfcProfileDef);
+    current->add("Operator",false,IfcUtil::Argument_ENTITY,Type::IfcCartesianTransformationOperator2D);
+    current->add("Label",true,IfcUtil::Argument_STRING,Type::IfcLabel);
     current = entity_descriptor_map[Type::IfcDimensionCalloutRelationship] = new IfcEntityDescriptor(Type::IfcDimensionCalloutRelationship,entity_descriptor_map.find(Type::IfcDraughtingCalloutRelationship)->second);
 
     current = entity_descriptor_map[Type::IfcDimensionPair] = new IfcEntityDescriptor(Type::IfcDimensionPair,entity_descriptor_map.find(Type::IfcDraughtingCalloutRelationship)->second);
@@ -953,164 +967,164 @@ void InitDescriptorMap() {
     current = entity_descriptor_map[Type::IfcDraughtingPreDefinedTextFont] = new IfcEntityDescriptor(Type::IfcDraughtingPreDefinedTextFont,entity_descriptor_map.find(Type::IfcPreDefinedTextFont)->second);
 
     current = entity_descriptor_map[Type::IfcEdge] = new IfcEntityDescriptor(Type::IfcEdge,entity_descriptor_map.find(Type::IfcTopologicalRepresentationItem)->second);
-    current->add("EdgeStart",false,IfcUtil::Argument_ENTITY);
-    current->add("EdgeEnd",false,IfcUtil::Argument_ENTITY);
+    current->add("EdgeStart",false,IfcUtil::Argument_ENTITY,Type::IfcVertex);
+    current->add("EdgeEnd",false,IfcUtil::Argument_ENTITY,Type::IfcVertex);
     current = entity_descriptor_map[Type::IfcEdgeCurve] = new IfcEntityDescriptor(Type::IfcEdgeCurve,entity_descriptor_map.find(Type::IfcEdge)->second);
-    current->add("EdgeGeometry",false,IfcUtil::Argument_ENTITY);
-    current->add("SameSense",false,IfcUtil::Argument_BOOL);
+    current->add("EdgeGeometry",false,IfcUtil::Argument_ENTITY,Type::IfcCurve);
+    current->add("SameSense",false,IfcUtil::Argument_BOOL,Type::UNDEFINED);
     current = entity_descriptor_map[Type::IfcExtendedMaterialProperties] = new IfcEntityDescriptor(Type::IfcExtendedMaterialProperties,entity_descriptor_map.find(Type::IfcMaterialProperties)->second);
-    current->add("ExtendedProperties",false,IfcUtil::Argument_ENTITY_LIST);
-    current->add("Description",true,IfcUtil::Argument_STRING);
-    current->add("Name",false,IfcUtil::Argument_STRING);
+    current->add("ExtendedProperties",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcProperty);
+    current->add("Description",true,IfcUtil::Argument_STRING,Type::IfcText);
+    current->add("Name",false,IfcUtil::Argument_STRING,Type::IfcLabel);
     current = entity_descriptor_map[Type::IfcFace] = new IfcEntityDescriptor(Type::IfcFace,entity_descriptor_map.find(Type::IfcTopologicalRepresentationItem)->second);
-    current->add("Bounds",false,IfcUtil::Argument_ENTITY_LIST);
+    current->add("Bounds",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcFaceBound);
     current = entity_descriptor_map[Type::IfcFaceBound] = new IfcEntityDescriptor(Type::IfcFaceBound,entity_descriptor_map.find(Type::IfcTopologicalRepresentationItem)->second);
-    current->add("Bound",false,IfcUtil::Argument_ENTITY);
-    current->add("Orientation",false,IfcUtil::Argument_BOOL);
+    current->add("Bound",false,IfcUtil::Argument_ENTITY,Type::IfcLoop);
+    current->add("Orientation",false,IfcUtil::Argument_BOOL,Type::UNDEFINED);
     current = entity_descriptor_map[Type::IfcFaceOuterBound] = new IfcEntityDescriptor(Type::IfcFaceOuterBound,entity_descriptor_map.find(Type::IfcFaceBound)->second);
 
     current = entity_descriptor_map[Type::IfcFaceSurface] = new IfcEntityDescriptor(Type::IfcFaceSurface,entity_descriptor_map.find(Type::IfcFace)->second);
-    current->add("FaceSurface",false,IfcUtil::Argument_ENTITY);
-    current->add("SameSense",false,IfcUtil::Argument_BOOL);
+    current->add("FaceSurface",false,IfcUtil::Argument_ENTITY,Type::IfcSurface);
+    current->add("SameSense",false,IfcUtil::Argument_BOOL,Type::UNDEFINED);
     current = entity_descriptor_map[Type::IfcFailureConnectionCondition] = new IfcEntityDescriptor(Type::IfcFailureConnectionCondition,entity_descriptor_map.find(Type::IfcStructuralConnectionCondition)->second);
-    current->add("TensionFailureX",true,IfcUtil::Argument_DOUBLE);
-    current->add("TensionFailureY",true,IfcUtil::Argument_DOUBLE);
-    current->add("TensionFailureZ",true,IfcUtil::Argument_DOUBLE);
-    current->add("CompressionFailureX",true,IfcUtil::Argument_DOUBLE);
-    current->add("CompressionFailureY",true,IfcUtil::Argument_DOUBLE);
-    current->add("CompressionFailureZ",true,IfcUtil::Argument_DOUBLE);
+    current->add("TensionFailureX",true,IfcUtil::Argument_DOUBLE,Type::IfcForceMeasure);
+    current->add("TensionFailureY",true,IfcUtil::Argument_DOUBLE,Type::IfcForceMeasure);
+    current->add("TensionFailureZ",true,IfcUtil::Argument_DOUBLE,Type::IfcForceMeasure);
+    current->add("CompressionFailureX",true,IfcUtil::Argument_DOUBLE,Type::IfcForceMeasure);
+    current->add("CompressionFailureY",true,IfcUtil::Argument_DOUBLE,Type::IfcForceMeasure);
+    current->add("CompressionFailureZ",true,IfcUtil::Argument_DOUBLE,Type::IfcForceMeasure);
     current = entity_descriptor_map[Type::IfcFillAreaStyle] = new IfcEntityDescriptor(Type::IfcFillAreaStyle,entity_descriptor_map.find(Type::IfcPresentationStyle)->second);
-    current->add("FillStyles",false,IfcUtil::Argument_ENTITY_LIST);
+    current->add("FillStyles",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcFillStyleSelect);
     current = entity_descriptor_map[Type::IfcFuelProperties] = new IfcEntityDescriptor(Type::IfcFuelProperties,entity_descriptor_map.find(Type::IfcMaterialProperties)->second);
-    current->add("CombustionTemperature",true,IfcUtil::Argument_DOUBLE);
-    current->add("CarbonContent",true,IfcUtil::Argument_DOUBLE);
-    current->add("LowerHeatingValue",true,IfcUtil::Argument_DOUBLE);
-    current->add("HigherHeatingValue",true,IfcUtil::Argument_DOUBLE);
+    current->add("CombustionTemperature",true,IfcUtil::Argument_DOUBLE,Type::IfcThermodynamicTemperatureMeasure);
+    current->add("CarbonContent",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveRatioMeasure);
+    current->add("LowerHeatingValue",true,IfcUtil::Argument_DOUBLE,Type::IfcHeatingValueMeasure);
+    current->add("HigherHeatingValue",true,IfcUtil::Argument_DOUBLE,Type::IfcHeatingValueMeasure);
     current = entity_descriptor_map[Type::IfcGeneralMaterialProperties] = new IfcEntityDescriptor(Type::IfcGeneralMaterialProperties,entity_descriptor_map.find(Type::IfcMaterialProperties)->second);
-    current->add("MolecularWeight",true,IfcUtil::Argument_DOUBLE);
-    current->add("Porosity",true,IfcUtil::Argument_DOUBLE);
-    current->add("MassDensity",true,IfcUtil::Argument_DOUBLE);
+    current->add("MolecularWeight",true,IfcUtil::Argument_DOUBLE,Type::IfcMolecularWeightMeasure);
+    current->add("Porosity",true,IfcUtil::Argument_DOUBLE,Type::IfcNormalisedRatioMeasure);
+    current->add("MassDensity",true,IfcUtil::Argument_DOUBLE,Type::IfcMassDensityMeasure);
     current = entity_descriptor_map[Type::IfcGeneralProfileProperties] = new IfcEntityDescriptor(Type::IfcGeneralProfileProperties,entity_descriptor_map.find(Type::IfcProfileProperties)->second);
-    current->add("PhysicalWeight",true,IfcUtil::Argument_DOUBLE);
-    current->add("Perimeter",true,IfcUtil::Argument_DOUBLE);
-    current->add("MinimumPlateThickness",true,IfcUtil::Argument_DOUBLE);
-    current->add("MaximumPlateThickness",true,IfcUtil::Argument_DOUBLE);
-    current->add("CrossSectionArea",true,IfcUtil::Argument_DOUBLE);
+    current->add("PhysicalWeight",true,IfcUtil::Argument_DOUBLE,Type::IfcMassPerLengthMeasure);
+    current->add("Perimeter",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("MinimumPlateThickness",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("MaximumPlateThickness",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("CrossSectionArea",true,IfcUtil::Argument_DOUBLE,Type::IfcAreaMeasure);
     current = entity_descriptor_map[Type::IfcGeometricRepresentationContext] = new IfcEntityDescriptor(Type::IfcGeometricRepresentationContext,entity_descriptor_map.find(Type::IfcRepresentationContext)->second);
-    current->add("CoordinateSpaceDimension",false,IfcUtil::Argument_INT);
-    current->add("Precision",true,IfcUtil::Argument_DOUBLE);
-    current->add("WorldCoordinateSystem",false,IfcUtil::Argument_ENTITY);
-    current->add("TrueNorth",true,IfcUtil::Argument_ENTITY);
+    current->add("CoordinateSpaceDimension",false,IfcUtil::Argument_INT,Type::IfcDimensionCount);
+    current->add("Precision",true,IfcUtil::Argument_DOUBLE,Type::UNDEFINED);
+    current->add("WorldCoordinateSystem",false,IfcUtil::Argument_ENTITY,Type::IfcAxis2Placement);
+    current->add("TrueNorth",true,IfcUtil::Argument_ENTITY,Type::IfcDirection);
     current = entity_descriptor_map[Type::IfcGeometricRepresentationItem] = new IfcEntityDescriptor(Type::IfcGeometricRepresentationItem,entity_descriptor_map.find(Type::IfcRepresentationItem)->second);
 
     current = entity_descriptor_map[Type::IfcGeometricRepresentationSubContext] = new IfcEntityDescriptor(Type::IfcGeometricRepresentationSubContext,entity_descriptor_map.find(Type::IfcGeometricRepresentationContext)->second);
-    current->add("ParentContext",false,IfcUtil::Argument_ENTITY);
-    current->add("TargetScale",true,IfcUtil::Argument_DOUBLE);
+    current->add("ParentContext",false,IfcUtil::Argument_ENTITY,Type::IfcGeometricRepresentationContext);
+    current->add("TargetScale",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveRatioMeasure);
     current->add("TargetView",false,IfcUtil::Argument_ENUMERATION,Type::IfcGeometricProjectionEnum);
-    current->add("UserDefinedTargetView",true,IfcUtil::Argument_STRING);
+    current->add("UserDefinedTargetView",true,IfcUtil::Argument_STRING,Type::IfcLabel);
     current = entity_descriptor_map[Type::IfcGeometricSet] = new IfcEntityDescriptor(Type::IfcGeometricSet,entity_descriptor_map.find(Type::IfcGeometricRepresentationItem)->second);
-    current->add("Elements",false,IfcUtil::Argument_ENTITY_LIST);
+    current->add("Elements",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcGeometricSetSelect);
     current = entity_descriptor_map[Type::IfcGridPlacement] = new IfcEntityDescriptor(Type::IfcGridPlacement,entity_descriptor_map.find(Type::IfcObjectPlacement)->second);
-    current->add("PlacementLocation",false,IfcUtil::Argument_ENTITY);
-    current->add("PlacementRefDirection",true,IfcUtil::Argument_ENTITY);
+    current->add("PlacementLocation",false,IfcUtil::Argument_ENTITY,Type::IfcVirtualGridIntersection);
+    current->add("PlacementRefDirection",true,IfcUtil::Argument_ENTITY,Type::IfcVirtualGridIntersection);
     current = entity_descriptor_map[Type::IfcHalfSpaceSolid] = new IfcEntityDescriptor(Type::IfcHalfSpaceSolid,entity_descriptor_map.find(Type::IfcGeometricRepresentationItem)->second);
-    current->add("BaseSurface",false,IfcUtil::Argument_ENTITY);
-    current->add("AgreementFlag",false,IfcUtil::Argument_BOOL);
+    current->add("BaseSurface",false,IfcUtil::Argument_ENTITY,Type::IfcSurface);
+    current->add("AgreementFlag",false,IfcUtil::Argument_BOOL,Type::UNDEFINED);
     current = entity_descriptor_map[Type::IfcHygroscopicMaterialProperties] = new IfcEntityDescriptor(Type::IfcHygroscopicMaterialProperties,entity_descriptor_map.find(Type::IfcMaterialProperties)->second);
-    current->add("UpperVaporResistanceFactor",true,IfcUtil::Argument_DOUBLE);
-    current->add("LowerVaporResistanceFactor",true,IfcUtil::Argument_DOUBLE);
-    current->add("IsothermalMoistureCapacity",true,IfcUtil::Argument_DOUBLE);
-    current->add("VaporPermeability",true,IfcUtil::Argument_DOUBLE);
-    current->add("MoistureDiffusivity",true,IfcUtil::Argument_DOUBLE);
+    current->add("UpperVaporResistanceFactor",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveRatioMeasure);
+    current->add("LowerVaporResistanceFactor",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveRatioMeasure);
+    current->add("IsothermalMoistureCapacity",true,IfcUtil::Argument_DOUBLE,Type::IfcIsothermalMoistureCapacityMeasure);
+    current->add("VaporPermeability",true,IfcUtil::Argument_DOUBLE,Type::IfcVaporPermeabilityMeasure);
+    current->add("MoistureDiffusivity",true,IfcUtil::Argument_DOUBLE,Type::IfcMoistureDiffusivityMeasure);
     current = entity_descriptor_map[Type::IfcImageTexture] = new IfcEntityDescriptor(Type::IfcImageTexture,entity_descriptor_map.find(Type::IfcSurfaceTexture)->second);
-    current->add("UrlReference",false,IfcUtil::Argument_STRING);
+    current->add("UrlReference",false,IfcUtil::Argument_STRING,Type::IfcIdentifier);
     current = entity_descriptor_map[Type::IfcIrregularTimeSeries] = new IfcEntityDescriptor(Type::IfcIrregularTimeSeries,entity_descriptor_map.find(Type::IfcTimeSeries)->second);
-    current->add("Values",false,IfcUtil::Argument_ENTITY_LIST);
+    current->add("Values",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcIrregularTimeSeriesValue);
     current = entity_descriptor_map[Type::IfcLightSource] = new IfcEntityDescriptor(Type::IfcLightSource,entity_descriptor_map.find(Type::IfcGeometricRepresentationItem)->second);
-    current->add("Name",true,IfcUtil::Argument_STRING);
-    current->add("LightColour",false,IfcUtil::Argument_ENTITY);
-    current->add("AmbientIntensity",true,IfcUtil::Argument_DOUBLE);
-    current->add("Intensity",true,IfcUtil::Argument_DOUBLE);
+    current->add("Name",true,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("LightColour",false,IfcUtil::Argument_ENTITY,Type::IfcColourRgb);
+    current->add("AmbientIntensity",true,IfcUtil::Argument_DOUBLE,Type::IfcNormalisedRatioMeasure);
+    current->add("Intensity",true,IfcUtil::Argument_DOUBLE,Type::IfcNormalisedRatioMeasure);
     current = entity_descriptor_map[Type::IfcLightSourceAmbient] = new IfcEntityDescriptor(Type::IfcLightSourceAmbient,entity_descriptor_map.find(Type::IfcLightSource)->second);
 
     current = entity_descriptor_map[Type::IfcLightSourceDirectional] = new IfcEntityDescriptor(Type::IfcLightSourceDirectional,entity_descriptor_map.find(Type::IfcLightSource)->second);
-    current->add("Orientation",false,IfcUtil::Argument_ENTITY);
+    current->add("Orientation",false,IfcUtil::Argument_ENTITY,Type::IfcDirection);
     current = entity_descriptor_map[Type::IfcLightSourceGoniometric] = new IfcEntityDescriptor(Type::IfcLightSourceGoniometric,entity_descriptor_map.find(Type::IfcLightSource)->second);
-    current->add("Position",false,IfcUtil::Argument_ENTITY);
-    current->add("ColourAppearance",true,IfcUtil::Argument_ENTITY);
-    current->add("ColourTemperature",false,IfcUtil::Argument_DOUBLE);
-    current->add("LuminousFlux",false,IfcUtil::Argument_DOUBLE);
+    current->add("Position",false,IfcUtil::Argument_ENTITY,Type::IfcAxis2Placement3D);
+    current->add("ColourAppearance",true,IfcUtil::Argument_ENTITY,Type::IfcColourRgb);
+    current->add("ColourTemperature",false,IfcUtil::Argument_DOUBLE,Type::IfcThermodynamicTemperatureMeasure);
+    current->add("LuminousFlux",false,IfcUtil::Argument_DOUBLE,Type::IfcLuminousFluxMeasure);
     current->add("LightEmissionSource",false,IfcUtil::Argument_ENUMERATION,Type::IfcLightEmissionSourceEnum);
-    current->add("LightDistributionDataSource",false,IfcUtil::Argument_ENTITY);
+    current->add("LightDistributionDataSource",false,IfcUtil::Argument_ENTITY,Type::IfcLightDistributionDataSourceSelect);
     current = entity_descriptor_map[Type::IfcLightSourcePositional] = new IfcEntityDescriptor(Type::IfcLightSourcePositional,entity_descriptor_map.find(Type::IfcLightSource)->second);
-    current->add("Position",false,IfcUtil::Argument_ENTITY);
-    current->add("Radius",false,IfcUtil::Argument_DOUBLE);
-    current->add("ConstantAttenuation",false,IfcUtil::Argument_DOUBLE);
-    current->add("DistanceAttenuation",false,IfcUtil::Argument_DOUBLE);
-    current->add("QuadricAttenuation",false,IfcUtil::Argument_DOUBLE);
+    current->add("Position",false,IfcUtil::Argument_ENTITY,Type::IfcCartesianPoint);
+    current->add("Radius",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("ConstantAttenuation",false,IfcUtil::Argument_DOUBLE,Type::IfcReal);
+    current->add("DistanceAttenuation",false,IfcUtil::Argument_DOUBLE,Type::IfcReal);
+    current->add("QuadricAttenuation",false,IfcUtil::Argument_DOUBLE,Type::IfcReal);
     current = entity_descriptor_map[Type::IfcLightSourceSpot] = new IfcEntityDescriptor(Type::IfcLightSourceSpot,entity_descriptor_map.find(Type::IfcLightSourcePositional)->second);
-    current->add("Orientation",false,IfcUtil::Argument_ENTITY);
-    current->add("ConcentrationExponent",true,IfcUtil::Argument_DOUBLE);
-    current->add("SpreadAngle",false,IfcUtil::Argument_DOUBLE);
-    current->add("BeamWidthAngle",false,IfcUtil::Argument_DOUBLE);
+    current->add("Orientation",false,IfcUtil::Argument_ENTITY,Type::IfcDirection);
+    current->add("ConcentrationExponent",true,IfcUtil::Argument_DOUBLE,Type::IfcReal);
+    current->add("SpreadAngle",false,IfcUtil::Argument_DOUBLE,Type::IfcPositivePlaneAngleMeasure);
+    current->add("BeamWidthAngle",false,IfcUtil::Argument_DOUBLE,Type::IfcPositivePlaneAngleMeasure);
     current = entity_descriptor_map[Type::IfcLocalPlacement] = new IfcEntityDescriptor(Type::IfcLocalPlacement,entity_descriptor_map.find(Type::IfcObjectPlacement)->second);
-    current->add("PlacementRelTo",true,IfcUtil::Argument_ENTITY);
-    current->add("RelativePlacement",false,IfcUtil::Argument_ENTITY);
+    current->add("PlacementRelTo",true,IfcUtil::Argument_ENTITY,Type::IfcObjectPlacement);
+    current->add("RelativePlacement",false,IfcUtil::Argument_ENTITY,Type::IfcAxis2Placement);
     current = entity_descriptor_map[Type::IfcLoop] = new IfcEntityDescriptor(Type::IfcLoop,entity_descriptor_map.find(Type::IfcTopologicalRepresentationItem)->second);
 
     current = entity_descriptor_map[Type::IfcMappedItem] = new IfcEntityDescriptor(Type::IfcMappedItem,entity_descriptor_map.find(Type::IfcRepresentationItem)->second);
-    current->add("MappingSource",false,IfcUtil::Argument_ENTITY);
-    current->add("MappingTarget",false,IfcUtil::Argument_ENTITY);
+    current->add("MappingSource",false,IfcUtil::Argument_ENTITY,Type::IfcRepresentationMap);
+    current->add("MappingTarget",false,IfcUtil::Argument_ENTITY,Type::IfcCartesianTransformationOperator);
     current = entity_descriptor_map[Type::IfcMaterialDefinitionRepresentation] = new IfcEntityDescriptor(Type::IfcMaterialDefinitionRepresentation,entity_descriptor_map.find(Type::IfcProductRepresentation)->second);
-    current->add("RepresentedMaterial",false,IfcUtil::Argument_ENTITY);
+    current->add("RepresentedMaterial",false,IfcUtil::Argument_ENTITY,Type::IfcMaterial);
     current = entity_descriptor_map[Type::IfcMechanicalConcreteMaterialProperties] = new IfcEntityDescriptor(Type::IfcMechanicalConcreteMaterialProperties,entity_descriptor_map.find(Type::IfcMechanicalMaterialProperties)->second);
-    current->add("CompressiveStrength",true,IfcUtil::Argument_DOUBLE);
-    current->add("MaxAggregateSize",true,IfcUtil::Argument_DOUBLE);
-    current->add("AdmixturesDescription",true,IfcUtil::Argument_STRING);
-    current->add("Workability",true,IfcUtil::Argument_STRING);
-    current->add("ProtectivePoreRatio",true,IfcUtil::Argument_DOUBLE);
-    current->add("WaterImpermeability",true,IfcUtil::Argument_STRING);
+    current->add("CompressiveStrength",true,IfcUtil::Argument_DOUBLE,Type::IfcPressureMeasure);
+    current->add("MaxAggregateSize",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("AdmixturesDescription",true,IfcUtil::Argument_STRING,Type::IfcText);
+    current->add("Workability",true,IfcUtil::Argument_STRING,Type::IfcText);
+    current->add("ProtectivePoreRatio",true,IfcUtil::Argument_DOUBLE,Type::IfcNormalisedRatioMeasure);
+    current->add("WaterImpermeability",true,IfcUtil::Argument_STRING,Type::IfcText);
     current = entity_descriptor_map[Type::IfcObjectDefinition] = new IfcEntityDescriptor(Type::IfcObjectDefinition,entity_descriptor_map.find(Type::IfcRoot)->second);
 
     current = entity_descriptor_map[Type::IfcOneDirectionRepeatFactor] = new IfcEntityDescriptor(Type::IfcOneDirectionRepeatFactor,entity_descriptor_map.find(Type::IfcGeometricRepresentationItem)->second);
-    current->add("RepeatFactor",false,IfcUtil::Argument_ENTITY);
+    current->add("RepeatFactor",false,IfcUtil::Argument_ENTITY,Type::IfcVector);
     current = entity_descriptor_map[Type::IfcOpenShell] = new IfcEntityDescriptor(Type::IfcOpenShell,entity_descriptor_map.find(Type::IfcConnectedFaceSet)->second);
 
     current = entity_descriptor_map[Type::IfcOrientedEdge] = new IfcEntityDescriptor(Type::IfcOrientedEdge,entity_descriptor_map.find(Type::IfcEdge)->second);
-    current->add("EdgeElement",false,IfcUtil::Argument_ENTITY);
-    current->add("Orientation",false,IfcUtil::Argument_BOOL);
+    current->add("EdgeElement",false,IfcUtil::Argument_ENTITY,Type::IfcEdge);
+    current->add("Orientation",false,IfcUtil::Argument_BOOL,Type::UNDEFINED);
     current = entity_descriptor_map[Type::IfcParameterizedProfileDef] = new IfcEntityDescriptor(Type::IfcParameterizedProfileDef,entity_descriptor_map.find(Type::IfcProfileDef)->second);
-    current->add("Position",false,IfcUtil::Argument_ENTITY);
+    current->add("Position",false,IfcUtil::Argument_ENTITY,Type::IfcAxis2Placement2D);
     current = entity_descriptor_map[Type::IfcPath] = new IfcEntityDescriptor(Type::IfcPath,entity_descriptor_map.find(Type::IfcTopologicalRepresentationItem)->second);
-    current->add("EdgeList",false,IfcUtil::Argument_ENTITY_LIST);
+    current->add("EdgeList",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcOrientedEdge);
     current = entity_descriptor_map[Type::IfcPhysicalComplexQuantity] = new IfcEntityDescriptor(Type::IfcPhysicalComplexQuantity,entity_descriptor_map.find(Type::IfcPhysicalQuantity)->second);
-    current->add("HasQuantities",false,IfcUtil::Argument_ENTITY_LIST);
-    current->add("Discrimination",false,IfcUtil::Argument_STRING);
-    current->add("Quality",true,IfcUtil::Argument_STRING);
-    current->add("Usage",true,IfcUtil::Argument_STRING);
+    current->add("HasQuantities",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcPhysicalQuantity);
+    current->add("Discrimination",false,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("Quality",true,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("Usage",true,IfcUtil::Argument_STRING,Type::IfcLabel);
     current = entity_descriptor_map[Type::IfcPixelTexture] = new IfcEntityDescriptor(Type::IfcPixelTexture,entity_descriptor_map.find(Type::IfcSurfaceTexture)->second);
-    current->add("Width",false,IfcUtil::Argument_INT);
-    current->add("Height",false,IfcUtil::Argument_INT);
-    current->add("ColourComponents",false,IfcUtil::Argument_INT);
+    current->add("Width",false,IfcUtil::Argument_INT,Type::IfcInteger);
+    current->add("Height",false,IfcUtil::Argument_INT,Type::IfcInteger);
+    current->add("ColourComponents",false,IfcUtil::Argument_INT,Type::IfcInteger);
     current = entity_descriptor_map[Type::IfcPlacement] = new IfcEntityDescriptor(Type::IfcPlacement,entity_descriptor_map.find(Type::IfcGeometricRepresentationItem)->second);
-    current->add("Location",false,IfcUtil::Argument_ENTITY);
+    current->add("Location",false,IfcUtil::Argument_ENTITY,Type::IfcCartesianPoint);
     current = entity_descriptor_map[Type::IfcPlanarExtent] = new IfcEntityDescriptor(Type::IfcPlanarExtent,entity_descriptor_map.find(Type::IfcGeometricRepresentationItem)->second);
-    current->add("SizeInX",false,IfcUtil::Argument_DOUBLE);
-    current->add("SizeInY",false,IfcUtil::Argument_DOUBLE);
+    current->add("SizeInX",false,IfcUtil::Argument_DOUBLE,Type::IfcLengthMeasure);
+    current->add("SizeInY",false,IfcUtil::Argument_DOUBLE,Type::IfcLengthMeasure);
     current = entity_descriptor_map[Type::IfcPoint] = new IfcEntityDescriptor(Type::IfcPoint,entity_descriptor_map.find(Type::IfcGeometricRepresentationItem)->second);
 
     current = entity_descriptor_map[Type::IfcPointOnCurve] = new IfcEntityDescriptor(Type::IfcPointOnCurve,entity_descriptor_map.find(Type::IfcPoint)->second);
-    current->add("BasisCurve",false,IfcUtil::Argument_ENTITY);
-    current->add("PointParameter",false,IfcUtil::Argument_DOUBLE);
+    current->add("BasisCurve",false,IfcUtil::Argument_ENTITY,Type::IfcCurve);
+    current->add("PointParameter",false,IfcUtil::Argument_DOUBLE,Type::IfcParameterValue);
     current = entity_descriptor_map[Type::IfcPointOnSurface] = new IfcEntityDescriptor(Type::IfcPointOnSurface,entity_descriptor_map.find(Type::IfcPoint)->second);
-    current->add("BasisSurface",false,IfcUtil::Argument_ENTITY);
-    current->add("PointParameterU",false,IfcUtil::Argument_DOUBLE);
-    current->add("PointParameterV",false,IfcUtil::Argument_DOUBLE);
+    current->add("BasisSurface",false,IfcUtil::Argument_ENTITY,Type::IfcSurface);
+    current->add("PointParameterU",false,IfcUtil::Argument_DOUBLE,Type::IfcParameterValue);
+    current->add("PointParameterV",false,IfcUtil::Argument_DOUBLE,Type::IfcParameterValue);
     current = entity_descriptor_map[Type::IfcPolyLoop] = new IfcEntityDescriptor(Type::IfcPolyLoop,entity_descriptor_map.find(Type::IfcLoop)->second);
-    current->add("Polygon",false,IfcUtil::Argument_ENTITY_LIST);
+    current->add("Polygon",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcCartesianPoint);
     current = entity_descriptor_map[Type::IfcPolygonalBoundedHalfSpace] = new IfcEntityDescriptor(Type::IfcPolygonalBoundedHalfSpace,entity_descriptor_map.find(Type::IfcHalfSpaceSolid)->second);
-    current->add("Position",false,IfcUtil::Argument_ENTITY);
-    current->add("PolygonalBoundary",false,IfcUtil::Argument_ENTITY);
+    current->add("Position",false,IfcUtil::Argument_ENTITY,Type::IfcAxis2Placement3D);
+    current->add("PolygonalBoundary",false,IfcUtil::Argument_ENTITY,Type::IfcBoundedCurve);
     current = entity_descriptor_map[Type::IfcPreDefinedColour] = new IfcEntityDescriptor(Type::IfcPreDefinedColour,entity_descriptor_map.find(Type::IfcPreDefinedItem)->second);
 
     current = entity_descriptor_map[Type::IfcPreDefinedCurveFont] = new IfcEntityDescriptor(Type::IfcPreDefinedCurveFont,entity_descriptor_map.find(Type::IfcPreDefinedItem)->second);
@@ -1122,412 +1136,412 @@ void InitDescriptorMap() {
     current = entity_descriptor_map[Type::IfcProductDefinitionShape] = new IfcEntityDescriptor(Type::IfcProductDefinitionShape,entity_descriptor_map.find(Type::IfcProductRepresentation)->second);
 
     current = entity_descriptor_map[Type::IfcPropertyBoundedValue] = new IfcEntityDescriptor(Type::IfcPropertyBoundedValue,entity_descriptor_map.find(Type::IfcSimpleProperty)->second);
-    current->add("UpperBoundValue",true,IfcUtil::Argument_ENTITY);
-    current->add("LowerBoundValue",true,IfcUtil::Argument_ENTITY);
-    current->add("Unit",true,IfcUtil::Argument_ENTITY);
+    current->add("UpperBoundValue",true,IfcUtil::Argument_ENTITY,Type::IfcValue);
+    current->add("LowerBoundValue",true,IfcUtil::Argument_ENTITY,Type::IfcValue);
+    current->add("Unit",true,IfcUtil::Argument_ENTITY,Type::IfcUnit);
     current = entity_descriptor_map[Type::IfcPropertyDefinition] = new IfcEntityDescriptor(Type::IfcPropertyDefinition,entity_descriptor_map.find(Type::IfcRoot)->second);
 
     current = entity_descriptor_map[Type::IfcPropertyEnumeratedValue] = new IfcEntityDescriptor(Type::IfcPropertyEnumeratedValue,entity_descriptor_map.find(Type::IfcSimpleProperty)->second);
-    current->add("EnumerationValues",false,IfcUtil::Argument_ENTITY_LIST);
-    current->add("EnumerationReference",true,IfcUtil::Argument_ENTITY);
+    current->add("EnumerationValues",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcValue);
+    current->add("EnumerationReference",true,IfcUtil::Argument_ENTITY,Type::IfcPropertyEnumeration);
     current = entity_descriptor_map[Type::IfcPropertyListValue] = new IfcEntityDescriptor(Type::IfcPropertyListValue,entity_descriptor_map.find(Type::IfcSimpleProperty)->second);
-    current->add("ListValues",false,IfcUtil::Argument_ENTITY_LIST);
-    current->add("Unit",true,IfcUtil::Argument_ENTITY);
+    current->add("ListValues",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcValue);
+    current->add("Unit",true,IfcUtil::Argument_ENTITY,Type::IfcUnit);
     current = entity_descriptor_map[Type::IfcPropertyReferenceValue] = new IfcEntityDescriptor(Type::IfcPropertyReferenceValue,entity_descriptor_map.find(Type::IfcSimpleProperty)->second);
-    current->add("UsageName",true,IfcUtil::Argument_STRING);
-    current->add("PropertyReference",false,IfcUtil::Argument_ENTITY);
+    current->add("UsageName",true,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("PropertyReference",false,IfcUtil::Argument_ENTITY,Type::IfcObjectReferenceSelect);
     current = entity_descriptor_map[Type::IfcPropertySetDefinition] = new IfcEntityDescriptor(Type::IfcPropertySetDefinition,entity_descriptor_map.find(Type::IfcPropertyDefinition)->second);
 
     current = entity_descriptor_map[Type::IfcPropertySingleValue] = new IfcEntityDescriptor(Type::IfcPropertySingleValue,entity_descriptor_map.find(Type::IfcSimpleProperty)->second);
-    current->add("NominalValue",true,IfcUtil::Argument_ENTITY);
-    current->add("Unit",true,IfcUtil::Argument_ENTITY);
+    current->add("NominalValue",true,IfcUtil::Argument_ENTITY,Type::IfcValue);
+    current->add("Unit",true,IfcUtil::Argument_ENTITY,Type::IfcUnit);
     current = entity_descriptor_map[Type::IfcPropertyTableValue] = new IfcEntityDescriptor(Type::IfcPropertyTableValue,entity_descriptor_map.find(Type::IfcSimpleProperty)->second);
-    current->add("DefiningValues",false,IfcUtil::Argument_ENTITY_LIST);
-    current->add("DefinedValues",false,IfcUtil::Argument_ENTITY_LIST);
-    current->add("Expression",true,IfcUtil::Argument_STRING);
-    current->add("DefiningUnit",true,IfcUtil::Argument_ENTITY);
-    current->add("DefinedUnit",true,IfcUtil::Argument_ENTITY);
+    current->add("DefiningValues",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcValue);
+    current->add("DefinedValues",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcValue);
+    current->add("Expression",true,IfcUtil::Argument_STRING,Type::IfcText);
+    current->add("DefiningUnit",true,IfcUtil::Argument_ENTITY,Type::IfcUnit);
+    current->add("DefinedUnit",true,IfcUtil::Argument_ENTITY,Type::IfcUnit);
     current = entity_descriptor_map[Type::IfcRectangleProfileDef] = new IfcEntityDescriptor(Type::IfcRectangleProfileDef,entity_descriptor_map.find(Type::IfcParameterizedProfileDef)->second);
-    current->add("XDim",false,IfcUtil::Argument_DOUBLE);
-    current->add("YDim",false,IfcUtil::Argument_DOUBLE);
+    current->add("XDim",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("YDim",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
     current = entity_descriptor_map[Type::IfcRegularTimeSeries] = new IfcEntityDescriptor(Type::IfcRegularTimeSeries,entity_descriptor_map.find(Type::IfcTimeSeries)->second);
-    current->add("TimeStep",false,IfcUtil::Argument_DOUBLE);
-    current->add("Values",false,IfcUtil::Argument_ENTITY_LIST);
+    current->add("TimeStep",false,IfcUtil::Argument_DOUBLE,Type::IfcTimeMeasure);
+    current->add("Values",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcTimeSeriesValue);
     current = entity_descriptor_map[Type::IfcReinforcementDefinitionProperties] = new IfcEntityDescriptor(Type::IfcReinforcementDefinitionProperties,entity_descriptor_map.find(Type::IfcPropertySetDefinition)->second);
-    current->add("DefinitionType",true,IfcUtil::Argument_STRING);
-    current->add("ReinforcementSectionDefinitions",false,IfcUtil::Argument_ENTITY_LIST);
+    current->add("DefinitionType",true,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("ReinforcementSectionDefinitions",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcSectionReinforcementProperties);
     current = entity_descriptor_map[Type::IfcRelationship] = new IfcEntityDescriptor(Type::IfcRelationship,entity_descriptor_map.find(Type::IfcRoot)->second);
 
     current = entity_descriptor_map[Type::IfcRoundedRectangleProfileDef] = new IfcEntityDescriptor(Type::IfcRoundedRectangleProfileDef,entity_descriptor_map.find(Type::IfcRectangleProfileDef)->second);
-    current->add("RoundingRadius",false,IfcUtil::Argument_DOUBLE);
+    current->add("RoundingRadius",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
     current = entity_descriptor_map[Type::IfcSectionedSpine] = new IfcEntityDescriptor(Type::IfcSectionedSpine,entity_descriptor_map.find(Type::IfcGeometricRepresentationItem)->second);
-    current->add("SpineCurve",false,IfcUtil::Argument_ENTITY);
-    current->add("CrossSections",false,IfcUtil::Argument_ENTITY_LIST);
-    current->add("CrossSectionPositions",false,IfcUtil::Argument_ENTITY_LIST);
+    current->add("SpineCurve",false,IfcUtil::Argument_ENTITY,Type::IfcCompositeCurve);
+    current->add("CrossSections",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcProfileDef);
+    current->add("CrossSectionPositions",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcAxis2Placement3D);
     current = entity_descriptor_map[Type::IfcServiceLifeFactor] = new IfcEntityDescriptor(Type::IfcServiceLifeFactor,entity_descriptor_map.find(Type::IfcPropertySetDefinition)->second);
     current->add("PredefinedType",false,IfcUtil::Argument_ENUMERATION,Type::IfcServiceLifeFactorTypeEnum);
-    current->add("UpperValue",true,IfcUtil::Argument_ENTITY);
-    current->add("MostUsedValue",false,IfcUtil::Argument_ENTITY);
-    current->add("LowerValue",true,IfcUtil::Argument_ENTITY);
+    current->add("UpperValue",true,IfcUtil::Argument_ENTITY,Type::IfcMeasureValue);
+    current->add("MostUsedValue",false,IfcUtil::Argument_ENTITY,Type::IfcMeasureValue);
+    current->add("LowerValue",true,IfcUtil::Argument_ENTITY,Type::IfcMeasureValue);
     current = entity_descriptor_map[Type::IfcShellBasedSurfaceModel] = new IfcEntityDescriptor(Type::IfcShellBasedSurfaceModel,entity_descriptor_map.find(Type::IfcGeometricRepresentationItem)->second);
-    current->add("SbsmBoundary",false,IfcUtil::Argument_ENTITY_LIST);
+    current->add("SbsmBoundary",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcShell);
     current = entity_descriptor_map[Type::IfcSlippageConnectionCondition] = new IfcEntityDescriptor(Type::IfcSlippageConnectionCondition,entity_descriptor_map.find(Type::IfcStructuralConnectionCondition)->second);
-    current->add("SlippageX",true,IfcUtil::Argument_DOUBLE);
-    current->add("SlippageY",true,IfcUtil::Argument_DOUBLE);
-    current->add("SlippageZ",true,IfcUtil::Argument_DOUBLE);
+    current->add("SlippageX",true,IfcUtil::Argument_DOUBLE,Type::IfcLengthMeasure);
+    current->add("SlippageY",true,IfcUtil::Argument_DOUBLE,Type::IfcLengthMeasure);
+    current->add("SlippageZ",true,IfcUtil::Argument_DOUBLE,Type::IfcLengthMeasure);
     current = entity_descriptor_map[Type::IfcSolidModel] = new IfcEntityDescriptor(Type::IfcSolidModel,entity_descriptor_map.find(Type::IfcGeometricRepresentationItem)->second);
 
     current = entity_descriptor_map[Type::IfcSoundProperties] = new IfcEntityDescriptor(Type::IfcSoundProperties,entity_descriptor_map.find(Type::IfcPropertySetDefinition)->second);
-    current->add("IsAttenuating",false,IfcUtil::Argument_BOOL);
+    current->add("IsAttenuating",false,IfcUtil::Argument_BOOL,Type::IfcBoolean);
     current->add("SoundScale",true,IfcUtil::Argument_ENUMERATION,Type::IfcSoundScaleEnum);
-    current->add("SoundValues",false,IfcUtil::Argument_ENTITY_LIST);
+    current->add("SoundValues",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcSoundValue);
     current = entity_descriptor_map[Type::IfcSoundValue] = new IfcEntityDescriptor(Type::IfcSoundValue,entity_descriptor_map.find(Type::IfcPropertySetDefinition)->second);
-    current->add("SoundLevelTimeSeries",true,IfcUtil::Argument_ENTITY);
-    current->add("Frequency",false,IfcUtil::Argument_DOUBLE);
-    current->add("SoundLevelSingleValue",true,IfcUtil::Argument_ENTITY);
+    current->add("SoundLevelTimeSeries",true,IfcUtil::Argument_ENTITY,Type::IfcTimeSeries);
+    current->add("Frequency",false,IfcUtil::Argument_DOUBLE,Type::IfcFrequencyMeasure);
+    current->add("SoundLevelSingleValue",true,IfcUtil::Argument_ENTITY,Type::IfcDerivedMeasureValue);
     current = entity_descriptor_map[Type::IfcSpaceThermalLoadProperties] = new IfcEntityDescriptor(Type::IfcSpaceThermalLoadProperties,entity_descriptor_map.find(Type::IfcPropertySetDefinition)->second);
-    current->add("ApplicableValueRatio",true,IfcUtil::Argument_DOUBLE);
+    current->add("ApplicableValueRatio",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveRatioMeasure);
     current->add("ThermalLoadSource",false,IfcUtil::Argument_ENUMERATION,Type::IfcThermalLoadSourceEnum);
     current->add("PropertySource",false,IfcUtil::Argument_ENUMERATION,Type::IfcPropertySourceEnum);
-    current->add("SourceDescription",true,IfcUtil::Argument_STRING);
-    current->add("MaximumValue",false,IfcUtil::Argument_DOUBLE);
-    current->add("MinimumValue",true,IfcUtil::Argument_DOUBLE);
-    current->add("ThermalLoadTimeSeriesValues",true,IfcUtil::Argument_ENTITY);
-    current->add("UserDefinedThermalLoadSource",true,IfcUtil::Argument_STRING);
-    current->add("UserDefinedPropertySource",true,IfcUtil::Argument_STRING);
+    current->add("SourceDescription",true,IfcUtil::Argument_STRING,Type::IfcText);
+    current->add("MaximumValue",false,IfcUtil::Argument_DOUBLE,Type::IfcPowerMeasure);
+    current->add("MinimumValue",true,IfcUtil::Argument_DOUBLE,Type::IfcPowerMeasure);
+    current->add("ThermalLoadTimeSeriesValues",true,IfcUtil::Argument_ENTITY,Type::IfcTimeSeries);
+    current->add("UserDefinedThermalLoadSource",true,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("UserDefinedPropertySource",true,IfcUtil::Argument_STRING,Type::IfcLabel);
     current->add("ThermalLoadType",false,IfcUtil::Argument_ENUMERATION,Type::IfcThermalLoadTypeEnum);
     current = entity_descriptor_map[Type::IfcStructuralLoadLinearForce] = new IfcEntityDescriptor(Type::IfcStructuralLoadLinearForce,entity_descriptor_map.find(Type::IfcStructuralLoadStatic)->second);
-    current->add("LinearForceX",true,IfcUtil::Argument_DOUBLE);
-    current->add("LinearForceY",true,IfcUtil::Argument_DOUBLE);
-    current->add("LinearForceZ",true,IfcUtil::Argument_DOUBLE);
-    current->add("LinearMomentX",true,IfcUtil::Argument_DOUBLE);
-    current->add("LinearMomentY",true,IfcUtil::Argument_DOUBLE);
-    current->add("LinearMomentZ",true,IfcUtil::Argument_DOUBLE);
+    current->add("LinearForceX",true,IfcUtil::Argument_DOUBLE,Type::IfcLinearForceMeasure);
+    current->add("LinearForceY",true,IfcUtil::Argument_DOUBLE,Type::IfcLinearForceMeasure);
+    current->add("LinearForceZ",true,IfcUtil::Argument_DOUBLE,Type::IfcLinearForceMeasure);
+    current->add("LinearMomentX",true,IfcUtil::Argument_DOUBLE,Type::IfcLinearMomentMeasure);
+    current->add("LinearMomentY",true,IfcUtil::Argument_DOUBLE,Type::IfcLinearMomentMeasure);
+    current->add("LinearMomentZ",true,IfcUtil::Argument_DOUBLE,Type::IfcLinearMomentMeasure);
     current = entity_descriptor_map[Type::IfcStructuralLoadPlanarForce] = new IfcEntityDescriptor(Type::IfcStructuralLoadPlanarForce,entity_descriptor_map.find(Type::IfcStructuralLoadStatic)->second);
-    current->add("PlanarForceX",true,IfcUtil::Argument_DOUBLE);
-    current->add("PlanarForceY",true,IfcUtil::Argument_DOUBLE);
-    current->add("PlanarForceZ",true,IfcUtil::Argument_DOUBLE);
+    current->add("PlanarForceX",true,IfcUtil::Argument_DOUBLE,Type::IfcPlanarForceMeasure);
+    current->add("PlanarForceY",true,IfcUtil::Argument_DOUBLE,Type::IfcPlanarForceMeasure);
+    current->add("PlanarForceZ",true,IfcUtil::Argument_DOUBLE,Type::IfcPlanarForceMeasure);
     current = entity_descriptor_map[Type::IfcStructuralLoadSingleDisplacement] = new IfcEntityDescriptor(Type::IfcStructuralLoadSingleDisplacement,entity_descriptor_map.find(Type::IfcStructuralLoadStatic)->second);
-    current->add("DisplacementX",true,IfcUtil::Argument_DOUBLE);
-    current->add("DisplacementY",true,IfcUtil::Argument_DOUBLE);
-    current->add("DisplacementZ",true,IfcUtil::Argument_DOUBLE);
-    current->add("RotationalDisplacementRX",true,IfcUtil::Argument_DOUBLE);
-    current->add("RotationalDisplacementRY",true,IfcUtil::Argument_DOUBLE);
-    current->add("RotationalDisplacementRZ",true,IfcUtil::Argument_DOUBLE);
+    current->add("DisplacementX",true,IfcUtil::Argument_DOUBLE,Type::IfcLengthMeasure);
+    current->add("DisplacementY",true,IfcUtil::Argument_DOUBLE,Type::IfcLengthMeasure);
+    current->add("DisplacementZ",true,IfcUtil::Argument_DOUBLE,Type::IfcLengthMeasure);
+    current->add("RotationalDisplacementRX",true,IfcUtil::Argument_DOUBLE,Type::IfcPlaneAngleMeasure);
+    current->add("RotationalDisplacementRY",true,IfcUtil::Argument_DOUBLE,Type::IfcPlaneAngleMeasure);
+    current->add("RotationalDisplacementRZ",true,IfcUtil::Argument_DOUBLE,Type::IfcPlaneAngleMeasure);
     current = entity_descriptor_map[Type::IfcStructuralLoadSingleDisplacementDistortion] = new IfcEntityDescriptor(Type::IfcStructuralLoadSingleDisplacementDistortion,entity_descriptor_map.find(Type::IfcStructuralLoadSingleDisplacement)->second);
-    current->add("Distortion",true,IfcUtil::Argument_DOUBLE);
+    current->add("Distortion",true,IfcUtil::Argument_DOUBLE,Type::IfcCurvatureMeasure);
     current = entity_descriptor_map[Type::IfcStructuralLoadSingleForce] = new IfcEntityDescriptor(Type::IfcStructuralLoadSingleForce,entity_descriptor_map.find(Type::IfcStructuralLoadStatic)->second);
-    current->add("ForceX",true,IfcUtil::Argument_DOUBLE);
-    current->add("ForceY",true,IfcUtil::Argument_DOUBLE);
-    current->add("ForceZ",true,IfcUtil::Argument_DOUBLE);
-    current->add("MomentX",true,IfcUtil::Argument_DOUBLE);
-    current->add("MomentY",true,IfcUtil::Argument_DOUBLE);
-    current->add("MomentZ",true,IfcUtil::Argument_DOUBLE);
+    current->add("ForceX",true,IfcUtil::Argument_DOUBLE,Type::IfcForceMeasure);
+    current->add("ForceY",true,IfcUtil::Argument_DOUBLE,Type::IfcForceMeasure);
+    current->add("ForceZ",true,IfcUtil::Argument_DOUBLE,Type::IfcForceMeasure);
+    current->add("MomentX",true,IfcUtil::Argument_DOUBLE,Type::IfcTorqueMeasure);
+    current->add("MomentY",true,IfcUtil::Argument_DOUBLE,Type::IfcTorqueMeasure);
+    current->add("MomentZ",true,IfcUtil::Argument_DOUBLE,Type::IfcTorqueMeasure);
     current = entity_descriptor_map[Type::IfcStructuralLoadSingleForceWarping] = new IfcEntityDescriptor(Type::IfcStructuralLoadSingleForceWarping,entity_descriptor_map.find(Type::IfcStructuralLoadSingleForce)->second);
-    current->add("WarpingMoment",true,IfcUtil::Argument_DOUBLE);
+    current->add("WarpingMoment",true,IfcUtil::Argument_DOUBLE,Type::IfcWarpingMomentMeasure);
     current = entity_descriptor_map[Type::IfcStructuralProfileProperties] = new IfcEntityDescriptor(Type::IfcStructuralProfileProperties,entity_descriptor_map.find(Type::IfcGeneralProfileProperties)->second);
-    current->add("TorsionalConstantX",true,IfcUtil::Argument_DOUBLE);
-    current->add("MomentOfInertiaYZ",true,IfcUtil::Argument_DOUBLE);
-    current->add("MomentOfInertiaY",true,IfcUtil::Argument_DOUBLE);
-    current->add("MomentOfInertiaZ",true,IfcUtil::Argument_DOUBLE);
-    current->add("WarpingConstant",true,IfcUtil::Argument_DOUBLE);
-    current->add("ShearCentreZ",true,IfcUtil::Argument_DOUBLE);
-    current->add("ShearCentreY",true,IfcUtil::Argument_DOUBLE);
-    current->add("ShearDeformationAreaZ",true,IfcUtil::Argument_DOUBLE);
-    current->add("ShearDeformationAreaY",true,IfcUtil::Argument_DOUBLE);
-    current->add("MaximumSectionModulusY",true,IfcUtil::Argument_DOUBLE);
-    current->add("MinimumSectionModulusY",true,IfcUtil::Argument_DOUBLE);
-    current->add("MaximumSectionModulusZ",true,IfcUtil::Argument_DOUBLE);
-    current->add("MinimumSectionModulusZ",true,IfcUtil::Argument_DOUBLE);
-    current->add("TorsionalSectionModulus",true,IfcUtil::Argument_DOUBLE);
-    current->add("CentreOfGravityInX",true,IfcUtil::Argument_DOUBLE);
-    current->add("CentreOfGravityInY",true,IfcUtil::Argument_DOUBLE);
+    current->add("TorsionalConstantX",true,IfcUtil::Argument_DOUBLE,Type::IfcMomentOfInertiaMeasure);
+    current->add("MomentOfInertiaYZ",true,IfcUtil::Argument_DOUBLE,Type::IfcMomentOfInertiaMeasure);
+    current->add("MomentOfInertiaY",true,IfcUtil::Argument_DOUBLE,Type::IfcMomentOfInertiaMeasure);
+    current->add("MomentOfInertiaZ",true,IfcUtil::Argument_DOUBLE,Type::IfcMomentOfInertiaMeasure);
+    current->add("WarpingConstant",true,IfcUtil::Argument_DOUBLE,Type::IfcWarpingConstantMeasure);
+    current->add("ShearCentreZ",true,IfcUtil::Argument_DOUBLE,Type::IfcLengthMeasure);
+    current->add("ShearCentreY",true,IfcUtil::Argument_DOUBLE,Type::IfcLengthMeasure);
+    current->add("ShearDeformationAreaZ",true,IfcUtil::Argument_DOUBLE,Type::IfcAreaMeasure);
+    current->add("ShearDeformationAreaY",true,IfcUtil::Argument_DOUBLE,Type::IfcAreaMeasure);
+    current->add("MaximumSectionModulusY",true,IfcUtil::Argument_DOUBLE,Type::IfcSectionModulusMeasure);
+    current->add("MinimumSectionModulusY",true,IfcUtil::Argument_DOUBLE,Type::IfcSectionModulusMeasure);
+    current->add("MaximumSectionModulusZ",true,IfcUtil::Argument_DOUBLE,Type::IfcSectionModulusMeasure);
+    current->add("MinimumSectionModulusZ",true,IfcUtil::Argument_DOUBLE,Type::IfcSectionModulusMeasure);
+    current->add("TorsionalSectionModulus",true,IfcUtil::Argument_DOUBLE,Type::IfcSectionModulusMeasure);
+    current->add("CentreOfGravityInX",true,IfcUtil::Argument_DOUBLE,Type::IfcLengthMeasure);
+    current->add("CentreOfGravityInY",true,IfcUtil::Argument_DOUBLE,Type::IfcLengthMeasure);
     current = entity_descriptor_map[Type::IfcStructuralSteelProfileProperties] = new IfcEntityDescriptor(Type::IfcStructuralSteelProfileProperties,entity_descriptor_map.find(Type::IfcStructuralProfileProperties)->second);
-    current->add("ShearAreaZ",true,IfcUtil::Argument_DOUBLE);
-    current->add("ShearAreaY",true,IfcUtil::Argument_DOUBLE);
-    current->add("PlasticShapeFactorY",true,IfcUtil::Argument_DOUBLE);
-    current->add("PlasticShapeFactorZ",true,IfcUtil::Argument_DOUBLE);
+    current->add("ShearAreaZ",true,IfcUtil::Argument_DOUBLE,Type::IfcAreaMeasure);
+    current->add("ShearAreaY",true,IfcUtil::Argument_DOUBLE,Type::IfcAreaMeasure);
+    current->add("PlasticShapeFactorY",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveRatioMeasure);
+    current->add("PlasticShapeFactorZ",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveRatioMeasure);
     current = entity_descriptor_map[Type::IfcSubedge] = new IfcEntityDescriptor(Type::IfcSubedge,entity_descriptor_map.find(Type::IfcEdge)->second);
-    current->add("ParentEdge",false,IfcUtil::Argument_ENTITY);
+    current->add("ParentEdge",false,IfcUtil::Argument_ENTITY,Type::IfcEdge);
     current = entity_descriptor_map[Type::IfcSurface] = new IfcEntityDescriptor(Type::IfcSurface,entity_descriptor_map.find(Type::IfcGeometricRepresentationItem)->second);
 
     current = entity_descriptor_map[Type::IfcSurfaceStyleRendering] = new IfcEntityDescriptor(Type::IfcSurfaceStyleRendering,entity_descriptor_map.find(Type::IfcSurfaceStyleShading)->second);
-    current->add("Transparency",true,IfcUtil::Argument_DOUBLE);
-    current->add("DiffuseColour",true,IfcUtil::Argument_ENTITY);
-    current->add("TransmissionColour",true,IfcUtil::Argument_ENTITY);
-    current->add("DiffuseTransmissionColour",true,IfcUtil::Argument_ENTITY);
-    current->add("ReflectionColour",true,IfcUtil::Argument_ENTITY);
-    current->add("SpecularColour",true,IfcUtil::Argument_ENTITY);
-    current->add("SpecularHighlight",true,IfcUtil::Argument_ENTITY);
+    current->add("Transparency",true,IfcUtil::Argument_DOUBLE,Type::IfcNormalisedRatioMeasure);
+    current->add("DiffuseColour",true,IfcUtil::Argument_ENTITY,Type::IfcColourOrFactor);
+    current->add("TransmissionColour",true,IfcUtil::Argument_ENTITY,Type::IfcColourOrFactor);
+    current->add("DiffuseTransmissionColour",true,IfcUtil::Argument_ENTITY,Type::IfcColourOrFactor);
+    current->add("ReflectionColour",true,IfcUtil::Argument_ENTITY,Type::IfcColourOrFactor);
+    current->add("SpecularColour",true,IfcUtil::Argument_ENTITY,Type::IfcColourOrFactor);
+    current->add("SpecularHighlight",true,IfcUtil::Argument_ENTITY,Type::IfcSpecularHighlightSelect);
     current->add("ReflectanceMethod",false,IfcUtil::Argument_ENUMERATION,Type::IfcReflectanceMethodEnum);
     current = entity_descriptor_map[Type::IfcSweptAreaSolid] = new IfcEntityDescriptor(Type::IfcSweptAreaSolid,entity_descriptor_map.find(Type::IfcSolidModel)->second);
-    current->add("SweptArea",false,IfcUtil::Argument_ENTITY);
-    current->add("Position",false,IfcUtil::Argument_ENTITY);
+    current->add("SweptArea",false,IfcUtil::Argument_ENTITY,Type::IfcProfileDef);
+    current->add("Position",false,IfcUtil::Argument_ENTITY,Type::IfcAxis2Placement3D);
     current = entity_descriptor_map[Type::IfcSweptDiskSolid] = new IfcEntityDescriptor(Type::IfcSweptDiskSolid,entity_descriptor_map.find(Type::IfcSolidModel)->second);
-    current->add("Directrix",false,IfcUtil::Argument_ENTITY);
-    current->add("Radius",false,IfcUtil::Argument_DOUBLE);
-    current->add("InnerRadius",true,IfcUtil::Argument_DOUBLE);
-    current->add("StartParam",false,IfcUtil::Argument_DOUBLE);
-    current->add("EndParam",false,IfcUtil::Argument_DOUBLE);
+    current->add("Directrix",false,IfcUtil::Argument_ENTITY,Type::IfcCurve);
+    current->add("Radius",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("InnerRadius",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("StartParam",false,IfcUtil::Argument_DOUBLE,Type::IfcParameterValue);
+    current->add("EndParam",false,IfcUtil::Argument_DOUBLE,Type::IfcParameterValue);
     current = entity_descriptor_map[Type::IfcSweptSurface] = new IfcEntityDescriptor(Type::IfcSweptSurface,entity_descriptor_map.find(Type::IfcSurface)->second);
-    current->add("SweptCurve",false,IfcUtil::Argument_ENTITY);
-    current->add("Position",false,IfcUtil::Argument_ENTITY);
+    current->add("SweptCurve",false,IfcUtil::Argument_ENTITY,Type::IfcProfileDef);
+    current->add("Position",false,IfcUtil::Argument_ENTITY,Type::IfcAxis2Placement3D);
     current = entity_descriptor_map[Type::IfcTShapeProfileDef] = new IfcEntityDescriptor(Type::IfcTShapeProfileDef,entity_descriptor_map.find(Type::IfcParameterizedProfileDef)->second);
-    current->add("Depth",false,IfcUtil::Argument_DOUBLE);
-    current->add("FlangeWidth",false,IfcUtil::Argument_DOUBLE);
-    current->add("WebThickness",false,IfcUtil::Argument_DOUBLE);
-    current->add("FlangeThickness",false,IfcUtil::Argument_DOUBLE);
-    current->add("FilletRadius",true,IfcUtil::Argument_DOUBLE);
-    current->add("FlangeEdgeRadius",true,IfcUtil::Argument_DOUBLE);
-    current->add("WebEdgeRadius",true,IfcUtil::Argument_DOUBLE);
-    current->add("WebSlope",true,IfcUtil::Argument_DOUBLE);
-    current->add("FlangeSlope",true,IfcUtil::Argument_DOUBLE);
-    current->add("CentreOfGravityInY",true,IfcUtil::Argument_DOUBLE);
+    current->add("Depth",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("FlangeWidth",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("WebThickness",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("FlangeThickness",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("FilletRadius",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("FlangeEdgeRadius",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("WebEdgeRadius",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("WebSlope",true,IfcUtil::Argument_DOUBLE,Type::IfcPlaneAngleMeasure);
+    current->add("FlangeSlope",true,IfcUtil::Argument_DOUBLE,Type::IfcPlaneAngleMeasure);
+    current->add("CentreOfGravityInY",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
     current = entity_descriptor_map[Type::IfcTerminatorSymbol] = new IfcEntityDescriptor(Type::IfcTerminatorSymbol,entity_descriptor_map.find(Type::IfcAnnotationSymbolOccurrence)->second);
-    current->add("AnnotatedCurve",false,IfcUtil::Argument_ENTITY);
+    current->add("AnnotatedCurve",false,IfcUtil::Argument_ENTITY,Type::IfcAnnotationCurveOccurrence);
     current = entity_descriptor_map[Type::IfcTextLiteral] = new IfcEntityDescriptor(Type::IfcTextLiteral,entity_descriptor_map.find(Type::IfcGeometricRepresentationItem)->second);
-    current->add("Literal",false,IfcUtil::Argument_STRING);
-    current->add("Placement",false,IfcUtil::Argument_ENTITY);
+    current->add("Literal",false,IfcUtil::Argument_STRING,Type::IfcPresentableText);
+    current->add("Placement",false,IfcUtil::Argument_ENTITY,Type::IfcAxis2Placement);
     current->add("Path",false,IfcUtil::Argument_ENUMERATION,Type::IfcTextPath);
     current = entity_descriptor_map[Type::IfcTextLiteralWithExtent] = new IfcEntityDescriptor(Type::IfcTextLiteralWithExtent,entity_descriptor_map.find(Type::IfcTextLiteral)->second);
-    current->add("Extent",false,IfcUtil::Argument_ENTITY);
-    current->add("BoxAlignment",false,IfcUtil::Argument_STRING);
+    current->add("Extent",false,IfcUtil::Argument_ENTITY,Type::IfcPlanarExtent);
+    current->add("BoxAlignment",false,IfcUtil::Argument_STRING,Type::IfcBoxAlignment);
     current = entity_descriptor_map[Type::IfcTrapeziumProfileDef] = new IfcEntityDescriptor(Type::IfcTrapeziumProfileDef,entity_descriptor_map.find(Type::IfcParameterizedProfileDef)->second);
-    current->add("BottomXDim",false,IfcUtil::Argument_DOUBLE);
-    current->add("TopXDim",false,IfcUtil::Argument_DOUBLE);
-    current->add("YDim",false,IfcUtil::Argument_DOUBLE);
-    current->add("TopXOffset",false,IfcUtil::Argument_DOUBLE);
+    current->add("BottomXDim",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("TopXDim",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("YDim",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("TopXOffset",false,IfcUtil::Argument_DOUBLE,Type::IfcLengthMeasure);
     current = entity_descriptor_map[Type::IfcTwoDirectionRepeatFactor] = new IfcEntityDescriptor(Type::IfcTwoDirectionRepeatFactor,entity_descriptor_map.find(Type::IfcOneDirectionRepeatFactor)->second);
-    current->add("SecondRepeatFactor",false,IfcUtil::Argument_ENTITY);
+    current->add("SecondRepeatFactor",false,IfcUtil::Argument_ENTITY,Type::IfcVector);
     current = entity_descriptor_map[Type::IfcTypeObject] = new IfcEntityDescriptor(Type::IfcTypeObject,entity_descriptor_map.find(Type::IfcObjectDefinition)->second);
-    current->add("ApplicableOccurrence",true,IfcUtil::Argument_STRING);
-    current->add("HasPropertySets",true,IfcUtil::Argument_ENTITY_LIST);
+    current->add("ApplicableOccurrence",true,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("HasPropertySets",true,IfcUtil::Argument_ENTITY_LIST,Type::IfcPropertySetDefinition);
     current = entity_descriptor_map[Type::IfcTypeProduct] = new IfcEntityDescriptor(Type::IfcTypeProduct,entity_descriptor_map.find(Type::IfcTypeObject)->second);
-    current->add("RepresentationMaps",true,IfcUtil::Argument_ENTITY_LIST);
-    current->add("Tag",true,IfcUtil::Argument_STRING);
+    current->add("RepresentationMaps",true,IfcUtil::Argument_ENTITY_LIST,Type::IfcRepresentationMap);
+    current->add("Tag",true,IfcUtil::Argument_STRING,Type::IfcLabel);
     current = entity_descriptor_map[Type::IfcUShapeProfileDef] = new IfcEntityDescriptor(Type::IfcUShapeProfileDef,entity_descriptor_map.find(Type::IfcParameterizedProfileDef)->second);
-    current->add("Depth",false,IfcUtil::Argument_DOUBLE);
-    current->add("FlangeWidth",false,IfcUtil::Argument_DOUBLE);
-    current->add("WebThickness",false,IfcUtil::Argument_DOUBLE);
-    current->add("FlangeThickness",false,IfcUtil::Argument_DOUBLE);
-    current->add("FilletRadius",true,IfcUtil::Argument_DOUBLE);
-    current->add("EdgeRadius",true,IfcUtil::Argument_DOUBLE);
-    current->add("FlangeSlope",true,IfcUtil::Argument_DOUBLE);
-    current->add("CentreOfGravityInX",true,IfcUtil::Argument_DOUBLE);
+    current->add("Depth",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("FlangeWidth",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("WebThickness",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("FlangeThickness",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("FilletRadius",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("EdgeRadius",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("FlangeSlope",true,IfcUtil::Argument_DOUBLE,Type::IfcPlaneAngleMeasure);
+    current->add("CentreOfGravityInX",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
     current = entity_descriptor_map[Type::IfcVector] = new IfcEntityDescriptor(Type::IfcVector,entity_descriptor_map.find(Type::IfcGeometricRepresentationItem)->second);
-    current->add("Orientation",false,IfcUtil::Argument_ENTITY);
-    current->add("Magnitude",false,IfcUtil::Argument_DOUBLE);
+    current->add("Orientation",false,IfcUtil::Argument_ENTITY,Type::IfcDirection);
+    current->add("Magnitude",false,IfcUtil::Argument_DOUBLE,Type::IfcLengthMeasure);
     current = entity_descriptor_map[Type::IfcVertexLoop] = new IfcEntityDescriptor(Type::IfcVertexLoop,entity_descriptor_map.find(Type::IfcLoop)->second);
-    current->add("LoopVertex",false,IfcUtil::Argument_ENTITY);
+    current->add("LoopVertex",false,IfcUtil::Argument_ENTITY,Type::IfcVertex);
     current = entity_descriptor_map[Type::IfcWindowLiningProperties] = new IfcEntityDescriptor(Type::IfcWindowLiningProperties,entity_descriptor_map.find(Type::IfcPropertySetDefinition)->second);
-    current->add("LiningDepth",true,IfcUtil::Argument_DOUBLE);
-    current->add("LiningThickness",true,IfcUtil::Argument_DOUBLE);
-    current->add("TransomThickness",true,IfcUtil::Argument_DOUBLE);
-    current->add("MullionThickness",true,IfcUtil::Argument_DOUBLE);
-    current->add("FirstTransomOffset",true,IfcUtil::Argument_DOUBLE);
-    current->add("SecondTransomOffset",true,IfcUtil::Argument_DOUBLE);
-    current->add("FirstMullionOffset",true,IfcUtil::Argument_DOUBLE);
-    current->add("SecondMullionOffset",true,IfcUtil::Argument_DOUBLE);
-    current->add("ShapeAspectStyle",true,IfcUtil::Argument_ENTITY);
+    current->add("LiningDepth",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("LiningThickness",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("TransomThickness",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("MullionThickness",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("FirstTransomOffset",true,IfcUtil::Argument_DOUBLE,Type::IfcNormalisedRatioMeasure);
+    current->add("SecondTransomOffset",true,IfcUtil::Argument_DOUBLE,Type::IfcNormalisedRatioMeasure);
+    current->add("FirstMullionOffset",true,IfcUtil::Argument_DOUBLE,Type::IfcNormalisedRatioMeasure);
+    current->add("SecondMullionOffset",true,IfcUtil::Argument_DOUBLE,Type::IfcNormalisedRatioMeasure);
+    current->add("ShapeAspectStyle",true,IfcUtil::Argument_ENTITY,Type::IfcShapeAspect);
     current = entity_descriptor_map[Type::IfcWindowPanelProperties] = new IfcEntityDescriptor(Type::IfcWindowPanelProperties,entity_descriptor_map.find(Type::IfcPropertySetDefinition)->second);
     current->add("OperationType",false,IfcUtil::Argument_ENUMERATION,Type::IfcWindowPanelOperationEnum);
     current->add("PanelPosition",false,IfcUtil::Argument_ENUMERATION,Type::IfcWindowPanelPositionEnum);
-    current->add("FrameDepth",true,IfcUtil::Argument_DOUBLE);
-    current->add("FrameThickness",true,IfcUtil::Argument_DOUBLE);
-    current->add("ShapeAspectStyle",true,IfcUtil::Argument_ENTITY);
+    current->add("FrameDepth",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("FrameThickness",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("ShapeAspectStyle",true,IfcUtil::Argument_ENTITY,Type::IfcShapeAspect);
     current = entity_descriptor_map[Type::IfcWindowStyle] = new IfcEntityDescriptor(Type::IfcWindowStyle,entity_descriptor_map.find(Type::IfcTypeProduct)->second);
     current->add("ConstructionType",false,IfcUtil::Argument_ENUMERATION,Type::IfcWindowStyleConstructionEnum);
     current->add("OperationType",false,IfcUtil::Argument_ENUMERATION,Type::IfcWindowStyleOperationEnum);
-    current->add("ParameterTakesPrecedence",false,IfcUtil::Argument_BOOL);
-    current->add("Sizeable",false,IfcUtil::Argument_BOOL);
+    current->add("ParameterTakesPrecedence",false,IfcUtil::Argument_BOOL,Type::UNDEFINED);
+    current->add("Sizeable",false,IfcUtil::Argument_BOOL,Type::UNDEFINED);
     current = entity_descriptor_map[Type::IfcZShapeProfileDef] = new IfcEntityDescriptor(Type::IfcZShapeProfileDef,entity_descriptor_map.find(Type::IfcParameterizedProfileDef)->second);
-    current->add("Depth",false,IfcUtil::Argument_DOUBLE);
-    current->add("FlangeWidth",false,IfcUtil::Argument_DOUBLE);
-    current->add("WebThickness",false,IfcUtil::Argument_DOUBLE);
-    current->add("FlangeThickness",false,IfcUtil::Argument_DOUBLE);
-    current->add("FilletRadius",true,IfcUtil::Argument_DOUBLE);
-    current->add("EdgeRadius",true,IfcUtil::Argument_DOUBLE);
+    current->add("Depth",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("FlangeWidth",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("WebThickness",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("FlangeThickness",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("FilletRadius",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("EdgeRadius",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
     current = entity_descriptor_map[Type::IfcAnnotationCurveOccurrence] = new IfcEntityDescriptor(Type::IfcAnnotationCurveOccurrence,entity_descriptor_map.find(Type::IfcAnnotationOccurrence)->second);
 
     current = entity_descriptor_map[Type::IfcAnnotationFillArea] = new IfcEntityDescriptor(Type::IfcAnnotationFillArea,entity_descriptor_map.find(Type::IfcGeometricRepresentationItem)->second);
-    current->add("OuterBoundary",false,IfcUtil::Argument_ENTITY);
-    current->add("InnerBoundaries",true,IfcUtil::Argument_ENTITY_LIST);
+    current->add("OuterBoundary",false,IfcUtil::Argument_ENTITY,Type::IfcCurve);
+    current->add("InnerBoundaries",true,IfcUtil::Argument_ENTITY_LIST,Type::IfcCurve);
     current = entity_descriptor_map[Type::IfcAnnotationFillAreaOccurrence] = new IfcEntityDescriptor(Type::IfcAnnotationFillAreaOccurrence,entity_descriptor_map.find(Type::IfcAnnotationOccurrence)->second);
-    current->add("FillStyleTarget",true,IfcUtil::Argument_ENTITY);
+    current->add("FillStyleTarget",true,IfcUtil::Argument_ENTITY,Type::IfcPoint);
     current->add("GlobalOrLocal",true,IfcUtil::Argument_ENUMERATION,Type::IfcGlobalOrLocalEnum);
     current = entity_descriptor_map[Type::IfcAnnotationSurface] = new IfcEntityDescriptor(Type::IfcAnnotationSurface,entity_descriptor_map.find(Type::IfcGeometricRepresentationItem)->second);
-    current->add("Item",false,IfcUtil::Argument_ENTITY);
-    current->add("TextureCoordinates",true,IfcUtil::Argument_ENTITY);
+    current->add("Item",false,IfcUtil::Argument_ENTITY,Type::IfcGeometricRepresentationItem);
+    current->add("TextureCoordinates",true,IfcUtil::Argument_ENTITY,Type::IfcTextureCoordinate);
     current = entity_descriptor_map[Type::IfcAxis1Placement] = new IfcEntityDescriptor(Type::IfcAxis1Placement,entity_descriptor_map.find(Type::IfcPlacement)->second);
-    current->add("Axis",true,IfcUtil::Argument_ENTITY);
+    current->add("Axis",true,IfcUtil::Argument_ENTITY,Type::IfcDirection);
     current = entity_descriptor_map[Type::IfcAxis2Placement2D] = new IfcEntityDescriptor(Type::IfcAxis2Placement2D,entity_descriptor_map.find(Type::IfcPlacement)->second);
-    current->add("RefDirection",true,IfcUtil::Argument_ENTITY);
+    current->add("RefDirection",true,IfcUtil::Argument_ENTITY,Type::IfcDirection);
     current = entity_descriptor_map[Type::IfcAxis2Placement3D] = new IfcEntityDescriptor(Type::IfcAxis2Placement3D,entity_descriptor_map.find(Type::IfcPlacement)->second);
-    current->add("Axis",true,IfcUtil::Argument_ENTITY);
-    current->add("RefDirection",true,IfcUtil::Argument_ENTITY);
+    current->add("Axis",true,IfcUtil::Argument_ENTITY,Type::IfcDirection);
+    current->add("RefDirection",true,IfcUtil::Argument_ENTITY,Type::IfcDirection);
     current = entity_descriptor_map[Type::IfcBooleanResult] = new IfcEntityDescriptor(Type::IfcBooleanResult,entity_descriptor_map.find(Type::IfcGeometricRepresentationItem)->second);
     current->add("Operator",false,IfcUtil::Argument_ENUMERATION,Type::IfcBooleanOperator);
-    current->add("FirstOperand",false,IfcUtil::Argument_ENTITY);
-    current->add("SecondOperand",false,IfcUtil::Argument_ENTITY);
+    current->add("FirstOperand",false,IfcUtil::Argument_ENTITY,Type::IfcBooleanOperand);
+    current->add("SecondOperand",false,IfcUtil::Argument_ENTITY,Type::IfcBooleanOperand);
     current = entity_descriptor_map[Type::IfcBoundedSurface] = new IfcEntityDescriptor(Type::IfcBoundedSurface,entity_descriptor_map.find(Type::IfcSurface)->second);
 
     current = entity_descriptor_map[Type::IfcBoundingBox] = new IfcEntityDescriptor(Type::IfcBoundingBox,entity_descriptor_map.find(Type::IfcGeometricRepresentationItem)->second);
-    current->add("Corner",false,IfcUtil::Argument_ENTITY);
-    current->add("XDim",false,IfcUtil::Argument_DOUBLE);
-    current->add("YDim",false,IfcUtil::Argument_DOUBLE);
-    current->add("ZDim",false,IfcUtil::Argument_DOUBLE);
+    current->add("Corner",false,IfcUtil::Argument_ENTITY,Type::IfcCartesianPoint);
+    current->add("XDim",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("YDim",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("ZDim",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
     current = entity_descriptor_map[Type::IfcBoxedHalfSpace] = new IfcEntityDescriptor(Type::IfcBoxedHalfSpace,entity_descriptor_map.find(Type::IfcHalfSpaceSolid)->second);
-    current->add("Enclosure",false,IfcUtil::Argument_ENTITY);
+    current->add("Enclosure",false,IfcUtil::Argument_ENTITY,Type::IfcBoundingBox);
     current = entity_descriptor_map[Type::IfcCShapeProfileDef] = new IfcEntityDescriptor(Type::IfcCShapeProfileDef,entity_descriptor_map.find(Type::IfcParameterizedProfileDef)->second);
-    current->add("Depth",false,IfcUtil::Argument_DOUBLE);
-    current->add("Width",false,IfcUtil::Argument_DOUBLE);
-    current->add("WallThickness",false,IfcUtil::Argument_DOUBLE);
-    current->add("Girth",false,IfcUtil::Argument_DOUBLE);
-    current->add("InternalFilletRadius",true,IfcUtil::Argument_DOUBLE);
-    current->add("CentreOfGravityInX",true,IfcUtil::Argument_DOUBLE);
+    current->add("Depth",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("Width",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("WallThickness",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("Girth",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("InternalFilletRadius",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("CentreOfGravityInX",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
     current = entity_descriptor_map[Type::IfcCartesianPoint] = new IfcEntityDescriptor(Type::IfcCartesianPoint,entity_descriptor_map.find(Type::IfcPoint)->second);
-    current->add("Coordinates",false,IfcUtil::Argument_VECTOR_DOUBLE);
+    current->add("Coordinates",false,IfcUtil::Argument_VECTOR_DOUBLE,Type::IfcLengthMeasure);
     current = entity_descriptor_map[Type::IfcCartesianTransformationOperator] = new IfcEntityDescriptor(Type::IfcCartesianTransformationOperator,entity_descriptor_map.find(Type::IfcGeometricRepresentationItem)->second);
-    current->add("Axis1",true,IfcUtil::Argument_ENTITY);
-    current->add("Axis2",true,IfcUtil::Argument_ENTITY);
-    current->add("LocalOrigin",false,IfcUtil::Argument_ENTITY);
-    current->add("Scale",true,IfcUtil::Argument_DOUBLE);
+    current->add("Axis1",true,IfcUtil::Argument_ENTITY,Type::IfcDirection);
+    current->add("Axis2",true,IfcUtil::Argument_ENTITY,Type::IfcDirection);
+    current->add("LocalOrigin",false,IfcUtil::Argument_ENTITY,Type::IfcCartesianPoint);
+    current->add("Scale",true,IfcUtil::Argument_DOUBLE,Type::UNDEFINED);
     current = entity_descriptor_map[Type::IfcCartesianTransformationOperator2D] = new IfcEntityDescriptor(Type::IfcCartesianTransformationOperator2D,entity_descriptor_map.find(Type::IfcCartesianTransformationOperator)->second);
 
     current = entity_descriptor_map[Type::IfcCartesianTransformationOperator2DnonUniform] = new IfcEntityDescriptor(Type::IfcCartesianTransformationOperator2DnonUniform,entity_descriptor_map.find(Type::IfcCartesianTransformationOperator2D)->second);
-    current->add("Scale2",true,IfcUtil::Argument_DOUBLE);
+    current->add("Scale2",true,IfcUtil::Argument_DOUBLE,Type::UNDEFINED);
     current = entity_descriptor_map[Type::IfcCartesianTransformationOperator3D] = new IfcEntityDescriptor(Type::IfcCartesianTransformationOperator3D,entity_descriptor_map.find(Type::IfcCartesianTransformationOperator)->second);
-    current->add("Axis3",true,IfcUtil::Argument_ENTITY);
+    current->add("Axis3",true,IfcUtil::Argument_ENTITY,Type::IfcDirection);
     current = entity_descriptor_map[Type::IfcCartesianTransformationOperator3DnonUniform] = new IfcEntityDescriptor(Type::IfcCartesianTransformationOperator3DnonUniform,entity_descriptor_map.find(Type::IfcCartesianTransformationOperator3D)->second);
-    current->add("Scale2",true,IfcUtil::Argument_DOUBLE);
-    current->add("Scale3",true,IfcUtil::Argument_DOUBLE);
+    current->add("Scale2",true,IfcUtil::Argument_DOUBLE,Type::UNDEFINED);
+    current->add("Scale3",true,IfcUtil::Argument_DOUBLE,Type::UNDEFINED);
     current = entity_descriptor_map[Type::IfcCircleProfileDef] = new IfcEntityDescriptor(Type::IfcCircleProfileDef,entity_descriptor_map.find(Type::IfcParameterizedProfileDef)->second);
-    current->add("Radius",false,IfcUtil::Argument_DOUBLE);
+    current->add("Radius",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
     current = entity_descriptor_map[Type::IfcClosedShell] = new IfcEntityDescriptor(Type::IfcClosedShell,entity_descriptor_map.find(Type::IfcConnectedFaceSet)->second);
 
     current = entity_descriptor_map[Type::IfcCompositeCurveSegment] = new IfcEntityDescriptor(Type::IfcCompositeCurveSegment,entity_descriptor_map.find(Type::IfcGeometricRepresentationItem)->second);
     current->add("Transition",false,IfcUtil::Argument_ENUMERATION,Type::IfcTransitionCode);
-    current->add("SameSense",false,IfcUtil::Argument_BOOL);
-    current->add("ParentCurve",false,IfcUtil::Argument_ENTITY);
+    current->add("SameSense",false,IfcUtil::Argument_BOOL,Type::UNDEFINED);
+    current->add("ParentCurve",false,IfcUtil::Argument_ENTITY,Type::IfcCurve);
     current = entity_descriptor_map[Type::IfcCraneRailAShapeProfileDef] = new IfcEntityDescriptor(Type::IfcCraneRailAShapeProfileDef,entity_descriptor_map.find(Type::IfcParameterizedProfileDef)->second);
-    current->add("OverallHeight",false,IfcUtil::Argument_DOUBLE);
-    current->add("BaseWidth2",false,IfcUtil::Argument_DOUBLE);
-    current->add("Radius",true,IfcUtil::Argument_DOUBLE);
-    current->add("HeadWidth",false,IfcUtil::Argument_DOUBLE);
-    current->add("HeadDepth2",false,IfcUtil::Argument_DOUBLE);
-    current->add("HeadDepth3",false,IfcUtil::Argument_DOUBLE);
-    current->add("WebThickness",false,IfcUtil::Argument_DOUBLE);
-    current->add("BaseWidth4",false,IfcUtil::Argument_DOUBLE);
-    current->add("BaseDepth1",false,IfcUtil::Argument_DOUBLE);
-    current->add("BaseDepth2",false,IfcUtil::Argument_DOUBLE);
-    current->add("BaseDepth3",false,IfcUtil::Argument_DOUBLE);
-    current->add("CentreOfGravityInY",true,IfcUtil::Argument_DOUBLE);
+    current->add("OverallHeight",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("BaseWidth2",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("Radius",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("HeadWidth",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("HeadDepth2",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("HeadDepth3",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("WebThickness",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("BaseWidth4",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("BaseDepth1",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("BaseDepth2",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("BaseDepth3",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("CentreOfGravityInY",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
     current = entity_descriptor_map[Type::IfcCraneRailFShapeProfileDef] = new IfcEntityDescriptor(Type::IfcCraneRailFShapeProfileDef,entity_descriptor_map.find(Type::IfcParameterizedProfileDef)->second);
-    current->add("OverallHeight",false,IfcUtil::Argument_DOUBLE);
-    current->add("HeadWidth",false,IfcUtil::Argument_DOUBLE);
-    current->add("Radius",true,IfcUtil::Argument_DOUBLE);
-    current->add("HeadDepth2",false,IfcUtil::Argument_DOUBLE);
-    current->add("HeadDepth3",false,IfcUtil::Argument_DOUBLE);
-    current->add("WebThickness",false,IfcUtil::Argument_DOUBLE);
-    current->add("BaseDepth1",false,IfcUtil::Argument_DOUBLE);
-    current->add("BaseDepth2",false,IfcUtil::Argument_DOUBLE);
-    current->add("CentreOfGravityInY",true,IfcUtil::Argument_DOUBLE);
+    current->add("OverallHeight",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("HeadWidth",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("Radius",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("HeadDepth2",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("HeadDepth3",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("WebThickness",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("BaseDepth1",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("BaseDepth2",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("CentreOfGravityInY",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
     current = entity_descriptor_map[Type::IfcCsgPrimitive3D] = new IfcEntityDescriptor(Type::IfcCsgPrimitive3D,entity_descriptor_map.find(Type::IfcGeometricRepresentationItem)->second);
-    current->add("Position",false,IfcUtil::Argument_ENTITY);
+    current->add("Position",false,IfcUtil::Argument_ENTITY,Type::IfcAxis2Placement3D);
     current = entity_descriptor_map[Type::IfcCsgSolid] = new IfcEntityDescriptor(Type::IfcCsgSolid,entity_descriptor_map.find(Type::IfcSolidModel)->second);
-    current->add("TreeRootExpression",false,IfcUtil::Argument_ENTITY);
+    current->add("TreeRootExpression",false,IfcUtil::Argument_ENTITY,Type::IfcCsgSelect);
     current = entity_descriptor_map[Type::IfcCurve] = new IfcEntityDescriptor(Type::IfcCurve,entity_descriptor_map.find(Type::IfcGeometricRepresentationItem)->second);
 
     current = entity_descriptor_map[Type::IfcCurveBoundedPlane] = new IfcEntityDescriptor(Type::IfcCurveBoundedPlane,entity_descriptor_map.find(Type::IfcBoundedSurface)->second);
-    current->add("BasisSurface",false,IfcUtil::Argument_ENTITY);
-    current->add("OuterBoundary",false,IfcUtil::Argument_ENTITY);
-    current->add("InnerBoundaries",false,IfcUtil::Argument_ENTITY_LIST);
+    current->add("BasisSurface",false,IfcUtil::Argument_ENTITY,Type::IfcPlane);
+    current->add("OuterBoundary",false,IfcUtil::Argument_ENTITY,Type::IfcCurve);
+    current->add("InnerBoundaries",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcCurve);
     current = entity_descriptor_map[Type::IfcDefinedSymbol] = new IfcEntityDescriptor(Type::IfcDefinedSymbol,entity_descriptor_map.find(Type::IfcGeometricRepresentationItem)->second);
-    current->add("Definition",false,IfcUtil::Argument_ENTITY);
-    current->add("Target",false,IfcUtil::Argument_ENTITY);
+    current->add("Definition",false,IfcUtil::Argument_ENTITY,Type::IfcDefinedSymbolSelect);
+    current->add("Target",false,IfcUtil::Argument_ENTITY,Type::IfcCartesianTransformationOperator2D);
     current = entity_descriptor_map[Type::IfcDimensionCurve] = new IfcEntityDescriptor(Type::IfcDimensionCurve,entity_descriptor_map.find(Type::IfcAnnotationCurveOccurrence)->second);
 
     current = entity_descriptor_map[Type::IfcDimensionCurveTerminator] = new IfcEntityDescriptor(Type::IfcDimensionCurveTerminator,entity_descriptor_map.find(Type::IfcTerminatorSymbol)->second);
     current->add("Role",false,IfcUtil::Argument_ENUMERATION,Type::IfcDimensionExtentUsage);
     current = entity_descriptor_map[Type::IfcDirection] = new IfcEntityDescriptor(Type::IfcDirection,entity_descriptor_map.find(Type::IfcGeometricRepresentationItem)->second);
-    current->add("DirectionRatios",false,IfcUtil::Argument_VECTOR_DOUBLE);
+    current->add("DirectionRatios",false,IfcUtil::Argument_VECTOR_DOUBLE,Type::UNDEFINED);
     current = entity_descriptor_map[Type::IfcDoorLiningProperties] = new IfcEntityDescriptor(Type::IfcDoorLiningProperties,entity_descriptor_map.find(Type::IfcPropertySetDefinition)->second);
-    current->add("LiningDepth",true,IfcUtil::Argument_DOUBLE);
-    current->add("LiningThickness",true,IfcUtil::Argument_DOUBLE);
-    current->add("ThresholdDepth",true,IfcUtil::Argument_DOUBLE);
-    current->add("ThresholdThickness",true,IfcUtil::Argument_DOUBLE);
-    current->add("TransomThickness",true,IfcUtil::Argument_DOUBLE);
-    current->add("TransomOffset",true,IfcUtil::Argument_DOUBLE);
-    current->add("LiningOffset",true,IfcUtil::Argument_DOUBLE);
-    current->add("ThresholdOffset",true,IfcUtil::Argument_DOUBLE);
-    current->add("CasingThickness",true,IfcUtil::Argument_DOUBLE);
-    current->add("CasingDepth",true,IfcUtil::Argument_DOUBLE);
-    current->add("ShapeAspectStyle",true,IfcUtil::Argument_ENTITY);
+    current->add("LiningDepth",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("LiningThickness",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("ThresholdDepth",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("ThresholdThickness",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("TransomThickness",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("TransomOffset",true,IfcUtil::Argument_DOUBLE,Type::IfcLengthMeasure);
+    current->add("LiningOffset",true,IfcUtil::Argument_DOUBLE,Type::IfcLengthMeasure);
+    current->add("ThresholdOffset",true,IfcUtil::Argument_DOUBLE,Type::IfcLengthMeasure);
+    current->add("CasingThickness",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("CasingDepth",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("ShapeAspectStyle",true,IfcUtil::Argument_ENTITY,Type::IfcShapeAspect);
     current = entity_descriptor_map[Type::IfcDoorPanelProperties] = new IfcEntityDescriptor(Type::IfcDoorPanelProperties,entity_descriptor_map.find(Type::IfcPropertySetDefinition)->second);
-    current->add("PanelDepth",true,IfcUtil::Argument_DOUBLE);
+    current->add("PanelDepth",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
     current->add("PanelOperation",false,IfcUtil::Argument_ENUMERATION,Type::IfcDoorPanelOperationEnum);
-    current->add("PanelWidth",true,IfcUtil::Argument_DOUBLE);
+    current->add("PanelWidth",true,IfcUtil::Argument_DOUBLE,Type::IfcNormalisedRatioMeasure);
     current->add("PanelPosition",false,IfcUtil::Argument_ENUMERATION,Type::IfcDoorPanelPositionEnum);
-    current->add("ShapeAspectStyle",true,IfcUtil::Argument_ENTITY);
+    current->add("ShapeAspectStyle",true,IfcUtil::Argument_ENTITY,Type::IfcShapeAspect);
     current = entity_descriptor_map[Type::IfcDoorStyle] = new IfcEntityDescriptor(Type::IfcDoorStyle,entity_descriptor_map.find(Type::IfcTypeProduct)->second);
     current->add("OperationType",false,IfcUtil::Argument_ENUMERATION,Type::IfcDoorStyleOperationEnum);
     current->add("ConstructionType",false,IfcUtil::Argument_ENUMERATION,Type::IfcDoorStyleConstructionEnum);
-    current->add("ParameterTakesPrecedence",false,IfcUtil::Argument_BOOL);
-    current->add("Sizeable",false,IfcUtil::Argument_BOOL);
+    current->add("ParameterTakesPrecedence",false,IfcUtil::Argument_BOOL,Type::UNDEFINED);
+    current->add("Sizeable",false,IfcUtil::Argument_BOOL,Type::UNDEFINED);
     current = entity_descriptor_map[Type::IfcDraughtingCallout] = new IfcEntityDescriptor(Type::IfcDraughtingCallout,entity_descriptor_map.find(Type::IfcGeometricRepresentationItem)->second);
-    current->add("Contents",false,IfcUtil::Argument_ENTITY_LIST);
+    current->add("Contents",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcDraughtingCalloutElement);
     current = entity_descriptor_map[Type::IfcDraughtingPreDefinedColour] = new IfcEntityDescriptor(Type::IfcDraughtingPreDefinedColour,entity_descriptor_map.find(Type::IfcPreDefinedColour)->second);
 
     current = entity_descriptor_map[Type::IfcDraughtingPreDefinedCurveFont] = new IfcEntityDescriptor(Type::IfcDraughtingPreDefinedCurveFont,entity_descriptor_map.find(Type::IfcPreDefinedCurveFont)->second);
 
     current = entity_descriptor_map[Type::IfcEdgeLoop] = new IfcEntityDescriptor(Type::IfcEdgeLoop,entity_descriptor_map.find(Type::IfcLoop)->second);
-    current->add("EdgeList",false,IfcUtil::Argument_ENTITY_LIST);
+    current->add("EdgeList",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcOrientedEdge);
     current = entity_descriptor_map[Type::IfcElementQuantity] = new IfcEntityDescriptor(Type::IfcElementQuantity,entity_descriptor_map.find(Type::IfcPropertySetDefinition)->second);
-    current->add("MethodOfMeasurement",true,IfcUtil::Argument_STRING);
-    current->add("Quantities",false,IfcUtil::Argument_ENTITY_LIST);
+    current->add("MethodOfMeasurement",true,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("Quantities",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcPhysicalQuantity);
     current = entity_descriptor_map[Type::IfcElementType] = new IfcEntityDescriptor(Type::IfcElementType,entity_descriptor_map.find(Type::IfcTypeProduct)->second);
-    current->add("ElementType",true,IfcUtil::Argument_STRING);
+    current->add("ElementType",true,IfcUtil::Argument_STRING,Type::IfcLabel);
     current = entity_descriptor_map[Type::IfcElementarySurface] = new IfcEntityDescriptor(Type::IfcElementarySurface,entity_descriptor_map.find(Type::IfcSurface)->second);
-    current->add("Position",false,IfcUtil::Argument_ENTITY);
+    current->add("Position",false,IfcUtil::Argument_ENTITY,Type::IfcAxis2Placement3D);
     current = entity_descriptor_map[Type::IfcEllipseProfileDef] = new IfcEntityDescriptor(Type::IfcEllipseProfileDef,entity_descriptor_map.find(Type::IfcParameterizedProfileDef)->second);
-    current->add("SemiAxis1",false,IfcUtil::Argument_DOUBLE);
-    current->add("SemiAxis2",false,IfcUtil::Argument_DOUBLE);
+    current->add("SemiAxis1",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("SemiAxis2",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
     current = entity_descriptor_map[Type::IfcEnergyProperties] = new IfcEntityDescriptor(Type::IfcEnergyProperties,entity_descriptor_map.find(Type::IfcPropertySetDefinition)->second);
     current->add("EnergySequence",true,IfcUtil::Argument_ENUMERATION,Type::IfcEnergySequenceEnum);
-    current->add("UserDefinedEnergySequence",true,IfcUtil::Argument_STRING);
+    current->add("UserDefinedEnergySequence",true,IfcUtil::Argument_STRING,Type::IfcLabel);
     current = entity_descriptor_map[Type::IfcExtrudedAreaSolid] = new IfcEntityDescriptor(Type::IfcExtrudedAreaSolid,entity_descriptor_map.find(Type::IfcSweptAreaSolid)->second);
-    current->add("ExtrudedDirection",false,IfcUtil::Argument_ENTITY);
-    current->add("Depth",false,IfcUtil::Argument_DOUBLE);
+    current->add("ExtrudedDirection",false,IfcUtil::Argument_ENTITY,Type::IfcDirection);
+    current->add("Depth",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
     current = entity_descriptor_map[Type::IfcFaceBasedSurfaceModel] = new IfcEntityDescriptor(Type::IfcFaceBasedSurfaceModel,entity_descriptor_map.find(Type::IfcGeometricRepresentationItem)->second);
-    current->add("FbsmFaces",false,IfcUtil::Argument_ENTITY_LIST);
+    current->add("FbsmFaces",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcConnectedFaceSet);
     current = entity_descriptor_map[Type::IfcFillAreaStyleHatching] = new IfcEntityDescriptor(Type::IfcFillAreaStyleHatching,entity_descriptor_map.find(Type::IfcGeometricRepresentationItem)->second);
-    current->add("HatchLineAppearance",false,IfcUtil::Argument_ENTITY);
-    current->add("StartOfNextHatchLine",false,IfcUtil::Argument_ENTITY);
-    current->add("PointOfReferenceHatchLine",true,IfcUtil::Argument_ENTITY);
-    current->add("PatternStart",true,IfcUtil::Argument_ENTITY);
-    current->add("HatchLineAngle",false,IfcUtil::Argument_DOUBLE);
+    current->add("HatchLineAppearance",false,IfcUtil::Argument_ENTITY,Type::IfcCurveStyle);
+    current->add("StartOfNextHatchLine",false,IfcUtil::Argument_ENTITY,Type::IfcHatchLineDistanceSelect);
+    current->add("PointOfReferenceHatchLine",true,IfcUtil::Argument_ENTITY,Type::IfcCartesianPoint);
+    current->add("PatternStart",true,IfcUtil::Argument_ENTITY,Type::IfcCartesianPoint);
+    current->add("HatchLineAngle",false,IfcUtil::Argument_DOUBLE,Type::IfcPlaneAngleMeasure);
     current = entity_descriptor_map[Type::IfcFillAreaStyleTileSymbolWithStyle] = new IfcEntityDescriptor(Type::IfcFillAreaStyleTileSymbolWithStyle,entity_descriptor_map.find(Type::IfcGeometricRepresentationItem)->second);
-    current->add("Symbol",false,IfcUtil::Argument_ENTITY);
+    current->add("Symbol",false,IfcUtil::Argument_ENTITY,Type::IfcAnnotationSymbolOccurrence);
     current = entity_descriptor_map[Type::IfcFillAreaStyleTiles] = new IfcEntityDescriptor(Type::IfcFillAreaStyleTiles,entity_descriptor_map.find(Type::IfcGeometricRepresentationItem)->second);
-    current->add("TilingPattern",false,IfcUtil::Argument_ENTITY);
-    current->add("Tiles",false,IfcUtil::Argument_ENTITY_LIST);
-    current->add("TilingScale",false,IfcUtil::Argument_DOUBLE);
+    current->add("TilingPattern",false,IfcUtil::Argument_ENTITY,Type::IfcOneDirectionRepeatFactor);
+    current->add("Tiles",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcFillAreaStyleTileShapeSelect);
+    current->add("TilingScale",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveRatioMeasure);
     current = entity_descriptor_map[Type::IfcFluidFlowProperties] = new IfcEntityDescriptor(Type::IfcFluidFlowProperties,entity_descriptor_map.find(Type::IfcPropertySetDefinition)->second);
     current->add("PropertySource",false,IfcUtil::Argument_ENUMERATION,Type::IfcPropertySourceEnum);
-    current->add("FlowConditionTimeSeries",true,IfcUtil::Argument_ENTITY);
-    current->add("VelocityTimeSeries",true,IfcUtil::Argument_ENTITY);
-    current->add("FlowrateTimeSeries",true,IfcUtil::Argument_ENTITY);
-    current->add("Fluid",false,IfcUtil::Argument_ENTITY);
-    current->add("PressureTimeSeries",true,IfcUtil::Argument_ENTITY);
-    current->add("UserDefinedPropertySource",true,IfcUtil::Argument_STRING);
-    current->add("TemperatureSingleValue",true,IfcUtil::Argument_DOUBLE);
-    current->add("WetBulbTemperatureSingleValue",true,IfcUtil::Argument_DOUBLE);
-    current->add("WetBulbTemperatureTimeSeries",true,IfcUtil::Argument_ENTITY);
-    current->add("TemperatureTimeSeries",true,IfcUtil::Argument_ENTITY);
-    current->add("FlowrateSingleValue",true,IfcUtil::Argument_ENTITY);
-    current->add("FlowConditionSingleValue",true,IfcUtil::Argument_DOUBLE);
-    current->add("VelocitySingleValue",true,IfcUtil::Argument_DOUBLE);
-    current->add("PressureSingleValue",true,IfcUtil::Argument_DOUBLE);
+    current->add("FlowConditionTimeSeries",true,IfcUtil::Argument_ENTITY,Type::IfcTimeSeries);
+    current->add("VelocityTimeSeries",true,IfcUtil::Argument_ENTITY,Type::IfcTimeSeries);
+    current->add("FlowrateTimeSeries",true,IfcUtil::Argument_ENTITY,Type::IfcTimeSeries);
+    current->add("Fluid",false,IfcUtil::Argument_ENTITY,Type::IfcMaterial);
+    current->add("PressureTimeSeries",true,IfcUtil::Argument_ENTITY,Type::IfcTimeSeries);
+    current->add("UserDefinedPropertySource",true,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("TemperatureSingleValue",true,IfcUtil::Argument_DOUBLE,Type::IfcThermodynamicTemperatureMeasure);
+    current->add("WetBulbTemperatureSingleValue",true,IfcUtil::Argument_DOUBLE,Type::IfcThermodynamicTemperatureMeasure);
+    current->add("WetBulbTemperatureTimeSeries",true,IfcUtil::Argument_ENTITY,Type::IfcTimeSeries);
+    current->add("TemperatureTimeSeries",true,IfcUtil::Argument_ENTITY,Type::IfcTimeSeries);
+    current->add("FlowrateSingleValue",true,IfcUtil::Argument_ENTITY,Type::IfcDerivedMeasureValue);
+    current->add("FlowConditionSingleValue",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveRatioMeasure);
+    current->add("VelocitySingleValue",true,IfcUtil::Argument_DOUBLE,Type::IfcLinearVelocityMeasure);
+    current->add("PressureSingleValue",true,IfcUtil::Argument_DOUBLE,Type::IfcPressureMeasure);
     current = entity_descriptor_map[Type::IfcFurnishingElementType] = new IfcEntityDescriptor(Type::IfcFurnishingElementType,entity_descriptor_map.find(Type::IfcElementType)->second);
 
     current = entity_descriptor_map[Type::IfcFurnitureType] = new IfcEntityDescriptor(Type::IfcFurnitureType,entity_descriptor_map.find(Type::IfcFurnishingElementType)->second);
@@ -1535,236 +1549,236 @@ void InitDescriptorMap() {
     current = entity_descriptor_map[Type::IfcGeometricCurveSet] = new IfcEntityDescriptor(Type::IfcGeometricCurveSet,entity_descriptor_map.find(Type::IfcGeometricSet)->second);
 
     current = entity_descriptor_map[Type::IfcIShapeProfileDef] = new IfcEntityDescriptor(Type::IfcIShapeProfileDef,entity_descriptor_map.find(Type::IfcParameterizedProfileDef)->second);
-    current->add("OverallWidth",false,IfcUtil::Argument_DOUBLE);
-    current->add("OverallDepth",false,IfcUtil::Argument_DOUBLE);
-    current->add("WebThickness",false,IfcUtil::Argument_DOUBLE);
-    current->add("FlangeThickness",false,IfcUtil::Argument_DOUBLE);
-    current->add("FilletRadius",true,IfcUtil::Argument_DOUBLE);
+    current->add("OverallWidth",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("OverallDepth",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("WebThickness",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("FlangeThickness",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("FilletRadius",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
     current = entity_descriptor_map[Type::IfcLShapeProfileDef] = new IfcEntityDescriptor(Type::IfcLShapeProfileDef,entity_descriptor_map.find(Type::IfcParameterizedProfileDef)->second);
-    current->add("Depth",false,IfcUtil::Argument_DOUBLE);
-    current->add("Width",true,IfcUtil::Argument_DOUBLE);
-    current->add("Thickness",false,IfcUtil::Argument_DOUBLE);
-    current->add("FilletRadius",true,IfcUtil::Argument_DOUBLE);
-    current->add("EdgeRadius",true,IfcUtil::Argument_DOUBLE);
-    current->add("LegSlope",true,IfcUtil::Argument_DOUBLE);
-    current->add("CentreOfGravityInX",true,IfcUtil::Argument_DOUBLE);
-    current->add("CentreOfGravityInY",true,IfcUtil::Argument_DOUBLE);
+    current->add("Depth",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("Width",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("Thickness",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("FilletRadius",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("EdgeRadius",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("LegSlope",true,IfcUtil::Argument_DOUBLE,Type::IfcPlaneAngleMeasure);
+    current->add("CentreOfGravityInX",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("CentreOfGravityInY",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
     current = entity_descriptor_map[Type::IfcLine] = new IfcEntityDescriptor(Type::IfcLine,entity_descriptor_map.find(Type::IfcCurve)->second);
-    current->add("Pnt",false,IfcUtil::Argument_ENTITY);
-    current->add("Dir",false,IfcUtil::Argument_ENTITY);
+    current->add("Pnt",false,IfcUtil::Argument_ENTITY,Type::IfcCartesianPoint);
+    current->add("Dir",false,IfcUtil::Argument_ENTITY,Type::IfcVector);
     current = entity_descriptor_map[Type::IfcManifoldSolidBrep] = new IfcEntityDescriptor(Type::IfcManifoldSolidBrep,entity_descriptor_map.find(Type::IfcSolidModel)->second);
-    current->add("Outer",false,IfcUtil::Argument_ENTITY);
+    current->add("Outer",false,IfcUtil::Argument_ENTITY,Type::IfcClosedShell);
     current = entity_descriptor_map[Type::IfcObject] = new IfcEntityDescriptor(Type::IfcObject,entity_descriptor_map.find(Type::IfcObjectDefinition)->second);
-    current->add("ObjectType",true,IfcUtil::Argument_STRING);
+    current->add("ObjectType",true,IfcUtil::Argument_STRING,Type::IfcLabel);
     current = entity_descriptor_map[Type::IfcOffsetCurve2D] = new IfcEntityDescriptor(Type::IfcOffsetCurve2D,entity_descriptor_map.find(Type::IfcCurve)->second);
-    current->add("BasisCurve",false,IfcUtil::Argument_ENTITY);
-    current->add("Distance",false,IfcUtil::Argument_DOUBLE);
-    current->add("SelfIntersect",false,IfcUtil::Argument_BOOL);
+    current->add("BasisCurve",false,IfcUtil::Argument_ENTITY,Type::IfcCurve);
+    current->add("Distance",false,IfcUtil::Argument_DOUBLE,Type::IfcLengthMeasure);
+    current->add("SelfIntersect",false,IfcUtil::Argument_BOOL,Type::UNDEFINED);
     current = entity_descriptor_map[Type::IfcOffsetCurve3D] = new IfcEntityDescriptor(Type::IfcOffsetCurve3D,entity_descriptor_map.find(Type::IfcCurve)->second);
-    current->add("BasisCurve",false,IfcUtil::Argument_ENTITY);
-    current->add("Distance",false,IfcUtil::Argument_DOUBLE);
-    current->add("SelfIntersect",false,IfcUtil::Argument_BOOL);
-    current->add("RefDirection",false,IfcUtil::Argument_ENTITY);
+    current->add("BasisCurve",false,IfcUtil::Argument_ENTITY,Type::IfcCurve);
+    current->add("Distance",false,IfcUtil::Argument_DOUBLE,Type::IfcLengthMeasure);
+    current->add("SelfIntersect",false,IfcUtil::Argument_BOOL,Type::UNDEFINED);
+    current->add("RefDirection",false,IfcUtil::Argument_ENTITY,Type::IfcDirection);
     current = entity_descriptor_map[Type::IfcPermeableCoveringProperties] = new IfcEntityDescriptor(Type::IfcPermeableCoveringProperties,entity_descriptor_map.find(Type::IfcPropertySetDefinition)->second);
     current->add("OperationType",false,IfcUtil::Argument_ENUMERATION,Type::IfcPermeableCoveringOperationEnum);
     current->add("PanelPosition",false,IfcUtil::Argument_ENUMERATION,Type::IfcWindowPanelPositionEnum);
-    current->add("FrameDepth",true,IfcUtil::Argument_DOUBLE);
-    current->add("FrameThickness",true,IfcUtil::Argument_DOUBLE);
-    current->add("ShapeAspectStyle",true,IfcUtil::Argument_ENTITY);
+    current->add("FrameDepth",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("FrameThickness",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("ShapeAspectStyle",true,IfcUtil::Argument_ENTITY,Type::IfcShapeAspect);
     current = entity_descriptor_map[Type::IfcPlanarBox] = new IfcEntityDescriptor(Type::IfcPlanarBox,entity_descriptor_map.find(Type::IfcPlanarExtent)->second);
-    current->add("Placement",false,IfcUtil::Argument_ENTITY);
+    current->add("Placement",false,IfcUtil::Argument_ENTITY,Type::IfcAxis2Placement);
     current = entity_descriptor_map[Type::IfcPlane] = new IfcEntityDescriptor(Type::IfcPlane,entity_descriptor_map.find(Type::IfcElementarySurface)->second);
 
     current = entity_descriptor_map[Type::IfcProcess] = new IfcEntityDescriptor(Type::IfcProcess,entity_descriptor_map.find(Type::IfcObject)->second);
 
     current = entity_descriptor_map[Type::IfcProduct] = new IfcEntityDescriptor(Type::IfcProduct,entity_descriptor_map.find(Type::IfcObject)->second);
-    current->add("ObjectPlacement",true,IfcUtil::Argument_ENTITY);
-    current->add("Representation",true,IfcUtil::Argument_ENTITY);
+    current->add("ObjectPlacement",true,IfcUtil::Argument_ENTITY,Type::IfcObjectPlacement);
+    current->add("Representation",true,IfcUtil::Argument_ENTITY,Type::IfcProductRepresentation);
     current = entity_descriptor_map[Type::IfcProject] = new IfcEntityDescriptor(Type::IfcProject,entity_descriptor_map.find(Type::IfcObject)->second);
-    current->add("LongName",true,IfcUtil::Argument_STRING);
-    current->add("Phase",true,IfcUtil::Argument_STRING);
-    current->add("RepresentationContexts",false,IfcUtil::Argument_ENTITY_LIST);
-    current->add("UnitsInContext",false,IfcUtil::Argument_ENTITY);
+    current->add("LongName",true,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("Phase",true,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("RepresentationContexts",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcRepresentationContext);
+    current->add("UnitsInContext",false,IfcUtil::Argument_ENTITY,Type::IfcUnitAssignment);
     current = entity_descriptor_map[Type::IfcProjectionCurve] = new IfcEntityDescriptor(Type::IfcProjectionCurve,entity_descriptor_map.find(Type::IfcAnnotationCurveOccurrence)->second);
 
     current = entity_descriptor_map[Type::IfcPropertySet] = new IfcEntityDescriptor(Type::IfcPropertySet,entity_descriptor_map.find(Type::IfcPropertySetDefinition)->second);
-    current->add("HasProperties",false,IfcUtil::Argument_ENTITY_LIST);
+    current->add("HasProperties",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcProperty);
     current = entity_descriptor_map[Type::IfcProxy] = new IfcEntityDescriptor(Type::IfcProxy,entity_descriptor_map.find(Type::IfcProduct)->second);
     current->add("ProxyType",false,IfcUtil::Argument_ENUMERATION,Type::IfcObjectTypeEnum);
-    current->add("Tag",true,IfcUtil::Argument_STRING);
+    current->add("Tag",true,IfcUtil::Argument_STRING,Type::IfcLabel);
     current = entity_descriptor_map[Type::IfcRectangleHollowProfileDef] = new IfcEntityDescriptor(Type::IfcRectangleHollowProfileDef,entity_descriptor_map.find(Type::IfcRectangleProfileDef)->second);
-    current->add("WallThickness",false,IfcUtil::Argument_DOUBLE);
-    current->add("InnerFilletRadius",true,IfcUtil::Argument_DOUBLE);
-    current->add("OuterFilletRadius",true,IfcUtil::Argument_DOUBLE);
+    current->add("WallThickness",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("InnerFilletRadius",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("OuterFilletRadius",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
     current = entity_descriptor_map[Type::IfcRectangularPyramid] = new IfcEntityDescriptor(Type::IfcRectangularPyramid,entity_descriptor_map.find(Type::IfcCsgPrimitive3D)->second);
-    current->add("XLength",false,IfcUtil::Argument_DOUBLE);
-    current->add("YLength",false,IfcUtil::Argument_DOUBLE);
-    current->add("Height",false,IfcUtil::Argument_DOUBLE);
+    current->add("XLength",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("YLength",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("Height",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
     current = entity_descriptor_map[Type::IfcRectangularTrimmedSurface] = new IfcEntityDescriptor(Type::IfcRectangularTrimmedSurface,entity_descriptor_map.find(Type::IfcBoundedSurface)->second);
-    current->add("BasisSurface",false,IfcUtil::Argument_ENTITY);
-    current->add("U1",false,IfcUtil::Argument_DOUBLE);
-    current->add("V1",false,IfcUtil::Argument_DOUBLE);
-    current->add("U2",false,IfcUtil::Argument_DOUBLE);
-    current->add("V2",false,IfcUtil::Argument_DOUBLE);
-    current->add("Usense",false,IfcUtil::Argument_BOOL);
-    current->add("Vsense",false,IfcUtil::Argument_BOOL);
+    current->add("BasisSurface",false,IfcUtil::Argument_ENTITY,Type::IfcSurface);
+    current->add("U1",false,IfcUtil::Argument_DOUBLE,Type::IfcParameterValue);
+    current->add("V1",false,IfcUtil::Argument_DOUBLE,Type::IfcParameterValue);
+    current->add("U2",false,IfcUtil::Argument_DOUBLE,Type::IfcParameterValue);
+    current->add("V2",false,IfcUtil::Argument_DOUBLE,Type::IfcParameterValue);
+    current->add("Usense",false,IfcUtil::Argument_BOOL,Type::UNDEFINED);
+    current->add("Vsense",false,IfcUtil::Argument_BOOL,Type::UNDEFINED);
     current = entity_descriptor_map[Type::IfcRelAssigns] = new IfcEntityDescriptor(Type::IfcRelAssigns,entity_descriptor_map.find(Type::IfcRelationship)->second);
-    current->add("RelatedObjects",false,IfcUtil::Argument_ENTITY_LIST);
+    current->add("RelatedObjects",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcObjectDefinition);
     current->add("RelatedObjectsType",true,IfcUtil::Argument_ENUMERATION,Type::IfcObjectTypeEnum);
     current = entity_descriptor_map[Type::IfcRelAssignsToActor] = new IfcEntityDescriptor(Type::IfcRelAssignsToActor,entity_descriptor_map.find(Type::IfcRelAssigns)->second);
-    current->add("RelatingActor",false,IfcUtil::Argument_ENTITY);
-    current->add("ActingRole",true,IfcUtil::Argument_ENTITY);
+    current->add("RelatingActor",false,IfcUtil::Argument_ENTITY,Type::IfcActor);
+    current->add("ActingRole",true,IfcUtil::Argument_ENTITY,Type::IfcActorRole);
     current = entity_descriptor_map[Type::IfcRelAssignsToControl] = new IfcEntityDescriptor(Type::IfcRelAssignsToControl,entity_descriptor_map.find(Type::IfcRelAssigns)->second);
-    current->add("RelatingControl",false,IfcUtil::Argument_ENTITY);
+    current->add("RelatingControl",false,IfcUtil::Argument_ENTITY,Type::IfcControl);
     current = entity_descriptor_map[Type::IfcRelAssignsToGroup] = new IfcEntityDescriptor(Type::IfcRelAssignsToGroup,entity_descriptor_map.find(Type::IfcRelAssigns)->second);
-    current->add("RelatingGroup",false,IfcUtil::Argument_ENTITY);
+    current->add("RelatingGroup",false,IfcUtil::Argument_ENTITY,Type::IfcGroup);
     current = entity_descriptor_map[Type::IfcRelAssignsToProcess] = new IfcEntityDescriptor(Type::IfcRelAssignsToProcess,entity_descriptor_map.find(Type::IfcRelAssigns)->second);
-    current->add("RelatingProcess",false,IfcUtil::Argument_ENTITY);
-    current->add("QuantityInProcess",true,IfcUtil::Argument_ENTITY);
+    current->add("RelatingProcess",false,IfcUtil::Argument_ENTITY,Type::IfcProcess);
+    current->add("QuantityInProcess",true,IfcUtil::Argument_ENTITY,Type::IfcMeasureWithUnit);
     current = entity_descriptor_map[Type::IfcRelAssignsToProduct] = new IfcEntityDescriptor(Type::IfcRelAssignsToProduct,entity_descriptor_map.find(Type::IfcRelAssigns)->second);
-    current->add("RelatingProduct",false,IfcUtil::Argument_ENTITY);
+    current->add("RelatingProduct",false,IfcUtil::Argument_ENTITY,Type::IfcProduct);
     current = entity_descriptor_map[Type::IfcRelAssignsToProjectOrder] = new IfcEntityDescriptor(Type::IfcRelAssignsToProjectOrder,entity_descriptor_map.find(Type::IfcRelAssignsToControl)->second);
 
     current = entity_descriptor_map[Type::IfcRelAssignsToResource] = new IfcEntityDescriptor(Type::IfcRelAssignsToResource,entity_descriptor_map.find(Type::IfcRelAssigns)->second);
-    current->add("RelatingResource",false,IfcUtil::Argument_ENTITY);
+    current->add("RelatingResource",false,IfcUtil::Argument_ENTITY,Type::IfcResource);
     current = entity_descriptor_map[Type::IfcRelAssociates] = new IfcEntityDescriptor(Type::IfcRelAssociates,entity_descriptor_map.find(Type::IfcRelationship)->second);
-    current->add("RelatedObjects",false,IfcUtil::Argument_ENTITY_LIST);
+    current->add("RelatedObjects",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcRoot);
     current = entity_descriptor_map[Type::IfcRelAssociatesAppliedValue] = new IfcEntityDescriptor(Type::IfcRelAssociatesAppliedValue,entity_descriptor_map.find(Type::IfcRelAssociates)->second);
-    current->add("RelatingAppliedValue",false,IfcUtil::Argument_ENTITY);
+    current->add("RelatingAppliedValue",false,IfcUtil::Argument_ENTITY,Type::IfcAppliedValue);
     current = entity_descriptor_map[Type::IfcRelAssociatesApproval] = new IfcEntityDescriptor(Type::IfcRelAssociatesApproval,entity_descriptor_map.find(Type::IfcRelAssociates)->second);
-    current->add("RelatingApproval",false,IfcUtil::Argument_ENTITY);
+    current->add("RelatingApproval",false,IfcUtil::Argument_ENTITY,Type::IfcApproval);
     current = entity_descriptor_map[Type::IfcRelAssociatesClassification] = new IfcEntityDescriptor(Type::IfcRelAssociatesClassification,entity_descriptor_map.find(Type::IfcRelAssociates)->second);
-    current->add("RelatingClassification",false,IfcUtil::Argument_ENTITY);
+    current->add("RelatingClassification",false,IfcUtil::Argument_ENTITY,Type::IfcClassificationNotationSelect);
     current = entity_descriptor_map[Type::IfcRelAssociatesConstraint] = new IfcEntityDescriptor(Type::IfcRelAssociatesConstraint,entity_descriptor_map.find(Type::IfcRelAssociates)->second);
-    current->add("Intent",false,IfcUtil::Argument_STRING);
-    current->add("RelatingConstraint",false,IfcUtil::Argument_ENTITY);
+    current->add("Intent",false,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("RelatingConstraint",false,IfcUtil::Argument_ENTITY,Type::IfcConstraint);
     current = entity_descriptor_map[Type::IfcRelAssociatesDocument] = new IfcEntityDescriptor(Type::IfcRelAssociatesDocument,entity_descriptor_map.find(Type::IfcRelAssociates)->second);
-    current->add("RelatingDocument",false,IfcUtil::Argument_ENTITY);
+    current->add("RelatingDocument",false,IfcUtil::Argument_ENTITY,Type::IfcDocumentSelect);
     current = entity_descriptor_map[Type::IfcRelAssociatesLibrary] = new IfcEntityDescriptor(Type::IfcRelAssociatesLibrary,entity_descriptor_map.find(Type::IfcRelAssociates)->second);
-    current->add("RelatingLibrary",false,IfcUtil::Argument_ENTITY);
+    current->add("RelatingLibrary",false,IfcUtil::Argument_ENTITY,Type::IfcLibrarySelect);
     current = entity_descriptor_map[Type::IfcRelAssociatesMaterial] = new IfcEntityDescriptor(Type::IfcRelAssociatesMaterial,entity_descriptor_map.find(Type::IfcRelAssociates)->second);
-    current->add("RelatingMaterial",false,IfcUtil::Argument_ENTITY);
+    current->add("RelatingMaterial",false,IfcUtil::Argument_ENTITY,Type::IfcMaterialSelect);
     current = entity_descriptor_map[Type::IfcRelAssociatesProfileProperties] = new IfcEntityDescriptor(Type::IfcRelAssociatesProfileProperties,entity_descriptor_map.find(Type::IfcRelAssociates)->second);
-    current->add("RelatingProfileProperties",false,IfcUtil::Argument_ENTITY);
-    current->add("ProfileSectionLocation",true,IfcUtil::Argument_ENTITY);
-    current->add("ProfileOrientation",true,IfcUtil::Argument_ENTITY);
+    current->add("RelatingProfileProperties",false,IfcUtil::Argument_ENTITY,Type::IfcProfileProperties);
+    current->add("ProfileSectionLocation",true,IfcUtil::Argument_ENTITY,Type::IfcShapeAspect);
+    current->add("ProfileOrientation",true,IfcUtil::Argument_ENTITY,Type::IfcOrientationSelect);
     current = entity_descriptor_map[Type::IfcRelConnects] = new IfcEntityDescriptor(Type::IfcRelConnects,entity_descriptor_map.find(Type::IfcRelationship)->second);
 
     current = entity_descriptor_map[Type::IfcRelConnectsElements] = new IfcEntityDescriptor(Type::IfcRelConnectsElements,entity_descriptor_map.find(Type::IfcRelConnects)->second);
-    current->add("ConnectionGeometry",true,IfcUtil::Argument_ENTITY);
-    current->add("RelatingElement",false,IfcUtil::Argument_ENTITY);
-    current->add("RelatedElement",false,IfcUtil::Argument_ENTITY);
+    current->add("ConnectionGeometry",true,IfcUtil::Argument_ENTITY,Type::IfcConnectionGeometry);
+    current->add("RelatingElement",false,IfcUtil::Argument_ENTITY,Type::IfcElement);
+    current->add("RelatedElement",false,IfcUtil::Argument_ENTITY,Type::IfcElement);
     current = entity_descriptor_map[Type::IfcRelConnectsPathElements] = new IfcEntityDescriptor(Type::IfcRelConnectsPathElements,entity_descriptor_map.find(Type::IfcRelConnectsElements)->second);
-    current->add("RelatingPriorities",false,IfcUtil::Argument_VECTOR_INT);
-    current->add("RelatedPriorities",false,IfcUtil::Argument_VECTOR_INT);
+    current->add("RelatingPriorities",false,IfcUtil::Argument_VECTOR_INT,Type::UNDEFINED);
+    current->add("RelatedPriorities",false,IfcUtil::Argument_VECTOR_INT,Type::UNDEFINED);
     current->add("RelatedConnectionType",false,IfcUtil::Argument_ENUMERATION,Type::IfcConnectionTypeEnum);
     current->add("RelatingConnectionType",false,IfcUtil::Argument_ENUMERATION,Type::IfcConnectionTypeEnum);
     current = entity_descriptor_map[Type::IfcRelConnectsPortToElement] = new IfcEntityDescriptor(Type::IfcRelConnectsPortToElement,entity_descriptor_map.find(Type::IfcRelConnects)->second);
-    current->add("RelatingPort",false,IfcUtil::Argument_ENTITY);
-    current->add("RelatedElement",false,IfcUtil::Argument_ENTITY);
+    current->add("RelatingPort",false,IfcUtil::Argument_ENTITY,Type::IfcPort);
+    current->add("RelatedElement",false,IfcUtil::Argument_ENTITY,Type::IfcElement);
     current = entity_descriptor_map[Type::IfcRelConnectsPorts] = new IfcEntityDescriptor(Type::IfcRelConnectsPorts,entity_descriptor_map.find(Type::IfcRelConnects)->second);
-    current->add("RelatingPort",false,IfcUtil::Argument_ENTITY);
-    current->add("RelatedPort",false,IfcUtil::Argument_ENTITY);
-    current->add("RealizingElement",true,IfcUtil::Argument_ENTITY);
+    current->add("RelatingPort",false,IfcUtil::Argument_ENTITY,Type::IfcPort);
+    current->add("RelatedPort",false,IfcUtil::Argument_ENTITY,Type::IfcPort);
+    current->add("RealizingElement",true,IfcUtil::Argument_ENTITY,Type::IfcElement);
     current = entity_descriptor_map[Type::IfcRelConnectsStructuralActivity] = new IfcEntityDescriptor(Type::IfcRelConnectsStructuralActivity,entity_descriptor_map.find(Type::IfcRelConnects)->second);
-    current->add("RelatingElement",false,IfcUtil::Argument_ENTITY);
-    current->add("RelatedStructuralActivity",false,IfcUtil::Argument_ENTITY);
+    current->add("RelatingElement",false,IfcUtil::Argument_ENTITY,Type::IfcStructuralActivityAssignmentSelect);
+    current->add("RelatedStructuralActivity",false,IfcUtil::Argument_ENTITY,Type::IfcStructuralActivity);
     current = entity_descriptor_map[Type::IfcRelConnectsStructuralElement] = new IfcEntityDescriptor(Type::IfcRelConnectsStructuralElement,entity_descriptor_map.find(Type::IfcRelConnects)->second);
-    current->add("RelatingElement",false,IfcUtil::Argument_ENTITY);
-    current->add("RelatedStructuralMember",false,IfcUtil::Argument_ENTITY);
+    current->add("RelatingElement",false,IfcUtil::Argument_ENTITY,Type::IfcElement);
+    current->add("RelatedStructuralMember",false,IfcUtil::Argument_ENTITY,Type::IfcStructuralMember);
     current = entity_descriptor_map[Type::IfcRelConnectsStructuralMember] = new IfcEntityDescriptor(Type::IfcRelConnectsStructuralMember,entity_descriptor_map.find(Type::IfcRelConnects)->second);
-    current->add("RelatingStructuralMember",false,IfcUtil::Argument_ENTITY);
-    current->add("RelatedStructuralConnection",false,IfcUtil::Argument_ENTITY);
-    current->add("AppliedCondition",true,IfcUtil::Argument_ENTITY);
-    current->add("AdditionalConditions",true,IfcUtil::Argument_ENTITY);
-    current->add("SupportedLength",true,IfcUtil::Argument_DOUBLE);
-    current->add("ConditionCoordinateSystem",true,IfcUtil::Argument_ENTITY);
+    current->add("RelatingStructuralMember",false,IfcUtil::Argument_ENTITY,Type::IfcStructuralMember);
+    current->add("RelatedStructuralConnection",false,IfcUtil::Argument_ENTITY,Type::IfcStructuralConnection);
+    current->add("AppliedCondition",true,IfcUtil::Argument_ENTITY,Type::IfcBoundaryCondition);
+    current->add("AdditionalConditions",true,IfcUtil::Argument_ENTITY,Type::IfcStructuralConnectionCondition);
+    current->add("SupportedLength",true,IfcUtil::Argument_DOUBLE,Type::IfcLengthMeasure);
+    current->add("ConditionCoordinateSystem",true,IfcUtil::Argument_ENTITY,Type::IfcAxis2Placement3D);
     current = entity_descriptor_map[Type::IfcRelConnectsWithEccentricity] = new IfcEntityDescriptor(Type::IfcRelConnectsWithEccentricity,entity_descriptor_map.find(Type::IfcRelConnectsStructuralMember)->second);
-    current->add("ConnectionConstraint",false,IfcUtil::Argument_ENTITY);
+    current->add("ConnectionConstraint",false,IfcUtil::Argument_ENTITY,Type::IfcConnectionGeometry);
     current = entity_descriptor_map[Type::IfcRelConnectsWithRealizingElements] = new IfcEntityDescriptor(Type::IfcRelConnectsWithRealizingElements,entity_descriptor_map.find(Type::IfcRelConnectsElements)->second);
-    current->add("RealizingElements",false,IfcUtil::Argument_ENTITY_LIST);
-    current->add("ConnectionType",true,IfcUtil::Argument_STRING);
+    current->add("RealizingElements",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcElement);
+    current->add("ConnectionType",true,IfcUtil::Argument_STRING,Type::IfcLabel);
     current = entity_descriptor_map[Type::IfcRelContainedInSpatialStructure] = new IfcEntityDescriptor(Type::IfcRelContainedInSpatialStructure,entity_descriptor_map.find(Type::IfcRelConnects)->second);
-    current->add("RelatedElements",false,IfcUtil::Argument_ENTITY_LIST);
-    current->add("RelatingStructure",false,IfcUtil::Argument_ENTITY);
+    current->add("RelatedElements",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcProduct);
+    current->add("RelatingStructure",false,IfcUtil::Argument_ENTITY,Type::IfcSpatialStructureElement);
     current = entity_descriptor_map[Type::IfcRelCoversBldgElements] = new IfcEntityDescriptor(Type::IfcRelCoversBldgElements,entity_descriptor_map.find(Type::IfcRelConnects)->second);
-    current->add("RelatingBuildingElement",false,IfcUtil::Argument_ENTITY);
-    current->add("RelatedCoverings",false,IfcUtil::Argument_ENTITY_LIST);
+    current->add("RelatingBuildingElement",false,IfcUtil::Argument_ENTITY,Type::IfcElement);
+    current->add("RelatedCoverings",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcCovering);
     current = entity_descriptor_map[Type::IfcRelCoversSpaces] = new IfcEntityDescriptor(Type::IfcRelCoversSpaces,entity_descriptor_map.find(Type::IfcRelConnects)->second);
-    current->add("RelatedSpace",false,IfcUtil::Argument_ENTITY);
-    current->add("RelatedCoverings",false,IfcUtil::Argument_ENTITY_LIST);
+    current->add("RelatedSpace",false,IfcUtil::Argument_ENTITY,Type::IfcSpace);
+    current->add("RelatedCoverings",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcCovering);
     current = entity_descriptor_map[Type::IfcRelDecomposes] = new IfcEntityDescriptor(Type::IfcRelDecomposes,entity_descriptor_map.find(Type::IfcRelationship)->second);
-    current->add("RelatingObject",false,IfcUtil::Argument_ENTITY);
-    current->add("RelatedObjects",false,IfcUtil::Argument_ENTITY_LIST);
+    current->add("RelatingObject",false,IfcUtil::Argument_ENTITY,Type::IfcObjectDefinition);
+    current->add("RelatedObjects",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcObjectDefinition);
     current = entity_descriptor_map[Type::IfcRelDefines] = new IfcEntityDescriptor(Type::IfcRelDefines,entity_descriptor_map.find(Type::IfcRelationship)->second);
-    current->add("RelatedObjects",false,IfcUtil::Argument_ENTITY_LIST);
+    current->add("RelatedObjects",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcObject);
     current = entity_descriptor_map[Type::IfcRelDefinesByProperties] = new IfcEntityDescriptor(Type::IfcRelDefinesByProperties,entity_descriptor_map.find(Type::IfcRelDefines)->second);
-    current->add("RelatingPropertyDefinition",false,IfcUtil::Argument_ENTITY);
+    current->add("RelatingPropertyDefinition",false,IfcUtil::Argument_ENTITY,Type::IfcPropertySetDefinition);
     current = entity_descriptor_map[Type::IfcRelDefinesByType] = new IfcEntityDescriptor(Type::IfcRelDefinesByType,entity_descriptor_map.find(Type::IfcRelDefines)->second);
-    current->add("RelatingType",false,IfcUtil::Argument_ENTITY);
+    current->add("RelatingType",false,IfcUtil::Argument_ENTITY,Type::IfcTypeObject);
     current = entity_descriptor_map[Type::IfcRelFillsElement] = new IfcEntityDescriptor(Type::IfcRelFillsElement,entity_descriptor_map.find(Type::IfcRelConnects)->second);
-    current->add("RelatingOpeningElement",false,IfcUtil::Argument_ENTITY);
-    current->add("RelatedBuildingElement",false,IfcUtil::Argument_ENTITY);
+    current->add("RelatingOpeningElement",false,IfcUtil::Argument_ENTITY,Type::IfcOpeningElement);
+    current->add("RelatedBuildingElement",false,IfcUtil::Argument_ENTITY,Type::IfcElement);
     current = entity_descriptor_map[Type::IfcRelFlowControlElements] = new IfcEntityDescriptor(Type::IfcRelFlowControlElements,entity_descriptor_map.find(Type::IfcRelConnects)->second);
-    current->add("RelatedControlElements",false,IfcUtil::Argument_ENTITY_LIST);
-    current->add("RelatingFlowElement",false,IfcUtil::Argument_ENTITY);
+    current->add("RelatedControlElements",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcDistributionControlElement);
+    current->add("RelatingFlowElement",false,IfcUtil::Argument_ENTITY,Type::IfcDistributionFlowElement);
     current = entity_descriptor_map[Type::IfcRelInteractionRequirements] = new IfcEntityDescriptor(Type::IfcRelInteractionRequirements,entity_descriptor_map.find(Type::IfcRelConnects)->second);
-    current->add("DailyInteraction",true,IfcUtil::Argument_DOUBLE);
-    current->add("ImportanceRating",true,IfcUtil::Argument_DOUBLE);
-    current->add("LocationOfInteraction",true,IfcUtil::Argument_ENTITY);
-    current->add("RelatedSpaceProgram",false,IfcUtil::Argument_ENTITY);
-    current->add("RelatingSpaceProgram",false,IfcUtil::Argument_ENTITY);
+    current->add("DailyInteraction",true,IfcUtil::Argument_DOUBLE,Type::IfcCountMeasure);
+    current->add("ImportanceRating",true,IfcUtil::Argument_DOUBLE,Type::IfcNormalisedRatioMeasure);
+    current->add("LocationOfInteraction",true,IfcUtil::Argument_ENTITY,Type::IfcSpatialStructureElement);
+    current->add("RelatedSpaceProgram",false,IfcUtil::Argument_ENTITY,Type::IfcSpaceProgram);
+    current->add("RelatingSpaceProgram",false,IfcUtil::Argument_ENTITY,Type::IfcSpaceProgram);
     current = entity_descriptor_map[Type::IfcRelNests] = new IfcEntityDescriptor(Type::IfcRelNests,entity_descriptor_map.find(Type::IfcRelDecomposes)->second);
 
     current = entity_descriptor_map[Type::IfcRelOccupiesSpaces] = new IfcEntityDescriptor(Type::IfcRelOccupiesSpaces,entity_descriptor_map.find(Type::IfcRelAssignsToActor)->second);
 
     current = entity_descriptor_map[Type::IfcRelOverridesProperties] = new IfcEntityDescriptor(Type::IfcRelOverridesProperties,entity_descriptor_map.find(Type::IfcRelDefinesByProperties)->second);
-    current->add("OverridingProperties",false,IfcUtil::Argument_ENTITY_LIST);
+    current->add("OverridingProperties",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcProperty);
     current = entity_descriptor_map[Type::IfcRelProjectsElement] = new IfcEntityDescriptor(Type::IfcRelProjectsElement,entity_descriptor_map.find(Type::IfcRelConnects)->second);
-    current->add("RelatingElement",false,IfcUtil::Argument_ENTITY);
-    current->add("RelatedFeatureElement",false,IfcUtil::Argument_ENTITY);
+    current->add("RelatingElement",false,IfcUtil::Argument_ENTITY,Type::IfcElement);
+    current->add("RelatedFeatureElement",false,IfcUtil::Argument_ENTITY,Type::IfcFeatureElementAddition);
     current = entity_descriptor_map[Type::IfcRelReferencedInSpatialStructure] = new IfcEntityDescriptor(Type::IfcRelReferencedInSpatialStructure,entity_descriptor_map.find(Type::IfcRelConnects)->second);
-    current->add("RelatedElements",false,IfcUtil::Argument_ENTITY_LIST);
-    current->add("RelatingStructure",false,IfcUtil::Argument_ENTITY);
+    current->add("RelatedElements",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcProduct);
+    current->add("RelatingStructure",false,IfcUtil::Argument_ENTITY,Type::IfcSpatialStructureElement);
     current = entity_descriptor_map[Type::IfcRelSchedulesCostItems] = new IfcEntityDescriptor(Type::IfcRelSchedulesCostItems,entity_descriptor_map.find(Type::IfcRelAssignsToControl)->second);
 
     current = entity_descriptor_map[Type::IfcRelSequence] = new IfcEntityDescriptor(Type::IfcRelSequence,entity_descriptor_map.find(Type::IfcRelConnects)->second);
-    current->add("RelatingProcess",false,IfcUtil::Argument_ENTITY);
-    current->add("RelatedProcess",false,IfcUtil::Argument_ENTITY);
-    current->add("TimeLag",false,IfcUtil::Argument_DOUBLE);
+    current->add("RelatingProcess",false,IfcUtil::Argument_ENTITY,Type::IfcProcess);
+    current->add("RelatedProcess",false,IfcUtil::Argument_ENTITY,Type::IfcProcess);
+    current->add("TimeLag",false,IfcUtil::Argument_DOUBLE,Type::IfcTimeMeasure);
     current->add("SequenceType",false,IfcUtil::Argument_ENUMERATION,Type::IfcSequenceEnum);
     current = entity_descriptor_map[Type::IfcRelServicesBuildings] = new IfcEntityDescriptor(Type::IfcRelServicesBuildings,entity_descriptor_map.find(Type::IfcRelConnects)->second);
-    current->add("RelatingSystem",false,IfcUtil::Argument_ENTITY);
-    current->add("RelatedBuildings",false,IfcUtil::Argument_ENTITY_LIST);
+    current->add("RelatingSystem",false,IfcUtil::Argument_ENTITY,Type::IfcSystem);
+    current->add("RelatedBuildings",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcSpatialStructureElement);
     current = entity_descriptor_map[Type::IfcRelSpaceBoundary] = new IfcEntityDescriptor(Type::IfcRelSpaceBoundary,entity_descriptor_map.find(Type::IfcRelConnects)->second);
-    current->add("RelatingSpace",false,IfcUtil::Argument_ENTITY);
-    current->add("RelatedBuildingElement",true,IfcUtil::Argument_ENTITY);
-    current->add("ConnectionGeometry",true,IfcUtil::Argument_ENTITY);
+    current->add("RelatingSpace",false,IfcUtil::Argument_ENTITY,Type::IfcSpace);
+    current->add("RelatedBuildingElement",true,IfcUtil::Argument_ENTITY,Type::IfcElement);
+    current->add("ConnectionGeometry",true,IfcUtil::Argument_ENTITY,Type::IfcConnectionGeometry);
     current->add("PhysicalOrVirtualBoundary",false,IfcUtil::Argument_ENUMERATION,Type::IfcPhysicalOrVirtualEnum);
     current->add("InternalOrExternalBoundary",false,IfcUtil::Argument_ENUMERATION,Type::IfcInternalOrExternalEnum);
     current = entity_descriptor_map[Type::IfcRelVoidsElement] = new IfcEntityDescriptor(Type::IfcRelVoidsElement,entity_descriptor_map.find(Type::IfcRelConnects)->second);
-    current->add("RelatingBuildingElement",false,IfcUtil::Argument_ENTITY);
-    current->add("RelatedOpeningElement",false,IfcUtil::Argument_ENTITY);
+    current->add("RelatingBuildingElement",false,IfcUtil::Argument_ENTITY,Type::IfcElement);
+    current->add("RelatedOpeningElement",false,IfcUtil::Argument_ENTITY,Type::IfcFeatureElementSubtraction);
     current = entity_descriptor_map[Type::IfcResource] = new IfcEntityDescriptor(Type::IfcResource,entity_descriptor_map.find(Type::IfcObject)->second);
 
     current = entity_descriptor_map[Type::IfcRevolvedAreaSolid] = new IfcEntityDescriptor(Type::IfcRevolvedAreaSolid,entity_descriptor_map.find(Type::IfcSweptAreaSolid)->second);
-    current->add("Axis",false,IfcUtil::Argument_ENTITY);
-    current->add("Angle",false,IfcUtil::Argument_DOUBLE);
+    current->add("Axis",false,IfcUtil::Argument_ENTITY,Type::IfcAxis1Placement);
+    current->add("Angle",false,IfcUtil::Argument_DOUBLE,Type::IfcPlaneAngleMeasure);
     current = entity_descriptor_map[Type::IfcRightCircularCone] = new IfcEntityDescriptor(Type::IfcRightCircularCone,entity_descriptor_map.find(Type::IfcCsgPrimitive3D)->second);
-    current->add("Height",false,IfcUtil::Argument_DOUBLE);
-    current->add("BottomRadius",false,IfcUtil::Argument_DOUBLE);
+    current->add("Height",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("BottomRadius",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
     current = entity_descriptor_map[Type::IfcRightCircularCylinder] = new IfcEntityDescriptor(Type::IfcRightCircularCylinder,entity_descriptor_map.find(Type::IfcCsgPrimitive3D)->second);
-    current->add("Height",false,IfcUtil::Argument_DOUBLE);
-    current->add("Radius",false,IfcUtil::Argument_DOUBLE);
+    current->add("Height",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("Radius",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
     current = entity_descriptor_map[Type::IfcSpatialStructureElement] = new IfcEntityDescriptor(Type::IfcSpatialStructureElement,entity_descriptor_map.find(Type::IfcProduct)->second);
-    current->add("LongName",true,IfcUtil::Argument_STRING);
+    current->add("LongName",true,IfcUtil::Argument_STRING,Type::IfcLabel);
     current->add("CompositionType",false,IfcUtil::Argument_ENUMERATION,Type::IfcElementCompositionEnum);
     current = entity_descriptor_map[Type::IfcSpatialStructureElementType] = new IfcEntityDescriptor(Type::IfcSpatialStructureElementType,entity_descriptor_map.find(Type::IfcElementType)->second);
 
     current = entity_descriptor_map[Type::IfcSphere] = new IfcEntityDescriptor(Type::IfcSphere,entity_descriptor_map.find(Type::IfcCsgPrimitive3D)->second);
-    current->add("Radius",false,IfcUtil::Argument_DOUBLE);
+    current->add("Radius",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
     current = entity_descriptor_map[Type::IfcStructuralActivity] = new IfcEntityDescriptor(Type::IfcStructuralActivity,entity_descriptor_map.find(Type::IfcProduct)->second);
-    current->add("AppliedLoad",false,IfcUtil::Argument_ENTITY);
+    current->add("AppliedLoad",false,IfcUtil::Argument_ENTITY,Type::IfcStructuralLoad);
     current->add("GlobalOrLocal",false,IfcUtil::Argument_ENUMERATION,Type::IfcGlobalOrLocalEnum);
     current = entity_descriptor_map[Type::IfcStructuralItem] = new IfcEntityDescriptor(Type::IfcStructuralItem,entity_descriptor_map.find(Type::IfcProduct)->second);
 
@@ -1774,83 +1788,83 @@ void InitDescriptorMap() {
 
     current = entity_descriptor_map[Type::IfcStructuralSurfaceMember] = new IfcEntityDescriptor(Type::IfcStructuralSurfaceMember,entity_descriptor_map.find(Type::IfcStructuralMember)->second);
     current->add("PredefinedType",false,IfcUtil::Argument_ENUMERATION,Type::IfcStructuralSurfaceTypeEnum);
-    current->add("Thickness",true,IfcUtil::Argument_DOUBLE);
+    current->add("Thickness",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
     current = entity_descriptor_map[Type::IfcStructuralSurfaceMemberVarying] = new IfcEntityDescriptor(Type::IfcStructuralSurfaceMemberVarying,entity_descriptor_map.find(Type::IfcStructuralSurfaceMember)->second);
-    current->add("SubsequentThickness",false,IfcUtil::Argument_VECTOR_DOUBLE);
-    current->add("VaryingThicknessLocation",false,IfcUtil::Argument_ENTITY);
+    current->add("SubsequentThickness",false,IfcUtil::Argument_VECTOR_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("VaryingThicknessLocation",false,IfcUtil::Argument_ENTITY,Type::IfcShapeAspect);
     current = entity_descriptor_map[Type::IfcStructuredDimensionCallout] = new IfcEntityDescriptor(Type::IfcStructuredDimensionCallout,entity_descriptor_map.find(Type::IfcDraughtingCallout)->second);
 
     current = entity_descriptor_map[Type::IfcSurfaceCurveSweptAreaSolid] = new IfcEntityDescriptor(Type::IfcSurfaceCurveSweptAreaSolid,entity_descriptor_map.find(Type::IfcSweptAreaSolid)->second);
-    current->add("Directrix",false,IfcUtil::Argument_ENTITY);
-    current->add("StartParam",false,IfcUtil::Argument_DOUBLE);
-    current->add("EndParam",false,IfcUtil::Argument_DOUBLE);
-    current->add("ReferenceSurface",false,IfcUtil::Argument_ENTITY);
+    current->add("Directrix",false,IfcUtil::Argument_ENTITY,Type::IfcCurve);
+    current->add("StartParam",false,IfcUtil::Argument_DOUBLE,Type::IfcParameterValue);
+    current->add("EndParam",false,IfcUtil::Argument_DOUBLE,Type::IfcParameterValue);
+    current->add("ReferenceSurface",false,IfcUtil::Argument_ENTITY,Type::IfcSurface);
     current = entity_descriptor_map[Type::IfcSurfaceOfLinearExtrusion] = new IfcEntityDescriptor(Type::IfcSurfaceOfLinearExtrusion,entity_descriptor_map.find(Type::IfcSweptSurface)->second);
-    current->add("ExtrudedDirection",false,IfcUtil::Argument_ENTITY);
-    current->add("Depth",false,IfcUtil::Argument_DOUBLE);
+    current->add("ExtrudedDirection",false,IfcUtil::Argument_ENTITY,Type::IfcDirection);
+    current->add("Depth",false,IfcUtil::Argument_DOUBLE,Type::IfcLengthMeasure);
     current = entity_descriptor_map[Type::IfcSurfaceOfRevolution] = new IfcEntityDescriptor(Type::IfcSurfaceOfRevolution,entity_descriptor_map.find(Type::IfcSweptSurface)->second);
-    current->add("AxisPosition",false,IfcUtil::Argument_ENTITY);
+    current->add("AxisPosition",false,IfcUtil::Argument_ENTITY,Type::IfcAxis1Placement);
     current = entity_descriptor_map[Type::IfcSystemFurnitureElementType] = new IfcEntityDescriptor(Type::IfcSystemFurnitureElementType,entity_descriptor_map.find(Type::IfcFurnishingElementType)->second);
 
     current = entity_descriptor_map[Type::IfcTask] = new IfcEntityDescriptor(Type::IfcTask,entity_descriptor_map.find(Type::IfcProcess)->second);
-    current->add("TaskId",false,IfcUtil::Argument_STRING);
-    current->add("Status",true,IfcUtil::Argument_STRING);
-    current->add("WorkMethod",true,IfcUtil::Argument_STRING);
-    current->add("IsMilestone",false,IfcUtil::Argument_BOOL);
-    current->add("Priority",true,IfcUtil::Argument_INT);
+    current->add("TaskId",false,IfcUtil::Argument_STRING,Type::IfcIdentifier);
+    current->add("Status",true,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("WorkMethod",true,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("IsMilestone",false,IfcUtil::Argument_BOOL,Type::UNDEFINED);
+    current->add("Priority",true,IfcUtil::Argument_INT,Type::UNDEFINED);
     current = entity_descriptor_map[Type::IfcTransportElementType] = new IfcEntityDescriptor(Type::IfcTransportElementType,entity_descriptor_map.find(Type::IfcElementType)->second);
     current->add("PredefinedType",false,IfcUtil::Argument_ENUMERATION,Type::IfcTransportElementTypeEnum);
     current = entity_descriptor_map[Type::IfcActor] = new IfcEntityDescriptor(Type::IfcActor,entity_descriptor_map.find(Type::IfcObject)->second);
-    current->add("TheActor",false,IfcUtil::Argument_ENTITY);
+    current->add("TheActor",false,IfcUtil::Argument_ENTITY,Type::IfcActorSelect);
     current = entity_descriptor_map[Type::IfcAnnotation] = new IfcEntityDescriptor(Type::IfcAnnotation,entity_descriptor_map.find(Type::IfcProduct)->second);
 
     current = entity_descriptor_map[Type::IfcAsymmetricIShapeProfileDef] = new IfcEntityDescriptor(Type::IfcAsymmetricIShapeProfileDef,entity_descriptor_map.find(Type::IfcIShapeProfileDef)->second);
-    current->add("TopFlangeWidth",false,IfcUtil::Argument_DOUBLE);
-    current->add("TopFlangeThickness",true,IfcUtil::Argument_DOUBLE);
-    current->add("TopFlangeFilletRadius",true,IfcUtil::Argument_DOUBLE);
-    current->add("CentreOfGravityInY",true,IfcUtil::Argument_DOUBLE);
+    current->add("TopFlangeWidth",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("TopFlangeThickness",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("TopFlangeFilletRadius",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("CentreOfGravityInY",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
     current = entity_descriptor_map[Type::IfcBlock] = new IfcEntityDescriptor(Type::IfcBlock,entity_descriptor_map.find(Type::IfcCsgPrimitive3D)->second);
-    current->add("XLength",false,IfcUtil::Argument_DOUBLE);
-    current->add("YLength",false,IfcUtil::Argument_DOUBLE);
-    current->add("ZLength",false,IfcUtil::Argument_DOUBLE);
+    current->add("XLength",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("YLength",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("ZLength",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
     current = entity_descriptor_map[Type::IfcBooleanClippingResult] = new IfcEntityDescriptor(Type::IfcBooleanClippingResult,entity_descriptor_map.find(Type::IfcBooleanResult)->second);
 
     current = entity_descriptor_map[Type::IfcBoundedCurve] = new IfcEntityDescriptor(Type::IfcBoundedCurve,entity_descriptor_map.find(Type::IfcCurve)->second);
 
     current = entity_descriptor_map[Type::IfcBuilding] = new IfcEntityDescriptor(Type::IfcBuilding,entity_descriptor_map.find(Type::IfcSpatialStructureElement)->second);
-    current->add("ElevationOfRefHeight",true,IfcUtil::Argument_DOUBLE);
-    current->add("ElevationOfTerrain",true,IfcUtil::Argument_DOUBLE);
-    current->add("BuildingAddress",true,IfcUtil::Argument_ENTITY);
+    current->add("ElevationOfRefHeight",true,IfcUtil::Argument_DOUBLE,Type::IfcLengthMeasure);
+    current->add("ElevationOfTerrain",true,IfcUtil::Argument_DOUBLE,Type::IfcLengthMeasure);
+    current->add("BuildingAddress",true,IfcUtil::Argument_ENTITY,Type::IfcPostalAddress);
     current = entity_descriptor_map[Type::IfcBuildingElementType] = new IfcEntityDescriptor(Type::IfcBuildingElementType,entity_descriptor_map.find(Type::IfcElementType)->second);
 
     current = entity_descriptor_map[Type::IfcBuildingStorey] = new IfcEntityDescriptor(Type::IfcBuildingStorey,entity_descriptor_map.find(Type::IfcSpatialStructureElement)->second);
-    current->add("Elevation",true,IfcUtil::Argument_DOUBLE);
+    current->add("Elevation",true,IfcUtil::Argument_DOUBLE,Type::IfcLengthMeasure);
     current = entity_descriptor_map[Type::IfcCircleHollowProfileDef] = new IfcEntityDescriptor(Type::IfcCircleHollowProfileDef,entity_descriptor_map.find(Type::IfcCircleProfileDef)->second);
-    current->add("WallThickness",false,IfcUtil::Argument_DOUBLE);
+    current->add("WallThickness",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
     current = entity_descriptor_map[Type::IfcColumnType] = new IfcEntityDescriptor(Type::IfcColumnType,entity_descriptor_map.find(Type::IfcBuildingElementType)->second);
     current->add("PredefinedType",false,IfcUtil::Argument_ENUMERATION,Type::IfcColumnTypeEnum);
     current = entity_descriptor_map[Type::IfcCompositeCurve] = new IfcEntityDescriptor(Type::IfcCompositeCurve,entity_descriptor_map.find(Type::IfcBoundedCurve)->second);
-    current->add("Segments",false,IfcUtil::Argument_ENTITY_LIST);
-    current->add("SelfIntersect",false,IfcUtil::Argument_BOOL);
+    current->add("Segments",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcCompositeCurveSegment);
+    current->add("SelfIntersect",false,IfcUtil::Argument_BOOL,Type::UNDEFINED);
     current = entity_descriptor_map[Type::IfcConic] = new IfcEntityDescriptor(Type::IfcConic,entity_descriptor_map.find(Type::IfcCurve)->second);
-    current->add("Position",false,IfcUtil::Argument_ENTITY);
+    current->add("Position",false,IfcUtil::Argument_ENTITY,Type::IfcAxis2Placement);
     current = entity_descriptor_map[Type::IfcConstructionResource] = new IfcEntityDescriptor(Type::IfcConstructionResource,entity_descriptor_map.find(Type::IfcResource)->second);
-    current->add("ResourceIdentifier",true,IfcUtil::Argument_STRING);
-    current->add("ResourceGroup",true,IfcUtil::Argument_STRING);
+    current->add("ResourceIdentifier",true,IfcUtil::Argument_STRING,Type::IfcIdentifier);
+    current->add("ResourceGroup",true,IfcUtil::Argument_STRING,Type::IfcLabel);
     current->add("ResourceConsumption",true,IfcUtil::Argument_ENUMERATION,Type::IfcResourceConsumptionEnum);
-    current->add("BaseQuantity",true,IfcUtil::Argument_ENTITY);
+    current->add("BaseQuantity",true,IfcUtil::Argument_ENTITY,Type::IfcMeasureWithUnit);
     current = entity_descriptor_map[Type::IfcControl] = new IfcEntityDescriptor(Type::IfcControl,entity_descriptor_map.find(Type::IfcObject)->second);
 
     current = entity_descriptor_map[Type::IfcCostItem] = new IfcEntityDescriptor(Type::IfcCostItem,entity_descriptor_map.find(Type::IfcControl)->second);
 
     current = entity_descriptor_map[Type::IfcCostSchedule] = new IfcEntityDescriptor(Type::IfcCostSchedule,entity_descriptor_map.find(Type::IfcControl)->second);
-    current->add("SubmittedBy",true,IfcUtil::Argument_ENTITY);
-    current->add("PreparedBy",true,IfcUtil::Argument_ENTITY);
-    current->add("SubmittedOn",true,IfcUtil::Argument_ENTITY);
-    current->add("Status",true,IfcUtil::Argument_STRING);
-    current->add("TargetUsers",true,IfcUtil::Argument_ENTITY_LIST);
-    current->add("UpdateDate",true,IfcUtil::Argument_ENTITY);
-    current->add("ID",false,IfcUtil::Argument_STRING);
+    current->add("SubmittedBy",true,IfcUtil::Argument_ENTITY,Type::IfcActorSelect);
+    current->add("PreparedBy",true,IfcUtil::Argument_ENTITY,Type::IfcActorSelect);
+    current->add("SubmittedOn",true,IfcUtil::Argument_ENTITY,Type::IfcDateTimeSelect);
+    current->add("Status",true,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("TargetUsers",true,IfcUtil::Argument_ENTITY_LIST,Type::IfcActorSelect);
+    current->add("UpdateDate",true,IfcUtil::Argument_ENTITY,Type::IfcDateTimeSelect);
+    current->add("ID",false,IfcUtil::Argument_STRING,Type::IfcIdentifier);
     current->add("PredefinedType",false,IfcUtil::Argument_ENUMERATION,Type::IfcCostScheduleTypeEnum);
     current = entity_descriptor_map[Type::IfcCoveringType] = new IfcEntityDescriptor(Type::IfcCoveringType,entity_descriptor_map.find(Type::IfcBuildingElementType)->second);
     current->add("PredefinedType",false,IfcUtil::Argument_ENUMERATION,Type::IfcCoveringTypeEnum);
@@ -1866,15 +1880,15 @@ void InitDescriptorMap() {
 
     current = entity_descriptor_map[Type::IfcElectricalBaseProperties] = new IfcEntityDescriptor(Type::IfcElectricalBaseProperties,entity_descriptor_map.find(Type::IfcEnergyProperties)->second);
     current->add("ElectricCurrentType",true,IfcUtil::Argument_ENUMERATION,Type::IfcElectricCurrentEnum);
-    current->add("InputVoltage",false,IfcUtil::Argument_DOUBLE);
-    current->add("InputFrequency",false,IfcUtil::Argument_DOUBLE);
-    current->add("FullLoadCurrent",true,IfcUtil::Argument_DOUBLE);
-    current->add("MinimumCircuitCurrent",true,IfcUtil::Argument_DOUBLE);
-    current->add("MaximumPowerInput",true,IfcUtil::Argument_DOUBLE);
-    current->add("RatedPowerInput",true,IfcUtil::Argument_DOUBLE);
-    current->add("InputPhase",false,IfcUtil::Argument_INT);
+    current->add("InputVoltage",false,IfcUtil::Argument_DOUBLE,Type::IfcElectricVoltageMeasure);
+    current->add("InputFrequency",false,IfcUtil::Argument_DOUBLE,Type::IfcFrequencyMeasure);
+    current->add("FullLoadCurrent",true,IfcUtil::Argument_DOUBLE,Type::IfcElectricCurrentMeasure);
+    current->add("MinimumCircuitCurrent",true,IfcUtil::Argument_DOUBLE,Type::IfcElectricCurrentMeasure);
+    current->add("MaximumPowerInput",true,IfcUtil::Argument_DOUBLE,Type::IfcPowerMeasure);
+    current->add("RatedPowerInput",true,IfcUtil::Argument_DOUBLE,Type::IfcPowerMeasure);
+    current->add("InputPhase",false,IfcUtil::Argument_INT,Type::UNDEFINED);
     current = entity_descriptor_map[Type::IfcElement] = new IfcEntityDescriptor(Type::IfcElement,entity_descriptor_map.find(Type::IfcProduct)->second);
-    current->add("Tag",true,IfcUtil::Argument_STRING);
+    current->add("Tag",true,IfcUtil::Argument_STRING,Type::IfcIdentifier);
     current = entity_descriptor_map[Type::IfcElementAssembly] = new IfcEntityDescriptor(Type::IfcElementAssembly,entity_descriptor_map.find(Type::IfcElement)->second);
     current->add("AssemblyPlace",true,IfcUtil::Argument_ENUMERATION,Type::IfcAssemblyPlaceEnum);
     current->add("PredefinedType",false,IfcUtil::Argument_ENUMERATION,Type::IfcElementAssemblyTypeEnum);
@@ -1883,8 +1897,8 @@ void InitDescriptorMap() {
     current = entity_descriptor_map[Type::IfcElementComponentType] = new IfcEntityDescriptor(Type::IfcElementComponentType,entity_descriptor_map.find(Type::IfcElementType)->second);
 
     current = entity_descriptor_map[Type::IfcEllipse] = new IfcEntityDescriptor(Type::IfcEllipse,entity_descriptor_map.find(Type::IfcConic)->second);
-    current->add("SemiAxis1",false,IfcUtil::Argument_DOUBLE);
-    current->add("SemiAxis2",false,IfcUtil::Argument_DOUBLE);
+    current->add("SemiAxis1",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("SemiAxis2",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
     current = entity_descriptor_map[Type::IfcEnergyConversionDeviceType] = new IfcEntityDescriptor(Type::IfcEnergyConversionDeviceType,entity_descriptor_map.find(Type::IfcDistributionFlowElementType)->second);
 
     current = entity_descriptor_map[Type::IfcEquipmentElement] = new IfcEntityDescriptor(Type::IfcEquipmentElement,entity_descriptor_map.find(Type::IfcElement)->second);
@@ -1898,7 +1912,7 @@ void InitDescriptorMap() {
     current = entity_descriptor_map[Type::IfcFacetedBrep] = new IfcEntityDescriptor(Type::IfcFacetedBrep,entity_descriptor_map.find(Type::IfcManifoldSolidBrep)->second);
 
     current = entity_descriptor_map[Type::IfcFacetedBrepWithVoids] = new IfcEntityDescriptor(Type::IfcFacetedBrepWithVoids,entity_descriptor_map.find(Type::IfcManifoldSolidBrep)->second);
-    current->add("Voids",false,IfcUtil::Argument_ENTITY_LIST);
+    current->add("Voids",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcClosedShell);
     current = entity_descriptor_map[Type::IfcFastener] = new IfcEntityDescriptor(Type::IfcFastener,entity_descriptor_map.find(Type::IfcElementComponent)->second);
 
     current = entity_descriptor_map[Type::IfcFastenerType] = new IfcEntityDescriptor(Type::IfcFastenerType,entity_descriptor_map.find(Type::IfcElementComponentType)->second);
@@ -1932,9 +1946,9 @@ void InitDescriptorMap() {
     current = entity_descriptor_map[Type::IfcGasTerminalType] = new IfcEntityDescriptor(Type::IfcGasTerminalType,entity_descriptor_map.find(Type::IfcFlowTerminalType)->second);
     current->add("PredefinedType",false,IfcUtil::Argument_ENUMERATION,Type::IfcGasTerminalTypeEnum);
     current = entity_descriptor_map[Type::IfcGrid] = new IfcEntityDescriptor(Type::IfcGrid,entity_descriptor_map.find(Type::IfcProduct)->second);
-    current->add("UAxes",false,IfcUtil::Argument_ENTITY_LIST);
-    current->add("VAxes",false,IfcUtil::Argument_ENTITY_LIST);
-    current->add("WAxes",true,IfcUtil::Argument_ENTITY_LIST);
+    current->add("UAxes",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcGridAxis);
+    current->add("VAxes",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcGridAxis);
+    current->add("WAxes",true,IfcUtil::Argument_ENTITY_LIST,Type::IfcGridAxis);
     current = entity_descriptor_map[Type::IfcGroup] = new IfcEntityDescriptor(Type::IfcGroup,entity_descriptor_map.find(Type::IfcObject)->second);
 
     current = entity_descriptor_map[Type::IfcHeatExchangerType] = new IfcEntityDescriptor(Type::IfcHeatExchangerType,entity_descriptor_map.find(Type::IfcEnergyConversionDeviceType)->second);
@@ -1943,15 +1957,15 @@ void InitDescriptorMap() {
     current->add("PredefinedType",false,IfcUtil::Argument_ENUMERATION,Type::IfcHumidifierTypeEnum);
     current = entity_descriptor_map[Type::IfcInventory] = new IfcEntityDescriptor(Type::IfcInventory,entity_descriptor_map.find(Type::IfcGroup)->second);
     current->add("InventoryType",false,IfcUtil::Argument_ENUMERATION,Type::IfcInventoryTypeEnum);
-    current->add("Jurisdiction",false,IfcUtil::Argument_ENTITY);
-    current->add("ResponsiblePersons",false,IfcUtil::Argument_ENTITY_LIST);
-    current->add("LastUpdateDate",false,IfcUtil::Argument_ENTITY);
-    current->add("CurrentValue",true,IfcUtil::Argument_ENTITY);
-    current->add("OriginalValue",true,IfcUtil::Argument_ENTITY);
+    current->add("Jurisdiction",false,IfcUtil::Argument_ENTITY,Type::IfcActorSelect);
+    current->add("ResponsiblePersons",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcPerson);
+    current->add("LastUpdateDate",false,IfcUtil::Argument_ENTITY,Type::IfcCalendarDate);
+    current->add("CurrentValue",true,IfcUtil::Argument_ENTITY,Type::IfcCostValue);
+    current->add("OriginalValue",true,IfcUtil::Argument_ENTITY,Type::IfcCostValue);
     current = entity_descriptor_map[Type::IfcJunctionBoxType] = new IfcEntityDescriptor(Type::IfcJunctionBoxType,entity_descriptor_map.find(Type::IfcFlowFittingType)->second);
     current->add("PredefinedType",false,IfcUtil::Argument_ENUMERATION,Type::IfcJunctionBoxTypeEnum);
     current = entity_descriptor_map[Type::IfcLaborResource] = new IfcEntityDescriptor(Type::IfcLaborResource,entity_descriptor_map.find(Type::IfcConstructionResource)->second);
-    current->add("SkillSet",true,IfcUtil::Argument_STRING);
+    current->add("SkillSet",true,IfcUtil::Argument_STRING,Type::IfcText);
     current = entity_descriptor_map[Type::IfcLampType] = new IfcEntityDescriptor(Type::IfcLampType,entity_descriptor_map.find(Type::IfcFlowTerminalType)->second);
     current->add("PredefinedType",false,IfcUtil::Argument_ENUMERATION,Type::IfcLampTypeEnum);
     current = entity_descriptor_map[Type::IfcLightFixtureType] = new IfcEntityDescriptor(Type::IfcLightFixtureType,entity_descriptor_map.find(Type::IfcFlowTerminalType)->second);
@@ -1959,8 +1973,8 @@ void InitDescriptorMap() {
     current = entity_descriptor_map[Type::IfcLinearDimension] = new IfcEntityDescriptor(Type::IfcLinearDimension,entity_descriptor_map.find(Type::IfcDimensionCurveDirectedCallout)->second);
 
     current = entity_descriptor_map[Type::IfcMechanicalFastener] = new IfcEntityDescriptor(Type::IfcMechanicalFastener,entity_descriptor_map.find(Type::IfcFastener)->second);
-    current->add("NominalDiameter",true,IfcUtil::Argument_DOUBLE);
-    current->add("NominalLength",true,IfcUtil::Argument_DOUBLE);
+    current->add("NominalDiameter",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("NominalLength",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
     current = entity_descriptor_map[Type::IfcMechanicalFastenerType] = new IfcEntityDescriptor(Type::IfcMechanicalFastenerType,entity_descriptor_map.find(Type::IfcFastenerType)->second);
 
     current = entity_descriptor_map[Type::IfcMemberType] = new IfcEntityDescriptor(Type::IfcMemberType,entity_descriptor_map.find(Type::IfcBuildingElementType)->second);
@@ -1968,21 +1982,21 @@ void InitDescriptorMap() {
     current = entity_descriptor_map[Type::IfcMotorConnectionType] = new IfcEntityDescriptor(Type::IfcMotorConnectionType,entity_descriptor_map.find(Type::IfcEnergyConversionDeviceType)->second);
     current->add("PredefinedType",false,IfcUtil::Argument_ENUMERATION,Type::IfcMotorConnectionTypeEnum);
     current = entity_descriptor_map[Type::IfcMove] = new IfcEntityDescriptor(Type::IfcMove,entity_descriptor_map.find(Type::IfcTask)->second);
-    current->add("MoveFrom",false,IfcUtil::Argument_ENTITY);
-    current->add("MoveTo",false,IfcUtil::Argument_ENTITY);
-    current->add("PunchList",true,IfcUtil::Argument_VECTOR_STRING);
+    current->add("MoveFrom",false,IfcUtil::Argument_ENTITY,Type::IfcSpatialStructureElement);
+    current->add("MoveTo",false,IfcUtil::Argument_ENTITY,Type::IfcSpatialStructureElement);
+    current->add("PunchList",true,IfcUtil::Argument_VECTOR_STRING,Type::IfcText);
     current = entity_descriptor_map[Type::IfcOccupant] = new IfcEntityDescriptor(Type::IfcOccupant,entity_descriptor_map.find(Type::IfcActor)->second);
     current->add("PredefinedType",false,IfcUtil::Argument_ENUMERATION,Type::IfcOccupantTypeEnum);
     current = entity_descriptor_map[Type::IfcOpeningElement] = new IfcEntityDescriptor(Type::IfcOpeningElement,entity_descriptor_map.find(Type::IfcFeatureElementSubtraction)->second);
 
     current = entity_descriptor_map[Type::IfcOrderAction] = new IfcEntityDescriptor(Type::IfcOrderAction,entity_descriptor_map.find(Type::IfcTask)->second);
-    current->add("ActionID",false,IfcUtil::Argument_STRING);
+    current->add("ActionID",false,IfcUtil::Argument_STRING,Type::IfcIdentifier);
     current = entity_descriptor_map[Type::IfcOutletType] = new IfcEntityDescriptor(Type::IfcOutletType,entity_descriptor_map.find(Type::IfcFlowTerminalType)->second);
     current->add("PredefinedType",false,IfcUtil::Argument_ENUMERATION,Type::IfcOutletTypeEnum);
     current = entity_descriptor_map[Type::IfcPerformanceHistory] = new IfcEntityDescriptor(Type::IfcPerformanceHistory,entity_descriptor_map.find(Type::IfcControl)->second);
-    current->add("LifeCyclePhase",false,IfcUtil::Argument_STRING);
+    current->add("LifeCyclePhase",false,IfcUtil::Argument_STRING,Type::IfcLabel);
     current = entity_descriptor_map[Type::IfcPermit] = new IfcEntityDescriptor(Type::IfcPermit,entity_descriptor_map.find(Type::IfcControl)->second);
-    current->add("PermitID",false,IfcUtil::Argument_STRING);
+    current->add("PermitID",false,IfcUtil::Argument_STRING,Type::IfcIdentifier);
     current = entity_descriptor_map[Type::IfcPipeFittingType] = new IfcEntityDescriptor(Type::IfcPipeFittingType,entity_descriptor_map.find(Type::IfcFlowFittingType)->second);
     current->add("PredefinedType",false,IfcUtil::Argument_ENUMERATION,Type::IfcPipeFittingTypeEnum);
     current = entity_descriptor_map[Type::IfcPipeSegmentType] = new IfcEntityDescriptor(Type::IfcPipeSegmentType,entity_descriptor_map.find(Type::IfcFlowSegmentType)->second);
@@ -1990,19 +2004,19 @@ void InitDescriptorMap() {
     current = entity_descriptor_map[Type::IfcPlateType] = new IfcEntityDescriptor(Type::IfcPlateType,entity_descriptor_map.find(Type::IfcBuildingElementType)->second);
     current->add("PredefinedType",false,IfcUtil::Argument_ENUMERATION,Type::IfcPlateTypeEnum);
     current = entity_descriptor_map[Type::IfcPolyline] = new IfcEntityDescriptor(Type::IfcPolyline,entity_descriptor_map.find(Type::IfcBoundedCurve)->second);
-    current->add("Points",false,IfcUtil::Argument_ENTITY_LIST);
+    current->add("Points",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcCartesianPoint);
     current = entity_descriptor_map[Type::IfcPort] = new IfcEntityDescriptor(Type::IfcPort,entity_descriptor_map.find(Type::IfcProduct)->second);
 
     current = entity_descriptor_map[Type::IfcProcedure] = new IfcEntityDescriptor(Type::IfcProcedure,entity_descriptor_map.find(Type::IfcProcess)->second);
-    current->add("ProcedureID",false,IfcUtil::Argument_STRING);
+    current->add("ProcedureID",false,IfcUtil::Argument_STRING,Type::IfcIdentifier);
     current->add("ProcedureType",false,IfcUtil::Argument_ENUMERATION,Type::IfcProcedureTypeEnum);
-    current->add("UserDefinedProcedureType",true,IfcUtil::Argument_STRING);
+    current->add("UserDefinedProcedureType",true,IfcUtil::Argument_STRING,Type::IfcLabel);
     current = entity_descriptor_map[Type::IfcProjectOrder] = new IfcEntityDescriptor(Type::IfcProjectOrder,entity_descriptor_map.find(Type::IfcControl)->second);
-    current->add("ID",false,IfcUtil::Argument_STRING);
+    current->add("ID",false,IfcUtil::Argument_STRING,Type::IfcIdentifier);
     current->add("PredefinedType",false,IfcUtil::Argument_ENUMERATION,Type::IfcProjectOrderTypeEnum);
-    current->add("Status",true,IfcUtil::Argument_STRING);
+    current->add("Status",true,IfcUtil::Argument_STRING,Type::IfcLabel);
     current = entity_descriptor_map[Type::IfcProjectOrderRecord] = new IfcEntityDescriptor(Type::IfcProjectOrderRecord,entity_descriptor_map.find(Type::IfcControl)->second);
-    current->add("Records",false,IfcUtil::Argument_ENTITY_LIST);
+    current->add("Records",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcRelAssignsToProjectOrder);
     current->add("PredefinedType",false,IfcUtil::Argument_ENUMERATION,Type::IfcProjectOrderRecordTypeEnum);
     current = entity_descriptor_map[Type::IfcProjectionElement] = new IfcEntityDescriptor(Type::IfcProjectionElement,entity_descriptor_map.find(Type::IfcFeatureElementAddition)->second);
 
@@ -2019,50 +2033,50 @@ void InitDescriptorMap() {
     current = entity_descriptor_map[Type::IfcRelAggregates] = new IfcEntityDescriptor(Type::IfcRelAggregates,entity_descriptor_map.find(Type::IfcRelDecomposes)->second);
 
     current = entity_descriptor_map[Type::IfcRelAssignsTasks] = new IfcEntityDescriptor(Type::IfcRelAssignsTasks,entity_descriptor_map.find(Type::IfcRelAssignsToControl)->second);
-    current->add("TimeForTask",true,IfcUtil::Argument_ENTITY);
+    current->add("TimeForTask",true,IfcUtil::Argument_ENTITY,Type::IfcScheduleTimeControl);
     current = entity_descriptor_map[Type::IfcSanitaryTerminalType] = new IfcEntityDescriptor(Type::IfcSanitaryTerminalType,entity_descriptor_map.find(Type::IfcFlowTerminalType)->second);
     current->add("PredefinedType",false,IfcUtil::Argument_ENUMERATION,Type::IfcSanitaryTerminalTypeEnum);
     current = entity_descriptor_map[Type::IfcScheduleTimeControl] = new IfcEntityDescriptor(Type::IfcScheduleTimeControl,entity_descriptor_map.find(Type::IfcControl)->second);
-    current->add("ActualStart",true,IfcUtil::Argument_ENTITY);
-    current->add("EarlyStart",true,IfcUtil::Argument_ENTITY);
-    current->add("LateStart",true,IfcUtil::Argument_ENTITY);
-    current->add("ScheduleStart",true,IfcUtil::Argument_ENTITY);
-    current->add("ActualFinish",true,IfcUtil::Argument_ENTITY);
-    current->add("EarlyFinish",true,IfcUtil::Argument_ENTITY);
-    current->add("LateFinish",true,IfcUtil::Argument_ENTITY);
-    current->add("ScheduleFinish",true,IfcUtil::Argument_ENTITY);
-    current->add("ScheduleDuration",true,IfcUtil::Argument_DOUBLE);
-    current->add("ActualDuration",true,IfcUtil::Argument_DOUBLE);
-    current->add("RemainingTime",true,IfcUtil::Argument_DOUBLE);
-    current->add("FreeFloat",true,IfcUtil::Argument_DOUBLE);
-    current->add("TotalFloat",true,IfcUtil::Argument_DOUBLE);
-    current->add("IsCritical",true,IfcUtil::Argument_BOOL);
-    current->add("StatusTime",true,IfcUtil::Argument_ENTITY);
-    current->add("StartFloat",true,IfcUtil::Argument_DOUBLE);
-    current->add("FinishFloat",true,IfcUtil::Argument_DOUBLE);
-    current->add("Completion",true,IfcUtil::Argument_DOUBLE);
+    current->add("ActualStart",true,IfcUtil::Argument_ENTITY,Type::IfcDateTimeSelect);
+    current->add("EarlyStart",true,IfcUtil::Argument_ENTITY,Type::IfcDateTimeSelect);
+    current->add("LateStart",true,IfcUtil::Argument_ENTITY,Type::IfcDateTimeSelect);
+    current->add("ScheduleStart",true,IfcUtil::Argument_ENTITY,Type::IfcDateTimeSelect);
+    current->add("ActualFinish",true,IfcUtil::Argument_ENTITY,Type::IfcDateTimeSelect);
+    current->add("EarlyFinish",true,IfcUtil::Argument_ENTITY,Type::IfcDateTimeSelect);
+    current->add("LateFinish",true,IfcUtil::Argument_ENTITY,Type::IfcDateTimeSelect);
+    current->add("ScheduleFinish",true,IfcUtil::Argument_ENTITY,Type::IfcDateTimeSelect);
+    current->add("ScheduleDuration",true,IfcUtil::Argument_DOUBLE,Type::IfcTimeMeasure);
+    current->add("ActualDuration",true,IfcUtil::Argument_DOUBLE,Type::IfcTimeMeasure);
+    current->add("RemainingTime",true,IfcUtil::Argument_DOUBLE,Type::IfcTimeMeasure);
+    current->add("FreeFloat",true,IfcUtil::Argument_DOUBLE,Type::IfcTimeMeasure);
+    current->add("TotalFloat",true,IfcUtil::Argument_DOUBLE,Type::IfcTimeMeasure);
+    current->add("IsCritical",true,IfcUtil::Argument_BOOL,Type::UNDEFINED);
+    current->add("StatusTime",true,IfcUtil::Argument_ENTITY,Type::IfcDateTimeSelect);
+    current->add("StartFloat",true,IfcUtil::Argument_DOUBLE,Type::IfcTimeMeasure);
+    current->add("FinishFloat",true,IfcUtil::Argument_DOUBLE,Type::IfcTimeMeasure);
+    current->add("Completion",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveRatioMeasure);
     current = entity_descriptor_map[Type::IfcServiceLife] = new IfcEntityDescriptor(Type::IfcServiceLife,entity_descriptor_map.find(Type::IfcControl)->second);
     current->add("ServiceLifeType",false,IfcUtil::Argument_ENUMERATION,Type::IfcServiceLifeTypeEnum);
-    current->add("ServiceLifeDuration",false,IfcUtil::Argument_DOUBLE);
+    current->add("ServiceLifeDuration",false,IfcUtil::Argument_DOUBLE,Type::IfcTimeMeasure);
     current = entity_descriptor_map[Type::IfcSite] = new IfcEntityDescriptor(Type::IfcSite,entity_descriptor_map.find(Type::IfcSpatialStructureElement)->second);
-    current->add("RefLatitude",true,IfcUtil::Argument_VECTOR_INT);
-    current->add("RefLongitude",true,IfcUtil::Argument_VECTOR_INT);
-    current->add("RefElevation",true,IfcUtil::Argument_DOUBLE);
-    current->add("LandTitleNumber",true,IfcUtil::Argument_STRING);
-    current->add("SiteAddress",true,IfcUtil::Argument_ENTITY);
+    current->add("RefLatitude",true,IfcUtil::Argument_VECTOR_INT,Type::IfcCompoundPlaneAngleMeasure);
+    current->add("RefLongitude",true,IfcUtil::Argument_VECTOR_INT,Type::IfcCompoundPlaneAngleMeasure);
+    current->add("RefElevation",true,IfcUtil::Argument_DOUBLE,Type::IfcLengthMeasure);
+    current->add("LandTitleNumber",true,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("SiteAddress",true,IfcUtil::Argument_ENTITY,Type::IfcPostalAddress);
     current = entity_descriptor_map[Type::IfcSlabType] = new IfcEntityDescriptor(Type::IfcSlabType,entity_descriptor_map.find(Type::IfcBuildingElementType)->second);
     current->add("PredefinedType",false,IfcUtil::Argument_ENUMERATION,Type::IfcSlabTypeEnum);
     current = entity_descriptor_map[Type::IfcSpace] = new IfcEntityDescriptor(Type::IfcSpace,entity_descriptor_map.find(Type::IfcSpatialStructureElement)->second);
     current->add("InteriorOrExteriorSpace",false,IfcUtil::Argument_ENUMERATION,Type::IfcInternalOrExternalEnum);
-    current->add("ElevationWithFlooring",true,IfcUtil::Argument_DOUBLE);
+    current->add("ElevationWithFlooring",true,IfcUtil::Argument_DOUBLE,Type::IfcLengthMeasure);
     current = entity_descriptor_map[Type::IfcSpaceHeaterType] = new IfcEntityDescriptor(Type::IfcSpaceHeaterType,entity_descriptor_map.find(Type::IfcEnergyConversionDeviceType)->second);
     current->add("PredefinedType",false,IfcUtil::Argument_ENUMERATION,Type::IfcSpaceHeaterTypeEnum);
     current = entity_descriptor_map[Type::IfcSpaceProgram] = new IfcEntityDescriptor(Type::IfcSpaceProgram,entity_descriptor_map.find(Type::IfcControl)->second);
-    current->add("SpaceProgramIdentifier",false,IfcUtil::Argument_STRING);
-    current->add("MaxRequiredArea",true,IfcUtil::Argument_DOUBLE);
-    current->add("MinRequiredArea",true,IfcUtil::Argument_DOUBLE);
-    current->add("RequestedLocation",true,IfcUtil::Argument_ENTITY);
-    current->add("StandardRequiredArea",false,IfcUtil::Argument_DOUBLE);
+    current->add("SpaceProgramIdentifier",false,IfcUtil::Argument_STRING,Type::IfcIdentifier);
+    current->add("MaxRequiredArea",true,IfcUtil::Argument_DOUBLE,Type::IfcAreaMeasure);
+    current->add("MinRequiredArea",true,IfcUtil::Argument_DOUBLE,Type::IfcAreaMeasure);
+    current->add("RequestedLocation",true,IfcUtil::Argument_ENTITY,Type::IfcSpatialStructureElement);
+    current->add("StandardRequiredArea",false,IfcUtil::Argument_DOUBLE,Type::IfcAreaMeasure);
     current = entity_descriptor_map[Type::IfcSpaceType] = new IfcEntityDescriptor(Type::IfcSpaceType,entity_descriptor_map.find(Type::IfcSpatialStructureElementType)->second);
     current->add("PredefinedType",false,IfcUtil::Argument_ENUMERATION,Type::IfcSpaceTypeEnum);
     current = entity_descriptor_map[Type::IfcStackTerminalType] = new IfcEntityDescriptor(Type::IfcStackTerminalType,entity_descriptor_map.find(Type::IfcFlowTerminalType)->second);
@@ -2070,10 +2084,10 @@ void InitDescriptorMap() {
     current = entity_descriptor_map[Type::IfcStairFlightType] = new IfcEntityDescriptor(Type::IfcStairFlightType,entity_descriptor_map.find(Type::IfcBuildingElementType)->second);
     current->add("PredefinedType",false,IfcUtil::Argument_ENUMERATION,Type::IfcStairFlightTypeEnum);
     current = entity_descriptor_map[Type::IfcStructuralAction] = new IfcEntityDescriptor(Type::IfcStructuralAction,entity_descriptor_map.find(Type::IfcStructuralActivity)->second);
-    current->add("DestabilizingLoad",false,IfcUtil::Argument_BOOL);
-    current->add("CausedBy",true,IfcUtil::Argument_ENTITY);
+    current->add("DestabilizingLoad",false,IfcUtil::Argument_BOOL,Type::UNDEFINED);
+    current->add("CausedBy",true,IfcUtil::Argument_ENTITY,Type::IfcStructuralReaction);
     current = entity_descriptor_map[Type::IfcStructuralConnection] = new IfcEntityDescriptor(Type::IfcStructuralConnection,entity_descriptor_map.find(Type::IfcStructuralItem)->second);
-    current->add("AppliedCondition",true,IfcUtil::Argument_ENTITY);
+    current->add("AppliedCondition",true,IfcUtil::Argument_ENTITY,Type::IfcBoundaryCondition);
     current = entity_descriptor_map[Type::IfcStructuralCurveConnection] = new IfcEntityDescriptor(Type::IfcStructuralCurveConnection,entity_descriptor_map.find(Type::IfcStructuralConnection)->second);
 
     current = entity_descriptor_map[Type::IfcStructuralCurveMember] = new IfcEntityDescriptor(Type::IfcStructuralCurveMember,entity_descriptor_map.find(Type::IfcStructuralMember)->second);
@@ -2083,19 +2097,19 @@ void InitDescriptorMap() {
     current = entity_descriptor_map[Type::IfcStructuralLinearAction] = new IfcEntityDescriptor(Type::IfcStructuralLinearAction,entity_descriptor_map.find(Type::IfcStructuralAction)->second);
     current->add("ProjectedOrTrue",false,IfcUtil::Argument_ENUMERATION,Type::IfcProjectedOrTrueLengthEnum);
     current = entity_descriptor_map[Type::IfcStructuralLinearActionVarying] = new IfcEntityDescriptor(Type::IfcStructuralLinearActionVarying,entity_descriptor_map.find(Type::IfcStructuralLinearAction)->second);
-    current->add("VaryingAppliedLoadLocation",false,IfcUtil::Argument_ENTITY);
-    current->add("SubsequentAppliedLoads",false,IfcUtil::Argument_ENTITY_LIST);
+    current->add("VaryingAppliedLoadLocation",false,IfcUtil::Argument_ENTITY,Type::IfcShapeAspect);
+    current->add("SubsequentAppliedLoads",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcStructuralLoad);
     current = entity_descriptor_map[Type::IfcStructuralLoadGroup] = new IfcEntityDescriptor(Type::IfcStructuralLoadGroup,entity_descriptor_map.find(Type::IfcGroup)->second);
     current->add("PredefinedType",false,IfcUtil::Argument_ENUMERATION,Type::IfcLoadGroupTypeEnum);
     current->add("ActionType",false,IfcUtil::Argument_ENUMERATION,Type::IfcActionTypeEnum);
     current->add("ActionSource",false,IfcUtil::Argument_ENUMERATION,Type::IfcActionSourceTypeEnum);
-    current->add("Coefficient",true,IfcUtil::Argument_DOUBLE);
-    current->add("Purpose",true,IfcUtil::Argument_STRING);
+    current->add("Coefficient",true,IfcUtil::Argument_DOUBLE,Type::IfcRatioMeasure);
+    current->add("Purpose",true,IfcUtil::Argument_STRING,Type::IfcLabel);
     current = entity_descriptor_map[Type::IfcStructuralPlanarAction] = new IfcEntityDescriptor(Type::IfcStructuralPlanarAction,entity_descriptor_map.find(Type::IfcStructuralAction)->second);
     current->add("ProjectedOrTrue",false,IfcUtil::Argument_ENUMERATION,Type::IfcProjectedOrTrueLengthEnum);
     current = entity_descriptor_map[Type::IfcStructuralPlanarActionVarying] = new IfcEntityDescriptor(Type::IfcStructuralPlanarActionVarying,entity_descriptor_map.find(Type::IfcStructuralPlanarAction)->second);
-    current->add("VaryingAppliedLoadLocation",false,IfcUtil::Argument_ENTITY);
-    current->add("SubsequentAppliedLoads",false,IfcUtil::Argument_ENTITY_LIST);
+    current->add("VaryingAppliedLoadLocation",false,IfcUtil::Argument_ENTITY,Type::IfcShapeAspect);
+    current->add("SubsequentAppliedLoads",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcStructuralLoad);
     current = entity_descriptor_map[Type::IfcStructuralPointAction] = new IfcEntityDescriptor(Type::IfcStructuralPointAction,entity_descriptor_map.find(Type::IfcStructuralAction)->second);
 
     current = entity_descriptor_map[Type::IfcStructuralPointConnection] = new IfcEntityDescriptor(Type::IfcStructuralPointConnection,entity_descriptor_map.find(Type::IfcStructuralConnection)->second);
@@ -2104,13 +2118,13 @@ void InitDescriptorMap() {
 
     current = entity_descriptor_map[Type::IfcStructuralResultGroup] = new IfcEntityDescriptor(Type::IfcStructuralResultGroup,entity_descriptor_map.find(Type::IfcGroup)->second);
     current->add("TheoryType",false,IfcUtil::Argument_ENUMERATION,Type::IfcAnalysisTheoryTypeEnum);
-    current->add("ResultForLoadGroup",true,IfcUtil::Argument_ENTITY);
-    current->add("IsLinear",false,IfcUtil::Argument_BOOL);
+    current->add("ResultForLoadGroup",true,IfcUtil::Argument_ENTITY,Type::IfcStructuralLoadGroup);
+    current->add("IsLinear",false,IfcUtil::Argument_BOOL,Type::UNDEFINED);
     current = entity_descriptor_map[Type::IfcStructuralSurfaceConnection] = new IfcEntityDescriptor(Type::IfcStructuralSurfaceConnection,entity_descriptor_map.find(Type::IfcStructuralConnection)->second);
 
     current = entity_descriptor_map[Type::IfcSubContractResource] = new IfcEntityDescriptor(Type::IfcSubContractResource,entity_descriptor_map.find(Type::IfcConstructionResource)->second);
-    current->add("SubContractor",true,IfcUtil::Argument_ENTITY);
-    current->add("JobDescription",true,IfcUtil::Argument_STRING);
+    current->add("SubContractor",true,IfcUtil::Argument_ENTITY,Type::IfcActorSelect);
+    current->add("JobDescription",true,IfcUtil::Argument_STRING,Type::IfcText);
     current = entity_descriptor_map[Type::IfcSwitchingDeviceType] = new IfcEntityDescriptor(Type::IfcSwitchingDeviceType,entity_descriptor_map.find(Type::IfcFlowControllerType)->second);
     current->add("PredefinedType",false,IfcUtil::Argument_ENUMERATION,Type::IfcSwitchingDeviceTypeEnum);
     current = entity_descriptor_map[Type::IfcSystem] = new IfcEntityDescriptor(Type::IfcSystem,entity_descriptor_map.find(Type::IfcGroup)->second);
@@ -2118,20 +2132,20 @@ void InitDescriptorMap() {
     current = entity_descriptor_map[Type::IfcTankType] = new IfcEntityDescriptor(Type::IfcTankType,entity_descriptor_map.find(Type::IfcFlowStorageDeviceType)->second);
     current->add("PredefinedType",false,IfcUtil::Argument_ENUMERATION,Type::IfcTankTypeEnum);
     current = entity_descriptor_map[Type::IfcTimeSeriesSchedule] = new IfcEntityDescriptor(Type::IfcTimeSeriesSchedule,entity_descriptor_map.find(Type::IfcControl)->second);
-    current->add("ApplicableDates",true,IfcUtil::Argument_ENTITY_LIST);
+    current->add("ApplicableDates",true,IfcUtil::Argument_ENTITY_LIST,Type::IfcDateTimeSelect);
     current->add("TimeSeriesScheduleType",false,IfcUtil::Argument_ENUMERATION,Type::IfcTimeSeriesScheduleTypeEnum);
-    current->add("TimeSeries",false,IfcUtil::Argument_ENTITY);
+    current->add("TimeSeries",false,IfcUtil::Argument_ENTITY,Type::IfcTimeSeries);
     current = entity_descriptor_map[Type::IfcTransformerType] = new IfcEntityDescriptor(Type::IfcTransformerType,entity_descriptor_map.find(Type::IfcEnergyConversionDeviceType)->second);
     current->add("PredefinedType",false,IfcUtil::Argument_ENUMERATION,Type::IfcTransformerTypeEnum);
     current = entity_descriptor_map[Type::IfcTransportElement] = new IfcEntityDescriptor(Type::IfcTransportElement,entity_descriptor_map.find(Type::IfcElement)->second);
     current->add("OperationType",true,IfcUtil::Argument_ENUMERATION,Type::IfcTransportElementTypeEnum);
-    current->add("CapacityByWeight",true,IfcUtil::Argument_DOUBLE);
-    current->add("CapacityByNumber",true,IfcUtil::Argument_DOUBLE);
+    current->add("CapacityByWeight",true,IfcUtil::Argument_DOUBLE,Type::IfcMassMeasure);
+    current->add("CapacityByNumber",true,IfcUtil::Argument_DOUBLE,Type::IfcCountMeasure);
     current = entity_descriptor_map[Type::IfcTrimmedCurve] = new IfcEntityDescriptor(Type::IfcTrimmedCurve,entity_descriptor_map.find(Type::IfcBoundedCurve)->second);
-    current->add("BasisCurve",false,IfcUtil::Argument_ENTITY);
-    current->add("Trim1",false,IfcUtil::Argument_ENTITY_LIST);
-    current->add("Trim2",false,IfcUtil::Argument_ENTITY_LIST);
-    current->add("SenseAgreement",false,IfcUtil::Argument_BOOL);
+    current->add("BasisCurve",false,IfcUtil::Argument_ENTITY,Type::IfcCurve);
+    current->add("Trim1",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcTrimmingSelect);
+    current->add("Trim2",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcTrimmingSelect);
+    current->add("SenseAgreement",false,IfcUtil::Argument_BOOL,Type::UNDEFINED);
     current->add("MasterRepresentation",false,IfcUtil::Argument_ENUMERATION,Type::IfcTrimmingPreference);
     current = entity_descriptor_map[Type::IfcTubeBundleType] = new IfcEntityDescriptor(Type::IfcTubeBundleType,entity_descriptor_map.find(Type::IfcEnergyConversionDeviceType)->second);
     current->add("PredefinedType",false,IfcUtil::Argument_ENUMERATION,Type::IfcTubeBundleTypeEnum);
@@ -2146,16 +2160,16 @@ void InitDescriptorMap() {
     current = entity_descriptor_map[Type::IfcWasteTerminalType] = new IfcEntityDescriptor(Type::IfcWasteTerminalType,entity_descriptor_map.find(Type::IfcFlowTerminalType)->second);
     current->add("PredefinedType",false,IfcUtil::Argument_ENUMERATION,Type::IfcWasteTerminalTypeEnum);
     current = entity_descriptor_map[Type::IfcWorkControl] = new IfcEntityDescriptor(Type::IfcWorkControl,entity_descriptor_map.find(Type::IfcControl)->second);
-    current->add("Identifier",false,IfcUtil::Argument_STRING);
-    current->add("CreationDate",false,IfcUtil::Argument_ENTITY);
-    current->add("Creators",true,IfcUtil::Argument_ENTITY_LIST);
-    current->add("Purpose",true,IfcUtil::Argument_STRING);
-    current->add("Duration",true,IfcUtil::Argument_DOUBLE);
-    current->add("TotalFloat",true,IfcUtil::Argument_DOUBLE);
-    current->add("StartTime",false,IfcUtil::Argument_ENTITY);
-    current->add("FinishTime",true,IfcUtil::Argument_ENTITY);
+    current->add("Identifier",false,IfcUtil::Argument_STRING,Type::IfcIdentifier);
+    current->add("CreationDate",false,IfcUtil::Argument_ENTITY,Type::IfcDateTimeSelect);
+    current->add("Creators",true,IfcUtil::Argument_ENTITY_LIST,Type::IfcPerson);
+    current->add("Purpose",true,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("Duration",true,IfcUtil::Argument_DOUBLE,Type::IfcTimeMeasure);
+    current->add("TotalFloat",true,IfcUtil::Argument_DOUBLE,Type::IfcTimeMeasure);
+    current->add("StartTime",false,IfcUtil::Argument_ENTITY,Type::IfcDateTimeSelect);
+    current->add("FinishTime",true,IfcUtil::Argument_ENTITY,Type::IfcDateTimeSelect);
     current->add("WorkControlType",true,IfcUtil::Argument_ENUMERATION,Type::IfcWorkControlTypeEnum);
-    current->add("UserDefinedControlType",true,IfcUtil::Argument_STRING);
+    current->add("UserDefinedControlType",true,IfcUtil::Argument_STRING,Type::IfcLabel);
     current = entity_descriptor_map[Type::IfcWorkPlan] = new IfcEntityDescriptor(Type::IfcWorkPlan,entity_descriptor_map.find(Type::IfcWorkControl)->second);
 
     current = entity_descriptor_map[Type::IfcWorkSchedule] = new IfcEntityDescriptor(Type::IfcWorkSchedule,entity_descriptor_map.find(Type::IfcWorkControl)->second);
@@ -2165,7 +2179,7 @@ void InitDescriptorMap() {
     current = entity_descriptor_map[Type::Ifc2DCompositeCurve] = new IfcEntityDescriptor(Type::Ifc2DCompositeCurve,entity_descriptor_map.find(Type::IfcCompositeCurve)->second);
 
     current = entity_descriptor_map[Type::IfcActionRequest] = new IfcEntityDescriptor(Type::IfcActionRequest,entity_descriptor_map.find(Type::IfcControl)->second);
-    current->add("RequestID",false,IfcUtil::Argument_STRING);
+    current->add("RequestID",false,IfcUtil::Argument_STRING,Type::IfcIdentifier);
     current = entity_descriptor_map[Type::IfcAirTerminalBoxType] = new IfcEntityDescriptor(Type::IfcAirTerminalBoxType,entity_descriptor_map.find(Type::IfcFlowControllerType)->second);
     current->add("PredefinedType",false,IfcUtil::Argument_ENUMERATION,Type::IfcAirTerminalBoxTypeEnum);
     current = entity_descriptor_map[Type::IfcAirTerminalType] = new IfcEntityDescriptor(Type::IfcAirTerminalType,entity_descriptor_map.find(Type::IfcFlowTerminalType)->second);
@@ -2175,21 +2189,21 @@ void InitDescriptorMap() {
     current = entity_descriptor_map[Type::IfcAngularDimension] = new IfcEntityDescriptor(Type::IfcAngularDimension,entity_descriptor_map.find(Type::IfcDimensionCurveDirectedCallout)->second);
 
     current = entity_descriptor_map[Type::IfcAsset] = new IfcEntityDescriptor(Type::IfcAsset,entity_descriptor_map.find(Type::IfcGroup)->second);
-    current->add("AssetID",false,IfcUtil::Argument_STRING);
-    current->add("OriginalValue",false,IfcUtil::Argument_ENTITY);
-    current->add("CurrentValue",false,IfcUtil::Argument_ENTITY);
-    current->add("TotalReplacementCost",false,IfcUtil::Argument_ENTITY);
-    current->add("Owner",false,IfcUtil::Argument_ENTITY);
-    current->add("User",false,IfcUtil::Argument_ENTITY);
-    current->add("ResponsiblePerson",false,IfcUtil::Argument_ENTITY);
-    current->add("IncorporationDate",false,IfcUtil::Argument_ENTITY);
-    current->add("DepreciatedValue",false,IfcUtil::Argument_ENTITY);
+    current->add("AssetID",false,IfcUtil::Argument_STRING,Type::IfcIdentifier);
+    current->add("OriginalValue",false,IfcUtil::Argument_ENTITY,Type::IfcCostValue);
+    current->add("CurrentValue",false,IfcUtil::Argument_ENTITY,Type::IfcCostValue);
+    current->add("TotalReplacementCost",false,IfcUtil::Argument_ENTITY,Type::IfcCostValue);
+    current->add("Owner",false,IfcUtil::Argument_ENTITY,Type::IfcActorSelect);
+    current->add("User",false,IfcUtil::Argument_ENTITY,Type::IfcActorSelect);
+    current->add("ResponsiblePerson",false,IfcUtil::Argument_ENTITY,Type::IfcPerson);
+    current->add("IncorporationDate",false,IfcUtil::Argument_ENTITY,Type::IfcCalendarDate);
+    current->add("DepreciatedValue",false,IfcUtil::Argument_ENTITY,Type::IfcCostValue);
     current = entity_descriptor_map[Type::IfcBSplineCurve] = new IfcEntityDescriptor(Type::IfcBSplineCurve,entity_descriptor_map.find(Type::IfcBoundedCurve)->second);
-    current->add("Degree",false,IfcUtil::Argument_INT);
-    current->add("ControlPointsList",false,IfcUtil::Argument_ENTITY_LIST);
+    current->add("Degree",false,IfcUtil::Argument_INT,Type::UNDEFINED);
+    current->add("ControlPointsList",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcCartesianPoint);
     current->add("CurveForm",false,IfcUtil::Argument_ENUMERATION,Type::IfcBSplineCurveForm);
-    current->add("ClosedCurve",false,IfcUtil::Argument_BOOL);
-    current->add("SelfIntersect",false,IfcUtil::Argument_BOOL);
+    current->add("ClosedCurve",false,IfcUtil::Argument_BOOL,Type::UNDEFINED);
+    current->add("SelfIntersect",false,IfcUtil::Argument_BOOL,Type::UNDEFINED);
     current = entity_descriptor_map[Type::IfcBeamType] = new IfcEntityDescriptor(Type::IfcBeamType,entity_descriptor_map.find(Type::IfcBuildingElementType)->second);
     current->add("PredefinedType",false,IfcUtil::Argument_ENUMERATION,Type::IfcBeamTypeEnum);
     current = entity_descriptor_map[Type::IfcBezierCurve] = new IfcEntityDescriptor(Type::IfcBezierCurve,entity_descriptor_map.find(Type::IfcBSplineCurve)->second);
@@ -2215,7 +2229,7 @@ void InitDescriptorMap() {
     current = entity_descriptor_map[Type::IfcChillerType] = new IfcEntityDescriptor(Type::IfcChillerType,entity_descriptor_map.find(Type::IfcEnergyConversionDeviceType)->second);
     current->add("PredefinedType",false,IfcUtil::Argument_ENUMERATION,Type::IfcChillerTypeEnum);
     current = entity_descriptor_map[Type::IfcCircle] = new IfcEntityDescriptor(Type::IfcCircle,entity_descriptor_map.find(Type::IfcConic)->second);
-    current->add("Radius",false,IfcUtil::Argument_DOUBLE);
+    current->add("Radius",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
     current = entity_descriptor_map[Type::IfcCoilType] = new IfcEntityDescriptor(Type::IfcCoilType,entity_descriptor_map.find(Type::IfcEnergyConversionDeviceType)->second);
     current->add("PredefinedType",false,IfcUtil::Argument_ENUMERATION,Type::IfcCoilTypeEnum);
     current = entity_descriptor_map[Type::IfcColumn] = new IfcEntityDescriptor(Type::IfcColumn,entity_descriptor_map.find(Type::IfcBuildingElement)->second);
@@ -2227,13 +2241,13 @@ void InitDescriptorMap() {
     current = entity_descriptor_map[Type::IfcCondition] = new IfcEntityDescriptor(Type::IfcCondition,entity_descriptor_map.find(Type::IfcGroup)->second);
 
     current = entity_descriptor_map[Type::IfcConditionCriterion] = new IfcEntityDescriptor(Type::IfcConditionCriterion,entity_descriptor_map.find(Type::IfcControl)->second);
-    current->add("Criterion",false,IfcUtil::Argument_ENTITY);
-    current->add("CriterionDateTime",false,IfcUtil::Argument_ENTITY);
+    current->add("Criterion",false,IfcUtil::Argument_ENTITY,Type::IfcConditionCriterionSelect);
+    current->add("CriterionDateTime",false,IfcUtil::Argument_ENTITY,Type::IfcDateTimeSelect);
     current = entity_descriptor_map[Type::IfcConstructionEquipmentResource] = new IfcEntityDescriptor(Type::IfcConstructionEquipmentResource,entity_descriptor_map.find(Type::IfcConstructionResource)->second);
 
     current = entity_descriptor_map[Type::IfcConstructionMaterialResource] = new IfcEntityDescriptor(Type::IfcConstructionMaterialResource,entity_descriptor_map.find(Type::IfcConstructionResource)->second);
-    current->add("Suppliers",true,IfcUtil::Argument_ENTITY_LIST);
-    current->add("UsageRatio",true,IfcUtil::Argument_DOUBLE);
+    current->add("Suppliers",true,IfcUtil::Argument_ENTITY_LIST,Type::IfcActorSelect);
+    current->add("UsageRatio",true,IfcUtil::Argument_DOUBLE,Type::IfcRatioMeasure);
     current = entity_descriptor_map[Type::IfcConstructionProductResource] = new IfcEntityDescriptor(Type::IfcConstructionProductResource,entity_descriptor_map.find(Type::IfcConstructionResource)->second);
 
     current = entity_descriptor_map[Type::IfcCooledBeamType] = new IfcEntityDescriptor(Type::IfcCooledBeamType,entity_descriptor_map.find(Type::IfcEnergyConversionDeviceType)->second);
@@ -2263,8 +2277,8 @@ void InitDescriptorMap() {
     current = entity_descriptor_map[Type::IfcDistributionPort] = new IfcEntityDescriptor(Type::IfcDistributionPort,entity_descriptor_map.find(Type::IfcPort)->second);
     current->add("FlowDirection",true,IfcUtil::Argument_ENUMERATION,Type::IfcFlowDirectionEnum);
     current = entity_descriptor_map[Type::IfcDoor] = new IfcEntityDescriptor(Type::IfcDoor,entity_descriptor_map.find(Type::IfcBuildingElement)->second);
-    current->add("OverallHeight",true,IfcUtil::Argument_DOUBLE);
-    current->add("OverallWidth",true,IfcUtil::Argument_DOUBLE);
+    current->add("OverallHeight",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("OverallWidth",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
     current = entity_descriptor_map[Type::IfcDuctFittingType] = new IfcEntityDescriptor(Type::IfcDuctFittingType,entity_descriptor_map.find(Type::IfcFlowFittingType)->second);
     current->add("PredefinedType",false,IfcUtil::Argument_ENUMERATION,Type::IfcDuctFittingTypeEnum);
     current = entity_descriptor_map[Type::IfcDuctSegmentType] = new IfcEntityDescriptor(Type::IfcDuctSegmentType,entity_descriptor_map.find(Type::IfcFlowSegmentType)->second);
@@ -2272,7 +2286,7 @@ void InitDescriptorMap() {
     current = entity_descriptor_map[Type::IfcDuctSilencerType] = new IfcEntityDescriptor(Type::IfcDuctSilencerType,entity_descriptor_map.find(Type::IfcFlowTreatmentDeviceType)->second);
     current->add("PredefinedType",false,IfcUtil::Argument_ENUMERATION,Type::IfcDuctSilencerTypeEnum);
     current = entity_descriptor_map[Type::IfcEdgeFeature] = new IfcEntityDescriptor(Type::IfcEdgeFeature,entity_descriptor_map.find(Type::IfcFeatureElementSubtraction)->second);
-    current->add("FeatureLength",true,IfcUtil::Argument_DOUBLE);
+    current->add("FeatureLength",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
     current = entity_descriptor_map[Type::IfcElectricApplianceType] = new IfcEntityDescriptor(Type::IfcElectricApplianceType,entity_descriptor_map.find(Type::IfcFlowTerminalType)->second);
     current->add("PredefinedType",false,IfcUtil::Argument_ENUMERATION,Type::IfcElectricApplianceTypeEnum);
     current = entity_descriptor_map[Type::IfcElectricFlowStorageDeviceType] = new IfcEntityDescriptor(Type::IfcElectricFlowStorageDeviceType,entity_descriptor_map.find(Type::IfcFlowStorageDeviceType)->second);
@@ -2329,22 +2343,22 @@ void InitDescriptorMap() {
     current = entity_descriptor_map[Type::IfcRampFlight] = new IfcEntityDescriptor(Type::IfcRampFlight,entity_descriptor_map.find(Type::IfcBuildingElement)->second);
 
     current = entity_descriptor_map[Type::IfcRationalBezierCurve] = new IfcEntityDescriptor(Type::IfcRationalBezierCurve,entity_descriptor_map.find(Type::IfcBezierCurve)->second);
-    current->add("WeightsData",false,IfcUtil::Argument_VECTOR_DOUBLE);
+    current->add("WeightsData",false,IfcUtil::Argument_VECTOR_DOUBLE,Type::UNDEFINED);
     current = entity_descriptor_map[Type::IfcReinforcingElement] = new IfcEntityDescriptor(Type::IfcReinforcingElement,entity_descriptor_map.find(Type::IfcBuildingElementComponent)->second);
-    current->add("SteelGrade",true,IfcUtil::Argument_STRING);
+    current->add("SteelGrade",true,IfcUtil::Argument_STRING,Type::IfcLabel);
     current = entity_descriptor_map[Type::IfcReinforcingMesh] = new IfcEntityDescriptor(Type::IfcReinforcingMesh,entity_descriptor_map.find(Type::IfcReinforcingElement)->second);
-    current->add("MeshLength",true,IfcUtil::Argument_DOUBLE);
-    current->add("MeshWidth",true,IfcUtil::Argument_DOUBLE);
-    current->add("LongitudinalBarNominalDiameter",false,IfcUtil::Argument_DOUBLE);
-    current->add("TransverseBarNominalDiameter",false,IfcUtil::Argument_DOUBLE);
-    current->add("LongitudinalBarCrossSectionArea",false,IfcUtil::Argument_DOUBLE);
-    current->add("TransverseBarCrossSectionArea",false,IfcUtil::Argument_DOUBLE);
-    current->add("LongitudinalBarSpacing",false,IfcUtil::Argument_DOUBLE);
-    current->add("TransverseBarSpacing",false,IfcUtil::Argument_DOUBLE);
+    current->add("MeshLength",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("MeshWidth",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("LongitudinalBarNominalDiameter",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("TransverseBarNominalDiameter",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("LongitudinalBarCrossSectionArea",false,IfcUtil::Argument_DOUBLE,Type::IfcAreaMeasure);
+    current->add("TransverseBarCrossSectionArea",false,IfcUtil::Argument_DOUBLE,Type::IfcAreaMeasure);
+    current->add("LongitudinalBarSpacing",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("TransverseBarSpacing",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
     current = entity_descriptor_map[Type::IfcRoof] = new IfcEntityDescriptor(Type::IfcRoof,entity_descriptor_map.find(Type::IfcBuildingElement)->second);
     current->add("ShapeType",false,IfcUtil::Argument_ENUMERATION,Type::IfcRoofTypeEnum);
     current = entity_descriptor_map[Type::IfcRoundedEdgeFeature] = new IfcEntityDescriptor(Type::IfcRoundedEdgeFeature,entity_descriptor_map.find(Type::IfcEdgeFeature)->second);
-    current->add("Radius",true,IfcUtil::Argument_DOUBLE);
+    current->add("Radius",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
     current = entity_descriptor_map[Type::IfcSensorType] = new IfcEntityDescriptor(Type::IfcSensorType,entity_descriptor_map.find(Type::IfcDistributionControlElementType)->second);
     current->add("PredefinedType",false,IfcUtil::Argument_ENUMERATION,Type::IfcSensorTypeEnum);
     current = entity_descriptor_map[Type::IfcSlab] = new IfcEntityDescriptor(Type::IfcSlab,entity_descriptor_map.find(Type::IfcBuildingElement)->second);
@@ -2352,24 +2366,24 @@ void InitDescriptorMap() {
     current = entity_descriptor_map[Type::IfcStair] = new IfcEntityDescriptor(Type::IfcStair,entity_descriptor_map.find(Type::IfcBuildingElement)->second);
     current->add("ShapeType",false,IfcUtil::Argument_ENUMERATION,Type::IfcStairTypeEnum);
     current = entity_descriptor_map[Type::IfcStairFlight] = new IfcEntityDescriptor(Type::IfcStairFlight,entity_descriptor_map.find(Type::IfcBuildingElement)->second);
-    current->add("NumberOfRiser",true,IfcUtil::Argument_INT);
-    current->add("NumberOfTreads",true,IfcUtil::Argument_INT);
-    current->add("RiserHeight",true,IfcUtil::Argument_DOUBLE);
-    current->add("TreadLength",true,IfcUtil::Argument_DOUBLE);
+    current->add("NumberOfRiser",true,IfcUtil::Argument_INT,Type::UNDEFINED);
+    current->add("NumberOfTreads",true,IfcUtil::Argument_INT,Type::UNDEFINED);
+    current->add("RiserHeight",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("TreadLength",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
     current = entity_descriptor_map[Type::IfcStructuralAnalysisModel] = new IfcEntityDescriptor(Type::IfcStructuralAnalysisModel,entity_descriptor_map.find(Type::IfcSystem)->second);
     current->add("PredefinedType",false,IfcUtil::Argument_ENUMERATION,Type::IfcAnalysisModelTypeEnum);
-    current->add("OrientationOf2DPlane",true,IfcUtil::Argument_ENTITY);
-    current->add("LoadedBy",true,IfcUtil::Argument_ENTITY_LIST);
-    current->add("HasResults",true,IfcUtil::Argument_ENTITY_LIST);
+    current->add("OrientationOf2DPlane",true,IfcUtil::Argument_ENTITY,Type::IfcAxis2Placement3D);
+    current->add("LoadedBy",true,IfcUtil::Argument_ENTITY_LIST,Type::IfcStructuralLoadGroup);
+    current->add("HasResults",true,IfcUtil::Argument_ENTITY_LIST,Type::IfcStructuralResultGroup);
     current = entity_descriptor_map[Type::IfcTendon] = new IfcEntityDescriptor(Type::IfcTendon,entity_descriptor_map.find(Type::IfcReinforcingElement)->second);
     current->add("PredefinedType",false,IfcUtil::Argument_ENUMERATION,Type::IfcTendonTypeEnum);
-    current->add("NominalDiameter",false,IfcUtil::Argument_DOUBLE);
-    current->add("CrossSectionArea",false,IfcUtil::Argument_DOUBLE);
-    current->add("TensionForce",true,IfcUtil::Argument_DOUBLE);
-    current->add("PreStress",true,IfcUtil::Argument_DOUBLE);
-    current->add("FrictionCoefficient",true,IfcUtil::Argument_DOUBLE);
-    current->add("AnchorageSlip",true,IfcUtil::Argument_DOUBLE);
-    current->add("MinCurvatureRadius",true,IfcUtil::Argument_DOUBLE);
+    current->add("NominalDiameter",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("CrossSectionArea",false,IfcUtil::Argument_DOUBLE,Type::IfcAreaMeasure);
+    current->add("TensionForce",true,IfcUtil::Argument_DOUBLE,Type::IfcForceMeasure);
+    current->add("PreStress",true,IfcUtil::Argument_DOUBLE,Type::IfcPressureMeasure);
+    current->add("FrictionCoefficient",true,IfcUtil::Argument_DOUBLE,Type::IfcNormalisedRatioMeasure);
+    current->add("AnchorageSlip",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("MinCurvatureRadius",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
     current = entity_descriptor_map[Type::IfcTendonAnchor] = new IfcEntityDescriptor(Type::IfcTendonAnchor,entity_descriptor_map.find(Type::IfcReinforcingElement)->second);
 
     current = entity_descriptor_map[Type::IfcVibrationIsolatorType] = new IfcEntityDescriptor(Type::IfcVibrationIsolatorType,entity_descriptor_map.find(Type::IfcDiscreteAccessoryType)->second);
@@ -2379,8 +2393,8 @@ void InitDescriptorMap() {
     current = entity_descriptor_map[Type::IfcWallStandardCase] = new IfcEntityDescriptor(Type::IfcWallStandardCase,entity_descriptor_map.find(Type::IfcWall)->second);
 
     current = entity_descriptor_map[Type::IfcWindow] = new IfcEntityDescriptor(Type::IfcWindow,entity_descriptor_map.find(Type::IfcBuildingElement)->second);
-    current->add("OverallHeight",true,IfcUtil::Argument_DOUBLE);
-    current->add("OverallWidth",true,IfcUtil::Argument_DOUBLE);
+    current->add("OverallHeight",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("OverallWidth",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
     current = entity_descriptor_map[Type::IfcActuatorType] = new IfcEntityDescriptor(Type::IfcActuatorType,entity_descriptor_map.find(Type::IfcDistributionControlElementType)->second);
     current->add("PredefinedType",false,IfcUtil::Argument_ENUMERATION,Type::IfcActuatorTypeEnum);
     current = entity_descriptor_map[Type::IfcAlarmType] = new IfcEntityDescriptor(Type::IfcAlarmType,entity_descriptor_map.find(Type::IfcDistributionControlElementType)->second);
@@ -2388,21 +2402,21 @@ void InitDescriptorMap() {
     current = entity_descriptor_map[Type::IfcBeam] = new IfcEntityDescriptor(Type::IfcBeam,entity_descriptor_map.find(Type::IfcBuildingElement)->second);
 
     current = entity_descriptor_map[Type::IfcChamferEdgeFeature] = new IfcEntityDescriptor(Type::IfcChamferEdgeFeature,entity_descriptor_map.find(Type::IfcEdgeFeature)->second);
-    current->add("Width",true,IfcUtil::Argument_DOUBLE);
-    current->add("Height",true,IfcUtil::Argument_DOUBLE);
+    current->add("Width",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("Height",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
     current = entity_descriptor_map[Type::IfcControllerType] = new IfcEntityDescriptor(Type::IfcControllerType,entity_descriptor_map.find(Type::IfcDistributionControlElementType)->second);
     current->add("PredefinedType",false,IfcUtil::Argument_ENUMERATION,Type::IfcControllerTypeEnum);
     current = entity_descriptor_map[Type::IfcDistributionChamberElement] = new IfcEntityDescriptor(Type::IfcDistributionChamberElement,entity_descriptor_map.find(Type::IfcDistributionFlowElement)->second);
 
     current = entity_descriptor_map[Type::IfcDistributionControlElement] = new IfcEntityDescriptor(Type::IfcDistributionControlElement,entity_descriptor_map.find(Type::IfcDistributionElement)->second);
-    current->add("ControlElementId",true,IfcUtil::Argument_STRING);
+    current->add("ControlElementId",true,IfcUtil::Argument_STRING,Type::IfcIdentifier);
     current = entity_descriptor_map[Type::IfcElectricDistributionPoint] = new IfcEntityDescriptor(Type::IfcElectricDistributionPoint,entity_descriptor_map.find(Type::IfcFlowController)->second);
     current->add("DistributionPointFunction",false,IfcUtil::Argument_ENUMERATION,Type::IfcElectricDistributionPointFunctionEnum);
-    current->add("UserDefinedFunction",true,IfcUtil::Argument_STRING);
+    current->add("UserDefinedFunction",true,IfcUtil::Argument_STRING,Type::IfcLabel);
     current = entity_descriptor_map[Type::IfcReinforcingBar] = new IfcEntityDescriptor(Type::IfcReinforcingBar,entity_descriptor_map.find(Type::IfcReinforcingElement)->second);
-    current->add("NominalDiameter",false,IfcUtil::Argument_DOUBLE);
-    current->add("CrossSectionArea",false,IfcUtil::Argument_DOUBLE);
-    current->add("BarLength",true,IfcUtil::Argument_DOUBLE);
+    current->add("NominalDiameter",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("CrossSectionArea",false,IfcUtil::Argument_DOUBLE,Type::IfcAreaMeasure);
+    current->add("BarLength",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
     current->add("BarRole",false,IfcUtil::Argument_ENUMERATION,Type::IfcReinforcingBarRoleEnum);
     current->add("BarSurface",true,IfcUtil::Argument_ENUMERATION,Type::IfcReinforcingBarSurfaceEnum);
     // Enumerations
@@ -4048,122 +4062,132 @@ void InitDescriptorMap() {
     current_enum = enumeration_descriptor_map[Type::IfcWorkControlTypeEnum] = new IfcEnumerationDescriptor(Type::IfcWorkControlTypeEnum, values);
 }
 
+#ifdef _MSC_VER
+#  pragma optimize( "", on )
+#endif
+
 void InitInverseMap() {
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcActor, "IsActingUpon"), std::make_pair(Type::IfcRelAssignsToActor, 6)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcAddress, "OfPerson"), std::make_pair(Type::IfcPerson, 7)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcAddress, "OfOrganization"), std::make_pair(Type::IfcOrganization, 4)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcAnnotation, "ContainedInStructure"), std::make_pair(Type::IfcRelContainedInSpatialStructure, 4)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcAppliedValue, "ValuesReferenced"), std::make_pair(Type::IfcReferencesValueDocument, 1)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcAppliedValue, "ValueOfComponents"), std::make_pair(Type::IfcAppliedValueRelationship, 0)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcAppliedValue, "IsComponentIn"), std::make_pair(Type::IfcAppliedValueRelationship, 1)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcApproval, "Actors"), std::make_pair(Type::IfcApprovalActorRelationship, 1)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcApproval, "IsRelatedWith"), std::make_pair(Type::IfcApprovalRelationship, 0)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcApproval, "Relates"), std::make_pair(Type::IfcApprovalRelationship, 1)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcClassification, "Contains"), std::make_pair(Type::IfcClassificationItem, 1)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcClassificationItem, "IsClassifiedItemIn"), std::make_pair(Type::IfcClassificationItemRelationship, 1)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcClassificationItem, "IsClassifyingItemIn"), std::make_pair(Type::IfcClassificationItemRelationship, 0)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcCompositeCurveSegment, "UsingCurves"), std::make_pair(Type::IfcCompositeCurve, 0)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcConstraint, "ClassifiedAs"), std::make_pair(Type::IfcConstraintClassificationRelationship, 0)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcConstraint, "RelatesConstraints"), std::make_pair(Type::IfcConstraintRelationship, 2)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcConstraint, "IsRelatedWith"), std::make_pair(Type::IfcConstraintRelationship, 3)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcConstraint, "PropertiesForConstraint"), std::make_pair(Type::IfcPropertyConstraintRelationship, 0)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcConstraint, "Aggregates"), std::make_pair(Type::IfcConstraintAggregationRelationship, 2)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcConstraint, "IsAggregatedIn"), std::make_pair(Type::IfcConstraintAggregationRelationship, 3)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcControl, "Controls"), std::make_pair(Type::IfcRelAssignsToControl, 6)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcCovering, "CoversSpaces"), std::make_pair(Type::IfcRelCoversSpaces, 5)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcCovering, "Covers"), std::make_pair(Type::IfcRelCoversBldgElements, 5)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcDimensionCurve, "AnnotatedBySymbols"), std::make_pair(Type::IfcTerminatorSymbol, 3)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcDistributionControlElement, "AssignedToFlowElement"), std::make_pair(Type::IfcRelFlowControlElements, 4)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcDistributionFlowElement, "HasControlElements"), std::make_pair(Type::IfcRelFlowControlElements, 5)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcDocumentInformation, "IsPointedTo"), std::make_pair(Type::IfcDocumentInformationRelationship, 1)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcDocumentInformation, "IsPointer"), std::make_pair(Type::IfcDocumentInformationRelationship, 0)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcDocumentReference, "ReferenceToDocument"), std::make_pair(Type::IfcDocumentInformation, 3)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcDraughtingCallout, "IsRelatedFromCallout"), std::make_pair(Type::IfcDraughtingCalloutRelationship, 3)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcDraughtingCallout, "IsRelatedToCallout"), std::make_pair(Type::IfcDraughtingCalloutRelationship, 2)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcElement, "HasStructuralMember"), std::make_pair(Type::IfcRelConnectsStructuralElement, 4)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcElement, "FillsVoids"), std::make_pair(Type::IfcRelFillsElement, 5)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcElement, "ConnectedTo"), std::make_pair(Type::IfcRelConnectsElements, 5)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcElement, "HasCoverings"), std::make_pair(Type::IfcRelCoversBldgElements, 4)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcElement, "HasProjections"), std::make_pair(Type::IfcRelProjectsElement, 4)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcElement, "ReferencedInStructures"), std::make_pair(Type::IfcRelReferencedInSpatialStructure, 4)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcElement, "HasPorts"), std::make_pair(Type::IfcRelConnectsPortToElement, 5)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcElement, "HasOpenings"), std::make_pair(Type::IfcRelVoidsElement, 4)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcElement, "IsConnectionRealization"), std::make_pair(Type::IfcRelConnectsWithRealizingElements, 7)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcElement, "ProvidesBoundaries"), std::make_pair(Type::IfcRelSpaceBoundary, 5)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcElement, "ConnectedFrom"), std::make_pair(Type::IfcRelConnectsElements, 6)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcElement, "ContainedInStructure"), std::make_pair(Type::IfcRelContainedInSpatialStructure, 4)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcFeatureElementAddition, "ProjectsElements"), std::make_pair(Type::IfcRelProjectsElement, 5)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcFeatureElementSubtraction, "VoidsElements"), std::make_pair(Type::IfcRelVoidsElement, 5)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcGeometricRepresentationContext, "HasSubContexts"), std::make_pair(Type::IfcGeometricRepresentationSubContext, 6)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcGrid, "ContainedInStructure"), std::make_pair(Type::IfcRelContainedInSpatialStructure, 4)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcGridAxis, "PartOfW"), std::make_pair(Type::IfcGrid, 9)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcGridAxis, "PartOfV"), std::make_pair(Type::IfcGrid, 8)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcGridAxis, "PartOfU"), std::make_pair(Type::IfcGrid, 7)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcGridAxis, "HasIntersections"), std::make_pair(Type::IfcVirtualGridIntersection, 0)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcGroup, "IsGroupedBy"), std::make_pair(Type::IfcRelAssignsToGroup, 6)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcLibraryReference, "ReferenceIntoLibrary"), std::make_pair(Type::IfcLibraryInformation, 4)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcMaterial, "HasRepresentation"), std::make_pair(Type::IfcMaterialDefinitionRepresentation, 3)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcMaterial, "ClassifiedAs"), std::make_pair(Type::IfcMaterialClassificationRelationship, 1)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcMaterialLayer, "ToMaterialLayerSet"), std::make_pair(Type::IfcMaterialLayerSet, 0)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcObject, "IsDefinedBy"), std::make_pair(Type::IfcRelDefines, 4)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcObjectDefinition, "HasAssignments"), std::make_pair(Type::IfcRelAssigns, 4)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcObjectDefinition, "IsDecomposedBy"), std::make_pair(Type::IfcRelDecomposes, 4)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcObjectDefinition, "Decomposes"), std::make_pair(Type::IfcRelDecomposes, 5)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcObjectDefinition, "HasAssociations"), std::make_pair(Type::IfcRelAssociates, 4)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcObjectPlacement, "PlacesObject"), std::make_pair(Type::IfcProduct, 5)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcObjectPlacement, "ReferencedByPlacements"), std::make_pair(Type::IfcLocalPlacement, 0)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcOpeningElement, "HasFillings"), std::make_pair(Type::IfcRelFillsElement, 4)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcOrganization, "IsRelatedBy"), std::make_pair(Type::IfcOrganizationRelationship, 3)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcOrganization, "Relates"), std::make_pair(Type::IfcOrganizationRelationship, 2)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcOrganization, "Engages"), std::make_pair(Type::IfcPersonAndOrganization, 1)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcPerson, "EngagedIn"), std::make_pair(Type::IfcPersonAndOrganization, 0)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcPhysicalQuantity, "PartOfComplex"), std::make_pair(Type::IfcPhysicalComplexQuantity, 2)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcPort, "ContainedIn"), std::make_pair(Type::IfcRelConnectsPortToElement, 4)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcPort, "ConnectedFrom"), std::make_pair(Type::IfcRelConnectsPorts, 5)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcPort, "ConnectedTo"), std::make_pair(Type::IfcRelConnectsPorts, 4)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcProcess, "OperatesOn"), std::make_pair(Type::IfcRelAssignsToProcess, 6)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcProcess, "IsSuccessorFrom"), std::make_pair(Type::IfcRelSequence, 5)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcProcess, "IsPredecessorTo"), std::make_pair(Type::IfcRelSequence, 4)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcProduct, "ReferencedBy"), std::make_pair(Type::IfcRelAssignsToProduct, 6)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcProductDefinitionShape, "ShapeOfProduct"), std::make_pair(Type::IfcProduct, 6)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcProductDefinitionShape, "HasShapeAspects"), std::make_pair(Type::IfcShapeAspect, 4)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcProperty, "PropertyForDependance"), std::make_pair(Type::IfcPropertyDependencyRelationship, 0)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcProperty, "PropertyDependsOn"), std::make_pair(Type::IfcPropertyDependencyRelationship, 1)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcProperty, "PartOfComplex"), std::make_pair(Type::IfcComplexProperty, 3)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcPropertyDefinition, "HasAssociations"), std::make_pair(Type::IfcRelAssociates, 4)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcPropertySetDefinition, "PropertyDefinitionOf"), std::make_pair(Type::IfcRelDefinesByProperties, 5)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcPropertySetDefinition, "DefinesType"), std::make_pair(Type::IfcTypeObject, 5)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcRepresentation, "RepresentationMap"), std::make_pair(Type::IfcRepresentationMap, 1)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcRepresentation, "LayerAssignments"), std::make_pair(Type::IfcPresentationLayerAssignment, 2)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcRepresentation, "OfProductRepresentation"), std::make_pair(Type::IfcProductRepresentation, 2)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcRepresentationContext, "RepresentationsInContext"), std::make_pair(Type::IfcRepresentation, 0)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcRepresentationItem, "LayerAssignments"), std::make_pair(Type::IfcPresentationLayerAssignment, 2)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcRepresentationItem, "StyledByItem"), std::make_pair(Type::IfcStyledItem, 0)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcRepresentationMap, "MapUsage"), std::make_pair(Type::IfcMappedItem, 0)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcResource, "ResourceOf"), std::make_pair(Type::IfcRelAssignsToResource, 6)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcScheduleTimeControl, "ScheduleTimeControlAssigned"), std::make_pair(Type::IfcRelAssignsTasks, 7)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcShapeModel, "OfShapeAspect"), std::make_pair(Type::IfcShapeAspect, 0)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcSpace, "HasCoverings"), std::make_pair(Type::IfcRelCoversSpaces, 4)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcSpace, "BoundedBy"), std::make_pair(Type::IfcRelSpaceBoundary, 4)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcSpaceProgram, "HasInteractionReqsFrom"), std::make_pair(Type::IfcRelInteractionRequirements, 7)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcSpaceProgram, "HasInteractionReqsTo"), std::make_pair(Type::IfcRelInteractionRequirements, 8)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcSpatialStructureElement, "ReferencesElements"), std::make_pair(Type::IfcRelReferencedInSpatialStructure, 5)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcSpatialStructureElement, "ServicedBySystems"), std::make_pair(Type::IfcRelServicesBuildings, 5)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcSpatialStructureElement, "ContainsElements"), std::make_pair(Type::IfcRelContainedInSpatialStructure, 5)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcStructuralActivity, "AssignedToStructuralItem"), std::make_pair(Type::IfcRelConnectsStructuralActivity, 5)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcStructuralConnection, "ConnectsStructuralMembers"), std::make_pair(Type::IfcRelConnectsStructuralMember, 5)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcStructuralItem, "AssignedStructuralActivity"), std::make_pair(Type::IfcRelConnectsStructuralActivity, 4)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcStructuralLoadGroup, "SourceOfResultGroup"), std::make_pair(Type::IfcStructuralResultGroup, 6)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcStructuralLoadGroup, "LoadGroupFor"), std::make_pair(Type::IfcStructuralAnalysisModel, 7)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcStructuralMember, "ReferencesElement"), std::make_pair(Type::IfcRelConnectsStructuralElement, 5)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcStructuralMember, "ConnectedBy"), std::make_pair(Type::IfcRelConnectsStructuralMember, 4)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcStructuralReaction, "Causes"), std::make_pair(Type::IfcStructuralAction, 10)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcStructuralResultGroup, "ResultGroupFor"), std::make_pair(Type::IfcStructuralAnalysisModel, 8)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcSystem, "ServicesBuildings"), std::make_pair(Type::IfcRelServicesBuildings, 4)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcTableRow, "OfTable"), std::make_pair(Type::IfcTable, 1)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcTextureCoordinate, "AnnotatedSurface"), std::make_pair(Type::IfcAnnotationSurface, 1)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcTimeSeries, "DocumentedBy"), std::make_pair(Type::IfcTimeSeriesReferenceRelationship, 0)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcTypeObject, "ObjectTypeOf"), std::make_pair(Type::IfcRelDefinesByType, 5)));
+    inverse_map[Type::IfcActor].insert(std::make_pair("IsActingUpon", std::make_pair(Type::IfcRelAssignsToActor, 6)));
+    inverse_map[Type::IfcAddress].insert(std::make_pair("OfPerson", std::make_pair(Type::IfcPerson, 7)));
+    inverse_map[Type::IfcAddress].insert(std::make_pair("OfOrganization", std::make_pair(Type::IfcOrganization, 4)));
+    inverse_map[Type::IfcAnnotation].insert(std::make_pair("ContainedInStructure", std::make_pair(Type::IfcRelContainedInSpatialStructure, 4)));
+    inverse_map[Type::IfcAppliedValue].insert(std::make_pair("ValuesReferenced", std::make_pair(Type::IfcReferencesValueDocument, 1)));
+    inverse_map[Type::IfcAppliedValue].insert(std::make_pair("ValueOfComponents", std::make_pair(Type::IfcAppliedValueRelationship, 0)));
+    inverse_map[Type::IfcAppliedValue].insert(std::make_pair("IsComponentIn", std::make_pair(Type::IfcAppliedValueRelationship, 1)));
+    inverse_map[Type::IfcApproval].insert(std::make_pair("Actors", std::make_pair(Type::IfcApprovalActorRelationship, 1)));
+    inverse_map[Type::IfcApproval].insert(std::make_pair("IsRelatedWith", std::make_pair(Type::IfcApprovalRelationship, 0)));
+    inverse_map[Type::IfcApproval].insert(std::make_pair("Relates", std::make_pair(Type::IfcApprovalRelationship, 1)));
+    inverse_map[Type::IfcClassification].insert(std::make_pair("Contains", std::make_pair(Type::IfcClassificationItem, 1)));
+    inverse_map[Type::IfcClassificationItem].insert(std::make_pair("IsClassifiedItemIn", std::make_pair(Type::IfcClassificationItemRelationship, 1)));
+    inverse_map[Type::IfcClassificationItem].insert(std::make_pair("IsClassifyingItemIn", std::make_pair(Type::IfcClassificationItemRelationship, 0)));
+    inverse_map[Type::IfcCompositeCurveSegment].insert(std::make_pair("UsingCurves", std::make_pair(Type::IfcCompositeCurve, 0)));
+    inverse_map[Type::IfcConstraint].insert(std::make_pair("ClassifiedAs", std::make_pair(Type::IfcConstraintClassificationRelationship, 0)));
+    inverse_map[Type::IfcConstraint].insert(std::make_pair("RelatesConstraints", std::make_pair(Type::IfcConstraintRelationship, 2)));
+    inverse_map[Type::IfcConstraint].insert(std::make_pair("IsRelatedWith", std::make_pair(Type::IfcConstraintRelationship, 3)));
+    inverse_map[Type::IfcConstraint].insert(std::make_pair("PropertiesForConstraint", std::make_pair(Type::IfcPropertyConstraintRelationship, 0)));
+    inverse_map[Type::IfcConstraint].insert(std::make_pair("Aggregates", std::make_pair(Type::IfcConstraintAggregationRelationship, 2)));
+    inverse_map[Type::IfcConstraint].insert(std::make_pair("IsAggregatedIn", std::make_pair(Type::IfcConstraintAggregationRelationship, 3)));
+    inverse_map[Type::IfcControl].insert(std::make_pair("Controls", std::make_pair(Type::IfcRelAssignsToControl, 6)));
+    inverse_map[Type::IfcCovering].insert(std::make_pair("CoversSpaces", std::make_pair(Type::IfcRelCoversSpaces, 5)));
+    inverse_map[Type::IfcCovering].insert(std::make_pair("Covers", std::make_pair(Type::IfcRelCoversBldgElements, 5)));
+    inverse_map[Type::IfcDimensionCurve].insert(std::make_pair("AnnotatedBySymbols", std::make_pair(Type::IfcTerminatorSymbol, 3)));
+    inverse_map[Type::IfcDistributionControlElement].insert(std::make_pair("AssignedToFlowElement", std::make_pair(Type::IfcRelFlowControlElements, 4)));
+    inverse_map[Type::IfcDistributionFlowElement].insert(std::make_pair("HasControlElements", std::make_pair(Type::IfcRelFlowControlElements, 5)));
+    inverse_map[Type::IfcDocumentInformation].insert(std::make_pair("IsPointedTo", std::make_pair(Type::IfcDocumentInformationRelationship, 1)));
+    inverse_map[Type::IfcDocumentInformation].insert(std::make_pair("IsPointer", std::make_pair(Type::IfcDocumentInformationRelationship, 0)));
+    inverse_map[Type::IfcDocumentReference].insert(std::make_pair("ReferenceToDocument", std::make_pair(Type::IfcDocumentInformation, 3)));
+    inverse_map[Type::IfcDraughtingCallout].insert(std::make_pair("IsRelatedFromCallout", std::make_pair(Type::IfcDraughtingCalloutRelationship, 3)));
+    inverse_map[Type::IfcDraughtingCallout].insert(std::make_pair("IsRelatedToCallout", std::make_pair(Type::IfcDraughtingCalloutRelationship, 2)));
+    inverse_map[Type::IfcElement].insert(std::make_pair("HasStructuralMember", std::make_pair(Type::IfcRelConnectsStructuralElement, 4)));
+    inverse_map[Type::IfcElement].insert(std::make_pair("FillsVoids", std::make_pair(Type::IfcRelFillsElement, 5)));
+    inverse_map[Type::IfcElement].insert(std::make_pair("ConnectedTo", std::make_pair(Type::IfcRelConnectsElements, 5)));
+    inverse_map[Type::IfcElement].insert(std::make_pair("HasCoverings", std::make_pair(Type::IfcRelCoversBldgElements, 4)));
+    inverse_map[Type::IfcElement].insert(std::make_pair("HasProjections", std::make_pair(Type::IfcRelProjectsElement, 4)));
+    inverse_map[Type::IfcElement].insert(std::make_pair("ReferencedInStructures", std::make_pair(Type::IfcRelReferencedInSpatialStructure, 4)));
+    inverse_map[Type::IfcElement].insert(std::make_pair("HasPorts", std::make_pair(Type::IfcRelConnectsPortToElement, 5)));
+    inverse_map[Type::IfcElement].insert(std::make_pair("HasOpenings", std::make_pair(Type::IfcRelVoidsElement, 4)));
+    inverse_map[Type::IfcElement].insert(std::make_pair("IsConnectionRealization", std::make_pair(Type::IfcRelConnectsWithRealizingElements, 7)));
+    inverse_map[Type::IfcElement].insert(std::make_pair("ProvidesBoundaries", std::make_pair(Type::IfcRelSpaceBoundary, 5)));
+    inverse_map[Type::IfcElement].insert(std::make_pair("ConnectedFrom", std::make_pair(Type::IfcRelConnectsElements, 6)));
+    inverse_map[Type::IfcElement].insert(std::make_pair("ContainedInStructure", std::make_pair(Type::IfcRelContainedInSpatialStructure, 4)));
+    inverse_map[Type::IfcFeatureElementAddition].insert(std::make_pair("ProjectsElements", std::make_pair(Type::IfcRelProjectsElement, 5)));
+    inverse_map[Type::IfcFeatureElementSubtraction].insert(std::make_pair("VoidsElements", std::make_pair(Type::IfcRelVoidsElement, 5)));
+    inverse_map[Type::IfcGeometricRepresentationContext].insert(std::make_pair("HasSubContexts", std::make_pair(Type::IfcGeometricRepresentationSubContext, 6)));
+    inverse_map[Type::IfcGrid].insert(std::make_pair("ContainedInStructure", std::make_pair(Type::IfcRelContainedInSpatialStructure, 4)));
+    inverse_map[Type::IfcGridAxis].insert(std::make_pair("PartOfW", std::make_pair(Type::IfcGrid, 9)));
+    inverse_map[Type::IfcGridAxis].insert(std::make_pair("PartOfV", std::make_pair(Type::IfcGrid, 8)));
+    inverse_map[Type::IfcGridAxis].insert(std::make_pair("PartOfU", std::make_pair(Type::IfcGrid, 7)));
+    inverse_map[Type::IfcGridAxis].insert(std::make_pair("HasIntersections", std::make_pair(Type::IfcVirtualGridIntersection, 0)));
+    inverse_map[Type::IfcGroup].insert(std::make_pair("IsGroupedBy", std::make_pair(Type::IfcRelAssignsToGroup, 6)));
+    inverse_map[Type::IfcLibraryReference].insert(std::make_pair("ReferenceIntoLibrary", std::make_pair(Type::IfcLibraryInformation, 4)));
+    inverse_map[Type::IfcMaterial].insert(std::make_pair("HasRepresentation", std::make_pair(Type::IfcMaterialDefinitionRepresentation, 3)));
+    inverse_map[Type::IfcMaterial].insert(std::make_pair("ClassifiedAs", std::make_pair(Type::IfcMaterialClassificationRelationship, 1)));
+    inverse_map[Type::IfcMaterialLayer].insert(std::make_pair("ToMaterialLayerSet", std::make_pair(Type::IfcMaterialLayerSet, 0)));
+    inverse_map[Type::IfcObject].insert(std::make_pair("IsDefinedBy", std::make_pair(Type::IfcRelDefines, 4)));
+    inverse_map[Type::IfcObjectDefinition].insert(std::make_pair("HasAssignments", std::make_pair(Type::IfcRelAssigns, 4)));
+    inverse_map[Type::IfcObjectDefinition].insert(std::make_pair("IsDecomposedBy", std::make_pair(Type::IfcRelDecomposes, 4)));
+    inverse_map[Type::IfcObjectDefinition].insert(std::make_pair("Decomposes", std::make_pair(Type::IfcRelDecomposes, 5)));
+    inverse_map[Type::IfcObjectDefinition].insert(std::make_pair("HasAssociations", std::make_pair(Type::IfcRelAssociates, 4)));
+    inverse_map[Type::IfcObjectPlacement].insert(std::make_pair("PlacesObject", std::make_pair(Type::IfcProduct, 5)));
+    inverse_map[Type::IfcObjectPlacement].insert(std::make_pair("ReferencedByPlacements", std::make_pair(Type::IfcLocalPlacement, 0)));
+    inverse_map[Type::IfcOpeningElement].insert(std::make_pair("HasFillings", std::make_pair(Type::IfcRelFillsElement, 4)));
+    inverse_map[Type::IfcOrganization].insert(std::make_pair("IsRelatedBy", std::make_pair(Type::IfcOrganizationRelationship, 3)));
+    inverse_map[Type::IfcOrganization].insert(std::make_pair("Relates", std::make_pair(Type::IfcOrganizationRelationship, 2)));
+    inverse_map[Type::IfcOrganization].insert(std::make_pair("Engages", std::make_pair(Type::IfcPersonAndOrganization, 1)));
+    inverse_map[Type::IfcPerson].insert(std::make_pair("EngagedIn", std::make_pair(Type::IfcPersonAndOrganization, 0)));
+    inverse_map[Type::IfcPhysicalQuantity].insert(std::make_pair("PartOfComplex", std::make_pair(Type::IfcPhysicalComplexQuantity, 2)));
+    inverse_map[Type::IfcPort].insert(std::make_pair("ContainedIn", std::make_pair(Type::IfcRelConnectsPortToElement, 4)));
+    inverse_map[Type::IfcPort].insert(std::make_pair("ConnectedFrom", std::make_pair(Type::IfcRelConnectsPorts, 5)));
+    inverse_map[Type::IfcPort].insert(std::make_pair("ConnectedTo", std::make_pair(Type::IfcRelConnectsPorts, 4)));
+    inverse_map[Type::IfcProcess].insert(std::make_pair("OperatesOn", std::make_pair(Type::IfcRelAssignsToProcess, 6)));
+    inverse_map[Type::IfcProcess].insert(std::make_pair("IsSuccessorFrom", std::make_pair(Type::IfcRelSequence, 5)));
+    inverse_map[Type::IfcProcess].insert(std::make_pair("IsPredecessorTo", std::make_pair(Type::IfcRelSequence, 4)));
+    inverse_map[Type::IfcProduct].insert(std::make_pair("ReferencedBy", std::make_pair(Type::IfcRelAssignsToProduct, 6)));
+    inverse_map[Type::IfcProductDefinitionShape].insert(std::make_pair("ShapeOfProduct", std::make_pair(Type::IfcProduct, 6)));
+    inverse_map[Type::IfcProductDefinitionShape].insert(std::make_pair("HasShapeAspects", std::make_pair(Type::IfcShapeAspect, 4)));
+    inverse_map[Type::IfcProperty].insert(std::make_pair("PropertyForDependance", std::make_pair(Type::IfcPropertyDependencyRelationship, 0)));
+    inverse_map[Type::IfcProperty].insert(std::make_pair("PropertyDependsOn", std::make_pair(Type::IfcPropertyDependencyRelationship, 1)));
+    inverse_map[Type::IfcProperty].insert(std::make_pair("PartOfComplex", std::make_pair(Type::IfcComplexProperty, 3)));
+    inverse_map[Type::IfcPropertyDefinition].insert(std::make_pair("HasAssociations", std::make_pair(Type::IfcRelAssociates, 4)));
+    inverse_map[Type::IfcPropertySetDefinition].insert(std::make_pair("PropertyDefinitionOf", std::make_pair(Type::IfcRelDefinesByProperties, 5)));
+    inverse_map[Type::IfcPropertySetDefinition].insert(std::make_pair("DefinesType", std::make_pair(Type::IfcTypeObject, 5)));
+    inverse_map[Type::IfcRepresentation].insert(std::make_pair("RepresentationMap", std::make_pair(Type::IfcRepresentationMap, 1)));
+    inverse_map[Type::IfcRepresentation].insert(std::make_pair("LayerAssignments", std::make_pair(Type::IfcPresentationLayerAssignment, 2)));
+    inverse_map[Type::IfcRepresentation].insert(std::make_pair("OfProductRepresentation", std::make_pair(Type::IfcProductRepresentation, 2)));
+    inverse_map[Type::IfcRepresentationContext].insert(std::make_pair("RepresentationsInContext", std::make_pair(Type::IfcRepresentation, 0)));
+    inverse_map[Type::IfcRepresentationItem].insert(std::make_pair("LayerAssignments", std::make_pair(Type::IfcPresentationLayerAssignment, 2)));
+    inverse_map[Type::IfcRepresentationItem].insert(std::make_pair("StyledByItem", std::make_pair(Type::IfcStyledItem, 0)));
+    inverse_map[Type::IfcRepresentationMap].insert(std::make_pair("MapUsage", std::make_pair(Type::IfcMappedItem, 0)));
+    inverse_map[Type::IfcResource].insert(std::make_pair("ResourceOf", std::make_pair(Type::IfcRelAssignsToResource, 6)));
+    inverse_map[Type::IfcScheduleTimeControl].insert(std::make_pair("ScheduleTimeControlAssigned", std::make_pair(Type::IfcRelAssignsTasks, 7)));
+    inverse_map[Type::IfcShapeModel].insert(std::make_pair("OfShapeAspect", std::make_pair(Type::IfcShapeAspect, 0)));
+    inverse_map[Type::IfcSpace].insert(std::make_pair("HasCoverings", std::make_pair(Type::IfcRelCoversSpaces, 4)));
+    inverse_map[Type::IfcSpace].insert(std::make_pair("BoundedBy", std::make_pair(Type::IfcRelSpaceBoundary, 4)));
+    inverse_map[Type::IfcSpaceProgram].insert(std::make_pair("HasInteractionReqsFrom", std::make_pair(Type::IfcRelInteractionRequirements, 7)));
+    inverse_map[Type::IfcSpaceProgram].insert(std::make_pair("HasInteractionReqsTo", std::make_pair(Type::IfcRelInteractionRequirements, 8)));
+    inverse_map[Type::IfcSpatialStructureElement].insert(std::make_pair("ReferencesElements", std::make_pair(Type::IfcRelReferencedInSpatialStructure, 5)));
+    inverse_map[Type::IfcSpatialStructureElement].insert(std::make_pair("ServicedBySystems", std::make_pair(Type::IfcRelServicesBuildings, 5)));
+    inverse_map[Type::IfcSpatialStructureElement].insert(std::make_pair("ContainsElements", std::make_pair(Type::IfcRelContainedInSpatialStructure, 5)));
+    inverse_map[Type::IfcStructuralActivity].insert(std::make_pair("AssignedToStructuralItem", std::make_pair(Type::IfcRelConnectsStructuralActivity, 5)));
+    inverse_map[Type::IfcStructuralConnection].insert(std::make_pair("ConnectsStructuralMembers", std::make_pair(Type::IfcRelConnectsStructuralMember, 5)));
+    inverse_map[Type::IfcStructuralItem].insert(std::make_pair("AssignedStructuralActivity", std::make_pair(Type::IfcRelConnectsStructuralActivity, 4)));
+    inverse_map[Type::IfcStructuralLoadGroup].insert(std::make_pair("SourceOfResultGroup", std::make_pair(Type::IfcStructuralResultGroup, 6)));
+    inverse_map[Type::IfcStructuralLoadGroup].insert(std::make_pair("LoadGroupFor", std::make_pair(Type::IfcStructuralAnalysisModel, 7)));
+    inverse_map[Type::IfcStructuralMember].insert(std::make_pair("ReferencesElement", std::make_pair(Type::IfcRelConnectsStructuralElement, 5)));
+    inverse_map[Type::IfcStructuralMember].insert(std::make_pair("ConnectedBy", std::make_pair(Type::IfcRelConnectsStructuralMember, 4)));
+    inverse_map[Type::IfcStructuralReaction].insert(std::make_pair("Causes", std::make_pair(Type::IfcStructuralAction, 10)));
+    inverse_map[Type::IfcStructuralResultGroup].insert(std::make_pair("ResultGroupFor", std::make_pair(Type::IfcStructuralAnalysisModel, 8)));
+    inverse_map[Type::IfcSystem].insert(std::make_pair("ServicesBuildings", std::make_pair(Type::IfcRelServicesBuildings, 4)));
+    inverse_map[Type::IfcTableRow].insert(std::make_pair("OfTable", std::make_pair(Type::IfcTable, 1)));
+    inverse_map[Type::IfcTextureCoordinate].insert(std::make_pair("AnnotatedSurface", std::make_pair(Type::IfcAnnotationSurface, 1)));
+    inverse_map[Type::IfcTimeSeries].insert(std::make_pair("DocumentedBy", std::make_pair(Type::IfcTimeSeriesReferenceRelationship, 0)));
+    inverse_map[Type::IfcTypeObject].insert(std::make_pair("ObjectTypeOf", std::make_pair(Type::IfcRelDefinesByType, 5)));
+}
+
+void InitDerivedMap() {
+    {std::set<int> idxs; idxs.insert(2); idxs.insert(3); idxs.insert(4); idxs.insert(5); derived_map[Type::IfcGeometricRepresentationSubContext] = idxs;}
+    {std::set<int> idxs; idxs.insert(0); idxs.insert(1); derived_map[Type::IfcOrientedEdge] = idxs;}
+    {std::set<int> idxs; idxs.insert(0); derived_map[Type::IfcSIUnit] = idxs;}
 }
 
 int Type::GetAttributeIndex(Enum t, const std::string& a) {
@@ -4187,6 +4211,13 @@ ArgumentType Type::GetAttributeType(Enum t, unsigned char a) {
     else return i->second->getArgumentType(a);
 }
 
+Type::Enum Type::GetAttributeEntity(Enum t, unsigned char a) {
+    if (entity_descriptor_map.empty()) ::InitDescriptorMap();
+    std::map<Type::Enum,IfcEntityDescriptor*>::const_iterator i = entity_descriptor_map.find(t);
+    if ( i == entity_descriptor_map.end() ) throw IfcException("Type not found");
+    else return i->second->getArgumentEntity(a);
+}
+
 const std::string& Type::GetAttributeName(Enum t, unsigned char a) {
     if (entity_descriptor_map.empty()) ::InitDescriptorMap();
     std::map<Type::Enum,IfcEntityDescriptor*>::const_iterator i = entity_descriptor_map.find(t);
@@ -4201,6 +4232,12 @@ bool Type::GetAttributeOptional(Enum t, unsigned char a) {
     else return i->second->getArgumentOptional(a);
 }
 
+bool Type::GetAttributeDerived(Enum t, unsigned char a) {
+    if (derived_map.empty()) ::InitDerivedMap();
+    std::map<Type::Enum,std::set<int> >::const_iterator i = derived_map.find(t);
+    return i != derived_map.end() && i->second.find(a) != i->second.end();
+}
+
 std::pair<const char*, int> Type::GetEnumerationIndex(Enum t, const std::string& a) {
     if (enumeration_descriptor_map.empty()) ::InitDescriptorMap();
     std::map<Type::Enum,IfcEnumerationDescriptor*>::const_iterator i = enumeration_descriptor_map.find(t);
@@ -4210,31 +4247,48 @@ std::pair<const char*, int> Type::GetEnumerationIndex(Enum t, const std::string&
 
 std::pair<Type::Enum, unsigned> Type::GetInverseAttribute(Enum t, const std::string& a) {
 	if (inverse_map.empty()) ::InitInverseMap();
-	std::map<std::pair<Type::Enum, std::string>, std::pair<Type::Enum, int> >::const_iterator it;
-    std::pair<Type::Enum, std::string> key = std::make_pair(t, a);
+	inverse_map_t::const_iterator it;
+	inverse_map_t::mapped_type::const_iterator jt;
     while (true) {
-        it = inverse_map.find(key);
-        if (it != inverse_map.end()) return it->second;
-        if ((key.first = Parent(key.first)) == -1) break;
+        it = inverse_map.find(t);
+        if (it != inverse_map.end()) {
+			jt = it->second.find(a);
+			if (jt != it->second.end()) {
+				return jt->second;
+			}
+		}
+        if ((t = Parent(t)) == -1) break;
     }
     throw IfcException("Attribute not found");
 }
 
-Type::Enum Type::GetAttributeEnumerationClass(Enum t, unsigned char a) {
-    if (entity_descriptor_map.empty()) ::InitDescriptorMap();
-    std::map<Type::Enum,IfcEntityDescriptor*>::const_iterator i = entity_descriptor_map.find(t);
-    if ( i == entity_descriptor_map.end() ) throw IfcException("Type not found");
-    else {
-        Type::Enum t = i->second->getArgumentEnumerationClass(a);
-        if ( t == Type::ALL ) throw IfcException("Not an enumeration");
-        else return t;
+std::set<std::string> Type::GetInverseAttributeNames(Enum t) {
+	if (inverse_map.empty()) ::InitInverseMap();
+	inverse_map_t::const_iterator it;
+	inverse_map_t::mapped_type::const_iterator jt;
+
+	std::set<std::string> return_value;
+
+    while (true) {
+        it = inverse_map.find(t);
+        if (it != inverse_map.end()) {
+			for (jt = it->second.begin(); jt != it->second.end(); ++jt) {
+				return_value.insert(jt->first);
+			}
+		}
+        if ((t = Parent(t)) == -1) break;
     }
+    
+	return return_value;
 }
 
 void Type::PopulateDerivedFields(IfcWrite::IfcWritableEntity* e) {
-    Type::Enum type = e->type();
-    if (type == Type::IfcGeometricRepresentationSubContext) { e->setArgumentDerived(2); e->setArgumentDerived(3); e->setArgumentDerived(4); e->setArgumentDerived(5); }
-    if (type == Type::IfcOrientedEdge) { e->setArgumentDerived(0); e->setArgumentDerived(1); }
-    if (type == Type::IfcSIUnit) { e->setArgumentDerived(0); }
+    std::map<Type::Enum, std::set<int> >::const_iterator i = derived_map.find(e->type());
+	if (i != derived_map.end()) {
+		for (std::set<int>::const_iterator it = i->second.begin(); it != i->second.end(); ++it) {
+			e->setArgumentDerived(*it);
+		}
+	}
 }
+
 #endif
diff --git a/src/ifcparse/Ifc2x3-rt.h b/src/ifcparse/Ifc2x3-latebound.h
similarity index 94%
rename from src/ifcparse/Ifc2x3-rt.h
rename to src/ifcparse/Ifc2x3-latebound.h
index bd180a8..16b90f8 100644
--- a/src/ifcparse/Ifc2x3-rt.h
+++ b/src/ifcparse/Ifc2x3-latebound.h
@@ -23,7 +23,7 @@
  * but instead modify the python script that has been used to generate this.    *
  *                                                                              *
  ********************************************************************************/
- 
+
 #ifndef IFC2X3RT_H
 #define IFC2X3RT_H
 
@@ -38,11 +38,13 @@ namespace Type {
     int GetAttributeCount(Enum t);
     int GetAttributeIndex(Enum t, const std::string& a);
     IfcUtil::ArgumentType GetAttributeType(Enum t, unsigned char a);
+    Enum GetAttributeEntity(Enum t, unsigned char a);
     const std::string& GetAttributeName(Enum t, unsigned char a);
     bool GetAttributeOptional(Enum t, unsigned char a);
+    bool GetAttributeDerived(Enum t, unsigned char a);
     std::pair<const char*, int> GetEnumerationIndex(Enum t, const std::string& a);
     std::pair<Enum, unsigned> GetInverseAttribute(Enum t, const std::string& a);
-    Enum GetAttributeEnumerationClass(Enum t, unsigned char a);
+    std::set<std::string> GetInverseAttributeNames(Enum t);
     void PopulateDerivedFields(IfcWrite::IfcWritableEntity* e);
 }}
 
diff --git a/src/ifcparse/Ifc2x3.cpp b/src/ifcparse/Ifc2x3.cpp
index 6fae397..f98afe0 100644
--- a/src/ifcparse/Ifc2x3.cpp
+++ b/src/ifcparse/Ifc2x3.cpp
@@ -35,114 +35,125 @@ using namespace Ifc2x3;
 using namespace IfcParse;
 using namespace IfcWrite;
 
-IfcUtil::IfcSchemaEntity Ifc2x3::SchemaEntity(IfcAbstractEntityPtr e) {
+IfcUtil::IfcBaseClass* Ifc2x3::SchemaEntity(IfcAbstractEntity* e) {
     switch(e->type()) {
-        case Type::IfcAbsorbedDoseMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcAccelerationMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcAmountOfSubstanceMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcAngularVelocityMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcAreaMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcBoolean: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcColour: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcComplexNumber: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcCompoundPlaneAngleMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcContextDependentMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcCountMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcCurvatureMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcCurveStyleFontSelect: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcDateTimeSelect: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcDerivedMeasureValue: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcDescriptiveMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcDoseEquivalentMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcDynamicViscosityMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcElectricCapacitanceMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcElectricChargeMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcElectricConductanceMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcElectricCurrentMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcElectricResistanceMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcElectricVoltageMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcEnergyMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcForceMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcFrequencyMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcHeatFluxDensityMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcHeatingValueMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcIdentifier: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcIlluminanceMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcInductanceMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcInteger: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcIntegerCountRateMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcIonConcentrationMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcIsothermalMoistureCapacityMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcKinematicViscosityMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcLabel: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcLengthMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcLinearForceMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcLinearMomentMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcLinearStiffnessMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcLinearVelocityMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcLogical: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcLuminousFluxMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcLuminousIntensityDistributionMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcLuminousIntensityMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcMagneticFluxDensityMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcMagneticFluxMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcMassDensityMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcMassFlowRateMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcMassMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcMassPerLengthMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcMeasureValue: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcModulusOfElasticityMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcModulusOfLinearSubgradeReactionMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcModulusOfRotationalSubgradeReactionMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcModulusOfSubgradeReactionMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcMoistureDiffusivityMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcMolecularWeightMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcMomentOfInertiaMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcMonetaryMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcNormalisedRatioMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcNullStyle: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcNumericMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcPHMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcParameterValue: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcPlanarForceMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcPlaneAngleMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcPositiveLengthMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcPositivePlaneAngleMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcPositiveRatioMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcPowerMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcPressureMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcRadioActivityMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcRatioMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcReal: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcRotationalFrequencyMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcRotationalMassMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcRotationalStiffnessMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcSectionModulusMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcSectionalAreaIntegralMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcShearModulusMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcSimpleValue: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcSolidAngleMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcSoundPowerMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcSoundPressureMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcSpecificHeatCapacityMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcSpecularExponent: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcSpecularRoughness: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcTemperatureGradientMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcText: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcThermalAdmittanceMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcThermalConductivityMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcThermalExpansionCoefficientMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcThermalResistanceMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcThermalTransmittanceMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcThermodynamicTemperatureMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcTimeMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcTimeStamp: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcTorqueMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcVaporPermeabilityMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcVolumeMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcVolumetricFlowRateMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcWarpingConstantMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcWarpingMomentMeasure: return new IfcUtil::IfcEntitySelect(e); break;
+        case Type::IfcAbsorbedDoseMeasure: return new IfcAbsorbedDoseMeasure(e); break;
+        case Type::IfcAccelerationMeasure: return new IfcAccelerationMeasure(e); break;
+        case Type::IfcAmountOfSubstanceMeasure: return new IfcAmountOfSubstanceMeasure(e); break;
+        case Type::IfcAngularVelocityMeasure: return new IfcAngularVelocityMeasure(e); break;
+        case Type::IfcAreaMeasure: return new IfcAreaMeasure(e); break;
+        case Type::IfcBoolean: return new IfcBoolean(e); break;
+        case Type::IfcBoxAlignment: return new IfcBoxAlignment(e); break;
+        case Type::IfcComplexNumber: return new IfcComplexNumber(e); break;
+        case Type::IfcCompoundPlaneAngleMeasure: return new IfcCompoundPlaneAngleMeasure(e); break;
+        case Type::IfcContextDependentMeasure: return new IfcContextDependentMeasure(e); break;
+        case Type::IfcCountMeasure: return new IfcCountMeasure(e); break;
+        case Type::IfcCurvatureMeasure: return new IfcCurvatureMeasure(e); break;
+        case Type::IfcDayInMonthNumber: return new IfcDayInMonthNumber(e); break;
+        case Type::IfcDaylightSavingHour: return new IfcDaylightSavingHour(e); break;
+        case Type::IfcDescriptiveMeasure: return new IfcDescriptiveMeasure(e); break;
+        case Type::IfcDimensionCount: return new IfcDimensionCount(e); break;
+        case Type::IfcDoseEquivalentMeasure: return new IfcDoseEquivalentMeasure(e); break;
+        case Type::IfcDynamicViscosityMeasure: return new IfcDynamicViscosityMeasure(e); break;
+        case Type::IfcElectricCapacitanceMeasure: return new IfcElectricCapacitanceMeasure(e); break;
+        case Type::IfcElectricChargeMeasure: return new IfcElectricChargeMeasure(e); break;
+        case Type::IfcElectricConductanceMeasure: return new IfcElectricConductanceMeasure(e); break;
+        case Type::IfcElectricCurrentMeasure: return new IfcElectricCurrentMeasure(e); break;
+        case Type::IfcElectricResistanceMeasure: return new IfcElectricResistanceMeasure(e); break;
+        case Type::IfcElectricVoltageMeasure: return new IfcElectricVoltageMeasure(e); break;
+        case Type::IfcEnergyMeasure: return new IfcEnergyMeasure(e); break;
+        case Type::IfcFontStyle: return new IfcFontStyle(e); break;
+        case Type::IfcFontVariant: return new IfcFontVariant(e); break;
+        case Type::IfcFontWeight: return new IfcFontWeight(e); break;
+        case Type::IfcForceMeasure: return new IfcForceMeasure(e); break;
+        case Type::IfcFrequencyMeasure: return new IfcFrequencyMeasure(e); break;
+        case Type::IfcGloballyUniqueId: return new IfcGloballyUniqueId(e); break;
+        case Type::IfcHeatFluxDensityMeasure: return new IfcHeatFluxDensityMeasure(e); break;
+        case Type::IfcHeatingValueMeasure: return new IfcHeatingValueMeasure(e); break;
+        case Type::IfcHourInDay: return new IfcHourInDay(e); break;
+        case Type::IfcIdentifier: return new IfcIdentifier(e); break;
+        case Type::IfcIlluminanceMeasure: return new IfcIlluminanceMeasure(e); break;
+        case Type::IfcInductanceMeasure: return new IfcInductanceMeasure(e); break;
+        case Type::IfcInteger: return new IfcInteger(e); break;
+        case Type::IfcIntegerCountRateMeasure: return new IfcIntegerCountRateMeasure(e); break;
+        case Type::IfcIonConcentrationMeasure: return new IfcIonConcentrationMeasure(e); break;
+        case Type::IfcIsothermalMoistureCapacityMeasure: return new IfcIsothermalMoistureCapacityMeasure(e); break;
+        case Type::IfcKinematicViscosityMeasure: return new IfcKinematicViscosityMeasure(e); break;
+        case Type::IfcLabel: return new IfcLabel(e); break;
+        case Type::IfcLengthMeasure: return new IfcLengthMeasure(e); break;
+        case Type::IfcLinearForceMeasure: return new IfcLinearForceMeasure(e); break;
+        case Type::IfcLinearMomentMeasure: return new IfcLinearMomentMeasure(e); break;
+        case Type::IfcLinearStiffnessMeasure: return new IfcLinearStiffnessMeasure(e); break;
+        case Type::IfcLinearVelocityMeasure: return new IfcLinearVelocityMeasure(e); break;
+        case Type::IfcLogical: return new IfcLogical(e); break;
+        case Type::IfcLuminousFluxMeasure: return new IfcLuminousFluxMeasure(e); break;
+        case Type::IfcLuminousIntensityDistributionMeasure: return new IfcLuminousIntensityDistributionMeasure(e); break;
+        case Type::IfcLuminousIntensityMeasure: return new IfcLuminousIntensityMeasure(e); break;
+        case Type::IfcMagneticFluxDensityMeasure: return new IfcMagneticFluxDensityMeasure(e); break;
+        case Type::IfcMagneticFluxMeasure: return new IfcMagneticFluxMeasure(e); break;
+        case Type::IfcMassDensityMeasure: return new IfcMassDensityMeasure(e); break;
+        case Type::IfcMassFlowRateMeasure: return new IfcMassFlowRateMeasure(e); break;
+        case Type::IfcMassMeasure: return new IfcMassMeasure(e); break;
+        case Type::IfcMassPerLengthMeasure: return new IfcMassPerLengthMeasure(e); break;
+        case Type::IfcMinuteInHour: return new IfcMinuteInHour(e); break;
+        case Type::IfcModulusOfElasticityMeasure: return new IfcModulusOfElasticityMeasure(e); break;
+        case Type::IfcModulusOfLinearSubgradeReactionMeasure: return new IfcModulusOfLinearSubgradeReactionMeasure(e); break;
+        case Type::IfcModulusOfRotationalSubgradeReactionMeasure: return new IfcModulusOfRotationalSubgradeReactionMeasure(e); break;
+        case Type::IfcModulusOfSubgradeReactionMeasure: return new IfcModulusOfSubgradeReactionMeasure(e); break;
+        case Type::IfcMoistureDiffusivityMeasure: return new IfcMoistureDiffusivityMeasure(e); break;
+        case Type::IfcMolecularWeightMeasure: return new IfcMolecularWeightMeasure(e); break;
+        case Type::IfcMomentOfInertiaMeasure: return new IfcMomentOfInertiaMeasure(e); break;
+        case Type::IfcMonetaryMeasure: return new IfcMonetaryMeasure(e); break;
+        case Type::IfcMonthInYearNumber: return new IfcMonthInYearNumber(e); break;
+        case Type::IfcNormalisedRatioMeasure: return new IfcNormalisedRatioMeasure(e); break;
+        case Type::IfcNumericMeasure: return new IfcNumericMeasure(e); break;
+        case Type::IfcPHMeasure: return new IfcPHMeasure(e); break;
+        case Type::IfcParameterValue: return new IfcParameterValue(e); break;
+        case Type::IfcPlanarForceMeasure: return new IfcPlanarForceMeasure(e); break;
+        case Type::IfcPlaneAngleMeasure: return new IfcPlaneAngleMeasure(e); break;
+        case Type::IfcPositiveLengthMeasure: return new IfcPositiveLengthMeasure(e); break;
+        case Type::IfcPositivePlaneAngleMeasure: return new IfcPositivePlaneAngleMeasure(e); break;
+        case Type::IfcPositiveRatioMeasure: return new IfcPositiveRatioMeasure(e); break;
+        case Type::IfcPowerMeasure: return new IfcPowerMeasure(e); break;
+        case Type::IfcPresentableText: return new IfcPresentableText(e); break;
+        case Type::IfcPressureMeasure: return new IfcPressureMeasure(e); break;
+        case Type::IfcRadioActivityMeasure: return new IfcRadioActivityMeasure(e); break;
+        case Type::IfcRatioMeasure: return new IfcRatioMeasure(e); break;
+        case Type::IfcReal: return new IfcReal(e); break;
+        case Type::IfcRotationalFrequencyMeasure: return new IfcRotationalFrequencyMeasure(e); break;
+        case Type::IfcRotationalMassMeasure: return new IfcRotationalMassMeasure(e); break;
+        case Type::IfcRotationalStiffnessMeasure: return new IfcRotationalStiffnessMeasure(e); break;
+        case Type::IfcSecondInMinute: return new IfcSecondInMinute(e); break;
+        case Type::IfcSectionModulusMeasure: return new IfcSectionModulusMeasure(e); break;
+        case Type::IfcSectionalAreaIntegralMeasure: return new IfcSectionalAreaIntegralMeasure(e); break;
+        case Type::IfcShearModulusMeasure: return new IfcShearModulusMeasure(e); break;
+        case Type::IfcSolidAngleMeasure: return new IfcSolidAngleMeasure(e); break;
+        case Type::IfcSoundPowerMeasure: return new IfcSoundPowerMeasure(e); break;
+        case Type::IfcSoundPressureMeasure: return new IfcSoundPressureMeasure(e); break;
+        case Type::IfcSpecificHeatCapacityMeasure: return new IfcSpecificHeatCapacityMeasure(e); break;
+        case Type::IfcSpecularExponent: return new IfcSpecularExponent(e); break;
+        case Type::IfcSpecularRoughness: return new IfcSpecularRoughness(e); break;
+        case Type::IfcTemperatureGradientMeasure: return new IfcTemperatureGradientMeasure(e); break;
+        case Type::IfcText: return new IfcText(e); break;
+        case Type::IfcTextAlignment: return new IfcTextAlignment(e); break;
+        case Type::IfcTextDecoration: return new IfcTextDecoration(e); break;
+        case Type::IfcTextFontName: return new IfcTextFontName(e); break;
+        case Type::IfcTextTransformation: return new IfcTextTransformation(e); break;
+        case Type::IfcThermalAdmittanceMeasure: return new IfcThermalAdmittanceMeasure(e); break;
+        case Type::IfcThermalConductivityMeasure: return new IfcThermalConductivityMeasure(e); break;
+        case Type::IfcThermalExpansionCoefficientMeasure: return new IfcThermalExpansionCoefficientMeasure(e); break;
+        case Type::IfcThermalResistanceMeasure: return new IfcThermalResistanceMeasure(e); break;
+        case Type::IfcThermalTransmittanceMeasure: return new IfcThermalTransmittanceMeasure(e); break;
+        case Type::IfcThermodynamicTemperatureMeasure: return new IfcThermodynamicTemperatureMeasure(e); break;
+        case Type::IfcTimeMeasure: return new IfcTimeMeasure(e); break;
+        case Type::IfcTimeStamp: return new IfcTimeStamp(e); break;
+        case Type::IfcTorqueMeasure: return new IfcTorqueMeasure(e); break;
+        case Type::IfcVaporPermeabilityMeasure: return new IfcVaporPermeabilityMeasure(e); break;
+        case Type::IfcVolumeMeasure: return new IfcVolumeMeasure(e); break;
+        case Type::IfcVolumetricFlowRateMeasure: return new IfcVolumetricFlowRateMeasure(e); break;
+        case Type::IfcWarpingConstantMeasure: return new IfcWarpingConstantMeasure(e); break;
+        case Type::IfcWarpingMomentMeasure: return new IfcWarpingMomentMeasure(e); break;
+        case Type::IfcYearNumber: return new IfcYearNumber(e); break;
         case Type::Ifc2DCompositeCurve: return new Ifc2DCompositeCurve(e); break;
         case Type::IfcActionRequest: return new IfcActionRequest(e); break;
         case Type::IfcActor: return new IfcActor(e); break;
@@ -5310,7933 +5321,9098 @@ IfcWorkControlTypeEnum::IfcWorkControlTypeEnum IfcWorkControlTypeEnum::FromStrin
 }
 
 
-#define RETURN_INVERSE(T)     IfcEntities e = entity->getInverse(T::Class());     SHARED_PTR< IfcTemplatedEntityList<T> > l ( new IfcTemplatedEntityList<T>() );     for ( IfcEntityList::it it = e->begin(); it != e->end(); ++ it ) {         l->push(reinterpret_pointer_cast<IfcBaseClass,T>(*it));     }     return l;
+// Function implementations for IfcAbsorbedDoseMeasure
+IfcUtil::ArgumentType IfcAbsorbedDoseMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcAbsorbedDoseMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcAbsorbedDoseMeasure::is(Type::Enum v) const { return v == IfcAbsorbedDoseMeasure::Class(); }
+Type::Enum IfcAbsorbedDoseMeasure::type() const { return Type::IfcAbsorbedDoseMeasure; }
+Type::Enum IfcAbsorbedDoseMeasure::Class() { return Type::IfcAbsorbedDoseMeasure; }
+IfcAbsorbedDoseMeasure::IfcAbsorbedDoseMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcAbsorbedDoseMeasure::IfcAbsorbedDoseMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcAbsorbedDoseMeasure); e->setArgument(0, v); entity = e; }
+IfcAbsorbedDoseMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcAccelerationMeasure
+IfcUtil::ArgumentType IfcAccelerationMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcAccelerationMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcAccelerationMeasure::is(Type::Enum v) const { return v == IfcAccelerationMeasure::Class(); }
+Type::Enum IfcAccelerationMeasure::type() const { return Type::IfcAccelerationMeasure; }
+Type::Enum IfcAccelerationMeasure::Class() { return Type::IfcAccelerationMeasure; }
+IfcAccelerationMeasure::IfcAccelerationMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcAccelerationMeasure::IfcAccelerationMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcAccelerationMeasure); e->setArgument(0, v); entity = e; }
+IfcAccelerationMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcAmountOfSubstanceMeasure
+IfcUtil::ArgumentType IfcAmountOfSubstanceMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcAmountOfSubstanceMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcAmountOfSubstanceMeasure::is(Type::Enum v) const { return v == IfcAmountOfSubstanceMeasure::Class(); }
+Type::Enum IfcAmountOfSubstanceMeasure::type() const { return Type::IfcAmountOfSubstanceMeasure; }
+Type::Enum IfcAmountOfSubstanceMeasure::Class() { return Type::IfcAmountOfSubstanceMeasure; }
+IfcAmountOfSubstanceMeasure::IfcAmountOfSubstanceMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcAmountOfSubstanceMeasure::IfcAmountOfSubstanceMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcAmountOfSubstanceMeasure); e->setArgument(0, v); entity = e; }
+IfcAmountOfSubstanceMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcAngularVelocityMeasure
+IfcUtil::ArgumentType IfcAngularVelocityMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcAngularVelocityMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcAngularVelocityMeasure::is(Type::Enum v) const { return v == IfcAngularVelocityMeasure::Class(); }
+Type::Enum IfcAngularVelocityMeasure::type() const { return Type::IfcAngularVelocityMeasure; }
+Type::Enum IfcAngularVelocityMeasure::Class() { return Type::IfcAngularVelocityMeasure; }
+IfcAngularVelocityMeasure::IfcAngularVelocityMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcAngularVelocityMeasure::IfcAngularVelocityMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcAngularVelocityMeasure); e->setArgument(0, v); entity = e; }
+IfcAngularVelocityMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcAreaMeasure
+IfcUtil::ArgumentType IfcAreaMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcAreaMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcAreaMeasure::is(Type::Enum v) const { return v == IfcAreaMeasure::Class(); }
+Type::Enum IfcAreaMeasure::type() const { return Type::IfcAreaMeasure; }
+Type::Enum IfcAreaMeasure::Class() { return Type::IfcAreaMeasure; }
+IfcAreaMeasure::IfcAreaMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcAreaMeasure::IfcAreaMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcAreaMeasure); e->setArgument(0, v); entity = e; }
+IfcAreaMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcBoolean
+IfcUtil::ArgumentType IfcBoolean::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_BOOL; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcBoolean::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcBoolean::is(Type::Enum v) const { return v == IfcBoolean::Class(); }
+Type::Enum IfcBoolean::type() const { return Type::IfcBoolean; }
+Type::Enum IfcBoolean::Class() { return Type::IfcBoolean; }
+IfcBoolean::IfcBoolean(IfcAbstractEntity* e) { entity = e; }
+IfcBoolean::IfcBoolean(bool v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcBoolean); e->setArgument(0, v); entity = e; }
+IfcBoolean::operator bool() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcBoxAlignment
+IfcUtil::ArgumentType IfcBoxAlignment::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_STRING; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcBoxAlignment::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcBoxAlignment::is(Type::Enum v) const { return v == Type::IfcBoxAlignment || IfcLabel::is(v); }
+Type::Enum IfcBoxAlignment::type() const { return Type::IfcBoxAlignment; }
+Type::Enum IfcBoxAlignment::Class() { return Type::IfcBoxAlignment; }
+IfcBoxAlignment::IfcBoxAlignment(IfcAbstractEntity* e) : IfcLabel((IfcAbstractEntity*)0) { entity = e; }
+IfcBoxAlignment::IfcBoxAlignment(std::string v) : IfcLabel((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcBoxAlignment); e->setArgument(0, v); entity = e; }
+IfcBoxAlignment::operator std::string() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcComplexNumber
+IfcUtil::ArgumentType IfcComplexNumber::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcComplexNumber::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcComplexNumber::is(Type::Enum v) const { return v == IfcComplexNumber::Class(); }
+Type::Enum IfcComplexNumber::type() const { return Type::IfcComplexNumber; }
+Type::Enum IfcComplexNumber::Class() { return Type::IfcComplexNumber; }
+IfcComplexNumber::IfcComplexNumber(IfcAbstractEntity* e) { entity = e; }
+IfcComplexNumber::IfcComplexNumber(std::vector< double > /*[1:2]*/ v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcComplexNumber); e->setArgument(0, v); entity = e; }
+IfcComplexNumber::operator std::vector< double > /*[1:2]*/() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcCompoundPlaneAngleMeasure
+IfcUtil::ArgumentType IfcCompoundPlaneAngleMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_INT; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcCompoundPlaneAngleMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcCompoundPlaneAngleMeasure::is(Type::Enum v) const { return v == IfcCompoundPlaneAngleMeasure::Class(); }
+Type::Enum IfcCompoundPlaneAngleMeasure::type() const { return Type::IfcCompoundPlaneAngleMeasure; }
+Type::Enum IfcCompoundPlaneAngleMeasure::Class() { return Type::IfcCompoundPlaneAngleMeasure; }
+IfcCompoundPlaneAngleMeasure::IfcCompoundPlaneAngleMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcCompoundPlaneAngleMeasure::IfcCompoundPlaneAngleMeasure(std::vector< int > /*[3:4]*/ v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcCompoundPlaneAngleMeasure); e->setArgument(0, v); entity = e; }
+IfcCompoundPlaneAngleMeasure::operator std::vector< int > /*[3:4]*/() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcContextDependentMeasure
+IfcUtil::ArgumentType IfcContextDependentMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcContextDependentMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcContextDependentMeasure::is(Type::Enum v) const { return v == IfcContextDependentMeasure::Class(); }
+Type::Enum IfcContextDependentMeasure::type() const { return Type::IfcContextDependentMeasure; }
+Type::Enum IfcContextDependentMeasure::Class() { return Type::IfcContextDependentMeasure; }
+IfcContextDependentMeasure::IfcContextDependentMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcContextDependentMeasure::IfcContextDependentMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcContextDependentMeasure); e->setArgument(0, v); entity = e; }
+IfcContextDependentMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcCountMeasure
+IfcUtil::ArgumentType IfcCountMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcCountMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcCountMeasure::is(Type::Enum v) const { return v == IfcCountMeasure::Class(); }
+Type::Enum IfcCountMeasure::type() const { return Type::IfcCountMeasure; }
+Type::Enum IfcCountMeasure::Class() { return Type::IfcCountMeasure; }
+IfcCountMeasure::IfcCountMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcCountMeasure::IfcCountMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcCountMeasure); e->setArgument(0, v); entity = e; }
+IfcCountMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcCurvatureMeasure
+IfcUtil::ArgumentType IfcCurvatureMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcCurvatureMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcCurvatureMeasure::is(Type::Enum v) const { return v == IfcCurvatureMeasure::Class(); }
+Type::Enum IfcCurvatureMeasure::type() const { return Type::IfcCurvatureMeasure; }
+Type::Enum IfcCurvatureMeasure::Class() { return Type::IfcCurvatureMeasure; }
+IfcCurvatureMeasure::IfcCurvatureMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcCurvatureMeasure::IfcCurvatureMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcCurvatureMeasure); e->setArgument(0, v); entity = e; }
+IfcCurvatureMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcDayInMonthNumber
+IfcUtil::ArgumentType IfcDayInMonthNumber::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_INT; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcDayInMonthNumber::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcDayInMonthNumber::is(Type::Enum v) const { return v == IfcDayInMonthNumber::Class(); }
+Type::Enum IfcDayInMonthNumber::type() const { return Type::IfcDayInMonthNumber; }
+Type::Enum IfcDayInMonthNumber::Class() { return Type::IfcDayInMonthNumber; }
+IfcDayInMonthNumber::IfcDayInMonthNumber(IfcAbstractEntity* e) { entity = e; }
+IfcDayInMonthNumber::IfcDayInMonthNumber(int v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcDayInMonthNumber); e->setArgument(0, v); entity = e; }
+IfcDayInMonthNumber::operator int() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcDaylightSavingHour
+IfcUtil::ArgumentType IfcDaylightSavingHour::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_INT; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcDaylightSavingHour::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcDaylightSavingHour::is(Type::Enum v) const { return v == IfcDaylightSavingHour::Class(); }
+Type::Enum IfcDaylightSavingHour::type() const { return Type::IfcDaylightSavingHour; }
+Type::Enum IfcDaylightSavingHour::Class() { return Type::IfcDaylightSavingHour; }
+IfcDaylightSavingHour::IfcDaylightSavingHour(IfcAbstractEntity* e) { entity = e; }
+IfcDaylightSavingHour::IfcDaylightSavingHour(int v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcDaylightSavingHour); e->setArgument(0, v); entity = e; }
+IfcDaylightSavingHour::operator int() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcDescriptiveMeasure
+IfcUtil::ArgumentType IfcDescriptiveMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_STRING; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcDescriptiveMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcDescriptiveMeasure::is(Type::Enum v) const { return v == IfcDescriptiveMeasure::Class(); }
+Type::Enum IfcDescriptiveMeasure::type() const { return Type::IfcDescriptiveMeasure; }
+Type::Enum IfcDescriptiveMeasure::Class() { return Type::IfcDescriptiveMeasure; }
+IfcDescriptiveMeasure::IfcDescriptiveMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcDescriptiveMeasure::IfcDescriptiveMeasure(std::string v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcDescriptiveMeasure); e->setArgument(0, v); entity = e; }
+IfcDescriptiveMeasure::operator std::string() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcDimensionCount
+IfcUtil::ArgumentType IfcDimensionCount::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_INT; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcDimensionCount::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcDimensionCount::is(Type::Enum v) const { return v == IfcDimensionCount::Class(); }
+Type::Enum IfcDimensionCount::type() const { return Type::IfcDimensionCount; }
+Type::Enum IfcDimensionCount::Class() { return Type::IfcDimensionCount; }
+IfcDimensionCount::IfcDimensionCount(IfcAbstractEntity* e) { entity = e; }
+IfcDimensionCount::IfcDimensionCount(int v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcDimensionCount); e->setArgument(0, v); entity = e; }
+IfcDimensionCount::operator int() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcDoseEquivalentMeasure
+IfcUtil::ArgumentType IfcDoseEquivalentMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcDoseEquivalentMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcDoseEquivalentMeasure::is(Type::Enum v) const { return v == IfcDoseEquivalentMeasure::Class(); }
+Type::Enum IfcDoseEquivalentMeasure::type() const { return Type::IfcDoseEquivalentMeasure; }
+Type::Enum IfcDoseEquivalentMeasure::Class() { return Type::IfcDoseEquivalentMeasure; }
+IfcDoseEquivalentMeasure::IfcDoseEquivalentMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcDoseEquivalentMeasure::IfcDoseEquivalentMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcDoseEquivalentMeasure); e->setArgument(0, v); entity = e; }
+IfcDoseEquivalentMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcDynamicViscosityMeasure
+IfcUtil::ArgumentType IfcDynamicViscosityMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcDynamicViscosityMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcDynamicViscosityMeasure::is(Type::Enum v) const { return v == IfcDynamicViscosityMeasure::Class(); }
+Type::Enum IfcDynamicViscosityMeasure::type() const { return Type::IfcDynamicViscosityMeasure; }
+Type::Enum IfcDynamicViscosityMeasure::Class() { return Type::IfcDynamicViscosityMeasure; }
+IfcDynamicViscosityMeasure::IfcDynamicViscosityMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcDynamicViscosityMeasure::IfcDynamicViscosityMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcDynamicViscosityMeasure); e->setArgument(0, v); entity = e; }
+IfcDynamicViscosityMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcElectricCapacitanceMeasure
+IfcUtil::ArgumentType IfcElectricCapacitanceMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcElectricCapacitanceMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcElectricCapacitanceMeasure::is(Type::Enum v) const { return v == IfcElectricCapacitanceMeasure::Class(); }
+Type::Enum IfcElectricCapacitanceMeasure::type() const { return Type::IfcElectricCapacitanceMeasure; }
+Type::Enum IfcElectricCapacitanceMeasure::Class() { return Type::IfcElectricCapacitanceMeasure; }
+IfcElectricCapacitanceMeasure::IfcElectricCapacitanceMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcElectricCapacitanceMeasure::IfcElectricCapacitanceMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcElectricCapacitanceMeasure); e->setArgument(0, v); entity = e; }
+IfcElectricCapacitanceMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcElectricChargeMeasure
+IfcUtil::ArgumentType IfcElectricChargeMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcElectricChargeMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcElectricChargeMeasure::is(Type::Enum v) const { return v == IfcElectricChargeMeasure::Class(); }
+Type::Enum IfcElectricChargeMeasure::type() const { return Type::IfcElectricChargeMeasure; }
+Type::Enum IfcElectricChargeMeasure::Class() { return Type::IfcElectricChargeMeasure; }
+IfcElectricChargeMeasure::IfcElectricChargeMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcElectricChargeMeasure::IfcElectricChargeMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcElectricChargeMeasure); e->setArgument(0, v); entity = e; }
+IfcElectricChargeMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcElectricConductanceMeasure
+IfcUtil::ArgumentType IfcElectricConductanceMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcElectricConductanceMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcElectricConductanceMeasure::is(Type::Enum v) const { return v == IfcElectricConductanceMeasure::Class(); }
+Type::Enum IfcElectricConductanceMeasure::type() const { return Type::IfcElectricConductanceMeasure; }
+Type::Enum IfcElectricConductanceMeasure::Class() { return Type::IfcElectricConductanceMeasure; }
+IfcElectricConductanceMeasure::IfcElectricConductanceMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcElectricConductanceMeasure::IfcElectricConductanceMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcElectricConductanceMeasure); e->setArgument(0, v); entity = e; }
+IfcElectricConductanceMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcElectricCurrentMeasure
+IfcUtil::ArgumentType IfcElectricCurrentMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcElectricCurrentMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcElectricCurrentMeasure::is(Type::Enum v) const { return v == IfcElectricCurrentMeasure::Class(); }
+Type::Enum IfcElectricCurrentMeasure::type() const { return Type::IfcElectricCurrentMeasure; }
+Type::Enum IfcElectricCurrentMeasure::Class() { return Type::IfcElectricCurrentMeasure; }
+IfcElectricCurrentMeasure::IfcElectricCurrentMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcElectricCurrentMeasure::IfcElectricCurrentMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcElectricCurrentMeasure); e->setArgument(0, v); entity = e; }
+IfcElectricCurrentMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcElectricResistanceMeasure
+IfcUtil::ArgumentType IfcElectricResistanceMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcElectricResistanceMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcElectricResistanceMeasure::is(Type::Enum v) const { return v == IfcElectricResistanceMeasure::Class(); }
+Type::Enum IfcElectricResistanceMeasure::type() const { return Type::IfcElectricResistanceMeasure; }
+Type::Enum IfcElectricResistanceMeasure::Class() { return Type::IfcElectricResistanceMeasure; }
+IfcElectricResistanceMeasure::IfcElectricResistanceMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcElectricResistanceMeasure::IfcElectricResistanceMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcElectricResistanceMeasure); e->setArgument(0, v); entity = e; }
+IfcElectricResistanceMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcElectricVoltageMeasure
+IfcUtil::ArgumentType IfcElectricVoltageMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcElectricVoltageMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcElectricVoltageMeasure::is(Type::Enum v) const { return v == IfcElectricVoltageMeasure::Class(); }
+Type::Enum IfcElectricVoltageMeasure::type() const { return Type::IfcElectricVoltageMeasure; }
+Type::Enum IfcElectricVoltageMeasure::Class() { return Type::IfcElectricVoltageMeasure; }
+IfcElectricVoltageMeasure::IfcElectricVoltageMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcElectricVoltageMeasure::IfcElectricVoltageMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcElectricVoltageMeasure); e->setArgument(0, v); entity = e; }
+IfcElectricVoltageMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcEnergyMeasure
+IfcUtil::ArgumentType IfcEnergyMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcEnergyMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcEnergyMeasure::is(Type::Enum v) const { return v == IfcEnergyMeasure::Class(); }
+Type::Enum IfcEnergyMeasure::type() const { return Type::IfcEnergyMeasure; }
+Type::Enum IfcEnergyMeasure::Class() { return Type::IfcEnergyMeasure; }
+IfcEnergyMeasure::IfcEnergyMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcEnergyMeasure::IfcEnergyMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcEnergyMeasure); e->setArgument(0, v); entity = e; }
+IfcEnergyMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcFontStyle
+IfcUtil::ArgumentType IfcFontStyle::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_STRING; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcFontStyle::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcFontStyle::is(Type::Enum v) const { return v == IfcFontStyle::Class(); }
+Type::Enum IfcFontStyle::type() const { return Type::IfcFontStyle; }
+Type::Enum IfcFontStyle::Class() { return Type::IfcFontStyle; }
+IfcFontStyle::IfcFontStyle(IfcAbstractEntity* e) { entity = e; }
+IfcFontStyle::IfcFontStyle(std::string v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcFontStyle); e->setArgument(0, v); entity = e; }
+IfcFontStyle::operator std::string() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcFontVariant
+IfcUtil::ArgumentType IfcFontVariant::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_STRING; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcFontVariant::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcFontVariant::is(Type::Enum v) const { return v == IfcFontVariant::Class(); }
+Type::Enum IfcFontVariant::type() const { return Type::IfcFontVariant; }
+Type::Enum IfcFontVariant::Class() { return Type::IfcFontVariant; }
+IfcFontVariant::IfcFontVariant(IfcAbstractEntity* e) { entity = e; }
+IfcFontVariant::IfcFontVariant(std::string v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcFontVariant); e->setArgument(0, v); entity = e; }
+IfcFontVariant::operator std::string() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcFontWeight
+IfcUtil::ArgumentType IfcFontWeight::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_STRING; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcFontWeight::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcFontWeight::is(Type::Enum v) const { return v == IfcFontWeight::Class(); }
+Type::Enum IfcFontWeight::type() const { return Type::IfcFontWeight; }
+Type::Enum IfcFontWeight::Class() { return Type::IfcFontWeight; }
+IfcFontWeight::IfcFontWeight(IfcAbstractEntity* e) { entity = e; }
+IfcFontWeight::IfcFontWeight(std::string v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcFontWeight); e->setArgument(0, v); entity = e; }
+IfcFontWeight::operator std::string() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcForceMeasure
+IfcUtil::ArgumentType IfcForceMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcForceMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcForceMeasure::is(Type::Enum v) const { return v == IfcForceMeasure::Class(); }
+Type::Enum IfcForceMeasure::type() const { return Type::IfcForceMeasure; }
+Type::Enum IfcForceMeasure::Class() { return Type::IfcForceMeasure; }
+IfcForceMeasure::IfcForceMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcForceMeasure::IfcForceMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcForceMeasure); e->setArgument(0, v); entity = e; }
+IfcForceMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcFrequencyMeasure
+IfcUtil::ArgumentType IfcFrequencyMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcFrequencyMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcFrequencyMeasure::is(Type::Enum v) const { return v == IfcFrequencyMeasure::Class(); }
+Type::Enum IfcFrequencyMeasure::type() const { return Type::IfcFrequencyMeasure; }
+Type::Enum IfcFrequencyMeasure::Class() { return Type::IfcFrequencyMeasure; }
+IfcFrequencyMeasure::IfcFrequencyMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcFrequencyMeasure::IfcFrequencyMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcFrequencyMeasure); e->setArgument(0, v); entity = e; }
+IfcFrequencyMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcGloballyUniqueId
+IfcUtil::ArgumentType IfcGloballyUniqueId::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_STRING; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcGloballyUniqueId::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcGloballyUniqueId::is(Type::Enum v) const { return v == IfcGloballyUniqueId::Class(); }
+Type::Enum IfcGloballyUniqueId::type() const { return Type::IfcGloballyUniqueId; }
+Type::Enum IfcGloballyUniqueId::Class() { return Type::IfcGloballyUniqueId; }
+IfcGloballyUniqueId::IfcGloballyUniqueId(IfcAbstractEntity* e) { entity = e; }
+IfcGloballyUniqueId::IfcGloballyUniqueId(std::string v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcGloballyUniqueId); e->setArgument(0, v); entity = e; }
+IfcGloballyUniqueId::operator std::string() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcHeatFluxDensityMeasure
+IfcUtil::ArgumentType IfcHeatFluxDensityMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcHeatFluxDensityMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcHeatFluxDensityMeasure::is(Type::Enum v) const { return v == IfcHeatFluxDensityMeasure::Class(); }
+Type::Enum IfcHeatFluxDensityMeasure::type() const { return Type::IfcHeatFluxDensityMeasure; }
+Type::Enum IfcHeatFluxDensityMeasure::Class() { return Type::IfcHeatFluxDensityMeasure; }
+IfcHeatFluxDensityMeasure::IfcHeatFluxDensityMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcHeatFluxDensityMeasure::IfcHeatFluxDensityMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcHeatFluxDensityMeasure); e->setArgument(0, v); entity = e; }
+IfcHeatFluxDensityMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcHeatingValueMeasure
+IfcUtil::ArgumentType IfcHeatingValueMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcHeatingValueMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcHeatingValueMeasure::is(Type::Enum v) const { return v == IfcHeatingValueMeasure::Class(); }
+Type::Enum IfcHeatingValueMeasure::type() const { return Type::IfcHeatingValueMeasure; }
+Type::Enum IfcHeatingValueMeasure::Class() { return Type::IfcHeatingValueMeasure; }
+IfcHeatingValueMeasure::IfcHeatingValueMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcHeatingValueMeasure::IfcHeatingValueMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcHeatingValueMeasure); e->setArgument(0, v); entity = e; }
+IfcHeatingValueMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcHourInDay
+IfcUtil::ArgumentType IfcHourInDay::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_INT; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcHourInDay::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcHourInDay::is(Type::Enum v) const { return v == IfcHourInDay::Class(); }
+Type::Enum IfcHourInDay::type() const { return Type::IfcHourInDay; }
+Type::Enum IfcHourInDay::Class() { return Type::IfcHourInDay; }
+IfcHourInDay::IfcHourInDay(IfcAbstractEntity* e) { entity = e; }
+IfcHourInDay::IfcHourInDay(int v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcHourInDay); e->setArgument(0, v); entity = e; }
+IfcHourInDay::operator int() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcIdentifier
+IfcUtil::ArgumentType IfcIdentifier::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_STRING; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcIdentifier::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcIdentifier::is(Type::Enum v) const { return v == IfcIdentifier::Class(); }
+Type::Enum IfcIdentifier::type() const { return Type::IfcIdentifier; }
+Type::Enum IfcIdentifier::Class() { return Type::IfcIdentifier; }
+IfcIdentifier::IfcIdentifier(IfcAbstractEntity* e) { entity = e; }
+IfcIdentifier::IfcIdentifier(std::string v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcIdentifier); e->setArgument(0, v); entity = e; }
+IfcIdentifier::operator std::string() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcIlluminanceMeasure
+IfcUtil::ArgumentType IfcIlluminanceMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcIlluminanceMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcIlluminanceMeasure::is(Type::Enum v) const { return v == IfcIlluminanceMeasure::Class(); }
+Type::Enum IfcIlluminanceMeasure::type() const { return Type::IfcIlluminanceMeasure; }
+Type::Enum IfcIlluminanceMeasure::Class() { return Type::IfcIlluminanceMeasure; }
+IfcIlluminanceMeasure::IfcIlluminanceMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcIlluminanceMeasure::IfcIlluminanceMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcIlluminanceMeasure); e->setArgument(0, v); entity = e; }
+IfcIlluminanceMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcInductanceMeasure
+IfcUtil::ArgumentType IfcInductanceMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcInductanceMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcInductanceMeasure::is(Type::Enum v) const { return v == IfcInductanceMeasure::Class(); }
+Type::Enum IfcInductanceMeasure::type() const { return Type::IfcInductanceMeasure; }
+Type::Enum IfcInductanceMeasure::Class() { return Type::IfcInductanceMeasure; }
+IfcInductanceMeasure::IfcInductanceMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcInductanceMeasure::IfcInductanceMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcInductanceMeasure); e->setArgument(0, v); entity = e; }
+IfcInductanceMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcInteger
+IfcUtil::ArgumentType IfcInteger::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_INT; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcInteger::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcInteger::is(Type::Enum v) const { return v == IfcInteger::Class(); }
+Type::Enum IfcInteger::type() const { return Type::IfcInteger; }
+Type::Enum IfcInteger::Class() { return Type::IfcInteger; }
+IfcInteger::IfcInteger(IfcAbstractEntity* e) { entity = e; }
+IfcInteger::IfcInteger(int v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcInteger); e->setArgument(0, v); entity = e; }
+IfcInteger::operator int() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcIntegerCountRateMeasure
+IfcUtil::ArgumentType IfcIntegerCountRateMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_INT; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcIntegerCountRateMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcIntegerCountRateMeasure::is(Type::Enum v) const { return v == IfcIntegerCountRateMeasure::Class(); }
+Type::Enum IfcIntegerCountRateMeasure::type() const { return Type::IfcIntegerCountRateMeasure; }
+Type::Enum IfcIntegerCountRateMeasure::Class() { return Type::IfcIntegerCountRateMeasure; }
+IfcIntegerCountRateMeasure::IfcIntegerCountRateMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcIntegerCountRateMeasure::IfcIntegerCountRateMeasure(int v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcIntegerCountRateMeasure); e->setArgument(0, v); entity = e; }
+IfcIntegerCountRateMeasure::operator int() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcIonConcentrationMeasure
+IfcUtil::ArgumentType IfcIonConcentrationMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcIonConcentrationMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcIonConcentrationMeasure::is(Type::Enum v) const { return v == IfcIonConcentrationMeasure::Class(); }
+Type::Enum IfcIonConcentrationMeasure::type() const { return Type::IfcIonConcentrationMeasure; }
+Type::Enum IfcIonConcentrationMeasure::Class() { return Type::IfcIonConcentrationMeasure; }
+IfcIonConcentrationMeasure::IfcIonConcentrationMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcIonConcentrationMeasure::IfcIonConcentrationMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcIonConcentrationMeasure); e->setArgument(0, v); entity = e; }
+IfcIonConcentrationMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcIsothermalMoistureCapacityMeasure
+IfcUtil::ArgumentType IfcIsothermalMoistureCapacityMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcIsothermalMoistureCapacityMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcIsothermalMoistureCapacityMeasure::is(Type::Enum v) const { return v == IfcIsothermalMoistureCapacityMeasure::Class(); }
+Type::Enum IfcIsothermalMoistureCapacityMeasure::type() const { return Type::IfcIsothermalMoistureCapacityMeasure; }
+Type::Enum IfcIsothermalMoistureCapacityMeasure::Class() { return Type::IfcIsothermalMoistureCapacityMeasure; }
+IfcIsothermalMoistureCapacityMeasure::IfcIsothermalMoistureCapacityMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcIsothermalMoistureCapacityMeasure::IfcIsothermalMoistureCapacityMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcIsothermalMoistureCapacityMeasure); e->setArgument(0, v); entity = e; }
+IfcIsothermalMoistureCapacityMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcKinematicViscosityMeasure
+IfcUtil::ArgumentType IfcKinematicViscosityMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcKinematicViscosityMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcKinematicViscosityMeasure::is(Type::Enum v) const { return v == IfcKinematicViscosityMeasure::Class(); }
+Type::Enum IfcKinematicViscosityMeasure::type() const { return Type::IfcKinematicViscosityMeasure; }
+Type::Enum IfcKinematicViscosityMeasure::Class() { return Type::IfcKinematicViscosityMeasure; }
+IfcKinematicViscosityMeasure::IfcKinematicViscosityMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcKinematicViscosityMeasure::IfcKinematicViscosityMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcKinematicViscosityMeasure); e->setArgument(0, v); entity = e; }
+IfcKinematicViscosityMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcLabel
+IfcUtil::ArgumentType IfcLabel::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_STRING; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcLabel::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcLabel::is(Type::Enum v) const { return v == IfcLabel::Class(); }
+Type::Enum IfcLabel::type() const { return Type::IfcLabel; }
+Type::Enum IfcLabel::Class() { return Type::IfcLabel; }
+IfcLabel::IfcLabel(IfcAbstractEntity* e) { entity = e; }
+IfcLabel::IfcLabel(std::string v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcLabel); e->setArgument(0, v); entity = e; }
+IfcLabel::operator std::string() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcLengthMeasure
+IfcUtil::ArgumentType IfcLengthMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcLengthMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcLengthMeasure::is(Type::Enum v) const { return v == IfcLengthMeasure::Class(); }
+Type::Enum IfcLengthMeasure::type() const { return Type::IfcLengthMeasure; }
+Type::Enum IfcLengthMeasure::Class() { return Type::IfcLengthMeasure; }
+IfcLengthMeasure::IfcLengthMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcLengthMeasure::IfcLengthMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcLengthMeasure); e->setArgument(0, v); entity = e; }
+IfcLengthMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcLinearForceMeasure
+IfcUtil::ArgumentType IfcLinearForceMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcLinearForceMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcLinearForceMeasure::is(Type::Enum v) const { return v == IfcLinearForceMeasure::Class(); }
+Type::Enum IfcLinearForceMeasure::type() const { return Type::IfcLinearForceMeasure; }
+Type::Enum IfcLinearForceMeasure::Class() { return Type::IfcLinearForceMeasure; }
+IfcLinearForceMeasure::IfcLinearForceMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcLinearForceMeasure::IfcLinearForceMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcLinearForceMeasure); e->setArgument(0, v); entity = e; }
+IfcLinearForceMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcLinearMomentMeasure
+IfcUtil::ArgumentType IfcLinearMomentMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcLinearMomentMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcLinearMomentMeasure::is(Type::Enum v) const { return v == IfcLinearMomentMeasure::Class(); }
+Type::Enum IfcLinearMomentMeasure::type() const { return Type::IfcLinearMomentMeasure; }
+Type::Enum IfcLinearMomentMeasure::Class() { return Type::IfcLinearMomentMeasure; }
+IfcLinearMomentMeasure::IfcLinearMomentMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcLinearMomentMeasure::IfcLinearMomentMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcLinearMomentMeasure); e->setArgument(0, v); entity = e; }
+IfcLinearMomentMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcLinearStiffnessMeasure
+IfcUtil::ArgumentType IfcLinearStiffnessMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcLinearStiffnessMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcLinearStiffnessMeasure::is(Type::Enum v) const { return v == IfcLinearStiffnessMeasure::Class(); }
+Type::Enum IfcLinearStiffnessMeasure::type() const { return Type::IfcLinearStiffnessMeasure; }
+Type::Enum IfcLinearStiffnessMeasure::Class() { return Type::IfcLinearStiffnessMeasure; }
+IfcLinearStiffnessMeasure::IfcLinearStiffnessMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcLinearStiffnessMeasure::IfcLinearStiffnessMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcLinearStiffnessMeasure); e->setArgument(0, v); entity = e; }
+IfcLinearStiffnessMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcLinearVelocityMeasure
+IfcUtil::ArgumentType IfcLinearVelocityMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcLinearVelocityMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcLinearVelocityMeasure::is(Type::Enum v) const { return v == IfcLinearVelocityMeasure::Class(); }
+Type::Enum IfcLinearVelocityMeasure::type() const { return Type::IfcLinearVelocityMeasure; }
+Type::Enum IfcLinearVelocityMeasure::Class() { return Type::IfcLinearVelocityMeasure; }
+IfcLinearVelocityMeasure::IfcLinearVelocityMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcLinearVelocityMeasure::IfcLinearVelocityMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcLinearVelocityMeasure); e->setArgument(0, v); entity = e; }
+IfcLinearVelocityMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcLogical
+IfcUtil::ArgumentType IfcLogical::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_BOOL; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcLogical::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcLogical::is(Type::Enum v) const { return v == IfcLogical::Class(); }
+Type::Enum IfcLogical::type() const { return Type::IfcLogical; }
+Type::Enum IfcLogical::Class() { return Type::IfcLogical; }
+IfcLogical::IfcLogical(IfcAbstractEntity* e) { entity = e; }
+IfcLogical::IfcLogical(bool v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcLogical); e->setArgument(0, v); entity = e; }
+IfcLogical::operator bool() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcLuminousFluxMeasure
+IfcUtil::ArgumentType IfcLuminousFluxMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcLuminousFluxMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcLuminousFluxMeasure::is(Type::Enum v) const { return v == IfcLuminousFluxMeasure::Class(); }
+Type::Enum IfcLuminousFluxMeasure::type() const { return Type::IfcLuminousFluxMeasure; }
+Type::Enum IfcLuminousFluxMeasure::Class() { return Type::IfcLuminousFluxMeasure; }
+IfcLuminousFluxMeasure::IfcLuminousFluxMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcLuminousFluxMeasure::IfcLuminousFluxMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcLuminousFluxMeasure); e->setArgument(0, v); entity = e; }
+IfcLuminousFluxMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcLuminousIntensityDistributionMeasure
+IfcUtil::ArgumentType IfcLuminousIntensityDistributionMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcLuminousIntensityDistributionMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcLuminousIntensityDistributionMeasure::is(Type::Enum v) const { return v == IfcLuminousIntensityDistributionMeasure::Class(); }
+Type::Enum IfcLuminousIntensityDistributionMeasure::type() const { return Type::IfcLuminousIntensityDistributionMeasure; }
+Type::Enum IfcLuminousIntensityDistributionMeasure::Class() { return Type::IfcLuminousIntensityDistributionMeasure; }
+IfcLuminousIntensityDistributionMeasure::IfcLuminousIntensityDistributionMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcLuminousIntensityDistributionMeasure::IfcLuminousIntensityDistributionMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcLuminousIntensityDistributionMeasure); e->setArgument(0, v); entity = e; }
+IfcLuminousIntensityDistributionMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcLuminousIntensityMeasure
+IfcUtil::ArgumentType IfcLuminousIntensityMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcLuminousIntensityMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcLuminousIntensityMeasure::is(Type::Enum v) const { return v == IfcLuminousIntensityMeasure::Class(); }
+Type::Enum IfcLuminousIntensityMeasure::type() const { return Type::IfcLuminousIntensityMeasure; }
+Type::Enum IfcLuminousIntensityMeasure::Class() { return Type::IfcLuminousIntensityMeasure; }
+IfcLuminousIntensityMeasure::IfcLuminousIntensityMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcLuminousIntensityMeasure::IfcLuminousIntensityMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcLuminousIntensityMeasure); e->setArgument(0, v); entity = e; }
+IfcLuminousIntensityMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcMagneticFluxDensityMeasure
+IfcUtil::ArgumentType IfcMagneticFluxDensityMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcMagneticFluxDensityMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcMagneticFluxDensityMeasure::is(Type::Enum v) const { return v == IfcMagneticFluxDensityMeasure::Class(); }
+Type::Enum IfcMagneticFluxDensityMeasure::type() const { return Type::IfcMagneticFluxDensityMeasure; }
+Type::Enum IfcMagneticFluxDensityMeasure::Class() { return Type::IfcMagneticFluxDensityMeasure; }
+IfcMagneticFluxDensityMeasure::IfcMagneticFluxDensityMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcMagneticFluxDensityMeasure::IfcMagneticFluxDensityMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcMagneticFluxDensityMeasure); e->setArgument(0, v); entity = e; }
+IfcMagneticFluxDensityMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcMagneticFluxMeasure
+IfcUtil::ArgumentType IfcMagneticFluxMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcMagneticFluxMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcMagneticFluxMeasure::is(Type::Enum v) const { return v == IfcMagneticFluxMeasure::Class(); }
+Type::Enum IfcMagneticFluxMeasure::type() const { return Type::IfcMagneticFluxMeasure; }
+Type::Enum IfcMagneticFluxMeasure::Class() { return Type::IfcMagneticFluxMeasure; }
+IfcMagneticFluxMeasure::IfcMagneticFluxMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcMagneticFluxMeasure::IfcMagneticFluxMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcMagneticFluxMeasure); e->setArgument(0, v); entity = e; }
+IfcMagneticFluxMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcMassDensityMeasure
+IfcUtil::ArgumentType IfcMassDensityMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcMassDensityMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcMassDensityMeasure::is(Type::Enum v) const { return v == IfcMassDensityMeasure::Class(); }
+Type::Enum IfcMassDensityMeasure::type() const { return Type::IfcMassDensityMeasure; }
+Type::Enum IfcMassDensityMeasure::Class() { return Type::IfcMassDensityMeasure; }
+IfcMassDensityMeasure::IfcMassDensityMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcMassDensityMeasure::IfcMassDensityMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcMassDensityMeasure); e->setArgument(0, v); entity = e; }
+IfcMassDensityMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcMassFlowRateMeasure
+IfcUtil::ArgumentType IfcMassFlowRateMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcMassFlowRateMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcMassFlowRateMeasure::is(Type::Enum v) const { return v == IfcMassFlowRateMeasure::Class(); }
+Type::Enum IfcMassFlowRateMeasure::type() const { return Type::IfcMassFlowRateMeasure; }
+Type::Enum IfcMassFlowRateMeasure::Class() { return Type::IfcMassFlowRateMeasure; }
+IfcMassFlowRateMeasure::IfcMassFlowRateMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcMassFlowRateMeasure::IfcMassFlowRateMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcMassFlowRateMeasure); e->setArgument(0, v); entity = e; }
+IfcMassFlowRateMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcMassMeasure
+IfcUtil::ArgumentType IfcMassMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcMassMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcMassMeasure::is(Type::Enum v) const { return v == IfcMassMeasure::Class(); }
+Type::Enum IfcMassMeasure::type() const { return Type::IfcMassMeasure; }
+Type::Enum IfcMassMeasure::Class() { return Type::IfcMassMeasure; }
+IfcMassMeasure::IfcMassMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcMassMeasure::IfcMassMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcMassMeasure); e->setArgument(0, v); entity = e; }
+IfcMassMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcMassPerLengthMeasure
+IfcUtil::ArgumentType IfcMassPerLengthMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcMassPerLengthMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcMassPerLengthMeasure::is(Type::Enum v) const { return v == IfcMassPerLengthMeasure::Class(); }
+Type::Enum IfcMassPerLengthMeasure::type() const { return Type::IfcMassPerLengthMeasure; }
+Type::Enum IfcMassPerLengthMeasure::Class() { return Type::IfcMassPerLengthMeasure; }
+IfcMassPerLengthMeasure::IfcMassPerLengthMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcMassPerLengthMeasure::IfcMassPerLengthMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcMassPerLengthMeasure); e->setArgument(0, v); entity = e; }
+IfcMassPerLengthMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcMinuteInHour
+IfcUtil::ArgumentType IfcMinuteInHour::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_INT; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcMinuteInHour::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcMinuteInHour::is(Type::Enum v) const { return v == IfcMinuteInHour::Class(); }
+Type::Enum IfcMinuteInHour::type() const { return Type::IfcMinuteInHour; }
+Type::Enum IfcMinuteInHour::Class() { return Type::IfcMinuteInHour; }
+IfcMinuteInHour::IfcMinuteInHour(IfcAbstractEntity* e) { entity = e; }
+IfcMinuteInHour::IfcMinuteInHour(int v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcMinuteInHour); e->setArgument(0, v); entity = e; }
+IfcMinuteInHour::operator int() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcModulusOfElasticityMeasure
+IfcUtil::ArgumentType IfcModulusOfElasticityMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcModulusOfElasticityMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcModulusOfElasticityMeasure::is(Type::Enum v) const { return v == IfcModulusOfElasticityMeasure::Class(); }
+Type::Enum IfcModulusOfElasticityMeasure::type() const { return Type::IfcModulusOfElasticityMeasure; }
+Type::Enum IfcModulusOfElasticityMeasure::Class() { return Type::IfcModulusOfElasticityMeasure; }
+IfcModulusOfElasticityMeasure::IfcModulusOfElasticityMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcModulusOfElasticityMeasure::IfcModulusOfElasticityMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcModulusOfElasticityMeasure); e->setArgument(0, v); entity = e; }
+IfcModulusOfElasticityMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcModulusOfLinearSubgradeReactionMeasure
+IfcUtil::ArgumentType IfcModulusOfLinearSubgradeReactionMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcModulusOfLinearSubgradeReactionMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcModulusOfLinearSubgradeReactionMeasure::is(Type::Enum v) const { return v == IfcModulusOfLinearSubgradeReactionMeasure::Class(); }
+Type::Enum IfcModulusOfLinearSubgradeReactionMeasure::type() const { return Type::IfcModulusOfLinearSubgradeReactionMeasure; }
+Type::Enum IfcModulusOfLinearSubgradeReactionMeasure::Class() { return Type::IfcModulusOfLinearSubgradeReactionMeasure; }
+IfcModulusOfLinearSubgradeReactionMeasure::IfcModulusOfLinearSubgradeReactionMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcModulusOfLinearSubgradeReactionMeasure::IfcModulusOfLinearSubgradeReactionMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcModulusOfLinearSubgradeReactionMeasure); e->setArgument(0, v); entity = e; }
+IfcModulusOfLinearSubgradeReactionMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcModulusOfRotationalSubgradeReactionMeasure
+IfcUtil::ArgumentType IfcModulusOfRotationalSubgradeReactionMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcModulusOfRotationalSubgradeReactionMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcModulusOfRotationalSubgradeReactionMeasure::is(Type::Enum v) const { return v == IfcModulusOfRotationalSubgradeReactionMeasure::Class(); }
+Type::Enum IfcModulusOfRotationalSubgradeReactionMeasure::type() const { return Type::IfcModulusOfRotationalSubgradeReactionMeasure; }
+Type::Enum IfcModulusOfRotationalSubgradeReactionMeasure::Class() { return Type::IfcModulusOfRotationalSubgradeReactionMeasure; }
+IfcModulusOfRotationalSubgradeReactionMeasure::IfcModulusOfRotationalSubgradeReactionMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcModulusOfRotationalSubgradeReactionMeasure::IfcModulusOfRotationalSubgradeReactionMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcModulusOfRotationalSubgradeReactionMeasure); e->setArgument(0, v); entity = e; }
+IfcModulusOfRotationalSubgradeReactionMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcModulusOfSubgradeReactionMeasure
+IfcUtil::ArgumentType IfcModulusOfSubgradeReactionMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcModulusOfSubgradeReactionMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcModulusOfSubgradeReactionMeasure::is(Type::Enum v) const { return v == IfcModulusOfSubgradeReactionMeasure::Class(); }
+Type::Enum IfcModulusOfSubgradeReactionMeasure::type() const { return Type::IfcModulusOfSubgradeReactionMeasure; }
+Type::Enum IfcModulusOfSubgradeReactionMeasure::Class() { return Type::IfcModulusOfSubgradeReactionMeasure; }
+IfcModulusOfSubgradeReactionMeasure::IfcModulusOfSubgradeReactionMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcModulusOfSubgradeReactionMeasure::IfcModulusOfSubgradeReactionMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcModulusOfSubgradeReactionMeasure); e->setArgument(0, v); entity = e; }
+IfcModulusOfSubgradeReactionMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcMoistureDiffusivityMeasure
+IfcUtil::ArgumentType IfcMoistureDiffusivityMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcMoistureDiffusivityMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcMoistureDiffusivityMeasure::is(Type::Enum v) const { return v == IfcMoistureDiffusivityMeasure::Class(); }
+Type::Enum IfcMoistureDiffusivityMeasure::type() const { return Type::IfcMoistureDiffusivityMeasure; }
+Type::Enum IfcMoistureDiffusivityMeasure::Class() { return Type::IfcMoistureDiffusivityMeasure; }
+IfcMoistureDiffusivityMeasure::IfcMoistureDiffusivityMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcMoistureDiffusivityMeasure::IfcMoistureDiffusivityMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcMoistureDiffusivityMeasure); e->setArgument(0, v); entity = e; }
+IfcMoistureDiffusivityMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcMolecularWeightMeasure
+IfcUtil::ArgumentType IfcMolecularWeightMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcMolecularWeightMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcMolecularWeightMeasure::is(Type::Enum v) const { return v == IfcMolecularWeightMeasure::Class(); }
+Type::Enum IfcMolecularWeightMeasure::type() const { return Type::IfcMolecularWeightMeasure; }
+Type::Enum IfcMolecularWeightMeasure::Class() { return Type::IfcMolecularWeightMeasure; }
+IfcMolecularWeightMeasure::IfcMolecularWeightMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcMolecularWeightMeasure::IfcMolecularWeightMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcMolecularWeightMeasure); e->setArgument(0, v); entity = e; }
+IfcMolecularWeightMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcMomentOfInertiaMeasure
+IfcUtil::ArgumentType IfcMomentOfInertiaMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcMomentOfInertiaMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcMomentOfInertiaMeasure::is(Type::Enum v) const { return v == IfcMomentOfInertiaMeasure::Class(); }
+Type::Enum IfcMomentOfInertiaMeasure::type() const { return Type::IfcMomentOfInertiaMeasure; }
+Type::Enum IfcMomentOfInertiaMeasure::Class() { return Type::IfcMomentOfInertiaMeasure; }
+IfcMomentOfInertiaMeasure::IfcMomentOfInertiaMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcMomentOfInertiaMeasure::IfcMomentOfInertiaMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcMomentOfInertiaMeasure); e->setArgument(0, v); entity = e; }
+IfcMomentOfInertiaMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcMonetaryMeasure
+IfcUtil::ArgumentType IfcMonetaryMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcMonetaryMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcMonetaryMeasure::is(Type::Enum v) const { return v == IfcMonetaryMeasure::Class(); }
+Type::Enum IfcMonetaryMeasure::type() const { return Type::IfcMonetaryMeasure; }
+Type::Enum IfcMonetaryMeasure::Class() { return Type::IfcMonetaryMeasure; }
+IfcMonetaryMeasure::IfcMonetaryMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcMonetaryMeasure::IfcMonetaryMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcMonetaryMeasure); e->setArgument(0, v); entity = e; }
+IfcMonetaryMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcMonthInYearNumber
+IfcUtil::ArgumentType IfcMonthInYearNumber::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_INT; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcMonthInYearNumber::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcMonthInYearNumber::is(Type::Enum v) const { return v == IfcMonthInYearNumber::Class(); }
+Type::Enum IfcMonthInYearNumber::type() const { return Type::IfcMonthInYearNumber; }
+Type::Enum IfcMonthInYearNumber::Class() { return Type::IfcMonthInYearNumber; }
+IfcMonthInYearNumber::IfcMonthInYearNumber(IfcAbstractEntity* e) { entity = e; }
+IfcMonthInYearNumber::IfcMonthInYearNumber(int v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcMonthInYearNumber); e->setArgument(0, v); entity = e; }
+IfcMonthInYearNumber::operator int() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcNormalisedRatioMeasure
+IfcUtil::ArgumentType IfcNormalisedRatioMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcNormalisedRatioMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcNormalisedRatioMeasure::is(Type::Enum v) const { return v == Type::IfcNormalisedRatioMeasure || IfcRatioMeasure::is(v); }
+Type::Enum IfcNormalisedRatioMeasure::type() const { return Type::IfcNormalisedRatioMeasure; }
+Type::Enum IfcNormalisedRatioMeasure::Class() { return Type::IfcNormalisedRatioMeasure; }
+IfcNormalisedRatioMeasure::IfcNormalisedRatioMeasure(IfcAbstractEntity* e) : IfcRatioMeasure((IfcAbstractEntity*)0) { entity = e; }
+IfcNormalisedRatioMeasure::IfcNormalisedRatioMeasure(double v) : IfcRatioMeasure((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcNormalisedRatioMeasure); e->setArgument(0, v); entity = e; }
+IfcNormalisedRatioMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcNumericMeasure
+IfcUtil::ArgumentType IfcNumericMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcNumericMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcNumericMeasure::is(Type::Enum v) const { return v == IfcNumericMeasure::Class(); }
+Type::Enum IfcNumericMeasure::type() const { return Type::IfcNumericMeasure; }
+Type::Enum IfcNumericMeasure::Class() { return Type::IfcNumericMeasure; }
+IfcNumericMeasure::IfcNumericMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcNumericMeasure::IfcNumericMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcNumericMeasure); e->setArgument(0, v); entity = e; }
+IfcNumericMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcPHMeasure
+IfcUtil::ArgumentType IfcPHMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcPHMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcPHMeasure::is(Type::Enum v) const { return v == IfcPHMeasure::Class(); }
+Type::Enum IfcPHMeasure::type() const { return Type::IfcPHMeasure; }
+Type::Enum IfcPHMeasure::Class() { return Type::IfcPHMeasure; }
+IfcPHMeasure::IfcPHMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcPHMeasure::IfcPHMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcPHMeasure); e->setArgument(0, v); entity = e; }
+IfcPHMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcParameterValue
+IfcUtil::ArgumentType IfcParameterValue::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcParameterValue::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcParameterValue::is(Type::Enum v) const { return v == IfcParameterValue::Class(); }
+Type::Enum IfcParameterValue::type() const { return Type::IfcParameterValue; }
+Type::Enum IfcParameterValue::Class() { return Type::IfcParameterValue; }
+IfcParameterValue::IfcParameterValue(IfcAbstractEntity* e) { entity = e; }
+IfcParameterValue::IfcParameterValue(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcParameterValue); e->setArgument(0, v); entity = e; }
+IfcParameterValue::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcPlanarForceMeasure
+IfcUtil::ArgumentType IfcPlanarForceMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcPlanarForceMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcPlanarForceMeasure::is(Type::Enum v) const { return v == IfcPlanarForceMeasure::Class(); }
+Type::Enum IfcPlanarForceMeasure::type() const { return Type::IfcPlanarForceMeasure; }
+Type::Enum IfcPlanarForceMeasure::Class() { return Type::IfcPlanarForceMeasure; }
+IfcPlanarForceMeasure::IfcPlanarForceMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcPlanarForceMeasure::IfcPlanarForceMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcPlanarForceMeasure); e->setArgument(0, v); entity = e; }
+IfcPlanarForceMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcPlaneAngleMeasure
+IfcUtil::ArgumentType IfcPlaneAngleMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcPlaneAngleMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcPlaneAngleMeasure::is(Type::Enum v) const { return v == IfcPlaneAngleMeasure::Class(); }
+Type::Enum IfcPlaneAngleMeasure::type() const { return Type::IfcPlaneAngleMeasure; }
+Type::Enum IfcPlaneAngleMeasure::Class() { return Type::IfcPlaneAngleMeasure; }
+IfcPlaneAngleMeasure::IfcPlaneAngleMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcPlaneAngleMeasure::IfcPlaneAngleMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcPlaneAngleMeasure); e->setArgument(0, v); entity = e; }
+IfcPlaneAngleMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcPositiveLengthMeasure
+IfcUtil::ArgumentType IfcPositiveLengthMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcPositiveLengthMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcPositiveLengthMeasure::is(Type::Enum v) const { return v == Type::IfcPositiveLengthMeasure || IfcLengthMeasure::is(v); }
+Type::Enum IfcPositiveLengthMeasure::type() const { return Type::IfcPositiveLengthMeasure; }
+Type::Enum IfcPositiveLengthMeasure::Class() { return Type::IfcPositiveLengthMeasure; }
+IfcPositiveLengthMeasure::IfcPositiveLengthMeasure(IfcAbstractEntity* e) : IfcLengthMeasure((IfcAbstractEntity*)0) { entity = e; }
+IfcPositiveLengthMeasure::IfcPositiveLengthMeasure(double v) : IfcLengthMeasure((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcPositiveLengthMeasure); e->setArgument(0, v); entity = e; }
+IfcPositiveLengthMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcPositivePlaneAngleMeasure
+IfcUtil::ArgumentType IfcPositivePlaneAngleMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcPositivePlaneAngleMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcPositivePlaneAngleMeasure::is(Type::Enum v) const { return v == Type::IfcPositivePlaneAngleMeasure || IfcPlaneAngleMeasure::is(v); }
+Type::Enum IfcPositivePlaneAngleMeasure::type() const { return Type::IfcPositivePlaneAngleMeasure; }
+Type::Enum IfcPositivePlaneAngleMeasure::Class() { return Type::IfcPositivePlaneAngleMeasure; }
+IfcPositivePlaneAngleMeasure::IfcPositivePlaneAngleMeasure(IfcAbstractEntity* e) : IfcPlaneAngleMeasure((IfcAbstractEntity*)0) { entity = e; }
+IfcPositivePlaneAngleMeasure::IfcPositivePlaneAngleMeasure(double v) : IfcPlaneAngleMeasure((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcPositivePlaneAngleMeasure); e->setArgument(0, v); entity = e; }
+IfcPositivePlaneAngleMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcPositiveRatioMeasure
+IfcUtil::ArgumentType IfcPositiveRatioMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcPositiveRatioMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcPositiveRatioMeasure::is(Type::Enum v) const { return v == Type::IfcPositiveRatioMeasure || IfcRatioMeasure::is(v); }
+Type::Enum IfcPositiveRatioMeasure::type() const { return Type::IfcPositiveRatioMeasure; }
+Type::Enum IfcPositiveRatioMeasure::Class() { return Type::IfcPositiveRatioMeasure; }
+IfcPositiveRatioMeasure::IfcPositiveRatioMeasure(IfcAbstractEntity* e) : IfcRatioMeasure((IfcAbstractEntity*)0) { entity = e; }
+IfcPositiveRatioMeasure::IfcPositiveRatioMeasure(double v) : IfcRatioMeasure((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcPositiveRatioMeasure); e->setArgument(0, v); entity = e; }
+IfcPositiveRatioMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcPowerMeasure
+IfcUtil::ArgumentType IfcPowerMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcPowerMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcPowerMeasure::is(Type::Enum v) const { return v == IfcPowerMeasure::Class(); }
+Type::Enum IfcPowerMeasure::type() const { return Type::IfcPowerMeasure; }
+Type::Enum IfcPowerMeasure::Class() { return Type::IfcPowerMeasure; }
+IfcPowerMeasure::IfcPowerMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcPowerMeasure::IfcPowerMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcPowerMeasure); e->setArgument(0, v); entity = e; }
+IfcPowerMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcPresentableText
+IfcUtil::ArgumentType IfcPresentableText::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_STRING; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcPresentableText::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcPresentableText::is(Type::Enum v) const { return v == IfcPresentableText::Class(); }
+Type::Enum IfcPresentableText::type() const { return Type::IfcPresentableText; }
+Type::Enum IfcPresentableText::Class() { return Type::IfcPresentableText; }
+IfcPresentableText::IfcPresentableText(IfcAbstractEntity* e) { entity = e; }
+IfcPresentableText::IfcPresentableText(std::string v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcPresentableText); e->setArgument(0, v); entity = e; }
+IfcPresentableText::operator std::string() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcPressureMeasure
+IfcUtil::ArgumentType IfcPressureMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcPressureMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcPressureMeasure::is(Type::Enum v) const { return v == IfcPressureMeasure::Class(); }
+Type::Enum IfcPressureMeasure::type() const { return Type::IfcPressureMeasure; }
+Type::Enum IfcPressureMeasure::Class() { return Type::IfcPressureMeasure; }
+IfcPressureMeasure::IfcPressureMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcPressureMeasure::IfcPressureMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcPressureMeasure); e->setArgument(0, v); entity = e; }
+IfcPressureMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcRadioActivityMeasure
+IfcUtil::ArgumentType IfcRadioActivityMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcRadioActivityMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcRadioActivityMeasure::is(Type::Enum v) const { return v == IfcRadioActivityMeasure::Class(); }
+Type::Enum IfcRadioActivityMeasure::type() const { return Type::IfcRadioActivityMeasure; }
+Type::Enum IfcRadioActivityMeasure::Class() { return Type::IfcRadioActivityMeasure; }
+IfcRadioActivityMeasure::IfcRadioActivityMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcRadioActivityMeasure::IfcRadioActivityMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcRadioActivityMeasure); e->setArgument(0, v); entity = e; }
+IfcRadioActivityMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcRatioMeasure
+IfcUtil::ArgumentType IfcRatioMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcRatioMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcRatioMeasure::is(Type::Enum v) const { return v == IfcRatioMeasure::Class(); }
+Type::Enum IfcRatioMeasure::type() const { return Type::IfcRatioMeasure; }
+Type::Enum IfcRatioMeasure::Class() { return Type::IfcRatioMeasure; }
+IfcRatioMeasure::IfcRatioMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcRatioMeasure::IfcRatioMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcRatioMeasure); e->setArgument(0, v); entity = e; }
+IfcRatioMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcReal
+IfcUtil::ArgumentType IfcReal::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcReal::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcReal::is(Type::Enum v) const { return v == IfcReal::Class(); }
+Type::Enum IfcReal::type() const { return Type::IfcReal; }
+Type::Enum IfcReal::Class() { return Type::IfcReal; }
+IfcReal::IfcReal(IfcAbstractEntity* e) { entity = e; }
+IfcReal::IfcReal(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcReal); e->setArgument(0, v); entity = e; }
+IfcReal::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcRotationalFrequencyMeasure
+IfcUtil::ArgumentType IfcRotationalFrequencyMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcRotationalFrequencyMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcRotationalFrequencyMeasure::is(Type::Enum v) const { return v == IfcRotationalFrequencyMeasure::Class(); }
+Type::Enum IfcRotationalFrequencyMeasure::type() const { return Type::IfcRotationalFrequencyMeasure; }
+Type::Enum IfcRotationalFrequencyMeasure::Class() { return Type::IfcRotationalFrequencyMeasure; }
+IfcRotationalFrequencyMeasure::IfcRotationalFrequencyMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcRotationalFrequencyMeasure::IfcRotationalFrequencyMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcRotationalFrequencyMeasure); e->setArgument(0, v); entity = e; }
+IfcRotationalFrequencyMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcRotationalMassMeasure
+IfcUtil::ArgumentType IfcRotationalMassMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcRotationalMassMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcRotationalMassMeasure::is(Type::Enum v) const { return v == IfcRotationalMassMeasure::Class(); }
+Type::Enum IfcRotationalMassMeasure::type() const { return Type::IfcRotationalMassMeasure; }
+Type::Enum IfcRotationalMassMeasure::Class() { return Type::IfcRotationalMassMeasure; }
+IfcRotationalMassMeasure::IfcRotationalMassMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcRotationalMassMeasure::IfcRotationalMassMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcRotationalMassMeasure); e->setArgument(0, v); entity = e; }
+IfcRotationalMassMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcRotationalStiffnessMeasure
+IfcUtil::ArgumentType IfcRotationalStiffnessMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcRotationalStiffnessMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcRotationalStiffnessMeasure::is(Type::Enum v) const { return v == IfcRotationalStiffnessMeasure::Class(); }
+Type::Enum IfcRotationalStiffnessMeasure::type() const { return Type::IfcRotationalStiffnessMeasure; }
+Type::Enum IfcRotationalStiffnessMeasure::Class() { return Type::IfcRotationalStiffnessMeasure; }
+IfcRotationalStiffnessMeasure::IfcRotationalStiffnessMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcRotationalStiffnessMeasure::IfcRotationalStiffnessMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcRotationalStiffnessMeasure); e->setArgument(0, v); entity = e; }
+IfcRotationalStiffnessMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcSecondInMinute
+IfcUtil::ArgumentType IfcSecondInMinute::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcSecondInMinute::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcSecondInMinute::is(Type::Enum v) const { return v == IfcSecondInMinute::Class(); }
+Type::Enum IfcSecondInMinute::type() const { return Type::IfcSecondInMinute; }
+Type::Enum IfcSecondInMinute::Class() { return Type::IfcSecondInMinute; }
+IfcSecondInMinute::IfcSecondInMinute(IfcAbstractEntity* e) { entity = e; }
+IfcSecondInMinute::IfcSecondInMinute(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcSecondInMinute); e->setArgument(0, v); entity = e; }
+IfcSecondInMinute::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcSectionModulusMeasure
+IfcUtil::ArgumentType IfcSectionModulusMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcSectionModulusMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcSectionModulusMeasure::is(Type::Enum v) const { return v == IfcSectionModulusMeasure::Class(); }
+Type::Enum IfcSectionModulusMeasure::type() const { return Type::IfcSectionModulusMeasure; }
+Type::Enum IfcSectionModulusMeasure::Class() { return Type::IfcSectionModulusMeasure; }
+IfcSectionModulusMeasure::IfcSectionModulusMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcSectionModulusMeasure::IfcSectionModulusMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcSectionModulusMeasure); e->setArgument(0, v); entity = e; }
+IfcSectionModulusMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcSectionalAreaIntegralMeasure
+IfcUtil::ArgumentType IfcSectionalAreaIntegralMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcSectionalAreaIntegralMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcSectionalAreaIntegralMeasure::is(Type::Enum v) const { return v == IfcSectionalAreaIntegralMeasure::Class(); }
+Type::Enum IfcSectionalAreaIntegralMeasure::type() const { return Type::IfcSectionalAreaIntegralMeasure; }
+Type::Enum IfcSectionalAreaIntegralMeasure::Class() { return Type::IfcSectionalAreaIntegralMeasure; }
+IfcSectionalAreaIntegralMeasure::IfcSectionalAreaIntegralMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcSectionalAreaIntegralMeasure::IfcSectionalAreaIntegralMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcSectionalAreaIntegralMeasure); e->setArgument(0, v); entity = e; }
+IfcSectionalAreaIntegralMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcShearModulusMeasure
+IfcUtil::ArgumentType IfcShearModulusMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcShearModulusMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcShearModulusMeasure::is(Type::Enum v) const { return v == IfcShearModulusMeasure::Class(); }
+Type::Enum IfcShearModulusMeasure::type() const { return Type::IfcShearModulusMeasure; }
+Type::Enum IfcShearModulusMeasure::Class() { return Type::IfcShearModulusMeasure; }
+IfcShearModulusMeasure::IfcShearModulusMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcShearModulusMeasure::IfcShearModulusMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcShearModulusMeasure); e->setArgument(0, v); entity = e; }
+IfcShearModulusMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcSolidAngleMeasure
+IfcUtil::ArgumentType IfcSolidAngleMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcSolidAngleMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcSolidAngleMeasure::is(Type::Enum v) const { return v == IfcSolidAngleMeasure::Class(); }
+Type::Enum IfcSolidAngleMeasure::type() const { return Type::IfcSolidAngleMeasure; }
+Type::Enum IfcSolidAngleMeasure::Class() { return Type::IfcSolidAngleMeasure; }
+IfcSolidAngleMeasure::IfcSolidAngleMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcSolidAngleMeasure::IfcSolidAngleMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcSolidAngleMeasure); e->setArgument(0, v); entity = e; }
+IfcSolidAngleMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcSoundPowerMeasure
+IfcUtil::ArgumentType IfcSoundPowerMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcSoundPowerMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcSoundPowerMeasure::is(Type::Enum v) const { return v == IfcSoundPowerMeasure::Class(); }
+Type::Enum IfcSoundPowerMeasure::type() const { return Type::IfcSoundPowerMeasure; }
+Type::Enum IfcSoundPowerMeasure::Class() { return Type::IfcSoundPowerMeasure; }
+IfcSoundPowerMeasure::IfcSoundPowerMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcSoundPowerMeasure::IfcSoundPowerMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcSoundPowerMeasure); e->setArgument(0, v); entity = e; }
+IfcSoundPowerMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcSoundPressureMeasure
+IfcUtil::ArgumentType IfcSoundPressureMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcSoundPressureMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcSoundPressureMeasure::is(Type::Enum v) const { return v == IfcSoundPressureMeasure::Class(); }
+Type::Enum IfcSoundPressureMeasure::type() const { return Type::IfcSoundPressureMeasure; }
+Type::Enum IfcSoundPressureMeasure::Class() { return Type::IfcSoundPressureMeasure; }
+IfcSoundPressureMeasure::IfcSoundPressureMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcSoundPressureMeasure::IfcSoundPressureMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcSoundPressureMeasure); e->setArgument(0, v); entity = e; }
+IfcSoundPressureMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcSpecificHeatCapacityMeasure
+IfcUtil::ArgumentType IfcSpecificHeatCapacityMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcSpecificHeatCapacityMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcSpecificHeatCapacityMeasure::is(Type::Enum v) const { return v == IfcSpecificHeatCapacityMeasure::Class(); }
+Type::Enum IfcSpecificHeatCapacityMeasure::type() const { return Type::IfcSpecificHeatCapacityMeasure; }
+Type::Enum IfcSpecificHeatCapacityMeasure::Class() { return Type::IfcSpecificHeatCapacityMeasure; }
+IfcSpecificHeatCapacityMeasure::IfcSpecificHeatCapacityMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcSpecificHeatCapacityMeasure::IfcSpecificHeatCapacityMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcSpecificHeatCapacityMeasure); e->setArgument(0, v); entity = e; }
+IfcSpecificHeatCapacityMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcSpecularExponent
+IfcUtil::ArgumentType IfcSpecularExponent::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcSpecularExponent::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcSpecularExponent::is(Type::Enum v) const { return v == IfcSpecularExponent::Class(); }
+Type::Enum IfcSpecularExponent::type() const { return Type::IfcSpecularExponent; }
+Type::Enum IfcSpecularExponent::Class() { return Type::IfcSpecularExponent; }
+IfcSpecularExponent::IfcSpecularExponent(IfcAbstractEntity* e) { entity = e; }
+IfcSpecularExponent::IfcSpecularExponent(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcSpecularExponent); e->setArgument(0, v); entity = e; }
+IfcSpecularExponent::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcSpecularRoughness
+IfcUtil::ArgumentType IfcSpecularRoughness::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcSpecularRoughness::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcSpecularRoughness::is(Type::Enum v) const { return v == IfcSpecularRoughness::Class(); }
+Type::Enum IfcSpecularRoughness::type() const { return Type::IfcSpecularRoughness; }
+Type::Enum IfcSpecularRoughness::Class() { return Type::IfcSpecularRoughness; }
+IfcSpecularRoughness::IfcSpecularRoughness(IfcAbstractEntity* e) { entity = e; }
+IfcSpecularRoughness::IfcSpecularRoughness(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcSpecularRoughness); e->setArgument(0, v); entity = e; }
+IfcSpecularRoughness::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcTemperatureGradientMeasure
+IfcUtil::ArgumentType IfcTemperatureGradientMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcTemperatureGradientMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcTemperatureGradientMeasure::is(Type::Enum v) const { return v == IfcTemperatureGradientMeasure::Class(); }
+Type::Enum IfcTemperatureGradientMeasure::type() const { return Type::IfcTemperatureGradientMeasure; }
+Type::Enum IfcTemperatureGradientMeasure::Class() { return Type::IfcTemperatureGradientMeasure; }
+IfcTemperatureGradientMeasure::IfcTemperatureGradientMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcTemperatureGradientMeasure::IfcTemperatureGradientMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcTemperatureGradientMeasure); e->setArgument(0, v); entity = e; }
+IfcTemperatureGradientMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcText
+IfcUtil::ArgumentType IfcText::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_STRING; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcText::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcText::is(Type::Enum v) const { return v == IfcText::Class(); }
+Type::Enum IfcText::type() const { return Type::IfcText; }
+Type::Enum IfcText::Class() { return Type::IfcText; }
+IfcText::IfcText(IfcAbstractEntity* e) { entity = e; }
+IfcText::IfcText(std::string v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcText); e->setArgument(0, v); entity = e; }
+IfcText::operator std::string() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcTextAlignment
+IfcUtil::ArgumentType IfcTextAlignment::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_STRING; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcTextAlignment::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcTextAlignment::is(Type::Enum v) const { return v == IfcTextAlignment::Class(); }
+Type::Enum IfcTextAlignment::type() const { return Type::IfcTextAlignment; }
+Type::Enum IfcTextAlignment::Class() { return Type::IfcTextAlignment; }
+IfcTextAlignment::IfcTextAlignment(IfcAbstractEntity* e) { entity = e; }
+IfcTextAlignment::IfcTextAlignment(std::string v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcTextAlignment); e->setArgument(0, v); entity = e; }
+IfcTextAlignment::operator std::string() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcTextDecoration
+IfcUtil::ArgumentType IfcTextDecoration::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_STRING; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcTextDecoration::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcTextDecoration::is(Type::Enum v) const { return v == IfcTextDecoration::Class(); }
+Type::Enum IfcTextDecoration::type() const { return Type::IfcTextDecoration; }
+Type::Enum IfcTextDecoration::Class() { return Type::IfcTextDecoration; }
+IfcTextDecoration::IfcTextDecoration(IfcAbstractEntity* e) { entity = e; }
+IfcTextDecoration::IfcTextDecoration(std::string v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcTextDecoration); e->setArgument(0, v); entity = e; }
+IfcTextDecoration::operator std::string() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcTextFontName
+IfcUtil::ArgumentType IfcTextFontName::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_STRING; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcTextFontName::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcTextFontName::is(Type::Enum v) const { return v == IfcTextFontName::Class(); }
+Type::Enum IfcTextFontName::type() const { return Type::IfcTextFontName; }
+Type::Enum IfcTextFontName::Class() { return Type::IfcTextFontName; }
+IfcTextFontName::IfcTextFontName(IfcAbstractEntity* e) { entity = e; }
+IfcTextFontName::IfcTextFontName(std::string v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcTextFontName); e->setArgument(0, v); entity = e; }
+IfcTextFontName::operator std::string() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcTextTransformation
+IfcUtil::ArgumentType IfcTextTransformation::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_STRING; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcTextTransformation::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcTextTransformation::is(Type::Enum v) const { return v == IfcTextTransformation::Class(); }
+Type::Enum IfcTextTransformation::type() const { return Type::IfcTextTransformation; }
+Type::Enum IfcTextTransformation::Class() { return Type::IfcTextTransformation; }
+IfcTextTransformation::IfcTextTransformation(IfcAbstractEntity* e) { entity = e; }
+IfcTextTransformation::IfcTextTransformation(std::string v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcTextTransformation); e->setArgument(0, v); entity = e; }
+IfcTextTransformation::operator std::string() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcThermalAdmittanceMeasure
+IfcUtil::ArgumentType IfcThermalAdmittanceMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcThermalAdmittanceMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcThermalAdmittanceMeasure::is(Type::Enum v) const { return v == IfcThermalAdmittanceMeasure::Class(); }
+Type::Enum IfcThermalAdmittanceMeasure::type() const { return Type::IfcThermalAdmittanceMeasure; }
+Type::Enum IfcThermalAdmittanceMeasure::Class() { return Type::IfcThermalAdmittanceMeasure; }
+IfcThermalAdmittanceMeasure::IfcThermalAdmittanceMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcThermalAdmittanceMeasure::IfcThermalAdmittanceMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcThermalAdmittanceMeasure); e->setArgument(0, v); entity = e; }
+IfcThermalAdmittanceMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcThermalConductivityMeasure
+IfcUtil::ArgumentType IfcThermalConductivityMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcThermalConductivityMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcThermalConductivityMeasure::is(Type::Enum v) const { return v == IfcThermalConductivityMeasure::Class(); }
+Type::Enum IfcThermalConductivityMeasure::type() const { return Type::IfcThermalConductivityMeasure; }
+Type::Enum IfcThermalConductivityMeasure::Class() { return Type::IfcThermalConductivityMeasure; }
+IfcThermalConductivityMeasure::IfcThermalConductivityMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcThermalConductivityMeasure::IfcThermalConductivityMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcThermalConductivityMeasure); e->setArgument(0, v); entity = e; }
+IfcThermalConductivityMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcThermalExpansionCoefficientMeasure
+IfcUtil::ArgumentType IfcThermalExpansionCoefficientMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcThermalExpansionCoefficientMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcThermalExpansionCoefficientMeasure::is(Type::Enum v) const { return v == IfcThermalExpansionCoefficientMeasure::Class(); }
+Type::Enum IfcThermalExpansionCoefficientMeasure::type() const { return Type::IfcThermalExpansionCoefficientMeasure; }
+Type::Enum IfcThermalExpansionCoefficientMeasure::Class() { return Type::IfcThermalExpansionCoefficientMeasure; }
+IfcThermalExpansionCoefficientMeasure::IfcThermalExpansionCoefficientMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcThermalExpansionCoefficientMeasure::IfcThermalExpansionCoefficientMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcThermalExpansionCoefficientMeasure); e->setArgument(0, v); entity = e; }
+IfcThermalExpansionCoefficientMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcThermalResistanceMeasure
+IfcUtil::ArgumentType IfcThermalResistanceMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcThermalResistanceMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcThermalResistanceMeasure::is(Type::Enum v) const { return v == IfcThermalResistanceMeasure::Class(); }
+Type::Enum IfcThermalResistanceMeasure::type() const { return Type::IfcThermalResistanceMeasure; }
+Type::Enum IfcThermalResistanceMeasure::Class() { return Type::IfcThermalResistanceMeasure; }
+IfcThermalResistanceMeasure::IfcThermalResistanceMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcThermalResistanceMeasure::IfcThermalResistanceMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcThermalResistanceMeasure); e->setArgument(0, v); entity = e; }
+IfcThermalResistanceMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcThermalTransmittanceMeasure
+IfcUtil::ArgumentType IfcThermalTransmittanceMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcThermalTransmittanceMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcThermalTransmittanceMeasure::is(Type::Enum v) const { return v == IfcThermalTransmittanceMeasure::Class(); }
+Type::Enum IfcThermalTransmittanceMeasure::type() const { return Type::IfcThermalTransmittanceMeasure; }
+Type::Enum IfcThermalTransmittanceMeasure::Class() { return Type::IfcThermalTransmittanceMeasure; }
+IfcThermalTransmittanceMeasure::IfcThermalTransmittanceMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcThermalTransmittanceMeasure::IfcThermalTransmittanceMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcThermalTransmittanceMeasure); e->setArgument(0, v); entity = e; }
+IfcThermalTransmittanceMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcThermodynamicTemperatureMeasure
+IfcUtil::ArgumentType IfcThermodynamicTemperatureMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcThermodynamicTemperatureMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcThermodynamicTemperatureMeasure::is(Type::Enum v) const { return v == IfcThermodynamicTemperatureMeasure::Class(); }
+Type::Enum IfcThermodynamicTemperatureMeasure::type() const { return Type::IfcThermodynamicTemperatureMeasure; }
+Type::Enum IfcThermodynamicTemperatureMeasure::Class() { return Type::IfcThermodynamicTemperatureMeasure; }
+IfcThermodynamicTemperatureMeasure::IfcThermodynamicTemperatureMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcThermodynamicTemperatureMeasure::IfcThermodynamicTemperatureMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcThermodynamicTemperatureMeasure); e->setArgument(0, v); entity = e; }
+IfcThermodynamicTemperatureMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcTimeMeasure
+IfcUtil::ArgumentType IfcTimeMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcTimeMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcTimeMeasure::is(Type::Enum v) const { return v == IfcTimeMeasure::Class(); }
+Type::Enum IfcTimeMeasure::type() const { return Type::IfcTimeMeasure; }
+Type::Enum IfcTimeMeasure::Class() { return Type::IfcTimeMeasure; }
+IfcTimeMeasure::IfcTimeMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcTimeMeasure::IfcTimeMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcTimeMeasure); e->setArgument(0, v); entity = e; }
+IfcTimeMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcTimeStamp
+IfcUtil::ArgumentType IfcTimeStamp::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_INT; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcTimeStamp::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcTimeStamp::is(Type::Enum v) const { return v == IfcTimeStamp::Class(); }
+Type::Enum IfcTimeStamp::type() const { return Type::IfcTimeStamp; }
+Type::Enum IfcTimeStamp::Class() { return Type::IfcTimeStamp; }
+IfcTimeStamp::IfcTimeStamp(IfcAbstractEntity* e) { entity = e; }
+IfcTimeStamp::IfcTimeStamp(int v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcTimeStamp); e->setArgument(0, v); entity = e; }
+IfcTimeStamp::operator int() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcTorqueMeasure
+IfcUtil::ArgumentType IfcTorqueMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcTorqueMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcTorqueMeasure::is(Type::Enum v) const { return v == IfcTorqueMeasure::Class(); }
+Type::Enum IfcTorqueMeasure::type() const { return Type::IfcTorqueMeasure; }
+Type::Enum IfcTorqueMeasure::Class() { return Type::IfcTorqueMeasure; }
+IfcTorqueMeasure::IfcTorqueMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcTorqueMeasure::IfcTorqueMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcTorqueMeasure); e->setArgument(0, v); entity = e; }
+IfcTorqueMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcVaporPermeabilityMeasure
+IfcUtil::ArgumentType IfcVaporPermeabilityMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcVaporPermeabilityMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcVaporPermeabilityMeasure::is(Type::Enum v) const { return v == IfcVaporPermeabilityMeasure::Class(); }
+Type::Enum IfcVaporPermeabilityMeasure::type() const { return Type::IfcVaporPermeabilityMeasure; }
+Type::Enum IfcVaporPermeabilityMeasure::Class() { return Type::IfcVaporPermeabilityMeasure; }
+IfcVaporPermeabilityMeasure::IfcVaporPermeabilityMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcVaporPermeabilityMeasure::IfcVaporPermeabilityMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcVaporPermeabilityMeasure); e->setArgument(0, v); entity = e; }
+IfcVaporPermeabilityMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcVolumeMeasure
+IfcUtil::ArgumentType IfcVolumeMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcVolumeMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcVolumeMeasure::is(Type::Enum v) const { return v == IfcVolumeMeasure::Class(); }
+Type::Enum IfcVolumeMeasure::type() const { return Type::IfcVolumeMeasure; }
+Type::Enum IfcVolumeMeasure::Class() { return Type::IfcVolumeMeasure; }
+IfcVolumeMeasure::IfcVolumeMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcVolumeMeasure::IfcVolumeMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcVolumeMeasure); e->setArgument(0, v); entity = e; }
+IfcVolumeMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcVolumetricFlowRateMeasure
+IfcUtil::ArgumentType IfcVolumetricFlowRateMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcVolumetricFlowRateMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcVolumetricFlowRateMeasure::is(Type::Enum v) const { return v == IfcVolumetricFlowRateMeasure::Class(); }
+Type::Enum IfcVolumetricFlowRateMeasure::type() const { return Type::IfcVolumetricFlowRateMeasure; }
+Type::Enum IfcVolumetricFlowRateMeasure::Class() { return Type::IfcVolumetricFlowRateMeasure; }
+IfcVolumetricFlowRateMeasure::IfcVolumetricFlowRateMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcVolumetricFlowRateMeasure::IfcVolumetricFlowRateMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcVolumetricFlowRateMeasure); e->setArgument(0, v); entity = e; }
+IfcVolumetricFlowRateMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcWarpingConstantMeasure
+IfcUtil::ArgumentType IfcWarpingConstantMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcWarpingConstantMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcWarpingConstantMeasure::is(Type::Enum v) const { return v == IfcWarpingConstantMeasure::Class(); }
+Type::Enum IfcWarpingConstantMeasure::type() const { return Type::IfcWarpingConstantMeasure; }
+Type::Enum IfcWarpingConstantMeasure::Class() { return Type::IfcWarpingConstantMeasure; }
+IfcWarpingConstantMeasure::IfcWarpingConstantMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcWarpingConstantMeasure::IfcWarpingConstantMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcWarpingConstantMeasure); e->setArgument(0, v); entity = e; }
+IfcWarpingConstantMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcWarpingMomentMeasure
+IfcUtil::ArgumentType IfcWarpingMomentMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcWarpingMomentMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcWarpingMomentMeasure::is(Type::Enum v) const { return v == IfcWarpingMomentMeasure::Class(); }
+Type::Enum IfcWarpingMomentMeasure::type() const { return Type::IfcWarpingMomentMeasure; }
+Type::Enum IfcWarpingMomentMeasure::Class() { return Type::IfcWarpingMomentMeasure; }
+IfcWarpingMomentMeasure::IfcWarpingMomentMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcWarpingMomentMeasure::IfcWarpingMomentMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcWarpingMomentMeasure); e->setArgument(0, v); entity = e; }
+IfcWarpingMomentMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcYearNumber
+IfcUtil::ArgumentType IfcYearNumber::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_INT; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcYearNumber::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcYearNumber::is(Type::Enum v) const { return v == IfcYearNumber::Class(); }
+Type::Enum IfcYearNumber::type() const { return Type::IfcYearNumber; }
+Type::Enum IfcYearNumber::Class() { return Type::IfcYearNumber; }
+IfcYearNumber::IfcYearNumber(IfcAbstractEntity* e) { entity = e; }
+IfcYearNumber::IfcYearNumber(int v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcYearNumber); e->setArgument(0, v); entity = e; }
+IfcYearNumber::operator int() const { return *entity->getArgument(0); }
 
-#define RETURN_AS_SINGLE(T,a)     return reinterpret_pointer_cast<IfcBaseClass,T>(*entity->getArgument(a));
-
-#define RETURN_AS_LIST(T,a)      IfcEntities e = *entity->getArgument(a);      SHARED_PTR< IfcTemplatedEntityList<T> > l ( new IfcTemplatedEntityList<T>() );      for ( IfcEntityList::it it = e->begin(); it != e->end(); ++ it ) {          l->push(reinterpret_pointer_cast<IfcBaseClass,T>(*it));     }      return l;
 
 // Function implementations for Ifc2DCompositeCurve
 bool Ifc2DCompositeCurve::is(Type::Enum v) const { return v == Type::Ifc2DCompositeCurve || IfcCompositeCurve::is(v); }
 Type::Enum Ifc2DCompositeCurve::type() const { return Type::Ifc2DCompositeCurve; }
 Type::Enum Ifc2DCompositeCurve::Class() { return Type::Ifc2DCompositeCurve; }
-Ifc2DCompositeCurve::Ifc2DCompositeCurve(IfcAbstractEntityPtr e) : IfcCompositeCurve((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::Ifc2DCompositeCurve)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-Ifc2DCompositeCurve::Ifc2DCompositeCurve(SHARED_PTR< IfcTemplatedEntityList< IfcCompositeCurveSegment > > v1_Segments, bool v2_SelfIntersect) : IfcCompositeCurve((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Segments)->generalize()); e->setArgument(1,(v2_SelfIntersect)); entity = e; EntityBuffer::Add(this); }
+Ifc2DCompositeCurve::Ifc2DCompositeCurve(IfcAbstractEntity* e) : IfcCompositeCurve((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::Ifc2DCompositeCurve)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+Ifc2DCompositeCurve::Ifc2DCompositeCurve(IfcTemplatedEntityList< IfcCompositeCurveSegment >::ptr v1_Segments, bool v2_SelfIntersect) : IfcCompositeCurve((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Segments)->generalize()); e->setArgument(1,(v2_SelfIntersect)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcActionRequest
-IfcIdentifier IfcActionRequest::RequestID() { return *entity->getArgument(5); }
-void IfcActionRequest::setRequestID(IfcIdentifier v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+std::string IfcActionRequest::RequestID() const { return *entity->getArgument(5); }
+void IfcActionRequest::setRequestID(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
 bool IfcActionRequest::is(Type::Enum v) const { return v == Type::IfcActionRequest || IfcControl::is(v); }
 Type::Enum IfcActionRequest::type() const { return Type::IfcActionRequest; }
 Type::Enum IfcActionRequest::Class() { return Type::IfcActionRequest; }
-IfcActionRequest::IfcActionRequest(IfcAbstractEntityPtr e) : IfcControl((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcActionRequest)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcActionRequest::IfcActionRequest(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcIdentifier v6_RequestID) : IfcControl((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_RequestID)); entity = e; EntityBuffer::Add(this); }
+IfcActionRequest::IfcActionRequest(IfcAbstractEntity* e) : IfcControl((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcActionRequest)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcActionRequest::IfcActionRequest(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, std::string v6_RequestID) : IfcControl((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_RequestID)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcActor
-IfcActorSelect IfcActor::TheActor() { return *entity->getArgument(5); }
-void IfcActor::setTheActor(IfcActorSelect v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-IfcRelAssignsToActor::list IfcActor::IsActingUpon() { RETURN_INVERSE(IfcRelAssignsToActor) }
+IfcActorSelect* IfcActor::TheActor() const { return (IfcActorSelect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(5))); }
+void IfcActor::setTheActor(IfcActorSelect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+IfcRelAssignsToActor::list::ptr IfcActor::IsActingUpon() const { return entity->getInverse(Type::IfcRelAssignsToActor, 6)->as<IfcRelAssignsToActor>(); }
 bool IfcActor::is(Type::Enum v) const { return v == Type::IfcActor || IfcObject::is(v); }
 Type::Enum IfcActor::type() const { return Type::IfcActor; }
 Type::Enum IfcActor::Class() { return Type::IfcActor; }
-IfcActor::IfcActor(IfcAbstractEntityPtr e) : IfcObject((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcActor)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcActor::IfcActor(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcActorSelect v6_TheActor) : IfcObject((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_TheActor)); entity = e; EntityBuffer::Add(this); }
+IfcActor::IfcActor(IfcAbstractEntity* e) : IfcObject((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcActor)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcActor::IfcActor(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcActorSelect* v6_TheActor) : IfcObject((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_TheActor)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcActorRole
-IfcRoleEnum::IfcRoleEnum IfcActorRole::Role() { return IfcRoleEnum::FromString(*entity->getArgument(0)); }
+IfcRoleEnum::IfcRoleEnum IfcActorRole::Role() const { return IfcRoleEnum::FromString(*entity->getArgument(0)); }
 void IfcActorRole::setRole(IfcRoleEnum::IfcRoleEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v,IfcRoleEnum::ToString(v)); }
-bool IfcActorRole::hasUserDefinedRole() { return !entity->getArgument(1)->isNull(); }
-IfcLabel IfcActorRole::UserDefinedRole() { return *entity->getArgument(1); }
-void IfcActorRole::setUserDefinedRole(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-bool IfcActorRole::hasDescription() { return !entity->getArgument(2)->isNull(); }
-IfcText IfcActorRole::Description() { return *entity->getArgument(2); }
-void IfcActorRole::setDescription(IfcText v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+bool IfcActorRole::hasUserDefinedRole() const { return !entity->getArgument(1)->isNull(); }
+std::string IfcActorRole::UserDefinedRole() const { return *entity->getArgument(1); }
+void IfcActorRole::setUserDefinedRole(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+bool IfcActorRole::hasDescription() const { return !entity->getArgument(2)->isNull(); }
+std::string IfcActorRole::Description() const { return *entity->getArgument(2); }
+void IfcActorRole::setDescription(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
 bool IfcActorRole::is(Type::Enum v) const { return v == Type::IfcActorRole; }
 Type::Enum IfcActorRole::type() const { return Type::IfcActorRole; }
 Type::Enum IfcActorRole::Class() { return Type::IfcActorRole; }
-IfcActorRole::IfcActorRole(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcActorRole)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcActorRole::IfcActorRole(IfcRoleEnum::IfcRoleEnum v1_Role, boost::optional< IfcLabel > v2_UserDefinedRole, boost::optional< IfcText > v3_Description) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,v1_Role,IfcRoleEnum::ToString(v1_Role)); if (v2_UserDefinedRole) { e->setArgument(1,(*v2_UserDefinedRole)); } else { e->setArgument(1); } if (v3_Description) { e->setArgument(2,(*v3_Description)); } else { e->setArgument(2); } entity = e; EntityBuffer::Add(this); }
+IfcActorRole::IfcActorRole(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcActorRole)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcActorRole::IfcActorRole(IfcRoleEnum::IfcRoleEnum v1_Role, boost::optional< std::string > v2_UserDefinedRole, boost::optional< std::string > v3_Description) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,v1_Role,IfcRoleEnum::ToString(v1_Role)); if (v2_UserDefinedRole) { e->setArgument(1,(*v2_UserDefinedRole)); } else { e->setArgument(1); } if (v3_Description) { e->setArgument(2,(*v3_Description)); } else { e->setArgument(2); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcActuatorType
-IfcActuatorTypeEnum::IfcActuatorTypeEnum IfcActuatorType::PredefinedType() { return IfcActuatorTypeEnum::FromString(*entity->getArgument(9)); }
+IfcActuatorTypeEnum::IfcActuatorTypeEnum IfcActuatorType::PredefinedType() const { return IfcActuatorTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcActuatorType::setPredefinedType(IfcActuatorTypeEnum::IfcActuatorTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcActuatorTypeEnum::ToString(v)); }
 bool IfcActuatorType::is(Type::Enum v) const { return v == Type::IfcActuatorType || IfcDistributionControlElementType::is(v); }
 Type::Enum IfcActuatorType::type() const { return Type::IfcActuatorType; }
 Type::Enum IfcActuatorType::Class() { return Type::IfcActuatorType; }
-IfcActuatorType::IfcActuatorType(IfcAbstractEntityPtr e) : IfcDistributionControlElementType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcActuatorType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcActuatorType::IfcActuatorType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcActuatorTypeEnum::IfcActuatorTypeEnum v10_PredefinedType) : IfcDistributionControlElementType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcActuatorTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcActuatorType::IfcActuatorType(IfcAbstractEntity* e) : IfcDistributionControlElementType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcActuatorType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcActuatorType::IfcActuatorType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcActuatorTypeEnum::IfcActuatorTypeEnum v10_PredefinedType) : IfcDistributionControlElementType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcActuatorTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcAddress
-bool IfcAddress::hasPurpose() { return !entity->getArgument(0)->isNull(); }
-IfcAddressTypeEnum::IfcAddressTypeEnum IfcAddress::Purpose() { return IfcAddressTypeEnum::FromString(*entity->getArgument(0)); }
+bool IfcAddress::hasPurpose() const { return !entity->getArgument(0)->isNull(); }
+IfcAddressTypeEnum::IfcAddressTypeEnum IfcAddress::Purpose() const { return IfcAddressTypeEnum::FromString(*entity->getArgument(0)); }
 void IfcAddress::setPurpose(IfcAddressTypeEnum::IfcAddressTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v,IfcAddressTypeEnum::ToString(v)); }
-bool IfcAddress::hasDescription() { return !entity->getArgument(1)->isNull(); }
-IfcText IfcAddress::Description() { return *entity->getArgument(1); }
-void IfcAddress::setDescription(IfcText v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-bool IfcAddress::hasUserDefinedPurpose() { return !entity->getArgument(2)->isNull(); }
-IfcLabel IfcAddress::UserDefinedPurpose() { return *entity->getArgument(2); }
-void IfcAddress::setUserDefinedPurpose(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-IfcPerson::list IfcAddress::OfPerson() { RETURN_INVERSE(IfcPerson) }
-IfcOrganization::list IfcAddress::OfOrganization() { RETURN_INVERSE(IfcOrganization) }
+bool IfcAddress::hasDescription() const { return !entity->getArgument(1)->isNull(); }
+std::string IfcAddress::Description() const { return *entity->getArgument(1); }
+void IfcAddress::setDescription(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+bool IfcAddress::hasUserDefinedPurpose() const { return !entity->getArgument(2)->isNull(); }
+std::string IfcAddress::UserDefinedPurpose() const { return *entity->getArgument(2); }
+void IfcAddress::setUserDefinedPurpose(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+IfcPerson::list::ptr IfcAddress::OfPerson() const { return entity->getInverse(Type::IfcPerson, 7)->as<IfcPerson>(); }
+IfcOrganization::list::ptr IfcAddress::OfOrganization() const { return entity->getInverse(Type::IfcOrganization, 4)->as<IfcOrganization>(); }
 bool IfcAddress::is(Type::Enum v) const { return v == Type::IfcAddress; }
 Type::Enum IfcAddress::type() const { return Type::IfcAddress; }
 Type::Enum IfcAddress::Class() { return Type::IfcAddress; }
-IfcAddress::IfcAddress(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcAddress)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcAddress::IfcAddress(boost::optional< IfcAddressTypeEnum::IfcAddressTypeEnum > v1_Purpose, boost::optional< IfcText > v2_Description, boost::optional< IfcLabel > v3_UserDefinedPurpose) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Purpose) { e->setArgument(0,*v1_Purpose,IfcAddressTypeEnum::ToString(*v1_Purpose)); } else { e->setArgument(0); } if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } if (v3_UserDefinedPurpose) { e->setArgument(2,(*v3_UserDefinedPurpose)); } else { e->setArgument(2); } entity = e; EntityBuffer::Add(this); }
+IfcAddress::IfcAddress(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcAddress)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcAddress::IfcAddress(boost::optional< IfcAddressTypeEnum::IfcAddressTypeEnum > v1_Purpose, boost::optional< std::string > v2_Description, boost::optional< std::string > v3_UserDefinedPurpose) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Purpose) { e->setArgument(0,*v1_Purpose,IfcAddressTypeEnum::ToString(*v1_Purpose)); } else { e->setArgument(0); } if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } if (v3_UserDefinedPurpose) { e->setArgument(2,(*v3_UserDefinedPurpose)); } else { e->setArgument(2); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcAirTerminalBoxType
-IfcAirTerminalBoxTypeEnum::IfcAirTerminalBoxTypeEnum IfcAirTerminalBoxType::PredefinedType() { return IfcAirTerminalBoxTypeEnum::FromString(*entity->getArgument(9)); }
+IfcAirTerminalBoxTypeEnum::IfcAirTerminalBoxTypeEnum IfcAirTerminalBoxType::PredefinedType() const { return IfcAirTerminalBoxTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcAirTerminalBoxType::setPredefinedType(IfcAirTerminalBoxTypeEnum::IfcAirTerminalBoxTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcAirTerminalBoxTypeEnum::ToString(v)); }
 bool IfcAirTerminalBoxType::is(Type::Enum v) const { return v == Type::IfcAirTerminalBoxType || IfcFlowControllerType::is(v); }
 Type::Enum IfcAirTerminalBoxType::type() const { return Type::IfcAirTerminalBoxType; }
 Type::Enum IfcAirTerminalBoxType::Class() { return Type::IfcAirTerminalBoxType; }
-IfcAirTerminalBoxType::IfcAirTerminalBoxType(IfcAbstractEntityPtr e) : IfcFlowControllerType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcAirTerminalBoxType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcAirTerminalBoxType::IfcAirTerminalBoxType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcAirTerminalBoxTypeEnum::IfcAirTerminalBoxTypeEnum v10_PredefinedType) : IfcFlowControllerType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcAirTerminalBoxTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcAirTerminalBoxType::IfcAirTerminalBoxType(IfcAbstractEntity* e) : IfcFlowControllerType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcAirTerminalBoxType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcAirTerminalBoxType::IfcAirTerminalBoxType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcAirTerminalBoxTypeEnum::IfcAirTerminalBoxTypeEnum v10_PredefinedType) : IfcFlowControllerType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcAirTerminalBoxTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcAirTerminalType
-IfcAirTerminalTypeEnum::IfcAirTerminalTypeEnum IfcAirTerminalType::PredefinedType() { return IfcAirTerminalTypeEnum::FromString(*entity->getArgument(9)); }
+IfcAirTerminalTypeEnum::IfcAirTerminalTypeEnum IfcAirTerminalType::PredefinedType() const { return IfcAirTerminalTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcAirTerminalType::setPredefinedType(IfcAirTerminalTypeEnum::IfcAirTerminalTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcAirTerminalTypeEnum::ToString(v)); }
 bool IfcAirTerminalType::is(Type::Enum v) const { return v == Type::IfcAirTerminalType || IfcFlowTerminalType::is(v); }
 Type::Enum IfcAirTerminalType::type() const { return Type::IfcAirTerminalType; }
 Type::Enum IfcAirTerminalType::Class() { return Type::IfcAirTerminalType; }
-IfcAirTerminalType::IfcAirTerminalType(IfcAbstractEntityPtr e) : IfcFlowTerminalType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcAirTerminalType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcAirTerminalType::IfcAirTerminalType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcAirTerminalTypeEnum::IfcAirTerminalTypeEnum v10_PredefinedType) : IfcFlowTerminalType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcAirTerminalTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcAirTerminalType::IfcAirTerminalType(IfcAbstractEntity* e) : IfcFlowTerminalType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcAirTerminalType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcAirTerminalType::IfcAirTerminalType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcAirTerminalTypeEnum::IfcAirTerminalTypeEnum v10_PredefinedType) : IfcFlowTerminalType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcAirTerminalTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcAirToAirHeatRecoveryType
-IfcAirToAirHeatRecoveryTypeEnum::IfcAirToAirHeatRecoveryTypeEnum IfcAirToAirHeatRecoveryType::PredefinedType() { return IfcAirToAirHeatRecoveryTypeEnum::FromString(*entity->getArgument(9)); }
+IfcAirToAirHeatRecoveryTypeEnum::IfcAirToAirHeatRecoveryTypeEnum IfcAirToAirHeatRecoveryType::PredefinedType() const { return IfcAirToAirHeatRecoveryTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcAirToAirHeatRecoveryType::setPredefinedType(IfcAirToAirHeatRecoveryTypeEnum::IfcAirToAirHeatRecoveryTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcAirToAirHeatRecoveryTypeEnum::ToString(v)); }
 bool IfcAirToAirHeatRecoveryType::is(Type::Enum v) const { return v == Type::IfcAirToAirHeatRecoveryType || IfcEnergyConversionDeviceType::is(v); }
 Type::Enum IfcAirToAirHeatRecoveryType::type() const { return Type::IfcAirToAirHeatRecoveryType; }
 Type::Enum IfcAirToAirHeatRecoveryType::Class() { return Type::IfcAirToAirHeatRecoveryType; }
-IfcAirToAirHeatRecoveryType::IfcAirToAirHeatRecoveryType(IfcAbstractEntityPtr e) : IfcEnergyConversionDeviceType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcAirToAirHeatRecoveryType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcAirToAirHeatRecoveryType::IfcAirToAirHeatRecoveryType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcAirToAirHeatRecoveryTypeEnum::IfcAirToAirHeatRecoveryTypeEnum v10_PredefinedType) : IfcEnergyConversionDeviceType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcAirToAirHeatRecoveryTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcAirToAirHeatRecoveryType::IfcAirToAirHeatRecoveryType(IfcAbstractEntity* e) : IfcEnergyConversionDeviceType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcAirToAirHeatRecoveryType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcAirToAirHeatRecoveryType::IfcAirToAirHeatRecoveryType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcAirToAirHeatRecoveryTypeEnum::IfcAirToAirHeatRecoveryTypeEnum v10_PredefinedType) : IfcEnergyConversionDeviceType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcAirToAirHeatRecoveryTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcAlarmType
-IfcAlarmTypeEnum::IfcAlarmTypeEnum IfcAlarmType::PredefinedType() { return IfcAlarmTypeEnum::FromString(*entity->getArgument(9)); }
+IfcAlarmTypeEnum::IfcAlarmTypeEnum IfcAlarmType::PredefinedType() const { return IfcAlarmTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcAlarmType::setPredefinedType(IfcAlarmTypeEnum::IfcAlarmTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcAlarmTypeEnum::ToString(v)); }
 bool IfcAlarmType::is(Type::Enum v) const { return v == Type::IfcAlarmType || IfcDistributionControlElementType::is(v); }
 Type::Enum IfcAlarmType::type() const { return Type::IfcAlarmType; }
 Type::Enum IfcAlarmType::Class() { return Type::IfcAlarmType; }
-IfcAlarmType::IfcAlarmType(IfcAbstractEntityPtr e) : IfcDistributionControlElementType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcAlarmType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcAlarmType::IfcAlarmType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcAlarmTypeEnum::IfcAlarmTypeEnum v10_PredefinedType) : IfcDistributionControlElementType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcAlarmTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcAlarmType::IfcAlarmType(IfcAbstractEntity* e) : IfcDistributionControlElementType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcAlarmType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcAlarmType::IfcAlarmType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcAlarmTypeEnum::IfcAlarmTypeEnum v10_PredefinedType) : IfcDistributionControlElementType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcAlarmTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcAngularDimension
 bool IfcAngularDimension::is(Type::Enum v) const { return v == Type::IfcAngularDimension || IfcDimensionCurveDirectedCallout::is(v); }
 Type::Enum IfcAngularDimension::type() const { return Type::IfcAngularDimension; }
 Type::Enum IfcAngularDimension::Class() { return Type::IfcAngularDimension; }
-IfcAngularDimension::IfcAngularDimension(IfcAbstractEntityPtr e) : IfcDimensionCurveDirectedCallout((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcAngularDimension)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcAngularDimension::IfcAngularDimension(IfcEntities v1_Contents) : IfcDimensionCurveDirectedCallout((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Contents)); entity = e; EntityBuffer::Add(this); }
+IfcAngularDimension::IfcAngularDimension(IfcAbstractEntity* e) : IfcDimensionCurveDirectedCallout((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcAngularDimension)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcAngularDimension::IfcAngularDimension(IfcEntityList::ptr v1_Contents) : IfcDimensionCurveDirectedCallout((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Contents)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcAnnotation
-IfcRelContainedInSpatialStructure::list IfcAnnotation::ContainedInStructure() { RETURN_INVERSE(IfcRelContainedInSpatialStructure) }
+IfcRelContainedInSpatialStructure::list::ptr IfcAnnotation::ContainedInStructure() const { return entity->getInverse(Type::IfcRelContainedInSpatialStructure, 4)->as<IfcRelContainedInSpatialStructure>(); }
 bool IfcAnnotation::is(Type::Enum v) const { return v == Type::IfcAnnotation || IfcProduct::is(v); }
 Type::Enum IfcAnnotation::type() const { return Type::IfcAnnotation; }
 Type::Enum IfcAnnotation::Class() { return Type::IfcAnnotation; }
-IfcAnnotation::IfcAnnotation(IfcAbstractEntityPtr e) : IfcProduct((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcAnnotation)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcAnnotation::IfcAnnotation(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation) : IfcProduct((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); entity = e; EntityBuffer::Add(this); }
+IfcAnnotation::IfcAnnotation(IfcAbstractEntity* e) : IfcProduct((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcAnnotation)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcAnnotation::IfcAnnotation(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation) : IfcProduct((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcAnnotationCurveOccurrence
 bool IfcAnnotationCurveOccurrence::is(Type::Enum v) const { return v == Type::IfcAnnotationCurveOccurrence || IfcAnnotationOccurrence::is(v); }
 Type::Enum IfcAnnotationCurveOccurrence::type() const { return Type::IfcAnnotationCurveOccurrence; }
 Type::Enum IfcAnnotationCurveOccurrence::Class() { return Type::IfcAnnotationCurveOccurrence; }
-IfcAnnotationCurveOccurrence::IfcAnnotationCurveOccurrence(IfcAbstractEntityPtr e) : IfcAnnotationOccurrence((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcAnnotationCurveOccurrence)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcAnnotationCurveOccurrence::IfcAnnotationCurveOccurrence(IfcRepresentationItem* v1_Item, SHARED_PTR< IfcTemplatedEntityList< IfcPresentationStyleAssignment > > v2_Styles, boost::optional< IfcLabel > v3_Name) : IfcAnnotationOccurrence((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Item)); e->setArgument(1,(v2_Styles)->generalize()); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } entity = e; EntityBuffer::Add(this); }
+IfcAnnotationCurveOccurrence::IfcAnnotationCurveOccurrence(IfcAbstractEntity* e) : IfcAnnotationOccurrence((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcAnnotationCurveOccurrence)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcAnnotationCurveOccurrence::IfcAnnotationCurveOccurrence(IfcRepresentationItem* v1_Item, IfcTemplatedEntityList< IfcPresentationStyleAssignment >::ptr v2_Styles, boost::optional< std::string > v3_Name) : IfcAnnotationOccurrence((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Item)); e->setArgument(1,(v2_Styles)->generalize()); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcAnnotationFillArea
-IfcCurve* IfcAnnotationFillArea::OuterBoundary() { return (IfcCurve*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(0))); }
+IfcCurve* IfcAnnotationFillArea::OuterBoundary() const { return (IfcCurve*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(0))); }
 void IfcAnnotationFillArea::setOuterBoundary(IfcCurve* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-bool IfcAnnotationFillArea::hasInnerBoundaries() { return !entity->getArgument(1)->isNull(); }
-SHARED_PTR< IfcTemplatedEntityList< IfcCurve > > IfcAnnotationFillArea::InnerBoundaries() { RETURN_AS_LIST(IfcCurve,1) }
-void IfcAnnotationFillArea::setInnerBoundaries(SHARED_PTR< IfcTemplatedEntityList< IfcCurve > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v->generalize()); }
+bool IfcAnnotationFillArea::hasInnerBoundaries() const { return !entity->getArgument(1)->isNull(); }
+IfcTemplatedEntityList< IfcCurve >::ptr IfcAnnotationFillArea::InnerBoundaries() const { IfcEntityList::ptr es = *entity->getArgument(1); return es->as<IfcCurve>(); }
+void IfcAnnotationFillArea::setInnerBoundaries(IfcTemplatedEntityList< IfcCurve >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v->generalize()); }
 bool IfcAnnotationFillArea::is(Type::Enum v) const { return v == Type::IfcAnnotationFillArea || IfcGeometricRepresentationItem::is(v); }
 Type::Enum IfcAnnotationFillArea::type() const { return Type::IfcAnnotationFillArea; }
 Type::Enum IfcAnnotationFillArea::Class() { return Type::IfcAnnotationFillArea; }
-IfcAnnotationFillArea::IfcAnnotationFillArea(IfcAbstractEntityPtr e) : IfcGeometricRepresentationItem((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcAnnotationFillArea)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcAnnotationFillArea::IfcAnnotationFillArea(IfcCurve* v1_OuterBoundary, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcCurve > > > v2_InnerBoundaries) : IfcGeometricRepresentationItem((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_OuterBoundary)); if (v2_InnerBoundaries) { e->setArgument(1,(*v2_InnerBoundaries)->generalize()); } else { e->setArgument(1); } entity = e; EntityBuffer::Add(this); }
+IfcAnnotationFillArea::IfcAnnotationFillArea(IfcAbstractEntity* e) : IfcGeometricRepresentationItem((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcAnnotationFillArea)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcAnnotationFillArea::IfcAnnotationFillArea(IfcCurve* v1_OuterBoundary, boost::optional< IfcTemplatedEntityList< IfcCurve >::ptr > v2_InnerBoundaries) : IfcGeometricRepresentationItem((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_OuterBoundary)); if (v2_InnerBoundaries) { e->setArgument(1,(*v2_InnerBoundaries)->generalize()); } else { e->setArgument(1); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcAnnotationFillAreaOccurrence
-bool IfcAnnotationFillAreaOccurrence::hasFillStyleTarget() { return !entity->getArgument(3)->isNull(); }
-IfcPoint* IfcAnnotationFillAreaOccurrence::FillStyleTarget() { return (IfcPoint*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(3))); }
+bool IfcAnnotationFillAreaOccurrence::hasFillStyleTarget() const { return !entity->getArgument(3)->isNull(); }
+IfcPoint* IfcAnnotationFillAreaOccurrence::FillStyleTarget() const { return (IfcPoint*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(3))); }
 void IfcAnnotationFillAreaOccurrence::setFillStyleTarget(IfcPoint* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-bool IfcAnnotationFillAreaOccurrence::hasGlobalOrLocal() { return !entity->getArgument(4)->isNull(); }
-IfcGlobalOrLocalEnum::IfcGlobalOrLocalEnum IfcAnnotationFillAreaOccurrence::GlobalOrLocal() { return IfcGlobalOrLocalEnum::FromString(*entity->getArgument(4)); }
+bool IfcAnnotationFillAreaOccurrence::hasGlobalOrLocal() const { return !entity->getArgument(4)->isNull(); }
+IfcGlobalOrLocalEnum::IfcGlobalOrLocalEnum IfcAnnotationFillAreaOccurrence::GlobalOrLocal() const { return IfcGlobalOrLocalEnum::FromString(*entity->getArgument(4)); }
 void IfcAnnotationFillAreaOccurrence::setGlobalOrLocal(IfcGlobalOrLocalEnum::IfcGlobalOrLocalEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v,IfcGlobalOrLocalEnum::ToString(v)); }
 bool IfcAnnotationFillAreaOccurrence::is(Type::Enum v) const { return v == Type::IfcAnnotationFillAreaOccurrence || IfcAnnotationOccurrence::is(v); }
 Type::Enum IfcAnnotationFillAreaOccurrence::type() const { return Type::IfcAnnotationFillAreaOccurrence; }
 Type::Enum IfcAnnotationFillAreaOccurrence::Class() { return Type::IfcAnnotationFillAreaOccurrence; }
-IfcAnnotationFillAreaOccurrence::IfcAnnotationFillAreaOccurrence(IfcAbstractEntityPtr e) : IfcAnnotationOccurrence((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcAnnotationFillAreaOccurrence)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcAnnotationFillAreaOccurrence::IfcAnnotationFillAreaOccurrence(IfcRepresentationItem* v1_Item, SHARED_PTR< IfcTemplatedEntityList< IfcPresentationStyleAssignment > > v2_Styles, boost::optional< IfcLabel > v3_Name, IfcPoint* v4_FillStyleTarget, boost::optional< IfcGlobalOrLocalEnum::IfcGlobalOrLocalEnum > v5_GlobalOrLocal) : IfcAnnotationOccurrence((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Item)); e->setArgument(1,(v2_Styles)->generalize()); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } e->setArgument(3,(v4_FillStyleTarget)); if (v5_GlobalOrLocal) { e->setArgument(4,*v5_GlobalOrLocal,IfcGlobalOrLocalEnum::ToString(*v5_GlobalOrLocal)); } else { e->setArgument(4); } entity = e; EntityBuffer::Add(this); }
+IfcAnnotationFillAreaOccurrence::IfcAnnotationFillAreaOccurrence(IfcAbstractEntity* e) : IfcAnnotationOccurrence((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcAnnotationFillAreaOccurrence)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcAnnotationFillAreaOccurrence::IfcAnnotationFillAreaOccurrence(IfcRepresentationItem* v1_Item, IfcTemplatedEntityList< IfcPresentationStyleAssignment >::ptr v2_Styles, boost::optional< std::string > v3_Name, IfcPoint* v4_FillStyleTarget, boost::optional< IfcGlobalOrLocalEnum::IfcGlobalOrLocalEnum > v5_GlobalOrLocal) : IfcAnnotationOccurrence((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Item)); e->setArgument(1,(v2_Styles)->generalize()); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } e->setArgument(3,(v4_FillStyleTarget)); if (v5_GlobalOrLocal) { e->setArgument(4,*v5_GlobalOrLocal,IfcGlobalOrLocalEnum::ToString(*v5_GlobalOrLocal)); } else { e->setArgument(4); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcAnnotationOccurrence
 bool IfcAnnotationOccurrence::is(Type::Enum v) const { return v == Type::IfcAnnotationOccurrence || IfcStyledItem::is(v); }
 Type::Enum IfcAnnotationOccurrence::type() const { return Type::IfcAnnotationOccurrence; }
 Type::Enum IfcAnnotationOccurrence::Class() { return Type::IfcAnnotationOccurrence; }
-IfcAnnotationOccurrence::IfcAnnotationOccurrence(IfcAbstractEntityPtr e) : IfcStyledItem((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcAnnotationOccurrence)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcAnnotationOccurrence::IfcAnnotationOccurrence(IfcRepresentationItem* v1_Item, SHARED_PTR< IfcTemplatedEntityList< IfcPresentationStyleAssignment > > v2_Styles, boost::optional< IfcLabel > v3_Name) : IfcStyledItem((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Item)); e->setArgument(1,(v2_Styles)->generalize()); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } entity = e; EntityBuffer::Add(this); }
+IfcAnnotationOccurrence::IfcAnnotationOccurrence(IfcAbstractEntity* e) : IfcStyledItem((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcAnnotationOccurrence)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcAnnotationOccurrence::IfcAnnotationOccurrence(IfcRepresentationItem* v1_Item, IfcTemplatedEntityList< IfcPresentationStyleAssignment >::ptr v2_Styles, boost::optional< std::string > v3_Name) : IfcStyledItem((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Item)); e->setArgument(1,(v2_Styles)->generalize()); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcAnnotationSurface
-IfcGeometricRepresentationItem* IfcAnnotationSurface::Item() { return (IfcGeometricRepresentationItem*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(0))); }
+IfcGeometricRepresentationItem* IfcAnnotationSurface::Item() const { return (IfcGeometricRepresentationItem*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(0))); }
 void IfcAnnotationSurface::setItem(IfcGeometricRepresentationItem* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-bool IfcAnnotationSurface::hasTextureCoordinates() { return !entity->getArgument(1)->isNull(); }
-IfcTextureCoordinate* IfcAnnotationSurface::TextureCoordinates() { return (IfcTextureCoordinate*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(1))); }
+bool IfcAnnotationSurface::hasTextureCoordinates() const { return !entity->getArgument(1)->isNull(); }
+IfcTextureCoordinate* IfcAnnotationSurface::TextureCoordinates() const { return (IfcTextureCoordinate*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(1))); }
 void IfcAnnotationSurface::setTextureCoordinates(IfcTextureCoordinate* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
 bool IfcAnnotationSurface::is(Type::Enum v) const { return v == Type::IfcAnnotationSurface || IfcGeometricRepresentationItem::is(v); }
 Type::Enum IfcAnnotationSurface::type() const { return Type::IfcAnnotationSurface; }
 Type::Enum IfcAnnotationSurface::Class() { return Type::IfcAnnotationSurface; }
-IfcAnnotationSurface::IfcAnnotationSurface(IfcAbstractEntityPtr e) : IfcGeometricRepresentationItem((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcAnnotationSurface)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcAnnotationSurface::IfcAnnotationSurface(IfcGeometricRepresentationItem* v1_Item, IfcTextureCoordinate* v2_TextureCoordinates) : IfcGeometricRepresentationItem((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Item)); e->setArgument(1,(v2_TextureCoordinates)); entity = e; EntityBuffer::Add(this); }
+IfcAnnotationSurface::IfcAnnotationSurface(IfcAbstractEntity* e) : IfcGeometricRepresentationItem((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcAnnotationSurface)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcAnnotationSurface::IfcAnnotationSurface(IfcGeometricRepresentationItem* v1_Item, IfcTextureCoordinate* v2_TextureCoordinates) : IfcGeometricRepresentationItem((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Item)); e->setArgument(1,(v2_TextureCoordinates)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcAnnotationSurfaceOccurrence
 bool IfcAnnotationSurfaceOccurrence::is(Type::Enum v) const { return v == Type::IfcAnnotationSurfaceOccurrence || IfcAnnotationOccurrence::is(v); }
 Type::Enum IfcAnnotationSurfaceOccurrence::type() const { return Type::IfcAnnotationSurfaceOccurrence; }
 Type::Enum IfcAnnotationSurfaceOccurrence::Class() { return Type::IfcAnnotationSurfaceOccurrence; }
-IfcAnnotationSurfaceOccurrence::IfcAnnotationSurfaceOccurrence(IfcAbstractEntityPtr e) : IfcAnnotationOccurrence((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcAnnotationSurfaceOccurrence)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcAnnotationSurfaceOccurrence::IfcAnnotationSurfaceOccurrence(IfcRepresentationItem* v1_Item, SHARED_PTR< IfcTemplatedEntityList< IfcPresentationStyleAssignment > > v2_Styles, boost::optional< IfcLabel > v3_Name) : IfcAnnotationOccurrence((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Item)); e->setArgument(1,(v2_Styles)->generalize()); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } entity = e; EntityBuffer::Add(this); }
+IfcAnnotationSurfaceOccurrence::IfcAnnotationSurfaceOccurrence(IfcAbstractEntity* e) : IfcAnnotationOccurrence((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcAnnotationSurfaceOccurrence)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcAnnotationSurfaceOccurrence::IfcAnnotationSurfaceOccurrence(IfcRepresentationItem* v1_Item, IfcTemplatedEntityList< IfcPresentationStyleAssignment >::ptr v2_Styles, boost::optional< std::string > v3_Name) : IfcAnnotationOccurrence((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Item)); e->setArgument(1,(v2_Styles)->generalize()); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcAnnotationSymbolOccurrence
 bool IfcAnnotationSymbolOccurrence::is(Type::Enum v) const { return v == Type::IfcAnnotationSymbolOccurrence || IfcAnnotationOccurrence::is(v); }
 Type::Enum IfcAnnotationSymbolOccurrence::type() const { return Type::IfcAnnotationSymbolOccurrence; }
 Type::Enum IfcAnnotationSymbolOccurrence::Class() { return Type::IfcAnnotationSymbolOccurrence; }
-IfcAnnotationSymbolOccurrence::IfcAnnotationSymbolOccurrence(IfcAbstractEntityPtr e) : IfcAnnotationOccurrence((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcAnnotationSymbolOccurrence)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcAnnotationSymbolOccurrence::IfcAnnotationSymbolOccurrence(IfcRepresentationItem* v1_Item, SHARED_PTR< IfcTemplatedEntityList< IfcPresentationStyleAssignment > > v2_Styles, boost::optional< IfcLabel > v3_Name) : IfcAnnotationOccurrence((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Item)); e->setArgument(1,(v2_Styles)->generalize()); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } entity = e; EntityBuffer::Add(this); }
+IfcAnnotationSymbolOccurrence::IfcAnnotationSymbolOccurrence(IfcAbstractEntity* e) : IfcAnnotationOccurrence((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcAnnotationSymbolOccurrence)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcAnnotationSymbolOccurrence::IfcAnnotationSymbolOccurrence(IfcRepresentationItem* v1_Item, IfcTemplatedEntityList< IfcPresentationStyleAssignment >::ptr v2_Styles, boost::optional< std::string > v3_Name) : IfcAnnotationOccurrence((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Item)); e->setArgument(1,(v2_Styles)->generalize()); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcAnnotationTextOccurrence
 bool IfcAnnotationTextOccurrence::is(Type::Enum v) const { return v == Type::IfcAnnotationTextOccurrence || IfcAnnotationOccurrence::is(v); }
 Type::Enum IfcAnnotationTextOccurrence::type() const { return Type::IfcAnnotationTextOccurrence; }
 Type::Enum IfcAnnotationTextOccurrence::Class() { return Type::IfcAnnotationTextOccurrence; }
-IfcAnnotationTextOccurrence::IfcAnnotationTextOccurrence(IfcAbstractEntityPtr e) : IfcAnnotationOccurrence((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcAnnotationTextOccurrence)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcAnnotationTextOccurrence::IfcAnnotationTextOccurrence(IfcRepresentationItem* v1_Item, SHARED_PTR< IfcTemplatedEntityList< IfcPresentationStyleAssignment > > v2_Styles, boost::optional< IfcLabel > v3_Name) : IfcAnnotationOccurrence((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Item)); e->setArgument(1,(v2_Styles)->generalize()); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } entity = e; EntityBuffer::Add(this); }
+IfcAnnotationTextOccurrence::IfcAnnotationTextOccurrence(IfcAbstractEntity* e) : IfcAnnotationOccurrence((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcAnnotationTextOccurrence)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcAnnotationTextOccurrence::IfcAnnotationTextOccurrence(IfcRepresentationItem* v1_Item, IfcTemplatedEntityList< IfcPresentationStyleAssignment >::ptr v2_Styles, boost::optional< std::string > v3_Name) : IfcAnnotationOccurrence((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Item)); e->setArgument(1,(v2_Styles)->generalize()); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcApplication
-IfcOrganization* IfcApplication::ApplicationDeveloper() { return (IfcOrganization*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(0))); }
+IfcOrganization* IfcApplication::ApplicationDeveloper() const { return (IfcOrganization*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(0))); }
 void IfcApplication::setApplicationDeveloper(IfcOrganization* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-IfcLabel IfcApplication::Version() { return *entity->getArgument(1); }
-void IfcApplication::setVersion(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-IfcLabel IfcApplication::ApplicationFullName() { return *entity->getArgument(2); }
-void IfcApplication::setApplicationFullName(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-IfcIdentifier IfcApplication::ApplicationIdentifier() { return *entity->getArgument(3); }
-void IfcApplication::setApplicationIdentifier(IfcIdentifier v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+std::string IfcApplication::Version() const { return *entity->getArgument(1); }
+void IfcApplication::setVersion(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+std::string IfcApplication::ApplicationFullName() const { return *entity->getArgument(2); }
+void IfcApplication::setApplicationFullName(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+std::string IfcApplication::ApplicationIdentifier() const { return *entity->getArgument(3); }
+void IfcApplication::setApplicationIdentifier(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
 bool IfcApplication::is(Type::Enum v) const { return v == Type::IfcApplication; }
 Type::Enum IfcApplication::type() const { return Type::IfcApplication; }
 Type::Enum IfcApplication::Class() { return Type::IfcApplication; }
-IfcApplication::IfcApplication(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcApplication)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcApplication::IfcApplication(IfcOrganization* v1_ApplicationDeveloper, IfcLabel v2_Version, IfcLabel v3_ApplicationFullName, IfcIdentifier v4_ApplicationIdentifier) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_ApplicationDeveloper)); e->setArgument(1,(v2_Version)); e->setArgument(2,(v3_ApplicationFullName)); e->setArgument(3,(v4_ApplicationIdentifier)); entity = e; EntityBuffer::Add(this); }
+IfcApplication::IfcApplication(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcApplication)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcApplication::IfcApplication(IfcOrganization* v1_ApplicationDeveloper, std::string v2_Version, std::string v3_ApplicationFullName, std::string v4_ApplicationIdentifier) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_ApplicationDeveloper)); e->setArgument(1,(v2_Version)); e->setArgument(2,(v3_ApplicationFullName)); e->setArgument(3,(v4_ApplicationIdentifier)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcAppliedValue
-bool IfcAppliedValue::hasName() { return !entity->getArgument(0)->isNull(); }
-IfcLabel IfcAppliedValue::Name() { return *entity->getArgument(0); }
-void IfcAppliedValue::setName(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-bool IfcAppliedValue::hasDescription() { return !entity->getArgument(1)->isNull(); }
-IfcText IfcAppliedValue::Description() { return *entity->getArgument(1); }
-void IfcAppliedValue::setDescription(IfcText v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-bool IfcAppliedValue::hasAppliedValue() { return !entity->getArgument(2)->isNull(); }
-IfcAppliedValueSelect IfcAppliedValue::AppliedValue() { return *entity->getArgument(2); }
-void IfcAppliedValue::setAppliedValue(IfcAppliedValueSelect v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-bool IfcAppliedValue::hasUnitBasis() { return !entity->getArgument(3)->isNull(); }
-IfcMeasureWithUnit* IfcAppliedValue::UnitBasis() { return (IfcMeasureWithUnit*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(3))); }
+bool IfcAppliedValue::hasName() const { return !entity->getArgument(0)->isNull(); }
+std::string IfcAppliedValue::Name() const { return *entity->getArgument(0); }
+void IfcAppliedValue::setName(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+bool IfcAppliedValue::hasDescription() const { return !entity->getArgument(1)->isNull(); }
+std::string IfcAppliedValue::Description() const { return *entity->getArgument(1); }
+void IfcAppliedValue::setDescription(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+bool IfcAppliedValue::hasAppliedValue() const { return !entity->getArgument(2)->isNull(); }
+IfcAppliedValueSelect* IfcAppliedValue::AppliedValue() const { return (IfcAppliedValueSelect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(2))); }
+void IfcAppliedValue::setAppliedValue(IfcAppliedValueSelect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+bool IfcAppliedValue::hasUnitBasis() const { return !entity->getArgument(3)->isNull(); }
+IfcMeasureWithUnit* IfcAppliedValue::UnitBasis() const { return (IfcMeasureWithUnit*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(3))); }
 void IfcAppliedValue::setUnitBasis(IfcMeasureWithUnit* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-bool IfcAppliedValue::hasApplicableDate() { return !entity->getArgument(4)->isNull(); }
-IfcDateTimeSelect IfcAppliedValue::ApplicableDate() { return *entity->getArgument(4); }
-void IfcAppliedValue::setApplicableDate(IfcDateTimeSelect v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-bool IfcAppliedValue::hasFixedUntilDate() { return !entity->getArgument(5)->isNull(); }
-IfcDateTimeSelect IfcAppliedValue::FixedUntilDate() { return *entity->getArgument(5); }
-void IfcAppliedValue::setFixedUntilDate(IfcDateTimeSelect v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-IfcReferencesValueDocument::list IfcAppliedValue::ValuesReferenced() { RETURN_INVERSE(IfcReferencesValueDocument) }
-IfcAppliedValueRelationship::list IfcAppliedValue::ValueOfComponents() { RETURN_INVERSE(IfcAppliedValueRelationship) }
-IfcAppliedValueRelationship::list IfcAppliedValue::IsComponentIn() { RETURN_INVERSE(IfcAppliedValueRelationship) }
+bool IfcAppliedValue::hasApplicableDate() const { return !entity->getArgument(4)->isNull(); }
+IfcDateTimeSelect* IfcAppliedValue::ApplicableDate() const { return (IfcDateTimeSelect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(4))); }
+void IfcAppliedValue::setApplicableDate(IfcDateTimeSelect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+bool IfcAppliedValue::hasFixedUntilDate() const { return !entity->getArgument(5)->isNull(); }
+IfcDateTimeSelect* IfcAppliedValue::FixedUntilDate() const { return (IfcDateTimeSelect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(5))); }
+void IfcAppliedValue::setFixedUntilDate(IfcDateTimeSelect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+IfcReferencesValueDocument::list::ptr IfcAppliedValue::ValuesReferenced() const { return entity->getInverse(Type::IfcReferencesValueDocument, 1)->as<IfcReferencesValueDocument>(); }
+IfcAppliedValueRelationship::list::ptr IfcAppliedValue::ValueOfComponents() const { return entity->getInverse(Type::IfcAppliedValueRelationship, 0)->as<IfcAppliedValueRelationship>(); }
+IfcAppliedValueRelationship::list::ptr IfcAppliedValue::IsComponentIn() const { return entity->getInverse(Type::IfcAppliedValueRelationship, 1)->as<IfcAppliedValueRelationship>(); }
 bool IfcAppliedValue::is(Type::Enum v) const { return v == Type::IfcAppliedValue; }
 Type::Enum IfcAppliedValue::type() const { return Type::IfcAppliedValue; }
 Type::Enum IfcAppliedValue::Class() { return Type::IfcAppliedValue; }
-IfcAppliedValue::IfcAppliedValue(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcAppliedValue)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcAppliedValue::IfcAppliedValue(boost::optional< IfcLabel > v1_Name, boost::optional< IfcText > v2_Description, boost::optional< IfcAppliedValueSelect > v3_AppliedValue, IfcMeasureWithUnit* v4_UnitBasis, boost::optional< IfcDateTimeSelect > v5_ApplicableDate, boost::optional< IfcDateTimeSelect > v6_FixedUntilDate) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } if (v3_AppliedValue) { e->setArgument(2,(*v3_AppliedValue)); } else { e->setArgument(2); } e->setArgument(3,(v4_UnitBasis)); if (v5_ApplicableDate) { e->setArgument(4,(*v5_ApplicableDate)); } else { e->setArgument(4); } if (v6_FixedUntilDate) { e->setArgument(5,(*v6_FixedUntilDate)); } else { e->setArgument(5); } entity = e; EntityBuffer::Add(this); }
+IfcAppliedValue::IfcAppliedValue(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcAppliedValue)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcAppliedValue::IfcAppliedValue(boost::optional< std::string > v1_Name, boost::optional< std::string > v2_Description, IfcAppliedValueSelect* v3_AppliedValue, IfcMeasureWithUnit* v4_UnitBasis, IfcDateTimeSelect* v5_ApplicableDate, IfcDateTimeSelect* v6_FixedUntilDate) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_AppliedValue)); e->setArgument(3,(v4_UnitBasis)); e->setArgument(4,(v5_ApplicableDate)); e->setArgument(5,(v6_FixedUntilDate)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcAppliedValueRelationship
-IfcAppliedValue* IfcAppliedValueRelationship::ComponentOfTotal() { return (IfcAppliedValue*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(0))); }
+IfcAppliedValue* IfcAppliedValueRelationship::ComponentOfTotal() const { return (IfcAppliedValue*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(0))); }
 void IfcAppliedValueRelationship::setComponentOfTotal(IfcAppliedValue* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-SHARED_PTR< IfcTemplatedEntityList< IfcAppliedValue > > IfcAppliedValueRelationship::Components() { RETURN_AS_LIST(IfcAppliedValue,1) }
-void IfcAppliedValueRelationship::setComponents(SHARED_PTR< IfcTemplatedEntityList< IfcAppliedValue > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v->generalize()); }
-IfcArithmeticOperatorEnum::IfcArithmeticOperatorEnum IfcAppliedValueRelationship::ArithmeticOperator() { return IfcArithmeticOperatorEnum::FromString(*entity->getArgument(2)); }
+IfcTemplatedEntityList< IfcAppliedValue >::ptr IfcAppliedValueRelationship::Components() const { IfcEntityList::ptr es = *entity->getArgument(1); return es->as<IfcAppliedValue>(); }
+void IfcAppliedValueRelationship::setComponents(IfcTemplatedEntityList< IfcAppliedValue >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v->generalize()); }
+IfcArithmeticOperatorEnum::IfcArithmeticOperatorEnum IfcAppliedValueRelationship::ArithmeticOperator() const { return IfcArithmeticOperatorEnum::FromString(*entity->getArgument(2)); }
 void IfcAppliedValueRelationship::setArithmeticOperator(IfcArithmeticOperatorEnum::IfcArithmeticOperatorEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v,IfcArithmeticOperatorEnum::ToString(v)); }
-bool IfcAppliedValueRelationship::hasName() { return !entity->getArgument(3)->isNull(); }
-IfcLabel IfcAppliedValueRelationship::Name() { return *entity->getArgument(3); }
-void IfcAppliedValueRelationship::setName(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-bool IfcAppliedValueRelationship::hasDescription() { return !entity->getArgument(4)->isNull(); }
-IfcText IfcAppliedValueRelationship::Description() { return *entity->getArgument(4); }
-void IfcAppliedValueRelationship::setDescription(IfcText v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+bool IfcAppliedValueRelationship::hasName() const { return !entity->getArgument(3)->isNull(); }
+std::string IfcAppliedValueRelationship::Name() const { return *entity->getArgument(3); }
+void IfcAppliedValueRelationship::setName(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+bool IfcAppliedValueRelationship::hasDescription() const { return !entity->getArgument(4)->isNull(); }
+std::string IfcAppliedValueRelationship::Description() const { return *entity->getArgument(4); }
+void IfcAppliedValueRelationship::setDescription(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
 bool IfcAppliedValueRelationship::is(Type::Enum v) const { return v == Type::IfcAppliedValueRelationship; }
 Type::Enum IfcAppliedValueRelationship::type() const { return Type::IfcAppliedValueRelationship; }
 Type::Enum IfcAppliedValueRelationship::Class() { return Type::IfcAppliedValueRelationship; }
-IfcAppliedValueRelationship::IfcAppliedValueRelationship(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcAppliedValueRelationship)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcAppliedValueRelationship::IfcAppliedValueRelationship(IfcAppliedValue* v1_ComponentOfTotal, SHARED_PTR< IfcTemplatedEntityList< IfcAppliedValue > > v2_Components, IfcArithmeticOperatorEnum::IfcArithmeticOperatorEnum v3_ArithmeticOperator, boost::optional< IfcLabel > v4_Name, boost::optional< IfcText > v5_Description) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_ComponentOfTotal)); e->setArgument(1,(v2_Components)->generalize()); e->setArgument(2,v3_ArithmeticOperator,IfcArithmeticOperatorEnum::ToString(v3_ArithmeticOperator)); if (v4_Name) { e->setArgument(3,(*v4_Name)); } else { e->setArgument(3); } if (v5_Description) { e->setArgument(4,(*v5_Description)); } else { e->setArgument(4); } entity = e; EntityBuffer::Add(this); }
+IfcAppliedValueRelationship::IfcAppliedValueRelationship(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcAppliedValueRelationship)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcAppliedValueRelationship::IfcAppliedValueRelationship(IfcAppliedValue* v1_ComponentOfTotal, IfcTemplatedEntityList< IfcAppliedValue >::ptr v2_Components, IfcArithmeticOperatorEnum::IfcArithmeticOperatorEnum v3_ArithmeticOperator, boost::optional< std::string > v4_Name, boost::optional< std::string > v5_Description) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_ComponentOfTotal)); e->setArgument(1,(v2_Components)->generalize()); e->setArgument(2,v3_ArithmeticOperator,IfcArithmeticOperatorEnum::ToString(v3_ArithmeticOperator)); if (v4_Name) { e->setArgument(3,(*v4_Name)); } else { e->setArgument(3); } if (v5_Description) { e->setArgument(4,(*v5_Description)); } else { e->setArgument(4); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcApproval
-bool IfcApproval::hasDescription() { return !entity->getArgument(0)->isNull(); }
-IfcText IfcApproval::Description() { return *entity->getArgument(0); }
-void IfcApproval::setDescription(IfcText v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-IfcDateTimeSelect IfcApproval::ApprovalDateTime() { return *entity->getArgument(1); }
-void IfcApproval::setApprovalDateTime(IfcDateTimeSelect v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-bool IfcApproval::hasApprovalStatus() { return !entity->getArgument(2)->isNull(); }
-IfcLabel IfcApproval::ApprovalStatus() { return *entity->getArgument(2); }
-void IfcApproval::setApprovalStatus(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-bool IfcApproval::hasApprovalLevel() { return !entity->getArgument(3)->isNull(); }
-IfcLabel IfcApproval::ApprovalLevel() { return *entity->getArgument(3); }
-void IfcApproval::setApprovalLevel(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-bool IfcApproval::hasApprovalQualifier() { return !entity->getArgument(4)->isNull(); }
-IfcText IfcApproval::ApprovalQualifier() { return *entity->getArgument(4); }
-void IfcApproval::setApprovalQualifier(IfcText v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-IfcLabel IfcApproval::Name() { return *entity->getArgument(5); }
-void IfcApproval::setName(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-IfcIdentifier IfcApproval::Identifier() { return *entity->getArgument(6); }
-void IfcApproval::setIdentifier(IfcIdentifier v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
-IfcApprovalActorRelationship::list IfcApproval::Actors() { RETURN_INVERSE(IfcApprovalActorRelationship) }
-IfcApprovalRelationship::list IfcApproval::IsRelatedWith() { RETURN_INVERSE(IfcApprovalRelationship) }
-IfcApprovalRelationship::list IfcApproval::Relates() { RETURN_INVERSE(IfcApprovalRelationship) }
+bool IfcApproval::hasDescription() const { return !entity->getArgument(0)->isNull(); }
+std::string IfcApproval::Description() const { return *entity->getArgument(0); }
+void IfcApproval::setDescription(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+IfcDateTimeSelect* IfcApproval::ApprovalDateTime() const { return (IfcDateTimeSelect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(1))); }
+void IfcApproval::setApprovalDateTime(IfcDateTimeSelect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+bool IfcApproval::hasApprovalStatus() const { return !entity->getArgument(2)->isNull(); }
+std::string IfcApproval::ApprovalStatus() const { return *entity->getArgument(2); }
+void IfcApproval::setApprovalStatus(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+bool IfcApproval::hasApprovalLevel() const { return !entity->getArgument(3)->isNull(); }
+std::string IfcApproval::ApprovalLevel() const { return *entity->getArgument(3); }
+void IfcApproval::setApprovalLevel(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+bool IfcApproval::hasApprovalQualifier() const { return !entity->getArgument(4)->isNull(); }
+std::string IfcApproval::ApprovalQualifier() const { return *entity->getArgument(4); }
+void IfcApproval::setApprovalQualifier(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+std::string IfcApproval::Name() const { return *entity->getArgument(5); }
+void IfcApproval::setName(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+std::string IfcApproval::Identifier() const { return *entity->getArgument(6); }
+void IfcApproval::setIdentifier(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
+IfcApprovalActorRelationship::list::ptr IfcApproval::Actors() const { return entity->getInverse(Type::IfcApprovalActorRelationship, 1)->as<IfcApprovalActorRelationship>(); }
+IfcApprovalRelationship::list::ptr IfcApproval::IsRelatedWith() const { return entity->getInverse(Type::IfcApprovalRelationship, 0)->as<IfcApprovalRelationship>(); }
+IfcApprovalRelationship::list::ptr IfcApproval::Relates() const { return entity->getInverse(Type::IfcApprovalRelationship, 1)->as<IfcApprovalRelationship>(); }
 bool IfcApproval::is(Type::Enum v) const { return v == Type::IfcApproval; }
 Type::Enum IfcApproval::type() const { return Type::IfcApproval; }
 Type::Enum IfcApproval::Class() { return Type::IfcApproval; }
-IfcApproval::IfcApproval(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcApproval)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcApproval::IfcApproval(boost::optional< IfcText > v1_Description, IfcDateTimeSelect v2_ApprovalDateTime, boost::optional< IfcLabel > v3_ApprovalStatus, boost::optional< IfcLabel > v4_ApprovalLevel, boost::optional< IfcText > v5_ApprovalQualifier, IfcLabel v6_Name, IfcIdentifier v7_Identifier) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Description) { e->setArgument(0,(*v1_Description)); } else { e->setArgument(0); } e->setArgument(1,(v2_ApprovalDateTime)); if (v3_ApprovalStatus) { e->setArgument(2,(*v3_ApprovalStatus)); } else { e->setArgument(2); } if (v4_ApprovalLevel) { e->setArgument(3,(*v4_ApprovalLevel)); } else { e->setArgument(3); } if (v5_ApprovalQualifier) { e->setArgument(4,(*v5_ApprovalQualifier)); } else { e->setArgument(4); } e->setArgument(5,(v6_Name)); e->setArgument(6,(v7_Identifier)); entity = e; EntityBuffer::Add(this); }
+IfcApproval::IfcApproval(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcApproval)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcApproval::IfcApproval(boost::optional< std::string > v1_Description, IfcDateTimeSelect* v2_ApprovalDateTime, boost::optional< std::string > v3_ApprovalStatus, boost::optional< std::string > v4_ApprovalLevel, boost::optional< std::string > v5_ApprovalQualifier, std::string v6_Name, std::string v7_Identifier) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Description) { e->setArgument(0,(*v1_Description)); } else { e->setArgument(0); } e->setArgument(1,(v2_ApprovalDateTime)); if (v3_ApprovalStatus) { e->setArgument(2,(*v3_ApprovalStatus)); } else { e->setArgument(2); } if (v4_ApprovalLevel) { e->setArgument(3,(*v4_ApprovalLevel)); } else { e->setArgument(3); } if (v5_ApprovalQualifier) { e->setArgument(4,(*v5_ApprovalQualifier)); } else { e->setArgument(4); } e->setArgument(5,(v6_Name)); e->setArgument(6,(v7_Identifier)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcApprovalActorRelationship
-IfcActorSelect IfcApprovalActorRelationship::Actor() { return *entity->getArgument(0); }
-void IfcApprovalActorRelationship::setActor(IfcActorSelect v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-IfcApproval* IfcApprovalActorRelationship::Approval() { return (IfcApproval*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(1))); }
+IfcActorSelect* IfcApprovalActorRelationship::Actor() const { return (IfcActorSelect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(0))); }
+void IfcApprovalActorRelationship::setActor(IfcActorSelect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+IfcApproval* IfcApprovalActorRelationship::Approval() const { return (IfcApproval*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(1))); }
 void IfcApprovalActorRelationship::setApproval(IfcApproval* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-IfcActorRole* IfcApprovalActorRelationship::Role() { return (IfcActorRole*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(2))); }
+IfcActorRole* IfcApprovalActorRelationship::Role() const { return (IfcActorRole*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(2))); }
 void IfcApprovalActorRelationship::setRole(IfcActorRole* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
 bool IfcApprovalActorRelationship::is(Type::Enum v) const { return v == Type::IfcApprovalActorRelationship; }
 Type::Enum IfcApprovalActorRelationship::type() const { return Type::IfcApprovalActorRelationship; }
 Type::Enum IfcApprovalActorRelationship::Class() { return Type::IfcApprovalActorRelationship; }
-IfcApprovalActorRelationship::IfcApprovalActorRelationship(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcApprovalActorRelationship)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcApprovalActorRelationship::IfcApprovalActorRelationship(IfcActorSelect v1_Actor, IfcApproval* v2_Approval, IfcActorRole* v3_Role) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Actor)); e->setArgument(1,(v2_Approval)); e->setArgument(2,(v3_Role)); entity = e; EntityBuffer::Add(this); }
+IfcApprovalActorRelationship::IfcApprovalActorRelationship(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcApprovalActorRelationship)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcApprovalActorRelationship::IfcApprovalActorRelationship(IfcActorSelect* v1_Actor, IfcApproval* v2_Approval, IfcActorRole* v3_Role) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Actor)); e->setArgument(1,(v2_Approval)); e->setArgument(2,(v3_Role)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcApprovalPropertyRelationship
-SHARED_PTR< IfcTemplatedEntityList< IfcProperty > > IfcApprovalPropertyRelationship::ApprovedProperties() { RETURN_AS_LIST(IfcProperty,0) }
-void IfcApprovalPropertyRelationship::setApprovedProperties(SHARED_PTR< IfcTemplatedEntityList< IfcProperty > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v->generalize()); }
-IfcApproval* IfcApprovalPropertyRelationship::Approval() { return (IfcApproval*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(1))); }
+IfcTemplatedEntityList< IfcProperty >::ptr IfcApprovalPropertyRelationship::ApprovedProperties() const { IfcEntityList::ptr es = *entity->getArgument(0); return es->as<IfcProperty>(); }
+void IfcApprovalPropertyRelationship::setApprovedProperties(IfcTemplatedEntityList< IfcProperty >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v->generalize()); }
+IfcApproval* IfcApprovalPropertyRelationship::Approval() const { return (IfcApproval*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(1))); }
 void IfcApprovalPropertyRelationship::setApproval(IfcApproval* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
 bool IfcApprovalPropertyRelationship::is(Type::Enum v) const { return v == Type::IfcApprovalPropertyRelationship; }
 Type::Enum IfcApprovalPropertyRelationship::type() const { return Type::IfcApprovalPropertyRelationship; }
 Type::Enum IfcApprovalPropertyRelationship::Class() { return Type::IfcApprovalPropertyRelationship; }
-IfcApprovalPropertyRelationship::IfcApprovalPropertyRelationship(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcApprovalPropertyRelationship)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcApprovalPropertyRelationship::IfcApprovalPropertyRelationship(SHARED_PTR< IfcTemplatedEntityList< IfcProperty > > v1_ApprovedProperties, IfcApproval* v2_Approval) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_ApprovedProperties)->generalize()); e->setArgument(1,(v2_Approval)); entity = e; EntityBuffer::Add(this); }
+IfcApprovalPropertyRelationship::IfcApprovalPropertyRelationship(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcApprovalPropertyRelationship)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcApprovalPropertyRelationship::IfcApprovalPropertyRelationship(IfcTemplatedEntityList< IfcProperty >::ptr v1_ApprovedProperties, IfcApproval* v2_Approval) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_ApprovedProperties)->generalize()); e->setArgument(1,(v2_Approval)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcApprovalRelationship
-IfcApproval* IfcApprovalRelationship::RelatedApproval() { return (IfcApproval*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(0))); }
+IfcApproval* IfcApprovalRelationship::RelatedApproval() const { return (IfcApproval*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(0))); }
 void IfcApprovalRelationship::setRelatedApproval(IfcApproval* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-IfcApproval* IfcApprovalRelationship::RelatingApproval() { return (IfcApproval*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(1))); }
+IfcApproval* IfcApprovalRelationship::RelatingApproval() const { return (IfcApproval*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(1))); }
 void IfcApprovalRelationship::setRelatingApproval(IfcApproval* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-bool IfcApprovalRelationship::hasDescription() { return !entity->getArgument(2)->isNull(); }
-IfcText IfcApprovalRelationship::Description() { return *entity->getArgument(2); }
-void IfcApprovalRelationship::setDescription(IfcText v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-IfcLabel IfcApprovalRelationship::Name() { return *entity->getArgument(3); }
-void IfcApprovalRelationship::setName(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+bool IfcApprovalRelationship::hasDescription() const { return !entity->getArgument(2)->isNull(); }
+std::string IfcApprovalRelationship::Description() const { return *entity->getArgument(2); }
+void IfcApprovalRelationship::setDescription(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+std::string IfcApprovalRelationship::Name() const { return *entity->getArgument(3); }
+void IfcApprovalRelationship::setName(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
 bool IfcApprovalRelationship::is(Type::Enum v) const { return v == Type::IfcApprovalRelationship; }
 Type::Enum IfcApprovalRelationship::type() const { return Type::IfcApprovalRelationship; }
 Type::Enum IfcApprovalRelationship::Class() { return Type::IfcApprovalRelationship; }
-IfcApprovalRelationship::IfcApprovalRelationship(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcApprovalRelationship)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcApprovalRelationship::IfcApprovalRelationship(IfcApproval* v1_RelatedApproval, IfcApproval* v2_RelatingApproval, boost::optional< IfcText > v3_Description, IfcLabel v4_Name) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_RelatedApproval)); e->setArgument(1,(v2_RelatingApproval)); if (v3_Description) { e->setArgument(2,(*v3_Description)); } else { e->setArgument(2); } e->setArgument(3,(v4_Name)); entity = e; EntityBuffer::Add(this); }
+IfcApprovalRelationship::IfcApprovalRelationship(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcApprovalRelationship)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcApprovalRelationship::IfcApprovalRelationship(IfcApproval* v1_RelatedApproval, IfcApproval* v2_RelatingApproval, boost::optional< std::string > v3_Description, std::string v4_Name) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_RelatedApproval)); e->setArgument(1,(v2_RelatingApproval)); if (v3_Description) { e->setArgument(2,(*v3_Description)); } else { e->setArgument(2); } e->setArgument(3,(v4_Name)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcArbitraryClosedProfileDef
-IfcCurve* IfcArbitraryClosedProfileDef::OuterCurve() { return (IfcCurve*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(2))); }
+IfcCurve* IfcArbitraryClosedProfileDef::OuterCurve() const { return (IfcCurve*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(2))); }
 void IfcArbitraryClosedProfileDef::setOuterCurve(IfcCurve* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
 bool IfcArbitraryClosedProfileDef::is(Type::Enum v) const { return v == Type::IfcArbitraryClosedProfileDef || IfcProfileDef::is(v); }
 Type::Enum IfcArbitraryClosedProfileDef::type() const { return Type::IfcArbitraryClosedProfileDef; }
 Type::Enum IfcArbitraryClosedProfileDef::Class() { return Type::IfcArbitraryClosedProfileDef; }
-IfcArbitraryClosedProfileDef::IfcArbitraryClosedProfileDef(IfcAbstractEntityPtr e) : IfcProfileDef((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcArbitraryClosedProfileDef)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcArbitraryClosedProfileDef::IfcArbitraryClosedProfileDef(IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< IfcLabel > v2_ProfileName, IfcCurve* v3_OuterCurve) : IfcProfileDef((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,v1_ProfileType,IfcProfileTypeEnum::ToString(v1_ProfileType)); if (v2_ProfileName) { e->setArgument(1,(*v2_ProfileName)); } else { e->setArgument(1); } e->setArgument(2,(v3_OuterCurve)); entity = e; EntityBuffer::Add(this); }
+IfcArbitraryClosedProfileDef::IfcArbitraryClosedProfileDef(IfcAbstractEntity* e) : IfcProfileDef((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcArbitraryClosedProfileDef)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcArbitraryClosedProfileDef::IfcArbitraryClosedProfileDef(IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< std::string > v2_ProfileName, IfcCurve* v3_OuterCurve) : IfcProfileDef((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,v1_ProfileType,IfcProfileTypeEnum::ToString(v1_ProfileType)); if (v2_ProfileName) { e->setArgument(1,(*v2_ProfileName)); } else { e->setArgument(1); } e->setArgument(2,(v3_OuterCurve)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcArbitraryOpenProfileDef
-IfcBoundedCurve* IfcArbitraryOpenProfileDef::Curve() { return (IfcBoundedCurve*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(2))); }
+IfcBoundedCurve* IfcArbitraryOpenProfileDef::Curve() const { return (IfcBoundedCurve*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(2))); }
 void IfcArbitraryOpenProfileDef::setCurve(IfcBoundedCurve* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
 bool IfcArbitraryOpenProfileDef::is(Type::Enum v) const { return v == Type::IfcArbitraryOpenProfileDef || IfcProfileDef::is(v); }
 Type::Enum IfcArbitraryOpenProfileDef::type() const { return Type::IfcArbitraryOpenProfileDef; }
 Type::Enum IfcArbitraryOpenProfileDef::Class() { return Type::IfcArbitraryOpenProfileDef; }
-IfcArbitraryOpenProfileDef::IfcArbitraryOpenProfileDef(IfcAbstractEntityPtr e) : IfcProfileDef((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcArbitraryOpenProfileDef)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcArbitraryOpenProfileDef::IfcArbitraryOpenProfileDef(IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< IfcLabel > v2_ProfileName, IfcBoundedCurve* v3_Curve) : IfcProfileDef((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,v1_ProfileType,IfcProfileTypeEnum::ToString(v1_ProfileType)); if (v2_ProfileName) { e->setArgument(1,(*v2_ProfileName)); } else { e->setArgument(1); } e->setArgument(2,(v3_Curve)); entity = e; EntityBuffer::Add(this); }
+IfcArbitraryOpenProfileDef::IfcArbitraryOpenProfileDef(IfcAbstractEntity* e) : IfcProfileDef((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcArbitraryOpenProfileDef)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcArbitraryOpenProfileDef::IfcArbitraryOpenProfileDef(IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< std::string > v2_ProfileName, IfcBoundedCurve* v3_Curve) : IfcProfileDef((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,v1_ProfileType,IfcProfileTypeEnum::ToString(v1_ProfileType)); if (v2_ProfileName) { e->setArgument(1,(*v2_ProfileName)); } else { e->setArgument(1); } e->setArgument(2,(v3_Curve)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcArbitraryProfileDefWithVoids
-SHARED_PTR< IfcTemplatedEntityList< IfcCurve > > IfcArbitraryProfileDefWithVoids::InnerCurves() { RETURN_AS_LIST(IfcCurve,3) }
-void IfcArbitraryProfileDefWithVoids::setInnerCurves(SHARED_PTR< IfcTemplatedEntityList< IfcCurve > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v->generalize()); }
+IfcTemplatedEntityList< IfcCurve >::ptr IfcArbitraryProfileDefWithVoids::InnerCurves() const { IfcEntityList::ptr es = *entity->getArgument(3); return es->as<IfcCurve>(); }
+void IfcArbitraryProfileDefWithVoids::setInnerCurves(IfcTemplatedEntityList< IfcCurve >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v->generalize()); }
 bool IfcArbitraryProfileDefWithVoids::is(Type::Enum v) const { return v == Type::IfcArbitraryProfileDefWithVoids || IfcArbitraryClosedProfileDef::is(v); }
 Type::Enum IfcArbitraryProfileDefWithVoids::type() const { return Type::IfcArbitraryProfileDefWithVoids; }
 Type::Enum IfcArbitraryProfileDefWithVoids::Class() { return Type::IfcArbitraryProfileDefWithVoids; }
-IfcArbitraryProfileDefWithVoids::IfcArbitraryProfileDefWithVoids(IfcAbstractEntityPtr e) : IfcArbitraryClosedProfileDef((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcArbitraryProfileDefWithVoids)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcArbitraryProfileDefWithVoids::IfcArbitraryProfileDefWithVoids(IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< IfcLabel > v2_ProfileName, IfcCurve* v3_OuterCurve, SHARED_PTR< IfcTemplatedEntityList< IfcCurve > > v4_InnerCurves) : IfcArbitraryClosedProfileDef((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,v1_ProfileType,IfcProfileTypeEnum::ToString(v1_ProfileType)); if (v2_ProfileName) { e->setArgument(1,(*v2_ProfileName)); } else { e->setArgument(1); } e->setArgument(2,(v3_OuterCurve)); e->setArgument(3,(v4_InnerCurves)->generalize()); entity = e; EntityBuffer::Add(this); }
+IfcArbitraryProfileDefWithVoids::IfcArbitraryProfileDefWithVoids(IfcAbstractEntity* e) : IfcArbitraryClosedProfileDef((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcArbitraryProfileDefWithVoids)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcArbitraryProfileDefWithVoids::IfcArbitraryProfileDefWithVoids(IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< std::string > v2_ProfileName, IfcCurve* v3_OuterCurve, IfcTemplatedEntityList< IfcCurve >::ptr v4_InnerCurves) : IfcArbitraryClosedProfileDef((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,v1_ProfileType,IfcProfileTypeEnum::ToString(v1_ProfileType)); if (v2_ProfileName) { e->setArgument(1,(*v2_ProfileName)); } else { e->setArgument(1); } e->setArgument(2,(v3_OuterCurve)); e->setArgument(3,(v4_InnerCurves)->generalize()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcAsset
-IfcIdentifier IfcAsset::AssetID() { return *entity->getArgument(5); }
-void IfcAsset::setAssetID(IfcIdentifier v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-IfcCostValue* IfcAsset::OriginalValue() { return (IfcCostValue*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(6))); }
+std::string IfcAsset::AssetID() const { return *entity->getArgument(5); }
+void IfcAsset::setAssetID(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+IfcCostValue* IfcAsset::OriginalValue() const { return (IfcCostValue*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(6))); }
 void IfcAsset::setOriginalValue(IfcCostValue* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
-IfcCostValue* IfcAsset::CurrentValue() { return (IfcCostValue*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(7))); }
+IfcCostValue* IfcAsset::CurrentValue() const { return (IfcCostValue*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(7))); }
 void IfcAsset::setCurrentValue(IfcCostValue* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
-IfcCostValue* IfcAsset::TotalReplacementCost() { return (IfcCostValue*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(8))); }
+IfcCostValue* IfcAsset::TotalReplacementCost() const { return (IfcCostValue*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(8))); }
 void IfcAsset::setTotalReplacementCost(IfcCostValue* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
-IfcActorSelect IfcAsset::Owner() { return *entity->getArgument(9); }
-void IfcAsset::setOwner(IfcActorSelect v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
-IfcActorSelect IfcAsset::User() { return *entity->getArgument(10); }
-void IfcAsset::setUser(IfcActorSelect v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
-IfcPerson* IfcAsset::ResponsiblePerson() { return (IfcPerson*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(11))); }
+IfcActorSelect* IfcAsset::Owner() const { return (IfcActorSelect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(9))); }
+void IfcAsset::setOwner(IfcActorSelect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
+IfcActorSelect* IfcAsset::User() const { return (IfcActorSelect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(10))); }
+void IfcAsset::setUser(IfcActorSelect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
+IfcPerson* IfcAsset::ResponsiblePerson() const { return (IfcPerson*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(11))); }
 void IfcAsset::setResponsiblePerson(IfcPerson* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(11,v); }
-IfcCalendarDate* IfcAsset::IncorporationDate() { return (IfcCalendarDate*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(12))); }
+IfcCalendarDate* IfcAsset::IncorporationDate() const { return (IfcCalendarDate*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(12))); }
 void IfcAsset::setIncorporationDate(IfcCalendarDate* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(12,v); }
-IfcCostValue* IfcAsset::DepreciatedValue() { return (IfcCostValue*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(13))); }
+IfcCostValue* IfcAsset::DepreciatedValue() const { return (IfcCostValue*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(13))); }
 void IfcAsset::setDepreciatedValue(IfcCostValue* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(13,v); }
 bool IfcAsset::is(Type::Enum v) const { return v == Type::IfcAsset || IfcGroup::is(v); }
 Type::Enum IfcAsset::type() const { return Type::IfcAsset; }
 Type::Enum IfcAsset::Class() { return Type::IfcAsset; }
-IfcAsset::IfcAsset(IfcAbstractEntityPtr e) : IfcGroup((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcAsset)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcAsset::IfcAsset(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcIdentifier v6_AssetID, IfcCostValue* v7_OriginalValue, IfcCostValue* v8_CurrentValue, IfcCostValue* v9_TotalReplacementCost, IfcActorSelect v10_Owner, IfcActorSelect v11_User, IfcPerson* v12_ResponsiblePerson, IfcCalendarDate* v13_IncorporationDate, IfcCostValue* v14_DepreciatedValue) : IfcGroup((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_AssetID)); e->setArgument(6,(v7_OriginalValue)); e->setArgument(7,(v8_CurrentValue)); e->setArgument(8,(v9_TotalReplacementCost)); e->setArgument(9,(v10_Owner)); e->setArgument(10,(v11_User)); e->setArgument(11,(v12_ResponsiblePerson)); e->setArgument(12,(v13_IncorporationDate)); e->setArgument(13,(v14_DepreciatedValue)); entity = e; EntityBuffer::Add(this); }
+IfcAsset::IfcAsset(IfcAbstractEntity* e) : IfcGroup((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcAsset)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcAsset::IfcAsset(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, std::string v6_AssetID, IfcCostValue* v7_OriginalValue, IfcCostValue* v8_CurrentValue, IfcCostValue* v9_TotalReplacementCost, IfcActorSelect* v10_Owner, IfcActorSelect* v11_User, IfcPerson* v12_ResponsiblePerson, IfcCalendarDate* v13_IncorporationDate, IfcCostValue* v14_DepreciatedValue) : IfcGroup((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_AssetID)); e->setArgument(6,(v7_OriginalValue)); e->setArgument(7,(v8_CurrentValue)); e->setArgument(8,(v9_TotalReplacementCost)); e->setArgument(9,(v10_Owner)); e->setArgument(10,(v11_User)); e->setArgument(11,(v12_ResponsiblePerson)); e->setArgument(12,(v13_IncorporationDate)); e->setArgument(13,(v14_DepreciatedValue)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcAsymmetricIShapeProfileDef
-IfcPositiveLengthMeasure IfcAsymmetricIShapeProfileDef::TopFlangeWidth() { return *entity->getArgument(8); }
-void IfcAsymmetricIShapeProfileDef::setTopFlangeWidth(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
-bool IfcAsymmetricIShapeProfileDef::hasTopFlangeThickness() { return !entity->getArgument(9)->isNull(); }
-IfcPositiveLengthMeasure IfcAsymmetricIShapeProfileDef::TopFlangeThickness() { return *entity->getArgument(9); }
-void IfcAsymmetricIShapeProfileDef::setTopFlangeThickness(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
-bool IfcAsymmetricIShapeProfileDef::hasTopFlangeFilletRadius() { return !entity->getArgument(10)->isNull(); }
-IfcPositiveLengthMeasure IfcAsymmetricIShapeProfileDef::TopFlangeFilletRadius() { return *entity->getArgument(10); }
-void IfcAsymmetricIShapeProfileDef::setTopFlangeFilletRadius(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
-bool IfcAsymmetricIShapeProfileDef::hasCentreOfGravityInY() { return !entity->getArgument(11)->isNull(); }
-IfcPositiveLengthMeasure IfcAsymmetricIShapeProfileDef::CentreOfGravityInY() { return *entity->getArgument(11); }
-void IfcAsymmetricIShapeProfileDef::setCentreOfGravityInY(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(11,v); }
+double IfcAsymmetricIShapeProfileDef::TopFlangeWidth() const { return *entity->getArgument(8); }
+void IfcAsymmetricIShapeProfileDef::setTopFlangeWidth(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
+bool IfcAsymmetricIShapeProfileDef::hasTopFlangeThickness() const { return !entity->getArgument(9)->isNull(); }
+double IfcAsymmetricIShapeProfileDef::TopFlangeThickness() const { return *entity->getArgument(9); }
+void IfcAsymmetricIShapeProfileDef::setTopFlangeThickness(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
+bool IfcAsymmetricIShapeProfileDef::hasTopFlangeFilletRadius() const { return !entity->getArgument(10)->isNull(); }
+double IfcAsymmetricIShapeProfileDef::TopFlangeFilletRadius() const { return *entity->getArgument(10); }
+void IfcAsymmetricIShapeProfileDef::setTopFlangeFilletRadius(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
+bool IfcAsymmetricIShapeProfileDef::hasCentreOfGravityInY() const { return !entity->getArgument(11)->isNull(); }
+double IfcAsymmetricIShapeProfileDef::CentreOfGravityInY() const { return *entity->getArgument(11); }
+void IfcAsymmetricIShapeProfileDef::setCentreOfGravityInY(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(11,v); }
 bool IfcAsymmetricIShapeProfileDef::is(Type::Enum v) const { return v == Type::IfcAsymmetricIShapeProfileDef || IfcIShapeProfileDef::is(v); }
 Type::Enum IfcAsymmetricIShapeProfileDef::type() const { return Type::IfcAsymmetricIShapeProfileDef; }
 Type::Enum IfcAsymmetricIShapeProfileDef::Class() { return Type::IfcAsymmetricIShapeProfileDef; }
-IfcAsymmetricIShapeProfileDef::IfcAsymmetricIShapeProfileDef(IfcAbstractEntityPtr e) : IfcIShapeProfileDef((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcAsymmetricIShapeProfileDef)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcAsymmetricIShapeProfileDef::IfcAsymmetricIShapeProfileDef(IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< IfcLabel > v2_ProfileName, IfcAxis2Placement2D* v3_Position, IfcPositiveLengthMeasure v4_OverallWidth, IfcPositiveLengthMeasure v5_OverallDepth, IfcPositiveLengthMeasure v6_WebThickness, IfcPositiveLengthMeasure v7_FlangeThickness, boost::optional< IfcPositiveLengthMeasure > v8_FilletRadius, IfcPositiveLengthMeasure v9_TopFlangeWidth, boost::optional< IfcPositiveLengthMeasure > v10_TopFlangeThickness, boost::optional< IfcPositiveLengthMeasure > v11_TopFlangeFilletRadius, boost::optional< IfcPositiveLengthMeasure > v12_CentreOfGravityInY) : IfcIShapeProfileDef((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,v1_ProfileType,IfcProfileTypeEnum::ToString(v1_ProfileType)); if (v2_ProfileName) { e->setArgument(1,(*v2_ProfileName)); } else { e->setArgument(1); } e->setArgument(2,(v3_Position)); e->setArgument(3,(v4_OverallWidth)); e->setArgument(4,(v5_OverallDepth)); e->setArgument(5,(v6_WebThickness)); e->setArgument(6,(v7_FlangeThickness)); if (v8_FilletRadius) { e->setArgument(7,(*v8_FilletRadius)); } else { e->setArgument(7); } e->setArgument(8,(v9_TopFlangeWidth)); if (v10_TopFlangeThickness) { e->setArgument(9,(*v10_TopFlangeThickness)); } else { e->setArgument(9); } if (v11_TopFlangeFilletRadius) { e->setArgument(10,(*v11_TopFlangeFilletRadius)); } else { e->setArgument(10); } if (v12_CentreOfGravityInY) { e->setArgument(11,(*v12_CentreOfGravityInY)); } else { e->setArgument(11); } entity = e; EntityBuffer::Add(this); }
+IfcAsymmetricIShapeProfileDef::IfcAsymmetricIShapeProfileDef(IfcAbstractEntity* e) : IfcIShapeProfileDef((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcAsymmetricIShapeProfileDef)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcAsymmetricIShapeProfileDef::IfcAsymmetricIShapeProfileDef(IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< std::string > v2_ProfileName, IfcAxis2Placement2D* v3_Position, double v4_OverallWidth, double v5_OverallDepth, double v6_WebThickness, double v7_FlangeThickness, boost::optional< double > v8_FilletRadius, double v9_TopFlangeWidth, boost::optional< double > v10_TopFlangeThickness, boost::optional< double > v11_TopFlangeFilletRadius, boost::optional< double > v12_CentreOfGravityInY) : IfcIShapeProfileDef((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,v1_ProfileType,IfcProfileTypeEnum::ToString(v1_ProfileType)); if (v2_ProfileName) { e->setArgument(1,(*v2_ProfileName)); } else { e->setArgument(1); } e->setArgument(2,(v3_Position)); e->setArgument(3,(v4_OverallWidth)); e->setArgument(4,(v5_OverallDepth)); e->setArgument(5,(v6_WebThickness)); e->setArgument(6,(v7_FlangeThickness)); if (v8_FilletRadius) { e->setArgument(7,(*v8_FilletRadius)); } else { e->setArgument(7); } e->setArgument(8,(v9_TopFlangeWidth)); if (v10_TopFlangeThickness) { e->setArgument(9,(*v10_TopFlangeThickness)); } else { e->setArgument(9); } if (v11_TopFlangeFilletRadius) { e->setArgument(10,(*v11_TopFlangeFilletRadius)); } else { e->setArgument(10); } if (v12_CentreOfGravityInY) { e->setArgument(11,(*v12_CentreOfGravityInY)); } else { e->setArgument(11); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcAxis1Placement
-bool IfcAxis1Placement::hasAxis() { return !entity->getArgument(1)->isNull(); }
-IfcDirection* IfcAxis1Placement::Axis() { return (IfcDirection*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(1))); }
+bool IfcAxis1Placement::hasAxis() const { return !entity->getArgument(1)->isNull(); }
+IfcDirection* IfcAxis1Placement::Axis() const { return (IfcDirection*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(1))); }
 void IfcAxis1Placement::setAxis(IfcDirection* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
 bool IfcAxis1Placement::is(Type::Enum v) const { return v == Type::IfcAxis1Placement || IfcPlacement::is(v); }
 Type::Enum IfcAxis1Placement::type() const { return Type::IfcAxis1Placement; }
 Type::Enum IfcAxis1Placement::Class() { return Type::IfcAxis1Placement; }
-IfcAxis1Placement::IfcAxis1Placement(IfcAbstractEntityPtr e) : IfcPlacement((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcAxis1Placement)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcAxis1Placement::IfcAxis1Placement(IfcCartesianPoint* v1_Location, IfcDirection* v2_Axis) : IfcPlacement((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Location)); e->setArgument(1,(v2_Axis)); entity = e; EntityBuffer::Add(this); }
+IfcAxis1Placement::IfcAxis1Placement(IfcAbstractEntity* e) : IfcPlacement((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcAxis1Placement)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcAxis1Placement::IfcAxis1Placement(IfcCartesianPoint* v1_Location, IfcDirection* v2_Axis) : IfcPlacement((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Location)); e->setArgument(1,(v2_Axis)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcAxis2Placement2D
-bool IfcAxis2Placement2D::hasRefDirection() { return !entity->getArgument(1)->isNull(); }
-IfcDirection* IfcAxis2Placement2D::RefDirection() { return (IfcDirection*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(1))); }
+bool IfcAxis2Placement2D::hasRefDirection() const { return !entity->getArgument(1)->isNull(); }
+IfcDirection* IfcAxis2Placement2D::RefDirection() const { return (IfcDirection*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(1))); }
 void IfcAxis2Placement2D::setRefDirection(IfcDirection* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
 bool IfcAxis2Placement2D::is(Type::Enum v) const { return v == Type::IfcAxis2Placement2D || IfcPlacement::is(v); }
 Type::Enum IfcAxis2Placement2D::type() const { return Type::IfcAxis2Placement2D; }
 Type::Enum IfcAxis2Placement2D::Class() { return Type::IfcAxis2Placement2D; }
-IfcAxis2Placement2D::IfcAxis2Placement2D(IfcAbstractEntityPtr e) : IfcPlacement((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcAxis2Placement2D)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcAxis2Placement2D::IfcAxis2Placement2D(IfcCartesianPoint* v1_Location, IfcDirection* v2_RefDirection) : IfcPlacement((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Location)); e->setArgument(1,(v2_RefDirection)); entity = e; EntityBuffer::Add(this); }
+IfcAxis2Placement2D::IfcAxis2Placement2D(IfcAbstractEntity* e) : IfcPlacement((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcAxis2Placement2D)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcAxis2Placement2D::IfcAxis2Placement2D(IfcCartesianPoint* v1_Location, IfcDirection* v2_RefDirection) : IfcPlacement((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Location)); e->setArgument(1,(v2_RefDirection)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcAxis2Placement3D
-bool IfcAxis2Placement3D::hasAxis() { return !entity->getArgument(1)->isNull(); }
-IfcDirection* IfcAxis2Placement3D::Axis() { return (IfcDirection*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(1))); }
+bool IfcAxis2Placement3D::hasAxis() const { return !entity->getArgument(1)->isNull(); }
+IfcDirection* IfcAxis2Placement3D::Axis() const { return (IfcDirection*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(1))); }
 void IfcAxis2Placement3D::setAxis(IfcDirection* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-bool IfcAxis2Placement3D::hasRefDirection() { return !entity->getArgument(2)->isNull(); }
-IfcDirection* IfcAxis2Placement3D::RefDirection() { return (IfcDirection*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(2))); }
+bool IfcAxis2Placement3D::hasRefDirection() const { return !entity->getArgument(2)->isNull(); }
+IfcDirection* IfcAxis2Placement3D::RefDirection() const { return (IfcDirection*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(2))); }
 void IfcAxis2Placement3D::setRefDirection(IfcDirection* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
 bool IfcAxis2Placement3D::is(Type::Enum v) const { return v == Type::IfcAxis2Placement3D || IfcPlacement::is(v); }
 Type::Enum IfcAxis2Placement3D::type() const { return Type::IfcAxis2Placement3D; }
 Type::Enum IfcAxis2Placement3D::Class() { return Type::IfcAxis2Placement3D; }
-IfcAxis2Placement3D::IfcAxis2Placement3D(IfcAbstractEntityPtr e) : IfcPlacement((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcAxis2Placement3D)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcAxis2Placement3D::IfcAxis2Placement3D(IfcCartesianPoint* v1_Location, IfcDirection* v2_Axis, IfcDirection* v3_RefDirection) : IfcPlacement((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Location)); e->setArgument(1,(v2_Axis)); e->setArgument(2,(v3_RefDirection)); entity = e; EntityBuffer::Add(this); }
+IfcAxis2Placement3D::IfcAxis2Placement3D(IfcAbstractEntity* e) : IfcPlacement((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcAxis2Placement3D)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcAxis2Placement3D::IfcAxis2Placement3D(IfcCartesianPoint* v1_Location, IfcDirection* v2_Axis, IfcDirection* v3_RefDirection) : IfcPlacement((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Location)); e->setArgument(1,(v2_Axis)); e->setArgument(2,(v3_RefDirection)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcBSplineCurve
-int IfcBSplineCurve::Degree() { return *entity->getArgument(0); }
+int IfcBSplineCurve::Degree() const { return *entity->getArgument(0); }
 void IfcBSplineCurve::setDegree(int v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-SHARED_PTR< IfcTemplatedEntityList< IfcCartesianPoint > > IfcBSplineCurve::ControlPointsList() { RETURN_AS_LIST(IfcCartesianPoint,1) }
-void IfcBSplineCurve::setControlPointsList(SHARED_PTR< IfcTemplatedEntityList< IfcCartesianPoint > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v->generalize()); }
-IfcBSplineCurveForm::IfcBSplineCurveForm IfcBSplineCurve::CurveForm() { return IfcBSplineCurveForm::FromString(*entity->getArgument(2)); }
+IfcTemplatedEntityList< IfcCartesianPoint >::ptr IfcBSplineCurve::ControlPointsList() const { IfcEntityList::ptr es = *entity->getArgument(1); return es->as<IfcCartesianPoint>(); }
+void IfcBSplineCurve::setControlPointsList(IfcTemplatedEntityList< IfcCartesianPoint >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v->generalize()); }
+IfcBSplineCurveForm::IfcBSplineCurveForm IfcBSplineCurve::CurveForm() const { return IfcBSplineCurveForm::FromString(*entity->getArgument(2)); }
 void IfcBSplineCurve::setCurveForm(IfcBSplineCurveForm::IfcBSplineCurveForm v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v,IfcBSplineCurveForm::ToString(v)); }
-bool IfcBSplineCurve::ClosedCurve() { return *entity->getArgument(3); }
+bool IfcBSplineCurve::ClosedCurve() const { return *entity->getArgument(3); }
 void IfcBSplineCurve::setClosedCurve(bool v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-bool IfcBSplineCurve::SelfIntersect() { return *entity->getArgument(4); }
+bool IfcBSplineCurve::SelfIntersect() const { return *entity->getArgument(4); }
 void IfcBSplineCurve::setSelfIntersect(bool v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
 bool IfcBSplineCurve::is(Type::Enum v) const { return v == Type::IfcBSplineCurve || IfcBoundedCurve::is(v); }
 Type::Enum IfcBSplineCurve::type() const { return Type::IfcBSplineCurve; }
 Type::Enum IfcBSplineCurve::Class() { return Type::IfcBSplineCurve; }
-IfcBSplineCurve::IfcBSplineCurve(IfcAbstractEntityPtr e) : IfcBoundedCurve((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcBSplineCurve)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcBSplineCurve::IfcBSplineCurve(int v1_Degree, SHARED_PTR< IfcTemplatedEntityList< IfcCartesianPoint > > v2_ControlPointsList, IfcBSplineCurveForm::IfcBSplineCurveForm v3_CurveForm, bool v4_ClosedCurve, bool v5_SelfIntersect) : IfcBoundedCurve((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Degree)); e->setArgument(1,(v2_ControlPointsList)->generalize()); e->setArgument(2,v3_CurveForm,IfcBSplineCurveForm::ToString(v3_CurveForm)); e->setArgument(3,(v4_ClosedCurve)); e->setArgument(4,(v5_SelfIntersect)); entity = e; EntityBuffer::Add(this); }
+IfcBSplineCurve::IfcBSplineCurve(IfcAbstractEntity* e) : IfcBoundedCurve((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcBSplineCurve)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcBSplineCurve::IfcBSplineCurve(int v1_Degree, IfcTemplatedEntityList< IfcCartesianPoint >::ptr v2_ControlPointsList, IfcBSplineCurveForm::IfcBSplineCurveForm v3_CurveForm, bool v4_ClosedCurve, bool v5_SelfIntersect) : IfcBoundedCurve((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Degree)); e->setArgument(1,(v2_ControlPointsList)->generalize()); e->setArgument(2,v3_CurveForm,IfcBSplineCurveForm::ToString(v3_CurveForm)); e->setArgument(3,(v4_ClosedCurve)); e->setArgument(4,(v5_SelfIntersect)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcBeam
 bool IfcBeam::is(Type::Enum v) const { return v == Type::IfcBeam || IfcBuildingElement::is(v); }
 Type::Enum IfcBeam::type() const { return Type::IfcBeam; }
 Type::Enum IfcBeam::Class() { return Type::IfcBeam; }
-IfcBeam::IfcBeam(IfcAbstractEntityPtr e) : IfcBuildingElement((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcBeam)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcBeam::IfcBeam(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag) : IfcBuildingElement((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
+IfcBeam::IfcBeam(IfcAbstractEntity* e) : IfcBuildingElement((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcBeam)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcBeam::IfcBeam(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag) : IfcBuildingElement((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcBeamType
-IfcBeamTypeEnum::IfcBeamTypeEnum IfcBeamType::PredefinedType() { return IfcBeamTypeEnum::FromString(*entity->getArgument(9)); }
+IfcBeamTypeEnum::IfcBeamTypeEnum IfcBeamType::PredefinedType() const { return IfcBeamTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcBeamType::setPredefinedType(IfcBeamTypeEnum::IfcBeamTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcBeamTypeEnum::ToString(v)); }
 bool IfcBeamType::is(Type::Enum v) const { return v == Type::IfcBeamType || IfcBuildingElementType::is(v); }
 Type::Enum IfcBeamType::type() const { return Type::IfcBeamType; }
 Type::Enum IfcBeamType::Class() { return Type::IfcBeamType; }
-IfcBeamType::IfcBeamType(IfcAbstractEntityPtr e) : IfcBuildingElementType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcBeamType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcBeamType::IfcBeamType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcBeamTypeEnum::IfcBeamTypeEnum v10_PredefinedType) : IfcBuildingElementType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcBeamTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcBeamType::IfcBeamType(IfcAbstractEntity* e) : IfcBuildingElementType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcBeamType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcBeamType::IfcBeamType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcBeamTypeEnum::IfcBeamTypeEnum v10_PredefinedType) : IfcBuildingElementType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcBeamTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcBezierCurve
 bool IfcBezierCurve::is(Type::Enum v) const { return v == Type::IfcBezierCurve || IfcBSplineCurve::is(v); }
 Type::Enum IfcBezierCurve::type() const { return Type::IfcBezierCurve; }
 Type::Enum IfcBezierCurve::Class() { return Type::IfcBezierCurve; }
-IfcBezierCurve::IfcBezierCurve(IfcAbstractEntityPtr e) : IfcBSplineCurve((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcBezierCurve)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcBezierCurve::IfcBezierCurve(int v1_Degree, SHARED_PTR< IfcTemplatedEntityList< IfcCartesianPoint > > v2_ControlPointsList, IfcBSplineCurveForm::IfcBSplineCurveForm v3_CurveForm, bool v4_ClosedCurve, bool v5_SelfIntersect) : IfcBSplineCurve((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Degree)); e->setArgument(1,(v2_ControlPointsList)->generalize()); e->setArgument(2,v3_CurveForm,IfcBSplineCurveForm::ToString(v3_CurveForm)); e->setArgument(3,(v4_ClosedCurve)); e->setArgument(4,(v5_SelfIntersect)); entity = e; EntityBuffer::Add(this); }
+IfcBezierCurve::IfcBezierCurve(IfcAbstractEntity* e) : IfcBSplineCurve((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcBezierCurve)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcBezierCurve::IfcBezierCurve(int v1_Degree, IfcTemplatedEntityList< IfcCartesianPoint >::ptr v2_ControlPointsList, IfcBSplineCurveForm::IfcBSplineCurveForm v3_CurveForm, bool v4_ClosedCurve, bool v5_SelfIntersect) : IfcBSplineCurve((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Degree)); e->setArgument(1,(v2_ControlPointsList)->generalize()); e->setArgument(2,v3_CurveForm,IfcBSplineCurveForm::ToString(v3_CurveForm)); e->setArgument(3,(v4_ClosedCurve)); e->setArgument(4,(v5_SelfIntersect)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcBlobTexture
-IfcIdentifier IfcBlobTexture::RasterFormat() { return *entity->getArgument(4); }
-void IfcBlobTexture::setRasterFormat(IfcIdentifier v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-bool IfcBlobTexture::RasterCode() { return *entity->getArgument(5); }
+std::string IfcBlobTexture::RasterFormat() const { return *entity->getArgument(4); }
+void IfcBlobTexture::setRasterFormat(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+bool IfcBlobTexture::RasterCode() const { return *entity->getArgument(5); }
 void IfcBlobTexture::setRasterCode(bool v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
 bool IfcBlobTexture::is(Type::Enum v) const { return v == Type::IfcBlobTexture || IfcSurfaceTexture::is(v); }
 Type::Enum IfcBlobTexture::type() const { return Type::IfcBlobTexture; }
 Type::Enum IfcBlobTexture::Class() { return Type::IfcBlobTexture; }
-IfcBlobTexture::IfcBlobTexture(IfcAbstractEntityPtr e) : IfcSurfaceTexture((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcBlobTexture)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcBlobTexture::IfcBlobTexture(bool v1_RepeatS, bool v2_RepeatT, IfcSurfaceTextureEnum::IfcSurfaceTextureEnum v3_TextureType, IfcCartesianTransformationOperator2D* v4_TextureTransform, IfcIdentifier v5_RasterFormat, bool v6_RasterCode) : IfcSurfaceTexture((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_RepeatS)); e->setArgument(1,(v2_RepeatT)); e->setArgument(2,v3_TextureType,IfcSurfaceTextureEnum::ToString(v3_TextureType)); e->setArgument(3,(v4_TextureTransform)); e->setArgument(4,(v5_RasterFormat)); e->setArgument(5,(v6_RasterCode)); entity = e; EntityBuffer::Add(this); }
+IfcBlobTexture::IfcBlobTexture(IfcAbstractEntity* e) : IfcSurfaceTexture((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcBlobTexture)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcBlobTexture::IfcBlobTexture(bool v1_RepeatS, bool v2_RepeatT, IfcSurfaceTextureEnum::IfcSurfaceTextureEnum v3_TextureType, IfcCartesianTransformationOperator2D* v4_TextureTransform, std::string v5_RasterFormat, bool v6_RasterCode) : IfcSurfaceTexture((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_RepeatS)); e->setArgument(1,(v2_RepeatT)); e->setArgument(2,v3_TextureType,IfcSurfaceTextureEnum::ToString(v3_TextureType)); e->setArgument(3,(v4_TextureTransform)); e->setArgument(4,(v5_RasterFormat)); e->setArgument(5,(v6_RasterCode)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcBlock
-IfcPositiveLengthMeasure IfcBlock::XLength() { return *entity->getArgument(1); }
-void IfcBlock::setXLength(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-IfcPositiveLengthMeasure IfcBlock::YLength() { return *entity->getArgument(2); }
-void IfcBlock::setYLength(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-IfcPositiveLengthMeasure IfcBlock::ZLength() { return *entity->getArgument(3); }
-void IfcBlock::setZLength(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+double IfcBlock::XLength() const { return *entity->getArgument(1); }
+void IfcBlock::setXLength(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+double IfcBlock::YLength() const { return *entity->getArgument(2); }
+void IfcBlock::setYLength(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+double IfcBlock::ZLength() const { return *entity->getArgument(3); }
+void IfcBlock::setZLength(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
 bool IfcBlock::is(Type::Enum v) const { return v == Type::IfcBlock || IfcCsgPrimitive3D::is(v); }
 Type::Enum IfcBlock::type() const { return Type::IfcBlock; }
 Type::Enum IfcBlock::Class() { return Type::IfcBlock; }
-IfcBlock::IfcBlock(IfcAbstractEntityPtr e) : IfcCsgPrimitive3D((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcBlock)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcBlock::IfcBlock(IfcAxis2Placement3D* v1_Position, IfcPositiveLengthMeasure v2_XLength, IfcPositiveLengthMeasure v3_YLength, IfcPositiveLengthMeasure v4_ZLength) : IfcCsgPrimitive3D((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Position)); e->setArgument(1,(v2_XLength)); e->setArgument(2,(v3_YLength)); e->setArgument(3,(v4_ZLength)); entity = e; EntityBuffer::Add(this); }
+IfcBlock::IfcBlock(IfcAbstractEntity* e) : IfcCsgPrimitive3D((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcBlock)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcBlock::IfcBlock(IfcAxis2Placement3D* v1_Position, double v2_XLength, double v3_YLength, double v4_ZLength) : IfcCsgPrimitive3D((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Position)); e->setArgument(1,(v2_XLength)); e->setArgument(2,(v3_YLength)); e->setArgument(3,(v4_ZLength)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcBoilerType
-IfcBoilerTypeEnum::IfcBoilerTypeEnum IfcBoilerType::PredefinedType() { return IfcBoilerTypeEnum::FromString(*entity->getArgument(9)); }
+IfcBoilerTypeEnum::IfcBoilerTypeEnum IfcBoilerType::PredefinedType() const { return IfcBoilerTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcBoilerType::setPredefinedType(IfcBoilerTypeEnum::IfcBoilerTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcBoilerTypeEnum::ToString(v)); }
 bool IfcBoilerType::is(Type::Enum v) const { return v == Type::IfcBoilerType || IfcEnergyConversionDeviceType::is(v); }
 Type::Enum IfcBoilerType::type() const { return Type::IfcBoilerType; }
 Type::Enum IfcBoilerType::Class() { return Type::IfcBoilerType; }
-IfcBoilerType::IfcBoilerType(IfcAbstractEntityPtr e) : IfcEnergyConversionDeviceType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcBoilerType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcBoilerType::IfcBoilerType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcBoilerTypeEnum::IfcBoilerTypeEnum v10_PredefinedType) : IfcEnergyConversionDeviceType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcBoilerTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcBoilerType::IfcBoilerType(IfcAbstractEntity* e) : IfcEnergyConversionDeviceType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcBoilerType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcBoilerType::IfcBoilerType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcBoilerTypeEnum::IfcBoilerTypeEnum v10_PredefinedType) : IfcEnergyConversionDeviceType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcBoilerTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcBooleanClippingResult
 bool IfcBooleanClippingResult::is(Type::Enum v) const { return v == Type::IfcBooleanClippingResult || IfcBooleanResult::is(v); }
 Type::Enum IfcBooleanClippingResult::type() const { return Type::IfcBooleanClippingResult; }
 Type::Enum IfcBooleanClippingResult::Class() { return Type::IfcBooleanClippingResult; }
-IfcBooleanClippingResult::IfcBooleanClippingResult(IfcAbstractEntityPtr e) : IfcBooleanResult((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcBooleanClippingResult)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcBooleanClippingResult::IfcBooleanClippingResult(IfcBooleanOperator::IfcBooleanOperator v1_Operator, IfcBooleanOperand v2_FirstOperand, IfcBooleanOperand v3_SecondOperand) : IfcBooleanResult((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,v1_Operator,IfcBooleanOperator::ToString(v1_Operator)); e->setArgument(1,(v2_FirstOperand)); e->setArgument(2,(v3_SecondOperand)); entity = e; EntityBuffer::Add(this); }
+IfcBooleanClippingResult::IfcBooleanClippingResult(IfcAbstractEntity* e) : IfcBooleanResult((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcBooleanClippingResult)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcBooleanClippingResult::IfcBooleanClippingResult(IfcBooleanOperator::IfcBooleanOperator v1_Operator, IfcBooleanOperand* v2_FirstOperand, IfcBooleanOperand* v3_SecondOperand) : IfcBooleanResult((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,v1_Operator,IfcBooleanOperator::ToString(v1_Operator)); e->setArgument(1,(v2_FirstOperand)); e->setArgument(2,(v3_SecondOperand)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcBooleanResult
-IfcBooleanOperator::IfcBooleanOperator IfcBooleanResult::Operator() { return IfcBooleanOperator::FromString(*entity->getArgument(0)); }
+IfcBooleanOperator::IfcBooleanOperator IfcBooleanResult::Operator() const { return IfcBooleanOperator::FromString(*entity->getArgument(0)); }
 void IfcBooleanResult::setOperator(IfcBooleanOperator::IfcBooleanOperator v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v,IfcBooleanOperator::ToString(v)); }
-IfcBooleanOperand IfcBooleanResult::FirstOperand() { return *entity->getArgument(1); }
-void IfcBooleanResult::setFirstOperand(IfcBooleanOperand v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-IfcBooleanOperand IfcBooleanResult::SecondOperand() { return *entity->getArgument(2); }
-void IfcBooleanResult::setSecondOperand(IfcBooleanOperand v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+IfcBooleanOperand* IfcBooleanResult::FirstOperand() const { return (IfcBooleanOperand*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(1))); }
+void IfcBooleanResult::setFirstOperand(IfcBooleanOperand* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+IfcBooleanOperand* IfcBooleanResult::SecondOperand() const { return (IfcBooleanOperand*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(2))); }
+void IfcBooleanResult::setSecondOperand(IfcBooleanOperand* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
 bool IfcBooleanResult::is(Type::Enum v) const { return v == Type::IfcBooleanResult || IfcGeometricRepresentationItem::is(v); }
 Type::Enum IfcBooleanResult::type() const { return Type::IfcBooleanResult; }
 Type::Enum IfcBooleanResult::Class() { return Type::IfcBooleanResult; }
-IfcBooleanResult::IfcBooleanResult(IfcAbstractEntityPtr e) : IfcGeometricRepresentationItem((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcBooleanResult)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcBooleanResult::IfcBooleanResult(IfcBooleanOperator::IfcBooleanOperator v1_Operator, IfcBooleanOperand v2_FirstOperand, IfcBooleanOperand v3_SecondOperand) : IfcGeometricRepresentationItem((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,v1_Operator,IfcBooleanOperator::ToString(v1_Operator)); e->setArgument(1,(v2_FirstOperand)); e->setArgument(2,(v3_SecondOperand)); entity = e; EntityBuffer::Add(this); }
+IfcBooleanResult::IfcBooleanResult(IfcAbstractEntity* e) : IfcGeometricRepresentationItem((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcBooleanResult)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcBooleanResult::IfcBooleanResult(IfcBooleanOperator::IfcBooleanOperator v1_Operator, IfcBooleanOperand* v2_FirstOperand, IfcBooleanOperand* v3_SecondOperand) : IfcGeometricRepresentationItem((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,v1_Operator,IfcBooleanOperator::ToString(v1_Operator)); e->setArgument(1,(v2_FirstOperand)); e->setArgument(2,(v3_SecondOperand)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcBoundaryCondition
-bool IfcBoundaryCondition::hasName() { return !entity->getArgument(0)->isNull(); }
-IfcLabel IfcBoundaryCondition::Name() { return *entity->getArgument(0); }
-void IfcBoundaryCondition::setName(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+bool IfcBoundaryCondition::hasName() const { return !entity->getArgument(0)->isNull(); }
+std::string IfcBoundaryCondition::Name() const { return *entity->getArgument(0); }
+void IfcBoundaryCondition::setName(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
 bool IfcBoundaryCondition::is(Type::Enum v) const { return v == Type::IfcBoundaryCondition; }
 Type::Enum IfcBoundaryCondition::type() const { return Type::IfcBoundaryCondition; }
 Type::Enum IfcBoundaryCondition::Class() { return Type::IfcBoundaryCondition; }
-IfcBoundaryCondition::IfcBoundaryCondition(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcBoundaryCondition)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcBoundaryCondition::IfcBoundaryCondition(boost::optional< IfcLabel > v1_Name) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } entity = e; EntityBuffer::Add(this); }
+IfcBoundaryCondition::IfcBoundaryCondition(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcBoundaryCondition)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcBoundaryCondition::IfcBoundaryCondition(boost::optional< std::string > v1_Name) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcBoundaryEdgeCondition
-bool IfcBoundaryEdgeCondition::hasLinearStiffnessByLengthX() { return !entity->getArgument(1)->isNull(); }
-IfcModulusOfLinearSubgradeReactionMeasure IfcBoundaryEdgeCondition::LinearStiffnessByLengthX() { return *entity->getArgument(1); }
-void IfcBoundaryEdgeCondition::setLinearStiffnessByLengthX(IfcModulusOfLinearSubgradeReactionMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-bool IfcBoundaryEdgeCondition::hasLinearStiffnessByLengthY() { return !entity->getArgument(2)->isNull(); }
-IfcModulusOfLinearSubgradeReactionMeasure IfcBoundaryEdgeCondition::LinearStiffnessByLengthY() { return *entity->getArgument(2); }
-void IfcBoundaryEdgeCondition::setLinearStiffnessByLengthY(IfcModulusOfLinearSubgradeReactionMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-bool IfcBoundaryEdgeCondition::hasLinearStiffnessByLengthZ() { return !entity->getArgument(3)->isNull(); }
-IfcModulusOfLinearSubgradeReactionMeasure IfcBoundaryEdgeCondition::LinearStiffnessByLengthZ() { return *entity->getArgument(3); }
-void IfcBoundaryEdgeCondition::setLinearStiffnessByLengthZ(IfcModulusOfLinearSubgradeReactionMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-bool IfcBoundaryEdgeCondition::hasRotationalStiffnessByLengthX() { return !entity->getArgument(4)->isNull(); }
-IfcModulusOfRotationalSubgradeReactionMeasure IfcBoundaryEdgeCondition::RotationalStiffnessByLengthX() { return *entity->getArgument(4); }
-void IfcBoundaryEdgeCondition::setRotationalStiffnessByLengthX(IfcModulusOfRotationalSubgradeReactionMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-bool IfcBoundaryEdgeCondition::hasRotationalStiffnessByLengthY() { return !entity->getArgument(5)->isNull(); }
-IfcModulusOfRotationalSubgradeReactionMeasure IfcBoundaryEdgeCondition::RotationalStiffnessByLengthY() { return *entity->getArgument(5); }
-void IfcBoundaryEdgeCondition::setRotationalStiffnessByLengthY(IfcModulusOfRotationalSubgradeReactionMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-bool IfcBoundaryEdgeCondition::hasRotationalStiffnessByLengthZ() { return !entity->getArgument(6)->isNull(); }
-IfcModulusOfRotationalSubgradeReactionMeasure IfcBoundaryEdgeCondition::RotationalStiffnessByLengthZ() { return *entity->getArgument(6); }
-void IfcBoundaryEdgeCondition::setRotationalStiffnessByLengthZ(IfcModulusOfRotationalSubgradeReactionMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
+bool IfcBoundaryEdgeCondition::hasLinearStiffnessByLengthX() const { return !entity->getArgument(1)->isNull(); }
+double IfcBoundaryEdgeCondition::LinearStiffnessByLengthX() const { return *entity->getArgument(1); }
+void IfcBoundaryEdgeCondition::setLinearStiffnessByLengthX(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+bool IfcBoundaryEdgeCondition::hasLinearStiffnessByLengthY() const { return !entity->getArgument(2)->isNull(); }
+double IfcBoundaryEdgeCondition::LinearStiffnessByLengthY() const { return *entity->getArgument(2); }
+void IfcBoundaryEdgeCondition::setLinearStiffnessByLengthY(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+bool IfcBoundaryEdgeCondition::hasLinearStiffnessByLengthZ() const { return !entity->getArgument(3)->isNull(); }
+double IfcBoundaryEdgeCondition::LinearStiffnessByLengthZ() const { return *entity->getArgument(3); }
+void IfcBoundaryEdgeCondition::setLinearStiffnessByLengthZ(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+bool IfcBoundaryEdgeCondition::hasRotationalStiffnessByLengthX() const { return !entity->getArgument(4)->isNull(); }
+double IfcBoundaryEdgeCondition::RotationalStiffnessByLengthX() const { return *entity->getArgument(4); }
+void IfcBoundaryEdgeCondition::setRotationalStiffnessByLengthX(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+bool IfcBoundaryEdgeCondition::hasRotationalStiffnessByLengthY() const { return !entity->getArgument(5)->isNull(); }
+double IfcBoundaryEdgeCondition::RotationalStiffnessByLengthY() const { return *entity->getArgument(5); }
+void IfcBoundaryEdgeCondition::setRotationalStiffnessByLengthY(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+bool IfcBoundaryEdgeCondition::hasRotationalStiffnessByLengthZ() const { return !entity->getArgument(6)->isNull(); }
+double IfcBoundaryEdgeCondition::RotationalStiffnessByLengthZ() const { return *entity->getArgument(6); }
+void IfcBoundaryEdgeCondition::setRotationalStiffnessByLengthZ(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
 bool IfcBoundaryEdgeCondition::is(Type::Enum v) const { return v == Type::IfcBoundaryEdgeCondition || IfcBoundaryCondition::is(v); }
 Type::Enum IfcBoundaryEdgeCondition::type() const { return Type::IfcBoundaryEdgeCondition; }
 Type::Enum IfcBoundaryEdgeCondition::Class() { return Type::IfcBoundaryEdgeCondition; }
-IfcBoundaryEdgeCondition::IfcBoundaryEdgeCondition(IfcAbstractEntityPtr e) : IfcBoundaryCondition((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcBoundaryEdgeCondition)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcBoundaryEdgeCondition::IfcBoundaryEdgeCondition(boost::optional< IfcLabel > v1_Name, boost::optional< IfcModulusOfLinearSubgradeReactionMeasure > v2_LinearStiffnessByLengthX, boost::optional< IfcModulusOfLinearSubgradeReactionMeasure > v3_LinearStiffnessByLengthY, boost::optional< IfcModulusOfLinearSubgradeReactionMeasure > v4_LinearStiffnessByLengthZ, boost::optional< IfcModulusOfRotationalSubgradeReactionMeasure > v5_RotationalStiffnessByLengthX, boost::optional< IfcModulusOfRotationalSubgradeReactionMeasure > v6_RotationalStiffnessByLengthY, boost::optional< IfcModulusOfRotationalSubgradeReactionMeasure > v7_RotationalStiffnessByLengthZ) : IfcBoundaryCondition((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_LinearStiffnessByLengthX) { e->setArgument(1,(*v2_LinearStiffnessByLengthX)); } else { e->setArgument(1); } if (v3_LinearStiffnessByLengthY) { e->setArgument(2,(*v3_LinearStiffnessByLengthY)); } else { e->setArgument(2); } if (v4_LinearStiffnessByLengthZ) { e->setArgument(3,(*v4_LinearStiffnessByLengthZ)); } else { e->setArgument(3); } if (v5_RotationalStiffnessByLengthX) { e->setArgument(4,(*v5_RotationalStiffnessByLengthX)); } else { e->setArgument(4); } if (v6_RotationalStiffnessByLengthY) { e->setArgument(5,(*v6_RotationalStiffnessByLengthY)); } else { e->setArgument(5); } if (v7_RotationalStiffnessByLengthZ) { e->setArgument(6,(*v7_RotationalStiffnessByLengthZ)); } else { e->setArgument(6); } entity = e; EntityBuffer::Add(this); }
+IfcBoundaryEdgeCondition::IfcBoundaryEdgeCondition(IfcAbstractEntity* e) : IfcBoundaryCondition((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcBoundaryEdgeCondition)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcBoundaryEdgeCondition::IfcBoundaryEdgeCondition(boost::optional< std::string > v1_Name, boost::optional< double > v2_LinearStiffnessByLengthX, boost::optional< double > v3_LinearStiffnessByLengthY, boost::optional< double > v4_LinearStiffnessByLengthZ, boost::optional< double > v5_RotationalStiffnessByLengthX, boost::optional< double > v6_RotationalStiffnessByLengthY, boost::optional< double > v7_RotationalStiffnessByLengthZ) : IfcBoundaryCondition((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_LinearStiffnessByLengthX) { e->setArgument(1,(*v2_LinearStiffnessByLengthX)); } else { e->setArgument(1); } if (v3_LinearStiffnessByLengthY) { e->setArgument(2,(*v3_LinearStiffnessByLengthY)); } else { e->setArgument(2); } if (v4_LinearStiffnessByLengthZ) { e->setArgument(3,(*v4_LinearStiffnessByLengthZ)); } else { e->setArgument(3); } if (v5_RotationalStiffnessByLengthX) { e->setArgument(4,(*v5_RotationalStiffnessByLengthX)); } else { e->setArgument(4); } if (v6_RotationalStiffnessByLengthY) { e->setArgument(5,(*v6_RotationalStiffnessByLengthY)); } else { e->setArgument(5); } if (v7_RotationalStiffnessByLengthZ) { e->setArgument(6,(*v7_RotationalStiffnessByLengthZ)); } else { e->setArgument(6); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcBoundaryFaceCondition
-bool IfcBoundaryFaceCondition::hasLinearStiffnessByAreaX() { return !entity->getArgument(1)->isNull(); }
-IfcModulusOfSubgradeReactionMeasure IfcBoundaryFaceCondition::LinearStiffnessByAreaX() { return *entity->getArgument(1); }
-void IfcBoundaryFaceCondition::setLinearStiffnessByAreaX(IfcModulusOfSubgradeReactionMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-bool IfcBoundaryFaceCondition::hasLinearStiffnessByAreaY() { return !entity->getArgument(2)->isNull(); }
-IfcModulusOfSubgradeReactionMeasure IfcBoundaryFaceCondition::LinearStiffnessByAreaY() { return *entity->getArgument(2); }
-void IfcBoundaryFaceCondition::setLinearStiffnessByAreaY(IfcModulusOfSubgradeReactionMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-bool IfcBoundaryFaceCondition::hasLinearStiffnessByAreaZ() { return !entity->getArgument(3)->isNull(); }
-IfcModulusOfSubgradeReactionMeasure IfcBoundaryFaceCondition::LinearStiffnessByAreaZ() { return *entity->getArgument(3); }
-void IfcBoundaryFaceCondition::setLinearStiffnessByAreaZ(IfcModulusOfSubgradeReactionMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+bool IfcBoundaryFaceCondition::hasLinearStiffnessByAreaX() const { return !entity->getArgument(1)->isNull(); }
+double IfcBoundaryFaceCondition::LinearStiffnessByAreaX() const { return *entity->getArgument(1); }
+void IfcBoundaryFaceCondition::setLinearStiffnessByAreaX(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+bool IfcBoundaryFaceCondition::hasLinearStiffnessByAreaY() const { return !entity->getArgument(2)->isNull(); }
+double IfcBoundaryFaceCondition::LinearStiffnessByAreaY() const { return *entity->getArgument(2); }
+void IfcBoundaryFaceCondition::setLinearStiffnessByAreaY(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+bool IfcBoundaryFaceCondition::hasLinearStiffnessByAreaZ() const { return !entity->getArgument(3)->isNull(); }
+double IfcBoundaryFaceCondition::LinearStiffnessByAreaZ() const { return *entity->getArgument(3); }
+void IfcBoundaryFaceCondition::setLinearStiffnessByAreaZ(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
 bool IfcBoundaryFaceCondition::is(Type::Enum v) const { return v == Type::IfcBoundaryFaceCondition || IfcBoundaryCondition::is(v); }
 Type::Enum IfcBoundaryFaceCondition::type() const { return Type::IfcBoundaryFaceCondition; }
 Type::Enum IfcBoundaryFaceCondition::Class() { return Type::IfcBoundaryFaceCondition; }
-IfcBoundaryFaceCondition::IfcBoundaryFaceCondition(IfcAbstractEntityPtr e) : IfcBoundaryCondition((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcBoundaryFaceCondition)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcBoundaryFaceCondition::IfcBoundaryFaceCondition(boost::optional< IfcLabel > v1_Name, boost::optional< IfcModulusOfSubgradeReactionMeasure > v2_LinearStiffnessByAreaX, boost::optional< IfcModulusOfSubgradeReactionMeasure > v3_LinearStiffnessByAreaY, boost::optional< IfcModulusOfSubgradeReactionMeasure > v4_LinearStiffnessByAreaZ) : IfcBoundaryCondition((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_LinearStiffnessByAreaX) { e->setArgument(1,(*v2_LinearStiffnessByAreaX)); } else { e->setArgument(1); } if (v3_LinearStiffnessByAreaY) { e->setArgument(2,(*v3_LinearStiffnessByAreaY)); } else { e->setArgument(2); } if (v4_LinearStiffnessByAreaZ) { e->setArgument(3,(*v4_LinearStiffnessByAreaZ)); } else { e->setArgument(3); } entity = e; EntityBuffer::Add(this); }
+IfcBoundaryFaceCondition::IfcBoundaryFaceCondition(IfcAbstractEntity* e) : IfcBoundaryCondition((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcBoundaryFaceCondition)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcBoundaryFaceCondition::IfcBoundaryFaceCondition(boost::optional< std::string > v1_Name, boost::optional< double > v2_LinearStiffnessByAreaX, boost::optional< double > v3_LinearStiffnessByAreaY, boost::optional< double > v4_LinearStiffnessByAreaZ) : IfcBoundaryCondition((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_LinearStiffnessByAreaX) { e->setArgument(1,(*v2_LinearStiffnessByAreaX)); } else { e->setArgument(1); } if (v3_LinearStiffnessByAreaY) { e->setArgument(2,(*v3_LinearStiffnessByAreaY)); } else { e->setArgument(2); } if (v4_LinearStiffnessByAreaZ) { e->setArgument(3,(*v4_LinearStiffnessByAreaZ)); } else { e->setArgument(3); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcBoundaryNodeCondition
-bool IfcBoundaryNodeCondition::hasLinearStiffnessX() { return !entity->getArgument(1)->isNull(); }
-IfcLinearStiffnessMeasure IfcBoundaryNodeCondition::LinearStiffnessX() { return *entity->getArgument(1); }
-void IfcBoundaryNodeCondition::setLinearStiffnessX(IfcLinearStiffnessMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-bool IfcBoundaryNodeCondition::hasLinearStiffnessY() { return !entity->getArgument(2)->isNull(); }
-IfcLinearStiffnessMeasure IfcBoundaryNodeCondition::LinearStiffnessY() { return *entity->getArgument(2); }
-void IfcBoundaryNodeCondition::setLinearStiffnessY(IfcLinearStiffnessMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-bool IfcBoundaryNodeCondition::hasLinearStiffnessZ() { return !entity->getArgument(3)->isNull(); }
-IfcLinearStiffnessMeasure IfcBoundaryNodeCondition::LinearStiffnessZ() { return *entity->getArgument(3); }
-void IfcBoundaryNodeCondition::setLinearStiffnessZ(IfcLinearStiffnessMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-bool IfcBoundaryNodeCondition::hasRotationalStiffnessX() { return !entity->getArgument(4)->isNull(); }
-IfcRotationalStiffnessMeasure IfcBoundaryNodeCondition::RotationalStiffnessX() { return *entity->getArgument(4); }
-void IfcBoundaryNodeCondition::setRotationalStiffnessX(IfcRotationalStiffnessMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-bool IfcBoundaryNodeCondition::hasRotationalStiffnessY() { return !entity->getArgument(5)->isNull(); }
-IfcRotationalStiffnessMeasure IfcBoundaryNodeCondition::RotationalStiffnessY() { return *entity->getArgument(5); }
-void IfcBoundaryNodeCondition::setRotationalStiffnessY(IfcRotationalStiffnessMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-bool IfcBoundaryNodeCondition::hasRotationalStiffnessZ() { return !entity->getArgument(6)->isNull(); }
-IfcRotationalStiffnessMeasure IfcBoundaryNodeCondition::RotationalStiffnessZ() { return *entity->getArgument(6); }
-void IfcBoundaryNodeCondition::setRotationalStiffnessZ(IfcRotationalStiffnessMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
+bool IfcBoundaryNodeCondition::hasLinearStiffnessX() const { return !entity->getArgument(1)->isNull(); }
+double IfcBoundaryNodeCondition::LinearStiffnessX() const { return *entity->getArgument(1); }
+void IfcBoundaryNodeCondition::setLinearStiffnessX(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+bool IfcBoundaryNodeCondition::hasLinearStiffnessY() const { return !entity->getArgument(2)->isNull(); }
+double IfcBoundaryNodeCondition::LinearStiffnessY() const { return *entity->getArgument(2); }
+void IfcBoundaryNodeCondition::setLinearStiffnessY(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+bool IfcBoundaryNodeCondition::hasLinearStiffnessZ() const { return !entity->getArgument(3)->isNull(); }
+double IfcBoundaryNodeCondition::LinearStiffnessZ() const { return *entity->getArgument(3); }
+void IfcBoundaryNodeCondition::setLinearStiffnessZ(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+bool IfcBoundaryNodeCondition::hasRotationalStiffnessX() const { return !entity->getArgument(4)->isNull(); }
+double IfcBoundaryNodeCondition::RotationalStiffnessX() const { return *entity->getArgument(4); }
+void IfcBoundaryNodeCondition::setRotationalStiffnessX(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+bool IfcBoundaryNodeCondition::hasRotationalStiffnessY() const { return !entity->getArgument(5)->isNull(); }
+double IfcBoundaryNodeCondition::RotationalStiffnessY() const { return *entity->getArgument(5); }
+void IfcBoundaryNodeCondition::setRotationalStiffnessY(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+bool IfcBoundaryNodeCondition::hasRotationalStiffnessZ() const { return !entity->getArgument(6)->isNull(); }
+double IfcBoundaryNodeCondition::RotationalStiffnessZ() const { return *entity->getArgument(6); }
+void IfcBoundaryNodeCondition::setRotationalStiffnessZ(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
 bool IfcBoundaryNodeCondition::is(Type::Enum v) const { return v == Type::IfcBoundaryNodeCondition || IfcBoundaryCondition::is(v); }
 Type::Enum IfcBoundaryNodeCondition::type() const { return Type::IfcBoundaryNodeCondition; }
 Type::Enum IfcBoundaryNodeCondition::Class() { return Type::IfcBoundaryNodeCondition; }
-IfcBoundaryNodeCondition::IfcBoundaryNodeCondition(IfcAbstractEntityPtr e) : IfcBoundaryCondition((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcBoundaryNodeCondition)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcBoundaryNodeCondition::IfcBoundaryNodeCondition(boost::optional< IfcLabel > v1_Name, boost::optional< IfcLinearStiffnessMeasure > v2_LinearStiffnessX, boost::optional< IfcLinearStiffnessMeasure > v3_LinearStiffnessY, boost::optional< IfcLinearStiffnessMeasure > v4_LinearStiffnessZ, boost::optional< IfcRotationalStiffnessMeasure > v5_RotationalStiffnessX, boost::optional< IfcRotationalStiffnessMeasure > v6_RotationalStiffnessY, boost::optional< IfcRotationalStiffnessMeasure > v7_RotationalStiffnessZ) : IfcBoundaryCondition((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_LinearStiffnessX) { e->setArgument(1,(*v2_LinearStiffnessX)); } else { e->setArgument(1); } if (v3_LinearStiffnessY) { e->setArgument(2,(*v3_LinearStiffnessY)); } else { e->setArgument(2); } if (v4_LinearStiffnessZ) { e->setArgument(3,(*v4_LinearStiffnessZ)); } else { e->setArgument(3); } if (v5_RotationalStiffnessX) { e->setArgument(4,(*v5_RotationalStiffnessX)); } else { e->setArgument(4); } if (v6_RotationalStiffnessY) { e->setArgument(5,(*v6_RotationalStiffnessY)); } else { e->setArgument(5); } if (v7_RotationalStiffnessZ) { e->setArgument(6,(*v7_RotationalStiffnessZ)); } else { e->setArgument(6); } entity = e; EntityBuffer::Add(this); }
+IfcBoundaryNodeCondition::IfcBoundaryNodeCondition(IfcAbstractEntity* e) : IfcBoundaryCondition((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcBoundaryNodeCondition)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcBoundaryNodeCondition::IfcBoundaryNodeCondition(boost::optional< std::string > v1_Name, boost::optional< double > v2_LinearStiffnessX, boost::optional< double > v3_LinearStiffnessY, boost::optional< double > v4_LinearStiffnessZ, boost::optional< double > v5_RotationalStiffnessX, boost::optional< double > v6_RotationalStiffnessY, boost::optional< double > v7_RotationalStiffnessZ) : IfcBoundaryCondition((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_LinearStiffnessX) { e->setArgument(1,(*v2_LinearStiffnessX)); } else { e->setArgument(1); } if (v3_LinearStiffnessY) { e->setArgument(2,(*v3_LinearStiffnessY)); } else { e->setArgument(2); } if (v4_LinearStiffnessZ) { e->setArgument(3,(*v4_LinearStiffnessZ)); } else { e->setArgument(3); } if (v5_RotationalStiffnessX) { e->setArgument(4,(*v5_RotationalStiffnessX)); } else { e->setArgument(4); } if (v6_RotationalStiffnessY) { e->setArgument(5,(*v6_RotationalStiffnessY)); } else { e->setArgument(5); } if (v7_RotationalStiffnessZ) { e->setArgument(6,(*v7_RotationalStiffnessZ)); } else { e->setArgument(6); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcBoundaryNodeConditionWarping
-bool IfcBoundaryNodeConditionWarping::hasWarpingStiffness() { return !entity->getArgument(7)->isNull(); }
-IfcWarpingMomentMeasure IfcBoundaryNodeConditionWarping::WarpingStiffness() { return *entity->getArgument(7); }
-void IfcBoundaryNodeConditionWarping::setWarpingStiffness(IfcWarpingMomentMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
+bool IfcBoundaryNodeConditionWarping::hasWarpingStiffness() const { return !entity->getArgument(7)->isNull(); }
+double IfcBoundaryNodeConditionWarping::WarpingStiffness() const { return *entity->getArgument(7); }
+void IfcBoundaryNodeConditionWarping::setWarpingStiffness(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
 bool IfcBoundaryNodeConditionWarping::is(Type::Enum v) const { return v == Type::IfcBoundaryNodeConditionWarping || IfcBoundaryNodeCondition::is(v); }
 Type::Enum IfcBoundaryNodeConditionWarping::type() const { return Type::IfcBoundaryNodeConditionWarping; }
 Type::Enum IfcBoundaryNodeConditionWarping::Class() { return Type::IfcBoundaryNodeConditionWarping; }
-IfcBoundaryNodeConditionWarping::IfcBoundaryNodeConditionWarping(IfcAbstractEntityPtr e) : IfcBoundaryNodeCondition((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcBoundaryNodeConditionWarping)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcBoundaryNodeConditionWarping::IfcBoundaryNodeConditionWarping(boost::optional< IfcLabel > v1_Name, boost::optional< IfcLinearStiffnessMeasure > v2_LinearStiffnessX, boost::optional< IfcLinearStiffnessMeasure > v3_LinearStiffnessY, boost::optional< IfcLinearStiffnessMeasure > v4_LinearStiffnessZ, boost::optional< IfcRotationalStiffnessMeasure > v5_RotationalStiffnessX, boost::optional< IfcRotationalStiffnessMeasure > v6_RotationalStiffnessY, boost::optional< IfcRotationalStiffnessMeasure > v7_RotationalStiffnessZ, boost::optional< IfcWarpingMomentMeasure > v8_WarpingStiffness) : IfcBoundaryNodeCondition((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_LinearStiffnessX) { e->setArgument(1,(*v2_LinearStiffnessX)); } else { e->setArgument(1); } if (v3_LinearStiffnessY) { e->setArgument(2,(*v3_LinearStiffnessY)); } else { e->setArgument(2); } if (v4_LinearStiffnessZ) { e->setArgument(3,(*v4_LinearStiffnessZ)); } else { e->setArgument(3); } if (v5_RotationalStiffnessX) { e->setArgument(4,(*v5_RotationalStiffnessX)); } else { e->setArgument(4); } if (v6_RotationalStiffnessY) { e->setArgument(5,(*v6_RotationalStiffnessY)); } else { e->setArgument(5); } if (v7_RotationalStiffnessZ) { e->setArgument(6,(*v7_RotationalStiffnessZ)); } else { e->setArgument(6); } if (v8_WarpingStiffness) { e->setArgument(7,(*v8_WarpingStiffness)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
+IfcBoundaryNodeConditionWarping::IfcBoundaryNodeConditionWarping(IfcAbstractEntity* e) : IfcBoundaryNodeCondition((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcBoundaryNodeConditionWarping)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcBoundaryNodeConditionWarping::IfcBoundaryNodeConditionWarping(boost::optional< std::string > v1_Name, boost::optional< double > v2_LinearStiffnessX, boost::optional< double > v3_LinearStiffnessY, boost::optional< double > v4_LinearStiffnessZ, boost::optional< double > v5_RotationalStiffnessX, boost::optional< double > v6_RotationalStiffnessY, boost::optional< double > v7_RotationalStiffnessZ, boost::optional< double > v8_WarpingStiffness) : IfcBoundaryNodeCondition((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_LinearStiffnessX) { e->setArgument(1,(*v2_LinearStiffnessX)); } else { e->setArgument(1); } if (v3_LinearStiffnessY) { e->setArgument(2,(*v3_LinearStiffnessY)); } else { e->setArgument(2); } if (v4_LinearStiffnessZ) { e->setArgument(3,(*v4_LinearStiffnessZ)); } else { e->setArgument(3); } if (v5_RotationalStiffnessX) { e->setArgument(4,(*v5_RotationalStiffnessX)); } else { e->setArgument(4); } if (v6_RotationalStiffnessY) { e->setArgument(5,(*v6_RotationalStiffnessY)); } else { e->setArgument(5); } if (v7_RotationalStiffnessZ) { e->setArgument(6,(*v7_RotationalStiffnessZ)); } else { e->setArgument(6); } if (v8_WarpingStiffness) { e->setArgument(7,(*v8_WarpingStiffness)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcBoundedCurve
 bool IfcBoundedCurve::is(Type::Enum v) const { return v == Type::IfcBoundedCurve || IfcCurve::is(v); }
 Type::Enum IfcBoundedCurve::type() const { return Type::IfcBoundedCurve; }
 Type::Enum IfcBoundedCurve::Class() { return Type::IfcBoundedCurve; }
-IfcBoundedCurve::IfcBoundedCurve(IfcAbstractEntityPtr e) : IfcCurve((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcBoundedCurve)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcBoundedCurve::IfcBoundedCurve() : IfcCurve((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); entity = e; EntityBuffer::Add(this); }
+IfcBoundedCurve::IfcBoundedCurve(IfcAbstractEntity* e) : IfcCurve((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcBoundedCurve)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcBoundedCurve::IfcBoundedCurve() : IfcCurve((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcBoundedSurface
 bool IfcBoundedSurface::is(Type::Enum v) const { return v == Type::IfcBoundedSurface || IfcSurface::is(v); }
 Type::Enum IfcBoundedSurface::type() const { return Type::IfcBoundedSurface; }
 Type::Enum IfcBoundedSurface::Class() { return Type::IfcBoundedSurface; }
-IfcBoundedSurface::IfcBoundedSurface(IfcAbstractEntityPtr e) : IfcSurface((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcBoundedSurface)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcBoundedSurface::IfcBoundedSurface() : IfcSurface((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); entity = e; EntityBuffer::Add(this); }
+IfcBoundedSurface::IfcBoundedSurface(IfcAbstractEntity* e) : IfcSurface((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcBoundedSurface)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcBoundedSurface::IfcBoundedSurface() : IfcSurface((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcBoundingBox
-IfcCartesianPoint* IfcBoundingBox::Corner() { return (IfcCartesianPoint*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(0))); }
+IfcCartesianPoint* IfcBoundingBox::Corner() const { return (IfcCartesianPoint*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(0))); }
 void IfcBoundingBox::setCorner(IfcCartesianPoint* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-IfcPositiveLengthMeasure IfcBoundingBox::XDim() { return *entity->getArgument(1); }
-void IfcBoundingBox::setXDim(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-IfcPositiveLengthMeasure IfcBoundingBox::YDim() { return *entity->getArgument(2); }
-void IfcBoundingBox::setYDim(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-IfcPositiveLengthMeasure IfcBoundingBox::ZDim() { return *entity->getArgument(3); }
-void IfcBoundingBox::setZDim(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+double IfcBoundingBox::XDim() const { return *entity->getArgument(1); }
+void IfcBoundingBox::setXDim(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+double IfcBoundingBox::YDim() const { return *entity->getArgument(2); }
+void IfcBoundingBox::setYDim(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+double IfcBoundingBox::ZDim() const { return *entity->getArgument(3); }
+void IfcBoundingBox::setZDim(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
 bool IfcBoundingBox::is(Type::Enum v) const { return v == Type::IfcBoundingBox || IfcGeometricRepresentationItem::is(v); }
 Type::Enum IfcBoundingBox::type() const { return Type::IfcBoundingBox; }
 Type::Enum IfcBoundingBox::Class() { return Type::IfcBoundingBox; }
-IfcBoundingBox::IfcBoundingBox(IfcAbstractEntityPtr e) : IfcGeometricRepresentationItem((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcBoundingBox)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcBoundingBox::IfcBoundingBox(IfcCartesianPoint* v1_Corner, IfcPositiveLengthMeasure v2_XDim, IfcPositiveLengthMeasure v3_YDim, IfcPositiveLengthMeasure v4_ZDim) : IfcGeometricRepresentationItem((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Corner)); e->setArgument(1,(v2_XDim)); e->setArgument(2,(v3_YDim)); e->setArgument(3,(v4_ZDim)); entity = e; EntityBuffer::Add(this); }
+IfcBoundingBox::IfcBoundingBox(IfcAbstractEntity* e) : IfcGeometricRepresentationItem((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcBoundingBox)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcBoundingBox::IfcBoundingBox(IfcCartesianPoint* v1_Corner, double v2_XDim, double v3_YDim, double v4_ZDim) : IfcGeometricRepresentationItem((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Corner)); e->setArgument(1,(v2_XDim)); e->setArgument(2,(v3_YDim)); e->setArgument(3,(v4_ZDim)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcBoxedHalfSpace
-IfcBoundingBox* IfcBoxedHalfSpace::Enclosure() { return (IfcBoundingBox*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(2))); }
+IfcBoundingBox* IfcBoxedHalfSpace::Enclosure() const { return (IfcBoundingBox*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(2))); }
 void IfcBoxedHalfSpace::setEnclosure(IfcBoundingBox* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
 bool IfcBoxedHalfSpace::is(Type::Enum v) const { return v == Type::IfcBoxedHalfSpace || IfcHalfSpaceSolid::is(v); }
 Type::Enum IfcBoxedHalfSpace::type() const { return Type::IfcBoxedHalfSpace; }
 Type::Enum IfcBoxedHalfSpace::Class() { return Type::IfcBoxedHalfSpace; }
-IfcBoxedHalfSpace::IfcBoxedHalfSpace(IfcAbstractEntityPtr e) : IfcHalfSpaceSolid((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcBoxedHalfSpace)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcBoxedHalfSpace::IfcBoxedHalfSpace(IfcSurface* v1_BaseSurface, bool v2_AgreementFlag, IfcBoundingBox* v3_Enclosure) : IfcHalfSpaceSolid((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_BaseSurface)); e->setArgument(1,(v2_AgreementFlag)); e->setArgument(2,(v3_Enclosure)); entity = e; EntityBuffer::Add(this); }
+IfcBoxedHalfSpace::IfcBoxedHalfSpace(IfcAbstractEntity* e) : IfcHalfSpaceSolid((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcBoxedHalfSpace)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcBoxedHalfSpace::IfcBoxedHalfSpace(IfcSurface* v1_BaseSurface, bool v2_AgreementFlag, IfcBoundingBox* v3_Enclosure) : IfcHalfSpaceSolid((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_BaseSurface)); e->setArgument(1,(v2_AgreementFlag)); e->setArgument(2,(v3_Enclosure)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcBuilding
-bool IfcBuilding::hasElevationOfRefHeight() { return !entity->getArgument(9)->isNull(); }
-IfcLengthMeasure IfcBuilding::ElevationOfRefHeight() { return *entity->getArgument(9); }
-void IfcBuilding::setElevationOfRefHeight(IfcLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
-bool IfcBuilding::hasElevationOfTerrain() { return !entity->getArgument(10)->isNull(); }
-IfcLengthMeasure IfcBuilding::ElevationOfTerrain() { return *entity->getArgument(10); }
-void IfcBuilding::setElevationOfTerrain(IfcLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
-bool IfcBuilding::hasBuildingAddress() { return !entity->getArgument(11)->isNull(); }
-IfcPostalAddress* IfcBuilding::BuildingAddress() { return (IfcPostalAddress*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(11))); }
+bool IfcBuilding::hasElevationOfRefHeight() const { return !entity->getArgument(9)->isNull(); }
+double IfcBuilding::ElevationOfRefHeight() const { return *entity->getArgument(9); }
+void IfcBuilding::setElevationOfRefHeight(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
+bool IfcBuilding::hasElevationOfTerrain() const { return !entity->getArgument(10)->isNull(); }
+double IfcBuilding::ElevationOfTerrain() const { return *entity->getArgument(10); }
+void IfcBuilding::setElevationOfTerrain(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
+bool IfcBuilding::hasBuildingAddress() const { return !entity->getArgument(11)->isNull(); }
+IfcPostalAddress* IfcBuilding::BuildingAddress() const { return (IfcPostalAddress*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(11))); }
 void IfcBuilding::setBuildingAddress(IfcPostalAddress* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(11,v); }
 bool IfcBuilding::is(Type::Enum v) const { return v == Type::IfcBuilding || IfcSpatialStructureElement::is(v); }
 Type::Enum IfcBuilding::type() const { return Type::IfcBuilding; }
 Type::Enum IfcBuilding::Class() { return Type::IfcBuilding; }
-IfcBuilding::IfcBuilding(IfcAbstractEntityPtr e) : IfcSpatialStructureElement((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcBuilding)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcBuilding::IfcBuilding(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcLabel > v8_LongName, IfcElementCompositionEnum::IfcElementCompositionEnum v9_CompositionType, boost::optional< IfcLengthMeasure > v10_ElevationOfRefHeight, boost::optional< IfcLengthMeasure > v11_ElevationOfTerrain, IfcPostalAddress* v12_BuildingAddress) : IfcSpatialStructureElement((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_LongName) { e->setArgument(7,(*v8_LongName)); } else { e->setArgument(7); } e->setArgument(8,v9_CompositionType,IfcElementCompositionEnum::ToString(v9_CompositionType)); if (v10_ElevationOfRefHeight) { e->setArgument(9,(*v10_ElevationOfRefHeight)); } else { e->setArgument(9); } if (v11_ElevationOfTerrain) { e->setArgument(10,(*v11_ElevationOfTerrain)); } else { e->setArgument(10); } e->setArgument(11,(v12_BuildingAddress)); entity = e; EntityBuffer::Add(this); }
+IfcBuilding::IfcBuilding(IfcAbstractEntity* e) : IfcSpatialStructureElement((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcBuilding)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcBuilding::IfcBuilding(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_LongName, IfcElementCompositionEnum::IfcElementCompositionEnum v9_CompositionType, boost::optional< double > v10_ElevationOfRefHeight, boost::optional< double > v11_ElevationOfTerrain, IfcPostalAddress* v12_BuildingAddress) : IfcSpatialStructureElement((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_LongName) { e->setArgument(7,(*v8_LongName)); } else { e->setArgument(7); } e->setArgument(8,v9_CompositionType,IfcElementCompositionEnum::ToString(v9_CompositionType)); if (v10_ElevationOfRefHeight) { e->setArgument(9,(*v10_ElevationOfRefHeight)); } else { e->setArgument(9); } if (v11_ElevationOfTerrain) { e->setArgument(10,(*v11_ElevationOfTerrain)); } else { e->setArgument(10); } e->setArgument(11,(v12_BuildingAddress)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcBuildingElement
 bool IfcBuildingElement::is(Type::Enum v) const { return v == Type::IfcBuildingElement || IfcElement::is(v); }
 Type::Enum IfcBuildingElement::type() const { return Type::IfcBuildingElement; }
 Type::Enum IfcBuildingElement::Class() { return Type::IfcBuildingElement; }
-IfcBuildingElement::IfcBuildingElement(IfcAbstractEntityPtr e) : IfcElement((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcBuildingElement)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcBuildingElement::IfcBuildingElement(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag) : IfcElement((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
+IfcBuildingElement::IfcBuildingElement(IfcAbstractEntity* e) : IfcElement((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcBuildingElement)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcBuildingElement::IfcBuildingElement(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag) : IfcElement((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcBuildingElementComponent
 bool IfcBuildingElementComponent::is(Type::Enum v) const { return v == Type::IfcBuildingElementComponent || IfcBuildingElement::is(v); }
 Type::Enum IfcBuildingElementComponent::type() const { return Type::IfcBuildingElementComponent; }
 Type::Enum IfcBuildingElementComponent::Class() { return Type::IfcBuildingElementComponent; }
-IfcBuildingElementComponent::IfcBuildingElementComponent(IfcAbstractEntityPtr e) : IfcBuildingElement((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcBuildingElementComponent)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcBuildingElementComponent::IfcBuildingElementComponent(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag) : IfcBuildingElement((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
+IfcBuildingElementComponent::IfcBuildingElementComponent(IfcAbstractEntity* e) : IfcBuildingElement((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcBuildingElementComponent)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcBuildingElementComponent::IfcBuildingElementComponent(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag) : IfcBuildingElement((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcBuildingElementPart
 bool IfcBuildingElementPart::is(Type::Enum v) const { return v == Type::IfcBuildingElementPart || IfcBuildingElementComponent::is(v); }
 Type::Enum IfcBuildingElementPart::type() const { return Type::IfcBuildingElementPart; }
 Type::Enum IfcBuildingElementPart::Class() { return Type::IfcBuildingElementPart; }
-IfcBuildingElementPart::IfcBuildingElementPart(IfcAbstractEntityPtr e) : IfcBuildingElementComponent((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcBuildingElementPart)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcBuildingElementPart::IfcBuildingElementPart(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag) : IfcBuildingElementComponent((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
+IfcBuildingElementPart::IfcBuildingElementPart(IfcAbstractEntity* e) : IfcBuildingElementComponent((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcBuildingElementPart)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcBuildingElementPart::IfcBuildingElementPart(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag) : IfcBuildingElementComponent((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcBuildingElementProxy
-bool IfcBuildingElementProxy::hasCompositionType() { return !entity->getArgument(8)->isNull(); }
-IfcElementCompositionEnum::IfcElementCompositionEnum IfcBuildingElementProxy::CompositionType() { return IfcElementCompositionEnum::FromString(*entity->getArgument(8)); }
+bool IfcBuildingElementProxy::hasCompositionType() const { return !entity->getArgument(8)->isNull(); }
+IfcElementCompositionEnum::IfcElementCompositionEnum IfcBuildingElementProxy::CompositionType() const { return IfcElementCompositionEnum::FromString(*entity->getArgument(8)); }
 void IfcBuildingElementProxy::setCompositionType(IfcElementCompositionEnum::IfcElementCompositionEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcElementCompositionEnum::ToString(v)); }
 bool IfcBuildingElementProxy::is(Type::Enum v) const { return v == Type::IfcBuildingElementProxy || IfcBuildingElement::is(v); }
 Type::Enum IfcBuildingElementProxy::type() const { return Type::IfcBuildingElementProxy; }
 Type::Enum IfcBuildingElementProxy::Class() { return Type::IfcBuildingElementProxy; }
-IfcBuildingElementProxy::IfcBuildingElementProxy(IfcAbstractEntityPtr e) : IfcBuildingElement((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcBuildingElementProxy)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcBuildingElementProxy::IfcBuildingElementProxy(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcElementCompositionEnum::IfcElementCompositionEnum > v9_CompositionType) : IfcBuildingElement((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_CompositionType) { e->setArgument(8,*v9_CompositionType,IfcElementCompositionEnum::ToString(*v9_CompositionType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcBuildingElementProxy::IfcBuildingElementProxy(IfcAbstractEntity* e) : IfcBuildingElement((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcBuildingElementProxy)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcBuildingElementProxy::IfcBuildingElementProxy(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcElementCompositionEnum::IfcElementCompositionEnum > v9_CompositionType) : IfcBuildingElement((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_CompositionType) { e->setArgument(8,*v9_CompositionType,IfcElementCompositionEnum::ToString(*v9_CompositionType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcBuildingElementProxyType
-IfcBuildingElementProxyTypeEnum::IfcBuildingElementProxyTypeEnum IfcBuildingElementProxyType::PredefinedType() { return IfcBuildingElementProxyTypeEnum::FromString(*entity->getArgument(9)); }
+IfcBuildingElementProxyTypeEnum::IfcBuildingElementProxyTypeEnum IfcBuildingElementProxyType::PredefinedType() const { return IfcBuildingElementProxyTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcBuildingElementProxyType::setPredefinedType(IfcBuildingElementProxyTypeEnum::IfcBuildingElementProxyTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcBuildingElementProxyTypeEnum::ToString(v)); }
 bool IfcBuildingElementProxyType::is(Type::Enum v) const { return v == Type::IfcBuildingElementProxyType || IfcBuildingElementType::is(v); }
 Type::Enum IfcBuildingElementProxyType::type() const { return Type::IfcBuildingElementProxyType; }
 Type::Enum IfcBuildingElementProxyType::Class() { return Type::IfcBuildingElementProxyType; }
-IfcBuildingElementProxyType::IfcBuildingElementProxyType(IfcAbstractEntityPtr e) : IfcBuildingElementType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcBuildingElementProxyType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcBuildingElementProxyType::IfcBuildingElementProxyType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcBuildingElementProxyTypeEnum::IfcBuildingElementProxyTypeEnum v10_PredefinedType) : IfcBuildingElementType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcBuildingElementProxyTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcBuildingElementProxyType::IfcBuildingElementProxyType(IfcAbstractEntity* e) : IfcBuildingElementType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcBuildingElementProxyType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcBuildingElementProxyType::IfcBuildingElementProxyType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcBuildingElementProxyTypeEnum::IfcBuildingElementProxyTypeEnum v10_PredefinedType) : IfcBuildingElementType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcBuildingElementProxyTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcBuildingElementType
 bool IfcBuildingElementType::is(Type::Enum v) const { return v == Type::IfcBuildingElementType || IfcElementType::is(v); }
 Type::Enum IfcBuildingElementType::type() const { return Type::IfcBuildingElementType; }
 Type::Enum IfcBuildingElementType::Class() { return Type::IfcBuildingElementType; }
-IfcBuildingElementType::IfcBuildingElementType(IfcAbstractEntityPtr e) : IfcElementType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcBuildingElementType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcBuildingElementType::IfcBuildingElementType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType) : IfcElementType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcBuildingElementType::IfcBuildingElementType(IfcAbstractEntity* e) : IfcElementType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcBuildingElementType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcBuildingElementType::IfcBuildingElementType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType) : IfcElementType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcBuildingStorey
-bool IfcBuildingStorey::hasElevation() { return !entity->getArgument(9)->isNull(); }
-IfcLengthMeasure IfcBuildingStorey::Elevation() { return *entity->getArgument(9); }
-void IfcBuildingStorey::setElevation(IfcLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
+bool IfcBuildingStorey::hasElevation() const { return !entity->getArgument(9)->isNull(); }
+double IfcBuildingStorey::Elevation() const { return *entity->getArgument(9); }
+void IfcBuildingStorey::setElevation(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
 bool IfcBuildingStorey::is(Type::Enum v) const { return v == Type::IfcBuildingStorey || IfcSpatialStructureElement::is(v); }
 Type::Enum IfcBuildingStorey::type() const { return Type::IfcBuildingStorey; }
 Type::Enum IfcBuildingStorey::Class() { return Type::IfcBuildingStorey; }
-IfcBuildingStorey::IfcBuildingStorey(IfcAbstractEntityPtr e) : IfcSpatialStructureElement((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcBuildingStorey)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcBuildingStorey::IfcBuildingStorey(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcLabel > v8_LongName, IfcElementCompositionEnum::IfcElementCompositionEnum v9_CompositionType, boost::optional< IfcLengthMeasure > v10_Elevation) : IfcSpatialStructureElement((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_LongName) { e->setArgument(7,(*v8_LongName)); } else { e->setArgument(7); } e->setArgument(8,v9_CompositionType,IfcElementCompositionEnum::ToString(v9_CompositionType)); if (v10_Elevation) { e->setArgument(9,(*v10_Elevation)); } else { e->setArgument(9); } entity = e; EntityBuffer::Add(this); }
+IfcBuildingStorey::IfcBuildingStorey(IfcAbstractEntity* e) : IfcSpatialStructureElement((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcBuildingStorey)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcBuildingStorey::IfcBuildingStorey(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_LongName, IfcElementCompositionEnum::IfcElementCompositionEnum v9_CompositionType, boost::optional< double > v10_Elevation) : IfcSpatialStructureElement((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_LongName) { e->setArgument(7,(*v8_LongName)); } else { e->setArgument(7); } e->setArgument(8,v9_CompositionType,IfcElementCompositionEnum::ToString(v9_CompositionType)); if (v10_Elevation) { e->setArgument(9,(*v10_Elevation)); } else { e->setArgument(9); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcCShapeProfileDef
-IfcPositiveLengthMeasure IfcCShapeProfileDef::Depth() { return *entity->getArgument(3); }
-void IfcCShapeProfileDef::setDepth(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-IfcPositiveLengthMeasure IfcCShapeProfileDef::Width() { return *entity->getArgument(4); }
-void IfcCShapeProfileDef::setWidth(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-IfcPositiveLengthMeasure IfcCShapeProfileDef::WallThickness() { return *entity->getArgument(5); }
-void IfcCShapeProfileDef::setWallThickness(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-IfcPositiveLengthMeasure IfcCShapeProfileDef::Girth() { return *entity->getArgument(6); }
-void IfcCShapeProfileDef::setGirth(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
-bool IfcCShapeProfileDef::hasInternalFilletRadius() { return !entity->getArgument(7)->isNull(); }
-IfcPositiveLengthMeasure IfcCShapeProfileDef::InternalFilletRadius() { return *entity->getArgument(7); }
-void IfcCShapeProfileDef::setInternalFilletRadius(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
-bool IfcCShapeProfileDef::hasCentreOfGravityInX() { return !entity->getArgument(8)->isNull(); }
-IfcPositiveLengthMeasure IfcCShapeProfileDef::CentreOfGravityInX() { return *entity->getArgument(8); }
-void IfcCShapeProfileDef::setCentreOfGravityInX(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
+double IfcCShapeProfileDef::Depth() const { return *entity->getArgument(3); }
+void IfcCShapeProfileDef::setDepth(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+double IfcCShapeProfileDef::Width() const { return *entity->getArgument(4); }
+void IfcCShapeProfileDef::setWidth(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+double IfcCShapeProfileDef::WallThickness() const { return *entity->getArgument(5); }
+void IfcCShapeProfileDef::setWallThickness(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+double IfcCShapeProfileDef::Girth() const { return *entity->getArgument(6); }
+void IfcCShapeProfileDef::setGirth(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
+bool IfcCShapeProfileDef::hasInternalFilletRadius() const { return !entity->getArgument(7)->isNull(); }
+double IfcCShapeProfileDef::InternalFilletRadius() const { return *entity->getArgument(7); }
+void IfcCShapeProfileDef::setInternalFilletRadius(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
+bool IfcCShapeProfileDef::hasCentreOfGravityInX() const { return !entity->getArgument(8)->isNull(); }
+double IfcCShapeProfileDef::CentreOfGravityInX() const { return *entity->getArgument(8); }
+void IfcCShapeProfileDef::setCentreOfGravityInX(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
 bool IfcCShapeProfileDef::is(Type::Enum v) const { return v == Type::IfcCShapeProfileDef || IfcParameterizedProfileDef::is(v); }
 Type::Enum IfcCShapeProfileDef::type() const { return Type::IfcCShapeProfileDef; }
 Type::Enum IfcCShapeProfileDef::Class() { return Type::IfcCShapeProfileDef; }
-IfcCShapeProfileDef::IfcCShapeProfileDef(IfcAbstractEntityPtr e) : IfcParameterizedProfileDef((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcCShapeProfileDef)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcCShapeProfileDef::IfcCShapeProfileDef(IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< IfcLabel > v2_ProfileName, IfcAxis2Placement2D* v3_Position, IfcPositiveLengthMeasure v4_Depth, IfcPositiveLengthMeasure v5_Width, IfcPositiveLengthMeasure v6_WallThickness, IfcPositiveLengthMeasure v7_Girth, boost::optional< IfcPositiveLengthMeasure > v8_InternalFilletRadius, boost::optional< IfcPositiveLengthMeasure > v9_CentreOfGravityInX) : IfcParameterizedProfileDef((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,v1_ProfileType,IfcProfileTypeEnum::ToString(v1_ProfileType)); if (v2_ProfileName) { e->setArgument(1,(*v2_ProfileName)); } else { e->setArgument(1); } e->setArgument(2,(v3_Position)); e->setArgument(3,(v4_Depth)); e->setArgument(4,(v5_Width)); e->setArgument(5,(v6_WallThickness)); e->setArgument(6,(v7_Girth)); if (v8_InternalFilletRadius) { e->setArgument(7,(*v8_InternalFilletRadius)); } else { e->setArgument(7); } if (v9_CentreOfGravityInX) { e->setArgument(8,(*v9_CentreOfGravityInX)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcCShapeProfileDef::IfcCShapeProfileDef(IfcAbstractEntity* e) : IfcParameterizedProfileDef((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcCShapeProfileDef)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcCShapeProfileDef::IfcCShapeProfileDef(IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< std::string > v2_ProfileName, IfcAxis2Placement2D* v3_Position, double v4_Depth, double v5_Width, double v6_WallThickness, double v7_Girth, boost::optional< double > v8_InternalFilletRadius, boost::optional< double > v9_CentreOfGravityInX) : IfcParameterizedProfileDef((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,v1_ProfileType,IfcProfileTypeEnum::ToString(v1_ProfileType)); if (v2_ProfileName) { e->setArgument(1,(*v2_ProfileName)); } else { e->setArgument(1); } e->setArgument(2,(v3_Position)); e->setArgument(3,(v4_Depth)); e->setArgument(4,(v5_Width)); e->setArgument(5,(v6_WallThickness)); e->setArgument(6,(v7_Girth)); if (v8_InternalFilletRadius) { e->setArgument(7,(*v8_InternalFilletRadius)); } else { e->setArgument(7); } if (v9_CentreOfGravityInX) { e->setArgument(8,(*v9_CentreOfGravityInX)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcCableCarrierFittingType
-IfcCableCarrierFittingTypeEnum::IfcCableCarrierFittingTypeEnum IfcCableCarrierFittingType::PredefinedType() { return IfcCableCarrierFittingTypeEnum::FromString(*entity->getArgument(9)); }
+IfcCableCarrierFittingTypeEnum::IfcCableCarrierFittingTypeEnum IfcCableCarrierFittingType::PredefinedType() const { return IfcCableCarrierFittingTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcCableCarrierFittingType::setPredefinedType(IfcCableCarrierFittingTypeEnum::IfcCableCarrierFittingTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcCableCarrierFittingTypeEnum::ToString(v)); }
 bool IfcCableCarrierFittingType::is(Type::Enum v) const { return v == Type::IfcCableCarrierFittingType || IfcFlowFittingType::is(v); }
 Type::Enum IfcCableCarrierFittingType::type() const { return Type::IfcCableCarrierFittingType; }
 Type::Enum IfcCableCarrierFittingType::Class() { return Type::IfcCableCarrierFittingType; }
-IfcCableCarrierFittingType::IfcCableCarrierFittingType(IfcAbstractEntityPtr e) : IfcFlowFittingType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcCableCarrierFittingType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcCableCarrierFittingType::IfcCableCarrierFittingType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcCableCarrierFittingTypeEnum::IfcCableCarrierFittingTypeEnum v10_PredefinedType) : IfcFlowFittingType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcCableCarrierFittingTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcCableCarrierFittingType::IfcCableCarrierFittingType(IfcAbstractEntity* e) : IfcFlowFittingType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcCableCarrierFittingType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcCableCarrierFittingType::IfcCableCarrierFittingType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcCableCarrierFittingTypeEnum::IfcCableCarrierFittingTypeEnum v10_PredefinedType) : IfcFlowFittingType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcCableCarrierFittingTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcCableCarrierSegmentType
-IfcCableCarrierSegmentTypeEnum::IfcCableCarrierSegmentTypeEnum IfcCableCarrierSegmentType::PredefinedType() { return IfcCableCarrierSegmentTypeEnum::FromString(*entity->getArgument(9)); }
+IfcCableCarrierSegmentTypeEnum::IfcCableCarrierSegmentTypeEnum IfcCableCarrierSegmentType::PredefinedType() const { return IfcCableCarrierSegmentTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcCableCarrierSegmentType::setPredefinedType(IfcCableCarrierSegmentTypeEnum::IfcCableCarrierSegmentTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcCableCarrierSegmentTypeEnum::ToString(v)); }
 bool IfcCableCarrierSegmentType::is(Type::Enum v) const { return v == Type::IfcCableCarrierSegmentType || IfcFlowSegmentType::is(v); }
 Type::Enum IfcCableCarrierSegmentType::type() const { return Type::IfcCableCarrierSegmentType; }
 Type::Enum IfcCableCarrierSegmentType::Class() { return Type::IfcCableCarrierSegmentType; }
-IfcCableCarrierSegmentType::IfcCableCarrierSegmentType(IfcAbstractEntityPtr e) : IfcFlowSegmentType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcCableCarrierSegmentType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcCableCarrierSegmentType::IfcCableCarrierSegmentType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcCableCarrierSegmentTypeEnum::IfcCableCarrierSegmentTypeEnum v10_PredefinedType) : IfcFlowSegmentType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcCableCarrierSegmentTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcCableCarrierSegmentType::IfcCableCarrierSegmentType(IfcAbstractEntity* e) : IfcFlowSegmentType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcCableCarrierSegmentType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcCableCarrierSegmentType::IfcCableCarrierSegmentType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcCableCarrierSegmentTypeEnum::IfcCableCarrierSegmentTypeEnum v10_PredefinedType) : IfcFlowSegmentType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcCableCarrierSegmentTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcCableSegmentType
-IfcCableSegmentTypeEnum::IfcCableSegmentTypeEnum IfcCableSegmentType::PredefinedType() { return IfcCableSegmentTypeEnum::FromString(*entity->getArgument(9)); }
+IfcCableSegmentTypeEnum::IfcCableSegmentTypeEnum IfcCableSegmentType::PredefinedType() const { return IfcCableSegmentTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcCableSegmentType::setPredefinedType(IfcCableSegmentTypeEnum::IfcCableSegmentTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcCableSegmentTypeEnum::ToString(v)); }
 bool IfcCableSegmentType::is(Type::Enum v) const { return v == Type::IfcCableSegmentType || IfcFlowSegmentType::is(v); }
 Type::Enum IfcCableSegmentType::type() const { return Type::IfcCableSegmentType; }
 Type::Enum IfcCableSegmentType::Class() { return Type::IfcCableSegmentType; }
-IfcCableSegmentType::IfcCableSegmentType(IfcAbstractEntityPtr e) : IfcFlowSegmentType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcCableSegmentType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcCableSegmentType::IfcCableSegmentType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcCableSegmentTypeEnum::IfcCableSegmentTypeEnum v10_PredefinedType) : IfcFlowSegmentType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcCableSegmentTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcCableSegmentType::IfcCableSegmentType(IfcAbstractEntity* e) : IfcFlowSegmentType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcCableSegmentType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcCableSegmentType::IfcCableSegmentType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcCableSegmentTypeEnum::IfcCableSegmentTypeEnum v10_PredefinedType) : IfcFlowSegmentType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcCableSegmentTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcCalendarDate
-IfcDayInMonthNumber IfcCalendarDate::DayComponent() { return *entity->getArgument(0); }
-void IfcCalendarDate::setDayComponent(IfcDayInMonthNumber v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-IfcMonthInYearNumber IfcCalendarDate::MonthComponent() { return *entity->getArgument(1); }
-void IfcCalendarDate::setMonthComponent(IfcMonthInYearNumber v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-IfcYearNumber IfcCalendarDate::YearComponent() { return *entity->getArgument(2); }
-void IfcCalendarDate::setYearComponent(IfcYearNumber v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+int IfcCalendarDate::DayComponent() const { return *entity->getArgument(0); }
+void IfcCalendarDate::setDayComponent(int v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+int IfcCalendarDate::MonthComponent() const { return *entity->getArgument(1); }
+void IfcCalendarDate::setMonthComponent(int v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+int IfcCalendarDate::YearComponent() const { return *entity->getArgument(2); }
+void IfcCalendarDate::setYearComponent(int v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
 bool IfcCalendarDate::is(Type::Enum v) const { return v == Type::IfcCalendarDate; }
 Type::Enum IfcCalendarDate::type() const { return Type::IfcCalendarDate; }
 Type::Enum IfcCalendarDate::Class() { return Type::IfcCalendarDate; }
-IfcCalendarDate::IfcCalendarDate(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcCalendarDate)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcCalendarDate::IfcCalendarDate(IfcDayInMonthNumber v1_DayComponent, IfcMonthInYearNumber v2_MonthComponent, IfcYearNumber v3_YearComponent) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_DayComponent)); e->setArgument(1,(v2_MonthComponent)); e->setArgument(2,(v3_YearComponent)); entity = e; EntityBuffer::Add(this); }
+IfcCalendarDate::IfcCalendarDate(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcCalendarDate)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcCalendarDate::IfcCalendarDate(int v1_DayComponent, int v2_MonthComponent, int v3_YearComponent) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_DayComponent)); e->setArgument(1,(v2_MonthComponent)); e->setArgument(2,(v3_YearComponent)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcCartesianPoint
-std::vector< IfcLengthMeasure > /*[1:3]*/ IfcCartesianPoint::Coordinates() { return *entity->getArgument(0); }
-void IfcCartesianPoint::setCoordinates(std::vector< IfcLengthMeasure > /*[1:3]*/ v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+std::vector< double > /*[1:3]*/ IfcCartesianPoint::Coordinates() const { return *entity->getArgument(0); }
+void IfcCartesianPoint::setCoordinates(std::vector< double > /*[1:3]*/ v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
 bool IfcCartesianPoint::is(Type::Enum v) const { return v == Type::IfcCartesianPoint || IfcPoint::is(v); }
 Type::Enum IfcCartesianPoint::type() const { return Type::IfcCartesianPoint; }
 Type::Enum IfcCartesianPoint::Class() { return Type::IfcCartesianPoint; }
-IfcCartesianPoint::IfcCartesianPoint(IfcAbstractEntityPtr e) : IfcPoint((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcCartesianPoint)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcCartesianPoint::IfcCartesianPoint(std::vector< IfcLengthMeasure > /*[1:3]*/ v1_Coordinates) : IfcPoint((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Coordinates)); entity = e; EntityBuffer::Add(this); }
+IfcCartesianPoint::IfcCartesianPoint(IfcAbstractEntity* e) : IfcPoint((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcCartesianPoint)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcCartesianPoint::IfcCartesianPoint(std::vector< double > /*[1:3]*/ v1_Coordinates) : IfcPoint((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Coordinates)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcCartesianTransformationOperator
-bool IfcCartesianTransformationOperator::hasAxis1() { return !entity->getArgument(0)->isNull(); }
-IfcDirection* IfcCartesianTransformationOperator::Axis1() { return (IfcDirection*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(0))); }
+bool IfcCartesianTransformationOperator::hasAxis1() const { return !entity->getArgument(0)->isNull(); }
+IfcDirection* IfcCartesianTransformationOperator::Axis1() const { return (IfcDirection*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(0))); }
 void IfcCartesianTransformationOperator::setAxis1(IfcDirection* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-bool IfcCartesianTransformationOperator::hasAxis2() { return !entity->getArgument(1)->isNull(); }
-IfcDirection* IfcCartesianTransformationOperator::Axis2() { return (IfcDirection*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(1))); }
+bool IfcCartesianTransformationOperator::hasAxis2() const { return !entity->getArgument(1)->isNull(); }
+IfcDirection* IfcCartesianTransformationOperator::Axis2() const { return (IfcDirection*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(1))); }
 void IfcCartesianTransformationOperator::setAxis2(IfcDirection* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-IfcCartesianPoint* IfcCartesianTransformationOperator::LocalOrigin() { return (IfcCartesianPoint*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(2))); }
+IfcCartesianPoint* IfcCartesianTransformationOperator::LocalOrigin() const { return (IfcCartesianPoint*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(2))); }
 void IfcCartesianTransformationOperator::setLocalOrigin(IfcCartesianPoint* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-bool IfcCartesianTransformationOperator::hasScale() { return !entity->getArgument(3)->isNull(); }
-double IfcCartesianTransformationOperator::Scale() { return *entity->getArgument(3); }
+bool IfcCartesianTransformationOperator::hasScale() const { return !entity->getArgument(3)->isNull(); }
+double IfcCartesianTransformationOperator::Scale() const { return *entity->getArgument(3); }
 void IfcCartesianTransformationOperator::setScale(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
 bool IfcCartesianTransformationOperator::is(Type::Enum v) const { return v == Type::IfcCartesianTransformationOperator || IfcGeometricRepresentationItem::is(v); }
 Type::Enum IfcCartesianTransformationOperator::type() const { return Type::IfcCartesianTransformationOperator; }
 Type::Enum IfcCartesianTransformationOperator::Class() { return Type::IfcCartesianTransformationOperator; }
-IfcCartesianTransformationOperator::IfcCartesianTransformationOperator(IfcAbstractEntityPtr e) : IfcGeometricRepresentationItem((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcCartesianTransformationOperator)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcCartesianTransformationOperator::IfcCartesianTransformationOperator(IfcDirection* v1_Axis1, IfcDirection* v2_Axis2, IfcCartesianPoint* v3_LocalOrigin, boost::optional< double > v4_Scale) : IfcGeometricRepresentationItem((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Axis1)); e->setArgument(1,(v2_Axis2)); e->setArgument(2,(v3_LocalOrigin)); if (v4_Scale) { e->setArgument(3,(*v4_Scale)); } else { e->setArgument(3); } entity = e; EntityBuffer::Add(this); }
+IfcCartesianTransformationOperator::IfcCartesianTransformationOperator(IfcAbstractEntity* e) : IfcGeometricRepresentationItem((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcCartesianTransformationOperator)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcCartesianTransformationOperator::IfcCartesianTransformationOperator(IfcDirection* v1_Axis1, IfcDirection* v2_Axis2, IfcCartesianPoint* v3_LocalOrigin, boost::optional< double > v4_Scale) : IfcGeometricRepresentationItem((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Axis1)); e->setArgument(1,(v2_Axis2)); e->setArgument(2,(v3_LocalOrigin)); if (v4_Scale) { e->setArgument(3,(*v4_Scale)); } else { e->setArgument(3); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcCartesianTransformationOperator2D
 bool IfcCartesianTransformationOperator2D::is(Type::Enum v) const { return v == Type::IfcCartesianTransformationOperator2D || IfcCartesianTransformationOperator::is(v); }
 Type::Enum IfcCartesianTransformationOperator2D::type() const { return Type::IfcCartesianTransformationOperator2D; }
 Type::Enum IfcCartesianTransformationOperator2D::Class() { return Type::IfcCartesianTransformationOperator2D; }
-IfcCartesianTransformationOperator2D::IfcCartesianTransformationOperator2D(IfcAbstractEntityPtr e) : IfcCartesianTransformationOperator((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcCartesianTransformationOperator2D)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcCartesianTransformationOperator2D::IfcCartesianTransformationOperator2D(IfcDirection* v1_Axis1, IfcDirection* v2_Axis2, IfcCartesianPoint* v3_LocalOrigin, boost::optional< double > v4_Scale) : IfcCartesianTransformationOperator((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Axis1)); e->setArgument(1,(v2_Axis2)); e->setArgument(2,(v3_LocalOrigin)); if (v4_Scale) { e->setArgument(3,(*v4_Scale)); } else { e->setArgument(3); } entity = e; EntityBuffer::Add(this); }
+IfcCartesianTransformationOperator2D::IfcCartesianTransformationOperator2D(IfcAbstractEntity* e) : IfcCartesianTransformationOperator((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcCartesianTransformationOperator2D)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcCartesianTransformationOperator2D::IfcCartesianTransformationOperator2D(IfcDirection* v1_Axis1, IfcDirection* v2_Axis2, IfcCartesianPoint* v3_LocalOrigin, boost::optional< double > v4_Scale) : IfcCartesianTransformationOperator((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Axis1)); e->setArgument(1,(v2_Axis2)); e->setArgument(2,(v3_LocalOrigin)); if (v4_Scale) { e->setArgument(3,(*v4_Scale)); } else { e->setArgument(3); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcCartesianTransformationOperator2DnonUniform
-bool IfcCartesianTransformationOperator2DnonUniform::hasScale2() { return !entity->getArgument(4)->isNull(); }
-double IfcCartesianTransformationOperator2DnonUniform::Scale2() { return *entity->getArgument(4); }
+bool IfcCartesianTransformationOperator2DnonUniform::hasScale2() const { return !entity->getArgument(4)->isNull(); }
+double IfcCartesianTransformationOperator2DnonUniform::Scale2() const { return *entity->getArgument(4); }
 void IfcCartesianTransformationOperator2DnonUniform::setScale2(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
 bool IfcCartesianTransformationOperator2DnonUniform::is(Type::Enum v) const { return v == Type::IfcCartesianTransformationOperator2DnonUniform || IfcCartesianTransformationOperator2D::is(v); }
 Type::Enum IfcCartesianTransformationOperator2DnonUniform::type() const { return Type::IfcCartesianTransformationOperator2DnonUniform; }
 Type::Enum IfcCartesianTransformationOperator2DnonUniform::Class() { return Type::IfcCartesianTransformationOperator2DnonUniform; }
-IfcCartesianTransformationOperator2DnonUniform::IfcCartesianTransformationOperator2DnonUniform(IfcAbstractEntityPtr e) : IfcCartesianTransformationOperator2D((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcCartesianTransformationOperator2DnonUniform)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcCartesianTransformationOperator2DnonUniform::IfcCartesianTransformationOperator2DnonUniform(IfcDirection* v1_Axis1, IfcDirection* v2_Axis2, IfcCartesianPoint* v3_LocalOrigin, boost::optional< double > v4_Scale, boost::optional< double > v5_Scale2) : IfcCartesianTransformationOperator2D((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Axis1)); e->setArgument(1,(v2_Axis2)); e->setArgument(2,(v3_LocalOrigin)); if (v4_Scale) { e->setArgument(3,(*v4_Scale)); } else { e->setArgument(3); } if (v5_Scale2) { e->setArgument(4,(*v5_Scale2)); } else { e->setArgument(4); } entity = e; EntityBuffer::Add(this); }
+IfcCartesianTransformationOperator2DnonUniform::IfcCartesianTransformationOperator2DnonUniform(IfcAbstractEntity* e) : IfcCartesianTransformationOperator2D((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcCartesianTransformationOperator2DnonUniform)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcCartesianTransformationOperator2DnonUniform::IfcCartesianTransformationOperator2DnonUniform(IfcDirection* v1_Axis1, IfcDirection* v2_Axis2, IfcCartesianPoint* v3_LocalOrigin, boost::optional< double > v4_Scale, boost::optional< double > v5_Scale2) : IfcCartesianTransformationOperator2D((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Axis1)); e->setArgument(1,(v2_Axis2)); e->setArgument(2,(v3_LocalOrigin)); if (v4_Scale) { e->setArgument(3,(*v4_Scale)); } else { e->setArgument(3); } if (v5_Scale2) { e->setArgument(4,(*v5_Scale2)); } else { e->setArgument(4); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcCartesianTransformationOperator3D
-bool IfcCartesianTransformationOperator3D::hasAxis3() { return !entity->getArgument(4)->isNull(); }
-IfcDirection* IfcCartesianTransformationOperator3D::Axis3() { return (IfcDirection*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(4))); }
+bool IfcCartesianTransformationOperator3D::hasAxis3() const { return !entity->getArgument(4)->isNull(); }
+IfcDirection* IfcCartesianTransformationOperator3D::Axis3() const { return (IfcDirection*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(4))); }
 void IfcCartesianTransformationOperator3D::setAxis3(IfcDirection* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
 bool IfcCartesianTransformationOperator3D::is(Type::Enum v) const { return v == Type::IfcCartesianTransformationOperator3D || IfcCartesianTransformationOperator::is(v); }
 Type::Enum IfcCartesianTransformationOperator3D::type() const { return Type::IfcCartesianTransformationOperator3D; }
 Type::Enum IfcCartesianTransformationOperator3D::Class() { return Type::IfcCartesianTransformationOperator3D; }
-IfcCartesianTransformationOperator3D::IfcCartesianTransformationOperator3D(IfcAbstractEntityPtr e) : IfcCartesianTransformationOperator((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcCartesianTransformationOperator3D)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcCartesianTransformationOperator3D::IfcCartesianTransformationOperator3D(IfcDirection* v1_Axis1, IfcDirection* v2_Axis2, IfcCartesianPoint* v3_LocalOrigin, boost::optional< double > v4_Scale, IfcDirection* v5_Axis3) : IfcCartesianTransformationOperator((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Axis1)); e->setArgument(1,(v2_Axis2)); e->setArgument(2,(v3_LocalOrigin)); if (v4_Scale) { e->setArgument(3,(*v4_Scale)); } else { e->setArgument(3); } e->setArgument(4,(v5_Axis3)); entity = e; EntityBuffer::Add(this); }
+IfcCartesianTransformationOperator3D::IfcCartesianTransformationOperator3D(IfcAbstractEntity* e) : IfcCartesianTransformationOperator((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcCartesianTransformationOperator3D)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcCartesianTransformationOperator3D::IfcCartesianTransformationOperator3D(IfcDirection* v1_Axis1, IfcDirection* v2_Axis2, IfcCartesianPoint* v3_LocalOrigin, boost::optional< double > v4_Scale, IfcDirection* v5_Axis3) : IfcCartesianTransformationOperator((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Axis1)); e->setArgument(1,(v2_Axis2)); e->setArgument(2,(v3_LocalOrigin)); if (v4_Scale) { e->setArgument(3,(*v4_Scale)); } else { e->setArgument(3); } e->setArgument(4,(v5_Axis3)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcCartesianTransformationOperator3DnonUniform
-bool IfcCartesianTransformationOperator3DnonUniform::hasScale2() { return !entity->getArgument(5)->isNull(); }
-double IfcCartesianTransformationOperator3DnonUniform::Scale2() { return *entity->getArgument(5); }
+bool IfcCartesianTransformationOperator3DnonUniform::hasScale2() const { return !entity->getArgument(5)->isNull(); }
+double IfcCartesianTransformationOperator3DnonUniform::Scale2() const { return *entity->getArgument(5); }
 void IfcCartesianTransformationOperator3DnonUniform::setScale2(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-bool IfcCartesianTransformationOperator3DnonUniform::hasScale3() { return !entity->getArgument(6)->isNull(); }
-double IfcCartesianTransformationOperator3DnonUniform::Scale3() { return *entity->getArgument(6); }
+bool IfcCartesianTransformationOperator3DnonUniform::hasScale3() const { return !entity->getArgument(6)->isNull(); }
+double IfcCartesianTransformationOperator3DnonUniform::Scale3() const { return *entity->getArgument(6); }
 void IfcCartesianTransformationOperator3DnonUniform::setScale3(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
 bool IfcCartesianTransformationOperator3DnonUniform::is(Type::Enum v) const { return v == Type::IfcCartesianTransformationOperator3DnonUniform || IfcCartesianTransformationOperator3D::is(v); }
 Type::Enum IfcCartesianTransformationOperator3DnonUniform::type() const { return Type::IfcCartesianTransformationOperator3DnonUniform; }
 Type::Enum IfcCartesianTransformationOperator3DnonUniform::Class() { return Type::IfcCartesianTransformationOperator3DnonUniform; }
-IfcCartesianTransformationOperator3DnonUniform::IfcCartesianTransformationOperator3DnonUniform(IfcAbstractEntityPtr e) : IfcCartesianTransformationOperator3D((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcCartesianTransformationOperator3DnonUniform)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcCartesianTransformationOperator3DnonUniform::IfcCartesianTransformationOperator3DnonUniform(IfcDirection* v1_Axis1, IfcDirection* v2_Axis2, IfcCartesianPoint* v3_LocalOrigin, boost::optional< double > v4_Scale, IfcDirection* v5_Axis3, boost::optional< double > v6_Scale2, boost::optional< double > v7_Scale3) : IfcCartesianTransformationOperator3D((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Axis1)); e->setArgument(1,(v2_Axis2)); e->setArgument(2,(v3_LocalOrigin)); if (v4_Scale) { e->setArgument(3,(*v4_Scale)); } else { e->setArgument(3); } e->setArgument(4,(v5_Axis3)); if (v6_Scale2) { e->setArgument(5,(*v6_Scale2)); } else { e->setArgument(5); } if (v7_Scale3) { e->setArgument(6,(*v7_Scale3)); } else { e->setArgument(6); } entity = e; EntityBuffer::Add(this); }
+IfcCartesianTransformationOperator3DnonUniform::IfcCartesianTransformationOperator3DnonUniform(IfcAbstractEntity* e) : IfcCartesianTransformationOperator3D((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcCartesianTransformationOperator3DnonUniform)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcCartesianTransformationOperator3DnonUniform::IfcCartesianTransformationOperator3DnonUniform(IfcDirection* v1_Axis1, IfcDirection* v2_Axis2, IfcCartesianPoint* v3_LocalOrigin, boost::optional< double > v4_Scale, IfcDirection* v5_Axis3, boost::optional< double > v6_Scale2, boost::optional< double > v7_Scale3) : IfcCartesianTransformationOperator3D((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Axis1)); e->setArgument(1,(v2_Axis2)); e->setArgument(2,(v3_LocalOrigin)); if (v4_Scale) { e->setArgument(3,(*v4_Scale)); } else { e->setArgument(3); } e->setArgument(4,(v5_Axis3)); if (v6_Scale2) { e->setArgument(5,(*v6_Scale2)); } else { e->setArgument(5); } if (v7_Scale3) { e->setArgument(6,(*v7_Scale3)); } else { e->setArgument(6); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcCenterLineProfileDef
-IfcPositiveLengthMeasure IfcCenterLineProfileDef::Thickness() { return *entity->getArgument(3); }
-void IfcCenterLineProfileDef::setThickness(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+double IfcCenterLineProfileDef::Thickness() const { return *entity->getArgument(3); }
+void IfcCenterLineProfileDef::setThickness(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
 bool IfcCenterLineProfileDef::is(Type::Enum v) const { return v == Type::IfcCenterLineProfileDef || IfcArbitraryOpenProfileDef::is(v); }
 Type::Enum IfcCenterLineProfileDef::type() const { return Type::IfcCenterLineProfileDef; }
 Type::Enum IfcCenterLineProfileDef::Class() { return Type::IfcCenterLineProfileDef; }
-IfcCenterLineProfileDef::IfcCenterLineProfileDef(IfcAbstractEntityPtr e) : IfcArbitraryOpenProfileDef((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcCenterLineProfileDef)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcCenterLineProfileDef::IfcCenterLineProfileDef(IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< IfcLabel > v2_ProfileName, IfcBoundedCurve* v3_Curve, IfcPositiveLengthMeasure v4_Thickness) : IfcArbitraryOpenProfileDef((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,v1_ProfileType,IfcProfileTypeEnum::ToString(v1_ProfileType)); if (v2_ProfileName) { e->setArgument(1,(*v2_ProfileName)); } else { e->setArgument(1); } e->setArgument(2,(v3_Curve)); e->setArgument(3,(v4_Thickness)); entity = e; EntityBuffer::Add(this); }
+IfcCenterLineProfileDef::IfcCenterLineProfileDef(IfcAbstractEntity* e) : IfcArbitraryOpenProfileDef((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcCenterLineProfileDef)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcCenterLineProfileDef::IfcCenterLineProfileDef(IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< std::string > v2_ProfileName, IfcBoundedCurve* v3_Curve, double v4_Thickness) : IfcArbitraryOpenProfileDef((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,v1_ProfileType,IfcProfileTypeEnum::ToString(v1_ProfileType)); if (v2_ProfileName) { e->setArgument(1,(*v2_ProfileName)); } else { e->setArgument(1); } e->setArgument(2,(v3_Curve)); e->setArgument(3,(v4_Thickness)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcChamferEdgeFeature
-bool IfcChamferEdgeFeature::hasWidth() { return !entity->getArgument(9)->isNull(); }
-IfcPositiveLengthMeasure IfcChamferEdgeFeature::Width() { return *entity->getArgument(9); }
-void IfcChamferEdgeFeature::setWidth(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
-bool IfcChamferEdgeFeature::hasHeight() { return !entity->getArgument(10)->isNull(); }
-IfcPositiveLengthMeasure IfcChamferEdgeFeature::Height() { return *entity->getArgument(10); }
-void IfcChamferEdgeFeature::setHeight(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
+bool IfcChamferEdgeFeature::hasWidth() const { return !entity->getArgument(9)->isNull(); }
+double IfcChamferEdgeFeature::Width() const { return *entity->getArgument(9); }
+void IfcChamferEdgeFeature::setWidth(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
+bool IfcChamferEdgeFeature::hasHeight() const { return !entity->getArgument(10)->isNull(); }
+double IfcChamferEdgeFeature::Height() const { return *entity->getArgument(10); }
+void IfcChamferEdgeFeature::setHeight(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
 bool IfcChamferEdgeFeature::is(Type::Enum v) const { return v == Type::IfcChamferEdgeFeature || IfcEdgeFeature::is(v); }
 Type::Enum IfcChamferEdgeFeature::type() const { return Type::IfcChamferEdgeFeature; }
 Type::Enum IfcChamferEdgeFeature::Class() { return Type::IfcChamferEdgeFeature; }
-IfcChamferEdgeFeature::IfcChamferEdgeFeature(IfcAbstractEntityPtr e) : IfcEdgeFeature((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcChamferEdgeFeature)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcChamferEdgeFeature::IfcChamferEdgeFeature(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcPositiveLengthMeasure > v9_FeatureLength, boost::optional< IfcPositiveLengthMeasure > v10_Width, boost::optional< IfcPositiveLengthMeasure > v11_Height) : IfcEdgeFeature((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_FeatureLength) { e->setArgument(8,(*v9_FeatureLength)); } else { e->setArgument(8); } if (v10_Width) { e->setArgument(9,(*v10_Width)); } else { e->setArgument(9); } if (v11_Height) { e->setArgument(10,(*v11_Height)); } else { e->setArgument(10); } entity = e; EntityBuffer::Add(this); }
+IfcChamferEdgeFeature::IfcChamferEdgeFeature(IfcAbstractEntity* e) : IfcEdgeFeature((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcChamferEdgeFeature)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcChamferEdgeFeature::IfcChamferEdgeFeature(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< double > v9_FeatureLength, boost::optional< double > v10_Width, boost::optional< double > v11_Height) : IfcEdgeFeature((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_FeatureLength) { e->setArgument(8,(*v9_FeatureLength)); } else { e->setArgument(8); } if (v10_Width) { e->setArgument(9,(*v10_Width)); } else { e->setArgument(9); } if (v11_Height) { e->setArgument(10,(*v11_Height)); } else { e->setArgument(10); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcChillerType
-IfcChillerTypeEnum::IfcChillerTypeEnum IfcChillerType::PredefinedType() { return IfcChillerTypeEnum::FromString(*entity->getArgument(9)); }
+IfcChillerTypeEnum::IfcChillerTypeEnum IfcChillerType::PredefinedType() const { return IfcChillerTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcChillerType::setPredefinedType(IfcChillerTypeEnum::IfcChillerTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcChillerTypeEnum::ToString(v)); }
 bool IfcChillerType::is(Type::Enum v) const { return v == Type::IfcChillerType || IfcEnergyConversionDeviceType::is(v); }
 Type::Enum IfcChillerType::type() const { return Type::IfcChillerType; }
 Type::Enum IfcChillerType::Class() { return Type::IfcChillerType; }
-IfcChillerType::IfcChillerType(IfcAbstractEntityPtr e) : IfcEnergyConversionDeviceType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcChillerType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcChillerType::IfcChillerType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcChillerTypeEnum::IfcChillerTypeEnum v10_PredefinedType) : IfcEnergyConversionDeviceType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcChillerTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcChillerType::IfcChillerType(IfcAbstractEntity* e) : IfcEnergyConversionDeviceType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcChillerType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcChillerType::IfcChillerType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcChillerTypeEnum::IfcChillerTypeEnum v10_PredefinedType) : IfcEnergyConversionDeviceType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcChillerTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcCircle
-IfcPositiveLengthMeasure IfcCircle::Radius() { return *entity->getArgument(1); }
-void IfcCircle::setRadius(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+double IfcCircle::Radius() const { return *entity->getArgument(1); }
+void IfcCircle::setRadius(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
 bool IfcCircle::is(Type::Enum v) const { return v == Type::IfcCircle || IfcConic::is(v); }
 Type::Enum IfcCircle::type() const { return Type::IfcCircle; }
 Type::Enum IfcCircle::Class() { return Type::IfcCircle; }
-IfcCircle::IfcCircle(IfcAbstractEntityPtr e) : IfcConic((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcCircle)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcCircle::IfcCircle(IfcAxis2Placement v1_Position, IfcPositiveLengthMeasure v2_Radius) : IfcConic((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Position)); e->setArgument(1,(v2_Radius)); entity = e; EntityBuffer::Add(this); }
+IfcCircle::IfcCircle(IfcAbstractEntity* e) : IfcConic((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcCircle)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcCircle::IfcCircle(IfcAxis2Placement* v1_Position, double v2_Radius) : IfcConic((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Position)); e->setArgument(1,(v2_Radius)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcCircleHollowProfileDef
-IfcPositiveLengthMeasure IfcCircleHollowProfileDef::WallThickness() { return *entity->getArgument(4); }
-void IfcCircleHollowProfileDef::setWallThickness(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+double IfcCircleHollowProfileDef::WallThickness() const { return *entity->getArgument(4); }
+void IfcCircleHollowProfileDef::setWallThickness(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
 bool IfcCircleHollowProfileDef::is(Type::Enum v) const { return v == Type::IfcCircleHollowProfileDef || IfcCircleProfileDef::is(v); }
 Type::Enum IfcCircleHollowProfileDef::type() const { return Type::IfcCircleHollowProfileDef; }
 Type::Enum IfcCircleHollowProfileDef::Class() { return Type::IfcCircleHollowProfileDef; }
-IfcCircleHollowProfileDef::IfcCircleHollowProfileDef(IfcAbstractEntityPtr e) : IfcCircleProfileDef((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcCircleHollowProfileDef)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcCircleHollowProfileDef::IfcCircleHollowProfileDef(IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< IfcLabel > v2_ProfileName, IfcAxis2Placement2D* v3_Position, IfcPositiveLengthMeasure v4_Radius, IfcPositiveLengthMeasure v5_WallThickness) : IfcCircleProfileDef((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,v1_ProfileType,IfcProfileTypeEnum::ToString(v1_ProfileType)); if (v2_ProfileName) { e->setArgument(1,(*v2_ProfileName)); } else { e->setArgument(1); } e->setArgument(2,(v3_Position)); e->setArgument(3,(v4_Radius)); e->setArgument(4,(v5_WallThickness)); entity = e; EntityBuffer::Add(this); }
+IfcCircleHollowProfileDef::IfcCircleHollowProfileDef(IfcAbstractEntity* e) : IfcCircleProfileDef((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcCircleHollowProfileDef)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcCircleHollowProfileDef::IfcCircleHollowProfileDef(IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< std::string > v2_ProfileName, IfcAxis2Placement2D* v3_Position, double v4_Radius, double v5_WallThickness) : IfcCircleProfileDef((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,v1_ProfileType,IfcProfileTypeEnum::ToString(v1_ProfileType)); if (v2_ProfileName) { e->setArgument(1,(*v2_ProfileName)); } else { e->setArgument(1); } e->setArgument(2,(v3_Position)); e->setArgument(3,(v4_Radius)); e->setArgument(4,(v5_WallThickness)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcCircleProfileDef
-IfcPositiveLengthMeasure IfcCircleProfileDef::Radius() { return *entity->getArgument(3); }
-void IfcCircleProfileDef::setRadius(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+double IfcCircleProfileDef::Radius() const { return *entity->getArgument(3); }
+void IfcCircleProfileDef::setRadius(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
 bool IfcCircleProfileDef::is(Type::Enum v) const { return v == Type::IfcCircleProfileDef || IfcParameterizedProfileDef::is(v); }
 Type::Enum IfcCircleProfileDef::type() const { return Type::IfcCircleProfileDef; }
 Type::Enum IfcCircleProfileDef::Class() { return Type::IfcCircleProfileDef; }
-IfcCircleProfileDef::IfcCircleProfileDef(IfcAbstractEntityPtr e) : IfcParameterizedProfileDef((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcCircleProfileDef)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcCircleProfileDef::IfcCircleProfileDef(IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< IfcLabel > v2_ProfileName, IfcAxis2Placement2D* v3_Position, IfcPositiveLengthMeasure v4_Radius) : IfcParameterizedProfileDef((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,v1_ProfileType,IfcProfileTypeEnum::ToString(v1_ProfileType)); if (v2_ProfileName) { e->setArgument(1,(*v2_ProfileName)); } else { e->setArgument(1); } e->setArgument(2,(v3_Position)); e->setArgument(3,(v4_Radius)); entity = e; EntityBuffer::Add(this); }
+IfcCircleProfileDef::IfcCircleProfileDef(IfcAbstractEntity* e) : IfcParameterizedProfileDef((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcCircleProfileDef)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcCircleProfileDef::IfcCircleProfileDef(IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< std::string > v2_ProfileName, IfcAxis2Placement2D* v3_Position, double v4_Radius) : IfcParameterizedProfileDef((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,v1_ProfileType,IfcProfileTypeEnum::ToString(v1_ProfileType)); if (v2_ProfileName) { e->setArgument(1,(*v2_ProfileName)); } else { e->setArgument(1); } e->setArgument(2,(v3_Position)); e->setArgument(3,(v4_Radius)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcClassification
-IfcLabel IfcClassification::Source() { return *entity->getArgument(0); }
-void IfcClassification::setSource(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-IfcLabel IfcClassification::Edition() { return *entity->getArgument(1); }
-void IfcClassification::setEdition(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-bool IfcClassification::hasEditionDate() { return !entity->getArgument(2)->isNull(); }
-IfcCalendarDate* IfcClassification::EditionDate() { return (IfcCalendarDate*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(2))); }
+std::string IfcClassification::Source() const { return *entity->getArgument(0); }
+void IfcClassification::setSource(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+std::string IfcClassification::Edition() const { return *entity->getArgument(1); }
+void IfcClassification::setEdition(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+bool IfcClassification::hasEditionDate() const { return !entity->getArgument(2)->isNull(); }
+IfcCalendarDate* IfcClassification::EditionDate() const { return (IfcCalendarDate*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(2))); }
 void IfcClassification::setEditionDate(IfcCalendarDate* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-IfcLabel IfcClassification::Name() { return *entity->getArgument(3); }
-void IfcClassification::setName(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-IfcClassificationItem::list IfcClassification::Contains() { RETURN_INVERSE(IfcClassificationItem) }
+std::string IfcClassification::Name() const { return *entity->getArgument(3); }
+void IfcClassification::setName(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+IfcClassificationItem::list::ptr IfcClassification::Contains() const { return entity->getInverse(Type::IfcClassificationItem, 1)->as<IfcClassificationItem>(); }
 bool IfcClassification::is(Type::Enum v) const { return v == Type::IfcClassification; }
 Type::Enum IfcClassification::type() const { return Type::IfcClassification; }
 Type::Enum IfcClassification::Class() { return Type::IfcClassification; }
-IfcClassification::IfcClassification(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcClassification)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcClassification::IfcClassification(IfcLabel v1_Source, IfcLabel v2_Edition, IfcCalendarDate* v3_EditionDate, IfcLabel v4_Name) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Source)); e->setArgument(1,(v2_Edition)); e->setArgument(2,(v3_EditionDate)); e->setArgument(3,(v4_Name)); entity = e; EntityBuffer::Add(this); }
+IfcClassification::IfcClassification(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcClassification)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcClassification::IfcClassification(std::string v1_Source, std::string v2_Edition, IfcCalendarDate* v3_EditionDate, std::string v4_Name) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Source)); e->setArgument(1,(v2_Edition)); e->setArgument(2,(v3_EditionDate)); e->setArgument(3,(v4_Name)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcClassificationItem
-IfcClassificationNotationFacet* IfcClassificationItem::Notation() { return (IfcClassificationNotationFacet*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(0))); }
+IfcClassificationNotationFacet* IfcClassificationItem::Notation() const { return (IfcClassificationNotationFacet*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(0))); }
 void IfcClassificationItem::setNotation(IfcClassificationNotationFacet* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-bool IfcClassificationItem::hasItemOf() { return !entity->getArgument(1)->isNull(); }
-IfcClassification* IfcClassificationItem::ItemOf() { return (IfcClassification*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(1))); }
+bool IfcClassificationItem::hasItemOf() const { return !entity->getArgument(1)->isNull(); }
+IfcClassification* IfcClassificationItem::ItemOf() const { return (IfcClassification*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(1))); }
 void IfcClassificationItem::setItemOf(IfcClassification* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-IfcLabel IfcClassificationItem::Title() { return *entity->getArgument(2); }
-void IfcClassificationItem::setTitle(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-IfcClassificationItemRelationship::list IfcClassificationItem::IsClassifiedItemIn() { RETURN_INVERSE(IfcClassificationItemRelationship) }
-IfcClassificationItemRelationship::list IfcClassificationItem::IsClassifyingItemIn() { RETURN_INVERSE(IfcClassificationItemRelationship) }
+std::string IfcClassificationItem::Title() const { return *entity->getArgument(2); }
+void IfcClassificationItem::setTitle(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+IfcClassificationItemRelationship::list::ptr IfcClassificationItem::IsClassifiedItemIn() const { return entity->getInverse(Type::IfcClassificationItemRelationship, 1)->as<IfcClassificationItemRelationship>(); }
+IfcClassificationItemRelationship::list::ptr IfcClassificationItem::IsClassifyingItemIn() const { return entity->getInverse(Type::IfcClassificationItemRelationship, 0)->as<IfcClassificationItemRelationship>(); }
 bool IfcClassificationItem::is(Type::Enum v) const { return v == Type::IfcClassificationItem; }
 Type::Enum IfcClassificationItem::type() const { return Type::IfcClassificationItem; }
 Type::Enum IfcClassificationItem::Class() { return Type::IfcClassificationItem; }
-IfcClassificationItem::IfcClassificationItem(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcClassificationItem)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcClassificationItem::IfcClassificationItem(IfcClassificationNotationFacet* v1_Notation, IfcClassification* v2_ItemOf, IfcLabel v3_Title) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Notation)); e->setArgument(1,(v2_ItemOf)); e->setArgument(2,(v3_Title)); entity = e; EntityBuffer::Add(this); }
+IfcClassificationItem::IfcClassificationItem(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcClassificationItem)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcClassificationItem::IfcClassificationItem(IfcClassificationNotationFacet* v1_Notation, IfcClassification* v2_ItemOf, std::string v3_Title) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Notation)); e->setArgument(1,(v2_ItemOf)); e->setArgument(2,(v3_Title)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcClassificationItemRelationship
-IfcClassificationItem* IfcClassificationItemRelationship::RelatingItem() { return (IfcClassificationItem*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(0))); }
+IfcClassificationItem* IfcClassificationItemRelationship::RelatingItem() const { return (IfcClassificationItem*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(0))); }
 void IfcClassificationItemRelationship::setRelatingItem(IfcClassificationItem* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-SHARED_PTR< IfcTemplatedEntityList< IfcClassificationItem > > IfcClassificationItemRelationship::RelatedItems() { RETURN_AS_LIST(IfcClassificationItem,1) }
-void IfcClassificationItemRelationship::setRelatedItems(SHARED_PTR< IfcTemplatedEntityList< IfcClassificationItem > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v->generalize()); }
+IfcTemplatedEntityList< IfcClassificationItem >::ptr IfcClassificationItemRelationship::RelatedItems() const { IfcEntityList::ptr es = *entity->getArgument(1); return es->as<IfcClassificationItem>(); }
+void IfcClassificationItemRelationship::setRelatedItems(IfcTemplatedEntityList< IfcClassificationItem >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v->generalize()); }
 bool IfcClassificationItemRelationship::is(Type::Enum v) const { return v == Type::IfcClassificationItemRelationship; }
 Type::Enum IfcClassificationItemRelationship::type() const { return Type::IfcClassificationItemRelationship; }
 Type::Enum IfcClassificationItemRelationship::Class() { return Type::IfcClassificationItemRelationship; }
-IfcClassificationItemRelationship::IfcClassificationItemRelationship(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcClassificationItemRelationship)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcClassificationItemRelationship::IfcClassificationItemRelationship(IfcClassificationItem* v1_RelatingItem, SHARED_PTR< IfcTemplatedEntityList< IfcClassificationItem > > v2_RelatedItems) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_RelatingItem)); e->setArgument(1,(v2_RelatedItems)->generalize()); entity = e; EntityBuffer::Add(this); }
+IfcClassificationItemRelationship::IfcClassificationItemRelationship(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcClassificationItemRelationship)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcClassificationItemRelationship::IfcClassificationItemRelationship(IfcClassificationItem* v1_RelatingItem, IfcTemplatedEntityList< IfcClassificationItem >::ptr v2_RelatedItems) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_RelatingItem)); e->setArgument(1,(v2_RelatedItems)->generalize()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcClassificationNotation
-SHARED_PTR< IfcTemplatedEntityList< IfcClassificationNotationFacet > > IfcClassificationNotation::NotationFacets() { RETURN_AS_LIST(IfcClassificationNotationFacet,0) }
-void IfcClassificationNotation::setNotationFacets(SHARED_PTR< IfcTemplatedEntityList< IfcClassificationNotationFacet > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v->generalize()); }
+IfcTemplatedEntityList< IfcClassificationNotationFacet >::ptr IfcClassificationNotation::NotationFacets() const { IfcEntityList::ptr es = *entity->getArgument(0); return es->as<IfcClassificationNotationFacet>(); }
+void IfcClassificationNotation::setNotationFacets(IfcTemplatedEntityList< IfcClassificationNotationFacet >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v->generalize()); }
 bool IfcClassificationNotation::is(Type::Enum v) const { return v == Type::IfcClassificationNotation; }
 Type::Enum IfcClassificationNotation::type() const { return Type::IfcClassificationNotation; }
 Type::Enum IfcClassificationNotation::Class() { return Type::IfcClassificationNotation; }
-IfcClassificationNotation::IfcClassificationNotation(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcClassificationNotation)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcClassificationNotation::IfcClassificationNotation(SHARED_PTR< IfcTemplatedEntityList< IfcClassificationNotationFacet > > v1_NotationFacets) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_NotationFacets)->generalize()); entity = e; EntityBuffer::Add(this); }
+IfcClassificationNotation::IfcClassificationNotation(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcClassificationNotation)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcClassificationNotation::IfcClassificationNotation(IfcTemplatedEntityList< IfcClassificationNotationFacet >::ptr v1_NotationFacets) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_NotationFacets)->generalize()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcClassificationNotationFacet
-IfcLabel IfcClassificationNotationFacet::NotationValue() { return *entity->getArgument(0); }
-void IfcClassificationNotationFacet::setNotationValue(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+std::string IfcClassificationNotationFacet::NotationValue() const { return *entity->getArgument(0); }
+void IfcClassificationNotationFacet::setNotationValue(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
 bool IfcClassificationNotationFacet::is(Type::Enum v) const { return v == Type::IfcClassificationNotationFacet; }
 Type::Enum IfcClassificationNotationFacet::type() const { return Type::IfcClassificationNotationFacet; }
 Type::Enum IfcClassificationNotationFacet::Class() { return Type::IfcClassificationNotationFacet; }
-IfcClassificationNotationFacet::IfcClassificationNotationFacet(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcClassificationNotationFacet)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcClassificationNotationFacet::IfcClassificationNotationFacet(IfcLabel v1_NotationValue) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_NotationValue)); entity = e; EntityBuffer::Add(this); }
+IfcClassificationNotationFacet::IfcClassificationNotationFacet(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcClassificationNotationFacet)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcClassificationNotationFacet::IfcClassificationNotationFacet(std::string v1_NotationValue) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_NotationValue)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcClassificationReference
-bool IfcClassificationReference::hasReferencedSource() { return !entity->getArgument(3)->isNull(); }
-IfcClassification* IfcClassificationReference::ReferencedSource() { return (IfcClassification*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(3))); }
+bool IfcClassificationReference::hasReferencedSource() const { return !entity->getArgument(3)->isNull(); }
+IfcClassification* IfcClassificationReference::ReferencedSource() const { return (IfcClassification*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(3))); }
 void IfcClassificationReference::setReferencedSource(IfcClassification* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
 bool IfcClassificationReference::is(Type::Enum v) const { return v == Type::IfcClassificationReference || IfcExternalReference::is(v); }
 Type::Enum IfcClassificationReference::type() const { return Type::IfcClassificationReference; }
 Type::Enum IfcClassificationReference::Class() { return Type::IfcClassificationReference; }
-IfcClassificationReference::IfcClassificationReference(IfcAbstractEntityPtr e) : IfcExternalReference((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcClassificationReference)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcClassificationReference::IfcClassificationReference(boost::optional< IfcLabel > v1_Location, boost::optional< IfcIdentifier > v2_ItemReference, boost::optional< IfcLabel > v3_Name, IfcClassification* v4_ReferencedSource) : IfcExternalReference((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Location) { e->setArgument(0,(*v1_Location)); } else { e->setArgument(0); } if (v2_ItemReference) { e->setArgument(1,(*v2_ItemReference)); } else { e->setArgument(1); } if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } e->setArgument(3,(v4_ReferencedSource)); entity = e; EntityBuffer::Add(this); }
+IfcClassificationReference::IfcClassificationReference(IfcAbstractEntity* e) : IfcExternalReference((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcClassificationReference)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcClassificationReference::IfcClassificationReference(boost::optional< std::string > v1_Location, boost::optional< std::string > v2_ItemReference, boost::optional< std::string > v3_Name, IfcClassification* v4_ReferencedSource) : IfcExternalReference((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Location) { e->setArgument(0,(*v1_Location)); } else { e->setArgument(0); } if (v2_ItemReference) { e->setArgument(1,(*v2_ItemReference)); } else { e->setArgument(1); } if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } e->setArgument(3,(v4_ReferencedSource)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcClosedShell
 bool IfcClosedShell::is(Type::Enum v) const { return v == Type::IfcClosedShell || IfcConnectedFaceSet::is(v); }
 Type::Enum IfcClosedShell::type() const { return Type::IfcClosedShell; }
 Type::Enum IfcClosedShell::Class() { return Type::IfcClosedShell; }
-IfcClosedShell::IfcClosedShell(IfcAbstractEntityPtr e) : IfcConnectedFaceSet((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcClosedShell)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcClosedShell::IfcClosedShell(SHARED_PTR< IfcTemplatedEntityList< IfcFace > > v1_CfsFaces) : IfcConnectedFaceSet((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_CfsFaces)->generalize()); entity = e; EntityBuffer::Add(this); }
+IfcClosedShell::IfcClosedShell(IfcAbstractEntity* e) : IfcConnectedFaceSet((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcClosedShell)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcClosedShell::IfcClosedShell(IfcTemplatedEntityList< IfcFace >::ptr v1_CfsFaces) : IfcConnectedFaceSet((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_CfsFaces)->generalize()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcCoilType
-IfcCoilTypeEnum::IfcCoilTypeEnum IfcCoilType::PredefinedType() { return IfcCoilTypeEnum::FromString(*entity->getArgument(9)); }
+IfcCoilTypeEnum::IfcCoilTypeEnum IfcCoilType::PredefinedType() const { return IfcCoilTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcCoilType::setPredefinedType(IfcCoilTypeEnum::IfcCoilTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcCoilTypeEnum::ToString(v)); }
 bool IfcCoilType::is(Type::Enum v) const { return v == Type::IfcCoilType || IfcEnergyConversionDeviceType::is(v); }
 Type::Enum IfcCoilType::type() const { return Type::IfcCoilType; }
 Type::Enum IfcCoilType::Class() { return Type::IfcCoilType; }
-IfcCoilType::IfcCoilType(IfcAbstractEntityPtr e) : IfcEnergyConversionDeviceType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcCoilType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcCoilType::IfcCoilType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcCoilTypeEnum::IfcCoilTypeEnum v10_PredefinedType) : IfcEnergyConversionDeviceType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcCoilTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcCoilType::IfcCoilType(IfcAbstractEntity* e) : IfcEnergyConversionDeviceType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcCoilType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcCoilType::IfcCoilType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcCoilTypeEnum::IfcCoilTypeEnum v10_PredefinedType) : IfcEnergyConversionDeviceType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcCoilTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcColourRgb
-IfcNormalisedRatioMeasure IfcColourRgb::Red() { return *entity->getArgument(1); }
-void IfcColourRgb::setRed(IfcNormalisedRatioMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-IfcNormalisedRatioMeasure IfcColourRgb::Green() { return *entity->getArgument(2); }
-void IfcColourRgb::setGreen(IfcNormalisedRatioMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-IfcNormalisedRatioMeasure IfcColourRgb::Blue() { return *entity->getArgument(3); }
-void IfcColourRgb::setBlue(IfcNormalisedRatioMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+double IfcColourRgb::Red() const { return *entity->getArgument(1); }
+void IfcColourRgb::setRed(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+double IfcColourRgb::Green() const { return *entity->getArgument(2); }
+void IfcColourRgb::setGreen(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+double IfcColourRgb::Blue() const { return *entity->getArgument(3); }
+void IfcColourRgb::setBlue(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
 bool IfcColourRgb::is(Type::Enum v) const { return v == Type::IfcColourRgb || IfcColourSpecification::is(v); }
 Type::Enum IfcColourRgb::type() const { return Type::IfcColourRgb; }
 Type::Enum IfcColourRgb::Class() { return Type::IfcColourRgb; }
-IfcColourRgb::IfcColourRgb(IfcAbstractEntityPtr e) : IfcColourSpecification((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcColourRgb)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcColourRgb::IfcColourRgb(boost::optional< IfcLabel > v1_Name, IfcNormalisedRatioMeasure v2_Red, IfcNormalisedRatioMeasure v3_Green, IfcNormalisedRatioMeasure v4_Blue) : IfcColourSpecification((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } e->setArgument(1,(v2_Red)); e->setArgument(2,(v3_Green)); e->setArgument(3,(v4_Blue)); entity = e; EntityBuffer::Add(this); }
+IfcColourRgb::IfcColourRgb(IfcAbstractEntity* e) : IfcColourSpecification((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcColourRgb)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcColourRgb::IfcColourRgb(boost::optional< std::string > v1_Name, double v2_Red, double v3_Green, double v4_Blue) : IfcColourSpecification((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } e->setArgument(1,(v2_Red)); e->setArgument(2,(v3_Green)); e->setArgument(3,(v4_Blue)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcColourSpecification
-bool IfcColourSpecification::hasName() { return !entity->getArgument(0)->isNull(); }
-IfcLabel IfcColourSpecification::Name() { return *entity->getArgument(0); }
-void IfcColourSpecification::setName(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+bool IfcColourSpecification::hasName() const { return !entity->getArgument(0)->isNull(); }
+std::string IfcColourSpecification::Name() const { return *entity->getArgument(0); }
+void IfcColourSpecification::setName(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
 bool IfcColourSpecification::is(Type::Enum v) const { return v == Type::IfcColourSpecification; }
 Type::Enum IfcColourSpecification::type() const { return Type::IfcColourSpecification; }
 Type::Enum IfcColourSpecification::Class() { return Type::IfcColourSpecification; }
-IfcColourSpecification::IfcColourSpecification(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcColourSpecification)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcColourSpecification::IfcColourSpecification(boost::optional< IfcLabel > v1_Name) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } entity = e; EntityBuffer::Add(this); }
+IfcColourSpecification::IfcColourSpecification(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcColourSpecification)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcColourSpecification::IfcColourSpecification(boost::optional< std::string > v1_Name) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcColumn
 bool IfcColumn::is(Type::Enum v) const { return v == Type::IfcColumn || IfcBuildingElement::is(v); }
 Type::Enum IfcColumn::type() const { return Type::IfcColumn; }
 Type::Enum IfcColumn::Class() { return Type::IfcColumn; }
-IfcColumn::IfcColumn(IfcAbstractEntityPtr e) : IfcBuildingElement((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcColumn)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcColumn::IfcColumn(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag) : IfcBuildingElement((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
+IfcColumn::IfcColumn(IfcAbstractEntity* e) : IfcBuildingElement((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcColumn)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcColumn::IfcColumn(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag) : IfcBuildingElement((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcColumnType
-IfcColumnTypeEnum::IfcColumnTypeEnum IfcColumnType::PredefinedType() { return IfcColumnTypeEnum::FromString(*entity->getArgument(9)); }
+IfcColumnTypeEnum::IfcColumnTypeEnum IfcColumnType::PredefinedType() const { return IfcColumnTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcColumnType::setPredefinedType(IfcColumnTypeEnum::IfcColumnTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcColumnTypeEnum::ToString(v)); }
 bool IfcColumnType::is(Type::Enum v) const { return v == Type::IfcColumnType || IfcBuildingElementType::is(v); }
 Type::Enum IfcColumnType::type() const { return Type::IfcColumnType; }
 Type::Enum IfcColumnType::Class() { return Type::IfcColumnType; }
-IfcColumnType::IfcColumnType(IfcAbstractEntityPtr e) : IfcBuildingElementType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcColumnType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcColumnType::IfcColumnType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcColumnTypeEnum::IfcColumnTypeEnum v10_PredefinedType) : IfcBuildingElementType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcColumnTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcColumnType::IfcColumnType(IfcAbstractEntity* e) : IfcBuildingElementType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcColumnType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcColumnType::IfcColumnType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcColumnTypeEnum::IfcColumnTypeEnum v10_PredefinedType) : IfcBuildingElementType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcColumnTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcComplexProperty
-IfcIdentifier IfcComplexProperty::UsageName() { return *entity->getArgument(2); }
-void IfcComplexProperty::setUsageName(IfcIdentifier v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-SHARED_PTR< IfcTemplatedEntityList< IfcProperty > > IfcComplexProperty::HasProperties() { RETURN_AS_LIST(IfcProperty,3) }
-void IfcComplexProperty::setHasProperties(SHARED_PTR< IfcTemplatedEntityList< IfcProperty > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v->generalize()); }
+std::string IfcComplexProperty::UsageName() const { return *entity->getArgument(2); }
+void IfcComplexProperty::setUsageName(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+IfcTemplatedEntityList< IfcProperty >::ptr IfcComplexProperty::HasProperties() const { IfcEntityList::ptr es = *entity->getArgument(3); return es->as<IfcProperty>(); }
+void IfcComplexProperty::setHasProperties(IfcTemplatedEntityList< IfcProperty >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v->generalize()); }
 bool IfcComplexProperty::is(Type::Enum v) const { return v == Type::IfcComplexProperty || IfcProperty::is(v); }
 Type::Enum IfcComplexProperty::type() const { return Type::IfcComplexProperty; }
 Type::Enum IfcComplexProperty::Class() { return Type::IfcComplexProperty; }
-IfcComplexProperty::IfcComplexProperty(IfcAbstractEntityPtr e) : IfcProperty((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcComplexProperty)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcComplexProperty::IfcComplexProperty(IfcIdentifier v1_Name, boost::optional< IfcText > v2_Description, IfcIdentifier v3_UsageName, SHARED_PTR< IfcTemplatedEntityList< IfcProperty > > v4_HasProperties) : IfcProperty((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_UsageName)); e->setArgument(3,(v4_HasProperties)->generalize()); entity = e; EntityBuffer::Add(this); }
+IfcComplexProperty::IfcComplexProperty(IfcAbstractEntity* e) : IfcProperty((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcComplexProperty)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcComplexProperty::IfcComplexProperty(std::string v1_Name, boost::optional< std::string > v2_Description, std::string v3_UsageName, IfcTemplatedEntityList< IfcProperty >::ptr v4_HasProperties) : IfcProperty((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_UsageName)); e->setArgument(3,(v4_HasProperties)->generalize()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcCompositeCurve
-SHARED_PTR< IfcTemplatedEntityList< IfcCompositeCurveSegment > > IfcCompositeCurve::Segments() { RETURN_AS_LIST(IfcCompositeCurveSegment,0) }
-void IfcCompositeCurve::setSegments(SHARED_PTR< IfcTemplatedEntityList< IfcCompositeCurveSegment > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v->generalize()); }
-bool IfcCompositeCurve::SelfIntersect() { return *entity->getArgument(1); }
+IfcTemplatedEntityList< IfcCompositeCurveSegment >::ptr IfcCompositeCurve::Segments() const { IfcEntityList::ptr es = *entity->getArgument(0); return es->as<IfcCompositeCurveSegment>(); }
+void IfcCompositeCurve::setSegments(IfcTemplatedEntityList< IfcCompositeCurveSegment >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v->generalize()); }
+bool IfcCompositeCurve::SelfIntersect() const { return *entity->getArgument(1); }
 void IfcCompositeCurve::setSelfIntersect(bool v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
 bool IfcCompositeCurve::is(Type::Enum v) const { return v == Type::IfcCompositeCurve || IfcBoundedCurve::is(v); }
 Type::Enum IfcCompositeCurve::type() const { return Type::IfcCompositeCurve; }
 Type::Enum IfcCompositeCurve::Class() { return Type::IfcCompositeCurve; }
-IfcCompositeCurve::IfcCompositeCurve(IfcAbstractEntityPtr e) : IfcBoundedCurve((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcCompositeCurve)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcCompositeCurve::IfcCompositeCurve(SHARED_PTR< IfcTemplatedEntityList< IfcCompositeCurveSegment > > v1_Segments, bool v2_SelfIntersect) : IfcBoundedCurve((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Segments)->generalize()); e->setArgument(1,(v2_SelfIntersect)); entity = e; EntityBuffer::Add(this); }
+IfcCompositeCurve::IfcCompositeCurve(IfcAbstractEntity* e) : IfcBoundedCurve((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcCompositeCurve)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcCompositeCurve::IfcCompositeCurve(IfcTemplatedEntityList< IfcCompositeCurveSegment >::ptr v1_Segments, bool v2_SelfIntersect) : IfcBoundedCurve((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Segments)->generalize()); e->setArgument(1,(v2_SelfIntersect)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcCompositeCurveSegment
-IfcTransitionCode::IfcTransitionCode IfcCompositeCurveSegment::Transition() { return IfcTransitionCode::FromString(*entity->getArgument(0)); }
+IfcTransitionCode::IfcTransitionCode IfcCompositeCurveSegment::Transition() const { return IfcTransitionCode::FromString(*entity->getArgument(0)); }
 void IfcCompositeCurveSegment::setTransition(IfcTransitionCode::IfcTransitionCode v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v,IfcTransitionCode::ToString(v)); }
-bool IfcCompositeCurveSegment::SameSense() { return *entity->getArgument(1); }
+bool IfcCompositeCurveSegment::SameSense() const { return *entity->getArgument(1); }
 void IfcCompositeCurveSegment::setSameSense(bool v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-IfcCurve* IfcCompositeCurveSegment::ParentCurve() { return (IfcCurve*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(2))); }
+IfcCurve* IfcCompositeCurveSegment::ParentCurve() const { return (IfcCurve*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(2))); }
 void IfcCompositeCurveSegment::setParentCurve(IfcCurve* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-IfcCompositeCurve::list IfcCompositeCurveSegment::UsingCurves() { RETURN_INVERSE(IfcCompositeCurve) }
+IfcCompositeCurve::list::ptr IfcCompositeCurveSegment::UsingCurves() const { return entity->getInverse(Type::IfcCompositeCurve, 0)->as<IfcCompositeCurve>(); }
 bool IfcCompositeCurveSegment::is(Type::Enum v) const { return v == Type::IfcCompositeCurveSegment || IfcGeometricRepresentationItem::is(v); }
 Type::Enum IfcCompositeCurveSegment::type() const { return Type::IfcCompositeCurveSegment; }
 Type::Enum IfcCompositeCurveSegment::Class() { return Type::IfcCompositeCurveSegment; }
-IfcCompositeCurveSegment::IfcCompositeCurveSegment(IfcAbstractEntityPtr e) : IfcGeometricRepresentationItem((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcCompositeCurveSegment)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcCompositeCurveSegment::IfcCompositeCurveSegment(IfcTransitionCode::IfcTransitionCode v1_Transition, bool v2_SameSense, IfcCurve* v3_ParentCurve) : IfcGeometricRepresentationItem((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,v1_Transition,IfcTransitionCode::ToString(v1_Transition)); e->setArgument(1,(v2_SameSense)); e->setArgument(2,(v3_ParentCurve)); entity = e; EntityBuffer::Add(this); }
+IfcCompositeCurveSegment::IfcCompositeCurveSegment(IfcAbstractEntity* e) : IfcGeometricRepresentationItem((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcCompositeCurveSegment)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcCompositeCurveSegment::IfcCompositeCurveSegment(IfcTransitionCode::IfcTransitionCode v1_Transition, bool v2_SameSense, IfcCurve* v3_ParentCurve) : IfcGeometricRepresentationItem((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,v1_Transition,IfcTransitionCode::ToString(v1_Transition)); e->setArgument(1,(v2_SameSense)); e->setArgument(2,(v3_ParentCurve)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcCompositeProfileDef
-SHARED_PTR< IfcTemplatedEntityList< IfcProfileDef > > IfcCompositeProfileDef::Profiles() { RETURN_AS_LIST(IfcProfileDef,2) }
-void IfcCompositeProfileDef::setProfiles(SHARED_PTR< IfcTemplatedEntityList< IfcProfileDef > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v->generalize()); }
-bool IfcCompositeProfileDef::hasLabel() { return !entity->getArgument(3)->isNull(); }
-IfcLabel IfcCompositeProfileDef::Label() { return *entity->getArgument(3); }
-void IfcCompositeProfileDef::setLabel(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+IfcTemplatedEntityList< IfcProfileDef >::ptr IfcCompositeProfileDef::Profiles() const { IfcEntityList::ptr es = *entity->getArgument(2); return es->as<IfcProfileDef>(); }
+void IfcCompositeProfileDef::setProfiles(IfcTemplatedEntityList< IfcProfileDef >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v->generalize()); }
+bool IfcCompositeProfileDef::hasLabel() const { return !entity->getArgument(3)->isNull(); }
+std::string IfcCompositeProfileDef::Label() const { return *entity->getArgument(3); }
+void IfcCompositeProfileDef::setLabel(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
 bool IfcCompositeProfileDef::is(Type::Enum v) const { return v == Type::IfcCompositeProfileDef || IfcProfileDef::is(v); }
 Type::Enum IfcCompositeProfileDef::type() const { return Type::IfcCompositeProfileDef; }
 Type::Enum IfcCompositeProfileDef::Class() { return Type::IfcCompositeProfileDef; }
-IfcCompositeProfileDef::IfcCompositeProfileDef(IfcAbstractEntityPtr e) : IfcProfileDef((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcCompositeProfileDef)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcCompositeProfileDef::IfcCompositeProfileDef(IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< IfcLabel > v2_ProfileName, SHARED_PTR< IfcTemplatedEntityList< IfcProfileDef > > v3_Profiles, boost::optional< IfcLabel > v4_Label) : IfcProfileDef((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,v1_ProfileType,IfcProfileTypeEnum::ToString(v1_ProfileType)); if (v2_ProfileName) { e->setArgument(1,(*v2_ProfileName)); } else { e->setArgument(1); } e->setArgument(2,(v3_Profiles)->generalize()); if (v4_Label) { e->setArgument(3,(*v4_Label)); } else { e->setArgument(3); } entity = e; EntityBuffer::Add(this); }
+IfcCompositeProfileDef::IfcCompositeProfileDef(IfcAbstractEntity* e) : IfcProfileDef((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcCompositeProfileDef)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcCompositeProfileDef::IfcCompositeProfileDef(IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< std::string > v2_ProfileName, IfcTemplatedEntityList< IfcProfileDef >::ptr v3_Profiles, boost::optional< std::string > v4_Label) : IfcProfileDef((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,v1_ProfileType,IfcProfileTypeEnum::ToString(v1_ProfileType)); if (v2_ProfileName) { e->setArgument(1,(*v2_ProfileName)); } else { e->setArgument(1); } e->setArgument(2,(v3_Profiles)->generalize()); if (v4_Label) { e->setArgument(3,(*v4_Label)); } else { e->setArgument(3); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcCompressorType
-IfcCompressorTypeEnum::IfcCompressorTypeEnum IfcCompressorType::PredefinedType() { return IfcCompressorTypeEnum::FromString(*entity->getArgument(9)); }
+IfcCompressorTypeEnum::IfcCompressorTypeEnum IfcCompressorType::PredefinedType() const { return IfcCompressorTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcCompressorType::setPredefinedType(IfcCompressorTypeEnum::IfcCompressorTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcCompressorTypeEnum::ToString(v)); }
 bool IfcCompressorType::is(Type::Enum v) const { return v == Type::IfcCompressorType || IfcFlowMovingDeviceType::is(v); }
 Type::Enum IfcCompressorType::type() const { return Type::IfcCompressorType; }
 Type::Enum IfcCompressorType::Class() { return Type::IfcCompressorType; }
-IfcCompressorType::IfcCompressorType(IfcAbstractEntityPtr e) : IfcFlowMovingDeviceType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcCompressorType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcCompressorType::IfcCompressorType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcCompressorTypeEnum::IfcCompressorTypeEnum v10_PredefinedType) : IfcFlowMovingDeviceType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcCompressorTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcCompressorType::IfcCompressorType(IfcAbstractEntity* e) : IfcFlowMovingDeviceType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcCompressorType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcCompressorType::IfcCompressorType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcCompressorTypeEnum::IfcCompressorTypeEnum v10_PredefinedType) : IfcFlowMovingDeviceType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcCompressorTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcCondenserType
-IfcCondenserTypeEnum::IfcCondenserTypeEnum IfcCondenserType::PredefinedType() { return IfcCondenserTypeEnum::FromString(*entity->getArgument(9)); }
+IfcCondenserTypeEnum::IfcCondenserTypeEnum IfcCondenserType::PredefinedType() const { return IfcCondenserTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcCondenserType::setPredefinedType(IfcCondenserTypeEnum::IfcCondenserTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcCondenserTypeEnum::ToString(v)); }
 bool IfcCondenserType::is(Type::Enum v) const { return v == Type::IfcCondenserType || IfcEnergyConversionDeviceType::is(v); }
 Type::Enum IfcCondenserType::type() const { return Type::IfcCondenserType; }
 Type::Enum IfcCondenserType::Class() { return Type::IfcCondenserType; }
-IfcCondenserType::IfcCondenserType(IfcAbstractEntityPtr e) : IfcEnergyConversionDeviceType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcCondenserType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcCondenserType::IfcCondenserType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcCondenserTypeEnum::IfcCondenserTypeEnum v10_PredefinedType) : IfcEnergyConversionDeviceType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcCondenserTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcCondenserType::IfcCondenserType(IfcAbstractEntity* e) : IfcEnergyConversionDeviceType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcCondenserType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcCondenserType::IfcCondenserType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcCondenserTypeEnum::IfcCondenserTypeEnum v10_PredefinedType) : IfcEnergyConversionDeviceType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcCondenserTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcCondition
 bool IfcCondition::is(Type::Enum v) const { return v == Type::IfcCondition || IfcGroup::is(v); }
 Type::Enum IfcCondition::type() const { return Type::IfcCondition; }
 Type::Enum IfcCondition::Class() { return Type::IfcCondition; }
-IfcCondition::IfcCondition(IfcAbstractEntityPtr e) : IfcGroup((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcCondition)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcCondition::IfcCondition(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType) : IfcGroup((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } entity = e; EntityBuffer::Add(this); }
+IfcCondition::IfcCondition(IfcAbstractEntity* e) : IfcGroup((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcCondition)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcCondition::IfcCondition(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType) : IfcGroup((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcConditionCriterion
-IfcConditionCriterionSelect IfcConditionCriterion::Criterion() { return *entity->getArgument(5); }
-void IfcConditionCriterion::setCriterion(IfcConditionCriterionSelect v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-IfcDateTimeSelect IfcConditionCriterion::CriterionDateTime() { return *entity->getArgument(6); }
-void IfcConditionCriterion::setCriterionDateTime(IfcDateTimeSelect v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
+IfcConditionCriterionSelect* IfcConditionCriterion::Criterion() const { return (IfcConditionCriterionSelect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(5))); }
+void IfcConditionCriterion::setCriterion(IfcConditionCriterionSelect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+IfcDateTimeSelect* IfcConditionCriterion::CriterionDateTime() const { return (IfcDateTimeSelect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(6))); }
+void IfcConditionCriterion::setCriterionDateTime(IfcDateTimeSelect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
 bool IfcConditionCriterion::is(Type::Enum v) const { return v == Type::IfcConditionCriterion || IfcControl::is(v); }
 Type::Enum IfcConditionCriterion::type() const { return Type::IfcConditionCriterion; }
 Type::Enum IfcConditionCriterion::Class() { return Type::IfcConditionCriterion; }
-IfcConditionCriterion::IfcConditionCriterion(IfcAbstractEntityPtr e) : IfcControl((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcConditionCriterion)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcConditionCriterion::IfcConditionCriterion(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcConditionCriterionSelect v6_Criterion, IfcDateTimeSelect v7_CriterionDateTime) : IfcControl((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_Criterion)); e->setArgument(6,(v7_CriterionDateTime)); entity = e; EntityBuffer::Add(this); }
+IfcConditionCriterion::IfcConditionCriterion(IfcAbstractEntity* e) : IfcControl((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcConditionCriterion)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcConditionCriterion::IfcConditionCriterion(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcConditionCriterionSelect* v6_Criterion, IfcDateTimeSelect* v7_CriterionDateTime) : IfcControl((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_Criterion)); e->setArgument(6,(v7_CriterionDateTime)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcConic
-IfcAxis2Placement IfcConic::Position() { return *entity->getArgument(0); }
-void IfcConic::setPosition(IfcAxis2Placement v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+IfcAxis2Placement* IfcConic::Position() const { return (IfcAxis2Placement*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(0))); }
+void IfcConic::setPosition(IfcAxis2Placement* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
 bool IfcConic::is(Type::Enum v) const { return v == Type::IfcConic || IfcCurve::is(v); }
 Type::Enum IfcConic::type() const { return Type::IfcConic; }
 Type::Enum IfcConic::Class() { return Type::IfcConic; }
-IfcConic::IfcConic(IfcAbstractEntityPtr e) : IfcCurve((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcConic)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcConic::IfcConic(IfcAxis2Placement v1_Position) : IfcCurve((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Position)); entity = e; EntityBuffer::Add(this); }
+IfcConic::IfcConic(IfcAbstractEntity* e) : IfcCurve((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcConic)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcConic::IfcConic(IfcAxis2Placement* v1_Position) : IfcCurve((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Position)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcConnectedFaceSet
-SHARED_PTR< IfcTemplatedEntityList< IfcFace > > IfcConnectedFaceSet::CfsFaces() { RETURN_AS_LIST(IfcFace,0) }
-void IfcConnectedFaceSet::setCfsFaces(SHARED_PTR< IfcTemplatedEntityList< IfcFace > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v->generalize()); }
+IfcTemplatedEntityList< IfcFace >::ptr IfcConnectedFaceSet::CfsFaces() const { IfcEntityList::ptr es = *entity->getArgument(0); return es->as<IfcFace>(); }
+void IfcConnectedFaceSet::setCfsFaces(IfcTemplatedEntityList< IfcFace >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v->generalize()); }
 bool IfcConnectedFaceSet::is(Type::Enum v) const { return v == Type::IfcConnectedFaceSet || IfcTopologicalRepresentationItem::is(v); }
 Type::Enum IfcConnectedFaceSet::type() const { return Type::IfcConnectedFaceSet; }
 Type::Enum IfcConnectedFaceSet::Class() { return Type::IfcConnectedFaceSet; }
-IfcConnectedFaceSet::IfcConnectedFaceSet(IfcAbstractEntityPtr e) : IfcTopologicalRepresentationItem((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcConnectedFaceSet)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcConnectedFaceSet::IfcConnectedFaceSet(SHARED_PTR< IfcTemplatedEntityList< IfcFace > > v1_CfsFaces) : IfcTopologicalRepresentationItem((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_CfsFaces)->generalize()); entity = e; EntityBuffer::Add(this); }
+IfcConnectedFaceSet::IfcConnectedFaceSet(IfcAbstractEntity* e) : IfcTopologicalRepresentationItem((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcConnectedFaceSet)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcConnectedFaceSet::IfcConnectedFaceSet(IfcTemplatedEntityList< IfcFace >::ptr v1_CfsFaces) : IfcTopologicalRepresentationItem((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_CfsFaces)->generalize()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcConnectionCurveGeometry
-IfcCurveOrEdgeCurve IfcConnectionCurveGeometry::CurveOnRelatingElement() { return *entity->getArgument(0); }
-void IfcConnectionCurveGeometry::setCurveOnRelatingElement(IfcCurveOrEdgeCurve v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-bool IfcConnectionCurveGeometry::hasCurveOnRelatedElement() { return !entity->getArgument(1)->isNull(); }
-IfcCurveOrEdgeCurve IfcConnectionCurveGeometry::CurveOnRelatedElement() { return *entity->getArgument(1); }
-void IfcConnectionCurveGeometry::setCurveOnRelatedElement(IfcCurveOrEdgeCurve v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+IfcCurveOrEdgeCurve* IfcConnectionCurveGeometry::CurveOnRelatingElement() const { return (IfcCurveOrEdgeCurve*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(0))); }
+void IfcConnectionCurveGeometry::setCurveOnRelatingElement(IfcCurveOrEdgeCurve* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+bool IfcConnectionCurveGeometry::hasCurveOnRelatedElement() const { return !entity->getArgument(1)->isNull(); }
+IfcCurveOrEdgeCurve* IfcConnectionCurveGeometry::CurveOnRelatedElement() const { return (IfcCurveOrEdgeCurve*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(1))); }
+void IfcConnectionCurveGeometry::setCurveOnRelatedElement(IfcCurveOrEdgeCurve* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
 bool IfcConnectionCurveGeometry::is(Type::Enum v) const { return v == Type::IfcConnectionCurveGeometry || IfcConnectionGeometry::is(v); }
 Type::Enum IfcConnectionCurveGeometry::type() const { return Type::IfcConnectionCurveGeometry; }
 Type::Enum IfcConnectionCurveGeometry::Class() { return Type::IfcConnectionCurveGeometry; }
-IfcConnectionCurveGeometry::IfcConnectionCurveGeometry(IfcAbstractEntityPtr e) : IfcConnectionGeometry((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcConnectionCurveGeometry)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcConnectionCurveGeometry::IfcConnectionCurveGeometry(IfcCurveOrEdgeCurve v1_CurveOnRelatingElement, boost::optional< IfcCurveOrEdgeCurve > v2_CurveOnRelatedElement) : IfcConnectionGeometry((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_CurveOnRelatingElement)); if (v2_CurveOnRelatedElement) { e->setArgument(1,(*v2_CurveOnRelatedElement)); } else { e->setArgument(1); } entity = e; EntityBuffer::Add(this); }
+IfcConnectionCurveGeometry::IfcConnectionCurveGeometry(IfcAbstractEntity* e) : IfcConnectionGeometry((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcConnectionCurveGeometry)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcConnectionCurveGeometry::IfcConnectionCurveGeometry(IfcCurveOrEdgeCurve* v1_CurveOnRelatingElement, IfcCurveOrEdgeCurve* v2_CurveOnRelatedElement) : IfcConnectionGeometry((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_CurveOnRelatingElement)); e->setArgument(1,(v2_CurveOnRelatedElement)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcConnectionGeometry
 bool IfcConnectionGeometry::is(Type::Enum v) const { return v == Type::IfcConnectionGeometry; }
 Type::Enum IfcConnectionGeometry::type() const { return Type::IfcConnectionGeometry; }
 Type::Enum IfcConnectionGeometry::Class() { return Type::IfcConnectionGeometry; }
-IfcConnectionGeometry::IfcConnectionGeometry(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcConnectionGeometry)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcConnectionGeometry::IfcConnectionGeometry(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcConnectionGeometry)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
 IfcConnectionGeometry::IfcConnectionGeometry() : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcConnectionPointEccentricity
-bool IfcConnectionPointEccentricity::hasEccentricityInX() { return !entity->getArgument(2)->isNull(); }
-IfcLengthMeasure IfcConnectionPointEccentricity::EccentricityInX() { return *entity->getArgument(2); }
-void IfcConnectionPointEccentricity::setEccentricityInX(IfcLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-bool IfcConnectionPointEccentricity::hasEccentricityInY() { return !entity->getArgument(3)->isNull(); }
-IfcLengthMeasure IfcConnectionPointEccentricity::EccentricityInY() { return *entity->getArgument(3); }
-void IfcConnectionPointEccentricity::setEccentricityInY(IfcLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-bool IfcConnectionPointEccentricity::hasEccentricityInZ() { return !entity->getArgument(4)->isNull(); }
-IfcLengthMeasure IfcConnectionPointEccentricity::EccentricityInZ() { return *entity->getArgument(4); }
-void IfcConnectionPointEccentricity::setEccentricityInZ(IfcLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+bool IfcConnectionPointEccentricity::hasEccentricityInX() const { return !entity->getArgument(2)->isNull(); }
+double IfcConnectionPointEccentricity::EccentricityInX() const { return *entity->getArgument(2); }
+void IfcConnectionPointEccentricity::setEccentricityInX(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+bool IfcConnectionPointEccentricity::hasEccentricityInY() const { return !entity->getArgument(3)->isNull(); }
+double IfcConnectionPointEccentricity::EccentricityInY() const { return *entity->getArgument(3); }
+void IfcConnectionPointEccentricity::setEccentricityInY(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+bool IfcConnectionPointEccentricity::hasEccentricityInZ() const { return !entity->getArgument(4)->isNull(); }
+double IfcConnectionPointEccentricity::EccentricityInZ() const { return *entity->getArgument(4); }
+void IfcConnectionPointEccentricity::setEccentricityInZ(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
 bool IfcConnectionPointEccentricity::is(Type::Enum v) const { return v == Type::IfcConnectionPointEccentricity || IfcConnectionPointGeometry::is(v); }
 Type::Enum IfcConnectionPointEccentricity::type() const { return Type::IfcConnectionPointEccentricity; }
 Type::Enum IfcConnectionPointEccentricity::Class() { return Type::IfcConnectionPointEccentricity; }
-IfcConnectionPointEccentricity::IfcConnectionPointEccentricity(IfcAbstractEntityPtr e) : IfcConnectionPointGeometry((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcConnectionPointEccentricity)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcConnectionPointEccentricity::IfcConnectionPointEccentricity(IfcPointOrVertexPoint v1_PointOnRelatingElement, boost::optional< IfcPointOrVertexPoint > v2_PointOnRelatedElement, boost::optional< IfcLengthMeasure > v3_EccentricityInX, boost::optional< IfcLengthMeasure > v4_EccentricityInY, boost::optional< IfcLengthMeasure > v5_EccentricityInZ) : IfcConnectionPointGeometry((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_PointOnRelatingElement)); if (v2_PointOnRelatedElement) { e->setArgument(1,(*v2_PointOnRelatedElement)); } else { e->setArgument(1); } if (v3_EccentricityInX) { e->setArgument(2,(*v3_EccentricityInX)); } else { e->setArgument(2); } if (v4_EccentricityInY) { e->setArgument(3,(*v4_EccentricityInY)); } else { e->setArgument(3); } if (v5_EccentricityInZ) { e->setArgument(4,(*v5_EccentricityInZ)); } else { e->setArgument(4); } entity = e; EntityBuffer::Add(this); }
+IfcConnectionPointEccentricity::IfcConnectionPointEccentricity(IfcAbstractEntity* e) : IfcConnectionPointGeometry((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcConnectionPointEccentricity)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcConnectionPointEccentricity::IfcConnectionPointEccentricity(IfcPointOrVertexPoint* v1_PointOnRelatingElement, IfcPointOrVertexPoint* v2_PointOnRelatedElement, boost::optional< double > v3_EccentricityInX, boost::optional< double > v4_EccentricityInY, boost::optional< double > v5_EccentricityInZ) : IfcConnectionPointGeometry((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_PointOnRelatingElement)); e->setArgument(1,(v2_PointOnRelatedElement)); if (v3_EccentricityInX) { e->setArgument(2,(*v3_EccentricityInX)); } else { e->setArgument(2); } if (v4_EccentricityInY) { e->setArgument(3,(*v4_EccentricityInY)); } else { e->setArgument(3); } if (v5_EccentricityInZ) { e->setArgument(4,(*v5_EccentricityInZ)); } else { e->setArgument(4); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcConnectionPointGeometry
-IfcPointOrVertexPoint IfcConnectionPointGeometry::PointOnRelatingElement() { return *entity->getArgument(0); }
-void IfcConnectionPointGeometry::setPointOnRelatingElement(IfcPointOrVertexPoint v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-bool IfcConnectionPointGeometry::hasPointOnRelatedElement() { return !entity->getArgument(1)->isNull(); }
-IfcPointOrVertexPoint IfcConnectionPointGeometry::PointOnRelatedElement() { return *entity->getArgument(1); }
-void IfcConnectionPointGeometry::setPointOnRelatedElement(IfcPointOrVertexPoint v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+IfcPointOrVertexPoint* IfcConnectionPointGeometry::PointOnRelatingElement() const { return (IfcPointOrVertexPoint*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(0))); }
+void IfcConnectionPointGeometry::setPointOnRelatingElement(IfcPointOrVertexPoint* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+bool IfcConnectionPointGeometry::hasPointOnRelatedElement() const { return !entity->getArgument(1)->isNull(); }
+IfcPointOrVertexPoint* IfcConnectionPointGeometry::PointOnRelatedElement() const { return (IfcPointOrVertexPoint*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(1))); }
+void IfcConnectionPointGeometry::setPointOnRelatedElement(IfcPointOrVertexPoint* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
 bool IfcConnectionPointGeometry::is(Type::Enum v) const { return v == Type::IfcConnectionPointGeometry || IfcConnectionGeometry::is(v); }
 Type::Enum IfcConnectionPointGeometry::type() const { return Type::IfcConnectionPointGeometry; }
 Type::Enum IfcConnectionPointGeometry::Class() { return Type::IfcConnectionPointGeometry; }
-IfcConnectionPointGeometry::IfcConnectionPointGeometry(IfcAbstractEntityPtr e) : IfcConnectionGeometry((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcConnectionPointGeometry)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcConnectionPointGeometry::IfcConnectionPointGeometry(IfcPointOrVertexPoint v1_PointOnRelatingElement, boost::optional< IfcPointOrVertexPoint > v2_PointOnRelatedElement) : IfcConnectionGeometry((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_PointOnRelatingElement)); if (v2_PointOnRelatedElement) { e->setArgument(1,(*v2_PointOnRelatedElement)); } else { e->setArgument(1); } entity = e; EntityBuffer::Add(this); }
+IfcConnectionPointGeometry::IfcConnectionPointGeometry(IfcAbstractEntity* e) : IfcConnectionGeometry((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcConnectionPointGeometry)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcConnectionPointGeometry::IfcConnectionPointGeometry(IfcPointOrVertexPoint* v1_PointOnRelatingElement, IfcPointOrVertexPoint* v2_PointOnRelatedElement) : IfcConnectionGeometry((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_PointOnRelatingElement)); e->setArgument(1,(v2_PointOnRelatedElement)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcConnectionPortGeometry
-IfcAxis2Placement IfcConnectionPortGeometry::LocationAtRelatingElement() { return *entity->getArgument(0); }
-void IfcConnectionPortGeometry::setLocationAtRelatingElement(IfcAxis2Placement v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-bool IfcConnectionPortGeometry::hasLocationAtRelatedElement() { return !entity->getArgument(1)->isNull(); }
-IfcAxis2Placement IfcConnectionPortGeometry::LocationAtRelatedElement() { return *entity->getArgument(1); }
-void IfcConnectionPortGeometry::setLocationAtRelatedElement(IfcAxis2Placement v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-IfcProfileDef* IfcConnectionPortGeometry::ProfileOfPort() { return (IfcProfileDef*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(2))); }
+IfcAxis2Placement* IfcConnectionPortGeometry::LocationAtRelatingElement() const { return (IfcAxis2Placement*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(0))); }
+void IfcConnectionPortGeometry::setLocationAtRelatingElement(IfcAxis2Placement* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+bool IfcConnectionPortGeometry::hasLocationAtRelatedElement() const { return !entity->getArgument(1)->isNull(); }
+IfcAxis2Placement* IfcConnectionPortGeometry::LocationAtRelatedElement() const { return (IfcAxis2Placement*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(1))); }
+void IfcConnectionPortGeometry::setLocationAtRelatedElement(IfcAxis2Placement* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+IfcProfileDef* IfcConnectionPortGeometry::ProfileOfPort() const { return (IfcProfileDef*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(2))); }
 void IfcConnectionPortGeometry::setProfileOfPort(IfcProfileDef* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
 bool IfcConnectionPortGeometry::is(Type::Enum v) const { return v == Type::IfcConnectionPortGeometry || IfcConnectionGeometry::is(v); }
 Type::Enum IfcConnectionPortGeometry::type() const { return Type::IfcConnectionPortGeometry; }
 Type::Enum IfcConnectionPortGeometry::Class() { return Type::IfcConnectionPortGeometry; }
-IfcConnectionPortGeometry::IfcConnectionPortGeometry(IfcAbstractEntityPtr e) : IfcConnectionGeometry((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcConnectionPortGeometry)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcConnectionPortGeometry::IfcConnectionPortGeometry(IfcAxis2Placement v1_LocationAtRelatingElement, boost::optional< IfcAxis2Placement > v2_LocationAtRelatedElement, IfcProfileDef* v3_ProfileOfPort) : IfcConnectionGeometry((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_LocationAtRelatingElement)); if (v2_LocationAtRelatedElement) { e->setArgument(1,(*v2_LocationAtRelatedElement)); } else { e->setArgument(1); } e->setArgument(2,(v3_ProfileOfPort)); entity = e; EntityBuffer::Add(this); }
+IfcConnectionPortGeometry::IfcConnectionPortGeometry(IfcAbstractEntity* e) : IfcConnectionGeometry((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcConnectionPortGeometry)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcConnectionPortGeometry::IfcConnectionPortGeometry(IfcAxis2Placement* v1_LocationAtRelatingElement, IfcAxis2Placement* v2_LocationAtRelatedElement, IfcProfileDef* v3_ProfileOfPort) : IfcConnectionGeometry((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_LocationAtRelatingElement)); e->setArgument(1,(v2_LocationAtRelatedElement)); e->setArgument(2,(v3_ProfileOfPort)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcConnectionSurfaceGeometry
-IfcSurfaceOrFaceSurface IfcConnectionSurfaceGeometry::SurfaceOnRelatingElement() { return *entity->getArgument(0); }
-void IfcConnectionSurfaceGeometry::setSurfaceOnRelatingElement(IfcSurfaceOrFaceSurface v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-bool IfcConnectionSurfaceGeometry::hasSurfaceOnRelatedElement() { return !entity->getArgument(1)->isNull(); }
-IfcSurfaceOrFaceSurface IfcConnectionSurfaceGeometry::SurfaceOnRelatedElement() { return *entity->getArgument(1); }
-void IfcConnectionSurfaceGeometry::setSurfaceOnRelatedElement(IfcSurfaceOrFaceSurface v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+IfcSurfaceOrFaceSurface* IfcConnectionSurfaceGeometry::SurfaceOnRelatingElement() const { return (IfcSurfaceOrFaceSurface*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(0))); }
+void IfcConnectionSurfaceGeometry::setSurfaceOnRelatingElement(IfcSurfaceOrFaceSurface* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+bool IfcConnectionSurfaceGeometry::hasSurfaceOnRelatedElement() const { return !entity->getArgument(1)->isNull(); }
+IfcSurfaceOrFaceSurface* IfcConnectionSurfaceGeometry::SurfaceOnRelatedElement() const { return (IfcSurfaceOrFaceSurface*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(1))); }
+void IfcConnectionSurfaceGeometry::setSurfaceOnRelatedElement(IfcSurfaceOrFaceSurface* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
 bool IfcConnectionSurfaceGeometry::is(Type::Enum v) const { return v == Type::IfcConnectionSurfaceGeometry || IfcConnectionGeometry::is(v); }
 Type::Enum IfcConnectionSurfaceGeometry::type() const { return Type::IfcConnectionSurfaceGeometry; }
 Type::Enum IfcConnectionSurfaceGeometry::Class() { return Type::IfcConnectionSurfaceGeometry; }
-IfcConnectionSurfaceGeometry::IfcConnectionSurfaceGeometry(IfcAbstractEntityPtr e) : IfcConnectionGeometry((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcConnectionSurfaceGeometry)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcConnectionSurfaceGeometry::IfcConnectionSurfaceGeometry(IfcSurfaceOrFaceSurface v1_SurfaceOnRelatingElement, boost::optional< IfcSurfaceOrFaceSurface > v2_SurfaceOnRelatedElement) : IfcConnectionGeometry((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_SurfaceOnRelatingElement)); if (v2_SurfaceOnRelatedElement) { e->setArgument(1,(*v2_SurfaceOnRelatedElement)); } else { e->setArgument(1); } entity = e; EntityBuffer::Add(this); }
+IfcConnectionSurfaceGeometry::IfcConnectionSurfaceGeometry(IfcAbstractEntity* e) : IfcConnectionGeometry((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcConnectionSurfaceGeometry)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcConnectionSurfaceGeometry::IfcConnectionSurfaceGeometry(IfcSurfaceOrFaceSurface* v1_SurfaceOnRelatingElement, IfcSurfaceOrFaceSurface* v2_SurfaceOnRelatedElement) : IfcConnectionGeometry((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_SurfaceOnRelatingElement)); e->setArgument(1,(v2_SurfaceOnRelatedElement)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcConstraint
-IfcLabel IfcConstraint::Name() { return *entity->getArgument(0); }
-void IfcConstraint::setName(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-bool IfcConstraint::hasDescription() { return !entity->getArgument(1)->isNull(); }
-IfcText IfcConstraint::Description() { return *entity->getArgument(1); }
-void IfcConstraint::setDescription(IfcText v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-IfcConstraintEnum::IfcConstraintEnum IfcConstraint::ConstraintGrade() { return IfcConstraintEnum::FromString(*entity->getArgument(2)); }
+std::string IfcConstraint::Name() const { return *entity->getArgument(0); }
+void IfcConstraint::setName(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+bool IfcConstraint::hasDescription() const { return !entity->getArgument(1)->isNull(); }
+std::string IfcConstraint::Description() const { return *entity->getArgument(1); }
+void IfcConstraint::setDescription(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+IfcConstraintEnum::IfcConstraintEnum IfcConstraint::ConstraintGrade() const { return IfcConstraintEnum::FromString(*entity->getArgument(2)); }
 void IfcConstraint::setConstraintGrade(IfcConstraintEnum::IfcConstraintEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v,IfcConstraintEnum::ToString(v)); }
-bool IfcConstraint::hasConstraintSource() { return !entity->getArgument(3)->isNull(); }
-IfcLabel IfcConstraint::ConstraintSource() { return *entity->getArgument(3); }
-void IfcConstraint::setConstraintSource(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-bool IfcConstraint::hasCreatingActor() { return !entity->getArgument(4)->isNull(); }
-IfcActorSelect IfcConstraint::CreatingActor() { return *entity->getArgument(4); }
-void IfcConstraint::setCreatingActor(IfcActorSelect v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-bool IfcConstraint::hasCreationTime() { return !entity->getArgument(5)->isNull(); }
-IfcDateTimeSelect IfcConstraint::CreationTime() { return *entity->getArgument(5); }
-void IfcConstraint::setCreationTime(IfcDateTimeSelect v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-bool IfcConstraint::hasUserDefinedGrade() { return !entity->getArgument(6)->isNull(); }
-IfcLabel IfcConstraint::UserDefinedGrade() { return *entity->getArgument(6); }
-void IfcConstraint::setUserDefinedGrade(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
-IfcConstraintClassificationRelationship::list IfcConstraint::ClassifiedAs() { RETURN_INVERSE(IfcConstraintClassificationRelationship) }
-IfcConstraintRelationship::list IfcConstraint::RelatesConstraints() { RETURN_INVERSE(IfcConstraintRelationship) }
-IfcConstraintRelationship::list IfcConstraint::IsRelatedWith() { RETURN_INVERSE(IfcConstraintRelationship) }
-IfcPropertyConstraintRelationship::list IfcConstraint::PropertiesForConstraint() { RETURN_INVERSE(IfcPropertyConstraintRelationship) }
-IfcConstraintAggregationRelationship::list IfcConstraint::Aggregates() { RETURN_INVERSE(IfcConstraintAggregationRelationship) }
-IfcConstraintAggregationRelationship::list IfcConstraint::IsAggregatedIn() { RETURN_INVERSE(IfcConstraintAggregationRelationship) }
+bool IfcConstraint::hasConstraintSource() const { return !entity->getArgument(3)->isNull(); }
+std::string IfcConstraint::ConstraintSource() const { return *entity->getArgument(3); }
+void IfcConstraint::setConstraintSource(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+bool IfcConstraint::hasCreatingActor() const { return !entity->getArgument(4)->isNull(); }
+IfcActorSelect* IfcConstraint::CreatingActor() const { return (IfcActorSelect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(4))); }
+void IfcConstraint::setCreatingActor(IfcActorSelect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+bool IfcConstraint::hasCreationTime() const { return !entity->getArgument(5)->isNull(); }
+IfcDateTimeSelect* IfcConstraint::CreationTime() const { return (IfcDateTimeSelect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(5))); }
+void IfcConstraint::setCreationTime(IfcDateTimeSelect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+bool IfcConstraint::hasUserDefinedGrade() const { return !entity->getArgument(6)->isNull(); }
+std::string IfcConstraint::UserDefinedGrade() const { return *entity->getArgument(6); }
+void IfcConstraint::setUserDefinedGrade(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
+IfcConstraintClassificationRelationship::list::ptr IfcConstraint::ClassifiedAs() const { return entity->getInverse(Type::IfcConstraintClassificationRelationship, 0)->as<IfcConstraintClassificationRelationship>(); }
+IfcConstraintRelationship::list::ptr IfcConstraint::RelatesConstraints() const { return entity->getInverse(Type::IfcConstraintRelationship, 2)->as<IfcConstraintRelationship>(); }
+IfcConstraintRelationship::list::ptr IfcConstraint::IsRelatedWith() const { return entity->getInverse(Type::IfcConstraintRelationship, 3)->as<IfcConstraintRelationship>(); }
+IfcPropertyConstraintRelationship::list::ptr IfcConstraint::PropertiesForConstraint() const { return entity->getInverse(Type::IfcPropertyConstraintRelationship, 0)->as<IfcPropertyConstraintRelationship>(); }
+IfcConstraintAggregationRelationship::list::ptr IfcConstraint::Aggregates() const { return entity->getInverse(Type::IfcConstraintAggregationRelationship, 2)->as<IfcConstraintAggregationRelationship>(); }
+IfcConstraintAggregationRelationship::list::ptr IfcConstraint::IsAggregatedIn() const { return entity->getInverse(Type::IfcConstraintAggregationRelationship, 3)->as<IfcConstraintAggregationRelationship>(); }
 bool IfcConstraint::is(Type::Enum v) const { return v == Type::IfcConstraint; }
 Type::Enum IfcConstraint::type() const { return Type::IfcConstraint; }
 Type::Enum IfcConstraint::Class() { return Type::IfcConstraint; }
-IfcConstraint::IfcConstraint(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcConstraint)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcConstraint::IfcConstraint(IfcLabel v1_Name, boost::optional< IfcText > v2_Description, IfcConstraintEnum::IfcConstraintEnum v3_ConstraintGrade, boost::optional< IfcLabel > v4_ConstraintSource, boost::optional< IfcActorSelect > v5_CreatingActor, boost::optional< IfcDateTimeSelect > v6_CreationTime, boost::optional< IfcLabel > v7_UserDefinedGrade) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,v3_ConstraintGrade,IfcConstraintEnum::ToString(v3_ConstraintGrade)); if (v4_ConstraintSource) { e->setArgument(3,(*v4_ConstraintSource)); } else { e->setArgument(3); } if (v5_CreatingActor) { e->setArgument(4,(*v5_CreatingActor)); } else { e->setArgument(4); } if (v6_CreationTime) { e->setArgument(5,(*v6_CreationTime)); } else { e->setArgument(5); } if (v7_UserDefinedGrade) { e->setArgument(6,(*v7_UserDefinedGrade)); } else { e->setArgument(6); } entity = e; EntityBuffer::Add(this); }
+IfcConstraint::IfcConstraint(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcConstraint)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcConstraint::IfcConstraint(std::string v1_Name, boost::optional< std::string > v2_Description, IfcConstraintEnum::IfcConstraintEnum v3_ConstraintGrade, boost::optional< std::string > v4_ConstraintSource, IfcActorSelect* v5_CreatingActor, IfcDateTimeSelect* v6_CreationTime, boost::optional< std::string > v7_UserDefinedGrade) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,v3_ConstraintGrade,IfcConstraintEnum::ToString(v3_ConstraintGrade)); if (v4_ConstraintSource) { e->setArgument(3,(*v4_ConstraintSource)); } else { e->setArgument(3); } e->setArgument(4,(v5_CreatingActor)); e->setArgument(5,(v6_CreationTime)); if (v7_UserDefinedGrade) { e->setArgument(6,(*v7_UserDefinedGrade)); } else { e->setArgument(6); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcConstraintAggregationRelationship
-bool IfcConstraintAggregationRelationship::hasName() { return !entity->getArgument(0)->isNull(); }
-IfcLabel IfcConstraintAggregationRelationship::Name() { return *entity->getArgument(0); }
-void IfcConstraintAggregationRelationship::setName(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-bool IfcConstraintAggregationRelationship::hasDescription() { return !entity->getArgument(1)->isNull(); }
-IfcText IfcConstraintAggregationRelationship::Description() { return *entity->getArgument(1); }
-void IfcConstraintAggregationRelationship::setDescription(IfcText v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-IfcConstraint* IfcConstraintAggregationRelationship::RelatingConstraint() { return (IfcConstraint*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(2))); }
+bool IfcConstraintAggregationRelationship::hasName() const { return !entity->getArgument(0)->isNull(); }
+std::string IfcConstraintAggregationRelationship::Name() const { return *entity->getArgument(0); }
+void IfcConstraintAggregationRelationship::setName(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+bool IfcConstraintAggregationRelationship::hasDescription() const { return !entity->getArgument(1)->isNull(); }
+std::string IfcConstraintAggregationRelationship::Description() const { return *entity->getArgument(1); }
+void IfcConstraintAggregationRelationship::setDescription(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+IfcConstraint* IfcConstraintAggregationRelationship::RelatingConstraint() const { return (IfcConstraint*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(2))); }
 void IfcConstraintAggregationRelationship::setRelatingConstraint(IfcConstraint* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-SHARED_PTR< IfcTemplatedEntityList< IfcConstraint > > IfcConstraintAggregationRelationship::RelatedConstraints() { RETURN_AS_LIST(IfcConstraint,3) }
-void IfcConstraintAggregationRelationship::setRelatedConstraints(SHARED_PTR< IfcTemplatedEntityList< IfcConstraint > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v->generalize()); }
-IfcLogicalOperatorEnum::IfcLogicalOperatorEnum IfcConstraintAggregationRelationship::LogicalAggregator() { return IfcLogicalOperatorEnum::FromString(*entity->getArgument(4)); }
+IfcTemplatedEntityList< IfcConstraint >::ptr IfcConstraintAggregationRelationship::RelatedConstraints() const { IfcEntityList::ptr es = *entity->getArgument(3); return es->as<IfcConstraint>(); }
+void IfcConstraintAggregationRelationship::setRelatedConstraints(IfcTemplatedEntityList< IfcConstraint >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v->generalize()); }
+IfcLogicalOperatorEnum::IfcLogicalOperatorEnum IfcConstraintAggregationRelationship::LogicalAggregator() const { return IfcLogicalOperatorEnum::FromString(*entity->getArgument(4)); }
 void IfcConstraintAggregationRelationship::setLogicalAggregator(IfcLogicalOperatorEnum::IfcLogicalOperatorEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v,IfcLogicalOperatorEnum::ToString(v)); }
 bool IfcConstraintAggregationRelationship::is(Type::Enum v) const { return v == Type::IfcConstraintAggregationRelationship; }
 Type::Enum IfcConstraintAggregationRelationship::type() const { return Type::IfcConstraintAggregationRelationship; }
 Type::Enum IfcConstraintAggregationRelationship::Class() { return Type::IfcConstraintAggregationRelationship; }
-IfcConstraintAggregationRelationship::IfcConstraintAggregationRelationship(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcConstraintAggregationRelationship)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcConstraintAggregationRelationship::IfcConstraintAggregationRelationship(boost::optional< IfcLabel > v1_Name, boost::optional< IfcText > v2_Description, IfcConstraint* v3_RelatingConstraint, SHARED_PTR< IfcTemplatedEntityList< IfcConstraint > > v4_RelatedConstraints, IfcLogicalOperatorEnum::IfcLogicalOperatorEnum v5_LogicalAggregator) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_RelatingConstraint)); e->setArgument(3,(v4_RelatedConstraints)->generalize()); e->setArgument(4,v5_LogicalAggregator,IfcLogicalOperatorEnum::ToString(v5_LogicalAggregator)); entity = e; EntityBuffer::Add(this); }
+IfcConstraintAggregationRelationship::IfcConstraintAggregationRelationship(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcConstraintAggregationRelationship)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcConstraintAggregationRelationship::IfcConstraintAggregationRelationship(boost::optional< std::string > v1_Name, boost::optional< std::string > v2_Description, IfcConstraint* v3_RelatingConstraint, IfcTemplatedEntityList< IfcConstraint >::ptr v4_RelatedConstraints, IfcLogicalOperatorEnum::IfcLogicalOperatorEnum v5_LogicalAggregator) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_RelatingConstraint)); e->setArgument(3,(v4_RelatedConstraints)->generalize()); e->setArgument(4,v5_LogicalAggregator,IfcLogicalOperatorEnum::ToString(v5_LogicalAggregator)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcConstraintClassificationRelationship
-IfcConstraint* IfcConstraintClassificationRelationship::ClassifiedConstraint() { return (IfcConstraint*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(0))); }
+IfcConstraint* IfcConstraintClassificationRelationship::ClassifiedConstraint() const { return (IfcConstraint*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(0))); }
 void IfcConstraintClassificationRelationship::setClassifiedConstraint(IfcConstraint* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > IfcConstraintClassificationRelationship::RelatedClassifications() { RETURN_AS_LIST(IfcUtil::IfcAbstractSelect,1) }
-void IfcConstraintClassificationRelationship::setRelatedClassifications(SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v->generalize()); }
+IfcEntityList::ptr IfcConstraintClassificationRelationship::RelatedClassifications() const { return *entity->getArgument(1); }
+void IfcConstraintClassificationRelationship::setRelatedClassifications(IfcEntityList::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
 bool IfcConstraintClassificationRelationship::is(Type::Enum v) const { return v == Type::IfcConstraintClassificationRelationship; }
 Type::Enum IfcConstraintClassificationRelationship::type() const { return Type::IfcConstraintClassificationRelationship; }
 Type::Enum IfcConstraintClassificationRelationship::Class() { return Type::IfcConstraintClassificationRelationship; }
-IfcConstraintClassificationRelationship::IfcConstraintClassificationRelationship(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcConstraintClassificationRelationship)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcConstraintClassificationRelationship::IfcConstraintClassificationRelationship(IfcConstraint* v1_ClassifiedConstraint, IfcEntities v2_RelatedClassifications) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_ClassifiedConstraint)); e->setArgument(1,(v2_RelatedClassifications)); entity = e; EntityBuffer::Add(this); }
+IfcConstraintClassificationRelationship::IfcConstraintClassificationRelationship(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcConstraintClassificationRelationship)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcConstraintClassificationRelationship::IfcConstraintClassificationRelationship(IfcConstraint* v1_ClassifiedConstraint, IfcEntityList::ptr v2_RelatedClassifications) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_ClassifiedConstraint)); e->setArgument(1,(v2_RelatedClassifications)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcConstraintRelationship
-bool IfcConstraintRelationship::hasName() { return !entity->getArgument(0)->isNull(); }
-IfcLabel IfcConstraintRelationship::Name() { return *entity->getArgument(0); }
-void IfcConstraintRelationship::setName(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-bool IfcConstraintRelationship::hasDescription() { return !entity->getArgument(1)->isNull(); }
-IfcText IfcConstraintRelationship::Description() { return *entity->getArgument(1); }
-void IfcConstraintRelationship::setDescription(IfcText v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-IfcConstraint* IfcConstraintRelationship::RelatingConstraint() { return (IfcConstraint*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(2))); }
+bool IfcConstraintRelationship::hasName() const { return !entity->getArgument(0)->isNull(); }
+std::string IfcConstraintRelationship::Name() const { return *entity->getArgument(0); }
+void IfcConstraintRelationship::setName(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+bool IfcConstraintRelationship::hasDescription() const { return !entity->getArgument(1)->isNull(); }
+std::string IfcConstraintRelationship::Description() const { return *entity->getArgument(1); }
+void IfcConstraintRelationship::setDescription(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+IfcConstraint* IfcConstraintRelationship::RelatingConstraint() const { return (IfcConstraint*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(2))); }
 void IfcConstraintRelationship::setRelatingConstraint(IfcConstraint* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-SHARED_PTR< IfcTemplatedEntityList< IfcConstraint > > IfcConstraintRelationship::RelatedConstraints() { RETURN_AS_LIST(IfcConstraint,3) }
-void IfcConstraintRelationship::setRelatedConstraints(SHARED_PTR< IfcTemplatedEntityList< IfcConstraint > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v->generalize()); }
+IfcTemplatedEntityList< IfcConstraint >::ptr IfcConstraintRelationship::RelatedConstraints() const { IfcEntityList::ptr es = *entity->getArgument(3); return es->as<IfcConstraint>(); }
+void IfcConstraintRelationship::setRelatedConstraints(IfcTemplatedEntityList< IfcConstraint >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v->generalize()); }
 bool IfcConstraintRelationship::is(Type::Enum v) const { return v == Type::IfcConstraintRelationship; }
 Type::Enum IfcConstraintRelationship::type() const { return Type::IfcConstraintRelationship; }
 Type::Enum IfcConstraintRelationship::Class() { return Type::IfcConstraintRelationship; }
-IfcConstraintRelationship::IfcConstraintRelationship(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcConstraintRelationship)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcConstraintRelationship::IfcConstraintRelationship(boost::optional< IfcLabel > v1_Name, boost::optional< IfcText > v2_Description, IfcConstraint* v3_RelatingConstraint, SHARED_PTR< IfcTemplatedEntityList< IfcConstraint > > v4_RelatedConstraints) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_RelatingConstraint)); e->setArgument(3,(v4_RelatedConstraints)->generalize()); entity = e; EntityBuffer::Add(this); }
+IfcConstraintRelationship::IfcConstraintRelationship(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcConstraintRelationship)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcConstraintRelationship::IfcConstraintRelationship(boost::optional< std::string > v1_Name, boost::optional< std::string > v2_Description, IfcConstraint* v3_RelatingConstraint, IfcTemplatedEntityList< IfcConstraint >::ptr v4_RelatedConstraints) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_RelatingConstraint)); e->setArgument(3,(v4_RelatedConstraints)->generalize()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcConstructionEquipmentResource
 bool IfcConstructionEquipmentResource::is(Type::Enum v) const { return v == Type::IfcConstructionEquipmentResource || IfcConstructionResource::is(v); }
 Type::Enum IfcConstructionEquipmentResource::type() const { return Type::IfcConstructionEquipmentResource; }
 Type::Enum IfcConstructionEquipmentResource::Class() { return Type::IfcConstructionEquipmentResource; }
-IfcConstructionEquipmentResource::IfcConstructionEquipmentResource(IfcAbstractEntityPtr e) : IfcConstructionResource((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcConstructionEquipmentResource)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcConstructionEquipmentResource::IfcConstructionEquipmentResource(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, boost::optional< IfcIdentifier > v6_ResourceIdentifier, boost::optional< IfcLabel > v7_ResourceGroup, boost::optional< IfcResourceConsumptionEnum::IfcResourceConsumptionEnum > v8_ResourceConsumption, IfcMeasureWithUnit* v9_BaseQuantity) : IfcConstructionResource((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } if (v6_ResourceIdentifier) { e->setArgument(5,(*v6_ResourceIdentifier)); } else { e->setArgument(5); } if (v7_ResourceGroup) { e->setArgument(6,(*v7_ResourceGroup)); } else { e->setArgument(6); } if (v8_ResourceConsumption) { e->setArgument(7,*v8_ResourceConsumption,IfcResourceConsumptionEnum::ToString(*v8_ResourceConsumption)); } else { e->setArgument(7); } e->setArgument(8,(v9_BaseQuantity)); entity = e; EntityBuffer::Add(this); }
+IfcConstructionEquipmentResource::IfcConstructionEquipmentResource(IfcAbstractEntity* e) : IfcConstructionResource((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcConstructionEquipmentResource)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcConstructionEquipmentResource::IfcConstructionEquipmentResource(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, boost::optional< std::string > v6_ResourceIdentifier, boost::optional< std::string > v7_ResourceGroup, boost::optional< IfcResourceConsumptionEnum::IfcResourceConsumptionEnum > v8_ResourceConsumption, IfcMeasureWithUnit* v9_BaseQuantity) : IfcConstructionResource((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } if (v6_ResourceIdentifier) { e->setArgument(5,(*v6_ResourceIdentifier)); } else { e->setArgument(5); } if (v7_ResourceGroup) { e->setArgument(6,(*v7_ResourceGroup)); } else { e->setArgument(6); } if (v8_ResourceConsumption) { e->setArgument(7,*v8_ResourceConsumption,IfcResourceConsumptionEnum::ToString(*v8_ResourceConsumption)); } else { e->setArgument(7); } e->setArgument(8,(v9_BaseQuantity)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcConstructionMaterialResource
-bool IfcConstructionMaterialResource::hasSuppliers() { return !entity->getArgument(9)->isNull(); }
-SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > IfcConstructionMaterialResource::Suppliers() { RETURN_AS_LIST(IfcUtil::IfcAbstractSelect,9) }
-void IfcConstructionMaterialResource::setSuppliers(SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v->generalize()); }
-bool IfcConstructionMaterialResource::hasUsageRatio() { return !entity->getArgument(10)->isNull(); }
-IfcRatioMeasure IfcConstructionMaterialResource::UsageRatio() { return *entity->getArgument(10); }
-void IfcConstructionMaterialResource::setUsageRatio(IfcRatioMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
+bool IfcConstructionMaterialResource::hasSuppliers() const { return !entity->getArgument(9)->isNull(); }
+IfcEntityList::ptr IfcConstructionMaterialResource::Suppliers() const { return *entity->getArgument(9); }
+void IfcConstructionMaterialResource::setSuppliers(IfcEntityList::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
+bool IfcConstructionMaterialResource::hasUsageRatio() const { return !entity->getArgument(10)->isNull(); }
+double IfcConstructionMaterialResource::UsageRatio() const { return *entity->getArgument(10); }
+void IfcConstructionMaterialResource::setUsageRatio(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
 bool IfcConstructionMaterialResource::is(Type::Enum v) const { return v == Type::IfcConstructionMaterialResource || IfcConstructionResource::is(v); }
 Type::Enum IfcConstructionMaterialResource::type() const { return Type::IfcConstructionMaterialResource; }
 Type::Enum IfcConstructionMaterialResource::Class() { return Type::IfcConstructionMaterialResource; }
-IfcConstructionMaterialResource::IfcConstructionMaterialResource(IfcAbstractEntityPtr e) : IfcConstructionResource((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcConstructionMaterialResource)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcConstructionMaterialResource::IfcConstructionMaterialResource(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, boost::optional< IfcIdentifier > v6_ResourceIdentifier, boost::optional< IfcLabel > v7_ResourceGroup, boost::optional< IfcResourceConsumptionEnum::IfcResourceConsumptionEnum > v8_ResourceConsumption, IfcMeasureWithUnit* v9_BaseQuantity, boost::optional< IfcEntities > v10_Suppliers, boost::optional< IfcRatioMeasure > v11_UsageRatio) : IfcConstructionResource((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } if (v6_ResourceIdentifier) { e->setArgument(5,(*v6_ResourceIdentifier)); } else { e->setArgument(5); } if (v7_ResourceGroup) { e->setArgument(6,(*v7_ResourceGroup)); } else { e->setArgument(6); } if (v8_ResourceConsumption) { e->setArgument(7,*v8_ResourceConsumption,IfcResourceConsumptionEnum::ToString(*v8_ResourceConsumption)); } else { e->setArgument(7); } e->setArgument(8,(v9_BaseQuantity)); if (v10_Suppliers) { e->setArgument(9,(*v10_Suppliers)); } else { e->setArgument(9); } if (v11_UsageRatio) { e->setArgument(10,(*v11_UsageRatio)); } else { e->setArgument(10); } entity = e; EntityBuffer::Add(this); }
+IfcConstructionMaterialResource::IfcConstructionMaterialResource(IfcAbstractEntity* e) : IfcConstructionResource((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcConstructionMaterialResource)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcConstructionMaterialResource::IfcConstructionMaterialResource(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, boost::optional< std::string > v6_ResourceIdentifier, boost::optional< std::string > v7_ResourceGroup, boost::optional< IfcResourceConsumptionEnum::IfcResourceConsumptionEnum > v8_ResourceConsumption, IfcMeasureWithUnit* v9_BaseQuantity, boost::optional< IfcEntityList::ptr > v10_Suppliers, boost::optional< double > v11_UsageRatio) : IfcConstructionResource((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } if (v6_ResourceIdentifier) { e->setArgument(5,(*v6_ResourceIdentifier)); } else { e->setArgument(5); } if (v7_ResourceGroup) { e->setArgument(6,(*v7_ResourceGroup)); } else { e->setArgument(6); } if (v8_ResourceConsumption) { e->setArgument(7,*v8_ResourceConsumption,IfcResourceConsumptionEnum::ToString(*v8_ResourceConsumption)); } else { e->setArgument(7); } e->setArgument(8,(v9_BaseQuantity)); if (v10_Suppliers) { e->setArgument(9,(*v10_Suppliers)); } else { e->setArgument(9); } if (v11_UsageRatio) { e->setArgument(10,(*v11_UsageRatio)); } else { e->setArgument(10); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcConstructionProductResource
 bool IfcConstructionProductResource::is(Type::Enum v) const { return v == Type::IfcConstructionProductResource || IfcConstructionResource::is(v); }
 Type::Enum IfcConstructionProductResource::type() const { return Type::IfcConstructionProductResource; }
 Type::Enum IfcConstructionProductResource::Class() { return Type::IfcConstructionProductResource; }
-IfcConstructionProductResource::IfcConstructionProductResource(IfcAbstractEntityPtr e) : IfcConstructionResource((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcConstructionProductResource)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcConstructionProductResource::IfcConstructionProductResource(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, boost::optional< IfcIdentifier > v6_ResourceIdentifier, boost::optional< IfcLabel > v7_ResourceGroup, boost::optional< IfcResourceConsumptionEnum::IfcResourceConsumptionEnum > v8_ResourceConsumption, IfcMeasureWithUnit* v9_BaseQuantity) : IfcConstructionResource((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } if (v6_ResourceIdentifier) { e->setArgument(5,(*v6_ResourceIdentifier)); } else { e->setArgument(5); } if (v7_ResourceGroup) { e->setArgument(6,(*v7_ResourceGroup)); } else { e->setArgument(6); } if (v8_ResourceConsumption) { e->setArgument(7,*v8_ResourceConsumption,IfcResourceConsumptionEnum::ToString(*v8_ResourceConsumption)); } else { e->setArgument(7); } e->setArgument(8,(v9_BaseQuantity)); entity = e; EntityBuffer::Add(this); }
+IfcConstructionProductResource::IfcConstructionProductResource(IfcAbstractEntity* e) : IfcConstructionResource((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcConstructionProductResource)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcConstructionProductResource::IfcConstructionProductResource(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, boost::optional< std::string > v6_ResourceIdentifier, boost::optional< std::string > v7_ResourceGroup, boost::optional< IfcResourceConsumptionEnum::IfcResourceConsumptionEnum > v8_ResourceConsumption, IfcMeasureWithUnit* v9_BaseQuantity) : IfcConstructionResource((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } if (v6_ResourceIdentifier) { e->setArgument(5,(*v6_ResourceIdentifier)); } else { e->setArgument(5); } if (v7_ResourceGroup) { e->setArgument(6,(*v7_ResourceGroup)); } else { e->setArgument(6); } if (v8_ResourceConsumption) { e->setArgument(7,*v8_ResourceConsumption,IfcResourceConsumptionEnum::ToString(*v8_ResourceConsumption)); } else { e->setArgument(7); } e->setArgument(8,(v9_BaseQuantity)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcConstructionResource
-bool IfcConstructionResource::hasResourceIdentifier() { return !entity->getArgument(5)->isNull(); }
-IfcIdentifier IfcConstructionResource::ResourceIdentifier() { return *entity->getArgument(5); }
-void IfcConstructionResource::setResourceIdentifier(IfcIdentifier v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-bool IfcConstructionResource::hasResourceGroup() { return !entity->getArgument(6)->isNull(); }
-IfcLabel IfcConstructionResource::ResourceGroup() { return *entity->getArgument(6); }
-void IfcConstructionResource::setResourceGroup(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
-bool IfcConstructionResource::hasResourceConsumption() { return !entity->getArgument(7)->isNull(); }
-IfcResourceConsumptionEnum::IfcResourceConsumptionEnum IfcConstructionResource::ResourceConsumption() { return IfcResourceConsumptionEnum::FromString(*entity->getArgument(7)); }
+bool IfcConstructionResource::hasResourceIdentifier() const { return !entity->getArgument(5)->isNull(); }
+std::string IfcConstructionResource::ResourceIdentifier() const { return *entity->getArgument(5); }
+void IfcConstructionResource::setResourceIdentifier(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+bool IfcConstructionResource::hasResourceGroup() const { return !entity->getArgument(6)->isNull(); }
+std::string IfcConstructionResource::ResourceGroup() const { return *entity->getArgument(6); }
+void IfcConstructionResource::setResourceGroup(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
+bool IfcConstructionResource::hasResourceConsumption() const { return !entity->getArgument(7)->isNull(); }
+IfcResourceConsumptionEnum::IfcResourceConsumptionEnum IfcConstructionResource::ResourceConsumption() const { return IfcResourceConsumptionEnum::FromString(*entity->getArgument(7)); }
 void IfcConstructionResource::setResourceConsumption(IfcResourceConsumptionEnum::IfcResourceConsumptionEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v,IfcResourceConsumptionEnum::ToString(v)); }
-bool IfcConstructionResource::hasBaseQuantity() { return !entity->getArgument(8)->isNull(); }
-IfcMeasureWithUnit* IfcConstructionResource::BaseQuantity() { return (IfcMeasureWithUnit*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(8))); }
+bool IfcConstructionResource::hasBaseQuantity() const { return !entity->getArgument(8)->isNull(); }
+IfcMeasureWithUnit* IfcConstructionResource::BaseQuantity() const { return (IfcMeasureWithUnit*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(8))); }
 void IfcConstructionResource::setBaseQuantity(IfcMeasureWithUnit* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
 bool IfcConstructionResource::is(Type::Enum v) const { return v == Type::IfcConstructionResource || IfcResource::is(v); }
 Type::Enum IfcConstructionResource::type() const { return Type::IfcConstructionResource; }
 Type::Enum IfcConstructionResource::Class() { return Type::IfcConstructionResource; }
-IfcConstructionResource::IfcConstructionResource(IfcAbstractEntityPtr e) : IfcResource((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcConstructionResource)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcConstructionResource::IfcConstructionResource(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, boost::optional< IfcIdentifier > v6_ResourceIdentifier, boost::optional< IfcLabel > v7_ResourceGroup, boost::optional< IfcResourceConsumptionEnum::IfcResourceConsumptionEnum > v8_ResourceConsumption, IfcMeasureWithUnit* v9_BaseQuantity) : IfcResource((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } if (v6_ResourceIdentifier) { e->setArgument(5,(*v6_ResourceIdentifier)); } else { e->setArgument(5); } if (v7_ResourceGroup) { e->setArgument(6,(*v7_ResourceGroup)); } else { e->setArgument(6); } if (v8_ResourceConsumption) { e->setArgument(7,*v8_ResourceConsumption,IfcResourceConsumptionEnum::ToString(*v8_ResourceConsumption)); } else { e->setArgument(7); } e->setArgument(8,(v9_BaseQuantity)); entity = e; EntityBuffer::Add(this); }
+IfcConstructionResource::IfcConstructionResource(IfcAbstractEntity* e) : IfcResource((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcConstructionResource)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcConstructionResource::IfcConstructionResource(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, boost::optional< std::string > v6_ResourceIdentifier, boost::optional< std::string > v7_ResourceGroup, boost::optional< IfcResourceConsumptionEnum::IfcResourceConsumptionEnum > v8_ResourceConsumption, IfcMeasureWithUnit* v9_BaseQuantity) : IfcResource((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } if (v6_ResourceIdentifier) { e->setArgument(5,(*v6_ResourceIdentifier)); } else { e->setArgument(5); } if (v7_ResourceGroup) { e->setArgument(6,(*v7_ResourceGroup)); } else { e->setArgument(6); } if (v8_ResourceConsumption) { e->setArgument(7,*v8_ResourceConsumption,IfcResourceConsumptionEnum::ToString(*v8_ResourceConsumption)); } else { e->setArgument(7); } e->setArgument(8,(v9_BaseQuantity)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcContextDependentUnit
-IfcLabel IfcContextDependentUnit::Name() { return *entity->getArgument(2); }
-void IfcContextDependentUnit::setName(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+std::string IfcContextDependentUnit::Name() const { return *entity->getArgument(2); }
+void IfcContextDependentUnit::setName(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
 bool IfcContextDependentUnit::is(Type::Enum v) const { return v == Type::IfcContextDependentUnit || IfcNamedUnit::is(v); }
 Type::Enum IfcContextDependentUnit::type() const { return Type::IfcContextDependentUnit; }
 Type::Enum IfcContextDependentUnit::Class() { return Type::IfcContextDependentUnit; }
-IfcContextDependentUnit::IfcContextDependentUnit(IfcAbstractEntityPtr e) : IfcNamedUnit((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcContextDependentUnit)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcContextDependentUnit::IfcContextDependentUnit(IfcDimensionalExponents* v1_Dimensions, IfcUnitEnum::IfcUnitEnum v2_UnitType, IfcLabel v3_Name) : IfcNamedUnit((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Dimensions)); e->setArgument(1,v2_UnitType,IfcUnitEnum::ToString(v2_UnitType)); e->setArgument(2,(v3_Name)); entity = e; EntityBuffer::Add(this); }
+IfcContextDependentUnit::IfcContextDependentUnit(IfcAbstractEntity* e) : IfcNamedUnit((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcContextDependentUnit)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcContextDependentUnit::IfcContextDependentUnit(IfcDimensionalExponents* v1_Dimensions, IfcUnitEnum::IfcUnitEnum v2_UnitType, std::string v3_Name) : IfcNamedUnit((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Dimensions)); e->setArgument(1,v2_UnitType,IfcUnitEnum::ToString(v2_UnitType)); e->setArgument(2,(v3_Name)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcControl
-IfcRelAssignsToControl::list IfcControl::Controls() { RETURN_INVERSE(IfcRelAssignsToControl) }
+IfcRelAssignsToControl::list::ptr IfcControl::Controls() const { return entity->getInverse(Type::IfcRelAssignsToControl, 6)->as<IfcRelAssignsToControl>(); }
 bool IfcControl::is(Type::Enum v) const { return v == Type::IfcControl || IfcObject::is(v); }
 Type::Enum IfcControl::type() const { return Type::IfcControl; }
 Type::Enum IfcControl::Class() { return Type::IfcControl; }
-IfcControl::IfcControl(IfcAbstractEntityPtr e) : IfcObject((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcControl)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcControl::IfcControl(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType) : IfcObject((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } entity = e; EntityBuffer::Add(this); }
+IfcControl::IfcControl(IfcAbstractEntity* e) : IfcObject((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcControl)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcControl::IfcControl(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType) : IfcObject((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcControllerType
-IfcControllerTypeEnum::IfcControllerTypeEnum IfcControllerType::PredefinedType() { return IfcControllerTypeEnum::FromString(*entity->getArgument(9)); }
+IfcControllerTypeEnum::IfcControllerTypeEnum IfcControllerType::PredefinedType() const { return IfcControllerTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcControllerType::setPredefinedType(IfcControllerTypeEnum::IfcControllerTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcControllerTypeEnum::ToString(v)); }
 bool IfcControllerType::is(Type::Enum v) const { return v == Type::IfcControllerType || IfcDistributionControlElementType::is(v); }
 Type::Enum IfcControllerType::type() const { return Type::IfcControllerType; }
 Type::Enum IfcControllerType::Class() { return Type::IfcControllerType; }
-IfcControllerType::IfcControllerType(IfcAbstractEntityPtr e) : IfcDistributionControlElementType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcControllerType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcControllerType::IfcControllerType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcControllerTypeEnum::IfcControllerTypeEnum v10_PredefinedType) : IfcDistributionControlElementType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcControllerTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcControllerType::IfcControllerType(IfcAbstractEntity* e) : IfcDistributionControlElementType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcControllerType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcControllerType::IfcControllerType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcControllerTypeEnum::IfcControllerTypeEnum v10_PredefinedType) : IfcDistributionControlElementType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcControllerTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcConversionBasedUnit
-IfcLabel IfcConversionBasedUnit::Name() { return *entity->getArgument(2); }
-void IfcConversionBasedUnit::setName(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-IfcMeasureWithUnit* IfcConversionBasedUnit::ConversionFactor() { return (IfcMeasureWithUnit*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(3))); }
+std::string IfcConversionBasedUnit::Name() const { return *entity->getArgument(2); }
+void IfcConversionBasedUnit::setName(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+IfcMeasureWithUnit* IfcConversionBasedUnit::ConversionFactor() const { return (IfcMeasureWithUnit*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(3))); }
 void IfcConversionBasedUnit::setConversionFactor(IfcMeasureWithUnit* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
 bool IfcConversionBasedUnit::is(Type::Enum v) const { return v == Type::IfcConversionBasedUnit || IfcNamedUnit::is(v); }
 Type::Enum IfcConversionBasedUnit::type() const { return Type::IfcConversionBasedUnit; }
 Type::Enum IfcConversionBasedUnit::Class() { return Type::IfcConversionBasedUnit; }
-IfcConversionBasedUnit::IfcConversionBasedUnit(IfcAbstractEntityPtr e) : IfcNamedUnit((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcConversionBasedUnit)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcConversionBasedUnit::IfcConversionBasedUnit(IfcDimensionalExponents* v1_Dimensions, IfcUnitEnum::IfcUnitEnum v2_UnitType, IfcLabel v3_Name, IfcMeasureWithUnit* v4_ConversionFactor) : IfcNamedUnit((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Dimensions)); e->setArgument(1,v2_UnitType,IfcUnitEnum::ToString(v2_UnitType)); e->setArgument(2,(v3_Name)); e->setArgument(3,(v4_ConversionFactor)); entity = e; EntityBuffer::Add(this); }
+IfcConversionBasedUnit::IfcConversionBasedUnit(IfcAbstractEntity* e) : IfcNamedUnit((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcConversionBasedUnit)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcConversionBasedUnit::IfcConversionBasedUnit(IfcDimensionalExponents* v1_Dimensions, IfcUnitEnum::IfcUnitEnum v2_UnitType, std::string v3_Name, IfcMeasureWithUnit* v4_ConversionFactor) : IfcNamedUnit((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Dimensions)); e->setArgument(1,v2_UnitType,IfcUnitEnum::ToString(v2_UnitType)); e->setArgument(2,(v3_Name)); e->setArgument(3,(v4_ConversionFactor)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcCooledBeamType
-IfcCooledBeamTypeEnum::IfcCooledBeamTypeEnum IfcCooledBeamType::PredefinedType() { return IfcCooledBeamTypeEnum::FromString(*entity->getArgument(9)); }
+IfcCooledBeamTypeEnum::IfcCooledBeamTypeEnum IfcCooledBeamType::PredefinedType() const { return IfcCooledBeamTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcCooledBeamType::setPredefinedType(IfcCooledBeamTypeEnum::IfcCooledBeamTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcCooledBeamTypeEnum::ToString(v)); }
 bool IfcCooledBeamType::is(Type::Enum v) const { return v == Type::IfcCooledBeamType || IfcEnergyConversionDeviceType::is(v); }
 Type::Enum IfcCooledBeamType::type() const { return Type::IfcCooledBeamType; }
 Type::Enum IfcCooledBeamType::Class() { return Type::IfcCooledBeamType; }
-IfcCooledBeamType::IfcCooledBeamType(IfcAbstractEntityPtr e) : IfcEnergyConversionDeviceType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcCooledBeamType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcCooledBeamType::IfcCooledBeamType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcCooledBeamTypeEnum::IfcCooledBeamTypeEnum v10_PredefinedType) : IfcEnergyConversionDeviceType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcCooledBeamTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcCooledBeamType::IfcCooledBeamType(IfcAbstractEntity* e) : IfcEnergyConversionDeviceType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcCooledBeamType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcCooledBeamType::IfcCooledBeamType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcCooledBeamTypeEnum::IfcCooledBeamTypeEnum v10_PredefinedType) : IfcEnergyConversionDeviceType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcCooledBeamTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcCoolingTowerType
-IfcCoolingTowerTypeEnum::IfcCoolingTowerTypeEnum IfcCoolingTowerType::PredefinedType() { return IfcCoolingTowerTypeEnum::FromString(*entity->getArgument(9)); }
+IfcCoolingTowerTypeEnum::IfcCoolingTowerTypeEnum IfcCoolingTowerType::PredefinedType() const { return IfcCoolingTowerTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcCoolingTowerType::setPredefinedType(IfcCoolingTowerTypeEnum::IfcCoolingTowerTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcCoolingTowerTypeEnum::ToString(v)); }
 bool IfcCoolingTowerType::is(Type::Enum v) const { return v == Type::IfcCoolingTowerType || IfcEnergyConversionDeviceType::is(v); }
 Type::Enum IfcCoolingTowerType::type() const { return Type::IfcCoolingTowerType; }
 Type::Enum IfcCoolingTowerType::Class() { return Type::IfcCoolingTowerType; }
-IfcCoolingTowerType::IfcCoolingTowerType(IfcAbstractEntityPtr e) : IfcEnergyConversionDeviceType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcCoolingTowerType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcCoolingTowerType::IfcCoolingTowerType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcCoolingTowerTypeEnum::IfcCoolingTowerTypeEnum v10_PredefinedType) : IfcEnergyConversionDeviceType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcCoolingTowerTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcCoolingTowerType::IfcCoolingTowerType(IfcAbstractEntity* e) : IfcEnergyConversionDeviceType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcCoolingTowerType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcCoolingTowerType::IfcCoolingTowerType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcCoolingTowerTypeEnum::IfcCoolingTowerTypeEnum v10_PredefinedType) : IfcEnergyConversionDeviceType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcCoolingTowerTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcCoordinatedUniversalTimeOffset
-IfcHourInDay IfcCoordinatedUniversalTimeOffset::HourOffset() { return *entity->getArgument(0); }
-void IfcCoordinatedUniversalTimeOffset::setHourOffset(IfcHourInDay v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-bool IfcCoordinatedUniversalTimeOffset::hasMinuteOffset() { return !entity->getArgument(1)->isNull(); }
-IfcMinuteInHour IfcCoordinatedUniversalTimeOffset::MinuteOffset() { return *entity->getArgument(1); }
-void IfcCoordinatedUniversalTimeOffset::setMinuteOffset(IfcMinuteInHour v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-IfcAheadOrBehind::IfcAheadOrBehind IfcCoordinatedUniversalTimeOffset::Sense() { return IfcAheadOrBehind::FromString(*entity->getArgument(2)); }
+int IfcCoordinatedUniversalTimeOffset::HourOffset() const { return *entity->getArgument(0); }
+void IfcCoordinatedUniversalTimeOffset::setHourOffset(int v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+bool IfcCoordinatedUniversalTimeOffset::hasMinuteOffset() const { return !entity->getArgument(1)->isNull(); }
+int IfcCoordinatedUniversalTimeOffset::MinuteOffset() const { return *entity->getArgument(1); }
+void IfcCoordinatedUniversalTimeOffset::setMinuteOffset(int v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+IfcAheadOrBehind::IfcAheadOrBehind IfcCoordinatedUniversalTimeOffset::Sense() const { return IfcAheadOrBehind::FromString(*entity->getArgument(2)); }
 void IfcCoordinatedUniversalTimeOffset::setSense(IfcAheadOrBehind::IfcAheadOrBehind v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v,IfcAheadOrBehind::ToString(v)); }
 bool IfcCoordinatedUniversalTimeOffset::is(Type::Enum v) const { return v == Type::IfcCoordinatedUniversalTimeOffset; }
 Type::Enum IfcCoordinatedUniversalTimeOffset::type() const { return Type::IfcCoordinatedUniversalTimeOffset; }
 Type::Enum IfcCoordinatedUniversalTimeOffset::Class() { return Type::IfcCoordinatedUniversalTimeOffset; }
-IfcCoordinatedUniversalTimeOffset::IfcCoordinatedUniversalTimeOffset(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcCoordinatedUniversalTimeOffset)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcCoordinatedUniversalTimeOffset::IfcCoordinatedUniversalTimeOffset(IfcHourInDay v1_HourOffset, boost::optional< IfcMinuteInHour > v2_MinuteOffset, IfcAheadOrBehind::IfcAheadOrBehind v3_Sense) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_HourOffset)); if (v2_MinuteOffset) { e->setArgument(1,(*v2_MinuteOffset)); } else { e->setArgument(1); } e->setArgument(2,v3_Sense,IfcAheadOrBehind::ToString(v3_Sense)); entity = e; EntityBuffer::Add(this); }
+IfcCoordinatedUniversalTimeOffset::IfcCoordinatedUniversalTimeOffset(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcCoordinatedUniversalTimeOffset)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcCoordinatedUniversalTimeOffset::IfcCoordinatedUniversalTimeOffset(int v1_HourOffset, boost::optional< int > v2_MinuteOffset, IfcAheadOrBehind::IfcAheadOrBehind v3_Sense) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_HourOffset)); if (v2_MinuteOffset) { e->setArgument(1,(*v2_MinuteOffset)); } else { e->setArgument(1); } e->setArgument(2,v3_Sense,IfcAheadOrBehind::ToString(v3_Sense)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcCostItem
 bool IfcCostItem::is(Type::Enum v) const { return v == Type::IfcCostItem || IfcControl::is(v); }
 Type::Enum IfcCostItem::type() const { return Type::IfcCostItem; }
 Type::Enum IfcCostItem::Class() { return Type::IfcCostItem; }
-IfcCostItem::IfcCostItem(IfcAbstractEntityPtr e) : IfcControl((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcCostItem)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcCostItem::IfcCostItem(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType) : IfcControl((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } entity = e; EntityBuffer::Add(this); }
+IfcCostItem::IfcCostItem(IfcAbstractEntity* e) : IfcControl((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcCostItem)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcCostItem::IfcCostItem(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType) : IfcControl((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcCostSchedule
-bool IfcCostSchedule::hasSubmittedBy() { return !entity->getArgument(5)->isNull(); }
-IfcActorSelect IfcCostSchedule::SubmittedBy() { return *entity->getArgument(5); }
-void IfcCostSchedule::setSubmittedBy(IfcActorSelect v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-bool IfcCostSchedule::hasPreparedBy() { return !entity->getArgument(6)->isNull(); }
-IfcActorSelect IfcCostSchedule::PreparedBy() { return *entity->getArgument(6); }
-void IfcCostSchedule::setPreparedBy(IfcActorSelect v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
-bool IfcCostSchedule::hasSubmittedOn() { return !entity->getArgument(7)->isNull(); }
-IfcDateTimeSelect IfcCostSchedule::SubmittedOn() { return *entity->getArgument(7); }
-void IfcCostSchedule::setSubmittedOn(IfcDateTimeSelect v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
-bool IfcCostSchedule::hasStatus() { return !entity->getArgument(8)->isNull(); }
-IfcLabel IfcCostSchedule::Status() { return *entity->getArgument(8); }
-void IfcCostSchedule::setStatus(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
-bool IfcCostSchedule::hasTargetUsers() { return !entity->getArgument(9)->isNull(); }
-SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > IfcCostSchedule::TargetUsers() { RETURN_AS_LIST(IfcUtil::IfcAbstractSelect,9) }
-void IfcCostSchedule::setTargetUsers(SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v->generalize()); }
-bool IfcCostSchedule::hasUpdateDate() { return !entity->getArgument(10)->isNull(); }
-IfcDateTimeSelect IfcCostSchedule::UpdateDate() { return *entity->getArgument(10); }
-void IfcCostSchedule::setUpdateDate(IfcDateTimeSelect v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
-IfcIdentifier IfcCostSchedule::ID() { return *entity->getArgument(11); }
-void IfcCostSchedule::setID(IfcIdentifier v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(11,v); }
-IfcCostScheduleTypeEnum::IfcCostScheduleTypeEnum IfcCostSchedule::PredefinedType() { return IfcCostScheduleTypeEnum::FromString(*entity->getArgument(12)); }
+bool IfcCostSchedule::hasSubmittedBy() const { return !entity->getArgument(5)->isNull(); }
+IfcActorSelect* IfcCostSchedule::SubmittedBy() const { return (IfcActorSelect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(5))); }
+void IfcCostSchedule::setSubmittedBy(IfcActorSelect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+bool IfcCostSchedule::hasPreparedBy() const { return !entity->getArgument(6)->isNull(); }
+IfcActorSelect* IfcCostSchedule::PreparedBy() const { return (IfcActorSelect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(6))); }
+void IfcCostSchedule::setPreparedBy(IfcActorSelect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
+bool IfcCostSchedule::hasSubmittedOn() const { return !entity->getArgument(7)->isNull(); }
+IfcDateTimeSelect* IfcCostSchedule::SubmittedOn() const { return (IfcDateTimeSelect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(7))); }
+void IfcCostSchedule::setSubmittedOn(IfcDateTimeSelect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
+bool IfcCostSchedule::hasStatus() const { return !entity->getArgument(8)->isNull(); }
+std::string IfcCostSchedule::Status() const { return *entity->getArgument(8); }
+void IfcCostSchedule::setStatus(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
+bool IfcCostSchedule::hasTargetUsers() const { return !entity->getArgument(9)->isNull(); }
+IfcEntityList::ptr IfcCostSchedule::TargetUsers() const { return *entity->getArgument(9); }
+void IfcCostSchedule::setTargetUsers(IfcEntityList::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
+bool IfcCostSchedule::hasUpdateDate() const { return !entity->getArgument(10)->isNull(); }
+IfcDateTimeSelect* IfcCostSchedule::UpdateDate() const { return (IfcDateTimeSelect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(10))); }
+void IfcCostSchedule::setUpdateDate(IfcDateTimeSelect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
+std::string IfcCostSchedule::ID() const { return *entity->getArgument(11); }
+void IfcCostSchedule::setID(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(11,v); }
+IfcCostScheduleTypeEnum::IfcCostScheduleTypeEnum IfcCostSchedule::PredefinedType() const { return IfcCostScheduleTypeEnum::FromString(*entity->getArgument(12)); }
 void IfcCostSchedule::setPredefinedType(IfcCostScheduleTypeEnum::IfcCostScheduleTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(12,v,IfcCostScheduleTypeEnum::ToString(v)); }
 bool IfcCostSchedule::is(Type::Enum v) const { return v == Type::IfcCostSchedule || IfcControl::is(v); }
 Type::Enum IfcCostSchedule::type() const { return Type::IfcCostSchedule; }
 Type::Enum IfcCostSchedule::Class() { return Type::IfcCostSchedule; }
-IfcCostSchedule::IfcCostSchedule(IfcAbstractEntityPtr e) : IfcControl((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcCostSchedule)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcCostSchedule::IfcCostSchedule(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, boost::optional< IfcActorSelect > v6_SubmittedBy, boost::optional< IfcActorSelect > v7_PreparedBy, boost::optional< IfcDateTimeSelect > v8_SubmittedOn, boost::optional< IfcLabel > v9_Status, boost::optional< IfcEntities > v10_TargetUsers, boost::optional< IfcDateTimeSelect > v11_UpdateDate, IfcIdentifier v12_ID, IfcCostScheduleTypeEnum::IfcCostScheduleTypeEnum v13_PredefinedType) : IfcControl((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } if (v6_SubmittedBy) { e->setArgument(5,(*v6_SubmittedBy)); } else { e->setArgument(5); } if (v7_PreparedBy) { e->setArgument(6,(*v7_PreparedBy)); } else { e->setArgument(6); } if (v8_SubmittedOn) { e->setArgument(7,(*v8_SubmittedOn)); } else { e->setArgument(7); } if (v9_Status) { e->setArgument(8,(*v9_Status)); } else { e->setArgument(8); } if (v10_TargetUsers) { e->setArgument(9,(*v10_TargetUsers)); } else { e->setArgument(9); } if (v11_UpdateDate) { e->setArgument(10,(*v11_UpdateDate)); } else { e->setArgument(10); } e->setArgument(11,(v12_ID)); e->setArgument(12,v13_PredefinedType,IfcCostScheduleTypeEnum::ToString(v13_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcCostSchedule::IfcCostSchedule(IfcAbstractEntity* e) : IfcControl((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcCostSchedule)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcCostSchedule::IfcCostSchedule(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcActorSelect* v6_SubmittedBy, IfcActorSelect* v7_PreparedBy, IfcDateTimeSelect* v8_SubmittedOn, boost::optional< std::string > v9_Status, boost::optional< IfcEntityList::ptr > v10_TargetUsers, IfcDateTimeSelect* v11_UpdateDate, std::string v12_ID, IfcCostScheduleTypeEnum::IfcCostScheduleTypeEnum v13_PredefinedType) : IfcControl((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_SubmittedBy)); e->setArgument(6,(v7_PreparedBy)); e->setArgument(7,(v8_SubmittedOn)); if (v9_Status) { e->setArgument(8,(*v9_Status)); } else { e->setArgument(8); } if (v10_TargetUsers) { e->setArgument(9,(*v10_TargetUsers)); } else { e->setArgument(9); } e->setArgument(10,(v11_UpdateDate)); e->setArgument(11,(v12_ID)); e->setArgument(12,v13_PredefinedType,IfcCostScheduleTypeEnum::ToString(v13_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcCostValue
-IfcLabel IfcCostValue::CostType() { return *entity->getArgument(6); }
-void IfcCostValue::setCostType(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
-bool IfcCostValue::hasCondition() { return !entity->getArgument(7)->isNull(); }
-IfcText IfcCostValue::Condition() { return *entity->getArgument(7); }
-void IfcCostValue::setCondition(IfcText v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
+std::string IfcCostValue::CostType() const { return *entity->getArgument(6); }
+void IfcCostValue::setCostType(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
+bool IfcCostValue::hasCondition() const { return !entity->getArgument(7)->isNull(); }
+std::string IfcCostValue::Condition() const { return *entity->getArgument(7); }
+void IfcCostValue::setCondition(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
 bool IfcCostValue::is(Type::Enum v) const { return v == Type::IfcCostValue || IfcAppliedValue::is(v); }
 Type::Enum IfcCostValue::type() const { return Type::IfcCostValue; }
 Type::Enum IfcCostValue::Class() { return Type::IfcCostValue; }
-IfcCostValue::IfcCostValue(IfcAbstractEntityPtr e) : IfcAppliedValue((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcCostValue)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcCostValue::IfcCostValue(boost::optional< IfcLabel > v1_Name, boost::optional< IfcText > v2_Description, boost::optional< IfcAppliedValueSelect > v3_AppliedValue, IfcMeasureWithUnit* v4_UnitBasis, boost::optional< IfcDateTimeSelect > v5_ApplicableDate, boost::optional< IfcDateTimeSelect > v6_FixedUntilDate, IfcLabel v7_CostType, boost::optional< IfcText > v8_Condition) : IfcAppliedValue((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } if (v3_AppliedValue) { e->setArgument(2,(*v3_AppliedValue)); } else { e->setArgument(2); } e->setArgument(3,(v4_UnitBasis)); if (v5_ApplicableDate) { e->setArgument(4,(*v5_ApplicableDate)); } else { e->setArgument(4); } if (v6_FixedUntilDate) { e->setArgument(5,(*v6_FixedUntilDate)); } else { e->setArgument(5); } e->setArgument(6,(v7_CostType)); if (v8_Condition) { e->setArgument(7,(*v8_Condition)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
+IfcCostValue::IfcCostValue(IfcAbstractEntity* e) : IfcAppliedValue((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcCostValue)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcCostValue::IfcCostValue(boost::optional< std::string > v1_Name, boost::optional< std::string > v2_Description, IfcAppliedValueSelect* v3_AppliedValue, IfcMeasureWithUnit* v4_UnitBasis, IfcDateTimeSelect* v5_ApplicableDate, IfcDateTimeSelect* v6_FixedUntilDate, std::string v7_CostType, boost::optional< std::string > v8_Condition) : IfcAppliedValue((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_AppliedValue)); e->setArgument(3,(v4_UnitBasis)); e->setArgument(4,(v5_ApplicableDate)); e->setArgument(5,(v6_FixedUntilDate)); e->setArgument(6,(v7_CostType)); if (v8_Condition) { e->setArgument(7,(*v8_Condition)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcCovering
-bool IfcCovering::hasPredefinedType() { return !entity->getArgument(8)->isNull(); }
-IfcCoveringTypeEnum::IfcCoveringTypeEnum IfcCovering::PredefinedType() { return IfcCoveringTypeEnum::FromString(*entity->getArgument(8)); }
+bool IfcCovering::hasPredefinedType() const { return !entity->getArgument(8)->isNull(); }
+IfcCoveringTypeEnum::IfcCoveringTypeEnum IfcCovering::PredefinedType() const { return IfcCoveringTypeEnum::FromString(*entity->getArgument(8)); }
 void IfcCovering::setPredefinedType(IfcCoveringTypeEnum::IfcCoveringTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcCoveringTypeEnum::ToString(v)); }
-IfcRelCoversSpaces::list IfcCovering::CoversSpaces() { RETURN_INVERSE(IfcRelCoversSpaces) }
-IfcRelCoversBldgElements::list IfcCovering::Covers() { RETURN_INVERSE(IfcRelCoversBldgElements) }
+IfcRelCoversSpaces::list::ptr IfcCovering::CoversSpaces() const { return entity->getInverse(Type::IfcRelCoversSpaces, 5)->as<IfcRelCoversSpaces>(); }
+IfcRelCoversBldgElements::list::ptr IfcCovering::Covers() const { return entity->getInverse(Type::IfcRelCoversBldgElements, 5)->as<IfcRelCoversBldgElements>(); }
 bool IfcCovering::is(Type::Enum v) const { return v == Type::IfcCovering || IfcBuildingElement::is(v); }
 Type::Enum IfcCovering::type() const { return Type::IfcCovering; }
 Type::Enum IfcCovering::Class() { return Type::IfcCovering; }
-IfcCovering::IfcCovering(IfcAbstractEntityPtr e) : IfcBuildingElement((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcCovering)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcCovering::IfcCovering(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcCoveringTypeEnum::IfcCoveringTypeEnum > v9_PredefinedType) : IfcBuildingElement((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcCoveringTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcCovering::IfcCovering(IfcAbstractEntity* e) : IfcBuildingElement((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcCovering)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcCovering::IfcCovering(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcCoveringTypeEnum::IfcCoveringTypeEnum > v9_PredefinedType) : IfcBuildingElement((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcCoveringTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcCoveringType
-IfcCoveringTypeEnum::IfcCoveringTypeEnum IfcCoveringType::PredefinedType() { return IfcCoveringTypeEnum::FromString(*entity->getArgument(9)); }
+IfcCoveringTypeEnum::IfcCoveringTypeEnum IfcCoveringType::PredefinedType() const { return IfcCoveringTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcCoveringType::setPredefinedType(IfcCoveringTypeEnum::IfcCoveringTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcCoveringTypeEnum::ToString(v)); }
 bool IfcCoveringType::is(Type::Enum v) const { return v == Type::IfcCoveringType || IfcBuildingElementType::is(v); }
 Type::Enum IfcCoveringType::type() const { return Type::IfcCoveringType; }
 Type::Enum IfcCoveringType::Class() { return Type::IfcCoveringType; }
-IfcCoveringType::IfcCoveringType(IfcAbstractEntityPtr e) : IfcBuildingElementType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcCoveringType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcCoveringType::IfcCoveringType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcCoveringTypeEnum::IfcCoveringTypeEnum v10_PredefinedType) : IfcBuildingElementType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcCoveringTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcCoveringType::IfcCoveringType(IfcAbstractEntity* e) : IfcBuildingElementType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcCoveringType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcCoveringType::IfcCoveringType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcCoveringTypeEnum::IfcCoveringTypeEnum v10_PredefinedType) : IfcBuildingElementType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcCoveringTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcCraneRailAShapeProfileDef
-IfcPositiveLengthMeasure IfcCraneRailAShapeProfileDef::OverallHeight() { return *entity->getArgument(3); }
-void IfcCraneRailAShapeProfileDef::setOverallHeight(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-IfcPositiveLengthMeasure IfcCraneRailAShapeProfileDef::BaseWidth2() { return *entity->getArgument(4); }
-void IfcCraneRailAShapeProfileDef::setBaseWidth2(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-bool IfcCraneRailAShapeProfileDef::hasRadius() { return !entity->getArgument(5)->isNull(); }
-IfcPositiveLengthMeasure IfcCraneRailAShapeProfileDef::Radius() { return *entity->getArgument(5); }
-void IfcCraneRailAShapeProfileDef::setRadius(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-IfcPositiveLengthMeasure IfcCraneRailAShapeProfileDef::HeadWidth() { return *entity->getArgument(6); }
-void IfcCraneRailAShapeProfileDef::setHeadWidth(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
-IfcPositiveLengthMeasure IfcCraneRailAShapeProfileDef::HeadDepth2() { return *entity->getArgument(7); }
-void IfcCraneRailAShapeProfileDef::setHeadDepth2(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
-IfcPositiveLengthMeasure IfcCraneRailAShapeProfileDef::HeadDepth3() { return *entity->getArgument(8); }
-void IfcCraneRailAShapeProfileDef::setHeadDepth3(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
-IfcPositiveLengthMeasure IfcCraneRailAShapeProfileDef::WebThickness() { return *entity->getArgument(9); }
-void IfcCraneRailAShapeProfileDef::setWebThickness(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
-IfcPositiveLengthMeasure IfcCraneRailAShapeProfileDef::BaseWidth4() { return *entity->getArgument(10); }
-void IfcCraneRailAShapeProfileDef::setBaseWidth4(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
-IfcPositiveLengthMeasure IfcCraneRailAShapeProfileDef::BaseDepth1() { return *entity->getArgument(11); }
-void IfcCraneRailAShapeProfileDef::setBaseDepth1(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(11,v); }
-IfcPositiveLengthMeasure IfcCraneRailAShapeProfileDef::BaseDepth2() { return *entity->getArgument(12); }
-void IfcCraneRailAShapeProfileDef::setBaseDepth2(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(12,v); }
-IfcPositiveLengthMeasure IfcCraneRailAShapeProfileDef::BaseDepth3() { return *entity->getArgument(13); }
-void IfcCraneRailAShapeProfileDef::setBaseDepth3(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(13,v); }
-bool IfcCraneRailAShapeProfileDef::hasCentreOfGravityInY() { return !entity->getArgument(14)->isNull(); }
-IfcPositiveLengthMeasure IfcCraneRailAShapeProfileDef::CentreOfGravityInY() { return *entity->getArgument(14); }
-void IfcCraneRailAShapeProfileDef::setCentreOfGravityInY(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(14,v); }
+double IfcCraneRailAShapeProfileDef::OverallHeight() const { return *entity->getArgument(3); }
+void IfcCraneRailAShapeProfileDef::setOverallHeight(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+double IfcCraneRailAShapeProfileDef::BaseWidth2() const { return *entity->getArgument(4); }
+void IfcCraneRailAShapeProfileDef::setBaseWidth2(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+bool IfcCraneRailAShapeProfileDef::hasRadius() const { return !entity->getArgument(5)->isNull(); }
+double IfcCraneRailAShapeProfileDef::Radius() const { return *entity->getArgument(5); }
+void IfcCraneRailAShapeProfileDef::setRadius(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+double IfcCraneRailAShapeProfileDef::HeadWidth() const { return *entity->getArgument(6); }
+void IfcCraneRailAShapeProfileDef::setHeadWidth(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
+double IfcCraneRailAShapeProfileDef::HeadDepth2() const { return *entity->getArgument(7); }
+void IfcCraneRailAShapeProfileDef::setHeadDepth2(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
+double IfcCraneRailAShapeProfileDef::HeadDepth3() const { return *entity->getArgument(8); }
+void IfcCraneRailAShapeProfileDef::setHeadDepth3(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
+double IfcCraneRailAShapeProfileDef::WebThickness() const { return *entity->getArgument(9); }
+void IfcCraneRailAShapeProfileDef::setWebThickness(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
+double IfcCraneRailAShapeProfileDef::BaseWidth4() const { return *entity->getArgument(10); }
+void IfcCraneRailAShapeProfileDef::setBaseWidth4(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
+double IfcCraneRailAShapeProfileDef::BaseDepth1() const { return *entity->getArgument(11); }
+void IfcCraneRailAShapeProfileDef::setBaseDepth1(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(11,v); }
+double IfcCraneRailAShapeProfileDef::BaseDepth2() const { return *entity->getArgument(12); }
+void IfcCraneRailAShapeProfileDef::setBaseDepth2(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(12,v); }
+double IfcCraneRailAShapeProfileDef::BaseDepth3() const { return *entity->getArgument(13); }
+void IfcCraneRailAShapeProfileDef::setBaseDepth3(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(13,v); }
+bool IfcCraneRailAShapeProfileDef::hasCentreOfGravityInY() const { return !entity->getArgument(14)->isNull(); }
+double IfcCraneRailAShapeProfileDef::CentreOfGravityInY() const { return *entity->getArgument(14); }
+void IfcCraneRailAShapeProfileDef::setCentreOfGravityInY(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(14,v); }
 bool IfcCraneRailAShapeProfileDef::is(Type::Enum v) const { return v == Type::IfcCraneRailAShapeProfileDef || IfcParameterizedProfileDef::is(v); }
 Type::Enum IfcCraneRailAShapeProfileDef::type() const { return Type::IfcCraneRailAShapeProfileDef; }
 Type::Enum IfcCraneRailAShapeProfileDef::Class() { return Type::IfcCraneRailAShapeProfileDef; }
-IfcCraneRailAShapeProfileDef::IfcCraneRailAShapeProfileDef(IfcAbstractEntityPtr e) : IfcParameterizedProfileDef((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcCraneRailAShapeProfileDef)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcCraneRailAShapeProfileDef::IfcCraneRailAShapeProfileDef(IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< IfcLabel > v2_ProfileName, IfcAxis2Placement2D* v3_Position, IfcPositiveLengthMeasure v4_OverallHeight, IfcPositiveLengthMeasure v5_BaseWidth2, boost::optional< IfcPositiveLengthMeasure > v6_Radius, IfcPositiveLengthMeasure v7_HeadWidth, IfcPositiveLengthMeasure v8_HeadDepth2, IfcPositiveLengthMeasure v9_HeadDepth3, IfcPositiveLengthMeasure v10_WebThickness, IfcPositiveLengthMeasure v11_BaseWidth4, IfcPositiveLengthMeasure v12_BaseDepth1, IfcPositiveLengthMeasure v13_BaseDepth2, IfcPositiveLengthMeasure v14_BaseDepth3, boost::optional< IfcPositiveLengthMeasure > v15_CentreOfGravityInY) : IfcParameterizedProfileDef((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,v1_ProfileType,IfcProfileTypeEnum::ToString(v1_ProfileType)); if (v2_ProfileName) { e->setArgument(1,(*v2_ProfileName)); } else { e->setArgument(1); } e->setArgument(2,(v3_Position)); e->setArgument(3,(v4_OverallHeight)); e->setArgument(4,(v5_BaseWidth2)); if (v6_Radius) { e->setArgument(5,(*v6_Radius)); } else { e->setArgument(5); } e->setArgument(6,(v7_HeadWidth)); e->setArgument(7,(v8_HeadDepth2)); e->setArgument(8,(v9_HeadDepth3)); e->setArgument(9,(v10_WebThickness)); e->setArgument(10,(v11_BaseWidth4)); e->setArgument(11,(v12_BaseDepth1)); e->setArgument(12,(v13_BaseDepth2)); e->setArgument(13,(v14_BaseDepth3)); if (v15_CentreOfGravityInY) { e->setArgument(14,(*v15_CentreOfGravityInY)); } else { e->setArgument(14); } entity = e; EntityBuffer::Add(this); }
+IfcCraneRailAShapeProfileDef::IfcCraneRailAShapeProfileDef(IfcAbstractEntity* e) : IfcParameterizedProfileDef((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcCraneRailAShapeProfileDef)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcCraneRailAShapeProfileDef::IfcCraneRailAShapeProfileDef(IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< std::string > v2_ProfileName, IfcAxis2Placement2D* v3_Position, double v4_OverallHeight, double v5_BaseWidth2, boost::optional< double > v6_Radius, double v7_HeadWidth, double v8_HeadDepth2, double v9_HeadDepth3, double v10_WebThickness, double v11_BaseWidth4, double v12_BaseDepth1, double v13_BaseDepth2, double v14_BaseDepth3, boost::optional< double > v15_CentreOfGravityInY) : IfcParameterizedProfileDef((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,v1_ProfileType,IfcProfileTypeEnum::ToString(v1_ProfileType)); if (v2_ProfileName) { e->setArgument(1,(*v2_ProfileName)); } else { e->setArgument(1); } e->setArgument(2,(v3_Position)); e->setArgument(3,(v4_OverallHeight)); e->setArgument(4,(v5_BaseWidth2)); if (v6_Radius) { e->setArgument(5,(*v6_Radius)); } else { e->setArgument(5); } e->setArgument(6,(v7_HeadWidth)); e->setArgument(7,(v8_HeadDepth2)); e->setArgument(8,(v9_HeadDepth3)); e->setArgument(9,(v10_WebThickness)); e->setArgument(10,(v11_BaseWidth4)); e->setArgument(11,(v12_BaseDepth1)); e->setArgument(12,(v13_BaseDepth2)); e->setArgument(13,(v14_BaseDepth3)); if (v15_CentreOfGravityInY) { e->setArgument(14,(*v15_CentreOfGravityInY)); } else { e->setArgument(14); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcCraneRailFShapeProfileDef
-IfcPositiveLengthMeasure IfcCraneRailFShapeProfileDef::OverallHeight() { return *entity->getArgument(3); }
-void IfcCraneRailFShapeProfileDef::setOverallHeight(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-IfcPositiveLengthMeasure IfcCraneRailFShapeProfileDef::HeadWidth() { return *entity->getArgument(4); }
-void IfcCraneRailFShapeProfileDef::setHeadWidth(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-bool IfcCraneRailFShapeProfileDef::hasRadius() { return !entity->getArgument(5)->isNull(); }
-IfcPositiveLengthMeasure IfcCraneRailFShapeProfileDef::Radius() { return *entity->getArgument(5); }
-void IfcCraneRailFShapeProfileDef::setRadius(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-IfcPositiveLengthMeasure IfcCraneRailFShapeProfileDef::HeadDepth2() { return *entity->getArgument(6); }
-void IfcCraneRailFShapeProfileDef::setHeadDepth2(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
-IfcPositiveLengthMeasure IfcCraneRailFShapeProfileDef::HeadDepth3() { return *entity->getArgument(7); }
-void IfcCraneRailFShapeProfileDef::setHeadDepth3(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
-IfcPositiveLengthMeasure IfcCraneRailFShapeProfileDef::WebThickness() { return *entity->getArgument(8); }
-void IfcCraneRailFShapeProfileDef::setWebThickness(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
-IfcPositiveLengthMeasure IfcCraneRailFShapeProfileDef::BaseDepth1() { return *entity->getArgument(9); }
-void IfcCraneRailFShapeProfileDef::setBaseDepth1(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
-IfcPositiveLengthMeasure IfcCraneRailFShapeProfileDef::BaseDepth2() { return *entity->getArgument(10); }
-void IfcCraneRailFShapeProfileDef::setBaseDepth2(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
-bool IfcCraneRailFShapeProfileDef::hasCentreOfGravityInY() { return !entity->getArgument(11)->isNull(); }
-IfcPositiveLengthMeasure IfcCraneRailFShapeProfileDef::CentreOfGravityInY() { return *entity->getArgument(11); }
-void IfcCraneRailFShapeProfileDef::setCentreOfGravityInY(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(11,v); }
+double IfcCraneRailFShapeProfileDef::OverallHeight() const { return *entity->getArgument(3); }
+void IfcCraneRailFShapeProfileDef::setOverallHeight(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+double IfcCraneRailFShapeProfileDef::HeadWidth() const { return *entity->getArgument(4); }
+void IfcCraneRailFShapeProfileDef::setHeadWidth(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+bool IfcCraneRailFShapeProfileDef::hasRadius() const { return !entity->getArgument(5)->isNull(); }
+double IfcCraneRailFShapeProfileDef::Radius() const { return *entity->getArgument(5); }
+void IfcCraneRailFShapeProfileDef::setRadius(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+double IfcCraneRailFShapeProfileDef::HeadDepth2() const { return *entity->getArgument(6); }
+void IfcCraneRailFShapeProfileDef::setHeadDepth2(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
+double IfcCraneRailFShapeProfileDef::HeadDepth3() const { return *entity->getArgument(7); }
+void IfcCraneRailFShapeProfileDef::setHeadDepth3(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
+double IfcCraneRailFShapeProfileDef::WebThickness() const { return *entity->getArgument(8); }
+void IfcCraneRailFShapeProfileDef::setWebThickness(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
+double IfcCraneRailFShapeProfileDef::BaseDepth1() const { return *entity->getArgument(9); }
+void IfcCraneRailFShapeProfileDef::setBaseDepth1(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
+double IfcCraneRailFShapeProfileDef::BaseDepth2() const { return *entity->getArgument(10); }
+void IfcCraneRailFShapeProfileDef::setBaseDepth2(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
+bool IfcCraneRailFShapeProfileDef::hasCentreOfGravityInY() const { return !entity->getArgument(11)->isNull(); }
+double IfcCraneRailFShapeProfileDef::CentreOfGravityInY() const { return *entity->getArgument(11); }
+void IfcCraneRailFShapeProfileDef::setCentreOfGravityInY(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(11,v); }
 bool IfcCraneRailFShapeProfileDef::is(Type::Enum v) const { return v == Type::IfcCraneRailFShapeProfileDef || IfcParameterizedProfileDef::is(v); }
 Type::Enum IfcCraneRailFShapeProfileDef::type() const { return Type::IfcCraneRailFShapeProfileDef; }
 Type::Enum IfcCraneRailFShapeProfileDef::Class() { return Type::IfcCraneRailFShapeProfileDef; }
-IfcCraneRailFShapeProfileDef::IfcCraneRailFShapeProfileDef(IfcAbstractEntityPtr e) : IfcParameterizedProfileDef((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcCraneRailFShapeProfileDef)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcCraneRailFShapeProfileDef::IfcCraneRailFShapeProfileDef(IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< IfcLabel > v2_ProfileName, IfcAxis2Placement2D* v3_Position, IfcPositiveLengthMeasure v4_OverallHeight, IfcPositiveLengthMeasure v5_HeadWidth, boost::optional< IfcPositiveLengthMeasure > v6_Radius, IfcPositiveLengthMeasure v7_HeadDepth2, IfcPositiveLengthMeasure v8_HeadDepth3, IfcPositiveLengthMeasure v9_WebThickness, IfcPositiveLengthMeasure v10_BaseDepth1, IfcPositiveLengthMeasure v11_BaseDepth2, boost::optional< IfcPositiveLengthMeasure > v12_CentreOfGravityInY) : IfcParameterizedProfileDef((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,v1_ProfileType,IfcProfileTypeEnum::ToString(v1_ProfileType)); if (v2_ProfileName) { e->setArgument(1,(*v2_ProfileName)); } else { e->setArgument(1); } e->setArgument(2,(v3_Position)); e->setArgument(3,(v4_OverallHeight)); e->setArgument(4,(v5_HeadWidth)); if (v6_Radius) { e->setArgument(5,(*v6_Radius)); } else { e->setArgument(5); } e->setArgument(6,(v7_HeadDepth2)); e->setArgument(7,(v8_HeadDepth3)); e->setArgument(8,(v9_WebThickness)); e->setArgument(9,(v10_BaseDepth1)); e->setArgument(10,(v11_BaseDepth2)); if (v12_CentreOfGravityInY) { e->setArgument(11,(*v12_CentreOfGravityInY)); } else { e->setArgument(11); } entity = e; EntityBuffer::Add(this); }
+IfcCraneRailFShapeProfileDef::IfcCraneRailFShapeProfileDef(IfcAbstractEntity* e) : IfcParameterizedProfileDef((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcCraneRailFShapeProfileDef)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcCraneRailFShapeProfileDef::IfcCraneRailFShapeProfileDef(IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< std::string > v2_ProfileName, IfcAxis2Placement2D* v3_Position, double v4_OverallHeight, double v5_HeadWidth, boost::optional< double > v6_Radius, double v7_HeadDepth2, double v8_HeadDepth3, double v9_WebThickness, double v10_BaseDepth1, double v11_BaseDepth2, boost::optional< double > v12_CentreOfGravityInY) : IfcParameterizedProfileDef((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,v1_ProfileType,IfcProfileTypeEnum::ToString(v1_ProfileType)); if (v2_ProfileName) { e->setArgument(1,(*v2_ProfileName)); } else { e->setArgument(1); } e->setArgument(2,(v3_Position)); e->setArgument(3,(v4_OverallHeight)); e->setArgument(4,(v5_HeadWidth)); if (v6_Radius) { e->setArgument(5,(*v6_Radius)); } else { e->setArgument(5); } e->setArgument(6,(v7_HeadDepth2)); e->setArgument(7,(v8_HeadDepth3)); e->setArgument(8,(v9_WebThickness)); e->setArgument(9,(v10_BaseDepth1)); e->setArgument(10,(v11_BaseDepth2)); if (v12_CentreOfGravityInY) { e->setArgument(11,(*v12_CentreOfGravityInY)); } else { e->setArgument(11); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcCrewResource
 bool IfcCrewResource::is(Type::Enum v) const { return v == Type::IfcCrewResource || IfcConstructionResource::is(v); }
 Type::Enum IfcCrewResource::type() const { return Type::IfcCrewResource; }
 Type::Enum IfcCrewResource::Class() { return Type::IfcCrewResource; }
-IfcCrewResource::IfcCrewResource(IfcAbstractEntityPtr e) : IfcConstructionResource((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcCrewResource)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcCrewResource::IfcCrewResource(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, boost::optional< IfcIdentifier > v6_ResourceIdentifier, boost::optional< IfcLabel > v7_ResourceGroup, boost::optional< IfcResourceConsumptionEnum::IfcResourceConsumptionEnum > v8_ResourceConsumption, IfcMeasureWithUnit* v9_BaseQuantity) : IfcConstructionResource((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } if (v6_ResourceIdentifier) { e->setArgument(5,(*v6_ResourceIdentifier)); } else { e->setArgument(5); } if (v7_ResourceGroup) { e->setArgument(6,(*v7_ResourceGroup)); } else { e->setArgument(6); } if (v8_ResourceConsumption) { e->setArgument(7,*v8_ResourceConsumption,IfcResourceConsumptionEnum::ToString(*v8_ResourceConsumption)); } else { e->setArgument(7); } e->setArgument(8,(v9_BaseQuantity)); entity = e; EntityBuffer::Add(this); }
+IfcCrewResource::IfcCrewResource(IfcAbstractEntity* e) : IfcConstructionResource((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcCrewResource)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcCrewResource::IfcCrewResource(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, boost::optional< std::string > v6_ResourceIdentifier, boost::optional< std::string > v7_ResourceGroup, boost::optional< IfcResourceConsumptionEnum::IfcResourceConsumptionEnum > v8_ResourceConsumption, IfcMeasureWithUnit* v9_BaseQuantity) : IfcConstructionResource((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } if (v6_ResourceIdentifier) { e->setArgument(5,(*v6_ResourceIdentifier)); } else { e->setArgument(5); } if (v7_ResourceGroup) { e->setArgument(6,(*v7_ResourceGroup)); } else { e->setArgument(6); } if (v8_ResourceConsumption) { e->setArgument(7,*v8_ResourceConsumption,IfcResourceConsumptionEnum::ToString(*v8_ResourceConsumption)); } else { e->setArgument(7); } e->setArgument(8,(v9_BaseQuantity)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcCsgPrimitive3D
-IfcAxis2Placement3D* IfcCsgPrimitive3D::Position() { return (IfcAxis2Placement3D*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(0))); }
+IfcAxis2Placement3D* IfcCsgPrimitive3D::Position() const { return (IfcAxis2Placement3D*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(0))); }
 void IfcCsgPrimitive3D::setPosition(IfcAxis2Placement3D* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
 bool IfcCsgPrimitive3D::is(Type::Enum v) const { return v == Type::IfcCsgPrimitive3D || IfcGeometricRepresentationItem::is(v); }
 Type::Enum IfcCsgPrimitive3D::type() const { return Type::IfcCsgPrimitive3D; }
 Type::Enum IfcCsgPrimitive3D::Class() { return Type::IfcCsgPrimitive3D; }
-IfcCsgPrimitive3D::IfcCsgPrimitive3D(IfcAbstractEntityPtr e) : IfcGeometricRepresentationItem((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcCsgPrimitive3D)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcCsgPrimitive3D::IfcCsgPrimitive3D(IfcAxis2Placement3D* v1_Position) : IfcGeometricRepresentationItem((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Position)); entity = e; EntityBuffer::Add(this); }
+IfcCsgPrimitive3D::IfcCsgPrimitive3D(IfcAbstractEntity* e) : IfcGeometricRepresentationItem((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcCsgPrimitive3D)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcCsgPrimitive3D::IfcCsgPrimitive3D(IfcAxis2Placement3D* v1_Position) : IfcGeometricRepresentationItem((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Position)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcCsgSolid
-IfcCsgSelect IfcCsgSolid::TreeRootExpression() { return *entity->getArgument(0); }
-void IfcCsgSolid::setTreeRootExpression(IfcCsgSelect v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+IfcCsgSelect* IfcCsgSolid::TreeRootExpression() const { return (IfcCsgSelect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(0))); }
+void IfcCsgSolid::setTreeRootExpression(IfcCsgSelect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
 bool IfcCsgSolid::is(Type::Enum v) const { return v == Type::IfcCsgSolid || IfcSolidModel::is(v); }
 Type::Enum IfcCsgSolid::type() const { return Type::IfcCsgSolid; }
 Type::Enum IfcCsgSolid::Class() { return Type::IfcCsgSolid; }
-IfcCsgSolid::IfcCsgSolid(IfcAbstractEntityPtr e) : IfcSolidModel((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcCsgSolid)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcCsgSolid::IfcCsgSolid(IfcCsgSelect v1_TreeRootExpression) : IfcSolidModel((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_TreeRootExpression)); entity = e; EntityBuffer::Add(this); }
+IfcCsgSolid::IfcCsgSolid(IfcAbstractEntity* e) : IfcSolidModel((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcCsgSolid)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcCsgSolid::IfcCsgSolid(IfcCsgSelect* v1_TreeRootExpression) : IfcSolidModel((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_TreeRootExpression)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcCurrencyRelationship
-IfcMonetaryUnit* IfcCurrencyRelationship::RelatingMonetaryUnit() { return (IfcMonetaryUnit*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(0))); }
+IfcMonetaryUnit* IfcCurrencyRelationship::RelatingMonetaryUnit() const { return (IfcMonetaryUnit*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(0))); }
 void IfcCurrencyRelationship::setRelatingMonetaryUnit(IfcMonetaryUnit* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-IfcMonetaryUnit* IfcCurrencyRelationship::RelatedMonetaryUnit() { return (IfcMonetaryUnit*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(1))); }
+IfcMonetaryUnit* IfcCurrencyRelationship::RelatedMonetaryUnit() const { return (IfcMonetaryUnit*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(1))); }
 void IfcCurrencyRelationship::setRelatedMonetaryUnit(IfcMonetaryUnit* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-IfcPositiveRatioMeasure IfcCurrencyRelationship::ExchangeRate() { return *entity->getArgument(2); }
-void IfcCurrencyRelationship::setExchangeRate(IfcPositiveRatioMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-IfcDateAndTime* IfcCurrencyRelationship::RateDateTime() { return (IfcDateAndTime*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(3))); }
+double IfcCurrencyRelationship::ExchangeRate() const { return *entity->getArgument(2); }
+void IfcCurrencyRelationship::setExchangeRate(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+IfcDateAndTime* IfcCurrencyRelationship::RateDateTime() const { return (IfcDateAndTime*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(3))); }
 void IfcCurrencyRelationship::setRateDateTime(IfcDateAndTime* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-bool IfcCurrencyRelationship::hasRateSource() { return !entity->getArgument(4)->isNull(); }
-IfcLibraryInformation* IfcCurrencyRelationship::RateSource() { return (IfcLibraryInformation*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(4))); }
+bool IfcCurrencyRelationship::hasRateSource() const { return !entity->getArgument(4)->isNull(); }
+IfcLibraryInformation* IfcCurrencyRelationship::RateSource() const { return (IfcLibraryInformation*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(4))); }
 void IfcCurrencyRelationship::setRateSource(IfcLibraryInformation* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
 bool IfcCurrencyRelationship::is(Type::Enum v) const { return v == Type::IfcCurrencyRelationship; }
 Type::Enum IfcCurrencyRelationship::type() const { return Type::IfcCurrencyRelationship; }
 Type::Enum IfcCurrencyRelationship::Class() { return Type::IfcCurrencyRelationship; }
-IfcCurrencyRelationship::IfcCurrencyRelationship(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcCurrencyRelationship)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcCurrencyRelationship::IfcCurrencyRelationship(IfcMonetaryUnit* v1_RelatingMonetaryUnit, IfcMonetaryUnit* v2_RelatedMonetaryUnit, IfcPositiveRatioMeasure v3_ExchangeRate, IfcDateAndTime* v4_RateDateTime, IfcLibraryInformation* v5_RateSource) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_RelatingMonetaryUnit)); e->setArgument(1,(v2_RelatedMonetaryUnit)); e->setArgument(2,(v3_ExchangeRate)); e->setArgument(3,(v4_RateDateTime)); e->setArgument(4,(v5_RateSource)); entity = e; EntityBuffer::Add(this); }
+IfcCurrencyRelationship::IfcCurrencyRelationship(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcCurrencyRelationship)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcCurrencyRelationship::IfcCurrencyRelationship(IfcMonetaryUnit* v1_RelatingMonetaryUnit, IfcMonetaryUnit* v2_RelatedMonetaryUnit, double v3_ExchangeRate, IfcDateAndTime* v4_RateDateTime, IfcLibraryInformation* v5_RateSource) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_RelatingMonetaryUnit)); e->setArgument(1,(v2_RelatedMonetaryUnit)); e->setArgument(2,(v3_ExchangeRate)); e->setArgument(3,(v4_RateDateTime)); e->setArgument(4,(v5_RateSource)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcCurtainWall
 bool IfcCurtainWall::is(Type::Enum v) const { return v == Type::IfcCurtainWall || IfcBuildingElement::is(v); }
 Type::Enum IfcCurtainWall::type() const { return Type::IfcCurtainWall; }
 Type::Enum IfcCurtainWall::Class() { return Type::IfcCurtainWall; }
-IfcCurtainWall::IfcCurtainWall(IfcAbstractEntityPtr e) : IfcBuildingElement((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcCurtainWall)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcCurtainWall::IfcCurtainWall(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag) : IfcBuildingElement((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
+IfcCurtainWall::IfcCurtainWall(IfcAbstractEntity* e) : IfcBuildingElement((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcCurtainWall)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcCurtainWall::IfcCurtainWall(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag) : IfcBuildingElement((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcCurtainWallType
-IfcCurtainWallTypeEnum::IfcCurtainWallTypeEnum IfcCurtainWallType::PredefinedType() { return IfcCurtainWallTypeEnum::FromString(*entity->getArgument(9)); }
+IfcCurtainWallTypeEnum::IfcCurtainWallTypeEnum IfcCurtainWallType::PredefinedType() const { return IfcCurtainWallTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcCurtainWallType::setPredefinedType(IfcCurtainWallTypeEnum::IfcCurtainWallTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcCurtainWallTypeEnum::ToString(v)); }
 bool IfcCurtainWallType::is(Type::Enum v) const { return v == Type::IfcCurtainWallType || IfcBuildingElementType::is(v); }
 Type::Enum IfcCurtainWallType::type() const { return Type::IfcCurtainWallType; }
 Type::Enum IfcCurtainWallType::Class() { return Type::IfcCurtainWallType; }
-IfcCurtainWallType::IfcCurtainWallType(IfcAbstractEntityPtr e) : IfcBuildingElementType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcCurtainWallType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcCurtainWallType::IfcCurtainWallType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcCurtainWallTypeEnum::IfcCurtainWallTypeEnum v10_PredefinedType) : IfcBuildingElementType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcCurtainWallTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcCurtainWallType::IfcCurtainWallType(IfcAbstractEntity* e) : IfcBuildingElementType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcCurtainWallType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcCurtainWallType::IfcCurtainWallType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcCurtainWallTypeEnum::IfcCurtainWallTypeEnum v10_PredefinedType) : IfcBuildingElementType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcCurtainWallTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcCurve
 bool IfcCurve::is(Type::Enum v) const { return v == Type::IfcCurve || IfcGeometricRepresentationItem::is(v); }
 Type::Enum IfcCurve::type() const { return Type::IfcCurve; }
 Type::Enum IfcCurve::Class() { return Type::IfcCurve; }
-IfcCurve::IfcCurve(IfcAbstractEntityPtr e) : IfcGeometricRepresentationItem((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcCurve)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcCurve::IfcCurve() : IfcGeometricRepresentationItem((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); entity = e; EntityBuffer::Add(this); }
+IfcCurve::IfcCurve(IfcAbstractEntity* e) : IfcGeometricRepresentationItem((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcCurve)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcCurve::IfcCurve() : IfcGeometricRepresentationItem((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcCurveBoundedPlane
-IfcPlane* IfcCurveBoundedPlane::BasisSurface() { return (IfcPlane*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(0))); }
+IfcPlane* IfcCurveBoundedPlane::BasisSurface() const { return (IfcPlane*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(0))); }
 void IfcCurveBoundedPlane::setBasisSurface(IfcPlane* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-IfcCurve* IfcCurveBoundedPlane::OuterBoundary() { return (IfcCurve*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(1))); }
+IfcCurve* IfcCurveBoundedPlane::OuterBoundary() const { return (IfcCurve*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(1))); }
 void IfcCurveBoundedPlane::setOuterBoundary(IfcCurve* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-SHARED_PTR< IfcTemplatedEntityList< IfcCurve > > IfcCurveBoundedPlane::InnerBoundaries() { RETURN_AS_LIST(IfcCurve,2) }
-void IfcCurveBoundedPlane::setInnerBoundaries(SHARED_PTR< IfcTemplatedEntityList< IfcCurve > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v->generalize()); }
+IfcTemplatedEntityList< IfcCurve >::ptr IfcCurveBoundedPlane::InnerBoundaries() const { IfcEntityList::ptr es = *entity->getArgument(2); return es->as<IfcCurve>(); }
+void IfcCurveBoundedPlane::setInnerBoundaries(IfcTemplatedEntityList< IfcCurve >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v->generalize()); }
 bool IfcCurveBoundedPlane::is(Type::Enum v) const { return v == Type::IfcCurveBoundedPlane || IfcBoundedSurface::is(v); }
 Type::Enum IfcCurveBoundedPlane::type() const { return Type::IfcCurveBoundedPlane; }
 Type::Enum IfcCurveBoundedPlane::Class() { return Type::IfcCurveBoundedPlane; }
-IfcCurveBoundedPlane::IfcCurveBoundedPlane(IfcAbstractEntityPtr e) : IfcBoundedSurface((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcCurveBoundedPlane)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcCurveBoundedPlane::IfcCurveBoundedPlane(IfcPlane* v1_BasisSurface, IfcCurve* v2_OuterBoundary, SHARED_PTR< IfcTemplatedEntityList< IfcCurve > > v3_InnerBoundaries) : IfcBoundedSurface((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_BasisSurface)); e->setArgument(1,(v2_OuterBoundary)); e->setArgument(2,(v3_InnerBoundaries)->generalize()); entity = e; EntityBuffer::Add(this); }
+IfcCurveBoundedPlane::IfcCurveBoundedPlane(IfcAbstractEntity* e) : IfcBoundedSurface((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcCurveBoundedPlane)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcCurveBoundedPlane::IfcCurveBoundedPlane(IfcPlane* v1_BasisSurface, IfcCurve* v2_OuterBoundary, IfcTemplatedEntityList< IfcCurve >::ptr v3_InnerBoundaries) : IfcBoundedSurface((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_BasisSurface)); e->setArgument(1,(v2_OuterBoundary)); e->setArgument(2,(v3_InnerBoundaries)->generalize()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcCurveStyle
-bool IfcCurveStyle::hasCurveFont() { return !entity->getArgument(1)->isNull(); }
-IfcCurveFontOrScaledCurveFontSelect IfcCurveStyle::CurveFont() { return *entity->getArgument(1); }
-void IfcCurveStyle::setCurveFont(IfcCurveFontOrScaledCurveFontSelect v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-bool IfcCurveStyle::hasCurveWidth() { return !entity->getArgument(2)->isNull(); }
-IfcSizeSelect IfcCurveStyle::CurveWidth() { return *entity->getArgument(2); }
-void IfcCurveStyle::setCurveWidth(IfcSizeSelect v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-bool IfcCurveStyle::hasCurveColour() { return !entity->getArgument(3)->isNull(); }
-IfcColour IfcCurveStyle::CurveColour() { return *entity->getArgument(3); }
-void IfcCurveStyle::setCurveColour(IfcColour v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+bool IfcCurveStyle::hasCurveFont() const { return !entity->getArgument(1)->isNull(); }
+IfcCurveFontOrScaledCurveFontSelect* IfcCurveStyle::CurveFont() const { return (IfcCurveFontOrScaledCurveFontSelect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(1))); }
+void IfcCurveStyle::setCurveFont(IfcCurveFontOrScaledCurveFontSelect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+bool IfcCurveStyle::hasCurveWidth() const { return !entity->getArgument(2)->isNull(); }
+IfcSizeSelect* IfcCurveStyle::CurveWidth() const { return (IfcSizeSelect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(2))); }
+void IfcCurveStyle::setCurveWidth(IfcSizeSelect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+bool IfcCurveStyle::hasCurveColour() const { return !entity->getArgument(3)->isNull(); }
+IfcColour* IfcCurveStyle::CurveColour() const { return (IfcColour*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(3))); }
+void IfcCurveStyle::setCurveColour(IfcColour* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
 bool IfcCurveStyle::is(Type::Enum v) const { return v == Type::IfcCurveStyle || IfcPresentationStyle::is(v); }
 Type::Enum IfcCurveStyle::type() const { return Type::IfcCurveStyle; }
 Type::Enum IfcCurveStyle::Class() { return Type::IfcCurveStyle; }
-IfcCurveStyle::IfcCurveStyle(IfcAbstractEntityPtr e) : IfcPresentationStyle((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcCurveStyle)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcCurveStyle::IfcCurveStyle(boost::optional< IfcLabel > v1_Name, boost::optional< IfcCurveFontOrScaledCurveFontSelect > v2_CurveFont, boost::optional< IfcSizeSelect > v3_CurveWidth, boost::optional< IfcColour > v4_CurveColour) : IfcPresentationStyle((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_CurveFont) { e->setArgument(1,(*v2_CurveFont)); } else { e->setArgument(1); } if (v3_CurveWidth) { e->setArgument(2,(*v3_CurveWidth)); } else { e->setArgument(2); } if (v4_CurveColour) { e->setArgument(3,(*v4_CurveColour)); } else { e->setArgument(3); } entity = e; EntityBuffer::Add(this); }
+IfcCurveStyle::IfcCurveStyle(IfcAbstractEntity* e) : IfcPresentationStyle((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcCurveStyle)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcCurveStyle::IfcCurveStyle(boost::optional< std::string > v1_Name, IfcCurveFontOrScaledCurveFontSelect* v2_CurveFont, IfcSizeSelect* v3_CurveWidth, IfcColour* v4_CurveColour) : IfcPresentationStyle((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } e->setArgument(1,(v2_CurveFont)); e->setArgument(2,(v3_CurveWidth)); e->setArgument(3,(v4_CurveColour)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcCurveStyleFont
-bool IfcCurveStyleFont::hasName() { return !entity->getArgument(0)->isNull(); }
-IfcLabel IfcCurveStyleFont::Name() { return *entity->getArgument(0); }
-void IfcCurveStyleFont::setName(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-SHARED_PTR< IfcTemplatedEntityList< IfcCurveStyleFontPattern > > IfcCurveStyleFont::PatternList() { RETURN_AS_LIST(IfcCurveStyleFontPattern,1) }
-void IfcCurveStyleFont::setPatternList(SHARED_PTR< IfcTemplatedEntityList< IfcCurveStyleFontPattern > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v->generalize()); }
+bool IfcCurveStyleFont::hasName() const { return !entity->getArgument(0)->isNull(); }
+std::string IfcCurveStyleFont::Name() const { return *entity->getArgument(0); }
+void IfcCurveStyleFont::setName(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+IfcTemplatedEntityList< IfcCurveStyleFontPattern >::ptr IfcCurveStyleFont::PatternList() const { IfcEntityList::ptr es = *entity->getArgument(1); return es->as<IfcCurveStyleFontPattern>(); }
+void IfcCurveStyleFont::setPatternList(IfcTemplatedEntityList< IfcCurveStyleFontPattern >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v->generalize()); }
 bool IfcCurveStyleFont::is(Type::Enum v) const { return v == Type::IfcCurveStyleFont; }
 Type::Enum IfcCurveStyleFont::type() const { return Type::IfcCurveStyleFont; }
 Type::Enum IfcCurveStyleFont::Class() { return Type::IfcCurveStyleFont; }
-IfcCurveStyleFont::IfcCurveStyleFont(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcCurveStyleFont)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcCurveStyleFont::IfcCurveStyleFont(boost::optional< IfcLabel > v1_Name, SHARED_PTR< IfcTemplatedEntityList< IfcCurveStyleFontPattern > > v2_PatternList) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } e->setArgument(1,(v2_PatternList)->generalize()); entity = e; EntityBuffer::Add(this); }
+IfcCurveStyleFont::IfcCurveStyleFont(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcCurveStyleFont)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcCurveStyleFont::IfcCurveStyleFont(boost::optional< std::string > v1_Name, IfcTemplatedEntityList< IfcCurveStyleFontPattern >::ptr v2_PatternList) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } e->setArgument(1,(v2_PatternList)->generalize()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcCurveStyleFontAndScaling
-bool IfcCurveStyleFontAndScaling::hasName() { return !entity->getArgument(0)->isNull(); }
-IfcLabel IfcCurveStyleFontAndScaling::Name() { return *entity->getArgument(0); }
-void IfcCurveStyleFontAndScaling::setName(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-IfcCurveStyleFontSelect IfcCurveStyleFontAndScaling::CurveFont() { return *entity->getArgument(1); }
-void IfcCurveStyleFontAndScaling::setCurveFont(IfcCurveStyleFontSelect v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-IfcPositiveRatioMeasure IfcCurveStyleFontAndScaling::CurveFontScaling() { return *entity->getArgument(2); }
-void IfcCurveStyleFontAndScaling::setCurveFontScaling(IfcPositiveRatioMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+bool IfcCurveStyleFontAndScaling::hasName() const { return !entity->getArgument(0)->isNull(); }
+std::string IfcCurveStyleFontAndScaling::Name() const { return *entity->getArgument(0); }
+void IfcCurveStyleFontAndScaling::setName(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+IfcCurveStyleFontSelect* IfcCurveStyleFontAndScaling::CurveFont() const { return (IfcCurveStyleFontSelect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(1))); }
+void IfcCurveStyleFontAndScaling::setCurveFont(IfcCurveStyleFontSelect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+double IfcCurveStyleFontAndScaling::CurveFontScaling() const { return *entity->getArgument(2); }
+void IfcCurveStyleFontAndScaling::setCurveFontScaling(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
 bool IfcCurveStyleFontAndScaling::is(Type::Enum v) const { return v == Type::IfcCurveStyleFontAndScaling; }
 Type::Enum IfcCurveStyleFontAndScaling::type() const { return Type::IfcCurveStyleFontAndScaling; }
 Type::Enum IfcCurveStyleFontAndScaling::Class() { return Type::IfcCurveStyleFontAndScaling; }
-IfcCurveStyleFontAndScaling::IfcCurveStyleFontAndScaling(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcCurveStyleFontAndScaling)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcCurveStyleFontAndScaling::IfcCurveStyleFontAndScaling(boost::optional< IfcLabel > v1_Name, IfcCurveStyleFontSelect v2_CurveFont, IfcPositiveRatioMeasure v3_CurveFontScaling) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } e->setArgument(1,(v2_CurveFont)); e->setArgument(2,(v3_CurveFontScaling)); entity = e; EntityBuffer::Add(this); }
+IfcCurveStyleFontAndScaling::IfcCurveStyleFontAndScaling(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcCurveStyleFontAndScaling)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcCurveStyleFontAndScaling::IfcCurveStyleFontAndScaling(boost::optional< std::string > v1_Name, IfcCurveStyleFontSelect* v2_CurveFont, double v3_CurveFontScaling) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } e->setArgument(1,(v2_CurveFont)); e->setArgument(2,(v3_CurveFontScaling)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcCurveStyleFontPattern
-IfcLengthMeasure IfcCurveStyleFontPattern::VisibleSegmentLength() { return *entity->getArgument(0); }
-void IfcCurveStyleFontPattern::setVisibleSegmentLength(IfcLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-IfcPositiveLengthMeasure IfcCurveStyleFontPattern::InvisibleSegmentLength() { return *entity->getArgument(1); }
-void IfcCurveStyleFontPattern::setInvisibleSegmentLength(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+double IfcCurveStyleFontPattern::VisibleSegmentLength() const { return *entity->getArgument(0); }
+void IfcCurveStyleFontPattern::setVisibleSegmentLength(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+double IfcCurveStyleFontPattern::InvisibleSegmentLength() const { return *entity->getArgument(1); }
+void IfcCurveStyleFontPattern::setInvisibleSegmentLength(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
 bool IfcCurveStyleFontPattern::is(Type::Enum v) const { return v == Type::IfcCurveStyleFontPattern; }
 Type::Enum IfcCurveStyleFontPattern::type() const { return Type::IfcCurveStyleFontPattern; }
 Type::Enum IfcCurveStyleFontPattern::Class() { return Type::IfcCurveStyleFontPattern; }
-IfcCurveStyleFontPattern::IfcCurveStyleFontPattern(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcCurveStyleFontPattern)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcCurveStyleFontPattern::IfcCurveStyleFontPattern(IfcLengthMeasure v1_VisibleSegmentLength, IfcPositiveLengthMeasure v2_InvisibleSegmentLength) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_VisibleSegmentLength)); e->setArgument(1,(v2_InvisibleSegmentLength)); entity = e; EntityBuffer::Add(this); }
+IfcCurveStyleFontPattern::IfcCurveStyleFontPattern(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcCurveStyleFontPattern)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcCurveStyleFontPattern::IfcCurveStyleFontPattern(double v1_VisibleSegmentLength, double v2_InvisibleSegmentLength) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_VisibleSegmentLength)); e->setArgument(1,(v2_InvisibleSegmentLength)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcDamperType
-IfcDamperTypeEnum::IfcDamperTypeEnum IfcDamperType::PredefinedType() { return IfcDamperTypeEnum::FromString(*entity->getArgument(9)); }
+IfcDamperTypeEnum::IfcDamperTypeEnum IfcDamperType::PredefinedType() const { return IfcDamperTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcDamperType::setPredefinedType(IfcDamperTypeEnum::IfcDamperTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcDamperTypeEnum::ToString(v)); }
 bool IfcDamperType::is(Type::Enum v) const { return v == Type::IfcDamperType || IfcFlowControllerType::is(v); }
 Type::Enum IfcDamperType::type() const { return Type::IfcDamperType; }
 Type::Enum IfcDamperType::Class() { return Type::IfcDamperType; }
-IfcDamperType::IfcDamperType(IfcAbstractEntityPtr e) : IfcFlowControllerType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcDamperType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcDamperType::IfcDamperType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcDamperTypeEnum::IfcDamperTypeEnum v10_PredefinedType) : IfcFlowControllerType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcDamperTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcDamperType::IfcDamperType(IfcAbstractEntity* e) : IfcFlowControllerType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcDamperType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcDamperType::IfcDamperType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcDamperTypeEnum::IfcDamperTypeEnum v10_PredefinedType) : IfcFlowControllerType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcDamperTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcDateAndTime
-IfcCalendarDate* IfcDateAndTime::DateComponent() { return (IfcCalendarDate*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(0))); }
+IfcCalendarDate* IfcDateAndTime::DateComponent() const { return (IfcCalendarDate*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(0))); }
 void IfcDateAndTime::setDateComponent(IfcCalendarDate* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-IfcLocalTime* IfcDateAndTime::TimeComponent() { return (IfcLocalTime*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(1))); }
+IfcLocalTime* IfcDateAndTime::TimeComponent() const { return (IfcLocalTime*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(1))); }
 void IfcDateAndTime::setTimeComponent(IfcLocalTime* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
 bool IfcDateAndTime::is(Type::Enum v) const { return v == Type::IfcDateAndTime; }
 Type::Enum IfcDateAndTime::type() const { return Type::IfcDateAndTime; }
 Type::Enum IfcDateAndTime::Class() { return Type::IfcDateAndTime; }
-IfcDateAndTime::IfcDateAndTime(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcDateAndTime)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcDateAndTime::IfcDateAndTime(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcDateAndTime)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
 IfcDateAndTime::IfcDateAndTime(IfcCalendarDate* v1_DateComponent, IfcLocalTime* v2_TimeComponent) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_DateComponent)); e->setArgument(1,(v2_TimeComponent)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcDefinedSymbol
-IfcDefinedSymbolSelect IfcDefinedSymbol::Definition() { return *entity->getArgument(0); }
-void IfcDefinedSymbol::setDefinition(IfcDefinedSymbolSelect v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-IfcCartesianTransformationOperator2D* IfcDefinedSymbol::Target() { return (IfcCartesianTransformationOperator2D*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(1))); }
+IfcDefinedSymbolSelect* IfcDefinedSymbol::Definition() const { return (IfcDefinedSymbolSelect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(0))); }
+void IfcDefinedSymbol::setDefinition(IfcDefinedSymbolSelect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+IfcCartesianTransformationOperator2D* IfcDefinedSymbol::Target() const { return (IfcCartesianTransformationOperator2D*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(1))); }
 void IfcDefinedSymbol::setTarget(IfcCartesianTransformationOperator2D* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
 bool IfcDefinedSymbol::is(Type::Enum v) const { return v == Type::IfcDefinedSymbol || IfcGeometricRepresentationItem::is(v); }
 Type::Enum IfcDefinedSymbol::type() const { return Type::IfcDefinedSymbol; }
 Type::Enum IfcDefinedSymbol::Class() { return Type::IfcDefinedSymbol; }
-IfcDefinedSymbol::IfcDefinedSymbol(IfcAbstractEntityPtr e) : IfcGeometricRepresentationItem((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcDefinedSymbol)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcDefinedSymbol::IfcDefinedSymbol(IfcDefinedSymbolSelect v1_Definition, IfcCartesianTransformationOperator2D* v2_Target) : IfcGeometricRepresentationItem((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Definition)); e->setArgument(1,(v2_Target)); entity = e; EntityBuffer::Add(this); }
+IfcDefinedSymbol::IfcDefinedSymbol(IfcAbstractEntity* e) : IfcGeometricRepresentationItem((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcDefinedSymbol)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcDefinedSymbol::IfcDefinedSymbol(IfcDefinedSymbolSelect* v1_Definition, IfcCartesianTransformationOperator2D* v2_Target) : IfcGeometricRepresentationItem((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Definition)); e->setArgument(1,(v2_Target)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcDerivedProfileDef
-IfcProfileDef* IfcDerivedProfileDef::ParentProfile() { return (IfcProfileDef*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(2))); }
+IfcProfileDef* IfcDerivedProfileDef::ParentProfile() const { return (IfcProfileDef*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(2))); }
 void IfcDerivedProfileDef::setParentProfile(IfcProfileDef* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-IfcCartesianTransformationOperator2D* IfcDerivedProfileDef::Operator() { return (IfcCartesianTransformationOperator2D*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(3))); }
+IfcCartesianTransformationOperator2D* IfcDerivedProfileDef::Operator() const { return (IfcCartesianTransformationOperator2D*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(3))); }
 void IfcDerivedProfileDef::setOperator(IfcCartesianTransformationOperator2D* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-bool IfcDerivedProfileDef::hasLabel() { return !entity->getArgument(4)->isNull(); }
-IfcLabel IfcDerivedProfileDef::Label() { return *entity->getArgument(4); }
-void IfcDerivedProfileDef::setLabel(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+bool IfcDerivedProfileDef::hasLabel() const { return !entity->getArgument(4)->isNull(); }
+std::string IfcDerivedProfileDef::Label() const { return *entity->getArgument(4); }
+void IfcDerivedProfileDef::setLabel(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
 bool IfcDerivedProfileDef::is(Type::Enum v) const { return v == Type::IfcDerivedProfileDef || IfcProfileDef::is(v); }
 Type::Enum IfcDerivedProfileDef::type() const { return Type::IfcDerivedProfileDef; }
 Type::Enum IfcDerivedProfileDef::Class() { return Type::IfcDerivedProfileDef; }
-IfcDerivedProfileDef::IfcDerivedProfileDef(IfcAbstractEntityPtr e) : IfcProfileDef((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcDerivedProfileDef)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcDerivedProfileDef::IfcDerivedProfileDef(IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< IfcLabel > v2_ProfileName, IfcProfileDef* v3_ParentProfile, IfcCartesianTransformationOperator2D* v4_Operator, boost::optional< IfcLabel > v5_Label) : IfcProfileDef((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,v1_ProfileType,IfcProfileTypeEnum::ToString(v1_ProfileType)); if (v2_ProfileName) { e->setArgument(1,(*v2_ProfileName)); } else { e->setArgument(1); } e->setArgument(2,(v3_ParentProfile)); e->setArgument(3,(v4_Operator)); if (v5_Label) { e->setArgument(4,(*v5_Label)); } else { e->setArgument(4); } entity = e; EntityBuffer::Add(this); }
+IfcDerivedProfileDef::IfcDerivedProfileDef(IfcAbstractEntity* e) : IfcProfileDef((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcDerivedProfileDef)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcDerivedProfileDef::IfcDerivedProfileDef(IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< std::string > v2_ProfileName, IfcProfileDef* v3_ParentProfile, IfcCartesianTransformationOperator2D* v4_Operator, boost::optional< std::string > v5_Label) : IfcProfileDef((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,v1_ProfileType,IfcProfileTypeEnum::ToString(v1_ProfileType)); if (v2_ProfileName) { e->setArgument(1,(*v2_ProfileName)); } else { e->setArgument(1); } e->setArgument(2,(v3_ParentProfile)); e->setArgument(3,(v4_Operator)); if (v5_Label) { e->setArgument(4,(*v5_Label)); } else { e->setArgument(4); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcDerivedUnit
-SHARED_PTR< IfcTemplatedEntityList< IfcDerivedUnitElement > > IfcDerivedUnit::Elements() { RETURN_AS_LIST(IfcDerivedUnitElement,0) }
-void IfcDerivedUnit::setElements(SHARED_PTR< IfcTemplatedEntityList< IfcDerivedUnitElement > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v->generalize()); }
-IfcDerivedUnitEnum::IfcDerivedUnitEnum IfcDerivedUnit::UnitType() { return IfcDerivedUnitEnum::FromString(*entity->getArgument(1)); }
+IfcTemplatedEntityList< IfcDerivedUnitElement >::ptr IfcDerivedUnit::Elements() const { IfcEntityList::ptr es = *entity->getArgument(0); return es->as<IfcDerivedUnitElement>(); }
+void IfcDerivedUnit::setElements(IfcTemplatedEntityList< IfcDerivedUnitElement >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v->generalize()); }
+IfcDerivedUnitEnum::IfcDerivedUnitEnum IfcDerivedUnit::UnitType() const { return IfcDerivedUnitEnum::FromString(*entity->getArgument(1)); }
 void IfcDerivedUnit::setUnitType(IfcDerivedUnitEnum::IfcDerivedUnitEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v,IfcDerivedUnitEnum::ToString(v)); }
-bool IfcDerivedUnit::hasUserDefinedType() { return !entity->getArgument(2)->isNull(); }
-IfcLabel IfcDerivedUnit::UserDefinedType() { return *entity->getArgument(2); }
-void IfcDerivedUnit::setUserDefinedType(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+bool IfcDerivedUnit::hasUserDefinedType() const { return !entity->getArgument(2)->isNull(); }
+std::string IfcDerivedUnit::UserDefinedType() const { return *entity->getArgument(2); }
+void IfcDerivedUnit::setUserDefinedType(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
 bool IfcDerivedUnit::is(Type::Enum v) const { return v == Type::IfcDerivedUnit; }
 Type::Enum IfcDerivedUnit::type() const { return Type::IfcDerivedUnit; }
 Type::Enum IfcDerivedUnit::Class() { return Type::IfcDerivedUnit; }
-IfcDerivedUnit::IfcDerivedUnit(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcDerivedUnit)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcDerivedUnit::IfcDerivedUnit(SHARED_PTR< IfcTemplatedEntityList< IfcDerivedUnitElement > > v1_Elements, IfcDerivedUnitEnum::IfcDerivedUnitEnum v2_UnitType, boost::optional< IfcLabel > v3_UserDefinedType) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Elements)->generalize()); e->setArgument(1,v2_UnitType,IfcDerivedUnitEnum::ToString(v2_UnitType)); if (v3_UserDefinedType) { e->setArgument(2,(*v3_UserDefinedType)); } else { e->setArgument(2); } entity = e; EntityBuffer::Add(this); }
+IfcDerivedUnit::IfcDerivedUnit(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcDerivedUnit)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcDerivedUnit::IfcDerivedUnit(IfcTemplatedEntityList< IfcDerivedUnitElement >::ptr v1_Elements, IfcDerivedUnitEnum::IfcDerivedUnitEnum v2_UnitType, boost::optional< std::string > v3_UserDefinedType) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Elements)->generalize()); e->setArgument(1,v2_UnitType,IfcDerivedUnitEnum::ToString(v2_UnitType)); if (v3_UserDefinedType) { e->setArgument(2,(*v3_UserDefinedType)); } else { e->setArgument(2); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcDerivedUnitElement
-IfcNamedUnit* IfcDerivedUnitElement::Unit() { return (IfcNamedUnit*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(0))); }
+IfcNamedUnit* IfcDerivedUnitElement::Unit() const { return (IfcNamedUnit*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(0))); }
 void IfcDerivedUnitElement::setUnit(IfcNamedUnit* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-int IfcDerivedUnitElement::Exponent() { return *entity->getArgument(1); }
+int IfcDerivedUnitElement::Exponent() const { return *entity->getArgument(1); }
 void IfcDerivedUnitElement::setExponent(int v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
 bool IfcDerivedUnitElement::is(Type::Enum v) const { return v == Type::IfcDerivedUnitElement; }
 Type::Enum IfcDerivedUnitElement::type() const { return Type::IfcDerivedUnitElement; }
 Type::Enum IfcDerivedUnitElement::Class() { return Type::IfcDerivedUnitElement; }
-IfcDerivedUnitElement::IfcDerivedUnitElement(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcDerivedUnitElement)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcDerivedUnitElement::IfcDerivedUnitElement(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcDerivedUnitElement)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
 IfcDerivedUnitElement::IfcDerivedUnitElement(IfcNamedUnit* v1_Unit, int v2_Exponent) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Unit)); e->setArgument(1,(v2_Exponent)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcDiameterDimension
 bool IfcDiameterDimension::is(Type::Enum v) const { return v == Type::IfcDiameterDimension || IfcDimensionCurveDirectedCallout::is(v); }
 Type::Enum IfcDiameterDimension::type() const { return Type::IfcDiameterDimension; }
 Type::Enum IfcDiameterDimension::Class() { return Type::IfcDiameterDimension; }
-IfcDiameterDimension::IfcDiameterDimension(IfcAbstractEntityPtr e) : IfcDimensionCurveDirectedCallout((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcDiameterDimension)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcDiameterDimension::IfcDiameterDimension(IfcEntities v1_Contents) : IfcDimensionCurveDirectedCallout((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Contents)); entity = e; EntityBuffer::Add(this); }
+IfcDiameterDimension::IfcDiameterDimension(IfcAbstractEntity* e) : IfcDimensionCurveDirectedCallout((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcDiameterDimension)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcDiameterDimension::IfcDiameterDimension(IfcEntityList::ptr v1_Contents) : IfcDimensionCurveDirectedCallout((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Contents)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcDimensionCalloutRelationship
 bool IfcDimensionCalloutRelationship::is(Type::Enum v) const { return v == Type::IfcDimensionCalloutRelationship || IfcDraughtingCalloutRelationship::is(v); }
 Type::Enum IfcDimensionCalloutRelationship::type() const { return Type::IfcDimensionCalloutRelationship; }
 Type::Enum IfcDimensionCalloutRelationship::Class() { return Type::IfcDimensionCalloutRelationship; }
-IfcDimensionCalloutRelationship::IfcDimensionCalloutRelationship(IfcAbstractEntityPtr e) : IfcDraughtingCalloutRelationship((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcDimensionCalloutRelationship)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcDimensionCalloutRelationship::IfcDimensionCalloutRelationship(boost::optional< IfcLabel > v1_Name, boost::optional< IfcText > v2_Description, IfcDraughtingCallout* v3_RelatingDraughtingCallout, IfcDraughtingCallout* v4_RelatedDraughtingCallout) : IfcDraughtingCalloutRelationship((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_RelatingDraughtingCallout)); e->setArgument(3,(v4_RelatedDraughtingCallout)); entity = e; EntityBuffer::Add(this); }
+IfcDimensionCalloutRelationship::IfcDimensionCalloutRelationship(IfcAbstractEntity* e) : IfcDraughtingCalloutRelationship((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcDimensionCalloutRelationship)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcDimensionCalloutRelationship::IfcDimensionCalloutRelationship(boost::optional< std::string > v1_Name, boost::optional< std::string > v2_Description, IfcDraughtingCallout* v3_RelatingDraughtingCallout, IfcDraughtingCallout* v4_RelatedDraughtingCallout) : IfcDraughtingCalloutRelationship((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_RelatingDraughtingCallout)); e->setArgument(3,(v4_RelatedDraughtingCallout)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcDimensionCurve
-IfcTerminatorSymbol::list IfcDimensionCurve::AnnotatedBySymbols() { RETURN_INVERSE(IfcTerminatorSymbol) }
+IfcTerminatorSymbol::list::ptr IfcDimensionCurve::AnnotatedBySymbols() const { return entity->getInverse(Type::IfcTerminatorSymbol, 3)->as<IfcTerminatorSymbol>(); }
 bool IfcDimensionCurve::is(Type::Enum v) const { return v == Type::IfcDimensionCurve || IfcAnnotationCurveOccurrence::is(v); }
 Type::Enum IfcDimensionCurve::type() const { return Type::IfcDimensionCurve; }
 Type::Enum IfcDimensionCurve::Class() { return Type::IfcDimensionCurve; }
-IfcDimensionCurve::IfcDimensionCurve(IfcAbstractEntityPtr e) : IfcAnnotationCurveOccurrence((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcDimensionCurve)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcDimensionCurve::IfcDimensionCurve(IfcRepresentationItem* v1_Item, SHARED_PTR< IfcTemplatedEntityList< IfcPresentationStyleAssignment > > v2_Styles, boost::optional< IfcLabel > v3_Name) : IfcAnnotationCurveOccurrence((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Item)); e->setArgument(1,(v2_Styles)->generalize()); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } entity = e; EntityBuffer::Add(this); }
+IfcDimensionCurve::IfcDimensionCurve(IfcAbstractEntity* e) : IfcAnnotationCurveOccurrence((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcDimensionCurve)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcDimensionCurve::IfcDimensionCurve(IfcRepresentationItem* v1_Item, IfcTemplatedEntityList< IfcPresentationStyleAssignment >::ptr v2_Styles, boost::optional< std::string > v3_Name) : IfcAnnotationCurveOccurrence((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Item)); e->setArgument(1,(v2_Styles)->generalize()); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcDimensionCurveDirectedCallout
 bool IfcDimensionCurveDirectedCallout::is(Type::Enum v) const { return v == Type::IfcDimensionCurveDirectedCallout || IfcDraughtingCallout::is(v); }
 Type::Enum IfcDimensionCurveDirectedCallout::type() const { return Type::IfcDimensionCurveDirectedCallout; }
 Type::Enum IfcDimensionCurveDirectedCallout::Class() { return Type::IfcDimensionCurveDirectedCallout; }
-IfcDimensionCurveDirectedCallout::IfcDimensionCurveDirectedCallout(IfcAbstractEntityPtr e) : IfcDraughtingCallout((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcDimensionCurveDirectedCallout)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcDimensionCurveDirectedCallout::IfcDimensionCurveDirectedCallout(IfcEntities v1_Contents) : IfcDraughtingCallout((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Contents)); entity = e; EntityBuffer::Add(this); }
+IfcDimensionCurveDirectedCallout::IfcDimensionCurveDirectedCallout(IfcAbstractEntity* e) : IfcDraughtingCallout((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcDimensionCurveDirectedCallout)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcDimensionCurveDirectedCallout::IfcDimensionCurveDirectedCallout(IfcEntityList::ptr v1_Contents) : IfcDraughtingCallout((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Contents)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcDimensionCurveTerminator
-IfcDimensionExtentUsage::IfcDimensionExtentUsage IfcDimensionCurveTerminator::Role() { return IfcDimensionExtentUsage::FromString(*entity->getArgument(4)); }
+IfcDimensionExtentUsage::IfcDimensionExtentUsage IfcDimensionCurveTerminator::Role() const { return IfcDimensionExtentUsage::FromString(*entity->getArgument(4)); }
 void IfcDimensionCurveTerminator::setRole(IfcDimensionExtentUsage::IfcDimensionExtentUsage v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v,IfcDimensionExtentUsage::ToString(v)); }
 bool IfcDimensionCurveTerminator::is(Type::Enum v) const { return v == Type::IfcDimensionCurveTerminator || IfcTerminatorSymbol::is(v); }
 Type::Enum IfcDimensionCurveTerminator::type() const { return Type::IfcDimensionCurveTerminator; }
 Type::Enum IfcDimensionCurveTerminator::Class() { return Type::IfcDimensionCurveTerminator; }
-IfcDimensionCurveTerminator::IfcDimensionCurveTerminator(IfcAbstractEntityPtr e) : IfcTerminatorSymbol((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcDimensionCurveTerminator)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcDimensionCurveTerminator::IfcDimensionCurveTerminator(IfcRepresentationItem* v1_Item, SHARED_PTR< IfcTemplatedEntityList< IfcPresentationStyleAssignment > > v2_Styles, boost::optional< IfcLabel > v3_Name, IfcAnnotationCurveOccurrence* v4_AnnotatedCurve, IfcDimensionExtentUsage::IfcDimensionExtentUsage v5_Role) : IfcTerminatorSymbol((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Item)); e->setArgument(1,(v2_Styles)->generalize()); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } e->setArgument(3,(v4_AnnotatedCurve)); e->setArgument(4,v5_Role,IfcDimensionExtentUsage::ToString(v5_Role)); entity = e; EntityBuffer::Add(this); }
+IfcDimensionCurveTerminator::IfcDimensionCurveTerminator(IfcAbstractEntity* e) : IfcTerminatorSymbol((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcDimensionCurveTerminator)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcDimensionCurveTerminator::IfcDimensionCurveTerminator(IfcRepresentationItem* v1_Item, IfcTemplatedEntityList< IfcPresentationStyleAssignment >::ptr v2_Styles, boost::optional< std::string > v3_Name, IfcAnnotationCurveOccurrence* v4_AnnotatedCurve, IfcDimensionExtentUsage::IfcDimensionExtentUsage v5_Role) : IfcTerminatorSymbol((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Item)); e->setArgument(1,(v2_Styles)->generalize()); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } e->setArgument(3,(v4_AnnotatedCurve)); e->setArgument(4,v5_Role,IfcDimensionExtentUsage::ToString(v5_Role)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcDimensionPair
 bool IfcDimensionPair::is(Type::Enum v) const { return v == Type::IfcDimensionPair || IfcDraughtingCalloutRelationship::is(v); }
 Type::Enum IfcDimensionPair::type() const { return Type::IfcDimensionPair; }
 Type::Enum IfcDimensionPair::Class() { return Type::IfcDimensionPair; }
-IfcDimensionPair::IfcDimensionPair(IfcAbstractEntityPtr e) : IfcDraughtingCalloutRelationship((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcDimensionPair)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcDimensionPair::IfcDimensionPair(boost::optional< IfcLabel > v1_Name, boost::optional< IfcText > v2_Description, IfcDraughtingCallout* v3_RelatingDraughtingCallout, IfcDraughtingCallout* v4_RelatedDraughtingCallout) : IfcDraughtingCalloutRelationship((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_RelatingDraughtingCallout)); e->setArgument(3,(v4_RelatedDraughtingCallout)); entity = e; EntityBuffer::Add(this); }
+IfcDimensionPair::IfcDimensionPair(IfcAbstractEntity* e) : IfcDraughtingCalloutRelationship((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcDimensionPair)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcDimensionPair::IfcDimensionPair(boost::optional< std::string > v1_Name, boost::optional< std::string > v2_Description, IfcDraughtingCallout* v3_RelatingDraughtingCallout, IfcDraughtingCallout* v4_RelatedDraughtingCallout) : IfcDraughtingCalloutRelationship((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_RelatingDraughtingCallout)); e->setArgument(3,(v4_RelatedDraughtingCallout)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcDimensionalExponents
-int IfcDimensionalExponents::LengthExponent() { return *entity->getArgument(0); }
+int IfcDimensionalExponents::LengthExponent() const { return *entity->getArgument(0); }
 void IfcDimensionalExponents::setLengthExponent(int v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-int IfcDimensionalExponents::MassExponent() { return *entity->getArgument(1); }
+int IfcDimensionalExponents::MassExponent() const { return *entity->getArgument(1); }
 void IfcDimensionalExponents::setMassExponent(int v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-int IfcDimensionalExponents::TimeExponent() { return *entity->getArgument(2); }
+int IfcDimensionalExponents::TimeExponent() const { return *entity->getArgument(2); }
 void IfcDimensionalExponents::setTimeExponent(int v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-int IfcDimensionalExponents::ElectricCurrentExponent() { return *entity->getArgument(3); }
+int IfcDimensionalExponents::ElectricCurrentExponent() const { return *entity->getArgument(3); }
 void IfcDimensionalExponents::setElectricCurrentExponent(int v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-int IfcDimensionalExponents::ThermodynamicTemperatureExponent() { return *entity->getArgument(4); }
+int IfcDimensionalExponents::ThermodynamicTemperatureExponent() const { return *entity->getArgument(4); }
 void IfcDimensionalExponents::setThermodynamicTemperatureExponent(int v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-int IfcDimensionalExponents::AmountOfSubstanceExponent() { return *entity->getArgument(5); }
+int IfcDimensionalExponents::AmountOfSubstanceExponent() const { return *entity->getArgument(5); }
 void IfcDimensionalExponents::setAmountOfSubstanceExponent(int v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-int IfcDimensionalExponents::LuminousIntensityExponent() { return *entity->getArgument(6); }
+int IfcDimensionalExponents::LuminousIntensityExponent() const { return *entity->getArgument(6); }
 void IfcDimensionalExponents::setLuminousIntensityExponent(int v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
 bool IfcDimensionalExponents::is(Type::Enum v) const { return v == Type::IfcDimensionalExponents; }
 Type::Enum IfcDimensionalExponents::type() const { return Type::IfcDimensionalExponents; }
 Type::Enum IfcDimensionalExponents::Class() { return Type::IfcDimensionalExponents; }
-IfcDimensionalExponents::IfcDimensionalExponents(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcDimensionalExponents)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcDimensionalExponents::IfcDimensionalExponents(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcDimensionalExponents)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
 IfcDimensionalExponents::IfcDimensionalExponents(int v1_LengthExponent, int v2_MassExponent, int v3_TimeExponent, int v4_ElectricCurrentExponent, int v5_ThermodynamicTemperatureExponent, int v6_AmountOfSubstanceExponent, int v7_LuminousIntensityExponent) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_LengthExponent)); e->setArgument(1,(v2_MassExponent)); e->setArgument(2,(v3_TimeExponent)); e->setArgument(3,(v4_ElectricCurrentExponent)); e->setArgument(4,(v5_ThermodynamicTemperatureExponent)); e->setArgument(5,(v6_AmountOfSubstanceExponent)); e->setArgument(6,(v7_LuminousIntensityExponent)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcDirection
-std::vector< double > /*[2:3]*/ IfcDirection::DirectionRatios() { return *entity->getArgument(0); }
+std::vector< double > /*[2:3]*/ IfcDirection::DirectionRatios() const { return *entity->getArgument(0); }
 void IfcDirection::setDirectionRatios(std::vector< double > /*[2:3]*/ v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
 bool IfcDirection::is(Type::Enum v) const { return v == Type::IfcDirection || IfcGeometricRepresentationItem::is(v); }
 Type::Enum IfcDirection::type() const { return Type::IfcDirection; }
 Type::Enum IfcDirection::Class() { return Type::IfcDirection; }
-IfcDirection::IfcDirection(IfcAbstractEntityPtr e) : IfcGeometricRepresentationItem((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcDirection)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcDirection::IfcDirection(std::vector< double > /*[2:3]*/ v1_DirectionRatios) : IfcGeometricRepresentationItem((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_DirectionRatios)); entity = e; EntityBuffer::Add(this); }
+IfcDirection::IfcDirection(IfcAbstractEntity* e) : IfcGeometricRepresentationItem((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcDirection)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcDirection::IfcDirection(std::vector< double > /*[2:3]*/ v1_DirectionRatios) : IfcGeometricRepresentationItem((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_DirectionRatios)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcDiscreteAccessory
 bool IfcDiscreteAccessory::is(Type::Enum v) const { return v == Type::IfcDiscreteAccessory || IfcElementComponent::is(v); }
 Type::Enum IfcDiscreteAccessory::type() const { return Type::IfcDiscreteAccessory; }
 Type::Enum IfcDiscreteAccessory::Class() { return Type::IfcDiscreteAccessory; }
-IfcDiscreteAccessory::IfcDiscreteAccessory(IfcAbstractEntityPtr e) : IfcElementComponent((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcDiscreteAccessory)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcDiscreteAccessory::IfcDiscreteAccessory(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag) : IfcElementComponent((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
+IfcDiscreteAccessory::IfcDiscreteAccessory(IfcAbstractEntity* e) : IfcElementComponent((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcDiscreteAccessory)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcDiscreteAccessory::IfcDiscreteAccessory(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag) : IfcElementComponent((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcDiscreteAccessoryType
 bool IfcDiscreteAccessoryType::is(Type::Enum v) const { return v == Type::IfcDiscreteAccessoryType || IfcElementComponentType::is(v); }
 Type::Enum IfcDiscreteAccessoryType::type() const { return Type::IfcDiscreteAccessoryType; }
 Type::Enum IfcDiscreteAccessoryType::Class() { return Type::IfcDiscreteAccessoryType; }
-IfcDiscreteAccessoryType::IfcDiscreteAccessoryType(IfcAbstractEntityPtr e) : IfcElementComponentType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcDiscreteAccessoryType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcDiscreteAccessoryType::IfcDiscreteAccessoryType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType) : IfcElementComponentType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcDiscreteAccessoryType::IfcDiscreteAccessoryType(IfcAbstractEntity* e) : IfcElementComponentType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcDiscreteAccessoryType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcDiscreteAccessoryType::IfcDiscreteAccessoryType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType) : IfcElementComponentType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcDistributionChamberElement
 bool IfcDistributionChamberElement::is(Type::Enum v) const { return v == Type::IfcDistributionChamberElement || IfcDistributionFlowElement::is(v); }
 Type::Enum IfcDistributionChamberElement::type() const { return Type::IfcDistributionChamberElement; }
 Type::Enum IfcDistributionChamberElement::Class() { return Type::IfcDistributionChamberElement; }
-IfcDistributionChamberElement::IfcDistributionChamberElement(IfcAbstractEntityPtr e) : IfcDistributionFlowElement((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcDistributionChamberElement)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcDistributionChamberElement::IfcDistributionChamberElement(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag) : IfcDistributionFlowElement((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
+IfcDistributionChamberElement::IfcDistributionChamberElement(IfcAbstractEntity* e) : IfcDistributionFlowElement((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcDistributionChamberElement)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcDistributionChamberElement::IfcDistributionChamberElement(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag) : IfcDistributionFlowElement((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcDistributionChamberElementType
-IfcDistributionChamberElementTypeEnum::IfcDistributionChamberElementTypeEnum IfcDistributionChamberElementType::PredefinedType() { return IfcDistributionChamberElementTypeEnum::FromString(*entity->getArgument(9)); }
+IfcDistributionChamberElementTypeEnum::IfcDistributionChamberElementTypeEnum IfcDistributionChamberElementType::PredefinedType() const { return IfcDistributionChamberElementTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcDistributionChamberElementType::setPredefinedType(IfcDistributionChamberElementTypeEnum::IfcDistributionChamberElementTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcDistributionChamberElementTypeEnum::ToString(v)); }
 bool IfcDistributionChamberElementType::is(Type::Enum v) const { return v == Type::IfcDistributionChamberElementType || IfcDistributionFlowElementType::is(v); }
 Type::Enum IfcDistributionChamberElementType::type() const { return Type::IfcDistributionChamberElementType; }
 Type::Enum IfcDistributionChamberElementType::Class() { return Type::IfcDistributionChamberElementType; }
-IfcDistributionChamberElementType::IfcDistributionChamberElementType(IfcAbstractEntityPtr e) : IfcDistributionFlowElementType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcDistributionChamberElementType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcDistributionChamberElementType::IfcDistributionChamberElementType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcDistributionChamberElementTypeEnum::IfcDistributionChamberElementTypeEnum v10_PredefinedType) : IfcDistributionFlowElementType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcDistributionChamberElementTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcDistributionChamberElementType::IfcDistributionChamberElementType(IfcAbstractEntity* e) : IfcDistributionFlowElementType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcDistributionChamberElementType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcDistributionChamberElementType::IfcDistributionChamberElementType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcDistributionChamberElementTypeEnum::IfcDistributionChamberElementTypeEnum v10_PredefinedType) : IfcDistributionFlowElementType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcDistributionChamberElementTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcDistributionControlElement
-bool IfcDistributionControlElement::hasControlElementId() { return !entity->getArgument(8)->isNull(); }
-IfcIdentifier IfcDistributionControlElement::ControlElementId() { return *entity->getArgument(8); }
-void IfcDistributionControlElement::setControlElementId(IfcIdentifier v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
-IfcRelFlowControlElements::list IfcDistributionControlElement::AssignedToFlowElement() { RETURN_INVERSE(IfcRelFlowControlElements) }
+bool IfcDistributionControlElement::hasControlElementId() const { return !entity->getArgument(8)->isNull(); }
+std::string IfcDistributionControlElement::ControlElementId() const { return *entity->getArgument(8); }
+void IfcDistributionControlElement::setControlElementId(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
+IfcRelFlowControlElements::list::ptr IfcDistributionControlElement::AssignedToFlowElement() const { return entity->getInverse(Type::IfcRelFlowControlElements, 4)->as<IfcRelFlowControlElements>(); }
 bool IfcDistributionControlElement::is(Type::Enum v) const { return v == Type::IfcDistributionControlElement || IfcDistributionElement::is(v); }
 Type::Enum IfcDistributionControlElement::type() const { return Type::IfcDistributionControlElement; }
 Type::Enum IfcDistributionControlElement::Class() { return Type::IfcDistributionControlElement; }
-IfcDistributionControlElement::IfcDistributionControlElement(IfcAbstractEntityPtr e) : IfcDistributionElement((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcDistributionControlElement)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcDistributionControlElement::IfcDistributionControlElement(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcIdentifier > v9_ControlElementId) : IfcDistributionElement((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ControlElementId) { e->setArgument(8,(*v9_ControlElementId)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcDistributionControlElement::IfcDistributionControlElement(IfcAbstractEntity* e) : IfcDistributionElement((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcDistributionControlElement)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcDistributionControlElement::IfcDistributionControlElement(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ControlElementId) : IfcDistributionElement((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ControlElementId) { e->setArgument(8,(*v9_ControlElementId)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcDistributionControlElementType
 bool IfcDistributionControlElementType::is(Type::Enum v) const { return v == Type::IfcDistributionControlElementType || IfcDistributionElementType::is(v); }
 Type::Enum IfcDistributionControlElementType::type() const { return Type::IfcDistributionControlElementType; }
 Type::Enum IfcDistributionControlElementType::Class() { return Type::IfcDistributionControlElementType; }
-IfcDistributionControlElementType::IfcDistributionControlElementType(IfcAbstractEntityPtr e) : IfcDistributionElementType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcDistributionControlElementType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcDistributionControlElementType::IfcDistributionControlElementType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType) : IfcDistributionElementType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcDistributionControlElementType::IfcDistributionControlElementType(IfcAbstractEntity* e) : IfcDistributionElementType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcDistributionControlElementType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcDistributionControlElementType::IfcDistributionControlElementType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType) : IfcDistributionElementType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcDistributionElement
 bool IfcDistributionElement::is(Type::Enum v) const { return v == Type::IfcDistributionElement || IfcElement::is(v); }
 Type::Enum IfcDistributionElement::type() const { return Type::IfcDistributionElement; }
 Type::Enum IfcDistributionElement::Class() { return Type::IfcDistributionElement; }
-IfcDistributionElement::IfcDistributionElement(IfcAbstractEntityPtr e) : IfcElement((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcDistributionElement)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcDistributionElement::IfcDistributionElement(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag) : IfcElement((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
+IfcDistributionElement::IfcDistributionElement(IfcAbstractEntity* e) : IfcElement((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcDistributionElement)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcDistributionElement::IfcDistributionElement(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag) : IfcElement((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcDistributionElementType
 bool IfcDistributionElementType::is(Type::Enum v) const { return v == Type::IfcDistributionElementType || IfcElementType::is(v); }
 Type::Enum IfcDistributionElementType::type() const { return Type::IfcDistributionElementType; }
 Type::Enum IfcDistributionElementType::Class() { return Type::IfcDistributionElementType; }
-IfcDistributionElementType::IfcDistributionElementType(IfcAbstractEntityPtr e) : IfcElementType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcDistributionElementType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcDistributionElementType::IfcDistributionElementType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType) : IfcElementType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcDistributionElementType::IfcDistributionElementType(IfcAbstractEntity* e) : IfcElementType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcDistributionElementType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcDistributionElementType::IfcDistributionElementType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType) : IfcElementType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcDistributionFlowElement
-IfcRelFlowControlElements::list IfcDistributionFlowElement::HasControlElements() { RETURN_INVERSE(IfcRelFlowControlElements) }
+IfcRelFlowControlElements::list::ptr IfcDistributionFlowElement::HasControlElements() const { return entity->getInverse(Type::IfcRelFlowControlElements, 5)->as<IfcRelFlowControlElements>(); }
 bool IfcDistributionFlowElement::is(Type::Enum v) const { return v == Type::IfcDistributionFlowElement || IfcDistributionElement::is(v); }
 Type::Enum IfcDistributionFlowElement::type() const { return Type::IfcDistributionFlowElement; }
 Type::Enum IfcDistributionFlowElement::Class() { return Type::IfcDistributionFlowElement; }
-IfcDistributionFlowElement::IfcDistributionFlowElement(IfcAbstractEntityPtr e) : IfcDistributionElement((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcDistributionFlowElement)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcDistributionFlowElement::IfcDistributionFlowElement(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag) : IfcDistributionElement((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
+IfcDistributionFlowElement::IfcDistributionFlowElement(IfcAbstractEntity* e) : IfcDistributionElement((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcDistributionFlowElement)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcDistributionFlowElement::IfcDistributionFlowElement(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag) : IfcDistributionElement((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcDistributionFlowElementType
 bool IfcDistributionFlowElementType::is(Type::Enum v) const { return v == Type::IfcDistributionFlowElementType || IfcDistributionElementType::is(v); }
 Type::Enum IfcDistributionFlowElementType::type() const { return Type::IfcDistributionFlowElementType; }
 Type::Enum IfcDistributionFlowElementType::Class() { return Type::IfcDistributionFlowElementType; }
-IfcDistributionFlowElementType::IfcDistributionFlowElementType(IfcAbstractEntityPtr e) : IfcDistributionElementType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcDistributionFlowElementType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcDistributionFlowElementType::IfcDistributionFlowElementType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType) : IfcDistributionElementType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcDistributionFlowElementType::IfcDistributionFlowElementType(IfcAbstractEntity* e) : IfcDistributionElementType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcDistributionFlowElementType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcDistributionFlowElementType::IfcDistributionFlowElementType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType) : IfcDistributionElementType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcDistributionPort
-bool IfcDistributionPort::hasFlowDirection() { return !entity->getArgument(7)->isNull(); }
-IfcFlowDirectionEnum::IfcFlowDirectionEnum IfcDistributionPort::FlowDirection() { return IfcFlowDirectionEnum::FromString(*entity->getArgument(7)); }
+bool IfcDistributionPort::hasFlowDirection() const { return !entity->getArgument(7)->isNull(); }
+IfcFlowDirectionEnum::IfcFlowDirectionEnum IfcDistributionPort::FlowDirection() const { return IfcFlowDirectionEnum::FromString(*entity->getArgument(7)); }
 void IfcDistributionPort::setFlowDirection(IfcFlowDirectionEnum::IfcFlowDirectionEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v,IfcFlowDirectionEnum::ToString(v)); }
 bool IfcDistributionPort::is(Type::Enum v) const { return v == Type::IfcDistributionPort || IfcPort::is(v); }
 Type::Enum IfcDistributionPort::type() const { return Type::IfcDistributionPort; }
 Type::Enum IfcDistributionPort::Class() { return Type::IfcDistributionPort; }
-IfcDistributionPort::IfcDistributionPort(IfcAbstractEntityPtr e) : IfcPort((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcDistributionPort)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcDistributionPort::IfcDistributionPort(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcFlowDirectionEnum::IfcFlowDirectionEnum > v8_FlowDirection) : IfcPort((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_FlowDirection) { e->setArgument(7,*v8_FlowDirection,IfcFlowDirectionEnum::ToString(*v8_FlowDirection)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
+IfcDistributionPort::IfcDistributionPort(IfcAbstractEntity* e) : IfcPort((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcDistributionPort)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcDistributionPort::IfcDistributionPort(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcFlowDirectionEnum::IfcFlowDirectionEnum > v8_FlowDirection) : IfcPort((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_FlowDirection) { e->setArgument(7,*v8_FlowDirection,IfcFlowDirectionEnum::ToString(*v8_FlowDirection)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcDocumentElectronicFormat
-bool IfcDocumentElectronicFormat::hasFileExtension() { return !entity->getArgument(0)->isNull(); }
-IfcLabel IfcDocumentElectronicFormat::FileExtension() { return *entity->getArgument(0); }
-void IfcDocumentElectronicFormat::setFileExtension(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-bool IfcDocumentElectronicFormat::hasMimeContentType() { return !entity->getArgument(1)->isNull(); }
-IfcLabel IfcDocumentElectronicFormat::MimeContentType() { return *entity->getArgument(1); }
-void IfcDocumentElectronicFormat::setMimeContentType(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-bool IfcDocumentElectronicFormat::hasMimeSubtype() { return !entity->getArgument(2)->isNull(); }
-IfcLabel IfcDocumentElectronicFormat::MimeSubtype() { return *entity->getArgument(2); }
-void IfcDocumentElectronicFormat::setMimeSubtype(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+bool IfcDocumentElectronicFormat::hasFileExtension() const { return !entity->getArgument(0)->isNull(); }
+std::string IfcDocumentElectronicFormat::FileExtension() const { return *entity->getArgument(0); }
+void IfcDocumentElectronicFormat::setFileExtension(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+bool IfcDocumentElectronicFormat::hasMimeContentType() const { return !entity->getArgument(1)->isNull(); }
+std::string IfcDocumentElectronicFormat::MimeContentType() const { return *entity->getArgument(1); }
+void IfcDocumentElectronicFormat::setMimeContentType(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+bool IfcDocumentElectronicFormat::hasMimeSubtype() const { return !entity->getArgument(2)->isNull(); }
+std::string IfcDocumentElectronicFormat::MimeSubtype() const { return *entity->getArgument(2); }
+void IfcDocumentElectronicFormat::setMimeSubtype(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
 bool IfcDocumentElectronicFormat::is(Type::Enum v) const { return v == Type::IfcDocumentElectronicFormat; }
 Type::Enum IfcDocumentElectronicFormat::type() const { return Type::IfcDocumentElectronicFormat; }
 Type::Enum IfcDocumentElectronicFormat::Class() { return Type::IfcDocumentElectronicFormat; }
-IfcDocumentElectronicFormat::IfcDocumentElectronicFormat(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcDocumentElectronicFormat)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcDocumentElectronicFormat::IfcDocumentElectronicFormat(boost::optional< IfcLabel > v1_FileExtension, boost::optional< IfcLabel > v2_MimeContentType, boost::optional< IfcLabel > v3_MimeSubtype) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_FileExtension) { e->setArgument(0,(*v1_FileExtension)); } else { e->setArgument(0); } if (v2_MimeContentType) { e->setArgument(1,(*v2_MimeContentType)); } else { e->setArgument(1); } if (v3_MimeSubtype) { e->setArgument(2,(*v3_MimeSubtype)); } else { e->setArgument(2); } entity = e; EntityBuffer::Add(this); }
+IfcDocumentElectronicFormat::IfcDocumentElectronicFormat(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcDocumentElectronicFormat)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcDocumentElectronicFormat::IfcDocumentElectronicFormat(boost::optional< std::string > v1_FileExtension, boost::optional< std::string > v2_MimeContentType, boost::optional< std::string > v3_MimeSubtype) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_FileExtension) { e->setArgument(0,(*v1_FileExtension)); } else { e->setArgument(0); } if (v2_MimeContentType) { e->setArgument(1,(*v2_MimeContentType)); } else { e->setArgument(1); } if (v3_MimeSubtype) { e->setArgument(2,(*v3_MimeSubtype)); } else { e->setArgument(2); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcDocumentInformation
-IfcIdentifier IfcDocumentInformation::DocumentId() { return *entity->getArgument(0); }
-void IfcDocumentInformation::setDocumentId(IfcIdentifier v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-IfcLabel IfcDocumentInformation::Name() { return *entity->getArgument(1); }
-void IfcDocumentInformation::setName(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-bool IfcDocumentInformation::hasDescription() { return !entity->getArgument(2)->isNull(); }
-IfcText IfcDocumentInformation::Description() { return *entity->getArgument(2); }
-void IfcDocumentInformation::setDescription(IfcText v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-bool IfcDocumentInformation::hasDocumentReferences() { return !entity->getArgument(3)->isNull(); }
-SHARED_PTR< IfcTemplatedEntityList< IfcDocumentReference > > IfcDocumentInformation::DocumentReferences() { RETURN_AS_LIST(IfcDocumentReference,3) }
-void IfcDocumentInformation::setDocumentReferences(SHARED_PTR< IfcTemplatedEntityList< IfcDocumentReference > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v->generalize()); }
-bool IfcDocumentInformation::hasPurpose() { return !entity->getArgument(4)->isNull(); }
-IfcText IfcDocumentInformation::Purpose() { return *entity->getArgument(4); }
-void IfcDocumentInformation::setPurpose(IfcText v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-bool IfcDocumentInformation::hasIntendedUse() { return !entity->getArgument(5)->isNull(); }
-IfcText IfcDocumentInformation::IntendedUse() { return *entity->getArgument(5); }
-void IfcDocumentInformation::setIntendedUse(IfcText v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-bool IfcDocumentInformation::hasScope() { return !entity->getArgument(6)->isNull(); }
-IfcText IfcDocumentInformation::Scope() { return *entity->getArgument(6); }
-void IfcDocumentInformation::setScope(IfcText v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
-bool IfcDocumentInformation::hasRevision() { return !entity->getArgument(7)->isNull(); }
-IfcLabel IfcDocumentInformation::Revision() { return *entity->getArgument(7); }
-void IfcDocumentInformation::setRevision(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
-bool IfcDocumentInformation::hasDocumentOwner() { return !entity->getArgument(8)->isNull(); }
-IfcActorSelect IfcDocumentInformation::DocumentOwner() { return *entity->getArgument(8); }
-void IfcDocumentInformation::setDocumentOwner(IfcActorSelect v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
-bool IfcDocumentInformation::hasEditors() { return !entity->getArgument(9)->isNull(); }
-SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > IfcDocumentInformation::Editors() { RETURN_AS_LIST(IfcUtil::IfcAbstractSelect,9) }
-void IfcDocumentInformation::setEditors(SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v->generalize()); }
-bool IfcDocumentInformation::hasCreationTime() { return !entity->getArgument(10)->isNull(); }
-IfcDateAndTime* IfcDocumentInformation::CreationTime() { return (IfcDateAndTime*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(10))); }
+std::string IfcDocumentInformation::DocumentId() const { return *entity->getArgument(0); }
+void IfcDocumentInformation::setDocumentId(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+std::string IfcDocumentInformation::Name() const { return *entity->getArgument(1); }
+void IfcDocumentInformation::setName(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+bool IfcDocumentInformation::hasDescription() const { return !entity->getArgument(2)->isNull(); }
+std::string IfcDocumentInformation::Description() const { return *entity->getArgument(2); }
+void IfcDocumentInformation::setDescription(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+bool IfcDocumentInformation::hasDocumentReferences() const { return !entity->getArgument(3)->isNull(); }
+IfcTemplatedEntityList< IfcDocumentReference >::ptr IfcDocumentInformation::DocumentReferences() const { IfcEntityList::ptr es = *entity->getArgument(3); return es->as<IfcDocumentReference>(); }
+void IfcDocumentInformation::setDocumentReferences(IfcTemplatedEntityList< IfcDocumentReference >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v->generalize()); }
+bool IfcDocumentInformation::hasPurpose() const { return !entity->getArgument(4)->isNull(); }
+std::string IfcDocumentInformation::Purpose() const { return *entity->getArgument(4); }
+void IfcDocumentInformation::setPurpose(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+bool IfcDocumentInformation::hasIntendedUse() const { return !entity->getArgument(5)->isNull(); }
+std::string IfcDocumentInformation::IntendedUse() const { return *entity->getArgument(5); }
+void IfcDocumentInformation::setIntendedUse(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+bool IfcDocumentInformation::hasScope() const { return !entity->getArgument(6)->isNull(); }
+std::string IfcDocumentInformation::Scope() const { return *entity->getArgument(6); }
+void IfcDocumentInformation::setScope(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
+bool IfcDocumentInformation::hasRevision() const { return !entity->getArgument(7)->isNull(); }
+std::string IfcDocumentInformation::Revision() const { return *entity->getArgument(7); }
+void IfcDocumentInformation::setRevision(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
+bool IfcDocumentInformation::hasDocumentOwner() const { return !entity->getArgument(8)->isNull(); }
+IfcActorSelect* IfcDocumentInformation::DocumentOwner() const { return (IfcActorSelect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(8))); }
+void IfcDocumentInformation::setDocumentOwner(IfcActorSelect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
+bool IfcDocumentInformation::hasEditors() const { return !entity->getArgument(9)->isNull(); }
+IfcEntityList::ptr IfcDocumentInformation::Editors() const { return *entity->getArgument(9); }
+void IfcDocumentInformation::setEditors(IfcEntityList::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
+bool IfcDocumentInformation::hasCreationTime() const { return !entity->getArgument(10)->isNull(); }
+IfcDateAndTime* IfcDocumentInformation::CreationTime() const { return (IfcDateAndTime*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(10))); }
 void IfcDocumentInformation::setCreationTime(IfcDateAndTime* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
-bool IfcDocumentInformation::hasLastRevisionTime() { return !entity->getArgument(11)->isNull(); }
-IfcDateAndTime* IfcDocumentInformation::LastRevisionTime() { return (IfcDateAndTime*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(11))); }
+bool IfcDocumentInformation::hasLastRevisionTime() const { return !entity->getArgument(11)->isNull(); }
+IfcDateAndTime* IfcDocumentInformation::LastRevisionTime() const { return (IfcDateAndTime*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(11))); }
 void IfcDocumentInformation::setLastRevisionTime(IfcDateAndTime* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(11,v); }
-bool IfcDocumentInformation::hasElectronicFormat() { return !entity->getArgument(12)->isNull(); }
-IfcDocumentElectronicFormat* IfcDocumentInformation::ElectronicFormat() { return (IfcDocumentElectronicFormat*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(12))); }
+bool IfcDocumentInformation::hasElectronicFormat() const { return !entity->getArgument(12)->isNull(); }
+IfcDocumentElectronicFormat* IfcDocumentInformation::ElectronicFormat() const { return (IfcDocumentElectronicFormat*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(12))); }
 void IfcDocumentInformation::setElectronicFormat(IfcDocumentElectronicFormat* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(12,v); }
-bool IfcDocumentInformation::hasValidFrom() { return !entity->getArgument(13)->isNull(); }
-IfcCalendarDate* IfcDocumentInformation::ValidFrom() { return (IfcCalendarDate*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(13))); }
+bool IfcDocumentInformation::hasValidFrom() const { return !entity->getArgument(13)->isNull(); }
+IfcCalendarDate* IfcDocumentInformation::ValidFrom() const { return (IfcCalendarDate*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(13))); }
 void IfcDocumentInformation::setValidFrom(IfcCalendarDate* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(13,v); }
-bool IfcDocumentInformation::hasValidUntil() { return !entity->getArgument(14)->isNull(); }
-IfcCalendarDate* IfcDocumentInformation::ValidUntil() { return (IfcCalendarDate*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(14))); }
+bool IfcDocumentInformation::hasValidUntil() const { return !entity->getArgument(14)->isNull(); }
+IfcCalendarDate* IfcDocumentInformation::ValidUntil() const { return (IfcCalendarDate*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(14))); }
 void IfcDocumentInformation::setValidUntil(IfcCalendarDate* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(14,v); }
-bool IfcDocumentInformation::hasConfidentiality() { return !entity->getArgument(15)->isNull(); }
-IfcDocumentConfidentialityEnum::IfcDocumentConfidentialityEnum IfcDocumentInformation::Confidentiality() { return IfcDocumentConfidentialityEnum::FromString(*entity->getArgument(15)); }
+bool IfcDocumentInformation::hasConfidentiality() const { return !entity->getArgument(15)->isNull(); }
+IfcDocumentConfidentialityEnum::IfcDocumentConfidentialityEnum IfcDocumentInformation::Confidentiality() const { return IfcDocumentConfidentialityEnum::FromString(*entity->getArgument(15)); }
 void IfcDocumentInformation::setConfidentiality(IfcDocumentConfidentialityEnum::IfcDocumentConfidentialityEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(15,v,IfcDocumentConfidentialityEnum::ToString(v)); }
-bool IfcDocumentInformation::hasStatus() { return !entity->getArgument(16)->isNull(); }
-IfcDocumentStatusEnum::IfcDocumentStatusEnum IfcDocumentInformation::Status() { return IfcDocumentStatusEnum::FromString(*entity->getArgument(16)); }
+bool IfcDocumentInformation::hasStatus() const { return !entity->getArgument(16)->isNull(); }
+IfcDocumentStatusEnum::IfcDocumentStatusEnum IfcDocumentInformation::Status() const { return IfcDocumentStatusEnum::FromString(*entity->getArgument(16)); }
 void IfcDocumentInformation::setStatus(IfcDocumentStatusEnum::IfcDocumentStatusEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(16,v,IfcDocumentStatusEnum::ToString(v)); }
-IfcDocumentInformationRelationship::list IfcDocumentInformation::IsPointedTo() { RETURN_INVERSE(IfcDocumentInformationRelationship) }
-IfcDocumentInformationRelationship::list IfcDocumentInformation::IsPointer() { RETURN_INVERSE(IfcDocumentInformationRelationship) }
+IfcDocumentInformationRelationship::list::ptr IfcDocumentInformation::IsPointedTo() const { return entity->getInverse(Type::IfcDocumentInformationRelationship, 1)->as<IfcDocumentInformationRelationship>(); }
+IfcDocumentInformationRelationship::list::ptr IfcDocumentInformation::IsPointer() const { return entity->getInverse(Type::IfcDocumentInformationRelationship, 0)->as<IfcDocumentInformationRelationship>(); }
 bool IfcDocumentInformation::is(Type::Enum v) const { return v == Type::IfcDocumentInformation; }
 Type::Enum IfcDocumentInformation::type() const { return Type::IfcDocumentInformation; }
 Type::Enum IfcDocumentInformation::Class() { return Type::IfcDocumentInformation; }
-IfcDocumentInformation::IfcDocumentInformation(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcDocumentInformation)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcDocumentInformation::IfcDocumentInformation(IfcIdentifier v1_DocumentId, IfcLabel v2_Name, boost::optional< IfcText > v3_Description, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcDocumentReference > > > v4_DocumentReferences, boost::optional< IfcText > v5_Purpose, boost::optional< IfcText > v6_IntendedUse, boost::optional< IfcText > v7_Scope, boost::optional< IfcLabel > v8_Revision, boost::optional< IfcActorSelect > v9_DocumentOwner, boost::optional< IfcEntities > v10_Editors, IfcDateAndTime* v11_CreationTime, IfcDateAndTime* v12_LastRevisionTime, IfcDocumentElectronicFormat* v13_ElectronicFormat, IfcCalendarDate* v14_ValidFrom, IfcCalendarDate* v15_ValidUntil, boost::optional< IfcDocumentConfidentialityEnum::IfcDocumentConfidentialityEnum > v16_Confidentiality, boost::optional< IfcDocumentStatusEnum::IfcDocumentStatusEnum > v17_Status) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_DocumentId)); e->setArgument(1,(v2_Name)); if (v3_Description) { e->setArgument(2,(*v3_Description)); } else { e->setArgument(2); } if (v4_DocumentReferences) { e->setArgument(3,(*v4_DocumentReferences)->generalize()); } else { e->setArgument(3); } if (v5_Purpose) { e->setArgument(4,(*v5_Purpose)); } else { e->setArgument(4); } if (v6_IntendedUse) { e->setArgument(5,(*v6_IntendedUse)); } else { e->setArgument(5); } if (v7_Scope) { e->setArgument(6,(*v7_Scope)); } else { e->setArgument(6); } if (v8_Revision) { e->setArgument(7,(*v8_Revision)); } else { e->setArgument(7); } if (v9_DocumentOwner) { e->setArgument(8,(*v9_DocumentOwner)); } else { e->setArgument(8); } if (v10_Editors) { e->setArgument(9,(*v10_Editors)); } else { e->setArgument(9); } e->setArgument(10,(v11_CreationTime)); e->setArgument(11,(v12_LastRevisionTime)); e->setArgument(12,(v13_ElectronicFormat)); e->setArgument(13,(v14_ValidFrom)); e->setArgument(14,(v15_ValidUntil)); if (v16_Confidentiality) { e->setArgument(15,*v16_Confidentiality,IfcDocumentConfidentialityEnum::ToString(*v16_Confidentiality)); } else { e->setArgument(15); } if (v17_Status) { e->setArgument(16,*v17_Status,IfcDocumentStatusEnum::ToString(*v17_Status)); } else { e->setArgument(16); } entity = e; EntityBuffer::Add(this); }
+IfcDocumentInformation::IfcDocumentInformation(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcDocumentInformation)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcDocumentInformation::IfcDocumentInformation(std::string v1_DocumentId, std::string v2_Name, boost::optional< std::string > v3_Description, boost::optional< IfcTemplatedEntityList< IfcDocumentReference >::ptr > v4_DocumentReferences, boost::optional< std::string > v5_Purpose, boost::optional< std::string > v6_IntendedUse, boost::optional< std::string > v7_Scope, boost::optional< std::string > v8_Revision, IfcActorSelect* v9_DocumentOwner, boost::optional< IfcEntityList::ptr > v10_Editors, IfcDateAndTime* v11_CreationTime, IfcDateAndTime* v12_LastRevisionTime, IfcDocumentElectronicFormat* v13_ElectronicFormat, IfcCalendarDate* v14_ValidFrom, IfcCalendarDate* v15_ValidUntil, boost::optional< IfcDocumentConfidentialityEnum::IfcDocumentConfidentialityEnum > v16_Confidentiality, boost::optional< IfcDocumentStatusEnum::IfcDocumentStatusEnum > v17_Status) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_DocumentId)); e->setArgument(1,(v2_Name)); if (v3_Description) { e->setArgument(2,(*v3_Description)); } else { e->setArgument(2); } if (v4_DocumentReferences) { e->setArgument(3,(*v4_DocumentReferences)->generalize()); } else { e->setArgument(3); } if (v5_Purpose) { e->setArgument(4,(*v5_Purpose)); } else { e->setArgument(4); } if (v6_IntendedUse) { e->setArgument(5,(*v6_IntendedUse)); } else { e->setArgument(5); } if (v7_Scope) { e->setArgument(6,(*v7_Scope)); } else { e->setArgument(6); } if (v8_Revision) { e->setArgument(7,(*v8_Revision)); } else { e->setArgument(7); } e->setArgument(8,(v9_DocumentOwner)); if (v10_Editors) { e->setArgument(9,(*v10_Editors)); } else { e->setArgument(9); } e->setArgument(10,(v11_CreationTime)); e->setArgument(11,(v12_LastRevisionTime)); e->setArgument(12,(v13_ElectronicFormat)); e->setArgument(13,(v14_ValidFrom)); e->setArgument(14,(v15_ValidUntil)); if (v16_Confidentiality) { e->setArgument(15,*v16_Confidentiality,IfcDocumentConfidentialityEnum::ToString(*v16_Confidentiality)); } else { e->setArgument(15); } if (v17_Status) { e->setArgument(16,*v17_Status,IfcDocumentStatusEnum::ToString(*v17_Status)); } else { e->setArgument(16); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcDocumentInformationRelationship
-IfcDocumentInformation* IfcDocumentInformationRelationship::RelatingDocument() { return (IfcDocumentInformation*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(0))); }
+IfcDocumentInformation* IfcDocumentInformationRelationship::RelatingDocument() const { return (IfcDocumentInformation*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(0))); }
 void IfcDocumentInformationRelationship::setRelatingDocument(IfcDocumentInformation* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-SHARED_PTR< IfcTemplatedEntityList< IfcDocumentInformation > > IfcDocumentInformationRelationship::RelatedDocuments() { RETURN_AS_LIST(IfcDocumentInformation,1) }
-void IfcDocumentInformationRelationship::setRelatedDocuments(SHARED_PTR< IfcTemplatedEntityList< IfcDocumentInformation > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v->generalize()); }
-bool IfcDocumentInformationRelationship::hasRelationshipType() { return !entity->getArgument(2)->isNull(); }
-IfcLabel IfcDocumentInformationRelationship::RelationshipType() { return *entity->getArgument(2); }
-void IfcDocumentInformationRelationship::setRelationshipType(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+IfcTemplatedEntityList< IfcDocumentInformation >::ptr IfcDocumentInformationRelationship::RelatedDocuments() const { IfcEntityList::ptr es = *entity->getArgument(1); return es->as<IfcDocumentInformation>(); }
+void IfcDocumentInformationRelationship::setRelatedDocuments(IfcTemplatedEntityList< IfcDocumentInformation >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v->generalize()); }
+bool IfcDocumentInformationRelationship::hasRelationshipType() const { return !entity->getArgument(2)->isNull(); }
+std::string IfcDocumentInformationRelationship::RelationshipType() const { return *entity->getArgument(2); }
+void IfcDocumentInformationRelationship::setRelationshipType(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
 bool IfcDocumentInformationRelationship::is(Type::Enum v) const { return v == Type::IfcDocumentInformationRelationship; }
 Type::Enum IfcDocumentInformationRelationship::type() const { return Type::IfcDocumentInformationRelationship; }
 Type::Enum IfcDocumentInformationRelationship::Class() { return Type::IfcDocumentInformationRelationship; }
-IfcDocumentInformationRelationship::IfcDocumentInformationRelationship(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcDocumentInformationRelationship)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcDocumentInformationRelationship::IfcDocumentInformationRelationship(IfcDocumentInformation* v1_RelatingDocument, SHARED_PTR< IfcTemplatedEntityList< IfcDocumentInformation > > v2_RelatedDocuments, boost::optional< IfcLabel > v3_RelationshipType) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_RelatingDocument)); e->setArgument(1,(v2_RelatedDocuments)->generalize()); if (v3_RelationshipType) { e->setArgument(2,(*v3_RelationshipType)); } else { e->setArgument(2); } entity = e; EntityBuffer::Add(this); }
+IfcDocumentInformationRelationship::IfcDocumentInformationRelationship(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcDocumentInformationRelationship)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcDocumentInformationRelationship::IfcDocumentInformationRelationship(IfcDocumentInformation* v1_RelatingDocument, IfcTemplatedEntityList< IfcDocumentInformation >::ptr v2_RelatedDocuments, boost::optional< std::string > v3_RelationshipType) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_RelatingDocument)); e->setArgument(1,(v2_RelatedDocuments)->generalize()); if (v3_RelationshipType) { e->setArgument(2,(*v3_RelationshipType)); } else { e->setArgument(2); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcDocumentReference
-IfcDocumentInformation::list IfcDocumentReference::ReferenceToDocument() { RETURN_INVERSE(IfcDocumentInformation) }
+IfcDocumentInformation::list::ptr IfcDocumentReference::ReferenceToDocument() const { return entity->getInverse(Type::IfcDocumentInformation, 3)->as<IfcDocumentInformation>(); }
 bool IfcDocumentReference::is(Type::Enum v) const { return v == Type::IfcDocumentReference || IfcExternalReference::is(v); }
 Type::Enum IfcDocumentReference::type() const { return Type::IfcDocumentReference; }
 Type::Enum IfcDocumentReference::Class() { return Type::IfcDocumentReference; }
-IfcDocumentReference::IfcDocumentReference(IfcAbstractEntityPtr e) : IfcExternalReference((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcDocumentReference)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcDocumentReference::IfcDocumentReference(boost::optional< IfcLabel > v1_Location, boost::optional< IfcIdentifier > v2_ItemReference, boost::optional< IfcLabel > v3_Name) : IfcExternalReference((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Location) { e->setArgument(0,(*v1_Location)); } else { e->setArgument(0); } if (v2_ItemReference) { e->setArgument(1,(*v2_ItemReference)); } else { e->setArgument(1); } if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } entity = e; EntityBuffer::Add(this); }
+IfcDocumentReference::IfcDocumentReference(IfcAbstractEntity* e) : IfcExternalReference((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcDocumentReference)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcDocumentReference::IfcDocumentReference(boost::optional< std::string > v1_Location, boost::optional< std::string > v2_ItemReference, boost::optional< std::string > v3_Name) : IfcExternalReference((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Location) { e->setArgument(0,(*v1_Location)); } else { e->setArgument(0); } if (v2_ItemReference) { e->setArgument(1,(*v2_ItemReference)); } else { e->setArgument(1); } if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcDoor
-bool IfcDoor::hasOverallHeight() { return !entity->getArgument(8)->isNull(); }
-IfcPositiveLengthMeasure IfcDoor::OverallHeight() { return *entity->getArgument(8); }
-void IfcDoor::setOverallHeight(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
-bool IfcDoor::hasOverallWidth() { return !entity->getArgument(9)->isNull(); }
-IfcPositiveLengthMeasure IfcDoor::OverallWidth() { return *entity->getArgument(9); }
-void IfcDoor::setOverallWidth(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
+bool IfcDoor::hasOverallHeight() const { return !entity->getArgument(8)->isNull(); }
+double IfcDoor::OverallHeight() const { return *entity->getArgument(8); }
+void IfcDoor::setOverallHeight(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
+bool IfcDoor::hasOverallWidth() const { return !entity->getArgument(9)->isNull(); }
+double IfcDoor::OverallWidth() const { return *entity->getArgument(9); }
+void IfcDoor::setOverallWidth(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
 bool IfcDoor::is(Type::Enum v) const { return v == Type::IfcDoor || IfcBuildingElement::is(v); }
 Type::Enum IfcDoor::type() const { return Type::IfcDoor; }
 Type::Enum IfcDoor::Class() { return Type::IfcDoor; }
-IfcDoor::IfcDoor(IfcAbstractEntityPtr e) : IfcBuildingElement((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcDoor)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcDoor::IfcDoor(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcPositiveLengthMeasure > v9_OverallHeight, boost::optional< IfcPositiveLengthMeasure > v10_OverallWidth) : IfcBuildingElement((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_OverallHeight) { e->setArgument(8,(*v9_OverallHeight)); } else { e->setArgument(8); } if (v10_OverallWidth) { e->setArgument(9,(*v10_OverallWidth)); } else { e->setArgument(9); } entity = e; EntityBuffer::Add(this); }
+IfcDoor::IfcDoor(IfcAbstractEntity* e) : IfcBuildingElement((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcDoor)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcDoor::IfcDoor(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< double > v9_OverallHeight, boost::optional< double > v10_OverallWidth) : IfcBuildingElement((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_OverallHeight) { e->setArgument(8,(*v9_OverallHeight)); } else { e->setArgument(8); } if (v10_OverallWidth) { e->setArgument(9,(*v10_OverallWidth)); } else { e->setArgument(9); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcDoorLiningProperties
-bool IfcDoorLiningProperties::hasLiningDepth() { return !entity->getArgument(4)->isNull(); }
-IfcPositiveLengthMeasure IfcDoorLiningProperties::LiningDepth() { return *entity->getArgument(4); }
-void IfcDoorLiningProperties::setLiningDepth(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-bool IfcDoorLiningProperties::hasLiningThickness() { return !entity->getArgument(5)->isNull(); }
-IfcPositiveLengthMeasure IfcDoorLiningProperties::LiningThickness() { return *entity->getArgument(5); }
-void IfcDoorLiningProperties::setLiningThickness(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-bool IfcDoorLiningProperties::hasThresholdDepth() { return !entity->getArgument(6)->isNull(); }
-IfcPositiveLengthMeasure IfcDoorLiningProperties::ThresholdDepth() { return *entity->getArgument(6); }
-void IfcDoorLiningProperties::setThresholdDepth(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
-bool IfcDoorLiningProperties::hasThresholdThickness() { return !entity->getArgument(7)->isNull(); }
-IfcPositiveLengthMeasure IfcDoorLiningProperties::ThresholdThickness() { return *entity->getArgument(7); }
-void IfcDoorLiningProperties::setThresholdThickness(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
-bool IfcDoorLiningProperties::hasTransomThickness() { return !entity->getArgument(8)->isNull(); }
-IfcPositiveLengthMeasure IfcDoorLiningProperties::TransomThickness() { return *entity->getArgument(8); }
-void IfcDoorLiningProperties::setTransomThickness(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
-bool IfcDoorLiningProperties::hasTransomOffset() { return !entity->getArgument(9)->isNull(); }
-IfcLengthMeasure IfcDoorLiningProperties::TransomOffset() { return *entity->getArgument(9); }
-void IfcDoorLiningProperties::setTransomOffset(IfcLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
-bool IfcDoorLiningProperties::hasLiningOffset() { return !entity->getArgument(10)->isNull(); }
-IfcLengthMeasure IfcDoorLiningProperties::LiningOffset() { return *entity->getArgument(10); }
-void IfcDoorLiningProperties::setLiningOffset(IfcLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
-bool IfcDoorLiningProperties::hasThresholdOffset() { return !entity->getArgument(11)->isNull(); }
-IfcLengthMeasure IfcDoorLiningProperties::ThresholdOffset() { return *entity->getArgument(11); }
-void IfcDoorLiningProperties::setThresholdOffset(IfcLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(11,v); }
-bool IfcDoorLiningProperties::hasCasingThickness() { return !entity->getArgument(12)->isNull(); }
-IfcPositiveLengthMeasure IfcDoorLiningProperties::CasingThickness() { return *entity->getArgument(12); }
-void IfcDoorLiningProperties::setCasingThickness(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(12,v); }
-bool IfcDoorLiningProperties::hasCasingDepth() { return !entity->getArgument(13)->isNull(); }
-IfcPositiveLengthMeasure IfcDoorLiningProperties::CasingDepth() { return *entity->getArgument(13); }
-void IfcDoorLiningProperties::setCasingDepth(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(13,v); }
-bool IfcDoorLiningProperties::hasShapeAspectStyle() { return !entity->getArgument(14)->isNull(); }
-IfcShapeAspect* IfcDoorLiningProperties::ShapeAspectStyle() { return (IfcShapeAspect*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(14))); }
+bool IfcDoorLiningProperties::hasLiningDepth() const { return !entity->getArgument(4)->isNull(); }
+double IfcDoorLiningProperties::LiningDepth() const { return *entity->getArgument(4); }
+void IfcDoorLiningProperties::setLiningDepth(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+bool IfcDoorLiningProperties::hasLiningThickness() const { return !entity->getArgument(5)->isNull(); }
+double IfcDoorLiningProperties::LiningThickness() const { return *entity->getArgument(5); }
+void IfcDoorLiningProperties::setLiningThickness(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+bool IfcDoorLiningProperties::hasThresholdDepth() const { return !entity->getArgument(6)->isNull(); }
+double IfcDoorLiningProperties::ThresholdDepth() const { return *entity->getArgument(6); }
+void IfcDoorLiningProperties::setThresholdDepth(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
+bool IfcDoorLiningProperties::hasThresholdThickness() const { return !entity->getArgument(7)->isNull(); }
+double IfcDoorLiningProperties::ThresholdThickness() const { return *entity->getArgument(7); }
+void IfcDoorLiningProperties::setThresholdThickness(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
+bool IfcDoorLiningProperties::hasTransomThickness() const { return !entity->getArgument(8)->isNull(); }
+double IfcDoorLiningProperties::TransomThickness() const { return *entity->getArgument(8); }
+void IfcDoorLiningProperties::setTransomThickness(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
+bool IfcDoorLiningProperties::hasTransomOffset() const { return !entity->getArgument(9)->isNull(); }
+double IfcDoorLiningProperties::TransomOffset() const { return *entity->getArgument(9); }
+void IfcDoorLiningProperties::setTransomOffset(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
+bool IfcDoorLiningProperties::hasLiningOffset() const { return !entity->getArgument(10)->isNull(); }
+double IfcDoorLiningProperties::LiningOffset() const { return *entity->getArgument(10); }
+void IfcDoorLiningProperties::setLiningOffset(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
+bool IfcDoorLiningProperties::hasThresholdOffset() const { return !entity->getArgument(11)->isNull(); }
+double IfcDoorLiningProperties::ThresholdOffset() const { return *entity->getArgument(11); }
+void IfcDoorLiningProperties::setThresholdOffset(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(11,v); }
+bool IfcDoorLiningProperties::hasCasingThickness() const { return !entity->getArgument(12)->isNull(); }
+double IfcDoorLiningProperties::CasingThickness() const { return *entity->getArgument(12); }
+void IfcDoorLiningProperties::setCasingThickness(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(12,v); }
+bool IfcDoorLiningProperties::hasCasingDepth() const { return !entity->getArgument(13)->isNull(); }
+double IfcDoorLiningProperties::CasingDepth() const { return *entity->getArgument(13); }
+void IfcDoorLiningProperties::setCasingDepth(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(13,v); }
+bool IfcDoorLiningProperties::hasShapeAspectStyle() const { return !entity->getArgument(14)->isNull(); }
+IfcShapeAspect* IfcDoorLiningProperties::ShapeAspectStyle() const { return (IfcShapeAspect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(14))); }
 void IfcDoorLiningProperties::setShapeAspectStyle(IfcShapeAspect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(14,v); }
 bool IfcDoorLiningProperties::is(Type::Enum v) const { return v == Type::IfcDoorLiningProperties || IfcPropertySetDefinition::is(v); }
 Type::Enum IfcDoorLiningProperties::type() const { return Type::IfcDoorLiningProperties; }
 Type::Enum IfcDoorLiningProperties::Class() { return Type::IfcDoorLiningProperties; }
-IfcDoorLiningProperties::IfcDoorLiningProperties(IfcAbstractEntityPtr e) : IfcPropertySetDefinition((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcDoorLiningProperties)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcDoorLiningProperties::IfcDoorLiningProperties(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcPositiveLengthMeasure > v5_LiningDepth, boost::optional< IfcPositiveLengthMeasure > v6_LiningThickness, boost::optional< IfcPositiveLengthMeasure > v7_ThresholdDepth, boost::optional< IfcPositiveLengthMeasure > v8_ThresholdThickness, boost::optional< IfcPositiveLengthMeasure > v9_TransomThickness, boost::optional< IfcLengthMeasure > v10_TransomOffset, boost::optional< IfcLengthMeasure > v11_LiningOffset, boost::optional< IfcLengthMeasure > v12_ThresholdOffset, boost::optional< IfcPositiveLengthMeasure > v13_CasingThickness, boost::optional< IfcPositiveLengthMeasure > v14_CasingDepth, IfcShapeAspect* v15_ShapeAspectStyle) : IfcPropertySetDefinition((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_LiningDepth) { e->setArgument(4,(*v5_LiningDepth)); } else { e->setArgument(4); } if (v6_LiningThickness) { e->setArgument(5,(*v6_LiningThickness)); } else { e->setArgument(5); } if (v7_ThresholdDepth) { e->setArgument(6,(*v7_ThresholdDepth)); } else { e->setArgument(6); } if (v8_ThresholdThickness) { e->setArgument(7,(*v8_ThresholdThickness)); } else { e->setArgument(7); } if (v9_TransomThickness) { e->setArgument(8,(*v9_TransomThickness)); } else { e->setArgument(8); } if (v10_TransomOffset) { e->setArgument(9,(*v10_TransomOffset)); } else { e->setArgument(9); } if (v11_LiningOffset) { e->setArgument(10,(*v11_LiningOffset)); } else { e->setArgument(10); } if (v12_ThresholdOffset) { e->setArgument(11,(*v12_ThresholdOffset)); } else { e->setArgument(11); } if (v13_CasingThickness) { e->setArgument(12,(*v13_CasingThickness)); } else { e->setArgument(12); } if (v14_CasingDepth) { e->setArgument(13,(*v14_CasingDepth)); } else { e->setArgument(13); } e->setArgument(14,(v15_ShapeAspectStyle)); entity = e; EntityBuffer::Add(this); }
+IfcDoorLiningProperties::IfcDoorLiningProperties(IfcAbstractEntity* e) : IfcPropertySetDefinition((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcDoorLiningProperties)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcDoorLiningProperties::IfcDoorLiningProperties(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< double > v5_LiningDepth, boost::optional< double > v6_LiningThickness, boost::optional< double > v7_ThresholdDepth, boost::optional< double > v8_ThresholdThickness, boost::optional< double > v9_TransomThickness, boost::optional< double > v10_TransomOffset, boost::optional< double > v11_LiningOffset, boost::optional< double > v12_ThresholdOffset, boost::optional< double > v13_CasingThickness, boost::optional< double > v14_CasingDepth, IfcShapeAspect* v15_ShapeAspectStyle) : IfcPropertySetDefinition((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_LiningDepth) { e->setArgument(4,(*v5_LiningDepth)); } else { e->setArgument(4); } if (v6_LiningThickness) { e->setArgument(5,(*v6_LiningThickness)); } else { e->setArgument(5); } if (v7_ThresholdDepth) { e->setArgument(6,(*v7_ThresholdDepth)); } else { e->setArgument(6); } if (v8_ThresholdThickness) { e->setArgument(7,(*v8_ThresholdThickness)); } else { e->setArgument(7); } if (v9_TransomThickness) { e->setArgument(8,(*v9_TransomThickness)); } else { e->setArgument(8); } if (v10_TransomOffset) { e->setArgument(9,(*v10_TransomOffset)); } else { e->setArgument(9); } if (v11_LiningOffset) { e->setArgument(10,(*v11_LiningOffset)); } else { e->setArgument(10); } if (v12_ThresholdOffset) { e->setArgument(11,(*v12_ThresholdOffset)); } else { e->setArgument(11); } if (v13_CasingThickness) { e->setArgument(12,(*v13_CasingThickness)); } else { e->setArgument(12); } if (v14_CasingDepth) { e->setArgument(13,(*v14_CasingDepth)); } else { e->setArgument(13); } e->setArgument(14,(v15_ShapeAspectStyle)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcDoorPanelProperties
-bool IfcDoorPanelProperties::hasPanelDepth() { return !entity->getArgument(4)->isNull(); }
-IfcPositiveLengthMeasure IfcDoorPanelProperties::PanelDepth() { return *entity->getArgument(4); }
-void IfcDoorPanelProperties::setPanelDepth(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-IfcDoorPanelOperationEnum::IfcDoorPanelOperationEnum IfcDoorPanelProperties::PanelOperation() { return IfcDoorPanelOperationEnum::FromString(*entity->getArgument(5)); }
+bool IfcDoorPanelProperties::hasPanelDepth() const { return !entity->getArgument(4)->isNull(); }
+double IfcDoorPanelProperties::PanelDepth() const { return *entity->getArgument(4); }
+void IfcDoorPanelProperties::setPanelDepth(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+IfcDoorPanelOperationEnum::IfcDoorPanelOperationEnum IfcDoorPanelProperties::PanelOperation() const { return IfcDoorPanelOperationEnum::FromString(*entity->getArgument(5)); }
 void IfcDoorPanelProperties::setPanelOperation(IfcDoorPanelOperationEnum::IfcDoorPanelOperationEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v,IfcDoorPanelOperationEnum::ToString(v)); }
-bool IfcDoorPanelProperties::hasPanelWidth() { return !entity->getArgument(6)->isNull(); }
-IfcNormalisedRatioMeasure IfcDoorPanelProperties::PanelWidth() { return *entity->getArgument(6); }
-void IfcDoorPanelProperties::setPanelWidth(IfcNormalisedRatioMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
-IfcDoorPanelPositionEnum::IfcDoorPanelPositionEnum IfcDoorPanelProperties::PanelPosition() { return IfcDoorPanelPositionEnum::FromString(*entity->getArgument(7)); }
+bool IfcDoorPanelProperties::hasPanelWidth() const { return !entity->getArgument(6)->isNull(); }
+double IfcDoorPanelProperties::PanelWidth() const { return *entity->getArgument(6); }
+void IfcDoorPanelProperties::setPanelWidth(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
+IfcDoorPanelPositionEnum::IfcDoorPanelPositionEnum IfcDoorPanelProperties::PanelPosition() const { return IfcDoorPanelPositionEnum::FromString(*entity->getArgument(7)); }
 void IfcDoorPanelProperties::setPanelPosition(IfcDoorPanelPositionEnum::IfcDoorPanelPositionEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v,IfcDoorPanelPositionEnum::ToString(v)); }
-bool IfcDoorPanelProperties::hasShapeAspectStyle() { return !entity->getArgument(8)->isNull(); }
-IfcShapeAspect* IfcDoorPanelProperties::ShapeAspectStyle() { return (IfcShapeAspect*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(8))); }
+bool IfcDoorPanelProperties::hasShapeAspectStyle() const { return !entity->getArgument(8)->isNull(); }
+IfcShapeAspect* IfcDoorPanelProperties::ShapeAspectStyle() const { return (IfcShapeAspect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(8))); }
 void IfcDoorPanelProperties::setShapeAspectStyle(IfcShapeAspect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
 bool IfcDoorPanelProperties::is(Type::Enum v) const { return v == Type::IfcDoorPanelProperties || IfcPropertySetDefinition::is(v); }
 Type::Enum IfcDoorPanelProperties::type() const { return Type::IfcDoorPanelProperties; }
 Type::Enum IfcDoorPanelProperties::Class() { return Type::IfcDoorPanelProperties; }
-IfcDoorPanelProperties::IfcDoorPanelProperties(IfcAbstractEntityPtr e) : IfcPropertySetDefinition((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcDoorPanelProperties)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcDoorPanelProperties::IfcDoorPanelProperties(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcPositiveLengthMeasure > v5_PanelDepth, IfcDoorPanelOperationEnum::IfcDoorPanelOperationEnum v6_PanelOperation, boost::optional< IfcNormalisedRatioMeasure > v7_PanelWidth, IfcDoorPanelPositionEnum::IfcDoorPanelPositionEnum v8_PanelPosition, IfcShapeAspect* v9_ShapeAspectStyle) : IfcPropertySetDefinition((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_PanelDepth) { e->setArgument(4,(*v5_PanelDepth)); } else { e->setArgument(4); } e->setArgument(5,v6_PanelOperation,IfcDoorPanelOperationEnum::ToString(v6_PanelOperation)); if (v7_PanelWidth) { e->setArgument(6,(*v7_PanelWidth)); } else { e->setArgument(6); } e->setArgument(7,v8_PanelPosition,IfcDoorPanelPositionEnum::ToString(v8_PanelPosition)); e->setArgument(8,(v9_ShapeAspectStyle)); entity = e; EntityBuffer::Add(this); }
+IfcDoorPanelProperties::IfcDoorPanelProperties(IfcAbstractEntity* e) : IfcPropertySetDefinition((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcDoorPanelProperties)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcDoorPanelProperties::IfcDoorPanelProperties(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< double > v5_PanelDepth, IfcDoorPanelOperationEnum::IfcDoorPanelOperationEnum v6_PanelOperation, boost::optional< double > v7_PanelWidth, IfcDoorPanelPositionEnum::IfcDoorPanelPositionEnum v8_PanelPosition, IfcShapeAspect* v9_ShapeAspectStyle) : IfcPropertySetDefinition((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_PanelDepth) { e->setArgument(4,(*v5_PanelDepth)); } else { e->setArgument(4); } e->setArgument(5,v6_PanelOperation,IfcDoorPanelOperationEnum::ToString(v6_PanelOperation)); if (v7_PanelWidth) { e->setArgument(6,(*v7_PanelWidth)); } else { e->setArgument(6); } e->setArgument(7,v8_PanelPosition,IfcDoorPanelPositionEnum::ToString(v8_PanelPosition)); e->setArgument(8,(v9_ShapeAspectStyle)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcDoorStyle
-IfcDoorStyleOperationEnum::IfcDoorStyleOperationEnum IfcDoorStyle::OperationType() { return IfcDoorStyleOperationEnum::FromString(*entity->getArgument(8)); }
+IfcDoorStyleOperationEnum::IfcDoorStyleOperationEnum IfcDoorStyle::OperationType() const { return IfcDoorStyleOperationEnum::FromString(*entity->getArgument(8)); }
 void IfcDoorStyle::setOperationType(IfcDoorStyleOperationEnum::IfcDoorStyleOperationEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcDoorStyleOperationEnum::ToString(v)); }
-IfcDoorStyleConstructionEnum::IfcDoorStyleConstructionEnum IfcDoorStyle::ConstructionType() { return IfcDoorStyleConstructionEnum::FromString(*entity->getArgument(9)); }
+IfcDoorStyleConstructionEnum::IfcDoorStyleConstructionEnum IfcDoorStyle::ConstructionType() const { return IfcDoorStyleConstructionEnum::FromString(*entity->getArgument(9)); }
 void IfcDoorStyle::setConstructionType(IfcDoorStyleConstructionEnum::IfcDoorStyleConstructionEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcDoorStyleConstructionEnum::ToString(v)); }
-bool IfcDoorStyle::ParameterTakesPrecedence() { return *entity->getArgument(10); }
+bool IfcDoorStyle::ParameterTakesPrecedence() const { return *entity->getArgument(10); }
 void IfcDoorStyle::setParameterTakesPrecedence(bool v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
-bool IfcDoorStyle::Sizeable() { return *entity->getArgument(11); }
+bool IfcDoorStyle::Sizeable() const { return *entity->getArgument(11); }
 void IfcDoorStyle::setSizeable(bool v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(11,v); }
 bool IfcDoorStyle::is(Type::Enum v) const { return v == Type::IfcDoorStyle || IfcTypeProduct::is(v); }
 Type::Enum IfcDoorStyle::type() const { return Type::IfcDoorStyle; }
 Type::Enum IfcDoorStyle::Class() { return Type::IfcDoorStyle; }
-IfcDoorStyle::IfcDoorStyle(IfcAbstractEntityPtr e) : IfcTypeProduct((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcDoorStyle)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcDoorStyle::IfcDoorStyle(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, IfcDoorStyleOperationEnum::IfcDoorStyleOperationEnum v9_OperationType, IfcDoorStyleConstructionEnum::IfcDoorStyleConstructionEnum v10_ConstructionType, bool v11_ParameterTakesPrecedence, bool v12_Sizeable) : IfcTypeProduct((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } e->setArgument(8,v9_OperationType,IfcDoorStyleOperationEnum::ToString(v9_OperationType)); e->setArgument(9,v10_ConstructionType,IfcDoorStyleConstructionEnum::ToString(v10_ConstructionType)); e->setArgument(10,(v11_ParameterTakesPrecedence)); e->setArgument(11,(v12_Sizeable)); entity = e; EntityBuffer::Add(this); }
+IfcDoorStyle::IfcDoorStyle(IfcAbstractEntity* e) : IfcTypeProduct((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcDoorStyle)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcDoorStyle::IfcDoorStyle(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, IfcDoorStyleOperationEnum::IfcDoorStyleOperationEnum v9_OperationType, IfcDoorStyleConstructionEnum::IfcDoorStyleConstructionEnum v10_ConstructionType, bool v11_ParameterTakesPrecedence, bool v12_Sizeable) : IfcTypeProduct((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } e->setArgument(8,v9_OperationType,IfcDoorStyleOperationEnum::ToString(v9_OperationType)); e->setArgument(9,v10_ConstructionType,IfcDoorStyleConstructionEnum::ToString(v10_ConstructionType)); e->setArgument(10,(v11_ParameterTakesPrecedence)); e->setArgument(11,(v12_Sizeable)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcDraughtingCallout
-SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > IfcDraughtingCallout::Contents() { RETURN_AS_LIST(IfcUtil::IfcAbstractSelect,0) }
-void IfcDraughtingCallout::setContents(SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v->generalize()); }
-IfcDraughtingCalloutRelationship::list IfcDraughtingCallout::IsRelatedFromCallout() { RETURN_INVERSE(IfcDraughtingCalloutRelationship) }
-IfcDraughtingCalloutRelationship::list IfcDraughtingCallout::IsRelatedToCallout() { RETURN_INVERSE(IfcDraughtingCalloutRelationship) }
+IfcEntityList::ptr IfcDraughtingCallout::Contents() const { return *entity->getArgument(0); }
+void IfcDraughtingCallout::setContents(IfcEntityList::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+IfcDraughtingCalloutRelationship::list::ptr IfcDraughtingCallout::IsRelatedFromCallout() const { return entity->getInverse(Type::IfcDraughtingCalloutRelationship, 3)->as<IfcDraughtingCalloutRelationship>(); }
+IfcDraughtingCalloutRelationship::list::ptr IfcDraughtingCallout::IsRelatedToCallout() const { return entity->getInverse(Type::IfcDraughtingCalloutRelationship, 2)->as<IfcDraughtingCalloutRelationship>(); }
 bool IfcDraughtingCallout::is(Type::Enum v) const { return v == Type::IfcDraughtingCallout || IfcGeometricRepresentationItem::is(v); }
 Type::Enum IfcDraughtingCallout::type() const { return Type::IfcDraughtingCallout; }
 Type::Enum IfcDraughtingCallout::Class() { return Type::IfcDraughtingCallout; }
-IfcDraughtingCallout::IfcDraughtingCallout(IfcAbstractEntityPtr e) : IfcGeometricRepresentationItem((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcDraughtingCallout)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcDraughtingCallout::IfcDraughtingCallout(IfcEntities v1_Contents) : IfcGeometricRepresentationItem((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Contents)); entity = e; EntityBuffer::Add(this); }
+IfcDraughtingCallout::IfcDraughtingCallout(IfcAbstractEntity* e) : IfcGeometricRepresentationItem((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcDraughtingCallout)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcDraughtingCallout::IfcDraughtingCallout(IfcEntityList::ptr v1_Contents) : IfcGeometricRepresentationItem((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Contents)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcDraughtingCalloutRelationship
-bool IfcDraughtingCalloutRelationship::hasName() { return !entity->getArgument(0)->isNull(); }
-IfcLabel IfcDraughtingCalloutRelationship::Name() { return *entity->getArgument(0); }
-void IfcDraughtingCalloutRelationship::setName(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-bool IfcDraughtingCalloutRelationship::hasDescription() { return !entity->getArgument(1)->isNull(); }
-IfcText IfcDraughtingCalloutRelationship::Description() { return *entity->getArgument(1); }
-void IfcDraughtingCalloutRelationship::setDescription(IfcText v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-IfcDraughtingCallout* IfcDraughtingCalloutRelationship::RelatingDraughtingCallout() { return (IfcDraughtingCallout*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(2))); }
+bool IfcDraughtingCalloutRelationship::hasName() const { return !entity->getArgument(0)->isNull(); }
+std::string IfcDraughtingCalloutRelationship::Name() const { return *entity->getArgument(0); }
+void IfcDraughtingCalloutRelationship::setName(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+bool IfcDraughtingCalloutRelationship::hasDescription() const { return !entity->getArgument(1)->isNull(); }
+std::string IfcDraughtingCalloutRelationship::Description() const { return *entity->getArgument(1); }
+void IfcDraughtingCalloutRelationship::setDescription(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+IfcDraughtingCallout* IfcDraughtingCalloutRelationship::RelatingDraughtingCallout() const { return (IfcDraughtingCallout*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(2))); }
 void IfcDraughtingCalloutRelationship::setRelatingDraughtingCallout(IfcDraughtingCallout* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-IfcDraughtingCallout* IfcDraughtingCalloutRelationship::RelatedDraughtingCallout() { return (IfcDraughtingCallout*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(3))); }
+IfcDraughtingCallout* IfcDraughtingCalloutRelationship::RelatedDraughtingCallout() const { return (IfcDraughtingCallout*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(3))); }
 void IfcDraughtingCalloutRelationship::setRelatedDraughtingCallout(IfcDraughtingCallout* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
 bool IfcDraughtingCalloutRelationship::is(Type::Enum v) const { return v == Type::IfcDraughtingCalloutRelationship; }
 Type::Enum IfcDraughtingCalloutRelationship::type() const { return Type::IfcDraughtingCalloutRelationship; }
 Type::Enum IfcDraughtingCalloutRelationship::Class() { return Type::IfcDraughtingCalloutRelationship; }
-IfcDraughtingCalloutRelationship::IfcDraughtingCalloutRelationship(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcDraughtingCalloutRelationship)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcDraughtingCalloutRelationship::IfcDraughtingCalloutRelationship(boost::optional< IfcLabel > v1_Name, boost::optional< IfcText > v2_Description, IfcDraughtingCallout* v3_RelatingDraughtingCallout, IfcDraughtingCallout* v4_RelatedDraughtingCallout) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_RelatingDraughtingCallout)); e->setArgument(3,(v4_RelatedDraughtingCallout)); entity = e; EntityBuffer::Add(this); }
+IfcDraughtingCalloutRelationship::IfcDraughtingCalloutRelationship(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcDraughtingCalloutRelationship)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcDraughtingCalloutRelationship::IfcDraughtingCalloutRelationship(boost::optional< std::string > v1_Name, boost::optional< std::string > v2_Description, IfcDraughtingCallout* v3_RelatingDraughtingCallout, IfcDraughtingCallout* v4_RelatedDraughtingCallout) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_RelatingDraughtingCallout)); e->setArgument(3,(v4_RelatedDraughtingCallout)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcDraughtingPreDefinedColour
 bool IfcDraughtingPreDefinedColour::is(Type::Enum v) const { return v == Type::IfcDraughtingPreDefinedColour || IfcPreDefinedColour::is(v); }
 Type::Enum IfcDraughtingPreDefinedColour::type() const { return Type::IfcDraughtingPreDefinedColour; }
 Type::Enum IfcDraughtingPreDefinedColour::Class() { return Type::IfcDraughtingPreDefinedColour; }
-IfcDraughtingPreDefinedColour::IfcDraughtingPreDefinedColour(IfcAbstractEntityPtr e) : IfcPreDefinedColour((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcDraughtingPreDefinedColour)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcDraughtingPreDefinedColour::IfcDraughtingPreDefinedColour(IfcLabel v1_Name) : IfcPreDefinedColour((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); entity = e; EntityBuffer::Add(this); }
+IfcDraughtingPreDefinedColour::IfcDraughtingPreDefinedColour(IfcAbstractEntity* e) : IfcPreDefinedColour((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcDraughtingPreDefinedColour)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcDraughtingPreDefinedColour::IfcDraughtingPreDefinedColour(std::string v1_Name) : IfcPreDefinedColour((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcDraughtingPreDefinedCurveFont
 bool IfcDraughtingPreDefinedCurveFont::is(Type::Enum v) const { return v == Type::IfcDraughtingPreDefinedCurveFont || IfcPreDefinedCurveFont::is(v); }
 Type::Enum IfcDraughtingPreDefinedCurveFont::type() const { return Type::IfcDraughtingPreDefinedCurveFont; }
 Type::Enum IfcDraughtingPreDefinedCurveFont::Class() { return Type::IfcDraughtingPreDefinedCurveFont; }
-IfcDraughtingPreDefinedCurveFont::IfcDraughtingPreDefinedCurveFont(IfcAbstractEntityPtr e) : IfcPreDefinedCurveFont((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcDraughtingPreDefinedCurveFont)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcDraughtingPreDefinedCurveFont::IfcDraughtingPreDefinedCurveFont(IfcLabel v1_Name) : IfcPreDefinedCurveFont((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); entity = e; EntityBuffer::Add(this); }
+IfcDraughtingPreDefinedCurveFont::IfcDraughtingPreDefinedCurveFont(IfcAbstractEntity* e) : IfcPreDefinedCurveFont((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcDraughtingPreDefinedCurveFont)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcDraughtingPreDefinedCurveFont::IfcDraughtingPreDefinedCurveFont(std::string v1_Name) : IfcPreDefinedCurveFont((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcDraughtingPreDefinedTextFont
 bool IfcDraughtingPreDefinedTextFont::is(Type::Enum v) const { return v == Type::IfcDraughtingPreDefinedTextFont || IfcPreDefinedTextFont::is(v); }
 Type::Enum IfcDraughtingPreDefinedTextFont::type() const { return Type::IfcDraughtingPreDefinedTextFont; }
 Type::Enum IfcDraughtingPreDefinedTextFont::Class() { return Type::IfcDraughtingPreDefinedTextFont; }
-IfcDraughtingPreDefinedTextFont::IfcDraughtingPreDefinedTextFont(IfcAbstractEntityPtr e) : IfcPreDefinedTextFont((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcDraughtingPreDefinedTextFont)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcDraughtingPreDefinedTextFont::IfcDraughtingPreDefinedTextFont(IfcLabel v1_Name) : IfcPreDefinedTextFont((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); entity = e; EntityBuffer::Add(this); }
+IfcDraughtingPreDefinedTextFont::IfcDraughtingPreDefinedTextFont(IfcAbstractEntity* e) : IfcPreDefinedTextFont((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcDraughtingPreDefinedTextFont)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcDraughtingPreDefinedTextFont::IfcDraughtingPreDefinedTextFont(std::string v1_Name) : IfcPreDefinedTextFont((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcDuctFittingType
-IfcDuctFittingTypeEnum::IfcDuctFittingTypeEnum IfcDuctFittingType::PredefinedType() { return IfcDuctFittingTypeEnum::FromString(*entity->getArgument(9)); }
+IfcDuctFittingTypeEnum::IfcDuctFittingTypeEnum IfcDuctFittingType::PredefinedType() const { return IfcDuctFittingTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcDuctFittingType::setPredefinedType(IfcDuctFittingTypeEnum::IfcDuctFittingTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcDuctFittingTypeEnum::ToString(v)); }
 bool IfcDuctFittingType::is(Type::Enum v) const { return v == Type::IfcDuctFittingType || IfcFlowFittingType::is(v); }
 Type::Enum IfcDuctFittingType::type() const { return Type::IfcDuctFittingType; }
 Type::Enum IfcDuctFittingType::Class() { return Type::IfcDuctFittingType; }
-IfcDuctFittingType::IfcDuctFittingType(IfcAbstractEntityPtr e) : IfcFlowFittingType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcDuctFittingType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcDuctFittingType::IfcDuctFittingType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcDuctFittingTypeEnum::IfcDuctFittingTypeEnum v10_PredefinedType) : IfcFlowFittingType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcDuctFittingTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcDuctFittingType::IfcDuctFittingType(IfcAbstractEntity* e) : IfcFlowFittingType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcDuctFittingType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcDuctFittingType::IfcDuctFittingType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcDuctFittingTypeEnum::IfcDuctFittingTypeEnum v10_PredefinedType) : IfcFlowFittingType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcDuctFittingTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcDuctSegmentType
-IfcDuctSegmentTypeEnum::IfcDuctSegmentTypeEnum IfcDuctSegmentType::PredefinedType() { return IfcDuctSegmentTypeEnum::FromString(*entity->getArgument(9)); }
+IfcDuctSegmentTypeEnum::IfcDuctSegmentTypeEnum IfcDuctSegmentType::PredefinedType() const { return IfcDuctSegmentTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcDuctSegmentType::setPredefinedType(IfcDuctSegmentTypeEnum::IfcDuctSegmentTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcDuctSegmentTypeEnum::ToString(v)); }
 bool IfcDuctSegmentType::is(Type::Enum v) const { return v == Type::IfcDuctSegmentType || IfcFlowSegmentType::is(v); }
 Type::Enum IfcDuctSegmentType::type() const { return Type::IfcDuctSegmentType; }
 Type::Enum IfcDuctSegmentType::Class() { return Type::IfcDuctSegmentType; }
-IfcDuctSegmentType::IfcDuctSegmentType(IfcAbstractEntityPtr e) : IfcFlowSegmentType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcDuctSegmentType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcDuctSegmentType::IfcDuctSegmentType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcDuctSegmentTypeEnum::IfcDuctSegmentTypeEnum v10_PredefinedType) : IfcFlowSegmentType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcDuctSegmentTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcDuctSegmentType::IfcDuctSegmentType(IfcAbstractEntity* e) : IfcFlowSegmentType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcDuctSegmentType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcDuctSegmentType::IfcDuctSegmentType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcDuctSegmentTypeEnum::IfcDuctSegmentTypeEnum v10_PredefinedType) : IfcFlowSegmentType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcDuctSegmentTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcDuctSilencerType
-IfcDuctSilencerTypeEnum::IfcDuctSilencerTypeEnum IfcDuctSilencerType::PredefinedType() { return IfcDuctSilencerTypeEnum::FromString(*entity->getArgument(9)); }
+IfcDuctSilencerTypeEnum::IfcDuctSilencerTypeEnum IfcDuctSilencerType::PredefinedType() const { return IfcDuctSilencerTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcDuctSilencerType::setPredefinedType(IfcDuctSilencerTypeEnum::IfcDuctSilencerTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcDuctSilencerTypeEnum::ToString(v)); }
 bool IfcDuctSilencerType::is(Type::Enum v) const { return v == Type::IfcDuctSilencerType || IfcFlowTreatmentDeviceType::is(v); }
 Type::Enum IfcDuctSilencerType::type() const { return Type::IfcDuctSilencerType; }
 Type::Enum IfcDuctSilencerType::Class() { return Type::IfcDuctSilencerType; }
-IfcDuctSilencerType::IfcDuctSilencerType(IfcAbstractEntityPtr e) : IfcFlowTreatmentDeviceType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcDuctSilencerType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcDuctSilencerType::IfcDuctSilencerType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcDuctSilencerTypeEnum::IfcDuctSilencerTypeEnum v10_PredefinedType) : IfcFlowTreatmentDeviceType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcDuctSilencerTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcDuctSilencerType::IfcDuctSilencerType(IfcAbstractEntity* e) : IfcFlowTreatmentDeviceType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcDuctSilencerType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcDuctSilencerType::IfcDuctSilencerType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcDuctSilencerTypeEnum::IfcDuctSilencerTypeEnum v10_PredefinedType) : IfcFlowTreatmentDeviceType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcDuctSilencerTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcEdge
-IfcVertex* IfcEdge::EdgeStart() { return (IfcVertex*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(0))); }
+IfcVertex* IfcEdge::EdgeStart() const { return (IfcVertex*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(0))); }
 void IfcEdge::setEdgeStart(IfcVertex* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-IfcVertex* IfcEdge::EdgeEnd() { return (IfcVertex*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(1))); }
+IfcVertex* IfcEdge::EdgeEnd() const { return (IfcVertex*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(1))); }
 void IfcEdge::setEdgeEnd(IfcVertex* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
 bool IfcEdge::is(Type::Enum v) const { return v == Type::IfcEdge || IfcTopologicalRepresentationItem::is(v); }
 Type::Enum IfcEdge::type() const { return Type::IfcEdge; }
 Type::Enum IfcEdge::Class() { return Type::IfcEdge; }
-IfcEdge::IfcEdge(IfcAbstractEntityPtr e) : IfcTopologicalRepresentationItem((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcEdge)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcEdge::IfcEdge(IfcVertex* v1_EdgeStart, IfcVertex* v2_EdgeEnd) : IfcTopologicalRepresentationItem((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_EdgeStart)); e->setArgument(1,(v2_EdgeEnd)); entity = e; EntityBuffer::Add(this); }
+IfcEdge::IfcEdge(IfcAbstractEntity* e) : IfcTopologicalRepresentationItem((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcEdge)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcEdge::IfcEdge(IfcVertex* v1_EdgeStart, IfcVertex* v2_EdgeEnd) : IfcTopologicalRepresentationItem((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_EdgeStart)); e->setArgument(1,(v2_EdgeEnd)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcEdgeCurve
-IfcCurve* IfcEdgeCurve::EdgeGeometry() { return (IfcCurve*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(2))); }
+IfcCurve* IfcEdgeCurve::EdgeGeometry() const { return (IfcCurve*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(2))); }
 void IfcEdgeCurve::setEdgeGeometry(IfcCurve* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-bool IfcEdgeCurve::SameSense() { return *entity->getArgument(3); }
+bool IfcEdgeCurve::SameSense() const { return *entity->getArgument(3); }
 void IfcEdgeCurve::setSameSense(bool v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
 bool IfcEdgeCurve::is(Type::Enum v) const { return v == Type::IfcEdgeCurve || IfcEdge::is(v); }
 Type::Enum IfcEdgeCurve::type() const { return Type::IfcEdgeCurve; }
 Type::Enum IfcEdgeCurve::Class() { return Type::IfcEdgeCurve; }
-IfcEdgeCurve::IfcEdgeCurve(IfcAbstractEntityPtr e) : IfcEdge((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcEdgeCurve)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcEdgeCurve::IfcEdgeCurve(IfcVertex* v1_EdgeStart, IfcVertex* v2_EdgeEnd, IfcCurve* v3_EdgeGeometry, bool v4_SameSense) : IfcEdge((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_EdgeStart)); e->setArgument(1,(v2_EdgeEnd)); e->setArgument(2,(v3_EdgeGeometry)); e->setArgument(3,(v4_SameSense)); entity = e; EntityBuffer::Add(this); }
+IfcEdgeCurve::IfcEdgeCurve(IfcAbstractEntity* e) : IfcEdge((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcEdgeCurve)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcEdgeCurve::IfcEdgeCurve(IfcVertex* v1_EdgeStart, IfcVertex* v2_EdgeEnd, IfcCurve* v3_EdgeGeometry, bool v4_SameSense) : IfcEdge((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_EdgeStart)); e->setArgument(1,(v2_EdgeEnd)); e->setArgument(2,(v3_EdgeGeometry)); e->setArgument(3,(v4_SameSense)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcEdgeFeature
-bool IfcEdgeFeature::hasFeatureLength() { return !entity->getArgument(8)->isNull(); }
-IfcPositiveLengthMeasure IfcEdgeFeature::FeatureLength() { return *entity->getArgument(8); }
-void IfcEdgeFeature::setFeatureLength(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
+bool IfcEdgeFeature::hasFeatureLength() const { return !entity->getArgument(8)->isNull(); }
+double IfcEdgeFeature::FeatureLength() const { return *entity->getArgument(8); }
+void IfcEdgeFeature::setFeatureLength(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
 bool IfcEdgeFeature::is(Type::Enum v) const { return v == Type::IfcEdgeFeature || IfcFeatureElementSubtraction::is(v); }
 Type::Enum IfcEdgeFeature::type() const { return Type::IfcEdgeFeature; }
 Type::Enum IfcEdgeFeature::Class() { return Type::IfcEdgeFeature; }
-IfcEdgeFeature::IfcEdgeFeature(IfcAbstractEntityPtr e) : IfcFeatureElementSubtraction((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcEdgeFeature)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcEdgeFeature::IfcEdgeFeature(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcPositiveLengthMeasure > v9_FeatureLength) : IfcFeatureElementSubtraction((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_FeatureLength) { e->setArgument(8,(*v9_FeatureLength)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcEdgeFeature::IfcEdgeFeature(IfcAbstractEntity* e) : IfcFeatureElementSubtraction((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcEdgeFeature)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcEdgeFeature::IfcEdgeFeature(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< double > v9_FeatureLength) : IfcFeatureElementSubtraction((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_FeatureLength) { e->setArgument(8,(*v9_FeatureLength)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcEdgeLoop
-SHARED_PTR< IfcTemplatedEntityList< IfcOrientedEdge > > IfcEdgeLoop::EdgeList() { RETURN_AS_LIST(IfcOrientedEdge,0) }
-void IfcEdgeLoop::setEdgeList(SHARED_PTR< IfcTemplatedEntityList< IfcOrientedEdge > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v->generalize()); }
+IfcTemplatedEntityList< IfcOrientedEdge >::ptr IfcEdgeLoop::EdgeList() const { IfcEntityList::ptr es = *entity->getArgument(0); return es->as<IfcOrientedEdge>(); }
+void IfcEdgeLoop::setEdgeList(IfcTemplatedEntityList< IfcOrientedEdge >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v->generalize()); }
 bool IfcEdgeLoop::is(Type::Enum v) const { return v == Type::IfcEdgeLoop || IfcLoop::is(v); }
 Type::Enum IfcEdgeLoop::type() const { return Type::IfcEdgeLoop; }
 Type::Enum IfcEdgeLoop::Class() { return Type::IfcEdgeLoop; }
-IfcEdgeLoop::IfcEdgeLoop(IfcAbstractEntityPtr e) : IfcLoop((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcEdgeLoop)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcEdgeLoop::IfcEdgeLoop(SHARED_PTR< IfcTemplatedEntityList< IfcOrientedEdge > > v1_EdgeList) : IfcLoop((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_EdgeList)->generalize()); entity = e; EntityBuffer::Add(this); }
+IfcEdgeLoop::IfcEdgeLoop(IfcAbstractEntity* e) : IfcLoop((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcEdgeLoop)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcEdgeLoop::IfcEdgeLoop(IfcTemplatedEntityList< IfcOrientedEdge >::ptr v1_EdgeList) : IfcLoop((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_EdgeList)->generalize()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcElectricApplianceType
-IfcElectricApplianceTypeEnum::IfcElectricApplianceTypeEnum IfcElectricApplianceType::PredefinedType() { return IfcElectricApplianceTypeEnum::FromString(*entity->getArgument(9)); }
+IfcElectricApplianceTypeEnum::IfcElectricApplianceTypeEnum IfcElectricApplianceType::PredefinedType() const { return IfcElectricApplianceTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcElectricApplianceType::setPredefinedType(IfcElectricApplianceTypeEnum::IfcElectricApplianceTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcElectricApplianceTypeEnum::ToString(v)); }
 bool IfcElectricApplianceType::is(Type::Enum v) const { return v == Type::IfcElectricApplianceType || IfcFlowTerminalType::is(v); }
 Type::Enum IfcElectricApplianceType::type() const { return Type::IfcElectricApplianceType; }
 Type::Enum IfcElectricApplianceType::Class() { return Type::IfcElectricApplianceType; }
-IfcElectricApplianceType::IfcElectricApplianceType(IfcAbstractEntityPtr e) : IfcFlowTerminalType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcElectricApplianceType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcElectricApplianceType::IfcElectricApplianceType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcElectricApplianceTypeEnum::IfcElectricApplianceTypeEnum v10_PredefinedType) : IfcFlowTerminalType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcElectricApplianceTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcElectricApplianceType::IfcElectricApplianceType(IfcAbstractEntity* e) : IfcFlowTerminalType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcElectricApplianceType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcElectricApplianceType::IfcElectricApplianceType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcElectricApplianceTypeEnum::IfcElectricApplianceTypeEnum v10_PredefinedType) : IfcFlowTerminalType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcElectricApplianceTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcElectricDistributionPoint
-IfcElectricDistributionPointFunctionEnum::IfcElectricDistributionPointFunctionEnum IfcElectricDistributionPoint::DistributionPointFunction() { return IfcElectricDistributionPointFunctionEnum::FromString(*entity->getArgument(8)); }
+IfcElectricDistributionPointFunctionEnum::IfcElectricDistributionPointFunctionEnum IfcElectricDistributionPoint::DistributionPointFunction() const { return IfcElectricDistributionPointFunctionEnum::FromString(*entity->getArgument(8)); }
 void IfcElectricDistributionPoint::setDistributionPointFunction(IfcElectricDistributionPointFunctionEnum::IfcElectricDistributionPointFunctionEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcElectricDistributionPointFunctionEnum::ToString(v)); }
-bool IfcElectricDistributionPoint::hasUserDefinedFunction() { return !entity->getArgument(9)->isNull(); }
-IfcLabel IfcElectricDistributionPoint::UserDefinedFunction() { return *entity->getArgument(9); }
-void IfcElectricDistributionPoint::setUserDefinedFunction(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
+bool IfcElectricDistributionPoint::hasUserDefinedFunction() const { return !entity->getArgument(9)->isNull(); }
+std::string IfcElectricDistributionPoint::UserDefinedFunction() const { return *entity->getArgument(9); }
+void IfcElectricDistributionPoint::setUserDefinedFunction(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
 bool IfcElectricDistributionPoint::is(Type::Enum v) const { return v == Type::IfcElectricDistributionPoint || IfcFlowController::is(v); }
 Type::Enum IfcElectricDistributionPoint::type() const { return Type::IfcElectricDistributionPoint; }
 Type::Enum IfcElectricDistributionPoint::Class() { return Type::IfcElectricDistributionPoint; }
-IfcElectricDistributionPoint::IfcElectricDistributionPoint(IfcAbstractEntityPtr e) : IfcFlowController((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcElectricDistributionPoint)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcElectricDistributionPoint::IfcElectricDistributionPoint(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, IfcElectricDistributionPointFunctionEnum::IfcElectricDistributionPointFunctionEnum v9_DistributionPointFunction, boost::optional< IfcLabel > v10_UserDefinedFunction) : IfcFlowController((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } e->setArgument(8,v9_DistributionPointFunction,IfcElectricDistributionPointFunctionEnum::ToString(v9_DistributionPointFunction)); if (v10_UserDefinedFunction) { e->setArgument(9,(*v10_UserDefinedFunction)); } else { e->setArgument(9); } entity = e; EntityBuffer::Add(this); }
+IfcElectricDistributionPoint::IfcElectricDistributionPoint(IfcAbstractEntity* e) : IfcFlowController((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcElectricDistributionPoint)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcElectricDistributionPoint::IfcElectricDistributionPoint(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, IfcElectricDistributionPointFunctionEnum::IfcElectricDistributionPointFunctionEnum v9_DistributionPointFunction, boost::optional< std::string > v10_UserDefinedFunction) : IfcFlowController((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } e->setArgument(8,v9_DistributionPointFunction,IfcElectricDistributionPointFunctionEnum::ToString(v9_DistributionPointFunction)); if (v10_UserDefinedFunction) { e->setArgument(9,(*v10_UserDefinedFunction)); } else { e->setArgument(9); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcElectricFlowStorageDeviceType
-IfcElectricFlowStorageDeviceTypeEnum::IfcElectricFlowStorageDeviceTypeEnum IfcElectricFlowStorageDeviceType::PredefinedType() { return IfcElectricFlowStorageDeviceTypeEnum::FromString(*entity->getArgument(9)); }
+IfcElectricFlowStorageDeviceTypeEnum::IfcElectricFlowStorageDeviceTypeEnum IfcElectricFlowStorageDeviceType::PredefinedType() const { return IfcElectricFlowStorageDeviceTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcElectricFlowStorageDeviceType::setPredefinedType(IfcElectricFlowStorageDeviceTypeEnum::IfcElectricFlowStorageDeviceTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcElectricFlowStorageDeviceTypeEnum::ToString(v)); }
 bool IfcElectricFlowStorageDeviceType::is(Type::Enum v) const { return v == Type::IfcElectricFlowStorageDeviceType || IfcFlowStorageDeviceType::is(v); }
 Type::Enum IfcElectricFlowStorageDeviceType::type() const { return Type::IfcElectricFlowStorageDeviceType; }
 Type::Enum IfcElectricFlowStorageDeviceType::Class() { return Type::IfcElectricFlowStorageDeviceType; }
-IfcElectricFlowStorageDeviceType::IfcElectricFlowStorageDeviceType(IfcAbstractEntityPtr e) : IfcFlowStorageDeviceType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcElectricFlowStorageDeviceType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcElectricFlowStorageDeviceType::IfcElectricFlowStorageDeviceType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcElectricFlowStorageDeviceTypeEnum::IfcElectricFlowStorageDeviceTypeEnum v10_PredefinedType) : IfcFlowStorageDeviceType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcElectricFlowStorageDeviceTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcElectricFlowStorageDeviceType::IfcElectricFlowStorageDeviceType(IfcAbstractEntity* e) : IfcFlowStorageDeviceType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcElectricFlowStorageDeviceType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcElectricFlowStorageDeviceType::IfcElectricFlowStorageDeviceType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcElectricFlowStorageDeviceTypeEnum::IfcElectricFlowStorageDeviceTypeEnum v10_PredefinedType) : IfcFlowStorageDeviceType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcElectricFlowStorageDeviceTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcElectricGeneratorType
-IfcElectricGeneratorTypeEnum::IfcElectricGeneratorTypeEnum IfcElectricGeneratorType::PredefinedType() { return IfcElectricGeneratorTypeEnum::FromString(*entity->getArgument(9)); }
+IfcElectricGeneratorTypeEnum::IfcElectricGeneratorTypeEnum IfcElectricGeneratorType::PredefinedType() const { return IfcElectricGeneratorTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcElectricGeneratorType::setPredefinedType(IfcElectricGeneratorTypeEnum::IfcElectricGeneratorTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcElectricGeneratorTypeEnum::ToString(v)); }
 bool IfcElectricGeneratorType::is(Type::Enum v) const { return v == Type::IfcElectricGeneratorType || IfcEnergyConversionDeviceType::is(v); }
 Type::Enum IfcElectricGeneratorType::type() const { return Type::IfcElectricGeneratorType; }
 Type::Enum IfcElectricGeneratorType::Class() { return Type::IfcElectricGeneratorType; }
-IfcElectricGeneratorType::IfcElectricGeneratorType(IfcAbstractEntityPtr e) : IfcEnergyConversionDeviceType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcElectricGeneratorType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcElectricGeneratorType::IfcElectricGeneratorType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcElectricGeneratorTypeEnum::IfcElectricGeneratorTypeEnum v10_PredefinedType) : IfcEnergyConversionDeviceType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcElectricGeneratorTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcElectricGeneratorType::IfcElectricGeneratorType(IfcAbstractEntity* e) : IfcEnergyConversionDeviceType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcElectricGeneratorType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcElectricGeneratorType::IfcElectricGeneratorType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcElectricGeneratorTypeEnum::IfcElectricGeneratorTypeEnum v10_PredefinedType) : IfcEnergyConversionDeviceType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcElectricGeneratorTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcElectricHeaterType
-IfcElectricHeaterTypeEnum::IfcElectricHeaterTypeEnum IfcElectricHeaterType::PredefinedType() { return IfcElectricHeaterTypeEnum::FromString(*entity->getArgument(9)); }
+IfcElectricHeaterTypeEnum::IfcElectricHeaterTypeEnum IfcElectricHeaterType::PredefinedType() const { return IfcElectricHeaterTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcElectricHeaterType::setPredefinedType(IfcElectricHeaterTypeEnum::IfcElectricHeaterTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcElectricHeaterTypeEnum::ToString(v)); }
 bool IfcElectricHeaterType::is(Type::Enum v) const { return v == Type::IfcElectricHeaterType || IfcFlowTerminalType::is(v); }
 Type::Enum IfcElectricHeaterType::type() const { return Type::IfcElectricHeaterType; }
 Type::Enum IfcElectricHeaterType::Class() { return Type::IfcElectricHeaterType; }
-IfcElectricHeaterType::IfcElectricHeaterType(IfcAbstractEntityPtr e) : IfcFlowTerminalType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcElectricHeaterType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcElectricHeaterType::IfcElectricHeaterType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcElectricHeaterTypeEnum::IfcElectricHeaterTypeEnum v10_PredefinedType) : IfcFlowTerminalType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcElectricHeaterTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcElectricHeaterType::IfcElectricHeaterType(IfcAbstractEntity* e) : IfcFlowTerminalType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcElectricHeaterType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcElectricHeaterType::IfcElectricHeaterType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcElectricHeaterTypeEnum::IfcElectricHeaterTypeEnum v10_PredefinedType) : IfcFlowTerminalType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcElectricHeaterTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcElectricMotorType
-IfcElectricMotorTypeEnum::IfcElectricMotorTypeEnum IfcElectricMotorType::PredefinedType() { return IfcElectricMotorTypeEnum::FromString(*entity->getArgument(9)); }
+IfcElectricMotorTypeEnum::IfcElectricMotorTypeEnum IfcElectricMotorType::PredefinedType() const { return IfcElectricMotorTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcElectricMotorType::setPredefinedType(IfcElectricMotorTypeEnum::IfcElectricMotorTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcElectricMotorTypeEnum::ToString(v)); }
 bool IfcElectricMotorType::is(Type::Enum v) const { return v == Type::IfcElectricMotorType || IfcEnergyConversionDeviceType::is(v); }
 Type::Enum IfcElectricMotorType::type() const { return Type::IfcElectricMotorType; }
 Type::Enum IfcElectricMotorType::Class() { return Type::IfcElectricMotorType; }
-IfcElectricMotorType::IfcElectricMotorType(IfcAbstractEntityPtr e) : IfcEnergyConversionDeviceType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcElectricMotorType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcElectricMotorType::IfcElectricMotorType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcElectricMotorTypeEnum::IfcElectricMotorTypeEnum v10_PredefinedType) : IfcEnergyConversionDeviceType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcElectricMotorTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcElectricMotorType::IfcElectricMotorType(IfcAbstractEntity* e) : IfcEnergyConversionDeviceType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcElectricMotorType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcElectricMotorType::IfcElectricMotorType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcElectricMotorTypeEnum::IfcElectricMotorTypeEnum v10_PredefinedType) : IfcEnergyConversionDeviceType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcElectricMotorTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcElectricTimeControlType
-IfcElectricTimeControlTypeEnum::IfcElectricTimeControlTypeEnum IfcElectricTimeControlType::PredefinedType() { return IfcElectricTimeControlTypeEnum::FromString(*entity->getArgument(9)); }
+IfcElectricTimeControlTypeEnum::IfcElectricTimeControlTypeEnum IfcElectricTimeControlType::PredefinedType() const { return IfcElectricTimeControlTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcElectricTimeControlType::setPredefinedType(IfcElectricTimeControlTypeEnum::IfcElectricTimeControlTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcElectricTimeControlTypeEnum::ToString(v)); }
 bool IfcElectricTimeControlType::is(Type::Enum v) const { return v == Type::IfcElectricTimeControlType || IfcFlowControllerType::is(v); }
 Type::Enum IfcElectricTimeControlType::type() const { return Type::IfcElectricTimeControlType; }
 Type::Enum IfcElectricTimeControlType::Class() { return Type::IfcElectricTimeControlType; }
-IfcElectricTimeControlType::IfcElectricTimeControlType(IfcAbstractEntityPtr e) : IfcFlowControllerType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcElectricTimeControlType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcElectricTimeControlType::IfcElectricTimeControlType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcElectricTimeControlTypeEnum::IfcElectricTimeControlTypeEnum v10_PredefinedType) : IfcFlowControllerType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcElectricTimeControlTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcElectricTimeControlType::IfcElectricTimeControlType(IfcAbstractEntity* e) : IfcFlowControllerType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcElectricTimeControlType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcElectricTimeControlType::IfcElectricTimeControlType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcElectricTimeControlTypeEnum::IfcElectricTimeControlTypeEnum v10_PredefinedType) : IfcFlowControllerType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcElectricTimeControlTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcElectricalBaseProperties
-bool IfcElectricalBaseProperties::hasElectricCurrentType() { return !entity->getArgument(6)->isNull(); }
-IfcElectricCurrentEnum::IfcElectricCurrentEnum IfcElectricalBaseProperties::ElectricCurrentType() { return IfcElectricCurrentEnum::FromString(*entity->getArgument(6)); }
+bool IfcElectricalBaseProperties::hasElectricCurrentType() const { return !entity->getArgument(6)->isNull(); }
+IfcElectricCurrentEnum::IfcElectricCurrentEnum IfcElectricalBaseProperties::ElectricCurrentType() const { return IfcElectricCurrentEnum::FromString(*entity->getArgument(6)); }
 void IfcElectricalBaseProperties::setElectricCurrentType(IfcElectricCurrentEnum::IfcElectricCurrentEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v,IfcElectricCurrentEnum::ToString(v)); }
-IfcElectricVoltageMeasure IfcElectricalBaseProperties::InputVoltage() { return *entity->getArgument(7); }
-void IfcElectricalBaseProperties::setInputVoltage(IfcElectricVoltageMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
-IfcFrequencyMeasure IfcElectricalBaseProperties::InputFrequency() { return *entity->getArgument(8); }
-void IfcElectricalBaseProperties::setInputFrequency(IfcFrequencyMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
-bool IfcElectricalBaseProperties::hasFullLoadCurrent() { return !entity->getArgument(9)->isNull(); }
-IfcElectricCurrentMeasure IfcElectricalBaseProperties::FullLoadCurrent() { return *entity->getArgument(9); }
-void IfcElectricalBaseProperties::setFullLoadCurrent(IfcElectricCurrentMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
-bool IfcElectricalBaseProperties::hasMinimumCircuitCurrent() { return !entity->getArgument(10)->isNull(); }
-IfcElectricCurrentMeasure IfcElectricalBaseProperties::MinimumCircuitCurrent() { return *entity->getArgument(10); }
-void IfcElectricalBaseProperties::setMinimumCircuitCurrent(IfcElectricCurrentMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
-bool IfcElectricalBaseProperties::hasMaximumPowerInput() { return !entity->getArgument(11)->isNull(); }
-IfcPowerMeasure IfcElectricalBaseProperties::MaximumPowerInput() { return *entity->getArgument(11); }
-void IfcElectricalBaseProperties::setMaximumPowerInput(IfcPowerMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(11,v); }
-bool IfcElectricalBaseProperties::hasRatedPowerInput() { return !entity->getArgument(12)->isNull(); }
-IfcPowerMeasure IfcElectricalBaseProperties::RatedPowerInput() { return *entity->getArgument(12); }
-void IfcElectricalBaseProperties::setRatedPowerInput(IfcPowerMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(12,v); }
-int IfcElectricalBaseProperties::InputPhase() { return *entity->getArgument(13); }
+double IfcElectricalBaseProperties::InputVoltage() const { return *entity->getArgument(7); }
+void IfcElectricalBaseProperties::setInputVoltage(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
+double IfcElectricalBaseProperties::InputFrequency() const { return *entity->getArgument(8); }
+void IfcElectricalBaseProperties::setInputFrequency(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
+bool IfcElectricalBaseProperties::hasFullLoadCurrent() const { return !entity->getArgument(9)->isNull(); }
+double IfcElectricalBaseProperties::FullLoadCurrent() const { return *entity->getArgument(9); }
+void IfcElectricalBaseProperties::setFullLoadCurrent(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
+bool IfcElectricalBaseProperties::hasMinimumCircuitCurrent() const { return !entity->getArgument(10)->isNull(); }
+double IfcElectricalBaseProperties::MinimumCircuitCurrent() const { return *entity->getArgument(10); }
+void IfcElectricalBaseProperties::setMinimumCircuitCurrent(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
+bool IfcElectricalBaseProperties::hasMaximumPowerInput() const { return !entity->getArgument(11)->isNull(); }
+double IfcElectricalBaseProperties::MaximumPowerInput() const { return *entity->getArgument(11); }
+void IfcElectricalBaseProperties::setMaximumPowerInput(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(11,v); }
+bool IfcElectricalBaseProperties::hasRatedPowerInput() const { return !entity->getArgument(12)->isNull(); }
+double IfcElectricalBaseProperties::RatedPowerInput() const { return *entity->getArgument(12); }
+void IfcElectricalBaseProperties::setRatedPowerInput(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(12,v); }
+int IfcElectricalBaseProperties::InputPhase() const { return *entity->getArgument(13); }
 void IfcElectricalBaseProperties::setInputPhase(int v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(13,v); }
 bool IfcElectricalBaseProperties::is(Type::Enum v) const { return v == Type::IfcElectricalBaseProperties || IfcEnergyProperties::is(v); }
 Type::Enum IfcElectricalBaseProperties::type() const { return Type::IfcElectricalBaseProperties; }
 Type::Enum IfcElectricalBaseProperties::Class() { return Type::IfcElectricalBaseProperties; }
-IfcElectricalBaseProperties::IfcElectricalBaseProperties(IfcAbstractEntityPtr e) : IfcEnergyProperties((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcElectricalBaseProperties)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcElectricalBaseProperties::IfcElectricalBaseProperties(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcEnergySequenceEnum::IfcEnergySequenceEnum > v5_EnergySequence, boost::optional< IfcLabel > v6_UserDefinedEnergySequence, boost::optional< IfcElectricCurrentEnum::IfcElectricCurrentEnum > v7_ElectricCurrentType, IfcElectricVoltageMeasure v8_InputVoltage, IfcFrequencyMeasure v9_InputFrequency, boost::optional< IfcElectricCurrentMeasure > v10_FullLoadCurrent, boost::optional< IfcElectricCurrentMeasure > v11_MinimumCircuitCurrent, boost::optional< IfcPowerMeasure > v12_MaximumPowerInput, boost::optional< IfcPowerMeasure > v13_RatedPowerInput, int v14_InputPhase) : IfcEnergyProperties((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_EnergySequence) { e->setArgument(4,*v5_EnergySequence,IfcEnergySequenceEnum::ToString(*v5_EnergySequence)); } else { e->setArgument(4); } if (v6_UserDefinedEnergySequence) { e->setArgument(5,(*v6_UserDefinedEnergySequence)); } else { e->setArgument(5); } if (v7_ElectricCurrentType) { e->setArgument(6,*v7_ElectricCurrentType,IfcElectricCurrentEnum::ToString(*v7_ElectricCurrentType)); } else { e->setArgument(6); } e->setArgument(7,(v8_InputVoltage)); e->setArgument(8,(v9_InputFrequency)); if (v10_FullLoadCurrent) { e->setArgument(9,(*v10_FullLoadCurrent)); } else { e->setArgument(9); } if (v11_MinimumCircuitCurrent) { e->setArgument(10,(*v11_MinimumCircuitCurrent)); } else { e->setArgument(10); } if (v12_MaximumPowerInput) { e->setArgument(11,(*v12_MaximumPowerInput)); } else { e->setArgument(11); } if (v13_RatedPowerInput) { e->setArgument(12,(*v13_RatedPowerInput)); } else { e->setArgument(12); } e->setArgument(13,(v14_InputPhase)); entity = e; EntityBuffer::Add(this); }
+IfcElectricalBaseProperties::IfcElectricalBaseProperties(IfcAbstractEntity* e) : IfcEnergyProperties((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcElectricalBaseProperties)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcElectricalBaseProperties::IfcElectricalBaseProperties(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< IfcEnergySequenceEnum::IfcEnergySequenceEnum > v5_EnergySequence, boost::optional< std::string > v6_UserDefinedEnergySequence, boost::optional< IfcElectricCurrentEnum::IfcElectricCurrentEnum > v7_ElectricCurrentType, double v8_InputVoltage, double v9_InputFrequency, boost::optional< double > v10_FullLoadCurrent, boost::optional< double > v11_MinimumCircuitCurrent, boost::optional< double > v12_MaximumPowerInput, boost::optional< double > v13_RatedPowerInput, int v14_InputPhase) : IfcEnergyProperties((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_EnergySequence) { e->setArgument(4,*v5_EnergySequence,IfcEnergySequenceEnum::ToString(*v5_EnergySequence)); } else { e->setArgument(4); } if (v6_UserDefinedEnergySequence) { e->setArgument(5,(*v6_UserDefinedEnergySequence)); } else { e->setArgument(5); } if (v7_ElectricCurrentType) { e->setArgument(6,*v7_ElectricCurrentType,IfcElectricCurrentEnum::ToString(*v7_ElectricCurrentType)); } else { e->setArgument(6); } e->setArgument(7,(v8_InputVoltage)); e->setArgument(8,(v9_InputFrequency)); if (v10_FullLoadCurrent) { e->setArgument(9,(*v10_FullLoadCurrent)); } else { e->setArgument(9); } if (v11_MinimumCircuitCurrent) { e->setArgument(10,(*v11_MinimumCircuitCurrent)); } else { e->setArgument(10); } if (v12_MaximumPowerInput) { e->setArgument(11,(*v12_MaximumPowerInput)); } else { e->setArgument(11); } if (v13_RatedPowerInput) { e->setArgument(12,(*v13_RatedPowerInput)); } else { e->setArgument(12); } e->setArgument(13,(v14_InputPhase)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcElectricalCircuit
 bool IfcElectricalCircuit::is(Type::Enum v) const { return v == Type::IfcElectricalCircuit || IfcSystem::is(v); }
 Type::Enum IfcElectricalCircuit::type() const { return Type::IfcElectricalCircuit; }
 Type::Enum IfcElectricalCircuit::Class() { return Type::IfcElectricalCircuit; }
-IfcElectricalCircuit::IfcElectricalCircuit(IfcAbstractEntityPtr e) : IfcSystem((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcElectricalCircuit)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcElectricalCircuit::IfcElectricalCircuit(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType) : IfcSystem((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } entity = e; EntityBuffer::Add(this); }
+IfcElectricalCircuit::IfcElectricalCircuit(IfcAbstractEntity* e) : IfcSystem((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcElectricalCircuit)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcElectricalCircuit::IfcElectricalCircuit(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType) : IfcSystem((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcElectricalElement
 bool IfcElectricalElement::is(Type::Enum v) const { return v == Type::IfcElectricalElement || IfcElement::is(v); }
 Type::Enum IfcElectricalElement::type() const { return Type::IfcElectricalElement; }
 Type::Enum IfcElectricalElement::Class() { return Type::IfcElectricalElement; }
-IfcElectricalElement::IfcElectricalElement(IfcAbstractEntityPtr e) : IfcElement((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcElectricalElement)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcElectricalElement::IfcElectricalElement(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag) : IfcElement((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
+IfcElectricalElement::IfcElectricalElement(IfcAbstractEntity* e) : IfcElement((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcElectricalElement)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcElectricalElement::IfcElectricalElement(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag) : IfcElement((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcElement
-bool IfcElement::hasTag() { return !entity->getArgument(7)->isNull(); }
-IfcIdentifier IfcElement::Tag() { return *entity->getArgument(7); }
-void IfcElement::setTag(IfcIdentifier v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
-IfcRelConnectsStructuralElement::list IfcElement::HasStructuralMember() { RETURN_INVERSE(IfcRelConnectsStructuralElement) }
-IfcRelFillsElement::list IfcElement::FillsVoids() { RETURN_INVERSE(IfcRelFillsElement) }
-IfcRelConnectsElements::list IfcElement::ConnectedTo() { RETURN_INVERSE(IfcRelConnectsElements) }
-IfcRelCoversBldgElements::list IfcElement::HasCoverings() { RETURN_INVERSE(IfcRelCoversBldgElements) }
-IfcRelProjectsElement::list IfcElement::HasProjections() { RETURN_INVERSE(IfcRelProjectsElement) }
-IfcRelReferencedInSpatialStructure::list IfcElement::ReferencedInStructures() { RETURN_INVERSE(IfcRelReferencedInSpatialStructure) }
-IfcRelConnectsPortToElement::list IfcElement::HasPorts() { RETURN_INVERSE(IfcRelConnectsPortToElement) }
-IfcRelVoidsElement::list IfcElement::HasOpenings() { RETURN_INVERSE(IfcRelVoidsElement) }
-IfcRelConnectsWithRealizingElements::list IfcElement::IsConnectionRealization() { RETURN_INVERSE(IfcRelConnectsWithRealizingElements) }
-IfcRelSpaceBoundary::list IfcElement::ProvidesBoundaries() { RETURN_INVERSE(IfcRelSpaceBoundary) }
-IfcRelConnectsElements::list IfcElement::ConnectedFrom() { RETURN_INVERSE(IfcRelConnectsElements) }
-IfcRelContainedInSpatialStructure::list IfcElement::ContainedInStructure() { RETURN_INVERSE(IfcRelContainedInSpatialStructure) }
+bool IfcElement::hasTag() const { return !entity->getArgument(7)->isNull(); }
+std::string IfcElement::Tag() const { return *entity->getArgument(7); }
+void IfcElement::setTag(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
+IfcRelConnectsStructuralElement::list::ptr IfcElement::HasStructuralMember() const { return entity->getInverse(Type::IfcRelConnectsStructuralElement, 4)->as<IfcRelConnectsStructuralElement>(); }
+IfcRelFillsElement::list::ptr IfcElement::FillsVoids() const { return entity->getInverse(Type::IfcRelFillsElement, 5)->as<IfcRelFillsElement>(); }
+IfcRelConnectsElements::list::ptr IfcElement::ConnectedTo() const { return entity->getInverse(Type::IfcRelConnectsElements, 5)->as<IfcRelConnectsElements>(); }
+IfcRelCoversBldgElements::list::ptr IfcElement::HasCoverings() const { return entity->getInverse(Type::IfcRelCoversBldgElements, 4)->as<IfcRelCoversBldgElements>(); }
+IfcRelProjectsElement::list::ptr IfcElement::HasProjections() const { return entity->getInverse(Type::IfcRelProjectsElement, 4)->as<IfcRelProjectsElement>(); }
+IfcRelReferencedInSpatialStructure::list::ptr IfcElement::ReferencedInStructures() const { return entity->getInverse(Type::IfcRelReferencedInSpatialStructure, 4)->as<IfcRelReferencedInSpatialStructure>(); }
+IfcRelConnectsPortToElement::list::ptr IfcElement::HasPorts() const { return entity->getInverse(Type::IfcRelConnectsPortToElement, 5)->as<IfcRelConnectsPortToElement>(); }
+IfcRelVoidsElement::list::ptr IfcElement::HasOpenings() const { return entity->getInverse(Type::IfcRelVoidsElement, 4)->as<IfcRelVoidsElement>(); }
+IfcRelConnectsWithRealizingElements::list::ptr IfcElement::IsConnectionRealization() const { return entity->getInverse(Type::IfcRelConnectsWithRealizingElements, 7)->as<IfcRelConnectsWithRealizingElements>(); }
+IfcRelSpaceBoundary::list::ptr IfcElement::ProvidesBoundaries() const { return entity->getInverse(Type::IfcRelSpaceBoundary, 5)->as<IfcRelSpaceBoundary>(); }
+IfcRelConnectsElements::list::ptr IfcElement::ConnectedFrom() const { return entity->getInverse(Type::IfcRelConnectsElements, 6)->as<IfcRelConnectsElements>(); }
+IfcRelContainedInSpatialStructure::list::ptr IfcElement::ContainedInStructure() const { return entity->getInverse(Type::IfcRelContainedInSpatialStructure, 4)->as<IfcRelContainedInSpatialStructure>(); }
 bool IfcElement::is(Type::Enum v) const { return v == Type::IfcElement || IfcProduct::is(v); }
 Type::Enum IfcElement::type() const { return Type::IfcElement; }
 Type::Enum IfcElement::Class() { return Type::IfcElement; }
-IfcElement::IfcElement(IfcAbstractEntityPtr e) : IfcProduct((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcElement)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcElement::IfcElement(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag) : IfcProduct((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
+IfcElement::IfcElement(IfcAbstractEntity* e) : IfcProduct((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcElement)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcElement::IfcElement(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag) : IfcProduct((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcElementAssembly
-bool IfcElementAssembly::hasAssemblyPlace() { return !entity->getArgument(8)->isNull(); }
-IfcAssemblyPlaceEnum::IfcAssemblyPlaceEnum IfcElementAssembly::AssemblyPlace() { return IfcAssemblyPlaceEnum::FromString(*entity->getArgument(8)); }
+bool IfcElementAssembly::hasAssemblyPlace() const { return !entity->getArgument(8)->isNull(); }
+IfcAssemblyPlaceEnum::IfcAssemblyPlaceEnum IfcElementAssembly::AssemblyPlace() const { return IfcAssemblyPlaceEnum::FromString(*entity->getArgument(8)); }
 void IfcElementAssembly::setAssemblyPlace(IfcAssemblyPlaceEnum::IfcAssemblyPlaceEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcAssemblyPlaceEnum::ToString(v)); }
-IfcElementAssemblyTypeEnum::IfcElementAssemblyTypeEnum IfcElementAssembly::PredefinedType() { return IfcElementAssemblyTypeEnum::FromString(*entity->getArgument(9)); }
+IfcElementAssemblyTypeEnum::IfcElementAssemblyTypeEnum IfcElementAssembly::PredefinedType() const { return IfcElementAssemblyTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcElementAssembly::setPredefinedType(IfcElementAssemblyTypeEnum::IfcElementAssemblyTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcElementAssemblyTypeEnum::ToString(v)); }
 bool IfcElementAssembly::is(Type::Enum v) const { return v == Type::IfcElementAssembly || IfcElement::is(v); }
 Type::Enum IfcElementAssembly::type() const { return Type::IfcElementAssembly; }
 Type::Enum IfcElementAssembly::Class() { return Type::IfcElementAssembly; }
-IfcElementAssembly::IfcElementAssembly(IfcAbstractEntityPtr e) : IfcElement((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcElementAssembly)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcElementAssembly::IfcElementAssembly(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcAssemblyPlaceEnum::IfcAssemblyPlaceEnum > v9_AssemblyPlace, IfcElementAssemblyTypeEnum::IfcElementAssemblyTypeEnum v10_PredefinedType) : IfcElement((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_AssemblyPlace) { e->setArgument(8,*v9_AssemblyPlace,IfcAssemblyPlaceEnum::ToString(*v9_AssemblyPlace)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcElementAssemblyTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcElementAssembly::IfcElementAssembly(IfcAbstractEntity* e) : IfcElement((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcElementAssembly)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcElementAssembly::IfcElementAssembly(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcAssemblyPlaceEnum::IfcAssemblyPlaceEnum > v9_AssemblyPlace, IfcElementAssemblyTypeEnum::IfcElementAssemblyTypeEnum v10_PredefinedType) : IfcElement((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_AssemblyPlace) { e->setArgument(8,*v9_AssemblyPlace,IfcAssemblyPlaceEnum::ToString(*v9_AssemblyPlace)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcElementAssemblyTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcElementComponent
 bool IfcElementComponent::is(Type::Enum v) const { return v == Type::IfcElementComponent || IfcElement::is(v); }
 Type::Enum IfcElementComponent::type() const { return Type::IfcElementComponent; }
 Type::Enum IfcElementComponent::Class() { return Type::IfcElementComponent; }
-IfcElementComponent::IfcElementComponent(IfcAbstractEntityPtr e) : IfcElement((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcElementComponent)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcElementComponent::IfcElementComponent(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag) : IfcElement((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
+IfcElementComponent::IfcElementComponent(IfcAbstractEntity* e) : IfcElement((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcElementComponent)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcElementComponent::IfcElementComponent(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag) : IfcElement((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcElementComponentType
 bool IfcElementComponentType::is(Type::Enum v) const { return v == Type::IfcElementComponentType || IfcElementType::is(v); }
 Type::Enum IfcElementComponentType::type() const { return Type::IfcElementComponentType; }
 Type::Enum IfcElementComponentType::Class() { return Type::IfcElementComponentType; }
-IfcElementComponentType::IfcElementComponentType(IfcAbstractEntityPtr e) : IfcElementType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcElementComponentType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcElementComponentType::IfcElementComponentType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType) : IfcElementType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcElementComponentType::IfcElementComponentType(IfcAbstractEntity* e) : IfcElementType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcElementComponentType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcElementComponentType::IfcElementComponentType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType) : IfcElementType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcElementQuantity
-bool IfcElementQuantity::hasMethodOfMeasurement() { return !entity->getArgument(4)->isNull(); }
-IfcLabel IfcElementQuantity::MethodOfMeasurement() { return *entity->getArgument(4); }
-void IfcElementQuantity::setMethodOfMeasurement(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-SHARED_PTR< IfcTemplatedEntityList< IfcPhysicalQuantity > > IfcElementQuantity::Quantities() { RETURN_AS_LIST(IfcPhysicalQuantity,5) }
-void IfcElementQuantity::setQuantities(SHARED_PTR< IfcTemplatedEntityList< IfcPhysicalQuantity > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v->generalize()); }
+bool IfcElementQuantity::hasMethodOfMeasurement() const { return !entity->getArgument(4)->isNull(); }
+std::string IfcElementQuantity::MethodOfMeasurement() const { return *entity->getArgument(4); }
+void IfcElementQuantity::setMethodOfMeasurement(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+IfcTemplatedEntityList< IfcPhysicalQuantity >::ptr IfcElementQuantity::Quantities() const { IfcEntityList::ptr es = *entity->getArgument(5); return es->as<IfcPhysicalQuantity>(); }
+void IfcElementQuantity::setQuantities(IfcTemplatedEntityList< IfcPhysicalQuantity >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v->generalize()); }
 bool IfcElementQuantity::is(Type::Enum v) const { return v == Type::IfcElementQuantity || IfcPropertySetDefinition::is(v); }
 Type::Enum IfcElementQuantity::type() const { return Type::IfcElementQuantity; }
 Type::Enum IfcElementQuantity::Class() { return Type::IfcElementQuantity; }
-IfcElementQuantity::IfcElementQuantity(IfcAbstractEntityPtr e) : IfcPropertySetDefinition((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcElementQuantity)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcElementQuantity::IfcElementQuantity(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_MethodOfMeasurement, SHARED_PTR< IfcTemplatedEntityList< IfcPhysicalQuantity > > v6_Quantities) : IfcPropertySetDefinition((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_MethodOfMeasurement) { e->setArgument(4,(*v5_MethodOfMeasurement)); } else { e->setArgument(4); } e->setArgument(5,(v6_Quantities)->generalize()); entity = e; EntityBuffer::Add(this); }
+IfcElementQuantity::IfcElementQuantity(IfcAbstractEntity* e) : IfcPropertySetDefinition((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcElementQuantity)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcElementQuantity::IfcElementQuantity(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_MethodOfMeasurement, IfcTemplatedEntityList< IfcPhysicalQuantity >::ptr v6_Quantities) : IfcPropertySetDefinition((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_MethodOfMeasurement) { e->setArgument(4,(*v5_MethodOfMeasurement)); } else { e->setArgument(4); } e->setArgument(5,(v6_Quantities)->generalize()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcElementType
-bool IfcElementType::hasElementType() { return !entity->getArgument(8)->isNull(); }
-IfcLabel IfcElementType::ElementType() { return *entity->getArgument(8); }
-void IfcElementType::setElementType(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
+bool IfcElementType::hasElementType() const { return !entity->getArgument(8)->isNull(); }
+std::string IfcElementType::ElementType() const { return *entity->getArgument(8); }
+void IfcElementType::setElementType(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
 bool IfcElementType::is(Type::Enum v) const { return v == Type::IfcElementType || IfcTypeProduct::is(v); }
 Type::Enum IfcElementType::type() const { return Type::IfcElementType; }
 Type::Enum IfcElementType::Class() { return Type::IfcElementType; }
-IfcElementType::IfcElementType(IfcAbstractEntityPtr e) : IfcTypeProduct((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcElementType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcElementType::IfcElementType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType) : IfcTypeProduct((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcElementType::IfcElementType(IfcAbstractEntity* e) : IfcTypeProduct((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcElementType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcElementType::IfcElementType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType) : IfcTypeProduct((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcElementarySurface
-IfcAxis2Placement3D* IfcElementarySurface::Position() { return (IfcAxis2Placement3D*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(0))); }
+IfcAxis2Placement3D* IfcElementarySurface::Position() const { return (IfcAxis2Placement3D*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(0))); }
 void IfcElementarySurface::setPosition(IfcAxis2Placement3D* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
 bool IfcElementarySurface::is(Type::Enum v) const { return v == Type::IfcElementarySurface || IfcSurface::is(v); }
 Type::Enum IfcElementarySurface::type() const { return Type::IfcElementarySurface; }
 Type::Enum IfcElementarySurface::Class() { return Type::IfcElementarySurface; }
-IfcElementarySurface::IfcElementarySurface(IfcAbstractEntityPtr e) : IfcSurface((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcElementarySurface)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcElementarySurface::IfcElementarySurface(IfcAxis2Placement3D* v1_Position) : IfcSurface((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Position)); entity = e; EntityBuffer::Add(this); }
+IfcElementarySurface::IfcElementarySurface(IfcAbstractEntity* e) : IfcSurface((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcElementarySurface)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcElementarySurface::IfcElementarySurface(IfcAxis2Placement3D* v1_Position) : IfcSurface((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Position)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcEllipse
-IfcPositiveLengthMeasure IfcEllipse::SemiAxis1() { return *entity->getArgument(1); }
-void IfcEllipse::setSemiAxis1(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-IfcPositiveLengthMeasure IfcEllipse::SemiAxis2() { return *entity->getArgument(2); }
-void IfcEllipse::setSemiAxis2(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+double IfcEllipse::SemiAxis1() const { return *entity->getArgument(1); }
+void IfcEllipse::setSemiAxis1(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+double IfcEllipse::SemiAxis2() const { return *entity->getArgument(2); }
+void IfcEllipse::setSemiAxis2(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
 bool IfcEllipse::is(Type::Enum v) const { return v == Type::IfcEllipse || IfcConic::is(v); }
 Type::Enum IfcEllipse::type() const { return Type::IfcEllipse; }
 Type::Enum IfcEllipse::Class() { return Type::IfcEllipse; }
-IfcEllipse::IfcEllipse(IfcAbstractEntityPtr e) : IfcConic((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcEllipse)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcEllipse::IfcEllipse(IfcAxis2Placement v1_Position, IfcPositiveLengthMeasure v2_SemiAxis1, IfcPositiveLengthMeasure v3_SemiAxis2) : IfcConic((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Position)); e->setArgument(1,(v2_SemiAxis1)); e->setArgument(2,(v3_SemiAxis2)); entity = e; EntityBuffer::Add(this); }
+IfcEllipse::IfcEllipse(IfcAbstractEntity* e) : IfcConic((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcEllipse)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcEllipse::IfcEllipse(IfcAxis2Placement* v1_Position, double v2_SemiAxis1, double v3_SemiAxis2) : IfcConic((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Position)); e->setArgument(1,(v2_SemiAxis1)); e->setArgument(2,(v3_SemiAxis2)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcEllipseProfileDef
-IfcPositiveLengthMeasure IfcEllipseProfileDef::SemiAxis1() { return *entity->getArgument(3); }
-void IfcEllipseProfileDef::setSemiAxis1(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-IfcPositiveLengthMeasure IfcEllipseProfileDef::SemiAxis2() { return *entity->getArgument(4); }
-void IfcEllipseProfileDef::setSemiAxis2(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+double IfcEllipseProfileDef::SemiAxis1() const { return *entity->getArgument(3); }
+void IfcEllipseProfileDef::setSemiAxis1(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+double IfcEllipseProfileDef::SemiAxis2() const { return *entity->getArgument(4); }
+void IfcEllipseProfileDef::setSemiAxis2(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
 bool IfcEllipseProfileDef::is(Type::Enum v) const { return v == Type::IfcEllipseProfileDef || IfcParameterizedProfileDef::is(v); }
 Type::Enum IfcEllipseProfileDef::type() const { return Type::IfcEllipseProfileDef; }
 Type::Enum IfcEllipseProfileDef::Class() { return Type::IfcEllipseProfileDef; }
-IfcEllipseProfileDef::IfcEllipseProfileDef(IfcAbstractEntityPtr e) : IfcParameterizedProfileDef((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcEllipseProfileDef)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcEllipseProfileDef::IfcEllipseProfileDef(IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< IfcLabel > v2_ProfileName, IfcAxis2Placement2D* v3_Position, IfcPositiveLengthMeasure v4_SemiAxis1, IfcPositiveLengthMeasure v5_SemiAxis2) : IfcParameterizedProfileDef((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,v1_ProfileType,IfcProfileTypeEnum::ToString(v1_ProfileType)); if (v2_ProfileName) { e->setArgument(1,(*v2_ProfileName)); } else { e->setArgument(1); } e->setArgument(2,(v3_Position)); e->setArgument(3,(v4_SemiAxis1)); e->setArgument(4,(v5_SemiAxis2)); entity = e; EntityBuffer::Add(this); }
+IfcEllipseProfileDef::IfcEllipseProfileDef(IfcAbstractEntity* e) : IfcParameterizedProfileDef((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcEllipseProfileDef)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcEllipseProfileDef::IfcEllipseProfileDef(IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< std::string > v2_ProfileName, IfcAxis2Placement2D* v3_Position, double v4_SemiAxis1, double v5_SemiAxis2) : IfcParameterizedProfileDef((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,v1_ProfileType,IfcProfileTypeEnum::ToString(v1_ProfileType)); if (v2_ProfileName) { e->setArgument(1,(*v2_ProfileName)); } else { e->setArgument(1); } e->setArgument(2,(v3_Position)); e->setArgument(3,(v4_SemiAxis1)); e->setArgument(4,(v5_SemiAxis2)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcEnergyConversionDevice
 bool IfcEnergyConversionDevice::is(Type::Enum v) const { return v == Type::IfcEnergyConversionDevice || IfcDistributionFlowElement::is(v); }
 Type::Enum IfcEnergyConversionDevice::type() const { return Type::IfcEnergyConversionDevice; }
 Type::Enum IfcEnergyConversionDevice::Class() { return Type::IfcEnergyConversionDevice; }
-IfcEnergyConversionDevice::IfcEnergyConversionDevice(IfcAbstractEntityPtr e) : IfcDistributionFlowElement((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcEnergyConversionDevice)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcEnergyConversionDevice::IfcEnergyConversionDevice(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag) : IfcDistributionFlowElement((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
+IfcEnergyConversionDevice::IfcEnergyConversionDevice(IfcAbstractEntity* e) : IfcDistributionFlowElement((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcEnergyConversionDevice)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcEnergyConversionDevice::IfcEnergyConversionDevice(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag) : IfcDistributionFlowElement((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcEnergyConversionDeviceType
 bool IfcEnergyConversionDeviceType::is(Type::Enum v) const { return v == Type::IfcEnergyConversionDeviceType || IfcDistributionFlowElementType::is(v); }
 Type::Enum IfcEnergyConversionDeviceType::type() const { return Type::IfcEnergyConversionDeviceType; }
 Type::Enum IfcEnergyConversionDeviceType::Class() { return Type::IfcEnergyConversionDeviceType; }
-IfcEnergyConversionDeviceType::IfcEnergyConversionDeviceType(IfcAbstractEntityPtr e) : IfcDistributionFlowElementType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcEnergyConversionDeviceType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcEnergyConversionDeviceType::IfcEnergyConversionDeviceType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType) : IfcDistributionFlowElementType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcEnergyConversionDeviceType::IfcEnergyConversionDeviceType(IfcAbstractEntity* e) : IfcDistributionFlowElementType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcEnergyConversionDeviceType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcEnergyConversionDeviceType::IfcEnergyConversionDeviceType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType) : IfcDistributionFlowElementType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcEnergyProperties
-bool IfcEnergyProperties::hasEnergySequence() { return !entity->getArgument(4)->isNull(); }
-IfcEnergySequenceEnum::IfcEnergySequenceEnum IfcEnergyProperties::EnergySequence() { return IfcEnergySequenceEnum::FromString(*entity->getArgument(4)); }
+bool IfcEnergyProperties::hasEnergySequence() const { return !entity->getArgument(4)->isNull(); }
+IfcEnergySequenceEnum::IfcEnergySequenceEnum IfcEnergyProperties::EnergySequence() const { return IfcEnergySequenceEnum::FromString(*entity->getArgument(4)); }
 void IfcEnergyProperties::setEnergySequence(IfcEnergySequenceEnum::IfcEnergySequenceEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v,IfcEnergySequenceEnum::ToString(v)); }
-bool IfcEnergyProperties::hasUserDefinedEnergySequence() { return !entity->getArgument(5)->isNull(); }
-IfcLabel IfcEnergyProperties::UserDefinedEnergySequence() { return *entity->getArgument(5); }
-void IfcEnergyProperties::setUserDefinedEnergySequence(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+bool IfcEnergyProperties::hasUserDefinedEnergySequence() const { return !entity->getArgument(5)->isNull(); }
+std::string IfcEnergyProperties::UserDefinedEnergySequence() const { return *entity->getArgument(5); }
+void IfcEnergyProperties::setUserDefinedEnergySequence(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
 bool IfcEnergyProperties::is(Type::Enum v) const { return v == Type::IfcEnergyProperties || IfcPropertySetDefinition::is(v); }
 Type::Enum IfcEnergyProperties::type() const { return Type::IfcEnergyProperties; }
 Type::Enum IfcEnergyProperties::Class() { return Type::IfcEnergyProperties; }
-IfcEnergyProperties::IfcEnergyProperties(IfcAbstractEntityPtr e) : IfcPropertySetDefinition((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcEnergyProperties)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcEnergyProperties::IfcEnergyProperties(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcEnergySequenceEnum::IfcEnergySequenceEnum > v5_EnergySequence, boost::optional< IfcLabel > v6_UserDefinedEnergySequence) : IfcPropertySetDefinition((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_EnergySequence) { e->setArgument(4,*v5_EnergySequence,IfcEnergySequenceEnum::ToString(*v5_EnergySequence)); } else { e->setArgument(4); } if (v6_UserDefinedEnergySequence) { e->setArgument(5,(*v6_UserDefinedEnergySequence)); } else { e->setArgument(5); } entity = e; EntityBuffer::Add(this); }
+IfcEnergyProperties::IfcEnergyProperties(IfcAbstractEntity* e) : IfcPropertySetDefinition((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcEnergyProperties)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcEnergyProperties::IfcEnergyProperties(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< IfcEnergySequenceEnum::IfcEnergySequenceEnum > v5_EnergySequence, boost::optional< std::string > v6_UserDefinedEnergySequence) : IfcPropertySetDefinition((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_EnergySequence) { e->setArgument(4,*v5_EnergySequence,IfcEnergySequenceEnum::ToString(*v5_EnergySequence)); } else { e->setArgument(4); } if (v6_UserDefinedEnergySequence) { e->setArgument(5,(*v6_UserDefinedEnergySequence)); } else { e->setArgument(5); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcEnvironmentalImpactValue
-IfcLabel IfcEnvironmentalImpactValue::ImpactType() { return *entity->getArgument(6); }
-void IfcEnvironmentalImpactValue::setImpactType(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
-IfcEnvironmentalImpactCategoryEnum::IfcEnvironmentalImpactCategoryEnum IfcEnvironmentalImpactValue::Category() { return IfcEnvironmentalImpactCategoryEnum::FromString(*entity->getArgument(7)); }
+std::string IfcEnvironmentalImpactValue::ImpactType() const { return *entity->getArgument(6); }
+void IfcEnvironmentalImpactValue::setImpactType(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
+IfcEnvironmentalImpactCategoryEnum::IfcEnvironmentalImpactCategoryEnum IfcEnvironmentalImpactValue::Category() const { return IfcEnvironmentalImpactCategoryEnum::FromString(*entity->getArgument(7)); }
 void IfcEnvironmentalImpactValue::setCategory(IfcEnvironmentalImpactCategoryEnum::IfcEnvironmentalImpactCategoryEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v,IfcEnvironmentalImpactCategoryEnum::ToString(v)); }
-bool IfcEnvironmentalImpactValue::hasUserDefinedCategory() { return !entity->getArgument(8)->isNull(); }
-IfcLabel IfcEnvironmentalImpactValue::UserDefinedCategory() { return *entity->getArgument(8); }
-void IfcEnvironmentalImpactValue::setUserDefinedCategory(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
+bool IfcEnvironmentalImpactValue::hasUserDefinedCategory() const { return !entity->getArgument(8)->isNull(); }
+std::string IfcEnvironmentalImpactValue::UserDefinedCategory() const { return *entity->getArgument(8); }
+void IfcEnvironmentalImpactValue::setUserDefinedCategory(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
 bool IfcEnvironmentalImpactValue::is(Type::Enum v) const { return v == Type::IfcEnvironmentalImpactValue || IfcAppliedValue::is(v); }
 Type::Enum IfcEnvironmentalImpactValue::type() const { return Type::IfcEnvironmentalImpactValue; }
 Type::Enum IfcEnvironmentalImpactValue::Class() { return Type::IfcEnvironmentalImpactValue; }
-IfcEnvironmentalImpactValue::IfcEnvironmentalImpactValue(IfcAbstractEntityPtr e) : IfcAppliedValue((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcEnvironmentalImpactValue)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcEnvironmentalImpactValue::IfcEnvironmentalImpactValue(boost::optional< IfcLabel > v1_Name, boost::optional< IfcText > v2_Description, boost::optional< IfcAppliedValueSelect > v3_AppliedValue, IfcMeasureWithUnit* v4_UnitBasis, boost::optional< IfcDateTimeSelect > v5_ApplicableDate, boost::optional< IfcDateTimeSelect > v6_FixedUntilDate, IfcLabel v7_ImpactType, IfcEnvironmentalImpactCategoryEnum::IfcEnvironmentalImpactCategoryEnum v8_Category, boost::optional< IfcLabel > v9_UserDefinedCategory) : IfcAppliedValue((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } if (v3_AppliedValue) { e->setArgument(2,(*v3_AppliedValue)); } else { e->setArgument(2); } e->setArgument(3,(v4_UnitBasis)); if (v5_ApplicableDate) { e->setArgument(4,(*v5_ApplicableDate)); } else { e->setArgument(4); } if (v6_FixedUntilDate) { e->setArgument(5,(*v6_FixedUntilDate)); } else { e->setArgument(5); } e->setArgument(6,(v7_ImpactType)); e->setArgument(7,v8_Category,IfcEnvironmentalImpactCategoryEnum::ToString(v8_Category)); if (v9_UserDefinedCategory) { e->setArgument(8,(*v9_UserDefinedCategory)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcEnvironmentalImpactValue::IfcEnvironmentalImpactValue(IfcAbstractEntity* e) : IfcAppliedValue((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcEnvironmentalImpactValue)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcEnvironmentalImpactValue::IfcEnvironmentalImpactValue(boost::optional< std::string > v1_Name, boost::optional< std::string > v2_Description, IfcAppliedValueSelect* v3_AppliedValue, IfcMeasureWithUnit* v4_UnitBasis, IfcDateTimeSelect* v5_ApplicableDate, IfcDateTimeSelect* v6_FixedUntilDate, std::string v7_ImpactType, IfcEnvironmentalImpactCategoryEnum::IfcEnvironmentalImpactCategoryEnum v8_Category, boost::optional< std::string > v9_UserDefinedCategory) : IfcAppliedValue((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_AppliedValue)); e->setArgument(3,(v4_UnitBasis)); e->setArgument(4,(v5_ApplicableDate)); e->setArgument(5,(v6_FixedUntilDate)); e->setArgument(6,(v7_ImpactType)); e->setArgument(7,v8_Category,IfcEnvironmentalImpactCategoryEnum::ToString(v8_Category)); if (v9_UserDefinedCategory) { e->setArgument(8,(*v9_UserDefinedCategory)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcEquipmentElement
 bool IfcEquipmentElement::is(Type::Enum v) const { return v == Type::IfcEquipmentElement || IfcElement::is(v); }
 Type::Enum IfcEquipmentElement::type() const { return Type::IfcEquipmentElement; }
 Type::Enum IfcEquipmentElement::Class() { return Type::IfcEquipmentElement; }
-IfcEquipmentElement::IfcEquipmentElement(IfcAbstractEntityPtr e) : IfcElement((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcEquipmentElement)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcEquipmentElement::IfcEquipmentElement(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag) : IfcElement((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
+IfcEquipmentElement::IfcEquipmentElement(IfcAbstractEntity* e) : IfcElement((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcEquipmentElement)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcEquipmentElement::IfcEquipmentElement(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag) : IfcElement((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcEquipmentStandard
 bool IfcEquipmentStandard::is(Type::Enum v) const { return v == Type::IfcEquipmentStandard || IfcControl::is(v); }
 Type::Enum IfcEquipmentStandard::type() const { return Type::IfcEquipmentStandard; }
 Type::Enum IfcEquipmentStandard::Class() { return Type::IfcEquipmentStandard; }
-IfcEquipmentStandard::IfcEquipmentStandard(IfcAbstractEntityPtr e) : IfcControl((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcEquipmentStandard)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcEquipmentStandard::IfcEquipmentStandard(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType) : IfcControl((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } entity = e; EntityBuffer::Add(this); }
+IfcEquipmentStandard::IfcEquipmentStandard(IfcAbstractEntity* e) : IfcControl((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcEquipmentStandard)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcEquipmentStandard::IfcEquipmentStandard(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType) : IfcControl((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcEvaporativeCoolerType
-IfcEvaporativeCoolerTypeEnum::IfcEvaporativeCoolerTypeEnum IfcEvaporativeCoolerType::PredefinedType() { return IfcEvaporativeCoolerTypeEnum::FromString(*entity->getArgument(9)); }
+IfcEvaporativeCoolerTypeEnum::IfcEvaporativeCoolerTypeEnum IfcEvaporativeCoolerType::PredefinedType() const { return IfcEvaporativeCoolerTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcEvaporativeCoolerType::setPredefinedType(IfcEvaporativeCoolerTypeEnum::IfcEvaporativeCoolerTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcEvaporativeCoolerTypeEnum::ToString(v)); }
 bool IfcEvaporativeCoolerType::is(Type::Enum v) const { return v == Type::IfcEvaporativeCoolerType || IfcEnergyConversionDeviceType::is(v); }
 Type::Enum IfcEvaporativeCoolerType::type() const { return Type::IfcEvaporativeCoolerType; }
 Type::Enum IfcEvaporativeCoolerType::Class() { return Type::IfcEvaporativeCoolerType; }
-IfcEvaporativeCoolerType::IfcEvaporativeCoolerType(IfcAbstractEntityPtr e) : IfcEnergyConversionDeviceType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcEvaporativeCoolerType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcEvaporativeCoolerType::IfcEvaporativeCoolerType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcEvaporativeCoolerTypeEnum::IfcEvaporativeCoolerTypeEnum v10_PredefinedType) : IfcEnergyConversionDeviceType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcEvaporativeCoolerTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcEvaporativeCoolerType::IfcEvaporativeCoolerType(IfcAbstractEntity* e) : IfcEnergyConversionDeviceType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcEvaporativeCoolerType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcEvaporativeCoolerType::IfcEvaporativeCoolerType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcEvaporativeCoolerTypeEnum::IfcEvaporativeCoolerTypeEnum v10_PredefinedType) : IfcEnergyConversionDeviceType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcEvaporativeCoolerTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcEvaporatorType
-IfcEvaporatorTypeEnum::IfcEvaporatorTypeEnum IfcEvaporatorType::PredefinedType() { return IfcEvaporatorTypeEnum::FromString(*entity->getArgument(9)); }
+IfcEvaporatorTypeEnum::IfcEvaporatorTypeEnum IfcEvaporatorType::PredefinedType() const { return IfcEvaporatorTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcEvaporatorType::setPredefinedType(IfcEvaporatorTypeEnum::IfcEvaporatorTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcEvaporatorTypeEnum::ToString(v)); }
 bool IfcEvaporatorType::is(Type::Enum v) const { return v == Type::IfcEvaporatorType || IfcEnergyConversionDeviceType::is(v); }
 Type::Enum IfcEvaporatorType::type() const { return Type::IfcEvaporatorType; }
 Type::Enum IfcEvaporatorType::Class() { return Type::IfcEvaporatorType; }
-IfcEvaporatorType::IfcEvaporatorType(IfcAbstractEntityPtr e) : IfcEnergyConversionDeviceType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcEvaporatorType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcEvaporatorType::IfcEvaporatorType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcEvaporatorTypeEnum::IfcEvaporatorTypeEnum v10_PredefinedType) : IfcEnergyConversionDeviceType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcEvaporatorTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcEvaporatorType::IfcEvaporatorType(IfcAbstractEntity* e) : IfcEnergyConversionDeviceType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcEvaporatorType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcEvaporatorType::IfcEvaporatorType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcEvaporatorTypeEnum::IfcEvaporatorTypeEnum v10_PredefinedType) : IfcEnergyConversionDeviceType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcEvaporatorTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcExtendedMaterialProperties
-SHARED_PTR< IfcTemplatedEntityList< IfcProperty > > IfcExtendedMaterialProperties::ExtendedProperties() { RETURN_AS_LIST(IfcProperty,1) }
-void IfcExtendedMaterialProperties::setExtendedProperties(SHARED_PTR< IfcTemplatedEntityList< IfcProperty > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v->generalize()); }
-bool IfcExtendedMaterialProperties::hasDescription() { return !entity->getArgument(2)->isNull(); }
-IfcText IfcExtendedMaterialProperties::Description() { return *entity->getArgument(2); }
-void IfcExtendedMaterialProperties::setDescription(IfcText v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-IfcLabel IfcExtendedMaterialProperties::Name() { return *entity->getArgument(3); }
-void IfcExtendedMaterialProperties::setName(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+IfcTemplatedEntityList< IfcProperty >::ptr IfcExtendedMaterialProperties::ExtendedProperties() const { IfcEntityList::ptr es = *entity->getArgument(1); return es->as<IfcProperty>(); }
+void IfcExtendedMaterialProperties::setExtendedProperties(IfcTemplatedEntityList< IfcProperty >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v->generalize()); }
+bool IfcExtendedMaterialProperties::hasDescription() const { return !entity->getArgument(2)->isNull(); }
+std::string IfcExtendedMaterialProperties::Description() const { return *entity->getArgument(2); }
+void IfcExtendedMaterialProperties::setDescription(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+std::string IfcExtendedMaterialProperties::Name() const { return *entity->getArgument(3); }
+void IfcExtendedMaterialProperties::setName(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
 bool IfcExtendedMaterialProperties::is(Type::Enum v) const { return v == Type::IfcExtendedMaterialProperties || IfcMaterialProperties::is(v); }
 Type::Enum IfcExtendedMaterialProperties::type() const { return Type::IfcExtendedMaterialProperties; }
 Type::Enum IfcExtendedMaterialProperties::Class() { return Type::IfcExtendedMaterialProperties; }
-IfcExtendedMaterialProperties::IfcExtendedMaterialProperties(IfcAbstractEntityPtr e) : IfcMaterialProperties((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcExtendedMaterialProperties)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcExtendedMaterialProperties::IfcExtendedMaterialProperties(IfcMaterial* v1_Material, SHARED_PTR< IfcTemplatedEntityList< IfcProperty > > v2_ExtendedProperties, boost::optional< IfcText > v3_Description, IfcLabel v4_Name) : IfcMaterialProperties((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Material)); e->setArgument(1,(v2_ExtendedProperties)->generalize()); if (v3_Description) { e->setArgument(2,(*v3_Description)); } else { e->setArgument(2); } e->setArgument(3,(v4_Name)); entity = e; EntityBuffer::Add(this); }
+IfcExtendedMaterialProperties::IfcExtendedMaterialProperties(IfcAbstractEntity* e) : IfcMaterialProperties((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcExtendedMaterialProperties)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcExtendedMaterialProperties::IfcExtendedMaterialProperties(IfcMaterial* v1_Material, IfcTemplatedEntityList< IfcProperty >::ptr v2_ExtendedProperties, boost::optional< std::string > v3_Description, std::string v4_Name) : IfcMaterialProperties((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Material)); e->setArgument(1,(v2_ExtendedProperties)->generalize()); if (v3_Description) { e->setArgument(2,(*v3_Description)); } else { e->setArgument(2); } e->setArgument(3,(v4_Name)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcExternalReference
-bool IfcExternalReference::hasLocation() { return !entity->getArgument(0)->isNull(); }
-IfcLabel IfcExternalReference::Location() { return *entity->getArgument(0); }
-void IfcExternalReference::setLocation(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-bool IfcExternalReference::hasItemReference() { return !entity->getArgument(1)->isNull(); }
-IfcIdentifier IfcExternalReference::ItemReference() { return *entity->getArgument(1); }
-void IfcExternalReference::setItemReference(IfcIdentifier v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-bool IfcExternalReference::hasName() { return !entity->getArgument(2)->isNull(); }
-IfcLabel IfcExternalReference::Name() { return *entity->getArgument(2); }
-void IfcExternalReference::setName(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+bool IfcExternalReference::hasLocation() const { return !entity->getArgument(0)->isNull(); }
+std::string IfcExternalReference::Location() const { return *entity->getArgument(0); }
+void IfcExternalReference::setLocation(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+bool IfcExternalReference::hasItemReference() const { return !entity->getArgument(1)->isNull(); }
+std::string IfcExternalReference::ItemReference() const { return *entity->getArgument(1); }
+void IfcExternalReference::setItemReference(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+bool IfcExternalReference::hasName() const { return !entity->getArgument(2)->isNull(); }
+std::string IfcExternalReference::Name() const { return *entity->getArgument(2); }
+void IfcExternalReference::setName(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
 bool IfcExternalReference::is(Type::Enum v) const { return v == Type::IfcExternalReference; }
 Type::Enum IfcExternalReference::type() const { return Type::IfcExternalReference; }
 Type::Enum IfcExternalReference::Class() { return Type::IfcExternalReference; }
-IfcExternalReference::IfcExternalReference(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcExternalReference)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcExternalReference::IfcExternalReference(boost::optional< IfcLabel > v1_Location, boost::optional< IfcIdentifier > v2_ItemReference, boost::optional< IfcLabel > v3_Name) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Location) { e->setArgument(0,(*v1_Location)); } else { e->setArgument(0); } if (v2_ItemReference) { e->setArgument(1,(*v2_ItemReference)); } else { e->setArgument(1); } if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } entity = e; EntityBuffer::Add(this); }
+IfcExternalReference::IfcExternalReference(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcExternalReference)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcExternalReference::IfcExternalReference(boost::optional< std::string > v1_Location, boost::optional< std::string > v2_ItemReference, boost::optional< std::string > v3_Name) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Location) { e->setArgument(0,(*v1_Location)); } else { e->setArgument(0); } if (v2_ItemReference) { e->setArgument(1,(*v2_ItemReference)); } else { e->setArgument(1); } if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcExternallyDefinedHatchStyle
 bool IfcExternallyDefinedHatchStyle::is(Type::Enum v) const { return v == Type::IfcExternallyDefinedHatchStyle || IfcExternalReference::is(v); }
 Type::Enum IfcExternallyDefinedHatchStyle::type() const { return Type::IfcExternallyDefinedHatchStyle; }
 Type::Enum IfcExternallyDefinedHatchStyle::Class() { return Type::IfcExternallyDefinedHatchStyle; }
-IfcExternallyDefinedHatchStyle::IfcExternallyDefinedHatchStyle(IfcAbstractEntityPtr e) : IfcExternalReference((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcExternallyDefinedHatchStyle)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcExternallyDefinedHatchStyle::IfcExternallyDefinedHatchStyle(boost::optional< IfcLabel > v1_Location, boost::optional< IfcIdentifier > v2_ItemReference, boost::optional< IfcLabel > v3_Name) : IfcExternalReference((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Location) { e->setArgument(0,(*v1_Location)); } else { e->setArgument(0); } if (v2_ItemReference) { e->setArgument(1,(*v2_ItemReference)); } else { e->setArgument(1); } if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } entity = e; EntityBuffer::Add(this); }
+IfcExternallyDefinedHatchStyle::IfcExternallyDefinedHatchStyle(IfcAbstractEntity* e) : IfcExternalReference((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcExternallyDefinedHatchStyle)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcExternallyDefinedHatchStyle::IfcExternallyDefinedHatchStyle(boost::optional< std::string > v1_Location, boost::optional< std::string > v2_ItemReference, boost::optional< std::string > v3_Name) : IfcExternalReference((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Location) { e->setArgument(0,(*v1_Location)); } else { e->setArgument(0); } if (v2_ItemReference) { e->setArgument(1,(*v2_ItemReference)); } else { e->setArgument(1); } if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcExternallyDefinedSurfaceStyle
 bool IfcExternallyDefinedSurfaceStyle::is(Type::Enum v) const { return v == Type::IfcExternallyDefinedSurfaceStyle || IfcExternalReference::is(v); }
 Type::Enum IfcExternallyDefinedSurfaceStyle::type() const { return Type::IfcExternallyDefinedSurfaceStyle; }
 Type::Enum IfcExternallyDefinedSurfaceStyle::Class() { return Type::IfcExternallyDefinedSurfaceStyle; }
-IfcExternallyDefinedSurfaceStyle::IfcExternallyDefinedSurfaceStyle(IfcAbstractEntityPtr e) : IfcExternalReference((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcExternallyDefinedSurfaceStyle)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcExternallyDefinedSurfaceStyle::IfcExternallyDefinedSurfaceStyle(boost::optional< IfcLabel > v1_Location, boost::optional< IfcIdentifier > v2_ItemReference, boost::optional< IfcLabel > v3_Name) : IfcExternalReference((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Location) { e->setArgument(0,(*v1_Location)); } else { e->setArgument(0); } if (v2_ItemReference) { e->setArgument(1,(*v2_ItemReference)); } else { e->setArgument(1); } if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } entity = e; EntityBuffer::Add(this); }
+IfcExternallyDefinedSurfaceStyle::IfcExternallyDefinedSurfaceStyle(IfcAbstractEntity* e) : IfcExternalReference((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcExternallyDefinedSurfaceStyle)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcExternallyDefinedSurfaceStyle::IfcExternallyDefinedSurfaceStyle(boost::optional< std::string > v1_Location, boost::optional< std::string > v2_ItemReference, boost::optional< std::string > v3_Name) : IfcExternalReference((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Location) { e->setArgument(0,(*v1_Location)); } else { e->setArgument(0); } if (v2_ItemReference) { e->setArgument(1,(*v2_ItemReference)); } else { e->setArgument(1); } if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcExternallyDefinedSymbol
 bool IfcExternallyDefinedSymbol::is(Type::Enum v) const { return v == Type::IfcExternallyDefinedSymbol || IfcExternalReference::is(v); }
 Type::Enum IfcExternallyDefinedSymbol::type() const { return Type::IfcExternallyDefinedSymbol; }
 Type::Enum IfcExternallyDefinedSymbol::Class() { return Type::IfcExternallyDefinedSymbol; }
-IfcExternallyDefinedSymbol::IfcExternallyDefinedSymbol(IfcAbstractEntityPtr e) : IfcExternalReference((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcExternallyDefinedSymbol)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcExternallyDefinedSymbol::IfcExternallyDefinedSymbol(boost::optional< IfcLabel > v1_Location, boost::optional< IfcIdentifier > v2_ItemReference, boost::optional< IfcLabel > v3_Name) : IfcExternalReference((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Location) { e->setArgument(0,(*v1_Location)); } else { e->setArgument(0); } if (v2_ItemReference) { e->setArgument(1,(*v2_ItemReference)); } else { e->setArgument(1); } if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } entity = e; EntityBuffer::Add(this); }
+IfcExternallyDefinedSymbol::IfcExternallyDefinedSymbol(IfcAbstractEntity* e) : IfcExternalReference((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcExternallyDefinedSymbol)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcExternallyDefinedSymbol::IfcExternallyDefinedSymbol(boost::optional< std::string > v1_Location, boost::optional< std::string > v2_ItemReference, boost::optional< std::string > v3_Name) : IfcExternalReference((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Location) { e->setArgument(0,(*v1_Location)); } else { e->setArgument(0); } if (v2_ItemReference) { e->setArgument(1,(*v2_ItemReference)); } else { e->setArgument(1); } if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcExternallyDefinedTextFont
 bool IfcExternallyDefinedTextFont::is(Type::Enum v) const { return v == Type::IfcExternallyDefinedTextFont || IfcExternalReference::is(v); }
 Type::Enum IfcExternallyDefinedTextFont::type() const { return Type::IfcExternallyDefinedTextFont; }
 Type::Enum IfcExternallyDefinedTextFont::Class() { return Type::IfcExternallyDefinedTextFont; }
-IfcExternallyDefinedTextFont::IfcExternallyDefinedTextFont(IfcAbstractEntityPtr e) : IfcExternalReference((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcExternallyDefinedTextFont)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcExternallyDefinedTextFont::IfcExternallyDefinedTextFont(boost::optional< IfcLabel > v1_Location, boost::optional< IfcIdentifier > v2_ItemReference, boost::optional< IfcLabel > v3_Name) : IfcExternalReference((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Location) { e->setArgument(0,(*v1_Location)); } else { e->setArgument(0); } if (v2_ItemReference) { e->setArgument(1,(*v2_ItemReference)); } else { e->setArgument(1); } if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } entity = e; EntityBuffer::Add(this); }
+IfcExternallyDefinedTextFont::IfcExternallyDefinedTextFont(IfcAbstractEntity* e) : IfcExternalReference((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcExternallyDefinedTextFont)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcExternallyDefinedTextFont::IfcExternallyDefinedTextFont(boost::optional< std::string > v1_Location, boost::optional< std::string > v2_ItemReference, boost::optional< std::string > v3_Name) : IfcExternalReference((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Location) { e->setArgument(0,(*v1_Location)); } else { e->setArgument(0); } if (v2_ItemReference) { e->setArgument(1,(*v2_ItemReference)); } else { e->setArgument(1); } if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcExtrudedAreaSolid
-IfcDirection* IfcExtrudedAreaSolid::ExtrudedDirection() { return (IfcDirection*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(2))); }
+IfcDirection* IfcExtrudedAreaSolid::ExtrudedDirection() const { return (IfcDirection*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(2))); }
 void IfcExtrudedAreaSolid::setExtrudedDirection(IfcDirection* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-IfcPositiveLengthMeasure IfcExtrudedAreaSolid::Depth() { return *entity->getArgument(3); }
-void IfcExtrudedAreaSolid::setDepth(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+double IfcExtrudedAreaSolid::Depth() const { return *entity->getArgument(3); }
+void IfcExtrudedAreaSolid::setDepth(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
 bool IfcExtrudedAreaSolid::is(Type::Enum v) const { return v == Type::IfcExtrudedAreaSolid || IfcSweptAreaSolid::is(v); }
 Type::Enum IfcExtrudedAreaSolid::type() const { return Type::IfcExtrudedAreaSolid; }
 Type::Enum IfcExtrudedAreaSolid::Class() { return Type::IfcExtrudedAreaSolid; }
-IfcExtrudedAreaSolid::IfcExtrudedAreaSolid(IfcAbstractEntityPtr e) : IfcSweptAreaSolid((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcExtrudedAreaSolid)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcExtrudedAreaSolid::IfcExtrudedAreaSolid(IfcProfileDef* v1_SweptArea, IfcAxis2Placement3D* v2_Position, IfcDirection* v3_ExtrudedDirection, IfcPositiveLengthMeasure v4_Depth) : IfcSweptAreaSolid((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_SweptArea)); e->setArgument(1,(v2_Position)); e->setArgument(2,(v3_ExtrudedDirection)); e->setArgument(3,(v4_Depth)); entity = e; EntityBuffer::Add(this); }
+IfcExtrudedAreaSolid::IfcExtrudedAreaSolid(IfcAbstractEntity* e) : IfcSweptAreaSolid((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcExtrudedAreaSolid)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcExtrudedAreaSolid::IfcExtrudedAreaSolid(IfcProfileDef* v1_SweptArea, IfcAxis2Placement3D* v2_Position, IfcDirection* v3_ExtrudedDirection, double v4_Depth) : IfcSweptAreaSolid((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_SweptArea)); e->setArgument(1,(v2_Position)); e->setArgument(2,(v3_ExtrudedDirection)); e->setArgument(3,(v4_Depth)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcFace
-SHARED_PTR< IfcTemplatedEntityList< IfcFaceBound > > IfcFace::Bounds() { RETURN_AS_LIST(IfcFaceBound,0) }
-void IfcFace::setBounds(SHARED_PTR< IfcTemplatedEntityList< IfcFaceBound > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v->generalize()); }
+IfcTemplatedEntityList< IfcFaceBound >::ptr IfcFace::Bounds() const { IfcEntityList::ptr es = *entity->getArgument(0); return es->as<IfcFaceBound>(); }
+void IfcFace::setBounds(IfcTemplatedEntityList< IfcFaceBound >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v->generalize()); }
 bool IfcFace::is(Type::Enum v) const { return v == Type::IfcFace || IfcTopologicalRepresentationItem::is(v); }
 Type::Enum IfcFace::type() const { return Type::IfcFace; }
 Type::Enum IfcFace::Class() { return Type::IfcFace; }
-IfcFace::IfcFace(IfcAbstractEntityPtr e) : IfcTopologicalRepresentationItem((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcFace)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcFace::IfcFace(SHARED_PTR< IfcTemplatedEntityList< IfcFaceBound > > v1_Bounds) : IfcTopologicalRepresentationItem((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Bounds)->generalize()); entity = e; EntityBuffer::Add(this); }
+IfcFace::IfcFace(IfcAbstractEntity* e) : IfcTopologicalRepresentationItem((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcFace)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcFace::IfcFace(IfcTemplatedEntityList< IfcFaceBound >::ptr v1_Bounds) : IfcTopologicalRepresentationItem((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Bounds)->generalize()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcFaceBasedSurfaceModel
-SHARED_PTR< IfcTemplatedEntityList< IfcConnectedFaceSet > > IfcFaceBasedSurfaceModel::FbsmFaces() { RETURN_AS_LIST(IfcConnectedFaceSet,0) }
-void IfcFaceBasedSurfaceModel::setFbsmFaces(SHARED_PTR< IfcTemplatedEntityList< IfcConnectedFaceSet > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v->generalize()); }
+IfcTemplatedEntityList< IfcConnectedFaceSet >::ptr IfcFaceBasedSurfaceModel::FbsmFaces() const { IfcEntityList::ptr es = *entity->getArgument(0); return es->as<IfcConnectedFaceSet>(); }
+void IfcFaceBasedSurfaceModel::setFbsmFaces(IfcTemplatedEntityList< IfcConnectedFaceSet >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v->generalize()); }
 bool IfcFaceBasedSurfaceModel::is(Type::Enum v) const { return v == Type::IfcFaceBasedSurfaceModel || IfcGeometricRepresentationItem::is(v); }
 Type::Enum IfcFaceBasedSurfaceModel::type() const { return Type::IfcFaceBasedSurfaceModel; }
 Type::Enum IfcFaceBasedSurfaceModel::Class() { return Type::IfcFaceBasedSurfaceModel; }
-IfcFaceBasedSurfaceModel::IfcFaceBasedSurfaceModel(IfcAbstractEntityPtr e) : IfcGeometricRepresentationItem((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcFaceBasedSurfaceModel)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcFaceBasedSurfaceModel::IfcFaceBasedSurfaceModel(SHARED_PTR< IfcTemplatedEntityList< IfcConnectedFaceSet > > v1_FbsmFaces) : IfcGeometricRepresentationItem((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_FbsmFaces)->generalize()); entity = e; EntityBuffer::Add(this); }
+IfcFaceBasedSurfaceModel::IfcFaceBasedSurfaceModel(IfcAbstractEntity* e) : IfcGeometricRepresentationItem((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcFaceBasedSurfaceModel)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcFaceBasedSurfaceModel::IfcFaceBasedSurfaceModel(IfcTemplatedEntityList< IfcConnectedFaceSet >::ptr v1_FbsmFaces) : IfcGeometricRepresentationItem((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_FbsmFaces)->generalize()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcFaceBound
-IfcLoop* IfcFaceBound::Bound() { return (IfcLoop*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(0))); }
+IfcLoop* IfcFaceBound::Bound() const { return (IfcLoop*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(0))); }
 void IfcFaceBound::setBound(IfcLoop* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-bool IfcFaceBound::Orientation() { return *entity->getArgument(1); }
+bool IfcFaceBound::Orientation() const { return *entity->getArgument(1); }
 void IfcFaceBound::setOrientation(bool v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
 bool IfcFaceBound::is(Type::Enum v) const { return v == Type::IfcFaceBound || IfcTopologicalRepresentationItem::is(v); }
 Type::Enum IfcFaceBound::type() const { return Type::IfcFaceBound; }
 Type::Enum IfcFaceBound::Class() { return Type::IfcFaceBound; }
-IfcFaceBound::IfcFaceBound(IfcAbstractEntityPtr e) : IfcTopologicalRepresentationItem((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcFaceBound)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcFaceBound::IfcFaceBound(IfcLoop* v1_Bound, bool v2_Orientation) : IfcTopologicalRepresentationItem((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Bound)); e->setArgument(1,(v2_Orientation)); entity = e; EntityBuffer::Add(this); }
+IfcFaceBound::IfcFaceBound(IfcAbstractEntity* e) : IfcTopologicalRepresentationItem((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcFaceBound)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcFaceBound::IfcFaceBound(IfcLoop* v1_Bound, bool v2_Orientation) : IfcTopologicalRepresentationItem((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Bound)); e->setArgument(1,(v2_Orientation)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcFaceOuterBound
 bool IfcFaceOuterBound::is(Type::Enum v) const { return v == Type::IfcFaceOuterBound || IfcFaceBound::is(v); }
 Type::Enum IfcFaceOuterBound::type() const { return Type::IfcFaceOuterBound; }
 Type::Enum IfcFaceOuterBound::Class() { return Type::IfcFaceOuterBound; }
-IfcFaceOuterBound::IfcFaceOuterBound(IfcAbstractEntityPtr e) : IfcFaceBound((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcFaceOuterBound)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcFaceOuterBound::IfcFaceOuterBound(IfcLoop* v1_Bound, bool v2_Orientation) : IfcFaceBound((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Bound)); e->setArgument(1,(v2_Orientation)); entity = e; EntityBuffer::Add(this); }
+IfcFaceOuterBound::IfcFaceOuterBound(IfcAbstractEntity* e) : IfcFaceBound((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcFaceOuterBound)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcFaceOuterBound::IfcFaceOuterBound(IfcLoop* v1_Bound, bool v2_Orientation) : IfcFaceBound((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Bound)); e->setArgument(1,(v2_Orientation)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcFaceSurface
-IfcSurface* IfcFaceSurface::FaceSurface() { return (IfcSurface*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(1))); }
+IfcSurface* IfcFaceSurface::FaceSurface() const { return (IfcSurface*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(1))); }
 void IfcFaceSurface::setFaceSurface(IfcSurface* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-bool IfcFaceSurface::SameSense() { return *entity->getArgument(2); }
+bool IfcFaceSurface::SameSense() const { return *entity->getArgument(2); }
 void IfcFaceSurface::setSameSense(bool v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
 bool IfcFaceSurface::is(Type::Enum v) const { return v == Type::IfcFaceSurface || IfcFace::is(v); }
 Type::Enum IfcFaceSurface::type() const { return Type::IfcFaceSurface; }
 Type::Enum IfcFaceSurface::Class() { return Type::IfcFaceSurface; }
-IfcFaceSurface::IfcFaceSurface(IfcAbstractEntityPtr e) : IfcFace((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcFaceSurface)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcFaceSurface::IfcFaceSurface(SHARED_PTR< IfcTemplatedEntityList< IfcFaceBound > > v1_Bounds, IfcSurface* v2_FaceSurface, bool v3_SameSense) : IfcFace((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Bounds)->generalize()); e->setArgument(1,(v2_FaceSurface)); e->setArgument(2,(v3_SameSense)); entity = e; EntityBuffer::Add(this); }
+IfcFaceSurface::IfcFaceSurface(IfcAbstractEntity* e) : IfcFace((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcFaceSurface)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcFaceSurface::IfcFaceSurface(IfcTemplatedEntityList< IfcFaceBound >::ptr v1_Bounds, IfcSurface* v2_FaceSurface, bool v3_SameSense) : IfcFace((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Bounds)->generalize()); e->setArgument(1,(v2_FaceSurface)); e->setArgument(2,(v3_SameSense)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcFacetedBrep
 bool IfcFacetedBrep::is(Type::Enum v) const { return v == Type::IfcFacetedBrep || IfcManifoldSolidBrep::is(v); }
 Type::Enum IfcFacetedBrep::type() const { return Type::IfcFacetedBrep; }
 Type::Enum IfcFacetedBrep::Class() { return Type::IfcFacetedBrep; }
-IfcFacetedBrep::IfcFacetedBrep(IfcAbstractEntityPtr e) : IfcManifoldSolidBrep((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcFacetedBrep)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcFacetedBrep::IfcFacetedBrep(IfcClosedShell* v1_Outer) : IfcManifoldSolidBrep((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Outer)); entity = e; EntityBuffer::Add(this); }
+IfcFacetedBrep::IfcFacetedBrep(IfcAbstractEntity* e) : IfcManifoldSolidBrep((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcFacetedBrep)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcFacetedBrep::IfcFacetedBrep(IfcClosedShell* v1_Outer) : IfcManifoldSolidBrep((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Outer)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcFacetedBrepWithVoids
-SHARED_PTR< IfcTemplatedEntityList< IfcClosedShell > > IfcFacetedBrepWithVoids::Voids() { RETURN_AS_LIST(IfcClosedShell,1) }
-void IfcFacetedBrepWithVoids::setVoids(SHARED_PTR< IfcTemplatedEntityList< IfcClosedShell > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v->generalize()); }
+IfcTemplatedEntityList< IfcClosedShell >::ptr IfcFacetedBrepWithVoids::Voids() const { IfcEntityList::ptr es = *entity->getArgument(1); return es->as<IfcClosedShell>(); }
+void IfcFacetedBrepWithVoids::setVoids(IfcTemplatedEntityList< IfcClosedShell >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v->generalize()); }
 bool IfcFacetedBrepWithVoids::is(Type::Enum v) const { return v == Type::IfcFacetedBrepWithVoids || IfcManifoldSolidBrep::is(v); }
 Type::Enum IfcFacetedBrepWithVoids::type() const { return Type::IfcFacetedBrepWithVoids; }
 Type::Enum IfcFacetedBrepWithVoids::Class() { return Type::IfcFacetedBrepWithVoids; }
-IfcFacetedBrepWithVoids::IfcFacetedBrepWithVoids(IfcAbstractEntityPtr e) : IfcManifoldSolidBrep((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcFacetedBrepWithVoids)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcFacetedBrepWithVoids::IfcFacetedBrepWithVoids(IfcClosedShell* v1_Outer, SHARED_PTR< IfcTemplatedEntityList< IfcClosedShell > > v2_Voids) : IfcManifoldSolidBrep((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Outer)); e->setArgument(1,(v2_Voids)->generalize()); entity = e; EntityBuffer::Add(this); }
+IfcFacetedBrepWithVoids::IfcFacetedBrepWithVoids(IfcAbstractEntity* e) : IfcManifoldSolidBrep((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcFacetedBrepWithVoids)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcFacetedBrepWithVoids::IfcFacetedBrepWithVoids(IfcClosedShell* v1_Outer, IfcTemplatedEntityList< IfcClosedShell >::ptr v2_Voids) : IfcManifoldSolidBrep((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Outer)); e->setArgument(1,(v2_Voids)->generalize()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcFailureConnectionCondition
-bool IfcFailureConnectionCondition::hasTensionFailureX() { return !entity->getArgument(1)->isNull(); }
-IfcForceMeasure IfcFailureConnectionCondition::TensionFailureX() { return *entity->getArgument(1); }
-void IfcFailureConnectionCondition::setTensionFailureX(IfcForceMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-bool IfcFailureConnectionCondition::hasTensionFailureY() { return !entity->getArgument(2)->isNull(); }
-IfcForceMeasure IfcFailureConnectionCondition::TensionFailureY() { return *entity->getArgument(2); }
-void IfcFailureConnectionCondition::setTensionFailureY(IfcForceMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-bool IfcFailureConnectionCondition::hasTensionFailureZ() { return !entity->getArgument(3)->isNull(); }
-IfcForceMeasure IfcFailureConnectionCondition::TensionFailureZ() { return *entity->getArgument(3); }
-void IfcFailureConnectionCondition::setTensionFailureZ(IfcForceMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-bool IfcFailureConnectionCondition::hasCompressionFailureX() { return !entity->getArgument(4)->isNull(); }
-IfcForceMeasure IfcFailureConnectionCondition::CompressionFailureX() { return *entity->getArgument(4); }
-void IfcFailureConnectionCondition::setCompressionFailureX(IfcForceMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-bool IfcFailureConnectionCondition::hasCompressionFailureY() { return !entity->getArgument(5)->isNull(); }
-IfcForceMeasure IfcFailureConnectionCondition::CompressionFailureY() { return *entity->getArgument(5); }
-void IfcFailureConnectionCondition::setCompressionFailureY(IfcForceMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-bool IfcFailureConnectionCondition::hasCompressionFailureZ() { return !entity->getArgument(6)->isNull(); }
-IfcForceMeasure IfcFailureConnectionCondition::CompressionFailureZ() { return *entity->getArgument(6); }
-void IfcFailureConnectionCondition::setCompressionFailureZ(IfcForceMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
+bool IfcFailureConnectionCondition::hasTensionFailureX() const { return !entity->getArgument(1)->isNull(); }
+double IfcFailureConnectionCondition::TensionFailureX() const { return *entity->getArgument(1); }
+void IfcFailureConnectionCondition::setTensionFailureX(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+bool IfcFailureConnectionCondition::hasTensionFailureY() const { return !entity->getArgument(2)->isNull(); }
+double IfcFailureConnectionCondition::TensionFailureY() const { return *entity->getArgument(2); }
+void IfcFailureConnectionCondition::setTensionFailureY(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+bool IfcFailureConnectionCondition::hasTensionFailureZ() const { return !entity->getArgument(3)->isNull(); }
+double IfcFailureConnectionCondition::TensionFailureZ() const { return *entity->getArgument(3); }
+void IfcFailureConnectionCondition::setTensionFailureZ(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+bool IfcFailureConnectionCondition::hasCompressionFailureX() const { return !entity->getArgument(4)->isNull(); }
+double IfcFailureConnectionCondition::CompressionFailureX() const { return *entity->getArgument(4); }
+void IfcFailureConnectionCondition::setCompressionFailureX(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+bool IfcFailureConnectionCondition::hasCompressionFailureY() const { return !entity->getArgument(5)->isNull(); }
+double IfcFailureConnectionCondition::CompressionFailureY() const { return *entity->getArgument(5); }
+void IfcFailureConnectionCondition::setCompressionFailureY(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+bool IfcFailureConnectionCondition::hasCompressionFailureZ() const { return !entity->getArgument(6)->isNull(); }
+double IfcFailureConnectionCondition::CompressionFailureZ() const { return *entity->getArgument(6); }
+void IfcFailureConnectionCondition::setCompressionFailureZ(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
 bool IfcFailureConnectionCondition::is(Type::Enum v) const { return v == Type::IfcFailureConnectionCondition || IfcStructuralConnectionCondition::is(v); }
 Type::Enum IfcFailureConnectionCondition::type() const { return Type::IfcFailureConnectionCondition; }
 Type::Enum IfcFailureConnectionCondition::Class() { return Type::IfcFailureConnectionCondition; }
-IfcFailureConnectionCondition::IfcFailureConnectionCondition(IfcAbstractEntityPtr e) : IfcStructuralConnectionCondition((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcFailureConnectionCondition)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcFailureConnectionCondition::IfcFailureConnectionCondition(boost::optional< IfcLabel > v1_Name, boost::optional< IfcForceMeasure > v2_TensionFailureX, boost::optional< IfcForceMeasure > v3_TensionFailureY, boost::optional< IfcForceMeasure > v4_TensionFailureZ, boost::optional< IfcForceMeasure > v5_CompressionFailureX, boost::optional< IfcForceMeasure > v6_CompressionFailureY, boost::optional< IfcForceMeasure > v7_CompressionFailureZ) : IfcStructuralConnectionCondition((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_TensionFailureX) { e->setArgument(1,(*v2_TensionFailureX)); } else { e->setArgument(1); } if (v3_TensionFailureY) { e->setArgument(2,(*v3_TensionFailureY)); } else { e->setArgument(2); } if (v4_TensionFailureZ) { e->setArgument(3,(*v4_TensionFailureZ)); } else { e->setArgument(3); } if (v5_CompressionFailureX) { e->setArgument(4,(*v5_CompressionFailureX)); } else { e->setArgument(4); } if (v6_CompressionFailureY) { e->setArgument(5,(*v6_CompressionFailureY)); } else { e->setArgument(5); } if (v7_CompressionFailureZ) { e->setArgument(6,(*v7_CompressionFailureZ)); } else { e->setArgument(6); } entity = e; EntityBuffer::Add(this); }
+IfcFailureConnectionCondition::IfcFailureConnectionCondition(IfcAbstractEntity* e) : IfcStructuralConnectionCondition((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcFailureConnectionCondition)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcFailureConnectionCondition::IfcFailureConnectionCondition(boost::optional< std::string > v1_Name, boost::optional< double > v2_TensionFailureX, boost::optional< double > v3_TensionFailureY, boost::optional< double > v4_TensionFailureZ, boost::optional< double > v5_CompressionFailureX, boost::optional< double > v6_CompressionFailureY, boost::optional< double > v7_CompressionFailureZ) : IfcStructuralConnectionCondition((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_TensionFailureX) { e->setArgument(1,(*v2_TensionFailureX)); } else { e->setArgument(1); } if (v3_TensionFailureY) { e->setArgument(2,(*v3_TensionFailureY)); } else { e->setArgument(2); } if (v4_TensionFailureZ) { e->setArgument(3,(*v4_TensionFailureZ)); } else { e->setArgument(3); } if (v5_CompressionFailureX) { e->setArgument(4,(*v5_CompressionFailureX)); } else { e->setArgument(4); } if (v6_CompressionFailureY) { e->setArgument(5,(*v6_CompressionFailureY)); } else { e->setArgument(5); } if (v7_CompressionFailureZ) { e->setArgument(6,(*v7_CompressionFailureZ)); } else { e->setArgument(6); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcFanType
-IfcFanTypeEnum::IfcFanTypeEnum IfcFanType::PredefinedType() { return IfcFanTypeEnum::FromString(*entity->getArgument(9)); }
+IfcFanTypeEnum::IfcFanTypeEnum IfcFanType::PredefinedType() const { return IfcFanTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcFanType::setPredefinedType(IfcFanTypeEnum::IfcFanTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcFanTypeEnum::ToString(v)); }
 bool IfcFanType::is(Type::Enum v) const { return v == Type::IfcFanType || IfcFlowMovingDeviceType::is(v); }
 Type::Enum IfcFanType::type() const { return Type::IfcFanType; }
 Type::Enum IfcFanType::Class() { return Type::IfcFanType; }
-IfcFanType::IfcFanType(IfcAbstractEntityPtr e) : IfcFlowMovingDeviceType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcFanType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcFanType::IfcFanType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcFanTypeEnum::IfcFanTypeEnum v10_PredefinedType) : IfcFlowMovingDeviceType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcFanTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcFanType::IfcFanType(IfcAbstractEntity* e) : IfcFlowMovingDeviceType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcFanType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcFanType::IfcFanType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcFanTypeEnum::IfcFanTypeEnum v10_PredefinedType) : IfcFlowMovingDeviceType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcFanTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcFastener
 bool IfcFastener::is(Type::Enum v) const { return v == Type::IfcFastener || IfcElementComponent::is(v); }
 Type::Enum IfcFastener::type() const { return Type::IfcFastener; }
 Type::Enum IfcFastener::Class() { return Type::IfcFastener; }
-IfcFastener::IfcFastener(IfcAbstractEntityPtr e) : IfcElementComponent((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcFastener)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcFastener::IfcFastener(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag) : IfcElementComponent((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
+IfcFastener::IfcFastener(IfcAbstractEntity* e) : IfcElementComponent((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcFastener)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcFastener::IfcFastener(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag) : IfcElementComponent((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcFastenerType
 bool IfcFastenerType::is(Type::Enum v) const { return v == Type::IfcFastenerType || IfcElementComponentType::is(v); }
 Type::Enum IfcFastenerType::type() const { return Type::IfcFastenerType; }
 Type::Enum IfcFastenerType::Class() { return Type::IfcFastenerType; }
-IfcFastenerType::IfcFastenerType(IfcAbstractEntityPtr e) : IfcElementComponentType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcFastenerType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcFastenerType::IfcFastenerType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType) : IfcElementComponentType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcFastenerType::IfcFastenerType(IfcAbstractEntity* e) : IfcElementComponentType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcFastenerType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcFastenerType::IfcFastenerType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType) : IfcElementComponentType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcFeatureElement
 bool IfcFeatureElement::is(Type::Enum v) const { return v == Type::IfcFeatureElement || IfcElement::is(v); }
 Type::Enum IfcFeatureElement::type() const { return Type::IfcFeatureElement; }
 Type::Enum IfcFeatureElement::Class() { return Type::IfcFeatureElement; }
-IfcFeatureElement::IfcFeatureElement(IfcAbstractEntityPtr e) : IfcElement((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcFeatureElement)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcFeatureElement::IfcFeatureElement(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag) : IfcElement((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
+IfcFeatureElement::IfcFeatureElement(IfcAbstractEntity* e) : IfcElement((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcFeatureElement)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcFeatureElement::IfcFeatureElement(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag) : IfcElement((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcFeatureElementAddition
-IfcRelProjectsElement::list IfcFeatureElementAddition::ProjectsElements() { RETURN_INVERSE(IfcRelProjectsElement) }
+IfcRelProjectsElement::list::ptr IfcFeatureElementAddition::ProjectsElements() const { return entity->getInverse(Type::IfcRelProjectsElement, 5)->as<IfcRelProjectsElement>(); }
 bool IfcFeatureElementAddition::is(Type::Enum v) const { return v == Type::IfcFeatureElementAddition || IfcFeatureElement::is(v); }
 Type::Enum IfcFeatureElementAddition::type() const { return Type::IfcFeatureElementAddition; }
 Type::Enum IfcFeatureElementAddition::Class() { return Type::IfcFeatureElementAddition; }
-IfcFeatureElementAddition::IfcFeatureElementAddition(IfcAbstractEntityPtr e) : IfcFeatureElement((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcFeatureElementAddition)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcFeatureElementAddition::IfcFeatureElementAddition(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag) : IfcFeatureElement((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
+IfcFeatureElementAddition::IfcFeatureElementAddition(IfcAbstractEntity* e) : IfcFeatureElement((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcFeatureElementAddition)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcFeatureElementAddition::IfcFeatureElementAddition(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag) : IfcFeatureElement((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcFeatureElementSubtraction
-IfcRelVoidsElement::list IfcFeatureElementSubtraction::VoidsElements() { RETURN_INVERSE(IfcRelVoidsElement) }
+IfcRelVoidsElement::list::ptr IfcFeatureElementSubtraction::VoidsElements() const { return entity->getInverse(Type::IfcRelVoidsElement, 5)->as<IfcRelVoidsElement>(); }
 bool IfcFeatureElementSubtraction::is(Type::Enum v) const { return v == Type::IfcFeatureElementSubtraction || IfcFeatureElement::is(v); }
 Type::Enum IfcFeatureElementSubtraction::type() const { return Type::IfcFeatureElementSubtraction; }
 Type::Enum IfcFeatureElementSubtraction::Class() { return Type::IfcFeatureElementSubtraction; }
-IfcFeatureElementSubtraction::IfcFeatureElementSubtraction(IfcAbstractEntityPtr e) : IfcFeatureElement((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcFeatureElementSubtraction)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcFeatureElementSubtraction::IfcFeatureElementSubtraction(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag) : IfcFeatureElement((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
+IfcFeatureElementSubtraction::IfcFeatureElementSubtraction(IfcAbstractEntity* e) : IfcFeatureElement((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcFeatureElementSubtraction)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcFeatureElementSubtraction::IfcFeatureElementSubtraction(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag) : IfcFeatureElement((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcFillAreaStyle
-SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > IfcFillAreaStyle::FillStyles() { RETURN_AS_LIST(IfcUtil::IfcAbstractSelect,1) }
-void IfcFillAreaStyle::setFillStyles(SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v->generalize()); }
+IfcEntityList::ptr IfcFillAreaStyle::FillStyles() const { return *entity->getArgument(1); }
+void IfcFillAreaStyle::setFillStyles(IfcEntityList::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
 bool IfcFillAreaStyle::is(Type::Enum v) const { return v == Type::IfcFillAreaStyle || IfcPresentationStyle::is(v); }
 Type::Enum IfcFillAreaStyle::type() const { return Type::IfcFillAreaStyle; }
 Type::Enum IfcFillAreaStyle::Class() { return Type::IfcFillAreaStyle; }
-IfcFillAreaStyle::IfcFillAreaStyle(IfcAbstractEntityPtr e) : IfcPresentationStyle((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcFillAreaStyle)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcFillAreaStyle::IfcFillAreaStyle(boost::optional< IfcLabel > v1_Name, IfcEntities v2_FillStyles) : IfcPresentationStyle((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } e->setArgument(1,(v2_FillStyles)); entity = e; EntityBuffer::Add(this); }
+IfcFillAreaStyle::IfcFillAreaStyle(IfcAbstractEntity* e) : IfcPresentationStyle((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcFillAreaStyle)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcFillAreaStyle::IfcFillAreaStyle(boost::optional< std::string > v1_Name, IfcEntityList::ptr v2_FillStyles) : IfcPresentationStyle((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } e->setArgument(1,(v2_FillStyles)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcFillAreaStyleHatching
-IfcCurveStyle* IfcFillAreaStyleHatching::HatchLineAppearance() { return (IfcCurveStyle*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(0))); }
+IfcCurveStyle* IfcFillAreaStyleHatching::HatchLineAppearance() const { return (IfcCurveStyle*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(0))); }
 void IfcFillAreaStyleHatching::setHatchLineAppearance(IfcCurveStyle* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-IfcHatchLineDistanceSelect IfcFillAreaStyleHatching::StartOfNextHatchLine() { return *entity->getArgument(1); }
-void IfcFillAreaStyleHatching::setStartOfNextHatchLine(IfcHatchLineDistanceSelect v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-bool IfcFillAreaStyleHatching::hasPointOfReferenceHatchLine() { return !entity->getArgument(2)->isNull(); }
-IfcCartesianPoint* IfcFillAreaStyleHatching::PointOfReferenceHatchLine() { return (IfcCartesianPoint*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(2))); }
+IfcHatchLineDistanceSelect* IfcFillAreaStyleHatching::StartOfNextHatchLine() const { return (IfcHatchLineDistanceSelect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(1))); }
+void IfcFillAreaStyleHatching::setStartOfNextHatchLine(IfcHatchLineDistanceSelect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+bool IfcFillAreaStyleHatching::hasPointOfReferenceHatchLine() const { return !entity->getArgument(2)->isNull(); }
+IfcCartesianPoint* IfcFillAreaStyleHatching::PointOfReferenceHatchLine() const { return (IfcCartesianPoint*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(2))); }
 void IfcFillAreaStyleHatching::setPointOfReferenceHatchLine(IfcCartesianPoint* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-bool IfcFillAreaStyleHatching::hasPatternStart() { return !entity->getArgument(3)->isNull(); }
-IfcCartesianPoint* IfcFillAreaStyleHatching::PatternStart() { return (IfcCartesianPoint*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(3))); }
+bool IfcFillAreaStyleHatching::hasPatternStart() const { return !entity->getArgument(3)->isNull(); }
+IfcCartesianPoint* IfcFillAreaStyleHatching::PatternStart() const { return (IfcCartesianPoint*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(3))); }
 void IfcFillAreaStyleHatching::setPatternStart(IfcCartesianPoint* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-IfcPlaneAngleMeasure IfcFillAreaStyleHatching::HatchLineAngle() { return *entity->getArgument(4); }
-void IfcFillAreaStyleHatching::setHatchLineAngle(IfcPlaneAngleMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+double IfcFillAreaStyleHatching::HatchLineAngle() const { return *entity->getArgument(4); }
+void IfcFillAreaStyleHatching::setHatchLineAngle(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
 bool IfcFillAreaStyleHatching::is(Type::Enum v) const { return v == Type::IfcFillAreaStyleHatching || IfcGeometricRepresentationItem::is(v); }
 Type::Enum IfcFillAreaStyleHatching::type() const { return Type::IfcFillAreaStyleHatching; }
 Type::Enum IfcFillAreaStyleHatching::Class() { return Type::IfcFillAreaStyleHatching; }
-IfcFillAreaStyleHatching::IfcFillAreaStyleHatching(IfcAbstractEntityPtr e) : IfcGeometricRepresentationItem((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcFillAreaStyleHatching)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcFillAreaStyleHatching::IfcFillAreaStyleHatching(IfcCurveStyle* v1_HatchLineAppearance, IfcHatchLineDistanceSelect v2_StartOfNextHatchLine, IfcCartesianPoint* v3_PointOfReferenceHatchLine, IfcCartesianPoint* v4_PatternStart, IfcPlaneAngleMeasure v5_HatchLineAngle) : IfcGeometricRepresentationItem((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_HatchLineAppearance)); e->setArgument(1,(v2_StartOfNextHatchLine)); e->setArgument(2,(v3_PointOfReferenceHatchLine)); e->setArgument(3,(v4_PatternStart)); e->setArgument(4,(v5_HatchLineAngle)); entity = e; EntityBuffer::Add(this); }
+IfcFillAreaStyleHatching::IfcFillAreaStyleHatching(IfcAbstractEntity* e) : IfcGeometricRepresentationItem((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcFillAreaStyleHatching)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcFillAreaStyleHatching::IfcFillAreaStyleHatching(IfcCurveStyle* v1_HatchLineAppearance, IfcHatchLineDistanceSelect* v2_StartOfNextHatchLine, IfcCartesianPoint* v3_PointOfReferenceHatchLine, IfcCartesianPoint* v4_PatternStart, double v5_HatchLineAngle) : IfcGeometricRepresentationItem((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_HatchLineAppearance)); e->setArgument(1,(v2_StartOfNextHatchLine)); e->setArgument(2,(v3_PointOfReferenceHatchLine)); e->setArgument(3,(v4_PatternStart)); e->setArgument(4,(v5_HatchLineAngle)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcFillAreaStyleTileSymbolWithStyle
-IfcAnnotationSymbolOccurrence* IfcFillAreaStyleTileSymbolWithStyle::Symbol() { return (IfcAnnotationSymbolOccurrence*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(0))); }
+IfcAnnotationSymbolOccurrence* IfcFillAreaStyleTileSymbolWithStyle::Symbol() const { return (IfcAnnotationSymbolOccurrence*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(0))); }
 void IfcFillAreaStyleTileSymbolWithStyle::setSymbol(IfcAnnotationSymbolOccurrence* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
 bool IfcFillAreaStyleTileSymbolWithStyle::is(Type::Enum v) const { return v == Type::IfcFillAreaStyleTileSymbolWithStyle || IfcGeometricRepresentationItem::is(v); }
 Type::Enum IfcFillAreaStyleTileSymbolWithStyle::type() const { return Type::IfcFillAreaStyleTileSymbolWithStyle; }
 Type::Enum IfcFillAreaStyleTileSymbolWithStyle::Class() { return Type::IfcFillAreaStyleTileSymbolWithStyle; }
-IfcFillAreaStyleTileSymbolWithStyle::IfcFillAreaStyleTileSymbolWithStyle(IfcAbstractEntityPtr e) : IfcGeometricRepresentationItem((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcFillAreaStyleTileSymbolWithStyle)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcFillAreaStyleTileSymbolWithStyle::IfcFillAreaStyleTileSymbolWithStyle(IfcAnnotationSymbolOccurrence* v1_Symbol) : IfcGeometricRepresentationItem((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Symbol)); entity = e; EntityBuffer::Add(this); }
+IfcFillAreaStyleTileSymbolWithStyle::IfcFillAreaStyleTileSymbolWithStyle(IfcAbstractEntity* e) : IfcGeometricRepresentationItem((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcFillAreaStyleTileSymbolWithStyle)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcFillAreaStyleTileSymbolWithStyle::IfcFillAreaStyleTileSymbolWithStyle(IfcAnnotationSymbolOccurrence* v1_Symbol) : IfcGeometricRepresentationItem((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Symbol)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcFillAreaStyleTiles
-IfcOneDirectionRepeatFactor* IfcFillAreaStyleTiles::TilingPattern() { return (IfcOneDirectionRepeatFactor*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(0))); }
+IfcOneDirectionRepeatFactor* IfcFillAreaStyleTiles::TilingPattern() const { return (IfcOneDirectionRepeatFactor*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(0))); }
 void IfcFillAreaStyleTiles::setTilingPattern(IfcOneDirectionRepeatFactor* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > IfcFillAreaStyleTiles::Tiles() { RETURN_AS_LIST(IfcUtil::IfcAbstractSelect,1) }
-void IfcFillAreaStyleTiles::setTiles(SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v->generalize()); }
-IfcPositiveRatioMeasure IfcFillAreaStyleTiles::TilingScale() { return *entity->getArgument(2); }
-void IfcFillAreaStyleTiles::setTilingScale(IfcPositiveRatioMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+IfcEntityList::ptr IfcFillAreaStyleTiles::Tiles() const { return *entity->getArgument(1); }
+void IfcFillAreaStyleTiles::setTiles(IfcEntityList::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+double IfcFillAreaStyleTiles::TilingScale() const { return *entity->getArgument(2); }
+void IfcFillAreaStyleTiles::setTilingScale(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
 bool IfcFillAreaStyleTiles::is(Type::Enum v) const { return v == Type::IfcFillAreaStyleTiles || IfcGeometricRepresentationItem::is(v); }
 Type::Enum IfcFillAreaStyleTiles::type() const { return Type::IfcFillAreaStyleTiles; }
 Type::Enum IfcFillAreaStyleTiles::Class() { return Type::IfcFillAreaStyleTiles; }
-IfcFillAreaStyleTiles::IfcFillAreaStyleTiles(IfcAbstractEntityPtr e) : IfcGeometricRepresentationItem((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcFillAreaStyleTiles)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcFillAreaStyleTiles::IfcFillAreaStyleTiles(IfcOneDirectionRepeatFactor* v1_TilingPattern, IfcEntities v2_Tiles, IfcPositiveRatioMeasure v3_TilingScale) : IfcGeometricRepresentationItem((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_TilingPattern)); e->setArgument(1,(v2_Tiles)); e->setArgument(2,(v3_TilingScale)); entity = e; EntityBuffer::Add(this); }
+IfcFillAreaStyleTiles::IfcFillAreaStyleTiles(IfcAbstractEntity* e) : IfcGeometricRepresentationItem((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcFillAreaStyleTiles)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcFillAreaStyleTiles::IfcFillAreaStyleTiles(IfcOneDirectionRepeatFactor* v1_TilingPattern, IfcEntityList::ptr v2_Tiles, double v3_TilingScale) : IfcGeometricRepresentationItem((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_TilingPattern)); e->setArgument(1,(v2_Tiles)); e->setArgument(2,(v3_TilingScale)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcFilterType
-IfcFilterTypeEnum::IfcFilterTypeEnum IfcFilterType::PredefinedType() { return IfcFilterTypeEnum::FromString(*entity->getArgument(9)); }
+IfcFilterTypeEnum::IfcFilterTypeEnum IfcFilterType::PredefinedType() const { return IfcFilterTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcFilterType::setPredefinedType(IfcFilterTypeEnum::IfcFilterTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcFilterTypeEnum::ToString(v)); }
 bool IfcFilterType::is(Type::Enum v) const { return v == Type::IfcFilterType || IfcFlowTreatmentDeviceType::is(v); }
 Type::Enum IfcFilterType::type() const { return Type::IfcFilterType; }
 Type::Enum IfcFilterType::Class() { return Type::IfcFilterType; }
-IfcFilterType::IfcFilterType(IfcAbstractEntityPtr e) : IfcFlowTreatmentDeviceType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcFilterType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcFilterType::IfcFilterType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcFilterTypeEnum::IfcFilterTypeEnum v10_PredefinedType) : IfcFlowTreatmentDeviceType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcFilterTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcFilterType::IfcFilterType(IfcAbstractEntity* e) : IfcFlowTreatmentDeviceType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcFilterType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcFilterType::IfcFilterType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcFilterTypeEnum::IfcFilterTypeEnum v10_PredefinedType) : IfcFlowTreatmentDeviceType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcFilterTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcFireSuppressionTerminalType
-IfcFireSuppressionTerminalTypeEnum::IfcFireSuppressionTerminalTypeEnum IfcFireSuppressionTerminalType::PredefinedType() { return IfcFireSuppressionTerminalTypeEnum::FromString(*entity->getArgument(9)); }
+IfcFireSuppressionTerminalTypeEnum::IfcFireSuppressionTerminalTypeEnum IfcFireSuppressionTerminalType::PredefinedType() const { return IfcFireSuppressionTerminalTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcFireSuppressionTerminalType::setPredefinedType(IfcFireSuppressionTerminalTypeEnum::IfcFireSuppressionTerminalTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcFireSuppressionTerminalTypeEnum::ToString(v)); }
 bool IfcFireSuppressionTerminalType::is(Type::Enum v) const { return v == Type::IfcFireSuppressionTerminalType || IfcFlowTerminalType::is(v); }
 Type::Enum IfcFireSuppressionTerminalType::type() const { return Type::IfcFireSuppressionTerminalType; }
 Type::Enum IfcFireSuppressionTerminalType::Class() { return Type::IfcFireSuppressionTerminalType; }
-IfcFireSuppressionTerminalType::IfcFireSuppressionTerminalType(IfcAbstractEntityPtr e) : IfcFlowTerminalType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcFireSuppressionTerminalType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcFireSuppressionTerminalType::IfcFireSuppressionTerminalType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcFireSuppressionTerminalTypeEnum::IfcFireSuppressionTerminalTypeEnum v10_PredefinedType) : IfcFlowTerminalType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcFireSuppressionTerminalTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcFireSuppressionTerminalType::IfcFireSuppressionTerminalType(IfcAbstractEntity* e) : IfcFlowTerminalType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcFireSuppressionTerminalType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcFireSuppressionTerminalType::IfcFireSuppressionTerminalType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcFireSuppressionTerminalTypeEnum::IfcFireSuppressionTerminalTypeEnum v10_PredefinedType) : IfcFlowTerminalType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcFireSuppressionTerminalTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcFlowController
 bool IfcFlowController::is(Type::Enum v) const { return v == Type::IfcFlowController || IfcDistributionFlowElement::is(v); }
 Type::Enum IfcFlowController::type() const { return Type::IfcFlowController; }
 Type::Enum IfcFlowController::Class() { return Type::IfcFlowController; }
-IfcFlowController::IfcFlowController(IfcAbstractEntityPtr e) : IfcDistributionFlowElement((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcFlowController)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcFlowController::IfcFlowController(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag) : IfcDistributionFlowElement((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
+IfcFlowController::IfcFlowController(IfcAbstractEntity* e) : IfcDistributionFlowElement((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcFlowController)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcFlowController::IfcFlowController(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag) : IfcDistributionFlowElement((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcFlowControllerType
 bool IfcFlowControllerType::is(Type::Enum v) const { return v == Type::IfcFlowControllerType || IfcDistributionFlowElementType::is(v); }
 Type::Enum IfcFlowControllerType::type() const { return Type::IfcFlowControllerType; }
 Type::Enum IfcFlowControllerType::Class() { return Type::IfcFlowControllerType; }
-IfcFlowControllerType::IfcFlowControllerType(IfcAbstractEntityPtr e) : IfcDistributionFlowElementType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcFlowControllerType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcFlowControllerType::IfcFlowControllerType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType) : IfcDistributionFlowElementType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcFlowControllerType::IfcFlowControllerType(IfcAbstractEntity* e) : IfcDistributionFlowElementType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcFlowControllerType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcFlowControllerType::IfcFlowControllerType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType) : IfcDistributionFlowElementType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcFlowFitting
 bool IfcFlowFitting::is(Type::Enum v) const { return v == Type::IfcFlowFitting || IfcDistributionFlowElement::is(v); }
 Type::Enum IfcFlowFitting::type() const { return Type::IfcFlowFitting; }
 Type::Enum IfcFlowFitting::Class() { return Type::IfcFlowFitting; }
-IfcFlowFitting::IfcFlowFitting(IfcAbstractEntityPtr e) : IfcDistributionFlowElement((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcFlowFitting)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcFlowFitting::IfcFlowFitting(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag) : IfcDistributionFlowElement((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
+IfcFlowFitting::IfcFlowFitting(IfcAbstractEntity* e) : IfcDistributionFlowElement((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcFlowFitting)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcFlowFitting::IfcFlowFitting(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag) : IfcDistributionFlowElement((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcFlowFittingType
 bool IfcFlowFittingType::is(Type::Enum v) const { return v == Type::IfcFlowFittingType || IfcDistributionFlowElementType::is(v); }
 Type::Enum IfcFlowFittingType::type() const { return Type::IfcFlowFittingType; }
 Type::Enum IfcFlowFittingType::Class() { return Type::IfcFlowFittingType; }
-IfcFlowFittingType::IfcFlowFittingType(IfcAbstractEntityPtr e) : IfcDistributionFlowElementType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcFlowFittingType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcFlowFittingType::IfcFlowFittingType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType) : IfcDistributionFlowElementType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcFlowFittingType::IfcFlowFittingType(IfcAbstractEntity* e) : IfcDistributionFlowElementType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcFlowFittingType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcFlowFittingType::IfcFlowFittingType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType) : IfcDistributionFlowElementType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcFlowInstrumentType
-IfcFlowInstrumentTypeEnum::IfcFlowInstrumentTypeEnum IfcFlowInstrumentType::PredefinedType() { return IfcFlowInstrumentTypeEnum::FromString(*entity->getArgument(9)); }
+IfcFlowInstrumentTypeEnum::IfcFlowInstrumentTypeEnum IfcFlowInstrumentType::PredefinedType() const { return IfcFlowInstrumentTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcFlowInstrumentType::setPredefinedType(IfcFlowInstrumentTypeEnum::IfcFlowInstrumentTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcFlowInstrumentTypeEnum::ToString(v)); }
 bool IfcFlowInstrumentType::is(Type::Enum v) const { return v == Type::IfcFlowInstrumentType || IfcDistributionControlElementType::is(v); }
 Type::Enum IfcFlowInstrumentType::type() const { return Type::IfcFlowInstrumentType; }
 Type::Enum IfcFlowInstrumentType::Class() { return Type::IfcFlowInstrumentType; }
-IfcFlowInstrumentType::IfcFlowInstrumentType(IfcAbstractEntityPtr e) : IfcDistributionControlElementType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcFlowInstrumentType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcFlowInstrumentType::IfcFlowInstrumentType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcFlowInstrumentTypeEnum::IfcFlowInstrumentTypeEnum v10_PredefinedType) : IfcDistributionControlElementType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcFlowInstrumentTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcFlowInstrumentType::IfcFlowInstrumentType(IfcAbstractEntity* e) : IfcDistributionControlElementType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcFlowInstrumentType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcFlowInstrumentType::IfcFlowInstrumentType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcFlowInstrumentTypeEnum::IfcFlowInstrumentTypeEnum v10_PredefinedType) : IfcDistributionControlElementType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcFlowInstrumentTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcFlowMeterType
-IfcFlowMeterTypeEnum::IfcFlowMeterTypeEnum IfcFlowMeterType::PredefinedType() { return IfcFlowMeterTypeEnum::FromString(*entity->getArgument(9)); }
+IfcFlowMeterTypeEnum::IfcFlowMeterTypeEnum IfcFlowMeterType::PredefinedType() const { return IfcFlowMeterTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcFlowMeterType::setPredefinedType(IfcFlowMeterTypeEnum::IfcFlowMeterTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcFlowMeterTypeEnum::ToString(v)); }
 bool IfcFlowMeterType::is(Type::Enum v) const { return v == Type::IfcFlowMeterType || IfcFlowControllerType::is(v); }
 Type::Enum IfcFlowMeterType::type() const { return Type::IfcFlowMeterType; }
 Type::Enum IfcFlowMeterType::Class() { return Type::IfcFlowMeterType; }
-IfcFlowMeterType::IfcFlowMeterType(IfcAbstractEntityPtr e) : IfcFlowControllerType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcFlowMeterType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcFlowMeterType::IfcFlowMeterType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcFlowMeterTypeEnum::IfcFlowMeterTypeEnum v10_PredefinedType) : IfcFlowControllerType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcFlowMeterTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcFlowMeterType::IfcFlowMeterType(IfcAbstractEntity* e) : IfcFlowControllerType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcFlowMeterType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcFlowMeterType::IfcFlowMeterType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcFlowMeterTypeEnum::IfcFlowMeterTypeEnum v10_PredefinedType) : IfcFlowControllerType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcFlowMeterTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcFlowMovingDevice
 bool IfcFlowMovingDevice::is(Type::Enum v) const { return v == Type::IfcFlowMovingDevice || IfcDistributionFlowElement::is(v); }
 Type::Enum IfcFlowMovingDevice::type() const { return Type::IfcFlowMovingDevice; }
 Type::Enum IfcFlowMovingDevice::Class() { return Type::IfcFlowMovingDevice; }
-IfcFlowMovingDevice::IfcFlowMovingDevice(IfcAbstractEntityPtr e) : IfcDistributionFlowElement((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcFlowMovingDevice)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcFlowMovingDevice::IfcFlowMovingDevice(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag) : IfcDistributionFlowElement((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
+IfcFlowMovingDevice::IfcFlowMovingDevice(IfcAbstractEntity* e) : IfcDistributionFlowElement((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcFlowMovingDevice)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcFlowMovingDevice::IfcFlowMovingDevice(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag) : IfcDistributionFlowElement((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcFlowMovingDeviceType
 bool IfcFlowMovingDeviceType::is(Type::Enum v) const { return v == Type::IfcFlowMovingDeviceType || IfcDistributionFlowElementType::is(v); }
 Type::Enum IfcFlowMovingDeviceType::type() const { return Type::IfcFlowMovingDeviceType; }
 Type::Enum IfcFlowMovingDeviceType::Class() { return Type::IfcFlowMovingDeviceType; }
-IfcFlowMovingDeviceType::IfcFlowMovingDeviceType(IfcAbstractEntityPtr e) : IfcDistributionFlowElementType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcFlowMovingDeviceType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcFlowMovingDeviceType::IfcFlowMovingDeviceType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType) : IfcDistributionFlowElementType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcFlowMovingDeviceType::IfcFlowMovingDeviceType(IfcAbstractEntity* e) : IfcDistributionFlowElementType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcFlowMovingDeviceType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcFlowMovingDeviceType::IfcFlowMovingDeviceType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType) : IfcDistributionFlowElementType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcFlowSegment
 bool IfcFlowSegment::is(Type::Enum v) const { return v == Type::IfcFlowSegment || IfcDistributionFlowElement::is(v); }
 Type::Enum IfcFlowSegment::type() const { return Type::IfcFlowSegment; }
 Type::Enum IfcFlowSegment::Class() { return Type::IfcFlowSegment; }
-IfcFlowSegment::IfcFlowSegment(IfcAbstractEntityPtr e) : IfcDistributionFlowElement((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcFlowSegment)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcFlowSegment::IfcFlowSegment(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag) : IfcDistributionFlowElement((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
+IfcFlowSegment::IfcFlowSegment(IfcAbstractEntity* e) : IfcDistributionFlowElement((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcFlowSegment)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcFlowSegment::IfcFlowSegment(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag) : IfcDistributionFlowElement((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcFlowSegmentType
 bool IfcFlowSegmentType::is(Type::Enum v) const { return v == Type::IfcFlowSegmentType || IfcDistributionFlowElementType::is(v); }
 Type::Enum IfcFlowSegmentType::type() const { return Type::IfcFlowSegmentType; }
 Type::Enum IfcFlowSegmentType::Class() { return Type::IfcFlowSegmentType; }
-IfcFlowSegmentType::IfcFlowSegmentType(IfcAbstractEntityPtr e) : IfcDistributionFlowElementType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcFlowSegmentType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcFlowSegmentType::IfcFlowSegmentType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType) : IfcDistributionFlowElementType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcFlowSegmentType::IfcFlowSegmentType(IfcAbstractEntity* e) : IfcDistributionFlowElementType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcFlowSegmentType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcFlowSegmentType::IfcFlowSegmentType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType) : IfcDistributionFlowElementType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcFlowStorageDevice
 bool IfcFlowStorageDevice::is(Type::Enum v) const { return v == Type::IfcFlowStorageDevice || IfcDistributionFlowElement::is(v); }
 Type::Enum IfcFlowStorageDevice::type() const { return Type::IfcFlowStorageDevice; }
 Type::Enum IfcFlowStorageDevice::Class() { return Type::IfcFlowStorageDevice; }
-IfcFlowStorageDevice::IfcFlowStorageDevice(IfcAbstractEntityPtr e) : IfcDistributionFlowElement((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcFlowStorageDevice)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcFlowStorageDevice::IfcFlowStorageDevice(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag) : IfcDistributionFlowElement((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
+IfcFlowStorageDevice::IfcFlowStorageDevice(IfcAbstractEntity* e) : IfcDistributionFlowElement((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcFlowStorageDevice)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcFlowStorageDevice::IfcFlowStorageDevice(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag) : IfcDistributionFlowElement((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcFlowStorageDeviceType
 bool IfcFlowStorageDeviceType::is(Type::Enum v) const { return v == Type::IfcFlowStorageDeviceType || IfcDistributionFlowElementType::is(v); }
 Type::Enum IfcFlowStorageDeviceType::type() const { return Type::IfcFlowStorageDeviceType; }
 Type::Enum IfcFlowStorageDeviceType::Class() { return Type::IfcFlowStorageDeviceType; }
-IfcFlowStorageDeviceType::IfcFlowStorageDeviceType(IfcAbstractEntityPtr e) : IfcDistributionFlowElementType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcFlowStorageDeviceType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcFlowStorageDeviceType::IfcFlowStorageDeviceType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType) : IfcDistributionFlowElementType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcFlowStorageDeviceType::IfcFlowStorageDeviceType(IfcAbstractEntity* e) : IfcDistributionFlowElementType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcFlowStorageDeviceType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcFlowStorageDeviceType::IfcFlowStorageDeviceType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType) : IfcDistributionFlowElementType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcFlowTerminal
 bool IfcFlowTerminal::is(Type::Enum v) const { return v == Type::IfcFlowTerminal || IfcDistributionFlowElement::is(v); }
 Type::Enum IfcFlowTerminal::type() const { return Type::IfcFlowTerminal; }
 Type::Enum IfcFlowTerminal::Class() { return Type::IfcFlowTerminal; }
-IfcFlowTerminal::IfcFlowTerminal(IfcAbstractEntityPtr e) : IfcDistributionFlowElement((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcFlowTerminal)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcFlowTerminal::IfcFlowTerminal(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag) : IfcDistributionFlowElement((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
+IfcFlowTerminal::IfcFlowTerminal(IfcAbstractEntity* e) : IfcDistributionFlowElement((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcFlowTerminal)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcFlowTerminal::IfcFlowTerminal(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag) : IfcDistributionFlowElement((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcFlowTerminalType
 bool IfcFlowTerminalType::is(Type::Enum v) const { return v == Type::IfcFlowTerminalType || IfcDistributionFlowElementType::is(v); }
 Type::Enum IfcFlowTerminalType::type() const { return Type::IfcFlowTerminalType; }
 Type::Enum IfcFlowTerminalType::Class() { return Type::IfcFlowTerminalType; }
-IfcFlowTerminalType::IfcFlowTerminalType(IfcAbstractEntityPtr e) : IfcDistributionFlowElementType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcFlowTerminalType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcFlowTerminalType::IfcFlowTerminalType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType) : IfcDistributionFlowElementType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcFlowTerminalType::IfcFlowTerminalType(IfcAbstractEntity* e) : IfcDistributionFlowElementType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcFlowTerminalType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcFlowTerminalType::IfcFlowTerminalType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType) : IfcDistributionFlowElementType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcFlowTreatmentDevice
 bool IfcFlowTreatmentDevice::is(Type::Enum v) const { return v == Type::IfcFlowTreatmentDevice || IfcDistributionFlowElement::is(v); }
 Type::Enum IfcFlowTreatmentDevice::type() const { return Type::IfcFlowTreatmentDevice; }
 Type::Enum IfcFlowTreatmentDevice::Class() { return Type::IfcFlowTreatmentDevice; }
-IfcFlowTreatmentDevice::IfcFlowTreatmentDevice(IfcAbstractEntityPtr e) : IfcDistributionFlowElement((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcFlowTreatmentDevice)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcFlowTreatmentDevice::IfcFlowTreatmentDevice(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag) : IfcDistributionFlowElement((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
+IfcFlowTreatmentDevice::IfcFlowTreatmentDevice(IfcAbstractEntity* e) : IfcDistributionFlowElement((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcFlowTreatmentDevice)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcFlowTreatmentDevice::IfcFlowTreatmentDevice(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag) : IfcDistributionFlowElement((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcFlowTreatmentDeviceType
 bool IfcFlowTreatmentDeviceType::is(Type::Enum v) const { return v == Type::IfcFlowTreatmentDeviceType || IfcDistributionFlowElementType::is(v); }
 Type::Enum IfcFlowTreatmentDeviceType::type() const { return Type::IfcFlowTreatmentDeviceType; }
 Type::Enum IfcFlowTreatmentDeviceType::Class() { return Type::IfcFlowTreatmentDeviceType; }
-IfcFlowTreatmentDeviceType::IfcFlowTreatmentDeviceType(IfcAbstractEntityPtr e) : IfcDistributionFlowElementType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcFlowTreatmentDeviceType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcFlowTreatmentDeviceType::IfcFlowTreatmentDeviceType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType) : IfcDistributionFlowElementType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcFlowTreatmentDeviceType::IfcFlowTreatmentDeviceType(IfcAbstractEntity* e) : IfcDistributionFlowElementType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcFlowTreatmentDeviceType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcFlowTreatmentDeviceType::IfcFlowTreatmentDeviceType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType) : IfcDistributionFlowElementType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcFluidFlowProperties
-IfcPropertySourceEnum::IfcPropertySourceEnum IfcFluidFlowProperties::PropertySource() { return IfcPropertySourceEnum::FromString(*entity->getArgument(4)); }
+IfcPropertySourceEnum::IfcPropertySourceEnum IfcFluidFlowProperties::PropertySource() const { return IfcPropertySourceEnum::FromString(*entity->getArgument(4)); }
 void IfcFluidFlowProperties::setPropertySource(IfcPropertySourceEnum::IfcPropertySourceEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v,IfcPropertySourceEnum::ToString(v)); }
-bool IfcFluidFlowProperties::hasFlowConditionTimeSeries() { return !entity->getArgument(5)->isNull(); }
-IfcTimeSeries* IfcFluidFlowProperties::FlowConditionTimeSeries() { return (IfcTimeSeries*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(5))); }
+bool IfcFluidFlowProperties::hasFlowConditionTimeSeries() const { return !entity->getArgument(5)->isNull(); }
+IfcTimeSeries* IfcFluidFlowProperties::FlowConditionTimeSeries() const { return (IfcTimeSeries*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(5))); }
 void IfcFluidFlowProperties::setFlowConditionTimeSeries(IfcTimeSeries* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-bool IfcFluidFlowProperties::hasVelocityTimeSeries() { return !entity->getArgument(6)->isNull(); }
-IfcTimeSeries* IfcFluidFlowProperties::VelocityTimeSeries() { return (IfcTimeSeries*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(6))); }
+bool IfcFluidFlowProperties::hasVelocityTimeSeries() const { return !entity->getArgument(6)->isNull(); }
+IfcTimeSeries* IfcFluidFlowProperties::VelocityTimeSeries() const { return (IfcTimeSeries*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(6))); }
 void IfcFluidFlowProperties::setVelocityTimeSeries(IfcTimeSeries* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
-bool IfcFluidFlowProperties::hasFlowrateTimeSeries() { return !entity->getArgument(7)->isNull(); }
-IfcTimeSeries* IfcFluidFlowProperties::FlowrateTimeSeries() { return (IfcTimeSeries*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(7))); }
+bool IfcFluidFlowProperties::hasFlowrateTimeSeries() const { return !entity->getArgument(7)->isNull(); }
+IfcTimeSeries* IfcFluidFlowProperties::FlowrateTimeSeries() const { return (IfcTimeSeries*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(7))); }
 void IfcFluidFlowProperties::setFlowrateTimeSeries(IfcTimeSeries* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
-IfcMaterial* IfcFluidFlowProperties::Fluid() { return (IfcMaterial*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(8))); }
+IfcMaterial* IfcFluidFlowProperties::Fluid() const { return (IfcMaterial*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(8))); }
 void IfcFluidFlowProperties::setFluid(IfcMaterial* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
-bool IfcFluidFlowProperties::hasPressureTimeSeries() { return !entity->getArgument(9)->isNull(); }
-IfcTimeSeries* IfcFluidFlowProperties::PressureTimeSeries() { return (IfcTimeSeries*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(9))); }
+bool IfcFluidFlowProperties::hasPressureTimeSeries() const { return !entity->getArgument(9)->isNull(); }
+IfcTimeSeries* IfcFluidFlowProperties::PressureTimeSeries() const { return (IfcTimeSeries*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(9))); }
 void IfcFluidFlowProperties::setPressureTimeSeries(IfcTimeSeries* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
-bool IfcFluidFlowProperties::hasUserDefinedPropertySource() { return !entity->getArgument(10)->isNull(); }
-IfcLabel IfcFluidFlowProperties::UserDefinedPropertySource() { return *entity->getArgument(10); }
-void IfcFluidFlowProperties::setUserDefinedPropertySource(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
-bool IfcFluidFlowProperties::hasTemperatureSingleValue() { return !entity->getArgument(11)->isNull(); }
-IfcThermodynamicTemperatureMeasure IfcFluidFlowProperties::TemperatureSingleValue() { return *entity->getArgument(11); }
-void IfcFluidFlowProperties::setTemperatureSingleValue(IfcThermodynamicTemperatureMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(11,v); }
-bool IfcFluidFlowProperties::hasWetBulbTemperatureSingleValue() { return !entity->getArgument(12)->isNull(); }
-IfcThermodynamicTemperatureMeasure IfcFluidFlowProperties::WetBulbTemperatureSingleValue() { return *entity->getArgument(12); }
-void IfcFluidFlowProperties::setWetBulbTemperatureSingleValue(IfcThermodynamicTemperatureMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(12,v); }
-bool IfcFluidFlowProperties::hasWetBulbTemperatureTimeSeries() { return !entity->getArgument(13)->isNull(); }
-IfcTimeSeries* IfcFluidFlowProperties::WetBulbTemperatureTimeSeries() { return (IfcTimeSeries*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(13))); }
+bool IfcFluidFlowProperties::hasUserDefinedPropertySource() const { return !entity->getArgument(10)->isNull(); }
+std::string IfcFluidFlowProperties::UserDefinedPropertySource() const { return *entity->getArgument(10); }
+void IfcFluidFlowProperties::setUserDefinedPropertySource(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
+bool IfcFluidFlowProperties::hasTemperatureSingleValue() const { return !entity->getArgument(11)->isNull(); }
+double IfcFluidFlowProperties::TemperatureSingleValue() const { return *entity->getArgument(11); }
+void IfcFluidFlowProperties::setTemperatureSingleValue(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(11,v); }
+bool IfcFluidFlowProperties::hasWetBulbTemperatureSingleValue() const { return !entity->getArgument(12)->isNull(); }
+double IfcFluidFlowProperties::WetBulbTemperatureSingleValue() const { return *entity->getArgument(12); }
+void IfcFluidFlowProperties::setWetBulbTemperatureSingleValue(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(12,v); }
+bool IfcFluidFlowProperties::hasWetBulbTemperatureTimeSeries() const { return !entity->getArgument(13)->isNull(); }
+IfcTimeSeries* IfcFluidFlowProperties::WetBulbTemperatureTimeSeries() const { return (IfcTimeSeries*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(13))); }
 void IfcFluidFlowProperties::setWetBulbTemperatureTimeSeries(IfcTimeSeries* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(13,v); }
-bool IfcFluidFlowProperties::hasTemperatureTimeSeries() { return !entity->getArgument(14)->isNull(); }
-IfcTimeSeries* IfcFluidFlowProperties::TemperatureTimeSeries() { return (IfcTimeSeries*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(14))); }
+bool IfcFluidFlowProperties::hasTemperatureTimeSeries() const { return !entity->getArgument(14)->isNull(); }
+IfcTimeSeries* IfcFluidFlowProperties::TemperatureTimeSeries() const { return (IfcTimeSeries*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(14))); }
 void IfcFluidFlowProperties::setTemperatureTimeSeries(IfcTimeSeries* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(14,v); }
-bool IfcFluidFlowProperties::hasFlowrateSingleValue() { return !entity->getArgument(15)->isNull(); }
-IfcDerivedMeasureValue IfcFluidFlowProperties::FlowrateSingleValue() { return *entity->getArgument(15); }
-void IfcFluidFlowProperties::setFlowrateSingleValue(IfcDerivedMeasureValue v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(15,v); }
-bool IfcFluidFlowProperties::hasFlowConditionSingleValue() { return !entity->getArgument(16)->isNull(); }
-IfcPositiveRatioMeasure IfcFluidFlowProperties::FlowConditionSingleValue() { return *entity->getArgument(16); }
-void IfcFluidFlowProperties::setFlowConditionSingleValue(IfcPositiveRatioMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(16,v); }
-bool IfcFluidFlowProperties::hasVelocitySingleValue() { return !entity->getArgument(17)->isNull(); }
-IfcLinearVelocityMeasure IfcFluidFlowProperties::VelocitySingleValue() { return *entity->getArgument(17); }
-void IfcFluidFlowProperties::setVelocitySingleValue(IfcLinearVelocityMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(17,v); }
-bool IfcFluidFlowProperties::hasPressureSingleValue() { return !entity->getArgument(18)->isNull(); }
-IfcPressureMeasure IfcFluidFlowProperties::PressureSingleValue() { return *entity->getArgument(18); }
-void IfcFluidFlowProperties::setPressureSingleValue(IfcPressureMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(18,v); }
+bool IfcFluidFlowProperties::hasFlowrateSingleValue() const { return !entity->getArgument(15)->isNull(); }
+IfcDerivedMeasureValue* IfcFluidFlowProperties::FlowrateSingleValue() const { return (IfcDerivedMeasureValue*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(15))); }
+void IfcFluidFlowProperties::setFlowrateSingleValue(IfcDerivedMeasureValue* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(15,v); }
+bool IfcFluidFlowProperties::hasFlowConditionSingleValue() const { return !entity->getArgument(16)->isNull(); }
+double IfcFluidFlowProperties::FlowConditionSingleValue() const { return *entity->getArgument(16); }
+void IfcFluidFlowProperties::setFlowConditionSingleValue(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(16,v); }
+bool IfcFluidFlowProperties::hasVelocitySingleValue() const { return !entity->getArgument(17)->isNull(); }
+double IfcFluidFlowProperties::VelocitySingleValue() const { return *entity->getArgument(17); }
+void IfcFluidFlowProperties::setVelocitySingleValue(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(17,v); }
+bool IfcFluidFlowProperties::hasPressureSingleValue() const { return !entity->getArgument(18)->isNull(); }
+double IfcFluidFlowProperties::PressureSingleValue() const { return *entity->getArgument(18); }
+void IfcFluidFlowProperties::setPressureSingleValue(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(18,v); }
 bool IfcFluidFlowProperties::is(Type::Enum v) const { return v == Type::IfcFluidFlowProperties || IfcPropertySetDefinition::is(v); }
 Type::Enum IfcFluidFlowProperties::type() const { return Type::IfcFluidFlowProperties; }
 Type::Enum IfcFluidFlowProperties::Class() { return Type::IfcFluidFlowProperties; }
-IfcFluidFlowProperties::IfcFluidFlowProperties(IfcAbstractEntityPtr e) : IfcPropertySetDefinition((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcFluidFlowProperties)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcFluidFlowProperties::IfcFluidFlowProperties(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, IfcPropertySourceEnum::IfcPropertySourceEnum v5_PropertySource, IfcTimeSeries* v6_FlowConditionTimeSeries, IfcTimeSeries* v7_VelocityTimeSeries, IfcTimeSeries* v8_FlowrateTimeSeries, IfcMaterial* v9_Fluid, IfcTimeSeries* v10_PressureTimeSeries, boost::optional< IfcLabel > v11_UserDefinedPropertySource, boost::optional< IfcThermodynamicTemperatureMeasure > v12_TemperatureSingleValue, boost::optional< IfcThermodynamicTemperatureMeasure > v13_WetBulbTemperatureSingleValue, IfcTimeSeries* v14_WetBulbTemperatureTimeSeries, IfcTimeSeries* v15_TemperatureTimeSeries, boost::optional< IfcDerivedMeasureValue > v16_FlowrateSingleValue, boost::optional< IfcPositiveRatioMeasure > v17_FlowConditionSingleValue, boost::optional< IfcLinearVelocityMeasure > v18_VelocitySingleValue, boost::optional< IfcPressureMeasure > v19_PressureSingleValue) : IfcPropertySetDefinition((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,v5_PropertySource,IfcPropertySourceEnum::ToString(v5_PropertySource)); e->setArgument(5,(v6_FlowConditionTimeSeries)); e->setArgument(6,(v7_VelocityTimeSeries)); e->setArgument(7,(v8_FlowrateTimeSeries)); e->setArgument(8,(v9_Fluid)); e->setArgument(9,(v10_PressureTimeSeries)); if (v11_UserDefinedPropertySource) { e->setArgument(10,(*v11_UserDefinedPropertySource)); } else { e->setArgument(10); } if (v12_TemperatureSingleValue) { e->setArgument(11,(*v12_TemperatureSingleValue)); } else { e->setArgument(11); } if (v13_WetBulbTemperatureSingleValue) { e->setArgument(12,(*v13_WetBulbTemperatureSingleValue)); } else { e->setArgument(12); } e->setArgument(13,(v14_WetBulbTemperatureTimeSeries)); e->setArgument(14,(v15_TemperatureTimeSeries)); if (v16_FlowrateSingleValue) { e->setArgument(15,(*v16_FlowrateSingleValue)); } else { e->setArgument(15); } if (v17_FlowConditionSingleValue) { e->setArgument(16,(*v17_FlowConditionSingleValue)); } else { e->setArgument(16); } if (v18_VelocitySingleValue) { e->setArgument(17,(*v18_VelocitySingleValue)); } else { e->setArgument(17); } if (v19_PressureSingleValue) { e->setArgument(18,(*v19_PressureSingleValue)); } else { e->setArgument(18); } entity = e; EntityBuffer::Add(this); }
+IfcFluidFlowProperties::IfcFluidFlowProperties(IfcAbstractEntity* e) : IfcPropertySetDefinition((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcFluidFlowProperties)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcFluidFlowProperties::IfcFluidFlowProperties(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcPropertySourceEnum::IfcPropertySourceEnum v5_PropertySource, IfcTimeSeries* v6_FlowConditionTimeSeries, IfcTimeSeries* v7_VelocityTimeSeries, IfcTimeSeries* v8_FlowrateTimeSeries, IfcMaterial* v9_Fluid, IfcTimeSeries* v10_PressureTimeSeries, boost::optional< std::string > v11_UserDefinedPropertySource, boost::optional< double > v12_TemperatureSingleValue, boost::optional< double > v13_WetBulbTemperatureSingleValue, IfcTimeSeries* v14_WetBulbTemperatureTimeSeries, IfcTimeSeries* v15_TemperatureTimeSeries, IfcDerivedMeasureValue* v16_FlowrateSingleValue, boost::optional< double > v17_FlowConditionSingleValue, boost::optional< double > v18_VelocitySingleValue, boost::optional< double > v19_PressureSingleValue) : IfcPropertySetDefinition((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,v5_PropertySource,IfcPropertySourceEnum::ToString(v5_PropertySource)); e->setArgument(5,(v6_FlowConditionTimeSeries)); e->setArgument(6,(v7_VelocityTimeSeries)); e->setArgument(7,(v8_FlowrateTimeSeries)); e->setArgument(8,(v9_Fluid)); e->setArgument(9,(v10_PressureTimeSeries)); if (v11_UserDefinedPropertySource) { e->setArgument(10,(*v11_UserDefinedPropertySource)); } else { e->setArgument(10); } if (v12_TemperatureSingleValue) { e->setArgument(11,(*v12_TemperatureSingleValue)); } else { e->setArgument(11); } if (v13_WetBulbTemperatureSingleValue) { e->setArgument(12,(*v13_WetBulbTemperatureSingleValue)); } else { e->setArgument(12); } e->setArgument(13,(v14_WetBulbTemperatureTimeSeries)); e->setArgument(14,(v15_TemperatureTimeSeries)); e->setArgument(15,(v16_FlowrateSingleValue)); if (v17_FlowConditionSingleValue) { e->setArgument(16,(*v17_FlowConditionSingleValue)); } else { e->setArgument(16); } if (v18_VelocitySingleValue) { e->setArgument(17,(*v18_VelocitySingleValue)); } else { e->setArgument(17); } if (v19_PressureSingleValue) { e->setArgument(18,(*v19_PressureSingleValue)); } else { e->setArgument(18); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcFooting
-IfcFootingTypeEnum::IfcFootingTypeEnum IfcFooting::PredefinedType() { return IfcFootingTypeEnum::FromString(*entity->getArgument(8)); }
+IfcFootingTypeEnum::IfcFootingTypeEnum IfcFooting::PredefinedType() const { return IfcFootingTypeEnum::FromString(*entity->getArgument(8)); }
 void IfcFooting::setPredefinedType(IfcFootingTypeEnum::IfcFootingTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcFootingTypeEnum::ToString(v)); }
 bool IfcFooting::is(Type::Enum v) const { return v == Type::IfcFooting || IfcBuildingElement::is(v); }
 Type::Enum IfcFooting::type() const { return Type::IfcFooting; }
 Type::Enum IfcFooting::Class() { return Type::IfcFooting; }
-IfcFooting::IfcFooting(IfcAbstractEntityPtr e) : IfcBuildingElement((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcFooting)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcFooting::IfcFooting(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, IfcFootingTypeEnum::IfcFootingTypeEnum v9_PredefinedType) : IfcBuildingElement((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } e->setArgument(8,v9_PredefinedType,IfcFootingTypeEnum::ToString(v9_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcFooting::IfcFooting(IfcAbstractEntity* e) : IfcBuildingElement((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcFooting)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcFooting::IfcFooting(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, IfcFootingTypeEnum::IfcFootingTypeEnum v9_PredefinedType) : IfcBuildingElement((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } e->setArgument(8,v9_PredefinedType,IfcFootingTypeEnum::ToString(v9_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcFuelProperties
-bool IfcFuelProperties::hasCombustionTemperature() { return !entity->getArgument(1)->isNull(); }
-IfcThermodynamicTemperatureMeasure IfcFuelProperties::CombustionTemperature() { return *entity->getArgument(1); }
-void IfcFuelProperties::setCombustionTemperature(IfcThermodynamicTemperatureMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-bool IfcFuelProperties::hasCarbonContent() { return !entity->getArgument(2)->isNull(); }
-IfcPositiveRatioMeasure IfcFuelProperties::CarbonContent() { return *entity->getArgument(2); }
-void IfcFuelProperties::setCarbonContent(IfcPositiveRatioMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-bool IfcFuelProperties::hasLowerHeatingValue() { return !entity->getArgument(3)->isNull(); }
-IfcHeatingValueMeasure IfcFuelProperties::LowerHeatingValue() { return *entity->getArgument(3); }
-void IfcFuelProperties::setLowerHeatingValue(IfcHeatingValueMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-bool IfcFuelProperties::hasHigherHeatingValue() { return !entity->getArgument(4)->isNull(); }
-IfcHeatingValueMeasure IfcFuelProperties::HigherHeatingValue() { return *entity->getArgument(4); }
-void IfcFuelProperties::setHigherHeatingValue(IfcHeatingValueMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+bool IfcFuelProperties::hasCombustionTemperature() const { return !entity->getArgument(1)->isNull(); }
+double IfcFuelProperties::CombustionTemperature() const { return *entity->getArgument(1); }
+void IfcFuelProperties::setCombustionTemperature(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+bool IfcFuelProperties::hasCarbonContent() const { return !entity->getArgument(2)->isNull(); }
+double IfcFuelProperties::CarbonContent() const { return *entity->getArgument(2); }
+void IfcFuelProperties::setCarbonContent(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+bool IfcFuelProperties::hasLowerHeatingValue() const { return !entity->getArgument(3)->isNull(); }
+double IfcFuelProperties::LowerHeatingValue() const { return *entity->getArgument(3); }
+void IfcFuelProperties::setLowerHeatingValue(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+bool IfcFuelProperties::hasHigherHeatingValue() const { return !entity->getArgument(4)->isNull(); }
+double IfcFuelProperties::HigherHeatingValue() const { return *entity->getArgument(4); }
+void IfcFuelProperties::setHigherHeatingValue(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
 bool IfcFuelProperties::is(Type::Enum v) const { return v == Type::IfcFuelProperties || IfcMaterialProperties::is(v); }
 Type::Enum IfcFuelProperties::type() const { return Type::IfcFuelProperties; }
 Type::Enum IfcFuelProperties::Class() { return Type::IfcFuelProperties; }
-IfcFuelProperties::IfcFuelProperties(IfcAbstractEntityPtr e) : IfcMaterialProperties((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcFuelProperties)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcFuelProperties::IfcFuelProperties(IfcMaterial* v1_Material, boost::optional< IfcThermodynamicTemperatureMeasure > v2_CombustionTemperature, boost::optional< IfcPositiveRatioMeasure > v3_CarbonContent, boost::optional< IfcHeatingValueMeasure > v4_LowerHeatingValue, boost::optional< IfcHeatingValueMeasure > v5_HigherHeatingValue) : IfcMaterialProperties((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Material)); if (v2_CombustionTemperature) { e->setArgument(1,(*v2_CombustionTemperature)); } else { e->setArgument(1); } if (v3_CarbonContent) { e->setArgument(2,(*v3_CarbonContent)); } else { e->setArgument(2); } if (v4_LowerHeatingValue) { e->setArgument(3,(*v4_LowerHeatingValue)); } else { e->setArgument(3); } if (v5_HigherHeatingValue) { e->setArgument(4,(*v5_HigherHeatingValue)); } else { e->setArgument(4); } entity = e; EntityBuffer::Add(this); }
+IfcFuelProperties::IfcFuelProperties(IfcAbstractEntity* e) : IfcMaterialProperties((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcFuelProperties)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcFuelProperties::IfcFuelProperties(IfcMaterial* v1_Material, boost::optional< double > v2_CombustionTemperature, boost::optional< double > v3_CarbonContent, boost::optional< double > v4_LowerHeatingValue, boost::optional< double > v5_HigherHeatingValue) : IfcMaterialProperties((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Material)); if (v2_CombustionTemperature) { e->setArgument(1,(*v2_CombustionTemperature)); } else { e->setArgument(1); } if (v3_CarbonContent) { e->setArgument(2,(*v3_CarbonContent)); } else { e->setArgument(2); } if (v4_LowerHeatingValue) { e->setArgument(3,(*v4_LowerHeatingValue)); } else { e->setArgument(3); } if (v5_HigherHeatingValue) { e->setArgument(4,(*v5_HigherHeatingValue)); } else { e->setArgument(4); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcFurnishingElement
 bool IfcFurnishingElement::is(Type::Enum v) const { return v == Type::IfcFurnishingElement || IfcElement::is(v); }
 Type::Enum IfcFurnishingElement::type() const { return Type::IfcFurnishingElement; }
 Type::Enum IfcFurnishingElement::Class() { return Type::IfcFurnishingElement; }
-IfcFurnishingElement::IfcFurnishingElement(IfcAbstractEntityPtr e) : IfcElement((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcFurnishingElement)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcFurnishingElement::IfcFurnishingElement(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag) : IfcElement((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
+IfcFurnishingElement::IfcFurnishingElement(IfcAbstractEntity* e) : IfcElement((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcFurnishingElement)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcFurnishingElement::IfcFurnishingElement(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag) : IfcElement((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcFurnishingElementType
 bool IfcFurnishingElementType::is(Type::Enum v) const { return v == Type::IfcFurnishingElementType || IfcElementType::is(v); }
 Type::Enum IfcFurnishingElementType::type() const { return Type::IfcFurnishingElementType; }
 Type::Enum IfcFurnishingElementType::Class() { return Type::IfcFurnishingElementType; }
-IfcFurnishingElementType::IfcFurnishingElementType(IfcAbstractEntityPtr e) : IfcElementType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcFurnishingElementType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcFurnishingElementType::IfcFurnishingElementType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType) : IfcElementType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcFurnishingElementType::IfcFurnishingElementType(IfcAbstractEntity* e) : IfcElementType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcFurnishingElementType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcFurnishingElementType::IfcFurnishingElementType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType) : IfcElementType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcFurnitureStandard
 bool IfcFurnitureStandard::is(Type::Enum v) const { return v == Type::IfcFurnitureStandard || IfcControl::is(v); }
 Type::Enum IfcFurnitureStandard::type() const { return Type::IfcFurnitureStandard; }
 Type::Enum IfcFurnitureStandard::Class() { return Type::IfcFurnitureStandard; }
-IfcFurnitureStandard::IfcFurnitureStandard(IfcAbstractEntityPtr e) : IfcControl((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcFurnitureStandard)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcFurnitureStandard::IfcFurnitureStandard(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType) : IfcControl((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } entity = e; EntityBuffer::Add(this); }
+IfcFurnitureStandard::IfcFurnitureStandard(IfcAbstractEntity* e) : IfcControl((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcFurnitureStandard)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcFurnitureStandard::IfcFurnitureStandard(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType) : IfcControl((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcFurnitureType
-IfcAssemblyPlaceEnum::IfcAssemblyPlaceEnum IfcFurnitureType::AssemblyPlace() { return IfcAssemblyPlaceEnum::FromString(*entity->getArgument(9)); }
+IfcAssemblyPlaceEnum::IfcAssemblyPlaceEnum IfcFurnitureType::AssemblyPlace() const { return IfcAssemblyPlaceEnum::FromString(*entity->getArgument(9)); }
 void IfcFurnitureType::setAssemblyPlace(IfcAssemblyPlaceEnum::IfcAssemblyPlaceEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcAssemblyPlaceEnum::ToString(v)); }
 bool IfcFurnitureType::is(Type::Enum v) const { return v == Type::IfcFurnitureType || IfcFurnishingElementType::is(v); }
 Type::Enum IfcFurnitureType::type() const { return Type::IfcFurnitureType; }
 Type::Enum IfcFurnitureType::Class() { return Type::IfcFurnitureType; }
-IfcFurnitureType::IfcFurnitureType(IfcAbstractEntityPtr e) : IfcFurnishingElementType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcFurnitureType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcFurnitureType::IfcFurnitureType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcAssemblyPlaceEnum::IfcAssemblyPlaceEnum v10_AssemblyPlace) : IfcFurnishingElementType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_AssemblyPlace,IfcAssemblyPlaceEnum::ToString(v10_AssemblyPlace)); entity = e; EntityBuffer::Add(this); }
+IfcFurnitureType::IfcFurnitureType(IfcAbstractEntity* e) : IfcFurnishingElementType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcFurnitureType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcFurnitureType::IfcFurnitureType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcAssemblyPlaceEnum::IfcAssemblyPlaceEnum v10_AssemblyPlace) : IfcFurnishingElementType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_AssemblyPlace,IfcAssemblyPlaceEnum::ToString(v10_AssemblyPlace)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcGasTerminalType
-IfcGasTerminalTypeEnum::IfcGasTerminalTypeEnum IfcGasTerminalType::PredefinedType() { return IfcGasTerminalTypeEnum::FromString(*entity->getArgument(9)); }
+IfcGasTerminalTypeEnum::IfcGasTerminalTypeEnum IfcGasTerminalType::PredefinedType() const { return IfcGasTerminalTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcGasTerminalType::setPredefinedType(IfcGasTerminalTypeEnum::IfcGasTerminalTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcGasTerminalTypeEnum::ToString(v)); }
 bool IfcGasTerminalType::is(Type::Enum v) const { return v == Type::IfcGasTerminalType || IfcFlowTerminalType::is(v); }
 Type::Enum IfcGasTerminalType::type() const { return Type::IfcGasTerminalType; }
 Type::Enum IfcGasTerminalType::Class() { return Type::IfcGasTerminalType; }
-IfcGasTerminalType::IfcGasTerminalType(IfcAbstractEntityPtr e) : IfcFlowTerminalType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcGasTerminalType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcGasTerminalType::IfcGasTerminalType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcGasTerminalTypeEnum::IfcGasTerminalTypeEnum v10_PredefinedType) : IfcFlowTerminalType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcGasTerminalTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcGasTerminalType::IfcGasTerminalType(IfcAbstractEntity* e) : IfcFlowTerminalType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcGasTerminalType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcGasTerminalType::IfcGasTerminalType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcGasTerminalTypeEnum::IfcGasTerminalTypeEnum v10_PredefinedType) : IfcFlowTerminalType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcGasTerminalTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcGeneralMaterialProperties
-bool IfcGeneralMaterialProperties::hasMolecularWeight() { return !entity->getArgument(1)->isNull(); }
-IfcMolecularWeightMeasure IfcGeneralMaterialProperties::MolecularWeight() { return *entity->getArgument(1); }
-void IfcGeneralMaterialProperties::setMolecularWeight(IfcMolecularWeightMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-bool IfcGeneralMaterialProperties::hasPorosity() { return !entity->getArgument(2)->isNull(); }
-IfcNormalisedRatioMeasure IfcGeneralMaterialProperties::Porosity() { return *entity->getArgument(2); }
-void IfcGeneralMaterialProperties::setPorosity(IfcNormalisedRatioMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-bool IfcGeneralMaterialProperties::hasMassDensity() { return !entity->getArgument(3)->isNull(); }
-IfcMassDensityMeasure IfcGeneralMaterialProperties::MassDensity() { return *entity->getArgument(3); }
-void IfcGeneralMaterialProperties::setMassDensity(IfcMassDensityMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+bool IfcGeneralMaterialProperties::hasMolecularWeight() const { return !entity->getArgument(1)->isNull(); }
+double IfcGeneralMaterialProperties::MolecularWeight() const { return *entity->getArgument(1); }
+void IfcGeneralMaterialProperties::setMolecularWeight(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+bool IfcGeneralMaterialProperties::hasPorosity() const { return !entity->getArgument(2)->isNull(); }
+double IfcGeneralMaterialProperties::Porosity() const { return *entity->getArgument(2); }
+void IfcGeneralMaterialProperties::setPorosity(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+bool IfcGeneralMaterialProperties::hasMassDensity() const { return !entity->getArgument(3)->isNull(); }
+double IfcGeneralMaterialProperties::MassDensity() const { return *entity->getArgument(3); }
+void IfcGeneralMaterialProperties::setMassDensity(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
 bool IfcGeneralMaterialProperties::is(Type::Enum v) const { return v == Type::IfcGeneralMaterialProperties || IfcMaterialProperties::is(v); }
 Type::Enum IfcGeneralMaterialProperties::type() const { return Type::IfcGeneralMaterialProperties; }
 Type::Enum IfcGeneralMaterialProperties::Class() { return Type::IfcGeneralMaterialProperties; }
-IfcGeneralMaterialProperties::IfcGeneralMaterialProperties(IfcAbstractEntityPtr e) : IfcMaterialProperties((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcGeneralMaterialProperties)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcGeneralMaterialProperties::IfcGeneralMaterialProperties(IfcMaterial* v1_Material, boost::optional< IfcMolecularWeightMeasure > v2_MolecularWeight, boost::optional< IfcNormalisedRatioMeasure > v3_Porosity, boost::optional< IfcMassDensityMeasure > v4_MassDensity) : IfcMaterialProperties((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Material)); if (v2_MolecularWeight) { e->setArgument(1,(*v2_MolecularWeight)); } else { e->setArgument(1); } if (v3_Porosity) { e->setArgument(2,(*v3_Porosity)); } else { e->setArgument(2); } if (v4_MassDensity) { e->setArgument(3,(*v4_MassDensity)); } else { e->setArgument(3); } entity = e; EntityBuffer::Add(this); }
+IfcGeneralMaterialProperties::IfcGeneralMaterialProperties(IfcAbstractEntity* e) : IfcMaterialProperties((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcGeneralMaterialProperties)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcGeneralMaterialProperties::IfcGeneralMaterialProperties(IfcMaterial* v1_Material, boost::optional< double > v2_MolecularWeight, boost::optional< double > v3_Porosity, boost::optional< double > v4_MassDensity) : IfcMaterialProperties((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Material)); if (v2_MolecularWeight) { e->setArgument(1,(*v2_MolecularWeight)); } else { e->setArgument(1); } if (v3_Porosity) { e->setArgument(2,(*v3_Porosity)); } else { e->setArgument(2); } if (v4_MassDensity) { e->setArgument(3,(*v4_MassDensity)); } else { e->setArgument(3); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcGeneralProfileProperties
-bool IfcGeneralProfileProperties::hasPhysicalWeight() { return !entity->getArgument(2)->isNull(); }
-IfcMassPerLengthMeasure IfcGeneralProfileProperties::PhysicalWeight() { return *entity->getArgument(2); }
-void IfcGeneralProfileProperties::setPhysicalWeight(IfcMassPerLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-bool IfcGeneralProfileProperties::hasPerimeter() { return !entity->getArgument(3)->isNull(); }
-IfcPositiveLengthMeasure IfcGeneralProfileProperties::Perimeter() { return *entity->getArgument(3); }
-void IfcGeneralProfileProperties::setPerimeter(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-bool IfcGeneralProfileProperties::hasMinimumPlateThickness() { return !entity->getArgument(4)->isNull(); }
-IfcPositiveLengthMeasure IfcGeneralProfileProperties::MinimumPlateThickness() { return *entity->getArgument(4); }
-void IfcGeneralProfileProperties::setMinimumPlateThickness(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-bool IfcGeneralProfileProperties::hasMaximumPlateThickness() { return !entity->getArgument(5)->isNull(); }
-IfcPositiveLengthMeasure IfcGeneralProfileProperties::MaximumPlateThickness() { return *entity->getArgument(5); }
-void IfcGeneralProfileProperties::setMaximumPlateThickness(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-bool IfcGeneralProfileProperties::hasCrossSectionArea() { return !entity->getArgument(6)->isNull(); }
-IfcAreaMeasure IfcGeneralProfileProperties::CrossSectionArea() { return *entity->getArgument(6); }
-void IfcGeneralProfileProperties::setCrossSectionArea(IfcAreaMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
+bool IfcGeneralProfileProperties::hasPhysicalWeight() const { return !entity->getArgument(2)->isNull(); }
+double IfcGeneralProfileProperties::PhysicalWeight() const { return *entity->getArgument(2); }
+void IfcGeneralProfileProperties::setPhysicalWeight(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+bool IfcGeneralProfileProperties::hasPerimeter() const { return !entity->getArgument(3)->isNull(); }
+double IfcGeneralProfileProperties::Perimeter() const { return *entity->getArgument(3); }
+void IfcGeneralProfileProperties::setPerimeter(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+bool IfcGeneralProfileProperties::hasMinimumPlateThickness() const { return !entity->getArgument(4)->isNull(); }
+double IfcGeneralProfileProperties::MinimumPlateThickness() const { return *entity->getArgument(4); }
+void IfcGeneralProfileProperties::setMinimumPlateThickness(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+bool IfcGeneralProfileProperties::hasMaximumPlateThickness() const { return !entity->getArgument(5)->isNull(); }
+double IfcGeneralProfileProperties::MaximumPlateThickness() const { return *entity->getArgument(5); }
+void IfcGeneralProfileProperties::setMaximumPlateThickness(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+bool IfcGeneralProfileProperties::hasCrossSectionArea() const { return !entity->getArgument(6)->isNull(); }
+double IfcGeneralProfileProperties::CrossSectionArea() const { return *entity->getArgument(6); }
+void IfcGeneralProfileProperties::setCrossSectionArea(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
 bool IfcGeneralProfileProperties::is(Type::Enum v) const { return v == Type::IfcGeneralProfileProperties || IfcProfileProperties::is(v); }
 Type::Enum IfcGeneralProfileProperties::type() const { return Type::IfcGeneralProfileProperties; }
 Type::Enum IfcGeneralProfileProperties::Class() { return Type::IfcGeneralProfileProperties; }
-IfcGeneralProfileProperties::IfcGeneralProfileProperties(IfcAbstractEntityPtr e) : IfcProfileProperties((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcGeneralProfileProperties)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcGeneralProfileProperties::IfcGeneralProfileProperties(boost::optional< IfcLabel > v1_ProfileName, IfcProfileDef* v2_ProfileDefinition, boost::optional< IfcMassPerLengthMeasure > v3_PhysicalWeight, boost::optional< IfcPositiveLengthMeasure > v4_Perimeter, boost::optional< IfcPositiveLengthMeasure > v5_MinimumPlateThickness, boost::optional< IfcPositiveLengthMeasure > v6_MaximumPlateThickness, boost::optional< IfcAreaMeasure > v7_CrossSectionArea) : IfcProfileProperties((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_ProfileName) { e->setArgument(0,(*v1_ProfileName)); } else { e->setArgument(0); } e->setArgument(1,(v2_ProfileDefinition)); if (v3_PhysicalWeight) { e->setArgument(2,(*v3_PhysicalWeight)); } else { e->setArgument(2); } if (v4_Perimeter) { e->setArgument(3,(*v4_Perimeter)); } else { e->setArgument(3); } if (v5_MinimumPlateThickness) { e->setArgument(4,(*v5_MinimumPlateThickness)); } else { e->setArgument(4); } if (v6_MaximumPlateThickness) { e->setArgument(5,(*v6_MaximumPlateThickness)); } else { e->setArgument(5); } if (v7_CrossSectionArea) { e->setArgument(6,(*v7_CrossSectionArea)); } else { e->setArgument(6); } entity = e; EntityBuffer::Add(this); }
+IfcGeneralProfileProperties::IfcGeneralProfileProperties(IfcAbstractEntity* e) : IfcProfileProperties((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcGeneralProfileProperties)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcGeneralProfileProperties::IfcGeneralProfileProperties(boost::optional< std::string > v1_ProfileName, IfcProfileDef* v2_ProfileDefinition, boost::optional< double > v3_PhysicalWeight, boost::optional< double > v4_Perimeter, boost::optional< double > v5_MinimumPlateThickness, boost::optional< double > v6_MaximumPlateThickness, boost::optional< double > v7_CrossSectionArea) : IfcProfileProperties((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_ProfileName) { e->setArgument(0,(*v1_ProfileName)); } else { e->setArgument(0); } e->setArgument(1,(v2_ProfileDefinition)); if (v3_PhysicalWeight) { e->setArgument(2,(*v3_PhysicalWeight)); } else { e->setArgument(2); } if (v4_Perimeter) { e->setArgument(3,(*v4_Perimeter)); } else { e->setArgument(3); } if (v5_MinimumPlateThickness) { e->setArgument(4,(*v5_MinimumPlateThickness)); } else { e->setArgument(4); } if (v6_MaximumPlateThickness) { e->setArgument(5,(*v6_MaximumPlateThickness)); } else { e->setArgument(5); } if (v7_CrossSectionArea) { e->setArgument(6,(*v7_CrossSectionArea)); } else { e->setArgument(6); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcGeometricCurveSet
 bool IfcGeometricCurveSet::is(Type::Enum v) const { return v == Type::IfcGeometricCurveSet || IfcGeometricSet::is(v); }
 Type::Enum IfcGeometricCurveSet::type() const { return Type::IfcGeometricCurveSet; }
 Type::Enum IfcGeometricCurveSet::Class() { return Type::IfcGeometricCurveSet; }
-IfcGeometricCurveSet::IfcGeometricCurveSet(IfcAbstractEntityPtr e) : IfcGeometricSet((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcGeometricCurveSet)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcGeometricCurveSet::IfcGeometricCurveSet(IfcEntities v1_Elements) : IfcGeometricSet((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Elements)); entity = e; EntityBuffer::Add(this); }
+IfcGeometricCurveSet::IfcGeometricCurveSet(IfcAbstractEntity* e) : IfcGeometricSet((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcGeometricCurveSet)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcGeometricCurveSet::IfcGeometricCurveSet(IfcEntityList::ptr v1_Elements) : IfcGeometricSet((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Elements)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcGeometricRepresentationContext
-IfcDimensionCount IfcGeometricRepresentationContext::CoordinateSpaceDimension() { return *entity->getArgument(2); }
-void IfcGeometricRepresentationContext::setCoordinateSpaceDimension(IfcDimensionCount v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-bool IfcGeometricRepresentationContext::hasPrecision() { return !entity->getArgument(3)->isNull(); }
-double IfcGeometricRepresentationContext::Precision() { return *entity->getArgument(3); }
+int IfcGeometricRepresentationContext::CoordinateSpaceDimension() const { return *entity->getArgument(2); }
+void IfcGeometricRepresentationContext::setCoordinateSpaceDimension(int v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+bool IfcGeometricRepresentationContext::hasPrecision() const { return !entity->getArgument(3)->isNull(); }
+double IfcGeometricRepresentationContext::Precision() const { return *entity->getArgument(3); }
 void IfcGeometricRepresentationContext::setPrecision(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-IfcAxis2Placement IfcGeometricRepresentationContext::WorldCoordinateSystem() { return *entity->getArgument(4); }
-void IfcGeometricRepresentationContext::setWorldCoordinateSystem(IfcAxis2Placement v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-bool IfcGeometricRepresentationContext::hasTrueNorth() { return !entity->getArgument(5)->isNull(); }
-IfcDirection* IfcGeometricRepresentationContext::TrueNorth() { return (IfcDirection*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(5))); }
+IfcAxis2Placement* IfcGeometricRepresentationContext::WorldCoordinateSystem() const { return (IfcAxis2Placement*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(4))); }
+void IfcGeometricRepresentationContext::setWorldCoordinateSystem(IfcAxis2Placement* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+bool IfcGeometricRepresentationContext::hasTrueNorth() const { return !entity->getArgument(5)->isNull(); }
+IfcDirection* IfcGeometricRepresentationContext::TrueNorth() const { return (IfcDirection*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(5))); }
 void IfcGeometricRepresentationContext::setTrueNorth(IfcDirection* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-IfcGeometricRepresentationSubContext::list IfcGeometricRepresentationContext::HasSubContexts() { RETURN_INVERSE(IfcGeometricRepresentationSubContext) }
+IfcGeometricRepresentationSubContext::list::ptr IfcGeometricRepresentationContext::HasSubContexts() const { return entity->getInverse(Type::IfcGeometricRepresentationSubContext, 6)->as<IfcGeometricRepresentationSubContext>(); }
 bool IfcGeometricRepresentationContext::is(Type::Enum v) const { return v == Type::IfcGeometricRepresentationContext || IfcRepresentationContext::is(v); }
 Type::Enum IfcGeometricRepresentationContext::type() const { return Type::IfcGeometricRepresentationContext; }
 Type::Enum IfcGeometricRepresentationContext::Class() { return Type::IfcGeometricRepresentationContext; }
-IfcGeometricRepresentationContext::IfcGeometricRepresentationContext(IfcAbstractEntityPtr e) : IfcRepresentationContext((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcGeometricRepresentationContext)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcGeometricRepresentationContext::IfcGeometricRepresentationContext(boost::optional< IfcLabel > v1_ContextIdentifier, boost::optional< IfcLabel > v2_ContextType, IfcDimensionCount v3_CoordinateSpaceDimension, boost::optional< double > v4_Precision, IfcAxis2Placement v5_WorldCoordinateSystem, IfcDirection* v6_TrueNorth) : IfcRepresentationContext((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_ContextIdentifier) { e->setArgument(0,(*v1_ContextIdentifier)); } else { e->setArgument(0); } if (v2_ContextType) { e->setArgument(1,(*v2_ContextType)); } else { e->setArgument(1); } e->setArgument(2,(v3_CoordinateSpaceDimension)); if (v4_Precision) { e->setArgument(3,(*v4_Precision)); } else { e->setArgument(3); } e->setArgument(4,(v5_WorldCoordinateSystem)); e->setArgument(5,(v6_TrueNorth)); entity = e; EntityBuffer::Add(this); }
+IfcGeometricRepresentationContext::IfcGeometricRepresentationContext(IfcAbstractEntity* e) : IfcRepresentationContext((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcGeometricRepresentationContext)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcGeometricRepresentationContext::IfcGeometricRepresentationContext(boost::optional< std::string > v1_ContextIdentifier, boost::optional< std::string > v2_ContextType, int v3_CoordinateSpaceDimension, boost::optional< double > v4_Precision, IfcAxis2Placement* v5_WorldCoordinateSystem, IfcDirection* v6_TrueNorth) : IfcRepresentationContext((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_ContextIdentifier) { e->setArgument(0,(*v1_ContextIdentifier)); } else { e->setArgument(0); } if (v2_ContextType) { e->setArgument(1,(*v2_ContextType)); } else { e->setArgument(1); } e->setArgument(2,(v3_CoordinateSpaceDimension)); if (v4_Precision) { e->setArgument(3,(*v4_Precision)); } else { e->setArgument(3); } e->setArgument(4,(v5_WorldCoordinateSystem)); e->setArgument(5,(v6_TrueNorth)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcGeometricRepresentationItem
 bool IfcGeometricRepresentationItem::is(Type::Enum v) const { return v == Type::IfcGeometricRepresentationItem || IfcRepresentationItem::is(v); }
 Type::Enum IfcGeometricRepresentationItem::type() const { return Type::IfcGeometricRepresentationItem; }
 Type::Enum IfcGeometricRepresentationItem::Class() { return Type::IfcGeometricRepresentationItem; }
-IfcGeometricRepresentationItem::IfcGeometricRepresentationItem(IfcAbstractEntityPtr e) : IfcRepresentationItem((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcGeometricRepresentationItem)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcGeometricRepresentationItem::IfcGeometricRepresentationItem() : IfcRepresentationItem((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); entity = e; EntityBuffer::Add(this); }
+IfcGeometricRepresentationItem::IfcGeometricRepresentationItem(IfcAbstractEntity* e) : IfcRepresentationItem((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcGeometricRepresentationItem)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcGeometricRepresentationItem::IfcGeometricRepresentationItem() : IfcRepresentationItem((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcGeometricRepresentationSubContext
-IfcGeometricRepresentationContext* IfcGeometricRepresentationSubContext::ParentContext() { return (IfcGeometricRepresentationContext*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(6))); }
+IfcGeometricRepresentationContext* IfcGeometricRepresentationSubContext::ParentContext() const { return (IfcGeometricRepresentationContext*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(6))); }
 void IfcGeometricRepresentationSubContext::setParentContext(IfcGeometricRepresentationContext* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
-bool IfcGeometricRepresentationSubContext::hasTargetScale() { return !entity->getArgument(7)->isNull(); }
-IfcPositiveRatioMeasure IfcGeometricRepresentationSubContext::TargetScale() { return *entity->getArgument(7); }
-void IfcGeometricRepresentationSubContext::setTargetScale(IfcPositiveRatioMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
-IfcGeometricProjectionEnum::IfcGeometricProjectionEnum IfcGeometricRepresentationSubContext::TargetView() { return IfcGeometricProjectionEnum::FromString(*entity->getArgument(8)); }
+bool IfcGeometricRepresentationSubContext::hasTargetScale() const { return !entity->getArgument(7)->isNull(); }
+double IfcGeometricRepresentationSubContext::TargetScale() const { return *entity->getArgument(7); }
+void IfcGeometricRepresentationSubContext::setTargetScale(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
+IfcGeometricProjectionEnum::IfcGeometricProjectionEnum IfcGeometricRepresentationSubContext::TargetView() const { return IfcGeometricProjectionEnum::FromString(*entity->getArgument(8)); }
 void IfcGeometricRepresentationSubContext::setTargetView(IfcGeometricProjectionEnum::IfcGeometricProjectionEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcGeometricProjectionEnum::ToString(v)); }
-bool IfcGeometricRepresentationSubContext::hasUserDefinedTargetView() { return !entity->getArgument(9)->isNull(); }
-IfcLabel IfcGeometricRepresentationSubContext::UserDefinedTargetView() { return *entity->getArgument(9); }
-void IfcGeometricRepresentationSubContext::setUserDefinedTargetView(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
+bool IfcGeometricRepresentationSubContext::hasUserDefinedTargetView() const { return !entity->getArgument(9)->isNull(); }
+std::string IfcGeometricRepresentationSubContext::UserDefinedTargetView() const { return *entity->getArgument(9); }
+void IfcGeometricRepresentationSubContext::setUserDefinedTargetView(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
 bool IfcGeometricRepresentationSubContext::is(Type::Enum v) const { return v == Type::IfcGeometricRepresentationSubContext || IfcGeometricRepresentationContext::is(v); }
 Type::Enum IfcGeometricRepresentationSubContext::type() const { return Type::IfcGeometricRepresentationSubContext; }
 Type::Enum IfcGeometricRepresentationSubContext::Class() { return Type::IfcGeometricRepresentationSubContext; }
-IfcGeometricRepresentationSubContext::IfcGeometricRepresentationSubContext(IfcAbstractEntityPtr e) : IfcGeometricRepresentationContext((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcGeometricRepresentationSubContext)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcGeometricRepresentationSubContext::IfcGeometricRepresentationSubContext(boost::optional< IfcLabel > v1_ContextIdentifier, boost::optional< IfcLabel > v2_ContextType, IfcGeometricRepresentationContext* v7_ParentContext, boost::optional< IfcPositiveRatioMeasure > v8_TargetScale, IfcGeometricProjectionEnum::IfcGeometricProjectionEnum v9_TargetView, boost::optional< IfcLabel > v10_UserDefinedTargetView) : IfcGeometricRepresentationContext((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_ContextIdentifier) { e->setArgument(0,(*v1_ContextIdentifier)); } else { e->setArgument(0); } if (v2_ContextType) { e->setArgument(1,(*v2_ContextType)); } else { e->setArgument(1); } e->setArgumentDerived(2); e->setArgumentDerived(3); e->setArgumentDerived(4); e->setArgumentDerived(5); e->setArgument(6,(v7_ParentContext)); if (v8_TargetScale) { e->setArgument(7,(*v8_TargetScale)); } else { e->setArgument(7); } e->setArgument(8,v9_TargetView,IfcGeometricProjectionEnum::ToString(v9_TargetView)); if (v10_UserDefinedTargetView) { e->setArgument(9,(*v10_UserDefinedTargetView)); } else { e->setArgument(9); } entity = e; EntityBuffer::Add(this); }
+IfcGeometricRepresentationSubContext::IfcGeometricRepresentationSubContext(IfcAbstractEntity* e) : IfcGeometricRepresentationContext((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcGeometricRepresentationSubContext)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcGeometricRepresentationSubContext::IfcGeometricRepresentationSubContext(boost::optional< std::string > v1_ContextIdentifier, boost::optional< std::string > v2_ContextType, IfcGeometricRepresentationContext* v7_ParentContext, boost::optional< double > v8_TargetScale, IfcGeometricProjectionEnum::IfcGeometricProjectionEnum v9_TargetView, boost::optional< std::string > v10_UserDefinedTargetView) : IfcGeometricRepresentationContext((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_ContextIdentifier) { e->setArgument(0,(*v1_ContextIdentifier)); } else { e->setArgument(0); } if (v2_ContextType) { e->setArgument(1,(*v2_ContextType)); } else { e->setArgument(1); } e->setArgumentDerived(2); e->setArgumentDerived(3); e->setArgumentDerived(4); e->setArgumentDerived(5); e->setArgument(6,(v7_ParentContext)); if (v8_TargetScale) { e->setArgument(7,(*v8_TargetScale)); } else { e->setArgument(7); } e->setArgument(8,v9_TargetView,IfcGeometricProjectionEnum::ToString(v9_TargetView)); if (v10_UserDefinedTargetView) { e->setArgument(9,(*v10_UserDefinedTargetView)); } else { e->setArgument(9); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcGeometricSet
-SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > IfcGeometricSet::Elements() { RETURN_AS_LIST(IfcUtil::IfcAbstractSelect,0) }
-void IfcGeometricSet::setElements(SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v->generalize()); }
+IfcEntityList::ptr IfcGeometricSet::Elements() const { return *entity->getArgument(0); }
+void IfcGeometricSet::setElements(IfcEntityList::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
 bool IfcGeometricSet::is(Type::Enum v) const { return v == Type::IfcGeometricSet || IfcGeometricRepresentationItem::is(v); }
 Type::Enum IfcGeometricSet::type() const { return Type::IfcGeometricSet; }
 Type::Enum IfcGeometricSet::Class() { return Type::IfcGeometricSet; }
-IfcGeometricSet::IfcGeometricSet(IfcAbstractEntityPtr e) : IfcGeometricRepresentationItem((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcGeometricSet)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcGeometricSet::IfcGeometricSet(IfcEntities v1_Elements) : IfcGeometricRepresentationItem((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Elements)); entity = e; EntityBuffer::Add(this); }
+IfcGeometricSet::IfcGeometricSet(IfcAbstractEntity* e) : IfcGeometricRepresentationItem((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcGeometricSet)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcGeometricSet::IfcGeometricSet(IfcEntityList::ptr v1_Elements) : IfcGeometricRepresentationItem((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Elements)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcGrid
-SHARED_PTR< IfcTemplatedEntityList< IfcGridAxis > > IfcGrid::UAxes() { RETURN_AS_LIST(IfcGridAxis,7) }
-void IfcGrid::setUAxes(SHARED_PTR< IfcTemplatedEntityList< IfcGridAxis > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v->generalize()); }
-SHARED_PTR< IfcTemplatedEntityList< IfcGridAxis > > IfcGrid::VAxes() { RETURN_AS_LIST(IfcGridAxis,8) }
-void IfcGrid::setVAxes(SHARED_PTR< IfcTemplatedEntityList< IfcGridAxis > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v->generalize()); }
-bool IfcGrid::hasWAxes() { return !entity->getArgument(9)->isNull(); }
-SHARED_PTR< IfcTemplatedEntityList< IfcGridAxis > > IfcGrid::WAxes() { RETURN_AS_LIST(IfcGridAxis,9) }
-void IfcGrid::setWAxes(SHARED_PTR< IfcTemplatedEntityList< IfcGridAxis > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v->generalize()); }
-IfcRelContainedInSpatialStructure::list IfcGrid::ContainedInStructure() { RETURN_INVERSE(IfcRelContainedInSpatialStructure) }
+IfcTemplatedEntityList< IfcGridAxis >::ptr IfcGrid::UAxes() const { IfcEntityList::ptr es = *entity->getArgument(7); return es->as<IfcGridAxis>(); }
+void IfcGrid::setUAxes(IfcTemplatedEntityList< IfcGridAxis >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v->generalize()); }
+IfcTemplatedEntityList< IfcGridAxis >::ptr IfcGrid::VAxes() const { IfcEntityList::ptr es = *entity->getArgument(8); return es->as<IfcGridAxis>(); }
+void IfcGrid::setVAxes(IfcTemplatedEntityList< IfcGridAxis >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v->generalize()); }
+bool IfcGrid::hasWAxes() const { return !entity->getArgument(9)->isNull(); }
+IfcTemplatedEntityList< IfcGridAxis >::ptr IfcGrid::WAxes() const { IfcEntityList::ptr es = *entity->getArgument(9); return es->as<IfcGridAxis>(); }
+void IfcGrid::setWAxes(IfcTemplatedEntityList< IfcGridAxis >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v->generalize()); }
+IfcRelContainedInSpatialStructure::list::ptr IfcGrid::ContainedInStructure() const { return entity->getInverse(Type::IfcRelContainedInSpatialStructure, 4)->as<IfcRelContainedInSpatialStructure>(); }
 bool IfcGrid::is(Type::Enum v) const { return v == Type::IfcGrid || IfcProduct::is(v); }
 Type::Enum IfcGrid::type() const { return Type::IfcGrid; }
 Type::Enum IfcGrid::Class() { return Type::IfcGrid; }
-IfcGrid::IfcGrid(IfcAbstractEntityPtr e) : IfcProduct((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcGrid)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcGrid::IfcGrid(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, SHARED_PTR< IfcTemplatedEntityList< IfcGridAxis > > v8_UAxes, SHARED_PTR< IfcTemplatedEntityList< IfcGridAxis > > v9_VAxes, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcGridAxis > > > v10_WAxes) : IfcProduct((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); e->setArgument(7,(v8_UAxes)->generalize()); e->setArgument(8,(v9_VAxes)->generalize()); if (v10_WAxes) { e->setArgument(9,(*v10_WAxes)->generalize()); } else { e->setArgument(9); } entity = e; EntityBuffer::Add(this); }
+IfcGrid::IfcGrid(IfcAbstractEntity* e) : IfcProduct((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcGrid)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcGrid::IfcGrid(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcTemplatedEntityList< IfcGridAxis >::ptr v8_UAxes, IfcTemplatedEntityList< IfcGridAxis >::ptr v9_VAxes, boost::optional< IfcTemplatedEntityList< IfcGridAxis >::ptr > v10_WAxes) : IfcProduct((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); e->setArgument(7,(v8_UAxes)->generalize()); e->setArgument(8,(v9_VAxes)->generalize()); if (v10_WAxes) { e->setArgument(9,(*v10_WAxes)->generalize()); } else { e->setArgument(9); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcGridAxis
-bool IfcGridAxis::hasAxisTag() { return !entity->getArgument(0)->isNull(); }
-IfcLabel IfcGridAxis::AxisTag() { return *entity->getArgument(0); }
-void IfcGridAxis::setAxisTag(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-IfcCurve* IfcGridAxis::AxisCurve() { return (IfcCurve*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(1))); }
+bool IfcGridAxis::hasAxisTag() const { return !entity->getArgument(0)->isNull(); }
+std::string IfcGridAxis::AxisTag() const { return *entity->getArgument(0); }
+void IfcGridAxis::setAxisTag(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+IfcCurve* IfcGridAxis::AxisCurve() const { return (IfcCurve*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(1))); }
 void IfcGridAxis::setAxisCurve(IfcCurve* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-IfcBoolean IfcGridAxis::SameSense() { return *entity->getArgument(2); }
-void IfcGridAxis::setSameSense(IfcBoolean v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-IfcGrid::list IfcGridAxis::PartOfW() { RETURN_INVERSE(IfcGrid) }
-IfcGrid::list IfcGridAxis::PartOfV() { RETURN_INVERSE(IfcGrid) }
-IfcGrid::list IfcGridAxis::PartOfU() { RETURN_INVERSE(IfcGrid) }
-IfcVirtualGridIntersection::list IfcGridAxis::HasIntersections() { RETURN_INVERSE(IfcVirtualGridIntersection) }
+bool IfcGridAxis::SameSense() const { return *entity->getArgument(2); }
+void IfcGridAxis::setSameSense(bool v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+IfcGrid::list::ptr IfcGridAxis::PartOfW() const { return entity->getInverse(Type::IfcGrid, 9)->as<IfcGrid>(); }
+IfcGrid::list::ptr IfcGridAxis::PartOfV() const { return entity->getInverse(Type::IfcGrid, 8)->as<IfcGrid>(); }
+IfcGrid::list::ptr IfcGridAxis::PartOfU() const { return entity->getInverse(Type::IfcGrid, 7)->as<IfcGrid>(); }
+IfcVirtualGridIntersection::list::ptr IfcGridAxis::HasIntersections() const { return entity->getInverse(Type::IfcVirtualGridIntersection, 0)->as<IfcVirtualGridIntersection>(); }
 bool IfcGridAxis::is(Type::Enum v) const { return v == Type::IfcGridAxis; }
 Type::Enum IfcGridAxis::type() const { return Type::IfcGridAxis; }
 Type::Enum IfcGridAxis::Class() { return Type::IfcGridAxis; }
-IfcGridAxis::IfcGridAxis(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcGridAxis)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcGridAxis::IfcGridAxis(boost::optional< IfcLabel > v1_AxisTag, IfcCurve* v2_AxisCurve, IfcBoolean v3_SameSense) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_AxisTag) { e->setArgument(0,(*v1_AxisTag)); } else { e->setArgument(0); } e->setArgument(1,(v2_AxisCurve)); e->setArgument(2,(v3_SameSense)); entity = e; EntityBuffer::Add(this); }
+IfcGridAxis::IfcGridAxis(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcGridAxis)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcGridAxis::IfcGridAxis(boost::optional< std::string > v1_AxisTag, IfcCurve* v2_AxisCurve, bool v3_SameSense) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_AxisTag) { e->setArgument(0,(*v1_AxisTag)); } else { e->setArgument(0); } e->setArgument(1,(v2_AxisCurve)); e->setArgument(2,(v3_SameSense)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcGridPlacement
-IfcVirtualGridIntersection* IfcGridPlacement::PlacementLocation() { return (IfcVirtualGridIntersection*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(0))); }
+IfcVirtualGridIntersection* IfcGridPlacement::PlacementLocation() const { return (IfcVirtualGridIntersection*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(0))); }
 void IfcGridPlacement::setPlacementLocation(IfcVirtualGridIntersection* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-bool IfcGridPlacement::hasPlacementRefDirection() { return !entity->getArgument(1)->isNull(); }
-IfcVirtualGridIntersection* IfcGridPlacement::PlacementRefDirection() { return (IfcVirtualGridIntersection*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(1))); }
+bool IfcGridPlacement::hasPlacementRefDirection() const { return !entity->getArgument(1)->isNull(); }
+IfcVirtualGridIntersection* IfcGridPlacement::PlacementRefDirection() const { return (IfcVirtualGridIntersection*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(1))); }
 void IfcGridPlacement::setPlacementRefDirection(IfcVirtualGridIntersection* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
 bool IfcGridPlacement::is(Type::Enum v) const { return v == Type::IfcGridPlacement || IfcObjectPlacement::is(v); }
 Type::Enum IfcGridPlacement::type() const { return Type::IfcGridPlacement; }
 Type::Enum IfcGridPlacement::Class() { return Type::IfcGridPlacement; }
-IfcGridPlacement::IfcGridPlacement(IfcAbstractEntityPtr e) : IfcObjectPlacement((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcGridPlacement)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcGridPlacement::IfcGridPlacement(IfcVirtualGridIntersection* v1_PlacementLocation, IfcVirtualGridIntersection* v2_PlacementRefDirection) : IfcObjectPlacement((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_PlacementLocation)); e->setArgument(1,(v2_PlacementRefDirection)); entity = e; EntityBuffer::Add(this); }
+IfcGridPlacement::IfcGridPlacement(IfcAbstractEntity* e) : IfcObjectPlacement((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcGridPlacement)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcGridPlacement::IfcGridPlacement(IfcVirtualGridIntersection* v1_PlacementLocation, IfcVirtualGridIntersection* v2_PlacementRefDirection) : IfcObjectPlacement((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_PlacementLocation)); e->setArgument(1,(v2_PlacementRefDirection)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcGroup
-IfcRelAssignsToGroup::list IfcGroup::IsGroupedBy() { RETURN_INVERSE(IfcRelAssignsToGroup) }
+IfcRelAssignsToGroup::list::ptr IfcGroup::IsGroupedBy() const { return entity->getInverse(Type::IfcRelAssignsToGroup, 6)->as<IfcRelAssignsToGroup>(); }
 bool IfcGroup::is(Type::Enum v) const { return v == Type::IfcGroup || IfcObject::is(v); }
 Type::Enum IfcGroup::type() const { return Type::IfcGroup; }
 Type::Enum IfcGroup::Class() { return Type::IfcGroup; }
-IfcGroup::IfcGroup(IfcAbstractEntityPtr e) : IfcObject((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcGroup)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcGroup::IfcGroup(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType) : IfcObject((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } entity = e; EntityBuffer::Add(this); }
+IfcGroup::IfcGroup(IfcAbstractEntity* e) : IfcObject((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcGroup)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcGroup::IfcGroup(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType) : IfcObject((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcHalfSpaceSolid
-IfcSurface* IfcHalfSpaceSolid::BaseSurface() { return (IfcSurface*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(0))); }
+IfcSurface* IfcHalfSpaceSolid::BaseSurface() const { return (IfcSurface*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(0))); }
 void IfcHalfSpaceSolid::setBaseSurface(IfcSurface* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-bool IfcHalfSpaceSolid::AgreementFlag() { return *entity->getArgument(1); }
+bool IfcHalfSpaceSolid::AgreementFlag() const { return *entity->getArgument(1); }
 void IfcHalfSpaceSolid::setAgreementFlag(bool v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
 bool IfcHalfSpaceSolid::is(Type::Enum v) const { return v == Type::IfcHalfSpaceSolid || IfcGeometricRepresentationItem::is(v); }
 Type::Enum IfcHalfSpaceSolid::type() const { return Type::IfcHalfSpaceSolid; }
 Type::Enum IfcHalfSpaceSolid::Class() { return Type::IfcHalfSpaceSolid; }
-IfcHalfSpaceSolid::IfcHalfSpaceSolid(IfcAbstractEntityPtr e) : IfcGeometricRepresentationItem((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcHalfSpaceSolid)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcHalfSpaceSolid::IfcHalfSpaceSolid(IfcSurface* v1_BaseSurface, bool v2_AgreementFlag) : IfcGeometricRepresentationItem((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_BaseSurface)); e->setArgument(1,(v2_AgreementFlag)); entity = e; EntityBuffer::Add(this); }
+IfcHalfSpaceSolid::IfcHalfSpaceSolid(IfcAbstractEntity* e) : IfcGeometricRepresentationItem((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcHalfSpaceSolid)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcHalfSpaceSolid::IfcHalfSpaceSolid(IfcSurface* v1_BaseSurface, bool v2_AgreementFlag) : IfcGeometricRepresentationItem((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_BaseSurface)); e->setArgument(1,(v2_AgreementFlag)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcHeatExchangerType
-IfcHeatExchangerTypeEnum::IfcHeatExchangerTypeEnum IfcHeatExchangerType::PredefinedType() { return IfcHeatExchangerTypeEnum::FromString(*entity->getArgument(9)); }
+IfcHeatExchangerTypeEnum::IfcHeatExchangerTypeEnum IfcHeatExchangerType::PredefinedType() const { return IfcHeatExchangerTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcHeatExchangerType::setPredefinedType(IfcHeatExchangerTypeEnum::IfcHeatExchangerTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcHeatExchangerTypeEnum::ToString(v)); }
 bool IfcHeatExchangerType::is(Type::Enum v) const { return v == Type::IfcHeatExchangerType || IfcEnergyConversionDeviceType::is(v); }
 Type::Enum IfcHeatExchangerType::type() const { return Type::IfcHeatExchangerType; }
 Type::Enum IfcHeatExchangerType::Class() { return Type::IfcHeatExchangerType; }
-IfcHeatExchangerType::IfcHeatExchangerType(IfcAbstractEntityPtr e) : IfcEnergyConversionDeviceType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcHeatExchangerType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcHeatExchangerType::IfcHeatExchangerType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcHeatExchangerTypeEnum::IfcHeatExchangerTypeEnum v10_PredefinedType) : IfcEnergyConversionDeviceType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcHeatExchangerTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcHeatExchangerType::IfcHeatExchangerType(IfcAbstractEntity* e) : IfcEnergyConversionDeviceType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcHeatExchangerType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcHeatExchangerType::IfcHeatExchangerType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcHeatExchangerTypeEnum::IfcHeatExchangerTypeEnum v10_PredefinedType) : IfcEnergyConversionDeviceType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcHeatExchangerTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcHumidifierType
-IfcHumidifierTypeEnum::IfcHumidifierTypeEnum IfcHumidifierType::PredefinedType() { return IfcHumidifierTypeEnum::FromString(*entity->getArgument(9)); }
+IfcHumidifierTypeEnum::IfcHumidifierTypeEnum IfcHumidifierType::PredefinedType() const { return IfcHumidifierTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcHumidifierType::setPredefinedType(IfcHumidifierTypeEnum::IfcHumidifierTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcHumidifierTypeEnum::ToString(v)); }
 bool IfcHumidifierType::is(Type::Enum v) const { return v == Type::IfcHumidifierType || IfcEnergyConversionDeviceType::is(v); }
 Type::Enum IfcHumidifierType::type() const { return Type::IfcHumidifierType; }
 Type::Enum IfcHumidifierType::Class() { return Type::IfcHumidifierType; }
-IfcHumidifierType::IfcHumidifierType(IfcAbstractEntityPtr e) : IfcEnergyConversionDeviceType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcHumidifierType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcHumidifierType::IfcHumidifierType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcHumidifierTypeEnum::IfcHumidifierTypeEnum v10_PredefinedType) : IfcEnergyConversionDeviceType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcHumidifierTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcHumidifierType::IfcHumidifierType(IfcAbstractEntity* e) : IfcEnergyConversionDeviceType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcHumidifierType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcHumidifierType::IfcHumidifierType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcHumidifierTypeEnum::IfcHumidifierTypeEnum v10_PredefinedType) : IfcEnergyConversionDeviceType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcHumidifierTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcHygroscopicMaterialProperties
-bool IfcHygroscopicMaterialProperties::hasUpperVaporResistanceFactor() { return !entity->getArgument(1)->isNull(); }
-IfcPositiveRatioMeasure IfcHygroscopicMaterialProperties::UpperVaporResistanceFactor() { return *entity->getArgument(1); }
-void IfcHygroscopicMaterialProperties::setUpperVaporResistanceFactor(IfcPositiveRatioMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-bool IfcHygroscopicMaterialProperties::hasLowerVaporResistanceFactor() { return !entity->getArgument(2)->isNull(); }
-IfcPositiveRatioMeasure IfcHygroscopicMaterialProperties::LowerVaporResistanceFactor() { return *entity->getArgument(2); }
-void IfcHygroscopicMaterialProperties::setLowerVaporResistanceFactor(IfcPositiveRatioMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-bool IfcHygroscopicMaterialProperties::hasIsothermalMoistureCapacity() { return !entity->getArgument(3)->isNull(); }
-IfcIsothermalMoistureCapacityMeasure IfcHygroscopicMaterialProperties::IsothermalMoistureCapacity() { return *entity->getArgument(3); }
-void IfcHygroscopicMaterialProperties::setIsothermalMoistureCapacity(IfcIsothermalMoistureCapacityMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-bool IfcHygroscopicMaterialProperties::hasVaporPermeability() { return !entity->getArgument(4)->isNull(); }
-IfcVaporPermeabilityMeasure IfcHygroscopicMaterialProperties::VaporPermeability() { return *entity->getArgument(4); }
-void IfcHygroscopicMaterialProperties::setVaporPermeability(IfcVaporPermeabilityMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-bool IfcHygroscopicMaterialProperties::hasMoistureDiffusivity() { return !entity->getArgument(5)->isNull(); }
-IfcMoistureDiffusivityMeasure IfcHygroscopicMaterialProperties::MoistureDiffusivity() { return *entity->getArgument(5); }
-void IfcHygroscopicMaterialProperties::setMoistureDiffusivity(IfcMoistureDiffusivityMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+bool IfcHygroscopicMaterialProperties::hasUpperVaporResistanceFactor() const { return !entity->getArgument(1)->isNull(); }
+double IfcHygroscopicMaterialProperties::UpperVaporResistanceFactor() const { return *entity->getArgument(1); }
+void IfcHygroscopicMaterialProperties::setUpperVaporResistanceFactor(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+bool IfcHygroscopicMaterialProperties::hasLowerVaporResistanceFactor() const { return !entity->getArgument(2)->isNull(); }
+double IfcHygroscopicMaterialProperties::LowerVaporResistanceFactor() const { return *entity->getArgument(2); }
+void IfcHygroscopicMaterialProperties::setLowerVaporResistanceFactor(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+bool IfcHygroscopicMaterialProperties::hasIsothermalMoistureCapacity() const { return !entity->getArgument(3)->isNull(); }
+double IfcHygroscopicMaterialProperties::IsothermalMoistureCapacity() const { return *entity->getArgument(3); }
+void IfcHygroscopicMaterialProperties::setIsothermalMoistureCapacity(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+bool IfcHygroscopicMaterialProperties::hasVaporPermeability() const { return !entity->getArgument(4)->isNull(); }
+double IfcHygroscopicMaterialProperties::VaporPermeability() const { return *entity->getArgument(4); }
+void IfcHygroscopicMaterialProperties::setVaporPermeability(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+bool IfcHygroscopicMaterialProperties::hasMoistureDiffusivity() const { return !entity->getArgument(5)->isNull(); }
+double IfcHygroscopicMaterialProperties::MoistureDiffusivity() const { return *entity->getArgument(5); }
+void IfcHygroscopicMaterialProperties::setMoistureDiffusivity(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
 bool IfcHygroscopicMaterialProperties::is(Type::Enum v) const { return v == Type::IfcHygroscopicMaterialProperties || IfcMaterialProperties::is(v); }
 Type::Enum IfcHygroscopicMaterialProperties::type() const { return Type::IfcHygroscopicMaterialProperties; }
 Type::Enum IfcHygroscopicMaterialProperties::Class() { return Type::IfcHygroscopicMaterialProperties; }
-IfcHygroscopicMaterialProperties::IfcHygroscopicMaterialProperties(IfcAbstractEntityPtr e) : IfcMaterialProperties((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcHygroscopicMaterialProperties)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcHygroscopicMaterialProperties::IfcHygroscopicMaterialProperties(IfcMaterial* v1_Material, boost::optional< IfcPositiveRatioMeasure > v2_UpperVaporResistanceFactor, boost::optional< IfcPositiveRatioMeasure > v3_LowerVaporResistanceFactor, boost::optional< IfcIsothermalMoistureCapacityMeasure > v4_IsothermalMoistureCapacity, boost::optional< IfcVaporPermeabilityMeasure > v5_VaporPermeability, boost::optional< IfcMoistureDiffusivityMeasure > v6_MoistureDiffusivity) : IfcMaterialProperties((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Material)); if (v2_UpperVaporResistanceFactor) { e->setArgument(1,(*v2_UpperVaporResistanceFactor)); } else { e->setArgument(1); } if (v3_LowerVaporResistanceFactor) { e->setArgument(2,(*v3_LowerVaporResistanceFactor)); } else { e->setArgument(2); } if (v4_IsothermalMoistureCapacity) { e->setArgument(3,(*v4_IsothermalMoistureCapacity)); } else { e->setArgument(3); } if (v5_VaporPermeability) { e->setArgument(4,(*v5_VaporPermeability)); } else { e->setArgument(4); } if (v6_MoistureDiffusivity) { e->setArgument(5,(*v6_MoistureDiffusivity)); } else { e->setArgument(5); } entity = e; EntityBuffer::Add(this); }
+IfcHygroscopicMaterialProperties::IfcHygroscopicMaterialProperties(IfcAbstractEntity* e) : IfcMaterialProperties((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcHygroscopicMaterialProperties)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcHygroscopicMaterialProperties::IfcHygroscopicMaterialProperties(IfcMaterial* v1_Material, boost::optional< double > v2_UpperVaporResistanceFactor, boost::optional< double > v3_LowerVaporResistanceFactor, boost::optional< double > v4_IsothermalMoistureCapacity, boost::optional< double > v5_VaporPermeability, boost::optional< double > v6_MoistureDiffusivity) : IfcMaterialProperties((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Material)); if (v2_UpperVaporResistanceFactor) { e->setArgument(1,(*v2_UpperVaporResistanceFactor)); } else { e->setArgument(1); } if (v3_LowerVaporResistanceFactor) { e->setArgument(2,(*v3_LowerVaporResistanceFactor)); } else { e->setArgument(2); } if (v4_IsothermalMoistureCapacity) { e->setArgument(3,(*v4_IsothermalMoistureCapacity)); } else { e->setArgument(3); } if (v5_VaporPermeability) { e->setArgument(4,(*v5_VaporPermeability)); } else { e->setArgument(4); } if (v6_MoistureDiffusivity) { e->setArgument(5,(*v6_MoistureDiffusivity)); } else { e->setArgument(5); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcIShapeProfileDef
-IfcPositiveLengthMeasure IfcIShapeProfileDef::OverallWidth() { return *entity->getArgument(3); }
-void IfcIShapeProfileDef::setOverallWidth(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-IfcPositiveLengthMeasure IfcIShapeProfileDef::OverallDepth() { return *entity->getArgument(4); }
-void IfcIShapeProfileDef::setOverallDepth(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-IfcPositiveLengthMeasure IfcIShapeProfileDef::WebThickness() { return *entity->getArgument(5); }
-void IfcIShapeProfileDef::setWebThickness(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-IfcPositiveLengthMeasure IfcIShapeProfileDef::FlangeThickness() { return *entity->getArgument(6); }
-void IfcIShapeProfileDef::setFlangeThickness(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
-bool IfcIShapeProfileDef::hasFilletRadius() { return !entity->getArgument(7)->isNull(); }
-IfcPositiveLengthMeasure IfcIShapeProfileDef::FilletRadius() { return *entity->getArgument(7); }
-void IfcIShapeProfileDef::setFilletRadius(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
+double IfcIShapeProfileDef::OverallWidth() const { return *entity->getArgument(3); }
+void IfcIShapeProfileDef::setOverallWidth(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+double IfcIShapeProfileDef::OverallDepth() const { return *entity->getArgument(4); }
+void IfcIShapeProfileDef::setOverallDepth(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+double IfcIShapeProfileDef::WebThickness() const { return *entity->getArgument(5); }
+void IfcIShapeProfileDef::setWebThickness(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+double IfcIShapeProfileDef::FlangeThickness() const { return *entity->getArgument(6); }
+void IfcIShapeProfileDef::setFlangeThickness(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
+bool IfcIShapeProfileDef::hasFilletRadius() const { return !entity->getArgument(7)->isNull(); }
+double IfcIShapeProfileDef::FilletRadius() const { return *entity->getArgument(7); }
+void IfcIShapeProfileDef::setFilletRadius(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
 bool IfcIShapeProfileDef::is(Type::Enum v) const { return v == Type::IfcIShapeProfileDef || IfcParameterizedProfileDef::is(v); }
 Type::Enum IfcIShapeProfileDef::type() const { return Type::IfcIShapeProfileDef; }
 Type::Enum IfcIShapeProfileDef::Class() { return Type::IfcIShapeProfileDef; }
-IfcIShapeProfileDef::IfcIShapeProfileDef(IfcAbstractEntityPtr e) : IfcParameterizedProfileDef((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcIShapeProfileDef)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcIShapeProfileDef::IfcIShapeProfileDef(IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< IfcLabel > v2_ProfileName, IfcAxis2Placement2D* v3_Position, IfcPositiveLengthMeasure v4_OverallWidth, IfcPositiveLengthMeasure v5_OverallDepth, IfcPositiveLengthMeasure v6_WebThickness, IfcPositiveLengthMeasure v7_FlangeThickness, boost::optional< IfcPositiveLengthMeasure > v8_FilletRadius) : IfcParameterizedProfileDef((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,v1_ProfileType,IfcProfileTypeEnum::ToString(v1_ProfileType)); if (v2_ProfileName) { e->setArgument(1,(*v2_ProfileName)); } else { e->setArgument(1); } e->setArgument(2,(v3_Position)); e->setArgument(3,(v4_OverallWidth)); e->setArgument(4,(v5_OverallDepth)); e->setArgument(5,(v6_WebThickness)); e->setArgument(6,(v7_FlangeThickness)); if (v8_FilletRadius) { e->setArgument(7,(*v8_FilletRadius)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
+IfcIShapeProfileDef::IfcIShapeProfileDef(IfcAbstractEntity* e) : IfcParameterizedProfileDef((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcIShapeProfileDef)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcIShapeProfileDef::IfcIShapeProfileDef(IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< std::string > v2_ProfileName, IfcAxis2Placement2D* v3_Position, double v4_OverallWidth, double v5_OverallDepth, double v6_WebThickness, double v7_FlangeThickness, boost::optional< double > v8_FilletRadius) : IfcParameterizedProfileDef((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,v1_ProfileType,IfcProfileTypeEnum::ToString(v1_ProfileType)); if (v2_ProfileName) { e->setArgument(1,(*v2_ProfileName)); } else { e->setArgument(1); } e->setArgument(2,(v3_Position)); e->setArgument(3,(v4_OverallWidth)); e->setArgument(4,(v5_OverallDepth)); e->setArgument(5,(v6_WebThickness)); e->setArgument(6,(v7_FlangeThickness)); if (v8_FilletRadius) { e->setArgument(7,(*v8_FilletRadius)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcImageTexture
-IfcIdentifier IfcImageTexture::UrlReference() { return *entity->getArgument(4); }
-void IfcImageTexture::setUrlReference(IfcIdentifier v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+std::string IfcImageTexture::UrlReference() const { return *entity->getArgument(4); }
+void IfcImageTexture::setUrlReference(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
 bool IfcImageTexture::is(Type::Enum v) const { return v == Type::IfcImageTexture || IfcSurfaceTexture::is(v); }
 Type::Enum IfcImageTexture::type() const { return Type::IfcImageTexture; }
 Type::Enum IfcImageTexture::Class() { return Type::IfcImageTexture; }
-IfcImageTexture::IfcImageTexture(IfcAbstractEntityPtr e) : IfcSurfaceTexture((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcImageTexture)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcImageTexture::IfcImageTexture(bool v1_RepeatS, bool v2_RepeatT, IfcSurfaceTextureEnum::IfcSurfaceTextureEnum v3_TextureType, IfcCartesianTransformationOperator2D* v4_TextureTransform, IfcIdentifier v5_UrlReference) : IfcSurfaceTexture((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_RepeatS)); e->setArgument(1,(v2_RepeatT)); e->setArgument(2,v3_TextureType,IfcSurfaceTextureEnum::ToString(v3_TextureType)); e->setArgument(3,(v4_TextureTransform)); e->setArgument(4,(v5_UrlReference)); entity = e; EntityBuffer::Add(this); }
+IfcImageTexture::IfcImageTexture(IfcAbstractEntity* e) : IfcSurfaceTexture((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcImageTexture)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcImageTexture::IfcImageTexture(bool v1_RepeatS, bool v2_RepeatT, IfcSurfaceTextureEnum::IfcSurfaceTextureEnum v3_TextureType, IfcCartesianTransformationOperator2D* v4_TextureTransform, std::string v5_UrlReference) : IfcSurfaceTexture((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_RepeatS)); e->setArgument(1,(v2_RepeatT)); e->setArgument(2,v3_TextureType,IfcSurfaceTextureEnum::ToString(v3_TextureType)); e->setArgument(3,(v4_TextureTransform)); e->setArgument(4,(v5_UrlReference)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcInventory
-IfcInventoryTypeEnum::IfcInventoryTypeEnum IfcInventory::InventoryType() { return IfcInventoryTypeEnum::FromString(*entity->getArgument(5)); }
+IfcInventoryTypeEnum::IfcInventoryTypeEnum IfcInventory::InventoryType() const { return IfcInventoryTypeEnum::FromString(*entity->getArgument(5)); }
 void IfcInventory::setInventoryType(IfcInventoryTypeEnum::IfcInventoryTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v,IfcInventoryTypeEnum::ToString(v)); }
-IfcActorSelect IfcInventory::Jurisdiction() { return *entity->getArgument(6); }
-void IfcInventory::setJurisdiction(IfcActorSelect v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
-SHARED_PTR< IfcTemplatedEntityList< IfcPerson > > IfcInventory::ResponsiblePersons() { RETURN_AS_LIST(IfcPerson,7) }
-void IfcInventory::setResponsiblePersons(SHARED_PTR< IfcTemplatedEntityList< IfcPerson > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v->generalize()); }
-IfcCalendarDate* IfcInventory::LastUpdateDate() { return (IfcCalendarDate*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(8))); }
+IfcActorSelect* IfcInventory::Jurisdiction() const { return (IfcActorSelect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(6))); }
+void IfcInventory::setJurisdiction(IfcActorSelect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
+IfcTemplatedEntityList< IfcPerson >::ptr IfcInventory::ResponsiblePersons() const { IfcEntityList::ptr es = *entity->getArgument(7); return es->as<IfcPerson>(); }
+void IfcInventory::setResponsiblePersons(IfcTemplatedEntityList< IfcPerson >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v->generalize()); }
+IfcCalendarDate* IfcInventory::LastUpdateDate() const { return (IfcCalendarDate*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(8))); }
 void IfcInventory::setLastUpdateDate(IfcCalendarDate* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
-bool IfcInventory::hasCurrentValue() { return !entity->getArgument(9)->isNull(); }
-IfcCostValue* IfcInventory::CurrentValue() { return (IfcCostValue*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(9))); }
+bool IfcInventory::hasCurrentValue() const { return !entity->getArgument(9)->isNull(); }
+IfcCostValue* IfcInventory::CurrentValue() const { return (IfcCostValue*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(9))); }
 void IfcInventory::setCurrentValue(IfcCostValue* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
-bool IfcInventory::hasOriginalValue() { return !entity->getArgument(10)->isNull(); }
-IfcCostValue* IfcInventory::OriginalValue() { return (IfcCostValue*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(10))); }
+bool IfcInventory::hasOriginalValue() const { return !entity->getArgument(10)->isNull(); }
+IfcCostValue* IfcInventory::OriginalValue() const { return (IfcCostValue*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(10))); }
 void IfcInventory::setOriginalValue(IfcCostValue* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
 bool IfcInventory::is(Type::Enum v) const { return v == Type::IfcInventory || IfcGroup::is(v); }
 Type::Enum IfcInventory::type() const { return Type::IfcInventory; }
 Type::Enum IfcInventory::Class() { return Type::IfcInventory; }
-IfcInventory::IfcInventory(IfcAbstractEntityPtr e) : IfcGroup((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcInventory)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcInventory::IfcInventory(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcInventoryTypeEnum::IfcInventoryTypeEnum v6_InventoryType, IfcActorSelect v7_Jurisdiction, SHARED_PTR< IfcTemplatedEntityList< IfcPerson > > v8_ResponsiblePersons, IfcCalendarDate* v9_LastUpdateDate, IfcCostValue* v10_CurrentValue, IfcCostValue* v11_OriginalValue) : IfcGroup((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,v6_InventoryType,IfcInventoryTypeEnum::ToString(v6_InventoryType)); e->setArgument(6,(v7_Jurisdiction)); e->setArgument(7,(v8_ResponsiblePersons)->generalize()); e->setArgument(8,(v9_LastUpdateDate)); e->setArgument(9,(v10_CurrentValue)); e->setArgument(10,(v11_OriginalValue)); entity = e; EntityBuffer::Add(this); }
+IfcInventory::IfcInventory(IfcAbstractEntity* e) : IfcGroup((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcInventory)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcInventory::IfcInventory(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcInventoryTypeEnum::IfcInventoryTypeEnum v6_InventoryType, IfcActorSelect* v7_Jurisdiction, IfcTemplatedEntityList< IfcPerson >::ptr v8_ResponsiblePersons, IfcCalendarDate* v9_LastUpdateDate, IfcCostValue* v10_CurrentValue, IfcCostValue* v11_OriginalValue) : IfcGroup((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,v6_InventoryType,IfcInventoryTypeEnum::ToString(v6_InventoryType)); e->setArgument(6,(v7_Jurisdiction)); e->setArgument(7,(v8_ResponsiblePersons)->generalize()); e->setArgument(8,(v9_LastUpdateDate)); e->setArgument(9,(v10_CurrentValue)); e->setArgument(10,(v11_OriginalValue)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcIrregularTimeSeries
-SHARED_PTR< IfcTemplatedEntityList< IfcIrregularTimeSeriesValue > > IfcIrregularTimeSeries::Values() { RETURN_AS_LIST(IfcIrregularTimeSeriesValue,8) }
-void IfcIrregularTimeSeries::setValues(SHARED_PTR< IfcTemplatedEntityList< IfcIrregularTimeSeriesValue > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v->generalize()); }
+IfcTemplatedEntityList< IfcIrregularTimeSeriesValue >::ptr IfcIrregularTimeSeries::Values() const { IfcEntityList::ptr es = *entity->getArgument(8); return es->as<IfcIrregularTimeSeriesValue>(); }
+void IfcIrregularTimeSeries::setValues(IfcTemplatedEntityList< IfcIrregularTimeSeriesValue >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v->generalize()); }
 bool IfcIrregularTimeSeries::is(Type::Enum v) const { return v == Type::IfcIrregularTimeSeries || IfcTimeSeries::is(v); }
 Type::Enum IfcIrregularTimeSeries::type() const { return Type::IfcIrregularTimeSeries; }
 Type::Enum IfcIrregularTimeSeries::Class() { return Type::IfcIrregularTimeSeries; }
-IfcIrregularTimeSeries::IfcIrregularTimeSeries(IfcAbstractEntityPtr e) : IfcTimeSeries((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcIrregularTimeSeries)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcIrregularTimeSeries::IfcIrregularTimeSeries(IfcLabel v1_Name, boost::optional< IfcText > v2_Description, IfcDateTimeSelect v3_StartTime, IfcDateTimeSelect v4_EndTime, IfcTimeSeriesDataTypeEnum::IfcTimeSeriesDataTypeEnum v5_TimeSeriesDataType, IfcDataOriginEnum::IfcDataOriginEnum v6_DataOrigin, boost::optional< IfcLabel > v7_UserDefinedDataOrigin, boost::optional< IfcUnit > v8_Unit, SHARED_PTR< IfcTemplatedEntityList< IfcIrregularTimeSeriesValue > > v9_Values) : IfcTimeSeries((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_StartTime)); e->setArgument(3,(v4_EndTime)); e->setArgument(4,v5_TimeSeriesDataType,IfcTimeSeriesDataTypeEnum::ToString(v5_TimeSeriesDataType)); e->setArgument(5,v6_DataOrigin,IfcDataOriginEnum::ToString(v6_DataOrigin)); if (v7_UserDefinedDataOrigin) { e->setArgument(6,(*v7_UserDefinedDataOrigin)); } else { e->setArgument(6); } if (v8_Unit) { e->setArgument(7,(*v8_Unit)); } else { e->setArgument(7); } e->setArgument(8,(v9_Values)->generalize()); entity = e; EntityBuffer::Add(this); }
+IfcIrregularTimeSeries::IfcIrregularTimeSeries(IfcAbstractEntity* e) : IfcTimeSeries((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcIrregularTimeSeries)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcIrregularTimeSeries::IfcIrregularTimeSeries(std::string v1_Name, boost::optional< std::string > v2_Description, IfcDateTimeSelect* v3_StartTime, IfcDateTimeSelect* v4_EndTime, IfcTimeSeriesDataTypeEnum::IfcTimeSeriesDataTypeEnum v5_TimeSeriesDataType, IfcDataOriginEnum::IfcDataOriginEnum v6_DataOrigin, boost::optional< std::string > v7_UserDefinedDataOrigin, IfcUnit* v8_Unit, IfcTemplatedEntityList< IfcIrregularTimeSeriesValue >::ptr v9_Values) : IfcTimeSeries((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_StartTime)); e->setArgument(3,(v4_EndTime)); e->setArgument(4,v5_TimeSeriesDataType,IfcTimeSeriesDataTypeEnum::ToString(v5_TimeSeriesDataType)); e->setArgument(5,v6_DataOrigin,IfcDataOriginEnum::ToString(v6_DataOrigin)); if (v7_UserDefinedDataOrigin) { e->setArgument(6,(*v7_UserDefinedDataOrigin)); } else { e->setArgument(6); } e->setArgument(7,(v8_Unit)); e->setArgument(8,(v9_Values)->generalize()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcIrregularTimeSeriesValue
-IfcDateTimeSelect IfcIrregularTimeSeriesValue::TimeStamp() { return *entity->getArgument(0); }
-void IfcIrregularTimeSeriesValue::setTimeStamp(IfcDateTimeSelect v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > IfcIrregularTimeSeriesValue::ListValues() { RETURN_AS_LIST(IfcUtil::IfcAbstractSelect,1) }
-void IfcIrregularTimeSeriesValue::setListValues(SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v->generalize()); }
+IfcDateTimeSelect* IfcIrregularTimeSeriesValue::TimeStamp() const { return (IfcDateTimeSelect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(0))); }
+void IfcIrregularTimeSeriesValue::setTimeStamp(IfcDateTimeSelect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+IfcEntityList::ptr IfcIrregularTimeSeriesValue::ListValues() const { return *entity->getArgument(1); }
+void IfcIrregularTimeSeriesValue::setListValues(IfcEntityList::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
 bool IfcIrregularTimeSeriesValue::is(Type::Enum v) const { return v == Type::IfcIrregularTimeSeriesValue; }
 Type::Enum IfcIrregularTimeSeriesValue::type() const { return Type::IfcIrregularTimeSeriesValue; }
 Type::Enum IfcIrregularTimeSeriesValue::Class() { return Type::IfcIrregularTimeSeriesValue; }
-IfcIrregularTimeSeriesValue::IfcIrregularTimeSeriesValue(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcIrregularTimeSeriesValue)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcIrregularTimeSeriesValue::IfcIrregularTimeSeriesValue(IfcDateTimeSelect v1_TimeStamp, IfcEntities v2_ListValues) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_TimeStamp)); e->setArgument(1,(v2_ListValues)); entity = e; EntityBuffer::Add(this); }
+IfcIrregularTimeSeriesValue::IfcIrregularTimeSeriesValue(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcIrregularTimeSeriesValue)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcIrregularTimeSeriesValue::IfcIrregularTimeSeriesValue(IfcDateTimeSelect* v1_TimeStamp, IfcEntityList::ptr v2_ListValues) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_TimeStamp)); e->setArgument(1,(v2_ListValues)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcJunctionBoxType
-IfcJunctionBoxTypeEnum::IfcJunctionBoxTypeEnum IfcJunctionBoxType::PredefinedType() { return IfcJunctionBoxTypeEnum::FromString(*entity->getArgument(9)); }
+IfcJunctionBoxTypeEnum::IfcJunctionBoxTypeEnum IfcJunctionBoxType::PredefinedType() const { return IfcJunctionBoxTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcJunctionBoxType::setPredefinedType(IfcJunctionBoxTypeEnum::IfcJunctionBoxTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcJunctionBoxTypeEnum::ToString(v)); }
 bool IfcJunctionBoxType::is(Type::Enum v) const { return v == Type::IfcJunctionBoxType || IfcFlowFittingType::is(v); }
 Type::Enum IfcJunctionBoxType::type() const { return Type::IfcJunctionBoxType; }
 Type::Enum IfcJunctionBoxType::Class() { return Type::IfcJunctionBoxType; }
-IfcJunctionBoxType::IfcJunctionBoxType(IfcAbstractEntityPtr e) : IfcFlowFittingType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcJunctionBoxType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcJunctionBoxType::IfcJunctionBoxType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcJunctionBoxTypeEnum::IfcJunctionBoxTypeEnum v10_PredefinedType) : IfcFlowFittingType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcJunctionBoxTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcJunctionBoxType::IfcJunctionBoxType(IfcAbstractEntity* e) : IfcFlowFittingType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcJunctionBoxType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcJunctionBoxType::IfcJunctionBoxType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcJunctionBoxTypeEnum::IfcJunctionBoxTypeEnum v10_PredefinedType) : IfcFlowFittingType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcJunctionBoxTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcLShapeProfileDef
-IfcPositiveLengthMeasure IfcLShapeProfileDef::Depth() { return *entity->getArgument(3); }
-void IfcLShapeProfileDef::setDepth(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-bool IfcLShapeProfileDef::hasWidth() { return !entity->getArgument(4)->isNull(); }
-IfcPositiveLengthMeasure IfcLShapeProfileDef::Width() { return *entity->getArgument(4); }
-void IfcLShapeProfileDef::setWidth(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-IfcPositiveLengthMeasure IfcLShapeProfileDef::Thickness() { return *entity->getArgument(5); }
-void IfcLShapeProfileDef::setThickness(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-bool IfcLShapeProfileDef::hasFilletRadius() { return !entity->getArgument(6)->isNull(); }
-IfcPositiveLengthMeasure IfcLShapeProfileDef::FilletRadius() { return *entity->getArgument(6); }
-void IfcLShapeProfileDef::setFilletRadius(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
-bool IfcLShapeProfileDef::hasEdgeRadius() { return !entity->getArgument(7)->isNull(); }
-IfcPositiveLengthMeasure IfcLShapeProfileDef::EdgeRadius() { return *entity->getArgument(7); }
-void IfcLShapeProfileDef::setEdgeRadius(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
-bool IfcLShapeProfileDef::hasLegSlope() { return !entity->getArgument(8)->isNull(); }
-IfcPlaneAngleMeasure IfcLShapeProfileDef::LegSlope() { return *entity->getArgument(8); }
-void IfcLShapeProfileDef::setLegSlope(IfcPlaneAngleMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
-bool IfcLShapeProfileDef::hasCentreOfGravityInX() { return !entity->getArgument(9)->isNull(); }
-IfcPositiveLengthMeasure IfcLShapeProfileDef::CentreOfGravityInX() { return *entity->getArgument(9); }
-void IfcLShapeProfileDef::setCentreOfGravityInX(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
-bool IfcLShapeProfileDef::hasCentreOfGravityInY() { return !entity->getArgument(10)->isNull(); }
-IfcPositiveLengthMeasure IfcLShapeProfileDef::CentreOfGravityInY() { return *entity->getArgument(10); }
-void IfcLShapeProfileDef::setCentreOfGravityInY(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
+double IfcLShapeProfileDef::Depth() const { return *entity->getArgument(3); }
+void IfcLShapeProfileDef::setDepth(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+bool IfcLShapeProfileDef::hasWidth() const { return !entity->getArgument(4)->isNull(); }
+double IfcLShapeProfileDef::Width() const { return *entity->getArgument(4); }
+void IfcLShapeProfileDef::setWidth(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+double IfcLShapeProfileDef::Thickness() const { return *entity->getArgument(5); }
+void IfcLShapeProfileDef::setThickness(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+bool IfcLShapeProfileDef::hasFilletRadius() const { return !entity->getArgument(6)->isNull(); }
+double IfcLShapeProfileDef::FilletRadius() const { return *entity->getArgument(6); }
+void IfcLShapeProfileDef::setFilletRadius(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
+bool IfcLShapeProfileDef::hasEdgeRadius() const { return !entity->getArgument(7)->isNull(); }
+double IfcLShapeProfileDef::EdgeRadius() const { return *entity->getArgument(7); }
+void IfcLShapeProfileDef::setEdgeRadius(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
+bool IfcLShapeProfileDef::hasLegSlope() const { return !entity->getArgument(8)->isNull(); }
+double IfcLShapeProfileDef::LegSlope() const { return *entity->getArgument(8); }
+void IfcLShapeProfileDef::setLegSlope(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
+bool IfcLShapeProfileDef::hasCentreOfGravityInX() const { return !entity->getArgument(9)->isNull(); }
+double IfcLShapeProfileDef::CentreOfGravityInX() const { return *entity->getArgument(9); }
+void IfcLShapeProfileDef::setCentreOfGravityInX(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
+bool IfcLShapeProfileDef::hasCentreOfGravityInY() const { return !entity->getArgument(10)->isNull(); }
+double IfcLShapeProfileDef::CentreOfGravityInY() const { return *entity->getArgument(10); }
+void IfcLShapeProfileDef::setCentreOfGravityInY(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
 bool IfcLShapeProfileDef::is(Type::Enum v) const { return v == Type::IfcLShapeProfileDef || IfcParameterizedProfileDef::is(v); }
 Type::Enum IfcLShapeProfileDef::type() const { return Type::IfcLShapeProfileDef; }
 Type::Enum IfcLShapeProfileDef::Class() { return Type::IfcLShapeProfileDef; }
-IfcLShapeProfileDef::IfcLShapeProfileDef(IfcAbstractEntityPtr e) : IfcParameterizedProfileDef((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcLShapeProfileDef)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcLShapeProfileDef::IfcLShapeProfileDef(IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< IfcLabel > v2_ProfileName, IfcAxis2Placement2D* v3_Position, IfcPositiveLengthMeasure v4_Depth, boost::optional< IfcPositiveLengthMeasure > v5_Width, IfcPositiveLengthMeasure v6_Thickness, boost::optional< IfcPositiveLengthMeasure > v7_FilletRadius, boost::optional< IfcPositiveLengthMeasure > v8_EdgeRadius, boost::optional< IfcPlaneAngleMeasure > v9_LegSlope, boost::optional< IfcPositiveLengthMeasure > v10_CentreOfGravityInX, boost::optional< IfcPositiveLengthMeasure > v11_CentreOfGravityInY) : IfcParameterizedProfileDef((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,v1_ProfileType,IfcProfileTypeEnum::ToString(v1_ProfileType)); if (v2_ProfileName) { e->setArgument(1,(*v2_ProfileName)); } else { e->setArgument(1); } e->setArgument(2,(v3_Position)); e->setArgument(3,(v4_Depth)); if (v5_Width) { e->setArgument(4,(*v5_Width)); } else { e->setArgument(4); } e->setArgument(5,(v6_Thickness)); if (v7_FilletRadius) { e->setArgument(6,(*v7_FilletRadius)); } else { e->setArgument(6); } if (v8_EdgeRadius) { e->setArgument(7,(*v8_EdgeRadius)); } else { e->setArgument(7); } if (v9_LegSlope) { e->setArgument(8,(*v9_LegSlope)); } else { e->setArgument(8); } if (v10_CentreOfGravityInX) { e->setArgument(9,(*v10_CentreOfGravityInX)); } else { e->setArgument(9); } if (v11_CentreOfGravityInY) { e->setArgument(10,(*v11_CentreOfGravityInY)); } else { e->setArgument(10); } entity = e; EntityBuffer::Add(this); }
+IfcLShapeProfileDef::IfcLShapeProfileDef(IfcAbstractEntity* e) : IfcParameterizedProfileDef((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcLShapeProfileDef)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcLShapeProfileDef::IfcLShapeProfileDef(IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< std::string > v2_ProfileName, IfcAxis2Placement2D* v3_Position, double v4_Depth, boost::optional< double > v5_Width, double v6_Thickness, boost::optional< double > v7_FilletRadius, boost::optional< double > v8_EdgeRadius, boost::optional< double > v9_LegSlope, boost::optional< double > v10_CentreOfGravityInX, boost::optional< double > v11_CentreOfGravityInY) : IfcParameterizedProfileDef((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,v1_ProfileType,IfcProfileTypeEnum::ToString(v1_ProfileType)); if (v2_ProfileName) { e->setArgument(1,(*v2_ProfileName)); } else { e->setArgument(1); } e->setArgument(2,(v3_Position)); e->setArgument(3,(v4_Depth)); if (v5_Width) { e->setArgument(4,(*v5_Width)); } else { e->setArgument(4); } e->setArgument(5,(v6_Thickness)); if (v7_FilletRadius) { e->setArgument(6,(*v7_FilletRadius)); } else { e->setArgument(6); } if (v8_EdgeRadius) { e->setArgument(7,(*v8_EdgeRadius)); } else { e->setArgument(7); } if (v9_LegSlope) { e->setArgument(8,(*v9_LegSlope)); } else { e->setArgument(8); } if (v10_CentreOfGravityInX) { e->setArgument(9,(*v10_CentreOfGravityInX)); } else { e->setArgument(9); } if (v11_CentreOfGravityInY) { e->setArgument(10,(*v11_CentreOfGravityInY)); } else { e->setArgument(10); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcLaborResource
-bool IfcLaborResource::hasSkillSet() { return !entity->getArgument(9)->isNull(); }
-IfcText IfcLaborResource::SkillSet() { return *entity->getArgument(9); }
-void IfcLaborResource::setSkillSet(IfcText v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
+bool IfcLaborResource::hasSkillSet() const { return !entity->getArgument(9)->isNull(); }
+std::string IfcLaborResource::SkillSet() const { return *entity->getArgument(9); }
+void IfcLaborResource::setSkillSet(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
 bool IfcLaborResource::is(Type::Enum v) const { return v == Type::IfcLaborResource || IfcConstructionResource::is(v); }
 Type::Enum IfcLaborResource::type() const { return Type::IfcLaborResource; }
 Type::Enum IfcLaborResource::Class() { return Type::IfcLaborResource; }
-IfcLaborResource::IfcLaborResource(IfcAbstractEntityPtr e) : IfcConstructionResource((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcLaborResource)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcLaborResource::IfcLaborResource(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, boost::optional< IfcIdentifier > v6_ResourceIdentifier, boost::optional< IfcLabel > v7_ResourceGroup, boost::optional< IfcResourceConsumptionEnum::IfcResourceConsumptionEnum > v8_ResourceConsumption, IfcMeasureWithUnit* v9_BaseQuantity, boost::optional< IfcText > v10_SkillSet) : IfcConstructionResource((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } if (v6_ResourceIdentifier) { e->setArgument(5,(*v6_ResourceIdentifier)); } else { e->setArgument(5); } if (v7_ResourceGroup) { e->setArgument(6,(*v7_ResourceGroup)); } else { e->setArgument(6); } if (v8_ResourceConsumption) { e->setArgument(7,*v8_ResourceConsumption,IfcResourceConsumptionEnum::ToString(*v8_ResourceConsumption)); } else { e->setArgument(7); } e->setArgument(8,(v9_BaseQuantity)); if (v10_SkillSet) { e->setArgument(9,(*v10_SkillSet)); } else { e->setArgument(9); } entity = e; EntityBuffer::Add(this); }
+IfcLaborResource::IfcLaborResource(IfcAbstractEntity* e) : IfcConstructionResource((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcLaborResource)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcLaborResource::IfcLaborResource(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, boost::optional< std::string > v6_ResourceIdentifier, boost::optional< std::string > v7_ResourceGroup, boost::optional< IfcResourceConsumptionEnum::IfcResourceConsumptionEnum > v8_ResourceConsumption, IfcMeasureWithUnit* v9_BaseQuantity, boost::optional< std::string > v10_SkillSet) : IfcConstructionResource((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } if (v6_ResourceIdentifier) { e->setArgument(5,(*v6_ResourceIdentifier)); } else { e->setArgument(5); } if (v7_ResourceGroup) { e->setArgument(6,(*v7_ResourceGroup)); } else { e->setArgument(6); } if (v8_ResourceConsumption) { e->setArgument(7,*v8_ResourceConsumption,IfcResourceConsumptionEnum::ToString(*v8_ResourceConsumption)); } else { e->setArgument(7); } e->setArgument(8,(v9_BaseQuantity)); if (v10_SkillSet) { e->setArgument(9,(*v10_SkillSet)); } else { e->setArgument(9); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcLampType
-IfcLampTypeEnum::IfcLampTypeEnum IfcLampType::PredefinedType() { return IfcLampTypeEnum::FromString(*entity->getArgument(9)); }
+IfcLampTypeEnum::IfcLampTypeEnum IfcLampType::PredefinedType() const { return IfcLampTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcLampType::setPredefinedType(IfcLampTypeEnum::IfcLampTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcLampTypeEnum::ToString(v)); }
 bool IfcLampType::is(Type::Enum v) const { return v == Type::IfcLampType || IfcFlowTerminalType::is(v); }
 Type::Enum IfcLampType::type() const { return Type::IfcLampType; }
 Type::Enum IfcLampType::Class() { return Type::IfcLampType; }
-IfcLampType::IfcLampType(IfcAbstractEntityPtr e) : IfcFlowTerminalType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcLampType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcLampType::IfcLampType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcLampTypeEnum::IfcLampTypeEnum v10_PredefinedType) : IfcFlowTerminalType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcLampTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcLampType::IfcLampType(IfcAbstractEntity* e) : IfcFlowTerminalType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcLampType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcLampType::IfcLampType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcLampTypeEnum::IfcLampTypeEnum v10_PredefinedType) : IfcFlowTerminalType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcLampTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcLibraryInformation
-IfcLabel IfcLibraryInformation::Name() { return *entity->getArgument(0); }
-void IfcLibraryInformation::setName(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-bool IfcLibraryInformation::hasVersion() { return !entity->getArgument(1)->isNull(); }
-IfcLabel IfcLibraryInformation::Version() { return *entity->getArgument(1); }
-void IfcLibraryInformation::setVersion(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-bool IfcLibraryInformation::hasPublisher() { return !entity->getArgument(2)->isNull(); }
-IfcOrganization* IfcLibraryInformation::Publisher() { return (IfcOrganization*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(2))); }
+std::string IfcLibraryInformation::Name() const { return *entity->getArgument(0); }
+void IfcLibraryInformation::setName(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+bool IfcLibraryInformation::hasVersion() const { return !entity->getArgument(1)->isNull(); }
+std::string IfcLibraryInformation::Version() const { return *entity->getArgument(1); }
+void IfcLibraryInformation::setVersion(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+bool IfcLibraryInformation::hasPublisher() const { return !entity->getArgument(2)->isNull(); }
+IfcOrganization* IfcLibraryInformation::Publisher() const { return (IfcOrganization*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(2))); }
 void IfcLibraryInformation::setPublisher(IfcOrganization* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-bool IfcLibraryInformation::hasVersionDate() { return !entity->getArgument(3)->isNull(); }
-IfcCalendarDate* IfcLibraryInformation::VersionDate() { return (IfcCalendarDate*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(3))); }
+bool IfcLibraryInformation::hasVersionDate() const { return !entity->getArgument(3)->isNull(); }
+IfcCalendarDate* IfcLibraryInformation::VersionDate() const { return (IfcCalendarDate*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(3))); }
 void IfcLibraryInformation::setVersionDate(IfcCalendarDate* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-bool IfcLibraryInformation::hasLibraryReference() { return !entity->getArgument(4)->isNull(); }
-SHARED_PTR< IfcTemplatedEntityList< IfcLibraryReference > > IfcLibraryInformation::LibraryReference() { RETURN_AS_LIST(IfcLibraryReference,4) }
-void IfcLibraryInformation::setLibraryReference(SHARED_PTR< IfcTemplatedEntityList< IfcLibraryReference > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v->generalize()); }
+bool IfcLibraryInformation::hasLibraryReference() const { return !entity->getArgument(4)->isNull(); }
+IfcTemplatedEntityList< IfcLibraryReference >::ptr IfcLibraryInformation::LibraryReference() const { IfcEntityList::ptr es = *entity->getArgument(4); return es->as<IfcLibraryReference>(); }
+void IfcLibraryInformation::setLibraryReference(IfcTemplatedEntityList< IfcLibraryReference >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v->generalize()); }
 bool IfcLibraryInformation::is(Type::Enum v) const { return v == Type::IfcLibraryInformation; }
 Type::Enum IfcLibraryInformation::type() const { return Type::IfcLibraryInformation; }
 Type::Enum IfcLibraryInformation::Class() { return Type::IfcLibraryInformation; }
-IfcLibraryInformation::IfcLibraryInformation(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcLibraryInformation)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcLibraryInformation::IfcLibraryInformation(IfcLabel v1_Name, boost::optional< IfcLabel > v2_Version, IfcOrganization* v3_Publisher, IfcCalendarDate* v4_VersionDate, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcLibraryReference > > > v5_LibraryReference) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); if (v2_Version) { e->setArgument(1,(*v2_Version)); } else { e->setArgument(1); } e->setArgument(2,(v3_Publisher)); e->setArgument(3,(v4_VersionDate)); if (v5_LibraryReference) { e->setArgument(4,(*v5_LibraryReference)->generalize()); } else { e->setArgument(4); } entity = e; EntityBuffer::Add(this); }
+IfcLibraryInformation::IfcLibraryInformation(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcLibraryInformation)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcLibraryInformation::IfcLibraryInformation(std::string v1_Name, boost::optional< std::string > v2_Version, IfcOrganization* v3_Publisher, IfcCalendarDate* v4_VersionDate, boost::optional< IfcTemplatedEntityList< IfcLibraryReference >::ptr > v5_LibraryReference) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); if (v2_Version) { e->setArgument(1,(*v2_Version)); } else { e->setArgument(1); } e->setArgument(2,(v3_Publisher)); e->setArgument(3,(v4_VersionDate)); if (v5_LibraryReference) { e->setArgument(4,(*v5_LibraryReference)->generalize()); } else { e->setArgument(4); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcLibraryReference
-IfcLibraryInformation::list IfcLibraryReference::ReferenceIntoLibrary() { RETURN_INVERSE(IfcLibraryInformation) }
+IfcLibraryInformation::list::ptr IfcLibraryReference::ReferenceIntoLibrary() const { return entity->getInverse(Type::IfcLibraryInformation, 4)->as<IfcLibraryInformation>(); }
 bool IfcLibraryReference::is(Type::Enum v) const { return v == Type::IfcLibraryReference || IfcExternalReference::is(v); }
 Type::Enum IfcLibraryReference::type() const { return Type::IfcLibraryReference; }
 Type::Enum IfcLibraryReference::Class() { return Type::IfcLibraryReference; }
-IfcLibraryReference::IfcLibraryReference(IfcAbstractEntityPtr e) : IfcExternalReference((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcLibraryReference)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcLibraryReference::IfcLibraryReference(boost::optional< IfcLabel > v1_Location, boost::optional< IfcIdentifier > v2_ItemReference, boost::optional< IfcLabel > v3_Name) : IfcExternalReference((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Location) { e->setArgument(0,(*v1_Location)); } else { e->setArgument(0); } if (v2_ItemReference) { e->setArgument(1,(*v2_ItemReference)); } else { e->setArgument(1); } if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } entity = e; EntityBuffer::Add(this); }
+IfcLibraryReference::IfcLibraryReference(IfcAbstractEntity* e) : IfcExternalReference((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcLibraryReference)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcLibraryReference::IfcLibraryReference(boost::optional< std::string > v1_Location, boost::optional< std::string > v2_ItemReference, boost::optional< std::string > v3_Name) : IfcExternalReference((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Location) { e->setArgument(0,(*v1_Location)); } else { e->setArgument(0); } if (v2_ItemReference) { e->setArgument(1,(*v2_ItemReference)); } else { e->setArgument(1); } if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcLightDistributionData
-IfcPlaneAngleMeasure IfcLightDistributionData::MainPlaneAngle() { return *entity->getArgument(0); }
-void IfcLightDistributionData::setMainPlaneAngle(IfcPlaneAngleMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-std::vector< IfcPlaneAngleMeasure > /*[1:?]*/ IfcLightDistributionData::SecondaryPlaneAngle() { return *entity->getArgument(1); }
-void IfcLightDistributionData::setSecondaryPlaneAngle(std::vector< IfcPlaneAngleMeasure > /*[1:?]*/ v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-std::vector< IfcLuminousIntensityDistributionMeasure > /*[1:?]*/ IfcLightDistributionData::LuminousIntensity() { return *entity->getArgument(2); }
-void IfcLightDistributionData::setLuminousIntensity(std::vector< IfcLuminousIntensityDistributionMeasure > /*[1:?]*/ v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+double IfcLightDistributionData::MainPlaneAngle() const { return *entity->getArgument(0); }
+void IfcLightDistributionData::setMainPlaneAngle(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+std::vector< double > /*[1:?]*/ IfcLightDistributionData::SecondaryPlaneAngle() const { return *entity->getArgument(1); }
+void IfcLightDistributionData::setSecondaryPlaneAngle(std::vector< double > /*[1:?]*/ v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+std::vector< double > /*[1:?]*/ IfcLightDistributionData::LuminousIntensity() const { return *entity->getArgument(2); }
+void IfcLightDistributionData::setLuminousIntensity(std::vector< double > /*[1:?]*/ v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
 bool IfcLightDistributionData::is(Type::Enum v) const { return v == Type::IfcLightDistributionData; }
 Type::Enum IfcLightDistributionData::type() const { return Type::IfcLightDistributionData; }
 Type::Enum IfcLightDistributionData::Class() { return Type::IfcLightDistributionData; }
-IfcLightDistributionData::IfcLightDistributionData(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcLightDistributionData)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcLightDistributionData::IfcLightDistributionData(IfcPlaneAngleMeasure v1_MainPlaneAngle, std::vector< IfcPlaneAngleMeasure > /*[1:?]*/ v2_SecondaryPlaneAngle, std::vector< IfcLuminousIntensityDistributionMeasure > /*[1:?]*/ v3_LuminousIntensity) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_MainPlaneAngle)); e->setArgument(1,(v2_SecondaryPlaneAngle)); e->setArgument(2,(v3_LuminousIntensity)); entity = e; EntityBuffer::Add(this); }
+IfcLightDistributionData::IfcLightDistributionData(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcLightDistributionData)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcLightDistributionData::IfcLightDistributionData(double v1_MainPlaneAngle, std::vector< double > /*[1:?]*/ v2_SecondaryPlaneAngle, std::vector< double > /*[1:?]*/ v3_LuminousIntensity) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_MainPlaneAngle)); e->setArgument(1,(v2_SecondaryPlaneAngle)); e->setArgument(2,(v3_LuminousIntensity)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcLightFixtureType
-IfcLightFixtureTypeEnum::IfcLightFixtureTypeEnum IfcLightFixtureType::PredefinedType() { return IfcLightFixtureTypeEnum::FromString(*entity->getArgument(9)); }
+IfcLightFixtureTypeEnum::IfcLightFixtureTypeEnum IfcLightFixtureType::PredefinedType() const { return IfcLightFixtureTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcLightFixtureType::setPredefinedType(IfcLightFixtureTypeEnum::IfcLightFixtureTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcLightFixtureTypeEnum::ToString(v)); }
 bool IfcLightFixtureType::is(Type::Enum v) const { return v == Type::IfcLightFixtureType || IfcFlowTerminalType::is(v); }
 Type::Enum IfcLightFixtureType::type() const { return Type::IfcLightFixtureType; }
 Type::Enum IfcLightFixtureType::Class() { return Type::IfcLightFixtureType; }
-IfcLightFixtureType::IfcLightFixtureType(IfcAbstractEntityPtr e) : IfcFlowTerminalType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcLightFixtureType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcLightFixtureType::IfcLightFixtureType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcLightFixtureTypeEnum::IfcLightFixtureTypeEnum v10_PredefinedType) : IfcFlowTerminalType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcLightFixtureTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcLightFixtureType::IfcLightFixtureType(IfcAbstractEntity* e) : IfcFlowTerminalType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcLightFixtureType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcLightFixtureType::IfcLightFixtureType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcLightFixtureTypeEnum::IfcLightFixtureTypeEnum v10_PredefinedType) : IfcFlowTerminalType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcLightFixtureTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcLightIntensityDistribution
-IfcLightDistributionCurveEnum::IfcLightDistributionCurveEnum IfcLightIntensityDistribution::LightDistributionCurve() { return IfcLightDistributionCurveEnum::FromString(*entity->getArgument(0)); }
+IfcLightDistributionCurveEnum::IfcLightDistributionCurveEnum IfcLightIntensityDistribution::LightDistributionCurve() const { return IfcLightDistributionCurveEnum::FromString(*entity->getArgument(0)); }
 void IfcLightIntensityDistribution::setLightDistributionCurve(IfcLightDistributionCurveEnum::IfcLightDistributionCurveEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v,IfcLightDistributionCurveEnum::ToString(v)); }
-SHARED_PTR< IfcTemplatedEntityList< IfcLightDistributionData > > IfcLightIntensityDistribution::DistributionData() { RETURN_AS_LIST(IfcLightDistributionData,1) }
-void IfcLightIntensityDistribution::setDistributionData(SHARED_PTR< IfcTemplatedEntityList< IfcLightDistributionData > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v->generalize()); }
+IfcTemplatedEntityList< IfcLightDistributionData >::ptr IfcLightIntensityDistribution::DistributionData() const { IfcEntityList::ptr es = *entity->getArgument(1); return es->as<IfcLightDistributionData>(); }
+void IfcLightIntensityDistribution::setDistributionData(IfcTemplatedEntityList< IfcLightDistributionData >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v->generalize()); }
 bool IfcLightIntensityDistribution::is(Type::Enum v) const { return v == Type::IfcLightIntensityDistribution; }
 Type::Enum IfcLightIntensityDistribution::type() const { return Type::IfcLightIntensityDistribution; }
 Type::Enum IfcLightIntensityDistribution::Class() { return Type::IfcLightIntensityDistribution; }
-IfcLightIntensityDistribution::IfcLightIntensityDistribution(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcLightIntensityDistribution)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcLightIntensityDistribution::IfcLightIntensityDistribution(IfcLightDistributionCurveEnum::IfcLightDistributionCurveEnum v1_LightDistributionCurve, SHARED_PTR< IfcTemplatedEntityList< IfcLightDistributionData > > v2_DistributionData) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,v1_LightDistributionCurve,IfcLightDistributionCurveEnum::ToString(v1_LightDistributionCurve)); e->setArgument(1,(v2_DistributionData)->generalize()); entity = e; EntityBuffer::Add(this); }
+IfcLightIntensityDistribution::IfcLightIntensityDistribution(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcLightIntensityDistribution)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcLightIntensityDistribution::IfcLightIntensityDistribution(IfcLightDistributionCurveEnum::IfcLightDistributionCurveEnum v1_LightDistributionCurve, IfcTemplatedEntityList< IfcLightDistributionData >::ptr v2_DistributionData) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,v1_LightDistributionCurve,IfcLightDistributionCurveEnum::ToString(v1_LightDistributionCurve)); e->setArgument(1,(v2_DistributionData)->generalize()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcLightSource
-bool IfcLightSource::hasName() { return !entity->getArgument(0)->isNull(); }
-IfcLabel IfcLightSource::Name() { return *entity->getArgument(0); }
-void IfcLightSource::setName(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-IfcColourRgb* IfcLightSource::LightColour() { return (IfcColourRgb*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(1))); }
+bool IfcLightSource::hasName() const { return !entity->getArgument(0)->isNull(); }
+std::string IfcLightSource::Name() const { return *entity->getArgument(0); }
+void IfcLightSource::setName(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+IfcColourRgb* IfcLightSource::LightColour() const { return (IfcColourRgb*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(1))); }
 void IfcLightSource::setLightColour(IfcColourRgb* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-bool IfcLightSource::hasAmbientIntensity() { return !entity->getArgument(2)->isNull(); }
-IfcNormalisedRatioMeasure IfcLightSource::AmbientIntensity() { return *entity->getArgument(2); }
-void IfcLightSource::setAmbientIntensity(IfcNormalisedRatioMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-bool IfcLightSource::hasIntensity() { return !entity->getArgument(3)->isNull(); }
-IfcNormalisedRatioMeasure IfcLightSource::Intensity() { return *entity->getArgument(3); }
-void IfcLightSource::setIntensity(IfcNormalisedRatioMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+bool IfcLightSource::hasAmbientIntensity() const { return !entity->getArgument(2)->isNull(); }
+double IfcLightSource::AmbientIntensity() const { return *entity->getArgument(2); }
+void IfcLightSource::setAmbientIntensity(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+bool IfcLightSource::hasIntensity() const { return !entity->getArgument(3)->isNull(); }
+double IfcLightSource::Intensity() const { return *entity->getArgument(3); }
+void IfcLightSource::setIntensity(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
 bool IfcLightSource::is(Type::Enum v) const { return v == Type::IfcLightSource || IfcGeometricRepresentationItem::is(v); }
 Type::Enum IfcLightSource::type() const { return Type::IfcLightSource; }
 Type::Enum IfcLightSource::Class() { return Type::IfcLightSource; }
-IfcLightSource::IfcLightSource(IfcAbstractEntityPtr e) : IfcGeometricRepresentationItem((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcLightSource)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcLightSource::IfcLightSource(boost::optional< IfcLabel > v1_Name, IfcColourRgb* v2_LightColour, boost::optional< IfcNormalisedRatioMeasure > v3_AmbientIntensity, boost::optional< IfcNormalisedRatioMeasure > v4_Intensity) : IfcGeometricRepresentationItem((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } e->setArgument(1,(v2_LightColour)); if (v3_AmbientIntensity) { e->setArgument(2,(*v3_AmbientIntensity)); } else { e->setArgument(2); } if (v4_Intensity) { e->setArgument(3,(*v4_Intensity)); } else { e->setArgument(3); } entity = e; EntityBuffer::Add(this); }
+IfcLightSource::IfcLightSource(IfcAbstractEntity* e) : IfcGeometricRepresentationItem((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcLightSource)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcLightSource::IfcLightSource(boost::optional< std::string > v1_Name, IfcColourRgb* v2_LightColour, boost::optional< double > v3_AmbientIntensity, boost::optional< double > v4_Intensity) : IfcGeometricRepresentationItem((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } e->setArgument(1,(v2_LightColour)); if (v3_AmbientIntensity) { e->setArgument(2,(*v3_AmbientIntensity)); } else { e->setArgument(2); } if (v4_Intensity) { e->setArgument(3,(*v4_Intensity)); } else { e->setArgument(3); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcLightSourceAmbient
 bool IfcLightSourceAmbient::is(Type::Enum v) const { return v == Type::IfcLightSourceAmbient || IfcLightSource::is(v); }
 Type::Enum IfcLightSourceAmbient::type() const { return Type::IfcLightSourceAmbient; }
 Type::Enum IfcLightSourceAmbient::Class() { return Type::IfcLightSourceAmbient; }
-IfcLightSourceAmbient::IfcLightSourceAmbient(IfcAbstractEntityPtr e) : IfcLightSource((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcLightSourceAmbient)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcLightSourceAmbient::IfcLightSourceAmbient(boost::optional< IfcLabel > v1_Name, IfcColourRgb* v2_LightColour, boost::optional< IfcNormalisedRatioMeasure > v3_AmbientIntensity, boost::optional< IfcNormalisedRatioMeasure > v4_Intensity) : IfcLightSource((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } e->setArgument(1,(v2_LightColour)); if (v3_AmbientIntensity) { e->setArgument(2,(*v3_AmbientIntensity)); } else { e->setArgument(2); } if (v4_Intensity) { e->setArgument(3,(*v4_Intensity)); } else { e->setArgument(3); } entity = e; EntityBuffer::Add(this); }
+IfcLightSourceAmbient::IfcLightSourceAmbient(IfcAbstractEntity* e) : IfcLightSource((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcLightSourceAmbient)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcLightSourceAmbient::IfcLightSourceAmbient(boost::optional< std::string > v1_Name, IfcColourRgb* v2_LightColour, boost::optional< double > v3_AmbientIntensity, boost::optional< double > v4_Intensity) : IfcLightSource((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } e->setArgument(1,(v2_LightColour)); if (v3_AmbientIntensity) { e->setArgument(2,(*v3_AmbientIntensity)); } else { e->setArgument(2); } if (v4_Intensity) { e->setArgument(3,(*v4_Intensity)); } else { e->setArgument(3); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcLightSourceDirectional
-IfcDirection* IfcLightSourceDirectional::Orientation() { return (IfcDirection*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(4))); }
+IfcDirection* IfcLightSourceDirectional::Orientation() const { return (IfcDirection*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(4))); }
 void IfcLightSourceDirectional::setOrientation(IfcDirection* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
 bool IfcLightSourceDirectional::is(Type::Enum v) const { return v == Type::IfcLightSourceDirectional || IfcLightSource::is(v); }
 Type::Enum IfcLightSourceDirectional::type() const { return Type::IfcLightSourceDirectional; }
 Type::Enum IfcLightSourceDirectional::Class() { return Type::IfcLightSourceDirectional; }
-IfcLightSourceDirectional::IfcLightSourceDirectional(IfcAbstractEntityPtr e) : IfcLightSource((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcLightSourceDirectional)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcLightSourceDirectional::IfcLightSourceDirectional(boost::optional< IfcLabel > v1_Name, IfcColourRgb* v2_LightColour, boost::optional< IfcNormalisedRatioMeasure > v3_AmbientIntensity, boost::optional< IfcNormalisedRatioMeasure > v4_Intensity, IfcDirection* v5_Orientation) : IfcLightSource((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } e->setArgument(1,(v2_LightColour)); if (v3_AmbientIntensity) { e->setArgument(2,(*v3_AmbientIntensity)); } else { e->setArgument(2); } if (v4_Intensity) { e->setArgument(3,(*v4_Intensity)); } else { e->setArgument(3); } e->setArgument(4,(v5_Orientation)); entity = e; EntityBuffer::Add(this); }
+IfcLightSourceDirectional::IfcLightSourceDirectional(IfcAbstractEntity* e) : IfcLightSource((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcLightSourceDirectional)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcLightSourceDirectional::IfcLightSourceDirectional(boost::optional< std::string > v1_Name, IfcColourRgb* v2_LightColour, boost::optional< double > v3_AmbientIntensity, boost::optional< double > v4_Intensity, IfcDirection* v5_Orientation) : IfcLightSource((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } e->setArgument(1,(v2_LightColour)); if (v3_AmbientIntensity) { e->setArgument(2,(*v3_AmbientIntensity)); } else { e->setArgument(2); } if (v4_Intensity) { e->setArgument(3,(*v4_Intensity)); } else { e->setArgument(3); } e->setArgument(4,(v5_Orientation)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcLightSourceGoniometric
-IfcAxis2Placement3D* IfcLightSourceGoniometric::Position() { return (IfcAxis2Placement3D*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(4))); }
+IfcAxis2Placement3D* IfcLightSourceGoniometric::Position() const { return (IfcAxis2Placement3D*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(4))); }
 void IfcLightSourceGoniometric::setPosition(IfcAxis2Placement3D* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-bool IfcLightSourceGoniometric::hasColourAppearance() { return !entity->getArgument(5)->isNull(); }
-IfcColourRgb* IfcLightSourceGoniometric::ColourAppearance() { return (IfcColourRgb*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(5))); }
+bool IfcLightSourceGoniometric::hasColourAppearance() const { return !entity->getArgument(5)->isNull(); }
+IfcColourRgb* IfcLightSourceGoniometric::ColourAppearance() const { return (IfcColourRgb*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(5))); }
 void IfcLightSourceGoniometric::setColourAppearance(IfcColourRgb* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-IfcThermodynamicTemperatureMeasure IfcLightSourceGoniometric::ColourTemperature() { return *entity->getArgument(6); }
-void IfcLightSourceGoniometric::setColourTemperature(IfcThermodynamicTemperatureMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
-IfcLuminousFluxMeasure IfcLightSourceGoniometric::LuminousFlux() { return *entity->getArgument(7); }
-void IfcLightSourceGoniometric::setLuminousFlux(IfcLuminousFluxMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
-IfcLightEmissionSourceEnum::IfcLightEmissionSourceEnum IfcLightSourceGoniometric::LightEmissionSource() { return IfcLightEmissionSourceEnum::FromString(*entity->getArgument(8)); }
+double IfcLightSourceGoniometric::ColourTemperature() const { return *entity->getArgument(6); }
+void IfcLightSourceGoniometric::setColourTemperature(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
+double IfcLightSourceGoniometric::LuminousFlux() const { return *entity->getArgument(7); }
+void IfcLightSourceGoniometric::setLuminousFlux(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
+IfcLightEmissionSourceEnum::IfcLightEmissionSourceEnum IfcLightSourceGoniometric::LightEmissionSource() const { return IfcLightEmissionSourceEnum::FromString(*entity->getArgument(8)); }
 void IfcLightSourceGoniometric::setLightEmissionSource(IfcLightEmissionSourceEnum::IfcLightEmissionSourceEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcLightEmissionSourceEnum::ToString(v)); }
-IfcLightDistributionDataSourceSelect IfcLightSourceGoniometric::LightDistributionDataSource() { return *entity->getArgument(9); }
-void IfcLightSourceGoniometric::setLightDistributionDataSource(IfcLightDistributionDataSourceSelect v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
+IfcLightDistributionDataSourceSelect* IfcLightSourceGoniometric::LightDistributionDataSource() const { return (IfcLightDistributionDataSourceSelect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(9))); }
+void IfcLightSourceGoniometric::setLightDistributionDataSource(IfcLightDistributionDataSourceSelect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
 bool IfcLightSourceGoniometric::is(Type::Enum v) const { return v == Type::IfcLightSourceGoniometric || IfcLightSource::is(v); }
 Type::Enum IfcLightSourceGoniometric::type() const { return Type::IfcLightSourceGoniometric; }
 Type::Enum IfcLightSourceGoniometric::Class() { return Type::IfcLightSourceGoniometric; }
-IfcLightSourceGoniometric::IfcLightSourceGoniometric(IfcAbstractEntityPtr e) : IfcLightSource((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcLightSourceGoniometric)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcLightSourceGoniometric::IfcLightSourceGoniometric(boost::optional< IfcLabel > v1_Name, IfcColourRgb* v2_LightColour, boost::optional< IfcNormalisedRatioMeasure > v3_AmbientIntensity, boost::optional< IfcNormalisedRatioMeasure > v4_Intensity, IfcAxis2Placement3D* v5_Position, IfcColourRgb* v6_ColourAppearance, IfcThermodynamicTemperatureMeasure v7_ColourTemperature, IfcLuminousFluxMeasure v8_LuminousFlux, IfcLightEmissionSourceEnum::IfcLightEmissionSourceEnum v9_LightEmissionSource, IfcLightDistributionDataSourceSelect v10_LightDistributionDataSource) : IfcLightSource((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } e->setArgument(1,(v2_LightColour)); if (v3_AmbientIntensity) { e->setArgument(2,(*v3_AmbientIntensity)); } else { e->setArgument(2); } if (v4_Intensity) { e->setArgument(3,(*v4_Intensity)); } else { e->setArgument(3); } e->setArgument(4,(v5_Position)); e->setArgument(5,(v6_ColourAppearance)); e->setArgument(6,(v7_ColourTemperature)); e->setArgument(7,(v8_LuminousFlux)); e->setArgument(8,v9_LightEmissionSource,IfcLightEmissionSourceEnum::ToString(v9_LightEmissionSource)); e->setArgument(9,(v10_LightDistributionDataSource)); entity = e; EntityBuffer::Add(this); }
+IfcLightSourceGoniometric::IfcLightSourceGoniometric(IfcAbstractEntity* e) : IfcLightSource((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcLightSourceGoniometric)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcLightSourceGoniometric::IfcLightSourceGoniometric(boost::optional< std::string > v1_Name, IfcColourRgb* v2_LightColour, boost::optional< double > v3_AmbientIntensity, boost::optional< double > v4_Intensity, IfcAxis2Placement3D* v5_Position, IfcColourRgb* v6_ColourAppearance, double v7_ColourTemperature, double v8_LuminousFlux, IfcLightEmissionSourceEnum::IfcLightEmissionSourceEnum v9_LightEmissionSource, IfcLightDistributionDataSourceSelect* v10_LightDistributionDataSource) : IfcLightSource((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } e->setArgument(1,(v2_LightColour)); if (v3_AmbientIntensity) { e->setArgument(2,(*v3_AmbientIntensity)); } else { e->setArgument(2); } if (v4_Intensity) { e->setArgument(3,(*v4_Intensity)); } else { e->setArgument(3); } e->setArgument(4,(v5_Position)); e->setArgument(5,(v6_ColourAppearance)); e->setArgument(6,(v7_ColourTemperature)); e->setArgument(7,(v8_LuminousFlux)); e->setArgument(8,v9_LightEmissionSource,IfcLightEmissionSourceEnum::ToString(v9_LightEmissionSource)); e->setArgument(9,(v10_LightDistributionDataSource)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcLightSourcePositional
-IfcCartesianPoint* IfcLightSourcePositional::Position() { return (IfcCartesianPoint*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(4))); }
+IfcCartesianPoint* IfcLightSourcePositional::Position() const { return (IfcCartesianPoint*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(4))); }
 void IfcLightSourcePositional::setPosition(IfcCartesianPoint* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-IfcPositiveLengthMeasure IfcLightSourcePositional::Radius() { return *entity->getArgument(5); }
-void IfcLightSourcePositional::setRadius(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-IfcReal IfcLightSourcePositional::ConstantAttenuation() { return *entity->getArgument(6); }
-void IfcLightSourcePositional::setConstantAttenuation(IfcReal v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
-IfcReal IfcLightSourcePositional::DistanceAttenuation() { return *entity->getArgument(7); }
-void IfcLightSourcePositional::setDistanceAttenuation(IfcReal v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
-IfcReal IfcLightSourcePositional::QuadricAttenuation() { return *entity->getArgument(8); }
-void IfcLightSourcePositional::setQuadricAttenuation(IfcReal v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
+double IfcLightSourcePositional::Radius() const { return *entity->getArgument(5); }
+void IfcLightSourcePositional::setRadius(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+double IfcLightSourcePositional::ConstantAttenuation() const { return *entity->getArgument(6); }
+void IfcLightSourcePositional::setConstantAttenuation(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
+double IfcLightSourcePositional::DistanceAttenuation() const { return *entity->getArgument(7); }
+void IfcLightSourcePositional::setDistanceAttenuation(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
+double IfcLightSourcePositional::QuadricAttenuation() const { return *entity->getArgument(8); }
+void IfcLightSourcePositional::setQuadricAttenuation(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
 bool IfcLightSourcePositional::is(Type::Enum v) const { return v == Type::IfcLightSourcePositional || IfcLightSource::is(v); }
 Type::Enum IfcLightSourcePositional::type() const { return Type::IfcLightSourcePositional; }
 Type::Enum IfcLightSourcePositional::Class() { return Type::IfcLightSourcePositional; }
-IfcLightSourcePositional::IfcLightSourcePositional(IfcAbstractEntityPtr e) : IfcLightSource((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcLightSourcePositional)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcLightSourcePositional::IfcLightSourcePositional(boost::optional< IfcLabel > v1_Name, IfcColourRgb* v2_LightColour, boost::optional< IfcNormalisedRatioMeasure > v3_AmbientIntensity, boost::optional< IfcNormalisedRatioMeasure > v4_Intensity, IfcCartesianPoint* v5_Position, IfcPositiveLengthMeasure v6_Radius, IfcReal v7_ConstantAttenuation, IfcReal v8_DistanceAttenuation, IfcReal v9_QuadricAttenuation) : IfcLightSource((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } e->setArgument(1,(v2_LightColour)); if (v3_AmbientIntensity) { e->setArgument(2,(*v3_AmbientIntensity)); } else { e->setArgument(2); } if (v4_Intensity) { e->setArgument(3,(*v4_Intensity)); } else { e->setArgument(3); } e->setArgument(4,(v5_Position)); e->setArgument(5,(v6_Radius)); e->setArgument(6,(v7_ConstantAttenuation)); e->setArgument(7,(v8_DistanceAttenuation)); e->setArgument(8,(v9_QuadricAttenuation)); entity = e; EntityBuffer::Add(this); }
+IfcLightSourcePositional::IfcLightSourcePositional(IfcAbstractEntity* e) : IfcLightSource((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcLightSourcePositional)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcLightSourcePositional::IfcLightSourcePositional(boost::optional< std::string > v1_Name, IfcColourRgb* v2_LightColour, boost::optional< double > v3_AmbientIntensity, boost::optional< double > v4_Intensity, IfcCartesianPoint* v5_Position, double v6_Radius, double v7_ConstantAttenuation, double v8_DistanceAttenuation, double v9_QuadricAttenuation) : IfcLightSource((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } e->setArgument(1,(v2_LightColour)); if (v3_AmbientIntensity) { e->setArgument(2,(*v3_AmbientIntensity)); } else { e->setArgument(2); } if (v4_Intensity) { e->setArgument(3,(*v4_Intensity)); } else { e->setArgument(3); } e->setArgument(4,(v5_Position)); e->setArgument(5,(v6_Radius)); e->setArgument(6,(v7_ConstantAttenuation)); e->setArgument(7,(v8_DistanceAttenuation)); e->setArgument(8,(v9_QuadricAttenuation)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcLightSourceSpot
-IfcDirection* IfcLightSourceSpot::Orientation() { return (IfcDirection*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(9))); }
+IfcDirection* IfcLightSourceSpot::Orientation() const { return (IfcDirection*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(9))); }
 void IfcLightSourceSpot::setOrientation(IfcDirection* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
-bool IfcLightSourceSpot::hasConcentrationExponent() { return !entity->getArgument(10)->isNull(); }
-IfcReal IfcLightSourceSpot::ConcentrationExponent() { return *entity->getArgument(10); }
-void IfcLightSourceSpot::setConcentrationExponent(IfcReal v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
-IfcPositivePlaneAngleMeasure IfcLightSourceSpot::SpreadAngle() { return *entity->getArgument(11); }
-void IfcLightSourceSpot::setSpreadAngle(IfcPositivePlaneAngleMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(11,v); }
-IfcPositivePlaneAngleMeasure IfcLightSourceSpot::BeamWidthAngle() { return *entity->getArgument(12); }
-void IfcLightSourceSpot::setBeamWidthAngle(IfcPositivePlaneAngleMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(12,v); }
+bool IfcLightSourceSpot::hasConcentrationExponent() const { return !entity->getArgument(10)->isNull(); }
+double IfcLightSourceSpot::ConcentrationExponent() const { return *entity->getArgument(10); }
+void IfcLightSourceSpot::setConcentrationExponent(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
+double IfcLightSourceSpot::SpreadAngle() const { return *entity->getArgument(11); }
+void IfcLightSourceSpot::setSpreadAngle(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(11,v); }
+double IfcLightSourceSpot::BeamWidthAngle() const { return *entity->getArgument(12); }
+void IfcLightSourceSpot::setBeamWidthAngle(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(12,v); }
 bool IfcLightSourceSpot::is(Type::Enum v) const { return v == Type::IfcLightSourceSpot || IfcLightSourcePositional::is(v); }
 Type::Enum IfcLightSourceSpot::type() const { return Type::IfcLightSourceSpot; }
 Type::Enum IfcLightSourceSpot::Class() { return Type::IfcLightSourceSpot; }
-IfcLightSourceSpot::IfcLightSourceSpot(IfcAbstractEntityPtr e) : IfcLightSourcePositional((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcLightSourceSpot)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcLightSourceSpot::IfcLightSourceSpot(boost::optional< IfcLabel > v1_Name, IfcColourRgb* v2_LightColour, boost::optional< IfcNormalisedRatioMeasure > v3_AmbientIntensity, boost::optional< IfcNormalisedRatioMeasure > v4_Intensity, IfcCartesianPoint* v5_Position, IfcPositiveLengthMeasure v6_Radius, IfcReal v7_ConstantAttenuation, IfcReal v8_DistanceAttenuation, IfcReal v9_QuadricAttenuation, IfcDirection* v10_Orientation, boost::optional< IfcReal > v11_ConcentrationExponent, IfcPositivePlaneAngleMeasure v12_SpreadAngle, IfcPositivePlaneAngleMeasure v13_BeamWidthAngle) : IfcLightSourcePositional((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } e->setArgument(1,(v2_LightColour)); if (v3_AmbientIntensity) { e->setArgument(2,(*v3_AmbientIntensity)); } else { e->setArgument(2); } if (v4_Intensity) { e->setArgument(3,(*v4_Intensity)); } else { e->setArgument(3); } e->setArgument(4,(v5_Position)); e->setArgument(5,(v6_Radius)); e->setArgument(6,(v7_ConstantAttenuation)); e->setArgument(7,(v8_DistanceAttenuation)); e->setArgument(8,(v9_QuadricAttenuation)); e->setArgument(9,(v10_Orientation)); if (v11_ConcentrationExponent) { e->setArgument(10,(*v11_ConcentrationExponent)); } else { e->setArgument(10); } e->setArgument(11,(v12_SpreadAngle)); e->setArgument(12,(v13_BeamWidthAngle)); entity = e; EntityBuffer::Add(this); }
+IfcLightSourceSpot::IfcLightSourceSpot(IfcAbstractEntity* e) : IfcLightSourcePositional((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcLightSourceSpot)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcLightSourceSpot::IfcLightSourceSpot(boost::optional< std::string > v1_Name, IfcColourRgb* v2_LightColour, boost::optional< double > v3_AmbientIntensity, boost::optional< double > v4_Intensity, IfcCartesianPoint* v5_Position, double v6_Radius, double v7_ConstantAttenuation, double v8_DistanceAttenuation, double v9_QuadricAttenuation, IfcDirection* v10_Orientation, boost::optional< double > v11_ConcentrationExponent, double v12_SpreadAngle, double v13_BeamWidthAngle) : IfcLightSourcePositional((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } e->setArgument(1,(v2_LightColour)); if (v3_AmbientIntensity) { e->setArgument(2,(*v3_AmbientIntensity)); } else { e->setArgument(2); } if (v4_Intensity) { e->setArgument(3,(*v4_Intensity)); } else { e->setArgument(3); } e->setArgument(4,(v5_Position)); e->setArgument(5,(v6_Radius)); e->setArgument(6,(v7_ConstantAttenuation)); e->setArgument(7,(v8_DistanceAttenuation)); e->setArgument(8,(v9_QuadricAttenuation)); e->setArgument(9,(v10_Orientation)); if (v11_ConcentrationExponent) { e->setArgument(10,(*v11_ConcentrationExponent)); } else { e->setArgument(10); } e->setArgument(11,(v12_SpreadAngle)); e->setArgument(12,(v13_BeamWidthAngle)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcLine
-IfcCartesianPoint* IfcLine::Pnt() { return (IfcCartesianPoint*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(0))); }
+IfcCartesianPoint* IfcLine::Pnt() const { return (IfcCartesianPoint*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(0))); }
 void IfcLine::setPnt(IfcCartesianPoint* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-IfcVector* IfcLine::Dir() { return (IfcVector*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(1))); }
+IfcVector* IfcLine::Dir() const { return (IfcVector*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(1))); }
 void IfcLine::setDir(IfcVector* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
 bool IfcLine::is(Type::Enum v) const { return v == Type::IfcLine || IfcCurve::is(v); }
 Type::Enum IfcLine::type() const { return Type::IfcLine; }
 Type::Enum IfcLine::Class() { return Type::IfcLine; }
-IfcLine::IfcLine(IfcAbstractEntityPtr e) : IfcCurve((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcLine)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcLine::IfcLine(IfcCartesianPoint* v1_Pnt, IfcVector* v2_Dir) : IfcCurve((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Pnt)); e->setArgument(1,(v2_Dir)); entity = e; EntityBuffer::Add(this); }
+IfcLine::IfcLine(IfcAbstractEntity* e) : IfcCurve((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcLine)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcLine::IfcLine(IfcCartesianPoint* v1_Pnt, IfcVector* v2_Dir) : IfcCurve((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Pnt)); e->setArgument(1,(v2_Dir)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcLinearDimension
 bool IfcLinearDimension::is(Type::Enum v) const { return v == Type::IfcLinearDimension || IfcDimensionCurveDirectedCallout::is(v); }
 Type::Enum IfcLinearDimension::type() const { return Type::IfcLinearDimension; }
 Type::Enum IfcLinearDimension::Class() { return Type::IfcLinearDimension; }
-IfcLinearDimension::IfcLinearDimension(IfcAbstractEntityPtr e) : IfcDimensionCurveDirectedCallout((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcLinearDimension)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcLinearDimension::IfcLinearDimension(IfcEntities v1_Contents) : IfcDimensionCurveDirectedCallout((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Contents)); entity = e; EntityBuffer::Add(this); }
+IfcLinearDimension::IfcLinearDimension(IfcAbstractEntity* e) : IfcDimensionCurveDirectedCallout((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcLinearDimension)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcLinearDimension::IfcLinearDimension(IfcEntityList::ptr v1_Contents) : IfcDimensionCurveDirectedCallout((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Contents)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcLocalPlacement
-bool IfcLocalPlacement::hasPlacementRelTo() { return !entity->getArgument(0)->isNull(); }
-IfcObjectPlacement* IfcLocalPlacement::PlacementRelTo() { return (IfcObjectPlacement*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(0))); }
+bool IfcLocalPlacement::hasPlacementRelTo() const { return !entity->getArgument(0)->isNull(); }
+IfcObjectPlacement* IfcLocalPlacement::PlacementRelTo() const { return (IfcObjectPlacement*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(0))); }
 void IfcLocalPlacement::setPlacementRelTo(IfcObjectPlacement* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-IfcAxis2Placement IfcLocalPlacement::RelativePlacement() { return *entity->getArgument(1); }
-void IfcLocalPlacement::setRelativePlacement(IfcAxis2Placement v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+IfcAxis2Placement* IfcLocalPlacement::RelativePlacement() const { return (IfcAxis2Placement*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(1))); }
+void IfcLocalPlacement::setRelativePlacement(IfcAxis2Placement* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
 bool IfcLocalPlacement::is(Type::Enum v) const { return v == Type::IfcLocalPlacement || IfcObjectPlacement::is(v); }
 Type::Enum IfcLocalPlacement::type() const { return Type::IfcLocalPlacement; }
 Type::Enum IfcLocalPlacement::Class() { return Type::IfcLocalPlacement; }
-IfcLocalPlacement::IfcLocalPlacement(IfcAbstractEntityPtr e) : IfcObjectPlacement((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcLocalPlacement)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcLocalPlacement::IfcLocalPlacement(IfcObjectPlacement* v1_PlacementRelTo, IfcAxis2Placement v2_RelativePlacement) : IfcObjectPlacement((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_PlacementRelTo)); e->setArgument(1,(v2_RelativePlacement)); entity = e; EntityBuffer::Add(this); }
+IfcLocalPlacement::IfcLocalPlacement(IfcAbstractEntity* e) : IfcObjectPlacement((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcLocalPlacement)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcLocalPlacement::IfcLocalPlacement(IfcObjectPlacement* v1_PlacementRelTo, IfcAxis2Placement* v2_RelativePlacement) : IfcObjectPlacement((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_PlacementRelTo)); e->setArgument(1,(v2_RelativePlacement)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcLocalTime
-IfcHourInDay IfcLocalTime::HourComponent() { return *entity->getArgument(0); }
-void IfcLocalTime::setHourComponent(IfcHourInDay v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-bool IfcLocalTime::hasMinuteComponent() { return !entity->getArgument(1)->isNull(); }
-IfcMinuteInHour IfcLocalTime::MinuteComponent() { return *entity->getArgument(1); }
-void IfcLocalTime::setMinuteComponent(IfcMinuteInHour v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-bool IfcLocalTime::hasSecondComponent() { return !entity->getArgument(2)->isNull(); }
-IfcSecondInMinute IfcLocalTime::SecondComponent() { return *entity->getArgument(2); }
-void IfcLocalTime::setSecondComponent(IfcSecondInMinute v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-bool IfcLocalTime::hasZone() { return !entity->getArgument(3)->isNull(); }
-IfcCoordinatedUniversalTimeOffset* IfcLocalTime::Zone() { return (IfcCoordinatedUniversalTimeOffset*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(3))); }
+int IfcLocalTime::HourComponent() const { return *entity->getArgument(0); }
+void IfcLocalTime::setHourComponent(int v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+bool IfcLocalTime::hasMinuteComponent() const { return !entity->getArgument(1)->isNull(); }
+int IfcLocalTime::MinuteComponent() const { return *entity->getArgument(1); }
+void IfcLocalTime::setMinuteComponent(int v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+bool IfcLocalTime::hasSecondComponent() const { return !entity->getArgument(2)->isNull(); }
+double IfcLocalTime::SecondComponent() const { return *entity->getArgument(2); }
+void IfcLocalTime::setSecondComponent(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+bool IfcLocalTime::hasZone() const { return !entity->getArgument(3)->isNull(); }
+IfcCoordinatedUniversalTimeOffset* IfcLocalTime::Zone() const { return (IfcCoordinatedUniversalTimeOffset*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(3))); }
 void IfcLocalTime::setZone(IfcCoordinatedUniversalTimeOffset* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-bool IfcLocalTime::hasDaylightSavingOffset() { return !entity->getArgument(4)->isNull(); }
-IfcDaylightSavingHour IfcLocalTime::DaylightSavingOffset() { return *entity->getArgument(4); }
-void IfcLocalTime::setDaylightSavingOffset(IfcDaylightSavingHour v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+bool IfcLocalTime::hasDaylightSavingOffset() const { return !entity->getArgument(4)->isNull(); }
+int IfcLocalTime::DaylightSavingOffset() const { return *entity->getArgument(4); }
+void IfcLocalTime::setDaylightSavingOffset(int v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
 bool IfcLocalTime::is(Type::Enum v) const { return v == Type::IfcLocalTime; }
 Type::Enum IfcLocalTime::type() const { return Type::IfcLocalTime; }
 Type::Enum IfcLocalTime::Class() { return Type::IfcLocalTime; }
-IfcLocalTime::IfcLocalTime(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcLocalTime)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcLocalTime::IfcLocalTime(IfcHourInDay v1_HourComponent, boost::optional< IfcMinuteInHour > v2_MinuteComponent, boost::optional< IfcSecondInMinute > v3_SecondComponent, IfcCoordinatedUniversalTimeOffset* v4_Zone, boost::optional< IfcDaylightSavingHour > v5_DaylightSavingOffset) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_HourComponent)); if (v2_MinuteComponent) { e->setArgument(1,(*v2_MinuteComponent)); } else { e->setArgument(1); } if (v3_SecondComponent) { e->setArgument(2,(*v3_SecondComponent)); } else { e->setArgument(2); } e->setArgument(3,(v4_Zone)); if (v5_DaylightSavingOffset) { e->setArgument(4,(*v5_DaylightSavingOffset)); } else { e->setArgument(4); } entity = e; EntityBuffer::Add(this); }
+IfcLocalTime::IfcLocalTime(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcLocalTime)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcLocalTime::IfcLocalTime(int v1_HourComponent, boost::optional< int > v2_MinuteComponent, boost::optional< double > v3_SecondComponent, IfcCoordinatedUniversalTimeOffset* v4_Zone, boost::optional< int > v5_DaylightSavingOffset) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_HourComponent)); if (v2_MinuteComponent) { e->setArgument(1,(*v2_MinuteComponent)); } else { e->setArgument(1); } if (v3_SecondComponent) { e->setArgument(2,(*v3_SecondComponent)); } else { e->setArgument(2); } e->setArgument(3,(v4_Zone)); if (v5_DaylightSavingOffset) { e->setArgument(4,(*v5_DaylightSavingOffset)); } else { e->setArgument(4); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcLoop
 bool IfcLoop::is(Type::Enum v) const { return v == Type::IfcLoop || IfcTopologicalRepresentationItem::is(v); }
 Type::Enum IfcLoop::type() const { return Type::IfcLoop; }
 Type::Enum IfcLoop::Class() { return Type::IfcLoop; }
-IfcLoop::IfcLoop(IfcAbstractEntityPtr e) : IfcTopologicalRepresentationItem((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcLoop)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcLoop::IfcLoop() : IfcTopologicalRepresentationItem((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); entity = e; EntityBuffer::Add(this); }
+IfcLoop::IfcLoop(IfcAbstractEntity* e) : IfcTopologicalRepresentationItem((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcLoop)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcLoop::IfcLoop() : IfcTopologicalRepresentationItem((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcManifoldSolidBrep
-IfcClosedShell* IfcManifoldSolidBrep::Outer() { return (IfcClosedShell*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(0))); }
+IfcClosedShell* IfcManifoldSolidBrep::Outer() const { return (IfcClosedShell*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(0))); }
 void IfcManifoldSolidBrep::setOuter(IfcClosedShell* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
 bool IfcManifoldSolidBrep::is(Type::Enum v) const { return v == Type::IfcManifoldSolidBrep || IfcSolidModel::is(v); }
 Type::Enum IfcManifoldSolidBrep::type() const { return Type::IfcManifoldSolidBrep; }
 Type::Enum IfcManifoldSolidBrep::Class() { return Type::IfcManifoldSolidBrep; }
-IfcManifoldSolidBrep::IfcManifoldSolidBrep(IfcAbstractEntityPtr e) : IfcSolidModel((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcManifoldSolidBrep)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcManifoldSolidBrep::IfcManifoldSolidBrep(IfcClosedShell* v1_Outer) : IfcSolidModel((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Outer)); entity = e; EntityBuffer::Add(this); }
+IfcManifoldSolidBrep::IfcManifoldSolidBrep(IfcAbstractEntity* e) : IfcSolidModel((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcManifoldSolidBrep)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcManifoldSolidBrep::IfcManifoldSolidBrep(IfcClosedShell* v1_Outer) : IfcSolidModel((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Outer)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcMappedItem
-IfcRepresentationMap* IfcMappedItem::MappingSource() { return (IfcRepresentationMap*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(0))); }
+IfcRepresentationMap* IfcMappedItem::MappingSource() const { return (IfcRepresentationMap*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(0))); }
 void IfcMappedItem::setMappingSource(IfcRepresentationMap* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-IfcCartesianTransformationOperator* IfcMappedItem::MappingTarget() { return (IfcCartesianTransformationOperator*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(1))); }
+IfcCartesianTransformationOperator* IfcMappedItem::MappingTarget() const { return (IfcCartesianTransformationOperator*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(1))); }
 void IfcMappedItem::setMappingTarget(IfcCartesianTransformationOperator* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
 bool IfcMappedItem::is(Type::Enum v) const { return v == Type::IfcMappedItem || IfcRepresentationItem::is(v); }
 Type::Enum IfcMappedItem::type() const { return Type::IfcMappedItem; }
 Type::Enum IfcMappedItem::Class() { return Type::IfcMappedItem; }
-IfcMappedItem::IfcMappedItem(IfcAbstractEntityPtr e) : IfcRepresentationItem((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcMappedItem)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcMappedItem::IfcMappedItem(IfcRepresentationMap* v1_MappingSource, IfcCartesianTransformationOperator* v2_MappingTarget) : IfcRepresentationItem((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_MappingSource)); e->setArgument(1,(v2_MappingTarget)); entity = e; EntityBuffer::Add(this); }
+IfcMappedItem::IfcMappedItem(IfcAbstractEntity* e) : IfcRepresentationItem((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcMappedItem)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcMappedItem::IfcMappedItem(IfcRepresentationMap* v1_MappingSource, IfcCartesianTransformationOperator* v2_MappingTarget) : IfcRepresentationItem((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_MappingSource)); e->setArgument(1,(v2_MappingTarget)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcMaterial
-IfcLabel IfcMaterial::Name() { return *entity->getArgument(0); }
-void IfcMaterial::setName(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-IfcMaterialDefinitionRepresentation::list IfcMaterial::HasRepresentation() { RETURN_INVERSE(IfcMaterialDefinitionRepresentation) }
-IfcMaterialClassificationRelationship::list IfcMaterial::ClassifiedAs() { RETURN_INVERSE(IfcMaterialClassificationRelationship) }
+std::string IfcMaterial::Name() const { return *entity->getArgument(0); }
+void IfcMaterial::setName(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+IfcMaterialDefinitionRepresentation::list::ptr IfcMaterial::HasRepresentation() const { return entity->getInverse(Type::IfcMaterialDefinitionRepresentation, 3)->as<IfcMaterialDefinitionRepresentation>(); }
+IfcMaterialClassificationRelationship::list::ptr IfcMaterial::ClassifiedAs() const { return entity->getInverse(Type::IfcMaterialClassificationRelationship, 1)->as<IfcMaterialClassificationRelationship>(); }
 bool IfcMaterial::is(Type::Enum v) const { return v == Type::IfcMaterial; }
 Type::Enum IfcMaterial::type() const { return Type::IfcMaterial; }
 Type::Enum IfcMaterial::Class() { return Type::IfcMaterial; }
-IfcMaterial::IfcMaterial(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcMaterial)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcMaterial::IfcMaterial(IfcLabel v1_Name) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); entity = e; EntityBuffer::Add(this); }
+IfcMaterial::IfcMaterial(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcMaterial)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcMaterial::IfcMaterial(std::string v1_Name) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcMaterialClassificationRelationship
-SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > IfcMaterialClassificationRelationship::MaterialClassifications() { RETURN_AS_LIST(IfcUtil::IfcAbstractSelect,0) }
-void IfcMaterialClassificationRelationship::setMaterialClassifications(SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v->generalize()); }
-IfcMaterial* IfcMaterialClassificationRelationship::ClassifiedMaterial() { return (IfcMaterial*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(1))); }
+IfcEntityList::ptr IfcMaterialClassificationRelationship::MaterialClassifications() const { return *entity->getArgument(0); }
+void IfcMaterialClassificationRelationship::setMaterialClassifications(IfcEntityList::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+IfcMaterial* IfcMaterialClassificationRelationship::ClassifiedMaterial() const { return (IfcMaterial*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(1))); }
 void IfcMaterialClassificationRelationship::setClassifiedMaterial(IfcMaterial* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
 bool IfcMaterialClassificationRelationship::is(Type::Enum v) const { return v == Type::IfcMaterialClassificationRelationship; }
 Type::Enum IfcMaterialClassificationRelationship::type() const { return Type::IfcMaterialClassificationRelationship; }
 Type::Enum IfcMaterialClassificationRelationship::Class() { return Type::IfcMaterialClassificationRelationship; }
-IfcMaterialClassificationRelationship::IfcMaterialClassificationRelationship(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcMaterialClassificationRelationship)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcMaterialClassificationRelationship::IfcMaterialClassificationRelationship(IfcEntities v1_MaterialClassifications, IfcMaterial* v2_ClassifiedMaterial) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_MaterialClassifications)); e->setArgument(1,(v2_ClassifiedMaterial)); entity = e; EntityBuffer::Add(this); }
+IfcMaterialClassificationRelationship::IfcMaterialClassificationRelationship(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcMaterialClassificationRelationship)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcMaterialClassificationRelationship::IfcMaterialClassificationRelationship(IfcEntityList::ptr v1_MaterialClassifications, IfcMaterial* v2_ClassifiedMaterial) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_MaterialClassifications)); e->setArgument(1,(v2_ClassifiedMaterial)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcMaterialDefinitionRepresentation
-IfcMaterial* IfcMaterialDefinitionRepresentation::RepresentedMaterial() { return (IfcMaterial*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(3))); }
+IfcMaterial* IfcMaterialDefinitionRepresentation::RepresentedMaterial() const { return (IfcMaterial*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(3))); }
 void IfcMaterialDefinitionRepresentation::setRepresentedMaterial(IfcMaterial* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
 bool IfcMaterialDefinitionRepresentation::is(Type::Enum v) const { return v == Type::IfcMaterialDefinitionRepresentation || IfcProductRepresentation::is(v); }
 Type::Enum IfcMaterialDefinitionRepresentation::type() const { return Type::IfcMaterialDefinitionRepresentation; }
 Type::Enum IfcMaterialDefinitionRepresentation::Class() { return Type::IfcMaterialDefinitionRepresentation; }
-IfcMaterialDefinitionRepresentation::IfcMaterialDefinitionRepresentation(IfcAbstractEntityPtr e) : IfcProductRepresentation((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcMaterialDefinitionRepresentation)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcMaterialDefinitionRepresentation::IfcMaterialDefinitionRepresentation(boost::optional< IfcLabel > v1_Name, boost::optional< IfcText > v2_Description, SHARED_PTR< IfcTemplatedEntityList< IfcRepresentation > > v3_Representations, IfcMaterial* v4_RepresentedMaterial) : IfcProductRepresentation((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_Representations)->generalize()); e->setArgument(3,(v4_RepresentedMaterial)); entity = e; EntityBuffer::Add(this); }
+IfcMaterialDefinitionRepresentation::IfcMaterialDefinitionRepresentation(IfcAbstractEntity* e) : IfcProductRepresentation((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcMaterialDefinitionRepresentation)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcMaterialDefinitionRepresentation::IfcMaterialDefinitionRepresentation(boost::optional< std::string > v1_Name, boost::optional< std::string > v2_Description, IfcTemplatedEntityList< IfcRepresentation >::ptr v3_Representations, IfcMaterial* v4_RepresentedMaterial) : IfcProductRepresentation((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_Representations)->generalize()); e->setArgument(3,(v4_RepresentedMaterial)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcMaterialLayer
-bool IfcMaterialLayer::hasMaterial() { return !entity->getArgument(0)->isNull(); }
-IfcMaterial* IfcMaterialLayer::Material() { return (IfcMaterial*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(0))); }
+bool IfcMaterialLayer::hasMaterial() const { return !entity->getArgument(0)->isNull(); }
+IfcMaterial* IfcMaterialLayer::Material() const { return (IfcMaterial*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(0))); }
 void IfcMaterialLayer::setMaterial(IfcMaterial* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-IfcPositiveLengthMeasure IfcMaterialLayer::LayerThickness() { return *entity->getArgument(1); }
-void IfcMaterialLayer::setLayerThickness(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-bool IfcMaterialLayer::hasIsVentilated() { return !entity->getArgument(2)->isNull(); }
-IfcLogical IfcMaterialLayer::IsVentilated() { return *entity->getArgument(2); }
-void IfcMaterialLayer::setIsVentilated(IfcLogical v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-IfcMaterialLayerSet::list IfcMaterialLayer::ToMaterialLayerSet() { RETURN_INVERSE(IfcMaterialLayerSet) }
+double IfcMaterialLayer::LayerThickness() const { return *entity->getArgument(1); }
+void IfcMaterialLayer::setLayerThickness(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+bool IfcMaterialLayer::hasIsVentilated() const { return !entity->getArgument(2)->isNull(); }
+bool IfcMaterialLayer::IsVentilated() const { return *entity->getArgument(2); }
+void IfcMaterialLayer::setIsVentilated(bool v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+IfcMaterialLayerSet::list::ptr IfcMaterialLayer::ToMaterialLayerSet() const { return entity->getInverse(Type::IfcMaterialLayerSet, 0)->as<IfcMaterialLayerSet>(); }
 bool IfcMaterialLayer::is(Type::Enum v) const { return v == Type::IfcMaterialLayer; }
 Type::Enum IfcMaterialLayer::type() const { return Type::IfcMaterialLayer; }
 Type::Enum IfcMaterialLayer::Class() { return Type::IfcMaterialLayer; }
-IfcMaterialLayer::IfcMaterialLayer(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcMaterialLayer)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcMaterialLayer::IfcMaterialLayer(IfcMaterial* v1_Material, IfcPositiveLengthMeasure v2_LayerThickness, boost::optional< IfcLogical > v3_IsVentilated) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Material)); e->setArgument(1,(v2_LayerThickness)); if (v3_IsVentilated) { e->setArgument(2,(*v3_IsVentilated)); } else { e->setArgument(2); } entity = e; EntityBuffer::Add(this); }
+IfcMaterialLayer::IfcMaterialLayer(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcMaterialLayer)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcMaterialLayer::IfcMaterialLayer(IfcMaterial* v1_Material, double v2_LayerThickness, boost::optional< bool > v3_IsVentilated) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Material)); e->setArgument(1,(v2_LayerThickness)); if (v3_IsVentilated) { e->setArgument(2,(*v3_IsVentilated)); } else { e->setArgument(2); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcMaterialLayerSet
-SHARED_PTR< IfcTemplatedEntityList< IfcMaterialLayer > > IfcMaterialLayerSet::MaterialLayers() { RETURN_AS_LIST(IfcMaterialLayer,0) }
-void IfcMaterialLayerSet::setMaterialLayers(SHARED_PTR< IfcTemplatedEntityList< IfcMaterialLayer > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v->generalize()); }
-bool IfcMaterialLayerSet::hasLayerSetName() { return !entity->getArgument(1)->isNull(); }
-IfcLabel IfcMaterialLayerSet::LayerSetName() { return *entity->getArgument(1); }
-void IfcMaterialLayerSet::setLayerSetName(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+IfcTemplatedEntityList< IfcMaterialLayer >::ptr IfcMaterialLayerSet::MaterialLayers() const { IfcEntityList::ptr es = *entity->getArgument(0); return es->as<IfcMaterialLayer>(); }
+void IfcMaterialLayerSet::setMaterialLayers(IfcTemplatedEntityList< IfcMaterialLayer >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v->generalize()); }
+bool IfcMaterialLayerSet::hasLayerSetName() const { return !entity->getArgument(1)->isNull(); }
+std::string IfcMaterialLayerSet::LayerSetName() const { return *entity->getArgument(1); }
+void IfcMaterialLayerSet::setLayerSetName(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
 bool IfcMaterialLayerSet::is(Type::Enum v) const { return v == Type::IfcMaterialLayerSet; }
 Type::Enum IfcMaterialLayerSet::type() const { return Type::IfcMaterialLayerSet; }
 Type::Enum IfcMaterialLayerSet::Class() { return Type::IfcMaterialLayerSet; }
-IfcMaterialLayerSet::IfcMaterialLayerSet(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcMaterialLayerSet)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcMaterialLayerSet::IfcMaterialLayerSet(SHARED_PTR< IfcTemplatedEntityList< IfcMaterialLayer > > v1_MaterialLayers, boost::optional< IfcLabel > v2_LayerSetName) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_MaterialLayers)->generalize()); if (v2_LayerSetName) { e->setArgument(1,(*v2_LayerSetName)); } else { e->setArgument(1); } entity = e; EntityBuffer::Add(this); }
+IfcMaterialLayerSet::IfcMaterialLayerSet(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcMaterialLayerSet)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcMaterialLayerSet::IfcMaterialLayerSet(IfcTemplatedEntityList< IfcMaterialLayer >::ptr v1_MaterialLayers, boost::optional< std::string > v2_LayerSetName) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_MaterialLayers)->generalize()); if (v2_LayerSetName) { e->setArgument(1,(*v2_LayerSetName)); } else { e->setArgument(1); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcMaterialLayerSetUsage
-IfcMaterialLayerSet* IfcMaterialLayerSetUsage::ForLayerSet() { return (IfcMaterialLayerSet*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(0))); }
+IfcMaterialLayerSet* IfcMaterialLayerSetUsage::ForLayerSet() const { return (IfcMaterialLayerSet*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(0))); }
 void IfcMaterialLayerSetUsage::setForLayerSet(IfcMaterialLayerSet* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-IfcLayerSetDirectionEnum::IfcLayerSetDirectionEnum IfcMaterialLayerSetUsage::LayerSetDirection() { return IfcLayerSetDirectionEnum::FromString(*entity->getArgument(1)); }
+IfcLayerSetDirectionEnum::IfcLayerSetDirectionEnum IfcMaterialLayerSetUsage::LayerSetDirection() const { return IfcLayerSetDirectionEnum::FromString(*entity->getArgument(1)); }
 void IfcMaterialLayerSetUsage::setLayerSetDirection(IfcLayerSetDirectionEnum::IfcLayerSetDirectionEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v,IfcLayerSetDirectionEnum::ToString(v)); }
-IfcDirectionSenseEnum::IfcDirectionSenseEnum IfcMaterialLayerSetUsage::DirectionSense() { return IfcDirectionSenseEnum::FromString(*entity->getArgument(2)); }
+IfcDirectionSenseEnum::IfcDirectionSenseEnum IfcMaterialLayerSetUsage::DirectionSense() const { return IfcDirectionSenseEnum::FromString(*entity->getArgument(2)); }
 void IfcMaterialLayerSetUsage::setDirectionSense(IfcDirectionSenseEnum::IfcDirectionSenseEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v,IfcDirectionSenseEnum::ToString(v)); }
-IfcLengthMeasure IfcMaterialLayerSetUsage::OffsetFromReferenceLine() { return *entity->getArgument(3); }
-void IfcMaterialLayerSetUsage::setOffsetFromReferenceLine(IfcLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+double IfcMaterialLayerSetUsage::OffsetFromReferenceLine() const { return *entity->getArgument(3); }
+void IfcMaterialLayerSetUsage::setOffsetFromReferenceLine(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
 bool IfcMaterialLayerSetUsage::is(Type::Enum v) const { return v == Type::IfcMaterialLayerSetUsage; }
 Type::Enum IfcMaterialLayerSetUsage::type() const { return Type::IfcMaterialLayerSetUsage; }
 Type::Enum IfcMaterialLayerSetUsage::Class() { return Type::IfcMaterialLayerSetUsage; }
-IfcMaterialLayerSetUsage::IfcMaterialLayerSetUsage(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcMaterialLayerSetUsage)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcMaterialLayerSetUsage::IfcMaterialLayerSetUsage(IfcMaterialLayerSet* v1_ForLayerSet, IfcLayerSetDirectionEnum::IfcLayerSetDirectionEnum v2_LayerSetDirection, IfcDirectionSenseEnum::IfcDirectionSenseEnum v3_DirectionSense, IfcLengthMeasure v4_OffsetFromReferenceLine) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_ForLayerSet)); e->setArgument(1,v2_LayerSetDirection,IfcLayerSetDirectionEnum::ToString(v2_LayerSetDirection)); e->setArgument(2,v3_DirectionSense,IfcDirectionSenseEnum::ToString(v3_DirectionSense)); e->setArgument(3,(v4_OffsetFromReferenceLine)); entity = e; EntityBuffer::Add(this); }
+IfcMaterialLayerSetUsage::IfcMaterialLayerSetUsage(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcMaterialLayerSetUsage)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcMaterialLayerSetUsage::IfcMaterialLayerSetUsage(IfcMaterialLayerSet* v1_ForLayerSet, IfcLayerSetDirectionEnum::IfcLayerSetDirectionEnum v2_LayerSetDirection, IfcDirectionSenseEnum::IfcDirectionSenseEnum v3_DirectionSense, double v4_OffsetFromReferenceLine) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_ForLayerSet)); e->setArgument(1,v2_LayerSetDirection,IfcLayerSetDirectionEnum::ToString(v2_LayerSetDirection)); e->setArgument(2,v3_DirectionSense,IfcDirectionSenseEnum::ToString(v3_DirectionSense)); e->setArgument(3,(v4_OffsetFromReferenceLine)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcMaterialList
-SHARED_PTR< IfcTemplatedEntityList< IfcMaterial > > IfcMaterialList::Materials() { RETURN_AS_LIST(IfcMaterial,0) }
-void IfcMaterialList::setMaterials(SHARED_PTR< IfcTemplatedEntityList< IfcMaterial > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v->generalize()); }
+IfcTemplatedEntityList< IfcMaterial >::ptr IfcMaterialList::Materials() const { IfcEntityList::ptr es = *entity->getArgument(0); return es->as<IfcMaterial>(); }
+void IfcMaterialList::setMaterials(IfcTemplatedEntityList< IfcMaterial >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v->generalize()); }
 bool IfcMaterialList::is(Type::Enum v) const { return v == Type::IfcMaterialList; }
 Type::Enum IfcMaterialList::type() const { return Type::IfcMaterialList; }
 Type::Enum IfcMaterialList::Class() { return Type::IfcMaterialList; }
-IfcMaterialList::IfcMaterialList(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcMaterialList)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcMaterialList::IfcMaterialList(SHARED_PTR< IfcTemplatedEntityList< IfcMaterial > > v1_Materials) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Materials)->generalize()); entity = e; EntityBuffer::Add(this); }
+IfcMaterialList::IfcMaterialList(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcMaterialList)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcMaterialList::IfcMaterialList(IfcTemplatedEntityList< IfcMaterial >::ptr v1_Materials) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Materials)->generalize()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcMaterialProperties
-IfcMaterial* IfcMaterialProperties::Material() { return (IfcMaterial*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(0))); }
+IfcMaterial* IfcMaterialProperties::Material() const { return (IfcMaterial*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(0))); }
 void IfcMaterialProperties::setMaterial(IfcMaterial* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
 bool IfcMaterialProperties::is(Type::Enum v) const { return v == Type::IfcMaterialProperties; }
 Type::Enum IfcMaterialProperties::type() const { return Type::IfcMaterialProperties; }
 Type::Enum IfcMaterialProperties::Class() { return Type::IfcMaterialProperties; }
-IfcMaterialProperties::IfcMaterialProperties(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcMaterialProperties)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcMaterialProperties::IfcMaterialProperties(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcMaterialProperties)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
 IfcMaterialProperties::IfcMaterialProperties(IfcMaterial* v1_Material) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Material)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcMeasureWithUnit
-IfcValue IfcMeasureWithUnit::ValueComponent() { return *entity->getArgument(0); }
-void IfcMeasureWithUnit::setValueComponent(IfcValue v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-IfcUnit IfcMeasureWithUnit::UnitComponent() { return *entity->getArgument(1); }
-void IfcMeasureWithUnit::setUnitComponent(IfcUnit v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+IfcValue* IfcMeasureWithUnit::ValueComponent() const { return (IfcValue*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(0))); }
+void IfcMeasureWithUnit::setValueComponent(IfcValue* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+IfcUnit* IfcMeasureWithUnit::UnitComponent() const { return (IfcUnit*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(1))); }
+void IfcMeasureWithUnit::setUnitComponent(IfcUnit* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
 bool IfcMeasureWithUnit::is(Type::Enum v) const { return v == Type::IfcMeasureWithUnit; }
 Type::Enum IfcMeasureWithUnit::type() const { return Type::IfcMeasureWithUnit; }
 Type::Enum IfcMeasureWithUnit::Class() { return Type::IfcMeasureWithUnit; }
-IfcMeasureWithUnit::IfcMeasureWithUnit(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcMeasureWithUnit)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcMeasureWithUnit::IfcMeasureWithUnit(IfcValue v1_ValueComponent, IfcUnit v2_UnitComponent) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_ValueComponent)); e->setArgument(1,(v2_UnitComponent)); entity = e; EntityBuffer::Add(this); }
+IfcMeasureWithUnit::IfcMeasureWithUnit(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcMeasureWithUnit)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcMeasureWithUnit::IfcMeasureWithUnit(IfcValue* v1_ValueComponent, IfcUnit* v2_UnitComponent) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_ValueComponent)); e->setArgument(1,(v2_UnitComponent)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcMechanicalConcreteMaterialProperties
-bool IfcMechanicalConcreteMaterialProperties::hasCompressiveStrength() { return !entity->getArgument(6)->isNull(); }
-IfcPressureMeasure IfcMechanicalConcreteMaterialProperties::CompressiveStrength() { return *entity->getArgument(6); }
-void IfcMechanicalConcreteMaterialProperties::setCompressiveStrength(IfcPressureMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
-bool IfcMechanicalConcreteMaterialProperties::hasMaxAggregateSize() { return !entity->getArgument(7)->isNull(); }
-IfcPositiveLengthMeasure IfcMechanicalConcreteMaterialProperties::MaxAggregateSize() { return *entity->getArgument(7); }
-void IfcMechanicalConcreteMaterialProperties::setMaxAggregateSize(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
-bool IfcMechanicalConcreteMaterialProperties::hasAdmixturesDescription() { return !entity->getArgument(8)->isNull(); }
-IfcText IfcMechanicalConcreteMaterialProperties::AdmixturesDescription() { return *entity->getArgument(8); }
-void IfcMechanicalConcreteMaterialProperties::setAdmixturesDescription(IfcText v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
-bool IfcMechanicalConcreteMaterialProperties::hasWorkability() { return !entity->getArgument(9)->isNull(); }
-IfcText IfcMechanicalConcreteMaterialProperties::Workability() { return *entity->getArgument(9); }
-void IfcMechanicalConcreteMaterialProperties::setWorkability(IfcText v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
-bool IfcMechanicalConcreteMaterialProperties::hasProtectivePoreRatio() { return !entity->getArgument(10)->isNull(); }
-IfcNormalisedRatioMeasure IfcMechanicalConcreteMaterialProperties::ProtectivePoreRatio() { return *entity->getArgument(10); }
-void IfcMechanicalConcreteMaterialProperties::setProtectivePoreRatio(IfcNormalisedRatioMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
-bool IfcMechanicalConcreteMaterialProperties::hasWaterImpermeability() { return !entity->getArgument(11)->isNull(); }
-IfcText IfcMechanicalConcreteMaterialProperties::WaterImpermeability() { return *entity->getArgument(11); }
-void IfcMechanicalConcreteMaterialProperties::setWaterImpermeability(IfcText v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(11,v); }
+bool IfcMechanicalConcreteMaterialProperties::hasCompressiveStrength() const { return !entity->getArgument(6)->isNull(); }
+double IfcMechanicalConcreteMaterialProperties::CompressiveStrength() const { return *entity->getArgument(6); }
+void IfcMechanicalConcreteMaterialProperties::setCompressiveStrength(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
+bool IfcMechanicalConcreteMaterialProperties::hasMaxAggregateSize() const { return !entity->getArgument(7)->isNull(); }
+double IfcMechanicalConcreteMaterialProperties::MaxAggregateSize() const { return *entity->getArgument(7); }
+void IfcMechanicalConcreteMaterialProperties::setMaxAggregateSize(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
+bool IfcMechanicalConcreteMaterialProperties::hasAdmixturesDescription() const { return !entity->getArgument(8)->isNull(); }
+std::string IfcMechanicalConcreteMaterialProperties::AdmixturesDescription() const { return *entity->getArgument(8); }
+void IfcMechanicalConcreteMaterialProperties::setAdmixturesDescription(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
+bool IfcMechanicalConcreteMaterialProperties::hasWorkability() const { return !entity->getArgument(9)->isNull(); }
+std::string IfcMechanicalConcreteMaterialProperties::Workability() const { return *entity->getArgument(9); }
+void IfcMechanicalConcreteMaterialProperties::setWorkability(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
+bool IfcMechanicalConcreteMaterialProperties::hasProtectivePoreRatio() const { return !entity->getArgument(10)->isNull(); }
+double IfcMechanicalConcreteMaterialProperties::ProtectivePoreRatio() const { return *entity->getArgument(10); }
+void IfcMechanicalConcreteMaterialProperties::setProtectivePoreRatio(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
+bool IfcMechanicalConcreteMaterialProperties::hasWaterImpermeability() const { return !entity->getArgument(11)->isNull(); }
+std::string IfcMechanicalConcreteMaterialProperties::WaterImpermeability() const { return *entity->getArgument(11); }
+void IfcMechanicalConcreteMaterialProperties::setWaterImpermeability(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(11,v); }
 bool IfcMechanicalConcreteMaterialProperties::is(Type::Enum v) const { return v == Type::IfcMechanicalConcreteMaterialProperties || IfcMechanicalMaterialProperties::is(v); }
 Type::Enum IfcMechanicalConcreteMaterialProperties::type() const { return Type::IfcMechanicalConcreteMaterialProperties; }
 Type::Enum IfcMechanicalConcreteMaterialProperties::Class() { return Type::IfcMechanicalConcreteMaterialProperties; }
-IfcMechanicalConcreteMaterialProperties::IfcMechanicalConcreteMaterialProperties(IfcAbstractEntityPtr e) : IfcMechanicalMaterialProperties((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcMechanicalConcreteMaterialProperties)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcMechanicalConcreteMaterialProperties::IfcMechanicalConcreteMaterialProperties(IfcMaterial* v1_Material, boost::optional< IfcDynamicViscosityMeasure > v2_DynamicViscosity, boost::optional< IfcModulusOfElasticityMeasure > v3_YoungModulus, boost::optional< IfcModulusOfElasticityMeasure > v4_ShearModulus, boost::optional< IfcPositiveRatioMeasure > v5_PoissonRatio, boost::optional< IfcThermalExpansionCoefficientMeasure > v6_ThermalExpansionCoefficient, boost::optional< IfcPressureMeasure > v7_CompressiveStrength, boost::optional< IfcPositiveLengthMeasure > v8_MaxAggregateSize, boost::optional< IfcText > v9_AdmixturesDescription, boost::optional< IfcText > v10_Workability, boost::optional< IfcNormalisedRatioMeasure > v11_ProtectivePoreRatio, boost::optional< IfcText > v12_WaterImpermeability) : IfcMechanicalMaterialProperties((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Material)); if (v2_DynamicViscosity) { e->setArgument(1,(*v2_DynamicViscosity)); } else { e->setArgument(1); } if (v3_YoungModulus) { e->setArgument(2,(*v3_YoungModulus)); } else { e->setArgument(2); } if (v4_ShearModulus) { e->setArgument(3,(*v4_ShearModulus)); } else { e->setArgument(3); } if (v5_PoissonRatio) { e->setArgument(4,(*v5_PoissonRatio)); } else { e->setArgument(4); } if (v6_ThermalExpansionCoefficient) { e->setArgument(5,(*v6_ThermalExpansionCoefficient)); } else { e->setArgument(5); } if (v7_CompressiveStrength) { e->setArgument(6,(*v7_CompressiveStrength)); } else { e->setArgument(6); } if (v8_MaxAggregateSize) { e->setArgument(7,(*v8_MaxAggregateSize)); } else { e->setArgument(7); } if (v9_AdmixturesDescription) { e->setArgument(8,(*v9_AdmixturesDescription)); } else { e->setArgument(8); } if (v10_Workability) { e->setArgument(9,(*v10_Workability)); } else { e->setArgument(9); } if (v11_ProtectivePoreRatio) { e->setArgument(10,(*v11_ProtectivePoreRatio)); } else { e->setArgument(10); } if (v12_WaterImpermeability) { e->setArgument(11,(*v12_WaterImpermeability)); } else { e->setArgument(11); } entity = e; EntityBuffer::Add(this); }
+IfcMechanicalConcreteMaterialProperties::IfcMechanicalConcreteMaterialProperties(IfcAbstractEntity* e) : IfcMechanicalMaterialProperties((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcMechanicalConcreteMaterialProperties)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcMechanicalConcreteMaterialProperties::IfcMechanicalConcreteMaterialProperties(IfcMaterial* v1_Material, boost::optional< double > v2_DynamicViscosity, boost::optional< double > v3_YoungModulus, boost::optional< double > v4_ShearModulus, boost::optional< double > v5_PoissonRatio, boost::optional< double > v6_ThermalExpansionCoefficient, boost::optional< double > v7_CompressiveStrength, boost::optional< double > v8_MaxAggregateSize, boost::optional< std::string > v9_AdmixturesDescription, boost::optional< std::string > v10_Workability, boost::optional< double > v11_ProtectivePoreRatio, boost::optional< std::string > v12_WaterImpermeability) : IfcMechanicalMaterialProperties((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Material)); if (v2_DynamicViscosity) { e->setArgument(1,(*v2_DynamicViscosity)); } else { e->setArgument(1); } if (v3_YoungModulus) { e->setArgument(2,(*v3_YoungModulus)); } else { e->setArgument(2); } if (v4_ShearModulus) { e->setArgument(3,(*v4_ShearModulus)); } else { e->setArgument(3); } if (v5_PoissonRatio) { e->setArgument(4,(*v5_PoissonRatio)); } else { e->setArgument(4); } if (v6_ThermalExpansionCoefficient) { e->setArgument(5,(*v6_ThermalExpansionCoefficient)); } else { e->setArgument(5); } if (v7_CompressiveStrength) { e->setArgument(6,(*v7_CompressiveStrength)); } else { e->setArgument(6); } if (v8_MaxAggregateSize) { e->setArgument(7,(*v8_MaxAggregateSize)); } else { e->setArgument(7); } if (v9_AdmixturesDescription) { e->setArgument(8,(*v9_AdmixturesDescription)); } else { e->setArgument(8); } if (v10_Workability) { e->setArgument(9,(*v10_Workability)); } else { e->setArgument(9); } if (v11_ProtectivePoreRatio) { e->setArgument(10,(*v11_ProtectivePoreRatio)); } else { e->setArgument(10); } if (v12_WaterImpermeability) { e->setArgument(11,(*v12_WaterImpermeability)); } else { e->setArgument(11); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcMechanicalFastener
-bool IfcMechanicalFastener::hasNominalDiameter() { return !entity->getArgument(8)->isNull(); }
-IfcPositiveLengthMeasure IfcMechanicalFastener::NominalDiameter() { return *entity->getArgument(8); }
-void IfcMechanicalFastener::setNominalDiameter(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
-bool IfcMechanicalFastener::hasNominalLength() { return !entity->getArgument(9)->isNull(); }
-IfcPositiveLengthMeasure IfcMechanicalFastener::NominalLength() { return *entity->getArgument(9); }
-void IfcMechanicalFastener::setNominalLength(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
+bool IfcMechanicalFastener::hasNominalDiameter() const { return !entity->getArgument(8)->isNull(); }
+double IfcMechanicalFastener::NominalDiameter() const { return *entity->getArgument(8); }
+void IfcMechanicalFastener::setNominalDiameter(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
+bool IfcMechanicalFastener::hasNominalLength() const { return !entity->getArgument(9)->isNull(); }
+double IfcMechanicalFastener::NominalLength() const { return *entity->getArgument(9); }
+void IfcMechanicalFastener::setNominalLength(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
 bool IfcMechanicalFastener::is(Type::Enum v) const { return v == Type::IfcMechanicalFastener || IfcFastener::is(v); }
 Type::Enum IfcMechanicalFastener::type() const { return Type::IfcMechanicalFastener; }
 Type::Enum IfcMechanicalFastener::Class() { return Type::IfcMechanicalFastener; }
-IfcMechanicalFastener::IfcMechanicalFastener(IfcAbstractEntityPtr e) : IfcFastener((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcMechanicalFastener)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcMechanicalFastener::IfcMechanicalFastener(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcPositiveLengthMeasure > v9_NominalDiameter, boost::optional< IfcPositiveLengthMeasure > v10_NominalLength) : IfcFastener((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_NominalDiameter) { e->setArgument(8,(*v9_NominalDiameter)); } else { e->setArgument(8); } if (v10_NominalLength) { e->setArgument(9,(*v10_NominalLength)); } else { e->setArgument(9); } entity = e; EntityBuffer::Add(this); }
+IfcMechanicalFastener::IfcMechanicalFastener(IfcAbstractEntity* e) : IfcFastener((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcMechanicalFastener)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcMechanicalFastener::IfcMechanicalFastener(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< double > v9_NominalDiameter, boost::optional< double > v10_NominalLength) : IfcFastener((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_NominalDiameter) { e->setArgument(8,(*v9_NominalDiameter)); } else { e->setArgument(8); } if (v10_NominalLength) { e->setArgument(9,(*v10_NominalLength)); } else { e->setArgument(9); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcMechanicalFastenerType
 bool IfcMechanicalFastenerType::is(Type::Enum v) const { return v == Type::IfcMechanicalFastenerType || IfcFastenerType::is(v); }
 Type::Enum IfcMechanicalFastenerType::type() const { return Type::IfcMechanicalFastenerType; }
 Type::Enum IfcMechanicalFastenerType::Class() { return Type::IfcMechanicalFastenerType; }
-IfcMechanicalFastenerType::IfcMechanicalFastenerType(IfcAbstractEntityPtr e) : IfcFastenerType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcMechanicalFastenerType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcMechanicalFastenerType::IfcMechanicalFastenerType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType) : IfcFastenerType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcMechanicalFastenerType::IfcMechanicalFastenerType(IfcAbstractEntity* e) : IfcFastenerType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcMechanicalFastenerType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcMechanicalFastenerType::IfcMechanicalFastenerType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType) : IfcFastenerType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcMechanicalMaterialProperties
-bool IfcMechanicalMaterialProperties::hasDynamicViscosity() { return !entity->getArgument(1)->isNull(); }
-IfcDynamicViscosityMeasure IfcMechanicalMaterialProperties::DynamicViscosity() { return *entity->getArgument(1); }
-void IfcMechanicalMaterialProperties::setDynamicViscosity(IfcDynamicViscosityMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-bool IfcMechanicalMaterialProperties::hasYoungModulus() { return !entity->getArgument(2)->isNull(); }
-IfcModulusOfElasticityMeasure IfcMechanicalMaterialProperties::YoungModulus() { return *entity->getArgument(2); }
-void IfcMechanicalMaterialProperties::setYoungModulus(IfcModulusOfElasticityMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-bool IfcMechanicalMaterialProperties::hasShearModulus() { return !entity->getArgument(3)->isNull(); }
-IfcModulusOfElasticityMeasure IfcMechanicalMaterialProperties::ShearModulus() { return *entity->getArgument(3); }
-void IfcMechanicalMaterialProperties::setShearModulus(IfcModulusOfElasticityMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-bool IfcMechanicalMaterialProperties::hasPoissonRatio() { return !entity->getArgument(4)->isNull(); }
-IfcPositiveRatioMeasure IfcMechanicalMaterialProperties::PoissonRatio() { return *entity->getArgument(4); }
-void IfcMechanicalMaterialProperties::setPoissonRatio(IfcPositiveRatioMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-bool IfcMechanicalMaterialProperties::hasThermalExpansionCoefficient() { return !entity->getArgument(5)->isNull(); }
-IfcThermalExpansionCoefficientMeasure IfcMechanicalMaterialProperties::ThermalExpansionCoefficient() { return *entity->getArgument(5); }
-void IfcMechanicalMaterialProperties::setThermalExpansionCoefficient(IfcThermalExpansionCoefficientMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+bool IfcMechanicalMaterialProperties::hasDynamicViscosity() const { return !entity->getArgument(1)->isNull(); }
+double IfcMechanicalMaterialProperties::DynamicViscosity() const { return *entity->getArgument(1); }
+void IfcMechanicalMaterialProperties::setDynamicViscosity(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+bool IfcMechanicalMaterialProperties::hasYoungModulus() const { return !entity->getArgument(2)->isNull(); }
+double IfcMechanicalMaterialProperties::YoungModulus() const { return *entity->getArgument(2); }
+void IfcMechanicalMaterialProperties::setYoungModulus(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+bool IfcMechanicalMaterialProperties::hasShearModulus() const { return !entity->getArgument(3)->isNull(); }
+double IfcMechanicalMaterialProperties::ShearModulus() const { return *entity->getArgument(3); }
+void IfcMechanicalMaterialProperties::setShearModulus(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+bool IfcMechanicalMaterialProperties::hasPoissonRatio() const { return !entity->getArgument(4)->isNull(); }
+double IfcMechanicalMaterialProperties::PoissonRatio() const { return *entity->getArgument(4); }
+void IfcMechanicalMaterialProperties::setPoissonRatio(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+bool IfcMechanicalMaterialProperties::hasThermalExpansionCoefficient() const { return !entity->getArgument(5)->isNull(); }
+double IfcMechanicalMaterialProperties::ThermalExpansionCoefficient() const { return *entity->getArgument(5); }
+void IfcMechanicalMaterialProperties::setThermalExpansionCoefficient(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
 bool IfcMechanicalMaterialProperties::is(Type::Enum v) const { return v == Type::IfcMechanicalMaterialProperties || IfcMaterialProperties::is(v); }
 Type::Enum IfcMechanicalMaterialProperties::type() const { return Type::IfcMechanicalMaterialProperties; }
 Type::Enum IfcMechanicalMaterialProperties::Class() { return Type::IfcMechanicalMaterialProperties; }
-IfcMechanicalMaterialProperties::IfcMechanicalMaterialProperties(IfcAbstractEntityPtr e) : IfcMaterialProperties((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcMechanicalMaterialProperties)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcMechanicalMaterialProperties::IfcMechanicalMaterialProperties(IfcMaterial* v1_Material, boost::optional< IfcDynamicViscosityMeasure > v2_DynamicViscosity, boost::optional< IfcModulusOfElasticityMeasure > v3_YoungModulus, boost::optional< IfcModulusOfElasticityMeasure > v4_ShearModulus, boost::optional< IfcPositiveRatioMeasure > v5_PoissonRatio, boost::optional< IfcThermalExpansionCoefficientMeasure > v6_ThermalExpansionCoefficient) : IfcMaterialProperties((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Material)); if (v2_DynamicViscosity) { e->setArgument(1,(*v2_DynamicViscosity)); } else { e->setArgument(1); } if (v3_YoungModulus) { e->setArgument(2,(*v3_YoungModulus)); } else { e->setArgument(2); } if (v4_ShearModulus) { e->setArgument(3,(*v4_ShearModulus)); } else { e->setArgument(3); } if (v5_PoissonRatio) { e->setArgument(4,(*v5_PoissonRatio)); } else { e->setArgument(4); } if (v6_ThermalExpansionCoefficient) { e->setArgument(5,(*v6_ThermalExpansionCoefficient)); } else { e->setArgument(5); } entity = e; EntityBuffer::Add(this); }
+IfcMechanicalMaterialProperties::IfcMechanicalMaterialProperties(IfcAbstractEntity* e) : IfcMaterialProperties((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcMechanicalMaterialProperties)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcMechanicalMaterialProperties::IfcMechanicalMaterialProperties(IfcMaterial* v1_Material, boost::optional< double > v2_DynamicViscosity, boost::optional< double > v3_YoungModulus, boost::optional< double > v4_ShearModulus, boost::optional< double > v5_PoissonRatio, boost::optional< double > v6_ThermalExpansionCoefficient) : IfcMaterialProperties((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Material)); if (v2_DynamicViscosity) { e->setArgument(1,(*v2_DynamicViscosity)); } else { e->setArgument(1); } if (v3_YoungModulus) { e->setArgument(2,(*v3_YoungModulus)); } else { e->setArgument(2); } if (v4_ShearModulus) { e->setArgument(3,(*v4_ShearModulus)); } else { e->setArgument(3); } if (v5_PoissonRatio) { e->setArgument(4,(*v5_PoissonRatio)); } else { e->setArgument(4); } if (v6_ThermalExpansionCoefficient) { e->setArgument(5,(*v6_ThermalExpansionCoefficient)); } else { e->setArgument(5); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcMechanicalSteelMaterialProperties
-bool IfcMechanicalSteelMaterialProperties::hasYieldStress() { return !entity->getArgument(6)->isNull(); }
-IfcPressureMeasure IfcMechanicalSteelMaterialProperties::YieldStress() { return *entity->getArgument(6); }
-void IfcMechanicalSteelMaterialProperties::setYieldStress(IfcPressureMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
-bool IfcMechanicalSteelMaterialProperties::hasUltimateStress() { return !entity->getArgument(7)->isNull(); }
-IfcPressureMeasure IfcMechanicalSteelMaterialProperties::UltimateStress() { return *entity->getArgument(7); }
-void IfcMechanicalSteelMaterialProperties::setUltimateStress(IfcPressureMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
-bool IfcMechanicalSteelMaterialProperties::hasUltimateStrain() { return !entity->getArgument(8)->isNull(); }
-IfcPositiveRatioMeasure IfcMechanicalSteelMaterialProperties::UltimateStrain() { return *entity->getArgument(8); }
-void IfcMechanicalSteelMaterialProperties::setUltimateStrain(IfcPositiveRatioMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
-bool IfcMechanicalSteelMaterialProperties::hasHardeningModule() { return !entity->getArgument(9)->isNull(); }
-IfcModulusOfElasticityMeasure IfcMechanicalSteelMaterialProperties::HardeningModule() { return *entity->getArgument(9); }
-void IfcMechanicalSteelMaterialProperties::setHardeningModule(IfcModulusOfElasticityMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
-bool IfcMechanicalSteelMaterialProperties::hasProportionalStress() { return !entity->getArgument(10)->isNull(); }
-IfcPressureMeasure IfcMechanicalSteelMaterialProperties::ProportionalStress() { return *entity->getArgument(10); }
-void IfcMechanicalSteelMaterialProperties::setProportionalStress(IfcPressureMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
-bool IfcMechanicalSteelMaterialProperties::hasPlasticStrain() { return !entity->getArgument(11)->isNull(); }
-IfcPositiveRatioMeasure IfcMechanicalSteelMaterialProperties::PlasticStrain() { return *entity->getArgument(11); }
-void IfcMechanicalSteelMaterialProperties::setPlasticStrain(IfcPositiveRatioMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(11,v); }
-bool IfcMechanicalSteelMaterialProperties::hasRelaxations() { return !entity->getArgument(12)->isNull(); }
-SHARED_PTR< IfcTemplatedEntityList< IfcRelaxation > > IfcMechanicalSteelMaterialProperties::Relaxations() { RETURN_AS_LIST(IfcRelaxation,12) }
-void IfcMechanicalSteelMaterialProperties::setRelaxations(SHARED_PTR< IfcTemplatedEntityList< IfcRelaxation > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(12,v->generalize()); }
+bool IfcMechanicalSteelMaterialProperties::hasYieldStress() const { return !entity->getArgument(6)->isNull(); }
+double IfcMechanicalSteelMaterialProperties::YieldStress() const { return *entity->getArgument(6); }
+void IfcMechanicalSteelMaterialProperties::setYieldStress(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
+bool IfcMechanicalSteelMaterialProperties::hasUltimateStress() const { return !entity->getArgument(7)->isNull(); }
+double IfcMechanicalSteelMaterialProperties::UltimateStress() const { return *entity->getArgument(7); }
+void IfcMechanicalSteelMaterialProperties::setUltimateStress(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
+bool IfcMechanicalSteelMaterialProperties::hasUltimateStrain() const { return !entity->getArgument(8)->isNull(); }
+double IfcMechanicalSteelMaterialProperties::UltimateStrain() const { return *entity->getArgument(8); }
+void IfcMechanicalSteelMaterialProperties::setUltimateStrain(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
+bool IfcMechanicalSteelMaterialProperties::hasHardeningModule() const { return !entity->getArgument(9)->isNull(); }
+double IfcMechanicalSteelMaterialProperties::HardeningModule() const { return *entity->getArgument(9); }
+void IfcMechanicalSteelMaterialProperties::setHardeningModule(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
+bool IfcMechanicalSteelMaterialProperties::hasProportionalStress() const { return !entity->getArgument(10)->isNull(); }
+double IfcMechanicalSteelMaterialProperties::ProportionalStress() const { return *entity->getArgument(10); }
+void IfcMechanicalSteelMaterialProperties::setProportionalStress(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
+bool IfcMechanicalSteelMaterialProperties::hasPlasticStrain() const { return !entity->getArgument(11)->isNull(); }
+double IfcMechanicalSteelMaterialProperties::PlasticStrain() const { return *entity->getArgument(11); }
+void IfcMechanicalSteelMaterialProperties::setPlasticStrain(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(11,v); }
+bool IfcMechanicalSteelMaterialProperties::hasRelaxations() const { return !entity->getArgument(12)->isNull(); }
+IfcTemplatedEntityList< IfcRelaxation >::ptr IfcMechanicalSteelMaterialProperties::Relaxations() const { IfcEntityList::ptr es = *entity->getArgument(12); return es->as<IfcRelaxation>(); }
+void IfcMechanicalSteelMaterialProperties::setRelaxations(IfcTemplatedEntityList< IfcRelaxation >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(12,v->generalize()); }
 bool IfcMechanicalSteelMaterialProperties::is(Type::Enum v) const { return v == Type::IfcMechanicalSteelMaterialProperties || IfcMechanicalMaterialProperties::is(v); }
 Type::Enum IfcMechanicalSteelMaterialProperties::type() const { return Type::IfcMechanicalSteelMaterialProperties; }
 Type::Enum IfcMechanicalSteelMaterialProperties::Class() { return Type::IfcMechanicalSteelMaterialProperties; }
-IfcMechanicalSteelMaterialProperties::IfcMechanicalSteelMaterialProperties(IfcAbstractEntityPtr e) : IfcMechanicalMaterialProperties((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcMechanicalSteelMaterialProperties)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcMechanicalSteelMaterialProperties::IfcMechanicalSteelMaterialProperties(IfcMaterial* v1_Material, boost::optional< IfcDynamicViscosityMeasure > v2_DynamicViscosity, boost::optional< IfcModulusOfElasticityMeasure > v3_YoungModulus, boost::optional< IfcModulusOfElasticityMeasure > v4_ShearModulus, boost::optional< IfcPositiveRatioMeasure > v5_PoissonRatio, boost::optional< IfcThermalExpansionCoefficientMeasure > v6_ThermalExpansionCoefficient, boost::optional< IfcPressureMeasure > v7_YieldStress, boost::optional< IfcPressureMeasure > v8_UltimateStress, boost::optional< IfcPositiveRatioMeasure > v9_UltimateStrain, boost::optional< IfcModulusOfElasticityMeasure > v10_HardeningModule, boost::optional< IfcPressureMeasure > v11_ProportionalStress, boost::optional< IfcPositiveRatioMeasure > v12_PlasticStrain, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRelaxation > > > v13_Relaxations) : IfcMechanicalMaterialProperties((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Material)); if (v2_DynamicViscosity) { e->setArgument(1,(*v2_DynamicViscosity)); } else { e->setArgument(1); } if (v3_YoungModulus) { e->setArgument(2,(*v3_YoungModulus)); } else { e->setArgument(2); } if (v4_ShearModulus) { e->setArgument(3,(*v4_ShearModulus)); } else { e->setArgument(3); } if (v5_PoissonRatio) { e->setArgument(4,(*v5_PoissonRatio)); } else { e->setArgument(4); } if (v6_ThermalExpansionCoefficient) { e->setArgument(5,(*v6_ThermalExpansionCoefficient)); } else { e->setArgument(5); } if (v7_YieldStress) { e->setArgument(6,(*v7_YieldStress)); } else { e->setArgument(6); } if (v8_UltimateStress) { e->setArgument(7,(*v8_UltimateStress)); } else { e->setArgument(7); } if (v9_UltimateStrain) { e->setArgument(8,(*v9_UltimateStrain)); } else { e->setArgument(8); } if (v10_HardeningModule) { e->setArgument(9,(*v10_HardeningModule)); } else { e->setArgument(9); } if (v11_ProportionalStress) { e->setArgument(10,(*v11_ProportionalStress)); } else { e->setArgument(10); } if (v12_PlasticStrain) { e->setArgument(11,(*v12_PlasticStrain)); } else { e->setArgument(11); } if (v13_Relaxations) { e->setArgument(12,(*v13_Relaxations)->generalize()); } else { e->setArgument(12); } entity = e; EntityBuffer::Add(this); }
+IfcMechanicalSteelMaterialProperties::IfcMechanicalSteelMaterialProperties(IfcAbstractEntity* e) : IfcMechanicalMaterialProperties((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcMechanicalSteelMaterialProperties)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcMechanicalSteelMaterialProperties::IfcMechanicalSteelMaterialProperties(IfcMaterial* v1_Material, boost::optional< double > v2_DynamicViscosity, boost::optional< double > v3_YoungModulus, boost::optional< double > v4_ShearModulus, boost::optional< double > v5_PoissonRatio, boost::optional< double > v6_ThermalExpansionCoefficient, boost::optional< double > v7_YieldStress, boost::optional< double > v8_UltimateStress, boost::optional< double > v9_UltimateStrain, boost::optional< double > v10_HardeningModule, boost::optional< double > v11_ProportionalStress, boost::optional< double > v12_PlasticStrain, boost::optional< IfcTemplatedEntityList< IfcRelaxation >::ptr > v13_Relaxations) : IfcMechanicalMaterialProperties((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Material)); if (v2_DynamicViscosity) { e->setArgument(1,(*v2_DynamicViscosity)); } else { e->setArgument(1); } if (v3_YoungModulus) { e->setArgument(2,(*v3_YoungModulus)); } else { e->setArgument(2); } if (v4_ShearModulus) { e->setArgument(3,(*v4_ShearModulus)); } else { e->setArgument(3); } if (v5_PoissonRatio) { e->setArgument(4,(*v5_PoissonRatio)); } else { e->setArgument(4); } if (v6_ThermalExpansionCoefficient) { e->setArgument(5,(*v6_ThermalExpansionCoefficient)); } else { e->setArgument(5); } if (v7_YieldStress) { e->setArgument(6,(*v7_YieldStress)); } else { e->setArgument(6); } if (v8_UltimateStress) { e->setArgument(7,(*v8_UltimateStress)); } else { e->setArgument(7); } if (v9_UltimateStrain) { e->setArgument(8,(*v9_UltimateStrain)); } else { e->setArgument(8); } if (v10_HardeningModule) { e->setArgument(9,(*v10_HardeningModule)); } else { e->setArgument(9); } if (v11_ProportionalStress) { e->setArgument(10,(*v11_ProportionalStress)); } else { e->setArgument(10); } if (v12_PlasticStrain) { e->setArgument(11,(*v12_PlasticStrain)); } else { e->setArgument(11); } if (v13_Relaxations) { e->setArgument(12,(*v13_Relaxations)->generalize()); } else { e->setArgument(12); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcMember
 bool IfcMember::is(Type::Enum v) const { return v == Type::IfcMember || IfcBuildingElement::is(v); }
 Type::Enum IfcMember::type() const { return Type::IfcMember; }
 Type::Enum IfcMember::Class() { return Type::IfcMember; }
-IfcMember::IfcMember(IfcAbstractEntityPtr e) : IfcBuildingElement((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcMember)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcMember::IfcMember(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag) : IfcBuildingElement((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
+IfcMember::IfcMember(IfcAbstractEntity* e) : IfcBuildingElement((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcMember)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcMember::IfcMember(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag) : IfcBuildingElement((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcMemberType
-IfcMemberTypeEnum::IfcMemberTypeEnum IfcMemberType::PredefinedType() { return IfcMemberTypeEnum::FromString(*entity->getArgument(9)); }
+IfcMemberTypeEnum::IfcMemberTypeEnum IfcMemberType::PredefinedType() const { return IfcMemberTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcMemberType::setPredefinedType(IfcMemberTypeEnum::IfcMemberTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcMemberTypeEnum::ToString(v)); }
 bool IfcMemberType::is(Type::Enum v) const { return v == Type::IfcMemberType || IfcBuildingElementType::is(v); }
 Type::Enum IfcMemberType::type() const { return Type::IfcMemberType; }
 Type::Enum IfcMemberType::Class() { return Type::IfcMemberType; }
-IfcMemberType::IfcMemberType(IfcAbstractEntityPtr e) : IfcBuildingElementType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcMemberType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcMemberType::IfcMemberType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcMemberTypeEnum::IfcMemberTypeEnum v10_PredefinedType) : IfcBuildingElementType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcMemberTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcMemberType::IfcMemberType(IfcAbstractEntity* e) : IfcBuildingElementType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcMemberType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcMemberType::IfcMemberType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcMemberTypeEnum::IfcMemberTypeEnum v10_PredefinedType) : IfcBuildingElementType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcMemberTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcMetric
-IfcBenchmarkEnum::IfcBenchmarkEnum IfcMetric::Benchmark() { return IfcBenchmarkEnum::FromString(*entity->getArgument(7)); }
+IfcBenchmarkEnum::IfcBenchmarkEnum IfcMetric::Benchmark() const { return IfcBenchmarkEnum::FromString(*entity->getArgument(7)); }
 void IfcMetric::setBenchmark(IfcBenchmarkEnum::IfcBenchmarkEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v,IfcBenchmarkEnum::ToString(v)); }
-bool IfcMetric::hasValueSource() { return !entity->getArgument(8)->isNull(); }
-IfcLabel IfcMetric::ValueSource() { return *entity->getArgument(8); }
-void IfcMetric::setValueSource(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
-IfcMetricValueSelect IfcMetric::DataValue() { return *entity->getArgument(9); }
-void IfcMetric::setDataValue(IfcMetricValueSelect v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
+bool IfcMetric::hasValueSource() const { return !entity->getArgument(8)->isNull(); }
+std::string IfcMetric::ValueSource() const { return *entity->getArgument(8); }
+void IfcMetric::setValueSource(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
+IfcMetricValueSelect* IfcMetric::DataValue() const { return (IfcMetricValueSelect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(9))); }
+void IfcMetric::setDataValue(IfcMetricValueSelect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
 bool IfcMetric::is(Type::Enum v) const { return v == Type::IfcMetric || IfcConstraint::is(v); }
 Type::Enum IfcMetric::type() const { return Type::IfcMetric; }
 Type::Enum IfcMetric::Class() { return Type::IfcMetric; }
-IfcMetric::IfcMetric(IfcAbstractEntityPtr e) : IfcConstraint((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcMetric)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcMetric::IfcMetric(IfcLabel v1_Name, boost::optional< IfcText > v2_Description, IfcConstraintEnum::IfcConstraintEnum v3_ConstraintGrade, boost::optional< IfcLabel > v4_ConstraintSource, boost::optional< IfcActorSelect > v5_CreatingActor, boost::optional< IfcDateTimeSelect > v6_CreationTime, boost::optional< IfcLabel > v7_UserDefinedGrade, IfcBenchmarkEnum::IfcBenchmarkEnum v8_Benchmark, boost::optional< IfcLabel > v9_ValueSource, IfcMetricValueSelect v10_DataValue) : IfcConstraint((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,v3_ConstraintGrade,IfcConstraintEnum::ToString(v3_ConstraintGrade)); if (v4_ConstraintSource) { e->setArgument(3,(*v4_ConstraintSource)); } else { e->setArgument(3); } if (v5_CreatingActor) { e->setArgument(4,(*v5_CreatingActor)); } else { e->setArgument(4); } if (v6_CreationTime) { e->setArgument(5,(*v6_CreationTime)); } else { e->setArgument(5); } if (v7_UserDefinedGrade) { e->setArgument(6,(*v7_UserDefinedGrade)); } else { e->setArgument(6); } e->setArgument(7,v8_Benchmark,IfcBenchmarkEnum::ToString(v8_Benchmark)); if (v9_ValueSource) { e->setArgument(8,(*v9_ValueSource)); } else { e->setArgument(8); } e->setArgument(9,(v10_DataValue)); entity = e; EntityBuffer::Add(this); }
+IfcMetric::IfcMetric(IfcAbstractEntity* e) : IfcConstraint((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcMetric)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcMetric::IfcMetric(std::string v1_Name, boost::optional< std::string > v2_Description, IfcConstraintEnum::IfcConstraintEnum v3_ConstraintGrade, boost::optional< std::string > v4_ConstraintSource, IfcActorSelect* v5_CreatingActor, IfcDateTimeSelect* v6_CreationTime, boost::optional< std::string > v7_UserDefinedGrade, IfcBenchmarkEnum::IfcBenchmarkEnum v8_Benchmark, boost::optional< std::string > v9_ValueSource, IfcMetricValueSelect* v10_DataValue) : IfcConstraint((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,v3_ConstraintGrade,IfcConstraintEnum::ToString(v3_ConstraintGrade)); if (v4_ConstraintSource) { e->setArgument(3,(*v4_ConstraintSource)); } else { e->setArgument(3); } e->setArgument(4,(v5_CreatingActor)); e->setArgument(5,(v6_CreationTime)); if (v7_UserDefinedGrade) { e->setArgument(6,(*v7_UserDefinedGrade)); } else { e->setArgument(6); } e->setArgument(7,v8_Benchmark,IfcBenchmarkEnum::ToString(v8_Benchmark)); if (v9_ValueSource) { e->setArgument(8,(*v9_ValueSource)); } else { e->setArgument(8); } e->setArgument(9,(v10_DataValue)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcMonetaryUnit
-IfcCurrencyEnum::IfcCurrencyEnum IfcMonetaryUnit::Currency() { return IfcCurrencyEnum::FromString(*entity->getArgument(0)); }
+IfcCurrencyEnum::IfcCurrencyEnum IfcMonetaryUnit::Currency() const { return IfcCurrencyEnum::FromString(*entity->getArgument(0)); }
 void IfcMonetaryUnit::setCurrency(IfcCurrencyEnum::IfcCurrencyEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v,IfcCurrencyEnum::ToString(v)); }
 bool IfcMonetaryUnit::is(Type::Enum v) const { return v == Type::IfcMonetaryUnit; }
 Type::Enum IfcMonetaryUnit::type() const { return Type::IfcMonetaryUnit; }
 Type::Enum IfcMonetaryUnit::Class() { return Type::IfcMonetaryUnit; }
-IfcMonetaryUnit::IfcMonetaryUnit(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcMonetaryUnit)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcMonetaryUnit::IfcMonetaryUnit(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcMonetaryUnit)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
 IfcMonetaryUnit::IfcMonetaryUnit(IfcCurrencyEnum::IfcCurrencyEnum v1_Currency) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,v1_Currency,IfcCurrencyEnum::ToString(v1_Currency)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcMotorConnectionType
-IfcMotorConnectionTypeEnum::IfcMotorConnectionTypeEnum IfcMotorConnectionType::PredefinedType() { return IfcMotorConnectionTypeEnum::FromString(*entity->getArgument(9)); }
+IfcMotorConnectionTypeEnum::IfcMotorConnectionTypeEnum IfcMotorConnectionType::PredefinedType() const { return IfcMotorConnectionTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcMotorConnectionType::setPredefinedType(IfcMotorConnectionTypeEnum::IfcMotorConnectionTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcMotorConnectionTypeEnum::ToString(v)); }
 bool IfcMotorConnectionType::is(Type::Enum v) const { return v == Type::IfcMotorConnectionType || IfcEnergyConversionDeviceType::is(v); }
 Type::Enum IfcMotorConnectionType::type() const { return Type::IfcMotorConnectionType; }
 Type::Enum IfcMotorConnectionType::Class() { return Type::IfcMotorConnectionType; }
-IfcMotorConnectionType::IfcMotorConnectionType(IfcAbstractEntityPtr e) : IfcEnergyConversionDeviceType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcMotorConnectionType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcMotorConnectionType::IfcMotorConnectionType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcMotorConnectionTypeEnum::IfcMotorConnectionTypeEnum v10_PredefinedType) : IfcEnergyConversionDeviceType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcMotorConnectionTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcMotorConnectionType::IfcMotorConnectionType(IfcAbstractEntity* e) : IfcEnergyConversionDeviceType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcMotorConnectionType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcMotorConnectionType::IfcMotorConnectionType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcMotorConnectionTypeEnum::IfcMotorConnectionTypeEnum v10_PredefinedType) : IfcEnergyConversionDeviceType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcMotorConnectionTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcMove
-IfcSpatialStructureElement* IfcMove::MoveFrom() { return (IfcSpatialStructureElement*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(10))); }
+IfcSpatialStructureElement* IfcMove::MoveFrom() const { return (IfcSpatialStructureElement*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(10))); }
 void IfcMove::setMoveFrom(IfcSpatialStructureElement* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
-IfcSpatialStructureElement* IfcMove::MoveTo() { return (IfcSpatialStructureElement*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(11))); }
+IfcSpatialStructureElement* IfcMove::MoveTo() const { return (IfcSpatialStructureElement*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(11))); }
 void IfcMove::setMoveTo(IfcSpatialStructureElement* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(11,v); }
-bool IfcMove::hasPunchList() { return !entity->getArgument(12)->isNull(); }
-std::vector< IfcText > /*[1:?]*/ IfcMove::PunchList() { return *entity->getArgument(12); }
-void IfcMove::setPunchList(std::vector< IfcText > /*[1:?]*/ v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(12,v); }
+bool IfcMove::hasPunchList() const { return !entity->getArgument(12)->isNull(); }
+std::vector< std::string > /*[1:?]*/ IfcMove::PunchList() const { return *entity->getArgument(12); }
+void IfcMove::setPunchList(std::vector< std::string > /*[1:?]*/ v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(12,v); }
 bool IfcMove::is(Type::Enum v) const { return v == Type::IfcMove || IfcTask::is(v); }
 Type::Enum IfcMove::type() const { return Type::IfcMove; }
 Type::Enum IfcMove::Class() { return Type::IfcMove; }
-IfcMove::IfcMove(IfcAbstractEntityPtr e) : IfcTask((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcMove)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcMove::IfcMove(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcIdentifier v6_TaskId, boost::optional< IfcLabel > v7_Status, boost::optional< IfcLabel > v8_WorkMethod, bool v9_IsMilestone, boost::optional< int > v10_Priority, IfcSpatialStructureElement* v11_MoveFrom, IfcSpatialStructureElement* v12_MoveTo, boost::optional< std::vector< IfcText > /*[1:?]*/ > v13_PunchList) : IfcTask((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_TaskId)); if (v7_Status) { e->setArgument(6,(*v7_Status)); } else { e->setArgument(6); } if (v8_WorkMethod) { e->setArgument(7,(*v8_WorkMethod)); } else { e->setArgument(7); } e->setArgument(8,(v9_IsMilestone)); if (v10_Priority) { e->setArgument(9,(*v10_Priority)); } else { e->setArgument(9); } e->setArgument(10,(v11_MoveFrom)); e->setArgument(11,(v12_MoveTo)); if (v13_PunchList) { e->setArgument(12,(*v13_PunchList)); } else { e->setArgument(12); } entity = e; EntityBuffer::Add(this); }
+IfcMove::IfcMove(IfcAbstractEntity* e) : IfcTask((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcMove)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcMove::IfcMove(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, std::string v6_TaskId, boost::optional< std::string > v7_Status, boost::optional< std::string > v8_WorkMethod, bool v9_IsMilestone, boost::optional< int > v10_Priority, IfcSpatialStructureElement* v11_MoveFrom, IfcSpatialStructureElement* v12_MoveTo, boost::optional< std::vector< std::string > /*[1:?]*/ > v13_PunchList) : IfcTask((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_TaskId)); if (v7_Status) { e->setArgument(6,(*v7_Status)); } else { e->setArgument(6); } if (v8_WorkMethod) { e->setArgument(7,(*v8_WorkMethod)); } else { e->setArgument(7); } e->setArgument(8,(v9_IsMilestone)); if (v10_Priority) { e->setArgument(9,(*v10_Priority)); } else { e->setArgument(9); } e->setArgument(10,(v11_MoveFrom)); e->setArgument(11,(v12_MoveTo)); if (v13_PunchList) { e->setArgument(12,(*v13_PunchList)); } else { e->setArgument(12); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcNamedUnit
-IfcDimensionalExponents* IfcNamedUnit::Dimensions() { return (IfcDimensionalExponents*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(0))); }
+IfcDimensionalExponents* IfcNamedUnit::Dimensions() const { return (IfcDimensionalExponents*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(0))); }
 void IfcNamedUnit::setDimensions(IfcDimensionalExponents* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-IfcUnitEnum::IfcUnitEnum IfcNamedUnit::UnitType() { return IfcUnitEnum::FromString(*entity->getArgument(1)); }
+IfcUnitEnum::IfcUnitEnum IfcNamedUnit::UnitType() const { return IfcUnitEnum::FromString(*entity->getArgument(1)); }
 void IfcNamedUnit::setUnitType(IfcUnitEnum::IfcUnitEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v,IfcUnitEnum::ToString(v)); }
 bool IfcNamedUnit::is(Type::Enum v) const { return v == Type::IfcNamedUnit; }
 Type::Enum IfcNamedUnit::type() const { return Type::IfcNamedUnit; }
 Type::Enum IfcNamedUnit::Class() { return Type::IfcNamedUnit; }
-IfcNamedUnit::IfcNamedUnit(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcNamedUnit)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcNamedUnit::IfcNamedUnit(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcNamedUnit)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
 IfcNamedUnit::IfcNamedUnit(IfcDimensionalExponents* v1_Dimensions, IfcUnitEnum::IfcUnitEnum v2_UnitType) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Dimensions)); e->setArgument(1,v2_UnitType,IfcUnitEnum::ToString(v2_UnitType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcObject
-bool IfcObject::hasObjectType() { return !entity->getArgument(4)->isNull(); }
-IfcLabel IfcObject::ObjectType() { return *entity->getArgument(4); }
-void IfcObject::setObjectType(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-IfcRelDefines::list IfcObject::IsDefinedBy() { RETURN_INVERSE(IfcRelDefines) }
+bool IfcObject::hasObjectType() const { return !entity->getArgument(4)->isNull(); }
+std::string IfcObject::ObjectType() const { return *entity->getArgument(4); }
+void IfcObject::setObjectType(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+IfcRelDefines::list::ptr IfcObject::IsDefinedBy() const { return entity->getInverse(Type::IfcRelDefines, 4)->as<IfcRelDefines>(); }
 bool IfcObject::is(Type::Enum v) const { return v == Type::IfcObject || IfcObjectDefinition::is(v); }
 Type::Enum IfcObject::type() const { return Type::IfcObject; }
 Type::Enum IfcObject::Class() { return Type::IfcObject; }
-IfcObject::IfcObject(IfcAbstractEntityPtr e) : IfcObjectDefinition((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcObject)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcObject::IfcObject(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType) : IfcObjectDefinition((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } entity = e; EntityBuffer::Add(this); }
+IfcObject::IfcObject(IfcAbstractEntity* e) : IfcObjectDefinition((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcObject)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcObject::IfcObject(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType) : IfcObjectDefinition((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcObjectDefinition
-IfcRelAssigns::list IfcObjectDefinition::HasAssignments() { RETURN_INVERSE(IfcRelAssigns) }
-IfcRelDecomposes::list IfcObjectDefinition::IsDecomposedBy() { RETURN_INVERSE(IfcRelDecomposes) }
-IfcRelDecomposes::list IfcObjectDefinition::Decomposes() { RETURN_INVERSE(IfcRelDecomposes) }
-IfcRelAssociates::list IfcObjectDefinition::HasAssociations() { RETURN_INVERSE(IfcRelAssociates) }
+IfcRelAssigns::list::ptr IfcObjectDefinition::HasAssignments() const { return entity->getInverse(Type::IfcRelAssigns, 4)->as<IfcRelAssigns>(); }
+IfcRelDecomposes::list::ptr IfcObjectDefinition::IsDecomposedBy() const { return entity->getInverse(Type::IfcRelDecomposes, 4)->as<IfcRelDecomposes>(); }
+IfcRelDecomposes::list::ptr IfcObjectDefinition::Decomposes() const { return entity->getInverse(Type::IfcRelDecomposes, 5)->as<IfcRelDecomposes>(); }
+IfcRelAssociates::list::ptr IfcObjectDefinition::HasAssociations() const { return entity->getInverse(Type::IfcRelAssociates, 4)->as<IfcRelAssociates>(); }
 bool IfcObjectDefinition::is(Type::Enum v) const { return v == Type::IfcObjectDefinition || IfcRoot::is(v); }
 Type::Enum IfcObjectDefinition::type() const { return Type::IfcObjectDefinition; }
 Type::Enum IfcObjectDefinition::Class() { return Type::IfcObjectDefinition; }
-IfcObjectDefinition::IfcObjectDefinition(IfcAbstractEntityPtr e) : IfcRoot((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcObjectDefinition)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcObjectDefinition::IfcObjectDefinition(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description) : IfcRoot((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } entity = e; EntityBuffer::Add(this); }
+IfcObjectDefinition::IfcObjectDefinition(IfcAbstractEntity* e) : IfcRoot((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcObjectDefinition)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcObjectDefinition::IfcObjectDefinition(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description) : IfcRoot((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcObjectPlacement
-IfcProduct::list IfcObjectPlacement::PlacesObject() { RETURN_INVERSE(IfcProduct) }
-IfcLocalPlacement::list IfcObjectPlacement::ReferencedByPlacements() { RETURN_INVERSE(IfcLocalPlacement) }
+IfcProduct::list::ptr IfcObjectPlacement::PlacesObject() const { return entity->getInverse(Type::IfcProduct, 5)->as<IfcProduct>(); }
+IfcLocalPlacement::list::ptr IfcObjectPlacement::ReferencedByPlacements() const { return entity->getInverse(Type::IfcLocalPlacement, 0)->as<IfcLocalPlacement>(); }
 bool IfcObjectPlacement::is(Type::Enum v) const { return v == Type::IfcObjectPlacement; }
 Type::Enum IfcObjectPlacement::type() const { return Type::IfcObjectPlacement; }
 Type::Enum IfcObjectPlacement::Class() { return Type::IfcObjectPlacement; }
-IfcObjectPlacement::IfcObjectPlacement(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcObjectPlacement)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcObjectPlacement::IfcObjectPlacement(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcObjectPlacement)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
 IfcObjectPlacement::IfcObjectPlacement() : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcObjective
-bool IfcObjective::hasBenchmarkValues() { return !entity->getArgument(7)->isNull(); }
-IfcMetric* IfcObjective::BenchmarkValues() { return (IfcMetric*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(7))); }
+bool IfcObjective::hasBenchmarkValues() const { return !entity->getArgument(7)->isNull(); }
+IfcMetric* IfcObjective::BenchmarkValues() const { return (IfcMetric*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(7))); }
 void IfcObjective::setBenchmarkValues(IfcMetric* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
-bool IfcObjective::hasResultValues() { return !entity->getArgument(8)->isNull(); }
-IfcMetric* IfcObjective::ResultValues() { return (IfcMetric*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(8))); }
+bool IfcObjective::hasResultValues() const { return !entity->getArgument(8)->isNull(); }
+IfcMetric* IfcObjective::ResultValues() const { return (IfcMetric*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(8))); }
 void IfcObjective::setResultValues(IfcMetric* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
-IfcObjectiveEnum::IfcObjectiveEnum IfcObjective::ObjectiveQualifier() { return IfcObjectiveEnum::FromString(*entity->getArgument(9)); }
+IfcObjectiveEnum::IfcObjectiveEnum IfcObjective::ObjectiveQualifier() const { return IfcObjectiveEnum::FromString(*entity->getArgument(9)); }
 void IfcObjective::setObjectiveQualifier(IfcObjectiveEnum::IfcObjectiveEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcObjectiveEnum::ToString(v)); }
-bool IfcObjective::hasUserDefinedQualifier() { return !entity->getArgument(10)->isNull(); }
-IfcLabel IfcObjective::UserDefinedQualifier() { return *entity->getArgument(10); }
-void IfcObjective::setUserDefinedQualifier(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
+bool IfcObjective::hasUserDefinedQualifier() const { return !entity->getArgument(10)->isNull(); }
+std::string IfcObjective::UserDefinedQualifier() const { return *entity->getArgument(10); }
+void IfcObjective::setUserDefinedQualifier(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
 bool IfcObjective::is(Type::Enum v) const { return v == Type::IfcObjective || IfcConstraint::is(v); }
 Type::Enum IfcObjective::type() const { return Type::IfcObjective; }
 Type::Enum IfcObjective::Class() { return Type::IfcObjective; }
-IfcObjective::IfcObjective(IfcAbstractEntityPtr e) : IfcConstraint((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcObjective)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcObjective::IfcObjective(IfcLabel v1_Name, boost::optional< IfcText > v2_Description, IfcConstraintEnum::IfcConstraintEnum v3_ConstraintGrade, boost::optional< IfcLabel > v4_ConstraintSource, boost::optional< IfcActorSelect > v5_CreatingActor, boost::optional< IfcDateTimeSelect > v6_CreationTime, boost::optional< IfcLabel > v7_UserDefinedGrade, IfcMetric* v8_BenchmarkValues, IfcMetric* v9_ResultValues, IfcObjectiveEnum::IfcObjectiveEnum v10_ObjectiveQualifier, boost::optional< IfcLabel > v11_UserDefinedQualifier) : IfcConstraint((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,v3_ConstraintGrade,IfcConstraintEnum::ToString(v3_ConstraintGrade)); if (v4_ConstraintSource) { e->setArgument(3,(*v4_ConstraintSource)); } else { e->setArgument(3); } if (v5_CreatingActor) { e->setArgument(4,(*v5_CreatingActor)); } else { e->setArgument(4); } if (v6_CreationTime) { e->setArgument(5,(*v6_CreationTime)); } else { e->setArgument(5); } if (v7_UserDefinedGrade) { e->setArgument(6,(*v7_UserDefinedGrade)); } else { e->setArgument(6); } e->setArgument(7,(v8_BenchmarkValues)); e->setArgument(8,(v9_ResultValues)); e->setArgument(9,v10_ObjectiveQualifier,IfcObjectiveEnum::ToString(v10_ObjectiveQualifier)); if (v11_UserDefinedQualifier) { e->setArgument(10,(*v11_UserDefinedQualifier)); } else { e->setArgument(10); } entity = e; EntityBuffer::Add(this); }
+IfcObjective::IfcObjective(IfcAbstractEntity* e) : IfcConstraint((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcObjective)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcObjective::IfcObjective(std::string v1_Name, boost::optional< std::string > v2_Description, IfcConstraintEnum::IfcConstraintEnum v3_ConstraintGrade, boost::optional< std::string > v4_ConstraintSource, IfcActorSelect* v5_CreatingActor, IfcDateTimeSelect* v6_CreationTime, boost::optional< std::string > v7_UserDefinedGrade, IfcMetric* v8_BenchmarkValues, IfcMetric* v9_ResultValues, IfcObjectiveEnum::IfcObjectiveEnum v10_ObjectiveQualifier, boost::optional< std::string > v11_UserDefinedQualifier) : IfcConstraint((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,v3_ConstraintGrade,IfcConstraintEnum::ToString(v3_ConstraintGrade)); if (v4_ConstraintSource) { e->setArgument(3,(*v4_ConstraintSource)); } else { e->setArgument(3); } e->setArgument(4,(v5_CreatingActor)); e->setArgument(5,(v6_CreationTime)); if (v7_UserDefinedGrade) { e->setArgument(6,(*v7_UserDefinedGrade)); } else { e->setArgument(6); } e->setArgument(7,(v8_BenchmarkValues)); e->setArgument(8,(v9_ResultValues)); e->setArgument(9,v10_ObjectiveQualifier,IfcObjectiveEnum::ToString(v10_ObjectiveQualifier)); if (v11_UserDefinedQualifier) { e->setArgument(10,(*v11_UserDefinedQualifier)); } else { e->setArgument(10); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcOccupant
-IfcOccupantTypeEnum::IfcOccupantTypeEnum IfcOccupant::PredefinedType() { return IfcOccupantTypeEnum::FromString(*entity->getArgument(6)); }
+IfcOccupantTypeEnum::IfcOccupantTypeEnum IfcOccupant::PredefinedType() const { return IfcOccupantTypeEnum::FromString(*entity->getArgument(6)); }
 void IfcOccupant::setPredefinedType(IfcOccupantTypeEnum::IfcOccupantTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v,IfcOccupantTypeEnum::ToString(v)); }
 bool IfcOccupant::is(Type::Enum v) const { return v == Type::IfcOccupant || IfcActor::is(v); }
 Type::Enum IfcOccupant::type() const { return Type::IfcOccupant; }
 Type::Enum IfcOccupant::Class() { return Type::IfcOccupant; }
-IfcOccupant::IfcOccupant(IfcAbstractEntityPtr e) : IfcActor((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcOccupant)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcOccupant::IfcOccupant(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcActorSelect v6_TheActor, IfcOccupantTypeEnum::IfcOccupantTypeEnum v7_PredefinedType) : IfcActor((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_TheActor)); e->setArgument(6,v7_PredefinedType,IfcOccupantTypeEnum::ToString(v7_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcOccupant::IfcOccupant(IfcAbstractEntity* e) : IfcActor((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcOccupant)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcOccupant::IfcOccupant(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcActorSelect* v6_TheActor, IfcOccupantTypeEnum::IfcOccupantTypeEnum v7_PredefinedType) : IfcActor((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_TheActor)); e->setArgument(6,v7_PredefinedType,IfcOccupantTypeEnum::ToString(v7_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcOffsetCurve2D
-IfcCurve* IfcOffsetCurve2D::BasisCurve() { return (IfcCurve*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(0))); }
+IfcCurve* IfcOffsetCurve2D::BasisCurve() const { return (IfcCurve*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(0))); }
 void IfcOffsetCurve2D::setBasisCurve(IfcCurve* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-IfcLengthMeasure IfcOffsetCurve2D::Distance() { return *entity->getArgument(1); }
-void IfcOffsetCurve2D::setDistance(IfcLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-bool IfcOffsetCurve2D::SelfIntersect() { return *entity->getArgument(2); }
+double IfcOffsetCurve2D::Distance() const { return *entity->getArgument(1); }
+void IfcOffsetCurve2D::setDistance(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+bool IfcOffsetCurve2D::SelfIntersect() const { return *entity->getArgument(2); }
 void IfcOffsetCurve2D::setSelfIntersect(bool v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
 bool IfcOffsetCurve2D::is(Type::Enum v) const { return v == Type::IfcOffsetCurve2D || IfcCurve::is(v); }
 Type::Enum IfcOffsetCurve2D::type() const { return Type::IfcOffsetCurve2D; }
 Type::Enum IfcOffsetCurve2D::Class() { return Type::IfcOffsetCurve2D; }
-IfcOffsetCurve2D::IfcOffsetCurve2D(IfcAbstractEntityPtr e) : IfcCurve((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcOffsetCurve2D)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcOffsetCurve2D::IfcOffsetCurve2D(IfcCurve* v1_BasisCurve, IfcLengthMeasure v2_Distance, bool v3_SelfIntersect) : IfcCurve((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_BasisCurve)); e->setArgument(1,(v2_Distance)); e->setArgument(2,(v3_SelfIntersect)); entity = e; EntityBuffer::Add(this); }
+IfcOffsetCurve2D::IfcOffsetCurve2D(IfcAbstractEntity* e) : IfcCurve((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcOffsetCurve2D)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcOffsetCurve2D::IfcOffsetCurve2D(IfcCurve* v1_BasisCurve, double v2_Distance, bool v3_SelfIntersect) : IfcCurve((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_BasisCurve)); e->setArgument(1,(v2_Distance)); e->setArgument(2,(v3_SelfIntersect)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcOffsetCurve3D
-IfcCurve* IfcOffsetCurve3D::BasisCurve() { return (IfcCurve*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(0))); }
+IfcCurve* IfcOffsetCurve3D::BasisCurve() const { return (IfcCurve*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(0))); }
 void IfcOffsetCurve3D::setBasisCurve(IfcCurve* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-IfcLengthMeasure IfcOffsetCurve3D::Distance() { return *entity->getArgument(1); }
-void IfcOffsetCurve3D::setDistance(IfcLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-bool IfcOffsetCurve3D::SelfIntersect() { return *entity->getArgument(2); }
+double IfcOffsetCurve3D::Distance() const { return *entity->getArgument(1); }
+void IfcOffsetCurve3D::setDistance(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+bool IfcOffsetCurve3D::SelfIntersect() const { return *entity->getArgument(2); }
 void IfcOffsetCurve3D::setSelfIntersect(bool v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-IfcDirection* IfcOffsetCurve3D::RefDirection() { return (IfcDirection*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(3))); }
+IfcDirection* IfcOffsetCurve3D::RefDirection() const { return (IfcDirection*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(3))); }
 void IfcOffsetCurve3D::setRefDirection(IfcDirection* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
 bool IfcOffsetCurve3D::is(Type::Enum v) const { return v == Type::IfcOffsetCurve3D || IfcCurve::is(v); }
 Type::Enum IfcOffsetCurve3D::type() const { return Type::IfcOffsetCurve3D; }
 Type::Enum IfcOffsetCurve3D::Class() { return Type::IfcOffsetCurve3D; }
-IfcOffsetCurve3D::IfcOffsetCurve3D(IfcAbstractEntityPtr e) : IfcCurve((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcOffsetCurve3D)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcOffsetCurve3D::IfcOffsetCurve3D(IfcCurve* v1_BasisCurve, IfcLengthMeasure v2_Distance, bool v3_SelfIntersect, IfcDirection* v4_RefDirection) : IfcCurve((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_BasisCurve)); e->setArgument(1,(v2_Distance)); e->setArgument(2,(v3_SelfIntersect)); e->setArgument(3,(v4_RefDirection)); entity = e; EntityBuffer::Add(this); }
+IfcOffsetCurve3D::IfcOffsetCurve3D(IfcAbstractEntity* e) : IfcCurve((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcOffsetCurve3D)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcOffsetCurve3D::IfcOffsetCurve3D(IfcCurve* v1_BasisCurve, double v2_Distance, bool v3_SelfIntersect, IfcDirection* v4_RefDirection) : IfcCurve((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_BasisCurve)); e->setArgument(1,(v2_Distance)); e->setArgument(2,(v3_SelfIntersect)); e->setArgument(3,(v4_RefDirection)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcOneDirectionRepeatFactor
-IfcVector* IfcOneDirectionRepeatFactor::RepeatFactor() { return (IfcVector*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(0))); }
+IfcVector* IfcOneDirectionRepeatFactor::RepeatFactor() const { return (IfcVector*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(0))); }
 void IfcOneDirectionRepeatFactor::setRepeatFactor(IfcVector* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
 bool IfcOneDirectionRepeatFactor::is(Type::Enum v) const { return v == Type::IfcOneDirectionRepeatFactor || IfcGeometricRepresentationItem::is(v); }
 Type::Enum IfcOneDirectionRepeatFactor::type() const { return Type::IfcOneDirectionRepeatFactor; }
 Type::Enum IfcOneDirectionRepeatFactor::Class() { return Type::IfcOneDirectionRepeatFactor; }
-IfcOneDirectionRepeatFactor::IfcOneDirectionRepeatFactor(IfcAbstractEntityPtr e) : IfcGeometricRepresentationItem((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcOneDirectionRepeatFactor)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcOneDirectionRepeatFactor::IfcOneDirectionRepeatFactor(IfcVector* v1_RepeatFactor) : IfcGeometricRepresentationItem((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_RepeatFactor)); entity = e; EntityBuffer::Add(this); }
+IfcOneDirectionRepeatFactor::IfcOneDirectionRepeatFactor(IfcAbstractEntity* e) : IfcGeometricRepresentationItem((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcOneDirectionRepeatFactor)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcOneDirectionRepeatFactor::IfcOneDirectionRepeatFactor(IfcVector* v1_RepeatFactor) : IfcGeometricRepresentationItem((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_RepeatFactor)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcOpenShell
 bool IfcOpenShell::is(Type::Enum v) const { return v == Type::IfcOpenShell || IfcConnectedFaceSet::is(v); }
 Type::Enum IfcOpenShell::type() const { return Type::IfcOpenShell; }
 Type::Enum IfcOpenShell::Class() { return Type::IfcOpenShell; }
-IfcOpenShell::IfcOpenShell(IfcAbstractEntityPtr e) : IfcConnectedFaceSet((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcOpenShell)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcOpenShell::IfcOpenShell(SHARED_PTR< IfcTemplatedEntityList< IfcFace > > v1_CfsFaces) : IfcConnectedFaceSet((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_CfsFaces)->generalize()); entity = e; EntityBuffer::Add(this); }
+IfcOpenShell::IfcOpenShell(IfcAbstractEntity* e) : IfcConnectedFaceSet((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcOpenShell)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcOpenShell::IfcOpenShell(IfcTemplatedEntityList< IfcFace >::ptr v1_CfsFaces) : IfcConnectedFaceSet((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_CfsFaces)->generalize()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcOpeningElement
-IfcRelFillsElement::list IfcOpeningElement::HasFillings() { RETURN_INVERSE(IfcRelFillsElement) }
+IfcRelFillsElement::list::ptr IfcOpeningElement::HasFillings() const { return entity->getInverse(Type::IfcRelFillsElement, 4)->as<IfcRelFillsElement>(); }
 bool IfcOpeningElement::is(Type::Enum v) const { return v == Type::IfcOpeningElement || IfcFeatureElementSubtraction::is(v); }
 Type::Enum IfcOpeningElement::type() const { return Type::IfcOpeningElement; }
 Type::Enum IfcOpeningElement::Class() { return Type::IfcOpeningElement; }
-IfcOpeningElement::IfcOpeningElement(IfcAbstractEntityPtr e) : IfcFeatureElementSubtraction((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcOpeningElement)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcOpeningElement::IfcOpeningElement(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag) : IfcFeatureElementSubtraction((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
+IfcOpeningElement::IfcOpeningElement(IfcAbstractEntity* e) : IfcFeatureElementSubtraction((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcOpeningElement)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcOpeningElement::IfcOpeningElement(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag) : IfcFeatureElementSubtraction((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcOpticalMaterialProperties
-bool IfcOpticalMaterialProperties::hasVisibleTransmittance() { return !entity->getArgument(1)->isNull(); }
-IfcPositiveRatioMeasure IfcOpticalMaterialProperties::VisibleTransmittance() { return *entity->getArgument(1); }
-void IfcOpticalMaterialProperties::setVisibleTransmittance(IfcPositiveRatioMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-bool IfcOpticalMaterialProperties::hasSolarTransmittance() { return !entity->getArgument(2)->isNull(); }
-IfcPositiveRatioMeasure IfcOpticalMaterialProperties::SolarTransmittance() { return *entity->getArgument(2); }
-void IfcOpticalMaterialProperties::setSolarTransmittance(IfcPositiveRatioMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-bool IfcOpticalMaterialProperties::hasThermalIrTransmittance() { return !entity->getArgument(3)->isNull(); }
-IfcPositiveRatioMeasure IfcOpticalMaterialProperties::ThermalIrTransmittance() { return *entity->getArgument(3); }
-void IfcOpticalMaterialProperties::setThermalIrTransmittance(IfcPositiveRatioMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-bool IfcOpticalMaterialProperties::hasThermalIrEmissivityBack() { return !entity->getArgument(4)->isNull(); }
-IfcPositiveRatioMeasure IfcOpticalMaterialProperties::ThermalIrEmissivityBack() { return *entity->getArgument(4); }
-void IfcOpticalMaterialProperties::setThermalIrEmissivityBack(IfcPositiveRatioMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-bool IfcOpticalMaterialProperties::hasThermalIrEmissivityFront() { return !entity->getArgument(5)->isNull(); }
-IfcPositiveRatioMeasure IfcOpticalMaterialProperties::ThermalIrEmissivityFront() { return *entity->getArgument(5); }
-void IfcOpticalMaterialProperties::setThermalIrEmissivityFront(IfcPositiveRatioMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-bool IfcOpticalMaterialProperties::hasVisibleReflectanceBack() { return !entity->getArgument(6)->isNull(); }
-IfcPositiveRatioMeasure IfcOpticalMaterialProperties::VisibleReflectanceBack() { return *entity->getArgument(6); }
-void IfcOpticalMaterialProperties::setVisibleReflectanceBack(IfcPositiveRatioMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
-bool IfcOpticalMaterialProperties::hasVisibleReflectanceFront() { return !entity->getArgument(7)->isNull(); }
-IfcPositiveRatioMeasure IfcOpticalMaterialProperties::VisibleReflectanceFront() { return *entity->getArgument(7); }
-void IfcOpticalMaterialProperties::setVisibleReflectanceFront(IfcPositiveRatioMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
-bool IfcOpticalMaterialProperties::hasSolarReflectanceFront() { return !entity->getArgument(8)->isNull(); }
-IfcPositiveRatioMeasure IfcOpticalMaterialProperties::SolarReflectanceFront() { return *entity->getArgument(8); }
-void IfcOpticalMaterialProperties::setSolarReflectanceFront(IfcPositiveRatioMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
-bool IfcOpticalMaterialProperties::hasSolarReflectanceBack() { return !entity->getArgument(9)->isNull(); }
-IfcPositiveRatioMeasure IfcOpticalMaterialProperties::SolarReflectanceBack() { return *entity->getArgument(9); }
-void IfcOpticalMaterialProperties::setSolarReflectanceBack(IfcPositiveRatioMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
+bool IfcOpticalMaterialProperties::hasVisibleTransmittance() const { return !entity->getArgument(1)->isNull(); }
+double IfcOpticalMaterialProperties::VisibleTransmittance() const { return *entity->getArgument(1); }
+void IfcOpticalMaterialProperties::setVisibleTransmittance(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+bool IfcOpticalMaterialProperties::hasSolarTransmittance() const { return !entity->getArgument(2)->isNull(); }
+double IfcOpticalMaterialProperties::SolarTransmittance() const { return *entity->getArgument(2); }
+void IfcOpticalMaterialProperties::setSolarTransmittance(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+bool IfcOpticalMaterialProperties::hasThermalIrTransmittance() const { return !entity->getArgument(3)->isNull(); }
+double IfcOpticalMaterialProperties::ThermalIrTransmittance() const { return *entity->getArgument(3); }
+void IfcOpticalMaterialProperties::setThermalIrTransmittance(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+bool IfcOpticalMaterialProperties::hasThermalIrEmissivityBack() const { return !entity->getArgument(4)->isNull(); }
+double IfcOpticalMaterialProperties::ThermalIrEmissivityBack() const { return *entity->getArgument(4); }
+void IfcOpticalMaterialProperties::setThermalIrEmissivityBack(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+bool IfcOpticalMaterialProperties::hasThermalIrEmissivityFront() const { return !entity->getArgument(5)->isNull(); }
+double IfcOpticalMaterialProperties::ThermalIrEmissivityFront() const { return *entity->getArgument(5); }
+void IfcOpticalMaterialProperties::setThermalIrEmissivityFront(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+bool IfcOpticalMaterialProperties::hasVisibleReflectanceBack() const { return !entity->getArgument(6)->isNull(); }
+double IfcOpticalMaterialProperties::VisibleReflectanceBack() const { return *entity->getArgument(6); }
+void IfcOpticalMaterialProperties::setVisibleReflectanceBack(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
+bool IfcOpticalMaterialProperties::hasVisibleReflectanceFront() const { return !entity->getArgument(7)->isNull(); }
+double IfcOpticalMaterialProperties::VisibleReflectanceFront() const { return *entity->getArgument(7); }
+void IfcOpticalMaterialProperties::setVisibleReflectanceFront(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
+bool IfcOpticalMaterialProperties::hasSolarReflectanceFront() const { return !entity->getArgument(8)->isNull(); }
+double IfcOpticalMaterialProperties::SolarReflectanceFront() const { return *entity->getArgument(8); }
+void IfcOpticalMaterialProperties::setSolarReflectanceFront(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
+bool IfcOpticalMaterialProperties::hasSolarReflectanceBack() const { return !entity->getArgument(9)->isNull(); }
+double IfcOpticalMaterialProperties::SolarReflectanceBack() const { return *entity->getArgument(9); }
+void IfcOpticalMaterialProperties::setSolarReflectanceBack(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
 bool IfcOpticalMaterialProperties::is(Type::Enum v) const { return v == Type::IfcOpticalMaterialProperties || IfcMaterialProperties::is(v); }
 Type::Enum IfcOpticalMaterialProperties::type() const { return Type::IfcOpticalMaterialProperties; }
 Type::Enum IfcOpticalMaterialProperties::Class() { return Type::IfcOpticalMaterialProperties; }
-IfcOpticalMaterialProperties::IfcOpticalMaterialProperties(IfcAbstractEntityPtr e) : IfcMaterialProperties((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcOpticalMaterialProperties)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcOpticalMaterialProperties::IfcOpticalMaterialProperties(IfcMaterial* v1_Material, boost::optional< IfcPositiveRatioMeasure > v2_VisibleTransmittance, boost::optional< IfcPositiveRatioMeasure > v3_SolarTransmittance, boost::optional< IfcPositiveRatioMeasure > v4_ThermalIrTransmittance, boost::optional< IfcPositiveRatioMeasure > v5_ThermalIrEmissivityBack, boost::optional< IfcPositiveRatioMeasure > v6_ThermalIrEmissivityFront, boost::optional< IfcPositiveRatioMeasure > v7_VisibleReflectanceBack, boost::optional< IfcPositiveRatioMeasure > v8_VisibleReflectanceFront, boost::optional< IfcPositiveRatioMeasure > v9_SolarReflectanceFront, boost::optional< IfcPositiveRatioMeasure > v10_SolarReflectanceBack) : IfcMaterialProperties((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Material)); if (v2_VisibleTransmittance) { e->setArgument(1,(*v2_VisibleTransmittance)); } else { e->setArgument(1); } if (v3_SolarTransmittance) { e->setArgument(2,(*v3_SolarTransmittance)); } else { e->setArgument(2); } if (v4_ThermalIrTransmittance) { e->setArgument(3,(*v4_ThermalIrTransmittance)); } else { e->setArgument(3); } if (v5_ThermalIrEmissivityBack) { e->setArgument(4,(*v5_ThermalIrEmissivityBack)); } else { e->setArgument(4); } if (v6_ThermalIrEmissivityFront) { e->setArgument(5,(*v6_ThermalIrEmissivityFront)); } else { e->setArgument(5); } if (v7_VisibleReflectanceBack) { e->setArgument(6,(*v7_VisibleReflectanceBack)); } else { e->setArgument(6); } if (v8_VisibleReflectanceFront) { e->setArgument(7,(*v8_VisibleReflectanceFront)); } else { e->setArgument(7); } if (v9_SolarReflectanceFront) { e->setArgument(8,(*v9_SolarReflectanceFront)); } else { e->setArgument(8); } if (v10_SolarReflectanceBack) { e->setArgument(9,(*v10_SolarReflectanceBack)); } else { e->setArgument(9); } entity = e; EntityBuffer::Add(this); }
+IfcOpticalMaterialProperties::IfcOpticalMaterialProperties(IfcAbstractEntity* e) : IfcMaterialProperties((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcOpticalMaterialProperties)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcOpticalMaterialProperties::IfcOpticalMaterialProperties(IfcMaterial* v1_Material, boost::optional< double > v2_VisibleTransmittance, boost::optional< double > v3_SolarTransmittance, boost::optional< double > v4_ThermalIrTransmittance, boost::optional< double > v5_ThermalIrEmissivityBack, boost::optional< double > v6_ThermalIrEmissivityFront, boost::optional< double > v7_VisibleReflectanceBack, boost::optional< double > v8_VisibleReflectanceFront, boost::optional< double > v9_SolarReflectanceFront, boost::optional< double > v10_SolarReflectanceBack) : IfcMaterialProperties((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Material)); if (v2_VisibleTransmittance) { e->setArgument(1,(*v2_VisibleTransmittance)); } else { e->setArgument(1); } if (v3_SolarTransmittance) { e->setArgument(2,(*v3_SolarTransmittance)); } else { e->setArgument(2); } if (v4_ThermalIrTransmittance) { e->setArgument(3,(*v4_ThermalIrTransmittance)); } else { e->setArgument(3); } if (v5_ThermalIrEmissivityBack) { e->setArgument(4,(*v5_ThermalIrEmissivityBack)); } else { e->setArgument(4); } if (v6_ThermalIrEmissivityFront) { e->setArgument(5,(*v6_ThermalIrEmissivityFront)); } else { e->setArgument(5); } if (v7_VisibleReflectanceBack) { e->setArgument(6,(*v7_VisibleReflectanceBack)); } else { e->setArgument(6); } if (v8_VisibleReflectanceFront) { e->setArgument(7,(*v8_VisibleReflectanceFront)); } else { e->setArgument(7); } if (v9_SolarReflectanceFront) { e->setArgument(8,(*v9_SolarReflectanceFront)); } else { e->setArgument(8); } if (v10_SolarReflectanceBack) { e->setArgument(9,(*v10_SolarReflectanceBack)); } else { e->setArgument(9); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcOrderAction
-IfcIdentifier IfcOrderAction::ActionID() { return *entity->getArgument(10); }
-void IfcOrderAction::setActionID(IfcIdentifier v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
+std::string IfcOrderAction::ActionID() const { return *entity->getArgument(10); }
+void IfcOrderAction::setActionID(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
 bool IfcOrderAction::is(Type::Enum v) const { return v == Type::IfcOrderAction || IfcTask::is(v); }
 Type::Enum IfcOrderAction::type() const { return Type::IfcOrderAction; }
 Type::Enum IfcOrderAction::Class() { return Type::IfcOrderAction; }
-IfcOrderAction::IfcOrderAction(IfcAbstractEntityPtr e) : IfcTask((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcOrderAction)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcOrderAction::IfcOrderAction(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcIdentifier v6_TaskId, boost::optional< IfcLabel > v7_Status, boost::optional< IfcLabel > v8_WorkMethod, bool v9_IsMilestone, boost::optional< int > v10_Priority, IfcIdentifier v11_ActionID) : IfcTask((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_TaskId)); if (v7_Status) { e->setArgument(6,(*v7_Status)); } else { e->setArgument(6); } if (v8_WorkMethod) { e->setArgument(7,(*v8_WorkMethod)); } else { e->setArgument(7); } e->setArgument(8,(v9_IsMilestone)); if (v10_Priority) { e->setArgument(9,(*v10_Priority)); } else { e->setArgument(9); } e->setArgument(10,(v11_ActionID)); entity = e; EntityBuffer::Add(this); }
+IfcOrderAction::IfcOrderAction(IfcAbstractEntity* e) : IfcTask((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcOrderAction)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcOrderAction::IfcOrderAction(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, std::string v6_TaskId, boost::optional< std::string > v7_Status, boost::optional< std::string > v8_WorkMethod, bool v9_IsMilestone, boost::optional< int > v10_Priority, std::string v11_ActionID) : IfcTask((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_TaskId)); if (v7_Status) { e->setArgument(6,(*v7_Status)); } else { e->setArgument(6); } if (v8_WorkMethod) { e->setArgument(7,(*v8_WorkMethod)); } else { e->setArgument(7); } e->setArgument(8,(v9_IsMilestone)); if (v10_Priority) { e->setArgument(9,(*v10_Priority)); } else { e->setArgument(9); } e->setArgument(10,(v11_ActionID)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcOrganization
-bool IfcOrganization::hasId() { return !entity->getArgument(0)->isNull(); }
-IfcIdentifier IfcOrganization::Id() { return *entity->getArgument(0); }
-void IfcOrganization::setId(IfcIdentifier v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-IfcLabel IfcOrganization::Name() { return *entity->getArgument(1); }
-void IfcOrganization::setName(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-bool IfcOrganization::hasDescription() { return !entity->getArgument(2)->isNull(); }
-IfcText IfcOrganization::Description() { return *entity->getArgument(2); }
-void IfcOrganization::setDescription(IfcText v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-bool IfcOrganization::hasRoles() { return !entity->getArgument(3)->isNull(); }
-SHARED_PTR< IfcTemplatedEntityList< IfcActorRole > > IfcOrganization::Roles() { RETURN_AS_LIST(IfcActorRole,3) }
-void IfcOrganization::setRoles(SHARED_PTR< IfcTemplatedEntityList< IfcActorRole > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v->generalize()); }
-bool IfcOrganization::hasAddresses() { return !entity->getArgument(4)->isNull(); }
-SHARED_PTR< IfcTemplatedEntityList< IfcAddress > > IfcOrganization::Addresses() { RETURN_AS_LIST(IfcAddress,4) }
-void IfcOrganization::setAddresses(SHARED_PTR< IfcTemplatedEntityList< IfcAddress > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v->generalize()); }
-IfcOrganizationRelationship::list IfcOrganization::IsRelatedBy() { RETURN_INVERSE(IfcOrganizationRelationship) }
-IfcOrganizationRelationship::list IfcOrganization::Relates() { RETURN_INVERSE(IfcOrganizationRelationship) }
-IfcPersonAndOrganization::list IfcOrganization::Engages() { RETURN_INVERSE(IfcPersonAndOrganization) }
+bool IfcOrganization::hasId() const { return !entity->getArgument(0)->isNull(); }
+std::string IfcOrganization::Id() const { return *entity->getArgument(0); }
+void IfcOrganization::setId(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+std::string IfcOrganization::Name() const { return *entity->getArgument(1); }
+void IfcOrganization::setName(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+bool IfcOrganization::hasDescription() const { return !entity->getArgument(2)->isNull(); }
+std::string IfcOrganization::Description() const { return *entity->getArgument(2); }
+void IfcOrganization::setDescription(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+bool IfcOrganization::hasRoles() const { return !entity->getArgument(3)->isNull(); }
+IfcTemplatedEntityList< IfcActorRole >::ptr IfcOrganization::Roles() const { IfcEntityList::ptr es = *entity->getArgument(3); return es->as<IfcActorRole>(); }
+void IfcOrganization::setRoles(IfcTemplatedEntityList< IfcActorRole >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v->generalize()); }
+bool IfcOrganization::hasAddresses() const { return !entity->getArgument(4)->isNull(); }
+IfcTemplatedEntityList< IfcAddress >::ptr IfcOrganization::Addresses() const { IfcEntityList::ptr es = *entity->getArgument(4); return es->as<IfcAddress>(); }
+void IfcOrganization::setAddresses(IfcTemplatedEntityList< IfcAddress >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v->generalize()); }
+IfcOrganizationRelationship::list::ptr IfcOrganization::IsRelatedBy() const { return entity->getInverse(Type::IfcOrganizationRelationship, 3)->as<IfcOrganizationRelationship>(); }
+IfcOrganizationRelationship::list::ptr IfcOrganization::Relates() const { return entity->getInverse(Type::IfcOrganizationRelationship, 2)->as<IfcOrganizationRelationship>(); }
+IfcPersonAndOrganization::list::ptr IfcOrganization::Engages() const { return entity->getInverse(Type::IfcPersonAndOrganization, 1)->as<IfcPersonAndOrganization>(); }
 bool IfcOrganization::is(Type::Enum v) const { return v == Type::IfcOrganization; }
 Type::Enum IfcOrganization::type() const { return Type::IfcOrganization; }
 Type::Enum IfcOrganization::Class() { return Type::IfcOrganization; }
-IfcOrganization::IfcOrganization(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcOrganization)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcOrganization::IfcOrganization(boost::optional< IfcIdentifier > v1_Id, IfcLabel v2_Name, boost::optional< IfcText > v3_Description, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcActorRole > > > v4_Roles, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcAddress > > > v5_Addresses) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Id) { e->setArgument(0,(*v1_Id)); } else { e->setArgument(0); } e->setArgument(1,(v2_Name)); if (v3_Description) { e->setArgument(2,(*v3_Description)); } else { e->setArgument(2); } if (v4_Roles) { e->setArgument(3,(*v4_Roles)->generalize()); } else { e->setArgument(3); } if (v5_Addresses) { e->setArgument(4,(*v5_Addresses)->generalize()); } else { e->setArgument(4); } entity = e; EntityBuffer::Add(this); }
+IfcOrganization::IfcOrganization(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcOrganization)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcOrganization::IfcOrganization(boost::optional< std::string > v1_Id, std::string v2_Name, boost::optional< std::string > v3_Description, boost::optional< IfcTemplatedEntityList< IfcActorRole >::ptr > v4_Roles, boost::optional< IfcTemplatedEntityList< IfcAddress >::ptr > v5_Addresses) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Id) { e->setArgument(0,(*v1_Id)); } else { e->setArgument(0); } e->setArgument(1,(v2_Name)); if (v3_Description) { e->setArgument(2,(*v3_Description)); } else { e->setArgument(2); } if (v4_Roles) { e->setArgument(3,(*v4_Roles)->generalize()); } else { e->setArgument(3); } if (v5_Addresses) { e->setArgument(4,(*v5_Addresses)->generalize()); } else { e->setArgument(4); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcOrganizationRelationship
-IfcLabel IfcOrganizationRelationship::Name() { return *entity->getArgument(0); }
-void IfcOrganizationRelationship::setName(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-bool IfcOrganizationRelationship::hasDescription() { return !entity->getArgument(1)->isNull(); }
-IfcText IfcOrganizationRelationship::Description() { return *entity->getArgument(1); }
-void IfcOrganizationRelationship::setDescription(IfcText v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-IfcOrganization* IfcOrganizationRelationship::RelatingOrganization() { return (IfcOrganization*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(2))); }
+std::string IfcOrganizationRelationship::Name() const { return *entity->getArgument(0); }
+void IfcOrganizationRelationship::setName(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+bool IfcOrganizationRelationship::hasDescription() const { return !entity->getArgument(1)->isNull(); }
+std::string IfcOrganizationRelationship::Description() const { return *entity->getArgument(1); }
+void IfcOrganizationRelationship::setDescription(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+IfcOrganization* IfcOrganizationRelationship::RelatingOrganization() const { return (IfcOrganization*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(2))); }
 void IfcOrganizationRelationship::setRelatingOrganization(IfcOrganization* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-SHARED_PTR< IfcTemplatedEntityList< IfcOrganization > > IfcOrganizationRelationship::RelatedOrganizations() { RETURN_AS_LIST(IfcOrganization,3) }
-void IfcOrganizationRelationship::setRelatedOrganizations(SHARED_PTR< IfcTemplatedEntityList< IfcOrganization > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v->generalize()); }
+IfcTemplatedEntityList< IfcOrganization >::ptr IfcOrganizationRelationship::RelatedOrganizations() const { IfcEntityList::ptr es = *entity->getArgument(3); return es->as<IfcOrganization>(); }
+void IfcOrganizationRelationship::setRelatedOrganizations(IfcTemplatedEntityList< IfcOrganization >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v->generalize()); }
 bool IfcOrganizationRelationship::is(Type::Enum v) const { return v == Type::IfcOrganizationRelationship; }
 Type::Enum IfcOrganizationRelationship::type() const { return Type::IfcOrganizationRelationship; }
 Type::Enum IfcOrganizationRelationship::Class() { return Type::IfcOrganizationRelationship; }
-IfcOrganizationRelationship::IfcOrganizationRelationship(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcOrganizationRelationship)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcOrganizationRelationship::IfcOrganizationRelationship(IfcLabel v1_Name, boost::optional< IfcText > v2_Description, IfcOrganization* v3_RelatingOrganization, SHARED_PTR< IfcTemplatedEntityList< IfcOrganization > > v4_RelatedOrganizations) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_RelatingOrganization)); e->setArgument(3,(v4_RelatedOrganizations)->generalize()); entity = e; EntityBuffer::Add(this); }
+IfcOrganizationRelationship::IfcOrganizationRelationship(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcOrganizationRelationship)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcOrganizationRelationship::IfcOrganizationRelationship(std::string v1_Name, boost::optional< std::string > v2_Description, IfcOrganization* v3_RelatingOrganization, IfcTemplatedEntityList< IfcOrganization >::ptr v4_RelatedOrganizations) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_RelatingOrganization)); e->setArgument(3,(v4_RelatedOrganizations)->generalize()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcOrientedEdge
-IfcEdge* IfcOrientedEdge::EdgeElement() { return (IfcEdge*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(2))); }
+IfcEdge* IfcOrientedEdge::EdgeElement() const { return (IfcEdge*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(2))); }
 void IfcOrientedEdge::setEdgeElement(IfcEdge* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-bool IfcOrientedEdge::Orientation() { return *entity->getArgument(3); }
+bool IfcOrientedEdge::Orientation() const { return *entity->getArgument(3); }
 void IfcOrientedEdge::setOrientation(bool v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
 bool IfcOrientedEdge::is(Type::Enum v) const { return v == Type::IfcOrientedEdge || IfcEdge::is(v); }
 Type::Enum IfcOrientedEdge::type() const { return Type::IfcOrientedEdge; }
 Type::Enum IfcOrientedEdge::Class() { return Type::IfcOrientedEdge; }
-IfcOrientedEdge::IfcOrientedEdge(IfcAbstractEntityPtr e) : IfcEdge((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcOrientedEdge)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcOrientedEdge::IfcOrientedEdge(IfcEdge* v3_EdgeElement, bool v4_Orientation) : IfcEdge((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgumentDerived(0); e->setArgumentDerived(1); e->setArgument(2,(v3_EdgeElement)); e->setArgument(3,(v4_Orientation)); entity = e; EntityBuffer::Add(this); }
+IfcOrientedEdge::IfcOrientedEdge(IfcAbstractEntity* e) : IfcEdge((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcOrientedEdge)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcOrientedEdge::IfcOrientedEdge(IfcEdge* v3_EdgeElement, bool v4_Orientation) : IfcEdge((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgumentDerived(0); e->setArgumentDerived(1); e->setArgument(2,(v3_EdgeElement)); e->setArgument(3,(v4_Orientation)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcOutletType
-IfcOutletTypeEnum::IfcOutletTypeEnum IfcOutletType::PredefinedType() { return IfcOutletTypeEnum::FromString(*entity->getArgument(9)); }
+IfcOutletTypeEnum::IfcOutletTypeEnum IfcOutletType::PredefinedType() const { return IfcOutletTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcOutletType::setPredefinedType(IfcOutletTypeEnum::IfcOutletTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcOutletTypeEnum::ToString(v)); }
 bool IfcOutletType::is(Type::Enum v) const { return v == Type::IfcOutletType || IfcFlowTerminalType::is(v); }
 Type::Enum IfcOutletType::type() const { return Type::IfcOutletType; }
 Type::Enum IfcOutletType::Class() { return Type::IfcOutletType; }
-IfcOutletType::IfcOutletType(IfcAbstractEntityPtr e) : IfcFlowTerminalType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcOutletType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcOutletType::IfcOutletType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcOutletTypeEnum::IfcOutletTypeEnum v10_PredefinedType) : IfcFlowTerminalType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcOutletTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcOutletType::IfcOutletType(IfcAbstractEntity* e) : IfcFlowTerminalType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcOutletType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcOutletType::IfcOutletType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcOutletTypeEnum::IfcOutletTypeEnum v10_PredefinedType) : IfcFlowTerminalType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcOutletTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcOwnerHistory
-IfcPersonAndOrganization* IfcOwnerHistory::OwningUser() { return (IfcPersonAndOrganization*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(0))); }
+IfcPersonAndOrganization* IfcOwnerHistory::OwningUser() const { return (IfcPersonAndOrganization*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(0))); }
 void IfcOwnerHistory::setOwningUser(IfcPersonAndOrganization* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-IfcApplication* IfcOwnerHistory::OwningApplication() { return (IfcApplication*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(1))); }
+IfcApplication* IfcOwnerHistory::OwningApplication() const { return (IfcApplication*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(1))); }
 void IfcOwnerHistory::setOwningApplication(IfcApplication* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-bool IfcOwnerHistory::hasState() { return !entity->getArgument(2)->isNull(); }
-IfcStateEnum::IfcStateEnum IfcOwnerHistory::State() { return IfcStateEnum::FromString(*entity->getArgument(2)); }
+bool IfcOwnerHistory::hasState() const { return !entity->getArgument(2)->isNull(); }
+IfcStateEnum::IfcStateEnum IfcOwnerHistory::State() const { return IfcStateEnum::FromString(*entity->getArgument(2)); }
 void IfcOwnerHistory::setState(IfcStateEnum::IfcStateEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v,IfcStateEnum::ToString(v)); }
-IfcChangeActionEnum::IfcChangeActionEnum IfcOwnerHistory::ChangeAction() { return IfcChangeActionEnum::FromString(*entity->getArgument(3)); }
+IfcChangeActionEnum::IfcChangeActionEnum IfcOwnerHistory::ChangeAction() const { return IfcChangeActionEnum::FromString(*entity->getArgument(3)); }
 void IfcOwnerHistory::setChangeAction(IfcChangeActionEnum::IfcChangeActionEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v,IfcChangeActionEnum::ToString(v)); }
-bool IfcOwnerHistory::hasLastModifiedDate() { return !entity->getArgument(4)->isNull(); }
-IfcTimeStamp IfcOwnerHistory::LastModifiedDate() { return *entity->getArgument(4); }
-void IfcOwnerHistory::setLastModifiedDate(IfcTimeStamp v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-bool IfcOwnerHistory::hasLastModifyingUser() { return !entity->getArgument(5)->isNull(); }
-IfcPersonAndOrganization* IfcOwnerHistory::LastModifyingUser() { return (IfcPersonAndOrganization*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(5))); }
+bool IfcOwnerHistory::hasLastModifiedDate() const { return !entity->getArgument(4)->isNull(); }
+int IfcOwnerHistory::LastModifiedDate() const { return *entity->getArgument(4); }
+void IfcOwnerHistory::setLastModifiedDate(int v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+bool IfcOwnerHistory::hasLastModifyingUser() const { return !entity->getArgument(5)->isNull(); }
+IfcPersonAndOrganization* IfcOwnerHistory::LastModifyingUser() const { return (IfcPersonAndOrganization*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(5))); }
 void IfcOwnerHistory::setLastModifyingUser(IfcPersonAndOrganization* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-bool IfcOwnerHistory::hasLastModifyingApplication() { return !entity->getArgument(6)->isNull(); }
-IfcApplication* IfcOwnerHistory::LastModifyingApplication() { return (IfcApplication*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(6))); }
+bool IfcOwnerHistory::hasLastModifyingApplication() const { return !entity->getArgument(6)->isNull(); }
+IfcApplication* IfcOwnerHistory::LastModifyingApplication() const { return (IfcApplication*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(6))); }
 void IfcOwnerHistory::setLastModifyingApplication(IfcApplication* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
-IfcTimeStamp IfcOwnerHistory::CreationDate() { return *entity->getArgument(7); }
-void IfcOwnerHistory::setCreationDate(IfcTimeStamp v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
+int IfcOwnerHistory::CreationDate() const { return *entity->getArgument(7); }
+void IfcOwnerHistory::setCreationDate(int v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
 bool IfcOwnerHistory::is(Type::Enum v) const { return v == Type::IfcOwnerHistory; }
 Type::Enum IfcOwnerHistory::type() const { return Type::IfcOwnerHistory; }
 Type::Enum IfcOwnerHistory::Class() { return Type::IfcOwnerHistory; }
-IfcOwnerHistory::IfcOwnerHistory(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcOwnerHistory)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcOwnerHistory::IfcOwnerHistory(IfcPersonAndOrganization* v1_OwningUser, IfcApplication* v2_OwningApplication, boost::optional< IfcStateEnum::IfcStateEnum > v3_State, IfcChangeActionEnum::IfcChangeActionEnum v4_ChangeAction, boost::optional< IfcTimeStamp > v5_LastModifiedDate, IfcPersonAndOrganization* v6_LastModifyingUser, IfcApplication* v7_LastModifyingApplication, IfcTimeStamp v8_CreationDate) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_OwningUser)); e->setArgument(1,(v2_OwningApplication)); if (v3_State) { e->setArgument(2,*v3_State,IfcStateEnum::ToString(*v3_State)); } else { e->setArgument(2); } e->setArgument(3,v4_ChangeAction,IfcChangeActionEnum::ToString(v4_ChangeAction)); if (v5_LastModifiedDate) { e->setArgument(4,(*v5_LastModifiedDate)); } else { e->setArgument(4); } e->setArgument(5,(v6_LastModifyingUser)); e->setArgument(6,(v7_LastModifyingApplication)); e->setArgument(7,(v8_CreationDate)); entity = e; EntityBuffer::Add(this); }
+IfcOwnerHistory::IfcOwnerHistory(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcOwnerHistory)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcOwnerHistory::IfcOwnerHistory(IfcPersonAndOrganization* v1_OwningUser, IfcApplication* v2_OwningApplication, boost::optional< IfcStateEnum::IfcStateEnum > v3_State, IfcChangeActionEnum::IfcChangeActionEnum v4_ChangeAction, boost::optional< int > v5_LastModifiedDate, IfcPersonAndOrganization* v6_LastModifyingUser, IfcApplication* v7_LastModifyingApplication, int v8_CreationDate) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_OwningUser)); e->setArgument(1,(v2_OwningApplication)); if (v3_State) { e->setArgument(2,*v3_State,IfcStateEnum::ToString(*v3_State)); } else { e->setArgument(2); } e->setArgument(3,v4_ChangeAction,IfcChangeActionEnum::ToString(v4_ChangeAction)); if (v5_LastModifiedDate) { e->setArgument(4,(*v5_LastModifiedDate)); } else { e->setArgument(4); } e->setArgument(5,(v6_LastModifyingUser)); e->setArgument(6,(v7_LastModifyingApplication)); e->setArgument(7,(v8_CreationDate)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcParameterizedProfileDef
-IfcAxis2Placement2D* IfcParameterizedProfileDef::Position() { return (IfcAxis2Placement2D*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(2))); }
+IfcAxis2Placement2D* IfcParameterizedProfileDef::Position() const { return (IfcAxis2Placement2D*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(2))); }
 void IfcParameterizedProfileDef::setPosition(IfcAxis2Placement2D* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
 bool IfcParameterizedProfileDef::is(Type::Enum v) const { return v == Type::IfcParameterizedProfileDef || IfcProfileDef::is(v); }
 Type::Enum IfcParameterizedProfileDef::type() const { return Type::IfcParameterizedProfileDef; }
 Type::Enum IfcParameterizedProfileDef::Class() { return Type::IfcParameterizedProfileDef; }
-IfcParameterizedProfileDef::IfcParameterizedProfileDef(IfcAbstractEntityPtr e) : IfcProfileDef((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcParameterizedProfileDef)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcParameterizedProfileDef::IfcParameterizedProfileDef(IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< IfcLabel > v2_ProfileName, IfcAxis2Placement2D* v3_Position) : IfcProfileDef((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,v1_ProfileType,IfcProfileTypeEnum::ToString(v1_ProfileType)); if (v2_ProfileName) { e->setArgument(1,(*v2_ProfileName)); } else { e->setArgument(1); } e->setArgument(2,(v3_Position)); entity = e; EntityBuffer::Add(this); }
+IfcParameterizedProfileDef::IfcParameterizedProfileDef(IfcAbstractEntity* e) : IfcProfileDef((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcParameterizedProfileDef)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcParameterizedProfileDef::IfcParameterizedProfileDef(IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< std::string > v2_ProfileName, IfcAxis2Placement2D* v3_Position) : IfcProfileDef((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,v1_ProfileType,IfcProfileTypeEnum::ToString(v1_ProfileType)); if (v2_ProfileName) { e->setArgument(1,(*v2_ProfileName)); } else { e->setArgument(1); } e->setArgument(2,(v3_Position)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcPath
-SHARED_PTR< IfcTemplatedEntityList< IfcOrientedEdge > > IfcPath::EdgeList() { RETURN_AS_LIST(IfcOrientedEdge,0) }
-void IfcPath::setEdgeList(SHARED_PTR< IfcTemplatedEntityList< IfcOrientedEdge > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v->generalize()); }
+IfcTemplatedEntityList< IfcOrientedEdge >::ptr IfcPath::EdgeList() const { IfcEntityList::ptr es = *entity->getArgument(0); return es->as<IfcOrientedEdge>(); }
+void IfcPath::setEdgeList(IfcTemplatedEntityList< IfcOrientedEdge >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v->generalize()); }
 bool IfcPath::is(Type::Enum v) const { return v == Type::IfcPath || IfcTopologicalRepresentationItem::is(v); }
 Type::Enum IfcPath::type() const { return Type::IfcPath; }
 Type::Enum IfcPath::Class() { return Type::IfcPath; }
-IfcPath::IfcPath(IfcAbstractEntityPtr e) : IfcTopologicalRepresentationItem((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcPath)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcPath::IfcPath(SHARED_PTR< IfcTemplatedEntityList< IfcOrientedEdge > > v1_EdgeList) : IfcTopologicalRepresentationItem((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_EdgeList)->generalize()); entity = e; EntityBuffer::Add(this); }
+IfcPath::IfcPath(IfcAbstractEntity* e) : IfcTopologicalRepresentationItem((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcPath)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcPath::IfcPath(IfcTemplatedEntityList< IfcOrientedEdge >::ptr v1_EdgeList) : IfcTopologicalRepresentationItem((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_EdgeList)->generalize()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcPerformanceHistory
-IfcLabel IfcPerformanceHistory::LifeCyclePhase() { return *entity->getArgument(5); }
-void IfcPerformanceHistory::setLifeCyclePhase(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+std::string IfcPerformanceHistory::LifeCyclePhase() const { return *entity->getArgument(5); }
+void IfcPerformanceHistory::setLifeCyclePhase(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
 bool IfcPerformanceHistory::is(Type::Enum v) const { return v == Type::IfcPerformanceHistory || IfcControl::is(v); }
 Type::Enum IfcPerformanceHistory::type() const { return Type::IfcPerformanceHistory; }
 Type::Enum IfcPerformanceHistory::Class() { return Type::IfcPerformanceHistory; }
-IfcPerformanceHistory::IfcPerformanceHistory(IfcAbstractEntityPtr e) : IfcControl((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcPerformanceHistory)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcPerformanceHistory::IfcPerformanceHistory(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcLabel v6_LifeCyclePhase) : IfcControl((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_LifeCyclePhase)); entity = e; EntityBuffer::Add(this); }
+IfcPerformanceHistory::IfcPerformanceHistory(IfcAbstractEntity* e) : IfcControl((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcPerformanceHistory)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcPerformanceHistory::IfcPerformanceHistory(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, std::string v6_LifeCyclePhase) : IfcControl((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_LifeCyclePhase)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcPermeableCoveringProperties
-IfcPermeableCoveringOperationEnum::IfcPermeableCoveringOperationEnum IfcPermeableCoveringProperties::OperationType() { return IfcPermeableCoveringOperationEnum::FromString(*entity->getArgument(4)); }
+IfcPermeableCoveringOperationEnum::IfcPermeableCoveringOperationEnum IfcPermeableCoveringProperties::OperationType() const { return IfcPermeableCoveringOperationEnum::FromString(*entity->getArgument(4)); }
 void IfcPermeableCoveringProperties::setOperationType(IfcPermeableCoveringOperationEnum::IfcPermeableCoveringOperationEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v,IfcPermeableCoveringOperationEnum::ToString(v)); }
-IfcWindowPanelPositionEnum::IfcWindowPanelPositionEnum IfcPermeableCoveringProperties::PanelPosition() { return IfcWindowPanelPositionEnum::FromString(*entity->getArgument(5)); }
+IfcWindowPanelPositionEnum::IfcWindowPanelPositionEnum IfcPermeableCoveringProperties::PanelPosition() const { return IfcWindowPanelPositionEnum::FromString(*entity->getArgument(5)); }
 void IfcPermeableCoveringProperties::setPanelPosition(IfcWindowPanelPositionEnum::IfcWindowPanelPositionEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v,IfcWindowPanelPositionEnum::ToString(v)); }
-bool IfcPermeableCoveringProperties::hasFrameDepth() { return !entity->getArgument(6)->isNull(); }
-IfcPositiveLengthMeasure IfcPermeableCoveringProperties::FrameDepth() { return *entity->getArgument(6); }
-void IfcPermeableCoveringProperties::setFrameDepth(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
-bool IfcPermeableCoveringProperties::hasFrameThickness() { return !entity->getArgument(7)->isNull(); }
-IfcPositiveLengthMeasure IfcPermeableCoveringProperties::FrameThickness() { return *entity->getArgument(7); }
-void IfcPermeableCoveringProperties::setFrameThickness(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
-bool IfcPermeableCoveringProperties::hasShapeAspectStyle() { return !entity->getArgument(8)->isNull(); }
-IfcShapeAspect* IfcPermeableCoveringProperties::ShapeAspectStyle() { return (IfcShapeAspect*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(8))); }
+bool IfcPermeableCoveringProperties::hasFrameDepth() const { return !entity->getArgument(6)->isNull(); }
+double IfcPermeableCoveringProperties::FrameDepth() const { return *entity->getArgument(6); }
+void IfcPermeableCoveringProperties::setFrameDepth(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
+bool IfcPermeableCoveringProperties::hasFrameThickness() const { return !entity->getArgument(7)->isNull(); }
+double IfcPermeableCoveringProperties::FrameThickness() const { return *entity->getArgument(7); }
+void IfcPermeableCoveringProperties::setFrameThickness(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
+bool IfcPermeableCoveringProperties::hasShapeAspectStyle() const { return !entity->getArgument(8)->isNull(); }
+IfcShapeAspect* IfcPermeableCoveringProperties::ShapeAspectStyle() const { return (IfcShapeAspect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(8))); }
 void IfcPermeableCoveringProperties::setShapeAspectStyle(IfcShapeAspect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
 bool IfcPermeableCoveringProperties::is(Type::Enum v) const { return v == Type::IfcPermeableCoveringProperties || IfcPropertySetDefinition::is(v); }
 Type::Enum IfcPermeableCoveringProperties::type() const { return Type::IfcPermeableCoveringProperties; }
 Type::Enum IfcPermeableCoveringProperties::Class() { return Type::IfcPermeableCoveringProperties; }
-IfcPermeableCoveringProperties::IfcPermeableCoveringProperties(IfcAbstractEntityPtr e) : IfcPropertySetDefinition((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcPermeableCoveringProperties)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcPermeableCoveringProperties::IfcPermeableCoveringProperties(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, IfcPermeableCoveringOperationEnum::IfcPermeableCoveringOperationEnum v5_OperationType, IfcWindowPanelPositionEnum::IfcWindowPanelPositionEnum v6_PanelPosition, boost::optional< IfcPositiveLengthMeasure > v7_FrameDepth, boost::optional< IfcPositiveLengthMeasure > v8_FrameThickness, IfcShapeAspect* v9_ShapeAspectStyle) : IfcPropertySetDefinition((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,v5_OperationType,IfcPermeableCoveringOperationEnum::ToString(v5_OperationType)); e->setArgument(5,v6_PanelPosition,IfcWindowPanelPositionEnum::ToString(v6_PanelPosition)); if (v7_FrameDepth) { e->setArgument(6,(*v7_FrameDepth)); } else { e->setArgument(6); } if (v8_FrameThickness) { e->setArgument(7,(*v8_FrameThickness)); } else { e->setArgument(7); } e->setArgument(8,(v9_ShapeAspectStyle)); entity = e; EntityBuffer::Add(this); }
+IfcPermeableCoveringProperties::IfcPermeableCoveringProperties(IfcAbstractEntity* e) : IfcPropertySetDefinition((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcPermeableCoveringProperties)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcPermeableCoveringProperties::IfcPermeableCoveringProperties(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcPermeableCoveringOperationEnum::IfcPermeableCoveringOperationEnum v5_OperationType, IfcWindowPanelPositionEnum::IfcWindowPanelPositionEnum v6_PanelPosition, boost::optional< double > v7_FrameDepth, boost::optional< double > v8_FrameThickness, IfcShapeAspect* v9_ShapeAspectStyle) : IfcPropertySetDefinition((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,v5_OperationType,IfcPermeableCoveringOperationEnum::ToString(v5_OperationType)); e->setArgument(5,v6_PanelPosition,IfcWindowPanelPositionEnum::ToString(v6_PanelPosition)); if (v7_FrameDepth) { e->setArgument(6,(*v7_FrameDepth)); } else { e->setArgument(6); } if (v8_FrameThickness) { e->setArgument(7,(*v8_FrameThickness)); } else { e->setArgument(7); } e->setArgument(8,(v9_ShapeAspectStyle)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcPermit
-IfcIdentifier IfcPermit::PermitID() { return *entity->getArgument(5); }
-void IfcPermit::setPermitID(IfcIdentifier v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+std::string IfcPermit::PermitID() const { return *entity->getArgument(5); }
+void IfcPermit::setPermitID(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
 bool IfcPermit::is(Type::Enum v) const { return v == Type::IfcPermit || IfcControl::is(v); }
 Type::Enum IfcPermit::type() const { return Type::IfcPermit; }
 Type::Enum IfcPermit::Class() { return Type::IfcPermit; }
-IfcPermit::IfcPermit(IfcAbstractEntityPtr e) : IfcControl((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcPermit)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcPermit::IfcPermit(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcIdentifier v6_PermitID) : IfcControl((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_PermitID)); entity = e; EntityBuffer::Add(this); }
+IfcPermit::IfcPermit(IfcAbstractEntity* e) : IfcControl((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcPermit)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcPermit::IfcPermit(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, std::string v6_PermitID) : IfcControl((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_PermitID)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcPerson
-bool IfcPerson::hasId() { return !entity->getArgument(0)->isNull(); }
-IfcIdentifier IfcPerson::Id() { return *entity->getArgument(0); }
-void IfcPerson::setId(IfcIdentifier v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-bool IfcPerson::hasFamilyName() { return !entity->getArgument(1)->isNull(); }
-IfcLabel IfcPerson::FamilyName() { return *entity->getArgument(1); }
-void IfcPerson::setFamilyName(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-bool IfcPerson::hasGivenName() { return !entity->getArgument(2)->isNull(); }
-IfcLabel IfcPerson::GivenName() { return *entity->getArgument(2); }
-void IfcPerson::setGivenName(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-bool IfcPerson::hasMiddleNames() { return !entity->getArgument(3)->isNull(); }
-std::vector< IfcLabel > /*[1:?]*/ IfcPerson::MiddleNames() { return *entity->getArgument(3); }
-void IfcPerson::setMiddleNames(std::vector< IfcLabel > /*[1:?]*/ v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-bool IfcPerson::hasPrefixTitles() { return !entity->getArgument(4)->isNull(); }
-std::vector< IfcLabel > /*[1:?]*/ IfcPerson::PrefixTitles() { return *entity->getArgument(4); }
-void IfcPerson::setPrefixTitles(std::vector< IfcLabel > /*[1:?]*/ v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-bool IfcPerson::hasSuffixTitles() { return !entity->getArgument(5)->isNull(); }
-std::vector< IfcLabel > /*[1:?]*/ IfcPerson::SuffixTitles() { return *entity->getArgument(5); }
-void IfcPerson::setSuffixTitles(std::vector< IfcLabel > /*[1:?]*/ v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-bool IfcPerson::hasRoles() { return !entity->getArgument(6)->isNull(); }
-SHARED_PTR< IfcTemplatedEntityList< IfcActorRole > > IfcPerson::Roles() { RETURN_AS_LIST(IfcActorRole,6) }
-void IfcPerson::setRoles(SHARED_PTR< IfcTemplatedEntityList< IfcActorRole > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v->generalize()); }
-bool IfcPerson::hasAddresses() { return !entity->getArgument(7)->isNull(); }
-SHARED_PTR< IfcTemplatedEntityList< IfcAddress > > IfcPerson::Addresses() { RETURN_AS_LIST(IfcAddress,7) }
-void IfcPerson::setAddresses(SHARED_PTR< IfcTemplatedEntityList< IfcAddress > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v->generalize()); }
-IfcPersonAndOrganization::list IfcPerson::EngagedIn() { RETURN_INVERSE(IfcPersonAndOrganization) }
+bool IfcPerson::hasId() const { return !entity->getArgument(0)->isNull(); }
+std::string IfcPerson::Id() const { return *entity->getArgument(0); }
+void IfcPerson::setId(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+bool IfcPerson::hasFamilyName() const { return !entity->getArgument(1)->isNull(); }
+std::string IfcPerson::FamilyName() const { return *entity->getArgument(1); }
+void IfcPerson::setFamilyName(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+bool IfcPerson::hasGivenName() const { return !entity->getArgument(2)->isNull(); }
+std::string IfcPerson::GivenName() const { return *entity->getArgument(2); }
+void IfcPerson::setGivenName(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+bool IfcPerson::hasMiddleNames() const { return !entity->getArgument(3)->isNull(); }
+std::vector< std::string > /*[1:?]*/ IfcPerson::MiddleNames() const { return *entity->getArgument(3); }
+void IfcPerson::setMiddleNames(std::vector< std::string > /*[1:?]*/ v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+bool IfcPerson::hasPrefixTitles() const { return !entity->getArgument(4)->isNull(); }
+std::vector< std::string > /*[1:?]*/ IfcPerson::PrefixTitles() const { return *entity->getArgument(4); }
+void IfcPerson::setPrefixTitles(std::vector< std::string > /*[1:?]*/ v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+bool IfcPerson::hasSuffixTitles() const { return !entity->getArgument(5)->isNull(); }
+std::vector< std::string > /*[1:?]*/ IfcPerson::SuffixTitles() const { return *entity->getArgument(5); }
+void IfcPerson::setSuffixTitles(std::vector< std::string > /*[1:?]*/ v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+bool IfcPerson::hasRoles() const { return !entity->getArgument(6)->isNull(); }
+IfcTemplatedEntityList< IfcActorRole >::ptr IfcPerson::Roles() const { IfcEntityList::ptr es = *entity->getArgument(6); return es->as<IfcActorRole>(); }
+void IfcPerson::setRoles(IfcTemplatedEntityList< IfcActorRole >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v->generalize()); }
+bool IfcPerson::hasAddresses() const { return !entity->getArgument(7)->isNull(); }
+IfcTemplatedEntityList< IfcAddress >::ptr IfcPerson::Addresses() const { IfcEntityList::ptr es = *entity->getArgument(7); return es->as<IfcAddress>(); }
+void IfcPerson::setAddresses(IfcTemplatedEntityList< IfcAddress >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v->generalize()); }
+IfcPersonAndOrganization::list::ptr IfcPerson::EngagedIn() const { return entity->getInverse(Type::IfcPersonAndOrganization, 0)->as<IfcPersonAndOrganization>(); }
 bool IfcPerson::is(Type::Enum v) const { return v == Type::IfcPerson; }
 Type::Enum IfcPerson::type() const { return Type::IfcPerson; }
 Type::Enum IfcPerson::Class() { return Type::IfcPerson; }
-IfcPerson::IfcPerson(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcPerson)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcPerson::IfcPerson(boost::optional< IfcIdentifier > v1_Id, boost::optional< IfcLabel > v2_FamilyName, boost::optional< IfcLabel > v3_GivenName, boost::optional< std::vector< IfcLabel > /*[1:?]*/ > v4_MiddleNames, boost::optional< std::vector< IfcLabel > /*[1:?]*/ > v5_PrefixTitles, boost::optional< std::vector< IfcLabel > /*[1:?]*/ > v6_SuffixTitles, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcActorRole > > > v7_Roles, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcAddress > > > v8_Addresses) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Id) { e->setArgument(0,(*v1_Id)); } else { e->setArgument(0); } if (v2_FamilyName) { e->setArgument(1,(*v2_FamilyName)); } else { e->setArgument(1); } if (v3_GivenName) { e->setArgument(2,(*v3_GivenName)); } else { e->setArgument(2); } if (v4_MiddleNames) { e->setArgument(3,(*v4_MiddleNames)); } else { e->setArgument(3); } if (v5_PrefixTitles) { e->setArgument(4,(*v5_PrefixTitles)); } else { e->setArgument(4); } if (v6_SuffixTitles) { e->setArgument(5,(*v6_SuffixTitles)); } else { e->setArgument(5); } if (v7_Roles) { e->setArgument(6,(*v7_Roles)->generalize()); } else { e->setArgument(6); } if (v8_Addresses) { e->setArgument(7,(*v8_Addresses)->generalize()); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
+IfcPerson::IfcPerson(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcPerson)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcPerson::IfcPerson(boost::optional< std::string > v1_Id, boost::optional< std::string > v2_FamilyName, boost::optional< std::string > v3_GivenName, boost::optional< std::vector< std::string > /*[1:?]*/ > v4_MiddleNames, boost::optional< std::vector< std::string > /*[1:?]*/ > v5_PrefixTitles, boost::optional< std::vector< std::string > /*[1:?]*/ > v6_SuffixTitles, boost::optional< IfcTemplatedEntityList< IfcActorRole >::ptr > v7_Roles, boost::optional< IfcTemplatedEntityList< IfcAddress >::ptr > v8_Addresses) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Id) { e->setArgument(0,(*v1_Id)); } else { e->setArgument(0); } if (v2_FamilyName) { e->setArgument(1,(*v2_FamilyName)); } else { e->setArgument(1); } if (v3_GivenName) { e->setArgument(2,(*v3_GivenName)); } else { e->setArgument(2); } if (v4_MiddleNames) { e->setArgument(3,(*v4_MiddleNames)); } else { e->setArgument(3); } if (v5_PrefixTitles) { e->setArgument(4,(*v5_PrefixTitles)); } else { e->setArgument(4); } if (v6_SuffixTitles) { e->setArgument(5,(*v6_SuffixTitles)); } else { e->setArgument(5); } if (v7_Roles) { e->setArgument(6,(*v7_Roles)->generalize()); } else { e->setArgument(6); } if (v8_Addresses) { e->setArgument(7,(*v8_Addresses)->generalize()); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcPersonAndOrganization
-IfcPerson* IfcPersonAndOrganization::ThePerson() { return (IfcPerson*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(0))); }
+IfcPerson* IfcPersonAndOrganization::ThePerson() const { return (IfcPerson*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(0))); }
 void IfcPersonAndOrganization::setThePerson(IfcPerson* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-IfcOrganization* IfcPersonAndOrganization::TheOrganization() { return (IfcOrganization*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(1))); }
+IfcOrganization* IfcPersonAndOrganization::TheOrganization() const { return (IfcOrganization*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(1))); }
 void IfcPersonAndOrganization::setTheOrganization(IfcOrganization* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-bool IfcPersonAndOrganization::hasRoles() { return !entity->getArgument(2)->isNull(); }
-SHARED_PTR< IfcTemplatedEntityList< IfcActorRole > > IfcPersonAndOrganization::Roles() { RETURN_AS_LIST(IfcActorRole,2) }
-void IfcPersonAndOrganization::setRoles(SHARED_PTR< IfcTemplatedEntityList< IfcActorRole > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v->generalize()); }
+bool IfcPersonAndOrganization::hasRoles() const { return !entity->getArgument(2)->isNull(); }
+IfcTemplatedEntityList< IfcActorRole >::ptr IfcPersonAndOrganization::Roles() const { IfcEntityList::ptr es = *entity->getArgument(2); return es->as<IfcActorRole>(); }
+void IfcPersonAndOrganization::setRoles(IfcTemplatedEntityList< IfcActorRole >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v->generalize()); }
 bool IfcPersonAndOrganization::is(Type::Enum v) const { return v == Type::IfcPersonAndOrganization; }
 Type::Enum IfcPersonAndOrganization::type() const { return Type::IfcPersonAndOrganization; }
 Type::Enum IfcPersonAndOrganization::Class() { return Type::IfcPersonAndOrganization; }
-IfcPersonAndOrganization::IfcPersonAndOrganization(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcPersonAndOrganization)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcPersonAndOrganization::IfcPersonAndOrganization(IfcPerson* v1_ThePerson, IfcOrganization* v2_TheOrganization, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcActorRole > > > v3_Roles) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_ThePerson)); e->setArgument(1,(v2_TheOrganization)); if (v3_Roles) { e->setArgument(2,(*v3_Roles)->generalize()); } else { e->setArgument(2); } entity = e; EntityBuffer::Add(this); }
+IfcPersonAndOrganization::IfcPersonAndOrganization(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcPersonAndOrganization)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcPersonAndOrganization::IfcPersonAndOrganization(IfcPerson* v1_ThePerson, IfcOrganization* v2_TheOrganization, boost::optional< IfcTemplatedEntityList< IfcActorRole >::ptr > v3_Roles) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_ThePerson)); e->setArgument(1,(v2_TheOrganization)); if (v3_Roles) { e->setArgument(2,(*v3_Roles)->generalize()); } else { e->setArgument(2); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcPhysicalComplexQuantity
-SHARED_PTR< IfcTemplatedEntityList< IfcPhysicalQuantity > > IfcPhysicalComplexQuantity::HasQuantities() { RETURN_AS_LIST(IfcPhysicalQuantity,2) }
-void IfcPhysicalComplexQuantity::setHasQuantities(SHARED_PTR< IfcTemplatedEntityList< IfcPhysicalQuantity > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v->generalize()); }
-IfcLabel IfcPhysicalComplexQuantity::Discrimination() { return *entity->getArgument(3); }
-void IfcPhysicalComplexQuantity::setDiscrimination(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-bool IfcPhysicalComplexQuantity::hasQuality() { return !entity->getArgument(4)->isNull(); }
-IfcLabel IfcPhysicalComplexQuantity::Quality() { return *entity->getArgument(4); }
-void IfcPhysicalComplexQuantity::setQuality(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-bool IfcPhysicalComplexQuantity::hasUsage() { return !entity->getArgument(5)->isNull(); }
-IfcLabel IfcPhysicalComplexQuantity::Usage() { return *entity->getArgument(5); }
-void IfcPhysicalComplexQuantity::setUsage(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+IfcTemplatedEntityList< IfcPhysicalQuantity >::ptr IfcPhysicalComplexQuantity::HasQuantities() const { IfcEntityList::ptr es = *entity->getArgument(2); return es->as<IfcPhysicalQuantity>(); }
+void IfcPhysicalComplexQuantity::setHasQuantities(IfcTemplatedEntityList< IfcPhysicalQuantity >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v->generalize()); }
+std::string IfcPhysicalComplexQuantity::Discrimination() const { return *entity->getArgument(3); }
+void IfcPhysicalComplexQuantity::setDiscrimination(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+bool IfcPhysicalComplexQuantity::hasQuality() const { return !entity->getArgument(4)->isNull(); }
+std::string IfcPhysicalComplexQuantity::Quality() const { return *entity->getArgument(4); }
+void IfcPhysicalComplexQuantity::setQuality(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+bool IfcPhysicalComplexQuantity::hasUsage() const { return !entity->getArgument(5)->isNull(); }
+std::string IfcPhysicalComplexQuantity::Usage() const { return *entity->getArgument(5); }
+void IfcPhysicalComplexQuantity::setUsage(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
 bool IfcPhysicalComplexQuantity::is(Type::Enum v) const { return v == Type::IfcPhysicalComplexQuantity || IfcPhysicalQuantity::is(v); }
 Type::Enum IfcPhysicalComplexQuantity::type() const { return Type::IfcPhysicalComplexQuantity; }
 Type::Enum IfcPhysicalComplexQuantity::Class() { return Type::IfcPhysicalComplexQuantity; }
-IfcPhysicalComplexQuantity::IfcPhysicalComplexQuantity(IfcAbstractEntityPtr e) : IfcPhysicalQuantity((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcPhysicalComplexQuantity)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcPhysicalComplexQuantity::IfcPhysicalComplexQuantity(IfcLabel v1_Name, boost::optional< IfcText > v2_Description, SHARED_PTR< IfcTemplatedEntityList< IfcPhysicalQuantity > > v3_HasQuantities, IfcLabel v4_Discrimination, boost::optional< IfcLabel > v5_Quality, boost::optional< IfcLabel > v6_Usage) : IfcPhysicalQuantity((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_HasQuantities)->generalize()); e->setArgument(3,(v4_Discrimination)); if (v5_Quality) { e->setArgument(4,(*v5_Quality)); } else { e->setArgument(4); } if (v6_Usage) { e->setArgument(5,(*v6_Usage)); } else { e->setArgument(5); } entity = e; EntityBuffer::Add(this); }
+IfcPhysicalComplexQuantity::IfcPhysicalComplexQuantity(IfcAbstractEntity* e) : IfcPhysicalQuantity((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcPhysicalComplexQuantity)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcPhysicalComplexQuantity::IfcPhysicalComplexQuantity(std::string v1_Name, boost::optional< std::string > v2_Description, IfcTemplatedEntityList< IfcPhysicalQuantity >::ptr v3_HasQuantities, std::string v4_Discrimination, boost::optional< std::string > v5_Quality, boost::optional< std::string > v6_Usage) : IfcPhysicalQuantity((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_HasQuantities)->generalize()); e->setArgument(3,(v4_Discrimination)); if (v5_Quality) { e->setArgument(4,(*v5_Quality)); } else { e->setArgument(4); } if (v6_Usage) { e->setArgument(5,(*v6_Usage)); } else { e->setArgument(5); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcPhysicalQuantity
-IfcLabel IfcPhysicalQuantity::Name() { return *entity->getArgument(0); }
-void IfcPhysicalQuantity::setName(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-bool IfcPhysicalQuantity::hasDescription() { return !entity->getArgument(1)->isNull(); }
-IfcText IfcPhysicalQuantity::Description() { return *entity->getArgument(1); }
-void IfcPhysicalQuantity::setDescription(IfcText v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-IfcPhysicalComplexQuantity::list IfcPhysicalQuantity::PartOfComplex() { RETURN_INVERSE(IfcPhysicalComplexQuantity) }
+std::string IfcPhysicalQuantity::Name() const { return *entity->getArgument(0); }
+void IfcPhysicalQuantity::setName(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+bool IfcPhysicalQuantity::hasDescription() const { return !entity->getArgument(1)->isNull(); }
+std::string IfcPhysicalQuantity::Description() const { return *entity->getArgument(1); }
+void IfcPhysicalQuantity::setDescription(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+IfcPhysicalComplexQuantity::list::ptr IfcPhysicalQuantity::PartOfComplex() const { return entity->getInverse(Type::IfcPhysicalComplexQuantity, 2)->as<IfcPhysicalComplexQuantity>(); }
 bool IfcPhysicalQuantity::is(Type::Enum v) const { return v == Type::IfcPhysicalQuantity; }
 Type::Enum IfcPhysicalQuantity::type() const { return Type::IfcPhysicalQuantity; }
 Type::Enum IfcPhysicalQuantity::Class() { return Type::IfcPhysicalQuantity; }
-IfcPhysicalQuantity::IfcPhysicalQuantity(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcPhysicalQuantity)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcPhysicalQuantity::IfcPhysicalQuantity(IfcLabel v1_Name, boost::optional< IfcText > v2_Description) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } entity = e; EntityBuffer::Add(this); }
+IfcPhysicalQuantity::IfcPhysicalQuantity(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcPhysicalQuantity)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcPhysicalQuantity::IfcPhysicalQuantity(std::string v1_Name, boost::optional< std::string > v2_Description) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcPhysicalSimpleQuantity
-bool IfcPhysicalSimpleQuantity::hasUnit() { return !entity->getArgument(2)->isNull(); }
-IfcNamedUnit* IfcPhysicalSimpleQuantity::Unit() { return (IfcNamedUnit*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(2))); }
+bool IfcPhysicalSimpleQuantity::hasUnit() const { return !entity->getArgument(2)->isNull(); }
+IfcNamedUnit* IfcPhysicalSimpleQuantity::Unit() const { return (IfcNamedUnit*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(2))); }
 void IfcPhysicalSimpleQuantity::setUnit(IfcNamedUnit* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
 bool IfcPhysicalSimpleQuantity::is(Type::Enum v) const { return v == Type::IfcPhysicalSimpleQuantity || IfcPhysicalQuantity::is(v); }
 Type::Enum IfcPhysicalSimpleQuantity::type() const { return Type::IfcPhysicalSimpleQuantity; }
 Type::Enum IfcPhysicalSimpleQuantity::Class() { return Type::IfcPhysicalSimpleQuantity; }
-IfcPhysicalSimpleQuantity::IfcPhysicalSimpleQuantity(IfcAbstractEntityPtr e) : IfcPhysicalQuantity((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcPhysicalSimpleQuantity)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcPhysicalSimpleQuantity::IfcPhysicalSimpleQuantity(IfcLabel v1_Name, boost::optional< IfcText > v2_Description, IfcNamedUnit* v3_Unit) : IfcPhysicalQuantity((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_Unit)); entity = e; EntityBuffer::Add(this); }
+IfcPhysicalSimpleQuantity::IfcPhysicalSimpleQuantity(IfcAbstractEntity* e) : IfcPhysicalQuantity((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcPhysicalSimpleQuantity)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcPhysicalSimpleQuantity::IfcPhysicalSimpleQuantity(std::string v1_Name, boost::optional< std::string > v2_Description, IfcNamedUnit* v3_Unit) : IfcPhysicalQuantity((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_Unit)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcPile
-IfcPileTypeEnum::IfcPileTypeEnum IfcPile::PredefinedType() { return IfcPileTypeEnum::FromString(*entity->getArgument(8)); }
+IfcPileTypeEnum::IfcPileTypeEnum IfcPile::PredefinedType() const { return IfcPileTypeEnum::FromString(*entity->getArgument(8)); }
 void IfcPile::setPredefinedType(IfcPileTypeEnum::IfcPileTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcPileTypeEnum::ToString(v)); }
-bool IfcPile::hasConstructionType() { return !entity->getArgument(9)->isNull(); }
-IfcPileConstructionEnum::IfcPileConstructionEnum IfcPile::ConstructionType() { return IfcPileConstructionEnum::FromString(*entity->getArgument(9)); }
+bool IfcPile::hasConstructionType() const { return !entity->getArgument(9)->isNull(); }
+IfcPileConstructionEnum::IfcPileConstructionEnum IfcPile::ConstructionType() const { return IfcPileConstructionEnum::FromString(*entity->getArgument(9)); }
 void IfcPile::setConstructionType(IfcPileConstructionEnum::IfcPileConstructionEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcPileConstructionEnum::ToString(v)); }
 bool IfcPile::is(Type::Enum v) const { return v == Type::IfcPile || IfcBuildingElement::is(v); }
 Type::Enum IfcPile::type() const { return Type::IfcPile; }
 Type::Enum IfcPile::Class() { return Type::IfcPile; }
-IfcPile::IfcPile(IfcAbstractEntityPtr e) : IfcBuildingElement((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcPile)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcPile::IfcPile(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, IfcPileTypeEnum::IfcPileTypeEnum v9_PredefinedType, boost::optional< IfcPileConstructionEnum::IfcPileConstructionEnum > v10_ConstructionType) : IfcBuildingElement((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } e->setArgument(8,v9_PredefinedType,IfcPileTypeEnum::ToString(v9_PredefinedType)); if (v10_ConstructionType) { e->setArgument(9,*v10_ConstructionType,IfcPileConstructionEnum::ToString(*v10_ConstructionType)); } else { e->setArgument(9); } entity = e; EntityBuffer::Add(this); }
+IfcPile::IfcPile(IfcAbstractEntity* e) : IfcBuildingElement((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcPile)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcPile::IfcPile(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, IfcPileTypeEnum::IfcPileTypeEnum v9_PredefinedType, boost::optional< IfcPileConstructionEnum::IfcPileConstructionEnum > v10_ConstructionType) : IfcBuildingElement((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } e->setArgument(8,v9_PredefinedType,IfcPileTypeEnum::ToString(v9_PredefinedType)); if (v10_ConstructionType) { e->setArgument(9,*v10_ConstructionType,IfcPileConstructionEnum::ToString(*v10_ConstructionType)); } else { e->setArgument(9); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcPipeFittingType
-IfcPipeFittingTypeEnum::IfcPipeFittingTypeEnum IfcPipeFittingType::PredefinedType() { return IfcPipeFittingTypeEnum::FromString(*entity->getArgument(9)); }
+IfcPipeFittingTypeEnum::IfcPipeFittingTypeEnum IfcPipeFittingType::PredefinedType() const { return IfcPipeFittingTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcPipeFittingType::setPredefinedType(IfcPipeFittingTypeEnum::IfcPipeFittingTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcPipeFittingTypeEnum::ToString(v)); }
 bool IfcPipeFittingType::is(Type::Enum v) const { return v == Type::IfcPipeFittingType || IfcFlowFittingType::is(v); }
 Type::Enum IfcPipeFittingType::type() const { return Type::IfcPipeFittingType; }
 Type::Enum IfcPipeFittingType::Class() { return Type::IfcPipeFittingType; }
-IfcPipeFittingType::IfcPipeFittingType(IfcAbstractEntityPtr e) : IfcFlowFittingType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcPipeFittingType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcPipeFittingType::IfcPipeFittingType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcPipeFittingTypeEnum::IfcPipeFittingTypeEnum v10_PredefinedType) : IfcFlowFittingType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcPipeFittingTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcPipeFittingType::IfcPipeFittingType(IfcAbstractEntity* e) : IfcFlowFittingType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcPipeFittingType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcPipeFittingType::IfcPipeFittingType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcPipeFittingTypeEnum::IfcPipeFittingTypeEnum v10_PredefinedType) : IfcFlowFittingType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcPipeFittingTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcPipeSegmentType
-IfcPipeSegmentTypeEnum::IfcPipeSegmentTypeEnum IfcPipeSegmentType::PredefinedType() { return IfcPipeSegmentTypeEnum::FromString(*entity->getArgument(9)); }
+IfcPipeSegmentTypeEnum::IfcPipeSegmentTypeEnum IfcPipeSegmentType::PredefinedType() const { return IfcPipeSegmentTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcPipeSegmentType::setPredefinedType(IfcPipeSegmentTypeEnum::IfcPipeSegmentTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcPipeSegmentTypeEnum::ToString(v)); }
 bool IfcPipeSegmentType::is(Type::Enum v) const { return v == Type::IfcPipeSegmentType || IfcFlowSegmentType::is(v); }
 Type::Enum IfcPipeSegmentType::type() const { return Type::IfcPipeSegmentType; }
 Type::Enum IfcPipeSegmentType::Class() { return Type::IfcPipeSegmentType; }
-IfcPipeSegmentType::IfcPipeSegmentType(IfcAbstractEntityPtr e) : IfcFlowSegmentType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcPipeSegmentType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcPipeSegmentType::IfcPipeSegmentType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcPipeSegmentTypeEnum::IfcPipeSegmentTypeEnum v10_PredefinedType) : IfcFlowSegmentType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcPipeSegmentTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcPipeSegmentType::IfcPipeSegmentType(IfcAbstractEntity* e) : IfcFlowSegmentType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcPipeSegmentType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcPipeSegmentType::IfcPipeSegmentType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcPipeSegmentTypeEnum::IfcPipeSegmentTypeEnum v10_PredefinedType) : IfcFlowSegmentType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcPipeSegmentTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcPixelTexture
-IfcInteger IfcPixelTexture::Width() { return *entity->getArgument(4); }
-void IfcPixelTexture::setWidth(IfcInteger v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-IfcInteger IfcPixelTexture::Height() { return *entity->getArgument(5); }
-void IfcPixelTexture::setHeight(IfcInteger v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-IfcInteger IfcPixelTexture::ColourComponents() { return *entity->getArgument(6); }
-void IfcPixelTexture::setColourComponents(IfcInteger v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
+int IfcPixelTexture::Width() const { return *entity->getArgument(4); }
+void IfcPixelTexture::setWidth(int v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+int IfcPixelTexture::Height() const { return *entity->getArgument(5); }
+void IfcPixelTexture::setHeight(int v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+int IfcPixelTexture::ColourComponents() const { return *entity->getArgument(6); }
+void IfcPixelTexture::setColourComponents(int v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
 bool IfcPixelTexture::is(Type::Enum v) const { return v == Type::IfcPixelTexture || IfcSurfaceTexture::is(v); }
 Type::Enum IfcPixelTexture::type() const { return Type::IfcPixelTexture; }
 Type::Enum IfcPixelTexture::Class() { return Type::IfcPixelTexture; }
-IfcPixelTexture::IfcPixelTexture(IfcAbstractEntityPtr e) : IfcSurfaceTexture((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcPixelTexture)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcPixelTexture::IfcPixelTexture(bool v1_RepeatS, bool v2_RepeatT, IfcSurfaceTextureEnum::IfcSurfaceTextureEnum v3_TextureType, IfcCartesianTransformationOperator2D* v4_TextureTransform, IfcInteger v5_Width, IfcInteger v6_Height, IfcInteger v7_ColourComponents) : IfcSurfaceTexture((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_RepeatS)); e->setArgument(1,(v2_RepeatT)); e->setArgument(2,v3_TextureType,IfcSurfaceTextureEnum::ToString(v3_TextureType)); e->setArgument(3,(v4_TextureTransform)); e->setArgument(4,(v5_Width)); e->setArgument(5,(v6_Height)); e->setArgument(6,(v7_ColourComponents)); entity = e; EntityBuffer::Add(this); }
+IfcPixelTexture::IfcPixelTexture(IfcAbstractEntity* e) : IfcSurfaceTexture((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcPixelTexture)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcPixelTexture::IfcPixelTexture(bool v1_RepeatS, bool v2_RepeatT, IfcSurfaceTextureEnum::IfcSurfaceTextureEnum v3_TextureType, IfcCartesianTransformationOperator2D* v4_TextureTransform, int v5_Width, int v6_Height, int v7_ColourComponents) : IfcSurfaceTexture((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_RepeatS)); e->setArgument(1,(v2_RepeatT)); e->setArgument(2,v3_TextureType,IfcSurfaceTextureEnum::ToString(v3_TextureType)); e->setArgument(3,(v4_TextureTransform)); e->setArgument(4,(v5_Width)); e->setArgument(5,(v6_Height)); e->setArgument(6,(v7_ColourComponents)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcPlacement
-IfcCartesianPoint* IfcPlacement::Location() { return (IfcCartesianPoint*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(0))); }
+IfcCartesianPoint* IfcPlacement::Location() const { return (IfcCartesianPoint*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(0))); }
 void IfcPlacement::setLocation(IfcCartesianPoint* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
 bool IfcPlacement::is(Type::Enum v) const { return v == Type::IfcPlacement || IfcGeometricRepresentationItem::is(v); }
 Type::Enum IfcPlacement::type() const { return Type::IfcPlacement; }
 Type::Enum IfcPlacement::Class() { return Type::IfcPlacement; }
-IfcPlacement::IfcPlacement(IfcAbstractEntityPtr e) : IfcGeometricRepresentationItem((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcPlacement)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcPlacement::IfcPlacement(IfcCartesianPoint* v1_Location) : IfcGeometricRepresentationItem((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Location)); entity = e; EntityBuffer::Add(this); }
+IfcPlacement::IfcPlacement(IfcAbstractEntity* e) : IfcGeometricRepresentationItem((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcPlacement)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcPlacement::IfcPlacement(IfcCartesianPoint* v1_Location) : IfcGeometricRepresentationItem((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Location)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcPlanarBox
-IfcAxis2Placement IfcPlanarBox::Placement() { return *entity->getArgument(2); }
-void IfcPlanarBox::setPlacement(IfcAxis2Placement v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+IfcAxis2Placement* IfcPlanarBox::Placement() const { return (IfcAxis2Placement*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(2))); }
+void IfcPlanarBox::setPlacement(IfcAxis2Placement* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
 bool IfcPlanarBox::is(Type::Enum v) const { return v == Type::IfcPlanarBox || IfcPlanarExtent::is(v); }
 Type::Enum IfcPlanarBox::type() const { return Type::IfcPlanarBox; }
 Type::Enum IfcPlanarBox::Class() { return Type::IfcPlanarBox; }
-IfcPlanarBox::IfcPlanarBox(IfcAbstractEntityPtr e) : IfcPlanarExtent((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcPlanarBox)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcPlanarBox::IfcPlanarBox(IfcLengthMeasure v1_SizeInX, IfcLengthMeasure v2_SizeInY, IfcAxis2Placement v3_Placement) : IfcPlanarExtent((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_SizeInX)); e->setArgument(1,(v2_SizeInY)); e->setArgument(2,(v3_Placement)); entity = e; EntityBuffer::Add(this); }
+IfcPlanarBox::IfcPlanarBox(IfcAbstractEntity* e) : IfcPlanarExtent((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcPlanarBox)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcPlanarBox::IfcPlanarBox(double v1_SizeInX, double v2_SizeInY, IfcAxis2Placement* v3_Placement) : IfcPlanarExtent((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_SizeInX)); e->setArgument(1,(v2_SizeInY)); e->setArgument(2,(v3_Placement)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcPlanarExtent
-IfcLengthMeasure IfcPlanarExtent::SizeInX() { return *entity->getArgument(0); }
-void IfcPlanarExtent::setSizeInX(IfcLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-IfcLengthMeasure IfcPlanarExtent::SizeInY() { return *entity->getArgument(1); }
-void IfcPlanarExtent::setSizeInY(IfcLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+double IfcPlanarExtent::SizeInX() const { return *entity->getArgument(0); }
+void IfcPlanarExtent::setSizeInX(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+double IfcPlanarExtent::SizeInY() const { return *entity->getArgument(1); }
+void IfcPlanarExtent::setSizeInY(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
 bool IfcPlanarExtent::is(Type::Enum v) const { return v == Type::IfcPlanarExtent || IfcGeometricRepresentationItem::is(v); }
 Type::Enum IfcPlanarExtent::type() const { return Type::IfcPlanarExtent; }
 Type::Enum IfcPlanarExtent::Class() { return Type::IfcPlanarExtent; }
-IfcPlanarExtent::IfcPlanarExtent(IfcAbstractEntityPtr e) : IfcGeometricRepresentationItem((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcPlanarExtent)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcPlanarExtent::IfcPlanarExtent(IfcLengthMeasure v1_SizeInX, IfcLengthMeasure v2_SizeInY) : IfcGeometricRepresentationItem((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_SizeInX)); e->setArgument(1,(v2_SizeInY)); entity = e; EntityBuffer::Add(this); }
+IfcPlanarExtent::IfcPlanarExtent(IfcAbstractEntity* e) : IfcGeometricRepresentationItem((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcPlanarExtent)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcPlanarExtent::IfcPlanarExtent(double v1_SizeInX, double v2_SizeInY) : IfcGeometricRepresentationItem((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_SizeInX)); e->setArgument(1,(v2_SizeInY)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcPlane
 bool IfcPlane::is(Type::Enum v) const { return v == Type::IfcPlane || IfcElementarySurface::is(v); }
 Type::Enum IfcPlane::type() const { return Type::IfcPlane; }
 Type::Enum IfcPlane::Class() { return Type::IfcPlane; }
-IfcPlane::IfcPlane(IfcAbstractEntityPtr e) : IfcElementarySurface((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcPlane)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcPlane::IfcPlane(IfcAxis2Placement3D* v1_Position) : IfcElementarySurface((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Position)); entity = e; EntityBuffer::Add(this); }
+IfcPlane::IfcPlane(IfcAbstractEntity* e) : IfcElementarySurface((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcPlane)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcPlane::IfcPlane(IfcAxis2Placement3D* v1_Position) : IfcElementarySurface((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Position)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcPlate
 bool IfcPlate::is(Type::Enum v) const { return v == Type::IfcPlate || IfcBuildingElement::is(v); }
 Type::Enum IfcPlate::type() const { return Type::IfcPlate; }
 Type::Enum IfcPlate::Class() { return Type::IfcPlate; }
-IfcPlate::IfcPlate(IfcAbstractEntityPtr e) : IfcBuildingElement((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcPlate)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcPlate::IfcPlate(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag) : IfcBuildingElement((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
+IfcPlate::IfcPlate(IfcAbstractEntity* e) : IfcBuildingElement((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcPlate)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcPlate::IfcPlate(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag) : IfcBuildingElement((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcPlateType
-IfcPlateTypeEnum::IfcPlateTypeEnum IfcPlateType::PredefinedType() { return IfcPlateTypeEnum::FromString(*entity->getArgument(9)); }
+IfcPlateTypeEnum::IfcPlateTypeEnum IfcPlateType::PredefinedType() const { return IfcPlateTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcPlateType::setPredefinedType(IfcPlateTypeEnum::IfcPlateTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcPlateTypeEnum::ToString(v)); }
 bool IfcPlateType::is(Type::Enum v) const { return v == Type::IfcPlateType || IfcBuildingElementType::is(v); }
 Type::Enum IfcPlateType::type() const { return Type::IfcPlateType; }
 Type::Enum IfcPlateType::Class() { return Type::IfcPlateType; }
-IfcPlateType::IfcPlateType(IfcAbstractEntityPtr e) : IfcBuildingElementType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcPlateType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcPlateType::IfcPlateType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcPlateTypeEnum::IfcPlateTypeEnum v10_PredefinedType) : IfcBuildingElementType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcPlateTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcPlateType::IfcPlateType(IfcAbstractEntity* e) : IfcBuildingElementType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcPlateType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcPlateType::IfcPlateType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcPlateTypeEnum::IfcPlateTypeEnum v10_PredefinedType) : IfcBuildingElementType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcPlateTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcPoint
 bool IfcPoint::is(Type::Enum v) const { return v == Type::IfcPoint || IfcGeometricRepresentationItem::is(v); }
 Type::Enum IfcPoint::type() const { return Type::IfcPoint; }
 Type::Enum IfcPoint::Class() { return Type::IfcPoint; }
-IfcPoint::IfcPoint(IfcAbstractEntityPtr e) : IfcGeometricRepresentationItem((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcPoint)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcPoint::IfcPoint() : IfcGeometricRepresentationItem((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); entity = e; EntityBuffer::Add(this); }
+IfcPoint::IfcPoint(IfcAbstractEntity* e) : IfcGeometricRepresentationItem((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcPoint)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcPoint::IfcPoint() : IfcGeometricRepresentationItem((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcPointOnCurve
-IfcCurve* IfcPointOnCurve::BasisCurve() { return (IfcCurve*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(0))); }
+IfcCurve* IfcPointOnCurve::BasisCurve() const { return (IfcCurve*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(0))); }
 void IfcPointOnCurve::setBasisCurve(IfcCurve* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-IfcParameterValue IfcPointOnCurve::PointParameter() { return *entity->getArgument(1); }
-void IfcPointOnCurve::setPointParameter(IfcParameterValue v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+double IfcPointOnCurve::PointParameter() const { return *entity->getArgument(1); }
+void IfcPointOnCurve::setPointParameter(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
 bool IfcPointOnCurve::is(Type::Enum v) const { return v == Type::IfcPointOnCurve || IfcPoint::is(v); }
 Type::Enum IfcPointOnCurve::type() const { return Type::IfcPointOnCurve; }
 Type::Enum IfcPointOnCurve::Class() { return Type::IfcPointOnCurve; }
-IfcPointOnCurve::IfcPointOnCurve(IfcAbstractEntityPtr e) : IfcPoint((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcPointOnCurve)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcPointOnCurve::IfcPointOnCurve(IfcCurve* v1_BasisCurve, IfcParameterValue v2_PointParameter) : IfcPoint((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_BasisCurve)); e->setArgument(1,(v2_PointParameter)); entity = e; EntityBuffer::Add(this); }
+IfcPointOnCurve::IfcPointOnCurve(IfcAbstractEntity* e) : IfcPoint((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcPointOnCurve)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcPointOnCurve::IfcPointOnCurve(IfcCurve* v1_BasisCurve, double v2_PointParameter) : IfcPoint((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_BasisCurve)); e->setArgument(1,(v2_PointParameter)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcPointOnSurface
-IfcSurface* IfcPointOnSurface::BasisSurface() { return (IfcSurface*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(0))); }
+IfcSurface* IfcPointOnSurface::BasisSurface() const { return (IfcSurface*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(0))); }
 void IfcPointOnSurface::setBasisSurface(IfcSurface* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-IfcParameterValue IfcPointOnSurface::PointParameterU() { return *entity->getArgument(1); }
-void IfcPointOnSurface::setPointParameterU(IfcParameterValue v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-IfcParameterValue IfcPointOnSurface::PointParameterV() { return *entity->getArgument(2); }
-void IfcPointOnSurface::setPointParameterV(IfcParameterValue v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+double IfcPointOnSurface::PointParameterU() const { return *entity->getArgument(1); }
+void IfcPointOnSurface::setPointParameterU(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+double IfcPointOnSurface::PointParameterV() const { return *entity->getArgument(2); }
+void IfcPointOnSurface::setPointParameterV(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
 bool IfcPointOnSurface::is(Type::Enum v) const { return v == Type::IfcPointOnSurface || IfcPoint::is(v); }
 Type::Enum IfcPointOnSurface::type() const { return Type::IfcPointOnSurface; }
 Type::Enum IfcPointOnSurface::Class() { return Type::IfcPointOnSurface; }
-IfcPointOnSurface::IfcPointOnSurface(IfcAbstractEntityPtr e) : IfcPoint((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcPointOnSurface)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcPointOnSurface::IfcPointOnSurface(IfcSurface* v1_BasisSurface, IfcParameterValue v2_PointParameterU, IfcParameterValue v3_PointParameterV) : IfcPoint((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_BasisSurface)); e->setArgument(1,(v2_PointParameterU)); e->setArgument(2,(v3_PointParameterV)); entity = e; EntityBuffer::Add(this); }
+IfcPointOnSurface::IfcPointOnSurface(IfcAbstractEntity* e) : IfcPoint((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcPointOnSurface)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcPointOnSurface::IfcPointOnSurface(IfcSurface* v1_BasisSurface, double v2_PointParameterU, double v3_PointParameterV) : IfcPoint((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_BasisSurface)); e->setArgument(1,(v2_PointParameterU)); e->setArgument(2,(v3_PointParameterV)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcPolyLoop
-SHARED_PTR< IfcTemplatedEntityList< IfcCartesianPoint > > IfcPolyLoop::Polygon() { RETURN_AS_LIST(IfcCartesianPoint,0) }
-void IfcPolyLoop::setPolygon(SHARED_PTR< IfcTemplatedEntityList< IfcCartesianPoint > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v->generalize()); }
+IfcTemplatedEntityList< IfcCartesianPoint >::ptr IfcPolyLoop::Polygon() const { IfcEntityList::ptr es = *entity->getArgument(0); return es->as<IfcCartesianPoint>(); }
+void IfcPolyLoop::setPolygon(IfcTemplatedEntityList< IfcCartesianPoint >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v->generalize()); }
 bool IfcPolyLoop::is(Type::Enum v) const { return v == Type::IfcPolyLoop || IfcLoop::is(v); }
 Type::Enum IfcPolyLoop::type() const { return Type::IfcPolyLoop; }
 Type::Enum IfcPolyLoop::Class() { return Type::IfcPolyLoop; }
-IfcPolyLoop::IfcPolyLoop(IfcAbstractEntityPtr e) : IfcLoop((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcPolyLoop)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcPolyLoop::IfcPolyLoop(SHARED_PTR< IfcTemplatedEntityList< IfcCartesianPoint > > v1_Polygon) : IfcLoop((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Polygon)->generalize()); entity = e; EntityBuffer::Add(this); }
+IfcPolyLoop::IfcPolyLoop(IfcAbstractEntity* e) : IfcLoop((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcPolyLoop)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcPolyLoop::IfcPolyLoop(IfcTemplatedEntityList< IfcCartesianPoint >::ptr v1_Polygon) : IfcLoop((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Polygon)->generalize()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcPolygonalBoundedHalfSpace
-IfcAxis2Placement3D* IfcPolygonalBoundedHalfSpace::Position() { return (IfcAxis2Placement3D*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(2))); }
+IfcAxis2Placement3D* IfcPolygonalBoundedHalfSpace::Position() const { return (IfcAxis2Placement3D*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(2))); }
 void IfcPolygonalBoundedHalfSpace::setPosition(IfcAxis2Placement3D* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-IfcBoundedCurve* IfcPolygonalBoundedHalfSpace::PolygonalBoundary() { return (IfcBoundedCurve*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(3))); }
+IfcBoundedCurve* IfcPolygonalBoundedHalfSpace::PolygonalBoundary() const { return (IfcBoundedCurve*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(3))); }
 void IfcPolygonalBoundedHalfSpace::setPolygonalBoundary(IfcBoundedCurve* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
 bool IfcPolygonalBoundedHalfSpace::is(Type::Enum v) const { return v == Type::IfcPolygonalBoundedHalfSpace || IfcHalfSpaceSolid::is(v); }
 Type::Enum IfcPolygonalBoundedHalfSpace::type() const { return Type::IfcPolygonalBoundedHalfSpace; }
 Type::Enum IfcPolygonalBoundedHalfSpace::Class() { return Type::IfcPolygonalBoundedHalfSpace; }
-IfcPolygonalBoundedHalfSpace::IfcPolygonalBoundedHalfSpace(IfcAbstractEntityPtr e) : IfcHalfSpaceSolid((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcPolygonalBoundedHalfSpace)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcPolygonalBoundedHalfSpace::IfcPolygonalBoundedHalfSpace(IfcSurface* v1_BaseSurface, bool v2_AgreementFlag, IfcAxis2Placement3D* v3_Position, IfcBoundedCurve* v4_PolygonalBoundary) : IfcHalfSpaceSolid((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_BaseSurface)); e->setArgument(1,(v2_AgreementFlag)); e->setArgument(2,(v3_Position)); e->setArgument(3,(v4_PolygonalBoundary)); entity = e; EntityBuffer::Add(this); }
+IfcPolygonalBoundedHalfSpace::IfcPolygonalBoundedHalfSpace(IfcAbstractEntity* e) : IfcHalfSpaceSolid((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcPolygonalBoundedHalfSpace)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcPolygonalBoundedHalfSpace::IfcPolygonalBoundedHalfSpace(IfcSurface* v1_BaseSurface, bool v2_AgreementFlag, IfcAxis2Placement3D* v3_Position, IfcBoundedCurve* v4_PolygonalBoundary) : IfcHalfSpaceSolid((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_BaseSurface)); e->setArgument(1,(v2_AgreementFlag)); e->setArgument(2,(v3_Position)); e->setArgument(3,(v4_PolygonalBoundary)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcPolyline
-SHARED_PTR< IfcTemplatedEntityList< IfcCartesianPoint > > IfcPolyline::Points() { RETURN_AS_LIST(IfcCartesianPoint,0) }
-void IfcPolyline::setPoints(SHARED_PTR< IfcTemplatedEntityList< IfcCartesianPoint > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v->generalize()); }
+IfcTemplatedEntityList< IfcCartesianPoint >::ptr IfcPolyline::Points() const { IfcEntityList::ptr es = *entity->getArgument(0); return es->as<IfcCartesianPoint>(); }
+void IfcPolyline::setPoints(IfcTemplatedEntityList< IfcCartesianPoint >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v->generalize()); }
 bool IfcPolyline::is(Type::Enum v) const { return v == Type::IfcPolyline || IfcBoundedCurve::is(v); }
 Type::Enum IfcPolyline::type() const { return Type::IfcPolyline; }
 Type::Enum IfcPolyline::Class() { return Type::IfcPolyline; }
-IfcPolyline::IfcPolyline(IfcAbstractEntityPtr e) : IfcBoundedCurve((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcPolyline)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcPolyline::IfcPolyline(SHARED_PTR< IfcTemplatedEntityList< IfcCartesianPoint > > v1_Points) : IfcBoundedCurve((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Points)->generalize()); entity = e; EntityBuffer::Add(this); }
+IfcPolyline::IfcPolyline(IfcAbstractEntity* e) : IfcBoundedCurve((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcPolyline)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcPolyline::IfcPolyline(IfcTemplatedEntityList< IfcCartesianPoint >::ptr v1_Points) : IfcBoundedCurve((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Points)->generalize()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcPort
-IfcRelConnectsPortToElement::list IfcPort::ContainedIn() { RETURN_INVERSE(IfcRelConnectsPortToElement) }
-IfcRelConnectsPorts::list IfcPort::ConnectedFrom() { RETURN_INVERSE(IfcRelConnectsPorts) }
-IfcRelConnectsPorts::list IfcPort::ConnectedTo() { RETURN_INVERSE(IfcRelConnectsPorts) }
+IfcRelConnectsPortToElement::list::ptr IfcPort::ContainedIn() const { return entity->getInverse(Type::IfcRelConnectsPortToElement, 4)->as<IfcRelConnectsPortToElement>(); }
+IfcRelConnectsPorts::list::ptr IfcPort::ConnectedFrom() const { return entity->getInverse(Type::IfcRelConnectsPorts, 5)->as<IfcRelConnectsPorts>(); }
+IfcRelConnectsPorts::list::ptr IfcPort::ConnectedTo() const { return entity->getInverse(Type::IfcRelConnectsPorts, 4)->as<IfcRelConnectsPorts>(); }
 bool IfcPort::is(Type::Enum v) const { return v == Type::IfcPort || IfcProduct::is(v); }
 Type::Enum IfcPort::type() const { return Type::IfcPort; }
 Type::Enum IfcPort::Class() { return Type::IfcPort; }
-IfcPort::IfcPort(IfcAbstractEntityPtr e) : IfcProduct((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcPort)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcPort::IfcPort(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation) : IfcProduct((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); entity = e; EntityBuffer::Add(this); }
+IfcPort::IfcPort(IfcAbstractEntity* e) : IfcProduct((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcPort)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcPort::IfcPort(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation) : IfcProduct((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcPostalAddress
-bool IfcPostalAddress::hasInternalLocation() { return !entity->getArgument(3)->isNull(); }
-IfcLabel IfcPostalAddress::InternalLocation() { return *entity->getArgument(3); }
-void IfcPostalAddress::setInternalLocation(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-bool IfcPostalAddress::hasAddressLines() { return !entity->getArgument(4)->isNull(); }
-std::vector< IfcLabel > /*[1:?]*/ IfcPostalAddress::AddressLines() { return *entity->getArgument(4); }
-void IfcPostalAddress::setAddressLines(std::vector< IfcLabel > /*[1:?]*/ v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-bool IfcPostalAddress::hasPostalBox() { return !entity->getArgument(5)->isNull(); }
-IfcLabel IfcPostalAddress::PostalBox() { return *entity->getArgument(5); }
-void IfcPostalAddress::setPostalBox(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-bool IfcPostalAddress::hasTown() { return !entity->getArgument(6)->isNull(); }
-IfcLabel IfcPostalAddress::Town() { return *entity->getArgument(6); }
-void IfcPostalAddress::setTown(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
-bool IfcPostalAddress::hasRegion() { return !entity->getArgument(7)->isNull(); }
-IfcLabel IfcPostalAddress::Region() { return *entity->getArgument(7); }
-void IfcPostalAddress::setRegion(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
-bool IfcPostalAddress::hasPostalCode() { return !entity->getArgument(8)->isNull(); }
-IfcLabel IfcPostalAddress::PostalCode() { return *entity->getArgument(8); }
-void IfcPostalAddress::setPostalCode(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
-bool IfcPostalAddress::hasCountry() { return !entity->getArgument(9)->isNull(); }
-IfcLabel IfcPostalAddress::Country() { return *entity->getArgument(9); }
-void IfcPostalAddress::setCountry(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
+bool IfcPostalAddress::hasInternalLocation() const { return !entity->getArgument(3)->isNull(); }
+std::string IfcPostalAddress::InternalLocation() const { return *entity->getArgument(3); }
+void IfcPostalAddress::setInternalLocation(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+bool IfcPostalAddress::hasAddressLines() const { return !entity->getArgument(4)->isNull(); }
+std::vector< std::string > /*[1:?]*/ IfcPostalAddress::AddressLines() const { return *entity->getArgument(4); }
+void IfcPostalAddress::setAddressLines(std::vector< std::string > /*[1:?]*/ v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+bool IfcPostalAddress::hasPostalBox() const { return !entity->getArgument(5)->isNull(); }
+std::string IfcPostalAddress::PostalBox() const { return *entity->getArgument(5); }
+void IfcPostalAddress::setPostalBox(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+bool IfcPostalAddress::hasTown() const { return !entity->getArgument(6)->isNull(); }
+std::string IfcPostalAddress::Town() const { return *entity->getArgument(6); }
+void IfcPostalAddress::setTown(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
+bool IfcPostalAddress::hasRegion() const { return !entity->getArgument(7)->isNull(); }
+std::string IfcPostalAddress::Region() const { return *entity->getArgument(7); }
+void IfcPostalAddress::setRegion(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
+bool IfcPostalAddress::hasPostalCode() const { return !entity->getArgument(8)->isNull(); }
+std::string IfcPostalAddress::PostalCode() const { return *entity->getArgument(8); }
+void IfcPostalAddress::setPostalCode(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
+bool IfcPostalAddress::hasCountry() const { return !entity->getArgument(9)->isNull(); }
+std::string IfcPostalAddress::Country() const { return *entity->getArgument(9); }
+void IfcPostalAddress::setCountry(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
 bool IfcPostalAddress::is(Type::Enum v) const { return v == Type::IfcPostalAddress || IfcAddress::is(v); }
 Type::Enum IfcPostalAddress::type() const { return Type::IfcPostalAddress; }
 Type::Enum IfcPostalAddress::Class() { return Type::IfcPostalAddress; }
-IfcPostalAddress::IfcPostalAddress(IfcAbstractEntityPtr e) : IfcAddress((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcPostalAddress)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcPostalAddress::IfcPostalAddress(boost::optional< IfcAddressTypeEnum::IfcAddressTypeEnum > v1_Purpose, boost::optional< IfcText > v2_Description, boost::optional< IfcLabel > v3_UserDefinedPurpose, boost::optional< IfcLabel > v4_InternalLocation, boost::optional< std::vector< IfcLabel > /*[1:?]*/ > v5_AddressLines, boost::optional< IfcLabel > v6_PostalBox, boost::optional< IfcLabel > v7_Town, boost::optional< IfcLabel > v8_Region, boost::optional< IfcLabel > v9_PostalCode, boost::optional< IfcLabel > v10_Country) : IfcAddress((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Purpose) { e->setArgument(0,*v1_Purpose,IfcAddressTypeEnum::ToString(*v1_Purpose)); } else { e->setArgument(0); } if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } if (v3_UserDefinedPurpose) { e->setArgument(2,(*v3_UserDefinedPurpose)); } else { e->setArgument(2); } if (v4_InternalLocation) { e->setArgument(3,(*v4_InternalLocation)); } else { e->setArgument(3); } if (v5_AddressLines) { e->setArgument(4,(*v5_AddressLines)); } else { e->setArgument(4); } if (v6_PostalBox) { e->setArgument(5,(*v6_PostalBox)); } else { e->setArgument(5); } if (v7_Town) { e->setArgument(6,(*v7_Town)); } else { e->setArgument(6); } if (v8_Region) { e->setArgument(7,(*v8_Region)); } else { e->setArgument(7); } if (v9_PostalCode) { e->setArgument(8,(*v9_PostalCode)); } else { e->setArgument(8); } if (v10_Country) { e->setArgument(9,(*v10_Country)); } else { e->setArgument(9); } entity = e; EntityBuffer::Add(this); }
+IfcPostalAddress::IfcPostalAddress(IfcAbstractEntity* e) : IfcAddress((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcPostalAddress)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcPostalAddress::IfcPostalAddress(boost::optional< IfcAddressTypeEnum::IfcAddressTypeEnum > v1_Purpose, boost::optional< std::string > v2_Description, boost::optional< std::string > v3_UserDefinedPurpose, boost::optional< std::string > v4_InternalLocation, boost::optional< std::vector< std::string > /*[1:?]*/ > v5_AddressLines, boost::optional< std::string > v6_PostalBox, boost::optional< std::string > v7_Town, boost::optional< std::string > v8_Region, boost::optional< std::string > v9_PostalCode, boost::optional< std::string > v10_Country) : IfcAddress((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Purpose) { e->setArgument(0,*v1_Purpose,IfcAddressTypeEnum::ToString(*v1_Purpose)); } else { e->setArgument(0); } if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } if (v3_UserDefinedPurpose) { e->setArgument(2,(*v3_UserDefinedPurpose)); } else { e->setArgument(2); } if (v4_InternalLocation) { e->setArgument(3,(*v4_InternalLocation)); } else { e->setArgument(3); } if (v5_AddressLines) { e->setArgument(4,(*v5_AddressLines)); } else { e->setArgument(4); } if (v6_PostalBox) { e->setArgument(5,(*v6_PostalBox)); } else { e->setArgument(5); } if (v7_Town) { e->setArgument(6,(*v7_Town)); } else { e->setArgument(6); } if (v8_Region) { e->setArgument(7,(*v8_Region)); } else { e->setArgument(7); } if (v9_PostalCode) { e->setArgument(8,(*v9_PostalCode)); } else { e->setArgument(8); } if (v10_Country) { e->setArgument(9,(*v10_Country)); } else { e->setArgument(9); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcPreDefinedColour
 bool IfcPreDefinedColour::is(Type::Enum v) const { return v == Type::IfcPreDefinedColour || IfcPreDefinedItem::is(v); }
 Type::Enum IfcPreDefinedColour::type() const { return Type::IfcPreDefinedColour; }
 Type::Enum IfcPreDefinedColour::Class() { return Type::IfcPreDefinedColour; }
-IfcPreDefinedColour::IfcPreDefinedColour(IfcAbstractEntityPtr e) : IfcPreDefinedItem((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcPreDefinedColour)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcPreDefinedColour::IfcPreDefinedColour(IfcLabel v1_Name) : IfcPreDefinedItem((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); entity = e; EntityBuffer::Add(this); }
+IfcPreDefinedColour::IfcPreDefinedColour(IfcAbstractEntity* e) : IfcPreDefinedItem((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcPreDefinedColour)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcPreDefinedColour::IfcPreDefinedColour(std::string v1_Name) : IfcPreDefinedItem((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcPreDefinedCurveFont
 bool IfcPreDefinedCurveFont::is(Type::Enum v) const { return v == Type::IfcPreDefinedCurveFont || IfcPreDefinedItem::is(v); }
 Type::Enum IfcPreDefinedCurveFont::type() const { return Type::IfcPreDefinedCurveFont; }
 Type::Enum IfcPreDefinedCurveFont::Class() { return Type::IfcPreDefinedCurveFont; }
-IfcPreDefinedCurveFont::IfcPreDefinedCurveFont(IfcAbstractEntityPtr e) : IfcPreDefinedItem((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcPreDefinedCurveFont)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcPreDefinedCurveFont::IfcPreDefinedCurveFont(IfcLabel v1_Name) : IfcPreDefinedItem((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); entity = e; EntityBuffer::Add(this); }
+IfcPreDefinedCurveFont::IfcPreDefinedCurveFont(IfcAbstractEntity* e) : IfcPreDefinedItem((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcPreDefinedCurveFont)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcPreDefinedCurveFont::IfcPreDefinedCurveFont(std::string v1_Name) : IfcPreDefinedItem((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcPreDefinedDimensionSymbol
 bool IfcPreDefinedDimensionSymbol::is(Type::Enum v) const { return v == Type::IfcPreDefinedDimensionSymbol || IfcPreDefinedSymbol::is(v); }
 Type::Enum IfcPreDefinedDimensionSymbol::type() const { return Type::IfcPreDefinedDimensionSymbol; }
 Type::Enum IfcPreDefinedDimensionSymbol::Class() { return Type::IfcPreDefinedDimensionSymbol; }
-IfcPreDefinedDimensionSymbol::IfcPreDefinedDimensionSymbol(IfcAbstractEntityPtr e) : IfcPreDefinedSymbol((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcPreDefinedDimensionSymbol)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcPreDefinedDimensionSymbol::IfcPreDefinedDimensionSymbol(IfcLabel v1_Name) : IfcPreDefinedSymbol((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); entity = e; EntityBuffer::Add(this); }
+IfcPreDefinedDimensionSymbol::IfcPreDefinedDimensionSymbol(IfcAbstractEntity* e) : IfcPreDefinedSymbol((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcPreDefinedDimensionSymbol)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcPreDefinedDimensionSymbol::IfcPreDefinedDimensionSymbol(std::string v1_Name) : IfcPreDefinedSymbol((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcPreDefinedItem
-IfcLabel IfcPreDefinedItem::Name() { return *entity->getArgument(0); }
-void IfcPreDefinedItem::setName(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+std::string IfcPreDefinedItem::Name() const { return *entity->getArgument(0); }
+void IfcPreDefinedItem::setName(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
 bool IfcPreDefinedItem::is(Type::Enum v) const { return v == Type::IfcPreDefinedItem; }
 Type::Enum IfcPreDefinedItem::type() const { return Type::IfcPreDefinedItem; }
 Type::Enum IfcPreDefinedItem::Class() { return Type::IfcPreDefinedItem; }
-IfcPreDefinedItem::IfcPreDefinedItem(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcPreDefinedItem)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcPreDefinedItem::IfcPreDefinedItem(IfcLabel v1_Name) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); entity = e; EntityBuffer::Add(this); }
+IfcPreDefinedItem::IfcPreDefinedItem(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcPreDefinedItem)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcPreDefinedItem::IfcPreDefinedItem(std::string v1_Name) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcPreDefinedPointMarkerSymbol
 bool IfcPreDefinedPointMarkerSymbol::is(Type::Enum v) const { return v == Type::IfcPreDefinedPointMarkerSymbol || IfcPreDefinedSymbol::is(v); }
 Type::Enum IfcPreDefinedPointMarkerSymbol::type() const { return Type::IfcPreDefinedPointMarkerSymbol; }
 Type::Enum IfcPreDefinedPointMarkerSymbol::Class() { return Type::IfcPreDefinedPointMarkerSymbol; }
-IfcPreDefinedPointMarkerSymbol::IfcPreDefinedPointMarkerSymbol(IfcAbstractEntityPtr e) : IfcPreDefinedSymbol((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcPreDefinedPointMarkerSymbol)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcPreDefinedPointMarkerSymbol::IfcPreDefinedPointMarkerSymbol(IfcLabel v1_Name) : IfcPreDefinedSymbol((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); entity = e; EntityBuffer::Add(this); }
+IfcPreDefinedPointMarkerSymbol::IfcPreDefinedPointMarkerSymbol(IfcAbstractEntity* e) : IfcPreDefinedSymbol((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcPreDefinedPointMarkerSymbol)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcPreDefinedPointMarkerSymbol::IfcPreDefinedPointMarkerSymbol(std::string v1_Name) : IfcPreDefinedSymbol((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcPreDefinedSymbol
 bool IfcPreDefinedSymbol::is(Type::Enum v) const { return v == Type::IfcPreDefinedSymbol || IfcPreDefinedItem::is(v); }
 Type::Enum IfcPreDefinedSymbol::type() const { return Type::IfcPreDefinedSymbol; }
 Type::Enum IfcPreDefinedSymbol::Class() { return Type::IfcPreDefinedSymbol; }
-IfcPreDefinedSymbol::IfcPreDefinedSymbol(IfcAbstractEntityPtr e) : IfcPreDefinedItem((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcPreDefinedSymbol)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcPreDefinedSymbol::IfcPreDefinedSymbol(IfcLabel v1_Name) : IfcPreDefinedItem((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); entity = e; EntityBuffer::Add(this); }
+IfcPreDefinedSymbol::IfcPreDefinedSymbol(IfcAbstractEntity* e) : IfcPreDefinedItem((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcPreDefinedSymbol)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcPreDefinedSymbol::IfcPreDefinedSymbol(std::string v1_Name) : IfcPreDefinedItem((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcPreDefinedTerminatorSymbol
 bool IfcPreDefinedTerminatorSymbol::is(Type::Enum v) const { return v == Type::IfcPreDefinedTerminatorSymbol || IfcPreDefinedSymbol::is(v); }
 Type::Enum IfcPreDefinedTerminatorSymbol::type() const { return Type::IfcPreDefinedTerminatorSymbol; }
 Type::Enum IfcPreDefinedTerminatorSymbol::Class() { return Type::IfcPreDefinedTerminatorSymbol; }
-IfcPreDefinedTerminatorSymbol::IfcPreDefinedTerminatorSymbol(IfcAbstractEntityPtr e) : IfcPreDefinedSymbol((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcPreDefinedTerminatorSymbol)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcPreDefinedTerminatorSymbol::IfcPreDefinedTerminatorSymbol(IfcLabel v1_Name) : IfcPreDefinedSymbol((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); entity = e; EntityBuffer::Add(this); }
+IfcPreDefinedTerminatorSymbol::IfcPreDefinedTerminatorSymbol(IfcAbstractEntity* e) : IfcPreDefinedSymbol((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcPreDefinedTerminatorSymbol)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcPreDefinedTerminatorSymbol::IfcPreDefinedTerminatorSymbol(std::string v1_Name) : IfcPreDefinedSymbol((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcPreDefinedTextFont
 bool IfcPreDefinedTextFont::is(Type::Enum v) const { return v == Type::IfcPreDefinedTextFont || IfcPreDefinedItem::is(v); }
 Type::Enum IfcPreDefinedTextFont::type() const { return Type::IfcPreDefinedTextFont; }
 Type::Enum IfcPreDefinedTextFont::Class() { return Type::IfcPreDefinedTextFont; }
-IfcPreDefinedTextFont::IfcPreDefinedTextFont(IfcAbstractEntityPtr e) : IfcPreDefinedItem((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcPreDefinedTextFont)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcPreDefinedTextFont::IfcPreDefinedTextFont(IfcLabel v1_Name) : IfcPreDefinedItem((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); entity = e; EntityBuffer::Add(this); }
+IfcPreDefinedTextFont::IfcPreDefinedTextFont(IfcAbstractEntity* e) : IfcPreDefinedItem((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcPreDefinedTextFont)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcPreDefinedTextFont::IfcPreDefinedTextFont(std::string v1_Name) : IfcPreDefinedItem((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcPresentationLayerAssignment
-IfcLabel IfcPresentationLayerAssignment::Name() { return *entity->getArgument(0); }
-void IfcPresentationLayerAssignment::setName(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-bool IfcPresentationLayerAssignment::hasDescription() { return !entity->getArgument(1)->isNull(); }
-IfcText IfcPresentationLayerAssignment::Description() { return *entity->getArgument(1); }
-void IfcPresentationLayerAssignment::setDescription(IfcText v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > IfcPresentationLayerAssignment::AssignedItems() { RETURN_AS_LIST(IfcUtil::IfcAbstractSelect,2) }
-void IfcPresentationLayerAssignment::setAssignedItems(SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v->generalize()); }
-bool IfcPresentationLayerAssignment::hasIdentifier() { return !entity->getArgument(3)->isNull(); }
-IfcIdentifier IfcPresentationLayerAssignment::Identifier() { return *entity->getArgument(3); }
-void IfcPresentationLayerAssignment::setIdentifier(IfcIdentifier v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+std::string IfcPresentationLayerAssignment::Name() const { return *entity->getArgument(0); }
+void IfcPresentationLayerAssignment::setName(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+bool IfcPresentationLayerAssignment::hasDescription() const { return !entity->getArgument(1)->isNull(); }
+std::string IfcPresentationLayerAssignment::Description() const { return *entity->getArgument(1); }
+void IfcPresentationLayerAssignment::setDescription(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+IfcEntityList::ptr IfcPresentationLayerAssignment::AssignedItems() const { return *entity->getArgument(2); }
+void IfcPresentationLayerAssignment::setAssignedItems(IfcEntityList::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+bool IfcPresentationLayerAssignment::hasIdentifier() const { return !entity->getArgument(3)->isNull(); }
+std::string IfcPresentationLayerAssignment::Identifier() const { return *entity->getArgument(3); }
+void IfcPresentationLayerAssignment::setIdentifier(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
 bool IfcPresentationLayerAssignment::is(Type::Enum v) const { return v == Type::IfcPresentationLayerAssignment; }
 Type::Enum IfcPresentationLayerAssignment::type() const { return Type::IfcPresentationLayerAssignment; }
 Type::Enum IfcPresentationLayerAssignment::Class() { return Type::IfcPresentationLayerAssignment; }
-IfcPresentationLayerAssignment::IfcPresentationLayerAssignment(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcPresentationLayerAssignment)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcPresentationLayerAssignment::IfcPresentationLayerAssignment(IfcLabel v1_Name, boost::optional< IfcText > v2_Description, IfcEntities v3_AssignedItems, boost::optional< IfcIdentifier > v4_Identifier) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_AssignedItems)); if (v4_Identifier) { e->setArgument(3,(*v4_Identifier)); } else { e->setArgument(3); } entity = e; EntityBuffer::Add(this); }
+IfcPresentationLayerAssignment::IfcPresentationLayerAssignment(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcPresentationLayerAssignment)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcPresentationLayerAssignment::IfcPresentationLayerAssignment(std::string v1_Name, boost::optional< std::string > v2_Description, IfcEntityList::ptr v3_AssignedItems, boost::optional< std::string > v4_Identifier) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_AssignedItems)); if (v4_Identifier) { e->setArgument(3,(*v4_Identifier)); } else { e->setArgument(3); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcPresentationLayerWithStyle
-bool IfcPresentationLayerWithStyle::LayerOn() { return *entity->getArgument(4); }
+bool IfcPresentationLayerWithStyle::LayerOn() const { return *entity->getArgument(4); }
 void IfcPresentationLayerWithStyle::setLayerOn(bool v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-bool IfcPresentationLayerWithStyle::LayerFrozen() { return *entity->getArgument(5); }
+bool IfcPresentationLayerWithStyle::LayerFrozen() const { return *entity->getArgument(5); }
 void IfcPresentationLayerWithStyle::setLayerFrozen(bool v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-bool IfcPresentationLayerWithStyle::LayerBlocked() { return *entity->getArgument(6); }
+bool IfcPresentationLayerWithStyle::LayerBlocked() const { return *entity->getArgument(6); }
 void IfcPresentationLayerWithStyle::setLayerBlocked(bool v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
-SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > IfcPresentationLayerWithStyle::LayerStyles() { RETURN_AS_LIST(IfcUtil::IfcAbstractSelect,7) }
-void IfcPresentationLayerWithStyle::setLayerStyles(SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v->generalize()); }
+IfcEntityList::ptr IfcPresentationLayerWithStyle::LayerStyles() const { return *entity->getArgument(7); }
+void IfcPresentationLayerWithStyle::setLayerStyles(IfcEntityList::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
 bool IfcPresentationLayerWithStyle::is(Type::Enum v) const { return v == Type::IfcPresentationLayerWithStyle || IfcPresentationLayerAssignment::is(v); }
 Type::Enum IfcPresentationLayerWithStyle::type() const { return Type::IfcPresentationLayerWithStyle; }
 Type::Enum IfcPresentationLayerWithStyle::Class() { return Type::IfcPresentationLayerWithStyle; }
-IfcPresentationLayerWithStyle::IfcPresentationLayerWithStyle(IfcAbstractEntityPtr e) : IfcPresentationLayerAssignment((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcPresentationLayerWithStyle)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcPresentationLayerWithStyle::IfcPresentationLayerWithStyle(IfcLabel v1_Name, boost::optional< IfcText > v2_Description, IfcEntities v3_AssignedItems, boost::optional< IfcIdentifier > v4_Identifier, bool v5_LayerOn, bool v6_LayerFrozen, bool v7_LayerBlocked, IfcEntities v8_LayerStyles) : IfcPresentationLayerAssignment((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_AssignedItems)); if (v4_Identifier) { e->setArgument(3,(*v4_Identifier)); } else { e->setArgument(3); } e->setArgument(4,(v5_LayerOn)); e->setArgument(5,(v6_LayerFrozen)); e->setArgument(6,(v7_LayerBlocked)); e->setArgument(7,(v8_LayerStyles)); entity = e; EntityBuffer::Add(this); }
+IfcPresentationLayerWithStyle::IfcPresentationLayerWithStyle(IfcAbstractEntity* e) : IfcPresentationLayerAssignment((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcPresentationLayerWithStyle)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcPresentationLayerWithStyle::IfcPresentationLayerWithStyle(std::string v1_Name, boost::optional< std::string > v2_Description, IfcEntityList::ptr v3_AssignedItems, boost::optional< std::string > v4_Identifier, bool v5_LayerOn, bool v6_LayerFrozen, bool v7_LayerBlocked, IfcEntityList::ptr v8_LayerStyles) : IfcPresentationLayerAssignment((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_AssignedItems)); if (v4_Identifier) { e->setArgument(3,(*v4_Identifier)); } else { e->setArgument(3); } e->setArgument(4,(v5_LayerOn)); e->setArgument(5,(v6_LayerFrozen)); e->setArgument(6,(v7_LayerBlocked)); e->setArgument(7,(v8_LayerStyles)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcPresentationStyle
-bool IfcPresentationStyle::hasName() { return !entity->getArgument(0)->isNull(); }
-IfcLabel IfcPresentationStyle::Name() { return *entity->getArgument(0); }
-void IfcPresentationStyle::setName(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+bool IfcPresentationStyle::hasName() const { return !entity->getArgument(0)->isNull(); }
+std::string IfcPresentationStyle::Name() const { return *entity->getArgument(0); }
+void IfcPresentationStyle::setName(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
 bool IfcPresentationStyle::is(Type::Enum v) const { return v == Type::IfcPresentationStyle; }
 Type::Enum IfcPresentationStyle::type() const { return Type::IfcPresentationStyle; }
 Type::Enum IfcPresentationStyle::Class() { return Type::IfcPresentationStyle; }
-IfcPresentationStyle::IfcPresentationStyle(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcPresentationStyle)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcPresentationStyle::IfcPresentationStyle(boost::optional< IfcLabel > v1_Name) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } entity = e; EntityBuffer::Add(this); }
+IfcPresentationStyle::IfcPresentationStyle(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcPresentationStyle)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcPresentationStyle::IfcPresentationStyle(boost::optional< std::string > v1_Name) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcPresentationStyleAssignment
-SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > IfcPresentationStyleAssignment::Styles() { RETURN_AS_LIST(IfcUtil::IfcAbstractSelect,0) }
-void IfcPresentationStyleAssignment::setStyles(SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v->generalize()); }
+IfcEntityList::ptr IfcPresentationStyleAssignment::Styles() const { return *entity->getArgument(0); }
+void IfcPresentationStyleAssignment::setStyles(IfcEntityList::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
 bool IfcPresentationStyleAssignment::is(Type::Enum v) const { return v == Type::IfcPresentationStyleAssignment; }
 Type::Enum IfcPresentationStyleAssignment::type() const { return Type::IfcPresentationStyleAssignment; }
 Type::Enum IfcPresentationStyleAssignment::Class() { return Type::IfcPresentationStyleAssignment; }
-IfcPresentationStyleAssignment::IfcPresentationStyleAssignment(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcPresentationStyleAssignment)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcPresentationStyleAssignment::IfcPresentationStyleAssignment(IfcEntities v1_Styles) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Styles)); entity = e; EntityBuffer::Add(this); }
+IfcPresentationStyleAssignment::IfcPresentationStyleAssignment(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcPresentationStyleAssignment)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcPresentationStyleAssignment::IfcPresentationStyleAssignment(IfcEntityList::ptr v1_Styles) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Styles)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcProcedure
-IfcIdentifier IfcProcedure::ProcedureID() { return *entity->getArgument(5); }
-void IfcProcedure::setProcedureID(IfcIdentifier v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-IfcProcedureTypeEnum::IfcProcedureTypeEnum IfcProcedure::ProcedureType() { return IfcProcedureTypeEnum::FromString(*entity->getArgument(6)); }
+std::string IfcProcedure::ProcedureID() const { return *entity->getArgument(5); }
+void IfcProcedure::setProcedureID(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+IfcProcedureTypeEnum::IfcProcedureTypeEnum IfcProcedure::ProcedureType() const { return IfcProcedureTypeEnum::FromString(*entity->getArgument(6)); }
 void IfcProcedure::setProcedureType(IfcProcedureTypeEnum::IfcProcedureTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v,IfcProcedureTypeEnum::ToString(v)); }
-bool IfcProcedure::hasUserDefinedProcedureType() { return !entity->getArgument(7)->isNull(); }
-IfcLabel IfcProcedure::UserDefinedProcedureType() { return *entity->getArgument(7); }
-void IfcProcedure::setUserDefinedProcedureType(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
+bool IfcProcedure::hasUserDefinedProcedureType() const { return !entity->getArgument(7)->isNull(); }
+std::string IfcProcedure::UserDefinedProcedureType() const { return *entity->getArgument(7); }
+void IfcProcedure::setUserDefinedProcedureType(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
 bool IfcProcedure::is(Type::Enum v) const { return v == Type::IfcProcedure || IfcProcess::is(v); }
 Type::Enum IfcProcedure::type() const { return Type::IfcProcedure; }
 Type::Enum IfcProcedure::Class() { return Type::IfcProcedure; }
-IfcProcedure::IfcProcedure(IfcAbstractEntityPtr e) : IfcProcess((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcProcedure)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcProcedure::IfcProcedure(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcIdentifier v6_ProcedureID, IfcProcedureTypeEnum::IfcProcedureTypeEnum v7_ProcedureType, boost::optional< IfcLabel > v8_UserDefinedProcedureType) : IfcProcess((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ProcedureID)); e->setArgument(6,v7_ProcedureType,IfcProcedureTypeEnum::ToString(v7_ProcedureType)); if (v8_UserDefinedProcedureType) { e->setArgument(7,(*v8_UserDefinedProcedureType)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
+IfcProcedure::IfcProcedure(IfcAbstractEntity* e) : IfcProcess((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcProcedure)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcProcedure::IfcProcedure(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, std::string v6_ProcedureID, IfcProcedureTypeEnum::IfcProcedureTypeEnum v7_ProcedureType, boost::optional< std::string > v8_UserDefinedProcedureType) : IfcProcess((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ProcedureID)); e->setArgument(6,v7_ProcedureType,IfcProcedureTypeEnum::ToString(v7_ProcedureType)); if (v8_UserDefinedProcedureType) { e->setArgument(7,(*v8_UserDefinedProcedureType)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcProcess
-IfcRelAssignsToProcess::list IfcProcess::OperatesOn() { RETURN_INVERSE(IfcRelAssignsToProcess) }
-IfcRelSequence::list IfcProcess::IsSuccessorFrom() { RETURN_INVERSE(IfcRelSequence) }
-IfcRelSequence::list IfcProcess::IsPredecessorTo() { RETURN_INVERSE(IfcRelSequence) }
+IfcRelAssignsToProcess::list::ptr IfcProcess::OperatesOn() const { return entity->getInverse(Type::IfcRelAssignsToProcess, 6)->as<IfcRelAssignsToProcess>(); }
+IfcRelSequence::list::ptr IfcProcess::IsSuccessorFrom() const { return entity->getInverse(Type::IfcRelSequence, 5)->as<IfcRelSequence>(); }
+IfcRelSequence::list::ptr IfcProcess::IsPredecessorTo() const { return entity->getInverse(Type::IfcRelSequence, 4)->as<IfcRelSequence>(); }
 bool IfcProcess::is(Type::Enum v) const { return v == Type::IfcProcess || IfcObject::is(v); }
 Type::Enum IfcProcess::type() const { return Type::IfcProcess; }
 Type::Enum IfcProcess::Class() { return Type::IfcProcess; }
-IfcProcess::IfcProcess(IfcAbstractEntityPtr e) : IfcObject((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcProcess)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcProcess::IfcProcess(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType) : IfcObject((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } entity = e; EntityBuffer::Add(this); }
+IfcProcess::IfcProcess(IfcAbstractEntity* e) : IfcObject((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcProcess)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcProcess::IfcProcess(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType) : IfcObject((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcProduct
-bool IfcProduct::hasObjectPlacement() { return !entity->getArgument(5)->isNull(); }
-IfcObjectPlacement* IfcProduct::ObjectPlacement() { return (IfcObjectPlacement*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(5))); }
+bool IfcProduct::hasObjectPlacement() const { return !entity->getArgument(5)->isNull(); }
+IfcObjectPlacement* IfcProduct::ObjectPlacement() const { return (IfcObjectPlacement*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(5))); }
 void IfcProduct::setObjectPlacement(IfcObjectPlacement* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-bool IfcProduct::hasRepresentation() { return !entity->getArgument(6)->isNull(); }
-IfcProductRepresentation* IfcProduct::Representation() { return (IfcProductRepresentation*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(6))); }
+bool IfcProduct::hasRepresentation() const { return !entity->getArgument(6)->isNull(); }
+IfcProductRepresentation* IfcProduct::Representation() const { return (IfcProductRepresentation*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(6))); }
 void IfcProduct::setRepresentation(IfcProductRepresentation* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
-IfcRelAssignsToProduct::list IfcProduct::ReferencedBy() { RETURN_INVERSE(IfcRelAssignsToProduct) }
+IfcRelAssignsToProduct::list::ptr IfcProduct::ReferencedBy() const { return entity->getInverse(Type::IfcRelAssignsToProduct, 6)->as<IfcRelAssignsToProduct>(); }
 bool IfcProduct::is(Type::Enum v) const { return v == Type::IfcProduct || IfcObject::is(v); }
 Type::Enum IfcProduct::type() const { return Type::IfcProduct; }
 Type::Enum IfcProduct::Class() { return Type::IfcProduct; }
-IfcProduct::IfcProduct(IfcAbstractEntityPtr e) : IfcObject((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcProduct)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcProduct::IfcProduct(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation) : IfcObject((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); entity = e; EntityBuffer::Add(this); }
+IfcProduct::IfcProduct(IfcAbstractEntity* e) : IfcObject((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcProduct)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcProduct::IfcProduct(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation) : IfcObject((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcProductDefinitionShape
-IfcProduct::list IfcProductDefinitionShape::ShapeOfProduct() { RETURN_INVERSE(IfcProduct) }
-IfcShapeAspect::list IfcProductDefinitionShape::HasShapeAspects() { RETURN_INVERSE(IfcShapeAspect) }
+IfcProduct::list::ptr IfcProductDefinitionShape::ShapeOfProduct() const { return entity->getInverse(Type::IfcProduct, 6)->as<IfcProduct>(); }
+IfcShapeAspect::list::ptr IfcProductDefinitionShape::HasShapeAspects() const { return entity->getInverse(Type::IfcShapeAspect, 4)->as<IfcShapeAspect>(); }
 bool IfcProductDefinitionShape::is(Type::Enum v) const { return v == Type::IfcProductDefinitionShape || IfcProductRepresentation::is(v); }
 Type::Enum IfcProductDefinitionShape::type() const { return Type::IfcProductDefinitionShape; }
 Type::Enum IfcProductDefinitionShape::Class() { return Type::IfcProductDefinitionShape; }
-IfcProductDefinitionShape::IfcProductDefinitionShape(IfcAbstractEntityPtr e) : IfcProductRepresentation((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcProductDefinitionShape)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcProductDefinitionShape::IfcProductDefinitionShape(boost::optional< IfcLabel > v1_Name, boost::optional< IfcText > v2_Description, SHARED_PTR< IfcTemplatedEntityList< IfcRepresentation > > v3_Representations) : IfcProductRepresentation((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_Representations)->generalize()); entity = e; EntityBuffer::Add(this); }
+IfcProductDefinitionShape::IfcProductDefinitionShape(IfcAbstractEntity* e) : IfcProductRepresentation((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcProductDefinitionShape)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcProductDefinitionShape::IfcProductDefinitionShape(boost::optional< std::string > v1_Name, boost::optional< std::string > v2_Description, IfcTemplatedEntityList< IfcRepresentation >::ptr v3_Representations) : IfcProductRepresentation((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_Representations)->generalize()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcProductRepresentation
-bool IfcProductRepresentation::hasName() { return !entity->getArgument(0)->isNull(); }
-IfcLabel IfcProductRepresentation::Name() { return *entity->getArgument(0); }
-void IfcProductRepresentation::setName(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-bool IfcProductRepresentation::hasDescription() { return !entity->getArgument(1)->isNull(); }
-IfcText IfcProductRepresentation::Description() { return *entity->getArgument(1); }
-void IfcProductRepresentation::setDescription(IfcText v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-SHARED_PTR< IfcTemplatedEntityList< IfcRepresentation > > IfcProductRepresentation::Representations() { RETURN_AS_LIST(IfcRepresentation,2) }
-void IfcProductRepresentation::setRepresentations(SHARED_PTR< IfcTemplatedEntityList< IfcRepresentation > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v->generalize()); }
+bool IfcProductRepresentation::hasName() const { return !entity->getArgument(0)->isNull(); }
+std::string IfcProductRepresentation::Name() const { return *entity->getArgument(0); }
+void IfcProductRepresentation::setName(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+bool IfcProductRepresentation::hasDescription() const { return !entity->getArgument(1)->isNull(); }
+std::string IfcProductRepresentation::Description() const { return *entity->getArgument(1); }
+void IfcProductRepresentation::setDescription(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+IfcTemplatedEntityList< IfcRepresentation >::ptr IfcProductRepresentation::Representations() const { IfcEntityList::ptr es = *entity->getArgument(2); return es->as<IfcRepresentation>(); }
+void IfcProductRepresentation::setRepresentations(IfcTemplatedEntityList< IfcRepresentation >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v->generalize()); }
 bool IfcProductRepresentation::is(Type::Enum v) const { return v == Type::IfcProductRepresentation; }
 Type::Enum IfcProductRepresentation::type() const { return Type::IfcProductRepresentation; }
 Type::Enum IfcProductRepresentation::Class() { return Type::IfcProductRepresentation; }
-IfcProductRepresentation::IfcProductRepresentation(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcProductRepresentation)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcProductRepresentation::IfcProductRepresentation(boost::optional< IfcLabel > v1_Name, boost::optional< IfcText > v2_Description, SHARED_PTR< IfcTemplatedEntityList< IfcRepresentation > > v3_Representations) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_Representations)->generalize()); entity = e; EntityBuffer::Add(this); }
+IfcProductRepresentation::IfcProductRepresentation(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcProductRepresentation)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcProductRepresentation::IfcProductRepresentation(boost::optional< std::string > v1_Name, boost::optional< std::string > v2_Description, IfcTemplatedEntityList< IfcRepresentation >::ptr v3_Representations) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_Representations)->generalize()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcProductsOfCombustionProperties
-bool IfcProductsOfCombustionProperties::hasSpecificHeatCapacity() { return !entity->getArgument(1)->isNull(); }
-IfcSpecificHeatCapacityMeasure IfcProductsOfCombustionProperties::SpecificHeatCapacity() { return *entity->getArgument(1); }
-void IfcProductsOfCombustionProperties::setSpecificHeatCapacity(IfcSpecificHeatCapacityMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-bool IfcProductsOfCombustionProperties::hasN20Content() { return !entity->getArgument(2)->isNull(); }
-IfcPositiveRatioMeasure IfcProductsOfCombustionProperties::N20Content() { return *entity->getArgument(2); }
-void IfcProductsOfCombustionProperties::setN20Content(IfcPositiveRatioMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-bool IfcProductsOfCombustionProperties::hasCOContent() { return !entity->getArgument(3)->isNull(); }
-IfcPositiveRatioMeasure IfcProductsOfCombustionProperties::COContent() { return *entity->getArgument(3); }
-void IfcProductsOfCombustionProperties::setCOContent(IfcPositiveRatioMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-bool IfcProductsOfCombustionProperties::hasCO2Content() { return !entity->getArgument(4)->isNull(); }
-IfcPositiveRatioMeasure IfcProductsOfCombustionProperties::CO2Content() { return *entity->getArgument(4); }
-void IfcProductsOfCombustionProperties::setCO2Content(IfcPositiveRatioMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+bool IfcProductsOfCombustionProperties::hasSpecificHeatCapacity() const { return !entity->getArgument(1)->isNull(); }
+double IfcProductsOfCombustionProperties::SpecificHeatCapacity() const { return *entity->getArgument(1); }
+void IfcProductsOfCombustionProperties::setSpecificHeatCapacity(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+bool IfcProductsOfCombustionProperties::hasN20Content() const { return !entity->getArgument(2)->isNull(); }
+double IfcProductsOfCombustionProperties::N20Content() const { return *entity->getArgument(2); }
+void IfcProductsOfCombustionProperties::setN20Content(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+bool IfcProductsOfCombustionProperties::hasCOContent() const { return !entity->getArgument(3)->isNull(); }
+double IfcProductsOfCombustionProperties::COContent() const { return *entity->getArgument(3); }
+void IfcProductsOfCombustionProperties::setCOContent(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+bool IfcProductsOfCombustionProperties::hasCO2Content() const { return !entity->getArgument(4)->isNull(); }
+double IfcProductsOfCombustionProperties::CO2Content() const { return *entity->getArgument(4); }
+void IfcProductsOfCombustionProperties::setCO2Content(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
 bool IfcProductsOfCombustionProperties::is(Type::Enum v) const { return v == Type::IfcProductsOfCombustionProperties || IfcMaterialProperties::is(v); }
 Type::Enum IfcProductsOfCombustionProperties::type() const { return Type::IfcProductsOfCombustionProperties; }
 Type::Enum IfcProductsOfCombustionProperties::Class() { return Type::IfcProductsOfCombustionProperties; }
-IfcProductsOfCombustionProperties::IfcProductsOfCombustionProperties(IfcAbstractEntityPtr e) : IfcMaterialProperties((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcProductsOfCombustionProperties)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcProductsOfCombustionProperties::IfcProductsOfCombustionProperties(IfcMaterial* v1_Material, boost::optional< IfcSpecificHeatCapacityMeasure > v2_SpecificHeatCapacity, boost::optional< IfcPositiveRatioMeasure > v3_N20Content, boost::optional< IfcPositiveRatioMeasure > v4_COContent, boost::optional< IfcPositiveRatioMeasure > v5_CO2Content) : IfcMaterialProperties((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Material)); if (v2_SpecificHeatCapacity) { e->setArgument(1,(*v2_SpecificHeatCapacity)); } else { e->setArgument(1); } if (v3_N20Content) { e->setArgument(2,(*v3_N20Content)); } else { e->setArgument(2); } if (v4_COContent) { e->setArgument(3,(*v4_COContent)); } else { e->setArgument(3); } if (v5_CO2Content) { e->setArgument(4,(*v5_CO2Content)); } else { e->setArgument(4); } entity = e; EntityBuffer::Add(this); }
+IfcProductsOfCombustionProperties::IfcProductsOfCombustionProperties(IfcAbstractEntity* e) : IfcMaterialProperties((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcProductsOfCombustionProperties)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcProductsOfCombustionProperties::IfcProductsOfCombustionProperties(IfcMaterial* v1_Material, boost::optional< double > v2_SpecificHeatCapacity, boost::optional< double > v3_N20Content, boost::optional< double > v4_COContent, boost::optional< double > v5_CO2Content) : IfcMaterialProperties((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Material)); if (v2_SpecificHeatCapacity) { e->setArgument(1,(*v2_SpecificHeatCapacity)); } else { e->setArgument(1); } if (v3_N20Content) { e->setArgument(2,(*v3_N20Content)); } else { e->setArgument(2); } if (v4_COContent) { e->setArgument(3,(*v4_COContent)); } else { e->setArgument(3); } if (v5_CO2Content) { e->setArgument(4,(*v5_CO2Content)); } else { e->setArgument(4); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcProfileDef
-IfcProfileTypeEnum::IfcProfileTypeEnum IfcProfileDef::ProfileType() { return IfcProfileTypeEnum::FromString(*entity->getArgument(0)); }
+IfcProfileTypeEnum::IfcProfileTypeEnum IfcProfileDef::ProfileType() const { return IfcProfileTypeEnum::FromString(*entity->getArgument(0)); }
 void IfcProfileDef::setProfileType(IfcProfileTypeEnum::IfcProfileTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v,IfcProfileTypeEnum::ToString(v)); }
-bool IfcProfileDef::hasProfileName() { return !entity->getArgument(1)->isNull(); }
-IfcLabel IfcProfileDef::ProfileName() { return *entity->getArgument(1); }
-void IfcProfileDef::setProfileName(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+bool IfcProfileDef::hasProfileName() const { return !entity->getArgument(1)->isNull(); }
+std::string IfcProfileDef::ProfileName() const { return *entity->getArgument(1); }
+void IfcProfileDef::setProfileName(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
 bool IfcProfileDef::is(Type::Enum v) const { return v == Type::IfcProfileDef; }
 Type::Enum IfcProfileDef::type() const { return Type::IfcProfileDef; }
 Type::Enum IfcProfileDef::Class() { return Type::IfcProfileDef; }
-IfcProfileDef::IfcProfileDef(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcProfileDef)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcProfileDef::IfcProfileDef(IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< IfcLabel > v2_ProfileName) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,v1_ProfileType,IfcProfileTypeEnum::ToString(v1_ProfileType)); if (v2_ProfileName) { e->setArgument(1,(*v2_ProfileName)); } else { e->setArgument(1); } entity = e; EntityBuffer::Add(this); }
+IfcProfileDef::IfcProfileDef(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcProfileDef)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcProfileDef::IfcProfileDef(IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< std::string > v2_ProfileName) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,v1_ProfileType,IfcProfileTypeEnum::ToString(v1_ProfileType)); if (v2_ProfileName) { e->setArgument(1,(*v2_ProfileName)); } else { e->setArgument(1); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcProfileProperties
-bool IfcProfileProperties::hasProfileName() { return !entity->getArgument(0)->isNull(); }
-IfcLabel IfcProfileProperties::ProfileName() { return *entity->getArgument(0); }
-void IfcProfileProperties::setProfileName(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-bool IfcProfileProperties::hasProfileDefinition() { return !entity->getArgument(1)->isNull(); }
-IfcProfileDef* IfcProfileProperties::ProfileDefinition() { return (IfcProfileDef*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(1))); }
+bool IfcProfileProperties::hasProfileName() const { return !entity->getArgument(0)->isNull(); }
+std::string IfcProfileProperties::ProfileName() const { return *entity->getArgument(0); }
+void IfcProfileProperties::setProfileName(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+bool IfcProfileProperties::hasProfileDefinition() const { return !entity->getArgument(1)->isNull(); }
+IfcProfileDef* IfcProfileProperties::ProfileDefinition() const { return (IfcProfileDef*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(1))); }
 void IfcProfileProperties::setProfileDefinition(IfcProfileDef* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
 bool IfcProfileProperties::is(Type::Enum v) const { return v == Type::IfcProfileProperties; }
 Type::Enum IfcProfileProperties::type() const { return Type::IfcProfileProperties; }
 Type::Enum IfcProfileProperties::Class() { return Type::IfcProfileProperties; }
-IfcProfileProperties::IfcProfileProperties(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcProfileProperties)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcProfileProperties::IfcProfileProperties(boost::optional< IfcLabel > v1_ProfileName, IfcProfileDef* v2_ProfileDefinition) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_ProfileName) { e->setArgument(0,(*v1_ProfileName)); } else { e->setArgument(0); } e->setArgument(1,(v2_ProfileDefinition)); entity = e; EntityBuffer::Add(this); }
+IfcProfileProperties::IfcProfileProperties(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcProfileProperties)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcProfileProperties::IfcProfileProperties(boost::optional< std::string > v1_ProfileName, IfcProfileDef* v2_ProfileDefinition) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_ProfileName) { e->setArgument(0,(*v1_ProfileName)); } else { e->setArgument(0); } e->setArgument(1,(v2_ProfileDefinition)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcProject
-bool IfcProject::hasLongName() { return !entity->getArgument(5)->isNull(); }
-IfcLabel IfcProject::LongName() { return *entity->getArgument(5); }
-void IfcProject::setLongName(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-bool IfcProject::hasPhase() { return !entity->getArgument(6)->isNull(); }
-IfcLabel IfcProject::Phase() { return *entity->getArgument(6); }
-void IfcProject::setPhase(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
-SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationContext > > IfcProject::RepresentationContexts() { RETURN_AS_LIST(IfcRepresentationContext,7) }
-void IfcProject::setRepresentationContexts(SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationContext > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v->generalize()); }
-IfcUnitAssignment* IfcProject::UnitsInContext() { return (IfcUnitAssignment*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(8))); }
+bool IfcProject::hasLongName() const { return !entity->getArgument(5)->isNull(); }
+std::string IfcProject::LongName() const { return *entity->getArgument(5); }
+void IfcProject::setLongName(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+bool IfcProject::hasPhase() const { return !entity->getArgument(6)->isNull(); }
+std::string IfcProject::Phase() const { return *entity->getArgument(6); }
+void IfcProject::setPhase(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
+IfcTemplatedEntityList< IfcRepresentationContext >::ptr IfcProject::RepresentationContexts() const { IfcEntityList::ptr es = *entity->getArgument(7); return es->as<IfcRepresentationContext>(); }
+void IfcProject::setRepresentationContexts(IfcTemplatedEntityList< IfcRepresentationContext >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v->generalize()); }
+IfcUnitAssignment* IfcProject::UnitsInContext() const { return (IfcUnitAssignment*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(8))); }
 void IfcProject::setUnitsInContext(IfcUnitAssignment* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
 bool IfcProject::is(Type::Enum v) const { return v == Type::IfcProject || IfcObject::is(v); }
 Type::Enum IfcProject::type() const { return Type::IfcProject; }
 Type::Enum IfcProject::Class() { return Type::IfcProject; }
-IfcProject::IfcProject(IfcAbstractEntityPtr e) : IfcObject((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcProject)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcProject::IfcProject(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, boost::optional< IfcLabel > v6_LongName, boost::optional< IfcLabel > v7_Phase, SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationContext > > v8_RepresentationContexts, IfcUnitAssignment* v9_UnitsInContext) : IfcObject((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } if (v6_LongName) { e->setArgument(5,(*v6_LongName)); } else { e->setArgument(5); } if (v7_Phase) { e->setArgument(6,(*v7_Phase)); } else { e->setArgument(6); } e->setArgument(7,(v8_RepresentationContexts)->generalize()); e->setArgument(8,(v9_UnitsInContext)); entity = e; EntityBuffer::Add(this); }
+IfcProject::IfcProject(IfcAbstractEntity* e) : IfcObject((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcProject)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcProject::IfcProject(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, boost::optional< std::string > v6_LongName, boost::optional< std::string > v7_Phase, IfcTemplatedEntityList< IfcRepresentationContext >::ptr v8_RepresentationContexts, IfcUnitAssignment* v9_UnitsInContext) : IfcObject((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } if (v6_LongName) { e->setArgument(5,(*v6_LongName)); } else { e->setArgument(5); } if (v7_Phase) { e->setArgument(6,(*v7_Phase)); } else { e->setArgument(6); } e->setArgument(7,(v8_RepresentationContexts)->generalize()); e->setArgument(8,(v9_UnitsInContext)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcProjectOrder
-IfcIdentifier IfcProjectOrder::ID() { return *entity->getArgument(5); }
-void IfcProjectOrder::setID(IfcIdentifier v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-IfcProjectOrderTypeEnum::IfcProjectOrderTypeEnum IfcProjectOrder::PredefinedType() { return IfcProjectOrderTypeEnum::FromString(*entity->getArgument(6)); }
+std::string IfcProjectOrder::ID() const { return *entity->getArgument(5); }
+void IfcProjectOrder::setID(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+IfcProjectOrderTypeEnum::IfcProjectOrderTypeEnum IfcProjectOrder::PredefinedType() const { return IfcProjectOrderTypeEnum::FromString(*entity->getArgument(6)); }
 void IfcProjectOrder::setPredefinedType(IfcProjectOrderTypeEnum::IfcProjectOrderTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v,IfcProjectOrderTypeEnum::ToString(v)); }
-bool IfcProjectOrder::hasStatus() { return !entity->getArgument(7)->isNull(); }
-IfcLabel IfcProjectOrder::Status() { return *entity->getArgument(7); }
-void IfcProjectOrder::setStatus(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
+bool IfcProjectOrder::hasStatus() const { return !entity->getArgument(7)->isNull(); }
+std::string IfcProjectOrder::Status() const { return *entity->getArgument(7); }
+void IfcProjectOrder::setStatus(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
 bool IfcProjectOrder::is(Type::Enum v) const { return v == Type::IfcProjectOrder || IfcControl::is(v); }
 Type::Enum IfcProjectOrder::type() const { return Type::IfcProjectOrder; }
 Type::Enum IfcProjectOrder::Class() { return Type::IfcProjectOrder; }
-IfcProjectOrder::IfcProjectOrder(IfcAbstractEntityPtr e) : IfcControl((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcProjectOrder)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcProjectOrder::IfcProjectOrder(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcIdentifier v6_ID, IfcProjectOrderTypeEnum::IfcProjectOrderTypeEnum v7_PredefinedType, boost::optional< IfcLabel > v8_Status) : IfcControl((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ID)); e->setArgument(6,v7_PredefinedType,IfcProjectOrderTypeEnum::ToString(v7_PredefinedType)); if (v8_Status) { e->setArgument(7,(*v8_Status)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
+IfcProjectOrder::IfcProjectOrder(IfcAbstractEntity* e) : IfcControl((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcProjectOrder)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcProjectOrder::IfcProjectOrder(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, std::string v6_ID, IfcProjectOrderTypeEnum::IfcProjectOrderTypeEnum v7_PredefinedType, boost::optional< std::string > v8_Status) : IfcControl((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ID)); e->setArgument(6,v7_PredefinedType,IfcProjectOrderTypeEnum::ToString(v7_PredefinedType)); if (v8_Status) { e->setArgument(7,(*v8_Status)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcProjectOrderRecord
-SHARED_PTR< IfcTemplatedEntityList< IfcRelAssignsToProjectOrder > > IfcProjectOrderRecord::Records() { RETURN_AS_LIST(IfcRelAssignsToProjectOrder,5) }
-void IfcProjectOrderRecord::setRecords(SHARED_PTR< IfcTemplatedEntityList< IfcRelAssignsToProjectOrder > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v->generalize()); }
-IfcProjectOrderRecordTypeEnum::IfcProjectOrderRecordTypeEnum IfcProjectOrderRecord::PredefinedType() { return IfcProjectOrderRecordTypeEnum::FromString(*entity->getArgument(6)); }
+IfcTemplatedEntityList< IfcRelAssignsToProjectOrder >::ptr IfcProjectOrderRecord::Records() const { IfcEntityList::ptr es = *entity->getArgument(5); return es->as<IfcRelAssignsToProjectOrder>(); }
+void IfcProjectOrderRecord::setRecords(IfcTemplatedEntityList< IfcRelAssignsToProjectOrder >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v->generalize()); }
+IfcProjectOrderRecordTypeEnum::IfcProjectOrderRecordTypeEnum IfcProjectOrderRecord::PredefinedType() const { return IfcProjectOrderRecordTypeEnum::FromString(*entity->getArgument(6)); }
 void IfcProjectOrderRecord::setPredefinedType(IfcProjectOrderRecordTypeEnum::IfcProjectOrderRecordTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v,IfcProjectOrderRecordTypeEnum::ToString(v)); }
 bool IfcProjectOrderRecord::is(Type::Enum v) const { return v == Type::IfcProjectOrderRecord || IfcControl::is(v); }
 Type::Enum IfcProjectOrderRecord::type() const { return Type::IfcProjectOrderRecord; }
 Type::Enum IfcProjectOrderRecord::Class() { return Type::IfcProjectOrderRecord; }
-IfcProjectOrderRecord::IfcProjectOrderRecord(IfcAbstractEntityPtr e) : IfcControl((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcProjectOrderRecord)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcProjectOrderRecord::IfcProjectOrderRecord(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, SHARED_PTR< IfcTemplatedEntityList< IfcRelAssignsToProjectOrder > > v6_Records, IfcProjectOrderRecordTypeEnum::IfcProjectOrderRecordTypeEnum v7_PredefinedType) : IfcControl((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_Records)->generalize()); e->setArgument(6,v7_PredefinedType,IfcProjectOrderRecordTypeEnum::ToString(v7_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcProjectOrderRecord::IfcProjectOrderRecord(IfcAbstractEntity* e) : IfcControl((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcProjectOrderRecord)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcProjectOrderRecord::IfcProjectOrderRecord(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcTemplatedEntityList< IfcRelAssignsToProjectOrder >::ptr v6_Records, IfcProjectOrderRecordTypeEnum::IfcProjectOrderRecordTypeEnum v7_PredefinedType) : IfcControl((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_Records)->generalize()); e->setArgument(6,v7_PredefinedType,IfcProjectOrderRecordTypeEnum::ToString(v7_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcProjectionCurve
 bool IfcProjectionCurve::is(Type::Enum v) const { return v == Type::IfcProjectionCurve || IfcAnnotationCurveOccurrence::is(v); }
 Type::Enum IfcProjectionCurve::type() const { return Type::IfcProjectionCurve; }
 Type::Enum IfcProjectionCurve::Class() { return Type::IfcProjectionCurve; }
-IfcProjectionCurve::IfcProjectionCurve(IfcAbstractEntityPtr e) : IfcAnnotationCurveOccurrence((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcProjectionCurve)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcProjectionCurve::IfcProjectionCurve(IfcRepresentationItem* v1_Item, SHARED_PTR< IfcTemplatedEntityList< IfcPresentationStyleAssignment > > v2_Styles, boost::optional< IfcLabel > v3_Name) : IfcAnnotationCurveOccurrence((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Item)); e->setArgument(1,(v2_Styles)->generalize()); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } entity = e; EntityBuffer::Add(this); }
+IfcProjectionCurve::IfcProjectionCurve(IfcAbstractEntity* e) : IfcAnnotationCurveOccurrence((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcProjectionCurve)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcProjectionCurve::IfcProjectionCurve(IfcRepresentationItem* v1_Item, IfcTemplatedEntityList< IfcPresentationStyleAssignment >::ptr v2_Styles, boost::optional< std::string > v3_Name) : IfcAnnotationCurveOccurrence((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Item)); e->setArgument(1,(v2_Styles)->generalize()); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcProjectionElement
 bool IfcProjectionElement::is(Type::Enum v) const { return v == Type::IfcProjectionElement || IfcFeatureElementAddition::is(v); }
 Type::Enum IfcProjectionElement::type() const { return Type::IfcProjectionElement; }
 Type::Enum IfcProjectionElement::Class() { return Type::IfcProjectionElement; }
-IfcProjectionElement::IfcProjectionElement(IfcAbstractEntityPtr e) : IfcFeatureElementAddition((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcProjectionElement)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcProjectionElement::IfcProjectionElement(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag) : IfcFeatureElementAddition((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
+IfcProjectionElement::IfcProjectionElement(IfcAbstractEntity* e) : IfcFeatureElementAddition((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcProjectionElement)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcProjectionElement::IfcProjectionElement(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag) : IfcFeatureElementAddition((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcProperty
-IfcIdentifier IfcProperty::Name() { return *entity->getArgument(0); }
-void IfcProperty::setName(IfcIdentifier v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-bool IfcProperty::hasDescription() { return !entity->getArgument(1)->isNull(); }
-IfcText IfcProperty::Description() { return *entity->getArgument(1); }
-void IfcProperty::setDescription(IfcText v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-IfcPropertyDependencyRelationship::list IfcProperty::PropertyForDependance() { RETURN_INVERSE(IfcPropertyDependencyRelationship) }
-IfcPropertyDependencyRelationship::list IfcProperty::PropertyDependsOn() { RETURN_INVERSE(IfcPropertyDependencyRelationship) }
-IfcComplexProperty::list IfcProperty::PartOfComplex() { RETURN_INVERSE(IfcComplexProperty) }
+std::string IfcProperty::Name() const { return *entity->getArgument(0); }
+void IfcProperty::setName(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+bool IfcProperty::hasDescription() const { return !entity->getArgument(1)->isNull(); }
+std::string IfcProperty::Description() const { return *entity->getArgument(1); }
+void IfcProperty::setDescription(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+IfcPropertyDependencyRelationship::list::ptr IfcProperty::PropertyForDependance() const { return entity->getInverse(Type::IfcPropertyDependencyRelationship, 0)->as<IfcPropertyDependencyRelationship>(); }
+IfcPropertyDependencyRelationship::list::ptr IfcProperty::PropertyDependsOn() const { return entity->getInverse(Type::IfcPropertyDependencyRelationship, 1)->as<IfcPropertyDependencyRelationship>(); }
+IfcComplexProperty::list::ptr IfcProperty::PartOfComplex() const { return entity->getInverse(Type::IfcComplexProperty, 3)->as<IfcComplexProperty>(); }
 bool IfcProperty::is(Type::Enum v) const { return v == Type::IfcProperty; }
 Type::Enum IfcProperty::type() const { return Type::IfcProperty; }
 Type::Enum IfcProperty::Class() { return Type::IfcProperty; }
-IfcProperty::IfcProperty(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcProperty)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcProperty::IfcProperty(IfcIdentifier v1_Name, boost::optional< IfcText > v2_Description) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } entity = e; EntityBuffer::Add(this); }
+IfcProperty::IfcProperty(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcProperty)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcProperty::IfcProperty(std::string v1_Name, boost::optional< std::string > v2_Description) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcPropertyBoundedValue
-bool IfcPropertyBoundedValue::hasUpperBoundValue() { return !entity->getArgument(2)->isNull(); }
-IfcValue IfcPropertyBoundedValue::UpperBoundValue() { return *entity->getArgument(2); }
-void IfcPropertyBoundedValue::setUpperBoundValue(IfcValue v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-bool IfcPropertyBoundedValue::hasLowerBoundValue() { return !entity->getArgument(3)->isNull(); }
-IfcValue IfcPropertyBoundedValue::LowerBoundValue() { return *entity->getArgument(3); }
-void IfcPropertyBoundedValue::setLowerBoundValue(IfcValue v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-bool IfcPropertyBoundedValue::hasUnit() { return !entity->getArgument(4)->isNull(); }
-IfcUnit IfcPropertyBoundedValue::Unit() { return *entity->getArgument(4); }
-void IfcPropertyBoundedValue::setUnit(IfcUnit v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+bool IfcPropertyBoundedValue::hasUpperBoundValue() const { return !entity->getArgument(2)->isNull(); }
+IfcValue* IfcPropertyBoundedValue::UpperBoundValue() const { return (IfcValue*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(2))); }
+void IfcPropertyBoundedValue::setUpperBoundValue(IfcValue* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+bool IfcPropertyBoundedValue::hasLowerBoundValue() const { return !entity->getArgument(3)->isNull(); }
+IfcValue* IfcPropertyBoundedValue::LowerBoundValue() const { return (IfcValue*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(3))); }
+void IfcPropertyBoundedValue::setLowerBoundValue(IfcValue* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+bool IfcPropertyBoundedValue::hasUnit() const { return !entity->getArgument(4)->isNull(); }
+IfcUnit* IfcPropertyBoundedValue::Unit() const { return (IfcUnit*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(4))); }
+void IfcPropertyBoundedValue::setUnit(IfcUnit* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
 bool IfcPropertyBoundedValue::is(Type::Enum v) const { return v == Type::IfcPropertyBoundedValue || IfcSimpleProperty::is(v); }
 Type::Enum IfcPropertyBoundedValue::type() const { return Type::IfcPropertyBoundedValue; }
 Type::Enum IfcPropertyBoundedValue::Class() { return Type::IfcPropertyBoundedValue; }
-IfcPropertyBoundedValue::IfcPropertyBoundedValue(IfcAbstractEntityPtr e) : IfcSimpleProperty((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcPropertyBoundedValue)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcPropertyBoundedValue::IfcPropertyBoundedValue(IfcIdentifier v1_Name, boost::optional< IfcText > v2_Description, boost::optional< IfcValue > v3_UpperBoundValue, boost::optional< IfcValue > v4_LowerBoundValue, boost::optional< IfcUnit > v5_Unit) : IfcSimpleProperty((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } if (v3_UpperBoundValue) { e->setArgument(2,(*v3_UpperBoundValue)); } else { e->setArgument(2); } if (v4_LowerBoundValue) { e->setArgument(3,(*v4_LowerBoundValue)); } else { e->setArgument(3); } if (v5_Unit) { e->setArgument(4,(*v5_Unit)); } else { e->setArgument(4); } entity = e; EntityBuffer::Add(this); }
+IfcPropertyBoundedValue::IfcPropertyBoundedValue(IfcAbstractEntity* e) : IfcSimpleProperty((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcPropertyBoundedValue)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcPropertyBoundedValue::IfcPropertyBoundedValue(std::string v1_Name, boost::optional< std::string > v2_Description, IfcValue* v3_UpperBoundValue, IfcValue* v4_LowerBoundValue, IfcUnit* v5_Unit) : IfcSimpleProperty((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_UpperBoundValue)); e->setArgument(3,(v4_LowerBoundValue)); e->setArgument(4,(v5_Unit)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcPropertyConstraintRelationship
-IfcConstraint* IfcPropertyConstraintRelationship::RelatingConstraint() { return (IfcConstraint*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(0))); }
+IfcConstraint* IfcPropertyConstraintRelationship::RelatingConstraint() const { return (IfcConstraint*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(0))); }
 void IfcPropertyConstraintRelationship::setRelatingConstraint(IfcConstraint* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-SHARED_PTR< IfcTemplatedEntityList< IfcProperty > > IfcPropertyConstraintRelationship::RelatedProperties() { RETURN_AS_LIST(IfcProperty,1) }
-void IfcPropertyConstraintRelationship::setRelatedProperties(SHARED_PTR< IfcTemplatedEntityList< IfcProperty > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v->generalize()); }
-bool IfcPropertyConstraintRelationship::hasName() { return !entity->getArgument(2)->isNull(); }
-IfcLabel IfcPropertyConstraintRelationship::Name() { return *entity->getArgument(2); }
-void IfcPropertyConstraintRelationship::setName(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-bool IfcPropertyConstraintRelationship::hasDescription() { return !entity->getArgument(3)->isNull(); }
-IfcText IfcPropertyConstraintRelationship::Description() { return *entity->getArgument(3); }
-void IfcPropertyConstraintRelationship::setDescription(IfcText v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+IfcTemplatedEntityList< IfcProperty >::ptr IfcPropertyConstraintRelationship::RelatedProperties() const { IfcEntityList::ptr es = *entity->getArgument(1); return es->as<IfcProperty>(); }
+void IfcPropertyConstraintRelationship::setRelatedProperties(IfcTemplatedEntityList< IfcProperty >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v->generalize()); }
+bool IfcPropertyConstraintRelationship::hasName() const { return !entity->getArgument(2)->isNull(); }
+std::string IfcPropertyConstraintRelationship::Name() const { return *entity->getArgument(2); }
+void IfcPropertyConstraintRelationship::setName(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+bool IfcPropertyConstraintRelationship::hasDescription() const { return !entity->getArgument(3)->isNull(); }
+std::string IfcPropertyConstraintRelationship::Description() const { return *entity->getArgument(3); }
+void IfcPropertyConstraintRelationship::setDescription(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
 bool IfcPropertyConstraintRelationship::is(Type::Enum v) const { return v == Type::IfcPropertyConstraintRelationship; }
 Type::Enum IfcPropertyConstraintRelationship::type() const { return Type::IfcPropertyConstraintRelationship; }
 Type::Enum IfcPropertyConstraintRelationship::Class() { return Type::IfcPropertyConstraintRelationship; }
-IfcPropertyConstraintRelationship::IfcPropertyConstraintRelationship(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcPropertyConstraintRelationship)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcPropertyConstraintRelationship::IfcPropertyConstraintRelationship(IfcConstraint* v1_RelatingConstraint, SHARED_PTR< IfcTemplatedEntityList< IfcProperty > > v2_RelatedProperties, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_RelatingConstraint)); e->setArgument(1,(v2_RelatedProperties)->generalize()); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } entity = e; EntityBuffer::Add(this); }
+IfcPropertyConstraintRelationship::IfcPropertyConstraintRelationship(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcPropertyConstraintRelationship)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcPropertyConstraintRelationship::IfcPropertyConstraintRelationship(IfcConstraint* v1_RelatingConstraint, IfcTemplatedEntityList< IfcProperty >::ptr v2_RelatedProperties, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_RelatingConstraint)); e->setArgument(1,(v2_RelatedProperties)->generalize()); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcPropertyDefinition
-IfcRelAssociates::list IfcPropertyDefinition::HasAssociations() { RETURN_INVERSE(IfcRelAssociates) }
+IfcRelAssociates::list::ptr IfcPropertyDefinition::HasAssociations() const { return entity->getInverse(Type::IfcRelAssociates, 4)->as<IfcRelAssociates>(); }
 bool IfcPropertyDefinition::is(Type::Enum v) const { return v == Type::IfcPropertyDefinition || IfcRoot::is(v); }
 Type::Enum IfcPropertyDefinition::type() const { return Type::IfcPropertyDefinition; }
 Type::Enum IfcPropertyDefinition::Class() { return Type::IfcPropertyDefinition; }
-IfcPropertyDefinition::IfcPropertyDefinition(IfcAbstractEntityPtr e) : IfcRoot((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcPropertyDefinition)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcPropertyDefinition::IfcPropertyDefinition(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description) : IfcRoot((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } entity = e; EntityBuffer::Add(this); }
+IfcPropertyDefinition::IfcPropertyDefinition(IfcAbstractEntity* e) : IfcRoot((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcPropertyDefinition)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcPropertyDefinition::IfcPropertyDefinition(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description) : IfcRoot((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcPropertyDependencyRelationship
-IfcProperty* IfcPropertyDependencyRelationship::DependingProperty() { return (IfcProperty*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(0))); }
+IfcProperty* IfcPropertyDependencyRelationship::DependingProperty() const { return (IfcProperty*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(0))); }
 void IfcPropertyDependencyRelationship::setDependingProperty(IfcProperty* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-IfcProperty* IfcPropertyDependencyRelationship::DependantProperty() { return (IfcProperty*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(1))); }
+IfcProperty* IfcPropertyDependencyRelationship::DependantProperty() const { return (IfcProperty*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(1))); }
 void IfcPropertyDependencyRelationship::setDependantProperty(IfcProperty* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-bool IfcPropertyDependencyRelationship::hasName() { return !entity->getArgument(2)->isNull(); }
-IfcLabel IfcPropertyDependencyRelationship::Name() { return *entity->getArgument(2); }
-void IfcPropertyDependencyRelationship::setName(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-bool IfcPropertyDependencyRelationship::hasDescription() { return !entity->getArgument(3)->isNull(); }
-IfcText IfcPropertyDependencyRelationship::Description() { return *entity->getArgument(3); }
-void IfcPropertyDependencyRelationship::setDescription(IfcText v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-bool IfcPropertyDependencyRelationship::hasExpression() { return !entity->getArgument(4)->isNull(); }
-IfcText IfcPropertyDependencyRelationship::Expression() { return *entity->getArgument(4); }
-void IfcPropertyDependencyRelationship::setExpression(IfcText v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+bool IfcPropertyDependencyRelationship::hasName() const { return !entity->getArgument(2)->isNull(); }
+std::string IfcPropertyDependencyRelationship::Name() const { return *entity->getArgument(2); }
+void IfcPropertyDependencyRelationship::setName(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+bool IfcPropertyDependencyRelationship::hasDescription() const { return !entity->getArgument(3)->isNull(); }
+std::string IfcPropertyDependencyRelationship::Description() const { return *entity->getArgument(3); }
+void IfcPropertyDependencyRelationship::setDescription(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+bool IfcPropertyDependencyRelationship::hasExpression() const { return !entity->getArgument(4)->isNull(); }
+std::string IfcPropertyDependencyRelationship::Expression() const { return *entity->getArgument(4); }
+void IfcPropertyDependencyRelationship::setExpression(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
 bool IfcPropertyDependencyRelationship::is(Type::Enum v) const { return v == Type::IfcPropertyDependencyRelationship; }
 Type::Enum IfcPropertyDependencyRelationship::type() const { return Type::IfcPropertyDependencyRelationship; }
 Type::Enum IfcPropertyDependencyRelationship::Class() { return Type::IfcPropertyDependencyRelationship; }
-IfcPropertyDependencyRelationship::IfcPropertyDependencyRelationship(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcPropertyDependencyRelationship)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcPropertyDependencyRelationship::IfcPropertyDependencyRelationship(IfcProperty* v1_DependingProperty, IfcProperty* v2_DependantProperty, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcText > v5_Expression) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_DependingProperty)); e->setArgument(1,(v2_DependantProperty)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_Expression) { e->setArgument(4,(*v5_Expression)); } else { e->setArgument(4); } entity = e; EntityBuffer::Add(this); }
+IfcPropertyDependencyRelationship::IfcPropertyDependencyRelationship(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcPropertyDependencyRelationship)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcPropertyDependencyRelationship::IfcPropertyDependencyRelationship(IfcProperty* v1_DependingProperty, IfcProperty* v2_DependantProperty, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_Expression) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_DependingProperty)); e->setArgument(1,(v2_DependantProperty)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_Expression) { e->setArgument(4,(*v5_Expression)); } else { e->setArgument(4); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcPropertyEnumeratedValue
-SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > IfcPropertyEnumeratedValue::EnumerationValues() { RETURN_AS_LIST(IfcUtil::IfcAbstractSelect,2) }
-void IfcPropertyEnumeratedValue::setEnumerationValues(SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v->generalize()); }
-bool IfcPropertyEnumeratedValue::hasEnumerationReference() { return !entity->getArgument(3)->isNull(); }
-IfcPropertyEnumeration* IfcPropertyEnumeratedValue::EnumerationReference() { return (IfcPropertyEnumeration*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(3))); }
+IfcEntityList::ptr IfcPropertyEnumeratedValue::EnumerationValues() const { return *entity->getArgument(2); }
+void IfcPropertyEnumeratedValue::setEnumerationValues(IfcEntityList::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+bool IfcPropertyEnumeratedValue::hasEnumerationReference() const { return !entity->getArgument(3)->isNull(); }
+IfcPropertyEnumeration* IfcPropertyEnumeratedValue::EnumerationReference() const { return (IfcPropertyEnumeration*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(3))); }
 void IfcPropertyEnumeratedValue::setEnumerationReference(IfcPropertyEnumeration* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
 bool IfcPropertyEnumeratedValue::is(Type::Enum v) const { return v == Type::IfcPropertyEnumeratedValue || IfcSimpleProperty::is(v); }
 Type::Enum IfcPropertyEnumeratedValue::type() const { return Type::IfcPropertyEnumeratedValue; }
 Type::Enum IfcPropertyEnumeratedValue::Class() { return Type::IfcPropertyEnumeratedValue; }
-IfcPropertyEnumeratedValue::IfcPropertyEnumeratedValue(IfcAbstractEntityPtr e) : IfcSimpleProperty((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcPropertyEnumeratedValue)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcPropertyEnumeratedValue::IfcPropertyEnumeratedValue(IfcIdentifier v1_Name, boost::optional< IfcText > v2_Description, IfcEntities v3_EnumerationValues, IfcPropertyEnumeration* v4_EnumerationReference) : IfcSimpleProperty((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_EnumerationValues)); e->setArgument(3,(v4_EnumerationReference)); entity = e; EntityBuffer::Add(this); }
+IfcPropertyEnumeratedValue::IfcPropertyEnumeratedValue(IfcAbstractEntity* e) : IfcSimpleProperty((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcPropertyEnumeratedValue)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcPropertyEnumeratedValue::IfcPropertyEnumeratedValue(std::string v1_Name, boost::optional< std::string > v2_Description, IfcEntityList::ptr v3_EnumerationValues, IfcPropertyEnumeration* v4_EnumerationReference) : IfcSimpleProperty((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_EnumerationValues)); e->setArgument(3,(v4_EnumerationReference)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcPropertyEnumeration
-IfcLabel IfcPropertyEnumeration::Name() { return *entity->getArgument(0); }
-void IfcPropertyEnumeration::setName(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > IfcPropertyEnumeration::EnumerationValues() { RETURN_AS_LIST(IfcUtil::IfcAbstractSelect,1) }
-void IfcPropertyEnumeration::setEnumerationValues(SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v->generalize()); }
-bool IfcPropertyEnumeration::hasUnit() { return !entity->getArgument(2)->isNull(); }
-IfcUnit IfcPropertyEnumeration::Unit() { return *entity->getArgument(2); }
-void IfcPropertyEnumeration::setUnit(IfcUnit v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+std::string IfcPropertyEnumeration::Name() const { return *entity->getArgument(0); }
+void IfcPropertyEnumeration::setName(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+IfcEntityList::ptr IfcPropertyEnumeration::EnumerationValues() const { return *entity->getArgument(1); }
+void IfcPropertyEnumeration::setEnumerationValues(IfcEntityList::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+bool IfcPropertyEnumeration::hasUnit() const { return !entity->getArgument(2)->isNull(); }
+IfcUnit* IfcPropertyEnumeration::Unit() const { return (IfcUnit*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(2))); }
+void IfcPropertyEnumeration::setUnit(IfcUnit* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
 bool IfcPropertyEnumeration::is(Type::Enum v) const { return v == Type::IfcPropertyEnumeration; }
 Type::Enum IfcPropertyEnumeration::type() const { return Type::IfcPropertyEnumeration; }
 Type::Enum IfcPropertyEnumeration::Class() { return Type::IfcPropertyEnumeration; }
-IfcPropertyEnumeration::IfcPropertyEnumeration(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcPropertyEnumeration)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcPropertyEnumeration::IfcPropertyEnumeration(IfcLabel v1_Name, IfcEntities v2_EnumerationValues, boost::optional< IfcUnit > v3_Unit) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); e->setArgument(1,(v2_EnumerationValues)); if (v3_Unit) { e->setArgument(2,(*v3_Unit)); } else { e->setArgument(2); } entity = e; EntityBuffer::Add(this); }
+IfcPropertyEnumeration::IfcPropertyEnumeration(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcPropertyEnumeration)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcPropertyEnumeration::IfcPropertyEnumeration(std::string v1_Name, IfcEntityList::ptr v2_EnumerationValues, IfcUnit* v3_Unit) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); e->setArgument(1,(v2_EnumerationValues)); e->setArgument(2,(v3_Unit)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcPropertyListValue
-SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > IfcPropertyListValue::ListValues() { RETURN_AS_LIST(IfcUtil::IfcAbstractSelect,2) }
-void IfcPropertyListValue::setListValues(SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v->generalize()); }
-bool IfcPropertyListValue::hasUnit() { return !entity->getArgument(3)->isNull(); }
-IfcUnit IfcPropertyListValue::Unit() { return *entity->getArgument(3); }
-void IfcPropertyListValue::setUnit(IfcUnit v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+IfcEntityList::ptr IfcPropertyListValue::ListValues() const { return *entity->getArgument(2); }
+void IfcPropertyListValue::setListValues(IfcEntityList::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+bool IfcPropertyListValue::hasUnit() const { return !entity->getArgument(3)->isNull(); }
+IfcUnit* IfcPropertyListValue::Unit() const { return (IfcUnit*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(3))); }
+void IfcPropertyListValue::setUnit(IfcUnit* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
 bool IfcPropertyListValue::is(Type::Enum v) const { return v == Type::IfcPropertyListValue || IfcSimpleProperty::is(v); }
 Type::Enum IfcPropertyListValue::type() const { return Type::IfcPropertyListValue; }
 Type::Enum IfcPropertyListValue::Class() { return Type::IfcPropertyListValue; }
-IfcPropertyListValue::IfcPropertyListValue(IfcAbstractEntityPtr e) : IfcSimpleProperty((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcPropertyListValue)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcPropertyListValue::IfcPropertyListValue(IfcIdentifier v1_Name, boost::optional< IfcText > v2_Description, IfcEntities v3_ListValues, boost::optional< IfcUnit > v4_Unit) : IfcSimpleProperty((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_ListValues)); if (v4_Unit) { e->setArgument(3,(*v4_Unit)); } else { e->setArgument(3); } entity = e; EntityBuffer::Add(this); }
+IfcPropertyListValue::IfcPropertyListValue(IfcAbstractEntity* e) : IfcSimpleProperty((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcPropertyListValue)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcPropertyListValue::IfcPropertyListValue(std::string v1_Name, boost::optional< std::string > v2_Description, IfcEntityList::ptr v3_ListValues, IfcUnit* v4_Unit) : IfcSimpleProperty((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_ListValues)); e->setArgument(3,(v4_Unit)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcPropertyReferenceValue
-bool IfcPropertyReferenceValue::hasUsageName() { return !entity->getArgument(2)->isNull(); }
-IfcLabel IfcPropertyReferenceValue::UsageName() { return *entity->getArgument(2); }
-void IfcPropertyReferenceValue::setUsageName(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-IfcObjectReferenceSelect IfcPropertyReferenceValue::PropertyReference() { return *entity->getArgument(3); }
-void IfcPropertyReferenceValue::setPropertyReference(IfcObjectReferenceSelect v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+bool IfcPropertyReferenceValue::hasUsageName() const { return !entity->getArgument(2)->isNull(); }
+std::string IfcPropertyReferenceValue::UsageName() const { return *entity->getArgument(2); }
+void IfcPropertyReferenceValue::setUsageName(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+IfcObjectReferenceSelect* IfcPropertyReferenceValue::PropertyReference() const { return (IfcObjectReferenceSelect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(3))); }
+void IfcPropertyReferenceValue::setPropertyReference(IfcObjectReferenceSelect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
 bool IfcPropertyReferenceValue::is(Type::Enum v) const { return v == Type::IfcPropertyReferenceValue || IfcSimpleProperty::is(v); }
 Type::Enum IfcPropertyReferenceValue::type() const { return Type::IfcPropertyReferenceValue; }
 Type::Enum IfcPropertyReferenceValue::Class() { return Type::IfcPropertyReferenceValue; }
-IfcPropertyReferenceValue::IfcPropertyReferenceValue(IfcAbstractEntityPtr e) : IfcSimpleProperty((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcPropertyReferenceValue)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcPropertyReferenceValue::IfcPropertyReferenceValue(IfcIdentifier v1_Name, boost::optional< IfcText > v2_Description, boost::optional< IfcLabel > v3_UsageName, IfcObjectReferenceSelect v4_PropertyReference) : IfcSimpleProperty((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } if (v3_UsageName) { e->setArgument(2,(*v3_UsageName)); } else { e->setArgument(2); } e->setArgument(3,(v4_PropertyReference)); entity = e; EntityBuffer::Add(this); }
+IfcPropertyReferenceValue::IfcPropertyReferenceValue(IfcAbstractEntity* e) : IfcSimpleProperty((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcPropertyReferenceValue)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcPropertyReferenceValue::IfcPropertyReferenceValue(std::string v1_Name, boost::optional< std::string > v2_Description, boost::optional< std::string > v3_UsageName, IfcObjectReferenceSelect* v4_PropertyReference) : IfcSimpleProperty((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } if (v3_UsageName) { e->setArgument(2,(*v3_UsageName)); } else { e->setArgument(2); } e->setArgument(3,(v4_PropertyReference)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcPropertySet
-SHARED_PTR< IfcTemplatedEntityList< IfcProperty > > IfcPropertySet::HasProperties() { RETURN_AS_LIST(IfcProperty,4) }
-void IfcPropertySet::setHasProperties(SHARED_PTR< IfcTemplatedEntityList< IfcProperty > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v->generalize()); }
+IfcTemplatedEntityList< IfcProperty >::ptr IfcPropertySet::HasProperties() const { IfcEntityList::ptr es = *entity->getArgument(4); return es->as<IfcProperty>(); }
+void IfcPropertySet::setHasProperties(IfcTemplatedEntityList< IfcProperty >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v->generalize()); }
 bool IfcPropertySet::is(Type::Enum v) const { return v == Type::IfcPropertySet || IfcPropertySetDefinition::is(v); }
 Type::Enum IfcPropertySet::type() const { return Type::IfcPropertySet; }
 Type::Enum IfcPropertySet::Class() { return Type::IfcPropertySet; }
-IfcPropertySet::IfcPropertySet(IfcAbstractEntityPtr e) : IfcPropertySetDefinition((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcPropertySet)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcPropertySet::IfcPropertySet(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, SHARED_PTR< IfcTemplatedEntityList< IfcProperty > > v5_HasProperties) : IfcPropertySetDefinition((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_HasProperties)->generalize()); entity = e; EntityBuffer::Add(this); }
+IfcPropertySet::IfcPropertySet(IfcAbstractEntity* e) : IfcPropertySetDefinition((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcPropertySet)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcPropertySet::IfcPropertySet(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcTemplatedEntityList< IfcProperty >::ptr v5_HasProperties) : IfcPropertySetDefinition((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_HasProperties)->generalize()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcPropertySetDefinition
-IfcRelDefinesByProperties::list IfcPropertySetDefinition::PropertyDefinitionOf() { RETURN_INVERSE(IfcRelDefinesByProperties) }
-IfcTypeObject::list IfcPropertySetDefinition::DefinesType() { RETURN_INVERSE(IfcTypeObject) }
+IfcRelDefinesByProperties::list::ptr IfcPropertySetDefinition::PropertyDefinitionOf() const { return entity->getInverse(Type::IfcRelDefinesByProperties, 5)->as<IfcRelDefinesByProperties>(); }
+IfcTypeObject::list::ptr IfcPropertySetDefinition::DefinesType() const { return entity->getInverse(Type::IfcTypeObject, 5)->as<IfcTypeObject>(); }
 bool IfcPropertySetDefinition::is(Type::Enum v) const { return v == Type::IfcPropertySetDefinition || IfcPropertyDefinition::is(v); }
 Type::Enum IfcPropertySetDefinition::type() const { return Type::IfcPropertySetDefinition; }
 Type::Enum IfcPropertySetDefinition::Class() { return Type::IfcPropertySetDefinition; }
-IfcPropertySetDefinition::IfcPropertySetDefinition(IfcAbstractEntityPtr e) : IfcPropertyDefinition((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcPropertySetDefinition)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcPropertySetDefinition::IfcPropertySetDefinition(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description) : IfcPropertyDefinition((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } entity = e; EntityBuffer::Add(this); }
+IfcPropertySetDefinition::IfcPropertySetDefinition(IfcAbstractEntity* e) : IfcPropertyDefinition((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcPropertySetDefinition)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcPropertySetDefinition::IfcPropertySetDefinition(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description) : IfcPropertyDefinition((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcPropertySingleValue
-bool IfcPropertySingleValue::hasNominalValue() { return !entity->getArgument(2)->isNull(); }
-IfcValue IfcPropertySingleValue::NominalValue() { return *entity->getArgument(2); }
-void IfcPropertySingleValue::setNominalValue(IfcValue v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-bool IfcPropertySingleValue::hasUnit() { return !entity->getArgument(3)->isNull(); }
-IfcUnit IfcPropertySingleValue::Unit() { return *entity->getArgument(3); }
-void IfcPropertySingleValue::setUnit(IfcUnit v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+bool IfcPropertySingleValue::hasNominalValue() const { return !entity->getArgument(2)->isNull(); }
+IfcValue* IfcPropertySingleValue::NominalValue() const { return (IfcValue*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(2))); }
+void IfcPropertySingleValue::setNominalValue(IfcValue* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+bool IfcPropertySingleValue::hasUnit() const { return !entity->getArgument(3)->isNull(); }
+IfcUnit* IfcPropertySingleValue::Unit() const { return (IfcUnit*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(3))); }
+void IfcPropertySingleValue::setUnit(IfcUnit* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
 bool IfcPropertySingleValue::is(Type::Enum v) const { return v == Type::IfcPropertySingleValue || IfcSimpleProperty::is(v); }
 Type::Enum IfcPropertySingleValue::type() const { return Type::IfcPropertySingleValue; }
 Type::Enum IfcPropertySingleValue::Class() { return Type::IfcPropertySingleValue; }
-IfcPropertySingleValue::IfcPropertySingleValue(IfcAbstractEntityPtr e) : IfcSimpleProperty((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcPropertySingleValue)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcPropertySingleValue::IfcPropertySingleValue(IfcIdentifier v1_Name, boost::optional< IfcText > v2_Description, boost::optional< IfcValue > v3_NominalValue, boost::optional< IfcUnit > v4_Unit) : IfcSimpleProperty((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } if (v3_NominalValue) { e->setArgument(2,(*v3_NominalValue)); } else { e->setArgument(2); } if (v4_Unit) { e->setArgument(3,(*v4_Unit)); } else { e->setArgument(3); } entity = e; EntityBuffer::Add(this); }
+IfcPropertySingleValue::IfcPropertySingleValue(IfcAbstractEntity* e) : IfcSimpleProperty((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcPropertySingleValue)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcPropertySingleValue::IfcPropertySingleValue(std::string v1_Name, boost::optional< std::string > v2_Description, IfcValue* v3_NominalValue, IfcUnit* v4_Unit) : IfcSimpleProperty((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_NominalValue)); e->setArgument(3,(v4_Unit)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcPropertyTableValue
-SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > IfcPropertyTableValue::DefiningValues() { RETURN_AS_LIST(IfcUtil::IfcAbstractSelect,2) }
-void IfcPropertyTableValue::setDefiningValues(SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v->generalize()); }
-SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > IfcPropertyTableValue::DefinedValues() { RETURN_AS_LIST(IfcUtil::IfcAbstractSelect,3) }
-void IfcPropertyTableValue::setDefinedValues(SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v->generalize()); }
-bool IfcPropertyTableValue::hasExpression() { return !entity->getArgument(4)->isNull(); }
-IfcText IfcPropertyTableValue::Expression() { return *entity->getArgument(4); }
-void IfcPropertyTableValue::setExpression(IfcText v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-bool IfcPropertyTableValue::hasDefiningUnit() { return !entity->getArgument(5)->isNull(); }
-IfcUnit IfcPropertyTableValue::DefiningUnit() { return *entity->getArgument(5); }
-void IfcPropertyTableValue::setDefiningUnit(IfcUnit v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-bool IfcPropertyTableValue::hasDefinedUnit() { return !entity->getArgument(6)->isNull(); }
-IfcUnit IfcPropertyTableValue::DefinedUnit() { return *entity->getArgument(6); }
-void IfcPropertyTableValue::setDefinedUnit(IfcUnit v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
+IfcEntityList::ptr IfcPropertyTableValue::DefiningValues() const { return *entity->getArgument(2); }
+void IfcPropertyTableValue::setDefiningValues(IfcEntityList::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+IfcEntityList::ptr IfcPropertyTableValue::DefinedValues() const { return *entity->getArgument(3); }
+void IfcPropertyTableValue::setDefinedValues(IfcEntityList::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+bool IfcPropertyTableValue::hasExpression() const { return !entity->getArgument(4)->isNull(); }
+std::string IfcPropertyTableValue::Expression() const { return *entity->getArgument(4); }
+void IfcPropertyTableValue::setExpression(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+bool IfcPropertyTableValue::hasDefiningUnit() const { return !entity->getArgument(5)->isNull(); }
+IfcUnit* IfcPropertyTableValue::DefiningUnit() const { return (IfcUnit*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(5))); }
+void IfcPropertyTableValue::setDefiningUnit(IfcUnit* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+bool IfcPropertyTableValue::hasDefinedUnit() const { return !entity->getArgument(6)->isNull(); }
+IfcUnit* IfcPropertyTableValue::DefinedUnit() const { return (IfcUnit*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(6))); }
+void IfcPropertyTableValue::setDefinedUnit(IfcUnit* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
 bool IfcPropertyTableValue::is(Type::Enum v) const { return v == Type::IfcPropertyTableValue || IfcSimpleProperty::is(v); }
 Type::Enum IfcPropertyTableValue::type() const { return Type::IfcPropertyTableValue; }
 Type::Enum IfcPropertyTableValue::Class() { return Type::IfcPropertyTableValue; }
-IfcPropertyTableValue::IfcPropertyTableValue(IfcAbstractEntityPtr e) : IfcSimpleProperty((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcPropertyTableValue)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcPropertyTableValue::IfcPropertyTableValue(IfcIdentifier v1_Name, boost::optional< IfcText > v2_Description, IfcEntities v3_DefiningValues, IfcEntities v4_DefinedValues, boost::optional< IfcText > v5_Expression, boost::optional< IfcUnit > v6_DefiningUnit, boost::optional< IfcUnit > v7_DefinedUnit) : IfcSimpleProperty((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_DefiningValues)); e->setArgument(3,(v4_DefinedValues)); if (v5_Expression) { e->setArgument(4,(*v5_Expression)); } else { e->setArgument(4); } if (v6_DefiningUnit) { e->setArgument(5,(*v6_DefiningUnit)); } else { e->setArgument(5); } if (v7_DefinedUnit) { e->setArgument(6,(*v7_DefinedUnit)); } else { e->setArgument(6); } entity = e; EntityBuffer::Add(this); }
+IfcPropertyTableValue::IfcPropertyTableValue(IfcAbstractEntity* e) : IfcSimpleProperty((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcPropertyTableValue)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcPropertyTableValue::IfcPropertyTableValue(std::string v1_Name, boost::optional< std::string > v2_Description, IfcEntityList::ptr v3_DefiningValues, IfcEntityList::ptr v4_DefinedValues, boost::optional< std::string > v5_Expression, IfcUnit* v6_DefiningUnit, IfcUnit* v7_DefinedUnit) : IfcSimpleProperty((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_DefiningValues)); e->setArgument(3,(v4_DefinedValues)); if (v5_Expression) { e->setArgument(4,(*v5_Expression)); } else { e->setArgument(4); } e->setArgument(5,(v6_DefiningUnit)); e->setArgument(6,(v7_DefinedUnit)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcProtectiveDeviceType
-IfcProtectiveDeviceTypeEnum::IfcProtectiveDeviceTypeEnum IfcProtectiveDeviceType::PredefinedType() { return IfcProtectiveDeviceTypeEnum::FromString(*entity->getArgument(9)); }
+IfcProtectiveDeviceTypeEnum::IfcProtectiveDeviceTypeEnum IfcProtectiveDeviceType::PredefinedType() const { return IfcProtectiveDeviceTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcProtectiveDeviceType::setPredefinedType(IfcProtectiveDeviceTypeEnum::IfcProtectiveDeviceTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcProtectiveDeviceTypeEnum::ToString(v)); }
 bool IfcProtectiveDeviceType::is(Type::Enum v) const { return v == Type::IfcProtectiveDeviceType || IfcFlowControllerType::is(v); }
 Type::Enum IfcProtectiveDeviceType::type() const { return Type::IfcProtectiveDeviceType; }
 Type::Enum IfcProtectiveDeviceType::Class() { return Type::IfcProtectiveDeviceType; }
-IfcProtectiveDeviceType::IfcProtectiveDeviceType(IfcAbstractEntityPtr e) : IfcFlowControllerType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcProtectiveDeviceType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcProtectiveDeviceType::IfcProtectiveDeviceType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcProtectiveDeviceTypeEnum::IfcProtectiveDeviceTypeEnum v10_PredefinedType) : IfcFlowControllerType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcProtectiveDeviceTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcProtectiveDeviceType::IfcProtectiveDeviceType(IfcAbstractEntity* e) : IfcFlowControllerType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcProtectiveDeviceType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcProtectiveDeviceType::IfcProtectiveDeviceType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcProtectiveDeviceTypeEnum::IfcProtectiveDeviceTypeEnum v10_PredefinedType) : IfcFlowControllerType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcProtectiveDeviceTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcProxy
-IfcObjectTypeEnum::IfcObjectTypeEnum IfcProxy::ProxyType() { return IfcObjectTypeEnum::FromString(*entity->getArgument(7)); }
+IfcObjectTypeEnum::IfcObjectTypeEnum IfcProxy::ProxyType() const { return IfcObjectTypeEnum::FromString(*entity->getArgument(7)); }
 void IfcProxy::setProxyType(IfcObjectTypeEnum::IfcObjectTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v,IfcObjectTypeEnum::ToString(v)); }
-bool IfcProxy::hasTag() { return !entity->getArgument(8)->isNull(); }
-IfcLabel IfcProxy::Tag() { return *entity->getArgument(8); }
-void IfcProxy::setTag(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
+bool IfcProxy::hasTag() const { return !entity->getArgument(8)->isNull(); }
+std::string IfcProxy::Tag() const { return *entity->getArgument(8); }
+void IfcProxy::setTag(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
 bool IfcProxy::is(Type::Enum v) const { return v == Type::IfcProxy || IfcProduct::is(v); }
 Type::Enum IfcProxy::type() const { return Type::IfcProxy; }
 Type::Enum IfcProxy::Class() { return Type::IfcProxy; }
-IfcProxy::IfcProxy(IfcAbstractEntityPtr e) : IfcProduct((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcProxy)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcProxy::IfcProxy(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcObjectTypeEnum::IfcObjectTypeEnum v8_ProxyType, boost::optional< IfcLabel > v9_Tag) : IfcProduct((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); e->setArgument(7,v8_ProxyType,IfcObjectTypeEnum::ToString(v8_ProxyType)); if (v9_Tag) { e->setArgument(8,(*v9_Tag)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcProxy::IfcProxy(IfcAbstractEntity* e) : IfcProduct((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcProxy)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcProxy::IfcProxy(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcObjectTypeEnum::IfcObjectTypeEnum v8_ProxyType, boost::optional< std::string > v9_Tag) : IfcProduct((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); e->setArgument(7,v8_ProxyType,IfcObjectTypeEnum::ToString(v8_ProxyType)); if (v9_Tag) { e->setArgument(8,(*v9_Tag)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcPumpType
-IfcPumpTypeEnum::IfcPumpTypeEnum IfcPumpType::PredefinedType() { return IfcPumpTypeEnum::FromString(*entity->getArgument(9)); }
+IfcPumpTypeEnum::IfcPumpTypeEnum IfcPumpType::PredefinedType() const { return IfcPumpTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcPumpType::setPredefinedType(IfcPumpTypeEnum::IfcPumpTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcPumpTypeEnum::ToString(v)); }
 bool IfcPumpType::is(Type::Enum v) const { return v == Type::IfcPumpType || IfcFlowMovingDeviceType::is(v); }
 Type::Enum IfcPumpType::type() const { return Type::IfcPumpType; }
 Type::Enum IfcPumpType::Class() { return Type::IfcPumpType; }
-IfcPumpType::IfcPumpType(IfcAbstractEntityPtr e) : IfcFlowMovingDeviceType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcPumpType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcPumpType::IfcPumpType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcPumpTypeEnum::IfcPumpTypeEnum v10_PredefinedType) : IfcFlowMovingDeviceType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcPumpTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcPumpType::IfcPumpType(IfcAbstractEntity* e) : IfcFlowMovingDeviceType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcPumpType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcPumpType::IfcPumpType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcPumpTypeEnum::IfcPumpTypeEnum v10_PredefinedType) : IfcFlowMovingDeviceType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcPumpTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcQuantityArea
-IfcAreaMeasure IfcQuantityArea::AreaValue() { return *entity->getArgument(3); }
-void IfcQuantityArea::setAreaValue(IfcAreaMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+double IfcQuantityArea::AreaValue() const { return *entity->getArgument(3); }
+void IfcQuantityArea::setAreaValue(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
 bool IfcQuantityArea::is(Type::Enum v) const { return v == Type::IfcQuantityArea || IfcPhysicalSimpleQuantity::is(v); }
 Type::Enum IfcQuantityArea::type() const { return Type::IfcQuantityArea; }
 Type::Enum IfcQuantityArea::Class() { return Type::IfcQuantityArea; }
-IfcQuantityArea::IfcQuantityArea(IfcAbstractEntityPtr e) : IfcPhysicalSimpleQuantity((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcQuantityArea)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcQuantityArea::IfcQuantityArea(IfcLabel v1_Name, boost::optional< IfcText > v2_Description, IfcNamedUnit* v3_Unit, IfcAreaMeasure v4_AreaValue) : IfcPhysicalSimpleQuantity((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_Unit)); e->setArgument(3,(v4_AreaValue)); entity = e; EntityBuffer::Add(this); }
+IfcQuantityArea::IfcQuantityArea(IfcAbstractEntity* e) : IfcPhysicalSimpleQuantity((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcQuantityArea)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcQuantityArea::IfcQuantityArea(std::string v1_Name, boost::optional< std::string > v2_Description, IfcNamedUnit* v3_Unit, double v4_AreaValue) : IfcPhysicalSimpleQuantity((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_Unit)); e->setArgument(3,(v4_AreaValue)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcQuantityCount
-IfcCountMeasure IfcQuantityCount::CountValue() { return *entity->getArgument(3); }
-void IfcQuantityCount::setCountValue(IfcCountMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+double IfcQuantityCount::CountValue() const { return *entity->getArgument(3); }
+void IfcQuantityCount::setCountValue(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
 bool IfcQuantityCount::is(Type::Enum v) const { return v == Type::IfcQuantityCount || IfcPhysicalSimpleQuantity::is(v); }
 Type::Enum IfcQuantityCount::type() const { return Type::IfcQuantityCount; }
 Type::Enum IfcQuantityCount::Class() { return Type::IfcQuantityCount; }
-IfcQuantityCount::IfcQuantityCount(IfcAbstractEntityPtr e) : IfcPhysicalSimpleQuantity((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcQuantityCount)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcQuantityCount::IfcQuantityCount(IfcLabel v1_Name, boost::optional< IfcText > v2_Description, IfcNamedUnit* v3_Unit, IfcCountMeasure v4_CountValue) : IfcPhysicalSimpleQuantity((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_Unit)); e->setArgument(3,(v4_CountValue)); entity = e; EntityBuffer::Add(this); }
+IfcQuantityCount::IfcQuantityCount(IfcAbstractEntity* e) : IfcPhysicalSimpleQuantity((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcQuantityCount)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcQuantityCount::IfcQuantityCount(std::string v1_Name, boost::optional< std::string > v2_Description, IfcNamedUnit* v3_Unit, double v4_CountValue) : IfcPhysicalSimpleQuantity((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_Unit)); e->setArgument(3,(v4_CountValue)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcQuantityLength
-IfcLengthMeasure IfcQuantityLength::LengthValue() { return *entity->getArgument(3); }
-void IfcQuantityLength::setLengthValue(IfcLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+double IfcQuantityLength::LengthValue() const { return *entity->getArgument(3); }
+void IfcQuantityLength::setLengthValue(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
 bool IfcQuantityLength::is(Type::Enum v) const { return v == Type::IfcQuantityLength || IfcPhysicalSimpleQuantity::is(v); }
 Type::Enum IfcQuantityLength::type() const { return Type::IfcQuantityLength; }
 Type::Enum IfcQuantityLength::Class() { return Type::IfcQuantityLength; }
-IfcQuantityLength::IfcQuantityLength(IfcAbstractEntityPtr e) : IfcPhysicalSimpleQuantity((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcQuantityLength)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcQuantityLength::IfcQuantityLength(IfcLabel v1_Name, boost::optional< IfcText > v2_Description, IfcNamedUnit* v3_Unit, IfcLengthMeasure v4_LengthValue) : IfcPhysicalSimpleQuantity((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_Unit)); e->setArgument(3,(v4_LengthValue)); entity = e; EntityBuffer::Add(this); }
+IfcQuantityLength::IfcQuantityLength(IfcAbstractEntity* e) : IfcPhysicalSimpleQuantity((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcQuantityLength)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcQuantityLength::IfcQuantityLength(std::string v1_Name, boost::optional< std::string > v2_Description, IfcNamedUnit* v3_Unit, double v4_LengthValue) : IfcPhysicalSimpleQuantity((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_Unit)); e->setArgument(3,(v4_LengthValue)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcQuantityTime
-IfcTimeMeasure IfcQuantityTime::TimeValue() { return *entity->getArgument(3); }
-void IfcQuantityTime::setTimeValue(IfcTimeMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+double IfcQuantityTime::TimeValue() const { return *entity->getArgument(3); }
+void IfcQuantityTime::setTimeValue(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
 bool IfcQuantityTime::is(Type::Enum v) const { return v == Type::IfcQuantityTime || IfcPhysicalSimpleQuantity::is(v); }
 Type::Enum IfcQuantityTime::type() const { return Type::IfcQuantityTime; }
 Type::Enum IfcQuantityTime::Class() { return Type::IfcQuantityTime; }
-IfcQuantityTime::IfcQuantityTime(IfcAbstractEntityPtr e) : IfcPhysicalSimpleQuantity((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcQuantityTime)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcQuantityTime::IfcQuantityTime(IfcLabel v1_Name, boost::optional< IfcText > v2_Description, IfcNamedUnit* v3_Unit, IfcTimeMeasure v4_TimeValue) : IfcPhysicalSimpleQuantity((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_Unit)); e->setArgument(3,(v4_TimeValue)); entity = e; EntityBuffer::Add(this); }
+IfcQuantityTime::IfcQuantityTime(IfcAbstractEntity* e) : IfcPhysicalSimpleQuantity((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcQuantityTime)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcQuantityTime::IfcQuantityTime(std::string v1_Name, boost::optional< std::string > v2_Description, IfcNamedUnit* v3_Unit, double v4_TimeValue) : IfcPhysicalSimpleQuantity((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_Unit)); e->setArgument(3,(v4_TimeValue)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcQuantityVolume
-IfcVolumeMeasure IfcQuantityVolume::VolumeValue() { return *entity->getArgument(3); }
-void IfcQuantityVolume::setVolumeValue(IfcVolumeMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+double IfcQuantityVolume::VolumeValue() const { return *entity->getArgument(3); }
+void IfcQuantityVolume::setVolumeValue(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
 bool IfcQuantityVolume::is(Type::Enum v) const { return v == Type::IfcQuantityVolume || IfcPhysicalSimpleQuantity::is(v); }
 Type::Enum IfcQuantityVolume::type() const { return Type::IfcQuantityVolume; }
 Type::Enum IfcQuantityVolume::Class() { return Type::IfcQuantityVolume; }
-IfcQuantityVolume::IfcQuantityVolume(IfcAbstractEntityPtr e) : IfcPhysicalSimpleQuantity((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcQuantityVolume)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcQuantityVolume::IfcQuantityVolume(IfcLabel v1_Name, boost::optional< IfcText > v2_Description, IfcNamedUnit* v3_Unit, IfcVolumeMeasure v4_VolumeValue) : IfcPhysicalSimpleQuantity((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_Unit)); e->setArgument(3,(v4_VolumeValue)); entity = e; EntityBuffer::Add(this); }
+IfcQuantityVolume::IfcQuantityVolume(IfcAbstractEntity* e) : IfcPhysicalSimpleQuantity((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcQuantityVolume)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcQuantityVolume::IfcQuantityVolume(std::string v1_Name, boost::optional< std::string > v2_Description, IfcNamedUnit* v3_Unit, double v4_VolumeValue) : IfcPhysicalSimpleQuantity((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_Unit)); e->setArgument(3,(v4_VolumeValue)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcQuantityWeight
-IfcMassMeasure IfcQuantityWeight::WeightValue() { return *entity->getArgument(3); }
-void IfcQuantityWeight::setWeightValue(IfcMassMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+double IfcQuantityWeight::WeightValue() const { return *entity->getArgument(3); }
+void IfcQuantityWeight::setWeightValue(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
 bool IfcQuantityWeight::is(Type::Enum v) const { return v == Type::IfcQuantityWeight || IfcPhysicalSimpleQuantity::is(v); }
 Type::Enum IfcQuantityWeight::type() const { return Type::IfcQuantityWeight; }
 Type::Enum IfcQuantityWeight::Class() { return Type::IfcQuantityWeight; }
-IfcQuantityWeight::IfcQuantityWeight(IfcAbstractEntityPtr e) : IfcPhysicalSimpleQuantity((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcQuantityWeight)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcQuantityWeight::IfcQuantityWeight(IfcLabel v1_Name, boost::optional< IfcText > v2_Description, IfcNamedUnit* v3_Unit, IfcMassMeasure v4_WeightValue) : IfcPhysicalSimpleQuantity((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_Unit)); e->setArgument(3,(v4_WeightValue)); entity = e; EntityBuffer::Add(this); }
+IfcQuantityWeight::IfcQuantityWeight(IfcAbstractEntity* e) : IfcPhysicalSimpleQuantity((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcQuantityWeight)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcQuantityWeight::IfcQuantityWeight(std::string v1_Name, boost::optional< std::string > v2_Description, IfcNamedUnit* v3_Unit, double v4_WeightValue) : IfcPhysicalSimpleQuantity((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_Unit)); e->setArgument(3,(v4_WeightValue)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRadiusDimension
 bool IfcRadiusDimension::is(Type::Enum v) const { return v == Type::IfcRadiusDimension || IfcDimensionCurveDirectedCallout::is(v); }
 Type::Enum IfcRadiusDimension::type() const { return Type::IfcRadiusDimension; }
 Type::Enum IfcRadiusDimension::Class() { return Type::IfcRadiusDimension; }
-IfcRadiusDimension::IfcRadiusDimension(IfcAbstractEntityPtr e) : IfcDimensionCurveDirectedCallout((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRadiusDimension)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRadiusDimension::IfcRadiusDimension(IfcEntities v1_Contents) : IfcDimensionCurveDirectedCallout((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Contents)); entity = e; EntityBuffer::Add(this); }
+IfcRadiusDimension::IfcRadiusDimension(IfcAbstractEntity* e) : IfcDimensionCurveDirectedCallout((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRadiusDimension)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRadiusDimension::IfcRadiusDimension(IfcEntityList::ptr v1_Contents) : IfcDimensionCurveDirectedCallout((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Contents)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRailing
-bool IfcRailing::hasPredefinedType() { return !entity->getArgument(8)->isNull(); }
-IfcRailingTypeEnum::IfcRailingTypeEnum IfcRailing::PredefinedType() { return IfcRailingTypeEnum::FromString(*entity->getArgument(8)); }
+bool IfcRailing::hasPredefinedType() const { return !entity->getArgument(8)->isNull(); }
+IfcRailingTypeEnum::IfcRailingTypeEnum IfcRailing::PredefinedType() const { return IfcRailingTypeEnum::FromString(*entity->getArgument(8)); }
 void IfcRailing::setPredefinedType(IfcRailingTypeEnum::IfcRailingTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcRailingTypeEnum::ToString(v)); }
 bool IfcRailing::is(Type::Enum v) const { return v == Type::IfcRailing || IfcBuildingElement::is(v); }
 Type::Enum IfcRailing::type() const { return Type::IfcRailing; }
 Type::Enum IfcRailing::Class() { return Type::IfcRailing; }
-IfcRailing::IfcRailing(IfcAbstractEntityPtr e) : IfcBuildingElement((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRailing)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRailing::IfcRailing(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcRailingTypeEnum::IfcRailingTypeEnum > v9_PredefinedType) : IfcBuildingElement((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcRailingTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcRailing::IfcRailing(IfcAbstractEntity* e) : IfcBuildingElement((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRailing)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRailing::IfcRailing(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcRailingTypeEnum::IfcRailingTypeEnum > v9_PredefinedType) : IfcBuildingElement((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcRailingTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRailingType
-IfcRailingTypeEnum::IfcRailingTypeEnum IfcRailingType::PredefinedType() { return IfcRailingTypeEnum::FromString(*entity->getArgument(9)); }
+IfcRailingTypeEnum::IfcRailingTypeEnum IfcRailingType::PredefinedType() const { return IfcRailingTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcRailingType::setPredefinedType(IfcRailingTypeEnum::IfcRailingTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcRailingTypeEnum::ToString(v)); }
 bool IfcRailingType::is(Type::Enum v) const { return v == Type::IfcRailingType || IfcBuildingElementType::is(v); }
 Type::Enum IfcRailingType::type() const { return Type::IfcRailingType; }
 Type::Enum IfcRailingType::Class() { return Type::IfcRailingType; }
-IfcRailingType::IfcRailingType(IfcAbstractEntityPtr e) : IfcBuildingElementType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRailingType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRailingType::IfcRailingType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcRailingTypeEnum::IfcRailingTypeEnum v10_PredefinedType) : IfcBuildingElementType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcRailingTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcRailingType::IfcRailingType(IfcAbstractEntity* e) : IfcBuildingElementType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRailingType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRailingType::IfcRailingType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcRailingTypeEnum::IfcRailingTypeEnum v10_PredefinedType) : IfcBuildingElementType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcRailingTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRamp
-IfcRampTypeEnum::IfcRampTypeEnum IfcRamp::ShapeType() { return IfcRampTypeEnum::FromString(*entity->getArgument(8)); }
+IfcRampTypeEnum::IfcRampTypeEnum IfcRamp::ShapeType() const { return IfcRampTypeEnum::FromString(*entity->getArgument(8)); }
 void IfcRamp::setShapeType(IfcRampTypeEnum::IfcRampTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcRampTypeEnum::ToString(v)); }
 bool IfcRamp::is(Type::Enum v) const { return v == Type::IfcRamp || IfcBuildingElement::is(v); }
 Type::Enum IfcRamp::type() const { return Type::IfcRamp; }
 Type::Enum IfcRamp::Class() { return Type::IfcRamp; }
-IfcRamp::IfcRamp(IfcAbstractEntityPtr e) : IfcBuildingElement((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRamp)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRamp::IfcRamp(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, IfcRampTypeEnum::IfcRampTypeEnum v9_ShapeType) : IfcBuildingElement((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } e->setArgument(8,v9_ShapeType,IfcRampTypeEnum::ToString(v9_ShapeType)); entity = e; EntityBuffer::Add(this); }
+IfcRamp::IfcRamp(IfcAbstractEntity* e) : IfcBuildingElement((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRamp)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRamp::IfcRamp(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, IfcRampTypeEnum::IfcRampTypeEnum v9_ShapeType) : IfcBuildingElement((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } e->setArgument(8,v9_ShapeType,IfcRampTypeEnum::ToString(v9_ShapeType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRampFlight
 bool IfcRampFlight::is(Type::Enum v) const { return v == Type::IfcRampFlight || IfcBuildingElement::is(v); }
 Type::Enum IfcRampFlight::type() const { return Type::IfcRampFlight; }
 Type::Enum IfcRampFlight::Class() { return Type::IfcRampFlight; }
-IfcRampFlight::IfcRampFlight(IfcAbstractEntityPtr e) : IfcBuildingElement((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRampFlight)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRampFlight::IfcRampFlight(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag) : IfcBuildingElement((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
+IfcRampFlight::IfcRampFlight(IfcAbstractEntity* e) : IfcBuildingElement((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRampFlight)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRampFlight::IfcRampFlight(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag) : IfcBuildingElement((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRampFlightType
-IfcRampFlightTypeEnum::IfcRampFlightTypeEnum IfcRampFlightType::PredefinedType() { return IfcRampFlightTypeEnum::FromString(*entity->getArgument(9)); }
+IfcRampFlightTypeEnum::IfcRampFlightTypeEnum IfcRampFlightType::PredefinedType() const { return IfcRampFlightTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcRampFlightType::setPredefinedType(IfcRampFlightTypeEnum::IfcRampFlightTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcRampFlightTypeEnum::ToString(v)); }
 bool IfcRampFlightType::is(Type::Enum v) const { return v == Type::IfcRampFlightType || IfcBuildingElementType::is(v); }
 Type::Enum IfcRampFlightType::type() const { return Type::IfcRampFlightType; }
 Type::Enum IfcRampFlightType::Class() { return Type::IfcRampFlightType; }
-IfcRampFlightType::IfcRampFlightType(IfcAbstractEntityPtr e) : IfcBuildingElementType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRampFlightType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRampFlightType::IfcRampFlightType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcRampFlightTypeEnum::IfcRampFlightTypeEnum v10_PredefinedType) : IfcBuildingElementType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcRampFlightTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcRampFlightType::IfcRampFlightType(IfcAbstractEntity* e) : IfcBuildingElementType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRampFlightType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRampFlightType::IfcRampFlightType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcRampFlightTypeEnum::IfcRampFlightTypeEnum v10_PredefinedType) : IfcBuildingElementType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcRampFlightTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRationalBezierCurve
-std::vector< double > /*[2:?]*/ IfcRationalBezierCurve::WeightsData() { return *entity->getArgument(5); }
+std::vector< double > /*[2:?]*/ IfcRationalBezierCurve::WeightsData() const { return *entity->getArgument(5); }
 void IfcRationalBezierCurve::setWeightsData(std::vector< double > /*[2:?]*/ v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
 bool IfcRationalBezierCurve::is(Type::Enum v) const { return v == Type::IfcRationalBezierCurve || IfcBezierCurve::is(v); }
 Type::Enum IfcRationalBezierCurve::type() const { return Type::IfcRationalBezierCurve; }
 Type::Enum IfcRationalBezierCurve::Class() { return Type::IfcRationalBezierCurve; }
-IfcRationalBezierCurve::IfcRationalBezierCurve(IfcAbstractEntityPtr e) : IfcBezierCurve((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRationalBezierCurve)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRationalBezierCurve::IfcRationalBezierCurve(int v1_Degree, SHARED_PTR< IfcTemplatedEntityList< IfcCartesianPoint > > v2_ControlPointsList, IfcBSplineCurveForm::IfcBSplineCurveForm v3_CurveForm, bool v4_ClosedCurve, bool v5_SelfIntersect, std::vector< double > /*[2:?]*/ v6_WeightsData) : IfcBezierCurve((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Degree)); e->setArgument(1,(v2_ControlPointsList)->generalize()); e->setArgument(2,v3_CurveForm,IfcBSplineCurveForm::ToString(v3_CurveForm)); e->setArgument(3,(v4_ClosedCurve)); e->setArgument(4,(v5_SelfIntersect)); e->setArgument(5,(v6_WeightsData)); entity = e; EntityBuffer::Add(this); }
+IfcRationalBezierCurve::IfcRationalBezierCurve(IfcAbstractEntity* e) : IfcBezierCurve((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRationalBezierCurve)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRationalBezierCurve::IfcRationalBezierCurve(int v1_Degree, IfcTemplatedEntityList< IfcCartesianPoint >::ptr v2_ControlPointsList, IfcBSplineCurveForm::IfcBSplineCurveForm v3_CurveForm, bool v4_ClosedCurve, bool v5_SelfIntersect, std::vector< double > /*[2:?]*/ v6_WeightsData) : IfcBezierCurve((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Degree)); e->setArgument(1,(v2_ControlPointsList)->generalize()); e->setArgument(2,v3_CurveForm,IfcBSplineCurveForm::ToString(v3_CurveForm)); e->setArgument(3,(v4_ClosedCurve)); e->setArgument(4,(v5_SelfIntersect)); e->setArgument(5,(v6_WeightsData)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRectangleHollowProfileDef
-IfcPositiveLengthMeasure IfcRectangleHollowProfileDef::WallThickness() { return *entity->getArgument(5); }
-void IfcRectangleHollowProfileDef::setWallThickness(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-bool IfcRectangleHollowProfileDef::hasInnerFilletRadius() { return !entity->getArgument(6)->isNull(); }
-IfcPositiveLengthMeasure IfcRectangleHollowProfileDef::InnerFilletRadius() { return *entity->getArgument(6); }
-void IfcRectangleHollowProfileDef::setInnerFilletRadius(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
-bool IfcRectangleHollowProfileDef::hasOuterFilletRadius() { return !entity->getArgument(7)->isNull(); }
-IfcPositiveLengthMeasure IfcRectangleHollowProfileDef::OuterFilletRadius() { return *entity->getArgument(7); }
-void IfcRectangleHollowProfileDef::setOuterFilletRadius(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
+double IfcRectangleHollowProfileDef::WallThickness() const { return *entity->getArgument(5); }
+void IfcRectangleHollowProfileDef::setWallThickness(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+bool IfcRectangleHollowProfileDef::hasInnerFilletRadius() const { return !entity->getArgument(6)->isNull(); }
+double IfcRectangleHollowProfileDef::InnerFilletRadius() const { return *entity->getArgument(6); }
+void IfcRectangleHollowProfileDef::setInnerFilletRadius(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
+bool IfcRectangleHollowProfileDef::hasOuterFilletRadius() const { return !entity->getArgument(7)->isNull(); }
+double IfcRectangleHollowProfileDef::OuterFilletRadius() const { return *entity->getArgument(7); }
+void IfcRectangleHollowProfileDef::setOuterFilletRadius(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
 bool IfcRectangleHollowProfileDef::is(Type::Enum v) const { return v == Type::IfcRectangleHollowProfileDef || IfcRectangleProfileDef::is(v); }
 Type::Enum IfcRectangleHollowProfileDef::type() const { return Type::IfcRectangleHollowProfileDef; }
 Type::Enum IfcRectangleHollowProfileDef::Class() { return Type::IfcRectangleHollowProfileDef; }
-IfcRectangleHollowProfileDef::IfcRectangleHollowProfileDef(IfcAbstractEntityPtr e) : IfcRectangleProfileDef((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRectangleHollowProfileDef)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRectangleHollowProfileDef::IfcRectangleHollowProfileDef(IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< IfcLabel > v2_ProfileName, IfcAxis2Placement2D* v3_Position, IfcPositiveLengthMeasure v4_XDim, IfcPositiveLengthMeasure v5_YDim, IfcPositiveLengthMeasure v6_WallThickness, boost::optional< IfcPositiveLengthMeasure > v7_InnerFilletRadius, boost::optional< IfcPositiveLengthMeasure > v8_OuterFilletRadius) : IfcRectangleProfileDef((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,v1_ProfileType,IfcProfileTypeEnum::ToString(v1_ProfileType)); if (v2_ProfileName) { e->setArgument(1,(*v2_ProfileName)); } else { e->setArgument(1); } e->setArgument(2,(v3_Position)); e->setArgument(3,(v4_XDim)); e->setArgument(4,(v5_YDim)); e->setArgument(5,(v6_WallThickness)); if (v7_InnerFilletRadius) { e->setArgument(6,(*v7_InnerFilletRadius)); } else { e->setArgument(6); } if (v8_OuterFilletRadius) { e->setArgument(7,(*v8_OuterFilletRadius)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
+IfcRectangleHollowProfileDef::IfcRectangleHollowProfileDef(IfcAbstractEntity* e) : IfcRectangleProfileDef((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRectangleHollowProfileDef)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRectangleHollowProfileDef::IfcRectangleHollowProfileDef(IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< std::string > v2_ProfileName, IfcAxis2Placement2D* v3_Position, double v4_XDim, double v5_YDim, double v6_WallThickness, boost::optional< double > v7_InnerFilletRadius, boost::optional< double > v8_OuterFilletRadius) : IfcRectangleProfileDef((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,v1_ProfileType,IfcProfileTypeEnum::ToString(v1_ProfileType)); if (v2_ProfileName) { e->setArgument(1,(*v2_ProfileName)); } else { e->setArgument(1); } e->setArgument(2,(v3_Position)); e->setArgument(3,(v4_XDim)); e->setArgument(4,(v5_YDim)); e->setArgument(5,(v6_WallThickness)); if (v7_InnerFilletRadius) { e->setArgument(6,(*v7_InnerFilletRadius)); } else { e->setArgument(6); } if (v8_OuterFilletRadius) { e->setArgument(7,(*v8_OuterFilletRadius)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRectangleProfileDef
-IfcPositiveLengthMeasure IfcRectangleProfileDef::XDim() { return *entity->getArgument(3); }
-void IfcRectangleProfileDef::setXDim(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-IfcPositiveLengthMeasure IfcRectangleProfileDef::YDim() { return *entity->getArgument(4); }
-void IfcRectangleProfileDef::setYDim(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+double IfcRectangleProfileDef::XDim() const { return *entity->getArgument(3); }
+void IfcRectangleProfileDef::setXDim(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+double IfcRectangleProfileDef::YDim() const { return *entity->getArgument(4); }
+void IfcRectangleProfileDef::setYDim(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
 bool IfcRectangleProfileDef::is(Type::Enum v) const { return v == Type::IfcRectangleProfileDef || IfcParameterizedProfileDef::is(v); }
 Type::Enum IfcRectangleProfileDef::type() const { return Type::IfcRectangleProfileDef; }
 Type::Enum IfcRectangleProfileDef::Class() { return Type::IfcRectangleProfileDef; }
-IfcRectangleProfileDef::IfcRectangleProfileDef(IfcAbstractEntityPtr e) : IfcParameterizedProfileDef((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRectangleProfileDef)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRectangleProfileDef::IfcRectangleProfileDef(IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< IfcLabel > v2_ProfileName, IfcAxis2Placement2D* v3_Position, IfcPositiveLengthMeasure v4_XDim, IfcPositiveLengthMeasure v5_YDim) : IfcParameterizedProfileDef((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,v1_ProfileType,IfcProfileTypeEnum::ToString(v1_ProfileType)); if (v2_ProfileName) { e->setArgument(1,(*v2_ProfileName)); } else { e->setArgument(1); } e->setArgument(2,(v3_Position)); e->setArgument(3,(v4_XDim)); e->setArgument(4,(v5_YDim)); entity = e; EntityBuffer::Add(this); }
+IfcRectangleProfileDef::IfcRectangleProfileDef(IfcAbstractEntity* e) : IfcParameterizedProfileDef((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRectangleProfileDef)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRectangleProfileDef::IfcRectangleProfileDef(IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< std::string > v2_ProfileName, IfcAxis2Placement2D* v3_Position, double v4_XDim, double v5_YDim) : IfcParameterizedProfileDef((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,v1_ProfileType,IfcProfileTypeEnum::ToString(v1_ProfileType)); if (v2_ProfileName) { e->setArgument(1,(*v2_ProfileName)); } else { e->setArgument(1); } e->setArgument(2,(v3_Position)); e->setArgument(3,(v4_XDim)); e->setArgument(4,(v5_YDim)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRectangularPyramid
-IfcPositiveLengthMeasure IfcRectangularPyramid::XLength() { return *entity->getArgument(1); }
-void IfcRectangularPyramid::setXLength(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-IfcPositiveLengthMeasure IfcRectangularPyramid::YLength() { return *entity->getArgument(2); }
-void IfcRectangularPyramid::setYLength(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-IfcPositiveLengthMeasure IfcRectangularPyramid::Height() { return *entity->getArgument(3); }
-void IfcRectangularPyramid::setHeight(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+double IfcRectangularPyramid::XLength() const { return *entity->getArgument(1); }
+void IfcRectangularPyramid::setXLength(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+double IfcRectangularPyramid::YLength() const { return *entity->getArgument(2); }
+void IfcRectangularPyramid::setYLength(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+double IfcRectangularPyramid::Height() const { return *entity->getArgument(3); }
+void IfcRectangularPyramid::setHeight(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
 bool IfcRectangularPyramid::is(Type::Enum v) const { return v == Type::IfcRectangularPyramid || IfcCsgPrimitive3D::is(v); }
 Type::Enum IfcRectangularPyramid::type() const { return Type::IfcRectangularPyramid; }
 Type::Enum IfcRectangularPyramid::Class() { return Type::IfcRectangularPyramid; }
-IfcRectangularPyramid::IfcRectangularPyramid(IfcAbstractEntityPtr e) : IfcCsgPrimitive3D((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRectangularPyramid)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRectangularPyramid::IfcRectangularPyramid(IfcAxis2Placement3D* v1_Position, IfcPositiveLengthMeasure v2_XLength, IfcPositiveLengthMeasure v3_YLength, IfcPositiveLengthMeasure v4_Height) : IfcCsgPrimitive3D((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Position)); e->setArgument(1,(v2_XLength)); e->setArgument(2,(v3_YLength)); e->setArgument(3,(v4_Height)); entity = e; EntityBuffer::Add(this); }
+IfcRectangularPyramid::IfcRectangularPyramid(IfcAbstractEntity* e) : IfcCsgPrimitive3D((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRectangularPyramid)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRectangularPyramid::IfcRectangularPyramid(IfcAxis2Placement3D* v1_Position, double v2_XLength, double v3_YLength, double v4_Height) : IfcCsgPrimitive3D((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Position)); e->setArgument(1,(v2_XLength)); e->setArgument(2,(v3_YLength)); e->setArgument(3,(v4_Height)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRectangularTrimmedSurface
-IfcSurface* IfcRectangularTrimmedSurface::BasisSurface() { return (IfcSurface*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(0))); }
+IfcSurface* IfcRectangularTrimmedSurface::BasisSurface() const { return (IfcSurface*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(0))); }
 void IfcRectangularTrimmedSurface::setBasisSurface(IfcSurface* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-IfcParameterValue IfcRectangularTrimmedSurface::U1() { return *entity->getArgument(1); }
-void IfcRectangularTrimmedSurface::setU1(IfcParameterValue v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-IfcParameterValue IfcRectangularTrimmedSurface::V1() { return *entity->getArgument(2); }
-void IfcRectangularTrimmedSurface::setV1(IfcParameterValue v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-IfcParameterValue IfcRectangularTrimmedSurface::U2() { return *entity->getArgument(3); }
-void IfcRectangularTrimmedSurface::setU2(IfcParameterValue v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-IfcParameterValue IfcRectangularTrimmedSurface::V2() { return *entity->getArgument(4); }
-void IfcRectangularTrimmedSurface::setV2(IfcParameterValue v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-bool IfcRectangularTrimmedSurface::Usense() { return *entity->getArgument(5); }
+double IfcRectangularTrimmedSurface::U1() const { return *entity->getArgument(1); }
+void IfcRectangularTrimmedSurface::setU1(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+double IfcRectangularTrimmedSurface::V1() const { return *entity->getArgument(2); }
+void IfcRectangularTrimmedSurface::setV1(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+double IfcRectangularTrimmedSurface::U2() const { return *entity->getArgument(3); }
+void IfcRectangularTrimmedSurface::setU2(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+double IfcRectangularTrimmedSurface::V2() const { return *entity->getArgument(4); }
+void IfcRectangularTrimmedSurface::setV2(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+bool IfcRectangularTrimmedSurface::Usense() const { return *entity->getArgument(5); }
 void IfcRectangularTrimmedSurface::setUsense(bool v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-bool IfcRectangularTrimmedSurface::Vsense() { return *entity->getArgument(6); }
+bool IfcRectangularTrimmedSurface::Vsense() const { return *entity->getArgument(6); }
 void IfcRectangularTrimmedSurface::setVsense(bool v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
 bool IfcRectangularTrimmedSurface::is(Type::Enum v) const { return v == Type::IfcRectangularTrimmedSurface || IfcBoundedSurface::is(v); }
 Type::Enum IfcRectangularTrimmedSurface::type() const { return Type::IfcRectangularTrimmedSurface; }
 Type::Enum IfcRectangularTrimmedSurface::Class() { return Type::IfcRectangularTrimmedSurface; }
-IfcRectangularTrimmedSurface::IfcRectangularTrimmedSurface(IfcAbstractEntityPtr e) : IfcBoundedSurface((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRectangularTrimmedSurface)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRectangularTrimmedSurface::IfcRectangularTrimmedSurface(IfcSurface* v1_BasisSurface, IfcParameterValue v2_U1, IfcParameterValue v3_V1, IfcParameterValue v4_U2, IfcParameterValue v5_V2, bool v6_Usense, bool v7_Vsense) : IfcBoundedSurface((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_BasisSurface)); e->setArgument(1,(v2_U1)); e->setArgument(2,(v3_V1)); e->setArgument(3,(v4_U2)); e->setArgument(4,(v5_V2)); e->setArgument(5,(v6_Usense)); e->setArgument(6,(v7_Vsense)); entity = e; EntityBuffer::Add(this); }
+IfcRectangularTrimmedSurface::IfcRectangularTrimmedSurface(IfcAbstractEntity* e) : IfcBoundedSurface((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRectangularTrimmedSurface)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRectangularTrimmedSurface::IfcRectangularTrimmedSurface(IfcSurface* v1_BasisSurface, double v2_U1, double v3_V1, double v4_U2, double v5_V2, bool v6_Usense, bool v7_Vsense) : IfcBoundedSurface((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_BasisSurface)); e->setArgument(1,(v2_U1)); e->setArgument(2,(v3_V1)); e->setArgument(3,(v4_U2)); e->setArgument(4,(v5_V2)); e->setArgument(5,(v6_Usense)); e->setArgument(6,(v7_Vsense)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcReferencesValueDocument
-IfcDocumentSelect IfcReferencesValueDocument::ReferencedDocument() { return *entity->getArgument(0); }
-void IfcReferencesValueDocument::setReferencedDocument(IfcDocumentSelect v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-SHARED_PTR< IfcTemplatedEntityList< IfcAppliedValue > > IfcReferencesValueDocument::ReferencingValues() { RETURN_AS_LIST(IfcAppliedValue,1) }
-void IfcReferencesValueDocument::setReferencingValues(SHARED_PTR< IfcTemplatedEntityList< IfcAppliedValue > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v->generalize()); }
-bool IfcReferencesValueDocument::hasName() { return !entity->getArgument(2)->isNull(); }
-IfcLabel IfcReferencesValueDocument::Name() { return *entity->getArgument(2); }
-void IfcReferencesValueDocument::setName(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-bool IfcReferencesValueDocument::hasDescription() { return !entity->getArgument(3)->isNull(); }
-IfcText IfcReferencesValueDocument::Description() { return *entity->getArgument(3); }
-void IfcReferencesValueDocument::setDescription(IfcText v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+IfcDocumentSelect* IfcReferencesValueDocument::ReferencedDocument() const { return (IfcDocumentSelect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(0))); }
+void IfcReferencesValueDocument::setReferencedDocument(IfcDocumentSelect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+IfcTemplatedEntityList< IfcAppliedValue >::ptr IfcReferencesValueDocument::ReferencingValues() const { IfcEntityList::ptr es = *entity->getArgument(1); return es->as<IfcAppliedValue>(); }
+void IfcReferencesValueDocument::setReferencingValues(IfcTemplatedEntityList< IfcAppliedValue >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v->generalize()); }
+bool IfcReferencesValueDocument::hasName() const { return !entity->getArgument(2)->isNull(); }
+std::string IfcReferencesValueDocument::Name() const { return *entity->getArgument(2); }
+void IfcReferencesValueDocument::setName(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+bool IfcReferencesValueDocument::hasDescription() const { return !entity->getArgument(3)->isNull(); }
+std::string IfcReferencesValueDocument::Description() const { return *entity->getArgument(3); }
+void IfcReferencesValueDocument::setDescription(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
 bool IfcReferencesValueDocument::is(Type::Enum v) const { return v == Type::IfcReferencesValueDocument; }
 Type::Enum IfcReferencesValueDocument::type() const { return Type::IfcReferencesValueDocument; }
 Type::Enum IfcReferencesValueDocument::Class() { return Type::IfcReferencesValueDocument; }
-IfcReferencesValueDocument::IfcReferencesValueDocument(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcReferencesValueDocument)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcReferencesValueDocument::IfcReferencesValueDocument(IfcDocumentSelect v1_ReferencedDocument, SHARED_PTR< IfcTemplatedEntityList< IfcAppliedValue > > v2_ReferencingValues, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_ReferencedDocument)); e->setArgument(1,(v2_ReferencingValues)->generalize()); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } entity = e; EntityBuffer::Add(this); }
+IfcReferencesValueDocument::IfcReferencesValueDocument(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcReferencesValueDocument)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcReferencesValueDocument::IfcReferencesValueDocument(IfcDocumentSelect* v1_ReferencedDocument, IfcTemplatedEntityList< IfcAppliedValue >::ptr v2_ReferencingValues, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_ReferencedDocument)); e->setArgument(1,(v2_ReferencingValues)->generalize()); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRegularTimeSeries
-IfcTimeMeasure IfcRegularTimeSeries::TimeStep() { return *entity->getArgument(8); }
-void IfcRegularTimeSeries::setTimeStep(IfcTimeMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
-SHARED_PTR< IfcTemplatedEntityList< IfcTimeSeriesValue > > IfcRegularTimeSeries::Values() { RETURN_AS_LIST(IfcTimeSeriesValue,9) }
-void IfcRegularTimeSeries::setValues(SHARED_PTR< IfcTemplatedEntityList< IfcTimeSeriesValue > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v->generalize()); }
+double IfcRegularTimeSeries::TimeStep() const { return *entity->getArgument(8); }
+void IfcRegularTimeSeries::setTimeStep(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
+IfcTemplatedEntityList< IfcTimeSeriesValue >::ptr IfcRegularTimeSeries::Values() const { IfcEntityList::ptr es = *entity->getArgument(9); return es->as<IfcTimeSeriesValue>(); }
+void IfcRegularTimeSeries::setValues(IfcTemplatedEntityList< IfcTimeSeriesValue >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v->generalize()); }
 bool IfcRegularTimeSeries::is(Type::Enum v) const { return v == Type::IfcRegularTimeSeries || IfcTimeSeries::is(v); }
 Type::Enum IfcRegularTimeSeries::type() const { return Type::IfcRegularTimeSeries; }
 Type::Enum IfcRegularTimeSeries::Class() { return Type::IfcRegularTimeSeries; }
-IfcRegularTimeSeries::IfcRegularTimeSeries(IfcAbstractEntityPtr e) : IfcTimeSeries((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRegularTimeSeries)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRegularTimeSeries::IfcRegularTimeSeries(IfcLabel v1_Name, boost::optional< IfcText > v2_Description, IfcDateTimeSelect v3_StartTime, IfcDateTimeSelect v4_EndTime, IfcTimeSeriesDataTypeEnum::IfcTimeSeriesDataTypeEnum v5_TimeSeriesDataType, IfcDataOriginEnum::IfcDataOriginEnum v6_DataOrigin, boost::optional< IfcLabel > v7_UserDefinedDataOrigin, boost::optional< IfcUnit > v8_Unit, IfcTimeMeasure v9_TimeStep, SHARED_PTR< IfcTemplatedEntityList< IfcTimeSeriesValue > > v10_Values) : IfcTimeSeries((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_StartTime)); e->setArgument(3,(v4_EndTime)); e->setArgument(4,v5_TimeSeriesDataType,IfcTimeSeriesDataTypeEnum::ToString(v5_TimeSeriesDataType)); e->setArgument(5,v6_DataOrigin,IfcDataOriginEnum::ToString(v6_DataOrigin)); if (v7_UserDefinedDataOrigin) { e->setArgument(6,(*v7_UserDefinedDataOrigin)); } else { e->setArgument(6); } if (v8_Unit) { e->setArgument(7,(*v8_Unit)); } else { e->setArgument(7); } e->setArgument(8,(v9_TimeStep)); e->setArgument(9,(v10_Values)->generalize()); entity = e; EntityBuffer::Add(this); }
+IfcRegularTimeSeries::IfcRegularTimeSeries(IfcAbstractEntity* e) : IfcTimeSeries((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRegularTimeSeries)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRegularTimeSeries::IfcRegularTimeSeries(std::string v1_Name, boost::optional< std::string > v2_Description, IfcDateTimeSelect* v3_StartTime, IfcDateTimeSelect* v4_EndTime, IfcTimeSeriesDataTypeEnum::IfcTimeSeriesDataTypeEnum v5_TimeSeriesDataType, IfcDataOriginEnum::IfcDataOriginEnum v6_DataOrigin, boost::optional< std::string > v7_UserDefinedDataOrigin, IfcUnit* v8_Unit, double v9_TimeStep, IfcTemplatedEntityList< IfcTimeSeriesValue >::ptr v10_Values) : IfcTimeSeries((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_StartTime)); e->setArgument(3,(v4_EndTime)); e->setArgument(4,v5_TimeSeriesDataType,IfcTimeSeriesDataTypeEnum::ToString(v5_TimeSeriesDataType)); e->setArgument(5,v6_DataOrigin,IfcDataOriginEnum::ToString(v6_DataOrigin)); if (v7_UserDefinedDataOrigin) { e->setArgument(6,(*v7_UserDefinedDataOrigin)); } else { e->setArgument(6); } e->setArgument(7,(v8_Unit)); e->setArgument(8,(v9_TimeStep)); e->setArgument(9,(v10_Values)->generalize()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcReinforcementBarProperties
-IfcAreaMeasure IfcReinforcementBarProperties::TotalCrossSectionArea() { return *entity->getArgument(0); }
-void IfcReinforcementBarProperties::setTotalCrossSectionArea(IfcAreaMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-IfcLabel IfcReinforcementBarProperties::SteelGrade() { return *entity->getArgument(1); }
-void IfcReinforcementBarProperties::setSteelGrade(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-bool IfcReinforcementBarProperties::hasBarSurface() { return !entity->getArgument(2)->isNull(); }
-IfcReinforcingBarSurfaceEnum::IfcReinforcingBarSurfaceEnum IfcReinforcementBarProperties::BarSurface() { return IfcReinforcingBarSurfaceEnum::FromString(*entity->getArgument(2)); }
+double IfcReinforcementBarProperties::TotalCrossSectionArea() const { return *entity->getArgument(0); }
+void IfcReinforcementBarProperties::setTotalCrossSectionArea(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+std::string IfcReinforcementBarProperties::SteelGrade() const { return *entity->getArgument(1); }
+void IfcReinforcementBarProperties::setSteelGrade(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+bool IfcReinforcementBarProperties::hasBarSurface() const { return !entity->getArgument(2)->isNull(); }
+IfcReinforcingBarSurfaceEnum::IfcReinforcingBarSurfaceEnum IfcReinforcementBarProperties::BarSurface() const { return IfcReinforcingBarSurfaceEnum::FromString(*entity->getArgument(2)); }
 void IfcReinforcementBarProperties::setBarSurface(IfcReinforcingBarSurfaceEnum::IfcReinforcingBarSurfaceEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v,IfcReinforcingBarSurfaceEnum::ToString(v)); }
-bool IfcReinforcementBarProperties::hasEffectiveDepth() { return !entity->getArgument(3)->isNull(); }
-IfcLengthMeasure IfcReinforcementBarProperties::EffectiveDepth() { return *entity->getArgument(3); }
-void IfcReinforcementBarProperties::setEffectiveDepth(IfcLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-bool IfcReinforcementBarProperties::hasNominalBarDiameter() { return !entity->getArgument(4)->isNull(); }
-IfcPositiveLengthMeasure IfcReinforcementBarProperties::NominalBarDiameter() { return *entity->getArgument(4); }
-void IfcReinforcementBarProperties::setNominalBarDiameter(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-bool IfcReinforcementBarProperties::hasBarCount() { return !entity->getArgument(5)->isNull(); }
-IfcCountMeasure IfcReinforcementBarProperties::BarCount() { return *entity->getArgument(5); }
-void IfcReinforcementBarProperties::setBarCount(IfcCountMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+bool IfcReinforcementBarProperties::hasEffectiveDepth() const { return !entity->getArgument(3)->isNull(); }
+double IfcReinforcementBarProperties::EffectiveDepth() const { return *entity->getArgument(3); }
+void IfcReinforcementBarProperties::setEffectiveDepth(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+bool IfcReinforcementBarProperties::hasNominalBarDiameter() const { return !entity->getArgument(4)->isNull(); }
+double IfcReinforcementBarProperties::NominalBarDiameter() const { return *entity->getArgument(4); }
+void IfcReinforcementBarProperties::setNominalBarDiameter(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+bool IfcReinforcementBarProperties::hasBarCount() const { return !entity->getArgument(5)->isNull(); }
+double IfcReinforcementBarProperties::BarCount() const { return *entity->getArgument(5); }
+void IfcReinforcementBarProperties::setBarCount(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
 bool IfcReinforcementBarProperties::is(Type::Enum v) const { return v == Type::IfcReinforcementBarProperties; }
 Type::Enum IfcReinforcementBarProperties::type() const { return Type::IfcReinforcementBarProperties; }
 Type::Enum IfcReinforcementBarProperties::Class() { return Type::IfcReinforcementBarProperties; }
-IfcReinforcementBarProperties::IfcReinforcementBarProperties(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcReinforcementBarProperties)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcReinforcementBarProperties::IfcReinforcementBarProperties(IfcAreaMeasure v1_TotalCrossSectionArea, IfcLabel v2_SteelGrade, boost::optional< IfcReinforcingBarSurfaceEnum::IfcReinforcingBarSurfaceEnum > v3_BarSurface, boost::optional< IfcLengthMeasure > v4_EffectiveDepth, boost::optional< IfcPositiveLengthMeasure > v5_NominalBarDiameter, boost::optional< IfcCountMeasure > v6_BarCount) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_TotalCrossSectionArea)); e->setArgument(1,(v2_SteelGrade)); if (v3_BarSurface) { e->setArgument(2,*v3_BarSurface,IfcReinforcingBarSurfaceEnum::ToString(*v3_BarSurface)); } else { e->setArgument(2); } if (v4_EffectiveDepth) { e->setArgument(3,(*v4_EffectiveDepth)); } else { e->setArgument(3); } if (v5_NominalBarDiameter) { e->setArgument(4,(*v5_NominalBarDiameter)); } else { e->setArgument(4); } if (v6_BarCount) { e->setArgument(5,(*v6_BarCount)); } else { e->setArgument(5); } entity = e; EntityBuffer::Add(this); }
+IfcReinforcementBarProperties::IfcReinforcementBarProperties(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcReinforcementBarProperties)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcReinforcementBarProperties::IfcReinforcementBarProperties(double v1_TotalCrossSectionArea, std::string v2_SteelGrade, boost::optional< IfcReinforcingBarSurfaceEnum::IfcReinforcingBarSurfaceEnum > v3_BarSurface, boost::optional< double > v4_EffectiveDepth, boost::optional< double > v5_NominalBarDiameter, boost::optional< double > v6_BarCount) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_TotalCrossSectionArea)); e->setArgument(1,(v2_SteelGrade)); if (v3_BarSurface) { e->setArgument(2,*v3_BarSurface,IfcReinforcingBarSurfaceEnum::ToString(*v3_BarSurface)); } else { e->setArgument(2); } if (v4_EffectiveDepth) { e->setArgument(3,(*v4_EffectiveDepth)); } else { e->setArgument(3); } if (v5_NominalBarDiameter) { e->setArgument(4,(*v5_NominalBarDiameter)); } else { e->setArgument(4); } if (v6_BarCount) { e->setArgument(5,(*v6_BarCount)); } else { e->setArgument(5); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcReinforcementDefinitionProperties
-bool IfcReinforcementDefinitionProperties::hasDefinitionType() { return !entity->getArgument(4)->isNull(); }
-IfcLabel IfcReinforcementDefinitionProperties::DefinitionType() { return *entity->getArgument(4); }
-void IfcReinforcementDefinitionProperties::setDefinitionType(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-SHARED_PTR< IfcTemplatedEntityList< IfcSectionReinforcementProperties > > IfcReinforcementDefinitionProperties::ReinforcementSectionDefinitions() { RETURN_AS_LIST(IfcSectionReinforcementProperties,5) }
-void IfcReinforcementDefinitionProperties::setReinforcementSectionDefinitions(SHARED_PTR< IfcTemplatedEntityList< IfcSectionReinforcementProperties > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v->generalize()); }
+bool IfcReinforcementDefinitionProperties::hasDefinitionType() const { return !entity->getArgument(4)->isNull(); }
+std::string IfcReinforcementDefinitionProperties::DefinitionType() const { return *entity->getArgument(4); }
+void IfcReinforcementDefinitionProperties::setDefinitionType(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+IfcTemplatedEntityList< IfcSectionReinforcementProperties >::ptr IfcReinforcementDefinitionProperties::ReinforcementSectionDefinitions() const { IfcEntityList::ptr es = *entity->getArgument(5); return es->as<IfcSectionReinforcementProperties>(); }
+void IfcReinforcementDefinitionProperties::setReinforcementSectionDefinitions(IfcTemplatedEntityList< IfcSectionReinforcementProperties >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v->generalize()); }
 bool IfcReinforcementDefinitionProperties::is(Type::Enum v) const { return v == Type::IfcReinforcementDefinitionProperties || IfcPropertySetDefinition::is(v); }
 Type::Enum IfcReinforcementDefinitionProperties::type() const { return Type::IfcReinforcementDefinitionProperties; }
 Type::Enum IfcReinforcementDefinitionProperties::Class() { return Type::IfcReinforcementDefinitionProperties; }
-IfcReinforcementDefinitionProperties::IfcReinforcementDefinitionProperties(IfcAbstractEntityPtr e) : IfcPropertySetDefinition((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcReinforcementDefinitionProperties)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcReinforcementDefinitionProperties::IfcReinforcementDefinitionProperties(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_DefinitionType, SHARED_PTR< IfcTemplatedEntityList< IfcSectionReinforcementProperties > > v6_ReinforcementSectionDefinitions) : IfcPropertySetDefinition((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_DefinitionType) { e->setArgument(4,(*v5_DefinitionType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ReinforcementSectionDefinitions)->generalize()); entity = e; EntityBuffer::Add(this); }
+IfcReinforcementDefinitionProperties::IfcReinforcementDefinitionProperties(IfcAbstractEntity* e) : IfcPropertySetDefinition((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcReinforcementDefinitionProperties)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcReinforcementDefinitionProperties::IfcReinforcementDefinitionProperties(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_DefinitionType, IfcTemplatedEntityList< IfcSectionReinforcementProperties >::ptr v6_ReinforcementSectionDefinitions) : IfcPropertySetDefinition((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_DefinitionType) { e->setArgument(4,(*v5_DefinitionType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ReinforcementSectionDefinitions)->generalize()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcReinforcingBar
-IfcPositiveLengthMeasure IfcReinforcingBar::NominalDiameter() { return *entity->getArgument(9); }
-void IfcReinforcingBar::setNominalDiameter(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
-IfcAreaMeasure IfcReinforcingBar::CrossSectionArea() { return *entity->getArgument(10); }
-void IfcReinforcingBar::setCrossSectionArea(IfcAreaMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
-bool IfcReinforcingBar::hasBarLength() { return !entity->getArgument(11)->isNull(); }
-IfcPositiveLengthMeasure IfcReinforcingBar::BarLength() { return *entity->getArgument(11); }
-void IfcReinforcingBar::setBarLength(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(11,v); }
-IfcReinforcingBarRoleEnum::IfcReinforcingBarRoleEnum IfcReinforcingBar::BarRole() { return IfcReinforcingBarRoleEnum::FromString(*entity->getArgument(12)); }
+double IfcReinforcingBar::NominalDiameter() const { return *entity->getArgument(9); }
+void IfcReinforcingBar::setNominalDiameter(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
+double IfcReinforcingBar::CrossSectionArea() const { return *entity->getArgument(10); }
+void IfcReinforcingBar::setCrossSectionArea(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
+bool IfcReinforcingBar::hasBarLength() const { return !entity->getArgument(11)->isNull(); }
+double IfcReinforcingBar::BarLength() const { return *entity->getArgument(11); }
+void IfcReinforcingBar::setBarLength(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(11,v); }
+IfcReinforcingBarRoleEnum::IfcReinforcingBarRoleEnum IfcReinforcingBar::BarRole() const { return IfcReinforcingBarRoleEnum::FromString(*entity->getArgument(12)); }
 void IfcReinforcingBar::setBarRole(IfcReinforcingBarRoleEnum::IfcReinforcingBarRoleEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(12,v,IfcReinforcingBarRoleEnum::ToString(v)); }
-bool IfcReinforcingBar::hasBarSurface() { return !entity->getArgument(13)->isNull(); }
-IfcReinforcingBarSurfaceEnum::IfcReinforcingBarSurfaceEnum IfcReinforcingBar::BarSurface() { return IfcReinforcingBarSurfaceEnum::FromString(*entity->getArgument(13)); }
+bool IfcReinforcingBar::hasBarSurface() const { return !entity->getArgument(13)->isNull(); }
+IfcReinforcingBarSurfaceEnum::IfcReinforcingBarSurfaceEnum IfcReinforcingBar::BarSurface() const { return IfcReinforcingBarSurfaceEnum::FromString(*entity->getArgument(13)); }
 void IfcReinforcingBar::setBarSurface(IfcReinforcingBarSurfaceEnum::IfcReinforcingBarSurfaceEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(13,v,IfcReinforcingBarSurfaceEnum::ToString(v)); }
 bool IfcReinforcingBar::is(Type::Enum v) const { return v == Type::IfcReinforcingBar || IfcReinforcingElement::is(v); }
 Type::Enum IfcReinforcingBar::type() const { return Type::IfcReinforcingBar; }
 Type::Enum IfcReinforcingBar::Class() { return Type::IfcReinforcingBar; }
-IfcReinforcingBar::IfcReinforcingBar(IfcAbstractEntityPtr e) : IfcReinforcingElement((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcReinforcingBar)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcReinforcingBar::IfcReinforcingBar(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcLabel > v9_SteelGrade, IfcPositiveLengthMeasure v10_NominalDiameter, IfcAreaMeasure v11_CrossSectionArea, boost::optional< IfcPositiveLengthMeasure > v12_BarLength, IfcReinforcingBarRoleEnum::IfcReinforcingBarRoleEnum v13_BarRole, boost::optional< IfcReinforcingBarSurfaceEnum::IfcReinforcingBarSurfaceEnum > v14_BarSurface) : IfcReinforcingElement((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_SteelGrade) { e->setArgument(8,(*v9_SteelGrade)); } else { e->setArgument(8); } e->setArgument(9,(v10_NominalDiameter)); e->setArgument(10,(v11_CrossSectionArea)); if (v12_BarLength) { e->setArgument(11,(*v12_BarLength)); } else { e->setArgument(11); } e->setArgument(12,v13_BarRole,IfcReinforcingBarRoleEnum::ToString(v13_BarRole)); if (v14_BarSurface) { e->setArgument(13,*v14_BarSurface,IfcReinforcingBarSurfaceEnum::ToString(*v14_BarSurface)); } else { e->setArgument(13); } entity = e; EntityBuffer::Add(this); }
+IfcReinforcingBar::IfcReinforcingBar(IfcAbstractEntity* e) : IfcReinforcingElement((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcReinforcingBar)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcReinforcingBar::IfcReinforcingBar(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_SteelGrade, double v10_NominalDiameter, double v11_CrossSectionArea, boost::optional< double > v12_BarLength, IfcReinforcingBarRoleEnum::IfcReinforcingBarRoleEnum v13_BarRole, boost::optional< IfcReinforcingBarSurfaceEnum::IfcReinforcingBarSurfaceEnum > v14_BarSurface) : IfcReinforcingElement((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_SteelGrade) { e->setArgument(8,(*v9_SteelGrade)); } else { e->setArgument(8); } e->setArgument(9,(v10_NominalDiameter)); e->setArgument(10,(v11_CrossSectionArea)); if (v12_BarLength) { e->setArgument(11,(*v12_BarLength)); } else { e->setArgument(11); } e->setArgument(12,v13_BarRole,IfcReinforcingBarRoleEnum::ToString(v13_BarRole)); if (v14_BarSurface) { e->setArgument(13,*v14_BarSurface,IfcReinforcingBarSurfaceEnum::ToString(*v14_BarSurface)); } else { e->setArgument(13); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcReinforcingElement
-bool IfcReinforcingElement::hasSteelGrade() { return !entity->getArgument(8)->isNull(); }
-IfcLabel IfcReinforcingElement::SteelGrade() { return *entity->getArgument(8); }
-void IfcReinforcingElement::setSteelGrade(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
+bool IfcReinforcingElement::hasSteelGrade() const { return !entity->getArgument(8)->isNull(); }
+std::string IfcReinforcingElement::SteelGrade() const { return *entity->getArgument(8); }
+void IfcReinforcingElement::setSteelGrade(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
 bool IfcReinforcingElement::is(Type::Enum v) const { return v == Type::IfcReinforcingElement || IfcBuildingElementComponent::is(v); }
 Type::Enum IfcReinforcingElement::type() const { return Type::IfcReinforcingElement; }
 Type::Enum IfcReinforcingElement::Class() { return Type::IfcReinforcingElement; }
-IfcReinforcingElement::IfcReinforcingElement(IfcAbstractEntityPtr e) : IfcBuildingElementComponent((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcReinforcingElement)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcReinforcingElement::IfcReinforcingElement(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcLabel > v9_SteelGrade) : IfcBuildingElementComponent((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_SteelGrade) { e->setArgument(8,(*v9_SteelGrade)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcReinforcingElement::IfcReinforcingElement(IfcAbstractEntity* e) : IfcBuildingElementComponent((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcReinforcingElement)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcReinforcingElement::IfcReinforcingElement(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_SteelGrade) : IfcBuildingElementComponent((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_SteelGrade) { e->setArgument(8,(*v9_SteelGrade)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcReinforcingMesh
-bool IfcReinforcingMesh::hasMeshLength() { return !entity->getArgument(9)->isNull(); }
-IfcPositiveLengthMeasure IfcReinforcingMesh::MeshLength() { return *entity->getArgument(9); }
-void IfcReinforcingMesh::setMeshLength(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
-bool IfcReinforcingMesh::hasMeshWidth() { return !entity->getArgument(10)->isNull(); }
-IfcPositiveLengthMeasure IfcReinforcingMesh::MeshWidth() { return *entity->getArgument(10); }
-void IfcReinforcingMesh::setMeshWidth(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
-IfcPositiveLengthMeasure IfcReinforcingMesh::LongitudinalBarNominalDiameter() { return *entity->getArgument(11); }
-void IfcReinforcingMesh::setLongitudinalBarNominalDiameter(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(11,v); }
-IfcPositiveLengthMeasure IfcReinforcingMesh::TransverseBarNominalDiameter() { return *entity->getArgument(12); }
-void IfcReinforcingMesh::setTransverseBarNominalDiameter(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(12,v); }
-IfcAreaMeasure IfcReinforcingMesh::LongitudinalBarCrossSectionArea() { return *entity->getArgument(13); }
-void IfcReinforcingMesh::setLongitudinalBarCrossSectionArea(IfcAreaMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(13,v); }
-IfcAreaMeasure IfcReinforcingMesh::TransverseBarCrossSectionArea() { return *entity->getArgument(14); }
-void IfcReinforcingMesh::setTransverseBarCrossSectionArea(IfcAreaMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(14,v); }
-IfcPositiveLengthMeasure IfcReinforcingMesh::LongitudinalBarSpacing() { return *entity->getArgument(15); }
-void IfcReinforcingMesh::setLongitudinalBarSpacing(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(15,v); }
-IfcPositiveLengthMeasure IfcReinforcingMesh::TransverseBarSpacing() { return *entity->getArgument(16); }
-void IfcReinforcingMesh::setTransverseBarSpacing(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(16,v); }
+bool IfcReinforcingMesh::hasMeshLength() const { return !entity->getArgument(9)->isNull(); }
+double IfcReinforcingMesh::MeshLength() const { return *entity->getArgument(9); }
+void IfcReinforcingMesh::setMeshLength(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
+bool IfcReinforcingMesh::hasMeshWidth() const { return !entity->getArgument(10)->isNull(); }
+double IfcReinforcingMesh::MeshWidth() const { return *entity->getArgument(10); }
+void IfcReinforcingMesh::setMeshWidth(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
+double IfcReinforcingMesh::LongitudinalBarNominalDiameter() const { return *entity->getArgument(11); }
+void IfcReinforcingMesh::setLongitudinalBarNominalDiameter(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(11,v); }
+double IfcReinforcingMesh::TransverseBarNominalDiameter() const { return *entity->getArgument(12); }
+void IfcReinforcingMesh::setTransverseBarNominalDiameter(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(12,v); }
+double IfcReinforcingMesh::LongitudinalBarCrossSectionArea() const { return *entity->getArgument(13); }
+void IfcReinforcingMesh::setLongitudinalBarCrossSectionArea(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(13,v); }
+double IfcReinforcingMesh::TransverseBarCrossSectionArea() const { return *entity->getArgument(14); }
+void IfcReinforcingMesh::setTransverseBarCrossSectionArea(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(14,v); }
+double IfcReinforcingMesh::LongitudinalBarSpacing() const { return *entity->getArgument(15); }
+void IfcReinforcingMesh::setLongitudinalBarSpacing(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(15,v); }
+double IfcReinforcingMesh::TransverseBarSpacing() const { return *entity->getArgument(16); }
+void IfcReinforcingMesh::setTransverseBarSpacing(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(16,v); }
 bool IfcReinforcingMesh::is(Type::Enum v) const { return v == Type::IfcReinforcingMesh || IfcReinforcingElement::is(v); }
 Type::Enum IfcReinforcingMesh::type() const { return Type::IfcReinforcingMesh; }
 Type::Enum IfcReinforcingMesh::Class() { return Type::IfcReinforcingMesh; }
-IfcReinforcingMesh::IfcReinforcingMesh(IfcAbstractEntityPtr e) : IfcReinforcingElement((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcReinforcingMesh)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcReinforcingMesh::IfcReinforcingMesh(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcLabel > v9_SteelGrade, boost::optional< IfcPositiveLengthMeasure > v10_MeshLength, boost::optional< IfcPositiveLengthMeasure > v11_MeshWidth, IfcPositiveLengthMeasure v12_LongitudinalBarNominalDiameter, IfcPositiveLengthMeasure v13_TransverseBarNominalDiameter, IfcAreaMeasure v14_LongitudinalBarCrossSectionArea, IfcAreaMeasure v15_TransverseBarCrossSectionArea, IfcPositiveLengthMeasure v16_LongitudinalBarSpacing, IfcPositiveLengthMeasure v17_TransverseBarSpacing) : IfcReinforcingElement((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_SteelGrade) { e->setArgument(8,(*v9_SteelGrade)); } else { e->setArgument(8); } if (v10_MeshLength) { e->setArgument(9,(*v10_MeshLength)); } else { e->setArgument(9); } if (v11_MeshWidth) { e->setArgument(10,(*v11_MeshWidth)); } else { e->setArgument(10); } e->setArgument(11,(v12_LongitudinalBarNominalDiameter)); e->setArgument(12,(v13_TransverseBarNominalDiameter)); e->setArgument(13,(v14_LongitudinalBarCrossSectionArea)); e->setArgument(14,(v15_TransverseBarCrossSectionArea)); e->setArgument(15,(v16_LongitudinalBarSpacing)); e->setArgument(16,(v17_TransverseBarSpacing)); entity = e; EntityBuffer::Add(this); }
+IfcReinforcingMesh::IfcReinforcingMesh(IfcAbstractEntity* e) : IfcReinforcingElement((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcReinforcingMesh)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcReinforcingMesh::IfcReinforcingMesh(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_SteelGrade, boost::optional< double > v10_MeshLength, boost::optional< double > v11_MeshWidth, double v12_LongitudinalBarNominalDiameter, double v13_TransverseBarNominalDiameter, double v14_LongitudinalBarCrossSectionArea, double v15_TransverseBarCrossSectionArea, double v16_LongitudinalBarSpacing, double v17_TransverseBarSpacing) : IfcReinforcingElement((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_SteelGrade) { e->setArgument(8,(*v9_SteelGrade)); } else { e->setArgument(8); } if (v10_MeshLength) { e->setArgument(9,(*v10_MeshLength)); } else { e->setArgument(9); } if (v11_MeshWidth) { e->setArgument(10,(*v11_MeshWidth)); } else { e->setArgument(10); } e->setArgument(11,(v12_LongitudinalBarNominalDiameter)); e->setArgument(12,(v13_TransverseBarNominalDiameter)); e->setArgument(13,(v14_LongitudinalBarCrossSectionArea)); e->setArgument(14,(v15_TransverseBarCrossSectionArea)); e->setArgument(15,(v16_LongitudinalBarSpacing)); e->setArgument(16,(v17_TransverseBarSpacing)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRelAggregates
 bool IfcRelAggregates::is(Type::Enum v) const { return v == Type::IfcRelAggregates || IfcRelDecomposes::is(v); }
 Type::Enum IfcRelAggregates::type() const { return Type::IfcRelAggregates; }
 Type::Enum IfcRelAggregates::Class() { return Type::IfcRelAggregates; }
-IfcRelAggregates::IfcRelAggregates(IfcAbstractEntityPtr e) : IfcRelDecomposes((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRelAggregates)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRelAggregates::IfcRelAggregates(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, IfcObjectDefinition* v5_RelatingObject, SHARED_PTR< IfcTemplatedEntityList< IfcObjectDefinition > > v6_RelatedObjects) : IfcRelDecomposes((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatingObject)); e->setArgument(5,(v6_RelatedObjects)->generalize()); entity = e; EntityBuffer::Add(this); }
+IfcRelAggregates::IfcRelAggregates(IfcAbstractEntity* e) : IfcRelDecomposes((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRelAggregates)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRelAggregates::IfcRelAggregates(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcObjectDefinition* v5_RelatingObject, IfcTemplatedEntityList< IfcObjectDefinition >::ptr v6_RelatedObjects) : IfcRelDecomposes((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatingObject)); e->setArgument(5,(v6_RelatedObjects)->generalize()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRelAssigns
-SHARED_PTR< IfcTemplatedEntityList< IfcObjectDefinition > > IfcRelAssigns::RelatedObjects() { RETURN_AS_LIST(IfcObjectDefinition,4) }
-void IfcRelAssigns::setRelatedObjects(SHARED_PTR< IfcTemplatedEntityList< IfcObjectDefinition > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v->generalize()); }
-bool IfcRelAssigns::hasRelatedObjectsType() { return !entity->getArgument(5)->isNull(); }
-IfcObjectTypeEnum::IfcObjectTypeEnum IfcRelAssigns::RelatedObjectsType() { return IfcObjectTypeEnum::FromString(*entity->getArgument(5)); }
+IfcTemplatedEntityList< IfcObjectDefinition >::ptr IfcRelAssigns::RelatedObjects() const { IfcEntityList::ptr es = *entity->getArgument(4); return es->as<IfcObjectDefinition>(); }
+void IfcRelAssigns::setRelatedObjects(IfcTemplatedEntityList< IfcObjectDefinition >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v->generalize()); }
+bool IfcRelAssigns::hasRelatedObjectsType() const { return !entity->getArgument(5)->isNull(); }
+IfcObjectTypeEnum::IfcObjectTypeEnum IfcRelAssigns::RelatedObjectsType() const { return IfcObjectTypeEnum::FromString(*entity->getArgument(5)); }
 void IfcRelAssigns::setRelatedObjectsType(IfcObjectTypeEnum::IfcObjectTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v,IfcObjectTypeEnum::ToString(v)); }
 bool IfcRelAssigns::is(Type::Enum v) const { return v == Type::IfcRelAssigns || IfcRelationship::is(v); }
 Type::Enum IfcRelAssigns::type() const { return Type::IfcRelAssigns; }
 Type::Enum IfcRelAssigns::Class() { return Type::IfcRelAssigns; }
-IfcRelAssigns::IfcRelAssigns(IfcAbstractEntityPtr e) : IfcRelationship((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRelAssigns)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRelAssigns::IfcRelAssigns(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, SHARED_PTR< IfcTemplatedEntityList< IfcObjectDefinition > > v5_RelatedObjects, boost::optional< IfcObjectTypeEnum::IfcObjectTypeEnum > v6_RelatedObjectsType) : IfcRelationship((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatedObjects)->generalize()); if (v6_RelatedObjectsType) { e->setArgument(5,*v6_RelatedObjectsType,IfcObjectTypeEnum::ToString(*v6_RelatedObjectsType)); } else { e->setArgument(5); } entity = e; EntityBuffer::Add(this); }
+IfcRelAssigns::IfcRelAssigns(IfcAbstractEntity* e) : IfcRelationship((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRelAssigns)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRelAssigns::IfcRelAssigns(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcTemplatedEntityList< IfcObjectDefinition >::ptr v5_RelatedObjects, boost::optional< IfcObjectTypeEnum::IfcObjectTypeEnum > v6_RelatedObjectsType) : IfcRelationship((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatedObjects)->generalize()); if (v6_RelatedObjectsType) { e->setArgument(5,*v6_RelatedObjectsType,IfcObjectTypeEnum::ToString(*v6_RelatedObjectsType)); } else { e->setArgument(5); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRelAssignsTasks
-bool IfcRelAssignsTasks::hasTimeForTask() { return !entity->getArgument(7)->isNull(); }
-IfcScheduleTimeControl* IfcRelAssignsTasks::TimeForTask() { return (IfcScheduleTimeControl*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(7))); }
+bool IfcRelAssignsTasks::hasTimeForTask() const { return !entity->getArgument(7)->isNull(); }
+IfcScheduleTimeControl* IfcRelAssignsTasks::TimeForTask() const { return (IfcScheduleTimeControl*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(7))); }
 void IfcRelAssignsTasks::setTimeForTask(IfcScheduleTimeControl* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
 bool IfcRelAssignsTasks::is(Type::Enum v) const { return v == Type::IfcRelAssignsTasks || IfcRelAssignsToControl::is(v); }
 Type::Enum IfcRelAssignsTasks::type() const { return Type::IfcRelAssignsTasks; }
 Type::Enum IfcRelAssignsTasks::Class() { return Type::IfcRelAssignsTasks; }
-IfcRelAssignsTasks::IfcRelAssignsTasks(IfcAbstractEntityPtr e) : IfcRelAssignsToControl((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRelAssignsTasks)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRelAssignsTasks::IfcRelAssignsTasks(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, SHARED_PTR< IfcTemplatedEntityList< IfcObjectDefinition > > v5_RelatedObjects, boost::optional< IfcObjectTypeEnum::IfcObjectTypeEnum > v6_RelatedObjectsType, IfcControl* v7_RelatingControl, IfcScheduleTimeControl* v8_TimeForTask) : IfcRelAssignsToControl((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatedObjects)->generalize()); if (v6_RelatedObjectsType) { e->setArgument(5,*v6_RelatedObjectsType,IfcObjectTypeEnum::ToString(*v6_RelatedObjectsType)); } else { e->setArgument(5); } e->setArgument(6,(v7_RelatingControl)); e->setArgument(7,(v8_TimeForTask)); entity = e; EntityBuffer::Add(this); }
+IfcRelAssignsTasks::IfcRelAssignsTasks(IfcAbstractEntity* e) : IfcRelAssignsToControl((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRelAssignsTasks)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRelAssignsTasks::IfcRelAssignsTasks(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcTemplatedEntityList< IfcObjectDefinition >::ptr v5_RelatedObjects, boost::optional< IfcObjectTypeEnum::IfcObjectTypeEnum > v6_RelatedObjectsType, IfcControl* v7_RelatingControl, IfcScheduleTimeControl* v8_TimeForTask) : IfcRelAssignsToControl((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatedObjects)->generalize()); if (v6_RelatedObjectsType) { e->setArgument(5,*v6_RelatedObjectsType,IfcObjectTypeEnum::ToString(*v6_RelatedObjectsType)); } else { e->setArgument(5); } e->setArgument(6,(v7_RelatingControl)); e->setArgument(7,(v8_TimeForTask)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRelAssignsToActor
-IfcActor* IfcRelAssignsToActor::RelatingActor() { return (IfcActor*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(6))); }
+IfcActor* IfcRelAssignsToActor::RelatingActor() const { return (IfcActor*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(6))); }
 void IfcRelAssignsToActor::setRelatingActor(IfcActor* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
-bool IfcRelAssignsToActor::hasActingRole() { return !entity->getArgument(7)->isNull(); }
-IfcActorRole* IfcRelAssignsToActor::ActingRole() { return (IfcActorRole*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(7))); }
+bool IfcRelAssignsToActor::hasActingRole() const { return !entity->getArgument(7)->isNull(); }
+IfcActorRole* IfcRelAssignsToActor::ActingRole() const { return (IfcActorRole*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(7))); }
 void IfcRelAssignsToActor::setActingRole(IfcActorRole* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
 bool IfcRelAssignsToActor::is(Type::Enum v) const { return v == Type::IfcRelAssignsToActor || IfcRelAssigns::is(v); }
 Type::Enum IfcRelAssignsToActor::type() const { return Type::IfcRelAssignsToActor; }
 Type::Enum IfcRelAssignsToActor::Class() { return Type::IfcRelAssignsToActor; }
-IfcRelAssignsToActor::IfcRelAssignsToActor(IfcAbstractEntityPtr e) : IfcRelAssigns((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRelAssignsToActor)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRelAssignsToActor::IfcRelAssignsToActor(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, SHARED_PTR< IfcTemplatedEntityList< IfcObjectDefinition > > v5_RelatedObjects, boost::optional< IfcObjectTypeEnum::IfcObjectTypeEnum > v6_RelatedObjectsType, IfcActor* v7_RelatingActor, IfcActorRole* v8_ActingRole) : IfcRelAssigns((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatedObjects)->generalize()); if (v6_RelatedObjectsType) { e->setArgument(5,*v6_RelatedObjectsType,IfcObjectTypeEnum::ToString(*v6_RelatedObjectsType)); } else { e->setArgument(5); } e->setArgument(6,(v7_RelatingActor)); e->setArgument(7,(v8_ActingRole)); entity = e; EntityBuffer::Add(this); }
+IfcRelAssignsToActor::IfcRelAssignsToActor(IfcAbstractEntity* e) : IfcRelAssigns((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRelAssignsToActor)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRelAssignsToActor::IfcRelAssignsToActor(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcTemplatedEntityList< IfcObjectDefinition >::ptr v5_RelatedObjects, boost::optional< IfcObjectTypeEnum::IfcObjectTypeEnum > v6_RelatedObjectsType, IfcActor* v7_RelatingActor, IfcActorRole* v8_ActingRole) : IfcRelAssigns((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatedObjects)->generalize()); if (v6_RelatedObjectsType) { e->setArgument(5,*v6_RelatedObjectsType,IfcObjectTypeEnum::ToString(*v6_RelatedObjectsType)); } else { e->setArgument(5); } e->setArgument(6,(v7_RelatingActor)); e->setArgument(7,(v8_ActingRole)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRelAssignsToControl
-IfcControl* IfcRelAssignsToControl::RelatingControl() { return (IfcControl*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(6))); }
+IfcControl* IfcRelAssignsToControl::RelatingControl() const { return (IfcControl*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(6))); }
 void IfcRelAssignsToControl::setRelatingControl(IfcControl* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
 bool IfcRelAssignsToControl::is(Type::Enum v) const { return v == Type::IfcRelAssignsToControl || IfcRelAssigns::is(v); }
 Type::Enum IfcRelAssignsToControl::type() const { return Type::IfcRelAssignsToControl; }
 Type::Enum IfcRelAssignsToControl::Class() { return Type::IfcRelAssignsToControl; }
-IfcRelAssignsToControl::IfcRelAssignsToControl(IfcAbstractEntityPtr e) : IfcRelAssigns((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRelAssignsToControl)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRelAssignsToControl::IfcRelAssignsToControl(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, SHARED_PTR< IfcTemplatedEntityList< IfcObjectDefinition > > v5_RelatedObjects, boost::optional< IfcObjectTypeEnum::IfcObjectTypeEnum > v6_RelatedObjectsType, IfcControl* v7_RelatingControl) : IfcRelAssigns((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatedObjects)->generalize()); if (v6_RelatedObjectsType) { e->setArgument(5,*v6_RelatedObjectsType,IfcObjectTypeEnum::ToString(*v6_RelatedObjectsType)); } else { e->setArgument(5); } e->setArgument(6,(v7_RelatingControl)); entity = e; EntityBuffer::Add(this); }
+IfcRelAssignsToControl::IfcRelAssignsToControl(IfcAbstractEntity* e) : IfcRelAssigns((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRelAssignsToControl)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRelAssignsToControl::IfcRelAssignsToControl(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcTemplatedEntityList< IfcObjectDefinition >::ptr v5_RelatedObjects, boost::optional< IfcObjectTypeEnum::IfcObjectTypeEnum > v6_RelatedObjectsType, IfcControl* v7_RelatingControl) : IfcRelAssigns((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatedObjects)->generalize()); if (v6_RelatedObjectsType) { e->setArgument(5,*v6_RelatedObjectsType,IfcObjectTypeEnum::ToString(*v6_RelatedObjectsType)); } else { e->setArgument(5); } e->setArgument(6,(v7_RelatingControl)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRelAssignsToGroup
-IfcGroup* IfcRelAssignsToGroup::RelatingGroup() { return (IfcGroup*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(6))); }
+IfcGroup* IfcRelAssignsToGroup::RelatingGroup() const { return (IfcGroup*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(6))); }
 void IfcRelAssignsToGroup::setRelatingGroup(IfcGroup* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
 bool IfcRelAssignsToGroup::is(Type::Enum v) const { return v == Type::IfcRelAssignsToGroup || IfcRelAssigns::is(v); }
 Type::Enum IfcRelAssignsToGroup::type() const { return Type::IfcRelAssignsToGroup; }
 Type::Enum IfcRelAssignsToGroup::Class() { return Type::IfcRelAssignsToGroup; }
-IfcRelAssignsToGroup::IfcRelAssignsToGroup(IfcAbstractEntityPtr e) : IfcRelAssigns((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRelAssignsToGroup)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRelAssignsToGroup::IfcRelAssignsToGroup(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, SHARED_PTR< IfcTemplatedEntityList< IfcObjectDefinition > > v5_RelatedObjects, boost::optional< IfcObjectTypeEnum::IfcObjectTypeEnum > v6_RelatedObjectsType, IfcGroup* v7_RelatingGroup) : IfcRelAssigns((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatedObjects)->generalize()); if (v6_RelatedObjectsType) { e->setArgument(5,*v6_RelatedObjectsType,IfcObjectTypeEnum::ToString(*v6_RelatedObjectsType)); } else { e->setArgument(5); } e->setArgument(6,(v7_RelatingGroup)); entity = e; EntityBuffer::Add(this); }
+IfcRelAssignsToGroup::IfcRelAssignsToGroup(IfcAbstractEntity* e) : IfcRelAssigns((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRelAssignsToGroup)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRelAssignsToGroup::IfcRelAssignsToGroup(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcTemplatedEntityList< IfcObjectDefinition >::ptr v5_RelatedObjects, boost::optional< IfcObjectTypeEnum::IfcObjectTypeEnum > v6_RelatedObjectsType, IfcGroup* v7_RelatingGroup) : IfcRelAssigns((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatedObjects)->generalize()); if (v6_RelatedObjectsType) { e->setArgument(5,*v6_RelatedObjectsType,IfcObjectTypeEnum::ToString(*v6_RelatedObjectsType)); } else { e->setArgument(5); } e->setArgument(6,(v7_RelatingGroup)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRelAssignsToProcess
-IfcProcess* IfcRelAssignsToProcess::RelatingProcess() { return (IfcProcess*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(6))); }
+IfcProcess* IfcRelAssignsToProcess::RelatingProcess() const { return (IfcProcess*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(6))); }
 void IfcRelAssignsToProcess::setRelatingProcess(IfcProcess* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
-bool IfcRelAssignsToProcess::hasQuantityInProcess() { return !entity->getArgument(7)->isNull(); }
-IfcMeasureWithUnit* IfcRelAssignsToProcess::QuantityInProcess() { return (IfcMeasureWithUnit*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(7))); }
+bool IfcRelAssignsToProcess::hasQuantityInProcess() const { return !entity->getArgument(7)->isNull(); }
+IfcMeasureWithUnit* IfcRelAssignsToProcess::QuantityInProcess() const { return (IfcMeasureWithUnit*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(7))); }
 void IfcRelAssignsToProcess::setQuantityInProcess(IfcMeasureWithUnit* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
 bool IfcRelAssignsToProcess::is(Type::Enum v) const { return v == Type::IfcRelAssignsToProcess || IfcRelAssigns::is(v); }
 Type::Enum IfcRelAssignsToProcess::type() const { return Type::IfcRelAssignsToProcess; }
 Type::Enum IfcRelAssignsToProcess::Class() { return Type::IfcRelAssignsToProcess; }
-IfcRelAssignsToProcess::IfcRelAssignsToProcess(IfcAbstractEntityPtr e) : IfcRelAssigns((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRelAssignsToProcess)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRelAssignsToProcess::IfcRelAssignsToProcess(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, SHARED_PTR< IfcTemplatedEntityList< IfcObjectDefinition > > v5_RelatedObjects, boost::optional< IfcObjectTypeEnum::IfcObjectTypeEnum > v6_RelatedObjectsType, IfcProcess* v7_RelatingProcess, IfcMeasureWithUnit* v8_QuantityInProcess) : IfcRelAssigns((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatedObjects)->generalize()); if (v6_RelatedObjectsType) { e->setArgument(5,*v6_RelatedObjectsType,IfcObjectTypeEnum::ToString(*v6_RelatedObjectsType)); } else { e->setArgument(5); } e->setArgument(6,(v7_RelatingProcess)); e->setArgument(7,(v8_QuantityInProcess)); entity = e; EntityBuffer::Add(this); }
+IfcRelAssignsToProcess::IfcRelAssignsToProcess(IfcAbstractEntity* e) : IfcRelAssigns((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRelAssignsToProcess)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRelAssignsToProcess::IfcRelAssignsToProcess(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcTemplatedEntityList< IfcObjectDefinition >::ptr v5_RelatedObjects, boost::optional< IfcObjectTypeEnum::IfcObjectTypeEnum > v6_RelatedObjectsType, IfcProcess* v7_RelatingProcess, IfcMeasureWithUnit* v8_QuantityInProcess) : IfcRelAssigns((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatedObjects)->generalize()); if (v6_RelatedObjectsType) { e->setArgument(5,*v6_RelatedObjectsType,IfcObjectTypeEnum::ToString(*v6_RelatedObjectsType)); } else { e->setArgument(5); } e->setArgument(6,(v7_RelatingProcess)); e->setArgument(7,(v8_QuantityInProcess)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRelAssignsToProduct
-IfcProduct* IfcRelAssignsToProduct::RelatingProduct() { return (IfcProduct*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(6))); }
+IfcProduct* IfcRelAssignsToProduct::RelatingProduct() const { return (IfcProduct*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(6))); }
 void IfcRelAssignsToProduct::setRelatingProduct(IfcProduct* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
 bool IfcRelAssignsToProduct::is(Type::Enum v) const { return v == Type::IfcRelAssignsToProduct || IfcRelAssigns::is(v); }
 Type::Enum IfcRelAssignsToProduct::type() const { return Type::IfcRelAssignsToProduct; }
 Type::Enum IfcRelAssignsToProduct::Class() { return Type::IfcRelAssignsToProduct; }
-IfcRelAssignsToProduct::IfcRelAssignsToProduct(IfcAbstractEntityPtr e) : IfcRelAssigns((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRelAssignsToProduct)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRelAssignsToProduct::IfcRelAssignsToProduct(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, SHARED_PTR< IfcTemplatedEntityList< IfcObjectDefinition > > v5_RelatedObjects, boost::optional< IfcObjectTypeEnum::IfcObjectTypeEnum > v6_RelatedObjectsType, IfcProduct* v7_RelatingProduct) : IfcRelAssigns((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatedObjects)->generalize()); if (v6_RelatedObjectsType) { e->setArgument(5,*v6_RelatedObjectsType,IfcObjectTypeEnum::ToString(*v6_RelatedObjectsType)); } else { e->setArgument(5); } e->setArgument(6,(v7_RelatingProduct)); entity = e; EntityBuffer::Add(this); }
+IfcRelAssignsToProduct::IfcRelAssignsToProduct(IfcAbstractEntity* e) : IfcRelAssigns((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRelAssignsToProduct)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRelAssignsToProduct::IfcRelAssignsToProduct(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcTemplatedEntityList< IfcObjectDefinition >::ptr v5_RelatedObjects, boost::optional< IfcObjectTypeEnum::IfcObjectTypeEnum > v6_RelatedObjectsType, IfcProduct* v7_RelatingProduct) : IfcRelAssigns((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatedObjects)->generalize()); if (v6_RelatedObjectsType) { e->setArgument(5,*v6_RelatedObjectsType,IfcObjectTypeEnum::ToString(*v6_RelatedObjectsType)); } else { e->setArgument(5); } e->setArgument(6,(v7_RelatingProduct)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRelAssignsToProjectOrder
 bool IfcRelAssignsToProjectOrder::is(Type::Enum v) const { return v == Type::IfcRelAssignsToProjectOrder || IfcRelAssignsToControl::is(v); }
 Type::Enum IfcRelAssignsToProjectOrder::type() const { return Type::IfcRelAssignsToProjectOrder; }
 Type::Enum IfcRelAssignsToProjectOrder::Class() { return Type::IfcRelAssignsToProjectOrder; }
-IfcRelAssignsToProjectOrder::IfcRelAssignsToProjectOrder(IfcAbstractEntityPtr e) : IfcRelAssignsToControl((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRelAssignsToProjectOrder)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRelAssignsToProjectOrder::IfcRelAssignsToProjectOrder(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, SHARED_PTR< IfcTemplatedEntityList< IfcObjectDefinition > > v5_RelatedObjects, boost::optional< IfcObjectTypeEnum::IfcObjectTypeEnum > v6_RelatedObjectsType, IfcControl* v7_RelatingControl) : IfcRelAssignsToControl((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatedObjects)->generalize()); if (v6_RelatedObjectsType) { e->setArgument(5,*v6_RelatedObjectsType,IfcObjectTypeEnum::ToString(*v6_RelatedObjectsType)); } else { e->setArgument(5); } e->setArgument(6,(v7_RelatingControl)); entity = e; EntityBuffer::Add(this); }
+IfcRelAssignsToProjectOrder::IfcRelAssignsToProjectOrder(IfcAbstractEntity* e) : IfcRelAssignsToControl((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRelAssignsToProjectOrder)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRelAssignsToProjectOrder::IfcRelAssignsToProjectOrder(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcTemplatedEntityList< IfcObjectDefinition >::ptr v5_RelatedObjects, boost::optional< IfcObjectTypeEnum::IfcObjectTypeEnum > v6_RelatedObjectsType, IfcControl* v7_RelatingControl) : IfcRelAssignsToControl((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatedObjects)->generalize()); if (v6_RelatedObjectsType) { e->setArgument(5,*v6_RelatedObjectsType,IfcObjectTypeEnum::ToString(*v6_RelatedObjectsType)); } else { e->setArgument(5); } e->setArgument(6,(v7_RelatingControl)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRelAssignsToResource
-IfcResource* IfcRelAssignsToResource::RelatingResource() { return (IfcResource*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(6))); }
+IfcResource* IfcRelAssignsToResource::RelatingResource() const { return (IfcResource*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(6))); }
 void IfcRelAssignsToResource::setRelatingResource(IfcResource* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
 bool IfcRelAssignsToResource::is(Type::Enum v) const { return v == Type::IfcRelAssignsToResource || IfcRelAssigns::is(v); }
 Type::Enum IfcRelAssignsToResource::type() const { return Type::IfcRelAssignsToResource; }
 Type::Enum IfcRelAssignsToResource::Class() { return Type::IfcRelAssignsToResource; }
-IfcRelAssignsToResource::IfcRelAssignsToResource(IfcAbstractEntityPtr e) : IfcRelAssigns((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRelAssignsToResource)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRelAssignsToResource::IfcRelAssignsToResource(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, SHARED_PTR< IfcTemplatedEntityList< IfcObjectDefinition > > v5_RelatedObjects, boost::optional< IfcObjectTypeEnum::IfcObjectTypeEnum > v6_RelatedObjectsType, IfcResource* v7_RelatingResource) : IfcRelAssigns((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatedObjects)->generalize()); if (v6_RelatedObjectsType) { e->setArgument(5,*v6_RelatedObjectsType,IfcObjectTypeEnum::ToString(*v6_RelatedObjectsType)); } else { e->setArgument(5); } e->setArgument(6,(v7_RelatingResource)); entity = e; EntityBuffer::Add(this); }
+IfcRelAssignsToResource::IfcRelAssignsToResource(IfcAbstractEntity* e) : IfcRelAssigns((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRelAssignsToResource)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRelAssignsToResource::IfcRelAssignsToResource(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcTemplatedEntityList< IfcObjectDefinition >::ptr v5_RelatedObjects, boost::optional< IfcObjectTypeEnum::IfcObjectTypeEnum > v6_RelatedObjectsType, IfcResource* v7_RelatingResource) : IfcRelAssigns((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatedObjects)->generalize()); if (v6_RelatedObjectsType) { e->setArgument(5,*v6_RelatedObjectsType,IfcObjectTypeEnum::ToString(*v6_RelatedObjectsType)); } else { e->setArgument(5); } e->setArgument(6,(v7_RelatingResource)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRelAssociates
-SHARED_PTR< IfcTemplatedEntityList< IfcRoot > > IfcRelAssociates::RelatedObjects() { RETURN_AS_LIST(IfcRoot,4) }
-void IfcRelAssociates::setRelatedObjects(SHARED_PTR< IfcTemplatedEntityList< IfcRoot > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v->generalize()); }
+IfcTemplatedEntityList< IfcRoot >::ptr IfcRelAssociates::RelatedObjects() const { IfcEntityList::ptr es = *entity->getArgument(4); return es->as<IfcRoot>(); }
+void IfcRelAssociates::setRelatedObjects(IfcTemplatedEntityList< IfcRoot >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v->generalize()); }
 bool IfcRelAssociates::is(Type::Enum v) const { return v == Type::IfcRelAssociates || IfcRelationship::is(v); }
 Type::Enum IfcRelAssociates::type() const { return Type::IfcRelAssociates; }
 Type::Enum IfcRelAssociates::Class() { return Type::IfcRelAssociates; }
-IfcRelAssociates::IfcRelAssociates(IfcAbstractEntityPtr e) : IfcRelationship((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRelAssociates)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRelAssociates::IfcRelAssociates(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, SHARED_PTR< IfcTemplatedEntityList< IfcRoot > > v5_RelatedObjects) : IfcRelationship((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatedObjects)->generalize()); entity = e; EntityBuffer::Add(this); }
+IfcRelAssociates::IfcRelAssociates(IfcAbstractEntity* e) : IfcRelationship((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRelAssociates)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRelAssociates::IfcRelAssociates(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcTemplatedEntityList< IfcRoot >::ptr v5_RelatedObjects) : IfcRelationship((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatedObjects)->generalize()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRelAssociatesAppliedValue
-IfcAppliedValue* IfcRelAssociatesAppliedValue::RelatingAppliedValue() { return (IfcAppliedValue*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(5))); }
+IfcAppliedValue* IfcRelAssociatesAppliedValue::RelatingAppliedValue() const { return (IfcAppliedValue*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(5))); }
 void IfcRelAssociatesAppliedValue::setRelatingAppliedValue(IfcAppliedValue* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
 bool IfcRelAssociatesAppliedValue::is(Type::Enum v) const { return v == Type::IfcRelAssociatesAppliedValue || IfcRelAssociates::is(v); }
 Type::Enum IfcRelAssociatesAppliedValue::type() const { return Type::IfcRelAssociatesAppliedValue; }
 Type::Enum IfcRelAssociatesAppliedValue::Class() { return Type::IfcRelAssociatesAppliedValue; }
-IfcRelAssociatesAppliedValue::IfcRelAssociatesAppliedValue(IfcAbstractEntityPtr e) : IfcRelAssociates((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRelAssociatesAppliedValue)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRelAssociatesAppliedValue::IfcRelAssociatesAppliedValue(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, SHARED_PTR< IfcTemplatedEntityList< IfcRoot > > v5_RelatedObjects, IfcAppliedValue* v6_RelatingAppliedValue) : IfcRelAssociates((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatedObjects)->generalize()); e->setArgument(5,(v6_RelatingAppliedValue)); entity = e; EntityBuffer::Add(this); }
+IfcRelAssociatesAppliedValue::IfcRelAssociatesAppliedValue(IfcAbstractEntity* e) : IfcRelAssociates((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRelAssociatesAppliedValue)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRelAssociatesAppliedValue::IfcRelAssociatesAppliedValue(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcTemplatedEntityList< IfcRoot >::ptr v5_RelatedObjects, IfcAppliedValue* v6_RelatingAppliedValue) : IfcRelAssociates((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatedObjects)->generalize()); e->setArgument(5,(v6_RelatingAppliedValue)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRelAssociatesApproval
-IfcApproval* IfcRelAssociatesApproval::RelatingApproval() { return (IfcApproval*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(5))); }
+IfcApproval* IfcRelAssociatesApproval::RelatingApproval() const { return (IfcApproval*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(5))); }
 void IfcRelAssociatesApproval::setRelatingApproval(IfcApproval* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
 bool IfcRelAssociatesApproval::is(Type::Enum v) const { return v == Type::IfcRelAssociatesApproval || IfcRelAssociates::is(v); }
 Type::Enum IfcRelAssociatesApproval::type() const { return Type::IfcRelAssociatesApproval; }
 Type::Enum IfcRelAssociatesApproval::Class() { return Type::IfcRelAssociatesApproval; }
-IfcRelAssociatesApproval::IfcRelAssociatesApproval(IfcAbstractEntityPtr e) : IfcRelAssociates((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRelAssociatesApproval)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRelAssociatesApproval::IfcRelAssociatesApproval(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, SHARED_PTR< IfcTemplatedEntityList< IfcRoot > > v5_RelatedObjects, IfcApproval* v6_RelatingApproval) : IfcRelAssociates((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatedObjects)->generalize()); e->setArgument(5,(v6_RelatingApproval)); entity = e; EntityBuffer::Add(this); }
+IfcRelAssociatesApproval::IfcRelAssociatesApproval(IfcAbstractEntity* e) : IfcRelAssociates((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRelAssociatesApproval)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRelAssociatesApproval::IfcRelAssociatesApproval(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcTemplatedEntityList< IfcRoot >::ptr v5_RelatedObjects, IfcApproval* v6_RelatingApproval) : IfcRelAssociates((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatedObjects)->generalize()); e->setArgument(5,(v6_RelatingApproval)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRelAssociatesClassification
-IfcClassificationNotationSelect IfcRelAssociatesClassification::RelatingClassification() { return *entity->getArgument(5); }
-void IfcRelAssociatesClassification::setRelatingClassification(IfcClassificationNotationSelect v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+IfcClassificationNotationSelect* IfcRelAssociatesClassification::RelatingClassification() const { return (IfcClassificationNotationSelect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(5))); }
+void IfcRelAssociatesClassification::setRelatingClassification(IfcClassificationNotationSelect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
 bool IfcRelAssociatesClassification::is(Type::Enum v) const { return v == Type::IfcRelAssociatesClassification || IfcRelAssociates::is(v); }
 Type::Enum IfcRelAssociatesClassification::type() const { return Type::IfcRelAssociatesClassification; }
 Type::Enum IfcRelAssociatesClassification::Class() { return Type::IfcRelAssociatesClassification; }
-IfcRelAssociatesClassification::IfcRelAssociatesClassification(IfcAbstractEntityPtr e) : IfcRelAssociates((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRelAssociatesClassification)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRelAssociatesClassification::IfcRelAssociatesClassification(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, SHARED_PTR< IfcTemplatedEntityList< IfcRoot > > v5_RelatedObjects, IfcClassificationNotationSelect v6_RelatingClassification) : IfcRelAssociates((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatedObjects)->generalize()); e->setArgument(5,(v6_RelatingClassification)); entity = e; EntityBuffer::Add(this); }
+IfcRelAssociatesClassification::IfcRelAssociatesClassification(IfcAbstractEntity* e) : IfcRelAssociates((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRelAssociatesClassification)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRelAssociatesClassification::IfcRelAssociatesClassification(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcTemplatedEntityList< IfcRoot >::ptr v5_RelatedObjects, IfcClassificationNotationSelect* v6_RelatingClassification) : IfcRelAssociates((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatedObjects)->generalize()); e->setArgument(5,(v6_RelatingClassification)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRelAssociatesConstraint
-IfcLabel IfcRelAssociatesConstraint::Intent() { return *entity->getArgument(5); }
-void IfcRelAssociatesConstraint::setIntent(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-IfcConstraint* IfcRelAssociatesConstraint::RelatingConstraint() { return (IfcConstraint*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(6))); }
+std::string IfcRelAssociatesConstraint::Intent() const { return *entity->getArgument(5); }
+void IfcRelAssociatesConstraint::setIntent(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+IfcConstraint* IfcRelAssociatesConstraint::RelatingConstraint() const { return (IfcConstraint*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(6))); }
 void IfcRelAssociatesConstraint::setRelatingConstraint(IfcConstraint* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
 bool IfcRelAssociatesConstraint::is(Type::Enum v) const { return v == Type::IfcRelAssociatesConstraint || IfcRelAssociates::is(v); }
 Type::Enum IfcRelAssociatesConstraint::type() const { return Type::IfcRelAssociatesConstraint; }
 Type::Enum IfcRelAssociatesConstraint::Class() { return Type::IfcRelAssociatesConstraint; }
-IfcRelAssociatesConstraint::IfcRelAssociatesConstraint(IfcAbstractEntityPtr e) : IfcRelAssociates((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRelAssociatesConstraint)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRelAssociatesConstraint::IfcRelAssociatesConstraint(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, SHARED_PTR< IfcTemplatedEntityList< IfcRoot > > v5_RelatedObjects, IfcLabel v6_Intent, IfcConstraint* v7_RelatingConstraint) : IfcRelAssociates((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatedObjects)->generalize()); e->setArgument(5,(v6_Intent)); e->setArgument(6,(v7_RelatingConstraint)); entity = e; EntityBuffer::Add(this); }
+IfcRelAssociatesConstraint::IfcRelAssociatesConstraint(IfcAbstractEntity* e) : IfcRelAssociates((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRelAssociatesConstraint)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRelAssociatesConstraint::IfcRelAssociatesConstraint(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcTemplatedEntityList< IfcRoot >::ptr v5_RelatedObjects, std::string v6_Intent, IfcConstraint* v7_RelatingConstraint) : IfcRelAssociates((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatedObjects)->generalize()); e->setArgument(5,(v6_Intent)); e->setArgument(6,(v7_RelatingConstraint)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRelAssociatesDocument
-IfcDocumentSelect IfcRelAssociatesDocument::RelatingDocument() { return *entity->getArgument(5); }
-void IfcRelAssociatesDocument::setRelatingDocument(IfcDocumentSelect v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+IfcDocumentSelect* IfcRelAssociatesDocument::RelatingDocument() const { return (IfcDocumentSelect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(5))); }
+void IfcRelAssociatesDocument::setRelatingDocument(IfcDocumentSelect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
 bool IfcRelAssociatesDocument::is(Type::Enum v) const { return v == Type::IfcRelAssociatesDocument || IfcRelAssociates::is(v); }
 Type::Enum IfcRelAssociatesDocument::type() const { return Type::IfcRelAssociatesDocument; }
 Type::Enum IfcRelAssociatesDocument::Class() { return Type::IfcRelAssociatesDocument; }
-IfcRelAssociatesDocument::IfcRelAssociatesDocument(IfcAbstractEntityPtr e) : IfcRelAssociates((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRelAssociatesDocument)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRelAssociatesDocument::IfcRelAssociatesDocument(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, SHARED_PTR< IfcTemplatedEntityList< IfcRoot > > v5_RelatedObjects, IfcDocumentSelect v6_RelatingDocument) : IfcRelAssociates((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatedObjects)->generalize()); e->setArgument(5,(v6_RelatingDocument)); entity = e; EntityBuffer::Add(this); }
+IfcRelAssociatesDocument::IfcRelAssociatesDocument(IfcAbstractEntity* e) : IfcRelAssociates((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRelAssociatesDocument)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRelAssociatesDocument::IfcRelAssociatesDocument(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcTemplatedEntityList< IfcRoot >::ptr v5_RelatedObjects, IfcDocumentSelect* v6_RelatingDocument) : IfcRelAssociates((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatedObjects)->generalize()); e->setArgument(5,(v6_RelatingDocument)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRelAssociatesLibrary
-IfcLibrarySelect IfcRelAssociatesLibrary::RelatingLibrary() { return *entity->getArgument(5); }
-void IfcRelAssociatesLibrary::setRelatingLibrary(IfcLibrarySelect v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+IfcLibrarySelect* IfcRelAssociatesLibrary::RelatingLibrary() const { return (IfcLibrarySelect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(5))); }
+void IfcRelAssociatesLibrary::setRelatingLibrary(IfcLibrarySelect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
 bool IfcRelAssociatesLibrary::is(Type::Enum v) const { return v == Type::IfcRelAssociatesLibrary || IfcRelAssociates::is(v); }
 Type::Enum IfcRelAssociatesLibrary::type() const { return Type::IfcRelAssociatesLibrary; }
 Type::Enum IfcRelAssociatesLibrary::Class() { return Type::IfcRelAssociatesLibrary; }
-IfcRelAssociatesLibrary::IfcRelAssociatesLibrary(IfcAbstractEntityPtr e) : IfcRelAssociates((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRelAssociatesLibrary)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRelAssociatesLibrary::IfcRelAssociatesLibrary(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, SHARED_PTR< IfcTemplatedEntityList< IfcRoot > > v5_RelatedObjects, IfcLibrarySelect v6_RelatingLibrary) : IfcRelAssociates((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatedObjects)->generalize()); e->setArgument(5,(v6_RelatingLibrary)); entity = e; EntityBuffer::Add(this); }
+IfcRelAssociatesLibrary::IfcRelAssociatesLibrary(IfcAbstractEntity* e) : IfcRelAssociates((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRelAssociatesLibrary)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRelAssociatesLibrary::IfcRelAssociatesLibrary(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcTemplatedEntityList< IfcRoot >::ptr v5_RelatedObjects, IfcLibrarySelect* v6_RelatingLibrary) : IfcRelAssociates((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatedObjects)->generalize()); e->setArgument(5,(v6_RelatingLibrary)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRelAssociatesMaterial
-IfcMaterialSelect IfcRelAssociatesMaterial::RelatingMaterial() { return *entity->getArgument(5); }
-void IfcRelAssociatesMaterial::setRelatingMaterial(IfcMaterialSelect v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+IfcMaterialSelect* IfcRelAssociatesMaterial::RelatingMaterial() const { return (IfcMaterialSelect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(5))); }
+void IfcRelAssociatesMaterial::setRelatingMaterial(IfcMaterialSelect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
 bool IfcRelAssociatesMaterial::is(Type::Enum v) const { return v == Type::IfcRelAssociatesMaterial || IfcRelAssociates::is(v); }
 Type::Enum IfcRelAssociatesMaterial::type() const { return Type::IfcRelAssociatesMaterial; }
 Type::Enum IfcRelAssociatesMaterial::Class() { return Type::IfcRelAssociatesMaterial; }
-IfcRelAssociatesMaterial::IfcRelAssociatesMaterial(IfcAbstractEntityPtr e) : IfcRelAssociates((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRelAssociatesMaterial)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRelAssociatesMaterial::IfcRelAssociatesMaterial(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, SHARED_PTR< IfcTemplatedEntityList< IfcRoot > > v5_RelatedObjects, IfcMaterialSelect v6_RelatingMaterial) : IfcRelAssociates((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatedObjects)->generalize()); e->setArgument(5,(v6_RelatingMaterial)); entity = e; EntityBuffer::Add(this); }
+IfcRelAssociatesMaterial::IfcRelAssociatesMaterial(IfcAbstractEntity* e) : IfcRelAssociates((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRelAssociatesMaterial)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRelAssociatesMaterial::IfcRelAssociatesMaterial(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcTemplatedEntityList< IfcRoot >::ptr v5_RelatedObjects, IfcMaterialSelect* v6_RelatingMaterial) : IfcRelAssociates((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatedObjects)->generalize()); e->setArgument(5,(v6_RelatingMaterial)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRelAssociatesProfileProperties
-IfcProfileProperties* IfcRelAssociatesProfileProperties::RelatingProfileProperties() { return (IfcProfileProperties*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(5))); }
+IfcProfileProperties* IfcRelAssociatesProfileProperties::RelatingProfileProperties() const { return (IfcProfileProperties*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(5))); }
 void IfcRelAssociatesProfileProperties::setRelatingProfileProperties(IfcProfileProperties* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-bool IfcRelAssociatesProfileProperties::hasProfileSectionLocation() { return !entity->getArgument(6)->isNull(); }
-IfcShapeAspect* IfcRelAssociatesProfileProperties::ProfileSectionLocation() { return (IfcShapeAspect*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(6))); }
+bool IfcRelAssociatesProfileProperties::hasProfileSectionLocation() const { return !entity->getArgument(6)->isNull(); }
+IfcShapeAspect* IfcRelAssociatesProfileProperties::ProfileSectionLocation() const { return (IfcShapeAspect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(6))); }
 void IfcRelAssociatesProfileProperties::setProfileSectionLocation(IfcShapeAspect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
-bool IfcRelAssociatesProfileProperties::hasProfileOrientation() { return !entity->getArgument(7)->isNull(); }
-IfcOrientationSelect IfcRelAssociatesProfileProperties::ProfileOrientation() { return *entity->getArgument(7); }
-void IfcRelAssociatesProfileProperties::setProfileOrientation(IfcOrientationSelect v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
+bool IfcRelAssociatesProfileProperties::hasProfileOrientation() const { return !entity->getArgument(7)->isNull(); }
+IfcOrientationSelect* IfcRelAssociatesProfileProperties::ProfileOrientation() const { return (IfcOrientationSelect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(7))); }
+void IfcRelAssociatesProfileProperties::setProfileOrientation(IfcOrientationSelect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
 bool IfcRelAssociatesProfileProperties::is(Type::Enum v) const { return v == Type::IfcRelAssociatesProfileProperties || IfcRelAssociates::is(v); }
 Type::Enum IfcRelAssociatesProfileProperties::type() const { return Type::IfcRelAssociatesProfileProperties; }
 Type::Enum IfcRelAssociatesProfileProperties::Class() { return Type::IfcRelAssociatesProfileProperties; }
-IfcRelAssociatesProfileProperties::IfcRelAssociatesProfileProperties(IfcAbstractEntityPtr e) : IfcRelAssociates((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRelAssociatesProfileProperties)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRelAssociatesProfileProperties::IfcRelAssociatesProfileProperties(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, SHARED_PTR< IfcTemplatedEntityList< IfcRoot > > v5_RelatedObjects, IfcProfileProperties* v6_RelatingProfileProperties, IfcShapeAspect* v7_ProfileSectionLocation, boost::optional< IfcOrientationSelect > v8_ProfileOrientation) : IfcRelAssociates((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatedObjects)->generalize()); e->setArgument(5,(v6_RelatingProfileProperties)); e->setArgument(6,(v7_ProfileSectionLocation)); if (v8_ProfileOrientation) { e->setArgument(7,(*v8_ProfileOrientation)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
+IfcRelAssociatesProfileProperties::IfcRelAssociatesProfileProperties(IfcAbstractEntity* e) : IfcRelAssociates((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRelAssociatesProfileProperties)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRelAssociatesProfileProperties::IfcRelAssociatesProfileProperties(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcTemplatedEntityList< IfcRoot >::ptr v5_RelatedObjects, IfcProfileProperties* v6_RelatingProfileProperties, IfcShapeAspect* v7_ProfileSectionLocation, IfcOrientationSelect* v8_ProfileOrientation) : IfcRelAssociates((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatedObjects)->generalize()); e->setArgument(5,(v6_RelatingProfileProperties)); e->setArgument(6,(v7_ProfileSectionLocation)); e->setArgument(7,(v8_ProfileOrientation)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRelConnects
 bool IfcRelConnects::is(Type::Enum v) const { return v == Type::IfcRelConnects || IfcRelationship::is(v); }
 Type::Enum IfcRelConnects::type() const { return Type::IfcRelConnects; }
 Type::Enum IfcRelConnects::Class() { return Type::IfcRelConnects; }
-IfcRelConnects::IfcRelConnects(IfcAbstractEntityPtr e) : IfcRelationship((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRelConnects)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRelConnects::IfcRelConnects(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description) : IfcRelationship((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } entity = e; EntityBuffer::Add(this); }
+IfcRelConnects::IfcRelConnects(IfcAbstractEntity* e) : IfcRelationship((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRelConnects)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRelConnects::IfcRelConnects(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description) : IfcRelationship((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRelConnectsElements
-bool IfcRelConnectsElements::hasConnectionGeometry() { return !entity->getArgument(4)->isNull(); }
-IfcConnectionGeometry* IfcRelConnectsElements::ConnectionGeometry() { return (IfcConnectionGeometry*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(4))); }
+bool IfcRelConnectsElements::hasConnectionGeometry() const { return !entity->getArgument(4)->isNull(); }
+IfcConnectionGeometry* IfcRelConnectsElements::ConnectionGeometry() const { return (IfcConnectionGeometry*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(4))); }
 void IfcRelConnectsElements::setConnectionGeometry(IfcConnectionGeometry* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-IfcElement* IfcRelConnectsElements::RelatingElement() { return (IfcElement*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(5))); }
+IfcElement* IfcRelConnectsElements::RelatingElement() const { return (IfcElement*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(5))); }
 void IfcRelConnectsElements::setRelatingElement(IfcElement* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-IfcElement* IfcRelConnectsElements::RelatedElement() { return (IfcElement*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(6))); }
+IfcElement* IfcRelConnectsElements::RelatedElement() const { return (IfcElement*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(6))); }
 void IfcRelConnectsElements::setRelatedElement(IfcElement* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
 bool IfcRelConnectsElements::is(Type::Enum v) const { return v == Type::IfcRelConnectsElements || IfcRelConnects::is(v); }
 Type::Enum IfcRelConnectsElements::type() const { return Type::IfcRelConnectsElements; }
 Type::Enum IfcRelConnectsElements::Class() { return Type::IfcRelConnectsElements; }
-IfcRelConnectsElements::IfcRelConnectsElements(IfcAbstractEntityPtr e) : IfcRelConnects((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRelConnectsElements)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRelConnectsElements::IfcRelConnectsElements(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, IfcConnectionGeometry* v5_ConnectionGeometry, IfcElement* v6_RelatingElement, IfcElement* v7_RelatedElement) : IfcRelConnects((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_ConnectionGeometry)); e->setArgument(5,(v6_RelatingElement)); e->setArgument(6,(v7_RelatedElement)); entity = e; EntityBuffer::Add(this); }
+IfcRelConnectsElements::IfcRelConnectsElements(IfcAbstractEntity* e) : IfcRelConnects((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRelConnectsElements)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRelConnectsElements::IfcRelConnectsElements(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcConnectionGeometry* v5_ConnectionGeometry, IfcElement* v6_RelatingElement, IfcElement* v7_RelatedElement) : IfcRelConnects((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_ConnectionGeometry)); e->setArgument(5,(v6_RelatingElement)); e->setArgument(6,(v7_RelatedElement)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRelConnectsPathElements
-std::vector< int > /*[0:?]*/ IfcRelConnectsPathElements::RelatingPriorities() { return *entity->getArgument(7); }
+std::vector< int > /*[0:?]*/ IfcRelConnectsPathElements::RelatingPriorities() const { return *entity->getArgument(7); }
 void IfcRelConnectsPathElements::setRelatingPriorities(std::vector< int > /*[0:?]*/ v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
-std::vector< int > /*[0:?]*/ IfcRelConnectsPathElements::RelatedPriorities() { return *entity->getArgument(8); }
+std::vector< int > /*[0:?]*/ IfcRelConnectsPathElements::RelatedPriorities() const { return *entity->getArgument(8); }
 void IfcRelConnectsPathElements::setRelatedPriorities(std::vector< int > /*[0:?]*/ v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
-IfcConnectionTypeEnum::IfcConnectionTypeEnum IfcRelConnectsPathElements::RelatedConnectionType() { return IfcConnectionTypeEnum::FromString(*entity->getArgument(9)); }
+IfcConnectionTypeEnum::IfcConnectionTypeEnum IfcRelConnectsPathElements::RelatedConnectionType() const { return IfcConnectionTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcRelConnectsPathElements::setRelatedConnectionType(IfcConnectionTypeEnum::IfcConnectionTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcConnectionTypeEnum::ToString(v)); }
-IfcConnectionTypeEnum::IfcConnectionTypeEnum IfcRelConnectsPathElements::RelatingConnectionType() { return IfcConnectionTypeEnum::FromString(*entity->getArgument(10)); }
+IfcConnectionTypeEnum::IfcConnectionTypeEnum IfcRelConnectsPathElements::RelatingConnectionType() const { return IfcConnectionTypeEnum::FromString(*entity->getArgument(10)); }
 void IfcRelConnectsPathElements::setRelatingConnectionType(IfcConnectionTypeEnum::IfcConnectionTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v,IfcConnectionTypeEnum::ToString(v)); }
 bool IfcRelConnectsPathElements::is(Type::Enum v) const { return v == Type::IfcRelConnectsPathElements || IfcRelConnectsElements::is(v); }
 Type::Enum IfcRelConnectsPathElements::type() const { return Type::IfcRelConnectsPathElements; }
 Type::Enum IfcRelConnectsPathElements::Class() { return Type::IfcRelConnectsPathElements; }
-IfcRelConnectsPathElements::IfcRelConnectsPathElements(IfcAbstractEntityPtr e) : IfcRelConnectsElements((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRelConnectsPathElements)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRelConnectsPathElements::IfcRelConnectsPathElements(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, IfcConnectionGeometry* v5_ConnectionGeometry, IfcElement* v6_RelatingElement, IfcElement* v7_RelatedElement, std::vector< int > /*[0:?]*/ v8_RelatingPriorities, std::vector< int > /*[0:?]*/ v9_RelatedPriorities, IfcConnectionTypeEnum::IfcConnectionTypeEnum v10_RelatedConnectionType, IfcConnectionTypeEnum::IfcConnectionTypeEnum v11_RelatingConnectionType) : IfcRelConnectsElements((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_ConnectionGeometry)); e->setArgument(5,(v6_RelatingElement)); e->setArgument(6,(v7_RelatedElement)); e->setArgument(7,(v8_RelatingPriorities)); e->setArgument(8,(v9_RelatedPriorities)); e->setArgument(9,v10_RelatedConnectionType,IfcConnectionTypeEnum::ToString(v10_RelatedConnectionType)); e->setArgument(10,v11_RelatingConnectionType,IfcConnectionTypeEnum::ToString(v11_RelatingConnectionType)); entity = e; EntityBuffer::Add(this); }
+IfcRelConnectsPathElements::IfcRelConnectsPathElements(IfcAbstractEntity* e) : IfcRelConnectsElements((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRelConnectsPathElements)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRelConnectsPathElements::IfcRelConnectsPathElements(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcConnectionGeometry* v5_ConnectionGeometry, IfcElement* v6_RelatingElement, IfcElement* v7_RelatedElement, std::vector< int > /*[0:?]*/ v8_RelatingPriorities, std::vector< int > /*[0:?]*/ v9_RelatedPriorities, IfcConnectionTypeEnum::IfcConnectionTypeEnum v10_RelatedConnectionType, IfcConnectionTypeEnum::IfcConnectionTypeEnum v11_RelatingConnectionType) : IfcRelConnectsElements((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_ConnectionGeometry)); e->setArgument(5,(v6_RelatingElement)); e->setArgument(6,(v7_RelatedElement)); e->setArgument(7,(v8_RelatingPriorities)); e->setArgument(8,(v9_RelatedPriorities)); e->setArgument(9,v10_RelatedConnectionType,IfcConnectionTypeEnum::ToString(v10_RelatedConnectionType)); e->setArgument(10,v11_RelatingConnectionType,IfcConnectionTypeEnum::ToString(v11_RelatingConnectionType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRelConnectsPortToElement
-IfcPort* IfcRelConnectsPortToElement::RelatingPort() { return (IfcPort*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(4))); }
+IfcPort* IfcRelConnectsPortToElement::RelatingPort() const { return (IfcPort*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(4))); }
 void IfcRelConnectsPortToElement::setRelatingPort(IfcPort* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-IfcElement* IfcRelConnectsPortToElement::RelatedElement() { return (IfcElement*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(5))); }
+IfcElement* IfcRelConnectsPortToElement::RelatedElement() const { return (IfcElement*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(5))); }
 void IfcRelConnectsPortToElement::setRelatedElement(IfcElement* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
 bool IfcRelConnectsPortToElement::is(Type::Enum v) const { return v == Type::IfcRelConnectsPortToElement || IfcRelConnects::is(v); }
 Type::Enum IfcRelConnectsPortToElement::type() const { return Type::IfcRelConnectsPortToElement; }
 Type::Enum IfcRelConnectsPortToElement::Class() { return Type::IfcRelConnectsPortToElement; }
-IfcRelConnectsPortToElement::IfcRelConnectsPortToElement(IfcAbstractEntityPtr e) : IfcRelConnects((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRelConnectsPortToElement)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRelConnectsPortToElement::IfcRelConnectsPortToElement(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, IfcPort* v5_RelatingPort, IfcElement* v6_RelatedElement) : IfcRelConnects((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatingPort)); e->setArgument(5,(v6_RelatedElement)); entity = e; EntityBuffer::Add(this); }
+IfcRelConnectsPortToElement::IfcRelConnectsPortToElement(IfcAbstractEntity* e) : IfcRelConnects((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRelConnectsPortToElement)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRelConnectsPortToElement::IfcRelConnectsPortToElement(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcPort* v5_RelatingPort, IfcElement* v6_RelatedElement) : IfcRelConnects((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatingPort)); e->setArgument(5,(v6_RelatedElement)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRelConnectsPorts
-IfcPort* IfcRelConnectsPorts::RelatingPort() { return (IfcPort*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(4))); }
+IfcPort* IfcRelConnectsPorts::RelatingPort() const { return (IfcPort*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(4))); }
 void IfcRelConnectsPorts::setRelatingPort(IfcPort* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-IfcPort* IfcRelConnectsPorts::RelatedPort() { return (IfcPort*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(5))); }
+IfcPort* IfcRelConnectsPorts::RelatedPort() const { return (IfcPort*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(5))); }
 void IfcRelConnectsPorts::setRelatedPort(IfcPort* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-bool IfcRelConnectsPorts::hasRealizingElement() { return !entity->getArgument(6)->isNull(); }
-IfcElement* IfcRelConnectsPorts::RealizingElement() { return (IfcElement*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(6))); }
+bool IfcRelConnectsPorts::hasRealizingElement() const { return !entity->getArgument(6)->isNull(); }
+IfcElement* IfcRelConnectsPorts::RealizingElement() const { return (IfcElement*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(6))); }
 void IfcRelConnectsPorts::setRealizingElement(IfcElement* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
 bool IfcRelConnectsPorts::is(Type::Enum v) const { return v == Type::IfcRelConnectsPorts || IfcRelConnects::is(v); }
 Type::Enum IfcRelConnectsPorts::type() const { return Type::IfcRelConnectsPorts; }
 Type::Enum IfcRelConnectsPorts::Class() { return Type::IfcRelConnectsPorts; }
-IfcRelConnectsPorts::IfcRelConnectsPorts(IfcAbstractEntityPtr e) : IfcRelConnects((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRelConnectsPorts)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRelConnectsPorts::IfcRelConnectsPorts(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, IfcPort* v5_RelatingPort, IfcPort* v6_RelatedPort, IfcElement* v7_RealizingElement) : IfcRelConnects((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatingPort)); e->setArgument(5,(v6_RelatedPort)); e->setArgument(6,(v7_RealizingElement)); entity = e; EntityBuffer::Add(this); }
+IfcRelConnectsPorts::IfcRelConnectsPorts(IfcAbstractEntity* e) : IfcRelConnects((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRelConnectsPorts)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRelConnectsPorts::IfcRelConnectsPorts(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcPort* v5_RelatingPort, IfcPort* v6_RelatedPort, IfcElement* v7_RealizingElement) : IfcRelConnects((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatingPort)); e->setArgument(5,(v6_RelatedPort)); e->setArgument(6,(v7_RealizingElement)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRelConnectsStructuralActivity
-IfcStructuralActivityAssignmentSelect IfcRelConnectsStructuralActivity::RelatingElement() { return *entity->getArgument(4); }
-void IfcRelConnectsStructuralActivity::setRelatingElement(IfcStructuralActivityAssignmentSelect v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-IfcStructuralActivity* IfcRelConnectsStructuralActivity::RelatedStructuralActivity() { return (IfcStructuralActivity*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(5))); }
+IfcStructuralActivityAssignmentSelect* IfcRelConnectsStructuralActivity::RelatingElement() const { return (IfcStructuralActivityAssignmentSelect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(4))); }
+void IfcRelConnectsStructuralActivity::setRelatingElement(IfcStructuralActivityAssignmentSelect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+IfcStructuralActivity* IfcRelConnectsStructuralActivity::RelatedStructuralActivity() const { return (IfcStructuralActivity*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(5))); }
 void IfcRelConnectsStructuralActivity::setRelatedStructuralActivity(IfcStructuralActivity* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
 bool IfcRelConnectsStructuralActivity::is(Type::Enum v) const { return v == Type::IfcRelConnectsStructuralActivity || IfcRelConnects::is(v); }
 Type::Enum IfcRelConnectsStructuralActivity::type() const { return Type::IfcRelConnectsStructuralActivity; }
 Type::Enum IfcRelConnectsStructuralActivity::Class() { return Type::IfcRelConnectsStructuralActivity; }
-IfcRelConnectsStructuralActivity::IfcRelConnectsStructuralActivity(IfcAbstractEntityPtr e) : IfcRelConnects((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRelConnectsStructuralActivity)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRelConnectsStructuralActivity::IfcRelConnectsStructuralActivity(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, IfcStructuralActivityAssignmentSelect v5_RelatingElement, IfcStructuralActivity* v6_RelatedStructuralActivity) : IfcRelConnects((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatingElement)); e->setArgument(5,(v6_RelatedStructuralActivity)); entity = e; EntityBuffer::Add(this); }
+IfcRelConnectsStructuralActivity::IfcRelConnectsStructuralActivity(IfcAbstractEntity* e) : IfcRelConnects((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRelConnectsStructuralActivity)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRelConnectsStructuralActivity::IfcRelConnectsStructuralActivity(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcStructuralActivityAssignmentSelect* v5_RelatingElement, IfcStructuralActivity* v6_RelatedStructuralActivity) : IfcRelConnects((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatingElement)); e->setArgument(5,(v6_RelatedStructuralActivity)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRelConnectsStructuralElement
-IfcElement* IfcRelConnectsStructuralElement::RelatingElement() { return (IfcElement*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(4))); }
+IfcElement* IfcRelConnectsStructuralElement::RelatingElement() const { return (IfcElement*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(4))); }
 void IfcRelConnectsStructuralElement::setRelatingElement(IfcElement* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-IfcStructuralMember* IfcRelConnectsStructuralElement::RelatedStructuralMember() { return (IfcStructuralMember*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(5))); }
+IfcStructuralMember* IfcRelConnectsStructuralElement::RelatedStructuralMember() const { return (IfcStructuralMember*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(5))); }
 void IfcRelConnectsStructuralElement::setRelatedStructuralMember(IfcStructuralMember* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
 bool IfcRelConnectsStructuralElement::is(Type::Enum v) const { return v == Type::IfcRelConnectsStructuralElement || IfcRelConnects::is(v); }
 Type::Enum IfcRelConnectsStructuralElement::type() const { return Type::IfcRelConnectsStructuralElement; }
 Type::Enum IfcRelConnectsStructuralElement::Class() { return Type::IfcRelConnectsStructuralElement; }
-IfcRelConnectsStructuralElement::IfcRelConnectsStructuralElement(IfcAbstractEntityPtr e) : IfcRelConnects((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRelConnectsStructuralElement)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRelConnectsStructuralElement::IfcRelConnectsStructuralElement(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, IfcElement* v5_RelatingElement, IfcStructuralMember* v6_RelatedStructuralMember) : IfcRelConnects((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatingElement)); e->setArgument(5,(v6_RelatedStructuralMember)); entity = e; EntityBuffer::Add(this); }
+IfcRelConnectsStructuralElement::IfcRelConnectsStructuralElement(IfcAbstractEntity* e) : IfcRelConnects((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRelConnectsStructuralElement)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRelConnectsStructuralElement::IfcRelConnectsStructuralElement(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcElement* v5_RelatingElement, IfcStructuralMember* v6_RelatedStructuralMember) : IfcRelConnects((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatingElement)); e->setArgument(5,(v6_RelatedStructuralMember)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRelConnectsStructuralMember
-IfcStructuralMember* IfcRelConnectsStructuralMember::RelatingStructuralMember() { return (IfcStructuralMember*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(4))); }
+IfcStructuralMember* IfcRelConnectsStructuralMember::RelatingStructuralMember() const { return (IfcStructuralMember*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(4))); }
 void IfcRelConnectsStructuralMember::setRelatingStructuralMember(IfcStructuralMember* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-IfcStructuralConnection* IfcRelConnectsStructuralMember::RelatedStructuralConnection() { return (IfcStructuralConnection*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(5))); }
+IfcStructuralConnection* IfcRelConnectsStructuralMember::RelatedStructuralConnection() const { return (IfcStructuralConnection*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(5))); }
 void IfcRelConnectsStructuralMember::setRelatedStructuralConnection(IfcStructuralConnection* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-bool IfcRelConnectsStructuralMember::hasAppliedCondition() { return !entity->getArgument(6)->isNull(); }
-IfcBoundaryCondition* IfcRelConnectsStructuralMember::AppliedCondition() { return (IfcBoundaryCondition*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(6))); }
+bool IfcRelConnectsStructuralMember::hasAppliedCondition() const { return !entity->getArgument(6)->isNull(); }
+IfcBoundaryCondition* IfcRelConnectsStructuralMember::AppliedCondition() const { return (IfcBoundaryCondition*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(6))); }
 void IfcRelConnectsStructuralMember::setAppliedCondition(IfcBoundaryCondition* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
-bool IfcRelConnectsStructuralMember::hasAdditionalConditions() { return !entity->getArgument(7)->isNull(); }
-IfcStructuralConnectionCondition* IfcRelConnectsStructuralMember::AdditionalConditions() { return (IfcStructuralConnectionCondition*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(7))); }
+bool IfcRelConnectsStructuralMember::hasAdditionalConditions() const { return !entity->getArgument(7)->isNull(); }
+IfcStructuralConnectionCondition* IfcRelConnectsStructuralMember::AdditionalConditions() const { return (IfcStructuralConnectionCondition*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(7))); }
 void IfcRelConnectsStructuralMember::setAdditionalConditions(IfcStructuralConnectionCondition* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
-bool IfcRelConnectsStructuralMember::hasSupportedLength() { return !entity->getArgument(8)->isNull(); }
-IfcLengthMeasure IfcRelConnectsStructuralMember::SupportedLength() { return *entity->getArgument(8); }
-void IfcRelConnectsStructuralMember::setSupportedLength(IfcLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
-bool IfcRelConnectsStructuralMember::hasConditionCoordinateSystem() { return !entity->getArgument(9)->isNull(); }
-IfcAxis2Placement3D* IfcRelConnectsStructuralMember::ConditionCoordinateSystem() { return (IfcAxis2Placement3D*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(9))); }
+bool IfcRelConnectsStructuralMember::hasSupportedLength() const { return !entity->getArgument(8)->isNull(); }
+double IfcRelConnectsStructuralMember::SupportedLength() const { return *entity->getArgument(8); }
+void IfcRelConnectsStructuralMember::setSupportedLength(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
+bool IfcRelConnectsStructuralMember::hasConditionCoordinateSystem() const { return !entity->getArgument(9)->isNull(); }
+IfcAxis2Placement3D* IfcRelConnectsStructuralMember::ConditionCoordinateSystem() const { return (IfcAxis2Placement3D*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(9))); }
 void IfcRelConnectsStructuralMember::setConditionCoordinateSystem(IfcAxis2Placement3D* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
 bool IfcRelConnectsStructuralMember::is(Type::Enum v) const { return v == Type::IfcRelConnectsStructuralMember || IfcRelConnects::is(v); }
 Type::Enum IfcRelConnectsStructuralMember::type() const { return Type::IfcRelConnectsStructuralMember; }
 Type::Enum IfcRelConnectsStructuralMember::Class() { return Type::IfcRelConnectsStructuralMember; }
-IfcRelConnectsStructuralMember::IfcRelConnectsStructuralMember(IfcAbstractEntityPtr e) : IfcRelConnects((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRelConnectsStructuralMember)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRelConnectsStructuralMember::IfcRelConnectsStructuralMember(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, IfcStructuralMember* v5_RelatingStructuralMember, IfcStructuralConnection* v6_RelatedStructuralConnection, IfcBoundaryCondition* v7_AppliedCondition, IfcStructuralConnectionCondition* v8_AdditionalConditions, boost::optional< IfcLengthMeasure > v9_SupportedLength, IfcAxis2Placement3D* v10_ConditionCoordinateSystem) : IfcRelConnects((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatingStructuralMember)); e->setArgument(5,(v6_RelatedStructuralConnection)); e->setArgument(6,(v7_AppliedCondition)); e->setArgument(7,(v8_AdditionalConditions)); if (v9_SupportedLength) { e->setArgument(8,(*v9_SupportedLength)); } else { e->setArgument(8); } e->setArgument(9,(v10_ConditionCoordinateSystem)); entity = e; EntityBuffer::Add(this); }
+IfcRelConnectsStructuralMember::IfcRelConnectsStructuralMember(IfcAbstractEntity* e) : IfcRelConnects((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRelConnectsStructuralMember)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRelConnectsStructuralMember::IfcRelConnectsStructuralMember(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcStructuralMember* v5_RelatingStructuralMember, IfcStructuralConnection* v6_RelatedStructuralConnection, IfcBoundaryCondition* v7_AppliedCondition, IfcStructuralConnectionCondition* v8_AdditionalConditions, boost::optional< double > v9_SupportedLength, IfcAxis2Placement3D* v10_ConditionCoordinateSystem) : IfcRelConnects((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatingStructuralMember)); e->setArgument(5,(v6_RelatedStructuralConnection)); e->setArgument(6,(v7_AppliedCondition)); e->setArgument(7,(v8_AdditionalConditions)); if (v9_SupportedLength) { e->setArgument(8,(*v9_SupportedLength)); } else { e->setArgument(8); } e->setArgument(9,(v10_ConditionCoordinateSystem)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRelConnectsWithEccentricity
-IfcConnectionGeometry* IfcRelConnectsWithEccentricity::ConnectionConstraint() { return (IfcConnectionGeometry*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(10))); }
+IfcConnectionGeometry* IfcRelConnectsWithEccentricity::ConnectionConstraint() const { return (IfcConnectionGeometry*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(10))); }
 void IfcRelConnectsWithEccentricity::setConnectionConstraint(IfcConnectionGeometry* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
 bool IfcRelConnectsWithEccentricity::is(Type::Enum v) const { return v == Type::IfcRelConnectsWithEccentricity || IfcRelConnectsStructuralMember::is(v); }
 Type::Enum IfcRelConnectsWithEccentricity::type() const { return Type::IfcRelConnectsWithEccentricity; }
 Type::Enum IfcRelConnectsWithEccentricity::Class() { return Type::IfcRelConnectsWithEccentricity; }
-IfcRelConnectsWithEccentricity::IfcRelConnectsWithEccentricity(IfcAbstractEntityPtr e) : IfcRelConnectsStructuralMember((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRelConnectsWithEccentricity)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRelConnectsWithEccentricity::IfcRelConnectsWithEccentricity(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, IfcStructuralMember* v5_RelatingStructuralMember, IfcStructuralConnection* v6_RelatedStructuralConnection, IfcBoundaryCondition* v7_AppliedCondition, IfcStructuralConnectionCondition* v8_AdditionalConditions, boost::optional< IfcLengthMeasure > v9_SupportedLength, IfcAxis2Placement3D* v10_ConditionCoordinateSystem, IfcConnectionGeometry* v11_ConnectionConstraint) : IfcRelConnectsStructuralMember((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatingStructuralMember)); e->setArgument(5,(v6_RelatedStructuralConnection)); e->setArgument(6,(v7_AppliedCondition)); e->setArgument(7,(v8_AdditionalConditions)); if (v9_SupportedLength) { e->setArgument(8,(*v9_SupportedLength)); } else { e->setArgument(8); } e->setArgument(9,(v10_ConditionCoordinateSystem)); e->setArgument(10,(v11_ConnectionConstraint)); entity = e; EntityBuffer::Add(this); }
+IfcRelConnectsWithEccentricity::IfcRelConnectsWithEccentricity(IfcAbstractEntity* e) : IfcRelConnectsStructuralMember((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRelConnectsWithEccentricity)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRelConnectsWithEccentricity::IfcRelConnectsWithEccentricity(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcStructuralMember* v5_RelatingStructuralMember, IfcStructuralConnection* v6_RelatedStructuralConnection, IfcBoundaryCondition* v7_AppliedCondition, IfcStructuralConnectionCondition* v8_AdditionalConditions, boost::optional< double > v9_SupportedLength, IfcAxis2Placement3D* v10_ConditionCoordinateSystem, IfcConnectionGeometry* v11_ConnectionConstraint) : IfcRelConnectsStructuralMember((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatingStructuralMember)); e->setArgument(5,(v6_RelatedStructuralConnection)); e->setArgument(6,(v7_AppliedCondition)); e->setArgument(7,(v8_AdditionalConditions)); if (v9_SupportedLength) { e->setArgument(8,(*v9_SupportedLength)); } else { e->setArgument(8); } e->setArgument(9,(v10_ConditionCoordinateSystem)); e->setArgument(10,(v11_ConnectionConstraint)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRelConnectsWithRealizingElements
-SHARED_PTR< IfcTemplatedEntityList< IfcElement > > IfcRelConnectsWithRealizingElements::RealizingElements() { RETURN_AS_LIST(IfcElement,7) }
-void IfcRelConnectsWithRealizingElements::setRealizingElements(SHARED_PTR< IfcTemplatedEntityList< IfcElement > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v->generalize()); }
-bool IfcRelConnectsWithRealizingElements::hasConnectionType() { return !entity->getArgument(8)->isNull(); }
-IfcLabel IfcRelConnectsWithRealizingElements::ConnectionType() { return *entity->getArgument(8); }
-void IfcRelConnectsWithRealizingElements::setConnectionType(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
+IfcTemplatedEntityList< IfcElement >::ptr IfcRelConnectsWithRealizingElements::RealizingElements() const { IfcEntityList::ptr es = *entity->getArgument(7); return es->as<IfcElement>(); }
+void IfcRelConnectsWithRealizingElements::setRealizingElements(IfcTemplatedEntityList< IfcElement >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v->generalize()); }
+bool IfcRelConnectsWithRealizingElements::hasConnectionType() const { return !entity->getArgument(8)->isNull(); }
+std::string IfcRelConnectsWithRealizingElements::ConnectionType() const { return *entity->getArgument(8); }
+void IfcRelConnectsWithRealizingElements::setConnectionType(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
 bool IfcRelConnectsWithRealizingElements::is(Type::Enum v) const { return v == Type::IfcRelConnectsWithRealizingElements || IfcRelConnectsElements::is(v); }
 Type::Enum IfcRelConnectsWithRealizingElements::type() const { return Type::IfcRelConnectsWithRealizingElements; }
 Type::Enum IfcRelConnectsWithRealizingElements::Class() { return Type::IfcRelConnectsWithRealizingElements; }
-IfcRelConnectsWithRealizingElements::IfcRelConnectsWithRealizingElements(IfcAbstractEntityPtr e) : IfcRelConnectsElements((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRelConnectsWithRealizingElements)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRelConnectsWithRealizingElements::IfcRelConnectsWithRealizingElements(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, IfcConnectionGeometry* v5_ConnectionGeometry, IfcElement* v6_RelatingElement, IfcElement* v7_RelatedElement, SHARED_PTR< IfcTemplatedEntityList< IfcElement > > v8_RealizingElements, boost::optional< IfcLabel > v9_ConnectionType) : IfcRelConnectsElements((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_ConnectionGeometry)); e->setArgument(5,(v6_RelatingElement)); e->setArgument(6,(v7_RelatedElement)); e->setArgument(7,(v8_RealizingElements)->generalize()); if (v9_ConnectionType) { e->setArgument(8,(*v9_ConnectionType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcRelConnectsWithRealizingElements::IfcRelConnectsWithRealizingElements(IfcAbstractEntity* e) : IfcRelConnectsElements((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRelConnectsWithRealizingElements)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRelConnectsWithRealizingElements::IfcRelConnectsWithRealizingElements(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcConnectionGeometry* v5_ConnectionGeometry, IfcElement* v6_RelatingElement, IfcElement* v7_RelatedElement, IfcTemplatedEntityList< IfcElement >::ptr v8_RealizingElements, boost::optional< std::string > v9_ConnectionType) : IfcRelConnectsElements((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_ConnectionGeometry)); e->setArgument(5,(v6_RelatingElement)); e->setArgument(6,(v7_RelatedElement)); e->setArgument(7,(v8_RealizingElements)->generalize()); if (v9_ConnectionType) { e->setArgument(8,(*v9_ConnectionType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRelContainedInSpatialStructure
-SHARED_PTR< IfcTemplatedEntityList< IfcProduct > > IfcRelContainedInSpatialStructure::RelatedElements() { RETURN_AS_LIST(IfcProduct,4) }
-void IfcRelContainedInSpatialStructure::setRelatedElements(SHARED_PTR< IfcTemplatedEntityList< IfcProduct > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v->generalize()); }
-IfcSpatialStructureElement* IfcRelContainedInSpatialStructure::RelatingStructure() { return (IfcSpatialStructureElement*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(5))); }
+IfcTemplatedEntityList< IfcProduct >::ptr IfcRelContainedInSpatialStructure::RelatedElements() const { IfcEntityList::ptr es = *entity->getArgument(4); return es->as<IfcProduct>(); }
+void IfcRelContainedInSpatialStructure::setRelatedElements(IfcTemplatedEntityList< IfcProduct >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v->generalize()); }
+IfcSpatialStructureElement* IfcRelContainedInSpatialStructure::RelatingStructure() const { return (IfcSpatialStructureElement*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(5))); }
 void IfcRelContainedInSpatialStructure::setRelatingStructure(IfcSpatialStructureElement* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
 bool IfcRelContainedInSpatialStructure::is(Type::Enum v) const { return v == Type::IfcRelContainedInSpatialStructure || IfcRelConnects::is(v); }
 Type::Enum IfcRelContainedInSpatialStructure::type() const { return Type::IfcRelContainedInSpatialStructure; }
 Type::Enum IfcRelContainedInSpatialStructure::Class() { return Type::IfcRelContainedInSpatialStructure; }
-IfcRelContainedInSpatialStructure::IfcRelContainedInSpatialStructure(IfcAbstractEntityPtr e) : IfcRelConnects((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRelContainedInSpatialStructure)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRelContainedInSpatialStructure::IfcRelContainedInSpatialStructure(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, SHARED_PTR< IfcTemplatedEntityList< IfcProduct > > v5_RelatedElements, IfcSpatialStructureElement* v6_RelatingStructure) : IfcRelConnects((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatedElements)->generalize()); e->setArgument(5,(v6_RelatingStructure)); entity = e; EntityBuffer::Add(this); }
+IfcRelContainedInSpatialStructure::IfcRelContainedInSpatialStructure(IfcAbstractEntity* e) : IfcRelConnects((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRelContainedInSpatialStructure)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRelContainedInSpatialStructure::IfcRelContainedInSpatialStructure(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcTemplatedEntityList< IfcProduct >::ptr v5_RelatedElements, IfcSpatialStructureElement* v6_RelatingStructure) : IfcRelConnects((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatedElements)->generalize()); e->setArgument(5,(v6_RelatingStructure)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRelCoversBldgElements
-IfcElement* IfcRelCoversBldgElements::RelatingBuildingElement() { return (IfcElement*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(4))); }
+IfcElement* IfcRelCoversBldgElements::RelatingBuildingElement() const { return (IfcElement*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(4))); }
 void IfcRelCoversBldgElements::setRelatingBuildingElement(IfcElement* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-SHARED_PTR< IfcTemplatedEntityList< IfcCovering > > IfcRelCoversBldgElements::RelatedCoverings() { RETURN_AS_LIST(IfcCovering,5) }
-void IfcRelCoversBldgElements::setRelatedCoverings(SHARED_PTR< IfcTemplatedEntityList< IfcCovering > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v->generalize()); }
+IfcTemplatedEntityList< IfcCovering >::ptr IfcRelCoversBldgElements::RelatedCoverings() const { IfcEntityList::ptr es = *entity->getArgument(5); return es->as<IfcCovering>(); }
+void IfcRelCoversBldgElements::setRelatedCoverings(IfcTemplatedEntityList< IfcCovering >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v->generalize()); }
 bool IfcRelCoversBldgElements::is(Type::Enum v) const { return v == Type::IfcRelCoversBldgElements || IfcRelConnects::is(v); }
 Type::Enum IfcRelCoversBldgElements::type() const { return Type::IfcRelCoversBldgElements; }
 Type::Enum IfcRelCoversBldgElements::Class() { return Type::IfcRelCoversBldgElements; }
-IfcRelCoversBldgElements::IfcRelCoversBldgElements(IfcAbstractEntityPtr e) : IfcRelConnects((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRelCoversBldgElements)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRelCoversBldgElements::IfcRelCoversBldgElements(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, IfcElement* v5_RelatingBuildingElement, SHARED_PTR< IfcTemplatedEntityList< IfcCovering > > v6_RelatedCoverings) : IfcRelConnects((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatingBuildingElement)); e->setArgument(5,(v6_RelatedCoverings)->generalize()); entity = e; EntityBuffer::Add(this); }
+IfcRelCoversBldgElements::IfcRelCoversBldgElements(IfcAbstractEntity* e) : IfcRelConnects((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRelCoversBldgElements)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRelCoversBldgElements::IfcRelCoversBldgElements(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcElement* v5_RelatingBuildingElement, IfcTemplatedEntityList< IfcCovering >::ptr v6_RelatedCoverings) : IfcRelConnects((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatingBuildingElement)); e->setArgument(5,(v6_RelatedCoverings)->generalize()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRelCoversSpaces
-IfcSpace* IfcRelCoversSpaces::RelatedSpace() { return (IfcSpace*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(4))); }
+IfcSpace* IfcRelCoversSpaces::RelatedSpace() const { return (IfcSpace*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(4))); }
 void IfcRelCoversSpaces::setRelatedSpace(IfcSpace* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-SHARED_PTR< IfcTemplatedEntityList< IfcCovering > > IfcRelCoversSpaces::RelatedCoverings() { RETURN_AS_LIST(IfcCovering,5) }
-void IfcRelCoversSpaces::setRelatedCoverings(SHARED_PTR< IfcTemplatedEntityList< IfcCovering > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v->generalize()); }
+IfcTemplatedEntityList< IfcCovering >::ptr IfcRelCoversSpaces::RelatedCoverings() const { IfcEntityList::ptr es = *entity->getArgument(5); return es->as<IfcCovering>(); }
+void IfcRelCoversSpaces::setRelatedCoverings(IfcTemplatedEntityList< IfcCovering >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v->generalize()); }
 bool IfcRelCoversSpaces::is(Type::Enum v) const { return v == Type::IfcRelCoversSpaces || IfcRelConnects::is(v); }
 Type::Enum IfcRelCoversSpaces::type() const { return Type::IfcRelCoversSpaces; }
 Type::Enum IfcRelCoversSpaces::Class() { return Type::IfcRelCoversSpaces; }
-IfcRelCoversSpaces::IfcRelCoversSpaces(IfcAbstractEntityPtr e) : IfcRelConnects((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRelCoversSpaces)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRelCoversSpaces::IfcRelCoversSpaces(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, IfcSpace* v5_RelatedSpace, SHARED_PTR< IfcTemplatedEntityList< IfcCovering > > v6_RelatedCoverings) : IfcRelConnects((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatedSpace)); e->setArgument(5,(v6_RelatedCoverings)->generalize()); entity = e; EntityBuffer::Add(this); }
+IfcRelCoversSpaces::IfcRelCoversSpaces(IfcAbstractEntity* e) : IfcRelConnects((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRelCoversSpaces)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRelCoversSpaces::IfcRelCoversSpaces(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcSpace* v5_RelatedSpace, IfcTemplatedEntityList< IfcCovering >::ptr v6_RelatedCoverings) : IfcRelConnects((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatedSpace)); e->setArgument(5,(v6_RelatedCoverings)->generalize()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRelDecomposes
-IfcObjectDefinition* IfcRelDecomposes::RelatingObject() { return (IfcObjectDefinition*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(4))); }
+IfcObjectDefinition* IfcRelDecomposes::RelatingObject() const { return (IfcObjectDefinition*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(4))); }
 void IfcRelDecomposes::setRelatingObject(IfcObjectDefinition* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-SHARED_PTR< IfcTemplatedEntityList< IfcObjectDefinition > > IfcRelDecomposes::RelatedObjects() { RETURN_AS_LIST(IfcObjectDefinition,5) }
-void IfcRelDecomposes::setRelatedObjects(SHARED_PTR< IfcTemplatedEntityList< IfcObjectDefinition > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v->generalize()); }
+IfcTemplatedEntityList< IfcObjectDefinition >::ptr IfcRelDecomposes::RelatedObjects() const { IfcEntityList::ptr es = *entity->getArgument(5); return es->as<IfcObjectDefinition>(); }
+void IfcRelDecomposes::setRelatedObjects(IfcTemplatedEntityList< IfcObjectDefinition >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v->generalize()); }
 bool IfcRelDecomposes::is(Type::Enum v) const { return v == Type::IfcRelDecomposes || IfcRelationship::is(v); }
 Type::Enum IfcRelDecomposes::type() const { return Type::IfcRelDecomposes; }
 Type::Enum IfcRelDecomposes::Class() { return Type::IfcRelDecomposes; }
-IfcRelDecomposes::IfcRelDecomposes(IfcAbstractEntityPtr e) : IfcRelationship((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRelDecomposes)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRelDecomposes::IfcRelDecomposes(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, IfcObjectDefinition* v5_RelatingObject, SHARED_PTR< IfcTemplatedEntityList< IfcObjectDefinition > > v6_RelatedObjects) : IfcRelationship((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatingObject)); e->setArgument(5,(v6_RelatedObjects)->generalize()); entity = e; EntityBuffer::Add(this); }
+IfcRelDecomposes::IfcRelDecomposes(IfcAbstractEntity* e) : IfcRelationship((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRelDecomposes)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRelDecomposes::IfcRelDecomposes(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcObjectDefinition* v5_RelatingObject, IfcTemplatedEntityList< IfcObjectDefinition >::ptr v6_RelatedObjects) : IfcRelationship((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatingObject)); e->setArgument(5,(v6_RelatedObjects)->generalize()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRelDefines
-SHARED_PTR< IfcTemplatedEntityList< IfcObject > > IfcRelDefines::RelatedObjects() { RETURN_AS_LIST(IfcObject,4) }
-void IfcRelDefines::setRelatedObjects(SHARED_PTR< IfcTemplatedEntityList< IfcObject > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v->generalize()); }
+IfcTemplatedEntityList< IfcObject >::ptr IfcRelDefines::RelatedObjects() const { IfcEntityList::ptr es = *entity->getArgument(4); return es->as<IfcObject>(); }
+void IfcRelDefines::setRelatedObjects(IfcTemplatedEntityList< IfcObject >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v->generalize()); }
 bool IfcRelDefines::is(Type::Enum v) const { return v == Type::IfcRelDefines || IfcRelationship::is(v); }
 Type::Enum IfcRelDefines::type() const { return Type::IfcRelDefines; }
 Type::Enum IfcRelDefines::Class() { return Type::IfcRelDefines; }
-IfcRelDefines::IfcRelDefines(IfcAbstractEntityPtr e) : IfcRelationship((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRelDefines)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRelDefines::IfcRelDefines(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, SHARED_PTR< IfcTemplatedEntityList< IfcObject > > v5_RelatedObjects) : IfcRelationship((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatedObjects)->generalize()); entity = e; EntityBuffer::Add(this); }
+IfcRelDefines::IfcRelDefines(IfcAbstractEntity* e) : IfcRelationship((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRelDefines)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRelDefines::IfcRelDefines(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcTemplatedEntityList< IfcObject >::ptr v5_RelatedObjects) : IfcRelationship((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatedObjects)->generalize()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRelDefinesByProperties
-IfcPropertySetDefinition* IfcRelDefinesByProperties::RelatingPropertyDefinition() { return (IfcPropertySetDefinition*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(5))); }
+IfcPropertySetDefinition* IfcRelDefinesByProperties::RelatingPropertyDefinition() const { return (IfcPropertySetDefinition*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(5))); }
 void IfcRelDefinesByProperties::setRelatingPropertyDefinition(IfcPropertySetDefinition* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
 bool IfcRelDefinesByProperties::is(Type::Enum v) const { return v == Type::IfcRelDefinesByProperties || IfcRelDefines::is(v); }
 Type::Enum IfcRelDefinesByProperties::type() const { return Type::IfcRelDefinesByProperties; }
 Type::Enum IfcRelDefinesByProperties::Class() { return Type::IfcRelDefinesByProperties; }
-IfcRelDefinesByProperties::IfcRelDefinesByProperties(IfcAbstractEntityPtr e) : IfcRelDefines((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRelDefinesByProperties)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRelDefinesByProperties::IfcRelDefinesByProperties(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, SHARED_PTR< IfcTemplatedEntityList< IfcObject > > v5_RelatedObjects, IfcPropertySetDefinition* v6_RelatingPropertyDefinition) : IfcRelDefines((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatedObjects)->generalize()); e->setArgument(5,(v6_RelatingPropertyDefinition)); entity = e; EntityBuffer::Add(this); }
+IfcRelDefinesByProperties::IfcRelDefinesByProperties(IfcAbstractEntity* e) : IfcRelDefines((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRelDefinesByProperties)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRelDefinesByProperties::IfcRelDefinesByProperties(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcTemplatedEntityList< IfcObject >::ptr v5_RelatedObjects, IfcPropertySetDefinition* v6_RelatingPropertyDefinition) : IfcRelDefines((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatedObjects)->generalize()); e->setArgument(5,(v6_RelatingPropertyDefinition)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRelDefinesByType
-IfcTypeObject* IfcRelDefinesByType::RelatingType() { return (IfcTypeObject*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(5))); }
+IfcTypeObject* IfcRelDefinesByType::RelatingType() const { return (IfcTypeObject*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(5))); }
 void IfcRelDefinesByType::setRelatingType(IfcTypeObject* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
 bool IfcRelDefinesByType::is(Type::Enum v) const { return v == Type::IfcRelDefinesByType || IfcRelDefines::is(v); }
 Type::Enum IfcRelDefinesByType::type() const { return Type::IfcRelDefinesByType; }
 Type::Enum IfcRelDefinesByType::Class() { return Type::IfcRelDefinesByType; }
-IfcRelDefinesByType::IfcRelDefinesByType(IfcAbstractEntityPtr e) : IfcRelDefines((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRelDefinesByType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRelDefinesByType::IfcRelDefinesByType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, SHARED_PTR< IfcTemplatedEntityList< IfcObject > > v5_RelatedObjects, IfcTypeObject* v6_RelatingType) : IfcRelDefines((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatedObjects)->generalize()); e->setArgument(5,(v6_RelatingType)); entity = e; EntityBuffer::Add(this); }
+IfcRelDefinesByType::IfcRelDefinesByType(IfcAbstractEntity* e) : IfcRelDefines((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRelDefinesByType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRelDefinesByType::IfcRelDefinesByType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcTemplatedEntityList< IfcObject >::ptr v5_RelatedObjects, IfcTypeObject* v6_RelatingType) : IfcRelDefines((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatedObjects)->generalize()); e->setArgument(5,(v6_RelatingType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRelFillsElement
-IfcOpeningElement* IfcRelFillsElement::RelatingOpeningElement() { return (IfcOpeningElement*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(4))); }
+IfcOpeningElement* IfcRelFillsElement::RelatingOpeningElement() const { return (IfcOpeningElement*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(4))); }
 void IfcRelFillsElement::setRelatingOpeningElement(IfcOpeningElement* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-IfcElement* IfcRelFillsElement::RelatedBuildingElement() { return (IfcElement*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(5))); }
+IfcElement* IfcRelFillsElement::RelatedBuildingElement() const { return (IfcElement*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(5))); }
 void IfcRelFillsElement::setRelatedBuildingElement(IfcElement* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
 bool IfcRelFillsElement::is(Type::Enum v) const { return v == Type::IfcRelFillsElement || IfcRelConnects::is(v); }
 Type::Enum IfcRelFillsElement::type() const { return Type::IfcRelFillsElement; }
 Type::Enum IfcRelFillsElement::Class() { return Type::IfcRelFillsElement; }
-IfcRelFillsElement::IfcRelFillsElement(IfcAbstractEntityPtr e) : IfcRelConnects((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRelFillsElement)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRelFillsElement::IfcRelFillsElement(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, IfcOpeningElement* v5_RelatingOpeningElement, IfcElement* v6_RelatedBuildingElement) : IfcRelConnects((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatingOpeningElement)); e->setArgument(5,(v6_RelatedBuildingElement)); entity = e; EntityBuffer::Add(this); }
+IfcRelFillsElement::IfcRelFillsElement(IfcAbstractEntity* e) : IfcRelConnects((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRelFillsElement)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRelFillsElement::IfcRelFillsElement(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcOpeningElement* v5_RelatingOpeningElement, IfcElement* v6_RelatedBuildingElement) : IfcRelConnects((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatingOpeningElement)); e->setArgument(5,(v6_RelatedBuildingElement)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRelFlowControlElements
-SHARED_PTR< IfcTemplatedEntityList< IfcDistributionControlElement > > IfcRelFlowControlElements::RelatedControlElements() { RETURN_AS_LIST(IfcDistributionControlElement,4) }
-void IfcRelFlowControlElements::setRelatedControlElements(SHARED_PTR< IfcTemplatedEntityList< IfcDistributionControlElement > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v->generalize()); }
-IfcDistributionFlowElement* IfcRelFlowControlElements::RelatingFlowElement() { return (IfcDistributionFlowElement*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(5))); }
+IfcTemplatedEntityList< IfcDistributionControlElement >::ptr IfcRelFlowControlElements::RelatedControlElements() const { IfcEntityList::ptr es = *entity->getArgument(4); return es->as<IfcDistributionControlElement>(); }
+void IfcRelFlowControlElements::setRelatedControlElements(IfcTemplatedEntityList< IfcDistributionControlElement >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v->generalize()); }
+IfcDistributionFlowElement* IfcRelFlowControlElements::RelatingFlowElement() const { return (IfcDistributionFlowElement*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(5))); }
 void IfcRelFlowControlElements::setRelatingFlowElement(IfcDistributionFlowElement* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
 bool IfcRelFlowControlElements::is(Type::Enum v) const { return v == Type::IfcRelFlowControlElements || IfcRelConnects::is(v); }
 Type::Enum IfcRelFlowControlElements::type() const { return Type::IfcRelFlowControlElements; }
 Type::Enum IfcRelFlowControlElements::Class() { return Type::IfcRelFlowControlElements; }
-IfcRelFlowControlElements::IfcRelFlowControlElements(IfcAbstractEntityPtr e) : IfcRelConnects((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRelFlowControlElements)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRelFlowControlElements::IfcRelFlowControlElements(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, SHARED_PTR< IfcTemplatedEntityList< IfcDistributionControlElement > > v5_RelatedControlElements, IfcDistributionFlowElement* v6_RelatingFlowElement) : IfcRelConnects((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatedControlElements)->generalize()); e->setArgument(5,(v6_RelatingFlowElement)); entity = e; EntityBuffer::Add(this); }
+IfcRelFlowControlElements::IfcRelFlowControlElements(IfcAbstractEntity* e) : IfcRelConnects((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRelFlowControlElements)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRelFlowControlElements::IfcRelFlowControlElements(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcTemplatedEntityList< IfcDistributionControlElement >::ptr v5_RelatedControlElements, IfcDistributionFlowElement* v6_RelatingFlowElement) : IfcRelConnects((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatedControlElements)->generalize()); e->setArgument(5,(v6_RelatingFlowElement)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRelInteractionRequirements
-bool IfcRelInteractionRequirements::hasDailyInteraction() { return !entity->getArgument(4)->isNull(); }
-IfcCountMeasure IfcRelInteractionRequirements::DailyInteraction() { return *entity->getArgument(4); }
-void IfcRelInteractionRequirements::setDailyInteraction(IfcCountMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-bool IfcRelInteractionRequirements::hasImportanceRating() { return !entity->getArgument(5)->isNull(); }
-IfcNormalisedRatioMeasure IfcRelInteractionRequirements::ImportanceRating() { return *entity->getArgument(5); }
-void IfcRelInteractionRequirements::setImportanceRating(IfcNormalisedRatioMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-bool IfcRelInteractionRequirements::hasLocationOfInteraction() { return !entity->getArgument(6)->isNull(); }
-IfcSpatialStructureElement* IfcRelInteractionRequirements::LocationOfInteraction() { return (IfcSpatialStructureElement*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(6))); }
+bool IfcRelInteractionRequirements::hasDailyInteraction() const { return !entity->getArgument(4)->isNull(); }
+double IfcRelInteractionRequirements::DailyInteraction() const { return *entity->getArgument(4); }
+void IfcRelInteractionRequirements::setDailyInteraction(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+bool IfcRelInteractionRequirements::hasImportanceRating() const { return !entity->getArgument(5)->isNull(); }
+double IfcRelInteractionRequirements::ImportanceRating() const { return *entity->getArgument(5); }
+void IfcRelInteractionRequirements::setImportanceRating(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+bool IfcRelInteractionRequirements::hasLocationOfInteraction() const { return !entity->getArgument(6)->isNull(); }
+IfcSpatialStructureElement* IfcRelInteractionRequirements::LocationOfInteraction() const { return (IfcSpatialStructureElement*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(6))); }
 void IfcRelInteractionRequirements::setLocationOfInteraction(IfcSpatialStructureElement* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
-IfcSpaceProgram* IfcRelInteractionRequirements::RelatedSpaceProgram() { return (IfcSpaceProgram*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(7))); }
+IfcSpaceProgram* IfcRelInteractionRequirements::RelatedSpaceProgram() const { return (IfcSpaceProgram*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(7))); }
 void IfcRelInteractionRequirements::setRelatedSpaceProgram(IfcSpaceProgram* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
-IfcSpaceProgram* IfcRelInteractionRequirements::RelatingSpaceProgram() { return (IfcSpaceProgram*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(8))); }
+IfcSpaceProgram* IfcRelInteractionRequirements::RelatingSpaceProgram() const { return (IfcSpaceProgram*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(8))); }
 void IfcRelInteractionRequirements::setRelatingSpaceProgram(IfcSpaceProgram* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
 bool IfcRelInteractionRequirements::is(Type::Enum v) const { return v == Type::IfcRelInteractionRequirements || IfcRelConnects::is(v); }
 Type::Enum IfcRelInteractionRequirements::type() const { return Type::IfcRelInteractionRequirements; }
 Type::Enum IfcRelInteractionRequirements::Class() { return Type::IfcRelInteractionRequirements; }
-IfcRelInteractionRequirements::IfcRelInteractionRequirements(IfcAbstractEntityPtr e) : IfcRelConnects((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRelInteractionRequirements)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRelInteractionRequirements::IfcRelInteractionRequirements(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcCountMeasure > v5_DailyInteraction, boost::optional< IfcNormalisedRatioMeasure > v6_ImportanceRating, IfcSpatialStructureElement* v7_LocationOfInteraction, IfcSpaceProgram* v8_RelatedSpaceProgram, IfcSpaceProgram* v9_RelatingSpaceProgram) : IfcRelConnects((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_DailyInteraction) { e->setArgument(4,(*v5_DailyInteraction)); } else { e->setArgument(4); } if (v6_ImportanceRating) { e->setArgument(5,(*v6_ImportanceRating)); } else { e->setArgument(5); } e->setArgument(6,(v7_LocationOfInteraction)); e->setArgument(7,(v8_RelatedSpaceProgram)); e->setArgument(8,(v9_RelatingSpaceProgram)); entity = e; EntityBuffer::Add(this); }
+IfcRelInteractionRequirements::IfcRelInteractionRequirements(IfcAbstractEntity* e) : IfcRelConnects((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRelInteractionRequirements)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRelInteractionRequirements::IfcRelInteractionRequirements(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< double > v5_DailyInteraction, boost::optional< double > v6_ImportanceRating, IfcSpatialStructureElement* v7_LocationOfInteraction, IfcSpaceProgram* v8_RelatedSpaceProgram, IfcSpaceProgram* v9_RelatingSpaceProgram) : IfcRelConnects((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_DailyInteraction) { e->setArgument(4,(*v5_DailyInteraction)); } else { e->setArgument(4); } if (v6_ImportanceRating) { e->setArgument(5,(*v6_ImportanceRating)); } else { e->setArgument(5); } e->setArgument(6,(v7_LocationOfInteraction)); e->setArgument(7,(v8_RelatedSpaceProgram)); e->setArgument(8,(v9_RelatingSpaceProgram)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRelNests
 bool IfcRelNests::is(Type::Enum v) const { return v == Type::IfcRelNests || IfcRelDecomposes::is(v); }
 Type::Enum IfcRelNests::type() const { return Type::IfcRelNests; }
 Type::Enum IfcRelNests::Class() { return Type::IfcRelNests; }
-IfcRelNests::IfcRelNests(IfcAbstractEntityPtr e) : IfcRelDecomposes((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRelNests)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRelNests::IfcRelNests(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, IfcObjectDefinition* v5_RelatingObject, SHARED_PTR< IfcTemplatedEntityList< IfcObjectDefinition > > v6_RelatedObjects) : IfcRelDecomposes((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatingObject)); e->setArgument(5,(v6_RelatedObjects)->generalize()); entity = e; EntityBuffer::Add(this); }
+IfcRelNests::IfcRelNests(IfcAbstractEntity* e) : IfcRelDecomposes((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRelNests)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRelNests::IfcRelNests(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcObjectDefinition* v5_RelatingObject, IfcTemplatedEntityList< IfcObjectDefinition >::ptr v6_RelatedObjects) : IfcRelDecomposes((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatingObject)); e->setArgument(5,(v6_RelatedObjects)->generalize()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRelOccupiesSpaces
 bool IfcRelOccupiesSpaces::is(Type::Enum v) const { return v == Type::IfcRelOccupiesSpaces || IfcRelAssignsToActor::is(v); }
 Type::Enum IfcRelOccupiesSpaces::type() const { return Type::IfcRelOccupiesSpaces; }
 Type::Enum IfcRelOccupiesSpaces::Class() { return Type::IfcRelOccupiesSpaces; }
-IfcRelOccupiesSpaces::IfcRelOccupiesSpaces(IfcAbstractEntityPtr e) : IfcRelAssignsToActor((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRelOccupiesSpaces)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRelOccupiesSpaces::IfcRelOccupiesSpaces(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, SHARED_PTR< IfcTemplatedEntityList< IfcObjectDefinition > > v5_RelatedObjects, boost::optional< IfcObjectTypeEnum::IfcObjectTypeEnum > v6_RelatedObjectsType, IfcActor* v7_RelatingActor, IfcActorRole* v8_ActingRole) : IfcRelAssignsToActor((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatedObjects)->generalize()); if (v6_RelatedObjectsType) { e->setArgument(5,*v6_RelatedObjectsType,IfcObjectTypeEnum::ToString(*v6_RelatedObjectsType)); } else { e->setArgument(5); } e->setArgument(6,(v7_RelatingActor)); e->setArgument(7,(v8_ActingRole)); entity = e; EntityBuffer::Add(this); }
+IfcRelOccupiesSpaces::IfcRelOccupiesSpaces(IfcAbstractEntity* e) : IfcRelAssignsToActor((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRelOccupiesSpaces)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRelOccupiesSpaces::IfcRelOccupiesSpaces(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcTemplatedEntityList< IfcObjectDefinition >::ptr v5_RelatedObjects, boost::optional< IfcObjectTypeEnum::IfcObjectTypeEnum > v6_RelatedObjectsType, IfcActor* v7_RelatingActor, IfcActorRole* v8_ActingRole) : IfcRelAssignsToActor((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatedObjects)->generalize()); if (v6_RelatedObjectsType) { e->setArgument(5,*v6_RelatedObjectsType,IfcObjectTypeEnum::ToString(*v6_RelatedObjectsType)); } else { e->setArgument(5); } e->setArgument(6,(v7_RelatingActor)); e->setArgument(7,(v8_ActingRole)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRelOverridesProperties
-SHARED_PTR< IfcTemplatedEntityList< IfcProperty > > IfcRelOverridesProperties::OverridingProperties() { RETURN_AS_LIST(IfcProperty,6) }
-void IfcRelOverridesProperties::setOverridingProperties(SHARED_PTR< IfcTemplatedEntityList< IfcProperty > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v->generalize()); }
+IfcTemplatedEntityList< IfcProperty >::ptr IfcRelOverridesProperties::OverridingProperties() const { IfcEntityList::ptr es = *entity->getArgument(6); return es->as<IfcProperty>(); }
+void IfcRelOverridesProperties::setOverridingProperties(IfcTemplatedEntityList< IfcProperty >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v->generalize()); }
 bool IfcRelOverridesProperties::is(Type::Enum v) const { return v == Type::IfcRelOverridesProperties || IfcRelDefinesByProperties::is(v); }
 Type::Enum IfcRelOverridesProperties::type() const { return Type::IfcRelOverridesProperties; }
 Type::Enum IfcRelOverridesProperties::Class() { return Type::IfcRelOverridesProperties; }
-IfcRelOverridesProperties::IfcRelOverridesProperties(IfcAbstractEntityPtr e) : IfcRelDefinesByProperties((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRelOverridesProperties)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRelOverridesProperties::IfcRelOverridesProperties(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, SHARED_PTR< IfcTemplatedEntityList< IfcObject > > v5_RelatedObjects, IfcPropertySetDefinition* v6_RelatingPropertyDefinition, SHARED_PTR< IfcTemplatedEntityList< IfcProperty > > v7_OverridingProperties) : IfcRelDefinesByProperties((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatedObjects)->generalize()); e->setArgument(5,(v6_RelatingPropertyDefinition)); e->setArgument(6,(v7_OverridingProperties)->generalize()); entity = e; EntityBuffer::Add(this); }
+IfcRelOverridesProperties::IfcRelOverridesProperties(IfcAbstractEntity* e) : IfcRelDefinesByProperties((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRelOverridesProperties)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRelOverridesProperties::IfcRelOverridesProperties(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcTemplatedEntityList< IfcObject >::ptr v5_RelatedObjects, IfcPropertySetDefinition* v6_RelatingPropertyDefinition, IfcTemplatedEntityList< IfcProperty >::ptr v7_OverridingProperties) : IfcRelDefinesByProperties((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatedObjects)->generalize()); e->setArgument(5,(v6_RelatingPropertyDefinition)); e->setArgument(6,(v7_OverridingProperties)->generalize()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRelProjectsElement
-IfcElement* IfcRelProjectsElement::RelatingElement() { return (IfcElement*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(4))); }
+IfcElement* IfcRelProjectsElement::RelatingElement() const { return (IfcElement*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(4))); }
 void IfcRelProjectsElement::setRelatingElement(IfcElement* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-IfcFeatureElementAddition* IfcRelProjectsElement::RelatedFeatureElement() { return (IfcFeatureElementAddition*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(5))); }
+IfcFeatureElementAddition* IfcRelProjectsElement::RelatedFeatureElement() const { return (IfcFeatureElementAddition*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(5))); }
 void IfcRelProjectsElement::setRelatedFeatureElement(IfcFeatureElementAddition* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
 bool IfcRelProjectsElement::is(Type::Enum v) const { return v == Type::IfcRelProjectsElement || IfcRelConnects::is(v); }
 Type::Enum IfcRelProjectsElement::type() const { return Type::IfcRelProjectsElement; }
 Type::Enum IfcRelProjectsElement::Class() { return Type::IfcRelProjectsElement; }
-IfcRelProjectsElement::IfcRelProjectsElement(IfcAbstractEntityPtr e) : IfcRelConnects((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRelProjectsElement)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRelProjectsElement::IfcRelProjectsElement(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, IfcElement* v5_RelatingElement, IfcFeatureElementAddition* v6_RelatedFeatureElement) : IfcRelConnects((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatingElement)); e->setArgument(5,(v6_RelatedFeatureElement)); entity = e; EntityBuffer::Add(this); }
+IfcRelProjectsElement::IfcRelProjectsElement(IfcAbstractEntity* e) : IfcRelConnects((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRelProjectsElement)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRelProjectsElement::IfcRelProjectsElement(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcElement* v5_RelatingElement, IfcFeatureElementAddition* v6_RelatedFeatureElement) : IfcRelConnects((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatingElement)); e->setArgument(5,(v6_RelatedFeatureElement)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRelReferencedInSpatialStructure
-SHARED_PTR< IfcTemplatedEntityList< IfcProduct > > IfcRelReferencedInSpatialStructure::RelatedElements() { RETURN_AS_LIST(IfcProduct,4) }
-void IfcRelReferencedInSpatialStructure::setRelatedElements(SHARED_PTR< IfcTemplatedEntityList< IfcProduct > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v->generalize()); }
-IfcSpatialStructureElement* IfcRelReferencedInSpatialStructure::RelatingStructure() { return (IfcSpatialStructureElement*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(5))); }
+IfcTemplatedEntityList< IfcProduct >::ptr IfcRelReferencedInSpatialStructure::RelatedElements() const { IfcEntityList::ptr es = *entity->getArgument(4); return es->as<IfcProduct>(); }
+void IfcRelReferencedInSpatialStructure::setRelatedElements(IfcTemplatedEntityList< IfcProduct >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v->generalize()); }
+IfcSpatialStructureElement* IfcRelReferencedInSpatialStructure::RelatingStructure() const { return (IfcSpatialStructureElement*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(5))); }
 void IfcRelReferencedInSpatialStructure::setRelatingStructure(IfcSpatialStructureElement* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
 bool IfcRelReferencedInSpatialStructure::is(Type::Enum v) const { return v == Type::IfcRelReferencedInSpatialStructure || IfcRelConnects::is(v); }
 Type::Enum IfcRelReferencedInSpatialStructure::type() const { return Type::IfcRelReferencedInSpatialStructure; }
 Type::Enum IfcRelReferencedInSpatialStructure::Class() { return Type::IfcRelReferencedInSpatialStructure; }
-IfcRelReferencedInSpatialStructure::IfcRelReferencedInSpatialStructure(IfcAbstractEntityPtr e) : IfcRelConnects((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRelReferencedInSpatialStructure)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRelReferencedInSpatialStructure::IfcRelReferencedInSpatialStructure(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, SHARED_PTR< IfcTemplatedEntityList< IfcProduct > > v5_RelatedElements, IfcSpatialStructureElement* v6_RelatingStructure) : IfcRelConnects((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatedElements)->generalize()); e->setArgument(5,(v6_RelatingStructure)); entity = e; EntityBuffer::Add(this); }
+IfcRelReferencedInSpatialStructure::IfcRelReferencedInSpatialStructure(IfcAbstractEntity* e) : IfcRelConnects((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRelReferencedInSpatialStructure)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRelReferencedInSpatialStructure::IfcRelReferencedInSpatialStructure(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcTemplatedEntityList< IfcProduct >::ptr v5_RelatedElements, IfcSpatialStructureElement* v6_RelatingStructure) : IfcRelConnects((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatedElements)->generalize()); e->setArgument(5,(v6_RelatingStructure)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRelSchedulesCostItems
 bool IfcRelSchedulesCostItems::is(Type::Enum v) const { return v == Type::IfcRelSchedulesCostItems || IfcRelAssignsToControl::is(v); }
 Type::Enum IfcRelSchedulesCostItems::type() const { return Type::IfcRelSchedulesCostItems; }
 Type::Enum IfcRelSchedulesCostItems::Class() { return Type::IfcRelSchedulesCostItems; }
-IfcRelSchedulesCostItems::IfcRelSchedulesCostItems(IfcAbstractEntityPtr e) : IfcRelAssignsToControl((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRelSchedulesCostItems)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRelSchedulesCostItems::IfcRelSchedulesCostItems(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, SHARED_PTR< IfcTemplatedEntityList< IfcObjectDefinition > > v5_RelatedObjects, boost::optional< IfcObjectTypeEnum::IfcObjectTypeEnum > v6_RelatedObjectsType, IfcControl* v7_RelatingControl) : IfcRelAssignsToControl((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatedObjects)->generalize()); if (v6_RelatedObjectsType) { e->setArgument(5,*v6_RelatedObjectsType,IfcObjectTypeEnum::ToString(*v6_RelatedObjectsType)); } else { e->setArgument(5); } e->setArgument(6,(v7_RelatingControl)); entity = e; EntityBuffer::Add(this); }
+IfcRelSchedulesCostItems::IfcRelSchedulesCostItems(IfcAbstractEntity* e) : IfcRelAssignsToControl((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRelSchedulesCostItems)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRelSchedulesCostItems::IfcRelSchedulesCostItems(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcTemplatedEntityList< IfcObjectDefinition >::ptr v5_RelatedObjects, boost::optional< IfcObjectTypeEnum::IfcObjectTypeEnum > v6_RelatedObjectsType, IfcControl* v7_RelatingControl) : IfcRelAssignsToControl((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatedObjects)->generalize()); if (v6_RelatedObjectsType) { e->setArgument(5,*v6_RelatedObjectsType,IfcObjectTypeEnum::ToString(*v6_RelatedObjectsType)); } else { e->setArgument(5); } e->setArgument(6,(v7_RelatingControl)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRelSequence
-IfcProcess* IfcRelSequence::RelatingProcess() { return (IfcProcess*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(4))); }
+IfcProcess* IfcRelSequence::RelatingProcess() const { return (IfcProcess*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(4))); }
 void IfcRelSequence::setRelatingProcess(IfcProcess* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-IfcProcess* IfcRelSequence::RelatedProcess() { return (IfcProcess*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(5))); }
+IfcProcess* IfcRelSequence::RelatedProcess() const { return (IfcProcess*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(5))); }
 void IfcRelSequence::setRelatedProcess(IfcProcess* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-IfcTimeMeasure IfcRelSequence::TimeLag() { return *entity->getArgument(6); }
-void IfcRelSequence::setTimeLag(IfcTimeMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
-IfcSequenceEnum::IfcSequenceEnum IfcRelSequence::SequenceType() { return IfcSequenceEnum::FromString(*entity->getArgument(7)); }
+double IfcRelSequence::TimeLag() const { return *entity->getArgument(6); }
+void IfcRelSequence::setTimeLag(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
+IfcSequenceEnum::IfcSequenceEnum IfcRelSequence::SequenceType() const { return IfcSequenceEnum::FromString(*entity->getArgument(7)); }
 void IfcRelSequence::setSequenceType(IfcSequenceEnum::IfcSequenceEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v,IfcSequenceEnum::ToString(v)); }
 bool IfcRelSequence::is(Type::Enum v) const { return v == Type::IfcRelSequence || IfcRelConnects::is(v); }
 Type::Enum IfcRelSequence::type() const { return Type::IfcRelSequence; }
 Type::Enum IfcRelSequence::Class() { return Type::IfcRelSequence; }
-IfcRelSequence::IfcRelSequence(IfcAbstractEntityPtr e) : IfcRelConnects((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRelSequence)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRelSequence::IfcRelSequence(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, IfcProcess* v5_RelatingProcess, IfcProcess* v6_RelatedProcess, IfcTimeMeasure v7_TimeLag, IfcSequenceEnum::IfcSequenceEnum v8_SequenceType) : IfcRelConnects((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatingProcess)); e->setArgument(5,(v6_RelatedProcess)); e->setArgument(6,(v7_TimeLag)); e->setArgument(7,v8_SequenceType,IfcSequenceEnum::ToString(v8_SequenceType)); entity = e; EntityBuffer::Add(this); }
+IfcRelSequence::IfcRelSequence(IfcAbstractEntity* e) : IfcRelConnects((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRelSequence)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRelSequence::IfcRelSequence(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcProcess* v5_RelatingProcess, IfcProcess* v6_RelatedProcess, double v7_TimeLag, IfcSequenceEnum::IfcSequenceEnum v8_SequenceType) : IfcRelConnects((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatingProcess)); e->setArgument(5,(v6_RelatedProcess)); e->setArgument(6,(v7_TimeLag)); e->setArgument(7,v8_SequenceType,IfcSequenceEnum::ToString(v8_SequenceType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRelServicesBuildings
-IfcSystem* IfcRelServicesBuildings::RelatingSystem() { return (IfcSystem*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(4))); }
+IfcSystem* IfcRelServicesBuildings::RelatingSystem() const { return (IfcSystem*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(4))); }
 void IfcRelServicesBuildings::setRelatingSystem(IfcSystem* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-SHARED_PTR< IfcTemplatedEntityList< IfcSpatialStructureElement > > IfcRelServicesBuildings::RelatedBuildings() { RETURN_AS_LIST(IfcSpatialStructureElement,5) }
-void IfcRelServicesBuildings::setRelatedBuildings(SHARED_PTR< IfcTemplatedEntityList< IfcSpatialStructureElement > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v->generalize()); }
+IfcTemplatedEntityList< IfcSpatialStructureElement >::ptr IfcRelServicesBuildings::RelatedBuildings() const { IfcEntityList::ptr es = *entity->getArgument(5); return es->as<IfcSpatialStructureElement>(); }
+void IfcRelServicesBuildings::setRelatedBuildings(IfcTemplatedEntityList< IfcSpatialStructureElement >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v->generalize()); }
 bool IfcRelServicesBuildings::is(Type::Enum v) const { return v == Type::IfcRelServicesBuildings || IfcRelConnects::is(v); }
 Type::Enum IfcRelServicesBuildings::type() const { return Type::IfcRelServicesBuildings; }
 Type::Enum IfcRelServicesBuildings::Class() { return Type::IfcRelServicesBuildings; }
-IfcRelServicesBuildings::IfcRelServicesBuildings(IfcAbstractEntityPtr e) : IfcRelConnects((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRelServicesBuildings)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRelServicesBuildings::IfcRelServicesBuildings(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, IfcSystem* v5_RelatingSystem, SHARED_PTR< IfcTemplatedEntityList< IfcSpatialStructureElement > > v6_RelatedBuildings) : IfcRelConnects((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatingSystem)); e->setArgument(5,(v6_RelatedBuildings)->generalize()); entity = e; EntityBuffer::Add(this); }
+IfcRelServicesBuildings::IfcRelServicesBuildings(IfcAbstractEntity* e) : IfcRelConnects((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRelServicesBuildings)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRelServicesBuildings::IfcRelServicesBuildings(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcSystem* v5_RelatingSystem, IfcTemplatedEntityList< IfcSpatialStructureElement >::ptr v6_RelatedBuildings) : IfcRelConnects((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatingSystem)); e->setArgument(5,(v6_RelatedBuildings)->generalize()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRelSpaceBoundary
-IfcSpace* IfcRelSpaceBoundary::RelatingSpace() { return (IfcSpace*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(4))); }
+IfcSpace* IfcRelSpaceBoundary::RelatingSpace() const { return (IfcSpace*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(4))); }
 void IfcRelSpaceBoundary::setRelatingSpace(IfcSpace* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-bool IfcRelSpaceBoundary::hasRelatedBuildingElement() { return !entity->getArgument(5)->isNull(); }
-IfcElement* IfcRelSpaceBoundary::RelatedBuildingElement() { return (IfcElement*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(5))); }
+bool IfcRelSpaceBoundary::hasRelatedBuildingElement() const { return !entity->getArgument(5)->isNull(); }
+IfcElement* IfcRelSpaceBoundary::RelatedBuildingElement() const { return (IfcElement*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(5))); }
 void IfcRelSpaceBoundary::setRelatedBuildingElement(IfcElement* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-bool IfcRelSpaceBoundary::hasConnectionGeometry() { return !entity->getArgument(6)->isNull(); }
-IfcConnectionGeometry* IfcRelSpaceBoundary::ConnectionGeometry() { return (IfcConnectionGeometry*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(6))); }
+bool IfcRelSpaceBoundary::hasConnectionGeometry() const { return !entity->getArgument(6)->isNull(); }
+IfcConnectionGeometry* IfcRelSpaceBoundary::ConnectionGeometry() const { return (IfcConnectionGeometry*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(6))); }
 void IfcRelSpaceBoundary::setConnectionGeometry(IfcConnectionGeometry* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
-IfcPhysicalOrVirtualEnum::IfcPhysicalOrVirtualEnum IfcRelSpaceBoundary::PhysicalOrVirtualBoundary() { return IfcPhysicalOrVirtualEnum::FromString(*entity->getArgument(7)); }
+IfcPhysicalOrVirtualEnum::IfcPhysicalOrVirtualEnum IfcRelSpaceBoundary::PhysicalOrVirtualBoundary() const { return IfcPhysicalOrVirtualEnum::FromString(*entity->getArgument(7)); }
 void IfcRelSpaceBoundary::setPhysicalOrVirtualBoundary(IfcPhysicalOrVirtualEnum::IfcPhysicalOrVirtualEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v,IfcPhysicalOrVirtualEnum::ToString(v)); }
-IfcInternalOrExternalEnum::IfcInternalOrExternalEnum IfcRelSpaceBoundary::InternalOrExternalBoundary() { return IfcInternalOrExternalEnum::FromString(*entity->getArgument(8)); }
+IfcInternalOrExternalEnum::IfcInternalOrExternalEnum IfcRelSpaceBoundary::InternalOrExternalBoundary() const { return IfcInternalOrExternalEnum::FromString(*entity->getArgument(8)); }
 void IfcRelSpaceBoundary::setInternalOrExternalBoundary(IfcInternalOrExternalEnum::IfcInternalOrExternalEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcInternalOrExternalEnum::ToString(v)); }
 bool IfcRelSpaceBoundary::is(Type::Enum v) const { return v == Type::IfcRelSpaceBoundary || IfcRelConnects::is(v); }
 Type::Enum IfcRelSpaceBoundary::type() const { return Type::IfcRelSpaceBoundary; }
 Type::Enum IfcRelSpaceBoundary::Class() { return Type::IfcRelSpaceBoundary; }
-IfcRelSpaceBoundary::IfcRelSpaceBoundary(IfcAbstractEntityPtr e) : IfcRelConnects((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRelSpaceBoundary)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRelSpaceBoundary::IfcRelSpaceBoundary(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, IfcSpace* v5_RelatingSpace, IfcElement* v6_RelatedBuildingElement, IfcConnectionGeometry* v7_ConnectionGeometry, IfcPhysicalOrVirtualEnum::IfcPhysicalOrVirtualEnum v8_PhysicalOrVirtualBoundary, IfcInternalOrExternalEnum::IfcInternalOrExternalEnum v9_InternalOrExternalBoundary) : IfcRelConnects((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatingSpace)); e->setArgument(5,(v6_RelatedBuildingElement)); e->setArgument(6,(v7_ConnectionGeometry)); e->setArgument(7,v8_PhysicalOrVirtualBoundary,IfcPhysicalOrVirtualEnum::ToString(v8_PhysicalOrVirtualBoundary)); e->setArgument(8,v9_InternalOrExternalBoundary,IfcInternalOrExternalEnum::ToString(v9_InternalOrExternalBoundary)); entity = e; EntityBuffer::Add(this); }
+IfcRelSpaceBoundary::IfcRelSpaceBoundary(IfcAbstractEntity* e) : IfcRelConnects((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRelSpaceBoundary)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRelSpaceBoundary::IfcRelSpaceBoundary(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcSpace* v5_RelatingSpace, IfcElement* v6_RelatedBuildingElement, IfcConnectionGeometry* v7_ConnectionGeometry, IfcPhysicalOrVirtualEnum::IfcPhysicalOrVirtualEnum v8_PhysicalOrVirtualBoundary, IfcInternalOrExternalEnum::IfcInternalOrExternalEnum v9_InternalOrExternalBoundary) : IfcRelConnects((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatingSpace)); e->setArgument(5,(v6_RelatedBuildingElement)); e->setArgument(6,(v7_ConnectionGeometry)); e->setArgument(7,v8_PhysicalOrVirtualBoundary,IfcPhysicalOrVirtualEnum::ToString(v8_PhysicalOrVirtualBoundary)); e->setArgument(8,v9_InternalOrExternalBoundary,IfcInternalOrExternalEnum::ToString(v9_InternalOrExternalBoundary)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRelVoidsElement
-IfcElement* IfcRelVoidsElement::RelatingBuildingElement() { return (IfcElement*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(4))); }
+IfcElement* IfcRelVoidsElement::RelatingBuildingElement() const { return (IfcElement*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(4))); }
 void IfcRelVoidsElement::setRelatingBuildingElement(IfcElement* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-IfcFeatureElementSubtraction* IfcRelVoidsElement::RelatedOpeningElement() { return (IfcFeatureElementSubtraction*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(5))); }
+IfcFeatureElementSubtraction* IfcRelVoidsElement::RelatedOpeningElement() const { return (IfcFeatureElementSubtraction*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(5))); }
 void IfcRelVoidsElement::setRelatedOpeningElement(IfcFeatureElementSubtraction* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
 bool IfcRelVoidsElement::is(Type::Enum v) const { return v == Type::IfcRelVoidsElement || IfcRelConnects::is(v); }
 Type::Enum IfcRelVoidsElement::type() const { return Type::IfcRelVoidsElement; }
 Type::Enum IfcRelVoidsElement::Class() { return Type::IfcRelVoidsElement; }
-IfcRelVoidsElement::IfcRelVoidsElement(IfcAbstractEntityPtr e) : IfcRelConnects((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRelVoidsElement)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRelVoidsElement::IfcRelVoidsElement(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, IfcElement* v5_RelatingBuildingElement, IfcFeatureElementSubtraction* v6_RelatedOpeningElement) : IfcRelConnects((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatingBuildingElement)); e->setArgument(5,(v6_RelatedOpeningElement)); entity = e; EntityBuffer::Add(this); }
+IfcRelVoidsElement::IfcRelVoidsElement(IfcAbstractEntity* e) : IfcRelConnects((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRelVoidsElement)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRelVoidsElement::IfcRelVoidsElement(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcElement* v5_RelatingBuildingElement, IfcFeatureElementSubtraction* v6_RelatedOpeningElement) : IfcRelConnects((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatingBuildingElement)); e->setArgument(5,(v6_RelatedOpeningElement)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRelationship
 bool IfcRelationship::is(Type::Enum v) const { return v == Type::IfcRelationship || IfcRoot::is(v); }
 Type::Enum IfcRelationship::type() const { return Type::IfcRelationship; }
 Type::Enum IfcRelationship::Class() { return Type::IfcRelationship; }
-IfcRelationship::IfcRelationship(IfcAbstractEntityPtr e) : IfcRoot((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRelationship)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRelationship::IfcRelationship(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description) : IfcRoot((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } entity = e; EntityBuffer::Add(this); }
+IfcRelationship::IfcRelationship(IfcAbstractEntity* e) : IfcRoot((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRelationship)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRelationship::IfcRelationship(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description) : IfcRoot((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRelaxation
-IfcNormalisedRatioMeasure IfcRelaxation::RelaxationValue() { return *entity->getArgument(0); }
-void IfcRelaxation::setRelaxationValue(IfcNormalisedRatioMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-IfcNormalisedRatioMeasure IfcRelaxation::InitialStress() { return *entity->getArgument(1); }
-void IfcRelaxation::setInitialStress(IfcNormalisedRatioMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+double IfcRelaxation::RelaxationValue() const { return *entity->getArgument(0); }
+void IfcRelaxation::setRelaxationValue(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+double IfcRelaxation::InitialStress() const { return *entity->getArgument(1); }
+void IfcRelaxation::setInitialStress(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
 bool IfcRelaxation::is(Type::Enum v) const { return v == Type::IfcRelaxation; }
 Type::Enum IfcRelaxation::type() const { return Type::IfcRelaxation; }
 Type::Enum IfcRelaxation::Class() { return Type::IfcRelaxation; }
-IfcRelaxation::IfcRelaxation(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcRelaxation)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRelaxation::IfcRelaxation(IfcNormalisedRatioMeasure v1_RelaxationValue, IfcNormalisedRatioMeasure v2_InitialStress) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_RelaxationValue)); e->setArgument(1,(v2_InitialStress)); entity = e; EntityBuffer::Add(this); }
+IfcRelaxation::IfcRelaxation(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcRelaxation)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRelaxation::IfcRelaxation(double v1_RelaxationValue, double v2_InitialStress) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_RelaxationValue)); e->setArgument(1,(v2_InitialStress)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRepresentation
-IfcRepresentationContext* IfcRepresentation::ContextOfItems() { return (IfcRepresentationContext*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(0))); }
+IfcRepresentationContext* IfcRepresentation::ContextOfItems() const { return (IfcRepresentationContext*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(0))); }
 void IfcRepresentation::setContextOfItems(IfcRepresentationContext* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-bool IfcRepresentation::hasRepresentationIdentifier() { return !entity->getArgument(1)->isNull(); }
-IfcLabel IfcRepresentation::RepresentationIdentifier() { return *entity->getArgument(1); }
-void IfcRepresentation::setRepresentationIdentifier(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-bool IfcRepresentation::hasRepresentationType() { return !entity->getArgument(2)->isNull(); }
-IfcLabel IfcRepresentation::RepresentationType() { return *entity->getArgument(2); }
-void IfcRepresentation::setRepresentationType(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationItem > > IfcRepresentation::Items() { RETURN_AS_LIST(IfcRepresentationItem,3) }
-void IfcRepresentation::setItems(SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationItem > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v->generalize()); }
-IfcRepresentationMap::list IfcRepresentation::RepresentationMap() { RETURN_INVERSE(IfcRepresentationMap) }
-IfcPresentationLayerAssignment::list IfcRepresentation::LayerAssignments() { RETURN_INVERSE(IfcPresentationLayerAssignment) }
-IfcProductRepresentation::list IfcRepresentation::OfProductRepresentation() { RETURN_INVERSE(IfcProductRepresentation) }
+bool IfcRepresentation::hasRepresentationIdentifier() const { return !entity->getArgument(1)->isNull(); }
+std::string IfcRepresentation::RepresentationIdentifier() const { return *entity->getArgument(1); }
+void IfcRepresentation::setRepresentationIdentifier(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+bool IfcRepresentation::hasRepresentationType() const { return !entity->getArgument(2)->isNull(); }
+std::string IfcRepresentation::RepresentationType() const { return *entity->getArgument(2); }
+void IfcRepresentation::setRepresentationType(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+IfcTemplatedEntityList< IfcRepresentationItem >::ptr IfcRepresentation::Items() const { IfcEntityList::ptr es = *entity->getArgument(3); return es->as<IfcRepresentationItem>(); }
+void IfcRepresentation::setItems(IfcTemplatedEntityList< IfcRepresentationItem >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v->generalize()); }
+IfcRepresentationMap::list::ptr IfcRepresentation::RepresentationMap() const { return entity->getInverse(Type::IfcRepresentationMap, 1)->as<IfcRepresentationMap>(); }
+IfcPresentationLayerAssignment::list::ptr IfcRepresentation::LayerAssignments() const { return entity->getInverse(Type::IfcPresentationLayerAssignment, 2)->as<IfcPresentationLayerAssignment>(); }
+IfcProductRepresentation::list::ptr IfcRepresentation::OfProductRepresentation() const { return entity->getInverse(Type::IfcProductRepresentation, 2)->as<IfcProductRepresentation>(); }
 bool IfcRepresentation::is(Type::Enum v) const { return v == Type::IfcRepresentation; }
 Type::Enum IfcRepresentation::type() const { return Type::IfcRepresentation; }
 Type::Enum IfcRepresentation::Class() { return Type::IfcRepresentation; }
-IfcRepresentation::IfcRepresentation(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcRepresentation)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRepresentation::IfcRepresentation(IfcRepresentationContext* v1_ContextOfItems, boost::optional< IfcLabel > v2_RepresentationIdentifier, boost::optional< IfcLabel > v3_RepresentationType, SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationItem > > v4_Items) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_ContextOfItems)); if (v2_RepresentationIdentifier) { e->setArgument(1,(*v2_RepresentationIdentifier)); } else { e->setArgument(1); } if (v3_RepresentationType) { e->setArgument(2,(*v3_RepresentationType)); } else { e->setArgument(2); } e->setArgument(3,(v4_Items)->generalize()); entity = e; EntityBuffer::Add(this); }
+IfcRepresentation::IfcRepresentation(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcRepresentation)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRepresentation::IfcRepresentation(IfcRepresentationContext* v1_ContextOfItems, boost::optional< std::string > v2_RepresentationIdentifier, boost::optional< std::string > v3_RepresentationType, IfcTemplatedEntityList< IfcRepresentationItem >::ptr v4_Items) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_ContextOfItems)); if (v2_RepresentationIdentifier) { e->setArgument(1,(*v2_RepresentationIdentifier)); } else { e->setArgument(1); } if (v3_RepresentationType) { e->setArgument(2,(*v3_RepresentationType)); } else { e->setArgument(2); } e->setArgument(3,(v4_Items)->generalize()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRepresentationContext
-bool IfcRepresentationContext::hasContextIdentifier() { return !entity->getArgument(0)->isNull(); }
-IfcLabel IfcRepresentationContext::ContextIdentifier() { return *entity->getArgument(0); }
-void IfcRepresentationContext::setContextIdentifier(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-bool IfcRepresentationContext::hasContextType() { return !entity->getArgument(1)->isNull(); }
-IfcLabel IfcRepresentationContext::ContextType() { return *entity->getArgument(1); }
-void IfcRepresentationContext::setContextType(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-IfcRepresentation::list IfcRepresentationContext::RepresentationsInContext() { RETURN_INVERSE(IfcRepresentation) }
+bool IfcRepresentationContext::hasContextIdentifier() const { return !entity->getArgument(0)->isNull(); }
+std::string IfcRepresentationContext::ContextIdentifier() const { return *entity->getArgument(0); }
+void IfcRepresentationContext::setContextIdentifier(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+bool IfcRepresentationContext::hasContextType() const { return !entity->getArgument(1)->isNull(); }
+std::string IfcRepresentationContext::ContextType() const { return *entity->getArgument(1); }
+void IfcRepresentationContext::setContextType(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+IfcRepresentation::list::ptr IfcRepresentationContext::RepresentationsInContext() const { return entity->getInverse(Type::IfcRepresentation, 0)->as<IfcRepresentation>(); }
 bool IfcRepresentationContext::is(Type::Enum v) const { return v == Type::IfcRepresentationContext; }
 Type::Enum IfcRepresentationContext::type() const { return Type::IfcRepresentationContext; }
 Type::Enum IfcRepresentationContext::Class() { return Type::IfcRepresentationContext; }
-IfcRepresentationContext::IfcRepresentationContext(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcRepresentationContext)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRepresentationContext::IfcRepresentationContext(boost::optional< IfcLabel > v1_ContextIdentifier, boost::optional< IfcLabel > v2_ContextType) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_ContextIdentifier) { e->setArgument(0,(*v1_ContextIdentifier)); } else { e->setArgument(0); } if (v2_ContextType) { e->setArgument(1,(*v2_ContextType)); } else { e->setArgument(1); } entity = e; EntityBuffer::Add(this); }
+IfcRepresentationContext::IfcRepresentationContext(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcRepresentationContext)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRepresentationContext::IfcRepresentationContext(boost::optional< std::string > v1_ContextIdentifier, boost::optional< std::string > v2_ContextType) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_ContextIdentifier) { e->setArgument(0,(*v1_ContextIdentifier)); } else { e->setArgument(0); } if (v2_ContextType) { e->setArgument(1,(*v2_ContextType)); } else { e->setArgument(1); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRepresentationItem
-IfcPresentationLayerAssignment::list IfcRepresentationItem::LayerAssignments() { RETURN_INVERSE(IfcPresentationLayerAssignment) }
-IfcStyledItem::list IfcRepresentationItem::StyledByItem() { RETURN_INVERSE(IfcStyledItem) }
+IfcPresentationLayerAssignment::list::ptr IfcRepresentationItem::LayerAssignments() const { return entity->getInverse(Type::IfcPresentationLayerAssignment, 2)->as<IfcPresentationLayerAssignment>(); }
+IfcStyledItem::list::ptr IfcRepresentationItem::StyledByItem() const { return entity->getInverse(Type::IfcStyledItem, 0)->as<IfcStyledItem>(); }
 bool IfcRepresentationItem::is(Type::Enum v) const { return v == Type::IfcRepresentationItem; }
 Type::Enum IfcRepresentationItem::type() const { return Type::IfcRepresentationItem; }
 Type::Enum IfcRepresentationItem::Class() { return Type::IfcRepresentationItem; }
-IfcRepresentationItem::IfcRepresentationItem(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcRepresentationItem)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRepresentationItem::IfcRepresentationItem(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcRepresentationItem)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
 IfcRepresentationItem::IfcRepresentationItem() : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRepresentationMap
-IfcAxis2Placement IfcRepresentationMap::MappingOrigin() { return *entity->getArgument(0); }
-void IfcRepresentationMap::setMappingOrigin(IfcAxis2Placement v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-IfcRepresentation* IfcRepresentationMap::MappedRepresentation() { return (IfcRepresentation*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(1))); }
+IfcAxis2Placement* IfcRepresentationMap::MappingOrigin() const { return (IfcAxis2Placement*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(0))); }
+void IfcRepresentationMap::setMappingOrigin(IfcAxis2Placement* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+IfcRepresentation* IfcRepresentationMap::MappedRepresentation() const { return (IfcRepresentation*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(1))); }
 void IfcRepresentationMap::setMappedRepresentation(IfcRepresentation* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-IfcMappedItem::list IfcRepresentationMap::MapUsage() { RETURN_INVERSE(IfcMappedItem) }
+IfcMappedItem::list::ptr IfcRepresentationMap::MapUsage() const { return entity->getInverse(Type::IfcMappedItem, 0)->as<IfcMappedItem>(); }
 bool IfcRepresentationMap::is(Type::Enum v) const { return v == Type::IfcRepresentationMap; }
 Type::Enum IfcRepresentationMap::type() const { return Type::IfcRepresentationMap; }
 Type::Enum IfcRepresentationMap::Class() { return Type::IfcRepresentationMap; }
-IfcRepresentationMap::IfcRepresentationMap(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcRepresentationMap)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRepresentationMap::IfcRepresentationMap(IfcAxis2Placement v1_MappingOrigin, IfcRepresentation* v2_MappedRepresentation) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_MappingOrigin)); e->setArgument(1,(v2_MappedRepresentation)); entity = e; EntityBuffer::Add(this); }
+IfcRepresentationMap::IfcRepresentationMap(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcRepresentationMap)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRepresentationMap::IfcRepresentationMap(IfcAxis2Placement* v1_MappingOrigin, IfcRepresentation* v2_MappedRepresentation) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_MappingOrigin)); e->setArgument(1,(v2_MappedRepresentation)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcResource
-IfcRelAssignsToResource::list IfcResource::ResourceOf() { RETURN_INVERSE(IfcRelAssignsToResource) }
+IfcRelAssignsToResource::list::ptr IfcResource::ResourceOf() const { return entity->getInverse(Type::IfcRelAssignsToResource, 6)->as<IfcRelAssignsToResource>(); }
 bool IfcResource::is(Type::Enum v) const { return v == Type::IfcResource || IfcObject::is(v); }
 Type::Enum IfcResource::type() const { return Type::IfcResource; }
 Type::Enum IfcResource::Class() { return Type::IfcResource; }
-IfcResource::IfcResource(IfcAbstractEntityPtr e) : IfcObject((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcResource)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcResource::IfcResource(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType) : IfcObject((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } entity = e; EntityBuffer::Add(this); }
+IfcResource::IfcResource(IfcAbstractEntity* e) : IfcObject((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcResource)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcResource::IfcResource(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType) : IfcObject((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRevolvedAreaSolid
-IfcAxis1Placement* IfcRevolvedAreaSolid::Axis() { return (IfcAxis1Placement*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(2))); }
+IfcAxis1Placement* IfcRevolvedAreaSolid::Axis() const { return (IfcAxis1Placement*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(2))); }
 void IfcRevolvedAreaSolid::setAxis(IfcAxis1Placement* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-IfcPlaneAngleMeasure IfcRevolvedAreaSolid::Angle() { return *entity->getArgument(3); }
-void IfcRevolvedAreaSolid::setAngle(IfcPlaneAngleMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+double IfcRevolvedAreaSolid::Angle() const { return *entity->getArgument(3); }
+void IfcRevolvedAreaSolid::setAngle(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
 bool IfcRevolvedAreaSolid::is(Type::Enum v) const { return v == Type::IfcRevolvedAreaSolid || IfcSweptAreaSolid::is(v); }
 Type::Enum IfcRevolvedAreaSolid::type() const { return Type::IfcRevolvedAreaSolid; }
 Type::Enum IfcRevolvedAreaSolid::Class() { return Type::IfcRevolvedAreaSolid; }
-IfcRevolvedAreaSolid::IfcRevolvedAreaSolid(IfcAbstractEntityPtr e) : IfcSweptAreaSolid((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRevolvedAreaSolid)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRevolvedAreaSolid::IfcRevolvedAreaSolid(IfcProfileDef* v1_SweptArea, IfcAxis2Placement3D* v2_Position, IfcAxis1Placement* v3_Axis, IfcPlaneAngleMeasure v4_Angle) : IfcSweptAreaSolid((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_SweptArea)); e->setArgument(1,(v2_Position)); e->setArgument(2,(v3_Axis)); e->setArgument(3,(v4_Angle)); entity = e; EntityBuffer::Add(this); }
+IfcRevolvedAreaSolid::IfcRevolvedAreaSolid(IfcAbstractEntity* e) : IfcSweptAreaSolid((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRevolvedAreaSolid)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRevolvedAreaSolid::IfcRevolvedAreaSolid(IfcProfileDef* v1_SweptArea, IfcAxis2Placement3D* v2_Position, IfcAxis1Placement* v3_Axis, double v4_Angle) : IfcSweptAreaSolid((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_SweptArea)); e->setArgument(1,(v2_Position)); e->setArgument(2,(v3_Axis)); e->setArgument(3,(v4_Angle)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRibPlateProfileProperties
-bool IfcRibPlateProfileProperties::hasThickness() { return !entity->getArgument(2)->isNull(); }
-IfcPositiveLengthMeasure IfcRibPlateProfileProperties::Thickness() { return *entity->getArgument(2); }
-void IfcRibPlateProfileProperties::setThickness(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-bool IfcRibPlateProfileProperties::hasRibHeight() { return !entity->getArgument(3)->isNull(); }
-IfcPositiveLengthMeasure IfcRibPlateProfileProperties::RibHeight() { return *entity->getArgument(3); }
-void IfcRibPlateProfileProperties::setRibHeight(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-bool IfcRibPlateProfileProperties::hasRibWidth() { return !entity->getArgument(4)->isNull(); }
-IfcPositiveLengthMeasure IfcRibPlateProfileProperties::RibWidth() { return *entity->getArgument(4); }
-void IfcRibPlateProfileProperties::setRibWidth(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-bool IfcRibPlateProfileProperties::hasRibSpacing() { return !entity->getArgument(5)->isNull(); }
-IfcPositiveLengthMeasure IfcRibPlateProfileProperties::RibSpacing() { return *entity->getArgument(5); }
-void IfcRibPlateProfileProperties::setRibSpacing(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-IfcRibPlateDirectionEnum::IfcRibPlateDirectionEnum IfcRibPlateProfileProperties::Direction() { return IfcRibPlateDirectionEnum::FromString(*entity->getArgument(6)); }
+bool IfcRibPlateProfileProperties::hasThickness() const { return !entity->getArgument(2)->isNull(); }
+double IfcRibPlateProfileProperties::Thickness() const { return *entity->getArgument(2); }
+void IfcRibPlateProfileProperties::setThickness(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+bool IfcRibPlateProfileProperties::hasRibHeight() const { return !entity->getArgument(3)->isNull(); }
+double IfcRibPlateProfileProperties::RibHeight() const { return *entity->getArgument(3); }
+void IfcRibPlateProfileProperties::setRibHeight(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+bool IfcRibPlateProfileProperties::hasRibWidth() const { return !entity->getArgument(4)->isNull(); }
+double IfcRibPlateProfileProperties::RibWidth() const { return *entity->getArgument(4); }
+void IfcRibPlateProfileProperties::setRibWidth(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+bool IfcRibPlateProfileProperties::hasRibSpacing() const { return !entity->getArgument(5)->isNull(); }
+double IfcRibPlateProfileProperties::RibSpacing() const { return *entity->getArgument(5); }
+void IfcRibPlateProfileProperties::setRibSpacing(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+IfcRibPlateDirectionEnum::IfcRibPlateDirectionEnum IfcRibPlateProfileProperties::Direction() const { return IfcRibPlateDirectionEnum::FromString(*entity->getArgument(6)); }
 void IfcRibPlateProfileProperties::setDirection(IfcRibPlateDirectionEnum::IfcRibPlateDirectionEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v,IfcRibPlateDirectionEnum::ToString(v)); }
 bool IfcRibPlateProfileProperties::is(Type::Enum v) const { return v == Type::IfcRibPlateProfileProperties || IfcProfileProperties::is(v); }
 Type::Enum IfcRibPlateProfileProperties::type() const { return Type::IfcRibPlateProfileProperties; }
 Type::Enum IfcRibPlateProfileProperties::Class() { return Type::IfcRibPlateProfileProperties; }
-IfcRibPlateProfileProperties::IfcRibPlateProfileProperties(IfcAbstractEntityPtr e) : IfcProfileProperties((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRibPlateProfileProperties)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRibPlateProfileProperties::IfcRibPlateProfileProperties(boost::optional< IfcLabel > v1_ProfileName, IfcProfileDef* v2_ProfileDefinition, boost::optional< IfcPositiveLengthMeasure > v3_Thickness, boost::optional< IfcPositiveLengthMeasure > v4_RibHeight, boost::optional< IfcPositiveLengthMeasure > v5_RibWidth, boost::optional< IfcPositiveLengthMeasure > v6_RibSpacing, IfcRibPlateDirectionEnum::IfcRibPlateDirectionEnum v7_Direction) : IfcProfileProperties((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_ProfileName) { e->setArgument(0,(*v1_ProfileName)); } else { e->setArgument(0); } e->setArgument(1,(v2_ProfileDefinition)); if (v3_Thickness) { e->setArgument(2,(*v3_Thickness)); } else { e->setArgument(2); } if (v4_RibHeight) { e->setArgument(3,(*v4_RibHeight)); } else { e->setArgument(3); } if (v5_RibWidth) { e->setArgument(4,(*v5_RibWidth)); } else { e->setArgument(4); } if (v6_RibSpacing) { e->setArgument(5,(*v6_RibSpacing)); } else { e->setArgument(5); } e->setArgument(6,v7_Direction,IfcRibPlateDirectionEnum::ToString(v7_Direction)); entity = e; EntityBuffer::Add(this); }
+IfcRibPlateProfileProperties::IfcRibPlateProfileProperties(IfcAbstractEntity* e) : IfcProfileProperties((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRibPlateProfileProperties)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRibPlateProfileProperties::IfcRibPlateProfileProperties(boost::optional< std::string > v1_ProfileName, IfcProfileDef* v2_ProfileDefinition, boost::optional< double > v3_Thickness, boost::optional< double > v4_RibHeight, boost::optional< double > v5_RibWidth, boost::optional< double > v6_RibSpacing, IfcRibPlateDirectionEnum::IfcRibPlateDirectionEnum v7_Direction) : IfcProfileProperties((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_ProfileName) { e->setArgument(0,(*v1_ProfileName)); } else { e->setArgument(0); } e->setArgument(1,(v2_ProfileDefinition)); if (v3_Thickness) { e->setArgument(2,(*v3_Thickness)); } else { e->setArgument(2); } if (v4_RibHeight) { e->setArgument(3,(*v4_RibHeight)); } else { e->setArgument(3); } if (v5_RibWidth) { e->setArgument(4,(*v5_RibWidth)); } else { e->setArgument(4); } if (v6_RibSpacing) { e->setArgument(5,(*v6_RibSpacing)); } else { e->setArgument(5); } e->setArgument(6,v7_Direction,IfcRibPlateDirectionEnum::ToString(v7_Direction)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRightCircularCone
-IfcPositiveLengthMeasure IfcRightCircularCone::Height() { return *entity->getArgument(1); }
-void IfcRightCircularCone::setHeight(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-IfcPositiveLengthMeasure IfcRightCircularCone::BottomRadius() { return *entity->getArgument(2); }
-void IfcRightCircularCone::setBottomRadius(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+double IfcRightCircularCone::Height() const { return *entity->getArgument(1); }
+void IfcRightCircularCone::setHeight(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+double IfcRightCircularCone::BottomRadius() const { return *entity->getArgument(2); }
+void IfcRightCircularCone::setBottomRadius(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
 bool IfcRightCircularCone::is(Type::Enum v) const { return v == Type::IfcRightCircularCone || IfcCsgPrimitive3D::is(v); }
 Type::Enum IfcRightCircularCone::type() const { return Type::IfcRightCircularCone; }
 Type::Enum IfcRightCircularCone::Class() { return Type::IfcRightCircularCone; }
-IfcRightCircularCone::IfcRightCircularCone(IfcAbstractEntityPtr e) : IfcCsgPrimitive3D((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRightCircularCone)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRightCircularCone::IfcRightCircularCone(IfcAxis2Placement3D* v1_Position, IfcPositiveLengthMeasure v2_Height, IfcPositiveLengthMeasure v3_BottomRadius) : IfcCsgPrimitive3D((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Position)); e->setArgument(1,(v2_Height)); e->setArgument(2,(v3_BottomRadius)); entity = e; EntityBuffer::Add(this); }
+IfcRightCircularCone::IfcRightCircularCone(IfcAbstractEntity* e) : IfcCsgPrimitive3D((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRightCircularCone)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRightCircularCone::IfcRightCircularCone(IfcAxis2Placement3D* v1_Position, double v2_Height, double v3_BottomRadius) : IfcCsgPrimitive3D((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Position)); e->setArgument(1,(v2_Height)); e->setArgument(2,(v3_BottomRadius)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRightCircularCylinder
-IfcPositiveLengthMeasure IfcRightCircularCylinder::Height() { return *entity->getArgument(1); }
-void IfcRightCircularCylinder::setHeight(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-IfcPositiveLengthMeasure IfcRightCircularCylinder::Radius() { return *entity->getArgument(2); }
-void IfcRightCircularCylinder::setRadius(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+double IfcRightCircularCylinder::Height() const { return *entity->getArgument(1); }
+void IfcRightCircularCylinder::setHeight(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+double IfcRightCircularCylinder::Radius() const { return *entity->getArgument(2); }
+void IfcRightCircularCylinder::setRadius(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
 bool IfcRightCircularCylinder::is(Type::Enum v) const { return v == Type::IfcRightCircularCylinder || IfcCsgPrimitive3D::is(v); }
 Type::Enum IfcRightCircularCylinder::type() const { return Type::IfcRightCircularCylinder; }
 Type::Enum IfcRightCircularCylinder::Class() { return Type::IfcRightCircularCylinder; }
-IfcRightCircularCylinder::IfcRightCircularCylinder(IfcAbstractEntityPtr e) : IfcCsgPrimitive3D((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRightCircularCylinder)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRightCircularCylinder::IfcRightCircularCylinder(IfcAxis2Placement3D* v1_Position, IfcPositiveLengthMeasure v2_Height, IfcPositiveLengthMeasure v3_Radius) : IfcCsgPrimitive3D((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Position)); e->setArgument(1,(v2_Height)); e->setArgument(2,(v3_Radius)); entity = e; EntityBuffer::Add(this); }
+IfcRightCircularCylinder::IfcRightCircularCylinder(IfcAbstractEntity* e) : IfcCsgPrimitive3D((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRightCircularCylinder)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRightCircularCylinder::IfcRightCircularCylinder(IfcAxis2Placement3D* v1_Position, double v2_Height, double v3_Radius) : IfcCsgPrimitive3D((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Position)); e->setArgument(1,(v2_Height)); e->setArgument(2,(v3_Radius)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRoof
-IfcRoofTypeEnum::IfcRoofTypeEnum IfcRoof::ShapeType() { return IfcRoofTypeEnum::FromString(*entity->getArgument(8)); }
+IfcRoofTypeEnum::IfcRoofTypeEnum IfcRoof::ShapeType() const { return IfcRoofTypeEnum::FromString(*entity->getArgument(8)); }
 void IfcRoof::setShapeType(IfcRoofTypeEnum::IfcRoofTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcRoofTypeEnum::ToString(v)); }
 bool IfcRoof::is(Type::Enum v) const { return v == Type::IfcRoof || IfcBuildingElement::is(v); }
 Type::Enum IfcRoof::type() const { return Type::IfcRoof; }
 Type::Enum IfcRoof::Class() { return Type::IfcRoof; }
-IfcRoof::IfcRoof(IfcAbstractEntityPtr e) : IfcBuildingElement((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRoof)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRoof::IfcRoof(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, IfcRoofTypeEnum::IfcRoofTypeEnum v9_ShapeType) : IfcBuildingElement((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } e->setArgument(8,v9_ShapeType,IfcRoofTypeEnum::ToString(v9_ShapeType)); entity = e; EntityBuffer::Add(this); }
+IfcRoof::IfcRoof(IfcAbstractEntity* e) : IfcBuildingElement((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRoof)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRoof::IfcRoof(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, IfcRoofTypeEnum::IfcRoofTypeEnum v9_ShapeType) : IfcBuildingElement((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } e->setArgument(8,v9_ShapeType,IfcRoofTypeEnum::ToString(v9_ShapeType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRoot
-IfcGloballyUniqueId IfcRoot::GlobalId() { return *entity->getArgument(0); }
-void IfcRoot::setGlobalId(IfcGloballyUniqueId v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-IfcOwnerHistory* IfcRoot::OwnerHistory() { return (IfcOwnerHistory*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(1))); }
+std::string IfcRoot::GlobalId() const { return *entity->getArgument(0); }
+void IfcRoot::setGlobalId(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+IfcOwnerHistory* IfcRoot::OwnerHistory() const { return (IfcOwnerHistory*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(1))); }
 void IfcRoot::setOwnerHistory(IfcOwnerHistory* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-bool IfcRoot::hasName() { return !entity->getArgument(2)->isNull(); }
-IfcLabel IfcRoot::Name() { return *entity->getArgument(2); }
-void IfcRoot::setName(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-bool IfcRoot::hasDescription() { return !entity->getArgument(3)->isNull(); }
-IfcText IfcRoot::Description() { return *entity->getArgument(3); }
-void IfcRoot::setDescription(IfcText v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+bool IfcRoot::hasName() const { return !entity->getArgument(2)->isNull(); }
+std::string IfcRoot::Name() const { return *entity->getArgument(2); }
+void IfcRoot::setName(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+bool IfcRoot::hasDescription() const { return !entity->getArgument(3)->isNull(); }
+std::string IfcRoot::Description() const { return *entity->getArgument(3); }
+void IfcRoot::setDescription(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
 bool IfcRoot::is(Type::Enum v) const { return v == Type::IfcRoot; }
 Type::Enum IfcRoot::type() const { return Type::IfcRoot; }
 Type::Enum IfcRoot::Class() { return Type::IfcRoot; }
-IfcRoot::IfcRoot(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcRoot)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRoot::IfcRoot(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } entity = e; EntityBuffer::Add(this); }
+IfcRoot::IfcRoot(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcRoot)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRoot::IfcRoot(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRoundedEdgeFeature
-bool IfcRoundedEdgeFeature::hasRadius() { return !entity->getArgument(9)->isNull(); }
-IfcPositiveLengthMeasure IfcRoundedEdgeFeature::Radius() { return *entity->getArgument(9); }
-void IfcRoundedEdgeFeature::setRadius(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
+bool IfcRoundedEdgeFeature::hasRadius() const { return !entity->getArgument(9)->isNull(); }
+double IfcRoundedEdgeFeature::Radius() const { return *entity->getArgument(9); }
+void IfcRoundedEdgeFeature::setRadius(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
 bool IfcRoundedEdgeFeature::is(Type::Enum v) const { return v == Type::IfcRoundedEdgeFeature || IfcEdgeFeature::is(v); }
 Type::Enum IfcRoundedEdgeFeature::type() const { return Type::IfcRoundedEdgeFeature; }
 Type::Enum IfcRoundedEdgeFeature::Class() { return Type::IfcRoundedEdgeFeature; }
-IfcRoundedEdgeFeature::IfcRoundedEdgeFeature(IfcAbstractEntityPtr e) : IfcEdgeFeature((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRoundedEdgeFeature)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRoundedEdgeFeature::IfcRoundedEdgeFeature(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcPositiveLengthMeasure > v9_FeatureLength, boost::optional< IfcPositiveLengthMeasure > v10_Radius) : IfcEdgeFeature((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_FeatureLength) { e->setArgument(8,(*v9_FeatureLength)); } else { e->setArgument(8); } if (v10_Radius) { e->setArgument(9,(*v10_Radius)); } else { e->setArgument(9); } entity = e; EntityBuffer::Add(this); }
+IfcRoundedEdgeFeature::IfcRoundedEdgeFeature(IfcAbstractEntity* e) : IfcEdgeFeature((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRoundedEdgeFeature)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRoundedEdgeFeature::IfcRoundedEdgeFeature(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< double > v9_FeatureLength, boost::optional< double > v10_Radius) : IfcEdgeFeature((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_FeatureLength) { e->setArgument(8,(*v9_FeatureLength)); } else { e->setArgument(8); } if (v10_Radius) { e->setArgument(9,(*v10_Radius)); } else { e->setArgument(9); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRoundedRectangleProfileDef
-IfcPositiveLengthMeasure IfcRoundedRectangleProfileDef::RoundingRadius() { return *entity->getArgument(5); }
-void IfcRoundedRectangleProfileDef::setRoundingRadius(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+double IfcRoundedRectangleProfileDef::RoundingRadius() const { return *entity->getArgument(5); }
+void IfcRoundedRectangleProfileDef::setRoundingRadius(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
 bool IfcRoundedRectangleProfileDef::is(Type::Enum v) const { return v == Type::IfcRoundedRectangleProfileDef || IfcRectangleProfileDef::is(v); }
 Type::Enum IfcRoundedRectangleProfileDef::type() const { return Type::IfcRoundedRectangleProfileDef; }
 Type::Enum IfcRoundedRectangleProfileDef::Class() { return Type::IfcRoundedRectangleProfileDef; }
-IfcRoundedRectangleProfileDef::IfcRoundedRectangleProfileDef(IfcAbstractEntityPtr e) : IfcRectangleProfileDef((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRoundedRectangleProfileDef)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRoundedRectangleProfileDef::IfcRoundedRectangleProfileDef(IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< IfcLabel > v2_ProfileName, IfcAxis2Placement2D* v3_Position, IfcPositiveLengthMeasure v4_XDim, IfcPositiveLengthMeasure v5_YDim, IfcPositiveLengthMeasure v6_RoundingRadius) : IfcRectangleProfileDef((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,v1_ProfileType,IfcProfileTypeEnum::ToString(v1_ProfileType)); if (v2_ProfileName) { e->setArgument(1,(*v2_ProfileName)); } else { e->setArgument(1); } e->setArgument(2,(v3_Position)); e->setArgument(3,(v4_XDim)); e->setArgument(4,(v5_YDim)); e->setArgument(5,(v6_RoundingRadius)); entity = e; EntityBuffer::Add(this); }
+IfcRoundedRectangleProfileDef::IfcRoundedRectangleProfileDef(IfcAbstractEntity* e) : IfcRectangleProfileDef((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRoundedRectangleProfileDef)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRoundedRectangleProfileDef::IfcRoundedRectangleProfileDef(IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< std::string > v2_ProfileName, IfcAxis2Placement2D* v3_Position, double v4_XDim, double v5_YDim, double v6_RoundingRadius) : IfcRectangleProfileDef((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,v1_ProfileType,IfcProfileTypeEnum::ToString(v1_ProfileType)); if (v2_ProfileName) { e->setArgument(1,(*v2_ProfileName)); } else { e->setArgument(1); } e->setArgument(2,(v3_Position)); e->setArgument(3,(v4_XDim)); e->setArgument(4,(v5_YDim)); e->setArgument(5,(v6_RoundingRadius)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcSIUnit
-bool IfcSIUnit::hasPrefix() { return !entity->getArgument(2)->isNull(); }
-IfcSIPrefix::IfcSIPrefix IfcSIUnit::Prefix() { return IfcSIPrefix::FromString(*entity->getArgument(2)); }
+bool IfcSIUnit::hasPrefix() const { return !entity->getArgument(2)->isNull(); }
+IfcSIPrefix::IfcSIPrefix IfcSIUnit::Prefix() const { return IfcSIPrefix::FromString(*entity->getArgument(2)); }
 void IfcSIUnit::setPrefix(IfcSIPrefix::IfcSIPrefix v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v,IfcSIPrefix::ToString(v)); }
-IfcSIUnitName::IfcSIUnitName IfcSIUnit::Name() { return IfcSIUnitName::FromString(*entity->getArgument(3)); }
+IfcSIUnitName::IfcSIUnitName IfcSIUnit::Name() const { return IfcSIUnitName::FromString(*entity->getArgument(3)); }
 void IfcSIUnit::setName(IfcSIUnitName::IfcSIUnitName v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v,IfcSIUnitName::ToString(v)); }
 bool IfcSIUnit::is(Type::Enum v) const { return v == Type::IfcSIUnit || IfcNamedUnit::is(v); }
 Type::Enum IfcSIUnit::type() const { return Type::IfcSIUnit; }
 Type::Enum IfcSIUnit::Class() { return Type::IfcSIUnit; }
-IfcSIUnit::IfcSIUnit(IfcAbstractEntityPtr e) : IfcNamedUnit((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcSIUnit)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcSIUnit::IfcSIUnit(IfcUnitEnum::IfcUnitEnum v2_UnitType, boost::optional< IfcSIPrefix::IfcSIPrefix > v3_Prefix, IfcSIUnitName::IfcSIUnitName v4_Name) : IfcNamedUnit((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgumentDerived(0); e->setArgument(1,v2_UnitType,IfcUnitEnum::ToString(v2_UnitType)); if (v3_Prefix) { e->setArgument(2,*v3_Prefix,IfcSIPrefix::ToString(*v3_Prefix)); } else { e->setArgument(2); } e->setArgument(3,v4_Name,IfcSIUnitName::ToString(v4_Name)); entity = e; EntityBuffer::Add(this); }
+IfcSIUnit::IfcSIUnit(IfcAbstractEntity* e) : IfcNamedUnit((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcSIUnit)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcSIUnit::IfcSIUnit(IfcUnitEnum::IfcUnitEnum v2_UnitType, boost::optional< IfcSIPrefix::IfcSIPrefix > v3_Prefix, IfcSIUnitName::IfcSIUnitName v4_Name) : IfcNamedUnit((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgumentDerived(0); e->setArgument(1,v2_UnitType,IfcUnitEnum::ToString(v2_UnitType)); if (v3_Prefix) { e->setArgument(2,*v3_Prefix,IfcSIPrefix::ToString(*v3_Prefix)); } else { e->setArgument(2); } e->setArgument(3,v4_Name,IfcSIUnitName::ToString(v4_Name)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcSanitaryTerminalType
-IfcSanitaryTerminalTypeEnum::IfcSanitaryTerminalTypeEnum IfcSanitaryTerminalType::PredefinedType() { return IfcSanitaryTerminalTypeEnum::FromString(*entity->getArgument(9)); }
+IfcSanitaryTerminalTypeEnum::IfcSanitaryTerminalTypeEnum IfcSanitaryTerminalType::PredefinedType() const { return IfcSanitaryTerminalTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcSanitaryTerminalType::setPredefinedType(IfcSanitaryTerminalTypeEnum::IfcSanitaryTerminalTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcSanitaryTerminalTypeEnum::ToString(v)); }
 bool IfcSanitaryTerminalType::is(Type::Enum v) const { return v == Type::IfcSanitaryTerminalType || IfcFlowTerminalType::is(v); }
 Type::Enum IfcSanitaryTerminalType::type() const { return Type::IfcSanitaryTerminalType; }
 Type::Enum IfcSanitaryTerminalType::Class() { return Type::IfcSanitaryTerminalType; }
-IfcSanitaryTerminalType::IfcSanitaryTerminalType(IfcAbstractEntityPtr e) : IfcFlowTerminalType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcSanitaryTerminalType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcSanitaryTerminalType::IfcSanitaryTerminalType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcSanitaryTerminalTypeEnum::IfcSanitaryTerminalTypeEnum v10_PredefinedType) : IfcFlowTerminalType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcSanitaryTerminalTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcSanitaryTerminalType::IfcSanitaryTerminalType(IfcAbstractEntity* e) : IfcFlowTerminalType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcSanitaryTerminalType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcSanitaryTerminalType::IfcSanitaryTerminalType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcSanitaryTerminalTypeEnum::IfcSanitaryTerminalTypeEnum v10_PredefinedType) : IfcFlowTerminalType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcSanitaryTerminalTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcScheduleTimeControl
-bool IfcScheduleTimeControl::hasActualStart() { return !entity->getArgument(5)->isNull(); }
-IfcDateTimeSelect IfcScheduleTimeControl::ActualStart() { return *entity->getArgument(5); }
-void IfcScheduleTimeControl::setActualStart(IfcDateTimeSelect v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-bool IfcScheduleTimeControl::hasEarlyStart() { return !entity->getArgument(6)->isNull(); }
-IfcDateTimeSelect IfcScheduleTimeControl::EarlyStart() { return *entity->getArgument(6); }
-void IfcScheduleTimeControl::setEarlyStart(IfcDateTimeSelect v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
-bool IfcScheduleTimeControl::hasLateStart() { return !entity->getArgument(7)->isNull(); }
-IfcDateTimeSelect IfcScheduleTimeControl::LateStart() { return *entity->getArgument(7); }
-void IfcScheduleTimeControl::setLateStart(IfcDateTimeSelect v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
-bool IfcScheduleTimeControl::hasScheduleStart() { return !entity->getArgument(8)->isNull(); }
-IfcDateTimeSelect IfcScheduleTimeControl::ScheduleStart() { return *entity->getArgument(8); }
-void IfcScheduleTimeControl::setScheduleStart(IfcDateTimeSelect v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
-bool IfcScheduleTimeControl::hasActualFinish() { return !entity->getArgument(9)->isNull(); }
-IfcDateTimeSelect IfcScheduleTimeControl::ActualFinish() { return *entity->getArgument(9); }
-void IfcScheduleTimeControl::setActualFinish(IfcDateTimeSelect v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
-bool IfcScheduleTimeControl::hasEarlyFinish() { return !entity->getArgument(10)->isNull(); }
-IfcDateTimeSelect IfcScheduleTimeControl::EarlyFinish() { return *entity->getArgument(10); }
-void IfcScheduleTimeControl::setEarlyFinish(IfcDateTimeSelect v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
-bool IfcScheduleTimeControl::hasLateFinish() { return !entity->getArgument(11)->isNull(); }
-IfcDateTimeSelect IfcScheduleTimeControl::LateFinish() { return *entity->getArgument(11); }
-void IfcScheduleTimeControl::setLateFinish(IfcDateTimeSelect v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(11,v); }
-bool IfcScheduleTimeControl::hasScheduleFinish() { return !entity->getArgument(12)->isNull(); }
-IfcDateTimeSelect IfcScheduleTimeControl::ScheduleFinish() { return *entity->getArgument(12); }
-void IfcScheduleTimeControl::setScheduleFinish(IfcDateTimeSelect v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(12,v); }
-bool IfcScheduleTimeControl::hasScheduleDuration() { return !entity->getArgument(13)->isNull(); }
-IfcTimeMeasure IfcScheduleTimeControl::ScheduleDuration() { return *entity->getArgument(13); }
-void IfcScheduleTimeControl::setScheduleDuration(IfcTimeMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(13,v); }
-bool IfcScheduleTimeControl::hasActualDuration() { return !entity->getArgument(14)->isNull(); }
-IfcTimeMeasure IfcScheduleTimeControl::ActualDuration() { return *entity->getArgument(14); }
-void IfcScheduleTimeControl::setActualDuration(IfcTimeMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(14,v); }
-bool IfcScheduleTimeControl::hasRemainingTime() { return !entity->getArgument(15)->isNull(); }
-IfcTimeMeasure IfcScheduleTimeControl::RemainingTime() { return *entity->getArgument(15); }
-void IfcScheduleTimeControl::setRemainingTime(IfcTimeMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(15,v); }
-bool IfcScheduleTimeControl::hasFreeFloat() { return !entity->getArgument(16)->isNull(); }
-IfcTimeMeasure IfcScheduleTimeControl::FreeFloat() { return *entity->getArgument(16); }
-void IfcScheduleTimeControl::setFreeFloat(IfcTimeMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(16,v); }
-bool IfcScheduleTimeControl::hasTotalFloat() { return !entity->getArgument(17)->isNull(); }
-IfcTimeMeasure IfcScheduleTimeControl::TotalFloat() { return *entity->getArgument(17); }
-void IfcScheduleTimeControl::setTotalFloat(IfcTimeMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(17,v); }
-bool IfcScheduleTimeControl::hasIsCritical() { return !entity->getArgument(18)->isNull(); }
-bool IfcScheduleTimeControl::IsCritical() { return *entity->getArgument(18); }
+bool IfcScheduleTimeControl::hasActualStart() const { return !entity->getArgument(5)->isNull(); }
+IfcDateTimeSelect* IfcScheduleTimeControl::ActualStart() const { return (IfcDateTimeSelect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(5))); }
+void IfcScheduleTimeControl::setActualStart(IfcDateTimeSelect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+bool IfcScheduleTimeControl::hasEarlyStart() const { return !entity->getArgument(6)->isNull(); }
+IfcDateTimeSelect* IfcScheduleTimeControl::EarlyStart() const { return (IfcDateTimeSelect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(6))); }
+void IfcScheduleTimeControl::setEarlyStart(IfcDateTimeSelect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
+bool IfcScheduleTimeControl::hasLateStart() const { return !entity->getArgument(7)->isNull(); }
+IfcDateTimeSelect* IfcScheduleTimeControl::LateStart() const { return (IfcDateTimeSelect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(7))); }
+void IfcScheduleTimeControl::setLateStart(IfcDateTimeSelect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
+bool IfcScheduleTimeControl::hasScheduleStart() const { return !entity->getArgument(8)->isNull(); }
+IfcDateTimeSelect* IfcScheduleTimeControl::ScheduleStart() const { return (IfcDateTimeSelect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(8))); }
+void IfcScheduleTimeControl::setScheduleStart(IfcDateTimeSelect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
+bool IfcScheduleTimeControl::hasActualFinish() const { return !entity->getArgument(9)->isNull(); }
+IfcDateTimeSelect* IfcScheduleTimeControl::ActualFinish() const { return (IfcDateTimeSelect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(9))); }
+void IfcScheduleTimeControl::setActualFinish(IfcDateTimeSelect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
+bool IfcScheduleTimeControl::hasEarlyFinish() const { return !entity->getArgument(10)->isNull(); }
+IfcDateTimeSelect* IfcScheduleTimeControl::EarlyFinish() const { return (IfcDateTimeSelect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(10))); }
+void IfcScheduleTimeControl::setEarlyFinish(IfcDateTimeSelect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
+bool IfcScheduleTimeControl::hasLateFinish() const { return !entity->getArgument(11)->isNull(); }
+IfcDateTimeSelect* IfcScheduleTimeControl::LateFinish() const { return (IfcDateTimeSelect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(11))); }
+void IfcScheduleTimeControl::setLateFinish(IfcDateTimeSelect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(11,v); }
+bool IfcScheduleTimeControl::hasScheduleFinish() const { return !entity->getArgument(12)->isNull(); }
+IfcDateTimeSelect* IfcScheduleTimeControl::ScheduleFinish() const { return (IfcDateTimeSelect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(12))); }
+void IfcScheduleTimeControl::setScheduleFinish(IfcDateTimeSelect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(12,v); }
+bool IfcScheduleTimeControl::hasScheduleDuration() const { return !entity->getArgument(13)->isNull(); }
+double IfcScheduleTimeControl::ScheduleDuration() const { return *entity->getArgument(13); }
+void IfcScheduleTimeControl::setScheduleDuration(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(13,v); }
+bool IfcScheduleTimeControl::hasActualDuration() const { return !entity->getArgument(14)->isNull(); }
+double IfcScheduleTimeControl::ActualDuration() const { return *entity->getArgument(14); }
+void IfcScheduleTimeControl::setActualDuration(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(14,v); }
+bool IfcScheduleTimeControl::hasRemainingTime() const { return !entity->getArgument(15)->isNull(); }
+double IfcScheduleTimeControl::RemainingTime() const { return *entity->getArgument(15); }
+void IfcScheduleTimeControl::setRemainingTime(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(15,v); }
+bool IfcScheduleTimeControl::hasFreeFloat() const { return !entity->getArgument(16)->isNull(); }
+double IfcScheduleTimeControl::FreeFloat() const { return *entity->getArgument(16); }
+void IfcScheduleTimeControl::setFreeFloat(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(16,v); }
+bool IfcScheduleTimeControl::hasTotalFloat() const { return !entity->getArgument(17)->isNull(); }
+double IfcScheduleTimeControl::TotalFloat() const { return *entity->getArgument(17); }
+void IfcScheduleTimeControl::setTotalFloat(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(17,v); }
+bool IfcScheduleTimeControl::hasIsCritical() const { return !entity->getArgument(18)->isNull(); }
+bool IfcScheduleTimeControl::IsCritical() const { return *entity->getArgument(18); }
 void IfcScheduleTimeControl::setIsCritical(bool v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(18,v); }
-bool IfcScheduleTimeControl::hasStatusTime() { return !entity->getArgument(19)->isNull(); }
-IfcDateTimeSelect IfcScheduleTimeControl::StatusTime() { return *entity->getArgument(19); }
-void IfcScheduleTimeControl::setStatusTime(IfcDateTimeSelect v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(19,v); }
-bool IfcScheduleTimeControl::hasStartFloat() { return !entity->getArgument(20)->isNull(); }
-IfcTimeMeasure IfcScheduleTimeControl::StartFloat() { return *entity->getArgument(20); }
-void IfcScheduleTimeControl::setStartFloat(IfcTimeMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(20,v); }
-bool IfcScheduleTimeControl::hasFinishFloat() { return !entity->getArgument(21)->isNull(); }
-IfcTimeMeasure IfcScheduleTimeControl::FinishFloat() { return *entity->getArgument(21); }
-void IfcScheduleTimeControl::setFinishFloat(IfcTimeMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(21,v); }
-bool IfcScheduleTimeControl::hasCompletion() { return !entity->getArgument(22)->isNull(); }
-IfcPositiveRatioMeasure IfcScheduleTimeControl::Completion() { return *entity->getArgument(22); }
-void IfcScheduleTimeControl::setCompletion(IfcPositiveRatioMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(22,v); }
-IfcRelAssignsTasks::list IfcScheduleTimeControl::ScheduleTimeControlAssigned() { RETURN_INVERSE(IfcRelAssignsTasks) }
+bool IfcScheduleTimeControl::hasStatusTime() const { return !entity->getArgument(19)->isNull(); }
+IfcDateTimeSelect* IfcScheduleTimeControl::StatusTime() const { return (IfcDateTimeSelect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(19))); }
+void IfcScheduleTimeControl::setStatusTime(IfcDateTimeSelect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(19,v); }
+bool IfcScheduleTimeControl::hasStartFloat() const { return !entity->getArgument(20)->isNull(); }
+double IfcScheduleTimeControl::StartFloat() const { return *entity->getArgument(20); }
+void IfcScheduleTimeControl::setStartFloat(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(20,v); }
+bool IfcScheduleTimeControl::hasFinishFloat() const { return !entity->getArgument(21)->isNull(); }
+double IfcScheduleTimeControl::FinishFloat() const { return *entity->getArgument(21); }
+void IfcScheduleTimeControl::setFinishFloat(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(21,v); }
+bool IfcScheduleTimeControl::hasCompletion() const { return !entity->getArgument(22)->isNull(); }
+double IfcScheduleTimeControl::Completion() const { return *entity->getArgument(22); }
+void IfcScheduleTimeControl::setCompletion(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(22,v); }
+IfcRelAssignsTasks::list::ptr IfcScheduleTimeControl::ScheduleTimeControlAssigned() const { return entity->getInverse(Type::IfcRelAssignsTasks, 7)->as<IfcRelAssignsTasks>(); }
 bool IfcScheduleTimeControl::is(Type::Enum v) const { return v == Type::IfcScheduleTimeControl || IfcControl::is(v); }
 Type::Enum IfcScheduleTimeControl::type() const { return Type::IfcScheduleTimeControl; }
 Type::Enum IfcScheduleTimeControl::Class() { return Type::IfcScheduleTimeControl; }
-IfcScheduleTimeControl::IfcScheduleTimeControl(IfcAbstractEntityPtr e) : IfcControl((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcScheduleTimeControl)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcScheduleTimeControl::IfcScheduleTimeControl(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, boost::optional< IfcDateTimeSelect > v6_ActualStart, boost::optional< IfcDateTimeSelect > v7_EarlyStart, boost::optional< IfcDateTimeSelect > v8_LateStart, boost::optional< IfcDateTimeSelect > v9_ScheduleStart, boost::optional< IfcDateTimeSelect > v10_ActualFinish, boost::optional< IfcDateTimeSelect > v11_EarlyFinish, boost::optional< IfcDateTimeSelect > v12_LateFinish, boost::optional< IfcDateTimeSelect > v13_ScheduleFinish, boost::optional< IfcTimeMeasure > v14_ScheduleDuration, boost::optional< IfcTimeMeasure > v15_ActualDuration, boost::optional< IfcTimeMeasure > v16_RemainingTime, boost::optional< IfcTimeMeasure > v17_FreeFloat, boost::optional< IfcTimeMeasure > v18_TotalFloat, boost::optional< bool > v19_IsCritical, boost::optional< IfcDateTimeSelect > v20_StatusTime, boost::optional< IfcTimeMeasure > v21_StartFloat, boost::optional< IfcTimeMeasure > v22_FinishFloat, boost::optional< IfcPositiveRatioMeasure > v23_Completion) : IfcControl((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } if (v6_ActualStart) { e->setArgument(5,(*v6_ActualStart)); } else { e->setArgument(5); } if (v7_EarlyStart) { e->setArgument(6,(*v7_EarlyStart)); } else { e->setArgument(6); } if (v8_LateStart) { e->setArgument(7,(*v8_LateStart)); } else { e->setArgument(7); } if (v9_ScheduleStart) { e->setArgument(8,(*v9_ScheduleStart)); } else { e->setArgument(8); } if (v10_ActualFinish) { e->setArgument(9,(*v10_ActualFinish)); } else { e->setArgument(9); } if (v11_EarlyFinish) { e->setArgument(10,(*v11_EarlyFinish)); } else { e->setArgument(10); } if (v12_LateFinish) { e->setArgument(11,(*v12_LateFinish)); } else { e->setArgument(11); } if (v13_ScheduleFinish) { e->setArgument(12,(*v13_ScheduleFinish)); } else { e->setArgument(12); } if (v14_ScheduleDuration) { e->setArgument(13,(*v14_ScheduleDuration)); } else { e->setArgument(13); } if (v15_ActualDuration) { e->setArgument(14,(*v15_ActualDuration)); } else { e->setArgument(14); } if (v16_RemainingTime) { e->setArgument(15,(*v16_RemainingTime)); } else { e->setArgument(15); } if (v17_FreeFloat) { e->setArgument(16,(*v17_FreeFloat)); } else { e->setArgument(16); } if (v18_TotalFloat) { e->setArgument(17,(*v18_TotalFloat)); } else { e->setArgument(17); } if (v19_IsCritical) { e->setArgument(18,(*v19_IsCritical)); } else { e->setArgument(18); } if (v20_StatusTime) { e->setArgument(19,(*v20_StatusTime)); } else { e->setArgument(19); } if (v21_StartFloat) { e->setArgument(20,(*v21_StartFloat)); } else { e->setArgument(20); } if (v22_FinishFloat) { e->setArgument(21,(*v22_FinishFloat)); } else { e->setArgument(21); } if (v23_Completion) { e->setArgument(22,(*v23_Completion)); } else { e->setArgument(22); } entity = e; EntityBuffer::Add(this); }
+IfcScheduleTimeControl::IfcScheduleTimeControl(IfcAbstractEntity* e) : IfcControl((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcScheduleTimeControl)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcScheduleTimeControl::IfcScheduleTimeControl(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcDateTimeSelect* v6_ActualStart, IfcDateTimeSelect* v7_EarlyStart, IfcDateTimeSelect* v8_LateStart, IfcDateTimeSelect* v9_ScheduleStart, IfcDateTimeSelect* v10_ActualFinish, IfcDateTimeSelect* v11_EarlyFinish, IfcDateTimeSelect* v12_LateFinish, IfcDateTimeSelect* v13_ScheduleFinish, boost::optional< double > v14_ScheduleDuration, boost::optional< double > v15_ActualDuration, boost::optional< double > v16_RemainingTime, boost::optional< double > v17_FreeFloat, boost::optional< double > v18_TotalFloat, boost::optional< bool > v19_IsCritical, IfcDateTimeSelect* v20_StatusTime, boost::optional< double > v21_StartFloat, boost::optional< double > v22_FinishFloat, boost::optional< double > v23_Completion) : IfcControl((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ActualStart)); e->setArgument(6,(v7_EarlyStart)); e->setArgument(7,(v8_LateStart)); e->setArgument(8,(v9_ScheduleStart)); e->setArgument(9,(v10_ActualFinish)); e->setArgument(10,(v11_EarlyFinish)); e->setArgument(11,(v12_LateFinish)); e->setArgument(12,(v13_ScheduleFinish)); if (v14_ScheduleDuration) { e->setArgument(13,(*v14_ScheduleDuration)); } else { e->setArgument(13); } if (v15_ActualDuration) { e->setArgument(14,(*v15_ActualDuration)); } else { e->setArgument(14); } if (v16_RemainingTime) { e->setArgument(15,(*v16_RemainingTime)); } else { e->setArgument(15); } if (v17_FreeFloat) { e->setArgument(16,(*v17_FreeFloat)); } else { e->setArgument(16); } if (v18_TotalFloat) { e->setArgument(17,(*v18_TotalFloat)); } else { e->setArgument(17); } if (v19_IsCritical) { e->setArgument(18,(*v19_IsCritical)); } else { e->setArgument(18); } e->setArgument(19,(v20_StatusTime)); if (v21_StartFloat) { e->setArgument(20,(*v21_StartFloat)); } else { e->setArgument(20); } if (v22_FinishFloat) { e->setArgument(21,(*v22_FinishFloat)); } else { e->setArgument(21); } if (v23_Completion) { e->setArgument(22,(*v23_Completion)); } else { e->setArgument(22); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcSectionProperties
-IfcSectionTypeEnum::IfcSectionTypeEnum IfcSectionProperties::SectionType() { return IfcSectionTypeEnum::FromString(*entity->getArgument(0)); }
+IfcSectionTypeEnum::IfcSectionTypeEnum IfcSectionProperties::SectionType() const { return IfcSectionTypeEnum::FromString(*entity->getArgument(0)); }
 void IfcSectionProperties::setSectionType(IfcSectionTypeEnum::IfcSectionTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v,IfcSectionTypeEnum::ToString(v)); }
-IfcProfileDef* IfcSectionProperties::StartProfile() { return (IfcProfileDef*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(1))); }
+IfcProfileDef* IfcSectionProperties::StartProfile() const { return (IfcProfileDef*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(1))); }
 void IfcSectionProperties::setStartProfile(IfcProfileDef* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-bool IfcSectionProperties::hasEndProfile() { return !entity->getArgument(2)->isNull(); }
-IfcProfileDef* IfcSectionProperties::EndProfile() { return (IfcProfileDef*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(2))); }
+bool IfcSectionProperties::hasEndProfile() const { return !entity->getArgument(2)->isNull(); }
+IfcProfileDef* IfcSectionProperties::EndProfile() const { return (IfcProfileDef*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(2))); }
 void IfcSectionProperties::setEndProfile(IfcProfileDef* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
 bool IfcSectionProperties::is(Type::Enum v) const { return v == Type::IfcSectionProperties; }
 Type::Enum IfcSectionProperties::type() const { return Type::IfcSectionProperties; }
 Type::Enum IfcSectionProperties::Class() { return Type::IfcSectionProperties; }
-IfcSectionProperties::IfcSectionProperties(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcSectionProperties)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcSectionProperties::IfcSectionProperties(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcSectionProperties)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
 IfcSectionProperties::IfcSectionProperties(IfcSectionTypeEnum::IfcSectionTypeEnum v1_SectionType, IfcProfileDef* v2_StartProfile, IfcProfileDef* v3_EndProfile) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,v1_SectionType,IfcSectionTypeEnum::ToString(v1_SectionType)); e->setArgument(1,(v2_StartProfile)); e->setArgument(2,(v3_EndProfile)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcSectionReinforcementProperties
-IfcLengthMeasure IfcSectionReinforcementProperties::LongitudinalStartPosition() { return *entity->getArgument(0); }
-void IfcSectionReinforcementProperties::setLongitudinalStartPosition(IfcLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-IfcLengthMeasure IfcSectionReinforcementProperties::LongitudinalEndPosition() { return *entity->getArgument(1); }
-void IfcSectionReinforcementProperties::setLongitudinalEndPosition(IfcLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-bool IfcSectionReinforcementProperties::hasTransversePosition() { return !entity->getArgument(2)->isNull(); }
-IfcLengthMeasure IfcSectionReinforcementProperties::TransversePosition() { return *entity->getArgument(2); }
-void IfcSectionReinforcementProperties::setTransversePosition(IfcLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-IfcReinforcingBarRoleEnum::IfcReinforcingBarRoleEnum IfcSectionReinforcementProperties::ReinforcementRole() { return IfcReinforcingBarRoleEnum::FromString(*entity->getArgument(3)); }
+double IfcSectionReinforcementProperties::LongitudinalStartPosition() const { return *entity->getArgument(0); }
+void IfcSectionReinforcementProperties::setLongitudinalStartPosition(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+double IfcSectionReinforcementProperties::LongitudinalEndPosition() const { return *entity->getArgument(1); }
+void IfcSectionReinforcementProperties::setLongitudinalEndPosition(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+bool IfcSectionReinforcementProperties::hasTransversePosition() const { return !entity->getArgument(2)->isNull(); }
+double IfcSectionReinforcementProperties::TransversePosition() const { return *entity->getArgument(2); }
+void IfcSectionReinforcementProperties::setTransversePosition(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+IfcReinforcingBarRoleEnum::IfcReinforcingBarRoleEnum IfcSectionReinforcementProperties::ReinforcementRole() const { return IfcReinforcingBarRoleEnum::FromString(*entity->getArgument(3)); }
 void IfcSectionReinforcementProperties::setReinforcementRole(IfcReinforcingBarRoleEnum::IfcReinforcingBarRoleEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v,IfcReinforcingBarRoleEnum::ToString(v)); }
-IfcSectionProperties* IfcSectionReinforcementProperties::SectionDefinition() { return (IfcSectionProperties*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(4))); }
+IfcSectionProperties* IfcSectionReinforcementProperties::SectionDefinition() const { return (IfcSectionProperties*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(4))); }
 void IfcSectionReinforcementProperties::setSectionDefinition(IfcSectionProperties* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-SHARED_PTR< IfcTemplatedEntityList< IfcReinforcementBarProperties > > IfcSectionReinforcementProperties::CrossSectionReinforcementDefinitions() { RETURN_AS_LIST(IfcReinforcementBarProperties,5) }
-void IfcSectionReinforcementProperties::setCrossSectionReinforcementDefinitions(SHARED_PTR< IfcTemplatedEntityList< IfcReinforcementBarProperties > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v->generalize()); }
+IfcTemplatedEntityList< IfcReinforcementBarProperties >::ptr IfcSectionReinforcementProperties::CrossSectionReinforcementDefinitions() const { IfcEntityList::ptr es = *entity->getArgument(5); return es->as<IfcReinforcementBarProperties>(); }
+void IfcSectionReinforcementProperties::setCrossSectionReinforcementDefinitions(IfcTemplatedEntityList< IfcReinforcementBarProperties >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v->generalize()); }
 bool IfcSectionReinforcementProperties::is(Type::Enum v) const { return v == Type::IfcSectionReinforcementProperties; }
 Type::Enum IfcSectionReinforcementProperties::type() const { return Type::IfcSectionReinforcementProperties; }
 Type::Enum IfcSectionReinforcementProperties::Class() { return Type::IfcSectionReinforcementProperties; }
-IfcSectionReinforcementProperties::IfcSectionReinforcementProperties(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcSectionReinforcementProperties)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcSectionReinforcementProperties::IfcSectionReinforcementProperties(IfcLengthMeasure v1_LongitudinalStartPosition, IfcLengthMeasure v2_LongitudinalEndPosition, boost::optional< IfcLengthMeasure > v3_TransversePosition, IfcReinforcingBarRoleEnum::IfcReinforcingBarRoleEnum v4_ReinforcementRole, IfcSectionProperties* v5_SectionDefinition, SHARED_PTR< IfcTemplatedEntityList< IfcReinforcementBarProperties > > v6_CrossSectionReinforcementDefinitions) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_LongitudinalStartPosition)); e->setArgument(1,(v2_LongitudinalEndPosition)); if (v3_TransversePosition) { e->setArgument(2,(*v3_TransversePosition)); } else { e->setArgument(2); } e->setArgument(3,v4_ReinforcementRole,IfcReinforcingBarRoleEnum::ToString(v4_ReinforcementRole)); e->setArgument(4,(v5_SectionDefinition)); e->setArgument(5,(v6_CrossSectionReinforcementDefinitions)->generalize()); entity = e; EntityBuffer::Add(this); }
+IfcSectionReinforcementProperties::IfcSectionReinforcementProperties(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcSectionReinforcementProperties)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcSectionReinforcementProperties::IfcSectionReinforcementProperties(double v1_LongitudinalStartPosition, double v2_LongitudinalEndPosition, boost::optional< double > v3_TransversePosition, IfcReinforcingBarRoleEnum::IfcReinforcingBarRoleEnum v4_ReinforcementRole, IfcSectionProperties* v5_SectionDefinition, IfcTemplatedEntityList< IfcReinforcementBarProperties >::ptr v6_CrossSectionReinforcementDefinitions) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_LongitudinalStartPosition)); e->setArgument(1,(v2_LongitudinalEndPosition)); if (v3_TransversePosition) { e->setArgument(2,(*v3_TransversePosition)); } else { e->setArgument(2); } e->setArgument(3,v4_ReinforcementRole,IfcReinforcingBarRoleEnum::ToString(v4_ReinforcementRole)); e->setArgument(4,(v5_SectionDefinition)); e->setArgument(5,(v6_CrossSectionReinforcementDefinitions)->generalize()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcSectionedSpine
-IfcCompositeCurve* IfcSectionedSpine::SpineCurve() { return (IfcCompositeCurve*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(0))); }
+IfcCompositeCurve* IfcSectionedSpine::SpineCurve() const { return (IfcCompositeCurve*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(0))); }
 void IfcSectionedSpine::setSpineCurve(IfcCompositeCurve* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-SHARED_PTR< IfcTemplatedEntityList< IfcProfileDef > > IfcSectionedSpine::CrossSections() { RETURN_AS_LIST(IfcProfileDef,1) }
-void IfcSectionedSpine::setCrossSections(SHARED_PTR< IfcTemplatedEntityList< IfcProfileDef > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v->generalize()); }
-SHARED_PTR< IfcTemplatedEntityList< IfcAxis2Placement3D > > IfcSectionedSpine::CrossSectionPositions() { RETURN_AS_LIST(IfcAxis2Placement3D,2) }
-void IfcSectionedSpine::setCrossSectionPositions(SHARED_PTR< IfcTemplatedEntityList< IfcAxis2Placement3D > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v->generalize()); }
+IfcTemplatedEntityList< IfcProfileDef >::ptr IfcSectionedSpine::CrossSections() const { IfcEntityList::ptr es = *entity->getArgument(1); return es->as<IfcProfileDef>(); }
+void IfcSectionedSpine::setCrossSections(IfcTemplatedEntityList< IfcProfileDef >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v->generalize()); }
+IfcTemplatedEntityList< IfcAxis2Placement3D >::ptr IfcSectionedSpine::CrossSectionPositions() const { IfcEntityList::ptr es = *entity->getArgument(2); return es->as<IfcAxis2Placement3D>(); }
+void IfcSectionedSpine::setCrossSectionPositions(IfcTemplatedEntityList< IfcAxis2Placement3D >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v->generalize()); }
 bool IfcSectionedSpine::is(Type::Enum v) const { return v == Type::IfcSectionedSpine || IfcGeometricRepresentationItem::is(v); }
 Type::Enum IfcSectionedSpine::type() const { return Type::IfcSectionedSpine; }
 Type::Enum IfcSectionedSpine::Class() { return Type::IfcSectionedSpine; }
-IfcSectionedSpine::IfcSectionedSpine(IfcAbstractEntityPtr e) : IfcGeometricRepresentationItem((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcSectionedSpine)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcSectionedSpine::IfcSectionedSpine(IfcCompositeCurve* v1_SpineCurve, SHARED_PTR< IfcTemplatedEntityList< IfcProfileDef > > v2_CrossSections, SHARED_PTR< IfcTemplatedEntityList< IfcAxis2Placement3D > > v3_CrossSectionPositions) : IfcGeometricRepresentationItem((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_SpineCurve)); e->setArgument(1,(v2_CrossSections)->generalize()); e->setArgument(2,(v3_CrossSectionPositions)->generalize()); entity = e; EntityBuffer::Add(this); }
+IfcSectionedSpine::IfcSectionedSpine(IfcAbstractEntity* e) : IfcGeometricRepresentationItem((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcSectionedSpine)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcSectionedSpine::IfcSectionedSpine(IfcCompositeCurve* v1_SpineCurve, IfcTemplatedEntityList< IfcProfileDef >::ptr v2_CrossSections, IfcTemplatedEntityList< IfcAxis2Placement3D >::ptr v3_CrossSectionPositions) : IfcGeometricRepresentationItem((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_SpineCurve)); e->setArgument(1,(v2_CrossSections)->generalize()); e->setArgument(2,(v3_CrossSectionPositions)->generalize()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcSensorType
-IfcSensorTypeEnum::IfcSensorTypeEnum IfcSensorType::PredefinedType() { return IfcSensorTypeEnum::FromString(*entity->getArgument(9)); }
+IfcSensorTypeEnum::IfcSensorTypeEnum IfcSensorType::PredefinedType() const { return IfcSensorTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcSensorType::setPredefinedType(IfcSensorTypeEnum::IfcSensorTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcSensorTypeEnum::ToString(v)); }
 bool IfcSensorType::is(Type::Enum v) const { return v == Type::IfcSensorType || IfcDistributionControlElementType::is(v); }
 Type::Enum IfcSensorType::type() const { return Type::IfcSensorType; }
 Type::Enum IfcSensorType::Class() { return Type::IfcSensorType; }
-IfcSensorType::IfcSensorType(IfcAbstractEntityPtr e) : IfcDistributionControlElementType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcSensorType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcSensorType::IfcSensorType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcSensorTypeEnum::IfcSensorTypeEnum v10_PredefinedType) : IfcDistributionControlElementType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcSensorTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcSensorType::IfcSensorType(IfcAbstractEntity* e) : IfcDistributionControlElementType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcSensorType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcSensorType::IfcSensorType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcSensorTypeEnum::IfcSensorTypeEnum v10_PredefinedType) : IfcDistributionControlElementType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcSensorTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcServiceLife
-IfcServiceLifeTypeEnum::IfcServiceLifeTypeEnum IfcServiceLife::ServiceLifeType() { return IfcServiceLifeTypeEnum::FromString(*entity->getArgument(5)); }
+IfcServiceLifeTypeEnum::IfcServiceLifeTypeEnum IfcServiceLife::ServiceLifeType() const { return IfcServiceLifeTypeEnum::FromString(*entity->getArgument(5)); }
 void IfcServiceLife::setServiceLifeType(IfcServiceLifeTypeEnum::IfcServiceLifeTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v,IfcServiceLifeTypeEnum::ToString(v)); }
-IfcTimeMeasure IfcServiceLife::ServiceLifeDuration() { return *entity->getArgument(6); }
-void IfcServiceLife::setServiceLifeDuration(IfcTimeMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
+double IfcServiceLife::ServiceLifeDuration() const { return *entity->getArgument(6); }
+void IfcServiceLife::setServiceLifeDuration(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
 bool IfcServiceLife::is(Type::Enum v) const { return v == Type::IfcServiceLife || IfcControl::is(v); }
 Type::Enum IfcServiceLife::type() const { return Type::IfcServiceLife; }
 Type::Enum IfcServiceLife::Class() { return Type::IfcServiceLife; }
-IfcServiceLife::IfcServiceLife(IfcAbstractEntityPtr e) : IfcControl((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcServiceLife)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcServiceLife::IfcServiceLife(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcServiceLifeTypeEnum::IfcServiceLifeTypeEnum v6_ServiceLifeType, IfcTimeMeasure v7_ServiceLifeDuration) : IfcControl((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,v6_ServiceLifeType,IfcServiceLifeTypeEnum::ToString(v6_ServiceLifeType)); e->setArgument(6,(v7_ServiceLifeDuration)); entity = e; EntityBuffer::Add(this); }
+IfcServiceLife::IfcServiceLife(IfcAbstractEntity* e) : IfcControl((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcServiceLife)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcServiceLife::IfcServiceLife(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcServiceLifeTypeEnum::IfcServiceLifeTypeEnum v6_ServiceLifeType, double v7_ServiceLifeDuration) : IfcControl((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,v6_ServiceLifeType,IfcServiceLifeTypeEnum::ToString(v6_ServiceLifeType)); e->setArgument(6,(v7_ServiceLifeDuration)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcServiceLifeFactor
-IfcServiceLifeFactorTypeEnum::IfcServiceLifeFactorTypeEnum IfcServiceLifeFactor::PredefinedType() { return IfcServiceLifeFactorTypeEnum::FromString(*entity->getArgument(4)); }
+IfcServiceLifeFactorTypeEnum::IfcServiceLifeFactorTypeEnum IfcServiceLifeFactor::PredefinedType() const { return IfcServiceLifeFactorTypeEnum::FromString(*entity->getArgument(4)); }
 void IfcServiceLifeFactor::setPredefinedType(IfcServiceLifeFactorTypeEnum::IfcServiceLifeFactorTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v,IfcServiceLifeFactorTypeEnum::ToString(v)); }
-bool IfcServiceLifeFactor::hasUpperValue() { return !entity->getArgument(5)->isNull(); }
-IfcMeasureValue IfcServiceLifeFactor::UpperValue() { return *entity->getArgument(5); }
-void IfcServiceLifeFactor::setUpperValue(IfcMeasureValue v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-IfcMeasureValue IfcServiceLifeFactor::MostUsedValue() { return *entity->getArgument(6); }
-void IfcServiceLifeFactor::setMostUsedValue(IfcMeasureValue v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
-bool IfcServiceLifeFactor::hasLowerValue() { return !entity->getArgument(7)->isNull(); }
-IfcMeasureValue IfcServiceLifeFactor::LowerValue() { return *entity->getArgument(7); }
-void IfcServiceLifeFactor::setLowerValue(IfcMeasureValue v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
+bool IfcServiceLifeFactor::hasUpperValue() const { return !entity->getArgument(5)->isNull(); }
+IfcMeasureValue* IfcServiceLifeFactor::UpperValue() const { return (IfcMeasureValue*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(5))); }
+void IfcServiceLifeFactor::setUpperValue(IfcMeasureValue* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+IfcMeasureValue* IfcServiceLifeFactor::MostUsedValue() const { return (IfcMeasureValue*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(6))); }
+void IfcServiceLifeFactor::setMostUsedValue(IfcMeasureValue* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
+bool IfcServiceLifeFactor::hasLowerValue() const { return !entity->getArgument(7)->isNull(); }
+IfcMeasureValue* IfcServiceLifeFactor::LowerValue() const { return (IfcMeasureValue*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(7))); }
+void IfcServiceLifeFactor::setLowerValue(IfcMeasureValue* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
 bool IfcServiceLifeFactor::is(Type::Enum v) const { return v == Type::IfcServiceLifeFactor || IfcPropertySetDefinition::is(v); }
 Type::Enum IfcServiceLifeFactor::type() const { return Type::IfcServiceLifeFactor; }
 Type::Enum IfcServiceLifeFactor::Class() { return Type::IfcServiceLifeFactor; }
-IfcServiceLifeFactor::IfcServiceLifeFactor(IfcAbstractEntityPtr e) : IfcPropertySetDefinition((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcServiceLifeFactor)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcServiceLifeFactor::IfcServiceLifeFactor(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, IfcServiceLifeFactorTypeEnum::IfcServiceLifeFactorTypeEnum v5_PredefinedType, boost::optional< IfcMeasureValue > v6_UpperValue, IfcMeasureValue v7_MostUsedValue, boost::optional< IfcMeasureValue > v8_LowerValue) : IfcPropertySetDefinition((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,v5_PredefinedType,IfcServiceLifeFactorTypeEnum::ToString(v5_PredefinedType)); if (v6_UpperValue) { e->setArgument(5,(*v6_UpperValue)); } else { e->setArgument(5); } e->setArgument(6,(v7_MostUsedValue)); if (v8_LowerValue) { e->setArgument(7,(*v8_LowerValue)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
+IfcServiceLifeFactor::IfcServiceLifeFactor(IfcAbstractEntity* e) : IfcPropertySetDefinition((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcServiceLifeFactor)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcServiceLifeFactor::IfcServiceLifeFactor(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcServiceLifeFactorTypeEnum::IfcServiceLifeFactorTypeEnum v5_PredefinedType, IfcMeasureValue* v6_UpperValue, IfcMeasureValue* v7_MostUsedValue, IfcMeasureValue* v8_LowerValue) : IfcPropertySetDefinition((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,v5_PredefinedType,IfcServiceLifeFactorTypeEnum::ToString(v5_PredefinedType)); e->setArgument(5,(v6_UpperValue)); e->setArgument(6,(v7_MostUsedValue)); e->setArgument(7,(v8_LowerValue)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcShapeAspect
-SHARED_PTR< IfcTemplatedEntityList< IfcShapeModel > > IfcShapeAspect::ShapeRepresentations() { RETURN_AS_LIST(IfcShapeModel,0) }
-void IfcShapeAspect::setShapeRepresentations(SHARED_PTR< IfcTemplatedEntityList< IfcShapeModel > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v->generalize()); }
-bool IfcShapeAspect::hasName() { return !entity->getArgument(1)->isNull(); }
-IfcLabel IfcShapeAspect::Name() { return *entity->getArgument(1); }
-void IfcShapeAspect::setName(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-bool IfcShapeAspect::hasDescription() { return !entity->getArgument(2)->isNull(); }
-IfcText IfcShapeAspect::Description() { return *entity->getArgument(2); }
-void IfcShapeAspect::setDescription(IfcText v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-bool IfcShapeAspect::ProductDefinitional() { return *entity->getArgument(3); }
+IfcTemplatedEntityList< IfcShapeModel >::ptr IfcShapeAspect::ShapeRepresentations() const { IfcEntityList::ptr es = *entity->getArgument(0); return es->as<IfcShapeModel>(); }
+void IfcShapeAspect::setShapeRepresentations(IfcTemplatedEntityList< IfcShapeModel >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v->generalize()); }
+bool IfcShapeAspect::hasName() const { return !entity->getArgument(1)->isNull(); }
+std::string IfcShapeAspect::Name() const { return *entity->getArgument(1); }
+void IfcShapeAspect::setName(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+bool IfcShapeAspect::hasDescription() const { return !entity->getArgument(2)->isNull(); }
+std::string IfcShapeAspect::Description() const { return *entity->getArgument(2); }
+void IfcShapeAspect::setDescription(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+bool IfcShapeAspect::ProductDefinitional() const { return *entity->getArgument(3); }
 void IfcShapeAspect::setProductDefinitional(bool v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-IfcProductDefinitionShape* IfcShapeAspect::PartOfProductDefinitionShape() { return (IfcProductDefinitionShape*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(4))); }
+IfcProductDefinitionShape* IfcShapeAspect::PartOfProductDefinitionShape() const { return (IfcProductDefinitionShape*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(4))); }
 void IfcShapeAspect::setPartOfProductDefinitionShape(IfcProductDefinitionShape* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
 bool IfcShapeAspect::is(Type::Enum v) const { return v == Type::IfcShapeAspect; }
 Type::Enum IfcShapeAspect::type() const { return Type::IfcShapeAspect; }
 Type::Enum IfcShapeAspect::Class() { return Type::IfcShapeAspect; }
-IfcShapeAspect::IfcShapeAspect(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcShapeAspect)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcShapeAspect::IfcShapeAspect(SHARED_PTR< IfcTemplatedEntityList< IfcShapeModel > > v1_ShapeRepresentations, boost::optional< IfcLabel > v2_Name, boost::optional< IfcText > v3_Description, bool v4_ProductDefinitional, IfcProductDefinitionShape* v5_PartOfProductDefinitionShape) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_ShapeRepresentations)->generalize()); if (v2_Name) { e->setArgument(1,(*v2_Name)); } else { e->setArgument(1); } if (v3_Description) { e->setArgument(2,(*v3_Description)); } else { e->setArgument(2); } e->setArgument(3,(v4_ProductDefinitional)); e->setArgument(4,(v5_PartOfProductDefinitionShape)); entity = e; EntityBuffer::Add(this); }
+IfcShapeAspect::IfcShapeAspect(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcShapeAspect)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcShapeAspect::IfcShapeAspect(IfcTemplatedEntityList< IfcShapeModel >::ptr v1_ShapeRepresentations, boost::optional< std::string > v2_Name, boost::optional< std::string > v3_Description, bool v4_ProductDefinitional, IfcProductDefinitionShape* v5_PartOfProductDefinitionShape) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_ShapeRepresentations)->generalize()); if (v2_Name) { e->setArgument(1,(*v2_Name)); } else { e->setArgument(1); } if (v3_Description) { e->setArgument(2,(*v3_Description)); } else { e->setArgument(2); } e->setArgument(3,(v4_ProductDefinitional)); e->setArgument(4,(v5_PartOfProductDefinitionShape)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcShapeModel
-IfcShapeAspect::list IfcShapeModel::OfShapeAspect() { RETURN_INVERSE(IfcShapeAspect) }
+IfcShapeAspect::list::ptr IfcShapeModel::OfShapeAspect() const { return entity->getInverse(Type::IfcShapeAspect, 0)->as<IfcShapeAspect>(); }
 bool IfcShapeModel::is(Type::Enum v) const { return v == Type::IfcShapeModel || IfcRepresentation::is(v); }
 Type::Enum IfcShapeModel::type() const { return Type::IfcShapeModel; }
 Type::Enum IfcShapeModel::Class() { return Type::IfcShapeModel; }
-IfcShapeModel::IfcShapeModel(IfcAbstractEntityPtr e) : IfcRepresentation((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcShapeModel)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcShapeModel::IfcShapeModel(IfcRepresentationContext* v1_ContextOfItems, boost::optional< IfcLabel > v2_RepresentationIdentifier, boost::optional< IfcLabel > v3_RepresentationType, SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationItem > > v4_Items) : IfcRepresentation((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_ContextOfItems)); if (v2_RepresentationIdentifier) { e->setArgument(1,(*v2_RepresentationIdentifier)); } else { e->setArgument(1); } if (v3_RepresentationType) { e->setArgument(2,(*v3_RepresentationType)); } else { e->setArgument(2); } e->setArgument(3,(v4_Items)->generalize()); entity = e; EntityBuffer::Add(this); }
+IfcShapeModel::IfcShapeModel(IfcAbstractEntity* e) : IfcRepresentation((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcShapeModel)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcShapeModel::IfcShapeModel(IfcRepresentationContext* v1_ContextOfItems, boost::optional< std::string > v2_RepresentationIdentifier, boost::optional< std::string > v3_RepresentationType, IfcTemplatedEntityList< IfcRepresentationItem >::ptr v4_Items) : IfcRepresentation((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_ContextOfItems)); if (v2_RepresentationIdentifier) { e->setArgument(1,(*v2_RepresentationIdentifier)); } else { e->setArgument(1); } if (v3_RepresentationType) { e->setArgument(2,(*v3_RepresentationType)); } else { e->setArgument(2); } e->setArgument(3,(v4_Items)->generalize()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcShapeRepresentation
 bool IfcShapeRepresentation::is(Type::Enum v) const { return v == Type::IfcShapeRepresentation || IfcShapeModel::is(v); }
 Type::Enum IfcShapeRepresentation::type() const { return Type::IfcShapeRepresentation; }
 Type::Enum IfcShapeRepresentation::Class() { return Type::IfcShapeRepresentation; }
-IfcShapeRepresentation::IfcShapeRepresentation(IfcAbstractEntityPtr e) : IfcShapeModel((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcShapeRepresentation)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcShapeRepresentation::IfcShapeRepresentation(IfcRepresentationContext* v1_ContextOfItems, boost::optional< IfcLabel > v2_RepresentationIdentifier, boost::optional< IfcLabel > v3_RepresentationType, SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationItem > > v4_Items) : IfcShapeModel((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_ContextOfItems)); if (v2_RepresentationIdentifier) { e->setArgument(1,(*v2_RepresentationIdentifier)); } else { e->setArgument(1); } if (v3_RepresentationType) { e->setArgument(2,(*v3_RepresentationType)); } else { e->setArgument(2); } e->setArgument(3,(v4_Items)->generalize()); entity = e; EntityBuffer::Add(this); }
+IfcShapeRepresentation::IfcShapeRepresentation(IfcAbstractEntity* e) : IfcShapeModel((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcShapeRepresentation)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcShapeRepresentation::IfcShapeRepresentation(IfcRepresentationContext* v1_ContextOfItems, boost::optional< std::string > v2_RepresentationIdentifier, boost::optional< std::string > v3_RepresentationType, IfcTemplatedEntityList< IfcRepresentationItem >::ptr v4_Items) : IfcShapeModel((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_ContextOfItems)); if (v2_RepresentationIdentifier) { e->setArgument(1,(*v2_RepresentationIdentifier)); } else { e->setArgument(1); } if (v3_RepresentationType) { e->setArgument(2,(*v3_RepresentationType)); } else { e->setArgument(2); } e->setArgument(3,(v4_Items)->generalize()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcShellBasedSurfaceModel
-SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > IfcShellBasedSurfaceModel::SbsmBoundary() { RETURN_AS_LIST(IfcUtil::IfcAbstractSelect,0) }
-void IfcShellBasedSurfaceModel::setSbsmBoundary(SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v->generalize()); }
+IfcEntityList::ptr IfcShellBasedSurfaceModel::SbsmBoundary() const { return *entity->getArgument(0); }
+void IfcShellBasedSurfaceModel::setSbsmBoundary(IfcEntityList::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
 bool IfcShellBasedSurfaceModel::is(Type::Enum v) const { return v == Type::IfcShellBasedSurfaceModel || IfcGeometricRepresentationItem::is(v); }
 Type::Enum IfcShellBasedSurfaceModel::type() const { return Type::IfcShellBasedSurfaceModel; }
 Type::Enum IfcShellBasedSurfaceModel::Class() { return Type::IfcShellBasedSurfaceModel; }
-IfcShellBasedSurfaceModel::IfcShellBasedSurfaceModel(IfcAbstractEntityPtr e) : IfcGeometricRepresentationItem((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcShellBasedSurfaceModel)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcShellBasedSurfaceModel::IfcShellBasedSurfaceModel(IfcEntities v1_SbsmBoundary) : IfcGeometricRepresentationItem((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_SbsmBoundary)); entity = e; EntityBuffer::Add(this); }
+IfcShellBasedSurfaceModel::IfcShellBasedSurfaceModel(IfcAbstractEntity* e) : IfcGeometricRepresentationItem((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcShellBasedSurfaceModel)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcShellBasedSurfaceModel::IfcShellBasedSurfaceModel(IfcEntityList::ptr v1_SbsmBoundary) : IfcGeometricRepresentationItem((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_SbsmBoundary)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcSimpleProperty
 bool IfcSimpleProperty::is(Type::Enum v) const { return v == Type::IfcSimpleProperty || IfcProperty::is(v); }
 Type::Enum IfcSimpleProperty::type() const { return Type::IfcSimpleProperty; }
 Type::Enum IfcSimpleProperty::Class() { return Type::IfcSimpleProperty; }
-IfcSimpleProperty::IfcSimpleProperty(IfcAbstractEntityPtr e) : IfcProperty((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcSimpleProperty)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcSimpleProperty::IfcSimpleProperty(IfcIdentifier v1_Name, boost::optional< IfcText > v2_Description) : IfcProperty((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } entity = e; EntityBuffer::Add(this); }
+IfcSimpleProperty::IfcSimpleProperty(IfcAbstractEntity* e) : IfcProperty((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcSimpleProperty)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcSimpleProperty::IfcSimpleProperty(std::string v1_Name, boost::optional< std::string > v2_Description) : IfcProperty((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcSite
-bool IfcSite::hasRefLatitude() { return !entity->getArgument(9)->isNull(); }
-IfcCompoundPlaneAngleMeasure IfcSite::RefLatitude() { return *entity->getArgument(9); }
-void IfcSite::setRefLatitude(IfcCompoundPlaneAngleMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
-bool IfcSite::hasRefLongitude() { return !entity->getArgument(10)->isNull(); }
-IfcCompoundPlaneAngleMeasure IfcSite::RefLongitude() { return *entity->getArgument(10); }
-void IfcSite::setRefLongitude(IfcCompoundPlaneAngleMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
-bool IfcSite::hasRefElevation() { return !entity->getArgument(11)->isNull(); }
-IfcLengthMeasure IfcSite::RefElevation() { return *entity->getArgument(11); }
-void IfcSite::setRefElevation(IfcLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(11,v); }
-bool IfcSite::hasLandTitleNumber() { return !entity->getArgument(12)->isNull(); }
-IfcLabel IfcSite::LandTitleNumber() { return *entity->getArgument(12); }
-void IfcSite::setLandTitleNumber(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(12,v); }
-bool IfcSite::hasSiteAddress() { return !entity->getArgument(13)->isNull(); }
-IfcPostalAddress* IfcSite::SiteAddress() { return (IfcPostalAddress*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(13))); }
+bool IfcSite::hasRefLatitude() const { return !entity->getArgument(9)->isNull(); }
+std::vector< int > /*[3:4]*/ IfcSite::RefLatitude() const { return *entity->getArgument(9); }
+void IfcSite::setRefLatitude(std::vector< int > /*[3:4]*/ v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
+bool IfcSite::hasRefLongitude() const { return !entity->getArgument(10)->isNull(); }
+std::vector< int > /*[3:4]*/ IfcSite::RefLongitude() const { return *entity->getArgument(10); }
+void IfcSite::setRefLongitude(std::vector< int > /*[3:4]*/ v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
+bool IfcSite::hasRefElevation() const { return !entity->getArgument(11)->isNull(); }
+double IfcSite::RefElevation() const { return *entity->getArgument(11); }
+void IfcSite::setRefElevation(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(11,v); }
+bool IfcSite::hasLandTitleNumber() const { return !entity->getArgument(12)->isNull(); }
+std::string IfcSite::LandTitleNumber() const { return *entity->getArgument(12); }
+void IfcSite::setLandTitleNumber(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(12,v); }
+bool IfcSite::hasSiteAddress() const { return !entity->getArgument(13)->isNull(); }
+IfcPostalAddress* IfcSite::SiteAddress() const { return (IfcPostalAddress*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(13))); }
 void IfcSite::setSiteAddress(IfcPostalAddress* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(13,v); }
 bool IfcSite::is(Type::Enum v) const { return v == Type::IfcSite || IfcSpatialStructureElement::is(v); }
 Type::Enum IfcSite::type() const { return Type::IfcSite; }
 Type::Enum IfcSite::Class() { return Type::IfcSite; }
-IfcSite::IfcSite(IfcAbstractEntityPtr e) : IfcSpatialStructureElement((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcSite)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcSite::IfcSite(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcLabel > v8_LongName, IfcElementCompositionEnum::IfcElementCompositionEnum v9_CompositionType, boost::optional< IfcCompoundPlaneAngleMeasure > v10_RefLatitude, boost::optional< IfcCompoundPlaneAngleMeasure > v11_RefLongitude, boost::optional< IfcLengthMeasure > v12_RefElevation, boost::optional< IfcLabel > v13_LandTitleNumber, IfcPostalAddress* v14_SiteAddress) : IfcSpatialStructureElement((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_LongName) { e->setArgument(7,(*v8_LongName)); } else { e->setArgument(7); } e->setArgument(8,v9_CompositionType,IfcElementCompositionEnum::ToString(v9_CompositionType)); if (v10_RefLatitude) { e->setArgument(9,(*v10_RefLatitude)); } else { e->setArgument(9); } if (v11_RefLongitude) { e->setArgument(10,(*v11_RefLongitude)); } else { e->setArgument(10); } if (v12_RefElevation) { e->setArgument(11,(*v12_RefElevation)); } else { e->setArgument(11); } if (v13_LandTitleNumber) { e->setArgument(12,(*v13_LandTitleNumber)); } else { e->setArgument(12); } e->setArgument(13,(v14_SiteAddress)); entity = e; EntityBuffer::Add(this); }
+IfcSite::IfcSite(IfcAbstractEntity* e) : IfcSpatialStructureElement((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcSite)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcSite::IfcSite(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_LongName, IfcElementCompositionEnum::IfcElementCompositionEnum v9_CompositionType, boost::optional< std::vector< int > /*[3:4]*/ > v10_RefLatitude, boost::optional< std::vector< int > /*[3:4]*/ > v11_RefLongitude, boost::optional< double > v12_RefElevation, boost::optional< std::string > v13_LandTitleNumber, IfcPostalAddress* v14_SiteAddress) : IfcSpatialStructureElement((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_LongName) { e->setArgument(7,(*v8_LongName)); } else { e->setArgument(7); } e->setArgument(8,v9_CompositionType,IfcElementCompositionEnum::ToString(v9_CompositionType)); if (v10_RefLatitude) { e->setArgument(9,(*v10_RefLatitude)); } else { e->setArgument(9); } if (v11_RefLongitude) { e->setArgument(10,(*v11_RefLongitude)); } else { e->setArgument(10); } if (v12_RefElevation) { e->setArgument(11,(*v12_RefElevation)); } else { e->setArgument(11); } if (v13_LandTitleNumber) { e->setArgument(12,(*v13_LandTitleNumber)); } else { e->setArgument(12); } e->setArgument(13,(v14_SiteAddress)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcSlab
-bool IfcSlab::hasPredefinedType() { return !entity->getArgument(8)->isNull(); }
-IfcSlabTypeEnum::IfcSlabTypeEnum IfcSlab::PredefinedType() { return IfcSlabTypeEnum::FromString(*entity->getArgument(8)); }
+bool IfcSlab::hasPredefinedType() const { return !entity->getArgument(8)->isNull(); }
+IfcSlabTypeEnum::IfcSlabTypeEnum IfcSlab::PredefinedType() const { return IfcSlabTypeEnum::FromString(*entity->getArgument(8)); }
 void IfcSlab::setPredefinedType(IfcSlabTypeEnum::IfcSlabTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcSlabTypeEnum::ToString(v)); }
 bool IfcSlab::is(Type::Enum v) const { return v == Type::IfcSlab || IfcBuildingElement::is(v); }
 Type::Enum IfcSlab::type() const { return Type::IfcSlab; }
 Type::Enum IfcSlab::Class() { return Type::IfcSlab; }
-IfcSlab::IfcSlab(IfcAbstractEntityPtr e) : IfcBuildingElement((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcSlab)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcSlab::IfcSlab(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcSlabTypeEnum::IfcSlabTypeEnum > v9_PredefinedType) : IfcBuildingElement((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcSlabTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcSlab::IfcSlab(IfcAbstractEntity* e) : IfcBuildingElement((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcSlab)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcSlab::IfcSlab(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcSlabTypeEnum::IfcSlabTypeEnum > v9_PredefinedType) : IfcBuildingElement((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcSlabTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcSlabType
-IfcSlabTypeEnum::IfcSlabTypeEnum IfcSlabType::PredefinedType() { return IfcSlabTypeEnum::FromString(*entity->getArgument(9)); }
+IfcSlabTypeEnum::IfcSlabTypeEnum IfcSlabType::PredefinedType() const { return IfcSlabTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcSlabType::setPredefinedType(IfcSlabTypeEnum::IfcSlabTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcSlabTypeEnum::ToString(v)); }
 bool IfcSlabType::is(Type::Enum v) const { return v == Type::IfcSlabType || IfcBuildingElementType::is(v); }
 Type::Enum IfcSlabType::type() const { return Type::IfcSlabType; }
 Type::Enum IfcSlabType::Class() { return Type::IfcSlabType; }
-IfcSlabType::IfcSlabType(IfcAbstractEntityPtr e) : IfcBuildingElementType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcSlabType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcSlabType::IfcSlabType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcSlabTypeEnum::IfcSlabTypeEnum v10_PredefinedType) : IfcBuildingElementType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcSlabTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcSlabType::IfcSlabType(IfcAbstractEntity* e) : IfcBuildingElementType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcSlabType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcSlabType::IfcSlabType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcSlabTypeEnum::IfcSlabTypeEnum v10_PredefinedType) : IfcBuildingElementType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcSlabTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcSlippageConnectionCondition
-bool IfcSlippageConnectionCondition::hasSlippageX() { return !entity->getArgument(1)->isNull(); }
-IfcLengthMeasure IfcSlippageConnectionCondition::SlippageX() { return *entity->getArgument(1); }
-void IfcSlippageConnectionCondition::setSlippageX(IfcLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-bool IfcSlippageConnectionCondition::hasSlippageY() { return !entity->getArgument(2)->isNull(); }
-IfcLengthMeasure IfcSlippageConnectionCondition::SlippageY() { return *entity->getArgument(2); }
-void IfcSlippageConnectionCondition::setSlippageY(IfcLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-bool IfcSlippageConnectionCondition::hasSlippageZ() { return !entity->getArgument(3)->isNull(); }
-IfcLengthMeasure IfcSlippageConnectionCondition::SlippageZ() { return *entity->getArgument(3); }
-void IfcSlippageConnectionCondition::setSlippageZ(IfcLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+bool IfcSlippageConnectionCondition::hasSlippageX() const { return !entity->getArgument(1)->isNull(); }
+double IfcSlippageConnectionCondition::SlippageX() const { return *entity->getArgument(1); }
+void IfcSlippageConnectionCondition::setSlippageX(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+bool IfcSlippageConnectionCondition::hasSlippageY() const { return !entity->getArgument(2)->isNull(); }
+double IfcSlippageConnectionCondition::SlippageY() const { return *entity->getArgument(2); }
+void IfcSlippageConnectionCondition::setSlippageY(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+bool IfcSlippageConnectionCondition::hasSlippageZ() const { return !entity->getArgument(3)->isNull(); }
+double IfcSlippageConnectionCondition::SlippageZ() const { return *entity->getArgument(3); }
+void IfcSlippageConnectionCondition::setSlippageZ(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
 bool IfcSlippageConnectionCondition::is(Type::Enum v) const { return v == Type::IfcSlippageConnectionCondition || IfcStructuralConnectionCondition::is(v); }
 Type::Enum IfcSlippageConnectionCondition::type() const { return Type::IfcSlippageConnectionCondition; }
 Type::Enum IfcSlippageConnectionCondition::Class() { return Type::IfcSlippageConnectionCondition; }
-IfcSlippageConnectionCondition::IfcSlippageConnectionCondition(IfcAbstractEntityPtr e) : IfcStructuralConnectionCondition((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcSlippageConnectionCondition)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcSlippageConnectionCondition::IfcSlippageConnectionCondition(boost::optional< IfcLabel > v1_Name, boost::optional< IfcLengthMeasure > v2_SlippageX, boost::optional< IfcLengthMeasure > v3_SlippageY, boost::optional< IfcLengthMeasure > v4_SlippageZ) : IfcStructuralConnectionCondition((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_SlippageX) { e->setArgument(1,(*v2_SlippageX)); } else { e->setArgument(1); } if (v3_SlippageY) { e->setArgument(2,(*v3_SlippageY)); } else { e->setArgument(2); } if (v4_SlippageZ) { e->setArgument(3,(*v4_SlippageZ)); } else { e->setArgument(3); } entity = e; EntityBuffer::Add(this); }
+IfcSlippageConnectionCondition::IfcSlippageConnectionCondition(IfcAbstractEntity* e) : IfcStructuralConnectionCondition((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcSlippageConnectionCondition)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcSlippageConnectionCondition::IfcSlippageConnectionCondition(boost::optional< std::string > v1_Name, boost::optional< double > v2_SlippageX, boost::optional< double > v3_SlippageY, boost::optional< double > v4_SlippageZ) : IfcStructuralConnectionCondition((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_SlippageX) { e->setArgument(1,(*v2_SlippageX)); } else { e->setArgument(1); } if (v3_SlippageY) { e->setArgument(2,(*v3_SlippageY)); } else { e->setArgument(2); } if (v4_SlippageZ) { e->setArgument(3,(*v4_SlippageZ)); } else { e->setArgument(3); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcSolidModel
 bool IfcSolidModel::is(Type::Enum v) const { return v == Type::IfcSolidModel || IfcGeometricRepresentationItem::is(v); }
 Type::Enum IfcSolidModel::type() const { return Type::IfcSolidModel; }
 Type::Enum IfcSolidModel::Class() { return Type::IfcSolidModel; }
-IfcSolidModel::IfcSolidModel(IfcAbstractEntityPtr e) : IfcGeometricRepresentationItem((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcSolidModel)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcSolidModel::IfcSolidModel() : IfcGeometricRepresentationItem((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); entity = e; EntityBuffer::Add(this); }
+IfcSolidModel::IfcSolidModel(IfcAbstractEntity* e) : IfcGeometricRepresentationItem((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcSolidModel)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcSolidModel::IfcSolidModel() : IfcGeometricRepresentationItem((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcSoundProperties
-IfcBoolean IfcSoundProperties::IsAttenuating() { return *entity->getArgument(4); }
-void IfcSoundProperties::setIsAttenuating(IfcBoolean v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-bool IfcSoundProperties::hasSoundScale() { return !entity->getArgument(5)->isNull(); }
-IfcSoundScaleEnum::IfcSoundScaleEnum IfcSoundProperties::SoundScale() { return IfcSoundScaleEnum::FromString(*entity->getArgument(5)); }
+bool IfcSoundProperties::IsAttenuating() const { return *entity->getArgument(4); }
+void IfcSoundProperties::setIsAttenuating(bool v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+bool IfcSoundProperties::hasSoundScale() const { return !entity->getArgument(5)->isNull(); }
+IfcSoundScaleEnum::IfcSoundScaleEnum IfcSoundProperties::SoundScale() const { return IfcSoundScaleEnum::FromString(*entity->getArgument(5)); }
 void IfcSoundProperties::setSoundScale(IfcSoundScaleEnum::IfcSoundScaleEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v,IfcSoundScaleEnum::ToString(v)); }
-SHARED_PTR< IfcTemplatedEntityList< IfcSoundValue > > IfcSoundProperties::SoundValues() { RETURN_AS_LIST(IfcSoundValue,6) }
-void IfcSoundProperties::setSoundValues(SHARED_PTR< IfcTemplatedEntityList< IfcSoundValue > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v->generalize()); }
+IfcTemplatedEntityList< IfcSoundValue >::ptr IfcSoundProperties::SoundValues() const { IfcEntityList::ptr es = *entity->getArgument(6); return es->as<IfcSoundValue>(); }
+void IfcSoundProperties::setSoundValues(IfcTemplatedEntityList< IfcSoundValue >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v->generalize()); }
 bool IfcSoundProperties::is(Type::Enum v) const { return v == Type::IfcSoundProperties || IfcPropertySetDefinition::is(v); }
 Type::Enum IfcSoundProperties::type() const { return Type::IfcSoundProperties; }
 Type::Enum IfcSoundProperties::Class() { return Type::IfcSoundProperties; }
-IfcSoundProperties::IfcSoundProperties(IfcAbstractEntityPtr e) : IfcPropertySetDefinition((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcSoundProperties)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcSoundProperties::IfcSoundProperties(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, IfcBoolean v5_IsAttenuating, boost::optional< IfcSoundScaleEnum::IfcSoundScaleEnum > v6_SoundScale, SHARED_PTR< IfcTemplatedEntityList< IfcSoundValue > > v7_SoundValues) : IfcPropertySetDefinition((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_IsAttenuating)); if (v6_SoundScale) { e->setArgument(5,*v6_SoundScale,IfcSoundScaleEnum::ToString(*v6_SoundScale)); } else { e->setArgument(5); } e->setArgument(6,(v7_SoundValues)->generalize()); entity = e; EntityBuffer::Add(this); }
+IfcSoundProperties::IfcSoundProperties(IfcAbstractEntity* e) : IfcPropertySetDefinition((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcSoundProperties)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcSoundProperties::IfcSoundProperties(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, bool v5_IsAttenuating, boost::optional< IfcSoundScaleEnum::IfcSoundScaleEnum > v6_SoundScale, IfcTemplatedEntityList< IfcSoundValue >::ptr v7_SoundValues) : IfcPropertySetDefinition((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_IsAttenuating)); if (v6_SoundScale) { e->setArgument(5,*v6_SoundScale,IfcSoundScaleEnum::ToString(*v6_SoundScale)); } else { e->setArgument(5); } e->setArgument(6,(v7_SoundValues)->generalize()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcSoundValue
-bool IfcSoundValue::hasSoundLevelTimeSeries() { return !entity->getArgument(4)->isNull(); }
-IfcTimeSeries* IfcSoundValue::SoundLevelTimeSeries() { return (IfcTimeSeries*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(4))); }
+bool IfcSoundValue::hasSoundLevelTimeSeries() const { return !entity->getArgument(4)->isNull(); }
+IfcTimeSeries* IfcSoundValue::SoundLevelTimeSeries() const { return (IfcTimeSeries*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(4))); }
 void IfcSoundValue::setSoundLevelTimeSeries(IfcTimeSeries* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-IfcFrequencyMeasure IfcSoundValue::Frequency() { return *entity->getArgument(5); }
-void IfcSoundValue::setFrequency(IfcFrequencyMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-bool IfcSoundValue::hasSoundLevelSingleValue() { return !entity->getArgument(6)->isNull(); }
-IfcDerivedMeasureValue IfcSoundValue::SoundLevelSingleValue() { return *entity->getArgument(6); }
-void IfcSoundValue::setSoundLevelSingleValue(IfcDerivedMeasureValue v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
+double IfcSoundValue::Frequency() const { return *entity->getArgument(5); }
+void IfcSoundValue::setFrequency(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+bool IfcSoundValue::hasSoundLevelSingleValue() const { return !entity->getArgument(6)->isNull(); }
+IfcDerivedMeasureValue* IfcSoundValue::SoundLevelSingleValue() const { return (IfcDerivedMeasureValue*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(6))); }
+void IfcSoundValue::setSoundLevelSingleValue(IfcDerivedMeasureValue* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
 bool IfcSoundValue::is(Type::Enum v) const { return v == Type::IfcSoundValue || IfcPropertySetDefinition::is(v); }
 Type::Enum IfcSoundValue::type() const { return Type::IfcSoundValue; }
 Type::Enum IfcSoundValue::Class() { return Type::IfcSoundValue; }
-IfcSoundValue::IfcSoundValue(IfcAbstractEntityPtr e) : IfcPropertySetDefinition((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcSoundValue)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcSoundValue::IfcSoundValue(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, IfcTimeSeries* v5_SoundLevelTimeSeries, IfcFrequencyMeasure v6_Frequency, boost::optional< IfcDerivedMeasureValue > v7_SoundLevelSingleValue) : IfcPropertySetDefinition((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_SoundLevelTimeSeries)); e->setArgument(5,(v6_Frequency)); if (v7_SoundLevelSingleValue) { e->setArgument(6,(*v7_SoundLevelSingleValue)); } else { e->setArgument(6); } entity = e; EntityBuffer::Add(this); }
+IfcSoundValue::IfcSoundValue(IfcAbstractEntity* e) : IfcPropertySetDefinition((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcSoundValue)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcSoundValue::IfcSoundValue(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcTimeSeries* v5_SoundLevelTimeSeries, double v6_Frequency, IfcDerivedMeasureValue* v7_SoundLevelSingleValue) : IfcPropertySetDefinition((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_SoundLevelTimeSeries)); e->setArgument(5,(v6_Frequency)); e->setArgument(6,(v7_SoundLevelSingleValue)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcSpace
-IfcInternalOrExternalEnum::IfcInternalOrExternalEnum IfcSpace::InteriorOrExteriorSpace() { return IfcInternalOrExternalEnum::FromString(*entity->getArgument(9)); }
+IfcInternalOrExternalEnum::IfcInternalOrExternalEnum IfcSpace::InteriorOrExteriorSpace() const { return IfcInternalOrExternalEnum::FromString(*entity->getArgument(9)); }
 void IfcSpace::setInteriorOrExteriorSpace(IfcInternalOrExternalEnum::IfcInternalOrExternalEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcInternalOrExternalEnum::ToString(v)); }
-bool IfcSpace::hasElevationWithFlooring() { return !entity->getArgument(10)->isNull(); }
-IfcLengthMeasure IfcSpace::ElevationWithFlooring() { return *entity->getArgument(10); }
-void IfcSpace::setElevationWithFlooring(IfcLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
-IfcRelCoversSpaces::list IfcSpace::HasCoverings() { RETURN_INVERSE(IfcRelCoversSpaces) }
-IfcRelSpaceBoundary::list IfcSpace::BoundedBy() { RETURN_INVERSE(IfcRelSpaceBoundary) }
+bool IfcSpace::hasElevationWithFlooring() const { return !entity->getArgument(10)->isNull(); }
+double IfcSpace::ElevationWithFlooring() const { return *entity->getArgument(10); }
+void IfcSpace::setElevationWithFlooring(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
+IfcRelCoversSpaces::list::ptr IfcSpace::HasCoverings() const { return entity->getInverse(Type::IfcRelCoversSpaces, 4)->as<IfcRelCoversSpaces>(); }
+IfcRelSpaceBoundary::list::ptr IfcSpace::BoundedBy() const { return entity->getInverse(Type::IfcRelSpaceBoundary, 4)->as<IfcRelSpaceBoundary>(); }
 bool IfcSpace::is(Type::Enum v) const { return v == Type::IfcSpace || IfcSpatialStructureElement::is(v); }
 Type::Enum IfcSpace::type() const { return Type::IfcSpace; }
 Type::Enum IfcSpace::Class() { return Type::IfcSpace; }
-IfcSpace::IfcSpace(IfcAbstractEntityPtr e) : IfcSpatialStructureElement((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcSpace)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcSpace::IfcSpace(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcLabel > v8_LongName, IfcElementCompositionEnum::IfcElementCompositionEnum v9_CompositionType, IfcInternalOrExternalEnum::IfcInternalOrExternalEnum v10_InteriorOrExteriorSpace, boost::optional< IfcLengthMeasure > v11_ElevationWithFlooring) : IfcSpatialStructureElement((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_LongName) { e->setArgument(7,(*v8_LongName)); } else { e->setArgument(7); } e->setArgument(8,v9_CompositionType,IfcElementCompositionEnum::ToString(v9_CompositionType)); e->setArgument(9,v10_InteriorOrExteriorSpace,IfcInternalOrExternalEnum::ToString(v10_InteriorOrExteriorSpace)); if (v11_ElevationWithFlooring) { e->setArgument(10,(*v11_ElevationWithFlooring)); } else { e->setArgument(10); } entity = e; EntityBuffer::Add(this); }
+IfcSpace::IfcSpace(IfcAbstractEntity* e) : IfcSpatialStructureElement((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcSpace)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcSpace::IfcSpace(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_LongName, IfcElementCompositionEnum::IfcElementCompositionEnum v9_CompositionType, IfcInternalOrExternalEnum::IfcInternalOrExternalEnum v10_InteriorOrExteriorSpace, boost::optional< double > v11_ElevationWithFlooring) : IfcSpatialStructureElement((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_LongName) { e->setArgument(7,(*v8_LongName)); } else { e->setArgument(7); } e->setArgument(8,v9_CompositionType,IfcElementCompositionEnum::ToString(v9_CompositionType)); e->setArgument(9,v10_InteriorOrExteriorSpace,IfcInternalOrExternalEnum::ToString(v10_InteriorOrExteriorSpace)); if (v11_ElevationWithFlooring) { e->setArgument(10,(*v11_ElevationWithFlooring)); } else { e->setArgument(10); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcSpaceHeaterType
-IfcSpaceHeaterTypeEnum::IfcSpaceHeaterTypeEnum IfcSpaceHeaterType::PredefinedType() { return IfcSpaceHeaterTypeEnum::FromString(*entity->getArgument(9)); }
+IfcSpaceHeaterTypeEnum::IfcSpaceHeaterTypeEnum IfcSpaceHeaterType::PredefinedType() const { return IfcSpaceHeaterTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcSpaceHeaterType::setPredefinedType(IfcSpaceHeaterTypeEnum::IfcSpaceHeaterTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcSpaceHeaterTypeEnum::ToString(v)); }
 bool IfcSpaceHeaterType::is(Type::Enum v) const { return v == Type::IfcSpaceHeaterType || IfcEnergyConversionDeviceType::is(v); }
 Type::Enum IfcSpaceHeaterType::type() const { return Type::IfcSpaceHeaterType; }
 Type::Enum IfcSpaceHeaterType::Class() { return Type::IfcSpaceHeaterType; }
-IfcSpaceHeaterType::IfcSpaceHeaterType(IfcAbstractEntityPtr e) : IfcEnergyConversionDeviceType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcSpaceHeaterType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcSpaceHeaterType::IfcSpaceHeaterType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcSpaceHeaterTypeEnum::IfcSpaceHeaterTypeEnum v10_PredefinedType) : IfcEnergyConversionDeviceType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcSpaceHeaterTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcSpaceHeaterType::IfcSpaceHeaterType(IfcAbstractEntity* e) : IfcEnergyConversionDeviceType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcSpaceHeaterType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcSpaceHeaterType::IfcSpaceHeaterType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcSpaceHeaterTypeEnum::IfcSpaceHeaterTypeEnum v10_PredefinedType) : IfcEnergyConversionDeviceType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcSpaceHeaterTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcSpaceProgram
-IfcIdentifier IfcSpaceProgram::SpaceProgramIdentifier() { return *entity->getArgument(5); }
-void IfcSpaceProgram::setSpaceProgramIdentifier(IfcIdentifier v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-bool IfcSpaceProgram::hasMaxRequiredArea() { return !entity->getArgument(6)->isNull(); }
-IfcAreaMeasure IfcSpaceProgram::MaxRequiredArea() { return *entity->getArgument(6); }
-void IfcSpaceProgram::setMaxRequiredArea(IfcAreaMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
-bool IfcSpaceProgram::hasMinRequiredArea() { return !entity->getArgument(7)->isNull(); }
-IfcAreaMeasure IfcSpaceProgram::MinRequiredArea() { return *entity->getArgument(7); }
-void IfcSpaceProgram::setMinRequiredArea(IfcAreaMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
-bool IfcSpaceProgram::hasRequestedLocation() { return !entity->getArgument(8)->isNull(); }
-IfcSpatialStructureElement* IfcSpaceProgram::RequestedLocation() { return (IfcSpatialStructureElement*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(8))); }
+std::string IfcSpaceProgram::SpaceProgramIdentifier() const { return *entity->getArgument(5); }
+void IfcSpaceProgram::setSpaceProgramIdentifier(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+bool IfcSpaceProgram::hasMaxRequiredArea() const { return !entity->getArgument(6)->isNull(); }
+double IfcSpaceProgram::MaxRequiredArea() const { return *entity->getArgument(6); }
+void IfcSpaceProgram::setMaxRequiredArea(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
+bool IfcSpaceProgram::hasMinRequiredArea() const { return !entity->getArgument(7)->isNull(); }
+double IfcSpaceProgram::MinRequiredArea() const { return *entity->getArgument(7); }
+void IfcSpaceProgram::setMinRequiredArea(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
+bool IfcSpaceProgram::hasRequestedLocation() const { return !entity->getArgument(8)->isNull(); }
+IfcSpatialStructureElement* IfcSpaceProgram::RequestedLocation() const { return (IfcSpatialStructureElement*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(8))); }
 void IfcSpaceProgram::setRequestedLocation(IfcSpatialStructureElement* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
-IfcAreaMeasure IfcSpaceProgram::StandardRequiredArea() { return *entity->getArgument(9); }
-void IfcSpaceProgram::setStandardRequiredArea(IfcAreaMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
-IfcRelInteractionRequirements::list IfcSpaceProgram::HasInteractionReqsFrom() { RETURN_INVERSE(IfcRelInteractionRequirements) }
-IfcRelInteractionRequirements::list IfcSpaceProgram::HasInteractionReqsTo() { RETURN_INVERSE(IfcRelInteractionRequirements) }
+double IfcSpaceProgram::StandardRequiredArea() const { return *entity->getArgument(9); }
+void IfcSpaceProgram::setStandardRequiredArea(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
+IfcRelInteractionRequirements::list::ptr IfcSpaceProgram::HasInteractionReqsFrom() const { return entity->getInverse(Type::IfcRelInteractionRequirements, 7)->as<IfcRelInteractionRequirements>(); }
+IfcRelInteractionRequirements::list::ptr IfcSpaceProgram::HasInteractionReqsTo() const { return entity->getInverse(Type::IfcRelInteractionRequirements, 8)->as<IfcRelInteractionRequirements>(); }
 bool IfcSpaceProgram::is(Type::Enum v) const { return v == Type::IfcSpaceProgram || IfcControl::is(v); }
 Type::Enum IfcSpaceProgram::type() const { return Type::IfcSpaceProgram; }
 Type::Enum IfcSpaceProgram::Class() { return Type::IfcSpaceProgram; }
-IfcSpaceProgram::IfcSpaceProgram(IfcAbstractEntityPtr e) : IfcControl((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcSpaceProgram)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcSpaceProgram::IfcSpaceProgram(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcIdentifier v6_SpaceProgramIdentifier, boost::optional< IfcAreaMeasure > v7_MaxRequiredArea, boost::optional< IfcAreaMeasure > v8_MinRequiredArea, IfcSpatialStructureElement* v9_RequestedLocation, IfcAreaMeasure v10_StandardRequiredArea) : IfcControl((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_SpaceProgramIdentifier)); if (v7_MaxRequiredArea) { e->setArgument(6,(*v7_MaxRequiredArea)); } else { e->setArgument(6); } if (v8_MinRequiredArea) { e->setArgument(7,(*v8_MinRequiredArea)); } else { e->setArgument(7); } e->setArgument(8,(v9_RequestedLocation)); e->setArgument(9,(v10_StandardRequiredArea)); entity = e; EntityBuffer::Add(this); }
+IfcSpaceProgram::IfcSpaceProgram(IfcAbstractEntity* e) : IfcControl((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcSpaceProgram)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcSpaceProgram::IfcSpaceProgram(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, std::string v6_SpaceProgramIdentifier, boost::optional< double > v7_MaxRequiredArea, boost::optional< double > v8_MinRequiredArea, IfcSpatialStructureElement* v9_RequestedLocation, double v10_StandardRequiredArea) : IfcControl((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_SpaceProgramIdentifier)); if (v7_MaxRequiredArea) { e->setArgument(6,(*v7_MaxRequiredArea)); } else { e->setArgument(6); } if (v8_MinRequiredArea) { e->setArgument(7,(*v8_MinRequiredArea)); } else { e->setArgument(7); } e->setArgument(8,(v9_RequestedLocation)); e->setArgument(9,(v10_StandardRequiredArea)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcSpaceThermalLoadProperties
-bool IfcSpaceThermalLoadProperties::hasApplicableValueRatio() { return !entity->getArgument(4)->isNull(); }
-IfcPositiveRatioMeasure IfcSpaceThermalLoadProperties::ApplicableValueRatio() { return *entity->getArgument(4); }
-void IfcSpaceThermalLoadProperties::setApplicableValueRatio(IfcPositiveRatioMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-IfcThermalLoadSourceEnum::IfcThermalLoadSourceEnum IfcSpaceThermalLoadProperties::ThermalLoadSource() { return IfcThermalLoadSourceEnum::FromString(*entity->getArgument(5)); }
+bool IfcSpaceThermalLoadProperties::hasApplicableValueRatio() const { return !entity->getArgument(4)->isNull(); }
+double IfcSpaceThermalLoadProperties::ApplicableValueRatio() const { return *entity->getArgument(4); }
+void IfcSpaceThermalLoadProperties::setApplicableValueRatio(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+IfcThermalLoadSourceEnum::IfcThermalLoadSourceEnum IfcSpaceThermalLoadProperties::ThermalLoadSource() const { return IfcThermalLoadSourceEnum::FromString(*entity->getArgument(5)); }
 void IfcSpaceThermalLoadProperties::setThermalLoadSource(IfcThermalLoadSourceEnum::IfcThermalLoadSourceEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v,IfcThermalLoadSourceEnum::ToString(v)); }
-IfcPropertySourceEnum::IfcPropertySourceEnum IfcSpaceThermalLoadProperties::PropertySource() { return IfcPropertySourceEnum::FromString(*entity->getArgument(6)); }
+IfcPropertySourceEnum::IfcPropertySourceEnum IfcSpaceThermalLoadProperties::PropertySource() const { return IfcPropertySourceEnum::FromString(*entity->getArgument(6)); }
 void IfcSpaceThermalLoadProperties::setPropertySource(IfcPropertySourceEnum::IfcPropertySourceEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v,IfcPropertySourceEnum::ToString(v)); }
-bool IfcSpaceThermalLoadProperties::hasSourceDescription() { return !entity->getArgument(7)->isNull(); }
-IfcText IfcSpaceThermalLoadProperties::SourceDescription() { return *entity->getArgument(7); }
-void IfcSpaceThermalLoadProperties::setSourceDescription(IfcText v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
-IfcPowerMeasure IfcSpaceThermalLoadProperties::MaximumValue() { return *entity->getArgument(8); }
-void IfcSpaceThermalLoadProperties::setMaximumValue(IfcPowerMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
-bool IfcSpaceThermalLoadProperties::hasMinimumValue() { return !entity->getArgument(9)->isNull(); }
-IfcPowerMeasure IfcSpaceThermalLoadProperties::MinimumValue() { return *entity->getArgument(9); }
-void IfcSpaceThermalLoadProperties::setMinimumValue(IfcPowerMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
-bool IfcSpaceThermalLoadProperties::hasThermalLoadTimeSeriesValues() { return !entity->getArgument(10)->isNull(); }
-IfcTimeSeries* IfcSpaceThermalLoadProperties::ThermalLoadTimeSeriesValues() { return (IfcTimeSeries*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(10))); }
+bool IfcSpaceThermalLoadProperties::hasSourceDescription() const { return !entity->getArgument(7)->isNull(); }
+std::string IfcSpaceThermalLoadProperties::SourceDescription() const { return *entity->getArgument(7); }
+void IfcSpaceThermalLoadProperties::setSourceDescription(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
+double IfcSpaceThermalLoadProperties::MaximumValue() const { return *entity->getArgument(8); }
+void IfcSpaceThermalLoadProperties::setMaximumValue(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
+bool IfcSpaceThermalLoadProperties::hasMinimumValue() const { return !entity->getArgument(9)->isNull(); }
+double IfcSpaceThermalLoadProperties::MinimumValue() const { return *entity->getArgument(9); }
+void IfcSpaceThermalLoadProperties::setMinimumValue(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
+bool IfcSpaceThermalLoadProperties::hasThermalLoadTimeSeriesValues() const { return !entity->getArgument(10)->isNull(); }
+IfcTimeSeries* IfcSpaceThermalLoadProperties::ThermalLoadTimeSeriesValues() const { return (IfcTimeSeries*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(10))); }
 void IfcSpaceThermalLoadProperties::setThermalLoadTimeSeriesValues(IfcTimeSeries* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
-bool IfcSpaceThermalLoadProperties::hasUserDefinedThermalLoadSource() { return !entity->getArgument(11)->isNull(); }
-IfcLabel IfcSpaceThermalLoadProperties::UserDefinedThermalLoadSource() { return *entity->getArgument(11); }
-void IfcSpaceThermalLoadProperties::setUserDefinedThermalLoadSource(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(11,v); }
-bool IfcSpaceThermalLoadProperties::hasUserDefinedPropertySource() { return !entity->getArgument(12)->isNull(); }
-IfcLabel IfcSpaceThermalLoadProperties::UserDefinedPropertySource() { return *entity->getArgument(12); }
-void IfcSpaceThermalLoadProperties::setUserDefinedPropertySource(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(12,v); }
-IfcThermalLoadTypeEnum::IfcThermalLoadTypeEnum IfcSpaceThermalLoadProperties::ThermalLoadType() { return IfcThermalLoadTypeEnum::FromString(*entity->getArgument(13)); }
+bool IfcSpaceThermalLoadProperties::hasUserDefinedThermalLoadSource() const { return !entity->getArgument(11)->isNull(); }
+std::string IfcSpaceThermalLoadProperties::UserDefinedThermalLoadSource() const { return *entity->getArgument(11); }
+void IfcSpaceThermalLoadProperties::setUserDefinedThermalLoadSource(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(11,v); }
+bool IfcSpaceThermalLoadProperties::hasUserDefinedPropertySource() const { return !entity->getArgument(12)->isNull(); }
+std::string IfcSpaceThermalLoadProperties::UserDefinedPropertySource() const { return *entity->getArgument(12); }
+void IfcSpaceThermalLoadProperties::setUserDefinedPropertySource(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(12,v); }
+IfcThermalLoadTypeEnum::IfcThermalLoadTypeEnum IfcSpaceThermalLoadProperties::ThermalLoadType() const { return IfcThermalLoadTypeEnum::FromString(*entity->getArgument(13)); }
 void IfcSpaceThermalLoadProperties::setThermalLoadType(IfcThermalLoadTypeEnum::IfcThermalLoadTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(13,v,IfcThermalLoadTypeEnum::ToString(v)); }
 bool IfcSpaceThermalLoadProperties::is(Type::Enum v) const { return v == Type::IfcSpaceThermalLoadProperties || IfcPropertySetDefinition::is(v); }
 Type::Enum IfcSpaceThermalLoadProperties::type() const { return Type::IfcSpaceThermalLoadProperties; }
 Type::Enum IfcSpaceThermalLoadProperties::Class() { return Type::IfcSpaceThermalLoadProperties; }
-IfcSpaceThermalLoadProperties::IfcSpaceThermalLoadProperties(IfcAbstractEntityPtr e) : IfcPropertySetDefinition((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcSpaceThermalLoadProperties)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcSpaceThermalLoadProperties::IfcSpaceThermalLoadProperties(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcPositiveRatioMeasure > v5_ApplicableValueRatio, IfcThermalLoadSourceEnum::IfcThermalLoadSourceEnum v6_ThermalLoadSource, IfcPropertySourceEnum::IfcPropertySourceEnum v7_PropertySource, boost::optional< IfcText > v8_SourceDescription, IfcPowerMeasure v9_MaximumValue, boost::optional< IfcPowerMeasure > v10_MinimumValue, IfcTimeSeries* v11_ThermalLoadTimeSeriesValues, boost::optional< IfcLabel > v12_UserDefinedThermalLoadSource, boost::optional< IfcLabel > v13_UserDefinedPropertySource, IfcThermalLoadTypeEnum::IfcThermalLoadTypeEnum v14_ThermalLoadType) : IfcPropertySetDefinition((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableValueRatio) { e->setArgument(4,(*v5_ApplicableValueRatio)); } else { e->setArgument(4); } e->setArgument(5,v6_ThermalLoadSource,IfcThermalLoadSourceEnum::ToString(v6_ThermalLoadSource)); e->setArgument(6,v7_PropertySource,IfcPropertySourceEnum::ToString(v7_PropertySource)); if (v8_SourceDescription) { e->setArgument(7,(*v8_SourceDescription)); } else { e->setArgument(7); } e->setArgument(8,(v9_MaximumValue)); if (v10_MinimumValue) { e->setArgument(9,(*v10_MinimumValue)); } else { e->setArgument(9); } e->setArgument(10,(v11_ThermalLoadTimeSeriesValues)); if (v12_UserDefinedThermalLoadSource) { e->setArgument(11,(*v12_UserDefinedThermalLoadSource)); } else { e->setArgument(11); } if (v13_UserDefinedPropertySource) { e->setArgument(12,(*v13_UserDefinedPropertySource)); } else { e->setArgument(12); } e->setArgument(13,v14_ThermalLoadType,IfcThermalLoadTypeEnum::ToString(v14_ThermalLoadType)); entity = e; EntityBuffer::Add(this); }
+IfcSpaceThermalLoadProperties::IfcSpaceThermalLoadProperties(IfcAbstractEntity* e) : IfcPropertySetDefinition((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcSpaceThermalLoadProperties)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcSpaceThermalLoadProperties::IfcSpaceThermalLoadProperties(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< double > v5_ApplicableValueRatio, IfcThermalLoadSourceEnum::IfcThermalLoadSourceEnum v6_ThermalLoadSource, IfcPropertySourceEnum::IfcPropertySourceEnum v7_PropertySource, boost::optional< std::string > v8_SourceDescription, double v9_MaximumValue, boost::optional< double > v10_MinimumValue, IfcTimeSeries* v11_ThermalLoadTimeSeriesValues, boost::optional< std::string > v12_UserDefinedThermalLoadSource, boost::optional< std::string > v13_UserDefinedPropertySource, IfcThermalLoadTypeEnum::IfcThermalLoadTypeEnum v14_ThermalLoadType) : IfcPropertySetDefinition((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableValueRatio) { e->setArgument(4,(*v5_ApplicableValueRatio)); } else { e->setArgument(4); } e->setArgument(5,v6_ThermalLoadSource,IfcThermalLoadSourceEnum::ToString(v6_ThermalLoadSource)); e->setArgument(6,v7_PropertySource,IfcPropertySourceEnum::ToString(v7_PropertySource)); if (v8_SourceDescription) { e->setArgument(7,(*v8_SourceDescription)); } else { e->setArgument(7); } e->setArgument(8,(v9_MaximumValue)); if (v10_MinimumValue) { e->setArgument(9,(*v10_MinimumValue)); } else { e->setArgument(9); } e->setArgument(10,(v11_ThermalLoadTimeSeriesValues)); if (v12_UserDefinedThermalLoadSource) { e->setArgument(11,(*v12_UserDefinedThermalLoadSource)); } else { e->setArgument(11); } if (v13_UserDefinedPropertySource) { e->setArgument(12,(*v13_UserDefinedPropertySource)); } else { e->setArgument(12); } e->setArgument(13,v14_ThermalLoadType,IfcThermalLoadTypeEnum::ToString(v14_ThermalLoadType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcSpaceType
-IfcSpaceTypeEnum::IfcSpaceTypeEnum IfcSpaceType::PredefinedType() { return IfcSpaceTypeEnum::FromString(*entity->getArgument(9)); }
+IfcSpaceTypeEnum::IfcSpaceTypeEnum IfcSpaceType::PredefinedType() const { return IfcSpaceTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcSpaceType::setPredefinedType(IfcSpaceTypeEnum::IfcSpaceTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcSpaceTypeEnum::ToString(v)); }
 bool IfcSpaceType::is(Type::Enum v) const { return v == Type::IfcSpaceType || IfcSpatialStructureElementType::is(v); }
 Type::Enum IfcSpaceType::type() const { return Type::IfcSpaceType; }
 Type::Enum IfcSpaceType::Class() { return Type::IfcSpaceType; }
-IfcSpaceType::IfcSpaceType(IfcAbstractEntityPtr e) : IfcSpatialStructureElementType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcSpaceType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcSpaceType::IfcSpaceType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcSpaceTypeEnum::IfcSpaceTypeEnum v10_PredefinedType) : IfcSpatialStructureElementType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcSpaceTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcSpaceType::IfcSpaceType(IfcAbstractEntity* e) : IfcSpatialStructureElementType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcSpaceType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcSpaceType::IfcSpaceType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcSpaceTypeEnum::IfcSpaceTypeEnum v10_PredefinedType) : IfcSpatialStructureElementType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcSpaceTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcSpatialStructureElement
-bool IfcSpatialStructureElement::hasLongName() { return !entity->getArgument(7)->isNull(); }
-IfcLabel IfcSpatialStructureElement::LongName() { return *entity->getArgument(7); }
-void IfcSpatialStructureElement::setLongName(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
-IfcElementCompositionEnum::IfcElementCompositionEnum IfcSpatialStructureElement::CompositionType() { return IfcElementCompositionEnum::FromString(*entity->getArgument(8)); }
+bool IfcSpatialStructureElement::hasLongName() const { return !entity->getArgument(7)->isNull(); }
+std::string IfcSpatialStructureElement::LongName() const { return *entity->getArgument(7); }
+void IfcSpatialStructureElement::setLongName(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
+IfcElementCompositionEnum::IfcElementCompositionEnum IfcSpatialStructureElement::CompositionType() const { return IfcElementCompositionEnum::FromString(*entity->getArgument(8)); }
 void IfcSpatialStructureElement::setCompositionType(IfcElementCompositionEnum::IfcElementCompositionEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcElementCompositionEnum::ToString(v)); }
-IfcRelReferencedInSpatialStructure::list IfcSpatialStructureElement::ReferencesElements() { RETURN_INVERSE(IfcRelReferencedInSpatialStructure) }
-IfcRelServicesBuildings::list IfcSpatialStructureElement::ServicedBySystems() { RETURN_INVERSE(IfcRelServicesBuildings) }
-IfcRelContainedInSpatialStructure::list IfcSpatialStructureElement::ContainsElements() { RETURN_INVERSE(IfcRelContainedInSpatialStructure) }
+IfcRelReferencedInSpatialStructure::list::ptr IfcSpatialStructureElement::ReferencesElements() const { return entity->getInverse(Type::IfcRelReferencedInSpatialStructure, 5)->as<IfcRelReferencedInSpatialStructure>(); }
+IfcRelServicesBuildings::list::ptr IfcSpatialStructureElement::ServicedBySystems() const { return entity->getInverse(Type::IfcRelServicesBuildings, 5)->as<IfcRelServicesBuildings>(); }
+IfcRelContainedInSpatialStructure::list::ptr IfcSpatialStructureElement::ContainsElements() const { return entity->getInverse(Type::IfcRelContainedInSpatialStructure, 5)->as<IfcRelContainedInSpatialStructure>(); }
 bool IfcSpatialStructureElement::is(Type::Enum v) const { return v == Type::IfcSpatialStructureElement || IfcProduct::is(v); }
 Type::Enum IfcSpatialStructureElement::type() const { return Type::IfcSpatialStructureElement; }
 Type::Enum IfcSpatialStructureElement::Class() { return Type::IfcSpatialStructureElement; }
-IfcSpatialStructureElement::IfcSpatialStructureElement(IfcAbstractEntityPtr e) : IfcProduct((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcSpatialStructureElement)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcSpatialStructureElement::IfcSpatialStructureElement(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcLabel > v8_LongName, IfcElementCompositionEnum::IfcElementCompositionEnum v9_CompositionType) : IfcProduct((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_LongName) { e->setArgument(7,(*v8_LongName)); } else { e->setArgument(7); } e->setArgument(8,v9_CompositionType,IfcElementCompositionEnum::ToString(v9_CompositionType)); entity = e; EntityBuffer::Add(this); }
+IfcSpatialStructureElement::IfcSpatialStructureElement(IfcAbstractEntity* e) : IfcProduct((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcSpatialStructureElement)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcSpatialStructureElement::IfcSpatialStructureElement(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_LongName, IfcElementCompositionEnum::IfcElementCompositionEnum v9_CompositionType) : IfcProduct((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_LongName) { e->setArgument(7,(*v8_LongName)); } else { e->setArgument(7); } e->setArgument(8,v9_CompositionType,IfcElementCompositionEnum::ToString(v9_CompositionType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcSpatialStructureElementType
 bool IfcSpatialStructureElementType::is(Type::Enum v) const { return v == Type::IfcSpatialStructureElementType || IfcElementType::is(v); }
 Type::Enum IfcSpatialStructureElementType::type() const { return Type::IfcSpatialStructureElementType; }
 Type::Enum IfcSpatialStructureElementType::Class() { return Type::IfcSpatialStructureElementType; }
-IfcSpatialStructureElementType::IfcSpatialStructureElementType(IfcAbstractEntityPtr e) : IfcElementType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcSpatialStructureElementType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcSpatialStructureElementType::IfcSpatialStructureElementType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType) : IfcElementType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcSpatialStructureElementType::IfcSpatialStructureElementType(IfcAbstractEntity* e) : IfcElementType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcSpatialStructureElementType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcSpatialStructureElementType::IfcSpatialStructureElementType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType) : IfcElementType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcSphere
-IfcPositiveLengthMeasure IfcSphere::Radius() { return *entity->getArgument(1); }
-void IfcSphere::setRadius(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+double IfcSphere::Radius() const { return *entity->getArgument(1); }
+void IfcSphere::setRadius(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
 bool IfcSphere::is(Type::Enum v) const { return v == Type::IfcSphere || IfcCsgPrimitive3D::is(v); }
 Type::Enum IfcSphere::type() const { return Type::IfcSphere; }
 Type::Enum IfcSphere::Class() { return Type::IfcSphere; }
-IfcSphere::IfcSphere(IfcAbstractEntityPtr e) : IfcCsgPrimitive3D((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcSphere)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcSphere::IfcSphere(IfcAxis2Placement3D* v1_Position, IfcPositiveLengthMeasure v2_Radius) : IfcCsgPrimitive3D((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Position)); e->setArgument(1,(v2_Radius)); entity = e; EntityBuffer::Add(this); }
+IfcSphere::IfcSphere(IfcAbstractEntity* e) : IfcCsgPrimitive3D((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcSphere)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcSphere::IfcSphere(IfcAxis2Placement3D* v1_Position, double v2_Radius) : IfcCsgPrimitive3D((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Position)); e->setArgument(1,(v2_Radius)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcStackTerminalType
-IfcStackTerminalTypeEnum::IfcStackTerminalTypeEnum IfcStackTerminalType::PredefinedType() { return IfcStackTerminalTypeEnum::FromString(*entity->getArgument(9)); }
+IfcStackTerminalTypeEnum::IfcStackTerminalTypeEnum IfcStackTerminalType::PredefinedType() const { return IfcStackTerminalTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcStackTerminalType::setPredefinedType(IfcStackTerminalTypeEnum::IfcStackTerminalTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcStackTerminalTypeEnum::ToString(v)); }
 bool IfcStackTerminalType::is(Type::Enum v) const { return v == Type::IfcStackTerminalType || IfcFlowTerminalType::is(v); }
 Type::Enum IfcStackTerminalType::type() const { return Type::IfcStackTerminalType; }
 Type::Enum IfcStackTerminalType::Class() { return Type::IfcStackTerminalType; }
-IfcStackTerminalType::IfcStackTerminalType(IfcAbstractEntityPtr e) : IfcFlowTerminalType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcStackTerminalType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcStackTerminalType::IfcStackTerminalType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcStackTerminalTypeEnum::IfcStackTerminalTypeEnum v10_PredefinedType) : IfcFlowTerminalType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcStackTerminalTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcStackTerminalType::IfcStackTerminalType(IfcAbstractEntity* e) : IfcFlowTerminalType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcStackTerminalType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcStackTerminalType::IfcStackTerminalType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcStackTerminalTypeEnum::IfcStackTerminalTypeEnum v10_PredefinedType) : IfcFlowTerminalType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcStackTerminalTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcStair
-IfcStairTypeEnum::IfcStairTypeEnum IfcStair::ShapeType() { return IfcStairTypeEnum::FromString(*entity->getArgument(8)); }
+IfcStairTypeEnum::IfcStairTypeEnum IfcStair::ShapeType() const { return IfcStairTypeEnum::FromString(*entity->getArgument(8)); }
 void IfcStair::setShapeType(IfcStairTypeEnum::IfcStairTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcStairTypeEnum::ToString(v)); }
 bool IfcStair::is(Type::Enum v) const { return v == Type::IfcStair || IfcBuildingElement::is(v); }
 Type::Enum IfcStair::type() const { return Type::IfcStair; }
 Type::Enum IfcStair::Class() { return Type::IfcStair; }
-IfcStair::IfcStair(IfcAbstractEntityPtr e) : IfcBuildingElement((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcStair)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcStair::IfcStair(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, IfcStairTypeEnum::IfcStairTypeEnum v9_ShapeType) : IfcBuildingElement((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } e->setArgument(8,v9_ShapeType,IfcStairTypeEnum::ToString(v9_ShapeType)); entity = e; EntityBuffer::Add(this); }
+IfcStair::IfcStair(IfcAbstractEntity* e) : IfcBuildingElement((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcStair)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcStair::IfcStair(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, IfcStairTypeEnum::IfcStairTypeEnum v9_ShapeType) : IfcBuildingElement((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } e->setArgument(8,v9_ShapeType,IfcStairTypeEnum::ToString(v9_ShapeType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcStairFlight
-bool IfcStairFlight::hasNumberOfRiser() { return !entity->getArgument(8)->isNull(); }
-int IfcStairFlight::NumberOfRiser() { return *entity->getArgument(8); }
+bool IfcStairFlight::hasNumberOfRiser() const { return !entity->getArgument(8)->isNull(); }
+int IfcStairFlight::NumberOfRiser() const { return *entity->getArgument(8); }
 void IfcStairFlight::setNumberOfRiser(int v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
-bool IfcStairFlight::hasNumberOfTreads() { return !entity->getArgument(9)->isNull(); }
-int IfcStairFlight::NumberOfTreads() { return *entity->getArgument(9); }
+bool IfcStairFlight::hasNumberOfTreads() const { return !entity->getArgument(9)->isNull(); }
+int IfcStairFlight::NumberOfTreads() const { return *entity->getArgument(9); }
 void IfcStairFlight::setNumberOfTreads(int v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
-bool IfcStairFlight::hasRiserHeight() { return !entity->getArgument(10)->isNull(); }
-IfcPositiveLengthMeasure IfcStairFlight::RiserHeight() { return *entity->getArgument(10); }
-void IfcStairFlight::setRiserHeight(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
-bool IfcStairFlight::hasTreadLength() { return !entity->getArgument(11)->isNull(); }
-IfcPositiveLengthMeasure IfcStairFlight::TreadLength() { return *entity->getArgument(11); }
-void IfcStairFlight::setTreadLength(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(11,v); }
+bool IfcStairFlight::hasRiserHeight() const { return !entity->getArgument(10)->isNull(); }
+double IfcStairFlight::RiserHeight() const { return *entity->getArgument(10); }
+void IfcStairFlight::setRiserHeight(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
+bool IfcStairFlight::hasTreadLength() const { return !entity->getArgument(11)->isNull(); }
+double IfcStairFlight::TreadLength() const { return *entity->getArgument(11); }
+void IfcStairFlight::setTreadLength(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(11,v); }
 bool IfcStairFlight::is(Type::Enum v) const { return v == Type::IfcStairFlight || IfcBuildingElement::is(v); }
 Type::Enum IfcStairFlight::type() const { return Type::IfcStairFlight; }
 Type::Enum IfcStairFlight::Class() { return Type::IfcStairFlight; }
-IfcStairFlight::IfcStairFlight(IfcAbstractEntityPtr e) : IfcBuildingElement((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcStairFlight)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcStairFlight::IfcStairFlight(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< int > v9_NumberOfRiser, boost::optional< int > v10_NumberOfTreads, boost::optional< IfcPositiveLengthMeasure > v11_RiserHeight, boost::optional< IfcPositiveLengthMeasure > v12_TreadLength) : IfcBuildingElement((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_NumberOfRiser) { e->setArgument(8,(*v9_NumberOfRiser)); } else { e->setArgument(8); } if (v10_NumberOfTreads) { e->setArgument(9,(*v10_NumberOfTreads)); } else { e->setArgument(9); } if (v11_RiserHeight) { e->setArgument(10,(*v11_RiserHeight)); } else { e->setArgument(10); } if (v12_TreadLength) { e->setArgument(11,(*v12_TreadLength)); } else { e->setArgument(11); } entity = e; EntityBuffer::Add(this); }
+IfcStairFlight::IfcStairFlight(IfcAbstractEntity* e) : IfcBuildingElement((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcStairFlight)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcStairFlight::IfcStairFlight(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< int > v9_NumberOfRiser, boost::optional< int > v10_NumberOfTreads, boost::optional< double > v11_RiserHeight, boost::optional< double > v12_TreadLength) : IfcBuildingElement((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_NumberOfRiser) { e->setArgument(8,(*v9_NumberOfRiser)); } else { e->setArgument(8); } if (v10_NumberOfTreads) { e->setArgument(9,(*v10_NumberOfTreads)); } else { e->setArgument(9); } if (v11_RiserHeight) { e->setArgument(10,(*v11_RiserHeight)); } else { e->setArgument(10); } if (v12_TreadLength) { e->setArgument(11,(*v12_TreadLength)); } else { e->setArgument(11); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcStairFlightType
-IfcStairFlightTypeEnum::IfcStairFlightTypeEnum IfcStairFlightType::PredefinedType() { return IfcStairFlightTypeEnum::FromString(*entity->getArgument(9)); }
+IfcStairFlightTypeEnum::IfcStairFlightTypeEnum IfcStairFlightType::PredefinedType() const { return IfcStairFlightTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcStairFlightType::setPredefinedType(IfcStairFlightTypeEnum::IfcStairFlightTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcStairFlightTypeEnum::ToString(v)); }
 bool IfcStairFlightType::is(Type::Enum v) const { return v == Type::IfcStairFlightType || IfcBuildingElementType::is(v); }
 Type::Enum IfcStairFlightType::type() const { return Type::IfcStairFlightType; }
 Type::Enum IfcStairFlightType::Class() { return Type::IfcStairFlightType; }
-IfcStairFlightType::IfcStairFlightType(IfcAbstractEntityPtr e) : IfcBuildingElementType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcStairFlightType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcStairFlightType::IfcStairFlightType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcStairFlightTypeEnum::IfcStairFlightTypeEnum v10_PredefinedType) : IfcBuildingElementType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcStairFlightTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcStairFlightType::IfcStairFlightType(IfcAbstractEntity* e) : IfcBuildingElementType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcStairFlightType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcStairFlightType::IfcStairFlightType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcStairFlightTypeEnum::IfcStairFlightTypeEnum v10_PredefinedType) : IfcBuildingElementType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcStairFlightTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcStructuralAction
-bool IfcStructuralAction::DestabilizingLoad() { return *entity->getArgument(9); }
+bool IfcStructuralAction::DestabilizingLoad() const { return *entity->getArgument(9); }
 void IfcStructuralAction::setDestabilizingLoad(bool v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
-bool IfcStructuralAction::hasCausedBy() { return !entity->getArgument(10)->isNull(); }
-IfcStructuralReaction* IfcStructuralAction::CausedBy() { return (IfcStructuralReaction*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(10))); }
+bool IfcStructuralAction::hasCausedBy() const { return !entity->getArgument(10)->isNull(); }
+IfcStructuralReaction* IfcStructuralAction::CausedBy() const { return (IfcStructuralReaction*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(10))); }
 void IfcStructuralAction::setCausedBy(IfcStructuralReaction* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
 bool IfcStructuralAction::is(Type::Enum v) const { return v == Type::IfcStructuralAction || IfcStructuralActivity::is(v); }
 Type::Enum IfcStructuralAction::type() const { return Type::IfcStructuralAction; }
 Type::Enum IfcStructuralAction::Class() { return Type::IfcStructuralAction; }
-IfcStructuralAction::IfcStructuralAction(IfcAbstractEntityPtr e) : IfcStructuralActivity((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcStructuralAction)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcStructuralAction::IfcStructuralAction(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcStructuralLoad* v8_AppliedLoad, IfcGlobalOrLocalEnum::IfcGlobalOrLocalEnum v9_GlobalOrLocal, bool v10_DestabilizingLoad, IfcStructuralReaction* v11_CausedBy) : IfcStructuralActivity((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); e->setArgument(7,(v8_AppliedLoad)); e->setArgument(8,v9_GlobalOrLocal,IfcGlobalOrLocalEnum::ToString(v9_GlobalOrLocal)); e->setArgument(9,(v10_DestabilizingLoad)); e->setArgument(10,(v11_CausedBy)); entity = e; EntityBuffer::Add(this); }
+IfcStructuralAction::IfcStructuralAction(IfcAbstractEntity* e) : IfcStructuralActivity((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcStructuralAction)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcStructuralAction::IfcStructuralAction(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcStructuralLoad* v8_AppliedLoad, IfcGlobalOrLocalEnum::IfcGlobalOrLocalEnum v9_GlobalOrLocal, bool v10_DestabilizingLoad, IfcStructuralReaction* v11_CausedBy) : IfcStructuralActivity((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); e->setArgument(7,(v8_AppliedLoad)); e->setArgument(8,v9_GlobalOrLocal,IfcGlobalOrLocalEnum::ToString(v9_GlobalOrLocal)); e->setArgument(9,(v10_DestabilizingLoad)); e->setArgument(10,(v11_CausedBy)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcStructuralActivity
-IfcStructuralLoad* IfcStructuralActivity::AppliedLoad() { return (IfcStructuralLoad*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(7))); }
+IfcStructuralLoad* IfcStructuralActivity::AppliedLoad() const { return (IfcStructuralLoad*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(7))); }
 void IfcStructuralActivity::setAppliedLoad(IfcStructuralLoad* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
-IfcGlobalOrLocalEnum::IfcGlobalOrLocalEnum IfcStructuralActivity::GlobalOrLocal() { return IfcGlobalOrLocalEnum::FromString(*entity->getArgument(8)); }
+IfcGlobalOrLocalEnum::IfcGlobalOrLocalEnum IfcStructuralActivity::GlobalOrLocal() const { return IfcGlobalOrLocalEnum::FromString(*entity->getArgument(8)); }
 void IfcStructuralActivity::setGlobalOrLocal(IfcGlobalOrLocalEnum::IfcGlobalOrLocalEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcGlobalOrLocalEnum::ToString(v)); }
-IfcRelConnectsStructuralActivity::list IfcStructuralActivity::AssignedToStructuralItem() { RETURN_INVERSE(IfcRelConnectsStructuralActivity) }
+IfcRelConnectsStructuralActivity::list::ptr IfcStructuralActivity::AssignedToStructuralItem() const { return entity->getInverse(Type::IfcRelConnectsStructuralActivity, 5)->as<IfcRelConnectsStructuralActivity>(); }
 bool IfcStructuralActivity::is(Type::Enum v) const { return v == Type::IfcStructuralActivity || IfcProduct::is(v); }
 Type::Enum IfcStructuralActivity::type() const { return Type::IfcStructuralActivity; }
 Type::Enum IfcStructuralActivity::Class() { return Type::IfcStructuralActivity; }
-IfcStructuralActivity::IfcStructuralActivity(IfcAbstractEntityPtr e) : IfcProduct((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcStructuralActivity)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcStructuralActivity::IfcStructuralActivity(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcStructuralLoad* v8_AppliedLoad, IfcGlobalOrLocalEnum::IfcGlobalOrLocalEnum v9_GlobalOrLocal) : IfcProduct((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); e->setArgument(7,(v8_AppliedLoad)); e->setArgument(8,v9_GlobalOrLocal,IfcGlobalOrLocalEnum::ToString(v9_GlobalOrLocal)); entity = e; EntityBuffer::Add(this); }
+IfcStructuralActivity::IfcStructuralActivity(IfcAbstractEntity* e) : IfcProduct((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcStructuralActivity)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcStructuralActivity::IfcStructuralActivity(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcStructuralLoad* v8_AppliedLoad, IfcGlobalOrLocalEnum::IfcGlobalOrLocalEnum v9_GlobalOrLocal) : IfcProduct((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); e->setArgument(7,(v8_AppliedLoad)); e->setArgument(8,v9_GlobalOrLocal,IfcGlobalOrLocalEnum::ToString(v9_GlobalOrLocal)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcStructuralAnalysisModel
-IfcAnalysisModelTypeEnum::IfcAnalysisModelTypeEnum IfcStructuralAnalysisModel::PredefinedType() { return IfcAnalysisModelTypeEnum::FromString(*entity->getArgument(5)); }
+IfcAnalysisModelTypeEnum::IfcAnalysisModelTypeEnum IfcStructuralAnalysisModel::PredefinedType() const { return IfcAnalysisModelTypeEnum::FromString(*entity->getArgument(5)); }
 void IfcStructuralAnalysisModel::setPredefinedType(IfcAnalysisModelTypeEnum::IfcAnalysisModelTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v,IfcAnalysisModelTypeEnum::ToString(v)); }
-bool IfcStructuralAnalysisModel::hasOrientationOf2DPlane() { return !entity->getArgument(6)->isNull(); }
-IfcAxis2Placement3D* IfcStructuralAnalysisModel::OrientationOf2DPlane() { return (IfcAxis2Placement3D*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(6))); }
+bool IfcStructuralAnalysisModel::hasOrientationOf2DPlane() const { return !entity->getArgument(6)->isNull(); }
+IfcAxis2Placement3D* IfcStructuralAnalysisModel::OrientationOf2DPlane() const { return (IfcAxis2Placement3D*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(6))); }
 void IfcStructuralAnalysisModel::setOrientationOf2DPlane(IfcAxis2Placement3D* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
-bool IfcStructuralAnalysisModel::hasLoadedBy() { return !entity->getArgument(7)->isNull(); }
-SHARED_PTR< IfcTemplatedEntityList< IfcStructuralLoadGroup > > IfcStructuralAnalysisModel::LoadedBy() { RETURN_AS_LIST(IfcStructuralLoadGroup,7) }
-void IfcStructuralAnalysisModel::setLoadedBy(SHARED_PTR< IfcTemplatedEntityList< IfcStructuralLoadGroup > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v->generalize()); }
-bool IfcStructuralAnalysisModel::hasHasResults() { return !entity->getArgument(8)->isNull(); }
-SHARED_PTR< IfcTemplatedEntityList< IfcStructuralResultGroup > > IfcStructuralAnalysisModel::HasResults() { RETURN_AS_LIST(IfcStructuralResultGroup,8) }
-void IfcStructuralAnalysisModel::setHasResults(SHARED_PTR< IfcTemplatedEntityList< IfcStructuralResultGroup > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v->generalize()); }
+bool IfcStructuralAnalysisModel::hasLoadedBy() const { return !entity->getArgument(7)->isNull(); }
+IfcTemplatedEntityList< IfcStructuralLoadGroup >::ptr IfcStructuralAnalysisModel::LoadedBy() const { IfcEntityList::ptr es = *entity->getArgument(7); return es->as<IfcStructuralLoadGroup>(); }
+void IfcStructuralAnalysisModel::setLoadedBy(IfcTemplatedEntityList< IfcStructuralLoadGroup >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v->generalize()); }
+bool IfcStructuralAnalysisModel::hasHasResults() const { return !entity->getArgument(8)->isNull(); }
+IfcTemplatedEntityList< IfcStructuralResultGroup >::ptr IfcStructuralAnalysisModel::HasResults() const { IfcEntityList::ptr es = *entity->getArgument(8); return es->as<IfcStructuralResultGroup>(); }
+void IfcStructuralAnalysisModel::setHasResults(IfcTemplatedEntityList< IfcStructuralResultGroup >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v->generalize()); }
 bool IfcStructuralAnalysisModel::is(Type::Enum v) const { return v == Type::IfcStructuralAnalysisModel || IfcSystem::is(v); }
 Type::Enum IfcStructuralAnalysisModel::type() const { return Type::IfcStructuralAnalysisModel; }
 Type::Enum IfcStructuralAnalysisModel::Class() { return Type::IfcStructuralAnalysisModel; }
-IfcStructuralAnalysisModel::IfcStructuralAnalysisModel(IfcAbstractEntityPtr e) : IfcSystem((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcStructuralAnalysisModel)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcStructuralAnalysisModel::IfcStructuralAnalysisModel(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcAnalysisModelTypeEnum::IfcAnalysisModelTypeEnum v6_PredefinedType, IfcAxis2Placement3D* v7_OrientationOf2DPlane, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcStructuralLoadGroup > > > v8_LoadedBy, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcStructuralResultGroup > > > v9_HasResults) : IfcSystem((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,v6_PredefinedType,IfcAnalysisModelTypeEnum::ToString(v6_PredefinedType)); e->setArgument(6,(v7_OrientationOf2DPlane)); if (v8_LoadedBy) { e->setArgument(7,(*v8_LoadedBy)->generalize()); } else { e->setArgument(7); } if (v9_HasResults) { e->setArgument(8,(*v9_HasResults)->generalize()); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcStructuralAnalysisModel::IfcStructuralAnalysisModel(IfcAbstractEntity* e) : IfcSystem((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcStructuralAnalysisModel)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcStructuralAnalysisModel::IfcStructuralAnalysisModel(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcAnalysisModelTypeEnum::IfcAnalysisModelTypeEnum v6_PredefinedType, IfcAxis2Placement3D* v7_OrientationOf2DPlane, boost::optional< IfcTemplatedEntityList< IfcStructuralLoadGroup >::ptr > v8_LoadedBy, boost::optional< IfcTemplatedEntityList< IfcStructuralResultGroup >::ptr > v9_HasResults) : IfcSystem((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,v6_PredefinedType,IfcAnalysisModelTypeEnum::ToString(v6_PredefinedType)); e->setArgument(6,(v7_OrientationOf2DPlane)); if (v8_LoadedBy) { e->setArgument(7,(*v8_LoadedBy)->generalize()); } else { e->setArgument(7); } if (v9_HasResults) { e->setArgument(8,(*v9_HasResults)->generalize()); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcStructuralConnection
-bool IfcStructuralConnection::hasAppliedCondition() { return !entity->getArgument(7)->isNull(); }
-IfcBoundaryCondition* IfcStructuralConnection::AppliedCondition() { return (IfcBoundaryCondition*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(7))); }
+bool IfcStructuralConnection::hasAppliedCondition() const { return !entity->getArgument(7)->isNull(); }
+IfcBoundaryCondition* IfcStructuralConnection::AppliedCondition() const { return (IfcBoundaryCondition*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(7))); }
 void IfcStructuralConnection::setAppliedCondition(IfcBoundaryCondition* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
-IfcRelConnectsStructuralMember::list IfcStructuralConnection::ConnectsStructuralMembers() { RETURN_INVERSE(IfcRelConnectsStructuralMember) }
+IfcRelConnectsStructuralMember::list::ptr IfcStructuralConnection::ConnectsStructuralMembers() const { return entity->getInverse(Type::IfcRelConnectsStructuralMember, 5)->as<IfcRelConnectsStructuralMember>(); }
 bool IfcStructuralConnection::is(Type::Enum v) const { return v == Type::IfcStructuralConnection || IfcStructuralItem::is(v); }
 Type::Enum IfcStructuralConnection::type() const { return Type::IfcStructuralConnection; }
 Type::Enum IfcStructuralConnection::Class() { return Type::IfcStructuralConnection; }
-IfcStructuralConnection::IfcStructuralConnection(IfcAbstractEntityPtr e) : IfcStructuralItem((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcStructuralConnection)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcStructuralConnection::IfcStructuralConnection(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcBoundaryCondition* v8_AppliedCondition) : IfcStructuralItem((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); e->setArgument(7,(v8_AppliedCondition)); entity = e; EntityBuffer::Add(this); }
+IfcStructuralConnection::IfcStructuralConnection(IfcAbstractEntity* e) : IfcStructuralItem((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcStructuralConnection)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcStructuralConnection::IfcStructuralConnection(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcBoundaryCondition* v8_AppliedCondition) : IfcStructuralItem((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); e->setArgument(7,(v8_AppliedCondition)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcStructuralConnectionCondition
-bool IfcStructuralConnectionCondition::hasName() { return !entity->getArgument(0)->isNull(); }
-IfcLabel IfcStructuralConnectionCondition::Name() { return *entity->getArgument(0); }
-void IfcStructuralConnectionCondition::setName(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+bool IfcStructuralConnectionCondition::hasName() const { return !entity->getArgument(0)->isNull(); }
+std::string IfcStructuralConnectionCondition::Name() const { return *entity->getArgument(0); }
+void IfcStructuralConnectionCondition::setName(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
 bool IfcStructuralConnectionCondition::is(Type::Enum v) const { return v == Type::IfcStructuralConnectionCondition; }
 Type::Enum IfcStructuralConnectionCondition::type() const { return Type::IfcStructuralConnectionCondition; }
 Type::Enum IfcStructuralConnectionCondition::Class() { return Type::IfcStructuralConnectionCondition; }
-IfcStructuralConnectionCondition::IfcStructuralConnectionCondition(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcStructuralConnectionCondition)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcStructuralConnectionCondition::IfcStructuralConnectionCondition(boost::optional< IfcLabel > v1_Name) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } entity = e; EntityBuffer::Add(this); }
+IfcStructuralConnectionCondition::IfcStructuralConnectionCondition(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcStructuralConnectionCondition)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcStructuralConnectionCondition::IfcStructuralConnectionCondition(boost::optional< std::string > v1_Name) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcStructuralCurveConnection
 bool IfcStructuralCurveConnection::is(Type::Enum v) const { return v == Type::IfcStructuralCurveConnection || IfcStructuralConnection::is(v); }
 Type::Enum IfcStructuralCurveConnection::type() const { return Type::IfcStructuralCurveConnection; }
 Type::Enum IfcStructuralCurveConnection::Class() { return Type::IfcStructuralCurveConnection; }
-IfcStructuralCurveConnection::IfcStructuralCurveConnection(IfcAbstractEntityPtr e) : IfcStructuralConnection((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcStructuralCurveConnection)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcStructuralCurveConnection::IfcStructuralCurveConnection(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcBoundaryCondition* v8_AppliedCondition) : IfcStructuralConnection((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); e->setArgument(7,(v8_AppliedCondition)); entity = e; EntityBuffer::Add(this); }
+IfcStructuralCurveConnection::IfcStructuralCurveConnection(IfcAbstractEntity* e) : IfcStructuralConnection((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcStructuralCurveConnection)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcStructuralCurveConnection::IfcStructuralCurveConnection(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcBoundaryCondition* v8_AppliedCondition) : IfcStructuralConnection((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); e->setArgument(7,(v8_AppliedCondition)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcStructuralCurveMember
-IfcStructuralCurveTypeEnum::IfcStructuralCurveTypeEnum IfcStructuralCurveMember::PredefinedType() { return IfcStructuralCurveTypeEnum::FromString(*entity->getArgument(7)); }
+IfcStructuralCurveTypeEnum::IfcStructuralCurveTypeEnum IfcStructuralCurveMember::PredefinedType() const { return IfcStructuralCurveTypeEnum::FromString(*entity->getArgument(7)); }
 void IfcStructuralCurveMember::setPredefinedType(IfcStructuralCurveTypeEnum::IfcStructuralCurveTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v,IfcStructuralCurveTypeEnum::ToString(v)); }
 bool IfcStructuralCurveMember::is(Type::Enum v) const { return v == Type::IfcStructuralCurveMember || IfcStructuralMember::is(v); }
 Type::Enum IfcStructuralCurveMember::type() const { return Type::IfcStructuralCurveMember; }
 Type::Enum IfcStructuralCurveMember::Class() { return Type::IfcStructuralCurveMember; }
-IfcStructuralCurveMember::IfcStructuralCurveMember(IfcAbstractEntityPtr e) : IfcStructuralMember((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcStructuralCurveMember)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcStructuralCurveMember::IfcStructuralCurveMember(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcStructuralCurveTypeEnum::IfcStructuralCurveTypeEnum v8_PredefinedType) : IfcStructuralMember((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); e->setArgument(7,v8_PredefinedType,IfcStructuralCurveTypeEnum::ToString(v8_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcStructuralCurveMember::IfcStructuralCurveMember(IfcAbstractEntity* e) : IfcStructuralMember((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcStructuralCurveMember)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcStructuralCurveMember::IfcStructuralCurveMember(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcStructuralCurveTypeEnum::IfcStructuralCurveTypeEnum v8_PredefinedType) : IfcStructuralMember((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); e->setArgument(7,v8_PredefinedType,IfcStructuralCurveTypeEnum::ToString(v8_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcStructuralCurveMemberVarying
 bool IfcStructuralCurveMemberVarying::is(Type::Enum v) const { return v == Type::IfcStructuralCurveMemberVarying || IfcStructuralCurveMember::is(v); }
 Type::Enum IfcStructuralCurveMemberVarying::type() const { return Type::IfcStructuralCurveMemberVarying; }
 Type::Enum IfcStructuralCurveMemberVarying::Class() { return Type::IfcStructuralCurveMemberVarying; }
-IfcStructuralCurveMemberVarying::IfcStructuralCurveMemberVarying(IfcAbstractEntityPtr e) : IfcStructuralCurveMember((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcStructuralCurveMemberVarying)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcStructuralCurveMemberVarying::IfcStructuralCurveMemberVarying(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcStructuralCurveTypeEnum::IfcStructuralCurveTypeEnum v8_PredefinedType) : IfcStructuralCurveMember((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); e->setArgument(7,v8_PredefinedType,IfcStructuralCurveTypeEnum::ToString(v8_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcStructuralCurveMemberVarying::IfcStructuralCurveMemberVarying(IfcAbstractEntity* e) : IfcStructuralCurveMember((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcStructuralCurveMemberVarying)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcStructuralCurveMemberVarying::IfcStructuralCurveMemberVarying(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcStructuralCurveTypeEnum::IfcStructuralCurveTypeEnum v8_PredefinedType) : IfcStructuralCurveMember((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); e->setArgument(7,v8_PredefinedType,IfcStructuralCurveTypeEnum::ToString(v8_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcStructuralItem
-IfcRelConnectsStructuralActivity::list IfcStructuralItem::AssignedStructuralActivity() { RETURN_INVERSE(IfcRelConnectsStructuralActivity) }
+IfcRelConnectsStructuralActivity::list::ptr IfcStructuralItem::AssignedStructuralActivity() const { return entity->getInverse(Type::IfcRelConnectsStructuralActivity, 4)->as<IfcRelConnectsStructuralActivity>(); }
 bool IfcStructuralItem::is(Type::Enum v) const { return v == Type::IfcStructuralItem || IfcProduct::is(v); }
 Type::Enum IfcStructuralItem::type() const { return Type::IfcStructuralItem; }
 Type::Enum IfcStructuralItem::Class() { return Type::IfcStructuralItem; }
-IfcStructuralItem::IfcStructuralItem(IfcAbstractEntityPtr e) : IfcProduct((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcStructuralItem)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcStructuralItem::IfcStructuralItem(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation) : IfcProduct((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); entity = e; EntityBuffer::Add(this); }
+IfcStructuralItem::IfcStructuralItem(IfcAbstractEntity* e) : IfcProduct((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcStructuralItem)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcStructuralItem::IfcStructuralItem(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation) : IfcProduct((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcStructuralLinearAction
-IfcProjectedOrTrueLengthEnum::IfcProjectedOrTrueLengthEnum IfcStructuralLinearAction::ProjectedOrTrue() { return IfcProjectedOrTrueLengthEnum::FromString(*entity->getArgument(11)); }
+IfcProjectedOrTrueLengthEnum::IfcProjectedOrTrueLengthEnum IfcStructuralLinearAction::ProjectedOrTrue() const { return IfcProjectedOrTrueLengthEnum::FromString(*entity->getArgument(11)); }
 void IfcStructuralLinearAction::setProjectedOrTrue(IfcProjectedOrTrueLengthEnum::IfcProjectedOrTrueLengthEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(11,v,IfcProjectedOrTrueLengthEnum::ToString(v)); }
 bool IfcStructuralLinearAction::is(Type::Enum v) const { return v == Type::IfcStructuralLinearAction || IfcStructuralAction::is(v); }
 Type::Enum IfcStructuralLinearAction::type() const { return Type::IfcStructuralLinearAction; }
 Type::Enum IfcStructuralLinearAction::Class() { return Type::IfcStructuralLinearAction; }
-IfcStructuralLinearAction::IfcStructuralLinearAction(IfcAbstractEntityPtr e) : IfcStructuralAction((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcStructuralLinearAction)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcStructuralLinearAction::IfcStructuralLinearAction(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcStructuralLoad* v8_AppliedLoad, IfcGlobalOrLocalEnum::IfcGlobalOrLocalEnum v9_GlobalOrLocal, bool v10_DestabilizingLoad, IfcStructuralReaction* v11_CausedBy, IfcProjectedOrTrueLengthEnum::IfcProjectedOrTrueLengthEnum v12_ProjectedOrTrue) : IfcStructuralAction((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); e->setArgument(7,(v8_AppliedLoad)); e->setArgument(8,v9_GlobalOrLocal,IfcGlobalOrLocalEnum::ToString(v9_GlobalOrLocal)); e->setArgument(9,(v10_DestabilizingLoad)); e->setArgument(10,(v11_CausedBy)); e->setArgument(11,v12_ProjectedOrTrue,IfcProjectedOrTrueLengthEnum::ToString(v12_ProjectedOrTrue)); entity = e; EntityBuffer::Add(this); }
+IfcStructuralLinearAction::IfcStructuralLinearAction(IfcAbstractEntity* e) : IfcStructuralAction((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcStructuralLinearAction)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcStructuralLinearAction::IfcStructuralLinearAction(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcStructuralLoad* v8_AppliedLoad, IfcGlobalOrLocalEnum::IfcGlobalOrLocalEnum v9_GlobalOrLocal, bool v10_DestabilizingLoad, IfcStructuralReaction* v11_CausedBy, IfcProjectedOrTrueLengthEnum::IfcProjectedOrTrueLengthEnum v12_ProjectedOrTrue) : IfcStructuralAction((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); e->setArgument(7,(v8_AppliedLoad)); e->setArgument(8,v9_GlobalOrLocal,IfcGlobalOrLocalEnum::ToString(v9_GlobalOrLocal)); e->setArgument(9,(v10_DestabilizingLoad)); e->setArgument(10,(v11_CausedBy)); e->setArgument(11,v12_ProjectedOrTrue,IfcProjectedOrTrueLengthEnum::ToString(v12_ProjectedOrTrue)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcStructuralLinearActionVarying
-IfcShapeAspect* IfcStructuralLinearActionVarying::VaryingAppliedLoadLocation() { return (IfcShapeAspect*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(12))); }
+IfcShapeAspect* IfcStructuralLinearActionVarying::VaryingAppliedLoadLocation() const { return (IfcShapeAspect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(12))); }
 void IfcStructuralLinearActionVarying::setVaryingAppliedLoadLocation(IfcShapeAspect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(12,v); }
-SHARED_PTR< IfcTemplatedEntityList< IfcStructuralLoad > > IfcStructuralLinearActionVarying::SubsequentAppliedLoads() { RETURN_AS_LIST(IfcStructuralLoad,13) }
-void IfcStructuralLinearActionVarying::setSubsequentAppliedLoads(SHARED_PTR< IfcTemplatedEntityList< IfcStructuralLoad > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(13,v->generalize()); }
+IfcTemplatedEntityList< IfcStructuralLoad >::ptr IfcStructuralLinearActionVarying::SubsequentAppliedLoads() const { IfcEntityList::ptr es = *entity->getArgument(13); return es->as<IfcStructuralLoad>(); }
+void IfcStructuralLinearActionVarying::setSubsequentAppliedLoads(IfcTemplatedEntityList< IfcStructuralLoad >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(13,v->generalize()); }
 bool IfcStructuralLinearActionVarying::is(Type::Enum v) const { return v == Type::IfcStructuralLinearActionVarying || IfcStructuralLinearAction::is(v); }
 Type::Enum IfcStructuralLinearActionVarying::type() const { return Type::IfcStructuralLinearActionVarying; }
 Type::Enum IfcStructuralLinearActionVarying::Class() { return Type::IfcStructuralLinearActionVarying; }
-IfcStructuralLinearActionVarying::IfcStructuralLinearActionVarying(IfcAbstractEntityPtr e) : IfcStructuralLinearAction((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcStructuralLinearActionVarying)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcStructuralLinearActionVarying::IfcStructuralLinearActionVarying(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcStructuralLoad* v8_AppliedLoad, IfcGlobalOrLocalEnum::IfcGlobalOrLocalEnum v9_GlobalOrLocal, bool v10_DestabilizingLoad, IfcStructuralReaction* v11_CausedBy, IfcProjectedOrTrueLengthEnum::IfcProjectedOrTrueLengthEnum v12_ProjectedOrTrue, IfcShapeAspect* v13_VaryingAppliedLoadLocation, SHARED_PTR< IfcTemplatedEntityList< IfcStructuralLoad > > v14_SubsequentAppliedLoads) : IfcStructuralLinearAction((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); e->setArgument(7,(v8_AppliedLoad)); e->setArgument(8,v9_GlobalOrLocal,IfcGlobalOrLocalEnum::ToString(v9_GlobalOrLocal)); e->setArgument(9,(v10_DestabilizingLoad)); e->setArgument(10,(v11_CausedBy)); e->setArgument(11,v12_ProjectedOrTrue,IfcProjectedOrTrueLengthEnum::ToString(v12_ProjectedOrTrue)); e->setArgument(12,(v13_VaryingAppliedLoadLocation)); e->setArgument(13,(v14_SubsequentAppliedLoads)->generalize()); entity = e; EntityBuffer::Add(this); }
+IfcStructuralLinearActionVarying::IfcStructuralLinearActionVarying(IfcAbstractEntity* e) : IfcStructuralLinearAction((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcStructuralLinearActionVarying)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcStructuralLinearActionVarying::IfcStructuralLinearActionVarying(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcStructuralLoad* v8_AppliedLoad, IfcGlobalOrLocalEnum::IfcGlobalOrLocalEnum v9_GlobalOrLocal, bool v10_DestabilizingLoad, IfcStructuralReaction* v11_CausedBy, IfcProjectedOrTrueLengthEnum::IfcProjectedOrTrueLengthEnum v12_ProjectedOrTrue, IfcShapeAspect* v13_VaryingAppliedLoadLocation, IfcTemplatedEntityList< IfcStructuralLoad >::ptr v14_SubsequentAppliedLoads) : IfcStructuralLinearAction((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); e->setArgument(7,(v8_AppliedLoad)); e->setArgument(8,v9_GlobalOrLocal,IfcGlobalOrLocalEnum::ToString(v9_GlobalOrLocal)); e->setArgument(9,(v10_DestabilizingLoad)); e->setArgument(10,(v11_CausedBy)); e->setArgument(11,v12_ProjectedOrTrue,IfcProjectedOrTrueLengthEnum::ToString(v12_ProjectedOrTrue)); e->setArgument(12,(v13_VaryingAppliedLoadLocation)); e->setArgument(13,(v14_SubsequentAppliedLoads)->generalize()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcStructuralLoad
-bool IfcStructuralLoad::hasName() { return !entity->getArgument(0)->isNull(); }
-IfcLabel IfcStructuralLoad::Name() { return *entity->getArgument(0); }
-void IfcStructuralLoad::setName(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+bool IfcStructuralLoad::hasName() const { return !entity->getArgument(0)->isNull(); }
+std::string IfcStructuralLoad::Name() const { return *entity->getArgument(0); }
+void IfcStructuralLoad::setName(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
 bool IfcStructuralLoad::is(Type::Enum v) const { return v == Type::IfcStructuralLoad; }
 Type::Enum IfcStructuralLoad::type() const { return Type::IfcStructuralLoad; }
 Type::Enum IfcStructuralLoad::Class() { return Type::IfcStructuralLoad; }
-IfcStructuralLoad::IfcStructuralLoad(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcStructuralLoad)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcStructuralLoad::IfcStructuralLoad(boost::optional< IfcLabel > v1_Name) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } entity = e; EntityBuffer::Add(this); }
+IfcStructuralLoad::IfcStructuralLoad(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcStructuralLoad)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcStructuralLoad::IfcStructuralLoad(boost::optional< std::string > v1_Name) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcStructuralLoadGroup
-IfcLoadGroupTypeEnum::IfcLoadGroupTypeEnum IfcStructuralLoadGroup::PredefinedType() { return IfcLoadGroupTypeEnum::FromString(*entity->getArgument(5)); }
+IfcLoadGroupTypeEnum::IfcLoadGroupTypeEnum IfcStructuralLoadGroup::PredefinedType() const { return IfcLoadGroupTypeEnum::FromString(*entity->getArgument(5)); }
 void IfcStructuralLoadGroup::setPredefinedType(IfcLoadGroupTypeEnum::IfcLoadGroupTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v,IfcLoadGroupTypeEnum::ToString(v)); }
-IfcActionTypeEnum::IfcActionTypeEnum IfcStructuralLoadGroup::ActionType() { return IfcActionTypeEnum::FromString(*entity->getArgument(6)); }
+IfcActionTypeEnum::IfcActionTypeEnum IfcStructuralLoadGroup::ActionType() const { return IfcActionTypeEnum::FromString(*entity->getArgument(6)); }
 void IfcStructuralLoadGroup::setActionType(IfcActionTypeEnum::IfcActionTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v,IfcActionTypeEnum::ToString(v)); }
-IfcActionSourceTypeEnum::IfcActionSourceTypeEnum IfcStructuralLoadGroup::ActionSource() { return IfcActionSourceTypeEnum::FromString(*entity->getArgument(7)); }
+IfcActionSourceTypeEnum::IfcActionSourceTypeEnum IfcStructuralLoadGroup::ActionSource() const { return IfcActionSourceTypeEnum::FromString(*entity->getArgument(7)); }
 void IfcStructuralLoadGroup::setActionSource(IfcActionSourceTypeEnum::IfcActionSourceTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v,IfcActionSourceTypeEnum::ToString(v)); }
-bool IfcStructuralLoadGroup::hasCoefficient() { return !entity->getArgument(8)->isNull(); }
-IfcRatioMeasure IfcStructuralLoadGroup::Coefficient() { return *entity->getArgument(8); }
-void IfcStructuralLoadGroup::setCoefficient(IfcRatioMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
-bool IfcStructuralLoadGroup::hasPurpose() { return !entity->getArgument(9)->isNull(); }
-IfcLabel IfcStructuralLoadGroup::Purpose() { return *entity->getArgument(9); }
-void IfcStructuralLoadGroup::setPurpose(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
-IfcStructuralResultGroup::list IfcStructuralLoadGroup::SourceOfResultGroup() { RETURN_INVERSE(IfcStructuralResultGroup) }
-IfcStructuralAnalysisModel::list IfcStructuralLoadGroup::LoadGroupFor() { RETURN_INVERSE(IfcStructuralAnalysisModel) }
+bool IfcStructuralLoadGroup::hasCoefficient() const { return !entity->getArgument(8)->isNull(); }
+double IfcStructuralLoadGroup::Coefficient() const { return *entity->getArgument(8); }
+void IfcStructuralLoadGroup::setCoefficient(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
+bool IfcStructuralLoadGroup::hasPurpose() const { return !entity->getArgument(9)->isNull(); }
+std::string IfcStructuralLoadGroup::Purpose() const { return *entity->getArgument(9); }
+void IfcStructuralLoadGroup::setPurpose(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
+IfcStructuralResultGroup::list::ptr IfcStructuralLoadGroup::SourceOfResultGroup() const { return entity->getInverse(Type::IfcStructuralResultGroup, 6)->as<IfcStructuralResultGroup>(); }
+IfcStructuralAnalysisModel::list::ptr IfcStructuralLoadGroup::LoadGroupFor() const { return entity->getInverse(Type::IfcStructuralAnalysisModel, 7)->as<IfcStructuralAnalysisModel>(); }
 bool IfcStructuralLoadGroup::is(Type::Enum v) const { return v == Type::IfcStructuralLoadGroup || IfcGroup::is(v); }
 Type::Enum IfcStructuralLoadGroup::type() const { return Type::IfcStructuralLoadGroup; }
 Type::Enum IfcStructuralLoadGroup::Class() { return Type::IfcStructuralLoadGroup; }
-IfcStructuralLoadGroup::IfcStructuralLoadGroup(IfcAbstractEntityPtr e) : IfcGroup((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcStructuralLoadGroup)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcStructuralLoadGroup::IfcStructuralLoadGroup(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcLoadGroupTypeEnum::IfcLoadGroupTypeEnum v6_PredefinedType, IfcActionTypeEnum::IfcActionTypeEnum v7_ActionType, IfcActionSourceTypeEnum::IfcActionSourceTypeEnum v8_ActionSource, boost::optional< IfcRatioMeasure > v9_Coefficient, boost::optional< IfcLabel > v10_Purpose) : IfcGroup((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,v6_PredefinedType,IfcLoadGroupTypeEnum::ToString(v6_PredefinedType)); e->setArgument(6,v7_ActionType,IfcActionTypeEnum::ToString(v7_ActionType)); e->setArgument(7,v8_ActionSource,IfcActionSourceTypeEnum::ToString(v8_ActionSource)); if (v9_Coefficient) { e->setArgument(8,(*v9_Coefficient)); } else { e->setArgument(8); } if (v10_Purpose) { e->setArgument(9,(*v10_Purpose)); } else { e->setArgument(9); } entity = e; EntityBuffer::Add(this); }
+IfcStructuralLoadGroup::IfcStructuralLoadGroup(IfcAbstractEntity* e) : IfcGroup((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcStructuralLoadGroup)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcStructuralLoadGroup::IfcStructuralLoadGroup(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcLoadGroupTypeEnum::IfcLoadGroupTypeEnum v6_PredefinedType, IfcActionTypeEnum::IfcActionTypeEnum v7_ActionType, IfcActionSourceTypeEnum::IfcActionSourceTypeEnum v8_ActionSource, boost::optional< double > v9_Coefficient, boost::optional< std::string > v10_Purpose) : IfcGroup((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,v6_PredefinedType,IfcLoadGroupTypeEnum::ToString(v6_PredefinedType)); e->setArgument(6,v7_ActionType,IfcActionTypeEnum::ToString(v7_ActionType)); e->setArgument(7,v8_ActionSource,IfcActionSourceTypeEnum::ToString(v8_ActionSource)); if (v9_Coefficient) { e->setArgument(8,(*v9_Coefficient)); } else { e->setArgument(8); } if (v10_Purpose) { e->setArgument(9,(*v10_Purpose)); } else { e->setArgument(9); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcStructuralLoadLinearForce
-bool IfcStructuralLoadLinearForce::hasLinearForceX() { return !entity->getArgument(1)->isNull(); }
-IfcLinearForceMeasure IfcStructuralLoadLinearForce::LinearForceX() { return *entity->getArgument(1); }
-void IfcStructuralLoadLinearForce::setLinearForceX(IfcLinearForceMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-bool IfcStructuralLoadLinearForce::hasLinearForceY() { return !entity->getArgument(2)->isNull(); }
-IfcLinearForceMeasure IfcStructuralLoadLinearForce::LinearForceY() { return *entity->getArgument(2); }
-void IfcStructuralLoadLinearForce::setLinearForceY(IfcLinearForceMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-bool IfcStructuralLoadLinearForce::hasLinearForceZ() { return !entity->getArgument(3)->isNull(); }
-IfcLinearForceMeasure IfcStructuralLoadLinearForce::LinearForceZ() { return *entity->getArgument(3); }
-void IfcStructuralLoadLinearForce::setLinearForceZ(IfcLinearForceMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-bool IfcStructuralLoadLinearForce::hasLinearMomentX() { return !entity->getArgument(4)->isNull(); }
-IfcLinearMomentMeasure IfcStructuralLoadLinearForce::LinearMomentX() { return *entity->getArgument(4); }
-void IfcStructuralLoadLinearForce::setLinearMomentX(IfcLinearMomentMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-bool IfcStructuralLoadLinearForce::hasLinearMomentY() { return !entity->getArgument(5)->isNull(); }
-IfcLinearMomentMeasure IfcStructuralLoadLinearForce::LinearMomentY() { return *entity->getArgument(5); }
-void IfcStructuralLoadLinearForce::setLinearMomentY(IfcLinearMomentMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-bool IfcStructuralLoadLinearForce::hasLinearMomentZ() { return !entity->getArgument(6)->isNull(); }
-IfcLinearMomentMeasure IfcStructuralLoadLinearForce::LinearMomentZ() { return *entity->getArgument(6); }
-void IfcStructuralLoadLinearForce::setLinearMomentZ(IfcLinearMomentMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
+bool IfcStructuralLoadLinearForce::hasLinearForceX() const { return !entity->getArgument(1)->isNull(); }
+double IfcStructuralLoadLinearForce::LinearForceX() const { return *entity->getArgument(1); }
+void IfcStructuralLoadLinearForce::setLinearForceX(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+bool IfcStructuralLoadLinearForce::hasLinearForceY() const { return !entity->getArgument(2)->isNull(); }
+double IfcStructuralLoadLinearForce::LinearForceY() const { return *entity->getArgument(2); }
+void IfcStructuralLoadLinearForce::setLinearForceY(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+bool IfcStructuralLoadLinearForce::hasLinearForceZ() const { return !entity->getArgument(3)->isNull(); }
+double IfcStructuralLoadLinearForce::LinearForceZ() const { return *entity->getArgument(3); }
+void IfcStructuralLoadLinearForce::setLinearForceZ(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+bool IfcStructuralLoadLinearForce::hasLinearMomentX() const { return !entity->getArgument(4)->isNull(); }
+double IfcStructuralLoadLinearForce::LinearMomentX() const { return *entity->getArgument(4); }
+void IfcStructuralLoadLinearForce::setLinearMomentX(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+bool IfcStructuralLoadLinearForce::hasLinearMomentY() const { return !entity->getArgument(5)->isNull(); }
+double IfcStructuralLoadLinearForce::LinearMomentY() const { return *entity->getArgument(5); }
+void IfcStructuralLoadLinearForce::setLinearMomentY(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+bool IfcStructuralLoadLinearForce::hasLinearMomentZ() const { return !entity->getArgument(6)->isNull(); }
+double IfcStructuralLoadLinearForce::LinearMomentZ() const { return *entity->getArgument(6); }
+void IfcStructuralLoadLinearForce::setLinearMomentZ(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
 bool IfcStructuralLoadLinearForce::is(Type::Enum v) const { return v == Type::IfcStructuralLoadLinearForce || IfcStructuralLoadStatic::is(v); }
 Type::Enum IfcStructuralLoadLinearForce::type() const { return Type::IfcStructuralLoadLinearForce; }
 Type::Enum IfcStructuralLoadLinearForce::Class() { return Type::IfcStructuralLoadLinearForce; }
-IfcStructuralLoadLinearForce::IfcStructuralLoadLinearForce(IfcAbstractEntityPtr e) : IfcStructuralLoadStatic((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcStructuralLoadLinearForce)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcStructuralLoadLinearForce::IfcStructuralLoadLinearForce(boost::optional< IfcLabel > v1_Name, boost::optional< IfcLinearForceMeasure > v2_LinearForceX, boost::optional< IfcLinearForceMeasure > v3_LinearForceY, boost::optional< IfcLinearForceMeasure > v4_LinearForceZ, boost::optional< IfcLinearMomentMeasure > v5_LinearMomentX, boost::optional< IfcLinearMomentMeasure > v6_LinearMomentY, boost::optional< IfcLinearMomentMeasure > v7_LinearMomentZ) : IfcStructuralLoadStatic((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_LinearForceX) { e->setArgument(1,(*v2_LinearForceX)); } else { e->setArgument(1); } if (v3_LinearForceY) { e->setArgument(2,(*v3_LinearForceY)); } else { e->setArgument(2); } if (v4_LinearForceZ) { e->setArgument(3,(*v4_LinearForceZ)); } else { e->setArgument(3); } if (v5_LinearMomentX) { e->setArgument(4,(*v5_LinearMomentX)); } else { e->setArgument(4); } if (v6_LinearMomentY) { e->setArgument(5,(*v6_LinearMomentY)); } else { e->setArgument(5); } if (v7_LinearMomentZ) { e->setArgument(6,(*v7_LinearMomentZ)); } else { e->setArgument(6); } entity = e; EntityBuffer::Add(this); }
+IfcStructuralLoadLinearForce::IfcStructuralLoadLinearForce(IfcAbstractEntity* e) : IfcStructuralLoadStatic((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcStructuralLoadLinearForce)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcStructuralLoadLinearForce::IfcStructuralLoadLinearForce(boost::optional< std::string > v1_Name, boost::optional< double > v2_LinearForceX, boost::optional< double > v3_LinearForceY, boost::optional< double > v4_LinearForceZ, boost::optional< double > v5_LinearMomentX, boost::optional< double > v6_LinearMomentY, boost::optional< double > v7_LinearMomentZ) : IfcStructuralLoadStatic((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_LinearForceX) { e->setArgument(1,(*v2_LinearForceX)); } else { e->setArgument(1); } if (v3_LinearForceY) { e->setArgument(2,(*v3_LinearForceY)); } else { e->setArgument(2); } if (v4_LinearForceZ) { e->setArgument(3,(*v4_LinearForceZ)); } else { e->setArgument(3); } if (v5_LinearMomentX) { e->setArgument(4,(*v5_LinearMomentX)); } else { e->setArgument(4); } if (v6_LinearMomentY) { e->setArgument(5,(*v6_LinearMomentY)); } else { e->setArgument(5); } if (v7_LinearMomentZ) { e->setArgument(6,(*v7_LinearMomentZ)); } else { e->setArgument(6); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcStructuralLoadPlanarForce
-bool IfcStructuralLoadPlanarForce::hasPlanarForceX() { return !entity->getArgument(1)->isNull(); }
-IfcPlanarForceMeasure IfcStructuralLoadPlanarForce::PlanarForceX() { return *entity->getArgument(1); }
-void IfcStructuralLoadPlanarForce::setPlanarForceX(IfcPlanarForceMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-bool IfcStructuralLoadPlanarForce::hasPlanarForceY() { return !entity->getArgument(2)->isNull(); }
-IfcPlanarForceMeasure IfcStructuralLoadPlanarForce::PlanarForceY() { return *entity->getArgument(2); }
-void IfcStructuralLoadPlanarForce::setPlanarForceY(IfcPlanarForceMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-bool IfcStructuralLoadPlanarForce::hasPlanarForceZ() { return !entity->getArgument(3)->isNull(); }
-IfcPlanarForceMeasure IfcStructuralLoadPlanarForce::PlanarForceZ() { return *entity->getArgument(3); }
-void IfcStructuralLoadPlanarForce::setPlanarForceZ(IfcPlanarForceMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+bool IfcStructuralLoadPlanarForce::hasPlanarForceX() const { return !entity->getArgument(1)->isNull(); }
+double IfcStructuralLoadPlanarForce::PlanarForceX() const { return *entity->getArgument(1); }
+void IfcStructuralLoadPlanarForce::setPlanarForceX(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+bool IfcStructuralLoadPlanarForce::hasPlanarForceY() const { return !entity->getArgument(2)->isNull(); }
+double IfcStructuralLoadPlanarForce::PlanarForceY() const { return *entity->getArgument(2); }
+void IfcStructuralLoadPlanarForce::setPlanarForceY(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+bool IfcStructuralLoadPlanarForce::hasPlanarForceZ() const { return !entity->getArgument(3)->isNull(); }
+double IfcStructuralLoadPlanarForce::PlanarForceZ() const { return *entity->getArgument(3); }
+void IfcStructuralLoadPlanarForce::setPlanarForceZ(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
 bool IfcStructuralLoadPlanarForce::is(Type::Enum v) const { return v == Type::IfcStructuralLoadPlanarForce || IfcStructuralLoadStatic::is(v); }
 Type::Enum IfcStructuralLoadPlanarForce::type() const { return Type::IfcStructuralLoadPlanarForce; }
 Type::Enum IfcStructuralLoadPlanarForce::Class() { return Type::IfcStructuralLoadPlanarForce; }
-IfcStructuralLoadPlanarForce::IfcStructuralLoadPlanarForce(IfcAbstractEntityPtr e) : IfcStructuralLoadStatic((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcStructuralLoadPlanarForce)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcStructuralLoadPlanarForce::IfcStructuralLoadPlanarForce(boost::optional< IfcLabel > v1_Name, boost::optional< IfcPlanarForceMeasure > v2_PlanarForceX, boost::optional< IfcPlanarForceMeasure > v3_PlanarForceY, boost::optional< IfcPlanarForceMeasure > v4_PlanarForceZ) : IfcStructuralLoadStatic((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_PlanarForceX) { e->setArgument(1,(*v2_PlanarForceX)); } else { e->setArgument(1); } if (v3_PlanarForceY) { e->setArgument(2,(*v3_PlanarForceY)); } else { e->setArgument(2); } if (v4_PlanarForceZ) { e->setArgument(3,(*v4_PlanarForceZ)); } else { e->setArgument(3); } entity = e; EntityBuffer::Add(this); }
+IfcStructuralLoadPlanarForce::IfcStructuralLoadPlanarForce(IfcAbstractEntity* e) : IfcStructuralLoadStatic((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcStructuralLoadPlanarForce)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcStructuralLoadPlanarForce::IfcStructuralLoadPlanarForce(boost::optional< std::string > v1_Name, boost::optional< double > v2_PlanarForceX, boost::optional< double > v3_PlanarForceY, boost::optional< double > v4_PlanarForceZ) : IfcStructuralLoadStatic((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_PlanarForceX) { e->setArgument(1,(*v2_PlanarForceX)); } else { e->setArgument(1); } if (v3_PlanarForceY) { e->setArgument(2,(*v3_PlanarForceY)); } else { e->setArgument(2); } if (v4_PlanarForceZ) { e->setArgument(3,(*v4_PlanarForceZ)); } else { e->setArgument(3); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcStructuralLoadSingleDisplacement
-bool IfcStructuralLoadSingleDisplacement::hasDisplacementX() { return !entity->getArgument(1)->isNull(); }
-IfcLengthMeasure IfcStructuralLoadSingleDisplacement::DisplacementX() { return *entity->getArgument(1); }
-void IfcStructuralLoadSingleDisplacement::setDisplacementX(IfcLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-bool IfcStructuralLoadSingleDisplacement::hasDisplacementY() { return !entity->getArgument(2)->isNull(); }
-IfcLengthMeasure IfcStructuralLoadSingleDisplacement::DisplacementY() { return *entity->getArgument(2); }
-void IfcStructuralLoadSingleDisplacement::setDisplacementY(IfcLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-bool IfcStructuralLoadSingleDisplacement::hasDisplacementZ() { return !entity->getArgument(3)->isNull(); }
-IfcLengthMeasure IfcStructuralLoadSingleDisplacement::DisplacementZ() { return *entity->getArgument(3); }
-void IfcStructuralLoadSingleDisplacement::setDisplacementZ(IfcLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-bool IfcStructuralLoadSingleDisplacement::hasRotationalDisplacementRX() { return !entity->getArgument(4)->isNull(); }
-IfcPlaneAngleMeasure IfcStructuralLoadSingleDisplacement::RotationalDisplacementRX() { return *entity->getArgument(4); }
-void IfcStructuralLoadSingleDisplacement::setRotationalDisplacementRX(IfcPlaneAngleMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-bool IfcStructuralLoadSingleDisplacement::hasRotationalDisplacementRY() { return !entity->getArgument(5)->isNull(); }
-IfcPlaneAngleMeasure IfcStructuralLoadSingleDisplacement::RotationalDisplacementRY() { return *entity->getArgument(5); }
-void IfcStructuralLoadSingleDisplacement::setRotationalDisplacementRY(IfcPlaneAngleMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-bool IfcStructuralLoadSingleDisplacement::hasRotationalDisplacementRZ() { return !entity->getArgument(6)->isNull(); }
-IfcPlaneAngleMeasure IfcStructuralLoadSingleDisplacement::RotationalDisplacementRZ() { return *entity->getArgument(6); }
-void IfcStructuralLoadSingleDisplacement::setRotationalDisplacementRZ(IfcPlaneAngleMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
+bool IfcStructuralLoadSingleDisplacement::hasDisplacementX() const { return !entity->getArgument(1)->isNull(); }
+double IfcStructuralLoadSingleDisplacement::DisplacementX() const { return *entity->getArgument(1); }
+void IfcStructuralLoadSingleDisplacement::setDisplacementX(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+bool IfcStructuralLoadSingleDisplacement::hasDisplacementY() const { return !entity->getArgument(2)->isNull(); }
+double IfcStructuralLoadSingleDisplacement::DisplacementY() const { return *entity->getArgument(2); }
+void IfcStructuralLoadSingleDisplacement::setDisplacementY(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+bool IfcStructuralLoadSingleDisplacement::hasDisplacementZ() const { return !entity->getArgument(3)->isNull(); }
+double IfcStructuralLoadSingleDisplacement::DisplacementZ() const { return *entity->getArgument(3); }
+void IfcStructuralLoadSingleDisplacement::setDisplacementZ(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+bool IfcStructuralLoadSingleDisplacement::hasRotationalDisplacementRX() const { return !entity->getArgument(4)->isNull(); }
+double IfcStructuralLoadSingleDisplacement::RotationalDisplacementRX() const { return *entity->getArgument(4); }
+void IfcStructuralLoadSingleDisplacement::setRotationalDisplacementRX(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+bool IfcStructuralLoadSingleDisplacement::hasRotationalDisplacementRY() const { return !entity->getArgument(5)->isNull(); }
+double IfcStructuralLoadSingleDisplacement::RotationalDisplacementRY() const { return *entity->getArgument(5); }
+void IfcStructuralLoadSingleDisplacement::setRotationalDisplacementRY(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+bool IfcStructuralLoadSingleDisplacement::hasRotationalDisplacementRZ() const { return !entity->getArgument(6)->isNull(); }
+double IfcStructuralLoadSingleDisplacement::RotationalDisplacementRZ() const { return *entity->getArgument(6); }
+void IfcStructuralLoadSingleDisplacement::setRotationalDisplacementRZ(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
 bool IfcStructuralLoadSingleDisplacement::is(Type::Enum v) const { return v == Type::IfcStructuralLoadSingleDisplacement || IfcStructuralLoadStatic::is(v); }
 Type::Enum IfcStructuralLoadSingleDisplacement::type() const { return Type::IfcStructuralLoadSingleDisplacement; }
 Type::Enum IfcStructuralLoadSingleDisplacement::Class() { return Type::IfcStructuralLoadSingleDisplacement; }
-IfcStructuralLoadSingleDisplacement::IfcStructuralLoadSingleDisplacement(IfcAbstractEntityPtr e) : IfcStructuralLoadStatic((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcStructuralLoadSingleDisplacement)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcStructuralLoadSingleDisplacement::IfcStructuralLoadSingleDisplacement(boost::optional< IfcLabel > v1_Name, boost::optional< IfcLengthMeasure > v2_DisplacementX, boost::optional< IfcLengthMeasure > v3_DisplacementY, boost::optional< IfcLengthMeasure > v4_DisplacementZ, boost::optional< IfcPlaneAngleMeasure > v5_RotationalDisplacementRX, boost::optional< IfcPlaneAngleMeasure > v6_RotationalDisplacementRY, boost::optional< IfcPlaneAngleMeasure > v7_RotationalDisplacementRZ) : IfcStructuralLoadStatic((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_DisplacementX) { e->setArgument(1,(*v2_DisplacementX)); } else { e->setArgument(1); } if (v3_DisplacementY) { e->setArgument(2,(*v3_DisplacementY)); } else { e->setArgument(2); } if (v4_DisplacementZ) { e->setArgument(3,(*v4_DisplacementZ)); } else { e->setArgument(3); } if (v5_RotationalDisplacementRX) { e->setArgument(4,(*v5_RotationalDisplacementRX)); } else { e->setArgument(4); } if (v6_RotationalDisplacementRY) { e->setArgument(5,(*v6_RotationalDisplacementRY)); } else { e->setArgument(5); } if (v7_RotationalDisplacementRZ) { e->setArgument(6,(*v7_RotationalDisplacementRZ)); } else { e->setArgument(6); } entity = e; EntityBuffer::Add(this); }
+IfcStructuralLoadSingleDisplacement::IfcStructuralLoadSingleDisplacement(IfcAbstractEntity* e) : IfcStructuralLoadStatic((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcStructuralLoadSingleDisplacement)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcStructuralLoadSingleDisplacement::IfcStructuralLoadSingleDisplacement(boost::optional< std::string > v1_Name, boost::optional< double > v2_DisplacementX, boost::optional< double > v3_DisplacementY, boost::optional< double > v4_DisplacementZ, boost::optional< double > v5_RotationalDisplacementRX, boost::optional< double > v6_RotationalDisplacementRY, boost::optional< double > v7_RotationalDisplacementRZ) : IfcStructuralLoadStatic((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_DisplacementX) { e->setArgument(1,(*v2_DisplacementX)); } else { e->setArgument(1); } if (v3_DisplacementY) { e->setArgument(2,(*v3_DisplacementY)); } else { e->setArgument(2); } if (v4_DisplacementZ) { e->setArgument(3,(*v4_DisplacementZ)); } else { e->setArgument(3); } if (v5_RotationalDisplacementRX) { e->setArgument(4,(*v5_RotationalDisplacementRX)); } else { e->setArgument(4); } if (v6_RotationalDisplacementRY) { e->setArgument(5,(*v6_RotationalDisplacementRY)); } else { e->setArgument(5); } if (v7_RotationalDisplacementRZ) { e->setArgument(6,(*v7_RotationalDisplacementRZ)); } else { e->setArgument(6); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcStructuralLoadSingleDisplacementDistortion
-bool IfcStructuralLoadSingleDisplacementDistortion::hasDistortion() { return !entity->getArgument(7)->isNull(); }
-IfcCurvatureMeasure IfcStructuralLoadSingleDisplacementDistortion::Distortion() { return *entity->getArgument(7); }
-void IfcStructuralLoadSingleDisplacementDistortion::setDistortion(IfcCurvatureMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
+bool IfcStructuralLoadSingleDisplacementDistortion::hasDistortion() const { return !entity->getArgument(7)->isNull(); }
+double IfcStructuralLoadSingleDisplacementDistortion::Distortion() const { return *entity->getArgument(7); }
+void IfcStructuralLoadSingleDisplacementDistortion::setDistortion(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
 bool IfcStructuralLoadSingleDisplacementDistortion::is(Type::Enum v) const { return v == Type::IfcStructuralLoadSingleDisplacementDistortion || IfcStructuralLoadSingleDisplacement::is(v); }
 Type::Enum IfcStructuralLoadSingleDisplacementDistortion::type() const { return Type::IfcStructuralLoadSingleDisplacementDistortion; }
 Type::Enum IfcStructuralLoadSingleDisplacementDistortion::Class() { return Type::IfcStructuralLoadSingleDisplacementDistortion; }
-IfcStructuralLoadSingleDisplacementDistortion::IfcStructuralLoadSingleDisplacementDistortion(IfcAbstractEntityPtr e) : IfcStructuralLoadSingleDisplacement((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcStructuralLoadSingleDisplacementDistortion)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcStructuralLoadSingleDisplacementDistortion::IfcStructuralLoadSingleDisplacementDistortion(boost::optional< IfcLabel > v1_Name, boost::optional< IfcLengthMeasure > v2_DisplacementX, boost::optional< IfcLengthMeasure > v3_DisplacementY, boost::optional< IfcLengthMeasure > v4_DisplacementZ, boost::optional< IfcPlaneAngleMeasure > v5_RotationalDisplacementRX, boost::optional< IfcPlaneAngleMeasure > v6_RotationalDisplacementRY, boost::optional< IfcPlaneAngleMeasure > v7_RotationalDisplacementRZ, boost::optional< IfcCurvatureMeasure > v8_Distortion) : IfcStructuralLoadSingleDisplacement((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_DisplacementX) { e->setArgument(1,(*v2_DisplacementX)); } else { e->setArgument(1); } if (v3_DisplacementY) { e->setArgument(2,(*v3_DisplacementY)); } else { e->setArgument(2); } if (v4_DisplacementZ) { e->setArgument(3,(*v4_DisplacementZ)); } else { e->setArgument(3); } if (v5_RotationalDisplacementRX) { e->setArgument(4,(*v5_RotationalDisplacementRX)); } else { e->setArgument(4); } if (v6_RotationalDisplacementRY) { e->setArgument(5,(*v6_RotationalDisplacementRY)); } else { e->setArgument(5); } if (v7_RotationalDisplacementRZ) { e->setArgument(6,(*v7_RotationalDisplacementRZ)); } else { e->setArgument(6); } if (v8_Distortion) { e->setArgument(7,(*v8_Distortion)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
+IfcStructuralLoadSingleDisplacementDistortion::IfcStructuralLoadSingleDisplacementDistortion(IfcAbstractEntity* e) : IfcStructuralLoadSingleDisplacement((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcStructuralLoadSingleDisplacementDistortion)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcStructuralLoadSingleDisplacementDistortion::IfcStructuralLoadSingleDisplacementDistortion(boost::optional< std::string > v1_Name, boost::optional< double > v2_DisplacementX, boost::optional< double > v3_DisplacementY, boost::optional< double > v4_DisplacementZ, boost::optional< double > v5_RotationalDisplacementRX, boost::optional< double > v6_RotationalDisplacementRY, boost::optional< double > v7_RotationalDisplacementRZ, boost::optional< double > v8_Distortion) : IfcStructuralLoadSingleDisplacement((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_DisplacementX) { e->setArgument(1,(*v2_DisplacementX)); } else { e->setArgument(1); } if (v3_DisplacementY) { e->setArgument(2,(*v3_DisplacementY)); } else { e->setArgument(2); } if (v4_DisplacementZ) { e->setArgument(3,(*v4_DisplacementZ)); } else { e->setArgument(3); } if (v5_RotationalDisplacementRX) { e->setArgument(4,(*v5_RotationalDisplacementRX)); } else { e->setArgument(4); } if (v6_RotationalDisplacementRY) { e->setArgument(5,(*v6_RotationalDisplacementRY)); } else { e->setArgument(5); } if (v7_RotationalDisplacementRZ) { e->setArgument(6,(*v7_RotationalDisplacementRZ)); } else { e->setArgument(6); } if (v8_Distortion) { e->setArgument(7,(*v8_Distortion)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcStructuralLoadSingleForce
-bool IfcStructuralLoadSingleForce::hasForceX() { return !entity->getArgument(1)->isNull(); }
-IfcForceMeasure IfcStructuralLoadSingleForce::ForceX() { return *entity->getArgument(1); }
-void IfcStructuralLoadSingleForce::setForceX(IfcForceMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-bool IfcStructuralLoadSingleForce::hasForceY() { return !entity->getArgument(2)->isNull(); }
-IfcForceMeasure IfcStructuralLoadSingleForce::ForceY() { return *entity->getArgument(2); }
-void IfcStructuralLoadSingleForce::setForceY(IfcForceMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-bool IfcStructuralLoadSingleForce::hasForceZ() { return !entity->getArgument(3)->isNull(); }
-IfcForceMeasure IfcStructuralLoadSingleForce::ForceZ() { return *entity->getArgument(3); }
-void IfcStructuralLoadSingleForce::setForceZ(IfcForceMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-bool IfcStructuralLoadSingleForce::hasMomentX() { return !entity->getArgument(4)->isNull(); }
-IfcTorqueMeasure IfcStructuralLoadSingleForce::MomentX() { return *entity->getArgument(4); }
-void IfcStructuralLoadSingleForce::setMomentX(IfcTorqueMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-bool IfcStructuralLoadSingleForce::hasMomentY() { return !entity->getArgument(5)->isNull(); }
-IfcTorqueMeasure IfcStructuralLoadSingleForce::MomentY() { return *entity->getArgument(5); }
-void IfcStructuralLoadSingleForce::setMomentY(IfcTorqueMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-bool IfcStructuralLoadSingleForce::hasMomentZ() { return !entity->getArgument(6)->isNull(); }
-IfcTorqueMeasure IfcStructuralLoadSingleForce::MomentZ() { return *entity->getArgument(6); }
-void IfcStructuralLoadSingleForce::setMomentZ(IfcTorqueMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
+bool IfcStructuralLoadSingleForce::hasForceX() const { return !entity->getArgument(1)->isNull(); }
+double IfcStructuralLoadSingleForce::ForceX() const { return *entity->getArgument(1); }
+void IfcStructuralLoadSingleForce::setForceX(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+bool IfcStructuralLoadSingleForce::hasForceY() const { return !entity->getArgument(2)->isNull(); }
+double IfcStructuralLoadSingleForce::ForceY() const { return *entity->getArgument(2); }
+void IfcStructuralLoadSingleForce::setForceY(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+bool IfcStructuralLoadSingleForce::hasForceZ() const { return !entity->getArgument(3)->isNull(); }
+double IfcStructuralLoadSingleForce::ForceZ() const { return *entity->getArgument(3); }
+void IfcStructuralLoadSingleForce::setForceZ(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+bool IfcStructuralLoadSingleForce::hasMomentX() const { return !entity->getArgument(4)->isNull(); }
+double IfcStructuralLoadSingleForce::MomentX() const { return *entity->getArgument(4); }
+void IfcStructuralLoadSingleForce::setMomentX(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+bool IfcStructuralLoadSingleForce::hasMomentY() const { return !entity->getArgument(5)->isNull(); }
+double IfcStructuralLoadSingleForce::MomentY() const { return *entity->getArgument(5); }
+void IfcStructuralLoadSingleForce::setMomentY(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+bool IfcStructuralLoadSingleForce::hasMomentZ() const { return !entity->getArgument(6)->isNull(); }
+double IfcStructuralLoadSingleForce::MomentZ() const { return *entity->getArgument(6); }
+void IfcStructuralLoadSingleForce::setMomentZ(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
 bool IfcStructuralLoadSingleForce::is(Type::Enum v) const { return v == Type::IfcStructuralLoadSingleForce || IfcStructuralLoadStatic::is(v); }
 Type::Enum IfcStructuralLoadSingleForce::type() const { return Type::IfcStructuralLoadSingleForce; }
 Type::Enum IfcStructuralLoadSingleForce::Class() { return Type::IfcStructuralLoadSingleForce; }
-IfcStructuralLoadSingleForce::IfcStructuralLoadSingleForce(IfcAbstractEntityPtr e) : IfcStructuralLoadStatic((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcStructuralLoadSingleForce)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcStructuralLoadSingleForce::IfcStructuralLoadSingleForce(boost::optional< IfcLabel > v1_Name, boost::optional< IfcForceMeasure > v2_ForceX, boost::optional< IfcForceMeasure > v3_ForceY, boost::optional< IfcForceMeasure > v4_ForceZ, boost::optional< IfcTorqueMeasure > v5_MomentX, boost::optional< IfcTorqueMeasure > v6_MomentY, boost::optional< IfcTorqueMeasure > v7_MomentZ) : IfcStructuralLoadStatic((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_ForceX) { e->setArgument(1,(*v2_ForceX)); } else { e->setArgument(1); } if (v3_ForceY) { e->setArgument(2,(*v3_ForceY)); } else { e->setArgument(2); } if (v4_ForceZ) { e->setArgument(3,(*v4_ForceZ)); } else { e->setArgument(3); } if (v5_MomentX) { e->setArgument(4,(*v5_MomentX)); } else { e->setArgument(4); } if (v6_MomentY) { e->setArgument(5,(*v6_MomentY)); } else { e->setArgument(5); } if (v7_MomentZ) { e->setArgument(6,(*v7_MomentZ)); } else { e->setArgument(6); } entity = e; EntityBuffer::Add(this); }
+IfcStructuralLoadSingleForce::IfcStructuralLoadSingleForce(IfcAbstractEntity* e) : IfcStructuralLoadStatic((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcStructuralLoadSingleForce)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcStructuralLoadSingleForce::IfcStructuralLoadSingleForce(boost::optional< std::string > v1_Name, boost::optional< double > v2_ForceX, boost::optional< double > v3_ForceY, boost::optional< double > v4_ForceZ, boost::optional< double > v5_MomentX, boost::optional< double > v6_MomentY, boost::optional< double > v7_MomentZ) : IfcStructuralLoadStatic((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_ForceX) { e->setArgument(1,(*v2_ForceX)); } else { e->setArgument(1); } if (v3_ForceY) { e->setArgument(2,(*v3_ForceY)); } else { e->setArgument(2); } if (v4_ForceZ) { e->setArgument(3,(*v4_ForceZ)); } else { e->setArgument(3); } if (v5_MomentX) { e->setArgument(4,(*v5_MomentX)); } else { e->setArgument(4); } if (v6_MomentY) { e->setArgument(5,(*v6_MomentY)); } else { e->setArgument(5); } if (v7_MomentZ) { e->setArgument(6,(*v7_MomentZ)); } else { e->setArgument(6); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcStructuralLoadSingleForceWarping
-bool IfcStructuralLoadSingleForceWarping::hasWarpingMoment() { return !entity->getArgument(7)->isNull(); }
-IfcWarpingMomentMeasure IfcStructuralLoadSingleForceWarping::WarpingMoment() { return *entity->getArgument(7); }
-void IfcStructuralLoadSingleForceWarping::setWarpingMoment(IfcWarpingMomentMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
+bool IfcStructuralLoadSingleForceWarping::hasWarpingMoment() const { return !entity->getArgument(7)->isNull(); }
+double IfcStructuralLoadSingleForceWarping::WarpingMoment() const { return *entity->getArgument(7); }
+void IfcStructuralLoadSingleForceWarping::setWarpingMoment(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
 bool IfcStructuralLoadSingleForceWarping::is(Type::Enum v) const { return v == Type::IfcStructuralLoadSingleForceWarping || IfcStructuralLoadSingleForce::is(v); }
 Type::Enum IfcStructuralLoadSingleForceWarping::type() const { return Type::IfcStructuralLoadSingleForceWarping; }
 Type::Enum IfcStructuralLoadSingleForceWarping::Class() { return Type::IfcStructuralLoadSingleForceWarping; }
-IfcStructuralLoadSingleForceWarping::IfcStructuralLoadSingleForceWarping(IfcAbstractEntityPtr e) : IfcStructuralLoadSingleForce((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcStructuralLoadSingleForceWarping)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcStructuralLoadSingleForceWarping::IfcStructuralLoadSingleForceWarping(boost::optional< IfcLabel > v1_Name, boost::optional< IfcForceMeasure > v2_ForceX, boost::optional< IfcForceMeasure > v3_ForceY, boost::optional< IfcForceMeasure > v4_ForceZ, boost::optional< IfcTorqueMeasure > v5_MomentX, boost::optional< IfcTorqueMeasure > v6_MomentY, boost::optional< IfcTorqueMeasure > v7_MomentZ, boost::optional< IfcWarpingMomentMeasure > v8_WarpingMoment) : IfcStructuralLoadSingleForce((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_ForceX) { e->setArgument(1,(*v2_ForceX)); } else { e->setArgument(1); } if (v3_ForceY) { e->setArgument(2,(*v3_ForceY)); } else { e->setArgument(2); } if (v4_ForceZ) { e->setArgument(3,(*v4_ForceZ)); } else { e->setArgument(3); } if (v5_MomentX) { e->setArgument(4,(*v5_MomentX)); } else { e->setArgument(4); } if (v6_MomentY) { e->setArgument(5,(*v6_MomentY)); } else { e->setArgument(5); } if (v7_MomentZ) { e->setArgument(6,(*v7_MomentZ)); } else { e->setArgument(6); } if (v8_WarpingMoment) { e->setArgument(7,(*v8_WarpingMoment)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
+IfcStructuralLoadSingleForceWarping::IfcStructuralLoadSingleForceWarping(IfcAbstractEntity* e) : IfcStructuralLoadSingleForce((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcStructuralLoadSingleForceWarping)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcStructuralLoadSingleForceWarping::IfcStructuralLoadSingleForceWarping(boost::optional< std::string > v1_Name, boost::optional< double > v2_ForceX, boost::optional< double > v3_ForceY, boost::optional< double > v4_ForceZ, boost::optional< double > v5_MomentX, boost::optional< double > v6_MomentY, boost::optional< double > v7_MomentZ, boost::optional< double > v8_WarpingMoment) : IfcStructuralLoadSingleForce((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_ForceX) { e->setArgument(1,(*v2_ForceX)); } else { e->setArgument(1); } if (v3_ForceY) { e->setArgument(2,(*v3_ForceY)); } else { e->setArgument(2); } if (v4_ForceZ) { e->setArgument(3,(*v4_ForceZ)); } else { e->setArgument(3); } if (v5_MomentX) { e->setArgument(4,(*v5_MomentX)); } else { e->setArgument(4); } if (v6_MomentY) { e->setArgument(5,(*v6_MomentY)); } else { e->setArgument(5); } if (v7_MomentZ) { e->setArgument(6,(*v7_MomentZ)); } else { e->setArgument(6); } if (v8_WarpingMoment) { e->setArgument(7,(*v8_WarpingMoment)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcStructuralLoadStatic
 bool IfcStructuralLoadStatic::is(Type::Enum v) const { return v == Type::IfcStructuralLoadStatic || IfcStructuralLoad::is(v); }
 Type::Enum IfcStructuralLoadStatic::type() const { return Type::IfcStructuralLoadStatic; }
 Type::Enum IfcStructuralLoadStatic::Class() { return Type::IfcStructuralLoadStatic; }
-IfcStructuralLoadStatic::IfcStructuralLoadStatic(IfcAbstractEntityPtr e) : IfcStructuralLoad((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcStructuralLoadStatic)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcStructuralLoadStatic::IfcStructuralLoadStatic(boost::optional< IfcLabel > v1_Name) : IfcStructuralLoad((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } entity = e; EntityBuffer::Add(this); }
+IfcStructuralLoadStatic::IfcStructuralLoadStatic(IfcAbstractEntity* e) : IfcStructuralLoad((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcStructuralLoadStatic)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcStructuralLoadStatic::IfcStructuralLoadStatic(boost::optional< std::string > v1_Name) : IfcStructuralLoad((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcStructuralLoadTemperature
-bool IfcStructuralLoadTemperature::hasDeltaT_Constant() { return !entity->getArgument(1)->isNull(); }
-IfcThermodynamicTemperatureMeasure IfcStructuralLoadTemperature::DeltaT_Constant() { return *entity->getArgument(1); }
-void IfcStructuralLoadTemperature::setDeltaT_Constant(IfcThermodynamicTemperatureMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-bool IfcStructuralLoadTemperature::hasDeltaT_Y() { return !entity->getArgument(2)->isNull(); }
-IfcThermodynamicTemperatureMeasure IfcStructuralLoadTemperature::DeltaT_Y() { return *entity->getArgument(2); }
-void IfcStructuralLoadTemperature::setDeltaT_Y(IfcThermodynamicTemperatureMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-bool IfcStructuralLoadTemperature::hasDeltaT_Z() { return !entity->getArgument(3)->isNull(); }
-IfcThermodynamicTemperatureMeasure IfcStructuralLoadTemperature::DeltaT_Z() { return *entity->getArgument(3); }
-void IfcStructuralLoadTemperature::setDeltaT_Z(IfcThermodynamicTemperatureMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+bool IfcStructuralLoadTemperature::hasDeltaT_Constant() const { return !entity->getArgument(1)->isNull(); }
+double IfcStructuralLoadTemperature::DeltaT_Constant() const { return *entity->getArgument(1); }
+void IfcStructuralLoadTemperature::setDeltaT_Constant(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+bool IfcStructuralLoadTemperature::hasDeltaT_Y() const { return !entity->getArgument(2)->isNull(); }
+double IfcStructuralLoadTemperature::DeltaT_Y() const { return *entity->getArgument(2); }
+void IfcStructuralLoadTemperature::setDeltaT_Y(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+bool IfcStructuralLoadTemperature::hasDeltaT_Z() const { return !entity->getArgument(3)->isNull(); }
+double IfcStructuralLoadTemperature::DeltaT_Z() const { return *entity->getArgument(3); }
+void IfcStructuralLoadTemperature::setDeltaT_Z(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
 bool IfcStructuralLoadTemperature::is(Type::Enum v) const { return v == Type::IfcStructuralLoadTemperature || IfcStructuralLoadStatic::is(v); }
 Type::Enum IfcStructuralLoadTemperature::type() const { return Type::IfcStructuralLoadTemperature; }
 Type::Enum IfcStructuralLoadTemperature::Class() { return Type::IfcStructuralLoadTemperature; }
-IfcStructuralLoadTemperature::IfcStructuralLoadTemperature(IfcAbstractEntityPtr e) : IfcStructuralLoadStatic((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcStructuralLoadTemperature)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcStructuralLoadTemperature::IfcStructuralLoadTemperature(boost::optional< IfcLabel > v1_Name, boost::optional< IfcThermodynamicTemperatureMeasure > v2_DeltaT_Constant, boost::optional< IfcThermodynamicTemperatureMeasure > v3_DeltaT_Y, boost::optional< IfcThermodynamicTemperatureMeasure > v4_DeltaT_Z) : IfcStructuralLoadStatic((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_DeltaT_Constant) { e->setArgument(1,(*v2_DeltaT_Constant)); } else { e->setArgument(1); } if (v3_DeltaT_Y) { e->setArgument(2,(*v3_DeltaT_Y)); } else { e->setArgument(2); } if (v4_DeltaT_Z) { e->setArgument(3,(*v4_DeltaT_Z)); } else { e->setArgument(3); } entity = e; EntityBuffer::Add(this); }
+IfcStructuralLoadTemperature::IfcStructuralLoadTemperature(IfcAbstractEntity* e) : IfcStructuralLoadStatic((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcStructuralLoadTemperature)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcStructuralLoadTemperature::IfcStructuralLoadTemperature(boost::optional< std::string > v1_Name, boost::optional< double > v2_DeltaT_Constant, boost::optional< double > v3_DeltaT_Y, boost::optional< double > v4_DeltaT_Z) : IfcStructuralLoadStatic((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_DeltaT_Constant) { e->setArgument(1,(*v2_DeltaT_Constant)); } else { e->setArgument(1); } if (v3_DeltaT_Y) { e->setArgument(2,(*v3_DeltaT_Y)); } else { e->setArgument(2); } if (v4_DeltaT_Z) { e->setArgument(3,(*v4_DeltaT_Z)); } else { e->setArgument(3); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcStructuralMember
-IfcRelConnectsStructuralElement::list IfcStructuralMember::ReferencesElement() { RETURN_INVERSE(IfcRelConnectsStructuralElement) }
-IfcRelConnectsStructuralMember::list IfcStructuralMember::ConnectedBy() { RETURN_INVERSE(IfcRelConnectsStructuralMember) }
+IfcRelConnectsStructuralElement::list::ptr IfcStructuralMember::ReferencesElement() const { return entity->getInverse(Type::IfcRelConnectsStructuralElement, 5)->as<IfcRelConnectsStructuralElement>(); }
+IfcRelConnectsStructuralMember::list::ptr IfcStructuralMember::ConnectedBy() const { return entity->getInverse(Type::IfcRelConnectsStructuralMember, 4)->as<IfcRelConnectsStructuralMember>(); }
 bool IfcStructuralMember::is(Type::Enum v) const { return v == Type::IfcStructuralMember || IfcStructuralItem::is(v); }
 Type::Enum IfcStructuralMember::type() const { return Type::IfcStructuralMember; }
 Type::Enum IfcStructuralMember::Class() { return Type::IfcStructuralMember; }
-IfcStructuralMember::IfcStructuralMember(IfcAbstractEntityPtr e) : IfcStructuralItem((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcStructuralMember)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcStructuralMember::IfcStructuralMember(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation) : IfcStructuralItem((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); entity = e; EntityBuffer::Add(this); }
+IfcStructuralMember::IfcStructuralMember(IfcAbstractEntity* e) : IfcStructuralItem((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcStructuralMember)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcStructuralMember::IfcStructuralMember(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation) : IfcStructuralItem((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcStructuralPlanarAction
-IfcProjectedOrTrueLengthEnum::IfcProjectedOrTrueLengthEnum IfcStructuralPlanarAction::ProjectedOrTrue() { return IfcProjectedOrTrueLengthEnum::FromString(*entity->getArgument(11)); }
+IfcProjectedOrTrueLengthEnum::IfcProjectedOrTrueLengthEnum IfcStructuralPlanarAction::ProjectedOrTrue() const { return IfcProjectedOrTrueLengthEnum::FromString(*entity->getArgument(11)); }
 void IfcStructuralPlanarAction::setProjectedOrTrue(IfcProjectedOrTrueLengthEnum::IfcProjectedOrTrueLengthEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(11,v,IfcProjectedOrTrueLengthEnum::ToString(v)); }
 bool IfcStructuralPlanarAction::is(Type::Enum v) const { return v == Type::IfcStructuralPlanarAction || IfcStructuralAction::is(v); }
 Type::Enum IfcStructuralPlanarAction::type() const { return Type::IfcStructuralPlanarAction; }
 Type::Enum IfcStructuralPlanarAction::Class() { return Type::IfcStructuralPlanarAction; }
-IfcStructuralPlanarAction::IfcStructuralPlanarAction(IfcAbstractEntityPtr e) : IfcStructuralAction((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcStructuralPlanarAction)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcStructuralPlanarAction::IfcStructuralPlanarAction(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcStructuralLoad* v8_AppliedLoad, IfcGlobalOrLocalEnum::IfcGlobalOrLocalEnum v9_GlobalOrLocal, bool v10_DestabilizingLoad, IfcStructuralReaction* v11_CausedBy, IfcProjectedOrTrueLengthEnum::IfcProjectedOrTrueLengthEnum v12_ProjectedOrTrue) : IfcStructuralAction((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); e->setArgument(7,(v8_AppliedLoad)); e->setArgument(8,v9_GlobalOrLocal,IfcGlobalOrLocalEnum::ToString(v9_GlobalOrLocal)); e->setArgument(9,(v10_DestabilizingLoad)); e->setArgument(10,(v11_CausedBy)); e->setArgument(11,v12_ProjectedOrTrue,IfcProjectedOrTrueLengthEnum::ToString(v12_ProjectedOrTrue)); entity = e; EntityBuffer::Add(this); }
+IfcStructuralPlanarAction::IfcStructuralPlanarAction(IfcAbstractEntity* e) : IfcStructuralAction((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcStructuralPlanarAction)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcStructuralPlanarAction::IfcStructuralPlanarAction(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcStructuralLoad* v8_AppliedLoad, IfcGlobalOrLocalEnum::IfcGlobalOrLocalEnum v9_GlobalOrLocal, bool v10_DestabilizingLoad, IfcStructuralReaction* v11_CausedBy, IfcProjectedOrTrueLengthEnum::IfcProjectedOrTrueLengthEnum v12_ProjectedOrTrue) : IfcStructuralAction((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); e->setArgument(7,(v8_AppliedLoad)); e->setArgument(8,v9_GlobalOrLocal,IfcGlobalOrLocalEnum::ToString(v9_GlobalOrLocal)); e->setArgument(9,(v10_DestabilizingLoad)); e->setArgument(10,(v11_CausedBy)); e->setArgument(11,v12_ProjectedOrTrue,IfcProjectedOrTrueLengthEnum::ToString(v12_ProjectedOrTrue)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcStructuralPlanarActionVarying
-IfcShapeAspect* IfcStructuralPlanarActionVarying::VaryingAppliedLoadLocation() { return (IfcShapeAspect*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(12))); }
+IfcShapeAspect* IfcStructuralPlanarActionVarying::VaryingAppliedLoadLocation() const { return (IfcShapeAspect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(12))); }
 void IfcStructuralPlanarActionVarying::setVaryingAppliedLoadLocation(IfcShapeAspect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(12,v); }
-SHARED_PTR< IfcTemplatedEntityList< IfcStructuralLoad > > IfcStructuralPlanarActionVarying::SubsequentAppliedLoads() { RETURN_AS_LIST(IfcStructuralLoad,13) }
-void IfcStructuralPlanarActionVarying::setSubsequentAppliedLoads(SHARED_PTR< IfcTemplatedEntityList< IfcStructuralLoad > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(13,v->generalize()); }
+IfcTemplatedEntityList< IfcStructuralLoad >::ptr IfcStructuralPlanarActionVarying::SubsequentAppliedLoads() const { IfcEntityList::ptr es = *entity->getArgument(13); return es->as<IfcStructuralLoad>(); }
+void IfcStructuralPlanarActionVarying::setSubsequentAppliedLoads(IfcTemplatedEntityList< IfcStructuralLoad >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(13,v->generalize()); }
 bool IfcStructuralPlanarActionVarying::is(Type::Enum v) const { return v == Type::IfcStructuralPlanarActionVarying || IfcStructuralPlanarAction::is(v); }
 Type::Enum IfcStructuralPlanarActionVarying::type() const { return Type::IfcStructuralPlanarActionVarying; }
 Type::Enum IfcStructuralPlanarActionVarying::Class() { return Type::IfcStructuralPlanarActionVarying; }
-IfcStructuralPlanarActionVarying::IfcStructuralPlanarActionVarying(IfcAbstractEntityPtr e) : IfcStructuralPlanarAction((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcStructuralPlanarActionVarying)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcStructuralPlanarActionVarying::IfcStructuralPlanarActionVarying(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcStructuralLoad* v8_AppliedLoad, IfcGlobalOrLocalEnum::IfcGlobalOrLocalEnum v9_GlobalOrLocal, bool v10_DestabilizingLoad, IfcStructuralReaction* v11_CausedBy, IfcProjectedOrTrueLengthEnum::IfcProjectedOrTrueLengthEnum v12_ProjectedOrTrue, IfcShapeAspect* v13_VaryingAppliedLoadLocation, SHARED_PTR< IfcTemplatedEntityList< IfcStructuralLoad > > v14_SubsequentAppliedLoads) : IfcStructuralPlanarAction((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); e->setArgument(7,(v8_AppliedLoad)); e->setArgument(8,v9_GlobalOrLocal,IfcGlobalOrLocalEnum::ToString(v9_GlobalOrLocal)); e->setArgument(9,(v10_DestabilizingLoad)); e->setArgument(10,(v11_CausedBy)); e->setArgument(11,v12_ProjectedOrTrue,IfcProjectedOrTrueLengthEnum::ToString(v12_ProjectedOrTrue)); e->setArgument(12,(v13_VaryingAppliedLoadLocation)); e->setArgument(13,(v14_SubsequentAppliedLoads)->generalize()); entity = e; EntityBuffer::Add(this); }
+IfcStructuralPlanarActionVarying::IfcStructuralPlanarActionVarying(IfcAbstractEntity* e) : IfcStructuralPlanarAction((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcStructuralPlanarActionVarying)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcStructuralPlanarActionVarying::IfcStructuralPlanarActionVarying(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcStructuralLoad* v8_AppliedLoad, IfcGlobalOrLocalEnum::IfcGlobalOrLocalEnum v9_GlobalOrLocal, bool v10_DestabilizingLoad, IfcStructuralReaction* v11_CausedBy, IfcProjectedOrTrueLengthEnum::IfcProjectedOrTrueLengthEnum v12_ProjectedOrTrue, IfcShapeAspect* v13_VaryingAppliedLoadLocation, IfcTemplatedEntityList< IfcStructuralLoad >::ptr v14_SubsequentAppliedLoads) : IfcStructuralPlanarAction((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); e->setArgument(7,(v8_AppliedLoad)); e->setArgument(8,v9_GlobalOrLocal,IfcGlobalOrLocalEnum::ToString(v9_GlobalOrLocal)); e->setArgument(9,(v10_DestabilizingLoad)); e->setArgument(10,(v11_CausedBy)); e->setArgument(11,v12_ProjectedOrTrue,IfcProjectedOrTrueLengthEnum::ToString(v12_ProjectedOrTrue)); e->setArgument(12,(v13_VaryingAppliedLoadLocation)); e->setArgument(13,(v14_SubsequentAppliedLoads)->generalize()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcStructuralPointAction
 bool IfcStructuralPointAction::is(Type::Enum v) const { return v == Type::IfcStructuralPointAction || IfcStructuralAction::is(v); }
 Type::Enum IfcStructuralPointAction::type() const { return Type::IfcStructuralPointAction; }
 Type::Enum IfcStructuralPointAction::Class() { return Type::IfcStructuralPointAction; }
-IfcStructuralPointAction::IfcStructuralPointAction(IfcAbstractEntityPtr e) : IfcStructuralAction((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcStructuralPointAction)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcStructuralPointAction::IfcStructuralPointAction(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcStructuralLoad* v8_AppliedLoad, IfcGlobalOrLocalEnum::IfcGlobalOrLocalEnum v9_GlobalOrLocal, bool v10_DestabilizingLoad, IfcStructuralReaction* v11_CausedBy) : IfcStructuralAction((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); e->setArgument(7,(v8_AppliedLoad)); e->setArgument(8,v9_GlobalOrLocal,IfcGlobalOrLocalEnum::ToString(v9_GlobalOrLocal)); e->setArgument(9,(v10_DestabilizingLoad)); e->setArgument(10,(v11_CausedBy)); entity = e; EntityBuffer::Add(this); }
+IfcStructuralPointAction::IfcStructuralPointAction(IfcAbstractEntity* e) : IfcStructuralAction((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcStructuralPointAction)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcStructuralPointAction::IfcStructuralPointAction(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcStructuralLoad* v8_AppliedLoad, IfcGlobalOrLocalEnum::IfcGlobalOrLocalEnum v9_GlobalOrLocal, bool v10_DestabilizingLoad, IfcStructuralReaction* v11_CausedBy) : IfcStructuralAction((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); e->setArgument(7,(v8_AppliedLoad)); e->setArgument(8,v9_GlobalOrLocal,IfcGlobalOrLocalEnum::ToString(v9_GlobalOrLocal)); e->setArgument(9,(v10_DestabilizingLoad)); e->setArgument(10,(v11_CausedBy)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcStructuralPointConnection
 bool IfcStructuralPointConnection::is(Type::Enum v) const { return v == Type::IfcStructuralPointConnection || IfcStructuralConnection::is(v); }
 Type::Enum IfcStructuralPointConnection::type() const { return Type::IfcStructuralPointConnection; }
 Type::Enum IfcStructuralPointConnection::Class() { return Type::IfcStructuralPointConnection; }
-IfcStructuralPointConnection::IfcStructuralPointConnection(IfcAbstractEntityPtr e) : IfcStructuralConnection((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcStructuralPointConnection)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcStructuralPointConnection::IfcStructuralPointConnection(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcBoundaryCondition* v8_AppliedCondition) : IfcStructuralConnection((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); e->setArgument(7,(v8_AppliedCondition)); entity = e; EntityBuffer::Add(this); }
+IfcStructuralPointConnection::IfcStructuralPointConnection(IfcAbstractEntity* e) : IfcStructuralConnection((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcStructuralPointConnection)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcStructuralPointConnection::IfcStructuralPointConnection(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcBoundaryCondition* v8_AppliedCondition) : IfcStructuralConnection((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); e->setArgument(7,(v8_AppliedCondition)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcStructuralPointReaction
 bool IfcStructuralPointReaction::is(Type::Enum v) const { return v == Type::IfcStructuralPointReaction || IfcStructuralReaction::is(v); }
 Type::Enum IfcStructuralPointReaction::type() const { return Type::IfcStructuralPointReaction; }
 Type::Enum IfcStructuralPointReaction::Class() { return Type::IfcStructuralPointReaction; }
-IfcStructuralPointReaction::IfcStructuralPointReaction(IfcAbstractEntityPtr e) : IfcStructuralReaction((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcStructuralPointReaction)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcStructuralPointReaction::IfcStructuralPointReaction(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcStructuralLoad* v8_AppliedLoad, IfcGlobalOrLocalEnum::IfcGlobalOrLocalEnum v9_GlobalOrLocal) : IfcStructuralReaction((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); e->setArgument(7,(v8_AppliedLoad)); e->setArgument(8,v9_GlobalOrLocal,IfcGlobalOrLocalEnum::ToString(v9_GlobalOrLocal)); entity = e; EntityBuffer::Add(this); }
+IfcStructuralPointReaction::IfcStructuralPointReaction(IfcAbstractEntity* e) : IfcStructuralReaction((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcStructuralPointReaction)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcStructuralPointReaction::IfcStructuralPointReaction(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcStructuralLoad* v8_AppliedLoad, IfcGlobalOrLocalEnum::IfcGlobalOrLocalEnum v9_GlobalOrLocal) : IfcStructuralReaction((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); e->setArgument(7,(v8_AppliedLoad)); e->setArgument(8,v9_GlobalOrLocal,IfcGlobalOrLocalEnum::ToString(v9_GlobalOrLocal)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcStructuralProfileProperties
-bool IfcStructuralProfileProperties::hasTorsionalConstantX() { return !entity->getArgument(7)->isNull(); }
-IfcMomentOfInertiaMeasure IfcStructuralProfileProperties::TorsionalConstantX() { return *entity->getArgument(7); }
-void IfcStructuralProfileProperties::setTorsionalConstantX(IfcMomentOfInertiaMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
-bool IfcStructuralProfileProperties::hasMomentOfInertiaYZ() { return !entity->getArgument(8)->isNull(); }
-IfcMomentOfInertiaMeasure IfcStructuralProfileProperties::MomentOfInertiaYZ() { return *entity->getArgument(8); }
-void IfcStructuralProfileProperties::setMomentOfInertiaYZ(IfcMomentOfInertiaMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
-bool IfcStructuralProfileProperties::hasMomentOfInertiaY() { return !entity->getArgument(9)->isNull(); }
-IfcMomentOfInertiaMeasure IfcStructuralProfileProperties::MomentOfInertiaY() { return *entity->getArgument(9); }
-void IfcStructuralProfileProperties::setMomentOfInertiaY(IfcMomentOfInertiaMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
-bool IfcStructuralProfileProperties::hasMomentOfInertiaZ() { return !entity->getArgument(10)->isNull(); }
-IfcMomentOfInertiaMeasure IfcStructuralProfileProperties::MomentOfInertiaZ() { return *entity->getArgument(10); }
-void IfcStructuralProfileProperties::setMomentOfInertiaZ(IfcMomentOfInertiaMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
-bool IfcStructuralProfileProperties::hasWarpingConstant() { return !entity->getArgument(11)->isNull(); }
-IfcWarpingConstantMeasure IfcStructuralProfileProperties::WarpingConstant() { return *entity->getArgument(11); }
-void IfcStructuralProfileProperties::setWarpingConstant(IfcWarpingConstantMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(11,v); }
-bool IfcStructuralProfileProperties::hasShearCentreZ() { return !entity->getArgument(12)->isNull(); }
-IfcLengthMeasure IfcStructuralProfileProperties::ShearCentreZ() { return *entity->getArgument(12); }
-void IfcStructuralProfileProperties::setShearCentreZ(IfcLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(12,v); }
-bool IfcStructuralProfileProperties::hasShearCentreY() { return !entity->getArgument(13)->isNull(); }
-IfcLengthMeasure IfcStructuralProfileProperties::ShearCentreY() { return *entity->getArgument(13); }
-void IfcStructuralProfileProperties::setShearCentreY(IfcLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(13,v); }
-bool IfcStructuralProfileProperties::hasShearDeformationAreaZ() { return !entity->getArgument(14)->isNull(); }
-IfcAreaMeasure IfcStructuralProfileProperties::ShearDeformationAreaZ() { return *entity->getArgument(14); }
-void IfcStructuralProfileProperties::setShearDeformationAreaZ(IfcAreaMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(14,v); }
-bool IfcStructuralProfileProperties::hasShearDeformationAreaY() { return !entity->getArgument(15)->isNull(); }
-IfcAreaMeasure IfcStructuralProfileProperties::ShearDeformationAreaY() { return *entity->getArgument(15); }
-void IfcStructuralProfileProperties::setShearDeformationAreaY(IfcAreaMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(15,v); }
-bool IfcStructuralProfileProperties::hasMaximumSectionModulusY() { return !entity->getArgument(16)->isNull(); }
-IfcSectionModulusMeasure IfcStructuralProfileProperties::MaximumSectionModulusY() { return *entity->getArgument(16); }
-void IfcStructuralProfileProperties::setMaximumSectionModulusY(IfcSectionModulusMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(16,v); }
-bool IfcStructuralProfileProperties::hasMinimumSectionModulusY() { return !entity->getArgument(17)->isNull(); }
-IfcSectionModulusMeasure IfcStructuralProfileProperties::MinimumSectionModulusY() { return *entity->getArgument(17); }
-void IfcStructuralProfileProperties::setMinimumSectionModulusY(IfcSectionModulusMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(17,v); }
-bool IfcStructuralProfileProperties::hasMaximumSectionModulusZ() { return !entity->getArgument(18)->isNull(); }
-IfcSectionModulusMeasure IfcStructuralProfileProperties::MaximumSectionModulusZ() { return *entity->getArgument(18); }
-void IfcStructuralProfileProperties::setMaximumSectionModulusZ(IfcSectionModulusMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(18,v); }
-bool IfcStructuralProfileProperties::hasMinimumSectionModulusZ() { return !entity->getArgument(19)->isNull(); }
-IfcSectionModulusMeasure IfcStructuralProfileProperties::MinimumSectionModulusZ() { return *entity->getArgument(19); }
-void IfcStructuralProfileProperties::setMinimumSectionModulusZ(IfcSectionModulusMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(19,v); }
-bool IfcStructuralProfileProperties::hasTorsionalSectionModulus() { return !entity->getArgument(20)->isNull(); }
-IfcSectionModulusMeasure IfcStructuralProfileProperties::TorsionalSectionModulus() { return *entity->getArgument(20); }
-void IfcStructuralProfileProperties::setTorsionalSectionModulus(IfcSectionModulusMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(20,v); }
-bool IfcStructuralProfileProperties::hasCentreOfGravityInX() { return !entity->getArgument(21)->isNull(); }
-IfcLengthMeasure IfcStructuralProfileProperties::CentreOfGravityInX() { return *entity->getArgument(21); }
-void IfcStructuralProfileProperties::setCentreOfGravityInX(IfcLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(21,v); }
-bool IfcStructuralProfileProperties::hasCentreOfGravityInY() { return !entity->getArgument(22)->isNull(); }
-IfcLengthMeasure IfcStructuralProfileProperties::CentreOfGravityInY() { return *entity->getArgument(22); }
-void IfcStructuralProfileProperties::setCentreOfGravityInY(IfcLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(22,v); }
+bool IfcStructuralProfileProperties::hasTorsionalConstantX() const { return !entity->getArgument(7)->isNull(); }
+double IfcStructuralProfileProperties::TorsionalConstantX() const { return *entity->getArgument(7); }
+void IfcStructuralProfileProperties::setTorsionalConstantX(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
+bool IfcStructuralProfileProperties::hasMomentOfInertiaYZ() const { return !entity->getArgument(8)->isNull(); }
+double IfcStructuralProfileProperties::MomentOfInertiaYZ() const { return *entity->getArgument(8); }
+void IfcStructuralProfileProperties::setMomentOfInertiaYZ(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
+bool IfcStructuralProfileProperties::hasMomentOfInertiaY() const { return !entity->getArgument(9)->isNull(); }
+double IfcStructuralProfileProperties::MomentOfInertiaY() const { return *entity->getArgument(9); }
+void IfcStructuralProfileProperties::setMomentOfInertiaY(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
+bool IfcStructuralProfileProperties::hasMomentOfInertiaZ() const { return !entity->getArgument(10)->isNull(); }
+double IfcStructuralProfileProperties::MomentOfInertiaZ() const { return *entity->getArgument(10); }
+void IfcStructuralProfileProperties::setMomentOfInertiaZ(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
+bool IfcStructuralProfileProperties::hasWarpingConstant() const { return !entity->getArgument(11)->isNull(); }
+double IfcStructuralProfileProperties::WarpingConstant() const { return *entity->getArgument(11); }
+void IfcStructuralProfileProperties::setWarpingConstant(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(11,v); }
+bool IfcStructuralProfileProperties::hasShearCentreZ() const { return !entity->getArgument(12)->isNull(); }
+double IfcStructuralProfileProperties::ShearCentreZ() const { return *entity->getArgument(12); }
+void IfcStructuralProfileProperties::setShearCentreZ(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(12,v); }
+bool IfcStructuralProfileProperties::hasShearCentreY() const { return !entity->getArgument(13)->isNull(); }
+double IfcStructuralProfileProperties::ShearCentreY() const { return *entity->getArgument(13); }
+void IfcStructuralProfileProperties::setShearCentreY(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(13,v); }
+bool IfcStructuralProfileProperties::hasShearDeformationAreaZ() const { return !entity->getArgument(14)->isNull(); }
+double IfcStructuralProfileProperties::ShearDeformationAreaZ() const { return *entity->getArgument(14); }
+void IfcStructuralProfileProperties::setShearDeformationAreaZ(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(14,v); }
+bool IfcStructuralProfileProperties::hasShearDeformationAreaY() const { return !entity->getArgument(15)->isNull(); }
+double IfcStructuralProfileProperties::ShearDeformationAreaY() const { return *entity->getArgument(15); }
+void IfcStructuralProfileProperties::setShearDeformationAreaY(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(15,v); }
+bool IfcStructuralProfileProperties::hasMaximumSectionModulusY() const { return !entity->getArgument(16)->isNull(); }
+double IfcStructuralProfileProperties::MaximumSectionModulusY() const { return *entity->getArgument(16); }
+void IfcStructuralProfileProperties::setMaximumSectionModulusY(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(16,v); }
+bool IfcStructuralProfileProperties::hasMinimumSectionModulusY() const { return !entity->getArgument(17)->isNull(); }
+double IfcStructuralProfileProperties::MinimumSectionModulusY() const { return *entity->getArgument(17); }
+void IfcStructuralProfileProperties::setMinimumSectionModulusY(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(17,v); }
+bool IfcStructuralProfileProperties::hasMaximumSectionModulusZ() const { return !entity->getArgument(18)->isNull(); }
+double IfcStructuralProfileProperties::MaximumSectionModulusZ() const { return *entity->getArgument(18); }
+void IfcStructuralProfileProperties::setMaximumSectionModulusZ(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(18,v); }
+bool IfcStructuralProfileProperties::hasMinimumSectionModulusZ() const { return !entity->getArgument(19)->isNull(); }
+double IfcStructuralProfileProperties::MinimumSectionModulusZ() const { return *entity->getArgument(19); }
+void IfcStructuralProfileProperties::setMinimumSectionModulusZ(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(19,v); }
+bool IfcStructuralProfileProperties::hasTorsionalSectionModulus() const { return !entity->getArgument(20)->isNull(); }
+double IfcStructuralProfileProperties::TorsionalSectionModulus() const { return *entity->getArgument(20); }
+void IfcStructuralProfileProperties::setTorsionalSectionModulus(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(20,v); }
+bool IfcStructuralProfileProperties::hasCentreOfGravityInX() const { return !entity->getArgument(21)->isNull(); }
+double IfcStructuralProfileProperties::CentreOfGravityInX() const { return *entity->getArgument(21); }
+void IfcStructuralProfileProperties::setCentreOfGravityInX(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(21,v); }
+bool IfcStructuralProfileProperties::hasCentreOfGravityInY() const { return !entity->getArgument(22)->isNull(); }
+double IfcStructuralProfileProperties::CentreOfGravityInY() const { return *entity->getArgument(22); }
+void IfcStructuralProfileProperties::setCentreOfGravityInY(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(22,v); }
 bool IfcStructuralProfileProperties::is(Type::Enum v) const { return v == Type::IfcStructuralProfileProperties || IfcGeneralProfileProperties::is(v); }
 Type::Enum IfcStructuralProfileProperties::type() const { return Type::IfcStructuralProfileProperties; }
 Type::Enum IfcStructuralProfileProperties::Class() { return Type::IfcStructuralProfileProperties; }
-IfcStructuralProfileProperties::IfcStructuralProfileProperties(IfcAbstractEntityPtr e) : IfcGeneralProfileProperties((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcStructuralProfileProperties)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcStructuralProfileProperties::IfcStructuralProfileProperties(boost::optional< IfcLabel > v1_ProfileName, IfcProfileDef* v2_ProfileDefinition, boost::optional< IfcMassPerLengthMeasure > v3_PhysicalWeight, boost::optional< IfcPositiveLengthMeasure > v4_Perimeter, boost::optional< IfcPositiveLengthMeasure > v5_MinimumPlateThickness, boost::optional< IfcPositiveLengthMeasure > v6_MaximumPlateThickness, boost::optional< IfcAreaMeasure > v7_CrossSectionArea, boost::optional< IfcMomentOfInertiaMeasure > v8_TorsionalConstantX, boost::optional< IfcMomentOfInertiaMeasure > v9_MomentOfInertiaYZ, boost::optional< IfcMomentOfInertiaMeasure > v10_MomentOfInertiaY, boost::optional< IfcMomentOfInertiaMeasure > v11_MomentOfInertiaZ, boost::optional< IfcWarpingConstantMeasure > v12_WarpingConstant, boost::optional< IfcLengthMeasure > v13_ShearCentreZ, boost::optional< IfcLengthMeasure > v14_ShearCentreY, boost::optional< IfcAreaMeasure > v15_ShearDeformationAreaZ, boost::optional< IfcAreaMeasure > v16_ShearDeformationAreaY, boost::optional< IfcSectionModulusMeasure > v17_MaximumSectionModulusY, boost::optional< IfcSectionModulusMeasure > v18_MinimumSectionModulusY, boost::optional< IfcSectionModulusMeasure > v19_MaximumSectionModulusZ, boost::optional< IfcSectionModulusMeasure > v20_MinimumSectionModulusZ, boost::optional< IfcSectionModulusMeasure > v21_TorsionalSectionModulus, boost::optional< IfcLengthMeasure > v22_CentreOfGravityInX, boost::optional< IfcLengthMeasure > v23_CentreOfGravityInY) : IfcGeneralProfileProperties((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_ProfileName) { e->setArgument(0,(*v1_ProfileName)); } else { e->setArgument(0); } e->setArgument(1,(v2_ProfileDefinition)); if (v3_PhysicalWeight) { e->setArgument(2,(*v3_PhysicalWeight)); } else { e->setArgument(2); } if (v4_Perimeter) { e->setArgument(3,(*v4_Perimeter)); } else { e->setArgument(3); } if (v5_MinimumPlateThickness) { e->setArgument(4,(*v5_MinimumPlateThickness)); } else { e->setArgument(4); } if (v6_MaximumPlateThickness) { e->setArgument(5,(*v6_MaximumPlateThickness)); } else { e->setArgument(5); } if (v7_CrossSectionArea) { e->setArgument(6,(*v7_CrossSectionArea)); } else { e->setArgument(6); } if (v8_TorsionalConstantX) { e->setArgument(7,(*v8_TorsionalConstantX)); } else { e->setArgument(7); } if (v9_MomentOfInertiaYZ) { e->setArgument(8,(*v9_MomentOfInertiaYZ)); } else { e->setArgument(8); } if (v10_MomentOfInertiaY) { e->setArgument(9,(*v10_MomentOfInertiaY)); } else { e->setArgument(9); } if (v11_MomentOfInertiaZ) { e->setArgument(10,(*v11_MomentOfInertiaZ)); } else { e->setArgument(10); } if (v12_WarpingConstant) { e->setArgument(11,(*v12_WarpingConstant)); } else { e->setArgument(11); } if (v13_ShearCentreZ) { e->setArgument(12,(*v13_ShearCentreZ)); } else { e->setArgument(12); } if (v14_ShearCentreY) { e->setArgument(13,(*v14_ShearCentreY)); } else { e->setArgument(13); } if (v15_ShearDeformationAreaZ) { e->setArgument(14,(*v15_ShearDeformationAreaZ)); } else { e->setArgument(14); } if (v16_ShearDeformationAreaY) { e->setArgument(15,(*v16_ShearDeformationAreaY)); } else { e->setArgument(15); } if (v17_MaximumSectionModulusY) { e->setArgument(16,(*v17_MaximumSectionModulusY)); } else { e->setArgument(16); } if (v18_MinimumSectionModulusY) { e->setArgument(17,(*v18_MinimumSectionModulusY)); } else { e->setArgument(17); } if (v19_MaximumSectionModulusZ) { e->setArgument(18,(*v19_MaximumSectionModulusZ)); } else { e->setArgument(18); } if (v20_MinimumSectionModulusZ) { e->setArgument(19,(*v20_MinimumSectionModulusZ)); } else { e->setArgument(19); } if (v21_TorsionalSectionModulus) { e->setArgument(20,(*v21_TorsionalSectionModulus)); } else { e->setArgument(20); } if (v22_CentreOfGravityInX) { e->setArgument(21,(*v22_CentreOfGravityInX)); } else { e->setArgument(21); } if (v23_CentreOfGravityInY) { e->setArgument(22,(*v23_CentreOfGravityInY)); } else { e->setArgument(22); } entity = e; EntityBuffer::Add(this); }
+IfcStructuralProfileProperties::IfcStructuralProfileProperties(IfcAbstractEntity* e) : IfcGeneralProfileProperties((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcStructuralProfileProperties)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcStructuralProfileProperties::IfcStructuralProfileProperties(boost::optional< std::string > v1_ProfileName, IfcProfileDef* v2_ProfileDefinition, boost::optional< double > v3_PhysicalWeight, boost::optional< double > v4_Perimeter, boost::optional< double > v5_MinimumPlateThickness, boost::optional< double > v6_MaximumPlateThickness, boost::optional< double > v7_CrossSectionArea, boost::optional< double > v8_TorsionalConstantX, boost::optional< double > v9_MomentOfInertiaYZ, boost::optional< double > v10_MomentOfInertiaY, boost::optional< double > v11_MomentOfInertiaZ, boost::optional< double > v12_WarpingConstant, boost::optional< double > v13_ShearCentreZ, boost::optional< double > v14_ShearCentreY, boost::optional< double > v15_ShearDeformationAreaZ, boost::optional< double > v16_ShearDeformationAreaY, boost::optional< double > v17_MaximumSectionModulusY, boost::optional< double > v18_MinimumSectionModulusY, boost::optional< double > v19_MaximumSectionModulusZ, boost::optional< double > v20_MinimumSectionModulusZ, boost::optional< double > v21_TorsionalSectionModulus, boost::optional< double > v22_CentreOfGravityInX, boost::optional< double > v23_CentreOfGravityInY) : IfcGeneralProfileProperties((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_ProfileName) { e->setArgument(0,(*v1_ProfileName)); } else { e->setArgument(0); } e->setArgument(1,(v2_ProfileDefinition)); if (v3_PhysicalWeight) { e->setArgument(2,(*v3_PhysicalWeight)); } else { e->setArgument(2); } if (v4_Perimeter) { e->setArgument(3,(*v4_Perimeter)); } else { e->setArgument(3); } if (v5_MinimumPlateThickness) { e->setArgument(4,(*v5_MinimumPlateThickness)); } else { e->setArgument(4); } if (v6_MaximumPlateThickness) { e->setArgument(5,(*v6_MaximumPlateThickness)); } else { e->setArgument(5); } if (v7_CrossSectionArea) { e->setArgument(6,(*v7_CrossSectionArea)); } else { e->setArgument(6); } if (v8_TorsionalConstantX) { e->setArgument(7,(*v8_TorsionalConstantX)); } else { e->setArgument(7); } if (v9_MomentOfInertiaYZ) { e->setArgument(8,(*v9_MomentOfInertiaYZ)); } else { e->setArgument(8); } if (v10_MomentOfInertiaY) { e->setArgument(9,(*v10_MomentOfInertiaY)); } else { e->setArgument(9); } if (v11_MomentOfInertiaZ) { e->setArgument(10,(*v11_MomentOfInertiaZ)); } else { e->setArgument(10); } if (v12_WarpingConstant) { e->setArgument(11,(*v12_WarpingConstant)); } else { e->setArgument(11); } if (v13_ShearCentreZ) { e->setArgument(12,(*v13_ShearCentreZ)); } else { e->setArgument(12); } if (v14_ShearCentreY) { e->setArgument(13,(*v14_ShearCentreY)); } else { e->setArgument(13); } if (v15_ShearDeformationAreaZ) { e->setArgument(14,(*v15_ShearDeformationAreaZ)); } else { e->setArgument(14); } if (v16_ShearDeformationAreaY) { e->setArgument(15,(*v16_ShearDeformationAreaY)); } else { e->setArgument(15); } if (v17_MaximumSectionModulusY) { e->setArgument(16,(*v17_MaximumSectionModulusY)); } else { e->setArgument(16); } if (v18_MinimumSectionModulusY) { e->setArgument(17,(*v18_MinimumSectionModulusY)); } else { e->setArgument(17); } if (v19_MaximumSectionModulusZ) { e->setArgument(18,(*v19_MaximumSectionModulusZ)); } else { e->setArgument(18); } if (v20_MinimumSectionModulusZ) { e->setArgument(19,(*v20_MinimumSectionModulusZ)); } else { e->setArgument(19); } if (v21_TorsionalSectionModulus) { e->setArgument(20,(*v21_TorsionalSectionModulus)); } else { e->setArgument(20); } if (v22_CentreOfGravityInX) { e->setArgument(21,(*v22_CentreOfGravityInX)); } else { e->setArgument(21); } if (v23_CentreOfGravityInY) { e->setArgument(22,(*v23_CentreOfGravityInY)); } else { e->setArgument(22); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcStructuralReaction
-IfcStructuralAction::list IfcStructuralReaction::Causes() { RETURN_INVERSE(IfcStructuralAction) }
+IfcStructuralAction::list::ptr IfcStructuralReaction::Causes() const { return entity->getInverse(Type::IfcStructuralAction, 10)->as<IfcStructuralAction>(); }
 bool IfcStructuralReaction::is(Type::Enum v) const { return v == Type::IfcStructuralReaction || IfcStructuralActivity::is(v); }
 Type::Enum IfcStructuralReaction::type() const { return Type::IfcStructuralReaction; }
 Type::Enum IfcStructuralReaction::Class() { return Type::IfcStructuralReaction; }
-IfcStructuralReaction::IfcStructuralReaction(IfcAbstractEntityPtr e) : IfcStructuralActivity((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcStructuralReaction)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcStructuralReaction::IfcStructuralReaction(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcStructuralLoad* v8_AppliedLoad, IfcGlobalOrLocalEnum::IfcGlobalOrLocalEnum v9_GlobalOrLocal) : IfcStructuralActivity((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); e->setArgument(7,(v8_AppliedLoad)); e->setArgument(8,v9_GlobalOrLocal,IfcGlobalOrLocalEnum::ToString(v9_GlobalOrLocal)); entity = e; EntityBuffer::Add(this); }
+IfcStructuralReaction::IfcStructuralReaction(IfcAbstractEntity* e) : IfcStructuralActivity((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcStructuralReaction)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcStructuralReaction::IfcStructuralReaction(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcStructuralLoad* v8_AppliedLoad, IfcGlobalOrLocalEnum::IfcGlobalOrLocalEnum v9_GlobalOrLocal) : IfcStructuralActivity((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); e->setArgument(7,(v8_AppliedLoad)); e->setArgument(8,v9_GlobalOrLocal,IfcGlobalOrLocalEnum::ToString(v9_GlobalOrLocal)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcStructuralResultGroup
-IfcAnalysisTheoryTypeEnum::IfcAnalysisTheoryTypeEnum IfcStructuralResultGroup::TheoryType() { return IfcAnalysisTheoryTypeEnum::FromString(*entity->getArgument(5)); }
+IfcAnalysisTheoryTypeEnum::IfcAnalysisTheoryTypeEnum IfcStructuralResultGroup::TheoryType() const { return IfcAnalysisTheoryTypeEnum::FromString(*entity->getArgument(5)); }
 void IfcStructuralResultGroup::setTheoryType(IfcAnalysisTheoryTypeEnum::IfcAnalysisTheoryTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v,IfcAnalysisTheoryTypeEnum::ToString(v)); }
-bool IfcStructuralResultGroup::hasResultForLoadGroup() { return !entity->getArgument(6)->isNull(); }
-IfcStructuralLoadGroup* IfcStructuralResultGroup::ResultForLoadGroup() { return (IfcStructuralLoadGroup*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(6))); }
+bool IfcStructuralResultGroup::hasResultForLoadGroup() const { return !entity->getArgument(6)->isNull(); }
+IfcStructuralLoadGroup* IfcStructuralResultGroup::ResultForLoadGroup() const { return (IfcStructuralLoadGroup*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(6))); }
 void IfcStructuralResultGroup::setResultForLoadGroup(IfcStructuralLoadGroup* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
-bool IfcStructuralResultGroup::IsLinear() { return *entity->getArgument(7); }
+bool IfcStructuralResultGroup::IsLinear() const { return *entity->getArgument(7); }
 void IfcStructuralResultGroup::setIsLinear(bool v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
-IfcStructuralAnalysisModel::list IfcStructuralResultGroup::ResultGroupFor() { RETURN_INVERSE(IfcStructuralAnalysisModel) }
+IfcStructuralAnalysisModel::list::ptr IfcStructuralResultGroup::ResultGroupFor() const { return entity->getInverse(Type::IfcStructuralAnalysisModel, 8)->as<IfcStructuralAnalysisModel>(); }
 bool IfcStructuralResultGroup::is(Type::Enum v) const { return v == Type::IfcStructuralResultGroup || IfcGroup::is(v); }
 Type::Enum IfcStructuralResultGroup::type() const { return Type::IfcStructuralResultGroup; }
 Type::Enum IfcStructuralResultGroup::Class() { return Type::IfcStructuralResultGroup; }
-IfcStructuralResultGroup::IfcStructuralResultGroup(IfcAbstractEntityPtr e) : IfcGroup((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcStructuralResultGroup)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcStructuralResultGroup::IfcStructuralResultGroup(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcAnalysisTheoryTypeEnum::IfcAnalysisTheoryTypeEnum v6_TheoryType, IfcStructuralLoadGroup* v7_ResultForLoadGroup, bool v8_IsLinear) : IfcGroup((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,v6_TheoryType,IfcAnalysisTheoryTypeEnum::ToString(v6_TheoryType)); e->setArgument(6,(v7_ResultForLoadGroup)); e->setArgument(7,(v8_IsLinear)); entity = e; EntityBuffer::Add(this); }
+IfcStructuralResultGroup::IfcStructuralResultGroup(IfcAbstractEntity* e) : IfcGroup((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcStructuralResultGroup)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcStructuralResultGroup::IfcStructuralResultGroup(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcAnalysisTheoryTypeEnum::IfcAnalysisTheoryTypeEnum v6_TheoryType, IfcStructuralLoadGroup* v7_ResultForLoadGroup, bool v8_IsLinear) : IfcGroup((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,v6_TheoryType,IfcAnalysisTheoryTypeEnum::ToString(v6_TheoryType)); e->setArgument(6,(v7_ResultForLoadGroup)); e->setArgument(7,(v8_IsLinear)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcStructuralSteelProfileProperties
-bool IfcStructuralSteelProfileProperties::hasShearAreaZ() { return !entity->getArgument(23)->isNull(); }
-IfcAreaMeasure IfcStructuralSteelProfileProperties::ShearAreaZ() { return *entity->getArgument(23); }
-void IfcStructuralSteelProfileProperties::setShearAreaZ(IfcAreaMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(23,v); }
-bool IfcStructuralSteelProfileProperties::hasShearAreaY() { return !entity->getArgument(24)->isNull(); }
-IfcAreaMeasure IfcStructuralSteelProfileProperties::ShearAreaY() { return *entity->getArgument(24); }
-void IfcStructuralSteelProfileProperties::setShearAreaY(IfcAreaMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(24,v); }
-bool IfcStructuralSteelProfileProperties::hasPlasticShapeFactorY() { return !entity->getArgument(25)->isNull(); }
-IfcPositiveRatioMeasure IfcStructuralSteelProfileProperties::PlasticShapeFactorY() { return *entity->getArgument(25); }
-void IfcStructuralSteelProfileProperties::setPlasticShapeFactorY(IfcPositiveRatioMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(25,v); }
-bool IfcStructuralSteelProfileProperties::hasPlasticShapeFactorZ() { return !entity->getArgument(26)->isNull(); }
-IfcPositiveRatioMeasure IfcStructuralSteelProfileProperties::PlasticShapeFactorZ() { return *entity->getArgument(26); }
-void IfcStructuralSteelProfileProperties::setPlasticShapeFactorZ(IfcPositiveRatioMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(26,v); }
+bool IfcStructuralSteelProfileProperties::hasShearAreaZ() const { return !entity->getArgument(23)->isNull(); }
+double IfcStructuralSteelProfileProperties::ShearAreaZ() const { return *entity->getArgument(23); }
+void IfcStructuralSteelProfileProperties::setShearAreaZ(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(23,v); }
+bool IfcStructuralSteelProfileProperties::hasShearAreaY() const { return !entity->getArgument(24)->isNull(); }
+double IfcStructuralSteelProfileProperties::ShearAreaY() const { return *entity->getArgument(24); }
+void IfcStructuralSteelProfileProperties::setShearAreaY(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(24,v); }
+bool IfcStructuralSteelProfileProperties::hasPlasticShapeFactorY() const { return !entity->getArgument(25)->isNull(); }
+double IfcStructuralSteelProfileProperties::PlasticShapeFactorY() const { return *entity->getArgument(25); }
+void IfcStructuralSteelProfileProperties::setPlasticShapeFactorY(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(25,v); }
+bool IfcStructuralSteelProfileProperties::hasPlasticShapeFactorZ() const { return !entity->getArgument(26)->isNull(); }
+double IfcStructuralSteelProfileProperties::PlasticShapeFactorZ() const { return *entity->getArgument(26); }
+void IfcStructuralSteelProfileProperties::setPlasticShapeFactorZ(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(26,v); }
 bool IfcStructuralSteelProfileProperties::is(Type::Enum v) const { return v == Type::IfcStructuralSteelProfileProperties || IfcStructuralProfileProperties::is(v); }
 Type::Enum IfcStructuralSteelProfileProperties::type() const { return Type::IfcStructuralSteelProfileProperties; }
 Type::Enum IfcStructuralSteelProfileProperties::Class() { return Type::IfcStructuralSteelProfileProperties; }
-IfcStructuralSteelProfileProperties::IfcStructuralSteelProfileProperties(IfcAbstractEntityPtr e) : IfcStructuralProfileProperties((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcStructuralSteelProfileProperties)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcStructuralSteelProfileProperties::IfcStructuralSteelProfileProperties(boost::optional< IfcLabel > v1_ProfileName, IfcProfileDef* v2_ProfileDefinition, boost::optional< IfcMassPerLengthMeasure > v3_PhysicalWeight, boost::optional< IfcPositiveLengthMeasure > v4_Perimeter, boost::optional< IfcPositiveLengthMeasure > v5_MinimumPlateThickness, boost::optional< IfcPositiveLengthMeasure > v6_MaximumPlateThickness, boost::optional< IfcAreaMeasure > v7_CrossSectionArea, boost::optional< IfcMomentOfInertiaMeasure > v8_TorsionalConstantX, boost::optional< IfcMomentOfInertiaMeasure > v9_MomentOfInertiaYZ, boost::optional< IfcMomentOfInertiaMeasure > v10_MomentOfInertiaY, boost::optional< IfcMomentOfInertiaMeasure > v11_MomentOfInertiaZ, boost::optional< IfcWarpingConstantMeasure > v12_WarpingConstant, boost::optional< IfcLengthMeasure > v13_ShearCentreZ, boost::optional< IfcLengthMeasure > v14_ShearCentreY, boost::optional< IfcAreaMeasure > v15_ShearDeformationAreaZ, boost::optional< IfcAreaMeasure > v16_ShearDeformationAreaY, boost::optional< IfcSectionModulusMeasure > v17_MaximumSectionModulusY, boost::optional< IfcSectionModulusMeasure > v18_MinimumSectionModulusY, boost::optional< IfcSectionModulusMeasure > v19_MaximumSectionModulusZ, boost::optional< IfcSectionModulusMeasure > v20_MinimumSectionModulusZ, boost::optional< IfcSectionModulusMeasure > v21_TorsionalSectionModulus, boost::optional< IfcLengthMeasure > v22_CentreOfGravityInX, boost::optional< IfcLengthMeasure > v23_CentreOfGravityInY, boost::optional< IfcAreaMeasure > v24_ShearAreaZ, boost::optional< IfcAreaMeasure > v25_ShearAreaY, boost::optional< IfcPositiveRatioMeasure > v26_PlasticShapeFactorY, boost::optional< IfcPositiveRatioMeasure > v27_PlasticShapeFactorZ) : IfcStructuralProfileProperties((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_ProfileName) { e->setArgument(0,(*v1_ProfileName)); } else { e->setArgument(0); } e->setArgument(1,(v2_ProfileDefinition)); if (v3_PhysicalWeight) { e->setArgument(2,(*v3_PhysicalWeight)); } else { e->setArgument(2); } if (v4_Perimeter) { e->setArgument(3,(*v4_Perimeter)); } else { e->setArgument(3); } if (v5_MinimumPlateThickness) { e->setArgument(4,(*v5_MinimumPlateThickness)); } else { e->setArgument(4); } if (v6_MaximumPlateThickness) { e->setArgument(5,(*v6_MaximumPlateThickness)); } else { e->setArgument(5); } if (v7_CrossSectionArea) { e->setArgument(6,(*v7_CrossSectionArea)); } else { e->setArgument(6); } if (v8_TorsionalConstantX) { e->setArgument(7,(*v8_TorsionalConstantX)); } else { e->setArgument(7); } if (v9_MomentOfInertiaYZ) { e->setArgument(8,(*v9_MomentOfInertiaYZ)); } else { e->setArgument(8); } if (v10_MomentOfInertiaY) { e->setArgument(9,(*v10_MomentOfInertiaY)); } else { e->setArgument(9); } if (v11_MomentOfInertiaZ) { e->setArgument(10,(*v11_MomentOfInertiaZ)); } else { e->setArgument(10); } if (v12_WarpingConstant) { e->setArgument(11,(*v12_WarpingConstant)); } else { e->setArgument(11); } if (v13_ShearCentreZ) { e->setArgument(12,(*v13_ShearCentreZ)); } else { e->setArgument(12); } if (v14_ShearCentreY) { e->setArgument(13,(*v14_ShearCentreY)); } else { e->setArgument(13); } if (v15_ShearDeformationAreaZ) { e->setArgument(14,(*v15_ShearDeformationAreaZ)); } else { e->setArgument(14); } if (v16_ShearDeformationAreaY) { e->setArgument(15,(*v16_ShearDeformationAreaY)); } else { e->setArgument(15); } if (v17_MaximumSectionModulusY) { e->setArgument(16,(*v17_MaximumSectionModulusY)); } else { e->setArgument(16); } if (v18_MinimumSectionModulusY) { e->setArgument(17,(*v18_MinimumSectionModulusY)); } else { e->setArgument(17); } if (v19_MaximumSectionModulusZ) { e->setArgument(18,(*v19_MaximumSectionModulusZ)); } else { e->setArgument(18); } if (v20_MinimumSectionModulusZ) { e->setArgument(19,(*v20_MinimumSectionModulusZ)); } else { e->setArgument(19); } if (v21_TorsionalSectionModulus) { e->setArgument(20,(*v21_TorsionalSectionModulus)); } else { e->setArgument(20); } if (v22_CentreOfGravityInX) { e->setArgument(21,(*v22_CentreOfGravityInX)); } else { e->setArgument(21); } if (v23_CentreOfGravityInY) { e->setArgument(22,(*v23_CentreOfGravityInY)); } else { e->setArgument(22); } if (v24_ShearAreaZ) { e->setArgument(23,(*v24_ShearAreaZ)); } else { e->setArgument(23); } if (v25_ShearAreaY) { e->setArgument(24,(*v25_ShearAreaY)); } else { e->setArgument(24); } if (v26_PlasticShapeFactorY) { e->setArgument(25,(*v26_PlasticShapeFactorY)); } else { e->setArgument(25); } if (v27_PlasticShapeFactorZ) { e->setArgument(26,(*v27_PlasticShapeFactorZ)); } else { e->setArgument(26); } entity = e; EntityBuffer::Add(this); }
+IfcStructuralSteelProfileProperties::IfcStructuralSteelProfileProperties(IfcAbstractEntity* e) : IfcStructuralProfileProperties((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcStructuralSteelProfileProperties)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcStructuralSteelProfileProperties::IfcStructuralSteelProfileProperties(boost::optional< std::string > v1_ProfileName, IfcProfileDef* v2_ProfileDefinition, boost::optional< double > v3_PhysicalWeight, boost::optional< double > v4_Perimeter, boost::optional< double > v5_MinimumPlateThickness, boost::optional< double > v6_MaximumPlateThickness, boost::optional< double > v7_CrossSectionArea, boost::optional< double > v8_TorsionalConstantX, boost::optional< double > v9_MomentOfInertiaYZ, boost::optional< double > v10_MomentOfInertiaY, boost::optional< double > v11_MomentOfInertiaZ, boost::optional< double > v12_WarpingConstant, boost::optional< double > v13_ShearCentreZ, boost::optional< double > v14_ShearCentreY, boost::optional< double > v15_ShearDeformationAreaZ, boost::optional< double > v16_ShearDeformationAreaY, boost::optional< double > v17_MaximumSectionModulusY, boost::optional< double > v18_MinimumSectionModulusY, boost::optional< double > v19_MaximumSectionModulusZ, boost::optional< double > v20_MinimumSectionModulusZ, boost::optional< double > v21_TorsionalSectionModulus, boost::optional< double > v22_CentreOfGravityInX, boost::optional< double > v23_CentreOfGravityInY, boost::optional< double > v24_ShearAreaZ, boost::optional< double > v25_ShearAreaY, boost::optional< double > v26_PlasticShapeFactorY, boost::optional< double > v27_PlasticShapeFactorZ) : IfcStructuralProfileProperties((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_ProfileName) { e->setArgument(0,(*v1_ProfileName)); } else { e->setArgument(0); } e->setArgument(1,(v2_ProfileDefinition)); if (v3_PhysicalWeight) { e->setArgument(2,(*v3_PhysicalWeight)); } else { e->setArgument(2); } if (v4_Perimeter) { e->setArgument(3,(*v4_Perimeter)); } else { e->setArgument(3); } if (v5_MinimumPlateThickness) { e->setArgument(4,(*v5_MinimumPlateThickness)); } else { e->setArgument(4); } if (v6_MaximumPlateThickness) { e->setArgument(5,(*v6_MaximumPlateThickness)); } else { e->setArgument(5); } if (v7_CrossSectionArea) { e->setArgument(6,(*v7_CrossSectionArea)); } else { e->setArgument(6); } if (v8_TorsionalConstantX) { e->setArgument(7,(*v8_TorsionalConstantX)); } else { e->setArgument(7); } if (v9_MomentOfInertiaYZ) { e->setArgument(8,(*v9_MomentOfInertiaYZ)); } else { e->setArgument(8); } if (v10_MomentOfInertiaY) { e->setArgument(9,(*v10_MomentOfInertiaY)); } else { e->setArgument(9); } if (v11_MomentOfInertiaZ) { e->setArgument(10,(*v11_MomentOfInertiaZ)); } else { e->setArgument(10); } if (v12_WarpingConstant) { e->setArgument(11,(*v12_WarpingConstant)); } else { e->setArgument(11); } if (v13_ShearCentreZ) { e->setArgument(12,(*v13_ShearCentreZ)); } else { e->setArgument(12); } if (v14_ShearCentreY) { e->setArgument(13,(*v14_ShearCentreY)); } else { e->setArgument(13); } if (v15_ShearDeformationAreaZ) { e->setArgument(14,(*v15_ShearDeformationAreaZ)); } else { e->setArgument(14); } if (v16_ShearDeformationAreaY) { e->setArgument(15,(*v16_ShearDeformationAreaY)); } else { e->setArgument(15); } if (v17_MaximumSectionModulusY) { e->setArgument(16,(*v17_MaximumSectionModulusY)); } else { e->setArgument(16); } if (v18_MinimumSectionModulusY) { e->setArgument(17,(*v18_MinimumSectionModulusY)); } else { e->setArgument(17); } if (v19_MaximumSectionModulusZ) { e->setArgument(18,(*v19_MaximumSectionModulusZ)); } else { e->setArgument(18); } if (v20_MinimumSectionModulusZ) { e->setArgument(19,(*v20_MinimumSectionModulusZ)); } else { e->setArgument(19); } if (v21_TorsionalSectionModulus) { e->setArgument(20,(*v21_TorsionalSectionModulus)); } else { e->setArgument(20); } if (v22_CentreOfGravityInX) { e->setArgument(21,(*v22_CentreOfGravityInX)); } else { e->setArgument(21); } if (v23_CentreOfGravityInY) { e->setArgument(22,(*v23_CentreOfGravityInY)); } else { e->setArgument(22); } if (v24_ShearAreaZ) { e->setArgument(23,(*v24_ShearAreaZ)); } else { e->setArgument(23); } if (v25_ShearAreaY) { e->setArgument(24,(*v25_ShearAreaY)); } else { e->setArgument(24); } if (v26_PlasticShapeFactorY) { e->setArgument(25,(*v26_PlasticShapeFactorY)); } else { e->setArgument(25); } if (v27_PlasticShapeFactorZ) { e->setArgument(26,(*v27_PlasticShapeFactorZ)); } else { e->setArgument(26); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcStructuralSurfaceConnection
 bool IfcStructuralSurfaceConnection::is(Type::Enum v) const { return v == Type::IfcStructuralSurfaceConnection || IfcStructuralConnection::is(v); }
 Type::Enum IfcStructuralSurfaceConnection::type() const { return Type::IfcStructuralSurfaceConnection; }
 Type::Enum IfcStructuralSurfaceConnection::Class() { return Type::IfcStructuralSurfaceConnection; }
-IfcStructuralSurfaceConnection::IfcStructuralSurfaceConnection(IfcAbstractEntityPtr e) : IfcStructuralConnection((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcStructuralSurfaceConnection)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcStructuralSurfaceConnection::IfcStructuralSurfaceConnection(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcBoundaryCondition* v8_AppliedCondition) : IfcStructuralConnection((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); e->setArgument(7,(v8_AppliedCondition)); entity = e; EntityBuffer::Add(this); }
+IfcStructuralSurfaceConnection::IfcStructuralSurfaceConnection(IfcAbstractEntity* e) : IfcStructuralConnection((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcStructuralSurfaceConnection)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcStructuralSurfaceConnection::IfcStructuralSurfaceConnection(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcBoundaryCondition* v8_AppliedCondition) : IfcStructuralConnection((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); e->setArgument(7,(v8_AppliedCondition)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcStructuralSurfaceMember
-IfcStructuralSurfaceTypeEnum::IfcStructuralSurfaceTypeEnum IfcStructuralSurfaceMember::PredefinedType() { return IfcStructuralSurfaceTypeEnum::FromString(*entity->getArgument(7)); }
+IfcStructuralSurfaceTypeEnum::IfcStructuralSurfaceTypeEnum IfcStructuralSurfaceMember::PredefinedType() const { return IfcStructuralSurfaceTypeEnum::FromString(*entity->getArgument(7)); }
 void IfcStructuralSurfaceMember::setPredefinedType(IfcStructuralSurfaceTypeEnum::IfcStructuralSurfaceTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v,IfcStructuralSurfaceTypeEnum::ToString(v)); }
-bool IfcStructuralSurfaceMember::hasThickness() { return !entity->getArgument(8)->isNull(); }
-IfcPositiveLengthMeasure IfcStructuralSurfaceMember::Thickness() { return *entity->getArgument(8); }
-void IfcStructuralSurfaceMember::setThickness(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
+bool IfcStructuralSurfaceMember::hasThickness() const { return !entity->getArgument(8)->isNull(); }
+double IfcStructuralSurfaceMember::Thickness() const { return *entity->getArgument(8); }
+void IfcStructuralSurfaceMember::setThickness(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
 bool IfcStructuralSurfaceMember::is(Type::Enum v) const { return v == Type::IfcStructuralSurfaceMember || IfcStructuralMember::is(v); }
 Type::Enum IfcStructuralSurfaceMember::type() const { return Type::IfcStructuralSurfaceMember; }
 Type::Enum IfcStructuralSurfaceMember::Class() { return Type::IfcStructuralSurfaceMember; }
-IfcStructuralSurfaceMember::IfcStructuralSurfaceMember(IfcAbstractEntityPtr e) : IfcStructuralMember((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcStructuralSurfaceMember)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcStructuralSurfaceMember::IfcStructuralSurfaceMember(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcStructuralSurfaceTypeEnum::IfcStructuralSurfaceTypeEnum v8_PredefinedType, boost::optional< IfcPositiveLengthMeasure > v9_Thickness) : IfcStructuralMember((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); e->setArgument(7,v8_PredefinedType,IfcStructuralSurfaceTypeEnum::ToString(v8_PredefinedType)); if (v9_Thickness) { e->setArgument(8,(*v9_Thickness)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcStructuralSurfaceMember::IfcStructuralSurfaceMember(IfcAbstractEntity* e) : IfcStructuralMember((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcStructuralSurfaceMember)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcStructuralSurfaceMember::IfcStructuralSurfaceMember(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcStructuralSurfaceTypeEnum::IfcStructuralSurfaceTypeEnum v8_PredefinedType, boost::optional< double > v9_Thickness) : IfcStructuralMember((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); e->setArgument(7,v8_PredefinedType,IfcStructuralSurfaceTypeEnum::ToString(v8_PredefinedType)); if (v9_Thickness) { e->setArgument(8,(*v9_Thickness)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcStructuralSurfaceMemberVarying
-std::vector< IfcPositiveLengthMeasure > /*[2:?]*/ IfcStructuralSurfaceMemberVarying::SubsequentThickness() { return *entity->getArgument(9); }
-void IfcStructuralSurfaceMemberVarying::setSubsequentThickness(std::vector< IfcPositiveLengthMeasure > /*[2:?]*/ v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
-IfcShapeAspect* IfcStructuralSurfaceMemberVarying::VaryingThicknessLocation() { return (IfcShapeAspect*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(10))); }
+std::vector< double > /*[2:?]*/ IfcStructuralSurfaceMemberVarying::SubsequentThickness() const { return *entity->getArgument(9); }
+void IfcStructuralSurfaceMemberVarying::setSubsequentThickness(std::vector< double > /*[2:?]*/ v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
+IfcShapeAspect* IfcStructuralSurfaceMemberVarying::VaryingThicknessLocation() const { return (IfcShapeAspect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(10))); }
 void IfcStructuralSurfaceMemberVarying::setVaryingThicknessLocation(IfcShapeAspect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
 bool IfcStructuralSurfaceMemberVarying::is(Type::Enum v) const { return v == Type::IfcStructuralSurfaceMemberVarying || IfcStructuralSurfaceMember::is(v); }
 Type::Enum IfcStructuralSurfaceMemberVarying::type() const { return Type::IfcStructuralSurfaceMemberVarying; }
 Type::Enum IfcStructuralSurfaceMemberVarying::Class() { return Type::IfcStructuralSurfaceMemberVarying; }
-IfcStructuralSurfaceMemberVarying::IfcStructuralSurfaceMemberVarying(IfcAbstractEntityPtr e) : IfcStructuralSurfaceMember((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcStructuralSurfaceMemberVarying)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcStructuralSurfaceMemberVarying::IfcStructuralSurfaceMemberVarying(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcStructuralSurfaceTypeEnum::IfcStructuralSurfaceTypeEnum v8_PredefinedType, boost::optional< IfcPositiveLengthMeasure > v9_Thickness, std::vector< IfcPositiveLengthMeasure > /*[2:?]*/ v10_SubsequentThickness, IfcShapeAspect* v11_VaryingThicknessLocation) : IfcStructuralSurfaceMember((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); e->setArgument(7,v8_PredefinedType,IfcStructuralSurfaceTypeEnum::ToString(v8_PredefinedType)); if (v9_Thickness) { e->setArgument(8,(*v9_Thickness)); } else { e->setArgument(8); } e->setArgument(9,(v10_SubsequentThickness)); e->setArgument(10,(v11_VaryingThicknessLocation)); entity = e; EntityBuffer::Add(this); }
+IfcStructuralSurfaceMemberVarying::IfcStructuralSurfaceMemberVarying(IfcAbstractEntity* e) : IfcStructuralSurfaceMember((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcStructuralSurfaceMemberVarying)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcStructuralSurfaceMemberVarying::IfcStructuralSurfaceMemberVarying(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcStructuralSurfaceTypeEnum::IfcStructuralSurfaceTypeEnum v8_PredefinedType, boost::optional< double > v9_Thickness, std::vector< double > /*[2:?]*/ v10_SubsequentThickness, IfcShapeAspect* v11_VaryingThicknessLocation) : IfcStructuralSurfaceMember((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); e->setArgument(7,v8_PredefinedType,IfcStructuralSurfaceTypeEnum::ToString(v8_PredefinedType)); if (v9_Thickness) { e->setArgument(8,(*v9_Thickness)); } else { e->setArgument(8); } e->setArgument(9,(v10_SubsequentThickness)); e->setArgument(10,(v11_VaryingThicknessLocation)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcStructuredDimensionCallout
 bool IfcStructuredDimensionCallout::is(Type::Enum v) const { return v == Type::IfcStructuredDimensionCallout || IfcDraughtingCallout::is(v); }
 Type::Enum IfcStructuredDimensionCallout::type() const { return Type::IfcStructuredDimensionCallout; }
 Type::Enum IfcStructuredDimensionCallout::Class() { return Type::IfcStructuredDimensionCallout; }
-IfcStructuredDimensionCallout::IfcStructuredDimensionCallout(IfcAbstractEntityPtr e) : IfcDraughtingCallout((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcStructuredDimensionCallout)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcStructuredDimensionCallout::IfcStructuredDimensionCallout(IfcEntities v1_Contents) : IfcDraughtingCallout((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Contents)); entity = e; EntityBuffer::Add(this); }
+IfcStructuredDimensionCallout::IfcStructuredDimensionCallout(IfcAbstractEntity* e) : IfcDraughtingCallout((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcStructuredDimensionCallout)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcStructuredDimensionCallout::IfcStructuredDimensionCallout(IfcEntityList::ptr v1_Contents) : IfcDraughtingCallout((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Contents)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcStyleModel
 bool IfcStyleModel::is(Type::Enum v) const { return v == Type::IfcStyleModel || IfcRepresentation::is(v); }
 Type::Enum IfcStyleModel::type() const { return Type::IfcStyleModel; }
 Type::Enum IfcStyleModel::Class() { return Type::IfcStyleModel; }
-IfcStyleModel::IfcStyleModel(IfcAbstractEntityPtr e) : IfcRepresentation((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcStyleModel)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcStyleModel::IfcStyleModel(IfcRepresentationContext* v1_ContextOfItems, boost::optional< IfcLabel > v2_RepresentationIdentifier, boost::optional< IfcLabel > v3_RepresentationType, SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationItem > > v4_Items) : IfcRepresentation((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_ContextOfItems)); if (v2_RepresentationIdentifier) { e->setArgument(1,(*v2_RepresentationIdentifier)); } else { e->setArgument(1); } if (v3_RepresentationType) { e->setArgument(2,(*v3_RepresentationType)); } else { e->setArgument(2); } e->setArgument(3,(v4_Items)->generalize()); entity = e; EntityBuffer::Add(this); }
+IfcStyleModel::IfcStyleModel(IfcAbstractEntity* e) : IfcRepresentation((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcStyleModel)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcStyleModel::IfcStyleModel(IfcRepresentationContext* v1_ContextOfItems, boost::optional< std::string > v2_RepresentationIdentifier, boost::optional< std::string > v3_RepresentationType, IfcTemplatedEntityList< IfcRepresentationItem >::ptr v4_Items) : IfcRepresentation((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_ContextOfItems)); if (v2_RepresentationIdentifier) { e->setArgument(1,(*v2_RepresentationIdentifier)); } else { e->setArgument(1); } if (v3_RepresentationType) { e->setArgument(2,(*v3_RepresentationType)); } else { e->setArgument(2); } e->setArgument(3,(v4_Items)->generalize()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcStyledItem
-bool IfcStyledItem::hasItem() { return !entity->getArgument(0)->isNull(); }
-IfcRepresentationItem* IfcStyledItem::Item() { return (IfcRepresentationItem*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(0))); }
+bool IfcStyledItem::hasItem() const { return !entity->getArgument(0)->isNull(); }
+IfcRepresentationItem* IfcStyledItem::Item() const { return (IfcRepresentationItem*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(0))); }
 void IfcStyledItem::setItem(IfcRepresentationItem* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-SHARED_PTR< IfcTemplatedEntityList< IfcPresentationStyleAssignment > > IfcStyledItem::Styles() { RETURN_AS_LIST(IfcPresentationStyleAssignment,1) }
-void IfcStyledItem::setStyles(SHARED_PTR< IfcTemplatedEntityList< IfcPresentationStyleAssignment > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v->generalize()); }
-bool IfcStyledItem::hasName() { return !entity->getArgument(2)->isNull(); }
-IfcLabel IfcStyledItem::Name() { return *entity->getArgument(2); }
-void IfcStyledItem::setName(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+IfcTemplatedEntityList< IfcPresentationStyleAssignment >::ptr IfcStyledItem::Styles() const { IfcEntityList::ptr es = *entity->getArgument(1); return es->as<IfcPresentationStyleAssignment>(); }
+void IfcStyledItem::setStyles(IfcTemplatedEntityList< IfcPresentationStyleAssignment >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v->generalize()); }
+bool IfcStyledItem::hasName() const { return !entity->getArgument(2)->isNull(); }
+std::string IfcStyledItem::Name() const { return *entity->getArgument(2); }
+void IfcStyledItem::setName(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
 bool IfcStyledItem::is(Type::Enum v) const { return v == Type::IfcStyledItem || IfcRepresentationItem::is(v); }
 Type::Enum IfcStyledItem::type() const { return Type::IfcStyledItem; }
 Type::Enum IfcStyledItem::Class() { return Type::IfcStyledItem; }
-IfcStyledItem::IfcStyledItem(IfcAbstractEntityPtr e) : IfcRepresentationItem((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcStyledItem)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcStyledItem::IfcStyledItem(IfcRepresentationItem* v1_Item, SHARED_PTR< IfcTemplatedEntityList< IfcPresentationStyleAssignment > > v2_Styles, boost::optional< IfcLabel > v3_Name) : IfcRepresentationItem((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Item)); e->setArgument(1,(v2_Styles)->generalize()); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } entity = e; EntityBuffer::Add(this); }
+IfcStyledItem::IfcStyledItem(IfcAbstractEntity* e) : IfcRepresentationItem((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcStyledItem)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcStyledItem::IfcStyledItem(IfcRepresentationItem* v1_Item, IfcTemplatedEntityList< IfcPresentationStyleAssignment >::ptr v2_Styles, boost::optional< std::string > v3_Name) : IfcRepresentationItem((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Item)); e->setArgument(1,(v2_Styles)->generalize()); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcStyledRepresentation
 bool IfcStyledRepresentation::is(Type::Enum v) const { return v == Type::IfcStyledRepresentation || IfcStyleModel::is(v); }
 Type::Enum IfcStyledRepresentation::type() const { return Type::IfcStyledRepresentation; }
 Type::Enum IfcStyledRepresentation::Class() { return Type::IfcStyledRepresentation; }
-IfcStyledRepresentation::IfcStyledRepresentation(IfcAbstractEntityPtr e) : IfcStyleModel((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcStyledRepresentation)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcStyledRepresentation::IfcStyledRepresentation(IfcRepresentationContext* v1_ContextOfItems, boost::optional< IfcLabel > v2_RepresentationIdentifier, boost::optional< IfcLabel > v3_RepresentationType, SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationItem > > v4_Items) : IfcStyleModel((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_ContextOfItems)); if (v2_RepresentationIdentifier) { e->setArgument(1,(*v2_RepresentationIdentifier)); } else { e->setArgument(1); } if (v3_RepresentationType) { e->setArgument(2,(*v3_RepresentationType)); } else { e->setArgument(2); } e->setArgument(3,(v4_Items)->generalize()); entity = e; EntityBuffer::Add(this); }
+IfcStyledRepresentation::IfcStyledRepresentation(IfcAbstractEntity* e) : IfcStyleModel((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcStyledRepresentation)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcStyledRepresentation::IfcStyledRepresentation(IfcRepresentationContext* v1_ContextOfItems, boost::optional< std::string > v2_RepresentationIdentifier, boost::optional< std::string > v3_RepresentationType, IfcTemplatedEntityList< IfcRepresentationItem >::ptr v4_Items) : IfcStyleModel((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_ContextOfItems)); if (v2_RepresentationIdentifier) { e->setArgument(1,(*v2_RepresentationIdentifier)); } else { e->setArgument(1); } if (v3_RepresentationType) { e->setArgument(2,(*v3_RepresentationType)); } else { e->setArgument(2); } e->setArgument(3,(v4_Items)->generalize()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcSubContractResource
-bool IfcSubContractResource::hasSubContractor() { return !entity->getArgument(9)->isNull(); }
-IfcActorSelect IfcSubContractResource::SubContractor() { return *entity->getArgument(9); }
-void IfcSubContractResource::setSubContractor(IfcActorSelect v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
-bool IfcSubContractResource::hasJobDescription() { return !entity->getArgument(10)->isNull(); }
-IfcText IfcSubContractResource::JobDescription() { return *entity->getArgument(10); }
-void IfcSubContractResource::setJobDescription(IfcText v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
+bool IfcSubContractResource::hasSubContractor() const { return !entity->getArgument(9)->isNull(); }
+IfcActorSelect* IfcSubContractResource::SubContractor() const { return (IfcActorSelect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(9))); }
+void IfcSubContractResource::setSubContractor(IfcActorSelect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
+bool IfcSubContractResource::hasJobDescription() const { return !entity->getArgument(10)->isNull(); }
+std::string IfcSubContractResource::JobDescription() const { return *entity->getArgument(10); }
+void IfcSubContractResource::setJobDescription(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
 bool IfcSubContractResource::is(Type::Enum v) const { return v == Type::IfcSubContractResource || IfcConstructionResource::is(v); }
 Type::Enum IfcSubContractResource::type() const { return Type::IfcSubContractResource; }
 Type::Enum IfcSubContractResource::Class() { return Type::IfcSubContractResource; }
-IfcSubContractResource::IfcSubContractResource(IfcAbstractEntityPtr e) : IfcConstructionResource((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcSubContractResource)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcSubContractResource::IfcSubContractResource(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, boost::optional< IfcIdentifier > v6_ResourceIdentifier, boost::optional< IfcLabel > v7_ResourceGroup, boost::optional< IfcResourceConsumptionEnum::IfcResourceConsumptionEnum > v8_ResourceConsumption, IfcMeasureWithUnit* v9_BaseQuantity, boost::optional< IfcActorSelect > v10_SubContractor, boost::optional< IfcText > v11_JobDescription) : IfcConstructionResource((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } if (v6_ResourceIdentifier) { e->setArgument(5,(*v6_ResourceIdentifier)); } else { e->setArgument(5); } if (v7_ResourceGroup) { e->setArgument(6,(*v7_ResourceGroup)); } else { e->setArgument(6); } if (v8_ResourceConsumption) { e->setArgument(7,*v8_ResourceConsumption,IfcResourceConsumptionEnum::ToString(*v8_ResourceConsumption)); } else { e->setArgument(7); } e->setArgument(8,(v9_BaseQuantity)); if (v10_SubContractor) { e->setArgument(9,(*v10_SubContractor)); } else { e->setArgument(9); } if (v11_JobDescription) { e->setArgument(10,(*v11_JobDescription)); } else { e->setArgument(10); } entity = e; EntityBuffer::Add(this); }
+IfcSubContractResource::IfcSubContractResource(IfcAbstractEntity* e) : IfcConstructionResource((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcSubContractResource)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcSubContractResource::IfcSubContractResource(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, boost::optional< std::string > v6_ResourceIdentifier, boost::optional< std::string > v7_ResourceGroup, boost::optional< IfcResourceConsumptionEnum::IfcResourceConsumptionEnum > v8_ResourceConsumption, IfcMeasureWithUnit* v9_BaseQuantity, IfcActorSelect* v10_SubContractor, boost::optional< std::string > v11_JobDescription) : IfcConstructionResource((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } if (v6_ResourceIdentifier) { e->setArgument(5,(*v6_ResourceIdentifier)); } else { e->setArgument(5); } if (v7_ResourceGroup) { e->setArgument(6,(*v7_ResourceGroup)); } else { e->setArgument(6); } if (v8_ResourceConsumption) { e->setArgument(7,*v8_ResourceConsumption,IfcResourceConsumptionEnum::ToString(*v8_ResourceConsumption)); } else { e->setArgument(7); } e->setArgument(8,(v9_BaseQuantity)); e->setArgument(9,(v10_SubContractor)); if (v11_JobDescription) { e->setArgument(10,(*v11_JobDescription)); } else { e->setArgument(10); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcSubedge
-IfcEdge* IfcSubedge::ParentEdge() { return (IfcEdge*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(2))); }
+IfcEdge* IfcSubedge::ParentEdge() const { return (IfcEdge*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(2))); }
 void IfcSubedge::setParentEdge(IfcEdge* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
 bool IfcSubedge::is(Type::Enum v) const { return v == Type::IfcSubedge || IfcEdge::is(v); }
 Type::Enum IfcSubedge::type() const { return Type::IfcSubedge; }
 Type::Enum IfcSubedge::Class() { return Type::IfcSubedge; }
-IfcSubedge::IfcSubedge(IfcAbstractEntityPtr e) : IfcEdge((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcSubedge)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcSubedge::IfcSubedge(IfcVertex* v1_EdgeStart, IfcVertex* v2_EdgeEnd, IfcEdge* v3_ParentEdge) : IfcEdge((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_EdgeStart)); e->setArgument(1,(v2_EdgeEnd)); e->setArgument(2,(v3_ParentEdge)); entity = e; EntityBuffer::Add(this); }
+IfcSubedge::IfcSubedge(IfcAbstractEntity* e) : IfcEdge((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcSubedge)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcSubedge::IfcSubedge(IfcVertex* v1_EdgeStart, IfcVertex* v2_EdgeEnd, IfcEdge* v3_ParentEdge) : IfcEdge((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_EdgeStart)); e->setArgument(1,(v2_EdgeEnd)); e->setArgument(2,(v3_ParentEdge)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcSurface
 bool IfcSurface::is(Type::Enum v) const { return v == Type::IfcSurface || IfcGeometricRepresentationItem::is(v); }
 Type::Enum IfcSurface::type() const { return Type::IfcSurface; }
 Type::Enum IfcSurface::Class() { return Type::IfcSurface; }
-IfcSurface::IfcSurface(IfcAbstractEntityPtr e) : IfcGeometricRepresentationItem((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcSurface)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcSurface::IfcSurface() : IfcGeometricRepresentationItem((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); entity = e; EntityBuffer::Add(this); }
+IfcSurface::IfcSurface(IfcAbstractEntity* e) : IfcGeometricRepresentationItem((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcSurface)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcSurface::IfcSurface() : IfcGeometricRepresentationItem((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcSurfaceCurveSweptAreaSolid
-IfcCurve* IfcSurfaceCurveSweptAreaSolid::Directrix() { return (IfcCurve*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(2))); }
+IfcCurve* IfcSurfaceCurveSweptAreaSolid::Directrix() const { return (IfcCurve*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(2))); }
 void IfcSurfaceCurveSweptAreaSolid::setDirectrix(IfcCurve* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-IfcParameterValue IfcSurfaceCurveSweptAreaSolid::StartParam() { return *entity->getArgument(3); }
-void IfcSurfaceCurveSweptAreaSolid::setStartParam(IfcParameterValue v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-IfcParameterValue IfcSurfaceCurveSweptAreaSolid::EndParam() { return *entity->getArgument(4); }
-void IfcSurfaceCurveSweptAreaSolid::setEndParam(IfcParameterValue v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-IfcSurface* IfcSurfaceCurveSweptAreaSolid::ReferenceSurface() { return (IfcSurface*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(5))); }
+double IfcSurfaceCurveSweptAreaSolid::StartParam() const { return *entity->getArgument(3); }
+void IfcSurfaceCurveSweptAreaSolid::setStartParam(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+double IfcSurfaceCurveSweptAreaSolid::EndParam() const { return *entity->getArgument(4); }
+void IfcSurfaceCurveSweptAreaSolid::setEndParam(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+IfcSurface* IfcSurfaceCurveSweptAreaSolid::ReferenceSurface() const { return (IfcSurface*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(5))); }
 void IfcSurfaceCurveSweptAreaSolid::setReferenceSurface(IfcSurface* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
 bool IfcSurfaceCurveSweptAreaSolid::is(Type::Enum v) const { return v == Type::IfcSurfaceCurveSweptAreaSolid || IfcSweptAreaSolid::is(v); }
 Type::Enum IfcSurfaceCurveSweptAreaSolid::type() const { return Type::IfcSurfaceCurveSweptAreaSolid; }
 Type::Enum IfcSurfaceCurveSweptAreaSolid::Class() { return Type::IfcSurfaceCurveSweptAreaSolid; }
-IfcSurfaceCurveSweptAreaSolid::IfcSurfaceCurveSweptAreaSolid(IfcAbstractEntityPtr e) : IfcSweptAreaSolid((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcSurfaceCurveSweptAreaSolid)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcSurfaceCurveSweptAreaSolid::IfcSurfaceCurveSweptAreaSolid(IfcProfileDef* v1_SweptArea, IfcAxis2Placement3D* v2_Position, IfcCurve* v3_Directrix, IfcParameterValue v4_StartParam, IfcParameterValue v5_EndParam, IfcSurface* v6_ReferenceSurface) : IfcSweptAreaSolid((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_SweptArea)); e->setArgument(1,(v2_Position)); e->setArgument(2,(v3_Directrix)); e->setArgument(3,(v4_StartParam)); e->setArgument(4,(v5_EndParam)); e->setArgument(5,(v6_ReferenceSurface)); entity = e; EntityBuffer::Add(this); }
+IfcSurfaceCurveSweptAreaSolid::IfcSurfaceCurveSweptAreaSolid(IfcAbstractEntity* e) : IfcSweptAreaSolid((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcSurfaceCurveSweptAreaSolid)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcSurfaceCurveSweptAreaSolid::IfcSurfaceCurveSweptAreaSolid(IfcProfileDef* v1_SweptArea, IfcAxis2Placement3D* v2_Position, IfcCurve* v3_Directrix, double v4_StartParam, double v5_EndParam, IfcSurface* v6_ReferenceSurface) : IfcSweptAreaSolid((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_SweptArea)); e->setArgument(1,(v2_Position)); e->setArgument(2,(v3_Directrix)); e->setArgument(3,(v4_StartParam)); e->setArgument(4,(v5_EndParam)); e->setArgument(5,(v6_ReferenceSurface)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcSurfaceOfLinearExtrusion
-IfcDirection* IfcSurfaceOfLinearExtrusion::ExtrudedDirection() { return (IfcDirection*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(2))); }
+IfcDirection* IfcSurfaceOfLinearExtrusion::ExtrudedDirection() const { return (IfcDirection*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(2))); }
 void IfcSurfaceOfLinearExtrusion::setExtrudedDirection(IfcDirection* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-IfcLengthMeasure IfcSurfaceOfLinearExtrusion::Depth() { return *entity->getArgument(3); }
-void IfcSurfaceOfLinearExtrusion::setDepth(IfcLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+double IfcSurfaceOfLinearExtrusion::Depth() const { return *entity->getArgument(3); }
+void IfcSurfaceOfLinearExtrusion::setDepth(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
 bool IfcSurfaceOfLinearExtrusion::is(Type::Enum v) const { return v == Type::IfcSurfaceOfLinearExtrusion || IfcSweptSurface::is(v); }
 Type::Enum IfcSurfaceOfLinearExtrusion::type() const { return Type::IfcSurfaceOfLinearExtrusion; }
 Type::Enum IfcSurfaceOfLinearExtrusion::Class() { return Type::IfcSurfaceOfLinearExtrusion; }
-IfcSurfaceOfLinearExtrusion::IfcSurfaceOfLinearExtrusion(IfcAbstractEntityPtr e) : IfcSweptSurface((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcSurfaceOfLinearExtrusion)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcSurfaceOfLinearExtrusion::IfcSurfaceOfLinearExtrusion(IfcProfileDef* v1_SweptCurve, IfcAxis2Placement3D* v2_Position, IfcDirection* v3_ExtrudedDirection, IfcLengthMeasure v4_Depth) : IfcSweptSurface((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_SweptCurve)); e->setArgument(1,(v2_Position)); e->setArgument(2,(v3_ExtrudedDirection)); e->setArgument(3,(v4_Depth)); entity = e; EntityBuffer::Add(this); }
+IfcSurfaceOfLinearExtrusion::IfcSurfaceOfLinearExtrusion(IfcAbstractEntity* e) : IfcSweptSurface((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcSurfaceOfLinearExtrusion)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcSurfaceOfLinearExtrusion::IfcSurfaceOfLinearExtrusion(IfcProfileDef* v1_SweptCurve, IfcAxis2Placement3D* v2_Position, IfcDirection* v3_ExtrudedDirection, double v4_Depth) : IfcSweptSurface((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_SweptCurve)); e->setArgument(1,(v2_Position)); e->setArgument(2,(v3_ExtrudedDirection)); e->setArgument(3,(v4_Depth)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcSurfaceOfRevolution
-IfcAxis1Placement* IfcSurfaceOfRevolution::AxisPosition() { return (IfcAxis1Placement*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(2))); }
+IfcAxis1Placement* IfcSurfaceOfRevolution::AxisPosition() const { return (IfcAxis1Placement*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(2))); }
 void IfcSurfaceOfRevolution::setAxisPosition(IfcAxis1Placement* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
 bool IfcSurfaceOfRevolution::is(Type::Enum v) const { return v == Type::IfcSurfaceOfRevolution || IfcSweptSurface::is(v); }
 Type::Enum IfcSurfaceOfRevolution::type() const { return Type::IfcSurfaceOfRevolution; }
 Type::Enum IfcSurfaceOfRevolution::Class() { return Type::IfcSurfaceOfRevolution; }
-IfcSurfaceOfRevolution::IfcSurfaceOfRevolution(IfcAbstractEntityPtr e) : IfcSweptSurface((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcSurfaceOfRevolution)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcSurfaceOfRevolution::IfcSurfaceOfRevolution(IfcProfileDef* v1_SweptCurve, IfcAxis2Placement3D* v2_Position, IfcAxis1Placement* v3_AxisPosition) : IfcSweptSurface((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_SweptCurve)); e->setArgument(1,(v2_Position)); e->setArgument(2,(v3_AxisPosition)); entity = e; EntityBuffer::Add(this); }
+IfcSurfaceOfRevolution::IfcSurfaceOfRevolution(IfcAbstractEntity* e) : IfcSweptSurface((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcSurfaceOfRevolution)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcSurfaceOfRevolution::IfcSurfaceOfRevolution(IfcProfileDef* v1_SweptCurve, IfcAxis2Placement3D* v2_Position, IfcAxis1Placement* v3_AxisPosition) : IfcSweptSurface((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_SweptCurve)); e->setArgument(1,(v2_Position)); e->setArgument(2,(v3_AxisPosition)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcSurfaceStyle
-IfcSurfaceSide::IfcSurfaceSide IfcSurfaceStyle::Side() { return IfcSurfaceSide::FromString(*entity->getArgument(1)); }
+IfcSurfaceSide::IfcSurfaceSide IfcSurfaceStyle::Side() const { return IfcSurfaceSide::FromString(*entity->getArgument(1)); }
 void IfcSurfaceStyle::setSide(IfcSurfaceSide::IfcSurfaceSide v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v,IfcSurfaceSide::ToString(v)); }
-SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > IfcSurfaceStyle::Styles() { RETURN_AS_LIST(IfcUtil::IfcAbstractSelect,2) }
-void IfcSurfaceStyle::setStyles(SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v->generalize()); }
+IfcEntityList::ptr IfcSurfaceStyle::Styles() const { return *entity->getArgument(2); }
+void IfcSurfaceStyle::setStyles(IfcEntityList::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
 bool IfcSurfaceStyle::is(Type::Enum v) const { return v == Type::IfcSurfaceStyle || IfcPresentationStyle::is(v); }
 Type::Enum IfcSurfaceStyle::type() const { return Type::IfcSurfaceStyle; }
 Type::Enum IfcSurfaceStyle::Class() { return Type::IfcSurfaceStyle; }
-IfcSurfaceStyle::IfcSurfaceStyle(IfcAbstractEntityPtr e) : IfcPresentationStyle((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcSurfaceStyle)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcSurfaceStyle::IfcSurfaceStyle(boost::optional< IfcLabel > v1_Name, IfcSurfaceSide::IfcSurfaceSide v2_Side, IfcEntities v3_Styles) : IfcPresentationStyle((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } e->setArgument(1,v2_Side,IfcSurfaceSide::ToString(v2_Side)); e->setArgument(2,(v3_Styles)); entity = e; EntityBuffer::Add(this); }
+IfcSurfaceStyle::IfcSurfaceStyle(IfcAbstractEntity* e) : IfcPresentationStyle((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcSurfaceStyle)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcSurfaceStyle::IfcSurfaceStyle(boost::optional< std::string > v1_Name, IfcSurfaceSide::IfcSurfaceSide v2_Side, IfcEntityList::ptr v3_Styles) : IfcPresentationStyle((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } e->setArgument(1,v2_Side,IfcSurfaceSide::ToString(v2_Side)); e->setArgument(2,(v3_Styles)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcSurfaceStyleLighting
-IfcColourRgb* IfcSurfaceStyleLighting::DiffuseTransmissionColour() { return (IfcColourRgb*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(0))); }
+IfcColourRgb* IfcSurfaceStyleLighting::DiffuseTransmissionColour() const { return (IfcColourRgb*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(0))); }
 void IfcSurfaceStyleLighting::setDiffuseTransmissionColour(IfcColourRgb* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-IfcColourRgb* IfcSurfaceStyleLighting::DiffuseReflectionColour() { return (IfcColourRgb*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(1))); }
+IfcColourRgb* IfcSurfaceStyleLighting::DiffuseReflectionColour() const { return (IfcColourRgb*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(1))); }
 void IfcSurfaceStyleLighting::setDiffuseReflectionColour(IfcColourRgb* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-IfcColourRgb* IfcSurfaceStyleLighting::TransmissionColour() { return (IfcColourRgb*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(2))); }
+IfcColourRgb* IfcSurfaceStyleLighting::TransmissionColour() const { return (IfcColourRgb*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(2))); }
 void IfcSurfaceStyleLighting::setTransmissionColour(IfcColourRgb* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-IfcColourRgb* IfcSurfaceStyleLighting::ReflectanceColour() { return (IfcColourRgb*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(3))); }
+IfcColourRgb* IfcSurfaceStyleLighting::ReflectanceColour() const { return (IfcColourRgb*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(3))); }
 void IfcSurfaceStyleLighting::setReflectanceColour(IfcColourRgb* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
 bool IfcSurfaceStyleLighting::is(Type::Enum v) const { return v == Type::IfcSurfaceStyleLighting; }
 Type::Enum IfcSurfaceStyleLighting::type() const { return Type::IfcSurfaceStyleLighting; }
 Type::Enum IfcSurfaceStyleLighting::Class() { return Type::IfcSurfaceStyleLighting; }
-IfcSurfaceStyleLighting::IfcSurfaceStyleLighting(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcSurfaceStyleLighting)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcSurfaceStyleLighting::IfcSurfaceStyleLighting(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcSurfaceStyleLighting)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
 IfcSurfaceStyleLighting::IfcSurfaceStyleLighting(IfcColourRgb* v1_DiffuseTransmissionColour, IfcColourRgb* v2_DiffuseReflectionColour, IfcColourRgb* v3_TransmissionColour, IfcColourRgb* v4_ReflectanceColour) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_DiffuseTransmissionColour)); e->setArgument(1,(v2_DiffuseReflectionColour)); e->setArgument(2,(v3_TransmissionColour)); e->setArgument(3,(v4_ReflectanceColour)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcSurfaceStyleRefraction
-bool IfcSurfaceStyleRefraction::hasRefractionIndex() { return !entity->getArgument(0)->isNull(); }
-IfcReal IfcSurfaceStyleRefraction::RefractionIndex() { return *entity->getArgument(0); }
-void IfcSurfaceStyleRefraction::setRefractionIndex(IfcReal v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-bool IfcSurfaceStyleRefraction::hasDispersionFactor() { return !entity->getArgument(1)->isNull(); }
-IfcReal IfcSurfaceStyleRefraction::DispersionFactor() { return *entity->getArgument(1); }
-void IfcSurfaceStyleRefraction::setDispersionFactor(IfcReal v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+bool IfcSurfaceStyleRefraction::hasRefractionIndex() const { return !entity->getArgument(0)->isNull(); }
+double IfcSurfaceStyleRefraction::RefractionIndex() const { return *entity->getArgument(0); }
+void IfcSurfaceStyleRefraction::setRefractionIndex(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+bool IfcSurfaceStyleRefraction::hasDispersionFactor() const { return !entity->getArgument(1)->isNull(); }
+double IfcSurfaceStyleRefraction::DispersionFactor() const { return *entity->getArgument(1); }
+void IfcSurfaceStyleRefraction::setDispersionFactor(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
 bool IfcSurfaceStyleRefraction::is(Type::Enum v) const { return v == Type::IfcSurfaceStyleRefraction; }
 Type::Enum IfcSurfaceStyleRefraction::type() const { return Type::IfcSurfaceStyleRefraction; }
 Type::Enum IfcSurfaceStyleRefraction::Class() { return Type::IfcSurfaceStyleRefraction; }
-IfcSurfaceStyleRefraction::IfcSurfaceStyleRefraction(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcSurfaceStyleRefraction)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcSurfaceStyleRefraction::IfcSurfaceStyleRefraction(boost::optional< IfcReal > v1_RefractionIndex, boost::optional< IfcReal > v2_DispersionFactor) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_RefractionIndex) { e->setArgument(0,(*v1_RefractionIndex)); } else { e->setArgument(0); } if (v2_DispersionFactor) { e->setArgument(1,(*v2_DispersionFactor)); } else { e->setArgument(1); } entity = e; EntityBuffer::Add(this); }
+IfcSurfaceStyleRefraction::IfcSurfaceStyleRefraction(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcSurfaceStyleRefraction)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcSurfaceStyleRefraction::IfcSurfaceStyleRefraction(boost::optional< double > v1_RefractionIndex, boost::optional< double > v2_DispersionFactor) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_RefractionIndex) { e->setArgument(0,(*v1_RefractionIndex)); } else { e->setArgument(0); } if (v2_DispersionFactor) { e->setArgument(1,(*v2_DispersionFactor)); } else { e->setArgument(1); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcSurfaceStyleRendering
-bool IfcSurfaceStyleRendering::hasTransparency() { return !entity->getArgument(1)->isNull(); }
-IfcNormalisedRatioMeasure IfcSurfaceStyleRendering::Transparency() { return *entity->getArgument(1); }
-void IfcSurfaceStyleRendering::setTransparency(IfcNormalisedRatioMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-bool IfcSurfaceStyleRendering::hasDiffuseColour() { return !entity->getArgument(2)->isNull(); }
-IfcColourOrFactor IfcSurfaceStyleRendering::DiffuseColour() { return *entity->getArgument(2); }
-void IfcSurfaceStyleRendering::setDiffuseColour(IfcColourOrFactor v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-bool IfcSurfaceStyleRendering::hasTransmissionColour() { return !entity->getArgument(3)->isNull(); }
-IfcColourOrFactor IfcSurfaceStyleRendering::TransmissionColour() { return *entity->getArgument(3); }
-void IfcSurfaceStyleRendering::setTransmissionColour(IfcColourOrFactor v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-bool IfcSurfaceStyleRendering::hasDiffuseTransmissionColour() { return !entity->getArgument(4)->isNull(); }
-IfcColourOrFactor IfcSurfaceStyleRendering::DiffuseTransmissionColour() { return *entity->getArgument(4); }
-void IfcSurfaceStyleRendering::setDiffuseTransmissionColour(IfcColourOrFactor v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-bool IfcSurfaceStyleRendering::hasReflectionColour() { return !entity->getArgument(5)->isNull(); }
-IfcColourOrFactor IfcSurfaceStyleRendering::ReflectionColour() { return *entity->getArgument(5); }
-void IfcSurfaceStyleRendering::setReflectionColour(IfcColourOrFactor v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-bool IfcSurfaceStyleRendering::hasSpecularColour() { return !entity->getArgument(6)->isNull(); }
-IfcColourOrFactor IfcSurfaceStyleRendering::SpecularColour() { return *entity->getArgument(6); }
-void IfcSurfaceStyleRendering::setSpecularColour(IfcColourOrFactor v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
-bool IfcSurfaceStyleRendering::hasSpecularHighlight() { return !entity->getArgument(7)->isNull(); }
-IfcSpecularHighlightSelect IfcSurfaceStyleRendering::SpecularHighlight() { return *entity->getArgument(7); }
-void IfcSurfaceStyleRendering::setSpecularHighlight(IfcSpecularHighlightSelect v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
-IfcReflectanceMethodEnum::IfcReflectanceMethodEnum IfcSurfaceStyleRendering::ReflectanceMethod() { return IfcReflectanceMethodEnum::FromString(*entity->getArgument(8)); }
+bool IfcSurfaceStyleRendering::hasTransparency() const { return !entity->getArgument(1)->isNull(); }
+double IfcSurfaceStyleRendering::Transparency() const { return *entity->getArgument(1); }
+void IfcSurfaceStyleRendering::setTransparency(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+bool IfcSurfaceStyleRendering::hasDiffuseColour() const { return !entity->getArgument(2)->isNull(); }
+IfcColourOrFactor* IfcSurfaceStyleRendering::DiffuseColour() const { return (IfcColourOrFactor*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(2))); }
+void IfcSurfaceStyleRendering::setDiffuseColour(IfcColourOrFactor* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+bool IfcSurfaceStyleRendering::hasTransmissionColour() const { return !entity->getArgument(3)->isNull(); }
+IfcColourOrFactor* IfcSurfaceStyleRendering::TransmissionColour() const { return (IfcColourOrFactor*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(3))); }
+void IfcSurfaceStyleRendering::setTransmissionColour(IfcColourOrFactor* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+bool IfcSurfaceStyleRendering::hasDiffuseTransmissionColour() const { return !entity->getArgument(4)->isNull(); }
+IfcColourOrFactor* IfcSurfaceStyleRendering::DiffuseTransmissionColour() const { return (IfcColourOrFactor*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(4))); }
+void IfcSurfaceStyleRendering::setDiffuseTransmissionColour(IfcColourOrFactor* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+bool IfcSurfaceStyleRendering::hasReflectionColour() const { return !entity->getArgument(5)->isNull(); }
+IfcColourOrFactor* IfcSurfaceStyleRendering::ReflectionColour() const { return (IfcColourOrFactor*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(5))); }
+void IfcSurfaceStyleRendering::setReflectionColour(IfcColourOrFactor* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+bool IfcSurfaceStyleRendering::hasSpecularColour() const { return !entity->getArgument(6)->isNull(); }
+IfcColourOrFactor* IfcSurfaceStyleRendering::SpecularColour() const { return (IfcColourOrFactor*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(6))); }
+void IfcSurfaceStyleRendering::setSpecularColour(IfcColourOrFactor* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
+bool IfcSurfaceStyleRendering::hasSpecularHighlight() const { return !entity->getArgument(7)->isNull(); }
+IfcSpecularHighlightSelect* IfcSurfaceStyleRendering::SpecularHighlight() const { return (IfcSpecularHighlightSelect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(7))); }
+void IfcSurfaceStyleRendering::setSpecularHighlight(IfcSpecularHighlightSelect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
+IfcReflectanceMethodEnum::IfcReflectanceMethodEnum IfcSurfaceStyleRendering::ReflectanceMethod() const { return IfcReflectanceMethodEnum::FromString(*entity->getArgument(8)); }
 void IfcSurfaceStyleRendering::setReflectanceMethod(IfcReflectanceMethodEnum::IfcReflectanceMethodEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcReflectanceMethodEnum::ToString(v)); }
 bool IfcSurfaceStyleRendering::is(Type::Enum v) const { return v == Type::IfcSurfaceStyleRendering || IfcSurfaceStyleShading::is(v); }
 Type::Enum IfcSurfaceStyleRendering::type() const { return Type::IfcSurfaceStyleRendering; }
 Type::Enum IfcSurfaceStyleRendering::Class() { return Type::IfcSurfaceStyleRendering; }
-IfcSurfaceStyleRendering::IfcSurfaceStyleRendering(IfcAbstractEntityPtr e) : IfcSurfaceStyleShading((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcSurfaceStyleRendering)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcSurfaceStyleRendering::IfcSurfaceStyleRendering(IfcColourRgb* v1_SurfaceColour, boost::optional< IfcNormalisedRatioMeasure > v2_Transparency, boost::optional< IfcColourOrFactor > v3_DiffuseColour, boost::optional< IfcColourOrFactor > v4_TransmissionColour, boost::optional< IfcColourOrFactor > v5_DiffuseTransmissionColour, boost::optional< IfcColourOrFactor > v6_ReflectionColour, boost::optional< IfcColourOrFactor > v7_SpecularColour, boost::optional< IfcSpecularHighlightSelect > v8_SpecularHighlight, IfcReflectanceMethodEnum::IfcReflectanceMethodEnum v9_ReflectanceMethod) : IfcSurfaceStyleShading((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_SurfaceColour)); if (v2_Transparency) { e->setArgument(1,(*v2_Transparency)); } else { e->setArgument(1); } if (v3_DiffuseColour) { e->setArgument(2,(*v3_DiffuseColour)); } else { e->setArgument(2); } if (v4_TransmissionColour) { e->setArgument(3,(*v4_TransmissionColour)); } else { e->setArgument(3); } if (v5_DiffuseTransmissionColour) { e->setArgument(4,(*v5_DiffuseTransmissionColour)); } else { e->setArgument(4); } if (v6_ReflectionColour) { e->setArgument(5,(*v6_ReflectionColour)); } else { e->setArgument(5); } if (v7_SpecularColour) { e->setArgument(6,(*v7_SpecularColour)); } else { e->setArgument(6); } if (v8_SpecularHighlight) { e->setArgument(7,(*v8_SpecularHighlight)); } else { e->setArgument(7); } e->setArgument(8,v9_ReflectanceMethod,IfcReflectanceMethodEnum::ToString(v9_ReflectanceMethod)); entity = e; EntityBuffer::Add(this); }
+IfcSurfaceStyleRendering::IfcSurfaceStyleRendering(IfcAbstractEntity* e) : IfcSurfaceStyleShading((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcSurfaceStyleRendering)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcSurfaceStyleRendering::IfcSurfaceStyleRendering(IfcColourRgb* v1_SurfaceColour, boost::optional< double > v2_Transparency, IfcColourOrFactor* v3_DiffuseColour, IfcColourOrFactor* v4_TransmissionColour, IfcColourOrFactor* v5_DiffuseTransmissionColour, IfcColourOrFactor* v6_ReflectionColour, IfcColourOrFactor* v7_SpecularColour, IfcSpecularHighlightSelect* v8_SpecularHighlight, IfcReflectanceMethodEnum::IfcReflectanceMethodEnum v9_ReflectanceMethod) : IfcSurfaceStyleShading((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_SurfaceColour)); if (v2_Transparency) { e->setArgument(1,(*v2_Transparency)); } else { e->setArgument(1); } e->setArgument(2,(v3_DiffuseColour)); e->setArgument(3,(v4_TransmissionColour)); e->setArgument(4,(v5_DiffuseTransmissionColour)); e->setArgument(5,(v6_ReflectionColour)); e->setArgument(6,(v7_SpecularColour)); e->setArgument(7,(v8_SpecularHighlight)); e->setArgument(8,v9_ReflectanceMethod,IfcReflectanceMethodEnum::ToString(v9_ReflectanceMethod)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcSurfaceStyleShading
-IfcColourRgb* IfcSurfaceStyleShading::SurfaceColour() { return (IfcColourRgb*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(0))); }
+IfcColourRgb* IfcSurfaceStyleShading::SurfaceColour() const { return (IfcColourRgb*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(0))); }
 void IfcSurfaceStyleShading::setSurfaceColour(IfcColourRgb* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
 bool IfcSurfaceStyleShading::is(Type::Enum v) const { return v == Type::IfcSurfaceStyleShading; }
 Type::Enum IfcSurfaceStyleShading::type() const { return Type::IfcSurfaceStyleShading; }
 Type::Enum IfcSurfaceStyleShading::Class() { return Type::IfcSurfaceStyleShading; }
-IfcSurfaceStyleShading::IfcSurfaceStyleShading(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcSurfaceStyleShading)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcSurfaceStyleShading::IfcSurfaceStyleShading(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcSurfaceStyleShading)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
 IfcSurfaceStyleShading::IfcSurfaceStyleShading(IfcColourRgb* v1_SurfaceColour) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_SurfaceColour)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcSurfaceStyleWithTextures
-SHARED_PTR< IfcTemplatedEntityList< IfcSurfaceTexture > > IfcSurfaceStyleWithTextures::Textures() { RETURN_AS_LIST(IfcSurfaceTexture,0) }
-void IfcSurfaceStyleWithTextures::setTextures(SHARED_PTR< IfcTemplatedEntityList< IfcSurfaceTexture > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v->generalize()); }
+IfcTemplatedEntityList< IfcSurfaceTexture >::ptr IfcSurfaceStyleWithTextures::Textures() const { IfcEntityList::ptr es = *entity->getArgument(0); return es->as<IfcSurfaceTexture>(); }
+void IfcSurfaceStyleWithTextures::setTextures(IfcTemplatedEntityList< IfcSurfaceTexture >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v->generalize()); }
 bool IfcSurfaceStyleWithTextures::is(Type::Enum v) const { return v == Type::IfcSurfaceStyleWithTextures; }
 Type::Enum IfcSurfaceStyleWithTextures::type() const { return Type::IfcSurfaceStyleWithTextures; }
 Type::Enum IfcSurfaceStyleWithTextures::Class() { return Type::IfcSurfaceStyleWithTextures; }
-IfcSurfaceStyleWithTextures::IfcSurfaceStyleWithTextures(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcSurfaceStyleWithTextures)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcSurfaceStyleWithTextures::IfcSurfaceStyleWithTextures(SHARED_PTR< IfcTemplatedEntityList< IfcSurfaceTexture > > v1_Textures) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Textures)->generalize()); entity = e; EntityBuffer::Add(this); }
+IfcSurfaceStyleWithTextures::IfcSurfaceStyleWithTextures(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcSurfaceStyleWithTextures)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcSurfaceStyleWithTextures::IfcSurfaceStyleWithTextures(IfcTemplatedEntityList< IfcSurfaceTexture >::ptr v1_Textures) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Textures)->generalize()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcSurfaceTexture
-bool IfcSurfaceTexture::RepeatS() { return *entity->getArgument(0); }
+bool IfcSurfaceTexture::RepeatS() const { return *entity->getArgument(0); }
 void IfcSurfaceTexture::setRepeatS(bool v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-bool IfcSurfaceTexture::RepeatT() { return *entity->getArgument(1); }
+bool IfcSurfaceTexture::RepeatT() const { return *entity->getArgument(1); }
 void IfcSurfaceTexture::setRepeatT(bool v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-IfcSurfaceTextureEnum::IfcSurfaceTextureEnum IfcSurfaceTexture::TextureType() { return IfcSurfaceTextureEnum::FromString(*entity->getArgument(2)); }
+IfcSurfaceTextureEnum::IfcSurfaceTextureEnum IfcSurfaceTexture::TextureType() const { return IfcSurfaceTextureEnum::FromString(*entity->getArgument(2)); }
 void IfcSurfaceTexture::setTextureType(IfcSurfaceTextureEnum::IfcSurfaceTextureEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v,IfcSurfaceTextureEnum::ToString(v)); }
-bool IfcSurfaceTexture::hasTextureTransform() { return !entity->getArgument(3)->isNull(); }
-IfcCartesianTransformationOperator2D* IfcSurfaceTexture::TextureTransform() { return (IfcCartesianTransformationOperator2D*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(3))); }
+bool IfcSurfaceTexture::hasTextureTransform() const { return !entity->getArgument(3)->isNull(); }
+IfcCartesianTransformationOperator2D* IfcSurfaceTexture::TextureTransform() const { return (IfcCartesianTransformationOperator2D*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(3))); }
 void IfcSurfaceTexture::setTextureTransform(IfcCartesianTransformationOperator2D* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
 bool IfcSurfaceTexture::is(Type::Enum v) const { return v == Type::IfcSurfaceTexture; }
 Type::Enum IfcSurfaceTexture::type() const { return Type::IfcSurfaceTexture; }
 Type::Enum IfcSurfaceTexture::Class() { return Type::IfcSurfaceTexture; }
-IfcSurfaceTexture::IfcSurfaceTexture(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcSurfaceTexture)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcSurfaceTexture::IfcSurfaceTexture(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcSurfaceTexture)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
 IfcSurfaceTexture::IfcSurfaceTexture(bool v1_RepeatS, bool v2_RepeatT, IfcSurfaceTextureEnum::IfcSurfaceTextureEnum v3_TextureType, IfcCartesianTransformationOperator2D* v4_TextureTransform) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_RepeatS)); e->setArgument(1,(v2_RepeatT)); e->setArgument(2,v3_TextureType,IfcSurfaceTextureEnum::ToString(v3_TextureType)); e->setArgument(3,(v4_TextureTransform)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcSweptAreaSolid
-IfcProfileDef* IfcSweptAreaSolid::SweptArea() { return (IfcProfileDef*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(0))); }
+IfcProfileDef* IfcSweptAreaSolid::SweptArea() const { return (IfcProfileDef*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(0))); }
 void IfcSweptAreaSolid::setSweptArea(IfcProfileDef* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-IfcAxis2Placement3D* IfcSweptAreaSolid::Position() { return (IfcAxis2Placement3D*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(1))); }
+IfcAxis2Placement3D* IfcSweptAreaSolid::Position() const { return (IfcAxis2Placement3D*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(1))); }
 void IfcSweptAreaSolid::setPosition(IfcAxis2Placement3D* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
 bool IfcSweptAreaSolid::is(Type::Enum v) const { return v == Type::IfcSweptAreaSolid || IfcSolidModel::is(v); }
 Type::Enum IfcSweptAreaSolid::type() const { return Type::IfcSweptAreaSolid; }
 Type::Enum IfcSweptAreaSolid::Class() { return Type::IfcSweptAreaSolid; }
-IfcSweptAreaSolid::IfcSweptAreaSolid(IfcAbstractEntityPtr e) : IfcSolidModel((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcSweptAreaSolid)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcSweptAreaSolid::IfcSweptAreaSolid(IfcProfileDef* v1_SweptArea, IfcAxis2Placement3D* v2_Position) : IfcSolidModel((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_SweptArea)); e->setArgument(1,(v2_Position)); entity = e; EntityBuffer::Add(this); }
+IfcSweptAreaSolid::IfcSweptAreaSolid(IfcAbstractEntity* e) : IfcSolidModel((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcSweptAreaSolid)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcSweptAreaSolid::IfcSweptAreaSolid(IfcProfileDef* v1_SweptArea, IfcAxis2Placement3D* v2_Position) : IfcSolidModel((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_SweptArea)); e->setArgument(1,(v2_Position)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcSweptDiskSolid
-IfcCurve* IfcSweptDiskSolid::Directrix() { return (IfcCurve*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(0))); }
+IfcCurve* IfcSweptDiskSolid::Directrix() const { return (IfcCurve*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(0))); }
 void IfcSweptDiskSolid::setDirectrix(IfcCurve* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-IfcPositiveLengthMeasure IfcSweptDiskSolid::Radius() { return *entity->getArgument(1); }
-void IfcSweptDiskSolid::setRadius(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-bool IfcSweptDiskSolid::hasInnerRadius() { return !entity->getArgument(2)->isNull(); }
-IfcPositiveLengthMeasure IfcSweptDiskSolid::InnerRadius() { return *entity->getArgument(2); }
-void IfcSweptDiskSolid::setInnerRadius(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-IfcParameterValue IfcSweptDiskSolid::StartParam() { return *entity->getArgument(3); }
-void IfcSweptDiskSolid::setStartParam(IfcParameterValue v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-IfcParameterValue IfcSweptDiskSolid::EndParam() { return *entity->getArgument(4); }
-void IfcSweptDiskSolid::setEndParam(IfcParameterValue v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+double IfcSweptDiskSolid::Radius() const { return *entity->getArgument(1); }
+void IfcSweptDiskSolid::setRadius(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+bool IfcSweptDiskSolid::hasInnerRadius() const { return !entity->getArgument(2)->isNull(); }
+double IfcSweptDiskSolid::InnerRadius() const { return *entity->getArgument(2); }
+void IfcSweptDiskSolid::setInnerRadius(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+double IfcSweptDiskSolid::StartParam() const { return *entity->getArgument(3); }
+void IfcSweptDiskSolid::setStartParam(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+double IfcSweptDiskSolid::EndParam() const { return *entity->getArgument(4); }
+void IfcSweptDiskSolid::setEndParam(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
 bool IfcSweptDiskSolid::is(Type::Enum v) const { return v == Type::IfcSweptDiskSolid || IfcSolidModel::is(v); }
 Type::Enum IfcSweptDiskSolid::type() const { return Type::IfcSweptDiskSolid; }
 Type::Enum IfcSweptDiskSolid::Class() { return Type::IfcSweptDiskSolid; }
-IfcSweptDiskSolid::IfcSweptDiskSolid(IfcAbstractEntityPtr e) : IfcSolidModel((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcSweptDiskSolid)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcSweptDiskSolid::IfcSweptDiskSolid(IfcCurve* v1_Directrix, IfcPositiveLengthMeasure v2_Radius, boost::optional< IfcPositiveLengthMeasure > v3_InnerRadius, IfcParameterValue v4_StartParam, IfcParameterValue v5_EndParam) : IfcSolidModel((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Directrix)); e->setArgument(1,(v2_Radius)); if (v3_InnerRadius) { e->setArgument(2,(*v3_InnerRadius)); } else { e->setArgument(2); } e->setArgument(3,(v4_StartParam)); e->setArgument(4,(v5_EndParam)); entity = e; EntityBuffer::Add(this); }
+IfcSweptDiskSolid::IfcSweptDiskSolid(IfcAbstractEntity* e) : IfcSolidModel((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcSweptDiskSolid)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcSweptDiskSolid::IfcSweptDiskSolid(IfcCurve* v1_Directrix, double v2_Radius, boost::optional< double > v3_InnerRadius, double v4_StartParam, double v5_EndParam) : IfcSolidModel((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Directrix)); e->setArgument(1,(v2_Radius)); if (v3_InnerRadius) { e->setArgument(2,(*v3_InnerRadius)); } else { e->setArgument(2); } e->setArgument(3,(v4_StartParam)); e->setArgument(4,(v5_EndParam)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcSweptSurface
-IfcProfileDef* IfcSweptSurface::SweptCurve() { return (IfcProfileDef*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(0))); }
+IfcProfileDef* IfcSweptSurface::SweptCurve() const { return (IfcProfileDef*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(0))); }
 void IfcSweptSurface::setSweptCurve(IfcProfileDef* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-IfcAxis2Placement3D* IfcSweptSurface::Position() { return (IfcAxis2Placement3D*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(1))); }
+IfcAxis2Placement3D* IfcSweptSurface::Position() const { return (IfcAxis2Placement3D*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(1))); }
 void IfcSweptSurface::setPosition(IfcAxis2Placement3D* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
 bool IfcSweptSurface::is(Type::Enum v) const { return v == Type::IfcSweptSurface || IfcSurface::is(v); }
 Type::Enum IfcSweptSurface::type() const { return Type::IfcSweptSurface; }
 Type::Enum IfcSweptSurface::Class() { return Type::IfcSweptSurface; }
-IfcSweptSurface::IfcSweptSurface(IfcAbstractEntityPtr e) : IfcSurface((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcSweptSurface)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcSweptSurface::IfcSweptSurface(IfcProfileDef* v1_SweptCurve, IfcAxis2Placement3D* v2_Position) : IfcSurface((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_SweptCurve)); e->setArgument(1,(v2_Position)); entity = e; EntityBuffer::Add(this); }
+IfcSweptSurface::IfcSweptSurface(IfcAbstractEntity* e) : IfcSurface((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcSweptSurface)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcSweptSurface::IfcSweptSurface(IfcProfileDef* v1_SweptCurve, IfcAxis2Placement3D* v2_Position) : IfcSurface((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_SweptCurve)); e->setArgument(1,(v2_Position)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcSwitchingDeviceType
-IfcSwitchingDeviceTypeEnum::IfcSwitchingDeviceTypeEnum IfcSwitchingDeviceType::PredefinedType() { return IfcSwitchingDeviceTypeEnum::FromString(*entity->getArgument(9)); }
+IfcSwitchingDeviceTypeEnum::IfcSwitchingDeviceTypeEnum IfcSwitchingDeviceType::PredefinedType() const { return IfcSwitchingDeviceTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcSwitchingDeviceType::setPredefinedType(IfcSwitchingDeviceTypeEnum::IfcSwitchingDeviceTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcSwitchingDeviceTypeEnum::ToString(v)); }
 bool IfcSwitchingDeviceType::is(Type::Enum v) const { return v == Type::IfcSwitchingDeviceType || IfcFlowControllerType::is(v); }
 Type::Enum IfcSwitchingDeviceType::type() const { return Type::IfcSwitchingDeviceType; }
 Type::Enum IfcSwitchingDeviceType::Class() { return Type::IfcSwitchingDeviceType; }
-IfcSwitchingDeviceType::IfcSwitchingDeviceType(IfcAbstractEntityPtr e) : IfcFlowControllerType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcSwitchingDeviceType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcSwitchingDeviceType::IfcSwitchingDeviceType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcSwitchingDeviceTypeEnum::IfcSwitchingDeviceTypeEnum v10_PredefinedType) : IfcFlowControllerType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcSwitchingDeviceTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcSwitchingDeviceType::IfcSwitchingDeviceType(IfcAbstractEntity* e) : IfcFlowControllerType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcSwitchingDeviceType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcSwitchingDeviceType::IfcSwitchingDeviceType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcSwitchingDeviceTypeEnum::IfcSwitchingDeviceTypeEnum v10_PredefinedType) : IfcFlowControllerType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcSwitchingDeviceTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcSymbolStyle
-IfcSymbolStyleSelect IfcSymbolStyle::StyleOfSymbol() { return *entity->getArgument(1); }
-void IfcSymbolStyle::setStyleOfSymbol(IfcSymbolStyleSelect v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+IfcSymbolStyleSelect* IfcSymbolStyle::StyleOfSymbol() const { return (IfcSymbolStyleSelect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(1))); }
+void IfcSymbolStyle::setStyleOfSymbol(IfcSymbolStyleSelect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
 bool IfcSymbolStyle::is(Type::Enum v) const { return v == Type::IfcSymbolStyle || IfcPresentationStyle::is(v); }
 Type::Enum IfcSymbolStyle::type() const { return Type::IfcSymbolStyle; }
 Type::Enum IfcSymbolStyle::Class() { return Type::IfcSymbolStyle; }
-IfcSymbolStyle::IfcSymbolStyle(IfcAbstractEntityPtr e) : IfcPresentationStyle((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcSymbolStyle)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcSymbolStyle::IfcSymbolStyle(boost::optional< IfcLabel > v1_Name, IfcSymbolStyleSelect v2_StyleOfSymbol) : IfcPresentationStyle((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } e->setArgument(1,(v2_StyleOfSymbol)); entity = e; EntityBuffer::Add(this); }
+IfcSymbolStyle::IfcSymbolStyle(IfcAbstractEntity* e) : IfcPresentationStyle((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcSymbolStyle)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcSymbolStyle::IfcSymbolStyle(boost::optional< std::string > v1_Name, IfcSymbolStyleSelect* v2_StyleOfSymbol) : IfcPresentationStyle((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } e->setArgument(1,(v2_StyleOfSymbol)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcSystem
-IfcRelServicesBuildings::list IfcSystem::ServicesBuildings() { RETURN_INVERSE(IfcRelServicesBuildings) }
+IfcRelServicesBuildings::list::ptr IfcSystem::ServicesBuildings() const { return entity->getInverse(Type::IfcRelServicesBuildings, 4)->as<IfcRelServicesBuildings>(); }
 bool IfcSystem::is(Type::Enum v) const { return v == Type::IfcSystem || IfcGroup::is(v); }
 Type::Enum IfcSystem::type() const { return Type::IfcSystem; }
 Type::Enum IfcSystem::Class() { return Type::IfcSystem; }
-IfcSystem::IfcSystem(IfcAbstractEntityPtr e) : IfcGroup((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcSystem)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcSystem::IfcSystem(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType) : IfcGroup((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } entity = e; EntityBuffer::Add(this); }
+IfcSystem::IfcSystem(IfcAbstractEntity* e) : IfcGroup((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcSystem)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcSystem::IfcSystem(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType) : IfcGroup((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcSystemFurnitureElementType
 bool IfcSystemFurnitureElementType::is(Type::Enum v) const { return v == Type::IfcSystemFurnitureElementType || IfcFurnishingElementType::is(v); }
 Type::Enum IfcSystemFurnitureElementType::type() const { return Type::IfcSystemFurnitureElementType; }
 Type::Enum IfcSystemFurnitureElementType::Class() { return Type::IfcSystemFurnitureElementType; }
-IfcSystemFurnitureElementType::IfcSystemFurnitureElementType(IfcAbstractEntityPtr e) : IfcFurnishingElementType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcSystemFurnitureElementType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcSystemFurnitureElementType::IfcSystemFurnitureElementType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType) : IfcFurnishingElementType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcSystemFurnitureElementType::IfcSystemFurnitureElementType(IfcAbstractEntity* e) : IfcFurnishingElementType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcSystemFurnitureElementType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcSystemFurnitureElementType::IfcSystemFurnitureElementType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType) : IfcFurnishingElementType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcTShapeProfileDef
-IfcPositiveLengthMeasure IfcTShapeProfileDef::Depth() { return *entity->getArgument(3); }
-void IfcTShapeProfileDef::setDepth(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-IfcPositiveLengthMeasure IfcTShapeProfileDef::FlangeWidth() { return *entity->getArgument(4); }
-void IfcTShapeProfileDef::setFlangeWidth(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-IfcPositiveLengthMeasure IfcTShapeProfileDef::WebThickness() { return *entity->getArgument(5); }
-void IfcTShapeProfileDef::setWebThickness(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-IfcPositiveLengthMeasure IfcTShapeProfileDef::FlangeThickness() { return *entity->getArgument(6); }
-void IfcTShapeProfileDef::setFlangeThickness(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
-bool IfcTShapeProfileDef::hasFilletRadius() { return !entity->getArgument(7)->isNull(); }
-IfcPositiveLengthMeasure IfcTShapeProfileDef::FilletRadius() { return *entity->getArgument(7); }
-void IfcTShapeProfileDef::setFilletRadius(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
-bool IfcTShapeProfileDef::hasFlangeEdgeRadius() { return !entity->getArgument(8)->isNull(); }
-IfcPositiveLengthMeasure IfcTShapeProfileDef::FlangeEdgeRadius() { return *entity->getArgument(8); }
-void IfcTShapeProfileDef::setFlangeEdgeRadius(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
-bool IfcTShapeProfileDef::hasWebEdgeRadius() { return !entity->getArgument(9)->isNull(); }
-IfcPositiveLengthMeasure IfcTShapeProfileDef::WebEdgeRadius() { return *entity->getArgument(9); }
-void IfcTShapeProfileDef::setWebEdgeRadius(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
-bool IfcTShapeProfileDef::hasWebSlope() { return !entity->getArgument(10)->isNull(); }
-IfcPlaneAngleMeasure IfcTShapeProfileDef::WebSlope() { return *entity->getArgument(10); }
-void IfcTShapeProfileDef::setWebSlope(IfcPlaneAngleMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
-bool IfcTShapeProfileDef::hasFlangeSlope() { return !entity->getArgument(11)->isNull(); }
-IfcPlaneAngleMeasure IfcTShapeProfileDef::FlangeSlope() { return *entity->getArgument(11); }
-void IfcTShapeProfileDef::setFlangeSlope(IfcPlaneAngleMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(11,v); }
-bool IfcTShapeProfileDef::hasCentreOfGravityInY() { return !entity->getArgument(12)->isNull(); }
-IfcPositiveLengthMeasure IfcTShapeProfileDef::CentreOfGravityInY() { return *entity->getArgument(12); }
-void IfcTShapeProfileDef::setCentreOfGravityInY(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(12,v); }
+double IfcTShapeProfileDef::Depth() const { return *entity->getArgument(3); }
+void IfcTShapeProfileDef::setDepth(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+double IfcTShapeProfileDef::FlangeWidth() const { return *entity->getArgument(4); }
+void IfcTShapeProfileDef::setFlangeWidth(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+double IfcTShapeProfileDef::WebThickness() const { return *entity->getArgument(5); }
+void IfcTShapeProfileDef::setWebThickness(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+double IfcTShapeProfileDef::FlangeThickness() const { return *entity->getArgument(6); }
+void IfcTShapeProfileDef::setFlangeThickness(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
+bool IfcTShapeProfileDef::hasFilletRadius() const { return !entity->getArgument(7)->isNull(); }
+double IfcTShapeProfileDef::FilletRadius() const { return *entity->getArgument(7); }
+void IfcTShapeProfileDef::setFilletRadius(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
+bool IfcTShapeProfileDef::hasFlangeEdgeRadius() const { return !entity->getArgument(8)->isNull(); }
+double IfcTShapeProfileDef::FlangeEdgeRadius() const { return *entity->getArgument(8); }
+void IfcTShapeProfileDef::setFlangeEdgeRadius(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
+bool IfcTShapeProfileDef::hasWebEdgeRadius() const { return !entity->getArgument(9)->isNull(); }
+double IfcTShapeProfileDef::WebEdgeRadius() const { return *entity->getArgument(9); }
+void IfcTShapeProfileDef::setWebEdgeRadius(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
+bool IfcTShapeProfileDef::hasWebSlope() const { return !entity->getArgument(10)->isNull(); }
+double IfcTShapeProfileDef::WebSlope() const { return *entity->getArgument(10); }
+void IfcTShapeProfileDef::setWebSlope(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
+bool IfcTShapeProfileDef::hasFlangeSlope() const { return !entity->getArgument(11)->isNull(); }
+double IfcTShapeProfileDef::FlangeSlope() const { return *entity->getArgument(11); }
+void IfcTShapeProfileDef::setFlangeSlope(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(11,v); }
+bool IfcTShapeProfileDef::hasCentreOfGravityInY() const { return !entity->getArgument(12)->isNull(); }
+double IfcTShapeProfileDef::CentreOfGravityInY() const { return *entity->getArgument(12); }
+void IfcTShapeProfileDef::setCentreOfGravityInY(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(12,v); }
 bool IfcTShapeProfileDef::is(Type::Enum v) const { return v == Type::IfcTShapeProfileDef || IfcParameterizedProfileDef::is(v); }
 Type::Enum IfcTShapeProfileDef::type() const { return Type::IfcTShapeProfileDef; }
 Type::Enum IfcTShapeProfileDef::Class() { return Type::IfcTShapeProfileDef; }
-IfcTShapeProfileDef::IfcTShapeProfileDef(IfcAbstractEntityPtr e) : IfcParameterizedProfileDef((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcTShapeProfileDef)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcTShapeProfileDef::IfcTShapeProfileDef(IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< IfcLabel > v2_ProfileName, IfcAxis2Placement2D* v3_Position, IfcPositiveLengthMeasure v4_Depth, IfcPositiveLengthMeasure v5_FlangeWidth, IfcPositiveLengthMeasure v6_WebThickness, IfcPositiveLengthMeasure v7_FlangeThickness, boost::optional< IfcPositiveLengthMeasure > v8_FilletRadius, boost::optional< IfcPositiveLengthMeasure > v9_FlangeEdgeRadius, boost::optional< IfcPositiveLengthMeasure > v10_WebEdgeRadius, boost::optional< IfcPlaneAngleMeasure > v11_WebSlope, boost::optional< IfcPlaneAngleMeasure > v12_FlangeSlope, boost::optional< IfcPositiveLengthMeasure > v13_CentreOfGravityInY) : IfcParameterizedProfileDef((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,v1_ProfileType,IfcProfileTypeEnum::ToString(v1_ProfileType)); if (v2_ProfileName) { e->setArgument(1,(*v2_ProfileName)); } else { e->setArgument(1); } e->setArgument(2,(v3_Position)); e->setArgument(3,(v4_Depth)); e->setArgument(4,(v5_FlangeWidth)); e->setArgument(5,(v6_WebThickness)); e->setArgument(6,(v7_FlangeThickness)); if (v8_FilletRadius) { e->setArgument(7,(*v8_FilletRadius)); } else { e->setArgument(7); } if (v9_FlangeEdgeRadius) { e->setArgument(8,(*v9_FlangeEdgeRadius)); } else { e->setArgument(8); } if (v10_WebEdgeRadius) { e->setArgument(9,(*v10_WebEdgeRadius)); } else { e->setArgument(9); } if (v11_WebSlope) { e->setArgument(10,(*v11_WebSlope)); } else { e->setArgument(10); } if (v12_FlangeSlope) { e->setArgument(11,(*v12_FlangeSlope)); } else { e->setArgument(11); } if (v13_CentreOfGravityInY) { e->setArgument(12,(*v13_CentreOfGravityInY)); } else { e->setArgument(12); } entity = e; EntityBuffer::Add(this); }
+IfcTShapeProfileDef::IfcTShapeProfileDef(IfcAbstractEntity* e) : IfcParameterizedProfileDef((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcTShapeProfileDef)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcTShapeProfileDef::IfcTShapeProfileDef(IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< std::string > v2_ProfileName, IfcAxis2Placement2D* v3_Position, double v4_Depth, double v5_FlangeWidth, double v6_WebThickness, double v7_FlangeThickness, boost::optional< double > v8_FilletRadius, boost::optional< double > v9_FlangeEdgeRadius, boost::optional< double > v10_WebEdgeRadius, boost::optional< double > v11_WebSlope, boost::optional< double > v12_FlangeSlope, boost::optional< double > v13_CentreOfGravityInY) : IfcParameterizedProfileDef((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,v1_ProfileType,IfcProfileTypeEnum::ToString(v1_ProfileType)); if (v2_ProfileName) { e->setArgument(1,(*v2_ProfileName)); } else { e->setArgument(1); } e->setArgument(2,(v3_Position)); e->setArgument(3,(v4_Depth)); e->setArgument(4,(v5_FlangeWidth)); e->setArgument(5,(v6_WebThickness)); e->setArgument(6,(v7_FlangeThickness)); if (v8_FilletRadius) { e->setArgument(7,(*v8_FilletRadius)); } else { e->setArgument(7); } if (v9_FlangeEdgeRadius) { e->setArgument(8,(*v9_FlangeEdgeRadius)); } else { e->setArgument(8); } if (v10_WebEdgeRadius) { e->setArgument(9,(*v10_WebEdgeRadius)); } else { e->setArgument(9); } if (v11_WebSlope) { e->setArgument(10,(*v11_WebSlope)); } else { e->setArgument(10); } if (v12_FlangeSlope) { e->setArgument(11,(*v12_FlangeSlope)); } else { e->setArgument(11); } if (v13_CentreOfGravityInY) { e->setArgument(12,(*v13_CentreOfGravityInY)); } else { e->setArgument(12); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcTable
-std::string IfcTable::Name() { return *entity->getArgument(0); }
+std::string IfcTable::Name() const { return *entity->getArgument(0); }
 void IfcTable::setName(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-SHARED_PTR< IfcTemplatedEntityList< IfcTableRow > > IfcTable::Rows() { RETURN_AS_LIST(IfcTableRow,1) }
-void IfcTable::setRows(SHARED_PTR< IfcTemplatedEntityList< IfcTableRow > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v->generalize()); }
+IfcTemplatedEntityList< IfcTableRow >::ptr IfcTable::Rows() const { IfcEntityList::ptr es = *entity->getArgument(1); return es->as<IfcTableRow>(); }
+void IfcTable::setRows(IfcTemplatedEntityList< IfcTableRow >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v->generalize()); }
 bool IfcTable::is(Type::Enum v) const { return v == Type::IfcTable; }
 Type::Enum IfcTable::type() const { return Type::IfcTable; }
 Type::Enum IfcTable::Class() { return Type::IfcTable; }
-IfcTable::IfcTable(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcTable)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcTable::IfcTable(std::string v1_Name, SHARED_PTR< IfcTemplatedEntityList< IfcTableRow > > v2_Rows) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); e->setArgument(1,(v2_Rows)->generalize()); entity = e; EntityBuffer::Add(this); }
+IfcTable::IfcTable(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcTable)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcTable::IfcTable(std::string v1_Name, IfcTemplatedEntityList< IfcTableRow >::ptr v2_Rows) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); e->setArgument(1,(v2_Rows)->generalize()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcTableRow
-SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > IfcTableRow::RowCells() { RETURN_AS_LIST(IfcUtil::IfcAbstractSelect,0) }
-void IfcTableRow::setRowCells(SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v->generalize()); }
-bool IfcTableRow::IsHeading() { return *entity->getArgument(1); }
+IfcEntityList::ptr IfcTableRow::RowCells() const { return *entity->getArgument(0); }
+void IfcTableRow::setRowCells(IfcEntityList::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+bool IfcTableRow::IsHeading() const { return *entity->getArgument(1); }
 void IfcTableRow::setIsHeading(bool v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-IfcTable::list IfcTableRow::OfTable() { RETURN_INVERSE(IfcTable) }
+IfcTable::list::ptr IfcTableRow::OfTable() const { return entity->getInverse(Type::IfcTable, 1)->as<IfcTable>(); }
 bool IfcTableRow::is(Type::Enum v) const { return v == Type::IfcTableRow; }
 Type::Enum IfcTableRow::type() const { return Type::IfcTableRow; }
 Type::Enum IfcTableRow::Class() { return Type::IfcTableRow; }
-IfcTableRow::IfcTableRow(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcTableRow)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcTableRow::IfcTableRow(IfcEntities v1_RowCells, bool v2_IsHeading) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_RowCells)); e->setArgument(1,(v2_IsHeading)); entity = e; EntityBuffer::Add(this); }
+IfcTableRow::IfcTableRow(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcTableRow)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcTableRow::IfcTableRow(IfcEntityList::ptr v1_RowCells, bool v2_IsHeading) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_RowCells)); e->setArgument(1,(v2_IsHeading)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcTankType
-IfcTankTypeEnum::IfcTankTypeEnum IfcTankType::PredefinedType() { return IfcTankTypeEnum::FromString(*entity->getArgument(9)); }
+IfcTankTypeEnum::IfcTankTypeEnum IfcTankType::PredefinedType() const { return IfcTankTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcTankType::setPredefinedType(IfcTankTypeEnum::IfcTankTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcTankTypeEnum::ToString(v)); }
 bool IfcTankType::is(Type::Enum v) const { return v == Type::IfcTankType || IfcFlowStorageDeviceType::is(v); }
 Type::Enum IfcTankType::type() const { return Type::IfcTankType; }
 Type::Enum IfcTankType::Class() { return Type::IfcTankType; }
-IfcTankType::IfcTankType(IfcAbstractEntityPtr e) : IfcFlowStorageDeviceType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcTankType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcTankType::IfcTankType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcTankTypeEnum::IfcTankTypeEnum v10_PredefinedType) : IfcFlowStorageDeviceType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcTankTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcTankType::IfcTankType(IfcAbstractEntity* e) : IfcFlowStorageDeviceType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcTankType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcTankType::IfcTankType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcTankTypeEnum::IfcTankTypeEnum v10_PredefinedType) : IfcFlowStorageDeviceType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcTankTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcTask
-IfcIdentifier IfcTask::TaskId() { return *entity->getArgument(5); }
-void IfcTask::setTaskId(IfcIdentifier v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-bool IfcTask::hasStatus() { return !entity->getArgument(6)->isNull(); }
-IfcLabel IfcTask::Status() { return *entity->getArgument(6); }
-void IfcTask::setStatus(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
-bool IfcTask::hasWorkMethod() { return !entity->getArgument(7)->isNull(); }
-IfcLabel IfcTask::WorkMethod() { return *entity->getArgument(7); }
-void IfcTask::setWorkMethod(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
-bool IfcTask::IsMilestone() { return *entity->getArgument(8); }
+std::string IfcTask::TaskId() const { return *entity->getArgument(5); }
+void IfcTask::setTaskId(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+bool IfcTask::hasStatus() const { return !entity->getArgument(6)->isNull(); }
+std::string IfcTask::Status() const { return *entity->getArgument(6); }
+void IfcTask::setStatus(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
+bool IfcTask::hasWorkMethod() const { return !entity->getArgument(7)->isNull(); }
+std::string IfcTask::WorkMethod() const { return *entity->getArgument(7); }
+void IfcTask::setWorkMethod(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
+bool IfcTask::IsMilestone() const { return *entity->getArgument(8); }
 void IfcTask::setIsMilestone(bool v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
-bool IfcTask::hasPriority() { return !entity->getArgument(9)->isNull(); }
-int IfcTask::Priority() { return *entity->getArgument(9); }
+bool IfcTask::hasPriority() const { return !entity->getArgument(9)->isNull(); }
+int IfcTask::Priority() const { return *entity->getArgument(9); }
 void IfcTask::setPriority(int v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
 bool IfcTask::is(Type::Enum v) const { return v == Type::IfcTask || IfcProcess::is(v); }
 Type::Enum IfcTask::type() const { return Type::IfcTask; }
 Type::Enum IfcTask::Class() { return Type::IfcTask; }
-IfcTask::IfcTask(IfcAbstractEntityPtr e) : IfcProcess((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcTask)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcTask::IfcTask(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcIdentifier v6_TaskId, boost::optional< IfcLabel > v7_Status, boost::optional< IfcLabel > v8_WorkMethod, bool v9_IsMilestone, boost::optional< int > v10_Priority) : IfcProcess((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_TaskId)); if (v7_Status) { e->setArgument(6,(*v7_Status)); } else { e->setArgument(6); } if (v8_WorkMethod) { e->setArgument(7,(*v8_WorkMethod)); } else { e->setArgument(7); } e->setArgument(8,(v9_IsMilestone)); if (v10_Priority) { e->setArgument(9,(*v10_Priority)); } else { e->setArgument(9); } entity = e; EntityBuffer::Add(this); }
+IfcTask::IfcTask(IfcAbstractEntity* e) : IfcProcess((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcTask)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcTask::IfcTask(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, std::string v6_TaskId, boost::optional< std::string > v7_Status, boost::optional< std::string > v8_WorkMethod, bool v9_IsMilestone, boost::optional< int > v10_Priority) : IfcProcess((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_TaskId)); if (v7_Status) { e->setArgument(6,(*v7_Status)); } else { e->setArgument(6); } if (v8_WorkMethod) { e->setArgument(7,(*v8_WorkMethod)); } else { e->setArgument(7); } e->setArgument(8,(v9_IsMilestone)); if (v10_Priority) { e->setArgument(9,(*v10_Priority)); } else { e->setArgument(9); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcTelecomAddress
-bool IfcTelecomAddress::hasTelephoneNumbers() { return !entity->getArgument(3)->isNull(); }
-std::vector< IfcLabel > /*[1:?]*/ IfcTelecomAddress::TelephoneNumbers() { return *entity->getArgument(3); }
-void IfcTelecomAddress::setTelephoneNumbers(std::vector< IfcLabel > /*[1:?]*/ v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-bool IfcTelecomAddress::hasFacsimileNumbers() { return !entity->getArgument(4)->isNull(); }
-std::vector< IfcLabel > /*[1:?]*/ IfcTelecomAddress::FacsimileNumbers() { return *entity->getArgument(4); }
-void IfcTelecomAddress::setFacsimileNumbers(std::vector< IfcLabel > /*[1:?]*/ v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-bool IfcTelecomAddress::hasPagerNumber() { return !entity->getArgument(5)->isNull(); }
-IfcLabel IfcTelecomAddress::PagerNumber() { return *entity->getArgument(5); }
-void IfcTelecomAddress::setPagerNumber(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-bool IfcTelecomAddress::hasElectronicMailAddresses() { return !entity->getArgument(6)->isNull(); }
-std::vector< IfcLabel > /*[1:?]*/ IfcTelecomAddress::ElectronicMailAddresses() { return *entity->getArgument(6); }
-void IfcTelecomAddress::setElectronicMailAddresses(std::vector< IfcLabel > /*[1:?]*/ v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
-bool IfcTelecomAddress::hasWWWHomePageURL() { return !entity->getArgument(7)->isNull(); }
-IfcLabel IfcTelecomAddress::WWWHomePageURL() { return *entity->getArgument(7); }
-void IfcTelecomAddress::setWWWHomePageURL(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
+bool IfcTelecomAddress::hasTelephoneNumbers() const { return !entity->getArgument(3)->isNull(); }
+std::vector< std::string > /*[1:?]*/ IfcTelecomAddress::TelephoneNumbers() const { return *entity->getArgument(3); }
+void IfcTelecomAddress::setTelephoneNumbers(std::vector< std::string > /*[1:?]*/ v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+bool IfcTelecomAddress::hasFacsimileNumbers() const { return !entity->getArgument(4)->isNull(); }
+std::vector< std::string > /*[1:?]*/ IfcTelecomAddress::FacsimileNumbers() const { return *entity->getArgument(4); }
+void IfcTelecomAddress::setFacsimileNumbers(std::vector< std::string > /*[1:?]*/ v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+bool IfcTelecomAddress::hasPagerNumber() const { return !entity->getArgument(5)->isNull(); }
+std::string IfcTelecomAddress::PagerNumber() const { return *entity->getArgument(5); }
+void IfcTelecomAddress::setPagerNumber(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+bool IfcTelecomAddress::hasElectronicMailAddresses() const { return !entity->getArgument(6)->isNull(); }
+std::vector< std::string > /*[1:?]*/ IfcTelecomAddress::ElectronicMailAddresses() const { return *entity->getArgument(6); }
+void IfcTelecomAddress::setElectronicMailAddresses(std::vector< std::string > /*[1:?]*/ v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
+bool IfcTelecomAddress::hasWWWHomePageURL() const { return !entity->getArgument(7)->isNull(); }
+std::string IfcTelecomAddress::WWWHomePageURL() const { return *entity->getArgument(7); }
+void IfcTelecomAddress::setWWWHomePageURL(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
 bool IfcTelecomAddress::is(Type::Enum v) const { return v == Type::IfcTelecomAddress || IfcAddress::is(v); }
 Type::Enum IfcTelecomAddress::type() const { return Type::IfcTelecomAddress; }
 Type::Enum IfcTelecomAddress::Class() { return Type::IfcTelecomAddress; }
-IfcTelecomAddress::IfcTelecomAddress(IfcAbstractEntityPtr e) : IfcAddress((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcTelecomAddress)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcTelecomAddress::IfcTelecomAddress(boost::optional< IfcAddressTypeEnum::IfcAddressTypeEnum > v1_Purpose, boost::optional< IfcText > v2_Description, boost::optional< IfcLabel > v3_UserDefinedPurpose, boost::optional< std::vector< IfcLabel > /*[1:?]*/ > v4_TelephoneNumbers, boost::optional< std::vector< IfcLabel > /*[1:?]*/ > v5_FacsimileNumbers, boost::optional< IfcLabel > v6_PagerNumber, boost::optional< std::vector< IfcLabel > /*[1:?]*/ > v7_ElectronicMailAddresses, boost::optional< IfcLabel > v8_WWWHomePageURL) : IfcAddress((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Purpose) { e->setArgument(0,*v1_Purpose,IfcAddressTypeEnum::ToString(*v1_Purpose)); } else { e->setArgument(0); } if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } if (v3_UserDefinedPurpose) { e->setArgument(2,(*v3_UserDefinedPurpose)); } else { e->setArgument(2); } if (v4_TelephoneNumbers) { e->setArgument(3,(*v4_TelephoneNumbers)); } else { e->setArgument(3); } if (v5_FacsimileNumbers) { e->setArgument(4,(*v5_FacsimileNumbers)); } else { e->setArgument(4); } if (v6_PagerNumber) { e->setArgument(5,(*v6_PagerNumber)); } else { e->setArgument(5); } if (v7_ElectronicMailAddresses) { e->setArgument(6,(*v7_ElectronicMailAddresses)); } else { e->setArgument(6); } if (v8_WWWHomePageURL) { e->setArgument(7,(*v8_WWWHomePageURL)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
+IfcTelecomAddress::IfcTelecomAddress(IfcAbstractEntity* e) : IfcAddress((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcTelecomAddress)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcTelecomAddress::IfcTelecomAddress(boost::optional< IfcAddressTypeEnum::IfcAddressTypeEnum > v1_Purpose, boost::optional< std::string > v2_Description, boost::optional< std::string > v3_UserDefinedPurpose, boost::optional< std::vector< std::string > /*[1:?]*/ > v4_TelephoneNumbers, boost::optional< std::vector< std::string > /*[1:?]*/ > v5_FacsimileNumbers, boost::optional< std::string > v6_PagerNumber, boost::optional< std::vector< std::string > /*[1:?]*/ > v7_ElectronicMailAddresses, boost::optional< std::string > v8_WWWHomePageURL) : IfcAddress((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Purpose) { e->setArgument(0,*v1_Purpose,IfcAddressTypeEnum::ToString(*v1_Purpose)); } else { e->setArgument(0); } if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } if (v3_UserDefinedPurpose) { e->setArgument(2,(*v3_UserDefinedPurpose)); } else { e->setArgument(2); } if (v4_TelephoneNumbers) { e->setArgument(3,(*v4_TelephoneNumbers)); } else { e->setArgument(3); } if (v5_FacsimileNumbers) { e->setArgument(4,(*v5_FacsimileNumbers)); } else { e->setArgument(4); } if (v6_PagerNumber) { e->setArgument(5,(*v6_PagerNumber)); } else { e->setArgument(5); } if (v7_ElectronicMailAddresses) { e->setArgument(6,(*v7_ElectronicMailAddresses)); } else { e->setArgument(6); } if (v8_WWWHomePageURL) { e->setArgument(7,(*v8_WWWHomePageURL)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcTendon
-IfcTendonTypeEnum::IfcTendonTypeEnum IfcTendon::PredefinedType() { return IfcTendonTypeEnum::FromString(*entity->getArgument(9)); }
+IfcTendonTypeEnum::IfcTendonTypeEnum IfcTendon::PredefinedType() const { return IfcTendonTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcTendon::setPredefinedType(IfcTendonTypeEnum::IfcTendonTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcTendonTypeEnum::ToString(v)); }
-IfcPositiveLengthMeasure IfcTendon::NominalDiameter() { return *entity->getArgument(10); }
-void IfcTendon::setNominalDiameter(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
-IfcAreaMeasure IfcTendon::CrossSectionArea() { return *entity->getArgument(11); }
-void IfcTendon::setCrossSectionArea(IfcAreaMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(11,v); }
-bool IfcTendon::hasTensionForce() { return !entity->getArgument(12)->isNull(); }
-IfcForceMeasure IfcTendon::TensionForce() { return *entity->getArgument(12); }
-void IfcTendon::setTensionForce(IfcForceMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(12,v); }
-bool IfcTendon::hasPreStress() { return !entity->getArgument(13)->isNull(); }
-IfcPressureMeasure IfcTendon::PreStress() { return *entity->getArgument(13); }
-void IfcTendon::setPreStress(IfcPressureMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(13,v); }
-bool IfcTendon::hasFrictionCoefficient() { return !entity->getArgument(14)->isNull(); }
-IfcNormalisedRatioMeasure IfcTendon::FrictionCoefficient() { return *entity->getArgument(14); }
-void IfcTendon::setFrictionCoefficient(IfcNormalisedRatioMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(14,v); }
-bool IfcTendon::hasAnchorageSlip() { return !entity->getArgument(15)->isNull(); }
-IfcPositiveLengthMeasure IfcTendon::AnchorageSlip() { return *entity->getArgument(15); }
-void IfcTendon::setAnchorageSlip(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(15,v); }
-bool IfcTendon::hasMinCurvatureRadius() { return !entity->getArgument(16)->isNull(); }
-IfcPositiveLengthMeasure IfcTendon::MinCurvatureRadius() { return *entity->getArgument(16); }
-void IfcTendon::setMinCurvatureRadius(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(16,v); }
+double IfcTendon::NominalDiameter() const { return *entity->getArgument(10); }
+void IfcTendon::setNominalDiameter(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
+double IfcTendon::CrossSectionArea() const { return *entity->getArgument(11); }
+void IfcTendon::setCrossSectionArea(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(11,v); }
+bool IfcTendon::hasTensionForce() const { return !entity->getArgument(12)->isNull(); }
+double IfcTendon::TensionForce() const { return *entity->getArgument(12); }
+void IfcTendon::setTensionForce(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(12,v); }
+bool IfcTendon::hasPreStress() const { return !entity->getArgument(13)->isNull(); }
+double IfcTendon::PreStress() const { return *entity->getArgument(13); }
+void IfcTendon::setPreStress(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(13,v); }
+bool IfcTendon::hasFrictionCoefficient() const { return !entity->getArgument(14)->isNull(); }
+double IfcTendon::FrictionCoefficient() const { return *entity->getArgument(14); }
+void IfcTendon::setFrictionCoefficient(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(14,v); }
+bool IfcTendon::hasAnchorageSlip() const { return !entity->getArgument(15)->isNull(); }
+double IfcTendon::AnchorageSlip() const { return *entity->getArgument(15); }
+void IfcTendon::setAnchorageSlip(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(15,v); }
+bool IfcTendon::hasMinCurvatureRadius() const { return !entity->getArgument(16)->isNull(); }
+double IfcTendon::MinCurvatureRadius() const { return *entity->getArgument(16); }
+void IfcTendon::setMinCurvatureRadius(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(16,v); }
 bool IfcTendon::is(Type::Enum v) const { return v == Type::IfcTendon || IfcReinforcingElement::is(v); }
 Type::Enum IfcTendon::type() const { return Type::IfcTendon; }
 Type::Enum IfcTendon::Class() { return Type::IfcTendon; }
-IfcTendon::IfcTendon(IfcAbstractEntityPtr e) : IfcReinforcingElement((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcTendon)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcTendon::IfcTendon(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcLabel > v9_SteelGrade, IfcTendonTypeEnum::IfcTendonTypeEnum v10_PredefinedType, IfcPositiveLengthMeasure v11_NominalDiameter, IfcAreaMeasure v12_CrossSectionArea, boost::optional< IfcForceMeasure > v13_TensionForce, boost::optional< IfcPressureMeasure > v14_PreStress, boost::optional< IfcNormalisedRatioMeasure > v15_FrictionCoefficient, boost::optional< IfcPositiveLengthMeasure > v16_AnchorageSlip, boost::optional< IfcPositiveLengthMeasure > v17_MinCurvatureRadius) : IfcReinforcingElement((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_SteelGrade) { e->setArgument(8,(*v9_SteelGrade)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcTendonTypeEnum::ToString(v10_PredefinedType)); e->setArgument(10,(v11_NominalDiameter)); e->setArgument(11,(v12_CrossSectionArea)); if (v13_TensionForce) { e->setArgument(12,(*v13_TensionForce)); } else { e->setArgument(12); } if (v14_PreStress) { e->setArgument(13,(*v14_PreStress)); } else { e->setArgument(13); } if (v15_FrictionCoefficient) { e->setArgument(14,(*v15_FrictionCoefficient)); } else { e->setArgument(14); } if (v16_AnchorageSlip) { e->setArgument(15,(*v16_AnchorageSlip)); } else { e->setArgument(15); } if (v17_MinCurvatureRadius) { e->setArgument(16,(*v17_MinCurvatureRadius)); } else { e->setArgument(16); } entity = e; EntityBuffer::Add(this); }
+IfcTendon::IfcTendon(IfcAbstractEntity* e) : IfcReinforcingElement((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcTendon)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcTendon::IfcTendon(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_SteelGrade, IfcTendonTypeEnum::IfcTendonTypeEnum v10_PredefinedType, double v11_NominalDiameter, double v12_CrossSectionArea, boost::optional< double > v13_TensionForce, boost::optional< double > v14_PreStress, boost::optional< double > v15_FrictionCoefficient, boost::optional< double > v16_AnchorageSlip, boost::optional< double > v17_MinCurvatureRadius) : IfcReinforcingElement((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_SteelGrade) { e->setArgument(8,(*v9_SteelGrade)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcTendonTypeEnum::ToString(v10_PredefinedType)); e->setArgument(10,(v11_NominalDiameter)); e->setArgument(11,(v12_CrossSectionArea)); if (v13_TensionForce) { e->setArgument(12,(*v13_TensionForce)); } else { e->setArgument(12); } if (v14_PreStress) { e->setArgument(13,(*v14_PreStress)); } else { e->setArgument(13); } if (v15_FrictionCoefficient) { e->setArgument(14,(*v15_FrictionCoefficient)); } else { e->setArgument(14); } if (v16_AnchorageSlip) { e->setArgument(15,(*v16_AnchorageSlip)); } else { e->setArgument(15); } if (v17_MinCurvatureRadius) { e->setArgument(16,(*v17_MinCurvatureRadius)); } else { e->setArgument(16); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcTendonAnchor
 bool IfcTendonAnchor::is(Type::Enum v) const { return v == Type::IfcTendonAnchor || IfcReinforcingElement::is(v); }
 Type::Enum IfcTendonAnchor::type() const { return Type::IfcTendonAnchor; }
 Type::Enum IfcTendonAnchor::Class() { return Type::IfcTendonAnchor; }
-IfcTendonAnchor::IfcTendonAnchor(IfcAbstractEntityPtr e) : IfcReinforcingElement((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcTendonAnchor)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcTendonAnchor::IfcTendonAnchor(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcLabel > v9_SteelGrade) : IfcReinforcingElement((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_SteelGrade) { e->setArgument(8,(*v9_SteelGrade)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcTendonAnchor::IfcTendonAnchor(IfcAbstractEntity* e) : IfcReinforcingElement((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcTendonAnchor)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcTendonAnchor::IfcTendonAnchor(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_SteelGrade) : IfcReinforcingElement((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_SteelGrade) { e->setArgument(8,(*v9_SteelGrade)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcTerminatorSymbol
-IfcAnnotationCurveOccurrence* IfcTerminatorSymbol::AnnotatedCurve() { return (IfcAnnotationCurveOccurrence*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(3))); }
+IfcAnnotationCurveOccurrence* IfcTerminatorSymbol::AnnotatedCurve() const { return (IfcAnnotationCurveOccurrence*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(3))); }
 void IfcTerminatorSymbol::setAnnotatedCurve(IfcAnnotationCurveOccurrence* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
 bool IfcTerminatorSymbol::is(Type::Enum v) const { return v == Type::IfcTerminatorSymbol || IfcAnnotationSymbolOccurrence::is(v); }
 Type::Enum IfcTerminatorSymbol::type() const { return Type::IfcTerminatorSymbol; }
 Type::Enum IfcTerminatorSymbol::Class() { return Type::IfcTerminatorSymbol; }
-IfcTerminatorSymbol::IfcTerminatorSymbol(IfcAbstractEntityPtr e) : IfcAnnotationSymbolOccurrence((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcTerminatorSymbol)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcTerminatorSymbol::IfcTerminatorSymbol(IfcRepresentationItem* v1_Item, SHARED_PTR< IfcTemplatedEntityList< IfcPresentationStyleAssignment > > v2_Styles, boost::optional< IfcLabel > v3_Name, IfcAnnotationCurveOccurrence* v4_AnnotatedCurve) : IfcAnnotationSymbolOccurrence((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Item)); e->setArgument(1,(v2_Styles)->generalize()); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } e->setArgument(3,(v4_AnnotatedCurve)); entity = e; EntityBuffer::Add(this); }
+IfcTerminatorSymbol::IfcTerminatorSymbol(IfcAbstractEntity* e) : IfcAnnotationSymbolOccurrence((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcTerminatorSymbol)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcTerminatorSymbol::IfcTerminatorSymbol(IfcRepresentationItem* v1_Item, IfcTemplatedEntityList< IfcPresentationStyleAssignment >::ptr v2_Styles, boost::optional< std::string > v3_Name, IfcAnnotationCurveOccurrence* v4_AnnotatedCurve) : IfcAnnotationSymbolOccurrence((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Item)); e->setArgument(1,(v2_Styles)->generalize()); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } e->setArgument(3,(v4_AnnotatedCurve)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcTextLiteral
-IfcPresentableText IfcTextLiteral::Literal() { return *entity->getArgument(0); }
-void IfcTextLiteral::setLiteral(IfcPresentableText v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-IfcAxis2Placement IfcTextLiteral::Placement() { return *entity->getArgument(1); }
-void IfcTextLiteral::setPlacement(IfcAxis2Placement v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-IfcTextPath::IfcTextPath IfcTextLiteral::Path() { return IfcTextPath::FromString(*entity->getArgument(2)); }
+std::string IfcTextLiteral::Literal() const { return *entity->getArgument(0); }
+void IfcTextLiteral::setLiteral(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+IfcAxis2Placement* IfcTextLiteral::Placement() const { return (IfcAxis2Placement*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(1))); }
+void IfcTextLiteral::setPlacement(IfcAxis2Placement* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+IfcTextPath::IfcTextPath IfcTextLiteral::Path() const { return IfcTextPath::FromString(*entity->getArgument(2)); }
 void IfcTextLiteral::setPath(IfcTextPath::IfcTextPath v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v,IfcTextPath::ToString(v)); }
 bool IfcTextLiteral::is(Type::Enum v) const { return v == Type::IfcTextLiteral || IfcGeometricRepresentationItem::is(v); }
 Type::Enum IfcTextLiteral::type() const { return Type::IfcTextLiteral; }
 Type::Enum IfcTextLiteral::Class() { return Type::IfcTextLiteral; }
-IfcTextLiteral::IfcTextLiteral(IfcAbstractEntityPtr e) : IfcGeometricRepresentationItem((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcTextLiteral)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcTextLiteral::IfcTextLiteral(IfcPresentableText v1_Literal, IfcAxis2Placement v2_Placement, IfcTextPath::IfcTextPath v3_Path) : IfcGeometricRepresentationItem((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Literal)); e->setArgument(1,(v2_Placement)); e->setArgument(2,v3_Path,IfcTextPath::ToString(v3_Path)); entity = e; EntityBuffer::Add(this); }
+IfcTextLiteral::IfcTextLiteral(IfcAbstractEntity* e) : IfcGeometricRepresentationItem((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcTextLiteral)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcTextLiteral::IfcTextLiteral(std::string v1_Literal, IfcAxis2Placement* v2_Placement, IfcTextPath::IfcTextPath v3_Path) : IfcGeometricRepresentationItem((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Literal)); e->setArgument(1,(v2_Placement)); e->setArgument(2,v3_Path,IfcTextPath::ToString(v3_Path)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcTextLiteralWithExtent
-IfcPlanarExtent* IfcTextLiteralWithExtent::Extent() { return (IfcPlanarExtent*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(3))); }
+IfcPlanarExtent* IfcTextLiteralWithExtent::Extent() const { return (IfcPlanarExtent*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(3))); }
 void IfcTextLiteralWithExtent::setExtent(IfcPlanarExtent* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-IfcBoxAlignment IfcTextLiteralWithExtent::BoxAlignment() { return *entity->getArgument(4); }
-void IfcTextLiteralWithExtent::setBoxAlignment(IfcBoxAlignment v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+std::string IfcTextLiteralWithExtent::BoxAlignment() const { return *entity->getArgument(4); }
+void IfcTextLiteralWithExtent::setBoxAlignment(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
 bool IfcTextLiteralWithExtent::is(Type::Enum v) const { return v == Type::IfcTextLiteralWithExtent || IfcTextLiteral::is(v); }
 Type::Enum IfcTextLiteralWithExtent::type() const { return Type::IfcTextLiteralWithExtent; }
 Type::Enum IfcTextLiteralWithExtent::Class() { return Type::IfcTextLiteralWithExtent; }
-IfcTextLiteralWithExtent::IfcTextLiteralWithExtent(IfcAbstractEntityPtr e) : IfcTextLiteral((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcTextLiteralWithExtent)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcTextLiteralWithExtent::IfcTextLiteralWithExtent(IfcPresentableText v1_Literal, IfcAxis2Placement v2_Placement, IfcTextPath::IfcTextPath v3_Path, IfcPlanarExtent* v4_Extent, IfcBoxAlignment v5_BoxAlignment) : IfcTextLiteral((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Literal)); e->setArgument(1,(v2_Placement)); e->setArgument(2,v3_Path,IfcTextPath::ToString(v3_Path)); e->setArgument(3,(v4_Extent)); e->setArgument(4,(v5_BoxAlignment)); entity = e; EntityBuffer::Add(this); }
+IfcTextLiteralWithExtent::IfcTextLiteralWithExtent(IfcAbstractEntity* e) : IfcTextLiteral((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcTextLiteralWithExtent)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcTextLiteralWithExtent::IfcTextLiteralWithExtent(std::string v1_Literal, IfcAxis2Placement* v2_Placement, IfcTextPath::IfcTextPath v3_Path, IfcPlanarExtent* v4_Extent, std::string v5_BoxAlignment) : IfcTextLiteral((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Literal)); e->setArgument(1,(v2_Placement)); e->setArgument(2,v3_Path,IfcTextPath::ToString(v3_Path)); e->setArgument(3,(v4_Extent)); e->setArgument(4,(v5_BoxAlignment)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcTextStyle
-bool IfcTextStyle::hasTextCharacterAppearance() { return !entity->getArgument(1)->isNull(); }
-IfcCharacterStyleSelect IfcTextStyle::TextCharacterAppearance() { return *entity->getArgument(1); }
-void IfcTextStyle::setTextCharacterAppearance(IfcCharacterStyleSelect v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-bool IfcTextStyle::hasTextStyle() { return !entity->getArgument(2)->isNull(); }
-IfcTextStyleSelect IfcTextStyle::TextStyle() { return *entity->getArgument(2); }
-void IfcTextStyle::setTextStyle(IfcTextStyleSelect v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-IfcTextFontSelect IfcTextStyle::TextFontStyle() { return *entity->getArgument(3); }
-void IfcTextStyle::setTextFontStyle(IfcTextFontSelect v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+bool IfcTextStyle::hasTextCharacterAppearance() const { return !entity->getArgument(1)->isNull(); }
+IfcCharacterStyleSelect* IfcTextStyle::TextCharacterAppearance() const { return (IfcCharacterStyleSelect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(1))); }
+void IfcTextStyle::setTextCharacterAppearance(IfcCharacterStyleSelect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+bool IfcTextStyle::hasTextStyle() const { return !entity->getArgument(2)->isNull(); }
+IfcTextStyleSelect* IfcTextStyle::TextStyle() const { return (IfcTextStyleSelect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(2))); }
+void IfcTextStyle::setTextStyle(IfcTextStyleSelect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+IfcTextFontSelect* IfcTextStyle::TextFontStyle() const { return (IfcTextFontSelect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(3))); }
+void IfcTextStyle::setTextFontStyle(IfcTextFontSelect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
 bool IfcTextStyle::is(Type::Enum v) const { return v == Type::IfcTextStyle || IfcPresentationStyle::is(v); }
 Type::Enum IfcTextStyle::type() const { return Type::IfcTextStyle; }
 Type::Enum IfcTextStyle::Class() { return Type::IfcTextStyle; }
-IfcTextStyle::IfcTextStyle(IfcAbstractEntityPtr e) : IfcPresentationStyle((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcTextStyle)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcTextStyle::IfcTextStyle(boost::optional< IfcLabel > v1_Name, boost::optional< IfcCharacterStyleSelect > v2_TextCharacterAppearance, boost::optional< IfcTextStyleSelect > v3_TextStyle, IfcTextFontSelect v4_TextFontStyle) : IfcPresentationStyle((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_TextCharacterAppearance) { e->setArgument(1,(*v2_TextCharacterAppearance)); } else { e->setArgument(1); } if (v3_TextStyle) { e->setArgument(2,(*v3_TextStyle)); } else { e->setArgument(2); } e->setArgument(3,(v4_TextFontStyle)); entity = e; EntityBuffer::Add(this); }
+IfcTextStyle::IfcTextStyle(IfcAbstractEntity* e) : IfcPresentationStyle((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcTextStyle)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcTextStyle::IfcTextStyle(boost::optional< std::string > v1_Name, IfcCharacterStyleSelect* v2_TextCharacterAppearance, IfcTextStyleSelect* v3_TextStyle, IfcTextFontSelect* v4_TextFontStyle) : IfcPresentationStyle((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } e->setArgument(1,(v2_TextCharacterAppearance)); e->setArgument(2,(v3_TextStyle)); e->setArgument(3,(v4_TextFontStyle)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcTextStyleFontModel
-bool IfcTextStyleFontModel::hasFontFamily() { return !entity->getArgument(1)->isNull(); }
-std::vector< IfcTextFontName > /*[1:?]*/ IfcTextStyleFontModel::FontFamily() { return *entity->getArgument(1); }
-void IfcTextStyleFontModel::setFontFamily(std::vector< IfcTextFontName > /*[1:?]*/ v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-bool IfcTextStyleFontModel::hasFontStyle() { return !entity->getArgument(2)->isNull(); }
-IfcFontStyle IfcTextStyleFontModel::FontStyle() { return *entity->getArgument(2); }
-void IfcTextStyleFontModel::setFontStyle(IfcFontStyle v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-bool IfcTextStyleFontModel::hasFontVariant() { return !entity->getArgument(3)->isNull(); }
-IfcFontVariant IfcTextStyleFontModel::FontVariant() { return *entity->getArgument(3); }
-void IfcTextStyleFontModel::setFontVariant(IfcFontVariant v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-bool IfcTextStyleFontModel::hasFontWeight() { return !entity->getArgument(4)->isNull(); }
-IfcFontWeight IfcTextStyleFontModel::FontWeight() { return *entity->getArgument(4); }
-void IfcTextStyleFontModel::setFontWeight(IfcFontWeight v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-IfcSizeSelect IfcTextStyleFontModel::FontSize() { return *entity->getArgument(5); }
-void IfcTextStyleFontModel::setFontSize(IfcSizeSelect v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+bool IfcTextStyleFontModel::hasFontFamily() const { return !entity->getArgument(1)->isNull(); }
+std::vector< std::string > /*[1:?]*/ IfcTextStyleFontModel::FontFamily() const { return *entity->getArgument(1); }
+void IfcTextStyleFontModel::setFontFamily(std::vector< std::string > /*[1:?]*/ v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+bool IfcTextStyleFontModel::hasFontStyle() const { return !entity->getArgument(2)->isNull(); }
+std::string IfcTextStyleFontModel::FontStyle() const { return *entity->getArgument(2); }
+void IfcTextStyleFontModel::setFontStyle(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+bool IfcTextStyleFontModel::hasFontVariant() const { return !entity->getArgument(3)->isNull(); }
+std::string IfcTextStyleFontModel::FontVariant() const { return *entity->getArgument(3); }
+void IfcTextStyleFontModel::setFontVariant(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+bool IfcTextStyleFontModel::hasFontWeight() const { return !entity->getArgument(4)->isNull(); }
+std::string IfcTextStyleFontModel::FontWeight() const { return *entity->getArgument(4); }
+void IfcTextStyleFontModel::setFontWeight(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+IfcSizeSelect* IfcTextStyleFontModel::FontSize() const { return (IfcSizeSelect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(5))); }
+void IfcTextStyleFontModel::setFontSize(IfcSizeSelect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
 bool IfcTextStyleFontModel::is(Type::Enum v) const { return v == Type::IfcTextStyleFontModel || IfcPreDefinedTextFont::is(v); }
 Type::Enum IfcTextStyleFontModel::type() const { return Type::IfcTextStyleFontModel; }
 Type::Enum IfcTextStyleFontModel::Class() { return Type::IfcTextStyleFontModel; }
-IfcTextStyleFontModel::IfcTextStyleFontModel(IfcAbstractEntityPtr e) : IfcPreDefinedTextFont((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcTextStyleFontModel)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcTextStyleFontModel::IfcTextStyleFontModel(IfcLabel v1_Name, boost::optional< std::vector< IfcTextFontName > /*[1:?]*/ > v2_FontFamily, boost::optional< IfcFontStyle > v3_FontStyle, boost::optional< IfcFontVariant > v4_FontVariant, boost::optional< IfcFontWeight > v5_FontWeight, IfcSizeSelect v6_FontSize) : IfcPreDefinedTextFont((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); if (v2_FontFamily) { e->setArgument(1,(*v2_FontFamily)); } else { e->setArgument(1); } if (v3_FontStyle) { e->setArgument(2,(*v3_FontStyle)); } else { e->setArgument(2); } if (v4_FontVariant) { e->setArgument(3,(*v4_FontVariant)); } else { e->setArgument(3); } if (v5_FontWeight) { e->setArgument(4,(*v5_FontWeight)); } else { e->setArgument(4); } e->setArgument(5,(v6_FontSize)); entity = e; EntityBuffer::Add(this); }
+IfcTextStyleFontModel::IfcTextStyleFontModel(IfcAbstractEntity* e) : IfcPreDefinedTextFont((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcTextStyleFontModel)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcTextStyleFontModel::IfcTextStyleFontModel(std::string v1_Name, boost::optional< std::vector< std::string > /*[1:?]*/ > v2_FontFamily, boost::optional< std::string > v3_FontStyle, boost::optional< std::string > v4_FontVariant, boost::optional< std::string > v5_FontWeight, IfcSizeSelect* v6_FontSize) : IfcPreDefinedTextFont((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); if (v2_FontFamily) { e->setArgument(1,(*v2_FontFamily)); } else { e->setArgument(1); } if (v3_FontStyle) { e->setArgument(2,(*v3_FontStyle)); } else { e->setArgument(2); } if (v4_FontVariant) { e->setArgument(3,(*v4_FontVariant)); } else { e->setArgument(3); } if (v5_FontWeight) { e->setArgument(4,(*v5_FontWeight)); } else { e->setArgument(4); } e->setArgument(5,(v6_FontSize)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcTextStyleForDefinedFont
-IfcColour IfcTextStyleForDefinedFont::Colour() { return *entity->getArgument(0); }
-void IfcTextStyleForDefinedFont::setColour(IfcColour v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-bool IfcTextStyleForDefinedFont::hasBackgroundColour() { return !entity->getArgument(1)->isNull(); }
-IfcColour IfcTextStyleForDefinedFont::BackgroundColour() { return *entity->getArgument(1); }
-void IfcTextStyleForDefinedFont::setBackgroundColour(IfcColour v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+IfcColour* IfcTextStyleForDefinedFont::Colour() const { return (IfcColour*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(0))); }
+void IfcTextStyleForDefinedFont::setColour(IfcColour* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+bool IfcTextStyleForDefinedFont::hasBackgroundColour() const { return !entity->getArgument(1)->isNull(); }
+IfcColour* IfcTextStyleForDefinedFont::BackgroundColour() const { return (IfcColour*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(1))); }
+void IfcTextStyleForDefinedFont::setBackgroundColour(IfcColour* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
 bool IfcTextStyleForDefinedFont::is(Type::Enum v) const { return v == Type::IfcTextStyleForDefinedFont; }
 Type::Enum IfcTextStyleForDefinedFont::type() const { return Type::IfcTextStyleForDefinedFont; }
 Type::Enum IfcTextStyleForDefinedFont::Class() { return Type::IfcTextStyleForDefinedFont; }
-IfcTextStyleForDefinedFont::IfcTextStyleForDefinedFont(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcTextStyleForDefinedFont)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcTextStyleForDefinedFont::IfcTextStyleForDefinedFont(IfcColour v1_Colour, boost::optional< IfcColour > v2_BackgroundColour) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Colour)); if (v2_BackgroundColour) { e->setArgument(1,(*v2_BackgroundColour)); } else { e->setArgument(1); } entity = e; EntityBuffer::Add(this); }
+IfcTextStyleForDefinedFont::IfcTextStyleForDefinedFont(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcTextStyleForDefinedFont)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcTextStyleForDefinedFont::IfcTextStyleForDefinedFont(IfcColour* v1_Colour, IfcColour* v2_BackgroundColour) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Colour)); e->setArgument(1,(v2_BackgroundColour)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcTextStyleTextModel
-bool IfcTextStyleTextModel::hasTextIndent() { return !entity->getArgument(0)->isNull(); }
-IfcSizeSelect IfcTextStyleTextModel::TextIndent() { return *entity->getArgument(0); }
-void IfcTextStyleTextModel::setTextIndent(IfcSizeSelect v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-bool IfcTextStyleTextModel::hasTextAlign() { return !entity->getArgument(1)->isNull(); }
-IfcTextAlignment IfcTextStyleTextModel::TextAlign() { return *entity->getArgument(1); }
-void IfcTextStyleTextModel::setTextAlign(IfcTextAlignment v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-bool IfcTextStyleTextModel::hasTextDecoration() { return !entity->getArgument(2)->isNull(); }
-IfcTextDecoration IfcTextStyleTextModel::TextDecoration() { return *entity->getArgument(2); }
-void IfcTextStyleTextModel::setTextDecoration(IfcTextDecoration v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-bool IfcTextStyleTextModel::hasLetterSpacing() { return !entity->getArgument(3)->isNull(); }
-IfcSizeSelect IfcTextStyleTextModel::LetterSpacing() { return *entity->getArgument(3); }
-void IfcTextStyleTextModel::setLetterSpacing(IfcSizeSelect v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-bool IfcTextStyleTextModel::hasWordSpacing() { return !entity->getArgument(4)->isNull(); }
-IfcSizeSelect IfcTextStyleTextModel::WordSpacing() { return *entity->getArgument(4); }
-void IfcTextStyleTextModel::setWordSpacing(IfcSizeSelect v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-bool IfcTextStyleTextModel::hasTextTransform() { return !entity->getArgument(5)->isNull(); }
-IfcTextTransformation IfcTextStyleTextModel::TextTransform() { return *entity->getArgument(5); }
-void IfcTextStyleTextModel::setTextTransform(IfcTextTransformation v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-bool IfcTextStyleTextModel::hasLineHeight() { return !entity->getArgument(6)->isNull(); }
-IfcSizeSelect IfcTextStyleTextModel::LineHeight() { return *entity->getArgument(6); }
-void IfcTextStyleTextModel::setLineHeight(IfcSizeSelect v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
+bool IfcTextStyleTextModel::hasTextIndent() const { return !entity->getArgument(0)->isNull(); }
+IfcSizeSelect* IfcTextStyleTextModel::TextIndent() const { return (IfcSizeSelect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(0))); }
+void IfcTextStyleTextModel::setTextIndent(IfcSizeSelect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+bool IfcTextStyleTextModel::hasTextAlign() const { return !entity->getArgument(1)->isNull(); }
+std::string IfcTextStyleTextModel::TextAlign() const { return *entity->getArgument(1); }
+void IfcTextStyleTextModel::setTextAlign(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+bool IfcTextStyleTextModel::hasTextDecoration() const { return !entity->getArgument(2)->isNull(); }
+std::string IfcTextStyleTextModel::TextDecoration() const { return *entity->getArgument(2); }
+void IfcTextStyleTextModel::setTextDecoration(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+bool IfcTextStyleTextModel::hasLetterSpacing() const { return !entity->getArgument(3)->isNull(); }
+IfcSizeSelect* IfcTextStyleTextModel::LetterSpacing() const { return (IfcSizeSelect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(3))); }
+void IfcTextStyleTextModel::setLetterSpacing(IfcSizeSelect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+bool IfcTextStyleTextModel::hasWordSpacing() const { return !entity->getArgument(4)->isNull(); }
+IfcSizeSelect* IfcTextStyleTextModel::WordSpacing() const { return (IfcSizeSelect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(4))); }
+void IfcTextStyleTextModel::setWordSpacing(IfcSizeSelect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+bool IfcTextStyleTextModel::hasTextTransform() const { return !entity->getArgument(5)->isNull(); }
+std::string IfcTextStyleTextModel::TextTransform() const { return *entity->getArgument(5); }
+void IfcTextStyleTextModel::setTextTransform(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+bool IfcTextStyleTextModel::hasLineHeight() const { return !entity->getArgument(6)->isNull(); }
+IfcSizeSelect* IfcTextStyleTextModel::LineHeight() const { return (IfcSizeSelect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(6))); }
+void IfcTextStyleTextModel::setLineHeight(IfcSizeSelect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
 bool IfcTextStyleTextModel::is(Type::Enum v) const { return v == Type::IfcTextStyleTextModel; }
 Type::Enum IfcTextStyleTextModel::type() const { return Type::IfcTextStyleTextModel; }
 Type::Enum IfcTextStyleTextModel::Class() { return Type::IfcTextStyleTextModel; }
-IfcTextStyleTextModel::IfcTextStyleTextModel(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcTextStyleTextModel)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcTextStyleTextModel::IfcTextStyleTextModel(boost::optional< IfcSizeSelect > v1_TextIndent, boost::optional< IfcTextAlignment > v2_TextAlign, boost::optional< IfcTextDecoration > v3_TextDecoration, boost::optional< IfcSizeSelect > v4_LetterSpacing, boost::optional< IfcSizeSelect > v5_WordSpacing, boost::optional< IfcTextTransformation > v6_TextTransform, boost::optional< IfcSizeSelect > v7_LineHeight) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_TextIndent) { e->setArgument(0,(*v1_TextIndent)); } else { e->setArgument(0); } if (v2_TextAlign) { e->setArgument(1,(*v2_TextAlign)); } else { e->setArgument(1); } if (v3_TextDecoration) { e->setArgument(2,(*v3_TextDecoration)); } else { e->setArgument(2); } if (v4_LetterSpacing) { e->setArgument(3,(*v4_LetterSpacing)); } else { e->setArgument(3); } if (v5_WordSpacing) { e->setArgument(4,(*v5_WordSpacing)); } else { e->setArgument(4); } if (v6_TextTransform) { e->setArgument(5,(*v6_TextTransform)); } else { e->setArgument(5); } if (v7_LineHeight) { e->setArgument(6,(*v7_LineHeight)); } else { e->setArgument(6); } entity = e; EntityBuffer::Add(this); }
+IfcTextStyleTextModel::IfcTextStyleTextModel(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcTextStyleTextModel)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcTextStyleTextModel::IfcTextStyleTextModel(IfcSizeSelect* v1_TextIndent, boost::optional< std::string > v2_TextAlign, boost::optional< std::string > v3_TextDecoration, IfcSizeSelect* v4_LetterSpacing, IfcSizeSelect* v5_WordSpacing, boost::optional< std::string > v6_TextTransform, IfcSizeSelect* v7_LineHeight) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_TextIndent)); if (v2_TextAlign) { e->setArgument(1,(*v2_TextAlign)); } else { e->setArgument(1); } if (v3_TextDecoration) { e->setArgument(2,(*v3_TextDecoration)); } else { e->setArgument(2); } e->setArgument(3,(v4_LetterSpacing)); e->setArgument(4,(v5_WordSpacing)); if (v6_TextTransform) { e->setArgument(5,(*v6_TextTransform)); } else { e->setArgument(5); } e->setArgument(6,(v7_LineHeight)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcTextStyleWithBoxCharacteristics
-bool IfcTextStyleWithBoxCharacteristics::hasBoxHeight() { return !entity->getArgument(0)->isNull(); }
-IfcPositiveLengthMeasure IfcTextStyleWithBoxCharacteristics::BoxHeight() { return *entity->getArgument(0); }
-void IfcTextStyleWithBoxCharacteristics::setBoxHeight(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-bool IfcTextStyleWithBoxCharacteristics::hasBoxWidth() { return !entity->getArgument(1)->isNull(); }
-IfcPositiveLengthMeasure IfcTextStyleWithBoxCharacteristics::BoxWidth() { return *entity->getArgument(1); }
-void IfcTextStyleWithBoxCharacteristics::setBoxWidth(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-bool IfcTextStyleWithBoxCharacteristics::hasBoxSlantAngle() { return !entity->getArgument(2)->isNull(); }
-IfcPlaneAngleMeasure IfcTextStyleWithBoxCharacteristics::BoxSlantAngle() { return *entity->getArgument(2); }
-void IfcTextStyleWithBoxCharacteristics::setBoxSlantAngle(IfcPlaneAngleMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-bool IfcTextStyleWithBoxCharacteristics::hasBoxRotateAngle() { return !entity->getArgument(3)->isNull(); }
-IfcPlaneAngleMeasure IfcTextStyleWithBoxCharacteristics::BoxRotateAngle() { return *entity->getArgument(3); }
-void IfcTextStyleWithBoxCharacteristics::setBoxRotateAngle(IfcPlaneAngleMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-bool IfcTextStyleWithBoxCharacteristics::hasCharacterSpacing() { return !entity->getArgument(4)->isNull(); }
-IfcSizeSelect IfcTextStyleWithBoxCharacteristics::CharacterSpacing() { return *entity->getArgument(4); }
-void IfcTextStyleWithBoxCharacteristics::setCharacterSpacing(IfcSizeSelect v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+bool IfcTextStyleWithBoxCharacteristics::hasBoxHeight() const { return !entity->getArgument(0)->isNull(); }
+double IfcTextStyleWithBoxCharacteristics::BoxHeight() const { return *entity->getArgument(0); }
+void IfcTextStyleWithBoxCharacteristics::setBoxHeight(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+bool IfcTextStyleWithBoxCharacteristics::hasBoxWidth() const { return !entity->getArgument(1)->isNull(); }
+double IfcTextStyleWithBoxCharacteristics::BoxWidth() const { return *entity->getArgument(1); }
+void IfcTextStyleWithBoxCharacteristics::setBoxWidth(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+bool IfcTextStyleWithBoxCharacteristics::hasBoxSlantAngle() const { return !entity->getArgument(2)->isNull(); }
+double IfcTextStyleWithBoxCharacteristics::BoxSlantAngle() const { return *entity->getArgument(2); }
+void IfcTextStyleWithBoxCharacteristics::setBoxSlantAngle(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+bool IfcTextStyleWithBoxCharacteristics::hasBoxRotateAngle() const { return !entity->getArgument(3)->isNull(); }
+double IfcTextStyleWithBoxCharacteristics::BoxRotateAngle() const { return *entity->getArgument(3); }
+void IfcTextStyleWithBoxCharacteristics::setBoxRotateAngle(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+bool IfcTextStyleWithBoxCharacteristics::hasCharacterSpacing() const { return !entity->getArgument(4)->isNull(); }
+IfcSizeSelect* IfcTextStyleWithBoxCharacteristics::CharacterSpacing() const { return (IfcSizeSelect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(4))); }
+void IfcTextStyleWithBoxCharacteristics::setCharacterSpacing(IfcSizeSelect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
 bool IfcTextStyleWithBoxCharacteristics::is(Type::Enum v) const { return v == Type::IfcTextStyleWithBoxCharacteristics; }
 Type::Enum IfcTextStyleWithBoxCharacteristics::type() const { return Type::IfcTextStyleWithBoxCharacteristics; }
 Type::Enum IfcTextStyleWithBoxCharacteristics::Class() { return Type::IfcTextStyleWithBoxCharacteristics; }
-IfcTextStyleWithBoxCharacteristics::IfcTextStyleWithBoxCharacteristics(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcTextStyleWithBoxCharacteristics)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcTextStyleWithBoxCharacteristics::IfcTextStyleWithBoxCharacteristics(boost::optional< IfcPositiveLengthMeasure > v1_BoxHeight, boost::optional< IfcPositiveLengthMeasure > v2_BoxWidth, boost::optional< IfcPlaneAngleMeasure > v3_BoxSlantAngle, boost::optional< IfcPlaneAngleMeasure > v4_BoxRotateAngle, boost::optional< IfcSizeSelect > v5_CharacterSpacing) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_BoxHeight) { e->setArgument(0,(*v1_BoxHeight)); } else { e->setArgument(0); } if (v2_BoxWidth) { e->setArgument(1,(*v2_BoxWidth)); } else { e->setArgument(1); } if (v3_BoxSlantAngle) { e->setArgument(2,(*v3_BoxSlantAngle)); } else { e->setArgument(2); } if (v4_BoxRotateAngle) { e->setArgument(3,(*v4_BoxRotateAngle)); } else { e->setArgument(3); } if (v5_CharacterSpacing) { e->setArgument(4,(*v5_CharacterSpacing)); } else { e->setArgument(4); } entity = e; EntityBuffer::Add(this); }
+IfcTextStyleWithBoxCharacteristics::IfcTextStyleWithBoxCharacteristics(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcTextStyleWithBoxCharacteristics)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcTextStyleWithBoxCharacteristics::IfcTextStyleWithBoxCharacteristics(boost::optional< double > v1_BoxHeight, boost::optional< double > v2_BoxWidth, boost::optional< double > v3_BoxSlantAngle, boost::optional< double > v4_BoxRotateAngle, IfcSizeSelect* v5_CharacterSpacing) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_BoxHeight) { e->setArgument(0,(*v1_BoxHeight)); } else { e->setArgument(0); } if (v2_BoxWidth) { e->setArgument(1,(*v2_BoxWidth)); } else { e->setArgument(1); } if (v3_BoxSlantAngle) { e->setArgument(2,(*v3_BoxSlantAngle)); } else { e->setArgument(2); } if (v4_BoxRotateAngle) { e->setArgument(3,(*v4_BoxRotateAngle)); } else { e->setArgument(3); } e->setArgument(4,(v5_CharacterSpacing)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcTextureCoordinate
-IfcAnnotationSurface::list IfcTextureCoordinate::AnnotatedSurface() { RETURN_INVERSE(IfcAnnotationSurface) }
+IfcAnnotationSurface::list::ptr IfcTextureCoordinate::AnnotatedSurface() const { return entity->getInverse(Type::IfcAnnotationSurface, 1)->as<IfcAnnotationSurface>(); }
 bool IfcTextureCoordinate::is(Type::Enum v) const { return v == Type::IfcTextureCoordinate; }
 Type::Enum IfcTextureCoordinate::type() const { return Type::IfcTextureCoordinate; }
 Type::Enum IfcTextureCoordinate::Class() { return Type::IfcTextureCoordinate; }
-IfcTextureCoordinate::IfcTextureCoordinate(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcTextureCoordinate)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcTextureCoordinate::IfcTextureCoordinate(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcTextureCoordinate)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
 IfcTextureCoordinate::IfcTextureCoordinate() : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcTextureCoordinateGenerator
-IfcLabel IfcTextureCoordinateGenerator::Mode() { return *entity->getArgument(0); }
-void IfcTextureCoordinateGenerator::setMode(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > IfcTextureCoordinateGenerator::Parameter() { RETURN_AS_LIST(IfcUtil::IfcAbstractSelect,1) }
-void IfcTextureCoordinateGenerator::setParameter(SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v->generalize()); }
+std::string IfcTextureCoordinateGenerator::Mode() const { return *entity->getArgument(0); }
+void IfcTextureCoordinateGenerator::setMode(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+IfcEntityList::ptr IfcTextureCoordinateGenerator::Parameter() const { return *entity->getArgument(1); }
+void IfcTextureCoordinateGenerator::setParameter(IfcEntityList::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
 bool IfcTextureCoordinateGenerator::is(Type::Enum v) const { return v == Type::IfcTextureCoordinateGenerator || IfcTextureCoordinate::is(v); }
 Type::Enum IfcTextureCoordinateGenerator::type() const { return Type::IfcTextureCoordinateGenerator; }
 Type::Enum IfcTextureCoordinateGenerator::Class() { return Type::IfcTextureCoordinateGenerator; }
-IfcTextureCoordinateGenerator::IfcTextureCoordinateGenerator(IfcAbstractEntityPtr e) : IfcTextureCoordinate((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcTextureCoordinateGenerator)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcTextureCoordinateGenerator::IfcTextureCoordinateGenerator(IfcLabel v1_Mode, IfcEntities v2_Parameter) : IfcTextureCoordinate((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Mode)); e->setArgument(1,(v2_Parameter)); entity = e; EntityBuffer::Add(this); }
+IfcTextureCoordinateGenerator::IfcTextureCoordinateGenerator(IfcAbstractEntity* e) : IfcTextureCoordinate((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcTextureCoordinateGenerator)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcTextureCoordinateGenerator::IfcTextureCoordinateGenerator(std::string v1_Mode, IfcEntityList::ptr v2_Parameter) : IfcTextureCoordinate((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Mode)); e->setArgument(1,(v2_Parameter)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcTextureMap
-SHARED_PTR< IfcTemplatedEntityList< IfcVertexBasedTextureMap > > IfcTextureMap::TextureMaps() { RETURN_AS_LIST(IfcVertexBasedTextureMap,0) }
-void IfcTextureMap::setTextureMaps(SHARED_PTR< IfcTemplatedEntityList< IfcVertexBasedTextureMap > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v->generalize()); }
+IfcTemplatedEntityList< IfcVertexBasedTextureMap >::ptr IfcTextureMap::TextureMaps() const { IfcEntityList::ptr es = *entity->getArgument(0); return es->as<IfcVertexBasedTextureMap>(); }
+void IfcTextureMap::setTextureMaps(IfcTemplatedEntityList< IfcVertexBasedTextureMap >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v->generalize()); }
 bool IfcTextureMap::is(Type::Enum v) const { return v == Type::IfcTextureMap || IfcTextureCoordinate::is(v); }
 Type::Enum IfcTextureMap::type() const { return Type::IfcTextureMap; }
 Type::Enum IfcTextureMap::Class() { return Type::IfcTextureMap; }
-IfcTextureMap::IfcTextureMap(IfcAbstractEntityPtr e) : IfcTextureCoordinate((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcTextureMap)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcTextureMap::IfcTextureMap(SHARED_PTR< IfcTemplatedEntityList< IfcVertexBasedTextureMap > > v1_TextureMaps) : IfcTextureCoordinate((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_TextureMaps)->generalize()); entity = e; EntityBuffer::Add(this); }
+IfcTextureMap::IfcTextureMap(IfcAbstractEntity* e) : IfcTextureCoordinate((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcTextureMap)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcTextureMap::IfcTextureMap(IfcTemplatedEntityList< IfcVertexBasedTextureMap >::ptr v1_TextureMaps) : IfcTextureCoordinate((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_TextureMaps)->generalize()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcTextureVertex
-std::vector< IfcParameterValue > /*[2:2]*/ IfcTextureVertex::Coordinates() { return *entity->getArgument(0); }
-void IfcTextureVertex::setCoordinates(std::vector< IfcParameterValue > /*[2:2]*/ v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+std::vector< double > /*[2:2]*/ IfcTextureVertex::Coordinates() const { return *entity->getArgument(0); }
+void IfcTextureVertex::setCoordinates(std::vector< double > /*[2:2]*/ v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
 bool IfcTextureVertex::is(Type::Enum v) const { return v == Type::IfcTextureVertex; }
 Type::Enum IfcTextureVertex::type() const { return Type::IfcTextureVertex; }
 Type::Enum IfcTextureVertex::Class() { return Type::IfcTextureVertex; }
-IfcTextureVertex::IfcTextureVertex(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcTextureVertex)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcTextureVertex::IfcTextureVertex(std::vector< IfcParameterValue > /*[2:2]*/ v1_Coordinates) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Coordinates)); entity = e; EntityBuffer::Add(this); }
+IfcTextureVertex::IfcTextureVertex(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcTextureVertex)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcTextureVertex::IfcTextureVertex(std::vector< double > /*[2:2]*/ v1_Coordinates) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Coordinates)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcThermalMaterialProperties
-bool IfcThermalMaterialProperties::hasSpecificHeatCapacity() { return !entity->getArgument(1)->isNull(); }
-IfcSpecificHeatCapacityMeasure IfcThermalMaterialProperties::SpecificHeatCapacity() { return *entity->getArgument(1); }
-void IfcThermalMaterialProperties::setSpecificHeatCapacity(IfcSpecificHeatCapacityMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-bool IfcThermalMaterialProperties::hasBoilingPoint() { return !entity->getArgument(2)->isNull(); }
-IfcThermodynamicTemperatureMeasure IfcThermalMaterialProperties::BoilingPoint() { return *entity->getArgument(2); }
-void IfcThermalMaterialProperties::setBoilingPoint(IfcThermodynamicTemperatureMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-bool IfcThermalMaterialProperties::hasFreezingPoint() { return !entity->getArgument(3)->isNull(); }
-IfcThermodynamicTemperatureMeasure IfcThermalMaterialProperties::FreezingPoint() { return *entity->getArgument(3); }
-void IfcThermalMaterialProperties::setFreezingPoint(IfcThermodynamicTemperatureMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-bool IfcThermalMaterialProperties::hasThermalConductivity() { return !entity->getArgument(4)->isNull(); }
-IfcThermalConductivityMeasure IfcThermalMaterialProperties::ThermalConductivity() { return *entity->getArgument(4); }
-void IfcThermalMaterialProperties::setThermalConductivity(IfcThermalConductivityMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+bool IfcThermalMaterialProperties::hasSpecificHeatCapacity() const { return !entity->getArgument(1)->isNull(); }
+double IfcThermalMaterialProperties::SpecificHeatCapacity() const { return *entity->getArgument(1); }
+void IfcThermalMaterialProperties::setSpecificHeatCapacity(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+bool IfcThermalMaterialProperties::hasBoilingPoint() const { return !entity->getArgument(2)->isNull(); }
+double IfcThermalMaterialProperties::BoilingPoint() const { return *entity->getArgument(2); }
+void IfcThermalMaterialProperties::setBoilingPoint(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+bool IfcThermalMaterialProperties::hasFreezingPoint() const { return !entity->getArgument(3)->isNull(); }
+double IfcThermalMaterialProperties::FreezingPoint() const { return *entity->getArgument(3); }
+void IfcThermalMaterialProperties::setFreezingPoint(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+bool IfcThermalMaterialProperties::hasThermalConductivity() const { return !entity->getArgument(4)->isNull(); }
+double IfcThermalMaterialProperties::ThermalConductivity() const { return *entity->getArgument(4); }
+void IfcThermalMaterialProperties::setThermalConductivity(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
 bool IfcThermalMaterialProperties::is(Type::Enum v) const { return v == Type::IfcThermalMaterialProperties || IfcMaterialProperties::is(v); }
 Type::Enum IfcThermalMaterialProperties::type() const { return Type::IfcThermalMaterialProperties; }
 Type::Enum IfcThermalMaterialProperties::Class() { return Type::IfcThermalMaterialProperties; }
-IfcThermalMaterialProperties::IfcThermalMaterialProperties(IfcAbstractEntityPtr e) : IfcMaterialProperties((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcThermalMaterialProperties)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcThermalMaterialProperties::IfcThermalMaterialProperties(IfcMaterial* v1_Material, boost::optional< IfcSpecificHeatCapacityMeasure > v2_SpecificHeatCapacity, boost::optional< IfcThermodynamicTemperatureMeasure > v3_BoilingPoint, boost::optional< IfcThermodynamicTemperatureMeasure > v4_FreezingPoint, boost::optional< IfcThermalConductivityMeasure > v5_ThermalConductivity) : IfcMaterialProperties((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Material)); if (v2_SpecificHeatCapacity) { e->setArgument(1,(*v2_SpecificHeatCapacity)); } else { e->setArgument(1); } if (v3_BoilingPoint) { e->setArgument(2,(*v3_BoilingPoint)); } else { e->setArgument(2); } if (v4_FreezingPoint) { e->setArgument(3,(*v4_FreezingPoint)); } else { e->setArgument(3); } if (v5_ThermalConductivity) { e->setArgument(4,(*v5_ThermalConductivity)); } else { e->setArgument(4); } entity = e; EntityBuffer::Add(this); }
+IfcThermalMaterialProperties::IfcThermalMaterialProperties(IfcAbstractEntity* e) : IfcMaterialProperties((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcThermalMaterialProperties)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcThermalMaterialProperties::IfcThermalMaterialProperties(IfcMaterial* v1_Material, boost::optional< double > v2_SpecificHeatCapacity, boost::optional< double > v3_BoilingPoint, boost::optional< double > v4_FreezingPoint, boost::optional< double > v5_ThermalConductivity) : IfcMaterialProperties((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Material)); if (v2_SpecificHeatCapacity) { e->setArgument(1,(*v2_SpecificHeatCapacity)); } else { e->setArgument(1); } if (v3_BoilingPoint) { e->setArgument(2,(*v3_BoilingPoint)); } else { e->setArgument(2); } if (v4_FreezingPoint) { e->setArgument(3,(*v4_FreezingPoint)); } else { e->setArgument(3); } if (v5_ThermalConductivity) { e->setArgument(4,(*v5_ThermalConductivity)); } else { e->setArgument(4); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcTimeSeries
-IfcLabel IfcTimeSeries::Name() { return *entity->getArgument(0); }
-void IfcTimeSeries::setName(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-bool IfcTimeSeries::hasDescription() { return !entity->getArgument(1)->isNull(); }
-IfcText IfcTimeSeries::Description() { return *entity->getArgument(1); }
-void IfcTimeSeries::setDescription(IfcText v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-IfcDateTimeSelect IfcTimeSeries::StartTime() { return *entity->getArgument(2); }
-void IfcTimeSeries::setStartTime(IfcDateTimeSelect v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-IfcDateTimeSelect IfcTimeSeries::EndTime() { return *entity->getArgument(3); }
-void IfcTimeSeries::setEndTime(IfcDateTimeSelect v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-IfcTimeSeriesDataTypeEnum::IfcTimeSeriesDataTypeEnum IfcTimeSeries::TimeSeriesDataType() { return IfcTimeSeriesDataTypeEnum::FromString(*entity->getArgument(4)); }
+std::string IfcTimeSeries::Name() const { return *entity->getArgument(0); }
+void IfcTimeSeries::setName(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+bool IfcTimeSeries::hasDescription() const { return !entity->getArgument(1)->isNull(); }
+std::string IfcTimeSeries::Description() const { return *entity->getArgument(1); }
+void IfcTimeSeries::setDescription(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+IfcDateTimeSelect* IfcTimeSeries::StartTime() const { return (IfcDateTimeSelect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(2))); }
+void IfcTimeSeries::setStartTime(IfcDateTimeSelect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+IfcDateTimeSelect* IfcTimeSeries::EndTime() const { return (IfcDateTimeSelect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(3))); }
+void IfcTimeSeries::setEndTime(IfcDateTimeSelect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+IfcTimeSeriesDataTypeEnum::IfcTimeSeriesDataTypeEnum IfcTimeSeries::TimeSeriesDataType() const { return IfcTimeSeriesDataTypeEnum::FromString(*entity->getArgument(4)); }
 void IfcTimeSeries::setTimeSeriesDataType(IfcTimeSeriesDataTypeEnum::IfcTimeSeriesDataTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v,IfcTimeSeriesDataTypeEnum::ToString(v)); }
-IfcDataOriginEnum::IfcDataOriginEnum IfcTimeSeries::DataOrigin() { return IfcDataOriginEnum::FromString(*entity->getArgument(5)); }
+IfcDataOriginEnum::IfcDataOriginEnum IfcTimeSeries::DataOrigin() const { return IfcDataOriginEnum::FromString(*entity->getArgument(5)); }
 void IfcTimeSeries::setDataOrigin(IfcDataOriginEnum::IfcDataOriginEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v,IfcDataOriginEnum::ToString(v)); }
-bool IfcTimeSeries::hasUserDefinedDataOrigin() { return !entity->getArgument(6)->isNull(); }
-IfcLabel IfcTimeSeries::UserDefinedDataOrigin() { return *entity->getArgument(6); }
-void IfcTimeSeries::setUserDefinedDataOrigin(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
-bool IfcTimeSeries::hasUnit() { return !entity->getArgument(7)->isNull(); }
-IfcUnit IfcTimeSeries::Unit() { return *entity->getArgument(7); }
-void IfcTimeSeries::setUnit(IfcUnit v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
-IfcTimeSeriesReferenceRelationship::list IfcTimeSeries::DocumentedBy() { RETURN_INVERSE(IfcTimeSeriesReferenceRelationship) }
+bool IfcTimeSeries::hasUserDefinedDataOrigin() const { return !entity->getArgument(6)->isNull(); }
+std::string IfcTimeSeries::UserDefinedDataOrigin() const { return *entity->getArgument(6); }
+void IfcTimeSeries::setUserDefinedDataOrigin(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
+bool IfcTimeSeries::hasUnit() const { return !entity->getArgument(7)->isNull(); }
+IfcUnit* IfcTimeSeries::Unit() const { return (IfcUnit*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(7))); }
+void IfcTimeSeries::setUnit(IfcUnit* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
+IfcTimeSeriesReferenceRelationship::list::ptr IfcTimeSeries::DocumentedBy() const { return entity->getInverse(Type::IfcTimeSeriesReferenceRelationship, 0)->as<IfcTimeSeriesReferenceRelationship>(); }
 bool IfcTimeSeries::is(Type::Enum v) const { return v == Type::IfcTimeSeries; }
 Type::Enum IfcTimeSeries::type() const { return Type::IfcTimeSeries; }
 Type::Enum IfcTimeSeries::Class() { return Type::IfcTimeSeries; }
-IfcTimeSeries::IfcTimeSeries(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcTimeSeries)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcTimeSeries::IfcTimeSeries(IfcLabel v1_Name, boost::optional< IfcText > v2_Description, IfcDateTimeSelect v3_StartTime, IfcDateTimeSelect v4_EndTime, IfcTimeSeriesDataTypeEnum::IfcTimeSeriesDataTypeEnum v5_TimeSeriesDataType, IfcDataOriginEnum::IfcDataOriginEnum v6_DataOrigin, boost::optional< IfcLabel > v7_UserDefinedDataOrigin, boost::optional< IfcUnit > v8_Unit) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_StartTime)); e->setArgument(3,(v4_EndTime)); e->setArgument(4,v5_TimeSeriesDataType,IfcTimeSeriesDataTypeEnum::ToString(v5_TimeSeriesDataType)); e->setArgument(5,v6_DataOrigin,IfcDataOriginEnum::ToString(v6_DataOrigin)); if (v7_UserDefinedDataOrigin) { e->setArgument(6,(*v7_UserDefinedDataOrigin)); } else { e->setArgument(6); } if (v8_Unit) { e->setArgument(7,(*v8_Unit)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
+IfcTimeSeries::IfcTimeSeries(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcTimeSeries)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcTimeSeries::IfcTimeSeries(std::string v1_Name, boost::optional< std::string > v2_Description, IfcDateTimeSelect* v3_StartTime, IfcDateTimeSelect* v4_EndTime, IfcTimeSeriesDataTypeEnum::IfcTimeSeriesDataTypeEnum v5_TimeSeriesDataType, IfcDataOriginEnum::IfcDataOriginEnum v6_DataOrigin, boost::optional< std::string > v7_UserDefinedDataOrigin, IfcUnit* v8_Unit) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_StartTime)); e->setArgument(3,(v4_EndTime)); e->setArgument(4,v5_TimeSeriesDataType,IfcTimeSeriesDataTypeEnum::ToString(v5_TimeSeriesDataType)); e->setArgument(5,v6_DataOrigin,IfcDataOriginEnum::ToString(v6_DataOrigin)); if (v7_UserDefinedDataOrigin) { e->setArgument(6,(*v7_UserDefinedDataOrigin)); } else { e->setArgument(6); } e->setArgument(7,(v8_Unit)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcTimeSeriesReferenceRelationship
-IfcTimeSeries* IfcTimeSeriesReferenceRelationship::ReferencedTimeSeries() { return (IfcTimeSeries*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(0))); }
+IfcTimeSeries* IfcTimeSeriesReferenceRelationship::ReferencedTimeSeries() const { return (IfcTimeSeries*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(0))); }
 void IfcTimeSeriesReferenceRelationship::setReferencedTimeSeries(IfcTimeSeries* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > IfcTimeSeriesReferenceRelationship::TimeSeriesReferences() { RETURN_AS_LIST(IfcUtil::IfcAbstractSelect,1) }
-void IfcTimeSeriesReferenceRelationship::setTimeSeriesReferences(SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v->generalize()); }
+IfcEntityList::ptr IfcTimeSeriesReferenceRelationship::TimeSeriesReferences() const { return *entity->getArgument(1); }
+void IfcTimeSeriesReferenceRelationship::setTimeSeriesReferences(IfcEntityList::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
 bool IfcTimeSeriesReferenceRelationship::is(Type::Enum v) const { return v == Type::IfcTimeSeriesReferenceRelationship; }
 Type::Enum IfcTimeSeriesReferenceRelationship::type() const { return Type::IfcTimeSeriesReferenceRelationship; }
 Type::Enum IfcTimeSeriesReferenceRelationship::Class() { return Type::IfcTimeSeriesReferenceRelationship; }
-IfcTimeSeriesReferenceRelationship::IfcTimeSeriesReferenceRelationship(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcTimeSeriesReferenceRelationship)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcTimeSeriesReferenceRelationship::IfcTimeSeriesReferenceRelationship(IfcTimeSeries* v1_ReferencedTimeSeries, IfcEntities v2_TimeSeriesReferences) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_ReferencedTimeSeries)); e->setArgument(1,(v2_TimeSeriesReferences)); entity = e; EntityBuffer::Add(this); }
+IfcTimeSeriesReferenceRelationship::IfcTimeSeriesReferenceRelationship(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcTimeSeriesReferenceRelationship)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcTimeSeriesReferenceRelationship::IfcTimeSeriesReferenceRelationship(IfcTimeSeries* v1_ReferencedTimeSeries, IfcEntityList::ptr v2_TimeSeriesReferences) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_ReferencedTimeSeries)); e->setArgument(1,(v2_TimeSeriesReferences)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcTimeSeriesSchedule
-bool IfcTimeSeriesSchedule::hasApplicableDates() { return !entity->getArgument(5)->isNull(); }
-SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > IfcTimeSeriesSchedule::ApplicableDates() { RETURN_AS_LIST(IfcUtil::IfcAbstractSelect,5) }
-void IfcTimeSeriesSchedule::setApplicableDates(SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v->generalize()); }
-IfcTimeSeriesScheduleTypeEnum::IfcTimeSeriesScheduleTypeEnum IfcTimeSeriesSchedule::TimeSeriesScheduleType() { return IfcTimeSeriesScheduleTypeEnum::FromString(*entity->getArgument(6)); }
+bool IfcTimeSeriesSchedule::hasApplicableDates() const { return !entity->getArgument(5)->isNull(); }
+IfcEntityList::ptr IfcTimeSeriesSchedule::ApplicableDates() const { return *entity->getArgument(5); }
+void IfcTimeSeriesSchedule::setApplicableDates(IfcEntityList::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+IfcTimeSeriesScheduleTypeEnum::IfcTimeSeriesScheduleTypeEnum IfcTimeSeriesSchedule::TimeSeriesScheduleType() const { return IfcTimeSeriesScheduleTypeEnum::FromString(*entity->getArgument(6)); }
 void IfcTimeSeriesSchedule::setTimeSeriesScheduleType(IfcTimeSeriesScheduleTypeEnum::IfcTimeSeriesScheduleTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v,IfcTimeSeriesScheduleTypeEnum::ToString(v)); }
-IfcTimeSeries* IfcTimeSeriesSchedule::TimeSeries() { return (IfcTimeSeries*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(7))); }
+IfcTimeSeries* IfcTimeSeriesSchedule::TimeSeries() const { return (IfcTimeSeries*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(7))); }
 void IfcTimeSeriesSchedule::setTimeSeries(IfcTimeSeries* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
 bool IfcTimeSeriesSchedule::is(Type::Enum v) const { return v == Type::IfcTimeSeriesSchedule || IfcControl::is(v); }
 Type::Enum IfcTimeSeriesSchedule::type() const { return Type::IfcTimeSeriesSchedule; }
 Type::Enum IfcTimeSeriesSchedule::Class() { return Type::IfcTimeSeriesSchedule; }
-IfcTimeSeriesSchedule::IfcTimeSeriesSchedule(IfcAbstractEntityPtr e) : IfcControl((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcTimeSeriesSchedule)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcTimeSeriesSchedule::IfcTimeSeriesSchedule(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, boost::optional< IfcEntities > v6_ApplicableDates, IfcTimeSeriesScheduleTypeEnum::IfcTimeSeriesScheduleTypeEnum v7_TimeSeriesScheduleType, IfcTimeSeries* v8_TimeSeries) : IfcControl((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } if (v6_ApplicableDates) { e->setArgument(5,(*v6_ApplicableDates)); } else { e->setArgument(5); } e->setArgument(6,v7_TimeSeriesScheduleType,IfcTimeSeriesScheduleTypeEnum::ToString(v7_TimeSeriesScheduleType)); e->setArgument(7,(v8_TimeSeries)); entity = e; EntityBuffer::Add(this); }
+IfcTimeSeriesSchedule::IfcTimeSeriesSchedule(IfcAbstractEntity* e) : IfcControl((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcTimeSeriesSchedule)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcTimeSeriesSchedule::IfcTimeSeriesSchedule(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, boost::optional< IfcEntityList::ptr > v6_ApplicableDates, IfcTimeSeriesScheduleTypeEnum::IfcTimeSeriesScheduleTypeEnum v7_TimeSeriesScheduleType, IfcTimeSeries* v8_TimeSeries) : IfcControl((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } if (v6_ApplicableDates) { e->setArgument(5,(*v6_ApplicableDates)); } else { e->setArgument(5); } e->setArgument(6,v7_TimeSeriesScheduleType,IfcTimeSeriesScheduleTypeEnum::ToString(v7_TimeSeriesScheduleType)); e->setArgument(7,(v8_TimeSeries)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcTimeSeriesValue
-SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > IfcTimeSeriesValue::ListValues() { RETURN_AS_LIST(IfcUtil::IfcAbstractSelect,0) }
-void IfcTimeSeriesValue::setListValues(SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v->generalize()); }
+IfcEntityList::ptr IfcTimeSeriesValue::ListValues() const { return *entity->getArgument(0); }
+void IfcTimeSeriesValue::setListValues(IfcEntityList::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
 bool IfcTimeSeriesValue::is(Type::Enum v) const { return v == Type::IfcTimeSeriesValue; }
 Type::Enum IfcTimeSeriesValue::type() const { return Type::IfcTimeSeriesValue; }
 Type::Enum IfcTimeSeriesValue::Class() { return Type::IfcTimeSeriesValue; }
-IfcTimeSeriesValue::IfcTimeSeriesValue(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcTimeSeriesValue)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcTimeSeriesValue::IfcTimeSeriesValue(IfcEntities v1_ListValues) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_ListValues)); entity = e; EntityBuffer::Add(this); }
+IfcTimeSeriesValue::IfcTimeSeriesValue(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcTimeSeriesValue)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcTimeSeriesValue::IfcTimeSeriesValue(IfcEntityList::ptr v1_ListValues) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_ListValues)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcTopologicalRepresentationItem
 bool IfcTopologicalRepresentationItem::is(Type::Enum v) const { return v == Type::IfcTopologicalRepresentationItem || IfcRepresentationItem::is(v); }
 Type::Enum IfcTopologicalRepresentationItem::type() const { return Type::IfcTopologicalRepresentationItem; }
 Type::Enum IfcTopologicalRepresentationItem::Class() { return Type::IfcTopologicalRepresentationItem; }
-IfcTopologicalRepresentationItem::IfcTopologicalRepresentationItem(IfcAbstractEntityPtr e) : IfcRepresentationItem((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcTopologicalRepresentationItem)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcTopologicalRepresentationItem::IfcTopologicalRepresentationItem() : IfcRepresentationItem((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); entity = e; EntityBuffer::Add(this); }
+IfcTopologicalRepresentationItem::IfcTopologicalRepresentationItem(IfcAbstractEntity* e) : IfcRepresentationItem((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcTopologicalRepresentationItem)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcTopologicalRepresentationItem::IfcTopologicalRepresentationItem() : IfcRepresentationItem((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcTopologyRepresentation
 bool IfcTopologyRepresentation::is(Type::Enum v) const { return v == Type::IfcTopologyRepresentation || IfcShapeModel::is(v); }
 Type::Enum IfcTopologyRepresentation::type() const { return Type::IfcTopologyRepresentation; }
 Type::Enum IfcTopologyRepresentation::Class() { return Type::IfcTopologyRepresentation; }
-IfcTopologyRepresentation::IfcTopologyRepresentation(IfcAbstractEntityPtr e) : IfcShapeModel((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcTopologyRepresentation)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcTopologyRepresentation::IfcTopologyRepresentation(IfcRepresentationContext* v1_ContextOfItems, boost::optional< IfcLabel > v2_RepresentationIdentifier, boost::optional< IfcLabel > v3_RepresentationType, SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationItem > > v4_Items) : IfcShapeModel((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_ContextOfItems)); if (v2_RepresentationIdentifier) { e->setArgument(1,(*v2_RepresentationIdentifier)); } else { e->setArgument(1); } if (v3_RepresentationType) { e->setArgument(2,(*v3_RepresentationType)); } else { e->setArgument(2); } e->setArgument(3,(v4_Items)->generalize()); entity = e; EntityBuffer::Add(this); }
+IfcTopologyRepresentation::IfcTopologyRepresentation(IfcAbstractEntity* e) : IfcShapeModel((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcTopologyRepresentation)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcTopologyRepresentation::IfcTopologyRepresentation(IfcRepresentationContext* v1_ContextOfItems, boost::optional< std::string > v2_RepresentationIdentifier, boost::optional< std::string > v3_RepresentationType, IfcTemplatedEntityList< IfcRepresentationItem >::ptr v4_Items) : IfcShapeModel((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_ContextOfItems)); if (v2_RepresentationIdentifier) { e->setArgument(1,(*v2_RepresentationIdentifier)); } else { e->setArgument(1); } if (v3_RepresentationType) { e->setArgument(2,(*v3_RepresentationType)); } else { e->setArgument(2); } e->setArgument(3,(v4_Items)->generalize()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcTransformerType
-IfcTransformerTypeEnum::IfcTransformerTypeEnum IfcTransformerType::PredefinedType() { return IfcTransformerTypeEnum::FromString(*entity->getArgument(9)); }
+IfcTransformerTypeEnum::IfcTransformerTypeEnum IfcTransformerType::PredefinedType() const { return IfcTransformerTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcTransformerType::setPredefinedType(IfcTransformerTypeEnum::IfcTransformerTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcTransformerTypeEnum::ToString(v)); }
 bool IfcTransformerType::is(Type::Enum v) const { return v == Type::IfcTransformerType || IfcEnergyConversionDeviceType::is(v); }
 Type::Enum IfcTransformerType::type() const { return Type::IfcTransformerType; }
 Type::Enum IfcTransformerType::Class() { return Type::IfcTransformerType; }
-IfcTransformerType::IfcTransformerType(IfcAbstractEntityPtr e) : IfcEnergyConversionDeviceType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcTransformerType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcTransformerType::IfcTransformerType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcTransformerTypeEnum::IfcTransformerTypeEnum v10_PredefinedType) : IfcEnergyConversionDeviceType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcTransformerTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcTransformerType::IfcTransformerType(IfcAbstractEntity* e) : IfcEnergyConversionDeviceType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcTransformerType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcTransformerType::IfcTransformerType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcTransformerTypeEnum::IfcTransformerTypeEnum v10_PredefinedType) : IfcEnergyConversionDeviceType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcTransformerTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcTransportElement
-bool IfcTransportElement::hasOperationType() { return !entity->getArgument(8)->isNull(); }
-IfcTransportElementTypeEnum::IfcTransportElementTypeEnum IfcTransportElement::OperationType() { return IfcTransportElementTypeEnum::FromString(*entity->getArgument(8)); }
+bool IfcTransportElement::hasOperationType() const { return !entity->getArgument(8)->isNull(); }
+IfcTransportElementTypeEnum::IfcTransportElementTypeEnum IfcTransportElement::OperationType() const { return IfcTransportElementTypeEnum::FromString(*entity->getArgument(8)); }
 void IfcTransportElement::setOperationType(IfcTransportElementTypeEnum::IfcTransportElementTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcTransportElementTypeEnum::ToString(v)); }
-bool IfcTransportElement::hasCapacityByWeight() { return !entity->getArgument(9)->isNull(); }
-IfcMassMeasure IfcTransportElement::CapacityByWeight() { return *entity->getArgument(9); }
-void IfcTransportElement::setCapacityByWeight(IfcMassMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
-bool IfcTransportElement::hasCapacityByNumber() { return !entity->getArgument(10)->isNull(); }
-IfcCountMeasure IfcTransportElement::CapacityByNumber() { return *entity->getArgument(10); }
-void IfcTransportElement::setCapacityByNumber(IfcCountMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
+bool IfcTransportElement::hasCapacityByWeight() const { return !entity->getArgument(9)->isNull(); }
+double IfcTransportElement::CapacityByWeight() const { return *entity->getArgument(9); }
+void IfcTransportElement::setCapacityByWeight(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
+bool IfcTransportElement::hasCapacityByNumber() const { return !entity->getArgument(10)->isNull(); }
+double IfcTransportElement::CapacityByNumber() const { return *entity->getArgument(10); }
+void IfcTransportElement::setCapacityByNumber(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
 bool IfcTransportElement::is(Type::Enum v) const { return v == Type::IfcTransportElement || IfcElement::is(v); }
 Type::Enum IfcTransportElement::type() const { return Type::IfcTransportElement; }
 Type::Enum IfcTransportElement::Class() { return Type::IfcTransportElement; }
-IfcTransportElement::IfcTransportElement(IfcAbstractEntityPtr e) : IfcElement((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcTransportElement)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcTransportElement::IfcTransportElement(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcTransportElementTypeEnum::IfcTransportElementTypeEnum > v9_OperationType, boost::optional< IfcMassMeasure > v10_CapacityByWeight, boost::optional< IfcCountMeasure > v11_CapacityByNumber) : IfcElement((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_OperationType) { e->setArgument(8,*v9_OperationType,IfcTransportElementTypeEnum::ToString(*v9_OperationType)); } else { e->setArgument(8); } if (v10_CapacityByWeight) { e->setArgument(9,(*v10_CapacityByWeight)); } else { e->setArgument(9); } if (v11_CapacityByNumber) { e->setArgument(10,(*v11_CapacityByNumber)); } else { e->setArgument(10); } entity = e; EntityBuffer::Add(this); }
+IfcTransportElement::IfcTransportElement(IfcAbstractEntity* e) : IfcElement((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcTransportElement)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcTransportElement::IfcTransportElement(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcTransportElementTypeEnum::IfcTransportElementTypeEnum > v9_OperationType, boost::optional< double > v10_CapacityByWeight, boost::optional< double > v11_CapacityByNumber) : IfcElement((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_OperationType) { e->setArgument(8,*v9_OperationType,IfcTransportElementTypeEnum::ToString(*v9_OperationType)); } else { e->setArgument(8); } if (v10_CapacityByWeight) { e->setArgument(9,(*v10_CapacityByWeight)); } else { e->setArgument(9); } if (v11_CapacityByNumber) { e->setArgument(10,(*v11_CapacityByNumber)); } else { e->setArgument(10); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcTransportElementType
-IfcTransportElementTypeEnum::IfcTransportElementTypeEnum IfcTransportElementType::PredefinedType() { return IfcTransportElementTypeEnum::FromString(*entity->getArgument(9)); }
+IfcTransportElementTypeEnum::IfcTransportElementTypeEnum IfcTransportElementType::PredefinedType() const { return IfcTransportElementTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcTransportElementType::setPredefinedType(IfcTransportElementTypeEnum::IfcTransportElementTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcTransportElementTypeEnum::ToString(v)); }
 bool IfcTransportElementType::is(Type::Enum v) const { return v == Type::IfcTransportElementType || IfcElementType::is(v); }
 Type::Enum IfcTransportElementType::type() const { return Type::IfcTransportElementType; }
 Type::Enum IfcTransportElementType::Class() { return Type::IfcTransportElementType; }
-IfcTransportElementType::IfcTransportElementType(IfcAbstractEntityPtr e) : IfcElementType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcTransportElementType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcTransportElementType::IfcTransportElementType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcTransportElementTypeEnum::IfcTransportElementTypeEnum v10_PredefinedType) : IfcElementType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcTransportElementTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcTransportElementType::IfcTransportElementType(IfcAbstractEntity* e) : IfcElementType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcTransportElementType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcTransportElementType::IfcTransportElementType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcTransportElementTypeEnum::IfcTransportElementTypeEnum v10_PredefinedType) : IfcElementType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcTransportElementTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcTrapeziumProfileDef
-IfcPositiveLengthMeasure IfcTrapeziumProfileDef::BottomXDim() { return *entity->getArgument(3); }
-void IfcTrapeziumProfileDef::setBottomXDim(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-IfcPositiveLengthMeasure IfcTrapeziumProfileDef::TopXDim() { return *entity->getArgument(4); }
-void IfcTrapeziumProfileDef::setTopXDim(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-IfcPositiveLengthMeasure IfcTrapeziumProfileDef::YDim() { return *entity->getArgument(5); }
-void IfcTrapeziumProfileDef::setYDim(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-IfcLengthMeasure IfcTrapeziumProfileDef::TopXOffset() { return *entity->getArgument(6); }
-void IfcTrapeziumProfileDef::setTopXOffset(IfcLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
+double IfcTrapeziumProfileDef::BottomXDim() const { return *entity->getArgument(3); }
+void IfcTrapeziumProfileDef::setBottomXDim(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+double IfcTrapeziumProfileDef::TopXDim() const { return *entity->getArgument(4); }
+void IfcTrapeziumProfileDef::setTopXDim(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+double IfcTrapeziumProfileDef::YDim() const { return *entity->getArgument(5); }
+void IfcTrapeziumProfileDef::setYDim(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+double IfcTrapeziumProfileDef::TopXOffset() const { return *entity->getArgument(6); }
+void IfcTrapeziumProfileDef::setTopXOffset(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
 bool IfcTrapeziumProfileDef::is(Type::Enum v) const { return v == Type::IfcTrapeziumProfileDef || IfcParameterizedProfileDef::is(v); }
 Type::Enum IfcTrapeziumProfileDef::type() const { return Type::IfcTrapeziumProfileDef; }
 Type::Enum IfcTrapeziumProfileDef::Class() { return Type::IfcTrapeziumProfileDef; }
-IfcTrapeziumProfileDef::IfcTrapeziumProfileDef(IfcAbstractEntityPtr e) : IfcParameterizedProfileDef((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcTrapeziumProfileDef)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcTrapeziumProfileDef::IfcTrapeziumProfileDef(IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< IfcLabel > v2_ProfileName, IfcAxis2Placement2D* v3_Position, IfcPositiveLengthMeasure v4_BottomXDim, IfcPositiveLengthMeasure v5_TopXDim, IfcPositiveLengthMeasure v6_YDim, IfcLengthMeasure v7_TopXOffset) : IfcParameterizedProfileDef((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,v1_ProfileType,IfcProfileTypeEnum::ToString(v1_ProfileType)); if (v2_ProfileName) { e->setArgument(1,(*v2_ProfileName)); } else { e->setArgument(1); } e->setArgument(2,(v3_Position)); e->setArgument(3,(v4_BottomXDim)); e->setArgument(4,(v5_TopXDim)); e->setArgument(5,(v6_YDim)); e->setArgument(6,(v7_TopXOffset)); entity = e; EntityBuffer::Add(this); }
+IfcTrapeziumProfileDef::IfcTrapeziumProfileDef(IfcAbstractEntity* e) : IfcParameterizedProfileDef((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcTrapeziumProfileDef)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcTrapeziumProfileDef::IfcTrapeziumProfileDef(IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< std::string > v2_ProfileName, IfcAxis2Placement2D* v3_Position, double v4_BottomXDim, double v5_TopXDim, double v6_YDim, double v7_TopXOffset) : IfcParameterizedProfileDef((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,v1_ProfileType,IfcProfileTypeEnum::ToString(v1_ProfileType)); if (v2_ProfileName) { e->setArgument(1,(*v2_ProfileName)); } else { e->setArgument(1); } e->setArgument(2,(v3_Position)); e->setArgument(3,(v4_BottomXDim)); e->setArgument(4,(v5_TopXDim)); e->setArgument(5,(v6_YDim)); e->setArgument(6,(v7_TopXOffset)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcTrimmedCurve
-IfcCurve* IfcTrimmedCurve::BasisCurve() { return (IfcCurve*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(0))); }
+IfcCurve* IfcTrimmedCurve::BasisCurve() const { return (IfcCurve*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(0))); }
 void IfcTrimmedCurve::setBasisCurve(IfcCurve* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > IfcTrimmedCurve::Trim1() { RETURN_AS_LIST(IfcUtil::IfcAbstractSelect,1) }
-void IfcTrimmedCurve::setTrim1(SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v->generalize()); }
-SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > IfcTrimmedCurve::Trim2() { RETURN_AS_LIST(IfcUtil::IfcAbstractSelect,2) }
-void IfcTrimmedCurve::setTrim2(SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v->generalize()); }
-bool IfcTrimmedCurve::SenseAgreement() { return *entity->getArgument(3); }
+IfcEntityList::ptr IfcTrimmedCurve::Trim1() const { return *entity->getArgument(1); }
+void IfcTrimmedCurve::setTrim1(IfcEntityList::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+IfcEntityList::ptr IfcTrimmedCurve::Trim2() const { return *entity->getArgument(2); }
+void IfcTrimmedCurve::setTrim2(IfcEntityList::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+bool IfcTrimmedCurve::SenseAgreement() const { return *entity->getArgument(3); }
 void IfcTrimmedCurve::setSenseAgreement(bool v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-IfcTrimmingPreference::IfcTrimmingPreference IfcTrimmedCurve::MasterRepresentation() { return IfcTrimmingPreference::FromString(*entity->getArgument(4)); }
+IfcTrimmingPreference::IfcTrimmingPreference IfcTrimmedCurve::MasterRepresentation() const { return IfcTrimmingPreference::FromString(*entity->getArgument(4)); }
 void IfcTrimmedCurve::setMasterRepresentation(IfcTrimmingPreference::IfcTrimmingPreference v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v,IfcTrimmingPreference::ToString(v)); }
 bool IfcTrimmedCurve::is(Type::Enum v) const { return v == Type::IfcTrimmedCurve || IfcBoundedCurve::is(v); }
 Type::Enum IfcTrimmedCurve::type() const { return Type::IfcTrimmedCurve; }
 Type::Enum IfcTrimmedCurve::Class() { return Type::IfcTrimmedCurve; }
-IfcTrimmedCurve::IfcTrimmedCurve(IfcAbstractEntityPtr e) : IfcBoundedCurve((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcTrimmedCurve)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcTrimmedCurve::IfcTrimmedCurve(IfcCurve* v1_BasisCurve, IfcEntities v2_Trim1, IfcEntities v3_Trim2, bool v4_SenseAgreement, IfcTrimmingPreference::IfcTrimmingPreference v5_MasterRepresentation) : IfcBoundedCurve((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_BasisCurve)); e->setArgument(1,(v2_Trim1)); e->setArgument(2,(v3_Trim2)); e->setArgument(3,(v4_SenseAgreement)); e->setArgument(4,v5_MasterRepresentation,IfcTrimmingPreference::ToString(v5_MasterRepresentation)); entity = e; EntityBuffer::Add(this); }
+IfcTrimmedCurve::IfcTrimmedCurve(IfcAbstractEntity* e) : IfcBoundedCurve((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcTrimmedCurve)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcTrimmedCurve::IfcTrimmedCurve(IfcCurve* v1_BasisCurve, IfcEntityList::ptr v2_Trim1, IfcEntityList::ptr v3_Trim2, bool v4_SenseAgreement, IfcTrimmingPreference::IfcTrimmingPreference v5_MasterRepresentation) : IfcBoundedCurve((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_BasisCurve)); e->setArgument(1,(v2_Trim1)); e->setArgument(2,(v3_Trim2)); e->setArgument(3,(v4_SenseAgreement)); e->setArgument(4,v5_MasterRepresentation,IfcTrimmingPreference::ToString(v5_MasterRepresentation)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcTubeBundleType
-IfcTubeBundleTypeEnum::IfcTubeBundleTypeEnum IfcTubeBundleType::PredefinedType() { return IfcTubeBundleTypeEnum::FromString(*entity->getArgument(9)); }
+IfcTubeBundleTypeEnum::IfcTubeBundleTypeEnum IfcTubeBundleType::PredefinedType() const { return IfcTubeBundleTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcTubeBundleType::setPredefinedType(IfcTubeBundleTypeEnum::IfcTubeBundleTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcTubeBundleTypeEnum::ToString(v)); }
 bool IfcTubeBundleType::is(Type::Enum v) const { return v == Type::IfcTubeBundleType || IfcEnergyConversionDeviceType::is(v); }
 Type::Enum IfcTubeBundleType::type() const { return Type::IfcTubeBundleType; }
 Type::Enum IfcTubeBundleType::Class() { return Type::IfcTubeBundleType; }
-IfcTubeBundleType::IfcTubeBundleType(IfcAbstractEntityPtr e) : IfcEnergyConversionDeviceType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcTubeBundleType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcTubeBundleType::IfcTubeBundleType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcTubeBundleTypeEnum::IfcTubeBundleTypeEnum v10_PredefinedType) : IfcEnergyConversionDeviceType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcTubeBundleTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcTubeBundleType::IfcTubeBundleType(IfcAbstractEntity* e) : IfcEnergyConversionDeviceType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcTubeBundleType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcTubeBundleType::IfcTubeBundleType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcTubeBundleTypeEnum::IfcTubeBundleTypeEnum v10_PredefinedType) : IfcEnergyConversionDeviceType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcTubeBundleTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcTwoDirectionRepeatFactor
-IfcVector* IfcTwoDirectionRepeatFactor::SecondRepeatFactor() { return (IfcVector*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(1))); }
+IfcVector* IfcTwoDirectionRepeatFactor::SecondRepeatFactor() const { return (IfcVector*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(1))); }
 void IfcTwoDirectionRepeatFactor::setSecondRepeatFactor(IfcVector* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
 bool IfcTwoDirectionRepeatFactor::is(Type::Enum v) const { return v == Type::IfcTwoDirectionRepeatFactor || IfcOneDirectionRepeatFactor::is(v); }
 Type::Enum IfcTwoDirectionRepeatFactor::type() const { return Type::IfcTwoDirectionRepeatFactor; }
 Type::Enum IfcTwoDirectionRepeatFactor::Class() { return Type::IfcTwoDirectionRepeatFactor; }
-IfcTwoDirectionRepeatFactor::IfcTwoDirectionRepeatFactor(IfcAbstractEntityPtr e) : IfcOneDirectionRepeatFactor((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcTwoDirectionRepeatFactor)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcTwoDirectionRepeatFactor::IfcTwoDirectionRepeatFactor(IfcVector* v1_RepeatFactor, IfcVector* v2_SecondRepeatFactor) : IfcOneDirectionRepeatFactor((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_RepeatFactor)); e->setArgument(1,(v2_SecondRepeatFactor)); entity = e; EntityBuffer::Add(this); }
+IfcTwoDirectionRepeatFactor::IfcTwoDirectionRepeatFactor(IfcAbstractEntity* e) : IfcOneDirectionRepeatFactor((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcTwoDirectionRepeatFactor)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcTwoDirectionRepeatFactor::IfcTwoDirectionRepeatFactor(IfcVector* v1_RepeatFactor, IfcVector* v2_SecondRepeatFactor) : IfcOneDirectionRepeatFactor((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_RepeatFactor)); e->setArgument(1,(v2_SecondRepeatFactor)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcTypeObject
-bool IfcTypeObject::hasApplicableOccurrence() { return !entity->getArgument(4)->isNull(); }
-IfcLabel IfcTypeObject::ApplicableOccurrence() { return *entity->getArgument(4); }
-void IfcTypeObject::setApplicableOccurrence(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-bool IfcTypeObject::hasHasPropertySets() { return !entity->getArgument(5)->isNull(); }
-SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > IfcTypeObject::HasPropertySets() { RETURN_AS_LIST(IfcPropertySetDefinition,5) }
-void IfcTypeObject::setHasPropertySets(SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v->generalize()); }
-IfcRelDefinesByType::list IfcTypeObject::ObjectTypeOf() { RETURN_INVERSE(IfcRelDefinesByType) }
+bool IfcTypeObject::hasApplicableOccurrence() const { return !entity->getArgument(4)->isNull(); }
+std::string IfcTypeObject::ApplicableOccurrence() const { return *entity->getArgument(4); }
+void IfcTypeObject::setApplicableOccurrence(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+bool IfcTypeObject::hasHasPropertySets() const { return !entity->getArgument(5)->isNull(); }
+IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr IfcTypeObject::HasPropertySets() const { IfcEntityList::ptr es = *entity->getArgument(5); return es->as<IfcPropertySetDefinition>(); }
+void IfcTypeObject::setHasPropertySets(IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v->generalize()); }
+IfcRelDefinesByType::list::ptr IfcTypeObject::ObjectTypeOf() const { return entity->getInverse(Type::IfcRelDefinesByType, 5)->as<IfcRelDefinesByType>(); }
 bool IfcTypeObject::is(Type::Enum v) const { return v == Type::IfcTypeObject || IfcObjectDefinition::is(v); }
 Type::Enum IfcTypeObject::type() const { return Type::IfcTypeObject; }
 Type::Enum IfcTypeObject::Class() { return Type::IfcTypeObject; }
-IfcTypeObject::IfcTypeObject(IfcAbstractEntityPtr e) : IfcObjectDefinition((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcTypeObject)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcTypeObject::IfcTypeObject(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets) : IfcObjectDefinition((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } entity = e; EntityBuffer::Add(this); }
+IfcTypeObject::IfcTypeObject(IfcAbstractEntity* e) : IfcObjectDefinition((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcTypeObject)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcTypeObject::IfcTypeObject(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets) : IfcObjectDefinition((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcTypeProduct
-bool IfcTypeProduct::hasRepresentationMaps() { return !entity->getArgument(6)->isNull(); }
-SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > IfcTypeProduct::RepresentationMaps() { RETURN_AS_LIST(IfcRepresentationMap,6) }
-void IfcTypeProduct::setRepresentationMaps(SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v->generalize()); }
-bool IfcTypeProduct::hasTag() { return !entity->getArgument(7)->isNull(); }
-IfcLabel IfcTypeProduct::Tag() { return *entity->getArgument(7); }
-void IfcTypeProduct::setTag(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
+bool IfcTypeProduct::hasRepresentationMaps() const { return !entity->getArgument(6)->isNull(); }
+IfcTemplatedEntityList< IfcRepresentationMap >::ptr IfcTypeProduct::RepresentationMaps() const { IfcEntityList::ptr es = *entity->getArgument(6); return es->as<IfcRepresentationMap>(); }
+void IfcTypeProduct::setRepresentationMaps(IfcTemplatedEntityList< IfcRepresentationMap >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v->generalize()); }
+bool IfcTypeProduct::hasTag() const { return !entity->getArgument(7)->isNull(); }
+std::string IfcTypeProduct::Tag() const { return *entity->getArgument(7); }
+void IfcTypeProduct::setTag(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
 bool IfcTypeProduct::is(Type::Enum v) const { return v == Type::IfcTypeProduct || IfcTypeObject::is(v); }
 Type::Enum IfcTypeProduct::type() const { return Type::IfcTypeProduct; }
 Type::Enum IfcTypeProduct::Class() { return Type::IfcTypeProduct; }
-IfcTypeProduct::IfcTypeProduct(IfcAbstractEntityPtr e) : IfcTypeObject((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcTypeProduct)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcTypeProduct::IfcTypeProduct(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag) : IfcTypeObject((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
+IfcTypeProduct::IfcTypeProduct(IfcAbstractEntity* e) : IfcTypeObject((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcTypeProduct)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcTypeProduct::IfcTypeProduct(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag) : IfcTypeObject((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcUShapeProfileDef
-IfcPositiveLengthMeasure IfcUShapeProfileDef::Depth() { return *entity->getArgument(3); }
-void IfcUShapeProfileDef::setDepth(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-IfcPositiveLengthMeasure IfcUShapeProfileDef::FlangeWidth() { return *entity->getArgument(4); }
-void IfcUShapeProfileDef::setFlangeWidth(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-IfcPositiveLengthMeasure IfcUShapeProfileDef::WebThickness() { return *entity->getArgument(5); }
-void IfcUShapeProfileDef::setWebThickness(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-IfcPositiveLengthMeasure IfcUShapeProfileDef::FlangeThickness() { return *entity->getArgument(6); }
-void IfcUShapeProfileDef::setFlangeThickness(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
-bool IfcUShapeProfileDef::hasFilletRadius() { return !entity->getArgument(7)->isNull(); }
-IfcPositiveLengthMeasure IfcUShapeProfileDef::FilletRadius() { return *entity->getArgument(7); }
-void IfcUShapeProfileDef::setFilletRadius(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
-bool IfcUShapeProfileDef::hasEdgeRadius() { return !entity->getArgument(8)->isNull(); }
-IfcPositiveLengthMeasure IfcUShapeProfileDef::EdgeRadius() { return *entity->getArgument(8); }
-void IfcUShapeProfileDef::setEdgeRadius(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
-bool IfcUShapeProfileDef::hasFlangeSlope() { return !entity->getArgument(9)->isNull(); }
-IfcPlaneAngleMeasure IfcUShapeProfileDef::FlangeSlope() { return *entity->getArgument(9); }
-void IfcUShapeProfileDef::setFlangeSlope(IfcPlaneAngleMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
-bool IfcUShapeProfileDef::hasCentreOfGravityInX() { return !entity->getArgument(10)->isNull(); }
-IfcPositiveLengthMeasure IfcUShapeProfileDef::CentreOfGravityInX() { return *entity->getArgument(10); }
-void IfcUShapeProfileDef::setCentreOfGravityInX(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
+double IfcUShapeProfileDef::Depth() const { return *entity->getArgument(3); }
+void IfcUShapeProfileDef::setDepth(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+double IfcUShapeProfileDef::FlangeWidth() const { return *entity->getArgument(4); }
+void IfcUShapeProfileDef::setFlangeWidth(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+double IfcUShapeProfileDef::WebThickness() const { return *entity->getArgument(5); }
+void IfcUShapeProfileDef::setWebThickness(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+double IfcUShapeProfileDef::FlangeThickness() const { return *entity->getArgument(6); }
+void IfcUShapeProfileDef::setFlangeThickness(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
+bool IfcUShapeProfileDef::hasFilletRadius() const { return !entity->getArgument(7)->isNull(); }
+double IfcUShapeProfileDef::FilletRadius() const { return *entity->getArgument(7); }
+void IfcUShapeProfileDef::setFilletRadius(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
+bool IfcUShapeProfileDef::hasEdgeRadius() const { return !entity->getArgument(8)->isNull(); }
+double IfcUShapeProfileDef::EdgeRadius() const { return *entity->getArgument(8); }
+void IfcUShapeProfileDef::setEdgeRadius(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
+bool IfcUShapeProfileDef::hasFlangeSlope() const { return !entity->getArgument(9)->isNull(); }
+double IfcUShapeProfileDef::FlangeSlope() const { return *entity->getArgument(9); }
+void IfcUShapeProfileDef::setFlangeSlope(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
+bool IfcUShapeProfileDef::hasCentreOfGravityInX() const { return !entity->getArgument(10)->isNull(); }
+double IfcUShapeProfileDef::CentreOfGravityInX() const { return *entity->getArgument(10); }
+void IfcUShapeProfileDef::setCentreOfGravityInX(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
 bool IfcUShapeProfileDef::is(Type::Enum v) const { return v == Type::IfcUShapeProfileDef || IfcParameterizedProfileDef::is(v); }
 Type::Enum IfcUShapeProfileDef::type() const { return Type::IfcUShapeProfileDef; }
 Type::Enum IfcUShapeProfileDef::Class() { return Type::IfcUShapeProfileDef; }
-IfcUShapeProfileDef::IfcUShapeProfileDef(IfcAbstractEntityPtr e) : IfcParameterizedProfileDef((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcUShapeProfileDef)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcUShapeProfileDef::IfcUShapeProfileDef(IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< IfcLabel > v2_ProfileName, IfcAxis2Placement2D* v3_Position, IfcPositiveLengthMeasure v4_Depth, IfcPositiveLengthMeasure v5_FlangeWidth, IfcPositiveLengthMeasure v6_WebThickness, IfcPositiveLengthMeasure v7_FlangeThickness, boost::optional< IfcPositiveLengthMeasure > v8_FilletRadius, boost::optional< IfcPositiveLengthMeasure > v9_EdgeRadius, boost::optional< IfcPlaneAngleMeasure > v10_FlangeSlope, boost::optional< IfcPositiveLengthMeasure > v11_CentreOfGravityInX) : IfcParameterizedProfileDef((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,v1_ProfileType,IfcProfileTypeEnum::ToString(v1_ProfileType)); if (v2_ProfileName) { e->setArgument(1,(*v2_ProfileName)); } else { e->setArgument(1); } e->setArgument(2,(v3_Position)); e->setArgument(3,(v4_Depth)); e->setArgument(4,(v5_FlangeWidth)); e->setArgument(5,(v6_WebThickness)); e->setArgument(6,(v7_FlangeThickness)); if (v8_FilletRadius) { e->setArgument(7,(*v8_FilletRadius)); } else { e->setArgument(7); } if (v9_EdgeRadius) { e->setArgument(8,(*v9_EdgeRadius)); } else { e->setArgument(8); } if (v10_FlangeSlope) { e->setArgument(9,(*v10_FlangeSlope)); } else { e->setArgument(9); } if (v11_CentreOfGravityInX) { e->setArgument(10,(*v11_CentreOfGravityInX)); } else { e->setArgument(10); } entity = e; EntityBuffer::Add(this); }
+IfcUShapeProfileDef::IfcUShapeProfileDef(IfcAbstractEntity* e) : IfcParameterizedProfileDef((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcUShapeProfileDef)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcUShapeProfileDef::IfcUShapeProfileDef(IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< std::string > v2_ProfileName, IfcAxis2Placement2D* v3_Position, double v4_Depth, double v5_FlangeWidth, double v6_WebThickness, double v7_FlangeThickness, boost::optional< double > v8_FilletRadius, boost::optional< double > v9_EdgeRadius, boost::optional< double > v10_FlangeSlope, boost::optional< double > v11_CentreOfGravityInX) : IfcParameterizedProfileDef((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,v1_ProfileType,IfcProfileTypeEnum::ToString(v1_ProfileType)); if (v2_ProfileName) { e->setArgument(1,(*v2_ProfileName)); } else { e->setArgument(1); } e->setArgument(2,(v3_Position)); e->setArgument(3,(v4_Depth)); e->setArgument(4,(v5_FlangeWidth)); e->setArgument(5,(v6_WebThickness)); e->setArgument(6,(v7_FlangeThickness)); if (v8_FilletRadius) { e->setArgument(7,(*v8_FilletRadius)); } else { e->setArgument(7); } if (v9_EdgeRadius) { e->setArgument(8,(*v9_EdgeRadius)); } else { e->setArgument(8); } if (v10_FlangeSlope) { e->setArgument(9,(*v10_FlangeSlope)); } else { e->setArgument(9); } if (v11_CentreOfGravityInX) { e->setArgument(10,(*v11_CentreOfGravityInX)); } else { e->setArgument(10); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcUnitAssignment
-SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > IfcUnitAssignment::Units() { RETURN_AS_LIST(IfcUtil::IfcAbstractSelect,0) }
-void IfcUnitAssignment::setUnits(SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v->generalize()); }
+IfcEntityList::ptr IfcUnitAssignment::Units() const { return *entity->getArgument(0); }
+void IfcUnitAssignment::setUnits(IfcEntityList::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
 bool IfcUnitAssignment::is(Type::Enum v) const { return v == Type::IfcUnitAssignment; }
 Type::Enum IfcUnitAssignment::type() const { return Type::IfcUnitAssignment; }
 Type::Enum IfcUnitAssignment::Class() { return Type::IfcUnitAssignment; }
-IfcUnitAssignment::IfcUnitAssignment(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcUnitAssignment)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcUnitAssignment::IfcUnitAssignment(IfcEntities v1_Units) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Units)); entity = e; EntityBuffer::Add(this); }
+IfcUnitAssignment::IfcUnitAssignment(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcUnitAssignment)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcUnitAssignment::IfcUnitAssignment(IfcEntityList::ptr v1_Units) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Units)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcUnitaryEquipmentType
-IfcUnitaryEquipmentTypeEnum::IfcUnitaryEquipmentTypeEnum IfcUnitaryEquipmentType::PredefinedType() { return IfcUnitaryEquipmentTypeEnum::FromString(*entity->getArgument(9)); }
+IfcUnitaryEquipmentTypeEnum::IfcUnitaryEquipmentTypeEnum IfcUnitaryEquipmentType::PredefinedType() const { return IfcUnitaryEquipmentTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcUnitaryEquipmentType::setPredefinedType(IfcUnitaryEquipmentTypeEnum::IfcUnitaryEquipmentTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcUnitaryEquipmentTypeEnum::ToString(v)); }
 bool IfcUnitaryEquipmentType::is(Type::Enum v) const { return v == Type::IfcUnitaryEquipmentType || IfcEnergyConversionDeviceType::is(v); }
 Type::Enum IfcUnitaryEquipmentType::type() const { return Type::IfcUnitaryEquipmentType; }
 Type::Enum IfcUnitaryEquipmentType::Class() { return Type::IfcUnitaryEquipmentType; }
-IfcUnitaryEquipmentType::IfcUnitaryEquipmentType(IfcAbstractEntityPtr e) : IfcEnergyConversionDeviceType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcUnitaryEquipmentType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcUnitaryEquipmentType::IfcUnitaryEquipmentType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcUnitaryEquipmentTypeEnum::IfcUnitaryEquipmentTypeEnum v10_PredefinedType) : IfcEnergyConversionDeviceType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcUnitaryEquipmentTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcUnitaryEquipmentType::IfcUnitaryEquipmentType(IfcAbstractEntity* e) : IfcEnergyConversionDeviceType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcUnitaryEquipmentType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcUnitaryEquipmentType::IfcUnitaryEquipmentType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcUnitaryEquipmentTypeEnum::IfcUnitaryEquipmentTypeEnum v10_PredefinedType) : IfcEnergyConversionDeviceType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcUnitaryEquipmentTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcValveType
-IfcValveTypeEnum::IfcValveTypeEnum IfcValveType::PredefinedType() { return IfcValveTypeEnum::FromString(*entity->getArgument(9)); }
+IfcValveTypeEnum::IfcValveTypeEnum IfcValveType::PredefinedType() const { return IfcValveTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcValveType::setPredefinedType(IfcValveTypeEnum::IfcValveTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcValveTypeEnum::ToString(v)); }
 bool IfcValveType::is(Type::Enum v) const { return v == Type::IfcValveType || IfcFlowControllerType::is(v); }
 Type::Enum IfcValveType::type() const { return Type::IfcValveType; }
 Type::Enum IfcValveType::Class() { return Type::IfcValveType; }
-IfcValveType::IfcValveType(IfcAbstractEntityPtr e) : IfcFlowControllerType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcValveType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcValveType::IfcValveType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcValveTypeEnum::IfcValveTypeEnum v10_PredefinedType) : IfcFlowControllerType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcValveTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcValveType::IfcValveType(IfcAbstractEntity* e) : IfcFlowControllerType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcValveType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcValveType::IfcValveType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcValveTypeEnum::IfcValveTypeEnum v10_PredefinedType) : IfcFlowControllerType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcValveTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcVector
-IfcDirection* IfcVector::Orientation() { return (IfcDirection*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(0))); }
+IfcDirection* IfcVector::Orientation() const { return (IfcDirection*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(0))); }
 void IfcVector::setOrientation(IfcDirection* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-IfcLengthMeasure IfcVector::Magnitude() { return *entity->getArgument(1); }
-void IfcVector::setMagnitude(IfcLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+double IfcVector::Magnitude() const { return *entity->getArgument(1); }
+void IfcVector::setMagnitude(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
 bool IfcVector::is(Type::Enum v) const { return v == Type::IfcVector || IfcGeometricRepresentationItem::is(v); }
 Type::Enum IfcVector::type() const { return Type::IfcVector; }
 Type::Enum IfcVector::Class() { return Type::IfcVector; }
-IfcVector::IfcVector(IfcAbstractEntityPtr e) : IfcGeometricRepresentationItem((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcVector)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcVector::IfcVector(IfcDirection* v1_Orientation, IfcLengthMeasure v2_Magnitude) : IfcGeometricRepresentationItem((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Orientation)); e->setArgument(1,(v2_Magnitude)); entity = e; EntityBuffer::Add(this); }
+IfcVector::IfcVector(IfcAbstractEntity* e) : IfcGeometricRepresentationItem((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcVector)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcVector::IfcVector(IfcDirection* v1_Orientation, double v2_Magnitude) : IfcGeometricRepresentationItem((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Orientation)); e->setArgument(1,(v2_Magnitude)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcVertex
 bool IfcVertex::is(Type::Enum v) const { return v == Type::IfcVertex || IfcTopologicalRepresentationItem::is(v); }
 Type::Enum IfcVertex::type() const { return Type::IfcVertex; }
 Type::Enum IfcVertex::Class() { return Type::IfcVertex; }
-IfcVertex::IfcVertex(IfcAbstractEntityPtr e) : IfcTopologicalRepresentationItem((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcVertex)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcVertex::IfcVertex() : IfcTopologicalRepresentationItem((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); entity = e; EntityBuffer::Add(this); }
+IfcVertex::IfcVertex(IfcAbstractEntity* e) : IfcTopologicalRepresentationItem((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcVertex)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcVertex::IfcVertex() : IfcTopologicalRepresentationItem((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcVertexBasedTextureMap
-SHARED_PTR< IfcTemplatedEntityList< IfcTextureVertex > > IfcVertexBasedTextureMap::TextureVertices() { RETURN_AS_LIST(IfcTextureVertex,0) }
-void IfcVertexBasedTextureMap::setTextureVertices(SHARED_PTR< IfcTemplatedEntityList< IfcTextureVertex > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v->generalize()); }
-SHARED_PTR< IfcTemplatedEntityList< IfcCartesianPoint > > IfcVertexBasedTextureMap::TexturePoints() { RETURN_AS_LIST(IfcCartesianPoint,1) }
-void IfcVertexBasedTextureMap::setTexturePoints(SHARED_PTR< IfcTemplatedEntityList< IfcCartesianPoint > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v->generalize()); }
+IfcTemplatedEntityList< IfcTextureVertex >::ptr IfcVertexBasedTextureMap::TextureVertices() const { IfcEntityList::ptr es = *entity->getArgument(0); return es->as<IfcTextureVertex>(); }
+void IfcVertexBasedTextureMap::setTextureVertices(IfcTemplatedEntityList< IfcTextureVertex >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v->generalize()); }
+IfcTemplatedEntityList< IfcCartesianPoint >::ptr IfcVertexBasedTextureMap::TexturePoints() const { IfcEntityList::ptr es = *entity->getArgument(1); return es->as<IfcCartesianPoint>(); }
+void IfcVertexBasedTextureMap::setTexturePoints(IfcTemplatedEntityList< IfcCartesianPoint >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v->generalize()); }
 bool IfcVertexBasedTextureMap::is(Type::Enum v) const { return v == Type::IfcVertexBasedTextureMap; }
 Type::Enum IfcVertexBasedTextureMap::type() const { return Type::IfcVertexBasedTextureMap; }
 Type::Enum IfcVertexBasedTextureMap::Class() { return Type::IfcVertexBasedTextureMap; }
-IfcVertexBasedTextureMap::IfcVertexBasedTextureMap(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcVertexBasedTextureMap)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcVertexBasedTextureMap::IfcVertexBasedTextureMap(SHARED_PTR< IfcTemplatedEntityList< IfcTextureVertex > > v1_TextureVertices, SHARED_PTR< IfcTemplatedEntityList< IfcCartesianPoint > > v2_TexturePoints) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_TextureVertices)->generalize()); e->setArgument(1,(v2_TexturePoints)->generalize()); entity = e; EntityBuffer::Add(this); }
+IfcVertexBasedTextureMap::IfcVertexBasedTextureMap(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcVertexBasedTextureMap)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcVertexBasedTextureMap::IfcVertexBasedTextureMap(IfcTemplatedEntityList< IfcTextureVertex >::ptr v1_TextureVertices, IfcTemplatedEntityList< IfcCartesianPoint >::ptr v2_TexturePoints) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_TextureVertices)->generalize()); e->setArgument(1,(v2_TexturePoints)->generalize()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcVertexLoop
-IfcVertex* IfcVertexLoop::LoopVertex() { return (IfcVertex*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(0))); }
+IfcVertex* IfcVertexLoop::LoopVertex() const { return (IfcVertex*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(0))); }
 void IfcVertexLoop::setLoopVertex(IfcVertex* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
 bool IfcVertexLoop::is(Type::Enum v) const { return v == Type::IfcVertexLoop || IfcLoop::is(v); }
 Type::Enum IfcVertexLoop::type() const { return Type::IfcVertexLoop; }
 Type::Enum IfcVertexLoop::Class() { return Type::IfcVertexLoop; }
-IfcVertexLoop::IfcVertexLoop(IfcAbstractEntityPtr e) : IfcLoop((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcVertexLoop)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcVertexLoop::IfcVertexLoop(IfcVertex* v1_LoopVertex) : IfcLoop((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_LoopVertex)); entity = e; EntityBuffer::Add(this); }
+IfcVertexLoop::IfcVertexLoop(IfcAbstractEntity* e) : IfcLoop((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcVertexLoop)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcVertexLoop::IfcVertexLoop(IfcVertex* v1_LoopVertex) : IfcLoop((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_LoopVertex)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcVertexPoint
-IfcPoint* IfcVertexPoint::VertexGeometry() { return (IfcPoint*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(0))); }
+IfcPoint* IfcVertexPoint::VertexGeometry() const { return (IfcPoint*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(0))); }
 void IfcVertexPoint::setVertexGeometry(IfcPoint* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
 bool IfcVertexPoint::is(Type::Enum v) const { return v == Type::IfcVertexPoint || IfcVertex::is(v); }
 Type::Enum IfcVertexPoint::type() const { return Type::IfcVertexPoint; }
 Type::Enum IfcVertexPoint::Class() { return Type::IfcVertexPoint; }
-IfcVertexPoint::IfcVertexPoint(IfcAbstractEntityPtr e) : IfcVertex((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcVertexPoint)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcVertexPoint::IfcVertexPoint(IfcPoint* v1_VertexGeometry) : IfcVertex((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_VertexGeometry)); entity = e; EntityBuffer::Add(this); }
+IfcVertexPoint::IfcVertexPoint(IfcAbstractEntity* e) : IfcVertex((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcVertexPoint)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcVertexPoint::IfcVertexPoint(IfcPoint* v1_VertexGeometry) : IfcVertex((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_VertexGeometry)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcVibrationIsolatorType
-IfcVibrationIsolatorTypeEnum::IfcVibrationIsolatorTypeEnum IfcVibrationIsolatorType::PredefinedType() { return IfcVibrationIsolatorTypeEnum::FromString(*entity->getArgument(9)); }
+IfcVibrationIsolatorTypeEnum::IfcVibrationIsolatorTypeEnum IfcVibrationIsolatorType::PredefinedType() const { return IfcVibrationIsolatorTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcVibrationIsolatorType::setPredefinedType(IfcVibrationIsolatorTypeEnum::IfcVibrationIsolatorTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcVibrationIsolatorTypeEnum::ToString(v)); }
 bool IfcVibrationIsolatorType::is(Type::Enum v) const { return v == Type::IfcVibrationIsolatorType || IfcDiscreteAccessoryType::is(v); }
 Type::Enum IfcVibrationIsolatorType::type() const { return Type::IfcVibrationIsolatorType; }
 Type::Enum IfcVibrationIsolatorType::Class() { return Type::IfcVibrationIsolatorType; }
-IfcVibrationIsolatorType::IfcVibrationIsolatorType(IfcAbstractEntityPtr e) : IfcDiscreteAccessoryType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcVibrationIsolatorType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcVibrationIsolatorType::IfcVibrationIsolatorType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcVibrationIsolatorTypeEnum::IfcVibrationIsolatorTypeEnum v10_PredefinedType) : IfcDiscreteAccessoryType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcVibrationIsolatorTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcVibrationIsolatorType::IfcVibrationIsolatorType(IfcAbstractEntity* e) : IfcDiscreteAccessoryType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcVibrationIsolatorType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcVibrationIsolatorType::IfcVibrationIsolatorType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcVibrationIsolatorTypeEnum::IfcVibrationIsolatorTypeEnum v10_PredefinedType) : IfcDiscreteAccessoryType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcVibrationIsolatorTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcVirtualElement
 bool IfcVirtualElement::is(Type::Enum v) const { return v == Type::IfcVirtualElement || IfcElement::is(v); }
 Type::Enum IfcVirtualElement::type() const { return Type::IfcVirtualElement; }
 Type::Enum IfcVirtualElement::Class() { return Type::IfcVirtualElement; }
-IfcVirtualElement::IfcVirtualElement(IfcAbstractEntityPtr e) : IfcElement((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcVirtualElement)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcVirtualElement::IfcVirtualElement(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag) : IfcElement((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
+IfcVirtualElement::IfcVirtualElement(IfcAbstractEntity* e) : IfcElement((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcVirtualElement)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcVirtualElement::IfcVirtualElement(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag) : IfcElement((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcVirtualGridIntersection
-SHARED_PTR< IfcTemplatedEntityList< IfcGridAxis > > IfcVirtualGridIntersection::IntersectingAxes() { RETURN_AS_LIST(IfcGridAxis,0) }
-void IfcVirtualGridIntersection::setIntersectingAxes(SHARED_PTR< IfcTemplatedEntityList< IfcGridAxis > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v->generalize()); }
-std::vector< IfcLengthMeasure > /*[2:3]*/ IfcVirtualGridIntersection::OffsetDistances() { return *entity->getArgument(1); }
-void IfcVirtualGridIntersection::setOffsetDistances(std::vector< IfcLengthMeasure > /*[2:3]*/ v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+IfcTemplatedEntityList< IfcGridAxis >::ptr IfcVirtualGridIntersection::IntersectingAxes() const { IfcEntityList::ptr es = *entity->getArgument(0); return es->as<IfcGridAxis>(); }
+void IfcVirtualGridIntersection::setIntersectingAxes(IfcTemplatedEntityList< IfcGridAxis >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v->generalize()); }
+std::vector< double > /*[2:3]*/ IfcVirtualGridIntersection::OffsetDistances() const { return *entity->getArgument(1); }
+void IfcVirtualGridIntersection::setOffsetDistances(std::vector< double > /*[2:3]*/ v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
 bool IfcVirtualGridIntersection::is(Type::Enum v) const { return v == Type::IfcVirtualGridIntersection; }
 Type::Enum IfcVirtualGridIntersection::type() const { return Type::IfcVirtualGridIntersection; }
 Type::Enum IfcVirtualGridIntersection::Class() { return Type::IfcVirtualGridIntersection; }
-IfcVirtualGridIntersection::IfcVirtualGridIntersection(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcVirtualGridIntersection)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcVirtualGridIntersection::IfcVirtualGridIntersection(SHARED_PTR< IfcTemplatedEntityList< IfcGridAxis > > v1_IntersectingAxes, std::vector< IfcLengthMeasure > /*[2:3]*/ v2_OffsetDistances) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_IntersectingAxes)->generalize()); e->setArgument(1,(v2_OffsetDistances)); entity = e; EntityBuffer::Add(this); }
+IfcVirtualGridIntersection::IfcVirtualGridIntersection(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcVirtualGridIntersection)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcVirtualGridIntersection::IfcVirtualGridIntersection(IfcTemplatedEntityList< IfcGridAxis >::ptr v1_IntersectingAxes, std::vector< double > /*[2:3]*/ v2_OffsetDistances) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_IntersectingAxes)->generalize()); e->setArgument(1,(v2_OffsetDistances)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcWall
 bool IfcWall::is(Type::Enum v) const { return v == Type::IfcWall || IfcBuildingElement::is(v); }
 Type::Enum IfcWall::type() const { return Type::IfcWall; }
 Type::Enum IfcWall::Class() { return Type::IfcWall; }
-IfcWall::IfcWall(IfcAbstractEntityPtr e) : IfcBuildingElement((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcWall)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcWall::IfcWall(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag) : IfcBuildingElement((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
+IfcWall::IfcWall(IfcAbstractEntity* e) : IfcBuildingElement((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcWall)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcWall::IfcWall(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag) : IfcBuildingElement((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcWallStandardCase
 bool IfcWallStandardCase::is(Type::Enum v) const { return v == Type::IfcWallStandardCase || IfcWall::is(v); }
 Type::Enum IfcWallStandardCase::type() const { return Type::IfcWallStandardCase; }
 Type::Enum IfcWallStandardCase::Class() { return Type::IfcWallStandardCase; }
-IfcWallStandardCase::IfcWallStandardCase(IfcAbstractEntityPtr e) : IfcWall((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcWallStandardCase)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcWallStandardCase::IfcWallStandardCase(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag) : IfcWall((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
+IfcWallStandardCase::IfcWallStandardCase(IfcAbstractEntity* e) : IfcWall((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcWallStandardCase)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcWallStandardCase::IfcWallStandardCase(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag) : IfcWall((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcWallType
-IfcWallTypeEnum::IfcWallTypeEnum IfcWallType::PredefinedType() { return IfcWallTypeEnum::FromString(*entity->getArgument(9)); }
+IfcWallTypeEnum::IfcWallTypeEnum IfcWallType::PredefinedType() const { return IfcWallTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcWallType::setPredefinedType(IfcWallTypeEnum::IfcWallTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcWallTypeEnum::ToString(v)); }
 bool IfcWallType::is(Type::Enum v) const { return v == Type::IfcWallType || IfcBuildingElementType::is(v); }
 Type::Enum IfcWallType::type() const { return Type::IfcWallType; }
 Type::Enum IfcWallType::Class() { return Type::IfcWallType; }
-IfcWallType::IfcWallType(IfcAbstractEntityPtr e) : IfcBuildingElementType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcWallType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcWallType::IfcWallType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcWallTypeEnum::IfcWallTypeEnum v10_PredefinedType) : IfcBuildingElementType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcWallTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcWallType::IfcWallType(IfcAbstractEntity* e) : IfcBuildingElementType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcWallType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcWallType::IfcWallType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcWallTypeEnum::IfcWallTypeEnum v10_PredefinedType) : IfcBuildingElementType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcWallTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcWasteTerminalType
-IfcWasteTerminalTypeEnum::IfcWasteTerminalTypeEnum IfcWasteTerminalType::PredefinedType() { return IfcWasteTerminalTypeEnum::FromString(*entity->getArgument(9)); }
+IfcWasteTerminalTypeEnum::IfcWasteTerminalTypeEnum IfcWasteTerminalType::PredefinedType() const { return IfcWasteTerminalTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcWasteTerminalType::setPredefinedType(IfcWasteTerminalTypeEnum::IfcWasteTerminalTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcWasteTerminalTypeEnum::ToString(v)); }
 bool IfcWasteTerminalType::is(Type::Enum v) const { return v == Type::IfcWasteTerminalType || IfcFlowTerminalType::is(v); }
 Type::Enum IfcWasteTerminalType::type() const { return Type::IfcWasteTerminalType; }
 Type::Enum IfcWasteTerminalType::Class() { return Type::IfcWasteTerminalType; }
-IfcWasteTerminalType::IfcWasteTerminalType(IfcAbstractEntityPtr e) : IfcFlowTerminalType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcWasteTerminalType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcWasteTerminalType::IfcWasteTerminalType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcWasteTerminalTypeEnum::IfcWasteTerminalTypeEnum v10_PredefinedType) : IfcFlowTerminalType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcWasteTerminalTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcWasteTerminalType::IfcWasteTerminalType(IfcAbstractEntity* e) : IfcFlowTerminalType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcWasteTerminalType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcWasteTerminalType::IfcWasteTerminalType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcWasteTerminalTypeEnum::IfcWasteTerminalTypeEnum v10_PredefinedType) : IfcFlowTerminalType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcWasteTerminalTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcWaterProperties
-bool IfcWaterProperties::hasIsPotable() { return !entity->getArgument(1)->isNull(); }
-bool IfcWaterProperties::IsPotable() { return *entity->getArgument(1); }
+bool IfcWaterProperties::hasIsPotable() const { return !entity->getArgument(1)->isNull(); }
+bool IfcWaterProperties::IsPotable() const { return *entity->getArgument(1); }
 void IfcWaterProperties::setIsPotable(bool v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-bool IfcWaterProperties::hasHardness() { return !entity->getArgument(2)->isNull(); }
-IfcIonConcentrationMeasure IfcWaterProperties::Hardness() { return *entity->getArgument(2); }
-void IfcWaterProperties::setHardness(IfcIonConcentrationMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-bool IfcWaterProperties::hasAlkalinityConcentration() { return !entity->getArgument(3)->isNull(); }
-IfcIonConcentrationMeasure IfcWaterProperties::AlkalinityConcentration() { return *entity->getArgument(3); }
-void IfcWaterProperties::setAlkalinityConcentration(IfcIonConcentrationMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-bool IfcWaterProperties::hasAcidityConcentration() { return !entity->getArgument(4)->isNull(); }
-IfcIonConcentrationMeasure IfcWaterProperties::AcidityConcentration() { return *entity->getArgument(4); }
-void IfcWaterProperties::setAcidityConcentration(IfcIonConcentrationMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-bool IfcWaterProperties::hasImpuritiesContent() { return !entity->getArgument(5)->isNull(); }
-IfcNormalisedRatioMeasure IfcWaterProperties::ImpuritiesContent() { return *entity->getArgument(5); }
-void IfcWaterProperties::setImpuritiesContent(IfcNormalisedRatioMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-bool IfcWaterProperties::hasPHLevel() { return !entity->getArgument(6)->isNull(); }
-IfcPHMeasure IfcWaterProperties::PHLevel() { return *entity->getArgument(6); }
-void IfcWaterProperties::setPHLevel(IfcPHMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
-bool IfcWaterProperties::hasDissolvedSolidsContent() { return !entity->getArgument(7)->isNull(); }
-IfcNormalisedRatioMeasure IfcWaterProperties::DissolvedSolidsContent() { return *entity->getArgument(7); }
-void IfcWaterProperties::setDissolvedSolidsContent(IfcNormalisedRatioMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
+bool IfcWaterProperties::hasHardness() const { return !entity->getArgument(2)->isNull(); }
+double IfcWaterProperties::Hardness() const { return *entity->getArgument(2); }
+void IfcWaterProperties::setHardness(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+bool IfcWaterProperties::hasAlkalinityConcentration() const { return !entity->getArgument(3)->isNull(); }
+double IfcWaterProperties::AlkalinityConcentration() const { return *entity->getArgument(3); }
+void IfcWaterProperties::setAlkalinityConcentration(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+bool IfcWaterProperties::hasAcidityConcentration() const { return !entity->getArgument(4)->isNull(); }
+double IfcWaterProperties::AcidityConcentration() const { return *entity->getArgument(4); }
+void IfcWaterProperties::setAcidityConcentration(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+bool IfcWaterProperties::hasImpuritiesContent() const { return !entity->getArgument(5)->isNull(); }
+double IfcWaterProperties::ImpuritiesContent() const { return *entity->getArgument(5); }
+void IfcWaterProperties::setImpuritiesContent(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+bool IfcWaterProperties::hasPHLevel() const { return !entity->getArgument(6)->isNull(); }
+double IfcWaterProperties::PHLevel() const { return *entity->getArgument(6); }
+void IfcWaterProperties::setPHLevel(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
+bool IfcWaterProperties::hasDissolvedSolidsContent() const { return !entity->getArgument(7)->isNull(); }
+double IfcWaterProperties::DissolvedSolidsContent() const { return *entity->getArgument(7); }
+void IfcWaterProperties::setDissolvedSolidsContent(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
 bool IfcWaterProperties::is(Type::Enum v) const { return v == Type::IfcWaterProperties || IfcMaterialProperties::is(v); }
 Type::Enum IfcWaterProperties::type() const { return Type::IfcWaterProperties; }
 Type::Enum IfcWaterProperties::Class() { return Type::IfcWaterProperties; }
-IfcWaterProperties::IfcWaterProperties(IfcAbstractEntityPtr e) : IfcMaterialProperties((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcWaterProperties)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcWaterProperties::IfcWaterProperties(IfcMaterial* v1_Material, boost::optional< bool > v2_IsPotable, boost::optional< IfcIonConcentrationMeasure > v3_Hardness, boost::optional< IfcIonConcentrationMeasure > v4_AlkalinityConcentration, boost::optional< IfcIonConcentrationMeasure > v5_AcidityConcentration, boost::optional< IfcNormalisedRatioMeasure > v6_ImpuritiesContent, boost::optional< IfcPHMeasure > v7_PHLevel, boost::optional< IfcNormalisedRatioMeasure > v8_DissolvedSolidsContent) : IfcMaterialProperties((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Material)); if (v2_IsPotable) { e->setArgument(1,(*v2_IsPotable)); } else { e->setArgument(1); } if (v3_Hardness) { e->setArgument(2,(*v3_Hardness)); } else { e->setArgument(2); } if (v4_AlkalinityConcentration) { e->setArgument(3,(*v4_AlkalinityConcentration)); } else { e->setArgument(3); } if (v5_AcidityConcentration) { e->setArgument(4,(*v5_AcidityConcentration)); } else { e->setArgument(4); } if (v6_ImpuritiesContent) { e->setArgument(5,(*v6_ImpuritiesContent)); } else { e->setArgument(5); } if (v7_PHLevel) { e->setArgument(6,(*v7_PHLevel)); } else { e->setArgument(6); } if (v8_DissolvedSolidsContent) { e->setArgument(7,(*v8_DissolvedSolidsContent)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
+IfcWaterProperties::IfcWaterProperties(IfcAbstractEntity* e) : IfcMaterialProperties((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcWaterProperties)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcWaterProperties::IfcWaterProperties(IfcMaterial* v1_Material, boost::optional< bool > v2_IsPotable, boost::optional< double > v3_Hardness, boost::optional< double > v4_AlkalinityConcentration, boost::optional< double > v5_AcidityConcentration, boost::optional< double > v6_ImpuritiesContent, boost::optional< double > v7_PHLevel, boost::optional< double > v8_DissolvedSolidsContent) : IfcMaterialProperties((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Material)); if (v2_IsPotable) { e->setArgument(1,(*v2_IsPotable)); } else { e->setArgument(1); } if (v3_Hardness) { e->setArgument(2,(*v3_Hardness)); } else { e->setArgument(2); } if (v4_AlkalinityConcentration) { e->setArgument(3,(*v4_AlkalinityConcentration)); } else { e->setArgument(3); } if (v5_AcidityConcentration) { e->setArgument(4,(*v5_AcidityConcentration)); } else { e->setArgument(4); } if (v6_ImpuritiesContent) { e->setArgument(5,(*v6_ImpuritiesContent)); } else { e->setArgument(5); } if (v7_PHLevel) { e->setArgument(6,(*v7_PHLevel)); } else { e->setArgument(6); } if (v8_DissolvedSolidsContent) { e->setArgument(7,(*v8_DissolvedSolidsContent)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcWindow
-bool IfcWindow::hasOverallHeight() { return !entity->getArgument(8)->isNull(); }
-IfcPositiveLengthMeasure IfcWindow::OverallHeight() { return *entity->getArgument(8); }
-void IfcWindow::setOverallHeight(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
-bool IfcWindow::hasOverallWidth() { return !entity->getArgument(9)->isNull(); }
-IfcPositiveLengthMeasure IfcWindow::OverallWidth() { return *entity->getArgument(9); }
-void IfcWindow::setOverallWidth(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
+bool IfcWindow::hasOverallHeight() const { return !entity->getArgument(8)->isNull(); }
+double IfcWindow::OverallHeight() const { return *entity->getArgument(8); }
+void IfcWindow::setOverallHeight(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
+bool IfcWindow::hasOverallWidth() const { return !entity->getArgument(9)->isNull(); }
+double IfcWindow::OverallWidth() const { return *entity->getArgument(9); }
+void IfcWindow::setOverallWidth(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
 bool IfcWindow::is(Type::Enum v) const { return v == Type::IfcWindow || IfcBuildingElement::is(v); }
 Type::Enum IfcWindow::type() const { return Type::IfcWindow; }
 Type::Enum IfcWindow::Class() { return Type::IfcWindow; }
-IfcWindow::IfcWindow(IfcAbstractEntityPtr e) : IfcBuildingElement((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcWindow)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcWindow::IfcWindow(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcPositiveLengthMeasure > v9_OverallHeight, boost::optional< IfcPositiveLengthMeasure > v10_OverallWidth) : IfcBuildingElement((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_OverallHeight) { e->setArgument(8,(*v9_OverallHeight)); } else { e->setArgument(8); } if (v10_OverallWidth) { e->setArgument(9,(*v10_OverallWidth)); } else { e->setArgument(9); } entity = e; EntityBuffer::Add(this); }
+IfcWindow::IfcWindow(IfcAbstractEntity* e) : IfcBuildingElement((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcWindow)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcWindow::IfcWindow(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< double > v9_OverallHeight, boost::optional< double > v10_OverallWidth) : IfcBuildingElement((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_OverallHeight) { e->setArgument(8,(*v9_OverallHeight)); } else { e->setArgument(8); } if (v10_OverallWidth) { e->setArgument(9,(*v10_OverallWidth)); } else { e->setArgument(9); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcWindowLiningProperties
-bool IfcWindowLiningProperties::hasLiningDepth() { return !entity->getArgument(4)->isNull(); }
-IfcPositiveLengthMeasure IfcWindowLiningProperties::LiningDepth() { return *entity->getArgument(4); }
-void IfcWindowLiningProperties::setLiningDepth(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-bool IfcWindowLiningProperties::hasLiningThickness() { return !entity->getArgument(5)->isNull(); }
-IfcPositiveLengthMeasure IfcWindowLiningProperties::LiningThickness() { return *entity->getArgument(5); }
-void IfcWindowLiningProperties::setLiningThickness(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-bool IfcWindowLiningProperties::hasTransomThickness() { return !entity->getArgument(6)->isNull(); }
-IfcPositiveLengthMeasure IfcWindowLiningProperties::TransomThickness() { return *entity->getArgument(6); }
-void IfcWindowLiningProperties::setTransomThickness(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
-bool IfcWindowLiningProperties::hasMullionThickness() { return !entity->getArgument(7)->isNull(); }
-IfcPositiveLengthMeasure IfcWindowLiningProperties::MullionThickness() { return *entity->getArgument(7); }
-void IfcWindowLiningProperties::setMullionThickness(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
-bool IfcWindowLiningProperties::hasFirstTransomOffset() { return !entity->getArgument(8)->isNull(); }
-IfcNormalisedRatioMeasure IfcWindowLiningProperties::FirstTransomOffset() { return *entity->getArgument(8); }
-void IfcWindowLiningProperties::setFirstTransomOffset(IfcNormalisedRatioMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
-bool IfcWindowLiningProperties::hasSecondTransomOffset() { return !entity->getArgument(9)->isNull(); }
-IfcNormalisedRatioMeasure IfcWindowLiningProperties::SecondTransomOffset() { return *entity->getArgument(9); }
-void IfcWindowLiningProperties::setSecondTransomOffset(IfcNormalisedRatioMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
-bool IfcWindowLiningProperties::hasFirstMullionOffset() { return !entity->getArgument(10)->isNull(); }
-IfcNormalisedRatioMeasure IfcWindowLiningProperties::FirstMullionOffset() { return *entity->getArgument(10); }
-void IfcWindowLiningProperties::setFirstMullionOffset(IfcNormalisedRatioMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
-bool IfcWindowLiningProperties::hasSecondMullionOffset() { return !entity->getArgument(11)->isNull(); }
-IfcNormalisedRatioMeasure IfcWindowLiningProperties::SecondMullionOffset() { return *entity->getArgument(11); }
-void IfcWindowLiningProperties::setSecondMullionOffset(IfcNormalisedRatioMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(11,v); }
-bool IfcWindowLiningProperties::hasShapeAspectStyle() { return !entity->getArgument(12)->isNull(); }
-IfcShapeAspect* IfcWindowLiningProperties::ShapeAspectStyle() { return (IfcShapeAspect*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(12))); }
+bool IfcWindowLiningProperties::hasLiningDepth() const { return !entity->getArgument(4)->isNull(); }
+double IfcWindowLiningProperties::LiningDepth() const { return *entity->getArgument(4); }
+void IfcWindowLiningProperties::setLiningDepth(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+bool IfcWindowLiningProperties::hasLiningThickness() const { return !entity->getArgument(5)->isNull(); }
+double IfcWindowLiningProperties::LiningThickness() const { return *entity->getArgument(5); }
+void IfcWindowLiningProperties::setLiningThickness(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+bool IfcWindowLiningProperties::hasTransomThickness() const { return !entity->getArgument(6)->isNull(); }
+double IfcWindowLiningProperties::TransomThickness() const { return *entity->getArgument(6); }
+void IfcWindowLiningProperties::setTransomThickness(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
+bool IfcWindowLiningProperties::hasMullionThickness() const { return !entity->getArgument(7)->isNull(); }
+double IfcWindowLiningProperties::MullionThickness() const { return *entity->getArgument(7); }
+void IfcWindowLiningProperties::setMullionThickness(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
+bool IfcWindowLiningProperties::hasFirstTransomOffset() const { return !entity->getArgument(8)->isNull(); }
+double IfcWindowLiningProperties::FirstTransomOffset() const { return *entity->getArgument(8); }
+void IfcWindowLiningProperties::setFirstTransomOffset(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
+bool IfcWindowLiningProperties::hasSecondTransomOffset() const { return !entity->getArgument(9)->isNull(); }
+double IfcWindowLiningProperties::SecondTransomOffset() const { return *entity->getArgument(9); }
+void IfcWindowLiningProperties::setSecondTransomOffset(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
+bool IfcWindowLiningProperties::hasFirstMullionOffset() const { return !entity->getArgument(10)->isNull(); }
+double IfcWindowLiningProperties::FirstMullionOffset() const { return *entity->getArgument(10); }
+void IfcWindowLiningProperties::setFirstMullionOffset(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
+bool IfcWindowLiningProperties::hasSecondMullionOffset() const { return !entity->getArgument(11)->isNull(); }
+double IfcWindowLiningProperties::SecondMullionOffset() const { return *entity->getArgument(11); }
+void IfcWindowLiningProperties::setSecondMullionOffset(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(11,v); }
+bool IfcWindowLiningProperties::hasShapeAspectStyle() const { return !entity->getArgument(12)->isNull(); }
+IfcShapeAspect* IfcWindowLiningProperties::ShapeAspectStyle() const { return (IfcShapeAspect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(12))); }
 void IfcWindowLiningProperties::setShapeAspectStyle(IfcShapeAspect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(12,v); }
 bool IfcWindowLiningProperties::is(Type::Enum v) const { return v == Type::IfcWindowLiningProperties || IfcPropertySetDefinition::is(v); }
 Type::Enum IfcWindowLiningProperties::type() const { return Type::IfcWindowLiningProperties; }
 Type::Enum IfcWindowLiningProperties::Class() { return Type::IfcWindowLiningProperties; }
-IfcWindowLiningProperties::IfcWindowLiningProperties(IfcAbstractEntityPtr e) : IfcPropertySetDefinition((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcWindowLiningProperties)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcWindowLiningProperties::IfcWindowLiningProperties(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcPositiveLengthMeasure > v5_LiningDepth, boost::optional< IfcPositiveLengthMeasure > v6_LiningThickness, boost::optional< IfcPositiveLengthMeasure > v7_TransomThickness, boost::optional< IfcPositiveLengthMeasure > v8_MullionThickness, boost::optional< IfcNormalisedRatioMeasure > v9_FirstTransomOffset, boost::optional< IfcNormalisedRatioMeasure > v10_SecondTransomOffset, boost::optional< IfcNormalisedRatioMeasure > v11_FirstMullionOffset, boost::optional< IfcNormalisedRatioMeasure > v12_SecondMullionOffset, IfcShapeAspect* v13_ShapeAspectStyle) : IfcPropertySetDefinition((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_LiningDepth) { e->setArgument(4,(*v5_LiningDepth)); } else { e->setArgument(4); } if (v6_LiningThickness) { e->setArgument(5,(*v6_LiningThickness)); } else { e->setArgument(5); } if (v7_TransomThickness) { e->setArgument(6,(*v7_TransomThickness)); } else { e->setArgument(6); } if (v8_MullionThickness) { e->setArgument(7,(*v8_MullionThickness)); } else { e->setArgument(7); } if (v9_FirstTransomOffset) { e->setArgument(8,(*v9_FirstTransomOffset)); } else { e->setArgument(8); } if (v10_SecondTransomOffset) { e->setArgument(9,(*v10_SecondTransomOffset)); } else { e->setArgument(9); } if (v11_FirstMullionOffset) { e->setArgument(10,(*v11_FirstMullionOffset)); } else { e->setArgument(10); } if (v12_SecondMullionOffset) { e->setArgument(11,(*v12_SecondMullionOffset)); } else { e->setArgument(11); } e->setArgument(12,(v13_ShapeAspectStyle)); entity = e; EntityBuffer::Add(this); }
+IfcWindowLiningProperties::IfcWindowLiningProperties(IfcAbstractEntity* e) : IfcPropertySetDefinition((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcWindowLiningProperties)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcWindowLiningProperties::IfcWindowLiningProperties(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< double > v5_LiningDepth, boost::optional< double > v6_LiningThickness, boost::optional< double > v7_TransomThickness, boost::optional< double > v8_MullionThickness, boost::optional< double > v9_FirstTransomOffset, boost::optional< double > v10_SecondTransomOffset, boost::optional< double > v11_FirstMullionOffset, boost::optional< double > v12_SecondMullionOffset, IfcShapeAspect* v13_ShapeAspectStyle) : IfcPropertySetDefinition((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_LiningDepth) { e->setArgument(4,(*v5_LiningDepth)); } else { e->setArgument(4); } if (v6_LiningThickness) { e->setArgument(5,(*v6_LiningThickness)); } else { e->setArgument(5); } if (v7_TransomThickness) { e->setArgument(6,(*v7_TransomThickness)); } else { e->setArgument(6); } if (v8_MullionThickness) { e->setArgument(7,(*v8_MullionThickness)); } else { e->setArgument(7); } if (v9_FirstTransomOffset) { e->setArgument(8,(*v9_FirstTransomOffset)); } else { e->setArgument(8); } if (v10_SecondTransomOffset) { e->setArgument(9,(*v10_SecondTransomOffset)); } else { e->setArgument(9); } if (v11_FirstMullionOffset) { e->setArgument(10,(*v11_FirstMullionOffset)); } else { e->setArgument(10); } if (v12_SecondMullionOffset) { e->setArgument(11,(*v12_SecondMullionOffset)); } else { e->setArgument(11); } e->setArgument(12,(v13_ShapeAspectStyle)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcWindowPanelProperties
-IfcWindowPanelOperationEnum::IfcWindowPanelOperationEnum IfcWindowPanelProperties::OperationType() { return IfcWindowPanelOperationEnum::FromString(*entity->getArgument(4)); }
+IfcWindowPanelOperationEnum::IfcWindowPanelOperationEnum IfcWindowPanelProperties::OperationType() const { return IfcWindowPanelOperationEnum::FromString(*entity->getArgument(4)); }
 void IfcWindowPanelProperties::setOperationType(IfcWindowPanelOperationEnum::IfcWindowPanelOperationEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v,IfcWindowPanelOperationEnum::ToString(v)); }
-IfcWindowPanelPositionEnum::IfcWindowPanelPositionEnum IfcWindowPanelProperties::PanelPosition() { return IfcWindowPanelPositionEnum::FromString(*entity->getArgument(5)); }
+IfcWindowPanelPositionEnum::IfcWindowPanelPositionEnum IfcWindowPanelProperties::PanelPosition() const { return IfcWindowPanelPositionEnum::FromString(*entity->getArgument(5)); }
 void IfcWindowPanelProperties::setPanelPosition(IfcWindowPanelPositionEnum::IfcWindowPanelPositionEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v,IfcWindowPanelPositionEnum::ToString(v)); }
-bool IfcWindowPanelProperties::hasFrameDepth() { return !entity->getArgument(6)->isNull(); }
-IfcPositiveLengthMeasure IfcWindowPanelProperties::FrameDepth() { return *entity->getArgument(6); }
-void IfcWindowPanelProperties::setFrameDepth(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
-bool IfcWindowPanelProperties::hasFrameThickness() { return !entity->getArgument(7)->isNull(); }
-IfcPositiveLengthMeasure IfcWindowPanelProperties::FrameThickness() { return *entity->getArgument(7); }
-void IfcWindowPanelProperties::setFrameThickness(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
-bool IfcWindowPanelProperties::hasShapeAspectStyle() { return !entity->getArgument(8)->isNull(); }
-IfcShapeAspect* IfcWindowPanelProperties::ShapeAspectStyle() { return (IfcShapeAspect*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(8))); }
+bool IfcWindowPanelProperties::hasFrameDepth() const { return !entity->getArgument(6)->isNull(); }
+double IfcWindowPanelProperties::FrameDepth() const { return *entity->getArgument(6); }
+void IfcWindowPanelProperties::setFrameDepth(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
+bool IfcWindowPanelProperties::hasFrameThickness() const { return !entity->getArgument(7)->isNull(); }
+double IfcWindowPanelProperties::FrameThickness() const { return *entity->getArgument(7); }
+void IfcWindowPanelProperties::setFrameThickness(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
+bool IfcWindowPanelProperties::hasShapeAspectStyle() const { return !entity->getArgument(8)->isNull(); }
+IfcShapeAspect* IfcWindowPanelProperties::ShapeAspectStyle() const { return (IfcShapeAspect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(8))); }
 void IfcWindowPanelProperties::setShapeAspectStyle(IfcShapeAspect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
 bool IfcWindowPanelProperties::is(Type::Enum v) const { return v == Type::IfcWindowPanelProperties || IfcPropertySetDefinition::is(v); }
 Type::Enum IfcWindowPanelProperties::type() const { return Type::IfcWindowPanelProperties; }
 Type::Enum IfcWindowPanelProperties::Class() { return Type::IfcWindowPanelProperties; }
-IfcWindowPanelProperties::IfcWindowPanelProperties(IfcAbstractEntityPtr e) : IfcPropertySetDefinition((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcWindowPanelProperties)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcWindowPanelProperties::IfcWindowPanelProperties(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, IfcWindowPanelOperationEnum::IfcWindowPanelOperationEnum v5_OperationType, IfcWindowPanelPositionEnum::IfcWindowPanelPositionEnum v6_PanelPosition, boost::optional< IfcPositiveLengthMeasure > v7_FrameDepth, boost::optional< IfcPositiveLengthMeasure > v8_FrameThickness, IfcShapeAspect* v9_ShapeAspectStyle) : IfcPropertySetDefinition((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,v5_OperationType,IfcWindowPanelOperationEnum::ToString(v5_OperationType)); e->setArgument(5,v6_PanelPosition,IfcWindowPanelPositionEnum::ToString(v6_PanelPosition)); if (v7_FrameDepth) { e->setArgument(6,(*v7_FrameDepth)); } else { e->setArgument(6); } if (v8_FrameThickness) { e->setArgument(7,(*v8_FrameThickness)); } else { e->setArgument(7); } e->setArgument(8,(v9_ShapeAspectStyle)); entity = e; EntityBuffer::Add(this); }
+IfcWindowPanelProperties::IfcWindowPanelProperties(IfcAbstractEntity* e) : IfcPropertySetDefinition((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcWindowPanelProperties)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcWindowPanelProperties::IfcWindowPanelProperties(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcWindowPanelOperationEnum::IfcWindowPanelOperationEnum v5_OperationType, IfcWindowPanelPositionEnum::IfcWindowPanelPositionEnum v6_PanelPosition, boost::optional< double > v7_FrameDepth, boost::optional< double > v8_FrameThickness, IfcShapeAspect* v9_ShapeAspectStyle) : IfcPropertySetDefinition((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,v5_OperationType,IfcWindowPanelOperationEnum::ToString(v5_OperationType)); e->setArgument(5,v6_PanelPosition,IfcWindowPanelPositionEnum::ToString(v6_PanelPosition)); if (v7_FrameDepth) { e->setArgument(6,(*v7_FrameDepth)); } else { e->setArgument(6); } if (v8_FrameThickness) { e->setArgument(7,(*v8_FrameThickness)); } else { e->setArgument(7); } e->setArgument(8,(v9_ShapeAspectStyle)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcWindowStyle
-IfcWindowStyleConstructionEnum::IfcWindowStyleConstructionEnum IfcWindowStyle::ConstructionType() { return IfcWindowStyleConstructionEnum::FromString(*entity->getArgument(8)); }
+IfcWindowStyleConstructionEnum::IfcWindowStyleConstructionEnum IfcWindowStyle::ConstructionType() const { return IfcWindowStyleConstructionEnum::FromString(*entity->getArgument(8)); }
 void IfcWindowStyle::setConstructionType(IfcWindowStyleConstructionEnum::IfcWindowStyleConstructionEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcWindowStyleConstructionEnum::ToString(v)); }
-IfcWindowStyleOperationEnum::IfcWindowStyleOperationEnum IfcWindowStyle::OperationType() { return IfcWindowStyleOperationEnum::FromString(*entity->getArgument(9)); }
+IfcWindowStyleOperationEnum::IfcWindowStyleOperationEnum IfcWindowStyle::OperationType() const { return IfcWindowStyleOperationEnum::FromString(*entity->getArgument(9)); }
 void IfcWindowStyle::setOperationType(IfcWindowStyleOperationEnum::IfcWindowStyleOperationEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcWindowStyleOperationEnum::ToString(v)); }
-bool IfcWindowStyle::ParameterTakesPrecedence() { return *entity->getArgument(10); }
+bool IfcWindowStyle::ParameterTakesPrecedence() const { return *entity->getArgument(10); }
 void IfcWindowStyle::setParameterTakesPrecedence(bool v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
-bool IfcWindowStyle::Sizeable() { return *entity->getArgument(11); }
+bool IfcWindowStyle::Sizeable() const { return *entity->getArgument(11); }
 void IfcWindowStyle::setSizeable(bool v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(11,v); }
 bool IfcWindowStyle::is(Type::Enum v) const { return v == Type::IfcWindowStyle || IfcTypeProduct::is(v); }
 Type::Enum IfcWindowStyle::type() const { return Type::IfcWindowStyle; }
 Type::Enum IfcWindowStyle::Class() { return Type::IfcWindowStyle; }
-IfcWindowStyle::IfcWindowStyle(IfcAbstractEntityPtr e) : IfcTypeProduct((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcWindowStyle)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcWindowStyle::IfcWindowStyle(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, IfcWindowStyleConstructionEnum::IfcWindowStyleConstructionEnum v9_ConstructionType, IfcWindowStyleOperationEnum::IfcWindowStyleOperationEnum v10_OperationType, bool v11_ParameterTakesPrecedence, bool v12_Sizeable) : IfcTypeProduct((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } e->setArgument(8,v9_ConstructionType,IfcWindowStyleConstructionEnum::ToString(v9_ConstructionType)); e->setArgument(9,v10_OperationType,IfcWindowStyleOperationEnum::ToString(v10_OperationType)); e->setArgument(10,(v11_ParameterTakesPrecedence)); e->setArgument(11,(v12_Sizeable)); entity = e; EntityBuffer::Add(this); }
+IfcWindowStyle::IfcWindowStyle(IfcAbstractEntity* e) : IfcTypeProduct((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcWindowStyle)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcWindowStyle::IfcWindowStyle(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, IfcWindowStyleConstructionEnum::IfcWindowStyleConstructionEnum v9_ConstructionType, IfcWindowStyleOperationEnum::IfcWindowStyleOperationEnum v10_OperationType, bool v11_ParameterTakesPrecedence, bool v12_Sizeable) : IfcTypeProduct((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } e->setArgument(8,v9_ConstructionType,IfcWindowStyleConstructionEnum::ToString(v9_ConstructionType)); e->setArgument(9,v10_OperationType,IfcWindowStyleOperationEnum::ToString(v10_OperationType)); e->setArgument(10,(v11_ParameterTakesPrecedence)); e->setArgument(11,(v12_Sizeable)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcWorkControl
-IfcIdentifier IfcWorkControl::Identifier() { return *entity->getArgument(5); }
-void IfcWorkControl::setIdentifier(IfcIdentifier v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-IfcDateTimeSelect IfcWorkControl::CreationDate() { return *entity->getArgument(6); }
-void IfcWorkControl::setCreationDate(IfcDateTimeSelect v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
-bool IfcWorkControl::hasCreators() { return !entity->getArgument(7)->isNull(); }
-SHARED_PTR< IfcTemplatedEntityList< IfcPerson > > IfcWorkControl::Creators() { RETURN_AS_LIST(IfcPerson,7) }
-void IfcWorkControl::setCreators(SHARED_PTR< IfcTemplatedEntityList< IfcPerson > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v->generalize()); }
-bool IfcWorkControl::hasPurpose() { return !entity->getArgument(8)->isNull(); }
-IfcLabel IfcWorkControl::Purpose() { return *entity->getArgument(8); }
-void IfcWorkControl::setPurpose(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
-bool IfcWorkControl::hasDuration() { return !entity->getArgument(9)->isNull(); }
-IfcTimeMeasure IfcWorkControl::Duration() { return *entity->getArgument(9); }
-void IfcWorkControl::setDuration(IfcTimeMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
-bool IfcWorkControl::hasTotalFloat() { return !entity->getArgument(10)->isNull(); }
-IfcTimeMeasure IfcWorkControl::TotalFloat() { return *entity->getArgument(10); }
-void IfcWorkControl::setTotalFloat(IfcTimeMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
-IfcDateTimeSelect IfcWorkControl::StartTime() { return *entity->getArgument(11); }
-void IfcWorkControl::setStartTime(IfcDateTimeSelect v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(11,v); }
-bool IfcWorkControl::hasFinishTime() { return !entity->getArgument(12)->isNull(); }
-IfcDateTimeSelect IfcWorkControl::FinishTime() { return *entity->getArgument(12); }
-void IfcWorkControl::setFinishTime(IfcDateTimeSelect v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(12,v); }
-bool IfcWorkControl::hasWorkControlType() { return !entity->getArgument(13)->isNull(); }
-IfcWorkControlTypeEnum::IfcWorkControlTypeEnum IfcWorkControl::WorkControlType() { return IfcWorkControlTypeEnum::FromString(*entity->getArgument(13)); }
+std::string IfcWorkControl::Identifier() const { return *entity->getArgument(5); }
+void IfcWorkControl::setIdentifier(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+IfcDateTimeSelect* IfcWorkControl::CreationDate() const { return (IfcDateTimeSelect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(6))); }
+void IfcWorkControl::setCreationDate(IfcDateTimeSelect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
+bool IfcWorkControl::hasCreators() const { return !entity->getArgument(7)->isNull(); }
+IfcTemplatedEntityList< IfcPerson >::ptr IfcWorkControl::Creators() const { IfcEntityList::ptr es = *entity->getArgument(7); return es->as<IfcPerson>(); }
+void IfcWorkControl::setCreators(IfcTemplatedEntityList< IfcPerson >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v->generalize()); }
+bool IfcWorkControl::hasPurpose() const { return !entity->getArgument(8)->isNull(); }
+std::string IfcWorkControl::Purpose() const { return *entity->getArgument(8); }
+void IfcWorkControl::setPurpose(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
+bool IfcWorkControl::hasDuration() const { return !entity->getArgument(9)->isNull(); }
+double IfcWorkControl::Duration() const { return *entity->getArgument(9); }
+void IfcWorkControl::setDuration(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
+bool IfcWorkControl::hasTotalFloat() const { return !entity->getArgument(10)->isNull(); }
+double IfcWorkControl::TotalFloat() const { return *entity->getArgument(10); }
+void IfcWorkControl::setTotalFloat(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
+IfcDateTimeSelect* IfcWorkControl::StartTime() const { return (IfcDateTimeSelect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(11))); }
+void IfcWorkControl::setStartTime(IfcDateTimeSelect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(11,v); }
+bool IfcWorkControl::hasFinishTime() const { return !entity->getArgument(12)->isNull(); }
+IfcDateTimeSelect* IfcWorkControl::FinishTime() const { return (IfcDateTimeSelect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(12))); }
+void IfcWorkControl::setFinishTime(IfcDateTimeSelect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(12,v); }
+bool IfcWorkControl::hasWorkControlType() const { return !entity->getArgument(13)->isNull(); }
+IfcWorkControlTypeEnum::IfcWorkControlTypeEnum IfcWorkControl::WorkControlType() const { return IfcWorkControlTypeEnum::FromString(*entity->getArgument(13)); }
 void IfcWorkControl::setWorkControlType(IfcWorkControlTypeEnum::IfcWorkControlTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(13,v,IfcWorkControlTypeEnum::ToString(v)); }
-bool IfcWorkControl::hasUserDefinedControlType() { return !entity->getArgument(14)->isNull(); }
-IfcLabel IfcWorkControl::UserDefinedControlType() { return *entity->getArgument(14); }
-void IfcWorkControl::setUserDefinedControlType(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(14,v); }
+bool IfcWorkControl::hasUserDefinedControlType() const { return !entity->getArgument(14)->isNull(); }
+std::string IfcWorkControl::UserDefinedControlType() const { return *entity->getArgument(14); }
+void IfcWorkControl::setUserDefinedControlType(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(14,v); }
 bool IfcWorkControl::is(Type::Enum v) const { return v == Type::IfcWorkControl || IfcControl::is(v); }
 Type::Enum IfcWorkControl::type() const { return Type::IfcWorkControl; }
 Type::Enum IfcWorkControl::Class() { return Type::IfcWorkControl; }
-IfcWorkControl::IfcWorkControl(IfcAbstractEntityPtr e) : IfcControl((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcWorkControl)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcWorkControl::IfcWorkControl(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcIdentifier v6_Identifier, IfcDateTimeSelect v7_CreationDate, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPerson > > > v8_Creators, boost::optional< IfcLabel > v9_Purpose, boost::optional< IfcTimeMeasure > v10_Duration, boost::optional< IfcTimeMeasure > v11_TotalFloat, IfcDateTimeSelect v12_StartTime, boost::optional< IfcDateTimeSelect > v13_FinishTime, boost::optional< IfcWorkControlTypeEnum::IfcWorkControlTypeEnum > v14_WorkControlType, boost::optional< IfcLabel > v15_UserDefinedControlType) : IfcControl((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_Identifier)); e->setArgument(6,(v7_CreationDate)); if (v8_Creators) { e->setArgument(7,(*v8_Creators)->generalize()); } else { e->setArgument(7); } if (v9_Purpose) { e->setArgument(8,(*v9_Purpose)); } else { e->setArgument(8); } if (v10_Duration) { e->setArgument(9,(*v10_Duration)); } else { e->setArgument(9); } if (v11_TotalFloat) { e->setArgument(10,(*v11_TotalFloat)); } else { e->setArgument(10); } e->setArgument(11,(v12_StartTime)); if (v13_FinishTime) { e->setArgument(12,(*v13_FinishTime)); } else { e->setArgument(12); } if (v14_WorkControlType) { e->setArgument(13,*v14_WorkControlType,IfcWorkControlTypeEnum::ToString(*v14_WorkControlType)); } else { e->setArgument(13); } if (v15_UserDefinedControlType) { e->setArgument(14,(*v15_UserDefinedControlType)); } else { e->setArgument(14); } entity = e; EntityBuffer::Add(this); }
+IfcWorkControl::IfcWorkControl(IfcAbstractEntity* e) : IfcControl((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcWorkControl)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcWorkControl::IfcWorkControl(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, std::string v6_Identifier, IfcDateTimeSelect* v7_CreationDate, boost::optional< IfcTemplatedEntityList< IfcPerson >::ptr > v8_Creators, boost::optional< std::string > v9_Purpose, boost::optional< double > v10_Duration, boost::optional< double > v11_TotalFloat, IfcDateTimeSelect* v12_StartTime, IfcDateTimeSelect* v13_FinishTime, boost::optional< IfcWorkControlTypeEnum::IfcWorkControlTypeEnum > v14_WorkControlType, boost::optional< std::string > v15_UserDefinedControlType) : IfcControl((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_Identifier)); e->setArgument(6,(v7_CreationDate)); if (v8_Creators) { e->setArgument(7,(*v8_Creators)->generalize()); } else { e->setArgument(7); } if (v9_Purpose) { e->setArgument(8,(*v9_Purpose)); } else { e->setArgument(8); } if (v10_Duration) { e->setArgument(9,(*v10_Duration)); } else { e->setArgument(9); } if (v11_TotalFloat) { e->setArgument(10,(*v11_TotalFloat)); } else { e->setArgument(10); } e->setArgument(11,(v12_StartTime)); e->setArgument(12,(v13_FinishTime)); if (v14_WorkControlType) { e->setArgument(13,*v14_WorkControlType,IfcWorkControlTypeEnum::ToString(*v14_WorkControlType)); } else { e->setArgument(13); } if (v15_UserDefinedControlType) { e->setArgument(14,(*v15_UserDefinedControlType)); } else { e->setArgument(14); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcWorkPlan
 bool IfcWorkPlan::is(Type::Enum v) const { return v == Type::IfcWorkPlan || IfcWorkControl::is(v); }
 Type::Enum IfcWorkPlan::type() const { return Type::IfcWorkPlan; }
 Type::Enum IfcWorkPlan::Class() { return Type::IfcWorkPlan; }
-IfcWorkPlan::IfcWorkPlan(IfcAbstractEntityPtr e) : IfcWorkControl((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcWorkPlan)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcWorkPlan::IfcWorkPlan(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcIdentifier v6_Identifier, IfcDateTimeSelect v7_CreationDate, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPerson > > > v8_Creators, boost::optional< IfcLabel > v9_Purpose, boost::optional< IfcTimeMeasure > v10_Duration, boost::optional< IfcTimeMeasure > v11_TotalFloat, IfcDateTimeSelect v12_StartTime, boost::optional< IfcDateTimeSelect > v13_FinishTime, boost::optional< IfcWorkControlTypeEnum::IfcWorkControlTypeEnum > v14_WorkControlType, boost::optional< IfcLabel > v15_UserDefinedControlType) : IfcWorkControl((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_Identifier)); e->setArgument(6,(v7_CreationDate)); if (v8_Creators) { e->setArgument(7,(*v8_Creators)->generalize()); } else { e->setArgument(7); } if (v9_Purpose) { e->setArgument(8,(*v9_Purpose)); } else { e->setArgument(8); } if (v10_Duration) { e->setArgument(9,(*v10_Duration)); } else { e->setArgument(9); } if (v11_TotalFloat) { e->setArgument(10,(*v11_TotalFloat)); } else { e->setArgument(10); } e->setArgument(11,(v12_StartTime)); if (v13_FinishTime) { e->setArgument(12,(*v13_FinishTime)); } else { e->setArgument(12); } if (v14_WorkControlType) { e->setArgument(13,*v14_WorkControlType,IfcWorkControlTypeEnum::ToString(*v14_WorkControlType)); } else { e->setArgument(13); } if (v15_UserDefinedControlType) { e->setArgument(14,(*v15_UserDefinedControlType)); } else { e->setArgument(14); } entity = e; EntityBuffer::Add(this); }
+IfcWorkPlan::IfcWorkPlan(IfcAbstractEntity* e) : IfcWorkControl((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcWorkPlan)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcWorkPlan::IfcWorkPlan(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, std::string v6_Identifier, IfcDateTimeSelect* v7_CreationDate, boost::optional< IfcTemplatedEntityList< IfcPerson >::ptr > v8_Creators, boost::optional< std::string > v9_Purpose, boost::optional< double > v10_Duration, boost::optional< double > v11_TotalFloat, IfcDateTimeSelect* v12_StartTime, IfcDateTimeSelect* v13_FinishTime, boost::optional< IfcWorkControlTypeEnum::IfcWorkControlTypeEnum > v14_WorkControlType, boost::optional< std::string > v15_UserDefinedControlType) : IfcWorkControl((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_Identifier)); e->setArgument(6,(v7_CreationDate)); if (v8_Creators) { e->setArgument(7,(*v8_Creators)->generalize()); } else { e->setArgument(7); } if (v9_Purpose) { e->setArgument(8,(*v9_Purpose)); } else { e->setArgument(8); } if (v10_Duration) { e->setArgument(9,(*v10_Duration)); } else { e->setArgument(9); } if (v11_TotalFloat) { e->setArgument(10,(*v11_TotalFloat)); } else { e->setArgument(10); } e->setArgument(11,(v12_StartTime)); e->setArgument(12,(v13_FinishTime)); if (v14_WorkControlType) { e->setArgument(13,*v14_WorkControlType,IfcWorkControlTypeEnum::ToString(*v14_WorkControlType)); } else { e->setArgument(13); } if (v15_UserDefinedControlType) { e->setArgument(14,(*v15_UserDefinedControlType)); } else { e->setArgument(14); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcWorkSchedule
 bool IfcWorkSchedule::is(Type::Enum v) const { return v == Type::IfcWorkSchedule || IfcWorkControl::is(v); }
 Type::Enum IfcWorkSchedule::type() const { return Type::IfcWorkSchedule; }
 Type::Enum IfcWorkSchedule::Class() { return Type::IfcWorkSchedule; }
-IfcWorkSchedule::IfcWorkSchedule(IfcAbstractEntityPtr e) : IfcWorkControl((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcWorkSchedule)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcWorkSchedule::IfcWorkSchedule(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcIdentifier v6_Identifier, IfcDateTimeSelect v7_CreationDate, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPerson > > > v8_Creators, boost::optional< IfcLabel > v9_Purpose, boost::optional< IfcTimeMeasure > v10_Duration, boost::optional< IfcTimeMeasure > v11_TotalFloat, IfcDateTimeSelect v12_StartTime, boost::optional< IfcDateTimeSelect > v13_FinishTime, boost::optional< IfcWorkControlTypeEnum::IfcWorkControlTypeEnum > v14_WorkControlType, boost::optional< IfcLabel > v15_UserDefinedControlType) : IfcWorkControl((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_Identifier)); e->setArgument(6,(v7_CreationDate)); if (v8_Creators) { e->setArgument(7,(*v8_Creators)->generalize()); } else { e->setArgument(7); } if (v9_Purpose) { e->setArgument(8,(*v9_Purpose)); } else { e->setArgument(8); } if (v10_Duration) { e->setArgument(9,(*v10_Duration)); } else { e->setArgument(9); } if (v11_TotalFloat) { e->setArgument(10,(*v11_TotalFloat)); } else { e->setArgument(10); } e->setArgument(11,(v12_StartTime)); if (v13_FinishTime) { e->setArgument(12,(*v13_FinishTime)); } else { e->setArgument(12); } if (v14_WorkControlType) { e->setArgument(13,*v14_WorkControlType,IfcWorkControlTypeEnum::ToString(*v14_WorkControlType)); } else { e->setArgument(13); } if (v15_UserDefinedControlType) { e->setArgument(14,(*v15_UserDefinedControlType)); } else { e->setArgument(14); } entity = e; EntityBuffer::Add(this); }
+IfcWorkSchedule::IfcWorkSchedule(IfcAbstractEntity* e) : IfcWorkControl((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcWorkSchedule)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcWorkSchedule::IfcWorkSchedule(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, std::string v6_Identifier, IfcDateTimeSelect* v7_CreationDate, boost::optional< IfcTemplatedEntityList< IfcPerson >::ptr > v8_Creators, boost::optional< std::string > v9_Purpose, boost::optional< double > v10_Duration, boost::optional< double > v11_TotalFloat, IfcDateTimeSelect* v12_StartTime, IfcDateTimeSelect* v13_FinishTime, boost::optional< IfcWorkControlTypeEnum::IfcWorkControlTypeEnum > v14_WorkControlType, boost::optional< std::string > v15_UserDefinedControlType) : IfcWorkControl((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_Identifier)); e->setArgument(6,(v7_CreationDate)); if (v8_Creators) { e->setArgument(7,(*v8_Creators)->generalize()); } else { e->setArgument(7); } if (v9_Purpose) { e->setArgument(8,(*v9_Purpose)); } else { e->setArgument(8); } if (v10_Duration) { e->setArgument(9,(*v10_Duration)); } else { e->setArgument(9); } if (v11_TotalFloat) { e->setArgument(10,(*v11_TotalFloat)); } else { e->setArgument(10); } e->setArgument(11,(v12_StartTime)); e->setArgument(12,(v13_FinishTime)); if (v14_WorkControlType) { e->setArgument(13,*v14_WorkControlType,IfcWorkControlTypeEnum::ToString(*v14_WorkControlType)); } else { e->setArgument(13); } if (v15_UserDefinedControlType) { e->setArgument(14,(*v15_UserDefinedControlType)); } else { e->setArgument(14); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcZShapeProfileDef
-IfcPositiveLengthMeasure IfcZShapeProfileDef::Depth() { return *entity->getArgument(3); }
-void IfcZShapeProfileDef::setDepth(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-IfcPositiveLengthMeasure IfcZShapeProfileDef::FlangeWidth() { return *entity->getArgument(4); }
-void IfcZShapeProfileDef::setFlangeWidth(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-IfcPositiveLengthMeasure IfcZShapeProfileDef::WebThickness() { return *entity->getArgument(5); }
-void IfcZShapeProfileDef::setWebThickness(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-IfcPositiveLengthMeasure IfcZShapeProfileDef::FlangeThickness() { return *entity->getArgument(6); }
-void IfcZShapeProfileDef::setFlangeThickness(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
-bool IfcZShapeProfileDef::hasFilletRadius() { return !entity->getArgument(7)->isNull(); }
-IfcPositiveLengthMeasure IfcZShapeProfileDef::FilletRadius() { return *entity->getArgument(7); }
-void IfcZShapeProfileDef::setFilletRadius(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
-bool IfcZShapeProfileDef::hasEdgeRadius() { return !entity->getArgument(8)->isNull(); }
-IfcPositiveLengthMeasure IfcZShapeProfileDef::EdgeRadius() { return *entity->getArgument(8); }
-void IfcZShapeProfileDef::setEdgeRadius(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
+double IfcZShapeProfileDef::Depth() const { return *entity->getArgument(3); }
+void IfcZShapeProfileDef::setDepth(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+double IfcZShapeProfileDef::FlangeWidth() const { return *entity->getArgument(4); }
+void IfcZShapeProfileDef::setFlangeWidth(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+double IfcZShapeProfileDef::WebThickness() const { return *entity->getArgument(5); }
+void IfcZShapeProfileDef::setWebThickness(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+double IfcZShapeProfileDef::FlangeThickness() const { return *entity->getArgument(6); }
+void IfcZShapeProfileDef::setFlangeThickness(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
+bool IfcZShapeProfileDef::hasFilletRadius() const { return !entity->getArgument(7)->isNull(); }
+double IfcZShapeProfileDef::FilletRadius() const { return *entity->getArgument(7); }
+void IfcZShapeProfileDef::setFilletRadius(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
+bool IfcZShapeProfileDef::hasEdgeRadius() const { return !entity->getArgument(8)->isNull(); }
+double IfcZShapeProfileDef::EdgeRadius() const { return *entity->getArgument(8); }
+void IfcZShapeProfileDef::setEdgeRadius(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
 bool IfcZShapeProfileDef::is(Type::Enum v) const { return v == Type::IfcZShapeProfileDef || IfcParameterizedProfileDef::is(v); }
 Type::Enum IfcZShapeProfileDef::type() const { return Type::IfcZShapeProfileDef; }
 Type::Enum IfcZShapeProfileDef::Class() { return Type::IfcZShapeProfileDef; }
-IfcZShapeProfileDef::IfcZShapeProfileDef(IfcAbstractEntityPtr e) : IfcParameterizedProfileDef((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcZShapeProfileDef)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcZShapeProfileDef::IfcZShapeProfileDef(IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< IfcLabel > v2_ProfileName, IfcAxis2Placement2D* v3_Position, IfcPositiveLengthMeasure v4_Depth, IfcPositiveLengthMeasure v5_FlangeWidth, IfcPositiveLengthMeasure v6_WebThickness, IfcPositiveLengthMeasure v7_FlangeThickness, boost::optional< IfcPositiveLengthMeasure > v8_FilletRadius, boost::optional< IfcPositiveLengthMeasure > v9_EdgeRadius) : IfcParameterizedProfileDef((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,v1_ProfileType,IfcProfileTypeEnum::ToString(v1_ProfileType)); if (v2_ProfileName) { e->setArgument(1,(*v2_ProfileName)); } else { e->setArgument(1); } e->setArgument(2,(v3_Position)); e->setArgument(3,(v4_Depth)); e->setArgument(4,(v5_FlangeWidth)); e->setArgument(5,(v6_WebThickness)); e->setArgument(6,(v7_FlangeThickness)); if (v8_FilletRadius) { e->setArgument(7,(*v8_FilletRadius)); } else { e->setArgument(7); } if (v9_EdgeRadius) { e->setArgument(8,(*v9_EdgeRadius)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcZShapeProfileDef::IfcZShapeProfileDef(IfcAbstractEntity* e) : IfcParameterizedProfileDef((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcZShapeProfileDef)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcZShapeProfileDef::IfcZShapeProfileDef(IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< std::string > v2_ProfileName, IfcAxis2Placement2D* v3_Position, double v4_Depth, double v5_FlangeWidth, double v6_WebThickness, double v7_FlangeThickness, boost::optional< double > v8_FilletRadius, boost::optional< double > v9_EdgeRadius) : IfcParameterizedProfileDef((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,v1_ProfileType,IfcProfileTypeEnum::ToString(v1_ProfileType)); if (v2_ProfileName) { e->setArgument(1,(*v2_ProfileName)); } else { e->setArgument(1); } e->setArgument(2,(v3_Position)); e->setArgument(3,(v4_Depth)); e->setArgument(4,(v5_FlangeWidth)); e->setArgument(5,(v6_WebThickness)); e->setArgument(6,(v7_FlangeThickness)); if (v8_FilletRadius) { e->setArgument(7,(*v8_FilletRadius)); } else { e->setArgument(7); } if (v9_EdgeRadius) { e->setArgument(8,(*v9_EdgeRadius)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcZone
 bool IfcZone::is(Type::Enum v) const { return v == Type::IfcZone || IfcGroup::is(v); }
 Type::Enum IfcZone::type() const { return Type::IfcZone; }
 Type::Enum IfcZone::Class() { return Type::IfcZone; }
-IfcZone::IfcZone(IfcAbstractEntityPtr e) : IfcGroup((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcZone)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcZone::IfcZone(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType) : IfcGroup((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } entity = e; EntityBuffer::Add(this); }
+IfcZone::IfcZone(IfcAbstractEntity* e) : IfcGroup((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcZone)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcZone::IfcZone(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType) : IfcGroup((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } entity = e; EntityBuffer::Add(this); }
 
 #endif
diff --git a/src/ifcparse/Ifc2x3.h b/src/ifcparse/Ifc2x3.h
index 5f65490..c4e5de2 100644
--- a/src/ifcparse/Ifc2x3.h
+++ b/src/ifcparse/Ifc2x3.h
@@ -41,5371 +41,6543 @@
 
 namespace Ifc2x3 {
 
+const char* const Identifier = "IFC2X3";
+
 // Forward definitions
-class Ifc2DCompositeCurve; class IfcActionRequest; class IfcActor; class IfcActorRole; class IfcActuatorType; class IfcAddress; class IfcAirTerminalBoxType; class IfcAirTerminalType; class IfcAirToAirHeatRecoveryType; class IfcAlarmType; class IfcAngularDimension; class IfcAnnotation; class IfcAnnotationCurveOccurrence; class IfcAnnotationFillArea; class IfcAnnotationFillAreaOccurrence; class IfcAnnotationOccurrence; class IfcAnnotationSurface; class IfcAnnotationSurfaceOccurrence; class IfcAnnotationSymbolOccurrence; class IfcAnnotationTextOccurrence; class IfcApplication; class IfcAppliedValue; class IfcAppliedValueRelationship; class IfcApproval; class IfcApprovalActorRelationship; class IfcApprovalPropertyRelationship; class IfcApprovalRelationship; class IfcArbitraryClosedProfileDef; class IfcArbitraryOpenProfileDef; class IfcArbitraryProfileDefWithVoids; class IfcAsset; class IfcAsymmetricIShapeProfileDef; class IfcAxis1Placement; class IfcAxis2Placement2D; class IfcAxis2Placement3D; class IfcBSplineCurve; class IfcBeam; class IfcBeamType; class IfcBezierCurve; class IfcBlobTexture; class IfcBlock; class IfcBoilerType; class IfcBooleanClippingResult; class IfcBooleanResult; class IfcBoundaryCondition; class IfcBoundaryEdgeCondition; class IfcBoundaryFaceCondition; class IfcBoundaryNodeCondition; class IfcBoundaryNodeConditionWarping; class IfcBoundedCurve; class IfcBoundedSurface; class IfcBoundingBox; class IfcBoxedHalfSpace; class IfcBuilding; class IfcBuildingElement; class IfcBuildingElementComponent; class IfcBuildingElementPart; class IfcBuildingElementProxy; class IfcBuildingElementProxyType; class IfcBuildingElementType; class IfcBuildingStorey; class IfcCShapeProfileDef; class IfcCableCarrierFittingType; class IfcCableCarrierSegmentType; class IfcCableSegmentType; class IfcCalendarDate; class IfcCartesianPoint; class IfcCartesianTransformationOperator; class IfcCartesianTransformationOperator2D; class IfcCartesianTransformationOperator2DnonUniform; class IfcCartesianTransformationOperator3D; class IfcCartesianTransformationOperator3DnonUniform; class IfcCenterLineProfileDef; class IfcChamferEdgeFeature; class IfcChillerType; class IfcCircle; class IfcCircleHollowProfileDef; class IfcCircleProfileDef; class IfcClassification; class IfcClassificationItem; class IfcClassificationItemRelationship; class IfcClassificationNotation; class IfcClassificationNotationFacet; class IfcClassificationReference; class IfcClosedShell; class IfcCoilType; class IfcColourRgb; class IfcColourSpecification; class IfcColumn; class IfcColumnType; class IfcComplexProperty; class IfcCompositeCurve; class IfcCompositeCurveSegment; class IfcCompositeProfileDef; class IfcCompressorType; class IfcCondenserType; class IfcCondition; class IfcConditionCriterion; class IfcConic; class IfcConnectedFaceSet; class IfcConnectionCurveGeometry; class IfcConnectionGeometry; class IfcConnectionPointEccentricity; class IfcConnectionPointGeometry; class IfcConnectionPortGeometry; class IfcConnectionSurfaceGeometry; class IfcConstraint; class IfcConstraintAggregationRelationship; class IfcConstraintClassificationRelationship; class IfcConstraintRelationship; class IfcConstructionEquipmentResource; class IfcConstructionMaterialResource; class IfcConstructionProductResource; class IfcConstructionResource; class IfcContextDependentUnit; class IfcControl; class IfcControllerType; class IfcConversionBasedUnit; class IfcCooledBeamType; class IfcCoolingTowerType; class IfcCoordinatedUniversalTimeOffset; class IfcCostItem; class IfcCostSchedule; class IfcCostValue; class IfcCovering; class IfcCoveringType; class IfcCraneRailAShapeProfileDef; class IfcCraneRailFShapeProfileDef; class IfcCrewResource; class IfcCsgPrimitive3D; class IfcCsgSolid; class IfcCurrencyRelationship; class IfcCurtainWall; class IfcCurtainWallType; class IfcCurve; class IfcCurveBoundedPlane; class IfcCurveStyle; class IfcCurveStyleFont; class IfcCurveStyleFontAndScaling; class IfcCurveStyleFontPattern; class IfcDamperType; class IfcDateAndTime; class IfcDefinedSymbol; class IfcDerivedProfileDef; class IfcDerivedUnit; class IfcDerivedUnitElement; class IfcDiameterDimension; class IfcDimensionCalloutRelationship; class IfcDimensionCurve; class IfcDimensionCurveDirectedCallout; class IfcDimensionCurveTerminator; class IfcDimensionPair; class IfcDimensionalExponents; class IfcDirection; class IfcDiscreteAccessory; class IfcDiscreteAccessoryType; class IfcDistributionChamberElement; class IfcDistributionChamberElementType; class IfcDistributionControlElement; class IfcDistributionControlElementType; class IfcDistributionElement; class IfcDistributionElementType; class IfcDistributionFlowElement; class IfcDistributionFlowElementType; class IfcDistributionPort; class IfcDocumentElectronicFormat; class IfcDocumentInformation; class IfcDocumentInformationRelationship; class IfcDocumentReference; class IfcDoor; class IfcDoorLiningProperties; class IfcDoorPanelProperties; class IfcDoorStyle; class IfcDraughtingCallout; class IfcDraughtingCalloutRelationship; class IfcDraughtingPreDefinedColour; class IfcDraughtingPreDefinedCurveFont; class IfcDraughtingPreDefinedTextFont; class IfcDuctFittingType; class IfcDuctSegmentType; class IfcDuctSilencerType; class IfcEdge; class IfcEdgeCurve; class IfcEdgeFeature; class IfcEdgeLoop; class IfcElectricApplianceType; class IfcElectricDistributionPoint; class IfcElectricFlowStorageDeviceType; class IfcElectricGeneratorType; class IfcElectricHeaterType; class IfcElectricMotorType; class IfcElectricTimeControlType; class IfcElectricalBaseProperties; class IfcElectricalCircuit; class IfcElectricalElement; class IfcElement; class IfcElementAssembly; class IfcElementComponent; class IfcElementComponentType; class IfcElementQuantity; class IfcElementType; class IfcElementarySurface; class IfcEllipse; class IfcEllipseProfileDef; class IfcEnergyConversionDevice; class IfcEnergyConversionDeviceType; class IfcEnergyProperties; class IfcEnvironmentalImpactValue; class IfcEquipmentElement; class IfcEquipmentStandard; class IfcEvaporativeCoolerType; class IfcEvaporatorType; class IfcExtendedMaterialProperties; class IfcExternalReference; class IfcExternallyDefinedHatchStyle; class IfcExternallyDefinedSurfaceStyle; class IfcExternallyDefinedSymbol; class IfcExternallyDefinedTextFont; class IfcExtrudedAreaSolid; class IfcFace; class IfcFaceBasedSurfaceModel; class IfcFaceBound; class IfcFaceOuterBound; class IfcFaceSurface; class IfcFacetedBrep; class IfcFacetedBrepWithVoids; class IfcFailureConnectionCondition; class IfcFanType; class IfcFastener; class IfcFastenerType; class IfcFeatureElement; class IfcFeatureElementAddition; class IfcFeatureElementSubtraction; class IfcFillAreaStyle; class IfcFillAreaStyleHatching; class IfcFillAreaStyleTileSymbolWithStyle; class IfcFillAreaStyleTiles; class IfcFilterType; class IfcFireSuppressionTerminalType; class IfcFlowController; class IfcFlowControllerType; class IfcFlowFitting; class IfcFlowFittingType; class IfcFlowInstrumentType; class IfcFlowMeterType; class IfcFlowMovingDevice; class IfcFlowMovingDeviceType; class IfcFlowSegment; class IfcFlowSegmentType; class IfcFlowStorageDevice; class IfcFlowStorageDeviceType; class IfcFlowTerminal; class IfcFlowTerminalType; class IfcFlowTreatmentDevice; class IfcFlowTreatmentDeviceType; class IfcFluidFlowProperties; class IfcFooting; class IfcFuelProperties; class IfcFurnishingElement; class IfcFurnishingElementType; class IfcFurnitureStandard; class IfcFurnitureType; class IfcGasTerminalType; class IfcGeneralMaterialProperties; class IfcGeneralProfileProperties; class IfcGeometricCurveSet; class IfcGeometricRepresentationContext; class IfcGeometricRepresentationItem; class IfcGeometricRepresentationSubContext; class IfcGeometricSet; class IfcGrid; class IfcGridAxis; class IfcGridPlacement; class IfcGroup; class IfcHalfSpaceSolid; class IfcHeatExchangerType; class IfcHumidifierType; class IfcHygroscopicMaterialProperties; class IfcIShapeProfileDef; class IfcImageTexture; class IfcInventory; class IfcIrregularTimeSeries; class IfcIrregularTimeSeriesValue; class IfcJunctionBoxType; class IfcLShapeProfileDef; class IfcLaborResource; class IfcLampType; class IfcLibraryInformation; class IfcLibraryReference; class IfcLightDistributionData; class IfcLightFixtureType; class IfcLightIntensityDistribution; class IfcLightSource; class IfcLightSourceAmbient; class IfcLightSourceDirectional; class IfcLightSourceGoniometric; class IfcLightSourcePositional; class IfcLightSourceSpot; class IfcLine; class IfcLinearDimension; class IfcLocalPlacement; class IfcLocalTime; class IfcLoop; class IfcManifoldSolidBrep; class IfcMappedItem; class IfcMaterial; class IfcMaterialClassificationRelationship; class IfcMaterialDefinitionRepresentation; class IfcMaterialLayer; class IfcMaterialLayerSet; class IfcMaterialLayerSetUsage; class IfcMaterialList; class IfcMaterialProperties; class IfcMeasureWithUnit; class IfcMechanicalConcreteMaterialProperties; class IfcMechanicalFastener; class IfcMechanicalFastenerType; class IfcMechanicalMaterialProperties; class IfcMechanicalSteelMaterialProperties; class IfcMember; class IfcMemberType; class IfcMetric; class IfcMonetaryUnit; class IfcMotorConnectionType; class IfcMove; class IfcNamedUnit; class IfcObject; class IfcObjectDefinition; class IfcObjectPlacement; class IfcObjective; class IfcOccupant; class IfcOffsetCurve2D; class IfcOffsetCurve3D; class IfcOneDirectionRepeatFactor; class IfcOpenShell; class IfcOpeningElement; class IfcOpticalMaterialProperties; class IfcOrderAction; class IfcOrganization; class IfcOrganizationRelationship; class IfcOrientedEdge; class IfcOutletType; class IfcOwnerHistory; class IfcParameterizedProfileDef; class IfcPath; class IfcPerformanceHistory; class IfcPermeableCoveringProperties; class IfcPermit; class IfcPerson; class IfcPersonAndOrganization; class IfcPhysicalComplexQuantity; class IfcPhysicalQuantity; class IfcPhysicalSimpleQuantity; class IfcPile; class IfcPipeFittingType; class IfcPipeSegmentType; class IfcPixelTexture; class IfcPlacement; class IfcPlanarBox; class IfcPlanarExtent; class IfcPlane; class IfcPlate; class IfcPlateType; class IfcPoint; class IfcPointOnCurve; class IfcPointOnSurface; class IfcPolyLoop; class IfcPolygonalBoundedHalfSpace; class IfcPolyline; class IfcPort; class IfcPostalAddress; class IfcPreDefinedColour; class IfcPreDefinedCurveFont; class IfcPreDefinedDimensionSymbol; class IfcPreDefinedItem; class IfcPreDefinedPointMarkerSymbol; class IfcPreDefinedSymbol; class IfcPreDefinedTerminatorSymbol; class IfcPreDefinedTextFont; class IfcPresentationLayerAssignment; class IfcPresentationLayerWithStyle; class IfcPresentationStyle; class IfcPresentationStyleAssignment; class IfcProcedure; class IfcProcess; class IfcProduct; class IfcProductDefinitionShape; class IfcProductRepresentation; class IfcProductsOfCombustionProperties; class IfcProfileDef; class IfcProfileProperties; class IfcProject; class IfcProjectOrder; class IfcProjectOrderRecord; class IfcProjectionCurve; class IfcProjectionElement; class IfcProperty; class IfcPropertyBoundedValue; class IfcPropertyConstraintRelationship; class IfcPropertyDefinition; class IfcPropertyDependencyRelationship; class IfcPropertyEnumeratedValue; class IfcPropertyEnumeration; class IfcPropertyListValue; class IfcPropertyReferenceValue; class IfcPropertySet; class IfcPropertySetDefinition; class IfcPropertySingleValue; class IfcPropertyTableValue; class IfcProtectiveDeviceType; class IfcProxy; class IfcPumpType; class IfcQuantityArea; class IfcQuantityCount; class IfcQuantityLength; class IfcQuantityTime; class IfcQuantityVolume; class IfcQuantityWeight; class IfcRadiusDimension; class IfcRailing; class IfcRailingType; class IfcRamp; class IfcRampFlight; class IfcRampFlightType; class IfcRationalBezierCurve; class IfcRectangleHollowProfileDef; class IfcRectangleProfileDef; class IfcRectangularPyramid; class IfcRectangularTrimmedSurface; class IfcReferencesValueDocument; class IfcRegularTimeSeries; class IfcReinforcementBarProperties; class IfcReinforcementDefinitionProperties; class IfcReinforcingBar; class IfcReinforcingElement; class IfcReinforcingMesh; class IfcRelAggregates; class IfcRelAssigns; class IfcRelAssignsTasks; class IfcRelAssignsToActor; class IfcRelAssignsToControl; class IfcRelAssignsToGroup; class IfcRelAssignsToProcess; class IfcRelAssignsToProduct; class IfcRelAssignsToProjectOrder; class IfcRelAssignsToResource; class IfcRelAssociates; class IfcRelAssociatesAppliedValue; class IfcRelAssociatesApproval; class IfcRelAssociatesClassification; class IfcRelAssociatesConstraint; class IfcRelAssociatesDocument; class IfcRelAssociatesLibrary; class IfcRelAssociatesMaterial; class IfcRelAssociatesProfileProperties; class IfcRelConnects; class IfcRelConnectsElements; class IfcRelConnectsPathElements; class IfcRelConnectsPortToElement; class IfcRelConnectsPorts; class IfcRelConnectsStructuralActivity; class IfcRelConnectsStructuralElement; class IfcRelConnectsStructuralMember; class IfcRelConnectsWithEccentricity; class IfcRelConnectsWithRealizingElements; class IfcRelContainedInSpatialStructure; class IfcRelCoversBldgElements; class IfcRelCoversSpaces; class IfcRelDecomposes; class IfcRelDefines; class IfcRelDefinesByProperties; class IfcRelDefinesByType; class IfcRelFillsElement; class IfcRelFlowControlElements; class IfcRelInteractionRequirements; class IfcRelNests; class IfcRelOccupiesSpaces; class IfcRelOverridesProperties; class IfcRelProjectsElement; class IfcRelReferencedInSpatialStructure; class IfcRelSchedulesCostItems; class IfcRelSequence; class IfcRelServicesBuildings; class IfcRelSpaceBoundary; class IfcRelVoidsElement; class IfcRelationship; class IfcRelaxation; class IfcRepresentation; class IfcRepresentationContext; class IfcRepresentationItem; class IfcRepresentationMap; class IfcResource; class IfcRevolvedAreaSolid; class IfcRibPlateProfileProperties; class IfcRightCircularCone; class IfcRightCircularCylinder; class IfcRoof; class IfcRoot; class IfcRoundedEdgeFeature; class IfcRoundedRectangleProfileDef; class IfcSIUnit; class IfcSanitaryTerminalType; class IfcScheduleTimeControl; class IfcSectionProperties; class IfcSectionReinforcementProperties; class IfcSectionedSpine; class IfcSensorType; class IfcServiceLife; class IfcServiceLifeFactor; class IfcShapeAspect; class IfcShapeModel; class IfcShapeRepresentation; class IfcShellBasedSurfaceModel; class IfcSimpleProperty; class IfcSite; class IfcSlab; class IfcSlabType; class IfcSlippageConnectionCondition; class IfcSolidModel; class IfcSoundProperties; class IfcSoundValue; class IfcSpace; class IfcSpaceHeaterType; class IfcSpaceProgram; class IfcSpaceThermalLoadProperties; class IfcSpaceType; class IfcSpatialStructureElement; class IfcSpatialStructureElementType; class IfcSphere; class IfcStackTerminalType; class IfcStair; class IfcStairFlight; class IfcStairFlightType; class IfcStructuralAction; class IfcStructuralActivity; class IfcStructuralAnalysisModel; class IfcStructuralConnection; class IfcStructuralConnectionCondition; class IfcStructuralCurveConnection; class IfcStructuralCurveMember; class IfcStructuralCurveMemberVarying; class IfcStructuralItem; class IfcStructuralLinearAction; class IfcStructuralLinearActionVarying; class IfcStructuralLoad; class IfcStructuralLoadGroup; class IfcStructuralLoadLinearForce; class IfcStructuralLoadPlanarForce; class IfcStructuralLoadSingleDisplacement; class IfcStructuralLoadSingleDisplacementDistortion; class IfcStructuralLoadSingleForce; class IfcStructuralLoadSingleForceWarping; class IfcStructuralLoadStatic; class IfcStructuralLoadTemperature; class IfcStructuralMember; class IfcStructuralPlanarAction; class IfcStructuralPlanarActionVarying; class IfcStructuralPointAction; class IfcStructuralPointConnection; class IfcStructuralPointReaction; class IfcStructuralProfileProperties; class IfcStructuralReaction; class IfcStructuralResultGroup; class IfcStructuralSteelProfileProperties; class IfcStructuralSurfaceConnection; class IfcStructuralSurfaceMember; class IfcStructuralSurfaceMemberVarying; class IfcStructuredDimensionCallout; class IfcStyleModel; class IfcStyledItem; class IfcStyledRepresentation; class IfcSubContractResource; class IfcSubedge; class IfcSurface; class IfcSurfaceCurveSweptAreaSolid; class IfcSurfaceOfLinearExtrusion; class IfcSurfaceOfRevolution; class IfcSurfaceStyle; class IfcSurfaceStyleLighting; class IfcSurfaceStyleRefraction; class IfcSurfaceStyleRendering; class IfcSurfaceStyleShading; class IfcSurfaceStyleWithTextures; class IfcSurfaceTexture; class IfcSweptAreaSolid; class IfcSweptDiskSolid; class IfcSweptSurface; class IfcSwitchingDeviceType; class IfcSymbolStyle; class IfcSystem; class IfcSystemFurnitureElementType; class IfcTShapeProfileDef; class IfcTable; class IfcTableRow; class IfcTankType; class IfcTask; class IfcTelecomAddress; class IfcTendon; class IfcTendonAnchor; class IfcTerminatorSymbol; class IfcTextLiteral; class IfcTextLiteralWithExtent; class IfcTextStyle; class IfcTextStyleFontModel; class IfcTextStyleForDefinedFont; class IfcTextStyleTextModel; class IfcTextStyleWithBoxCharacteristics; class IfcTextureCoordinate; class IfcTextureCoordinateGenerator; class IfcTextureMap; class IfcTextureVertex; class IfcThermalMaterialProperties; class IfcTimeSeries; class IfcTimeSeriesReferenceRelationship; class IfcTimeSeriesSchedule; class IfcTimeSeriesValue; class IfcTopologicalRepresentationItem; class IfcTopologyRepresentation; class IfcTransformerType; class IfcTransportElement; class IfcTransportElementType; class IfcTrapeziumProfileDef; class IfcTrimmedCurve; class IfcTubeBundleType; class IfcTwoDirectionRepeatFactor; class IfcTypeObject; class IfcTypeProduct; class IfcUShapeProfileDef; class IfcUnitAssignment; class IfcUnitaryEquipmentType; class IfcValveType; class IfcVector; class IfcVertex; class IfcVertexBasedTextureMap; class IfcVertexLoop; class IfcVertexPoint; class IfcVibrationIsolatorType; class IfcVirtualElement; class IfcVirtualGridIntersection; class IfcWall; class IfcWallStandardCase; class IfcWallType; class IfcWasteTerminalType; class IfcWaterProperties; class IfcWindow; class IfcWindowLiningProperties; class IfcWindowPanelProperties; class IfcWindowStyle; class IfcWorkControl; class IfcWorkPlan; class IfcWorkSchedule; class IfcZShapeProfileDef; class IfcZone; 
+class Ifc2DCompositeCurve; class IfcActionRequest; class IfcActor; class IfcActorRole; class IfcActuatorType; class IfcAddress; class IfcAirTerminalBoxType; class IfcAirTerminalType; class IfcAirToAirHeatRecoveryType; class IfcAlarmType; class IfcAngularDimension; class IfcAnnotation; class IfcAnnotationCurveOccurrence; class IfcAnnotationFillArea; class IfcAnnotationFillAreaOccurrence; class IfcAnnotationOccurrence; class IfcAnnotationSurface; class IfcAnnotationSurfaceOccurrence; class IfcAnnotationSymbolOccurrence; class IfcAnnotationTextOccurrence; class IfcApplication; class IfcAppliedValue; class IfcAppliedValueRelationship; class IfcApproval; class IfcApprovalActorRelationship; class IfcApprovalPropertyRelationship; class IfcApprovalRelationship; class IfcArbitraryClosedProfileDef; class IfcArbitraryOpenProfileDef; class IfcArbitraryProfileDefWithVoids; class IfcAsset; class IfcAsymmetricIShapeProfileDef; class IfcAxis1Placement; class IfcAxis2Placement2D; class IfcAxis2Placement3D; class IfcBSplineCurve; class IfcBeam; class IfcBeamType; class IfcBezierCurve; class IfcBlobTexture; class IfcBlock; class IfcBoilerType; class IfcBooleanClippingResult; class IfcBooleanResult; class IfcBoundaryCondition; class IfcBoundaryEdgeCondition; class IfcBoundaryFaceCondition; class IfcBoundaryNodeCondition; class IfcBoundaryNodeConditionWarping; class IfcBoundedCurve; class IfcBoundedSurface; class IfcBoundingBox; class IfcBoxedHalfSpace; class IfcBuilding; class IfcBuildingElement; class IfcBuildingElementComponent; class IfcBuildingElementPart; class IfcBuildingElementProxy; class IfcBuildingElementProxyType; class IfcBuildingElementType; class IfcBuildingStorey; class IfcCShapeProfileDef; class IfcCableCarrierFittingType; class IfcCableCarrierSegmentType; class IfcCableSegmentType; class IfcCalendarDate; class IfcCartesianPoint; class IfcCartesianTransformationOperator; class IfcCartesianTransformationOperator2D; class IfcCartesianTransformationOperator2DnonUniform; class IfcCartesianTransformationOperator3D; class IfcCartesianTransformationOperator3DnonUniform; class IfcCenterLineProfileDef; class IfcChamferEdgeFeature; class IfcChillerType; class IfcCircle; class IfcCircleHollowProfileDef; class IfcCircleProfileDef; class IfcClassification; class IfcClassificationItem; class IfcClassificationItemRelationship; class IfcClassificationNotation; class IfcClassificationNotationFacet; class IfcClassificationReference; class IfcClosedShell; class IfcCoilType; class IfcColourRgb; class IfcColourSpecification; class IfcColumn; class IfcColumnType; class IfcComplexProperty; class IfcCompositeCurve; class IfcCompositeCurveSegment; class IfcCompositeProfileDef; class IfcCompressorType; class IfcCondenserType; class IfcCondition; class IfcConditionCriterion; class IfcConic; class IfcConnectedFaceSet; class IfcConnectionCurveGeometry; class IfcConnectionGeometry; class IfcConnectionPointEccentricity; class IfcConnectionPointGeometry; class IfcConnectionPortGeometry; class IfcConnectionSurfaceGeometry; class IfcConstraint; class IfcConstraintAggregationRelationship; class IfcConstraintClassificationRelationship; class IfcConstraintRelationship; class IfcConstructionEquipmentResource; class IfcConstructionMaterialResource; class IfcConstructionProductResource; class IfcConstructionResource; class IfcContextDependentUnit; class IfcControl; class IfcControllerType; class IfcConversionBasedUnit; class IfcCooledBeamType; class IfcCoolingTowerType; class IfcCoordinatedUniversalTimeOffset; class IfcCostItem; class IfcCostSchedule; class IfcCostValue; class IfcCovering; class IfcCoveringType; class IfcCraneRailAShapeProfileDef; class IfcCraneRailFShapeProfileDef; class IfcCrewResource; class IfcCsgPrimitive3D; class IfcCsgSolid; class IfcCurrencyRelationship; class IfcCurtainWall; class IfcCurtainWallType; class IfcCurve; class IfcCurveBoundedPlane; class IfcCurveStyle; class IfcCurveStyleFont; class IfcCurveStyleFontAndScaling; class IfcCurveStyleFontPattern; class IfcDamperType; class IfcDateAndTime; class IfcDefinedSymbol; class IfcDerivedProfileDef; class IfcDerivedUnit; class IfcDerivedUnitElement; class IfcDiameterDimension; class IfcDimensionCalloutRelationship; class IfcDimensionCurve; class IfcDimensionCurveDirectedCallout; class IfcDimensionCurveTerminator; class IfcDimensionPair; class IfcDimensionalExponents; class IfcDirection; class IfcDiscreteAccessory; class IfcDiscreteAccessoryType; class IfcDistributionChamberElement; class IfcDistributionChamberElementType; class IfcDistributionControlElement; class IfcDistributionControlElementType; class IfcDistributionElement; class IfcDistributionElementType; class IfcDistributionFlowElement; class IfcDistributionFlowElementType; class IfcDistributionPort; class IfcDocumentElectronicFormat; class IfcDocumentInformation; class IfcDocumentInformationRelationship; class IfcDocumentReference; class IfcDoor; class IfcDoorLiningProperties; class IfcDoorPanelProperties; class IfcDoorStyle; class IfcDraughtingCallout; class IfcDraughtingCalloutRelationship; class IfcDraughtingPreDefinedColour; class IfcDraughtingPreDefinedCurveFont; class IfcDraughtingPreDefinedTextFont; class IfcDuctFittingType; class IfcDuctSegmentType; class IfcDuctSilencerType; class IfcEdge; class IfcEdgeCurve; class IfcEdgeFeature; class IfcEdgeLoop; class IfcElectricApplianceType; class IfcElectricDistributionPoint; class IfcElectricFlowStorageDeviceType; class IfcElectricGeneratorType; class IfcElectricHeaterType; class IfcElectricMotorType; class IfcElectricTimeControlType; class IfcElectricalBaseProperties; class IfcElectricalCircuit; class IfcElectricalElement; class IfcElement; class IfcElementAssembly; class IfcElementComponent; class IfcElementComponentType; class IfcElementQuantity; class IfcElementType; class IfcElementarySurface; class IfcEllipse; class IfcEllipseProfileDef; class IfcEnergyConversionDevice; class IfcEnergyConversionDeviceType; class IfcEnergyProperties; class IfcEnvironmentalImpactValue; class IfcEquipmentElement; class IfcEquipmentStandard; class IfcEvaporativeCoolerType; class IfcEvaporatorType; class IfcExtendedMaterialProperties; class IfcExternalReference; class IfcExternallyDefinedHatchStyle; class IfcExternallyDefinedSurfaceStyle; class IfcExternallyDefinedSymbol; class IfcExternallyDefinedTextFont; class IfcExtrudedAreaSolid; class IfcFace; class IfcFaceBasedSurfaceModel; class IfcFaceBound; class IfcFaceOuterBound; class IfcFaceSurface; class IfcFacetedBrep; class IfcFacetedBrepWithVoids; class IfcFailureConnectionCondition; class IfcFanType; class IfcFastener; class IfcFastenerType; class IfcFeatureElement; class IfcFeatureElementAddition; class IfcFeatureElementSubtraction; class IfcFillAreaStyle; class IfcFillAreaStyleHatching; class IfcFillAreaStyleTileSymbolWithStyle; class IfcFillAreaStyleTiles; class IfcFilterType; class IfcFireSuppressionTerminalType; class IfcFlowController; class IfcFlowControllerType; class IfcFlowFitting; class IfcFlowFittingType; class IfcFlowInstrumentType; class IfcFlowMeterType; class IfcFlowMovingDevice; class IfcFlowMovingDeviceType; class IfcFlowSegment; class IfcFlowSegmentType; class IfcFlowStorageDevice; class IfcFlowStorageDeviceType; class IfcFlowTerminal; class IfcFlowTerminalType; class IfcFlowTreatmentDevice; class IfcFlowTreatmentDeviceType; class IfcFluidFlowProperties; class IfcFooting; class IfcFuelProperties; class IfcFurnishingElement; class IfcFurnishingElementType; class IfcFurnitureStandard; class IfcFurnitureType; class IfcGasTerminalType; class IfcGeneralMaterialProperties; class IfcGeneralProfileProperties; class IfcGeometricCurveSet; class IfcGeometricRepresentationContext; class IfcGeometricRepresentationItem; class IfcGeometricRepresentationSubContext; class IfcGeometricSet; class IfcGrid; class IfcGridAxis; class IfcGridPlacement; class IfcGroup; class IfcHalfSpaceSolid; class IfcHeatExchangerType; class IfcHumidifierType; class IfcHygroscopicMaterialProperties; class IfcIShapeProfileDef; class IfcImageTexture; class IfcInventory; class IfcIrregularTimeSeries; class IfcIrregularTimeSeriesValue; class IfcJunctionBoxType; class IfcLShapeProfileDef; class IfcLaborResource; class IfcLampType; class IfcLibraryInformation; class IfcLibraryReference; class IfcLightDistributionData; class IfcLightFixtureType; class IfcLightIntensityDistribution; class IfcLightSource; class IfcLightSourceAmbient; class IfcLightSourceDirectional; class IfcLightSourceGoniometric; class IfcLightSourcePositional; class IfcLightSourceSpot; class IfcLine; class IfcLinearDimension; class IfcLocalPlacement; class IfcLocalTime; class IfcLoop; class IfcManifoldSolidBrep; class IfcMappedItem; class IfcMaterial; class IfcMaterialClassificationRelationship; class IfcMaterialDefinitionRepresentation; class IfcMaterialLayer; class IfcMaterialLayerSet; class IfcMaterialLayerSetUsage; class IfcMaterialList; class IfcMaterialProperties; class IfcMeasureWithUnit; class IfcMechanicalConcreteMaterialProperties; class IfcMechanicalFastener; class IfcMechanicalFastenerType; class IfcMechanicalMaterialProperties; class IfcMechanicalSteelMaterialProperties; class IfcMember; class IfcMemberType; class IfcMetric; class IfcMonetaryUnit; class IfcMotorConnectionType; class IfcMove; class IfcNamedUnit; class IfcObject; class IfcObjectDefinition; class IfcObjectPlacement; class IfcObjective; class IfcOccupant; class IfcOffsetCurve2D; class IfcOffsetCurve3D; class IfcOneDirectionRepeatFactor; class IfcOpenShell; class IfcOpeningElement; class IfcOpticalMaterialProperties; class IfcOrderAction; class IfcOrganization; class IfcOrganizationRelationship; class IfcOrientedEdge; class IfcOutletType; class IfcOwnerHistory; class IfcParameterizedProfileDef; class IfcPath; class IfcPerformanceHistory; class IfcPermeableCoveringProperties; class IfcPermit; class IfcPerson; class IfcPersonAndOrganization; class IfcPhysicalComplexQuantity; class IfcPhysicalQuantity; class IfcPhysicalSimpleQuantity; class IfcPile; class IfcPipeFittingType; class IfcPipeSegmentType; class IfcPixelTexture; class IfcPlacement; class IfcPlanarBox; class IfcPlanarExtent; class IfcPlane; class IfcPlate; class IfcPlateType; class IfcPoint; class IfcPointOnCurve; class IfcPointOnSurface; class IfcPolyLoop; class IfcPolygonalBoundedHalfSpace; class IfcPolyline; class IfcPort; class IfcPostalAddress; class IfcPreDefinedColour; class IfcPreDefinedCurveFont; class IfcPreDefinedDimensionSymbol; class IfcPreDefinedItem; class IfcPreDefinedPointMarkerSymbol; class IfcPreDefinedSymbol; class IfcPreDefinedTerminatorSymbol; class IfcPreDefinedTextFont; class IfcPresentationLayerAssignment; class IfcPresentationLayerWithStyle; class IfcPresentationStyle; class IfcPresentationStyleAssignment; class IfcProcedure; class IfcProcess; class IfcProduct; class IfcProductDefinitionShape; class IfcProductRepresentation; class IfcProductsOfCombustionProperties; class IfcProfileDef; class IfcProfileProperties; class IfcProject; class IfcProjectOrder; class IfcProjectOrderRecord; class IfcProjectionCurve; class IfcProjectionElement; class IfcProperty; class IfcPropertyBoundedValue; class IfcPropertyConstraintRelationship; class IfcPropertyDefinition; class IfcPropertyDependencyRelationship; class IfcPropertyEnumeratedValue; class IfcPropertyEnumeration; class IfcPropertyListValue; class IfcPropertyReferenceValue; class IfcPropertySet; class IfcPropertySetDefinition; class IfcPropertySingleValue; class IfcPropertyTableValue; class IfcProtectiveDeviceType; class IfcProxy; class IfcPumpType; class IfcQuantityArea; class IfcQuantityCount; class IfcQuantityLength; class IfcQuantityTime; class IfcQuantityVolume; class IfcQuantityWeight; class IfcRadiusDimension; class IfcRailing; class IfcRailingType; class IfcRamp; class IfcRampFlight; class IfcRampFlightType; class IfcRationalBezierCurve; class IfcRectangleHollowProfileDef; class IfcRectangleProfileDef; class IfcRectangularPyramid; class IfcRectangularTrimmedSurface; class IfcReferencesValueDocument; class IfcRegularTimeSeries; class IfcReinforcementBarProperties; class IfcReinforcementDefinitionProperties; class IfcReinforcingBar; class IfcReinforcingElement; class IfcReinforcingMesh; class IfcRelAggregates; class IfcRelAssigns; class IfcRelAssignsTasks; class IfcRelAssignsToActor; class IfcRelAssignsToControl; class IfcRelAssignsToGroup; class IfcRelAssignsToProcess; class IfcRelAssignsToProduct; class IfcRelAssignsToProjectOrder; class IfcRelAssignsToResource; class IfcRelAssociates; class IfcRelAssociatesAppliedValue; class IfcRelAssociatesApproval; class IfcRelAssociatesClassification; class IfcRelAssociatesConstraint; class IfcRelAssociatesDocument; class IfcRelAssociatesLibrary; class IfcRelAssociatesMaterial; class IfcRelAssociatesProfileProperties; class IfcRelConnects; class IfcRelConnectsElements; class IfcRelConnectsPathElements; class IfcRelConnectsPortToElement; class IfcRelConnectsPorts; class IfcRelConnectsStructuralActivity; class IfcRelConnectsStructuralElement; class IfcRelConnectsStructuralMember; class IfcRelConnectsWithEccentricity; class IfcRelConnectsWithRealizingElements; class IfcRelContainedInSpatialStructure; class IfcRelCoversBldgElements; class IfcRelCoversSpaces; class IfcRelDecomposes; class IfcRelDefines; class IfcRelDefinesByProperties; class IfcRelDefinesByType; class IfcRelFillsElement; class IfcRelFlowControlElements; class IfcRelInteractionRequirements; class IfcRelNests; class IfcRelOccupiesSpaces; class IfcRelOverridesProperties; class IfcRelProjectsElement; class IfcRelReferencedInSpatialStructure; class IfcRelSchedulesCostItems; class IfcRelSequence; class IfcRelServicesBuildings; class IfcRelSpaceBoundary; class IfcRelVoidsElement; class IfcRelationship; class IfcRelaxation; class IfcRepresentation; class IfcRepresentationContext; class IfcRepresentationItem; class IfcRepresentationMap; class IfcResource; class IfcRevolvedAreaSolid; class IfcRibPlateProfileProperties; class IfcRightCircularCone; class IfcRightCircularCylinder; class IfcRoof; class IfcRoot; class IfcRoundedEdgeFeature; class IfcRoundedRectangleProfileDef; class IfcSIUnit; class IfcSanitaryTerminalType; class IfcScheduleTimeControl; class IfcSectionProperties; class IfcSectionReinforcementProperties; class IfcSectionedSpine; class IfcSensorType; class IfcServiceLife; class IfcServiceLifeFactor; class IfcShapeAspect; class IfcShapeModel; class IfcShapeRepresentation; class IfcShellBasedSurfaceModel; class IfcSimpleProperty; class IfcSite; class IfcSlab; class IfcSlabType; class IfcSlippageConnectionCondition; class IfcSolidModel; class IfcSoundProperties; class IfcSoundValue; class IfcSpace; class IfcSpaceHeaterType; class IfcSpaceProgram; class IfcSpaceThermalLoadProperties; class IfcSpaceType; class IfcSpatialStructureElement; class IfcSpatialStructureElementType; class IfcSphere; class IfcStackTerminalType; class IfcStair; class IfcStairFlight; class IfcStairFlightType; class IfcStructuralAction; class IfcStructuralActivity; class IfcStructuralAnalysisModel; class IfcStructuralConnection; class IfcStructuralConnectionCondition; class IfcStructuralCurveConnection; class IfcStructuralCurveMember; class IfcStructuralCurveMemberVarying; class IfcStructuralItem; class IfcStructuralLinearAction; class IfcStructuralLinearActionVarying; class IfcStructuralLoad; class IfcStructuralLoadGroup; class IfcStructuralLoadLinearForce; class IfcStructuralLoadPlanarForce; class IfcStructuralLoadSingleDisplacement; class IfcStructuralLoadSingleDisplacementDistortion; class IfcStructuralLoadSingleForce; class IfcStructuralLoadSingleForceWarping; class IfcStructuralLoadStatic; class IfcStructuralLoadTemperature; class IfcStructuralMember; class IfcStructuralPlanarAction; class IfcStructuralPlanarActionVarying; class IfcStructuralPointAction; class IfcStructuralPointConnection; class IfcStructuralPointReaction; class IfcStructuralProfileProperties; class IfcStructuralReaction; class IfcStructuralResultGroup; class IfcStructuralSteelProfileProperties; class IfcStructuralSurfaceConnection; class IfcStructuralSurfaceMember; class IfcStructuralSurfaceMemberVarying; class IfcStructuredDimensionCallout; class IfcStyleModel; class IfcStyledItem; class IfcStyledRepresentation; class IfcSubContractResource; class IfcSubedge; class IfcSurface; class IfcSurfaceCurveSweptAreaSolid; class IfcSurfaceOfLinearExtrusion; class IfcSurfaceOfRevolution; class IfcSurfaceStyle; class IfcSurfaceStyleLighting; class IfcSurfaceStyleRefraction; class IfcSurfaceStyleRendering; class IfcSurfaceStyleShading; class IfcSurfaceStyleWithTextures; class IfcSurfaceTexture; class IfcSweptAreaSolid; class IfcSweptDiskSolid; class IfcSweptSurface; class IfcSwitchingDeviceType; class IfcSymbolStyle; class IfcSystem; class IfcSystemFurnitureElementType; class IfcTShapeProfileDef; class IfcTable; class IfcTableRow; class IfcTankType; class IfcTask; class IfcTelecomAddress; class IfcTendon; class IfcTendonAnchor; class IfcTerminatorSymbol; class IfcTextLiteral; class IfcTextLiteralWithExtent; class IfcTextStyle; class IfcTextStyleFontModel; class IfcTextStyleForDefinedFont; class IfcTextStyleTextModel; class IfcTextStyleWithBoxCharacteristics; class IfcTextureCoordinate; class IfcTextureCoordinateGenerator; class IfcTextureMap; class IfcTextureVertex; class IfcThermalMaterialProperties; class IfcTimeSeries; class IfcTimeSeriesReferenceRelationship; class IfcTimeSeriesSchedule; class IfcTimeSeriesValue; class IfcTopologicalRepresentationItem; class IfcTopologyRepresentation; class IfcTransformerType; class IfcTransportElement; class IfcTransportElementType; class IfcTrapeziumProfileDef; class IfcTrimmedCurve; class IfcTubeBundleType; class IfcTwoDirectionRepeatFactor; class IfcTypeObject; class IfcTypeProduct; class IfcUShapeProfileDef; class IfcUnitAssignment; class IfcUnitaryEquipmentType; class IfcValveType; class IfcVector; class IfcVertex; class IfcVertexBasedTextureMap; class IfcVertexLoop; class IfcVertexPoint; class IfcVibrationIsolatorType; class IfcVirtualElement; class IfcVirtualGridIntersection; class IfcWall; class IfcWallStandardCase; class IfcWallType; class IfcWasteTerminalType; class IfcWaterProperties; class IfcWindow; class IfcWindowLiningProperties; class IfcWindowPanelProperties; class IfcWindowStyle; class IfcWorkControl; class IfcWorkPlan; class IfcWorkSchedule; class IfcZShapeProfileDef; class IfcZone; class IfcAbsorbedDoseMeasure; class IfcAccelerationMeasure; class IfcAmountOfSubstanceMeasure; class IfcAngularVelocityMeasure; class IfcAreaMeasure; class IfcBoolean; class IfcBoxAlignment; class IfcComplexNumber; class IfcCompoundPlaneAngleMeasure; class IfcContextDependentMeasure; class IfcCountMeasure; class IfcCurvatureMeasure; class IfcDayInMonthNumber; class IfcDaylightSavingHour; class IfcDescriptiveMeasure; class IfcDimensionCount; class IfcDoseEquivalentMeasure; class IfcDynamicViscosityMeasure; class IfcElectricCapacitanceMeasure; class IfcElectricChargeMeasure; class IfcElectricConductanceMeasure; class IfcElectricCurrentMeasure; class IfcElectricResistanceMeasure; class IfcElectricVoltageMeasure; class IfcEnergyMeasure; class IfcFontStyle; class IfcFontVariant; class IfcFontWeight; class IfcForceMeasure; class IfcFrequencyMeasure; class IfcGloballyUniqueId; class IfcHeatFluxDensityMeasure; class IfcHeatingValueMeasure; class IfcHourInDay; class IfcIdentifier; class IfcIlluminanceMeasure; class IfcInductanceMeasure; class IfcInteger; class IfcIntegerCountRateMeasure; class IfcIonConcentrationMeasure; class IfcIsothermalMoistureCapacityMeasure; class IfcKinematicViscosityMeasure; class IfcLabel; class IfcLengthMeasure; class IfcLinearForceMeasure; class IfcLinearMomentMeasure; class IfcLinearStiffnessMeasure; class IfcLinearVelocityMeasure; class IfcLogical; class IfcLuminousFluxMeasure; class IfcLuminousIntensityDistributionMeasure; class IfcLuminousIntensityMeasure; class IfcMagneticFluxDensityMeasure; class IfcMagneticFluxMeasure; class IfcMassDensityMeasure; class IfcMassFlowRateMeasure; class IfcMassMeasure; class IfcMassPerLengthMeasure; class IfcMinuteInHour; class IfcModulusOfElasticityMeasure; class IfcModulusOfLinearSubgradeReactionMeasure; class IfcModulusOfRotationalSubgradeReactionMeasure; class IfcModulusOfSubgradeReactionMeasure; class IfcMoistureDiffusivityMeasure; class IfcMolecularWeightMeasure; class IfcMomentOfInertiaMeasure; class IfcMonetaryMeasure; class IfcMonthInYearNumber; class IfcNormalisedRatioMeasure; class IfcNumericMeasure; class IfcPHMeasure; class IfcParameterValue; class IfcPlanarForceMeasure; class IfcPlaneAngleMeasure; class IfcPositiveLengthMeasure; class IfcPositivePlaneAngleMeasure; class IfcPositiveRatioMeasure; class IfcPowerMeasure; class IfcPresentableText; class IfcPressureMeasure; class IfcRadioActivityMeasure; class IfcRatioMeasure; class IfcReal; class IfcRotationalFrequencyMeasure; class IfcRotationalMassMeasure; class IfcRotationalStiffnessMeasure; class IfcSecondInMinute; class IfcSectionModulusMeasure; class IfcSectionalAreaIntegralMeasure; class IfcShearModulusMeasure; class IfcSolidAngleMeasure; class IfcSoundPowerMeasure; class IfcSoundPressureMeasure; class IfcSpecificHeatCapacityMeasure; class IfcSpecularExponent; class IfcSpecularRoughness; class IfcTemperatureGradientMeasure; class IfcText; class IfcTextAlignment; class IfcTextDecoration; class IfcTextFontName; class IfcTextTransformation; class IfcThermalAdmittanceMeasure; class IfcThermalConductivityMeasure; class IfcThermalExpansionCoefficientMeasure; class IfcThermalResistanceMeasure; class IfcThermalTransmittanceMeasure; class IfcThermodynamicTemperatureMeasure; class IfcTimeMeasure; class IfcTimeStamp; class IfcTorqueMeasure; class IfcVaporPermeabilityMeasure; class IfcVolumeMeasure; class IfcVolumetricFlowRateMeasure; class IfcWarpingConstantMeasure; class IfcWarpingMomentMeasure; class IfcYearNumber; 
 
-/// IfcAbsorbedDoseMeasure is a measure of the absorbed radioactivity dose.
-/// Usually measured in Gray (Gy, J/kg).
-/// Type: REAL
-/// 
-/// HISTORY New type in IFC Release 2x.
-typedef double IfcAbsorbedDoseMeasure;
-/// IfcAccelerationMeasure is a measure of acceleration.
-/// Usually measured in m/s2.
-/// Type: REAL
+/// The actor select type allows a person, or an organization, or a person associated with an organization to be referenced.
 /// 
-/// HISTORY New type in IFC Release 2x.
-typedef double IfcAccelerationMeasure;
-/// Definition from ISO/CD 10303-41:1992: An amount of substance measure is the value for the quantity  of a substance when compared with the number of atoms in 0.012kilogram of carbon 12.
+/// NOTE Corresponds to the following entity in ISO 10303-41: person_organization_select.
 /// 
-/// Usually measure in mole (mol).
-/// Type: REAL
+/// HISTORY New entity in IFC Release 1.5.1
 /// 
-/// NOTE Corresponding ISO 10303 name: amount_of_substance_measure, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
+/// SELECT 
 /// 
-/// HISTORY New type in IFC Release 1.5.1.
-typedef double IfcAmountOfSubstanceMeasure;
-/// IfcAngularVelocityMeasure is a measure of the velocity of a body measured in terms of angle subtended per unit time.
-/// Usually measured in radians/s.
-/// Type: REAL
+/// IfcOrganization An organization. 
+/// IfcPerson A person. 
+/// IfcPersonAndOrganization A person related to an organization.
+typedef IfcUtil::IfcBaseClass IfcActorSelect;
+/// IfcAppliedValueSelect defines the selection of whether a value (expressed as a ratio) or an amount should be used as the value for an IfcAppliedValue. 
 /// 
-/// HISTORY New type in IFC Release 2.0.
-typedef double IfcAngularVelocityMeasure;
-/// Definition from ISO/CD 10303-41:1992: An area measure is the value of the extent of a surface.
-/// Usually measured in square metre (m2).
-/// Type: REAL
+/// Select from:  
 /// 
-/// NOTE Corresponding ISO 10303 name: area_measure, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
+/// IfcMeasureWithUnit 
+///   IfcMonetaryMeasure 
+///   IfcRatioMeasure 
 /// 
-/// HISTORY New type in IFC Release 1.5.1.
-typedef double IfcAreaMeasure;
-/// IfcBoolean is a defined data type of simple data type Boolean. It is required since a select type (IfcSimpleValue) cannot directly include simple types in its select list.  A boolean type can have value TRUE or FALSE.
+/// HISTORY: New SELECT type in IFC 2x2.
 /// 
-/// Type: BOOLEAN
+/// Use definitions 
+/// Selecting IfcMeasureWithUnit allows the specification of both the actual figure for the value together with the currency in which the value is represented. 
+/// Selecting IfcMonetaryMeasure allows the specification only of the value, the currency being as set by the global context 
+/// Selecting IfcRatioMeasure assumes that the amount is a percentage or other REAL number. Note that if the amount is normally specified as -20%, then this figure will need to be converted to a multiplier of 0.8
+typedef IfcUtil::IfcBaseClass IfcAppliedValueSelect;
+/// Definition from ISO/CD 10303-42:1992: This select type collects together both versions of the placement as used in two dimensional or in three dimensional Cartesian space. This enables entities requiring this information to reference them without specifying the space dimensionality.  
 /// 
-/// HISTORY New type in IFC Release 1.5.1.
-typedef bool IfcBoolean;
-/// IfcComplexNumber is a representation of a complex number expressed as an array with two elements.
-///   The first element (index 1) denotes the real component which is the numerical
-///   component of a complex number whose square roots can be calculated explicitly.
-///   The second element (index 2) denotes the imaginary component which is the numerical
-///   component of a complex number whose square roots cannot be determined other
-///   than through the provision of the square of the imaginary number j where j^2 = -1.
-///   Note that the imaginary component may be referred to as i in certain references.
+/// NOTE: Corresponding STEP type: axis2_placement, please refer to ISO/IS 10303-42:1994, p. 19 for the final definition of the formal standard.
 /// 
-/// Type: ARRAY [1:2] OF REAL
+/// HISTORY: New type in IFC Release 1.5
+typedef IfcUtil::IfcBaseClass IfcAxis2Placement;
+/// Definition from ISO/CD 10303-42:1992: This select type identifies
+///   all those types of entities which may participate in a Boolean operation to
+///   form a CSG solid.  
+///   Definition from IAI: CSG primitives are out of scope for the
+///   current IFC Release. Only faceted B-reps, swept area solids and half space
+///   solids are available as Boolean operands. Boolean results themselves can be used
+///   as operands thus enabling nested Boolean operations. 
 /// 
-/// HISTORY New type in IFC Release 2x2.
-typedef std::vector< double > /*[1:2]*/ IfcComplexNumber;
-/// IfcCompoundPlaneAngleMeasure is a compound measure of plane angle in degrees, minutes, seconds, and optionally millionth-seconds of arc.
+/// NOTE Corresponding STEP type:
+///   boolean_operand, please refer to ISO/IS 10303-42:1994, p.167 for the final
+///   definition of the formal standard. In IFC Release 1.5.1 & 2.0 only Boolean
+///   results (IfcBooleanResult), half space solids
+///   (IfcHalfSpaceSolid), faceted B-Rep, extruded solids and revolved solids
+///   (IfcSolidModel) are defined for being valid Boolean operands.
 /// 
-/// NOTE: IfcCompoundPlaneAngleMeasure is used where angles need to be described to an accuracy as fine as one millionth of a degree and expressed as parts of an arc. It may be used for angular measurement by surveyors or for other angular measurements where precision is required. Another usage is exact or approximate global positioning against a geographic coordinate systems using longitude and latitude.
+/// HISTORY: New Type in IFC Release 1.5.1
+typedef IfcUtil::IfcBaseClass IfcBooleanOperand;
+/// The character style select allows for a selection of character styles for text. Currently only text color and background color is selectable.
 /// 
-/// NOTE: While the unit of measurement of the type IfcPlaneAngleMeasure depends on unit assignment (radian or degree or other derived units; globally at the IfcPoject or locally at an IfcMeasureWithUnit), the units of IfcCompoundPlaneAngleMeasure are always degrees, minutes, seconds, and millionth-seconds irrespective of unit assignments.
+/// NOTE  Corresponding ISO 10303 name: character_style_select. Please refer to ISO/IS
+/// 10303-46:1994, p. 89 for the final definition of the formal standard.
 /// 
-/// HISTORY New type in IFC Release 1.5.1.
+/// HISTORY  New type in IFC2x2.
 /// 
-/// Type: LIST [3:4] OF INTEGER
+/// IFC2x3 CHANGE  The SELECT item IfcTextStyleForDefinedFont replaces the old IfcColour.
+typedef IfcUtil::IfcBaseClass IfcCharacterStyleSelect;
+
+typedef IfcUtil::IfcBaseClass IfcClassificationNotationSelect;
+/// Definition from ISO/CD 10303-46:1992: The colour entity defines a basic appearance of elements which shall be visualized in a picture.
 /// 
-/// Value restrictions
+/// NOTE  Corresponding STEP name: colour. It has been made into a SELECT type in IFC to avoid multiple inheritance for pre defined colour. Please refer to ISO/IS 10303-46:1994, p. 138 for the final definition of the formal standard.
 /// 
-/// The first integer measure is the number of degrees and is generally not range-restricted.  However, when IfcCompoundPlaneAngleMeasure is used to express geographic coordinates, only latitudes of [-90, 90] and longitudes of [-180, 180] are used in practice.
-/// The second integer measure is the number of minutes and shall be in the range (-60, 60).
-/// The third integer measure is the number of seconds and shall be in the range (-60, 60).
-/// The optional fourth integer measure is the number of millionth-seconds and shall be in the range (-1 000 000, 1 000 000).
+/// HISTORY  New entity in IFC2x2.
+typedef IfcUtil::IfcBaseClass IfcColour;
+/// The IfcColourOrFactor enables the selection of either a RGB colour value or a scalar factor value for the use as values of the reflectance components.
 /// 
-/// Signedness
+/// HISTORY: New type in IFC2x2.
+typedef IfcUtil::IfcBaseClass IfcColourOrFactor;
+
+typedef IfcUtil::IfcBaseClass IfcConditionCriterionSelect;
+/// Definition from ISO/CD 10303-42:1992: This type identifies the types of entity which may be selected as the root of a CSG tree including a single CSG primitive as a special case.
+/// Definition from IAI: The IfcBooleanResult, and subtypes of IfcCsgPrimitive3D are defined as potential root tree expression (at IfcCsgSolid). A subtype of IfcCsgPrimitive3D marks the special case of a CSG solid solely expressed by a single primitive.
 /// 
-/// All measure components have the same sign (positive or negative).  It is therefore trivial to convert between floating point representation (decimal degrees) and compound representation regardless whether the angle is greater or smaller than zero.  Example:
+/// NOTE Corresponding ISO 10303-42 type: csg_select, please refer to ISO/IS 10303-42:1994, p.168 for the final definition of the formal standard.
 /// 
-/// LOCAL
-///   a : IfcPlaneAngleMeasure := -50.975864;  (* decimal degrees, -50° 58' 33" 110400 *)
-///   b : IfcPlaneAngleMeasure;
-///   c : IfcCompoundPlaneAngleMeasure;
-///   s : IfcText;
-/// END_LOCAL;
+/// HISTORY New Type in IFC Release 1.5.1.
+typedef IfcUtil::IfcBaseClass IfcCsgSelect;
+/// Definition from ISO/CD 10303-46:1992: The curve font or scaled curve font select is a selection of either a curve font style select (being either a predefined curve font or an explicitly defined curve font) or a curve style font and scaling. 
 /// 
-/// (* convert from float to compound *)
-///   c[1] :=    a;                                           -- -50
-///   c[2] :=   (a - c[1]) * 60;                              -- -58
-///   c[3] :=  ((a - c[1]) * 60 - c[2]) * 60;                 -- -33
-///   c[4] := (((a - c[1]) * 60 - c[2]) * 60 - c[3]) * 1.e6;  -- -110400
+/// NOTE Corresponding ISO 10303 name: curve_font_or_scaled_curve_font_select. Please refer to ISO/IS 10303-46:1994 for the final definition of the formal standard.
 /// 
-/// (* convert from compound to float *)
-///   b := c[1] + c[2]/60. + c[3]/3600. + c[4]/3600.e6;       -- -50.975864
+/// HISTORY New entity in IFC2x2.
+typedef IfcUtil::IfcBaseClass IfcCurveFontOrScaledCurveFontSelect;
+/// IfcCurveOrEdgeCurve provides the option to either select a geometric curve (IfcCurve
+/// and subtypes) within a geometric model, or a curve with associated geometry and coordinates (IfcEdgeCurve) within a topological model.
+/// SELECT 
 /// 
-/// Use in string representations
+/// IfcCurve
+///   IfcEdgeCurve
 /// 
-/// When a compound plane angle measure is formatted for display or printout, the signs of the fractional components will usually be discarded because, to a human reader, the sign of the first component alone already indicates the sense of the angle:
+/// HISTORY  New select type in IFC2x Edition 3.
+typedef IfcUtil::IfcBaseClass IfcCurveOrEdgeCurve;
+/// Definition from ISO/CD 10303-46:1992: The curve style font select is a selection of a curve style font or a predefined curve style font. 
 /// 
-/// (* convert from compound to human-readable string *)
-///   s := FORMAT(c[1], '+##')     + "000000B0"
-///      + FORMAT(ABS(c[2]), '##') + ''''
-///      + FORMAT(ABS(c[3]), '##') + '"'
-///      + FORMAT(ABS(c[4]), '##');  -- -50° 58' 33" 110400
+/// NOTE Corresponding ISO 10303 name: curve_style_font_select. Please refer to ISO/IS 10303-46:1994 for the final definition of the formal standard.
 /// 
-/// Another often encountered display format of latitudes and longitudes is to omit the signs and print N, S, E, W indicators instead, for example, 50°58'33"S.  When stored as IfcCompoundPlaneAngleMeasure however, a compound plane angle measure is always signed, with same sign of all components.
-typedef std::vector< int > /*[3:4]*/ IfcCompoundPlaneAngleMeasure;
-/// Definition from ISO/CD 10303-41:1992: Is the value of a physical quantity as defined by an application context.
-/// Type: REAL
+/// HISTORY New entity in IFC2x2.
+typedef IfcUtil::IfcBaseClass IfcCurveStyleFontSelect;
+
+typedef IfcUtil::IfcBaseClass IfcDateTimeSelect;
+/// The defined symbol select is a selection between a predefined symbol and an externally defined symbol. 
 /// 
-/// NOTE Corresponding ISO 10303 name: context_dependent_measure, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
+/// NOTE Corresponding ISO 10303 name: defined_symbol_select. Please refer to ISO/IS 10303-46:1994 for the final definition of the formal standard.
 /// 
-/// HISTORY New type in IFC Release 1.5.1.
-typedef double IfcContextDependentMeasure;
-/// Definition from ISO/CD 10303-41:1992: A count measure is the value of a count.
-/// Type: NUMBER
+/// HISTORY New type in IFC2x2.
+typedef IfcUtil::IfcBaseClass IfcDefinedSymbolSelect;
+/// IfcDerivedMeasureValue is a select type for selecting between derived measure types.
 /// 
-/// NOTE Corresponding ISO 10303 name: count_measure, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
+/// SELECT 
 /// 
-/// HISTORY New type in IFC Release 1.5.1.
-typedef double IfcCountMeasure;
-/// IfcCurvatureMeasure is a measure for curvature, which is defined as the change of slope per length.
-///   This is typically a computed value in structural analysis.
-///   It is usually measured in rad/m.
+/// IfcAbsorbedDoseMeasure 
+///   IfcAccelerationMeasure 
+///   IfcAngularVelocityMeasure 
+///   IfcCompoundPlaneAngleMeasure 
+///   IfcDoseEquivalentMeasure 
+///   IfcDynamicViscosityMeasure 
+///   IfcElectricCapacitanceMeasure 
+///   IfcElectricChargeMeasure 
+///   IfcElectricConductanceMeasure 
+///   IfcElectricResistanceMeasure 
+///   IfcElectricVoltageMeasure 
+///   IfcEnergyMeasure 
+///   IfcForceMeasure 
+///   IfcFrequencyMeasure 
+///   IfcHeatFluxDensityMeasure 
+///   IfcIlluminanceMeasure 
+///   IfcInductanceMeasure 
+///   IfcIntegerCountRateMeasure 
+///   IfcIsothermalMoisturecapacityMeasure 
+///   IfcKinematicViscosityMeasure 
+///   IfcLinearForceMeasure 
+///   IfcLinearMomentMeasure  
+///   IfcLinearStiffnessMeasure 
+///   IfcLinearVelocityMeasure 
+///   IfcLuminousFluxMeasure 
+///   IfcMagneticFluxDensityMeasure 
+///   IfcMagneticFluxMeasure 
+///   IfcMassDensityMeasure 
+///   IfcMassFlowRateMeasure 
+///   IfcModulusOfElasticityMeasure 
+///   IfcModulusOfSubgradeReactionMeasure 
+///   IfcMoistureDiffusivityMeasure 
+///   IfcMolecularWeightMeasure 
+///   IfcMomentOfInertiaMeasure  
+///   IfcMonetaryMeasure 
+///   IfcPlanarForceMeasure 
+///   IfcPowerMeasure 
+///   IfcPressureMeasure 
+///   IfcRadioActivityMeasure 
+///   IfcRotationalFrequencyMeasure 
+///   IfcRotationalStiffnessMeasure 
+///   IfcShearModulusMeasure 
+///   IfcSpecificHeatCapacityMeasure 
+///   IfcThermalAdmittanceMeasure 
+///   IfcThermalConductivityMeasure 
+///   IfcThermalResistanceMeasure 
+///   IfcThermalTransmittanceMeasure 
+///   IfcTimeStamp 
+///   IfcTorqueMeasure 
+///   IfcVaporPermeabilityMeasure 
+///   IfcVolumetricFlowRateMeasure 
+///   IfcCurvatureMeasure 
+///   IfcMassPerLengthMeasure 
+///   IfcRotationalMassMeasure 
+///   IfcSectionalAreaIntegralMeasure 
+///   IfcSectionModulusMeasure 
+///   IfcTemperatureGradientMeasure 
+///   IfcTemperatureRateOfChangeMeasure 
+///   IfcWarpingConstantMeasure 
+///   IfcWarpingMomentMeasure 
+///   IfcThermalExpansionCoefficientMeasure 
+///   IfcModulusOfLinearSubgradeReactionMeasure 
+///   IfcModulusOfRotationalSubgradeReactionMeasure 
+///   IfcLuminousIntensityDistributionMeasure 
+///   IfcSoundPowerMeasure 
+///   IfcSoundPressureMeasure 
 /// 
-/// Type: REAL
+/// HISTORY New type in IFC Release 2x.
 /// 
-/// HISTORY New type in IFC2x2.
-typedef double IfcCurvatureMeasure;
-/// Definition from IAI: The IfcDayInMonthNumber is
-/// an integer that defines the position of the specified day in a
-/// month.
-/// Type: INTEGER
-/// NOTE Corresponding STEP
-/// name: day_in_month_number, please refer to ISO/IS 10303-41:1994
-/// for the final definition of the formal
-/// standard.
-/// HISTORY New type in IFC
-/// Release 1.5.1.
-/// IFC2x4 CHANGE Where rule
-/// ValidRange added.
-typedef int IfcDayInMonthNumber;
-
-typedef int IfcDaylightSavingHour;
-/// Definition from ISO/CD 10303-41:1992: A descriptive measure is a human interpretable definition of a quantifiable value.
-/// Type: STRING
+/// IFC2x4 change: added IfcTemperatureRateOfChangeMeasure.
+typedef IfcUtil::IfcBaseClass IfcDerivedMeasureValue;
+/// IfcDocumentSelect enables selection of whether document information is to be contained within an IFC model or is to be referenced from an external source. 
 /// 
-/// NOTE Corresponding ISO 10303 name:descriptive_measure, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
+/// HISTORY: New Select Type in IFC 2x
 /// 
-/// HISTORY New type in IFC Release 1.5.1.
-typedef std::string IfcDescriptiveMeasure;
-/// Definition from ISO/CD 10303-42:1992: A dimension count is a positive integer used to define the coordinate space dimensionality.  
+/// Select From: 
 /// 
-/// The IfcDimensionCount is restricted to have the dimensionality of either 1, 2, or 3 - the WR1 had been added as an addition to the ISO 10303:42 entity dimension_count. In contrary to the ISO 10303:42 constraint, that all geometric representation items within a geometric representation context are forced to have the same dimension count, the IFC geometry allows mixed dimensions, particularly when defining the boundary of planar surfaces.  
+/// IfcDocumentInformation (for "metadata" of an external document)  
+/// IfcDocumentReference (for reference within a document)
+typedef IfcUtil::IfcBaseClass IfcDocumentSelect;
+
+typedef IfcUtil::IfcBaseClass IfcDraughtingCalloutElement;
+/// The fill area style tile shape select is used to make a selection for the style of the fill area style tile.
 /// 
-/// NOTE Corresponding ISO 10303 type: dimension_count, please refer to ISO/IS 10303-42:1994, p. 14 for the final definition of the formal standard.
+/// NOTE: The IfcFillAreaStyleTileShapeSelect is an entity that had been adopted from ISO 10303, Industrial automation systems and integration&#151;Product data representation and exchange, Part 46: Integrated generic resources: Visual presentation.
 /// 
-/// HISTORY New Type in IFC Release 1.5
-typedef int IfcDimensionCount;
-/// IfcDoseEquivalentMeasure is a measure of the radioactive dose equivalent.
-/// Usually measured in Sievert (Sv, J/kg).
-/// Type: REAL
+/// NOTE Corresponding ISO 10303 name: fill_area_style_tile_shape_select. Please refer to ISO/IS 10303-46:1994 for the final definition of the formal standard.
 /// 
-/// HISTORY New type in IFC Release 2x.
-typedef double IfcDoseEquivalentMeasure;
-/// IfcDynamicViscosityMeasure is a measure of the viscous resistance of a medium.
+/// HISTORY New type in IFC2x2.
+typedef IfcUtil::IfcBaseClass IfcFillAreaStyleTileShapeSelect;
+/// Definition from ISO/CD 10303-46:1992: The fill style select is a selection between different fill area styles.
 /// 
-/// Usually measured in Pascal second (Pa s).
-/// Type: REAL 
+/// NOTE Corresponding ISO 10303 name: fill_style_select. Please refer to ISO/IS 10303-46:1994 for
+/// the final definition of the formal standard.
 /// 
-/// HISTORY New type in IFC Release 2.0.
-typedef double IfcDynamicViscosityMeasure;
-/// IfcElectricCapacitanceMeasure is a measure of the electric capacitance.
-/// Usually measured in Farad (F, C/V = A s/V).
-/// Type: REAL
+/// HISTORY New type in IFC2x2.
+typedef IfcUtil::IfcBaseClass IfcFillStyleSelect;
+/// Definition from ISO/CD 10303-42:1992: This select type identifies the types of entities which can occur in a geometric set. 
 /// 
-/// HISTORY New type in IFC Release 2x.
-typedef double IfcElectricCapacitanceMeasure;
-/// IfcElectricChargeMeasure is a measure of the electric charge.
-/// Usually measured in Coulomb (C, A s).
-/// Type: REAL
+/// NOTE: Corresponding ISO 10303 type: geometric_set_select. Please refer to ISO/IS 10303-42:1994, p. 169 for the final definition of the formal standard.
 /// 
-/// HISTORY New type in IFC Release 2x.
-typedef double IfcElectricChargeMeasure;
-/// IfcElectricConductanceMeasure is a measure of the electric conductance.
-/// Usually measured in Siemens (S, 1/Ohm = A/V).
-/// Type: REAL
+/// HISTORY: New type in IFC Release 2x.
+typedef IfcUtil::IfcBaseClass IfcGeometricSetSelect;
+/// The IfcHatchLineDistanceSelect is a selection between different ways to determine the distance and potentially start point of hatch lines, either by an offset distance length measure or by a vector.
 /// 
-/// HISTORY New type in IFC Release 2x.
-typedef double IfcElectricConductanceMeasure;
-/// Definition from ISO/CD 10303-41:1992: The value for the movement of electrically charged particles.
-/// Usually measured in Ampere (A).
-/// Type: REAL
+/// HISTORY  New type in IFC2x3.
+typedef IfcUtil::IfcBaseClass IfcHatchLineDistanceSelect;
+/// Definition from ISO/CD 10303-46:1992: The layered things type selects those things, which can be grouped in layers. 
 /// 
-/// NOTE Corresponding ISO 10303 name: electric_current_measure, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
+/// It is the collection of all those items, that are assigned to a single layer. These items are representation items or complete representations (IfcRepresentationItem, IfcRepresentation). If an IfcRepresentation is referenced, all IfcRepresentationItem within its set of Items are assigned to the same layer. 
 /// 
-/// HISTORY New type in IFC Release 1.5.1.
-typedef double IfcElectricCurrentMeasure;
-/// IfcElectricResistanceMeasure is a measure of the electric resistance.
-/// Usually measured in Ohm (V/A).
-/// Type: REAL
+/// NOTE: Corresponding ISO 10303 name: layered_item. It was called layered_things in the ISO/CD version and had been renamed to layered_item in the ISO/IS final version. Please refer to ISO/IS 10303-46:1994, p. 13 for the final definition of the formal standard.
 /// 
-/// HISTORY New type in IFC Release 2x.
-typedef double IfcElectricResistanceMeasure;
-/// IfcElectricVoltageMeasure is a measure of electromotive force.
-/// Usually measured in Volts (V, W/A).
-/// Type: REAL
+/// HISTORY: New type in IFC2x2.
+typedef IfcUtil::IfcBaseClass IfcLayeredItem;
+/// IfcLibrarySelect enables selection of whether library information is to be contained within an IFC model or is to be referenced from an external source. 
 /// 
-/// HISTORY New type in IFC Release 2.0.
-typedef double IfcElectricVoltageMeasure;
-/// IfcEnergyMeasure is a measure of energy required or used.
-/// Usually measured in Joules, (J, Nm).
-/// Type: REAL
+/// HISTORY: New Select Type in IFC2x
 /// 
-/// HISTORY New type in IFC Release 2.0.
-typedef double IfcEnergyMeasure;
-/// Definition from CSS1 (W3C Recommendation): The font-style property selects between normal (sometimes
-/// referred to as "roman" or "upright"), italic and oblique faces within a font family. Values are:
+/// Select From: 
 /// 
-/// normal 
-///   italic 
-///   oblique
+/// IfcLibraryInformation (for library information)  
+/// IfcLibraryReference (for reference into a library of information by location)  
 /// 
-/// A value of 'normal' selects a font that is classified as 'normal' in the user agents font database, while 'oblique' selects a font that is labeled 'oblique'. A value of 'italic' selects a font that is labeled 'italic', or, if that is not available, one labeled 'oblique'. The font that is labeled 'oblique' in the user agents font database may actually have been generated by electronically slanting a normal font.
+/// Generally, it is expected that selection will be IfcLibraryReference and only rarely IfcLibraryInformation. IfcLibraryInformation should only be selected in circumstances where there could be a need to indicate the libraries that will be used without making individual references. This may occur for higher level objects such as a project or building.
+typedef IfcUtil::IfcBaseClass IfcLibrarySelect;
+/// A goniometric light gets its intensity distribution function (how much light goes in any one direction) from one of two sources: (i) an industry-standard file, (ii) from distribution data passed directly via the IfcLightIntensityDistribution. 
 /// 
-/// Fonts with Oblique, Slanted or Incline in their names will typically be labeled 'oblique' in the user agents font database. Fonts with Italic, Cursive or Kursiv in their names will typically be labeled 'italic'.
+/// The light distribution provides the luminous intensity distribution according to some standardized light distribution curves. 
 /// 
-/// NOTE  Corresponding CSS1 definitions is font-style.
+/// Select: 
 /// 
-/// HISTORY  New type in IFC2x3.
-typedef std::string IfcFontStyle;
-/// Definition from CSS1 (W3C Recommendation): The font-style property selects between normal and small-caps within a font family. Values are:
+/// Type 
+///   Definition 
 /// 
-/// normal 
-///   small-caps 
+/// IfcExternalReference 
+///   Light distribution is represented by a standard photometric data file such as Eulumdat, IES, CIBSE TM14.  
 /// 
-/// Another type of variation within a font family is the small-caps. In a small-caps font the lower case letters look similar to the uppercase ones, but in a smaller size and with slightly different proportions. The 'font-variant' property selects that font.
+/// IfcLightIntensityDistribution 
+///   For representing a light distribution directly the
+///   following values needs to be given in a table like structure with column and
+///   row headings. These headings should contain the angles (C/&#947; or B/&#946; )
+///   and the table body contains the intensity values, (normally normalized to
+///   cd/Klm). The angles can be non- equidistant and the angle steps can be almost
+///   any value in the valid range, so a list of all available angles in both
+///   directions covers all cases.  
 /// 
-/// A value of 'normal' selects a font that is not a small-caps font, 'small-caps' selects a small-caps font. It is acceptable (but not required) in CSS1 if the small-caps font is a created by taking a normal font and replacing the lower case letters by scaled uppercase characters. As a last resort, uppercase letters will be used as replacement for a small-caps font.
+/// HISTORY New type in IFC2x2.
+typedef IfcUtil::IfcBaseClass IfcLightDistributionDataSourceSelect;
+/// IfcMaterialSelect provides selection of either a material
+/// definition or a material usage definition that can be assigned to
+/// an element, a resource or another entity within IFC.
+/// SELECT
 /// 
-/// NOTE  Corresponding CSS1 definitions is font-variant.
+/// IfcMaterialDefinition
 /// 
-/// HISTORY  New type in IFC2x3.
-typedef std::string IfcFontVariant;
-/// Definition from CSS1 (W3C Recommendation): The 'font-weight' property selects the weight of the font. The values '100' to '900' form an ordered sequence, where each number indicates a weight that is at least as dark as its predecessor. The keyword 'normal' is synonymous with '400', and 'bold' is synonymous with '700'. Keywords other than 'normal' and 'bold' have been shown to be often confused with font names and a numerical scale was therefore chosen for the 9-value list. Values are:
+/// IfcMaterial
+/// IfcMaterialLayer
+/// IfcMaterialLayerSet
+/// IfcMaterialProfile
+/// IfcMaterialProfileSet
+/// IfcMaterialConstituent
+/// IfcMaterialConstituentSet
 /// 
-/// normal 
-///   bold 
-///   100 | 200 | 300 | 400 | 500 | 600 | 700 | 800 | 900
+/// IfcMaterialUsageDefinition
 /// 
-/// Fonts (the font data) typically have one or more properties whose values are names that are descriptive of the "weight" of a font. There is no accepted, universal meaning to these weight names. Their primary role is to distinguish faces of differing darkness within a single font family. Usage across font families is quite variant; for example a font that you might think of as being bold might be described as being Regular, Roman, Book, Medium, Semi- or DemiBold, Bold, or Black, depending on how black the "normal" face of the font is within the design. Because there is no standard usage of names, the weight property values in CSS1 are given on a numerical scale in which the value '400' (or 'normal') corresponds to the "normal" text face for that family. The weight name associated with that face will typically be Book, Regular, Roman, Normal or sometimes Medium.
+/// IfcMaterialLayerSetUsage
+/// IfcMaterialProfileSetUsage
 /// 
-/// The association of other weights within a family to the numerical weight values is intended only to preserve the ordering of darkness within that family. However, the following heuristics tell how the assignment is done in typical cases:
+/// IfcMaterialList
 /// 
-/// If the font family already uses a numerical scale with nine values (such as with OpenType), the font weights should be mapped directly. 
-///   If there is both a face labeled Medium and one labeled Book, Regular, Roman or Normal, then the Medium is normally assigned to the '500'. 
-///   The font labeled "Bold" will often correspond to the weight value '700'. 
-///   If there are fewer then 9 weights in the family, the default algorithm for filling the "holes" is as follows. If '500' is unassigned, it will be assigned the same font as '400'. If any of the values '600', '700', '800' or '900' remains unassigned, they are assigned to the same face as the next darker assigned keyword, if any, or the next lighter one otherwise. If any of '300', '200' or '100' remains unassigned, it is assigned to the next lighter assigned keyword, if any, or the next darker otherwise. 
+/// HISTORY New select in IFC 1.0
 /// 
-/// The following two examples illustrate the process. Assume four weights in the "Example1" family, from lightest to darkest: Regular, Medium, Bold, Heavy. And assume six weights in the "Example2" family: Book, Medium, Bold, Heavy, Black, ExtraBlack. Note how in the second example it has been decided not to assign "Example2 ExtraBlack" to anything.
+/// IFC2x4 CHANGE The select now includes two new abstract entities IfcMaterialDefinition
+/// and IfcMaterialUsageDefinition with upward compatibility.  The use of IfcMaterialList is deprecated from IFC2x4 onwards.
+typedef IfcUtil::IfcBaseClass IfcMaterialSelect;
+/// Definition from ISO/CD 10303-41:1992: A measure value is a value as defined in ISO 31-0 (clause 2).
 /// 
-/// Available faces       | Assignments   | Filling the holes----------------------+---------------+-------------------"Example1 Regular"    | 400           | 100, 200, 300"Example1 Medium"     | 500           |"Example1 Bold"       | 700           | 600"Example1 Heavy"      | 800           | 900
-/// Available faces       | Assignments   | Filling the holes----------------------+---------------+-------------------"Example2 Book"       | 400           | 100, 200, 300"Example2 Medium"     | 500           |"Example2 Bold"       | 700           | 600 "Example2 Heavy"      | 800           |"Example2 Black"      | 900           |"Example2 ExtraBlack" | (none)        |
+/// NOTE IfcMeasureValue is a select data type for most basic measure types coming from ISO 10303-41.  Select item IfcNonNegativeLengthMeasure is in addition to ISO 10303-41.
 /// 
-/// NOTE  Corresponding CSS1 definitions is font-weight.
+/// NOTE Corresponding ISO 10303 name: measure_value, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
 /// 
-/// HISTORY  New type in IFC2x2 Addendum 2.
-typedef std::string IfcFontWeight;
-/// IfcForceMeasure is a measure of the force.
-/// Usually measured in Newton (N, kg m/s2).
-/// Type: REAL
+/// HISTORY New type in IFC Release 1.5.1.
 /// 
-/// HISTORY New type in IFC Release 2x.
-typedef double IfcForceMeasure;
-/// IfcFrequencyMeasure is a measure of the number of times that an item vibrates in unit time.
-/// Usually measured in cycles/s or Herz (Hz).
-/// Type: REAL
+/// IFC 2x4 change: added IfcNonNegativeLengthMeasure
+typedef IfcUtil::IfcBaseClass IfcMeasureValue;
+/// IfcMetricValueSelect is a select type that enables selection of the data type for the value component of an IfcMetric. 
 /// 
-/// HISTORY New type in IFC Release 2.0.
-typedef double IfcFrequencyMeasure;
-/// An IfcGloballyUniqueId holds an encoded string identifier that is used to uniquely identify an IFC object. An IfcGloballyUniqueId is a Globally
-///   Unique Identifier (GUID) which is an auto-generated 128-bit number. Since this identifier is
-///   required for all IFC object instances, it is desirable to compress it to reduce overhead. The encoding of the base 64 character set is shown below:
+/// HISTORY: New type in IFC Release 2.0
 /// 
-///            1         2         3         4         5         6
+/// Select 
 /// 
-///  0123456789012345678901234567890123456789012345678901234567890123
+/// IfcCostValue
+///   IfcDateTime 
+///   IfcMeasureWithUnit 
+///   IfcTable 
+///   IfcText 
+///   IfcTimeSeries
+typedef IfcUtil::IfcBaseClass IfcMetricValueSelect;
+/// IfcObjectReferenceSelect is a select type, that holds a list of resource level entities that can be used as properties within a property set. 
 /// 
-/// "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz_$";
+/// HISTORY  New select type in IFC Release 2.0.
+typedef IfcUtil::IfcBaseClass IfcObjectReferenceSelect;
+
+typedef IfcUtil::IfcBaseClass IfcOrientationSelect;
+/// IfcPointOrVertexPoint provides the option to either select a geometric point (IfcPoint and subtypes) within a geometric model, or a vertex with associated point coordinates (IfcVertexPoint) within a topological model.
+/// SELECT 
 /// 
-/// The resulting string is a fixed 22 character length string to be exchanged within the IFC exchange file structure.
+/// IfcPoint, 
+///   IfcVertexPoint
 /// 
-/// Refer to the BuildingSMART website (www.buildingsmart-tech.org) for more information and sample encoding algorithms.
+/// HISTORY  New select type in IFC2x Edition 3.
+typedef IfcUtil::IfcBaseClass IfcPointOrVertexPoint;
+/// Definition from ISO/CD 10303-46:1992: The presentation style select is a selection of one of many kinds of styles, a different one for each kind of geometric representation item to be styled.
 /// 
-/// HISTORY  New type in IFC R1.5.1.
-typedef std::string IfcGloballyUniqueId;
-/// IfcHeatFluxDensityMeasure is a measure of the density of heat flux within a body.
-/// Usually measured in W/m2 (J/s m2).
-/// Type: REAL
+/// NOTE Corresponding ISO 10303 name: presentation_style_Select. Please refer to ISO/IS
+/// 10303-46:1994 for the final definition of the formal standard.
 /// 
-/// HISTORY New type in IFC Release 2.0.
-typedef double IfcHeatFluxDensityMeasure;
-/// IfcHeatingValueMeasure defines the amount of energy released (usually in MJ/kg) when a fuel is burned.
+/// HISTORY New type in IFC2x2.
 /// 
-/// HISTORY: This is new type in IFC2x2.
-typedef double IfcHeatingValueMeasure;
-
-typedef int IfcHourInDay;
-/// Definition from ISO/CD 10303-41:1992: An identifier is an alphanumeric string which allows an individual thing to be identified. It may not provide natural-language meaning.
+/// IFC2x4 CHANGE The select type has been deprecated.
+typedef IfcUtil::IfcBaseClass IfcPresentationStyleSelect;
+/// Definition from ISO/CD 10303-42:1992 This type collects together, for reference when constructing more complex models, the subtypes which have the characteristics of a shell. A shell is a connected object of fixed dimensionality d = 0; 1; or 2, typically used to bound a region. The domain of a shell, if present, includes its bounds and 0 £ X < ¥.  
 /// 
-/// Type: STRING of up to 255 characters
+/// A shell of dimensionality 0 is represented by a graph consisting of a single vertex. The vertex shall not have any associated edges. 
+/// A shell of dimensionality 1 is represented by a connected graph of dimensionality 1. 
+/// A shell of dimensionality 2 is a topological entity constructed by joining faces along edges. Its domain, if present, is a connected, orientable 2-manifold with boundary, that is, a connected, oriented, finite, non-self-intersecting surface, which may be closed or open. 
 /// 
-/// NOTE Corresponding STEP name: identifier, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
+/// Shells of dimensionality 0 and 1 are not part of the current IFC release. 
 /// 
-/// HISTORY New type in IFC Release 2x.
-/// IFC 2x4 CHANGE: Previously recommended size restriction of 255 characters is now mandatory.
+/// NOTE  Corresponding ISO 10303 type: shell. Please refer to ISO/IS 10303-42:1994, p. 127 for the final definition of the formal standard. Only the select items closed_shell (IfcClosedShell) and open_shell (IfcOpenShell) have been incorporated in the current IFC release. 
 /// 
-/// As a merely machine-readable string for identification purposes, an identifier is usually machine-generated and locale-independent (in contrast to human-readable labels, IfcLabel).
+/// HISTORY  New type in IFC2x.
+typedef IfcUtil::IfcBaseClass IfcShell;
+/// IfcSimpleValue is a select type for selecting between simple value types.
 /// 
-/// Per ISO 10303-11, the set of characters that may appear in STRINGs is defined in ISO 10646.  The encoding of characters in case of file-based exchange is defined in ISO 10303-21 (STEP physical files) and ISO 10303-28 (XML files).  Among else, these specifications define the encoding of 8-bit characters from ISO 8859-1...-16 and of 2-byte Unicode characters.
+/// SELECT 
 /// 
-/// Note that while IfcIdentifier is restricted to 255 characters, the size in exchange files after encoding may be considerably larger than 255 octets, depending on the particular encoding and on the contents of the identifier.
-typedef std::string IfcIdentifier;
-/// IfcIlluminanceMeasure is a measure of the illuminance.
-/// Usually measured in Lux (lx, Lumen/m2 = Candela Steradian/m2).
-/// Type: REAL
+/// IfcInteger: Defined type of simple type INTEGER. 
+///   IfcReal: Defined type of simple type REAL. 
+///   IfcBoolean: Defined type of simple type BOOLEAN. 
+///   IfcLogical: Defined type of simple type LOGICAL. 
+///   IfcIdentifier: Defined type of simple type STRING for identification purposes. 
+///   IfcLabel: Defined type of simple type STRING for naming purposes. 
+///   IfcText: Defined type of simple type STRING for descriptive purposes. 
+///   IfcDateTime: Defined type of simple type STRING to represent a date and time. 
+///   IfcDate: Defined type of simple type STRING to represent a date. 
+///   IfcTime: Defined type of simple type STRING to represent a time. 
+///   IfcDuration: Defined type of simple type STRING to represent a duration. 
 /// 
 /// HISTORY New type in IFC Release 2x.
-typedef double IfcIlluminanceMeasure;
-/// IfcInductanceMeasure is a measure of the inductance.
-/// Usually measure in Henry (H, Weber/A = V s/A).
-/// Type: REAL
 /// 
-/// HISTORY New type in IFC Release 2x.
-typedef double IfcInductanceMeasure;
-/// IfcInteger is a defined type of simple data type Integer. It is required since a select type (IfcSimpleValue) cannot include directly simple types in its select list.
+/// IFC2x4 CHANGE Items IfcDateTime, IfcDate, IfcTime, IfcDuration added.
+typedef IfcUtil::IfcBaseClass IfcSimpleValue;
+/// Definition from ISO/CD 10303-46:1992: The size select is a selection of a specific positive length measure.
 /// 
-/// In principle, the domain of IfcInteger (being an Integer) is all integer numbers. Here the number of bits used for the IfcInteger representation is unconstrained, but in practice it is implementation specific.
+/// Definition from ISO: The size (or width) measure value is given in the global drawing length units.
 /// 
-/// Type: INTEGER
+/// NOTE  global units are defined at the single IfcProject instance, given by UnitsInContext:IfcUnitAssignment, the same units are used for the geometric representation items and for the style definitions.
 /// 
-/// HISTORY New type in IFC Release 1.5.1.
-typedef int IfcInteger;
-/// IfcIntegerCountRateMeasure is a measure of the integer number of units flowing per unit time.
+/// NOTE  Corresponding ISO 10303 name: size_select. Please refer to ISO/IS 10303-46:1994 for the final
+/// definition of the formal standard.
 /// 
-/// EXAMPLE: This measure may be used for measuring integer units per second or per hour. For example, it may be used to measure the number of books per hour passing along a part of a mechanical book handling system, the number of people per hour travelling along a moving walkway or the number of vehicles per hour travelling along a section of road.
+/// HISTORY  New type in IFC2x2.
 /// 
-/// Type: INTEGER
+/// IFC2x3 CHANGE  The SELECT item IfcMeasureWithUnit has been removed from the IfcSizeSelect, the IfcRatioMeasure and IfcDescriptiveMeasure has been added.
+typedef IfcUtil::IfcBaseClass IfcSizeSelect;
+/// The IfcSpecularHighlightSelect defines the selectable types of value for specular highlight sharpness. 
 /// 
-/// HISTORY New type in IFC Release 2.0.
-typedef int IfcIntegerCountRateMeasure;
-/// IfcIonConcentrationMeasure is a measure of particular ion concentration in a liquid, given in mg/L.
+/// NOTE: The two select types relate to the different ways to specifiy the sharpness (or shininess) of the specular part of the reflectance equation. It relates to the attributes: 
 /// 
-/// HISTORY: New type in IFC2x2.
-typedef double IfcIonConcentrationMeasure;
-/// IfcIsothermalMoistureCapacityMeasure is a measure of isothermal moisture capacity.
-/// Usually measured in m3/kg.
-/// Type: REAL
+/// in ISO10303-46 the attribute specular_exponent is given 
+///   in VRML97 the attribute shininess is given 
 /// 
-/// HISTORY New type in IFC Release 2x.
-typedef double IfcIsothermalMoistureCapacityMeasure;
-/// IfcKinematicViscosityMeasure is a measure of the viscous resistance of a medium to a moving body.
-/// Usually measured in m2/s.
-/// Type: REAL
+/// For each surface side style only one of the two methods is needed for calculating the specular part of the equation.
 /// 
-/// HISTORY New type in IFC Release 2.0.
-typedef double IfcKinematicViscosityMeasure;
-/// Definition from ISO/CD 10303-41:1992: A label is the term by which something may be referred to.  It is a string which represents the human-interpretable name of something and shall have a natural-language meaning.
+/// HISTORY: New type in IFC2x2.
+typedef IfcUtil::IfcBaseClass IfcSpecularHighlightSelect;
+/// Definition from IAI: This type definition shall be used to
+///   distinguish between a reference to an instance either of
+///   IfcStructuralItem or IfcBuildingElement. The
+///   IfcStructuralActivityAssignmentSelect type is referenced by the entity
+///   IfcRelConnectsStructuralActivity which defines the connection between
+///   activities (IfcStructuralActivity) and the loaded element.  
 /// 
-/// Type: STRING of up to 255 characters
+/// HISTORY: New type in Release IFC2x
+///   Edition 2.
+typedef IfcUtil::IfcBaseClass IfcStructuralActivityAssignmentSelect;
+/// IfcSurfaceOrFaceSurface provides the option to either select a geometric surface (IfcSurface
+/// and subtypes) within a geometric model, or a face with associated surface geometry and coordinates (IfcFaceSurface) within a topological model.
+/// SELECT 
 /// 
-/// NOTE Corresponding STEP name: label, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
+/// IfcSurface 
+///   IfcFaceSurface
+///   IfcFaceBasedSurfaceModel (a connected face set, representing a faceted surface as an approximation of a non planar, non rectangular bounded surface)
 /// 
-/// HISTORY New type in IFC Release 2x.
-/// IFC 2x4 CHANGE: Previously recommended size restriction of 255 characters is now mandatory.
+/// HISTORY  New select type in IFC2x3.
+typedef IfcUtil::IfcBaseClass IfcSurfaceOrFaceSurface;
+/// Definition from ISO/CD 10303-46:1992: The surface style element select is a selection of the different surface styles to use in the presentation of the side of a surface. 
 /// 
-/// As a human-readable string for naming purposes, a label is usually human-specified and locale-dependent (in contrast to purely machine-readable identifiers, IfcIdentifier).
+/// The select type only includes the IfcSurfaceStyleRendering (which is the equivalent to surface_style_rendering) from the select type surface_style_element_select. In addition it has the IfcSurfaceStyleLighting, which holds the exact physically based lighting properties for lighting based calculation algorithms (as the opposite to the rendering based calculation), the IfcSurfaceStyleRefraction (for more advanced refraction indices) and IfcSurfaceStyleWithTextures (to allow for image textures applied to surfaces). In addition an IfcExternallyDefinedSurfaceStyle can be selected that points into an external material library. 
 /// 
-/// Per ISO 10303-11, the set of characters that may appear in STRINGs is defined in ISO 10646.  The encoding of characters in case of file-based exchange is defined in ISO 10303-21 (STEP physical files) and ISO 10303-28 (XML files).  Among else, these specifications define the encoding of 8-bit characters from ISO 8859-1...-16 and of 2-byte Unicode characters.
-/// 
-/// Note that while IfcLabel is restricted to 255 characters, the size in exchange files after encoding may be considerably larger than 255 octets, depending on the particular encoding and on the contents of the label.
-typedef std::string IfcLabel;
-/// Definition from ISO/CD 10303-41:1992: A length measure is the value of a distance.
-/// Usually measured in millimeters (mm).
-/// Type: REAL
+/// NOTE The IfcSurfaceLightingProperties are needed for exact lighting calculation, because physically based lighting calculation algorithms need exact physically based parameters. The factors in IfcSurfaceStyleRendering lack the physical base, they are intended for rendering calculations, but a lighting calculation based software cannot use these values.
 /// 
-/// NOTE Corresponding ISO 10303 name: length_measure, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
+/// NOTE: Corresponding ISO 10303 type: surface_style_element_select. Please refer to ISO/IS 10303-46:1994, p. 85 for the final definition of the formal standard.
 /// 
-/// HISTORY New type in IFC Release 1.5.1.
-typedef double IfcLengthMeasure;
-/// IfcLinearForceMeasure is a measure of linear force.
-/// Usually measured in N/m.
-/// Type: REAL
+/// HISTORY: New Select type in IFC2x2.
+typedef IfcUtil::IfcBaseClass IfcSurfaceStyleElementSelect;
+/// The symbol style select allows for the selection of styles to be assigned to an annotated symbol.
 /// 
-/// HISTORY New type in IFC Release 2x.
-typedef double IfcLinearForceMeasure;
-/// IfcLinearMomentMeasure is a measure of linear moment.
-/// Usually measured in Nm/m.
-/// Type: REAL
+/// NOTE: The selection is restricted to colour within the current release of IFC
 /// 
-/// HISTORY New type in IFC Release 2x.
-typedef double IfcLinearMomentMeasure;
-/// IfcLinearStiffnessMeasureA measure of linear stiffness.
-/// Usually measured in N/m.
-/// Type: REAL
+/// NOTE Corresponding ISO 10303 name: symbol_style_select. Please refer to ISO/IS 10303-46:1994 for the final definition of the formal standard.
 /// 
-/// HISTORY New type in IFC Release 2x.
-typedef double IfcLinearStiffnessMeasure;
-/// IfcLinearVelocityMeasure is a measure of the velocity of a body measured in terms of distance moved per unit time.
-/// Usually measured in m/s.
-/// Type: REAL
+/// HISTORY New entity in IFC2x2.
+typedef IfcUtil::IfcBaseClass IfcSymbolStyleSelect;
+/// IfcTextFontSelect allows for either a predefined text font, a text font model or an externally defined text font to be used to describe the font of a text literal. The definition of the text font model is based on W3C TR Cascading Style Sheet Version 1, whereas the definition of predefined text font is based on ISO 10303.
 /// 
-/// HISTORY New type in IFC Release 2.0.
-typedef double IfcLinearVelocityMeasure;
-/// IfcLogical</iL is a defined type of simple type Logical. It is required since a select type (IfcSimpleValue) cannot directly include simple types in its select list). Logical datatype can have values TRUE, FALSE or UNKNOWN.
+/// NOTE  IfcTextFontSelect is an entity that had been adopted from ISO 10303, Industrial automation systems and integration—Product data representation and exchange, Part 46: Integrated generic resources: Visual presentation. Corresponding ISO 10303 name: font_select. Please refer to ISO/IS 10303-46:1994, p. 133 for the final definition of the formal standard.
 /// 
-/// Type: LOGICAL
+/// HISTORY  New type in IFC2x2.
 /// 
-/// HISTORY New type in IFC Release 2x.
-typedef bool IfcLogical;
-/// IfcLuminousFluxMeasure is a measure of the luminous flux.
-/// Usually measured in Lumen (lm, Candela Steradian).
-/// Type: REAL
+/// IFC2x3 CHANGE  The select type has been renamed from IfcFontSelect.
+typedef IfcUtil::IfcBaseClass IfcTextFontSelect;
+/// The text style select allows for the selection of styles to be assigned to an annotated text. The text style determines the text model that affect the visual presentation of characters, spaces, words, and paragraphs. There are two choices:
 /// 
-/// HISTORY New type in IFC Release 2x.
-typedef double IfcLuminousFluxMeasure;
-/// IfcLuminousIntensityDistributionMeasure is a measure of the luminous intensity of a light source that changes according to the direction of the ray. It is normally based on some standardized distribution light distribution curves. 
+/// IfcTextStyleWithBoxCharacteristics for definitions from ISO/IS 10303-46:1994 for (old) vector based and monospace text.
+///   IfcTextStyleTextModel for definitions from Cascading
+/// Style Sheets, level 1, W3C Recommendation 17 Dec 1996, revised 11 Jan 1999, CSS1, for all true type text. The use of the CSS1 definitions is the preferred way to represent text styles.
 /// 
-/// Usually measured in Candela/Lumen (cd/lm) or (cd/klm).  
+/// HISTORY  New type in IFC2x2.
 /// 
-/// Type: REAL  
+/// IFC2x3 CHANGE  The items within the IfcTextStyleSelect have changed to IfcTextStyleWithBoxCharacteristics and IfcTextStyleTextModel.
+typedef IfcUtil::IfcBaseClass IfcTextStyleSelect;
+/// Definition from ISO/CD 10303-42:1992: This select type identifies the two possible ways of trimming a parametric curve; by a Cartesian point on the curve, or by a REAL number defining a parameter value within the parametric range of the curve. 
 /// 
-/// HISTORY New type in IFC2x2.
-typedef double IfcLuminousIntensityDistributionMeasure;
-/// Definition from ISO/CD 10303-41:1992: A luminous intensity measure is the value for the brightness of a body.
-/// Usually measured in candela (cd).
-/// Type: REAL
+/// NOTE Corresponding ISO 10303 type: trimming_select, please refer to ISO/IS 10303-42:1994, p. 20 for the final definition of the formal standard.
 /// 
-/// NOTE Corresponding ISO 10303 name: luminous_intensity_measure, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
+/// HISTORY New Type in IFC Release 1.0
+typedef IfcUtil::IfcBaseClass IfcTrimmingSelect;
+/// Definition from ISO/CD 10303-41:1992: A unit is a physical quantity, with a value of one, which is used as a standard in terms of which other quantities are expressed.
 /// 
-/// HISTORY New type in IFC Release 1.5.1.
-typedef double IfcLuminousIntensityMeasure;
-/// IfcMagneticFluxDensityMeasure is a measure of the magnetic flux density.
-/// Usually measured in Tesla (T, Weber/m2 = V s/m2).
-/// Type: REAL
+/// NOTE: Select item IfcMonetaryUnit is an addition to ISO 10303-41.
 /// 
-/// HISTORY New type in IFC Release 2x.
-typedef double IfcMagneticFluxDensityMeasure;
-/// IfcMagneticFluxMeasure is a measure of the magnetic flux.
-/// Usually measured in Weber (Wb, V s).
-/// Type: REAL
+/// NOTE: Corresponding ISO 10303 name: unit, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
 /// 
-/// HISTORY New type in IFC Release 2x.
-typedef double IfcMagneticFluxMeasure;
-/// IfcMassDensityMeasure is a measure of the density of a medium.
-/// Usually measured in kg/m3.
-/// Type: REAL
+/// SELECT 
 /// 
-/// HISTORY New type in IFC Release 2.0.
-typedef double IfcMassDensityMeasure;
-/// IfcMassFlowRateMeasure is a measure of the mass of a medium flowing per unit time.
-/// Usually measured in kg/s.
-/// Type: REAL
+/// IfcNamedUnit: A unit which is identified by a name.
+/// IfcDerivedUnit: A unit which is derived from an expression of units. 
+/// IfcMonetaryUnit: A unit for defining currencies. 
 /// 
-/// HISTORY New type in IFC Release 2.0.
-typedef double IfcMassFlowRateMeasure;
-/// Definition from ISO/CD 10303-41:1992: A mass measure is the value of the amount of matter that a body contains.
-/// Usually measured in kilograms (kg) or grams (g).
-/// Type: REAL
+/// HISTORY: New type in IFC Release 1.5.1.
+typedef IfcUtil::IfcBaseClass IfcUnit;
+/// IfcValue is a select type for selecting between more specialised select types IfcSimpleValue,
+/// IfcMeasureValue and IfcDerivedMeasureValue.
 /// 
-/// NOTE Corresponding ISO 10303 name: mass_measure, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
+/// SELECT 
 /// 
-/// HISTORY New type in IFC Release 1.5.1.
-typedef double IfcMassMeasure;
-/// IfcMassPerLengthMeasure is a measure for mass per length. For example for rolled steel profiles the weight of
-///   an imaginary beam is usually expressed by kg/m length for cost calculation and
-///   structural analysis purposes.
+/// IfcSimpleValue A select type for basic defined types of simple data type. 
+///   IfcMeasureValue A select type for basic measure types of ISO 10303-41. 
+///   IfcDerivedMeasureValue A select type for derived measure types.
 /// 
-/// Type: REAL
+/// HISTORY New type in IFC Release 2x.
+typedef IfcUtil::IfcBaseClass IfcValue;
+/// Definition from ISO/CD 10303-42:1992: This type is used to
+///   identify the types of entity which can participate in vector computations. 
 /// 
-/// HISTORY New type in IFC2x2.
-typedef double IfcMassPerLengthMeasure;
-
-typedef int IfcMinuteInHour;
-/// IfcModulusOfElasticityMeasure is a measure of modulus of elasticity.
-/// Usually measured in N/m2.
-/// Type: REAL
+/// NOTE Corresponding STEP type:
+///   vector_or_direction, please refer to ISO/IS 10303-42:1994, p. 20 for the final
+///   definition of the formal standard.  
+///   HISTORY New Type in IFC Release
+///   1.5
+typedef IfcUtil::IfcBaseClass IfcVectorOrDirection;
+namespace IfcActionSourceTypeEnum {
+/// Definition from IAI:This enumeration type contains possible
+///   action sources. 
 /// 
-/// HISTORY New type in IFC Release 2x.
-typedef double IfcModulusOfElasticityMeasure;
-/// IfcModulusOfLinearSubgradeReactionMeasure is a measure for modulus of linear subgrade reaction, which expresses the elastic bedding of a linear structural element per length, such as for a beam. It is typically measured in N/m^2.
+/// HISTORY: New type in Release IFC2x
+///   Edition 2.
+typedef enum {IfcActionSourceType_DEAD_LOAD_G, IfcActionSourceType_COMPLETION_G1, IfcActionSourceType_LIVE_LOAD_Q, IfcActionSourceType_SNOW_S, IfcActionSourceType_WIND_W, IfcActionSourceType_PRESTRESSING_P, IfcActionSourceType_SETTLEMENT_U, IfcActionSourceType_TEMPERATURE_T, IfcActionSourceType_EARTHQUAKE_E, IfcActionSourceType_FIRE, IfcActionSourceType_IMPULSE, IfcActionSourceType_IMPACT, IfcActionSourceType_TRANSPORT, IfcActionSourceType_ERECTION, IfcActionSourceType_PROPPING, IfcActionSourceType_SYSTEM_IMPERFECTION, IfcActionSourceType_SHRINKAGE, IfcActionSourceType_CREEP, IfcActionSourceType_LACK_OF_FIT, IfcActionSourceType_BUOYANCY, IfcActionSourceType_ICE, IfcActionSourceType_CURRENT, IfcActionSourceType_WAVE, IfcActionSourceType_RAIN, IfcActionSourceType_BRAKES, IfcActionSourceType_USERDEFINED, IfcActionSourceType_NOTDEFINED} IfcActionSourceTypeEnum;
+const char* ToString(IfcActionSourceTypeEnum v);
+IfcActionSourceTypeEnum FromString(const std::string& s);
+}
+namespace IfcActionTypeEnum {
+/// Definition from IAI: This enumeration type is used to distinguish
+///   between possible action types at a high level. It can be used for an automated
+///   definition of load combinations and for dimensioning. The contained items and
+///   their acronyms are adopted from the Eurocode standard. 
 /// 
-/// Type: REAL  
+/// HISTORY: New type in Release IFC2x
+///   Edition 2.
+typedef enum {IfcActionType_PERMANENT_G, IfcActionType_VARIABLE_Q, IfcActionType_EXTRAORDINARY_A, IfcActionType_USERDEFINED, IfcActionType_NOTDEFINED} IfcActionTypeEnum;
+const char* ToString(IfcActionTypeEnum v);
+IfcActionTypeEnum FromString(const std::string& s);
+}
+namespace IfcActuatorTypeEnum {
+/// The IfcActuatorTypeEnum defines the range of different types of actuator that can be specified. 
 /// 
-/// HISTORY New type in IFC Release 2x2.
-typedef double IfcModulusOfLinearSubgradeReactionMeasure;
-/// IfcModulusOfRotationalSubgradeReactionMeasure is a measure for modulus of rotational subgrade reaction, which expresses the rotational elastic bedding of a linear structural element per length, such as for a beam. It is typically measured in Nm/(m*rad). 
+/// HISTORY: New type in IFC
+///   R2.0  
+///   Enumeration 
 /// 
-/// Type: REAL  
+/// ELECTRICACTUATOR: A device that electrically actuates a control element.  
+/// PNEUMATICACTUATOR<: A device that pneumatically actuates a control element  
+/// HYDRAULICACTUATOR: A device that electrically actuates a control element.  
+/// HANDOPERATEDACTUATOR: A device that manually actuates a control element. 
+/// THERMOSTATICACTUATOR: A device that thermostatically actuates a control element. 
+/// USERDEFINED: User-defined type. 
+/// NOTDEFINED: Undefined type. 
 /// 
-/// HISTORY New type in IFC2x2.
-typedef double IfcModulusOfRotationalSubgradeReactionMeasure;
-/// IfcModulusOfSubgradeReactionMeasure is a geotechnical measure describing interaction between foundation structures and the soil. May also be known as bedding measure. 
-///   Usually measured in N/m3.  
-///   Type: REAL  
+/// See property set of actuator common attributes for specification of
+///   properties for hand operated actuators.
+typedef enum {IfcActuatorType_ELECTRICACTUATOR, IfcActuatorType_HANDOPERATEDACTUATOR, IfcActuatorType_HYDRAULICACTUATOR, IfcActuatorType_PNEUMATICACTUATOR, IfcActuatorType_THERMOSTATICACTUATOR, IfcActuatorType_USERDEFINED, IfcActuatorType_NOTDEFINED} IfcActuatorTypeEnum;
+const char* ToString(IfcActuatorTypeEnum v);
+IfcActuatorTypeEnum FromString(const std::string& s);
+}
+namespace IfcAddressTypeEnum {
+/// Definition from IAI: Identifies the logical location of the address.
 /// 
 /// HISTORY New type in IFC Release 2x.
 /// 
-/// Figure 290 illustrates elastic support of a planar member.
+/// ENUMERATION 
 /// 
-/// Figure 290 — Modulus of subgrade reaction measure
-typedef double IfcModulusOfSubgradeReactionMeasure;
-/// IfcMoistureDiffusivityMeasure is a measure of moisture diffusivity.
-/// Usually measured in m3/s.
-/// Type: REAL
+/// OFFICE An office address. 
+///   SITE A site address.
+///   HOME A home address.
+///   DISTRIBUTIONPOINT A postal distribution point address.
+///   USERDEFINED A user defined address type to be provided.
+typedef enum {IfcAddressType_OFFICE, IfcAddressType_SITE, IfcAddressType_HOME, IfcAddressType_DISTRIBUTIONPOINT, IfcAddressType_USERDEFINED} IfcAddressTypeEnum;
+const char* ToString(IfcAddressTypeEnum v);
+IfcAddressTypeEnum FromString(const std::string& s);
+}
+namespace IfcAheadOrBehind {
+
+typedef enum {IfcAheadOrBehind_AHEAD, IfcAheadOrBehind_BEHIND} IfcAheadOrBehind;
+const char* ToString(IfcAheadOrBehind v);
+IfcAheadOrBehind FromString(const std::string& s);
+}
+namespace IfcAirTerminalBoxTypeEnum {
+/// This enumeration identifies different types of air terminal boxes.   
 /// 
-/// HISTORY New type in IFC Release 2x.
-typedef double IfcMoistureDiffusivityMeasure;
-/// IfcMolecularWeightMeasure is a measure of molecular weight of material (typically gas).
-/// Usually measured in g/mole.
-/// Type: REAL
+/// Valid enumerations are:
 /// 
-/// HISTORY New type in IFC Release 2x.
-typedef double IfcMolecularWeightMeasure;
-/// IfcMomentOfInertiaMeasure is a measure of moment of inertia.
-/// Usually measured in m4.
-/// Type: REAL
+/// CONSTANTFLOW:  Terminal box does not include a means to reset the volume automatically to an outside signal such as thermostat.
+///   VARIABLEFLOWPRESSUREDEPENDANT:  terminal box includes a means to reset the volume automatically to a different control point in response to an outside signal such as thermostat: air-flow rate depends on supply pressure.
+///   VARIABLEFLOWPRESSUREINDEPENDANT:  terminal box includes a means to reset the volume automatically to a different control point in response to an outside signal such as thermostat: air-flow rate is independant of supply pressure.
+///   USERDEFINED:				  User-defined terminal box.
+///   NOTDEFINED:					  Undefined terminal box.
 /// 
-/// HISTORY New type in IFC Release 2x.
-typedef double IfcMomentOfInertiaMeasure;
-/// A monetary measure is the value of an amount of money without regard to its currency.
-/// Type: REAL
+/// HISTORY: New enumeration in IFC R2.0
+typedef enum {IfcAirTerminalBoxType_CONSTANTFLOW, IfcAirTerminalBoxType_VARIABLEFLOWPRESSUREDEPENDANT, IfcAirTerminalBoxType_VARIABLEFLOWPRESSUREINDEPENDANT, IfcAirTerminalBoxType_USERDEFINED, IfcAirTerminalBoxType_NOTDEFINED} IfcAirTerminalBoxTypeEnum;
+const char* ToString(IfcAirTerminalBoxTypeEnum v);
+IfcAirTerminalBoxTypeEnum FromString(const std::string& s);
+}
+namespace IfcAirTerminalTypeEnum {
+/// Enumeration defining the functional types of air terminals. 
+///   The IfcAirTerminalTypeEnum contains the following:
 /// 
-/// HISTORY New type in IFC Release 2.0.
-typedef double IfcMonetaryMeasure;
-/// Definition from IAI: The IfcDayInMonthNumber is
-/// an integer that defines the position of the specified month in a
-/// year. The positions have the following meaning (according to
-/// ISO8601 "calendar month") that assigns the Calendar month number
-/// to the Calender month name.
-/// NOTE Refer to ISO 8601 for the definitions for
-/// using the Gregorian calendar as the standard for the
-/// identification of calendar days.
+/// GRILLE: A covering for any area through which air passes.
+///   REGISTER: A grille typically equipped with a damper or control valve.
+///   DIFFUSER: An outlet discharging supply air in various directions and planes.
+///   LOUVRE: A rectilinear louvre.
+///   USERDEFINED: User-defined air terminal type.
+///   NOTDEFINED:  Undefined air terminal type.
 /// 
-/// Calendar month number
-/// Calendar month
-/// name
+/// NOTE: Architectural louvres within doors or windows are defined by IfcPermeableCoveringProperties.
 /// 
-/// 01
-/// January
+/// HISTORY: New enumeration in IFC R2x2.  Modified in IFC R2x4 to add LOUVRE and remove EYEBALL, IRIS, LINEARGRILLE, LINEARDIFFUSER
+typedef enum {IfcAirTerminalType_GRILLE, IfcAirTerminalType_REGISTER, IfcAirTerminalType_DIFFUSER, IfcAirTerminalType_EYEBALL, IfcAirTerminalType_IRIS, IfcAirTerminalType_LINEARGRILLE, IfcAirTerminalType_LINEARDIFFUSER, IfcAirTerminalType_USERDEFINED, IfcAirTerminalType_NOTDEFINED} IfcAirTerminalTypeEnum;
+const char* ToString(IfcAirTerminalTypeEnum v);
+IfcAirTerminalTypeEnum FromString(const std::string& s);
+}
+namespace IfcAirToAirHeatRecoveryTypeEnum {
+/// Defines general types of pumps.
+///   The IfcPumpTypeEnum contains the following:
 /// 
-/// 02
-/// February
+/// FIXEDPLATECOUNTERFLOWEXCHANGER: Heat exchanger with moving parts and alternate layers of plates, separated and sealed from the exhaust and supply air stream passages with primary air enters at secondary air outlet location and exits at secondary air inlet location.
+///   FIXEDPLATECROSSFLOWEXCHANGER: Heat exchanger with moving parts and alternate layers of plates, separated and sealed from the exhaust and supply air stream passages with secondary air flow in the direction perpendicular to primary air flow.
+///   FIXEDPLATEPARALLELFLOWEXCHANGER: Heat exchanger with moving parts and alternate layers of plates, separated and sealed from the exhaust and supply air stream passages with primary air enters at secondary air inlet location and exits at secondary air outlet location.
+///   ROTARYWHEEL: A heat wheel with a revolving cylinder filled with an air-permeable medium having a large internal surface area.
+///   RUNAROUNDCOILLOOP: A typical coil energy recovery loop places extended surface, finned tube water coils in the supply and exhaust airstreams of a building.
+///   HEATPIPE: A passive energy recovery device with a heat pipe divided into evaporator and condenser sections.
+///   TWINTOWERENTHALPYRECOVERYLOOPS: An air-to-liquid, liquid-to-air enthalpy recovery system with a sorbent liquid circulates continuously between supply and exhaust airstreams, alternately contacting both airstreams directly in contactor towers.
+///   THERMOSIPHONSEALEDTUBEHEATEXCHANGERS: Sealed systems that consist of an evaporator, a condenser, interconnecting piping, and an intermediate working fluid that is present in both liquid and vapor phases where the evaporator and the condenser are usually at opposite ends of a bundle of straight, individual thermosiphon tubes and the exhaust and supply ducts are adjacent to each other.
+///   THERMOSIPHONCOILTYPEHEATEXCHANGERS: Sealed systems that consist of an evaporator, a condenser, interconnecting piping, and an intermediate working fluid that is present in both liquid and vapor phases where the evaporator and condensor coils are installed independently in the ducts and are interconnected by the working fluid piping.
+///   USERDEFINED: User-defined air to air heat recovery type.
+///   NOTDEFINED:  Undefined air to air heat recovery type.
 /// 
-/// 03
-/// March
+/// HISTORY: New enumeration in IFC R2x.
+typedef enum {IfcAirToAirHeatRecoveryType_FIXEDPLATECOUNTERFLOWEXCHANGER, IfcAirToAirHeatRecoveryType_FIXEDPLATECROSSFLOWEXCHANGER, IfcAirToAirHeatRecoveryType_FIXEDPLATEPARALLELFLOWEXCHANGER, IfcAirToAirHeatRecoveryType_ROTARYWHEEL, IfcAirToAirHeatRecoveryType_RUNAROUNDCOILLOOP, IfcAirToAirHeatRecoveryType_HEATPIPE, IfcAirToAirHeatRecoveryType_TWINTOWERENTHALPYRECOVERYLOOPS, IfcAirToAirHeatRecoveryType_THERMOSIPHONSEALEDTUBEHEATEXCHANGERS, IfcAirToAirHeatRecoveryType_THERMOSIPHONCOILTYPEHEATEXCHANGERS, IfcAirToAirHeatRecoveryType_USERDEFINED, IfcAirToAirHeatRecoveryType_NOTDEFINED} IfcAirToAirHeatRecoveryTypeEnum;
+const char* ToString(IfcAirToAirHeatRecoveryTypeEnum v);
+IfcAirToAirHeatRecoveryTypeEnum FromString(const std::string& s);
+}
+namespace IfcAlarmTypeEnum {
+/// The IfcAlarmTypeEnum defines the range of different types of alarm that can be specified. 
 /// 
-/// 04
-/// April
+/// HISTORY: New type in IFC 2x2
 /// 
-/// 05
-/// May
+/// Enumeration 
 /// 
-/// 06
-/// June
+/// BELL: An audible alarm. 
+/// BREAKGLASSBUTTON: An alarm activation mechanism in which a protective glass has to be broken to enable a button to be pressed. 
+/// LIGHT: A visual alarm. 
+/// MANUALPULLBOX: An alarm activation mechanism in which activation is achieved by a pulling action. 
+/// SIREN: An audible alarm. 
+/// WHISTLE: An audible alarm.  
+/// USERDEFINED: User-defined type. 
+/// NOTDEFINED: Undefined type.
+typedef enum {IfcAlarmType_BELL, IfcAlarmType_BREAKGLASSBUTTON, IfcAlarmType_LIGHT, IfcAlarmType_MANUALPULLBOX, IfcAlarmType_SIREN, IfcAlarmType_WHISTLE, IfcAlarmType_USERDEFINED, IfcAlarmType_NOTDEFINED} IfcAlarmTypeEnum;
+const char* ToString(IfcAlarmTypeEnum v);
+IfcAlarmTypeEnum FromString(const std::string& s);
+}
+namespace IfcAnalysisModelTypeEnum {
+/// Definition from IAI: This type definition is used to distinguish
+///   between different types of structural analysis models. The analysis models are
+///   differentiated by their dimensionality. 
 /// 
-/// 07
-/// July
+/// HISTORY: New type in Release IFC2x
+///   Edition 2.
+typedef enum {IfcAnalysisModelType_IN_PLANE_LOADING_2D, IfcAnalysisModelType_OUT_PLANE_LOADING_2D, IfcAnalysisModelType_LOADING_3D, IfcAnalysisModelType_USERDEFINED, IfcAnalysisModelType_NOTDEFINED} IfcAnalysisModelTypeEnum;
+const char* ToString(IfcAnalysisModelTypeEnum v);
+IfcAnalysisModelTypeEnum FromString(const std::string& s);
+}
+namespace IfcAnalysisTheoryTypeEnum {
+/// Definition from IAI: This type definition is used to distinguish
+///   between different types of structural analysis methods, i.e. first order
+///   theory, second order theory (small deformations), third order theory (large
+///   deformations) and the full nonlinear theory (geometric nonlinearity together with other nonlinearities, e.g. plasticity). 
 /// 
-/// 08
-/// August
+/// HISTORY: New type in Release IFC2x
+///   Edition 2.
+typedef enum {IfcAnalysisTheoryType_FIRST_ORDER_THEORY, IfcAnalysisTheoryType_SECOND_ORDER_THEORY, IfcAnalysisTheoryType_THIRD_ORDER_THEORY, IfcAnalysisTheoryType_FULL_NONLINEAR_THEORY, IfcAnalysisTheoryType_USERDEFINED, IfcAnalysisTheoryType_NOTDEFINED} IfcAnalysisTheoryTypeEnum;
+const char* ToString(IfcAnalysisTheoryTypeEnum v);
+IfcAnalysisTheoryTypeEnum FromString(const std::string& s);
+}
+namespace IfcArithmeticOperatorEnum {
+/// IfcArithmeticOperatorEnum specifies the form of arithmetical operation implied by the relationship. 
+/// Enumeration 
 /// 
-/// 09
-/// September
+/// ADD 
+///   DIVIDE 
+///   MULTIPLY 
+///   SUBTRACT 
 /// 
-/// 10
-/// October
+/// HISTORY: New enumeration in IFC2x2.
 /// 
-/// 11
-/// November
+/// Use definitions 
+/// There can be only one arithmetic operator for each applied value relationship. This is to enforce arithmetic consistency. Given this consistency, the cardinality of the IfcAppliedValueRelationship.Components attribute is a set of one to many applied values that are components of an applied value.
+typedef enum {IfcArithmeticOperator_ADD, IfcArithmeticOperator_DIVIDE, IfcArithmeticOperator_MULTIPLY, IfcArithmeticOperator_SUBTRACT} IfcArithmeticOperatorEnum;
+const char* ToString(IfcArithmeticOperatorEnum v);
+IfcArithmeticOperatorEnum FromString(const std::string& s);
+}
+namespace IfcAssemblyPlaceEnum {
+/// Definition from IAI: Enumeration defining where the
+///   assembly is intended to take place, either in a factory or
+///   on the building site.
 /// 
-/// 12
-/// December
+/// HISTORY New enumeration in
+///   Release IFC2x Edition 2.
 /// 
-/// Type: INTEGER
-/// NOTE Corresponding STEP
-/// name: month_in_year_number, please refer to ISO/IS 10303-41:1994
-/// for the final definition of the formal
-/// standard.
-/// HISTORY New type in IFC
-/// Release 1.5.1.
-typedef int IfcMonthInYearNumber;
-/// Definition from ISO/CD 10303-41:1992: A numeric measure is the numeric value of a physical quantity.
-/// Type: NUMBER
+/// Enumeration
 /// 
-/// NOTE Corresponding ISO 10303 name: numeric_measure, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
+/// SITE - this assembly is assembled at site
 /// 
-/// HISTORY New type in IFC Release 1.5.1.
-typedef double IfcNumericMeasure;
-/// IfcPHMeasure is a measure of the molar hydrogen ion concentration in a liquid (usually defined as the measure of acidity) in a range from 0 to 14.
+/// FACTORY - this assembly is assembled in a factory
+typedef enum {IfcAssemblyPlace_SITE, IfcAssemblyPlace_FACTORY, IfcAssemblyPlace_NOTDEFINED} IfcAssemblyPlaceEnum;
+const char* ToString(IfcAssemblyPlaceEnum v);
+IfcAssemblyPlaceEnum FromString(const std::string& s);
+}
+namespace IfcBSplineCurveForm {
+/// Definition from ISO/CD 10303-42:1992: This type is used to indicate that the B-spline curve represents a part of a curve of some specific form.
 /// 
-/// HISTORY: New type in IFC 2x2.
-typedef double IfcPHMeasure;
-/// Definition from ISO/CD 10303-41:1992: A parameter value is the value which specifies the amount of a 
-/// parameter in some parameter space.
-/// Type: REAL
+/// Enumeration
 /// 
-/// NOTE Corresponding STEP name: parameter_value, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
+/// polyline form: A connected sequence of line segments represented by degree 1 B-spline basis functions.
+/// circular arc: An arc of a circle, or a complete circle represented by a B-spline curve.
+/// elliptic arc: An arc of an ellipse, or a complete ellipse, represented by a B-spline curve.
+/// parabolic arc: An arc of finite length of a parabola represented by a B-spline curve.
+/// hyperbolic arc: An arc of finite length of one branch of a hyperbola represented by a B-spline curve.
+/// unspecified: A B-spline curve for which no particular form is specified.
 /// 
-/// HISTORY New type in IFC Release 1.5.1.
-typedef double IfcParameterValue;
-/// IfcPlanarForceMeasure is a measure of force on an area.
-/// Usually measured in N/m2.
-/// Type: REAL
+/// NOTE  Corresponding ISO 10303 type: b_spline_curve_form. Please refer to ISO/IS 10303-42:1994, p. 15 for the final definition of the formal standard.
 /// 
-/// HISTORY New type in IFC Release 2x.
-typedef double IfcPlanarForceMeasure;
-/// Definition from ISO/CD 10303-41:1992: A plane angle measure is the value of an angle in a plane.
+/// HISTORY  New type in Release IFC2x2.
+typedef enum {IfcBSplineCurveForm_POLYLINE_FORM, IfcBSplineCurveForm_CIRCULAR_ARC, IfcBSplineCurveForm_ELLIPTIC_ARC, IfcBSplineCurveForm_PARABOLIC_ARC, IfcBSplineCurveForm_HYPERBOLIC_ARC, IfcBSplineCurveForm_UNSPECIFIED} IfcBSplineCurveForm;
+const char* ToString(IfcBSplineCurveForm v);
+IfcBSplineCurveForm FromString(const std::string& s);
+}
+namespace IfcBeamTypeEnum {
+/// Definition from IAI: This enumeration defines the
+/// different types of linear elements an IfcBeamType object
+/// can fulfill:
 /// 
-/// Usually measured in radian (rad, m/m = 1), but also grads may be used. The grad unit may be declared as a conversion based unit based on radian unit.
+/// BEAM: A standard beam usually used horizontally.
+/// JOIST: A beam used to support a floor or ceiling.
+/// HOLLOWCORE: A wide often prestressed beam with a
+/// hollow-core profile that usually serves as a slab component.
+/// LINTEL: A beam or horizontal piece of material over an
+/// opening (e.g. door, window).
+/// SPANDREL: A tall beam placed on the facade of a
+/// building. One tall side is usually finished to provide the
+/// exterior of the building. Can be used to support joists or slab
+/// elements on its interior side.
 /// 
-/// NOTE IfcPlaneAngleMeasure is used where angles need to be described to an accuracy of less than one degree and expressed as decimal parts of an angle. It is widely used for angular measurement except for situations where accuracy needs to be defined using arc measurement; for which purpose the IfcCompoundPlaneAngleMeasure is provided.
+/// NOTE  They are also referred to as "spandrel
+/// panels", which are parts of a facade and sometimes have
+/// supporting consoles for floor slabs
+/// integrated.
 /// 
-/// Type: REAL
+/// T_BEAM: A beam that forms part of a slab construction
+/// and acts together with the slab which its carries. Such beams are
+/// often of T-shape (therefore the English name), but may have other
+/// shapes as well, e.g. an L-Shape or an Inverted-T-Shape.
 /// 
-/// NOTE Corresponding ISO 10303 name: plane_angle_measure, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
+/// NOTE  In order to distinguish beams by shape,
+/// the assigned IfcProfileDef subtypes provide the shape type
+/// and, if using a subtype of
+/// IfcParameterizedProfileDef, also the shape
+/// parameterization.
 /// 
-/// HISTORY New type in IFC Release 1.5.1.
-typedef double IfcPlaneAngleMeasure;
-/// Definition from ISO/CD 10303-41:1992: A positive length measure is a length measure that is greater than zero.
-/// Type: IfcLengthMeasure
+/// USERDEFINED: User-defined linear beam element.
+/// NOTDEFINED: Undefined linear beam element
 /// 
-/// NOTE Corresponding ISO 10303 name: positive_length_measure, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
+/// HISTORY  New Enumeration
+/// in Release IFC2x Edition 2.
+/// IFC2x4 CHANGE  The enumerators
+/// HOLLOWCORE and SPANDREL have been
+/// added.
+typedef enum {IfcBeamType_BEAM, IfcBeamType_JOIST, IfcBeamType_LINTEL, IfcBeamType_T_BEAM, IfcBeamType_USERDEFINED, IfcBeamType_NOTDEFINED} IfcBeamTypeEnum;
+const char* ToString(IfcBeamTypeEnum v);
+IfcBeamTypeEnum FromString(const std::string& s);
+}
+namespace IfcBenchmarkEnum {
+/// IfcBenchmarkEnum is an enumeration used to identify the logical comparators that can be applied in conjunction with constraint values. 
 /// 
-/// HISTORY New type in IFC Release 1.5.1.
-typedef IfcLengthMeasure IfcPositiveLengthMeasure;
-/// Definition from ISO/CD 10303-41:1992: Positive plane angle measure is a plane angle measure that is greater than zero.
-/// Type: IfcPlaneAngleMeasure 
+/// HISTORY: New type in IFC Release 2.0
 /// 
-/// NOTE Corresponding STEP name: positive_plane_angle_measure, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
+/// IFC2x4 CHANGE: Extended to include comparators for item-set and set-item comparisons: INCLUDES, NOTINCLUDES, INCLUDEDIN and NOTINCLUDEDIN, to test if an individual item is a member of a given aggregation, or if an aggregation has a given individual item as a member.
 /// 
-/// HISTORY New type in IFC Release 1.5.1.
-typedef IfcPlaneAngleMeasure IfcPositivePlaneAngleMeasure;
-/// IfcPowerMeasure is a measure of power required or used.
-/// Usually measured in Watts (W, J/s).
-/// Type: REAL
+/// Enumeration 
 /// 
-/// HISTORY New type in IFC Release 2.0.
-typedef double IfcPowerMeasure;
-/// IfcPresentableText is a text string used to capture the content of a text literal for the purpose of presentation. The IfcPresentableText can include multiple lines of text, for which the line feed character LF, 0x0A, should be used to separate lines.
+/// Value 
+///   Definition 
 /// 
-/// NOTE  The non printable characters are converted within the standard exchange format ISO 10303-21 (STEP physical file format), commonly the \X\09 represents the TAB, and \X\0A the LF character.
+/// GREATERTHAN 
+///   Identifies that a value must be greater than that set by the constraint. 
 /// 
-/// NOTE  The IfcPresentableText is an entity that had been adopted from ISO 10303, Industrial automation systems and integration—Product data representation and exchange, Part 46: Integrated generic resources: Visual presentation.
+/// GREATERTHANOREQUALTO 
+///   Identifies that a value must be either greater than or equal to that set by the constraint. 
 /// 
-/// NOTE  Corresponding ISO 10303 name: presentable_text. Please refer to ISO/IS 10303-46:1994, p. 133 for the final definition of the formal standard.
+/// LESSTHAN 
+///   Identifies that a value must be less than that set by the constraint. 
 /// 
-/// HISTORY  New type in IFC2x2.
-typedef std::string IfcPresentableText;
-/// IfcPressureMeasure is a measure of the quantity of a medium acting on a unit area.
-/// Usually measured in Pascals (Pa, N/m2).
-/// Type: REAL
+/// LESSTHANOREQUALTO 
+///   Identifies that a value must be either less than or equal to that set by the constraint. 
 /// 
-/// HISTORY New type in IFC Release 2.0.
-typedef double IfcPressureMeasure;
-/// IfcRadioActivityMeasure is a measure of activity of radionuclide.
-/// Usually measured in Becquerel (Bq, 1/s).
-/// Type: REAL
+/// EQUALTO 
+///   Identifies that a value must be equal to that set by the constraint. 
 /// 
-/// HISTORY New type in IFC Release 2x.
-typedef double IfcRadioActivityMeasure;
-/// Definition from ISO/CD 10303-41:1992: A ratio measure is the value of the relation between two 
-/// physical quantities that are of the same kind.
+/// NOTEQUALTO 
+///   Identifies that a value must be not equal to that set by the constraint. 
 /// 
-/// NOTE: Input given in percent is to be divided by 100% when stored as an IfcRatioMeasure. For example, 25% becomes 0.25.
+/// INCLUDES 
+///   Identifies that an aggregation (set, list or table) must include the value (individual item) set by the constraint. 
 /// 
-/// Type: REAL
+/// NOTINCLUDES 
+///   Identifies that an aggregation (set, list or table) must not include (i.e must exclude) the value (individual item) set by the constraint. 
 /// 
-/// NOTE Corresponding STEP name: ratio_measure, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
+/// INCLUDEDIN 
+///   Identifies that a value (individual item) must be included in the aggregation (set, list or table) set by the constraint. 
 /// 
-/// HISTORY New type in IFC Release 1.5.1.
-typedef double IfcRatioMeasure;
-/// IfcReal is a defined type of simple data type REAL.  It is required since a select type (IfcSimpleValue), cannot directly include simple types in its select list.
+/// NOTINCLUDEDIN 
+///   Identifies that a value (individual item) must not be included (i.e. must be excluded) in the aggregation (set, list or table) set by the constraint.
+typedef enum {IfcBenchmark_GREATERTHAN, IfcBenchmark_GREATERTHANOREQUALTO, IfcBenchmark_LESSTHAN, IfcBenchmark_LESSTHANOREQUALTO, IfcBenchmark_EQUALTO, IfcBenchmark_NOTEQUALTO} IfcBenchmarkEnum;
+const char* ToString(IfcBenchmarkEnum v);
+IfcBenchmarkEnum FromString(const std::string& s);
+}
+namespace IfcBoilerTypeEnum {
+/// Enumeration defining the typical types of boilers.
+///   The IfcBoilerTypeEnum contains the following:
 /// 
-/// In principle, the domain of IfcReal (being a Real) is all rational, irrational and scientific real numbers. Here the precision is unconstrained, but in practice it is implementation specific.
+/// WATER: Water boiler.
+///   STEAM: Steam boiler.
+///   USERDEFINED: User-defined Boiler type.
+///   NOTDEFINED:  Undefined Boiler type.
 /// 
-/// Type: REAL
+/// HISTORY: New enumeration in IFC R2x.
+typedef enum {IfcBoilerType_WATER, IfcBoilerType_STEAM, IfcBoilerType_USERDEFINED, IfcBoilerType_NOTDEFINED} IfcBoilerTypeEnum;
+const char* ToString(IfcBoilerTypeEnum v);
+IfcBoilerTypeEnum FromString(const std::string& s);
+}
+namespace IfcBooleanOperator {
+/// Definition from ISO/CD 10303-42:1992: This type defines the three Boolean operators used in the definition of CSG solids.
 /// 
-/// HISTORY: New type in IFC Release 1.5.1.
-typedef double IfcReal;
-/// IfcRotationalFrequencyMeasure is a measure of the number of cycles that an item revolves in unit time.
-/// Usually measured in cycles/s.
-/// Type: REAL
+/// UNION: The operation of constructing the regularized set theoretic union of the volumes defined by two solids.
+/// INTERSECTION: The operation of constructing the regularised set theoretic intersection of the volumes defined by two solids.
+/// DIFFERENCE: The operation of constructing the regularized set theoretic intersection of the volumes defined by two solids.
 /// 
-/// HISTORY New type in IFC Release 2x.
-typedef double IfcRotationalFrequencyMeasure;
-/// The rotational mass measure denotes the inertia of a body with respect to angular acceleration.
-/// It is usually measured in kg*m^2.
+/// NOTE Corresponding STEP type: boolean_operator, please refer to ISO/IS 10303-42:1994, p.167 for the final definition of the formal standard.
 /// 
-/// Type: REAL  
+/// HISTORY New Type in IFC Release 1.5.1.
+typedef enum {IfcBooleanOperator_UNION, IfcBooleanOperator_INTERSECTION, IfcBooleanOperator_DIFFERENCE} IfcBooleanOperator;
+const char* ToString(IfcBooleanOperator v);
+IfcBooleanOperator FromString(const std::string& s);
+}
+namespace IfcBuildingElementProxyTypeEnum {
+/// Definition from IAI: This enumeration defines the
+///   available generic types for IfcBuildingElementProxyType.
 /// 
-/// HISTORY New type in IFC2x2.
-typedef double IfcRotationalMassMeasure;
-/// IfcRotationalStiffnessMeasure is a measure of rotational stiffness.
-/// Usually measured in Nm/rad.
-/// Type: REAL
+/// HISTORY  New enumeration
+///   in Release IFC2x Edition 3.
 /// 
-/// HISTORY New type in IFC Release 2x.
-typedef double IfcRotationalStiffnessMeasure;
-
-typedef double IfcSecondInMinute;
-/// IfcSectionModulusMeasure is a measure for the resistance of a cross section against bending or torsional moment.  It is usually measured in m^3.
+/// Enumeration
 /// 
-/// Type: REAL 
+/// USERDEFINED
 /// 
-/// HISTORY New type in IFC Release 2x2.
-typedef double IfcSectionModulusMeasure;
-/// The sectional area integral measure is typically used in torsional analysis. It is usually measured in m^5.
+/// NOTDEFINED
+typedef enum {IfcBuildingElementProxyType_USERDEFINED, IfcBuildingElementProxyType_NOTDEFINED} IfcBuildingElementProxyTypeEnum;
+const char* ToString(IfcBuildingElementProxyTypeEnum v);
+IfcBuildingElementProxyTypeEnum FromString(const std::string& s);
+}
+namespace IfcCableCarrierFittingTypeEnum {
+/// The IfcCableCarrierFittingTypeEnum defines the range of different types of cable carrier fitting that can be specified. 
+///   HISTORY: New type in IFC 2x2  
+///   Enumeration 
 /// 
-/// Type: REAL  
+/// BEND: A fitting that changes the route of the cable carrier. 
+/// CROSS: A fitting at which two branches are taken from the main route of the cable carrier simultaneously. 
+/// REDUCER: A fitting that changes the physical size of the main route of the cable carrier. 
+/// TEE: A fitting at which a branch is taken from the main route of the cable carrier. 
+/// USERDEFINED: User-defined type. 
+/// NOTDEFINED: Undefined type.
+typedef enum {IfcCableCarrierFittingType_BEND, IfcCableCarrierFittingType_CROSS, IfcCableCarrierFittingType_REDUCER, IfcCableCarrierFittingType_TEE, IfcCableCarrierFittingType_USERDEFINED, IfcCableCarrierFittingType_NOTDEFINED} IfcCableCarrierFittingTypeEnum;
+const char* ToString(IfcCableCarrierFittingTypeEnum v);
+IfcCableCarrierFittingTypeEnum FromString(const std::string& s);
+}
+namespace IfcCableCarrierSegmentTypeEnum {
+/// The IfcCableCarrierSegmentTypeEnum defines the range of different types of cable carrier segment that can be specified. 
+///   HISTORY: New type in IFC 2x2  
+///   Enumeration 
 /// 
-/// HISTORY New type in IFC2x2.
-typedef double IfcSectionalAreaIntegralMeasure;
-/// IfcShearModulusMeasure is a measure of shear modulus.
-/// Usually measured in N/m2.
-/// Type: REAL
+/// CABLELADDERSEGMENT: An open carrier segment on which cables are carried on a ladder structure.
+/// CABLETRAYSEGMENT: A (typically) open carrier segment onto which cables are laid.
+/// CABLETRUNKINGSEGMENT: An enclosed carrier segment with one or more compartments into which cables are placed.
+/// CONDUITSEGMENT: An enclosed tubular carrier segment through which cables are pulled.
+/// USERDEFINED: User-defined type.  
+/// NOTDEFINED: Undefined type.
+typedef enum {IfcCableCarrierSegmentType_CABLELADDERSEGMENT, IfcCableCarrierSegmentType_CABLETRAYSEGMENT, IfcCableCarrierSegmentType_CABLETRUNKINGSEGMENT, IfcCableCarrierSegmentType_CONDUITSEGMENT, IfcCableCarrierSegmentType_USERDEFINED, IfcCableCarrierSegmentType_NOTDEFINED} IfcCableCarrierSegmentTypeEnum;
+const char* ToString(IfcCableCarrierSegmentTypeEnum v);
+IfcCableCarrierSegmentTypeEnum FromString(const std::string& s);
+}
+namespace IfcCableSegmentTypeEnum {
+/// The IfcCableSegmentTypeEnum defines the range of different types of cable segment that can be specified. 
 /// 
-/// HISTORY New type in IFC Release 2x.
-typedef double IfcShearModulusMeasure;
-/// Definition from ISO/CD 10303-41:1992: A solid angle measure is the value of an angle in a solid.
-/// Usually measured in Steradians, (sr, m2/m2).
-/// Type: REAL
+/// HISTORY: New type in IFC
+///   2x2. Core and busbar segment added in IFC 2x4.  
+///   Enumeration 
 /// 
-/// NOTE Corresponding ISO 10303 name: solid_angle_measure, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
+/// BUSBARSEGMENT: Electrical conductor that makes a common connection between several electrical circuits. Properties of a busbar are the same as those of a cable segment and are captured by the cable segment property set. 
+/// CABLESEGMENT: Cable with a specific purpose to lead electric current within a circuit or any other electric construction. Includes all types of electric cables, mainly several core segments or conductor segments wrapped together. 
+/// CONDUCTORSEGMENT: A single linear element within a cable or an exposed wire (such as for grounding) with the specific purpose to lead electric current, data, or a telecommunications signal.  
+/// CORESEGMENT: A self contained element of a  cable that comprises one or more conductors and sheathing.The core of one lead is normally single wired or multiwired which are intertwined.  
+/// USERDEFINED: User-defined type.  
+/// NOTDEFINED: Undefined type.
+typedef enum {IfcCableSegmentType_CABLESEGMENT, IfcCableSegmentType_CONDUCTORSEGMENT, IfcCableSegmentType_USERDEFINED, IfcCableSegmentType_NOTDEFINED} IfcCableSegmentTypeEnum;
+const char* ToString(IfcCableSegmentTypeEnum v);
+IfcCableSegmentTypeEnum FromString(const std::string& s);
+}
+namespace IfcChangeActionEnum {
+/// IfcChangeActionEnum identifies the type of change that might have occurred to the object during the last session (for example, added, modified, deleted). This information is required in a partial model exchange scenario so that an application or model server will know how an object might have been affected by the previous application. Valid enumerations are:
 /// 
-/// HISTORY New type in IFC Release 1.5.1.
-typedef double IfcSolidAngleMeasure;
-/// A sound power measure is a measure of total radiated noise with units of decibels with a reference value of picowatts.
+/// NOCHANGE: Object has not been modified.
 /// 
-/// Type: REAL  
+/// MODIFIED: A modification to the object has been made by the user and application defined by the LastModifyingUser and LastModifyingApplication respectively.
 /// 
-/// HISTORY New type in IFC2x2.
-typedef double IfcSoundPowerMeasure;
-/// A sound pressure measure is a measure of the pressure fluctuations superimposed over the ambient pressure level with units of decibels with a reference value of micropascals. 
+/// ADDED: The object has been created by the user and application defined by the OwningUser and OwningApplication respectively.
 /// 
-/// Type: REAL  
+/// DELETED: The object has been deleted by the user and application defined by the LastModifyingUser and LastModifyingApplication respectively.
 /// 
-/// HISTORY New type in IFC2x2.
-typedef double IfcSoundPressureMeasure;
-/// IfcSpecificHeatCapacityMeasure defines the specific heat of material: The heat energy absorbed per temperature unit.
-/// Usually measured in J / kg Kelvin.
-/// Type: REAL
+/// NOTDEFINED: The change action is not known or has not been defined.
 /// 
-/// HISTORY New type in IFC Release 2x.
-typedef double IfcSpecificHeatCapacityMeasure;
-/// The IfcSpecularExponent defines the datatype for exponent determining the sharpness of the 'reflection'. reflection is made sharper with large values of the exponent, such as 10.0. Small values, such as 1.0, decrease the specular fall-off. 
+/// Consider Application A will create an IFC dataset that it wants to publish to others for modification and have the ability to subsequently merge these changes back into the original model. Before publication, it may want to set the IfcChangeActionEnum to NOCHANGE to establish a baseline so that other application changes can be easily identified. Application B then receives this IFC dataset and adds a new object and sets IfcChangeActionEnum to ADDED with Application B defined as the OwningApplication. Application B then modifies an existing object and (re)defines the LastModifiedDate to the time of the modification, LastModifyingUser to the IfcPersonAndOrganization making the change, and sets the LastModifyingApplication to Application B. When Application A receives this modified dataset, it can determine which objects have been added and modified by Application B and either merge or reject these changes as necessary. Consequently, the intent is that an application only modifies the value of IfcChangeActionEnum when it does something to the object, with the further intent that a model server is responsible for clearing the IfcChangeActionEnum back to NOCHANGE when it is ready to be republished.
 /// 
-/// IfcSpecularExponent is of type REAL.
+/// HISTORY: New enumeration in IFC R2.0. Modified in IFC2x4.
+typedef enum {IfcChangeAction_NOCHANGE, IfcChangeAction_MODIFIED, IfcChangeAction_ADDED, IfcChangeAction_DELETED, IfcChangeAction_MODIFIEDADDED, IfcChangeAction_MODIFIEDDELETED} IfcChangeActionEnum;
+const char* ToString(IfcChangeActionEnum v);
+IfcChangeActionEnum FromString(const std::string& s);
+}
+namespace IfcChillerTypeEnum {
+/// Enumeration defining the typical types of Chillers classified by their method of heat rejection. 
+///   The IfcChillerTypeEnum contains the following:
 /// 
-/// NOTE: The datatype relates to the definition of specular_exponent in ISO 10303-46 entity surface_style_reflectance_ambient_diffuse_specular.
+/// AIRCOOLED: Air cooled chiller.
+///   WATERCOOLED: Water cooled chiller.
+///   HEATRECOVERY: Heat recovery chiller.
+///   USERDEFINED:	User-defined chiller type.
+///   NOTDEFINED: Undefined chiller type.
 /// 
-/// HISTORY: New type in IFC2x2.
-typedef double IfcSpecularExponent;
-/// The IfcSpecularRoughness defines the datatype for the reflection resulting from the roughness of a surface through the height of surface impurities where the specular highlight is made sharper with small values for the roughness, such as 0.1.  
+/// HISTORY: New enumeration in IFC R2x.
+typedef enum {IfcChillerType_AIRCOOLED, IfcChillerType_WATERCOOLED, IfcChillerType_HEATRECOVERY, IfcChillerType_USERDEFINED, IfcChillerType_NOTDEFINED} IfcChillerTypeEnum;
+const char* ToString(IfcChillerTypeEnum v);
+IfcChillerTypeEnum FromString(const std::string& s);
+}
+namespace IfcCoilTypeEnum {
+/// Enumeration defining the typical types of coils.
 /// 
-/// Applies to "glass", "metal", "mirror" and "plastic" reflection models. Larger values, close to 1.0 decrease the specular fall-off. 
+/// The IfcCoilTypeEnum contains the following:
 /// 
-/// IfcSpecularRoughness is of type REAL. It is constraint to values between (and including) 0 and 1.
+/// DXCOOLINGCOIL: Cooling coil using a refrigerant to cool the air stream directly.
 /// 
-/// NOTE: The datatype relates to the definition of "shiness" in VRML97, which is the reciprocate value to the specular roughness.
+/// WATERCOOLINGCOIL: Cooling coil using chilled water. HYDRONICCOIL supercedes this enumerator.
 /// 
-/// HISTORY: New type in Release IFC2x2.
-typedef double IfcSpecularRoughness;
-/// The temperature gradient measures the difference of a temperature per lenght, as for instance used in an external wall or its layers.  It is usually measured in K/m.
+/// STEAMHEATINGCOIL: Heating coil using steam as heating source.
 /// 
-/// Type: REAL  
+/// WATERHEATINGCOIL: Heating coil using hot water as a heating source. HYDRONICCOIL supercedes this enumerator.
 /// 
-/// HISTORY New type in IFC2x2.
-typedef double IfcTemperatureGradientMeasure;
-/// Definition from ISO/CD 10303-41:1992: A text is an alphanumeric string of characters which is intended to be read and understood by a human being. It is for information purposes only.
+/// ELECTRICHEATINGCOIL: Heating coil using electricity as a heating source.
 /// 
-/// Type: STRING
+/// GASHEATINGCOIL: Heating coil using gas as a heating source.
 /// 
-/// NOTE Corresponding STEP name: text, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
+/// HYDRONICCOIL: Cooling or Heating coil that uses a hydronic fluid as a cooling or heating source.
+///   USERDEFINED: User-defined coil type.
 /// 
-/// HISTORY New type in IFC Release 2x.
+/// NOTDEFINED:  Undefined coil type.
 /// 
-/// Per ISO 10303-11, the set of characters that may appear in STRINGs is defined in ISO 10646.  The encoding of characters in case of file-based exchange is defined in ISO 10303-21 (STEP physical files) and ISO 10303-28 (XML files).  Among else, these specifications define the encoding of 8-bit characters from ISO 8859-1...-16 and of 2-byte Unicode characters.
+/// HISTORY: New enumeration in IFC R2x.
+typedef enum {IfcCoilType_DXCOOLINGCOIL, IfcCoilType_WATERCOOLINGCOIL, IfcCoilType_STEAMHEATINGCOIL, IfcCoilType_WATERHEATINGCOIL, IfcCoilType_ELECTRICHEATINGCOIL, IfcCoilType_GASHEATINGCOIL, IfcCoilType_USERDEFINED, IfcCoilType_NOTDEFINED} IfcCoilTypeEnum;
+const char* ToString(IfcCoilTypeEnum v);
+IfcCoilTypeEnum FromString(const std::string& s);
+}
+namespace IfcColumnTypeEnum {
+/// Definition from IAI: This enumeration defines the
+/// different types of linear elements an IfcColumnType object
+/// can fulfill:
 /// 
-/// Note that while IfcText is not formally restricted in length, the size of a string in ISO 10303-21:2002 conforming exchange files must not exceed 32767 octets after encoding and escaping.
-typedef std::string IfcText;
-/// Definition from CSS1 (W3C Recommendation): This property describes how text is aligned within the element. The actual justification algorithm used is user agent and human language dependent. If 'justify' is not supported, the user agent will supply a replacement. Typically, this will be 'left' for western languages. Values are:
+/// COLUMN: A standard column element usually used
+/// vertically.
+/// USERDEFINED: User-defined linear element.
+/// NOTDEFINED: Undefined linear element
 /// 
-/// left
-///   right
-///   center
-///   justify
+/// NOTE: This enumeration has been mainly
+/// introduced to allow further detailing of the type information in
+/// future releases of IFC.
+/// HISTORY New Enumeration
+/// in Release IFC2x Edition 2.
+typedef enum {IfcColumnType_COLUMN, IfcColumnType_USERDEFINED, IfcColumnType_NOTDEFINED} IfcColumnTypeEnum;
+const char* ToString(IfcColumnTypeEnum v);
+IfcColumnTypeEnum FromString(const std::string& s);
+}
+namespace IfcCompressorTypeEnum {
+/// Types of compressors.
+///   The IfcCompressorTypeEnum contains the following:
 /// 
-/// NOTE  Corresponding CSS1 definition is text-align.
+/// DYNAMIC: The pressure of refrigerant vapor is increased by a continuous transfer of angular momentum from a rotating member to the vapor followed by conversion of this momentum into static pressure.
+///   RECIPROCATING: Positive-displacement compressor using a piston driven by a connecting rod from a crankshaft.
+///   ROTARY: Positive-displacement compressor using a roller or rotor device.
+///   SCROLL: Positive-displacement compressor using two inter-fitting, spiral-shaped scroll members.
+///   TROCHOIDAL: Positive-displacement compressor using a rolling motion of one circle outside or inside the circumference of a basic circle and produce either epitrochoids or hypotrochoids.
+///   SINGLESTAGE: Positive-displacement reciprocating compressor where vapor is compressed in a single stage.
+///   BOOSTER: Positive-displacement reciprocating compressor where pressure is increased by a booster.
+///   OPENTYPE: Positive-displacement reciprocating compressor where the shaft extends through a seal in the crankcase for an external drive.
+///   HERMETIC: Positive-displacement reciprocating compressor where the motor and compressor are contained within the same housing, with the motor shaft integral with the compressor crankshaft and the motor in contact with refrigerant.
+///   SEMIHERMETIC: Positive-displacement reciprocating compressor where the hermetic compressors use bolted construction amenable to field repair.
+///   WELDEDSHELLHERMETIC: Positive-displacement reciprocating compressor where the motor compressor is mounted inside a steel shell, which, in turn is sealed by welding.
+///   ROLLINGPISTON: Positive-displacement rotary compressor using a roller mounted on the eccentric of a shaft with a single vane in the nonrotating cylindrical housing.
+///   ROTARYVANE: Positive-displacement rotary compressor using a roller mounted on the eccentric of a shaft with multiple vanes in the nontotating cylindrical housing.
+///   SINGLESCREW: Positive-displacement rotary compressor using a single cylindrical main rotor that works with a pair of gate rotors.
+///   TWINSCREW: Positive-displacement rotary compressor using two mating helically grooved rotors, male (lobes) and female (flutes) in a stationary housing with inlet and outlet gas ports.
+///   USERDEFINED: User-defined compressor type.
+///   NOTDEFINED:  Undefined compressor type.
 /// 
-/// HISTORY  New type in IFC2x3.
-typedef std::string IfcTextAlignment;
-/// Definition from CSS1 (W3C Recommendation): This property describes decorations that are added to the text of an element. A value of 'blink' causes the text to blink.. Values are:
+/// HISTORY: New enumeration in IFC R2x.
+typedef enum {IfcCompressorType_DYNAMIC, IfcCompressorType_RECIPROCATING, IfcCompressorType_ROTARY, IfcCompressorType_SCROLL, IfcCompressorType_TROCHOIDAL, IfcCompressorType_SINGLESTAGE, IfcCompressorType_BOOSTER, IfcCompressorType_OPENTYPE, IfcCompressorType_HERMETIC, IfcCompressorType_SEMIHERMETIC, IfcCompressorType_WELDEDSHELLHERMETIC, IfcCompressorType_ROLLINGPISTON, IfcCompressorType_ROTARYVANE, IfcCompressorType_SINGLESCREW, IfcCompressorType_TWINSCREW, IfcCompressorType_USERDEFINED, IfcCompressorType_NOTDEFINED} IfcCompressorTypeEnum;
+const char* ToString(IfcCompressorTypeEnum v);
+IfcCompressorTypeEnum FromString(const std::string& s);
+}
+namespace IfcCondenserTypeEnum {
+/// Enumeration defining the typical types of condensers.  Air is used as the cooling medium for AIRCOOLED; water is used as the cooling medium for all other types.  The IfcCondenserTypeEnum contains the following:
 /// 
-/// none
-///   underline
-///   overline
-///   line-through
-///   blink
+/// AIRCOOLED: A condenser in which heat is transferred to an air-stream.
+///   EVAPORATIVECOOLED: A condenser that is cooled evaporatively.
+///   WATERCOOLED: Water-cooled condenser with unspecified operation.
+///   WATERCOOLEDSHELLTUBE: Water-cooled condenser with cooling water circulated through one or more tubes contained within the shell.
+///   WATERCOOLEDSHELLCOIL: Water-cooled condenser with cooling water circulated through one or more continuous or assembled coils contained within the shell.
+///   WATERCOOLEDTUBEINTUBE: Water-cooled condenser consisting of one or more assemblies of two tubes, one within the other.
+///   WATERCOOLEDBRAZEDPLATE: Water-cooled condenser condenser with plates brazed together to form an assembly of separate channels.
+///   USERDEFINED: User-defined condenser type.
+///   NOTDEFINED:  Undefined condenser type.
 /// 
-/// User agents must recognize the keyword 'blink', but are not required to support the blink effect.
+/// HISTORY: New enumeration in IFC 2x2.  WATERCOOLED added in IFC 2x4.
+typedef enum {IfcCondenserType_WATERCOOLEDSHELLTUBE, IfcCondenserType_WATERCOOLEDSHELLCOIL, IfcCondenserType_WATERCOOLEDTUBEINTUBE, IfcCondenserType_WATERCOOLEDBRAZEDPLATE, IfcCondenserType_AIRCOOLED, IfcCondenserType_EVAPORATIVECOOLED, IfcCondenserType_USERDEFINED, IfcCondenserType_NOTDEFINED} IfcCondenserTypeEnum;
+const char* ToString(IfcCondenserTypeEnum v);
+IfcCondenserTypeEnum FromString(const std::string& s);
+}
+namespace IfcConnectionTypeEnum {
+/// This enumeration defines the different ways how path based elements (such as IfcWallStandardCase) can connect, as shown in Figure 65. 
 /// 
-/// NOTE  Corresponding CSS1 definition is text-decoration.
+/// HISTORY New type in IFC Release 2.0 
 /// 
-/// HISTORY  New type in IFC2x3.
-typedef std::string IfcTextDecoration;
-/// Definition from CSS1 (W3C Recommendation): The value is a font family name and/or generic family name. Values are:
+/// L-Shape Connection 
 /// 
-/// The name of a font family of choice. For example, "gill" and "helvetica" are font families.
+/// RelatingConnectionType: AtStart 
+///   RelatedConnectionType: AtStart 
 /// 
-/// In the example above, the last value is a generic family name. The following generic families are defined:
+/// L-Shape Connection 
 /// 
-/// 'serif' (Example: Times)
-///   'sans-serif' (Example: Helvetica)
-///   'cursive' (Example: Zapf-Chancery)
-///   'fantasy' (Example: Western)
-///   'monospace' (Example: Courier)
+/// RelatingConnectionType: AtEnd 
+///   RelatedConnectionType: AtStart 
 /// 
-/// It is encouraged to offer a generic font family as a last alternative.
+/// T-Shape Connection 
 /// 
-/// NOTE  Corresponding CSS1 definitions are font-family.
+/// RelatingConnectionType: AtPath 
+///   RelatedConnectionType: AtStart 
 /// 
-/// HISTORY  New type in IFC2x2 Addendum 2.
+/// Figure 65 — Connection types</td
+typedef enum {IfcConnectionType_ATPATH, IfcConnectionType_ATSTART, IfcConnectionType_ATEND, IfcConnectionType_NOTDEFINED} IfcConnectionTypeEnum;
+const char* ToString(IfcConnectionTypeEnum v);
+IfcConnectionTypeEnum FromString(const std::string& s);
+}
+namespace IfcConstraintEnum {
+/// IfcConstraintEnum is an enumeration used to qualify a constraint. 
 /// 
-/// IFC2x2 Addendum 2 CHANGE: The IfcFontFamily has been added.
-typedef std::string IfcTextFontName;
-/// Definition from CSS1 (W3C Recommendation): This property describes how the cases of characters are handled. Values are:
+/// HISTORY: New type in IFC Release 2.0
 /// 
-/// capitalize: uppercases the first character of each word
-///   uppercase: uppercases all letters of the element
-///   lowercase: lowercases all letters of the element
-///   none
+/// Enumeration 
 /// 
-/// NOTE  Corresponding CSS1 definition is text-transform.
+/// Value 
+///   Definition 
 /// 
-/// HISTORY  New type in IFC2x3.
-typedef std::string IfcTextTransformation;
-/// IfcThermalAdmittanceMeasure is the measure of the ability of a surface to smooth out temperature variations.
-/// Usually measured in Watt / m2 Kelvin.
-/// Type: REAL
+/// HARD 
+///   Qualifies a constraint such that it must be followed rigidly within or at the values set. 
 /// 
-/// HISTORY New type in IFC Release 2.0.
-typedef double IfcThermalAdmittanceMeasure;
-/// IfcThermalConductivityMeasure is a measure of thermal conductivity.
-/// Usually measured in Watt / m Kelvin.
-/// Type: REAL
+/// SOFT 
+///   Qualifies a constraint such that it should be followed within or at the values set. 
 /// 
-/// HISTORY New type in IFC Release 2x.
-typedef double IfcThermalConductivityMeasure;
-/// IfcThermalExpansionCoeffientMeasure is a measure of the thermal expansion coefficient of a material, which expresses its elongation (as a ratio) per temperature difference. It is usually measured in 1/K. A positive elongation per (positive) rise of temperature is expressed by a positive value.
-/// Type: REAL  
+/// ADVISORY 
+///   Qualifies a constraint such that it is advised that it is followed within or at the values set.
+typedef enum {IfcConstraint_HARD, IfcConstraint_SOFT, IfcConstraint_ADVISORY, IfcConstraint_USERDEFINED, IfcConstraint_NOTDEFINED} IfcConstraintEnum;
+const char* ToString(IfcConstraintEnum v);
+IfcConstraintEnum FromString(const std::string& s);
+}
+namespace IfcControllerTypeEnum {
+/// The IfcControllerTypeEnum defines the range of different types of controller that can be specified.
 /// 
-/// HISTORY New type in IFC2x2.
-typedef double IfcThermalExpansionCoefficientMeasure;
-/// IfcThermalResistanceMeasure is a measure of the resistance offered by a body to the flow of energy.
-/// Usually measured in m2 Kelvin/Watt.
+/// HISTORY: New type in IFC R2.0
+///   Documentation extended in IFC 2x4. PROPORTIONALINTEGRAL and PROPORTIONALINTEGRALDERIVATIVE values deleted (property set enumeration now used).  MULTIPOSITION added.
 /// 
-/// HISTORY New type in IFC Release 2.0.
-typedef double IfcThermalResistanceMeasure;
-/// IfcThermalTransmittanceMeasure is a measure of the rate at which energy is transmitted through a body.
-/// Usually measured in Watts/m2 Kelvin.
-/// Type: REAL
+/// Enumeration
 /// 
-/// HISTORY New type in IFC Release 2.0.
-typedef double IfcThermalTransmittanceMeasure;
-/// Definition from ISO/CD 10303-41:1992: A thermodynamic temperature measure is the value for the degree of heat of a body.
-/// Usually measured in degrees Kelvin (K).
-/// Type: REAL
+/// FLOATING: Output increases or decreases at a constant or accelerating rate.
+/// MULTIPOSITION: Output is discrete value, can be one of three or more values.
+/// PROGRAMMABLE: Output is programmable such as Discrete Digital Control (DDC).
+/// PROPORTIONAL: Output is proportional to the control error and optionally time integral and derivative.
+/// TWOPOSITION: Output can be either on or off
+/// USERDEFINED: User-defined type.
+/// NOTDEFINED: Undefined type.
+typedef enum {IfcControllerType_FLOATING, IfcControllerType_PROPORTIONAL, IfcControllerType_PROPORTIONALINTEGRAL, IfcControllerType_PROPORTIONALINTEGRALDERIVATIVE, IfcControllerType_TIMEDTWOPOSITION, IfcControllerType_TWOPOSITION, IfcControllerType_USERDEFINED, IfcControllerType_NOTDEFINED} IfcControllerTypeEnum;
+const char* ToString(IfcControllerTypeEnum v);
+IfcControllerTypeEnum FromString(const std::string& s);
+}
+namespace IfcCooledBeamTypeEnum {
+/// There are two general types of cooled or chilled beams: passive and active.
 /// 
-/// NOTE Corresponding ISO 10303 name: thermodynamic_temperature_measure, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
+/// An active Cooled Beam uses a fan or other auxilliary device to aid in air recirculation, while a passive
 /// 
-/// HISTORY New type in IFC Release 1.5.1.
-typedef double IfcThermodynamicTemperatureMeasure;
-/// Definition from ISO/CD 10303-41:1992: A time measure is the value of the duration of periods.
-/// Measured in seconds (s) or days (d) or other units of time.
-/// Type: REAL
+/// Cooled Beam relies solely on convection to cool the space.
 /// 
-/// NOTE Corresponding ISO 10303 name: time_measure, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
+/// Enumeration defining the typical types of cooled beams.
 /// 
-/// HISTORY New type in IFC Release 1.5.1.
-typedef double IfcTimeMeasure;
-/// IfcTimeStamp is an indication of date and time by measuring the number of seconds which have elapsed since the beginning of the year 1970.
-/// Type: INTEGER
+/// The IfcCooledBeamTypeEnum contains the following:
 /// 
-/// HISTORY New type in IFC Release 1.5.1.
-typedef int IfcTimeStamp;
-/// IfcTorqueMeasure is a measure of the torque or moment of a couple.
-/// Usually measured in N m.
-/// Type: REAL
+/// ACTIVE: An active or ventilated cooled beam provides cooling (and heating) but can also function as an air terminal in a ventilation system.
 /// 
-/// HISTORY New type in IFC Release 2x.
-typedef double IfcTorqueMeasure;
-/// IfcVaporPermeabilityMeasure is a measure of vapor permeability.
-/// Usually measured in kg / s m Pascal.
-/// Type: REAL
+/// PASSIVE: A passive or static cooled beam provides cooling (and heating) to a room or zone.
 /// 
-/// HISTORY New type in IFC Release 2x.
-typedef double IfcVaporPermeabilityMeasure;
-/// Definition from ISO/CD 10303-41:1992: A volume measure is the value of the solid content of a body.
-/// Usually measured in cubic metre (m3).
-/// Type: REAL
+/// USERDEFINED: User-defined cooled beam type.
 /// 
-/// NOTE Corresponding ISO 10303 name: volume_measure, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
+/// NOTDEFINED:  Undefined cooled beam type.
 /// 
-/// HISTORY New type in IFC Release 1.5.1.
-typedef double IfcVolumeMeasure;
-/// IfcVolumetricFlowRateMeasure is a measure of the volume of a medium flowing per unit time.
-/// Usually measured in m3/s.
-/// Type: REAL
+/// HISTORY: New enumeration in IFC 2x2.
+typedef enum {IfcCooledBeamType_ACTIVE, IfcCooledBeamType_PASSIVE, IfcCooledBeamType_USERDEFINED, IfcCooledBeamType_NOTDEFINED} IfcCooledBeamTypeEnum;
+const char* ToString(IfcCooledBeamTypeEnum v);
+IfcCooledBeamTypeEnum FromString(const std::string& s);
+}
+namespace IfcCoolingTowerTypeEnum {
+/// Enumeration defining the typical types of cooling towers. 
+///   The IfcCoolingTowerTypeEnum contains the following:
 /// 
-/// HISTORY New type in IFC Release 2.0.
-typedef double IfcVolumetricFlowRateMeasure;
-/// IfcWarpingConstantMeasure is a measure for the warping constant or warping resistance of a cross section under torsional loading. It is usually measured in m^6.
+/// NATURALDRAFT: Air flow is produced naturally.
+///   MECHANICALINDUCEDDRAFT: Air flow is produced by a mechanical device, typically one or more fans, located on 
 /// 
-/// Type: REAL  
+/// the air outlet side of the cooling tower.
+///   MECHANICALFORCEDDRAFT: Air flow is produced by a mechanical device, typically one or more fans, located on 
 /// 
-/// HISTORY New type in IFC2x2.
-typedef double IfcWarpingConstantMeasure;
-/// The warping moment measure is a measure for the warping moment, which occurs in warping torsional analysis. It is usually measured in kN*m^2.
+/// the inlet air side of the cooling tower.
+///   USERDEFINED:  User-defined cooling tower type.
+///   NOTDEFINED:  Undefined cooling tower type.
 /// 
-/// Type: REAL  
+/// HISTORY: New enumeration in IFC R2x.
+typedef enum {IfcCoolingTowerType_NATURALDRAFT, IfcCoolingTowerType_MECHANICALINDUCEDDRAFT, IfcCoolingTowerType_MECHANICALFORCEDDRAFT, IfcCoolingTowerType_USERDEFINED, IfcCoolingTowerType_NOTDEFINED} IfcCoolingTowerTypeEnum;
+const char* ToString(IfcCoolingTowerTypeEnum v);
+IfcCoolingTowerTypeEnum FromString(const std::string& s);
+}
+namespace IfcCostScheduleTypeEnum {
+/// An IfcCostScheduleTypeEnum is a list of the available types of cost schedule from which that required may be selected. 
+///   HISTORY: New type in IFC 2x2  
+///   Enumeration 
 /// 
-/// HISTORY New type in IFC2x2.
-typedef double IfcWarpingMomentMeasure;
-
-typedef int IfcYearNumber;
-/// The actor select type allows a person, or an organization, or a person associated with an organization to be referenced.
+/// BUDGET: An allocation of money for a particular purpose. 
+/// COSTPLAN: An assessment of the amount of money needing to be expended for a defined purpose based on incomplete information about the goods and services required for a construction or installation.  
+/// ESTIMATE: An assessment of the amount of money needing to be expended for a defined purpose based on actual information about the goods and services required for a construction or installation. 
+/// TENDER: An offer to provide goods and services.  
+/// PRICEDBILLOFQUANTITIES: A complete listing of all work items forming construction or installation works in which costs have been allocated to work items.  
+/// UNPRICEDBILLOFQUANTITIES: A complete listing of all work items forming construction or installation works in which costs have not yet been allocated to work items. 
+/// SCHEDULEOFRATES: A listing of each type of goods forming construction or installation works with the cost of purchase, construction/installation, overheads and profit assigned so that additional items of that type can be costed.  
+/// USERDEFINED: User-defined type. 
+/// NOTDEFINED: Undefined type.
+typedef enum {IfcCostScheduleType_BUDGET, IfcCostScheduleType_COSTPLAN, IfcCostScheduleType_ESTIMATE, IfcCostScheduleType_TENDER, IfcCostScheduleType_PRICEDBILLOFQUANTITIES, IfcCostScheduleType_UNPRICEDBILLOFQUANTITIES, IfcCostScheduleType_SCHEDULEOFRATES, IfcCostScheduleType_USERDEFINED, IfcCostScheduleType_NOTDEFINED} IfcCostScheduleTypeEnum;
+const char* ToString(IfcCostScheduleTypeEnum v);
+IfcCostScheduleTypeEnum FromString(const std::string& s);
+}
+namespace IfcCoveringTypeEnum {
+/// Definition from IAI: This enumeration defines the range
+/// of different types of covering that can further specify an
+/// IfcCovering or an IfcCoveringType.
+/// HISTORY New enumeration
+/// in IFC Release 1.0
+/// IFC2x4 CHANGE The following
+/// enumerators of the IfcCoveringTypeEnum have been
+/// deprecated INSULATION, SLEEVING and
+/// WRAPPING.
+/// Enumeration
 /// 
-/// NOTE Corresponds to the following entity in ISO 10303-41: person_organization_select.
+/// CEILING: the covering is used to
+/// represent a ceiling
+/// FLOORING: the covering is used to
+/// represent a flooring
+/// CLADDING: the covering is used to
+/// represent a cladding
+/// ROOFING: the covering is used to
+/// represent a roof
 /// 
-/// HISTORY New entity in IFC Release 1.5.1
+/// INSULATION: the covering is used to
+/// insulate an element for thermal or acoustic purposes.
+/// IFC2x4 NOTE The use of this
+/// enumerator is deprecated.
+/// MEMBRANE: an impervious layer that
+/// could be used for e.g. roof covering (below tiling - that may be
+/// known as sarking etc.) or as a damp proof course membrane
+/// IFC2x4 NOTE The use of this
+/// enumerator is deprecated.
+/// SLEEVING: the covering is used to
+/// isolate a distribution element from a space in which it is
+/// contained.
+/// IFC2x4 NOTE The use of this
+/// enumerator is deprecated.
+/// WRAPPING: the covering is used for
+/// wrapping particularly of distribution elements using tape.
+/// IFC2x4 NOTE The use of this
+/// enumerator is deprecated.
 /// 
-/// SELECT 
+/// USERDEFINED: user defined type of
+/// covering
+/// NOTDEFINED: undefined type of
+/// covering
+typedef enum {IfcCoveringType_CEILING, IfcCoveringType_FLOORING, IfcCoveringType_CLADDING, IfcCoveringType_ROOFING, IfcCoveringType_INSULATION, IfcCoveringType_MEMBRANE, IfcCoveringType_SLEEVING, IfcCoveringType_WRAPPING, IfcCoveringType_USERDEFINED, IfcCoveringType_NOTDEFINED} IfcCoveringTypeEnum;
+const char* ToString(IfcCoveringTypeEnum v);
+IfcCoveringTypeEnum FromString(const std::string& s);
+}
+namespace IfcCurrencyEnum {
+
+typedef enum {IfcCurrency_AED, IfcCurrency_AES, IfcCurrency_ATS, IfcCurrency_AUD, IfcCurrency_BBD, IfcCurrency_BEG, IfcCurrency_BGL, IfcCurrency_BHD, IfcCurrency_BMD, IfcCurrency_BND, IfcCurrency_BRL, IfcCurrency_BSD, IfcCurrency_BWP, IfcCurrency_BZD, IfcCurrency_CAD, IfcCurrency_CBD, IfcCurrency_CHF, IfcCurrency_CLP, IfcCurrency_CNY, IfcCurrency_CYS, IfcCurrency_CZK, IfcCurrency_DDP, IfcCurrency_DEM, IfcCurrency_DKK, IfcCurrency_EGL, IfcCurrency_EST, IfcCurrency_EUR, IfcCurrency_FAK, IfcCurrency_FIM, IfcCurrency_FJD, IfcCurrency_FKP, IfcCurrency_FRF, IfcCurrency_GBP, IfcCurrency_GIP, IfcCurrency_GMD, IfcCurrency_GRX, IfcCurrency_HKD, IfcCurrency_HUF, IfcCurrency_ICK, IfcCurrency_IDR, IfcCurrency_ILS, IfcCurrency_INR, IfcCurrency_IRP, IfcCurrency_ITL, IfcCurrency_JMD, IfcCurrency_JOD, IfcCurrency_JPY, IfcCurrency_KES, IfcCurrency_KRW, IfcCurrency_KWD, IfcCurrency_KYD, IfcCurrency_LKR, IfcCurrency_LUF, IfcCurrency_MTL, IfcCurrency_MUR, IfcCurrency_MXN, IfcCurrency_MYR, IfcCurrency_NLG, IfcCurrency_NZD, IfcCurrency_OMR, IfcCurrency_PGK, IfcCurrency_PHP, IfcCurrency_PKR, IfcCurrency_PLN, IfcCurrency_PTN, IfcCurrency_QAR, IfcCurrency_RUR, IfcCurrency_SAR, IfcCurrency_SCR, IfcCurrency_SEK, IfcCurrency_SGD, IfcCurrency_SKP, IfcCurrency_THB, IfcCurrency_TRL, IfcCurrency_TTD, IfcCurrency_TWD, IfcCurrency_USD, IfcCurrency_VEB, IfcCurrency_VND, IfcCurrency_XEU, IfcCurrency_ZAR, IfcCurrency_ZWD, IfcCurrency_NOK} IfcCurrencyEnum;
+const char* ToString(IfcCurrencyEnum v);
+IfcCurrencyEnum FromString(const std::string& s);
+}
+namespace IfcCurtainWallTypeEnum {
+/// Definition from IAI: Enumeration defining
+/// the valid types of curtain wall that can be predefined using the
+/// enumeration values. 
+/// HISTORY 
+/// New Enumeration in Release IFC2x Edition 3
+/// NOTE  Currently there
+/// are no specific enumerators defined, the IfcCurtainWallTypeEnum
+/// has
+/// been added for future extensions.
+typedef enum {IfcCurtainWallType_USERDEFINED, IfcCurtainWallType_NOTDEFINED} IfcCurtainWallTypeEnum;
+const char* ToString(IfcCurtainWallTypeEnum v);
+IfcCurtainWallTypeEnum FromString(const std::string& s);
+}
+namespace IfcDamperTypeEnum {
+/// This enumeration defines the various types of damper:
 /// 
-/// IfcOrganization An organization. 
-/// IfcPerson A person. 
-/// IfcPersonAndOrganization A person related to an organization.
-typedef IfcUtil::IfcSchemaEntity IfcActorSelect;
-/// IfcAppliedValueSelect defines the selection of whether a value (expressed as a ratio) or an amount should be used as the value for an IfcAppliedValue. 
+/// BALANCINGDAMPER: Damper used for purposes of manually balancing pressure differences.  Commonly operated by mechanical adjustment.
+/// BACKDRAFTDAMPER: Backdraft damper used to restrict the movement of air in one direction.  Commonly operated by mechanical spring.
+/// BLASTDAMPER: Blast damper use to prevent protect occupants and equipment against overpressures resultant of an explosion.  Commonly operated by mechanical spring.
+/// CONTROLDAMPER: Control damper used to modulate the flow of air by adjusting the position of the blades.  Commonly operated by an actuator of a building automation system.
+/// FIREDAMPER: Fire damper used to prevent the spread of fire for a specified duration.  Commonly operated by fusable link that melts above a certain temperature.
+/// FIRESMOKEDAMPER: Combination fire and smoke damper used to preven the spread of fire and smoke.  Commonly operated by a fusable link and a smoke detector
+/// FUMEHOODEXHAUST: Fume hood exhaust damper.  Commonly operated by actuator.
+/// GRAVITYDAMPER: Gravity damper closes from the force of gravity.  Commonly operated by gravitational weight.
+/// GRAVITYRELIEFDAMPER: Gravity-relief damper used to allow air to move upon a buildup of enough pressure to overcome the gravitational force exerted upon the damper blades.  Commonly operated by gravitational weight.
+/// RELIEFDAMPER: Relief damper used to allow air to move upon a buildup of a specified pressure differential.  Commonly operated by mechanical spring.
+/// SMOKEDAMPER: Smoke damper used to prevent the spread of smoke.  Commonly operated by a smoke detector of a building automation system.
+/// USERDEFINED: User-defined damper.
+/// NOTDEFINED: Undefined damper.
 /// 
-/// Select from:  
+/// HISTORY: New enumeration in IFC R2.0
+typedef enum {IfcDamperType_CONTROLDAMPER, IfcDamperType_FIREDAMPER, IfcDamperType_SMOKEDAMPER, IfcDamperType_FIRESMOKEDAMPER, IfcDamperType_BACKDRAFTDAMPER, IfcDamperType_RELIEFDAMPER, IfcDamperType_BLASTDAMPER, IfcDamperType_GRAVITYDAMPER, IfcDamperType_GRAVITYRELIEFDAMPER, IfcDamperType_BALANCINGDAMPER, IfcDamperType_FUMEHOODEXHAUST, IfcDamperType_USERDEFINED, IfcDamperType_NOTDEFINED} IfcDamperTypeEnum;
+const char* ToString(IfcDamperTypeEnum v);
+IfcDamperTypeEnum FromString(const std::string& s);
+}
+namespace IfcDataOriginEnum {
+/// IfcDataOriginEnum identifies the origin of time data:
 /// 
-/// IfcMeasureWithUnit 
-///   IfcMonetaryMeasure 
-///   IfcRatioMeasure 
+/// MEASURED: The origin of the time data is a measurement device.
+///   PREDICTED: The time data are a prediction.
+///   SIMULATED: The origin of the time data is a simulation.
+///   NOTDEFINED: The origin of the time data is undefined.
 /// 
-/// HISTORY: New SELECT type in IFC 2x2.
+/// HISTORY: New enumeration in IFC 2x2.
+typedef enum {IfcDataOrigin_MEASURED, IfcDataOrigin_PREDICTED, IfcDataOrigin_SIMULATED, IfcDataOrigin_USERDEFINED, IfcDataOrigin_NOTDEFINED} IfcDataOriginEnum;
+const char* ToString(IfcDataOriginEnum v);
+IfcDataOriginEnum FromString(const std::string& s);
+}
+namespace IfcDerivedUnitEnum {
+/// IfcDerivedUnitEnum is an enumeration type for allowed types of derived units.
+/// ENUMERATION 
 /// 
-/// Use definitions 
-/// Selecting IfcMeasureWithUnit allows the specification of both the actual figure for the value together with the currency in which the value is represented. 
-/// Selecting IfcMonetaryMeasure allows the specification only of the value, the currency being as set by the global context 
-/// Selecting IfcRatioMeasure assumes that the amount is a percentage or other REAL number. Note that if the amount is normally specified as -20%, then this figure will need to be converted to a multiplier of 0.8
-typedef IfcUtil::IfcSchemaEntity IfcAppliedValueSelect;
-/// Definition from ISO/CD 10303-42:1992: This select type collects together both versions of the placement as used in two dimensional or in three dimensional Cartesian space. This enables entities requiring this information to reference them without specifying the space dimensionality.  
-/// 
-/// NOTE: Corresponding STEP type: axis2_placement, please refer to ISO/IS 10303-42:1994, p. 19 for the final definition of the formal standard.
-/// 
-/// HISTORY: New type in IFC Release 1.5
-typedef IfcUtil::IfcSchemaEntity IfcAxis2Placement;
-/// Definition from ISO/CD 10303-42:1992: This select type identifies
-///   all those types of entities which may participate in a Boolean operation to
-///   form a CSG solid.  
-///   Definition from IAI: CSG primitives are out of scope for the
-///   current IFC Release. Only faceted B-reps, swept area solids and half space
-///   solids are available as Boolean operands. Boolean results themselves can be used
-///   as operands thus enabling nested Boolean operations. 
-/// 
-/// NOTE Corresponding STEP type:
-///   boolean_operand, please refer to ISO/IS 10303-42:1994, p.167 for the final
-///   definition of the formal standard. In IFC Release 1.5.1 & 2.0 only Boolean
-///   results (IfcBooleanResult), half space solids
-///   (IfcHalfSpaceSolid), faceted B-Rep, extruded solids and revolved solids
-///   (IfcSolidModel) are defined for being valid Boolean operands.
-/// 
-/// HISTORY: New Type in IFC Release 1.5.1
-typedef IfcUtil::IfcSchemaEntity IfcBooleanOperand;
-/// The character style select allows for a selection of character styles for text. Currently only text color and background color is selectable.
-/// 
-/// NOTE  Corresponding ISO 10303 name: character_style_select. Please refer to ISO/IS
-/// 10303-46:1994, p. 89 for the final definition of the formal standard.
-/// 
-/// HISTORY  New type in IFC2x2.
-/// 
-/// IFC2x3 CHANGE  The SELECT item IfcTextStyleForDefinedFont replaces the old IfcColour.
-typedef IfcUtil::IfcSchemaEntity IfcCharacterStyleSelect;
-
-typedef IfcUtil::IfcSchemaEntity IfcClassificationNotationSelect;
-/// Definition from ISO/CD 10303-46:1992: The colour entity defines a basic appearance of elements which shall be visualized in a picture.
-/// 
-/// NOTE  Corresponding STEP name: colour. It has been made into a SELECT type in IFC to avoid multiple inheritance for pre defined colour. Please refer to ISO/IS 10303-46:1994, p. 138 for the final definition of the formal standard.
+/// ACCELERATIONUNIT 
+///   ANGULARVELOCITYUNIT 
+///   COMPOUNDPLANEANGLEUNIT 
+///   DYNAMICVISCOSITYUNIT 
+///   HEATFLUXDENSITYUNIT 
+///   INTEGERCOUNTRATEUNIT 
+///   ISOTHERMALMOISTURECAPACITYUNIT 
+///   KINEMATICVISCOSITYUNIT 
+///   LINEARFORCEUNIT 
+///   LINEARMOMENTUNIT 
+///   LINEARSTIFFNESSUNIT 
+///   LINEARVELOCITYUNIT 
+///   MASSDENSITYUNIT 
+///   MASSFLOWRATEUNIT 
+///   MODULUSOFELASTICITYUNIT 
+///   MODULUSOFSUBGRADEREACTIONUNIT 
+///   MOISTUREDIFFUSIVITYUNIT 
+///   MOLECULARWEIGHTUNIT 
+///   MOMENTORINERTIAUNIT 
+///   PLANARFORCEUNIT 
+///   ROTATIONALFREQUENCYUNIT 
+///   ROTATIONALSTIFFNESSUNIT 
+///   SHEARMODULUSUNIT 
+///   SPECIFICHEATCAPACITYUNIT 
+///   THERMALADMITTANCEUNIT 
+///   THERMALCONDUCTANCEUNIT 
+///   THERMALRESISTANCEUNIT 
+///   THERMALTRANSMITTANCEUNIT 
+///   TORQUEUNIT 
+///   VAPORPERMEABILITYUNIT 
+///   VOLUMETRICFLOWRATEUNIT 
+///   CURVATUREUNIT 
+///   HEATINGVALUEUNIT 
+///   IONCONCENTRATIONUNIT 
+///   LUMINOUSINTENSITYDISTRIBUTIONUNIT 
+///   MASSPERLENGTHUNIT 
+///   MODULUSOFLINEARSUBGRADEREACTIONUNIT 
+///   MODULUSOFROTATIONALSUBGRADEREACTIONUNIT 
+///   PHUNIT 
+///   ROTATIONALMASSUNIT 
+///   SECTIONAREAINTEGRALUNIT 
+///   SECTIONMODULUSUNIT 
+///   SOUNDPOWERUNIT 
+///   SOUNDPRESSUREUNIT 
+///   TEMPERATUREGRADIENTUNIT 
+///   TEMPERATURERATEOFCHANGE 
+///   THERMALEXPANSIONCOEFFICIENTUNIT 
+///   WARPINGCONSTANTUNIT 
+///   WARPINGMOMENTUNIT 
+///   USERDEFINED: User defined derived unit. 
 /// 
-/// HISTORY  New entity in IFC2x2.
-typedef IfcUtil::IfcSchemaEntity IfcColour;
-/// The IfcColourOrFactor enables the selection of either a RGB colour value or a scalar factor value for the use as values of the reflectance components.
+/// HISTORY: New type in IFC Release 2.0.
 /// 
-/// HISTORY: New type in IFC2x2.
-typedef IfcUtil::IfcSchemaEntity IfcColourOrFactor;
+/// IFC 2x4 change: added TEMPERATURERATEOFCHANGE.
+typedef enum {IfcDerivedUnit_ANGULARVELOCITYUNIT, IfcDerivedUnit_COMPOUNDPLANEANGLEUNIT, IfcDerivedUnit_DYNAMICVISCOSITYUNIT, IfcDerivedUnit_HEATFLUXDENSITYUNIT, IfcDerivedUnit_INTEGERCOUNTRATEUNIT, IfcDerivedUnit_ISOTHERMALMOISTURECAPACITYUNIT, IfcDerivedUnit_KINEMATICVISCOSITYUNIT, IfcDerivedUnit_LINEARVELOCITYUNIT, IfcDerivedUnit_MASSDENSITYUNIT, IfcDerivedUnit_MASSFLOWRATEUNIT, IfcDerivedUnit_MOISTUREDIFFUSIVITYUNIT, IfcDerivedUnit_MOLECULARWEIGHTUNIT, IfcDerivedUnit_SPECIFICHEATCAPACITYUNIT, IfcDerivedUnit_THERMALADMITTANCEUNIT, IfcDerivedUnit_THERMALCONDUCTANCEUNIT, IfcDerivedUnit_THERMALRESISTANCEUNIT, IfcDerivedUnit_THERMALTRANSMITTANCEUNIT, IfcDerivedUnit_VAPORPERMEABILITYUNIT, IfcDerivedUnit_VOLUMETRICFLOWRATEUNIT, IfcDerivedUnit_ROTATIONALFREQUENCYUNIT, IfcDerivedUnit_TORQUEUNIT, IfcDerivedUnit_MOMENTOFINERTIAUNIT, IfcDerivedUnit_LINEARMOMENTUNIT, IfcDerivedUnit_LINEARFORCEUNIT, IfcDerivedUnit_PLANARFORCEUNIT, IfcDerivedUnit_MODULUSOFELASTICITYUNIT, IfcDerivedUnit_SHEARMODULUSUNIT, IfcDerivedUnit_LINEARSTIFFNESSUNIT, IfcDerivedUnit_ROTATIONALSTIFFNESSUNIT, IfcDerivedUnit_MODULUSOFSUBGRADEREACTIONUNIT, IfcDerivedUnit_ACCELERATIONUNIT, IfcDerivedUnit_CURVATUREUNIT, IfcDerivedUnit_HEATINGVALUEUNIT, IfcDerivedUnit_IONCONCENTRATIONUNIT, IfcDerivedUnit_LUMINOUSINTENSITYDISTRIBUTIONUNIT, IfcDerivedUnit_MASSPERLENGTHUNIT, IfcDerivedUnit_MODULUSOFLINEARSUBGRADEREACTIONUNIT, IfcDerivedUnit_MODULUSOFROTATIONALSUBGRADEREACTIONUNIT, IfcDerivedUnit_PHUNIT, IfcDerivedUnit_ROTATIONALMASSUNIT, IfcDerivedUnit_SECTIONAREAINTEGRALUNIT, IfcDerivedUnit_SECTIONMODULUSUNIT, IfcDerivedUnit_SOUNDPOWERUNIT, IfcDerivedUnit_SOUNDPRESSUREUNIT, IfcDerivedUnit_TEMPERATUREGRADIENTUNIT, IfcDerivedUnit_THERMALEXPANSIONCOEFFICIENTUNIT, IfcDerivedUnit_WARPINGCONSTANTUNIT, IfcDerivedUnit_WARPINGMOMENTUNIT, IfcDerivedUnit_USERDEFINED} IfcDerivedUnitEnum;
+const char* ToString(IfcDerivedUnitEnum v);
+IfcDerivedUnitEnum FromString(const std::string& s);
+}
+namespace IfcDimensionExtentUsage {
 
-typedef IfcUtil::IfcSchemaEntity IfcConditionCriterionSelect;
-/// Definition from ISO/CD 10303-42:1992: This type identifies the types of entity which may be selected as the root of a CSG tree including a single CSG primitive as a special case.
-/// Definition from IAI: The IfcBooleanResult, and subtypes of IfcCsgPrimitive3D are defined as potential root tree expression (at IfcCsgSolid). A subtype of IfcCsgPrimitive3D marks the special case of a CSG solid solely expressed by a single primitive.
+typedef enum {IfcDimensionExtentUsage_ORIGIN, IfcDimensionExtentUsage_TARGET} IfcDimensionExtentUsage;
+const char* ToString(IfcDimensionExtentUsage v);
+IfcDimensionExtentUsage FromString(const std::string& s);
+}
+namespace IfcDirectionSenseEnum {
+/// IfcDirectionSenseEnum is an enumeration denoting whether sense of direction is positive or negative along the given axis.
 /// 
-/// NOTE Corresponding ISO 10303-42 type: csg_select, please refer to ISO/IS 10303-42:1994, p.168 for the final definition of the formal standard.
+/// ENUMERATION
 /// 
-/// HISTORY New Type in IFC Release 1.5.1.
-typedef IfcUtil::IfcSchemaEntity IfcCsgSelect;
-/// Definition from ISO/CD 10303-46:1992: The curve font or scaled curve font select is a selection of either a curve font style select (being either a predefined curve font or an explicitly defined curve font) or a curve style font and scaling. 
+/// POSITIVE: Direction defined to be positive.
+/// NEGATIVE: Direction defined to be negative.
 /// 
-/// NOTE Corresponding ISO 10303 name: curve_font_or_scaled_curve_font_select. Please refer to ISO/IS 10303-46:1994 for the final definition of the formal standard.
+/// HISTORY New Type in IFC2x.
+typedef enum {IfcDirectionSense_POSITIVE, IfcDirectionSense_NEGATIVE} IfcDirectionSenseEnum;
+const char* ToString(IfcDirectionSenseEnum v);
+IfcDirectionSenseEnum FromString(const std::string& s);
+}
+namespace IfcDistributionChamberElementTypeEnum {
+/// This enumeration identifies different types of distribution chambers.
 /// 
-/// HISTORY New entity in IFC2x2.
-typedef IfcUtil::IfcSchemaEntity IfcCurveFontOrScaledCurveFontSelect;
-/// IfcCurveOrEdgeCurve provides the option to either select a geometric curve (IfcCurve
-/// and subtypes) within a geometric model, or a curve with associated geometry and coordinates (IfcEdgeCurve) within a topological model.
-/// SELECT 
+/// Valid enumerations are:
 /// 
-/// IfcCurve
-///   IfcEdgeCurve
+/// FORMEDDUCT: Space formed in the ground for the passage of pipes, cables, ducts.
+/// INSPECTIONCHAMBER: Chamber constructed on a drain, sewer or pipeline with a removable cover that permits visble inspection.
+/// INSPECTIONPIT:  Recess or chamber formed to permit access for inspection of substructure and services.
+/// MANHOLE: Chamber constructed on a drain, sewer or pipeline with a removable cover that permits the entry of a person.
+/// METERCHAMBER: Chamber that houses a meter(s).
+/// SUMP: Recessed or small chamber into which liquid is drained to facilitate its collection for removal.
+/// TRENCH: Excavated chamber, the length of which typically exceeds the width.
+/// VALVECHAMBER: Chamber that houses a valve(s).
+/// USERDEFINED: User-defined chamber type.
+/// NOTDEFINED: Undefined chamber type.
 /// 
-/// HISTORY  New select type in IFC2x Edition 3.
-typedef IfcUtil::IfcSchemaEntity IfcCurveOrEdgeCurve;
-/// Definition from ISO/CD 10303-46:1992: The curve style font select is a selection of a curve style font or a predefined curve style font. 
+/// HISTORY: New enumeration in IFC R2x2
+typedef enum {IfcDistributionChamberElementType_FORMEDDUCT, IfcDistributionChamberElementType_INSPECTIONCHAMBER, IfcDistributionChamberElementType_INSPECTIONPIT, IfcDistributionChamberElementType_MANHOLE, IfcDistributionChamberElementType_METERCHAMBER, IfcDistributionChamberElementType_SUMP, IfcDistributionChamberElementType_TRENCH, IfcDistributionChamberElementType_VALVECHAMBER, IfcDistributionChamberElementType_USERDEFINED, IfcDistributionChamberElementType_NOTDEFINED} IfcDistributionChamberElementTypeEnum;
+const char* ToString(IfcDistributionChamberElementTypeEnum v);
+IfcDistributionChamberElementTypeEnum FromString(const std::string& s);
+}
+namespace IfcDocumentConfidentialityEnum {
+/// IfcDocumentConfidentialityEnum enables selection of the level of confidentiality of document information from a list of choices. 
 /// 
-/// NOTE Corresponding ISO 10303 name: curve_style_font_select. Please refer to ISO/IS 10303-46:1994 for the final definition of the formal standard.
+/// HISTORY: New enumeration in IFC 2x
 /// 
-/// HISTORY New entity in IFC2x2.
-typedef IfcUtil::IfcSchemaEntity IfcCurveStyleFontSelect;
-
-typedef IfcUtil::IfcSchemaEntity IfcDateTimeSelect;
-/// The defined symbol select is a selection between a predefined symbol and an externally defined symbol. 
+/// Enumeration 
 /// 
-/// NOTE Corresponding ISO 10303 name: defined_symbol_select. Please refer to ISO/IS 10303-46:1994 for the final definition of the formal standard.
+/// PUBLIC: Document is publicly available. 
+/// RESTRICTED: Document availability is restricted. 
+/// CONFIDENTIAL: Document is confidential and its contents should not be revealed without permission. 
+/// PERSONAL: Document is personal to the author. 
+/// USERDEFINED 
+/// NOTDEFINED
+typedef enum {IfcDocumentConfidentiality_PUBLIC, IfcDocumentConfidentiality_RESTRICTED, IfcDocumentConfidentiality_CONFIDENTIAL, IfcDocumentConfidentiality_PERSONAL, IfcDocumentConfidentiality_USERDEFINED, IfcDocumentConfidentiality_NOTDEFINED} IfcDocumentConfidentialityEnum;
+const char* ToString(IfcDocumentConfidentialityEnum v);
+IfcDocumentConfidentialityEnum FromString(const std::string& s);
+}
+namespace IfcDocumentStatusEnum {
+/// IfcDocumentStatusEnum enables selection of the status of document information from a list of choices.
 /// 
-/// HISTORY New type in IFC2x2.
-typedef IfcUtil::IfcSchemaEntity IfcDefinedSymbolSelect;
-/// IfcDerivedMeasureValue is a select type for selecting between derived measure types.
+/// HISTORY: New enumeration in IFC Release 2x.
+typedef enum {IfcDocumentStatus_DRAFT, IfcDocumentStatus_FINALDRAFT, IfcDocumentStatus_FINAL, IfcDocumentStatus_REVISION, IfcDocumentStatus_NOTDEFINED} IfcDocumentStatusEnum;
+const char* ToString(IfcDocumentStatusEnum v);
+IfcDocumentStatusEnum FromString(const std::string& s);
+}
+namespace IfcDoorPanelOperationEnum {
+/// This enumeration defines the basic ways how individual door panels operate as shown in Figure 164.
+/// HISTORY New Enumeration in IFC Release 2.0.
+/// IFC2x4 CHANGE Enumerator FIXEDPANELadded.
 /// 
-/// SELECT 
+/// Swinging
 /// 
-/// IfcAbsorbedDoseMeasure 
-///   IfcAccelerationMeasure 
-///   IfcAngularVelocityMeasure 
-///   IfcCompoundPlaneAngleMeasure 
-///   IfcDoseEquivalentMeasure 
-///   IfcDynamicViscosityMeasure 
-///   IfcElectricCapacitanceMeasure 
-///   IfcElectricChargeMeasure 
-///   IfcElectricConductanceMeasure 
-///   IfcElectricResistanceMeasure 
-///   IfcElectricVoltageMeasure 
-///   IfcEnergyMeasure 
-///   IfcForceMeasure 
-///   IfcFrequencyMeasure 
-///   IfcHeatFluxDensityMeasure 
-///   IfcIlluminanceMeasure 
-///   IfcInductanceMeasure 
-///   IfcIntegerCountRateMeasure 
-///   IfcIsothermalMoisturecapacityMeasure 
-///   IfcKinematicViscosityMeasure 
-///   IfcLinearForceMeasure 
-///   IfcLinearMomentMeasure  
-///   IfcLinearStiffnessMeasure 
-///   IfcLinearVelocityMeasure 
-///   IfcLuminousFluxMeasure 
-///   IfcMagneticFluxDensityMeasure 
-///   IfcMagneticFluxMeasure 
-///   IfcMassDensityMeasure 
-///   IfcMassFlowRateMeasure 
-///   IfcModulusOfElasticityMeasure 
-///   IfcModulusOfSubgradeReactionMeasure 
-///   IfcMoistureDiffusivityMeasure 
-///   IfcMolecularWeightMeasure 
-///   IfcMomentOfInertiaMeasure  
-///   IfcMonetaryMeasure 
-///   IfcPlanarForceMeasure 
-///   IfcPowerMeasure 
-///   IfcPressureMeasure 
-///   IfcRadioActivityMeasure 
-///   IfcRotationalFrequencyMeasure 
-///   IfcRotationalStiffnessMeasure 
-///   IfcShearModulusMeasure 
-///   IfcSpecificHeatCapacityMeasure 
-///   IfcThermalAdmittanceMeasure 
-///   IfcThermalConductivityMeasure 
-///   IfcThermalResistanceMeasure 
-///   IfcThermalTransmittanceMeasure 
-///   IfcTimeStamp 
-///   IfcTorqueMeasure 
-///   IfcVaporPermeabilityMeasure 
-///   IfcVolumetricFlowRateMeasure 
-///   IfcCurvatureMeasure 
-///   IfcMassPerLengthMeasure 
-///   IfcRotationalMassMeasure 
-///   IfcSectionalAreaIntegralMeasure 
-///   IfcSectionModulusMeasure 
-///   IfcTemperatureGradientMeasure 
-///   IfcTemperatureRateOfChangeMeasure 
-///   IfcWarpingConstantMeasure 
-///   IfcWarpingMomentMeasure 
-///   IfcThermalExpansionCoefficientMeasure 
-///   IfcModulusOfLinearSubgradeReactionMeasure 
-///   IfcModulusOfRotationalSubgradeReactionMeasure 
-///   IfcLuminousIntensityDistributionMeasure 
-///   IfcSoundPowerMeasure 
-///   IfcSoundPressureMeasure 
+/// DoubleActing
 /// 
-/// HISTORY New type in IFC Release 2x.
+/// Sliding
 /// 
-/// IFC2x4 change: added IfcTemperatureRateOfChangeMeasure.
-typedef IfcUtil::IfcSchemaEntity IfcDerivedMeasureValue;
-/// IfcDocumentSelect enables selection of whether document information is to be contained within an IFC model or is to be referenced from an external source. 
+/// Folding
 /// 
-/// HISTORY: New Select Type in IFC 2x
+/// Revolving
 /// 
-/// Select From: 
+/// Rollingup
 /// 
-/// IfcDocumentInformation (for "metadata" of an external document)  
-/// IfcDocumentReference (for reference within a document)
-typedef IfcUtil::IfcSchemaEntity IfcDocumentSelect;
-
-typedef IfcUtil::IfcSchemaEntity IfcDraughtingCalloutElement;
-/// The fill area style tile shape select is used to make a selection for the style of the fill area style tile.
+/// FixedPanel
 /// 
-/// NOTE: The IfcFillAreaStyleTileShapeSelect is an entity that had been adopted from ISO 10303, Industrial automation systems and integration&#151;Product data representation and exchange, Part 46: Integrated generic resources: Visual presentation.
+/// NOTE Enumerator added in IFC2x4.
 /// 
-/// NOTE Corresponding ISO 10303 name: fill_area_style_tile_shape_select. Please refer to ISO/IS 10303-46:1994 for the final definition of the formal standard.
+/// UserDefined
+///  
 /// 
-/// HISTORY New type in IFC2x2.
-typedef IfcUtil::IfcSchemaEntity IfcFillAreaStyleTileShapeSelect;
-/// Definition from ISO/CD 10303-46:1992: The fill style select is a selection between different fill area styles.
+/// NotDefined
+///  
 /// 
-/// NOTE Corresponding ISO 10303 name: fill_style_select. Please refer to ISO/IS 10303-46:1994 for
-/// the final definition of the formal standard.
+/// Figure 164 — Door operations
 /// 
-/// HISTORY New type in IFC2x2.
-typedef IfcUtil::IfcSchemaEntity IfcFillStyleSelect;
-/// Definition from ISO/CD 10303-42:1992: This select type identifies the types of entities which can occur in a geometric set. 
+/// The opening direction of the door panels is given by the local
+/// placement of the IfcDoor. The positive y-axis determines
+/// the direction as shown in Figure 165.
 /// 
-/// NOTE: Corresponding ISO 10303 type: geometric_set_select. Please refer to ISO/IS 10303-42:1994, p. 169 for the final definition of the formal standard.
+/// Figure 165 — Door panel operations
 /// 
-/// HISTORY: New type in IFC Release 2x.
-typedef IfcUtil::IfcSchemaEntity IfcGeometricSetSelect;
-/// The IfcHatchLineDistanceSelect is a selection between different ways to determine the distance and potentially start point of hatch lines, either by an offset distance length measure or by a vector.
+/// NOTE  Figures (symbolic representation) depend on the national building code.  These figures are only shown as illustrations
+typedef enum {IfcDoorPanelOperation_SWINGING, IfcDoorPanelOperation_DOUBLE_ACTING, IfcDoorPanelOperation_SLIDING, IfcDoorPanelOperation_FOLDING, IfcDoorPanelOperation_REVOLVING, IfcDoorPanelOperation_ROLLINGUP, IfcDoorPanelOperation_USERDEFINED, IfcDoorPanelOperation_NOTDEFINED} IfcDoorPanelOperationEnum;
+const char* ToString(IfcDoorPanelOperationEnum v);
+IfcDoorPanelOperationEnum FromString(const std::string& s);
+}
+namespace IfcDoorPanelPositionEnum {
+/// Definition: This enumeration defines the basic ways to describe the location of a door panel within a door lining.
 /// 
-/// HISTORY  New type in IFC2x3.
-typedef IfcUtil::IfcSchemaEntity IfcHatchLineDistanceSelect;
-/// Definition from ISO/CD 10303-46:1992: The layered things type selects those things, which can be grouped in layers. 
+/// HISTORY New Enumeration in IFC Release 2.x
 /// 
-/// It is the collection of all those items, that are assigned to a single layer. These items are representation items or complete representations (IfcRepresentationItem, IfcRepresentation). If an IfcRepresentation is referenced, all IfcRepresentationItem within its set of Items are assigned to the same layer. 
+/// Figure 166 shows the designation of a door panel with PanelPosition = LEFT and a door panel with PanelPosition = RIGHT within a door style with OperationType = DOUBLE_DOOR_SINGLE_SWING. The position is given as shown in the XZ plane of the local placement, looking into the direction of the positive Y axis. 
 /// 
-/// NOTE: Corresponding ISO 10303 name: layered_item. It was called layered_things in the ISO/CD version and had been renamed to layered_item in the ISO/IS final version. Please refer to ISO/IS 10303-46:1994, p. 13 for the final definition of the formal standard.
+/// Figure 166 — Door panel positions
+typedef enum {IfcDoorPanelPosition_LEFT, IfcDoorPanelPosition_MIDDLE, IfcDoorPanelPosition_RIGHT, IfcDoorPanelPosition_NOTDEFINED} IfcDoorPanelPositionEnum;
+const char* ToString(IfcDoorPanelPositionEnum v);
+IfcDoorPanelPositionEnum FromString(const std::string& s);
+}
+namespace IfcDoorStyleConstructionEnum {
+/// Definition from IAI: This enumeration defines the
+///   basic types of construction of doors. The construction type
+///   relates to the main material (or material combination) used
+///   for making the door.
 /// 
-/// HISTORY: New type in IFC2x2.
-typedef IfcUtil::IfcSchemaEntity IfcLayeredItem;
-/// IfcLibrarySelect enables selection of whether library information is to be contained within an IFC model or is to be referenced from an external source. 
+/// HISTORY New Enumeration in
+///   IFC Release 2x .
+typedef enum {IfcDoorStyleConstruction_ALUMINIUM, IfcDoorStyleConstruction_HIGH_GRADE_STEEL, IfcDoorStyleConstruction_STEEL, IfcDoorStyleConstruction_WOOD, IfcDoorStyleConstruction_ALUMINIUM_WOOD, IfcDoorStyleConstruction_ALUMINIUM_PLASTIC, IfcDoorStyleConstruction_PLASTIC, IfcDoorStyleConstruction_USERDEFINED, IfcDoorStyleConstruction_NOTDEFINED} IfcDoorStyleConstructionEnum;
+const char* ToString(IfcDoorStyleConstructionEnum v);
+IfcDoorStyleConstructionEnum FromString(const std::string& s);
+}
+namespace IfcDoorStyleOperationEnum {
+/// This enumeration defines the basic ways to describe how doors operate as shown in Figure 167.
+/// HISTORY  New Enumeration in Release IFC2x.
 /// 
-/// HISTORY: New Select Type in IFC2x
+/// Enumerator
+///   Description
+///   Figure
 /// 
-/// Select From: 
+/// SINGLE_SWING_LEFT
 /// 
-/// IfcLibraryInformation (for library information)  
-/// IfcLibraryReference (for reference into a library of information by location)  
+/// Door with one
+/// panel that opens (swings) to the
+/// left. The hinges are on the left side as viewed in the direction of the
+/// positive y-axis.
+///   Note: Direction of swing (whether
+/// in or out)
+/// is determined at the IfcDoor.
 /// 
-/// Generally, it is expected that selection will be IfcLibraryReference and only rarely IfcLibraryInformation. IfcLibraryInformation should only be selected in circumstances where there could be a need to indicate the libraries that will be used without making individual references. This may occur for higher level objects such as a project or building.
-typedef IfcUtil::IfcSchemaEntity IfcLibrarySelect;
-/// A goniometric light gets its intensity distribution function (how much light goes in any one direction) from one of two sources: (i) an industry-standard file, (ii) from distribution data passed directly via the IfcLightIntensityDistribution. 
+/// SINGLE_SWING_RIGHT
 /// 
-/// The light distribution provides the luminous intensity distribution according to some standardized light distribution curves. 
+/// Door with one
+/// panel that opens (swings) to the
+/// right. The hinges are on the right side as viewed in the direction of
+/// the positive y-axis.
+///   Note: Direction of swing (whether
+/// in or out)
+/// is determined at the IfcDoor.
 /// 
-/// Select: 
+/// DOUBLE_DOOR_
+/// SINGLE_SWING
 /// 
-/// Type 
-///   Definition 
+/// Door with two
+/// panels, one opens (swings) to the
+/// left the other opens (swings) to the right.
+///   Note: Direction of swing (whether
+/// in or out)
+/// is determined at the IfcDoor. 
 /// 
-/// IfcExternalReference 
-///   Light distribution is represented by a standard photometric data file such as Eulumdat, IES, CIBSE TM14.  
+/// DOUBLE_SWING_LEFT
 /// 
-/// IfcLightIntensityDistribution 
-///   For representing a light distribution directly the
-///   following values needs to be given in a table like structure with column and
-///   row headings. These headings should contain the angles (C/&#947; or B/&#946; )
-///   and the table body contains the intensity values, (normally normalized to
-///   cd/Klm). The angles can be non- equidistant and the angle steps can be almost
-///   any value in the valid range, so a list of all available angles in both
-///   directions covers all cases.  
+/// Door with one
+/// panel that swings in both
+/// directions and to the left in the main trafic direction. Also called
+/// double acting door.
+///   Note: Direction of main swing
+/// (whether in or
+/// out) is determined at the IfcDoor. 
 /// 
-/// HISTORY New type in IFC2x2.
-typedef IfcUtil::IfcSchemaEntity IfcLightDistributionDataSourceSelect;
-/// IfcMaterialSelect provides selection of either a material
-/// definition or a material usage definition that can be assigned to
-/// an element, a resource or another entity within IFC.
-/// SELECT
+/// DOUBLE_SWING_RIGHT
 /// 
-/// IfcMaterialDefinition
+/// Door with one
+/// panel that swings in both
+/// directions and to the right in the main trafic direction. Also called
+/// double acting door.
+///   Note: Direction of main swing
+/// (whether in or
+/// out) is determined at the IfcDoor.
 /// 
-/// IfcMaterial
-/// IfcMaterialLayer
-/// IfcMaterialLayerSet
-/// IfcMaterialProfile
-/// IfcMaterialProfileSet
-/// IfcMaterialConstituent
-/// IfcMaterialConstituentSet
+/// DOUBLE_DOOR_
+/// DOUBLE_SWING
 /// 
-/// IfcMaterialUsageDefinition
+/// Door with two
+/// panels, one swings in both
+/// directions and to the right in the main trafic direction the other
+/// swings also in both directions and to the left in the main trafic
+/// direction.
+///   Note: Direction of main swing
+/// (whether in or
+/// out) is determined at the IfcDoor.
 /// 
-/// IfcMaterialLayerSetUsage
-/// IfcMaterialProfileSetUsage
+/// DOUBLE_DOOR_
+/// SINGLE_SWING_
+/// OPPOSITE_LEFT
 /// 
-/// IfcMaterialList
+/// Door with two
+/// panels that both open to the left,
+/// one panel swings in one direction and the other panel swings in the
+/// opposite direction.
+///   Note: Direction of main swing
+/// (whether in or
+/// out) is determined at the IfcDoor.
 /// 
-/// HISTORY New select in IFC 1.0
+/// DOUBLE_DOOR_
+/// SINGLE_SWING_
+/// OPPOSITE_RIGHT
+///   Door with two
+/// panels that both open to the right,
+/// one panel swings in one direction and the other panel swings in the
+/// opposite direction.
+///   Note: Direction of main swing
+/// (whether in or
+/// out) is determined at the IfcDoor.
 /// 
-/// IFC2x4 CHANGE The select now includes two new abstract entities IfcMaterialDefinition
-/// and IfcMaterialUsageDefinition with upward compatibility.  The use of IfcMaterialList is deprecated from IFC2x4 onwards.
-typedef IfcUtil::IfcSchemaEntity IfcMaterialSelect;
-/// Definition from ISO/CD 10303-41:1992: A measure value is a value as defined in ISO 31-0 (clause 2).
+/// SLIDING_TO_LEFT
 /// 
-/// NOTE IfcMeasureValue is a select data type for most basic measure types coming from ISO 10303-41.  Select item IfcNonNegativeLengthMeasure is in addition to ISO 10303-41.
+/// Door with one
+/// panel that is sliding to the left. 
 /// 
-/// NOTE Corresponding ISO 10303 name: measure_value, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
+/// SLIDING_TO_RIGHT
 /// 
-/// HISTORY New type in IFC Release 1.5.1.
+/// Door with one
+/// panel that is sliding to the right. 
 /// 
-/// IFC 2x4 change: added IfcNonNegativeLengthMeasure
-typedef IfcUtil::IfcSchemaEntity IfcMeasureValue;
-/// IfcMetricValueSelect is a select type that enables selection of the data type for the value component of an IfcMetric. 
+/// DOUBLE_DOOR_SLIDING
 /// 
-/// HISTORY: New type in IFC Release 2.0
+/// Door with two
+/// panels, one is sliding to the left
+/// the other is sliding to the right. 
 /// 
-/// Select 
+/// FOLDING_TO_LEFT
 /// 
-/// IfcCostValue
-///   IfcDateTime 
-///   IfcMeasureWithUnit 
-///   IfcTable 
-///   IfcText 
-///   IfcTimeSeries
-typedef IfcUtil::IfcSchemaEntity IfcMetricValueSelect;
-/// IfcObjectReferenceSelect is a select type, that holds a list of resource level entities that can be used as properties within a property set. 
+/// Door with one
+/// panel that is folding to the left. 
 /// 
-/// HISTORY  New select type in IFC Release 2.0.
-typedef IfcUtil::IfcSchemaEntity IfcObjectReferenceSelect;
-
-typedef IfcUtil::IfcSchemaEntity IfcOrientationSelect;
-/// IfcPointOrVertexPoint provides the option to either select a geometric point (IfcPoint and subtypes) within a geometric model, or a vertex with associated point coordinates (IfcVertexPoint) within a topological model.
-/// SELECT 
+/// FOLDING_TO_RIGHT
+///   Door with one
+/// panel that is folding to the right. 
 /// 
-/// IfcPoint, 
-///   IfcVertexPoint
+/// DOUBLE_DOOR_FOLDING
 /// 
-/// HISTORY  New select type in IFC2x Edition 3.
-typedef IfcUtil::IfcSchemaEntity IfcPointOrVertexPoint;
-/// Definition from ISO/CD 10303-46:1992: The presentation style select is a selection of one of many kinds of styles, a different one for each kind of geometric representation item to be styled.
+/// Door with two
+/// panels, one is folding to the left
+/// the other is folding to the right. 
 /// 
-/// NOTE Corresponding ISO 10303 name: presentation_style_Select. Please refer to ISO/IS
-/// 10303-46:1994 for the final definition of the formal standard.
+/// REVOLVING
 /// 
-/// HISTORY New type in IFC2x2.
+/// An entrance door
+/// consisting of four leaves set in
+/// a form of a cross and revolving around a central vertical axis (the
+/// four panels are described by a single IfcDoor panel
+/// property). 
 /// 
-/// IFC2x4 CHANGE The select type has been deprecated.
-typedef IfcUtil::IfcSchemaEntity IfcPresentationStyleSelect;
-/// Definition from ISO/CD 10303-42:1992 This type collects together, for reference when constructing more complex models, the subtypes which have the characteristics of a shell. A shell is a connected object of fixed dimensionality d = 0; 1; or 2, typically used to bound a region. The domain of a shell, if present, includes its bounds and 0 £ X < ¥.  
+/// ROLLINGUP
 /// 
-/// A shell of dimensionality 0 is represented by a graph consisting of a single vertex. The vertex shall not have any associated edges. 
-/// A shell of dimensionality 1 is represented by a connected graph of dimensionality 1. 
-/// A shell of dimensionality 2 is a topological entity constructed by joining faces along edges. Its domain, if present, is a connected, orientable 2-manifold with boundary, that is, a connected, oriented, finite, non-self-intersecting surface, which may be closed or open. 
+/// Door that opens
+/// by rolling up.
+///   Note: Whether it rolls up to the
+/// inside or
+/// outside is determined at the IfcDoor.
 /// 
-/// Shells of dimensionality 0 and 1 are not part of the current IFC release. 
+/// USERDEFINED
+///   User defined
+/// operation type
+///    
 /// 
-/// NOTE  Corresponding ISO 10303 type: shell. Please refer to ISO/IS 10303-42:1994, p. 127 for the final definition of the formal standard. Only the select items closed_shell (IfcClosedShell) and open_shell (IfcOpenShell) have been incorporated in the current IFC release. 
+/// NOTDEFINED
+///   A door with a
+/// not defined operation type is
+/// considered as a door with a lining, but no panels. It is thereby always
+/// open.
+///    
 /// 
-/// HISTORY  New type in IFC2x.
-typedef IfcUtil::IfcSchemaEntity IfcShell;
-/// IfcSimpleValue is a select type for selecting between simple value types.
+/// Figure 167 — Door style operations
 /// 
-/// SELECT 
+/// NOTE
 /// 
-/// IfcInteger: Defined type of simple type INTEGER. 
-///   IfcReal: Defined type of simple type REAL. 
-///   IfcBoolean: Defined type of simple type BOOLEAN. 
-///   IfcLogical: Defined type of simple type LOGICAL. 
-///   IfcIdentifier: Defined type of simple type STRING for identification purposes. 
-///   IfcLabel: Defined type of simple type STRING for naming purposes. 
-///   IfcText: Defined type of simple type STRING for descriptive purposes. 
-///   IfcDateTime: Defined type of simple type STRING to represent a date and time. 
-///   IfcDate: Defined type of simple type STRING to represent a date. 
-///   IfcTime: Defined type of simple type STRING to represent a time. 
-///   IfcDuration: Defined type of simple type STRING to represent a duration. 
-/// 
-/// HISTORY New type in IFC Release 2x.
-/// 
-/// IFC2x4 CHANGE Items IfcDateTime, IfcDate, IfcTime, IfcDuration added.
-typedef IfcUtil::IfcSchemaEntity IfcSimpleValue;
-/// Definition from ISO/CD 10303-46:1992: The size select is a selection of a specific positive length measure.
-/// 
-/// Definition from ISO: The size (or width) measure value is given in the global drawing length units.
-/// 
-/// NOTE  global units are defined at the single IfcProject instance, given by UnitsInContext:IfcUnitAssignment, the same units are used for the geometric representation items and for the style definitions.
-/// 
-/// NOTE  Corresponding ISO 10303 name: size_select. Please refer to ISO/IS 10303-46:1994 for the final
-/// definition of the formal standard.
+/// Figures are shown in the ground view.
+///   Figures (symbolic representation) depend on the national
+/// building
+/// code.
+///   These figures are only shown as illustrations, the actual
+/// representation in the ground view might differ. 
+///   Open to the outside is declared as open into the direction
+/// of the
+/// positive y-axis, determined by the ObjectPlacement
+/// at IfcDoor
+///   The location of the panel relative to the wall thickness is
+/// defined by the ObjectPlacement at IfcDoor,
+/// and the IfcDoorLiningProperties.LiningOffset
+/// parameter.
+typedef enum {IfcDoorStyleOperation_SINGLE_SWING_LEFT, IfcDoorStyleOperation_SINGLE_SWING_RIGHT, IfcDoorStyleOperation_DOUBLE_DOOR_SINGLE_SWING, IfcDoorStyleOperation_DOUBLE_DOOR_SINGLE_SWING_OPPOSITE_LEFT, IfcDoorStyleOperation_DOUBLE_DOOR_SINGLE_SWING_OPPOSITE_RIGHT, IfcDoorStyleOperation_DOUBLE_SWING_LEFT, IfcDoorStyleOperation_DOUBLE_SWING_RIGHT, IfcDoorStyleOperation_DOUBLE_DOOR_DOUBLE_SWING, IfcDoorStyleOperation_SLIDING_TO_LEFT, IfcDoorStyleOperation_SLIDING_TO_RIGHT, IfcDoorStyleOperation_DOUBLE_DOOR_SLIDING, IfcDoorStyleOperation_FOLDING_TO_LEFT, IfcDoorStyleOperation_FOLDING_TO_RIGHT, IfcDoorStyleOperation_DOUBLE_DOOR_FOLDING, IfcDoorStyleOperation_REVOLVING, IfcDoorStyleOperation_ROLLINGUP, IfcDoorStyleOperation_USERDEFINED, IfcDoorStyleOperation_NOTDEFINED} IfcDoorStyleOperationEnum;
+const char* ToString(IfcDoorStyleOperationEnum v);
+IfcDoorStyleOperationEnum FromString(const std::string& s);
+}
+namespace IfcDuctFittingTypeEnum {
+/// This enumeration is used to identify the primary purpose of a duct fitting. This is a very basic categorization mechanism
+///   to generically identify the duct fitting type. Subcategories
+///   of duct fittings are not enumerated. 
+///   The IfcDuctFittingTypeEnum contains the following:
 /// 
-/// HISTORY  New type in IFC2x2.
+/// BEND:		A fitting with typically two ports used to change 
+///   the direction of flow between connected elements.
+///   CONNECTOR:   Connector fitting, typically used to join two
+///   ports together within a flow distribution system 
+///   (e.g., a coupling used to join two duct segments).
+///   ENTRY:       Entry fitting, typically unconnected at one port
+///   and connected to a flow distribution system at 
+///   the other (e.g., an outside air duct system 
+///   intake opening).
+///   EXIT:        Exit fitting, typically unconnected at one port
+///   and connected to a flow distribution system at 
+///   the other (e.g., an exhaust air discharge 
+///   opening).
+///   JUNCTION:	A fitting with typically more than two ports used
+///   to redistribute flow among the ports and/or to
+///   change the direction of flow between connected
+///   elements (e.g, tee, cross, wye, etc.).
+///   OBSTRUCTION: A fitting with typically two ports used to 
+///   obstruct or restrict flow between the connected
+///   elements (e.g., screen, perforated plate, etc.).
+///   TRANSITION:	A fitting with typically two ports having
+///   different shapes or sizes. Can also be used to
+///   change the direction of flow between connected
+///   elements.
+///   USERDEFINED: User-defined fitting.
+///   NOTDEFINED:  Undefined fitting.
 /// 
-/// IFC2x3 CHANGE  The SELECT item IfcMeasureWithUnit has been removed from the IfcSizeSelect, the IfcRatioMeasure and IfcDescriptiveMeasure has been added.
-typedef IfcUtil::IfcSchemaEntity IfcSizeSelect;
-/// The IfcSpecularHighlightSelect defines the selectable types of value for specular highlight sharpness. 
+/// HISTORY: New enumeration in IFC 2x2
+typedef enum {IfcDuctFittingType_BEND, IfcDuctFittingType_CONNECTOR, IfcDuctFittingType_ENTRY, IfcDuctFittingType_EXIT, IfcDuctFittingType_JUNCTION, IfcDuctFittingType_OBSTRUCTION, IfcDuctFittingType_TRANSITION, IfcDuctFittingType_USERDEFINED, IfcDuctFittingType_NOTDEFINED} IfcDuctFittingTypeEnum;
+const char* ToString(IfcDuctFittingTypeEnum v);
+IfcDuctFittingTypeEnum FromString(const std::string& s);
+}
+namespace IfcDuctSegmentTypeEnum {
+/// This enumeration is used to identify the primary purpose of a
+///   duct segment. This is a very basic categorization mechanism
+///   to generically identify the duct segment type. Subcategories
+///   of duct segments are not enumerated. 
+///   The IfcDuctSegmentTypeEnum contains the following:
 /// 
-/// NOTE: The two select types relate to the different ways to specifiy the sharpness (or shininess) of the specular part of the reflectance equation. It relates to the attributes: 
+/// RIGIDSEGMENT: A rigid segment is continuous linear segment of duct
+///   that cannot be deformed.
+///   FLEXIBLESEGMENT:  A flexible segment is a continuous non-linear segment
+///   of duct that can be deformed and change the direction 
+///   of flow.
+///   USERDEFINED: User-defined segment.
+///   NOTDEFINED:  Undefined segment.
 /// 
-/// in ISO10303-46 the attribute specular_exponent is given 
-///   in VRML97 the attribute shininess is given 
+/// HISTORY: New enumeration in IFC 2x2
+typedef enum {IfcDuctSegmentType_RIGIDSEGMENT, IfcDuctSegmentType_FLEXIBLESEGMENT, IfcDuctSegmentType_USERDEFINED, IfcDuctSegmentType_NOTDEFINED} IfcDuctSegmentTypeEnum;
+const char* ToString(IfcDuctSegmentTypeEnum v);
+IfcDuctSegmentTypeEnum FromString(const std::string& s);
+}
+namespace IfcDuctSilencerTypeEnum {
+/// Enumeration defining the typical types of duct silencers. 
+///   The IfcDuctSilencerTypeEnum contains the following:
 /// 
-/// For each surface side style only one of the two methods is needed for calculating the specular part of the equation.
+/// FLATOVAL:  Flat-oval shaped duct silencer type.
+///   RECTANGULAR:  Rectangular shaped duct silencer type.
+///   ROUND:  Round duct silencer type.
+///   USERDEFINED:  User-defined duct silencer type.
+///   NOTDEFINED:  Undefined duct silencer type.
 /// 
-/// HISTORY: New type in IFC2x2.
-typedef IfcUtil::IfcSchemaEntity IfcSpecularHighlightSelect;
-/// Definition from IAI: This type definition shall be used to
-///   distinguish between a reference to an instance either of
-///   IfcStructuralItem or IfcBuildingElement. The
-///   IfcStructuralActivityAssignmentSelect type is referenced by the entity
-///   IfcRelConnectsStructuralActivity which defines the connection between
-///   activities (IfcStructuralActivity) and the loaded element.  
+/// HISTORY: New enumeration in IFC 2x2.
+typedef enum {IfcDuctSilencerType_FLATOVAL, IfcDuctSilencerType_RECTANGULAR, IfcDuctSilencerType_ROUND, IfcDuctSilencerType_USERDEFINED, IfcDuctSilencerType_NOTDEFINED} IfcDuctSilencerTypeEnum;
+const char* ToString(IfcDuctSilencerTypeEnum v);
+IfcDuctSilencerTypeEnum FromString(const std::string& s);
+}
+namespace IfcElectricApplianceTypeEnum {
+/// The IfcElectricApplianceTypeEnum defines the range of different types of electrical appliance that can be specified. 
 /// 
-/// HISTORY: New type in Release IFC2x
-///   Edition 2.
-typedef IfcUtil::IfcSchemaEntity IfcStructuralActivityAssignmentSelect;
-/// IfcSurfaceOrFaceSurface provides the option to either select a geometric surface (IfcSurface
-/// and subtypes) within a geometric model, or a face with associated surface geometry and coordinates (IfcFaceSurface) within a topological model.
-/// SELECT 
+/// HISTORY: New type in IFC R2.0.
+///   Renamed from IfcElectricalApplianceTypeEnum if IFC 2x2.IFC 2x2 Addendum 1:
+///   Missing enumeration values added (ELECTRICHEATER, TUMBLEDRYER and
+///   WATERHEATER)
+///   IFC 2x4: ELECTRICHEATER changed to FREESTANDINGELECTRICHEATER and noted as being for occasional use. RADIANTHEATER removed as part of general 'heater consolidation'. WATERHEATER, DIRECTWATERHEATER and INDIRECTWATERHEATER rationalized to FREESTANDINGWATERHEATER. WATERCOOLER changed to FREESTANDINGWATERCOOLER.
+///   COMPUTER, FACSIMILE (FAX), PRINTER, SCANNER, TELEPHONE, TV (TELEVISION) moved to IfcAudioVisualApplianceTypeEnum and IfcCommunicationsApplianceTypeEnum. KITCHENMACHINE added.
 /// 
-/// IfcSurface 
-///   IfcFaceSurface
-///   IfcFaceBasedSurfaceModel (a connected face set, representing a faceted surface as an approximation of a non planar, non rectangular bounded surface)
+/// Enumeration 
 /// 
-/// HISTORY  New select type in IFC2x3.
-typedef IfcUtil::IfcSchemaEntity IfcSurfaceOrFaceSurface;
-/// Definition from ISO/CD 10303-46:1992: The surface style element select is a selection of the different surface styles to use in the presentation of the side of a surface. 
+/// DISHWASHER: An appliance that has the primary function of washing dishes. 
+/// ELECTRICCOOKER: An electrical appliance that has the primary function of cooking food (including oven, hob, grill). 
+/// FREESTANDINGELECTRICHEATER: An electrical appliance that is used occasionally to provide heat. A freestanding electric heater is a 'plugged' appliance whose load may be removed from an electric circuit. 
+/// FREESTANDINGFAN: An electrical appliance that is used occasionally to provide ventilation. A freestanding fan is a 'plugged' appliance whose load may be removed from an electric circuit. 
+/// FREESTANDINGWATERHEATER: A small, local electrical appliance for heating water. A freestanding water heater is a 'plugged' appliance whose load may be removed from an electric circuit. 
+/// FREESTANDINGWATERCOOLER: A small, local electrical appliance for cooling water. A freestanding water cooler is a 'plugged' appliance whose load may be removed from an electric circuit. 
+/// FREEZER: An electrical appliance that has the primary function of storing food at temperatures below the freezing point of water. 
+/// FRIDGE_FREEZER: An electrical appliance that combines the functions of a freezer and a refrigerator through the provision of separate compartments. 
+/// KITCHENMACHINE: A specialized appliance used in commercial kitchens such as a mixer. 
+/// HANDDRYER: An electrical appliance that has the primary function of drying hands. 
+/// MICROWAVE: An electrical appliance that has the primary function of cooking food using microwaves. 
+/// PHOTOCOPIER: A machine that has the primary function of reproduction of printed matter. 
+/// REFRIGERATOR: An electrical appliance that has the primary function of storing food at low temperature but above the freezing point of water. 
+/// TUMBLEDRYER: An electrical appliance that has the primary function of drying clothes. 
+/// VENDINGMACHINE: An appliance that stores and vends goods including food, drink and goods of various types. 
+/// WASHINGMACHINE: An appliance that has the primary function of washing clothes. 	  
+/// USERDEFINED: User-defined type. 
+/// NOTDEFINED: Undefined type.
+typedef enum {IfcElectricApplianceType_COMPUTER, IfcElectricApplianceType_DIRECTWATERHEATER, IfcElectricApplianceType_DISHWASHER, IfcElectricApplianceType_ELECTRICCOOKER, IfcElectricApplianceType_ELECTRICHEATER, IfcElectricApplianceType_FACSIMILE, IfcElectricApplianceType_FREESTANDINGFAN, IfcElectricApplianceType_FREEZER, IfcElectricApplianceType_FRIDGE_FREEZER, IfcElectricApplianceType_HANDDRYER, IfcElectricApplianceType_INDIRECTWATERHEATER, IfcElectricApplianceType_MICROWAVE, IfcElectricApplianceType_PHOTOCOPIER, IfcElectricApplianceType_PRINTER, IfcElectricApplianceType_REFRIGERATOR, IfcElectricApplianceType_RADIANTHEATER, IfcElectricApplianceType_SCANNER, IfcElectricApplianceType_TELEPHONE, IfcElectricApplianceType_TUMBLEDRYER, IfcElectricApplianceType_TV, IfcElectricApplianceType_VENDINGMACHINE, IfcElectricApplianceType_WASHINGMACHINE, IfcElectricApplianceType_WATERHEATER, IfcElectricApplianceType_WATERCOOLER, IfcElectricApplianceType_USERDEFINED, IfcElectricApplianceType_NOTDEFINED} IfcElectricApplianceTypeEnum;
+const char* ToString(IfcElectricApplianceTypeEnum v);
+IfcElectricApplianceTypeEnum FromString(const std::string& s);
+}
+namespace IfcElectricCurrentEnum {
+
+typedef enum {IfcElectricCurrent_ALTERNATING, IfcElectricCurrent_DIRECT, IfcElectricCurrent_NOTDEFINED} IfcElectricCurrentEnum;
+const char* ToString(IfcElectricCurrentEnum v);
+IfcElectricCurrentEnum FromString(const std::string& s);
+}
+namespace IfcElectricDistributionPointFunctionEnum {
+
+typedef enum {IfcElectricDistributionPointFunction_ALARMPANEL, IfcElectricDistributionPointFunction_CONSUMERUNIT, IfcElectricDistributionPointFunction_CONTROLPANEL, IfcElectricDistributionPointFunction_DISTRIBUTIONBOARD, IfcElectricDistributionPointFunction_GASDETECTORPANEL, IfcElectricDistributionPointFunction_INDICATORPANEL, IfcElectricDistributionPointFunction_MIMICPANEL, IfcElectricDistributionPointFunction_MOTORCONTROLCENTRE, IfcElectricDistributionPointFunction_SWITCHBOARD, IfcElectricDistributionPointFunction_USERDEFINED, IfcElectricDistributionPointFunction_NOTDEFINED} IfcElectricDistributionPointFunctionEnum;
+const char* ToString(IfcElectricDistributionPointFunctionEnum v);
+IfcElectricDistributionPointFunctionEnum FromString(const std::string& s);
+}
+namespace IfcElectricFlowStorageDeviceTypeEnum {
+/// The IfcElectricFlowStorageDeviceTypeEnum defines the range of different types of electrical flow storage device available. 
+///   HISTORY: New type in IFC 2x2  
+///   Enumeration 
 /// 
-/// The select type only includes the IfcSurfaceStyleRendering (which is the equivalent to surface_style_rendering) from the select type surface_style_element_select. In addition it has the IfcSurfaceStyleLighting, which holds the exact physically based lighting properties for lighting based calculation algorithms (as the opposite to the rendering based calculation), the IfcSurfaceStyleRefraction (for more advanced refraction indices) and IfcSurfaceStyleWithTextures (to allow for image textures applied to surfaces). In addition an IfcExternallyDefinedSurfaceStyle can be selected that points into an external material library. 
+/// BATTERY: A device for storing energy in chemical form so that it can be released as electrical energy. 
+/// CAPACITORBANK: A device that stores electrical energy when an external power supply is present using the electrical property of capacitance 
+/// HARMONICFILTER: A device that constantly injects currents that precisely correspond to the harmonic components drawn by the load. 
+/// UPS: A device that provides a time limited alternative source of power supply in the event of failure of the main supply.  
+/// USERDEFINED: User-defined type.  
+/// NOTDEFINED: Undefined type.
+typedef enum {IfcElectricFlowStorageDeviceType_BATTERY, IfcElectricFlowStorageDeviceType_CAPACITORBANK, IfcElectricFlowStorageDeviceType_HARMONICFILTER, IfcElectricFlowStorageDeviceType_INDUCTORBANK, IfcElectricFlowStorageDeviceType_UPS, IfcElectricFlowStorageDeviceType_USERDEFINED, IfcElectricFlowStorageDeviceType_NOTDEFINED} IfcElectricFlowStorageDeviceTypeEnum;
+const char* ToString(IfcElectricFlowStorageDeviceTypeEnum v);
+IfcElectricFlowStorageDeviceTypeEnum FromString(const std::string& s);
+}
+namespace IfcElectricGeneratorTypeEnum {
+/// The IfcElectricGeneratorTypeEnum defines the range of types of electric generators available.
+///   HISTORY: New type in IFC 2x2.  Values added in IFC 2x4. 
 /// 
-/// NOTE The IfcSurfaceLightingProperties are needed for exact lighting calculation, because physically based lighting calculation algorithms need exact physically based parameters. The factors in IfcSurfaceStyleRendering lack the physical base, they are intended for rendering calculations, but a lighting calculation based software cannot use these values.
+/// Enumeration 
 /// 
-/// NOTE: Corresponding ISO 10303 type: surface_style_element_select. Please refer to ISO/IS 10303-46:1994, p. 85 for the final definition of the formal standard.
+/// CHP: Combined heat and power supply, used not only as a source of electric energy but also as a heating source for the building. It may therefore be not only part of an electrical system but also of a heating system. 
+/// ENGINEGENERATOR: Electrical generator with a fuel-driven engine, for example a diesel-driven emergency power supply. 
+/// STANDALONE: Electrical generator which does not include its source of kinetic energy, that is, a motor, engine, or turbine is modeled by a separate object. 
+/// USERDEFINED: User-defined type. 
+/// NOTDEFINED: Undefined type.
+typedef enum {IfcElectricGeneratorType_USERDEFINED, IfcElectricGeneratorType_NOTDEFINED} IfcElectricGeneratorTypeEnum;
+const char* ToString(IfcElectricGeneratorTypeEnum v);
+IfcElectricGeneratorTypeEnum FromString(const std::string& s);
+}
+namespace IfcElectricHeaterTypeEnum {
+
+typedef enum {IfcElectricHeaterType_ELECTRICPOINTHEATER, IfcElectricHeaterType_ELECTRICCABLEHEATER, IfcElectricHeaterType_ELECTRICMATHEATER, IfcElectricHeaterType_USERDEFINED, IfcElectricHeaterType_NOTDEFINED} IfcElectricHeaterTypeEnum;
+const char* ToString(IfcElectricHeaterTypeEnum v);
+IfcElectricHeaterTypeEnum FromString(const std::string& s);
+}
+namespace IfcElectricMotorTypeEnum {
+/// The IfcElectricMotorTypeEnum defines the range of different types of electric motor that can be specified. 
+///   HISTORY: New type in IFC 2x2  
+///   Enumeration 
 /// 
-/// HISTORY: New Select type in IFC2x2.
-typedef IfcUtil::IfcSchemaEntity IfcSurfaceStyleElementSelect;
-/// The symbol style select allows for the selection of styles to be assigned to an annotated symbol.
+/// DC: A motor using either generated or rectified D.C. power. 
+/// INDUCTION: An alternating current motor in which the primary winding on one member (usually the stator) is connected to the power source and a secondary winding or a squirrel-cage secondary winding on the other member (usually the rotor) carries the induced current. There is no physical electrical connection to the secondary winding, its current is induced. 
+/// POLYPHASE: A two or three-phase induction motor in which the windings, one for each phase, are evenly divided by the same number of electrical degrees.  
+/// RELUCTANCESYNCHRONOUS: A synchronous motor with a special rotor design which directly lines the rotor up with the rotating magnetic field of the stator, allowing for no slip under load.  
+/// SYNCHRONOUS: A motor that operates at a constant speed up to full load. The rotor speed is equal to the speed of the rotating magnetic field of the stator; there is no slip. 
+/// USERDEFINED: User-defined type. 
+/// NOTDEFINED: Undefined type.
+typedef enum {IfcElectricMotorType_DC, IfcElectricMotorType_INDUCTION, IfcElectricMotorType_POLYPHASE, IfcElectricMotorType_RELUCTANCESYNCHRONOUS, IfcElectricMotorType_SYNCHRONOUS, IfcElectricMotorType_USERDEFINED, IfcElectricMotorType_NOTDEFINED} IfcElectricMotorTypeEnum;
+const char* ToString(IfcElectricMotorTypeEnum v);
+IfcElectricMotorTypeEnum FromString(const std::string& s);
+}
+namespace IfcElectricTimeControlTypeEnum {
+/// The IfcElectricTimeControlTypeEnum defines the range of types of electrical time control available. 
+///   HISTORY: New type in IFC 2x2  
+///   Enumeration 
 /// 
-/// NOTE: The selection is restricted to colour within the current release of IFC
+/// TIMECLOCK: A control that causes action to occur at set times. 
+/// TIMEDELAY: A control that causes action to occur following a set duration. 
+/// RELAY: Electromagnetically operated contactor for making or breaking a control circuit. 
+/// USERDEFINED: User-defined type. 
+/// NOTDEFINED: Undefined type.
+typedef enum {IfcElectricTimeControlType_TIMECLOCK, IfcElectricTimeControlType_TIMEDELAY, IfcElectricTimeControlType_RELAY, IfcElectricTimeControlType_USERDEFINED, IfcElectricTimeControlType_NOTDEFINED} IfcElectricTimeControlTypeEnum;
+const char* ToString(IfcElectricTimeControlTypeEnum v);
+IfcElectricTimeControlTypeEnum FromString(const std::string& s);
+}
+namespace IfcElementAssemblyTypeEnum {
+/// Definition from IAI: An enumeration defining the
+///   basic configuration types for element assemblies.
 /// 
-/// NOTE Corresponding ISO 10303 name: symbol_style_select. Please refer to ISO/IS 10303-46:1994 for the final definition of the formal standard.
+/// HISTORY New enumeration type
+///   in Release IFC2x Edition 2.
 /// 
-/// HISTORY New entity in IFC2x2.
-typedef IfcUtil::IfcSchemaEntity IfcSymbolStyleSelect;
-/// IfcTextFontSelect allows for either a predefined text font, a text font model or an externally defined text font to be used to describe the font of a text literal. The definition of the text font model is based on W3C TR Cascading Style Sheet Version 1, whereas the definition of predefined text font is based on ISO 10303.
+/// Enumeration
 /// 
-/// NOTE  IfcTextFontSelect is an entity that had been adopted from ISO 10303, Industrial automation systems and integration—Product data representation and exchange, Part 46: Integrated generic resources: Visual presentation. Corresponding ISO 10303 name: font_select. Please refer to ISO/IS 10303-46:1994, p. 133 for the final definition of the formal standard.
+/// ACCESSORY_ASSEMBLY: Assembled accessories or components
+///   ARCH: A curved structure
+///   BEAM_GRID: Interconnected beams, located in one (typically horizontal) plane
+///   BRACED_FRAME: A rigid frame with additional bracing members
+///   GIRDER: A beam-like superstructure
+///   REINFORCEMENT_UNIT: Assembled reinforcement elements
+///   RIGID_FRAME: A structure built up of beams, columns, etc. with moment-resisting joints
+///   SLAB_FIELD: Slabs, laid out in one plane
+///   TRUSS: A structure built up of members with (quasi) pinned joints
+///   USERDEFINED: User-defined element assembly
+///   NOTDEFINED: Undefined element assembly
+typedef enum {IfcElementAssemblyType_ACCESSORY_ASSEMBLY, IfcElementAssemblyType_ARCH, IfcElementAssemblyType_BEAM_GRID, IfcElementAssemblyType_BRACED_FRAME, IfcElementAssemblyType_GIRDER, IfcElementAssemblyType_REINFORCEMENT_UNIT, IfcElementAssemblyType_RIGID_FRAME, IfcElementAssemblyType_SLAB_FIELD, IfcElementAssemblyType_TRUSS, IfcElementAssemblyType_USERDEFINED, IfcElementAssemblyType_NOTDEFINED} IfcElementAssemblyTypeEnum;
+const char* ToString(IfcElementAssemblyTypeEnum v);
+IfcElementAssemblyTypeEnum FromString(const std::string& s);
+}
+namespace IfcElementCompositionEnum {
+/// Definition from IAI: Enumeration that provides an
+///   indication, whether the spatial structure element or proxy
+///   represents a:
 /// 
-/// HISTORY  New type in IFC2x2.
+/// COMPLEX - a group or aggregation of similar elements
 /// 
-/// IFC2x3 CHANGE  The select type has been renamed from IfcFontSelect.
-typedef IfcUtil::IfcSchemaEntity IfcTextFontSelect;
-/// The text style select allows for the selection of styles to be assigned to an annotated text. The text style determines the text model that affect the visual presentation of characters, spaces, words, and paragraphs. There are two choices:
+/// ELEMENT - a (undivided) element itself
 /// 
-/// IfcTextStyleWithBoxCharacteristics for definitions from ISO/IS 10303-46:1994 for (old) vector based and monospace text.
-///   IfcTextStyleTextModel for definitions from Cascading
-/// Style Sheets, level 1, W3C Recommendation 17 Dec 1996, revised 11 Jan 1999, CSS1, for all true type text. The use of the CSS1 definitions is the preferred way to represent text styles.
+/// PARTIAL - a subelement or part
 /// 
-/// HISTORY  New type in IFC2x2.
+/// HISTORY New enumeration in
+///   IFC Release 2.x
+typedef enum {IfcElementComposition_COMPLEX, IfcElementComposition_ELEMENT, IfcElementComposition_PARTIAL} IfcElementCompositionEnum;
+const char* ToString(IfcElementCompositionEnum v);
+IfcElementCompositionEnum FromString(const std::string& s);
+}
+namespace IfcEnergySequenceEnum {
+
+typedef enum {IfcEnergySequence_PRIMARY, IfcEnergySequence_SECONDARY, IfcEnergySequence_TERTIARY, IfcEnergySequence_AUXILIARY, IfcEnergySequence_USERDEFINED, IfcEnergySequence_NOTDEFINED} IfcEnergySequenceEnum;
+const char* ToString(IfcEnergySequenceEnum v);
+IfcEnergySequenceEnum FromString(const std::string& s);
+}
+namespace IfcEnvironmentalImpactCategoryEnum {
+
+typedef enum {IfcEnvironmentalImpactCategory_COMBINEDVALUE, IfcEnvironmentalImpactCategory_DISPOSAL, IfcEnvironmentalImpactCategory_EXTRACTION, IfcEnvironmentalImpactCategory_INSTALLATION, IfcEnvironmentalImpactCategory_MANUFACTURE, IfcEnvironmentalImpactCategory_TRANSPORTATION, IfcEnvironmentalImpactCategory_USERDEFINED, IfcEnvironmentalImpactCategory_NOTDEFINED} IfcEnvironmentalImpactCategoryEnum;
+const char* ToString(IfcEnvironmentalImpactCategoryEnum v);
+IfcEnvironmentalImpactCategoryEnum FromString(const std::string& s);
+}
+namespace IfcEvaporativeCoolerTypeEnum {
+/// Enumeration defining the typical types of evaporative coolers. 
+///   The IfcEvaporativeCoolerTypeEnum contains the following:
 /// 
-/// IFC2x3 CHANGE  The items within the IfcTextStyleSelect have changed to IfcTextStyleWithBoxCharacteristics and IfcTextStyleTextModel.
-typedef IfcUtil::IfcSchemaEntity IfcTextStyleSelect;
-/// Definition from ISO/CD 10303-42:1992: This select type identifies the two possible ways of trimming a parametric curve; by a Cartesian point on the curve, or by a REAL number defining a parameter value within the parametric range of the curve. 
+/// DIRECTEVAPORATIVERANDOMMEDIAAIRCOOLER: Direct evaporative random media air cooler: Cools the air stream by evaporating water dircectly into the air stream using coolers with evaporative pads, usually of aspen wood or plastic fiber/foam.
+///   DIRECTEVAPORATIVERIGIDMEDIAAIRCOOLER: Direct evaporative rigid media air cooler: Cools the air stream by evaporating water dircectly into the air stream using coolers with sheets of rigid, corrugated material as the wetted surface.
+///   DIRECTEVAPORATIVESLINGERSPACKAGEDAIRCOOLER: Direct evaporative slingers packaged air cooler: Cools the air stream by evaporating water dircectly into the air stream using coolers with a water slinger in an evaporative cooling section and a fan section.
+///   DIRECTEVAPORATIVEPACKAGEDROTARYAIRCOOLER: Direct evaporative packaged rotary air cooler: Cools the air stream by evaporating water dircectly into the air stream using coolers that wet and wash the evaporative pad by rotating it through a water bath.
+///   DIRECTEVAPORATIVEAIRWASHER: Direct evaporative air washer: Cools the air stream by evaporating water dircectly into the air stream using coolers with spray-type air washer consist of a chamber or casing containing spray nozzles, and tank for collecting spray water, and an eliminator section for removing entrained drops of water from the air.
+///   INDIRECTEVAPORATIVEPACKAGEAIRCOOLER: Indirect evaporative package air cooler: Cools the air stream by evaporating water indirectly and without adding moisture into the air stream. On one side of the heat exchanger, the secondary air stream is cooled by evaporation, while on the other side of heat exchanger, the primary air stream (conditioned air to be supplied to the room) is sensibly cooled by the heat exchanger surfaces.
+///   INDIRECTEVAPORATIVEWETCOIL: Indirect evaporative wet coil: Cools the air stream by evaporating water indirectly and without adding moisture into the air stream. Water is sprayed directly on the tubes of the heat exchanger where latent cooling takes place and the vaporization of the water on the outside of the heat exchanger tubes allows the simultaneous heat and mass transfer which removes heat from the supply air on the tube side.
+///   INDIRECTEVAPORATIVECOOLINGTOWERORCOILCOOLER: Indirect evaporative cooling tower or coil cooler: Cools the air stream by evaporating water indirectly and without adding moisture into the air stream using a combination of a cooling tower or other evaporative water cooler with a water-to-air heat exchanger coil and water circulating pump.
+///   INDIRECTDIRECTCOMBINATION: Indirect/Direct combination: Cools the air stream by evaporating water indirectly and without adding moisture into the air stream using a two-stage cooler with a first-stage indirect evaporative cooler and second-stage direct evaporative cooler.
+///   USERDEFINED:  User-defined evaporative cooler type.
+///   NOTDEFINED:  Undefined evaporative cooler type.
 /// 
-/// NOTE Corresponding ISO 10303 type: trimming_select, please refer to ISO/IS 10303-42:1994, p. 20 for the final definition of the formal standard.
+/// HISTORY: New enumeration in IFC 2x2.
+typedef enum {IfcEvaporativeCoolerType_DIRECTEVAPORATIVERANDOMMEDIAAIRCOOLER, IfcEvaporativeCoolerType_DIRECTEVAPORATIVERIGIDMEDIAAIRCOOLER, IfcEvaporativeCoolerType_DIRECTEVAPORATIVESLINGERSPACKAGEDAIRCOOLER, IfcEvaporativeCoolerType_DIRECTEVAPORATIVEPACKAGEDROTARYAIRCOOLER, IfcEvaporativeCoolerType_DIRECTEVAPORATIVEAIRWASHER, IfcEvaporativeCoolerType_INDIRECTEVAPORATIVEPACKAGEAIRCOOLER, IfcEvaporativeCoolerType_INDIRECTEVAPORATIVEWETCOIL, IfcEvaporativeCoolerType_INDIRECTEVAPORATIVECOOLINGTOWERORCOILCOOLER, IfcEvaporativeCoolerType_INDIRECTDIRECTCOMBINATION, IfcEvaporativeCoolerType_USERDEFINED, IfcEvaporativeCoolerType_NOTDEFINED} IfcEvaporativeCoolerTypeEnum;
+const char* ToString(IfcEvaporativeCoolerTypeEnum v);
+IfcEvaporativeCoolerTypeEnum FromString(const std::string& s);
+}
+namespace IfcEvaporatorTypeEnum {
+/// Enumeration defining the typical types of evaporators. 
+///   The IfcEvaporatorTypeEnum contains the following:
 /// 
-/// HISTORY New Type in IFC Release 1.0
-typedef IfcUtil::IfcSchemaEntity IfcTrimmingSelect;
-/// Definition from ISO/CD 10303-41:1992: A unit is a physical quantity, with a value of one, which is used as a standard in terms of which other quantities are expressed.
+/// DIRECTEXPANSION: Direct-expansion evaporator.
+///   DIRECTEXPANSIONSHELLANDTUBE: Direct-expansion evaporator where a refrigerant evaporates inside a series of baffles that channel the fluid throughout the shell side.
+///   DIRECTEXPANSIONTUBEINTUBE: Direct-expansion evaporator where a refrigerant evaporates inside one or more pairs of coaxial tubes.
+///   DIRECTEXPANSIONBRAZEDPLATE: Direct-expansion evaporator where a refrigerant evaporates inside plates brazed or welded together to make up an assembly of separate channels.
+///   FLOODEDSHELLANDTUBE: Evaporator in which refrigerant evaporates outside tubes.
+///   SHELLANDCOIL: Evaporator in which refrigerant evaporates inside a simple coiled tube immersed in the fluid to be cooled.
+///   USERDEFINED:  User-defined evaporator type.
+///   NOTDEFINED:  Undefined evaporator type.
 /// 
-/// NOTE: Select item IfcMonetaryUnit is an addition to ISO 10303-41.
+/// HISTORY: New enumeration in IFC 2x2.
+typedef enum {IfcEvaporatorType_DIRECTEXPANSIONSHELLANDTUBE, IfcEvaporatorType_DIRECTEXPANSIONTUBEINTUBE, IfcEvaporatorType_DIRECTEXPANSIONBRAZEDPLATE, IfcEvaporatorType_FLOODEDSHELLANDTUBE, IfcEvaporatorType_SHELLANDCOIL, IfcEvaporatorType_USERDEFINED, IfcEvaporatorType_NOTDEFINED} IfcEvaporatorTypeEnum;
+const char* ToString(IfcEvaporatorTypeEnum v);
+IfcEvaporatorTypeEnum FromString(const std::string& s);
+}
+namespace IfcFanTypeEnum {
+/// Enumeration defining the typical types of fans.
+///   The IfcFanTypeEnum contains the following:
 /// 
-/// NOTE: Corresponding ISO 10303 name: unit, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
+/// CENTRIFUGALFORWARDCURVED: Air flows through the impeller radially using blades that are forward curved.
+///   CENTRIFUGALRADIAL: Air flows through the impeller radially using blades that are uncurved or slightl forward curved.
+///   CENTRIFUGALBACKWARDINCLINEDCURVED: Air flows through the impeller radially using blades that are backward curved.
+///   CENTRIFUGALAIRFOIL: Air flows through the impeller radially using blades are airfoil shaped.
+///   TUBEAXIAL: Air flows through the impeller axially with reduced tip clearance and operating at higher tip speeds.
+///   VANEAXIAL: Air flows through the impeller axially with guide vanes and reduced running blade tip clearance.
+///   PROPELLORAXIAL: Air flows through the impeller axially and small hub-to-tip ratio impeller mounted in an orifice plate or inlet ring.
+///   USERDEFINED:	User-defined fan type.
+///   NOTDEFINED: Undefined fan type.
 /// 
-/// SELECT 
+/// HISTORY: New enumeration in IFC 2x2.
+typedef enum {IfcFanType_CENTRIFUGALFORWARDCURVED, IfcFanType_CENTRIFUGALRADIAL, IfcFanType_CENTRIFUGALBACKWARDINCLINEDCURVED, IfcFanType_CENTRIFUGALAIRFOIL, IfcFanType_TUBEAXIAL, IfcFanType_VANEAXIAL, IfcFanType_PROPELLORAXIAL, IfcFanType_USERDEFINED, IfcFanType_NOTDEFINED} IfcFanTypeEnum;
+const char* ToString(IfcFanTypeEnum v);
+IfcFanTypeEnum FromString(const std::string& s);
+}
+namespace IfcFilterTypeEnum {
+/// This enumeration defines the various types of filter typically used
+///   within building services distribution systems:
 /// 
-/// IfcNamedUnit: A unit which is identified by a name.
-/// IfcDerivedUnit: A unit which is derived from an expression of units. 
-/// IfcMonetaryUnit: A unit for defining currencies. 
+/// AIRPARTICLEFILTER: A filter used to remove particulates from air.
+///   COMPRESSEDAIRFILTER: A filter used to remove particulates from compressed air.
+///   ODORFILTER: A filter used to remove odors from air.
+///   OILFILTER: A filter used to remove particulates from oil.
+///   STRAINER: A filter used to remove particulates from a fluid.
+///   WATERFILTER: A filter used to remove particulates from water.
+///   USERDEFINED:	User-defined filter type.
+///   NOTDEFINED:	Undefined filter type.
 /// 
-/// HISTORY: New type in IFC Release 1.5.1.
-typedef IfcUtil::IfcSchemaEntity IfcUnit;
-/// IfcValue is a select type for selecting between more specialised select types IfcSimpleValue,
-/// IfcMeasureValue and IfcDerivedMeasureValue.
+/// HISTORY: New enumeration in IFC R2x.  COMPRESSEDAIRFILTER added in IFC2x4.
+typedef enum {IfcFilterType_AIRPARTICLEFILTER, IfcFilterType_ODORFILTER, IfcFilterType_OILFILTER, IfcFilterType_STRAINER, IfcFilterType_WATERFILTER, IfcFilterType_USERDEFINED, IfcFilterType_NOTDEFINED} IfcFilterTypeEnum;
+const char* ToString(IfcFilterTypeEnum v);
+IfcFilterTypeEnum FromString(const std::string& s);
+}
+namespace IfcFireSuppressionTerminalTypeEnum {
+/// The IfcFireSuppressionTerminalTypeEnum defines the range of different types of fire suppression terminal that can be specified. 
 /// 
-/// SELECT 
+/// HISTORY: New type in IFC 2x2
 /// 
-/// IfcSimpleValue A select type for basic defined types of simple data type. 
-///   IfcMeasureValue A select type for basic measure types of ISO 10303-41. 
-///   IfcDerivedMeasureValue A select type for derived measure types.
+/// Enumeration
 /// 
-/// HISTORY New type in IFC Release 2x.
-typedef IfcUtil::IfcSchemaEntity IfcValue;
-/// Definition from ISO/CD 10303-42:1992: This type is used to
-///   identify the types of entity which can participate in vector computations. 
+/// BREECHINGINLET: Symmetrical pipe fitting that unites two or more inlets into a single pipe (BS6100 330 114 adapted). A breeching inlet may be used on either a wet or dry riser. Used by fire services personnel for fast connection of fire appliance hose reels. May also be used for foam. 
+/// FIREHYDRANT: Device, fitted to a pipe, through which a temporary supply of water may be provided (BS6100 330 6107).  May also be termed a stand pipe. 
+/// HOSEREEL: A supporting framework on which a hose may be wound (BS6100 155 8201). 
+/// SPRINKLER: Device for sprinkling water from a pipe under pressure over an area (BS6100 100 3432). 
+/// SPRINKLERDEFLECTOR: Device attached to a sprinkler to deflect the water flow into a spread pattern to cover the required area. 
+/// USERDEFINED: User-defined type. 
+/// NOTDEFINED: Underined type.
+typedef enum {IfcFireSuppressionTerminalType_BREECHINGINLET, IfcFireSuppressionTerminalType_FIREHYDRANT, IfcFireSuppressionTerminalType_HOSEREEL, IfcFireSuppressionTerminalType_SPRINKLER, IfcFireSuppressionTerminalType_SPRINKLERDEFLECTOR, IfcFireSuppressionTerminalType_USERDEFINED, IfcFireSuppressionTerminalType_NOTDEFINED} IfcFireSuppressionTerminalTypeEnum;
+const char* ToString(IfcFireSuppressionTerminalTypeEnum v);
+IfcFireSuppressionTerminalTypeEnum FromString(const std::string& s);
+}
+namespace IfcFlowDirectionEnum {
+/// This enumeration defines the flow direction at a port as either a SOURCE, SINK, or SOURCEANDSINK.  For solids, liquids, or gas, the direction is the physical flow direction.  For electric power (circuits containing hot, neutral, ground), the direction is from the origination of power (from a distribution board to protective devices to switches to fixtures).  For communication signals, the direction originates from where the signal is shaped, such as a sensor.  For communicaton networks, the direction originates from the up-level network host, such as a router (having SOURCE ports) hosting multiple computers (having SINK ports).
 /// 
-/// NOTE Corresponding STEP type:
-///   vector_or_direction, please refer to ISO/IS 10303-42:1994, p. 20 for the final
-///   definition of the formal standard.  
-///   HISTORY New Type in IFC Release
-///   1.5
-typedef IfcUtil::IfcSchemaEntity IfcVectorOrDirection;
-/// The box alignment specifies the alignment of the text box relative to its position. The following string values shall be used:
+/// SOURCE:        A flow source, where a substance flows out of the connection.
+///   SINK:          A flow sink, where a substance flows into the connection.
+///   SOURCEANDSINK: Both a source and sink, where a substance flows both into and out of the connection simultaneously.
+///   NOTDEFINED:    Undefined flow direction.
 /// 
-/// top-left
-///   top-middle
-///   top-right
-///   middle-left
-///   center
-///   middle-right
-///   bottom-left
-///   bottom-middle
-///   bottom-right
+/// HISTORY: New enumeration in IFC R2.0
+typedef enum {IfcFlowDirection_SOURCE, IfcFlowDirection_SINK, IfcFlowDirection_SOURCEANDSINK, IfcFlowDirection_NOTDEFINED} IfcFlowDirectionEnum;
+const char* ToString(IfcFlowDirectionEnum v);
+IfcFlowDirectionEnum FromString(const std::string& s);
+}
+namespace IfcFlowInstrumentTypeEnum {
+/// The IfcFlowInstrumentTypeEnum defines the range of different types of flow instrument that can be specified. 
 /// 
-/// NOTE  The top-left is the default value.
+/// HISTORY: New type in IFC
+///   2x2  
+///   Enumeration 
 /// 
-/// Figure 298 illustrates alignment values.
+/// PRESSUREGAUGE: A device that reads and displays a pressure value at a point or the pressure difference between two points. 
+/// THERMOMETER: A device that reads and displays a temperature value at a point. 
+/// AMMETER: A device that reads and displays the current flow in a circuit. 
+/// FREQUENCYMETER: A device that reads and displays the electrical frequency of an alternating current circuit. 
+/// PHASEANGLEMETER: A device that reads and displays the phase angle of a phase in a polyphase electrical circuit. 
+/// POWERFACTORMETER: A device that reads and displays the power factor of an electrical circuit. 
+/// VOLTMETER_PEAK: A device that reads and displays the peak voltage in an electrical circuit. 
+/// VOLTMETER_RMS: A device that reads and displays the RMS (mean) voltage in an electrical circuit. 
+/// USERDEFINED: User-defined type. 
+/// NOTDEFINED: Undefined type.
+typedef enum {IfcFlowInstrumentType_PRESSUREGAUGE, IfcFlowInstrumentType_THERMOMETER, IfcFlowInstrumentType_AMMETER, IfcFlowInstrumentType_FREQUENCYMETER, IfcFlowInstrumentType_POWERFACTORMETER, IfcFlowInstrumentType_PHASEANGLEMETER, IfcFlowInstrumentType_VOLTMETER_PEAK, IfcFlowInstrumentType_VOLTMETER_RMS, IfcFlowInstrumentType_USERDEFINED, IfcFlowInstrumentType_NOTDEFINED} IfcFlowInstrumentTypeEnum;
+const char* ToString(IfcFlowInstrumentTypeEnum v);
+IfcFlowInstrumentTypeEnum FromString(const std::string& s);
+}
+namespace IfcFlowMeterTypeEnum {
+/// This enumeration defines various types of flow meter:
 /// 
-/// Figure 298 — Box alignment values
+/// ENERGYMETER:   An electric meter or energy meter is a device that measures the amount of electrical energy supplied to or produced by a residence, business or machine.
 /// 
-/// Figure 299 illustrates use of alignment values together with the placement and planar extent.
+/// GASMETER:   A device that measures the quantity of a gas or fuel.
 /// 
-/// Figure 299 — Box alignment examples
+/// OILMETER:   A device that measures the quantity of oil.
 /// 
-/// HISTORY  New type in IFC2x2 Addendum2.
+/// WATERMETER:   A device that measures the quantity of water.
 /// 
-/// IFC2x3 CHANGE  The IfcBoxAlignment has been added.
-typedef IfcLabel IfcBoxAlignment;
-/// IfcNormalisedRatioMeasure is a dimensionless measure to express ratio values ranging from 0.0 to 1.0.
+/// USERDEFINED:   User-defined meter type
 /// 
-/// Type: REAL
+/// NOTDEFINED:    Undefined meter type
 /// 
-/// HISTORY New type in IFC Release 2x.
-typedef IfcRatioMeasure IfcNormalisedRatioMeasure;
-/// Definition from ISO/CD 10303-41:1992: A positive ratio measure is a ratio measure that is greater than zero.
-/// Type: IfcRatioMeasure
+/// HISTORY: New enumeration in IFC 2x2
+typedef enum {IfcFlowMeterType_ELECTRICMETER, IfcFlowMeterType_ENERGYMETER, IfcFlowMeterType_FLOWMETER, IfcFlowMeterType_GASMETER, IfcFlowMeterType_OILMETER, IfcFlowMeterType_WATERMETER, IfcFlowMeterType_USERDEFINED, IfcFlowMeterType_NOTDEFINED} IfcFlowMeterTypeEnum;
+const char* ToString(IfcFlowMeterTypeEnum v);
+IfcFlowMeterTypeEnum FromString(const std::string& s);
+}
+namespace IfcFootingTypeEnum {
+/// Definition from IAI: Enumeration defining the generic footing type.
 /// 
-/// NOTE Corresponding ISO 10303 name: positive_ratio_measure, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
+/// HISTORY New type in IFC Release 2x2
+/// IFC 2x4 change:  Item CAISSON_FOUNDATION added
 /// 
-/// HISTORY New type in IFC Release 1.5.1.
-typedef IfcRatioMeasure IfcPositiveRatioMeasure;
-namespace IfcActionSourceTypeEnum {
-/// Definition from IAI:This enumeration type contains possible
-///   action sources. 
+/// ENUMERATION 
 /// 
-/// HISTORY: New type in Release IFC2x
-///   Edition 2.
-typedef enum {IfcActionSourceType_DEAD_LOAD_G, IfcActionSourceType_COMPLETION_G1, IfcActionSourceType_LIVE_LOAD_Q, IfcActionSourceType_SNOW_S, IfcActionSourceType_WIND_W, IfcActionSourceType_PRESTRESSING_P, IfcActionSourceType_SETTLEMENT_U, IfcActionSourceType_TEMPERATURE_T, IfcActionSourceType_EARTHQUAKE_E, IfcActionSourceType_FIRE, IfcActionSourceType_IMPULSE, IfcActionSourceType_IMPACT, IfcActionSourceType_TRANSPORT, IfcActionSourceType_ERECTION, IfcActionSourceType_PROPPING, IfcActionSourceType_SYSTEM_IMPERFECTION, IfcActionSourceType_SHRINKAGE, IfcActionSourceType_CREEP, IfcActionSourceType_LACK_OF_FIT, IfcActionSourceType_BUOYANCY, IfcActionSourceType_ICE, IfcActionSourceType_CURRENT, IfcActionSourceType_WAVE, IfcActionSourceType_RAIN, IfcActionSourceType_BRAKES, IfcActionSourceType_USERDEFINED, IfcActionSourceType_NOTDEFINED} IfcActionSourceTypeEnum;
-const char* ToString(IfcActionSourceTypeEnum v);
-IfcActionSourceTypeEnum FromString(const std::string& s);
+/// CAISSON_FOUNDATION A foundation construction type used in underwater construction.
+///   FOOTING_BEAM Footing elements that are in bending and are supported clear of the ground. They will normally span between piers, piles or pile caps. They are distinguished from beams in the building superstructure since they will normally require a lower grade of finish. They are distinguished from STRIP_FOOTING since they are clear of the ground surface and hence require support to the lower face while the concrete is curing.
+///   PAD_FOOTING An element that transfers the load of a single column (possibly two) to the ground.
+///   PILE_CAP An element that transfers the load from a column or group of columns to a pier or pile or group of piers or piles.
+///   STRIP_FOOTING A linear element that transfers loads into the ground from either a continuous element, such as a wall, or from a series of elements, such as columns.
+///   USERDEFINED Special types of footings which meet specific local requirements.
+///   NOTDEFINED The type of footing is not defined.
+typedef enum {IfcFootingType_FOOTING_BEAM, IfcFootingType_PAD_FOOTING, IfcFootingType_PILE_CAP, IfcFootingType_STRIP_FOOTING, IfcFootingType_USERDEFINED, IfcFootingType_NOTDEFINED} IfcFootingTypeEnum;
+const char* ToString(IfcFootingTypeEnum v);
+IfcFootingTypeEnum FromString(const std::string& s);
 }
-namespace IfcActionTypeEnum {
-/// Definition from IAI: This enumeration type is used to distinguish
-///   between possible action types at a high level. It can be used for an automated
-///   definition of load combinations and for dimensioning. The contained items and
-///   their acronyms are adopted from the Eurocode standard. 
-/// 
-/// HISTORY: New type in Release IFC2x
-///   Edition 2.
-typedef enum {IfcActionType_PERMANENT_G, IfcActionType_VARIABLE_Q, IfcActionType_EXTRAORDINARY_A, IfcActionType_USERDEFINED, IfcActionType_NOTDEFINED} IfcActionTypeEnum;
-const char* ToString(IfcActionTypeEnum v);
-IfcActionTypeEnum FromString(const std::string& s);
+namespace IfcGasTerminalTypeEnum {
+
+typedef enum {IfcGasTerminalType_GASAPPLIANCE, IfcGasTerminalType_GASBOOSTER, IfcGasTerminalType_GASBURNER, IfcGasTerminalType_USERDEFINED, IfcGasTerminalType_NOTDEFINED} IfcGasTerminalTypeEnum;
+const char* ToString(IfcGasTerminalTypeEnum v);
+IfcGasTerminalTypeEnum FromString(const std::string& s);
 }
-namespace IfcActuatorTypeEnum {
-/// The IfcActuatorTypeEnum defines the range of different types of actuator that can be specified. 
+namespace IfcGeometricProjectionEnum {
+/// IfcGeometricProjectionEnum defines the various representation types that can be semantically distinguished. Often different levels of detail of the shape representation are controlled by the representation type.
 /// 
-/// HISTORY: New type in IFC
-///   R2.0  
-///   Enumeration 
-/// 
-/// ELECTRICACTUATOR: A device that electrically actuates a control element.  
-/// PNEUMATICACTUATOR<: A device that pneumatically actuates a control element  
-/// HYDRAULICACTUATOR: A device that electrically actuates a control element.  
-/// HANDOPERATEDACTUATOR: A device that manually actuates a control element. 
-/// THERMOSTATICACTUATOR: A device that thermostatically actuates a control element. 
-/// USERDEFINED: User-defined type. 
-/// NOTDEFINED: Undefined type. 
+/// GRAPH_VIEW:
+/// Geometric display representation that shows an abstract, often 1D
+/// element representation, e.g. representing a wall by its axis line.
+///   SKETCH_VIEW:
+/// Geometric display representation that shows an abstract, often 2D
+/// element representation, e.g. representing a wall by its two foot print
+/// edges, surpressing any inner layer representation.
+///   MODEL_VIEW:
+/// Geometric display representation that shows a full 3D element
+/// representation, e.g. representing a wall by its volumetric body.
+///   PLAN_VIEW:
+/// Geometric display representation that shows a full 2D element
+/// representation, the level of detail often depends on the target scale,
+/// e.g. representing a wall by its two foot print edges and the edges of
+/// all inner layers. The projection is shown in ground view as seen from
+/// above.
+///   REFLECTED_PLAN_VIEW:
+/// Geometric display representation that shows a full 2D element
+/// representation, the level of detail often depends on the target scale,
+/// e.g. representing a wall by its two foot print edges and the edges of
+/// all inner layers. The projection is shown in ground view as seen from
+/// below.
+///   SECTION_VIEW:
+/// Geometric display representation that shows a full 2D element
+/// representation, the level of detail often depends on the target scale,
+/// e.g. representing a wall by its two inner/outer edges and the edges of
+/// all inner layers, if the element is cut by the section line.
+///   ELEVATION_VIEW:
+/// Geometric display representation that shows a full 2D element
+/// representation, the level of detail often depends on the target scale,
+/// e.g. representing a wall by its bounding edges if the element is within
+/// an elevation view.
+///   USERDEFINED:
+/// A user defined specification is given by the value of the UserDefinedTargetView
+/// attribute.
+///   NOTDEFINED:
+/// No specification given.
 /// 
-/// See property set of actuator common attributes for specification of
-///   properties for hand operated actuators.
-typedef enum {IfcActuatorType_ELECTRICACTUATOR, IfcActuatorType_HANDOPERATEDACTUATOR, IfcActuatorType_HYDRAULICACTUATOR, IfcActuatorType_PNEUMATICACTUATOR, IfcActuatorType_THERMOSTATICACTUATOR, IfcActuatorType_USERDEFINED, IfcActuatorType_NOTDEFINED} IfcActuatorTypeEnum;
-const char* ToString(IfcActuatorTypeEnum v);
-IfcActuatorTypeEnum FromString(const std::string& s);
+/// HISTORY: New Type in Release IFC2x2.
+typedef enum {IfcGeometricProjection_GRAPH_VIEW, IfcGeometricProjection_SKETCH_VIEW, IfcGeometricProjection_MODEL_VIEW, IfcGeometricProjection_PLAN_VIEW, IfcGeometricProjection_REFLECTED_PLAN_VIEW, IfcGeometricProjection_SECTION_VIEW, IfcGeometricProjection_ELEVATION_VIEW, IfcGeometricProjection_USERDEFINED, IfcGeometricProjection_NOTDEFINED} IfcGeometricProjectionEnum;
+const char* ToString(IfcGeometricProjectionEnum v);
+IfcGeometricProjectionEnum FromString(const std::string& s);
 }
-namespace IfcAddressTypeEnum {
-/// Definition from IAI: Identifies the logical location of the address.
+namespace IfcGlobalOrLocalEnum {
+/// This enumeration type defines if the local object coordinate system or the global world coordinate system for the project is used to describe the measure values of entities which have a reference to this type.
 /// 
-/// HISTORY New type in IFC Release 2x.
+/// NOTE  The world coordinate system is given by the IfcGeometricRepresentationContext.WorldCoordinateSystem
+/// and is unique within the project. The local (or object) coordinate system is given by IfcProduct.ObjectPlacement and is used by all IfcRepresentation's within the IfcProduct.Representation.
 /// 
-/// ENUMERATION 
+/// HISTORY: New type in IFC2x2.
+typedef enum {IfcGlobalOrLocal_GLOBAL_COORDS, IfcGlobalOrLocal_LOCAL_COORDS} IfcGlobalOrLocalEnum;
+const char* ToString(IfcGlobalOrLocalEnum v);
+IfcGlobalOrLocalEnum FromString(const std::string& s);
+}
+namespace IfcHeatExchangerTypeEnum {
+/// Enumeration defining the typical types of heat exchangers. 
+///   The IfcHeatExchangerTypeEnum contains the following:
 /// 
-/// OFFICE An office address. 
-///   SITE A site address.
-///   HOME A home address.
-///   DISTRIBUTIONPOINT A postal distribution point address.
-///   USERDEFINED A user defined address type to be provided.
-typedef enum {IfcAddressType_OFFICE, IfcAddressType_SITE, IfcAddressType_HOME, IfcAddressType_DISTRIBUTIONPOINT, IfcAddressType_USERDEFINED} IfcAddressTypeEnum;
-const char* ToString(IfcAddressTypeEnum v);
-IfcAddressTypeEnum FromString(const std::string& s);
+/// PLATE: Plate heat exchanger.
+///   SHELLANDTUBE: Shell and Tube heat exchanger.
+///   USERDEFINED:  User-defined heat exchanger type.
+///   NOTDEFINED:  Undefined heat exchanger type.
+/// 
+/// HISTORY: New enumeration in IFC R2x.
+typedef enum {IfcHeatExchangerType_PLATE, IfcHeatExchangerType_SHELLANDTUBE, IfcHeatExchangerType_USERDEFINED, IfcHeatExchangerType_NOTDEFINED} IfcHeatExchangerTypeEnum;
+const char* ToString(IfcHeatExchangerTypeEnum v);
+IfcHeatExchangerTypeEnum FromString(const std::string& s);
 }
-namespace IfcAheadOrBehind {
-
-typedef enum {IfcAheadOrBehind_AHEAD, IfcAheadOrBehind_BEHIND} IfcAheadOrBehind;
-const char* ToString(IfcAheadOrBehind v);
-IfcAheadOrBehind FromString(const std::string& s);
+namespace IfcHumidifierTypeEnum {
+/// Enumeration defining the typical types of humidifiers. 
+///   The IfcHumidifierTypeEnum contains the following:
+/// 
+/// STEAMINJECTION: Water vapor is added into the airstream through direction steam injection.
+///   ADIABATICAIRWASHER: Water vapor is added into the airstream through adiabatic evaporation using an air washing element.
+///   ADIABATICPAN:  Water vapor is added into the airstream through adiabatic evaporation using a pan.
+///   ADIABATICWETTEDELEMENT: Water vapor is added into the airstream through adiabatic evaporation using a wetted element.
+///   ADIABATICATOMIZING: Water vapor is added into the airstream through adiabatic evaporation using an atomizing element.
+///   ADIABATICULTRASONIC: Water vapor is added into the airstream through adiabatic evaporation using an ultrasonic element.
+///   ADIABATICRIGIDMEDIA: Water vapor is added into the airstream through adiabatic evaporation using a rigid media.
+///   ADIABATICCOMPRESSEDAIRNOZZLE: Water vapor is added into the airstream through adiabatic evaporation using a compressed air nozzle.
+///   ASSISTEDELECTRIC: Water vapor is added into the airstream through water heated evaporation using an electric heater.
+///   ASSISTEDNATURALGAS: Water vapor is added into the airstream through water heated evaporation using a natural gas heater.
+///   ASSISTEDPROPANE: Water vapor is added into the airstream through water heated evaporation using a propane heater.
+///   ASSISTEDBUTANE: Water vapor is added into the airstream through water heated evaporation using a butane heater.
+///   ASSISTEDSTEAM: Water vapor is added into the airstream through water heated evaporation using a steam heater.
+///   USERDEFINED:  User-defined humidifier type.
+///   NOTDEFINED:  Undefined humidifier type.
+/// 
+/// HISTORY: New enumeration in IFC 2x2.
+typedef enum {IfcHumidifierType_STEAMINJECTION, IfcHumidifierType_ADIABATICAIRWASHER, IfcHumidifierType_ADIABATICPAN, IfcHumidifierType_ADIABATICWETTEDELEMENT, IfcHumidifierType_ADIABATICATOMIZING, IfcHumidifierType_ADIABATICULTRASONIC, IfcHumidifierType_ADIABATICRIGIDMEDIA, IfcHumidifierType_ADIABATICCOMPRESSEDAIRNOZZLE, IfcHumidifierType_ASSISTEDELECTRIC, IfcHumidifierType_ASSISTEDNATURALGAS, IfcHumidifierType_ASSISTEDPROPANE, IfcHumidifierType_ASSISTEDBUTANE, IfcHumidifierType_ASSISTEDSTEAM, IfcHumidifierType_USERDEFINED, IfcHumidifierType_NOTDEFINED} IfcHumidifierTypeEnum;
+const char* ToString(IfcHumidifierTypeEnum v);
+IfcHumidifierTypeEnum FromString(const std::string& s);
 }
-namespace IfcAirTerminalBoxTypeEnum {
-/// This enumeration identifies different types of air terminal boxes.   
+namespace IfcInternalOrExternalEnum {
+/// Definition from IAI: This enumeration defines the
+/// different types of space boundaries in terms of either being
+/// inside the building or outside the building.
+/// Enumeration:
 /// 
-/// Valid enumerations are:
+/// INTERNAL
 /// 
-/// CONSTANTFLOW:  Terminal box does not include a means to reset the volume automatically to an outside signal such as thermostat.
-///   VARIABLEFLOWPRESSUREDEPENDANT:  terminal box includes a means to reset the volume automatically to a different control point in response to an outside signal such as thermostat: air-flow rate depends on supply pressure.
-///   VARIABLEFLOWPRESSUREINDEPENDANT:  terminal box includes a means to reset the volume automatically to a different control point in response to an outside signal such as thermostat: air-flow rate is independant of supply pressure.
-///   USERDEFINED:				  User-defined terminal box.
-///   NOTDEFINED:					  Undefined terminal box.
+/// IfcSpaceBoundary
+/// The space boundary faces a physical
+/// or virtual element where there is an internal space on the other
+/// side.
 /// 
-/// HISTORY: New enumeration in IFC R2.0
-typedef enum {IfcAirTerminalBoxType_CONSTANTFLOW, IfcAirTerminalBoxType_VARIABLEFLOWPRESSUREDEPENDANT, IfcAirTerminalBoxType_VARIABLEFLOWPRESSUREINDEPENDANT, IfcAirTerminalBoxType_USERDEFINED, IfcAirTerminalBoxType_NOTDEFINED} IfcAirTerminalBoxTypeEnum;
-const char* ToString(IfcAirTerminalBoxTypeEnum v);
-IfcAirTerminalBoxTypeEnum FromString(const std::string& s);
-}
-namespace IfcAirTerminalTypeEnum {
-/// Enumeration defining the functional types of air terminals. 
-///   The IfcAirTerminalTypeEnum contains the following:
+/// EXTERNAL
 /// 
-/// GRILLE: A covering for any area through which air passes.
-///   REGISTER: A grille typically equipped with a damper or control valve.
-///   DIFFUSER: An outlet discharging supply air in various directions and planes.
-///   LOUVRE: A rectilinear louvre.
-///   USERDEFINED: User-defined air terminal type.
-///   NOTDEFINED:  Undefined air terminal type.
+/// IfcSpaceBoundary
+/// The space boundary faces a physical
+/// or virtual element where there is an external space on the other
+/// side (i.e. air). Or it is the space boundary of that external
+/// space against the building.
 /// 
-/// NOTE: Architectural louvres within doors or windows are defined by IfcPermeableCoveringProperties.
+/// EXTERNAL_EARTH
 /// 
-/// HISTORY: New enumeration in IFC R2x2.  Modified in IFC R2x4 to add LOUVRE and remove EYEBALL, IRIS, LINEARGRILLE, LINEARDIFFUSER
-typedef enum {IfcAirTerminalType_GRILLE, IfcAirTerminalType_REGISTER, IfcAirTerminalType_DIFFUSER, IfcAirTerminalType_EYEBALL, IfcAirTerminalType_IRIS, IfcAirTerminalType_LINEARGRILLE, IfcAirTerminalType_LINEARDIFFUSER, IfcAirTerminalType_USERDEFINED, IfcAirTerminalType_NOTDEFINED} IfcAirTerminalTypeEnum;
-const char* ToString(IfcAirTerminalTypeEnum v);
-IfcAirTerminalTypeEnum FromString(const std::string& s);
-}
-namespace IfcAirToAirHeatRecoveryTypeEnum {
-/// Defines general types of pumps.
-///   The IfcPumpTypeEnum contains the following:
+/// IfcSpaceBoundary
+/// The space boundary faces a physical
+/// or virtual element where there is earth (or terrain) on the other
+/// side. Or it is the space boundary of that earth (or terrain
+/// object) external space against the building.
 /// 
-/// FIXEDPLATECOUNTERFLOWEXCHANGER: Heat exchanger with moving parts and alternate layers of plates, separated and sealed from the exhaust and supply air stream passages with primary air enters at secondary air outlet location and exits at secondary air inlet location.
-///   FIXEDPLATECROSSFLOWEXCHANGER: Heat exchanger with moving parts and alternate layers of plates, separated and sealed from the exhaust and supply air stream passages with secondary air flow in the direction perpendicular to primary air flow.
-///   FIXEDPLATEPARALLELFLOWEXCHANGER: Heat exchanger with moving parts and alternate layers of plates, separated and sealed from the exhaust and supply air stream passages with primary air enters at secondary air inlet location and exits at secondary air outlet location.
-///   ROTARYWHEEL: A heat wheel with a revolving cylinder filled with an air-permeable medium having a large internal surface area.
-///   RUNAROUNDCOILLOOP: A typical coil energy recovery loop places extended surface, finned tube water coils in the supply and exhaust airstreams of a building.
-///   HEATPIPE: A passive energy recovery device with a heat pipe divided into evaporator and condenser sections.
-///   TWINTOWERENTHALPYRECOVERYLOOPS: An air-to-liquid, liquid-to-air enthalpy recovery system with a sorbent liquid circulates continuously between supply and exhaust airstreams, alternately contacting both airstreams directly in contactor towers.
-///   THERMOSIPHONSEALEDTUBEHEATEXCHANGERS: Sealed systems that consist of an evaporator, a condenser, interconnecting piping, and an intermediate working fluid that is present in both liquid and vapor phases where the evaporator and the condenser are usually at opposite ends of a bundle of straight, individual thermosiphon tubes and the exhaust and supply ducts are adjacent to each other.
-///   THERMOSIPHONCOILTYPEHEATEXCHANGERS: Sealed systems that consist of an evaporator, a condenser, interconnecting piping, and an intermediate working fluid that is present in both liquid and vapor phases where the evaporator and condensor coils are installed independently in the ducts and are interconnected by the working fluid piping.
-///   USERDEFINED: User-defined air to air heat recovery type.
-///   NOTDEFINED:  Undefined air to air heat recovery type.
+/// EXTERNAL_WATER
 /// 
-/// HISTORY: New enumeration in IFC R2x.
-typedef enum {IfcAirToAirHeatRecoveryType_FIXEDPLATECOUNTERFLOWEXCHANGER, IfcAirToAirHeatRecoveryType_FIXEDPLATECROSSFLOWEXCHANGER, IfcAirToAirHeatRecoveryType_FIXEDPLATEPARALLELFLOWEXCHANGER, IfcAirToAirHeatRecoveryType_ROTARYWHEEL, IfcAirToAirHeatRecoveryType_RUNAROUNDCOILLOOP, IfcAirToAirHeatRecoveryType_HEATPIPE, IfcAirToAirHeatRecoveryType_TWINTOWERENTHALPYRECOVERYLOOPS, IfcAirToAirHeatRecoveryType_THERMOSIPHONSEALEDTUBEHEATEXCHANGERS, IfcAirToAirHeatRecoveryType_THERMOSIPHONCOILTYPEHEATEXCHANGERS, IfcAirToAirHeatRecoveryType_USERDEFINED, IfcAirToAirHeatRecoveryType_NOTDEFINED} IfcAirToAirHeatRecoveryTypeEnum;
-const char* ToString(IfcAirToAirHeatRecoveryTypeEnum v);
-IfcAirToAirHeatRecoveryTypeEnum FromString(const std::string& s);
-}
-namespace IfcAlarmTypeEnum {
-/// The IfcAlarmTypeEnum defines the range of different types of alarm that can be specified. 
+/// IfcSpaceBoundary
+/// The space boundary faces a physical
+/// or virtual element where there is water (water component of
+/// terrain) on the other side. Or it is the space boundary of that
+/// object representing water external space against the
+/// building.
 /// 
-/// HISTORY: New type in IFC 2x2
+/// EXTERNAL_FIRE
 /// 
-/// Enumeration 
+/// IfcSpaceBoundary
+/// The space boundary faces a physical
+/// or virtual element where there is another building on the other
+/// side. Or it is the space boundary of that other neighbor building
+/// against the building in question.
 /// 
-/// BELL: An audible alarm. 
-/// BREAKGLASSBUTTON: An alarm activation mechanism in which a protective glass has to be broken to enable a button to be pressed. 
-/// LIGHT: A visual alarm. 
-/// MANUALPULLBOX: An alarm activation mechanism in which activation is achieved by a pulling action. 
-/// SIREN: An audible alarm. 
-/// WHISTLE: An audible alarm.  
+/// NOTDEFINED
+/// 
+/// No information available.
+/// 
+/// HISTORY: New enumeration
+/// in IFC Release 2.0
+/// IFC2x4 CHANGE: Enumeration no longer
+/// applicable to IfcSpace. The following enumerators are
+/// added: EXTERNAL_EARTH, EXTERNAL_WATER,
+/// EXTERNAL_FIRE.
+typedef enum {IfcInternalOrExternal_INTERNAL, IfcInternalOrExternal_EXTERNAL, IfcInternalOrExternal_NOTDEFINED} IfcInternalOrExternalEnum;
+const char* ToString(IfcInternalOrExternalEnum v);
+IfcInternalOrExternalEnum FromString(const std::string& s);
+}
+namespace IfcInventoryTypeEnum {
+/// IfcInventoryTypeEnum defines the types of inventory that can be defined. 
+///   HISTORY: New Enumeration in IFC Release 2.0  
+///   Enumeration: 
+/// 
+/// ASSETINVENTORY: A collection of asset instances of type IfcAsset 
+/// SPACEINVENTORY: A collection of space instances of type IfcSpace 
+/// FURNITUREINVENTORY: A collection of furniture instances of type IfcFurnishingElement 
 /// USERDEFINED: User-defined type. 
 /// NOTDEFINED: Undefined type.
-typedef enum {IfcAlarmType_BELL, IfcAlarmType_BREAKGLASSBUTTON, IfcAlarmType_LIGHT, IfcAlarmType_MANUALPULLBOX, IfcAlarmType_SIREN, IfcAlarmType_WHISTLE, IfcAlarmType_USERDEFINED, IfcAlarmType_NOTDEFINED} IfcAlarmTypeEnum;
-const char* ToString(IfcAlarmTypeEnum v);
-IfcAlarmTypeEnum FromString(const std::string& s);
+typedef enum {IfcInventoryType_ASSETINVENTORY, IfcInventoryType_SPACEINVENTORY, IfcInventoryType_FURNITUREINVENTORY, IfcInventoryType_USERDEFINED, IfcInventoryType_NOTDEFINED} IfcInventoryTypeEnum;
+const char* ToString(IfcInventoryTypeEnum v);
+IfcInventoryTypeEnum FromString(const std::string& s);
 }
-namespace IfcAnalysisModelTypeEnum {
-/// Definition from IAI: This type definition is used to distinguish
-///   between different types of structural analysis models. The analysis models are
-///   differentiated by their dimensionality. 
+namespace IfcJunctionBoxTypeEnum {
+/// The IfcJunctionBoxTypeEnum defines the range of types of junction boxes available.
+///   HISTORY: New type in IFC 2x2.  Values added in IFC 2x4. 
 /// 
-/// HISTORY: New type in Release IFC2x
-///   Edition 2.
-typedef enum {IfcAnalysisModelType_IN_PLANE_LOADING_2D, IfcAnalysisModelType_OUT_PLANE_LOADING_2D, IfcAnalysisModelType_LOADING_3D, IfcAnalysisModelType_USERDEFINED, IfcAnalysisModelType_NOTDEFINED} IfcAnalysisModelTypeEnum;
-const char* ToString(IfcAnalysisModelTypeEnum v);
-IfcAnalysisModelTypeEnum FromString(const std::string& s);
+/// POWER: Contains cables, outlets, and/or switches for electrical power.
+/// DATA: Contains cables, outlets, and/or switches for communications use.
+/// USERDEFINED: User-defined type.
+/// NOTDEFINED: Undefined type.
+typedef enum {IfcJunctionBoxType_USERDEFINED, IfcJunctionBoxType_NOTDEFINED} IfcJunctionBoxTypeEnum;
+const char* ToString(IfcJunctionBoxTypeEnum v);
+IfcJunctionBoxTypeEnum FromString(const std::string& s);
 }
-namespace IfcAnalysisTheoryTypeEnum {
-/// Definition from IAI: This type definition is used to distinguish
-///   between different types of structural analysis methods, i.e. first order
-///   theory, second order theory (small deformations), third order theory (large
-///   deformations) and the full nonlinear theory (geometric nonlinearity together with other nonlinearities, e.g. plasticity). 
+namespace IfcLampTypeEnum {
+/// The IfcLampTypeEnum defines the range of different types of lamp available. 
 /// 
-/// HISTORY: New type in Release IFC2x
-///   Edition 2.
-typedef enum {IfcAnalysisTheoryType_FIRST_ORDER_THEORY, IfcAnalysisTheoryType_SECOND_ORDER_THEORY, IfcAnalysisTheoryType_THIRD_ORDER_THEORY, IfcAnalysisTheoryType_FULL_NONLINEAR_THEORY, IfcAnalysisTheoryType_USERDEFINED, IfcAnalysisTheoryType_NOTDEFINED} IfcAnalysisTheoryTypeEnum;
-const char* ToString(IfcAnalysisTheoryTypeEnum v);
-IfcAnalysisTheoryTypeEnum FromString(const std::string& s);
+/// HISTORY: New type in IFC 2x2 Addendum
+///   1  
+///   Enumeration 
+/// 
+/// COMPACTFLUORESCENT: A fluorescent lamp having a compact form factor produced by shaping the tube. 
+/// FLUORESCENT: A typically tubular discharge lamp in which most of the light is emitted by one or several layers of phosphors excited by ultraviolet radiation from the discharge.
+/// HALOGEN: an incandescent lamp in which a tungsten filament is sealed into a compact transport envelope filled with an inert gas and a small amount of halogen such as iodine or bromine.
+/// HIGHPRESSUREMERCURY: A discharge lamp in which most of the light is emitted by exciting mercury at high pressure.
+/// HIGHPRESSURESODIUM: A discharge lamp in which most of the light is emitted by exciting sodium at high pressure.
+/// LED: a solid state lamp that uses light-emitting diodes as the source of light.
+/// METALHALIDE: A discharge lamp in which most of the light is emitted by exciting a metal halide.
+/// OLED: a solid state lamp that uses light-emitting diodes as the source of light whose emissive electroluminescent layer is composed of a film of organic compounds.
+/// TUNGSTENFILAMENT: A lamp that emits light by passing an electrical current through a tungsten wire filament in a near vacuum.
+/// USERDEFINED: User-defined type.
+/// NOTDEFINED: Undefined type.
+typedef enum {IfcLampType_COMPACTFLUORESCENT, IfcLampType_FLUORESCENT, IfcLampType_HIGHPRESSUREMERCURY, IfcLampType_HIGHPRESSURESODIUM, IfcLampType_METALHALIDE, IfcLampType_TUNGSTENFILAMENT, IfcLampType_USERDEFINED, IfcLampType_NOTDEFINED} IfcLampTypeEnum;
+const char* ToString(IfcLampTypeEnum v);
+IfcLampTypeEnum FromString(const std::string& s);
 }
-namespace IfcArithmeticOperatorEnum {
-/// IfcArithmeticOperatorEnum specifies the form of arithmetical operation implied by the relationship. 
-/// Enumeration 
+namespace IfcLayerSetDirectionEnum {
+/// IfcLayerSetDirectionEnum provides identification of the axis of element geometry, denoting the layer set thickness direction, or direction of layer offsets.
 /// 
-/// ADD 
-///   DIVIDE 
-///   MULTIPLY 
-///   SUBTRACT 
+/// ENUMERATION
 /// 
-/// HISTORY: New enumeration in IFC2x2.
+/// AXIS1: Usually x-axis.
+/// AXIS2: Usually y-axis.
+/// AXIS3: Usually z-axis.
 /// 
-/// Use definitions 
-/// There can be only one arithmetic operator for each applied value relationship. This is to enforce arithmetic consistency. Given this consistency, the cardinality of the IfcAppliedValueRelationship.Components attribute is a set of one to many applied values that are components of an applied value.
-typedef enum {IfcArithmeticOperator_ADD, IfcArithmeticOperator_DIVIDE, IfcArithmeticOperator_MULTIPLY, IfcArithmeticOperator_SUBTRACT} IfcArithmeticOperatorEnum;
-const char* ToString(IfcArithmeticOperatorEnum v);
-IfcArithmeticOperatorEnum FromString(const std::string& s);
+/// HISTORY: New Type in IFC2x.
+typedef enum {IfcLayerSetDirection_AXIS1, IfcLayerSetDirection_AXIS2, IfcLayerSetDirection_AXIS3} IfcLayerSetDirectionEnum;
+const char* ToString(IfcLayerSetDirectionEnum v);
+IfcLayerSetDirectionEnum FromString(const std::string& s);
 }
-namespace IfcAssemblyPlaceEnum {
-/// Definition from IAI: Enumeration defining where the
-///   assembly is intended to take place, either in a factory or
-///   on the building site.
+namespace IfcLightDistributionCurveEnum {
+/// There are three kinds of light distribution curves, according to Standard CEN TC 169, prEN 13032-1, CIE 121: 
 /// 
-/// HISTORY New enumeration in
-///   Release IFC2x Edition 2.
+/// TYPE_A: Type A is basically not used. For completeness the Type A Photometry equals the Type B rotated 90° around the Z-Axis counter clockwise. 
+/// TYPE_B: Type B is sometimes used for floodlights. The B-Plane System has a horizontal axis. B-Angles are valid from -180° to +180° with B 0° at the bottom and B180°/B-180° at the top, &#946;-Angles are valid from -90° to +90°. (See Figure 302.)
+/// TYPE_C: Type C is the recommended standard system. The C-Plane system equals a globe with a vertical axis. C-Angles are valid from 0° to 360°, &#947;-Angles are valid from 0° (south pole) to 180° (north pole). (See Figure 302.) 
 /// 
-/// Enumeration
+/// <table
 /// 
-/// SITE - this assembly is assembled at site
+/// B-Type System 
+///   C-Type System 
 /// 
-/// FACTORY - this assembly is assembled in a factory
-typedef enum {IfcAssemblyPlace_SITE, IfcAssemblyPlace_FACTORY, IfcAssemblyPlace_NOTDEFINED} IfcAssemblyPlaceEnum;
-const char* ToString(IfcAssemblyPlaceEnum v);
-IfcAssemblyPlaceEnum FromString(const std::string& s);
-}
-namespace IfcBSplineCurveForm {
-/// Definition from ISO/CD 10303-42:1992: This type is used to indicate that the B-spline curve represents a part of a curve of some specific form.
+/// Figure 302 — Light distribution curves
 /// 
-/// Enumeration
+/// HISTORY  This is a new enumeration in IFC2x2.
+typedef enum {IfcLightDistributionCurve_TYPE_A, IfcLightDistributionCurve_TYPE_B, IfcLightDistributionCurve_TYPE_C, IfcLightDistributionCurve_NOTDEFINED} IfcLightDistributionCurveEnum;
+const char* ToString(IfcLightDistributionCurveEnum v);
+IfcLightDistributionCurveEnum FromString(const std::string& s);
+}
+namespace IfcLightEmissionSourceEnum {
+/// IfcLightEmissionSourceEnum defines the range of different types of light emitter available. 
 /// 
-/// polyline form: A connected sequence of line segments represented by degree 1 B-spline basis functions.
-/// circular arc: An arc of a circle, or a complete circle represented by a B-spline curve.
-/// elliptic arc: An arc of an ellipse, or a complete ellipse, represented by a B-spline curve.
-/// parabolic arc: An arc of finite length of a parabola represented by a B-spline curve.
-/// hyperbolic arc: An arc of finite length of one branch of a hyperbola represented by a B-spline curve.
-/// unspecified: A B-spline curve for which no particular form is specified.
+/// HISTORY: New type in IFC2x2.
 /// 
-/// NOTE  Corresponding ISO 10303 type: b_spline_curve_form. Please refer to ISO/IS 10303-42:1994, p. 15 for the final definition of the formal standard.
+/// Enumeration 
 /// 
-/// HISTORY  New type in Release IFC2x2.
-typedef enum {IfcBSplineCurveForm_POLYLINE_FORM, IfcBSplineCurveForm_CIRCULAR_ARC, IfcBSplineCurveForm_ELLIPTIC_ARC, IfcBSplineCurveForm_PARABOLIC_ARC, IfcBSplineCurveForm_HYPERBOLIC_ARC, IfcBSplineCurveForm_UNSPECIFIED} IfcBSplineCurveForm;
-const char* ToString(IfcBSplineCurveForm v);
-IfcBSplineCurveForm FromString(const std::string& s);
+/// COMPACTFLUORESCENT
+/// FLUORESCENT
+/// HIGHPRESSUREMERCURY
+/// HIGHPRESSURESODIUM
+/// LIGHTEMITTINGDIODE
+/// LOWPRESSURESODIUM
+/// LOWVOLTAGEHALOGEN
+/// MAINVOLTAGEHALOGEN
+/// METALHALIDE 
+/// TUNGSTENFILAMENT 
+/// NOTDEFINED
+typedef enum {IfcLightEmissionSource_COMPACTFLUORESCENT, IfcLightEmissionSource_FLUORESCENT, IfcLightEmissionSource_HIGHPRESSUREMERCURY, IfcLightEmissionSource_HIGHPRESSURESODIUM, IfcLightEmissionSource_LIGHTEMITTINGDIODE, IfcLightEmissionSource_LOWPRESSURESODIUM, IfcLightEmissionSource_LOWVOLTAGEHALOGEN, IfcLightEmissionSource_MAINVOLTAGEHALOGEN, IfcLightEmissionSource_METALHALIDE, IfcLightEmissionSource_TUNGSTENFILAMENT, IfcLightEmissionSource_NOTDEFINED} IfcLightEmissionSourceEnum;
+const char* ToString(IfcLightEmissionSourceEnum v);
+IfcLightEmissionSourceEnum FromString(const std::string& s);
 }
-namespace IfcBeamTypeEnum {
-/// Definition from IAI: This enumeration defines the
-/// different types of linear elements an IfcBeamType object
-/// can fulfill:
+namespace IfcLightFixtureTypeEnum {
+/// The IfcLightFixtureTypeEnum defines the range of different types of light fixture available.
 /// 
-/// BEAM: A standard beam usually used horizontally.
-/// JOIST: A beam used to support a floor or ceiling.
-/// HOLLOWCORE: A wide often prestressed beam with a
-/// hollow-core profile that usually serves as a slab component.
-/// LINTEL: A beam or horizontal piece of material over an
-/// opening (e.g. door, window).
-/// SPANDREL: A tall beam placed on the facade of a
-/// building. One tall side is usually finished to provide the
-/// exterior of the building. Can be used to support joists or slab
-/// elements on its interior side.
+/// HISTORY: New type in IFC 2x Edition 2IFC 2x4: SECURITYLIGHTING added
 /// 
-/// NOTE  They are also referred to as "spandrel
-/// panels", which are parts of a facade and sometimes have
-/// supporting consoles for floor slabs
-/// integrated.
+/// Enumeration
 /// 
-/// T_BEAM: A beam that forms part of a slab construction
-/// and acts together with the slab which its carries. Such beams are
-/// often of T-shape (therefore the English name), but may have other
-/// shapes as well, e.g. an L-Shape or an Inverted-T-Shape.
+/// POINTSOURCE: A light fixture that is considered to have negligible area and that emit light with approximately equal intensity in all directions.  A light fixture containing a tungsten, halogen or similar bulb is an example of a point source.
+/// DIRECTIONSOURCE: A light fixture that is considered to have a length or surface area from which it emits light in a direction. A light fixture containing one or more fluorescent lamps is an example of a direction source. 
+/// SECURITYLIGHTING: A light fixture having specific purpose of directing occupants in an emergency, such as an illuminated exit sign or emergency flood light. 
+/// USERDEFINED: User-defined type.
+/// NOTDEFINED: Undefined type.
+typedef enum {IfcLightFixtureType_POINTSOURCE, IfcLightFixtureType_DIRECTIONSOURCE, IfcLightFixtureType_USERDEFINED, IfcLightFixtureType_NOTDEFINED} IfcLightFixtureTypeEnum;
+const char* ToString(IfcLightFixtureTypeEnum v);
+IfcLightFixtureTypeEnum FromString(const std::string& s);
+}
+namespace IfcLoadGroupTypeEnum {
+/// Definition from IAI: This type definition is used to distinguish between different levels
+/// of load grouping.  It allows to differentiate between load groups, load cases, and load combinations.
+/// Normally, these enumeration types shall be used in the following context:
 /// 
-/// NOTE  In order to distinguish beams by shape,
-/// the assigned IfcProfileDef subtypes provide the shape type
-/// and, if using a subtype of
-/// IfcParameterizedProfileDef, also the shape
-/// parameterization.
+/// LOAD_GROUP groups instances of subtypes of IfcStructuralAction.  It shall be used as a
+///   container for loads grouped together for specific purposes, e.g. loads which are part of a
+///   special load pattern.
+///   LOAD_CASE groups LOAD_GROUPs and instances of subtypes of IfcStructuralAction.
+///   It should be used as a container for loads with the same origin.
+///   LOAD_COMBINATION_GROUP is an intermediate level between LOAD_CASE and LOAD_COMBINATION.
+///   The purpose of this level is to provide a factor with which one or more LOAD_CASEs occur in a
+///   LOAD_COMBINATION.  This factor cannot be specified directly at the load case if the load case
+///   is meant to occur in more than one combination with different factors.
+///   This intermediate level is obsolete.  Instead, 
+///   LOAD_COMBINATION is used to group load cases which act together into a load combination.
+///   USERDEFINED:  A grouping level which does not follow the standard hierarchy of load group types.
+///   NOTDEFINED:  The grouping level is not yet known.
 /// 
-/// USERDEFINED: User-defined linear beam element.
-/// NOTDEFINED: Undefined linear beam element
+/// HISTORY: New type in IFC 2x2.
 /// 
-/// HISTORY  New Enumeration
-/// in Release IFC2x Edition 2.
-/// IFC2x4 CHANGE  The enumerators
-/// HOLLOWCORE and SPANDREL have been
-/// added.
-typedef enum {IfcBeamType_BEAM, IfcBeamType_JOIST, IfcBeamType_LINTEL, IfcBeamType_T_BEAM, IfcBeamType_USERDEFINED, IfcBeamType_NOTDEFINED} IfcBeamTypeEnum;
-const char* ToString(IfcBeamTypeEnum v);
-IfcBeamTypeEnum FromString(const std::string& s);
+/// IFC 2x4 change:  Obsolete item LOAD_COMBINATION_GROUP removed.  Load cases are directly assigned to load combinations with different factors for each load case—load combination pair by means of IfcRelAssignsToGroupByFactor.
+typedef enum {IfcLoadGroupType_LOAD_GROUP, IfcLoadGroupType_LOAD_CASE, IfcLoadGroupType_LOAD_COMBINATION_GROUP, IfcLoadGroupType_LOAD_COMBINATION, IfcLoadGroupType_USERDEFINED, IfcLoadGroupType_NOTDEFINED} IfcLoadGroupTypeEnum;
+const char* ToString(IfcLoadGroupTypeEnum v);
+IfcLoadGroupTypeEnum FromString(const std::string& s);
 }
-namespace IfcBenchmarkEnum {
-/// IfcBenchmarkEnum is an enumeration used to identify the logical comparators that can be applied in conjunction with constraint values. 
+namespace IfcLogicalOperatorEnum {
+/// Definition: IfcLogicalOperatorEnum is an enumeration that defines the logical operators that may be applied for the satisfaction of one or more operands (IfcConstraint) at a time. 
 /// 
-/// HISTORY: New type in IFC Release 2.0
+/// HISTORY  New type in IFC Release 2.0.  Renamed from IfcConstraintAggregatorEnum in IFC 2x2
 /// 
-/// IFC2x4 CHANGE: Extended to include comparators for item-set and set-item comparisons: INCLUDES, NOTINCLUDES, INCLUDEDIN and NOTINCLUDEDIN, to test if an individual item is a member of a given aggregation, or if an aggregation has a given individual item as a member.
+/// IFC2x4 CHANGE: Extended to include LOGICALXOR, LOGICALNOTAND and LOGICALNOTOR.
 /// 
 /// Enumeration 
 /// 
 /// Value 
 ///   Definition 
 /// 
-/// GREATERTHAN 
-///   Identifies that a value must be greater than that set by the constraint. 
-/// 
-/// GREATERTHANOREQUALTO 
-///   Identifies that a value must be either greater than or equal to that set by the constraint. 
+/// LOGICALAND 
+///   Defines a relationship between operands whereby the result is true if all operands are true, i.e. false if at least 
 /// 
-/// LESSTHAN 
-///   Identifies that a value must be less than that set by the constraint. 
+/// one operand is false. 
 /// 
-/// LESSTHANOREQUALTO 
-///   Identifies that a value must be either less than or equal to that set by the constraint. 
+/// LOGICALOR 
+///   Defines a relationship between operands whereby the result is true if at least one operand is true, i.e false if 
 /// 
-/// EQUALTO 
-///   Identifies that a value must be equal to that set by the constraint. 
+/// all operands are false. 
 /// 
-/// NOTEQUALTO 
-///   Identifies that a value must be not equal to that set by the constraint. 
+/// LOGICALXOR 
+///   Defines a relationship between operands whereby the result is true if exactly one operand is true (exclusive or). 
 /// 
-/// INCLUDES 
-///   Identifies that an aggregation (set, list or table) must include the value (individual item) set by the constraint. 
+/// LOGICALNOTAND 
+///   Defines a relationship between operands whereby the result is true if at least one operand is false, i.e false if 
 /// 
-/// NOTINCLUDES 
-///   Identifies that an aggregation (set, list or table) must not include (i.e must exclude) the value (individual item) set by the constraint. 
+/// all operands are true. 
 /// 
-/// INCLUDEDIN 
-///   Identifies that a value (individual item) must be included in the aggregation (set, list or table) set by the constraint. 
+/// LOGICALNOTOR 
+///   Defines a relationship between operands whereby the result is true if all operands are false, i.e false if at least 
 /// 
-/// NOTINCLUDEDIN 
-///   Identifies that a value (individual item) must not be included (i.e. must be excluded) in the aggregation (set, list or table) set by the constraint.
-typedef enum {IfcBenchmark_GREATERTHAN, IfcBenchmark_GREATERTHANOREQUALTO, IfcBenchmark_LESSTHAN, IfcBenchmark_LESSTHANOREQUALTO, IfcBenchmark_EQUALTO, IfcBenchmark_NOTEQUALTO} IfcBenchmarkEnum;
-const char* ToString(IfcBenchmarkEnum v);
-IfcBenchmarkEnum FromString(const std::string& s);
-}
-namespace IfcBoilerTypeEnum {
-/// Enumeration defining the typical types of boilers.
-///   The IfcBoilerTypeEnum contains the following:
+/// one operand is true. 
 /// 
-/// WATER: Water boiler.
-///   STEAM: Steam boiler.
-///   USERDEFINED: User-defined Boiler type.
-///   NOTDEFINED:  Undefined Boiler type.
+/// Use Definition 
 /// 
-/// HISTORY: New enumeration in IFC R2x.
-typedef enum {IfcBoilerType_WATER, IfcBoilerType_STEAM, IfcBoilerType_USERDEFINED, IfcBoilerType_NOTDEFINED} IfcBoilerTypeEnum;
-const char* ToString(IfcBoilerTypeEnum v);
-IfcBoilerTypeEnum FromString(const std::string& s);
-}
-namespace IfcBooleanOperator {
-/// Definition from ISO/CD 10303-42:1992: This type defines the three Boolean operators used in the definition of CSG solids.
+/// The IfcLogicalOperatorEnum, when applied in a case of three operands, A, B and C, evaluates for each operator as 
 /// 
-/// UNION: The operation of constructing the regularized set theoretic union of the volumes defined by two solids.
-/// INTERSECTION: The operation of constructing the regularised set theoretic intersection of the volumes defined by two solids.
-/// DIFFERENCE: The operation of constructing the regularized set theoretic intersection of the volumes defined by two solids.
+/// follows:
 /// 
-/// NOTE Corresponding STEP type: boolean_operator, please refer to ISO/IS 10303-42:1994, p.167 for the final definition of the formal standard.
+/// TRUTH TABLE: LOGICALAND(A,B,C)
 /// 
-/// HISTORY New Type in IFC Release 1.5.1.
-typedef enum {IfcBooleanOperator_UNION, IfcBooleanOperator_INTERSECTION, IfcBooleanOperator_DIFFERENCE} IfcBooleanOperator;
-const char* ToString(IfcBooleanOperator v);
-IfcBooleanOperator FromString(const std::string& s);
-}
-namespace IfcBuildingElementProxyTypeEnum {
-/// Definition from IAI: This enumeration defines the
-///   available generic types for IfcBuildingElementProxyType.
-/// 
-/// HISTORY  New enumeration
-///   in Release IFC2x Edition 3.
-/// 
-/// Enumeration
-/// 
-/// USERDEFINED
-/// 
-/// NOTDEFINED
-typedef enum {IfcBuildingElementProxyType_USERDEFINED, IfcBuildingElementProxyType_NOTDEFINED} IfcBuildingElementProxyTypeEnum;
-const char* ToString(IfcBuildingElementProxyTypeEnum v);
-IfcBuildingElementProxyTypeEnum FromString(const std::string& s);
-}
-namespace IfcCableCarrierFittingTypeEnum {
-/// The IfcCableCarrierFittingTypeEnum defines the range of different types of cable carrier fitting that can be specified. 
-///   HISTORY: New type in IFC 2x2  
-///   Enumeration 
+/// A
+/// F
+/// F
+/// F
+/// T
+/// F
+/// T
+/// T
+/// T
 /// 
-/// BEND: A fitting that changes the route of the cable carrier. 
-/// CROSS: A fitting at which two branches are taken from the main route of the cable carrier simultaneously. 
-/// REDUCER: A fitting that changes the physical size of the main route of the cable carrier. 
-/// TEE: A fitting at which a branch is taken from the main route of the cable carrier. 
-/// USERDEFINED: User-defined type. 
-/// NOTDEFINED: Undefined type.
-typedef enum {IfcCableCarrierFittingType_BEND, IfcCableCarrierFittingType_CROSS, IfcCableCarrierFittingType_REDUCER, IfcCableCarrierFittingType_TEE, IfcCableCarrierFittingType_USERDEFINED, IfcCableCarrierFittingType_NOTDEFINED} IfcCableCarrierFittingTypeEnum;
-const char* ToString(IfcCableCarrierFittingTypeEnum v);
-IfcCableCarrierFittingTypeEnum FromString(const std::string& s);
-}
-namespace IfcCableCarrierSegmentTypeEnum {
-/// The IfcCableCarrierSegmentTypeEnum defines the range of different types of cable carrier segment that can be specified. 
-///   HISTORY: New type in IFC 2x2  
-///   Enumeration 
+/// B
+/// F
+/// F
+/// T
+/// F
+/// T
+/// F
+/// T
+/// T
 /// 
-/// CABLELADDERSEGMENT: An open carrier segment on which cables are carried on a ladder structure.
-/// CABLETRAYSEGMENT: A (typically) open carrier segment onto which cables are laid.
-/// CABLETRUNKINGSEGMENT: An enclosed carrier segment with one or more compartments into which cables are placed.
-/// CONDUITSEGMENT: An enclosed tubular carrier segment through which cables are pulled.
-/// USERDEFINED: User-defined type.  
-/// NOTDEFINED: Undefined type.
-typedef enum {IfcCableCarrierSegmentType_CABLELADDERSEGMENT, IfcCableCarrierSegmentType_CABLETRAYSEGMENT, IfcCableCarrierSegmentType_CABLETRUNKINGSEGMENT, IfcCableCarrierSegmentType_CONDUITSEGMENT, IfcCableCarrierSegmentType_USERDEFINED, IfcCableCarrierSegmentType_NOTDEFINED} IfcCableCarrierSegmentTypeEnum;
-const char* ToString(IfcCableCarrierSegmentTypeEnum v);
-IfcCableCarrierSegmentTypeEnum FromString(const std::string& s);
-}
-namespace IfcCableSegmentTypeEnum {
-/// The IfcCableSegmentTypeEnum defines the range of different types of cable segment that can be specified. 
+/// C
+/// F
+/// T
+/// F
+/// F
+/// T
+/// T
+/// F
+/// T
 /// 
-/// HISTORY: New type in IFC
-///   2x2. Core and busbar segment added in IFC 2x4.  
-///   Enumeration 
+/// AND
+/// F
+/// F
+/// F
+/// F
+/// F
+/// F
+/// F
+/// T
 /// 
-/// BUSBARSEGMENT: Electrical conductor that makes a common connection between several electrical circuits. Properties of a busbar are the same as those of a cable segment and are captured by the cable segment property set. 
-/// CABLESEGMENT: Cable with a specific purpose to lead electric current within a circuit or any other electric construction. Includes all types of electric cables, mainly several core segments or conductor segments wrapped together. 
-/// CONDUCTORSEGMENT: A single linear element within a cable or an exposed wire (such as for grounding) with the specific purpose to lead electric current, data, or a telecommunications signal.  
-/// CORESEGMENT: A self contained element of a  cable that comprises one or more conductors and sheathing.The core of one lead is normally single wired or multiwired which are intertwined.  
-/// USERDEFINED: User-defined type.  
-/// NOTDEFINED: Undefined type.
-typedef enum {IfcCableSegmentType_CABLESEGMENT, IfcCableSegmentType_CONDUCTORSEGMENT, IfcCableSegmentType_USERDEFINED, IfcCableSegmentType_NOTDEFINED} IfcCableSegmentTypeEnum;
-const char* ToString(IfcCableSegmentTypeEnum v);
-IfcCableSegmentTypeEnum FromString(const std::string& s);
-}
-namespace IfcChangeActionEnum {
-/// IfcChangeActionEnum identifies the type of change that might have occurred to the object during the last session (for example, added, modified, deleted). This information is required in a partial model exchange scenario so that an application or model server will know how an object might have been affected by the previous application. Valid enumerations are:
+/// TRUTH TABLE: LOGICALOR(A,B,C)
 /// 
-/// NOCHANGE: Object has not been modified.
+/// A
+/// F
+/// F
+/// F
+/// T
+/// F
+/// T
+/// T
+/// T
 /// 
-/// MODIFIED: A modification to the object has been made by the user and application defined by the LastModifyingUser and LastModifyingApplication respectively.
+/// B
+/// F
+/// F
+/// T
+/// F
+/// T
+/// F
+/// T
+/// T
 /// 
-/// ADDED: The object has been created by the user and application defined by the OwningUser and OwningApplication respectively.
+/// C
+/// F
+/// T
+/// F
+/// F
+/// T
+/// T
+/// F
+/// T
 /// 
-/// DELETED: The object has been deleted by the user and application defined by the LastModifyingUser and LastModifyingApplication respectively.
+/// OR
+/// F
+/// T
+/// T
+/// T
+/// T
+/// T
+/// T
+/// T
 /// 
-/// NOTDEFINED: The change action is not known or has not been defined.
+/// TRUTH TABLE: LOGICALXOR(A,B,C)
 /// 
-/// Consider Application A will create an IFC dataset that it wants to publish to others for modification and have the ability to subsequently merge these changes back into the original model. Before publication, it may want to set the IfcChangeActionEnum to NOCHANGE to establish a baseline so that other application changes can be easily identified. Application B then receives this IFC dataset and adds a new object and sets IfcChangeActionEnum to ADDED with Application B defined as the OwningApplication. Application B then modifies an existing object and (re)defines the LastModifiedDate to the time of the modification, LastModifyingUser to the IfcPersonAndOrganization making the change, and sets the LastModifyingApplication to Application B. When Application A receives this modified dataset, it can determine which objects have been added and modified by Application B and either merge or reject these changes as necessary. Consequently, the intent is that an application only modifies the value of IfcChangeActionEnum when it does something to the object, with the further intent that a model server is responsible for clearing the IfcChangeActionEnum back to NOCHANGE when it is ready to be republished.
+/// A
+/// F
+/// F
+/// F
+/// T
+/// F
+/// T
+/// T
+/// T
 /// 
-/// HISTORY: New enumeration in IFC R2.0. Modified in IFC2x4.
-typedef enum {IfcChangeAction_NOCHANGE, IfcChangeAction_MODIFIED, IfcChangeAction_ADDED, IfcChangeAction_DELETED, IfcChangeAction_MODIFIEDADDED, IfcChangeAction_MODIFIEDDELETED} IfcChangeActionEnum;
-const char* ToString(IfcChangeActionEnum v);
-IfcChangeActionEnum FromString(const std::string& s);
-}
-namespace IfcChillerTypeEnum {
-/// Enumeration defining the typical types of Chillers classified by their method of heat rejection. 
-///   The IfcChillerTypeEnum contains the following:
+/// B
+/// F
+/// F
+/// T
+/// F
+/// T
+/// F
+/// T
+/// T
 /// 
-/// AIRCOOLED: Air cooled chiller.
-///   WATERCOOLED: Water cooled chiller.
-///   HEATRECOVERY: Heat recovery chiller.
-///   USERDEFINED:	User-defined chiller type.
-///   NOTDEFINED: Undefined chiller type.
+/// C
+/// F
+/// T
+/// F
+/// F
+/// T
+/// T
+/// F
+/// T
 /// 
-/// HISTORY: New enumeration in IFC R2x.
-typedef enum {IfcChillerType_AIRCOOLED, IfcChillerType_WATERCOOLED, IfcChillerType_HEATRECOVERY, IfcChillerType_USERDEFINED, IfcChillerType_NOTDEFINED} IfcChillerTypeEnum;
-const char* ToString(IfcChillerTypeEnum v);
-IfcChillerTypeEnum FromString(const std::string& s);
-}
-namespace IfcCoilTypeEnum {
-/// Enumeration defining the typical types of coils.
+/// XOR
+/// F
+/// T
+/// T
+/// T
+/// F
+/// F
+/// F
+/// F
 /// 
-/// The IfcCoilTypeEnum contains the following:
+/// TRUTH TABLE: LOGICALNOTAND(A,B,C)
 /// 
-/// DXCOOLINGCOIL: Cooling coil using a refrigerant to cool the air stream directly.
+/// A
+/// F
+/// F
+/// F
+/// T
+/// F
+/// T
+/// T
+/// T
 /// 
-/// WATERCOOLINGCOIL: Cooling coil using chilled water. HYDRONICCOIL supercedes this enumerator.
+/// B
+/// F
+/// F
+/// T
+/// F
+/// T
+/// F
+/// T
+/// T
 /// 
-/// STEAMHEATINGCOIL: Heating coil using steam as heating source.
+/// C
+/// F
+/// T
+/// F
+/// F
+/// T
+/// T
+/// F
+/// T
 /// 
-/// WATERHEATINGCOIL: Heating coil using hot water as a heating source. HYDRONICCOIL supercedes this enumerator.
+/// NOTAND
+/// T
+/// T
+/// T
+/// T
+/// T
+/// T
+/// T
+/// F
 /// 
-/// ELECTRICHEATINGCOIL: Heating coil using electricity as a heating source.
+/// TRUTH TABLE: LOGICALNOTOR(A,B,C)
 /// 
-/// GASHEATINGCOIL: Heating coil using gas as a heating source.
+/// A
+/// F
+/// F
+/// F
+/// T
+/// F
+/// T
+/// T
+/// T
 /// 
-/// HYDRONICCOIL: Cooling or Heating coil that uses a hydronic fluid as a cooling or heating source.
-///   USERDEFINED: User-defined coil type.
+/// B
+/// F
+/// F
+/// T
+/// F
+/// T
+/// F
+/// T
+/// T
 /// 
-/// NOTDEFINED:  Undefined coil type.
+/// C
+/// F
+/// T
+/// F
+/// F
+/// T
+/// T
+/// F
+/// T
 /// 
-/// HISTORY: New enumeration in IFC R2x.
-typedef enum {IfcCoilType_DXCOOLINGCOIL, IfcCoilType_WATERCOOLINGCOIL, IfcCoilType_STEAMHEATINGCOIL, IfcCoilType_WATERHEATINGCOIL, IfcCoilType_ELECTRICHEATINGCOIL, IfcCoilType_GASHEATINGCOIL, IfcCoilType_USERDEFINED, IfcCoilType_NOTDEFINED} IfcCoilTypeEnum;
-const char* ToString(IfcCoilTypeEnum v);
-IfcCoilTypeEnum FromString(const std::string& s);
+/// NOTOR
+/// T
+/// F
+/// F
+/// F
+/// F
+/// F
+/// F
+/// F
+typedef enum {IfcLogicalOperator_LOGICALAND, IfcLogicalOperator_LOGICALOR} IfcLogicalOperatorEnum;
+const char* ToString(IfcLogicalOperatorEnum v);
+IfcLogicalOperatorEnum FromString(const std::string& s);
 }
-namespace IfcColumnTypeEnum {
+namespace IfcMemberTypeEnum {
 /// Definition from IAI: This enumeration defines the
-/// different types of linear elements an IfcColumnType object
+/// different types of linear elements an IfcMemberType object
 /// can fulfill:
 /// 
-/// COLUMN: A standard column element usually used
-/// vertically.
-/// USERDEFINED: User-defined linear element.
-/// NOTDEFINED: Undefined linear element
+/// BRACE: A linear element (usually sloped) often used
+/// for bracing of a girder or truss.
+/// CHORD: Upper or lower longitudinal member of a truss,
+/// used horizontally or sloped.
+/// COLLAR: A linear element (usually used horizontally)
+/// within a roof structure to connect rafters and posts.
+/// MEMBER: A linear element within a girder or truss with
+/// no further meaning.
+/// MULLION: A linear element within a curtain wall system
+/// to connect two (or more) panels.
+/// PLATE: A linear continuous horizontal element in wall
+/// framing, e.g. a head piece or a sole plate.
 /// 
-/// NOTE: This enumeration has been mainly
-/// introduced to allow further detailing of the type information in
-/// future releases of IFC.
-/// HISTORY New Enumeration
-/// in Release IFC2x Edition 2.
-typedef enum {IfcColumnType_COLUMN, IfcColumnType_USERDEFINED, IfcColumnType_NOTDEFINED} IfcColumnTypeEnum;
-const char* ToString(IfcColumnTypeEnum v);
-IfcColumnTypeEnum FromString(const std::string& s);
-}
-namespace IfcCompressorTypeEnum {
-/// Types of compressors.
-///   The IfcCompressorTypeEnum contains the following:
+/// NOTE  This head piece or sole plate shall not
+/// be mixed up with planar elements, such as sheets and panels, that
+/// are handled as IfcPlate (and
+/// IfcPlateType).
 /// 
-/// DYNAMIC: The pressure of refrigerant vapor is increased by a continuous transfer of angular momentum from a rotating member to the vapor followed by conversion of this momentum into static pressure.
-///   RECIPROCATING: Positive-displacement compressor using a piston driven by a connecting rod from a crankshaft.
-///   ROTARY: Positive-displacement compressor using a roller or rotor device.
-///   SCROLL: Positive-displacement compressor using two inter-fitting, spiral-shaped scroll members.
-///   TROCHOIDAL: Positive-displacement compressor using a rolling motion of one circle outside or inside the circumference of a basic circle and produce either epitrochoids or hypotrochoids.
-///   SINGLESTAGE: Positive-displacement reciprocating compressor where vapor is compressed in a single stage.
-///   BOOSTER: Positive-displacement reciprocating compressor where pressure is increased by a booster.
-///   OPENTYPE: Positive-displacement reciprocating compressor where the shaft extends through a seal in the crankcase for an external drive.
-///   HERMETIC: Positive-displacement reciprocating compressor where the motor and compressor are contained within the same housing, with the motor shaft integral with the compressor crankshaft and the motor in contact with refrigerant.
-///   SEMIHERMETIC: Positive-displacement reciprocating compressor where the hermetic compressors use bolted construction amenable to field repair.
-///   WELDEDSHELLHERMETIC: Positive-displacement reciprocating compressor where the motor compressor is mounted inside a steel shell, which, in turn is sealed by welding.
-///   ROLLINGPISTON: Positive-displacement rotary compressor using a roller mounted on the eccentric of a shaft with a single vane in the nonrotating cylindrical housing.
-///   ROTARYVANE: Positive-displacement rotary compressor using a roller mounted on the eccentric of a shaft with multiple vanes in the nontotating cylindrical housing.
-///   SINGLESCREW: Positive-displacement rotary compressor using a single cylindrical main rotor that works with a pair of gate rotors.
-///   TWINSCREW: Positive-displacement rotary compressor using two mating helically grooved rotors, male (lobes) and female (flutes) in a stationary housing with inlet and outlet gas ports.
-///   USERDEFINED: User-defined compressor type.
-///   NOTDEFINED:  Undefined compressor type.
+/// POST: A linear member (usually used vertically) within
+/// a roof structure to support purlins.
+/// PURLIN: A linear element (usually used horizontally)
+/// within a roof structure to support rafters
+/// RAFTER: A linear elements used to support roof slabs
+/// or roof covering, usually used with slope.
+/// STRINGER: A linear element used to support stair or
+/// ramp flights, usually used with slope.
+/// STRUT: A linear element often used within a girder or
+/// truss.
+/// STUD: Vertical element in wall framing.
+/// USERDEFINED: User-defined linear element.
+/// NOTDEFINED: Undefined linear element
 /// 
-/// HISTORY: New enumeration in IFC R2x.
-typedef enum {IfcCompressorType_DYNAMIC, IfcCompressorType_RECIPROCATING, IfcCompressorType_ROTARY, IfcCompressorType_SCROLL, IfcCompressorType_TROCHOIDAL, IfcCompressorType_SINGLESTAGE, IfcCompressorType_BOOSTER, IfcCompressorType_OPENTYPE, IfcCompressorType_HERMETIC, IfcCompressorType_SEMIHERMETIC, IfcCompressorType_WELDEDSHELLHERMETIC, IfcCompressorType_ROLLINGPISTON, IfcCompressorType_ROTARYVANE, IfcCompressorType_SINGLESCREW, IfcCompressorType_TWINSCREW, IfcCompressorType_USERDEFINED, IfcCompressorType_NOTDEFINED} IfcCompressorTypeEnum;
-const char* ToString(IfcCompressorTypeEnum v);
-IfcCompressorTypeEnum FromString(const std::string& s);
+/// HISTORY: New
+/// Enumeration in Release IFC2x Edition 2.
+/// IFC2x Edition 2
+/// Addendum 1 CHANGE  The additional identifiers CHORD, PLATE, STUD
+/// are added.
+/// IFC2x Edition 3 CHANGE  The additional identifier MULLION has
+/// been added.
+typedef enum {IfcMemberType_BRACE, IfcMemberType_CHORD, IfcMemberType_COLLAR, IfcMemberType_MEMBER, IfcMemberType_MULLION, IfcMemberType_PLATE, IfcMemberType_POST, IfcMemberType_PURLIN, IfcMemberType_RAFTER, IfcMemberType_STRINGER, IfcMemberType_STRUT, IfcMemberType_STUD, IfcMemberType_USERDEFINED, IfcMemberType_NOTDEFINED} IfcMemberTypeEnum;
+const char* ToString(IfcMemberTypeEnum v);
+IfcMemberTypeEnum FromString(const std::string& s);
 }
-namespace IfcCondenserTypeEnum {
-/// Enumeration defining the typical types of condensers.  Air is used as the cooling medium for AIRCOOLED; water is used as the cooling medium for all other types.  The IfcCondenserTypeEnum contains the following:
-/// 
-/// AIRCOOLED: A condenser in which heat is transferred to an air-stream.
-///   EVAPORATIVECOOLED: A condenser that is cooled evaporatively.
-///   WATERCOOLED: Water-cooled condenser with unspecified operation.
-///   WATERCOOLEDSHELLTUBE: Water-cooled condenser with cooling water circulated through one or more tubes contained within the shell.
-///   WATERCOOLEDSHELLCOIL: Water-cooled condenser with cooling water circulated through one or more continuous or assembled coils contained within the shell.
-///   WATERCOOLEDTUBEINTUBE: Water-cooled condenser consisting of one or more assemblies of two tubes, one within the other.
-///   WATERCOOLEDBRAZEDPLATE: Water-cooled condenser condenser with plates brazed together to form an assembly of separate channels.
-///   USERDEFINED: User-defined condenser type.
-///   NOTDEFINED:  Undefined condenser type.
+namespace IfcMotorConnectionTypeEnum {
+/// The IfcMotorConnectionTypeEnum defines the range of different types of motor connection that can be specified. 
+///   HISTORY: New type in IFC 2x.  
+///   Enumeration 
 /// 
-/// HISTORY: New enumeration in IFC 2x2.  WATERCOOLED added in IFC 2x4.
-typedef enum {IfcCondenserType_WATERCOOLEDSHELLTUBE, IfcCondenserType_WATERCOOLEDSHELLCOIL, IfcCondenserType_WATERCOOLEDTUBEINTUBE, IfcCondenserType_WATERCOOLEDBRAZEDPLATE, IfcCondenserType_AIRCOOLED, IfcCondenserType_EVAPORATIVECOOLED, IfcCondenserType_USERDEFINED, IfcCondenserType_NOTDEFINED} IfcCondenserTypeEnum;
-const char* ToString(IfcCondenserTypeEnum v);
-IfcCondenserTypeEnum FromString(const std::string& s);
+/// BELTDRIVE: An indirect connection made through the medium of a shaped, flexible continuous loop. 
+/// COUPLING: An indirect connection made through the medium of the viscosity of a fluid. 
+/// DIRECTDRIVE: A direct, physical connection made between the motor and the driven device. 
+/// USERDEFINED: User-defined type. 
+/// NOTDEFINED: Undefined type.
+typedef enum {IfcMotorConnectionType_BELTDRIVE, IfcMotorConnectionType_COUPLING, IfcMotorConnectionType_DIRECTDRIVE, IfcMotorConnectionType_USERDEFINED, IfcMotorConnectionType_NOTDEFINED} IfcMotorConnectionTypeEnum;
+const char* ToString(IfcMotorConnectionTypeEnum v);
+IfcMotorConnectionTypeEnum FromString(const std::string& s);
 }
-namespace IfcConnectionTypeEnum {
-/// This enumeration defines the different ways how path based elements (such as IfcWallStandardCase) can connect, as shown in Figure 65. 
-/// 
-/// HISTORY New type in IFC Release 2.0 
-/// 
-/// L-Shape Connection 
-/// 
-/// RelatingConnectionType: AtStart 
-///   RelatedConnectionType: AtStart 
-/// 
-/// L-Shape Connection 
+namespace IfcNullStyle {
+/// Definition from ISO/CD 10303-46:1992: The null style type specifies, that a representation item is not styled.
 /// 
-/// RelatingConnectionType: AtEnd 
-///   RelatedConnectionType: AtStart 
+/// NOTE  Corresponding ISO 10303 name: null_style. Please refer to ISO/IS 10303-46:1994 for the final
+/// definition of the formal standard.
 /// 
-/// T-Shape Connection 
+/// HISTORY  New enumeration in IFC2x2.
 /// 
-/// RelatingConnectionType: AtPath 
-///   RelatedConnectionType: AtStart 
+/// IFC2x4 CHANGE  The enumeration is deprecated.
+typedef enum {IfcNullStyle_NULL} IfcNullStyle;
+const char* ToString(IfcNullStyle v);
+IfcNullStyle FromString(const std::string& s);
+}
+namespace IfcObjectTypeEnum {
+/// This enumeration defines the applicable object categories, that is, the subtypes at the 2nd level of the IFC inheritance tree. Attached to an object, it indicates to which subtype of IfcObject the entity referencing it would otherwise comply with. 
 /// 
-/// Figure 65 — Connection types</td
-typedef enum {IfcConnectionType_ATPATH, IfcConnectionType_ATSTART, IfcConnectionType_ATEND, IfcConnectionType_NOTDEFINED} IfcConnectionTypeEnum;
-const char* ToString(IfcConnectionTypeEnum v);
-IfcConnectionTypeEnum FromString(const std::string& s);
+/// HISTORY New entity in IFC Release 1.0, has been renamed from IfcProxyEnum in IFC 2x.
+typedef enum {IfcObjectType_PRODUCT, IfcObjectType_PROCESS, IfcObjectType_CONTROL, IfcObjectType_RESOURCE, IfcObjectType_ACTOR, IfcObjectType_GROUP, IfcObjectType_PROJECT, IfcObjectType_NOTDEFINED} IfcObjectTypeEnum;
+const char* ToString(IfcObjectTypeEnum v);
+IfcObjectTypeEnum FromString(const std::string& s);
 }
-namespace IfcConstraintEnum {
-/// IfcConstraintEnum is an enumeration used to qualify a constraint. 
+namespace IfcObjectiveEnum {
+/// IfcObjectiveEnum is an enumeration used to determine the objective for which purpose the constraint needs to be satisfied. 
 /// 
-/// HISTORY: New type in IFC Release 2.0
+/// HISTORY: IFC2x4 CHANGE: Extended to include CODEWAIVER.
 /// 
 /// Enumeration 
 /// 
 /// Value 
 ///   Definition 
 /// 
-/// HARD 
-///   Qualifies a constraint such that it must be followed rigidly within or at the values set. 
-/// 
-/// SOFT 
-///   Qualifies a constraint such that it should be followed within or at the values set. 
+/// CODECOMPLIANCE 
+///   A constraint whose objective is to ensure satisfaction of a code compliance provision. 
 /// 
-/// ADVISORY 
-///   Qualifies a constraint such that it is advised that it is followed within or at the values set.
-typedef enum {IfcConstraint_HARD, IfcConstraint_SOFT, IfcConstraint_ADVISORY, IfcConstraint_USERDEFINED, IfcConstraint_NOTDEFINED} IfcConstraintEnum;
-const char* ToString(IfcConstraintEnum v);
-IfcConstraintEnum FromString(const std::string& s);
-}
-namespace IfcControllerTypeEnum {
-/// The IfcControllerTypeEnum defines the range of different types of controller that can be specified.
+/// CODEWAIVER 
+///   A constraint whose objective is to identify an agreement that code compliance requirements (the waiver) will not be enforced. 
 /// 
-/// HISTORY: New type in IFC R2.0
-///   Documentation extended in IFC 2x4. PROPORTIONALINTEGRAL and PROPORTIONALINTEGRALDERIVATIVE values deleted (property set enumeration now used).  MULTIPOSITION added.
+/// DESIGNINTENT 
+///   A constraint whose objective is to ensure satisfaction of a design intent provision. 
 /// 
-/// Enumeration
+/// HEALTHANDSAFETY 
+///   A constraint whose objective is to ensure satisfaction of a health and safety provision. 
 /// 
-/// FLOATING: Output increases or decreases at a constant or accelerating rate.
-/// MULTIPOSITION: Output is discrete value, can be one of three or more values.
-/// PROGRAMMABLE: Output is programmable such as Discrete Digital Control (DDC).
-/// PROPORTIONAL: Output is proportional to the control error and optionally time integral and derivative.
-/// TWOPOSITION: Output can be either on or off
-/// USERDEFINED: User-defined type.
-/// NOTDEFINED: Undefined type.
-typedef enum {IfcControllerType_FLOATING, IfcControllerType_PROPORTIONAL, IfcControllerType_PROPORTIONALINTEGRAL, IfcControllerType_PROPORTIONALINTEGRALDERIVATIVE, IfcControllerType_TIMEDTWOPOSITION, IfcControllerType_TWOPOSITION, IfcControllerType_USERDEFINED, IfcControllerType_NOTDEFINED} IfcControllerTypeEnum;
-const char* ToString(IfcControllerTypeEnum v);
-IfcControllerTypeEnum FromString(const std::string& s);
-}
-namespace IfcCooledBeamTypeEnum {
-/// There are two general types of cooled or chilled beams: passive and active.
+/// REQUIREMENT 
+///   A constraint whose objective is to ensure satisfaction of a project requirement provision. 
 /// 
-/// An active Cooled Beam uses a fan or other auxilliary device to aid in air recirculation, while a passive
+/// SPECIFICATION 
+///   A constraint whose objective is to ensure satisfaction of a specification provision. 
 /// 
-/// Cooled Beam relies solely on convection to cool the space.
+/// TRIGGERCONDITION 
+///   A constraint whose objective is to indicate a limiting value beyond which the condition of an object requires a particular form of attention.
+typedef enum {IfcObjective_CODECOMPLIANCE, IfcObjective_DESIGNINTENT, IfcObjective_HEALTHANDSAFETY, IfcObjective_REQUIREMENT, IfcObjective_SPECIFICATION, IfcObjective_TRIGGERCONDITION, IfcObjective_USERDEFINED, IfcObjective_NOTDEFINED} IfcObjectiveEnum;
+const char* ToString(IfcObjectiveEnum v);
+IfcObjectiveEnum FromString(const std::string& s);
+}
+namespace IfcOccupantTypeEnum {
+/// IfcOccupantTypeEnum defines the types of occupant from which the type required can be selected. 
+///   HISTORY: New Enumeration in IFC Release 2.0 Modified in IFC 2x2 
+///   Enumeration: 
 /// 
-/// Enumeration defining the typical types of cooled beams.
+/// ASSIGNEE: Actor receiving the assignment of a property agreement from an assignor  
+/// ASSIGNOR: Actor assigning a property agreement to an assignor  
+/// LESSEE: Actor receiving the lease of a property from a lessor  
+/// LESSOR: Actor leasing a property to a lessee  
+/// LETTINGAGENT: Actor participating in a property agreement on behalf of an owner, lessor or assignor  
+/// OWNER: Actor that owns a property  
+/// TENANT: Actor renting the use of a property fro a period of time  
+/// USERDEFINED: User-defined type.  
+/// NOTDEFINED: Undefined type.
+typedef enum {IfcOccupantType_ASSIGNEE, IfcOccupantType_ASSIGNOR, IfcOccupantType_LESSEE, IfcOccupantType_LESSOR, IfcOccupantType_LETTINGAGENT, IfcOccupantType_OWNER, IfcOccupantType_TENANT, IfcOccupantType_USERDEFINED, IfcOccupantType_NOTDEFINED} IfcOccupantTypeEnum;
+const char* ToString(IfcOccupantTypeEnum v);
+IfcOccupantTypeEnum FromString(const std::string& s);
+}
+namespace IfcOutletTypeEnum {
+/// The IfcOutletTypeEnum defines the range of different types of outlet that can be specified. 
 /// 
-/// The IfcCooledBeamTypeEnum contains the following:
+/// HISTORY: New type in IFC 2x. Telephone and Data outlets added in IFC 2x4
 /// 
-/// ACTIVE: An active or ventilated cooled beam provides cooling (and heating) but can also function as an air terminal in a ventilation system.
+/// Enumeration 
 /// 
-/// PASSIVE: A passive or static cooled beam provides cooling (and heating) to a room or zone.
+/// AUDIOVISUALOUTLET: An outlet used for an audio or visual device. 
+/// COMMUNICATIONSOUTLET: An outlet used for connecting communications equipment. 
+/// POWEROUTLET: An outlet used for connecting electrical devices requiring power.  
+/// DATAOUTLET: An outlet used for connecting data communications equipment. 
+/// TELEPHONEOUTLET: An outlet used for connecting telephone communications equipment.  
+/// USERDEFINED: User-defined type. 
+/// NOTDEFINED: Undefined type.
+typedef enum {IfcOutletType_AUDIOVISUALOUTLET, IfcOutletType_COMMUNICATIONSOUTLET, IfcOutletType_POWEROUTLET, IfcOutletType_USERDEFINED, IfcOutletType_NOTDEFINED} IfcOutletTypeEnum;
+const char* ToString(IfcOutletTypeEnum v);
+IfcOutletTypeEnum FromString(const std::string& s);
+}
+namespace IfcPermeableCoveringOperationEnum {
+/// Definition: Enumeration defining the valid types of permeable coverings. 
 /// 
-/// USERDEFINED: User-defined cooled beam type.
+/// Enumeration:
 /// 
-/// NOTDEFINED:  Undefined cooled beam type.
+/// GRILL 
+///   protective screen of metal bars or wires
 /// 
-/// HISTORY: New enumeration in IFC 2x2.
-typedef enum {IfcCooledBeamType_ACTIVE, IfcCooledBeamType_PASSIVE, IfcCooledBeamType_USERDEFINED, IfcCooledBeamType_NOTDEFINED} IfcCooledBeamTypeEnum;
-const char* ToString(IfcCooledBeamTypeEnum v);
-IfcCooledBeamTypeEnum FromString(const std::string& s);
-}
-namespace IfcCoolingTowerTypeEnum {
-/// Enumeration defining the typical types of cooling towers. 
-///   The IfcCoolingTowerTypeEnum contains the following:
+/// LOUVER 
+///   set of fixed or movable strips of wood, metal, etc. arranged to let
+///   air in while keeping light or rain out
 /// 
-/// NATURALDRAFT: Air flow is produced naturally.
-///   MECHANICALINDUCEDDRAFT: Air flow is produced by a mechanical device, typically one or more fans, located on 
+/// SCREEN 
+///   upright, fixed or movable, sometimes folding framework used for
+///   protection against heat, light, access or similar
 /// 
-/// the air outlet side of the cooling tower.
-///   MECHANICALFORCEDDRAFT: Air flow is produced by a mechanical device, typically one or more fans, located on 
+/// USERDEFINED 
+///   user defined permeable covering type
 /// 
-/// the inlet air side of the cooling tower.
-///   USERDEFINED:  User-defined cooling tower type.
-///   NOTDEFINED:  Undefined cooling tower type.
+/// NOTDEFINED 
+///   no information available
 /// 
-/// HISTORY: New enumeration in IFC R2x.
-typedef enum {IfcCoolingTowerType_NATURALDRAFT, IfcCoolingTowerType_MECHANICALINDUCEDDRAFT, IfcCoolingTowerType_MECHANICALFORCEDDRAFT, IfcCoolingTowerType_USERDEFINED, IfcCoolingTowerType_NOTDEFINED} IfcCoolingTowerTypeEnum;
-const char* ToString(IfcCoolingTowerTypeEnum v);
-IfcCoolingTowerTypeEnum FromString(const std::string& s);
+/// HISTORY: New Enumeration in IFC Release 2.0
+typedef enum {IfcPermeableCoveringOperation_GRILL, IfcPermeableCoveringOperation_LOUVER, IfcPermeableCoveringOperation_SCREEN, IfcPermeableCoveringOperation_USERDEFINED, IfcPermeableCoveringOperation_NOTDEFINED} IfcPermeableCoveringOperationEnum;
+const char* ToString(IfcPermeableCoveringOperationEnum v);
+IfcPermeableCoveringOperationEnum FromString(const std::string& s);
 }
-namespace IfcCostScheduleTypeEnum {
-/// An IfcCostScheduleTypeEnum is a list of the available types of cost schedule from which that required may be selected. 
-///   HISTORY: New type in IFC 2x2  
-///   Enumeration 
+namespace IfcPhysicalOrVirtualEnum {
+/// Definition from IAI: This enumeration defines the
+///   different types of space boundaries in terms of its
+///   physical manifestation. A space boundary can either be
+///   physically dividing or can be a virtual divider.
 /// 
-/// BUDGET: An allocation of money for a particular purpose. 
-/// COSTPLAN: An assessment of the amount of money needing to be expended for a defined purpose based on incomplete information about the goods and services required for a construction or installation.  
-/// ESTIMATE: An assessment of the amount of money needing to be expended for a defined purpose based on actual information about the goods and services required for a construction or installation. 
-/// TENDER: An offer to provide goods and services.  
-/// PRICEDBILLOFQUANTITIES: A complete listing of all work items forming construction or installation works in which costs have been allocated to work items.  
-/// UNPRICEDBILLOFQUANTITIES: A complete listing of all work items forming construction or installation works in which costs have not yet been allocated to work items. 
-/// SCHEDULEOFRATES: A listing of each type of goods forming construction or installation works with the cost of purchase, construction/installation, overheads and profit assigned so that additional items of that type can be costed.  
-/// USERDEFINED: User-defined type. 
-/// NOTDEFINED: Undefined type.
-typedef enum {IfcCostScheduleType_BUDGET, IfcCostScheduleType_COSTPLAN, IfcCostScheduleType_ESTIMATE, IfcCostScheduleType_TENDER, IfcCostScheduleType_PRICEDBILLOFQUANTITIES, IfcCostScheduleType_UNPRICEDBILLOFQUANTITIES, IfcCostScheduleType_SCHEDULEOFRATES, IfcCostScheduleType_USERDEFINED, IfcCostScheduleType_NOTDEFINED} IfcCostScheduleTypeEnum;
-const char* ToString(IfcCostScheduleTypeEnum v);
-IfcCostScheduleTypeEnum FromString(const std::string& s);
-}
-namespace IfcCoveringTypeEnum {
-/// Definition from IAI: This enumeration defines the range
-/// of different types of covering that can further specify an
-/// IfcCovering or an IfcCoveringType.
-/// HISTORY New enumeration
-/// in IFC Release 1.0
-/// IFC2x4 CHANGE The following
-/// enumerators of the IfcCoveringTypeEnum have been
-/// deprecated INSULATION, SLEEVING and
-/// WRAPPING.
-/// Enumeration
+/// Enumeration:
 /// 
-/// CEILING: the covering is used to
-/// represent a ceiling
-/// FLOORING: the covering is used to
-/// represent a flooring
-/// CLADDING: the covering is used to
-/// represent a cladding
-/// ROOFING: the covering is used to
-/// represent a roof
+/// PHYSICAL
 /// 
-/// INSULATION: the covering is used to
-/// insulate an element for thermal or acoustic purposes.
-/// IFC2x4 NOTE The use of this
-/// enumerator is deprecated.
-/// MEMBRANE: an impervious layer that
-/// could be used for e.g. roof covering (below tiling - that may be
-/// known as sarking etc.) or as a damp proof course membrane
-/// IFC2x4 NOTE The use of this
-/// enumerator is deprecated.
-/// SLEEVING: the covering is used to
-/// isolate a distribution element from a space in which it is
-/// contained.
-/// IFC2x4 NOTE The use of this
-/// enumerator is deprecated.
-/// WRAPPING: the covering is used for
-/// wrapping particularly of distribution elements using tape.
-/// IFC2x4 NOTE The use of this
-/// enumerator is deprecated.
+/// The space boundary is provided physically, i.e. by an
+///   physical element.
 /// 
-/// USERDEFINED: user defined type of
-/// covering
-/// NOTDEFINED: undefined type of
-/// covering
-typedef enum {IfcCoveringType_CEILING, IfcCoveringType_FLOORING, IfcCoveringType_CLADDING, IfcCoveringType_ROOFING, IfcCoveringType_INSULATION, IfcCoveringType_MEMBRANE, IfcCoveringType_SLEEVING, IfcCoveringType_WRAPPING, IfcCoveringType_USERDEFINED, IfcCoveringType_NOTDEFINED} IfcCoveringTypeEnum;
-const char* ToString(IfcCoveringTypeEnum v);
-IfcCoveringTypeEnum FromString(const std::string& s);
-}
-namespace IfcCurrencyEnum {
-
-typedef enum {IfcCurrency_AED, IfcCurrency_AES, IfcCurrency_ATS, IfcCurrency_AUD, IfcCurrency_BBD, IfcCurrency_BEG, IfcCurrency_BGL, IfcCurrency_BHD, IfcCurrency_BMD, IfcCurrency_BND, IfcCurrency_BRL, IfcCurrency_BSD, IfcCurrency_BWP, IfcCurrency_BZD, IfcCurrency_CAD, IfcCurrency_CBD, IfcCurrency_CHF, IfcCurrency_CLP, IfcCurrency_CNY, IfcCurrency_CYS, IfcCurrency_CZK, IfcCurrency_DDP, IfcCurrency_DEM, IfcCurrency_DKK, IfcCurrency_EGL, IfcCurrency_EST, IfcCurrency_EUR, IfcCurrency_FAK, IfcCurrency_FIM, IfcCurrency_FJD, IfcCurrency_FKP, IfcCurrency_FRF, IfcCurrency_GBP, IfcCurrency_GIP, IfcCurrency_GMD, IfcCurrency_GRX, IfcCurrency_HKD, IfcCurrency_HUF, IfcCurrency_ICK, IfcCurrency_IDR, IfcCurrency_ILS, IfcCurrency_INR, IfcCurrency_IRP, IfcCurrency_ITL, IfcCurrency_JMD, IfcCurrency_JOD, IfcCurrency_JPY, IfcCurrency_KES, IfcCurrency_KRW, IfcCurrency_KWD, IfcCurrency_KYD, IfcCurrency_LKR, IfcCurrency_LUF, IfcCurrency_MTL, IfcCurrency_MUR, IfcCurrency_MXN, IfcCurrency_MYR, IfcCurrency_NLG, IfcCurrency_NZD, IfcCurrency_OMR, IfcCurrency_PGK, IfcCurrency_PHP, IfcCurrency_PKR, IfcCurrency_PLN, IfcCurrency_PTN, IfcCurrency_QAR, IfcCurrency_RUR, IfcCurrency_SAR, IfcCurrency_SCR, IfcCurrency_SEK, IfcCurrency_SGD, IfcCurrency_SKP, IfcCurrency_THB, IfcCurrency_TRL, IfcCurrency_TTD, IfcCurrency_TWD, IfcCurrency_USD, IfcCurrency_VEB, IfcCurrency_VND, IfcCurrency_XEU, IfcCurrency_ZAR, IfcCurrency_ZWD, IfcCurrency_NOK} IfcCurrencyEnum;
-const char* ToString(IfcCurrencyEnum v);
-IfcCurrencyEnum FromString(const std::string& s);
-}
-namespace IfcCurtainWallTypeEnum {
-/// Definition from IAI: Enumeration defining
-/// the valid types of curtain wall that can be predefined using the
-/// enumeration values. 
-/// HISTORY 
-/// New Enumeration in Release IFC2x Edition 3
-/// NOTE  Currently there
-/// are no specific enumerators defined, the IfcCurtainWallTypeEnum
-/// has
-/// been added for future extensions.
-typedef enum {IfcCurtainWallType_USERDEFINED, IfcCurtainWallType_NOTDEFINED} IfcCurtainWallTypeEnum;
-const char* ToString(IfcCurtainWallTypeEnum v);
-IfcCurtainWallTypeEnum FromString(const std::string& s);
-}
-namespace IfcDamperTypeEnum {
-/// This enumeration defines the various types of damper:
+/// VIRTUAL
 /// 
-/// BALANCINGDAMPER: Damper used for purposes of manually balancing pressure differences.  Commonly operated by mechanical adjustment.
-/// BACKDRAFTDAMPER: Backdraft damper used to restrict the movement of air in one direction.  Commonly operated by mechanical spring.
-/// BLASTDAMPER: Blast damper use to prevent protect occupants and equipment against overpressures resultant of an explosion.  Commonly operated by mechanical spring.
-/// CONTROLDAMPER: Control damper used to modulate the flow of air by adjusting the position of the blades.  Commonly operated by an actuator of a building automation system.
-/// FIREDAMPER: Fire damper used to prevent the spread of fire for a specified duration.  Commonly operated by fusable link that melts above a certain temperature.
-/// FIRESMOKEDAMPER: Combination fire and smoke damper used to preven the spread of fire and smoke.  Commonly operated by a fusable link and a smoke detector
-/// FUMEHOODEXHAUST: Fume hood exhaust damper.  Commonly operated by actuator.
-/// GRAVITYDAMPER: Gravity damper closes from the force of gravity.  Commonly operated by gravitational weight.
-/// GRAVITYRELIEFDAMPER: Gravity-relief damper used to allow air to move upon a buildup of enough pressure to overcome the gravitational force exerted upon the damper blades.  Commonly operated by gravitational weight.
-/// RELIEFDAMPER: Relief damper used to allow air to move upon a buildup of a specified pressure differential.  Commonly operated by mechanical spring.
-/// SMOKEDAMPER: Smoke damper used to prevent the spread of smoke.  Commonly operated by a smoke detector of a building automation system.
-/// USERDEFINED: User-defined damper.
-/// NOTDEFINED: Undefined damper.
+/// The space boundary is provided virtually, i.e. by a
+///   logical divider that has no physical manifestation.
 /// 
-/// HISTORY: New enumeration in IFC R2.0
-typedef enum {IfcDamperType_CONTROLDAMPER, IfcDamperType_FIREDAMPER, IfcDamperType_SMOKEDAMPER, IfcDamperType_FIRESMOKEDAMPER, IfcDamperType_BACKDRAFTDAMPER, IfcDamperType_RELIEFDAMPER, IfcDamperType_BLASTDAMPER, IfcDamperType_GRAVITYDAMPER, IfcDamperType_GRAVITYRELIEFDAMPER, IfcDamperType_BALANCINGDAMPER, IfcDamperType_FUMEHOODEXHAUST, IfcDamperType_USERDEFINED, IfcDamperType_NOTDEFINED} IfcDamperTypeEnum;
-const char* ToString(IfcDamperTypeEnum v);
-IfcDamperTypeEnum FromString(const std::string& s);
-}
-namespace IfcDataOriginEnum {
-/// IfcDataOriginEnum identifies the origin of time data:
+/// NOTDEFINED
 /// 
-/// MEASURED: The origin of the time data is a measurement device.
-///   PREDICTED: The time data are a prediction.
-///   SIMULATED: The origin of the time data is a simulation.
-///   NOTDEFINED: The origin of the time data is undefined.
+/// No information available.
 /// 
-/// HISTORY: New enumeration in IFC 2x2.
-typedef enum {IfcDataOrigin_MEASURED, IfcDataOrigin_PREDICTED, IfcDataOrigin_SIMULATED, IfcDataOrigin_USERDEFINED, IfcDataOrigin_NOTDEFINED} IfcDataOriginEnum;
-const char* ToString(IfcDataOriginEnum v);
-IfcDataOriginEnum FromString(const std::string& s);
+/// HISTORY: New enumeration in
+///   IFC Release 2.0
+typedef enum {IfcPhysicalOrVirtual_PHYSICAL, IfcPhysicalOrVirtual_VIRTUAL, IfcPhysicalOrVirtual_NOTDEFINED} IfcPhysicalOrVirtualEnum;
+const char* ToString(IfcPhysicalOrVirtualEnum v);
+IfcPhysicalOrVirtualEnum FromString(const std::string& s);
 }
-namespace IfcDerivedUnitEnum {
-/// IfcDerivedUnitEnum is an enumeration type for allowed types of derived units.
-/// ENUMERATION 
+namespace IfcPileConstructionEnum {
+/// Definition from IAI: Enumeration defining the construction type
+///   for piles. The type is mainly based on how the piles are used and manufactured.
+///   Some material information is mixed in because this affects the way the piles
+///   are used.  
 /// 
-/// ACCELERATIONUNIT 
-///   ANGULARVELOCITYUNIT 
-///   COMPOUNDPLANEANGLEUNIT 
-///   DYNAMICVISCOSITYUNIT 
-///   HEATFLUXDENSITYUNIT 
-///   INTEGERCOUNTRATEUNIT 
-///   ISOTHERMALMOISTURECAPACITYUNIT 
-///   KINEMATICVISCOSITYUNIT 
-///   LINEARFORCEUNIT 
-///   LINEARMOMENTUNIT 
-///   LINEARSTIFFNESSUNIT 
-///   LINEARVELOCITYUNIT 
-///   MASSDENSITYUNIT 
-///   MASSFLOWRATEUNIT 
-///   MODULUSOFELASTICITYUNIT 
-///   MODULUSOFSUBGRADEREACTIONUNIT 
-///   MOISTUREDIFFUSIVITYUNIT 
-///   MOLECULARWEIGHTUNIT 
-///   MOMENTORINERTIAUNIT 
-///   PLANARFORCEUNIT 
-///   ROTATIONALFREQUENCYUNIT 
-///   ROTATIONALSTIFFNESSUNIT 
-///   SHEARMODULUSUNIT 
-///   SPECIFICHEATCAPACITYUNIT 
-///   THERMALADMITTANCEUNIT 
-///   THERMALCONDUCTANCEUNIT 
-///   THERMALRESISTANCEUNIT 
-///   THERMALTRANSMITTANCEUNIT 
-///   TORQUEUNIT 
-///   VAPORPERMEABILITYUNIT 
-///   VOLUMETRICFLOWRATEUNIT 
-///   CURVATUREUNIT 
-///   HEATINGVALUEUNIT 
-///   IONCONCENTRATIONUNIT 
-///   LUMINOUSINTENSITYDISTRIBUTIONUNIT 
-///   MASSPERLENGTHUNIT 
-///   MODULUSOFLINEARSUBGRADEREACTIONUNIT 
-///   MODULUSOFROTATIONALSUBGRADEREACTIONUNIT 
-///   PHUNIT 
-///   ROTATIONALMASSUNIT 
-///   SECTIONAREAINTEGRALUNIT 
-///   SECTIONMODULUSUNIT 
-///   SOUNDPOWERUNIT 
-///   SOUNDPRESSUREUNIT 
-///   TEMPERATUREGRADIENTUNIT 
-///   TEMPERATURERATEOFCHANGE 
-///   THERMALEXPANSIONCOEFFICIENTUNIT 
-///   WARPINGCONSTANTUNIT 
-///   WARPINGMOMENTUNIT 
-///   USERDEFINED: User defined derived unit. 
+/// HISTORY New type in IFC Release 2x2
 /// 
-/// HISTORY: New type in IFC Release 2.0.
+/// ENUMERATION 
 /// 
-/// IFC 2x4 change: added TEMPERATURERATEOFCHANGE.
-typedef enum {IfcDerivedUnit_ANGULARVELOCITYUNIT, IfcDerivedUnit_COMPOUNDPLANEANGLEUNIT, IfcDerivedUnit_DYNAMICVISCOSITYUNIT, IfcDerivedUnit_HEATFLUXDENSITYUNIT, IfcDerivedUnit_INTEGERCOUNTRATEUNIT, IfcDerivedUnit_ISOTHERMALMOISTURECAPACITYUNIT, IfcDerivedUnit_KINEMATICVISCOSITYUNIT, IfcDerivedUnit_LINEARVELOCITYUNIT, IfcDerivedUnit_MASSDENSITYUNIT, IfcDerivedUnit_MASSFLOWRATEUNIT, IfcDerivedUnit_MOISTUREDIFFUSIVITYUNIT, IfcDerivedUnit_MOLECULARWEIGHTUNIT, IfcDerivedUnit_SPECIFICHEATCAPACITYUNIT, IfcDerivedUnit_THERMALADMITTANCEUNIT, IfcDerivedUnit_THERMALCONDUCTANCEUNIT, IfcDerivedUnit_THERMALRESISTANCEUNIT, IfcDerivedUnit_THERMALTRANSMITTANCEUNIT, IfcDerivedUnit_VAPORPERMEABILITYUNIT, IfcDerivedUnit_VOLUMETRICFLOWRATEUNIT, IfcDerivedUnit_ROTATIONALFREQUENCYUNIT, IfcDerivedUnit_TORQUEUNIT, IfcDerivedUnit_MOMENTOFINERTIAUNIT, IfcDerivedUnit_LINEARMOMENTUNIT, IfcDerivedUnit_LINEARFORCEUNIT, IfcDerivedUnit_PLANARFORCEUNIT, IfcDerivedUnit_MODULUSOFELASTICITYUNIT, IfcDerivedUnit_SHEARMODULUSUNIT, IfcDerivedUnit_LINEARSTIFFNESSUNIT, IfcDerivedUnit_ROTATIONALSTIFFNESSUNIT, IfcDerivedUnit_MODULUSOFSUBGRADEREACTIONUNIT, IfcDerivedUnit_ACCELERATIONUNIT, IfcDerivedUnit_CURVATUREUNIT, IfcDerivedUnit_HEATINGVALUEUNIT, IfcDerivedUnit_IONCONCENTRATIONUNIT, IfcDerivedUnit_LUMINOUSINTENSITYDISTRIBUTIONUNIT, IfcDerivedUnit_MASSPERLENGTHUNIT, IfcDerivedUnit_MODULUSOFLINEARSUBGRADEREACTIONUNIT, IfcDerivedUnit_MODULUSOFROTATIONALSUBGRADEREACTIONUNIT, IfcDerivedUnit_PHUNIT, IfcDerivedUnit_ROTATIONALMASSUNIT, IfcDerivedUnit_SECTIONAREAINTEGRALUNIT, IfcDerivedUnit_SECTIONMODULUSUNIT, IfcDerivedUnit_SOUNDPOWERUNIT, IfcDerivedUnit_SOUNDPRESSUREUNIT, IfcDerivedUnit_TEMPERATUREGRADIENTUNIT, IfcDerivedUnit_THERMALEXPANSIONCOEFFICIENTUNIT, IfcDerivedUnit_WARPINGCONSTANTUNIT, IfcDerivedUnit_WARPINGMOMENTUNIT, IfcDerivedUnit_USERDEFINED} IfcDerivedUnitEnum;
-const char* ToString(IfcDerivedUnitEnum v);
-IfcDerivedUnitEnum FromString(const std::string& s);
-}
-namespace IfcDimensionExtentUsage {
-
-typedef enum {IfcDimensionExtentUsage_ORIGIN, IfcDimensionExtentUsage_TARGET} IfcDimensionExtentUsage;
-const char* ToString(IfcDimensionExtentUsage v);
-IfcDimensionExtentUsage FromString(const std::string& s);
+/// CAST_IN_PLACE Piles and piers that are excavated and poured in
+///   place. 
+///   COMPOSITE Piles that are a mix of components, such as a steel
+///   outer casing which is driven into the ground with a cast-in-place concrete
+///   core. 
+///   PRECAST_CONCRETE Piles that are entirely of precast concrete
+///   (possibly with some steel or other fixtures). 
+///   PREFAB_STEEL Prefabricated piles made entirely out of steel.
+///   It will also include steel sheet piles where these are not part of another
+///   construction element. 
+///   USERDEFINED Special types of pile construction which meet
+///   specific local requirements. 
+///   NOTDEFINED The type of pile construction is not defined.
+typedef enum {IfcPileConstruction_CAST_IN_PLACE, IfcPileConstruction_COMPOSITE, IfcPileConstruction_PRECAST_CONCRETE, IfcPileConstruction_PREFAB_STEEL, IfcPileConstruction_USERDEFINED, IfcPileConstruction_NOTDEFINED} IfcPileConstructionEnum;
+const char* ToString(IfcPileConstructionEnum v);
+IfcPileConstructionEnum FromString(const std::string& s);
 }
-namespace IfcDirectionSenseEnum {
-/// IfcDirectionSenseEnum is an enumeration denoting whether sense of direction is positive or negative along the given axis.
+namespace IfcPileTypeEnum {
+/// Definition from IAI: Enumeration defining the pile type. 
 /// 
-/// ENUMERATION
+/// HISTORY New type in IFC Release 2x2
+/// IFC 2x4 change:  Items BORED, DRIVEN, JETGROUTING added
 /// 
-/// POSITIVE: Direction defined to be positive.
-/// NEGATIVE: Direction defined to be negative.
+/// BORED A bore pile.
+///   DRIVEN A rammed, vibrated, or otherwise driven pile.
+///   JETGROUTING An injected pile-like construction.
+///   COHESION A cohesion pile.
+///   FRICTION A friction pile.
+///   SUPPORT A support pile.
+///   USERDEFINED The type of pile function is user defined.
+///   NOTDEFINED The type of pile function is not defined.
+typedef enum {IfcPileType_COHESION, IfcPileType_FRICTION, IfcPileType_SUPPORT, IfcPileType_USERDEFINED, IfcPileType_NOTDEFINED} IfcPileTypeEnum;
+const char* ToString(IfcPileTypeEnum v);
+IfcPileTypeEnum FromString(const std::string& s);
+}
+namespace IfcPipeFittingTypeEnum {
+/// This enumeration is used to identify the primary purpose of a pipe fitting. This is a very basic categorization mechanism
+///   to generically identify the pipe fitting type. Subcategories
+///   of pipe fittings are not enumerated. 
+///   The IfcpipeFittingTypeEnum contains the following:
 /// 
-/// HISTORY New Type in IFC2x.
-typedef enum {IfcDirectionSense_POSITIVE, IfcDirectionSense_NEGATIVE} IfcDirectionSenseEnum;
-const char* ToString(IfcDirectionSenseEnum v);
-IfcDirectionSenseEnum FromString(const std::string& s);
+/// BEND:		A fitting with typically two ports used to change 
+///   the direction of flow between connected elements.
+///   CONNECTOR:   Connector fitting, typically used to join two
+///   ports together within a flow distribution system 
+///   (e.g., a coupling used to join two pipe segments).
+///   ENTRY:       Entry fitting, typically unconnected at one port
+///   and connected to a flow distribution system at 
+///   the other (e.g., a breeching inlet).
+///   EXIT:        Exit fitting, typically unconnected at one port
+///   and connected to a flow distribution system at 
+///   the other (e.g., a hose bibb).
+///   JUNCTION:	A fitting with typically more than two ports used
+///   to redistribute flow among the ports and/or to
+///   change the direction of flow between connected
+///   elements (e.g, tee, cross, wye, etc.).
+///   OBSTRUCTION: A fitting with typically two ports used to 
+///   obstruct or restrict flow between the connected
+///   elements (e.g., screen, perforated plate, etc.).
+///   TRANSITION:	A fitting with typically two ports having
+///   different shapes or sizes. Can also be used to
+///   change the direction of flow between connected
+///   elements.
+///   USERDEFINED: User-defined fitting.
+///   NOTDEFINED:  Undefined fitting.
+/// 
+/// HISTORY: New enumeration in IFC 2x2
+typedef enum {IfcPipeFittingType_BEND, IfcPipeFittingType_CONNECTOR, IfcPipeFittingType_ENTRY, IfcPipeFittingType_EXIT, IfcPipeFittingType_JUNCTION, IfcPipeFittingType_OBSTRUCTION, IfcPipeFittingType_TRANSITION, IfcPipeFittingType_USERDEFINED, IfcPipeFittingType_NOTDEFINED} IfcPipeFittingTypeEnum;
+const char* ToString(IfcPipeFittingTypeEnum v);
+IfcPipeFittingTypeEnum FromString(const std::string& s);
 }
-namespace IfcDistributionChamberElementTypeEnum {
-/// This enumeration identifies different types of distribution chambers.
+namespace IfcPipeSegmentTypeEnum {
+/// This enumeration is used to identify the primary purpose of a
+///   pipe segment. This is a very basic categorization mechanism
+///   to generically identify the pipe segment type. Subcategories
+///   of pipe segments are not enumerated. 
+///   The IfcPipeSegmentTypeEnum contains the following:
 /// 
-/// Valid enumerations are:
+/// CULVERT: A covered channel or large pipe that forms a watercourse below ground level, usually under a road or railway.
+///   RIGIDSEGMENT: A rigid segment is continuous linear segment of pipe that cannot be deformed.
+///   FLEXIBLESEGMENT:  A flexible segment is a continuous non-linear segment of pipe that can be deformed and change the direction of flow.
+///   GUTTER: A gutter segment is a continuous open-channel segment of pipe.
+///   SPOOL: A type of rigid segment that is typically shorter and used for providing connectivity within a piping network.
+///   USERDEFINED: User-defined segment.
+///   NOTDEFINED:  Undefined segment.
 /// 
-/// FORMEDDUCT: Space formed in the ground for the passage of pipes, cables, ducts.
-/// INSPECTIONCHAMBER: Chamber constructed on a drain, sewer or pipeline with a removable cover that permits visble inspection.
-/// INSPECTIONPIT:  Recess or chamber formed to permit access for inspection of substructure and services.
-/// MANHOLE: Chamber constructed on a drain, sewer or pipeline with a removable cover that permits the entry of a person.
-/// METERCHAMBER: Chamber that houses a meter(s).
-/// SUMP: Recessed or small chamber into which liquid is drained to facilitate its collection for removal.
-/// TRENCH: Excavated chamber, the length of which typically exceeds the width.
-/// VALVECHAMBER: Chamber that houses a valve(s).
-/// USERDEFINED: User-defined chamber type.
-/// NOTDEFINED: Undefined chamber type.
+/// HISTORY: New enumeration in IFC 2x2
+typedef enum {IfcPipeSegmentType_FLEXIBLESEGMENT, IfcPipeSegmentType_RIGIDSEGMENT, IfcPipeSegmentType_GUTTER, IfcPipeSegmentType_SPOOL, IfcPipeSegmentType_USERDEFINED, IfcPipeSegmentType_NOTDEFINED} IfcPipeSegmentTypeEnum;
+const char* ToString(IfcPipeSegmentTypeEnum v);
+IfcPipeSegmentTypeEnum FromString(const std::string& s);
+}
+namespace IfcPlateTypeEnum {
+/// Definition from IAI: This enumeration
+/// defines the different types of planar elements an IfcPlateType
+/// object can fulfill:
 /// 
-/// HISTORY: New enumeration in IFC R2x2
-typedef enum {IfcDistributionChamberElementType_FORMEDDUCT, IfcDistributionChamberElementType_INSPECTIONCHAMBER, IfcDistributionChamberElementType_INSPECTIONPIT, IfcDistributionChamberElementType_MANHOLE, IfcDistributionChamberElementType_METERCHAMBER, IfcDistributionChamberElementType_SUMP, IfcDistributionChamberElementType_TRENCH, IfcDistributionChamberElementType_VALVECHAMBER, IfcDistributionChamberElementType_USERDEFINED, IfcDistributionChamberElementType_NOTDEFINED} IfcDistributionChamberElementTypeEnum;
-const char* ToString(IfcDistributionChamberElementTypeEnum v);
-IfcDistributionChamberElementTypeEnum FromString(const std::string& s);
+/// CURTAIN_PANEL: A planar element within a
+/// curtain wall, often consisting of a frame with fixed glazing.
+///   SHEET: A planar, flat and thin element,
+/// comes usually as metal sheet, and is often used as an additonal part
+/// within an assembly.
+///   USERDEFINED: User-defined linear element.
+///   NOTDEFINED: Undefined linear element
+/// 
+/// HISTORY  New Enumeration in Release IFC2x Edition 2. 
+/// IFC2x
+/// Edition 3
+/// CHANGE  The additional identifiers CURTAIN_PANEL, SHEET have
+/// been
+/// added.
+typedef enum {IfcPlateType_CURTAIN_PANEL, IfcPlateType_SHEET, IfcPlateType_USERDEFINED, IfcPlateType_NOTDEFINED} IfcPlateTypeEnum;
+const char* ToString(IfcPlateTypeEnum v);
+IfcPlateTypeEnum FromString(const std::string& s);
 }
-namespace IfcDocumentConfidentialityEnum {
-/// IfcDocumentConfidentialityEnum enables selection of the level of confidentiality of document information from a list of choices. 
+namespace IfcProcedureTypeEnum {
+/// The IfcProcedureTypeEnum defines the range of different types of procedure that can be specified.
 /// 
-/// HISTORY: New enumeration in IFC 2x
+/// HISTORY: New type in IFC2x2
 /// 
-/// Enumeration 
+/// Enumeration:
 /// 
-/// PUBLIC: Document is publicly available. 
-/// RESTRICTED: Document availability is restricted. 
-/// CONFIDENTIAL: Document is confidential and its contents should not be revealed without permission. 
-/// PERSONAL: Document is personal to the author. 
-/// USERDEFINED 
+/// ADVICE_CAUTION: A caution that should be taken note of as a procedure or when carrying out a procedure
+/// ADVICE_NOTE: Additional information or advice that should be taken note of as a procedure or when carrying out a procedure
+/// ADVICE_WARNING: A warning of potential danger that should be taken note of as a procedure or when carrying out a procedure
+/// CALIBRATION: A procedure undertaken to calibrate an artifact
+/// SHUTDOWN: A procedure undertaken to shutdown the operation an artifact
+/// STARTUP: A procedure undertaken to start up the operation an artifact
+/// USERDEFINED
 /// NOTDEFINED
-typedef enum {IfcDocumentConfidentiality_PUBLIC, IfcDocumentConfidentiality_RESTRICTED, IfcDocumentConfidentiality_CONFIDENTIAL, IfcDocumentConfidentiality_PERSONAL, IfcDocumentConfidentiality_USERDEFINED, IfcDocumentConfidentiality_NOTDEFINED} IfcDocumentConfidentialityEnum;
-const char* ToString(IfcDocumentConfidentialityEnum v);
-IfcDocumentConfidentialityEnum FromString(const std::string& s);
+typedef enum {IfcProcedureType_ADVICE_CAUTION, IfcProcedureType_ADVICE_NOTE, IfcProcedureType_ADVICE_WARNING, IfcProcedureType_CALIBRATION, IfcProcedureType_DIAGNOSTIC, IfcProcedureType_SHUTDOWN, IfcProcedureType_STARTUP, IfcProcedureType_USERDEFINED, IfcProcedureType_NOTDEFINED} IfcProcedureTypeEnum;
+const char* ToString(IfcProcedureTypeEnum v);
+IfcProcedureTypeEnum FromString(const std::string& s);
 }
-namespace IfcDocumentStatusEnum {
-/// IfcDocumentStatusEnum enables selection of the status of document information from a list of choices.
+namespace IfcProfileTypeEnum {
+/// The enumeration defines whether the definition of a profile shape shall be geometrically resolved into a curve or into a surface.
 /// 
-/// HISTORY: New enumeration in IFC Release 2x.
-typedef enum {IfcDocumentStatus_DRAFT, IfcDocumentStatus_FINALDRAFT, IfcDocumentStatus_FINAL, IfcDocumentStatus_REVISION, IfcDocumentStatus_NOTDEFINED} IfcDocumentStatusEnum;
-const char* ToString(IfcDocumentStatusEnum v);
-IfcDocumentStatusEnum FromString(const std::string& s);
-}
-namespace IfcDoorPanelOperationEnum {
-/// This enumeration defines the basic ways how individual door panels operate as shown in Figure 164.
-/// HISTORY New Enumeration in IFC Release 2.0.
-/// IFC2x4 CHANGE Enumerator FIXEDPANELadded.
+/// HISTORY: New type in IFC 1.5.
 /// 
-/// Swinging
+/// Enumeration values:
 /// 
-/// DoubleActing
+/// CURVE: The resulting geometric item is of type curve and closed (with the only exception of the curve created by the IfcArbitraryOpenProfileDef which resolves into an open curve). The resulting geometry after applying a sweeping operation is a swept surface. This can be used to define shapes with thin sheets, such as ducts, where the thickness is not appropriate for geometric representation.
+/// AREA: The resulting geometric item is of type surface. The resulting geometry after applying a sweeping operation is a swept solid with defined volume.
+typedef enum {IfcProfileType_CURVE, IfcProfileType_AREA} IfcProfileTypeEnum;
+const char* ToString(IfcProfileTypeEnum v);
+IfcProfileTypeEnum FromString(const std::string& s);
+}
+namespace IfcProjectOrderRecordTypeEnum {
+
+typedef enum {IfcProjectOrderRecordType_CHANGE, IfcProjectOrderRecordType_MAINTENANCE, IfcProjectOrderRecordType_MOVE, IfcProjectOrderRecordType_PURCHASE, IfcProjectOrderRecordType_WORK, IfcProjectOrderRecordType_USERDEFINED, IfcProjectOrderRecordType_NOTDEFINED} IfcProjectOrderRecordTypeEnum;
+const char* ToString(IfcProjectOrderRecordTypeEnum v);
+IfcProjectOrderRecordTypeEnum FromString(const std::string& s);
+}
+namespace IfcProjectOrderTypeEnum {
+/// An IfcProjectOrderTypeEnum is a list of the types of project order that may be identified. 
+///   HISTORY: New type in IFC 2x2  
+///   Enumeration 
 /// 
-/// Sliding
+/// CHANGEORDER: An instruction to make a change to a product or work being undertaken and a description of the work that is to be performed. 
+/// MAINTENANCEWORKORDER: An instruction to carry out maintenance work and a description of the work that is to be performed. 
+/// MOVEORDER: An instruction to move persons and artefacts and a description of the move locations, objects to be moved, etc.  
+/// PURCHASEORDER: An instruction to purchase goods and/or services and a description of the goods and/or services to be purchased that is to be performed. 
+/// WORKORDER: A general instruction to carry out work and a description of the work to be done. Note the difference between a work order generally and a maintenance work order. 
+/// USERDEFINED: User-defined type. 
+/// NOTDEFINED: Undefined type.
+typedef enum {IfcProjectOrderType_CHANGEORDER, IfcProjectOrderType_MAINTENANCEWORKORDER, IfcProjectOrderType_MOVEORDER, IfcProjectOrderType_PURCHASEORDER, IfcProjectOrderType_WORKORDER, IfcProjectOrderType_USERDEFINED, IfcProjectOrderType_NOTDEFINED} IfcProjectOrderTypeEnum;
+const char* ToString(IfcProjectOrderTypeEnum v);
+IfcProjectOrderTypeEnum FromString(const std::string& s);
+}
+namespace IfcProjectedOrTrueLengthEnum {
+/// This enumeration type is needed for load definition and is only considered if the load values are given as global actions and if they define linear or planar loads (that is, one- or two-dimensionally distributed loads).
+/// Figure 234 illustrates the interpretation of a load definition depending on the enumeration types IfcGlobalOrLocalEnum and IfcProjectedOrTrueLengthEnum.
 /// 
-/// Folding
+/// HISTORY  New type in IFC2x2. 
 /// 
-/// Revolving
+/// Figure 234 — Projected or true length
+typedef enum {IfcProjectedOrTrueLength_PROJECTED_LENGTH, IfcProjectedOrTrueLength_TRUE_LENGTH} IfcProjectedOrTrueLengthEnum;
+const char* ToString(IfcProjectedOrTrueLengthEnum v);
+IfcProjectedOrTrueLengthEnum FromString(const std::string& s);
+}
+namespace IfcPropertySourceEnum {
+
+typedef enum {IfcPropertySource_DESIGN, IfcPropertySource_DESIGNMAXIMUM, IfcPropertySource_DESIGNMINIMUM, IfcPropertySource_SIMULATED, IfcPropertySource_ASBUILT, IfcPropertySource_COMMISSIONING, IfcPropertySource_MEASURED, IfcPropertySource_USERDEFINED, IfcPropertySource_NOTKNOWN} IfcPropertySourceEnum;
+const char* ToString(IfcPropertySourceEnum v);
+IfcPropertySourceEnum FromString(const std::string& s);
+}
+namespace IfcProtectiveDeviceTypeEnum {
+/// The IfcProtectiveDeviceTypeEnum specifically defines the range of different breaker unit types that can be used in conjunction with protective device. Types may also be used as a reference to a complete protective device in circumstances where tripping units are not separately identified (typically expected to be the case during earlier stages of design). 
 /// 
-/// Rollingup
+/// HISTORY: New type in IFC 2x2. Modified definition and usage in IFC 2x4 
 /// 
-/// FixedPanel
+/// Enumeration
 /// 
-/// NOTE Enumerator added in IFC2x4.
+/// FUSEDISCONNECTOR: A device that will electrically open the circuit after a period of prolonged, abnormal current flow.
+/// CIRCUITBREAKER: A mechanical switching device capable of making, carrying, and breaking currents under normal circuit conditions and also making, carrying for a specified time and breaking, current under specified abnormal circuit conditions such as those of short circuit.
+/// EARTHINGSWITCH: A safety device used to open or close a circuit when there is no current. Used to isolate a part of a circuit, a machine, a part of an overhead line or an underground line so that maintenance can be safely conducted.
+/// EARTHLEAKAGECIRCUITBREAKER: A device that opens, closes, or isolates a circuit and has short circuit protection but no overload protection.  It attempts to break the circuit when there is a leakage of current from phase to earth, by measuring voltage on the earth conductor.
+/// RESIDUALCURRENTCIRCUITBREAKER: A device that opens, closes, or isolates a circuit and has short circuit and overload protection.  It attempts to break the circuit when there is a difference in current between any two phases.  May also be referred to as 'Ground Fault Interupter (GFI)' or 'Ground Fault Circuit Interuptor (GFCI)'
+/// RESIDUALCURRENTSWITCH: A device that opens, closes or isolates a circuit and has no short circuit or overload protection.  May also be identified as a 'ground fault switch'.
+/// VARISTOR: A high voltage surge protection device.
+/// USERDEFINED: User-defined type.
+/// NOTDEFINED: Undefined type.
+typedef enum {IfcProtectiveDeviceType_FUSEDISCONNECTOR, IfcProtectiveDeviceType_CIRCUITBREAKER, IfcProtectiveDeviceType_EARTHFAILUREDEVICE, IfcProtectiveDeviceType_RESIDUALCURRENTCIRCUITBREAKER, IfcProtectiveDeviceType_RESIDUALCURRENTSWITCH, IfcProtectiveDeviceType_VARISTOR, IfcProtectiveDeviceType_USERDEFINED, IfcProtectiveDeviceType_NOTDEFINED} IfcProtectiveDeviceTypeEnum;
+const char* ToString(IfcProtectiveDeviceTypeEnum v);
+IfcProtectiveDeviceTypeEnum FromString(const std::string& s);
+}
+namespace IfcPumpTypeEnum {
+/// Defines general types of pumps.
 /// 
-/// UserDefined
-///  
+/// The IfcPumpTypeEnum contains the following:
 /// 
-/// NotDefined
-///  
+/// CIRCULATOR: A Circulator pump is a generic low-pressure, low-capacity pump. It may have a wet rotor and
+///   may be driven by a flexible-coupled motor.
 /// 
-/// Figure 164 — Door operations
+/// ENDSUCTION: An End Suction pump, when mounted horizontally, has a single horizontal inlet on the impeller suction side
+///   and a vertical discharge. It may have a direct or close-coupled motor.
 /// 
-/// The opening direction of the door panels is given by the local
-/// placement of the IfcDoor. The positive y-axis determines
-/// the direction as shown in Figure 165.
+/// SPLITCASE: A Split Case pump, when mounted horizontally, has an inlet and outlet on each side of the impeller.
+///   The impeller can be easily accessed by removing the front of the impeller casing. It may have a direct or close-coupled motor.
 /// 
-/// Figure 165 — Door panel operations
+/// SUBMERSIBLEPUMP: A pump designed to be immersed in a fluid, typically a collection tank.
 /// 
-/// NOTE  Figures (symbolic representation) depend on the national building code.  These figures are only shown as illustrations
-typedef enum {IfcDoorPanelOperation_SWINGING, IfcDoorPanelOperation_DOUBLE_ACTING, IfcDoorPanelOperation_SLIDING, IfcDoorPanelOperation_FOLDING, IfcDoorPanelOperation_REVOLVING, IfcDoorPanelOperation_ROLLINGUP, IfcDoorPanelOperation_USERDEFINED, IfcDoorPanelOperation_NOTDEFINED} IfcDoorPanelOperationEnum;
-const char* ToString(IfcDoorPanelOperationEnum v);
-IfcDoorPanelOperationEnum FromString(const std::string& s);
-}
-namespace IfcDoorPanelPositionEnum {
-/// Definition: This enumeration defines the basic ways to describe the location of a door panel within a door lining.
+/// SUMPPUMP: A pump designed to sit above a collection tank with a suction inlet extending into the tank.
 /// 
-/// HISTORY New Enumeration in IFC Release 2.x
+/// VERTICALINLINE: A Vertical Inline pump has the pump and motor close-coupled on the pump casing.
+///   The pump depends on the connected, horizontal piping for support, with the suction and discharge along the piping axis.
 /// 
-/// Figure 166 shows the designation of a door panel with PanelPosition = LEFT and a door panel with PanelPosition = RIGHT within a door style with OperationType = DOUBLE_DOOR_SINGLE_SWING. The position is given as shown in the XZ plane of the local placement, looking into the direction of the positive Y axis. 
+/// VERTICALTURBINE: A Vertical Turbine pump has a motor mounted vertically on the pump casing for either
+///   wet-pit sump mounting or dry-well mounting.
 /// 
-/// Figure 166 — Door panel positions
-typedef enum {IfcDoorPanelPosition_LEFT, IfcDoorPanelPosition_MIDDLE, IfcDoorPanelPosition_RIGHT, IfcDoorPanelPosition_NOTDEFINED} IfcDoorPanelPositionEnum;
-const char* ToString(IfcDoorPanelPositionEnum v);
-IfcDoorPanelPositionEnum FromString(const std::string& s);
+/// USERDEFINED: User-defined pump type.
+/// 
+/// NOTDEFINED:  Pump type has not been defined.
+/// 
+/// HISTORY: New enumeration in IFC R2x.  SUBMERSIBLEPUMP and SUMPPUMP added in IFC2x4.
+typedef enum {IfcPumpType_CIRCULATOR, IfcPumpType_ENDSUCTION, IfcPumpType_SPLITCASE, IfcPumpType_VERTICALINLINE, IfcPumpType_VERTICALTURBINE, IfcPumpType_USERDEFINED, IfcPumpType_NOTDEFINED} IfcPumpTypeEnum;
+const char* ToString(IfcPumpTypeEnum v);
+IfcPumpTypeEnum FromString(const std::string& s);
 }
-namespace IfcDoorStyleConstructionEnum {
-/// Definition from IAI: This enumeration defines the
-///   basic types of construction of doors. The construction type
-///   relates to the main material (or material combination) used
-///   for making the door.
+namespace IfcRailingTypeEnum {
+/// Definition from IAI: Enumeration defining the valid types of
+///   railings that can be predefined using the enumeration values.  
+///   HISTORY: New Enumeration in IFC
+///   Release 2.0  
+///   Enumeration 
 /// 
-/// HISTORY New Enumeration in
-///   IFC Release 2x .
-typedef enum {IfcDoorStyleConstruction_ALUMINIUM, IfcDoorStyleConstruction_HIGH_GRADE_STEEL, IfcDoorStyleConstruction_STEEL, IfcDoorStyleConstruction_WOOD, IfcDoorStyleConstruction_ALUMINIUM_WOOD, IfcDoorStyleConstruction_ALUMINIUM_PLASTIC, IfcDoorStyleConstruction_PLASTIC, IfcDoorStyleConstruction_USERDEFINED, IfcDoorStyleConstruction_NOTDEFINED} IfcDoorStyleConstructionEnum;
-const char* ToString(IfcDoorStyleConstructionEnum v);
-IfcDoorStyleConstructionEnum FromString(const std::string& s);
+/// HANDRAIL: A type of railing designed to serve as an optional
+///   structural support for loads applied by human occupants (at hand height).
+///   Generally located adjacent to ramps and stairs. Generally floor or wall
+///   mounted. 
+///   GUARDRAIL: A type of railing designed to guard human occupants
+///   from falling off a stair, ramp or landing where there is a vertical drop at the
+///   edge of such floors/landings. 
+///   BALUSTRADE: Similar to the definitions of a guardrail except
+///   the location is at the edge of a floor, rather then a stair or ramp. Examples
+///   are balustrates at roof-tops or balconies. 
+///   USERDEFINED: User-defined railing element, a term to identify
+///   the user type is given by the attribute IfcRailing.ObjectType. 
+///   NOTDEFINED: Undefined railing element, no type information
+///   available.
+typedef enum {IfcRailingType_HANDRAIL, IfcRailingType_GUARDRAIL, IfcRailingType_BALUSTRADE, IfcRailingType_USERDEFINED, IfcRailingType_NOTDEFINED} IfcRailingTypeEnum;
+const char* ToString(IfcRailingTypeEnum v);
+IfcRailingTypeEnum FromString(const std::string& s);
 }
-namespace IfcDoorStyleOperationEnum {
-/// This enumeration defines the basic ways to describe how doors operate as shown in Figure 167.
-/// HISTORY  New Enumeration in Release IFC2x.
+namespace IfcRampFlightTypeEnum {
+/// Definition from IAI: This enumeration defines the different types
+///   of linear elements an IfcRampFlightType object can fulfill: 
 /// 
-/// Enumerator
-///   Description
-///   Figure
+/// STRAIGHT: A ramp flight with a straight walking line.  
+///   SPIRAL: A ramp flight with a circular or elliptic walking
+///   line. 
+///   USERDEFINED: User-defined ramp flight. 
+///   NOTDEFINED: Undefined ramp flight. 
 /// 
-/// SINGLE_SWING_LEFT
+/// HISTORY: New Enumeration in
+///   Release IFC2x Edition 2.
+typedef enum {IfcRampFlightType_STRAIGHT, IfcRampFlightType_SPIRAL, IfcRampFlightType_USERDEFINED, IfcRampFlightType_NOTDEFINED} IfcRampFlightTypeEnum;
+const char* ToString(IfcRampFlightTypeEnum v);
+IfcRampFlightTypeEnum FromString(const std::string& s);
+}
+namespace IfcRampTypeEnum {
+/// This enumeration defines the basic configuration of the ramp type in terms of the number and shape of ramp flights, as shown in Figure 67. The type also distinguished turns by landings. In addition the subdivision of the straight and changing direction ramps is included. The ramp configurations are given for ramps without and with one and two landings. 
 /// 
-/// Door with one
-/// panel that opens (swings) to the
-/// left. The hinges are on the left side as viewed in the direction of the
-/// positive y-axis.
-///   Note: Direction of swing (whether
-/// in or out)
-/// is determined at the IfcDoor.
+/// Ramps which are subdivided into more than two landings have to be defined by the geometry only. Also ramps with non-regular shapes have to be defined by the geometry only. The type of such ramps is USERDEFINED. 
 /// 
-/// SINGLE_SWING_RIGHT
+/// HISTORY New Enumeration in IFC Release 2.0. 
 /// 
-/// Door with one
-/// panel that opens (swings) to the
-/// right. The hinges are on the right side as viewed in the direction of
-/// the positive y-axis.
-///   Note: Direction of swing (whether
-/// in or out)
-/// is determined at the IfcDoor.
+/// Enumerator 
+///   Description 
+///   Figure 
 /// 
-/// DOUBLE_DOOR_
-/// SINGLE_SWING
+/// StraightRunRamp 
+///   A ramp - which is a sloping
+///   floor, walk, or roadway - connecting two levels. The straight ramp consists of
+///   one straight flight without turns or winders.  
 /// 
-/// Door with two
-/// panels, one opens (swings) to the
-/// left the other opens (swings) to the right.
-///   Note: Direction of swing (whether
-/// in or out)
-/// is determined at the IfcDoor. 
+/// TwoStraightRunRamp 
+///   A straight ramp consisting of
+///   two straight flights without turns but with one landing. 
 /// 
-/// DOUBLE_SWING_LEFT
+/// QuarterTurnRamp 
+///   A ramp making a 90° turn,
+///   consisting of two straight flights connected by a quarterspace landing. The
+///   direction of the turn is determined by the walking line. 
 /// 
-/// Door with one
-/// panel that swings in both
-/// directions and to the left in the main trafic direction. Also called
-/// double acting door.
-///   Note: Direction of main swing
-/// (whether in or
-/// out) is determined at the IfcDoor. 
+/// TwoQuarterTurnRamp 
+///   A ramp making a 180°
+///   turn, consisting of three straight flights connected by two quarterspace
+///   landings. The direction of the turn is determined by the walking line. 
 /// 
-/// DOUBLE_SWING_RIGHT
+/// HalfTurnRamp 
+///   A ramp making a 180°
+///   turn, consisting of two straight flights connected by a halfspace landing. The
+///   orientation of the turn is determined by the walking line. 
 /// 
-/// Door with one
-/// panel that swings in both
-/// directions and to the right in the main trafic direction. Also called
-/// double acting door.
-///   Note: Direction of main swing
-/// (whether in or
-/// out) is determined at the IfcDoor.
+/// SpiralRamp 
+///   A ramp constructed around a
+///   circular or elliptical well without newels and landings. 
 /// 
-/// DOUBLE_DOOR_
-/// DOUBLE_SWING
+/// UserDefined 
+///   Free form ramp (user defined
+///   operation type) 
+///     
 /// 
-/// Door with two
-/// panels, one swings in both
-/// directions and to the right in the main trafic direction the other
-/// swings also in both directions and to the left in the main trafic
-/// direction.
-///   Note: Direction of main swing
-/// (whether in or
-/// out) is determined at the IfcDoor.
+/// NotDefined 
+///     
+///     
 /// 
-/// DOUBLE_DOOR_
-/// SINGLE_SWING_
-/// OPPOSITE_LEFT
+/// Figure 67 — Ramp types
+typedef enum {IfcRampType_STRAIGHT_RUN_RAMP, IfcRampType_TWO_STRAIGHT_RUN_RAMP, IfcRampType_QUARTER_TURN_RAMP, IfcRampType_TWO_QUARTER_TURN_RAMP, IfcRampType_HALF_TURN_RAMP, IfcRampType_SPIRAL_RAMP, IfcRampType_USERDEFINED, IfcRampType_NOTDEFINED} IfcRampTypeEnum;
+const char* ToString(IfcRampTypeEnum v);
+IfcRampTypeEnum FromString(const std::string& s);
+}
+namespace IfcReflectanceMethodEnum {
+/// The IfcReflectanceMethodEnum defines the range of different reflectance methods available. 
 /// 
-/// Door with two
-/// panels that both open to the left,
-/// one panel swings in one direction and the other panel swings in the
-/// opposite direction.
-///   Note: Direction of main swing
-/// (whether in or
-/// out) is determined at the IfcDoor.
+/// HISTORY: New type in IFC 2x2.
 /// 
-/// DOUBLE_DOOR_
-/// SINGLE_SWING_
-/// OPPOSITE_RIGHT
-///   Door with two
-/// panels that both open to the right,
-/// one panel swings in one direction and the other panel swings in the
-/// opposite direction.
-///   Note: Direction of main swing
-/// (whether in or
-/// out) is determined at the IfcDoor.
+/// Enumeration 
 /// 
-/// SLIDING_TO_LEFT
+/// BLINN: A reflectance model providing a smooth, slightly shiny appearance.
+/// FLAT: A reflectance model providing a constant colour. This model ignores the effect of all light sources. 
+/// GLASS: A reflectance model that supports an approximation of glass-like materials that have both reflective and transmissive properties. 
+/// MATT: A reflectance model providing a dull matte appearance. 
+/// METAL: A reflectance model providing a specular metallic appearance. 
+/// MIRROR: A reflectance model that supports secondary mirrored views through ray tracing. 
+/// PHONG: A reflectance model conforming with the Phong model in which reflections are greatest in the `mirror' direction of a surface opposite the viewing direction with respect to the surface normal. 
+/// PLASTIC: A reflectance model providing a specular effect which is similar to the Phong model. 
+/// STRAUSS: A reflectance model for metallic and non-metallic appearance based on a limited set of control parameter.
+/// NOTDEFINED
+typedef enum {IfcReflectanceMethod_BLINN, IfcReflectanceMethod_FLAT, IfcReflectanceMethod_GLASS, IfcReflectanceMethod_MATT, IfcReflectanceMethod_METAL, IfcReflectanceMethod_MIRROR, IfcReflectanceMethod_PHONG, IfcReflectanceMethod_PLASTIC, IfcReflectanceMethod_STRAUSS, IfcReflectanceMethod_NOTDEFINED} IfcReflectanceMethodEnum;
+const char* ToString(IfcReflectanceMethodEnum v);
+IfcReflectanceMethodEnum FromString(const std::string& s);
+}
+namespace IfcReinforcingBarRoleEnum {
+/// Definition from IAI: Enumeration defining standard types for the
+///   role, purpose or usage of the bar, i.e. the kind of loads and stresses they are
+///   intended to carry.  
 /// 
-/// Door with one
-/// panel that is sliding to the left. 
+/// HISTORY New type in IFC Release 2x2.
+///   Item ANCHORING (documented since IFC 2x2) added to the EXPRESS definition in IFC 2x4.
 /// 
-/// SLIDING_TO_RIGHT
+/// ENUMERATION 
 /// 
-/// Door with one
-/// panel that is sliding to the right. 
+/// MAIN The reinforcing bar is a main bar. 
+///   SHEAR The reinforcing bar is a shear bar. 
+///   LIGATURE The reinforcing bar is a ligature (link, stirrup). 
+///   STUD The reinforcing bar is a stud. 
+///   PUNCHING Punching reinforcement. 
+///   EDGE Edge reinforcement. 
+///   RING Ring reinforcement. 
+///   ANCHORING Anchoring reinforcement. 
+///   USERDEFINED The type of reinforcement is user defined. 
+///   NOTDEFINED The type of reinforcement is not defined.
+typedef enum {IfcReinforcingBarRole_MAIN, IfcReinforcingBarRole_SHEAR, IfcReinforcingBarRole_LIGATURE, IfcReinforcingBarRole_STUD, IfcReinforcingBarRole_PUNCHING, IfcReinforcingBarRole_EDGE, IfcReinforcingBarRole_RING, IfcReinforcingBarRole_USERDEFINED, IfcReinforcingBarRole_NOTDEFINED} IfcReinforcingBarRoleEnum;
+const char* ToString(IfcReinforcingBarRoleEnum v);
+IfcReinforcingBarRoleEnum FromString(const std::string& s);
+}
+namespace IfcReinforcingBarSurfaceEnum {
+/// Definition from IAI: Enumeration indicating whether the bar has a
+///   plain or textured (ribbed) surface.  
 /// 
-/// DOUBLE_DOOR_SLIDING
+/// HISTORY New type in IFC Release 2x2
 /// 
-/// Door with two
-/// panels, one is sliding to the left
-/// the other is sliding to the right. 
+/// ENUMERATION 
 /// 
-/// FOLDING_TO_LEFT
+/// PLAIN The reinforcing bar surface is plain. 
+///   TEXTURED The reinforcing bar surface is textured (ribbed).
+typedef enum {IfcReinforcingBarSurface_PLAIN, IfcReinforcingBarSurface_TEXTURED} IfcReinforcingBarSurfaceEnum;
+const char* ToString(IfcReinforcingBarSurfaceEnum v);
+IfcReinforcingBarSurfaceEnum FromString(const std::string& s);
+}
+namespace IfcResourceConsumptionEnum {
+/// The IfcResourceConsumptionEnum indicates how a construction resource is consumed during its use.  The IfcResourceConsumptionEnum contains the following:
 /// 
-/// Door with one
-/// panel that is folding to the left. 
+/// CONSUMED: Resource is production-based and is immediately consumed at the start of its usage.
+/// PARTIALLYCONSUMED: Resource is production-based and is consumed over its usage.
+/// NOTCONSUMED: Resource is production-based and is not consumed during its usage.
+/// OCCUPIED: Resource is duration-based and is immediately consumed at the start of its usage.
+/// PARTIALLYOCCUPIED: Resource is duration-based and is consumed over its usage.
+/// NOTOCCUPIED: Resource is duration-based and is not consumed during its usage.
+/// USERDEFINED: User-defined consumption; custom property sets must indicate usage.
+/// NOTDEFINED: Undefined consumption.
 /// 
-/// FOLDING_TO_RIGHT
-///   Door with one
-/// panel that is folding to the right. 
+/// HISTORY: New Enumeration in IFC Release 2.0.
+typedef enum {IfcResourceConsumption_CONSUMED, IfcResourceConsumption_PARTIALLYCONSUMED, IfcResourceConsumption_NOTCONSUMED, IfcResourceConsumption_OCCUPIED, IfcResourceConsumption_PARTIALLYOCCUPIED, IfcResourceConsumption_NOTOCCUPIED, IfcResourceConsumption_USERDEFINED, IfcResourceConsumption_NOTDEFINED} IfcResourceConsumptionEnum;
+const char* ToString(IfcResourceConsumptionEnum v);
+IfcResourceConsumptionEnum FromString(const std::string& s);
+}
+namespace IfcRibPlateDirectionEnum {
+
+typedef enum {IfcRibPlateDirection_DIRECTION_X, IfcRibPlateDirection_DIRECTION_Y} IfcRibPlateDirectionEnum;
+const char* ToString(IfcRibPlateDirectionEnum v);
+IfcRibPlateDirectionEnum FromString(const std::string& s);
+}
+namespace IfcRoleEnum {
+/// Definition: Roles which may be played by an actor.
 /// 
-/// DOUBLE_DOOR_FOLDING
+/// HISTORY This type has changes after IFC Release 2.0.  Spelling of COMMISSIONINGENGINEER fixed in IFC 2x4.
 /// 
-/// Door with two
-/// panels, one is folding to the left
-/// the other is folding to the right. 
+/// ENUMERATION 
 /// 
-/// REVOLVING
+/// SUPPLIER
+///   MANUFACTURER
+///   CONTRACTOR 
+///   SUBCONTRACTOR
+///   ARCHITECT
+///   STRUCTURALENGINEER
+///   COSTENGINEER 
+///   CLIENT
+///   BUILDINGOWNER
+///   BUILDINGOPERATOR
+///   MECHANICALENGINEER 
+///   ELECTRICALENGINEER
+///   PROJECTMANAGER
+///   FACILITIESMANAGER
+///   CIVILENGINEER
+///   COMMISSIONINGENGINEER 
+///   ENGINEER
+///   OWNER
+///   CONSULTANT
+///   CONSTRUCTIONMANAGER
+///   FIELDCONSTRUCTIONMANAGER 
+///   RESELLER
+///   USERDEFINED User defined value to be provided.
+typedef enum {IfcRole_SUPPLIER, IfcRole_MANUFACTURER, IfcRole_CONTRACTOR, IfcRole_SUBCONTRACTOR, IfcRole_ARCHITECT, IfcRole_STRUCTURALENGINEER, IfcRole_COSTENGINEER, IfcRole_CLIENT, IfcRole_BUILDINGOWNER, IfcRole_BUILDINGOPERATOR, IfcRole_MECHANICALENGINEER, IfcRole_ELECTRICALENGINEER, IfcRole_PROJECTMANAGER, IfcRole_FACILITIESMANAGER, IfcRole_CIVILENGINEER, IfcRole_COMISSIONINGENGINEER, IfcRole_ENGINEER, IfcRole_OWNER, IfcRole_CONSULTANT, IfcRole_CONSTRUCTIONMANAGER, IfcRole_FIELDCONSTRUCTIONMANAGER, IfcRole_RESELLER, IfcRole_USERDEFINED} IfcRoleEnum;
+const char* ToString(IfcRoleEnum v);
+IfcRoleEnum FromString(const std::string& s);
+}
+namespace IfcRoofTypeEnum {
+/// This enumeration defines the basic configuration of the roof in terms of the different roof shapes, as illustrated in Figure 68.
 /// 
-/// An entrance door
-/// consisting of four leaves set in
-/// a form of a cross and revolving around a central vertical axis (the
-/// four panels are described by a single IfcDoor panel
-/// property). 
+/// Roofs which are subdivided into more than these basic shapes have to be defined by the geometry only. Also roofs with non-regular shapes (free form roof) have to be defined by the geometry only. The type of such roofs is FREEFORM. 
 /// 
-/// ROLLINGUP
+/// HISTORY New Enumeration in IFC Release 2x. 
 /// 
-/// Door that opens
-/// by rolling up.
-///   Note: Whether it rolls up to the
-/// inside or
-/// outside is determined at the IfcDoor.
+/// Enumerator 
+///   Description 
+///   Figure 
 /// 
-/// USERDEFINED
-///   User defined
-/// operation type
-///    
+/// FLAT_ROOF 
+///   A roof having no slope, or
+///   one with only a slight pitch so as to drain rainwater. 
 /// 
-/// NOTDEFINED
-///   A door with a
-/// not defined operation type is
-/// considered as a door with a lining, but no panels. It is thereby always
-/// open.
-///    
+/// SHED_ROOF 
+///   A roof having a single
+///   slope. 
 /// 
-/// Figure 167 — Door style operations
+/// GABLE_ROOF 
+///   A roof sloping downward in
+///   two parts from a central ridge, so as to form a gable at each end. 
 /// 
-/// NOTE
+/// HIP_ROOF 
+///   A roof having sloping ends
+///   and sides meeting at an inclined projecting angle. 
 /// 
-/// Figures are shown in the ground view.
-///   Figures (symbolic representation) depend on the national
-/// building
-/// code.
-///   These figures are only shown as illustrations, the actual
-/// representation in the ground view might differ. 
-///   Open to the outside is declared as open into the direction
-/// of the
-/// positive y-axis, determined by the ObjectPlacement
-/// at IfcDoor
-///   The location of the panel relative to the wall thickness is
-/// defined by the ObjectPlacement at IfcDoor,
-/// and the IfcDoorLiningProperties.LiningOffset
-/// parameter.
-typedef enum {IfcDoorStyleOperation_SINGLE_SWING_LEFT, IfcDoorStyleOperation_SINGLE_SWING_RIGHT, IfcDoorStyleOperation_DOUBLE_DOOR_SINGLE_SWING, IfcDoorStyleOperation_DOUBLE_DOOR_SINGLE_SWING_OPPOSITE_LEFT, IfcDoorStyleOperation_DOUBLE_DOOR_SINGLE_SWING_OPPOSITE_RIGHT, IfcDoorStyleOperation_DOUBLE_SWING_LEFT, IfcDoorStyleOperation_DOUBLE_SWING_RIGHT, IfcDoorStyleOperation_DOUBLE_DOOR_DOUBLE_SWING, IfcDoorStyleOperation_SLIDING_TO_LEFT, IfcDoorStyleOperation_SLIDING_TO_RIGHT, IfcDoorStyleOperation_DOUBLE_DOOR_SLIDING, IfcDoorStyleOperation_FOLDING_TO_LEFT, IfcDoorStyleOperation_FOLDING_TO_RIGHT, IfcDoorStyleOperation_DOUBLE_DOOR_FOLDING, IfcDoorStyleOperation_REVOLVING, IfcDoorStyleOperation_ROLLINGUP, IfcDoorStyleOperation_USERDEFINED, IfcDoorStyleOperation_NOTDEFINED} IfcDoorStyleOperationEnum;
-const char* ToString(IfcDoorStyleOperationEnum v);
-IfcDoorStyleOperationEnum FromString(const std::string& s);
-}
-namespace IfcDuctFittingTypeEnum {
-/// This enumeration is used to identify the primary purpose of a duct fitting. This is a very basic categorization mechanism
-///   to generically identify the duct fitting type. Subcategories
-///   of duct fittings are not enumerated. 
-///   The IfcDuctFittingTypeEnum contains the following:
+/// HIPPED_GABLE_ROOF 
+///   A roof having a hipped end
+///   truncating a gable. 
 /// 
-/// BEND:		A fitting with typically two ports used to change 
-///   the direction of flow between connected elements.
-///   CONNECTOR:   Connector fitting, typically used to join two
-///   ports together within a flow distribution system 
-///   (e.g., a coupling used to join two duct segments).
-///   ENTRY:       Entry fitting, typically unconnected at one port
-///   and connected to a flow distribution system at 
-///   the other (e.g., an outside air duct system 
-///   intake opening).
-///   EXIT:        Exit fitting, typically unconnected at one port
-///   and connected to a flow distribution system at 
-///   the other (e.g., an exhaust air discharge 
-///   opening).
-///   JUNCTION:	A fitting with typically more than two ports used
-///   to redistribute flow among the ports and/or to
-///   change the direction of flow between connected
-///   elements (e.g, tee, cross, wye, etc.).
-///   OBSTRUCTION: A fitting with typically two ports used to 
-///   obstruct or restrict flow between the connected
-///   elements (e.g., screen, perforated plate, etc.).
-///   TRANSITION:	A fitting with typically two ports having
-///   different shapes or sizes. Can also be used to
-///   change the direction of flow between connected
-///   elements.
-///   USERDEFINED: User-defined fitting.
-///   NOTDEFINED:  Undefined fitting.
+/// GAMBREL_ROOF 
+///   A ridged roof divided on each
+///   side into a shallower slope above a steeper one. 
 /// 
-/// HISTORY: New enumeration in IFC 2x2
-typedef enum {IfcDuctFittingType_BEND, IfcDuctFittingType_CONNECTOR, IfcDuctFittingType_ENTRY, IfcDuctFittingType_EXIT, IfcDuctFittingType_JUNCTION, IfcDuctFittingType_OBSTRUCTION, IfcDuctFittingType_TRANSITION, IfcDuctFittingType_USERDEFINED, IfcDuctFittingType_NOTDEFINED} IfcDuctFittingTypeEnum;
-const char* ToString(IfcDuctFittingTypeEnum v);
-IfcDuctFittingTypeEnum FromString(const std::string& s);
-}
-namespace IfcDuctSegmentTypeEnum {
-/// This enumeration is used to identify the primary purpose of a
-///   duct segment. This is a very basic categorization mechanism
-///   to generically identify the duct segment type. Subcategories
-///   of duct segments are not enumerated. 
-///   The IfcDuctSegmentTypeEnum contains the following:
+/// MANSARD_ROOF 
+///   A roof having on each side a
+///   steeper lower part and a shallower upper part. 
 /// 
-/// RIGIDSEGMENT: A rigid segment is continuous linear segment of duct
-///   that cannot be deformed.
-///   FLEXIBLESEGMENT:  A flexible segment is a continuous non-linear segment
-///   of duct that can be deformed and change the direction 
-///   of flow.
-///   USERDEFINED: User-defined segment.
-///   NOTDEFINED:  Undefined segment.
+/// BARREL_ROOF 
+///   A roof or ceiling having a
+///   semicylindrical form. 
 /// 
-/// HISTORY: New enumeration in IFC 2x2
-typedef enum {IfcDuctSegmentType_RIGIDSEGMENT, IfcDuctSegmentType_FLEXIBLESEGMENT, IfcDuctSegmentType_USERDEFINED, IfcDuctSegmentType_NOTDEFINED} IfcDuctSegmentTypeEnum;
-const char* ToString(IfcDuctSegmentTypeEnum v);
-IfcDuctSegmentTypeEnum FromString(const std::string& s);
-}
-namespace IfcDuctSilencerTypeEnum {
-/// Enumeration defining the typical types of duct silencers. 
-///   The IfcDuctSilencerTypeEnum contains the following:
+/// RAINBOW_ROOF 
+///   A gable roof in the form of a
+///   broad Gothic arch, with gently sloping convex surfaces. 
 /// 
-/// FLATOVAL:  Flat-oval shaped duct silencer type.
-///   RECTANGULAR:  Rectangular shaped duct silencer type.
-///   ROUND:  Round duct silencer type.
-///   USERDEFINED:  User-defined duct silencer type.
-///   NOTDEFINED:  Undefined duct silencer type.
+/// BUTTERFLY_ROOF 
+///   A roof having two slopes,
+///   each descending inward from the eaves. 
 /// 
-/// HISTORY: New enumeration in IFC 2x2.
-typedef enum {IfcDuctSilencerType_FLATOVAL, IfcDuctSilencerType_RECTANGULAR, IfcDuctSilencerType_ROUND, IfcDuctSilencerType_USERDEFINED, IfcDuctSilencerType_NOTDEFINED} IfcDuctSilencerTypeEnum;
-const char* ToString(IfcDuctSilencerTypeEnum v);
-IfcDuctSilencerTypeEnum FromString(const std::string& s);
-}
-namespace IfcElectricApplianceTypeEnum {
-/// The IfcElectricApplianceTypeEnum defines the range of different types of electrical appliance that can be specified. 
+/// PAVILION_ROOF 
+///   A pyramidal hip roof. 
 /// 
-/// HISTORY: New type in IFC R2.0.
-///   Renamed from IfcElectricalApplianceTypeEnum if IFC 2x2.IFC 2x2 Addendum 1:
-///   Missing enumeration values added (ELECTRICHEATER, TUMBLEDRYER and
-///   WATERHEATER)
-///   IFC 2x4: ELECTRICHEATER changed to FREESTANDINGELECTRICHEATER and noted as being for occasional use. RADIANTHEATER removed as part of general 'heater consolidation'. WATERHEATER, DIRECTWATERHEATER and INDIRECTWATERHEATER rationalized to FREESTANDINGWATERHEATER. WATERCOOLER changed to FREESTANDINGWATERCOOLER.
-///   COMPUTER, FACSIMILE (FAX), PRINTER, SCANNER, TELEPHONE, TV (TELEVISION) moved to IfcAudioVisualApplianceTypeEnum and IfcCommunicationsApplianceTypeEnum. KITCHENMACHINE added.
+/// DOME_ROOF 
+///   A hemispherical hip
+///   roof. 
 /// 
-/// Enumeration 
+/// FREEFORM 
+///   Free form roof  
+///     
 /// 
-/// DISHWASHER: An appliance that has the primary function of washing dishes. 
-/// ELECTRICCOOKER: An electrical appliance that has the primary function of cooking food (including oven, hob, grill). 
-/// FREESTANDINGELECTRICHEATER: An electrical appliance that is used occasionally to provide heat. A freestanding electric heater is a 'plugged' appliance whose load may be removed from an electric circuit. 
-/// FREESTANDINGFAN: An electrical appliance that is used occasionally to provide ventilation. A freestanding fan is a 'plugged' appliance whose load may be removed from an electric circuit. 
-/// FREESTANDINGWATERHEATER: A small, local electrical appliance for heating water. A freestanding water heater is a 'plugged' appliance whose load may be removed from an electric circuit. 
-/// FREESTANDINGWATERCOOLER: A small, local electrical appliance for cooling water. A freestanding water cooler is a 'plugged' appliance whose load may be removed from an electric circuit. 
-/// FREEZER: An electrical appliance that has the primary function of storing food at temperatures below the freezing point of water. 
-/// FRIDGE_FREEZER: An electrical appliance that combines the functions of a freezer and a refrigerator through the provision of separate compartments. 
-/// KITCHENMACHINE: A specialized appliance used in commercial kitchens such as a mixer. 
-/// HANDDRYER: An electrical appliance that has the primary function of drying hands. 
-/// MICROWAVE: An electrical appliance that has the primary function of cooking food using microwaves. 
-/// PHOTOCOPIER: A machine that has the primary function of reproduction of printed matter. 
-/// REFRIGERATOR: An electrical appliance that has the primary function of storing food at low temperature but above the freezing point of water. 
-/// TUMBLEDRYER: An electrical appliance that has the primary function of drying clothes. 
-/// VENDINGMACHINE: An appliance that stores and vends goods including food, drink and goods of various types. 
-/// WASHINGMACHINE: An appliance that has the primary function of washing clothes. 	  
-/// USERDEFINED: User-defined type. 
-/// NOTDEFINED: Undefined type.
-typedef enum {IfcElectricApplianceType_COMPUTER, IfcElectricApplianceType_DIRECTWATERHEATER, IfcElectricApplianceType_DISHWASHER, IfcElectricApplianceType_ELECTRICCOOKER, IfcElectricApplianceType_ELECTRICHEATER, IfcElectricApplianceType_FACSIMILE, IfcElectricApplianceType_FREESTANDINGFAN, IfcElectricApplianceType_FREEZER, IfcElectricApplianceType_FRIDGE_FREEZER, IfcElectricApplianceType_HANDDRYER, IfcElectricApplianceType_INDIRECTWATERHEATER, IfcElectricApplianceType_MICROWAVE, IfcElectricApplianceType_PHOTOCOPIER, IfcElectricApplianceType_PRINTER, IfcElectricApplianceType_REFRIGERATOR, IfcElectricApplianceType_RADIANTHEATER, IfcElectricApplianceType_SCANNER, IfcElectricApplianceType_TELEPHONE, IfcElectricApplianceType_TUMBLEDRYER, IfcElectricApplianceType_TV, IfcElectricApplianceType_VENDINGMACHINE, IfcElectricApplianceType_WASHINGMACHINE, IfcElectricApplianceType_WATERHEATER, IfcElectricApplianceType_WATERCOOLER, IfcElectricApplianceType_USERDEFINED, IfcElectricApplianceType_NOTDEFINED} IfcElectricApplianceTypeEnum;
-const char* ToString(IfcElectricApplianceTypeEnum v);
-IfcElectricApplianceTypeEnum FromString(const std::string& s);
-}
-namespace IfcElectricCurrentEnum {
-
-typedef enum {IfcElectricCurrent_ALTERNATING, IfcElectricCurrent_DIRECT, IfcElectricCurrent_NOTDEFINED} IfcElectricCurrentEnum;
-const char* ToString(IfcElectricCurrentEnum v);
-IfcElectricCurrentEnum FromString(const std::string& s);
+/// NOTDEFINED 
+///   No specification given 
+///     
+/// 
+/// Figure 68 — Roof types
+typedef enum {IfcRoofType_FLAT_ROOF, IfcRoofType_SHED_ROOF, IfcRoofType_GABLE_ROOF, IfcRoofType_HIP_ROOF, IfcRoofType_HIPPED_GABLE_ROOF, IfcRoofType_GAMBREL_ROOF, IfcRoofType_MANSARD_ROOF, IfcRoofType_BARREL_ROOF, IfcRoofType_RAINBOW_ROOF, IfcRoofType_BUTTERFLY_ROOF, IfcRoofType_PAVILION_ROOF, IfcRoofType_DOME_ROOF, IfcRoofType_FREEFORM, IfcRoofType_NOTDEFINED} IfcRoofTypeEnum;
+const char* ToString(IfcRoofTypeEnum v);
+IfcRoofTypeEnum FromString(const std::string& s);
 }
-namespace IfcElectricDistributionPointFunctionEnum {
-
-typedef enum {IfcElectricDistributionPointFunction_ALARMPANEL, IfcElectricDistributionPointFunction_CONSUMERUNIT, IfcElectricDistributionPointFunction_CONTROLPANEL, IfcElectricDistributionPointFunction_DISTRIBUTIONBOARD, IfcElectricDistributionPointFunction_GASDETECTORPANEL, IfcElectricDistributionPointFunction_INDICATORPANEL, IfcElectricDistributionPointFunction_MIMICPANEL, IfcElectricDistributionPointFunction_MOTORCONTROLCENTRE, IfcElectricDistributionPointFunction_SWITCHBOARD, IfcElectricDistributionPointFunction_USERDEFINED, IfcElectricDistributionPointFunction_NOTDEFINED} IfcElectricDistributionPointFunctionEnum;
-const char* ToString(IfcElectricDistributionPointFunctionEnum v);
-IfcElectricDistributionPointFunctionEnum FromString(const std::string& s);
-}
-namespace IfcElectricFlowStorageDeviceTypeEnum {
-/// The IfcElectricFlowStorageDeviceTypeEnum defines the range of different types of electrical flow storage device available. 
-///   HISTORY: New type in IFC 2x2  
-///   Enumeration 
+namespace IfcSIPrefix {
+/// Definition from ISO/CD 10303-41:1992: An SI prefix is the name of a prefix that may be associated 
+/// with an SI unit. The definitions of SI prefixes are specified in ISO 1000 (clause 3).
 /// 
-/// BATTERY: A device for storing energy in chemical form so that it can be released as electrical energy. 
-/// CAPACITORBANK: A device that stores electrical energy when an external power supply is present using the electrical property of capacitance 
-/// HARMONICFILTER: A device that constantly injects currents that precisely correspond to the harmonic components drawn by the load. 
-/// UPS: A device that provides a time limited alternative source of power supply in the event of failure of the main supply.  
-/// USERDEFINED: User-defined type.  
-/// NOTDEFINED: Undefined type.
-typedef enum {IfcElectricFlowStorageDeviceType_BATTERY, IfcElectricFlowStorageDeviceType_CAPACITORBANK, IfcElectricFlowStorageDeviceType_HARMONICFILTER, IfcElectricFlowStorageDeviceType_INDUCTORBANK, IfcElectricFlowStorageDeviceType_UPS, IfcElectricFlowStorageDeviceType_USERDEFINED, IfcElectricFlowStorageDeviceType_NOTDEFINED} IfcElectricFlowStorageDeviceTypeEnum;
-const char* ToString(IfcElectricFlowStorageDeviceTypeEnum v);
-IfcElectricFlowStorageDeviceTypeEnum FromString(const std::string& s);
-}
-namespace IfcElectricGeneratorTypeEnum {
-/// The IfcElectricGeneratorTypeEnum defines the range of types of electric generators available.
-///   HISTORY: New type in IFC 2x2.  Values added in IFC 2x4. 
+/// NOTE The prefix defines multiples and submultiples of the SI units.
 /// 
-/// Enumeration 
+/// NOTE Corresponding ISO 10303 name: SI_prefix, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
 /// 
-/// CHP: Combined heat and power supply, used not only as a source of electric energy but also as a heating source for the building. It may therefore be not only part of an electrical system but also of a heating system. 
-/// ENGINEGENERATOR: Electrical generator with a fuel-driven engine, for example a diesel-driven emergency power supply. 
-/// STANDALONE: Electrical generator which does not include its source of kinetic energy, that is, a motor, engine, or turbine is modeled by a separate object. 
-/// USERDEFINED: User-defined type. 
-/// NOTDEFINED: Undefined type.
-typedef enum {IfcElectricGeneratorType_USERDEFINED, IfcElectricGeneratorType_NOTDEFINED} IfcElectricGeneratorTypeEnum;
-const char* ToString(IfcElectricGeneratorTypeEnum v);
-IfcElectricGeneratorTypeEnum FromString(const std::string& s);
-}
-namespace IfcElectricHeaterTypeEnum {
-
-typedef enum {IfcElectricHeaterType_ELECTRICPOINTHEATER, IfcElectricHeaterType_ELECTRICCABLEHEATER, IfcElectricHeaterType_ELECTRICMATHEATER, IfcElectricHeaterType_USERDEFINED, IfcElectricHeaterType_NOTDEFINED} IfcElectricHeaterTypeEnum;
-const char* ToString(IfcElectricHeaterTypeEnum v);
-IfcElectricHeaterTypeEnum FromString(const std::string& s);
+/// ENUMERATION 
+/// 
+/// EXA: 10^18. 
+///   PETA: 10^15. 
+///   TERA: 10^12. 
+///   GIGA: 10^9. 
+///   MEGA: 10^6. 
+///   KILO: 10^3. 
+///   HECTO: 10^2.  
+///   DECA: 10. 
+///   DECI: 10^-1. 
+///   CENTI: 10^-2. 
+///   MILLI: 10^-3. 
+///   MICRO: 10^-6. 
+///   NANO: 10^-9. 
+///   PICO: 10^-12. 
+///   FEMTO: 10^-15. 
+///   ATTO: 10^-18. 
+/// 
+/// HISTORY New entity in IFC Release 1.5.1.
+typedef enum {IfcSIPrefix_EXA, IfcSIPrefix_PETA, IfcSIPrefix_TERA, IfcSIPrefix_GIGA, IfcSIPrefix_MEGA, IfcSIPrefix_KILO, IfcSIPrefix_HECTO, IfcSIPrefix_DECA, IfcSIPrefix_DECI, IfcSIPrefix_CENTI, IfcSIPrefix_MILLI, IfcSIPrefix_MICRO, IfcSIPrefix_NANO, IfcSIPrefix_PICO, IfcSIPrefix_FEMTO, IfcSIPrefix_ATTO} IfcSIPrefix;
+const char* ToString(IfcSIPrefix v);
+IfcSIPrefix FromString(const std::string& s);
 }
-namespace IfcElectricMotorTypeEnum {
-/// The IfcElectricMotorTypeEnum defines the range of different types of electric motor that can be specified. 
-///   HISTORY: New type in IFC 2x2  
-///   Enumeration 
+namespace IfcSIUnitName {
+/// Definition from ISO/CD 10303-41:1992: An SI unit name is the name of an SI unit. The definitions of the 
+/// names of SI units are specified in ISO 1000 (clause 2).
 /// 
-/// DC: A motor using either generated or rectified D.C. power. 
-/// INDUCTION: An alternating current motor in which the primary winding on one member (usually the stator) is connected to the power source and a secondary winding or a squirrel-cage secondary winding on the other member (usually the rotor) carries the induced current. There is no physical electrical connection to the secondary winding, its current is induced. 
-/// POLYPHASE: A two or three-phase induction motor in which the windings, one for each phase, are evenly divided by the same number of electrical degrees.  
-/// RELUCTANCESYNCHRONOUS: A synchronous motor with a special rotor design which directly lines the rotor up with the rotating magnetic field of the stator, allowing for no slip under load.  
-/// SYNCHRONOUS: A motor that operates at a constant speed up to full load. The rotor speed is equal to the speed of the rotating magnetic field of the stator; there is no slip. 
-/// USERDEFINED: User-defined type. 
-/// NOTDEFINED: Undefined type.
-typedef enum {IfcElectricMotorType_DC, IfcElectricMotorType_INDUCTION, IfcElectricMotorType_POLYPHASE, IfcElectricMotorType_RELUCTANCESYNCHRONOUS, IfcElectricMotorType_SYNCHRONOUS, IfcElectricMotorType_USERDEFINED, IfcElectricMotorType_NOTDEFINED} IfcElectricMotorTypeEnum;
-const char* ToString(IfcElectricMotorTypeEnum v);
-IfcElectricMotorTypeEnum FromString(const std::string& s);
+/// NOTE Corresponding STEP name: SI_unit_name, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
+/// 
+/// ENUMERATION 
+/// 
+/// AMPERE: Unit for electric current. 
+///   BECQUEREL: Unit for radioactivity. 
+///   CANDELA: Unit for luminousintensity. 
+///   COULOMB: Unit for electric charge. 
+///   CUBIC_METRE: Unit for volume. 
+///   DEGREE_CELSIUS: Unit for thermodynamic temperature. 
+///   FARAD: Unit for electric capacitance. 
+///   GRAM: Unit for mass. 
+///   GRAY: Unit for absorbed radioactive dose. 
+///   HENRY: Unit for inductance. 
+///   HERTZ: Unit for frequency. 
+///   JOULE: Unit for energy. 
+///   KELVIN: Unit for thermodynamic temperature. 
+///   LUMEN: Unit for luminous flux. 
+///   LUX: Unit for illuminance. 
+///   METRE: Unit for length. 
+///   MOLE: Unit for amount of substance. 
+///   NEWTON: Unit for force. 
+///   OHM: Unit for electric resistance. 
+///   PASCAL: Unit for pressure. 
+///   RADIAN: Unit for plane angle. 
+///   SECOND: Unit for time. 
+///   SIEMENS: Unit for electric conductance. 
+///   SIEVERT: Unit for radioactive dose equivalent. 
+///   SQUARE_METRE: Unit for area. 
+///   STERADIAN: Unit for solid angle. 
+///   TESLA: Unit for magnetic flux density. 
+///   VOLT: Unit for electric voltage. 
+///   WATT: Unit for power. 
+///   WEBER: Unit for magnetic flux. 
+/// 
+/// HISTORY New entity in IFC Release 1.5.1.
+typedef enum {IfcSIUnitName_AMPERE, IfcSIUnitName_BECQUEREL, IfcSIUnitName_CANDELA, IfcSIUnitName_COULOMB, IfcSIUnitName_CUBIC_METRE, IfcSIUnitName_DEGREE_CELSIUS, IfcSIUnitName_FARAD, IfcSIUnitName_GRAM, IfcSIUnitName_GRAY, IfcSIUnitName_HENRY, IfcSIUnitName_HERTZ, IfcSIUnitName_JOULE, IfcSIUnitName_KELVIN, IfcSIUnitName_LUMEN, IfcSIUnitName_LUX, IfcSIUnitName_METRE, IfcSIUnitName_MOLE, IfcSIUnitName_NEWTON, IfcSIUnitName_OHM, IfcSIUnitName_PASCAL, IfcSIUnitName_RADIAN, IfcSIUnitName_SECOND, IfcSIUnitName_SIEMENS, IfcSIUnitName_SIEVERT, IfcSIUnitName_SQUARE_METRE, IfcSIUnitName_STERADIAN, IfcSIUnitName_TESLA, IfcSIUnitName_VOLT, IfcSIUnitName_WATT, IfcSIUnitName_WEBER} IfcSIUnitName;
+const char* ToString(IfcSIUnitName v);
+IfcSIUnitName FromString(const std::string& s);
 }
-namespace IfcElectricTimeControlTypeEnum {
-/// The IfcElectricTimeControlTypeEnum defines the range of types of electrical time control available. 
-///   HISTORY: New type in IFC 2x2  
-///   Enumeration 
+namespace IfcSanitaryTerminalTypeEnum {
+/// The IfcSanitaryTerminalTypeEnum defines the range of different types of sanitary terminal that can be specified. 
 /// 
-/// TIMECLOCK: A control that causes action to occur at set times. 
-/// TIMEDELAY: A control that causes action to occur following a set duration. 
-/// RELAY: Electromagnetically operated contactor for making or breaking a control circuit. 
+/// NOTE: The value WCSEAT has been deprecated and should no longer be used; toilet seats should be represented by IfcDiscreteAccessory with ObjectType 'WC Seat'. 
+///   HISTORY: New type in IFC 2x2 
+/// 
+/// Enumeration 
+/// 
+/// BATH: Sanitary appliance for immersion of the human body or parts of it. 
+/// BIDET: Waste water appliance for washing the excretory organs while sitting astride the bowl. 
+/// CISTERN: A water storage unit attached to a sanitary terminal that is fitted with a device, operated automatically or by the user, that discharges water to cleanse a water closet (toilet) pan, urinal or slop hopper. 
+/// SHOWER: Installation or waste water appliance that emits a spray of water to wash the human body. 
+/// SINK: Waste water appliance for receiving, retaining or disposing of domestic, culinary, laboratory or industrial process liquids. 
+/// SANITARYFOUNTAIN: A sanitary terminal that provides a low pressure jet of water for a specific purpose. 
+/// TOILETPAN: Soil appliance for the disposal of excrement. 
+/// URINAL: Soil appliance that receives urine and directs it to a waste outlet (BS6100). 
+/// WASHHANDBASIN: Waste water appliance for washing the upper parts of the body. 
+/// WCSEAT: [Deprecated] Hinged seat that fits on the top of a water closet (WC) pan. 
 /// USERDEFINED: User-defined type. 
 /// NOTDEFINED: Undefined type.
-typedef enum {IfcElectricTimeControlType_TIMECLOCK, IfcElectricTimeControlType_TIMEDELAY, IfcElectricTimeControlType_RELAY, IfcElectricTimeControlType_USERDEFINED, IfcElectricTimeControlType_NOTDEFINED} IfcElectricTimeControlTypeEnum;
-const char* ToString(IfcElectricTimeControlTypeEnum v);
-IfcElectricTimeControlTypeEnum FromString(const std::string& s);
+typedef enum {IfcSanitaryTerminalType_BATH, IfcSanitaryTerminalType_BIDET, IfcSanitaryTerminalType_CISTERN, IfcSanitaryTerminalType_SHOWER, IfcSanitaryTerminalType_SINK, IfcSanitaryTerminalType_SANITARYFOUNTAIN, IfcSanitaryTerminalType_TOILETPAN, IfcSanitaryTerminalType_URINAL, IfcSanitaryTerminalType_WASHHANDBASIN, IfcSanitaryTerminalType_WCSEAT, IfcSanitaryTerminalType_USERDEFINED, IfcSanitaryTerminalType_NOTDEFINED} IfcSanitaryTerminalTypeEnum;
+const char* ToString(IfcSanitaryTerminalTypeEnum v);
+IfcSanitaryTerminalTypeEnum FromString(const std::string& s);
 }
-namespace IfcElementAssemblyTypeEnum {
-/// Definition from IAI: An enumeration defining the
-///   basic configuration types for element assemblies.
-/// 
-/// HISTORY New enumeration type
-///   in Release IFC2x Edition 2.
+namespace IfcSectionTypeEnum {
+/// Definition from IAI: An enumeration indicating whether a
+///   specific piece of a cross section is uniform or tapered in longitudinal
+///   direction.  
+///   HISTORY New type in IFC
+///   Release 2x2  
+///   ENUMERATION 
 /// 
-/// Enumeration
+/// UNIFORM The section is uniform in longitudinal direction.
 /// 
-/// ACCESSORY_ASSEMBLY: Assembled accessories or components
-///   ARCH: A curved structure
-///   BEAM_GRID: Interconnected beams, located in one (typically horizontal) plane
-///   BRACED_FRAME: A rigid frame with additional bracing members
-///   GIRDER: A beam-like superstructure
-///   REINFORCEMENT_UNIT: Assembled reinforcement elements
-///   RIGID_FRAME: A structure built up of beams, columns, etc. with moment-resisting joints
-///   SLAB_FIELD: Slabs, laid out in one plane
-///   TRUSS: A structure built up of members with (quasi) pinned joints
-///   USERDEFINED: User-defined element assembly
-///   NOTDEFINED: Undefined element assembly
-typedef enum {IfcElementAssemblyType_ACCESSORY_ASSEMBLY, IfcElementAssemblyType_ARCH, IfcElementAssemblyType_BEAM_GRID, IfcElementAssemblyType_BRACED_FRAME, IfcElementAssemblyType_GIRDER, IfcElementAssemblyType_REINFORCEMENT_UNIT, IfcElementAssemblyType_RIGID_FRAME, IfcElementAssemblyType_SLAB_FIELD, IfcElementAssemblyType_TRUSS, IfcElementAssemblyType_USERDEFINED, IfcElementAssemblyType_NOTDEFINED} IfcElementAssemblyTypeEnum;
-const char* ToString(IfcElementAssemblyTypeEnum v);
-IfcElementAssemblyTypeEnum FromString(const std::string& s);
+/// TAPERED The section is tapered in longitudinal direction.
+typedef enum {IfcSectionType_UNIFORM, IfcSectionType_TAPERED} IfcSectionTypeEnum;
+const char* ToString(IfcSectionTypeEnum v);
+IfcSectionTypeEnum FromString(const std::string& s);
 }
-namespace IfcElementCompositionEnum {
-/// Definition from IAI: Enumeration that provides an
-///   indication, whether the spatial structure element or proxy
-///   represents a:
+namespace IfcSensorTypeEnum {
+/// The IfcSensorTypeEnum defines the range of different types of sensor that can be specified. 
 /// 
-/// COMPLEX - a group or aggregation of similar elements
+/// HISTORY: New type in IFC R2.0.  Added missing enumerations in IFC2x4
 /// 
-/// ELEMENT - a (undivided) element itself
+/// Enumeration 
 /// 
-/// PARTIAL - a subelement or part
+/// CONDUCTANCESENSOR: A device that senses or detects electrical conductance. 
+/// CONTACTSENSOR: A device that senses or detects contact, such as for detecting if a door is closed. 
+/// FIRESENSOR: A device that senses or detects fire. 
+/// FLOWSENSOR: A device that senses or detects flow in a fluid. 
+/// GASSENSOR: A device that senses or detects gas concentration. 
+/// HEATSENSOR: A device that senses or detects heat. 
+/// IONCONCENTRATIONSENSOR: A device that senses or detects ion concentration, such as for water hardness. 
+/// LEVELSENSOR: A device that senses or detects fill level, such as for a tank. 
+/// HUMIDITYSENSOR: A device that senses or detects humidity. 
+/// LIGHTSENSOR: A device that senses or detects light. 
+/// MOISTURESENSOR: A device that senses or detects moisture. 
+/// MOVEMENTSENSOR: A device that senses or detects movement.  
+/// PHSENSOR: A device that senses or detects acidity. 
+/// PRESSURESENSOR: A device that senses or detects pressure. 
+/// RADIATIONSENSOR: A device that senses or detects electromagnetic radiation. 
+/// RADIOACTIVITYSENSOR: A device that senses or detects atomic decay. 
+/// SMOKESENSOR: A device that senses or detects smoke. 
+/// SOUNDSENSOR: A device that senses or detects sound.  
+/// TEMPERATURESENSOR: A device that senses or detects temperature. 
+/// WINDSENSOR: A device that senses or detects airflow speed and direction. 
+/// USERDEFINED: User-defined type. 
+/// NOTDEFINED: Undefined type.
+typedef enum {IfcSensorType_CO2SENSOR, IfcSensorType_FIRESENSOR, IfcSensorType_FLOWSENSOR, IfcSensorType_GASSENSOR, IfcSensorType_HEATSENSOR, IfcSensorType_HUMIDITYSENSOR, IfcSensorType_LIGHTSENSOR, IfcSensorType_MOISTURESENSOR, IfcSensorType_MOVEMENTSENSOR, IfcSensorType_PRESSURESENSOR, IfcSensorType_SMOKESENSOR, IfcSensorType_SOUNDSENSOR, IfcSensorType_TEMPERATURESENSOR, IfcSensorType_USERDEFINED, IfcSensorType_NOTDEFINED} IfcSensorTypeEnum;
+const char* ToString(IfcSensorTypeEnum v);
+IfcSensorTypeEnum FromString(const std::string& s);
+}
+namespace IfcSequenceEnum {
+/// IfcSequenceEnum is an
+///   enumeration that defines the different ways in which a
+///   time lag is applied to a sequence between two processes.
 /// 
-/// HISTORY New enumeration in
-///   IFC Release 2.x
-typedef enum {IfcElementComposition_COMPLEX, IfcElementComposition_ELEMENT, IfcElementComposition_PARTIAL} IfcElementCompositionEnum;
-const char* ToString(IfcElementCompositionEnum v);
-IfcElementCompositionEnum FromString(const std::string& s);
+/// HISTORY  New entity in IFC 1.0
+typedef enum {IfcSequence_START_START, IfcSequence_START_FINISH, IfcSequence_FINISH_START, IfcSequence_FINISH_FINISH, IfcSequence_NOTDEFINED} IfcSequenceEnum;
+const char* ToString(IfcSequenceEnum v);
+IfcSequenceEnum FromString(const std::string& s);
 }
-namespace IfcEnergySequenceEnum {
+namespace IfcServiceLifeFactorTypeEnum {
 
-typedef enum {IfcEnergySequence_PRIMARY, IfcEnergySequence_SECONDARY, IfcEnergySequence_TERTIARY, IfcEnergySequence_AUXILIARY, IfcEnergySequence_USERDEFINED, IfcEnergySequence_NOTDEFINED} IfcEnergySequenceEnum;
-const char* ToString(IfcEnergySequenceEnum v);
-IfcEnergySequenceEnum FromString(const std::string& s);
+typedef enum {IfcServiceLifeFactorType_A_QUALITYOFCOMPONENTS, IfcServiceLifeFactorType_B_DESIGNLEVEL, IfcServiceLifeFactorType_C_WORKEXECUTIONLEVEL, IfcServiceLifeFactorType_D_INDOORENVIRONMENT, IfcServiceLifeFactorType_E_OUTDOORENVIRONMENT, IfcServiceLifeFactorType_F_INUSECONDITIONS, IfcServiceLifeFactorType_G_MAINTENANCELEVEL, IfcServiceLifeFactorType_USERDEFINED, IfcServiceLifeFactorType_NOTDEFINED} IfcServiceLifeFactorTypeEnum;
+const char* ToString(IfcServiceLifeFactorTypeEnum v);
+IfcServiceLifeFactorTypeEnum FromString(const std::string& s);
 }
-namespace IfcEnvironmentalImpactCategoryEnum {
+namespace IfcServiceLifeTypeEnum {
 
-typedef enum {IfcEnvironmentalImpactCategory_COMBINEDVALUE, IfcEnvironmentalImpactCategory_DISPOSAL, IfcEnvironmentalImpactCategory_EXTRACTION, IfcEnvironmentalImpactCategory_INSTALLATION, IfcEnvironmentalImpactCategory_MANUFACTURE, IfcEnvironmentalImpactCategory_TRANSPORTATION, IfcEnvironmentalImpactCategory_USERDEFINED, IfcEnvironmentalImpactCategory_NOTDEFINED} IfcEnvironmentalImpactCategoryEnum;
-const char* ToString(IfcEnvironmentalImpactCategoryEnum v);
-IfcEnvironmentalImpactCategoryEnum FromString(const std::string& s);
+typedef enum {IfcServiceLifeType_ACTUALSERVICELIFE, IfcServiceLifeType_EXPECTEDSERVICELIFE, IfcServiceLifeType_OPTIMISTICREFERENCESERVICELIFE, IfcServiceLifeType_PESSIMISTICREFERENCESERVICELIFE, IfcServiceLifeType_REFERENCESERVICELIFE} IfcServiceLifeTypeEnum;
+const char* ToString(IfcServiceLifeTypeEnum v);
+IfcServiceLifeTypeEnum FromString(const std::string& s);
 }
-namespace IfcEvaporativeCoolerTypeEnum {
-/// Enumeration defining the typical types of evaporative coolers. 
-///   The IfcEvaporativeCoolerTypeEnum contains the following:
+namespace IfcSlabTypeEnum {
+/// Definition from IAI: This enumeration defines the
+///   available predefined types of a slab. The
+///   IfcSlabTypeEnum can be used for slab occurrences,
+///   IfcSlab, and slab types, IfcSlabType. A
+///   special property set definition may be provided for each
+///   predefined type.
 /// 
-/// DIRECTEVAPORATIVERANDOMMEDIAAIRCOOLER: Direct evaporative random media air cooler: Cools the air stream by evaporating water dircectly into the air stream using coolers with evaporative pads, usually of aspen wood or plastic fiber/foam.
-///   DIRECTEVAPORATIVERIGIDMEDIAAIRCOOLER: Direct evaporative rigid media air cooler: Cools the air stream by evaporating water dircectly into the air stream using coolers with sheets of rigid, corrugated material as the wetted surface.
-///   DIRECTEVAPORATIVESLINGERSPACKAGEDAIRCOOLER: Direct evaporative slingers packaged air cooler: Cools the air stream by evaporating water dircectly into the air stream using coolers with a water slinger in an evaporative cooling section and a fan section.
-///   DIRECTEVAPORATIVEPACKAGEDROTARYAIRCOOLER: Direct evaporative packaged rotary air cooler: Cools the air stream by evaporating water dircectly into the air stream using coolers that wet and wash the evaporative pad by rotating it through a water bath.
-///   DIRECTEVAPORATIVEAIRWASHER: Direct evaporative air washer: Cools the air stream by evaporating water dircectly into the air stream using coolers with spray-type air washer consist of a chamber or casing containing spray nozzles, and tank for collecting spray water, and an eliminator section for removing entrained drops of water from the air.
-///   INDIRECTEVAPORATIVEPACKAGEAIRCOOLER: Indirect evaporative package air cooler: Cools the air stream by evaporating water indirectly and without adding moisture into the air stream. On one side of the heat exchanger, the secondary air stream is cooled by evaporation, while on the other side of heat exchanger, the primary air stream (conditioned air to be supplied to the room) is sensibly cooled by the heat exchanger surfaces.
-///   INDIRECTEVAPORATIVEWETCOIL: Indirect evaporative wet coil: Cools the air stream by evaporating water indirectly and without adding moisture into the air stream. Water is sprayed directly on the tubes of the heat exchanger where latent cooling takes place and the vaporization of the water on the outside of the heat exchanger tubes allows the simultaneous heat and mass transfer which removes heat from the supply air on the tube side.
-///   INDIRECTEVAPORATIVECOOLINGTOWERORCOILCOOLER: Indirect evaporative cooling tower or coil cooler: Cools the air stream by evaporating water indirectly and without adding moisture into the air stream using a combination of a cooling tower or other evaporative water cooler with a water-to-air heat exchanger coil and water circulating pump.
-///   INDIRECTDIRECTCOMBINATION: Indirect/Direct combination: Cools the air stream by evaporating water indirectly and without adding moisture into the air stream using a two-stage cooler with a first-stage indirect evaporative cooler and second-stage direct evaporative cooler.
-///   USERDEFINED:  User-defined evaporative cooler type.
-///   NOTDEFINED:  Undefined evaporative cooler type.
+/// HISTORY  New type in IFC
+///   Release 2.0
 /// 
-/// HISTORY: New enumeration in IFC 2x2.
-typedef enum {IfcEvaporativeCoolerType_DIRECTEVAPORATIVERANDOMMEDIAAIRCOOLER, IfcEvaporativeCoolerType_DIRECTEVAPORATIVERIGIDMEDIAAIRCOOLER, IfcEvaporativeCoolerType_DIRECTEVAPORATIVESLINGERSPACKAGEDAIRCOOLER, IfcEvaporativeCoolerType_DIRECTEVAPORATIVEPACKAGEDROTARYAIRCOOLER, IfcEvaporativeCoolerType_DIRECTEVAPORATIVEAIRWASHER, IfcEvaporativeCoolerType_INDIRECTEVAPORATIVEPACKAGEAIRCOOLER, IfcEvaporativeCoolerType_INDIRECTEVAPORATIVEWETCOIL, IfcEvaporativeCoolerType_INDIRECTEVAPORATIVECOOLINGTOWERORCOILCOOLER, IfcEvaporativeCoolerType_INDIRECTDIRECTCOMBINATION, IfcEvaporativeCoolerType_USERDEFINED, IfcEvaporativeCoolerType_NOTDEFINED} IfcEvaporativeCoolerTypeEnum;
-const char* ToString(IfcEvaporativeCoolerTypeEnum v);
-IfcEvaporativeCoolerTypeEnum FromString(const std::string& s);
-}
-namespace IfcEvaporatorTypeEnum {
-/// Enumeration defining the typical types of evaporators. 
-///   The IfcEvaporatorTypeEnum contains the following:
+/// Floor
 /// 
-/// DIRECTEXPANSION: Direct-expansion evaporator.
-///   DIRECTEXPANSIONSHELLANDTUBE: Direct-expansion evaporator where a refrigerant evaporates inside a series of baffles that channel the fluid throughout the shell side.
-///   DIRECTEXPANSIONTUBEINTUBE: Direct-expansion evaporator where a refrigerant evaporates inside one or more pairs of coaxial tubes.
-///   DIRECTEXPANSIONBRAZEDPLATE: Direct-expansion evaporator where a refrigerant evaporates inside plates brazed or welded together to make up an assembly of separate channels.
-///   FLOODEDSHELLANDTUBE: Evaporator in which refrigerant evaporates outside tubes.
-///   SHELLANDCOIL: Evaporator in which refrigerant evaporates inside a simple coiled tube immersed in the fluid to be cooled.
-///   USERDEFINED:  User-defined evaporator type.
-///   NOTDEFINED:  Undefined evaporator type.
+/// The slab is used to represent a floor slab.
 /// 
-/// HISTORY: New enumeration in IFC 2x2.
-typedef enum {IfcEvaporatorType_DIRECTEXPANSIONSHELLANDTUBE, IfcEvaporatorType_DIRECTEXPANSIONTUBEINTUBE, IfcEvaporatorType_DIRECTEXPANSIONBRAZEDPLATE, IfcEvaporatorType_FLOODEDSHELLANDTUBE, IfcEvaporatorType_SHELLANDCOIL, IfcEvaporatorType_USERDEFINED, IfcEvaporatorType_NOTDEFINED} IfcEvaporatorTypeEnum;
-const char* ToString(IfcEvaporatorTypeEnum v);
-IfcEvaporatorTypeEnum FromString(const std::string& s);
-}
-namespace IfcFanTypeEnum {
-/// Enumeration defining the typical types of fans.
-///   The IfcFanTypeEnum contains the following:
+/// Roof
 /// 
-/// CENTRIFUGALFORWARDCURVED: Air flows through the impeller radially using blades that are forward curved.
-///   CENTRIFUGALRADIAL: Air flows through the impeller radially using blades that are uncurved or slightl forward curved.
-///   CENTRIFUGALBACKWARDINCLINEDCURVED: Air flows through the impeller radially using blades that are backward curved.
-///   CENTRIFUGALAIRFOIL: Air flows through the impeller radially using blades are airfoil shaped.
-///   TUBEAXIAL: Air flows through the impeller axially with reduced tip clearance and operating at higher tip speeds.
-///   VANEAXIAL: Air flows through the impeller axially with guide vanes and reduced running blade tip clearance.
-///   PROPELLORAXIAL: Air flows through the impeller axially and small hub-to-tip ratio impeller mounted in an orifice plate or inlet ring.
-///   USERDEFINED:	User-defined fan type.
-///   NOTDEFINED: Undefined fan type.
+/// The slab is used to represent a roof slab (either
+///   flat or sloped).
 /// 
-/// HISTORY: New enumeration in IFC 2x2.
-typedef enum {IfcFanType_CENTRIFUGALFORWARDCURVED, IfcFanType_CENTRIFUGALRADIAL, IfcFanType_CENTRIFUGALBACKWARDINCLINEDCURVED, IfcFanType_CENTRIFUGALAIRFOIL, IfcFanType_TUBEAXIAL, IfcFanType_VANEAXIAL, IfcFanType_PROPELLORAXIAL, IfcFanType_USERDEFINED, IfcFanType_NOTDEFINED} IfcFanTypeEnum;
-const char* ToString(IfcFanTypeEnum v);
-IfcFanTypeEnum FromString(const std::string& s);
-}
-namespace IfcFilterTypeEnum {
-/// This enumeration defines the various types of filter typically used
-///   within building services distribution systems:
+/// Landing
 /// 
-/// AIRPARTICLEFILTER: A filter used to remove particulates from air.
-///   COMPRESSEDAIRFILTER: A filter used to remove particulates from compressed air.
-///   ODORFILTER: A filter used to remove odors from air.
-///   OILFILTER: A filter used to remove particulates from oil.
-///   STRAINER: A filter used to remove particulates from a fluid.
-///   WATERFILTER: A filter used to remove particulates from water.
-///   USERDEFINED:	User-defined filter type.
-///   NOTDEFINED:	Undefined filter type.
+/// The slab is used to represent a landing within a
+///   stair or ramp.
 /// 
-/// HISTORY: New enumeration in IFC R2x.  COMPRESSEDAIRFILTER added in IFC2x4.
-typedef enum {IfcFilterType_AIRPARTICLEFILTER, IfcFilterType_ODORFILTER, IfcFilterType_OILFILTER, IfcFilterType_STRAINER, IfcFilterType_WATERFILTER, IfcFilterType_USERDEFINED, IfcFilterType_NOTDEFINED} IfcFilterTypeEnum;
-const char* ToString(IfcFilterTypeEnum v);
-IfcFilterTypeEnum FromString(const std::string& s);
+/// BaseSlab
+/// 
+/// The slab is used to represent a floor slab against
+///   the ground (and thereby being a part of the
+///   foundation). Another name is mat foundation.
+/// 
+/// IFC2x3 CHANGE
+///    new enumerator added.
+typedef enum {IfcSlabType_FLOOR, IfcSlabType_ROOF, IfcSlabType_LANDING, IfcSlabType_BASESLAB, IfcSlabType_USERDEFINED, IfcSlabType_NOTDEFINED} IfcSlabTypeEnum;
+const char* ToString(IfcSlabTypeEnum v);
+IfcSlabTypeEnum FromString(const std::string& s);
 }
-namespace IfcFireSuppressionTerminalTypeEnum {
-/// The IfcFireSuppressionTerminalTypeEnum defines the range of different types of fire suppression terminal that can be specified. 
+namespace IfcSoundScaleEnum {
+
+typedef enum {IfcSoundScale_DBA, IfcSoundScale_DBB, IfcSoundScale_DBC, IfcSoundScale_NC, IfcSoundScale_NR, IfcSoundScale_USERDEFINED, IfcSoundScale_NOTDEFINED} IfcSoundScaleEnum;
+const char* ToString(IfcSoundScaleEnum v);
+IfcSoundScaleEnum FromString(const std::string& s);
+}
+namespace IfcSpaceHeaterTypeEnum {
+/// Enumeration defining the functional type of space heater.
 /// 
-/// HISTORY: New type in IFC 2x2
+/// The IfcSpaceHeaterTypeEnum contains the following:
 /// 
-/// Enumeration
+/// CONVECTOR: A heat-distributing unit that operates with gravity-circulated air.
+/// RADIATOR: A heat-distributing unit that operates with thermal radiation.
+/// USERDEFINED: User-defined space heater type.
+/// NOTDEFINED:  Undefined space heater type.
 /// 
-/// BREECHINGINLET: Symmetrical pipe fitting that unites two or more inlets into a single pipe (BS6100 330 114 adapted). A breeching inlet may be used on either a wet or dry riser. Used by fire services personnel for fast connection of fire appliance hose reels. May also be used for foam. 
-/// FIREHYDRANT: Device, fitted to a pipe, through which a temporary supply of water may be provided (BS6100 330 6107).  May also be termed a stand pipe. 
-/// HOSEREEL: A supporting framework on which a hose may be wound (BS6100 155 8201). 
-/// SPRINKLER: Device for sprinkling water from a pipe under pressure over an area (BS6100 100 3432). 
-/// SPRINKLERDEFLECTOR: Device attached to a sprinkler to deflect the water flow into a spread pattern to cover the required area. 
-/// USERDEFINED: User-defined type. 
-/// NOTDEFINED: Underined type.
-typedef enum {IfcFireSuppressionTerminalType_BREECHINGINLET, IfcFireSuppressionTerminalType_FIREHYDRANT, IfcFireSuppressionTerminalType_HOSEREEL, IfcFireSuppressionTerminalType_SPRINKLER, IfcFireSuppressionTerminalType_SPRINKLERDEFLECTOR, IfcFireSuppressionTerminalType_USERDEFINED, IfcFireSuppressionTerminalType_NOTDEFINED} IfcFireSuppressionTerminalTypeEnum;
-const char* ToString(IfcFireSuppressionTerminalTypeEnum v);
-IfcFireSuppressionTerminalTypeEnum FromString(const std::string& s);
+/// NOTE: This enumeration was revised in IFC 2x4 and was renamed from IfcHydronicHeaterTypeEnum in IFC R2x.
+/// 
+/// HISTORY: New enumeration in IFC R2x.
+typedef enum {IfcSpaceHeaterType_SECTIONALRADIATOR, IfcSpaceHeaterType_PANELRADIATOR, IfcSpaceHeaterType_TUBULARRADIATOR, IfcSpaceHeaterType_CONVECTOR, IfcSpaceHeaterType_BASEBOARDHEATER, IfcSpaceHeaterType_FINNEDTUBEUNIT, IfcSpaceHeaterType_UNITHEATER, IfcSpaceHeaterType_USERDEFINED, IfcSpaceHeaterType_NOTDEFINED} IfcSpaceHeaterTypeEnum;
+const char* ToString(IfcSpaceHeaterTypeEnum v);
+IfcSpaceHeaterTypeEnum FromString(const std::string& s);
 }
-namespace IfcFlowDirectionEnum {
-/// This enumeration defines the flow direction at a port as either a SOURCE, SINK, or SOURCEANDSINK.  For solids, liquids, or gas, the direction is the physical flow direction.  For electric power (circuits containing hot, neutral, ground), the direction is from the origination of power (from a distribution board to protective devices to switches to fixtures).  For communication signals, the direction originates from where the signal is shaped, such as a sensor.  For communicaton networks, the direction originates from the up-level network host, such as a router (having SOURCE ports) hosting multiple computers (having SINK ports).
+namespace IfcSpaceTypeEnum {
+/// Definition from IAI: This enumeration defines the
+/// available generic types for IfcSpace and
+/// IfcSpaceType.
+/// HISTORY New enumeration
+/// in IFC2x3.
+/// IFC2x4 CHANGE The enumerators
+/// INTERNAL and EXTERNAL have been added for upward compatibility to
+/// replace InteriorOrExteriorSpace
+/// usage.
+/// Enumeration
 /// 
-/// SOURCE:        A flow source, where a substance flows out of the connection.
-///   SINK:          A flow sink, where a substance flows into the connection.
-///   SOURCEANDSINK: Both a source and sink, where a substance flows both into and out of the connection simultaneously.
-///   NOTDEFINED:    Undefined flow direction.
+/// SPACE Any space not falling into another category.
 /// 
-/// HISTORY: New enumeration in IFC R2.0
-typedef enum {IfcFlowDirection_SOURCE, IfcFlowDirection_SINK, IfcFlowDirection_SOURCEANDSINK, IfcFlowDirection_NOTDEFINED} IfcFlowDirectionEnum;
-const char* ToString(IfcFlowDirectionEnum v);
-IfcFlowDirectionEnum FromString(const std::string& s);
-}
-namespace IfcFlowInstrumentTypeEnum {
-/// The IfcFlowInstrumentTypeEnum defines the range of different types of flow instrument that can be specified. 
+/// NOTE For classification of spaces according to its
+/// function that is often determined by national classification
+/// systems use IfcClassificationReference via the
+/// relationship IfcRelAssociatesClassification.
 /// 
-/// HISTORY: New type in IFC
-///   2x2  
+/// PARKING A space dedication for use as a parking spot
+/// for vehicles, including access, such as a parking aisle
+/// GFA Gross Floor Area - a specific kind of space for
+/// each building story that includes all net area and construction
+/// area (also the external envelop). Provision of such a specific
+/// space is often required by regulations.
+/// INTERNAL
+/// 
+/// NOTE the use is deprecated and
+/// only provided for backward compatibility
+/// purposes.
+/// 
+/// EXTERNAL
+/// 
+/// NOTE the use is deprecated and
+/// only provided for backward compatibility
+/// purposes.
+typedef enum {IfcSpaceType_USERDEFINED, IfcSpaceType_NOTDEFINED} IfcSpaceTypeEnum;
+const char* ToString(IfcSpaceTypeEnum v);
+IfcSpaceTypeEnum FromString(const std::string& s);
+}
+namespace IfcStackTerminalTypeEnum {
+/// An IfcStackTerminalTypeEnum defines the range of different types of stack terminal that can be specified for use at the top of a vertical stack subsystem. 
+///   HISTORY: New type in IFC 2x  
 ///   Enumeration 
 /// 
-/// PRESSUREGAUGE: A device that reads and displays a pressure value at a point or the pressure difference between two points. 
-/// THERMOMETER: A device that reads and displays a temperature value at a point. 
-/// AMMETER: A device that reads and displays the current flow in a circuit. 
-/// FREQUENCYMETER: A device that reads and displays the electrical frequency of an alternating current circuit. 
-/// PHASEANGLEMETER: A device that reads and displays the phase angle of a phase in a polyphase electrical circuit. 
-/// POWERFACTORMETER: A device that reads and displays the power factor of an electrical circuit. 
-/// VOLTMETER_PEAK: A device that reads and displays the peak voltage in an electrical circuit. 
-/// VOLTMETER_RMS: A device that reads and displays the RMS (mean) voltage in an electrical circuit. 
+/// BIRDCAGE: Guard cage, typically wire mesh, at the top of the stack preventing access by birds. 
+/// COWL: A cowling placed at the top of a stack to eliminate downdraft. 
+/// RAINWATERHOPPER: A box placed at the top of a rainwater downpipe to catch rainwater from guttering. 
 /// USERDEFINED: User-defined type. 
 /// NOTDEFINED: Undefined type.
-typedef enum {IfcFlowInstrumentType_PRESSUREGAUGE, IfcFlowInstrumentType_THERMOMETER, IfcFlowInstrumentType_AMMETER, IfcFlowInstrumentType_FREQUENCYMETER, IfcFlowInstrumentType_POWERFACTORMETER, IfcFlowInstrumentType_PHASEANGLEMETER, IfcFlowInstrumentType_VOLTMETER_PEAK, IfcFlowInstrumentType_VOLTMETER_RMS, IfcFlowInstrumentType_USERDEFINED, IfcFlowInstrumentType_NOTDEFINED} IfcFlowInstrumentTypeEnum;
-const char* ToString(IfcFlowInstrumentTypeEnum v);
-IfcFlowInstrumentTypeEnum FromString(const std::string& s);
+typedef enum {IfcStackTerminalType_BIRDCAGE, IfcStackTerminalType_COWL, IfcStackTerminalType_RAINWATERHOPPER, IfcStackTerminalType_USERDEFINED, IfcStackTerminalType_NOTDEFINED} IfcStackTerminalTypeEnum;
+const char* ToString(IfcStackTerminalTypeEnum v);
+IfcStackTerminalTypeEnum FromString(const std::string& s);
 }
-namespace IfcFlowMeterTypeEnum {
-/// This enumeration defines various types of flow meter:
+namespace IfcStairFlightTypeEnum {
+/// Definition from IAI: This enumeration defines the different types
+///   of stair flights an IfcStairFlightType object can fulfill: 
 /// 
-/// ENERGYMETER:   An electric meter or energy meter is a device that measures the amount of electrical energy supplied to or produced by a residence, business or machine.
+/// STRAIGHT: A stair flight with a straight walking line.  
+///   WINDER: A stair flight with a straight walking line. 
+///   SPIRAL: A stair flight with a circular or elliptic walking
+///   line. 
+///   CURVED: A stair flight with a curved walking line. 
+///   FREEFORM: A stair flight with a free form walking line (and
+///   outer boundaries). 
+///   USERDEFINED: User-defined stair flight . 
+///   NOTDEFINED: Undefined stair flight . 
 /// 
-/// GASMETER:   A device that measures the quantity of a gas or fuel.
+/// HISTORY: New Enumeration in
+///   Release IFC2x Edition 2.
+typedef enum {IfcStairFlightType_STRAIGHT, IfcStairFlightType_WINDER, IfcStairFlightType_SPIRAL, IfcStairFlightType_CURVED, IfcStairFlightType_FREEFORM, IfcStairFlightType_USERDEFINED, IfcStairFlightType_NOTDEFINED} IfcStairFlightTypeEnum;
+const char* ToString(IfcStairFlightTypeEnum v);
+IfcStairFlightTypeEnum FromString(const std::string& s);
+}
+namespace IfcStairTypeEnum {
+/// This enumeration defines the basic configuration of the stair type in terms of the number of stair flights and the number of landings, as illustrated in Figure 69. The type also distinguished turns by windings or by landings. In addition the subdivision of the straight and changing direction stairs is included. The stair configurations are given for stairs without and with one, two or three landings. 
 /// 
-/// OILMETER:   A device that measures the quantity of oil.
+/// Stairs which are subdivided into more than three landings have to be defined by the geometry only. Also stairs with non-regular shapes have to be defined by the geometry only. The type of such stairs is OTHEROPERATION. 
 /// 
-/// WATERMETER:   A device that measures the quantity of water.
+/// HISTORY New Enumeration in IFC Release 2.0. 
 /// 
-/// USERDEFINED:   User-defined meter type
+/// Enumerator 
+///   Description 
+///   Figure 
 /// 
-/// NOTDEFINED:    Undefined meter type
+/// StraightRunStair 
+///   A stair extending from
+///   one level to another without turns or winders. The stair consists of one
+///   straight flight. 
 /// 
-/// HISTORY: New enumeration in IFC 2x2
-typedef enum {IfcFlowMeterType_ELECTRICMETER, IfcFlowMeterType_ENERGYMETER, IfcFlowMeterType_FLOWMETER, IfcFlowMeterType_GASMETER, IfcFlowMeterType_OILMETER, IfcFlowMeterType_WATERMETER, IfcFlowMeterType_USERDEFINED, IfcFlowMeterType_NOTDEFINED} IfcFlowMeterTypeEnum;
-const char* ToString(IfcFlowMeterTypeEnum v);
-IfcFlowMeterTypeEnum FromString(const std::string& s);
-}
-namespace IfcFootingTypeEnum {
-/// Definition from IAI: Enumeration defining the generic footing type.
+/// TwoStraightRunStair 
+///   A straight stair
+///   consisting of two straight flights without turns but with one landing. 
 /// 
-/// HISTORY New type in IFC Release 2x2
-/// IFC 2x4 change:  Item CAISSON_FOUNDATION added
+/// QuarterWindingStair 
+///   A stair consisting of one
+///   flight with a quarter winder, which is making a 90° turn. The direction of
+///   the turn is determined by the walking line. 
 /// 
-/// ENUMERATION 
+/// QuarterTurnStair 
+///   A stair making a 90°
+///   turn, consisting of two straight flights connected by a quarterspace landing.
+///   The direction of the turn is determined by the walking line. 
 /// 
-/// CAISSON_FOUNDATION A foundation construction type used in underwater construction.
-///   FOOTING_BEAM Footing elements that are in bending and are supported clear of the ground. They will normally span between piers, piles or pile caps. They are distinguished from beams in the building superstructure since they will normally require a lower grade of finish. They are distinguished from STRIP_FOOTING since they are clear of the ground surface and hence require support to the lower face while the concrete is curing.
-///   PAD_FOOTING An element that transfers the load of a single column (possibly two) to the ground.
-///   PILE_CAP An element that transfers the load from a column or group of columns to a pier or pile or group of piers or piles.
-///   STRIP_FOOTING A linear element that transfers loads into the ground from either a continuous element, such as a wall, or from a series of elements, such as columns.
-///   USERDEFINED Special types of footings which meet specific local requirements.
-///   NOTDEFINED The type of footing is not defined.
-typedef enum {IfcFootingType_FOOTING_BEAM, IfcFootingType_PAD_FOOTING, IfcFootingType_PILE_CAP, IfcFootingType_STRIP_FOOTING, IfcFootingType_USERDEFINED, IfcFootingType_NOTDEFINED} IfcFootingTypeEnum;
-const char* ToString(IfcFootingTypeEnum v);
-IfcFootingTypeEnum FromString(const std::string& s);
-}
-namespace IfcGasTerminalTypeEnum {
-
-typedef enum {IfcGasTerminalType_GASAPPLIANCE, IfcGasTerminalType_GASBOOSTER, IfcGasTerminalType_GASBURNER, IfcGasTerminalType_USERDEFINED, IfcGasTerminalType_NOTDEFINED} IfcGasTerminalTypeEnum;
-const char* ToString(IfcGasTerminalTypeEnum v);
-IfcGasTerminalTypeEnum FromString(const std::string& s);
-}
-namespace IfcGeometricProjectionEnum {
-/// IfcGeometricProjectionEnum defines the various representation types that can be semantically distinguished. Often different levels of detail of the shape representation are controlled by the representation type.
+/// HalfWindingStair 
+///   A stair consisting of one
+///   flight with one half winder, which makes a 180° turn. The orientation of
+///   the turn is determined by the walking line. 
 /// 
-/// GRAPH_VIEW:
-/// Geometric display representation that shows an abstract, often 1D
-/// element representation, e.g. representing a wall by its axis line.
-///   SKETCH_VIEW:
-/// Geometric display representation that shows an abstract, often 2D
-/// element representation, e.g. representing a wall by its two foot print
-/// edges, surpressing any inner layer representation.
-///   MODEL_VIEW:
-/// Geometric display representation that shows a full 3D element
-/// representation, e.g. representing a wall by its volumetric body.
-///   PLAN_VIEW:
-/// Geometric display representation that shows a full 2D element
-/// representation, the level of detail often depends on the target scale,
-/// e.g. representing a wall by its two foot print edges and the edges of
-/// all inner layers. The projection is shown in ground view as seen from
-/// above.
-///   REFLECTED_PLAN_VIEW:
-/// Geometric display representation that shows a full 2D element
-/// representation, the level of detail often depends on the target scale,
-/// e.g. representing a wall by its two foot print edges and the edges of
-/// all inner layers. The projection is shown in ground view as seen from
-/// below.
-///   SECTION_VIEW:
-/// Geometric display representation that shows a full 2D element
-/// representation, the level of detail often depends on the target scale,
-/// e.g. representing a wall by its two inner/outer edges and the edges of
-/// all inner layers, if the element is cut by the section line.
-///   ELEVATION_VIEW:
-/// Geometric display representation that shows a full 2D element
-/// representation, the level of detail often depends on the target scale,
-/// e.g. representing a wall by its bounding edges if the element is within
-/// an elevation view.
-///   USERDEFINED:
-/// A user defined specification is given by the value of the UserDefinedTargetView
-/// attribute.
-///   NOTDEFINED:
-/// No specification given.
+/// HalfTurnStair 
+///   A stair making a 180°
+///   turn, consisting of two straight flights connected by a halfspace landing. The
+///   orientation of the turn is determined by the walking line. 
 /// 
-/// HISTORY: New Type in Release IFC2x2.
-typedef enum {IfcGeometricProjection_GRAPH_VIEW, IfcGeometricProjection_SKETCH_VIEW, IfcGeometricProjection_MODEL_VIEW, IfcGeometricProjection_PLAN_VIEW, IfcGeometricProjection_REFLECTED_PLAN_VIEW, IfcGeometricProjection_SECTION_VIEW, IfcGeometricProjection_ELEVATION_VIEW, IfcGeometricProjection_USERDEFINED, IfcGeometricProjection_NOTDEFINED} IfcGeometricProjectionEnum;
-const char* ToString(IfcGeometricProjectionEnum v);
-IfcGeometricProjectionEnum FromString(const std::string& s);
-}
-namespace IfcGlobalOrLocalEnum {
-/// This enumeration type defines if the local object coordinate system or the global world coordinate system for the project is used to describe the measure values of entities which have a reference to this type.
+/// TwoQuarterWindingStair 
+///   A stair consisting of one
+///   flight with two quarter winders, which make a 90° turn. The stair makes a
+///   180° turn. The direction of the turns is determined by the walking
+///   line. 
 /// 
-/// NOTE  The world coordinate system is given by the IfcGeometricRepresentationContext.WorldCoordinateSystem
-/// and is unique within the project. The local (or object) coordinate system is given by IfcProduct.ObjectPlacement and is used by all IfcRepresentation's within the IfcProduct.Representation.
+/// TwoQuarterTurnStair 
+///   A stair making a 180°
+///   turn, consisting of three straight flights connected by two quarterspace
+///   landings. The direction of the turns is determined by the walking line. 
 /// 
-/// HISTORY: New type in IFC2x2.
-typedef enum {IfcGlobalOrLocal_GLOBAL_COORDS, IfcGlobalOrLocal_LOCAL_COORDS} IfcGlobalOrLocalEnum;
-const char* ToString(IfcGlobalOrLocalEnum v);
-IfcGlobalOrLocalEnum FromString(const std::string& s);
-}
-namespace IfcHeatExchangerTypeEnum {
-/// Enumeration defining the typical types of heat exchangers. 
-///   The IfcHeatExchangerTypeEnum contains the following:
+/// ThreeQuarterWindingStair
 /// 
-/// PLATE: Plate heat exchanger.
-///   SHELLANDTUBE: Shell and Tube heat exchanger.
-///   USERDEFINED:  User-defined heat exchanger type.
-///   NOTDEFINED:  Undefined heat exchanger type.
+/// A stair consisting of one
+///   flight with three quarter winders, which make a 90° turn. The stair makes a
+///   270° turn. The direction of the turns is determined by the walking
+///   line. 
 /// 
-/// HISTORY: New enumeration in IFC R2x.
-typedef enum {IfcHeatExchangerType_PLATE, IfcHeatExchangerType_SHELLANDTUBE, IfcHeatExchangerType_USERDEFINED, IfcHeatExchangerType_NOTDEFINED} IfcHeatExchangerTypeEnum;
-const char* ToString(IfcHeatExchangerTypeEnum v);
-IfcHeatExchangerTypeEnum FromString(const std::string& s);
-}
-namespace IfcHumidifierTypeEnum {
-/// Enumeration defining the typical types of humidifiers. 
-///   The IfcHumidifierTypeEnum contains the following:
+/// ThreeQuarterTurnStair 
+///   A stair making a 270°
+///   turn, consisting of four straight flights connected by three quarterspace
+///   landings. The direction of the turns is determined by the walking line. 
 /// 
-/// STEAMINJECTION: Water vapor is added into the airstream through direction steam injection.
-///   ADIABATICAIRWASHER: Water vapor is added into the airstream through adiabatic evaporation using an air washing element.
-///   ADIABATICPAN:  Water vapor is added into the airstream through adiabatic evaporation using a pan.
-///   ADIABATICWETTEDELEMENT: Water vapor is added into the airstream through adiabatic evaporation using a wetted element.
-///   ADIABATICATOMIZING: Water vapor is added into the airstream through adiabatic evaporation using an atomizing element.
-///   ADIABATICULTRASONIC: Water vapor is added into the airstream through adiabatic evaporation using an ultrasonic element.
-///   ADIABATICRIGIDMEDIA: Water vapor is added into the airstream through adiabatic evaporation using a rigid media.
-///   ADIABATICCOMPRESSEDAIRNOZZLE: Water vapor is added into the airstream through adiabatic evaporation using a compressed air nozzle.
-///   ASSISTEDELECTRIC: Water vapor is added into the airstream through water heated evaporation using an electric heater.
-///   ASSISTEDNATURALGAS: Water vapor is added into the airstream through water heated evaporation using a natural gas heater.
-///   ASSISTEDPROPANE: Water vapor is added into the airstream through water heated evaporation using a propane heater.
-///   ASSISTEDBUTANE: Water vapor is added into the airstream through water heated evaporation using a butane heater.
-///   ASSISTEDSTEAM: Water vapor is added into the airstream through water heated evaporation using a steam heater.
-///   USERDEFINED:  User-defined humidifier type.
-///   NOTDEFINED:  Undefined humidifier type.
+/// SpiralStair 
+///   A stair constructed with
+///   winders around a circular newel often without landings. Depending on outer
+///   boundary it can be either a circular, elliptical or rectangular spiral stair.
+///   The orientation of the winding stairs is determined by the walking line. 
 /// 
-/// HISTORY: New enumeration in IFC 2x2.
-typedef enum {IfcHumidifierType_STEAMINJECTION, IfcHumidifierType_ADIABATICAIRWASHER, IfcHumidifierType_ADIABATICPAN, IfcHumidifierType_ADIABATICWETTEDELEMENT, IfcHumidifierType_ADIABATICATOMIZING, IfcHumidifierType_ADIABATICULTRASONIC, IfcHumidifierType_ADIABATICRIGIDMEDIA, IfcHumidifierType_ADIABATICCOMPRESSEDAIRNOZZLE, IfcHumidifierType_ASSISTEDELECTRIC, IfcHumidifierType_ASSISTEDNATURALGAS, IfcHumidifierType_ASSISTEDPROPANE, IfcHumidifierType_ASSISTEDBUTANE, IfcHumidifierType_ASSISTEDSTEAM, IfcHumidifierType_USERDEFINED, IfcHumidifierType_NOTDEFINED} IfcHumidifierTypeEnum;
-const char* ToString(IfcHumidifierTypeEnum v);
-IfcHumidifierTypeEnum FromString(const std::string& s);
-}
-namespace IfcInternalOrExternalEnum {
-/// Definition from IAI: This enumeration defines the
-/// different types of space boundaries in terms of either being
-/// inside the building or outside the building.
-/// Enumeration:
+/// DoubleReturnStair 
+///   A stair having one
+///   straight flight to a wide quarterspace landing, and two side flights from that
+///   landing into opposite directions. The stair is making a 90° turn. The
+///   direction of traffic is determined by the walking line. 
 /// 
-/// INTERNAL
+/// CurvedRunStair 
+///   A stair extending from one
+///   level to another without turns or winders. The stair is consisting of one
+///   curved flight. 
 /// 
-/// IfcSpaceBoundary
-/// The space boundary faces a physical
-/// or virtual element where there is an internal space on the other
-/// side.
+/// TwoCurvedRunStair 
+///   A curved stair consisting of
+///   two curved flights without turns but with one landing. 
 /// 
-/// EXTERNAL
+/// OtherOperation 
+///   Free form stair (user defined
+///   operation type) 
+///     
 /// 
-/// IfcSpaceBoundary
-/// The space boundary faces a physical
-/// or virtual element where there is an external space on the other
-/// side (i.e. air). Or it is the space boundary of that external
-/// space against the building.
+/// NotDefined 
+///     
+///     
 /// 
-/// EXTERNAL_EARTH
+/// Figure 69 — Stair types
+typedef enum {IfcStairType_STRAIGHT_RUN_STAIR, IfcStairType_TWO_STRAIGHT_RUN_STAIR, IfcStairType_QUARTER_WINDING_STAIR, IfcStairType_QUARTER_TURN_STAIR, IfcStairType_HALF_WINDING_STAIR, IfcStairType_HALF_TURN_STAIR, IfcStairType_TWO_QUARTER_WINDING_STAIR, IfcStairType_TWO_QUARTER_TURN_STAIR, IfcStairType_THREE_QUARTER_WINDING_STAIR, IfcStairType_THREE_QUARTER_TURN_STAIR, IfcStairType_SPIRAL_STAIR, IfcStairType_DOUBLE_RETURN_STAIR, IfcStairType_CURVED_RUN_STAIR, IfcStairType_TWO_CURVED_RUN_STAIR, IfcStairType_USERDEFINED, IfcStairType_NOTDEFINED} IfcStairTypeEnum;
+const char* ToString(IfcStairTypeEnum v);
+IfcStairTypeEnum FromString(const std::string& s);
+}
+namespace IfcStateEnum {
+/// The IfcStateEnum enumeration identifies the state or accessibility of the object (for example, read/write, locked).
 /// 
-/// IfcSpaceBoundary
-/// The space boundary faces a physical
-/// or virtual element where there is earth (or terrain) on the other
-/// side. Or it is the space boundary of that earth (or terrain
-/// object) external space against the building.
+/// Valid enumerations are:
 /// 
-/// EXTERNAL_WATER
+/// READWRITE: Object is in a Read-Write state. It may be modified by an application.
+/// READONLY: Object is in a Read-Only state. It may be viewed but not modified by an application.
+/// LOCKED: Object is in a Locked state. It may not be accessed by an application.
+/// READWRITELOCKED: Object is in a Read-Write-Locked state. It may not be accessed by an application.
+/// READONLYLOCKED: Object is in a Read-Only-Locked state. It may not be accessed by an application.
 /// 
-/// IfcSpaceBoundary
-/// The space boundary faces a physical
-/// or virtual element where there is water (water component of
-/// terrain) on the other side. Or it is the space boundary of that
-/// object representing water external space against the
-/// building.
+/// HISTORY  New enumeration in IFC R2.0.
 /// 
-/// EXTERNAL_FIRE
+/// IFC2x3 CHANGE  This concept was initially introduced in IFC 2.0 as IfcModifiedFlag of type BINARY(3) FIXED and has been modified in R2x to an enumeration. It was initially introduced as a first step towards providing facilities for partial model exchange from a server as requested by the IFC implementers. It is intended for use primarily by a model server so that an application can identify the state of the object.
+typedef enum {IfcState_READWRITE, IfcState_READONLY, IfcState_LOCKED, IfcState_READWRITELOCKED, IfcState_READONLYLOCKED} IfcStateEnum;
+const char* ToString(IfcStateEnum v);
+IfcStateEnum FromString(const std::string& s);
+}
+namespace IfcStructuralCurveTypeEnum {
+
+typedef enum {IfcStructuralCurveType_RIGID_JOINED_MEMBER, IfcStructuralCurveType_PIN_JOINED_MEMBER, IfcStructuralCurveType_CABLE, IfcStructuralCurveType_TENSION_MEMBER, IfcStructuralCurveType_COMPRESSION_MEMBER, IfcStructuralCurveType_USERDEFINED, IfcStructuralCurveType_NOTDEFINED} IfcStructuralCurveTypeEnum;
+const char* ToString(IfcStructuralCurveTypeEnum v);
+IfcStructuralCurveTypeEnum FromString(const std::string& s);
+}
+namespace IfcStructuralSurfaceTypeEnum {
+
+typedef enum {IfcStructuralSurfaceType_BENDING_ELEMENT, IfcStructuralSurfaceType_MEMBRANE_ELEMENT, IfcStructuralSurfaceType_SHELL, IfcStructuralSurfaceType_USERDEFINED, IfcStructuralSurfaceType_NOTDEFINED} IfcStructuralSurfaceTypeEnum;
+const char* ToString(IfcStructuralSurfaceTypeEnum v);
+IfcStructuralSurfaceTypeEnum FromString(const std::string& s);
+}
+namespace IfcSurfaceSide {
+/// IfcSurfaceSide is a denotion of whether negative, positive or both sides of a surface are being referenced. 
 /// 
-/// IfcSpaceBoundary
-/// The space boundary faces a physical
-/// or virtual element where there is another building on the other
-/// side. Or it is the space boundary of that other neighbor building
-/// against the building in question.
+/// ENUMERATION Definition from ISO/CD 10303-46:1992: 
 /// 
-/// NOTDEFINED
+/// POSITIVE: The side of a surface which is in the same direction as the surface normal derived from the mathematical definition.  
+/// NEGATIVE: The side of a surface which is in the opposite direction than the surface normal derived from the mathematical definition. 
+/// BOTH: Both, positive and negative side. 
 /// 
-/// No information available.
+/// NOTE Corresponding ISO 10303 type: surface_side. Please refer to ISO/IS 10303-46:1994 for the final definition of the formal standard.
 /// 
-/// HISTORY: New enumeration
-/// in IFC Release 2.0
-/// IFC2x4 CHANGE: Enumeration no longer
-/// applicable to IfcSpace. The following enumerators are
-/// added: EXTERNAL_EARTH, EXTERNAL_WATER,
-/// EXTERNAL_FIRE.
-typedef enum {IfcInternalOrExternal_INTERNAL, IfcInternalOrExternal_EXTERNAL, IfcInternalOrExternal_NOTDEFINED} IfcInternalOrExternalEnum;
-const char* ToString(IfcInternalOrExternalEnum v);
-IfcInternalOrExternalEnum FromString(const std::string& s);
+/// HISTORY: New Enumeration in IFC 2.0
+typedef enum {IfcSurfaceSide_POSITIVE, IfcSurfaceSide_NEGATIVE, IfcSurfaceSide_BOTH} IfcSurfaceSide;
+const char* ToString(IfcSurfaceSide v);
+IfcSurfaceSide FromString(const std::string& s);
 }
-namespace IfcInventoryTypeEnum {
-/// IfcInventoryTypeEnum defines the types of inventory that can be defined. 
-///   HISTORY: New Enumeration in IFC Release 2.0  
-///   Enumeration: 
+namespace IfcSurfaceTextureEnum {
+
+typedef enum {IfcSurfaceTexture_BUMP, IfcSurfaceTexture_OPACITY, IfcSurfaceTexture_REFLECTION, IfcSurfaceTexture_SELFILLUMINATION, IfcSurfaceTexture_SHININESS, IfcSurfaceTexture_SPECULAR, IfcSurfaceTexture_TEXTURE, IfcSurfaceTexture_TRANSPARENCYMAP, IfcSurfaceTexture_NOTDEFINED} IfcSurfaceTextureEnum;
+const char* ToString(IfcSurfaceTextureEnum v);
+IfcSurfaceTextureEnum FromString(const std::string& s);
+}
+namespace IfcSwitchingDeviceTypeEnum {
+/// The IfcSwitchingDeviceTypeEnum defines the range of different types of switch that can be specified. 
+///   HISTORY: New type in IFC 2x2 
+///   Enumeration 
 /// 
-/// ASSETINVENTORY: A collection of asset instances of type IfcAsset 
-/// SPACEINVENTORY: A collection of space instances of type IfcSpace 
-/// FURNITUREINVENTORY: A collection of furniture instances of type IfcFurnishingElement 
+/// CONTACTOR: An electrical device used to control the flow of power in a circuit on or off. 
+/// DIMMERSWITCH: A dimmer switch has variable positions, and may adjust electrical power or other setting (according to the switched port type). 
+/// EMERGENCYSTOP: An emergency stop device acts to remove as quickly as possible any danger that may have arisen unexpectedly. 
+/// KEYPAD: A set of buttons or switches, each potentially applicable to a different device.  
+/// MOMENTARYSWITCH: A momentary switch has no position, and may trigger some action to occur.  
+/// SELECTORSWITCH: A selector switch has multiple positions, and may switch connectivity or other setting.  
+/// STARTER: A starter is a switch which in the closed position controls the application of power to an electrical device. 
+/// SWITCHDISCONNECTOR: A switch disconnector is a switch which in the open position satisfies the isolating requirements specified for a disconnector. 
+/// SELECTORSWITCH: A selector switch has multiple positions, and may change the source or level of power or other setting (according to the switched port type). 
+/// TOGGLESWITCH: A toggle switch has two positions, and may enable or isolate electrical power or other setting (according to the switched port type). 
 /// USERDEFINED: User-defined type. 
 /// NOTDEFINED: Undefined type.
-typedef enum {IfcInventoryType_ASSETINVENTORY, IfcInventoryType_SPACEINVENTORY, IfcInventoryType_FURNITUREINVENTORY, IfcInventoryType_USERDEFINED, IfcInventoryType_NOTDEFINED} IfcInventoryTypeEnum;
-const char* ToString(IfcInventoryTypeEnum v);
-IfcInventoryTypeEnum FromString(const std::string& s);
+typedef enum {IfcSwitchingDeviceType_CONTACTOR, IfcSwitchingDeviceType_EMERGENCYSTOP, IfcSwitchingDeviceType_STARTER, IfcSwitchingDeviceType_SWITCHDISCONNECTOR, IfcSwitchingDeviceType_TOGGLESWITCH, IfcSwitchingDeviceType_USERDEFINED, IfcSwitchingDeviceType_NOTDEFINED} IfcSwitchingDeviceTypeEnum;
+const char* ToString(IfcSwitchingDeviceTypeEnum v);
+IfcSwitchingDeviceTypeEnum FromString(const std::string& s);
 }
-namespace IfcJunctionBoxTypeEnum {
-/// The IfcJunctionBoxTypeEnum defines the range of types of junction boxes available.
-///   HISTORY: New type in IFC 2x2.  Values added in IFC 2x4. 
+namespace IfcTankTypeEnum {
+/// Enumeration defining the typical types of tanks.
 /// 
-/// POWER: Contains cables, outlets, and/or switches for electrical power.
-/// DATA: Contains cables, outlets, and/or switches for communications use.
-/// USERDEFINED: User-defined type.
-/// NOTDEFINED: Undefined type.
-typedef enum {IfcJunctionBoxType_USERDEFINED, IfcJunctionBoxType_NOTDEFINED} IfcJunctionBoxTypeEnum;
-const char* ToString(IfcJunctionBoxTypeEnum v);
-IfcJunctionBoxTypeEnum FromString(const std::string& s);
-}
-namespace IfcLampTypeEnum {
-/// The IfcLampTypeEnum defines the range of different types of lamp available. 
+/// The IfcTankTypeEnum contains the following:
 /// 
-/// HISTORY: New type in IFC 2x2 Addendum
-///   1  
-///   Enumeration 
+/// BASIN:  An arbitrary open tank type.
 /// 
-/// COMPACTFLUORESCENT: A fluorescent lamp having a compact form factor produced by shaping the tube. 
-/// FLUORESCENT: A typically tubular discharge lamp in which most of the light is emitted by one or several layers of phosphors excited by ultraviolet radiation from the discharge.
-/// HALOGEN: an incandescent lamp in which a tungsten filament is sealed into a compact transport envelope filled with an inert gas and a small amount of halogen such as iodine or bromine.
-/// HIGHPRESSUREMERCURY: A discharge lamp in which most of the light is emitted by exciting mercury at high pressure.
-/// HIGHPRESSURESODIUM: A discharge lamp in which most of the light is emitted by exciting sodium at high pressure.
-/// LED: a solid state lamp that uses light-emitting diodes as the source of light.
-/// METALHALIDE: A discharge lamp in which most of the light is emitted by exciting a metal halide.
-/// OLED: a solid state lamp that uses light-emitting diodes as the source of light whose emissive electroluminescent layer is composed of a film of organic compounds.
-/// TUNGSTENFILAMENT: A lamp that emits light by passing an electrical current through a tungsten wire filament in a near vacuum.
-/// USERDEFINED: User-defined type.
-/// NOTDEFINED: Undefined type.
-typedef enum {IfcLampType_COMPACTFLUORESCENT, IfcLampType_FLUORESCENT, IfcLampType_HIGHPRESSUREMERCURY, IfcLampType_HIGHPRESSURESODIUM, IfcLampType_METALHALIDE, IfcLampType_TUNGSTENFILAMENT, IfcLampType_USERDEFINED, IfcLampType_NOTDEFINED} IfcLampTypeEnum;
-const char* ToString(IfcLampTypeEnum v);
-IfcLampTypeEnum FromString(const std::string& s);
-}
-namespace IfcLayerSetDirectionEnum {
-/// IfcLayerSetDirectionEnum provides identification of the axis of element geometry, denoting the layer set thickness direction, or direction of layer offsets.
+/// BREAKPRESSURE:  An open container that breaks the hydraulic pressure in a distribution system, typically located between the fluid reservoir and the fluid supply points. A typical break pressure tank allows the flow to discharge into the atmosphere, thereby reducing its hydrostatic pressure to zero.
 /// 
-/// ENUMERATION
+/// EXPANSION:  A closed container used in a closed fluid distribution system to mitigate the effects of thermal expansion or water hammer. The tank is typically constructed with a diaphragm dividing the tank into two sections, with fluid on one side of the diaphragm and air on the other. One example application is when connected to the primary circuit of a hot water system to accommodate the increase in volume of the water when it is heated.
 /// 
-/// AXIS1: Usually x-axis.
-/// AXIS2: Usually y-axis.
-/// AXIS3: Usually z-axis.
+/// FEEDANDEXPANSION:  An open tank that is used for both storage and thermal expansion. A typical example is a tank used to store make-up water at ambient pressure for supply to a hot water system, simultaneously accommodating increases in volume of the water when heated.
 /// 
-/// HISTORY: New Type in IFC2x.
-typedef enum {IfcLayerSetDirection_AXIS1, IfcLayerSetDirection_AXIS2, IfcLayerSetDirection_AXIS3} IfcLayerSetDirectionEnum;
-const char* ToString(IfcLayerSetDirectionEnum v);
-IfcLayerSetDirectionEnum FromString(const std::string& s);
-}
-namespace IfcLightDistributionCurveEnum {
-/// There are three kinds of light distribution curves, according to Standard CEN TC 169, prEN 13032-1, CIE 121: 
+/// PRESSUREVESSEL:  A closed container used for storing fluids or gases at a pressure different from the ambient pressure. A pressure vessel is typically rated by an authority having jurisdiction for the operational pressure.
 /// 
-/// TYPE_A: Type A is basically not used. For completeness the Type A Photometry equals the Type B rotated 90° around the Z-Axis counter clockwise. 
-/// TYPE_B: Type B is sometimes used for floodlights. The B-Plane System has a horizontal axis. B-Angles are valid from -180° to +180° with B 0° at the bottom and B180°/B-180° at the top, &#946;-Angles are valid from -90° to +90°. (See Figure 302.)
-/// TYPE_C: Type C is the recommended standard system. The C-Plane system equals a globe with a vertical axis. C-Angles are valid from 0° to 360°, &#947;-Angles are valid from 0° (south pole) to 180° (north pole). (See Figure 302.) 
+/// STORAGE:  An open or closed containter used for storing a fluid at ambient pressure and from which it can be supplied to the fluid distribution system. There are many examples of storage tanks, such as potable water storage tanks, fuel storage tanks, etc.
 /// 
-/// <table
+/// VESSEL:  An arbitrary closed tank type.
 /// 
-/// B-Type System 
-///   C-Type System 
+/// USERDEFINED:  User-defined tank type.
 /// 
-/// Figure 302 — Light distribution curves
+/// NOTDEFINED:  Undefined tank type.
 /// 
-/// HISTORY  This is a new enumeration in IFC2x2.
-typedef enum {IfcLightDistributionCurve_TYPE_A, IfcLightDistributionCurve_TYPE_B, IfcLightDistributionCurve_TYPE_C, IfcLightDistributionCurve_NOTDEFINED} IfcLightDistributionCurveEnum;
-const char* ToString(IfcLightDistributionCurveEnum v);
-IfcLightDistributionCurveEnum FromString(const std::string& s);
+/// HISTORY: New enumeration in IFC 2x2.  BASIN and VESSEL added in IFC2x4.
+typedef enum {IfcTankType_PREFORMED, IfcTankType_SECTIONAL, IfcTankType_EXPANSION, IfcTankType_PRESSUREVESSEL, IfcTankType_USERDEFINED, IfcTankType_NOTDEFINED} IfcTankTypeEnum;
+const char* ToString(IfcTankTypeEnum v);
+IfcTankTypeEnum FromString(const std::string& s);
 }
-namespace IfcLightEmissionSourceEnum {
-/// IfcLightEmissionSourceEnum defines the range of different types of light emitter available. 
+namespace IfcTendonTypeEnum {
+
+typedef enum {IfcTendonType_STRAND, IfcTendonType_WIRE, IfcTendonType_BAR, IfcTendonType_COATED, IfcTendonType_USERDEFINED, IfcTendonType_NOTDEFINED} IfcTendonTypeEnum;
+const char* ToString(IfcTendonTypeEnum v);
+IfcTendonTypeEnum FromString(const std::string& s);
+}
+namespace IfcTextPath {
+/// The text path determines the direction of the text characters in respect to each other.
 /// 
-/// HISTORY: New type in IFC2x2.
+/// NOTE: The IfcTextPath is an entity that had been adopted from ISO 10303, Industrial automation systems and integration&#151;Product data representation and exchange, Part 46: Integrated generic resources: Visual presentation.
 /// 
-/// Enumeration 
+/// NOTE Corresponding ISO 10303 name:text_path . Please refer to ISO/IS 10303-46:1994 for the final definition of the formal standard.
 /// 
-/// COMPACTFLUORESCENT
-/// FLUORESCENT
-/// HIGHPRESSUREMERCURY
-/// HIGHPRESSURESODIUM
-/// LIGHTEMITTINGDIODE
-/// LOWPRESSURESODIUM
-/// LOWVOLTAGEHALOGEN
-/// MAINVOLTAGEHALOGEN
-/// METALHALIDE 
-/// TUNGSTENFILAMENT 
-/// NOTDEFINED
-typedef enum {IfcLightEmissionSource_COMPACTFLUORESCENT, IfcLightEmissionSource_FLUORESCENT, IfcLightEmissionSource_HIGHPRESSUREMERCURY, IfcLightEmissionSource_HIGHPRESSURESODIUM, IfcLightEmissionSource_LIGHTEMITTINGDIODE, IfcLightEmissionSource_LOWPRESSURESODIUM, IfcLightEmissionSource_LOWVOLTAGEHALOGEN, IfcLightEmissionSource_MAINVOLTAGEHALOGEN, IfcLightEmissionSource_METALHALIDE, IfcLightEmissionSource_TUNGSTENFILAMENT, IfcLightEmissionSource_NOTDEFINED} IfcLightEmissionSourceEnum;
-const char* ToString(IfcLightEmissionSourceEnum v);
-IfcLightEmissionSourceEnum FromString(const std::string& s);
+/// HISTORY New entity in IFC2x2.
+typedef enum {IfcTextPath_LEFT, IfcTextPath_RIGHT, IfcTextPath_UP, IfcTextPath_DOWN} IfcTextPath;
+const char* ToString(IfcTextPath v);
+IfcTextPath FromString(const std::string& s);
 }
-namespace IfcLightFixtureTypeEnum {
-/// The IfcLightFixtureTypeEnum defines the range of different types of light fixture available.
+namespace IfcThermalLoadSourceEnum {
+
+typedef enum {IfcThermalLoadSource_PEOPLE, IfcThermalLoadSource_LIGHTING, IfcThermalLoadSource_EQUIPMENT, IfcThermalLoadSource_VENTILATIONINDOORAIR, IfcThermalLoadSource_VENTILATIONOUTSIDEAIR, IfcThermalLoadSource_RECIRCULATEDAIR, IfcThermalLoadSource_EXHAUSTAIR, IfcThermalLoadSource_AIREXCHANGERATE, IfcThermalLoadSource_DRYBULBTEMPERATURE, IfcThermalLoadSource_RELATIVEHUMIDITY, IfcThermalLoadSource_INFILTRATION, IfcThermalLoadSource_USERDEFINED, IfcThermalLoadSource_NOTDEFINED} IfcThermalLoadSourceEnum;
+const char* ToString(IfcThermalLoadSourceEnum v);
+IfcThermalLoadSourceEnum FromString(const std::string& s);
+}
+namespace IfcThermalLoadTypeEnum {
+
+typedef enum {IfcThermalLoadType_SENSIBLE, IfcThermalLoadType_LATENT, IfcThermalLoadType_RADIANT, IfcThermalLoadType_NOTDEFINED} IfcThermalLoadTypeEnum;
+const char* ToString(IfcThermalLoadTypeEnum v);
+IfcThermalLoadTypeEnum FromString(const std::string& s);
+}
+namespace IfcTimeSeriesDataTypeEnum {
+/// IfcTimeSeriesDataTypeEnum describes a type of time series data and is used to determine a value during the time series which is not explicitly specified: 
 /// 
-/// HISTORY: New type in IFC 2x Edition 2IFC 2x4: SECURITYLIGHTING added
+/// CONTINUOUS: The time series data is continuous. 
+///   DISCRETE: The time series data is discrete. 
+///   DISCRETEBINARY: The time series data is discrete binary. 
+///   PIECEWISEBINARY: The time series data is piecewise binary. 
+///   PIECEWISECONSTANT: The time series data is piecewise constant. 
+///   PIECEWISECONTINUOUS: The time series data is piecewise continuous. 
+///   NOTDEFINED: The time series data is not defined. 
 /// 
-/// Enumeration
+/// HISTORY: New enumeration in IFC2x2.
+typedef enum {IfcTimeSeriesDataType_CONTINUOUS, IfcTimeSeriesDataType_DISCRETE, IfcTimeSeriesDataType_DISCRETEBINARY, IfcTimeSeriesDataType_PIECEWISEBINARY, IfcTimeSeriesDataType_PIECEWISECONSTANT, IfcTimeSeriesDataType_PIECEWISECONTINUOUS, IfcTimeSeriesDataType_NOTDEFINED} IfcTimeSeriesDataTypeEnum;
+const char* ToString(IfcTimeSeriesDataTypeEnum v);
+IfcTimeSeriesDataTypeEnum FromString(const std::string& s);
+}
+namespace IfcTimeSeriesScheduleTypeEnum {
+
+typedef enum {IfcTimeSeriesScheduleType_ANNUAL, IfcTimeSeriesScheduleType_MONTHLY, IfcTimeSeriesScheduleType_WEEKLY, IfcTimeSeriesScheduleType_DAILY, IfcTimeSeriesScheduleType_USERDEFINED, IfcTimeSeriesScheduleType_NOTDEFINED} IfcTimeSeriesScheduleTypeEnum;
+const char* ToString(IfcTimeSeriesScheduleTypeEnum v);
+IfcTimeSeriesScheduleTypeEnum FromString(const std::string& s);
+}
+namespace IfcTransformerTypeEnum {
+/// The IfcTransformerTypeEnum defines the range of different types of transformer that can be specified. 
+///   HISTORY: New type in IFC 2x2 
+///   Enumeration 
 /// 
-/// POINTSOURCE: A light fixture that is considered to have negligible area and that emit light with approximately equal intensity in all directions.  A light fixture containing a tungsten, halogen or similar bulb is an example of a point source.
-/// DIRECTIONSOURCE: A light fixture that is considered to have a length or surface area from which it emits light in a direction. A light fixture containing one or more fluorescent lamps is an example of a direction source. 
-/// SECURITYLIGHTING: A light fixture having specific purpose of directing occupants in an emergency, such as an illuminated exit sign or emergency flood light. 
-/// USERDEFINED: User-defined type.
+/// CURRENT: A transformer that changes the current between circuits. 
+/// FREQUENCY: A transformer that changes the frequency between circuits. 
+/// INVERTER: A transformer that converts from direct current (DC) to alternating current (AC). 
+/// RECTIFIER: A transformer that converts from alternating current (AC) to direct current (DC).  
+/// VOLTAGE: A transformer that changes the voltage between circuits.  
+/// USERDEFINED: User-defined type. 
 /// NOTDEFINED: Undefined type.
-typedef enum {IfcLightFixtureType_POINTSOURCE, IfcLightFixtureType_DIRECTIONSOURCE, IfcLightFixtureType_USERDEFINED, IfcLightFixtureType_NOTDEFINED} IfcLightFixtureTypeEnum;
-const char* ToString(IfcLightFixtureTypeEnum v);
-IfcLightFixtureTypeEnum FromString(const std::string& s);
+typedef enum {IfcTransformerType_CURRENT, IfcTransformerType_FREQUENCY, IfcTransformerType_VOLTAGE, IfcTransformerType_USERDEFINED, IfcTransformerType_NOTDEFINED} IfcTransformerTypeEnum;
+const char* ToString(IfcTransformerTypeEnum v);
+IfcTransformerTypeEnum FromString(const std::string& s);
 }
-namespace IfcLoadGroupTypeEnum {
-/// Definition from IAI: This type definition is used to distinguish between different levels
-/// of load grouping.  It allows to differentiate between load groups, load cases, and load combinations.
-/// Normally, these enumeration types shall be used in the following context:
+namespace IfcTransitionCode {
+/// Definition from ISO/CD 10303-42:1992: This type conveys the continuity properties of a composite curve or surface. The continuity referred to is geometric, not parametric continuity. For example, in ContSameGradient the tangent vectors of successive segments will have the same direction, but may have different magnitude.  
 /// 
-/// LOAD_GROUP groups instances of subtypes of IfcStructuralAction.  It shall be used as a
-///   container for loads grouped together for specific purposes, e.g. loads which are part of a
-///   special load pattern.
-///   LOAD_CASE groups LOAD_GROUPs and instances of subtypes of IfcStructuralAction.
-///   It should be used as a container for loads with the same origin.
-///   LOAD_COMBINATION_GROUP is an intermediate level between LOAD_CASE and LOAD_COMBINATION.
-///   The purpose of this level is to provide a factor with which one or more LOAD_CASEs occur in a
-///   LOAD_COMBINATION.  This factor cannot be specified directly at the load case if the load case
-///   is meant to occur in more than one combination with different factors.
-///   This intermediate level is obsolete.  Instead, 
-///   LOAD_COMBINATION is used to group load cases which act together into a load combination.
-///   USERDEFINED:  A grouping level which does not follow the standard hierarchy of load group types.
-///   NOTDEFINED:  The grouping level is not yet known.
+/// NOTE  Corresponding ISO 10303 type: transition_code, please refer to ISO/IS 10303-42:1994, p. 14 for the final definition of the formal standard.
 /// 
-/// HISTORY: New type in IFC 2x2.
+/// HISTORY  New Type in IFC Release 1.0
 /// 
-/// IFC 2x4 change:  Obsolete item LOAD_COMBINATION_GROUP removed.  Load cases are directly assigned to load combinations with different factors for each load case—load combination pair by means of IfcRelAssignsToGroupByFactor.
-typedef enum {IfcLoadGroupType_LOAD_GROUP, IfcLoadGroupType_LOAD_CASE, IfcLoadGroupType_LOAD_COMBINATION_GROUP, IfcLoadGroupType_LOAD_COMBINATION, IfcLoadGroupType_USERDEFINED, IfcLoadGroupType_NOTDEFINED} IfcLoadGroupTypeEnum;
-const char* ToString(IfcLoadGroupTypeEnum v);
-IfcLoadGroupTypeEnum FromString(const std::string& s);
-}
-namespace IfcLogicalOperatorEnum {
-/// Definition: IfcLogicalOperatorEnum is an enumeration that defines the logical operators that may be applied for the satisfaction of one or more operands (IfcConstraint) at a time. 
+/// Figure 273 (quoted from ISO/CD 10303-42:1992, p.55) illustrates transition types.
 /// 
-/// HISTORY  New type in IFC Release 2.0.  Renamed from IfcConstraintAggregatorEnum in IFC 2x2
+/// Figure 273 — Transition code
 /// 
-/// IFC2x4 CHANGE: Extended to include LOGICALXOR, LOGICALNOTAND and LOGICALNOTOR.
+/// ENUMERATION 
 /// 
-/// Enumeration 
+/// DISCONTINUOUS: The segments do not join. This is permitted only at the boundary of the curve or surface to indicate that it is not closed.
+/// CONTINUOUS: The segments join but no condition on their tangents is implied. 
+/// CONTSAMEGRADIENT: The segments join and their tangent vectors or tangent planes are parallel and have the same direction at the joint: equality of derivatives is not required. 
+/// CONTSAMEGRADIENTSAMECURVATURE: For a curve, the segments join, their tangent vectors are parallel and in the same direction and their curvatures are equal at the joint: equality of derivatives is not required. For a surface this implies that the principle curvatures are the same and the principle directions are coincident along the common boundary.
+typedef enum {IfcTransitionCode_DISCONTINUOUS, IfcTransitionCode_CONTINUOUS, IfcTransitionCode_CONTSAMEGRADIENT, IfcTransitionCode_CONTSAMEGRADIENTSAMECURVATURE} IfcTransitionCode;
+const char* ToString(IfcTransitionCode v);
+IfcTransitionCode FromString(const std::string& s);
+}
+namespace IfcTransportElementTypeEnum {
+/// Definition from IAI: This enumeration is used to
+/// identify primary transport element types. The
+/// IfcTransportElementTypeEnum contains the following:
 /// 
-/// Value 
-///   Definition 
+/// ELEVATOR: Elevator or lift being a transport device to
+/// move people of good vertically.
+/// ESCALATOR: Escalator being a transport device to move
+/// people. It consists of individual linked steps that move up and
+/// down on tracks while keeping the threads horizontal.
+/// MOVINGWALKWAY: Moving walkway being a transport device
+/// to move people horizontally or on an incline. It is a slow
+/// conveyor belt that transports people.
+/// CRANEWAY: A crane way system, normally including the
+/// crane rails, fasteners and the crane. It is primarily used to
+/// move heavy goods in a factory or other industry buildings.
+/// LIFTINGGEAR: A device used for lifting or lowering
+/// heavy goods. It may be manually operated or electrically or
+/// pneumatically driven.
 /// 
-/// LOGICALAND 
-///   Defines a relationship between operands whereby the result is true if all operands are true, i.e. false if at least 
+/// HISTORY  New enumeration
+/// in IFC Release 2x.
+/// IFC2x4 CHANGE  New enumerators
+/// CRANEWAY and LIFTINGGEAR added in
+/// IFC2x4.
+typedef enum {IfcTransportElementType_ELEVATOR, IfcTransportElementType_ESCALATOR, IfcTransportElementType_MOVINGWALKWAY, IfcTransportElementType_USERDEFINED, IfcTransportElementType_NOTDEFINED} IfcTransportElementTypeEnum;
+const char* ToString(IfcTransportElementTypeEnum v);
+IfcTransportElementTypeEnum FromString(const std::string& s);
+}
+namespace IfcTrimmingPreference {
+/// Definition from ISO/CD 10303-42:1992: This type is used to describe the preferred way of trimming a parametric curve where the trimming is multiply defined. 
 /// 
-/// one operand is false. 
+/// NOTE Corresponding ISO 10303 type: trimming_preference, please refer to ISO/IS 10303-42:1994, p. 18 for the final definition of the formal standard.
 /// 
-/// LOGICALOR 
-///   Defines a relationship between operands whereby the result is true if at least one operand is true, i.e false if 
+/// HISTORY New Type in IFC Release 1.0
 /// 
-/// all operands are false. 
-/// 
-/// LOGICALXOR 
-///   Defines a relationship between operands whereby the result is true if exactly one operand is true (exclusive or). 
-/// 
-/// LOGICALNOTAND 
-///   Defines a relationship between operands whereby the result is true if at least one operand is false, i.e false if 
+/// ENUMERATION 
 /// 
-/// all operands are true. 
+/// CARTESIAN: Indicates that trimming by Cartesian point is preferred. 
+/// PARAMETER: Indicates the preference for the parameter value. 
+/// UNSPECIFIED: Indicates that no preference is communicated.
+typedef enum {IfcTrimmingPreference_CARTESIAN, IfcTrimmingPreference_PARAMETER, IfcTrimmingPreference_UNSPECIFIED} IfcTrimmingPreference;
+const char* ToString(IfcTrimmingPreference v);
+IfcTrimmingPreference FromString(const std::string& s);
+}
+namespace IfcTubeBundleTypeEnum {
+/// Enumeration defining the typical types of tube bundles. 
+///   The IfcTubeBundleTypeEnum contains the following:
 /// 
-/// LOGICALNOTOR 
-///   Defines a relationship between operands whereby the result is true if all operands are false, i.e false if at least 
+/// FINNED:  Finned tube bundle type.
+///   USERDEFINED:  User-defined tube bundle type.
+///   NOTDEFINED:  Undefined tube bundle type.
 /// 
-/// one operand is true. 
+/// HISTORY: New enumeration in IFC 2x2.
+typedef enum {IfcTubeBundleType_FINNED, IfcTubeBundleType_USERDEFINED, IfcTubeBundleType_NOTDEFINED} IfcTubeBundleTypeEnum;
+const char* ToString(IfcTubeBundleTypeEnum v);
+IfcTubeBundleTypeEnum FromString(const std::string& s);
+}
+namespace IfcUnitEnum {
+/// IfcUnitEnum is an enumeration type for allowed unit types of IfcNamedUnit.
 /// 
-/// Use Definition 
+/// ENUMERATION 
 /// 
-/// The IfcLogicalOperatorEnum, when applied in a case of three operands, A, B and C, evaluates for each operator as 
+/// ABSORBEDDOSEUNIT
+///   AMOUNTOFSUBSTANCEUNIT
+///   AREAUNIT
+///   DOSEEQUIVALENTUNIT
+///   ELECTRICCAPACITANCEUNIT
+///   ELECTRICCHARGEUNIT
+///   ELECTRICCONDUCTANCEUNIT
+///   ELECTRICCURRENTUNIT
+///   ELECTRICRESISTANCEUNIT
+///   ELECTRICVOLTAGEUNIT
+///   ENERGYUNIT
+///   FORCEUNIT
+///   FREQUENCYUNIT
+///   ILLUMINANCEUNIT
+///   INDUCTANCEUNIT
+///   LENGTHUNIT
+///   LUMINOUSFLUXUNIT
+///   LUMINOUSINTENSITYUNIT
+///   MAGNETICFLUXDENSITYUNIT
+///   MAGNETICFLUXUNIT
+///   MASSUNIT
+///   PLANEANGLEUNIT
+///   POWERUNIT
+///   PRESSUREUNIT
+///   RADIOACTIVITYUNIT
+///   SOLIDANGLEUNIT
+///   THERMODYNAMICTEMPERATUREUNIT
+///   TIMEUNIT
+///   VOLUMEUNIT
+///   USERDEFINED: User defined unit type. The type of unit is only implied by its name or the usage context.
 /// 
-/// follows:
+/// HISTORY New type in IFC Release 1.5.1.
+typedef enum {IfcUnit_ABSORBEDDOSEUNIT, IfcUnit_AMOUNTOFSUBSTANCEUNIT, IfcUnit_AREAUNIT, IfcUnit_DOSEEQUIVALENTUNIT, IfcUnit_ELECTRICCAPACITANCEUNIT, IfcUnit_ELECTRICCHARGEUNIT, IfcUnit_ELECTRICCONDUCTANCEUNIT, IfcUnit_ELECTRICCURRENTUNIT, IfcUnit_ELECTRICRESISTANCEUNIT, IfcUnit_ELECTRICVOLTAGEUNIT, IfcUnit_ENERGYUNIT, IfcUnit_FORCEUNIT, IfcUnit_FREQUENCYUNIT, IfcUnit_ILLUMINANCEUNIT, IfcUnit_INDUCTANCEUNIT, IfcUnit_LENGTHUNIT, IfcUnit_LUMINOUSFLUXUNIT, IfcUnit_LUMINOUSINTENSITYUNIT, IfcUnit_MAGNETICFLUXDENSITYUNIT, IfcUnit_MAGNETICFLUXUNIT, IfcUnit_MASSUNIT, IfcUnit_PLANEANGLEUNIT, IfcUnit_POWERUNIT, IfcUnit_PRESSUREUNIT, IfcUnit_RADIOACTIVITYUNIT, IfcUnit_SOLIDANGLEUNIT, IfcUnit_THERMODYNAMICTEMPERATUREUNIT, IfcUnit_TIMEUNIT, IfcUnit_VOLUMEUNIT, IfcUnit_USERDEFINED} IfcUnitEnum;
+const char* ToString(IfcUnitEnum v);
+IfcUnitEnum FromString(const std::string& s);
+}
+namespace IfcUnitaryEquipmentTypeEnum {
+/// Enumeration defining the functional type of unitary equipment. 
+///   The IfcUnitaryEquipmentTypeEnum contains the following:
 /// 
-/// TRUTH TABLE: LOGICALAND(A,B,C)
+/// AIRHANDLER: A unitary air handling unit typically containing a fan, economizer, and coils.
+///   AIRCONDITIONINGUNIT: A unitary packaged air-conditioning unit typically used in residential or light commercial applications.
+///   DEHUMIDIFIER: A unitary packaged dehumidification unit.  Note: units supporting multiple modes (dehumidification, cooling, and/or heating) should use AIRCONDITIONINGUNIT.
+///   SPLITSYSTEM: A system which separates the compressor from the evaporator, but acts as a unitary component typically within residential or light commercial applications.
+///   ROOFTOPUNIT: A packaged assembly that is either field-erected or manufactured atop the roof of a large residential or commercial building and acts as a unitary component.
+///   USERDEFINED: User-defined unitary equipment type.
+///   NOTDEFINED:  Undefined unitary equipment type.
 /// 
-/// A
-/// F
-/// F
-/// F
-/// T
-/// F
-/// T
-/// T
-/// T
+/// HISTORY: New enumeration in IFC R2x.  DEHUMIDIFIER added in IFC 2x4
+typedef enum {IfcUnitaryEquipmentType_AIRHANDLER, IfcUnitaryEquipmentType_AIRCONDITIONINGUNIT, IfcUnitaryEquipmentType_SPLITSYSTEM, IfcUnitaryEquipmentType_ROOFTOPUNIT, IfcUnitaryEquipmentType_USERDEFINED, IfcUnitaryEquipmentType_NOTDEFINED} IfcUnitaryEquipmentTypeEnum;
+const char* ToString(IfcUnitaryEquipmentTypeEnum v);
+IfcUnitaryEquipmentTypeEnum FromString(const std::string& s);
+}
+namespace IfcValveTypeEnum {
+/// The IfcValveTypeEnum defines the
+///   range of different types of valve that can be specified. These are typically
+///   used in conjunction with Pset_ValveTypeCommon, which contains common
+///   properties for all valve types. The IfcValveTypeEnum contains:
 /// 
-/// B
-/// F
-/// F
-/// T
-/// F
-/// T
-/// F
-/// T
-/// T
+/// AIRRELEASE: Valve used to release air from a pipe or fitting.  
+///   ANTIVACUUM: Valve that opens to admit air if the pressure falls below
+///   atmospheric pressure (BS6100 330 4104) 
+///   CHANGEOVER: Valve that enables flow to be switched between pipelines (3 or 4
+///   port). 
+///   CHECK: Valve that permits water to flow in one direction only and is
+///   enclosed when there is no flow (2 port). 
+///   COMMISSIONING: Valve used to facilitate commissioning of a system (2 port). 
+///   DIVERTING: Valve that enables flow to be diverted from one branch of a
+///   pipeline to another (3 port). 
+///   DOUBLECHECK: An assembly that incorporates two valves used to prevent backflow
+///   (BS6100 330 4106). 
+///   DOUBLEREGULATING: Valve used to facilitate regulation of fluid flow in a system.
+///   DRAWOFFCOCK: A valve used to remove fluid from a piping system.
+///   FAUCET: Faucet valve typically used as a flow discharge.
+///   FLUSHING: Valve that flushes a predetermined quantity of water to cleanse a
+///   toilet, urinal, etc.
+///   GASCOCK: Valve that is used for controlling the flow of gas. 
+///   GASTAP: Gas tap typically used for venting or discharging gas from a system.
+///   ISOLATING: Valve that closes off flow in a pipeline. 
+///   MIXING: Valve that enables flow from two branches of a pipeline to be mixed
+///   together (3 port). 
+///   PRESSUREREDUCING: Valve that reduces the pressure of a fluid immediately downstream
+///   of its position in a pipeline to a preselected value or by a predetermined
+///   ratio. 
+///   PRESSURERELIEF: Spring or weight loaded valve that automatically discharges to a
+///   safe place fluid that has built up to excessive pressure in pipes or
+///   fittings 
+///   REGULATING: Valve used to facilitate regulation of fluid flow in a system.
+///   SAFETYCUTOFF: Valve that closes under the action of a safety mechanism such as a
+///   drop weight, solenoid etc. 
+///   STEAMTRAP: Valve that restricts flow of steam while allowing condensate to 
+///   pass through. 
+///   STOPCOCK: An isolating valve used on a domestic water service. 
+///   USERDEFINED: User-defined valve type. 
+///   NOTDEFINED: Undefined valve type. 
 /// 
-/// C
-/// F
-/// T
-/// F
-/// F
-/// T
-/// T
-/// F
-/// T
+/// HISTORY: New type in IFC R2.0
+typedef enum {IfcValveType_AIRRELEASE, IfcValveType_ANTIVACUUM, IfcValveType_CHANGEOVER, IfcValveType_CHECK, IfcValveType_COMMISSIONING, IfcValveType_DIVERTING, IfcValveType_DRAWOFFCOCK, IfcValveType_DOUBLECHECK, IfcValveType_DOUBLEREGULATING, IfcValveType_FAUCET, IfcValveType_FLUSHING, IfcValveType_GASCOCK, IfcValveType_GASTAP, IfcValveType_ISOLATING, IfcValveType_MIXING, IfcValveType_PRESSUREREDUCING, IfcValveType_PRESSURERELIEF, IfcValveType_REGULATING, IfcValveType_SAFETYCUTOFF, IfcValveType_STEAMTRAP, IfcValveType_STOPCOCK, IfcValveType_USERDEFINED, IfcValveType_NOTDEFINED} IfcValveTypeEnum;
+const char* ToString(IfcValveTypeEnum v);
+IfcValveTypeEnum FromString(const std::string& s);
+}
+namespace IfcVibrationIsolatorTypeEnum {
+/// Enumeration defining the typical types of vibration isolators. 
+///   The IfcVibrationIsolatorTypeEnum contains the following:
 /// 
-/// AND
-/// F
-/// F
-/// F
-/// F
-/// F
-/// F
-/// F
-/// T
+/// COMPRESSION:  Compression type vibration isolator.
+///   SPRING:  Spring type vibration isolator.
+///   USERDEFINED:  User-defined vibration isolator type.
+///   NOTDEFINED:  Undefined vibration isolator type.
 /// 
-/// TRUTH TABLE: LOGICALOR(A,B,C)
+/// HISTORY: New enumeration in IFC 2x2.
+typedef enum {IfcVibrationIsolatorType_COMPRESSION, IfcVibrationIsolatorType_SPRING, IfcVibrationIsolatorType_USERDEFINED, IfcVibrationIsolatorType_NOTDEFINED} IfcVibrationIsolatorTypeEnum;
+const char* ToString(IfcVibrationIsolatorTypeEnum v);
+IfcVibrationIsolatorTypeEnum FromString(const std::string& s);
+}
+namespace IfcWallTypeEnum {
+/// Definition from IAI: This enumeration defines the
+/// different types of walls an IfcWallType object can
+/// fulfill:
 /// 
-/// A
-/// F
-/// F
-/// F
-/// T
-/// F
-/// T
-/// T
-/// T
+/// STANDARD: A standard wall, extruded vertically with a
+/// constant thickness along the wall path.
+/// POLYGONAL: A polygonal wall, extruded vertically,
+/// where the wall thickness varies along the wall path.
+/// SHEAR: A wall having a non-rectangular cross section
+/// along the wall path.
 /// 
-/// B
-/// F
-/// F
-/// T
-/// F
-/// T
-/// F
-/// T
-/// T
+/// NOTE The potentially misleading term shall not impose
+/// a particular resistance against shear forces, but a particular
+/// shape.
 /// 
-/// C
-/// F
-/// T
-/// F
-/// F
-/// T
-/// T
-/// F
-/// T
+/// ELEMENTEDWALL: A stud wall framed with studs and faced
+/// with sheatings, sidings, wallboard, or plasterwork.
+/// PLUMBINGWALL: A pier, or enclosure, or encasement,
+/// normally used to enclose plumbing in sanitary rooms.
+/// MOVABLE: A movable wall that is either movable, e.g. a
+/// folding wall, or a sliding wall, or can be easily removed as a
+/// removable partitioning or mounting wall. Movable walls do
+/// normally not define space boundaries and often belong to the
+/// furnishing system.
+/// USERDEFINED: User-defined wall element.
+/// NOTDEFINED: Undefined wall element
 /// 
-/// OR
-/// F
-/// T
-/// T
-/// T
-/// T
-/// T
-/// T
-/// T
+/// HISTORY  New
+/// Enumeration in Release IFC2x Edition 2.
+/// IFC2x2 ADDENDUM CHANGE 
+/// The enumerator POLYGON has been changed to
+/// POLYGONAL.
+/// IFC2x3 CHANGE  The enumerators
+/// ELEMENTEDWALL and PLUMBINGWALL have been
+/// added.
+/// IFC2x4 CHANGE  New enumerator
+/// MOVABLE has been added.
+typedef enum {IfcWallType_STANDARD, IfcWallType_POLYGONAL, IfcWallType_SHEAR, IfcWallType_ELEMENTEDWALL, IfcWallType_PLUMBINGWALL, IfcWallType_USERDEFINED, IfcWallType_NOTDEFINED} IfcWallTypeEnum;
+const char* ToString(IfcWallTypeEnum v);
+IfcWallTypeEnum FromString(const std::string& s);
+}
+namespace IfcWasteTerminalTypeEnum {
+/// The IfcWasteTerminalTypeEnum defines the range of different types of waste terminal that can be specified. 
+///   HISTORY: New type in IFC 2x2.  GREASEINTERCEPTOR, OILINTERCEPTOR, PETROLINTERCEPTOR moved to IfcInterceptorTypeEnum in IFC2x4.
 /// 
-/// TRUTH TABLE: LOGICALXOR(A,B,C)
+/// Enumeration 	 
 /// 
-/// A
-/// F
-/// F
-/// F
-/// T
-/// F
-/// T
-/// T
-/// T
+/// FLOORTRAP: Pipe fitting, set into the floor, that retains liquid to prevent the passage of foul air 
+/// FLOOORWASTE: Pipe fitting, set into the floor, that collects waste water and discharges it to a separate trap. 
+/// GULLYSUMP: Pipe fitting or assembly of fittings to receive surface water or waste water, fitted with a grating or sealed cover. 
+/// GULLYTRAP: Pipe fitting or assembly of fittings to receive surface water or waste water, fitted with a grating or sealed cover and discharging through a trap (BS6100 330 3504 modified). 
+/// ROOFDRAIN: Pipe fitting, set into the roof, that collects rainwater for discharge into the rainwater system.  
+/// WASTEDISPOSALUNIT: Electrically operated device that reduces kitchen or other waste into fragments small enough to be flushed into a drainage system. 
+/// WASTETRAP: Pipe fitting, set adjacent to a sanitary terminal, that retains liquid to prevent the passage of foul air. 
+/// USERDEFINED: User-defined type. 
+/// NOTDEFINED: Undefined type.
+typedef enum {IfcWasteTerminalType_FLOORTRAP, IfcWasteTerminalType_FLOORWASTE, IfcWasteTerminalType_GULLYSUMP, IfcWasteTerminalType_GULLYTRAP, IfcWasteTerminalType_GREASEINTERCEPTOR, IfcWasteTerminalType_OILINTERCEPTOR, IfcWasteTerminalType_PETROLINTERCEPTOR, IfcWasteTerminalType_ROOFDRAIN, IfcWasteTerminalType_WASTEDISPOSALUNIT, IfcWasteTerminalType_WASTETRAP, IfcWasteTerminalType_USERDEFINED, IfcWasteTerminalType_NOTDEFINED} IfcWasteTerminalTypeEnum;
+const char* ToString(IfcWasteTerminalTypeEnum v);
+IfcWasteTerminalTypeEnum FromString(const std::string& s);
+}
+namespace IfcWindowPanelOperationEnum {
+/// This enumeration defines the basic ways to describe how window panels operate, as shown in Figure 168. 
 /// 
-/// B
-/// F
-/// F
-/// T
-/// F
-/// T
-/// F
-/// T
-/// T
+/// HISTORY New Enumeration in IFC Release 2.0
 /// 
-/// C
-/// F
-/// T
-/// F
-/// F
-/// T
-/// T
-/// F
-/// T
+/// Enumerator 
+///   Description 
+///   Figure 
 /// 
-/// XOR
-/// F
-/// T
-/// T
-/// T
-/// F
-/// F
-/// F
-/// F
+/// SideHungRightHand 
+///   panel that opens to the right
+///   when viewed from the outside 
+///     
 /// 
-/// TRUTH TABLE: LOGICALNOTAND(A,B,C)
+/// SideHungLeftHand 
+///   panel that opens to the left
+///   when viewed from the outside 
+///     
 /// 
-/// A
-/// F
-/// F
-/// F
-/// T
-/// F
-/// T
-/// T
-/// T
+/// TiltAndTurnRightHand 
+///   panel that opens to the right
+///   and is bottom hung 
+///     
 /// 
-/// B
-/// F
-/// F
-/// T
-/// F
-/// T
-/// F
-/// T
-/// T
+/// TiltAndTurnLeftHand 
+///   panel that opens to the left
+///   and is bottom hung 
+///     
 /// 
-/// C
-/// F
-/// T
-/// F
-/// F
-/// T
-/// T
-/// F
-/// T
+/// TopHung 
+///   panel is top hung 
+///     
 /// 
-/// NOTAND
-/// T
-/// T
-/// T
-/// T
-/// T
-/// T
-/// T
-/// F
+/// BottomHung 
+///   panel is bottom hung 
+///     
 /// 
-/// TRUTH TABLE: LOGICALNOTOR(A,B,C)
+/// PivotHorizontal 
+///   panel is swinging
+///   horizontally (hinges are in the middle) 
+///     
 /// 
-/// A
-/// F
-/// F
-/// F
-/// T
-/// F
-/// T
-/// T
-/// T
+/// PivotVertical 
+///   panel is swinging vertically
+///   (hinges are in the middle) 
+///     
 /// 
-/// B
-/// F
-/// F
-/// T
-/// F
-/// T
-/// F
-/// T
-/// T
+/// SlidingHorizontal 
+///   panel is sliding horizontally
 /// 
-/// C
-/// F
-/// T
-/// F
-/// F
-/// T
-/// T
-/// F
-/// T
+///   
 /// 
-/// NOTOR
-/// T
-/// F
-/// F
-/// F
-/// F
-/// F
-/// F
-/// F
-typedef enum {IfcLogicalOperator_LOGICALAND, IfcLogicalOperator_LOGICALOR} IfcLogicalOperatorEnum;
-const char* ToString(IfcLogicalOperatorEnum v);
-IfcLogicalOperatorEnum FromString(const std::string& s);
-}
-namespace IfcMemberTypeEnum {
-/// Definition from IAI: This enumeration defines the
-/// different types of linear elements an IfcMemberType object
-/// can fulfill:
+/// SlidingVertical 
+///   panel is sliding
+///   vertically 
+///     
 /// 
-/// BRACE: A linear element (usually sloped) often used
-/// for bracing of a girder or truss.
-/// CHORD: Upper or lower longitudinal member of a truss,
-/// used horizontally or sloped.
-/// COLLAR: A linear element (usually used horizontally)
-/// within a roof structure to connect rafters and posts.
-/// MEMBER: A linear element within a girder or truss with
-/// no further meaning.
-/// MULLION: A linear element within a curtain wall system
-/// to connect two (or more) panels.
-/// PLATE: A linear continuous horizontal element in wall
-/// framing, e.g. a head piece or a sole plate.
+/// RemovableCasement 
+///   panel is removable 
+///     
 /// 
-/// NOTE  This head piece or sole plate shall not
-/// be mixed up with planar elements, such as sheets and panels, that
-/// are handled as IfcPlate (and
-/// IfcPlateType).
+/// FixedCasement 
+///   panel is fixed 
+///     
 /// 
-/// POST: A linear member (usually used vertically) within
-/// a roof structure to support purlins.
-/// PURLIN: A linear element (usually used horizontally)
-/// within a roof structure to support rafters
-/// RAFTER: A linear elements used to support roof slabs
-/// or roof covering, usually used with slope.
-/// STRINGER: A linear element used to support stair or
-/// ramp flights, usually used with slope.
-/// STRUT: A linear element often used within a girder or
-/// truss.
-/// STUD: Vertical element in wall framing.
-/// USERDEFINED: User-defined linear element.
-/// NOTDEFINED: Undefined linear element
+/// OtherOperation 
+///   user defined operation type 
+///     
 /// 
-/// HISTORY: New
-/// Enumeration in Release IFC2x Edition 2.
-/// IFC2x Edition 2
-/// Addendum 1 CHANGE  The additional identifiers CHORD, PLATE, STUD
-/// are added.
-/// IFC2x Edition 3 CHANGE  The additional identifier MULLION has
-/// been added.
-typedef enum {IfcMemberType_BRACE, IfcMemberType_CHORD, IfcMemberType_COLLAR, IfcMemberType_MEMBER, IfcMemberType_MULLION, IfcMemberType_PLATE, IfcMemberType_POST, IfcMemberType_PURLIN, IfcMemberType_RAFTER, IfcMemberType_STRINGER, IfcMemberType_STRUT, IfcMemberType_STUD, IfcMemberType_USERDEFINED, IfcMemberType_NOTDEFINED} IfcMemberTypeEnum;
-const char* ToString(IfcMemberTypeEnum v);
-IfcMemberTypeEnum FromString(const std::string& s);
-}
-namespace IfcMotorConnectionTypeEnum {
-/// The IfcMotorConnectionTypeEnum defines the range of different types of motor connection that can be specified. 
-///   HISTORY: New type in IFC 2x.  
-///   Enumeration 
+/// NotDefined 
+///     
+///     
 /// 
-/// BELTDRIVE: An indirect connection made through the medium of a shaped, flexible continuous loop. 
-/// COUPLING: An indirect connection made through the medium of the viscosity of a fluid. 
-/// DIRECTDRIVE: A direct, physical connection made between the motor and the driven device. 
-/// USERDEFINED: User-defined type. 
-/// NOTDEFINED: Undefined type.
-typedef enum {IfcMotorConnectionType_BELTDRIVE, IfcMotorConnectionType_COUPLING, IfcMotorConnectionType_DIRECTDRIVE, IfcMotorConnectionType_USERDEFINED, IfcMotorConnectionType_NOTDEFINED} IfcMotorConnectionTypeEnum;
-const char* ToString(IfcMotorConnectionTypeEnum v);
-IfcMotorConnectionTypeEnum FromString(const std::string& s);
-}
-namespace IfcNullStyle {
-/// Definition from ISO/CD 10303-46:1992: The null style type specifies, that a representation item is not styled.
+/// Figure 168 — Window panel operations
 /// 
-/// NOTE  Corresponding ISO 10303 name: null_style. Please refer to ISO/IS 10303-46:1994 for the final
-/// definition of the formal standard.
+/// The opening direction of the window panels is given by the local placement of the IfcWindow. The positive y-axis determines the direction as shown in Figure 169.
+///   NOTE 
 /// 
-/// HISTORY  New enumeration in IFC2x2.
+/// Figures are shown as viewed from the outside (in direction of the
+///   positive y-axis). 
+///   Figures (symbolic representation) depend on the national building
+///   code 
+///   These figures are only shown as illustrations 
 /// 
-/// IFC2x4 CHANGE  The enumeration is deprecated.
-typedef enum {IfcNullStyle_NULL} IfcNullStyle;
-const char* ToString(IfcNullStyle v);
-IfcNullStyle FromString(const std::string& s);
+/// Figure 169 — Window panel directions
+typedef enum {IfcWindowPanelOperation_SIDEHUNGRIGHTHAND, IfcWindowPanelOperation_SIDEHUNGLEFTHAND, IfcWindowPanelOperation_TILTANDTURNRIGHTHAND, IfcWindowPanelOperation_TILTANDTURNLEFTHAND, IfcWindowPanelOperation_TOPHUNG, IfcWindowPanelOperation_BOTTOMHUNG, IfcWindowPanelOperation_PIVOTHORIZONTAL, IfcWindowPanelOperation_PIVOTVERTICAL, IfcWindowPanelOperation_SLIDINGHORIZONTAL, IfcWindowPanelOperation_SLIDINGVERTICAL, IfcWindowPanelOperation_REMOVABLECASEMENT, IfcWindowPanelOperation_FIXEDCASEMENT, IfcWindowPanelOperation_OTHEROPERATION, IfcWindowPanelOperation_NOTDEFINED} IfcWindowPanelOperationEnum;
+const char* ToString(IfcWindowPanelOperationEnum v);
+IfcWindowPanelOperationEnum FromString(const std::string& s);
 }
-namespace IfcObjectTypeEnum {
-/// This enumeration defines the applicable object categories, that is, the subtypes at the 2nd level of the IFC inheritance tree. Attached to an object, it indicates to which subtype of IfcObject the entity referencing it would otherwise comply with. 
+namespace IfcWindowPanelPositionEnum {
+/// This enumeration defines the basic configuration of the window type in terms of the location of window panels. The window configurations are given for windows with one, two or three panels (including fixed panels) as shown in Figure 170. It corresponds to the OperationType of the IfcWindowStyle definition, which references the IfcWindowPanelProperties. 
 /// 
-/// HISTORY New entity in IFC Release 1.0, has been renamed from IfcProxyEnum in IFC 2x.
-typedef enum {IfcObjectType_PRODUCT, IfcObjectType_PROCESS, IfcObjectType_CONTROL, IfcObjectType_RESOURCE, IfcObjectType_ACTOR, IfcObjectType_GROUP, IfcObjectType_PROJECT, IfcObjectType_NOTDEFINED} IfcObjectTypeEnum;
-const char* ToString(IfcObjectTypeEnum v);
-IfcObjectTypeEnum FromString(const std::string& s);
-}
-namespace IfcObjectiveEnum {
-/// IfcObjectiveEnum is an enumeration used to determine the objective for which purpose the constraint needs to be satisfied. 
+/// Windows which are subdivided into more than three panels have to be defined by the geometry only. The type of such windows is given by an IfcWindowStyle.OperationType = USERDEFINED or NOTDEFINED (see IfcWindowStyleOperationEnum for details). 
 /// 
-/// HISTORY: IFC2x4 CHANGE: Extended to include CODEWAIVER.
+/// HISTORY New Enumeration in IFC Release 2.0.
 /// 
-/// Enumeration 
+/// Enumerator from IfcWindowStyleOperationEnum 
+///   Use of enumerators from IfcWindowPanelPositionEnum 
+///   Figure 
 /// 
-/// Value 
-///   Definition 
+/// DoublePanelVertical 
+///   first
+///   IfcWindowPanelProperties with PanelPosition = LEFTsecond
+///   IfcWindowPanelProperties with PanelPosition = RIGHT 
 /// 
-/// CODECOMPLIANCE 
-///   A constraint whose objective is to ensure satisfaction of a code compliance provision. 
+/// DoublePanelHorizontal 
+///   first
+///   IfcWindowPanelProperties with PanelPosition = TOPsecond
+///   IfcWindowPanelProperties with PanelPosition = BOTTOM 
 /// 
-/// CODEWAIVER 
-///   A constraint whose objective is to identify an agreement that code compliance requirements (the waiver) will not be enforced. 
+/// TriplePanelVertical 
+///   first
+///   IfcWindowPanelProperties with PanelPosition = LEFTsecond
+///   IfcWindowPanelProperties with PanelPosition = MIDDLEthird
+///   IfcWindowPanelProperties with PanelPosition = RIGHT 
 /// 
-/// DESIGNINTENT 
-///   A constraint whose objective is to ensure satisfaction of a design intent provision. 
+/// TriplePanelHorizontal  
+///   first
+///   IfcWindowPanelProperties with PanelPosition = TOPsecond
+///   IfcWindowPanelProperties with PanelPosition = MIDDLEthird
+///   IfcWindowPanelProperties with PanelPosition = BOTTOM 
 /// 
-/// HEALTHANDSAFETY 
-///   A constraint whose objective is to ensure satisfaction of a health and safety provision. 
+/// TriplePanelBottom 
+///   first
+///   IfcWindowPanelProperties with PanelPosition = LEFTsecond
+///   IfcWindowPanelProperties with PanelPosition = RIGHTthird
+///   IfcWindowPanelProperties with PanelPosition = BOTTOM 
 /// 
-/// REQUIREMENT 
-///   A constraint whose objective is to ensure satisfaction of a project requirement provision. 
+/// TriplePanelTop 
+///   first
+///   IfcWindowPanelProperties with PanelPosition = TOPsecond
+///   IfcWindowPanelProperties with PanelPosition = LEFTthird
+///   IfcWindowPanelProperties with PanelPosition = RIGHT 
 /// 
-/// SPECIFICATION 
-///   A constraint whose objective is to ensure satisfaction of a specification provision. 
+/// TriplePanelLeft 
+///   first
+///   IfcWindowPanelProperties with PanelPosition = LEFTsecond
+///   IfcWindowPanelProperties with PanelPosition = TOPthird
+///   IfcWindowPanelProperties with PanelPosition = BOTTOM 
 /// 
-/// TRIGGERCONDITION 
-///   A constraint whose objective is to indicate a limiting value beyond which the condition of an object requires a particular form of attention.
-typedef enum {IfcObjective_CODECOMPLIANCE, IfcObjective_DESIGNINTENT, IfcObjective_HEALTHANDSAFETY, IfcObjective_REQUIREMENT, IfcObjective_SPECIFICATION, IfcObjective_TRIGGERCONDITION, IfcObjective_USERDEFINED, IfcObjective_NOTDEFINED} IfcObjectiveEnum;
-const char* ToString(IfcObjectiveEnum v);
-IfcObjectiveEnum FromString(const std::string& s);
-}
-namespace IfcOccupantTypeEnum {
-/// IfcOccupantTypeEnum defines the types of occupant from which the type required can be selected. 
-///   HISTORY: New Enumeration in IFC Release 2.0 Modified in IFC 2x2 
-///   Enumeration: 
+/// TriplePanelRight 
+///   first
+///   IfcWindowPanelProperties with PanelPosition = TOPsecond
+///   IfcWindowPanelProperties with PanelPosition = BOTTOMthird
+///   IfcWindowPanelProperties with PanelPosition = RIGHT 
 /// 
-/// ASSIGNEE: Actor receiving the assignment of a property agreement from an assignor  
-/// ASSIGNOR: Actor assigning a property agreement to an assignor  
-/// LESSEE: Actor receiving the lease of a property from a lessor  
-/// LESSOR: Actor leasing a property to a lessee  
-/// LETTINGAGENT: Actor participating in a property agreement on behalf of an owner, lessor or assignor  
-/// OWNER: Actor that owns a property  
-/// TENANT: Actor renting the use of a property fro a period of time  
-/// USERDEFINED: User-defined type.  
-/// NOTDEFINED: Undefined type.
-typedef enum {IfcOccupantType_ASSIGNEE, IfcOccupantType_ASSIGNOR, IfcOccupantType_LESSEE, IfcOccupantType_LESSOR, IfcOccupantType_LETTINGAGENT, IfcOccupantType_OWNER, IfcOccupantType_TENANT, IfcOccupantType_USERDEFINED, IfcOccupantType_NOTDEFINED} IfcOccupantTypeEnum;
-const char* ToString(IfcOccupantTypeEnum v);
-IfcOccupantTypeEnum FromString(const std::string& s);
-}
-namespace IfcOutletTypeEnum {
-/// The IfcOutletTypeEnum defines the range of different types of outlet that can be specified. 
+/// Figure 170 — Window panel positions
 /// 
-/// HISTORY: New type in IFC 2x. Telephone and Data outlets added in IFC 2x4
+/// NOTE 
 /// 
-/// Enumeration 
+/// The figures are shown as elevations in the XZ plane of the local
+///   placement of the window, looking into the direction of the positive Y
+///   axis. 
+///   These figures are only shown as illustrations.
+typedef enum {IfcWindowPanelPosition_LEFT, IfcWindowPanelPosition_MIDDLE, IfcWindowPanelPosition_RIGHT, IfcWindowPanelPosition_BOTTOM, IfcWindowPanelPosition_TOP, IfcWindowPanelPosition_NOTDEFINED} IfcWindowPanelPositionEnum;
+const char* ToString(IfcWindowPanelPositionEnum v);
+IfcWindowPanelPositionEnum FromString(const std::string& s);
+}
+namespace IfcWindowStyleConstructionEnum {
+/// Definition from IAI: This enumeration defines the
+///   basic types of construction of windows. The construction
+///   type relates to the main material (or material combination)
+///   used for making the window.
 /// 
-/// AUDIOVISUALOUTLET: An outlet used for an audio or visual device. 
-/// COMMUNICATIONSOUTLET: An outlet used for connecting communications equipment. 
-/// POWEROUTLET: An outlet used for connecting electrical devices requiring power.  
-/// DATAOUTLET: An outlet used for connecting data communications equipment. 
-/// TELEPHONEOUTLET: An outlet used for connecting telephone communications equipment.  
-/// USERDEFINED: User-defined type. 
-/// NOTDEFINED: Undefined type.
-typedef enum {IfcOutletType_AUDIOVISUALOUTLET, IfcOutletType_COMMUNICATIONSOUTLET, IfcOutletType_POWEROUTLET, IfcOutletType_USERDEFINED, IfcOutletType_NOTDEFINED} IfcOutletTypeEnum;
-const char* ToString(IfcOutletTypeEnum v);
-IfcOutletTypeEnum FromString(const std::string& s);
+/// HISTORY New Enumeration in
+///   IFC Release 2x .
+typedef enum {IfcWindowStyleConstruction_ALUMINIUM, IfcWindowStyleConstruction_HIGH_GRADE_STEEL, IfcWindowStyleConstruction_STEEL, IfcWindowStyleConstruction_WOOD, IfcWindowStyleConstruction_ALUMINIUM_WOOD, IfcWindowStyleConstruction_PLASTIC, IfcWindowStyleConstruction_OTHER_CONSTRUCTION, IfcWindowStyleConstruction_NOTDEFINED} IfcWindowStyleConstructionEnum;
+const char* ToString(IfcWindowStyleConstructionEnum v);
+IfcWindowStyleConstructionEnum FromString(const std::string& s);
 }
-namespace IfcPermeableCoveringOperationEnum {
-/// Definition: Enumeration defining the valid types of permeable coverings. 
+namespace IfcWindowStyleOperationEnum {
+/// This enumeration defines the basic
+///   configuration of the window type in terms of the number of window panels and
+///   the subdivision of the total window. The window configurations are given for
+///   windows with one, two or three panels (including fixed panels) as shown in Figure 171. 
+///   Windows which are subdivided into more than three panels have to be
+///   defined by the geometry only. The type of such windows is USERDEFINED. 
+///   HISTORY New Enumeration in IFC Release 2.0. 
 /// 
-/// Enumeration:
+/// Enumerator 
+///   Description 
+///   Figure 
 /// 
-/// GRILL 
-///   protective screen of metal bars or wires
+/// SinglePanel 
+///   Window with one
+///   panel. 
 /// 
-/// LOUVER 
-///   set of fixed or movable strips of wood, metal, etc. arranged to let
-///   air in while keeping light or rain out
+/// DoublePanelVertical 
+///   Window with two panels. The
+///   configuration of the panels is vertically. 
 /// 
-/// SCREEN 
-///   upright, fixed or movable, sometimes folding framework used for
-///   protection against heat, light, access or similar
+/// DoublePanelHorizontal 
+///   Window with two panels. The
+///   configuration of the panels is horizontally. 
 /// 
-/// USERDEFINED 
-///   user defined permeable covering type
+/// TriplePanelVertical 
+///   Window with three panels. The
+///   configuration of the panels is vertically. 
 /// 
-/// NOTDEFINED 
-///   no information available
+/// TriplePanelHorizontal  
+///   Window with three panels. The
+///   configuration of the panels is horizontally. 
 /// 
-/// HISTORY: New Enumeration in IFC Release 2.0
-typedef enum {IfcPermeableCoveringOperation_GRILL, IfcPermeableCoveringOperation_LOUVER, IfcPermeableCoveringOperation_SCREEN, IfcPermeableCoveringOperation_USERDEFINED, IfcPermeableCoveringOperation_NOTDEFINED} IfcPermeableCoveringOperationEnum;
-const char* ToString(IfcPermeableCoveringOperationEnum v);
-IfcPermeableCoveringOperationEnum FromString(const std::string& s);
-}
-namespace IfcPhysicalOrVirtualEnum {
-/// Definition from IAI: This enumeration defines the
-///   different types of space boundaries in terms of its
-///   physical manifestation. A space boundary can either be
-///   physically dividing or can be a virtual divider.
+/// TriplePanelBottom 
+///   Window with three panels. The
+///   configuration of two panels is vertically and the third one is horizontally at
+///   the bottom. 
 /// 
-/// Enumeration:
+/// TriplePanelTop 
+///   Window with three panels. The
+///   configuration of two panels is vertically and the third one is horizontally at
+///   the top. 
 /// 
-/// PHYSICAL
+/// TriplePanelLeft 
+///   Window with three panels. The
+///   configuration of two panels is horizontally and the third one is vertically at
+///   the left hand side. 
 /// 
-/// The space boundary is provided physically, i.e. by an
-///   physical element.
+/// TriplePanelRight 
+///   Window with three panels. The
+///   configuration of two panels is horizontally and the third one is vertically at
+///   the right hand side. 
 /// 
-/// VIRTUAL
+/// UserDefined 
+///   user defined operation
+///   type 
+///     
 /// 
-/// The space boundary is provided virtually, i.e. by a
-///   logical divider that has no physical manifestation.
+/// NotDefined 
+///     
+///     
 /// 
-/// NOTDEFINED
+/// Figure 171 — Window style operations
 /// 
-/// No information available.
+/// NOTE 
 /// 
-/// HISTORY: New enumeration in
-///   IFC Release 2.0
-typedef enum {IfcPhysicalOrVirtual_PHYSICAL, IfcPhysicalOrVirtual_VIRTUAL, IfcPhysicalOrVirtual_NOTDEFINED} IfcPhysicalOrVirtualEnum;
-const char* ToString(IfcPhysicalOrVirtualEnum v);
-IfcPhysicalOrVirtualEnum FromString(const std::string& s);
+/// The way how each panel operates is defined at the
+///   IfcWindowPanelProperties.OperationType. 
+///   The reference from the window panel to the location of that panel in
+///   the window style configuration is handled by the
+///   IfcWindowPanelProperties.PanelPosition. 
+///   The figures are shown as elevations in the XZ plane of the local
+///   placement of the window, looking into the direction of the positive Y
+///   axis. 
+///   These figures are only shown as illustrations
+typedef enum {IfcWindowStyleOperation_SINGLE_PANEL, IfcWindowStyleOperation_DOUBLE_PANEL_VERTICAL, IfcWindowStyleOperation_DOUBLE_PANEL_HORIZONTAL, IfcWindowStyleOperation_TRIPLE_PANEL_VERTICAL, IfcWindowStyleOperation_TRIPLE_PANEL_BOTTOM, IfcWindowStyleOperation_TRIPLE_PANEL_TOP, IfcWindowStyleOperation_TRIPLE_PANEL_LEFT, IfcWindowStyleOperation_TRIPLE_PANEL_RIGHT, IfcWindowStyleOperation_TRIPLE_PANEL_HORIZONTAL, IfcWindowStyleOperation_USERDEFINED, IfcWindowStyleOperation_NOTDEFINED} IfcWindowStyleOperationEnum;
+const char* ToString(IfcWindowStyleOperationEnum v);
+IfcWindowStyleOperationEnum FromString(const std::string& s);
 }
-namespace IfcPileConstructionEnum {
-/// Definition from IAI: Enumeration defining the construction type
-///   for piles. The type is mainly based on how the piles are used and manufactured.
-///   Some material information is mixed in because this affects the way the piles
-///   are used.  
-/// 
-/// HISTORY New type in IFC Release 2x2
-/// 
-/// ENUMERATION 
-/// 
-/// CAST_IN_PLACE Piles and piers that are excavated and poured in
-///   place. 
-///   COMPOSITE Piles that are a mix of components, such as a steel
-///   outer casing which is driven into the ground with a cast-in-place concrete
-///   core. 
-///   PRECAST_CONCRETE Piles that are entirely of precast concrete
-///   (possibly with some steel or other fixtures). 
-///   PREFAB_STEEL Prefabricated piles made entirely out of steel.
-///   It will also include steel sheet piles where these are not part of another
-///   construction element. 
-///   USERDEFINED Special types of pile construction which meet
-///   specific local requirements. 
-///   NOTDEFINED The type of pile construction is not defined.
-typedef enum {IfcPileConstruction_CAST_IN_PLACE, IfcPileConstruction_COMPOSITE, IfcPileConstruction_PRECAST_CONCRETE, IfcPileConstruction_PREFAB_STEEL, IfcPileConstruction_USERDEFINED, IfcPileConstruction_NOTDEFINED} IfcPileConstructionEnum;
-const char* ToString(IfcPileConstructionEnum v);
-IfcPileConstructionEnum FromString(const std::string& s);
+namespace IfcWorkControlTypeEnum {
+
+typedef enum {IfcWorkControlType_ACTUAL, IfcWorkControlType_BASELINE, IfcWorkControlType_PLANNED, IfcWorkControlType_USERDEFINED, IfcWorkControlType_NOTDEFINED} IfcWorkControlTypeEnum;
+const char* ToString(IfcWorkControlTypeEnum v);
+IfcWorkControlTypeEnum FromString(const std::string& s);
 }
-namespace IfcPileTypeEnum {
-/// Definition from IAI: Enumeration defining the pile type. 
+/// IfcAbsorbedDoseMeasure is a measure of the absorbed radioactivity dose.
+/// Usually measured in Gray (Gy, J/kg).
+/// Type: REAL
+/// 
+/// HISTORY New type in IFC Release 2x.
+class IfcAbsorbedDoseMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcAbsorbedDoseMeasure (IfcAbstractEntity* e);
+    IfcAbsorbedDoseMeasure (double v);
+    operator double() const;
+};
+/// IfcAccelerationMeasure is a measure of acceleration.
+/// Usually measured in m/s2.
+/// Type: REAL
 /// 
-/// HISTORY New type in IFC Release 2x2
-/// IFC 2x4 change:  Items BORED, DRIVEN, JETGROUTING added
+/// HISTORY New type in IFC Release 2x.
+class IfcAccelerationMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcAccelerationMeasure (IfcAbstractEntity* e);
+    IfcAccelerationMeasure (double v);
+    operator double() const;
+};
+/// Definition from ISO/CD 10303-41:1992: An amount of substance measure is the value for the quantity  of a substance when compared with the number of atoms in 0.012kilogram of carbon 12.
 /// 
-/// BORED A bore pile.
-///   DRIVEN A rammed, vibrated, or otherwise driven pile.
-///   JETGROUTING An injected pile-like construction.
-///   COHESION A cohesion pile.
-///   FRICTION A friction pile.
-///   SUPPORT A support pile.
-///   USERDEFINED The type of pile function is user defined.
-///   NOTDEFINED The type of pile function is not defined.
-typedef enum {IfcPileType_COHESION, IfcPileType_FRICTION, IfcPileType_SUPPORT, IfcPileType_USERDEFINED, IfcPileType_NOTDEFINED} IfcPileTypeEnum;
-const char* ToString(IfcPileTypeEnum v);
-IfcPileTypeEnum FromString(const std::string& s);
-}
-namespace IfcPipeFittingTypeEnum {
-/// This enumeration is used to identify the primary purpose of a pipe fitting. This is a very basic categorization mechanism
-///   to generically identify the pipe fitting type. Subcategories
-///   of pipe fittings are not enumerated. 
-///   The IfcpipeFittingTypeEnum contains the following:
+/// Usually measure in mole (mol).
+/// Type: REAL
 /// 
-/// BEND:		A fitting with typically two ports used to change 
-///   the direction of flow between connected elements.
-///   CONNECTOR:   Connector fitting, typically used to join two
-///   ports together within a flow distribution system 
-///   (e.g., a coupling used to join two pipe segments).
-///   ENTRY:       Entry fitting, typically unconnected at one port
-///   and connected to a flow distribution system at 
-///   the other (e.g., a breeching inlet).
-///   EXIT:        Exit fitting, typically unconnected at one port
-///   and connected to a flow distribution system at 
-///   the other (e.g., a hose bibb).
-///   JUNCTION:	A fitting with typically more than two ports used
-///   to redistribute flow among the ports and/or to
-///   change the direction of flow between connected
-///   elements (e.g, tee, cross, wye, etc.).
-///   OBSTRUCTION: A fitting with typically two ports used to 
-///   obstruct or restrict flow between the connected
-///   elements (e.g., screen, perforated plate, etc.).
-///   TRANSITION:	A fitting with typically two ports having
-///   different shapes or sizes. Can also be used to
-///   change the direction of flow between connected
-///   elements.
-///   USERDEFINED: User-defined fitting.
-///   NOTDEFINED:  Undefined fitting.
+/// NOTE Corresponding ISO 10303 name: amount_of_substance_measure, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
 /// 
-/// HISTORY: New enumeration in IFC 2x2
-typedef enum {IfcPipeFittingType_BEND, IfcPipeFittingType_CONNECTOR, IfcPipeFittingType_ENTRY, IfcPipeFittingType_EXIT, IfcPipeFittingType_JUNCTION, IfcPipeFittingType_OBSTRUCTION, IfcPipeFittingType_TRANSITION, IfcPipeFittingType_USERDEFINED, IfcPipeFittingType_NOTDEFINED} IfcPipeFittingTypeEnum;
-const char* ToString(IfcPipeFittingTypeEnum v);
-IfcPipeFittingTypeEnum FromString(const std::string& s);
-}
-namespace IfcPipeSegmentTypeEnum {
-/// This enumeration is used to identify the primary purpose of a
-///   pipe segment. This is a very basic categorization mechanism
-///   to generically identify the pipe segment type. Subcategories
-///   of pipe segments are not enumerated. 
-///   The IfcPipeSegmentTypeEnum contains the following:
+/// HISTORY New type in IFC Release 1.5.1.
+class IfcAmountOfSubstanceMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcAmountOfSubstanceMeasure (IfcAbstractEntity* e);
+    IfcAmountOfSubstanceMeasure (double v);
+    operator double() const;
+};
+/// IfcAngularVelocityMeasure is a measure of the velocity of a body measured in terms of angle subtended per unit time.
+/// Usually measured in radians/s.
+/// Type: REAL
 /// 
-/// CULVERT: A covered channel or large pipe that forms a watercourse below ground level, usually under a road or railway.
-///   RIGIDSEGMENT: A rigid segment is continuous linear segment of pipe that cannot be deformed.
-///   FLEXIBLESEGMENT:  A flexible segment is a continuous non-linear segment of pipe that can be deformed and change the direction of flow.
-///   GUTTER: A gutter segment is a continuous open-channel segment of pipe.
-///   SPOOL: A type of rigid segment that is typically shorter and used for providing connectivity within a piping network.
-///   USERDEFINED: User-defined segment.
-///   NOTDEFINED:  Undefined segment.
+/// HISTORY New type in IFC Release 2.0.
+class IfcAngularVelocityMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcAngularVelocityMeasure (IfcAbstractEntity* e);
+    IfcAngularVelocityMeasure (double v);
+    operator double() const;
+};
+/// Definition from ISO/CD 10303-41:1992: An area measure is the value of the extent of a surface.
+/// Usually measured in square metre (m2).
+/// Type: REAL
 /// 
-/// HISTORY: New enumeration in IFC 2x2
-typedef enum {IfcPipeSegmentType_FLEXIBLESEGMENT, IfcPipeSegmentType_RIGIDSEGMENT, IfcPipeSegmentType_GUTTER, IfcPipeSegmentType_SPOOL, IfcPipeSegmentType_USERDEFINED, IfcPipeSegmentType_NOTDEFINED} IfcPipeSegmentTypeEnum;
-const char* ToString(IfcPipeSegmentTypeEnum v);
-IfcPipeSegmentTypeEnum FromString(const std::string& s);
-}
-namespace IfcPlateTypeEnum {
-/// Definition from IAI: This enumeration
-/// defines the different types of planar elements an IfcPlateType
-/// object can fulfill:
+/// NOTE Corresponding ISO 10303 name: area_measure, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
 /// 
-/// CURTAIN_PANEL: A planar element within a
-/// curtain wall, often consisting of a frame with fixed glazing.
-///   SHEET: A planar, flat and thin element,
-/// comes usually as metal sheet, and is often used as an additonal part
-/// within an assembly.
-///   USERDEFINED: User-defined linear element.
-///   NOTDEFINED: Undefined linear element
+/// HISTORY New type in IFC Release 1.5.1.
+class IfcAreaMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcAreaMeasure (IfcAbstractEntity* e);
+    IfcAreaMeasure (double v);
+    operator double() const;
+};
+/// IfcBoolean is a defined data type of simple data type Boolean. It is required since a select type (IfcSimpleValue) cannot directly include simple types in its select list.  A boolean type can have value TRUE or FALSE.
 /// 
-/// HISTORY  New Enumeration in Release IFC2x Edition 2. 
-/// IFC2x
-/// Edition 3
-/// CHANGE  The additional identifiers CURTAIN_PANEL, SHEET have
-/// been
-/// added.
-typedef enum {IfcPlateType_CURTAIN_PANEL, IfcPlateType_SHEET, IfcPlateType_USERDEFINED, IfcPlateType_NOTDEFINED} IfcPlateTypeEnum;
-const char* ToString(IfcPlateTypeEnum v);
-IfcPlateTypeEnum FromString(const std::string& s);
-}
-namespace IfcProcedureTypeEnum {
-/// The IfcProcedureTypeEnum defines the range of different types of procedure that can be specified.
+/// Type: BOOLEAN
 /// 
-/// HISTORY: New type in IFC2x2
+/// HISTORY New type in IFC Release 1.5.1.
+class IfcBoolean : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcBoolean (IfcAbstractEntity* e);
+    IfcBoolean (bool v);
+    operator bool() const;
+};
+/// IfcComplexNumber is a representation of a complex number expressed as an array with two elements.
+///   The first element (index 1) denotes the real component which is the numerical
+///   component of a complex number whose square roots can be calculated explicitly.
+///   The second element (index 2) denotes the imaginary component which is the numerical
+///   component of a complex number whose square roots cannot be determined other
+///   than through the provision of the square of the imaginary number j where j^2 = -1.
+///   Note that the imaginary component may be referred to as i in certain references.
 /// 
-/// Enumeration:
+/// Type: ARRAY [1:2] OF REAL
 /// 
-/// ADVICE_CAUTION: A caution that should be taken note of as a procedure or when carrying out a procedure
-/// ADVICE_NOTE: Additional information or advice that should be taken note of as a procedure or when carrying out a procedure
-/// ADVICE_WARNING: A warning of potential danger that should be taken note of as a procedure or when carrying out a procedure
-/// CALIBRATION: A procedure undertaken to calibrate an artifact
-/// SHUTDOWN: A procedure undertaken to shutdown the operation an artifact
-/// STARTUP: A procedure undertaken to start up the operation an artifact
-/// USERDEFINED
-/// NOTDEFINED
-typedef enum {IfcProcedureType_ADVICE_CAUTION, IfcProcedureType_ADVICE_NOTE, IfcProcedureType_ADVICE_WARNING, IfcProcedureType_CALIBRATION, IfcProcedureType_DIAGNOSTIC, IfcProcedureType_SHUTDOWN, IfcProcedureType_STARTUP, IfcProcedureType_USERDEFINED, IfcProcedureType_NOTDEFINED} IfcProcedureTypeEnum;
-const char* ToString(IfcProcedureTypeEnum v);
-IfcProcedureTypeEnum FromString(const std::string& s);
-}
-namespace IfcProfileTypeEnum {
-/// The enumeration defines whether the definition of a profile shape shall be geometrically resolved into a curve or into a surface.
+/// HISTORY New type in IFC Release 2x2.
+class IfcComplexNumber : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcComplexNumber (IfcAbstractEntity* e);
+    IfcComplexNumber (std::vector< double > /*[1:2]*/ v);
+    operator std::vector< double > /*[1:2]*/() const;
+};
+/// IfcCompoundPlaneAngleMeasure is a compound measure of plane angle in degrees, minutes, seconds, and optionally millionth-seconds of arc.
 /// 
-/// HISTORY: New type in IFC 1.5.
+/// NOTE: IfcCompoundPlaneAngleMeasure is used where angles need to be described to an accuracy as fine as one millionth of a degree and expressed as parts of an arc. It may be used for angular measurement by surveyors or for other angular measurements where precision is required. Another usage is exact or approximate global positioning against a geographic coordinate systems using longitude and latitude.
 /// 
-/// Enumeration values:
+/// NOTE: While the unit of measurement of the type IfcPlaneAngleMeasure depends on unit assignment (radian or degree or other derived units; globally at the IfcPoject or locally at an IfcMeasureWithUnit), the units of IfcCompoundPlaneAngleMeasure are always degrees, minutes, seconds, and millionth-seconds irrespective of unit assignments.
 /// 
-/// CURVE: The resulting geometric item is of type curve and closed (with the only exception of the curve created by the IfcArbitraryOpenProfileDef which resolves into an open curve). The resulting geometry after applying a sweeping operation is a swept surface. This can be used to define shapes with thin sheets, such as ducts, where the thickness is not appropriate for geometric representation.
-/// AREA: The resulting geometric item is of type surface. The resulting geometry after applying a sweeping operation is a swept solid with defined volume.
-typedef enum {IfcProfileType_CURVE, IfcProfileType_AREA} IfcProfileTypeEnum;
-const char* ToString(IfcProfileTypeEnum v);
-IfcProfileTypeEnum FromString(const std::string& s);
-}
-namespace IfcProjectOrderRecordTypeEnum {
-
-typedef enum {IfcProjectOrderRecordType_CHANGE, IfcProjectOrderRecordType_MAINTENANCE, IfcProjectOrderRecordType_MOVE, IfcProjectOrderRecordType_PURCHASE, IfcProjectOrderRecordType_WORK, IfcProjectOrderRecordType_USERDEFINED, IfcProjectOrderRecordType_NOTDEFINED} IfcProjectOrderRecordTypeEnum;
-const char* ToString(IfcProjectOrderRecordTypeEnum v);
-IfcProjectOrderRecordTypeEnum FromString(const std::string& s);
-}
-namespace IfcProjectOrderTypeEnum {
-/// An IfcProjectOrderTypeEnum is a list of the types of project order that may be identified. 
-///   HISTORY: New type in IFC 2x2  
-///   Enumeration 
+/// HISTORY New type in IFC Release 1.5.1.
 /// 
-/// CHANGEORDER: An instruction to make a change to a product or work being undertaken and a description of the work that is to be performed. 
-/// MAINTENANCEWORKORDER: An instruction to carry out maintenance work and a description of the work that is to be performed. 
-/// MOVEORDER: An instruction to move persons and artefacts and a description of the move locations, objects to be moved, etc.  
-/// PURCHASEORDER: An instruction to purchase goods and/or services and a description of the goods and/or services to be purchased that is to be performed. 
-/// WORKORDER: A general instruction to carry out work and a description of the work to be done. Note the difference between a work order generally and a maintenance work order. 
-/// USERDEFINED: User-defined type. 
-/// NOTDEFINED: Undefined type.
-typedef enum {IfcProjectOrderType_CHANGEORDER, IfcProjectOrderType_MAINTENANCEWORKORDER, IfcProjectOrderType_MOVEORDER, IfcProjectOrderType_PURCHASEORDER, IfcProjectOrderType_WORKORDER, IfcProjectOrderType_USERDEFINED, IfcProjectOrderType_NOTDEFINED} IfcProjectOrderTypeEnum;
-const char* ToString(IfcProjectOrderTypeEnum v);
-IfcProjectOrderTypeEnum FromString(const std::string& s);
-}
-namespace IfcProjectedOrTrueLengthEnum {
-/// This enumeration type is needed for load definition and is only considered if the load values are given as global actions and if they define linear or planar loads (that is, one- or two-dimensionally distributed loads).
-/// Figure 234 illustrates the interpretation of a load definition depending on the enumeration types IfcGlobalOrLocalEnum and IfcProjectedOrTrueLengthEnum.
+/// Type: LIST [3:4] OF INTEGER
 /// 
-/// HISTORY  New type in IFC2x2. 
+/// Value restrictions
 /// 
-/// Figure 234 — Projected or true length
-typedef enum {IfcProjectedOrTrueLength_PROJECTED_LENGTH, IfcProjectedOrTrueLength_TRUE_LENGTH} IfcProjectedOrTrueLengthEnum;
-const char* ToString(IfcProjectedOrTrueLengthEnum v);
-IfcProjectedOrTrueLengthEnum FromString(const std::string& s);
-}
-namespace IfcPropertySourceEnum {
-
-typedef enum {IfcPropertySource_DESIGN, IfcPropertySource_DESIGNMAXIMUM, IfcPropertySource_DESIGNMINIMUM, IfcPropertySource_SIMULATED, IfcPropertySource_ASBUILT, IfcPropertySource_COMMISSIONING, IfcPropertySource_MEASURED, IfcPropertySource_USERDEFINED, IfcPropertySource_NOTKNOWN} IfcPropertySourceEnum;
-const char* ToString(IfcPropertySourceEnum v);
-IfcPropertySourceEnum FromString(const std::string& s);
-}
-namespace IfcProtectiveDeviceTypeEnum {
-/// The IfcProtectiveDeviceTypeEnum specifically defines the range of different breaker unit types that can be used in conjunction with protective device. Types may also be used as a reference to a complete protective device in circumstances where tripping units are not separately identified (typically expected to be the case during earlier stages of design). 
+/// The first integer measure is the number of degrees and is generally not range-restricted.  However, when IfcCompoundPlaneAngleMeasure is used to express geographic coordinates, only latitudes of [-90, 90] and longitudes of [-180, 180] are used in practice.
+/// The second integer measure is the number of minutes and shall be in the range (-60, 60).
+/// The third integer measure is the number of seconds and shall be in the range (-60, 60).
+/// The optional fourth integer measure is the number of millionth-seconds and shall be in the range (-1 000 000, 1 000 000).
 /// 
-/// HISTORY: New type in IFC 2x2. Modified definition and usage in IFC 2x4 
+/// Signedness
 /// 
-/// Enumeration
+/// All measure components have the same sign (positive or negative).  It is therefore trivial to convert between floating point representation (decimal degrees) and compound representation regardless whether the angle is greater or smaller than zero.  Example:
 /// 
-/// FUSEDISCONNECTOR: A device that will electrically open the circuit after a period of prolonged, abnormal current flow.
-/// CIRCUITBREAKER: A mechanical switching device capable of making, carrying, and breaking currents under normal circuit conditions and also making, carrying for a specified time and breaking, current under specified abnormal circuit conditions such as those of short circuit.
-/// EARTHINGSWITCH: A safety device used to open or close a circuit when there is no current. Used to isolate a part of a circuit, a machine, a part of an overhead line or an underground line so that maintenance can be safely conducted.
-/// EARTHLEAKAGECIRCUITBREAKER: A device that opens, closes, or isolates a circuit and has short circuit protection but no overload protection.  It attempts to break the circuit when there is a leakage of current from phase to earth, by measuring voltage on the earth conductor.
-/// RESIDUALCURRENTCIRCUITBREAKER: A device that opens, closes, or isolates a circuit and has short circuit and overload protection.  It attempts to break the circuit when there is a difference in current between any two phases.  May also be referred to as 'Ground Fault Interupter (GFI)' or 'Ground Fault Circuit Interuptor (GFCI)'
-/// RESIDUALCURRENTSWITCH: A device that opens, closes or isolates a circuit and has no short circuit or overload protection.  May also be identified as a 'ground fault switch'.
-/// VARISTOR: A high voltage surge protection device.
-/// USERDEFINED: User-defined type.
-/// NOTDEFINED: Undefined type.
-typedef enum {IfcProtectiveDeviceType_FUSEDISCONNECTOR, IfcProtectiveDeviceType_CIRCUITBREAKER, IfcProtectiveDeviceType_EARTHFAILUREDEVICE, IfcProtectiveDeviceType_RESIDUALCURRENTCIRCUITBREAKER, IfcProtectiveDeviceType_RESIDUALCURRENTSWITCH, IfcProtectiveDeviceType_VARISTOR, IfcProtectiveDeviceType_USERDEFINED, IfcProtectiveDeviceType_NOTDEFINED} IfcProtectiveDeviceTypeEnum;
-const char* ToString(IfcProtectiveDeviceTypeEnum v);
-IfcProtectiveDeviceTypeEnum FromString(const std::string& s);
-}
-namespace IfcPumpTypeEnum {
-/// Defines general types of pumps.
+/// LOCAL
+///   a : IfcPlaneAngleMeasure := -50.975864;  (* decimal degrees, -50° 58' 33" 110400 *)
+///   b : IfcPlaneAngleMeasure;
+///   c : IfcCompoundPlaneAngleMeasure;
+///   s : IfcText;
+/// END_LOCAL;
 /// 
-/// The IfcPumpTypeEnum contains the following:
+/// (* convert from float to compound *)
+///   c[1] :=    a;                                           -- -50
+///   c[2] :=   (a - c[1]) * 60;                              -- -58
+///   c[3] :=  ((a - c[1]) * 60 - c[2]) * 60;                 -- -33
+///   c[4] := (((a - c[1]) * 60 - c[2]) * 60 - c[3]) * 1.e6;  -- -110400
 /// 
-/// CIRCULATOR: A Circulator pump is a generic low-pressure, low-capacity pump. It may have a wet rotor and
-///   may be driven by a flexible-coupled motor.
+/// (* convert from compound to float *)
+///   b := c[1] + c[2]/60. + c[3]/3600. + c[4]/3600.e6;       -- -50.975864
 /// 
-/// ENDSUCTION: An End Suction pump, when mounted horizontally, has a single horizontal inlet on the impeller suction side
-///   and a vertical discharge. It may have a direct or close-coupled motor.
+/// Use in string representations
 /// 
-/// SPLITCASE: A Split Case pump, when mounted horizontally, has an inlet and outlet on each side of the impeller.
-///   The impeller can be easily accessed by removing the front of the impeller casing. It may have a direct or close-coupled motor.
+/// When a compound plane angle measure is formatted for display or printout, the signs of the fractional components will usually be discarded because, to a human reader, the sign of the first component alone already indicates the sense of the angle:
 /// 
-/// SUBMERSIBLEPUMP: A pump designed to be immersed in a fluid, typically a collection tank.
+/// (* convert from compound to human-readable string *)
+///   s := FORMAT(c[1], '+##')     + "000000B0"
+///      + FORMAT(ABS(c[2]), '##') + ''''
+///      + FORMAT(ABS(c[3]), '##') + '"'
+///      + FORMAT(ABS(c[4]), '##');  -- -50° 58' 33" 110400
 /// 
-/// SUMPPUMP: A pump designed to sit above a collection tank with a suction inlet extending into the tank.
+/// Another often encountered display format of latitudes and longitudes is to omit the signs and print N, S, E, W indicators instead, for example, 50°58'33"S.  When stored as IfcCompoundPlaneAngleMeasure however, a compound plane angle measure is always signed, with same sign of all components.
+class IfcCompoundPlaneAngleMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcCompoundPlaneAngleMeasure (IfcAbstractEntity* e);
+    IfcCompoundPlaneAngleMeasure (std::vector< int > /*[3:4]*/ v);
+    operator std::vector< int > /*[3:4]*/() const;
+};
+/// Definition from ISO/CD 10303-41:1992: Is the value of a physical quantity as defined by an application context.
+/// Type: REAL
 /// 
-/// VERTICALINLINE: A Vertical Inline pump has the pump and motor close-coupled on the pump casing.
-///   The pump depends on the connected, horizontal piping for support, with the suction and discharge along the piping axis.
+/// NOTE Corresponding ISO 10303 name: context_dependent_measure, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
 /// 
-/// VERTICALTURBINE: A Vertical Turbine pump has a motor mounted vertically on the pump casing for either
-///   wet-pit sump mounting or dry-well mounting.
+/// HISTORY New type in IFC Release 1.5.1.
+class IfcContextDependentMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcContextDependentMeasure (IfcAbstractEntity* e);
+    IfcContextDependentMeasure (double v);
+    operator double() const;
+};
+/// Definition from ISO/CD 10303-41:1992: A count measure is the value of a count.
+/// Type: NUMBER
 /// 
-/// USERDEFINED: User-defined pump type.
+/// NOTE Corresponding ISO 10303 name: count_measure, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
 /// 
-/// NOTDEFINED:  Pump type has not been defined.
+/// HISTORY New type in IFC Release 1.5.1.
+class IfcCountMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcCountMeasure (IfcAbstractEntity* e);
+    IfcCountMeasure (double v);
+    operator double() const;
+};
+/// IfcCurvatureMeasure is a measure for curvature, which is defined as the change of slope per length.
+///   This is typically a computed value in structural analysis.
+///   It is usually measured in rad/m.
 /// 
-/// HISTORY: New enumeration in IFC R2x.  SUBMERSIBLEPUMP and SUMPPUMP added in IFC2x4.
-typedef enum {IfcPumpType_CIRCULATOR, IfcPumpType_ENDSUCTION, IfcPumpType_SPLITCASE, IfcPumpType_VERTICALINLINE, IfcPumpType_VERTICALTURBINE, IfcPumpType_USERDEFINED, IfcPumpType_NOTDEFINED} IfcPumpTypeEnum;
-const char* ToString(IfcPumpTypeEnum v);
-IfcPumpTypeEnum FromString(const std::string& s);
-}
-namespace IfcRailingTypeEnum {
-/// Definition from IAI: Enumeration defining the valid types of
-///   railings that can be predefined using the enumeration values.  
-///   HISTORY: New Enumeration in IFC
-///   Release 2.0  
-///   Enumeration 
+/// Type: REAL
 /// 
-/// HANDRAIL: A type of railing designed to serve as an optional
-///   structural support for loads applied by human occupants (at hand height).
-///   Generally located adjacent to ramps and stairs. Generally floor or wall
-///   mounted. 
-///   GUARDRAIL: A type of railing designed to guard human occupants
-///   from falling off a stair, ramp or landing where there is a vertical drop at the
-///   edge of such floors/landings. 
-///   BALUSTRADE: Similar to the definitions of a guardrail except
-///   the location is at the edge of a floor, rather then a stair or ramp. Examples
-///   are balustrates at roof-tops or balconies. 
-///   USERDEFINED: User-defined railing element, a term to identify
-///   the user type is given by the attribute IfcRailing.ObjectType. 
-///   NOTDEFINED: Undefined railing element, no type information
-///   available.
-typedef enum {IfcRailingType_HANDRAIL, IfcRailingType_GUARDRAIL, IfcRailingType_BALUSTRADE, IfcRailingType_USERDEFINED, IfcRailingType_NOTDEFINED} IfcRailingTypeEnum;
-const char* ToString(IfcRailingTypeEnum v);
-IfcRailingTypeEnum FromString(const std::string& s);
-}
-namespace IfcRampFlightTypeEnum {
-/// Definition from IAI: This enumeration defines the different types
-///   of linear elements an IfcRampFlightType object can fulfill: 
+/// HISTORY New type in IFC2x2.
+class IfcCurvatureMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcCurvatureMeasure (IfcAbstractEntity* e);
+    IfcCurvatureMeasure (double v);
+    operator double() const;
+};
+/// Definition from IAI: The IfcDayInMonthNumber is
+/// an integer that defines the position of the specified day in a
+/// month.
+/// Type: INTEGER
+/// NOTE Corresponding STEP
+/// name: day_in_month_number, please refer to ISO/IS 10303-41:1994
+/// for the final definition of the formal
+/// standard.
+/// HISTORY New type in IFC
+/// Release 1.5.1.
+/// IFC2x4 CHANGE Where rule
+/// ValidRange added.
+class IfcDayInMonthNumber : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcDayInMonthNumber (IfcAbstractEntity* e);
+    IfcDayInMonthNumber (int v);
+    operator int() const;
+};
+
+class IfcDaylightSavingHour : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcDaylightSavingHour (IfcAbstractEntity* e);
+    IfcDaylightSavingHour (int v);
+    operator int() const;
+};
+/// Definition from ISO/CD 10303-41:1992: A descriptive measure is a human interpretable definition of a quantifiable value.
+/// Type: STRING
 /// 
-/// STRAIGHT: A ramp flight with a straight walking line.  
-///   SPIRAL: A ramp flight with a circular or elliptic walking
-///   line. 
-///   USERDEFINED: User-defined ramp flight. 
-///   NOTDEFINED: Undefined ramp flight. 
+/// NOTE Corresponding ISO 10303 name:descriptive_measure, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
 /// 
-/// HISTORY: New Enumeration in
-///   Release IFC2x Edition 2.
-typedef enum {IfcRampFlightType_STRAIGHT, IfcRampFlightType_SPIRAL, IfcRampFlightType_USERDEFINED, IfcRampFlightType_NOTDEFINED} IfcRampFlightTypeEnum;
-const char* ToString(IfcRampFlightTypeEnum v);
-IfcRampFlightTypeEnum FromString(const std::string& s);
-}
-namespace IfcRampTypeEnum {
-/// This enumeration defines the basic configuration of the ramp type in terms of the number and shape of ramp flights, as shown in Figure 67. The type also distinguished turns by landings. In addition the subdivision of the straight and changing direction ramps is included. The ramp configurations are given for ramps without and with one and two landings. 
+/// HISTORY New type in IFC Release 1.5.1.
+class IfcDescriptiveMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcDescriptiveMeasure (IfcAbstractEntity* e);
+    IfcDescriptiveMeasure (std::string v);
+    operator std::string() const;
+};
+/// Definition from ISO/CD 10303-42:1992: A dimension count is a positive integer used to define the coordinate space dimensionality.  
 /// 
-/// Ramps which are subdivided into more than two landings have to be defined by the geometry only. Also ramps with non-regular shapes have to be defined by the geometry only. The type of such ramps is USERDEFINED. 
+/// The IfcDimensionCount is restricted to have the dimensionality of either 1, 2, or 3 - the WR1 had been added as an addition to the ISO 10303:42 entity dimension_count. In contrary to the ISO 10303:42 constraint, that all geometric representation items within a geometric representation context are forced to have the same dimension count, the IFC geometry allows mixed dimensions, particularly when defining the boundary of planar surfaces.  
 /// 
-/// HISTORY New Enumeration in IFC Release 2.0. 
+/// NOTE Corresponding ISO 10303 type: dimension_count, please refer to ISO/IS 10303-42:1994, p. 14 for the final definition of the formal standard.
 /// 
-/// Enumerator 
-///   Description 
-///   Figure 
+/// HISTORY New Type in IFC Release 1.5
+class IfcDimensionCount : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcDimensionCount (IfcAbstractEntity* e);
+    IfcDimensionCount (int v);
+    operator int() const;
+};
+/// IfcDoseEquivalentMeasure is a measure of the radioactive dose equivalent.
+/// Usually measured in Sievert (Sv, J/kg).
+/// Type: REAL
 /// 
-/// StraightRunRamp 
-///   A ramp - which is a sloping
-///   floor, walk, or roadway - connecting two levels. The straight ramp consists of
-///   one straight flight without turns or winders.  
+/// HISTORY New type in IFC Release 2x.
+class IfcDoseEquivalentMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcDoseEquivalentMeasure (IfcAbstractEntity* e);
+    IfcDoseEquivalentMeasure (double v);
+    operator double() const;
+};
+/// IfcDynamicViscosityMeasure is a measure of the viscous resistance of a medium.
 /// 
-/// TwoStraightRunRamp 
-///   A straight ramp consisting of
-///   two straight flights without turns but with one landing. 
+/// Usually measured in Pascal second (Pa s).
+/// Type: REAL 
 /// 
-/// QuarterTurnRamp 
-///   A ramp making a 90° turn,
-///   consisting of two straight flights connected by a quarterspace landing. The
-///   direction of the turn is determined by the walking line. 
+/// HISTORY New type in IFC Release 2.0.
+class IfcDynamicViscosityMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcDynamicViscosityMeasure (IfcAbstractEntity* e);
+    IfcDynamicViscosityMeasure (double v);
+    operator double() const;
+};
+/// IfcElectricCapacitanceMeasure is a measure of the electric capacitance.
+/// Usually measured in Farad (F, C/V = A s/V).
+/// Type: REAL
 /// 
-/// TwoQuarterTurnRamp 
-///   A ramp making a 180°
-///   turn, consisting of three straight flights connected by two quarterspace
-///   landings. The direction of the turn is determined by the walking line. 
+/// HISTORY New type in IFC Release 2x.
+class IfcElectricCapacitanceMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcElectricCapacitanceMeasure (IfcAbstractEntity* e);
+    IfcElectricCapacitanceMeasure (double v);
+    operator double() const;
+};
+/// IfcElectricChargeMeasure is a measure of the electric charge.
+/// Usually measured in Coulomb (C, A s).
+/// Type: REAL
 /// 
-/// HalfTurnRamp 
-///   A ramp making a 180°
-///   turn, consisting of two straight flights connected by a halfspace landing. The
-///   orientation of the turn is determined by the walking line. 
+/// HISTORY New type in IFC Release 2x.
+class IfcElectricChargeMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcElectricChargeMeasure (IfcAbstractEntity* e);
+    IfcElectricChargeMeasure (double v);
+    operator double() const;
+};
+/// IfcElectricConductanceMeasure is a measure of the electric conductance.
+/// Usually measured in Siemens (S, 1/Ohm = A/V).
+/// Type: REAL
 /// 
-/// SpiralRamp 
-///   A ramp constructed around a
-///   circular or elliptical well without newels and landings. 
+/// HISTORY New type in IFC Release 2x.
+class IfcElectricConductanceMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcElectricConductanceMeasure (IfcAbstractEntity* e);
+    IfcElectricConductanceMeasure (double v);
+    operator double() const;
+};
+/// Definition from ISO/CD 10303-41:1992: The value for the movement of electrically charged particles.
+/// Usually measured in Ampere (A).
+/// Type: REAL
 /// 
-/// UserDefined 
-///   Free form ramp (user defined
-///   operation type) 
-///     
+/// NOTE Corresponding ISO 10303 name: electric_current_measure, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
+/// 
+/// HISTORY New type in IFC Release 1.5.1.
+class IfcElectricCurrentMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcElectricCurrentMeasure (IfcAbstractEntity* e);
+    IfcElectricCurrentMeasure (double v);
+    operator double() const;
+};
+/// IfcElectricResistanceMeasure is a measure of the electric resistance.
+/// Usually measured in Ohm (V/A).
+/// Type: REAL
+/// 
+/// HISTORY New type in IFC Release 2x.
+class IfcElectricResistanceMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcElectricResistanceMeasure (IfcAbstractEntity* e);
+    IfcElectricResistanceMeasure (double v);
+    operator double() const;
+};
+/// IfcElectricVoltageMeasure is a measure of electromotive force.
+/// Usually measured in Volts (V, W/A).
+/// Type: REAL
+/// 
+/// HISTORY New type in IFC Release 2.0.
+class IfcElectricVoltageMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcElectricVoltageMeasure (IfcAbstractEntity* e);
+    IfcElectricVoltageMeasure (double v);
+    operator double() const;
+};
+/// IfcEnergyMeasure is a measure of energy required or used.
+/// Usually measured in Joules, (J, Nm).
+/// Type: REAL
+/// 
+/// HISTORY New type in IFC Release 2.0.
+class IfcEnergyMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcEnergyMeasure (IfcAbstractEntity* e);
+    IfcEnergyMeasure (double v);
+    operator double() const;
+};
+/// Definition from CSS1 (W3C Recommendation): The font-style property selects between normal (sometimes
+/// referred to as "roman" or "upright"), italic and oblique faces within a font family. Values are:
 /// 
-/// NotDefined 
-///     
-///     
+/// normal 
+///   italic 
+///   oblique
 /// 
-/// Figure 67 — Ramp types
-typedef enum {IfcRampType_STRAIGHT_RUN_RAMP, IfcRampType_TWO_STRAIGHT_RUN_RAMP, IfcRampType_QUARTER_TURN_RAMP, IfcRampType_TWO_QUARTER_TURN_RAMP, IfcRampType_HALF_TURN_RAMP, IfcRampType_SPIRAL_RAMP, IfcRampType_USERDEFINED, IfcRampType_NOTDEFINED} IfcRampTypeEnum;
-const char* ToString(IfcRampTypeEnum v);
-IfcRampTypeEnum FromString(const std::string& s);
-}
-namespace IfcReflectanceMethodEnum {
-/// The IfcReflectanceMethodEnum defines the range of different reflectance methods available. 
+/// A value of 'normal' selects a font that is classified as 'normal' in the user agents font database, while 'oblique' selects a font that is labeled 'oblique'. A value of 'italic' selects a font that is labeled 'italic', or, if that is not available, one labeled 'oblique'. The font that is labeled 'oblique' in the user agents font database may actually have been generated by electronically slanting a normal font.
 /// 
-/// HISTORY: New type in IFC 2x2.
+/// Fonts with Oblique, Slanted or Incline in their names will typically be labeled 'oblique' in the user agents font database. Fonts with Italic, Cursive or Kursiv in their names will typically be labeled 'italic'.
 /// 
-/// Enumeration 
+/// NOTE  Corresponding CSS1 definitions is font-style.
 /// 
-/// BLINN: A reflectance model providing a smooth, slightly shiny appearance.
-/// FLAT: A reflectance model providing a constant colour. This model ignores the effect of all light sources. 
-/// GLASS: A reflectance model that supports an approximation of glass-like materials that have both reflective and transmissive properties. 
-/// MATT: A reflectance model providing a dull matte appearance. 
-/// METAL: A reflectance model providing a specular metallic appearance. 
-/// MIRROR: A reflectance model that supports secondary mirrored views through ray tracing. 
-/// PHONG: A reflectance model conforming with the Phong model in which reflections are greatest in the `mirror' direction of a surface opposite the viewing direction with respect to the surface normal. 
-/// PLASTIC: A reflectance model providing a specular effect which is similar to the Phong model. 
-/// STRAUSS: A reflectance model for metallic and non-metallic appearance based on a limited set of control parameter.
-/// NOTDEFINED
-typedef enum {IfcReflectanceMethod_BLINN, IfcReflectanceMethod_FLAT, IfcReflectanceMethod_GLASS, IfcReflectanceMethod_MATT, IfcReflectanceMethod_METAL, IfcReflectanceMethod_MIRROR, IfcReflectanceMethod_PHONG, IfcReflectanceMethod_PLASTIC, IfcReflectanceMethod_STRAUSS, IfcReflectanceMethod_NOTDEFINED} IfcReflectanceMethodEnum;
-const char* ToString(IfcReflectanceMethodEnum v);
-IfcReflectanceMethodEnum FromString(const std::string& s);
-}
-namespace IfcReinforcingBarRoleEnum {
-/// Definition from IAI: Enumeration defining standard types for the
-///   role, purpose or usage of the bar, i.e. the kind of loads and stresses they are
-///   intended to carry.  
+/// HISTORY  New type in IFC2x3.
+class IfcFontStyle : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcFontStyle (IfcAbstractEntity* e);
+    IfcFontStyle (std::string v);
+    operator std::string() const;
+};
+/// Definition from CSS1 (W3C Recommendation): The font-style property selects between normal and small-caps within a font family. Values are:
 /// 
-/// HISTORY New type in IFC Release 2x2.
-///   Item ANCHORING (documented since IFC 2x2) added to the EXPRESS definition in IFC 2x4.
+/// normal 
+///   small-caps 
 /// 
-/// ENUMERATION 
+/// Another type of variation within a font family is the small-caps. In a small-caps font the lower case letters look similar to the uppercase ones, but in a smaller size and with slightly different proportions. The 'font-variant' property selects that font.
 /// 
-/// MAIN The reinforcing bar is a main bar. 
-///   SHEAR The reinforcing bar is a shear bar. 
-///   LIGATURE The reinforcing bar is a ligature (link, stirrup). 
-///   STUD The reinforcing bar is a stud. 
-///   PUNCHING Punching reinforcement. 
-///   EDGE Edge reinforcement. 
-///   RING Ring reinforcement. 
-///   ANCHORING Anchoring reinforcement. 
-///   USERDEFINED The type of reinforcement is user defined. 
-///   NOTDEFINED The type of reinforcement is not defined.
-typedef enum {IfcReinforcingBarRole_MAIN, IfcReinforcingBarRole_SHEAR, IfcReinforcingBarRole_LIGATURE, IfcReinforcingBarRole_STUD, IfcReinforcingBarRole_PUNCHING, IfcReinforcingBarRole_EDGE, IfcReinforcingBarRole_RING, IfcReinforcingBarRole_USERDEFINED, IfcReinforcingBarRole_NOTDEFINED} IfcReinforcingBarRoleEnum;
-const char* ToString(IfcReinforcingBarRoleEnum v);
-IfcReinforcingBarRoleEnum FromString(const std::string& s);
-}
-namespace IfcReinforcingBarSurfaceEnum {
-/// Definition from IAI: Enumeration indicating whether the bar has a
-///   plain or textured (ribbed) surface.  
+/// A value of 'normal' selects a font that is not a small-caps font, 'small-caps' selects a small-caps font. It is acceptable (but not required) in CSS1 if the small-caps font is a created by taking a normal font and replacing the lower case letters by scaled uppercase characters. As a last resort, uppercase letters will be used as replacement for a small-caps font.
 /// 
-/// HISTORY New type in IFC Release 2x2
+/// NOTE  Corresponding CSS1 definitions is font-variant.
 /// 
-/// ENUMERATION 
+/// HISTORY  New type in IFC2x3.
+class IfcFontVariant : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcFontVariant (IfcAbstractEntity* e);
+    IfcFontVariant (std::string v);
+    operator std::string() const;
+};
+/// Definition from CSS1 (W3C Recommendation): The 'font-weight' property selects the weight of the font. The values '100' to '900' form an ordered sequence, where each number indicates a weight that is at least as dark as its predecessor. The keyword 'normal' is synonymous with '400', and 'bold' is synonymous with '700'. Keywords other than 'normal' and 'bold' have been shown to be often confused with font names and a numerical scale was therefore chosen for the 9-value list. Values are:
 /// 
-/// PLAIN The reinforcing bar surface is plain. 
-///   TEXTURED The reinforcing bar surface is textured (ribbed).
-typedef enum {IfcReinforcingBarSurface_PLAIN, IfcReinforcingBarSurface_TEXTURED} IfcReinforcingBarSurfaceEnum;
-const char* ToString(IfcReinforcingBarSurfaceEnum v);
-IfcReinforcingBarSurfaceEnum FromString(const std::string& s);
-}
-namespace IfcResourceConsumptionEnum {
-/// The IfcResourceConsumptionEnum indicates how a construction resource is consumed during its use.  The IfcResourceConsumptionEnum contains the following:
+/// normal 
+///   bold 
+///   100 | 200 | 300 | 400 | 500 | 600 | 700 | 800 | 900
 /// 
-/// CONSUMED: Resource is production-based and is immediately consumed at the start of its usage.
-/// PARTIALLYCONSUMED: Resource is production-based and is consumed over its usage.
-/// NOTCONSUMED: Resource is production-based and is not consumed during its usage.
-/// OCCUPIED: Resource is duration-based and is immediately consumed at the start of its usage.
-/// PARTIALLYOCCUPIED: Resource is duration-based and is consumed over its usage.
-/// NOTOCCUPIED: Resource is duration-based and is not consumed during its usage.
-/// USERDEFINED: User-defined consumption; custom property sets must indicate usage.
-/// NOTDEFINED: Undefined consumption.
+/// Fonts (the font data) typically have one or more properties whose values are names that are descriptive of the "weight" of a font. There is no accepted, universal meaning to these weight names. Their primary role is to distinguish faces of differing darkness within a single font family. Usage across font families is quite variant; for example a font that you might think of as being bold might be described as being Regular, Roman, Book, Medium, Semi- or DemiBold, Bold, or Black, depending on how black the "normal" face of the font is within the design. Because there is no standard usage of names, the weight property values in CSS1 are given on a numerical scale in which the value '400' (or 'normal') corresponds to the "normal" text face for that family. The weight name associated with that face will typically be Book, Regular, Roman, Normal or sometimes Medium.
 /// 
-/// HISTORY: New Enumeration in IFC Release 2.0.
-typedef enum {IfcResourceConsumption_CONSUMED, IfcResourceConsumption_PARTIALLYCONSUMED, IfcResourceConsumption_NOTCONSUMED, IfcResourceConsumption_OCCUPIED, IfcResourceConsumption_PARTIALLYOCCUPIED, IfcResourceConsumption_NOTOCCUPIED, IfcResourceConsumption_USERDEFINED, IfcResourceConsumption_NOTDEFINED} IfcResourceConsumptionEnum;
-const char* ToString(IfcResourceConsumptionEnum v);
-IfcResourceConsumptionEnum FromString(const std::string& s);
-}
-namespace IfcRibPlateDirectionEnum {
-
-typedef enum {IfcRibPlateDirection_DIRECTION_X, IfcRibPlateDirection_DIRECTION_Y} IfcRibPlateDirectionEnum;
-const char* ToString(IfcRibPlateDirectionEnum v);
-IfcRibPlateDirectionEnum FromString(const std::string& s);
-}
-namespace IfcRoleEnum {
-/// Definition: Roles which may be played by an actor.
+/// The association of other weights within a family to the numerical weight values is intended only to preserve the ordering of darkness within that family. However, the following heuristics tell how the assignment is done in typical cases:
 /// 
-/// HISTORY This type has changes after IFC Release 2.0.  Spelling of COMMISSIONINGENGINEER fixed in IFC 2x4.
+/// If the font family already uses a numerical scale with nine values (such as with OpenType), the font weights should be mapped directly. 
+///   If there is both a face labeled Medium and one labeled Book, Regular, Roman or Normal, then the Medium is normally assigned to the '500'. 
+///   The font labeled "Bold" will often correspond to the weight value '700'. 
+///   If there are fewer then 9 weights in the family, the default algorithm for filling the "holes" is as follows. If '500' is unassigned, it will be assigned the same font as '400'. If any of the values '600', '700', '800' or '900' remains unassigned, they are assigned to the same face as the next darker assigned keyword, if any, or the next lighter one otherwise. If any of '300', '200' or '100' remains unassigned, it is assigned to the next lighter assigned keyword, if any, or the next darker otherwise. 
 /// 
-/// ENUMERATION 
+/// The following two examples illustrate the process. Assume four weights in the "Example1" family, from lightest to darkest: Regular, Medium, Bold, Heavy. And assume six weights in the "Example2" family: Book, Medium, Bold, Heavy, Black, ExtraBlack. Note how in the second example it has been decided not to assign "Example2 ExtraBlack" to anything.
 /// 
-/// SUPPLIER
-///   MANUFACTURER
-///   CONTRACTOR 
-///   SUBCONTRACTOR
-///   ARCHITECT
-///   STRUCTURALENGINEER
-///   COSTENGINEER 
-///   CLIENT
-///   BUILDINGOWNER
-///   BUILDINGOPERATOR
-///   MECHANICALENGINEER 
-///   ELECTRICALENGINEER
-///   PROJECTMANAGER
-///   FACILITIESMANAGER
-///   CIVILENGINEER
-///   COMMISSIONINGENGINEER 
-///   ENGINEER
-///   OWNER
-///   CONSULTANT
-///   CONSTRUCTIONMANAGER
-///   FIELDCONSTRUCTIONMANAGER 
-///   RESELLER
-///   USERDEFINED User defined value to be provided.
-typedef enum {IfcRole_SUPPLIER, IfcRole_MANUFACTURER, IfcRole_CONTRACTOR, IfcRole_SUBCONTRACTOR, IfcRole_ARCHITECT, IfcRole_STRUCTURALENGINEER, IfcRole_COSTENGINEER, IfcRole_CLIENT, IfcRole_BUILDINGOWNER, IfcRole_BUILDINGOPERATOR, IfcRole_MECHANICALENGINEER, IfcRole_ELECTRICALENGINEER, IfcRole_PROJECTMANAGER, IfcRole_FACILITIESMANAGER, IfcRole_CIVILENGINEER, IfcRole_COMISSIONINGENGINEER, IfcRole_ENGINEER, IfcRole_OWNER, IfcRole_CONSULTANT, IfcRole_CONSTRUCTIONMANAGER, IfcRole_FIELDCONSTRUCTIONMANAGER, IfcRole_RESELLER, IfcRole_USERDEFINED} IfcRoleEnum;
-const char* ToString(IfcRoleEnum v);
-IfcRoleEnum FromString(const std::string& s);
-}
-namespace IfcRoofTypeEnum {
-/// This enumeration defines the basic configuration of the roof in terms of the different roof shapes, as illustrated in Figure 68.
+/// Available faces       | Assignments   | Filling the holes----------------------+---------------+-------------------"Example1 Regular"    | 400           | 100, 200, 300"Example1 Medium"     | 500           |"Example1 Bold"       | 700           | 600"Example1 Heavy"      | 800           | 900
+/// Available faces       | Assignments   | Filling the holes----------------------+---------------+-------------------"Example2 Book"       | 400           | 100, 200, 300"Example2 Medium"     | 500           |"Example2 Bold"       | 700           | 600 "Example2 Heavy"      | 800           |"Example2 Black"      | 900           |"Example2 ExtraBlack" | (none)        |
 /// 
-/// Roofs which are subdivided into more than these basic shapes have to be defined by the geometry only. Also roofs with non-regular shapes (free form roof) have to be defined by the geometry only. The type of such roofs is FREEFORM. 
+/// NOTE  Corresponding CSS1 definitions is font-weight.
 /// 
-/// HISTORY New Enumeration in IFC Release 2x. 
+/// HISTORY  New type in IFC2x2 Addendum 2.
+class IfcFontWeight : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcFontWeight (IfcAbstractEntity* e);
+    IfcFontWeight (std::string v);
+    operator std::string() const;
+};
+/// IfcForceMeasure is a measure of the force.
+/// Usually measured in Newton (N, kg m/s2).
+/// Type: REAL
 /// 
-/// Enumerator 
-///   Description 
-///   Figure 
+/// HISTORY New type in IFC Release 2x.
+class IfcForceMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcForceMeasure (IfcAbstractEntity* e);
+    IfcForceMeasure (double v);
+    operator double() const;
+};
+/// IfcFrequencyMeasure is a measure of the number of times that an item vibrates in unit time.
+/// Usually measured in cycles/s or Herz (Hz).
+/// Type: REAL
 /// 
-/// FLAT_ROOF 
-///   A roof having no slope, or
-///   one with only a slight pitch so as to drain rainwater. 
+/// HISTORY New type in IFC Release 2.0.
+class IfcFrequencyMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcFrequencyMeasure (IfcAbstractEntity* e);
+    IfcFrequencyMeasure (double v);
+    operator double() const;
+};
+/// An IfcGloballyUniqueId holds an encoded string identifier that is used to uniquely identify an IFC object. An IfcGloballyUniqueId is a Globally
+///   Unique Identifier (GUID) which is an auto-generated 128-bit number. Since this identifier is
+///   required for all IFC object instances, it is desirable to compress it to reduce overhead. The encoding of the base 64 character set is shown below:
 /// 
-/// SHED_ROOF 
-///   A roof having a single
-///   slope. 
+///            1         2         3         4         5         6
 /// 
-/// GABLE_ROOF 
-///   A roof sloping downward in
-///   two parts from a central ridge, so as to form a gable at each end. 
+///  0123456789012345678901234567890123456789012345678901234567890123
 /// 
-/// HIP_ROOF 
-///   A roof having sloping ends
-///   and sides meeting at an inclined projecting angle. 
+/// "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz_$";
 /// 
-/// HIPPED_GABLE_ROOF 
-///   A roof having a hipped end
-///   truncating a gable. 
+/// The resulting string is a fixed 22 character length string to be exchanged within the IFC exchange file structure.
 /// 
-/// GAMBREL_ROOF 
-///   A ridged roof divided on each
-///   side into a shallower slope above a steeper one. 
+/// Refer to the BuildingSMART website (www.buildingsmart-tech.org) for more information and sample encoding algorithms.
 /// 
-/// MANSARD_ROOF 
-///   A roof having on each side a
-///   steeper lower part and a shallower upper part. 
+/// HISTORY  New type in IFC R1.5.1.
+class IfcGloballyUniqueId : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcGloballyUniqueId (IfcAbstractEntity* e);
+    IfcGloballyUniqueId (std::string v);
+    operator std::string() const;
+};
+/// IfcHeatFluxDensityMeasure is a measure of the density of heat flux within a body.
+/// Usually measured in W/m2 (J/s m2).
+/// Type: REAL
 /// 
-/// BARREL_ROOF 
-///   A roof or ceiling having a
-///   semicylindrical form. 
+/// HISTORY New type in IFC Release 2.0.
+class IfcHeatFluxDensityMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcHeatFluxDensityMeasure (IfcAbstractEntity* e);
+    IfcHeatFluxDensityMeasure (double v);
+    operator double() const;
+};
+/// IfcHeatingValueMeasure defines the amount of energy released (usually in MJ/kg) when a fuel is burned.
 /// 
-/// RAINBOW_ROOF 
-///   A gable roof in the form of a
-///   broad Gothic arch, with gently sloping convex surfaces. 
+/// HISTORY: This is new type in IFC2x2.
+class IfcHeatingValueMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcHeatingValueMeasure (IfcAbstractEntity* e);
+    IfcHeatingValueMeasure (double v);
+    operator double() const;
+};
+
+class IfcHourInDay : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcHourInDay (IfcAbstractEntity* e);
+    IfcHourInDay (int v);
+    operator int() const;
+};
+/// Definition from ISO/CD 10303-41:1992: An identifier is an alphanumeric string which allows an individual thing to be identified. It may not provide natural-language meaning.
 /// 
-/// BUTTERFLY_ROOF 
-///   A roof having two slopes,
-///   each descending inward from the eaves. 
+/// Type: STRING of up to 255 characters
 /// 
-/// PAVILION_ROOF 
-///   A pyramidal hip roof. 
+/// NOTE Corresponding STEP name: identifier, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
 /// 
-/// DOME_ROOF 
-///   A hemispherical hip
-///   roof. 
+/// HISTORY New type in IFC Release 2x.
+/// IFC 2x4 CHANGE: Previously recommended size restriction of 255 characters is now mandatory.
 /// 
-/// FREEFORM 
-///   Free form roof  
-///     
+/// As a merely machine-readable string for identification purposes, an identifier is usually machine-generated and locale-independent (in contrast to human-readable labels, IfcLabel).
 /// 
-/// NOTDEFINED 
-///   No specification given 
-///     
+/// Per ISO 10303-11, the set of characters that may appear in STRINGs is defined in ISO 10646.  The encoding of characters in case of file-based exchange is defined in ISO 10303-21 (STEP physical files) and ISO 10303-28 (XML files).  Among else, these specifications define the encoding of 8-bit characters from ISO 8859-1...-16 and of 2-byte Unicode characters.
 /// 
-/// Figure 68 — Roof types
-typedef enum {IfcRoofType_FLAT_ROOF, IfcRoofType_SHED_ROOF, IfcRoofType_GABLE_ROOF, IfcRoofType_HIP_ROOF, IfcRoofType_HIPPED_GABLE_ROOF, IfcRoofType_GAMBREL_ROOF, IfcRoofType_MANSARD_ROOF, IfcRoofType_BARREL_ROOF, IfcRoofType_RAINBOW_ROOF, IfcRoofType_BUTTERFLY_ROOF, IfcRoofType_PAVILION_ROOF, IfcRoofType_DOME_ROOF, IfcRoofType_FREEFORM, IfcRoofType_NOTDEFINED} IfcRoofTypeEnum;
-const char* ToString(IfcRoofTypeEnum v);
-IfcRoofTypeEnum FromString(const std::string& s);
-}
-namespace IfcSIPrefix {
-/// Definition from ISO/CD 10303-41:1992: An SI prefix is the name of a prefix that may be associated 
-/// with an SI unit. The definitions of SI prefixes are specified in ISO 1000 (clause 3).
+/// Note that while IfcIdentifier is restricted to 255 characters, the size in exchange files after encoding may be considerably larger than 255 octets, depending on the particular encoding and on the contents of the identifier.
+class IfcIdentifier : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcIdentifier (IfcAbstractEntity* e);
+    IfcIdentifier (std::string v);
+    operator std::string() const;
+};
+/// IfcIlluminanceMeasure is a measure of the illuminance.
+/// Usually measured in Lux (lx, Lumen/m2 = Candela Steradian/m2).
+/// Type: REAL
 /// 
-/// NOTE The prefix defines multiples and submultiples of the SI units.
+/// HISTORY New type in IFC Release 2x.
+class IfcIlluminanceMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcIlluminanceMeasure (IfcAbstractEntity* e);
+    IfcIlluminanceMeasure (double v);
+    operator double() const;
+};
+/// IfcInductanceMeasure is a measure of the inductance.
+/// Usually measure in Henry (H, Weber/A = V s/A).
+/// Type: REAL
 /// 
-/// NOTE Corresponding ISO 10303 name: SI_prefix, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
+/// HISTORY New type in IFC Release 2x.
+class IfcInductanceMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcInductanceMeasure (IfcAbstractEntity* e);
+    IfcInductanceMeasure (double v);
+    operator double() const;
+};
+/// IfcInteger is a defined type of simple data type Integer. It is required since a select type (IfcSimpleValue) cannot include directly simple types in its select list.
 /// 
-/// ENUMERATION 
+/// In principle, the domain of IfcInteger (being an Integer) is all integer numbers. Here the number of bits used for the IfcInteger representation is unconstrained, but in practice it is implementation specific.
 /// 
-/// EXA: 10^18. 
-///   PETA: 10^15. 
-///   TERA: 10^12. 
-///   GIGA: 10^9. 
-///   MEGA: 10^6. 
-///   KILO: 10^3. 
-///   HECTO: 10^2.  
-///   DECA: 10. 
-///   DECI: 10^-1. 
-///   CENTI: 10^-2. 
-///   MILLI: 10^-3. 
-///   MICRO: 10^-6. 
-///   NANO: 10^-9. 
-///   PICO: 10^-12. 
-///   FEMTO: 10^-15. 
-///   ATTO: 10^-18. 
+/// Type: INTEGER
 /// 
-/// HISTORY New entity in IFC Release 1.5.1.
-typedef enum {IfcSIPrefix_EXA, IfcSIPrefix_PETA, IfcSIPrefix_TERA, IfcSIPrefix_GIGA, IfcSIPrefix_MEGA, IfcSIPrefix_KILO, IfcSIPrefix_HECTO, IfcSIPrefix_DECA, IfcSIPrefix_DECI, IfcSIPrefix_CENTI, IfcSIPrefix_MILLI, IfcSIPrefix_MICRO, IfcSIPrefix_NANO, IfcSIPrefix_PICO, IfcSIPrefix_FEMTO, IfcSIPrefix_ATTO} IfcSIPrefix;
-const char* ToString(IfcSIPrefix v);
-IfcSIPrefix FromString(const std::string& s);
-}
-namespace IfcSIUnitName {
-/// Definition from ISO/CD 10303-41:1992: An SI unit name is the name of an SI unit. The definitions of the 
-/// names of SI units are specified in ISO 1000 (clause 2).
+/// HISTORY New type in IFC Release 1.5.1.
+class IfcInteger : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcInteger (IfcAbstractEntity* e);
+    IfcInteger (int v);
+    operator int() const;
+};
+/// IfcIntegerCountRateMeasure is a measure of the integer number of units flowing per unit time.
 /// 
-/// NOTE Corresponding STEP name: SI_unit_name, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
+/// EXAMPLE: This measure may be used for measuring integer units per second or per hour. For example, it may be used to measure the number of books per hour passing along a part of a mechanical book handling system, the number of people per hour travelling along a moving walkway or the number of vehicles per hour travelling along a section of road.
 /// 
-/// ENUMERATION 
+/// Type: INTEGER
 /// 
-/// AMPERE: Unit for electric current. 
-///   BECQUEREL: Unit for radioactivity. 
-///   CANDELA: Unit for luminousintensity. 
-///   COULOMB: Unit for electric charge. 
-///   CUBIC_METRE: Unit for volume. 
-///   DEGREE_CELSIUS: Unit for thermodynamic temperature. 
-///   FARAD: Unit for electric capacitance. 
-///   GRAM: Unit for mass. 
-///   GRAY: Unit for absorbed radioactive dose. 
-///   HENRY: Unit for inductance. 
-///   HERTZ: Unit for frequency. 
-///   JOULE: Unit for energy. 
-///   KELVIN: Unit for thermodynamic temperature. 
-///   LUMEN: Unit for luminous flux. 
-///   LUX: Unit for illuminance. 
-///   METRE: Unit for length. 
-///   MOLE: Unit for amount of substance. 
-///   NEWTON: Unit for force. 
-///   OHM: Unit for electric resistance. 
-///   PASCAL: Unit for pressure. 
-///   RADIAN: Unit for plane angle. 
-///   SECOND: Unit for time. 
-///   SIEMENS: Unit for electric conductance. 
-///   SIEVERT: Unit for radioactive dose equivalent. 
-///   SQUARE_METRE: Unit for area. 
-///   STERADIAN: Unit for solid angle. 
-///   TESLA: Unit for magnetic flux density. 
-///   VOLT: Unit for electric voltage. 
-///   WATT: Unit for power. 
-///   WEBER: Unit for magnetic flux. 
+/// HISTORY New type in IFC Release 2.0.
+class IfcIntegerCountRateMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcIntegerCountRateMeasure (IfcAbstractEntity* e);
+    IfcIntegerCountRateMeasure (int v);
+    operator int() const;
+};
+/// IfcIonConcentrationMeasure is a measure of particular ion concentration in a liquid, given in mg/L.
 /// 
-/// HISTORY New entity in IFC Release 1.5.1.
-typedef enum {IfcSIUnitName_AMPERE, IfcSIUnitName_BECQUEREL, IfcSIUnitName_CANDELA, IfcSIUnitName_COULOMB, IfcSIUnitName_CUBIC_METRE, IfcSIUnitName_DEGREE_CELSIUS, IfcSIUnitName_FARAD, IfcSIUnitName_GRAM, IfcSIUnitName_GRAY, IfcSIUnitName_HENRY, IfcSIUnitName_HERTZ, IfcSIUnitName_JOULE, IfcSIUnitName_KELVIN, IfcSIUnitName_LUMEN, IfcSIUnitName_LUX, IfcSIUnitName_METRE, IfcSIUnitName_MOLE, IfcSIUnitName_NEWTON, IfcSIUnitName_OHM, IfcSIUnitName_PASCAL, IfcSIUnitName_RADIAN, IfcSIUnitName_SECOND, IfcSIUnitName_SIEMENS, IfcSIUnitName_SIEVERT, IfcSIUnitName_SQUARE_METRE, IfcSIUnitName_STERADIAN, IfcSIUnitName_TESLA, IfcSIUnitName_VOLT, IfcSIUnitName_WATT, IfcSIUnitName_WEBER} IfcSIUnitName;
-const char* ToString(IfcSIUnitName v);
-IfcSIUnitName FromString(const std::string& s);
-}
-namespace IfcSanitaryTerminalTypeEnum {
-/// The IfcSanitaryTerminalTypeEnum defines the range of different types of sanitary terminal that can be specified. 
+/// HISTORY: New type in IFC2x2.
+class IfcIonConcentrationMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcIonConcentrationMeasure (IfcAbstractEntity* e);
+    IfcIonConcentrationMeasure (double v);
+    operator double() const;
+};
+/// IfcIsothermalMoistureCapacityMeasure is a measure of isothermal moisture capacity.
+/// Usually measured in m3/kg.
+/// Type: REAL
 /// 
-/// NOTE: The value WCSEAT has been deprecated and should no longer be used; toilet seats should be represented by IfcDiscreteAccessory with ObjectType 'WC Seat'. 
-///   HISTORY: New type in IFC 2x2 
+/// HISTORY New type in IFC Release 2x.
+class IfcIsothermalMoistureCapacityMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcIsothermalMoistureCapacityMeasure (IfcAbstractEntity* e);
+    IfcIsothermalMoistureCapacityMeasure (double v);
+    operator double() const;
+};
+/// IfcKinematicViscosityMeasure is a measure of the viscous resistance of a medium to a moving body.
+/// Usually measured in m2/s.
+/// Type: REAL
 /// 
-/// Enumeration 
+/// HISTORY New type in IFC Release 2.0.
+class IfcKinematicViscosityMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcKinematicViscosityMeasure (IfcAbstractEntity* e);
+    IfcKinematicViscosityMeasure (double v);
+    operator double() const;
+};
+/// Definition from ISO/CD 10303-41:1992: A label is the term by which something may be referred to.  It is a string which represents the human-interpretable name of something and shall have a natural-language meaning.
 /// 
-/// BATH: Sanitary appliance for immersion of the human body or parts of it. 
-/// BIDET: Waste water appliance for washing the excretory organs while sitting astride the bowl. 
-/// CISTERN: A water storage unit attached to a sanitary terminal that is fitted with a device, operated automatically or by the user, that discharges water to cleanse a water closet (toilet) pan, urinal or slop hopper. 
-/// SHOWER: Installation or waste water appliance that emits a spray of water to wash the human body. 
-/// SINK: Waste water appliance for receiving, retaining or disposing of domestic, culinary, laboratory or industrial process liquids. 
-/// SANITARYFOUNTAIN: A sanitary terminal that provides a low pressure jet of water for a specific purpose. 
-/// TOILETPAN: Soil appliance for the disposal of excrement. 
-/// URINAL: Soil appliance that receives urine and directs it to a waste outlet (BS6100). 
-/// WASHHANDBASIN: Waste water appliance for washing the upper parts of the body. 
-/// WCSEAT: [Deprecated] Hinged seat that fits on the top of a water closet (WC) pan. 
-/// USERDEFINED: User-defined type. 
-/// NOTDEFINED: Undefined type.
-typedef enum {IfcSanitaryTerminalType_BATH, IfcSanitaryTerminalType_BIDET, IfcSanitaryTerminalType_CISTERN, IfcSanitaryTerminalType_SHOWER, IfcSanitaryTerminalType_SINK, IfcSanitaryTerminalType_SANITARYFOUNTAIN, IfcSanitaryTerminalType_TOILETPAN, IfcSanitaryTerminalType_URINAL, IfcSanitaryTerminalType_WASHHANDBASIN, IfcSanitaryTerminalType_WCSEAT, IfcSanitaryTerminalType_USERDEFINED, IfcSanitaryTerminalType_NOTDEFINED} IfcSanitaryTerminalTypeEnum;
-const char* ToString(IfcSanitaryTerminalTypeEnum v);
-IfcSanitaryTerminalTypeEnum FromString(const std::string& s);
-}
-namespace IfcSectionTypeEnum {
-/// Definition from IAI: An enumeration indicating whether a
-///   specific piece of a cross section is uniform or tapered in longitudinal
-///   direction.  
-///   HISTORY New type in IFC
-///   Release 2x2  
-///   ENUMERATION 
+/// Type: STRING of up to 255 characters
 /// 
-/// UNIFORM The section is uniform in longitudinal direction.
+/// NOTE Corresponding STEP name: label, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
 /// 
-/// TAPERED The section is tapered in longitudinal direction.
-typedef enum {IfcSectionType_UNIFORM, IfcSectionType_TAPERED} IfcSectionTypeEnum;
-const char* ToString(IfcSectionTypeEnum v);
-IfcSectionTypeEnum FromString(const std::string& s);
-}
-namespace IfcSensorTypeEnum {
-/// The IfcSensorTypeEnum defines the range of different types of sensor that can be specified. 
+/// HISTORY New type in IFC Release 2x.
+/// IFC 2x4 CHANGE: Previously recommended size restriction of 255 characters is now mandatory.
 /// 
-/// HISTORY: New type in IFC R2.0.  Added missing enumerations in IFC2x4
+/// As a human-readable string for naming purposes, a label is usually human-specified and locale-dependent (in contrast to purely machine-readable identifiers, IfcIdentifier).
 /// 
-/// Enumeration 
+/// Per ISO 10303-11, the set of characters that may appear in STRINGs is defined in ISO 10646.  The encoding of characters in case of file-based exchange is defined in ISO 10303-21 (STEP physical files) and ISO 10303-28 (XML files).  Among else, these specifications define the encoding of 8-bit characters from ISO 8859-1...-16 and of 2-byte Unicode characters.
 /// 
-/// CONDUCTANCESENSOR: A device that senses or detects electrical conductance. 
-/// CONTACTSENSOR: A device that senses or detects contact, such as for detecting if a door is closed. 
-/// FIRESENSOR: A device that senses or detects fire. 
-/// FLOWSENSOR: A device that senses or detects flow in a fluid. 
-/// GASSENSOR: A device that senses or detects gas concentration. 
-/// HEATSENSOR: A device that senses or detects heat. 
-/// IONCONCENTRATIONSENSOR: A device that senses or detects ion concentration, such as for water hardness. 
-/// LEVELSENSOR: A device that senses or detects fill level, such as for a tank. 
-/// HUMIDITYSENSOR: A device that senses or detects humidity. 
-/// LIGHTSENSOR: A device that senses or detects light. 
-/// MOISTURESENSOR: A device that senses or detects moisture. 
-/// MOVEMENTSENSOR: A device that senses or detects movement.  
-/// PHSENSOR: A device that senses or detects acidity. 
-/// PRESSURESENSOR: A device that senses or detects pressure. 
-/// RADIATIONSENSOR: A device that senses or detects electromagnetic radiation. 
-/// RADIOACTIVITYSENSOR: A device that senses or detects atomic decay. 
-/// SMOKESENSOR: A device that senses or detects smoke. 
-/// SOUNDSENSOR: A device that senses or detects sound.  
-/// TEMPERATURESENSOR: A device that senses or detects temperature. 
-/// WINDSENSOR: A device that senses or detects airflow speed and direction. 
-/// USERDEFINED: User-defined type. 
-/// NOTDEFINED: Undefined type.
-typedef enum {IfcSensorType_CO2SENSOR, IfcSensorType_FIRESENSOR, IfcSensorType_FLOWSENSOR, IfcSensorType_GASSENSOR, IfcSensorType_HEATSENSOR, IfcSensorType_HUMIDITYSENSOR, IfcSensorType_LIGHTSENSOR, IfcSensorType_MOISTURESENSOR, IfcSensorType_MOVEMENTSENSOR, IfcSensorType_PRESSURESENSOR, IfcSensorType_SMOKESENSOR, IfcSensorType_SOUNDSENSOR, IfcSensorType_TEMPERATURESENSOR, IfcSensorType_USERDEFINED, IfcSensorType_NOTDEFINED} IfcSensorTypeEnum;
-const char* ToString(IfcSensorTypeEnum v);
-IfcSensorTypeEnum FromString(const std::string& s);
-}
-namespace IfcSequenceEnum {
-/// IfcSequenceEnum is an
-///   enumeration that defines the different ways in which a
-///   time lag is applied to a sequence between two processes.
+/// Note that while IfcLabel is restricted to 255 characters, the size in exchange files after encoding may be considerably larger than 255 octets, depending on the particular encoding and on the contents of the label.
+class IfcLabel : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcLabel (IfcAbstractEntity* e);
+    IfcLabel (std::string v);
+    operator std::string() const;
+};
+/// Definition from ISO/CD 10303-41:1992: A length measure is the value of a distance.
+/// Usually measured in millimeters (mm).
+/// Type: REAL
 /// 
-/// HISTORY  New entity in IFC 1.0
-typedef enum {IfcSequence_START_START, IfcSequence_START_FINISH, IfcSequence_FINISH_START, IfcSequence_FINISH_FINISH, IfcSequence_NOTDEFINED} IfcSequenceEnum;
-const char* ToString(IfcSequenceEnum v);
-IfcSequenceEnum FromString(const std::string& s);
-}
-namespace IfcServiceLifeFactorTypeEnum {
-
-typedef enum {IfcServiceLifeFactorType_A_QUALITYOFCOMPONENTS, IfcServiceLifeFactorType_B_DESIGNLEVEL, IfcServiceLifeFactorType_C_WORKEXECUTIONLEVEL, IfcServiceLifeFactorType_D_INDOORENVIRONMENT, IfcServiceLifeFactorType_E_OUTDOORENVIRONMENT, IfcServiceLifeFactorType_F_INUSECONDITIONS, IfcServiceLifeFactorType_G_MAINTENANCELEVEL, IfcServiceLifeFactorType_USERDEFINED, IfcServiceLifeFactorType_NOTDEFINED} IfcServiceLifeFactorTypeEnum;
-const char* ToString(IfcServiceLifeFactorTypeEnum v);
-IfcServiceLifeFactorTypeEnum FromString(const std::string& s);
-}
-namespace IfcServiceLifeTypeEnum {
-
-typedef enum {IfcServiceLifeType_ACTUALSERVICELIFE, IfcServiceLifeType_EXPECTEDSERVICELIFE, IfcServiceLifeType_OPTIMISTICREFERENCESERVICELIFE, IfcServiceLifeType_PESSIMISTICREFERENCESERVICELIFE, IfcServiceLifeType_REFERENCESERVICELIFE} IfcServiceLifeTypeEnum;
-const char* ToString(IfcServiceLifeTypeEnum v);
-IfcServiceLifeTypeEnum FromString(const std::string& s);
-}
-namespace IfcSlabTypeEnum {
-/// Definition from IAI: This enumeration defines the
-///   available predefined types of a slab. The
-///   IfcSlabTypeEnum can be used for slab occurrences,
-///   IfcSlab, and slab types, IfcSlabType. A
-///   special property set definition may be provided for each
-///   predefined type.
+/// NOTE Corresponding ISO 10303 name: length_measure, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
 /// 
-/// HISTORY  New type in IFC
-///   Release 2.0
+/// HISTORY New type in IFC Release 1.5.1.
+class IfcLengthMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcLengthMeasure (IfcAbstractEntity* e);
+    IfcLengthMeasure (double v);
+    operator double() const;
+};
+/// IfcLinearForceMeasure is a measure of linear force.
+/// Usually measured in N/m.
+/// Type: REAL
 /// 
-/// Floor
+/// HISTORY New type in IFC Release 2x.
+class IfcLinearForceMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcLinearForceMeasure (IfcAbstractEntity* e);
+    IfcLinearForceMeasure (double v);
+    operator double() const;
+};
+/// IfcLinearMomentMeasure is a measure of linear moment.
+/// Usually measured in Nm/m.
+/// Type: REAL
 /// 
-/// The slab is used to represent a floor slab.
+/// HISTORY New type in IFC Release 2x.
+class IfcLinearMomentMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcLinearMomentMeasure (IfcAbstractEntity* e);
+    IfcLinearMomentMeasure (double v);
+    operator double() const;
+};
+/// IfcLinearStiffnessMeasureA measure of linear stiffness.
+/// Usually measured in N/m.
+/// Type: REAL
 /// 
-/// Roof
+/// HISTORY New type in IFC Release 2x.
+class IfcLinearStiffnessMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcLinearStiffnessMeasure (IfcAbstractEntity* e);
+    IfcLinearStiffnessMeasure (double v);
+    operator double() const;
+};
+/// IfcLinearVelocityMeasure is a measure of the velocity of a body measured in terms of distance moved per unit time.
+/// Usually measured in m/s.
+/// Type: REAL
 /// 
-/// The slab is used to represent a roof slab (either
-///   flat or sloped).
+/// HISTORY New type in IFC Release 2.0.
+class IfcLinearVelocityMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcLinearVelocityMeasure (IfcAbstractEntity* e);
+    IfcLinearVelocityMeasure (double v);
+    operator double() const;
+};
+/// IfcLogical</iL is a defined type of simple type Logical. It is required since a select type (IfcSimpleValue) cannot directly include simple types in its select list). Logical datatype can have values TRUE, FALSE or UNKNOWN.
 /// 
-/// Landing
+/// Type: LOGICAL
 /// 
-/// The slab is used to represent a landing within a
-///   stair or ramp.
+/// HISTORY New type in IFC Release 2x.
+class IfcLogical : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcLogical (IfcAbstractEntity* e);
+    IfcLogical (bool v);
+    operator bool() const;
+};
+/// IfcLuminousFluxMeasure is a measure of the luminous flux.
+/// Usually measured in Lumen (lm, Candela Steradian).
+/// Type: REAL
 /// 
-/// BaseSlab
+/// HISTORY New type in IFC Release 2x.
+class IfcLuminousFluxMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcLuminousFluxMeasure (IfcAbstractEntity* e);
+    IfcLuminousFluxMeasure (double v);
+    operator double() const;
+};
+/// IfcLuminousIntensityDistributionMeasure is a measure of the luminous intensity of a light source that changes according to the direction of the ray. It is normally based on some standardized distribution light distribution curves. 
 /// 
-/// The slab is used to represent a floor slab against
-///   the ground (and thereby being a part of the
-///   foundation). Another name is mat foundation.
+/// Usually measured in Candela/Lumen (cd/lm) or (cd/klm).  
 /// 
-/// IFC2x3 CHANGE
-///    new enumerator added.
-typedef enum {IfcSlabType_FLOOR, IfcSlabType_ROOF, IfcSlabType_LANDING, IfcSlabType_BASESLAB, IfcSlabType_USERDEFINED, IfcSlabType_NOTDEFINED} IfcSlabTypeEnum;
-const char* ToString(IfcSlabTypeEnum v);
-IfcSlabTypeEnum FromString(const std::string& s);
-}
-namespace IfcSoundScaleEnum {
-
-typedef enum {IfcSoundScale_DBA, IfcSoundScale_DBB, IfcSoundScale_DBC, IfcSoundScale_NC, IfcSoundScale_NR, IfcSoundScale_USERDEFINED, IfcSoundScale_NOTDEFINED} IfcSoundScaleEnum;
-const char* ToString(IfcSoundScaleEnum v);
-IfcSoundScaleEnum FromString(const std::string& s);
-}
-namespace IfcSpaceHeaterTypeEnum {
-/// Enumeration defining the functional type of space heater.
+/// Type: REAL  
 /// 
-/// The IfcSpaceHeaterTypeEnum contains the following:
+/// HISTORY New type in IFC2x2.
+class IfcLuminousIntensityDistributionMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcLuminousIntensityDistributionMeasure (IfcAbstractEntity* e);
+    IfcLuminousIntensityDistributionMeasure (double v);
+    operator double() const;
+};
+/// Definition from ISO/CD 10303-41:1992: A luminous intensity measure is the value for the brightness of a body.
+/// Usually measured in candela (cd).
+/// Type: REAL
 /// 
-/// CONVECTOR: A heat-distributing unit that operates with gravity-circulated air.
-/// RADIATOR: A heat-distributing unit that operates with thermal radiation.
-/// USERDEFINED: User-defined space heater type.
-/// NOTDEFINED:  Undefined space heater type.
+/// NOTE Corresponding ISO 10303 name: luminous_intensity_measure, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
 /// 
-/// NOTE: This enumeration was revised in IFC 2x4 and was renamed from IfcHydronicHeaterTypeEnum in IFC R2x.
+/// HISTORY New type in IFC Release 1.5.1.
+class IfcLuminousIntensityMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcLuminousIntensityMeasure (IfcAbstractEntity* e);
+    IfcLuminousIntensityMeasure (double v);
+    operator double() const;
+};
+/// IfcMagneticFluxDensityMeasure is a measure of the magnetic flux density.
+/// Usually measured in Tesla (T, Weber/m2 = V s/m2).
+/// Type: REAL
 /// 
-/// HISTORY: New enumeration in IFC R2x.
-typedef enum {IfcSpaceHeaterType_SECTIONALRADIATOR, IfcSpaceHeaterType_PANELRADIATOR, IfcSpaceHeaterType_TUBULARRADIATOR, IfcSpaceHeaterType_CONVECTOR, IfcSpaceHeaterType_BASEBOARDHEATER, IfcSpaceHeaterType_FINNEDTUBEUNIT, IfcSpaceHeaterType_UNITHEATER, IfcSpaceHeaterType_USERDEFINED, IfcSpaceHeaterType_NOTDEFINED} IfcSpaceHeaterTypeEnum;
-const char* ToString(IfcSpaceHeaterTypeEnum v);
-IfcSpaceHeaterTypeEnum FromString(const std::string& s);
-}
-namespace IfcSpaceTypeEnum {
-/// Definition from IAI: This enumeration defines the
-/// available generic types for IfcSpace and
-/// IfcSpaceType.
-/// HISTORY New enumeration
-/// in IFC2x3.
-/// IFC2x4 CHANGE The enumerators
-/// INTERNAL and EXTERNAL have been added for upward compatibility to
-/// replace InteriorOrExteriorSpace
-/// usage.
-/// Enumeration
+/// HISTORY New type in IFC Release 2x.
+class IfcMagneticFluxDensityMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcMagneticFluxDensityMeasure (IfcAbstractEntity* e);
+    IfcMagneticFluxDensityMeasure (double v);
+    operator double() const;
+};
+/// IfcMagneticFluxMeasure is a measure of the magnetic flux.
+/// Usually measured in Weber (Wb, V s).
+/// Type: REAL
 /// 
-/// SPACE Any space not falling into another category.
+/// HISTORY New type in IFC Release 2x.
+class IfcMagneticFluxMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcMagneticFluxMeasure (IfcAbstractEntity* e);
+    IfcMagneticFluxMeasure (double v);
+    operator double() const;
+};
+/// IfcMassDensityMeasure is a measure of the density of a medium.
+/// Usually measured in kg/m3.
+/// Type: REAL
 /// 
-/// NOTE For classification of spaces according to its
-/// function that is often determined by national classification
-/// systems use IfcClassificationReference via the
-/// relationship IfcRelAssociatesClassification.
+/// HISTORY New type in IFC Release 2.0.
+class IfcMassDensityMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcMassDensityMeasure (IfcAbstractEntity* e);
+    IfcMassDensityMeasure (double v);
+    operator double() const;
+};
+/// IfcMassFlowRateMeasure is a measure of the mass of a medium flowing per unit time.
+/// Usually measured in kg/s.
+/// Type: REAL
 /// 
-/// PARKING A space dedication for use as a parking spot
-/// for vehicles, including access, such as a parking aisle
-/// GFA Gross Floor Area - a specific kind of space for
-/// each building story that includes all net area and construction
-/// area (also the external envelop). Provision of such a specific
-/// space is often required by regulations.
-/// INTERNAL
+/// HISTORY New type in IFC Release 2.0.
+class IfcMassFlowRateMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcMassFlowRateMeasure (IfcAbstractEntity* e);
+    IfcMassFlowRateMeasure (double v);
+    operator double() const;
+};
+/// Definition from ISO/CD 10303-41:1992: A mass measure is the value of the amount of matter that a body contains.
+/// Usually measured in kilograms (kg) or grams (g).
+/// Type: REAL
 /// 
-/// NOTE the use is deprecated and
-/// only provided for backward compatibility
-/// purposes.
+/// NOTE Corresponding ISO 10303 name: mass_measure, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
 /// 
-/// EXTERNAL
+/// HISTORY New type in IFC Release 1.5.1.
+class IfcMassMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcMassMeasure (IfcAbstractEntity* e);
+    IfcMassMeasure (double v);
+    operator double() const;
+};
+/// IfcMassPerLengthMeasure is a measure for mass per length. For example for rolled steel profiles the weight of
+///   an imaginary beam is usually expressed by kg/m length for cost calculation and
+///   structural analysis purposes.
 /// 
-/// NOTE the use is deprecated and
-/// only provided for backward compatibility
-/// purposes.
-typedef enum {IfcSpaceType_USERDEFINED, IfcSpaceType_NOTDEFINED} IfcSpaceTypeEnum;
-const char* ToString(IfcSpaceTypeEnum v);
-IfcSpaceTypeEnum FromString(const std::string& s);
-}
-namespace IfcStackTerminalTypeEnum {
-/// An IfcStackTerminalTypeEnum defines the range of different types of stack terminal that can be specified for use at the top of a vertical stack subsystem. 
-///   HISTORY: New type in IFC 2x  
-///   Enumeration 
+/// Type: REAL
 /// 
-/// BIRDCAGE: Guard cage, typically wire mesh, at the top of the stack preventing access by birds. 
-/// COWL: A cowling placed at the top of a stack to eliminate downdraft. 
-/// RAINWATERHOPPER: A box placed at the top of a rainwater downpipe to catch rainwater from guttering. 
-/// USERDEFINED: User-defined type. 
-/// NOTDEFINED: Undefined type.
-typedef enum {IfcStackTerminalType_BIRDCAGE, IfcStackTerminalType_COWL, IfcStackTerminalType_RAINWATERHOPPER, IfcStackTerminalType_USERDEFINED, IfcStackTerminalType_NOTDEFINED} IfcStackTerminalTypeEnum;
-const char* ToString(IfcStackTerminalTypeEnum v);
-IfcStackTerminalTypeEnum FromString(const std::string& s);
-}
-namespace IfcStairFlightTypeEnum {
-/// Definition from IAI: This enumeration defines the different types
-///   of stair flights an IfcStairFlightType object can fulfill: 
+/// HISTORY New type in IFC2x2.
+class IfcMassPerLengthMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcMassPerLengthMeasure (IfcAbstractEntity* e);
+    IfcMassPerLengthMeasure (double v);
+    operator double() const;
+};
+
+class IfcMinuteInHour : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcMinuteInHour (IfcAbstractEntity* e);
+    IfcMinuteInHour (int v);
+    operator int() const;
+};
+/// IfcModulusOfElasticityMeasure is a measure of modulus of elasticity.
+/// Usually measured in N/m2.
+/// Type: REAL
 /// 
-/// STRAIGHT: A stair flight with a straight walking line.  
-///   WINDER: A stair flight with a straight walking line. 
-///   SPIRAL: A stair flight with a circular or elliptic walking
-///   line. 
-///   CURVED: A stair flight with a curved walking line. 
-///   FREEFORM: A stair flight with a free form walking line (and
-///   outer boundaries). 
-///   USERDEFINED: User-defined stair flight . 
-///   NOTDEFINED: Undefined stair flight . 
+/// HISTORY New type in IFC Release 2x.
+class IfcModulusOfElasticityMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcModulusOfElasticityMeasure (IfcAbstractEntity* e);
+    IfcModulusOfElasticityMeasure (double v);
+    operator double() const;
+};
+/// IfcModulusOfLinearSubgradeReactionMeasure is a measure for modulus of linear subgrade reaction, which expresses the elastic bedding of a linear structural element per length, such as for a beam. It is typically measured in N/m^2.
 /// 
-/// HISTORY: New Enumeration in
-///   Release IFC2x Edition 2.
-typedef enum {IfcStairFlightType_STRAIGHT, IfcStairFlightType_WINDER, IfcStairFlightType_SPIRAL, IfcStairFlightType_CURVED, IfcStairFlightType_FREEFORM, IfcStairFlightType_USERDEFINED, IfcStairFlightType_NOTDEFINED} IfcStairFlightTypeEnum;
-const char* ToString(IfcStairFlightTypeEnum v);
-IfcStairFlightTypeEnum FromString(const std::string& s);
-}
-namespace IfcStairTypeEnum {
-/// This enumeration defines the basic configuration of the stair type in terms of the number of stair flights and the number of landings, as illustrated in Figure 69. The type also distinguished turns by windings or by landings. In addition the subdivision of the straight and changing direction stairs is included. The stair configurations are given for stairs without and with one, two or three landings. 
+/// Type: REAL  
 /// 
-/// Stairs which are subdivided into more than three landings have to be defined by the geometry only. Also stairs with non-regular shapes have to be defined by the geometry only. The type of such stairs is OTHEROPERATION. 
+/// HISTORY New type in IFC Release 2x2.
+class IfcModulusOfLinearSubgradeReactionMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcModulusOfLinearSubgradeReactionMeasure (IfcAbstractEntity* e);
+    IfcModulusOfLinearSubgradeReactionMeasure (double v);
+    operator double() const;
+};
+/// IfcModulusOfRotationalSubgradeReactionMeasure is a measure for modulus of rotational subgrade reaction, which expresses the rotational elastic bedding of a linear structural element per length, such as for a beam. It is typically measured in Nm/(m*rad). 
 /// 
-/// HISTORY New Enumeration in IFC Release 2.0. 
+/// Type: REAL  
 /// 
-/// Enumerator 
-///   Description 
-///   Figure 
+/// HISTORY New type in IFC2x2.
+class IfcModulusOfRotationalSubgradeReactionMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcModulusOfRotationalSubgradeReactionMeasure (IfcAbstractEntity* e);
+    IfcModulusOfRotationalSubgradeReactionMeasure (double v);
+    operator double() const;
+};
+/// IfcModulusOfSubgradeReactionMeasure is a geotechnical measure describing interaction between foundation structures and the soil. May also be known as bedding measure. 
+///   Usually measured in N/m3.  
+///   Type: REAL  
 /// 
-/// StraightRunStair 
-///   A stair extending from
-///   one level to another without turns or winders. The stair consists of one
-///   straight flight. 
+/// HISTORY New type in IFC Release 2x.
 /// 
-/// TwoStraightRunStair 
-///   A straight stair
-///   consisting of two straight flights without turns but with one landing. 
+/// Figure 290 illustrates elastic support of a planar member.
 /// 
-/// QuarterWindingStair 
-///   A stair consisting of one
-///   flight with a quarter winder, which is making a 90° turn. The direction of
-///   the turn is determined by the walking line. 
+/// Figure 290 — Modulus of subgrade reaction measure
+class IfcModulusOfSubgradeReactionMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcModulusOfSubgradeReactionMeasure (IfcAbstractEntity* e);
+    IfcModulusOfSubgradeReactionMeasure (double v);
+    operator double() const;
+};
+/// IfcMoistureDiffusivityMeasure is a measure of moisture diffusivity.
+/// Usually measured in m3/s.
+/// Type: REAL
 /// 
-/// QuarterTurnStair 
-///   A stair making a 90°
-///   turn, consisting of two straight flights connected by a quarterspace landing.
-///   The direction of the turn is determined by the walking line. 
+/// HISTORY New type in IFC Release 2x.
+class IfcMoistureDiffusivityMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcMoistureDiffusivityMeasure (IfcAbstractEntity* e);
+    IfcMoistureDiffusivityMeasure (double v);
+    operator double() const;
+};
+/// IfcMolecularWeightMeasure is a measure of molecular weight of material (typically gas).
+/// Usually measured in g/mole.
+/// Type: REAL
 /// 
-/// HalfWindingStair 
-///   A stair consisting of one
-///   flight with one half winder, which makes a 180° turn. The orientation of
-///   the turn is determined by the walking line. 
+/// HISTORY New type in IFC Release 2x.
+class IfcMolecularWeightMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcMolecularWeightMeasure (IfcAbstractEntity* e);
+    IfcMolecularWeightMeasure (double v);
+    operator double() const;
+};
+/// IfcMomentOfInertiaMeasure is a measure of moment of inertia.
+/// Usually measured in m4.
+/// Type: REAL
 /// 
-/// HalfTurnStair 
-///   A stair making a 180°
-///   turn, consisting of two straight flights connected by a halfspace landing. The
-///   orientation of the turn is determined by the walking line. 
+/// HISTORY New type in IFC Release 2x.
+class IfcMomentOfInertiaMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcMomentOfInertiaMeasure (IfcAbstractEntity* e);
+    IfcMomentOfInertiaMeasure (double v);
+    operator double() const;
+};
+/// A monetary measure is the value of an amount of money without regard to its currency.
+/// Type: REAL
 /// 
-/// TwoQuarterWindingStair 
-///   A stair consisting of one
-///   flight with two quarter winders, which make a 90° turn. The stair makes a
-///   180° turn. The direction of the turns is determined by the walking
-///   line. 
+/// HISTORY New type in IFC Release 2.0.
+class IfcMonetaryMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcMonetaryMeasure (IfcAbstractEntity* e);
+    IfcMonetaryMeasure (double v);
+    operator double() const;
+};
+/// Definition from IAI: The IfcDayInMonthNumber is
+/// an integer that defines the position of the specified month in a
+/// year. The positions have the following meaning (according to
+/// ISO8601 "calendar month") that assigns the Calendar month number
+/// to the Calender month name.
+/// NOTE Refer to ISO 8601 for the definitions for
+/// using the Gregorian calendar as the standard for the
+/// identification of calendar days.
 /// 
-/// TwoQuarterTurnStair 
-///   A stair making a 180°
-///   turn, consisting of three straight flights connected by two quarterspace
-///   landings. The direction of the turns is determined by the walking line. 
+/// Calendar month number
+/// Calendar month
+/// name
 /// 
-/// ThreeQuarterWindingStair
+/// 01
+/// January
 /// 
-/// A stair consisting of one
-///   flight with three quarter winders, which make a 90° turn. The stair makes a
-///   270° turn. The direction of the turns is determined by the walking
-///   line. 
+/// 02
+/// February
 /// 
-/// ThreeQuarterTurnStair 
-///   A stair making a 270°
-///   turn, consisting of four straight flights connected by three quarterspace
-///   landings. The direction of the turns is determined by the walking line. 
+/// 03
+/// March
 /// 
-/// SpiralStair 
-///   A stair constructed with
-///   winders around a circular newel often without landings. Depending on outer
-///   boundary it can be either a circular, elliptical or rectangular spiral stair.
-///   The orientation of the winding stairs is determined by the walking line. 
+/// 04
+/// April
 /// 
-/// DoubleReturnStair 
-///   A stair having one
-///   straight flight to a wide quarterspace landing, and two side flights from that
-///   landing into opposite directions. The stair is making a 90° turn. The
-///   direction of traffic is determined by the walking line. 
+/// 05
+/// May
 /// 
-/// CurvedRunStair 
-///   A stair extending from one
-///   level to another without turns or winders. The stair is consisting of one
-///   curved flight. 
+/// 06
+/// June
 /// 
-/// TwoCurvedRunStair 
-///   A curved stair consisting of
-///   two curved flights without turns but with one landing. 
+/// 07
+/// July
 /// 
-/// OtherOperation 
-///   Free form stair (user defined
-///   operation type) 
-///     
+/// 08
+/// August
 /// 
-/// NotDefined 
-///     
-///     
+/// 09
+/// September
 /// 
-/// Figure 69 — Stair types
-typedef enum {IfcStairType_STRAIGHT_RUN_STAIR, IfcStairType_TWO_STRAIGHT_RUN_STAIR, IfcStairType_QUARTER_WINDING_STAIR, IfcStairType_QUARTER_TURN_STAIR, IfcStairType_HALF_WINDING_STAIR, IfcStairType_HALF_TURN_STAIR, IfcStairType_TWO_QUARTER_WINDING_STAIR, IfcStairType_TWO_QUARTER_TURN_STAIR, IfcStairType_THREE_QUARTER_WINDING_STAIR, IfcStairType_THREE_QUARTER_TURN_STAIR, IfcStairType_SPIRAL_STAIR, IfcStairType_DOUBLE_RETURN_STAIR, IfcStairType_CURVED_RUN_STAIR, IfcStairType_TWO_CURVED_RUN_STAIR, IfcStairType_USERDEFINED, IfcStairType_NOTDEFINED} IfcStairTypeEnum;
-const char* ToString(IfcStairTypeEnum v);
-IfcStairTypeEnum FromString(const std::string& s);
-}
-namespace IfcStateEnum {
-/// The IfcStateEnum enumeration identifies the state or accessibility of the object (for example, read/write, locked).
+/// 10
+/// October
 /// 
-/// Valid enumerations are:
+/// 11
+/// November
 /// 
-/// READWRITE: Object is in a Read-Write state. It may be modified by an application.
-/// READONLY: Object is in a Read-Only state. It may be viewed but not modified by an application.
-/// LOCKED: Object is in a Locked state. It may not be accessed by an application.
-/// READWRITELOCKED: Object is in a Read-Write-Locked state. It may not be accessed by an application.
-/// READONLYLOCKED: Object is in a Read-Only-Locked state. It may not be accessed by an application.
+/// 12
+/// December
 /// 
-/// HISTORY  New enumeration in IFC R2.0.
+/// Type: INTEGER
+/// NOTE Corresponding STEP
+/// name: month_in_year_number, please refer to ISO/IS 10303-41:1994
+/// for the final definition of the formal
+/// standard.
+/// HISTORY New type in IFC
+/// Release 1.5.1.
+class IfcMonthInYearNumber : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcMonthInYearNumber (IfcAbstractEntity* e);
+    IfcMonthInYearNumber (int v);
+    operator int() const;
+};
+/// Definition from ISO/CD 10303-41:1992: A numeric measure is the numeric value of a physical quantity.
+/// Type: NUMBER
 /// 
-/// IFC2x3 CHANGE  This concept was initially introduced in IFC 2.0 as IfcModifiedFlag of type BINARY(3) FIXED and has been modified in R2x to an enumeration. It was initially introduced as a first step towards providing facilities for partial model exchange from a server as requested by the IFC implementers. It is intended for use primarily by a model server so that an application can identify the state of the object.
-typedef enum {IfcState_READWRITE, IfcState_READONLY, IfcState_LOCKED, IfcState_READWRITELOCKED, IfcState_READONLYLOCKED} IfcStateEnum;
-const char* ToString(IfcStateEnum v);
-IfcStateEnum FromString(const std::string& s);
-}
-namespace IfcStructuralCurveTypeEnum {
-
-typedef enum {IfcStructuralCurveType_RIGID_JOINED_MEMBER, IfcStructuralCurveType_PIN_JOINED_MEMBER, IfcStructuralCurveType_CABLE, IfcStructuralCurveType_TENSION_MEMBER, IfcStructuralCurveType_COMPRESSION_MEMBER, IfcStructuralCurveType_USERDEFINED, IfcStructuralCurveType_NOTDEFINED} IfcStructuralCurveTypeEnum;
-const char* ToString(IfcStructuralCurveTypeEnum v);
-IfcStructuralCurveTypeEnum FromString(const std::string& s);
-}
-namespace IfcStructuralSurfaceTypeEnum {
-
-typedef enum {IfcStructuralSurfaceType_BENDING_ELEMENT, IfcStructuralSurfaceType_MEMBRANE_ELEMENT, IfcStructuralSurfaceType_SHELL, IfcStructuralSurfaceType_USERDEFINED, IfcStructuralSurfaceType_NOTDEFINED} IfcStructuralSurfaceTypeEnum;
-const char* ToString(IfcStructuralSurfaceTypeEnum v);
-IfcStructuralSurfaceTypeEnum FromString(const std::string& s);
-}
-namespace IfcSurfaceSide {
-/// IfcSurfaceSide is a denotion of whether negative, positive or both sides of a surface are being referenced. 
+/// NOTE Corresponding ISO 10303 name: numeric_measure, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
 /// 
-/// ENUMERATION Definition from ISO/CD 10303-46:1992: 
+/// HISTORY New type in IFC Release 1.5.1.
+class IfcNumericMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcNumericMeasure (IfcAbstractEntity* e);
+    IfcNumericMeasure (double v);
+    operator double() const;
+};
+/// IfcPHMeasure is a measure of the molar hydrogen ion concentration in a liquid (usually defined as the measure of acidity) in a range from 0 to 14.
 /// 
-/// POSITIVE: The side of a surface which is in the same direction as the surface normal derived from the mathematical definition.  
-/// NEGATIVE: The side of a surface which is in the opposite direction than the surface normal derived from the mathematical definition. 
-/// BOTH: Both, positive and negative side. 
+/// HISTORY: New type in IFC 2x2.
+class IfcPHMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcPHMeasure (IfcAbstractEntity* e);
+    IfcPHMeasure (double v);
+    operator double() const;
+};
+/// Definition from ISO/CD 10303-41:1992: A parameter value is the value which specifies the amount of a 
+/// parameter in some parameter space.
+/// Type: REAL
 /// 
-/// NOTE Corresponding ISO 10303 type: surface_side. Please refer to ISO/IS 10303-46:1994 for the final definition of the formal standard.
+/// NOTE Corresponding STEP name: parameter_value, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
 /// 
-/// HISTORY: New Enumeration in IFC 2.0
-typedef enum {IfcSurfaceSide_POSITIVE, IfcSurfaceSide_NEGATIVE, IfcSurfaceSide_BOTH} IfcSurfaceSide;
-const char* ToString(IfcSurfaceSide v);
-IfcSurfaceSide FromString(const std::string& s);
-}
-namespace IfcSurfaceTextureEnum {
-
-typedef enum {IfcSurfaceTexture_BUMP, IfcSurfaceTexture_OPACITY, IfcSurfaceTexture_REFLECTION, IfcSurfaceTexture_SELFILLUMINATION, IfcSurfaceTexture_SHININESS, IfcSurfaceTexture_SPECULAR, IfcSurfaceTexture_TEXTURE, IfcSurfaceTexture_TRANSPARENCYMAP, IfcSurfaceTexture_NOTDEFINED} IfcSurfaceTextureEnum;
-const char* ToString(IfcSurfaceTextureEnum v);
-IfcSurfaceTextureEnum FromString(const std::string& s);
-}
-namespace IfcSwitchingDeviceTypeEnum {
-/// The IfcSwitchingDeviceTypeEnum defines the range of different types of switch that can be specified. 
-///   HISTORY: New type in IFC 2x2 
-///   Enumeration 
+/// HISTORY New type in IFC Release 1.5.1.
+class IfcParameterValue : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcParameterValue (IfcAbstractEntity* e);
+    IfcParameterValue (double v);
+    operator double() const;
+};
+/// IfcPlanarForceMeasure is a measure of force on an area.
+/// Usually measured in N/m2.
+/// Type: REAL
 /// 
-/// CONTACTOR: An electrical device used to control the flow of power in a circuit on or off. 
-/// DIMMERSWITCH: A dimmer switch has variable positions, and may adjust electrical power or other setting (according to the switched port type). 
-/// EMERGENCYSTOP: An emergency stop device acts to remove as quickly as possible any danger that may have arisen unexpectedly. 
-/// KEYPAD: A set of buttons or switches, each potentially applicable to a different device.  
-/// MOMENTARYSWITCH: A momentary switch has no position, and may trigger some action to occur.  
-/// SELECTORSWITCH: A selector switch has multiple positions, and may switch connectivity or other setting.  
-/// STARTER: A starter is a switch which in the closed position controls the application of power to an electrical device. 
-/// SWITCHDISCONNECTOR: A switch disconnector is a switch which in the open position satisfies the isolating requirements specified for a disconnector. 
-/// SELECTORSWITCH: A selector switch has multiple positions, and may change the source or level of power or other setting (according to the switched port type). 
-/// TOGGLESWITCH: A toggle switch has two positions, and may enable or isolate electrical power or other setting (according to the switched port type). 
-/// USERDEFINED: User-defined type. 
-/// NOTDEFINED: Undefined type.
-typedef enum {IfcSwitchingDeviceType_CONTACTOR, IfcSwitchingDeviceType_EMERGENCYSTOP, IfcSwitchingDeviceType_STARTER, IfcSwitchingDeviceType_SWITCHDISCONNECTOR, IfcSwitchingDeviceType_TOGGLESWITCH, IfcSwitchingDeviceType_USERDEFINED, IfcSwitchingDeviceType_NOTDEFINED} IfcSwitchingDeviceTypeEnum;
-const char* ToString(IfcSwitchingDeviceTypeEnum v);
-IfcSwitchingDeviceTypeEnum FromString(const std::string& s);
-}
-namespace IfcTankTypeEnum {
-/// Enumeration defining the typical types of tanks.
+/// HISTORY New type in IFC Release 2x.
+class IfcPlanarForceMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcPlanarForceMeasure (IfcAbstractEntity* e);
+    IfcPlanarForceMeasure (double v);
+    operator double() const;
+};
+/// Definition from ISO/CD 10303-41:1992: A plane angle measure is the value of an angle in a plane.
 /// 
-/// The IfcTankTypeEnum contains the following:
+/// Usually measured in radian (rad, m/m = 1), but also grads may be used. The grad unit may be declared as a conversion based unit based on radian unit.
 /// 
-/// BASIN:  An arbitrary open tank type.
+/// NOTE IfcPlaneAngleMeasure is used where angles need to be described to an accuracy of less than one degree and expressed as decimal parts of an angle. It is widely used for angular measurement except for situations where accuracy needs to be defined using arc measurement; for which purpose the IfcCompoundPlaneAngleMeasure is provided.
 /// 
-/// BREAKPRESSURE:  An open container that breaks the hydraulic pressure in a distribution system, typically located between the fluid reservoir and the fluid supply points. A typical break pressure tank allows the flow to discharge into the atmosphere, thereby reducing its hydrostatic pressure to zero.
+/// Type: REAL
 /// 
-/// EXPANSION:  A closed container used in a closed fluid distribution system to mitigate the effects of thermal expansion or water hammer. The tank is typically constructed with a diaphragm dividing the tank into two sections, with fluid on one side of the diaphragm and air on the other. One example application is when connected to the primary circuit of a hot water system to accommodate the increase in volume of the water when it is heated.
+/// NOTE Corresponding ISO 10303 name: plane_angle_measure, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
 /// 
-/// FEEDANDEXPANSION:  An open tank that is used for both storage and thermal expansion. A typical example is a tank used to store make-up water at ambient pressure for supply to a hot water system, simultaneously accommodating increases in volume of the water when heated.
+/// HISTORY New type in IFC Release 1.5.1.
+class IfcPlaneAngleMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcPlaneAngleMeasure (IfcAbstractEntity* e);
+    IfcPlaneAngleMeasure (double v);
+    operator double() const;
+};
+/// Definition from ISO/CD 10303-41:1992: A positive length measure is a length measure that is greater than zero.
+/// Type: IfcLengthMeasure
 /// 
-/// PRESSUREVESSEL:  A closed container used for storing fluids or gases at a pressure different from the ambient pressure. A pressure vessel is typically rated by an authority having jurisdiction for the operational pressure.
+/// NOTE Corresponding ISO 10303 name: positive_length_measure, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
 /// 
-/// STORAGE:  An open or closed containter used for storing a fluid at ambient pressure and from which it can be supplied to the fluid distribution system. There are many examples of storage tanks, such as potable water storage tanks, fuel storage tanks, etc.
+/// HISTORY New type in IFC Release 1.5.1.
+class IfcPositiveLengthMeasure : public IfcLengthMeasure {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcPositiveLengthMeasure (IfcAbstractEntity* e);
+    IfcPositiveLengthMeasure (double v);
+    operator double() const;
+};
+/// Definition from ISO/CD 10303-41:1992: Positive plane angle measure is a plane angle measure that is greater than zero.
+/// Type: IfcPlaneAngleMeasure 
 /// 
-/// VESSEL:  An arbitrary closed tank type.
+/// NOTE Corresponding STEP name: positive_plane_angle_measure, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
 /// 
-/// USERDEFINED:  User-defined tank type.
+/// HISTORY New type in IFC Release 1.5.1.
+class IfcPositivePlaneAngleMeasure : public IfcPlaneAngleMeasure {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcPositivePlaneAngleMeasure (IfcAbstractEntity* e);
+    IfcPositivePlaneAngleMeasure (double v);
+    operator double() const;
+};
+/// IfcPowerMeasure is a measure of power required or used.
+/// Usually measured in Watts (W, J/s).
+/// Type: REAL
 /// 
-/// NOTDEFINED:  Undefined tank type.
+/// HISTORY New type in IFC Release 2.0.
+class IfcPowerMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcPowerMeasure (IfcAbstractEntity* e);
+    IfcPowerMeasure (double v);
+    operator double() const;
+};
+/// IfcPresentableText is a text string used to capture the content of a text literal for the purpose of presentation. The IfcPresentableText can include multiple lines of text, for which the line feed character LF, 0x0A, should be used to separate lines.
 /// 
-/// HISTORY: New enumeration in IFC 2x2.  BASIN and VESSEL added in IFC2x4.
-typedef enum {IfcTankType_PREFORMED, IfcTankType_SECTIONAL, IfcTankType_EXPANSION, IfcTankType_PRESSUREVESSEL, IfcTankType_USERDEFINED, IfcTankType_NOTDEFINED} IfcTankTypeEnum;
-const char* ToString(IfcTankTypeEnum v);
-IfcTankTypeEnum FromString(const std::string& s);
-}
-namespace IfcTendonTypeEnum {
-
-typedef enum {IfcTendonType_STRAND, IfcTendonType_WIRE, IfcTendonType_BAR, IfcTendonType_COATED, IfcTendonType_USERDEFINED, IfcTendonType_NOTDEFINED} IfcTendonTypeEnum;
-const char* ToString(IfcTendonTypeEnum v);
-IfcTendonTypeEnum FromString(const std::string& s);
-}
-namespace IfcTextPath {
-/// The text path determines the direction of the text characters in respect to each other.
+/// NOTE  The non printable characters are converted within the standard exchange format ISO 10303-21 (STEP physical file format), commonly the \X\09 represents the TAB, and \X\0A the LF character.
 /// 
-/// NOTE: The IfcTextPath is an entity that had been adopted from ISO 10303, Industrial automation systems and integration&#151;Product data representation and exchange, Part 46: Integrated generic resources: Visual presentation.
+/// NOTE  The IfcPresentableText is an entity that had been adopted from ISO 10303, Industrial automation systems and integration—Product data representation and exchange, Part 46: Integrated generic resources: Visual presentation.
 /// 
-/// NOTE Corresponding ISO 10303 name:text_path . Please refer to ISO/IS 10303-46:1994 for the final definition of the formal standard.
+/// NOTE  Corresponding ISO 10303 name: presentable_text. Please refer to ISO/IS 10303-46:1994, p. 133 for the final definition of the formal standard.
 /// 
-/// HISTORY New entity in IFC2x2.
-typedef enum {IfcTextPath_LEFT, IfcTextPath_RIGHT, IfcTextPath_UP, IfcTextPath_DOWN} IfcTextPath;
-const char* ToString(IfcTextPath v);
-IfcTextPath FromString(const std::string& s);
-}
-namespace IfcThermalLoadSourceEnum {
-
-typedef enum {IfcThermalLoadSource_PEOPLE, IfcThermalLoadSource_LIGHTING, IfcThermalLoadSource_EQUIPMENT, IfcThermalLoadSource_VENTILATIONINDOORAIR, IfcThermalLoadSource_VENTILATIONOUTSIDEAIR, IfcThermalLoadSource_RECIRCULATEDAIR, IfcThermalLoadSource_EXHAUSTAIR, IfcThermalLoadSource_AIREXCHANGERATE, IfcThermalLoadSource_DRYBULBTEMPERATURE, IfcThermalLoadSource_RELATIVEHUMIDITY, IfcThermalLoadSource_INFILTRATION, IfcThermalLoadSource_USERDEFINED, IfcThermalLoadSource_NOTDEFINED} IfcThermalLoadSourceEnum;
-const char* ToString(IfcThermalLoadSourceEnum v);
-IfcThermalLoadSourceEnum FromString(const std::string& s);
-}
-namespace IfcThermalLoadTypeEnum {
-
-typedef enum {IfcThermalLoadType_SENSIBLE, IfcThermalLoadType_LATENT, IfcThermalLoadType_RADIANT, IfcThermalLoadType_NOTDEFINED} IfcThermalLoadTypeEnum;
-const char* ToString(IfcThermalLoadTypeEnum v);
-IfcThermalLoadTypeEnum FromString(const std::string& s);
-}
-namespace IfcTimeSeriesDataTypeEnum {
-/// IfcTimeSeriesDataTypeEnum describes a type of time series data and is used to determine a value during the time series which is not explicitly specified: 
+/// HISTORY  New type in IFC2x2.
+class IfcPresentableText : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcPresentableText (IfcAbstractEntity* e);
+    IfcPresentableText (std::string v);
+    operator std::string() const;
+};
+/// IfcPressureMeasure is a measure of the quantity of a medium acting on a unit area.
+/// Usually measured in Pascals (Pa, N/m2).
+/// Type: REAL
 /// 
-/// CONTINUOUS: The time series data is continuous. 
-///   DISCRETE: The time series data is discrete. 
-///   DISCRETEBINARY: The time series data is discrete binary. 
-///   PIECEWISEBINARY: The time series data is piecewise binary. 
-///   PIECEWISECONSTANT: The time series data is piecewise constant. 
-///   PIECEWISECONTINUOUS: The time series data is piecewise continuous. 
-///   NOTDEFINED: The time series data is not defined. 
+/// HISTORY New type in IFC Release 2.0.
+class IfcPressureMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcPressureMeasure (IfcAbstractEntity* e);
+    IfcPressureMeasure (double v);
+    operator double() const;
+};
+/// IfcRadioActivityMeasure is a measure of activity of radionuclide.
+/// Usually measured in Becquerel (Bq, 1/s).
+/// Type: REAL
 /// 
-/// HISTORY: New enumeration in IFC2x2.
-typedef enum {IfcTimeSeriesDataType_CONTINUOUS, IfcTimeSeriesDataType_DISCRETE, IfcTimeSeriesDataType_DISCRETEBINARY, IfcTimeSeriesDataType_PIECEWISEBINARY, IfcTimeSeriesDataType_PIECEWISECONSTANT, IfcTimeSeriesDataType_PIECEWISECONTINUOUS, IfcTimeSeriesDataType_NOTDEFINED} IfcTimeSeriesDataTypeEnum;
-const char* ToString(IfcTimeSeriesDataTypeEnum v);
-IfcTimeSeriesDataTypeEnum FromString(const std::string& s);
-}
-namespace IfcTimeSeriesScheduleTypeEnum {
-
-typedef enum {IfcTimeSeriesScheduleType_ANNUAL, IfcTimeSeriesScheduleType_MONTHLY, IfcTimeSeriesScheduleType_WEEKLY, IfcTimeSeriesScheduleType_DAILY, IfcTimeSeriesScheduleType_USERDEFINED, IfcTimeSeriesScheduleType_NOTDEFINED} IfcTimeSeriesScheduleTypeEnum;
-const char* ToString(IfcTimeSeriesScheduleTypeEnum v);
-IfcTimeSeriesScheduleTypeEnum FromString(const std::string& s);
-}
-namespace IfcTransformerTypeEnum {
-/// The IfcTransformerTypeEnum defines the range of different types of transformer that can be specified. 
-///   HISTORY: New type in IFC 2x2 
-///   Enumeration 
+/// HISTORY New type in IFC Release 2x.
+class IfcRadioActivityMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcRadioActivityMeasure (IfcAbstractEntity* e);
+    IfcRadioActivityMeasure (double v);
+    operator double() const;
+};
+/// Definition from ISO/CD 10303-41:1992: A ratio measure is the value of the relation between two 
+/// physical quantities that are of the same kind.
 /// 
-/// CURRENT: A transformer that changes the current between circuits. 
-/// FREQUENCY: A transformer that changes the frequency between circuits. 
-/// INVERTER: A transformer that converts from direct current (DC) to alternating current (AC). 
-/// RECTIFIER: A transformer that converts from alternating current (AC) to direct current (DC).  
-/// VOLTAGE: A transformer that changes the voltage between circuits.  
-/// USERDEFINED: User-defined type. 
-/// NOTDEFINED: Undefined type.
-typedef enum {IfcTransformerType_CURRENT, IfcTransformerType_FREQUENCY, IfcTransformerType_VOLTAGE, IfcTransformerType_USERDEFINED, IfcTransformerType_NOTDEFINED} IfcTransformerTypeEnum;
-const char* ToString(IfcTransformerTypeEnum v);
-IfcTransformerTypeEnum FromString(const std::string& s);
-}
-namespace IfcTransitionCode {
-/// Definition from ISO/CD 10303-42:1992: This type conveys the continuity properties of a composite curve or surface. The continuity referred to is geometric, not parametric continuity. For example, in ContSameGradient the tangent vectors of successive segments will have the same direction, but may have different magnitude.  
+/// NOTE: Input given in percent is to be divided by 100% when stored as an IfcRatioMeasure. For example, 25% becomes 0.25.
 /// 
-/// NOTE  Corresponding ISO 10303 type: transition_code, please refer to ISO/IS 10303-42:1994, p. 14 for the final definition of the formal standard.
+/// Type: REAL
 /// 
-/// HISTORY  New Type in IFC Release 1.0
+/// NOTE Corresponding STEP name: ratio_measure, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
 /// 
-/// Figure 273 (quoted from ISO/CD 10303-42:1992, p.55) illustrates transition types.
+/// HISTORY New type in IFC Release 1.5.1.
+class IfcRatioMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcRatioMeasure (IfcAbstractEntity* e);
+    IfcRatioMeasure (double v);
+    operator double() const;
+};
+/// IfcReal is a defined type of simple data type REAL.  It is required since a select type (IfcSimpleValue), cannot directly include simple types in its select list.
 /// 
-/// Figure 273 — Transition code
+/// In principle, the domain of IfcReal (being a Real) is all rational, irrational and scientific real numbers. Here the precision is unconstrained, but in practice it is implementation specific.
 /// 
-/// ENUMERATION 
+/// Type: REAL
 /// 
-/// DISCONTINUOUS: The segments do not join. This is permitted only at the boundary of the curve or surface to indicate that it is not closed.
-/// CONTINUOUS: The segments join but no condition on their tangents is implied. 
-/// CONTSAMEGRADIENT: The segments join and their tangent vectors or tangent planes are parallel and have the same direction at the joint: equality of derivatives is not required. 
-/// CONTSAMEGRADIENTSAMECURVATURE: For a curve, the segments join, their tangent vectors are parallel and in the same direction and their curvatures are equal at the joint: equality of derivatives is not required. For a surface this implies that the principle curvatures are the same and the principle directions are coincident along the common boundary.
-typedef enum {IfcTransitionCode_DISCONTINUOUS, IfcTransitionCode_CONTINUOUS, IfcTransitionCode_CONTSAMEGRADIENT, IfcTransitionCode_CONTSAMEGRADIENTSAMECURVATURE} IfcTransitionCode;
-const char* ToString(IfcTransitionCode v);
-IfcTransitionCode FromString(const std::string& s);
-}
-namespace IfcTransportElementTypeEnum {
-/// Definition from IAI: This enumeration is used to
-/// identify primary transport element types. The
-/// IfcTransportElementTypeEnum contains the following:
+/// HISTORY: New type in IFC Release 1.5.1.
+class IfcReal : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcReal (IfcAbstractEntity* e);
+    IfcReal (double v);
+    operator double() const;
+};
+/// IfcRotationalFrequencyMeasure is a measure of the number of cycles that an item revolves in unit time.
+/// Usually measured in cycles/s.
+/// Type: REAL
 /// 
-/// ELEVATOR: Elevator or lift being a transport device to
-/// move people of good vertically.
-/// ESCALATOR: Escalator being a transport device to move
-/// people. It consists of individual linked steps that move up and
-/// down on tracks while keeping the threads horizontal.
-/// MOVINGWALKWAY: Moving walkway being a transport device
-/// to move people horizontally or on an incline. It is a slow
-/// conveyor belt that transports people.
-/// CRANEWAY: A crane way system, normally including the
-/// crane rails, fasteners and the crane. It is primarily used to
-/// move heavy goods in a factory or other industry buildings.
-/// LIFTINGGEAR: A device used for lifting or lowering
-/// heavy goods. It may be manually operated or electrically or
-/// pneumatically driven.
+/// HISTORY New type in IFC Release 2x.
+class IfcRotationalFrequencyMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcRotationalFrequencyMeasure (IfcAbstractEntity* e);
+    IfcRotationalFrequencyMeasure (double v);
+    operator double() const;
+};
+/// The rotational mass measure denotes the inertia of a body with respect to angular acceleration.
+/// It is usually measured in kg*m^2.
 /// 
-/// HISTORY  New enumeration
-/// in IFC Release 2x.
-/// IFC2x4 CHANGE  New enumerators
-/// CRANEWAY and LIFTINGGEAR added in
-/// IFC2x4.
-typedef enum {IfcTransportElementType_ELEVATOR, IfcTransportElementType_ESCALATOR, IfcTransportElementType_MOVINGWALKWAY, IfcTransportElementType_USERDEFINED, IfcTransportElementType_NOTDEFINED} IfcTransportElementTypeEnum;
-const char* ToString(IfcTransportElementTypeEnum v);
-IfcTransportElementTypeEnum FromString(const std::string& s);
-}
-namespace IfcTrimmingPreference {
-/// Definition from ISO/CD 10303-42:1992: This type is used to describe the preferred way of trimming a parametric curve where the trimming is multiply defined. 
+/// Type: REAL  
 /// 
-/// NOTE Corresponding ISO 10303 type: trimming_preference, please refer to ISO/IS 10303-42:1994, p. 18 for the final definition of the formal standard.
+/// HISTORY New type in IFC2x2.
+class IfcRotationalMassMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcRotationalMassMeasure (IfcAbstractEntity* e);
+    IfcRotationalMassMeasure (double v);
+    operator double() const;
+};
+/// IfcRotationalStiffnessMeasure is a measure of rotational stiffness.
+/// Usually measured in Nm/rad.
+/// Type: REAL
 /// 
-/// HISTORY New Type in IFC Release 1.0
+/// HISTORY New type in IFC Release 2x.
+class IfcRotationalStiffnessMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcRotationalStiffnessMeasure (IfcAbstractEntity* e);
+    IfcRotationalStiffnessMeasure (double v);
+    operator double() const;
+};
+
+class IfcSecondInMinute : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcSecondInMinute (IfcAbstractEntity* e);
+    IfcSecondInMinute (double v);
+    operator double() const;
+};
+/// IfcSectionModulusMeasure is a measure for the resistance of a cross section against bending or torsional moment.  It is usually measured in m^3.
 /// 
-/// ENUMERATION 
+/// Type: REAL 
 /// 
-/// CARTESIAN: Indicates that trimming by Cartesian point is preferred. 
-/// PARAMETER: Indicates the preference for the parameter value. 
-/// UNSPECIFIED: Indicates that no preference is communicated.
-typedef enum {IfcTrimmingPreference_CARTESIAN, IfcTrimmingPreference_PARAMETER, IfcTrimmingPreference_UNSPECIFIED} IfcTrimmingPreference;
-const char* ToString(IfcTrimmingPreference v);
-IfcTrimmingPreference FromString(const std::string& s);
-}
-namespace IfcTubeBundleTypeEnum {
-/// Enumeration defining the typical types of tube bundles. 
-///   The IfcTubeBundleTypeEnum contains the following:
+/// HISTORY New type in IFC Release 2x2.
+class IfcSectionModulusMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcSectionModulusMeasure (IfcAbstractEntity* e);
+    IfcSectionModulusMeasure (double v);
+    operator double() const;
+};
+/// The sectional area integral measure is typically used in torsional analysis. It is usually measured in m^5.
 /// 
-/// FINNED:  Finned tube bundle type.
-///   USERDEFINED:  User-defined tube bundle type.
-///   NOTDEFINED:  Undefined tube bundle type.
+/// Type: REAL  
 /// 
-/// HISTORY: New enumeration in IFC 2x2.
-typedef enum {IfcTubeBundleType_FINNED, IfcTubeBundleType_USERDEFINED, IfcTubeBundleType_NOTDEFINED} IfcTubeBundleTypeEnum;
-const char* ToString(IfcTubeBundleTypeEnum v);
-IfcTubeBundleTypeEnum FromString(const std::string& s);
-}
-namespace IfcUnitEnum {
-/// IfcUnitEnum is an enumeration type for allowed unit types of IfcNamedUnit.
+/// HISTORY New type in IFC2x2.
+class IfcSectionalAreaIntegralMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcSectionalAreaIntegralMeasure (IfcAbstractEntity* e);
+    IfcSectionalAreaIntegralMeasure (double v);
+    operator double() const;
+};
+/// IfcShearModulusMeasure is a measure of shear modulus.
+/// Usually measured in N/m2.
+/// Type: REAL
 /// 
-/// ENUMERATION 
+/// HISTORY New type in IFC Release 2x.
+class IfcShearModulusMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcShearModulusMeasure (IfcAbstractEntity* e);
+    IfcShearModulusMeasure (double v);
+    operator double() const;
+};
+/// Definition from ISO/CD 10303-41:1992: A solid angle measure is the value of an angle in a solid.
+/// Usually measured in Steradians, (sr, m2/m2).
+/// Type: REAL
 /// 
-/// ABSORBEDDOSEUNIT
-///   AMOUNTOFSUBSTANCEUNIT
-///   AREAUNIT
-///   DOSEEQUIVALENTUNIT
-///   ELECTRICCAPACITANCEUNIT
-///   ELECTRICCHARGEUNIT
-///   ELECTRICCONDUCTANCEUNIT
-///   ELECTRICCURRENTUNIT
-///   ELECTRICRESISTANCEUNIT
-///   ELECTRICVOLTAGEUNIT
-///   ENERGYUNIT
-///   FORCEUNIT
-///   FREQUENCYUNIT
-///   ILLUMINANCEUNIT
-///   INDUCTANCEUNIT
-///   LENGTHUNIT
-///   LUMINOUSFLUXUNIT
-///   LUMINOUSINTENSITYUNIT
-///   MAGNETICFLUXDENSITYUNIT
-///   MAGNETICFLUXUNIT
-///   MASSUNIT
-///   PLANEANGLEUNIT
-///   POWERUNIT
-///   PRESSUREUNIT
-///   RADIOACTIVITYUNIT
-///   SOLIDANGLEUNIT
-///   THERMODYNAMICTEMPERATUREUNIT
-///   TIMEUNIT
-///   VOLUMEUNIT
-///   USERDEFINED: User defined unit type. The type of unit is only implied by its name or the usage context.
+/// NOTE Corresponding ISO 10303 name: solid_angle_measure, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
 /// 
 /// HISTORY New type in IFC Release 1.5.1.
-typedef enum {IfcUnit_ABSORBEDDOSEUNIT, IfcUnit_AMOUNTOFSUBSTANCEUNIT, IfcUnit_AREAUNIT, IfcUnit_DOSEEQUIVALENTUNIT, IfcUnit_ELECTRICCAPACITANCEUNIT, IfcUnit_ELECTRICCHARGEUNIT, IfcUnit_ELECTRICCONDUCTANCEUNIT, IfcUnit_ELECTRICCURRENTUNIT, IfcUnit_ELECTRICRESISTANCEUNIT, IfcUnit_ELECTRICVOLTAGEUNIT, IfcUnit_ENERGYUNIT, IfcUnit_FORCEUNIT, IfcUnit_FREQUENCYUNIT, IfcUnit_ILLUMINANCEUNIT, IfcUnit_INDUCTANCEUNIT, IfcUnit_LENGTHUNIT, IfcUnit_LUMINOUSFLUXUNIT, IfcUnit_LUMINOUSINTENSITYUNIT, IfcUnit_MAGNETICFLUXDENSITYUNIT, IfcUnit_MAGNETICFLUXUNIT, IfcUnit_MASSUNIT, IfcUnit_PLANEANGLEUNIT, IfcUnit_POWERUNIT, IfcUnit_PRESSUREUNIT, IfcUnit_RADIOACTIVITYUNIT, IfcUnit_SOLIDANGLEUNIT, IfcUnit_THERMODYNAMICTEMPERATUREUNIT, IfcUnit_TIMEUNIT, IfcUnit_VOLUMEUNIT, IfcUnit_USERDEFINED} IfcUnitEnum;
-const char* ToString(IfcUnitEnum v);
-IfcUnitEnum FromString(const std::string& s);
-}
-namespace IfcUnitaryEquipmentTypeEnum {
-/// Enumeration defining the functional type of unitary equipment. 
-///   The IfcUnitaryEquipmentTypeEnum contains the following:
+class IfcSolidAngleMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcSolidAngleMeasure (IfcAbstractEntity* e);
+    IfcSolidAngleMeasure (double v);
+    operator double() const;
+};
+/// A sound power measure is a measure of total radiated noise with units of decibels with a reference value of picowatts.
 /// 
-/// AIRHANDLER: A unitary air handling unit typically containing a fan, economizer, and coils.
-///   AIRCONDITIONINGUNIT: A unitary packaged air-conditioning unit typically used in residential or light commercial applications.
-///   DEHUMIDIFIER: A unitary packaged dehumidification unit.  Note: units supporting multiple modes (dehumidification, cooling, and/or heating) should use AIRCONDITIONINGUNIT.
-///   SPLITSYSTEM: A system which separates the compressor from the evaporator, but acts as a unitary component typically within residential or light commercial applications.
-///   ROOFTOPUNIT: A packaged assembly that is either field-erected or manufactured atop the roof of a large residential or commercial building and acts as a unitary component.
-///   USERDEFINED: User-defined unitary equipment type.
-///   NOTDEFINED:  Undefined unitary equipment type.
+/// Type: REAL  
 /// 
-/// HISTORY: New enumeration in IFC R2x.  DEHUMIDIFIER added in IFC 2x4
-typedef enum {IfcUnitaryEquipmentType_AIRHANDLER, IfcUnitaryEquipmentType_AIRCONDITIONINGUNIT, IfcUnitaryEquipmentType_SPLITSYSTEM, IfcUnitaryEquipmentType_ROOFTOPUNIT, IfcUnitaryEquipmentType_USERDEFINED, IfcUnitaryEquipmentType_NOTDEFINED} IfcUnitaryEquipmentTypeEnum;
-const char* ToString(IfcUnitaryEquipmentTypeEnum v);
-IfcUnitaryEquipmentTypeEnum FromString(const std::string& s);
-}
-namespace IfcValveTypeEnum {
-/// The IfcValveTypeEnum defines the
-///   range of different types of valve that can be specified. These are typically
-///   used in conjunction with Pset_ValveTypeCommon, which contains common
-///   properties for all valve types. The IfcValveTypeEnum contains:
+/// HISTORY New type in IFC2x2.
+class IfcSoundPowerMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcSoundPowerMeasure (IfcAbstractEntity* e);
+    IfcSoundPowerMeasure (double v);
+    operator double() const;
+};
+/// A sound pressure measure is a measure of the pressure fluctuations superimposed over the ambient pressure level with units of decibels with a reference value of micropascals. 
 /// 
-/// AIRRELEASE: Valve used to release air from a pipe or fitting.  
-///   ANTIVACUUM: Valve that opens to admit air if the pressure falls below
-///   atmospheric pressure (BS6100 330 4104) 
-///   CHANGEOVER: Valve that enables flow to be switched between pipelines (3 or 4
-///   port). 
-///   CHECK: Valve that permits water to flow in one direction only and is
-///   enclosed when there is no flow (2 port). 
-///   COMMISSIONING: Valve used to facilitate commissioning of a system (2 port). 
-///   DIVERTING: Valve that enables flow to be diverted from one branch of a
-///   pipeline to another (3 port). 
-///   DOUBLECHECK: An assembly that incorporates two valves used to prevent backflow
-///   (BS6100 330 4106). 
-///   DOUBLEREGULATING: Valve used to facilitate regulation of fluid flow in a system.
-///   DRAWOFFCOCK: A valve used to remove fluid from a piping system.
-///   FAUCET: Faucet valve typically used as a flow discharge.
-///   FLUSHING: Valve that flushes a predetermined quantity of water to cleanse a
-///   toilet, urinal, etc.
-///   GASCOCK: Valve that is used for controlling the flow of gas. 
-///   GASTAP: Gas tap typically used for venting or discharging gas from a system.
-///   ISOLATING: Valve that closes off flow in a pipeline. 
-///   MIXING: Valve that enables flow from two branches of a pipeline to be mixed
-///   together (3 port). 
-///   PRESSUREREDUCING: Valve that reduces the pressure of a fluid immediately downstream
-///   of its position in a pipeline to a preselected value or by a predetermined
-///   ratio. 
-///   PRESSURERELIEF: Spring or weight loaded valve that automatically discharges to a
-///   safe place fluid that has built up to excessive pressure in pipes or
-///   fittings 
-///   REGULATING: Valve used to facilitate regulation of fluid flow in a system.
-///   SAFETYCUTOFF: Valve that closes under the action of a safety mechanism such as a
-///   drop weight, solenoid etc. 
-///   STEAMTRAP: Valve that restricts flow of steam while allowing condensate to 
-///   pass through. 
-///   STOPCOCK: An isolating valve used on a domestic water service. 
-///   USERDEFINED: User-defined valve type. 
-///   NOTDEFINED: Undefined valve type. 
+/// Type: REAL  
 /// 
-/// HISTORY: New type in IFC R2.0
-typedef enum {IfcValveType_AIRRELEASE, IfcValveType_ANTIVACUUM, IfcValveType_CHANGEOVER, IfcValveType_CHECK, IfcValveType_COMMISSIONING, IfcValveType_DIVERTING, IfcValveType_DRAWOFFCOCK, IfcValveType_DOUBLECHECK, IfcValveType_DOUBLEREGULATING, IfcValveType_FAUCET, IfcValveType_FLUSHING, IfcValveType_GASCOCK, IfcValveType_GASTAP, IfcValveType_ISOLATING, IfcValveType_MIXING, IfcValveType_PRESSUREREDUCING, IfcValveType_PRESSURERELIEF, IfcValveType_REGULATING, IfcValveType_SAFETYCUTOFF, IfcValveType_STEAMTRAP, IfcValveType_STOPCOCK, IfcValveType_USERDEFINED, IfcValveType_NOTDEFINED} IfcValveTypeEnum;
-const char* ToString(IfcValveTypeEnum v);
-IfcValveTypeEnum FromString(const std::string& s);
-}
-namespace IfcVibrationIsolatorTypeEnum {
-/// Enumeration defining the typical types of vibration isolators. 
-///   The IfcVibrationIsolatorTypeEnum contains the following:
+/// HISTORY New type in IFC2x2.
+class IfcSoundPressureMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcSoundPressureMeasure (IfcAbstractEntity* e);
+    IfcSoundPressureMeasure (double v);
+    operator double() const;
+};
+/// IfcSpecificHeatCapacityMeasure defines the specific heat of material: The heat energy absorbed per temperature unit.
+/// Usually measured in J / kg Kelvin.
+/// Type: REAL
 /// 
-/// COMPRESSION:  Compression type vibration isolator.
-///   SPRING:  Spring type vibration isolator.
-///   USERDEFINED:  User-defined vibration isolator type.
-///   NOTDEFINED:  Undefined vibration isolator type.
+/// HISTORY New type in IFC Release 2x.
+class IfcSpecificHeatCapacityMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcSpecificHeatCapacityMeasure (IfcAbstractEntity* e);
+    IfcSpecificHeatCapacityMeasure (double v);
+    operator double() const;
+};
+/// The IfcSpecularExponent defines the datatype for exponent determining the sharpness of the 'reflection'. reflection is made sharper with large values of the exponent, such as 10.0. Small values, such as 1.0, decrease the specular fall-off. 
 /// 
-/// HISTORY: New enumeration in IFC 2x2.
-typedef enum {IfcVibrationIsolatorType_COMPRESSION, IfcVibrationIsolatorType_SPRING, IfcVibrationIsolatorType_USERDEFINED, IfcVibrationIsolatorType_NOTDEFINED} IfcVibrationIsolatorTypeEnum;
-const char* ToString(IfcVibrationIsolatorTypeEnum v);
-IfcVibrationIsolatorTypeEnum FromString(const std::string& s);
-}
-namespace IfcWallTypeEnum {
-/// Definition from IAI: This enumeration defines the
-/// different types of walls an IfcWallType object can
-/// fulfill:
+/// IfcSpecularExponent is of type REAL.
 /// 
-/// STANDARD: A standard wall, extruded vertically with a
-/// constant thickness along the wall path.
-/// POLYGONAL: A polygonal wall, extruded vertically,
-/// where the wall thickness varies along the wall path.
-/// SHEAR: A wall having a non-rectangular cross section
-/// along the wall path.
+/// NOTE: The datatype relates to the definition of specular_exponent in ISO 10303-46 entity surface_style_reflectance_ambient_diffuse_specular.
 /// 
-/// NOTE The potentially misleading term shall not impose
-/// a particular resistance against shear forces, but a particular
-/// shape.
+/// HISTORY: New type in IFC2x2.
+class IfcSpecularExponent : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcSpecularExponent (IfcAbstractEntity* e);
+    IfcSpecularExponent (double v);
+    operator double() const;
+};
+/// The IfcSpecularRoughness defines the datatype for the reflection resulting from the roughness of a surface through the height of surface impurities where the specular highlight is made sharper with small values for the roughness, such as 0.1.  
 /// 
-/// ELEMENTEDWALL: A stud wall framed with studs and faced
-/// with sheatings, sidings, wallboard, or plasterwork.
-/// PLUMBINGWALL: A pier, or enclosure, or encasement,
-/// normally used to enclose plumbing in sanitary rooms.
-/// MOVABLE: A movable wall that is either movable, e.g. a
-/// folding wall, or a sliding wall, or can be easily removed as a
-/// removable partitioning or mounting wall. Movable walls do
-/// normally not define space boundaries and often belong to the
-/// furnishing system.
-/// USERDEFINED: User-defined wall element.
-/// NOTDEFINED: Undefined wall element
+/// Applies to "glass", "metal", "mirror" and "plastic" reflection models. Larger values, close to 1.0 decrease the specular fall-off. 
 /// 
-/// HISTORY  New
-/// Enumeration in Release IFC2x Edition 2.
-/// IFC2x2 ADDENDUM CHANGE 
-/// The enumerator POLYGON has been changed to
-/// POLYGONAL.
-/// IFC2x3 CHANGE  The enumerators
-/// ELEMENTEDWALL and PLUMBINGWALL have been
-/// added.
-/// IFC2x4 CHANGE  New enumerator
-/// MOVABLE has been added.
-typedef enum {IfcWallType_STANDARD, IfcWallType_POLYGONAL, IfcWallType_SHEAR, IfcWallType_ELEMENTEDWALL, IfcWallType_PLUMBINGWALL, IfcWallType_USERDEFINED, IfcWallType_NOTDEFINED} IfcWallTypeEnum;
-const char* ToString(IfcWallTypeEnum v);
-IfcWallTypeEnum FromString(const std::string& s);
-}
-namespace IfcWasteTerminalTypeEnum {
-/// The IfcWasteTerminalTypeEnum defines the range of different types of waste terminal that can be specified. 
-///   HISTORY: New type in IFC 2x2.  GREASEINTERCEPTOR, OILINTERCEPTOR, PETROLINTERCEPTOR moved to IfcInterceptorTypeEnum in IFC2x4.
+/// IfcSpecularRoughness is of type REAL. It is constraint to values between (and including) 0 and 1.
 /// 
-/// Enumeration 	 
+/// NOTE: The datatype relates to the definition of "shiness" in VRML97, which is the reciprocate value to the specular roughness.
 /// 
-/// FLOORTRAP: Pipe fitting, set into the floor, that retains liquid to prevent the passage of foul air 
-/// FLOOORWASTE: Pipe fitting, set into the floor, that collects waste water and discharges it to a separate trap. 
-/// GULLYSUMP: Pipe fitting or assembly of fittings to receive surface water or waste water, fitted with a grating or sealed cover. 
-/// GULLYTRAP: Pipe fitting or assembly of fittings to receive surface water or waste water, fitted with a grating or sealed cover and discharging through a trap (BS6100 330 3504 modified). 
-/// ROOFDRAIN: Pipe fitting, set into the roof, that collects rainwater for discharge into the rainwater system.  
-/// WASTEDISPOSALUNIT: Electrically operated device that reduces kitchen or other waste into fragments small enough to be flushed into a drainage system. 
-/// WASTETRAP: Pipe fitting, set adjacent to a sanitary terminal, that retains liquid to prevent the passage of foul air. 
-/// USERDEFINED: User-defined type. 
-/// NOTDEFINED: Undefined type.
-typedef enum {IfcWasteTerminalType_FLOORTRAP, IfcWasteTerminalType_FLOORWASTE, IfcWasteTerminalType_GULLYSUMP, IfcWasteTerminalType_GULLYTRAP, IfcWasteTerminalType_GREASEINTERCEPTOR, IfcWasteTerminalType_OILINTERCEPTOR, IfcWasteTerminalType_PETROLINTERCEPTOR, IfcWasteTerminalType_ROOFDRAIN, IfcWasteTerminalType_WASTEDISPOSALUNIT, IfcWasteTerminalType_WASTETRAP, IfcWasteTerminalType_USERDEFINED, IfcWasteTerminalType_NOTDEFINED} IfcWasteTerminalTypeEnum;
-const char* ToString(IfcWasteTerminalTypeEnum v);
-IfcWasteTerminalTypeEnum FromString(const std::string& s);
-}
-namespace IfcWindowPanelOperationEnum {
-/// This enumeration defines the basic ways to describe how window panels operate, as shown in Figure 168. 
+/// HISTORY: New type in Release IFC2x2.
+class IfcSpecularRoughness : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcSpecularRoughness (IfcAbstractEntity* e);
+    IfcSpecularRoughness (double v);
+    operator double() const;
+};
+/// The temperature gradient measures the difference of a temperature per lenght, as for instance used in an external wall or its layers.  It is usually measured in K/m.
 /// 
-/// HISTORY New Enumeration in IFC Release 2.0
+/// Type: REAL  
 /// 
-/// Enumerator 
-///   Description 
-///   Figure 
+/// HISTORY New type in IFC2x2.
+class IfcTemperatureGradientMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcTemperatureGradientMeasure (IfcAbstractEntity* e);
+    IfcTemperatureGradientMeasure (double v);
+    operator double() const;
+};
+/// Definition from ISO/CD 10303-41:1992: A text is an alphanumeric string of characters which is intended to be read and understood by a human being. It is for information purposes only.
 /// 
-/// SideHungRightHand 
-///   panel that opens to the right
-///   when viewed from the outside 
-///     
+/// Type: STRING
 /// 
-/// SideHungLeftHand 
-///   panel that opens to the left
-///   when viewed from the outside 
-///     
+/// NOTE Corresponding STEP name: text, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
 /// 
-/// TiltAndTurnRightHand 
-///   panel that opens to the right
-///   and is bottom hung 
-///     
+/// HISTORY New type in IFC Release 2x.
 /// 
-/// TiltAndTurnLeftHand 
-///   panel that opens to the left
-///   and is bottom hung 
-///     
+/// Per ISO 10303-11, the set of characters that may appear in STRINGs is defined in ISO 10646.  The encoding of characters in case of file-based exchange is defined in ISO 10303-21 (STEP physical files) and ISO 10303-28 (XML files).  Among else, these specifications define the encoding of 8-bit characters from ISO 8859-1...-16 and of 2-byte Unicode characters.
 /// 
-/// TopHung 
-///   panel is top hung 
-///     
+/// Note that while IfcText is not formally restricted in length, the size of a string in ISO 10303-21:2002 conforming exchange files must not exceed 32767 octets after encoding and escaping.
+class IfcText : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcText (IfcAbstractEntity* e);
+    IfcText (std::string v);
+    operator std::string() const;
+};
+/// Definition from CSS1 (W3C Recommendation): This property describes how text is aligned within the element. The actual justification algorithm used is user agent and human language dependent. If 'justify' is not supported, the user agent will supply a replacement. Typically, this will be 'left' for western languages. Values are:
 /// 
-/// BottomHung 
-///   panel is bottom hung 
-///     
+/// left
+///   right
+///   center
+///   justify
 /// 
-/// PivotHorizontal 
-///   panel is swinging
-///   horizontally (hinges are in the middle) 
-///     
+/// NOTE  Corresponding CSS1 definition is text-align.
 /// 
-/// PivotVertical 
-///   panel is swinging vertically
-///   (hinges are in the middle) 
-///     
+/// HISTORY  New type in IFC2x3.
+class IfcTextAlignment : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcTextAlignment (IfcAbstractEntity* e);
+    IfcTextAlignment (std::string v);
+    operator std::string() const;
+};
+/// Definition from CSS1 (W3C Recommendation): This property describes decorations that are added to the text of an element. A value of 'blink' causes the text to blink.. Values are:
 /// 
-/// SlidingHorizontal 
-///   panel is sliding horizontally
+/// none
+///   underline
+///   overline
+///   line-through
+///   blink
 /// 
-///   
+/// User agents must recognize the keyword 'blink', but are not required to support the blink effect.
 /// 
-/// SlidingVertical 
-///   panel is sliding
-///   vertically 
-///     
+/// NOTE  Corresponding CSS1 definition is text-decoration.
 /// 
-/// RemovableCasement 
-///   panel is removable 
-///     
+/// HISTORY  New type in IFC2x3.
+class IfcTextDecoration : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcTextDecoration (IfcAbstractEntity* e);
+    IfcTextDecoration (std::string v);
+    operator std::string() const;
+};
+/// Definition from CSS1 (W3C Recommendation): The value is a font family name and/or generic family name. Values are:
 /// 
-/// FixedCasement 
-///   panel is fixed 
-///     
+/// The name of a font family of choice. For example, "gill" and "helvetica" are font families.
 /// 
-/// OtherOperation 
-///   user defined operation type 
-///     
+/// In the example above, the last value is a generic family name. The following generic families are defined:
 /// 
-/// NotDefined 
-///     
-///     
+/// 'serif' (Example: Times)
+///   'sans-serif' (Example: Helvetica)
+///   'cursive' (Example: Zapf-Chancery)
+///   'fantasy' (Example: Western)
+///   'monospace' (Example: Courier)
 /// 
-/// Figure 168 — Window panel operations
+/// It is encouraged to offer a generic font family as a last alternative.
 /// 
-/// The opening direction of the window panels is given by the local placement of the IfcWindow. The positive y-axis determines the direction as shown in Figure 169.
-///   NOTE 
+/// NOTE  Corresponding CSS1 definitions are font-family.
 /// 
-/// Figures are shown as viewed from the outside (in direction of the
-///   positive y-axis). 
-///   Figures (symbolic representation) depend on the national building
-///   code 
-///   These figures are only shown as illustrations 
+/// HISTORY  New type in IFC2x2 Addendum 2.
 /// 
-/// Figure 169 — Window panel directions
-typedef enum {IfcWindowPanelOperation_SIDEHUNGRIGHTHAND, IfcWindowPanelOperation_SIDEHUNGLEFTHAND, IfcWindowPanelOperation_TILTANDTURNRIGHTHAND, IfcWindowPanelOperation_TILTANDTURNLEFTHAND, IfcWindowPanelOperation_TOPHUNG, IfcWindowPanelOperation_BOTTOMHUNG, IfcWindowPanelOperation_PIVOTHORIZONTAL, IfcWindowPanelOperation_PIVOTVERTICAL, IfcWindowPanelOperation_SLIDINGHORIZONTAL, IfcWindowPanelOperation_SLIDINGVERTICAL, IfcWindowPanelOperation_REMOVABLECASEMENT, IfcWindowPanelOperation_FIXEDCASEMENT, IfcWindowPanelOperation_OTHEROPERATION, IfcWindowPanelOperation_NOTDEFINED} IfcWindowPanelOperationEnum;
-const char* ToString(IfcWindowPanelOperationEnum v);
-IfcWindowPanelOperationEnum FromString(const std::string& s);
-}
-namespace IfcWindowPanelPositionEnum {
-/// This enumeration defines the basic configuration of the window type in terms of the location of window panels. The window configurations are given for windows with one, two or three panels (including fixed panels) as shown in Figure 170. It corresponds to the OperationType of the IfcWindowStyle definition, which references the IfcWindowPanelProperties. 
+/// IFC2x2 Addendum 2 CHANGE: The IfcFontFamily has been added.
+class IfcTextFontName : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcTextFontName (IfcAbstractEntity* e);
+    IfcTextFontName (std::string v);
+    operator std::string() const;
+};
+/// Definition from CSS1 (W3C Recommendation): This property describes how the cases of characters are handled. Values are:
 /// 
-/// Windows which are subdivided into more than three panels have to be defined by the geometry only. The type of such windows is given by an IfcWindowStyle.OperationType = USERDEFINED or NOTDEFINED (see IfcWindowStyleOperationEnum for details). 
+/// capitalize: uppercases the first character of each word
+///   uppercase: uppercases all letters of the element
+///   lowercase: lowercases all letters of the element
+///   none
 /// 
-/// HISTORY New Enumeration in IFC Release 2.0.
+/// NOTE  Corresponding CSS1 definition is text-transform.
 /// 
-/// Enumerator from IfcWindowStyleOperationEnum 
-///   Use of enumerators from IfcWindowPanelPositionEnum 
-///   Figure 
+/// HISTORY  New type in IFC2x3.
+class IfcTextTransformation : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcTextTransformation (IfcAbstractEntity* e);
+    IfcTextTransformation (std::string v);
+    operator std::string() const;
+};
+/// IfcThermalAdmittanceMeasure is the measure of the ability of a surface to smooth out temperature variations.
+/// Usually measured in Watt / m2 Kelvin.
+/// Type: REAL
 /// 
-/// DoublePanelVertical 
-///   first
-///   IfcWindowPanelProperties with PanelPosition = LEFTsecond
-///   IfcWindowPanelProperties with PanelPosition = RIGHT 
+/// HISTORY New type in IFC Release 2.0.
+class IfcThermalAdmittanceMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcThermalAdmittanceMeasure (IfcAbstractEntity* e);
+    IfcThermalAdmittanceMeasure (double v);
+    operator double() const;
+};
+/// IfcThermalConductivityMeasure is a measure of thermal conductivity.
+/// Usually measured in Watt / m Kelvin.
+/// Type: REAL
 /// 
-/// DoublePanelHorizontal 
-///   first
-///   IfcWindowPanelProperties with PanelPosition = TOPsecond
-///   IfcWindowPanelProperties with PanelPosition = BOTTOM 
+/// HISTORY New type in IFC Release 2x.
+class IfcThermalConductivityMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcThermalConductivityMeasure (IfcAbstractEntity* e);
+    IfcThermalConductivityMeasure (double v);
+    operator double() const;
+};
+/// IfcThermalExpansionCoeffientMeasure is a measure of the thermal expansion coefficient of a material, which expresses its elongation (as a ratio) per temperature difference. It is usually measured in 1/K. A positive elongation per (positive) rise of temperature is expressed by a positive value.
+/// Type: REAL  
 /// 
-/// TriplePanelVertical 
-///   first
-///   IfcWindowPanelProperties with PanelPosition = LEFTsecond
-///   IfcWindowPanelProperties with PanelPosition = MIDDLEthird
-///   IfcWindowPanelProperties with PanelPosition = RIGHT 
+/// HISTORY New type in IFC2x2.
+class IfcThermalExpansionCoefficientMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcThermalExpansionCoefficientMeasure (IfcAbstractEntity* e);
+    IfcThermalExpansionCoefficientMeasure (double v);
+    operator double() const;
+};
+/// IfcThermalResistanceMeasure is a measure of the resistance offered by a body to the flow of energy.
+/// Usually measured in m2 Kelvin/Watt.
 /// 
-/// TriplePanelHorizontal  
-///   first
-///   IfcWindowPanelProperties with PanelPosition = TOPsecond
-///   IfcWindowPanelProperties with PanelPosition = MIDDLEthird
-///   IfcWindowPanelProperties with PanelPosition = BOTTOM 
+/// HISTORY New type in IFC Release 2.0.
+class IfcThermalResistanceMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcThermalResistanceMeasure (IfcAbstractEntity* e);
+    IfcThermalResistanceMeasure (double v);
+    operator double() const;
+};
+/// IfcThermalTransmittanceMeasure is a measure of the rate at which energy is transmitted through a body.
+/// Usually measured in Watts/m2 Kelvin.
+/// Type: REAL
 /// 
-/// TriplePanelBottom 
-///   first
-///   IfcWindowPanelProperties with PanelPosition = LEFTsecond
-///   IfcWindowPanelProperties with PanelPosition = RIGHTthird
-///   IfcWindowPanelProperties with PanelPosition = BOTTOM 
+/// HISTORY New type in IFC Release 2.0.
+class IfcThermalTransmittanceMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcThermalTransmittanceMeasure (IfcAbstractEntity* e);
+    IfcThermalTransmittanceMeasure (double v);
+    operator double() const;
+};
+/// Definition from ISO/CD 10303-41:1992: A thermodynamic temperature measure is the value for the degree of heat of a body.
+/// Usually measured in degrees Kelvin (K).
+/// Type: REAL
 /// 
-/// TriplePanelTop 
-///   first
-///   IfcWindowPanelProperties with PanelPosition = TOPsecond
-///   IfcWindowPanelProperties with PanelPosition = LEFTthird
-///   IfcWindowPanelProperties with PanelPosition = RIGHT 
+/// NOTE Corresponding ISO 10303 name: thermodynamic_temperature_measure, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
 /// 
-/// TriplePanelLeft 
-///   first
-///   IfcWindowPanelProperties with PanelPosition = LEFTsecond
-///   IfcWindowPanelProperties with PanelPosition = TOPthird
-///   IfcWindowPanelProperties with PanelPosition = BOTTOM 
+/// HISTORY New type in IFC Release 1.5.1.
+class IfcThermodynamicTemperatureMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcThermodynamicTemperatureMeasure (IfcAbstractEntity* e);
+    IfcThermodynamicTemperatureMeasure (double v);
+    operator double() const;
+};
+/// Definition from ISO/CD 10303-41:1992: A time measure is the value of the duration of periods.
+/// Measured in seconds (s) or days (d) or other units of time.
+/// Type: REAL
 /// 
-/// TriplePanelRight 
-///   first
-///   IfcWindowPanelProperties with PanelPosition = TOPsecond
-///   IfcWindowPanelProperties with PanelPosition = BOTTOMthird
-///   IfcWindowPanelProperties with PanelPosition = RIGHT 
+/// NOTE Corresponding ISO 10303 name: time_measure, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
 /// 
-/// Figure 170 — Window panel positions
+/// HISTORY New type in IFC Release 1.5.1.
+class IfcTimeMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcTimeMeasure (IfcAbstractEntity* e);
+    IfcTimeMeasure (double v);
+    operator double() const;
+};
+/// IfcTimeStamp is an indication of date and time by measuring the number of seconds which have elapsed since the beginning of the year 1970.
+/// Type: INTEGER
 /// 
-/// NOTE 
+/// HISTORY New type in IFC Release 1.5.1.
+class IfcTimeStamp : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcTimeStamp (IfcAbstractEntity* e);
+    IfcTimeStamp (int v);
+    operator int() const;
+};
+/// IfcTorqueMeasure is a measure of the torque or moment of a couple.
+/// Usually measured in N m.
+/// Type: REAL
 /// 
-/// The figures are shown as elevations in the XZ plane of the local
-///   placement of the window, looking into the direction of the positive Y
-///   axis. 
-///   These figures are only shown as illustrations.
-typedef enum {IfcWindowPanelPosition_LEFT, IfcWindowPanelPosition_MIDDLE, IfcWindowPanelPosition_RIGHT, IfcWindowPanelPosition_BOTTOM, IfcWindowPanelPosition_TOP, IfcWindowPanelPosition_NOTDEFINED} IfcWindowPanelPositionEnum;
-const char* ToString(IfcWindowPanelPositionEnum v);
-IfcWindowPanelPositionEnum FromString(const std::string& s);
-}
-namespace IfcWindowStyleConstructionEnum {
-/// Definition from IAI: This enumeration defines the
-///   basic types of construction of windows. The construction
-///   type relates to the main material (or material combination)
-///   used for making the window.
+/// HISTORY New type in IFC Release 2x.
+class IfcTorqueMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcTorqueMeasure (IfcAbstractEntity* e);
+    IfcTorqueMeasure (double v);
+    operator double() const;
+};
+/// IfcVaporPermeabilityMeasure is a measure of vapor permeability.
+/// Usually measured in kg / s m Pascal.
+/// Type: REAL
 /// 
-/// HISTORY New Enumeration in
-///   IFC Release 2x .
-typedef enum {IfcWindowStyleConstruction_ALUMINIUM, IfcWindowStyleConstruction_HIGH_GRADE_STEEL, IfcWindowStyleConstruction_STEEL, IfcWindowStyleConstruction_WOOD, IfcWindowStyleConstruction_ALUMINIUM_WOOD, IfcWindowStyleConstruction_PLASTIC, IfcWindowStyleConstruction_OTHER_CONSTRUCTION, IfcWindowStyleConstruction_NOTDEFINED} IfcWindowStyleConstructionEnum;
-const char* ToString(IfcWindowStyleConstructionEnum v);
-IfcWindowStyleConstructionEnum FromString(const std::string& s);
-}
-namespace IfcWindowStyleOperationEnum {
-/// This enumeration defines the basic
-///   configuration of the window type in terms of the number of window panels and
-///   the subdivision of the total window. The window configurations are given for
-///   windows with one, two or three panels (including fixed panels) as shown in Figure 171. 
-///   Windows which are subdivided into more than three panels have to be
-///   defined by the geometry only. The type of such windows is USERDEFINED. 
-///   HISTORY New Enumeration in IFC Release 2.0. 
+/// HISTORY New type in IFC Release 2x.
+class IfcVaporPermeabilityMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcVaporPermeabilityMeasure (IfcAbstractEntity* e);
+    IfcVaporPermeabilityMeasure (double v);
+    operator double() const;
+};
+/// Definition from ISO/CD 10303-41:1992: A volume measure is the value of the solid content of a body.
+/// Usually measured in cubic metre (m3).
+/// Type: REAL
 /// 
-/// Enumerator 
-///   Description 
-///   Figure 
+/// NOTE Corresponding ISO 10303 name: volume_measure, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
 /// 
-/// SinglePanel 
-///   Window with one
-///   panel. 
+/// HISTORY New type in IFC Release 1.5.1.
+class IfcVolumeMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcVolumeMeasure (IfcAbstractEntity* e);
+    IfcVolumeMeasure (double v);
+    operator double() const;
+};
+/// IfcVolumetricFlowRateMeasure is a measure of the volume of a medium flowing per unit time.
+/// Usually measured in m3/s.
+/// Type: REAL
 /// 
-/// DoublePanelVertical 
-///   Window with two panels. The
-///   configuration of the panels is vertically. 
+/// HISTORY New type in IFC Release 2.0.
+class IfcVolumetricFlowRateMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcVolumetricFlowRateMeasure (IfcAbstractEntity* e);
+    IfcVolumetricFlowRateMeasure (double v);
+    operator double() const;
+};
+/// IfcWarpingConstantMeasure is a measure for the warping constant or warping resistance of a cross section under torsional loading. It is usually measured in m^6.
 /// 
-/// DoublePanelHorizontal 
-///   Window with two panels. The
-///   configuration of the panels is horizontally. 
+/// Type: REAL  
 /// 
-/// TriplePanelVertical 
-///   Window with three panels. The
-///   configuration of the panels is vertically. 
+/// HISTORY New type in IFC2x2.
+class IfcWarpingConstantMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcWarpingConstantMeasure (IfcAbstractEntity* e);
+    IfcWarpingConstantMeasure (double v);
+    operator double() const;
+};
+/// The warping moment measure is a measure for the warping moment, which occurs in warping torsional analysis. It is usually measured in kN*m^2.
 /// 
-/// TriplePanelHorizontal  
-///   Window with three panels. The
-///   configuration of the panels is horizontally. 
+/// Type: REAL  
 /// 
-/// TriplePanelBottom 
-///   Window with three panels. The
-///   configuration of two panels is vertically and the third one is horizontally at
-///   the bottom. 
+/// HISTORY New type in IFC2x2.
+class IfcWarpingMomentMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcWarpingMomentMeasure (IfcAbstractEntity* e);
+    IfcWarpingMomentMeasure (double v);
+    operator double() const;
+};
+
+class IfcYearNumber : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcYearNumber (IfcAbstractEntity* e);
+    IfcYearNumber (int v);
+    operator int() const;
+};
+/// The box alignment specifies the alignment of the text box relative to its position. The following string values shall be used:
 /// 
-/// TriplePanelTop 
-///   Window with three panels. The
-///   configuration of two panels is vertically and the third one is horizontally at
-///   the top. 
+/// top-left
+///   top-middle
+///   top-right
+///   middle-left
+///   center
+///   middle-right
+///   bottom-left
+///   bottom-middle
+///   bottom-right
 /// 
-/// TriplePanelLeft 
-///   Window with three panels. The
-///   configuration of two panels is horizontally and the third one is vertically at
-///   the left hand side. 
+/// NOTE  The top-left is the default value.
 /// 
-/// TriplePanelRight 
-///   Window with three panels. The
-///   configuration of two panels is horizontally and the third one is vertically at
-///   the right hand side. 
+/// Figure 298 illustrates alignment values.
 /// 
-/// UserDefined 
-///   user defined operation
-///   type 
-///     
+/// Figure 298 — Box alignment values
 /// 
-/// NotDefined 
-///     
-///     
+/// Figure 299 illustrates use of alignment values together with the placement and planar extent.
 /// 
-/// Figure 171 — Window style operations
+/// Figure 299 — Box alignment examples
 /// 
-/// NOTE 
+/// HISTORY  New type in IFC2x2 Addendum2.
 /// 
-/// The way how each panel operates is defined at the
-///   IfcWindowPanelProperties.OperationType. 
-///   The reference from the window panel to the location of that panel in
-///   the window style configuration is handled by the
-///   IfcWindowPanelProperties.PanelPosition. 
-///   The figures are shown as elevations in the XZ plane of the local
-///   placement of the window, looking into the direction of the positive Y
-///   axis. 
-///   These figures are only shown as illustrations
-typedef enum {IfcWindowStyleOperation_SINGLE_PANEL, IfcWindowStyleOperation_DOUBLE_PANEL_VERTICAL, IfcWindowStyleOperation_DOUBLE_PANEL_HORIZONTAL, IfcWindowStyleOperation_TRIPLE_PANEL_VERTICAL, IfcWindowStyleOperation_TRIPLE_PANEL_BOTTOM, IfcWindowStyleOperation_TRIPLE_PANEL_TOP, IfcWindowStyleOperation_TRIPLE_PANEL_LEFT, IfcWindowStyleOperation_TRIPLE_PANEL_RIGHT, IfcWindowStyleOperation_TRIPLE_PANEL_HORIZONTAL, IfcWindowStyleOperation_USERDEFINED, IfcWindowStyleOperation_NOTDEFINED} IfcWindowStyleOperationEnum;
-const char* ToString(IfcWindowStyleOperationEnum v);
-IfcWindowStyleOperationEnum FromString(const std::string& s);
-}
-namespace IfcWorkControlTypeEnum {
-
-typedef enum {IfcWorkControlType_ACTUAL, IfcWorkControlType_BASELINE, IfcWorkControlType_PLANNED, IfcWorkControlType_USERDEFINED, IfcWorkControlType_NOTDEFINED} IfcWorkControlTypeEnum;
-const char* ToString(IfcWorkControlTypeEnum v);
-IfcWorkControlTypeEnum FromString(const std::string& s);
-}
+/// IFC2x3 CHANGE  The IfcBoxAlignment has been added.
+class IfcBoxAlignment : public IfcLabel {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcBoxAlignment (IfcAbstractEntity* e);
+    IfcBoxAlignment (std::string v);
+    operator std::string() const;
+};
+/// IfcNormalisedRatioMeasure is a dimensionless measure to express ratio values ranging from 0.0 to 1.0.
+/// 
+/// Type: REAL
+/// 
+/// HISTORY New type in IFC Release 2x.
+class IfcNormalisedRatioMeasure : public IfcRatioMeasure {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcNormalisedRatioMeasure (IfcAbstractEntity* e);
+    IfcNormalisedRatioMeasure (double v);
+    operator double() const;
+};
+/// Definition from ISO/CD 10303-41:1992: A positive ratio measure is a ratio measure that is greater than zero.
+/// Type: IfcRatioMeasure
+/// 
+/// NOTE Corresponding ISO 10303 name: positive_ratio_measure, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
+/// 
+/// HISTORY New type in IFC Release 1.5.1.
+class IfcPositiveRatioMeasure : public IfcRatioMeasure {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcPositiveRatioMeasure (IfcAbstractEntity* e);
+    IfcPositiveRatioMeasure (double v);
+    operator double() const;
+};
 
 
 /// Definition: A role which is performed by an actor, either a person, an organization or a 
@@ -5422,33 +6594,32 @@ class IfcActorRole : public IfcUtil::IfcBaseEntity {
 public:
     /// The name of the role played by an actor. If the Role has value USERDEFINED, then
     /// the user defined role shall be provided as a value of the attribute UserDefinedRole.
-    IfcRoleEnum::IfcRoleEnum Role();
+    IfcRoleEnum::IfcRoleEnum Role() const;
     void setRole(IfcRoleEnum::IfcRoleEnum v);
     /// Whether the optional attribute UserDefinedRole is defined for this IfcActorRole
-    bool hasUserDefinedRole();
+    bool hasUserDefinedRole() const;
     /// Allows for specification of user defined roles beyond the 
     /// enumeration values provided by Role attribute of type IfcRoleEnum. 
     /// When a value is provided for attribute UserDefinedRole in parallel 
     /// the attribute Role shall have enumeration value USERDEFINED.
-    IfcLabel UserDefinedRole();
-    void setUserDefinedRole(IfcLabel v);
+    std::string UserDefinedRole() const;
+    void setUserDefinedRole(std::string v);
     /// Whether the optional attribute Description is defined for this IfcActorRole
-    bool hasDescription();
+    bool hasDescription() const;
     /// A textual description relating the nature of the role played by an actor.
-    IfcText Description();
-    void setDescription(IfcText v);
+    std::string Description() const;
+    void setDescription(std::string v);
     virtual unsigned int getArgumentCount() const { return 3; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENUMERATION; case 1: return IfcUtil::Argument_STRING; case 2: return IfcUtil::Argument_STRING; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcRoleEnum; case 1: return Type::IfcLabel; case 2: return Type::IfcText; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Role"; case 1: return "UserDefinedRole"; case 2: return "Description"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcActorRole (IfcAbstractEntityPtr e);
-    IfcActorRole (IfcRoleEnum::IfcRoleEnum v1_Role, boost::optional< IfcLabel > v2_UserDefinedRole, boost::optional< IfcText > v3_Description);
-    typedef IfcActorRole* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcActorRole > > list;
-    typedef IfcTemplatedEntityList< IfcActorRole >::it it;
+    IfcActorRole (IfcAbstractEntity* e);
+    IfcActorRole (IfcRoleEnum::IfcRoleEnum v1_Role, boost::optional< std::string > v2_UserDefinedRole, boost::optional< std::string > v3_Description);
+    typedef IfcTemplatedEntityList< IfcActorRole > list;
 };
 /// Definition: An abstract entity type for various kinds of postal and telecom addresses.
 /// 
@@ -5458,37 +6629,36 @@ class IfcActorRole : public IfcUtil::IfcBaseEntity {
 class IfcAddress : public IfcUtil::IfcBaseEntity {
 public:
     /// Whether the optional attribute Purpose is defined for this IfcAddress
-    bool hasPurpose();
+    bool hasPurpose() const;
     /// Identifies the logical location of the address.
-    IfcAddressTypeEnum::IfcAddressTypeEnum Purpose();
+    IfcAddressTypeEnum::IfcAddressTypeEnum Purpose() const;
     void setPurpose(IfcAddressTypeEnum::IfcAddressTypeEnum v);
     /// Whether the optional attribute Description is defined for this IfcAddress
-    bool hasDescription();
+    bool hasDescription() const;
     /// Text that relates the nature of the address.
-    IfcText Description();
-    void setDescription(IfcText v);
+    std::string Description() const;
+    void setDescription(std::string v);
     /// Whether the optional attribute UserDefinedPurpose is defined for this IfcAddress
-    bool hasUserDefinedPurpose();
+    bool hasUserDefinedPurpose() const;
     /// Allows for specification of user specific purpose of the address beyond the 
     /// enumeration values provided by Purpose attribute of type IfcAddressTypeEnum. 
     /// When a value is provided for attribute UserDefinedPurpose, in parallel the 
     /// attribute Purpose shall have enumeration value USERDEFINED.
-    IfcLabel UserDefinedPurpose();
-    void setUserDefinedPurpose(IfcLabel v);
+    std::string UserDefinedPurpose() const;
+    void setUserDefinedPurpose(std::string v);
     virtual unsigned int getArgumentCount() const { return 3; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENUMERATION; case 1: return IfcUtil::Argument_STRING; case 2: return IfcUtil::Argument_STRING; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcAddressTypeEnum; case 1: return Type::IfcText; case 2: return Type::IfcLabel; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Purpose"; case 1: return "Description"; case 2: return "UserDefinedPurpose"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcPerson > > OfPerson(); // INVERSE IfcPerson::Addresses
-    SHARED_PTR< IfcTemplatedEntityList< IfcOrganization > > OfOrganization(); // INVERSE IfcOrganization::Addresses
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcPerson >::ptr OfPerson() const; // INVERSE IfcPerson::Addresses
+    IfcTemplatedEntityList< IfcOrganization >::ptr OfOrganization() const; // INVERSE IfcOrganization::Addresses
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcAddress (IfcAbstractEntityPtr e);
-    IfcAddress (boost::optional< IfcAddressTypeEnum::IfcAddressTypeEnum > v1_Purpose, boost::optional< IfcText > v2_Description, boost::optional< IfcLabel > v3_UserDefinedPurpose);
-    typedef IfcAddress* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcAddress > > list;
-    typedef IfcTemplatedEntityList< IfcAddress >::it it;
+    IfcAddress (IfcAbstractEntity* e);
+    IfcAddress (boost::optional< IfcAddressTypeEnum::IfcAddressTypeEnum > v1_Purpose, boost::optional< std::string > v2_Description, boost::optional< std::string > v3_UserDefinedPurpose);
+    typedef IfcTemplatedEntityList< IfcAddress > list;
 };
 /// IfcApplication holds the information about an IFC compliant application developed by an application developer. The IfcApplication utilizes a short identifying name as provided by the application developer.
 /// 
@@ -5496,29 +6666,28 @@ class IfcAddress : public IfcUtil::IfcBaseEntity {
 class IfcApplication : public IfcUtil::IfcBaseEntity {
 public:
     /// Name of the application developer, being requested to be member of the IAI.
-    IfcOrganization* ApplicationDeveloper();
+    IfcOrganization* ApplicationDeveloper() const;
     void setApplicationDeveloper(IfcOrganization* v);
     /// The version number of this software as specified by the developer of the application.
-    IfcLabel Version();
-    void setVersion(IfcLabel v);
+    std::string Version() const;
+    void setVersion(std::string v);
     /// The full name of the application as specified by the application developer.
-    IfcLabel ApplicationFullName();
-    void setApplicationFullName(IfcLabel v);
+    std::string ApplicationFullName() const;
+    void setApplicationFullName(std::string v);
     /// Short identifying name for the application.
-    IfcIdentifier ApplicationIdentifier();
-    void setApplicationIdentifier(IfcIdentifier v);
+    std::string ApplicationIdentifier() const;
+    void setApplicationIdentifier(std::string v);
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY; case 1: return IfcUtil::Argument_STRING; case 2: return IfcUtil::Argument_STRING; case 3: return IfcUtil::Argument_STRING; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcOrganization; case 1: return Type::IfcLabel; case 2: return Type::IfcLabel; case 3: return Type::IfcIdentifier; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "ApplicationDeveloper"; case 1: return "Version"; case 2: return "ApplicationFullName"; case 3: return "ApplicationIdentifier"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcApplication (IfcAbstractEntityPtr e);
-    IfcApplication (IfcOrganization* v1_ApplicationDeveloper, IfcLabel v2_Version, IfcLabel v3_ApplicationFullName, IfcIdentifier v4_ApplicationIdentifier);
-    typedef IfcApplication* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcApplication > > list;
-    typedef IfcTemplatedEntityList< IfcApplication >::it it;
+    IfcApplication (IfcAbstractEntity* e);
+    IfcApplication (IfcOrganization* v1_ApplicationDeveloper, std::string v2_Version, std::string v3_ApplicationFullName, std::string v4_ApplicationIdentifier);
+    typedef IfcTemplatedEntityList< IfcApplication > list;
 };
 /// IfcAppliedValue is an abstract supertype that specifies the common attributes for cost values. 
 /// 
@@ -5537,58 +6706,57 @@ class IfcApplication : public IfcUtil::IfcBaseEntity {
 class IfcAppliedValue : public IfcUtil::IfcBaseEntity {
 public:
     /// Whether the optional attribute Name is defined for this IfcAppliedValue
-    bool hasName();
+    bool hasName() const;
     /// A name or additional clarification given to a cost value.
-    IfcLabel Name();
-    void setName(IfcLabel v);
+    std::string Name() const;
+    void setName(std::string v);
     /// Whether the optional attribute Description is defined for this IfcAppliedValue
-    bool hasDescription();
+    bool hasDescription() const;
     /// The description that may apply additional information about a cost value.
-    IfcText Description();
-    void setDescription(IfcText v);
+    std::string Description() const;
+    void setDescription(std::string v);
     /// Whether the optional attribute AppliedValue is defined for this IfcAppliedValue
-    bool hasAppliedValue();
+    bool hasAppliedValue() const;
     /// The extent or quantity or amount of an applied value.
-    IfcAppliedValueSelect AppliedValue();
-    void setAppliedValue(IfcAppliedValueSelect v);
+    IfcAppliedValueSelect* AppliedValue() const;
+    void setAppliedValue(IfcAppliedValueSelect* v);
     /// Whether the optional attribute UnitBasis is defined for this IfcAppliedValue
-    bool hasUnitBasis();
+    bool hasUnitBasis() const;
     /// The number and unit of measure on which the unit cost is based.
     /// 
     /// Note: As well as the normally expected units of measure such as length, area, volume etc., costs may be based on units of measure which need to be defined e.g. sack, drum, pallet, item etc. Unit costs may be based on quantities greater (or lesser) than a unitary value of the basis measure. For instance, timber may have a unit cost rate per X meters where X > 1; similarly for cable, piping and many other items. The basis number may be either an integer or a real value.
     /// 
     /// Note: This attribute should be asserted for all circumstances where the cost to be applied is per unit quantity. It may be asserted even for circumstances where an item price is used, in which case the unit cost basis should be by item (or equivalent definition).
-    IfcMeasureWithUnit* UnitBasis();
+    IfcMeasureWithUnit* UnitBasis() const;
     void setUnitBasis(IfcMeasureWithUnit* v);
     /// Whether the optional attribute ApplicableDate is defined for this IfcAppliedValue
-    bool hasApplicableDate();
+    bool hasApplicableDate() const;
     /// The date on or from which an applied value is applicable.
     /// 
     /// IFC2x4 CHANGE Type changed from IfcDateTimeSelect.
-    IfcDateTimeSelect ApplicableDate();
-    void setApplicableDate(IfcDateTimeSelect v);
+    IfcDateTimeSelect* ApplicableDate() const;
+    void setApplicableDate(IfcDateTimeSelect* v);
     /// Whether the optional attribute FixedUntilDate is defined for this IfcAppliedValue
-    bool hasFixedUntilDate();
+    bool hasFixedUntilDate() const;
     /// The date until which applied value is applicable.
     /// 
     /// IFC2x4 CHANGE Type changed from IfcDateTimeSelect.
-    IfcDateTimeSelect FixedUntilDate();
-    void setFixedUntilDate(IfcDateTimeSelect v);
+    IfcDateTimeSelect* FixedUntilDate() const;
+    void setFixedUntilDate(IfcDateTimeSelect* v);
     virtual unsigned int getArgumentCount() const { return 6; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_STRING; case 1: return IfcUtil::Argument_STRING; case 2: return IfcUtil::Argument_ENTITY; case 3: return IfcUtil::Argument_ENTITY; case 4: return IfcUtil::Argument_ENTITY; case 5: return IfcUtil::Argument_ENTITY; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcLabel; case 1: return Type::IfcText; case 2: return Type::IfcAppliedValueSelect; case 3: return Type::IfcMeasureWithUnit; case 4: return Type::IfcDateTimeSelect; case 5: return Type::IfcDateTimeSelect; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Name"; case 1: return "Description"; case 2: return "AppliedValue"; case 3: return "UnitBasis"; case 4: return "ApplicableDate"; case 5: return "FixedUntilDate"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcReferencesValueDocument > > ValuesReferenced(); // INVERSE IfcReferencesValueDocument::ReferencingValues
-    SHARED_PTR< IfcTemplatedEntityList< IfcAppliedValueRelationship > > ValueOfComponents(); // INVERSE IfcAppliedValueRelationship::ComponentOfTotal
-    SHARED_PTR< IfcTemplatedEntityList< IfcAppliedValueRelationship > > IsComponentIn(); // INVERSE IfcAppliedValueRelationship::Components
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcReferencesValueDocument >::ptr ValuesReferenced() const; // INVERSE IfcReferencesValueDocument::ReferencingValues
+    IfcTemplatedEntityList< IfcAppliedValueRelationship >::ptr ValueOfComponents() const; // INVERSE IfcAppliedValueRelationship::ComponentOfTotal
+    IfcTemplatedEntityList< IfcAppliedValueRelationship >::ptr IsComponentIn() const; // INVERSE IfcAppliedValueRelationship::Components
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcAppliedValue (IfcAbstractEntityPtr e);
-    IfcAppliedValue (boost::optional< IfcLabel > v1_Name, boost::optional< IfcText > v2_Description, boost::optional< IfcAppliedValueSelect > v3_AppliedValue, IfcMeasureWithUnit* v4_UnitBasis, boost::optional< IfcDateTimeSelect > v5_ApplicableDate, boost::optional< IfcDateTimeSelect > v6_FixedUntilDate);
-    typedef IfcAppliedValue* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcAppliedValue > > list;
-    typedef IfcTemplatedEntityList< IfcAppliedValue >::it it;
+    IfcAppliedValue (IfcAbstractEntity* e);
+    IfcAppliedValue (boost::optional< std::string > v1_Name, boost::optional< std::string > v2_Description, IfcAppliedValueSelect* v3_AppliedValue, IfcMeasureWithUnit* v4_UnitBasis, IfcDateTimeSelect* v5_ApplicableDate, IfcDateTimeSelect* v6_FixedUntilDate);
+    typedef IfcTemplatedEntityList< IfcAppliedValue > list;
 };
 /// An IfcAppliedValueRelationship is a relationship class that enables cost values to be aggregated together as components of another cost value.
 /// 
@@ -5617,34 +6785,33 @@ class IfcAppliedValue : public IfcUtil::IfcBaseEntity {
 class IfcAppliedValueRelationship : public IfcUtil::IfcBaseEntity {
 public:
     /// The applied value (total or subtotal) of which the value being considered is a component.
-    IfcAppliedValue* ComponentOfTotal();
+    IfcAppliedValue* ComponentOfTotal() const;
     void setComponentOfTotal(IfcAppliedValue* v);
     /// Applied values that are components of another applied value and from which that applied value may be deduced.
-    SHARED_PTR< IfcTemplatedEntityList< IfcAppliedValue > > Components();
-    void setComponents(SHARED_PTR< IfcTemplatedEntityList< IfcAppliedValue > > v);
+    IfcTemplatedEntityList< IfcAppliedValue >::ptr Components() const;
+    void setComponents(IfcTemplatedEntityList< IfcAppliedValue >::ptr v);
     /// The arithmetic operator applied in an applied value relationship.
-    IfcArithmeticOperatorEnum::IfcArithmeticOperatorEnum ArithmeticOperator();
+    IfcArithmeticOperatorEnum::IfcArithmeticOperatorEnum ArithmeticOperator() const;
     void setArithmeticOperator(IfcArithmeticOperatorEnum::IfcArithmeticOperatorEnum v);
     /// Whether the optional attribute Name is defined for this IfcAppliedValueRelationship
-    bool hasName();
-    IfcLabel Name();
-    void setName(IfcLabel v);
+    bool hasName() const;
+    std::string Name() const;
+    void setName(std::string v);
     /// Whether the optional attribute Description is defined for this IfcAppliedValueRelationship
-    bool hasDescription();
-    IfcText Description();
-    void setDescription(IfcText v);
+    bool hasDescription() const;
+    std::string Description() const;
+    void setDescription(std::string v);
     virtual unsigned int getArgumentCount() const { return 5; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY; case 1: return IfcUtil::Argument_ENTITY_LIST; case 2: return IfcUtil::Argument_ENUMERATION; case 3: return IfcUtil::Argument_STRING; case 4: return IfcUtil::Argument_STRING; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcAppliedValue; case 1: return Type::IfcAppliedValue; case 2: return Type::IfcArithmeticOperatorEnum; case 3: return Type::IfcLabel; case 4: return Type::IfcText; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "ComponentOfTotal"; case 1: return "Components"; case 2: return "ArithmeticOperator"; case 3: return "Name"; case 4: return "Description"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcAppliedValueRelationship (IfcAbstractEntityPtr e);
-    IfcAppliedValueRelationship (IfcAppliedValue* v1_ComponentOfTotal, SHARED_PTR< IfcTemplatedEntityList< IfcAppliedValue > > v2_Components, IfcArithmeticOperatorEnum::IfcArithmeticOperatorEnum v3_ArithmeticOperator, boost::optional< IfcLabel > v4_Name, boost::optional< IfcText > v5_Description);
-    typedef IfcAppliedValueRelationship* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcAppliedValueRelationship > > list;
-    typedef IfcTemplatedEntityList< IfcAppliedValueRelationship >::it it;
+    IfcAppliedValueRelationship (IfcAbstractEntity* e);
+    IfcAppliedValueRelationship (IfcAppliedValue* v1_ComponentOfTotal, IfcTemplatedEntityList< IfcAppliedValue >::ptr v2_Components, IfcArithmeticOperatorEnum::IfcArithmeticOperatorEnum v3_ArithmeticOperator, boost::optional< std::string > v4_Name, boost::optional< std::string > v5_Description);
+    typedef IfcTemplatedEntityList< IfcAppliedValueRelationship > list;
 };
 /// Definition: An IfcApproval represents information about approval processes such as for a plan, a design, a proposal, or a change order in a construction or facilities management project. IfcApproval is referenced by IfcRelAssociatesApproval in IfcControlExtension schema, and thereby can be related to all subtypes of IfcRoot. An approval may also be given to resource objects using IfcResourceApprovalRelationship
 /// 
@@ -5654,87 +6821,84 @@ class IfcAppliedValueRelationship : public IfcUtil::IfcBaseEntity {
 class IfcApproval : public IfcUtil::IfcBaseEntity {
 public:
     /// Whether the optional attribute Description is defined for this IfcApproval
-    bool hasDescription();
+    bool hasDescription() const;
     /// A general textual description of a design, work task, plan, etc. that is being approved for.
-    IfcText Description();
-    void setDescription(IfcText v);
-    IfcDateTimeSelect ApprovalDateTime();
-    void setApprovalDateTime(IfcDateTimeSelect v);
+    std::string Description() const;
+    void setDescription(std::string v);
+    IfcDateTimeSelect* ApprovalDateTime() const;
+    void setApprovalDateTime(IfcDateTimeSelect* v);
     /// Whether the optional attribute ApprovalStatus is defined for this IfcApproval
-    bool hasApprovalStatus();
-    IfcLabel ApprovalStatus();
-    void setApprovalStatus(IfcLabel v);
+    bool hasApprovalStatus() const;
+    std::string ApprovalStatus() const;
+    void setApprovalStatus(std::string v);
     /// Whether the optional attribute ApprovalLevel is defined for this IfcApproval
-    bool hasApprovalLevel();
-    IfcLabel ApprovalLevel();
-    void setApprovalLevel(IfcLabel v);
+    bool hasApprovalLevel() const;
+    std::string ApprovalLevel() const;
+    void setApprovalLevel(std::string v);
     /// Whether the optional attribute ApprovalQualifier is defined for this IfcApproval
-    bool hasApprovalQualifier();
-    IfcText ApprovalQualifier();
-    void setApprovalQualifier(IfcText v);
+    bool hasApprovalQualifier() const;
+    std::string ApprovalQualifier() const;
+    void setApprovalQualifier(std::string v);
     /// A human readable name given to an approval.
-    IfcLabel Name();
-    void setName(IfcLabel v);
+    std::string Name() const;
+    void setName(std::string v);
     /// A computer interpretable identifier by which the approval is known.
-    IfcIdentifier Identifier();
-    void setIdentifier(IfcIdentifier v);
+    std::string Identifier() const;
+    void setIdentifier(std::string v);
     virtual unsigned int getArgumentCount() const { return 7; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_STRING; case 1: return IfcUtil::Argument_ENTITY; case 2: return IfcUtil::Argument_STRING; case 3: return IfcUtil::Argument_STRING; case 4: return IfcUtil::Argument_STRING; case 5: return IfcUtil::Argument_STRING; case 6: return IfcUtil::Argument_STRING; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcText; case 1: return Type::IfcDateTimeSelect; case 2: return Type::IfcLabel; case 3: return Type::IfcLabel; case 4: return Type::IfcText; case 5: return Type::IfcLabel; case 6: return Type::IfcIdentifier; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Description"; case 1: return "ApprovalDateTime"; case 2: return "ApprovalStatus"; case 3: return "ApprovalLevel"; case 4: return "ApprovalQualifier"; case 5: return "Name"; case 6: return "Identifier"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcApprovalActorRelationship > > Actors(); // INVERSE IfcApprovalActorRelationship::Approval
-    SHARED_PTR< IfcTemplatedEntityList< IfcApprovalRelationship > > IsRelatedWith(); // INVERSE IfcApprovalRelationship::RelatedApproval
-    SHARED_PTR< IfcTemplatedEntityList< IfcApprovalRelationship > > Relates(); // INVERSE IfcApprovalRelationship::RelatingApproval
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcApprovalActorRelationship >::ptr Actors() const; // INVERSE IfcApprovalActorRelationship::Approval
+    IfcTemplatedEntityList< IfcApprovalRelationship >::ptr IsRelatedWith() const; // INVERSE IfcApprovalRelationship::RelatedApproval
+    IfcTemplatedEntityList< IfcApprovalRelationship >::ptr Relates() const; // INVERSE IfcApprovalRelationship::RelatingApproval
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcApproval (IfcAbstractEntityPtr e);
-    IfcApproval (boost::optional< IfcText > v1_Description, IfcDateTimeSelect v2_ApprovalDateTime, boost::optional< IfcLabel > v3_ApprovalStatus, boost::optional< IfcLabel > v4_ApprovalLevel, boost::optional< IfcText > v5_ApprovalQualifier, IfcLabel v6_Name, IfcIdentifier v7_Identifier);
-    typedef IfcApproval* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcApproval > > list;
-    typedef IfcTemplatedEntityList< IfcApproval >::it it;
+    IfcApproval (IfcAbstractEntity* e);
+    IfcApproval (boost::optional< std::string > v1_Description, IfcDateTimeSelect* v2_ApprovalDateTime, boost::optional< std::string > v3_ApprovalStatus, boost::optional< std::string > v4_ApprovalLevel, boost::optional< std::string > v5_ApprovalQualifier, std::string v6_Name, std::string v7_Identifier);
+    typedef IfcTemplatedEntityList< IfcApproval > list;
 };
 
 class IfcApprovalActorRelationship : public IfcUtil::IfcBaseEntity {
 public:
-    IfcActorSelect Actor();
-    void setActor(IfcActorSelect v);
-    IfcApproval* Approval();
+    IfcActorSelect* Actor() const;
+    void setActor(IfcActorSelect* v);
+    IfcApproval* Approval() const;
     void setApproval(IfcApproval* v);
-    IfcActorRole* Role();
+    IfcActorRole* Role() const;
     void setRole(IfcActorRole* v);
     virtual unsigned int getArgumentCount() const { return 3; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY; case 1: return IfcUtil::Argument_ENTITY; case 2: return IfcUtil::Argument_ENTITY; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcActorSelect; case 1: return Type::IfcApproval; case 2: return Type::IfcActorRole; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Actor"; case 1: return "Approval"; case 2: return "Role"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcApprovalActorRelationship (IfcAbstractEntityPtr e);
-    IfcApprovalActorRelationship (IfcActorSelect v1_Actor, IfcApproval* v2_Approval, IfcActorRole* v3_Role);
-    typedef IfcApprovalActorRelationship* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcApprovalActorRelationship > > list;
-    typedef IfcTemplatedEntityList< IfcApprovalActorRelationship >::it it;
+    IfcApprovalActorRelationship (IfcAbstractEntity* e);
+    IfcApprovalActorRelationship (IfcActorSelect* v1_Actor, IfcApproval* v2_Approval, IfcActorRole* v3_Role);
+    typedef IfcTemplatedEntityList< IfcApprovalActorRelationship > list;
 };
 
 class IfcApprovalPropertyRelationship : public IfcUtil::IfcBaseEntity {
 public:
-    SHARED_PTR< IfcTemplatedEntityList< IfcProperty > > ApprovedProperties();
-    void setApprovedProperties(SHARED_PTR< IfcTemplatedEntityList< IfcProperty > > v);
-    IfcApproval* Approval();
+    IfcTemplatedEntityList< IfcProperty >::ptr ApprovedProperties() const;
+    void setApprovedProperties(IfcTemplatedEntityList< IfcProperty >::ptr v);
+    IfcApproval* Approval() const;
     void setApproval(IfcApproval* v);
     virtual unsigned int getArgumentCount() const { return 2; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY_LIST; case 1: return IfcUtil::Argument_ENTITY; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcProperty; case 1: return Type::IfcApproval; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "ApprovedProperties"; case 1: return "Approval"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcApprovalPropertyRelationship (IfcAbstractEntityPtr e);
-    IfcApprovalPropertyRelationship (SHARED_PTR< IfcTemplatedEntityList< IfcProperty > > v1_ApprovedProperties, IfcApproval* v2_Approval);
-    typedef IfcApprovalPropertyRelationship* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcApprovalPropertyRelationship > > list;
-    typedef IfcTemplatedEntityList< IfcApprovalPropertyRelationship >::it it;
+    IfcApprovalPropertyRelationship (IfcAbstractEntity* e);
+    IfcApprovalPropertyRelationship (IfcTemplatedEntityList< IfcProperty >::ptr v1_ApprovedProperties, IfcApproval* v2_Approval);
+    typedef IfcTemplatedEntityList< IfcApprovalPropertyRelationship > list;
 };
 /// An IfcApprovalRelationship associates approvals (one
 /// relating approval and one or more related approvals), each having different status or level as the approval process or the approved
@@ -5745,29 +6909,28 @@ class IfcApprovalPropertyRelationship : public IfcUtil::IfcBaseEntity {
 /// IFC2x4 CHANGE  Subtyped from IfcResourceLevelRelationship, order of attributes changed.
 class IfcApprovalRelationship : public IfcUtil::IfcBaseEntity {
 public:
-    IfcApproval* RelatedApproval();
+    IfcApproval* RelatedApproval() const;
     void setRelatedApproval(IfcApproval* v);
     /// The approval that other approval is related to.
-    IfcApproval* RelatingApproval();
+    IfcApproval* RelatingApproval() const;
     void setRelatingApproval(IfcApproval* v);
     /// Whether the optional attribute Description is defined for this IfcApprovalRelationship
-    bool hasDescription();
-    IfcText Description();
-    void setDescription(IfcText v);
-    IfcLabel Name();
-    void setName(IfcLabel v);
+    bool hasDescription() const;
+    std::string Description() const;
+    void setDescription(std::string v);
+    std::string Name() const;
+    void setName(std::string v);
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY; case 1: return IfcUtil::Argument_ENTITY; case 2: return IfcUtil::Argument_STRING; case 3: return IfcUtil::Argument_STRING; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcApproval; case 1: return Type::IfcApproval; case 2: return Type::IfcText; case 3: return Type::IfcLabel; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "RelatedApproval"; case 1: return "RelatingApproval"; case 2: return "Description"; case 3: return "Name"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcApprovalRelationship (IfcAbstractEntityPtr e);
-    IfcApprovalRelationship (IfcApproval* v1_RelatedApproval, IfcApproval* v2_RelatingApproval, boost::optional< IfcText > v3_Description, IfcLabel v4_Name);
-    typedef IfcApprovalRelationship* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcApprovalRelationship > > list;
-    typedef IfcTemplatedEntityList< IfcApprovalRelationship >::it it;
+    IfcApprovalRelationship (IfcAbstractEntity* e);
+    IfcApprovalRelationship (IfcApproval* v1_RelatedApproval, IfcApproval* v2_RelatingApproval, boost::optional< std::string > v3_Description, std::string v4_Name);
+    typedef IfcTemplatedEntityList< IfcApprovalRelationship > list;
 };
 /// Definition
 /// from IAI: The abstract entity IfcBoundaryCondition
@@ -5787,22 +6950,21 @@ class IfcApprovalRelationship : public IfcUtil::IfcBaseEntity {
 class IfcBoundaryCondition : public IfcUtil::IfcBaseEntity {
 public:
     /// Whether the optional attribute Name is defined for this IfcBoundaryCondition
-    bool hasName();
+    bool hasName() const;
     /// Optionally defines a name for this boundary condition.
-    IfcLabel Name();
-    void setName(IfcLabel v);
+    std::string Name() const;
+    void setName(std::string v);
     virtual unsigned int getArgumentCount() const { return 1; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_STRING; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcLabel; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Name"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcBoundaryCondition (IfcAbstractEntityPtr e);
-    IfcBoundaryCondition (boost::optional< IfcLabel > v1_Name);
-    typedef IfcBoundaryCondition* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcBoundaryCondition > > list;
-    typedef IfcTemplatedEntityList< IfcBoundaryCondition >::it it;
+    IfcBoundaryCondition (IfcAbstractEntity* e);
+    IfcBoundaryCondition (boost::optional< std::string > v1_Name);
+    typedef IfcTemplatedEntityList< IfcBoundaryCondition > list;
 };
 /// Definition from IAI: Describes linearly elastic support conditions or connection conditions.
 /// 
@@ -5817,44 +6979,43 @@ class IfcBoundaryCondition : public IfcUtil::IfcBaseEntity {
 class IfcBoundaryEdgeCondition : public IfcBoundaryCondition {
 public:
     /// Whether the optional attribute LinearStiffnessByLengthX is defined for this IfcBoundaryEdgeCondition
-    bool hasLinearStiffnessByLengthX();
-    IfcModulusOfLinearSubgradeReactionMeasure LinearStiffnessByLengthX();
-    void setLinearStiffnessByLengthX(IfcModulusOfLinearSubgradeReactionMeasure v);
+    bool hasLinearStiffnessByLengthX() const;
+    double LinearStiffnessByLengthX() const;
+    void setLinearStiffnessByLengthX(double v);
     /// Whether the optional attribute LinearStiffnessByLengthY is defined for this IfcBoundaryEdgeCondition
-    bool hasLinearStiffnessByLengthY();
-    IfcModulusOfLinearSubgradeReactionMeasure LinearStiffnessByLengthY();
-    void setLinearStiffnessByLengthY(IfcModulusOfLinearSubgradeReactionMeasure v);
+    bool hasLinearStiffnessByLengthY() const;
+    double LinearStiffnessByLengthY() const;
+    void setLinearStiffnessByLengthY(double v);
     /// Whether the optional attribute LinearStiffnessByLengthZ is defined for this IfcBoundaryEdgeCondition
-    bool hasLinearStiffnessByLengthZ();
-    IfcModulusOfLinearSubgradeReactionMeasure LinearStiffnessByLengthZ();
-    void setLinearStiffnessByLengthZ(IfcModulusOfLinearSubgradeReactionMeasure v);
+    bool hasLinearStiffnessByLengthZ() const;
+    double LinearStiffnessByLengthZ() const;
+    void setLinearStiffnessByLengthZ(double v);
     /// Whether the optional attribute RotationalStiffnessByLengthX is defined for this IfcBoundaryEdgeCondition
-    bool hasRotationalStiffnessByLengthX();
+    bool hasRotationalStiffnessByLengthX() const;
     /// Rotational stiffness value about the x-axis of the coordinate system defined by the instance which uses this resource object.
-    IfcModulusOfRotationalSubgradeReactionMeasure RotationalStiffnessByLengthX();
-    void setRotationalStiffnessByLengthX(IfcModulusOfRotationalSubgradeReactionMeasure v);
+    double RotationalStiffnessByLengthX() const;
+    void setRotationalStiffnessByLengthX(double v);
     /// Whether the optional attribute RotationalStiffnessByLengthY is defined for this IfcBoundaryEdgeCondition
-    bool hasRotationalStiffnessByLengthY();
+    bool hasRotationalStiffnessByLengthY() const;
     /// Rotational stiffness value about the y-axis of the coordinate system defined by the instance which uses this resource object.
-    IfcModulusOfRotationalSubgradeReactionMeasure RotationalStiffnessByLengthY();
-    void setRotationalStiffnessByLengthY(IfcModulusOfRotationalSubgradeReactionMeasure v);
+    double RotationalStiffnessByLengthY() const;
+    void setRotationalStiffnessByLengthY(double v);
     /// Whether the optional attribute RotationalStiffnessByLengthZ is defined for this IfcBoundaryEdgeCondition
-    bool hasRotationalStiffnessByLengthZ();
+    bool hasRotationalStiffnessByLengthZ() const;
     /// Rotational stiffness value about the z-axis of the coordinate system defined by the instance which uses this resource object.
-    IfcModulusOfRotationalSubgradeReactionMeasure RotationalStiffnessByLengthZ();
-    void setRotationalStiffnessByLengthZ(IfcModulusOfRotationalSubgradeReactionMeasure v);
+    double RotationalStiffnessByLengthZ() const;
+    void setRotationalStiffnessByLengthZ(double v);
     virtual unsigned int getArgumentCount() const { return 7; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 1: return IfcUtil::Argument_DOUBLE; case 2: return IfcUtil::Argument_DOUBLE; case 3: return IfcUtil::Argument_DOUBLE; case 4: return IfcUtil::Argument_DOUBLE; case 5: return IfcUtil::Argument_DOUBLE; case 6: return IfcUtil::Argument_DOUBLE; } return IfcBoundaryCondition::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 1: return Type::IfcModulusOfLinearSubgradeReactionMeasure; case 2: return Type::IfcModulusOfLinearSubgradeReactionMeasure; case 3: return Type::IfcModulusOfLinearSubgradeReactionMeasure; case 4: return Type::IfcModulusOfRotationalSubgradeReactionMeasure; case 5: return Type::IfcModulusOfRotationalSubgradeReactionMeasure; case 6: return Type::IfcModulusOfRotationalSubgradeReactionMeasure; } return IfcBoundaryCondition::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 1: return "LinearStiffnessByLengthX"; case 2: return "LinearStiffnessByLengthY"; case 3: return "LinearStiffnessByLengthZ"; case 4: return "RotationalStiffnessByLengthX"; case 5: return "RotationalStiffnessByLengthY"; case 6: return "RotationalStiffnessByLengthZ"; } return IfcBoundaryCondition::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcBoundaryEdgeCondition (IfcAbstractEntityPtr e);
-    IfcBoundaryEdgeCondition (boost::optional< IfcLabel > v1_Name, boost::optional< IfcModulusOfLinearSubgradeReactionMeasure > v2_LinearStiffnessByLengthX, boost::optional< IfcModulusOfLinearSubgradeReactionMeasure > v3_LinearStiffnessByLengthY, boost::optional< IfcModulusOfLinearSubgradeReactionMeasure > v4_LinearStiffnessByLengthZ, boost::optional< IfcModulusOfRotationalSubgradeReactionMeasure > v5_RotationalStiffnessByLengthX, boost::optional< IfcModulusOfRotationalSubgradeReactionMeasure > v6_RotationalStiffnessByLengthY, boost::optional< IfcModulusOfRotationalSubgradeReactionMeasure > v7_RotationalStiffnessByLengthZ);
-    typedef IfcBoundaryEdgeCondition* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcBoundaryEdgeCondition > > list;
-    typedef IfcTemplatedEntityList< IfcBoundaryEdgeCondition >::it it;
+    IfcBoundaryEdgeCondition (IfcAbstractEntity* e);
+    IfcBoundaryEdgeCondition (boost::optional< std::string > v1_Name, boost::optional< double > v2_LinearStiffnessByLengthX, boost::optional< double > v3_LinearStiffnessByLengthY, boost::optional< double > v4_LinearStiffnessByLengthZ, boost::optional< double > v5_RotationalStiffnessByLengthX, boost::optional< double > v6_RotationalStiffnessByLengthY, boost::optional< double > v7_RotationalStiffnessByLengthZ);
+    typedef IfcTemplatedEntityList< IfcBoundaryEdgeCondition > list;
 };
 /// Definition from IAI: Describes linearly elastic support conditions or connection conditions.
 /// 
@@ -5869,29 +7030,28 @@ class IfcBoundaryEdgeCondition : public IfcBoundaryCondition {
 class IfcBoundaryFaceCondition : public IfcBoundaryCondition {
 public:
     /// Whether the optional attribute LinearStiffnessByAreaX is defined for this IfcBoundaryFaceCondition
-    bool hasLinearStiffnessByAreaX();
-    IfcModulusOfSubgradeReactionMeasure LinearStiffnessByAreaX();
-    void setLinearStiffnessByAreaX(IfcModulusOfSubgradeReactionMeasure v);
+    bool hasLinearStiffnessByAreaX() const;
+    double LinearStiffnessByAreaX() const;
+    void setLinearStiffnessByAreaX(double v);
     /// Whether the optional attribute LinearStiffnessByAreaY is defined for this IfcBoundaryFaceCondition
-    bool hasLinearStiffnessByAreaY();
-    IfcModulusOfSubgradeReactionMeasure LinearStiffnessByAreaY();
-    void setLinearStiffnessByAreaY(IfcModulusOfSubgradeReactionMeasure v);
+    bool hasLinearStiffnessByAreaY() const;
+    double LinearStiffnessByAreaY() const;
+    void setLinearStiffnessByAreaY(double v);
     /// Whether the optional attribute LinearStiffnessByAreaZ is defined for this IfcBoundaryFaceCondition
-    bool hasLinearStiffnessByAreaZ();
-    IfcModulusOfSubgradeReactionMeasure LinearStiffnessByAreaZ();
-    void setLinearStiffnessByAreaZ(IfcModulusOfSubgradeReactionMeasure v);
+    bool hasLinearStiffnessByAreaZ() const;
+    double LinearStiffnessByAreaZ() const;
+    void setLinearStiffnessByAreaZ(double v);
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 1: return IfcUtil::Argument_DOUBLE; case 2: return IfcUtil::Argument_DOUBLE; case 3: return IfcUtil::Argument_DOUBLE; } return IfcBoundaryCondition::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 1: return Type::IfcModulusOfSubgradeReactionMeasure; case 2: return Type::IfcModulusOfSubgradeReactionMeasure; case 3: return Type::IfcModulusOfSubgradeReactionMeasure; } return IfcBoundaryCondition::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 1: return "LinearStiffnessByAreaX"; case 2: return "LinearStiffnessByAreaY"; case 3: return "LinearStiffnessByAreaZ"; } return IfcBoundaryCondition::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcBoundaryFaceCondition (IfcAbstractEntityPtr e);
-    IfcBoundaryFaceCondition (boost::optional< IfcLabel > v1_Name, boost::optional< IfcModulusOfSubgradeReactionMeasure > v2_LinearStiffnessByAreaX, boost::optional< IfcModulusOfSubgradeReactionMeasure > v3_LinearStiffnessByAreaY, boost::optional< IfcModulusOfSubgradeReactionMeasure > v4_LinearStiffnessByAreaZ);
-    typedef IfcBoundaryFaceCondition* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcBoundaryFaceCondition > > list;
-    typedef IfcTemplatedEntityList< IfcBoundaryFaceCondition >::it it;
+    IfcBoundaryFaceCondition (IfcAbstractEntity* e);
+    IfcBoundaryFaceCondition (boost::optional< std::string > v1_Name, boost::optional< double > v2_LinearStiffnessByAreaX, boost::optional< double > v3_LinearStiffnessByAreaY, boost::optional< double > v4_LinearStiffnessByAreaZ);
+    typedef IfcTemplatedEntityList< IfcBoundaryFaceCondition > list;
 };
 /// Definition from IAI: Describes linearly elastic support conditions or connection conditions.
 /// 
@@ -5906,44 +7066,43 @@ class IfcBoundaryFaceCondition : public IfcBoundaryCondition {
 class IfcBoundaryNodeCondition : public IfcBoundaryCondition {
 public:
     /// Whether the optional attribute LinearStiffnessX is defined for this IfcBoundaryNodeCondition
-    bool hasLinearStiffnessX();
-    IfcLinearStiffnessMeasure LinearStiffnessX();
-    void setLinearStiffnessX(IfcLinearStiffnessMeasure v);
+    bool hasLinearStiffnessX() const;
+    double LinearStiffnessX() const;
+    void setLinearStiffnessX(double v);
     /// Whether the optional attribute LinearStiffnessY is defined for this IfcBoundaryNodeCondition
-    bool hasLinearStiffnessY();
-    IfcLinearStiffnessMeasure LinearStiffnessY();
-    void setLinearStiffnessY(IfcLinearStiffnessMeasure v);
+    bool hasLinearStiffnessY() const;
+    double LinearStiffnessY() const;
+    void setLinearStiffnessY(double v);
     /// Whether the optional attribute LinearStiffnessZ is defined for this IfcBoundaryNodeCondition
-    bool hasLinearStiffnessZ();
-    IfcLinearStiffnessMeasure LinearStiffnessZ();
-    void setLinearStiffnessZ(IfcLinearStiffnessMeasure v);
+    bool hasLinearStiffnessZ() const;
+    double LinearStiffnessZ() const;
+    void setLinearStiffnessZ(double v);
     /// Whether the optional attribute RotationalStiffnessX is defined for this IfcBoundaryNodeCondition
-    bool hasRotationalStiffnessX();
+    bool hasRotationalStiffnessX() const;
     /// Rotational stiffness value about the x-axis of the coordinate system defined by the instance which uses this resource object.
-    IfcRotationalStiffnessMeasure RotationalStiffnessX();
-    void setRotationalStiffnessX(IfcRotationalStiffnessMeasure v);
+    double RotationalStiffnessX() const;
+    void setRotationalStiffnessX(double v);
     /// Whether the optional attribute RotationalStiffnessY is defined for this IfcBoundaryNodeCondition
-    bool hasRotationalStiffnessY();
+    bool hasRotationalStiffnessY() const;
     /// Rotational stiffness value about the y-axis of the coordinate system defined by the instance which uses this resource object.
-    IfcRotationalStiffnessMeasure RotationalStiffnessY();
-    void setRotationalStiffnessY(IfcRotationalStiffnessMeasure v);
+    double RotationalStiffnessY() const;
+    void setRotationalStiffnessY(double v);
     /// Whether the optional attribute RotationalStiffnessZ is defined for this IfcBoundaryNodeCondition
-    bool hasRotationalStiffnessZ();
+    bool hasRotationalStiffnessZ() const;
     /// Rotational stiffness value about the z-axis of the coordinate system defined by the instance which uses this resource object.
-    IfcRotationalStiffnessMeasure RotationalStiffnessZ();
-    void setRotationalStiffnessZ(IfcRotationalStiffnessMeasure v);
+    double RotationalStiffnessZ() const;
+    void setRotationalStiffnessZ(double v);
     virtual unsigned int getArgumentCount() const { return 7; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 1: return IfcUtil::Argument_DOUBLE; case 2: return IfcUtil::Argument_DOUBLE; case 3: return IfcUtil::Argument_DOUBLE; case 4: return IfcUtil::Argument_DOUBLE; case 5: return IfcUtil::Argument_DOUBLE; case 6: return IfcUtil::Argument_DOUBLE; } return IfcBoundaryCondition::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 1: return Type::IfcLinearStiffnessMeasure; case 2: return Type::IfcLinearStiffnessMeasure; case 3: return Type::IfcLinearStiffnessMeasure; case 4: return Type::IfcRotationalStiffnessMeasure; case 5: return Type::IfcRotationalStiffnessMeasure; case 6: return Type::IfcRotationalStiffnessMeasure; } return IfcBoundaryCondition::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 1: return "LinearStiffnessX"; case 2: return "LinearStiffnessY"; case 3: return "LinearStiffnessZ"; case 4: return "RotationalStiffnessX"; case 5: return "RotationalStiffnessY"; case 6: return "RotationalStiffnessZ"; } return IfcBoundaryCondition::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcBoundaryNodeCondition (IfcAbstractEntityPtr e);
-    IfcBoundaryNodeCondition (boost::optional< IfcLabel > v1_Name, boost::optional< IfcLinearStiffnessMeasure > v2_LinearStiffnessX, boost::optional< IfcLinearStiffnessMeasure > v3_LinearStiffnessY, boost::optional< IfcLinearStiffnessMeasure > v4_LinearStiffnessZ, boost::optional< IfcRotationalStiffnessMeasure > v5_RotationalStiffnessX, boost::optional< IfcRotationalStiffnessMeasure > v6_RotationalStiffnessY, boost::optional< IfcRotationalStiffnessMeasure > v7_RotationalStiffnessZ);
-    typedef IfcBoundaryNodeCondition* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcBoundaryNodeCondition > > list;
-    typedef IfcTemplatedEntityList< IfcBoundaryNodeCondition >::it it;
+    IfcBoundaryNodeCondition (IfcAbstractEntity* e);
+    IfcBoundaryNodeCondition (boost::optional< std::string > v1_Name, boost::optional< double > v2_LinearStiffnessX, boost::optional< double > v3_LinearStiffnessY, boost::optional< double > v4_LinearStiffnessZ, boost::optional< double > v5_RotationalStiffnessX, boost::optional< double > v6_RotationalStiffnessY, boost::optional< double > v7_RotationalStiffnessZ);
+    typedef IfcTemplatedEntityList< IfcBoundaryNodeCondition > list;
 };
 /// Definition from IAI: Describes linearly elastic support conditions or connection conditions, including linearly elastic warping restraints.
 /// 
@@ -5957,44 +7116,42 @@ class IfcBoundaryNodeCondition : public IfcBoundaryCondition {
 class IfcBoundaryNodeConditionWarping : public IfcBoundaryNodeCondition {
 public:
     /// Whether the optional attribute WarpingStiffness is defined for this IfcBoundaryNodeConditionWarping
-    bool hasWarpingStiffness();
+    bool hasWarpingStiffness() const;
     /// Defines the warping stiffness value.
-    IfcWarpingMomentMeasure WarpingStiffness();
-    void setWarpingStiffness(IfcWarpingMomentMeasure v);
+    double WarpingStiffness() const;
+    void setWarpingStiffness(double v);
     virtual unsigned int getArgumentCount() const { return 8; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 7: return IfcUtil::Argument_DOUBLE; } return IfcBoundaryNodeCondition::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 7: return Type::IfcWarpingMomentMeasure; } return IfcBoundaryNodeCondition::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 7: return "WarpingStiffness"; } return IfcBoundaryNodeCondition::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcBoundaryNodeConditionWarping (IfcAbstractEntityPtr e);
-    IfcBoundaryNodeConditionWarping (boost::optional< IfcLabel > v1_Name, boost::optional< IfcLinearStiffnessMeasure > v2_LinearStiffnessX, boost::optional< IfcLinearStiffnessMeasure > v3_LinearStiffnessY, boost::optional< IfcLinearStiffnessMeasure > v4_LinearStiffnessZ, boost::optional< IfcRotationalStiffnessMeasure > v5_RotationalStiffnessX, boost::optional< IfcRotationalStiffnessMeasure > v6_RotationalStiffnessY, boost::optional< IfcRotationalStiffnessMeasure > v7_RotationalStiffnessZ, boost::optional< IfcWarpingMomentMeasure > v8_WarpingStiffness);
-    typedef IfcBoundaryNodeConditionWarping* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcBoundaryNodeConditionWarping > > list;
-    typedef IfcTemplatedEntityList< IfcBoundaryNodeConditionWarping >::it it;
+    IfcBoundaryNodeConditionWarping (IfcAbstractEntity* e);
+    IfcBoundaryNodeConditionWarping (boost::optional< std::string > v1_Name, boost::optional< double > v2_LinearStiffnessX, boost::optional< double > v3_LinearStiffnessY, boost::optional< double > v4_LinearStiffnessZ, boost::optional< double > v5_RotationalStiffnessX, boost::optional< double > v6_RotationalStiffnessY, boost::optional< double > v7_RotationalStiffnessZ, boost::optional< double > v8_WarpingStiffness);
+    typedef IfcTemplatedEntityList< IfcBoundaryNodeConditionWarping > list;
 };
 
 class IfcCalendarDate : public IfcUtil::IfcBaseEntity {
 public:
-    IfcDayInMonthNumber DayComponent();
-    void setDayComponent(IfcDayInMonthNumber v);
-    IfcMonthInYearNumber MonthComponent();
-    void setMonthComponent(IfcMonthInYearNumber v);
-    IfcYearNumber YearComponent();
-    void setYearComponent(IfcYearNumber v);
+    int DayComponent() const;
+    void setDayComponent(int v);
+    int MonthComponent() const;
+    void setMonthComponent(int v);
+    int YearComponent() const;
+    void setYearComponent(int v);
     virtual unsigned int getArgumentCount() const { return 3; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_INT; case 1: return IfcUtil::Argument_INT; case 2: return IfcUtil::Argument_INT; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcDayInMonthNumber; case 1: return Type::IfcMonthInYearNumber; case 2: return Type::IfcYearNumber; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "DayComponent"; case 1: return "MonthComponent"; case 2: return "YearComponent"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcCalendarDate (IfcAbstractEntityPtr e);
-    IfcCalendarDate (IfcDayInMonthNumber v1_DayComponent, IfcMonthInYearNumber v2_MonthComponent, IfcYearNumber v3_YearComponent);
-    typedef IfcCalendarDate* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcCalendarDate > > list;
-    typedef IfcTemplatedEntityList< IfcCalendarDate >::it it;
+    IfcCalendarDate (IfcAbstractEntity* e);
+    IfcCalendarDate (int v1_DayComponent, int v2_MonthComponent, int v3_YearComponent);
+    typedef IfcTemplatedEntityList< IfcCalendarDate > list;
 };
 /// An IfcClassification is used for the arrangement of objects into a class or category according to a common purpose or their possession of common
 /// characteristics. A classification in the sense of IfcClassification is taxonomy, or taxonomic scheme, arranged in a hierarchical structure. A category of objects relates to other categories in a generalization-specialization relationship. Therefore the classification items in an
@@ -6016,124 +7173,119 @@ class IfcClassification : public IfcUtil::IfcBaseEntity {
     /// Source (or publisher) for this classification.
     /// 
     /// NOTE that the source of the classification means the person or organization that was the original author or the person or organization currently acting as the publisher.
-    IfcLabel Source();
-    void setSource(IfcLabel v);
+    std::string Source() const;
+    void setSource(std::string v);
     /// The edition or version of the classification system from which the classification notation is derived.
     /// 
     /// NOTE the version labeling system is specific to the classification system. 
     /// 
     /// IFC2x4 CHANGE The attribute has been changed to be optional.
-    IfcLabel Edition();
-    void setEdition(IfcLabel v);
+    std::string Edition() const;
+    void setEdition(std::string v);
     /// Whether the optional attribute EditionDate is defined for this IfcClassification
-    bool hasEditionDate();
+    bool hasEditionDate() const;
     /// The date on which the edition of the classification used became valid.
     /// 
     /// NOTE The indication of edition may be sufficient to identify the classification source uniquely but the edition date is provided as an optional attribute to enable more precise identification where required.
     /// 
     /// IFC2x4 CHANGE The data type has been changed to IfcDate, the date string according to ISO8601.
-    IfcCalendarDate* EditionDate();
+    IfcCalendarDate* EditionDate() const;
     void setEditionDate(IfcCalendarDate* v);
     /// The name or label by which the classification used is normally known.
     /// 
     /// NOTE Examples of names include CI/SfB, Masterformat, BSAB, Uniclass, STABU, DIN276, DIN277 etc.
-    IfcLabel Name();
-    void setName(IfcLabel v);
+    std::string Name() const;
+    void setName(std::string v);
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_STRING; case 1: return IfcUtil::Argument_STRING; case 2: return IfcUtil::Argument_ENTITY; case 3: return IfcUtil::Argument_STRING; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcLabel; case 1: return Type::IfcLabel; case 2: return Type::IfcCalendarDate; case 3: return Type::IfcLabel; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Source"; case 1: return "Edition"; case 2: return "EditionDate"; case 3: return "Name"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcClassificationItem > > Contains(); // INVERSE IfcClassificationItem::ItemOf
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcClassificationItem >::ptr Contains() const; // INVERSE IfcClassificationItem::ItemOf
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcClassification (IfcAbstractEntityPtr e);
-    IfcClassification (IfcLabel v1_Source, IfcLabel v2_Edition, IfcCalendarDate* v3_EditionDate, IfcLabel v4_Name);
-    typedef IfcClassification* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcClassification > > list;
-    typedef IfcTemplatedEntityList< IfcClassification >::it it;
+    IfcClassification (IfcAbstractEntity* e);
+    IfcClassification (std::string v1_Source, std::string v2_Edition, IfcCalendarDate* v3_EditionDate, std::string v4_Name);
+    typedef IfcTemplatedEntityList< IfcClassification > list;
 };
 
 class IfcClassificationItem : public IfcUtil::IfcBaseEntity {
 public:
-    IfcClassificationNotationFacet* Notation();
+    IfcClassificationNotationFacet* Notation() const;
     void setNotation(IfcClassificationNotationFacet* v);
     /// Whether the optional attribute ItemOf is defined for this IfcClassificationItem
-    bool hasItemOf();
-    IfcClassification* ItemOf();
+    bool hasItemOf() const;
+    IfcClassification* ItemOf() const;
     void setItemOf(IfcClassification* v);
-    IfcLabel Title();
-    void setTitle(IfcLabel v);
+    std::string Title() const;
+    void setTitle(std::string v);
     virtual unsigned int getArgumentCount() const { return 3; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY; case 1: return IfcUtil::Argument_ENTITY; case 2: return IfcUtil::Argument_STRING; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcClassificationNotationFacet; case 1: return Type::IfcClassification; case 2: return Type::IfcLabel; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Notation"; case 1: return "ItemOf"; case 2: return "Title"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcClassificationItemRelationship > > IsClassifiedItemIn(); // INVERSE IfcClassificationItemRelationship::RelatedItems
-    SHARED_PTR< IfcTemplatedEntityList< IfcClassificationItemRelationship > > IsClassifyingItemIn(); // INVERSE IfcClassificationItemRelationship::RelatingItem
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcClassificationItemRelationship >::ptr IsClassifiedItemIn() const; // INVERSE IfcClassificationItemRelationship::RelatedItems
+    IfcTemplatedEntityList< IfcClassificationItemRelationship >::ptr IsClassifyingItemIn() const; // INVERSE IfcClassificationItemRelationship::RelatingItem
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcClassificationItem (IfcAbstractEntityPtr e);
-    IfcClassificationItem (IfcClassificationNotationFacet* v1_Notation, IfcClassification* v2_ItemOf, IfcLabel v3_Title);
-    typedef IfcClassificationItem* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcClassificationItem > > list;
-    typedef IfcTemplatedEntityList< IfcClassificationItem >::it it;
+    IfcClassificationItem (IfcAbstractEntity* e);
+    IfcClassificationItem (IfcClassificationNotationFacet* v1_Notation, IfcClassification* v2_ItemOf, std::string v3_Title);
+    typedef IfcTemplatedEntityList< IfcClassificationItem > list;
 };
 
 class IfcClassificationItemRelationship : public IfcUtil::IfcBaseEntity {
 public:
-    IfcClassificationItem* RelatingItem();
+    IfcClassificationItem* RelatingItem() const;
     void setRelatingItem(IfcClassificationItem* v);
-    SHARED_PTR< IfcTemplatedEntityList< IfcClassificationItem > > RelatedItems();
-    void setRelatedItems(SHARED_PTR< IfcTemplatedEntityList< IfcClassificationItem > > v);
+    IfcTemplatedEntityList< IfcClassificationItem >::ptr RelatedItems() const;
+    void setRelatedItems(IfcTemplatedEntityList< IfcClassificationItem >::ptr v);
     virtual unsigned int getArgumentCount() const { return 2; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY; case 1: return IfcUtil::Argument_ENTITY_LIST; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcClassificationItem; case 1: return Type::IfcClassificationItem; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "RelatingItem"; case 1: return "RelatedItems"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcClassificationItemRelationship (IfcAbstractEntityPtr e);
-    IfcClassificationItemRelationship (IfcClassificationItem* v1_RelatingItem, SHARED_PTR< IfcTemplatedEntityList< IfcClassificationItem > > v2_RelatedItems);
-    typedef IfcClassificationItemRelationship* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcClassificationItemRelationship > > list;
-    typedef IfcTemplatedEntityList< IfcClassificationItemRelationship >::it it;
+    IfcClassificationItemRelationship (IfcAbstractEntity* e);
+    IfcClassificationItemRelationship (IfcClassificationItem* v1_RelatingItem, IfcTemplatedEntityList< IfcClassificationItem >::ptr v2_RelatedItems);
+    typedef IfcTemplatedEntityList< IfcClassificationItemRelationship > list;
 };
 
 class IfcClassificationNotation : public IfcUtil::IfcBaseEntity {
 public:
-    SHARED_PTR< IfcTemplatedEntityList< IfcClassificationNotationFacet > > NotationFacets();
-    void setNotationFacets(SHARED_PTR< IfcTemplatedEntityList< IfcClassificationNotationFacet > > v);
+    IfcTemplatedEntityList< IfcClassificationNotationFacet >::ptr NotationFacets() const;
+    void setNotationFacets(IfcTemplatedEntityList< IfcClassificationNotationFacet >::ptr v);
     virtual unsigned int getArgumentCount() const { return 1; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY_LIST; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcClassificationNotationFacet; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "NotationFacets"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcClassificationNotation (IfcAbstractEntityPtr e);
-    IfcClassificationNotation (SHARED_PTR< IfcTemplatedEntityList< IfcClassificationNotationFacet > > v1_NotationFacets);
-    typedef IfcClassificationNotation* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcClassificationNotation > > list;
-    typedef IfcTemplatedEntityList< IfcClassificationNotation >::it it;
+    IfcClassificationNotation (IfcAbstractEntity* e);
+    IfcClassificationNotation (IfcTemplatedEntityList< IfcClassificationNotationFacet >::ptr v1_NotationFacets);
+    typedef IfcTemplatedEntityList< IfcClassificationNotation > list;
 };
 
 class IfcClassificationNotationFacet : public IfcUtil::IfcBaseEntity {
 public:
-    IfcLabel NotationValue();
-    void setNotationValue(IfcLabel v);
+    std::string NotationValue() const;
+    void setNotationValue(std::string v);
     virtual unsigned int getArgumentCount() const { return 1; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_STRING; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcLabel; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "NotationValue"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcClassificationNotationFacet (IfcAbstractEntityPtr e);
-    IfcClassificationNotationFacet (IfcLabel v1_NotationValue);
-    typedef IfcClassificationNotationFacet* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcClassificationNotationFacet > > list;
-    typedef IfcTemplatedEntityList< IfcClassificationNotationFacet >::it it;
+    IfcClassificationNotationFacet (IfcAbstractEntity* e);
+    IfcClassificationNotationFacet (std::string v1_NotationValue);
+    typedef IfcTemplatedEntityList< IfcClassificationNotationFacet > list;
 };
 /// Definition from ISO/CD 10303-46:1992: The colour specification entity contains a direct colour definition. Colour component values refer directly to a specific colour space.
 /// 
@@ -6143,25 +7295,24 @@ class IfcClassificationNotationFacet : public IfcUtil::IfcBaseEntity {
 class IfcColourSpecification : public IfcUtil::IfcBaseEntity {
 public:
     /// Whether the optional attribute Name is defined for this IfcColourSpecification
-    bool hasName();
+    bool hasName() const;
     /// Optional name given to a particular colour specification in addition to the colour components (like the RGB values).
     /// 
     /// NOTE  Examples are the names of a industry colour classification, such as RAL.
     /// IFC2x Edition 3 CHANGE  Attribute added.
-    IfcLabel Name();
-    void setName(IfcLabel v);
+    std::string Name() const;
+    void setName(std::string v);
     virtual unsigned int getArgumentCount() const { return 1; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_STRING; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcLabel; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Name"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcColourSpecification (IfcAbstractEntityPtr e);
-    IfcColourSpecification (boost::optional< IfcLabel > v1_Name);
-    typedef IfcColourSpecification* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcColourSpecification > > list;
-    typedef IfcTemplatedEntityList< IfcColourSpecification >::it it;
+    IfcColourSpecification (IfcAbstractEntity* e);
+    IfcColourSpecification (boost::optional< std::string > v1_Name);
+    typedef IfcTemplatedEntityList< IfcColourSpecification > list;
 };
 /// IfcConnectionGeometry is used to describe the geometric and topological constraints that facilitate the physical connection of two objects. It is envisioned as a control that applies to the element connection relationships.
 /// 
@@ -6181,16 +7332,15 @@ class IfcConnectionGeometry : public IfcUtil::IfcBaseEntity {
 public:
     virtual unsigned int getArgumentCount() const { return 0; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcConnectionGeometry (IfcAbstractEntityPtr e);
+    IfcConnectionGeometry (IfcAbstractEntity* e);
     IfcConnectionGeometry ();
-    typedef IfcConnectionGeometry* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcConnectionGeometry > > list;
-    typedef IfcTemplatedEntityList< IfcConnectionGeometry >::it it;
+    typedef IfcTemplatedEntityList< IfcConnectionGeometry > list;
 };
 /// IfcConnectionPointGeometry
 /// is used to describe the geometric constraints that facilitate the
@@ -6211,49 +7361,47 @@ class IfcConnectionGeometry : public IfcUtil::IfcBaseEntity {
 class IfcConnectionPointGeometry : public IfcConnectionGeometry {
 public:
     /// Point at which the connected object is aligned at the relating element, given in the LCS of the relating element.
-    IfcPointOrVertexPoint PointOnRelatingElement();
-    void setPointOnRelatingElement(IfcPointOrVertexPoint v);
+    IfcPointOrVertexPoint* PointOnRelatingElement() const;
+    void setPointOnRelatingElement(IfcPointOrVertexPoint* v);
     /// Whether the optional attribute PointOnRelatedElement is defined for this IfcConnectionPointGeometry
-    bool hasPointOnRelatedElement();
+    bool hasPointOnRelatedElement() const;
     /// Point at which connected objects are aligned at the related element, given in the LCS of the related element. If the information is omitted, then the origin of the related element is used.
-    IfcPointOrVertexPoint PointOnRelatedElement();
-    void setPointOnRelatedElement(IfcPointOrVertexPoint v);
+    IfcPointOrVertexPoint* PointOnRelatedElement() const;
+    void setPointOnRelatedElement(IfcPointOrVertexPoint* v);
     virtual unsigned int getArgumentCount() const { return 2; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY; case 1: return IfcUtil::Argument_ENTITY; } return IfcConnectionGeometry::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcPointOrVertexPoint; case 1: return Type::IfcPointOrVertexPoint; } return IfcConnectionGeometry::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "PointOnRelatingElement"; case 1: return "PointOnRelatedElement"; } return IfcConnectionGeometry::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcConnectionPointGeometry (IfcAbstractEntityPtr e);
-    IfcConnectionPointGeometry (IfcPointOrVertexPoint v1_PointOnRelatingElement, boost::optional< IfcPointOrVertexPoint > v2_PointOnRelatedElement);
-    typedef IfcConnectionPointGeometry* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcConnectionPointGeometry > > list;
-    typedef IfcTemplatedEntityList< IfcConnectionPointGeometry >::it it;
+    IfcConnectionPointGeometry (IfcAbstractEntity* e);
+    IfcConnectionPointGeometry (IfcPointOrVertexPoint* v1_PointOnRelatingElement, IfcPointOrVertexPoint* v2_PointOnRelatedElement);
+    typedef IfcTemplatedEntityList< IfcConnectionPointGeometry > list;
 };
 
 class IfcConnectionPortGeometry : public IfcConnectionGeometry {
 public:
-    IfcAxis2Placement LocationAtRelatingElement();
-    void setLocationAtRelatingElement(IfcAxis2Placement v);
+    IfcAxis2Placement* LocationAtRelatingElement() const;
+    void setLocationAtRelatingElement(IfcAxis2Placement* v);
     /// Whether the optional attribute LocationAtRelatedElement is defined for this IfcConnectionPortGeometry
-    bool hasLocationAtRelatedElement();
-    IfcAxis2Placement LocationAtRelatedElement();
-    void setLocationAtRelatedElement(IfcAxis2Placement v);
-    IfcProfileDef* ProfileOfPort();
+    bool hasLocationAtRelatedElement() const;
+    IfcAxis2Placement* LocationAtRelatedElement() const;
+    void setLocationAtRelatedElement(IfcAxis2Placement* v);
+    IfcProfileDef* ProfileOfPort() const;
     void setProfileOfPort(IfcProfileDef* v);
     virtual unsigned int getArgumentCount() const { return 3; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY; case 1: return IfcUtil::Argument_ENTITY; case 2: return IfcUtil::Argument_ENTITY; } return IfcConnectionGeometry::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcAxis2Placement; case 1: return Type::IfcAxis2Placement; case 2: return Type::IfcProfileDef; } return IfcConnectionGeometry::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "LocationAtRelatingElement"; case 1: return "LocationAtRelatedElement"; case 2: return "ProfileOfPort"; } return IfcConnectionGeometry::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcConnectionPortGeometry (IfcAbstractEntityPtr e);
-    IfcConnectionPortGeometry (IfcAxis2Placement v1_LocationAtRelatingElement, boost::optional< IfcAxis2Placement > v2_LocationAtRelatedElement, IfcProfileDef* v3_ProfileOfPort);
-    typedef IfcConnectionPortGeometry* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcConnectionPortGeometry > > list;
-    typedef IfcTemplatedEntityList< IfcConnectionPortGeometry >::it it;
+    IfcConnectionPortGeometry (IfcAbstractEntity* e);
+    IfcConnectionPortGeometry (IfcAxis2Placement* v1_LocationAtRelatingElement, IfcAxis2Placement* v2_LocationAtRelatedElement, IfcProfileDef* v3_ProfileOfPort);
+    typedef IfcTemplatedEntityList< IfcConnectionPortGeometry > list;
 };
 /// IfcConnectionSurfaceGeometry is used to describe the geometric constraints that facilitate the physical connection of two objects at a surface or at a face with surface geometry associated. It is envisioned as a control that applies to the element connection relationships. 
 /// 
@@ -6266,25 +7414,24 @@ class IfcConnectionPortGeometry : public IfcConnectionGeometry {
 class IfcConnectionSurfaceGeometry : public IfcConnectionGeometry {
 public:
     /// Surface at which related object is aligned at the relating element, given in the LCS of the relating element.
-    IfcSurfaceOrFaceSurface SurfaceOnRelatingElement();
-    void setSurfaceOnRelatingElement(IfcSurfaceOrFaceSurface v);
+    IfcSurfaceOrFaceSurface* SurfaceOnRelatingElement() const;
+    void setSurfaceOnRelatingElement(IfcSurfaceOrFaceSurface* v);
     /// Whether the optional attribute SurfaceOnRelatedElement is defined for this IfcConnectionSurfaceGeometry
-    bool hasSurfaceOnRelatedElement();
+    bool hasSurfaceOnRelatedElement() const;
     /// Surface at which the relating element is aligned at the related element, given in the LCS of the related element. If the information is omitted, then the origin of the related element is used.
-    IfcSurfaceOrFaceSurface SurfaceOnRelatedElement();
-    void setSurfaceOnRelatedElement(IfcSurfaceOrFaceSurface v);
+    IfcSurfaceOrFaceSurface* SurfaceOnRelatedElement() const;
+    void setSurfaceOnRelatedElement(IfcSurfaceOrFaceSurface* v);
     virtual unsigned int getArgumentCount() const { return 2; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY; case 1: return IfcUtil::Argument_ENTITY; } return IfcConnectionGeometry::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcSurfaceOrFaceSurface; case 1: return Type::IfcSurfaceOrFaceSurface; } return IfcConnectionGeometry::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "SurfaceOnRelatingElement"; case 1: return "SurfaceOnRelatedElement"; } return IfcConnectionGeometry::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcConnectionSurfaceGeometry (IfcAbstractEntityPtr e);
-    IfcConnectionSurfaceGeometry (IfcSurfaceOrFaceSurface v1_SurfaceOnRelatingElement, boost::optional< IfcSurfaceOrFaceSurface > v2_SurfaceOnRelatedElement);
-    typedef IfcConnectionSurfaceGeometry* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcConnectionSurfaceGeometry > > list;
-    typedef IfcTemplatedEntityList< IfcConnectionSurfaceGeometry >::it it;
+    IfcConnectionSurfaceGeometry (IfcAbstractEntity* e);
+    IfcConnectionSurfaceGeometry (IfcSurfaceOrFaceSurface* v1_SurfaceOnRelatingElement, IfcSurfaceOrFaceSurface* v2_SurfaceOnRelatedElement);
+    typedef IfcTemplatedEntityList< IfcConnectionSurfaceGeometry > list;
 };
 /// An IfcConstraint is used to define a constraint or limiting value or boundary condition that may be applied to an object or to the value of a property.  
 /// 
@@ -6301,57 +7448,56 @@ class IfcConnectionSurfaceGeometry : public IfcConnectionGeometry {
 class IfcConstraint : public IfcUtil::IfcBaseEntity {
 public:
     /// A name to be used for the constraint (e.g., ChillerCoefficientOfPerformance).
-    IfcLabel Name();
-    void setName(IfcLabel v);
+    std::string Name() const;
+    void setName(std::string v);
     /// Whether the optional attribute Description is defined for this IfcConstraint
-    bool hasDescription();
+    bool hasDescription() const;
     /// A description that may apply additional information about a constraint.
-    IfcText Description();
-    void setDescription(IfcText v);
+    std::string Description() const;
+    void setDescription(std::string v);
     /// Enumeration that qualifies the type of constraint.
-    IfcConstraintEnum::IfcConstraintEnum ConstraintGrade();
+    IfcConstraintEnum::IfcConstraintEnum ConstraintGrade() const;
     void setConstraintGrade(IfcConstraintEnum::IfcConstraintEnum v);
     /// Whether the optional attribute ConstraintSource is defined for this IfcConstraint
-    bool hasConstraintSource();
+    bool hasConstraintSource() const;
     /// Any source material, such as a code or standard, from which the constraint originated.
-    IfcLabel ConstraintSource();
-    void setConstraintSource(IfcLabel v);
+    std::string ConstraintSource() const;
+    void setConstraintSource(std::string v);
     /// Whether the optional attribute CreatingActor is defined for this IfcConstraint
-    bool hasCreatingActor();
+    bool hasCreatingActor() const;
     /// Person and/or organization that has created the constraint.
-    IfcActorSelect CreatingActor();
-    void setCreatingActor(IfcActorSelect v);
+    IfcActorSelect* CreatingActor() const;
+    void setCreatingActor(IfcActorSelect* v);
     /// Whether the optional attribute CreationTime is defined for this IfcConstraint
-    bool hasCreationTime();
+    bool hasCreationTime() const;
     /// Time when information specifying the constraint instance was created.
     /// 
     /// Note IFC2x4 CHANGE: Attribute data type changed to IfcDateTime using ISO 8601 representation
-    IfcDateTimeSelect CreationTime();
-    void setCreationTime(IfcDateTimeSelect v);
+    IfcDateTimeSelect* CreationTime() const;
+    void setCreationTime(IfcDateTimeSelect* v);
     /// Whether the optional attribute UserDefinedGrade is defined for this IfcConstraint
-    bool hasUserDefinedGrade();
+    bool hasUserDefinedGrade() const;
     /// Allows for specification of user defined grade of the constraint  beyond the enumeration values (hard, soft, advisory) provided by ConstraintGrade attribute of type IfcConstraintEnum. 
     /// When a value is provided for attribute UserDefinedGrade in parallel the attribute ConstraintGrade shall have enumeration value USERDEFINED.
-    IfcLabel UserDefinedGrade();
-    void setUserDefinedGrade(IfcLabel v);
+    std::string UserDefinedGrade() const;
+    void setUserDefinedGrade(std::string v);
     virtual unsigned int getArgumentCount() const { return 7; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_STRING; case 1: return IfcUtil::Argument_STRING; case 2: return IfcUtil::Argument_ENUMERATION; case 3: return IfcUtil::Argument_STRING; case 4: return IfcUtil::Argument_ENTITY; case 5: return IfcUtil::Argument_ENTITY; case 6: return IfcUtil::Argument_STRING; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcLabel; case 1: return Type::IfcText; case 2: return Type::IfcConstraintEnum; case 3: return Type::IfcLabel; case 4: return Type::IfcActorSelect; case 5: return Type::IfcDateTimeSelect; case 6: return Type::IfcLabel; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Name"; case 1: return "Description"; case 2: return "ConstraintGrade"; case 3: return "ConstraintSource"; case 4: return "CreatingActor"; case 5: return "CreationTime"; case 6: return "UserDefinedGrade"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcConstraintClassificationRelationship > > ClassifiedAs(); // INVERSE IfcConstraintClassificationRelationship::ClassifiedConstraint
-    SHARED_PTR< IfcTemplatedEntityList< IfcConstraintRelationship > > RelatesConstraints(); // INVERSE IfcConstraintRelationship::RelatingConstraint
-    SHARED_PTR< IfcTemplatedEntityList< IfcConstraintRelationship > > IsRelatedWith(); // INVERSE IfcConstraintRelationship::RelatedConstraints
-    SHARED_PTR< IfcTemplatedEntityList< IfcPropertyConstraintRelationship > > PropertiesForConstraint(); // INVERSE IfcPropertyConstraintRelationship::RelatingConstraint
-    SHARED_PTR< IfcTemplatedEntityList< IfcConstraintAggregationRelationship > > Aggregates(); // INVERSE IfcConstraintAggregationRelationship::RelatingConstraint
-    SHARED_PTR< IfcTemplatedEntityList< IfcConstraintAggregationRelationship > > IsAggregatedIn(); // INVERSE IfcConstraintAggregationRelationship::RelatedConstraints
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcConstraintClassificationRelationship >::ptr ClassifiedAs() const; // INVERSE IfcConstraintClassificationRelationship::ClassifiedConstraint
+    IfcTemplatedEntityList< IfcConstraintRelationship >::ptr RelatesConstraints() const; // INVERSE IfcConstraintRelationship::RelatingConstraint
+    IfcTemplatedEntityList< IfcConstraintRelationship >::ptr IsRelatedWith() const; // INVERSE IfcConstraintRelationship::RelatedConstraints
+    IfcTemplatedEntityList< IfcPropertyConstraintRelationship >::ptr PropertiesForConstraint() const; // INVERSE IfcPropertyConstraintRelationship::RelatingConstraint
+    IfcTemplatedEntityList< IfcConstraintAggregationRelationship >::ptr Aggregates() const; // INVERSE IfcConstraintAggregationRelationship::RelatingConstraint
+    IfcTemplatedEntityList< IfcConstraintAggregationRelationship >::ptr IsAggregatedIn() const; // INVERSE IfcConstraintAggregationRelationship::RelatedConstraints
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcConstraint (IfcAbstractEntityPtr e);
-    IfcConstraint (IfcLabel v1_Name, boost::optional< IfcText > v2_Description, IfcConstraintEnum::IfcConstraintEnum v3_ConstraintGrade, boost::optional< IfcLabel > v4_ConstraintSource, boost::optional< IfcActorSelect > v5_CreatingActor, boost::optional< IfcDateTimeSelect > v6_CreationTime, boost::optional< IfcLabel > v7_UserDefinedGrade);
-    typedef IfcConstraint* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcConstraint > > list;
-    typedef IfcTemplatedEntityList< IfcConstraint >::it it;
+    IfcConstraint (IfcAbstractEntity* e);
+    IfcConstraint (std::string v1_Name, boost::optional< std::string > v2_Description, IfcConstraintEnum::IfcConstraintEnum v3_ConstraintGrade, boost::optional< std::string > v4_ConstraintSource, IfcActorSelect* v5_CreatingActor, IfcDateTimeSelect* v6_CreationTime, boost::optional< std::string > v7_UserDefinedGrade);
+    typedef IfcTemplatedEntityList< IfcConstraint > list;
 };
 /// An IfcConstraintAggregationRelationship is an objectified relationship that enables instances of IfcConstraint subtypes to be aggregated together logically. 
 /// 
@@ -6367,52 +7513,50 @@ class IfcConstraint : public IfcUtil::IfcBaseEntity {
 class IfcConstraintAggregationRelationship : public IfcUtil::IfcBaseEntity {
 public:
     /// Whether the optional attribute Name is defined for this IfcConstraintAggregationRelationship
-    bool hasName();
-    IfcLabel Name();
-    void setName(IfcLabel v);
+    bool hasName() const;
+    std::string Name() const;
+    void setName(std::string v);
     /// Whether the optional attribute Description is defined for this IfcConstraintAggregationRelationship
-    bool hasDescription();
-    IfcText Description();
-    void setDescription(IfcText v);
-    IfcConstraint* RelatingConstraint();
+    bool hasDescription() const;
+    std::string Description() const;
+    void setDescription(std::string v);
+    IfcConstraint* RelatingConstraint() const;
     void setRelatingConstraint(IfcConstraint* v);
-    SHARED_PTR< IfcTemplatedEntityList< IfcConstraint > > RelatedConstraints();
-    void setRelatedConstraints(SHARED_PTR< IfcTemplatedEntityList< IfcConstraint > > v);
+    IfcTemplatedEntityList< IfcConstraint >::ptr RelatedConstraints() const;
+    void setRelatedConstraints(IfcTemplatedEntityList< IfcConstraint >::ptr v);
     /// Enumeration that identifies the logical type of aggregation.
-    IfcLogicalOperatorEnum::IfcLogicalOperatorEnum LogicalAggregator();
+    IfcLogicalOperatorEnum::IfcLogicalOperatorEnum LogicalAggregator() const;
     void setLogicalAggregator(IfcLogicalOperatorEnum::IfcLogicalOperatorEnum v);
     virtual unsigned int getArgumentCount() const { return 5; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_STRING; case 1: return IfcUtil::Argument_STRING; case 2: return IfcUtil::Argument_ENTITY; case 3: return IfcUtil::Argument_ENTITY_LIST; case 4: return IfcUtil::Argument_ENUMERATION; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcLabel; case 1: return Type::IfcText; case 2: return Type::IfcConstraint; case 3: return Type::IfcConstraint; case 4: return Type::IfcLogicalOperatorEnum; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Name"; case 1: return "Description"; case 2: return "RelatingConstraint"; case 3: return "RelatedConstraints"; case 4: return "LogicalAggregator"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcConstraintAggregationRelationship (IfcAbstractEntityPtr e);
-    IfcConstraintAggregationRelationship (boost::optional< IfcLabel > v1_Name, boost::optional< IfcText > v2_Description, IfcConstraint* v3_RelatingConstraint, SHARED_PTR< IfcTemplatedEntityList< IfcConstraint > > v4_RelatedConstraints, IfcLogicalOperatorEnum::IfcLogicalOperatorEnum v5_LogicalAggregator);
-    typedef IfcConstraintAggregationRelationship* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcConstraintAggregationRelationship > > list;
-    typedef IfcTemplatedEntityList< IfcConstraintAggregationRelationship >::it it;
+    IfcConstraintAggregationRelationship (IfcAbstractEntity* e);
+    IfcConstraintAggregationRelationship (boost::optional< std::string > v1_Name, boost::optional< std::string > v2_Description, IfcConstraint* v3_RelatingConstraint, IfcTemplatedEntityList< IfcConstraint >::ptr v4_RelatedConstraints, IfcLogicalOperatorEnum::IfcLogicalOperatorEnum v5_LogicalAggregator);
+    typedef IfcTemplatedEntityList< IfcConstraintAggregationRelationship > list;
 };
 
 class IfcConstraintClassificationRelationship : public IfcUtil::IfcBaseEntity {
 public:
-    IfcConstraint* ClassifiedConstraint();
+    IfcConstraint* ClassifiedConstraint() const;
     void setClassifiedConstraint(IfcConstraint* v);
-    SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > RelatedClassifications();
-    void setRelatedClassifications(SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > v);
+    IfcEntityList::ptr RelatedClassifications() const;
+    void setRelatedClassifications(IfcEntityList::ptr v);
     virtual unsigned int getArgumentCount() const { return 2; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY; case 1: return IfcUtil::Argument_ENTITY_LIST; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcConstraint; case 1: return Type::IfcClassificationNotationSelect; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "ClassifiedConstraint"; case 1: return "RelatedClassifications"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcConstraintClassificationRelationship (IfcAbstractEntityPtr e);
-    IfcConstraintClassificationRelationship (IfcConstraint* v1_ClassifiedConstraint, IfcEntities v2_RelatedClassifications);
-    typedef IfcConstraintClassificationRelationship* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcConstraintClassificationRelationship > > list;
-    typedef IfcTemplatedEntityList< IfcConstraintClassificationRelationship >::it it;
+    IfcConstraintClassificationRelationship (IfcAbstractEntity* e);
+    IfcConstraintClassificationRelationship (IfcConstraint* v1_ClassifiedConstraint, IfcEntityList::ptr v2_RelatedClassifications);
+    typedef IfcTemplatedEntityList< IfcConstraintClassificationRelationship > list;
 };
 /// An IfcConstraintRelationship is an objectified relationship that enables instances of IfcConstraint and its
 /// subtypes to be associated to each other. Logical aggregation of instances of IfcConstraint and its subtypes is handled by the subtype IfcConstraintAggregationRelationship.
@@ -6426,55 +7570,53 @@ class IfcConstraintClassificationRelationship : public IfcUtil::IfcBaseEntity {
 class IfcConstraintRelationship : public IfcUtil::IfcBaseEntity {
 public:
     /// Whether the optional attribute Name is defined for this IfcConstraintRelationship
-    bool hasName();
-    IfcLabel Name();
-    void setName(IfcLabel v);
+    bool hasName() const;
+    std::string Name() const;
+    void setName(std::string v);
     /// Whether the optional attribute Description is defined for this IfcConstraintRelationship
-    bool hasDescription();
-    IfcText Description();
-    void setDescription(IfcText v);
+    bool hasDescription() const;
+    std::string Description() const;
+    void setDescription(std::string v);
     /// Constraint with which the other Constraints referenced by attribute RelatedConstraints are related.
-    IfcConstraint* RelatingConstraint();
+    IfcConstraint* RelatingConstraint() const;
     void setRelatingConstraint(IfcConstraint* v);
     /// Constraints that are related with the one referenced as RelatingConstraint.
-    SHARED_PTR< IfcTemplatedEntityList< IfcConstraint > > RelatedConstraints();
-    void setRelatedConstraints(SHARED_PTR< IfcTemplatedEntityList< IfcConstraint > > v);
+    IfcTemplatedEntityList< IfcConstraint >::ptr RelatedConstraints() const;
+    void setRelatedConstraints(IfcTemplatedEntityList< IfcConstraint >::ptr v);
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_STRING; case 1: return IfcUtil::Argument_STRING; case 2: return IfcUtil::Argument_ENTITY; case 3: return IfcUtil::Argument_ENTITY_LIST; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcLabel; case 1: return Type::IfcText; case 2: return Type::IfcConstraint; case 3: return Type::IfcConstraint; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Name"; case 1: return "Description"; case 2: return "RelatingConstraint"; case 3: return "RelatedConstraints"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcConstraintRelationship (IfcAbstractEntityPtr e);
-    IfcConstraintRelationship (boost::optional< IfcLabel > v1_Name, boost::optional< IfcText > v2_Description, IfcConstraint* v3_RelatingConstraint, SHARED_PTR< IfcTemplatedEntityList< IfcConstraint > > v4_RelatedConstraints);
-    typedef IfcConstraintRelationship* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcConstraintRelationship > > list;
-    typedef IfcTemplatedEntityList< IfcConstraintRelationship >::it it;
+    IfcConstraintRelationship (IfcAbstractEntity* e);
+    IfcConstraintRelationship (boost::optional< std::string > v1_Name, boost::optional< std::string > v2_Description, IfcConstraint* v3_RelatingConstraint, IfcTemplatedEntityList< IfcConstraint >::ptr v4_RelatedConstraints);
+    typedef IfcTemplatedEntityList< IfcConstraintRelationship > list;
 };
 
 class IfcCoordinatedUniversalTimeOffset : public IfcUtil::IfcBaseEntity {
 public:
-    IfcHourInDay HourOffset();
-    void setHourOffset(IfcHourInDay v);
+    int HourOffset() const;
+    void setHourOffset(int v);
     /// Whether the optional attribute MinuteOffset is defined for this IfcCoordinatedUniversalTimeOffset
-    bool hasMinuteOffset();
-    IfcMinuteInHour MinuteOffset();
-    void setMinuteOffset(IfcMinuteInHour v);
-    IfcAheadOrBehind::IfcAheadOrBehind Sense();
+    bool hasMinuteOffset() const;
+    int MinuteOffset() const;
+    void setMinuteOffset(int v);
+    IfcAheadOrBehind::IfcAheadOrBehind Sense() const;
     void setSense(IfcAheadOrBehind::IfcAheadOrBehind v);
     virtual unsigned int getArgumentCount() const { return 3; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_INT; case 1: return IfcUtil::Argument_INT; case 2: return IfcUtil::Argument_ENUMERATION; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcHourInDay; case 1: return Type::IfcMinuteInHour; case 2: return Type::IfcAheadOrBehind; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "HourOffset"; case 1: return "MinuteOffset"; case 2: return "Sense"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcCoordinatedUniversalTimeOffset (IfcAbstractEntityPtr e);
-    IfcCoordinatedUniversalTimeOffset (IfcHourInDay v1_HourOffset, boost::optional< IfcMinuteInHour > v2_MinuteOffset, IfcAheadOrBehind::IfcAheadOrBehind v3_Sense);
-    typedef IfcCoordinatedUniversalTimeOffset* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcCoordinatedUniversalTimeOffset > > list;
-    typedef IfcTemplatedEntityList< IfcCoordinatedUniversalTimeOffset >::it it;
+    IfcCoordinatedUniversalTimeOffset (IfcAbstractEntity* e);
+    IfcCoordinatedUniversalTimeOffset (int v1_HourOffset, boost::optional< int > v2_MinuteOffset, IfcAheadOrBehind::IfcAheadOrBehind v3_Sense);
+    typedef IfcTemplatedEntityList< IfcCoordinatedUniversalTimeOffset > list;
 };
 /// IfcCostValue is an amount of money or a value that affects an amount of money. 
 /// 
@@ -6525,25 +7667,24 @@ class IfcCostValue : public IfcAppliedValue {
     /// NOTE: There are many possible types of cost value that may be identified. Whilst there is a broad understanding of the meaning of names that may be assigned to different types of costs, there is no general standard for naming cost types nor are there any broadly defined classifications. To allow for any type of cost value, the IfcLabel datatype is assigned.
     /// 
     /// In the absence of any well defined standard, it is recommended that local agreements should be made to define allowable and understandable cost value types within a project or region.
-    IfcLabel CostType();
-    void setCostType(IfcLabel v);
+    std::string CostType() const;
+    void setCostType(std::string v);
     /// Whether the optional attribute Condition is defined for this IfcCostValue
-    bool hasCondition();
+    bool hasCondition() const;
     /// The condition under which a cost value applies.
-    IfcText Condition();
-    void setCondition(IfcText v);
+    std::string Condition() const;
+    void setCondition(std::string v);
     virtual unsigned int getArgumentCount() const { return 8; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 6: return IfcUtil::Argument_STRING; case 7: return IfcUtil::Argument_STRING; } return IfcAppliedValue::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 6: return Type::IfcLabel; case 7: return Type::IfcText; } return IfcAppliedValue::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 6: return "CostType"; case 7: return "Condition"; } return IfcAppliedValue::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcCostValue (IfcAbstractEntityPtr e);
-    IfcCostValue (boost::optional< IfcLabel > v1_Name, boost::optional< IfcText > v2_Description, boost::optional< IfcAppliedValueSelect > v3_AppliedValue, IfcMeasureWithUnit* v4_UnitBasis, boost::optional< IfcDateTimeSelect > v5_ApplicableDate, boost::optional< IfcDateTimeSelect > v6_FixedUntilDate, IfcLabel v7_CostType, boost::optional< IfcText > v8_Condition);
-    typedef IfcCostValue* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcCostValue > > list;
-    typedef IfcTemplatedEntityList< IfcCostValue >::it it;
+    IfcCostValue (IfcAbstractEntity* e);
+    IfcCostValue (boost::optional< std::string > v1_Name, boost::optional< std::string > v2_Description, IfcAppliedValueSelect* v3_AppliedValue, IfcMeasureWithUnit* v4_UnitBasis, IfcDateTimeSelect* v5_ApplicableDate, IfcDateTimeSelect* v6_FixedUntilDate, std::string v7_CostType, boost::optional< std::string > v8_Condition);
+    typedef IfcTemplatedEntityList< IfcCostValue > list;
 };
 /// IfcCurrencyRelationship defines the rate of exchange
 /// that applies between two designated currencies at a particular time
@@ -6559,36 +7700,35 @@ class IfcCostValue : public IfcAppliedValue {
 class IfcCurrencyRelationship : public IfcUtil::IfcBaseEntity {
 public:
     /// The monetary unit from which an exchange is derived. For instance, in the case of a conversion from GBP to USD, the relating monetary unit is GBP.
-    IfcMonetaryUnit* RelatingMonetaryUnit();
+    IfcMonetaryUnit* RelatingMonetaryUnit() const;
     void setRelatingMonetaryUnit(IfcMonetaryUnit* v);
     /// The monetary unit to which an exchange results. For instance, in the case of a conversion from GBP to USD, the related monetary unit is USD.
-    IfcMonetaryUnit* RelatedMonetaryUnit();
+    IfcMonetaryUnit* RelatedMonetaryUnit() const;
     void setRelatedMonetaryUnit(IfcMonetaryUnit* v);
     /// The currently agreed ratio of the amount of a related monetary unit that is equivalent to a unit amount of the relating monetary unit in a currency relationship. For instance, in the case of a conversion from GBP to USD, the value of the exchange rate may be 1.486 (USD) : 1 (GBP).
-    IfcPositiveRatioMeasure ExchangeRate();
-    void setExchangeRate(IfcPositiveRatioMeasure v);
+    double ExchangeRate() const;
+    void setExchangeRate(double v);
     /// The date and time at which an exchange rate applies.
     /// 
     /// IFC2x4 CHANGE Type changed from IfcDateTimeSelect. Attribute made optional.
-    IfcDateAndTime* RateDateTime();
+    IfcDateAndTime* RateDateTime() const;
     void setRateDateTime(IfcDateAndTime* v);
     /// Whether the optional attribute RateSource is defined for this IfcCurrencyRelationship
-    bool hasRateSource();
+    bool hasRateSource() const;
     /// The source from which an exchange rate is obtained.
-    IfcLibraryInformation* RateSource();
+    IfcLibraryInformation* RateSource() const;
     void setRateSource(IfcLibraryInformation* v);
     virtual unsigned int getArgumentCount() const { return 5; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY; case 1: return IfcUtil::Argument_ENTITY; case 2: return IfcUtil::Argument_DOUBLE; case 3: return IfcUtil::Argument_ENTITY; case 4: return IfcUtil::Argument_ENTITY; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcMonetaryUnit; case 1: return Type::IfcMonetaryUnit; case 2: return Type::IfcPositiveRatioMeasure; case 3: return Type::IfcDateAndTime; case 4: return Type::IfcLibraryInformation; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "RelatingMonetaryUnit"; case 1: return "RelatedMonetaryUnit"; case 2: return "ExchangeRate"; case 3: return "RateDateTime"; case 4: return "RateSource"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcCurrencyRelationship (IfcAbstractEntityPtr e);
-    IfcCurrencyRelationship (IfcMonetaryUnit* v1_RelatingMonetaryUnit, IfcMonetaryUnit* v2_RelatedMonetaryUnit, IfcPositiveRatioMeasure v3_ExchangeRate, IfcDateAndTime* v4_RateDateTime, IfcLibraryInformation* v5_RateSource);
-    typedef IfcCurrencyRelationship* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcCurrencyRelationship > > list;
-    typedef IfcTemplatedEntityList< IfcCurrencyRelationship >::it it;
+    IfcCurrencyRelationship (IfcAbstractEntity* e);
+    IfcCurrencyRelationship (IfcMonetaryUnit* v1_RelatingMonetaryUnit, IfcMonetaryUnit* v2_RelatedMonetaryUnit, double v3_ExchangeRate, IfcDateAndTime* v4_RateDateTime, IfcLibraryInformation* v5_RateSource);
+    typedef IfcTemplatedEntityList< IfcCurrencyRelationship > list;
 };
 /// Definition from ISO/CD 10303-46:1992: A curve style font combines several curve style font pattern entities into a more complex pattern. The resulting pattern is repeated along the curve. 
 /// 
@@ -6598,25 +7738,24 @@ class IfcCurrencyRelationship : public IfcUtil::IfcBaseEntity {
 class IfcCurveStyleFont : public IfcUtil::IfcBaseEntity {
 public:
     /// Whether the optional attribute Name is defined for this IfcCurveStyleFont
-    bool hasName();
+    bool hasName() const;
     /// Name that may be assigned with the curve font.
-    IfcLabel Name();
-    void setName(IfcLabel v);
+    std::string Name() const;
+    void setName(std::string v);
     /// A list of curve font pattern entities, that contains the simple patterns used for drawing curves. The patterns are applied in the order they occur in the list.
-    SHARED_PTR< IfcTemplatedEntityList< IfcCurveStyleFontPattern > > PatternList();
-    void setPatternList(SHARED_PTR< IfcTemplatedEntityList< IfcCurveStyleFontPattern > > v);
+    IfcTemplatedEntityList< IfcCurveStyleFontPattern >::ptr PatternList() const;
+    void setPatternList(IfcTemplatedEntityList< IfcCurveStyleFontPattern >::ptr v);
     virtual unsigned int getArgumentCount() const { return 2; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_STRING; case 1: return IfcUtil::Argument_ENTITY_LIST; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcLabel; case 1: return Type::IfcCurveStyleFontPattern; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Name"; case 1: return "PatternList"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcCurveStyleFont (IfcAbstractEntityPtr e);
-    IfcCurveStyleFont (boost::optional< IfcLabel > v1_Name, SHARED_PTR< IfcTemplatedEntityList< IfcCurveStyleFontPattern > > v2_PatternList);
-    typedef IfcCurveStyleFont* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcCurveStyleFont > > list;
-    typedef IfcTemplatedEntityList< IfcCurveStyleFont >::it it;
+    IfcCurveStyleFont (IfcAbstractEntity* e);
+    IfcCurveStyleFont (boost::optional< std::string > v1_Name, IfcTemplatedEntityList< IfcCurveStyleFontPattern >::ptr v2_PatternList);
+    typedef IfcTemplatedEntityList< IfcCurveStyleFont > list;
 };
 /// Definition from ISO/CD 10303-46:1992: A curve style font and scaling is a curve style font and a scalar factor for that font, so that a given curve style font may be applied at various scales.
 /// 
@@ -6632,28 +7771,27 @@ class IfcCurveStyleFont : public IfcUtil::IfcBaseEntity {
 class IfcCurveStyleFontAndScaling : public IfcUtil::IfcBaseEntity {
 public:
     /// Whether the optional attribute Name is defined for this IfcCurveStyleFontAndScaling
-    bool hasName();
+    bool hasName() const;
     /// Name that may be assigned with the scaling of a curve font.
-    IfcLabel Name();
-    void setName(IfcLabel v);
+    std::string Name() const;
+    void setName(std::string v);
     /// The curve font to be scaled.
-    IfcCurveStyleFontSelect CurveFont();
-    void setCurveFont(IfcCurveStyleFontSelect v);
+    IfcCurveStyleFontSelect* CurveFont() const;
+    void setCurveFont(IfcCurveStyleFontSelect* v);
     /// The scale factor.
-    IfcPositiveRatioMeasure CurveFontScaling();
-    void setCurveFontScaling(IfcPositiveRatioMeasure v);
+    double CurveFontScaling() const;
+    void setCurveFontScaling(double v);
     virtual unsigned int getArgumentCount() const { return 3; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_STRING; case 1: return IfcUtil::Argument_ENTITY; case 2: return IfcUtil::Argument_DOUBLE; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcLabel; case 1: return Type::IfcCurveStyleFontSelect; case 2: return Type::IfcPositiveRatioMeasure; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Name"; case 1: return "CurveFont"; case 2: return "CurveFontScaling"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcCurveStyleFontAndScaling (IfcAbstractEntityPtr e);
-    IfcCurveStyleFontAndScaling (boost::optional< IfcLabel > v1_Name, IfcCurveStyleFontSelect v2_CurveFont, IfcPositiveRatioMeasure v3_CurveFontScaling);
-    typedef IfcCurveStyleFontAndScaling* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcCurveStyleFontAndScaling > > list;
-    typedef IfcTemplatedEntityList< IfcCurveStyleFontAndScaling >::it it;
+    IfcCurveStyleFontAndScaling (IfcAbstractEntity* e);
+    IfcCurveStyleFontAndScaling (boost::optional< std::string > v1_Name, IfcCurveStyleFontSelect* v2_CurveFont, double v3_CurveFontScaling);
+    typedef IfcTemplatedEntityList< IfcCurveStyleFontAndScaling > list;
 };
 /// Definition from ISO/CD 10303-46:1992: A curve style font pattern is a pair of visible and invisible curve segment length measures in presentation area units. 
 /// 
@@ -6667,43 +7805,41 @@ class IfcCurveStyleFontPattern : public IfcUtil::IfcBaseEntity {
     /// NOTE  For a visible segment representing a point, the value 0. should be assigned.
     /// 
     /// IFC2x Edition 3 CHANGE  The datatype has been changed to IfcLengthMeasure with upward compatibility for file-based exchange.
-    IfcLengthMeasure VisibleSegmentLength();
-    void setVisibleSegmentLength(IfcLengthMeasure v);
+    double VisibleSegmentLength() const;
+    void setVisibleSegmentLength(double v);
     /// The length of the invisible segment in the pattern definition.
-    IfcPositiveLengthMeasure InvisibleSegmentLength();
-    void setInvisibleSegmentLength(IfcPositiveLengthMeasure v);
+    double InvisibleSegmentLength() const;
+    void setInvisibleSegmentLength(double v);
     virtual unsigned int getArgumentCount() const { return 2; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_DOUBLE; case 1: return IfcUtil::Argument_DOUBLE; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcLengthMeasure; case 1: return Type::IfcPositiveLengthMeasure; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "VisibleSegmentLength"; case 1: return "InvisibleSegmentLength"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcCurveStyleFontPattern (IfcAbstractEntityPtr e);
-    IfcCurveStyleFontPattern (IfcLengthMeasure v1_VisibleSegmentLength, IfcPositiveLengthMeasure v2_InvisibleSegmentLength);
-    typedef IfcCurveStyleFontPattern* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcCurveStyleFontPattern > > list;
-    typedef IfcTemplatedEntityList< IfcCurveStyleFontPattern >::it it;
+    IfcCurveStyleFontPattern (IfcAbstractEntity* e);
+    IfcCurveStyleFontPattern (double v1_VisibleSegmentLength, double v2_InvisibleSegmentLength);
+    typedef IfcTemplatedEntityList< IfcCurveStyleFontPattern > list;
 };
 
 class IfcDateAndTime : public IfcUtil::IfcBaseEntity {
 public:
-    IfcCalendarDate* DateComponent();
+    IfcCalendarDate* DateComponent() const;
     void setDateComponent(IfcCalendarDate* v);
-    IfcLocalTime* TimeComponent();
+    IfcLocalTime* TimeComponent() const;
     void setTimeComponent(IfcLocalTime* v);
     virtual unsigned int getArgumentCount() const { return 2; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY; case 1: return IfcUtil::Argument_ENTITY; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcCalendarDate; case 1: return Type::IfcLocalTime; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "DateComponent"; case 1: return "TimeComponent"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcDateAndTime (IfcAbstractEntityPtr e);
+    IfcDateAndTime (IfcAbstractEntity* e);
     IfcDateAndTime (IfcCalendarDate* v1_DateComponent, IfcLocalTime* v2_TimeComponent);
-    typedef IfcDateAndTime* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcDateAndTime > > list;
-    typedef IfcTemplatedEntityList< IfcDateAndTime >::it it;
+    typedef IfcTemplatedEntityList< IfcDateAndTime > list;
 };
 /// Definition from ISO/CD 10303-41:1992: A derived unit is an expression of units.
 /// 
@@ -6715,27 +7851,26 @@ class IfcDateAndTime : public IfcUtil::IfcBaseEntity {
 class IfcDerivedUnit : public IfcUtil::IfcBaseEntity {
 public:
     /// The group of units and their exponents that define the derived unit.
-    SHARED_PTR< IfcTemplatedEntityList< IfcDerivedUnitElement > > Elements();
-    void setElements(SHARED_PTR< IfcTemplatedEntityList< IfcDerivedUnitElement > > v);
+    IfcTemplatedEntityList< IfcDerivedUnitElement >::ptr Elements() const;
+    void setElements(IfcTemplatedEntityList< IfcDerivedUnitElement >::ptr v);
     /// Name of the derived unit chosen from an enumeration of derived unit types for use in IFC models.
-    IfcDerivedUnitEnum::IfcDerivedUnitEnum UnitType();
+    IfcDerivedUnitEnum::IfcDerivedUnitEnum UnitType() const;
     void setUnitType(IfcDerivedUnitEnum::IfcDerivedUnitEnum v);
     /// Whether the optional attribute UserDefinedType is defined for this IfcDerivedUnit
-    bool hasUserDefinedType();
-    IfcLabel UserDefinedType();
-    void setUserDefinedType(IfcLabel v);
+    bool hasUserDefinedType() const;
+    std::string UserDefinedType() const;
+    void setUserDefinedType(std::string v);
     virtual unsigned int getArgumentCount() const { return 3; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY_LIST; case 1: return IfcUtil::Argument_ENUMERATION; case 2: return IfcUtil::Argument_STRING; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcDerivedUnitElement; case 1: return Type::IfcDerivedUnitEnum; case 2: return Type::IfcLabel; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Elements"; case 1: return "UnitType"; case 2: return "UserDefinedType"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcDerivedUnit (IfcAbstractEntityPtr e);
-    IfcDerivedUnit (SHARED_PTR< IfcTemplatedEntityList< IfcDerivedUnitElement > > v1_Elements, IfcDerivedUnitEnum::IfcDerivedUnitEnum v2_UnitType, boost::optional< IfcLabel > v3_UserDefinedType);
-    typedef IfcDerivedUnit* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcDerivedUnit > > list;
-    typedef IfcTemplatedEntityList< IfcDerivedUnit >::it it;
+    IfcDerivedUnit (IfcAbstractEntity* e);
+    IfcDerivedUnit (IfcTemplatedEntityList< IfcDerivedUnitElement >::ptr v1_Elements, IfcDerivedUnitEnum::IfcDerivedUnitEnum v2_UnitType, boost::optional< std::string > v3_UserDefinedType);
+    typedef IfcTemplatedEntityList< IfcDerivedUnit > list;
 };
 /// Definition from ISO/CD 10303-41:1992: A derived unit element is one of the unit quantities 
 /// which makes up a derived unit.
@@ -6749,23 +7884,22 @@ class IfcDerivedUnit : public IfcUtil::IfcBaseEntity {
 class IfcDerivedUnitElement : public IfcUtil::IfcBaseEntity {
 public:
     /// The fixed quantity which is used as the mathematical factor.
-    IfcNamedUnit* Unit();
+    IfcNamedUnit* Unit() const;
     void setUnit(IfcNamedUnit* v);
     /// The power that is applied to the unit attribute.
-    int Exponent();
+    int Exponent() const;
     void setExponent(int v);
     virtual unsigned int getArgumentCount() const { return 2; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY; case 1: return IfcUtil::Argument_INT; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcNamedUnit; case 1: return Type::UNDEFINED; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Unit"; case 1: return "Exponent"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcDerivedUnitElement (IfcAbstractEntityPtr e);
+    IfcDerivedUnitElement (IfcAbstractEntity* e);
     IfcDerivedUnitElement (IfcNamedUnit* v1_Unit, int v2_Exponent);
-    typedef IfcDerivedUnitElement* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcDerivedUnitElement > > list;
-    typedef IfcTemplatedEntityList< IfcDerivedUnitElement >::it it;
+    typedef IfcTemplatedEntityList< IfcDerivedUnitElement > list;
 };
 /// Definition from ISO/CD 10303-41:1992: The dimensionality of any quantity can be expressed as a product of powers of the dimensions of base quantities. 
 /// The dimensional exponents entity defines the powers of the dimensions of the base quantities. All the physical 
@@ -6787,38 +7921,37 @@ class IfcDerivedUnitElement : public IfcUtil::IfcBaseEntity {
 class IfcDimensionalExponents : public IfcUtil::IfcBaseEntity {
 public:
     /// The power of the length base quantity.
-    int LengthExponent();
+    int LengthExponent() const;
     void setLengthExponent(int v);
     /// The power of the mass base quantity.
-    int MassExponent();
+    int MassExponent() const;
     void setMassExponent(int v);
     /// The power of the time base quantity.
-    int TimeExponent();
+    int TimeExponent() const;
     void setTimeExponent(int v);
     /// The power of the electric current base quantity.
-    int ElectricCurrentExponent();
+    int ElectricCurrentExponent() const;
     void setElectricCurrentExponent(int v);
     /// The power of the thermodynamic temperature base quantity.
-    int ThermodynamicTemperatureExponent();
+    int ThermodynamicTemperatureExponent() const;
     void setThermodynamicTemperatureExponent(int v);
     /// The power of the amount of substance base quantity.
-    int AmountOfSubstanceExponent();
+    int AmountOfSubstanceExponent() const;
     void setAmountOfSubstanceExponent(int v);
     /// The power of the luminous intensity base quantity.
-    int LuminousIntensityExponent();
+    int LuminousIntensityExponent() const;
     void setLuminousIntensityExponent(int v);
     virtual unsigned int getArgumentCount() const { return 7; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_INT; case 1: return IfcUtil::Argument_INT; case 2: return IfcUtil::Argument_INT; case 3: return IfcUtil::Argument_INT; case 4: return IfcUtil::Argument_INT; case 5: return IfcUtil::Argument_INT; case 6: return IfcUtil::Argument_INT; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::UNDEFINED; case 1: return Type::UNDEFINED; case 2: return Type::UNDEFINED; case 3: return Type::UNDEFINED; case 4: return Type::UNDEFINED; case 5: return Type::UNDEFINED; case 6: return Type::UNDEFINED; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "LengthExponent"; case 1: return "MassExponent"; case 2: return "TimeExponent"; case 3: return "ElectricCurrentExponent"; case 4: return "ThermodynamicTemperatureExponent"; case 5: return "AmountOfSubstanceExponent"; case 6: return "LuminousIntensityExponent"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcDimensionalExponents (IfcAbstractEntityPtr e);
+    IfcDimensionalExponents (IfcAbstractEntity* e);
     IfcDimensionalExponents (int v1_LengthExponent, int v2_MassExponent, int v3_TimeExponent, int v4_ElectricCurrentExponent, int v5_ThermodynamicTemperatureExponent, int v6_AmountOfSubstanceExponent, int v7_LuminousIntensityExponent);
-    typedef IfcDimensionalExponents* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcDimensionalExponents > > list;
-    typedef IfcTemplatedEntityList< IfcDimensionalExponents >::it it;
+    typedef IfcTemplatedEntityList< IfcDimensionalExponents > list;
 };
 /// IfcDocumentElectronicFormat captures the type of document being referenced as an external source, and for which metadata is specified by IfcDocumentInformation. 
 /// 
@@ -6826,32 +7959,31 @@ class IfcDimensionalExponents : public IfcUtil::IfcBaseEntity {
 class IfcDocumentElectronicFormat : public IfcUtil::IfcBaseEntity {
 public:
     /// Whether the optional attribute FileExtension is defined for this IfcDocumentElectronicFormat
-    bool hasFileExtension();
+    bool hasFileExtension() const;
     /// File extension of electronic document used by computer operating system.
-    IfcLabel FileExtension();
-    void setFileExtension(IfcLabel v);
+    std::string FileExtension() const;
+    void setFileExtension(std::string v);
     /// Whether the optional attribute MimeContentType is defined for this IfcDocumentElectronicFormat
-    bool hasMimeContentType();
+    bool hasMimeContentType() const;
     /// Main Mime type (as published by W3C or as user defined application type).
-    IfcLabel MimeContentType();
-    void setMimeContentType(IfcLabel v);
+    std::string MimeContentType() const;
+    void setMimeContentType(std::string v);
     /// Whether the optional attribute MimeSubtype is defined for this IfcDocumentElectronicFormat
-    bool hasMimeSubtype();
+    bool hasMimeSubtype() const;
     /// Mime subtype information.
-    IfcLabel MimeSubtype();
-    void setMimeSubtype(IfcLabel v);
+    std::string MimeSubtype() const;
+    void setMimeSubtype(std::string v);
     virtual unsigned int getArgumentCount() const { return 3; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_STRING; case 1: return IfcUtil::Argument_STRING; case 2: return IfcUtil::Argument_STRING; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcLabel; case 1: return Type::IfcLabel; case 2: return Type::IfcLabel; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "FileExtension"; case 1: return "MimeContentType"; case 2: return "MimeSubtype"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcDocumentElectronicFormat (IfcAbstractEntityPtr e);
-    IfcDocumentElectronicFormat (boost::optional< IfcLabel > v1_FileExtension, boost::optional< IfcLabel > v2_MimeContentType, boost::optional< IfcLabel > v3_MimeSubtype);
-    typedef IfcDocumentElectronicFormat* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcDocumentElectronicFormat > > list;
-    typedef IfcTemplatedEntityList< IfcDocumentElectronicFormat >::it it;
+    IfcDocumentElectronicFormat (IfcAbstractEntity* e);
+    IfcDocumentElectronicFormat (boost::optional< std::string > v1_FileExtension, boost::optional< std::string > v2_MimeContentType, boost::optional< std::string > v3_MimeSubtype);
+    typedef IfcTemplatedEntityList< IfcDocumentElectronicFormat > list;
 };
 /// IfcDocumentInformation captures "metadata" of an external document. The actual content of the document is not defined in IFC; instead, it can be found following the reference given to IfcDocumentReference. 
 /// 
@@ -6859,111 +7991,110 @@ class IfcDocumentElectronicFormat : public IfcUtil::IfcBaseEntity {
 class IfcDocumentInformation : public IfcUtil::IfcBaseEntity {
 public:
     /// Identifier that uniquely identifies a document.
-    IfcIdentifier DocumentId();
-    void setDocumentId(IfcIdentifier v);
+    std::string DocumentId() const;
+    void setDocumentId(std::string v);
     /// File name or document name assigned by owner.
-    IfcLabel Name();
-    void setName(IfcLabel v);
+    std::string Name() const;
+    void setName(std::string v);
     /// Whether the optional attribute Description is defined for this IfcDocumentInformation
-    bool hasDescription();
+    bool hasDescription() const;
     /// Description of document and its content.
-    IfcText Description();
-    void setDescription(IfcText v);
+    std::string Description() const;
+    void setDescription(std::string v);
     /// Whether the optional attribute DocumentReferences is defined for this IfcDocumentInformation
-    bool hasDocumentReferences();
-    SHARED_PTR< IfcTemplatedEntityList< IfcDocumentReference > > DocumentReferences();
-    void setDocumentReferences(SHARED_PTR< IfcTemplatedEntityList< IfcDocumentReference > > v);
+    bool hasDocumentReferences() const;
+    IfcTemplatedEntityList< IfcDocumentReference >::ptr DocumentReferences() const;
+    void setDocumentReferences(IfcTemplatedEntityList< IfcDocumentReference >::ptr v);
     /// Whether the optional attribute Purpose is defined for this IfcDocumentInformation
-    bool hasPurpose();
+    bool hasPurpose() const;
     /// Purpose for this document.
-    IfcText Purpose();
-    void setPurpose(IfcText v);
+    std::string Purpose() const;
+    void setPurpose(std::string v);
     /// Whether the optional attribute IntendedUse is defined for this IfcDocumentInformation
-    bool hasIntendedUse();
+    bool hasIntendedUse() const;
     /// Intended use for this document.
-    IfcText IntendedUse();
-    void setIntendedUse(IfcText v);
+    std::string IntendedUse() const;
+    void setIntendedUse(std::string v);
     /// Whether the optional attribute Scope is defined for this IfcDocumentInformation
-    bool hasScope();
+    bool hasScope() const;
     /// Scope for this document.
-    IfcText Scope();
-    void setScope(IfcText v);
+    std::string Scope() const;
+    void setScope(std::string v);
     /// Whether the optional attribute Revision is defined for this IfcDocumentInformation
-    bool hasRevision();
+    bool hasRevision() const;
     /// Document revision designation.
-    IfcLabel Revision();
-    void setRevision(IfcLabel v);
+    std::string Revision() const;
+    void setRevision(std::string v);
     /// Whether the optional attribute DocumentOwner is defined for this IfcDocumentInformation
-    bool hasDocumentOwner();
+    bool hasDocumentOwner() const;
     /// Information about the person and/or organization acknowledged as the 'owner' of this document. In some contexts, the document owner determines who has access to or editing right to the document.
-    IfcActorSelect DocumentOwner();
-    void setDocumentOwner(IfcActorSelect v);
+    IfcActorSelect* DocumentOwner() const;
+    void setDocumentOwner(IfcActorSelect* v);
     /// Whether the optional attribute Editors is defined for this IfcDocumentInformation
-    bool hasEditors();
+    bool hasEditors() const;
     /// The persons and/or organizations who have created this document or contributed to it.
-    SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > Editors();
-    void setEditors(SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > v);
+    IfcEntityList::ptr Editors() const;
+    void setEditors(IfcEntityList::ptr v);
     /// Whether the optional attribute CreationTime is defined for this IfcDocumentInformation
-    bool hasCreationTime();
+    bool hasCreationTime() const;
     /// Date and time stamp when the document was originally created.
     /// 
     /// IFC2x4 CHANGE The data type has been changed to IfcDateTime, the date time string according to ISO8601.
-    IfcDateAndTime* CreationTime();
+    IfcDateAndTime* CreationTime() const;
     void setCreationTime(IfcDateAndTime* v);
     /// Whether the optional attribute LastRevisionTime is defined for this IfcDocumentInformation
-    bool hasLastRevisionTime();
+    bool hasLastRevisionTime() const;
     /// Date and time stamp when this document version was created.
     /// 
     /// IFC2x4 CHANGE The data type has been changed to IfcDateTime, the date time string according to ISO8601.
-    IfcDateAndTime* LastRevisionTime();
+    IfcDateAndTime* LastRevisionTime() const;
     void setLastRevisionTime(IfcDateAndTime* v);
     /// Whether the optional attribute ElectronicFormat is defined for this IfcDocumentInformation
-    bool hasElectronicFormat();
+    bool hasElectronicFormat() const;
     /// Describes the electronic format of the document being referenced, providing the file extension and the manner in which the content is provided.
-    IfcDocumentElectronicFormat* ElectronicFormat();
+    IfcDocumentElectronicFormat* ElectronicFormat() const;
     void setElectronicFormat(IfcDocumentElectronicFormat* v);
     /// Whether the optional attribute ValidFrom is defined for this IfcDocumentInformation
-    bool hasValidFrom();
+    bool hasValidFrom() const;
     /// Date when the document becomes valid.
     /// 
     /// IFC2x4 CHANGE The data type has been changed to IfcDate, the date string according to ISO8601.
-    IfcCalendarDate* ValidFrom();
+    IfcCalendarDate* ValidFrom() const;
     void setValidFrom(IfcCalendarDate* v);
     /// Whether the optional attribute ValidUntil is defined for this IfcDocumentInformation
-    bool hasValidUntil();
+    bool hasValidUntil() const;
     /// Date until which the document remains valid.
     /// 
     /// IFC2x4 CHANGE The data type has been changed to IfcDate, the date string according to ISO8601.
-    IfcCalendarDate* ValidUntil();
+    IfcCalendarDate* ValidUntil() const;
     void setValidUntil(IfcCalendarDate* v);
     /// Whether the optional attribute Confidentiality is defined for this IfcDocumentInformation
-    bool hasConfidentiality();
+    bool hasConfidentiality() const;
     /// The level of confidentiality of the document.
-    IfcDocumentConfidentialityEnum::IfcDocumentConfidentialityEnum Confidentiality();
+    IfcDocumentConfidentialityEnum::IfcDocumentConfidentialityEnum Confidentiality() const;
     void setConfidentiality(IfcDocumentConfidentialityEnum::IfcDocumentConfidentialityEnum v);
     /// Whether the optional attribute Status is defined for this IfcDocumentInformation
-    bool hasStatus();
+    bool hasStatus() const;
     /// The current status of the document. Examples of status values that might be used for a document information status include:
     /// - DRAFT
     /// - FINAL DRAFT
     /// - FINAL
     /// - REVISION
-    IfcDocumentStatusEnum::IfcDocumentStatusEnum Status();
+    IfcDocumentStatusEnum::IfcDocumentStatusEnum Status() const;
     void setStatus(IfcDocumentStatusEnum::IfcDocumentStatusEnum v);
     virtual unsigned int getArgumentCount() const { return 17; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_STRING; case 1: return IfcUtil::Argument_STRING; case 2: return IfcUtil::Argument_STRING; case 3: return IfcUtil::Argument_ENTITY_LIST; case 4: return IfcUtil::Argument_STRING; case 5: return IfcUtil::Argument_STRING; case 6: return IfcUtil::Argument_STRING; case 7: return IfcUtil::Argument_STRING; case 8: return IfcUtil::Argument_ENTITY; case 9: return IfcUtil::Argument_ENTITY_LIST; case 10: return IfcUtil::Argument_ENTITY; case 11: return IfcUtil::Argument_ENTITY; case 12: return IfcUtil::Argument_ENTITY; case 13: return IfcUtil::Argument_ENTITY; case 14: return IfcUtil::Argument_ENTITY; case 15: return IfcUtil::Argument_ENUMERATION; case 16: return IfcUtil::Argument_ENUMERATION; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcIdentifier; case 1: return Type::IfcLabel; case 2: return Type::IfcText; case 3: return Type::IfcDocumentReference; case 4: return Type::IfcText; case 5: return Type::IfcText; case 6: return Type::IfcText; case 7: return Type::IfcLabel; case 8: return Type::IfcActorSelect; case 9: return Type::IfcActorSelect; case 10: return Type::IfcDateAndTime; case 11: return Type::IfcDateAndTime; case 12: return Type::IfcDocumentElectronicFormat; case 13: return Type::IfcCalendarDate; case 14: return Type::IfcCalendarDate; case 15: return Type::IfcDocumentConfidentialityEnum; case 16: return Type::IfcDocumentStatusEnum; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "DocumentId"; case 1: return "Name"; case 2: return "Description"; case 3: return "DocumentReferences"; case 4: return "Purpose"; case 5: return "IntendedUse"; case 6: return "Scope"; case 7: return "Revision"; case 8: return "DocumentOwner"; case 9: return "Editors"; case 10: return "CreationTime"; case 11: return "LastRevisionTime"; case 12: return "ElectronicFormat"; case 13: return "ValidFrom"; case 14: return "ValidUntil"; case 15: return "Confidentiality"; case 16: return "Status"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcDocumentInformationRelationship > > IsPointedTo(); // INVERSE IfcDocumentInformationRelationship::RelatedDocuments
-    SHARED_PTR< IfcTemplatedEntityList< IfcDocumentInformationRelationship > > IsPointer(); // INVERSE IfcDocumentInformationRelationship::RelatingDocument
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcDocumentInformationRelationship >::ptr IsPointedTo() const; // INVERSE IfcDocumentInformationRelationship::RelatedDocuments
+    IfcTemplatedEntityList< IfcDocumentInformationRelationship >::ptr IsPointer() const; // INVERSE IfcDocumentInformationRelationship::RelatingDocument
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcDocumentInformation (IfcAbstractEntityPtr e);
-    IfcDocumentInformation (IfcIdentifier v1_DocumentId, IfcLabel v2_Name, boost::optional< IfcText > v3_Description, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcDocumentReference > > > v4_DocumentReferences, boost::optional< IfcText > v5_Purpose, boost::optional< IfcText > v6_IntendedUse, boost::optional< IfcText > v7_Scope, boost::optional< IfcLabel > v8_Revision, boost::optional< IfcActorSelect > v9_DocumentOwner, boost::optional< IfcEntities > v10_Editors, IfcDateAndTime* v11_CreationTime, IfcDateAndTime* v12_LastRevisionTime, IfcDocumentElectronicFormat* v13_ElectronicFormat, IfcCalendarDate* v14_ValidFrom, IfcCalendarDate* v15_ValidUntil, boost::optional< IfcDocumentConfidentialityEnum::IfcDocumentConfidentialityEnum > v16_Confidentiality, boost::optional< IfcDocumentStatusEnum::IfcDocumentStatusEnum > v17_Status);
-    typedef IfcDocumentInformation* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcDocumentInformation > > list;
-    typedef IfcTemplatedEntityList< IfcDocumentInformation >::it it;
+    IfcDocumentInformation (IfcAbstractEntity* e);
+    IfcDocumentInformation (std::string v1_DocumentId, std::string v2_Name, boost::optional< std::string > v3_Description, boost::optional< IfcTemplatedEntityList< IfcDocumentReference >::ptr > v4_DocumentReferences, boost::optional< std::string > v5_Purpose, boost::optional< std::string > v6_IntendedUse, boost::optional< std::string > v7_Scope, boost::optional< std::string > v8_Revision, IfcActorSelect* v9_DocumentOwner, boost::optional< IfcEntityList::ptr > v10_Editors, IfcDateAndTime* v11_CreationTime, IfcDateAndTime* v12_LastRevisionTime, IfcDocumentElectronicFormat* v13_ElectronicFormat, IfcCalendarDate* v14_ValidFrom, IfcCalendarDate* v15_ValidUntil, boost::optional< IfcDocumentConfidentialityEnum::IfcDocumentConfidentialityEnum > v16_Confidentiality, boost::optional< IfcDocumentStatusEnum::IfcDocumentStatusEnum > v17_Status);
+    typedef IfcTemplatedEntityList< IfcDocumentInformation > list;
 };
 /// An IfcDocumentInformationRelationship is a relationship class that enables a document to have the ability to reference other documents.
 /// 
@@ -6976,80 +8107,77 @@ class IfcDocumentInformation : public IfcUtil::IfcBaseEntity {
 class IfcDocumentInformationRelationship : public IfcUtil::IfcBaseEntity {
 public:
     /// The document that acts as the parent, referencing or original document in a relationship.
-    IfcDocumentInformation* RelatingDocument();
+    IfcDocumentInformation* RelatingDocument() const;
     void setRelatingDocument(IfcDocumentInformation* v);
     /// The document that acts as the child, referenced or replacing document in a relationship.
-    SHARED_PTR< IfcTemplatedEntityList< IfcDocumentInformation > > RelatedDocuments();
-    void setRelatedDocuments(SHARED_PTR< IfcTemplatedEntityList< IfcDocumentInformation > > v);
+    IfcTemplatedEntityList< IfcDocumentInformation >::ptr RelatedDocuments() const;
+    void setRelatedDocuments(IfcTemplatedEntityList< IfcDocumentInformation >::ptr v);
     /// Whether the optional attribute RelationshipType is defined for this IfcDocumentInformationRelationship
-    bool hasRelationshipType();
+    bool hasRelationshipType() const;
     /// Describes the type of relationship between documents. This could be sub-document, replacement etc. The interpretation has to be established in an application context.
-    IfcLabel RelationshipType();
-    void setRelationshipType(IfcLabel v);
+    std::string RelationshipType() const;
+    void setRelationshipType(std::string v);
     virtual unsigned int getArgumentCount() const { return 3; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY; case 1: return IfcUtil::Argument_ENTITY_LIST; case 2: return IfcUtil::Argument_STRING; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcDocumentInformation; case 1: return Type::IfcDocumentInformation; case 2: return Type::IfcLabel; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "RelatingDocument"; case 1: return "RelatedDocuments"; case 2: return "RelationshipType"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcDocumentInformationRelationship (IfcAbstractEntityPtr e);
-    IfcDocumentInformationRelationship (IfcDocumentInformation* v1_RelatingDocument, SHARED_PTR< IfcTemplatedEntityList< IfcDocumentInformation > > v2_RelatedDocuments, boost::optional< IfcLabel > v3_RelationshipType);
-    typedef IfcDocumentInformationRelationship* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcDocumentInformationRelationship > > list;
-    typedef IfcTemplatedEntityList< IfcDocumentInformationRelationship >::it it;
+    IfcDocumentInformationRelationship (IfcAbstractEntity* e);
+    IfcDocumentInformationRelationship (IfcDocumentInformation* v1_RelatingDocument, IfcTemplatedEntityList< IfcDocumentInformation >::ptr v2_RelatedDocuments, boost::optional< std::string > v3_RelationshipType);
+    typedef IfcTemplatedEntityList< IfcDocumentInformationRelationship > list;
 };
 
 class IfcDraughtingCalloutRelationship : public IfcUtil::IfcBaseEntity {
 public:
     /// Whether the optional attribute Name is defined for this IfcDraughtingCalloutRelationship
-    bool hasName();
-    IfcLabel Name();
-    void setName(IfcLabel v);
+    bool hasName() const;
+    std::string Name() const;
+    void setName(std::string v);
     /// Whether the optional attribute Description is defined for this IfcDraughtingCalloutRelationship
-    bool hasDescription();
-    IfcText Description();
-    void setDescription(IfcText v);
-    IfcDraughtingCallout* RelatingDraughtingCallout();
+    bool hasDescription() const;
+    std::string Description() const;
+    void setDescription(std::string v);
+    IfcDraughtingCallout* RelatingDraughtingCallout() const;
     void setRelatingDraughtingCallout(IfcDraughtingCallout* v);
-    IfcDraughtingCallout* RelatedDraughtingCallout();
+    IfcDraughtingCallout* RelatedDraughtingCallout() const;
     void setRelatedDraughtingCallout(IfcDraughtingCallout* v);
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_STRING; case 1: return IfcUtil::Argument_STRING; case 2: return IfcUtil::Argument_ENTITY; case 3: return IfcUtil::Argument_ENTITY; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcLabel; case 1: return Type::IfcText; case 2: return Type::IfcDraughtingCallout; case 3: return Type::IfcDraughtingCallout; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Name"; case 1: return "Description"; case 2: return "RelatingDraughtingCallout"; case 3: return "RelatedDraughtingCallout"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcDraughtingCalloutRelationship (IfcAbstractEntityPtr e);
-    IfcDraughtingCalloutRelationship (boost::optional< IfcLabel > v1_Name, boost::optional< IfcText > v2_Description, IfcDraughtingCallout* v3_RelatingDraughtingCallout, IfcDraughtingCallout* v4_RelatedDraughtingCallout);
-    typedef IfcDraughtingCalloutRelationship* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcDraughtingCalloutRelationship > > list;
-    typedef IfcTemplatedEntityList< IfcDraughtingCalloutRelationship >::it it;
+    IfcDraughtingCalloutRelationship (IfcAbstractEntity* e);
+    IfcDraughtingCalloutRelationship (boost::optional< std::string > v1_Name, boost::optional< std::string > v2_Description, IfcDraughtingCallout* v3_RelatingDraughtingCallout, IfcDraughtingCallout* v4_RelatedDraughtingCallout);
+    typedef IfcTemplatedEntityList< IfcDraughtingCalloutRelationship > list;
 };
 
 class IfcEnvironmentalImpactValue : public IfcAppliedValue {
 public:
-    IfcLabel ImpactType();
-    void setImpactType(IfcLabel v);
-    IfcEnvironmentalImpactCategoryEnum::IfcEnvironmentalImpactCategoryEnum Category();
+    std::string ImpactType() const;
+    void setImpactType(std::string v);
+    IfcEnvironmentalImpactCategoryEnum::IfcEnvironmentalImpactCategoryEnum Category() const;
     void setCategory(IfcEnvironmentalImpactCategoryEnum::IfcEnvironmentalImpactCategoryEnum v);
     /// Whether the optional attribute UserDefinedCategory is defined for this IfcEnvironmentalImpactValue
-    bool hasUserDefinedCategory();
-    IfcLabel UserDefinedCategory();
-    void setUserDefinedCategory(IfcLabel v);
+    bool hasUserDefinedCategory() const;
+    std::string UserDefinedCategory() const;
+    void setUserDefinedCategory(std::string v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 6: return IfcUtil::Argument_STRING; case 7: return IfcUtil::Argument_ENUMERATION; case 8: return IfcUtil::Argument_STRING; } return IfcAppliedValue::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 6: return Type::IfcLabel; case 7: return Type::IfcEnvironmentalImpactCategoryEnum; case 8: return Type::IfcLabel; } return IfcAppliedValue::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 6: return "ImpactType"; case 7: return "Category"; case 8: return "UserDefinedCategory"; } return IfcAppliedValue::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcEnvironmentalImpactValue (IfcAbstractEntityPtr e);
-    IfcEnvironmentalImpactValue (boost::optional< IfcLabel > v1_Name, boost::optional< IfcText > v2_Description, boost::optional< IfcAppliedValueSelect > v3_AppliedValue, IfcMeasureWithUnit* v4_UnitBasis, boost::optional< IfcDateTimeSelect > v5_ApplicableDate, boost::optional< IfcDateTimeSelect > v6_FixedUntilDate, IfcLabel v7_ImpactType, IfcEnvironmentalImpactCategoryEnum::IfcEnvironmentalImpactCategoryEnum v8_Category, boost::optional< IfcLabel > v9_UserDefinedCategory);
-    typedef IfcEnvironmentalImpactValue* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcEnvironmentalImpactValue > > list;
-    typedef IfcTemplatedEntityList< IfcEnvironmentalImpactValue >::it it;
+    IfcEnvironmentalImpactValue (IfcAbstractEntity* e);
+    IfcEnvironmentalImpactValue (boost::optional< std::string > v1_Name, boost::optional< std::string > v2_Description, IfcAppliedValueSelect* v3_AppliedValue, IfcMeasureWithUnit* v4_UnitBasis, IfcDateTimeSelect* v5_ApplicableDate, IfcDateTimeSelect* v6_FixedUntilDate, std::string v7_ImpactType, IfcEnvironmentalImpactCategoryEnum::IfcEnvironmentalImpactCategoryEnum v8_Category, boost::optional< std::string > v9_UserDefinedCategory);
+    typedef IfcTemplatedEntityList< IfcEnvironmentalImpactValue > list;
 };
 /// An IfcExternalReference is the identification of information that is not explicitly represented in the current model or in the project database (as an implementation of the current model). Such information may be contained in classifications, documents or libraries. The IfcExternalReference identifies a particular item, such as a
 /// dictionary entry, a classification notation, or a document reference within the external source.
@@ -7063,33 +8191,32 @@ class IfcEnvironmentalImpactValue : public IfcAppliedValue {
 class IfcExternalReference : public IfcUtil::IfcBaseEntity {
 public:
     /// Whether the optional attribute Location is defined for this IfcExternalReference
-    bool hasLocation();
+    bool hasLocation() const;
     /// Location, where the external source (classification, document or library) can be accessed by electronic means. The electronic location is provided as an URI, and would normally be given as an URL location string.
     /// 
     /// IFC2x4 CHANGE  The data type has been changed from IfcLabel to IfcURIReference.
-    IfcLabel Location();
-    void setLocation(IfcLabel v);
+    std::string Location() const;
+    void setLocation(std::string v);
     /// Whether the optional attribute ItemReference is defined for this IfcExternalReference
-    bool hasItemReference();
-    IfcIdentifier ItemReference();
-    void setItemReference(IfcIdentifier v);
+    bool hasItemReference() const;
+    std::string ItemReference() const;
+    void setItemReference(std::string v);
     /// Whether the optional attribute Name is defined for this IfcExternalReference
-    bool hasName();
+    bool hasName() const;
     /// Optional name to further specify the reference. It can provide a human readable identifier (which does not necessarily need to have a counterpart in the internal structure of the document).
-    IfcLabel Name();
-    void setName(IfcLabel v);
+    std::string Name() const;
+    void setName(std::string v);
     virtual unsigned int getArgumentCount() const { return 3; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_STRING; case 1: return IfcUtil::Argument_STRING; case 2: return IfcUtil::Argument_STRING; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcLabel; case 1: return Type::IfcIdentifier; case 2: return Type::IfcLabel; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Location"; case 1: return "ItemReference"; case 2: return "Name"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcExternalReference (IfcAbstractEntityPtr e);
-    IfcExternalReference (boost::optional< IfcLabel > v1_Location, boost::optional< IfcIdentifier > v2_ItemReference, boost::optional< IfcLabel > v3_Name);
-    typedef IfcExternalReference* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcExternalReference > > list;
-    typedef IfcTemplatedEntityList< IfcExternalReference >::it it;
+    IfcExternalReference (IfcAbstractEntity* e);
+    IfcExternalReference (boost::optional< std::string > v1_Location, boost::optional< std::string > v2_ItemReference, boost::optional< std::string > v3_Name);
+    typedef IfcTemplatedEntityList< IfcExternalReference > list;
 };
 /// Definition from ISO/CD 10303-46:1992: The externally defined hatch style is an entity which makes an external reference to a hatching style.
 /// 
@@ -7103,16 +8230,15 @@ class IfcExternallyDefinedHatchStyle : public IfcExternalReference {
 public:
     virtual unsigned int getArgumentCount() const { return 3; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcExternalReference::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcExternalReference::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcExternalReference::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcExternallyDefinedHatchStyle (IfcAbstractEntityPtr e);
-    IfcExternallyDefinedHatchStyle (boost::optional< IfcLabel > v1_Location, boost::optional< IfcIdentifier > v2_ItemReference, boost::optional< IfcLabel > v3_Name);
-    typedef IfcExternallyDefinedHatchStyle* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcExternallyDefinedHatchStyle > > list;
-    typedef IfcTemplatedEntityList< IfcExternallyDefinedHatchStyle >::it it;
+    IfcExternallyDefinedHatchStyle (IfcAbstractEntity* e);
+    IfcExternallyDefinedHatchStyle (boost::optional< std::string > v1_Location, boost::optional< std::string > v2_ItemReference, boost::optional< std::string > v3_Name);
+    typedef IfcTemplatedEntityList< IfcExternallyDefinedHatchStyle > list;
 };
 /// IfcExternallyDefinedSurfaceStyle is a definition of a surface style through referencing an external source, such as a material library for rendering information.
 /// 
@@ -7125,16 +8251,15 @@ class IfcExternallyDefinedSurfaceStyle : public IfcExternalReference {
 public:
     virtual unsigned int getArgumentCount() const { return 3; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcExternalReference::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcExternalReference::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcExternalReference::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcExternallyDefinedSurfaceStyle (IfcAbstractEntityPtr e);
-    IfcExternallyDefinedSurfaceStyle (boost::optional< IfcLabel > v1_Location, boost::optional< IfcIdentifier > v2_ItemReference, boost::optional< IfcLabel > v3_Name);
-    typedef IfcExternallyDefinedSurfaceStyle* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcExternallyDefinedSurfaceStyle > > list;
-    typedef IfcTemplatedEntityList< IfcExternallyDefinedSurfaceStyle >::it it;
+    IfcExternallyDefinedSurfaceStyle (IfcAbstractEntity* e);
+    IfcExternallyDefinedSurfaceStyle (boost::optional< std::string > v1_Location, boost::optional< std::string > v2_ItemReference, boost::optional< std::string > v3_Name);
+    typedef IfcTemplatedEntityList< IfcExternallyDefinedSurfaceStyle > list;
 };
 /// An externally defined symbol is a symbol that gets its shape information by an agreed reference to an external source.
 /// 
@@ -7149,16 +8274,15 @@ class IfcExternallyDefinedSymbol : public IfcExternalReference {
 public:
     virtual unsigned int getArgumentCount() const { return 3; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcExternalReference::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcExternalReference::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcExternalReference::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcExternallyDefinedSymbol (IfcAbstractEntityPtr e);
-    IfcExternallyDefinedSymbol (boost::optional< IfcLabel > v1_Location, boost::optional< IfcIdentifier > v2_ItemReference, boost::optional< IfcLabel > v3_Name);
-    typedef IfcExternallyDefinedSymbol* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcExternallyDefinedSymbol > > list;
-    typedef IfcTemplatedEntityList< IfcExternallyDefinedSymbol >::it it;
+    IfcExternallyDefinedSymbol (IfcAbstractEntity* e);
+    IfcExternallyDefinedSymbol (boost::optional< std::string > v1_Location, boost::optional< std::string > v2_ItemReference, boost::optional< std::string > v3_Name);
+    typedef IfcTemplatedEntityList< IfcExternallyDefinedSymbol > list;
 };
 /// Definition from ISO/CD 10303-46:1992: The externally defined text font is an external reference to a text font 
 /// 
@@ -7171,16 +8295,15 @@ class IfcExternallyDefinedTextFont : public IfcExternalReference {
 public:
     virtual unsigned int getArgumentCount() const { return 3; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcExternalReference::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcExternalReference::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcExternalReference::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcExternallyDefinedTextFont (IfcAbstractEntityPtr e);
-    IfcExternallyDefinedTextFont (boost::optional< IfcLabel > v1_Location, boost::optional< IfcIdentifier > v2_ItemReference, boost::optional< IfcLabel > v3_Name);
-    typedef IfcExternallyDefinedTextFont* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcExternallyDefinedTextFont > > list;
-    typedef IfcTemplatedEntityList< IfcExternallyDefinedTextFont >::it it;
+    IfcExternallyDefinedTextFont (IfcAbstractEntity* e);
+    IfcExternallyDefinedTextFont (boost::optional< std::string > v1_Location, boost::optional< std::string > v2_ItemReference, boost::optional< std::string > v3_Name);
+    typedef IfcTemplatedEntityList< IfcExternallyDefinedTextFont > list;
 };
 /// An individual axis, IfcGridAxis, is defined in the context of a design grid.  The axis definition is based on a curve of dimensionality 2. The grid axis is positioned within the XY plane of the position coordinate system defined by the IfcDesignGrid.
 /// 
@@ -7208,32 +8331,31 @@ class IfcExternallyDefinedTextFont : public IfcExternalReference {
 class IfcGridAxis : public IfcUtil::IfcBaseEntity {
 public:
     /// Whether the optional attribute AxisTag is defined for this IfcGridAxis
-    bool hasAxisTag();
+    bool hasAxisTag() const;
     /// The tag or name for this grid axis.
-    IfcLabel AxisTag();
-    void setAxisTag(IfcLabel v);
+    std::string AxisTag() const;
+    void setAxisTag(std::string v);
     /// Underlying curve which provides the geometry for this grid axis.
-    IfcCurve* AxisCurve();
+    IfcCurve* AxisCurve() const;
     void setAxisCurve(IfcCurve* v);
     /// Defines whether the original sense of curve is used or whether it is reversed in the context of the grid axis.
-    IfcBoolean SameSense();
-    void setSameSense(IfcBoolean v);
+    bool SameSense() const;
+    void setSameSense(bool v);
     virtual unsigned int getArgumentCount() const { return 3; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_STRING; case 1: return IfcUtil::Argument_ENTITY; case 2: return IfcUtil::Argument_BOOL; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcLabel; case 1: return Type::IfcCurve; case 2: return Type::IfcBoolean; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "AxisTag"; case 1: return "AxisCurve"; case 2: return "SameSense"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcGrid > > PartOfW(); // INVERSE IfcGrid::WAxes
-    SHARED_PTR< IfcTemplatedEntityList< IfcGrid > > PartOfV(); // INVERSE IfcGrid::VAxes
-    SHARED_PTR< IfcTemplatedEntityList< IfcGrid > > PartOfU(); // INVERSE IfcGrid::UAxes
-    SHARED_PTR< IfcTemplatedEntityList< IfcVirtualGridIntersection > > HasIntersections(); // INVERSE IfcVirtualGridIntersection::IntersectingAxes
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcGrid >::ptr PartOfW() const; // INVERSE IfcGrid::WAxes
+    IfcTemplatedEntityList< IfcGrid >::ptr PartOfV() const; // INVERSE IfcGrid::VAxes
+    IfcTemplatedEntityList< IfcGrid >::ptr PartOfU() const; // INVERSE IfcGrid::UAxes
+    IfcTemplatedEntityList< IfcVirtualGridIntersection >::ptr HasIntersections() const; // INVERSE IfcVirtualGridIntersection::IntersectingAxes
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcGridAxis (IfcAbstractEntityPtr e);
-    IfcGridAxis (boost::optional< IfcLabel > v1_AxisTag, IfcCurve* v2_AxisCurve, IfcBoolean v3_SameSense);
-    typedef IfcGridAxis* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcGridAxis > > list;
-    typedef IfcTemplatedEntityList< IfcGridAxis >::it it;
+    IfcGridAxis (IfcAbstractEntity* e);
+    IfcGridAxis (boost::optional< std::string > v1_AxisTag, IfcCurve* v2_AxisCurve, bool v3_SameSense);
+    typedef IfcTemplatedEntityList< IfcGridAxis > list;
 };
 /// The IfcIrregularTimeSeriesValue describes a value (or set of values) at a particular time point. 
 /// 
@@ -7241,23 +8363,22 @@ class IfcGridAxis : public IfcUtil::IfcBaseEntity {
 class IfcIrregularTimeSeriesValue : public IfcUtil::IfcBaseEntity {
 public:
     /// The specification of the time point.
-    IfcDateTimeSelect TimeStamp();
-    void setTimeStamp(IfcDateTimeSelect v);
+    IfcDateTimeSelect* TimeStamp() const;
+    void setTimeStamp(IfcDateTimeSelect* v);
     /// A list of time-series values. At least one value is required.
-    SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > ListValues();
-    void setListValues(SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > v);
+    IfcEntityList::ptr ListValues() const;
+    void setListValues(IfcEntityList::ptr v);
     virtual unsigned int getArgumentCount() const { return 2; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY; case 1: return IfcUtil::Argument_ENTITY_LIST; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcDateTimeSelect; case 1: return Type::IfcValue; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "TimeStamp"; case 1: return "ListValues"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcIrregularTimeSeriesValue (IfcAbstractEntityPtr e);
-    IfcIrregularTimeSeriesValue (IfcDateTimeSelect v1_TimeStamp, IfcEntities v2_ListValues);
-    typedef IfcIrregularTimeSeriesValue* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcIrregularTimeSeriesValue > > list;
-    typedef IfcTemplatedEntityList< IfcIrregularTimeSeriesValue >::it it;
+    IfcIrregularTimeSeriesValue (IfcAbstractEntity* e);
+    IfcIrregularTimeSeriesValue (IfcDateTimeSelect* v1_TimeStamp, IfcEntityList::ptr v2_ListValues);
+    typedef IfcTemplatedEntityList< IfcIrregularTimeSeriesValue > list;
 };
 /// An IfcLibraryInformation describes a library where a library is a structured store of information, normally organized in a manner which allows information lookup through an index or reference value. IfcLibraryInformation provides the library Name and optional Version, VersionDate and Publisher attributes. A Location may be added for electronic access to the library.
 /// 
@@ -7270,41 +8391,40 @@ class IfcIrregularTimeSeriesValue : public IfcUtil::IfcBaseEntity {
 class IfcLibraryInformation : public IfcUtil::IfcBaseEntity {
 public:
     /// The name which is used to identify the library.
-    IfcLabel Name();
-    void setName(IfcLabel v);
+    std::string Name() const;
+    void setName(std::string v);
     /// Whether the optional attribute Version is defined for this IfcLibraryInformation
-    bool hasVersion();
+    bool hasVersion() const;
     /// Identifier for the library version used for reference.
-    IfcLabel Version();
-    void setVersion(IfcLabel v);
+    std::string Version() const;
+    void setVersion(std::string v);
     /// Whether the optional attribute Publisher is defined for this IfcLibraryInformation
-    bool hasPublisher();
+    bool hasPublisher() const;
     /// Information of the organization that acts as the library publisher.
-    IfcOrganization* Publisher();
+    IfcOrganization* Publisher() const;
     void setPublisher(IfcOrganization* v);
     /// Whether the optional attribute VersionDate is defined for this IfcLibraryInformation
-    bool hasVersionDate();
+    bool hasVersionDate() const;
     /// Date of the referenced version of the library.
     /// 
     /// IFC2x4 CHANGE  The data type has been changed to IfcDate, the date string according to ISO8601.
-    IfcCalendarDate* VersionDate();
+    IfcCalendarDate* VersionDate() const;
     void setVersionDate(IfcCalendarDate* v);
     /// Whether the optional attribute LibraryReference is defined for this IfcLibraryInformation
-    bool hasLibraryReference();
-    SHARED_PTR< IfcTemplatedEntityList< IfcLibraryReference > > LibraryReference();
-    void setLibraryReference(SHARED_PTR< IfcTemplatedEntityList< IfcLibraryReference > > v);
+    bool hasLibraryReference() const;
+    IfcTemplatedEntityList< IfcLibraryReference >::ptr LibraryReference() const;
+    void setLibraryReference(IfcTemplatedEntityList< IfcLibraryReference >::ptr v);
     virtual unsigned int getArgumentCount() const { return 5; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_STRING; case 1: return IfcUtil::Argument_STRING; case 2: return IfcUtil::Argument_ENTITY; case 3: return IfcUtil::Argument_ENTITY; case 4: return IfcUtil::Argument_ENTITY_LIST; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcLabel; case 1: return Type::IfcLabel; case 2: return Type::IfcOrganization; case 3: return Type::IfcCalendarDate; case 4: return Type::IfcLibraryReference; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Name"; case 1: return "Version"; case 2: return "Publisher"; case 3: return "VersionDate"; case 4: return "LibraryReference"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcLibraryInformation (IfcAbstractEntityPtr e);
-    IfcLibraryInformation (IfcLabel v1_Name, boost::optional< IfcLabel > v2_Version, IfcOrganization* v3_Publisher, IfcCalendarDate* v4_VersionDate, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcLibraryReference > > > v5_LibraryReference);
-    typedef IfcLibraryInformation* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcLibraryInformation > > list;
-    typedef IfcTemplatedEntityList< IfcLibraryInformation >::it it;
+    IfcLibraryInformation (IfcAbstractEntity* e);
+    IfcLibraryInformation (std::string v1_Name, boost::optional< std::string > v2_Version, IfcOrganization* v3_Publisher, IfcCalendarDate* v4_VersionDate, boost::optional< IfcTemplatedEntityList< IfcLibraryReference >::ptr > v5_LibraryReference);
+    typedef IfcTemplatedEntityList< IfcLibraryInformation > list;
 };
 /// An IfcLibraryReference is a reference into a library of information by Location (provided as a URI). It also provides an optional inherited Identification key to allow more specific references to library sections or tables. The inherited Name attribute allows for a human interpretable identification of the library item. Also, general information on the library from which the reference is taken, is given by the ReferencedLibrary relation which identifies the relevant occurrence of IfcLibraryInformation.
 /// 
@@ -7317,17 +8437,16 @@ class IfcLibraryReference : public IfcExternalReference {
 public:
     virtual unsigned int getArgumentCount() const { return 3; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcExternalReference::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcExternalReference::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcExternalReference::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcLibraryInformation > > ReferenceIntoLibrary(); // INVERSE IfcLibraryInformation::LibraryReference
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcLibraryInformation >::ptr ReferenceIntoLibrary() const; // INVERSE IfcLibraryInformation::LibraryReference
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcLibraryReference (IfcAbstractEntityPtr e);
-    IfcLibraryReference (boost::optional< IfcLabel > v1_Location, boost::optional< IfcIdentifier > v2_ItemReference, boost::optional< IfcLabel > v3_Name);
-    typedef IfcLibraryReference* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcLibraryReference > > list;
-    typedef IfcTemplatedEntityList< IfcLibraryReference >::it it;
+    IfcLibraryReference (IfcAbstractEntity* e);
+    IfcLibraryReference (boost::optional< std::string > v1_Location, boost::optional< std::string > v2_ItemReference, boost::optional< std::string > v3_Name);
+    typedef IfcTemplatedEntityList< IfcLibraryReference > list;
 };
 /// IfcLightDistributionData defines the luminous intensity of a light source given at a particular main plane angle. It is based on some standardized light distribution curves; the MainPlaneAngle is either the 
 /// 
@@ -7347,28 +8466,27 @@ class IfcLibraryReference : public IfcExternalReference {
 class IfcLightDistributionData : public IfcUtil::IfcBaseEntity {
 public:
     /// The main plane angle (A, B or C angles, according to the light distribution curve chosen).
-    IfcPlaneAngleMeasure MainPlaneAngle();
-    void setMainPlaneAngle(IfcPlaneAngleMeasure v);
+    double MainPlaneAngle() const;
+    void setMainPlaneAngle(double v);
     /// The list of secondary plane angles (the &#945;, &#946; or &#947; angles) according to the light distribution curve chosen.
     /// 
     /// NOTE: The SecondaryPlaneAngle and LuminousIntensity lists are corresponding lists.
-    std::vector< IfcPlaneAngleMeasure > /*[1:?]*/ SecondaryPlaneAngle();
-    void setSecondaryPlaneAngle(std::vector< IfcPlaneAngleMeasure > /*[1:?]*/ v);
+    std::vector< double > /*[1:?]*/ SecondaryPlaneAngle() const;
+    void setSecondaryPlaneAngle(std::vector< double > /*[1:?]*/ v);
     /// The luminous intensity distribution measure for this pair of main and secondary plane angles according to the light distribution curve chosen.
-    std::vector< IfcLuminousIntensityDistributionMeasure > /*[1:?]*/ LuminousIntensity();
-    void setLuminousIntensity(std::vector< IfcLuminousIntensityDistributionMeasure > /*[1:?]*/ v);
+    std::vector< double > /*[1:?]*/ LuminousIntensity() const;
+    void setLuminousIntensity(std::vector< double > /*[1:?]*/ v);
     virtual unsigned int getArgumentCount() const { return 3; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_DOUBLE; case 1: return IfcUtil::Argument_VECTOR_DOUBLE; case 2: return IfcUtil::Argument_VECTOR_DOUBLE; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcPlaneAngleMeasure; case 1: return Type::IfcPlaneAngleMeasure; case 2: return Type::IfcLuminousIntensityDistributionMeasure; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "MainPlaneAngle"; case 1: return "SecondaryPlaneAngle"; case 2: return "LuminousIntensity"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcLightDistributionData (IfcAbstractEntityPtr e);
-    IfcLightDistributionData (IfcPlaneAngleMeasure v1_MainPlaneAngle, std::vector< IfcPlaneAngleMeasure > /*[1:?]*/ v2_SecondaryPlaneAngle, std::vector< IfcLuminousIntensityDistributionMeasure > /*[1:?]*/ v3_LuminousIntensity);
-    typedef IfcLightDistributionData* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcLightDistributionData > > list;
-    typedef IfcTemplatedEntityList< IfcLightDistributionData >::it it;
+    IfcLightDistributionData (IfcAbstractEntity* e);
+    IfcLightDistributionData (double v1_MainPlaneAngle, std::vector< double > /*[1:?]*/ v2_SecondaryPlaneAngle, std::vector< double > /*[1:?]*/ v3_LuminousIntensity);
+    typedef IfcTemplatedEntityList< IfcLightDistributionData > list;
 };
 /// IfcLightIntensityDistribution defines the the luminous intensity of a light source that changes according to the direction of the ray. It is based on some standardized light distribution curves, which are defined by the LightDistributionCurve attribute. 
 /// 
@@ -7376,57 +8494,55 @@ class IfcLightDistributionData : public IfcUtil::IfcBaseEntity {
 class IfcLightIntensityDistribution : public IfcUtil::IfcBaseEntity {
 public:
     /// Standardized  light distribution curve used to define the luminous intensity of the light in all directions.
-    IfcLightDistributionCurveEnum::IfcLightDistributionCurveEnum LightDistributionCurve();
+    IfcLightDistributionCurveEnum::IfcLightDistributionCurveEnum LightDistributionCurve() const;
     void setLightDistributionCurve(IfcLightDistributionCurveEnum::IfcLightDistributionCurveEnum v);
     /// Light distribution data applied to the light source. It is defined by a list of main plane angles (B or C according to the light distribution curve chosen) that includes (for each B or C angle) a second list of secondary plane angles (the &#946; or &#947; angles) and the according luminous intensity distribution measures.
-    SHARED_PTR< IfcTemplatedEntityList< IfcLightDistributionData > > DistributionData();
-    void setDistributionData(SHARED_PTR< IfcTemplatedEntityList< IfcLightDistributionData > > v);
+    IfcTemplatedEntityList< IfcLightDistributionData >::ptr DistributionData() const;
+    void setDistributionData(IfcTemplatedEntityList< IfcLightDistributionData >::ptr v);
     virtual unsigned int getArgumentCount() const { return 2; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENUMERATION; case 1: return IfcUtil::Argument_ENTITY_LIST; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcLightDistributionCurveEnum; case 1: return Type::IfcLightDistributionData; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "LightDistributionCurve"; case 1: return "DistributionData"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcLightIntensityDistribution (IfcAbstractEntityPtr e);
-    IfcLightIntensityDistribution (IfcLightDistributionCurveEnum::IfcLightDistributionCurveEnum v1_LightDistributionCurve, SHARED_PTR< IfcTemplatedEntityList< IfcLightDistributionData > > v2_DistributionData);
-    typedef IfcLightIntensityDistribution* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcLightIntensityDistribution > > list;
-    typedef IfcTemplatedEntityList< IfcLightIntensityDistribution >::it it;
+    IfcLightIntensityDistribution (IfcAbstractEntity* e);
+    IfcLightIntensityDistribution (IfcLightDistributionCurveEnum::IfcLightDistributionCurveEnum v1_LightDistributionCurve, IfcTemplatedEntityList< IfcLightDistributionData >::ptr v2_DistributionData);
+    typedef IfcTemplatedEntityList< IfcLightIntensityDistribution > list;
 };
 
 class IfcLocalTime : public IfcUtil::IfcBaseEntity {
 public:
-    IfcHourInDay HourComponent();
-    void setHourComponent(IfcHourInDay v);
+    int HourComponent() const;
+    void setHourComponent(int v);
     /// Whether the optional attribute MinuteComponent is defined for this IfcLocalTime
-    bool hasMinuteComponent();
-    IfcMinuteInHour MinuteComponent();
-    void setMinuteComponent(IfcMinuteInHour v);
+    bool hasMinuteComponent() const;
+    int MinuteComponent() const;
+    void setMinuteComponent(int v);
     /// Whether the optional attribute SecondComponent is defined for this IfcLocalTime
-    bool hasSecondComponent();
-    IfcSecondInMinute SecondComponent();
-    void setSecondComponent(IfcSecondInMinute v);
+    bool hasSecondComponent() const;
+    double SecondComponent() const;
+    void setSecondComponent(double v);
     /// Whether the optional attribute Zone is defined for this IfcLocalTime
-    bool hasZone();
-    IfcCoordinatedUniversalTimeOffset* Zone();
+    bool hasZone() const;
+    IfcCoordinatedUniversalTimeOffset* Zone() const;
     void setZone(IfcCoordinatedUniversalTimeOffset* v);
     /// Whether the optional attribute DaylightSavingOffset is defined for this IfcLocalTime
-    bool hasDaylightSavingOffset();
-    IfcDaylightSavingHour DaylightSavingOffset();
-    void setDaylightSavingOffset(IfcDaylightSavingHour v);
+    bool hasDaylightSavingOffset() const;
+    int DaylightSavingOffset() const;
+    void setDaylightSavingOffset(int v);
     virtual unsigned int getArgumentCount() const { return 5; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_INT; case 1: return IfcUtil::Argument_INT; case 2: return IfcUtil::Argument_DOUBLE; case 3: return IfcUtil::Argument_ENTITY; case 4: return IfcUtil::Argument_INT; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcHourInDay; case 1: return Type::IfcMinuteInHour; case 2: return Type::IfcSecondInMinute; case 3: return Type::IfcCoordinatedUniversalTimeOffset; case 4: return Type::IfcDaylightSavingHour; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "HourComponent"; case 1: return "MinuteComponent"; case 2: return "SecondComponent"; case 3: return "Zone"; case 4: return "DaylightSavingOffset"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcLocalTime (IfcAbstractEntityPtr e);
-    IfcLocalTime (IfcHourInDay v1_HourComponent, boost::optional< IfcMinuteInHour > v2_MinuteComponent, boost::optional< IfcSecondInMinute > v3_SecondComponent, IfcCoordinatedUniversalTimeOffset* v4_Zone, boost::optional< IfcDaylightSavingHour > v5_DaylightSavingOffset);
-    typedef IfcLocalTime* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcLocalTime > > list;
-    typedef IfcTemplatedEntityList< IfcLocalTime >::it it;
+    IfcLocalTime (IfcAbstractEntity* e);
+    IfcLocalTime (int v1_HourComponent, boost::optional< int > v2_MinuteComponent, boost::optional< double > v3_SecondComponent, IfcCoordinatedUniversalTimeOffset* v4_Zone, boost::optional< int > v5_DaylightSavingOffset);
+    typedef IfcTemplatedEntityList< IfcLocalTime > list;
 };
 /// IfcMaterial is a homogeneous or inhomogeneous
 /// substance that can be used to form elements (physical products or
@@ -7462,22 +8578,21 @@ class IfcMaterial : public IfcUtil::IfcBaseEntity {
     /// EXAMPLE A view definition may require Material.Name to uniquely specify e.g. concrete or steel grade, in which case the attribute Material.Category could take the value 'Concrete' or 'Steel'. 
     /// 
     /// NOTE Material grade may have diffenrent meaning in different view definitions, e.g. strength grade for structural design and analysis, or visible appearance grade in architectural application. Also, more elaborate material grade definition may be associated as classification via inverse attribute HasExternalReferences.
-    IfcLabel Name();
-    void setName(IfcLabel v);
+    std::string Name() const;
+    void setName(std::string v);
     virtual unsigned int getArgumentCount() const { return 1; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_STRING; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcLabel; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Name"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcMaterialDefinitionRepresentation > > HasRepresentation(); // INVERSE IfcMaterialDefinitionRepresentation::RepresentedMaterial
-    SHARED_PTR< IfcTemplatedEntityList< IfcMaterialClassificationRelationship > > ClassifiedAs(); // INVERSE IfcMaterialClassificationRelationship::ClassifiedMaterial
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcMaterialDefinitionRepresentation >::ptr HasRepresentation() const; // INVERSE IfcMaterialDefinitionRepresentation::RepresentedMaterial
+    IfcTemplatedEntityList< IfcMaterialClassificationRelationship >::ptr ClassifiedAs() const; // INVERSE IfcMaterialClassificationRelationship::ClassifiedMaterial
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcMaterial (IfcAbstractEntityPtr e);
-    IfcMaterial (IfcLabel v1_Name);
-    typedef IfcMaterial* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcMaterial > > list;
-    typedef IfcTemplatedEntityList< IfcMaterial >::it it;
+    IfcMaterial (IfcAbstractEntity* e);
+    IfcMaterial (std::string v1_Name);
+    typedef IfcTemplatedEntityList< IfcMaterial > list;
 };
 /// IfcMaterialClassificationRelationship is a relationship assigning classifications to materials.
 /// 
@@ -7487,23 +8602,22 @@ class IfcMaterial : public IfcUtil::IfcBaseEntity {
 class IfcMaterialClassificationRelationship : public IfcUtil::IfcBaseEntity {
 public:
     /// The material classifications identifying the type of material.
-    SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > MaterialClassifications();
-    void setMaterialClassifications(SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > v);
+    IfcEntityList::ptr MaterialClassifications() const;
+    void setMaterialClassifications(IfcEntityList::ptr v);
     /// Material being classified.
-    IfcMaterial* ClassifiedMaterial();
+    IfcMaterial* ClassifiedMaterial() const;
     void setClassifiedMaterial(IfcMaterial* v);
     virtual unsigned int getArgumentCount() const { return 2; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY_LIST; case 1: return IfcUtil::Argument_ENTITY; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcClassificationNotationSelect; case 1: return Type::IfcMaterial; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "MaterialClassifications"; case 1: return "ClassifiedMaterial"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcMaterialClassificationRelationship (IfcAbstractEntityPtr e);
-    IfcMaterialClassificationRelationship (IfcEntities v1_MaterialClassifications, IfcMaterial* v2_ClassifiedMaterial);
-    typedef IfcMaterialClassificationRelationship* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcMaterialClassificationRelationship > > list;
-    typedef IfcTemplatedEntityList< IfcMaterialClassificationRelationship >::it it;
+    IfcMaterialClassificationRelationship (IfcAbstractEntity* e);
+    IfcMaterialClassificationRelationship (IfcEntityList::ptr v1_MaterialClassifications, IfcMaterial* v2_ClassifiedMaterial);
+    typedef IfcTemplatedEntityList< IfcMaterialClassificationRelationship > list;
 };
 /// IfcMaterialLayer is a single and identifiable part of an element which is constructed of a number of layers (one or more). Each IfcMaterialLayer has a constant thickness and is located relative to the referencing IfcMaterialLayerSet along the MlsBase.
 /// 
@@ -7531,39 +8645,38 @@ class IfcMaterialClassificationRelationship : public IfcUtil::IfcBaseEntity {
 class IfcMaterialLayer : public IfcUtil::IfcBaseEntity {
 public:
     /// Whether the optional attribute Material is defined for this IfcMaterialLayer
-    bool hasMaterial();
+    bool hasMaterial() const;
     /// Optional reference to the material from which the layer is constructed. Note that if this value is not given, it does not denote a layer with no material (an air gap), it only means that the material is not specified at that point.
-    IfcMaterial* Material();
+    IfcMaterial* Material() const;
     void setMaterial(IfcMaterial* v);
     /// The thickness of the material layer. The dimension is measured along the positive MlsDirection as specified in IfcMaterialLayerSet (that is mapped to AXIS-2, as specified in IfcMaterialLayerSetUsage for element occurrences supporting IfcMaterialLayerSetUsage.
     /// 
     /// NOTE  The attribute value can be 0. for material thicknesses very close to zero, such as for a membrane. Material layers with thickess 0. shall not be rendered in the geometric representation.
     /// 
     /// IFC2x4 CHANGE  The attribute datatype has been changed to IfcNonNegativeLengthMeasure allowing for 0. as thickness.
-    IfcPositiveLengthMeasure LayerThickness();
-    void setLayerThickness(IfcPositiveLengthMeasure v);
+    double LayerThickness() const;
+    void setLayerThickness(double v);
     /// Whether the optional attribute IsVentilated is defined for this IfcMaterialLayer
-    bool hasIsVentilated();
+    bool hasIsVentilated() const;
     /// Indication of whether the material layer represents an air layer (or cavity). 
     /// 
     /// set to TRUE if the material layer is an air gap and provides air exchange from the layer to the outside air.
     ///   set to UNKNOWN if the material layer is an air gap and does not provide air exchange (or when this information about air exchange of the air gap is not available).
     ///   set to FALSE if the material layer is a solid material layer (the default).
-    IfcLogical IsVentilated();
-    void setIsVentilated(IfcLogical v);
+    bool IsVentilated() const;
+    void setIsVentilated(bool v);
     virtual unsigned int getArgumentCount() const { return 3; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY; case 1: return IfcUtil::Argument_DOUBLE; case 2: return IfcUtil::Argument_BOOL; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcMaterial; case 1: return Type::IfcPositiveLengthMeasure; case 2: return Type::IfcLogical; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Material"; case 1: return "LayerThickness"; case 2: return "IsVentilated"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcMaterialLayerSet > > ToMaterialLayerSet(); // INVERSE IfcMaterialLayerSet::MaterialLayers
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcMaterialLayerSet >::ptr ToMaterialLayerSet() const; // INVERSE IfcMaterialLayerSet::MaterialLayers
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcMaterialLayer (IfcAbstractEntityPtr e);
-    IfcMaterialLayer (IfcMaterial* v1_Material, IfcPositiveLengthMeasure v2_LayerThickness, boost::optional< IfcLogical > v3_IsVentilated);
-    typedef IfcMaterialLayer* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcMaterialLayer > > list;
-    typedef IfcTemplatedEntityList< IfcMaterialLayer >::it it;
+    IfcMaterialLayer (IfcAbstractEntity* e);
+    IfcMaterialLayer (IfcMaterial* v1_Material, double v2_LayerThickness, boost::optional< bool > v3_IsVentilated);
+    typedef IfcTemplatedEntityList< IfcMaterialLayer > list;
 };
 /// IfcMaterialLayerSet is a designation by which materials of an element constructed of a number of material layers is known and through which the relative positioning of individual layers can be expressed.
 /// 
@@ -7601,25 +8714,24 @@ class IfcMaterialLayer : public IfcUtil::IfcBaseEntity {
 class IfcMaterialLayerSet : public IfcUtil::IfcBaseEntity {
 public:
     /// Identification of the layers from which the material layer set is composed.
-    SHARED_PTR< IfcTemplatedEntityList< IfcMaterialLayer > > MaterialLayers();
-    void setMaterialLayers(SHARED_PTR< IfcTemplatedEntityList< IfcMaterialLayer > > v);
+    IfcTemplatedEntityList< IfcMaterialLayer >::ptr MaterialLayers() const;
+    void setMaterialLayers(IfcTemplatedEntityList< IfcMaterialLayer >::ptr v);
     /// Whether the optional attribute LayerSetName is defined for this IfcMaterialLayerSet
-    bool hasLayerSetName();
+    bool hasLayerSetName() const;
     /// The name by which the material layer set is known.
-    IfcLabel LayerSetName();
-    void setLayerSetName(IfcLabel v);
+    std::string LayerSetName() const;
+    void setLayerSetName(std::string v);
     virtual unsigned int getArgumentCount() const { return 2; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY_LIST; case 1: return IfcUtil::Argument_STRING; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcMaterialLayer; case 1: return Type::IfcLabel; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "MaterialLayers"; case 1: return "LayerSetName"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcMaterialLayerSet (IfcAbstractEntityPtr e);
-    IfcMaterialLayerSet (SHARED_PTR< IfcTemplatedEntityList< IfcMaterialLayer > > v1_MaterialLayers, boost::optional< IfcLabel > v2_LayerSetName);
-    typedef IfcMaterialLayerSet* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcMaterialLayerSet > > list;
-    typedef IfcTemplatedEntityList< IfcMaterialLayerSet >::it it;
+    IfcMaterialLayerSet (IfcAbstractEntity* e);
+    IfcMaterialLayerSet (IfcTemplatedEntityList< IfcMaterialLayer >::ptr v1_MaterialLayers, boost::optional< std::string > v2_LayerSetName);
+    typedef IfcTemplatedEntityList< IfcMaterialLayerSet > list;
 };
 /// IfcMaterialLayerSetUsage determines the usage of
 /// IfcMaterialLayerSet in terms of its location and
@@ -7724,34 +8836,33 @@ class IfcMaterialLayerSet : public IfcUtil::IfcBaseEntity {
 class IfcMaterialLayerSetUsage : public IfcUtil::IfcBaseEntity {
 public:
     /// The IfcMaterialLayerSet set to which the usage is applied.
-    IfcMaterialLayerSet* ForLayerSet();
+    IfcMaterialLayerSet* ForLayerSet() const;
     void setForLayerSet(IfcMaterialLayerSet* v);
     /// Orientation of the material layer set relative to element reference geometry. The meaning of the value of this attribute shall be specified in the geometry use section for each element. For extruded shape representation, direction can be given along the extrusion path (e.g. for slabs) or perpendicular to it (e.g. for walls).
     /// 
     /// NOTE  the LayerSetDirection for IfcWallStandardCase shall be AXIS2 (i.e. the y-axis) and for IfcSlabStandardCase and IfcPlateStandardCase it shall be AXIS3 (i.e. the z-axis).
     /// 
     /// Whether the material layers of the set being used shall 'grow' into the positive or negative direction of the given axis, shall be deifned by DirectionSense attribute.
-    IfcLayerSetDirectionEnum::IfcLayerSetDirectionEnum LayerSetDirection();
+    IfcLayerSetDirectionEnum::IfcLayerSetDirectionEnum LayerSetDirection() const;
     void setLayerSetDirection(IfcLayerSetDirectionEnum::IfcLayerSetDirectionEnum v);
     /// Denotion whether the material layer set is oriented in positive or negative sense along the specified axis (defined by LayerSetDirection). "Positive" means that the consecutive layers (the IfcMaterialLayer instances in the list of  IfcMaterialLayerSet.MaterialLayers) are placed face-by-face in the direction of the positive axis as established by LayerSetDirection: for AXIS2 it would be in +y, for AXIS3 it would be +z. "Negative" means that the layers are placed face-by-face in the direction of the negative LayerSetDirection. In both cases,  starting at the material layer set base line.
     /// NOTE  the material layer set base line (MlsBase) is located by OffsetFromReferenceLine, and may be on the positive or negative side of the element reference line (or plane); positive or negative for MlsBase placement does not depend on the DirectionSense attribute, but on the relevant element axis.
-    IfcDirectionSenseEnum::IfcDirectionSenseEnum DirectionSense();
+    IfcDirectionSenseEnum::IfcDirectionSenseEnum DirectionSense() const;
     void setDirectionSense(IfcDirectionSenseEnum::IfcDirectionSenseEnum v);
     /// Offset of the material layer set base line (MlsBase) from reference geometry (line or plane) of element. The offset can be positive or negative, unless restricted for a particular building element type in its use definition or by implementer agreement. A positive value means, that the MlsBase is placed on the positive side of the reference line or plane, on the axis established by LayerSetDirection (in case of AXIS2 into the direction of +y, or in case of AXIS2 into the direction of +z). A negative value means that the MlsBase is placed on the negative side, as established by LayerSetDirection (in case of AXIS2 into the direction of -y). NOTE  the positive or negative sign in the offset only affects the MlsBase placement, it does not have any effect on the application of DirectionSense for orientation of the material layers; also DirectionSense does not change the MlsBase placement.
-    IfcLengthMeasure OffsetFromReferenceLine();
-    void setOffsetFromReferenceLine(IfcLengthMeasure v);
+    double OffsetFromReferenceLine() const;
+    void setOffsetFromReferenceLine(double v);
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY; case 1: return IfcUtil::Argument_ENUMERATION; case 2: return IfcUtil::Argument_ENUMERATION; case 3: return IfcUtil::Argument_DOUBLE; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcMaterialLayerSet; case 1: return Type::IfcLayerSetDirectionEnum; case 2: return Type::IfcDirectionSenseEnum; case 3: return Type::IfcLengthMeasure; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "ForLayerSet"; case 1: return "LayerSetDirection"; case 2: return "DirectionSense"; case 3: return "OffsetFromReferenceLine"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcMaterialLayerSetUsage (IfcAbstractEntityPtr e);
-    IfcMaterialLayerSetUsage (IfcMaterialLayerSet* v1_ForLayerSet, IfcLayerSetDirectionEnum::IfcLayerSetDirectionEnum v2_LayerSetDirection, IfcDirectionSenseEnum::IfcDirectionSenseEnum v3_DirectionSense, IfcLengthMeasure v4_OffsetFromReferenceLine);
-    typedef IfcMaterialLayerSetUsage* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcMaterialLayerSetUsage > > list;
-    typedef IfcTemplatedEntityList< IfcMaterialLayerSetUsage >::it it;
+    IfcMaterialLayerSetUsage (IfcAbstractEntity* e);
+    IfcMaterialLayerSetUsage (IfcMaterialLayerSet* v1_ForLayerSet, IfcLayerSetDirectionEnum::IfcLayerSetDirectionEnum v2_LayerSetDirection, IfcDirectionSenseEnum::IfcDirectionSenseEnum v3_DirectionSense, double v4_OffsetFromReferenceLine);
+    typedef IfcTemplatedEntityList< IfcMaterialLayerSetUsage > list;
 };
 /// IfcMaterialList is a list of the different materials
 /// that are used in an element.
@@ -7773,20 +8884,19 @@ class IfcMaterialLayerSetUsage : public IfcUtil::IfcBaseEntity {
 class IfcMaterialList : public IfcUtil::IfcBaseEntity {
 public:
     /// Materials used in a composition of substances.
-    SHARED_PTR< IfcTemplatedEntityList< IfcMaterial > > Materials();
-    void setMaterials(SHARED_PTR< IfcTemplatedEntityList< IfcMaterial > > v);
+    IfcTemplatedEntityList< IfcMaterial >::ptr Materials() const;
+    void setMaterials(IfcTemplatedEntityList< IfcMaterial >::ptr v);
     virtual unsigned int getArgumentCount() const { return 1; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY_LIST; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcMaterial; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Materials"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcMaterialList (IfcAbstractEntityPtr e);
-    IfcMaterialList (SHARED_PTR< IfcTemplatedEntityList< IfcMaterial > > v1_Materials);
-    typedef IfcMaterialList* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcMaterialList > > list;
-    typedef IfcTemplatedEntityList< IfcMaterialList >::it it;
+    IfcMaterialList (IfcAbstractEntity* e);
+    IfcMaterialList (IfcTemplatedEntityList< IfcMaterial >::ptr v1_Materials);
+    typedef IfcTemplatedEntityList< IfcMaterialList > list;
 };
 /// IfcMaterialProperties is defined as an abstract
 /// supertype for entities that apply material properties to material
@@ -7815,20 +8925,19 @@ class IfcMaterialProperties : public IfcUtil::IfcBaseEntity {
     /// Reference to the material definition to which the set of properties is assigned.
     /// 
     /// IFC2x4 CHANGE  The datatype has been changed to supertype IfcMaterialDefinition.
-    IfcMaterial* Material();
+    IfcMaterial* Material() const;
     void setMaterial(IfcMaterial* v);
     virtual unsigned int getArgumentCount() const { return 1; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcMaterial; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Material"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcMaterialProperties (IfcAbstractEntityPtr e);
+    IfcMaterialProperties (IfcAbstractEntity* e);
     IfcMaterialProperties (IfcMaterial* v1_Material);
-    typedef IfcMaterialProperties* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcMaterialProperties > > list;
-    typedef IfcTemplatedEntityList< IfcMaterialProperties >::it it;
+    typedef IfcTemplatedEntityList< IfcMaterialProperties > list;
 };
 /// Definition from ISO/CD 10303-41:1992: A measure with unit is the specification of a physical quantity  as defined in ISO 31 (clause 2).
 /// 
@@ -7843,103 +8952,100 @@ class IfcMaterialProperties : public IfcUtil::IfcBaseEntity {
 class IfcMeasureWithUnit : public IfcUtil::IfcBaseEntity {
 public:
     /// The value of the physical quantity when expressed in the specified units.
-    IfcValue ValueComponent();
-    void setValueComponent(IfcValue v);
+    IfcValue* ValueComponent() const;
+    void setValueComponent(IfcValue* v);
     /// The unit in which the physical quantity is expressed.
-    IfcUnit UnitComponent();
-    void setUnitComponent(IfcUnit v);
+    IfcUnit* UnitComponent() const;
+    void setUnitComponent(IfcUnit* v);
     virtual unsigned int getArgumentCount() const { return 2; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY; case 1: return IfcUtil::Argument_ENTITY; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcValue; case 1: return Type::IfcUnit; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "ValueComponent"; case 1: return "UnitComponent"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcMeasureWithUnit (IfcAbstractEntityPtr e);
-    IfcMeasureWithUnit (IfcValue v1_ValueComponent, IfcUnit v2_UnitComponent);
-    typedef IfcMeasureWithUnit* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcMeasureWithUnit > > list;
-    typedef IfcTemplatedEntityList< IfcMeasureWithUnit >::it it;
+    IfcMeasureWithUnit (IfcAbstractEntity* e);
+    IfcMeasureWithUnit (IfcValue* v1_ValueComponent, IfcUnit* v2_UnitComponent);
+    typedef IfcTemplatedEntityList< IfcMeasureWithUnit > list;
 };
 
 class IfcMechanicalMaterialProperties : public IfcMaterialProperties {
 public:
     /// Whether the optional attribute DynamicViscosity is defined for this IfcMechanicalMaterialProperties
-    bool hasDynamicViscosity();
-    IfcDynamicViscosityMeasure DynamicViscosity();
-    void setDynamicViscosity(IfcDynamicViscosityMeasure v);
+    bool hasDynamicViscosity() const;
+    double DynamicViscosity() const;
+    void setDynamicViscosity(double v);
     /// Whether the optional attribute YoungModulus is defined for this IfcMechanicalMaterialProperties
-    bool hasYoungModulus();
-    IfcModulusOfElasticityMeasure YoungModulus();
-    void setYoungModulus(IfcModulusOfElasticityMeasure v);
+    bool hasYoungModulus() const;
+    double YoungModulus() const;
+    void setYoungModulus(double v);
     /// Whether the optional attribute ShearModulus is defined for this IfcMechanicalMaterialProperties
-    bool hasShearModulus();
-    IfcModulusOfElasticityMeasure ShearModulus();
-    void setShearModulus(IfcModulusOfElasticityMeasure v);
+    bool hasShearModulus() const;
+    double ShearModulus() const;
+    void setShearModulus(double v);
     /// Whether the optional attribute PoissonRatio is defined for this IfcMechanicalMaterialProperties
-    bool hasPoissonRatio();
-    IfcPositiveRatioMeasure PoissonRatio();
-    void setPoissonRatio(IfcPositiveRatioMeasure v);
+    bool hasPoissonRatio() const;
+    double PoissonRatio() const;
+    void setPoissonRatio(double v);
     /// Whether the optional attribute ThermalExpansionCoefficient is defined for this IfcMechanicalMaterialProperties
-    bool hasThermalExpansionCoefficient();
-    IfcThermalExpansionCoefficientMeasure ThermalExpansionCoefficient();
-    void setThermalExpansionCoefficient(IfcThermalExpansionCoefficientMeasure v);
+    bool hasThermalExpansionCoefficient() const;
+    double ThermalExpansionCoefficient() const;
+    void setThermalExpansionCoefficient(double v);
     virtual unsigned int getArgumentCount() const { return 6; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 1: return IfcUtil::Argument_DOUBLE; case 2: return IfcUtil::Argument_DOUBLE; case 3: return IfcUtil::Argument_DOUBLE; case 4: return IfcUtil::Argument_DOUBLE; case 5: return IfcUtil::Argument_DOUBLE; } return IfcMaterialProperties::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 1: return Type::IfcDynamicViscosityMeasure; case 2: return Type::IfcModulusOfElasticityMeasure; case 3: return Type::IfcModulusOfElasticityMeasure; case 4: return Type::IfcPositiveRatioMeasure; case 5: return Type::IfcThermalExpansionCoefficientMeasure; } return IfcMaterialProperties::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 1: return "DynamicViscosity"; case 2: return "YoungModulus"; case 3: return "ShearModulus"; case 4: return "PoissonRatio"; case 5: return "ThermalExpansionCoefficient"; } return IfcMaterialProperties::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcMechanicalMaterialProperties (IfcAbstractEntityPtr e);
-    IfcMechanicalMaterialProperties (IfcMaterial* v1_Material, boost::optional< IfcDynamicViscosityMeasure > v2_DynamicViscosity, boost::optional< IfcModulusOfElasticityMeasure > v3_YoungModulus, boost::optional< IfcModulusOfElasticityMeasure > v4_ShearModulus, boost::optional< IfcPositiveRatioMeasure > v5_PoissonRatio, boost::optional< IfcThermalExpansionCoefficientMeasure > v6_ThermalExpansionCoefficient);
-    typedef IfcMechanicalMaterialProperties* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcMechanicalMaterialProperties > > list;
-    typedef IfcTemplatedEntityList< IfcMechanicalMaterialProperties >::it it;
+    IfcMechanicalMaterialProperties (IfcAbstractEntity* e);
+    IfcMechanicalMaterialProperties (IfcMaterial* v1_Material, boost::optional< double > v2_DynamicViscosity, boost::optional< double > v3_YoungModulus, boost::optional< double > v4_ShearModulus, boost::optional< double > v5_PoissonRatio, boost::optional< double > v6_ThermalExpansionCoefficient);
+    typedef IfcTemplatedEntityList< IfcMechanicalMaterialProperties > list;
 };
 
 class IfcMechanicalSteelMaterialProperties : public IfcMechanicalMaterialProperties {
 public:
     /// Whether the optional attribute YieldStress is defined for this IfcMechanicalSteelMaterialProperties
-    bool hasYieldStress();
-    IfcPressureMeasure YieldStress();
-    void setYieldStress(IfcPressureMeasure v);
+    bool hasYieldStress() const;
+    double YieldStress() const;
+    void setYieldStress(double v);
     /// Whether the optional attribute UltimateStress is defined for this IfcMechanicalSteelMaterialProperties
-    bool hasUltimateStress();
-    IfcPressureMeasure UltimateStress();
-    void setUltimateStress(IfcPressureMeasure v);
+    bool hasUltimateStress() const;
+    double UltimateStress() const;
+    void setUltimateStress(double v);
     /// Whether the optional attribute UltimateStrain is defined for this IfcMechanicalSteelMaterialProperties
-    bool hasUltimateStrain();
-    IfcPositiveRatioMeasure UltimateStrain();
-    void setUltimateStrain(IfcPositiveRatioMeasure v);
+    bool hasUltimateStrain() const;
+    double UltimateStrain() const;
+    void setUltimateStrain(double v);
     /// Whether the optional attribute HardeningModule is defined for this IfcMechanicalSteelMaterialProperties
-    bool hasHardeningModule();
-    IfcModulusOfElasticityMeasure HardeningModule();
-    void setHardeningModule(IfcModulusOfElasticityMeasure v);
+    bool hasHardeningModule() const;
+    double HardeningModule() const;
+    void setHardeningModule(double v);
     /// Whether the optional attribute ProportionalStress is defined for this IfcMechanicalSteelMaterialProperties
-    bool hasProportionalStress();
-    IfcPressureMeasure ProportionalStress();
-    void setProportionalStress(IfcPressureMeasure v);
+    bool hasProportionalStress() const;
+    double ProportionalStress() const;
+    void setProportionalStress(double v);
     /// Whether the optional attribute PlasticStrain is defined for this IfcMechanicalSteelMaterialProperties
-    bool hasPlasticStrain();
-    IfcPositiveRatioMeasure PlasticStrain();
-    void setPlasticStrain(IfcPositiveRatioMeasure v);
+    bool hasPlasticStrain() const;
+    double PlasticStrain() const;
+    void setPlasticStrain(double v);
     /// Whether the optional attribute Relaxations is defined for this IfcMechanicalSteelMaterialProperties
-    bool hasRelaxations();
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelaxation > > Relaxations();
-    void setRelaxations(SHARED_PTR< IfcTemplatedEntityList< IfcRelaxation > > v);
+    bool hasRelaxations() const;
+    IfcTemplatedEntityList< IfcRelaxation >::ptr Relaxations() const;
+    void setRelaxations(IfcTemplatedEntityList< IfcRelaxation >::ptr v);
     virtual unsigned int getArgumentCount() const { return 13; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 6: return IfcUtil::Argument_DOUBLE; case 7: return IfcUtil::Argument_DOUBLE; case 8: return IfcUtil::Argument_DOUBLE; case 9: return IfcUtil::Argument_DOUBLE; case 10: return IfcUtil::Argument_DOUBLE; case 11: return IfcUtil::Argument_DOUBLE; case 12: return IfcUtil::Argument_ENTITY_LIST; } return IfcMechanicalMaterialProperties::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 6: return Type::IfcPressureMeasure; case 7: return Type::IfcPressureMeasure; case 8: return Type::IfcPositiveRatioMeasure; case 9: return Type::IfcModulusOfElasticityMeasure; case 10: return Type::IfcPressureMeasure; case 11: return Type::IfcPositiveRatioMeasure; case 12: return Type::IfcRelaxation; } return IfcMechanicalMaterialProperties::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 6: return "YieldStress"; case 7: return "UltimateStress"; case 8: return "UltimateStrain"; case 9: return "HardeningModule"; case 10: return "ProportionalStress"; case 11: return "PlasticStrain"; case 12: return "Relaxations"; } return IfcMechanicalMaterialProperties::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcMechanicalSteelMaterialProperties (IfcAbstractEntityPtr e);
-    IfcMechanicalSteelMaterialProperties (IfcMaterial* v1_Material, boost::optional< IfcDynamicViscosityMeasure > v2_DynamicViscosity, boost::optional< IfcModulusOfElasticityMeasure > v3_YoungModulus, boost::optional< IfcModulusOfElasticityMeasure > v4_ShearModulus, boost::optional< IfcPositiveRatioMeasure > v5_PoissonRatio, boost::optional< IfcThermalExpansionCoefficientMeasure > v6_ThermalExpansionCoefficient, boost::optional< IfcPressureMeasure > v7_YieldStress, boost::optional< IfcPressureMeasure > v8_UltimateStress, boost::optional< IfcPositiveRatioMeasure > v9_UltimateStrain, boost::optional< IfcModulusOfElasticityMeasure > v10_HardeningModule, boost::optional< IfcPressureMeasure > v11_ProportionalStress, boost::optional< IfcPositiveRatioMeasure > v12_PlasticStrain, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRelaxation > > > v13_Relaxations);
-    typedef IfcMechanicalSteelMaterialProperties* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcMechanicalSteelMaterialProperties > > list;
-    typedef IfcTemplatedEntityList< IfcMechanicalSteelMaterialProperties >::it it;
+    IfcMechanicalSteelMaterialProperties (IfcAbstractEntity* e);
+    IfcMechanicalSteelMaterialProperties (IfcMaterial* v1_Material, boost::optional< double > v2_DynamicViscosity, boost::optional< double > v3_YoungModulus, boost::optional< double > v4_ShearModulus, boost::optional< double > v5_PoissonRatio, boost::optional< double > v6_ThermalExpansionCoefficient, boost::optional< double > v7_YieldStress, boost::optional< double > v8_UltimateStress, boost::optional< double > v9_UltimateStrain, boost::optional< double > v10_HardeningModule, boost::optional< double > v11_ProportionalStress, boost::optional< double > v12_PlasticStrain, boost::optional< IfcTemplatedEntityList< IfcRelaxation >::ptr > v13_Relaxations);
+    typedef IfcTemplatedEntityList< IfcMechanicalSteelMaterialProperties > list;
 };
 /// An IfcMetric is used to capture quantitative resultant metrics that can be applied to objectives. 
 /// 
@@ -7996,28 +9102,27 @@ class IfcMechanicalSteelMaterialProperties : public IfcMechanicalMaterialPropert
 class IfcMetric : public IfcConstraint {
 public:
     /// Enumeration that identifies the type of benchmark data.
-    IfcBenchmarkEnum::IfcBenchmarkEnum Benchmark();
+    IfcBenchmarkEnum::IfcBenchmarkEnum Benchmark() const;
     void setBenchmark(IfcBenchmarkEnum::IfcBenchmarkEnum v);
     /// Whether the optional attribute ValueSource is defined for this IfcMetric
-    bool hasValueSource();
+    bool hasValueSource() const;
     /// Reference source for data values.
-    IfcLabel ValueSource();
-    void setValueSource(IfcLabel v);
+    std::string ValueSource() const;
+    void setValueSource(std::string v);
     /// The value with data type defined by the underlying type accesses via IfcMetricValueSelect.
-    IfcMetricValueSelect DataValue();
-    void setDataValue(IfcMetricValueSelect v);
+    IfcMetricValueSelect* DataValue() const;
+    void setDataValue(IfcMetricValueSelect* v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 7: return IfcUtil::Argument_ENUMERATION; case 8: return IfcUtil::Argument_STRING; case 9: return IfcUtil::Argument_ENTITY; } return IfcConstraint::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 7: return Type::IfcBenchmarkEnum; case 8: return Type::IfcLabel; case 9: return Type::IfcMetricValueSelect; } return IfcConstraint::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 7: return "Benchmark"; case 8: return "ValueSource"; case 9: return "DataValue"; } return IfcConstraint::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcMetric (IfcAbstractEntityPtr e);
-    IfcMetric (IfcLabel v1_Name, boost::optional< IfcText > v2_Description, IfcConstraintEnum::IfcConstraintEnum v3_ConstraintGrade, boost::optional< IfcLabel > v4_ConstraintSource, boost::optional< IfcActorSelect > v5_CreatingActor, boost::optional< IfcDateTimeSelect > v6_CreationTime, boost::optional< IfcLabel > v7_UserDefinedGrade, IfcBenchmarkEnum::IfcBenchmarkEnum v8_Benchmark, boost::optional< IfcLabel > v9_ValueSource, IfcMetricValueSelect v10_DataValue);
-    typedef IfcMetric* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcMetric > > list;
-    typedef IfcTemplatedEntityList< IfcMetric >::it it;
+    IfcMetric (IfcAbstractEntity* e);
+    IfcMetric (std::string v1_Name, boost::optional< std::string > v2_Description, IfcConstraintEnum::IfcConstraintEnum v3_ConstraintGrade, boost::optional< std::string > v4_ConstraintSource, IfcActorSelect* v5_CreatingActor, IfcDateTimeSelect* v6_CreationTime, boost::optional< std::string > v7_UserDefinedGrade, IfcBenchmarkEnum::IfcBenchmarkEnum v8_Benchmark, boost::optional< std::string > v9_ValueSource, IfcMetricValueSelect* v10_DataValue);
+    typedef IfcTemplatedEntityList< IfcMetric > list;
 };
 /// IfcMonetaryUnit is a unit to define currency for money.
 /// 
@@ -8027,20 +9132,19 @@ class IfcMetric : public IfcConstraint {
 class IfcMonetaryUnit : public IfcUtil::IfcBaseEntity {
 public:
     /// Code or name of the currency.  Permissible values are the three-letter alphabetic currency codes as per ISO 4217, for example CNY, EUR, GBP, JPY, USD.
-    IfcCurrencyEnum::IfcCurrencyEnum Currency();
+    IfcCurrencyEnum::IfcCurrencyEnum Currency() const;
     void setCurrency(IfcCurrencyEnum::IfcCurrencyEnum v);
     virtual unsigned int getArgumentCount() const { return 1; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENUMERATION; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcCurrencyEnum; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Currency"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcMonetaryUnit (IfcAbstractEntityPtr e);
+    IfcMonetaryUnit (IfcAbstractEntity* e);
     IfcMonetaryUnit (IfcCurrencyEnum::IfcCurrencyEnum v1_Currency);
-    typedef IfcMonetaryUnit* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcMonetaryUnit > > list;
-    typedef IfcTemplatedEntityList< IfcMonetaryUnit >::it it;
+    typedef IfcTemplatedEntityList< IfcMonetaryUnit > list;
 };
 /// Definition from ISO/CD 10303-41:1992: A named unit is a unit quantity associated with the word, or group of words, by which the unit is identified.
 /// 
@@ -8050,23 +9154,22 @@ class IfcMonetaryUnit : public IfcUtil::IfcBaseEntity {
 class IfcNamedUnit : public IfcUtil::IfcBaseEntity {
 public:
     /// The dimensional exponents of the SI base units by which the named unit is defined.
-    IfcDimensionalExponents* Dimensions();
+    IfcDimensionalExponents* Dimensions() const;
     void setDimensions(IfcDimensionalExponents* v);
     /// The type of the unit.
-    IfcUnitEnum::IfcUnitEnum UnitType();
+    IfcUnitEnum::IfcUnitEnum UnitType() const;
     void setUnitType(IfcUnitEnum::IfcUnitEnum v);
     virtual unsigned int getArgumentCount() const { return 2; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY; case 1: return IfcUtil::Argument_ENUMERATION; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcDimensionalExponents; case 1: return Type::IfcUnitEnum; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Dimensions"; case 1: return "UnitType"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcNamedUnit (IfcAbstractEntityPtr e);
+    IfcNamedUnit (IfcAbstractEntity* e);
     IfcNamedUnit (IfcDimensionalExponents* v1_Dimensions, IfcUnitEnum::IfcUnitEnum v2_UnitType);
-    typedef IfcNamedUnit* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcNamedUnit > > list;
-    typedef IfcTemplatedEntityList< IfcNamedUnit >::it it;
+    typedef IfcTemplatedEntityList< IfcNamedUnit > list;
 };
 /// IfcObjectPlacement is an abstract supertype for the special types defining the object coordinate system. The
 /// IfcObjectPlacement has to be provided for each product that has a shape representation.
@@ -8083,18 +9186,17 @@ class IfcObjectPlacement : public IfcUtil::IfcBaseEntity {
 public:
     virtual unsigned int getArgumentCount() const { return 0; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcProduct > > PlacesObject(); // INVERSE IfcProduct::ObjectPlacement
-    SHARED_PTR< IfcTemplatedEntityList< IfcLocalPlacement > > ReferencedByPlacements(); // INVERSE IfcLocalPlacement::PlacementRelTo
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcProduct >::ptr PlacesObject() const; // INVERSE IfcProduct::ObjectPlacement
+    IfcTemplatedEntityList< IfcLocalPlacement >::ptr ReferencedByPlacements() const; // INVERSE IfcLocalPlacement::PlacementRelTo
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcObjectPlacement (IfcAbstractEntityPtr e);
+    IfcObjectPlacement (IfcAbstractEntity* e);
     IfcObjectPlacement ();
-    typedef IfcObjectPlacement* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcObjectPlacement > > list;
-    typedef IfcTemplatedEntityList< IfcObjectPlacement >::it it;
+    typedef IfcTemplatedEntityList< IfcObjectPlacement > list;
 };
 /// An IfcObjective captures qualitative information for an objective-based constraint. 
 /// 
@@ -8108,87 +9210,85 @@ class IfcObjectPlacement : public IfcUtil::IfcBaseEntity {
 class IfcObjective : public IfcConstraint {
 public:
     /// Whether the optional attribute BenchmarkValues is defined for this IfcObjective
-    bool hasBenchmarkValues();
+    bool hasBenchmarkValues() const;
     /// A list of any benchmark values used for comparison purposes.
-    IfcMetric* BenchmarkValues();
+    IfcMetric* BenchmarkValues() const;
     void setBenchmarkValues(IfcMetric* v);
     /// Whether the optional attribute ResultValues is defined for this IfcObjective
-    bool hasResultValues();
+    bool hasResultValues() const;
     /// A list of any resultant values used for comparison purposes.
-    IfcMetric* ResultValues();
+    IfcMetric* ResultValues() const;
     void setResultValues(IfcMetric* v);
     /// Enumeration that qualifies the type of objective constraint.
-    IfcObjectiveEnum::IfcObjectiveEnum ObjectiveQualifier();
+    IfcObjectiveEnum::IfcObjectiveEnum ObjectiveQualifier() const;
     void setObjectiveQualifier(IfcObjectiveEnum::IfcObjectiveEnum v);
     /// Whether the optional attribute UserDefinedQualifier is defined for this IfcObjective
-    bool hasUserDefinedQualifier();
+    bool hasUserDefinedQualifier() const;
     /// A user defined value that qualifies the type of objective constraint when ObjectiveQualifier attribute of type IfcObjectiveEnum has value USERDEFINED.
-    IfcLabel UserDefinedQualifier();
-    void setUserDefinedQualifier(IfcLabel v);
+    std::string UserDefinedQualifier() const;
+    void setUserDefinedQualifier(std::string v);
     virtual unsigned int getArgumentCount() const { return 11; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 7: return IfcUtil::Argument_ENTITY; case 8: return IfcUtil::Argument_ENTITY; case 9: return IfcUtil::Argument_ENUMERATION; case 10: return IfcUtil::Argument_STRING; } return IfcConstraint::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 7: return Type::IfcMetric; case 8: return Type::IfcMetric; case 9: return Type::IfcObjectiveEnum; case 10: return Type::IfcLabel; } return IfcConstraint::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 7: return "BenchmarkValues"; case 8: return "ResultValues"; case 9: return "ObjectiveQualifier"; case 10: return "UserDefinedQualifier"; } return IfcConstraint::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcObjective (IfcAbstractEntityPtr e);
-    IfcObjective (IfcLabel v1_Name, boost::optional< IfcText > v2_Description, IfcConstraintEnum::IfcConstraintEnum v3_ConstraintGrade, boost::optional< IfcLabel > v4_ConstraintSource, boost::optional< IfcActorSelect > v5_CreatingActor, boost::optional< IfcDateTimeSelect > v6_CreationTime, boost::optional< IfcLabel > v7_UserDefinedGrade, IfcMetric* v8_BenchmarkValues, IfcMetric* v9_ResultValues, IfcObjectiveEnum::IfcObjectiveEnum v10_ObjectiveQualifier, boost::optional< IfcLabel > v11_UserDefinedQualifier);
-    typedef IfcObjective* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcObjective > > list;
-    typedef IfcTemplatedEntityList< IfcObjective >::it it;
+    IfcObjective (IfcAbstractEntity* e);
+    IfcObjective (std::string v1_Name, boost::optional< std::string > v2_Description, IfcConstraintEnum::IfcConstraintEnum v3_ConstraintGrade, boost::optional< std::string > v4_ConstraintSource, IfcActorSelect* v5_CreatingActor, IfcDateTimeSelect* v6_CreationTime, boost::optional< std::string > v7_UserDefinedGrade, IfcMetric* v8_BenchmarkValues, IfcMetric* v9_ResultValues, IfcObjectiveEnum::IfcObjectiveEnum v10_ObjectiveQualifier, boost::optional< std::string > v11_UserDefinedQualifier);
+    typedef IfcTemplatedEntityList< IfcObjective > list;
 };
 
 class IfcOpticalMaterialProperties : public IfcMaterialProperties {
 public:
     /// Whether the optional attribute VisibleTransmittance is defined for this IfcOpticalMaterialProperties
-    bool hasVisibleTransmittance();
-    IfcPositiveRatioMeasure VisibleTransmittance();
-    void setVisibleTransmittance(IfcPositiveRatioMeasure v);
+    bool hasVisibleTransmittance() const;
+    double VisibleTransmittance() const;
+    void setVisibleTransmittance(double v);
     /// Whether the optional attribute SolarTransmittance is defined for this IfcOpticalMaterialProperties
-    bool hasSolarTransmittance();
-    IfcPositiveRatioMeasure SolarTransmittance();
-    void setSolarTransmittance(IfcPositiveRatioMeasure v);
+    bool hasSolarTransmittance() const;
+    double SolarTransmittance() const;
+    void setSolarTransmittance(double v);
     /// Whether the optional attribute ThermalIrTransmittance is defined for this IfcOpticalMaterialProperties
-    bool hasThermalIrTransmittance();
-    IfcPositiveRatioMeasure ThermalIrTransmittance();
-    void setThermalIrTransmittance(IfcPositiveRatioMeasure v);
+    bool hasThermalIrTransmittance() const;
+    double ThermalIrTransmittance() const;
+    void setThermalIrTransmittance(double v);
     /// Whether the optional attribute ThermalIrEmissivityBack is defined for this IfcOpticalMaterialProperties
-    bool hasThermalIrEmissivityBack();
-    IfcPositiveRatioMeasure ThermalIrEmissivityBack();
-    void setThermalIrEmissivityBack(IfcPositiveRatioMeasure v);
+    bool hasThermalIrEmissivityBack() const;
+    double ThermalIrEmissivityBack() const;
+    void setThermalIrEmissivityBack(double v);
     /// Whether the optional attribute ThermalIrEmissivityFront is defined for this IfcOpticalMaterialProperties
-    bool hasThermalIrEmissivityFront();
-    IfcPositiveRatioMeasure ThermalIrEmissivityFront();
-    void setThermalIrEmissivityFront(IfcPositiveRatioMeasure v);
+    bool hasThermalIrEmissivityFront() const;
+    double ThermalIrEmissivityFront() const;
+    void setThermalIrEmissivityFront(double v);
     /// Whether the optional attribute VisibleReflectanceBack is defined for this IfcOpticalMaterialProperties
-    bool hasVisibleReflectanceBack();
-    IfcPositiveRatioMeasure VisibleReflectanceBack();
-    void setVisibleReflectanceBack(IfcPositiveRatioMeasure v);
+    bool hasVisibleReflectanceBack() const;
+    double VisibleReflectanceBack() const;
+    void setVisibleReflectanceBack(double v);
     /// Whether the optional attribute VisibleReflectanceFront is defined for this IfcOpticalMaterialProperties
-    bool hasVisibleReflectanceFront();
-    IfcPositiveRatioMeasure VisibleReflectanceFront();
-    void setVisibleReflectanceFront(IfcPositiveRatioMeasure v);
+    bool hasVisibleReflectanceFront() const;
+    double VisibleReflectanceFront() const;
+    void setVisibleReflectanceFront(double v);
     /// Whether the optional attribute SolarReflectanceFront is defined for this IfcOpticalMaterialProperties
-    bool hasSolarReflectanceFront();
-    IfcPositiveRatioMeasure SolarReflectanceFront();
-    void setSolarReflectanceFront(IfcPositiveRatioMeasure v);
+    bool hasSolarReflectanceFront() const;
+    double SolarReflectanceFront() const;
+    void setSolarReflectanceFront(double v);
     /// Whether the optional attribute SolarReflectanceBack is defined for this IfcOpticalMaterialProperties
-    bool hasSolarReflectanceBack();
-    IfcPositiveRatioMeasure SolarReflectanceBack();
-    void setSolarReflectanceBack(IfcPositiveRatioMeasure v);
+    bool hasSolarReflectanceBack() const;
+    double SolarReflectanceBack() const;
+    void setSolarReflectanceBack(double v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 1: return IfcUtil::Argument_DOUBLE; case 2: return IfcUtil::Argument_DOUBLE; case 3: return IfcUtil::Argument_DOUBLE; case 4: return IfcUtil::Argument_DOUBLE; case 5: return IfcUtil::Argument_DOUBLE; case 6: return IfcUtil::Argument_DOUBLE; case 7: return IfcUtil::Argument_DOUBLE; case 8: return IfcUtil::Argument_DOUBLE; case 9: return IfcUtil::Argument_DOUBLE; } return IfcMaterialProperties::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 1: return Type::IfcPositiveRatioMeasure; case 2: return Type::IfcPositiveRatioMeasure; case 3: return Type::IfcPositiveRatioMeasure; case 4: return Type::IfcPositiveRatioMeasure; case 5: return Type::IfcPositiveRatioMeasure; case 6: return Type::IfcPositiveRatioMeasure; case 7: return Type::IfcPositiveRatioMeasure; case 8: return Type::IfcPositiveRatioMeasure; case 9: return Type::IfcPositiveRatioMeasure; } return IfcMaterialProperties::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 1: return "VisibleTransmittance"; case 2: return "SolarTransmittance"; case 3: return "ThermalIrTransmittance"; case 4: return "ThermalIrEmissivityBack"; case 5: return "ThermalIrEmissivityFront"; case 6: return "VisibleReflectanceBack"; case 7: return "VisibleReflectanceFront"; case 8: return "SolarReflectanceFront"; case 9: return "SolarReflectanceBack"; } return IfcMaterialProperties::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcOpticalMaterialProperties (IfcAbstractEntityPtr e);
-    IfcOpticalMaterialProperties (IfcMaterial* v1_Material, boost::optional< IfcPositiveRatioMeasure > v2_VisibleTransmittance, boost::optional< IfcPositiveRatioMeasure > v3_SolarTransmittance, boost::optional< IfcPositiveRatioMeasure > v4_ThermalIrTransmittance, boost::optional< IfcPositiveRatioMeasure > v5_ThermalIrEmissivityBack, boost::optional< IfcPositiveRatioMeasure > v6_ThermalIrEmissivityFront, boost::optional< IfcPositiveRatioMeasure > v7_VisibleReflectanceBack, boost::optional< IfcPositiveRatioMeasure > v8_VisibleReflectanceFront, boost::optional< IfcPositiveRatioMeasure > v9_SolarReflectanceFront, boost::optional< IfcPositiveRatioMeasure > v10_SolarReflectanceBack);
-    typedef IfcOpticalMaterialProperties* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcOpticalMaterialProperties > > list;
-    typedef IfcTemplatedEntityList< IfcOpticalMaterialProperties >::it it;
+    IfcOpticalMaterialProperties (IfcAbstractEntity* e);
+    IfcOpticalMaterialProperties (IfcMaterial* v1_Material, boost::optional< double > v2_VisibleTransmittance, boost::optional< double > v3_SolarTransmittance, boost::optional< double > v4_ThermalIrTransmittance, boost::optional< double > v5_ThermalIrEmissivityBack, boost::optional< double > v6_ThermalIrEmissivityFront, boost::optional< double > v7_VisibleReflectanceBack, boost::optional< double > v8_VisibleReflectanceFront, boost::optional< double > v9_SolarReflectanceFront, boost::optional< double > v10_SolarReflectanceBack);
+    typedef IfcTemplatedEntityList< IfcOpticalMaterialProperties > list;
 };
 /// A named and structured grouping with a corporate identity.
 /// 
@@ -8201,43 +9301,42 @@ class IfcOpticalMaterialProperties : public IfcMaterialProperties {
 class IfcOrganization : public IfcUtil::IfcBaseEntity {
 public:
     /// Whether the optional attribute Id is defined for this IfcOrganization
-    bool hasId();
-    IfcIdentifier Id();
-    void setId(IfcIdentifier v);
+    bool hasId() const;
+    std::string Id() const;
+    void setId(std::string v);
     /// The word, or group of words, by which the organization is referred to.
-    IfcLabel Name();
-    void setName(IfcLabel v);
+    std::string Name() const;
+    void setName(std::string v);
     /// Whether the optional attribute Description is defined for this IfcOrganization
-    bool hasDescription();
+    bool hasDescription() const;
     /// Text that relates the nature of the organization.
-    IfcText Description();
-    void setDescription(IfcText v);
+    std::string Description() const;
+    void setDescription(std::string v);
     /// Whether the optional attribute Roles is defined for this IfcOrganization
-    bool hasRoles();
+    bool hasRoles() const;
     /// Roles played by the organization.
-    SHARED_PTR< IfcTemplatedEntityList< IfcActorRole > > Roles();
-    void setRoles(SHARED_PTR< IfcTemplatedEntityList< IfcActorRole > > v);
+    IfcTemplatedEntityList< IfcActorRole >::ptr Roles() const;
+    void setRoles(IfcTemplatedEntityList< IfcActorRole >::ptr v);
     /// Whether the optional attribute Addresses is defined for this IfcOrganization
-    bool hasAddresses();
+    bool hasAddresses() const;
     /// Postal and telecom addresses of an organization.
     /// NOTE: There may be several addresses related to an organization.
-    SHARED_PTR< IfcTemplatedEntityList< IfcAddress > > Addresses();
-    void setAddresses(SHARED_PTR< IfcTemplatedEntityList< IfcAddress > > v);
+    IfcTemplatedEntityList< IfcAddress >::ptr Addresses() const;
+    void setAddresses(IfcTemplatedEntityList< IfcAddress >::ptr v);
     virtual unsigned int getArgumentCount() const { return 5; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_STRING; case 1: return IfcUtil::Argument_STRING; case 2: return IfcUtil::Argument_STRING; case 3: return IfcUtil::Argument_ENTITY_LIST; case 4: return IfcUtil::Argument_ENTITY_LIST; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcIdentifier; case 1: return Type::IfcLabel; case 2: return Type::IfcText; case 3: return Type::IfcActorRole; case 4: return Type::IfcAddress; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Id"; case 1: return "Name"; case 2: return "Description"; case 3: return "Roles"; case 4: return "Addresses"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcOrganizationRelationship > > IsRelatedBy(); // INVERSE IfcOrganizationRelationship::RelatedOrganizations
-    SHARED_PTR< IfcTemplatedEntityList< IfcOrganizationRelationship > > Relates(); // INVERSE IfcOrganizationRelationship::RelatingOrganization
-    SHARED_PTR< IfcTemplatedEntityList< IfcPersonAndOrganization > > Engages(); // INVERSE IfcPersonAndOrganization::TheOrganization
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcOrganizationRelationship >::ptr IsRelatedBy() const; // INVERSE IfcOrganizationRelationship::RelatedOrganizations
+    IfcTemplatedEntityList< IfcOrganizationRelationship >::ptr Relates() const; // INVERSE IfcOrganizationRelationship::RelatingOrganization
+    IfcTemplatedEntityList< IfcPersonAndOrganization >::ptr Engages() const; // INVERSE IfcPersonAndOrganization::TheOrganization
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcOrganization (IfcAbstractEntityPtr e);
-    IfcOrganization (boost::optional< IfcIdentifier > v1_Id, IfcLabel v2_Name, boost::optional< IfcText > v3_Description, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcActorRole > > > v4_Roles, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcAddress > > > v5_Addresses);
-    typedef IfcOrganization* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcOrganization > > list;
-    typedef IfcTemplatedEntityList< IfcOrganization >::it it;
+    IfcOrganization (IfcAbstractEntity* e);
+    IfcOrganization (boost::optional< std::string > v1_Id, std::string v2_Name, boost::optional< std::string > v3_Description, boost::optional< IfcTemplatedEntityList< IfcActorRole >::ptr > v4_Roles, boost::optional< IfcTemplatedEntityList< IfcAddress >::ptr > v5_Addresses);
+    typedef IfcTemplatedEntityList< IfcOrganization > list;
 };
 /// Definition: establishes an association between one relating organization and one or more related organizations.
 /// 
@@ -8248,31 +9347,30 @@ class IfcOrganization : public IfcUtil::IfcBaseEntity {
 class IfcOrganizationRelationship : public IfcUtil::IfcBaseEntity {
 public:
     /// The word or group of words by which the relationship is referred to.
-    IfcLabel Name();
-    void setName(IfcLabel v);
+    std::string Name() const;
+    void setName(std::string v);
     /// Whether the optional attribute Description is defined for this IfcOrganizationRelationship
-    bool hasDescription();
+    bool hasDescription() const;
     /// Text that relates the nature of the relationship.
-    IfcText Description();
-    void setDescription(IfcText v);
+    std::string Description() const;
+    void setDescription(std::string v);
     /// Organization which is the relating part of the relationship between organizations.
-    IfcOrganization* RelatingOrganization();
+    IfcOrganization* RelatingOrganization() const;
     void setRelatingOrganization(IfcOrganization* v);
     /// The other, possibly dependent, organizations which are the related parts of the relationship between organizations.
-    SHARED_PTR< IfcTemplatedEntityList< IfcOrganization > > RelatedOrganizations();
-    void setRelatedOrganizations(SHARED_PTR< IfcTemplatedEntityList< IfcOrganization > > v);
+    IfcTemplatedEntityList< IfcOrganization >::ptr RelatedOrganizations() const;
+    void setRelatedOrganizations(IfcTemplatedEntityList< IfcOrganization >::ptr v);
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_STRING; case 1: return IfcUtil::Argument_STRING; case 2: return IfcUtil::Argument_ENTITY; case 3: return IfcUtil::Argument_ENTITY_LIST; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcLabel; case 1: return Type::IfcText; case 2: return Type::IfcOrganization; case 3: return Type::IfcOrganization; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Name"; case 1: return "Description"; case 2: return "RelatingOrganization"; case 3: return "RelatedOrganizations"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcOrganizationRelationship (IfcAbstractEntityPtr e);
-    IfcOrganizationRelationship (IfcLabel v1_Name, boost::optional< IfcText > v2_Description, IfcOrganization* v3_RelatingOrganization, SHARED_PTR< IfcTemplatedEntityList< IfcOrganization > > v4_RelatedOrganizations);
-    typedef IfcOrganizationRelationship* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcOrganizationRelationship > > list;
-    typedef IfcTemplatedEntityList< IfcOrganizationRelationship >::it it;
+    IfcOrganizationRelationship (IfcAbstractEntity* e);
+    IfcOrganizationRelationship (std::string v1_Name, boost::optional< std::string > v2_Description, IfcOrganization* v3_RelatingOrganization, IfcTemplatedEntityList< IfcOrganization >::ptr v4_RelatedOrganizations);
+    typedef IfcTemplatedEntityList< IfcOrganizationRelationship > list;
 };
 /// IfcOwnerHistory defines all history and identification related information. In order to provide fast access it is directly attached to all independent objects, relationships and properties.
 /// 
@@ -8287,49 +9385,48 @@ class IfcOrganizationRelationship : public IfcUtil::IfcBaseEntity {
 class IfcOwnerHistory : public IfcUtil::IfcBaseEntity {
 public:
     /// Direct reference to the end user who currently "owns" this object. Note that IFC includes the concept of ownership transfer from one user to another and therefore distinguishes between the Owning User and Creating User.
-    IfcPersonAndOrganization* OwningUser();
+    IfcPersonAndOrganization* OwningUser() const;
     void setOwningUser(IfcPersonAndOrganization* v);
     /// Direct reference to the application which currently "Owns" this object on behalf of the owning user, who uses this application. Note that IFC includes the concept of ownership transfer from one application to another and therefore distinguishes between the Owning Application and Creating Application.
-    IfcApplication* OwningApplication();
+    IfcApplication* OwningApplication() const;
     void setOwningApplication(IfcApplication* v);
     /// Whether the optional attribute State is defined for this IfcOwnerHistory
-    bool hasState();
+    bool hasState() const;
     /// Enumeration that defines the current access state of the object.
-    IfcStateEnum::IfcStateEnum State();
+    IfcStateEnum::IfcStateEnum State() const;
     void setState(IfcStateEnum::IfcStateEnum v);
     /// Enumeration that defines the actions associated with changes made to the object.
-    IfcChangeActionEnum::IfcChangeActionEnum ChangeAction();
+    IfcChangeActionEnum::IfcChangeActionEnum ChangeAction() const;
     void setChangeAction(IfcChangeActionEnum::IfcChangeActionEnum v);
     /// Whether the optional attribute LastModifiedDate is defined for this IfcOwnerHistory
-    bool hasLastModifiedDate();
+    bool hasLastModifiedDate() const;
     /// Date and Time expressed in UTC (Universal Time Coordinated, formerly Greenwich Mean Time or GMT) at which the last modification was made by LastModifyingUser and LastModifyingApplication.
-    IfcTimeStamp LastModifiedDate();
-    void setLastModifiedDate(IfcTimeStamp v);
+    int LastModifiedDate() const;
+    void setLastModifiedDate(int v);
     /// Whether the optional attribute LastModifyingUser is defined for this IfcOwnerHistory
-    bool hasLastModifyingUser();
+    bool hasLastModifyingUser() const;
     /// User who carried out the last modification using LastModifyingApplication.
-    IfcPersonAndOrganization* LastModifyingUser();
+    IfcPersonAndOrganization* LastModifyingUser() const;
     void setLastModifyingUser(IfcPersonAndOrganization* v);
     /// Whether the optional attribute LastModifyingApplication is defined for this IfcOwnerHistory
-    bool hasLastModifyingApplication();
+    bool hasLastModifyingApplication() const;
     /// Application used to make the last modification.
-    IfcApplication* LastModifyingApplication();
+    IfcApplication* LastModifyingApplication() const;
     void setLastModifyingApplication(IfcApplication* v);
     /// The date and time expressed in UTC (Universal Time Coordinated, formerly Greenwich Mean Time or GMT) when first created by the original OwningApplication. Once defined this value remains unchanged through the lifetime of the entity.
-    IfcTimeStamp CreationDate();
-    void setCreationDate(IfcTimeStamp v);
+    int CreationDate() const;
+    void setCreationDate(int v);
     virtual unsigned int getArgumentCount() const { return 8; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY; case 1: return IfcUtil::Argument_ENTITY; case 2: return IfcUtil::Argument_ENUMERATION; case 3: return IfcUtil::Argument_ENUMERATION; case 4: return IfcUtil::Argument_INT; case 5: return IfcUtil::Argument_ENTITY; case 6: return IfcUtil::Argument_ENTITY; case 7: return IfcUtil::Argument_INT; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcPersonAndOrganization; case 1: return Type::IfcApplication; case 2: return Type::IfcStateEnum; case 3: return Type::IfcChangeActionEnum; case 4: return Type::IfcTimeStamp; case 5: return Type::IfcPersonAndOrganization; case 6: return Type::IfcApplication; case 7: return Type::IfcTimeStamp; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "OwningUser"; case 1: return "OwningApplication"; case 2: return "State"; case 3: return "ChangeAction"; case 4: return "LastModifiedDate"; case 5: return "LastModifyingUser"; case 6: return "LastModifyingApplication"; case 7: return "CreationDate"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcOwnerHistory (IfcAbstractEntityPtr e);
-    IfcOwnerHistory (IfcPersonAndOrganization* v1_OwningUser, IfcApplication* v2_OwningApplication, boost::optional< IfcStateEnum::IfcStateEnum > v3_State, IfcChangeActionEnum::IfcChangeActionEnum v4_ChangeAction, boost::optional< IfcTimeStamp > v5_LastModifiedDate, IfcPersonAndOrganization* v6_LastModifyingUser, IfcApplication* v7_LastModifyingApplication, IfcTimeStamp v8_CreationDate);
-    typedef IfcOwnerHistory* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcOwnerHistory > > list;
-    typedef IfcTemplatedEntityList< IfcOwnerHistory >::it it;
+    IfcOwnerHistory (IfcAbstractEntity* e);
+    IfcOwnerHistory (IfcPersonAndOrganization* v1_OwningUser, IfcApplication* v2_OwningApplication, boost::optional< IfcStateEnum::IfcStateEnum > v3_State, IfcChangeActionEnum::IfcChangeActionEnum v4_ChangeAction, boost::optional< int > v5_LastModifiedDate, IfcPersonAndOrganization* v6_LastModifyingUser, IfcApplication* v7_LastModifyingApplication, int v8_CreationDate);
+    typedef IfcTemplatedEntityList< IfcOwnerHistory > list;
 };
 /// Definition: an individual human being.
 /// 
@@ -8343,63 +9440,62 @@ class IfcOwnerHistory : public IfcUtil::IfcBaseEntity {
 class IfcPerson : public IfcUtil::IfcBaseEntity {
 public:
     /// Whether the optional attribute Id is defined for this IfcPerson
-    bool hasId();
-    IfcIdentifier Id();
-    void setId(IfcIdentifier v);
+    bool hasId() const;
+    std::string Id() const;
+    void setId(std::string v);
     /// Whether the optional attribute FamilyName is defined for this IfcPerson
-    bool hasFamilyName();
+    bool hasFamilyName() const;
     /// The name by which the family identity of the person may be recognized.
     /// NOTE: Depending on geographical location and culture, family name may appear either as the first or last component of a name.
-    IfcLabel FamilyName();
-    void setFamilyName(IfcLabel v);
+    std::string FamilyName() const;
+    void setFamilyName(std::string v);
     /// Whether the optional attribute GivenName is defined for this IfcPerson
-    bool hasGivenName();
+    bool hasGivenName() const;
     /// The name by which a person is known within a family and by which he or she may be familiarly recognized.
     /// NOTE: Depending on geographical location and culture, given name may appear either as the first or last component of a name.
-    IfcLabel GivenName();
-    void setGivenName(IfcLabel v);
+    std::string GivenName() const;
+    void setGivenName(std::string v);
     /// Whether the optional attribute MiddleNames is defined for this IfcPerson
-    bool hasMiddleNames();
+    bool hasMiddleNames() const;
     /// Additional names given to a person that enable their identification apart from others who may have the same or similar family and given names.
     /// NOTE: Middle names are not normally used in familiar communication but may be asserted to provide additional 
     /// identification of a particular person if necessary. They may be particularly useful in situations where the person concerned has a 
     /// family name that occurs commonly in the geographical region.
-    std::vector< IfcLabel > /*[1:?]*/ MiddleNames();
-    void setMiddleNames(std::vector< IfcLabel > /*[1:?]*/ v);
+    std::vector< std::string > /*[1:?]*/ MiddleNames() const;
+    void setMiddleNames(std::vector< std::string > /*[1:?]*/ v);
     /// Whether the optional attribute PrefixTitles is defined for this IfcPerson
-    bool hasPrefixTitles();
+    bool hasPrefixTitles() const;
     /// The word, or group of words, which specify the person's social and/or professional standing and appear before his/her names.
-    std::vector< IfcLabel > /*[1:?]*/ PrefixTitles();
-    void setPrefixTitles(std::vector< IfcLabel > /*[1:?]*/ v);
+    std::vector< std::string > /*[1:?]*/ PrefixTitles() const;
+    void setPrefixTitles(std::vector< std::string > /*[1:?]*/ v);
     /// Whether the optional attribute SuffixTitles is defined for this IfcPerson
-    bool hasSuffixTitles();
+    bool hasSuffixTitles() const;
     /// The word, or group of words, which specify the person's social and/or professional standing and appear after his/her names.
-    std::vector< IfcLabel > /*[1:?]*/ SuffixTitles();
-    void setSuffixTitles(std::vector< IfcLabel > /*[1:?]*/ v);
+    std::vector< std::string > /*[1:?]*/ SuffixTitles() const;
+    void setSuffixTitles(std::vector< std::string > /*[1:?]*/ v);
     /// Whether the optional attribute Roles is defined for this IfcPerson
-    bool hasRoles();
+    bool hasRoles() const;
     /// Roles played by the person.
-    SHARED_PTR< IfcTemplatedEntityList< IfcActorRole > > Roles();
-    void setRoles(SHARED_PTR< IfcTemplatedEntityList< IfcActorRole > > v);
+    IfcTemplatedEntityList< IfcActorRole >::ptr Roles() const;
+    void setRoles(IfcTemplatedEntityList< IfcActorRole >::ptr v);
     /// Whether the optional attribute Addresses is defined for this IfcPerson
-    bool hasAddresses();
+    bool hasAddresses() const;
     /// Postal and telecommunication addresses of a person.
     /// NOTE - A person may have several addresses.
-    SHARED_PTR< IfcTemplatedEntityList< IfcAddress > > Addresses();
-    void setAddresses(SHARED_PTR< IfcTemplatedEntityList< IfcAddress > > v);
+    IfcTemplatedEntityList< IfcAddress >::ptr Addresses() const;
+    void setAddresses(IfcTemplatedEntityList< IfcAddress >::ptr v);
     virtual unsigned int getArgumentCount() const { return 8; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_STRING; case 1: return IfcUtil::Argument_STRING; case 2: return IfcUtil::Argument_STRING; case 3: return IfcUtil::Argument_VECTOR_STRING; case 4: return IfcUtil::Argument_VECTOR_STRING; case 5: return IfcUtil::Argument_VECTOR_STRING; case 6: return IfcUtil::Argument_ENTITY_LIST; case 7: return IfcUtil::Argument_ENTITY_LIST; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcIdentifier; case 1: return Type::IfcLabel; case 2: return Type::IfcLabel; case 3: return Type::IfcLabel; case 4: return Type::IfcLabel; case 5: return Type::IfcLabel; case 6: return Type::IfcActorRole; case 7: return Type::IfcAddress; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Id"; case 1: return "FamilyName"; case 2: return "GivenName"; case 3: return "MiddleNames"; case 4: return "PrefixTitles"; case 5: return "SuffixTitles"; case 6: return "Roles"; case 7: return "Addresses"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcPersonAndOrganization > > EngagedIn(); // INVERSE IfcPersonAndOrganization::ThePerson
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcPersonAndOrganization >::ptr EngagedIn() const; // INVERSE IfcPersonAndOrganization::ThePerson
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcPerson (IfcAbstractEntityPtr e);
-    IfcPerson (boost::optional< IfcIdentifier > v1_Id, boost::optional< IfcLabel > v2_FamilyName, boost::optional< IfcLabel > v3_GivenName, boost::optional< std::vector< IfcLabel > /*[1:?]*/ > v4_MiddleNames, boost::optional< std::vector< IfcLabel > /*[1:?]*/ > v5_PrefixTitles, boost::optional< std::vector< IfcLabel > /*[1:?]*/ > v6_SuffixTitles, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcActorRole > > > v7_Roles, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcAddress > > > v8_Addresses);
-    typedef IfcPerson* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcPerson > > list;
-    typedef IfcTemplatedEntityList< IfcPerson >::it it;
+    IfcPerson (IfcAbstractEntity* e);
+    IfcPerson (boost::optional< std::string > v1_Id, boost::optional< std::string > v2_FamilyName, boost::optional< std::string > v3_GivenName, boost::optional< std::vector< std::string > /*[1:?]*/ > v4_MiddleNames, boost::optional< std::vector< std::string > /*[1:?]*/ > v5_PrefixTitles, boost::optional< std::vector< std::string > /*[1:?]*/ > v6_SuffixTitles, boost::optional< IfcTemplatedEntityList< IfcActorRole >::ptr > v7_Roles, boost::optional< IfcTemplatedEntityList< IfcAddress >::ptr > v8_Addresses);
+    typedef IfcTemplatedEntityList< IfcPerson > list;
 };
 /// Definition: Identification of a person within an organization.
 /// 
@@ -8409,28 +9505,27 @@ class IfcPerson : public IfcUtil::IfcBaseEntity {
 class IfcPersonAndOrganization : public IfcUtil::IfcBaseEntity {
 public:
     /// The person who is related to the organization.
-    IfcPerson* ThePerson();
+    IfcPerson* ThePerson() const;
     void setThePerson(IfcPerson* v);
     /// The organization to which the person is related.
-    IfcOrganization* TheOrganization();
+    IfcOrganization* TheOrganization() const;
     void setTheOrganization(IfcOrganization* v);
     /// Whether the optional attribute Roles is defined for this IfcPersonAndOrganization
-    bool hasRoles();
+    bool hasRoles() const;
     /// Roles played by the person within the context of an organization.  These may differ from the roles in ThePerson.Roles which may be asserted without organizational context.
-    SHARED_PTR< IfcTemplatedEntityList< IfcActorRole > > Roles();
-    void setRoles(SHARED_PTR< IfcTemplatedEntityList< IfcActorRole > > v);
+    IfcTemplatedEntityList< IfcActorRole >::ptr Roles() const;
+    void setRoles(IfcTemplatedEntityList< IfcActorRole >::ptr v);
     virtual unsigned int getArgumentCount() const { return 3; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY; case 1: return IfcUtil::Argument_ENTITY; case 2: return IfcUtil::Argument_ENTITY_LIST; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcPerson; case 1: return Type::IfcOrganization; case 2: return Type::IfcActorRole; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "ThePerson"; case 1: return "TheOrganization"; case 2: return "Roles"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcPersonAndOrganization (IfcAbstractEntityPtr e);
-    IfcPersonAndOrganization (IfcPerson* v1_ThePerson, IfcOrganization* v2_TheOrganization, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcActorRole > > > v3_Roles);
-    typedef IfcPersonAndOrganization* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcPersonAndOrganization > > list;
-    typedef IfcTemplatedEntityList< IfcPersonAndOrganization >::it it;
+    IfcPersonAndOrganization (IfcAbstractEntity* e);
+    IfcPersonAndOrganization (IfcPerson* v1_ThePerson, IfcOrganization* v2_TheOrganization, boost::optional< IfcTemplatedEntityList< IfcActorRole >::ptr > v3_Roles);
+    typedef IfcTemplatedEntityList< IfcPersonAndOrganization > list;
 };
 /// The physical quantity, IfcPhysicalQuantity, is an abstract entity that holds a complex or simple quantity measure together with a semantic definition of the usage for the single or several measure value. 
 /// 
@@ -8440,26 +9535,25 @@ class IfcPersonAndOrganization : public IfcUtil::IfcBaseEntity {
 class IfcPhysicalQuantity : public IfcUtil::IfcBaseEntity {
 public:
     /// Name of the element quantity or measure. The name attribute has to be made recognizable by further agreements.
-    IfcLabel Name();
-    void setName(IfcLabel v);
+    std::string Name() const;
+    void setName(std::string v);
     /// Whether the optional attribute Description is defined for this IfcPhysicalQuantity
-    bool hasDescription();
+    bool hasDescription() const;
     /// Further explanation that might be given to the quantity.
-    IfcText Description();
-    void setDescription(IfcText v);
+    std::string Description() const;
+    void setDescription(std::string v);
     virtual unsigned int getArgumentCount() const { return 2; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_STRING; case 1: return IfcUtil::Argument_STRING; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcLabel; case 1: return Type::IfcText; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Name"; case 1: return "Description"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcPhysicalComplexQuantity > > PartOfComplex(); // INVERSE IfcPhysicalComplexQuantity::HasQuantities
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcPhysicalComplexQuantity >::ptr PartOfComplex() const; // INVERSE IfcPhysicalComplexQuantity::HasQuantities
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcPhysicalQuantity (IfcAbstractEntityPtr e);
-    IfcPhysicalQuantity (IfcLabel v1_Name, boost::optional< IfcText > v2_Description);
-    typedef IfcPhysicalQuantity* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcPhysicalQuantity > > list;
-    typedef IfcTemplatedEntityList< IfcPhysicalQuantity >::it it;
+    IfcPhysicalQuantity (IfcAbstractEntity* e);
+    IfcPhysicalQuantity (std::string v1_Name, boost::optional< std::string > v2_Description);
+    typedef IfcTemplatedEntityList< IfcPhysicalQuantity > list;
 };
 /// The physical quantity, IfcPhysicalSimpleQuantity, is an entity that holds a single quantity measure value (as defined at the subtypes of IfcPhysicalSimpleQuantity) together with a semantic definition of the usage for the measure value. 
 /// 
@@ -8473,22 +9567,21 @@ class IfcPhysicalQuantity : public IfcUtil::IfcBaseEntity {
 class IfcPhysicalSimpleQuantity : public IfcPhysicalQuantity {
 public:
     /// Whether the optional attribute Unit is defined for this IfcPhysicalSimpleQuantity
-    bool hasUnit();
+    bool hasUnit() const;
     /// Optional assignment of a unit. If no unit is given, then the global unit assignment, as established at the IfcProject, applies to the quantity measures.
-    IfcNamedUnit* Unit();
+    IfcNamedUnit* Unit() const;
     void setUnit(IfcNamedUnit* v);
     virtual unsigned int getArgumentCount() const { return 3; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 2: return IfcUtil::Argument_ENTITY; } return IfcPhysicalQuantity::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 2: return Type::IfcNamedUnit; } return IfcPhysicalQuantity::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 2: return "Unit"; } return IfcPhysicalQuantity::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcPhysicalSimpleQuantity (IfcAbstractEntityPtr e);
-    IfcPhysicalSimpleQuantity (IfcLabel v1_Name, boost::optional< IfcText > v2_Description, IfcNamedUnit* v3_Unit);
-    typedef IfcPhysicalSimpleQuantity* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcPhysicalSimpleQuantity > > list;
-    typedef IfcTemplatedEntityList< IfcPhysicalSimpleQuantity >::it it;
+    IfcPhysicalSimpleQuantity (IfcAbstractEntity* e);
+    IfcPhysicalSimpleQuantity (std::string v1_Name, boost::optional< std::string > v2_Description, IfcNamedUnit* v3_Unit);
+    typedef IfcTemplatedEntityList< IfcPhysicalSimpleQuantity > list;
 };
 /// Definition: The address for delivery of paper based mail.
 /// 
@@ -8496,58 +9589,57 @@ class IfcPhysicalSimpleQuantity : public IfcPhysicalQuantity {
 class IfcPostalAddress : public IfcAddress {
 public:
     /// Whether the optional attribute InternalLocation is defined for this IfcPostalAddress
-    bool hasInternalLocation();
+    bool hasInternalLocation() const;
     /// An organization defined address for internal mail delivery.
-    IfcLabel InternalLocation();
-    void setInternalLocation(IfcLabel v);
+    std::string InternalLocation() const;
+    void setInternalLocation(std::string v);
     /// Whether the optional attribute AddressLines is defined for this IfcPostalAddress
-    bool hasAddressLines();
+    bool hasAddressLines() const;
     /// The postal address.
     /// NOTE: A postal address may occupy several lines (or elements) when recorded. 
     /// It is expected that normal usage will incorporate relevant elements of the following address concepts: 
     /// A location within a building (e.g. 3rd Floor) Building name (e.g. Interoperability House) Street number 
     /// (e.g. 6400) Street name (e.g. Alliance Boulevard). Typical content of address lines may vary in different 
     /// countries.
-    std::vector< IfcLabel > /*[1:?]*/ AddressLines();
-    void setAddressLines(std::vector< IfcLabel > /*[1:?]*/ v);
+    std::vector< std::string > /*[1:?]*/ AddressLines() const;
+    void setAddressLines(std::vector< std::string > /*[1:?]*/ v);
     /// Whether the optional attribute PostalBox is defined for this IfcPostalAddress
-    bool hasPostalBox();
+    bool hasPostalBox() const;
     /// An address that is implied by an identifiable mail drop.
-    IfcLabel PostalBox();
-    void setPostalBox(IfcLabel v);
+    std::string PostalBox() const;
+    void setPostalBox(std::string v);
     /// Whether the optional attribute Town is defined for this IfcPostalAddress
-    bool hasTown();
+    bool hasTown() const;
     /// The name of a town.
-    IfcLabel Town();
-    void setTown(IfcLabel v);
+    std::string Town() const;
+    void setTown(std::string v);
     /// Whether the optional attribute Region is defined for this IfcPostalAddress
-    bool hasRegion();
+    bool hasRegion() const;
     /// The name of a region.
     /// NOTE: The counties of the United Kingdom and the states of North America are examples of regions.
-    IfcLabel Region();
-    void setRegion(IfcLabel v);
+    std::string Region() const;
+    void setRegion(std::string v);
     /// Whether the optional attribute PostalCode is defined for this IfcPostalAddress
-    bool hasPostalCode();
+    bool hasPostalCode() const;
     /// The code that is used by the country's postal service.
-    IfcLabel PostalCode();
-    void setPostalCode(IfcLabel v);
+    std::string PostalCode() const;
+    void setPostalCode(std::string v);
     /// Whether the optional attribute Country is defined for this IfcPostalAddress
-    bool hasCountry();
+    bool hasCountry() const;
     /// The name of a country.
-    IfcLabel Country();
-    void setCountry(IfcLabel v);
+    std::string Country() const;
+    void setCountry(std::string v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 3: return IfcUtil::Argument_STRING; case 4: return IfcUtil::Argument_VECTOR_STRING; case 5: return IfcUtil::Argument_STRING; case 6: return IfcUtil::Argument_STRING; case 7: return IfcUtil::Argument_STRING; case 8: return IfcUtil::Argument_STRING; case 9: return IfcUtil::Argument_STRING; } return IfcAddress::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 3: return Type::IfcLabel; case 4: return Type::IfcLabel; case 5: return Type::IfcLabel; case 6: return Type::IfcLabel; case 7: return Type::IfcLabel; case 8: return Type::IfcLabel; case 9: return Type::IfcLabel; } return IfcAddress::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 3: return "InternalLocation"; case 4: return "AddressLines"; case 5: return "PostalBox"; case 6: return "Town"; case 7: return "Region"; case 8: return "PostalCode"; case 9: return "Country"; } return IfcAddress::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcPostalAddress (IfcAbstractEntityPtr e);
-    IfcPostalAddress (boost::optional< IfcAddressTypeEnum::IfcAddressTypeEnum > v1_Purpose, boost::optional< IfcText > v2_Description, boost::optional< IfcLabel > v3_UserDefinedPurpose, boost::optional< IfcLabel > v4_InternalLocation, boost::optional< std::vector< IfcLabel > /*[1:?]*/ > v5_AddressLines, boost::optional< IfcLabel > v6_PostalBox, boost::optional< IfcLabel > v7_Town, boost::optional< IfcLabel > v8_Region, boost::optional< IfcLabel > v9_PostalCode, boost::optional< IfcLabel > v10_Country);
-    typedef IfcPostalAddress* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcPostalAddress > > list;
-    typedef IfcTemplatedEntityList< IfcPostalAddress >::it it;
+    IfcPostalAddress (IfcAbstractEntity* e);
+    IfcPostalAddress (boost::optional< IfcAddressTypeEnum::IfcAddressTypeEnum > v1_Purpose, boost::optional< std::string > v2_Description, boost::optional< std::string > v3_UserDefinedPurpose, boost::optional< std::string > v4_InternalLocation, boost::optional< std::vector< std::string > /*[1:?]*/ > v5_AddressLines, boost::optional< std::string > v6_PostalBox, boost::optional< std::string > v7_Town, boost::optional< std::string > v8_Region, boost::optional< std::string > v9_PostalCode, boost::optional< std::string > v10_Country);
+    typedef IfcTemplatedEntityList< IfcPostalAddress > list;
 };
 /// A pre defined item is a qualified name given to a style or font which is determined within the data exchange specification by convention on using the Name attribute value (in contrary to externally defined items, which are agreed by an external source).
 /// 
@@ -8559,20 +9651,19 @@ class IfcPostalAddress : public IfcAddress {
 class IfcPreDefinedItem : public IfcUtil::IfcBaseEntity {
 public:
     /// The string by which the pre defined item is identified. Allowable values for the string are declared at the level of subtypes.
-    IfcLabel Name();
-    void setName(IfcLabel v);
+    std::string Name() const;
+    void setName(std::string v);
     virtual unsigned int getArgumentCount() const { return 1; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_STRING; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcLabel; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Name"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcPreDefinedItem (IfcAbstractEntityPtr e);
-    IfcPreDefinedItem (IfcLabel v1_Name);
-    typedef IfcPreDefinedItem* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcPreDefinedItem > > list;
-    typedef IfcTemplatedEntityList< IfcPreDefinedItem >::it it;
+    IfcPreDefinedItem (IfcAbstractEntity* e);
+    IfcPreDefinedItem (std::string v1_Name);
+    typedef IfcTemplatedEntityList< IfcPreDefinedItem > list;
 };
 /// A predefined symbol is a symbol that gets its shape information by a conforming name that is specified within subtypes of the entity.
 /// 
@@ -8585,32 +9676,30 @@ class IfcPreDefinedSymbol : public IfcPreDefinedItem {
 public:
     virtual unsigned int getArgumentCount() const { return 1; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcPreDefinedItem::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcPreDefinedItem::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcPreDefinedItem::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcPreDefinedSymbol (IfcAbstractEntityPtr e);
-    IfcPreDefinedSymbol (IfcLabel v1_Name);
-    typedef IfcPreDefinedSymbol* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcPreDefinedSymbol > > list;
-    typedef IfcTemplatedEntityList< IfcPreDefinedSymbol >::it it;
+    IfcPreDefinedSymbol (IfcAbstractEntity* e);
+    IfcPreDefinedSymbol (std::string v1_Name);
+    typedef IfcTemplatedEntityList< IfcPreDefinedSymbol > list;
 };
 
 class IfcPreDefinedTerminatorSymbol : public IfcPreDefinedSymbol {
 public:
     virtual unsigned int getArgumentCount() const { return 1; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcPreDefinedSymbol::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcPreDefinedSymbol::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcPreDefinedSymbol::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcPreDefinedTerminatorSymbol (IfcAbstractEntityPtr e);
-    IfcPreDefinedTerminatorSymbol (IfcLabel v1_Name);
-    typedef IfcPreDefinedTerminatorSymbol* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcPreDefinedTerminatorSymbol > > list;
-    typedef IfcTemplatedEntityList< IfcPreDefinedTerminatorSymbol >::it it;
+    IfcPreDefinedTerminatorSymbol (IfcAbstractEntity* e);
+    IfcPreDefinedTerminatorSymbol (std::string v1_Name);
+    typedef IfcTemplatedEntityList< IfcPreDefinedTerminatorSymbol > list;
 };
 /// The pre defined text font determines those qualified names which can be used for fonts that are in scope of the current data exchange specification (in contrary to externally defined text fonts). There are two choices:
 /// 
@@ -8627,16 +9716,15 @@ class IfcPreDefinedTextFont : public IfcPreDefinedItem {
 public:
     virtual unsigned int getArgumentCount() const { return 1; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcPreDefinedItem::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcPreDefinedItem::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcPreDefinedItem::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcPreDefinedTextFont (IfcAbstractEntityPtr e);
-    IfcPreDefinedTextFont (IfcLabel v1_Name);
-    typedef IfcPreDefinedTextFont* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcPreDefinedTextFont > > list;
-    typedef IfcTemplatedEntityList< IfcPreDefinedTextFont >::it it;
+    IfcPreDefinedTextFont (IfcAbstractEntity* e);
+    IfcPreDefinedTextFont (std::string v1_Name);
+    typedef IfcTemplatedEntityList< IfcPreDefinedTextFont > list;
 };
 /// The presentation layer assignment provides the layer name (and optionally a description and an identifier) for a collection of geometric representation items. The IfcPresentationLayerAssignment corresponds to the term "CAD Layer" and is used mainly for grouping and visibility control.
 /// 
@@ -8656,33 +9744,32 @@ class IfcPreDefinedTextFont : public IfcPreDefinedItem {
 class IfcPresentationLayerAssignment : public IfcUtil::IfcBaseEntity {
 public:
     /// Name of the layer.
-    IfcLabel Name();
-    void setName(IfcLabel v);
+    std::string Name() const;
+    void setName(std::string v);
     /// Whether the optional attribute Description is defined for this IfcPresentationLayerAssignment
-    bool hasDescription();
+    bool hasDescription() const;
     /// Additional description of the layer.
-    IfcText Description();
-    void setDescription(IfcText v);
+    std::string Description() const;
+    void setDescription(std::string v);
     /// The set of layered items, which are assigned to this layer.
-    SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > AssignedItems();
-    void setAssignedItems(SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > v);
+    IfcEntityList::ptr AssignedItems() const;
+    void setAssignedItems(IfcEntityList::ptr v);
     /// Whether the optional attribute Identifier is defined for this IfcPresentationLayerAssignment
-    bool hasIdentifier();
+    bool hasIdentifier() const;
     /// An (internal) identifier assigned to the layer.
-    IfcIdentifier Identifier();
-    void setIdentifier(IfcIdentifier v);
+    std::string Identifier() const;
+    void setIdentifier(std::string v);
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_STRING; case 1: return IfcUtil::Argument_STRING; case 2: return IfcUtil::Argument_ENTITY_LIST; case 3: return IfcUtil::Argument_STRING; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcLabel; case 1: return Type::IfcText; case 2: return Type::IfcLayeredItem; case 3: return Type::IfcIdentifier; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Name"; case 1: return "Description"; case 2: return "AssignedItems"; case 3: return "Identifier"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcPresentationLayerAssignment (IfcAbstractEntityPtr e);
-    IfcPresentationLayerAssignment (IfcLabel v1_Name, boost::optional< IfcText > v2_Description, IfcEntities v3_AssignedItems, boost::optional< IfcIdentifier > v4_Identifier);
-    typedef IfcPresentationLayerAssignment* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcPresentationLayerAssignment > > list;
-    typedef IfcTemplatedEntityList< IfcPresentationLayerAssignment >::it it;
+    IfcPresentationLayerAssignment (IfcAbstractEntity* e);
+    IfcPresentationLayerAssignment (std::string v1_Name, boost::optional< std::string > v2_Description, IfcEntityList::ptr v3_AssignedItems, boost::optional< std::string > v4_Identifier);
+    typedef IfcTemplatedEntityList< IfcPresentationLayerAssignment > list;
 };
 /// An IfcPresentationLayerAssignmentWithStyle extends the presentation layer assignment with capabilities to define visibility control, access control and common style information.
 /// 
@@ -8700,33 +9787,32 @@ class IfcPresentationLayerAssignment : public IfcUtil::IfcBaseEntity {
 class IfcPresentationLayerWithStyle : public IfcPresentationLayerAssignment {
 public:
     /// A logical setting, TRUE indicates that the layer is set to 'On', FALSE that the layer is set to 'Off', UNKNOWN that such information is not available.
-    bool LayerOn();
+    bool LayerOn() const;
     void setLayerOn(bool v);
     /// A logical setting, TRUE indicates that the layer is set to 'Frozen', FALSE that the layer is set to 'Not frozen', UNKNOWN that such information is not available.
-    bool LayerFrozen();
+    bool LayerFrozen() const;
     void setLayerFrozen(bool v);
     /// A logical setting, TRUE indicates that the layer is set to 'Blocked', FALSE that the layer is set to 'Not blocked', UNKNOWN that such information is not available.
-    bool LayerBlocked();
+    bool LayerBlocked() const;
     void setLayerBlocked(bool v);
     /// Assignment of presentation styles to the layer to provide a default style for representation items.
     /// 
     /// NOTE  In most cases the assignment of styles to a layer is restricted to an IfcCurveStyle representing the layer curve colour, layer curve thickness, and layer curve type.
     /// 
     /// IFC2x4 CHANGE  The data type has been changed from IfcPresentationStyleSelect (now deprecated) to IfcPresentationStyle.
-    SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > LayerStyles();
-    void setLayerStyles(SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > v);
+    IfcEntityList::ptr LayerStyles() const;
+    void setLayerStyles(IfcEntityList::ptr v);
     virtual unsigned int getArgumentCount() const { return 8; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 4: return IfcUtil::Argument_BOOL; case 5: return IfcUtil::Argument_BOOL; case 6: return IfcUtil::Argument_BOOL; case 7: return IfcUtil::Argument_ENTITY_LIST; } return IfcPresentationLayerAssignment::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 4: return Type::UNDEFINED; case 5: return Type::UNDEFINED; case 6: return Type::UNDEFINED; case 7: return Type::IfcPresentationStyleSelect; } return IfcPresentationLayerAssignment::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 4: return "LayerOn"; case 5: return "LayerFrozen"; case 6: return "LayerBlocked"; case 7: return "LayerStyles"; } return IfcPresentationLayerAssignment::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcPresentationLayerWithStyle (IfcAbstractEntityPtr e);
-    IfcPresentationLayerWithStyle (IfcLabel v1_Name, boost::optional< IfcText > v2_Description, IfcEntities v3_AssignedItems, boost::optional< IfcIdentifier > v4_Identifier, bool v5_LayerOn, bool v6_LayerFrozen, bool v7_LayerBlocked, IfcEntities v8_LayerStyles);
-    typedef IfcPresentationLayerWithStyle* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcPresentationLayerWithStyle > > list;
-    typedef IfcTemplatedEntityList< IfcPresentationLayerWithStyle >::it it;
+    IfcPresentationLayerWithStyle (IfcAbstractEntity* e);
+    IfcPresentationLayerWithStyle (std::string v1_Name, boost::optional< std::string > v2_Description, IfcEntityList::ptr v3_AssignedItems, boost::optional< std::string > v4_Identifier, bool v5_LayerOn, bool v6_LayerFrozen, bool v7_LayerBlocked, IfcEntityList::ptr v8_LayerStyles);
+    typedef IfcTemplatedEntityList< IfcPresentationLayerWithStyle > list;
 };
 /// IfcPresentationStyle is an abstract generalization of style table for presentation information assigned to geometric representation items. It includes styles for curves, areas, surfaces, text and symbols. Style information may include colour, hatching, rendering, and text fonts.
 /// 
@@ -8736,22 +9822,21 @@ class IfcPresentationLayerWithStyle : public IfcPresentationLayerAssignment {
 class IfcPresentationStyle : public IfcUtil::IfcBaseEntity {
 public:
     /// Whether the optional attribute Name is defined for this IfcPresentationStyle
-    bool hasName();
+    bool hasName() const;
     /// Name of the presentation style.
-    IfcLabel Name();
-    void setName(IfcLabel v);
+    std::string Name() const;
+    void setName(std::string v);
     virtual unsigned int getArgumentCount() const { return 1; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_STRING; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcLabel; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Name"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcPresentationStyle (IfcAbstractEntityPtr e);
-    IfcPresentationStyle (boost::optional< IfcLabel > v1_Name);
-    typedef IfcPresentationStyle* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcPresentationStyle > > list;
-    typedef IfcTemplatedEntityList< IfcPresentationStyle >::it it;
+    IfcPresentationStyle (IfcAbstractEntity* e);
+    IfcPresentationStyle (boost::optional< std::string > v1_Name);
+    typedef IfcTemplatedEntityList< IfcPresentationStyle > list;
 };
 /// Definition from ISO/CD 10303-46:1992: The presentation style assignment is a set of styles which are assigned to styled items for the purpose of presenting these styled items. 
 /// 
@@ -8761,20 +9846,19 @@ class IfcPresentationStyle : public IfcUtil::IfcBaseEntity {
 class IfcPresentationStyleAssignment : public IfcUtil::IfcBaseEntity {
 public:
     /// A set of presentation styles that are assigned to styled items.
-    SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > Styles();
-    void setStyles(SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > v);
+    IfcEntityList::ptr Styles() const;
+    void setStyles(IfcEntityList::ptr v);
     virtual unsigned int getArgumentCount() const { return 1; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY_LIST; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcPresentationStyleSelect; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Styles"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcPresentationStyleAssignment (IfcAbstractEntityPtr e);
-    IfcPresentationStyleAssignment (IfcEntities v1_Styles);
-    typedef IfcPresentationStyleAssignment* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcPresentationStyleAssignment > > list;
-    typedef IfcTemplatedEntityList< IfcPresentationStyleAssignment >::it it;
+    IfcPresentationStyleAssignment (IfcAbstractEntity* e);
+    IfcPresentationStyleAssignment (IfcEntityList::ptr v1_Styles);
+    typedef IfcTemplatedEntityList< IfcPresentationStyleAssignment > list;
 };
 /// IfcProductRepresentation defines a representation of a
 /// product, including its (geometric or topological) representation.
@@ -8796,62 +9880,60 @@ class IfcPresentationStyleAssignment : public IfcUtil::IfcBaseEntity {
 class IfcProductRepresentation : public IfcUtil::IfcBaseEntity {
 public:
     /// Whether the optional attribute Name is defined for this IfcProductRepresentation
-    bool hasName();
+    bool hasName() const;
     /// The word or group of words by which the product representation is known.
-    IfcLabel Name();
-    void setName(IfcLabel v);
+    std::string Name() const;
+    void setName(std::string v);
     /// Whether the optional attribute Description is defined for this IfcProductRepresentation
-    bool hasDescription();
+    bool hasDescription() const;
     /// The word or group of words that characterize the product representation. It can be used to add additional meaning to the name of the product representation.
-    IfcText Description();
-    void setDescription(IfcText v);
+    std::string Description() const;
+    void setDescription(std::string v);
     /// Contained list of representations (including shape representations). Each member defines a valid representation of a particular type within a particular representation context.
-    SHARED_PTR< IfcTemplatedEntityList< IfcRepresentation > > Representations();
-    void setRepresentations(SHARED_PTR< IfcTemplatedEntityList< IfcRepresentation > > v);
+    IfcTemplatedEntityList< IfcRepresentation >::ptr Representations() const;
+    void setRepresentations(IfcTemplatedEntityList< IfcRepresentation >::ptr v);
     virtual unsigned int getArgumentCount() const { return 3; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_STRING; case 1: return IfcUtil::Argument_STRING; case 2: return IfcUtil::Argument_ENTITY_LIST; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcLabel; case 1: return Type::IfcText; case 2: return Type::IfcRepresentation; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Name"; case 1: return "Description"; case 2: return "Representations"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcProductRepresentation (IfcAbstractEntityPtr e);
-    IfcProductRepresentation (boost::optional< IfcLabel > v1_Name, boost::optional< IfcText > v2_Description, SHARED_PTR< IfcTemplatedEntityList< IfcRepresentation > > v3_Representations);
-    typedef IfcProductRepresentation* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcProductRepresentation > > list;
-    typedef IfcTemplatedEntityList< IfcProductRepresentation >::it it;
+    IfcProductRepresentation (IfcAbstractEntity* e);
+    IfcProductRepresentation (boost::optional< std::string > v1_Name, boost::optional< std::string > v2_Description, IfcTemplatedEntityList< IfcRepresentation >::ptr v3_Representations);
+    typedef IfcTemplatedEntityList< IfcProductRepresentation > list;
 };
 
 class IfcProductsOfCombustionProperties : public IfcMaterialProperties {
 public:
     /// Whether the optional attribute SpecificHeatCapacity is defined for this IfcProductsOfCombustionProperties
-    bool hasSpecificHeatCapacity();
-    IfcSpecificHeatCapacityMeasure SpecificHeatCapacity();
-    void setSpecificHeatCapacity(IfcSpecificHeatCapacityMeasure v);
+    bool hasSpecificHeatCapacity() const;
+    double SpecificHeatCapacity() const;
+    void setSpecificHeatCapacity(double v);
     /// Whether the optional attribute N20Content is defined for this IfcProductsOfCombustionProperties
-    bool hasN20Content();
-    IfcPositiveRatioMeasure N20Content();
-    void setN20Content(IfcPositiveRatioMeasure v);
+    bool hasN20Content() const;
+    double N20Content() const;
+    void setN20Content(double v);
     /// Whether the optional attribute COContent is defined for this IfcProductsOfCombustionProperties
-    bool hasCOContent();
-    IfcPositiveRatioMeasure COContent();
-    void setCOContent(IfcPositiveRatioMeasure v);
+    bool hasCOContent() const;
+    double COContent() const;
+    void setCOContent(double v);
     /// Whether the optional attribute CO2Content is defined for this IfcProductsOfCombustionProperties
-    bool hasCO2Content();
-    IfcPositiveRatioMeasure CO2Content();
-    void setCO2Content(IfcPositiveRatioMeasure v);
+    bool hasCO2Content() const;
+    double CO2Content() const;
+    void setCO2Content(double v);
     virtual unsigned int getArgumentCount() const { return 5; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 1: return IfcUtil::Argument_DOUBLE; case 2: return IfcUtil::Argument_DOUBLE; case 3: return IfcUtil::Argument_DOUBLE; case 4: return IfcUtil::Argument_DOUBLE; } return IfcMaterialProperties::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 1: return Type::IfcSpecificHeatCapacityMeasure; case 2: return Type::IfcPositiveRatioMeasure; case 3: return Type::IfcPositiveRatioMeasure; case 4: return Type::IfcPositiveRatioMeasure; } return IfcMaterialProperties::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 1: return "SpecificHeatCapacity"; case 2: return "N20Content"; case 3: return "COContent"; case 4: return "CO2Content"; } return IfcMaterialProperties::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcProductsOfCombustionProperties (IfcAbstractEntityPtr e);
-    IfcProductsOfCombustionProperties (IfcMaterial* v1_Material, boost::optional< IfcSpecificHeatCapacityMeasure > v2_SpecificHeatCapacity, boost::optional< IfcPositiveRatioMeasure > v3_N20Content, boost::optional< IfcPositiveRatioMeasure > v4_COContent, boost::optional< IfcPositiveRatioMeasure > v5_CO2Content);
-    typedef IfcProductsOfCombustionProperties* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcProductsOfCombustionProperties > > list;
-    typedef IfcTemplatedEntityList< IfcProductsOfCombustionProperties >::it it;
+    IfcProductsOfCombustionProperties (IfcAbstractEntity* e);
+    IfcProductsOfCombustionProperties (IfcMaterial* v1_Material, boost::optional< double > v2_SpecificHeatCapacity, boost::optional< double > v3_N20Content, boost::optional< double > v4_COContent, boost::optional< double > v5_CO2Content);
+    typedef IfcTemplatedEntityList< IfcProductsOfCombustionProperties > list;
 };
 /// IfcProfileDef
 /// is the supertype of all definitions of standard and arbitrary profiles
@@ -9026,25 +10108,24 @@ class IfcProductsOfCombustionProperties : public IfcMaterialProperties {
 class IfcProfileDef : public IfcUtil::IfcBaseEntity {
 public:
     /// Defines the type of geometry into which this profile definition shall be resolved, either a curve or a surface area. In case of curve the profile should be referenced by a swept surface, in case of area the profile should be referenced by a swept area solid.
-    IfcProfileTypeEnum::IfcProfileTypeEnum ProfileType();
+    IfcProfileTypeEnum::IfcProfileTypeEnum ProfileType() const;
     void setProfileType(IfcProfileTypeEnum::IfcProfileTypeEnum v);
     /// Whether the optional attribute ProfileName is defined for this IfcProfileDef
-    bool hasProfileName();
+    bool hasProfileName() const;
     /// Human-readable name of the profile, for example according to a standard profile table. As noted above, machine-readable standardized profile designations should be provided in IfcExternalReference.ItemReference.
-    IfcLabel ProfileName();
-    void setProfileName(IfcLabel v);
+    std::string ProfileName() const;
+    void setProfileName(std::string v);
     virtual unsigned int getArgumentCount() const { return 2; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENUMERATION; case 1: return IfcUtil::Argument_STRING; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcProfileTypeEnum; case 1: return Type::IfcLabel; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "ProfileType"; case 1: return "ProfileName"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcProfileDef (IfcAbstractEntityPtr e);
-    IfcProfileDef (IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< IfcLabel > v2_ProfileName);
-    typedef IfcProfileDef* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcProfileDef > > list;
-    typedef IfcTemplatedEntityList< IfcProfileDef >::it it;
+    IfcProfileDef (IfcAbstractEntity* e);
+    IfcProfileDef (IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< std::string > v2_ProfileName);
+    typedef IfcTemplatedEntityList< IfcProfileDef > list;
 };
 /// This is a collection of properties applicable to section profile definitions.
 /// 
@@ -9060,26 +10141,25 @@ class IfcProfileDef : public IfcUtil::IfcBaseEntity {
 class IfcProfileProperties : public IfcUtil::IfcBaseEntity {
 public:
     /// Whether the optional attribute ProfileName is defined for this IfcProfileProperties
-    bool hasProfileName();
-    IfcLabel ProfileName();
-    void setProfileName(IfcLabel v);
+    bool hasProfileName() const;
+    std::string ProfileName() const;
+    void setProfileName(std::string v);
     /// Whether the optional attribute ProfileDefinition is defined for this IfcProfileProperties
-    bool hasProfileDefinition();
+    bool hasProfileDefinition() const;
     /// Profile definition which is qualified by these properties.
-    IfcProfileDef* ProfileDefinition();
+    IfcProfileDef* ProfileDefinition() const;
     void setProfileDefinition(IfcProfileDef* v);
     virtual unsigned int getArgumentCount() const { return 2; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_STRING; case 1: return IfcUtil::Argument_ENTITY; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcLabel; case 1: return Type::IfcProfileDef; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "ProfileName"; case 1: return "ProfileDefinition"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcProfileProperties (IfcAbstractEntityPtr e);
-    IfcProfileProperties (boost::optional< IfcLabel > v1_ProfileName, IfcProfileDef* v2_ProfileDefinition);
-    typedef IfcProfileProperties* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcProfileProperties > > list;
-    typedef IfcTemplatedEntityList< IfcProfileProperties >::it it;
+    IfcProfileProperties (IfcAbstractEntity* e);
+    IfcProfileProperties (boost::optional< std::string > v1_ProfileName, IfcProfileDef* v2_ProfileDefinition);
+    typedef IfcTemplatedEntityList< IfcProfileProperties > list;
 };
 /// IfcProperty is an abstract generalization for all types of properties that can be associated with IFC objects through the property set mechanism. 
 /// 
@@ -9087,56 +10167,54 @@ class IfcProfileProperties : public IfcUtil::IfcBaseEntity {
 class IfcProperty : public IfcUtil::IfcBaseEntity {
 public:
     /// Name for this property. This label is the significant name string that defines the semantic meaning for the property.
-    IfcIdentifier Name();
-    void setName(IfcIdentifier v);
+    std::string Name() const;
+    void setName(std::string v);
     /// Whether the optional attribute Description is defined for this IfcProperty
-    bool hasDescription();
+    bool hasDescription() const;
     /// Informative text to explain the property.
-    IfcText Description();
-    void setDescription(IfcText v);
+    std::string Description() const;
+    void setDescription(std::string v);
     virtual unsigned int getArgumentCount() const { return 2; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_STRING; case 1: return IfcUtil::Argument_STRING; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcIdentifier; case 1: return Type::IfcText; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Name"; case 1: return "Description"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcPropertyDependencyRelationship > > PropertyForDependance(); // INVERSE IfcPropertyDependencyRelationship::DependingProperty
-    SHARED_PTR< IfcTemplatedEntityList< IfcPropertyDependencyRelationship > > PropertyDependsOn(); // INVERSE IfcPropertyDependencyRelationship::DependantProperty
-    SHARED_PTR< IfcTemplatedEntityList< IfcComplexProperty > > PartOfComplex(); // INVERSE IfcComplexProperty::HasProperties
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcPropertyDependencyRelationship >::ptr PropertyForDependance() const; // INVERSE IfcPropertyDependencyRelationship::DependingProperty
+    IfcTemplatedEntityList< IfcPropertyDependencyRelationship >::ptr PropertyDependsOn() const; // INVERSE IfcPropertyDependencyRelationship::DependantProperty
+    IfcTemplatedEntityList< IfcComplexProperty >::ptr PartOfComplex() const; // INVERSE IfcComplexProperty::HasProperties
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcProperty (IfcAbstractEntityPtr e);
-    IfcProperty (IfcIdentifier v1_Name, boost::optional< IfcText > v2_Description);
-    typedef IfcProperty* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcProperty > > list;
-    typedef IfcTemplatedEntityList< IfcProperty >::it it;
+    IfcProperty (IfcAbstractEntity* e);
+    IfcProperty (std::string v1_Name, boost::optional< std::string > v2_Description);
+    typedef IfcTemplatedEntityList< IfcProperty > list;
 };
 
 class IfcPropertyConstraintRelationship : public IfcUtil::IfcBaseEntity {
 public:
-    IfcConstraint* RelatingConstraint();
+    IfcConstraint* RelatingConstraint() const;
     void setRelatingConstraint(IfcConstraint* v);
-    SHARED_PTR< IfcTemplatedEntityList< IfcProperty > > RelatedProperties();
-    void setRelatedProperties(SHARED_PTR< IfcTemplatedEntityList< IfcProperty > > v);
+    IfcTemplatedEntityList< IfcProperty >::ptr RelatedProperties() const;
+    void setRelatedProperties(IfcTemplatedEntityList< IfcProperty >::ptr v);
     /// Whether the optional attribute Name is defined for this IfcPropertyConstraintRelationship
-    bool hasName();
-    IfcLabel Name();
-    void setName(IfcLabel v);
+    bool hasName() const;
+    std::string Name() const;
+    void setName(std::string v);
     /// Whether the optional attribute Description is defined for this IfcPropertyConstraintRelationship
-    bool hasDescription();
-    IfcText Description();
-    void setDescription(IfcText v);
+    bool hasDescription() const;
+    std::string Description() const;
+    void setDescription(std::string v);
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY; case 1: return IfcUtil::Argument_ENTITY_LIST; case 2: return IfcUtil::Argument_STRING; case 3: return IfcUtil::Argument_STRING; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcConstraint; case 1: return Type::IfcProperty; case 2: return Type::IfcLabel; case 3: return Type::IfcText; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "RelatingConstraint"; case 1: return "RelatedProperties"; case 2: return "Name"; case 3: return "Description"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcPropertyConstraintRelationship (IfcAbstractEntityPtr e);
-    IfcPropertyConstraintRelationship (IfcConstraint* v1_RelatingConstraint, SHARED_PTR< IfcTemplatedEntityList< IfcProperty > > v2_RelatedProperties, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description);
-    typedef IfcPropertyConstraintRelationship* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcPropertyConstraintRelationship > > list;
-    typedef IfcTemplatedEntityList< IfcPropertyConstraintRelationship >::it it;
+    IfcPropertyConstraintRelationship (IfcAbstractEntity* e);
+    IfcPropertyConstraintRelationship (IfcConstraint* v1_RelatingConstraint, IfcTemplatedEntityList< IfcProperty >::ptr v2_RelatedProperties, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description);
+    typedef IfcTemplatedEntityList< IfcPropertyConstraintRelationship > list;
 };
 /// An IfcPropertyDependencyRelationship describes an identified dependency between the value of one property and that of another.
 /// 
@@ -9149,36 +10227,35 @@ class IfcPropertyConstraintRelationship : public IfcUtil::IfcBaseEntity {
 class IfcPropertyDependencyRelationship : public IfcUtil::IfcBaseEntity {
 public:
     /// The property on which the relationship depends.
-    IfcProperty* DependingProperty();
+    IfcProperty* DependingProperty() const;
     void setDependingProperty(IfcProperty* v);
     /// The dependant property.
-    IfcProperty* DependantProperty();
+    IfcProperty* DependantProperty() const;
     void setDependantProperty(IfcProperty* v);
     /// Whether the optional attribute Name is defined for this IfcPropertyDependencyRelationship
-    bool hasName();
-    IfcLabel Name();
-    void setName(IfcLabel v);
+    bool hasName() const;
+    std::string Name() const;
+    void setName(std::string v);
     /// Whether the optional attribute Description is defined for this IfcPropertyDependencyRelationship
-    bool hasDescription();
-    IfcText Description();
-    void setDescription(IfcText v);
+    bool hasDescription() const;
+    std::string Description() const;
+    void setDescription(std::string v);
     /// Whether the optional attribute Expression is defined for this IfcPropertyDependencyRelationship
-    bool hasExpression();
+    bool hasExpression() const;
     /// Expression that further describes the nature of the dependency relation.
-    IfcText Expression();
-    void setExpression(IfcText v);
+    std::string Expression() const;
+    void setExpression(std::string v);
     virtual unsigned int getArgumentCount() const { return 5; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY; case 1: return IfcUtil::Argument_ENTITY; case 2: return IfcUtil::Argument_STRING; case 3: return IfcUtil::Argument_STRING; case 4: return IfcUtil::Argument_STRING; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcProperty; case 1: return Type::IfcProperty; case 2: return Type::IfcLabel; case 3: return Type::IfcText; case 4: return Type::IfcText; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "DependingProperty"; case 1: return "DependantProperty"; case 2: return "Name"; case 3: return "Description"; case 4: return "Expression"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcPropertyDependencyRelationship (IfcAbstractEntityPtr e);
-    IfcPropertyDependencyRelationship (IfcProperty* v1_DependingProperty, IfcProperty* v2_DependantProperty, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcText > v5_Expression);
-    typedef IfcPropertyDependencyRelationship* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcPropertyDependencyRelationship > > list;
-    typedef IfcTemplatedEntityList< IfcPropertyDependencyRelationship >::it it;
+    IfcPropertyDependencyRelationship (IfcAbstractEntity* e);
+    IfcPropertyDependencyRelationship (IfcProperty* v1_DependingProperty, IfcProperty* v2_DependantProperty, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_Expression);
+    typedef IfcTemplatedEntityList< IfcPropertyDependencyRelationship > list;
 };
 /// IfcPropertyEnumeration is a collection of simple
 /// or measure values that define a prescribed set of alternatives from
@@ -9229,28 +10306,27 @@ class IfcPropertyDependencyRelationship : public IfcUtil::IfcBaseEntity {
 class IfcPropertyEnumeration : public IfcUtil::IfcBaseEntity {
 public:
     /// Name of this enumeration.
-    IfcLabel Name();
-    void setName(IfcLabel v);
+    std::string Name() const;
+    void setName(std::string v);
     /// List of values that form the enumeration.
-    SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > EnumerationValues();
-    void setEnumerationValues(SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > v);
+    IfcEntityList::ptr EnumerationValues() const;
+    void setEnumerationValues(IfcEntityList::ptr v);
     /// Whether the optional attribute Unit is defined for this IfcPropertyEnumeration
-    bool hasUnit();
+    bool hasUnit() const;
     /// Unit for the enumerator values, if not given, the default value for the measure type (given by the TYPE of nominal value) is used as defined by the global unit assignment at IfcProject.
-    IfcUnit Unit();
-    void setUnit(IfcUnit v);
+    IfcUnit* Unit() const;
+    void setUnit(IfcUnit* v);
     virtual unsigned int getArgumentCount() const { return 3; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_STRING; case 1: return IfcUtil::Argument_ENTITY_LIST; case 2: return IfcUtil::Argument_ENTITY; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcLabel; case 1: return Type::IfcValue; case 2: return Type::IfcUnit; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Name"; case 1: return "EnumerationValues"; case 2: return "Unit"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcPropertyEnumeration (IfcAbstractEntityPtr e);
-    IfcPropertyEnumeration (IfcLabel v1_Name, IfcEntities v2_EnumerationValues, boost::optional< IfcUnit > v3_Unit);
-    typedef IfcPropertyEnumeration* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcPropertyEnumeration > > list;
-    typedef IfcTemplatedEntityList< IfcPropertyEnumeration >::it it;
+    IfcPropertyEnumeration (IfcAbstractEntity* e);
+    IfcPropertyEnumeration (std::string v1_Name, IfcEntityList::ptr v2_EnumerationValues, IfcUnit* v3_Unit);
+    typedef IfcTemplatedEntityList< IfcPropertyEnumeration > list;
 };
 /// IfcQuantityArea is a physical quantity that defines a derived area measure to provide an element's physical property. It is normally derived from the physical properties of the element under the specific measure rules given by a method of measurement. 
 /// 
@@ -9260,20 +10336,19 @@ class IfcPropertyEnumeration : public IfcUtil::IfcBaseEntity {
 class IfcQuantityArea : public IfcPhysicalSimpleQuantity {
 public:
     /// Area measure value of this quantity.
-    IfcAreaMeasure AreaValue();
-    void setAreaValue(IfcAreaMeasure v);
+    double AreaValue() const;
+    void setAreaValue(double v);
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 3: return IfcUtil::Argument_DOUBLE; } return IfcPhysicalSimpleQuantity::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 3: return Type::IfcAreaMeasure; } return IfcPhysicalSimpleQuantity::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 3: return "AreaValue"; } return IfcPhysicalSimpleQuantity::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcQuantityArea (IfcAbstractEntityPtr e);
-    IfcQuantityArea (IfcLabel v1_Name, boost::optional< IfcText > v2_Description, IfcNamedUnit* v3_Unit, IfcAreaMeasure v4_AreaValue);
-    typedef IfcQuantityArea* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcQuantityArea > > list;
-    typedef IfcTemplatedEntityList< IfcQuantityArea >::it it;
+    IfcQuantityArea (IfcAbstractEntity* e);
+    IfcQuantityArea (std::string v1_Name, boost::optional< std::string > v2_Description, IfcNamedUnit* v3_Unit, double v4_AreaValue);
+    typedef IfcTemplatedEntityList< IfcQuantityArea > list;
 };
 /// IfcQuantityCount is a physical quantity that defines a derived count measure to provide an element's physical property. It is normally derived from the physical properties of the element under the specific measure rules given by a method of measurement.
 /// 
@@ -9283,20 +10358,19 @@ class IfcQuantityArea : public IfcPhysicalSimpleQuantity {
 class IfcQuantityCount : public IfcPhysicalSimpleQuantity {
 public:
     /// Count measure value of this quantity.
-    IfcCountMeasure CountValue();
-    void setCountValue(IfcCountMeasure v);
+    double CountValue() const;
+    void setCountValue(double v);
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 3: return IfcUtil::Argument_DOUBLE; } return IfcPhysicalSimpleQuantity::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 3: return Type::IfcCountMeasure; } return IfcPhysicalSimpleQuantity::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 3: return "CountValue"; } return IfcPhysicalSimpleQuantity::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcQuantityCount (IfcAbstractEntityPtr e);
-    IfcQuantityCount (IfcLabel v1_Name, boost::optional< IfcText > v2_Description, IfcNamedUnit* v3_Unit, IfcCountMeasure v4_CountValue);
-    typedef IfcQuantityCount* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcQuantityCount > > list;
-    typedef IfcTemplatedEntityList< IfcQuantityCount >::it it;
+    IfcQuantityCount (IfcAbstractEntity* e);
+    IfcQuantityCount (std::string v1_Name, boost::optional< std::string > v2_Description, IfcNamedUnit* v3_Unit, double v4_CountValue);
+    typedef IfcTemplatedEntityList< IfcQuantityCount > list;
 };
 /// IfcQuantityLength is a physical quantity that defines a derived length measure to provide an element's physical property. It is normally derived from the physical properties of the element under the specific measure rules given by a method of measurement.
 /// 
@@ -9306,20 +10380,19 @@ class IfcQuantityCount : public IfcPhysicalSimpleQuantity {
 class IfcQuantityLength : public IfcPhysicalSimpleQuantity {
 public:
     /// Length measure value of this quantity.
-    IfcLengthMeasure LengthValue();
-    void setLengthValue(IfcLengthMeasure v);
+    double LengthValue() const;
+    void setLengthValue(double v);
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 3: return IfcUtil::Argument_DOUBLE; } return IfcPhysicalSimpleQuantity::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 3: return Type::IfcLengthMeasure; } return IfcPhysicalSimpleQuantity::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 3: return "LengthValue"; } return IfcPhysicalSimpleQuantity::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcQuantityLength (IfcAbstractEntityPtr e);
-    IfcQuantityLength (IfcLabel v1_Name, boost::optional< IfcText > v2_Description, IfcNamedUnit* v3_Unit, IfcLengthMeasure v4_LengthValue);
-    typedef IfcQuantityLength* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcQuantityLength > > list;
-    typedef IfcTemplatedEntityList< IfcQuantityLength >::it it;
+    IfcQuantityLength (IfcAbstractEntity* e);
+    IfcQuantityLength (std::string v1_Name, boost::optional< std::string > v2_Description, IfcNamedUnit* v3_Unit, double v4_LengthValue);
+    typedef IfcTemplatedEntityList< IfcQuantityLength > list;
 };
 /// IfcQuantityTime is an element quantity that defines a time measure to provide an property of time related to an element. It is normally given by the recipe information of the element under the specific measure rules given by a method of measurement.
 /// 
@@ -9329,20 +10402,19 @@ class IfcQuantityLength : public IfcPhysicalSimpleQuantity {
 class IfcQuantityTime : public IfcPhysicalSimpleQuantity {
 public:
     /// Time measure value of this quantity.
-    IfcTimeMeasure TimeValue();
-    void setTimeValue(IfcTimeMeasure v);
+    double TimeValue() const;
+    void setTimeValue(double v);
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 3: return IfcUtil::Argument_DOUBLE; } return IfcPhysicalSimpleQuantity::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 3: return Type::IfcTimeMeasure; } return IfcPhysicalSimpleQuantity::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 3: return "TimeValue"; } return IfcPhysicalSimpleQuantity::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcQuantityTime (IfcAbstractEntityPtr e);
-    IfcQuantityTime (IfcLabel v1_Name, boost::optional< IfcText > v2_Description, IfcNamedUnit* v3_Unit, IfcTimeMeasure v4_TimeValue);
-    typedef IfcQuantityTime* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcQuantityTime > > list;
-    typedef IfcTemplatedEntityList< IfcQuantityTime >::it it;
+    IfcQuantityTime (IfcAbstractEntity* e);
+    IfcQuantityTime (std::string v1_Name, boost::optional< std::string > v2_Description, IfcNamedUnit* v3_Unit, double v4_TimeValue);
+    typedef IfcTemplatedEntityList< IfcQuantityTime > list;
 };
 /// IfcQuantityVolume is a physical quantity that defines a derived volume measure to provide an element's physical property. It is normally derived from the physical properties of the element under the specific measure rules given by a method of measurement. 
 /// 
@@ -9352,20 +10424,19 @@ class IfcQuantityTime : public IfcPhysicalSimpleQuantity {
 class IfcQuantityVolume : public IfcPhysicalSimpleQuantity {
 public:
     /// Volume measure value of this quantity.
-    IfcVolumeMeasure VolumeValue();
-    void setVolumeValue(IfcVolumeMeasure v);
+    double VolumeValue() const;
+    void setVolumeValue(double v);
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 3: return IfcUtil::Argument_DOUBLE; } return IfcPhysicalSimpleQuantity::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 3: return Type::IfcVolumeMeasure; } return IfcPhysicalSimpleQuantity::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 3: return "VolumeValue"; } return IfcPhysicalSimpleQuantity::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcQuantityVolume (IfcAbstractEntityPtr e);
-    IfcQuantityVolume (IfcLabel v1_Name, boost::optional< IfcText > v2_Description, IfcNamedUnit* v3_Unit, IfcVolumeMeasure v4_VolumeValue);
-    typedef IfcQuantityVolume* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcQuantityVolume > > list;
-    typedef IfcTemplatedEntityList< IfcQuantityVolume >::it it;
+    IfcQuantityVolume (IfcAbstractEntity* e);
+    IfcQuantityVolume (std::string v1_Name, boost::optional< std::string > v2_Description, IfcNamedUnit* v3_Unit, double v4_VolumeValue);
+    typedef IfcTemplatedEntityList< IfcQuantityVolume > list;
 };
 /// IfcQuantityWeight is a physical element quantity that defines a derived weight measure to provide an element's physical property. It is normally derived from the physical properties of the element under the specific measure rules given by a method of measurement. 
 /// 
@@ -9375,48 +10446,46 @@ class IfcQuantityVolume : public IfcPhysicalSimpleQuantity {
 class IfcQuantityWeight : public IfcPhysicalSimpleQuantity {
 public:
     /// Mass measure value of this quantity.
-    IfcMassMeasure WeightValue();
-    void setWeightValue(IfcMassMeasure v);
+    double WeightValue() const;
+    void setWeightValue(double v);
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 3: return IfcUtil::Argument_DOUBLE; } return IfcPhysicalSimpleQuantity::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 3: return Type::IfcMassMeasure; } return IfcPhysicalSimpleQuantity::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 3: return "WeightValue"; } return IfcPhysicalSimpleQuantity::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcQuantityWeight (IfcAbstractEntityPtr e);
-    IfcQuantityWeight (IfcLabel v1_Name, boost::optional< IfcText > v2_Description, IfcNamedUnit* v3_Unit, IfcMassMeasure v4_WeightValue);
-    typedef IfcQuantityWeight* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcQuantityWeight > > list;
-    typedef IfcTemplatedEntityList< IfcQuantityWeight >::it it;
+    IfcQuantityWeight (IfcAbstractEntity* e);
+    IfcQuantityWeight (std::string v1_Name, boost::optional< std::string > v2_Description, IfcNamedUnit* v3_Unit, double v4_WeightValue);
+    typedef IfcTemplatedEntityList< IfcQuantityWeight > list;
 };
 
 class IfcReferencesValueDocument : public IfcUtil::IfcBaseEntity {
 public:
-    IfcDocumentSelect ReferencedDocument();
-    void setReferencedDocument(IfcDocumentSelect v);
-    SHARED_PTR< IfcTemplatedEntityList< IfcAppliedValue > > ReferencingValues();
-    void setReferencingValues(SHARED_PTR< IfcTemplatedEntityList< IfcAppliedValue > > v);
+    IfcDocumentSelect* ReferencedDocument() const;
+    void setReferencedDocument(IfcDocumentSelect* v);
+    IfcTemplatedEntityList< IfcAppliedValue >::ptr ReferencingValues() const;
+    void setReferencingValues(IfcTemplatedEntityList< IfcAppliedValue >::ptr v);
     /// Whether the optional attribute Name is defined for this IfcReferencesValueDocument
-    bool hasName();
-    IfcLabel Name();
-    void setName(IfcLabel v);
+    bool hasName() const;
+    std::string Name() const;
+    void setName(std::string v);
     /// Whether the optional attribute Description is defined for this IfcReferencesValueDocument
-    bool hasDescription();
-    IfcText Description();
-    void setDescription(IfcText v);
+    bool hasDescription() const;
+    std::string Description() const;
+    void setDescription(std::string v);
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY; case 1: return IfcUtil::Argument_ENTITY_LIST; case 2: return IfcUtil::Argument_STRING; case 3: return IfcUtil::Argument_STRING; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcDocumentSelect; case 1: return Type::IfcAppliedValue; case 2: return Type::IfcLabel; case 3: return Type::IfcText; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "ReferencedDocument"; case 1: return "ReferencingValues"; case 2: return "Name"; case 3: return "Description"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcReferencesValueDocument (IfcAbstractEntityPtr e);
-    IfcReferencesValueDocument (IfcDocumentSelect v1_ReferencedDocument, SHARED_PTR< IfcTemplatedEntityList< IfcAppliedValue > > v2_ReferencingValues, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description);
-    typedef IfcReferencesValueDocument* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcReferencesValueDocument > > list;
-    typedef IfcTemplatedEntityList< IfcReferencesValueDocument >::it it;
+    IfcReferencesValueDocument (IfcAbstractEntity* e);
+    IfcReferencesValueDocument (IfcDocumentSelect* v1_ReferencedDocument, IfcTemplatedEntityList< IfcAppliedValue >::ptr v2_ReferencingValues, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description);
+    typedef IfcTemplatedEntityList< IfcReferencesValueDocument > list;
 };
 /// IfcReinforcementProperties defines the set of properties for a specific combination of reinforcement bar steel grade, bar type and effective depth. 
 /// 
@@ -9426,63 +10495,61 @@ class IfcReferencesValueDocument : public IfcUtil::IfcBaseEntity {
 class IfcReinforcementBarProperties : public IfcUtil::IfcBaseEntity {
 public:
     /// The total effective cross-section area of the reinforcement of a specific steel grade.
-    IfcAreaMeasure TotalCrossSectionArea();
-    void setTotalCrossSectionArea(IfcAreaMeasure v);
+    double TotalCrossSectionArea() const;
+    void setTotalCrossSectionArea(double v);
     /// The nominal steel grade defined according to local standards.
-    IfcLabel SteelGrade();
-    void setSteelGrade(IfcLabel v);
+    std::string SteelGrade() const;
+    void setSteelGrade(std::string v);
     /// Whether the optional attribute BarSurface is defined for this IfcReinforcementBarProperties
-    bool hasBarSurface();
+    bool hasBarSurface() const;
     /// Indicator for whether the bar surface is plain or textured.
-    IfcReinforcingBarSurfaceEnum::IfcReinforcingBarSurfaceEnum BarSurface();
+    IfcReinforcingBarSurfaceEnum::IfcReinforcingBarSurfaceEnum BarSurface() const;
     void setBarSurface(IfcReinforcingBarSurfaceEnum::IfcReinforcingBarSurfaceEnum v);
     /// Whether the optional attribute EffectiveDepth is defined for this IfcReinforcementBarProperties
-    bool hasEffectiveDepth();
+    bool hasEffectiveDepth() const;
     /// The effective depth, i.e. the distance of the specific reinforcement cross section area or reinforcement configuration in a row, counted from a common specific reference point. Usually the reference point is the upper surface (for beams and slabs) or a similar projection in a plane (for columns).
-    IfcLengthMeasure EffectiveDepth();
-    void setEffectiveDepth(IfcLengthMeasure v);
+    double EffectiveDepth() const;
+    void setEffectiveDepth(double v);
     /// Whether the optional attribute NominalBarDiameter is defined for this IfcReinforcementBarProperties
-    bool hasNominalBarDiameter();
+    bool hasNominalBarDiameter() const;
     /// The nominal diameter defining the cross-section size of the reinforcing bar. The bar diameter should be identical for all bars included in the specific reinforcement configuration.
-    IfcPositiveLengthMeasure NominalBarDiameter();
-    void setNominalBarDiameter(IfcPositiveLengthMeasure v);
+    double NominalBarDiameter() const;
+    void setNominalBarDiameter(double v);
     /// Whether the optional attribute BarCount is defined for this IfcReinforcementBarProperties
-    bool hasBarCount();
+    bool hasBarCount() const;
     /// The number of bars with identical nominal diameter and steel grade included in the specific reinforcement configuration.
-    IfcCountMeasure BarCount();
-    void setBarCount(IfcCountMeasure v);
+    double BarCount() const;
+    void setBarCount(double v);
     virtual unsigned int getArgumentCount() const { return 6; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_DOUBLE; case 1: return IfcUtil::Argument_STRING; case 2: return IfcUtil::Argument_ENUMERATION; case 3: return IfcUtil::Argument_DOUBLE; case 4: return IfcUtil::Argument_DOUBLE; case 5: return IfcUtil::Argument_DOUBLE; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcAreaMeasure; case 1: return Type::IfcLabel; case 2: return Type::IfcReinforcingBarSurfaceEnum; case 3: return Type::IfcLengthMeasure; case 4: return Type::IfcPositiveLengthMeasure; case 5: return Type::IfcCountMeasure; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "TotalCrossSectionArea"; case 1: return "SteelGrade"; case 2: return "BarSurface"; case 3: return "EffectiveDepth"; case 4: return "NominalBarDiameter"; case 5: return "BarCount"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcReinforcementBarProperties (IfcAbstractEntityPtr e);
-    IfcReinforcementBarProperties (IfcAreaMeasure v1_TotalCrossSectionArea, IfcLabel v2_SteelGrade, boost::optional< IfcReinforcingBarSurfaceEnum::IfcReinforcingBarSurfaceEnum > v3_BarSurface, boost::optional< IfcLengthMeasure > v4_EffectiveDepth, boost::optional< IfcPositiveLengthMeasure > v5_NominalBarDiameter, boost::optional< IfcCountMeasure > v6_BarCount);
-    typedef IfcReinforcementBarProperties* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcReinforcementBarProperties > > list;
-    typedef IfcTemplatedEntityList< IfcReinforcementBarProperties >::it it;
+    IfcReinforcementBarProperties (IfcAbstractEntity* e);
+    IfcReinforcementBarProperties (double v1_TotalCrossSectionArea, std::string v2_SteelGrade, boost::optional< IfcReinforcingBarSurfaceEnum::IfcReinforcingBarSurfaceEnum > v3_BarSurface, boost::optional< double > v4_EffectiveDepth, boost::optional< double > v5_NominalBarDiameter, boost::optional< double > v6_BarCount);
+    typedef IfcTemplatedEntityList< IfcReinforcementBarProperties > list;
 };
 
 class IfcRelaxation : public IfcUtil::IfcBaseEntity {
 public:
-    IfcNormalisedRatioMeasure RelaxationValue();
-    void setRelaxationValue(IfcNormalisedRatioMeasure v);
-    IfcNormalisedRatioMeasure InitialStress();
-    void setInitialStress(IfcNormalisedRatioMeasure v);
+    double RelaxationValue() const;
+    void setRelaxationValue(double v);
+    double InitialStress() const;
+    void setInitialStress(double v);
     virtual unsigned int getArgumentCount() const { return 2; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_DOUBLE; case 1: return IfcUtil::Argument_DOUBLE; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcNormalisedRatioMeasure; case 1: return Type::IfcNormalisedRatioMeasure; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "RelaxationValue"; case 1: return "InitialStress"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRelaxation (IfcAbstractEntityPtr e);
-    IfcRelaxation (IfcNormalisedRatioMeasure v1_RelaxationValue, IfcNormalisedRatioMeasure v2_InitialStress);
-    typedef IfcRelaxation* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRelaxation > > list;
-    typedef IfcTemplatedEntityList< IfcRelaxation >::it it;
+    IfcRelaxation (IfcAbstractEntity* e);
+    IfcRelaxation (double v1_RelaxationValue, double v2_InitialStress);
+    typedef IfcTemplatedEntityList< IfcRelaxation > list;
 };
 /// Definition from ISO/CD 10303-43:1992: A
 ///   representation is one or more representation items that are
@@ -9533,37 +10600,36 @@ class IfcRelaxation : public IfcUtil::IfcBaseEntity {
 class IfcRepresentation : public IfcUtil::IfcBaseEntity {
 public:
     /// Definition of the representation context for which the different subtypes of representation are valid.
-    IfcRepresentationContext* ContextOfItems();
+    IfcRepresentationContext* ContextOfItems() const;
     void setContextOfItems(IfcRepresentationContext* v);
     /// Whether the optional attribute RepresentationIdentifier is defined for this IfcRepresentation
-    bool hasRepresentationIdentifier();
+    bool hasRepresentationIdentifier() const;
     /// The optional identifier of the representation as used within a project.
-    IfcLabel RepresentationIdentifier();
-    void setRepresentationIdentifier(IfcLabel v);
+    std::string RepresentationIdentifier() const;
+    void setRepresentationIdentifier(std::string v);
     /// Whether the optional attribute RepresentationType is defined for this IfcRepresentation
-    bool hasRepresentationType();
+    bool hasRepresentationType() const;
     /// The description of the type of a representation context. The representation type defines the type of geometry or topology used for representing the product representation. More information is given at the subtypes IfcShapeRepresentation and IfcTopologyRepresentation.
     /// The supported values for context type are to be specified by implementers agreements.
-    IfcLabel RepresentationType();
-    void setRepresentationType(IfcLabel v);
+    std::string RepresentationType() const;
+    void setRepresentationType(std::string v);
     /// Set of geometric representation items that are defined for this representation.
-    SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationItem > > Items();
-    void setItems(SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationItem > > v);
+    IfcTemplatedEntityList< IfcRepresentationItem >::ptr Items() const;
+    void setItems(IfcTemplatedEntityList< IfcRepresentationItem >::ptr v);
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY; case 1: return IfcUtil::Argument_STRING; case 2: return IfcUtil::Argument_STRING; case 3: return IfcUtil::Argument_ENTITY_LIST; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcRepresentationContext; case 1: return Type::IfcLabel; case 2: return Type::IfcLabel; case 3: return Type::IfcRepresentationItem; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "ContextOfItems"; case 1: return "RepresentationIdentifier"; case 2: return "RepresentationType"; case 3: return "Items"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > RepresentationMap(); // INVERSE IfcRepresentationMap::MappedRepresentation
-    SHARED_PTR< IfcTemplatedEntityList< IfcPresentationLayerAssignment > > LayerAssignments(); // INVERSE IfcPresentationLayerAssignment::AssignedItems
-    SHARED_PTR< IfcTemplatedEntityList< IfcProductRepresentation > > OfProductRepresentation(); // INVERSE IfcProductRepresentation::Representations
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcRepresentationMap >::ptr RepresentationMap() const; // INVERSE IfcRepresentationMap::MappedRepresentation
+    IfcTemplatedEntityList< IfcPresentationLayerAssignment >::ptr LayerAssignments() const; // INVERSE IfcPresentationLayerAssignment::AssignedItems
+    IfcTemplatedEntityList< IfcProductRepresentation >::ptr OfProductRepresentation() const; // INVERSE IfcProductRepresentation::Representations
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRepresentation (IfcAbstractEntityPtr e);
-    IfcRepresentation (IfcRepresentationContext* v1_ContextOfItems, boost::optional< IfcLabel > v2_RepresentationIdentifier, boost::optional< IfcLabel > v3_RepresentationType, SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationItem > > v4_Items);
-    typedef IfcRepresentation* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRepresentation > > list;
-    typedef IfcTemplatedEntityList< IfcRepresentation >::it it;
+    IfcRepresentation (IfcAbstractEntity* e);
+    IfcRepresentation (IfcRepresentationContext* v1_ContextOfItems, boost::optional< std::string > v2_RepresentationIdentifier, boost::optional< std::string > v3_RepresentationType, IfcTemplatedEntityList< IfcRepresentationItem >::ptr v4_Items);
+    typedef IfcTemplatedEntityList< IfcRepresentation > list;
 };
 /// Definition from ISO/CD 10303-42:1992: A representation context is a context in which a set of representation items are related.
 /// 
@@ -9578,28 +10644,27 @@ class IfcRepresentation : public IfcUtil::IfcBaseEntity {
 class IfcRepresentationContext : public IfcUtil::IfcBaseEntity {
 public:
     /// Whether the optional attribute ContextIdentifier is defined for this IfcRepresentationContext
-    bool hasContextIdentifier();
+    bool hasContextIdentifier() const;
     /// The optional identifier of the representation context as used within a project.
-    IfcLabel ContextIdentifier();
-    void setContextIdentifier(IfcLabel v);
+    std::string ContextIdentifier() const;
+    void setContextIdentifier(std::string v);
     /// Whether the optional attribute ContextType is defined for this IfcRepresentationContext
-    bool hasContextType();
+    bool hasContextType() const;
     /// The description of the type of a representation context. The supported values for context type are to be specified by implementers agreements.
-    IfcLabel ContextType();
-    void setContextType(IfcLabel v);
+    std::string ContextType() const;
+    void setContextType(std::string v);
     virtual unsigned int getArgumentCount() const { return 2; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_STRING; case 1: return IfcUtil::Argument_STRING; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcLabel; case 1: return Type::IfcLabel; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "ContextIdentifier"; case 1: return "ContextType"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcRepresentation > > RepresentationsInContext(); // INVERSE IfcRepresentation::ContextOfItems
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcRepresentation >::ptr RepresentationsInContext() const; // INVERSE IfcRepresentation::ContextOfItems
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRepresentationContext (IfcAbstractEntityPtr e);
-    IfcRepresentationContext (boost::optional< IfcLabel > v1_ContextIdentifier, boost::optional< IfcLabel > v2_ContextType);
-    typedef IfcRepresentationContext* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationContext > > list;
-    typedef IfcTemplatedEntityList< IfcRepresentationContext >::it it;
+    IfcRepresentationContext (IfcAbstractEntity* e);
+    IfcRepresentationContext (boost::optional< std::string > v1_ContextIdentifier, boost::optional< std::string > v2_ContextType);
+    typedef IfcTemplatedEntityList< IfcRepresentationContext > list;
 };
 /// Definition from ISO/CD
 /// 10303-43:1992: A representation item is an element of
@@ -9637,18 +10702,17 @@ class IfcRepresentationItem : public IfcUtil::IfcBaseEntity {
 public:
     virtual unsigned int getArgumentCount() const { return 0; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcPresentationLayerAssignment > > LayerAssignments(); // INVERSE IfcPresentationLayerAssignment::AssignedItems
-    SHARED_PTR< IfcTemplatedEntityList< IfcStyledItem > > StyledByItem(); // INVERSE IfcStyledItem::Item
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcPresentationLayerAssignment >::ptr LayerAssignments() const; // INVERSE IfcPresentationLayerAssignment::AssignedItems
+    IfcTemplatedEntityList< IfcStyledItem >::ptr StyledByItem() const; // INVERSE IfcStyledItem::Item
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRepresentationItem (IfcAbstractEntityPtr e);
+    IfcRepresentationItem (IfcAbstractEntity* e);
     IfcRepresentationItem ();
-    typedef IfcRepresentationItem* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationItem > > list;
-    typedef IfcTemplatedEntityList< IfcRepresentationItem >::it it;
+    typedef IfcTemplatedEntityList< IfcRepresentationItem > list;
 };
 /// Definition from ISO/CD 10303-43:1992: A representation map is the identification of a representation and a representation item in that representation for the purpose of mapping. The representation item defines the origin of the mapping. The representation map is used as the source of a mapping by a mapped item.
 /// 
@@ -9665,58 +10729,56 @@ class IfcRepresentationMap : public IfcUtil::IfcBaseEntity {
 public:
     /// An axis2 placement that defines the position about which the mapped
     /// representation is mapped.
-    IfcAxis2Placement MappingOrigin();
-    void setMappingOrigin(IfcAxis2Placement v);
+    IfcAxis2Placement* MappingOrigin() const;
+    void setMappingOrigin(IfcAxis2Placement* v);
     /// A representation that is mapped to at least one mapped item.
-    IfcRepresentation* MappedRepresentation();
+    IfcRepresentation* MappedRepresentation() const;
     void setMappedRepresentation(IfcRepresentation* v);
     virtual unsigned int getArgumentCount() const { return 2; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY; case 1: return IfcUtil::Argument_ENTITY; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcAxis2Placement; case 1: return Type::IfcRepresentation; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "MappingOrigin"; case 1: return "MappedRepresentation"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcMappedItem > > MapUsage(); // INVERSE IfcMappedItem::MappingSource
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcMappedItem >::ptr MapUsage() const; // INVERSE IfcMappedItem::MappingSource
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRepresentationMap (IfcAbstractEntityPtr e);
-    IfcRepresentationMap (IfcAxis2Placement v1_MappingOrigin, IfcRepresentation* v2_MappedRepresentation);
-    typedef IfcRepresentationMap* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > list;
-    typedef IfcTemplatedEntityList< IfcRepresentationMap >::it it;
+    IfcRepresentationMap (IfcAbstractEntity* e);
+    IfcRepresentationMap (IfcAxis2Placement* v1_MappingOrigin, IfcRepresentation* v2_MappedRepresentation);
+    typedef IfcTemplatedEntityList< IfcRepresentationMap > list;
 };
 
 class IfcRibPlateProfileProperties : public IfcProfileProperties {
 public:
     /// Whether the optional attribute Thickness is defined for this IfcRibPlateProfileProperties
-    bool hasThickness();
-    IfcPositiveLengthMeasure Thickness();
-    void setThickness(IfcPositiveLengthMeasure v);
+    bool hasThickness() const;
+    double Thickness() const;
+    void setThickness(double v);
     /// Whether the optional attribute RibHeight is defined for this IfcRibPlateProfileProperties
-    bool hasRibHeight();
-    IfcPositiveLengthMeasure RibHeight();
-    void setRibHeight(IfcPositiveLengthMeasure v);
+    bool hasRibHeight() const;
+    double RibHeight() const;
+    void setRibHeight(double v);
     /// Whether the optional attribute RibWidth is defined for this IfcRibPlateProfileProperties
-    bool hasRibWidth();
-    IfcPositiveLengthMeasure RibWidth();
-    void setRibWidth(IfcPositiveLengthMeasure v);
+    bool hasRibWidth() const;
+    double RibWidth() const;
+    void setRibWidth(double v);
     /// Whether the optional attribute RibSpacing is defined for this IfcRibPlateProfileProperties
-    bool hasRibSpacing();
-    IfcPositiveLengthMeasure RibSpacing();
-    void setRibSpacing(IfcPositiveLengthMeasure v);
-    IfcRibPlateDirectionEnum::IfcRibPlateDirectionEnum Direction();
+    bool hasRibSpacing() const;
+    double RibSpacing() const;
+    void setRibSpacing(double v);
+    IfcRibPlateDirectionEnum::IfcRibPlateDirectionEnum Direction() const;
     void setDirection(IfcRibPlateDirectionEnum::IfcRibPlateDirectionEnum v);
     virtual unsigned int getArgumentCount() const { return 7; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 2: return IfcUtil::Argument_DOUBLE; case 3: return IfcUtil::Argument_DOUBLE; case 4: return IfcUtil::Argument_DOUBLE; case 5: return IfcUtil::Argument_DOUBLE; case 6: return IfcUtil::Argument_ENUMERATION; } return IfcProfileProperties::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 2: return Type::IfcPositiveLengthMeasure; case 3: return Type::IfcPositiveLengthMeasure; case 4: return Type::IfcPositiveLengthMeasure; case 5: return Type::IfcPositiveLengthMeasure; case 6: return Type::IfcRibPlateDirectionEnum; } return IfcProfileProperties::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 2: return "Thickness"; case 3: return "RibHeight"; case 4: return "RibWidth"; case 5: return "RibSpacing"; case 6: return "Direction"; } return IfcProfileProperties::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRibPlateProfileProperties (IfcAbstractEntityPtr e);
-    IfcRibPlateProfileProperties (boost::optional< IfcLabel > v1_ProfileName, IfcProfileDef* v2_ProfileDefinition, boost::optional< IfcPositiveLengthMeasure > v3_Thickness, boost::optional< IfcPositiveLengthMeasure > v4_RibHeight, boost::optional< IfcPositiveLengthMeasure > v5_RibWidth, boost::optional< IfcPositiveLengthMeasure > v6_RibSpacing, IfcRibPlateDirectionEnum::IfcRibPlateDirectionEnum v7_Direction);
-    typedef IfcRibPlateProfileProperties* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRibPlateProfileProperties > > list;
-    typedef IfcTemplatedEntityList< IfcRibPlateProfileProperties >::it it;
+    IfcRibPlateProfileProperties (IfcAbstractEntity* e);
+    IfcRibPlateProfileProperties (boost::optional< std::string > v1_ProfileName, IfcProfileDef* v2_ProfileDefinition, boost::optional< double > v3_Thickness, boost::optional< double > v4_RibHeight, boost::optional< double > v5_RibWidth, boost::optional< double > v6_RibSpacing, IfcRibPlateDirectionEnum::IfcRibPlateDirectionEnum v7_Direction);
+    typedef IfcTemplatedEntityList< IfcRibPlateProfileProperties > list;
 };
 /// IfcRoot is the most abstract and root class for all IFC entity definitions that roots in the kernel or in subsequent layers of the IFC object model. It is therefore the common supertype of all IFC entities, beside those defined in an IFC resource schema. All entities that are subtypes of IfcRoot can be used independently, whereas resource schema entities, that are not subtypes of IfcRoot, are not supposed to be independent entities.
 /// 
@@ -9730,37 +10792,36 @@ class IfcRibPlateProfileProperties : public IfcProfileProperties {
 class IfcRoot : public IfcUtil::IfcBaseEntity {
 public:
     /// Assignment of a globally unique identifier within the entire software world.
-    IfcGloballyUniqueId GlobalId();
-    void setGlobalId(IfcGloballyUniqueId v);
+    std::string GlobalId() const;
+    void setGlobalId(std::string v);
     /// Assignment of the information about the current ownership of that object, including owning actor, application, local identification and information captured about the recent changes of the object, 
     /// 
     /// NOTE only the last modification in stored - either as addition, deletion or modification.
     /// 
     /// IFC2x4 CHANGE  The attribute has been changed to be OPTIONAL.
-    IfcOwnerHistory* OwnerHistory();
+    IfcOwnerHistory* OwnerHistory() const;
     void setOwnerHistory(IfcOwnerHistory* v);
     /// Whether the optional attribute Name is defined for this IfcRoot
-    bool hasName();
+    bool hasName() const;
     /// Optional name for use by the participating software systems or users. For some subtypes of IfcRoot the insertion of the Name attribute may be required. This would be enforced by a where rule.
-    IfcLabel Name();
-    void setName(IfcLabel v);
+    std::string Name() const;
+    void setName(std::string v);
     /// Whether the optional attribute Description is defined for this IfcRoot
-    bool hasDescription();
+    bool hasDescription() const;
     /// Optional description, provided for exchanging informative comments.
-    IfcText Description();
-    void setDescription(IfcText v);
+    std::string Description() const;
+    void setDescription(std::string v);
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_STRING; case 1: return IfcUtil::Argument_ENTITY; case 2: return IfcUtil::Argument_STRING; case 3: return IfcUtil::Argument_STRING; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcGloballyUniqueId; case 1: return Type::IfcOwnerHistory; case 2: return Type::IfcLabel; case 3: return Type::IfcText; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "GlobalId"; case 1: return "OwnerHistory"; case 2: return "Name"; case 3: return "Description"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRoot (IfcAbstractEntityPtr e);
-    IfcRoot (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description);
-    typedef IfcRoot* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRoot > > list;
-    typedef IfcTemplatedEntityList< IfcRoot >::it it;
+    IfcRoot (IfcAbstractEntity* e);
+    IfcRoot (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description);
+    typedef IfcTemplatedEntityList< IfcRoot > list;
 };
 /// Definition from ISO/CD 10303-41:1992: An SI unit is the fixed quantity used as a standard in terms of which items are measured as defined by ISO 1000 (clause 2).
 /// 
@@ -9772,27 +10833,26 @@ class IfcRoot : public IfcUtil::IfcBaseEntity {
 class IfcSIUnit : public IfcNamedUnit {
 public:
     /// Whether the optional attribute Prefix is defined for this IfcSIUnit
-    bool hasPrefix();
+    bool hasPrefix() const;
     /// The SI Prefix for defining decimal multiples and submultiples of the unit.
-    IfcSIPrefix::IfcSIPrefix Prefix();
+    IfcSIPrefix::IfcSIPrefix Prefix() const;
     void setPrefix(IfcSIPrefix::IfcSIPrefix v);
     /// The word, or group of words, by which the SI unit is referred to.
     /// 
     /// NOTE  Even though the SI system's base unit for mass is kilogram, the IfcSIUnit for mass is gram if no Prefix is asserted.
-    IfcSIUnitName::IfcSIUnitName Name();
+    IfcSIUnitName::IfcSIUnitName Name() const;
     void setName(IfcSIUnitName::IfcSIUnitName v);
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 2: return IfcUtil::Argument_ENUMERATION; case 3: return IfcUtil::Argument_ENUMERATION; } return IfcNamedUnit::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 2: return Type::IfcSIPrefix; case 3: return Type::IfcSIUnitName; } return IfcNamedUnit::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 2: return "Prefix"; case 3: return "Name"; } return IfcNamedUnit::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcSIUnit (IfcAbstractEntityPtr e);
+    IfcSIUnit (IfcAbstractEntity* e);
     IfcSIUnit (IfcUnitEnum::IfcUnitEnum v2_UnitType, boost::optional< IfcSIPrefix::IfcSIPrefix > v3_Prefix, IfcSIUnitName::IfcSIUnitName v4_Name);
-    typedef IfcSIUnit* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcSIUnit > > list;
-    typedef IfcTemplatedEntityList< IfcSIUnit >::it it;
+    typedef IfcTemplatedEntityList< IfcSIUnit > list;
 };
 /// IfcSectionProperties defines the cross section properties for a single longitudinal piece of a cross section.  It is a special-purpose helper class for IfcSectionReinforcementProperties.
 /// 
@@ -9802,28 +10862,27 @@ class IfcSIUnit : public IfcNamedUnit {
 class IfcSectionProperties : public IfcUtil::IfcBaseEntity {
 public:
     /// An indicator whether a specific piece of a cross section is uniform or tapered in longitudinal direction.
-    IfcSectionTypeEnum::IfcSectionTypeEnum SectionType();
+    IfcSectionTypeEnum::IfcSectionTypeEnum SectionType() const;
     void setSectionType(IfcSectionTypeEnum::IfcSectionTypeEnum v);
     /// The cross section profile at the start point of the longitudinal section.
-    IfcProfileDef* StartProfile();
+    IfcProfileDef* StartProfile() const;
     void setStartProfile(IfcProfileDef* v);
     /// Whether the optional attribute EndProfile is defined for this IfcSectionProperties
-    bool hasEndProfile();
+    bool hasEndProfile() const;
     /// The cross section profile at the end point of the longitudinal section.
-    IfcProfileDef* EndProfile();
+    IfcProfileDef* EndProfile() const;
     void setEndProfile(IfcProfileDef* v);
     virtual unsigned int getArgumentCount() const { return 3; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENUMERATION; case 1: return IfcUtil::Argument_ENTITY; case 2: return IfcUtil::Argument_ENTITY; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcSectionTypeEnum; case 1: return Type::IfcProfileDef; case 2: return Type::IfcProfileDef; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "SectionType"; case 1: return "StartProfile"; case 2: return "EndProfile"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcSectionProperties (IfcAbstractEntityPtr e);
+    IfcSectionProperties (IfcAbstractEntity* e);
     IfcSectionProperties (IfcSectionTypeEnum::IfcSectionTypeEnum v1_SectionType, IfcProfileDef* v2_StartProfile, IfcProfileDef* v3_EndProfile);
-    typedef IfcSectionProperties* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcSectionProperties > > list;
-    typedef IfcTemplatedEntityList< IfcSectionProperties >::it it;
+    typedef IfcTemplatedEntityList< IfcSectionProperties > list;
 };
 /// IfcSectionReinforcementProperties defines the cross section properties of reinforcement for a single longitudinal piece of a cross section with a specific reinforcement usage type.  
 /// 
@@ -9835,37 +10894,36 @@ class IfcSectionProperties : public IfcUtil::IfcBaseEntity {
 class IfcSectionReinforcementProperties : public IfcUtil::IfcBaseEntity {
 public:
     /// The start position in longitudinal direction for the section reinforcement properties.
-    IfcLengthMeasure LongitudinalStartPosition();
-    void setLongitudinalStartPosition(IfcLengthMeasure v);
+    double LongitudinalStartPosition() const;
+    void setLongitudinalStartPosition(double v);
     /// The end position in longitudinal direction for the section reinforcement properties.
-    IfcLengthMeasure LongitudinalEndPosition();
-    void setLongitudinalEndPosition(IfcLengthMeasure v);
+    double LongitudinalEndPosition() const;
+    void setLongitudinalEndPosition(double v);
     /// Whether the optional attribute TransversePosition is defined for this IfcSectionReinforcementProperties
-    bool hasTransversePosition();
+    bool hasTransversePosition() const;
     /// The position for the section reinforcement properties in transverse direction.
-    IfcLengthMeasure TransversePosition();
-    void setTransversePosition(IfcLengthMeasure v);
+    double TransversePosition() const;
+    void setTransversePosition(double v);
     /// The role, purpose or usage of the reinforcement, i.e. the kind of loads and stresses it is intended to carry, defined for the section reinforcement properties.
-    IfcReinforcingBarRoleEnum::IfcReinforcingBarRoleEnum ReinforcementRole();
+    IfcReinforcingBarRoleEnum::IfcReinforcingBarRoleEnum ReinforcementRole() const;
     void setReinforcementRole(IfcReinforcingBarRoleEnum::IfcReinforcingBarRoleEnum v);
     /// Definition of the cross section profile and longitudinal section type.
-    IfcSectionProperties* SectionDefinition();
+    IfcSectionProperties* SectionDefinition() const;
     void setSectionDefinition(IfcSectionProperties* v);
     /// The set of reinforcment properties attached to a section reinforcement properties definition.
-    SHARED_PTR< IfcTemplatedEntityList< IfcReinforcementBarProperties > > CrossSectionReinforcementDefinitions();
-    void setCrossSectionReinforcementDefinitions(SHARED_PTR< IfcTemplatedEntityList< IfcReinforcementBarProperties > > v);
+    IfcTemplatedEntityList< IfcReinforcementBarProperties >::ptr CrossSectionReinforcementDefinitions() const;
+    void setCrossSectionReinforcementDefinitions(IfcTemplatedEntityList< IfcReinforcementBarProperties >::ptr v);
     virtual unsigned int getArgumentCount() const { return 6; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_DOUBLE; case 1: return IfcUtil::Argument_DOUBLE; case 2: return IfcUtil::Argument_DOUBLE; case 3: return IfcUtil::Argument_ENUMERATION; case 4: return IfcUtil::Argument_ENTITY; case 5: return IfcUtil::Argument_ENTITY_LIST; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcLengthMeasure; case 1: return Type::IfcLengthMeasure; case 2: return Type::IfcLengthMeasure; case 3: return Type::IfcReinforcingBarRoleEnum; case 4: return Type::IfcSectionProperties; case 5: return Type::IfcReinforcementBarProperties; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "LongitudinalStartPosition"; case 1: return "LongitudinalEndPosition"; case 2: return "TransversePosition"; case 3: return "ReinforcementRole"; case 4: return "SectionDefinition"; case 5: return "CrossSectionReinforcementDefinitions"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcSectionReinforcementProperties (IfcAbstractEntityPtr e);
-    IfcSectionReinforcementProperties (IfcLengthMeasure v1_LongitudinalStartPosition, IfcLengthMeasure v2_LongitudinalEndPosition, boost::optional< IfcLengthMeasure > v3_TransversePosition, IfcReinforcingBarRoleEnum::IfcReinforcingBarRoleEnum v4_ReinforcementRole, IfcSectionProperties* v5_SectionDefinition, SHARED_PTR< IfcTemplatedEntityList< IfcReinforcementBarProperties > > v6_CrossSectionReinforcementDefinitions);
-    typedef IfcSectionReinforcementProperties* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcSectionReinforcementProperties > > list;
-    typedef IfcTemplatedEntityList< IfcSectionReinforcementProperties >::it it;
+    IfcSectionReinforcementProperties (IfcAbstractEntity* e);
+    IfcSectionReinforcementProperties (double v1_LongitudinalStartPosition, double v2_LongitudinalEndPosition, boost::optional< double > v3_TransversePosition, IfcReinforcingBarRoleEnum::IfcReinforcingBarRoleEnum v4_ReinforcementRole, IfcSectionProperties* v5_SectionDefinition, IfcTemplatedEntityList< IfcReinforcementBarProperties >::ptr v6_CrossSectionReinforcementDefinitions);
+    typedef IfcTemplatedEntityList< IfcSectionReinforcementProperties > list;
 };
 /// Definition from ISO/CD 10303-41:1992: The shape
 ///   aspect is an identifiable element of the shape of a
@@ -9908,39 +10966,38 @@ class IfcShapeAspect : public IfcUtil::IfcBaseEntity {
 public:
     /// List of shape representations. Each member defines a valid representation of a particular type within a particular representation context as being an aspect (or part) of a product definition.
     /// IFC2x Edition 3 CHANGE  The data type has been changed from IfcShapeRepresentation to IfcShapeModel with upward compatibility
-    SHARED_PTR< IfcTemplatedEntityList< IfcShapeModel > > ShapeRepresentations();
-    void setShapeRepresentations(SHARED_PTR< IfcTemplatedEntityList< IfcShapeModel > > v);
+    IfcTemplatedEntityList< IfcShapeModel >::ptr ShapeRepresentations() const;
+    void setShapeRepresentations(IfcTemplatedEntityList< IfcShapeModel >::ptr v);
     /// Whether the optional attribute Name is defined for this IfcShapeAspect
-    bool hasName();
+    bool hasName() const;
     /// The word or group of words by which the shape aspect is known. It is a tag to indicate the particular semantic of a component within the product definition shape, used to provide meaning. Example: use the tag "Glazing" to define which component of a window shape defines the glazing area.
-    IfcLabel Name();
-    void setName(IfcLabel v);
+    std::string Name() const;
+    void setName(std::string v);
     /// Whether the optional attribute Description is defined for this IfcShapeAspect
-    bool hasDescription();
+    bool hasDescription() const;
     /// The word or group of words that characterize the shape aspect. It can be used to add additional meaning to the name of the aspect.
-    IfcText Description();
-    void setDescription(IfcText v);
+    std::string Description() const;
+    void setDescription(std::string v);
     /// An indication that the shape aspect is on the physical boundary of the product definition shape. If the value of this attribute is TRUE, it shall be asserted that the shape aspect being identified is on such a boundary. If the value is FALSE, it shall be asserted that the shape aspect being identified is not on such a boundary. If the value is UNKNOWN, it shall be asserted that it is not known whether or not the shape aspect being identified is on such a boundary. 
     /// ---
     /// EXAMPLE: Would be FALSE for a center line, identified as shape aspect; would be TRUE for a cantilever.
     /// ---
-    bool ProductDefinitional();
+    bool ProductDefinitional() const;
     void setProductDefinitional(bool v);
     /// Reference to the product definition shape of which this class is an aspect.
-    IfcProductDefinitionShape* PartOfProductDefinitionShape();
+    IfcProductDefinitionShape* PartOfProductDefinitionShape() const;
     void setPartOfProductDefinitionShape(IfcProductDefinitionShape* v);
     virtual unsigned int getArgumentCount() const { return 5; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY_LIST; case 1: return IfcUtil::Argument_STRING; case 2: return IfcUtil::Argument_STRING; case 3: return IfcUtil::Argument_BOOL; case 4: return IfcUtil::Argument_ENTITY; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcShapeModel; case 1: return Type::IfcLabel; case 2: return Type::IfcText; case 3: return Type::UNDEFINED; case 4: return Type::IfcProductDefinitionShape; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "ShapeRepresentations"; case 1: return "Name"; case 2: return "Description"; case 3: return "ProductDefinitional"; case 4: return "PartOfProductDefinitionShape"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcShapeAspect (IfcAbstractEntityPtr e);
-    IfcShapeAspect (SHARED_PTR< IfcTemplatedEntityList< IfcShapeModel > > v1_ShapeRepresentations, boost::optional< IfcLabel > v2_Name, boost::optional< IfcText > v3_Description, bool v4_ProductDefinitional, IfcProductDefinitionShape* v5_PartOfProductDefinitionShape);
-    typedef IfcShapeAspect* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcShapeAspect > > list;
-    typedef IfcTemplatedEntityList< IfcShapeAspect >::it it;
+    IfcShapeAspect (IfcAbstractEntity* e);
+    IfcShapeAspect (IfcTemplatedEntityList< IfcShapeModel >::ptr v1_ShapeRepresentations, boost::optional< std::string > v2_Name, boost::optional< std::string > v3_Description, bool v4_ProductDefinitional, IfcProductDefinitionShape* v5_PartOfProductDefinitionShape);
+    typedef IfcTemplatedEntityList< IfcShapeAspect > list;
 };
 /// IfcShapeModel represents
 /// the concept of a particular geometric and/or topological
@@ -9964,17 +11021,16 @@ class IfcShapeModel : public IfcRepresentation {
 public:
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcRepresentation::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcRepresentation::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcRepresentation::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcShapeAspect > > OfShapeAspect(); // INVERSE IfcShapeAspect::ShapeRepresentations
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcShapeAspect >::ptr OfShapeAspect() const; // INVERSE IfcShapeAspect::ShapeRepresentations
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcShapeModel (IfcAbstractEntityPtr e);
-    IfcShapeModel (IfcRepresentationContext* v1_ContextOfItems, boost::optional< IfcLabel > v2_RepresentationIdentifier, boost::optional< IfcLabel > v3_RepresentationType, SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationItem > > v4_Items);
-    typedef IfcShapeModel* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcShapeModel > > list;
-    typedef IfcTemplatedEntityList< IfcShapeModel >::it it;
+    IfcShapeModel (IfcAbstractEntity* e);
+    IfcShapeModel (IfcRepresentationContext* v1_ContextOfItems, boost::optional< std::string > v2_RepresentationIdentifier, boost::optional< std::string > v3_RepresentationType, IfcTemplatedEntityList< IfcRepresentationItem >::ptr v4_Items);
+    typedef IfcTemplatedEntityList< IfcShapeModel > list;
 };
 /// The IfcShapeRepresentation represents the concept of a
 /// particular geometric representation of a product or a product
@@ -10115,16 +11171,15 @@ class IfcShapeRepresentation : public IfcShapeModel {
 public:
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcShapeModel::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcShapeModel::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcShapeModel::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcShapeRepresentation (IfcAbstractEntityPtr e);
-    IfcShapeRepresentation (IfcRepresentationContext* v1_ContextOfItems, boost::optional< IfcLabel > v2_RepresentationIdentifier, boost::optional< IfcLabel > v3_RepresentationType, SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationItem > > v4_Items);
-    typedef IfcShapeRepresentation* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcShapeRepresentation > > list;
-    typedef IfcTemplatedEntityList< IfcShapeRepresentation >::it it;
+    IfcShapeRepresentation (IfcAbstractEntity* e);
+    IfcShapeRepresentation (IfcRepresentationContext* v1_ContextOfItems, boost::optional< std::string > v2_RepresentationIdentifier, boost::optional< std::string > v3_RepresentationType, IfcTemplatedEntityList< IfcRepresentationItem >::ptr v4_Items);
+    typedef IfcTemplatedEntityList< IfcShapeRepresentation > list;
 };
 /// IfcSimpleProperty is a generalization of a single property object. The various subtypes of IfcSimpleProperty establish different ways in which a property value can be set. 
 /// 
@@ -10133,16 +11188,15 @@ class IfcSimpleProperty : public IfcProperty {
 public:
     virtual unsigned int getArgumentCount() const { return 2; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcProperty::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcProperty::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcProperty::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcSimpleProperty (IfcAbstractEntityPtr e);
-    IfcSimpleProperty (IfcIdentifier v1_Name, boost::optional< IfcText > v2_Description);
-    typedef IfcSimpleProperty* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcSimpleProperty > > list;
-    typedef IfcTemplatedEntityList< IfcSimpleProperty >::it it;
+    IfcSimpleProperty (IfcAbstractEntity* e);
+    IfcSimpleProperty (std::string v1_Name, boost::optional< std::string > v2_Description);
+    typedef IfcTemplatedEntityList< IfcSimpleProperty > list;
 };
 /// Definition from IAI: Describe more rarely needed connection properties.
 /// 
@@ -10150,22 +11204,21 @@ class IfcSimpleProperty : public IfcProperty {
 class IfcStructuralConnectionCondition : public IfcUtil::IfcBaseEntity {
 public:
     /// Whether the optional attribute Name is defined for this IfcStructuralConnectionCondition
-    bool hasName();
+    bool hasName() const;
     /// Optionally defines a name for this connection condition.
-    IfcLabel Name();
-    void setName(IfcLabel v);
+    std::string Name() const;
+    void setName(std::string v);
     virtual unsigned int getArgumentCount() const { return 1; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_STRING; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcLabel; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Name"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcStructuralConnectionCondition (IfcAbstractEntityPtr e);
-    IfcStructuralConnectionCondition (boost::optional< IfcLabel > v1_Name);
-    typedef IfcStructuralConnectionCondition* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcStructuralConnectionCondition > > list;
-    typedef IfcTemplatedEntityList< IfcStructuralConnectionCondition >::it it;
+    IfcStructuralConnectionCondition (IfcAbstractEntity* e);
+    IfcStructuralConnectionCondition (boost::optional< std::string > v1_Name);
+    typedef IfcTemplatedEntityList< IfcStructuralConnectionCondition > list;
 };
 /// Definition from IAI: The abstract entity IfcStructuralLoadOrResult is the supertype of all loads (actions or reactions) or of certain requirements resulting from structural analysis, or certain provisions which influence structural analysis.
 /// 
@@ -10173,22 +11226,21 @@ class IfcStructuralConnectionCondition : public IfcUtil::IfcBaseEntity {
 class IfcStructuralLoad : public IfcUtil::IfcBaseEntity {
 public:
     /// Whether the optional attribute Name is defined for this IfcStructuralLoad
-    bool hasName();
+    bool hasName() const;
     /// Optionally defines a name for this load.
-    IfcLabel Name();
-    void setName(IfcLabel v);
+    std::string Name() const;
+    void setName(std::string v);
     virtual unsigned int getArgumentCount() const { return 1; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_STRING; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcLabel; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Name"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcStructuralLoad (IfcAbstractEntityPtr e);
-    IfcStructuralLoad (boost::optional< IfcLabel > v1_Name);
-    typedef IfcStructuralLoad* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcStructuralLoad > > list;
-    typedef IfcTemplatedEntityList< IfcStructuralLoad >::it it;
+    IfcStructuralLoad (IfcAbstractEntity* e);
+    IfcStructuralLoad (boost::optional< std::string > v1_Name);
+    typedef IfcTemplatedEntityList< IfcStructuralLoad > list;
 };
 /// Definition from IAI: The abstract entity IfcStructuralLoadStatic is the supertype of all static loads (actions or reactions) which can be defined.  Within scope are single i.e. concentrated forces and moments, linear i.e. one-dimensionally distributed forces and moments, planar i.e. two-dimensionally distributed forces, furthermore displacements and temperature loads.
 /// 
@@ -10197,16 +11249,15 @@ class IfcStructuralLoadStatic : public IfcStructuralLoad {
 public:
     virtual unsigned int getArgumentCount() const { return 1; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcStructuralLoad::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcStructuralLoad::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcStructuralLoad::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcStructuralLoadStatic (IfcAbstractEntityPtr e);
-    IfcStructuralLoadStatic (boost::optional< IfcLabel > v1_Name);
-    typedef IfcStructuralLoadStatic* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcStructuralLoadStatic > > list;
-    typedef IfcTemplatedEntityList< IfcStructuralLoadStatic >::it it;
+    IfcStructuralLoadStatic (IfcAbstractEntity* e);
+    IfcStructuralLoadStatic (boost::optional< std::string > v1_Name);
+    typedef IfcTemplatedEntityList< IfcStructuralLoadStatic > list;
 };
 /// An instance of the entity IfcStructuralLoadTemperature shall be used to define actions which are caused by a temperature change. As shown in Figure 332, the change of temperature is given with a constant value which is applied to the complete section and values for temperature differences between outer fibres of the section.
 /// 
@@ -10216,29 +11267,28 @@ class IfcStructuralLoadStatic : public IfcStructuralLoad {
 class IfcStructuralLoadTemperature : public IfcStructuralLoadStatic {
 public:
     /// Whether the optional attribute DeltaT_Constant is defined for this IfcStructuralLoadTemperature
-    bool hasDeltaT_Constant();
-    IfcThermodynamicTemperatureMeasure DeltaT_Constant();
-    void setDeltaT_Constant(IfcThermodynamicTemperatureMeasure v);
+    bool hasDeltaT_Constant() const;
+    double DeltaT_Constant() const;
+    void setDeltaT_Constant(double v);
     /// Whether the optional attribute DeltaT_Y is defined for this IfcStructuralLoadTemperature
-    bool hasDeltaT_Y();
-    IfcThermodynamicTemperatureMeasure DeltaT_Y();
-    void setDeltaT_Y(IfcThermodynamicTemperatureMeasure v);
+    bool hasDeltaT_Y() const;
+    double DeltaT_Y() const;
+    void setDeltaT_Y(double v);
     /// Whether the optional attribute DeltaT_Z is defined for this IfcStructuralLoadTemperature
-    bool hasDeltaT_Z();
-    IfcThermodynamicTemperatureMeasure DeltaT_Z();
-    void setDeltaT_Z(IfcThermodynamicTemperatureMeasure v);
+    bool hasDeltaT_Z() const;
+    double DeltaT_Z() const;
+    void setDeltaT_Z(double v);
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 1: return IfcUtil::Argument_DOUBLE; case 2: return IfcUtil::Argument_DOUBLE; case 3: return IfcUtil::Argument_DOUBLE; } return IfcStructuralLoadStatic::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 1: return Type::IfcThermodynamicTemperatureMeasure; case 2: return Type::IfcThermodynamicTemperatureMeasure; case 3: return Type::IfcThermodynamicTemperatureMeasure; } return IfcStructuralLoadStatic::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 1: return "DeltaT_Constant"; case 2: return "DeltaT_Y"; case 3: return "DeltaT_Z"; } return IfcStructuralLoadStatic::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcStructuralLoadTemperature (IfcAbstractEntityPtr e);
-    IfcStructuralLoadTemperature (boost::optional< IfcLabel > v1_Name, boost::optional< IfcThermodynamicTemperatureMeasure > v2_DeltaT_Constant, boost::optional< IfcThermodynamicTemperatureMeasure > v3_DeltaT_Y, boost::optional< IfcThermodynamicTemperatureMeasure > v4_DeltaT_Z);
-    typedef IfcStructuralLoadTemperature* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcStructuralLoadTemperature > > list;
-    typedef IfcTemplatedEntityList< IfcStructuralLoadTemperature >::it it;
+    IfcStructuralLoadTemperature (IfcAbstractEntity* e);
+    IfcStructuralLoadTemperature (boost::optional< std::string > v1_Name, boost::optional< double > v2_DeltaT_Constant, boost::optional< double > v3_DeltaT_Y, boost::optional< double > v4_DeltaT_Z);
+    typedef IfcTemplatedEntityList< IfcStructuralLoadTemperature > list;
 };
 /// IfcStyleModel represents the concept of a particular presentation style defined for a material (or other characteristic) of a product or a product component within a representation context. This representation context may (but has not to be) a geometric representation context.
 /// 
@@ -10249,16 +11299,15 @@ class IfcStyleModel : public IfcRepresentation {
 public:
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcRepresentation::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcRepresentation::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcRepresentation::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcStyleModel (IfcAbstractEntityPtr e);
-    IfcStyleModel (IfcRepresentationContext* v1_ContextOfItems, boost::optional< IfcLabel > v2_RepresentationIdentifier, boost::optional< IfcLabel > v3_RepresentationType, SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationItem > > v4_Items);
-    typedef IfcStyleModel* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcStyleModel > > list;
-    typedef IfcTemplatedEntityList< IfcStyleModel >::it it;
+    IfcStyleModel (IfcAbstractEntity* e);
+    IfcStyleModel (IfcRepresentationContext* v1_ContextOfItems, boost::optional< std::string > v2_RepresentationIdentifier, boost::optional< std::string > v3_RepresentationType, IfcTemplatedEntityList< IfcRepresentationItem >::ptr v4_Items);
+    typedef IfcTemplatedEntityList< IfcStyleModel > list;
 };
 /// Definition from ISO/CD 10303-46:1992: The styled item is an assignment of style for presentation to a geometric representation item as it is used in a representation.
 /// 
@@ -10291,11 +11340,11 @@ class IfcStyleModel : public IfcRepresentation {
 class IfcStyledItem : public IfcRepresentationItem {
 public:
     /// Whether the optional attribute Item is defined for this IfcStyledItem
-    bool hasItem();
+    bool hasItem() const;
     /// A geometric representation item to which the style is assigned.
     /// 
     /// IFC2x Edition 2 Addendum 2 CHANGE The attribute Item has been made optional. Upward compatibility for file based exchange is guaranteed.
-    IfcRepresentationItem* Item();
+    IfcRepresentationItem* Item() const;
     void setItem(IfcRepresentationItem* v);
     /// Representation styles which are assigned, either to an geometric representation item, or to a material definition.
     /// 
@@ -10303,25 +11352,24 @@ class IfcStyledItem : public IfcRepresentationItem {
     /// for file based exchange.
     /// 
     /// NOTE  Only the select item IfcPresentationStyle shall be used from IFC2x4 onwards, the IfcPresentationStyleAssignment has been deprecated.
-    SHARED_PTR< IfcTemplatedEntityList< IfcPresentationStyleAssignment > > Styles();
-    void setStyles(SHARED_PTR< IfcTemplatedEntityList< IfcPresentationStyleAssignment > > v);
+    IfcTemplatedEntityList< IfcPresentationStyleAssignment >::ptr Styles() const;
+    void setStyles(IfcTemplatedEntityList< IfcPresentationStyleAssignment >::ptr v);
     /// Whether the optional attribute Name is defined for this IfcStyledItem
-    bool hasName();
+    bool hasName() const;
     /// The word, or group of words, by which the styled item is referred to.
-    IfcLabel Name();
-    void setName(IfcLabel v);
+    std::string Name() const;
+    void setName(std::string v);
     virtual unsigned int getArgumentCount() const { return 3; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY; case 1: return IfcUtil::Argument_ENTITY_LIST; case 2: return IfcUtil::Argument_STRING; } return IfcRepresentationItem::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcRepresentationItem; case 1: return Type::IfcPresentationStyleAssignment; case 2: return Type::IfcLabel; } return IfcRepresentationItem::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Item"; case 1: return "Styles"; case 2: return "Name"; } return IfcRepresentationItem::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcStyledItem (IfcAbstractEntityPtr e);
-    IfcStyledItem (IfcRepresentationItem* v1_Item, SHARED_PTR< IfcTemplatedEntityList< IfcPresentationStyleAssignment > > v2_Styles, boost::optional< IfcLabel > v3_Name);
-    typedef IfcStyledItem* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcStyledItem > > list;
-    typedef IfcTemplatedEntityList< IfcStyledItem >::it it;
+    IfcStyledItem (IfcAbstractEntity* e);
+    IfcStyledItem (IfcRepresentationItem* v1_Item, IfcTemplatedEntityList< IfcPresentationStyleAssignment >::ptr v2_Styles, boost::optional< std::string > v3_Name);
+    typedef IfcTemplatedEntityList< IfcStyledItem > list;
 };
 /// The IfcStyledRepresentation represents the concept of a styled presentation being a representation of a product or a product component, like material. within a representation context. This representation context does not need to be (but may be) a geometric representation context.
 /// 
@@ -10334,16 +11382,15 @@ class IfcStyledRepresentation : public IfcStyleModel {
 public:
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcStyleModel::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcStyleModel::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcStyleModel::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcStyledRepresentation (IfcAbstractEntityPtr e);
-    IfcStyledRepresentation (IfcRepresentationContext* v1_ContextOfItems, boost::optional< IfcLabel > v2_RepresentationIdentifier, boost::optional< IfcLabel > v3_RepresentationType, SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationItem > > v4_Items);
-    typedef IfcStyledRepresentation* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcStyledRepresentation > > list;
-    typedef IfcTemplatedEntityList< IfcStyledRepresentation >::it it;
+    IfcStyledRepresentation (IfcAbstractEntity* e);
+    IfcStyledRepresentation (IfcRepresentationContext* v1_ContextOfItems, boost::optional< std::string > v2_RepresentationIdentifier, boost::optional< std::string > v3_RepresentationType, IfcTemplatedEntityList< IfcRepresentationItem >::ptr v4_Items);
+    typedef IfcTemplatedEntityList< IfcStyledRepresentation > list;
 };
 /// IfcSurfaceStyle is an assignment of one or many surface style elements to a surface, defined by subtypes of IfcSurface, IfcFaceBasedSurfaceModel, IfcShellBasedSurfaceModel, or by subtypes of IfcSolidModel. The positive direction of the surface normal relates to the positive side. In case of solids the outside of the solid is to be taken as positive side. 
 /// 
@@ -10355,23 +11402,22 @@ class IfcStyledRepresentation : public IfcStyleModel {
 class IfcSurfaceStyle : public IfcPresentationStyle {
 public:
     /// An indication of which side of the surface to apply the style.
-    IfcSurfaceSide::IfcSurfaceSide Side();
+    IfcSurfaceSide::IfcSurfaceSide Side() const;
     void setSide(IfcSurfaceSide::IfcSurfaceSide v);
     /// A collection of different surface styles.
-    SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > Styles();
-    void setStyles(SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > v);
+    IfcEntityList::ptr Styles() const;
+    void setStyles(IfcEntityList::ptr v);
     virtual unsigned int getArgumentCount() const { return 3; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 1: return IfcUtil::Argument_ENUMERATION; case 2: return IfcUtil::Argument_ENTITY_LIST; } return IfcPresentationStyle::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 1: return Type::IfcSurfaceSide; case 2: return Type::IfcSurfaceStyleElementSelect; } return IfcPresentationStyle::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 1: return "Side"; case 2: return "Styles"; } return IfcPresentationStyle::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcSurfaceStyle (IfcAbstractEntityPtr e);
-    IfcSurfaceStyle (boost::optional< IfcLabel > v1_Name, IfcSurfaceSide::IfcSurfaceSide v2_Side, IfcEntities v3_Styles);
-    typedef IfcSurfaceStyle* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcSurfaceStyle > > list;
-    typedef IfcTemplatedEntityList< IfcSurfaceStyle >::it it;
+    IfcSurfaceStyle (IfcAbstractEntity* e);
+    IfcSurfaceStyle (boost::optional< std::string > v1_Name, IfcSurfaceSide::IfcSurfaceSide v2_Side, IfcEntityList::ptr v3_Styles);
+    typedef IfcTemplatedEntityList< IfcSurfaceStyle > list;
 };
 /// IfcSurfaceStyleLighting is a container class for properties for calculation of physically exact illuminance related to a particular surface style.
 /// 
@@ -10388,32 +11434,31 @@ class IfcSurfaceStyleLighting : public IfcUtil::IfcBaseEntity {
 public:
     /// The degree of diffusion of the transmitted light. In the case of completely transparent materials there is no diffusion. The greater the diffusing power, the smaller the direct component of the transmitted light, up to the point where only diffuse light is produced.A value of 1 means totally diffuse for that colour part of the light.
     /// The factor can be measured physically and has three ratios for the red, green and blue part of the light.
-    IfcColourRgb* DiffuseTransmissionColour();
+    IfcColourRgb* DiffuseTransmissionColour() const;
     void setDiffuseTransmissionColour(IfcColourRgb* v);
     /// The degree of diffusion of the reflected light. In the case of specular surfaces there is no diffusion. The greater the diffusing power of the reflecting surface, the smaller the specular component of the reflected light, up to the point where only diffuse light is produced. A value of 1 means totally diffuse for that colour part of the light. 
     /// The factor can be measured physically and has three ratios for the red, green and blue part of the light.
-    IfcColourRgb* DiffuseReflectionColour();
+    IfcColourRgb* DiffuseReflectionColour() const;
     void setDiffuseReflectionColour(IfcColourRgb* v);
     /// Describes how the light falling on a body is totally or partially transmitted. 
     /// The factor can be measured physically and has three ratios for the red, green and blue part of the light.
-    IfcColourRgb* TransmissionColour();
+    IfcColourRgb* TransmissionColour() const;
     void setTransmissionColour(IfcColourRgb* v);
     /// A coefficient that determines the extent that the light falling onto a surface is fully or partially reflected. 
     /// The factor can be measured physically and has three ratios for the red, green and blue part of the light.
-    IfcColourRgb* ReflectanceColour();
+    IfcColourRgb* ReflectanceColour() const;
     void setReflectanceColour(IfcColourRgb* v);
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY; case 1: return IfcUtil::Argument_ENTITY; case 2: return IfcUtil::Argument_ENTITY; case 3: return IfcUtil::Argument_ENTITY; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcColourRgb; case 1: return Type::IfcColourRgb; case 2: return Type::IfcColourRgb; case 3: return Type::IfcColourRgb; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "DiffuseTransmissionColour"; case 1: return "DiffuseReflectionColour"; case 2: return "TransmissionColour"; case 3: return "ReflectanceColour"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcSurfaceStyleLighting (IfcAbstractEntityPtr e);
+    IfcSurfaceStyleLighting (IfcAbstractEntity* e);
     IfcSurfaceStyleLighting (IfcColourRgb* v1_DiffuseTransmissionColour, IfcColourRgb* v2_DiffuseReflectionColour, IfcColourRgb* v3_TransmissionColour, IfcColourRgb* v4_ReflectanceColour);
-    typedef IfcSurfaceStyleLighting* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcSurfaceStyleLighting > > list;
-    typedef IfcTemplatedEntityList< IfcSurfaceStyleLighting >::it it;
+    typedef IfcTemplatedEntityList< IfcSurfaceStyleLighting > list;
 };
 /// IfcSurfaceStyleRefraction extends the surface style lighting, or the surface style rendering definition for properties for calculation of physically exact illuminance by adding seldomly used properties. Currently this includes the refraction index (by which the light ray refracts when passing through a prism) and the dispersion factor (or Abbe constant) which takes into account the wavelength dependency of the refraction.
 /// 
@@ -10423,27 +11468,26 @@ class IfcSurfaceStyleLighting : public IfcUtil::IfcBaseEntity {
 class IfcSurfaceStyleRefraction : public IfcUtil::IfcBaseEntity {
 public:
     /// Whether the optional attribute RefractionIndex is defined for this IfcSurfaceStyleRefraction
-    bool hasRefractionIndex();
+    bool hasRefractionIndex() const;
     /// The index of refraction for all wave lengths of light. The refraction index is the ratio between the speed of light in a vacuum and the speed of light in the medium. E.g. glass has a refraction index of 1.5, whereas water has an index of 1.33
-    IfcReal RefractionIndex();
-    void setRefractionIndex(IfcReal v);
+    double RefractionIndex() const;
+    void setRefractionIndex(double v);
     /// Whether the optional attribute DispersionFactor is defined for this IfcSurfaceStyleRefraction
-    bool hasDispersionFactor();
+    bool hasDispersionFactor() const;
     /// The Abbe constant given as a fixed ratio between the refractive indices of the material at different wavelengths. A low Abbe number means a high dispersive power. In general this translates to a greater angular spread of the emergent spectrum.
-    IfcReal DispersionFactor();
-    void setDispersionFactor(IfcReal v);
+    double DispersionFactor() const;
+    void setDispersionFactor(double v);
     virtual unsigned int getArgumentCount() const { return 2; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_DOUBLE; case 1: return IfcUtil::Argument_DOUBLE; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcReal; case 1: return Type::IfcReal; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "RefractionIndex"; case 1: return "DispersionFactor"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcSurfaceStyleRefraction (IfcAbstractEntityPtr e);
-    IfcSurfaceStyleRefraction (boost::optional< IfcReal > v1_RefractionIndex, boost::optional< IfcReal > v2_DispersionFactor);
-    typedef IfcSurfaceStyleRefraction* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcSurfaceStyleRefraction > > list;
-    typedef IfcTemplatedEntityList< IfcSurfaceStyleRefraction >::it it;
+    IfcSurfaceStyleRefraction (IfcAbstractEntity* e);
+    IfcSurfaceStyleRefraction (boost::optional< double > v1_RefractionIndex, boost::optional< double > v2_DispersionFactor);
+    typedef IfcTemplatedEntityList< IfcSurfaceStyleRefraction > list;
 };
 /// Definition from ISO/CD 10303-46:1992: The surface style rendering allows the realistic visualization of surfaces referring to rendering techniques based on the laws of physics and mathematics. 
 /// 
@@ -10455,20 +11499,19 @@ class IfcSurfaceStyleRefraction : public IfcUtil::IfcBaseEntity {
 class IfcSurfaceStyleShading : public IfcUtil::IfcBaseEntity {
 public:
     /// The colour used to render the surface. The surface colour for visualisation is defined by specifying the intensity of red, green and blue.
-    IfcColourRgb* SurfaceColour();
+    IfcColourRgb* SurfaceColour() const;
     void setSurfaceColour(IfcColourRgb* v);
     virtual unsigned int getArgumentCount() const { return 1; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcColourRgb; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "SurfaceColour"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcSurfaceStyleShading (IfcAbstractEntityPtr e);
+    IfcSurfaceStyleShading (IfcAbstractEntity* e);
     IfcSurfaceStyleShading (IfcColourRgb* v1_SurfaceColour);
-    typedef IfcSurfaceStyleShading* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcSurfaceStyleShading > > list;
-    typedef IfcTemplatedEntityList< IfcSurfaceStyleShading >::it it;
+    typedef IfcTemplatedEntityList< IfcSurfaceStyleShading > list;
 };
 /// The entity IfcSurfaceStyleWithTextures allows to include image textures in surface styles. These image textures can be applied repeating across the surface or mapped with a particular scale upon the surface.
 /// 
@@ -10491,20 +11534,19 @@ class IfcSurfaceStyleShading : public IfcUtil::IfcBaseEntity {
 class IfcSurfaceStyleWithTextures : public IfcUtil::IfcBaseEntity {
 public:
     /// The textures applied to the surface. In case of more than one surface texture is included, the IfcSurfaceStyleWithTexture defines a multi texture.
-    SHARED_PTR< IfcTemplatedEntityList< IfcSurfaceTexture > > Textures();
-    void setTextures(SHARED_PTR< IfcTemplatedEntityList< IfcSurfaceTexture > > v);
+    IfcTemplatedEntityList< IfcSurfaceTexture >::ptr Textures() const;
+    void setTextures(IfcTemplatedEntityList< IfcSurfaceTexture >::ptr v);
     virtual unsigned int getArgumentCount() const { return 1; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY_LIST; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcSurfaceTexture; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Textures"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcSurfaceStyleWithTextures (IfcAbstractEntityPtr e);
-    IfcSurfaceStyleWithTextures (SHARED_PTR< IfcTemplatedEntityList< IfcSurfaceTexture > > v1_Textures);
-    typedef IfcSurfaceStyleWithTextures* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcSurfaceStyleWithTextures > > list;
-    typedef IfcTemplatedEntityList< IfcSurfaceStyleWithTextures >::it it;
+    IfcSurfaceStyleWithTextures (IfcAbstractEntity* e);
+    IfcSurfaceStyleWithTextures (IfcTemplatedEntityList< IfcSurfaceTexture >::ptr v1_Textures);
+    typedef IfcTemplatedEntityList< IfcSurfaceStyleWithTextures > list;
 };
 /// An IfcSurfaceTexture provides a 2-dimensional
 /// image-based texture map. It can either be given by referencing an
@@ -10601,32 +11643,31 @@ class IfcSurfaceStyleWithTextures : public IfcUtil::IfcBaseEntity {
 class IfcSurfaceTexture : public IfcUtil::IfcBaseEntity {
 public:
     /// The RepeatS field specifies how the texture wraps in the S direction. If RepeatS is TRUE (the default), the texture map is repeated outside the [0.0, 1.0] texture coordinate range in the S direction so that it fills the shape. If RepeatS is FALSE, the texture coordinates are clamped in the S direction to lie within the [0.0, 1.0] range.
-    bool RepeatS();
+    bool RepeatS() const;
     void setRepeatS(bool v);
     /// The RepeatT field specifies how the texture wraps in the T direction. If RepeatT is TRUE (the default), the texture map is repeated outside the [0.0, 1.0] texture coordinate range in the T direction so that it fills the shape. If RepeatT is FALSE, the texture coordinates are clamped in the T direction to lie within the [0.0, 1.0] range.
-    bool RepeatT();
+    bool RepeatT() const;
     void setRepeatT(bool v);
-    IfcSurfaceTextureEnum::IfcSurfaceTextureEnum TextureType();
+    IfcSurfaceTextureEnum::IfcSurfaceTextureEnum TextureType() const;
     void setTextureType(IfcSurfaceTextureEnum::IfcSurfaceTextureEnum v);
     /// Whether the optional attribute TextureTransform is defined for this IfcSurfaceTexture
-    bool hasTextureTransform();
+    bool hasTextureTransform() const;
     /// The TextureTransform defines a 2D transformation that is applied to the texture coordinates. It affects the way texture coordinates are applied to the surfaces of geometric representation itesm. The 2D transformation supports changes to the size, orientation, and position of textures on shapes. 
     /// 
     /// Mirroring is not allowed to be used in the IfcCarteesianTransformationOperator
-    IfcCartesianTransformationOperator2D* TextureTransform();
+    IfcCartesianTransformationOperator2D* TextureTransform() const;
     void setTextureTransform(IfcCartesianTransformationOperator2D* v);
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_BOOL; case 1: return IfcUtil::Argument_BOOL; case 2: return IfcUtil::Argument_ENUMERATION; case 3: return IfcUtil::Argument_ENTITY; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::UNDEFINED; case 1: return Type::UNDEFINED; case 2: return Type::IfcSurfaceTextureEnum; case 3: return Type::IfcCartesianTransformationOperator2D; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "RepeatS"; case 1: return "RepeatT"; case 2: return "TextureType"; case 3: return "TextureTransform"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcSurfaceTexture (IfcAbstractEntityPtr e);
+    IfcSurfaceTexture (IfcAbstractEntity* e);
     IfcSurfaceTexture (bool v1_RepeatS, bool v2_RepeatT, IfcSurfaceTextureEnum::IfcSurfaceTextureEnum v3_TextureType, IfcCartesianTransformationOperator2D* v4_TextureTransform);
-    typedef IfcSurfaceTexture* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcSurfaceTexture > > list;
-    typedef IfcTemplatedEntityList< IfcSurfaceTexture >::it it;
+    typedef IfcTemplatedEntityList< IfcSurfaceTexture > list;
 };
 /// Definition from ISO/CD 10303-46:1992: The symbol style is the presentation style that indicates the presentation of annotation symbols. 
 /// 
@@ -10636,20 +11677,19 @@ class IfcSurfaceTexture : public IfcUtil::IfcBaseEntity {
 class IfcSymbolStyle : public IfcPresentationStyle {
 public:
     /// The style applied to the symbol for its visual appearance.
-    IfcSymbolStyleSelect StyleOfSymbol();
-    void setStyleOfSymbol(IfcSymbolStyleSelect v);
+    IfcSymbolStyleSelect* StyleOfSymbol() const;
+    void setStyleOfSymbol(IfcSymbolStyleSelect* v);
     virtual unsigned int getArgumentCount() const { return 2; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 1: return IfcUtil::Argument_ENTITY; } return IfcPresentationStyle::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 1: return Type::IfcSymbolStyleSelect; } return IfcPresentationStyle::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 1: return "StyleOfSymbol"; } return IfcPresentationStyle::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcSymbolStyle (IfcAbstractEntityPtr e);
-    IfcSymbolStyle (boost::optional< IfcLabel > v1_Name, IfcSymbolStyleSelect v2_StyleOfSymbol);
-    typedef IfcSymbolStyle* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcSymbolStyle > > list;
-    typedef IfcTemplatedEntityList< IfcSymbolStyle >::it it;
+    IfcSymbolStyle (IfcAbstractEntity* e);
+    IfcSymbolStyle (boost::optional< std::string > v1_Name, IfcSymbolStyleSelect* v2_StyleOfSymbol);
+    typedef IfcTemplatedEntityList< IfcSymbolStyle > list;
 };
 /// An IfcTable is a data structure for the provision of information in the form of rows and columns. Each instance may have IfcTableColumn instances that define the name, description and units for each column. The rows of information are stored as a list of IfcTableRow objects. 
 /// 
@@ -10669,23 +11709,22 @@ class IfcSymbolStyle : public IfcPresentationStyle {
 class IfcTable : public IfcUtil::IfcBaseEntity {
 public:
     /// A unique name which is intended to describe the usage of the Table.
-    std::string Name();
+    std::string Name() const;
     void setName(std::string v);
     /// Reference to information content of rows.
-    SHARED_PTR< IfcTemplatedEntityList< IfcTableRow > > Rows();
-    void setRows(SHARED_PTR< IfcTemplatedEntityList< IfcTableRow > > v);
+    IfcTemplatedEntityList< IfcTableRow >::ptr Rows() const;
+    void setRows(IfcTemplatedEntityList< IfcTableRow >::ptr v);
     virtual unsigned int getArgumentCount() const { return 2; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_STRING; case 1: return IfcUtil::Argument_ENTITY_LIST; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::UNDEFINED; case 1: return Type::IfcTableRow; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Name"; case 1: return "Rows"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcTable (IfcAbstractEntityPtr e);
-    IfcTable (std::string v1_Name, SHARED_PTR< IfcTemplatedEntityList< IfcTableRow > > v2_Rows);
-    typedef IfcTable* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcTable > > list;
-    typedef IfcTemplatedEntityList< IfcTable >::it it;
+    IfcTable (IfcAbstractEntity* e);
+    IfcTable (std::string v1_Name, IfcTemplatedEntityList< IfcTableRow >::ptr v2_Rows);
+    typedef IfcTemplatedEntityList< IfcTable > list;
 };
 /// IfcTableRow contains data for a single row within an IfcTable. 
 /// 
@@ -10703,24 +11742,23 @@ class IfcTable : public IfcUtil::IfcBaseEntity {
 class IfcTableRow : public IfcUtil::IfcBaseEntity {
 public:
     /// The data value of the table cell..
-    SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > RowCells();
-    void setRowCells(SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > v);
+    IfcEntityList::ptr RowCells() const;
+    void setRowCells(IfcEntityList::ptr v);
     /// Flag which identifies if the row is a heading row or a row which contains row values. NOTE - If the row is a heading, the flag takes the value = TRUE.
-    bool IsHeading();
+    bool IsHeading() const;
     void setIsHeading(bool v);
     virtual unsigned int getArgumentCount() const { return 2; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY_LIST; case 1: return IfcUtil::Argument_BOOL; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcValue; case 1: return Type::UNDEFINED; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "RowCells"; case 1: return "IsHeading"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcTable > > OfTable(); // INVERSE IfcTable::Rows
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcTable >::ptr OfTable() const; // INVERSE IfcTable::Rows
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcTableRow (IfcAbstractEntityPtr e);
-    IfcTableRow (IfcEntities v1_RowCells, bool v2_IsHeading);
-    typedef IfcTableRow* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcTableRow > > list;
-    typedef IfcTemplatedEntityList< IfcTableRow >::it it;
+    IfcTableRow (IfcAbstractEntity* e);
+    IfcTableRow (IfcEntityList::ptr v1_RowCells, bool v2_IsHeading);
+    typedef IfcTemplatedEntityList< IfcTableRow > list;
 };
 /// Definition: Address to which telephone, electronic mail and other forms of telecommunications should be addressed.
 /// 
@@ -10731,45 +11769,44 @@ class IfcTableRow : public IfcUtil::IfcBaseEntity {
 class IfcTelecomAddress : public IfcAddress {
 public:
     /// Whether the optional attribute TelephoneNumbers is defined for this IfcTelecomAddress
-    bool hasTelephoneNumbers();
+    bool hasTelephoneNumbers() const;
     /// The list of telephone numbers at which telephone messages may be received.
-    std::vector< IfcLabel > /*[1:?]*/ TelephoneNumbers();
-    void setTelephoneNumbers(std::vector< IfcLabel > /*[1:?]*/ v);
+    std::vector< std::string > /*[1:?]*/ TelephoneNumbers() const;
+    void setTelephoneNumbers(std::vector< std::string > /*[1:?]*/ v);
     /// Whether the optional attribute FacsimileNumbers is defined for this IfcTelecomAddress
-    bool hasFacsimileNumbers();
+    bool hasFacsimileNumbers() const;
     /// The list of fax numbers at which fax messages may be received.
-    std::vector< IfcLabel > /*[1:?]*/ FacsimileNumbers();
-    void setFacsimileNumbers(std::vector< IfcLabel > /*[1:?]*/ v);
+    std::vector< std::string > /*[1:?]*/ FacsimileNumbers() const;
+    void setFacsimileNumbers(std::vector< std::string > /*[1:?]*/ v);
     /// Whether the optional attribute PagerNumber is defined for this IfcTelecomAddress
-    bool hasPagerNumber();
+    bool hasPagerNumber() const;
     /// The pager number at which paging messages may be received.
-    IfcLabel PagerNumber();
-    void setPagerNumber(IfcLabel v);
+    std::string PagerNumber() const;
+    void setPagerNumber(std::string v);
     /// Whether the optional attribute ElectronicMailAddresses is defined for this IfcTelecomAddress
-    bool hasElectronicMailAddresses();
+    bool hasElectronicMailAddresses() const;
     /// The list of Email addresses at which Email messages may be received.
-    std::vector< IfcLabel > /*[1:?]*/ ElectronicMailAddresses();
-    void setElectronicMailAddresses(std::vector< IfcLabel > /*[1:?]*/ v);
+    std::vector< std::string > /*[1:?]*/ ElectronicMailAddresses() const;
+    void setElectronicMailAddresses(std::vector< std::string > /*[1:?]*/ v);
     /// Whether the optional attribute WWWHomePageURL is defined for this IfcTelecomAddress
-    bool hasWWWHomePageURL();
+    bool hasWWWHomePageURL() const;
     /// The world wide web address at which the preliminary page of information for the person or organization can be located.
     /// NOTE: Information on the world wide web for a person or organization may be separated 
     /// into a number of pages and across a number of host sites, all of which may be linked together. It is assumed that 
     /// all such information may be referenced from a single page that is termed the home page for that person or organization.
-    IfcLabel WWWHomePageURL();
-    void setWWWHomePageURL(IfcLabel v);
+    std::string WWWHomePageURL() const;
+    void setWWWHomePageURL(std::string v);
     virtual unsigned int getArgumentCount() const { return 8; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 3: return IfcUtil::Argument_VECTOR_STRING; case 4: return IfcUtil::Argument_VECTOR_STRING; case 5: return IfcUtil::Argument_STRING; case 6: return IfcUtil::Argument_VECTOR_STRING; case 7: return IfcUtil::Argument_STRING; } return IfcAddress::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 3: return Type::IfcLabel; case 4: return Type::IfcLabel; case 5: return Type::IfcLabel; case 6: return Type::IfcLabel; case 7: return Type::IfcLabel; } return IfcAddress::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 3: return "TelephoneNumbers"; case 4: return "FacsimileNumbers"; case 5: return "PagerNumber"; case 6: return "ElectronicMailAddresses"; case 7: return "WWWHomePageURL"; } return IfcAddress::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcTelecomAddress (IfcAbstractEntityPtr e);
-    IfcTelecomAddress (boost::optional< IfcAddressTypeEnum::IfcAddressTypeEnum > v1_Purpose, boost::optional< IfcText > v2_Description, boost::optional< IfcLabel > v3_UserDefinedPurpose, boost::optional< std::vector< IfcLabel > /*[1:?]*/ > v4_TelephoneNumbers, boost::optional< std::vector< IfcLabel > /*[1:?]*/ > v5_FacsimileNumbers, boost::optional< IfcLabel > v6_PagerNumber, boost::optional< std::vector< IfcLabel > /*[1:?]*/ > v7_ElectronicMailAddresses, boost::optional< IfcLabel > v8_WWWHomePageURL);
-    typedef IfcTelecomAddress* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcTelecomAddress > > list;
-    typedef IfcTemplatedEntityList< IfcTelecomAddress >::it it;
+    IfcTelecomAddress (IfcAbstractEntity* e);
+    IfcTelecomAddress (boost::optional< IfcAddressTypeEnum::IfcAddressTypeEnum > v1_Purpose, boost::optional< std::string > v2_Description, boost::optional< std::string > v3_UserDefinedPurpose, boost::optional< std::vector< std::string > /*[1:?]*/ > v4_TelephoneNumbers, boost::optional< std::vector< std::string > /*[1:?]*/ > v5_FacsimileNumbers, boost::optional< std::string > v6_PagerNumber, boost::optional< std::vector< std::string > /*[1:?]*/ > v7_ElectronicMailAddresses, boost::optional< std::string > v8_WWWHomePageURL);
+    typedef IfcTemplatedEntityList< IfcTelecomAddress > list;
 };
 /// Definition from ISO/CD 10303-46:1992: The text style is a presentation style for annotation text.
 /// 
@@ -10802,36 +11839,35 @@ class IfcTelecomAddress : public IfcAddress {
 class IfcTextStyle : public IfcPresentationStyle {
 public:
     /// Whether the optional attribute TextCharacterAppearance is defined for this IfcTextStyle
-    bool hasTextCharacterAppearance();
+    bool hasTextCharacterAppearance() const;
     /// A character style to be used for presented text.
-    IfcCharacterStyleSelect TextCharacterAppearance();
-    void setTextCharacterAppearance(IfcCharacterStyleSelect v);
+    IfcCharacterStyleSelect* TextCharacterAppearance() const;
+    void setTextCharacterAppearance(IfcCharacterStyleSelect* v);
     /// Whether the optional attribute TextStyle is defined for this IfcTextStyle
-    bool hasTextStyle();
+    bool hasTextStyle() const;
     /// The style applied to the text block for its visual appearance.
     /// It defines the text block characteristics, either for vector based or monospace text fonts (see select item IfcTextStyleWithBoxCharacteristics), or for true type text fonts (see select item IfcTextStyleTextModel.
     /// 
     /// IFC2x Edition 3 CHANGE  The attribute TextBlockStyle has been changed from SET[1:?] to a non-aggregated optional, it has been renamed from TextStyles.
-    IfcTextStyleSelect TextStyle();
-    void setTextStyle(IfcTextStyleSelect v);
+    IfcTextStyleSelect* TextStyle() const;
+    void setTextStyle(IfcTextStyleSelect* v);
     /// The style applied to the text font for its visual appearance.
     /// It defines the font family, font style, weight and size.
     /// 
     /// IFC2x Edition 2 Addendum 2 CHANGE The attribute TextFontStyle is a new attribute attached to IfcTextStyle.
-    IfcTextFontSelect TextFontStyle();
-    void setTextFontStyle(IfcTextFontSelect v);
+    IfcTextFontSelect* TextFontStyle() const;
+    void setTextFontStyle(IfcTextFontSelect* v);
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 1: return IfcUtil::Argument_ENTITY; case 2: return IfcUtil::Argument_ENTITY; case 3: return IfcUtil::Argument_ENTITY; } return IfcPresentationStyle::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 1: return Type::IfcCharacterStyleSelect; case 2: return Type::IfcTextStyleSelect; case 3: return Type::IfcTextFontSelect; } return IfcPresentationStyle::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 1: return "TextCharacterAppearance"; case 2: return "TextStyle"; case 3: return "TextFontStyle"; } return IfcPresentationStyle::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcTextStyle (IfcAbstractEntityPtr e);
-    IfcTextStyle (boost::optional< IfcLabel > v1_Name, boost::optional< IfcCharacterStyleSelect > v2_TextCharacterAppearance, boost::optional< IfcTextStyleSelect > v3_TextStyle, IfcTextFontSelect v4_TextFontStyle);
-    typedef IfcTextStyle* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcTextStyle > > list;
-    typedef IfcTemplatedEntityList< IfcTextStyle >::it it;
+    IfcTextStyle (IfcAbstractEntity* e);
+    IfcTextStyle (boost::optional< std::string > v1_Name, IfcCharacterStyleSelect* v2_TextCharacterAppearance, IfcTextStyleSelect* v3_TextStyle, IfcTextFontSelect* v4_TextFontStyle);
+    typedef IfcTemplatedEntityList< IfcTextStyle > list;
 };
 /// Definition from CSS1 (W3C Recommendation): Setting font properties will be among the most common uses of style sheets. Unfortunately, there exists no well-defined and universally accepted taxonomy for classifying fonts, and terms that apply to one font family may not be appropriate for others. For example, 'italic' is commonly used to label slanted text, but slanted text may also be labeled as being Oblique, Slanted, Incline, Cursive or Kursiv. Therefore it is not a simple problem to map typical font selection properties to a specific font.
 /// 
@@ -10901,43 +11937,42 @@ class IfcTextStyle : public IfcPresentationStyle {
 class IfcTextStyleFontModel : public IfcPreDefinedTextFont {
 public:
     /// Whether the optional attribute FontFamily is defined for this IfcTextStyleFontModel
-    bool hasFontFamily();
+    bool hasFontFamily() const;
     /// The value is a prioritized list of font family names and/or generic family names. The first list entry has the highest priority, if this font fails, the next list item shall be used. The last list item should (if possible) be a generic family.
-    std::vector< IfcTextFontName > /*[1:?]*/ FontFamily();
-    void setFontFamily(std::vector< IfcTextFontName > /*[1:?]*/ v);
+    std::vector< std::string > /*[1:?]*/ FontFamily() const;
+    void setFontFamily(std::vector< std::string > /*[1:?]*/ v);
     /// Whether the optional attribute FontStyle is defined for this IfcTextStyleFontModel
-    bool hasFontStyle();
+    bool hasFontStyle() const;
     /// The font style property selects between normal (sometimes referred to as "roman" or "upright"), italic and oblique faces within a font family.
-    IfcFontStyle FontStyle();
-    void setFontStyle(IfcFontStyle v);
+    std::string FontStyle() const;
+    void setFontStyle(std::string v);
     /// Whether the optional attribute FontVariant is defined for this IfcTextStyleFontModel
-    bool hasFontVariant();
+    bool hasFontVariant() const;
     /// The font variant property selects between normal and small-caps.
     ///   NOTE  It has been introduced for later compliance to full CSS1 support.
-    IfcFontVariant FontVariant();
-    void setFontVariant(IfcFontVariant v);
+    std::string FontVariant() const;
+    void setFontVariant(std::string v);
     /// Whether the optional attribute FontWeight is defined for this IfcTextStyleFontModel
-    bool hasFontWeight();
+    bool hasFontWeight() const;
     /// The font weight property selects the weight of the font.
     ///   NOTE  Values other then 'normal' and 'bold' have been introduced for later compliance to full CSS1 support.
-    IfcFontWeight FontWeight();
-    void setFontWeight(IfcFontWeight v);
+    std::string FontWeight() const;
+    void setFontWeight(std::string v);
     /// The font size provides the size or height of the text font.
     ///   NOTE  The following values are allowed, <IfcLengthMeasure, with positive values, the length unit is globally defined at IfcUnitAssignment.
-    IfcSizeSelect FontSize();
-    void setFontSize(IfcSizeSelect v);
+    IfcSizeSelect* FontSize() const;
+    void setFontSize(IfcSizeSelect* v);
     virtual unsigned int getArgumentCount() const { return 6; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 1: return IfcUtil::Argument_VECTOR_STRING; case 2: return IfcUtil::Argument_STRING; case 3: return IfcUtil::Argument_STRING; case 4: return IfcUtil::Argument_STRING; case 5: return IfcUtil::Argument_ENTITY; } return IfcPreDefinedTextFont::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 1: return Type::IfcTextFontName; case 2: return Type::IfcFontStyle; case 3: return Type::IfcFontVariant; case 4: return Type::IfcFontWeight; case 5: return Type::IfcSizeSelect; } return IfcPreDefinedTextFont::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 1: return "FontFamily"; case 2: return "FontStyle"; case 3: return "FontVariant"; case 4: return "FontWeight"; case 5: return "FontSize"; } return IfcPreDefinedTextFont::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcTextStyleFontModel (IfcAbstractEntityPtr e);
-    IfcTextStyleFontModel (IfcLabel v1_Name, boost::optional< std::vector< IfcTextFontName > /*[1:?]*/ > v2_FontFamily, boost::optional< IfcFontStyle > v3_FontStyle, boost::optional< IfcFontVariant > v4_FontVariant, boost::optional< IfcFontWeight > v5_FontWeight, IfcSizeSelect v6_FontSize);
-    typedef IfcTextStyleFontModel* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcTextStyleFontModel > > list;
-    typedef IfcTemplatedEntityList< IfcTextStyleFontModel >::it it;
+    IfcTextStyleFontModel (IfcAbstractEntity* e);
+    IfcTextStyleFontModel (std::string v1_Name, boost::optional< std::vector< std::string > /*[1:?]*/ > v2_FontFamily, boost::optional< std::string > v3_FontStyle, boost::optional< std::string > v4_FontVariant, boost::optional< std::string > v5_FontWeight, IfcSizeSelect* v6_FontSize);
+    typedef IfcTemplatedEntityList< IfcTextStyleFontModel > list;
 };
 /// Definition from ISO/CD 10303-46:1992: A text style for defined font is a character glyph style for pre-defined or externally defined text fonts.
 /// 
@@ -10959,25 +11994,24 @@ class IfcTextStyleFontModel : public IfcPreDefinedTextFont {
 class IfcTextStyleForDefinedFont : public IfcUtil::IfcBaseEntity {
 public:
     /// This property describes the text color of an element (often referred to as the foreground color).
-    IfcColour Colour();
-    void setColour(IfcColour v);
+    IfcColour* Colour() const;
+    void setColour(IfcColour* v);
     /// Whether the optional attribute BackgroundColour is defined for this IfcTextStyleForDefinedFont
-    bool hasBackgroundColour();
+    bool hasBackgroundColour() const;
     /// This property sets the background color of an element.
-    IfcColour BackgroundColour();
-    void setBackgroundColour(IfcColour v);
+    IfcColour* BackgroundColour() const;
+    void setBackgroundColour(IfcColour* v);
     virtual unsigned int getArgumentCount() const { return 2; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY; case 1: return IfcUtil::Argument_ENTITY; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcColour; case 1: return Type::IfcColour; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Colour"; case 1: return "BackgroundColour"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcTextStyleForDefinedFont (IfcAbstractEntityPtr e);
-    IfcTextStyleForDefinedFont (IfcColour v1_Colour, boost::optional< IfcColour > v2_BackgroundColour);
-    typedef IfcTextStyleForDefinedFont* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcTextStyleForDefinedFont > > list;
-    typedef IfcTemplatedEntityList< IfcTextStyleForDefinedFont >::it it;
+    IfcTextStyleForDefinedFont (IfcAbstractEntity* e);
+    IfcTextStyleForDefinedFont (IfcColour* v1_Colour, IfcColour* v2_BackgroundColour);
+    typedef IfcTemplatedEntityList< IfcTextStyleForDefinedFont > list;
 };
 /// Definition from CSS1 (W3C Recommendation): The properties defined in the text model affect the visual presentation of characters, spaces, words, and paragraphs.
 /// 
@@ -10989,59 +12023,58 @@ class IfcTextStyleForDefinedFont : public IfcUtil::IfcBaseEntity {
 class IfcTextStyleTextModel : public IfcUtil::IfcBaseEntity {
 public:
     /// Whether the optional attribute TextIndent is defined for this IfcTextStyleTextModel
-    bool hasTextIndent();
+    bool hasTextIndent() const;
     /// The property specifies the indentation that appears before the first formatted line.
     ///   NOTE  It has been introduced for later compliance to full CSS1 support.
-    IfcSizeSelect TextIndent();
-    void setTextIndent(IfcSizeSelect v);
+    IfcSizeSelect* TextIndent() const;
+    void setTextIndent(IfcSizeSelect* v);
     /// Whether the optional attribute TextAlign is defined for this IfcTextStyleTextModel
-    bool hasTextAlign();
+    bool hasTextAlign() const;
     /// This property describes how text is aligned horizontally within the element. The actual justification algorithm used is dependent on the rendering algorithm.
-    IfcTextAlignment TextAlign();
-    void setTextAlign(IfcTextAlignment v);
+    std::string TextAlign() const;
+    void setTextAlign(std::string v);
     /// Whether the optional attribute TextDecoration is defined for this IfcTextStyleTextModel
-    bool hasTextDecoration();
+    bool hasTextDecoration() const;
     /// This property describes decorations that are added to the text of an element.
-    IfcTextDecoration TextDecoration();
-    void setTextDecoration(IfcTextDecoration v);
+    std::string TextDecoration() const;
+    void setTextDecoration(std::string v);
     /// Whether the optional attribute LetterSpacing is defined for this IfcTextStyleTextModel
-    bool hasLetterSpacing();
+    bool hasLetterSpacing() const;
     /// The length unit indicates an addition to the default space between characters. Values can be negative, but there may be implementation-specific limits. The user agent is free to select the exact spacing algorithm. The letter spacing may also be influenced by justification (which is a value of the 'align' property).
     ///   NOTE  The following values are allowed, IfcDescriptiveMeasure with value='normal', or IfcLengthMeasure, the length unit is globally defined at IfcUnitAssignment.
-    IfcSizeSelect LetterSpacing();
-    void setLetterSpacing(IfcSizeSelect v);
+    IfcSizeSelect* LetterSpacing() const;
+    void setLetterSpacing(IfcSizeSelect* v);
     /// Whether the optional attribute WordSpacing is defined for this IfcTextStyleTextModel
-    bool hasWordSpacing();
+    bool hasWordSpacing() const;
     /// The length unit indicates an addition to the default space between words. Values can be negative, but there may be implementation-specific limits. The user agent is free to select the exact spacing algorithm. The word spacing may also be influenced by justification (which is a value of the 'text-align' property).
     ///   NOTE  It has been introduced for later compliance to full CSS1 support.
-    IfcSizeSelect WordSpacing();
-    void setWordSpacing(IfcSizeSelect v);
+    IfcSizeSelect* WordSpacing() const;
+    void setWordSpacing(IfcSizeSelect* v);
     /// Whether the optional attribute TextTransform is defined for this IfcTextStyleTextModel
-    bool hasTextTransform();
+    bool hasTextTransform() const;
     /// This property describes how text characters may transform to upper case, lower case, or capitalized case, independent of the character case used in the text literal.
     ///   NOTE  It has been introduced for later compliance to full CSS1 support.
-    IfcTextTransformation TextTransform();
-    void setTextTransform(IfcTextTransformation v);
+    std::string TextTransform() const;
+    void setTextTransform(std::string v);
     /// Whether the optional attribute LineHeight is defined for this IfcTextStyleTextModel
-    bool hasLineHeight();
+    bool hasLineHeight() const;
     /// The property sets the distance between two adjacent lines' baselines.
     /// When a ratio value is specified, the line height is given by the font size of the current element multiplied with the numerical value. A value of 'normal' sets the line height to a reasonable value for the element's font. It is suggested that user agents set the 'normal' value to be a ratio number in the range of 1.0 to 1.2.
     ///   NOTE  The following values are allowed: IfcDescriptiveMeasure with value='normal', or 
     /// IfcLengthMeasure, with non-negative values, the length unit is globally defined at IfcUnitAssignment, or IfcRatioMeasure.
-    IfcSizeSelect LineHeight();
-    void setLineHeight(IfcSizeSelect v);
+    IfcSizeSelect* LineHeight() const;
+    void setLineHeight(IfcSizeSelect* v);
     virtual unsigned int getArgumentCount() const { return 7; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY; case 1: return IfcUtil::Argument_STRING; case 2: return IfcUtil::Argument_STRING; case 3: return IfcUtil::Argument_ENTITY; case 4: return IfcUtil::Argument_ENTITY; case 5: return IfcUtil::Argument_STRING; case 6: return IfcUtil::Argument_ENTITY; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcSizeSelect; case 1: return Type::IfcTextAlignment; case 2: return Type::IfcTextDecoration; case 3: return Type::IfcSizeSelect; case 4: return Type::IfcSizeSelect; case 5: return Type::IfcTextTransformation; case 6: return Type::IfcSizeSelect; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "TextIndent"; case 1: return "TextAlign"; case 2: return "TextDecoration"; case 3: return "LetterSpacing"; case 4: return "WordSpacing"; case 5: return "TextTransform"; case 6: return "LineHeight"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcTextStyleTextModel (IfcAbstractEntityPtr e);
-    IfcTextStyleTextModel (boost::optional< IfcSizeSelect > v1_TextIndent, boost::optional< IfcTextAlignment > v2_TextAlign, boost::optional< IfcTextDecoration > v3_TextDecoration, boost::optional< IfcSizeSelect > v4_LetterSpacing, boost::optional< IfcSizeSelect > v5_WordSpacing, boost::optional< IfcTextTransformation > v6_TextTransform, boost::optional< IfcSizeSelect > v7_LineHeight);
-    typedef IfcTextStyleTextModel* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcTextStyleTextModel > > list;
-    typedef IfcTemplatedEntityList< IfcTextStyleTextModel >::it it;
+    IfcTextStyleTextModel (IfcAbstractEntity* e);
+    IfcTextStyleTextModel (IfcSizeSelect* v1_TextIndent, boost::optional< std::string > v2_TextAlign, boost::optional< std::string > v3_TextDecoration, IfcSizeSelect* v4_LetterSpacing, IfcSizeSelect* v5_WordSpacing, boost::optional< std::string > v6_TextTransform, IfcSizeSelect* v7_LineHeight);
+    typedef IfcTemplatedEntityList< IfcTextStyleTextModel > list;
 };
 /// The text style with box characteristics allows the presentation of annotated text by specifying the characteristics of the character boxes of the text and the spacing between the character boxes.
 /// 
@@ -11063,42 +12096,41 @@ class IfcTextStyleTextModel : public IfcUtil::IfcBaseEntity {
 class IfcTextStyleWithBoxCharacteristics : public IfcUtil::IfcBaseEntity {
 public:
     /// Whether the optional attribute BoxHeight is defined for this IfcTextStyleWithBoxCharacteristics
-    bool hasBoxHeight();
+    bool hasBoxHeight() const;
     /// It is the height scaling factor in the definition of a character glyph.
-    IfcPositiveLengthMeasure BoxHeight();
-    void setBoxHeight(IfcPositiveLengthMeasure v);
+    double BoxHeight() const;
+    void setBoxHeight(double v);
     /// Whether the optional attribute BoxWidth is defined for this IfcTextStyleWithBoxCharacteristics
-    bool hasBoxWidth();
+    bool hasBoxWidth() const;
     /// It is the width scaling factor in the definition of a character glyph.
-    IfcPositiveLengthMeasure BoxWidth();
-    void setBoxWidth(IfcPositiveLengthMeasure v);
+    double BoxWidth() const;
+    void setBoxWidth(double v);
     /// Whether the optional attribute BoxSlantAngle is defined for this IfcTextStyleWithBoxCharacteristics
-    bool hasBoxSlantAngle();
+    bool hasBoxSlantAngle() const;
     /// It indicated that the box of a character glyph shall be represented as a parallelogram, with the angle being between the character up line and an axis perpendicular to the character base line.
-    IfcPlaneAngleMeasure BoxSlantAngle();
-    void setBoxSlantAngle(IfcPlaneAngleMeasure v);
+    double BoxSlantAngle() const;
+    void setBoxSlantAngle(double v);
     /// Whether the optional attribute BoxRotateAngle is defined for this IfcTextStyleWithBoxCharacteristics
-    bool hasBoxRotateAngle();
+    bool hasBoxRotateAngle() const;
     /// It indicated that the box of a character glyph shall be presented at an angle to the base line of a text string within which the glyph occurs, the angle being that between the base line of the glyph and an axis perpendicular to the baseline of the text string.
-    IfcPlaneAngleMeasure BoxRotateAngle();
-    void setBoxRotateAngle(IfcPlaneAngleMeasure v);
+    double BoxRotateAngle() const;
+    void setBoxRotateAngle(double v);
     /// Whether the optional attribute CharacterSpacing is defined for this IfcTextStyleWithBoxCharacteristics
-    bool hasCharacterSpacing();
+    bool hasCharacterSpacing() const;
     /// The distance between the character boxes of adjacent characters.
-    IfcSizeSelect CharacterSpacing();
-    void setCharacterSpacing(IfcSizeSelect v);
+    IfcSizeSelect* CharacterSpacing() const;
+    void setCharacterSpacing(IfcSizeSelect* v);
     virtual unsigned int getArgumentCount() const { return 5; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_DOUBLE; case 1: return IfcUtil::Argument_DOUBLE; case 2: return IfcUtil::Argument_DOUBLE; case 3: return IfcUtil::Argument_DOUBLE; case 4: return IfcUtil::Argument_ENTITY; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcPositiveLengthMeasure; case 1: return Type::IfcPositiveLengthMeasure; case 2: return Type::IfcPlaneAngleMeasure; case 3: return Type::IfcPlaneAngleMeasure; case 4: return Type::IfcSizeSelect; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "BoxHeight"; case 1: return "BoxWidth"; case 2: return "BoxSlantAngle"; case 3: return "BoxRotateAngle"; case 4: return "CharacterSpacing"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcTextStyleWithBoxCharacteristics (IfcAbstractEntityPtr e);
-    IfcTextStyleWithBoxCharacteristics (boost::optional< IfcPositiveLengthMeasure > v1_BoxHeight, boost::optional< IfcPositiveLengthMeasure > v2_BoxWidth, boost::optional< IfcPlaneAngleMeasure > v3_BoxSlantAngle, boost::optional< IfcPlaneAngleMeasure > v4_BoxRotateAngle, boost::optional< IfcSizeSelect > v5_CharacterSpacing);
-    typedef IfcTextStyleWithBoxCharacteristics* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcTextStyleWithBoxCharacteristics > > list;
-    typedef IfcTemplatedEntityList< IfcTextStyleWithBoxCharacteristics >::it it;
+    IfcTextStyleWithBoxCharacteristics (IfcAbstractEntity* e);
+    IfcTextStyleWithBoxCharacteristics (boost::optional< double > v1_BoxHeight, boost::optional< double > v2_BoxWidth, boost::optional< double > v3_BoxSlantAngle, boost::optional< double > v4_BoxRotateAngle, IfcSizeSelect* v5_CharacterSpacing);
+    typedef IfcTemplatedEntityList< IfcTextStyleWithBoxCharacteristics > list;
 };
 /// The IfcTextureCoordinate a an abstract supertype of the different kinds to apply texture coordinates to geometries. For vertex based geometries an explicit assignment of 2D texture vertices to the 3D geometry points is supported by the subtype IfcTextureMap, in addition there can be a procedural description of how texture coordinates shall be applied to geometric items. If no IfcTextureCoordinate is provided for the IfcSurfaceTexture, the default mapping shall be used.
 /// 
@@ -11115,17 +12147,16 @@ class IfcTextureCoordinate : public IfcUtil::IfcBaseEntity {
 public:
     virtual unsigned int getArgumentCount() const { return 0; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcAnnotationSurface > > AnnotatedSurface(); // INVERSE IfcAnnotationSurface::TextureCoordinates
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcAnnotationSurface >::ptr AnnotatedSurface() const; // INVERSE IfcAnnotationSurface::TextureCoordinates
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcTextureCoordinate (IfcAbstractEntityPtr e);
+    IfcTextureCoordinate (IfcAbstractEntity* e);
     IfcTextureCoordinate ();
-    typedef IfcTextureCoordinate* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcTextureCoordinate > > list;
-    typedef IfcTemplatedEntityList< IfcTextureCoordinate >::it it;
+    typedef IfcTemplatedEntityList< IfcTextureCoordinate > list;
 };
 /// The IfcTextureCoordinateGenerator describes a procedurally defined mapping function with input parameter to map 2D texture coordinates to 3D geometry vertices. The allowable Mode values and input Parameter need to be agreed upon in view definitions and implementer agreements.
 /// 
@@ -11158,25 +12189,24 @@ class IfcTextureCoordinateGenerator : public IfcTextureCoordinate {
     /// The Mode attribute describes the algorithm used to compute texture coordinates.
     /// 
     /// NOTE  The applicable values for the Mode attribute are determined by view definitions or implementer agreements. It is recommended to use the modes described in ISO/IES 19775-1.2:2008 X3D Architecture and base components Edition 2, Part 1. See 18.4.8 TextureCoordinateGenerator for recommended values.
-    IfcLabel Mode();
-    void setMode(IfcLabel v);
+    std::string Mode() const;
+    void setMode(std::string v);
     /// The parameters used as arguments by the function as specified by Mode.
     /// 
     /// IFC2x4 CHANGE  Made optional data type restricted to REAL.
-    SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > Parameter();
-    void setParameter(SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > v);
+    IfcEntityList::ptr Parameter() const;
+    void setParameter(IfcEntityList::ptr v);
     virtual unsigned int getArgumentCount() const { return 2; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_STRING; case 1: return IfcUtil::Argument_ENTITY_LIST; } return IfcTextureCoordinate::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcLabel; case 1: return Type::IfcSimpleValue; } return IfcTextureCoordinate::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Mode"; case 1: return "Parameter"; } return IfcTextureCoordinate::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcTextureCoordinateGenerator (IfcAbstractEntityPtr e);
-    IfcTextureCoordinateGenerator (IfcLabel v1_Mode, IfcEntities v2_Parameter);
-    typedef IfcTextureCoordinateGenerator* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcTextureCoordinateGenerator > > list;
-    typedef IfcTemplatedEntityList< IfcTextureCoordinateGenerator >::it it;
+    IfcTextureCoordinateGenerator (IfcAbstractEntity* e);
+    IfcTextureCoordinateGenerator (std::string v1_Mode, IfcEntityList::ptr v2_Parameter);
+    typedef IfcTemplatedEntityList< IfcTextureCoordinateGenerator > list;
 };
 /// An IfcTextureMap provides the mapping of the
 /// 2-dimensional texture coordinates to the surface onto which it is
@@ -11231,20 +12261,19 @@ class IfcTextureCoordinateGenerator : public IfcTextureCoordinate {
 /// The FaceBound referenced in AppliedTo shall be used by the vertex based geometry, to which this texture map is assigned to by through the IfcStyledItem.
 class IfcTextureMap : public IfcTextureCoordinate {
 public:
-    SHARED_PTR< IfcTemplatedEntityList< IfcVertexBasedTextureMap > > TextureMaps();
-    void setTextureMaps(SHARED_PTR< IfcTemplatedEntityList< IfcVertexBasedTextureMap > > v);
+    IfcTemplatedEntityList< IfcVertexBasedTextureMap >::ptr TextureMaps() const;
+    void setTextureMaps(IfcTemplatedEntityList< IfcVertexBasedTextureMap >::ptr v);
     virtual unsigned int getArgumentCount() const { return 1; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY_LIST; } return IfcTextureCoordinate::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcVertexBasedTextureMap; } return IfcTextureCoordinate::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "TextureMaps"; } return IfcTextureCoordinate::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcTextureMap (IfcAbstractEntityPtr e);
-    IfcTextureMap (SHARED_PTR< IfcTemplatedEntityList< IfcVertexBasedTextureMap > > v1_TextureMaps);
-    typedef IfcTextureMap* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcTextureMap > > list;
-    typedef IfcTemplatedEntityList< IfcTextureMap >::it it;
+    IfcTextureMap (IfcAbstractEntity* e);
+    IfcTextureMap (IfcTemplatedEntityList< IfcVertexBasedTextureMap >::ptr v1_TextureMaps);
+    typedef IfcTemplatedEntityList< IfcTextureMap > list;
 };
 /// An IfcTextureVertex is a list of 2 (S, T) texture coordinates. 
 /// 
@@ -11276,52 +12305,50 @@ class IfcTextureMap : public IfcTextureCoordinate {
 class IfcTextureVertex : public IfcUtil::IfcBaseEntity {
 public:
     /// The first coordinate[1] is the S, the second coordinate[2] is the T parameter value.
-    std::vector< IfcParameterValue > /*[2:2]*/ Coordinates();
-    void setCoordinates(std::vector< IfcParameterValue > /*[2:2]*/ v);
+    std::vector< double > /*[2:2]*/ Coordinates() const;
+    void setCoordinates(std::vector< double > /*[2:2]*/ v);
     virtual unsigned int getArgumentCount() const { return 1; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_VECTOR_DOUBLE; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcParameterValue; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Coordinates"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcTextureVertex (IfcAbstractEntityPtr e);
-    IfcTextureVertex (std::vector< IfcParameterValue > /*[2:2]*/ v1_Coordinates);
-    typedef IfcTextureVertex* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcTextureVertex > > list;
-    typedef IfcTemplatedEntityList< IfcTextureVertex >::it it;
+    IfcTextureVertex (IfcAbstractEntity* e);
+    IfcTextureVertex (std::vector< double > /*[2:2]*/ v1_Coordinates);
+    typedef IfcTemplatedEntityList< IfcTextureVertex > list;
 };
 
 class IfcThermalMaterialProperties : public IfcMaterialProperties {
 public:
     /// Whether the optional attribute SpecificHeatCapacity is defined for this IfcThermalMaterialProperties
-    bool hasSpecificHeatCapacity();
-    IfcSpecificHeatCapacityMeasure SpecificHeatCapacity();
-    void setSpecificHeatCapacity(IfcSpecificHeatCapacityMeasure v);
+    bool hasSpecificHeatCapacity() const;
+    double SpecificHeatCapacity() const;
+    void setSpecificHeatCapacity(double v);
     /// Whether the optional attribute BoilingPoint is defined for this IfcThermalMaterialProperties
-    bool hasBoilingPoint();
-    IfcThermodynamicTemperatureMeasure BoilingPoint();
-    void setBoilingPoint(IfcThermodynamicTemperatureMeasure v);
+    bool hasBoilingPoint() const;
+    double BoilingPoint() const;
+    void setBoilingPoint(double v);
     /// Whether the optional attribute FreezingPoint is defined for this IfcThermalMaterialProperties
-    bool hasFreezingPoint();
-    IfcThermodynamicTemperatureMeasure FreezingPoint();
-    void setFreezingPoint(IfcThermodynamicTemperatureMeasure v);
+    bool hasFreezingPoint() const;
+    double FreezingPoint() const;
+    void setFreezingPoint(double v);
     /// Whether the optional attribute ThermalConductivity is defined for this IfcThermalMaterialProperties
-    bool hasThermalConductivity();
-    IfcThermalConductivityMeasure ThermalConductivity();
-    void setThermalConductivity(IfcThermalConductivityMeasure v);
+    bool hasThermalConductivity() const;
+    double ThermalConductivity() const;
+    void setThermalConductivity(double v);
     virtual unsigned int getArgumentCount() const { return 5; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 1: return IfcUtil::Argument_DOUBLE; case 2: return IfcUtil::Argument_DOUBLE; case 3: return IfcUtil::Argument_DOUBLE; case 4: return IfcUtil::Argument_DOUBLE; } return IfcMaterialProperties::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 1: return Type::IfcSpecificHeatCapacityMeasure; case 2: return Type::IfcThermodynamicTemperatureMeasure; case 3: return Type::IfcThermodynamicTemperatureMeasure; case 4: return Type::IfcThermalConductivityMeasure; } return IfcMaterialProperties::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 1: return "SpecificHeatCapacity"; case 2: return "BoilingPoint"; case 3: return "FreezingPoint"; case 4: return "ThermalConductivity"; } return IfcMaterialProperties::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcThermalMaterialProperties (IfcAbstractEntityPtr e);
-    IfcThermalMaterialProperties (IfcMaterial* v1_Material, boost::optional< IfcSpecificHeatCapacityMeasure > v2_SpecificHeatCapacity, boost::optional< IfcThermodynamicTemperatureMeasure > v3_BoilingPoint, boost::optional< IfcThermodynamicTemperatureMeasure > v4_FreezingPoint, boost::optional< IfcThermalConductivityMeasure > v5_ThermalConductivity);
-    typedef IfcThermalMaterialProperties* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcThermalMaterialProperties > > list;
-    typedef IfcTemplatedEntityList< IfcThermalMaterialProperties >::it it;
+    IfcThermalMaterialProperties (IfcAbstractEntity* e);
+    IfcThermalMaterialProperties (IfcMaterial* v1_Material, boost::optional< double > v2_SpecificHeatCapacity, boost::optional< double > v3_BoilingPoint, boost::optional< double > v4_FreezingPoint, boost::optional< double > v5_ThermalConductivity);
+    typedef IfcTemplatedEntityList< IfcThermalMaterialProperties > list;
 };
 /// A time series is a set of a time-stamped data entries. It allows a natural association of data collected over intervals of time. Time series can be regular or irregular. In regular time series data arrive predictably at predefined intervals.  In irregular time series  some or all time stamps do not follow a repetitive pattern and unpredictable bursts of data may arrive at unspecified points in time.
 /// 
@@ -11331,68 +12358,66 @@ class IfcThermalMaterialProperties : public IfcMaterialProperties {
 class IfcTimeSeries : public IfcUtil::IfcBaseEntity {
 public:
     /// An unique name for the time series.
-    IfcLabel Name();
-    void setName(IfcLabel v);
+    std::string Name() const;
+    void setName(std::string v);
     /// Whether the optional attribute Description is defined for this IfcTimeSeries
-    bool hasDescription();
+    bool hasDescription() const;
     /// A text description of the data that the series represents.
-    IfcText Description();
-    void setDescription(IfcText v);
+    std::string Description() const;
+    void setDescription(std::string v);
     /// The start time of a time series.
-    IfcDateTimeSelect StartTime();
-    void setStartTime(IfcDateTimeSelect v);
+    IfcDateTimeSelect* StartTime() const;
+    void setStartTime(IfcDateTimeSelect* v);
     /// The end time of a time series.
-    IfcDateTimeSelect EndTime();
-    void setEndTime(IfcDateTimeSelect v);
+    IfcDateTimeSelect* EndTime() const;
+    void setEndTime(IfcDateTimeSelect* v);
     /// The time series data type.
-    IfcTimeSeriesDataTypeEnum::IfcTimeSeriesDataTypeEnum TimeSeriesDataType();
+    IfcTimeSeriesDataTypeEnum::IfcTimeSeriesDataTypeEnum TimeSeriesDataType() const;
     void setTimeSeriesDataType(IfcTimeSeriesDataTypeEnum::IfcTimeSeriesDataTypeEnum v);
     /// The orgin of a time series data.
-    IfcDataOriginEnum::IfcDataOriginEnum DataOrigin();
+    IfcDataOriginEnum::IfcDataOriginEnum DataOrigin() const;
     void setDataOrigin(IfcDataOriginEnum::IfcDataOriginEnum v);
     /// Whether the optional attribute UserDefinedDataOrigin is defined for this IfcTimeSeries
-    bool hasUserDefinedDataOrigin();
+    bool hasUserDefinedDataOrigin() const;
     /// Value of the data origin if DataOrigin attribute is USERDEFINED.
-    IfcLabel UserDefinedDataOrigin();
-    void setUserDefinedDataOrigin(IfcLabel v);
+    std::string UserDefinedDataOrigin() const;
+    void setUserDefinedDataOrigin(std::string v);
     /// Whether the optional attribute Unit is defined for this IfcTimeSeries
-    bool hasUnit();
+    bool hasUnit() const;
     /// The unit to be assigned to all values within the time series. Note that mixing units is not allowed. If the value is not given, the global unit for the type of IfcValue, as defined at IfcProject.UnitsInContext is used.
-    IfcUnit Unit();
-    void setUnit(IfcUnit v);
+    IfcUnit* Unit() const;
+    void setUnit(IfcUnit* v);
     virtual unsigned int getArgumentCount() const { return 8; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_STRING; case 1: return IfcUtil::Argument_STRING; case 2: return IfcUtil::Argument_ENTITY; case 3: return IfcUtil::Argument_ENTITY; case 4: return IfcUtil::Argument_ENUMERATION; case 5: return IfcUtil::Argument_ENUMERATION; case 6: return IfcUtil::Argument_STRING; case 7: return IfcUtil::Argument_ENTITY; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcLabel; case 1: return Type::IfcText; case 2: return Type::IfcDateTimeSelect; case 3: return Type::IfcDateTimeSelect; case 4: return Type::IfcTimeSeriesDataTypeEnum; case 5: return Type::IfcDataOriginEnum; case 6: return Type::IfcLabel; case 7: return Type::IfcUnit; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Name"; case 1: return "Description"; case 2: return "StartTime"; case 3: return "EndTime"; case 4: return "TimeSeriesDataType"; case 5: return "DataOrigin"; case 6: return "UserDefinedDataOrigin"; case 7: return "Unit"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcTimeSeriesReferenceRelationship > > DocumentedBy(); // INVERSE IfcTimeSeriesReferenceRelationship::ReferencedTimeSeries
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcTimeSeriesReferenceRelationship >::ptr DocumentedBy() const; // INVERSE IfcTimeSeriesReferenceRelationship::ReferencedTimeSeries
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcTimeSeries (IfcAbstractEntityPtr e);
-    IfcTimeSeries (IfcLabel v1_Name, boost::optional< IfcText > v2_Description, IfcDateTimeSelect v3_StartTime, IfcDateTimeSelect v4_EndTime, IfcTimeSeriesDataTypeEnum::IfcTimeSeriesDataTypeEnum v5_TimeSeriesDataType, IfcDataOriginEnum::IfcDataOriginEnum v6_DataOrigin, boost::optional< IfcLabel > v7_UserDefinedDataOrigin, boost::optional< IfcUnit > v8_Unit);
-    typedef IfcTimeSeries* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcTimeSeries > > list;
-    typedef IfcTemplatedEntityList< IfcTimeSeries >::it it;
+    IfcTimeSeries (IfcAbstractEntity* e);
+    IfcTimeSeries (std::string v1_Name, boost::optional< std::string > v2_Description, IfcDateTimeSelect* v3_StartTime, IfcDateTimeSelect* v4_EndTime, IfcTimeSeriesDataTypeEnum::IfcTimeSeriesDataTypeEnum v5_TimeSeriesDataType, IfcDataOriginEnum::IfcDataOriginEnum v6_DataOrigin, boost::optional< std::string > v7_UserDefinedDataOrigin, IfcUnit* v8_Unit);
+    typedef IfcTemplatedEntityList< IfcTimeSeries > list;
 };
 
 class IfcTimeSeriesReferenceRelationship : public IfcUtil::IfcBaseEntity {
 public:
-    IfcTimeSeries* ReferencedTimeSeries();
+    IfcTimeSeries* ReferencedTimeSeries() const;
     void setReferencedTimeSeries(IfcTimeSeries* v);
-    SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > TimeSeriesReferences();
-    void setTimeSeriesReferences(SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > v);
+    IfcEntityList::ptr TimeSeriesReferences() const;
+    void setTimeSeriesReferences(IfcEntityList::ptr v);
     virtual unsigned int getArgumentCount() const { return 2; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY; case 1: return IfcUtil::Argument_ENTITY_LIST; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcTimeSeries; case 1: return Type::IfcDocumentSelect; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "ReferencedTimeSeries"; case 1: return "TimeSeriesReferences"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcTimeSeriesReferenceRelationship (IfcAbstractEntityPtr e);
-    IfcTimeSeriesReferenceRelationship (IfcTimeSeries* v1_ReferencedTimeSeries, IfcEntities v2_TimeSeriesReferences);
-    typedef IfcTimeSeriesReferenceRelationship* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcTimeSeriesReferenceRelationship > > list;
-    typedef IfcTemplatedEntityList< IfcTimeSeriesReferenceRelationship >::it it;
+    IfcTimeSeriesReferenceRelationship (IfcAbstractEntity* e);
+    IfcTimeSeriesReferenceRelationship (IfcTimeSeries* v1_ReferencedTimeSeries, IfcEntityList::ptr v2_TimeSeriesReferences);
+    typedef IfcTemplatedEntityList< IfcTimeSeriesReferenceRelationship > list;
 };
 /// A time series value is a list of values that comprise the time series. At least one value must be supplied. Applications are expected to normalize values by applying the following three rules:
 /// 
@@ -11406,20 +12431,19 @@ class IfcTimeSeriesReferenceRelationship : public IfcUtil::IfcBaseEntity {
 class IfcTimeSeriesValue : public IfcUtil::IfcBaseEntity {
 public:
     /// A list of time-series values. At least one value is required.
-    SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > ListValues();
-    void setListValues(SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > v);
+    IfcEntityList::ptr ListValues() const;
+    void setListValues(IfcEntityList::ptr v);
     virtual unsigned int getArgumentCount() const { return 1; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY_LIST; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcValue; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "ListValues"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcTimeSeriesValue (IfcAbstractEntityPtr e);
-    IfcTimeSeriesValue (IfcEntities v1_ListValues);
-    typedef IfcTimeSeriesValue* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcTimeSeriesValue > > list;
-    typedef IfcTemplatedEntityList< IfcTimeSeriesValue >::it it;
+    IfcTimeSeriesValue (IfcAbstractEntity* e);
+    IfcTimeSeriesValue (IfcEntityList::ptr v1_ListValues);
+    typedef IfcTemplatedEntityList< IfcTimeSeriesValue > list;
 };
 /// Definition from ISO/CD 10303-42:1992: The topological representation item is the supertype for all the topological representation items in the geometry resource. 
 /// 
@@ -11430,16 +12454,15 @@ class IfcTopologicalRepresentationItem : public IfcRepresentationItem {
 public:
     virtual unsigned int getArgumentCount() const { return 0; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcRepresentationItem::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcRepresentationItem::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcRepresentationItem::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcTopologicalRepresentationItem (IfcAbstractEntityPtr e);
+    IfcTopologicalRepresentationItem (IfcAbstractEntity* e);
     IfcTopologicalRepresentationItem ();
-    typedef IfcTopologicalRepresentationItem* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcTopologicalRepresentationItem > > list;
-    typedef IfcTemplatedEntityList< IfcTopologicalRepresentationItem >::it it;
+    typedef IfcTemplatedEntityList< IfcTopologicalRepresentationItem > list;
 };
 /// IfcTopologyRepresentation
 /// represents the concept of a particular topological representation of a
@@ -11479,16 +12502,15 @@ class IfcTopologyRepresentation : public IfcShapeModel {
 public:
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcShapeModel::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcShapeModel::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcShapeModel::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcTopologyRepresentation (IfcAbstractEntityPtr e);
-    IfcTopologyRepresentation (IfcRepresentationContext* v1_ContextOfItems, boost::optional< IfcLabel > v2_RepresentationIdentifier, boost::optional< IfcLabel > v3_RepresentationType, SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationItem > > v4_Items);
-    typedef IfcTopologyRepresentation* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcTopologyRepresentation > > list;
-    typedef IfcTemplatedEntityList< IfcTopologyRepresentation >::it it;
+    IfcTopologyRepresentation (IfcAbstractEntity* e);
+    IfcTopologyRepresentation (IfcRepresentationContext* v1_ContextOfItems, boost::optional< std::string > v2_RepresentationIdentifier, boost::optional< std::string > v3_RepresentationType, IfcTemplatedEntityList< IfcRepresentationItem >::ptr v4_Items);
+    typedef IfcTemplatedEntityList< IfcTopologyRepresentation > list;
 };
 /// IfcUnitAssignment indicates a set of units which may be assigned. Within an IfcUnitAssigment each unit definition shall be unique; that is, there shall be no redundant unit definitions for the same unit type such as length unit or area unit. For currencies, there shall be only a single IfcMonetaryUnit within an IfcUnitAssignment.
 /// 
@@ -11498,20 +12520,19 @@ class IfcTopologyRepresentation : public IfcShapeModel {
 class IfcUnitAssignment : public IfcUtil::IfcBaseEntity {
 public:
     /// Units to be included within a unit assignment.
-    SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > Units();
-    void setUnits(SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > v);
+    IfcEntityList::ptr Units() const;
+    void setUnits(IfcEntityList::ptr v);
     virtual unsigned int getArgumentCount() const { return 1; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY_LIST; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcUnit; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Units"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcUnitAssignment (IfcAbstractEntityPtr e);
-    IfcUnitAssignment (IfcEntities v1_Units);
-    typedef IfcUnitAssignment* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcUnitAssignment > > list;
-    typedef IfcTemplatedEntityList< IfcUnitAssignment >::it it;
+    IfcUnitAssignment (IfcAbstractEntity* e);
+    IfcUnitAssignment (IfcEntityList::ptr v1_Units);
+    typedef IfcTemplatedEntityList< IfcUnitAssignment > list;
 };
 /// Definition from ISO/CD 10303-42:1992: A vertex is the topological construct corresponding to a point. It has dimensionality 0 and extent 0. The domain of a vertex, if present, is a point in m dimensional real space RM; this is represented by the vertex point subtype. 
 /// 
@@ -11527,36 +12548,34 @@ class IfcVertex : public IfcTopologicalRepresentationItem {
 public:
     virtual unsigned int getArgumentCount() const { return 0; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcTopologicalRepresentationItem::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcTopologicalRepresentationItem::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcTopologicalRepresentationItem::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcVertex (IfcAbstractEntityPtr e);
+    IfcVertex (IfcAbstractEntity* e);
     IfcVertex ();
-    typedef IfcVertex* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcVertex > > list;
-    typedef IfcTemplatedEntityList< IfcVertex >::it it;
+    typedef IfcTemplatedEntityList< IfcVertex > list;
 };
 
 class IfcVertexBasedTextureMap : public IfcUtil::IfcBaseEntity {
 public:
-    SHARED_PTR< IfcTemplatedEntityList< IfcTextureVertex > > TextureVertices();
-    void setTextureVertices(SHARED_PTR< IfcTemplatedEntityList< IfcTextureVertex > > v);
-    SHARED_PTR< IfcTemplatedEntityList< IfcCartesianPoint > > TexturePoints();
-    void setTexturePoints(SHARED_PTR< IfcTemplatedEntityList< IfcCartesianPoint > > v);
+    IfcTemplatedEntityList< IfcTextureVertex >::ptr TextureVertices() const;
+    void setTextureVertices(IfcTemplatedEntityList< IfcTextureVertex >::ptr v);
+    IfcTemplatedEntityList< IfcCartesianPoint >::ptr TexturePoints() const;
+    void setTexturePoints(IfcTemplatedEntityList< IfcCartesianPoint >::ptr v);
     virtual unsigned int getArgumentCount() const { return 2; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY_LIST; case 1: return IfcUtil::Argument_ENTITY_LIST; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcTextureVertex; case 1: return Type::IfcCartesianPoint; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "TextureVertices"; case 1: return "TexturePoints"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcVertexBasedTextureMap (IfcAbstractEntityPtr e);
-    IfcVertexBasedTextureMap (SHARED_PTR< IfcTemplatedEntityList< IfcTextureVertex > > v1_TextureVertices, SHARED_PTR< IfcTemplatedEntityList< IfcCartesianPoint > > v2_TexturePoints);
-    typedef IfcVertexBasedTextureMap* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcVertexBasedTextureMap > > list;
-    typedef IfcTemplatedEntityList< IfcVertexBasedTextureMap >::it it;
+    IfcVertexBasedTextureMap (IfcAbstractEntity* e);
+    IfcVertexBasedTextureMap (IfcTemplatedEntityList< IfcTextureVertex >::ptr v1_TextureVertices, IfcTemplatedEntityList< IfcCartesianPoint >::ptr v2_TexturePoints);
+    typedef IfcTemplatedEntityList< IfcVertexBasedTextureMap > list;
 };
 /// Definition from ISO/CD 10303-42:1992: A vertex point is a vertex which has its geometry defined as a point.  
 /// 
@@ -11570,20 +12589,19 @@ class IfcVertexBasedTextureMap : public IfcUtil::IfcBaseEntity {
 class IfcVertexPoint : public IfcVertex {
 public:
     /// The geometric point, which defines the position in geometric space of the vertex.
-    IfcPoint* VertexGeometry();
+    IfcPoint* VertexGeometry() const;
     void setVertexGeometry(IfcPoint* v);
     virtual unsigned int getArgumentCount() const { return 1; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY; } return IfcVertex::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcPoint; } return IfcVertex::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "VertexGeometry"; } return IfcVertex::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcVertexPoint (IfcAbstractEntityPtr e);
+    IfcVertexPoint (IfcAbstractEntity* e);
     IfcVertexPoint (IfcPoint* v1_VertexGeometry);
-    typedef IfcVertexPoint* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcVertexPoint > > list;
-    typedef IfcTemplatedEntityList< IfcVertexPoint >::it it;
+    typedef IfcTemplatedEntityList< IfcVertexPoint > list;
 };
 /// IfcVirtualGridIntersection defines the derived location of the intersection between two grid axes. Offset values may be given to set an offset distance to the grid axis for the calculation of the virtual grid intersection.
 /// 
@@ -11647,131 +12665,125 @@ class IfcVertexPoint : public IfcVertex {
 class IfcVirtualGridIntersection : public IfcUtil::IfcBaseEntity {
 public:
     /// Two grid axes which intersects at exactly one intersection (see also informal proposition at IfcGrid). If attribute OffsetDistances is omitted, the intersection defines the placement or ref direction of a grid placement directly. If OffsetDistances are given, the intersection is defined by the offset curves to the grid axes.
-    SHARED_PTR< IfcTemplatedEntityList< IfcGridAxis > > IntersectingAxes();
-    void setIntersectingAxes(SHARED_PTR< IfcTemplatedEntityList< IfcGridAxis > > v);
+    IfcTemplatedEntityList< IfcGridAxis >::ptr IntersectingAxes() const;
+    void setIntersectingAxes(IfcTemplatedEntityList< IfcGridAxis >::ptr v);
     /// Offset distances to the grid axes. If given, it defines virtual offset curves to the grid axes. The intersection of the offset curves specify the virtual grid intersection.
-    std::vector< IfcLengthMeasure > /*[2:3]*/ OffsetDistances();
-    void setOffsetDistances(std::vector< IfcLengthMeasure > /*[2:3]*/ v);
+    std::vector< double > /*[2:3]*/ OffsetDistances() const;
+    void setOffsetDistances(std::vector< double > /*[2:3]*/ v);
     virtual unsigned int getArgumentCount() const { return 2; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY_LIST; case 1: return IfcUtil::Argument_VECTOR_DOUBLE; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcGridAxis; case 1: return Type::IfcLengthMeasure; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "IntersectingAxes"; case 1: return "OffsetDistances"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcVirtualGridIntersection (IfcAbstractEntityPtr e);
-    IfcVirtualGridIntersection (SHARED_PTR< IfcTemplatedEntityList< IfcGridAxis > > v1_IntersectingAxes, std::vector< IfcLengthMeasure > /*[2:3]*/ v2_OffsetDistances);
-    typedef IfcVirtualGridIntersection* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcVirtualGridIntersection > > list;
-    typedef IfcTemplatedEntityList< IfcVirtualGridIntersection >::it it;
+    IfcVirtualGridIntersection (IfcAbstractEntity* e);
+    IfcVirtualGridIntersection (IfcTemplatedEntityList< IfcGridAxis >::ptr v1_IntersectingAxes, std::vector< double > /*[2:3]*/ v2_OffsetDistances);
+    typedef IfcTemplatedEntityList< IfcVirtualGridIntersection > list;
 };
 
 class IfcWaterProperties : public IfcMaterialProperties {
 public:
     /// Whether the optional attribute IsPotable is defined for this IfcWaterProperties
-    bool hasIsPotable();
-    bool IsPotable();
+    bool hasIsPotable() const;
+    bool IsPotable() const;
     void setIsPotable(bool v);
     /// Whether the optional attribute Hardness is defined for this IfcWaterProperties
-    bool hasHardness();
-    IfcIonConcentrationMeasure Hardness();
-    void setHardness(IfcIonConcentrationMeasure v);
+    bool hasHardness() const;
+    double Hardness() const;
+    void setHardness(double v);
     /// Whether the optional attribute AlkalinityConcentration is defined for this IfcWaterProperties
-    bool hasAlkalinityConcentration();
-    IfcIonConcentrationMeasure AlkalinityConcentration();
-    void setAlkalinityConcentration(IfcIonConcentrationMeasure v);
+    bool hasAlkalinityConcentration() const;
+    double AlkalinityConcentration() const;
+    void setAlkalinityConcentration(double v);
     /// Whether the optional attribute AcidityConcentration is defined for this IfcWaterProperties
-    bool hasAcidityConcentration();
-    IfcIonConcentrationMeasure AcidityConcentration();
-    void setAcidityConcentration(IfcIonConcentrationMeasure v);
+    bool hasAcidityConcentration() const;
+    double AcidityConcentration() const;
+    void setAcidityConcentration(double v);
     /// Whether the optional attribute ImpuritiesContent is defined for this IfcWaterProperties
-    bool hasImpuritiesContent();
-    IfcNormalisedRatioMeasure ImpuritiesContent();
-    void setImpuritiesContent(IfcNormalisedRatioMeasure v);
+    bool hasImpuritiesContent() const;
+    double ImpuritiesContent() const;
+    void setImpuritiesContent(double v);
     /// Whether the optional attribute PHLevel is defined for this IfcWaterProperties
-    bool hasPHLevel();
-    IfcPHMeasure PHLevel();
-    void setPHLevel(IfcPHMeasure v);
+    bool hasPHLevel() const;
+    double PHLevel() const;
+    void setPHLevel(double v);
     /// Whether the optional attribute DissolvedSolidsContent is defined for this IfcWaterProperties
-    bool hasDissolvedSolidsContent();
-    IfcNormalisedRatioMeasure DissolvedSolidsContent();
-    void setDissolvedSolidsContent(IfcNormalisedRatioMeasure v);
+    bool hasDissolvedSolidsContent() const;
+    double DissolvedSolidsContent() const;
+    void setDissolvedSolidsContent(double v);
     virtual unsigned int getArgumentCount() const { return 8; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 1: return IfcUtil::Argument_BOOL; case 2: return IfcUtil::Argument_DOUBLE; case 3: return IfcUtil::Argument_DOUBLE; case 4: return IfcUtil::Argument_DOUBLE; case 5: return IfcUtil::Argument_DOUBLE; case 6: return IfcUtil::Argument_DOUBLE; case 7: return IfcUtil::Argument_DOUBLE; } return IfcMaterialProperties::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 1: return Type::UNDEFINED; case 2: return Type::IfcIonConcentrationMeasure; case 3: return Type::IfcIonConcentrationMeasure; case 4: return Type::IfcIonConcentrationMeasure; case 5: return Type::IfcNormalisedRatioMeasure; case 6: return Type::IfcPHMeasure; case 7: return Type::IfcNormalisedRatioMeasure; } return IfcMaterialProperties::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 1: return "IsPotable"; case 2: return "Hardness"; case 3: return "AlkalinityConcentration"; case 4: return "AcidityConcentration"; case 5: return "ImpuritiesContent"; case 6: return "PHLevel"; case 7: return "DissolvedSolidsContent"; } return IfcMaterialProperties::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcWaterProperties (IfcAbstractEntityPtr e);
-    IfcWaterProperties (IfcMaterial* v1_Material, boost::optional< bool > v2_IsPotable, boost::optional< IfcIonConcentrationMeasure > v3_Hardness, boost::optional< IfcIonConcentrationMeasure > v4_AlkalinityConcentration, boost::optional< IfcIonConcentrationMeasure > v5_AcidityConcentration, boost::optional< IfcNormalisedRatioMeasure > v6_ImpuritiesContent, boost::optional< IfcPHMeasure > v7_PHLevel, boost::optional< IfcNormalisedRatioMeasure > v8_DissolvedSolidsContent);
-    typedef IfcWaterProperties* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcWaterProperties > > list;
-    typedef IfcTemplatedEntityList< IfcWaterProperties >::it it;
+    IfcWaterProperties (IfcAbstractEntity* e);
+    IfcWaterProperties (IfcMaterial* v1_Material, boost::optional< bool > v2_IsPotable, boost::optional< double > v3_Hardness, boost::optional< double > v4_AlkalinityConcentration, boost::optional< double > v5_AcidityConcentration, boost::optional< double > v6_ImpuritiesContent, boost::optional< double > v7_PHLevel, boost::optional< double > v8_DissolvedSolidsContent);
+    typedef IfcTemplatedEntityList< IfcWaterProperties > list;
 };
 
 class IfcAnnotationOccurrence : public IfcStyledItem {
 public:
     virtual unsigned int getArgumentCount() const { return 3; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcStyledItem::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcStyledItem::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcStyledItem::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcAnnotationOccurrence (IfcAbstractEntityPtr e);
-    IfcAnnotationOccurrence (IfcRepresentationItem* v1_Item, SHARED_PTR< IfcTemplatedEntityList< IfcPresentationStyleAssignment > > v2_Styles, boost::optional< IfcLabel > v3_Name);
-    typedef IfcAnnotationOccurrence* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcAnnotationOccurrence > > list;
-    typedef IfcTemplatedEntityList< IfcAnnotationOccurrence >::it it;
+    IfcAnnotationOccurrence (IfcAbstractEntity* e);
+    IfcAnnotationOccurrence (IfcRepresentationItem* v1_Item, IfcTemplatedEntityList< IfcPresentationStyleAssignment >::ptr v2_Styles, boost::optional< std::string > v3_Name);
+    typedef IfcTemplatedEntityList< IfcAnnotationOccurrence > list;
 };
 
 class IfcAnnotationSurfaceOccurrence : public IfcAnnotationOccurrence {
 public:
     virtual unsigned int getArgumentCount() const { return 3; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcAnnotationOccurrence::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcAnnotationOccurrence::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcAnnotationOccurrence::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcAnnotationSurfaceOccurrence (IfcAbstractEntityPtr e);
-    IfcAnnotationSurfaceOccurrence (IfcRepresentationItem* v1_Item, SHARED_PTR< IfcTemplatedEntityList< IfcPresentationStyleAssignment > > v2_Styles, boost::optional< IfcLabel > v3_Name);
-    typedef IfcAnnotationSurfaceOccurrence* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcAnnotationSurfaceOccurrence > > list;
-    typedef IfcTemplatedEntityList< IfcAnnotationSurfaceOccurrence >::it it;
+    IfcAnnotationSurfaceOccurrence (IfcAbstractEntity* e);
+    IfcAnnotationSurfaceOccurrence (IfcRepresentationItem* v1_Item, IfcTemplatedEntityList< IfcPresentationStyleAssignment >::ptr v2_Styles, boost::optional< std::string > v3_Name);
+    typedef IfcTemplatedEntityList< IfcAnnotationSurfaceOccurrence > list;
 };
 
 class IfcAnnotationSymbolOccurrence : public IfcAnnotationOccurrence {
 public:
     virtual unsigned int getArgumentCount() const { return 3; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcAnnotationOccurrence::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcAnnotationOccurrence::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcAnnotationOccurrence::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcAnnotationSymbolOccurrence (IfcAbstractEntityPtr e);
-    IfcAnnotationSymbolOccurrence (IfcRepresentationItem* v1_Item, SHARED_PTR< IfcTemplatedEntityList< IfcPresentationStyleAssignment > > v2_Styles, boost::optional< IfcLabel > v3_Name);
-    typedef IfcAnnotationSymbolOccurrence* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcAnnotationSymbolOccurrence > > list;
-    typedef IfcTemplatedEntityList< IfcAnnotationSymbolOccurrence >::it it;
+    IfcAnnotationSymbolOccurrence (IfcAbstractEntity* e);
+    IfcAnnotationSymbolOccurrence (IfcRepresentationItem* v1_Item, IfcTemplatedEntityList< IfcPresentationStyleAssignment >::ptr v2_Styles, boost::optional< std::string > v3_Name);
+    typedef IfcTemplatedEntityList< IfcAnnotationSymbolOccurrence > list;
 };
 
 class IfcAnnotationTextOccurrence : public IfcAnnotationOccurrence {
 public:
     virtual unsigned int getArgumentCount() const { return 3; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcAnnotationOccurrence::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcAnnotationOccurrence::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcAnnotationOccurrence::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcAnnotationTextOccurrence (IfcAbstractEntityPtr e);
-    IfcAnnotationTextOccurrence (IfcRepresentationItem* v1_Item, SHARED_PTR< IfcTemplatedEntityList< IfcPresentationStyleAssignment > > v2_Styles, boost::optional< IfcLabel > v3_Name);
-    typedef IfcAnnotationTextOccurrence* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcAnnotationTextOccurrence > > list;
-    typedef IfcTemplatedEntityList< IfcAnnotationTextOccurrence >::it it;
+    IfcAnnotationTextOccurrence (IfcAbstractEntity* e);
+    IfcAnnotationTextOccurrence (IfcRepresentationItem* v1_Item, IfcTemplatedEntityList< IfcPresentationStyleAssignment >::ptr v2_Styles, boost::optional< std::string > v3_Name);
+    typedef IfcTemplatedEntityList< IfcAnnotationTextOccurrence > list;
 };
 /// The closed profile IfcArbitraryClosedProfileDef defines an arbitrary two-dimensional profile for the use within the swept surface geometry, the swept area solid or a sectioned spine. It is given by an outer boundary from which the surface or solid can be constructed. 
 /// 
@@ -11794,20 +12806,19 @@ class IfcAnnotationTextOccurrence : public IfcAnnotationOccurrence {
 class IfcArbitraryClosedProfileDef : public IfcProfileDef {
 public:
     /// Bounded curve, defining the outer boundaries of the arbitrary profile.
-    IfcCurve* OuterCurve();
+    IfcCurve* OuterCurve() const;
     void setOuterCurve(IfcCurve* v);
     virtual unsigned int getArgumentCount() const { return 3; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 2: return IfcUtil::Argument_ENTITY; } return IfcProfileDef::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 2: return Type::IfcCurve; } return IfcProfileDef::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 2: return "OuterCurve"; } return IfcProfileDef::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcArbitraryClosedProfileDef (IfcAbstractEntityPtr e);
-    IfcArbitraryClosedProfileDef (IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< IfcLabel > v2_ProfileName, IfcCurve* v3_OuterCurve);
-    typedef IfcArbitraryClosedProfileDef* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcArbitraryClosedProfileDef > > list;
-    typedef IfcTemplatedEntityList< IfcArbitraryClosedProfileDef >::it it;
+    IfcArbitraryClosedProfileDef (IfcAbstractEntity* e);
+    IfcArbitraryClosedProfileDef (IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< std::string > v2_ProfileName, IfcCurve* v3_OuterCurve);
+    typedef IfcTemplatedEntityList< IfcArbitraryClosedProfileDef > list;
 };
 /// The open profile IfcArbitraryOpenProfileDef defines an arbitrary two-dimensional open profile for the use within the swept surface geometry. It is given by an open boundary from with the surface can be constructed. 
 /// 
@@ -11827,20 +12838,19 @@ class IfcArbitraryClosedProfileDef : public IfcProfileDef {
 class IfcArbitraryOpenProfileDef : public IfcProfileDef {
 public:
     /// Open bounded curve defining the profile.
-    IfcBoundedCurve* Curve();
+    IfcBoundedCurve* Curve() const;
     void setCurve(IfcBoundedCurve* v);
     virtual unsigned int getArgumentCount() const { return 3; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 2: return IfcUtil::Argument_ENTITY; } return IfcProfileDef::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 2: return Type::IfcBoundedCurve; } return IfcProfileDef::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 2: return "Curve"; } return IfcProfileDef::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcArbitraryOpenProfileDef (IfcAbstractEntityPtr e);
-    IfcArbitraryOpenProfileDef (IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< IfcLabel > v2_ProfileName, IfcBoundedCurve* v3_Curve);
-    typedef IfcArbitraryOpenProfileDef* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcArbitraryOpenProfileDef > > list;
-    typedef IfcTemplatedEntityList< IfcArbitraryOpenProfileDef >::it it;
+    IfcArbitraryOpenProfileDef (IfcAbstractEntity* e);
+    IfcArbitraryOpenProfileDef (IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< std::string > v2_ProfileName, IfcBoundedCurve* v3_Curve);
+    typedef IfcTemplatedEntityList< IfcArbitraryOpenProfileDef > list;
 };
 /// The IfcArbitraryProfileDefWithVoids defines an arbitrary closed two-dimensional profile with holes defined for the use for the swept area solid or a sectioned spine. It is given by an outer boundary and inner boundaries from with the solid the can be constructed.
 /// 
@@ -11864,20 +12874,19 @@ class IfcArbitraryOpenProfileDef : public IfcProfileDef {
 class IfcArbitraryProfileDefWithVoids : public IfcArbitraryClosedProfileDef {
 public:
     /// Set of bounded curves, defining the inner boundaries of the arbitrary profile.
-    SHARED_PTR< IfcTemplatedEntityList< IfcCurve > > InnerCurves();
-    void setInnerCurves(SHARED_PTR< IfcTemplatedEntityList< IfcCurve > > v);
+    IfcTemplatedEntityList< IfcCurve >::ptr InnerCurves() const;
+    void setInnerCurves(IfcTemplatedEntityList< IfcCurve >::ptr v);
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 3: return IfcUtil::Argument_ENTITY_LIST; } return IfcArbitraryClosedProfileDef::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 3: return Type::IfcCurve; } return IfcArbitraryClosedProfileDef::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 3: return "InnerCurves"; } return IfcArbitraryClosedProfileDef::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcArbitraryProfileDefWithVoids (IfcAbstractEntityPtr e);
-    IfcArbitraryProfileDefWithVoids (IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< IfcLabel > v2_ProfileName, IfcCurve* v3_OuterCurve, SHARED_PTR< IfcTemplatedEntityList< IfcCurve > > v4_InnerCurves);
-    typedef IfcArbitraryProfileDefWithVoids* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcArbitraryProfileDefWithVoids > > list;
-    typedef IfcTemplatedEntityList< IfcArbitraryProfileDefWithVoids >::it it;
+    IfcArbitraryProfileDefWithVoids (IfcAbstractEntity* e);
+    IfcArbitraryProfileDefWithVoids (IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< std::string > v2_ProfileName, IfcCurve* v3_OuterCurve, IfcTemplatedEntityList< IfcCurve >::ptr v4_InnerCurves);
+    typedef IfcTemplatedEntityList< IfcArbitraryProfileDefWithVoids > list;
 };
 /// An IfcBlobTexture provides a 2-dimensional distribution of the lighting parameters of a surface onto which it is mapped. The texture itself is given as a single binary blob, representing the content of a pixel format file. The file format of the pixel file is given by the RasterFormat attribute and allowable formats are guided by where rule SupportedRasterFormat.
 /// 
@@ -11891,23 +12900,22 @@ class IfcArbitraryProfileDefWithVoids : public IfcArbitraryClosedProfileDef {
 class IfcBlobTexture : public IfcSurfaceTexture {
 public:
     /// The format of the RasterCode often using a compression.
-    IfcIdentifier RasterFormat();
-    void setRasterFormat(IfcIdentifier v);
+    std::string RasterFormat() const;
+    void setRasterFormat(std::string v);
     /// Blob, given as a single binary, to capture the texture within one popular file (compression) format. The file format is provided by the RasterFormat attribute.
-    bool RasterCode();
+    bool RasterCode() const;
     void setRasterCode(bool v);
     virtual unsigned int getArgumentCount() const { return 6; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 4: return IfcUtil::Argument_STRING; case 5: return IfcUtil::Argument_BOOL; } return IfcSurfaceTexture::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 4: return Type::IfcIdentifier; case 5: return Type::UNDEFINED; } return IfcSurfaceTexture::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 4: return "RasterFormat"; case 5: return "RasterCode"; } return IfcSurfaceTexture::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcBlobTexture (IfcAbstractEntityPtr e);
-    IfcBlobTexture (bool v1_RepeatS, bool v2_RepeatT, IfcSurfaceTextureEnum::IfcSurfaceTextureEnum v3_TextureType, IfcCartesianTransformationOperator2D* v4_TextureTransform, IfcIdentifier v5_RasterFormat, bool v6_RasterCode);
-    typedef IfcBlobTexture* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcBlobTexture > > list;
-    typedef IfcTemplatedEntityList< IfcBlobTexture >::it it;
+    IfcBlobTexture (IfcAbstractEntity* e);
+    IfcBlobTexture (bool v1_RepeatS, bool v2_RepeatT, IfcSurfaceTextureEnum::IfcSurfaceTextureEnum v3_TextureType, IfcCartesianTransformationOperator2D* v4_TextureTransform, std::string v5_RasterFormat, bool v6_RasterCode);
+    typedef IfcTemplatedEntityList< IfcBlobTexture > list;
 };
 /// The profile IfcCenterLineProfileDef defines an arbitrary two-dimensional open, not self intersecting profile for the use within the swept solid geometry. It is given by an area defined by applying a constant thickness to a centerline, generating an area from which the solid can be constructed.
 /// 
@@ -11941,20 +12949,19 @@ class IfcBlobTexture : public IfcSurfaceTexture {
 class IfcCenterLineProfileDef : public IfcArbitraryOpenProfileDef {
 public:
     /// Constant thickness applied along the center line.
-    IfcPositiveLengthMeasure Thickness();
-    void setThickness(IfcPositiveLengthMeasure v);
+    double Thickness() const;
+    void setThickness(double v);
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 3: return IfcUtil::Argument_DOUBLE; } return IfcArbitraryOpenProfileDef::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 3: return Type::IfcPositiveLengthMeasure; } return IfcArbitraryOpenProfileDef::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 3: return "Thickness"; } return IfcArbitraryOpenProfileDef::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcCenterLineProfileDef (IfcAbstractEntityPtr e);
-    IfcCenterLineProfileDef (IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< IfcLabel > v2_ProfileName, IfcBoundedCurve* v3_Curve, IfcPositiveLengthMeasure v4_Thickness);
-    typedef IfcCenterLineProfileDef* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcCenterLineProfileDef > > list;
-    typedef IfcTemplatedEntityList< IfcCenterLineProfileDef >::it it;
+    IfcCenterLineProfileDef (IfcAbstractEntity* e);
+    IfcCenterLineProfileDef (IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< std::string > v2_ProfileName, IfcBoundedCurve* v3_Curve, double v4_Thickness);
+    typedef IfcTemplatedEntityList< IfcCenterLineProfileDef > list;
 };
 /// An IfcClassificationReference is a reference into a classification system or source (see IfcClassification) for a specific classification key (or notation).
 /// 
@@ -11980,22 +12987,21 @@ class IfcCenterLineProfileDef : public IfcArbitraryOpenProfileDef {
 class IfcClassificationReference : public IfcExternalReference {
 public:
     /// Whether the optional attribute ReferencedSource is defined for this IfcClassificationReference
-    bool hasReferencedSource();
+    bool hasReferencedSource() const;
     /// The classification system or source that is referenced.
-    IfcClassification* ReferencedSource();
+    IfcClassification* ReferencedSource() const;
     void setReferencedSource(IfcClassification* v);
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 3: return IfcUtil::Argument_ENTITY; } return IfcExternalReference::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 3: return Type::IfcClassification; } return IfcExternalReference::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 3: return "ReferencedSource"; } return IfcExternalReference::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcClassificationReference (IfcAbstractEntityPtr e);
-    IfcClassificationReference (boost::optional< IfcLabel > v1_Location, boost::optional< IfcIdentifier > v2_ItemReference, boost::optional< IfcLabel > v3_Name, IfcClassification* v4_ReferencedSource);
-    typedef IfcClassificationReference* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcClassificationReference > > list;
-    typedef IfcTemplatedEntityList< IfcClassificationReference >::it it;
+    IfcClassificationReference (IfcAbstractEntity* e);
+    IfcClassificationReference (boost::optional< std::string > v1_Location, boost::optional< std::string > v2_ItemReference, boost::optional< std::string > v3_Name, IfcClassification* v4_ReferencedSource);
+    typedef IfcTemplatedEntityList< IfcClassificationReference > list;
 };
 /// Definition from ISO/CD 10303-46:1992: A colour rgb as a subtype of colour specifications is defined by three colour component values for red, green, and blue in the RGB colour model.
 /// 
@@ -12010,30 +13016,29 @@ class IfcColourRgb : public IfcColourSpecification {
     /// The intensity of the red colour component.
     /// 
     /// NOTE  The colour component value is given within the range of 0..1, and not within the range of 0..255 as otherwise usual.
-    IfcNormalisedRatioMeasure Red();
-    void setRed(IfcNormalisedRatioMeasure v);
+    double Red() const;
+    void setRed(double v);
     /// The intensity of the green colour component.
     /// 
     /// NOTE  The colour component value is given within the range of 0..1, and not within the range of 0..255 as otherwise usual.
-    IfcNormalisedRatioMeasure Green();
-    void setGreen(IfcNormalisedRatioMeasure v);
+    double Green() const;
+    void setGreen(double v);
     /// The intensity of the blue colour component.
     /// 
     /// NOTE  The colour component value is given within the range of 0..1, and not within the range of 0..255 as otherwise usual.
-    IfcNormalisedRatioMeasure Blue();
-    void setBlue(IfcNormalisedRatioMeasure v);
+    double Blue() const;
+    void setBlue(double v);
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 1: return IfcUtil::Argument_DOUBLE; case 2: return IfcUtil::Argument_DOUBLE; case 3: return IfcUtil::Argument_DOUBLE; } return IfcColourSpecification::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 1: return Type::IfcNormalisedRatioMeasure; case 2: return Type::IfcNormalisedRatioMeasure; case 3: return Type::IfcNormalisedRatioMeasure; } return IfcColourSpecification::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 1: return "Red"; case 2: return "Green"; case 3: return "Blue"; } return IfcColourSpecification::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcColourRgb (IfcAbstractEntityPtr e);
-    IfcColourRgb (boost::optional< IfcLabel > v1_Name, IfcNormalisedRatioMeasure v2_Red, IfcNormalisedRatioMeasure v3_Green, IfcNormalisedRatioMeasure v4_Blue);
-    typedef IfcColourRgb* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcColourRgb > > list;
-    typedef IfcTemplatedEntityList< IfcColourRgb >::it it;
+    IfcColourRgb (IfcAbstractEntity* e);
+    IfcColourRgb (boost::optional< std::string > v1_Name, double v2_Red, double v3_Green, double v4_Blue);
+    typedef IfcTemplatedEntityList< IfcColourRgb > list;
 };
 /// IfcComplexProperty is used to define complex properties to be handled completely within a property set. The included set of properties may be a mixed or consistent collection of IfcProperty subtypes. This enables the definition of a set of properties to be included as a single 'property' entry in an IfcPropertySet. The definition of such an IfcComplexProperty can be reused in many different IfcPropertySet's.
 /// 
@@ -12044,23 +13049,22 @@ class IfcComplexProperty : public IfcProperty {
 public:
     /// Usage description of the IfcComplexProperty within the property set which references the IfcComplexProperty.
     ///   NOTE: Consider a complex property for glazing properties. The Name attribute of the IfcComplexProperty could be Pset_GlazingProperties, and the UsageName attribute could be OuterGlazingPane.
-    IfcIdentifier UsageName();
-    void setUsageName(IfcIdentifier v);
+    std::string UsageName() const;
+    void setUsageName(std::string v);
     /// Set of properties that can be used within this complex property (may include other complex properties).
-    SHARED_PTR< IfcTemplatedEntityList< IfcProperty > > HasProperties();
-    void setHasProperties(SHARED_PTR< IfcTemplatedEntityList< IfcProperty > > v);
+    IfcTemplatedEntityList< IfcProperty >::ptr HasProperties() const;
+    void setHasProperties(IfcTemplatedEntityList< IfcProperty >::ptr v);
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 2: return IfcUtil::Argument_STRING; case 3: return IfcUtil::Argument_ENTITY_LIST; } return IfcProperty::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 2: return Type::IfcIdentifier; case 3: return Type::IfcProperty; } return IfcProperty::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 2: return "UsageName"; case 3: return "HasProperties"; } return IfcProperty::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcComplexProperty (IfcAbstractEntityPtr e);
-    IfcComplexProperty (IfcIdentifier v1_Name, boost::optional< IfcText > v2_Description, IfcIdentifier v3_UsageName, SHARED_PTR< IfcTemplatedEntityList< IfcProperty > > v4_HasProperties);
-    typedef IfcComplexProperty* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcComplexProperty > > list;
-    typedef IfcTemplatedEntityList< IfcComplexProperty >::it it;
+    IfcComplexProperty (IfcAbstractEntity* e);
+    IfcComplexProperty (std::string v1_Name, boost::optional< std::string > v2_Description, std::string v3_UsageName, IfcTemplatedEntityList< IfcProperty >::ptr v4_HasProperties);
+    typedef IfcTemplatedEntityList< IfcComplexProperty > list;
 };
 /// The IfcCompositeProfileDef
 /// defines the profile by composition of other profiles. The composition
@@ -12101,25 +13105,24 @@ class IfcComplexProperty : public IfcProperty {
 class IfcCompositeProfileDef : public IfcProfileDef {
 public:
     /// The profiles which are used to define the composite profile.
-    SHARED_PTR< IfcTemplatedEntityList< IfcProfileDef > > Profiles();
-    void setProfiles(SHARED_PTR< IfcTemplatedEntityList< IfcProfileDef > > v);
+    IfcTemplatedEntityList< IfcProfileDef >::ptr Profiles() const;
+    void setProfiles(IfcTemplatedEntityList< IfcProfileDef >::ptr v);
     /// Whether the optional attribute Label is defined for this IfcCompositeProfileDef
-    bool hasLabel();
+    bool hasLabel() const;
     /// The name by which the composition may be referred to. The actual meaning of the name has to be defined in the context of applications.
-    IfcLabel Label();
-    void setLabel(IfcLabel v);
+    std::string Label() const;
+    void setLabel(std::string v);
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 2: return IfcUtil::Argument_ENTITY_LIST; case 3: return IfcUtil::Argument_STRING; } return IfcProfileDef::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 2: return Type::IfcProfileDef; case 3: return Type::IfcLabel; } return IfcProfileDef::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 2: return "Profiles"; case 3: return "Label"; } return IfcProfileDef::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcCompositeProfileDef (IfcAbstractEntityPtr e);
-    IfcCompositeProfileDef (IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< IfcLabel > v2_ProfileName, SHARED_PTR< IfcTemplatedEntityList< IfcProfileDef > > v3_Profiles, boost::optional< IfcLabel > v4_Label);
-    typedef IfcCompositeProfileDef* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcCompositeProfileDef > > list;
-    typedef IfcTemplatedEntityList< IfcCompositeProfileDef >::it it;
+    IfcCompositeProfileDef (IfcAbstractEntity* e);
+    IfcCompositeProfileDef (IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< std::string > v2_ProfileName, IfcTemplatedEntityList< IfcProfileDef >::ptr v3_Profiles, boost::optional< std::string > v4_Label);
+    typedef IfcTemplatedEntityList< IfcCompositeProfileDef > list;
 };
 /// Definition from ISO/CD 10303-42:1992: A connected_face_set is a set of faces such that the domain of faces together with their bounding edges and vertices is connected.  
 /// 
@@ -12133,20 +13136,19 @@ class IfcCompositeProfileDef : public IfcProfileDef {
 class IfcConnectedFaceSet : public IfcTopologicalRepresentationItem {
 public:
     /// The set of faces arcwise connected along common edges or vertices.
-    SHARED_PTR< IfcTemplatedEntityList< IfcFace > > CfsFaces();
-    void setCfsFaces(SHARED_PTR< IfcTemplatedEntityList< IfcFace > > v);
+    IfcTemplatedEntityList< IfcFace >::ptr CfsFaces() const;
+    void setCfsFaces(IfcTemplatedEntityList< IfcFace >::ptr v);
     virtual unsigned int getArgumentCount() const { return 1; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY_LIST; } return IfcTopologicalRepresentationItem::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcFace; } return IfcTopologicalRepresentationItem::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "CfsFaces"; } return IfcTopologicalRepresentationItem::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcConnectedFaceSet (IfcAbstractEntityPtr e);
-    IfcConnectedFaceSet (SHARED_PTR< IfcTemplatedEntityList< IfcFace > > v1_CfsFaces);
-    typedef IfcConnectedFaceSet* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcConnectedFaceSet > > list;
-    typedef IfcTemplatedEntityList< IfcConnectedFaceSet >::it it;
+    IfcConnectedFaceSet (IfcAbstractEntity* e);
+    IfcConnectedFaceSet (IfcTemplatedEntityList< IfcFace >::ptr v1_CfsFaces);
+    typedef IfcTemplatedEntityList< IfcConnectedFaceSet > list;
 };
 /// IfcConnectionCurveGeometry is used to describe the geometric constraints that facilitate the physical connection of two objects at a curve or at an edge with curve geometry associated. It is envisioned as a control that applies to the element connection relationships. 
 /// 
@@ -12164,25 +13166,24 @@ class IfcConnectedFaceSet : public IfcTopologicalRepresentationItem {
 class IfcConnectionCurveGeometry : public IfcConnectionGeometry {
 public:
     /// The bounded curve at which the connected objects are aligned at the relating element, given in the LCS of the relating element.
-    IfcCurveOrEdgeCurve CurveOnRelatingElement();
-    void setCurveOnRelatingElement(IfcCurveOrEdgeCurve v);
+    IfcCurveOrEdgeCurve* CurveOnRelatingElement() const;
+    void setCurveOnRelatingElement(IfcCurveOrEdgeCurve* v);
     /// Whether the optional attribute CurveOnRelatedElement is defined for this IfcConnectionCurveGeometry
-    bool hasCurveOnRelatedElement();
+    bool hasCurveOnRelatedElement() const;
     /// The bounded curve at which the connected objects are aligned at the related element, given in the LCS of the related element. If the information is omitted, then the origin of the related element is used.
-    IfcCurveOrEdgeCurve CurveOnRelatedElement();
-    void setCurveOnRelatedElement(IfcCurveOrEdgeCurve v);
+    IfcCurveOrEdgeCurve* CurveOnRelatedElement() const;
+    void setCurveOnRelatedElement(IfcCurveOrEdgeCurve* v);
     virtual unsigned int getArgumentCount() const { return 2; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY; case 1: return IfcUtil::Argument_ENTITY; } return IfcConnectionGeometry::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcCurveOrEdgeCurve; case 1: return Type::IfcCurveOrEdgeCurve; } return IfcConnectionGeometry::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "CurveOnRelatingElement"; case 1: return "CurveOnRelatedElement"; } return IfcConnectionGeometry::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcConnectionCurveGeometry (IfcAbstractEntityPtr e);
-    IfcConnectionCurveGeometry (IfcCurveOrEdgeCurve v1_CurveOnRelatingElement, boost::optional< IfcCurveOrEdgeCurve > v2_CurveOnRelatedElement);
-    typedef IfcConnectionCurveGeometry* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcConnectionCurveGeometry > > list;
-    typedef IfcTemplatedEntityList< IfcConnectionCurveGeometry >::it it;
+    IfcConnectionCurveGeometry (IfcAbstractEntity* e);
+    IfcConnectionCurveGeometry (IfcCurveOrEdgeCurve* v1_CurveOnRelatingElement, IfcCurveOrEdgeCurve* v2_CurveOnRelatedElement);
+    typedef IfcTemplatedEntityList< IfcConnectionCurveGeometry > list;
 };
 /// IfcConnectionPointEccentricity is used to describe the geometric constraints that facilitate the physical connection of two objects at a point or vertex point with associated point coordinates. There is a physical distance, or eccentricity, etween the connection points of both object. The eccentricity can be either given by:
 /// 
@@ -12206,32 +13207,31 @@ class IfcConnectionCurveGeometry : public IfcConnectionGeometry {
 class IfcConnectionPointEccentricity : public IfcConnectionPointGeometry {
 public:
     /// Whether the optional attribute EccentricityInX is defined for this IfcConnectionPointEccentricity
-    bool hasEccentricityInX();
+    bool hasEccentricityInX() const;
     /// Distance in x direction between the two points (or vertex points) engaged in the point connection.
-    IfcLengthMeasure EccentricityInX();
-    void setEccentricityInX(IfcLengthMeasure v);
+    double EccentricityInX() const;
+    void setEccentricityInX(double v);
     /// Whether the optional attribute EccentricityInY is defined for this IfcConnectionPointEccentricity
-    bool hasEccentricityInY();
+    bool hasEccentricityInY() const;
     /// Distance in y direction between the two points (or vertex points) engaged in the point connection.
-    IfcLengthMeasure EccentricityInY();
-    void setEccentricityInY(IfcLengthMeasure v);
+    double EccentricityInY() const;
+    void setEccentricityInY(double v);
     /// Whether the optional attribute EccentricityInZ is defined for this IfcConnectionPointEccentricity
-    bool hasEccentricityInZ();
+    bool hasEccentricityInZ() const;
     /// Distance in z direction between the two points (or vertex points) engaged in the point connection.
-    IfcLengthMeasure EccentricityInZ();
-    void setEccentricityInZ(IfcLengthMeasure v);
+    double EccentricityInZ() const;
+    void setEccentricityInZ(double v);
     virtual unsigned int getArgumentCount() const { return 5; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 2: return IfcUtil::Argument_DOUBLE; case 3: return IfcUtil::Argument_DOUBLE; case 4: return IfcUtil::Argument_DOUBLE; } return IfcConnectionPointGeometry::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 2: return Type::IfcLengthMeasure; case 3: return Type::IfcLengthMeasure; case 4: return Type::IfcLengthMeasure; } return IfcConnectionPointGeometry::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 2: return "EccentricityInX"; case 3: return "EccentricityInY"; case 4: return "EccentricityInZ"; } return IfcConnectionPointGeometry::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcConnectionPointEccentricity (IfcAbstractEntityPtr e);
-    IfcConnectionPointEccentricity (IfcPointOrVertexPoint v1_PointOnRelatingElement, boost::optional< IfcPointOrVertexPoint > v2_PointOnRelatedElement, boost::optional< IfcLengthMeasure > v3_EccentricityInX, boost::optional< IfcLengthMeasure > v4_EccentricityInY, boost::optional< IfcLengthMeasure > v5_EccentricityInZ);
-    typedef IfcConnectionPointEccentricity* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcConnectionPointEccentricity > > list;
-    typedef IfcTemplatedEntityList< IfcConnectionPointEccentricity >::it it;
+    IfcConnectionPointEccentricity (IfcAbstractEntity* e);
+    IfcConnectionPointEccentricity (IfcPointOrVertexPoint* v1_PointOnRelatingElement, IfcPointOrVertexPoint* v2_PointOnRelatedElement, boost::optional< double > v3_EccentricityInX, boost::optional< double > v4_EccentricityInY, boost::optional< double > v5_EccentricityInZ);
+    typedef IfcTemplatedEntityList< IfcConnectionPointEccentricity > list;
 };
 /// Definition from ISO/CD 10303-41:1992: A context dependent unit is a unit which is not related to the SI system.
 /// 
@@ -12243,20 +13243,19 @@ class IfcConnectionPointEccentricity : public IfcConnectionPointGeometry {
 class IfcContextDependentUnit : public IfcNamedUnit {
 public:
     /// The word, or group of words, by which the context dependent unit is referred to.
-    IfcLabel Name();
-    void setName(IfcLabel v);
+    std::string Name() const;
+    void setName(std::string v);
     virtual unsigned int getArgumentCount() const { return 3; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 2: return IfcUtil::Argument_STRING; } return IfcNamedUnit::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 2: return Type::IfcLabel; } return IfcNamedUnit::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 2: return "Name"; } return IfcNamedUnit::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcContextDependentUnit (IfcAbstractEntityPtr e);
-    IfcContextDependentUnit (IfcDimensionalExponents* v1_Dimensions, IfcUnitEnum::IfcUnitEnum v2_UnitType, IfcLabel v3_Name);
-    typedef IfcContextDependentUnit* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcContextDependentUnit > > list;
-    typedef IfcTemplatedEntityList< IfcContextDependentUnit >::it it;
+    IfcContextDependentUnit (IfcAbstractEntity* e);
+    IfcContextDependentUnit (IfcDimensionalExponents* v1_Dimensions, IfcUnitEnum::IfcUnitEnum v2_UnitType, std::string v3_Name);
+    typedef IfcTemplatedEntityList< IfcContextDependentUnit > list;
 };
 /// Definition from ISO/CD 10303-41:1992: A conversion based unit is a unit that is defined based on a measure with unit.
 /// 
@@ -12308,23 +13307,22 @@ class IfcContextDependentUnit : public IfcNamedUnit {
 class IfcConversionBasedUnit : public IfcNamedUnit {
 public:
     /// The word, or group of words, by which the conversion based unit is referred to.
-    IfcLabel Name();
-    void setName(IfcLabel v);
+    std::string Name() const;
+    void setName(std::string v);
     /// The physical quantity from which the converted unit is derived.
-    IfcMeasureWithUnit* ConversionFactor();
+    IfcMeasureWithUnit* ConversionFactor() const;
     void setConversionFactor(IfcMeasureWithUnit* v);
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 2: return IfcUtil::Argument_STRING; case 3: return IfcUtil::Argument_ENTITY; } return IfcNamedUnit::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 2: return Type::IfcLabel; case 3: return Type::IfcMeasureWithUnit; } return IfcNamedUnit::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 2: return "Name"; case 3: return "ConversionFactor"; } return IfcNamedUnit::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcConversionBasedUnit (IfcAbstractEntityPtr e);
-    IfcConversionBasedUnit (IfcDimensionalExponents* v1_Dimensions, IfcUnitEnum::IfcUnitEnum v2_UnitType, IfcLabel v3_Name, IfcMeasureWithUnit* v4_ConversionFactor);
-    typedef IfcConversionBasedUnit* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcConversionBasedUnit > > list;
-    typedef IfcTemplatedEntityList< IfcConversionBasedUnit >::it it;
+    IfcConversionBasedUnit (IfcAbstractEntity* e);
+    IfcConversionBasedUnit (IfcDimensionalExponents* v1_Dimensions, IfcUnitEnum::IfcUnitEnum v2_UnitType, std::string v3_Name, IfcMeasureWithUnit* v4_ConversionFactor);
+    typedef IfcTemplatedEntityList< IfcConversionBasedUnit > list;
 };
 /// Definition from ISO/CD 10303-46:1992: A curve style specifies the visual appearance of curves.
 /// 
@@ -12346,32 +13344,31 @@ class IfcConversionBasedUnit : public IfcNamedUnit {
 class IfcCurveStyle : public IfcPresentationStyle {
 public:
     /// Whether the optional attribute CurveFont is defined for this IfcCurveStyle
-    bool hasCurveFont();
+    bool hasCurveFont() const;
     /// A curve style font which is used to present a curve. It can either be a predefined curve font, or an explicitly defined curve font. Both may be scaled. If not given, then the curve font should be taken from the layer assignment with style, if that is not given either, then the default curve font applies.
-    IfcCurveFontOrScaledCurveFontSelect CurveFont();
-    void setCurveFont(IfcCurveFontOrScaledCurveFontSelect v);
+    IfcCurveFontOrScaledCurveFontSelect* CurveFont() const;
+    void setCurveFont(IfcCurveFontOrScaledCurveFontSelect* v);
     /// Whether the optional attribute CurveWidth is defined for this IfcCurveStyle
-    bool hasCurveWidth();
+    bool hasCurveWidth() const;
     /// A positive length measure in units of the presentation area for the width of a presented curve. If not given, then the style should be taken from the layer assignment with style, if that is not given either, then the default style applies.
-    IfcSizeSelect CurveWidth();
-    void setCurveWidth(IfcSizeSelect v);
+    IfcSizeSelect* CurveWidth() const;
+    void setCurveWidth(IfcSizeSelect* v);
     /// Whether the optional attribute CurveColour is defined for this IfcCurveStyle
-    bool hasCurveColour();
+    bool hasCurveColour() const;
     /// The colour of the visible part of the curve. If not given, then the colour should be taken from the layer assignment with style, if that is not given either, then the default colour applies.
-    IfcColour CurveColour();
-    void setCurveColour(IfcColour v);
+    IfcColour* CurveColour() const;
+    void setCurveColour(IfcColour* v);
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 1: return IfcUtil::Argument_ENTITY; case 2: return IfcUtil::Argument_ENTITY; case 3: return IfcUtil::Argument_ENTITY; } return IfcPresentationStyle::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 1: return Type::IfcCurveFontOrScaledCurveFontSelect; case 2: return Type::IfcSizeSelect; case 3: return Type::IfcColour; } return IfcPresentationStyle::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 1: return "CurveFont"; case 2: return "CurveWidth"; case 3: return "CurveColour"; } return IfcPresentationStyle::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcCurveStyle (IfcAbstractEntityPtr e);
-    IfcCurveStyle (boost::optional< IfcLabel > v1_Name, boost::optional< IfcCurveFontOrScaledCurveFontSelect > v2_CurveFont, boost::optional< IfcSizeSelect > v3_CurveWidth, boost::optional< IfcColour > v4_CurveColour);
-    typedef IfcCurveStyle* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcCurveStyle > > list;
-    typedef IfcTemplatedEntityList< IfcCurveStyle >::it it;
+    IfcCurveStyle (IfcAbstractEntity* e);
+    IfcCurveStyle (boost::optional< std::string > v1_Name, IfcCurveFontOrScaledCurveFontSelect* v2_CurveFont, IfcSizeSelect* v3_CurveWidth, IfcColour* v4_CurveColour);
+    typedef IfcTemplatedEntityList< IfcCurveStyle > list;
 };
 /// IfcDerivedProfileDef defines the profile by transformation from the parent profile. The transformation is given by a two dimensional transformation operator. Transformation includes translation, rotation, mirror and scaling. The latter can be uniform or non uniform. The derived profiles may be used to define swept surfaces, swept area solids or sectioned spines.
 /// 
@@ -12460,60 +13457,57 @@ class IfcCurveStyle : public IfcPresentationStyle {
 class IfcDerivedProfileDef : public IfcProfileDef {
 public:
     /// The parent profile provides the origin of the transformation.
-    IfcProfileDef* ParentProfile();
+    IfcProfileDef* ParentProfile() const;
     void setParentProfile(IfcProfileDef* v);
     /// Transformation operator applied to the parent profile.
-    IfcCartesianTransformationOperator2D* Operator();
+    IfcCartesianTransformationOperator2D* Operator() const;
     void setOperator(IfcCartesianTransformationOperator2D* v);
     /// Whether the optional attribute Label is defined for this IfcDerivedProfileDef
-    bool hasLabel();
+    bool hasLabel() const;
     /// The name by which the transformation may be referred to. The actual meaning of the name has to be defined in the context of applications.
-    IfcLabel Label();
-    void setLabel(IfcLabel v);
+    std::string Label() const;
+    void setLabel(std::string v);
     virtual unsigned int getArgumentCount() const { return 5; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 2: return IfcUtil::Argument_ENTITY; case 3: return IfcUtil::Argument_ENTITY; case 4: return IfcUtil::Argument_STRING; } return IfcProfileDef::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 2: return Type::IfcProfileDef; case 3: return Type::IfcCartesianTransformationOperator2D; case 4: return Type::IfcLabel; } return IfcProfileDef::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 2: return "ParentProfile"; case 3: return "Operator"; case 4: return "Label"; } return IfcProfileDef::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcDerivedProfileDef (IfcAbstractEntityPtr e);
-    IfcDerivedProfileDef (IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< IfcLabel > v2_ProfileName, IfcProfileDef* v3_ParentProfile, IfcCartesianTransformationOperator2D* v4_Operator, boost::optional< IfcLabel > v5_Label);
-    typedef IfcDerivedProfileDef* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcDerivedProfileDef > > list;
-    typedef IfcTemplatedEntityList< IfcDerivedProfileDef >::it it;
+    IfcDerivedProfileDef (IfcAbstractEntity* e);
+    IfcDerivedProfileDef (IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< std::string > v2_ProfileName, IfcProfileDef* v3_ParentProfile, IfcCartesianTransformationOperator2D* v4_Operator, boost::optional< std::string > v5_Label);
+    typedef IfcTemplatedEntityList< IfcDerivedProfileDef > list;
 };
 
 class IfcDimensionCalloutRelationship : public IfcDraughtingCalloutRelationship {
 public:
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcDraughtingCalloutRelationship::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcDraughtingCalloutRelationship::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcDraughtingCalloutRelationship::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcDimensionCalloutRelationship (IfcAbstractEntityPtr e);
-    IfcDimensionCalloutRelationship (boost::optional< IfcLabel > v1_Name, boost::optional< IfcText > v2_Description, IfcDraughtingCallout* v3_RelatingDraughtingCallout, IfcDraughtingCallout* v4_RelatedDraughtingCallout);
-    typedef IfcDimensionCalloutRelationship* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcDimensionCalloutRelationship > > list;
-    typedef IfcTemplatedEntityList< IfcDimensionCalloutRelationship >::it it;
+    IfcDimensionCalloutRelationship (IfcAbstractEntity* e);
+    IfcDimensionCalloutRelationship (boost::optional< std::string > v1_Name, boost::optional< std::string > v2_Description, IfcDraughtingCallout* v3_RelatingDraughtingCallout, IfcDraughtingCallout* v4_RelatedDraughtingCallout);
+    typedef IfcTemplatedEntityList< IfcDimensionCalloutRelationship > list;
 };
 
 class IfcDimensionPair : public IfcDraughtingCalloutRelationship {
 public:
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcDraughtingCalloutRelationship::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcDraughtingCalloutRelationship::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcDraughtingCalloutRelationship::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcDimensionPair (IfcAbstractEntityPtr e);
-    IfcDimensionPair (boost::optional< IfcLabel > v1_Name, boost::optional< IfcText > v2_Description, IfcDraughtingCallout* v3_RelatingDraughtingCallout, IfcDraughtingCallout* v4_RelatedDraughtingCallout);
-    typedef IfcDimensionPair* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcDimensionPair > > list;
-    typedef IfcTemplatedEntityList< IfcDimensionPair >::it it;
+    IfcDimensionPair (IfcAbstractEntity* e);
+    IfcDimensionPair (boost::optional< std::string > v1_Name, boost::optional< std::string > v2_Description, IfcDraughtingCallout* v3_RelatingDraughtingCallout, IfcDraughtingCallout* v4_RelatedDraughtingCallout);
+    typedef IfcTemplatedEntityList< IfcDimensionPair > list;
 };
 /// An IfcDocumentReference is a reference 
 /// to the location of a document. The reference is given by a system 
@@ -12530,17 +13524,16 @@ class IfcDocumentReference : public IfcExternalReference {
 public:
     virtual unsigned int getArgumentCount() const { return 3; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcExternalReference::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcExternalReference::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcExternalReference::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcDocumentInformation > > ReferenceToDocument(); // INVERSE IfcDocumentInformation::DocumentReferences
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcDocumentInformation >::ptr ReferenceToDocument() const; // INVERSE IfcDocumentInformation::DocumentReferences
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcDocumentReference (IfcAbstractEntityPtr e);
-    IfcDocumentReference (boost::optional< IfcLabel > v1_Location, boost::optional< IfcIdentifier > v2_ItemReference, boost::optional< IfcLabel > v3_Name);
-    typedef IfcDocumentReference* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcDocumentReference > > list;
-    typedef IfcTemplatedEntityList< IfcDocumentReference >::it it;
+    IfcDocumentReference (IfcAbstractEntity* e);
+    IfcDocumentReference (boost::optional< std::string > v1_Location, boost::optional< std::string > v2_ItemReference, boost::optional< std::string > v3_Name);
+    typedef IfcTemplatedEntityList< IfcDocumentReference > list;
 };
 /// The draughting pre defined text font is a pre defined text font for the purpose to identify a font by name. Allowable names are:
 /// 
@@ -12556,16 +13549,15 @@ class IfcDraughtingPreDefinedTextFont : public IfcPreDefinedTextFont {
 public:
     virtual unsigned int getArgumentCount() const { return 1; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcPreDefinedTextFont::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcPreDefinedTextFont::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcPreDefinedTextFont::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcDraughtingPreDefinedTextFont (IfcAbstractEntityPtr e);
-    IfcDraughtingPreDefinedTextFont (IfcLabel v1_Name);
-    typedef IfcDraughtingPreDefinedTextFont* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcDraughtingPreDefinedTextFont > > list;
-    typedef IfcTemplatedEntityList< IfcDraughtingPreDefinedTextFont >::it it;
+    IfcDraughtingPreDefinedTextFont (IfcAbstractEntity* e);
+    IfcDraughtingPreDefinedTextFont (std::string v1_Name);
+    typedef IfcTemplatedEntityList< IfcDraughtingPreDefinedTextFont > list;
 };
 /// Definition from ISO/CD 10303-42:1992: An edge is the
 /// topological construct corresponding to the connection of two
@@ -12619,23 +13611,22 @@ class IfcDraughtingPreDefinedTextFont : public IfcPreDefinedTextFont {
 class IfcEdge : public IfcTopologicalRepresentationItem {
 public:
     /// Start point (vertex) of the edge.
-    IfcVertex* EdgeStart();
+    IfcVertex* EdgeStart() const;
     void setEdgeStart(IfcVertex* v);
     /// End point (vertex) of the edge. The same vertex can be used for both EdgeStart and EdgeEnd.
-    IfcVertex* EdgeEnd();
+    IfcVertex* EdgeEnd() const;
     void setEdgeEnd(IfcVertex* v);
     virtual unsigned int getArgumentCount() const { return 2; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY; case 1: return IfcUtil::Argument_ENTITY; } return IfcTopologicalRepresentationItem::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcVertex; case 1: return Type::IfcVertex; } return IfcTopologicalRepresentationItem::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "EdgeStart"; case 1: return "EdgeEnd"; } return IfcTopologicalRepresentationItem::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcEdge (IfcAbstractEntityPtr e);
+    IfcEdge (IfcAbstractEntity* e);
     IfcEdge (IfcVertex* v1_EdgeStart, IfcVertex* v2_EdgeEnd);
-    typedef IfcEdge* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcEdge > > list;
-    typedef IfcTemplatedEntityList< IfcEdge >::it it;
+    typedef IfcTemplatedEntityList< IfcEdge > list;
 };
 /// Definition from ISO/CD 10303-42:1992: An edge curve is
 /// a special subtype of edge which has its geometry fully defined.
@@ -12673,23 +13664,22 @@ class IfcEdge : public IfcTopologicalRepresentationItem {
 class IfcEdgeCurve : public IfcEdge {
 public:
     /// The curve which defines the shape and spatial location of the edge. This curve may be unbounded and is implicitly trimmed by the vertices of the edge; this defines the edge domain. Multiple edges can reference the same curve.
-    IfcCurve* EdgeGeometry();
+    IfcCurve* EdgeGeometry() const;
     void setEdgeGeometry(IfcCurve* v);
     /// This logical flag indicates whether (TRUE), or not (FALSE) the senses of the edge and the curve defining the edge geometry are the same. The sense of an edge is from the edge start vertex to the edge end vertex; the sense of a curve is in the direction of increasing parameter.
-    bool SameSense();
+    bool SameSense() const;
     void setSameSense(bool v);
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 2: return IfcUtil::Argument_ENTITY; case 3: return IfcUtil::Argument_BOOL; } return IfcEdge::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 2: return Type::IfcCurve; case 3: return Type::UNDEFINED; } return IfcEdge::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 2: return "EdgeGeometry"; case 3: return "SameSense"; } return IfcEdge::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcEdgeCurve (IfcAbstractEntityPtr e);
+    IfcEdgeCurve (IfcAbstractEntity* e);
     IfcEdgeCurve (IfcVertex* v1_EdgeStart, IfcVertex* v2_EdgeEnd, IfcCurve* v3_EdgeGeometry, bool v4_SameSense);
-    typedef IfcEdgeCurve* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcEdgeCurve > > list;
-    typedef IfcTemplatedEntityList< IfcEdgeCurve >::it it;
+    typedef IfcTemplatedEntityList< IfcEdgeCurve > list;
 };
 /// The IfcExtendedMaterialProperties assign a set of
 /// defined material properties to associated material definitions.
@@ -12728,26 +13718,25 @@ class IfcEdgeCurve : public IfcEdge {
 /// General Energy Calculation Properties
 class IfcExtendedMaterialProperties : public IfcMaterialProperties {
 public:
-    SHARED_PTR< IfcTemplatedEntityList< IfcProperty > > ExtendedProperties();
-    void setExtendedProperties(SHARED_PTR< IfcTemplatedEntityList< IfcProperty > > v);
+    IfcTemplatedEntityList< IfcProperty >::ptr ExtendedProperties() const;
+    void setExtendedProperties(IfcTemplatedEntityList< IfcProperty >::ptr v);
     /// Whether the optional attribute Description is defined for this IfcExtendedMaterialProperties
-    bool hasDescription();
-    IfcText Description();
-    void setDescription(IfcText v);
-    IfcLabel Name();
-    void setName(IfcLabel v);
+    bool hasDescription() const;
+    std::string Description() const;
+    void setDescription(std::string v);
+    std::string Name() const;
+    void setName(std::string v);
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 1: return IfcUtil::Argument_ENTITY_LIST; case 2: return IfcUtil::Argument_STRING; case 3: return IfcUtil::Argument_STRING; } return IfcMaterialProperties::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 1: return Type::IfcProperty; case 2: return Type::IfcText; case 3: return Type::IfcLabel; } return IfcMaterialProperties::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 1: return "ExtendedProperties"; case 2: return "Description"; case 3: return "Name"; } return IfcMaterialProperties::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcExtendedMaterialProperties (IfcAbstractEntityPtr e);
-    IfcExtendedMaterialProperties (IfcMaterial* v1_Material, SHARED_PTR< IfcTemplatedEntityList< IfcProperty > > v2_ExtendedProperties, boost::optional< IfcText > v3_Description, IfcLabel v4_Name);
-    typedef IfcExtendedMaterialProperties* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcExtendedMaterialProperties > > list;
-    typedef IfcTemplatedEntityList< IfcExtendedMaterialProperties >::it it;
+    IfcExtendedMaterialProperties (IfcAbstractEntity* e);
+    IfcExtendedMaterialProperties (IfcMaterial* v1_Material, IfcTemplatedEntityList< IfcProperty >::ptr v2_ExtendedProperties, boost::optional< std::string > v3_Description, std::string v4_Name);
+    typedef IfcTemplatedEntityList< IfcExtendedMaterialProperties > list;
 };
 /// Definition from ISO/CD 10303-42:1992: A face is a topological
 ///   entity of dimensionality 2 corresponding to the intuitive notion of a piece of
@@ -12796,20 +13785,19 @@ class IfcExtendedMaterialProperties : public IfcMaterialProperties {
 class IfcFace : public IfcTopologicalRepresentationItem {
 public:
     /// Boundaries of the face.
-    SHARED_PTR< IfcTemplatedEntityList< IfcFaceBound > > Bounds();
-    void setBounds(SHARED_PTR< IfcTemplatedEntityList< IfcFaceBound > > v);
+    IfcTemplatedEntityList< IfcFaceBound >::ptr Bounds() const;
+    void setBounds(IfcTemplatedEntityList< IfcFaceBound >::ptr v);
     virtual unsigned int getArgumentCount() const { return 1; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY_LIST; } return IfcTopologicalRepresentationItem::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcFaceBound; } return IfcTopologicalRepresentationItem::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Bounds"; } return IfcTopologicalRepresentationItem::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcFace (IfcAbstractEntityPtr e);
-    IfcFace (SHARED_PTR< IfcTemplatedEntityList< IfcFaceBound > > v1_Bounds);
-    typedef IfcFace* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcFace > > list;
-    typedef IfcTemplatedEntityList< IfcFace >::it it;
+    IfcFace (IfcAbstractEntity* e);
+    IfcFace (IfcTemplatedEntityList< IfcFaceBound >::ptr v1_Bounds);
+    typedef IfcTemplatedEntityList< IfcFace > list;
 };
 /// Definition from ISO/CD 10303-42:1992: A face bound is a loop which is intended to be used for bounding a face.  
 /// 
@@ -12819,23 +13807,22 @@ class IfcFace : public IfcTopologicalRepresentationItem {
 class IfcFaceBound : public IfcTopologicalRepresentationItem {
 public:
     /// The loop which will be used as a face boundary.
-    IfcLoop* Bound();
+    IfcLoop* Bound() const;
     void setBound(IfcLoop* v);
     /// This indicated whether (TRUE) or not (FALSE) the loop has the same sense when used to bound the face as when first defined. If sense is FALSE the senses of all its component oriented edges are implicitly reversed when used in the face.
-    bool Orientation();
+    bool Orientation() const;
     void setOrientation(bool v);
     virtual unsigned int getArgumentCount() const { return 2; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY; case 1: return IfcUtil::Argument_BOOL; } return IfcTopologicalRepresentationItem::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcLoop; case 1: return Type::UNDEFINED; } return IfcTopologicalRepresentationItem::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Bound"; case 1: return "Orientation"; } return IfcTopologicalRepresentationItem::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcFaceBound (IfcAbstractEntityPtr e);
+    IfcFaceBound (IfcAbstractEntity* e);
     IfcFaceBound (IfcLoop* v1_Bound, bool v2_Orientation);
-    typedef IfcFaceBound* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcFaceBound > > list;
-    typedef IfcTemplatedEntityList< IfcFaceBound >::it it;
+    typedef IfcTemplatedEntityList< IfcFaceBound > list;
 };
 /// Definition from ISO/CD 10303-42:1992: A face outer bound is a special subtype of face bound which carries the additional semantics of defining an outer boundary on the face. No more than one boundary of a face shall be of this type.  
 /// 
@@ -12846,16 +13833,15 @@ class IfcFaceOuterBound : public IfcFaceBound {
 public:
     virtual unsigned int getArgumentCount() const { return 2; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcFaceBound::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcFaceBound::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcFaceBound::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcFaceOuterBound (IfcAbstractEntityPtr e);
+    IfcFaceOuterBound (IfcAbstractEntity* e);
     IfcFaceOuterBound (IfcLoop* v1_Bound, bool v2_Orientation);
-    typedef IfcFaceOuterBound* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcFaceOuterBound > > list;
-    typedef IfcTemplatedEntityList< IfcFaceOuterBound >::it it;
+    typedef IfcTemplatedEntityList< IfcFaceOuterBound > list;
 };
 /// Definition from ISO/CD 10303-42:1992: A face surface
 ///   (IfcFaceSurface) is a subtype of face in which the geometry is defined by an
@@ -12896,23 +13882,22 @@ class IfcFaceOuterBound : public IfcFaceBound {
 class IfcFaceSurface : public IfcFace {
 public:
     /// The surface which defines the internal shape of the face. This surface may be unbounded. The domain of the face is defined by this surface and the bounding loops in the inherited attribute SELF\FaceBounds.
-    IfcSurface* FaceSurface();
+    IfcSurface* FaceSurface() const;
     void setFaceSurface(IfcSurface* v);
     /// This flag indicates whether the sense of the surface normal agrees with (TRUE), or opposes (FALSE), the sense of the topological normal to the face.
-    bool SameSense();
+    bool SameSense() const;
     void setSameSense(bool v);
     virtual unsigned int getArgumentCount() const { return 3; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 1: return IfcUtil::Argument_ENTITY; case 2: return IfcUtil::Argument_BOOL; } return IfcFace::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 1: return Type::IfcSurface; case 2: return Type::UNDEFINED; } return IfcFace::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 1: return "FaceSurface"; case 2: return "SameSense"; } return IfcFace::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcFaceSurface (IfcAbstractEntityPtr e);
-    IfcFaceSurface (SHARED_PTR< IfcTemplatedEntityList< IfcFaceBound > > v1_Bounds, IfcSurface* v2_FaceSurface, bool v3_SameSense);
-    typedef IfcFaceSurface* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcFaceSurface > > list;
-    typedef IfcTemplatedEntityList< IfcFaceSurface >::it it;
+    IfcFaceSurface (IfcAbstractEntity* e);
+    IfcFaceSurface (IfcTemplatedEntityList< IfcFaceBound >::ptr v1_Bounds, IfcSurface* v2_FaceSurface, bool v3_SameSense);
+    typedef IfcTemplatedEntityList< IfcFaceSurface > list;
 };
 /// Definition from IAI: Defines forces at which a support or connection fails.
 /// 
@@ -12924,47 +13909,46 @@ class IfcFaceSurface : public IfcFace {
 class IfcFailureConnectionCondition : public IfcStructuralConnectionCondition {
 public:
     /// Whether the optional attribute TensionFailureX is defined for this IfcFailureConnectionCondition
-    bool hasTensionFailureX();
+    bool hasTensionFailureX() const;
     /// Tension force in x-direction leading to failure of the connection.
-    IfcForceMeasure TensionFailureX();
-    void setTensionFailureX(IfcForceMeasure v);
+    double TensionFailureX() const;
+    void setTensionFailureX(double v);
     /// Whether the optional attribute TensionFailureY is defined for this IfcFailureConnectionCondition
-    bool hasTensionFailureY();
+    bool hasTensionFailureY() const;
     /// Tension force in y-direction leading to failure of the connection.
-    IfcForceMeasure TensionFailureY();
-    void setTensionFailureY(IfcForceMeasure v);
+    double TensionFailureY() const;
+    void setTensionFailureY(double v);
     /// Whether the optional attribute TensionFailureZ is defined for this IfcFailureConnectionCondition
-    bool hasTensionFailureZ();
+    bool hasTensionFailureZ() const;
     /// Tension force in z-direction leading to failure of the connection.
-    IfcForceMeasure TensionFailureZ();
-    void setTensionFailureZ(IfcForceMeasure v);
+    double TensionFailureZ() const;
+    void setTensionFailureZ(double v);
     /// Whether the optional attribute CompressionFailureX is defined for this IfcFailureConnectionCondition
-    bool hasCompressionFailureX();
+    bool hasCompressionFailureX() const;
     /// Compression force in x-direction leading to failure of the connection.
-    IfcForceMeasure CompressionFailureX();
-    void setCompressionFailureX(IfcForceMeasure v);
+    double CompressionFailureX() const;
+    void setCompressionFailureX(double v);
     /// Whether the optional attribute CompressionFailureY is defined for this IfcFailureConnectionCondition
-    bool hasCompressionFailureY();
+    bool hasCompressionFailureY() const;
     /// Compression force in y-direction leading to failure of the connection.
-    IfcForceMeasure CompressionFailureY();
-    void setCompressionFailureY(IfcForceMeasure v);
+    double CompressionFailureY() const;
+    void setCompressionFailureY(double v);
     /// Whether the optional attribute CompressionFailureZ is defined for this IfcFailureConnectionCondition
-    bool hasCompressionFailureZ();
+    bool hasCompressionFailureZ() const;
     /// Compression force in z-direction leading to failure of the connection.
-    IfcForceMeasure CompressionFailureZ();
-    void setCompressionFailureZ(IfcForceMeasure v);
+    double CompressionFailureZ() const;
+    void setCompressionFailureZ(double v);
     virtual unsigned int getArgumentCount() const { return 7; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 1: return IfcUtil::Argument_DOUBLE; case 2: return IfcUtil::Argument_DOUBLE; case 3: return IfcUtil::Argument_DOUBLE; case 4: return IfcUtil::Argument_DOUBLE; case 5: return IfcUtil::Argument_DOUBLE; case 6: return IfcUtil::Argument_DOUBLE; } return IfcStructuralConnectionCondition::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 1: return Type::IfcForceMeasure; case 2: return Type::IfcForceMeasure; case 3: return Type::IfcForceMeasure; case 4: return Type::IfcForceMeasure; case 5: return Type::IfcForceMeasure; case 6: return Type::IfcForceMeasure; } return IfcStructuralConnectionCondition::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 1: return "TensionFailureX"; case 2: return "TensionFailureY"; case 3: return "TensionFailureZ"; case 4: return "CompressionFailureX"; case 5: return "CompressionFailureY"; case 6: return "CompressionFailureZ"; } return IfcStructuralConnectionCondition::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcFailureConnectionCondition (IfcAbstractEntityPtr e);
-    IfcFailureConnectionCondition (boost::optional< IfcLabel > v1_Name, boost::optional< IfcForceMeasure > v2_TensionFailureX, boost::optional< IfcForceMeasure > v3_TensionFailureY, boost::optional< IfcForceMeasure > v4_TensionFailureZ, boost::optional< IfcForceMeasure > v5_CompressionFailureX, boost::optional< IfcForceMeasure > v6_CompressionFailureY, boost::optional< IfcForceMeasure > v7_CompressionFailureZ);
-    typedef IfcFailureConnectionCondition* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcFailureConnectionCondition > > list;
-    typedef IfcTemplatedEntityList< IfcFailureConnectionCondition >::it it;
+    IfcFailureConnectionCondition (IfcAbstractEntity* e);
+    IfcFailureConnectionCondition (boost::optional< std::string > v1_Name, boost::optional< double > v2_TensionFailureX, boost::optional< double > v3_TensionFailureY, boost::optional< double > v4_TensionFailureZ, boost::optional< double > v5_CompressionFailureX, boost::optional< double > v6_CompressionFailureY, boost::optional< double > v7_CompressionFailureZ);
+    typedef IfcTemplatedEntityList< IfcFailureConnectionCondition > list;
 };
 /// Definition from ISO/CD 10303-46:1992: The style for filling visible curve segments, annotation fill areas or surfaces with tiles or hatches.
 /// 
@@ -13003,116 +13987,112 @@ class IfcFailureConnectionCondition : public IfcStructuralConnectionCondition {
 class IfcFillAreaStyle : public IfcPresentationStyle {
 public:
     /// The set of fill area styles to use in presenting visible curve segments, annotation fill areas or surfaces.
-    SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > FillStyles();
-    void setFillStyles(SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > v);
+    IfcEntityList::ptr FillStyles() const;
+    void setFillStyles(IfcEntityList::ptr v);
     virtual unsigned int getArgumentCount() const { return 2; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 1: return IfcUtil::Argument_ENTITY_LIST; } return IfcPresentationStyle::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 1: return Type::IfcFillStyleSelect; } return IfcPresentationStyle::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 1: return "FillStyles"; } return IfcPresentationStyle::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcFillAreaStyle (IfcAbstractEntityPtr e);
-    IfcFillAreaStyle (boost::optional< IfcLabel > v1_Name, IfcEntities v2_FillStyles);
-    typedef IfcFillAreaStyle* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcFillAreaStyle > > list;
-    typedef IfcTemplatedEntityList< IfcFillAreaStyle >::it it;
+    IfcFillAreaStyle (IfcAbstractEntity* e);
+    IfcFillAreaStyle (boost::optional< std::string > v1_Name, IfcEntityList::ptr v2_FillStyles);
+    typedef IfcTemplatedEntityList< IfcFillAreaStyle > list;
 };
 
 class IfcFuelProperties : public IfcMaterialProperties {
 public:
     /// Whether the optional attribute CombustionTemperature is defined for this IfcFuelProperties
-    bool hasCombustionTemperature();
-    IfcThermodynamicTemperatureMeasure CombustionTemperature();
-    void setCombustionTemperature(IfcThermodynamicTemperatureMeasure v);
+    bool hasCombustionTemperature() const;
+    double CombustionTemperature() const;
+    void setCombustionTemperature(double v);
     /// Whether the optional attribute CarbonContent is defined for this IfcFuelProperties
-    bool hasCarbonContent();
-    IfcPositiveRatioMeasure CarbonContent();
-    void setCarbonContent(IfcPositiveRatioMeasure v);
+    bool hasCarbonContent() const;
+    double CarbonContent() const;
+    void setCarbonContent(double v);
     /// Whether the optional attribute LowerHeatingValue is defined for this IfcFuelProperties
-    bool hasLowerHeatingValue();
-    IfcHeatingValueMeasure LowerHeatingValue();
-    void setLowerHeatingValue(IfcHeatingValueMeasure v);
+    bool hasLowerHeatingValue() const;
+    double LowerHeatingValue() const;
+    void setLowerHeatingValue(double v);
     /// Whether the optional attribute HigherHeatingValue is defined for this IfcFuelProperties
-    bool hasHigherHeatingValue();
-    IfcHeatingValueMeasure HigherHeatingValue();
-    void setHigherHeatingValue(IfcHeatingValueMeasure v);
+    bool hasHigherHeatingValue() const;
+    double HigherHeatingValue() const;
+    void setHigherHeatingValue(double v);
     virtual unsigned int getArgumentCount() const { return 5; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 1: return IfcUtil::Argument_DOUBLE; case 2: return IfcUtil::Argument_DOUBLE; case 3: return IfcUtil::Argument_DOUBLE; case 4: return IfcUtil::Argument_DOUBLE; } return IfcMaterialProperties::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 1: return Type::IfcThermodynamicTemperatureMeasure; case 2: return Type::IfcPositiveRatioMeasure; case 3: return Type::IfcHeatingValueMeasure; case 4: return Type::IfcHeatingValueMeasure; } return IfcMaterialProperties::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 1: return "CombustionTemperature"; case 2: return "CarbonContent"; case 3: return "LowerHeatingValue"; case 4: return "HigherHeatingValue"; } return IfcMaterialProperties::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcFuelProperties (IfcAbstractEntityPtr e);
-    IfcFuelProperties (IfcMaterial* v1_Material, boost::optional< IfcThermodynamicTemperatureMeasure > v2_CombustionTemperature, boost::optional< IfcPositiveRatioMeasure > v3_CarbonContent, boost::optional< IfcHeatingValueMeasure > v4_LowerHeatingValue, boost::optional< IfcHeatingValueMeasure > v5_HigherHeatingValue);
-    typedef IfcFuelProperties* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcFuelProperties > > list;
-    typedef IfcTemplatedEntityList< IfcFuelProperties >::it it;
+    IfcFuelProperties (IfcAbstractEntity* e);
+    IfcFuelProperties (IfcMaterial* v1_Material, boost::optional< double > v2_CombustionTemperature, boost::optional< double > v3_CarbonContent, boost::optional< double > v4_LowerHeatingValue, boost::optional< double > v5_HigherHeatingValue);
+    typedef IfcTemplatedEntityList< IfcFuelProperties > list;
 };
 
 class IfcGeneralMaterialProperties : public IfcMaterialProperties {
 public:
     /// Whether the optional attribute MolecularWeight is defined for this IfcGeneralMaterialProperties
-    bool hasMolecularWeight();
-    IfcMolecularWeightMeasure MolecularWeight();
-    void setMolecularWeight(IfcMolecularWeightMeasure v);
+    bool hasMolecularWeight() const;
+    double MolecularWeight() const;
+    void setMolecularWeight(double v);
     /// Whether the optional attribute Porosity is defined for this IfcGeneralMaterialProperties
-    bool hasPorosity();
-    IfcNormalisedRatioMeasure Porosity();
-    void setPorosity(IfcNormalisedRatioMeasure v);
+    bool hasPorosity() const;
+    double Porosity() const;
+    void setPorosity(double v);
     /// Whether the optional attribute MassDensity is defined for this IfcGeneralMaterialProperties
-    bool hasMassDensity();
-    IfcMassDensityMeasure MassDensity();
-    void setMassDensity(IfcMassDensityMeasure v);
+    bool hasMassDensity() const;
+    double MassDensity() const;
+    void setMassDensity(double v);
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 1: return IfcUtil::Argument_DOUBLE; case 2: return IfcUtil::Argument_DOUBLE; case 3: return IfcUtil::Argument_DOUBLE; } return IfcMaterialProperties::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 1: return Type::IfcMolecularWeightMeasure; case 2: return Type::IfcNormalisedRatioMeasure; case 3: return Type::IfcMassDensityMeasure; } return IfcMaterialProperties::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 1: return "MolecularWeight"; case 2: return "Porosity"; case 3: return "MassDensity"; } return IfcMaterialProperties::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcGeneralMaterialProperties (IfcAbstractEntityPtr e);
-    IfcGeneralMaterialProperties (IfcMaterial* v1_Material, boost::optional< IfcMolecularWeightMeasure > v2_MolecularWeight, boost::optional< IfcNormalisedRatioMeasure > v3_Porosity, boost::optional< IfcMassDensityMeasure > v4_MassDensity);
-    typedef IfcGeneralMaterialProperties* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcGeneralMaterialProperties > > list;
-    typedef IfcTemplatedEntityList< IfcGeneralMaterialProperties >::it it;
+    IfcGeneralMaterialProperties (IfcAbstractEntity* e);
+    IfcGeneralMaterialProperties (IfcMaterial* v1_Material, boost::optional< double > v2_MolecularWeight, boost::optional< double > v3_Porosity, boost::optional< double > v4_MassDensity);
+    typedef IfcTemplatedEntityList< IfcGeneralMaterialProperties > list;
 };
 
 class IfcGeneralProfileProperties : public IfcProfileProperties {
 public:
     /// Whether the optional attribute PhysicalWeight is defined for this IfcGeneralProfileProperties
-    bool hasPhysicalWeight();
-    IfcMassPerLengthMeasure PhysicalWeight();
-    void setPhysicalWeight(IfcMassPerLengthMeasure v);
+    bool hasPhysicalWeight() const;
+    double PhysicalWeight() const;
+    void setPhysicalWeight(double v);
     /// Whether the optional attribute Perimeter is defined for this IfcGeneralProfileProperties
-    bool hasPerimeter();
-    IfcPositiveLengthMeasure Perimeter();
-    void setPerimeter(IfcPositiveLengthMeasure v);
+    bool hasPerimeter() const;
+    double Perimeter() const;
+    void setPerimeter(double v);
     /// Whether the optional attribute MinimumPlateThickness is defined for this IfcGeneralProfileProperties
-    bool hasMinimumPlateThickness();
-    IfcPositiveLengthMeasure MinimumPlateThickness();
-    void setMinimumPlateThickness(IfcPositiveLengthMeasure v);
+    bool hasMinimumPlateThickness() const;
+    double MinimumPlateThickness() const;
+    void setMinimumPlateThickness(double v);
     /// Whether the optional attribute MaximumPlateThickness is defined for this IfcGeneralProfileProperties
-    bool hasMaximumPlateThickness();
-    IfcPositiveLengthMeasure MaximumPlateThickness();
-    void setMaximumPlateThickness(IfcPositiveLengthMeasure v);
+    bool hasMaximumPlateThickness() const;
+    double MaximumPlateThickness() const;
+    void setMaximumPlateThickness(double v);
     /// Whether the optional attribute CrossSectionArea is defined for this IfcGeneralProfileProperties
-    bool hasCrossSectionArea();
-    IfcAreaMeasure CrossSectionArea();
-    void setCrossSectionArea(IfcAreaMeasure v);
+    bool hasCrossSectionArea() const;
+    double CrossSectionArea() const;
+    void setCrossSectionArea(double v);
     virtual unsigned int getArgumentCount() const { return 7; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 2: return IfcUtil::Argument_DOUBLE; case 3: return IfcUtil::Argument_DOUBLE; case 4: return IfcUtil::Argument_DOUBLE; case 5: return IfcUtil::Argument_DOUBLE; case 6: return IfcUtil::Argument_DOUBLE; } return IfcProfileProperties::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 2: return Type::IfcMassPerLengthMeasure; case 3: return Type::IfcPositiveLengthMeasure; case 4: return Type::IfcPositiveLengthMeasure; case 5: return Type::IfcPositiveLengthMeasure; case 6: return Type::IfcAreaMeasure; } return IfcProfileProperties::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 2: return "PhysicalWeight"; case 3: return "Perimeter"; case 4: return "MinimumPlateThickness"; case 5: return "MaximumPlateThickness"; case 6: return "CrossSectionArea"; } return IfcProfileProperties::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcGeneralProfileProperties (IfcAbstractEntityPtr e);
-    IfcGeneralProfileProperties (boost::optional< IfcLabel > v1_ProfileName, IfcProfileDef* v2_ProfileDefinition, boost::optional< IfcMassPerLengthMeasure > v3_PhysicalWeight, boost::optional< IfcPositiveLengthMeasure > v4_Perimeter, boost::optional< IfcPositiveLengthMeasure > v5_MinimumPlateThickness, boost::optional< IfcPositiveLengthMeasure > v6_MaximumPlateThickness, boost::optional< IfcAreaMeasure > v7_CrossSectionArea);
-    typedef IfcGeneralProfileProperties* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcGeneralProfileProperties > > list;
-    typedef IfcTemplatedEntityList< IfcGeneralProfileProperties >::it it;
+    IfcGeneralProfileProperties (IfcAbstractEntity* e);
+    IfcGeneralProfileProperties (boost::optional< std::string > v1_ProfileName, IfcProfileDef* v2_ProfileDefinition, boost::optional< double > v3_PhysicalWeight, boost::optional< double > v4_Perimeter, boost::optional< double > v5_MinimumPlateThickness, boost::optional< double > v6_MaximumPlateThickness, boost::optional< double > v7_CrossSectionArea);
+    typedef IfcTemplatedEntityList< IfcGeneralProfileProperties > list;
 };
 /// Definition from ISO/CD 10303-42:1992: A geometric
 /// representation context is a representation context in which the
@@ -13164,36 +14144,35 @@ class IfcGeneralProfileProperties : public IfcProfileProperties {
 class IfcGeometricRepresentationContext : public IfcRepresentationContext {
 public:
     /// The integer dimension count of the coordinate space modeled in a geometric representation context.
-    IfcDimensionCount CoordinateSpaceDimension();
-    void setCoordinateSpaceDimension(IfcDimensionCount v);
+    int CoordinateSpaceDimension() const;
+    void setCoordinateSpaceDimension(int v);
     /// Whether the optional attribute Precision is defined for this IfcGeometricRepresentationContext
-    bool hasPrecision();
+    bool hasPrecision() const;
     /// Value of the model precision for geometric models. It is a double value (REAL), typically in 1E-5 to 1E-8 range, that indicates the tolerance under which two given points are still assumed to be identical. The value can be used e.g. to sets the maximum distance from an edge curve to the underlying face surface in brep models.
-    double Precision();
+    double Precision() const;
     void setPrecision(double v);
     /// Establishment of the engineering coordinate system (often referred to as the world coordinate system in CAD) for all representation contexts used by the project. 
     /// 
     /// Note  it can be used to provide better numeric stability if the placement of the building(s) is far away from the origin. In most cases however it would be set to origin: (0.,0.,0.) and directions x(1.,0.,0.), y(0.,1.,0.), z(0.,0.,1.).
-    IfcAxis2Placement WorldCoordinateSystem();
-    void setWorldCoordinateSystem(IfcAxis2Placement v);
+    IfcAxis2Placement* WorldCoordinateSystem() const;
+    void setWorldCoordinateSystem(IfcAxis2Placement* v);
     /// Whether the optional attribute TrueNorth is defined for this IfcGeometricRepresentationContext
-    bool hasTrueNorth();
+    bool hasTrueNorth() const;
     /// Direction of the true north, or geographic northing direction, relative to the underlying project coordinate system. It is given by a 2 dimensional direction within the xy-plane of the project coordinate system. If not resent, it defaults to 0. 1. - i.e. the positive Y axis of the project coordinate system equals the geographic northing direction.
-    IfcDirection* TrueNorth();
+    IfcDirection* TrueNorth() const;
     void setTrueNorth(IfcDirection* v);
     virtual unsigned int getArgumentCount() const { return 6; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 2: return IfcUtil::Argument_INT; case 3: return IfcUtil::Argument_DOUBLE; case 4: return IfcUtil::Argument_ENTITY; case 5: return IfcUtil::Argument_ENTITY; } return IfcRepresentationContext::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 2: return Type::IfcDimensionCount; case 3: return Type::UNDEFINED; case 4: return Type::IfcAxis2Placement; case 5: return Type::IfcDirection; } return IfcRepresentationContext::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 2: return "CoordinateSpaceDimension"; case 3: return "Precision"; case 4: return "WorldCoordinateSystem"; case 5: return "TrueNorth"; } return IfcRepresentationContext::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcGeometricRepresentationSubContext > > HasSubContexts(); // INVERSE IfcGeometricRepresentationSubContext::ParentContext
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcGeometricRepresentationSubContext >::ptr HasSubContexts() const; // INVERSE IfcGeometricRepresentationSubContext::ParentContext
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcGeometricRepresentationContext (IfcAbstractEntityPtr e);
-    IfcGeometricRepresentationContext (boost::optional< IfcLabel > v1_ContextIdentifier, boost::optional< IfcLabel > v2_ContextType, IfcDimensionCount v3_CoordinateSpaceDimension, boost::optional< double > v4_Precision, IfcAxis2Placement v5_WorldCoordinateSystem, IfcDirection* v6_TrueNorth);
-    typedef IfcGeometricRepresentationContext* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcGeometricRepresentationContext > > list;
-    typedef IfcTemplatedEntityList< IfcGeometricRepresentationContext >::it it;
+    IfcGeometricRepresentationContext (IfcAbstractEntity* e);
+    IfcGeometricRepresentationContext (boost::optional< std::string > v1_ContextIdentifier, boost::optional< std::string > v2_ContextType, int v3_CoordinateSpaceDimension, boost::optional< double > v4_Precision, IfcAxis2Placement* v5_WorldCoordinateSystem, IfcDirection* v6_TrueNorth);
+    typedef IfcTemplatedEntityList< IfcGeometricRepresentationContext > list;
 };
 /// Definition from ISO/CD 10303-43:1992: An geometric representation item is a representation item that has the additional meaning of having geometric position or orientation or both. This meaning is present by virtue of:  
 /// 
@@ -13218,16 +14197,15 @@ class IfcGeometricRepresentationItem : public IfcRepresentationItem {
 public:
     virtual unsigned int getArgumentCount() const { return 0; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcRepresentationItem::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcRepresentationItem::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcRepresentationItem::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcGeometricRepresentationItem (IfcAbstractEntityPtr e);
+    IfcGeometricRepresentationItem (IfcAbstractEntity* e);
     IfcGeometricRepresentationItem ();
-    typedef IfcGeometricRepresentationItem* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcGeometricRepresentationItem > > list;
-    typedef IfcTemplatedEntityList< IfcGeometricRepresentationItem >::it it;
+    typedef IfcTemplatedEntityList< IfcGeometricRepresentationItem > list;
 };
 /// IfcGeometricRepresentationSubContext defines the context that applies to several shape representations of a product being a sub context, sharing the WorldCoordinateSystem, CoordinateSpaceDimension, Precision and TrueNorth attributes with the parent IfcGeometricRepresentationContext.
 /// 
@@ -13245,10 +14223,10 @@ class IfcGeometricRepresentationItem : public IfcRepresentationItem {
 class IfcGeometricRepresentationSubContext : public IfcGeometricRepresentationContext {
 public:
     /// Parent context from which the sub context derives its world coordinate system, precision, space coordinate dimension and true north.
-    IfcGeometricRepresentationContext* ParentContext();
+    IfcGeometricRepresentationContext* ParentContext() const;
     void setParentContext(IfcGeometricRepresentationContext* v);
     /// Whether the optional attribute TargetScale is defined for this IfcGeometricRepresentationSubContext
-    bool hasTargetScale();
+    bool hasTargetScale() const;
     /// The target plot scale of the representation 
     /// to which this representation context applies.
     ///   Scale indicates the target plot scale for
@@ -13260,28 +14238,27 @@ class IfcGeometricRepresentationSubContext : public IfcGeometricRepresentationCo
     /// 
     /// Note: Scale 1:100 (given as 0.01 within TargetScale)
     /// is bigger then 1:200 (given as 0.005 within TargetScale).
-    IfcPositiveRatioMeasure TargetScale();
-    void setTargetScale(IfcPositiveRatioMeasure v);
+    double TargetScale() const;
+    void setTargetScale(double v);
     /// Target view of the representation to which this representation context applies.
-    IfcGeometricProjectionEnum::IfcGeometricProjectionEnum TargetView();
+    IfcGeometricProjectionEnum::IfcGeometricProjectionEnum TargetView() const;
     void setTargetView(IfcGeometricProjectionEnum::IfcGeometricProjectionEnum v);
     /// Whether the optional attribute UserDefinedTargetView is defined for this IfcGeometricRepresentationSubContext
-    bool hasUserDefinedTargetView();
+    bool hasUserDefinedTargetView() const;
     /// User defined target view, this attribute value shall be given, if the TargetView attribute is set to USERDEFINED.
-    IfcLabel UserDefinedTargetView();
-    void setUserDefinedTargetView(IfcLabel v);
+    std::string UserDefinedTargetView() const;
+    void setUserDefinedTargetView(std::string v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 6: return IfcUtil::Argument_ENTITY; case 7: return IfcUtil::Argument_DOUBLE; case 8: return IfcUtil::Argument_ENUMERATION; case 9: return IfcUtil::Argument_STRING; } return IfcGeometricRepresentationContext::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 6: return Type::IfcGeometricRepresentationContext; case 7: return Type::IfcPositiveRatioMeasure; case 8: return Type::IfcGeometricProjectionEnum; case 9: return Type::IfcLabel; } return IfcGeometricRepresentationContext::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 6: return "ParentContext"; case 7: return "TargetScale"; case 8: return "TargetView"; case 9: return "UserDefinedTargetView"; } return IfcGeometricRepresentationContext::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcGeometricRepresentationSubContext (IfcAbstractEntityPtr e);
-    IfcGeometricRepresentationSubContext (boost::optional< IfcLabel > v1_ContextIdentifier, boost::optional< IfcLabel > v2_ContextType, IfcGeometricRepresentationContext* v7_ParentContext, boost::optional< IfcPositiveRatioMeasure > v8_TargetScale, IfcGeometricProjectionEnum::IfcGeometricProjectionEnum v9_TargetView, boost::optional< IfcLabel > v10_UserDefinedTargetView);
-    typedef IfcGeometricRepresentationSubContext* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcGeometricRepresentationSubContext > > list;
-    typedef IfcTemplatedEntityList< IfcGeometricRepresentationSubContext >::it it;
+    IfcGeometricRepresentationSubContext (IfcAbstractEntity* e);
+    IfcGeometricRepresentationSubContext (boost::optional< std::string > v1_ContextIdentifier, boost::optional< std::string > v2_ContextType, IfcGeometricRepresentationContext* v7_ParentContext, boost::optional< double > v8_TargetScale, IfcGeometricProjectionEnum::IfcGeometricProjectionEnum v9_TargetView, boost::optional< std::string > v10_UserDefinedTargetView);
+    typedef IfcTemplatedEntityList< IfcGeometricRepresentationSubContext > list;
 };
 /// Definition from ISO/CD 10303-42:1992: This entity is intended for the transfer of models when a topological structure is not available. 
 /// 
@@ -13293,20 +14270,19 @@ class IfcGeometricRepresentationSubContext : public IfcGeometricRepresentationCo
 class IfcGeometricSet : public IfcGeometricRepresentationItem {
 public:
     /// The geometric elements which make up the geometric set, these may be points, curves or surfaces; but are required to be of the same coordinate space dimensionality.
-    SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > Elements();
-    void setElements(SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > v);
+    IfcEntityList::ptr Elements() const;
+    void setElements(IfcEntityList::ptr v);
     virtual unsigned int getArgumentCount() const { return 1; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY_LIST; } return IfcGeometricRepresentationItem::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcGeometricSetSelect; } return IfcGeometricRepresentationItem::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Elements"; } return IfcGeometricRepresentationItem::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcGeometricSet (IfcAbstractEntityPtr e);
-    IfcGeometricSet (IfcEntities v1_Elements);
-    typedef IfcGeometricSet* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcGeometricSet > > list;
-    typedef IfcTemplatedEntityList< IfcGeometricSet >::it it;
+    IfcGeometricSet (IfcAbstractEntity* e);
+    IfcGeometricSet (IfcEntityList::ptr v1_Elements);
+    typedef IfcTemplatedEntityList< IfcGeometricSet > list;
 };
 /// IfcGridPlacement provides a specialization of IfcObjectPlacement in which
 /// the placement and axis direction of the object coordinate system is defined by a reference to the design grid as defined in IfcGrid.
@@ -13356,27 +14332,26 @@ class IfcGeometricSet : public IfcGeometricRepresentationItem {
 class IfcGridPlacement : public IfcObjectPlacement {
 public:
     /// Placement of the object coordinate system defined by the intersection of two grid axes.
-    IfcVirtualGridIntersection* PlacementLocation();
+    IfcVirtualGridIntersection* PlacementLocation() const;
     void setPlacementLocation(IfcVirtualGridIntersection* v);
     /// Whether the optional attribute PlacementRefDirection is defined for this IfcGridPlacement
-    bool hasPlacementRefDirection();
+    bool hasPlacementRefDirection() const;
     /// Reference to either an explicit direction, or a second grid axis intersection, which defines the orientation of the grid placement.
     /// 
     /// IFC2x4 CHANGE  The select of an explict direction has been added.
-    IfcVirtualGridIntersection* PlacementRefDirection();
+    IfcVirtualGridIntersection* PlacementRefDirection() const;
     void setPlacementRefDirection(IfcVirtualGridIntersection* v);
     virtual unsigned int getArgumentCount() const { return 2; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY; case 1: return IfcUtil::Argument_ENTITY; } return IfcObjectPlacement::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcVirtualGridIntersection; case 1: return Type::IfcVirtualGridIntersection; } return IfcObjectPlacement::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "PlacementLocation"; case 1: return "PlacementRefDirection"; } return IfcObjectPlacement::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcGridPlacement (IfcAbstractEntityPtr e);
+    IfcGridPlacement (IfcAbstractEntity* e);
     IfcGridPlacement (IfcVirtualGridIntersection* v1_PlacementLocation, IfcVirtualGridIntersection* v2_PlacementRefDirection);
-    typedef IfcGridPlacement* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcGridPlacement > > list;
-    typedef IfcTemplatedEntityList< IfcGridPlacement >::it it;
+    typedef IfcTemplatedEntityList< IfcGridPlacement > list;
 };
 /// Definition from ISO/CD 10303-42:1992: A half space solid is defined by the half space which is the regular subset of the domain which lies on one side of an unbounded surface. The side of the surface which is in the half space is determined by the surface normal and the agreement flag. If the agreement flag is TRUE, then the subset is the one the normal points away from. If the agreement flag is FALSE, then the subset is the one the normal points into. For a valid half space solid the surface shall divide the domain into exactly two subsets. Also, within the domain the surface shall be manifold and all surface normals shall point into the same subset.  
 /// 
@@ -13396,59 +14371,57 @@ class IfcGridPlacement : public IfcObjectPlacement {
 class IfcHalfSpaceSolid : public IfcGeometricRepresentationItem {
 public:
     /// Surface defining side of half space.
-    IfcSurface* BaseSurface();
+    IfcSurface* BaseSurface() const;
     void setBaseSurface(IfcSurface* v);
     /// The agreement flag is TRUE if the normal to the BaseSurface points away from the material of the IfcHalfSpaceSolid. Otherwise it is FALSE.
-    bool AgreementFlag();
+    bool AgreementFlag() const;
     void setAgreementFlag(bool v);
     virtual unsigned int getArgumentCount() const { return 2; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY; case 1: return IfcUtil::Argument_BOOL; } return IfcGeometricRepresentationItem::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcSurface; case 1: return Type::UNDEFINED; } return IfcGeometricRepresentationItem::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "BaseSurface"; case 1: return "AgreementFlag"; } return IfcGeometricRepresentationItem::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcHalfSpaceSolid (IfcAbstractEntityPtr e);
+    IfcHalfSpaceSolid (IfcAbstractEntity* e);
     IfcHalfSpaceSolid (IfcSurface* v1_BaseSurface, bool v2_AgreementFlag);
-    typedef IfcHalfSpaceSolid* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcHalfSpaceSolid > > list;
-    typedef IfcTemplatedEntityList< IfcHalfSpaceSolid >::it it;
+    typedef IfcTemplatedEntityList< IfcHalfSpaceSolid > list;
 };
 
 class IfcHygroscopicMaterialProperties : public IfcMaterialProperties {
 public:
     /// Whether the optional attribute UpperVaporResistanceFactor is defined for this IfcHygroscopicMaterialProperties
-    bool hasUpperVaporResistanceFactor();
-    IfcPositiveRatioMeasure UpperVaporResistanceFactor();
-    void setUpperVaporResistanceFactor(IfcPositiveRatioMeasure v);
+    bool hasUpperVaporResistanceFactor() const;
+    double UpperVaporResistanceFactor() const;
+    void setUpperVaporResistanceFactor(double v);
     /// Whether the optional attribute LowerVaporResistanceFactor is defined for this IfcHygroscopicMaterialProperties
-    bool hasLowerVaporResistanceFactor();
-    IfcPositiveRatioMeasure LowerVaporResistanceFactor();
-    void setLowerVaporResistanceFactor(IfcPositiveRatioMeasure v);
+    bool hasLowerVaporResistanceFactor() const;
+    double LowerVaporResistanceFactor() const;
+    void setLowerVaporResistanceFactor(double v);
     /// Whether the optional attribute IsothermalMoistureCapacity is defined for this IfcHygroscopicMaterialProperties
-    bool hasIsothermalMoistureCapacity();
-    IfcIsothermalMoistureCapacityMeasure IsothermalMoistureCapacity();
-    void setIsothermalMoistureCapacity(IfcIsothermalMoistureCapacityMeasure v);
+    bool hasIsothermalMoistureCapacity() const;
+    double IsothermalMoistureCapacity() const;
+    void setIsothermalMoistureCapacity(double v);
     /// Whether the optional attribute VaporPermeability is defined for this IfcHygroscopicMaterialProperties
-    bool hasVaporPermeability();
-    IfcVaporPermeabilityMeasure VaporPermeability();
-    void setVaporPermeability(IfcVaporPermeabilityMeasure v);
+    bool hasVaporPermeability() const;
+    double VaporPermeability() const;
+    void setVaporPermeability(double v);
     /// Whether the optional attribute MoistureDiffusivity is defined for this IfcHygroscopicMaterialProperties
-    bool hasMoistureDiffusivity();
-    IfcMoistureDiffusivityMeasure MoistureDiffusivity();
-    void setMoistureDiffusivity(IfcMoistureDiffusivityMeasure v);
+    bool hasMoistureDiffusivity() const;
+    double MoistureDiffusivity() const;
+    void setMoistureDiffusivity(double v);
     virtual unsigned int getArgumentCount() const { return 6; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 1: return IfcUtil::Argument_DOUBLE; case 2: return IfcUtil::Argument_DOUBLE; case 3: return IfcUtil::Argument_DOUBLE; case 4: return IfcUtil::Argument_DOUBLE; case 5: return IfcUtil::Argument_DOUBLE; } return IfcMaterialProperties::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 1: return Type::IfcPositiveRatioMeasure; case 2: return Type::IfcPositiveRatioMeasure; case 3: return Type::IfcIsothermalMoistureCapacityMeasure; case 4: return Type::IfcVaporPermeabilityMeasure; case 5: return Type::IfcMoistureDiffusivityMeasure; } return IfcMaterialProperties::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 1: return "UpperVaporResistanceFactor"; case 2: return "LowerVaporResistanceFactor"; case 3: return "IsothermalMoistureCapacity"; case 4: return "VaporPermeability"; case 5: return "MoistureDiffusivity"; } return IfcMaterialProperties::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcHygroscopicMaterialProperties (IfcAbstractEntityPtr e);
-    IfcHygroscopicMaterialProperties (IfcMaterial* v1_Material, boost::optional< IfcPositiveRatioMeasure > v2_UpperVaporResistanceFactor, boost::optional< IfcPositiveRatioMeasure > v3_LowerVaporResistanceFactor, boost::optional< IfcIsothermalMoistureCapacityMeasure > v4_IsothermalMoistureCapacity, boost::optional< IfcVaporPermeabilityMeasure > v5_VaporPermeability, boost::optional< IfcMoistureDiffusivityMeasure > v6_MoistureDiffusivity);
-    typedef IfcHygroscopicMaterialProperties* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcHygroscopicMaterialProperties > > list;
-    typedef IfcTemplatedEntityList< IfcHygroscopicMaterialProperties >::it it;
+    IfcHygroscopicMaterialProperties (IfcAbstractEntity* e);
+    IfcHygroscopicMaterialProperties (IfcMaterial* v1_Material, boost::optional< double > v2_UpperVaporResistanceFactor, boost::optional< double > v3_LowerVaporResistanceFactor, boost::optional< double > v4_IsothermalMoistureCapacity, boost::optional< double > v5_VaporPermeability, boost::optional< double > v6_MoistureDiffusivity);
+    typedef IfcTemplatedEntityList< IfcHygroscopicMaterialProperties > list;
 };
 /// An IfcImageTexture provides a 2-dimensional texture that can be applied to a surface of an geometric item and that provides lighting parameters of a surface onto which it is mapped. The texture is provided as an image file at an external location for which an URL is provided.
 /// 
@@ -13487,20 +14460,19 @@ class IfcHygroscopicMaterialProperties : public IfcMaterialProperties {
 /// HISTORY  New entity in Release IFC2x2.
 class IfcImageTexture : public IfcSurfaceTexture {
 public:
-    IfcIdentifier UrlReference();
-    void setUrlReference(IfcIdentifier v);
+    std::string UrlReference() const;
+    void setUrlReference(std::string v);
     virtual unsigned int getArgumentCount() const { return 5; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 4: return IfcUtil::Argument_STRING; } return IfcSurfaceTexture::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 4: return Type::IfcIdentifier; } return IfcSurfaceTexture::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 4: return "UrlReference"; } return IfcSurfaceTexture::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcImageTexture (IfcAbstractEntityPtr e);
-    IfcImageTexture (bool v1_RepeatS, bool v2_RepeatT, IfcSurfaceTextureEnum::IfcSurfaceTextureEnum v3_TextureType, IfcCartesianTransformationOperator2D* v4_TextureTransform, IfcIdentifier v5_UrlReference);
-    typedef IfcImageTexture* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcImageTexture > > list;
-    typedef IfcTemplatedEntityList< IfcImageTexture >::it it;
+    IfcImageTexture (IfcAbstractEntity* e);
+    IfcImageTexture (bool v1_RepeatS, bool v2_RepeatT, IfcSurfaceTextureEnum::IfcSurfaceTextureEnum v3_TextureType, IfcCartesianTransformationOperator2D* v4_TextureTransform, std::string v5_UrlReference);
+    typedef IfcTemplatedEntityList< IfcImageTexture > list;
 };
 /// In an irregular time series, unpredictable bursts of data arrive at unspecified points in time, or most time stamps cannot be characterized by a repeating pattern.
 /// 
@@ -13510,20 +14482,19 @@ class IfcImageTexture : public IfcSurfaceTexture {
 class IfcIrregularTimeSeries : public IfcTimeSeries {
 public:
     /// The collection of time series values.
-    SHARED_PTR< IfcTemplatedEntityList< IfcIrregularTimeSeriesValue > > Values();
-    void setValues(SHARED_PTR< IfcTemplatedEntityList< IfcIrregularTimeSeriesValue > > v);
+    IfcTemplatedEntityList< IfcIrregularTimeSeriesValue >::ptr Values() const;
+    void setValues(IfcTemplatedEntityList< IfcIrregularTimeSeriesValue >::ptr v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_ENTITY_LIST; } return IfcTimeSeries::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcIrregularTimeSeriesValue; } return IfcTimeSeries::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "Values"; } return IfcTimeSeries::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcIrregularTimeSeries (IfcAbstractEntityPtr e);
-    IfcIrregularTimeSeries (IfcLabel v1_Name, boost::optional< IfcText > v2_Description, IfcDateTimeSelect v3_StartTime, IfcDateTimeSelect v4_EndTime, IfcTimeSeriesDataTypeEnum::IfcTimeSeriesDataTypeEnum v5_TimeSeriesDataType, IfcDataOriginEnum::IfcDataOriginEnum v6_DataOrigin, boost::optional< IfcLabel > v7_UserDefinedDataOrigin, boost::optional< IfcUnit > v8_Unit, SHARED_PTR< IfcTemplatedEntityList< IfcIrregularTimeSeriesValue > > v9_Values);
-    typedef IfcIrregularTimeSeries* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcIrregularTimeSeries > > list;
-    typedef IfcTemplatedEntityList< IfcIrregularTimeSeries >::it it;
+    IfcIrregularTimeSeries (IfcAbstractEntity* e);
+    IfcIrregularTimeSeries (std::string v1_Name, boost::optional< std::string > v2_Description, IfcDateTimeSelect* v3_StartTime, IfcDateTimeSelect* v4_EndTime, IfcTimeSeriesDataTypeEnum::IfcTimeSeriesDataTypeEnum v5_TimeSeriesDataType, IfcDataOriginEnum::IfcDataOriginEnum v6_DataOrigin, boost::optional< std::string > v7_UserDefinedDataOrigin, IfcUnit* v8_Unit, IfcTemplatedEntityList< IfcIrregularTimeSeriesValue >::ptr v9_Values);
+    typedef IfcTemplatedEntityList< IfcIrregularTimeSeries > list;
 };
 /// Definition from ISO/CD 10303-46:1992: The light source entity is determined by the reflectance specified in the surface style rendering. Lighting is applied on a surface by surface basis: no interactions between surfaces such as shadows or reflections are defined. 
 /// 
@@ -13535,36 +14506,35 @@ class IfcIrregularTimeSeries : public IfcTimeSeries {
 class IfcLightSource : public IfcGeometricRepresentationItem {
 public:
     /// Whether the optional attribute Name is defined for this IfcLightSource
-    bool hasName();
+    bool hasName() const;
     /// The name given to the light source in presentation.
-    IfcLabel Name();
-    void setName(IfcLabel v);
+    std::string Name() const;
+    void setName(std::string v);
     /// Definition from ISO/CD 10303-46:1992: Based on the current lighting model, the colour of the light to be used for shading.
     /// Definition from VRML97 - ISO/IEC 14772-1:1997: The color field specifies the spectral color properties of both the direct and ambient light emission as an RGB value.
-    IfcColourRgb* LightColour();
+    IfcColourRgb* LightColour() const;
     void setLightColour(IfcColourRgb* v);
     /// Whether the optional attribute AmbientIntensity is defined for this IfcLightSource
-    bool hasAmbientIntensity();
+    bool hasAmbientIntensity() const;
     /// Definition from VRML97 - ISO/IEC 14772-1:1997: The ambientIntensity specifies the intensity of the ambient emission from the light. Light intensity may range from 0.0 (no light emission) to 1.0 (full intensity).
-    IfcNormalisedRatioMeasure AmbientIntensity();
-    void setAmbientIntensity(IfcNormalisedRatioMeasure v);
+    double AmbientIntensity() const;
+    void setAmbientIntensity(double v);
     /// Whether the optional attribute Intensity is defined for this IfcLightSource
-    bool hasIntensity();
+    bool hasIntensity() const;
     /// Definition from VRML97 - ISO/IEC 14772-1:1997: The intensity field specifies the brightness of the direct emission from the ligth. Light intensity may range from 0.0 (no light emission) to 1.0 (full intensity).
-    IfcNormalisedRatioMeasure Intensity();
-    void setIntensity(IfcNormalisedRatioMeasure v);
+    double Intensity() const;
+    void setIntensity(double v);
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_STRING; case 1: return IfcUtil::Argument_ENTITY; case 2: return IfcUtil::Argument_DOUBLE; case 3: return IfcUtil::Argument_DOUBLE; } return IfcGeometricRepresentationItem::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcLabel; case 1: return Type::IfcColourRgb; case 2: return Type::IfcNormalisedRatioMeasure; case 3: return Type::IfcNormalisedRatioMeasure; } return IfcGeometricRepresentationItem::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Name"; case 1: return "LightColour"; case 2: return "AmbientIntensity"; case 3: return "Intensity"; } return IfcGeometricRepresentationItem::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcLightSource (IfcAbstractEntityPtr e);
-    IfcLightSource (boost::optional< IfcLabel > v1_Name, IfcColourRgb* v2_LightColour, boost::optional< IfcNormalisedRatioMeasure > v3_AmbientIntensity, boost::optional< IfcNormalisedRatioMeasure > v4_Intensity);
-    typedef IfcLightSource* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcLightSource > > list;
-    typedef IfcTemplatedEntityList< IfcLightSource >::it it;
+    IfcLightSource (IfcAbstractEntity* e);
+    IfcLightSource (boost::optional< std::string > v1_Name, IfcColourRgb* v2_LightColour, boost::optional< double > v3_AmbientIntensity, boost::optional< double > v4_Intensity);
+    typedef IfcTemplatedEntityList< IfcLightSource > list;
 };
 /// Definition from ISO/CD 10303-46:1992: The light source ambient entity is a subtype of light source. It lights a surface independent of the surface's orientation and position. 
 /// 
@@ -13577,16 +14547,15 @@ class IfcLightSourceAmbient : public IfcLightSource {
 public:
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcLightSource::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcLightSource::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcLightSource::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcLightSourceAmbient (IfcAbstractEntityPtr e);
-    IfcLightSourceAmbient (boost::optional< IfcLabel > v1_Name, IfcColourRgb* v2_LightColour, boost::optional< IfcNormalisedRatioMeasure > v3_AmbientIntensity, boost::optional< IfcNormalisedRatioMeasure > v4_Intensity);
-    typedef IfcLightSourceAmbient* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcLightSourceAmbient > > list;
-    typedef IfcTemplatedEntityList< IfcLightSourceAmbient >::it it;
+    IfcLightSourceAmbient (IfcAbstractEntity* e);
+    IfcLightSourceAmbient (boost::optional< std::string > v1_Name, IfcColourRgb* v2_LightColour, boost::optional< double > v3_AmbientIntensity, boost::optional< double > v4_Intensity);
+    typedef IfcTemplatedEntityList< IfcLightSourceAmbient > list;
 };
 /// Definition from ISO/CD 10303-46:1992: The light source directional is a subtype of light source. This entity has a light source direction. With a conceptual origin at infinity, all the rays of the light are parallel to this direction. This kind of light source lights a surface based on the surface's orientation, but not position. 
 /// 
@@ -13601,20 +14570,19 @@ class IfcLightSourceDirectional : public IfcLightSource {
 public:
     /// Definition from ISO/CD 10303-46:1992: This direction is the direction of the light source.
     /// Definition from VRML97 - ISO/IEC 14772-1:1997: The direction field specifies the direction vector of the illumination emanating from the light source in the local coordinate system. Light is emitted along parallel rays from an infinite distance away.
-    IfcDirection* Orientation();
+    IfcDirection* Orientation() const;
     void setOrientation(IfcDirection* v);
     virtual unsigned int getArgumentCount() const { return 5; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 4: return IfcUtil::Argument_ENTITY; } return IfcLightSource::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 4: return Type::IfcDirection; } return IfcLightSource::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 4: return "Orientation"; } return IfcLightSource::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcLightSourceDirectional (IfcAbstractEntityPtr e);
-    IfcLightSourceDirectional (boost::optional< IfcLabel > v1_Name, IfcColourRgb* v2_LightColour, boost::optional< IfcNormalisedRatioMeasure > v3_AmbientIntensity, boost::optional< IfcNormalisedRatioMeasure > v4_Intensity, IfcDirection* v5_Orientation);
-    typedef IfcLightSourceDirectional* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcLightSourceDirectional > > list;
-    typedef IfcTemplatedEntityList< IfcLightSourceDirectional >::it it;
+    IfcLightSourceDirectional (IfcAbstractEntity* e);
+    IfcLightSourceDirectional (boost::optional< std::string > v1_Name, IfcColourRgb* v2_LightColour, boost::optional< double > v3_AmbientIntensity, boost::optional< double > v4_Intensity, IfcDirection* v5_Orientation);
+    typedef IfcTemplatedEntityList< IfcLightSourceDirectional > list;
 };
 /// IfcLightSourceGoniometric defines a light source for which exact lighting data is available. It specifies the type of a light emitter, defines the position and orientation of a light distribution curve and the data concerning lamp and photometric information. 
 /// 
@@ -13626,37 +14594,36 @@ class IfcLightSourceDirectional : public IfcLightSource {
 class IfcLightSourceGoniometric : public IfcLightSource {
 public:
     /// The position of the light source. It is used to orientate the light distribution curves.
-    IfcAxis2Placement3D* Position();
+    IfcAxis2Placement3D* Position() const;
     void setPosition(IfcAxis2Placement3D* v);
     /// Whether the optional attribute ColourAppearance is defined for this IfcLightSourceGoniometric
-    bool hasColourAppearance();
+    bool hasColourAppearance() const;
     /// Artificial light sources are classified in terms of their color appearance. To the human eye they all appear to be white; the difference can only be detected by direct comparison. Visual performance is not directly affected by differences in color appearance.
-    IfcColourRgb* ColourAppearance();
+    IfcColourRgb* ColourAppearance() const;
     void setColourAppearance(IfcColourRgb* v);
     /// The color temperature of any source of radiation is defined as the temperature (in Kelvin) of a black-body or Planckian radiator whose radiation has the same chromaticity as the source of radiation. Often the values are only approximate color temperatures as the black-body radiator cannot emit radiation of every chromaticity value. The color temperatures of the commonest artificial light sources range from less than 3000K (warm white) to 4000K (intermediate) and over 5000K (daylight).
-    IfcThermodynamicTemperatureMeasure ColourTemperature();
-    void setColourTemperature(IfcThermodynamicTemperatureMeasure v);
+    double ColourTemperature() const;
+    void setColourTemperature(double v);
     /// Luminous flux is a photometric measure of radiant flux, i.e. the volume of light emitted from a light source. Luminous flux is measured either for the interior as a whole or for a part of the interior (partial luminous flux for a solid angle). All other photometric parameters are derivatives of luminous flux. Luminous flux is measured in lumens (lm). The luminous flux is given as a nominal value for each lamp.
-    IfcLuminousFluxMeasure LuminousFlux();
-    void setLuminousFlux(IfcLuminousFluxMeasure v);
+    double LuminousFlux() const;
+    void setLuminousFlux(double v);
     /// Identifies the types of light emitter from which the type required may be set.
-    IfcLightEmissionSourceEnum::IfcLightEmissionSourceEnum LightEmissionSource();
+    IfcLightEmissionSourceEnum::IfcLightEmissionSourceEnum LightEmissionSource() const;
     void setLightEmissionSource(IfcLightEmissionSourceEnum::IfcLightEmissionSourceEnum v);
     /// The data source from which light distribution data is obtained.
-    IfcLightDistributionDataSourceSelect LightDistributionDataSource();
-    void setLightDistributionDataSource(IfcLightDistributionDataSourceSelect v);
+    IfcLightDistributionDataSourceSelect* LightDistributionDataSource() const;
+    void setLightDistributionDataSource(IfcLightDistributionDataSourceSelect* v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 4: return IfcUtil::Argument_ENTITY; case 5: return IfcUtil::Argument_ENTITY; case 6: return IfcUtil::Argument_DOUBLE; case 7: return IfcUtil::Argument_DOUBLE; case 8: return IfcUtil::Argument_ENUMERATION; case 9: return IfcUtil::Argument_ENTITY; } return IfcLightSource::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 4: return Type::IfcAxis2Placement3D; case 5: return Type::IfcColourRgb; case 6: return Type::IfcThermodynamicTemperatureMeasure; case 7: return Type::IfcLuminousFluxMeasure; case 8: return Type::IfcLightEmissionSourceEnum; case 9: return Type::IfcLightDistributionDataSourceSelect; } return IfcLightSource::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 4: return "Position"; case 5: return "ColourAppearance"; case 6: return "ColourTemperature"; case 7: return "LuminousFlux"; case 8: return "LightEmissionSource"; case 9: return "LightDistributionDataSource"; } return IfcLightSource::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcLightSourceGoniometric (IfcAbstractEntityPtr e);
-    IfcLightSourceGoniometric (boost::optional< IfcLabel > v1_Name, IfcColourRgb* v2_LightColour, boost::optional< IfcNormalisedRatioMeasure > v3_AmbientIntensity, boost::optional< IfcNormalisedRatioMeasure > v4_Intensity, IfcAxis2Placement3D* v5_Position, IfcColourRgb* v6_ColourAppearance, IfcThermodynamicTemperatureMeasure v7_ColourTemperature, IfcLuminousFluxMeasure v8_LuminousFlux, IfcLightEmissionSourceEnum::IfcLightEmissionSourceEnum v9_LightEmissionSource, IfcLightDistributionDataSourceSelect v10_LightDistributionDataSource);
-    typedef IfcLightSourceGoniometric* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcLightSourceGoniometric > > list;
-    typedef IfcTemplatedEntityList< IfcLightSourceGoniometric >::it it;
+    IfcLightSourceGoniometric (IfcAbstractEntity* e);
+    IfcLightSourceGoniometric (boost::optional< std::string > v1_Name, IfcColourRgb* v2_LightColour, boost::optional< double > v3_AmbientIntensity, boost::optional< double > v4_Intensity, IfcAxis2Placement3D* v5_Position, IfcColourRgb* v6_ColourAppearance, double v7_ColourTemperature, double v8_LuminousFlux, IfcLightEmissionSourceEnum::IfcLightEmissionSourceEnum v9_LightEmissionSource, IfcLightDistributionDataSourceSelect* v10_LightDistributionDataSource);
+    typedef IfcTemplatedEntityList< IfcLightSourceGoniometric > list;
 };
 /// Definition from ISO/CD 10303-46:1992: The light source positional entity is a subtype of light source. This entity has a light source position and attenuation coefficients. A positional light source affects a surface based on the surface's orientation and position. 
 /// 
@@ -13677,33 +14644,32 @@ class IfcLightSourcePositional : public IfcLightSource {
 public:
     /// Definition from ISO/CD 10303-46:1992: The Cartesian point indicates the position of the light source.
     /// Definition from VRML97 - ISO/IEC 14772-1:1997: A Point light node illuminates geometry within radius of its location.
-    IfcCartesianPoint* Position();
+    IfcCartesianPoint* Position() const;
     void setPosition(IfcCartesianPoint* v);
     /// Definition from IAI: The maximum distance from the light source for a surface still to be illuminated.
     /// Definition from VRML97 - ISO/IEC 14772-1:1997: A Point light node illuminates geometry within radius of its location.
-    IfcPositiveLengthMeasure Radius();
-    void setRadius(IfcPositiveLengthMeasure v);
+    double Radius() const;
+    void setRadius(double v);
     /// Definition from ISO/CD 10303-46:1992: This real indicates the value of the attenuation in the lighting equation that is constant.
-    IfcReal ConstantAttenuation();
-    void setConstantAttenuation(IfcReal v);
+    double ConstantAttenuation() const;
+    void setConstantAttenuation(double v);
     /// Definition from ISO/CD 10303-46:1992: This real indicates the value of the attenuation in the lighting equation that proportional to the distance from the light source.
-    IfcReal DistanceAttenuation();
-    void setDistanceAttenuation(IfcReal v);
+    double DistanceAttenuation() const;
+    void setDistanceAttenuation(double v);
     /// Definition from the IAI: This real indicates the value of the attenuation in the lighting equation that proportional to the square value of the distance from the light source.
-    IfcReal QuadricAttenuation();
-    void setQuadricAttenuation(IfcReal v);
+    double QuadricAttenuation() const;
+    void setQuadricAttenuation(double v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 4: return IfcUtil::Argument_ENTITY; case 5: return IfcUtil::Argument_DOUBLE; case 6: return IfcUtil::Argument_DOUBLE; case 7: return IfcUtil::Argument_DOUBLE; case 8: return IfcUtil::Argument_DOUBLE; } return IfcLightSource::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 4: return Type::IfcCartesianPoint; case 5: return Type::IfcPositiveLengthMeasure; case 6: return Type::IfcReal; case 7: return Type::IfcReal; case 8: return Type::IfcReal; } return IfcLightSource::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 4: return "Position"; case 5: return "Radius"; case 6: return "ConstantAttenuation"; case 7: return "DistanceAttenuation"; case 8: return "QuadricAttenuation"; } return IfcLightSource::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcLightSourcePositional (IfcAbstractEntityPtr e);
-    IfcLightSourcePositional (boost::optional< IfcLabel > v1_Name, IfcColourRgb* v2_LightColour, boost::optional< IfcNormalisedRatioMeasure > v3_AmbientIntensity, boost::optional< IfcNormalisedRatioMeasure > v4_Intensity, IfcCartesianPoint* v5_Position, IfcPositiveLengthMeasure v6_Radius, IfcReal v7_ConstantAttenuation, IfcReal v8_DistanceAttenuation, IfcReal v9_QuadricAttenuation);
-    typedef IfcLightSourcePositional* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcLightSourcePositional > > list;
-    typedef IfcTemplatedEntityList< IfcLightSourcePositional >::it it;
+    IfcLightSourcePositional (IfcAbstractEntity* e);
+    IfcLightSourcePositional (boost::optional< std::string > v1_Name, IfcColourRgb* v2_LightColour, boost::optional< double > v3_AmbientIntensity, boost::optional< double > v4_Intensity, IfcCartesianPoint* v5_Position, double v6_Radius, double v7_ConstantAttenuation, double v8_DistanceAttenuation, double v9_QuadricAttenuation);
+    typedef IfcTemplatedEntityList< IfcLightSourcePositional > list;
 };
 /// Definition from ISO/CD 10303-46:1992: The light source spot entity is a subtype of light source. Spot light source entities have a light source colour, position, direction, attenuation coefficients, concentration exponent, and spread angle. If a point lies outside the cone of influence of a light source of this type as determined by the light source position, direction and spread angle its colour is not affected by that light source. 
 /// 
@@ -13724,33 +14690,32 @@ class IfcLightSourceSpot : public IfcLightSourcePositional {
 public:
     /// Definition from ISO/CD 10303-46:1992: This is the direction of the axis of the cone of the light source specified in the coordinate space of the representation being projected..
     /// Definition from VRML97 - ISO/IEC 14772-1:1997: The direction field specifies the direction vector of the light's central axis defined in the local coordinate system.
-    IfcDirection* Orientation();
+    IfcDirection* Orientation() const;
     void setOrientation(IfcDirection* v);
     /// Whether the optional attribute ConcentrationExponent is defined for this IfcLightSourceSpot
-    bool hasConcentrationExponent();
+    bool hasConcentrationExponent() const;
     /// Definition from ISO/CD 10303-46:1992: This real is the exponent on the cosine of the angle between the line that starts at the position of the spot light source and is in the direction of the orientation of the spot light source and a line that starts at the position of the spot light source and goes through a point on the surface being shaded.
     /// NOTE: This attribute does not exists in ISO/IEC 14772-1:1997.
-    IfcReal ConcentrationExponent();
-    void setConcentrationExponent(IfcReal v);
+    double ConcentrationExponent() const;
+    void setConcentrationExponent(double v);
     /// Definition from ISO/CD 10303-46:1992: This planar angle measure is the angle between the line that starts at the position of the spot light source and is in the direction of the spot light source and any line on the boundary of the cone of influence.
     /// Definition from VRML97 - ISO/IEC 14772-1:1997: The cutOffAngle (name of spread angle in VRML) field specifies the outer bound of the solid angle. The light source does not emit light outside of this solid angle.
-    IfcPositivePlaneAngleMeasure SpreadAngle();
-    void setSpreadAngle(IfcPositivePlaneAngleMeasure v);
+    double SpreadAngle() const;
+    void setSpreadAngle(double v);
     /// Definition from VRML97 - ISO/IEC 14772-1:1997: The beamWidth field specifies an inner solid angle in which the light source emits light at uniform full intensity. The light source's emission intensity drops off from the inner solid angle (beamWidthAngle) to the outer solid angle (spreadAngle).
-    IfcPositivePlaneAngleMeasure BeamWidthAngle();
-    void setBeamWidthAngle(IfcPositivePlaneAngleMeasure v);
+    double BeamWidthAngle() const;
+    void setBeamWidthAngle(double v);
     virtual unsigned int getArgumentCount() const { return 13; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENTITY; case 10: return IfcUtil::Argument_DOUBLE; case 11: return IfcUtil::Argument_DOUBLE; case 12: return IfcUtil::Argument_DOUBLE; } return IfcLightSourcePositional::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcDirection; case 10: return Type::IfcReal; case 11: return Type::IfcPositivePlaneAngleMeasure; case 12: return Type::IfcPositivePlaneAngleMeasure; } return IfcLightSourcePositional::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "Orientation"; case 10: return "ConcentrationExponent"; case 11: return "SpreadAngle"; case 12: return "BeamWidthAngle"; } return IfcLightSourcePositional::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcLightSourceSpot (IfcAbstractEntityPtr e);
-    IfcLightSourceSpot (boost::optional< IfcLabel > v1_Name, IfcColourRgb* v2_LightColour, boost::optional< IfcNormalisedRatioMeasure > v3_AmbientIntensity, boost::optional< IfcNormalisedRatioMeasure > v4_Intensity, IfcCartesianPoint* v5_Position, IfcPositiveLengthMeasure v6_Radius, IfcReal v7_ConstantAttenuation, IfcReal v8_DistanceAttenuation, IfcReal v9_QuadricAttenuation, IfcDirection* v10_Orientation, boost::optional< IfcReal > v11_ConcentrationExponent, IfcPositivePlaneAngleMeasure v12_SpreadAngle, IfcPositivePlaneAngleMeasure v13_BeamWidthAngle);
-    typedef IfcLightSourceSpot* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcLightSourceSpot > > list;
-    typedef IfcTemplatedEntityList< IfcLightSourceSpot >::it it;
+    IfcLightSourceSpot (IfcAbstractEntity* e);
+    IfcLightSourceSpot (boost::optional< std::string > v1_Name, IfcColourRgb* v2_LightColour, boost::optional< double > v3_AmbientIntensity, boost::optional< double > v4_Intensity, IfcCartesianPoint* v5_Position, double v6_Radius, double v7_ConstantAttenuation, double v8_DistanceAttenuation, double v9_QuadricAttenuation, IfcDirection* v10_Orientation, boost::optional< double > v11_ConcentrationExponent, double v12_SpreadAngle, double v13_BeamWidthAngle);
+    typedef IfcTemplatedEntityList< IfcLightSourceSpot > list;
 };
 /// IfcLocalPlacement defines the relative placement of a product in relation to the
 /// placement of another product or the absolute placement of a product within the geometric representation context of the project. 
@@ -13807,25 +14772,24 @@ class IfcLightSourceSpot : public IfcLightSourcePositional {
 class IfcLocalPlacement : public IfcObjectPlacement {
 public:
     /// Whether the optional attribute PlacementRelTo is defined for this IfcLocalPlacement
-    bool hasPlacementRelTo();
+    bool hasPlacementRelTo() const;
     /// Reference to Object that provides the relative placement by its local coordinate system. If it is omitted, then the local placement is given to the WCS, established by the geometric representation context.
-    IfcObjectPlacement* PlacementRelTo();
+    IfcObjectPlacement* PlacementRelTo() const;
     void setPlacementRelTo(IfcObjectPlacement* v);
     /// Geometric placement that defines the transformation from the related coordinate system into the relating. The placement can be either 2D or 3D, depending on the dimension count of the coordinate system.
-    IfcAxis2Placement RelativePlacement();
-    void setRelativePlacement(IfcAxis2Placement v);
+    IfcAxis2Placement* RelativePlacement() const;
+    void setRelativePlacement(IfcAxis2Placement* v);
     virtual unsigned int getArgumentCount() const { return 2; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY; case 1: return IfcUtil::Argument_ENTITY; } return IfcObjectPlacement::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcObjectPlacement; case 1: return Type::IfcAxis2Placement; } return IfcObjectPlacement::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "PlacementRelTo"; case 1: return "RelativePlacement"; } return IfcObjectPlacement::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcLocalPlacement (IfcAbstractEntityPtr e);
-    IfcLocalPlacement (IfcObjectPlacement* v1_PlacementRelTo, IfcAxis2Placement v2_RelativePlacement);
-    typedef IfcLocalPlacement* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcLocalPlacement > > list;
-    typedef IfcTemplatedEntityList< IfcLocalPlacement >::it it;
+    IfcLocalPlacement (IfcAbstractEntity* e);
+    IfcLocalPlacement (IfcObjectPlacement* v1_PlacementRelTo, IfcAxis2Placement* v2_RelativePlacement);
+    typedef IfcTemplatedEntityList< IfcLocalPlacement > list;
 };
 /// Definition from ISO/CD 10303-42:1992: A loop is a topological
 ///   entity constructed from a single vertex, or by stringing together connected
@@ -13857,16 +14821,15 @@ class IfcLoop : public IfcTopologicalRepresentationItem {
 public:
     virtual unsigned int getArgumentCount() const { return 0; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcTopologicalRepresentationItem::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcTopologicalRepresentationItem::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcTopologicalRepresentationItem::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcLoop (IfcAbstractEntityPtr e);
+    IfcLoop (IfcAbstractEntity* e);
     IfcLoop ();
-    typedef IfcLoop* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcLoop > > list;
-    typedef IfcTemplatedEntityList< IfcLoop >::it it;
+    typedef IfcTemplatedEntityList< IfcLoop > list;
 };
 /// Definition from ISO/CD 10303-43:1992: A mapped item is the use of an existing representation (the mapping source - mapped representation) as a representation item in a second representation. 
 /// 
@@ -13890,23 +14853,22 @@ class IfcLoop : public IfcTopologicalRepresentationItem {
 class IfcMappedItem : public IfcRepresentationItem {
 public:
     /// A representation map that is the source of the mapped item. It can be seen as a block (or cell or marco) definition.
-    IfcRepresentationMap* MappingSource();
+    IfcRepresentationMap* MappingSource() const;
     void setMappingSource(IfcRepresentationMap* v);
     /// A representation item that is the target onto which the mapping source is mapped. It is constraint to be a Cartesian transformation operator.
-    IfcCartesianTransformationOperator* MappingTarget();
+    IfcCartesianTransformationOperator* MappingTarget() const;
     void setMappingTarget(IfcCartesianTransformationOperator* v);
     virtual unsigned int getArgumentCount() const { return 2; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY; case 1: return IfcUtil::Argument_ENTITY; } return IfcRepresentationItem::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcRepresentationMap; case 1: return Type::IfcCartesianTransformationOperator; } return IfcRepresentationItem::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "MappingSource"; case 1: return "MappingTarget"; } return IfcRepresentationItem::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcMappedItem (IfcAbstractEntityPtr e);
+    IfcMappedItem (IfcAbstractEntity* e);
     IfcMappedItem (IfcRepresentationMap* v1_MappingSource, IfcCartesianTransformationOperator* v2_MappingTarget);
-    typedef IfcMappedItem* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcMappedItem > > list;
-    typedef IfcTemplatedEntityList< IfcMappedItem >::it it;
+    typedef IfcTemplatedEntityList< IfcMappedItem > list;
 };
 /// IfcMaterialDefinitionRepresentation defines presentation information relating to IfcMaterial. It allows for multiple presentations of the same material for different geometric representation contexts.
 /// 
@@ -13941,60 +14903,58 @@ class IfcMappedItem : public IfcRepresentationItem {
 class IfcMaterialDefinitionRepresentation : public IfcProductRepresentation {
 public:
     /// Reference to the material to which the representation applies.
-    IfcMaterial* RepresentedMaterial();
+    IfcMaterial* RepresentedMaterial() const;
     void setRepresentedMaterial(IfcMaterial* v);
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 3: return IfcUtil::Argument_ENTITY; } return IfcProductRepresentation::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 3: return Type::IfcMaterial; } return IfcProductRepresentation::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 3: return "RepresentedMaterial"; } return IfcProductRepresentation::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcMaterialDefinitionRepresentation (IfcAbstractEntityPtr e);
-    IfcMaterialDefinitionRepresentation (boost::optional< IfcLabel > v1_Name, boost::optional< IfcText > v2_Description, SHARED_PTR< IfcTemplatedEntityList< IfcRepresentation > > v3_Representations, IfcMaterial* v4_RepresentedMaterial);
-    typedef IfcMaterialDefinitionRepresentation* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcMaterialDefinitionRepresentation > > list;
-    typedef IfcTemplatedEntityList< IfcMaterialDefinitionRepresentation >::it it;
+    IfcMaterialDefinitionRepresentation (IfcAbstractEntity* e);
+    IfcMaterialDefinitionRepresentation (boost::optional< std::string > v1_Name, boost::optional< std::string > v2_Description, IfcTemplatedEntityList< IfcRepresentation >::ptr v3_Representations, IfcMaterial* v4_RepresentedMaterial);
+    typedef IfcTemplatedEntityList< IfcMaterialDefinitionRepresentation > list;
 };
 
 class IfcMechanicalConcreteMaterialProperties : public IfcMechanicalMaterialProperties {
 public:
     /// Whether the optional attribute CompressiveStrength is defined for this IfcMechanicalConcreteMaterialProperties
-    bool hasCompressiveStrength();
-    IfcPressureMeasure CompressiveStrength();
-    void setCompressiveStrength(IfcPressureMeasure v);
+    bool hasCompressiveStrength() const;
+    double CompressiveStrength() const;
+    void setCompressiveStrength(double v);
     /// Whether the optional attribute MaxAggregateSize is defined for this IfcMechanicalConcreteMaterialProperties
-    bool hasMaxAggregateSize();
-    IfcPositiveLengthMeasure MaxAggregateSize();
-    void setMaxAggregateSize(IfcPositiveLengthMeasure v);
+    bool hasMaxAggregateSize() const;
+    double MaxAggregateSize() const;
+    void setMaxAggregateSize(double v);
     /// Whether the optional attribute AdmixturesDescription is defined for this IfcMechanicalConcreteMaterialProperties
-    bool hasAdmixturesDescription();
-    IfcText AdmixturesDescription();
-    void setAdmixturesDescription(IfcText v);
+    bool hasAdmixturesDescription() const;
+    std::string AdmixturesDescription() const;
+    void setAdmixturesDescription(std::string v);
     /// Whether the optional attribute Workability is defined for this IfcMechanicalConcreteMaterialProperties
-    bool hasWorkability();
-    IfcText Workability();
-    void setWorkability(IfcText v);
+    bool hasWorkability() const;
+    std::string Workability() const;
+    void setWorkability(std::string v);
     /// Whether the optional attribute ProtectivePoreRatio is defined for this IfcMechanicalConcreteMaterialProperties
-    bool hasProtectivePoreRatio();
-    IfcNormalisedRatioMeasure ProtectivePoreRatio();
-    void setProtectivePoreRatio(IfcNormalisedRatioMeasure v);
+    bool hasProtectivePoreRatio() const;
+    double ProtectivePoreRatio() const;
+    void setProtectivePoreRatio(double v);
     /// Whether the optional attribute WaterImpermeability is defined for this IfcMechanicalConcreteMaterialProperties
-    bool hasWaterImpermeability();
-    IfcText WaterImpermeability();
-    void setWaterImpermeability(IfcText v);
+    bool hasWaterImpermeability() const;
+    std::string WaterImpermeability() const;
+    void setWaterImpermeability(std::string v);
     virtual unsigned int getArgumentCount() const { return 12; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 6: return IfcUtil::Argument_DOUBLE; case 7: return IfcUtil::Argument_DOUBLE; case 8: return IfcUtil::Argument_STRING; case 9: return IfcUtil::Argument_STRING; case 10: return IfcUtil::Argument_DOUBLE; case 11: return IfcUtil::Argument_STRING; } return IfcMechanicalMaterialProperties::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 6: return Type::IfcPressureMeasure; case 7: return Type::IfcPositiveLengthMeasure; case 8: return Type::IfcText; case 9: return Type::IfcText; case 10: return Type::IfcNormalisedRatioMeasure; case 11: return Type::IfcText; } return IfcMechanicalMaterialProperties::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 6: return "CompressiveStrength"; case 7: return "MaxAggregateSize"; case 8: return "AdmixturesDescription"; case 9: return "Workability"; case 10: return "ProtectivePoreRatio"; case 11: return "WaterImpermeability"; } return IfcMechanicalMaterialProperties::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcMechanicalConcreteMaterialProperties (IfcAbstractEntityPtr e);
-    IfcMechanicalConcreteMaterialProperties (IfcMaterial* v1_Material, boost::optional< IfcDynamicViscosityMeasure > v2_DynamicViscosity, boost::optional< IfcModulusOfElasticityMeasure > v3_YoungModulus, boost::optional< IfcModulusOfElasticityMeasure > v4_ShearModulus, boost::optional< IfcPositiveRatioMeasure > v5_PoissonRatio, boost::optional< IfcThermalExpansionCoefficientMeasure > v6_ThermalExpansionCoefficient, boost::optional< IfcPressureMeasure > v7_CompressiveStrength, boost::optional< IfcPositiveLengthMeasure > v8_MaxAggregateSize, boost::optional< IfcText > v9_AdmixturesDescription, boost::optional< IfcText > v10_Workability, boost::optional< IfcNormalisedRatioMeasure > v11_ProtectivePoreRatio, boost::optional< IfcText > v12_WaterImpermeability);
-    typedef IfcMechanicalConcreteMaterialProperties* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcMechanicalConcreteMaterialProperties > > list;
-    typedef IfcTemplatedEntityList< IfcMechanicalConcreteMaterialProperties >::it it;
+    IfcMechanicalConcreteMaterialProperties (IfcAbstractEntity* e);
+    IfcMechanicalConcreteMaterialProperties (IfcMaterial* v1_Material, boost::optional< double > v2_DynamicViscosity, boost::optional< double > v3_YoungModulus, boost::optional< double > v4_ShearModulus, boost::optional< double > v5_PoissonRatio, boost::optional< double > v6_ThermalExpansionCoefficient, boost::optional< double > v7_CompressiveStrength, boost::optional< double > v8_MaxAggregateSize, boost::optional< std::string > v9_AdmixturesDescription, boost::optional< std::string > v10_Workability, boost::optional< double > v11_ProtectivePoreRatio, boost::optional< std::string > v12_WaterImpermeability);
+    typedef IfcTemplatedEntityList< IfcMechanicalConcreteMaterialProperties > list;
 };
 /// An IfcObjectDefinition is the generalization of any
 /// semantically treated thing or process, either being a type or an
@@ -14050,20 +15010,19 @@ class IfcObjectDefinition : public IfcRoot {
 public:
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcRoot::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcRoot::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcRoot::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelAssigns > > HasAssignments(); // INVERSE IfcRelAssigns::RelatedObjects
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelDecomposes > > IsDecomposedBy(); // INVERSE IfcRelDecomposes::RelatingObject
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelDecomposes > > Decomposes(); // INVERSE IfcRelDecomposes::RelatedObjects
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelAssociates > > HasAssociations(); // INVERSE IfcRelAssociates::RelatedObjects
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcRelAssigns >::ptr HasAssignments() const; // INVERSE IfcRelAssigns::RelatedObjects
+    IfcTemplatedEntityList< IfcRelDecomposes >::ptr IsDecomposedBy() const; // INVERSE IfcRelDecomposes::RelatingObject
+    IfcTemplatedEntityList< IfcRelDecomposes >::ptr Decomposes() const; // INVERSE IfcRelDecomposes::RelatedObjects
+    IfcTemplatedEntityList< IfcRelAssociates >::ptr HasAssociations() const; // INVERSE IfcRelAssociates::RelatedObjects
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcObjectDefinition (IfcAbstractEntityPtr e);
-    IfcObjectDefinition (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description);
-    typedef IfcObjectDefinition* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcObjectDefinition > > list;
-    typedef IfcTemplatedEntityList< IfcObjectDefinition >::it it;
+    IfcObjectDefinition (IfcAbstractEntity* e);
+    IfcObjectDefinition (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description);
+    typedef IfcTemplatedEntityList< IfcObjectDefinition > list;
 };
 /// Definition from ISO/CD 10303-46:1992: A one time repeat factor is a vector used in the fill area style hatching and fill area style tiles entities for determining the origin of the repeated hatch line relative to the origin of the previous hatch line, Given the initial position of any hatch line, the one direction repeat factor determines two new positions according to the equation: 
 /// 
@@ -14075,20 +15034,19 @@ class IfcObjectDefinition : public IfcRoot {
 class IfcOneDirectionRepeatFactor : public IfcGeometricRepresentationItem {
 public:
     /// A vector which specifies the relative positioning of hatch lines.
-    IfcVector* RepeatFactor();
+    IfcVector* RepeatFactor() const;
     void setRepeatFactor(IfcVector* v);
     virtual unsigned int getArgumentCount() const { return 1; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY; } return IfcGeometricRepresentationItem::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcVector; } return IfcGeometricRepresentationItem::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "RepeatFactor"; } return IfcGeometricRepresentationItem::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcOneDirectionRepeatFactor (IfcAbstractEntityPtr e);
+    IfcOneDirectionRepeatFactor (IfcAbstractEntity* e);
     IfcOneDirectionRepeatFactor (IfcVector* v1_RepeatFactor);
-    typedef IfcOneDirectionRepeatFactor* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcOneDirectionRepeatFactor > > list;
-    typedef IfcTemplatedEntityList< IfcOneDirectionRepeatFactor >::it it;
+    typedef IfcTemplatedEntityList< IfcOneDirectionRepeatFactor > list;
 };
 /// Definition from ISO/CD 10303-42:1992: An open shell is a shell of
 ///   the dimensionality 2. Its domain, if present, is a finite, connected, oriented,
@@ -14153,16 +15111,15 @@ class IfcOpenShell : public IfcConnectedFaceSet {
 public:
     virtual unsigned int getArgumentCount() const { return 1; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcConnectedFaceSet::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcConnectedFaceSet::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcConnectedFaceSet::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcOpenShell (IfcAbstractEntityPtr e);
-    IfcOpenShell (SHARED_PTR< IfcTemplatedEntityList< IfcFace > > v1_CfsFaces);
-    typedef IfcOpenShell* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcOpenShell > > list;
-    typedef IfcTemplatedEntityList< IfcOpenShell >::it it;
+    IfcOpenShell (IfcAbstractEntity* e);
+    IfcOpenShell (IfcTemplatedEntityList< IfcFace >::ptr v1_CfsFaces);
+    typedef IfcTemplatedEntityList< IfcOpenShell > list;
 };
 /// Definition from ISO/CD 10303-42:1992: An oriented edge is an edge constructed from another edge and contains a BOOLEAN direction flag to indicate whether or not the orientation of the constructed edge agrees with the orientation of the original edge. Except for perhaps orientation, the oriented edge is equivalent to the original edge.  
 /// 
@@ -14174,23 +15131,22 @@ class IfcOpenShell : public IfcConnectedFaceSet {
 class IfcOrientedEdge : public IfcEdge {
 public:
     /// Edge entity used to construct this oriented edge.
-    IfcEdge* EdgeElement();
+    IfcEdge* EdgeElement() const;
     void setEdgeElement(IfcEdge* v);
     /// BOOLEAN, If TRUE the topological orientation as used coincides with the orientation from start vertex to end vertex of the edge element. If FALSE otherwise.
-    bool Orientation();
+    bool Orientation() const;
     void setOrientation(bool v);
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 2: return IfcUtil::Argument_ENTITY; case 3: return IfcUtil::Argument_BOOL; } return IfcEdge::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 2: return Type::IfcEdge; case 3: return Type::UNDEFINED; } return IfcEdge::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 2: return "EdgeElement"; case 3: return "Orientation"; } return IfcEdge::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcOrientedEdge (IfcAbstractEntityPtr e);
+    IfcOrientedEdge (IfcAbstractEntity* e);
     IfcOrientedEdge (IfcEdge* v3_EdgeElement, bool v4_Orientation);
-    typedef IfcOrientedEdge* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcOrientedEdge > > list;
-    typedef IfcTemplatedEntityList< IfcOrientedEdge >::it it;
+    typedef IfcTemplatedEntityList< IfcOrientedEdge > list;
 };
 /// The parameterized profile definition
 /// defines a 2D position coordinate system to which the parameters of the
@@ -14237,20 +15193,19 @@ class IfcOrientedEdge : public IfcEdge {
 class IfcParameterizedProfileDef : public IfcProfileDef {
 public:
     /// Position coordinate system of the parameterized profile definition. If unspecified, no translation and no rotation is applied.
-    IfcAxis2Placement2D* Position();
+    IfcAxis2Placement2D* Position() const;
     void setPosition(IfcAxis2Placement2D* v);
     virtual unsigned int getArgumentCount() const { return 3; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 2: return IfcUtil::Argument_ENTITY; } return IfcProfileDef::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 2: return Type::IfcAxis2Placement2D; } return IfcProfileDef::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 2: return "Position"; } return IfcProfileDef::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcParameterizedProfileDef (IfcAbstractEntityPtr e);
-    IfcParameterizedProfileDef (IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< IfcLabel > v2_ProfileName, IfcAxis2Placement2D* v3_Position);
-    typedef IfcParameterizedProfileDef* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcParameterizedProfileDef > > list;
-    typedef IfcTemplatedEntityList< IfcParameterizedProfileDef >::it it;
+    IfcParameterizedProfileDef (IfcAbstractEntity* e);
+    IfcParameterizedProfileDef (IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< std::string > v2_ProfileName, IfcAxis2Placement2D* v3_Position);
+    typedef IfcTemplatedEntityList< IfcParameterizedProfileDef > list;
 };
 /// Definition from ISO/CD 10303-42:1992: A path is a topological entity consisting of an ordered collection of oriented edges, such that the edge start vertex of each edge coincides with the edge end of its predecessor. The path is ordered from the edge start of the first oriented edge to the edge end of the last edge. The BOOLEAN value sense in the oriented edge indicates whether the edge direction agrees with the direction of the path (TRUE) or is the opposite direction (FALSE).  
 /// 
@@ -14269,20 +15224,19 @@ class IfcParameterizedProfileDef : public IfcProfileDef {
 class IfcPath : public IfcTopologicalRepresentationItem {
 public:
     /// The list of oriented edges which are concatenated together to form this path.
-    SHARED_PTR< IfcTemplatedEntityList< IfcOrientedEdge > > EdgeList();
-    void setEdgeList(SHARED_PTR< IfcTemplatedEntityList< IfcOrientedEdge > > v);
+    IfcTemplatedEntityList< IfcOrientedEdge >::ptr EdgeList() const;
+    void setEdgeList(IfcTemplatedEntityList< IfcOrientedEdge >::ptr v);
     virtual unsigned int getArgumentCount() const { return 1; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY_LIST; } return IfcTopologicalRepresentationItem::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcOrientedEdge; } return IfcTopologicalRepresentationItem::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "EdgeList"; } return IfcTopologicalRepresentationItem::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcPath (IfcAbstractEntityPtr e);
-    IfcPath (SHARED_PTR< IfcTemplatedEntityList< IfcOrientedEdge > > v1_EdgeList);
-    typedef IfcPath* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcPath > > list;
-    typedef IfcTemplatedEntityList< IfcPath >::it it;
+    IfcPath (IfcAbstractEntity* e);
+    IfcPath (IfcTemplatedEntityList< IfcOrientedEdge >::ptr v1_EdgeList);
+    typedef IfcTemplatedEntityList< IfcPath > list;
 };
 /// The complex physical quantity, IfcPhysicalComplexQuantity, is an entity that holds a set of single quantity measure value (as defined at the subtypes of IfcPhysicalSimpleQuantity), that all apply to a given component or aspect of the element. 
 /// 
@@ -14296,33 +15250,32 @@ class IfcPath : public IfcTopologicalRepresentationItem {
 class IfcPhysicalComplexQuantity : public IfcPhysicalQuantity {
 public:
     /// Set of physical quantities that are grouped by this complex physical quantity according to a given discrimination.
-    SHARED_PTR< IfcTemplatedEntityList< IfcPhysicalQuantity > > HasQuantities();
-    void setHasQuantities(SHARED_PTR< IfcTemplatedEntityList< IfcPhysicalQuantity > > v);
+    IfcTemplatedEntityList< IfcPhysicalQuantity >::ptr HasQuantities() const;
+    void setHasQuantities(IfcTemplatedEntityList< IfcPhysicalQuantity >::ptr v);
     /// Identification of the discrimination by which this physical complex property is distinguished. Examples of discriminations are 'layer', 'steel bar diameter', etc.
-    IfcLabel Discrimination();
-    void setDiscrimination(IfcLabel v);
+    std::string Discrimination() const;
+    void setDiscrimination(std::string v);
     /// Whether the optional attribute Quality is defined for this IfcPhysicalComplexQuantity
-    bool hasQuality();
+    bool hasQuality() const;
     /// Additional indication of a quality of the quantities that are grouped under this physical complex quantity.
-    IfcLabel Quality();
-    void setQuality(IfcLabel v);
+    std::string Quality() const;
+    void setQuality(std::string v);
     /// Whether the optional attribute Usage is defined for this IfcPhysicalComplexQuantity
-    bool hasUsage();
+    bool hasUsage() const;
     /// Additional indication of a usage type of the quantities that are grouped under this physical complex quantity.
-    IfcLabel Usage();
-    void setUsage(IfcLabel v);
+    std::string Usage() const;
+    void setUsage(std::string v);
     virtual unsigned int getArgumentCount() const { return 6; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 2: return IfcUtil::Argument_ENTITY_LIST; case 3: return IfcUtil::Argument_STRING; case 4: return IfcUtil::Argument_STRING; case 5: return IfcUtil::Argument_STRING; } return IfcPhysicalQuantity::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 2: return Type::IfcPhysicalQuantity; case 3: return Type::IfcLabel; case 4: return Type::IfcLabel; case 5: return Type::IfcLabel; } return IfcPhysicalQuantity::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 2: return "HasQuantities"; case 3: return "Discrimination"; case 4: return "Quality"; case 5: return "Usage"; } return IfcPhysicalQuantity::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcPhysicalComplexQuantity (IfcAbstractEntityPtr e);
-    IfcPhysicalComplexQuantity (IfcLabel v1_Name, boost::optional< IfcText > v2_Description, SHARED_PTR< IfcTemplatedEntityList< IfcPhysicalQuantity > > v3_HasQuantities, IfcLabel v4_Discrimination, boost::optional< IfcLabel > v5_Quality, boost::optional< IfcLabel > v6_Usage);
-    typedef IfcPhysicalComplexQuantity* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcPhysicalComplexQuantity > > list;
-    typedef IfcTemplatedEntityList< IfcPhysicalComplexQuantity >::it it;
+    IfcPhysicalComplexQuantity (IfcAbstractEntity* e);
+    IfcPhysicalComplexQuantity (std::string v1_Name, boost::optional< std::string > v2_Description, IfcTemplatedEntityList< IfcPhysicalQuantity >::ptr v3_HasQuantities, std::string v4_Discrimination, boost::optional< std::string > v5_Quality, boost::optional< std::string > v6_Usage);
+    typedef IfcTemplatedEntityList< IfcPhysicalComplexQuantity > list;
 };
 /// An IfcPixelTexture provides a 2D image-based texture map as an explicit array of pixel values (list of Pixel binary attributes). In contrary to the IfcImageTexture the IfcPixelTexture holds a 2 dimensional list of pixel color
 /// (and opacity) directly, instead of referencing to an URL.
@@ -14345,29 +15298,28 @@ class IfcPhysicalComplexQuantity : public IfcPhysicalQuantity {
 class IfcPixelTexture : public IfcSurfaceTexture {
 public:
     /// The number of pixels in width (S) direction.
-    IfcInteger Width();
-    void setWidth(IfcInteger v);
+    int Width() const;
+    void setWidth(int v);
     /// The number of pixels in height (T) direction.
-    IfcInteger Height();
-    void setHeight(IfcInteger v);
+    int Height() const;
+    void setHeight(int v);
     /// Indication whether the pixel values contain a 1, 2, 3, or 4 colour component.
-    IfcInteger ColourComponents();
-    void setColourComponents(IfcInteger v);
+    int ColourComponents() const;
+    void setColourComponents(int v);
     /// Flat list of hexadecimal values, each describing one pixel by 1, 2, 3, or 4 components.
     /// 
     /// IFC2x Edition 3 CHANGE  The data type has been changed from STRING to BINARY.
     virtual unsigned int getArgumentCount() const { return 8; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 4: return IfcUtil::Argument_INT; case 5: return IfcUtil::Argument_INT; case 6: return IfcUtil::Argument_INT; case 7: return IfcUtil::Argument_UNKNOWN; } return IfcSurfaceTexture::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 4: return Type::IfcInteger; case 5: return Type::IfcInteger; case 6: return Type::IfcInteger; case 7: return Type::UNDEFINED; } return IfcSurfaceTexture::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 4: return "Width"; case 5: return "Height"; case 6: return "ColourComponents"; case 7: return "Pixel"; } return IfcSurfaceTexture::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcPixelTexture (IfcAbstractEntityPtr e);
-    IfcPixelTexture (bool v1_RepeatS, bool v2_RepeatT, IfcSurfaceTextureEnum::IfcSurfaceTextureEnum v3_TextureType, IfcCartesianTransformationOperator2D* v4_TextureTransform, IfcInteger v5_Width, IfcInteger v6_Height, IfcInteger v7_ColourComponents);
-    typedef IfcPixelTexture* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcPixelTexture > > list;
-    typedef IfcTemplatedEntityList< IfcPixelTexture >::it it;
+    IfcPixelTexture (IfcAbstractEntity* e);
+    IfcPixelTexture (bool v1_RepeatS, bool v2_RepeatT, IfcSurfaceTextureEnum::IfcSurfaceTextureEnum v3_TextureType, IfcCartesianTransformationOperator2D* v4_TextureTransform, int v5_Width, int v6_Height, int v7_ColourComponents);
+    typedef IfcTemplatedEntityList< IfcPixelTexture > list;
 };
 /// Definition from ISO/CD 10303-42:1992: A placement entity defines the local environment for the definition of a geometry item. It locates the item to be defined and, in the case of the axis placement subtypes, gives its orientation. 
 /// 
@@ -14381,20 +15333,19 @@ class IfcPixelTexture : public IfcSurfaceTexture {
 class IfcPlacement : public IfcGeometricRepresentationItem {
 public:
     /// The geometric position of a reference point, such as the center of a circle, of the item to be located.
-    IfcCartesianPoint* Location();
+    IfcCartesianPoint* Location() const;
     void setLocation(IfcCartesianPoint* v);
     virtual unsigned int getArgumentCount() const { return 1; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY; } return IfcGeometricRepresentationItem::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcCartesianPoint; } return IfcGeometricRepresentationItem::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Location"; } return IfcGeometricRepresentationItem::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcPlacement (IfcAbstractEntityPtr e);
+    IfcPlacement (IfcAbstractEntity* e);
     IfcPlacement (IfcCartesianPoint* v1_Location);
-    typedef IfcPlacement* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcPlacement > > list;
-    typedef IfcTemplatedEntityList< IfcPlacement >::it it;
+    typedef IfcTemplatedEntityList< IfcPlacement > list;
 };
 /// The planar extent defines the extent along the two axes of the two-dimensional coordinate system, independently of its position.
 /// 
@@ -14404,23 +15355,22 @@ class IfcPlacement : public IfcGeometricRepresentationItem {
 class IfcPlanarExtent : public IfcGeometricRepresentationItem {
 public:
     /// The extent in the direction of the x-axis.
-    IfcLengthMeasure SizeInX();
-    void setSizeInX(IfcLengthMeasure v);
+    double SizeInX() const;
+    void setSizeInX(double v);
     /// The extent in the direction of the y-axis.
-    IfcLengthMeasure SizeInY();
-    void setSizeInY(IfcLengthMeasure v);
+    double SizeInY() const;
+    void setSizeInY(double v);
     virtual unsigned int getArgumentCount() const { return 2; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_DOUBLE; case 1: return IfcUtil::Argument_DOUBLE; } return IfcGeometricRepresentationItem::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcLengthMeasure; case 1: return Type::IfcLengthMeasure; } return IfcGeometricRepresentationItem::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "SizeInX"; case 1: return "SizeInY"; } return IfcGeometricRepresentationItem::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcPlanarExtent (IfcAbstractEntityPtr e);
-    IfcPlanarExtent (IfcLengthMeasure v1_SizeInX, IfcLengthMeasure v2_SizeInY);
-    typedef IfcPlanarExtent* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcPlanarExtent > > list;
-    typedef IfcTemplatedEntityList< IfcPlanarExtent >::it it;
+    IfcPlanarExtent (IfcAbstractEntity* e);
+    IfcPlanarExtent (double v1_SizeInX, double v2_SizeInY);
+    typedef IfcTemplatedEntityList< IfcPlanarExtent > list;
 };
 /// Definition from ISO/CD 10303-42:1992: A point is a location in some real Cartesian coordinate space Rm, for m = 1, 2 or 3.  
 /// 
@@ -14431,16 +15381,15 @@ class IfcPoint : public IfcGeometricRepresentationItem {
 public:
     virtual unsigned int getArgumentCount() const { return 0; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcGeometricRepresentationItem::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcGeometricRepresentationItem::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcGeometricRepresentationItem::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcPoint (IfcAbstractEntityPtr e);
+    IfcPoint (IfcAbstractEntity* e);
     IfcPoint ();
-    typedef IfcPoint* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcPoint > > list;
-    typedef IfcTemplatedEntityList< IfcPoint >::it it;
+    typedef IfcTemplatedEntityList< IfcPoint > list;
 };
 /// Definition from ISO/CD 10303-42:1992: A point on curve is a point which lies on a curve. The point is determined by evaluating the curve at a specific parameter value. The coordinate space dimensionality of the point is that of the basis curve. 
 /// 
@@ -14454,23 +15403,22 @@ class IfcPoint : public IfcGeometricRepresentationItem {
 class IfcPointOnCurve : public IfcPoint {
 public:
     /// The curve to which point parameter relates.
-    IfcCurve* BasisCurve();
+    IfcCurve* BasisCurve() const;
     void setBasisCurve(IfcCurve* v);
     /// The parameter value of the point location.
-    IfcParameterValue PointParameter();
-    void setPointParameter(IfcParameterValue v);
+    double PointParameter() const;
+    void setPointParameter(double v);
     virtual unsigned int getArgumentCount() const { return 2; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY; case 1: return IfcUtil::Argument_DOUBLE; } return IfcPoint::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcCurve; case 1: return Type::IfcParameterValue; } return IfcPoint::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "BasisCurve"; case 1: return "PointParameter"; } return IfcPoint::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcPointOnCurve (IfcAbstractEntityPtr e);
-    IfcPointOnCurve (IfcCurve* v1_BasisCurve, IfcParameterValue v2_PointParameter);
-    typedef IfcPointOnCurve* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcPointOnCurve > > list;
-    typedef IfcTemplatedEntityList< IfcPointOnCurve >::it it;
+    IfcPointOnCurve (IfcAbstractEntity* e);
+    IfcPointOnCurve (IfcCurve* v1_BasisCurve, double v2_PointParameter);
+    typedef IfcTemplatedEntityList< IfcPointOnCurve > list;
 };
 /// Definition from ISO/CD 10303-42:1992: A point on surface is a point which lies on a parametric surface. The point is determined by evaluating the surface at a particular pair of parameter values. 
 /// 
@@ -14484,26 +15432,25 @@ class IfcPointOnCurve : public IfcPoint {
 class IfcPointOnSurface : public IfcPoint {
 public:
     /// The surface to which the parameter values relate.
-    IfcSurface* BasisSurface();
+    IfcSurface* BasisSurface() const;
     void setBasisSurface(IfcSurface* v);
     /// The first parameter value of the point location.
-    IfcParameterValue PointParameterU();
-    void setPointParameterU(IfcParameterValue v);
+    double PointParameterU() const;
+    void setPointParameterU(double v);
     /// The second parameter value of the point location.
-    IfcParameterValue PointParameterV();
-    void setPointParameterV(IfcParameterValue v);
+    double PointParameterV() const;
+    void setPointParameterV(double v);
     virtual unsigned int getArgumentCount() const { return 3; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY; case 1: return IfcUtil::Argument_DOUBLE; case 2: return IfcUtil::Argument_DOUBLE; } return IfcPoint::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcSurface; case 1: return Type::IfcParameterValue; case 2: return Type::IfcParameterValue; } return IfcPoint::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "BasisSurface"; case 1: return "PointParameterU"; case 2: return "PointParameterV"; } return IfcPoint::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcPointOnSurface (IfcAbstractEntityPtr e);
-    IfcPointOnSurface (IfcSurface* v1_BasisSurface, IfcParameterValue v2_PointParameterU, IfcParameterValue v3_PointParameterV);
-    typedef IfcPointOnSurface* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcPointOnSurface > > list;
-    typedef IfcTemplatedEntityList< IfcPointOnSurface >::it it;
+    IfcPointOnSurface (IfcAbstractEntity* e);
+    IfcPointOnSurface (IfcSurface* v1_BasisSurface, double v2_PointParameterU, double v3_PointParameterV);
+    typedef IfcTemplatedEntityList< IfcPointOnSurface > list;
 };
 /// Definition from ISO/CD 10303-42:1992: A
 /// poly loop is a loop with straight edges bounding a planar region in
@@ -14547,20 +15494,19 @@ class IfcPointOnSurface : public IfcPoint {
 class IfcPolyLoop : public IfcLoop {
 public:
     /// List of points defining the loop. There are no repeated points in the list.
-    SHARED_PTR< IfcTemplatedEntityList< IfcCartesianPoint > > Polygon();
-    void setPolygon(SHARED_PTR< IfcTemplatedEntityList< IfcCartesianPoint > > v);
+    IfcTemplatedEntityList< IfcCartesianPoint >::ptr Polygon() const;
+    void setPolygon(IfcTemplatedEntityList< IfcCartesianPoint >::ptr v);
     virtual unsigned int getArgumentCount() const { return 1; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY_LIST; } return IfcLoop::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcCartesianPoint; } return IfcLoop::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Polygon"; } return IfcLoop::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcPolyLoop (IfcAbstractEntityPtr e);
-    IfcPolyLoop (SHARED_PTR< IfcTemplatedEntityList< IfcCartesianPoint > > v1_Polygon);
-    typedef IfcPolyLoop* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcPolyLoop > > list;
-    typedef IfcTemplatedEntityList< IfcPolyLoop >::it it;
+    IfcPolyLoop (IfcAbstractEntity* e);
+    IfcPolyLoop (IfcTemplatedEntityList< IfcCartesianPoint >::ptr v1_Polygon);
+    typedef IfcTemplatedEntityList< IfcPolyLoop > list;
 };
 /// The polygonal bounded
 /// half space is a special subtype of a half space solid, where the
@@ -14621,25 +15567,24 @@ class IfcPolyLoop : public IfcLoop {
 class IfcPolygonalBoundedHalfSpace : public IfcHalfSpaceSolid {
 public:
     /// Definition of the position coordinate system for the bounding polyline and the base surface.
-    IfcAxis2Placement3D* Position();
+    IfcAxis2Placement3D* Position() const;
     void setPosition(IfcAxis2Placement3D* v);
     /// Two-dimensional polyline bounded curve, defined in the xy plane of the position coordinate system.
     /// 
     /// IFC2x Edition 3 CHANGE  The attribute type has been changed from IfcPolyline to its supertype IfcBoundedCurve with upward compatibility for file based exchange.
-    IfcBoundedCurve* PolygonalBoundary();
+    IfcBoundedCurve* PolygonalBoundary() const;
     void setPolygonalBoundary(IfcBoundedCurve* v);
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 2: return IfcUtil::Argument_ENTITY; case 3: return IfcUtil::Argument_ENTITY; } return IfcHalfSpaceSolid::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 2: return Type::IfcAxis2Placement3D; case 3: return Type::IfcBoundedCurve; } return IfcHalfSpaceSolid::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 2: return "Position"; case 3: return "PolygonalBoundary"; } return IfcHalfSpaceSolid::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcPolygonalBoundedHalfSpace (IfcAbstractEntityPtr e);
+    IfcPolygonalBoundedHalfSpace (IfcAbstractEntity* e);
     IfcPolygonalBoundedHalfSpace (IfcSurface* v1_BaseSurface, bool v2_AgreementFlag, IfcAxis2Placement3D* v3_Position, IfcBoundedCurve* v4_PolygonalBoundary);
-    typedef IfcPolygonalBoundedHalfSpace* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcPolygonalBoundedHalfSpace > > list;
-    typedef IfcTemplatedEntityList< IfcPolygonalBoundedHalfSpace >::it it;
+    typedef IfcTemplatedEntityList< IfcPolygonalBoundedHalfSpace > list;
 };
 /// The pre defined colour determines those qualified names which can be used to identify a colour that is in scope of the current data exchange specification (in contrary to colour specification which defines the colour directly by its colour components).
 /// 
@@ -14650,16 +15595,15 @@ class IfcPreDefinedColour : public IfcPreDefinedItem {
 public:
     virtual unsigned int getArgumentCount() const { return 1; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcPreDefinedItem::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcPreDefinedItem::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcPreDefinedItem::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcPreDefinedColour (IfcAbstractEntityPtr e);
-    IfcPreDefinedColour (IfcLabel v1_Name);
-    typedef IfcPreDefinedColour* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcPreDefinedColour > > list;
-    typedef IfcTemplatedEntityList< IfcPreDefinedColour >::it it;
+    IfcPreDefinedColour (IfcAbstractEntity* e);
+    IfcPreDefinedColour (std::string v1_Name);
+    typedef IfcTemplatedEntityList< IfcPreDefinedColour > list;
 };
 /// Definition from ISO/CD 10303-46:1992: The predefined curve font type is an abstract supertype provided to define an application specific curve font. The name label shall be constrained in the application protocol to values that are given specific meaning for curve fonts in that application protocol.
 /// 
@@ -14672,48 +15616,45 @@ class IfcPreDefinedCurveFont : public IfcPreDefinedItem {
 public:
     virtual unsigned int getArgumentCount() const { return 1; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcPreDefinedItem::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcPreDefinedItem::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcPreDefinedItem::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcPreDefinedCurveFont (IfcAbstractEntityPtr e);
-    IfcPreDefinedCurveFont (IfcLabel v1_Name);
-    typedef IfcPreDefinedCurveFont* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcPreDefinedCurveFont > > list;
-    typedef IfcTemplatedEntityList< IfcPreDefinedCurveFont >::it it;
+    IfcPreDefinedCurveFont (IfcAbstractEntity* e);
+    IfcPreDefinedCurveFont (std::string v1_Name);
+    typedef IfcTemplatedEntityList< IfcPreDefinedCurveFont > list;
 };
 
 class IfcPreDefinedDimensionSymbol : public IfcPreDefinedSymbol {
 public:
     virtual unsigned int getArgumentCount() const { return 1; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcPreDefinedSymbol::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcPreDefinedSymbol::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcPreDefinedSymbol::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcPreDefinedDimensionSymbol (IfcAbstractEntityPtr e);
-    IfcPreDefinedDimensionSymbol (IfcLabel v1_Name);
-    typedef IfcPreDefinedDimensionSymbol* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcPreDefinedDimensionSymbol > > list;
-    typedef IfcTemplatedEntityList< IfcPreDefinedDimensionSymbol >::it it;
+    IfcPreDefinedDimensionSymbol (IfcAbstractEntity* e);
+    IfcPreDefinedDimensionSymbol (std::string v1_Name);
+    typedef IfcTemplatedEntityList< IfcPreDefinedDimensionSymbol > list;
 };
 
 class IfcPreDefinedPointMarkerSymbol : public IfcPreDefinedSymbol {
 public:
     virtual unsigned int getArgumentCount() const { return 1; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcPreDefinedSymbol::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcPreDefinedSymbol::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcPreDefinedSymbol::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcPreDefinedPointMarkerSymbol (IfcAbstractEntityPtr e);
-    IfcPreDefinedPointMarkerSymbol (IfcLabel v1_Name);
-    typedef IfcPreDefinedPointMarkerSymbol* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcPreDefinedPointMarkerSymbol > > list;
-    typedef IfcTemplatedEntityList< IfcPreDefinedPointMarkerSymbol >::it it;
+    IfcPreDefinedPointMarkerSymbol (IfcAbstractEntity* e);
+    IfcPreDefinedPointMarkerSymbol (std::string v1_Name);
+    typedef IfcTemplatedEntityList< IfcPreDefinedPointMarkerSymbol > list;
 };
 /// The IfcProductDefinitionShape defines all shape relevant information about an IfcProduct. It allows for multiple geometric shape representations of the same product. The shape relevant information includes:
 /// 
@@ -14731,18 +15672,17 @@ class IfcProductDefinitionShape : public IfcProductRepresentation {
 public:
     virtual unsigned int getArgumentCount() const { return 3; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcProductRepresentation::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcProductRepresentation::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcProductRepresentation::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcProduct > > ShapeOfProduct(); // INVERSE IfcProduct::Representation
-    SHARED_PTR< IfcTemplatedEntityList< IfcShapeAspect > > HasShapeAspects(); // INVERSE IfcShapeAspect::PartOfProductDefinitionShape
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcProduct >::ptr ShapeOfProduct() const; // INVERSE IfcProduct::Representation
+    IfcTemplatedEntityList< IfcShapeAspect >::ptr HasShapeAspects() const; // INVERSE IfcShapeAspect::PartOfProductDefinitionShape
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcProductDefinitionShape (IfcAbstractEntityPtr e);
-    IfcProductDefinitionShape (boost::optional< IfcLabel > v1_Name, boost::optional< IfcText > v2_Description, SHARED_PTR< IfcTemplatedEntityList< IfcRepresentation > > v3_Representations);
-    typedef IfcProductDefinitionShape* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcProductDefinitionShape > > list;
-    typedef IfcTemplatedEntityList< IfcProductDefinitionShape >::it it;
+    IfcProductDefinitionShape (IfcAbstractEntity* e);
+    IfcProductDefinitionShape (boost::optional< std::string > v1_Name, boost::optional< std::string > v2_Description, IfcTemplatedEntityList< IfcRepresentation >::ptr v3_Representations);
+    typedef IfcTemplatedEntityList< IfcProductDefinitionShape > list;
 };
 /// A property with a bounded
 ///   value, IfcPropertyBoundedValue, defines a property
@@ -14851,32 +15791,31 @@ class IfcProductDefinitionShape : public IfcProductRepresentation {
 class IfcPropertyBoundedValue : public IfcSimpleProperty {
 public:
     /// Whether the optional attribute UpperBoundValue is defined for this IfcPropertyBoundedValue
-    bool hasUpperBoundValue();
+    bool hasUpperBoundValue() const;
     /// Upper bound value for the interval defining the property value. If the value is not given, it indicates an open bound (all values to be greater than or equal to LowerBoundValue).
-    IfcValue UpperBoundValue();
-    void setUpperBoundValue(IfcValue v);
+    IfcValue* UpperBoundValue() const;
+    void setUpperBoundValue(IfcValue* v);
     /// Whether the optional attribute LowerBoundValue is defined for this IfcPropertyBoundedValue
-    bool hasLowerBoundValue();
+    bool hasLowerBoundValue() const;
     /// Lower bound value for the interval defining the property value. If the value is not given, it indicates an open bound (all values to be lower than or equal to UpperBoundValue).
-    IfcValue LowerBoundValue();
-    void setLowerBoundValue(IfcValue v);
+    IfcValue* LowerBoundValue() const;
+    void setLowerBoundValue(IfcValue* v);
     /// Whether the optional attribute Unit is defined for this IfcPropertyBoundedValue
-    bool hasUnit();
+    bool hasUnit() const;
     /// Unit for the upper and lower bound values, if not given, the default value for the measure type is used as defined by the global unit assignment at IfcProject.UnitInContext. The applicable unit is then selected by the underlying TYPE of the UpperBoundValue, LowerBoundValue, and SetPointValue)
-    IfcUnit Unit();
-    void setUnit(IfcUnit v);
+    IfcUnit* Unit() const;
+    void setUnit(IfcUnit* v);
     virtual unsigned int getArgumentCount() const { return 5; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 2: return IfcUtil::Argument_ENTITY; case 3: return IfcUtil::Argument_ENTITY; case 4: return IfcUtil::Argument_ENTITY; } return IfcSimpleProperty::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 2: return Type::IfcValue; case 3: return Type::IfcValue; case 4: return Type::IfcUnit; } return IfcSimpleProperty::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 2: return "UpperBoundValue"; case 3: return "LowerBoundValue"; case 4: return "Unit"; } return IfcSimpleProperty::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcPropertyBoundedValue (IfcAbstractEntityPtr e);
-    IfcPropertyBoundedValue (IfcIdentifier v1_Name, boost::optional< IfcText > v2_Description, boost::optional< IfcValue > v3_UpperBoundValue, boost::optional< IfcValue > v4_LowerBoundValue, boost::optional< IfcUnit > v5_Unit);
-    typedef IfcPropertyBoundedValue* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcPropertyBoundedValue > > list;
-    typedef IfcTemplatedEntityList< IfcPropertyBoundedValue >::it it;
+    IfcPropertyBoundedValue (IfcAbstractEntity* e);
+    IfcPropertyBoundedValue (std::string v1_Name, boost::optional< std::string > v2_Description, IfcValue* v3_UpperBoundValue, IfcValue* v4_LowerBoundValue, IfcUnit* v5_Unit);
+    typedef IfcTemplatedEntityList< IfcPropertyBoundedValue > list;
 };
 /// IfcPropertyDefinition defines the generalization of
 /// all characteristics (i.e. a grouping of individual properties),
@@ -14932,17 +15871,16 @@ class IfcPropertyDefinition : public IfcRoot {
 public:
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcRoot::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcRoot::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcRoot::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelAssociates > > HasAssociations(); // INVERSE IfcRelAssociates::RelatedObjects
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcRelAssociates >::ptr HasAssociations() const; // INVERSE IfcRelAssociates::RelatedObjects
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcPropertyDefinition (IfcAbstractEntityPtr e);
-    IfcPropertyDefinition (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description);
-    typedef IfcPropertyDefinition* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcPropertyDefinition > > list;
-    typedef IfcTemplatedEntityList< IfcPropertyDefinition >::it it;
+    IfcPropertyDefinition (IfcAbstractEntity* e);
+    IfcPropertyDefinition (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description);
+    typedef IfcTemplatedEntityList< IfcPropertyDefinition > list;
 };
 /// A property with an enumerated
 /// value, IfcPropertyEnumeratedValue, defines a property
@@ -15026,25 +15964,24 @@ class IfcPropertyEnumeratedValue : public IfcSimpleProperty {
     /// Enumeration values, which shall be listed in the referenced IfcPropertyEnumeration, if such a reference is provided.
     /// 
     /// IFC2x4 CHANGE  The attribute has been made optional with upward compatibility for file based exchange.
-    SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > EnumerationValues();
-    void setEnumerationValues(SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > v);
+    IfcEntityList::ptr EnumerationValues() const;
+    void setEnumerationValues(IfcEntityList::ptr v);
     /// Whether the optional attribute EnumerationReference is defined for this IfcPropertyEnumeratedValue
-    bool hasEnumerationReference();
+    bool hasEnumerationReference() const;
     /// Enumeration from which a enumeration value has been selected. The referenced enumeration also establishes the unit of the enumeration value.
-    IfcPropertyEnumeration* EnumerationReference();
+    IfcPropertyEnumeration* EnumerationReference() const;
     void setEnumerationReference(IfcPropertyEnumeration* v);
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 2: return IfcUtil::Argument_ENTITY_LIST; case 3: return IfcUtil::Argument_ENTITY; } return IfcSimpleProperty::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 2: return Type::IfcValue; case 3: return Type::IfcPropertyEnumeration; } return IfcSimpleProperty::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 2: return "EnumerationValues"; case 3: return "EnumerationReference"; } return IfcSimpleProperty::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcPropertyEnumeratedValue (IfcAbstractEntityPtr e);
-    IfcPropertyEnumeratedValue (IfcIdentifier v1_Name, boost::optional< IfcText > v2_Description, IfcEntities v3_EnumerationValues, IfcPropertyEnumeration* v4_EnumerationReference);
-    typedef IfcPropertyEnumeratedValue* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcPropertyEnumeratedValue > > list;
-    typedef IfcTemplatedEntityList< IfcPropertyEnumeratedValue >::it it;
+    IfcPropertyEnumeratedValue (IfcAbstractEntity* e);
+    IfcPropertyEnumeratedValue (std::string v1_Name, boost::optional< std::string > v2_Description, IfcEntityList::ptr v3_EnumerationValues, IfcPropertyEnumeration* v4_EnumerationReference);
+    typedef IfcTemplatedEntityList< IfcPropertyEnumeratedValue > list;
 };
 /// An IfcPropertyListValue
 ///   defines a property that has several (numeric or
@@ -15116,25 +16053,24 @@ class IfcPropertyListValue : public IfcSimpleProperty {
     /// List of property values.
     /// 
     /// IFC2x4 CHANGE  The attribute has been made optional with upward compatibility for file based exchange.
-    SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > ListValues();
-    void setListValues(SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > v);
+    IfcEntityList::ptr ListValues() const;
+    void setListValues(IfcEntityList::ptr v);
     /// Whether the optional attribute Unit is defined for this IfcPropertyListValue
-    bool hasUnit();
+    bool hasUnit() const;
     /// Unit for the list values, if not given, the default value for the measure type (given by the TYPE of nominal value) is used as defined by the global unit assignment at IfcProject.
-    IfcUnit Unit();
-    void setUnit(IfcUnit v);
+    IfcUnit* Unit() const;
+    void setUnit(IfcUnit* v);
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 2: return IfcUtil::Argument_ENTITY_LIST; case 3: return IfcUtil::Argument_ENTITY; } return IfcSimpleProperty::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 2: return Type::IfcValue; case 3: return Type::IfcUnit; } return IfcSimpleProperty::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 2: return "ListValues"; case 3: return "Unit"; } return IfcSimpleProperty::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcPropertyListValue (IfcAbstractEntityPtr e);
-    IfcPropertyListValue (IfcIdentifier v1_Name, boost::optional< IfcText > v2_Description, IfcEntities v3_ListValues, boost::optional< IfcUnit > v4_Unit);
-    typedef IfcPropertyListValue* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcPropertyListValue > > list;
-    typedef IfcTemplatedEntityList< IfcPropertyListValue >::it it;
+    IfcPropertyListValue (IfcAbstractEntity* e);
+    IfcPropertyListValue (std::string v1_Name, boost::optional< std::string > v2_Description, IfcEntityList::ptr v3_ListValues, IfcUnit* v4_Unit);
+    typedef IfcTemplatedEntityList< IfcPropertyListValue > list;
 };
 /// IfcPropertyReferenceValue allows a property value to
 ///   be given by referencing other entities within the resource
@@ -15154,27 +16090,26 @@ class IfcPropertyListValue : public IfcSimpleProperty {
 class IfcPropertyReferenceValue : public IfcSimpleProperty {
 public:
     /// Whether the optional attribute UsageName is defined for this IfcPropertyReferenceValue
-    bool hasUsageName();
+    bool hasUsageName() const;
     /// Description of the use of the referenced value within the property.
-    IfcLabel UsageName();
-    void setUsageName(IfcLabel v);
+    std::string UsageName() const;
+    void setUsageName(std::string v);
     /// Reference to another property entity through one of the select types in the IfcObjectReferenceSelect.
     /// 
     /// IFC2x4 CHANGE  The attribute has been made optional with upward compatibility for file based exchange.
-    IfcObjectReferenceSelect PropertyReference();
-    void setPropertyReference(IfcObjectReferenceSelect v);
+    IfcObjectReferenceSelect* PropertyReference() const;
+    void setPropertyReference(IfcObjectReferenceSelect* v);
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 2: return IfcUtil::Argument_STRING; case 3: return IfcUtil::Argument_ENTITY; } return IfcSimpleProperty::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 2: return Type::IfcLabel; case 3: return Type::IfcObjectReferenceSelect; } return IfcSimpleProperty::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 2: return "UsageName"; case 3: return "PropertyReference"; } return IfcSimpleProperty::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcPropertyReferenceValue (IfcAbstractEntityPtr e);
-    IfcPropertyReferenceValue (IfcIdentifier v1_Name, boost::optional< IfcText > v2_Description, boost::optional< IfcLabel > v3_UsageName, IfcObjectReferenceSelect v4_PropertyReference);
-    typedef IfcPropertyReferenceValue* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcPropertyReferenceValue > > list;
-    typedef IfcTemplatedEntityList< IfcPropertyReferenceValue >::it it;
+    IfcPropertyReferenceValue (IfcAbstractEntity* e);
+    IfcPropertyReferenceValue (std::string v1_Name, boost::optional< std::string > v2_Description, boost::optional< std::string > v3_UsageName, IfcObjectReferenceSelect* v4_PropertyReference);
+    typedef IfcTemplatedEntityList< IfcPropertyReferenceValue > list;
 };
 /// IfcPropertySetDefinition is a generalization of all
 /// individual property sets that can be assigned to an object or type
@@ -15222,18 +16157,17 @@ class IfcPropertySetDefinition : public IfcPropertyDefinition {
 public:
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcPropertyDefinition::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcPropertyDefinition::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcPropertyDefinition::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelDefinesByProperties > > PropertyDefinitionOf(); // INVERSE IfcRelDefinesByProperties::RelatingPropertyDefinition
-    SHARED_PTR< IfcTemplatedEntityList< IfcTypeObject > > DefinesType(); // INVERSE IfcTypeObject::HasPropertySets
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcRelDefinesByProperties >::ptr PropertyDefinitionOf() const; // INVERSE IfcRelDefinesByProperties::RelatingPropertyDefinition
+    IfcTemplatedEntityList< IfcTypeObject >::ptr DefinesType() const; // INVERSE IfcTypeObject::HasPropertySets
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcPropertySetDefinition (IfcAbstractEntityPtr e);
-    IfcPropertySetDefinition (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description);
-    typedef IfcPropertySetDefinition* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > list;
-    typedef IfcTemplatedEntityList< IfcPropertySetDefinition >::it it;
+    IfcPropertySetDefinition (IfcAbstractEntity* e);
+    IfcPropertySetDefinition (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description);
+    typedef IfcTemplatedEntityList< IfcPropertySetDefinition > list;
 };
 /// The property with a single value
 /// IfcPropertySingleValue defines a property object which has
@@ -15282,31 +16216,30 @@ class IfcPropertySetDefinition : public IfcPropertyDefinition {
 class IfcPropertySingleValue : public IfcSimpleProperty {
 public:
     /// Whether the optional attribute NominalValue is defined for this IfcPropertySingleValue
-    bool hasNominalValue();
+    bool hasNominalValue() const;
     /// Value and measure type of this property. 
     /// 
     /// NOTE  By virtue of the defined data type, that is selected from the SELECT IfcValue, the appropriate unit can be found within the IfcUnitAssignment, defined for the project if no value for the unit attribute is given.
     /// 
     /// IFC2x3 CHANGE  The attribute has been made optional with upward compatibility for file based exchange.
-    IfcValue NominalValue();
-    void setNominalValue(IfcValue v);
+    IfcValue* NominalValue() const;
+    void setNominalValue(IfcValue* v);
     /// Whether the optional attribute Unit is defined for this IfcPropertySingleValue
-    bool hasUnit();
+    bool hasUnit() const;
     /// Unit for the nominal value, if not given, the default value for the measure type (given by the TYPE of nominal value) is used as defined by the global unit assignment at IfcProject.
-    IfcUnit Unit();
-    void setUnit(IfcUnit v);
+    IfcUnit* Unit() const;
+    void setUnit(IfcUnit* v);
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 2: return IfcUtil::Argument_ENTITY; case 3: return IfcUtil::Argument_ENTITY; } return IfcSimpleProperty::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 2: return Type::IfcValue; case 3: return Type::IfcUnit; } return IfcSimpleProperty::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 2: return "NominalValue"; case 3: return "Unit"; } return IfcSimpleProperty::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcPropertySingleValue (IfcAbstractEntityPtr e);
-    IfcPropertySingleValue (IfcIdentifier v1_Name, boost::optional< IfcText > v2_Description, boost::optional< IfcValue > v3_NominalValue, boost::optional< IfcUnit > v4_Unit);
-    typedef IfcPropertySingleValue* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcPropertySingleValue > > list;
-    typedef IfcTemplatedEntityList< IfcPropertySingleValue >::it it;
+    IfcPropertySingleValue (IfcAbstractEntity* e);
+    IfcPropertySingleValue (std::string v1_Name, boost::optional< std::string > v2_Description, IfcValue* v3_NominalValue, IfcUnit* v4_Unit);
+    typedef IfcTemplatedEntityList< IfcPropertySingleValue > list;
 };
 /// A property with a range value
 ///   (IfcPropertyTableValue) defines a property object
@@ -15459,40 +16392,39 @@ class IfcPropertyTableValue : public IfcSimpleProperty {
     /// List of defining values, which determine the defined values. This list shall have unique values only.
     /// 
     /// IFC2x4 CHANGE  The attribute has been made optional with upward compatibility for file based exchange.
-    SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > DefiningValues();
-    void setDefiningValues(SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > v);
+    IfcEntityList::ptr DefiningValues() const;
+    void setDefiningValues(IfcEntityList::ptr v);
     /// Defined values which are applicable for the scope as defined by the defining values.
     /// 
     /// IFC2x4 CHANGE  The attribute has been made optional with upward compatibility for file based exchange.
-    SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > DefinedValues();
-    void setDefinedValues(SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > v);
+    IfcEntityList::ptr DefinedValues() const;
+    void setDefinedValues(IfcEntityList::ptr v);
     /// Whether the optional attribute Expression is defined for this IfcPropertyTableValue
-    bool hasExpression();
+    bool hasExpression() const;
     /// Expression for the derivation of defined values from the defining values, the expression is given for information only, i.e. no automatic processing can be expected from the expression.
-    IfcText Expression();
-    void setExpression(IfcText v);
+    std::string Expression() const;
+    void setExpression(std::string v);
     /// Whether the optional attribute DefiningUnit is defined for this IfcPropertyTableValue
-    bool hasDefiningUnit();
+    bool hasDefiningUnit() const;
     /// Unit for the defining values, if not given, the default value for the measure type (given by the TYPE of the defining values) is used as defined by the global unit assignment at IfcProject.
-    IfcUnit DefiningUnit();
-    void setDefiningUnit(IfcUnit v);
+    IfcUnit* DefiningUnit() const;
+    void setDefiningUnit(IfcUnit* v);
     /// Whether the optional attribute DefinedUnit is defined for this IfcPropertyTableValue
-    bool hasDefinedUnit();
+    bool hasDefinedUnit() const;
     /// Unit for the defined values, if not given, the default value for the measure type (given by the TYPE of the defined values) is used as defined by the global unit assignment at IfcProject.
-    IfcUnit DefinedUnit();
-    void setDefinedUnit(IfcUnit v);
+    IfcUnit* DefinedUnit() const;
+    void setDefinedUnit(IfcUnit* v);
     virtual unsigned int getArgumentCount() const { return 7; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 2: return IfcUtil::Argument_ENTITY_LIST; case 3: return IfcUtil::Argument_ENTITY_LIST; case 4: return IfcUtil::Argument_STRING; case 5: return IfcUtil::Argument_ENTITY; case 6: return IfcUtil::Argument_ENTITY; } return IfcSimpleProperty::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 2: return Type::IfcValue; case 3: return Type::IfcValue; case 4: return Type::IfcText; case 5: return Type::IfcUnit; case 6: return Type::IfcUnit; } return IfcSimpleProperty::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 2: return "DefiningValues"; case 3: return "DefinedValues"; case 4: return "Expression"; case 5: return "DefiningUnit"; case 6: return "DefinedUnit"; } return IfcSimpleProperty::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcPropertyTableValue (IfcAbstractEntityPtr e);
-    IfcPropertyTableValue (IfcIdentifier v1_Name, boost::optional< IfcText > v2_Description, IfcEntities v3_DefiningValues, IfcEntities v4_DefinedValues, boost::optional< IfcText > v5_Expression, boost::optional< IfcUnit > v6_DefiningUnit, boost::optional< IfcUnit > v7_DefinedUnit);
-    typedef IfcPropertyTableValue* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcPropertyTableValue > > list;
-    typedef IfcTemplatedEntityList< IfcPropertyTableValue >::it it;
+    IfcPropertyTableValue (IfcAbstractEntity* e);
+    IfcPropertyTableValue (std::string v1_Name, boost::optional< std::string > v2_Description, IfcEntityList::ptr v3_DefiningValues, IfcEntityList::ptr v4_DefinedValues, boost::optional< std::string > v5_Expression, IfcUnit* v6_DefiningUnit, IfcUnit* v7_DefinedUnit);
+    typedef IfcTemplatedEntityList< IfcPropertyTableValue > list;
 };
 /// IfcRectangleProfileDef defines a rectangle as the profile definition used by the swept surface geometry or the swept area solid. It is given by its X extent and its Y extent, and placed within the 2D position coordinate system, established by the Position attribute. It is placed centric within the position coordinate system. 
 /// 
@@ -15531,23 +16463,22 @@ class IfcPropertyTableValue : public IfcSimpleProperty {
 class IfcRectangleProfileDef : public IfcParameterizedProfileDef {
 public:
     /// The extent of the rectangle in the direction of the x-axis.
-    IfcPositiveLengthMeasure XDim();
-    void setXDim(IfcPositiveLengthMeasure v);
+    double XDim() const;
+    void setXDim(double v);
     /// The extent of the rectangle in the direction of the y-axis.
-    IfcPositiveLengthMeasure YDim();
-    void setYDim(IfcPositiveLengthMeasure v);
+    double YDim() const;
+    void setYDim(double v);
     virtual unsigned int getArgumentCount() const { return 5; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 3: return IfcUtil::Argument_DOUBLE; case 4: return IfcUtil::Argument_DOUBLE; } return IfcParameterizedProfileDef::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 3: return Type::IfcPositiveLengthMeasure; case 4: return Type::IfcPositiveLengthMeasure; } return IfcParameterizedProfileDef::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 3: return "XDim"; case 4: return "YDim"; } return IfcParameterizedProfileDef::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRectangleProfileDef (IfcAbstractEntityPtr e);
-    IfcRectangleProfileDef (IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< IfcLabel > v2_ProfileName, IfcAxis2Placement2D* v3_Position, IfcPositiveLengthMeasure v4_XDim, IfcPositiveLengthMeasure v5_YDim);
-    typedef IfcRectangleProfileDef* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRectangleProfileDef > > list;
-    typedef IfcTemplatedEntityList< IfcRectangleProfileDef >::it it;
+    IfcRectangleProfileDef (IfcAbstractEntity* e);
+    IfcRectangleProfileDef (IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< std::string > v2_ProfileName, IfcAxis2Placement2D* v3_Position, double v4_XDim, double v5_YDim);
+    typedef IfcTemplatedEntityList< IfcRectangleProfileDef > list;
 };
 /// In a regular time series, the data arrives predictably at predefined intervals. In a regular time series there is no need to store multiple time stamps and the algorithms for analyzing the time series are therefore significantly simpler.  Using the start time provided in the supertype, the time step is used to identify the frequency of the occurrences of the list of values.
 /// 
@@ -15557,23 +16488,22 @@ class IfcRectangleProfileDef : public IfcParameterizedProfileDef {
 class IfcRegularTimeSeries : public IfcTimeSeries {
 public:
     /// A duration of time intervals between values.
-    IfcTimeMeasure TimeStep();
-    void setTimeStep(IfcTimeMeasure v);
+    double TimeStep() const;
+    void setTimeStep(double v);
     /// The collection of time series values.
-    SHARED_PTR< IfcTemplatedEntityList< IfcTimeSeriesValue > > Values();
-    void setValues(SHARED_PTR< IfcTemplatedEntityList< IfcTimeSeriesValue > > v);
+    IfcTemplatedEntityList< IfcTimeSeriesValue >::ptr Values() const;
+    void setValues(IfcTemplatedEntityList< IfcTimeSeriesValue >::ptr v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_DOUBLE; case 9: return IfcUtil::Argument_ENTITY_LIST; } return IfcTimeSeries::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcTimeMeasure; case 9: return Type::IfcTimeSeriesValue; } return IfcTimeSeries::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "TimeStep"; case 9: return "Values"; } return IfcTimeSeries::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRegularTimeSeries (IfcAbstractEntityPtr e);
-    IfcRegularTimeSeries (IfcLabel v1_Name, boost::optional< IfcText > v2_Description, IfcDateTimeSelect v3_StartTime, IfcDateTimeSelect v4_EndTime, IfcTimeSeriesDataTypeEnum::IfcTimeSeriesDataTypeEnum v5_TimeSeriesDataType, IfcDataOriginEnum::IfcDataOriginEnum v6_DataOrigin, boost::optional< IfcLabel > v7_UserDefinedDataOrigin, boost::optional< IfcUnit > v8_Unit, IfcTimeMeasure v9_TimeStep, SHARED_PTR< IfcTemplatedEntityList< IfcTimeSeriesValue > > v10_Values);
-    typedef IfcRegularTimeSeries* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRegularTimeSeries > > list;
-    typedef IfcTemplatedEntityList< IfcRegularTimeSeries >::it it;
+    IfcRegularTimeSeries (IfcAbstractEntity* e);
+    IfcRegularTimeSeries (std::string v1_Name, boost::optional< std::string > v2_Description, IfcDateTimeSelect* v3_StartTime, IfcDateTimeSelect* v4_EndTime, IfcTimeSeriesDataTypeEnum::IfcTimeSeriesDataTypeEnum v5_TimeSeriesDataType, IfcDataOriginEnum::IfcDataOriginEnum v6_DataOrigin, boost::optional< std::string > v7_UserDefinedDataOrigin, IfcUnit* v8_Unit, double v9_TimeStep, IfcTemplatedEntityList< IfcTimeSeriesValue >::ptr v10_Values);
+    typedef IfcTemplatedEntityList< IfcRegularTimeSeries > list;
 };
 /// Definition from IAI: An
 ///   IfcReinforcementDefinitionProperties defines the cross section
@@ -15604,25 +16534,24 @@ class IfcRegularTimeSeries : public IfcTimeSeries {
 class IfcReinforcementDefinitionProperties : public IfcPropertySetDefinition {
 public:
     /// Whether the optional attribute DefinitionType is defined for this IfcReinforcementDefinitionProperties
-    bool hasDefinitionType();
+    bool hasDefinitionType() const;
     /// Descriptive type name applied to reinforcement definition properties.
-    IfcLabel DefinitionType();
-    void setDefinitionType(IfcLabel v);
+    std::string DefinitionType() const;
+    void setDefinitionType(std::string v);
     /// The list of section reinforcement properties attached to the reinforcement definition properties.
-    SHARED_PTR< IfcTemplatedEntityList< IfcSectionReinforcementProperties > > ReinforcementSectionDefinitions();
-    void setReinforcementSectionDefinitions(SHARED_PTR< IfcTemplatedEntityList< IfcSectionReinforcementProperties > > v);
+    IfcTemplatedEntityList< IfcSectionReinforcementProperties >::ptr ReinforcementSectionDefinitions() const;
+    void setReinforcementSectionDefinitions(IfcTemplatedEntityList< IfcSectionReinforcementProperties >::ptr v);
     virtual unsigned int getArgumentCount() const { return 6; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 4: return IfcUtil::Argument_STRING; case 5: return IfcUtil::Argument_ENTITY_LIST; } return IfcPropertySetDefinition::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 4: return Type::IfcLabel; case 5: return Type::IfcSectionReinforcementProperties; } return IfcPropertySetDefinition::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 4: return "DefinitionType"; case 5: return "ReinforcementSectionDefinitions"; } return IfcPropertySetDefinition::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcReinforcementDefinitionProperties (IfcAbstractEntityPtr e);
-    IfcReinforcementDefinitionProperties (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_DefinitionType, SHARED_PTR< IfcTemplatedEntityList< IfcSectionReinforcementProperties > > v6_ReinforcementSectionDefinitions);
-    typedef IfcReinforcementDefinitionProperties* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcReinforcementDefinitionProperties > > list;
-    typedef IfcTemplatedEntityList< IfcReinforcementDefinitionProperties >::it it;
+    IfcReinforcementDefinitionProperties (IfcAbstractEntity* e);
+    IfcReinforcementDefinitionProperties (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_DefinitionType, IfcTemplatedEntityList< IfcSectionReinforcementProperties >::ptr v6_ReinforcementSectionDefinitions);
+    typedef IfcTemplatedEntityList< IfcReinforcementDefinitionProperties > list;
 };
 /// IfcRelationship is the abstract generalization of all objectified relationships in IFC. Objectified relationships are the preferred way to handle relationships among objects. This allows to keep relationship specific properties directly at the relationship and opens the possibility to later handle relationship specific behavior.  
 /// 
@@ -15636,16 +16565,15 @@ class IfcRelationship : public IfcRoot {
 public:
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcRoot::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcRoot::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcRoot::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRelationship (IfcAbstractEntityPtr e);
-    IfcRelationship (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description);
-    typedef IfcRelationship* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRelationship > > list;
-    typedef IfcTemplatedEntityList< IfcRelationship >::it it;
+    IfcRelationship (IfcAbstractEntity* e);
+    IfcRelationship (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description);
+    typedef IfcTemplatedEntityList< IfcRelationship > list;
 };
 /// IfcRoundedRectangleProfileDef defines a rectangle with equally rounded corners as the profile definition used by the swept surface geometry or the swept area solid. It is given by the X extent, the Y extent, and the radius for the rounded corners, and placed within the 2D position coordinate system, established by the Position attribute. It is placed centric within the position coordinate system, that is, in the center of the bounding box.
 /// 
@@ -15687,20 +16615,19 @@ class IfcRelationship : public IfcRoot {
 class IfcRoundedRectangleProfileDef : public IfcRectangleProfileDef {
 public:
     /// Radius of the circular arcs by which all four corners of the rectangle are equally rounded.
-    IfcPositiveLengthMeasure RoundingRadius();
-    void setRoundingRadius(IfcPositiveLengthMeasure v);
+    double RoundingRadius() const;
+    void setRoundingRadius(double v);
     virtual unsigned int getArgumentCount() const { return 6; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 5: return IfcUtil::Argument_DOUBLE; } return IfcRectangleProfileDef::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 5: return Type::IfcPositiveLengthMeasure; } return IfcRectangleProfileDef::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 5: return "RoundingRadius"; } return IfcRectangleProfileDef::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRoundedRectangleProfileDef (IfcAbstractEntityPtr e);
-    IfcRoundedRectangleProfileDef (IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< IfcLabel > v2_ProfileName, IfcAxis2Placement2D* v3_Position, IfcPositiveLengthMeasure v4_XDim, IfcPositiveLengthMeasure v5_YDim, IfcPositiveLengthMeasure v6_RoundingRadius);
-    typedef IfcRoundedRectangleProfileDef* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRoundedRectangleProfileDef > > list;
-    typedef IfcTemplatedEntityList< IfcRoundedRectangleProfileDef >::it it;
+    IfcRoundedRectangleProfileDef (IfcAbstractEntity* e);
+    IfcRoundedRectangleProfileDef (IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< std::string > v2_ProfileName, IfcAxis2Placement2D* v3_Position, double v4_XDim, double v5_YDim, double v6_RoundingRadius);
+    typedef IfcTemplatedEntityList< IfcRoundedRectangleProfileDef > list;
 };
 /// Definition from ISO 10303-42:1999: A sectioned
 /// spine is a representation of the shape of a three dimensional
@@ -15758,54 +16685,52 @@ class IfcRoundedRectangleProfileDef : public IfcRectangleProfileDef {
 class IfcSectionedSpine : public IfcGeometricRepresentationItem {
 public:
     /// A single composite curve, that defines the spine curve. Each of the composite curve segments correspond to the part between two cross-sections.
-    IfcCompositeCurve* SpineCurve();
+    IfcCompositeCurve* SpineCurve() const;
     void setSpineCurve(IfcCompositeCurve* v);
     /// A list of at least two cross sections, each defined within the xy plane of the position coordinate system of the cross section. The position coordinate system is given by the corresponding list CrossSectionPositions.
-    SHARED_PTR< IfcTemplatedEntityList< IfcProfileDef > > CrossSections();
-    void setCrossSections(SHARED_PTR< IfcTemplatedEntityList< IfcProfileDef > > v);
+    IfcTemplatedEntityList< IfcProfileDef >::ptr CrossSections() const;
+    void setCrossSections(IfcTemplatedEntityList< IfcProfileDef >::ptr v);
     /// Position coordinate systems for the cross sections that form the sectioned spine. The profiles defining the cross sections are positioned within the xy plane of the corresponding position coordinate system.
-    SHARED_PTR< IfcTemplatedEntityList< IfcAxis2Placement3D > > CrossSectionPositions();
-    void setCrossSectionPositions(SHARED_PTR< IfcTemplatedEntityList< IfcAxis2Placement3D > > v);
+    IfcTemplatedEntityList< IfcAxis2Placement3D >::ptr CrossSectionPositions() const;
+    void setCrossSectionPositions(IfcTemplatedEntityList< IfcAxis2Placement3D >::ptr v);
     virtual unsigned int getArgumentCount() const { return 3; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY; case 1: return IfcUtil::Argument_ENTITY_LIST; case 2: return IfcUtil::Argument_ENTITY_LIST; } return IfcGeometricRepresentationItem::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcCompositeCurve; case 1: return Type::IfcProfileDef; case 2: return Type::IfcAxis2Placement3D; } return IfcGeometricRepresentationItem::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "SpineCurve"; case 1: return "CrossSections"; case 2: return "CrossSectionPositions"; } return IfcGeometricRepresentationItem::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcSectionedSpine (IfcAbstractEntityPtr e);
-    IfcSectionedSpine (IfcCompositeCurve* v1_SpineCurve, SHARED_PTR< IfcTemplatedEntityList< IfcProfileDef > > v2_CrossSections, SHARED_PTR< IfcTemplatedEntityList< IfcAxis2Placement3D > > v3_CrossSectionPositions);
-    typedef IfcSectionedSpine* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcSectionedSpine > > list;
-    typedef IfcTemplatedEntityList< IfcSectionedSpine >::it it;
+    IfcSectionedSpine (IfcAbstractEntity* e);
+    IfcSectionedSpine (IfcCompositeCurve* v1_SpineCurve, IfcTemplatedEntityList< IfcProfileDef >::ptr v2_CrossSections, IfcTemplatedEntityList< IfcAxis2Placement3D >::ptr v3_CrossSectionPositions);
+    typedef IfcTemplatedEntityList< IfcSectionedSpine > list;
 };
 
 class IfcServiceLifeFactor : public IfcPropertySetDefinition {
 public:
-    IfcServiceLifeFactorTypeEnum::IfcServiceLifeFactorTypeEnum PredefinedType();
+    IfcServiceLifeFactorTypeEnum::IfcServiceLifeFactorTypeEnum PredefinedType() const;
     void setPredefinedType(IfcServiceLifeFactorTypeEnum::IfcServiceLifeFactorTypeEnum v);
     /// Whether the optional attribute UpperValue is defined for this IfcServiceLifeFactor
-    bool hasUpperValue();
-    IfcMeasureValue UpperValue();
-    void setUpperValue(IfcMeasureValue v);
-    IfcMeasureValue MostUsedValue();
-    void setMostUsedValue(IfcMeasureValue v);
+    bool hasUpperValue() const;
+    IfcMeasureValue* UpperValue() const;
+    void setUpperValue(IfcMeasureValue* v);
+    IfcMeasureValue* MostUsedValue() const;
+    void setMostUsedValue(IfcMeasureValue* v);
     /// Whether the optional attribute LowerValue is defined for this IfcServiceLifeFactor
-    bool hasLowerValue();
-    IfcMeasureValue LowerValue();
-    void setLowerValue(IfcMeasureValue v);
+    bool hasLowerValue() const;
+    IfcMeasureValue* LowerValue() const;
+    void setLowerValue(IfcMeasureValue* v);
     virtual unsigned int getArgumentCount() const { return 8; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 4: return IfcUtil::Argument_ENUMERATION; case 5: return IfcUtil::Argument_ENTITY; case 6: return IfcUtil::Argument_ENTITY; case 7: return IfcUtil::Argument_ENTITY; } return IfcPropertySetDefinition::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 4: return Type::IfcServiceLifeFactorTypeEnum; case 5: return Type::IfcMeasureValue; case 6: return Type::IfcMeasureValue; case 7: return Type::IfcMeasureValue; } return IfcPropertySetDefinition::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 4: return "PredefinedType"; case 5: return "UpperValue"; case 6: return "MostUsedValue"; case 7: return "LowerValue"; } return IfcPropertySetDefinition::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcServiceLifeFactor (IfcAbstractEntityPtr e);
-    IfcServiceLifeFactor (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, IfcServiceLifeFactorTypeEnum::IfcServiceLifeFactorTypeEnum v5_PredefinedType, boost::optional< IfcMeasureValue > v6_UpperValue, IfcMeasureValue v7_MostUsedValue, boost::optional< IfcMeasureValue > v8_LowerValue);
-    typedef IfcServiceLifeFactor* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcServiceLifeFactor > > list;
-    typedef IfcTemplatedEntityList< IfcServiceLifeFactor >::it it;
+    IfcServiceLifeFactor (IfcAbstractEntity* e);
+    IfcServiceLifeFactor (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcServiceLifeFactorTypeEnum::IfcServiceLifeFactorTypeEnum v5_PredefinedType, IfcMeasureValue* v6_UpperValue, IfcMeasureValue* v7_MostUsedValue, IfcMeasureValue* v8_LowerValue);
+    typedef IfcTemplatedEntityList< IfcServiceLifeFactor > list;
 };
 /// Definition from ISO/CD 10303-42:1992: A shell based surface model is described by a set of open or closed shells of dimensionality 2. The shells shall not intersect except at edges and vertices. In particular, distinct faces may not intersect. A complete face of one shell may be shared with another shell. Coincident portions of shells shall both reference the same faces, edges and vertices defining the coincident region. There shall be at least one shell. 
 /// 
@@ -15821,20 +16746,19 @@ class IfcServiceLifeFactor : public IfcPropertySetDefinition {
 /// The shells shall not overlap or intersect except at common faces, edges or vertices.
 class IfcShellBasedSurfaceModel : public IfcGeometricRepresentationItem {
 public:
-    SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > SbsmBoundary();
-    void setSbsmBoundary(SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > v);
+    IfcEntityList::ptr SbsmBoundary() const;
+    void setSbsmBoundary(IfcEntityList::ptr v);
     virtual unsigned int getArgumentCount() const { return 1; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY_LIST; } return IfcGeometricRepresentationItem::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcShell; } return IfcGeometricRepresentationItem::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "SbsmBoundary"; } return IfcGeometricRepresentationItem::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcShellBasedSurfaceModel (IfcAbstractEntityPtr e);
-    IfcShellBasedSurfaceModel (IfcEntities v1_SbsmBoundary);
-    typedef IfcShellBasedSurfaceModel* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcShellBasedSurfaceModel > > list;
-    typedef IfcTemplatedEntityList< IfcShellBasedSurfaceModel >::it it;
+    IfcShellBasedSurfaceModel (IfcAbstractEntity* e);
+    IfcShellBasedSurfaceModel (IfcEntityList::ptr v1_SbsmBoundary);
+    typedef IfcTemplatedEntityList< IfcShellBasedSurfaceModel > list;
 };
 /// Definition from IAI: Describes slippage in support conditions or connection conditions.  Slippage means that a relative displacement may occur in a support or connection before support or connection reactions are awoken.
 /// 
@@ -15848,32 +16772,31 @@ class IfcShellBasedSurfaceModel : public IfcGeometricRepresentationItem {
 class IfcSlippageConnectionCondition : public IfcStructuralConnectionCondition {
 public:
     /// Whether the optional attribute SlippageX is defined for this IfcSlippageConnectionCondition
-    bool hasSlippageX();
+    bool hasSlippageX() const;
     /// Slippage in x-direction of the coordinate system defined by the instance which uses this resource object.
-    IfcLengthMeasure SlippageX();
-    void setSlippageX(IfcLengthMeasure v);
+    double SlippageX() const;
+    void setSlippageX(double v);
     /// Whether the optional attribute SlippageY is defined for this IfcSlippageConnectionCondition
-    bool hasSlippageY();
+    bool hasSlippageY() const;
     /// Slippage in y-direction of the coordinate system defined by the instance which uses this resource object.
-    IfcLengthMeasure SlippageY();
-    void setSlippageY(IfcLengthMeasure v);
+    double SlippageY() const;
+    void setSlippageY(double v);
     /// Whether the optional attribute SlippageZ is defined for this IfcSlippageConnectionCondition
-    bool hasSlippageZ();
+    bool hasSlippageZ() const;
     /// Slippage in z-direction of the coordinate system defined by the instance which uses this resource object.
-    IfcLengthMeasure SlippageZ();
-    void setSlippageZ(IfcLengthMeasure v);
+    double SlippageZ() const;
+    void setSlippageZ(double v);
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 1: return IfcUtil::Argument_DOUBLE; case 2: return IfcUtil::Argument_DOUBLE; case 3: return IfcUtil::Argument_DOUBLE; } return IfcStructuralConnectionCondition::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 1: return Type::IfcLengthMeasure; case 2: return Type::IfcLengthMeasure; case 3: return Type::IfcLengthMeasure; } return IfcStructuralConnectionCondition::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 1: return "SlippageX"; case 2: return "SlippageY"; case 3: return "SlippageZ"; } return IfcStructuralConnectionCondition::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcSlippageConnectionCondition (IfcAbstractEntityPtr e);
-    IfcSlippageConnectionCondition (boost::optional< IfcLabel > v1_Name, boost::optional< IfcLengthMeasure > v2_SlippageX, boost::optional< IfcLengthMeasure > v3_SlippageY, boost::optional< IfcLengthMeasure > v4_SlippageZ);
-    typedef IfcSlippageConnectionCondition* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcSlippageConnectionCondition > > list;
-    typedef IfcTemplatedEntityList< IfcSlippageConnectionCondition >::it it;
+    IfcSlippageConnectionCondition (IfcAbstractEntity* e);
+    IfcSlippageConnectionCondition (boost::optional< std::string > v1_Name, boost::optional< double > v2_SlippageX, boost::optional< double > v3_SlippageY, boost::optional< double > v4_SlippageZ);
+    typedef IfcTemplatedEntityList< IfcSlippageConnectionCondition > list;
 };
 /// Definition from ISO/CD 10303-42:1992: A solid model is a complete representation of the nominal shape of a product such that all points in the interior are connected. Any point can be classified as being inside, outside, or on the boundary of a solid. There are several different types of solid model representations. 
 /// 
@@ -15884,114 +16807,110 @@ class IfcSolidModel : public IfcGeometricRepresentationItem {
 public:
     virtual unsigned int getArgumentCount() const { return 0; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcGeometricRepresentationItem::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcGeometricRepresentationItem::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcGeometricRepresentationItem::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcSolidModel (IfcAbstractEntityPtr e);
+    IfcSolidModel (IfcAbstractEntity* e);
     IfcSolidModel ();
-    typedef IfcSolidModel* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcSolidModel > > list;
-    typedef IfcTemplatedEntityList< IfcSolidModel >::it it;
+    typedef IfcTemplatedEntityList< IfcSolidModel > list;
 };
 
 class IfcSoundProperties : public IfcPropertySetDefinition {
 public:
-    IfcBoolean IsAttenuating();
-    void setIsAttenuating(IfcBoolean v);
+    bool IsAttenuating() const;
+    void setIsAttenuating(bool v);
     /// Whether the optional attribute SoundScale is defined for this IfcSoundProperties
-    bool hasSoundScale();
-    IfcSoundScaleEnum::IfcSoundScaleEnum SoundScale();
+    bool hasSoundScale() const;
+    IfcSoundScaleEnum::IfcSoundScaleEnum SoundScale() const;
     void setSoundScale(IfcSoundScaleEnum::IfcSoundScaleEnum v);
-    SHARED_PTR< IfcTemplatedEntityList< IfcSoundValue > > SoundValues();
-    void setSoundValues(SHARED_PTR< IfcTemplatedEntityList< IfcSoundValue > > v);
+    IfcTemplatedEntityList< IfcSoundValue >::ptr SoundValues() const;
+    void setSoundValues(IfcTemplatedEntityList< IfcSoundValue >::ptr v);
     virtual unsigned int getArgumentCount() const { return 7; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 4: return IfcUtil::Argument_BOOL; case 5: return IfcUtil::Argument_ENUMERATION; case 6: return IfcUtil::Argument_ENTITY_LIST; } return IfcPropertySetDefinition::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 4: return Type::IfcBoolean; case 5: return Type::IfcSoundScaleEnum; case 6: return Type::IfcSoundValue; } return IfcPropertySetDefinition::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 4: return "IsAttenuating"; case 5: return "SoundScale"; case 6: return "SoundValues"; } return IfcPropertySetDefinition::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcSoundProperties (IfcAbstractEntityPtr e);
-    IfcSoundProperties (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, IfcBoolean v5_IsAttenuating, boost::optional< IfcSoundScaleEnum::IfcSoundScaleEnum > v6_SoundScale, SHARED_PTR< IfcTemplatedEntityList< IfcSoundValue > > v7_SoundValues);
-    typedef IfcSoundProperties* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcSoundProperties > > list;
-    typedef IfcTemplatedEntityList< IfcSoundProperties >::it it;
+    IfcSoundProperties (IfcAbstractEntity* e);
+    IfcSoundProperties (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, bool v5_IsAttenuating, boost::optional< IfcSoundScaleEnum::IfcSoundScaleEnum > v6_SoundScale, IfcTemplatedEntityList< IfcSoundValue >::ptr v7_SoundValues);
+    typedef IfcTemplatedEntityList< IfcSoundProperties > list;
 };
 
 class IfcSoundValue : public IfcPropertySetDefinition {
 public:
     /// Whether the optional attribute SoundLevelTimeSeries is defined for this IfcSoundValue
-    bool hasSoundLevelTimeSeries();
-    IfcTimeSeries* SoundLevelTimeSeries();
+    bool hasSoundLevelTimeSeries() const;
+    IfcTimeSeries* SoundLevelTimeSeries() const;
     void setSoundLevelTimeSeries(IfcTimeSeries* v);
-    IfcFrequencyMeasure Frequency();
-    void setFrequency(IfcFrequencyMeasure v);
+    double Frequency() const;
+    void setFrequency(double v);
     /// Whether the optional attribute SoundLevelSingleValue is defined for this IfcSoundValue
-    bool hasSoundLevelSingleValue();
-    IfcDerivedMeasureValue SoundLevelSingleValue();
-    void setSoundLevelSingleValue(IfcDerivedMeasureValue v);
+    bool hasSoundLevelSingleValue() const;
+    IfcDerivedMeasureValue* SoundLevelSingleValue() const;
+    void setSoundLevelSingleValue(IfcDerivedMeasureValue* v);
     virtual unsigned int getArgumentCount() const { return 7; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 4: return IfcUtil::Argument_ENTITY; case 5: return IfcUtil::Argument_DOUBLE; case 6: return IfcUtil::Argument_ENTITY; } return IfcPropertySetDefinition::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 4: return Type::IfcTimeSeries; case 5: return Type::IfcFrequencyMeasure; case 6: return Type::IfcDerivedMeasureValue; } return IfcPropertySetDefinition::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 4: return "SoundLevelTimeSeries"; case 5: return "Frequency"; case 6: return "SoundLevelSingleValue"; } return IfcPropertySetDefinition::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcSoundValue (IfcAbstractEntityPtr e);
-    IfcSoundValue (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, IfcTimeSeries* v5_SoundLevelTimeSeries, IfcFrequencyMeasure v6_Frequency, boost::optional< IfcDerivedMeasureValue > v7_SoundLevelSingleValue);
-    typedef IfcSoundValue* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcSoundValue > > list;
-    typedef IfcTemplatedEntityList< IfcSoundValue >::it it;
+    IfcSoundValue (IfcAbstractEntity* e);
+    IfcSoundValue (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcTimeSeries* v5_SoundLevelTimeSeries, double v6_Frequency, IfcDerivedMeasureValue* v7_SoundLevelSingleValue);
+    typedef IfcTemplatedEntityList< IfcSoundValue > list;
 };
 
 class IfcSpaceThermalLoadProperties : public IfcPropertySetDefinition {
 public:
     /// Whether the optional attribute ApplicableValueRatio is defined for this IfcSpaceThermalLoadProperties
-    bool hasApplicableValueRatio();
-    IfcPositiveRatioMeasure ApplicableValueRatio();
-    void setApplicableValueRatio(IfcPositiveRatioMeasure v);
-    IfcThermalLoadSourceEnum::IfcThermalLoadSourceEnum ThermalLoadSource();
+    bool hasApplicableValueRatio() const;
+    double ApplicableValueRatio() const;
+    void setApplicableValueRatio(double v);
+    IfcThermalLoadSourceEnum::IfcThermalLoadSourceEnum ThermalLoadSource() const;
     void setThermalLoadSource(IfcThermalLoadSourceEnum::IfcThermalLoadSourceEnum v);
-    IfcPropertySourceEnum::IfcPropertySourceEnum PropertySource();
+    IfcPropertySourceEnum::IfcPropertySourceEnum PropertySource() const;
     void setPropertySource(IfcPropertySourceEnum::IfcPropertySourceEnum v);
     /// Whether the optional attribute SourceDescription is defined for this IfcSpaceThermalLoadProperties
-    bool hasSourceDescription();
-    IfcText SourceDescription();
-    void setSourceDescription(IfcText v);
-    IfcPowerMeasure MaximumValue();
-    void setMaximumValue(IfcPowerMeasure v);
+    bool hasSourceDescription() const;
+    std::string SourceDescription() const;
+    void setSourceDescription(std::string v);
+    double MaximumValue() const;
+    void setMaximumValue(double v);
     /// Whether the optional attribute MinimumValue is defined for this IfcSpaceThermalLoadProperties
-    bool hasMinimumValue();
-    IfcPowerMeasure MinimumValue();
-    void setMinimumValue(IfcPowerMeasure v);
+    bool hasMinimumValue() const;
+    double MinimumValue() const;
+    void setMinimumValue(double v);
     /// Whether the optional attribute ThermalLoadTimeSeriesValues is defined for this IfcSpaceThermalLoadProperties
-    bool hasThermalLoadTimeSeriesValues();
-    IfcTimeSeries* ThermalLoadTimeSeriesValues();
+    bool hasThermalLoadTimeSeriesValues() const;
+    IfcTimeSeries* ThermalLoadTimeSeriesValues() const;
     void setThermalLoadTimeSeriesValues(IfcTimeSeries* v);
     /// Whether the optional attribute UserDefinedThermalLoadSource is defined for this IfcSpaceThermalLoadProperties
-    bool hasUserDefinedThermalLoadSource();
-    IfcLabel UserDefinedThermalLoadSource();
-    void setUserDefinedThermalLoadSource(IfcLabel v);
+    bool hasUserDefinedThermalLoadSource() const;
+    std::string UserDefinedThermalLoadSource() const;
+    void setUserDefinedThermalLoadSource(std::string v);
     /// Whether the optional attribute UserDefinedPropertySource is defined for this IfcSpaceThermalLoadProperties
-    bool hasUserDefinedPropertySource();
-    IfcLabel UserDefinedPropertySource();
-    void setUserDefinedPropertySource(IfcLabel v);
-    IfcThermalLoadTypeEnum::IfcThermalLoadTypeEnum ThermalLoadType();
+    bool hasUserDefinedPropertySource() const;
+    std::string UserDefinedPropertySource() const;
+    void setUserDefinedPropertySource(std::string v);
+    IfcThermalLoadTypeEnum::IfcThermalLoadTypeEnum ThermalLoadType() const;
     void setThermalLoadType(IfcThermalLoadTypeEnum::IfcThermalLoadTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 14; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 4: return IfcUtil::Argument_DOUBLE; case 5: return IfcUtil::Argument_ENUMERATION; case 6: return IfcUtil::Argument_ENUMERATION; case 7: return IfcUtil::Argument_STRING; case 8: return IfcUtil::Argument_DOUBLE; case 9: return IfcUtil::Argument_DOUBLE; case 10: return IfcUtil::Argument_ENTITY; case 11: return IfcUtil::Argument_STRING; case 12: return IfcUtil::Argument_STRING; case 13: return IfcUtil::Argument_ENUMERATION; } return IfcPropertySetDefinition::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 4: return Type::IfcPositiveRatioMeasure; case 5: return Type::IfcThermalLoadSourceEnum; case 6: return Type::IfcPropertySourceEnum; case 7: return Type::IfcText; case 8: return Type::IfcPowerMeasure; case 9: return Type::IfcPowerMeasure; case 10: return Type::IfcTimeSeries; case 11: return Type::IfcLabel; case 12: return Type::IfcLabel; case 13: return Type::IfcThermalLoadTypeEnum; } return IfcPropertySetDefinition::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 4: return "ApplicableValueRatio"; case 5: return "ThermalLoadSource"; case 6: return "PropertySource"; case 7: return "SourceDescription"; case 8: return "MaximumValue"; case 9: return "MinimumValue"; case 10: return "ThermalLoadTimeSeriesValues"; case 11: return "UserDefinedThermalLoadSource"; case 12: return "UserDefinedPropertySource"; case 13: return "ThermalLoadType"; } return IfcPropertySetDefinition::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcSpaceThermalLoadProperties (IfcAbstractEntityPtr e);
-    IfcSpaceThermalLoadProperties (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcPositiveRatioMeasure > v5_ApplicableValueRatio, IfcThermalLoadSourceEnum::IfcThermalLoadSourceEnum v6_ThermalLoadSource, IfcPropertySourceEnum::IfcPropertySourceEnum v7_PropertySource, boost::optional< IfcText > v8_SourceDescription, IfcPowerMeasure v9_MaximumValue, boost::optional< IfcPowerMeasure > v10_MinimumValue, IfcTimeSeries* v11_ThermalLoadTimeSeriesValues, boost::optional< IfcLabel > v12_UserDefinedThermalLoadSource, boost::optional< IfcLabel > v13_UserDefinedPropertySource, IfcThermalLoadTypeEnum::IfcThermalLoadTypeEnum v14_ThermalLoadType);
-    typedef IfcSpaceThermalLoadProperties* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcSpaceThermalLoadProperties > > list;
-    typedef IfcTemplatedEntityList< IfcSpaceThermalLoadProperties >::it it;
+    IfcSpaceThermalLoadProperties (IfcAbstractEntity* e);
+    IfcSpaceThermalLoadProperties (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< double > v5_ApplicableValueRatio, IfcThermalLoadSourceEnum::IfcThermalLoadSourceEnum v6_ThermalLoadSource, IfcPropertySourceEnum::IfcPropertySourceEnum v7_PropertySource, boost::optional< std::string > v8_SourceDescription, double v9_MaximumValue, boost::optional< double > v10_MinimumValue, IfcTimeSeries* v11_ThermalLoadTimeSeriesValues, boost::optional< std::string > v12_UserDefinedThermalLoadSource, boost::optional< std::string > v13_UserDefinedPropertySource, IfcThermalLoadTypeEnum::IfcThermalLoadTypeEnum v14_ThermalLoadType);
+    typedef IfcTemplatedEntityList< IfcSpaceThermalLoadProperties > list;
 };
 /// Definition from IAI: An instance of the entity
 ///   IfcStructuralLoadLinearForce shall be used to define actions on curves.
@@ -16001,47 +16920,46 @@ class IfcSpaceThermalLoadProperties : public IfcPropertySetDefinition {
 class IfcStructuralLoadLinearForce : public IfcStructuralLoadStatic {
 public:
     /// Whether the optional attribute LinearForceX is defined for this IfcStructuralLoadLinearForce
-    bool hasLinearForceX();
+    bool hasLinearForceX() const;
     /// Linear force value in x-direction.
-    IfcLinearForceMeasure LinearForceX();
-    void setLinearForceX(IfcLinearForceMeasure v);
+    double LinearForceX() const;
+    void setLinearForceX(double v);
     /// Whether the optional attribute LinearForceY is defined for this IfcStructuralLoadLinearForce
-    bool hasLinearForceY();
+    bool hasLinearForceY() const;
     /// Linear force value in y-direction.
-    IfcLinearForceMeasure LinearForceY();
-    void setLinearForceY(IfcLinearForceMeasure v);
+    double LinearForceY() const;
+    void setLinearForceY(double v);
     /// Whether the optional attribute LinearForceZ is defined for this IfcStructuralLoadLinearForce
-    bool hasLinearForceZ();
+    bool hasLinearForceZ() const;
     /// Linear force value in z-direction.
-    IfcLinearForceMeasure LinearForceZ();
-    void setLinearForceZ(IfcLinearForceMeasure v);
+    double LinearForceZ() const;
+    void setLinearForceZ(double v);
     /// Whether the optional attribute LinearMomentX is defined for this IfcStructuralLoadLinearForce
-    bool hasLinearMomentX();
+    bool hasLinearMomentX() const;
     /// Linear moment about the x-axis.
-    IfcLinearMomentMeasure LinearMomentX();
-    void setLinearMomentX(IfcLinearMomentMeasure v);
+    double LinearMomentX() const;
+    void setLinearMomentX(double v);
     /// Whether the optional attribute LinearMomentY is defined for this IfcStructuralLoadLinearForce
-    bool hasLinearMomentY();
+    bool hasLinearMomentY() const;
     /// Linear moment about the y-axis.
-    IfcLinearMomentMeasure LinearMomentY();
-    void setLinearMomentY(IfcLinearMomentMeasure v);
+    double LinearMomentY() const;
+    void setLinearMomentY(double v);
     /// Whether the optional attribute LinearMomentZ is defined for this IfcStructuralLoadLinearForce
-    bool hasLinearMomentZ();
+    bool hasLinearMomentZ() const;
     /// Linear moment about the z-axis.
-    IfcLinearMomentMeasure LinearMomentZ();
-    void setLinearMomentZ(IfcLinearMomentMeasure v);
+    double LinearMomentZ() const;
+    void setLinearMomentZ(double v);
     virtual unsigned int getArgumentCount() const { return 7; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 1: return IfcUtil::Argument_DOUBLE; case 2: return IfcUtil::Argument_DOUBLE; case 3: return IfcUtil::Argument_DOUBLE; case 4: return IfcUtil::Argument_DOUBLE; case 5: return IfcUtil::Argument_DOUBLE; case 6: return IfcUtil::Argument_DOUBLE; } return IfcStructuralLoadStatic::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 1: return Type::IfcLinearForceMeasure; case 2: return Type::IfcLinearForceMeasure; case 3: return Type::IfcLinearForceMeasure; case 4: return Type::IfcLinearMomentMeasure; case 5: return Type::IfcLinearMomentMeasure; case 6: return Type::IfcLinearMomentMeasure; } return IfcStructuralLoadStatic::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 1: return "LinearForceX"; case 2: return "LinearForceY"; case 3: return "LinearForceZ"; case 4: return "LinearMomentX"; case 5: return "LinearMomentY"; case 6: return "LinearMomentZ"; } return IfcStructuralLoadStatic::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcStructuralLoadLinearForce (IfcAbstractEntityPtr e);
-    IfcStructuralLoadLinearForce (boost::optional< IfcLabel > v1_Name, boost::optional< IfcLinearForceMeasure > v2_LinearForceX, boost::optional< IfcLinearForceMeasure > v3_LinearForceY, boost::optional< IfcLinearForceMeasure > v4_LinearForceZ, boost::optional< IfcLinearMomentMeasure > v5_LinearMomentX, boost::optional< IfcLinearMomentMeasure > v6_LinearMomentY, boost::optional< IfcLinearMomentMeasure > v7_LinearMomentZ);
-    typedef IfcStructuralLoadLinearForce* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcStructuralLoadLinearForce > > list;
-    typedef IfcTemplatedEntityList< IfcStructuralLoadLinearForce >::it it;
+    IfcStructuralLoadLinearForce (IfcAbstractEntity* e);
+    IfcStructuralLoadLinearForce (boost::optional< std::string > v1_Name, boost::optional< double > v2_LinearForceX, boost::optional< double > v3_LinearForceY, boost::optional< double > v4_LinearForceZ, boost::optional< double > v5_LinearMomentX, boost::optional< double > v6_LinearMomentY, boost::optional< double > v7_LinearMomentZ);
+    typedef IfcTemplatedEntityList< IfcStructuralLoadLinearForce > list;
 };
 /// Definition from IAI: An instance of the entity
 ///   IfcStructuralLoadPlanarForce shall be used to define actions on faces.
@@ -16051,32 +16969,31 @@ class IfcStructuralLoadLinearForce : public IfcStructuralLoadStatic {
 class IfcStructuralLoadPlanarForce : public IfcStructuralLoadStatic {
 public:
     /// Whether the optional attribute PlanarForceX is defined for this IfcStructuralLoadPlanarForce
-    bool hasPlanarForceX();
+    bool hasPlanarForceX() const;
     /// Planar force value in x-direction.
-    IfcPlanarForceMeasure PlanarForceX();
-    void setPlanarForceX(IfcPlanarForceMeasure v);
+    double PlanarForceX() const;
+    void setPlanarForceX(double v);
     /// Whether the optional attribute PlanarForceY is defined for this IfcStructuralLoadPlanarForce
-    bool hasPlanarForceY();
+    bool hasPlanarForceY() const;
     /// Planar force value in y-direction.
-    IfcPlanarForceMeasure PlanarForceY();
-    void setPlanarForceY(IfcPlanarForceMeasure v);
+    double PlanarForceY() const;
+    void setPlanarForceY(double v);
     /// Whether the optional attribute PlanarForceZ is defined for this IfcStructuralLoadPlanarForce
-    bool hasPlanarForceZ();
+    bool hasPlanarForceZ() const;
     /// Planar force value in z-direction.
-    IfcPlanarForceMeasure PlanarForceZ();
-    void setPlanarForceZ(IfcPlanarForceMeasure v);
+    double PlanarForceZ() const;
+    void setPlanarForceZ(double v);
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 1: return IfcUtil::Argument_DOUBLE; case 2: return IfcUtil::Argument_DOUBLE; case 3: return IfcUtil::Argument_DOUBLE; } return IfcStructuralLoadStatic::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 1: return Type::IfcPlanarForceMeasure; case 2: return Type::IfcPlanarForceMeasure; case 3: return Type::IfcPlanarForceMeasure; } return IfcStructuralLoadStatic::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 1: return "PlanarForceX"; case 2: return "PlanarForceY"; case 3: return "PlanarForceZ"; } return IfcStructuralLoadStatic::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcStructuralLoadPlanarForce (IfcAbstractEntityPtr e);
-    IfcStructuralLoadPlanarForce (boost::optional< IfcLabel > v1_Name, boost::optional< IfcPlanarForceMeasure > v2_PlanarForceX, boost::optional< IfcPlanarForceMeasure > v3_PlanarForceY, boost::optional< IfcPlanarForceMeasure > v4_PlanarForceZ);
-    typedef IfcStructuralLoadPlanarForce* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcStructuralLoadPlanarForce > > list;
-    typedef IfcTemplatedEntityList< IfcStructuralLoadPlanarForce >::it it;
+    IfcStructuralLoadPlanarForce (IfcAbstractEntity* e);
+    IfcStructuralLoadPlanarForce (boost::optional< std::string > v1_Name, boost::optional< double > v2_PlanarForceX, boost::optional< double > v3_PlanarForceY, boost::optional< double > v4_PlanarForceZ);
+    typedef IfcTemplatedEntityList< IfcStructuralLoadPlanarForce > list;
 };
 /// Definition from IAI: Instances of the entity
 ///   IfcStructuralLoadSingleDisplacement shall be used to define displacements.
@@ -16086,47 +17003,46 @@ class IfcStructuralLoadPlanarForce : public IfcStructuralLoadStatic {
 class IfcStructuralLoadSingleDisplacement : public IfcStructuralLoadStatic {
 public:
     /// Whether the optional attribute DisplacementX is defined for this IfcStructuralLoadSingleDisplacement
-    bool hasDisplacementX();
+    bool hasDisplacementX() const;
     /// Displacement in x-direction.
-    IfcLengthMeasure DisplacementX();
-    void setDisplacementX(IfcLengthMeasure v);
+    double DisplacementX() const;
+    void setDisplacementX(double v);
     /// Whether the optional attribute DisplacementY is defined for this IfcStructuralLoadSingleDisplacement
-    bool hasDisplacementY();
+    bool hasDisplacementY() const;
     /// Displacement in y-direction.
-    IfcLengthMeasure DisplacementY();
-    void setDisplacementY(IfcLengthMeasure v);
+    double DisplacementY() const;
+    void setDisplacementY(double v);
     /// Whether the optional attribute DisplacementZ is defined for this IfcStructuralLoadSingleDisplacement
-    bool hasDisplacementZ();
+    bool hasDisplacementZ() const;
     /// Displacement in z-direction.
-    IfcLengthMeasure DisplacementZ();
-    void setDisplacementZ(IfcLengthMeasure v);
+    double DisplacementZ() const;
+    void setDisplacementZ(double v);
     /// Whether the optional attribute RotationalDisplacementRX is defined for this IfcStructuralLoadSingleDisplacement
-    bool hasRotationalDisplacementRX();
+    bool hasRotationalDisplacementRX() const;
     /// Rotation about the x-axis.
-    IfcPlaneAngleMeasure RotationalDisplacementRX();
-    void setRotationalDisplacementRX(IfcPlaneAngleMeasure v);
+    double RotationalDisplacementRX() const;
+    void setRotationalDisplacementRX(double v);
     /// Whether the optional attribute RotationalDisplacementRY is defined for this IfcStructuralLoadSingleDisplacement
-    bool hasRotationalDisplacementRY();
+    bool hasRotationalDisplacementRY() const;
     /// Rotation about the y-axis.
-    IfcPlaneAngleMeasure RotationalDisplacementRY();
-    void setRotationalDisplacementRY(IfcPlaneAngleMeasure v);
+    double RotationalDisplacementRY() const;
+    void setRotationalDisplacementRY(double v);
     /// Whether the optional attribute RotationalDisplacementRZ is defined for this IfcStructuralLoadSingleDisplacement
-    bool hasRotationalDisplacementRZ();
+    bool hasRotationalDisplacementRZ() const;
     /// Rotation about the z-axis.
-    IfcPlaneAngleMeasure RotationalDisplacementRZ();
-    void setRotationalDisplacementRZ(IfcPlaneAngleMeasure v);
+    double RotationalDisplacementRZ() const;
+    void setRotationalDisplacementRZ(double v);
     virtual unsigned int getArgumentCount() const { return 7; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 1: return IfcUtil::Argument_DOUBLE; case 2: return IfcUtil::Argument_DOUBLE; case 3: return IfcUtil::Argument_DOUBLE; case 4: return IfcUtil::Argument_DOUBLE; case 5: return IfcUtil::Argument_DOUBLE; case 6: return IfcUtil::Argument_DOUBLE; } return IfcStructuralLoadStatic::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 1: return Type::IfcLengthMeasure; case 2: return Type::IfcLengthMeasure; case 3: return Type::IfcLengthMeasure; case 4: return Type::IfcPlaneAngleMeasure; case 5: return Type::IfcPlaneAngleMeasure; case 6: return Type::IfcPlaneAngleMeasure; } return IfcStructuralLoadStatic::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 1: return "DisplacementX"; case 2: return "DisplacementY"; case 3: return "DisplacementZ"; case 4: return "RotationalDisplacementRX"; case 5: return "RotationalDisplacementRY"; case 6: return "RotationalDisplacementRZ"; } return IfcStructuralLoadStatic::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcStructuralLoadSingleDisplacement (IfcAbstractEntityPtr e);
-    IfcStructuralLoadSingleDisplacement (boost::optional< IfcLabel > v1_Name, boost::optional< IfcLengthMeasure > v2_DisplacementX, boost::optional< IfcLengthMeasure > v3_DisplacementY, boost::optional< IfcLengthMeasure > v4_DisplacementZ, boost::optional< IfcPlaneAngleMeasure > v5_RotationalDisplacementRX, boost::optional< IfcPlaneAngleMeasure > v6_RotationalDisplacementRY, boost::optional< IfcPlaneAngleMeasure > v7_RotationalDisplacementRZ);
-    typedef IfcStructuralLoadSingleDisplacement* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcStructuralLoadSingleDisplacement > > list;
-    typedef IfcTemplatedEntityList< IfcStructuralLoadSingleDisplacement >::it it;
+    IfcStructuralLoadSingleDisplacement (IfcAbstractEntity* e);
+    IfcStructuralLoadSingleDisplacement (boost::optional< std::string > v1_Name, boost::optional< double > v2_DisplacementX, boost::optional< double > v3_DisplacementY, boost::optional< double > v4_DisplacementZ, boost::optional< double > v5_RotationalDisplacementRX, boost::optional< double > v6_RotationalDisplacementRY, boost::optional< double > v7_RotationalDisplacementRZ);
+    typedef IfcTemplatedEntityList< IfcStructuralLoadSingleDisplacement > list;
 };
 /// Definition from IAI: Defines a displacement with warping.
 /// 
@@ -16134,22 +17050,21 @@ class IfcStructuralLoadSingleDisplacement : public IfcStructuralLoadStatic {
 class IfcStructuralLoadSingleDisplacementDistortion : public IfcStructuralLoadSingleDisplacement {
 public:
     /// Whether the optional attribute Distortion is defined for this IfcStructuralLoadSingleDisplacementDistortion
-    bool hasDistortion();
+    bool hasDistortion() const;
     /// The distortion curvature (warping, i.e. a cross-sectional deplanation) given to the displacement load.
-    IfcCurvatureMeasure Distortion();
-    void setDistortion(IfcCurvatureMeasure v);
+    double Distortion() const;
+    void setDistortion(double v);
     virtual unsigned int getArgumentCount() const { return 8; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 7: return IfcUtil::Argument_DOUBLE; } return IfcStructuralLoadSingleDisplacement::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 7: return Type::IfcCurvatureMeasure; } return IfcStructuralLoadSingleDisplacement::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 7: return "Distortion"; } return IfcStructuralLoadSingleDisplacement::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcStructuralLoadSingleDisplacementDistortion (IfcAbstractEntityPtr e);
-    IfcStructuralLoadSingleDisplacementDistortion (boost::optional< IfcLabel > v1_Name, boost::optional< IfcLengthMeasure > v2_DisplacementX, boost::optional< IfcLengthMeasure > v3_DisplacementY, boost::optional< IfcLengthMeasure > v4_DisplacementZ, boost::optional< IfcPlaneAngleMeasure > v5_RotationalDisplacementRX, boost::optional< IfcPlaneAngleMeasure > v6_RotationalDisplacementRY, boost::optional< IfcPlaneAngleMeasure > v7_RotationalDisplacementRZ, boost::optional< IfcCurvatureMeasure > v8_Distortion);
-    typedef IfcStructuralLoadSingleDisplacementDistortion* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcStructuralLoadSingleDisplacementDistortion > > list;
-    typedef IfcTemplatedEntityList< IfcStructuralLoadSingleDisplacementDistortion >::it it;
+    IfcStructuralLoadSingleDisplacementDistortion (IfcAbstractEntity* e);
+    IfcStructuralLoadSingleDisplacementDistortion (boost::optional< std::string > v1_Name, boost::optional< double > v2_DisplacementX, boost::optional< double > v3_DisplacementY, boost::optional< double > v4_DisplacementZ, boost::optional< double > v5_RotationalDisplacementRX, boost::optional< double > v6_RotationalDisplacementRY, boost::optional< double > v7_RotationalDisplacementRZ, boost::optional< double > v8_Distortion);
+    typedef IfcTemplatedEntityList< IfcStructuralLoadSingleDisplacementDistortion > list;
 };
 /// Definition from IAI: Instances of the entity
 ///   IfcStructuralLoadSingleForce shall be used to define the forces and
@@ -16160,47 +17075,46 @@ class IfcStructuralLoadSingleDisplacementDistortion : public IfcStructuralLoadSi
 class IfcStructuralLoadSingleForce : public IfcStructuralLoadStatic {
 public:
     /// Whether the optional attribute ForceX is defined for this IfcStructuralLoadSingleForce
-    bool hasForceX();
+    bool hasForceX() const;
     /// Force value in x-direction.
-    IfcForceMeasure ForceX();
-    void setForceX(IfcForceMeasure v);
+    double ForceX() const;
+    void setForceX(double v);
     /// Whether the optional attribute ForceY is defined for this IfcStructuralLoadSingleForce
-    bool hasForceY();
+    bool hasForceY() const;
     /// Force value in y-direction.
-    IfcForceMeasure ForceY();
-    void setForceY(IfcForceMeasure v);
+    double ForceY() const;
+    void setForceY(double v);
     /// Whether the optional attribute ForceZ is defined for this IfcStructuralLoadSingleForce
-    bool hasForceZ();
+    bool hasForceZ() const;
     /// Force value in z-direction.
-    IfcForceMeasure ForceZ();
-    void setForceZ(IfcForceMeasure v);
+    double ForceZ() const;
+    void setForceZ(double v);
     /// Whether the optional attribute MomentX is defined for this IfcStructuralLoadSingleForce
-    bool hasMomentX();
+    bool hasMomentX() const;
     /// Moment about the x-axis.
-    IfcTorqueMeasure MomentX();
-    void setMomentX(IfcTorqueMeasure v);
+    double MomentX() const;
+    void setMomentX(double v);
     /// Whether the optional attribute MomentY is defined for this IfcStructuralLoadSingleForce
-    bool hasMomentY();
+    bool hasMomentY() const;
     /// Moment about the y-axis.
-    IfcTorqueMeasure MomentY();
-    void setMomentY(IfcTorqueMeasure v);
+    double MomentY() const;
+    void setMomentY(double v);
     /// Whether the optional attribute MomentZ is defined for this IfcStructuralLoadSingleForce
-    bool hasMomentZ();
+    bool hasMomentZ() const;
     /// Moment about the z-axis.
-    IfcTorqueMeasure MomentZ();
-    void setMomentZ(IfcTorqueMeasure v);
+    double MomentZ() const;
+    void setMomentZ(double v);
     virtual unsigned int getArgumentCount() const { return 7; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 1: return IfcUtil::Argument_DOUBLE; case 2: return IfcUtil::Argument_DOUBLE; case 3: return IfcUtil::Argument_DOUBLE; case 4: return IfcUtil::Argument_DOUBLE; case 5: return IfcUtil::Argument_DOUBLE; case 6: return IfcUtil::Argument_DOUBLE; } return IfcStructuralLoadStatic::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 1: return Type::IfcForceMeasure; case 2: return Type::IfcForceMeasure; case 3: return Type::IfcForceMeasure; case 4: return Type::IfcTorqueMeasure; case 5: return Type::IfcTorqueMeasure; case 6: return Type::IfcTorqueMeasure; } return IfcStructuralLoadStatic::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 1: return "ForceX"; case 2: return "ForceY"; case 3: return "ForceZ"; case 4: return "MomentX"; case 5: return "MomentY"; case 6: return "MomentZ"; } return IfcStructuralLoadStatic::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcStructuralLoadSingleForce (IfcAbstractEntityPtr e);
-    IfcStructuralLoadSingleForce (boost::optional< IfcLabel > v1_Name, boost::optional< IfcForceMeasure > v2_ForceX, boost::optional< IfcForceMeasure > v3_ForceY, boost::optional< IfcForceMeasure > v4_ForceZ, boost::optional< IfcTorqueMeasure > v5_MomentX, boost::optional< IfcTorqueMeasure > v6_MomentY, boost::optional< IfcTorqueMeasure > v7_MomentZ);
-    typedef IfcStructuralLoadSingleForce* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcStructuralLoadSingleForce > > list;
-    typedef IfcTemplatedEntityList< IfcStructuralLoadSingleForce >::it it;
+    IfcStructuralLoadSingleForce (IfcAbstractEntity* e);
+    IfcStructuralLoadSingleForce (boost::optional< std::string > v1_Name, boost::optional< double > v2_ForceX, boost::optional< double > v3_ForceY, boost::optional< double > v4_ForceZ, boost::optional< double > v5_MomentX, boost::optional< double > v6_MomentY, boost::optional< double > v7_MomentZ);
+    typedef IfcTemplatedEntityList< IfcStructuralLoadSingleForce > list;
 };
 /// Definition from IAI: Instances of the entity
 ///   IfcStructuralLoadSingleForceWarping, as a subtype of
@@ -16213,134 +17127,131 @@ class IfcStructuralLoadSingleForce : public IfcStructuralLoadStatic {
 class IfcStructuralLoadSingleForceWarping : public IfcStructuralLoadSingleForce {
 public:
     /// Whether the optional attribute WarpingMoment is defined for this IfcStructuralLoadSingleForceWarping
-    bool hasWarpingMoment();
+    bool hasWarpingMoment() const;
     /// The warping moment at the point load.
-    IfcWarpingMomentMeasure WarpingMoment();
-    void setWarpingMoment(IfcWarpingMomentMeasure v);
+    double WarpingMoment() const;
+    void setWarpingMoment(double v);
     virtual unsigned int getArgumentCount() const { return 8; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 7: return IfcUtil::Argument_DOUBLE; } return IfcStructuralLoadSingleForce::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 7: return Type::IfcWarpingMomentMeasure; } return IfcStructuralLoadSingleForce::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 7: return "WarpingMoment"; } return IfcStructuralLoadSingleForce::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcStructuralLoadSingleForceWarping (IfcAbstractEntityPtr e);
-    IfcStructuralLoadSingleForceWarping (boost::optional< IfcLabel > v1_Name, boost::optional< IfcForceMeasure > v2_ForceX, boost::optional< IfcForceMeasure > v3_ForceY, boost::optional< IfcForceMeasure > v4_ForceZ, boost::optional< IfcTorqueMeasure > v5_MomentX, boost::optional< IfcTorqueMeasure > v6_MomentY, boost::optional< IfcTorqueMeasure > v7_MomentZ, boost::optional< IfcWarpingMomentMeasure > v8_WarpingMoment);
-    typedef IfcStructuralLoadSingleForceWarping* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcStructuralLoadSingleForceWarping > > list;
-    typedef IfcTemplatedEntityList< IfcStructuralLoadSingleForceWarping >::it it;
+    IfcStructuralLoadSingleForceWarping (IfcAbstractEntity* e);
+    IfcStructuralLoadSingleForceWarping (boost::optional< std::string > v1_Name, boost::optional< double > v2_ForceX, boost::optional< double > v3_ForceY, boost::optional< double > v4_ForceZ, boost::optional< double > v5_MomentX, boost::optional< double > v6_MomentY, boost::optional< double > v7_MomentZ, boost::optional< double > v8_WarpingMoment);
+    typedef IfcTemplatedEntityList< IfcStructuralLoadSingleForceWarping > list;
 };
 
 class IfcStructuralProfileProperties : public IfcGeneralProfileProperties {
 public:
     /// Whether the optional attribute TorsionalConstantX is defined for this IfcStructuralProfileProperties
-    bool hasTorsionalConstantX();
-    IfcMomentOfInertiaMeasure TorsionalConstantX();
-    void setTorsionalConstantX(IfcMomentOfInertiaMeasure v);
+    bool hasTorsionalConstantX() const;
+    double TorsionalConstantX() const;
+    void setTorsionalConstantX(double v);
     /// Whether the optional attribute MomentOfInertiaYZ is defined for this IfcStructuralProfileProperties
-    bool hasMomentOfInertiaYZ();
-    IfcMomentOfInertiaMeasure MomentOfInertiaYZ();
-    void setMomentOfInertiaYZ(IfcMomentOfInertiaMeasure v);
+    bool hasMomentOfInertiaYZ() const;
+    double MomentOfInertiaYZ() const;
+    void setMomentOfInertiaYZ(double v);
     /// Whether the optional attribute MomentOfInertiaY is defined for this IfcStructuralProfileProperties
-    bool hasMomentOfInertiaY();
-    IfcMomentOfInertiaMeasure MomentOfInertiaY();
-    void setMomentOfInertiaY(IfcMomentOfInertiaMeasure v);
+    bool hasMomentOfInertiaY() const;
+    double MomentOfInertiaY() const;
+    void setMomentOfInertiaY(double v);
     /// Whether the optional attribute MomentOfInertiaZ is defined for this IfcStructuralProfileProperties
-    bool hasMomentOfInertiaZ();
-    IfcMomentOfInertiaMeasure MomentOfInertiaZ();
-    void setMomentOfInertiaZ(IfcMomentOfInertiaMeasure v);
+    bool hasMomentOfInertiaZ() const;
+    double MomentOfInertiaZ() const;
+    void setMomentOfInertiaZ(double v);
     /// Whether the optional attribute WarpingConstant is defined for this IfcStructuralProfileProperties
-    bool hasWarpingConstant();
-    IfcWarpingConstantMeasure WarpingConstant();
-    void setWarpingConstant(IfcWarpingConstantMeasure v);
+    bool hasWarpingConstant() const;
+    double WarpingConstant() const;
+    void setWarpingConstant(double v);
     /// Whether the optional attribute ShearCentreZ is defined for this IfcStructuralProfileProperties
-    bool hasShearCentreZ();
-    IfcLengthMeasure ShearCentreZ();
-    void setShearCentreZ(IfcLengthMeasure v);
+    bool hasShearCentreZ() const;
+    double ShearCentreZ() const;
+    void setShearCentreZ(double v);
     /// Whether the optional attribute ShearCentreY is defined for this IfcStructuralProfileProperties
-    bool hasShearCentreY();
-    IfcLengthMeasure ShearCentreY();
-    void setShearCentreY(IfcLengthMeasure v);
+    bool hasShearCentreY() const;
+    double ShearCentreY() const;
+    void setShearCentreY(double v);
     /// Whether the optional attribute ShearDeformationAreaZ is defined for this IfcStructuralProfileProperties
-    bool hasShearDeformationAreaZ();
-    IfcAreaMeasure ShearDeformationAreaZ();
-    void setShearDeformationAreaZ(IfcAreaMeasure v);
+    bool hasShearDeformationAreaZ() const;
+    double ShearDeformationAreaZ() const;
+    void setShearDeformationAreaZ(double v);
     /// Whether the optional attribute ShearDeformationAreaY is defined for this IfcStructuralProfileProperties
-    bool hasShearDeformationAreaY();
-    IfcAreaMeasure ShearDeformationAreaY();
-    void setShearDeformationAreaY(IfcAreaMeasure v);
+    bool hasShearDeformationAreaY() const;
+    double ShearDeformationAreaY() const;
+    void setShearDeformationAreaY(double v);
     /// Whether the optional attribute MaximumSectionModulusY is defined for this IfcStructuralProfileProperties
-    bool hasMaximumSectionModulusY();
-    IfcSectionModulusMeasure MaximumSectionModulusY();
-    void setMaximumSectionModulusY(IfcSectionModulusMeasure v);
+    bool hasMaximumSectionModulusY() const;
+    double MaximumSectionModulusY() const;
+    void setMaximumSectionModulusY(double v);
     /// Whether the optional attribute MinimumSectionModulusY is defined for this IfcStructuralProfileProperties
-    bool hasMinimumSectionModulusY();
-    IfcSectionModulusMeasure MinimumSectionModulusY();
-    void setMinimumSectionModulusY(IfcSectionModulusMeasure v);
+    bool hasMinimumSectionModulusY() const;
+    double MinimumSectionModulusY() const;
+    void setMinimumSectionModulusY(double v);
     /// Whether the optional attribute MaximumSectionModulusZ is defined for this IfcStructuralProfileProperties
-    bool hasMaximumSectionModulusZ();
-    IfcSectionModulusMeasure MaximumSectionModulusZ();
-    void setMaximumSectionModulusZ(IfcSectionModulusMeasure v);
+    bool hasMaximumSectionModulusZ() const;
+    double MaximumSectionModulusZ() const;
+    void setMaximumSectionModulusZ(double v);
     /// Whether the optional attribute MinimumSectionModulusZ is defined for this IfcStructuralProfileProperties
-    bool hasMinimumSectionModulusZ();
-    IfcSectionModulusMeasure MinimumSectionModulusZ();
-    void setMinimumSectionModulusZ(IfcSectionModulusMeasure v);
+    bool hasMinimumSectionModulusZ() const;
+    double MinimumSectionModulusZ() const;
+    void setMinimumSectionModulusZ(double v);
     /// Whether the optional attribute TorsionalSectionModulus is defined for this IfcStructuralProfileProperties
-    bool hasTorsionalSectionModulus();
-    IfcSectionModulusMeasure TorsionalSectionModulus();
-    void setTorsionalSectionModulus(IfcSectionModulusMeasure v);
+    bool hasTorsionalSectionModulus() const;
+    double TorsionalSectionModulus() const;
+    void setTorsionalSectionModulus(double v);
     /// Whether the optional attribute CentreOfGravityInX is defined for this IfcStructuralProfileProperties
-    bool hasCentreOfGravityInX();
-    IfcLengthMeasure CentreOfGravityInX();
-    void setCentreOfGravityInX(IfcLengthMeasure v);
+    bool hasCentreOfGravityInX() const;
+    double CentreOfGravityInX() const;
+    void setCentreOfGravityInX(double v);
     /// Whether the optional attribute CentreOfGravityInY is defined for this IfcStructuralProfileProperties
-    bool hasCentreOfGravityInY();
-    IfcLengthMeasure CentreOfGravityInY();
-    void setCentreOfGravityInY(IfcLengthMeasure v);
+    bool hasCentreOfGravityInY() const;
+    double CentreOfGravityInY() const;
+    void setCentreOfGravityInY(double v);
     virtual unsigned int getArgumentCount() const { return 23; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 7: return IfcUtil::Argument_DOUBLE; case 8: return IfcUtil::Argument_DOUBLE; case 9: return IfcUtil::Argument_DOUBLE; case 10: return IfcUtil::Argument_DOUBLE; case 11: return IfcUtil::Argument_DOUBLE; case 12: return IfcUtil::Argument_DOUBLE; case 13: return IfcUtil::Argument_DOUBLE; case 14: return IfcUtil::Argument_DOUBLE; case 15: return IfcUtil::Argument_DOUBLE; case 16: return IfcUtil::Argument_DOUBLE; case 17: return IfcUtil::Argument_DOUBLE; case 18: return IfcUtil::Argument_DOUBLE; case 19: return IfcUtil::Argument_DOUBLE; case 20: return IfcUtil::Argument_DOUBLE; case 21: return IfcUtil::Argument_DOUBLE; case 22: return IfcUtil::Argument_DOUBLE; } return IfcGeneralProfileProperties::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 7: return Type::IfcMomentOfInertiaMeasure; case 8: return Type::IfcMomentOfInertiaMeasure; case 9: return Type::IfcMomentOfInertiaMeasure; case 10: return Type::IfcMomentOfInertiaMeasure; case 11: return Type::IfcWarpingConstantMeasure; case 12: return Type::IfcLengthMeasure; case 13: return Type::IfcLengthMeasure; case 14: return Type::IfcAreaMeasure; case 15: return Type::IfcAreaMeasure; case 16: return Type::IfcSectionModulusMeasure; case 17: return Type::IfcSectionModulusMeasure; case 18: return Type::IfcSectionModulusMeasure; case 19: return Type::IfcSectionModulusMeasure; case 20: return Type::IfcSectionModulusMeasure; case 21: return Type::IfcLengthMeasure; case 22: return Type::IfcLengthMeasure; } return IfcGeneralProfileProperties::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 7: return "TorsionalConstantX"; case 8: return "MomentOfInertiaYZ"; case 9: return "MomentOfInertiaY"; case 10: return "MomentOfInertiaZ"; case 11: return "WarpingConstant"; case 12: return "ShearCentreZ"; case 13: return "ShearCentreY"; case 14: return "ShearDeformationAreaZ"; case 15: return "ShearDeformationAreaY"; case 16: return "MaximumSectionModulusY"; case 17: return "MinimumSectionModulusY"; case 18: return "MaximumSectionModulusZ"; case 19: return "MinimumSectionModulusZ"; case 20: return "TorsionalSectionModulus"; case 21: return "CentreOfGravityInX"; case 22: return "CentreOfGravityInY"; } return IfcGeneralProfileProperties::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcStructuralProfileProperties (IfcAbstractEntityPtr e);
-    IfcStructuralProfileProperties (boost::optional< IfcLabel > v1_ProfileName, IfcProfileDef* v2_ProfileDefinition, boost::optional< IfcMassPerLengthMeasure > v3_PhysicalWeight, boost::optional< IfcPositiveLengthMeasure > v4_Perimeter, boost::optional< IfcPositiveLengthMeasure > v5_MinimumPlateThickness, boost::optional< IfcPositiveLengthMeasure > v6_MaximumPlateThickness, boost::optional< IfcAreaMeasure > v7_CrossSectionArea, boost::optional< IfcMomentOfInertiaMeasure > v8_TorsionalConstantX, boost::optional< IfcMomentOfInertiaMeasure > v9_MomentOfInertiaYZ, boost::optional< IfcMomentOfInertiaMeasure > v10_MomentOfInertiaY, boost::optional< IfcMomentOfInertiaMeasure > v11_MomentOfInertiaZ, boost::optional< IfcWarpingConstantMeasure > v12_WarpingConstant, boost::optional< IfcLengthMeasure > v13_ShearCentreZ, boost::optional< IfcLengthMeasure > v14_ShearCentreY, boost::optional< IfcAreaMeasure > v15_ShearDeformationAreaZ, boost::optional< IfcAreaMeasure > v16_ShearDeformationAreaY, boost::optional< IfcSectionModulusMeasure > v17_MaximumSectionModulusY, boost::optional< IfcSectionModulusMeasure > v18_MinimumSectionModulusY, boost::optional< IfcSectionModulusMeasure > v19_MaximumSectionModulusZ, boost::optional< IfcSectionModulusMeasure > v20_MinimumSectionModulusZ, boost::optional< IfcSectionModulusMeasure > v21_TorsionalSectionModulus, boost::optional< IfcLengthMeasure > v22_CentreOfGravityInX, boost::optional< IfcLengthMeasure > v23_CentreOfGravityInY);
-    typedef IfcStructuralProfileProperties* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcStructuralProfileProperties > > list;
-    typedef IfcTemplatedEntityList< IfcStructuralProfileProperties >::it it;
+    IfcStructuralProfileProperties (IfcAbstractEntity* e);
+    IfcStructuralProfileProperties (boost::optional< std::string > v1_ProfileName, IfcProfileDef* v2_ProfileDefinition, boost::optional< double > v3_PhysicalWeight, boost::optional< double > v4_Perimeter, boost::optional< double > v5_MinimumPlateThickness, boost::optional< double > v6_MaximumPlateThickness, boost::optional< double > v7_CrossSectionArea, boost::optional< double > v8_TorsionalConstantX, boost::optional< double > v9_MomentOfInertiaYZ, boost::optional< double > v10_MomentOfInertiaY, boost::optional< double > v11_MomentOfInertiaZ, boost::optional< double > v12_WarpingConstant, boost::optional< double > v13_ShearCentreZ, boost::optional< double > v14_ShearCentreY, boost::optional< double > v15_ShearDeformationAreaZ, boost::optional< double > v16_ShearDeformationAreaY, boost::optional< double > v17_MaximumSectionModulusY, boost::optional< double > v18_MinimumSectionModulusY, boost::optional< double > v19_MaximumSectionModulusZ, boost::optional< double > v20_MinimumSectionModulusZ, boost::optional< double > v21_TorsionalSectionModulus, boost::optional< double > v22_CentreOfGravityInX, boost::optional< double > v23_CentreOfGravityInY);
+    typedef IfcTemplatedEntityList< IfcStructuralProfileProperties > list;
 };
 
 class IfcStructuralSteelProfileProperties : public IfcStructuralProfileProperties {
 public:
     /// Whether the optional attribute ShearAreaZ is defined for this IfcStructuralSteelProfileProperties
-    bool hasShearAreaZ();
-    IfcAreaMeasure ShearAreaZ();
-    void setShearAreaZ(IfcAreaMeasure v);
+    bool hasShearAreaZ() const;
+    double ShearAreaZ() const;
+    void setShearAreaZ(double v);
     /// Whether the optional attribute ShearAreaY is defined for this IfcStructuralSteelProfileProperties
-    bool hasShearAreaY();
-    IfcAreaMeasure ShearAreaY();
-    void setShearAreaY(IfcAreaMeasure v);
+    bool hasShearAreaY() const;
+    double ShearAreaY() const;
+    void setShearAreaY(double v);
     /// Whether the optional attribute PlasticShapeFactorY is defined for this IfcStructuralSteelProfileProperties
-    bool hasPlasticShapeFactorY();
-    IfcPositiveRatioMeasure PlasticShapeFactorY();
-    void setPlasticShapeFactorY(IfcPositiveRatioMeasure v);
+    bool hasPlasticShapeFactorY() const;
+    double PlasticShapeFactorY() const;
+    void setPlasticShapeFactorY(double v);
     /// Whether the optional attribute PlasticShapeFactorZ is defined for this IfcStructuralSteelProfileProperties
-    bool hasPlasticShapeFactorZ();
-    IfcPositiveRatioMeasure PlasticShapeFactorZ();
-    void setPlasticShapeFactorZ(IfcPositiveRatioMeasure v);
+    bool hasPlasticShapeFactorZ() const;
+    double PlasticShapeFactorZ() const;
+    void setPlasticShapeFactorZ(double v);
     virtual unsigned int getArgumentCount() const { return 27; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 23: return IfcUtil::Argument_DOUBLE; case 24: return IfcUtil::Argument_DOUBLE; case 25: return IfcUtil::Argument_DOUBLE; case 26: return IfcUtil::Argument_DOUBLE; } return IfcStructuralProfileProperties::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 23: return Type::IfcAreaMeasure; case 24: return Type::IfcAreaMeasure; case 25: return Type::IfcPositiveRatioMeasure; case 26: return Type::IfcPositiveRatioMeasure; } return IfcStructuralProfileProperties::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 23: return "ShearAreaZ"; case 24: return "ShearAreaY"; case 25: return "PlasticShapeFactorY"; case 26: return "PlasticShapeFactorZ"; } return IfcStructuralProfileProperties::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcStructuralSteelProfileProperties (IfcAbstractEntityPtr e);
-    IfcStructuralSteelProfileProperties (boost::optional< IfcLabel > v1_ProfileName, IfcProfileDef* v2_ProfileDefinition, boost::optional< IfcMassPerLengthMeasure > v3_PhysicalWeight, boost::optional< IfcPositiveLengthMeasure > v4_Perimeter, boost::optional< IfcPositiveLengthMeasure > v5_MinimumPlateThickness, boost::optional< IfcPositiveLengthMeasure > v6_MaximumPlateThickness, boost::optional< IfcAreaMeasure > v7_CrossSectionArea, boost::optional< IfcMomentOfInertiaMeasure > v8_TorsionalConstantX, boost::optional< IfcMomentOfInertiaMeasure > v9_MomentOfInertiaYZ, boost::optional< IfcMomentOfInertiaMeasure > v10_MomentOfInertiaY, boost::optional< IfcMomentOfInertiaMeasure > v11_MomentOfInertiaZ, boost::optional< IfcWarpingConstantMeasure > v12_WarpingConstant, boost::optional< IfcLengthMeasure > v13_ShearCentreZ, boost::optional< IfcLengthMeasure > v14_ShearCentreY, boost::optional< IfcAreaMeasure > v15_ShearDeformationAreaZ, boost::optional< IfcAreaMeasure > v16_ShearDeformationAreaY, boost::optional< IfcSectionModulusMeasure > v17_MaximumSectionModulusY, boost::optional< IfcSectionModulusMeasure > v18_MinimumSectionModulusY, boost::optional< IfcSectionModulusMeasure > v19_MaximumSectionModulusZ, boost::optional< IfcSectionModulusMeasure > v20_MinimumSectionModulusZ, boost::optional< IfcSectionModulusMeasure > v21_TorsionalSectionModulus, boost::optional< IfcLengthMeasure > v22_CentreOfGravityInX, boost::optional< IfcLengthMeasure > v23_CentreOfGravityInY, boost::optional< IfcAreaMeasure > v24_ShearAreaZ, boost::optional< IfcAreaMeasure > v25_ShearAreaY, boost::optional< IfcPositiveRatioMeasure > v26_PlasticShapeFactorY, boost::optional< IfcPositiveRatioMeasure > v27_PlasticShapeFactorZ);
-    typedef IfcStructuralSteelProfileProperties* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcStructuralSteelProfileProperties > > list;
-    typedef IfcTemplatedEntityList< IfcStructuralSteelProfileProperties >::it it;
+    IfcStructuralSteelProfileProperties (IfcAbstractEntity* e);
+    IfcStructuralSteelProfileProperties (boost::optional< std::string > v1_ProfileName, IfcProfileDef* v2_ProfileDefinition, boost::optional< double > v3_PhysicalWeight, boost::optional< double > v4_Perimeter, boost::optional< double > v5_MinimumPlateThickness, boost::optional< double > v6_MaximumPlateThickness, boost::optional< double > v7_CrossSectionArea, boost::optional< double > v8_TorsionalConstantX, boost::optional< double > v9_MomentOfInertiaYZ, boost::optional< double > v10_MomentOfInertiaY, boost::optional< double > v11_MomentOfInertiaZ, boost::optional< double > v12_WarpingConstant, boost::optional< double > v13_ShearCentreZ, boost::optional< double > v14_ShearCentreY, boost::optional< double > v15_ShearDeformationAreaZ, boost::optional< double > v16_ShearDeformationAreaY, boost::optional< double > v17_MaximumSectionModulusY, boost::optional< double > v18_MinimumSectionModulusY, boost::optional< double > v19_MaximumSectionModulusZ, boost::optional< double > v20_MinimumSectionModulusZ, boost::optional< double > v21_TorsionalSectionModulus, boost::optional< double > v22_CentreOfGravityInX, boost::optional< double > v23_CentreOfGravityInY, boost::optional< double > v24_ShearAreaZ, boost::optional< double > v25_ShearAreaY, boost::optional< double > v26_PlasticShapeFactorY, boost::optional< double > v27_PlasticShapeFactorZ);
+    typedef IfcTemplatedEntityList< IfcStructuralSteelProfileProperties > list;
 };
 /// Definition from ISO/DIS 10303-42:1999(E): A subedge is an edge whose domain is a connected portion of the domain of an existing edge. The topological constraints on a subedge are the same as those on an edge. 
 /// 
@@ -16355,20 +17266,19 @@ class IfcStructuralSteelProfileProperties : public IfcStructuralProfilePropertie
 class IfcSubedge : public IfcEdge {
 public:
     /// The Edge, or Subedge, which contains the Subedge.
-    IfcEdge* ParentEdge();
+    IfcEdge* ParentEdge() const;
     void setParentEdge(IfcEdge* v);
     virtual unsigned int getArgumentCount() const { return 3; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 2: return IfcUtil::Argument_ENTITY; } return IfcEdge::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 2: return Type::IfcEdge; } return IfcEdge::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 2: return "ParentEdge"; } return IfcEdge::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcSubedge (IfcAbstractEntityPtr e);
+    IfcSubedge (IfcAbstractEntity* e);
     IfcSubedge (IfcVertex* v1_EdgeStart, IfcVertex* v2_EdgeEnd, IfcEdge* v3_ParentEdge);
-    typedef IfcSubedge* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcSubedge > > list;
-    typedef IfcTemplatedEntityList< IfcSubedge >::it it;
+    typedef IfcTemplatedEntityList< IfcSubedge > list;
 };
 /// Definition from ISO/CD 10303-42:1992: A surface can be envisioned as a set of connected points in 3-dimensional space which is always locally 2-dimensional, but need not be a manifold.  
 /// 
@@ -16384,16 +17294,15 @@ class IfcSurface : public IfcGeometricRepresentationItem {
 public:
     virtual unsigned int getArgumentCount() const { return 0; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcGeometricRepresentationItem::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcGeometricRepresentationItem::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcGeometricRepresentationItem::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcSurface (IfcAbstractEntityPtr e);
+    IfcSurface (IfcAbstractEntity* e);
     IfcSurface ();
-    typedef IfcSurface* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcSurface > > list;
-    typedef IfcTemplatedEntityList< IfcSurface >::it it;
+    typedef IfcTemplatedEntityList< IfcSurface > list;
 };
 /// IfcSurfaceStyleRendering holds the properties for visualization related to a particular surface side style.  
 /// 
@@ -16443,66 +17352,65 @@ class IfcSurface : public IfcGeometricRepresentationItem {
 class IfcSurfaceStyleRendering : public IfcSurfaceStyleShading {
 public:
     /// Whether the optional attribute Transparency is defined for this IfcSurfaceStyleRendering
-    bool hasTransparency();
+    bool hasTransparency() const;
     /// Definition from ISO/CD 10303-46: The degree of transparency is indicated by the percentage of light traversing the surface.
     /// Definition from VRML97 - ISO/IEC 14772-1:1997: The transparency field specifies how "clear" an object is, with 1.0 being completely transparent, and 0.0 completely opaque. If not given, the value 0.0 (opaque) is assumed.
-    IfcNormalisedRatioMeasure Transparency();
-    void setTransparency(IfcNormalisedRatioMeasure v);
+    double Transparency() const;
+    void setTransparency(double v);
     /// Whether the optional attribute DiffuseColour is defined for this IfcSurfaceStyleRendering
-    bool hasDiffuseColour();
+    bool hasDiffuseColour() const;
     /// The diffuse part of the reflectance equation can be given as either a colour or a scalar factor.
     /// The diffuse colour field reflects all light sources depending on the angle of the surface with respect to the light source. The more directly the surface faces the light, the more diffuse light reflects.
     /// The diffuse factor field specifies how much diffuse light from light sources this surface shall reflect. Diffuse light depends on the angle of the surface with respect to the light source. The more directly the surface faces the light, the more diffuse light reflects. The diffuse colour is then defined by surface colour * diffuse factor.
-    IfcColourOrFactor DiffuseColour();
-    void setDiffuseColour(IfcColourOrFactor v);
+    IfcColourOrFactor* DiffuseColour() const;
+    void setDiffuseColour(IfcColourOrFactor* v);
     /// Whether the optional attribute TransmissionColour is defined for this IfcSurfaceStyleRendering
-    bool hasTransmissionColour();
+    bool hasTransmissionColour() const;
     /// The transmissive part of the reflectance equation can be given as either a colour or a scalar factor. It only applies to materials which Transparency field is greater than zero.
     /// The transmissive colour field specifies the colour that passes through a transparant material (like the colour that shines through a glass).
     /// The transmissive factor defines the transmissive part, the transmissive colour is then defined by surface colour * transmissive factor.
-    IfcColourOrFactor TransmissionColour();
-    void setTransmissionColour(IfcColourOrFactor v);
+    IfcColourOrFactor* TransmissionColour() const;
+    void setTransmissionColour(IfcColourOrFactor* v);
     /// Whether the optional attribute DiffuseTransmissionColour is defined for this IfcSurfaceStyleRendering
-    bool hasDiffuseTransmissionColour();
+    bool hasDiffuseTransmissionColour() const;
     /// The diffuse transmission part of the reflectance equation can be given as either a colour or a scalar factor. It only applies to materials whose Transparency field is greater than zero.
     /// The diffuse transmission colour specifies how much diffuse light is reflected at the opposite side of the material surface.
     /// The diffuse transmission factor field specifies how much diffuse light from light sources this surface shall reflect on the opposite side of the material surface. The diffuse transmissive colour is then defined by surface colour * diffuse transmissive factor.
-    IfcColourOrFactor DiffuseTransmissionColour();
-    void setDiffuseTransmissionColour(IfcColourOrFactor v);
+    IfcColourOrFactor* DiffuseTransmissionColour() const;
+    void setDiffuseTransmissionColour(IfcColourOrFactor* v);
     /// Whether the optional attribute ReflectionColour is defined for this IfcSurfaceStyleRendering
-    bool hasReflectionColour();
+    bool hasReflectionColour() const;
     /// The reflection (or mirror) part of the reflectance equation can be given as either a colour or a scalar factor. Applies to "glass" and "mirror" reflection models.
     /// The reflection colour specifies the contribution made by light from the mirror direction, i.e. light being reflected from the surface.
     /// The reflection factor specifies the amount of contribution made by light from the mirror direction. The reflection colour is then defined by surface colour * reflection factor.
-    IfcColourOrFactor ReflectionColour();
-    void setReflectionColour(IfcColourOrFactor v);
+    IfcColourOrFactor* ReflectionColour() const;
+    void setReflectionColour(IfcColourOrFactor* v);
     /// Whether the optional attribute SpecularColour is defined for this IfcSurfaceStyleRendering
-    bool hasSpecularColour();
+    bool hasSpecularColour() const;
     /// The specular part of the reflectance equation can be given as either a colour or a scalar factor.
     /// The specular colour determine the specular highlights (e.g., the shiny spots on an apple). When the angle from the light to the surface is close to the angle from the surface to the viewer, the specular colour is added to the diffuse and ambient colour calculations.
     /// The specular factor defines the specular part, the specular colour is then defined by surface colour * specular factor.
-    IfcColourOrFactor SpecularColour();
-    void setSpecularColour(IfcColourOrFactor v);
+    IfcColourOrFactor* SpecularColour() const;
+    void setSpecularColour(IfcColourOrFactor* v);
     /// Whether the optional attribute SpecularHighlight is defined for this IfcSurfaceStyleRendering
-    bool hasSpecularHighlight();
+    bool hasSpecularHighlight() const;
     /// The exponent or roughness part of the specular reflectance.
-    IfcSpecularHighlightSelect SpecularHighlight();
-    void setSpecularHighlight(IfcSpecularHighlightSelect v);
+    IfcSpecularHighlightSelect* SpecularHighlight() const;
+    void setSpecularHighlight(IfcSpecularHighlightSelect* v);
     /// Identifies the predefined types of reflectance method from which the method required may be set.
-    IfcReflectanceMethodEnum::IfcReflectanceMethodEnum ReflectanceMethod();
+    IfcReflectanceMethodEnum::IfcReflectanceMethodEnum ReflectanceMethod() const;
     void setReflectanceMethod(IfcReflectanceMethodEnum::IfcReflectanceMethodEnum v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 1: return IfcUtil::Argument_DOUBLE; case 2: return IfcUtil::Argument_ENTITY; case 3: return IfcUtil::Argument_ENTITY; case 4: return IfcUtil::Argument_ENTITY; case 5: return IfcUtil::Argument_ENTITY; case 6: return IfcUtil::Argument_ENTITY; case 7: return IfcUtil::Argument_ENTITY; case 8: return IfcUtil::Argument_ENUMERATION; } return IfcSurfaceStyleShading::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 1: return Type::IfcNormalisedRatioMeasure; case 2: return Type::IfcColourOrFactor; case 3: return Type::IfcColourOrFactor; case 4: return Type::IfcColourOrFactor; case 5: return Type::IfcColourOrFactor; case 6: return Type::IfcColourOrFactor; case 7: return Type::IfcSpecularHighlightSelect; case 8: return Type::IfcReflectanceMethodEnum; } return IfcSurfaceStyleShading::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 1: return "Transparency"; case 2: return "DiffuseColour"; case 3: return "TransmissionColour"; case 4: return "DiffuseTransmissionColour"; case 5: return "ReflectionColour"; case 6: return "SpecularColour"; case 7: return "SpecularHighlight"; case 8: return "ReflectanceMethod"; } return IfcSurfaceStyleShading::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcSurfaceStyleRendering (IfcAbstractEntityPtr e);
-    IfcSurfaceStyleRendering (IfcColourRgb* v1_SurfaceColour, boost::optional< IfcNormalisedRatioMeasure > v2_Transparency, boost::optional< IfcColourOrFactor > v3_DiffuseColour, boost::optional< IfcColourOrFactor > v4_TransmissionColour, boost::optional< IfcColourOrFactor > v5_DiffuseTransmissionColour, boost::optional< IfcColourOrFactor > v6_ReflectionColour, boost::optional< IfcColourOrFactor > v7_SpecularColour, boost::optional< IfcSpecularHighlightSelect > v8_SpecularHighlight, IfcReflectanceMethodEnum::IfcReflectanceMethodEnum v9_ReflectanceMethod);
-    typedef IfcSurfaceStyleRendering* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcSurfaceStyleRendering > > list;
-    typedef IfcTemplatedEntityList< IfcSurfaceStyleRendering >::it it;
+    IfcSurfaceStyleRendering (IfcAbstractEntity* e);
+    IfcSurfaceStyleRendering (IfcColourRgb* v1_SurfaceColour, boost::optional< double > v2_Transparency, IfcColourOrFactor* v3_DiffuseColour, IfcColourOrFactor* v4_TransmissionColour, IfcColourOrFactor* v5_DiffuseTransmissionColour, IfcColourOrFactor* v6_ReflectionColour, IfcColourOrFactor* v7_SpecularColour, IfcSpecularHighlightSelect* v8_SpecularHighlight, IfcReflectanceMethodEnum::IfcReflectanceMethodEnum v9_ReflectanceMethod);
+    typedef IfcTemplatedEntityList< IfcSurfaceStyleRendering > list;
 };
 /// Definition from ISO/CD 10303-42:1992: The swept area
 ///   solid entity collects the entities which are defined
@@ -16525,23 +17433,22 @@ class IfcSurfaceStyleRendering : public IfcSurfaceStyleShading {
 class IfcSweptAreaSolid : public IfcSolidModel {
 public:
     /// The surface defining the area to be swept. It is given as a profile definition within the xy plane of the position coordinate system.
-    IfcProfileDef* SweptArea();
+    IfcProfileDef* SweptArea() const;
     void setSweptArea(IfcProfileDef* v);
     /// Position coordinate system for the swept area, provided by a profile definition within the XY plane of the Position.
-    IfcAxis2Placement3D* Position();
+    IfcAxis2Placement3D* Position() const;
     void setPosition(IfcAxis2Placement3D* v);
     virtual unsigned int getArgumentCount() const { return 2; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY; case 1: return IfcUtil::Argument_ENTITY; } return IfcSolidModel::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcProfileDef; case 1: return Type::IfcAxis2Placement3D; } return IfcSolidModel::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "SweptArea"; case 1: return "Position"; } return IfcSolidModel::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcSweptAreaSolid (IfcAbstractEntityPtr e);
+    IfcSweptAreaSolid (IfcAbstractEntity* e);
     IfcSweptAreaSolid (IfcProfileDef* v1_SweptArea, IfcAxis2Placement3D* v2_Position);
-    typedef IfcSweptAreaSolid* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcSweptAreaSolid > > list;
-    typedef IfcTemplatedEntityList< IfcSweptAreaSolid >::it it;
+    typedef IfcTemplatedEntityList< IfcSweptAreaSolid > list;
 };
 /// Definition from ISO 10303-42:2002: A swept
 /// disk solid is the solid produced by sweeping a circular disk
@@ -16599,38 +17506,37 @@ class IfcSweptAreaSolid : public IfcSolidModel {
 class IfcSweptDiskSolid : public IfcSolidModel {
 public:
     /// The curve used to define the sweeping operation. The solid is generated by sweeping a circular disk along the Directrix.
-    IfcCurve* Directrix();
+    IfcCurve* Directrix() const;
     void setDirectrix(IfcCurve* v);
     /// The Radius of the circular disk to be swept along the directrix. Denotes the outer radius, if an InnerRadius is applied.
-    IfcPositiveLengthMeasure Radius();
-    void setRadius(IfcPositiveLengthMeasure v);
+    double Radius() const;
+    void setRadius(double v);
     /// Whether the optional attribute InnerRadius is defined for this IfcSweptDiskSolid
-    bool hasInnerRadius();
+    bool hasInnerRadius() const;
     /// This attribute is optional, if present it defines the radius of a circular hole in the centre of the disk.
-    IfcPositiveLengthMeasure InnerRadius();
-    void setInnerRadius(IfcPositiveLengthMeasure v);
+    double InnerRadius() const;
+    void setInnerRadius(double v);
     /// The parameter value on the Directrix at which the sweeping operation commences. If no value is provided the start of the sweeping operation is at the start of the Directrix..
     /// 
     /// IFC2x4 CHANGE  The attribute has been changed to OPTIONAL with upward compatibility for file-based exchange.
-    IfcParameterValue StartParam();
-    void setStartParam(IfcParameterValue v);
+    double StartParam() const;
+    void setStartParam(double v);
     /// The parameter value on the Directrix at which the sweeping operation ends. If no value is provided the end of the sweeping operation is at the end of the Directrix..
     /// 
     /// IFC2x4 CHANGE  The attribute has been changed to OPTIONAL with upward compatibility for file-based exchange.
-    IfcParameterValue EndParam();
-    void setEndParam(IfcParameterValue v);
+    double EndParam() const;
+    void setEndParam(double v);
     virtual unsigned int getArgumentCount() const { return 5; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY; case 1: return IfcUtil::Argument_DOUBLE; case 2: return IfcUtil::Argument_DOUBLE; case 3: return IfcUtil::Argument_DOUBLE; case 4: return IfcUtil::Argument_DOUBLE; } return IfcSolidModel::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcCurve; case 1: return Type::IfcPositiveLengthMeasure; case 2: return Type::IfcPositiveLengthMeasure; case 3: return Type::IfcParameterValue; case 4: return Type::IfcParameterValue; } return IfcSolidModel::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Directrix"; case 1: return "Radius"; case 2: return "InnerRadius"; case 3: return "StartParam"; case 4: return "EndParam"; } return IfcSolidModel::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcSweptDiskSolid (IfcAbstractEntityPtr e);
-    IfcSweptDiskSolid (IfcCurve* v1_Directrix, IfcPositiveLengthMeasure v2_Radius, boost::optional< IfcPositiveLengthMeasure > v3_InnerRadius, IfcParameterValue v4_StartParam, IfcParameterValue v5_EndParam);
-    typedef IfcSweptDiskSolid* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcSweptDiskSolid > > list;
-    typedef IfcTemplatedEntityList< IfcSweptDiskSolid >::it it;
+    IfcSweptDiskSolid (IfcAbstractEntity* e);
+    IfcSweptDiskSolid (IfcCurve* v1_Directrix, double v2_Radius, boost::optional< double > v3_InnerRadius, double v4_StartParam, double v5_EndParam);
+    typedef IfcTemplatedEntityList< IfcSweptDiskSolid > list;
 };
 /// Definition from ISO/CD 10303-42:1992: A swept surface is one that is constructed by sweeping a curve along another curve.  
 /// 
@@ -16640,23 +17546,22 @@ class IfcSweptDiskSolid : public IfcSolidModel {
 class IfcSweptSurface : public IfcSurface {
 public:
     /// The curve to be swept in defining the surface. The curve is defined as a profile within the position coordinate system.
-    IfcProfileDef* SweptCurve();
+    IfcProfileDef* SweptCurve() const;
     void setSweptCurve(IfcProfileDef* v);
     /// Position coordinate system for the placement of the profile within the xy plane of the axis placement.
-    IfcAxis2Placement3D* Position();
+    IfcAxis2Placement3D* Position() const;
     void setPosition(IfcAxis2Placement3D* v);
     virtual unsigned int getArgumentCount() const { return 2; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY; case 1: return IfcUtil::Argument_ENTITY; } return IfcSurface::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcProfileDef; case 1: return Type::IfcAxis2Placement3D; } return IfcSurface::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "SweptCurve"; case 1: return "Position"; } return IfcSurface::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcSweptSurface (IfcAbstractEntityPtr e);
+    IfcSweptSurface (IfcAbstractEntity* e);
     IfcSweptSurface (IfcProfileDef* v1_SweptCurve, IfcAxis2Placement3D* v2_Position);
-    typedef IfcSweptSurface* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcSweptSurface > > list;
-    typedef IfcTemplatedEntityList< IfcSweptSurface >::it it;
+    typedef IfcTemplatedEntityList< IfcSweptSurface > list;
 };
 /// IfcTShapeProfileDef defines
 /// a section profile that provides the defining parameters of a T-shaped
@@ -16689,76 +17594,74 @@ class IfcSweptSurface : public IfcSurface {
 class IfcTShapeProfileDef : public IfcParameterizedProfileDef {
 public:
     /// Web lengths, see illustration above (= h).
-    IfcPositiveLengthMeasure Depth();
-    void setDepth(IfcPositiveLengthMeasure v);
+    double Depth() const;
+    void setDepth(double v);
     /// Flange lengths, see illustration above (= b).
-    IfcPositiveLengthMeasure FlangeWidth();
-    void setFlangeWidth(IfcPositiveLengthMeasure v);
+    double FlangeWidth() const;
+    void setFlangeWidth(double v);
     /// Constant wall thickness of web (= ts).
-    IfcPositiveLengthMeasure WebThickness();
-    void setWebThickness(IfcPositiveLengthMeasure v);
+    double WebThickness() const;
+    void setWebThickness(double v);
     /// Constant wall thickness of flange (= tg).
-    IfcPositiveLengthMeasure FlangeThickness();
-    void setFlangeThickness(IfcPositiveLengthMeasure v);
+    double FlangeThickness() const;
+    void setFlangeThickness(double v);
     /// Whether the optional attribute FilletRadius is defined for this IfcTShapeProfileDef
-    bool hasFilletRadius();
+    bool hasFilletRadius() const;
     /// Fillet radius according the above illustration (= r1).
-    IfcPositiveLengthMeasure FilletRadius();
-    void setFilletRadius(IfcPositiveLengthMeasure v);
+    double FilletRadius() const;
+    void setFilletRadius(double v);
     /// Whether the optional attribute FlangeEdgeRadius is defined for this IfcTShapeProfileDef
-    bool hasFlangeEdgeRadius();
+    bool hasFlangeEdgeRadius() const;
     /// Edge radius according the above illustration (= r2).
-    IfcPositiveLengthMeasure FlangeEdgeRadius();
-    void setFlangeEdgeRadius(IfcPositiveLengthMeasure v);
+    double FlangeEdgeRadius() const;
+    void setFlangeEdgeRadius(double v);
     /// Whether the optional attribute WebEdgeRadius is defined for this IfcTShapeProfileDef
-    bool hasWebEdgeRadius();
+    bool hasWebEdgeRadius() const;
     /// Edge radius according the above illustration (= r3).
-    IfcPositiveLengthMeasure WebEdgeRadius();
-    void setWebEdgeRadius(IfcPositiveLengthMeasure v);
+    double WebEdgeRadius() const;
+    void setWebEdgeRadius(double v);
     /// Whether the optional attribute WebSlope is defined for this IfcTShapeProfileDef
-    bool hasWebSlope();
+    bool hasWebSlope() const;
     /// Slope of flange of the profile.
-    IfcPlaneAngleMeasure WebSlope();
-    void setWebSlope(IfcPlaneAngleMeasure v);
+    double WebSlope() const;
+    void setWebSlope(double v);
     /// Whether the optional attribute FlangeSlope is defined for this IfcTShapeProfileDef
-    bool hasFlangeSlope();
+    bool hasFlangeSlope() const;
     /// Slope of web of the profile.
-    IfcPlaneAngleMeasure FlangeSlope();
-    void setFlangeSlope(IfcPlaneAngleMeasure v);
+    double FlangeSlope() const;
+    void setFlangeSlope(double v);
     /// Whether the optional attribute CentreOfGravityInY is defined for this IfcTShapeProfileDef
-    bool hasCentreOfGravityInY();
-    IfcPositiveLengthMeasure CentreOfGravityInY();
-    void setCentreOfGravityInY(IfcPositiveLengthMeasure v);
+    bool hasCentreOfGravityInY() const;
+    double CentreOfGravityInY() const;
+    void setCentreOfGravityInY(double v);
     virtual unsigned int getArgumentCount() const { return 13; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 3: return IfcUtil::Argument_DOUBLE; case 4: return IfcUtil::Argument_DOUBLE; case 5: return IfcUtil::Argument_DOUBLE; case 6: return IfcUtil::Argument_DOUBLE; case 7: return IfcUtil::Argument_DOUBLE; case 8: return IfcUtil::Argument_DOUBLE; case 9: return IfcUtil::Argument_DOUBLE; case 10: return IfcUtil::Argument_DOUBLE; case 11: return IfcUtil::Argument_DOUBLE; case 12: return IfcUtil::Argument_DOUBLE; } return IfcParameterizedProfileDef::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 3: return Type::IfcPositiveLengthMeasure; case 4: return Type::IfcPositiveLengthMeasure; case 5: return Type::IfcPositiveLengthMeasure; case 6: return Type::IfcPositiveLengthMeasure; case 7: return Type::IfcPositiveLengthMeasure; case 8: return Type::IfcPositiveLengthMeasure; case 9: return Type::IfcPositiveLengthMeasure; case 10: return Type::IfcPlaneAngleMeasure; case 11: return Type::IfcPlaneAngleMeasure; case 12: return Type::IfcPositiveLengthMeasure; } return IfcParameterizedProfileDef::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 3: return "Depth"; case 4: return "FlangeWidth"; case 5: return "WebThickness"; case 6: return "FlangeThickness"; case 7: return "FilletRadius"; case 8: return "FlangeEdgeRadius"; case 9: return "WebEdgeRadius"; case 10: return "WebSlope"; case 11: return "FlangeSlope"; case 12: return "CentreOfGravityInY"; } return IfcParameterizedProfileDef::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcTShapeProfileDef (IfcAbstractEntityPtr e);
-    IfcTShapeProfileDef (IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< IfcLabel > v2_ProfileName, IfcAxis2Placement2D* v3_Position, IfcPositiveLengthMeasure v4_Depth, IfcPositiveLengthMeasure v5_FlangeWidth, IfcPositiveLengthMeasure v6_WebThickness, IfcPositiveLengthMeasure v7_FlangeThickness, boost::optional< IfcPositiveLengthMeasure > v8_FilletRadius, boost::optional< IfcPositiveLengthMeasure > v9_FlangeEdgeRadius, boost::optional< IfcPositiveLengthMeasure > v10_WebEdgeRadius, boost::optional< IfcPlaneAngleMeasure > v11_WebSlope, boost::optional< IfcPlaneAngleMeasure > v12_FlangeSlope, boost::optional< IfcPositiveLengthMeasure > v13_CentreOfGravityInY);
-    typedef IfcTShapeProfileDef* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcTShapeProfileDef > > list;
-    typedef IfcTemplatedEntityList< IfcTShapeProfileDef >::it it;
+    IfcTShapeProfileDef (IfcAbstractEntity* e);
+    IfcTShapeProfileDef (IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< std::string > v2_ProfileName, IfcAxis2Placement2D* v3_Position, double v4_Depth, double v5_FlangeWidth, double v6_WebThickness, double v7_FlangeThickness, boost::optional< double > v8_FilletRadius, boost::optional< double > v9_FlangeEdgeRadius, boost::optional< double > v10_WebEdgeRadius, boost::optional< double > v11_WebSlope, boost::optional< double > v12_FlangeSlope, boost::optional< double > v13_CentreOfGravityInY);
+    typedef IfcTemplatedEntityList< IfcTShapeProfileDef > list;
 };
 
 class IfcTerminatorSymbol : public IfcAnnotationSymbolOccurrence {
 public:
-    IfcAnnotationCurveOccurrence* AnnotatedCurve();
+    IfcAnnotationCurveOccurrence* AnnotatedCurve() const;
     void setAnnotatedCurve(IfcAnnotationCurveOccurrence* v);
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 3: return IfcUtil::Argument_ENTITY; } return IfcAnnotationSymbolOccurrence::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 3: return Type::IfcAnnotationCurveOccurrence; } return IfcAnnotationSymbolOccurrence::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 3: return "AnnotatedCurve"; } return IfcAnnotationSymbolOccurrence::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcTerminatorSymbol (IfcAbstractEntityPtr e);
-    IfcTerminatorSymbol (IfcRepresentationItem* v1_Item, SHARED_PTR< IfcTemplatedEntityList< IfcPresentationStyleAssignment > > v2_Styles, boost::optional< IfcLabel > v3_Name, IfcAnnotationCurveOccurrence* v4_AnnotatedCurve);
-    typedef IfcTerminatorSymbol* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcTerminatorSymbol > > list;
-    typedef IfcTemplatedEntityList< IfcTerminatorSymbol >::it it;
+    IfcTerminatorSymbol (IfcAbstractEntity* e);
+    IfcTerminatorSymbol (IfcRepresentationItem* v1_Item, IfcTemplatedEntityList< IfcPresentationStyleAssignment >::ptr v2_Styles, boost::optional< std::string > v3_Name, IfcAnnotationCurveOccurrence* v4_AnnotatedCurve);
+    typedef IfcTemplatedEntityList< IfcTerminatorSymbol > list;
 };
 /// The text literal is a geometric representation item which describes a text string using a string literal and additional position and path information.
 /// 
@@ -16773,27 +17676,26 @@ class IfcTerminatorSymbol : public IfcAnnotationSymbolOccurrence {
 class IfcTextLiteral : public IfcGeometricRepresentationItem {
 public:
     /// The text literal to be presented.
-    IfcPresentableText Literal();
-    void setLiteral(IfcPresentableText v);
+    std::string Literal() const;
+    void setLiteral(std::string v);
     /// An IfcAxis2Placement that determines the placement and orientation of the presented string.
     /// When used with a text style based on IfcTextStyleWithBoxCharacteristics then the y-axis is taken as the reference direction for the box rotation angle and the box slant angle.
-    IfcAxis2Placement Placement();
-    void setPlacement(IfcAxis2Placement v);
+    IfcAxis2Placement* Placement() const;
+    void setPlacement(IfcAxis2Placement* v);
     /// The writing direction of the text literal.
-    IfcTextPath::IfcTextPath Path();
+    IfcTextPath::IfcTextPath Path() const;
     void setPath(IfcTextPath::IfcTextPath v);
     virtual unsigned int getArgumentCount() const { return 3; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_STRING; case 1: return IfcUtil::Argument_ENTITY; case 2: return IfcUtil::Argument_ENUMERATION; } return IfcGeometricRepresentationItem::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcPresentableText; case 1: return Type::IfcAxis2Placement; case 2: return Type::IfcTextPath; } return IfcGeometricRepresentationItem::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Literal"; case 1: return "Placement"; case 2: return "Path"; } return IfcGeometricRepresentationItem::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcTextLiteral (IfcAbstractEntityPtr e);
-    IfcTextLiteral (IfcPresentableText v1_Literal, IfcAxis2Placement v2_Placement, IfcTextPath::IfcTextPath v3_Path);
-    typedef IfcTextLiteral* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcTextLiteral > > list;
-    typedef IfcTemplatedEntityList< IfcTextLiteral >::it it;
+    IfcTextLiteral (IfcAbstractEntity* e);
+    IfcTextLiteral (std::string v1_Literal, IfcAxis2Placement* v2_Placement, IfcTextPath::IfcTextPath v3_Path);
+    typedef IfcTemplatedEntityList< IfcTextLiteral > list;
 };
 /// The text literal with extent is a text literal with the additional explicit information of the planar extent (or surrounding text box). An alignment attribute defines, how the text box is aligned to the placement and how it may expand.
 /// 
@@ -16807,23 +17709,22 @@ class IfcTextLiteral : public IfcGeometricRepresentationItem {
 class IfcTextLiteralWithExtent : public IfcTextLiteral {
 public:
     /// The extent in the x and y direction of the text literal.
-    IfcPlanarExtent* Extent();
+    IfcPlanarExtent* Extent() const;
     void setExtent(IfcPlanarExtent* v);
     /// The alignment of the text literal relative to its position.
-    IfcBoxAlignment BoxAlignment();
-    void setBoxAlignment(IfcBoxAlignment v);
+    std::string BoxAlignment() const;
+    void setBoxAlignment(std::string v);
     virtual unsigned int getArgumentCount() const { return 5; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 3: return IfcUtil::Argument_ENTITY; case 4: return IfcUtil::Argument_STRING; } return IfcTextLiteral::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 3: return Type::IfcPlanarExtent; case 4: return Type::IfcBoxAlignment; } return IfcTextLiteral::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 3: return "Extent"; case 4: return "BoxAlignment"; } return IfcTextLiteral::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcTextLiteralWithExtent (IfcAbstractEntityPtr e);
-    IfcTextLiteralWithExtent (IfcPresentableText v1_Literal, IfcAxis2Placement v2_Placement, IfcTextPath::IfcTextPath v3_Path, IfcPlanarExtent* v4_Extent, IfcBoxAlignment v5_BoxAlignment);
-    typedef IfcTextLiteralWithExtent* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcTextLiteralWithExtent > > list;
-    typedef IfcTemplatedEntityList< IfcTextLiteralWithExtent >::it it;
+    IfcTextLiteralWithExtent (IfcAbstractEntity* e);
+    IfcTextLiteralWithExtent (std::string v1_Literal, IfcAxis2Placement* v2_Placement, IfcTextPath::IfcTextPath v3_Path, IfcPlanarExtent* v4_Extent, std::string v5_BoxAlignment);
+    typedef IfcTemplatedEntityList< IfcTextLiteralWithExtent > list;
 };
 /// IfcTrapeziumProfileDef defines a trapezium as the profile definition used by the swept surface geometry or the swept area solid. It is given by its Top X and Bottom X extent and its Y extent as well as by the offset of the Top X extend, and placed within the 2D position coordinate system, established by the Position attribute. It is placed centric within the position coordinate system, that is, in the center of the bounding box. 
 /// 
@@ -16866,29 +17767,28 @@ class IfcTextLiteralWithExtent : public IfcTextLiteral {
 class IfcTrapeziumProfileDef : public IfcParameterizedProfileDef {
 public:
     /// The extent of the bottom line measured along the implicit x-axis.
-    IfcPositiveLengthMeasure BottomXDim();
-    void setBottomXDim(IfcPositiveLengthMeasure v);
+    double BottomXDim() const;
+    void setBottomXDim(double v);
     /// The extent of the top line measured along the implicit x-axis.
-    IfcPositiveLengthMeasure TopXDim();
-    void setTopXDim(IfcPositiveLengthMeasure v);
+    double TopXDim() const;
+    void setTopXDim(double v);
     /// The extent of the distance between the parallel bottom and top lines measured along the implicit y-axis.
-    IfcPositiveLengthMeasure YDim();
-    void setYDim(IfcPositiveLengthMeasure v);
+    double YDim() const;
+    void setYDim(double v);
     /// Offset from the beginning of the top line to the bottom line, measured along the implicit x-axis.
-    IfcLengthMeasure TopXOffset();
-    void setTopXOffset(IfcLengthMeasure v);
+    double TopXOffset() const;
+    void setTopXOffset(double v);
     virtual unsigned int getArgumentCount() const { return 7; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 3: return IfcUtil::Argument_DOUBLE; case 4: return IfcUtil::Argument_DOUBLE; case 5: return IfcUtil::Argument_DOUBLE; case 6: return IfcUtil::Argument_DOUBLE; } return IfcParameterizedProfileDef::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 3: return Type::IfcPositiveLengthMeasure; case 4: return Type::IfcPositiveLengthMeasure; case 5: return Type::IfcPositiveLengthMeasure; case 6: return Type::IfcLengthMeasure; } return IfcParameterizedProfileDef::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 3: return "BottomXDim"; case 4: return "TopXDim"; case 5: return "YDim"; case 6: return "TopXOffset"; } return IfcParameterizedProfileDef::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcTrapeziumProfileDef (IfcAbstractEntityPtr e);
-    IfcTrapeziumProfileDef (IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< IfcLabel > v2_ProfileName, IfcAxis2Placement2D* v3_Position, IfcPositiveLengthMeasure v4_BottomXDim, IfcPositiveLengthMeasure v5_TopXDim, IfcPositiveLengthMeasure v6_YDim, IfcLengthMeasure v7_TopXOffset);
-    typedef IfcTrapeziumProfileDef* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcTrapeziumProfileDef > > list;
-    typedef IfcTemplatedEntityList< IfcTrapeziumProfileDef >::it it;
+    IfcTrapeziumProfileDef (IfcAbstractEntity* e);
+    IfcTrapeziumProfileDef (IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< std::string > v2_ProfileName, IfcAxis2Placement2D* v3_Position, double v4_BottomXDim, double v5_TopXDim, double v6_YDim, double v7_TopXOffset);
+    typedef IfcTemplatedEntityList< IfcTrapeziumProfileDef > list;
 };
 /// Definition from ISO/CD 10303-46:1992: A two direction repeat factor combines two vectors which are used in the fill area style tiles entity for determining the shape and relative location of tiles. Given the initial position of any tile, the two direction repeat factor determines eight new positions according to the equation:
 /// 
@@ -16901,20 +17801,19 @@ class IfcTrapeziumProfileDef : public IfcParameterizedProfileDef {
 class IfcTwoDirectionRepeatFactor : public IfcOneDirectionRepeatFactor {
 public:
     /// A vector which specifies the relative positioning of tiles in the second direction.
-    IfcVector* SecondRepeatFactor();
+    IfcVector* SecondRepeatFactor() const;
     void setSecondRepeatFactor(IfcVector* v);
     virtual unsigned int getArgumentCount() const { return 2; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 1: return IfcUtil::Argument_ENTITY; } return IfcOneDirectionRepeatFactor::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 1: return Type::IfcVector; } return IfcOneDirectionRepeatFactor::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 1: return "SecondRepeatFactor"; } return IfcOneDirectionRepeatFactor::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcTwoDirectionRepeatFactor (IfcAbstractEntityPtr e);
+    IfcTwoDirectionRepeatFactor (IfcAbstractEntity* e);
     IfcTwoDirectionRepeatFactor (IfcVector* v1_RepeatFactor, IfcVector* v2_SecondRepeatFactor);
-    typedef IfcTwoDirectionRepeatFactor* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcTwoDirectionRepeatFactor > > list;
-    typedef IfcTemplatedEntityList< IfcTwoDirectionRepeatFactor >::it it;
+    typedef IfcTemplatedEntityList< IfcTwoDirectionRepeatFactor > list;
 };
 /// The object type defines the
 /// specific information about a type, being common to all
@@ -16950,7 +17849,7 @@ class IfcTwoDirectionRepeatFactor : public IfcOneDirectionRepeatFactor {
 class IfcTypeObject : public IfcObjectDefinition {
 public:
     /// Whether the optional attribute ApplicableOccurrence is defined for this IfcTypeObject
-    bool hasApplicableOccurrence();
+    bool hasApplicableOccurrence() const;
     /// The attribute optionally defines the data type of the occurrence object, to which the assigned type object can relate. If not present, no instruction is given to which occurrence object the type object is applicable. The following conventions are used:
     /// 
     /// The IFC entity name of the applicable occurrence using the IFC naming convention, CamelCase with IFC prefix
@@ -16958,28 +17857,27 @@ class IfcTypeObject : public IfcObjectDefinition {
     ///   If one type object is applicable to many occurrence objects, then those occurrence object names should be separate by comma "," forming a comma separated string.
     /// 
     /// EXAMPLE  Refering to a furniture as applicable occurrence entity would be expressed as 'IfcFurnishingElement', refering to a brace as applicable entity would be expressed as 'IfcMember/BRACE', refering to a wall and wall standard case would be expressed as 'IfcWall, IfcWallStandardCase'.
-    IfcLabel ApplicableOccurrence();
-    void setApplicableOccurrence(IfcLabel v);
+    std::string ApplicableOccurrence() const;
+    void setApplicableOccurrence(std::string v);
     /// Whether the optional attribute HasPropertySets is defined for this IfcTypeObject
-    bool hasHasPropertySets();
+    bool hasHasPropertySets() const;
     /// Set list of unique property sets, that are associated with the object type and are common to all object occurrences referring to this object type.
     /// 
     /// IFC2x3 CHANGE  The attribute aggregate type has been changed from LIST to SET.
-    SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > HasPropertySets();
-    void setHasPropertySets(SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > v);
+    IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr HasPropertySets() const;
+    void setHasPropertySets(IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr v);
     virtual unsigned int getArgumentCount() const { return 6; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 4: return IfcUtil::Argument_STRING; case 5: return IfcUtil::Argument_ENTITY_LIST; } return IfcObjectDefinition::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 4: return Type::IfcLabel; case 5: return Type::IfcPropertySetDefinition; } return IfcObjectDefinition::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 4: return "ApplicableOccurrence"; case 5: return "HasPropertySets"; } return IfcObjectDefinition::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelDefinesByType > > ObjectTypeOf(); // INVERSE IfcRelDefinesByType::RelatingType
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcRelDefinesByType >::ptr ObjectTypeOf() const; // INVERSE IfcRelDefinesByType::RelatingType
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcTypeObject (IfcAbstractEntityPtr e);
-    IfcTypeObject (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets);
-    typedef IfcTypeObject* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcTypeObject > > list;
-    typedef IfcTemplatedEntityList< IfcTypeObject >::it it;
+    IfcTypeObject (IfcAbstractEntity* e);
+    IfcTypeObject (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets);
+    typedef IfcTemplatedEntityList< IfcTypeObject > list;
 };
 /// IfcTypeProduct defines a type
 /// definition of a product without being already inserted into a
@@ -17050,27 +17948,26 @@ class IfcTypeObject : public IfcObjectDefinition {
 class IfcTypeProduct : public IfcTypeObject {
 public:
     /// Whether the optional attribute RepresentationMaps is defined for this IfcTypeProduct
-    bool hasRepresentationMaps();
+    bool hasRepresentationMaps() const;
     /// List of unique representation maps. Each representation map describes a block definition of the shape of the product style. By providing more than one representation map, a multi-view block definition can be given.
-    SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > RepresentationMaps();
-    void setRepresentationMaps(SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > v);
+    IfcTemplatedEntityList< IfcRepresentationMap >::ptr RepresentationMaps() const;
+    void setRepresentationMaps(IfcTemplatedEntityList< IfcRepresentationMap >::ptr v);
     /// Whether the optional attribute Tag is defined for this IfcTypeProduct
-    bool hasTag();
+    bool hasTag() const;
     /// The tag (or label) identifier at the particular type of a product, e.g. the article number (like the EAN). It is the identifier at the specific level.
-    IfcLabel Tag();
-    void setTag(IfcLabel v);
+    std::string Tag() const;
+    void setTag(std::string v);
     virtual unsigned int getArgumentCount() const { return 8; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 6: return IfcUtil::Argument_ENTITY_LIST; case 7: return IfcUtil::Argument_STRING; } return IfcTypeObject::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 6: return Type::IfcRepresentationMap; case 7: return Type::IfcLabel; } return IfcTypeObject::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 6: return "RepresentationMaps"; case 7: return "Tag"; } return IfcTypeObject::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcTypeProduct (IfcAbstractEntityPtr e);
-    IfcTypeProduct (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag);
-    typedef IfcTypeProduct* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcTypeProduct > > list;
-    typedef IfcTemplatedEntityList< IfcTypeProduct >::it it;
+    IfcTypeProduct (IfcAbstractEntity* e);
+    IfcTypeProduct (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag);
+    typedef IfcTemplatedEntityList< IfcTypeProduct > list;
 };
 /// IfcUShapeProfileDef defines
 /// a section profile that provides the defining parameters of a U-shape
@@ -17103,48 +18000,47 @@ class IfcTypeProduct : public IfcTypeObject {
 class IfcUShapeProfileDef : public IfcParameterizedProfileDef {
 public:
     /// Web lengths, see illustration above (= h).
-    IfcPositiveLengthMeasure Depth();
-    void setDepth(IfcPositiveLengthMeasure v);
+    double Depth() const;
+    void setDepth(double v);
     /// Flange lengths, see illustration above (= b).
-    IfcPositiveLengthMeasure FlangeWidth();
-    void setFlangeWidth(IfcPositiveLengthMeasure v);
+    double FlangeWidth() const;
+    void setFlangeWidth(double v);
     /// Constant wall thickness of web (= ts).
-    IfcPositiveLengthMeasure WebThickness();
-    void setWebThickness(IfcPositiveLengthMeasure v);
+    double WebThickness() const;
+    void setWebThickness(double v);
     /// Constant wall thickness of flange (= tg).
-    IfcPositiveLengthMeasure FlangeThickness();
-    void setFlangeThickness(IfcPositiveLengthMeasure v);
+    double FlangeThickness() const;
+    void setFlangeThickness(double v);
     /// Whether the optional attribute FilletRadius is defined for this IfcUShapeProfileDef
-    bool hasFilletRadius();
+    bool hasFilletRadius() const;
     /// Fillet radius according the above illustration (= r1).
-    IfcPositiveLengthMeasure FilletRadius();
-    void setFilletRadius(IfcPositiveLengthMeasure v);
+    double FilletRadius() const;
+    void setFilletRadius(double v);
     /// Whether the optional attribute EdgeRadius is defined for this IfcUShapeProfileDef
-    bool hasEdgeRadius();
+    bool hasEdgeRadius() const;
     /// Edge radius according the above illustration (= r2).
-    IfcPositiveLengthMeasure EdgeRadius();
-    void setEdgeRadius(IfcPositiveLengthMeasure v);
+    double EdgeRadius() const;
+    void setEdgeRadius(double v);
     /// Whether the optional attribute FlangeSlope is defined for this IfcUShapeProfileDef
-    bool hasFlangeSlope();
+    bool hasFlangeSlope() const;
     /// Slope of flange of the profile.
-    IfcPlaneAngleMeasure FlangeSlope();
-    void setFlangeSlope(IfcPlaneAngleMeasure v);
+    double FlangeSlope() const;
+    void setFlangeSlope(double v);
     /// Whether the optional attribute CentreOfGravityInX is defined for this IfcUShapeProfileDef
-    bool hasCentreOfGravityInX();
-    IfcPositiveLengthMeasure CentreOfGravityInX();
-    void setCentreOfGravityInX(IfcPositiveLengthMeasure v);
+    bool hasCentreOfGravityInX() const;
+    double CentreOfGravityInX() const;
+    void setCentreOfGravityInX(double v);
     virtual unsigned int getArgumentCount() const { return 11; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 3: return IfcUtil::Argument_DOUBLE; case 4: return IfcUtil::Argument_DOUBLE; case 5: return IfcUtil::Argument_DOUBLE; case 6: return IfcUtil::Argument_DOUBLE; case 7: return IfcUtil::Argument_DOUBLE; case 8: return IfcUtil::Argument_DOUBLE; case 9: return IfcUtil::Argument_DOUBLE; case 10: return IfcUtil::Argument_DOUBLE; } return IfcParameterizedProfileDef::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 3: return Type::IfcPositiveLengthMeasure; case 4: return Type::IfcPositiveLengthMeasure; case 5: return Type::IfcPositiveLengthMeasure; case 6: return Type::IfcPositiveLengthMeasure; case 7: return Type::IfcPositiveLengthMeasure; case 8: return Type::IfcPositiveLengthMeasure; case 9: return Type::IfcPlaneAngleMeasure; case 10: return Type::IfcPositiveLengthMeasure; } return IfcParameterizedProfileDef::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 3: return "Depth"; case 4: return "FlangeWidth"; case 5: return "WebThickness"; case 6: return "FlangeThickness"; case 7: return "FilletRadius"; case 8: return "EdgeRadius"; case 9: return "FlangeSlope"; case 10: return "CentreOfGravityInX"; } return IfcParameterizedProfileDef::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcUShapeProfileDef (IfcAbstractEntityPtr e);
-    IfcUShapeProfileDef (IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< IfcLabel > v2_ProfileName, IfcAxis2Placement2D* v3_Position, IfcPositiveLengthMeasure v4_Depth, IfcPositiveLengthMeasure v5_FlangeWidth, IfcPositiveLengthMeasure v6_WebThickness, IfcPositiveLengthMeasure v7_FlangeThickness, boost::optional< IfcPositiveLengthMeasure > v8_FilletRadius, boost::optional< IfcPositiveLengthMeasure > v9_EdgeRadius, boost::optional< IfcPlaneAngleMeasure > v10_FlangeSlope, boost::optional< IfcPositiveLengthMeasure > v11_CentreOfGravityInX);
-    typedef IfcUShapeProfileDef* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcUShapeProfileDef > > list;
-    typedef IfcTemplatedEntityList< IfcUShapeProfileDef >::it it;
+    IfcUShapeProfileDef (IfcAbstractEntity* e);
+    IfcUShapeProfileDef (IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< std::string > v2_ProfileName, IfcAxis2Placement2D* v3_Position, double v4_Depth, double v5_FlangeWidth, double v6_WebThickness, double v7_FlangeThickness, boost::optional< double > v8_FilletRadius, boost::optional< double > v9_EdgeRadius, boost::optional< double > v10_FlangeSlope, boost::optional< double > v11_CentreOfGravityInX);
+    typedef IfcTemplatedEntityList< IfcUShapeProfileDef > list;
 };
 /// Definition from ISO/CD 10303-42:1992: The vector is defined in terms of the direction and magnitude of the vector. The value of the magnitude attribute defines the magnitude of the vector. 
 /// 
@@ -17156,23 +18052,22 @@ class IfcUShapeProfileDef : public IfcParameterizedProfileDef {
 class IfcVector : public IfcGeometricRepresentationItem {
 public:
     /// The direction of the vector.
-    IfcDirection* Orientation();
+    IfcDirection* Orientation() const;
     void setOrientation(IfcDirection* v);
     /// The magnitude of the vector. All vectors of Magnitude 0.0 are regarded as equal in value regardless of the orientation attribute.
-    IfcLengthMeasure Magnitude();
-    void setMagnitude(IfcLengthMeasure v);
+    double Magnitude() const;
+    void setMagnitude(double v);
     virtual unsigned int getArgumentCount() const { return 2; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY; case 1: return IfcUtil::Argument_DOUBLE; } return IfcGeometricRepresentationItem::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcDirection; case 1: return Type::IfcLengthMeasure; } return IfcGeometricRepresentationItem::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Orientation"; case 1: return "Magnitude"; } return IfcGeometricRepresentationItem::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcVector (IfcAbstractEntityPtr e);
-    IfcVector (IfcDirection* v1_Orientation, IfcLengthMeasure v2_Magnitude);
-    typedef IfcVector* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcVector > > list;
-    typedef IfcTemplatedEntityList< IfcVector >::it it;
+    IfcVector (IfcAbstractEntity* e);
+    IfcVector (IfcDirection* v1_Orientation, double v2_Magnitude);
+    typedef IfcTemplatedEntityList< IfcVector > list;
 };
 /// Definition from ISO/CD 10303-42:1992: A vertex_loop is a loop of
 ///   zero genus consisting of a single vertex. A vertex can exist independently of a
@@ -17189,20 +18084,19 @@ class IfcVector : public IfcGeometricRepresentationItem {
 class IfcVertexLoop : public IfcLoop {
 public:
     /// The vertex which defines the entire loop.
-    IfcVertex* LoopVertex();
+    IfcVertex* LoopVertex() const;
     void setLoopVertex(IfcVertex* v);
     virtual unsigned int getArgumentCount() const { return 1; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY; } return IfcLoop::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcVertex; } return IfcLoop::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "LoopVertex"; } return IfcLoop::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcVertexLoop (IfcAbstractEntityPtr e);
+    IfcVertexLoop (IfcAbstractEntity* e);
     IfcVertexLoop (IfcVertex* v1_LoopVertex);
-    typedef IfcVertexLoop* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcVertexLoop > > list;
-    typedef IfcTemplatedEntityList< IfcVertexLoop >::it it;
+    typedef IfcTemplatedEntityList< IfcVertexLoop > list;
 };
 /// The window lining is the outer
 /// frame which enables the window to be fixed in position. The
@@ -17305,64 +18199,63 @@ class IfcVertexLoop : public IfcLoop {
 class IfcWindowLiningProperties : public IfcPropertySetDefinition {
 public:
     /// Whether the optional attribute LiningDepth is defined for this IfcWindowLiningProperties
-    bool hasLiningDepth();
+    bool hasLiningDepth() const;
     /// Depth of the window lining (dimension measured perpendicular to window elevation plane).
-    IfcPositiveLengthMeasure LiningDepth();
-    void setLiningDepth(IfcPositiveLengthMeasure v);
+    double LiningDepth() const;
+    void setLiningDepth(double v);
     /// Whether the optional attribute LiningThickness is defined for this IfcWindowLiningProperties
-    bool hasLiningThickness();
+    bool hasLiningThickness() const;
     /// Thickness of the window lining (measured parallel to the window elevation plane).
-    IfcPositiveLengthMeasure LiningThickness();
-    void setLiningThickness(IfcPositiveLengthMeasure v);
+    double LiningThickness() const;
+    void setLiningThickness(double v);
     /// Whether the optional attribute TransomThickness is defined for this IfcWindowLiningProperties
-    bool hasTransomThickness();
+    bool hasTransomThickness() const;
     /// Thickness of the transom (horizontal separator of window panels within a window), measured parallel to the window elevation plane. The transom is part of the lining and the transom depth is assumed to be identical to the lining depth.
-    IfcPositiveLengthMeasure TransomThickness();
-    void setTransomThickness(IfcPositiveLengthMeasure v);
+    double TransomThickness() const;
+    void setTransomThickness(double v);
     /// Whether the optional attribute MullionThickness is defined for this IfcWindowLiningProperties
-    bool hasMullionThickness();
+    bool hasMullionThickness() const;
     /// Thickness of the mullion (vertical separator of window panels within a window), measured parallel to the window elevation plane. The mullion is part of the lining and the mullion depth is assumed to be identical to the lining depth.
-    IfcPositiveLengthMeasure MullionThickness();
-    void setMullionThickness(IfcPositiveLengthMeasure v);
+    double MullionThickness() const;
+    void setMullionThickness(double v);
     /// Whether the optional attribute FirstTransomOffset is defined for this IfcWindowLiningProperties
-    bool hasFirstTransomOffset();
+    bool hasFirstTransomOffset() const;
     /// Offset of the transom centerline, measured along the z-axis of the window placement co-ordinate system. An offset value = 0.5 indicates that the transom is positioned in the middle of the window.
-    IfcNormalisedRatioMeasure FirstTransomOffset();
-    void setFirstTransomOffset(IfcNormalisedRatioMeasure v);
+    double FirstTransomOffset() const;
+    void setFirstTransomOffset(double v);
     /// Whether the optional attribute SecondTransomOffset is defined for this IfcWindowLiningProperties
-    bool hasSecondTransomOffset();
+    bool hasSecondTransomOffset() const;
     /// Offset of the transom centerline for the second transom, measured along the x-axis of the window placement co-ordinate system. An offset value = 0.666 indicates that the second transom is positioned at two/third of the window.
-    IfcNormalisedRatioMeasure SecondTransomOffset();
-    void setSecondTransomOffset(IfcNormalisedRatioMeasure v);
+    double SecondTransomOffset() const;
+    void setSecondTransomOffset(double v);
     /// Whether the optional attribute FirstMullionOffset is defined for this IfcWindowLiningProperties
-    bool hasFirstMullionOffset();
+    bool hasFirstMullionOffset() const;
     /// Offset of the mullion centerline, measured along the x-axis of the window placement co-ordinate system. An offset value = 0.5 indicates that the mullion is positioned in the middle of the window.
-    IfcNormalisedRatioMeasure FirstMullionOffset();
-    void setFirstMullionOffset(IfcNormalisedRatioMeasure v);
+    double FirstMullionOffset() const;
+    void setFirstMullionOffset(double v);
     /// Whether the optional attribute SecondMullionOffset is defined for this IfcWindowLiningProperties
-    bool hasSecondMullionOffset();
+    bool hasSecondMullionOffset() const;
     /// Offset of the mullion centerline for the second mullion, measured along the x-axis of the window placement co-ordinate system. An offset value = 0.666 indicates that the second mullion is positioned at two/third of the window.
-    IfcNormalisedRatioMeasure SecondMullionOffset();
-    void setSecondMullionOffset(IfcNormalisedRatioMeasure v);
+    double SecondMullionOffset() const;
+    void setSecondMullionOffset(double v);
     /// Whether the optional attribute ShapeAspectStyle is defined for this IfcWindowLiningProperties
-    bool hasShapeAspectStyle();
+    bool hasShapeAspectStyle() const;
     /// Optional link to a shape aspect definition, which points to the part of the geometric representation of the window style, which is used to represent the lining.
     /// 
     /// IFC2x4 CHANGE The attribute is deprecated and shall no longer be used, i.e. the value shall be NIL ($).
-    IfcShapeAspect* ShapeAspectStyle();
+    IfcShapeAspect* ShapeAspectStyle() const;
     void setShapeAspectStyle(IfcShapeAspect* v);
     virtual unsigned int getArgumentCount() const { return 13; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 4: return IfcUtil::Argument_DOUBLE; case 5: return IfcUtil::Argument_DOUBLE; case 6: return IfcUtil::Argument_DOUBLE; case 7: return IfcUtil::Argument_DOUBLE; case 8: return IfcUtil::Argument_DOUBLE; case 9: return IfcUtil::Argument_DOUBLE; case 10: return IfcUtil::Argument_DOUBLE; case 11: return IfcUtil::Argument_DOUBLE; case 12: return IfcUtil::Argument_ENTITY; } return IfcPropertySetDefinition::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 4: return Type::IfcPositiveLengthMeasure; case 5: return Type::IfcPositiveLengthMeasure; case 6: return Type::IfcPositiveLengthMeasure; case 7: return Type::IfcPositiveLengthMeasure; case 8: return Type::IfcNormalisedRatioMeasure; case 9: return Type::IfcNormalisedRatioMeasure; case 10: return Type::IfcNormalisedRatioMeasure; case 11: return Type::IfcNormalisedRatioMeasure; case 12: return Type::IfcShapeAspect; } return IfcPropertySetDefinition::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 4: return "LiningDepth"; case 5: return "LiningThickness"; case 6: return "TransomThickness"; case 7: return "MullionThickness"; case 8: return "FirstTransomOffset"; case 9: return "SecondTransomOffset"; case 10: return "FirstMullionOffset"; case 11: return "SecondMullionOffset"; case 12: return "ShapeAspectStyle"; } return IfcPropertySetDefinition::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcWindowLiningProperties (IfcAbstractEntityPtr e);
-    IfcWindowLiningProperties (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcPositiveLengthMeasure > v5_LiningDepth, boost::optional< IfcPositiveLengthMeasure > v6_LiningThickness, boost::optional< IfcPositiveLengthMeasure > v7_TransomThickness, boost::optional< IfcPositiveLengthMeasure > v8_MullionThickness, boost::optional< IfcNormalisedRatioMeasure > v9_FirstTransomOffset, boost::optional< IfcNormalisedRatioMeasure > v10_SecondTransomOffset, boost::optional< IfcNormalisedRatioMeasure > v11_FirstMullionOffset, boost::optional< IfcNormalisedRatioMeasure > v12_SecondMullionOffset, IfcShapeAspect* v13_ShapeAspectStyle);
-    typedef IfcWindowLiningProperties* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcWindowLiningProperties > > list;
-    typedef IfcTemplatedEntityList< IfcWindowLiningProperties >::it it;
+    IfcWindowLiningProperties (IfcAbstractEntity* e);
+    IfcWindowLiningProperties (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< double > v5_LiningDepth, boost::optional< double > v6_LiningThickness, boost::optional< double > v7_TransomThickness, boost::optional< double > v8_MullionThickness, boost::optional< double > v9_FirstTransomOffset, boost::optional< double > v10_SecondTransomOffset, boost::optional< double > v11_FirstMullionOffset, boost::optional< double > v12_SecondMullionOffset, IfcShapeAspect* v13_ShapeAspectStyle);
+    typedef IfcTemplatedEntityList< IfcWindowLiningProperties > list;
 };
 /// A window panel is a casement, that is, a component, fixed or opening,
 /// consisting essentially of a frame and the infilling. The
@@ -17412,40 +18305,39 @@ class IfcWindowLiningProperties : public IfcPropertySetDefinition {
 class IfcWindowPanelProperties : public IfcPropertySetDefinition {
 public:
     /// Types of window panel operations. Also used to assign standard symbolic presentations according to national building standards.
-    IfcWindowPanelOperationEnum::IfcWindowPanelOperationEnum OperationType();
+    IfcWindowPanelOperationEnum::IfcWindowPanelOperationEnum OperationType() const;
     void setOperationType(IfcWindowPanelOperationEnum::IfcWindowPanelOperationEnum v);
     /// Position of this panel within the overall window style.
-    IfcWindowPanelPositionEnum::IfcWindowPanelPositionEnum PanelPosition();
+    IfcWindowPanelPositionEnum::IfcWindowPanelPositionEnum PanelPosition() const;
     void setPanelPosition(IfcWindowPanelPositionEnum::IfcWindowPanelPositionEnum v);
     /// Whether the optional attribute FrameDepth is defined for this IfcWindowPanelProperties
-    bool hasFrameDepth();
+    bool hasFrameDepth() const;
     /// Depth of panel frame, measured from front face to back face horizontally (i.e. perpendicular to the window (elevation) plane.
-    IfcPositiveLengthMeasure FrameDepth();
-    void setFrameDepth(IfcPositiveLengthMeasure v);
+    double FrameDepth() const;
+    void setFrameDepth(double v);
     /// Whether the optional attribute FrameThickness is defined for this IfcWindowPanelProperties
-    bool hasFrameThickness();
+    bool hasFrameThickness() const;
     /// Width of panel frame, measured from inside of panel (at glazing) to outside of panel (at lining), i.e. parallel to the window (elevation) plane.
-    IfcPositiveLengthMeasure FrameThickness();
-    void setFrameThickness(IfcPositiveLengthMeasure v);
+    double FrameThickness() const;
+    void setFrameThickness(double v);
     /// Whether the optional attribute ShapeAspectStyle is defined for this IfcWindowPanelProperties
-    bool hasShapeAspectStyle();
+    bool hasShapeAspectStyle() const;
     /// Optional link to a shape aspect definition, which points to the part of the geometric representation of the window style, which is used to represent the panel.
     /// 
     /// IFC2x4 CHANGE The attribute is deprecated and shall no longer be used, i.e. the value shall be NIL ($).
-    IfcShapeAspect* ShapeAspectStyle();
+    IfcShapeAspect* ShapeAspectStyle() const;
     void setShapeAspectStyle(IfcShapeAspect* v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 4: return IfcUtil::Argument_ENUMERATION; case 5: return IfcUtil::Argument_ENUMERATION; case 6: return IfcUtil::Argument_DOUBLE; case 7: return IfcUtil::Argument_DOUBLE; case 8: return IfcUtil::Argument_ENTITY; } return IfcPropertySetDefinition::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 4: return Type::IfcWindowPanelOperationEnum; case 5: return Type::IfcWindowPanelPositionEnum; case 6: return Type::IfcPositiveLengthMeasure; case 7: return Type::IfcPositiveLengthMeasure; case 8: return Type::IfcShapeAspect; } return IfcPropertySetDefinition::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 4: return "OperationType"; case 5: return "PanelPosition"; case 6: return "FrameDepth"; case 7: return "FrameThickness"; case 8: return "ShapeAspectStyle"; } return IfcPropertySetDefinition::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcWindowPanelProperties (IfcAbstractEntityPtr e);
-    IfcWindowPanelProperties (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, IfcWindowPanelOperationEnum::IfcWindowPanelOperationEnum v5_OperationType, IfcWindowPanelPositionEnum::IfcWindowPanelPositionEnum v6_PanelPosition, boost::optional< IfcPositiveLengthMeasure > v7_FrameDepth, boost::optional< IfcPositiveLengthMeasure > v8_FrameThickness, IfcShapeAspect* v9_ShapeAspectStyle);
-    typedef IfcWindowPanelProperties* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcWindowPanelProperties > > list;
-    typedef IfcTemplatedEntityList< IfcWindowPanelProperties >::it it;
+    IfcWindowPanelProperties (IfcAbstractEntity* e);
+    IfcWindowPanelProperties (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcWindowPanelOperationEnum::IfcWindowPanelOperationEnum v5_OperationType, IfcWindowPanelPositionEnum::IfcWindowPanelPositionEnum v6_PanelPosition, boost::optional< double > v7_FrameDepth, boost::optional< double > v8_FrameThickness, IfcShapeAspect* v9_ShapeAspectStyle);
+    typedef IfcTemplatedEntityList< IfcWindowPanelProperties > list;
 };
 /// Definition: The window style defines a particular style of windows, which may be included into the spatial context of the building model through instances of IfcWindow. A window style defines the overall parameter of the window style and refers to the particular parameter of the lining and one (or several) panels through IfcWindowLiningProperties and IfcWindowPanelProperties.
 /// 
@@ -17468,29 +18360,28 @@ class IfcWindowPanelProperties : public IfcPropertySetDefinition {
 class IfcWindowStyle : public IfcTypeProduct {
 public:
     /// Type defining the basic construction and material type of the window.
-    IfcWindowStyleConstructionEnum::IfcWindowStyleConstructionEnum ConstructionType();
+    IfcWindowStyleConstructionEnum::IfcWindowStyleConstructionEnum ConstructionType() const;
     void setConstructionType(IfcWindowStyleConstructionEnum::IfcWindowStyleConstructionEnum v);
     /// Type defining the general layout and operation of the window style.
-    IfcWindowStyleOperationEnum::IfcWindowStyleOperationEnum OperationType();
+    IfcWindowStyleOperationEnum::IfcWindowStyleOperationEnum OperationType() const;
     void setOperationType(IfcWindowStyleOperationEnum::IfcWindowStyleOperationEnum v);
     /// The Boolean value reflects, whether the parameter given in the attached lining and panel properties exactly define the geometry (TRUE), or whether the attached style shape take precedence (FALSE). In the last case the parameter have only informative value.
-    bool ParameterTakesPrecedence();
+    bool ParameterTakesPrecedence() const;
     void setParameterTakesPrecedence(bool v);
     /// The Boolean indicates, whether the attached ShapeStyle can be sized (using scale factor of transformation), or not (FALSE). If not, the ShapeStyle should be inserted by the IfcWindow (using IfcMappedItem) with the scale factor = 1.
-    bool Sizeable();
+    bool Sizeable() const;
     void setSizeable(bool v);
     virtual unsigned int getArgumentCount() const { return 12; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_ENUMERATION; case 9: return IfcUtil::Argument_ENUMERATION; case 10: return IfcUtil::Argument_BOOL; case 11: return IfcUtil::Argument_BOOL; } return IfcTypeProduct::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcWindowStyleConstructionEnum; case 9: return Type::IfcWindowStyleOperationEnum; case 10: return Type::UNDEFINED; case 11: return Type::UNDEFINED; } return IfcTypeProduct::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "ConstructionType"; case 9: return "OperationType"; case 10: return "ParameterTakesPrecedence"; case 11: return "Sizeable"; } return IfcTypeProduct::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcWindowStyle (IfcAbstractEntityPtr e);
-    IfcWindowStyle (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, IfcWindowStyleConstructionEnum::IfcWindowStyleConstructionEnum v9_ConstructionType, IfcWindowStyleOperationEnum::IfcWindowStyleOperationEnum v10_OperationType, bool v11_ParameterTakesPrecedence, bool v12_Sizeable);
-    typedef IfcWindowStyle* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcWindowStyle > > list;
-    typedef IfcTemplatedEntityList< IfcWindowStyle >::it it;
+    IfcWindowStyle (IfcAbstractEntity* e);
+    IfcWindowStyle (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, IfcWindowStyleConstructionEnum::IfcWindowStyleConstructionEnum v9_ConstructionType, IfcWindowStyleOperationEnum::IfcWindowStyleOperationEnum v10_OperationType, bool v11_ParameterTakesPrecedence, bool v12_Sizeable);
+    typedef IfcTemplatedEntityList< IfcWindowStyle > list;
 };
 /// IfcZShapeProfileDef defines
 /// a section profile that provides the defining parameters of a Z-shape
@@ -17520,55 +18411,53 @@ class IfcWindowStyle : public IfcTypeProduct {
 class IfcZShapeProfileDef : public IfcParameterizedProfileDef {
 public:
     /// Web length, see illustration above (= h).
-    IfcPositiveLengthMeasure Depth();
-    void setDepth(IfcPositiveLengthMeasure v);
+    double Depth() const;
+    void setDepth(double v);
     /// Flange length, see illustration above (= b).
-    IfcPositiveLengthMeasure FlangeWidth();
-    void setFlangeWidth(IfcPositiveLengthMeasure v);
+    double FlangeWidth() const;
+    void setFlangeWidth(double v);
     /// Constant wall thickness of web, see illustration above (= ts).
-    IfcPositiveLengthMeasure WebThickness();
-    void setWebThickness(IfcPositiveLengthMeasure v);
+    double WebThickness() const;
+    void setWebThickness(double v);
     /// Constant wall thickness of flange, see illustration above (= tg).
-    IfcPositiveLengthMeasure FlangeThickness();
-    void setFlangeThickness(IfcPositiveLengthMeasure v);
+    double FlangeThickness() const;
+    void setFlangeThickness(double v);
     /// Whether the optional attribute FilletRadius is defined for this IfcZShapeProfileDef
-    bool hasFilletRadius();
+    bool hasFilletRadius() const;
     /// Fillet radius according the above illustration (= r1).
-    IfcPositiveLengthMeasure FilletRadius();
-    void setFilletRadius(IfcPositiveLengthMeasure v);
+    double FilletRadius() const;
+    void setFilletRadius(double v);
     /// Whether the optional attribute EdgeRadius is defined for this IfcZShapeProfileDef
-    bool hasEdgeRadius();
+    bool hasEdgeRadius() const;
     /// Edge radius according the above illustration (= r2).
-    IfcPositiveLengthMeasure EdgeRadius();
-    void setEdgeRadius(IfcPositiveLengthMeasure v);
+    double EdgeRadius() const;
+    void setEdgeRadius(double v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 3: return IfcUtil::Argument_DOUBLE; case 4: return IfcUtil::Argument_DOUBLE; case 5: return IfcUtil::Argument_DOUBLE; case 6: return IfcUtil::Argument_DOUBLE; case 7: return IfcUtil::Argument_DOUBLE; case 8: return IfcUtil::Argument_DOUBLE; } return IfcParameterizedProfileDef::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 3: return Type::IfcPositiveLengthMeasure; case 4: return Type::IfcPositiveLengthMeasure; case 5: return Type::IfcPositiveLengthMeasure; case 6: return Type::IfcPositiveLengthMeasure; case 7: return Type::IfcPositiveLengthMeasure; case 8: return Type::IfcPositiveLengthMeasure; } return IfcParameterizedProfileDef::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 3: return "Depth"; case 4: return "FlangeWidth"; case 5: return "WebThickness"; case 6: return "FlangeThickness"; case 7: return "FilletRadius"; case 8: return "EdgeRadius"; } return IfcParameterizedProfileDef::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcZShapeProfileDef (IfcAbstractEntityPtr e);
-    IfcZShapeProfileDef (IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< IfcLabel > v2_ProfileName, IfcAxis2Placement2D* v3_Position, IfcPositiveLengthMeasure v4_Depth, IfcPositiveLengthMeasure v5_FlangeWidth, IfcPositiveLengthMeasure v6_WebThickness, IfcPositiveLengthMeasure v7_FlangeThickness, boost::optional< IfcPositiveLengthMeasure > v8_FilletRadius, boost::optional< IfcPositiveLengthMeasure > v9_EdgeRadius);
-    typedef IfcZShapeProfileDef* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcZShapeProfileDef > > list;
-    typedef IfcTemplatedEntityList< IfcZShapeProfileDef >::it it;
+    IfcZShapeProfileDef (IfcAbstractEntity* e);
+    IfcZShapeProfileDef (IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< std::string > v2_ProfileName, IfcAxis2Placement2D* v3_Position, double v4_Depth, double v5_FlangeWidth, double v6_WebThickness, double v7_FlangeThickness, boost::optional< double > v8_FilletRadius, boost::optional< double > v9_EdgeRadius);
+    typedef IfcTemplatedEntityList< IfcZShapeProfileDef > list;
 };
 
 class IfcAnnotationCurveOccurrence : public IfcAnnotationOccurrence {
 public:
     virtual unsigned int getArgumentCount() const { return 3; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcAnnotationOccurrence::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcAnnotationOccurrence::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcAnnotationOccurrence::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcAnnotationCurveOccurrence (IfcAbstractEntityPtr e);
-    IfcAnnotationCurveOccurrence (IfcRepresentationItem* v1_Item, SHARED_PTR< IfcTemplatedEntityList< IfcPresentationStyleAssignment > > v2_Styles, boost::optional< IfcLabel > v3_Name);
-    typedef IfcAnnotationCurveOccurrence* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcAnnotationCurveOccurrence > > list;
-    typedef IfcTemplatedEntityList< IfcAnnotationCurveOccurrence >::it it;
+    IfcAnnotationCurveOccurrence (IfcAbstractEntity* e);
+    IfcAnnotationCurveOccurrence (IfcRepresentationItem* v1_Item, IfcTemplatedEntityList< IfcPresentationStyleAssignment >::ptr v2_Styles, boost::optional< std::string > v3_Name);
+    typedef IfcTemplatedEntityList< IfcAnnotationCurveOccurrence > list;
 };
 /// Definition from ISO/CD 10303-46:1992: An annotation fill area is a set of curves that may be filled with hatching, colour or tiling. The annotation fill are is described by boundaries which consist of non-intersecting, non-self-intersecting closed curves. These curves form the boundary of planar areas to be filled according to the style for the annotation fill area.
 /// 
@@ -17595,73 +18484,70 @@ class IfcAnnotationFillArea : public IfcGeometricRepresentationItem {
     /// A closed curve that defines the outer boundary of the fill area. The areas defined by the outer boundary (minus potentially defined inner boundaries) is filled by the fill area style.
     /// 
     /// IFC2x Edition 3 CHANGE  The two new attributes OuterBoundary and InnerBoundaries replace the old single attribute Boundaries.
-    IfcCurve* OuterBoundary();
+    IfcCurve* OuterBoundary() const;
     void setOuterBoundary(IfcCurve* v);
     /// Whether the optional attribute InnerBoundaries is defined for this IfcAnnotationFillArea
-    bool hasInnerBoundaries();
+    bool hasInnerBoundaries() const;
     /// A set of inner curves that define the inner boundaries of the fill area. The areas defined by the inner boundaries are excluded from applying the fill area style.
     /// 
     /// IFC2x Edition 3 CHANGE  The two new attributes OuterBoundary and InnerBoundaries replace the old single attribute Boundaries.
-    SHARED_PTR< IfcTemplatedEntityList< IfcCurve > > InnerBoundaries();
-    void setInnerBoundaries(SHARED_PTR< IfcTemplatedEntityList< IfcCurve > > v);
+    IfcTemplatedEntityList< IfcCurve >::ptr InnerBoundaries() const;
+    void setInnerBoundaries(IfcTemplatedEntityList< IfcCurve >::ptr v);
     virtual unsigned int getArgumentCount() const { return 2; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY; case 1: return IfcUtil::Argument_ENTITY_LIST; } return IfcGeometricRepresentationItem::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcCurve; case 1: return Type::IfcCurve; } return IfcGeometricRepresentationItem::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "OuterBoundary"; case 1: return "InnerBoundaries"; } return IfcGeometricRepresentationItem::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcAnnotationFillArea (IfcAbstractEntityPtr e);
-    IfcAnnotationFillArea (IfcCurve* v1_OuterBoundary, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcCurve > > > v2_InnerBoundaries);
-    typedef IfcAnnotationFillArea* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcAnnotationFillArea > > list;
-    typedef IfcTemplatedEntityList< IfcAnnotationFillArea >::it it;
+    IfcAnnotationFillArea (IfcAbstractEntity* e);
+    IfcAnnotationFillArea (IfcCurve* v1_OuterBoundary, boost::optional< IfcTemplatedEntityList< IfcCurve >::ptr > v2_InnerBoundaries);
+    typedef IfcTemplatedEntityList< IfcAnnotationFillArea > list;
 };
 
 class IfcAnnotationFillAreaOccurrence : public IfcAnnotationOccurrence {
 public:
     /// Whether the optional attribute FillStyleTarget is defined for this IfcAnnotationFillAreaOccurrence
-    bool hasFillStyleTarget();
-    IfcPoint* FillStyleTarget();
+    bool hasFillStyleTarget() const;
+    IfcPoint* FillStyleTarget() const;
     void setFillStyleTarget(IfcPoint* v);
     /// Whether the optional attribute GlobalOrLocal is defined for this IfcAnnotationFillAreaOccurrence
-    bool hasGlobalOrLocal();
-    IfcGlobalOrLocalEnum::IfcGlobalOrLocalEnum GlobalOrLocal();
+    bool hasGlobalOrLocal() const;
+    IfcGlobalOrLocalEnum::IfcGlobalOrLocalEnum GlobalOrLocal() const;
     void setGlobalOrLocal(IfcGlobalOrLocalEnum::IfcGlobalOrLocalEnum v);
     virtual unsigned int getArgumentCount() const { return 5; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 3: return IfcUtil::Argument_ENTITY; case 4: return IfcUtil::Argument_ENUMERATION; } return IfcAnnotationOccurrence::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 3: return Type::IfcPoint; case 4: return Type::IfcGlobalOrLocalEnum; } return IfcAnnotationOccurrence::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 3: return "FillStyleTarget"; case 4: return "GlobalOrLocal"; } return IfcAnnotationOccurrence::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcAnnotationFillAreaOccurrence (IfcAbstractEntityPtr e);
-    IfcAnnotationFillAreaOccurrence (IfcRepresentationItem* v1_Item, SHARED_PTR< IfcTemplatedEntityList< IfcPresentationStyleAssignment > > v2_Styles, boost::optional< IfcLabel > v3_Name, IfcPoint* v4_FillStyleTarget, boost::optional< IfcGlobalOrLocalEnum::IfcGlobalOrLocalEnum > v5_GlobalOrLocal);
-    typedef IfcAnnotationFillAreaOccurrence* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcAnnotationFillAreaOccurrence > > list;
-    typedef IfcTemplatedEntityList< IfcAnnotationFillAreaOccurrence >::it it;
+    IfcAnnotationFillAreaOccurrence (IfcAbstractEntity* e);
+    IfcAnnotationFillAreaOccurrence (IfcRepresentationItem* v1_Item, IfcTemplatedEntityList< IfcPresentationStyleAssignment >::ptr v2_Styles, boost::optional< std::string > v3_Name, IfcPoint* v4_FillStyleTarget, boost::optional< IfcGlobalOrLocalEnum::IfcGlobalOrLocalEnum > v5_GlobalOrLocal);
+    typedef IfcTemplatedEntityList< IfcAnnotationFillAreaOccurrence > list;
 };
 
 class IfcAnnotationSurface : public IfcGeometricRepresentationItem {
 public:
-    IfcGeometricRepresentationItem* Item();
+    IfcGeometricRepresentationItem* Item() const;
     void setItem(IfcGeometricRepresentationItem* v);
     /// Whether the optional attribute TextureCoordinates is defined for this IfcAnnotationSurface
-    bool hasTextureCoordinates();
-    IfcTextureCoordinate* TextureCoordinates();
+    bool hasTextureCoordinates() const;
+    IfcTextureCoordinate* TextureCoordinates() const;
     void setTextureCoordinates(IfcTextureCoordinate* v);
     virtual unsigned int getArgumentCount() const { return 2; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY; case 1: return IfcUtil::Argument_ENTITY; } return IfcGeometricRepresentationItem::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcGeometricRepresentationItem; case 1: return Type::IfcTextureCoordinate; } return IfcGeometricRepresentationItem::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Item"; case 1: return "TextureCoordinates"; } return IfcGeometricRepresentationItem::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcAnnotationSurface (IfcAbstractEntityPtr e);
+    IfcAnnotationSurface (IfcAbstractEntity* e);
     IfcAnnotationSurface (IfcGeometricRepresentationItem* v1_Item, IfcTextureCoordinate* v2_TextureCoordinates);
-    typedef IfcAnnotationSurface* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcAnnotationSurface > > list;
-    typedef IfcTemplatedEntityList< IfcAnnotationSurface >::it it;
+    typedef IfcTemplatedEntityList< IfcAnnotationSurface > list;
 };
 /// Definition from ISO/CD 10303-42:1992: The direction and location in three dimensional space of a single axis. An axis1_placement is defined in terms of a locating point (inherited from placement supertype) and an axis direction: this is either the direction of axis or defaults to (0.0,0.0,1.0). The actual direction for the axis placement is given by the derived attribute z (Z).  
 /// 
@@ -17675,22 +18561,21 @@ class IfcAnnotationSurface : public IfcGeometricRepresentationItem {
 class IfcAxis1Placement : public IfcPlacement {
 public:
     /// Whether the optional attribute Axis is defined for this IfcAxis1Placement
-    bool hasAxis();
+    bool hasAxis() const;
     /// The direction of the local Z axis.
-    IfcDirection* Axis();
+    IfcDirection* Axis() const;
     void setAxis(IfcDirection* v);
     virtual unsigned int getArgumentCount() const { return 2; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 1: return IfcUtil::Argument_ENTITY; } return IfcPlacement::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 1: return Type::IfcDirection; } return IfcPlacement::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 1: return "Axis"; } return IfcPlacement::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcAxis1Placement (IfcAbstractEntityPtr e);
+    IfcAxis1Placement (IfcAbstractEntity* e);
     IfcAxis1Placement (IfcCartesianPoint* v1_Location, IfcDirection* v2_Axis);
-    typedef IfcAxis1Placement* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcAxis1Placement > > list;
-    typedef IfcTemplatedEntityList< IfcAxis1Placement >::it it;
+    typedef IfcTemplatedEntityList< IfcAxis1Placement > list;
 };
 /// Definition from ISO/CD 10303-42:1992: The location and orientation in two dimensional space of two mutually perpendicular axes. An axis2_placement_2d is defined in terms of a point, (inherited from the placement supertype), and an axis. It can be used to locate and originate an object in two dimensional space and to define a placement coordinate system. The class includes a point which forms the origin of the placement coordinate system. A direction vector is required to complete the definition of the placement coordinate system. The reference direction defines the placement X axis direction, the placement Y axis is derived from this.  
 /// 
@@ -17706,22 +18591,21 @@ class IfcAxis1Placement : public IfcPlacement {
 class IfcAxis2Placement2D : public IfcPlacement {
 public:
     /// Whether the optional attribute RefDirection is defined for this IfcAxis2Placement2D
-    bool hasRefDirection();
+    bool hasRefDirection() const;
     /// The direction used to determine the direction of the local X axis. If a value is omited that it defaults to [1.0, 0.0.].
-    IfcDirection* RefDirection();
+    IfcDirection* RefDirection() const;
     void setRefDirection(IfcDirection* v);
     virtual unsigned int getArgumentCount() const { return 2; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 1: return IfcUtil::Argument_ENTITY; } return IfcPlacement::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 1: return Type::IfcDirection; } return IfcPlacement::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 1: return "RefDirection"; } return IfcPlacement::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcAxis2Placement2D (IfcAbstractEntityPtr e);
+    IfcAxis2Placement2D (IfcAbstractEntity* e);
     IfcAxis2Placement2D (IfcCartesianPoint* v1_Location, IfcDirection* v2_RefDirection);
-    typedef IfcAxis2Placement2D* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcAxis2Placement2D > > list;
-    typedef IfcTemplatedEntityList< IfcAxis2Placement2D >::it it;
+    typedef IfcTemplatedEntityList< IfcAxis2Placement2D > list;
 };
 /// Definition from ISO/CD 10303-42:1992: The location and orientation in three dimensional space of three mutually perpendicular axes. An axis2_placement_3D is defined in terms of a point (inherited from placement supertype) and two (ideally orthogonal) axes. It can be used to locate and originate an object in three dimensional space and to define a placement coordinate system. The entity includes a point which forms the origin of the placement coordinate system. Two direction vectors are required to complete the definition of the placement coordinate system. The axis is the placement Z axis direction and the ref_direction is an approximation to the placement X axis direction.
 /// 
@@ -17739,27 +18623,26 @@ class IfcAxis2Placement2D : public IfcPlacement {
 class IfcAxis2Placement3D : public IfcPlacement {
 public:
     /// Whether the optional attribute Axis is defined for this IfcAxis2Placement3D
-    bool hasAxis();
+    bool hasAxis() const;
     /// The exact direction of the local Z Axis.
-    IfcDirection* Axis();
+    IfcDirection* Axis() const;
     void setAxis(IfcDirection* v);
     /// Whether the optional attribute RefDirection is defined for this IfcAxis2Placement3D
-    bool hasRefDirection();
+    bool hasRefDirection() const;
     /// The direction used to determine the direction of the local X Axis. If necessary an adjustment is made to maintain orthogonality to the Axis direction. If Axis and/or RefDirection is omitted, these directions are taken from the geometric coordinate system.
-    IfcDirection* RefDirection();
+    IfcDirection* RefDirection() const;
     void setRefDirection(IfcDirection* v);
     virtual unsigned int getArgumentCount() const { return 3; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 1: return IfcUtil::Argument_ENTITY; case 2: return IfcUtil::Argument_ENTITY; } return IfcPlacement::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 1: return Type::IfcDirection; case 2: return Type::IfcDirection; } return IfcPlacement::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 1: return "Axis"; case 2: return "RefDirection"; } return IfcPlacement::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcAxis2Placement3D (IfcAbstractEntityPtr e);
+    IfcAxis2Placement3D (IfcAbstractEntity* e);
     IfcAxis2Placement3D (IfcCartesianPoint* v1_Location, IfcDirection* v2_Axis, IfcDirection* v3_RefDirection);
-    typedef IfcAxis2Placement3D* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcAxis2Placement3D > > list;
-    typedef IfcTemplatedEntityList< IfcAxis2Placement3D >::it it;
+    typedef IfcTemplatedEntityList< IfcAxis2Placement3D > list;
 };
 /// Definition from ISO/CD 10303-42:1992: A Boolean result
 /// is the result of a regularized operation on two solids to create
@@ -17790,26 +18673,25 @@ class IfcAxis2Placement3D : public IfcPlacement {
 class IfcBooleanResult : public IfcGeometricRepresentationItem {
 public:
     /// The Boolean operator used in the operation to create the result.
-    IfcBooleanOperator::IfcBooleanOperator Operator();
+    IfcBooleanOperator::IfcBooleanOperator Operator() const;
     void setOperator(IfcBooleanOperator::IfcBooleanOperator v);
     /// The first operand to be operated upon by the Boolean operation.
-    IfcBooleanOperand FirstOperand();
-    void setFirstOperand(IfcBooleanOperand v);
+    IfcBooleanOperand* FirstOperand() const;
+    void setFirstOperand(IfcBooleanOperand* v);
     /// The second operand specified for the operation.
-    IfcBooleanOperand SecondOperand();
-    void setSecondOperand(IfcBooleanOperand v);
+    IfcBooleanOperand* SecondOperand() const;
+    void setSecondOperand(IfcBooleanOperand* v);
     virtual unsigned int getArgumentCount() const { return 3; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENUMERATION; case 1: return IfcUtil::Argument_ENTITY; case 2: return IfcUtil::Argument_ENTITY; } return IfcGeometricRepresentationItem::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcBooleanOperator; case 1: return Type::IfcBooleanOperand; case 2: return Type::IfcBooleanOperand; } return IfcGeometricRepresentationItem::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Operator"; case 1: return "FirstOperand"; case 2: return "SecondOperand"; } return IfcGeometricRepresentationItem::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcBooleanResult (IfcAbstractEntityPtr e);
-    IfcBooleanResult (IfcBooleanOperator::IfcBooleanOperator v1_Operator, IfcBooleanOperand v2_FirstOperand, IfcBooleanOperand v3_SecondOperand);
-    typedef IfcBooleanResult* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcBooleanResult > > list;
-    typedef IfcTemplatedEntityList< IfcBooleanResult >::it it;
+    IfcBooleanResult (IfcAbstractEntity* e);
+    IfcBooleanResult (IfcBooleanOperator::IfcBooleanOperator v1_Operator, IfcBooleanOperand* v2_FirstOperand, IfcBooleanOperand* v3_SecondOperand);
+    typedef IfcTemplatedEntityList< IfcBooleanResult > list;
 };
 /// Definition from ISO/CD 10303-42:1992: A bounded surface is a surface of finite area with identifiable boundaries.
 /// 
@@ -17827,16 +18709,15 @@ class IfcBoundedSurface : public IfcSurface {
 public:
     virtual unsigned int getArgumentCount() const { return 0; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcSurface::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcSurface::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcSurface::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcBoundedSurface (IfcAbstractEntityPtr e);
+    IfcBoundedSurface (IfcAbstractEntity* e);
     IfcBoundedSurface ();
-    typedef IfcBoundedSurface* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcBoundedSurface > > list;
-    typedef IfcTemplatedEntityList< IfcBoundedSurface >::it it;
+    typedef IfcTemplatedEntityList< IfcBoundedSurface > list;
 };
 /// Definition from ISO/CD 10303-42:1992: A box domain
 ///   is an orthogonal box parallel to the axes of the geometric
@@ -17863,29 +18744,28 @@ class IfcBoundedSurface : public IfcSurface {
 class IfcBoundingBox : public IfcGeometricRepresentationItem {
 public:
     /// Location of the bottom left corner (having the minimum values).
-    IfcCartesianPoint* Corner();
+    IfcCartesianPoint* Corner() const;
     void setCorner(IfcCartesianPoint* v);
     /// Length attribute (measured along the edge parallel to the X Axis)
-    IfcPositiveLengthMeasure XDim();
-    void setXDim(IfcPositiveLengthMeasure v);
+    double XDim() const;
+    void setXDim(double v);
     /// Width attribute (measured along the edge parallel to the Y Axis)
-    IfcPositiveLengthMeasure YDim();
-    void setYDim(IfcPositiveLengthMeasure v);
+    double YDim() const;
+    void setYDim(double v);
     /// Height attribute (measured along the edge parallel to the Z Axis).
-    IfcPositiveLengthMeasure ZDim();
-    void setZDim(IfcPositiveLengthMeasure v);
+    double ZDim() const;
+    void setZDim(double v);
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY; case 1: return IfcUtil::Argument_DOUBLE; case 2: return IfcUtil::Argument_DOUBLE; case 3: return IfcUtil::Argument_DOUBLE; } return IfcGeometricRepresentationItem::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcCartesianPoint; case 1: return Type::IfcPositiveLengthMeasure; case 2: return Type::IfcPositiveLengthMeasure; case 3: return Type::IfcPositiveLengthMeasure; } return IfcGeometricRepresentationItem::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Corner"; case 1: return "XDim"; case 2: return "YDim"; case 3: return "ZDim"; } return IfcGeometricRepresentationItem::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcBoundingBox (IfcAbstractEntityPtr e);
-    IfcBoundingBox (IfcCartesianPoint* v1_Corner, IfcPositiveLengthMeasure v2_XDim, IfcPositiveLengthMeasure v3_YDim, IfcPositiveLengthMeasure v4_ZDim);
-    typedef IfcBoundingBox* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcBoundingBox > > list;
-    typedef IfcTemplatedEntityList< IfcBoundingBox >::it it;
+    IfcBoundingBox (IfcAbstractEntity* e);
+    IfcBoundingBox (IfcCartesianPoint* v1_Corner, double v2_XDim, double v3_YDim, double v4_ZDim);
+    typedef IfcTemplatedEntityList< IfcBoundingBox > list;
 };
 /// Definition from ISO/CD 10303-42:1992: This entity is a subtype of the half space solid which is trimmed by a surrounding rectangular box. The box has its edges parallel to the coordinate axes of the geometric coordinate system.
 /// 
@@ -17920,20 +18800,19 @@ class IfcBoundingBox : public IfcGeometricRepresentationItem {
 class IfcBoxedHalfSpace : public IfcHalfSpaceSolid {
 public:
     /// The box which bounds the resulting solid of the Boolean operation involving the half space solid for computational purposes only.
-    IfcBoundingBox* Enclosure();
+    IfcBoundingBox* Enclosure() const;
     void setEnclosure(IfcBoundingBox* v);
     virtual unsigned int getArgumentCount() const { return 3; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 2: return IfcUtil::Argument_ENTITY; } return IfcHalfSpaceSolid::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 2: return Type::IfcBoundingBox; } return IfcHalfSpaceSolid::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 2: return "Enclosure"; } return IfcHalfSpaceSolid::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcBoxedHalfSpace (IfcAbstractEntityPtr e);
+    IfcBoxedHalfSpace (IfcAbstractEntity* e);
     IfcBoxedHalfSpace (IfcSurface* v1_BaseSurface, bool v2_AgreementFlag, IfcBoundingBox* v3_Enclosure);
-    typedef IfcBoxedHalfSpace* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcBoxedHalfSpace > > list;
-    typedef IfcTemplatedEntityList< IfcBoxedHalfSpace >::it it;
+    typedef IfcTemplatedEntityList< IfcBoxedHalfSpace > list;
 };
 /// IfcCShapeProfileDef defines
 /// a section profile that provides the defining parameters of a C-shaped
@@ -17960,38 +18839,37 @@ class IfcBoxedHalfSpace : public IfcHalfSpaceSolid {
 class IfcCShapeProfileDef : public IfcParameterizedProfileDef {
 public:
     /// Profile depth, see illustration above (= h).
-    IfcPositiveLengthMeasure Depth();
-    void setDepth(IfcPositiveLengthMeasure v);
+    double Depth() const;
+    void setDepth(double v);
     /// Profile width, see illustration above (= b).
-    IfcPositiveLengthMeasure Width();
-    void setWidth(IfcPositiveLengthMeasure v);
+    double Width() const;
+    void setWidth(double v);
     /// Constant wall thickness of profile (= ts).
-    IfcPositiveLengthMeasure WallThickness();
-    void setWallThickness(IfcPositiveLengthMeasure v);
+    double WallThickness() const;
+    void setWallThickness(double v);
     /// Lengths of girth, see illustration above (= c).
-    IfcPositiveLengthMeasure Girth();
-    void setGirth(IfcPositiveLengthMeasure v);
+    double Girth() const;
+    void setGirth(double v);
     /// Whether the optional attribute InternalFilletRadius is defined for this IfcCShapeProfileDef
-    bool hasInternalFilletRadius();
+    bool hasInternalFilletRadius() const;
     /// Internal fillet radius according the above illustration (= r1).
-    IfcPositiveLengthMeasure InternalFilletRadius();
-    void setInternalFilletRadius(IfcPositiveLengthMeasure v);
+    double InternalFilletRadius() const;
+    void setInternalFilletRadius(double v);
     /// Whether the optional attribute CentreOfGravityInX is defined for this IfcCShapeProfileDef
-    bool hasCentreOfGravityInX();
-    IfcPositiveLengthMeasure CentreOfGravityInX();
-    void setCentreOfGravityInX(IfcPositiveLengthMeasure v);
+    bool hasCentreOfGravityInX() const;
+    double CentreOfGravityInX() const;
+    void setCentreOfGravityInX(double v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 3: return IfcUtil::Argument_DOUBLE; case 4: return IfcUtil::Argument_DOUBLE; case 5: return IfcUtil::Argument_DOUBLE; case 6: return IfcUtil::Argument_DOUBLE; case 7: return IfcUtil::Argument_DOUBLE; case 8: return IfcUtil::Argument_DOUBLE; } return IfcParameterizedProfileDef::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 3: return Type::IfcPositiveLengthMeasure; case 4: return Type::IfcPositiveLengthMeasure; case 5: return Type::IfcPositiveLengthMeasure; case 6: return Type::IfcPositiveLengthMeasure; case 7: return Type::IfcPositiveLengthMeasure; case 8: return Type::IfcPositiveLengthMeasure; } return IfcParameterizedProfileDef::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 3: return "Depth"; case 4: return "Width"; case 5: return "WallThickness"; case 6: return "Girth"; case 7: return "InternalFilletRadius"; case 8: return "CentreOfGravityInX"; } return IfcParameterizedProfileDef::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcCShapeProfileDef (IfcAbstractEntityPtr e);
-    IfcCShapeProfileDef (IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< IfcLabel > v2_ProfileName, IfcAxis2Placement2D* v3_Position, IfcPositiveLengthMeasure v4_Depth, IfcPositiveLengthMeasure v5_Width, IfcPositiveLengthMeasure v6_WallThickness, IfcPositiveLengthMeasure v7_Girth, boost::optional< IfcPositiveLengthMeasure > v8_InternalFilletRadius, boost::optional< IfcPositiveLengthMeasure > v9_CentreOfGravityInX);
-    typedef IfcCShapeProfileDef* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcCShapeProfileDef > > list;
-    typedef IfcTemplatedEntityList< IfcCShapeProfileDef >::it it;
+    IfcCShapeProfileDef (IfcAbstractEntity* e);
+    IfcCShapeProfileDef (IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< std::string > v2_ProfileName, IfcAxis2Placement2D* v3_Position, double v4_Depth, double v5_Width, double v6_WallThickness, double v7_Girth, boost::optional< double > v8_InternalFilletRadius, boost::optional< double > v9_CentreOfGravityInX);
+    typedef IfcTemplatedEntityList< IfcCShapeProfileDef > list;
 };
 /// Definition from ISO/CD 10303-42:1992: A point defined by its coordinates in a two or three dimensional rectangular Cartesian coordinate system, or in a two dimensional parameter space. The entity is defined in a two or three dimensional space.  
 /// 
@@ -18003,20 +18881,19 @@ class IfcCShapeProfileDef : public IfcParameterizedProfileDef {
 class IfcCartesianPoint : public IfcPoint {
 public:
     /// The first, second, and third coordinate of the point location. If placed in a two or three dimensional rectangular Cartesian coordinate system, Coordinates[1] is the X coordinate, Coordinates[2] is the Y coordinate, and Coordinates[3] is the Z coordinate.
-    std::vector< IfcLengthMeasure > /*[1:3]*/ Coordinates();
-    void setCoordinates(std::vector< IfcLengthMeasure > /*[1:3]*/ v);
+    std::vector< double > /*[1:3]*/ Coordinates() const;
+    void setCoordinates(std::vector< double > /*[1:3]*/ v);
     virtual unsigned int getArgumentCount() const { return 1; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_VECTOR_DOUBLE; } return IfcPoint::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcLengthMeasure; } return IfcPoint::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Coordinates"; } return IfcPoint::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcCartesianPoint (IfcAbstractEntityPtr e);
-    IfcCartesianPoint (std::vector< IfcLengthMeasure > /*[1:3]*/ v1_Coordinates);
-    typedef IfcCartesianPoint* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcCartesianPoint > > list;
-    typedef IfcTemplatedEntityList< IfcCartesianPoint >::it it;
+    IfcCartesianPoint (IfcAbstractEntity* e);
+    IfcCartesianPoint (std::vector< double > /*[1:3]*/ v1_Coordinates);
+    typedef IfcTemplatedEntityList< IfcCartesianPoint > list;
 };
 /// Definition from ISO/CD 10303-42:1992: A Cartesian transformation operator defines a geometric transformation composed of translation, rotation, mirroring and uniform scaling. The list of normalized vectors u defines the columns of an orthogonal matrix T. These vectors are computed, by the base axis function, from the direction attributes axis1, axis2 and, in Cartesian transformation operator 3d, axis3. If |T|= -1, the transformation includes mirroring. The local origin point A, the scale value S and the matrix T together define a transformation.  
 /// 
@@ -18051,35 +18928,34 @@ class IfcCartesianPoint : public IfcPoint {
 class IfcCartesianTransformationOperator : public IfcGeometricRepresentationItem {
 public:
     /// Whether the optional attribute Axis1 is defined for this IfcCartesianTransformationOperator
-    bool hasAxis1();
+    bool hasAxis1() const;
     /// The direction used to determine U[1], the derived X axis direction.
-    IfcDirection* Axis1();
+    IfcDirection* Axis1() const;
     void setAxis1(IfcDirection* v);
     /// Whether the optional attribute Axis2 is defined for this IfcCartesianTransformationOperator
-    bool hasAxis2();
+    bool hasAxis2() const;
     /// The direction used to determine U[2], the derived Y axis direction.
-    IfcDirection* Axis2();
+    IfcDirection* Axis2() const;
     void setAxis2(IfcDirection* v);
     /// The required translation, specified as a cartesian point. The actual translation included in the transformation is from the geometric origin to the local origin.
-    IfcCartesianPoint* LocalOrigin();
+    IfcCartesianPoint* LocalOrigin() const;
     void setLocalOrigin(IfcCartesianPoint* v);
     /// Whether the optional attribute Scale is defined for this IfcCartesianTransformationOperator
-    bool hasScale();
+    bool hasScale() const;
     /// The scaling value specified for the transformation.
-    double Scale();
+    double Scale() const;
     void setScale(double v);
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY; case 1: return IfcUtil::Argument_ENTITY; case 2: return IfcUtil::Argument_ENTITY; case 3: return IfcUtil::Argument_DOUBLE; } return IfcGeometricRepresentationItem::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcDirection; case 1: return Type::IfcDirection; case 2: return Type::IfcCartesianPoint; case 3: return Type::UNDEFINED; } return IfcGeometricRepresentationItem::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Axis1"; case 1: return "Axis2"; case 2: return "LocalOrigin"; case 3: return "Scale"; } return IfcGeometricRepresentationItem::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcCartesianTransformationOperator (IfcAbstractEntityPtr e);
+    IfcCartesianTransformationOperator (IfcAbstractEntity* e);
     IfcCartesianTransformationOperator (IfcDirection* v1_Axis1, IfcDirection* v2_Axis2, IfcCartesianPoint* v3_LocalOrigin, boost::optional< double > v4_Scale);
-    typedef IfcCartesianTransformationOperator* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcCartesianTransformationOperator > > list;
-    typedef IfcTemplatedEntityList< IfcCartesianTransformationOperator >::it it;
+    typedef IfcTemplatedEntityList< IfcCartesianTransformationOperator > list;
 };
 /// Definition from ISO/CD 10303-42:1992: A Cartesian transformation operator 2d defines a geometric transformation in two-dimensional space composed of translation, rotation, mirroring and uniform scaling. The list of normalized vectors u defines the columns of an orthogonal matrix T. These vectors are computed from the direction attributes axis1 and axis2 by the base axis function. If |T|= -1, the transformation includes mirroring.  
 /// 
@@ -18090,16 +18966,15 @@ class IfcCartesianTransformationOperator2D : public IfcCartesianTransformationOp
 public:
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcCartesianTransformationOperator::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcCartesianTransformationOperator::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcCartesianTransformationOperator::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcCartesianTransformationOperator2D (IfcAbstractEntityPtr e);
+    IfcCartesianTransformationOperator2D (IfcAbstractEntity* e);
     IfcCartesianTransformationOperator2D (IfcDirection* v1_Axis1, IfcDirection* v2_Axis2, IfcCartesianPoint* v3_LocalOrigin, boost::optional< double > v4_Scale);
-    typedef IfcCartesianTransformationOperator2D* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcCartesianTransformationOperator2D > > list;
-    typedef IfcTemplatedEntityList< IfcCartesianTransformationOperator2D >::it it;
+    typedef IfcTemplatedEntityList< IfcCartesianTransformationOperator2D > list;
 };
 /// A Cartesian transformation operator 2d non uniform defines a geometric transformation in two-dimensional space composed of translation, rotation, mirroring and non uniform scaling. Non uniform scaling is given by two different scaling factors: 
 /// 
@@ -18114,22 +18989,21 @@ class IfcCartesianTransformationOperator2D : public IfcCartesianTransformationOp
 class IfcCartesianTransformationOperator2DnonUniform : public IfcCartesianTransformationOperator2D {
 public:
     /// Whether the optional attribute Scale2 is defined for this IfcCartesianTransformationOperator2DnonUniform
-    bool hasScale2();
+    bool hasScale2() const;
     /// The scaling value specified for the transformation along the axis 2. This is normally the y scale factor.
-    double Scale2();
+    double Scale2() const;
     void setScale2(double v);
     virtual unsigned int getArgumentCount() const { return 5; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 4: return IfcUtil::Argument_DOUBLE; } return IfcCartesianTransformationOperator2D::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 4: return Type::UNDEFINED; } return IfcCartesianTransformationOperator2D::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 4: return "Scale2"; } return IfcCartesianTransformationOperator2D::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcCartesianTransformationOperator2DnonUniform (IfcAbstractEntityPtr e);
+    IfcCartesianTransformationOperator2DnonUniform (IfcAbstractEntity* e);
     IfcCartesianTransformationOperator2DnonUniform (IfcDirection* v1_Axis1, IfcDirection* v2_Axis2, IfcCartesianPoint* v3_LocalOrigin, boost::optional< double > v4_Scale, boost::optional< double > v5_Scale2);
-    typedef IfcCartesianTransformationOperator2DnonUniform* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcCartesianTransformationOperator2DnonUniform > > list;
-    typedef IfcTemplatedEntityList< IfcCartesianTransformationOperator2DnonUniform >::it it;
+    typedef IfcTemplatedEntityList< IfcCartesianTransformationOperator2DnonUniform > list;
 };
 /// Definition from ISO/CD 10303-42:1992: A Cartesian transformation operator 3d defines a geometric transformation in three-dimensional space composed of translation, rotation, mirroring and uniform scaling. The list of normalized vectors u defines the columns of an orthogonal matrix T. These vectors are computed from the direction attributes axis1, axis2 and axis3 by the base axis function. If |T|= -1, the transformation includes mirroring.  
 /// 
@@ -18139,22 +19013,21 @@ class IfcCartesianTransformationOperator2DnonUniform : public IfcCartesianTransf
 class IfcCartesianTransformationOperator3D : public IfcCartesianTransformationOperator {
 public:
     /// Whether the optional attribute Axis3 is defined for this IfcCartesianTransformationOperator3D
-    bool hasAxis3();
+    bool hasAxis3() const;
     /// The exact direction of U[3], the derived Z axis direction.
-    IfcDirection* Axis3();
+    IfcDirection* Axis3() const;
     void setAxis3(IfcDirection* v);
     virtual unsigned int getArgumentCount() const { return 5; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 4: return IfcUtil::Argument_ENTITY; } return IfcCartesianTransformationOperator::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 4: return Type::IfcDirection; } return IfcCartesianTransformationOperator::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 4: return "Axis3"; } return IfcCartesianTransformationOperator::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcCartesianTransformationOperator3D (IfcAbstractEntityPtr e);
+    IfcCartesianTransformationOperator3D (IfcAbstractEntity* e);
     IfcCartesianTransformationOperator3D (IfcDirection* v1_Axis1, IfcDirection* v2_Axis2, IfcCartesianPoint* v3_LocalOrigin, boost::optional< double > v4_Scale, IfcDirection* v5_Axis3);
-    typedef IfcCartesianTransformationOperator3D* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcCartesianTransformationOperator3D > > list;
-    typedef IfcTemplatedEntityList< IfcCartesianTransformationOperator3D >::it it;
+    typedef IfcTemplatedEntityList< IfcCartesianTransformationOperator3D > list;
 };
 /// A Cartesian transformation operator 3d non uniform defines a geometric transformation in three-dimensional space composed of translation, rotation, mirroring and non uniform scaling. Non uniform scaling is given by three different scaling factors:
 /// 
@@ -18170,27 +19043,26 @@ class IfcCartesianTransformationOperator3D : public IfcCartesianTransformationOp
 class IfcCartesianTransformationOperator3DnonUniform : public IfcCartesianTransformationOperator3D {
 public:
     /// Whether the optional attribute Scale2 is defined for this IfcCartesianTransformationOperator3DnonUniform
-    bool hasScale2();
+    bool hasScale2() const;
     /// The scaling value specified for the transformation along the axis 2. This is normally the y scale factor.
-    double Scale2();
+    double Scale2() const;
     void setScale2(double v);
     /// Whether the optional attribute Scale3 is defined for this IfcCartesianTransformationOperator3DnonUniform
-    bool hasScale3();
+    bool hasScale3() const;
     /// The scaling value specified for the transformation along the axis 3. This is normally the z scale factor.
-    double Scale3();
+    double Scale3() const;
     void setScale3(double v);
     virtual unsigned int getArgumentCount() const { return 7; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 5: return IfcUtil::Argument_DOUBLE; case 6: return IfcUtil::Argument_DOUBLE; } return IfcCartesianTransformationOperator3D::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 5: return Type::UNDEFINED; case 6: return Type::UNDEFINED; } return IfcCartesianTransformationOperator3D::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 5: return "Scale2"; case 6: return "Scale3"; } return IfcCartesianTransformationOperator3D::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcCartesianTransformationOperator3DnonUniform (IfcAbstractEntityPtr e);
+    IfcCartesianTransformationOperator3DnonUniform (IfcAbstractEntity* e);
     IfcCartesianTransformationOperator3DnonUniform (IfcDirection* v1_Axis1, IfcDirection* v2_Axis2, IfcCartesianPoint* v3_LocalOrigin, boost::optional< double > v4_Scale, IfcDirection* v5_Axis3, boost::optional< double > v6_Scale2, boost::optional< double > v7_Scale3);
-    typedef IfcCartesianTransformationOperator3DnonUniform* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcCartesianTransformationOperator3DnonUniform > > list;
-    typedef IfcTemplatedEntityList< IfcCartesianTransformationOperator3DnonUniform >::it it;
+    typedef IfcTemplatedEntityList< IfcCartesianTransformationOperator3DnonUniform > list;
 };
 /// IfcCircleProfileDef defines a circle as the profile definition used by the swept surface geometry or by the swept area solid. It is given by its Radius attribute and placed within the 2D position coordinate system, established by the Position attribute. 
 /// 
@@ -18207,20 +19079,19 @@ class IfcCartesianTransformationOperator3DnonUniform : public IfcCartesianTransf
 class IfcCircleProfileDef : public IfcParameterizedProfileDef {
 public:
     /// The radius of the circle.
-    IfcPositiveLengthMeasure Radius();
-    void setRadius(IfcPositiveLengthMeasure v);
+    double Radius() const;
+    void setRadius(double v);
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 3: return IfcUtil::Argument_DOUBLE; } return IfcParameterizedProfileDef::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 3: return Type::IfcPositiveLengthMeasure; } return IfcParameterizedProfileDef::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 3: return "Radius"; } return IfcParameterizedProfileDef::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcCircleProfileDef (IfcAbstractEntityPtr e);
-    IfcCircleProfileDef (IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< IfcLabel > v2_ProfileName, IfcAxis2Placement2D* v3_Position, IfcPositiveLengthMeasure v4_Radius);
-    typedef IfcCircleProfileDef* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcCircleProfileDef > > list;
-    typedef IfcTemplatedEntityList< IfcCircleProfileDef >::it it;
+    IfcCircleProfileDef (IfcAbstractEntity* e);
+    IfcCircleProfileDef (IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< std::string > v2_ProfileName, IfcAxis2Placement2D* v3_Position, double v4_Radius);
+    typedef IfcTemplatedEntityList< IfcCircleProfileDef > list;
 };
 /// Definition from ISO/CD 10303-42:1992: A closed shell is a shell
 ///   of the dimensionality 2 which typically serves as a bound for a region in R3. A
@@ -18275,16 +19146,15 @@ class IfcClosedShell : public IfcConnectedFaceSet {
 public:
     virtual unsigned int getArgumentCount() const { return 1; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcConnectedFaceSet::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcConnectedFaceSet::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcConnectedFaceSet::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcClosedShell (IfcAbstractEntityPtr e);
-    IfcClosedShell (SHARED_PTR< IfcTemplatedEntityList< IfcFace > > v1_CfsFaces);
-    typedef IfcClosedShell* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcClosedShell > > list;
-    typedef IfcTemplatedEntityList< IfcClosedShell >::it it;
+    IfcClosedShell (IfcAbstractEntity* e);
+    IfcClosedShell (IfcTemplatedEntityList< IfcFace >::ptr v1_CfsFaces);
+    typedef IfcTemplatedEntityList< IfcClosedShell > list;
 };
 /// Definition from ISO/CD 10303-42:1992: A composite curve segment is a bounded curve together with transition information which is used to construct a composite curve (IfcCompositeCurve).
 /// 
@@ -18296,111 +19166,108 @@ class IfcClosedShell : public IfcConnectedFaceSet {
 class IfcCompositeCurveSegment : public IfcGeometricRepresentationItem {
 public:
     /// The state of transition (i.e., geometric continuity from the last point of this segment to the first point of the next segment) in a composite curve.
-    IfcTransitionCode::IfcTransitionCode Transition();
+    IfcTransitionCode::IfcTransitionCode Transition() const;
     void setTransition(IfcTransitionCode::IfcTransitionCode v);
     /// An indicator of whether or not the sense of the segment agrees with, or opposes, that of the parent curve. If SameSense is false, the point with highest parameter value is taken as the first point of the segment.
     /// 
     /// NOTE  If the datatype of ParentCurve is IfcTrimmedCurve, the value of SameSense overrides the value of IfcTrimmedCurve.SenseAgreement
-    bool SameSense();
+    bool SameSense() const;
     void setSameSense(bool v);
     /// The bounded curve which defines the geometry of the segment.
-    IfcCurve* ParentCurve();
+    IfcCurve* ParentCurve() const;
     void setParentCurve(IfcCurve* v);
     virtual unsigned int getArgumentCount() const { return 3; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENUMERATION; case 1: return IfcUtil::Argument_BOOL; case 2: return IfcUtil::Argument_ENTITY; } return IfcGeometricRepresentationItem::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcTransitionCode; case 1: return Type::UNDEFINED; case 2: return Type::IfcCurve; } return IfcGeometricRepresentationItem::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Transition"; case 1: return "SameSense"; case 2: return "ParentCurve"; } return IfcGeometricRepresentationItem::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcCompositeCurve > > UsingCurves(); // INVERSE IfcCompositeCurve::Segments
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcCompositeCurve >::ptr UsingCurves() const; // INVERSE IfcCompositeCurve::Segments
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcCompositeCurveSegment (IfcAbstractEntityPtr e);
+    IfcCompositeCurveSegment (IfcAbstractEntity* e);
     IfcCompositeCurveSegment (IfcTransitionCode::IfcTransitionCode v1_Transition, bool v2_SameSense, IfcCurve* v3_ParentCurve);
-    typedef IfcCompositeCurveSegment* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcCompositeCurveSegment > > list;
-    typedef IfcTemplatedEntityList< IfcCompositeCurveSegment >::it it;
+    typedef IfcTemplatedEntityList< IfcCompositeCurveSegment > list;
 };
 
 class IfcCraneRailAShapeProfileDef : public IfcParameterizedProfileDef {
 public:
-    IfcPositiveLengthMeasure OverallHeight();
-    void setOverallHeight(IfcPositiveLengthMeasure v);
-    IfcPositiveLengthMeasure BaseWidth2();
-    void setBaseWidth2(IfcPositiveLengthMeasure v);
+    double OverallHeight() const;
+    void setOverallHeight(double v);
+    double BaseWidth2() const;
+    void setBaseWidth2(double v);
     /// Whether the optional attribute Radius is defined for this IfcCraneRailAShapeProfileDef
-    bool hasRadius();
-    IfcPositiveLengthMeasure Radius();
-    void setRadius(IfcPositiveLengthMeasure v);
-    IfcPositiveLengthMeasure HeadWidth();
-    void setHeadWidth(IfcPositiveLengthMeasure v);
-    IfcPositiveLengthMeasure HeadDepth2();
-    void setHeadDepth2(IfcPositiveLengthMeasure v);
-    IfcPositiveLengthMeasure HeadDepth3();
-    void setHeadDepth3(IfcPositiveLengthMeasure v);
-    IfcPositiveLengthMeasure WebThickness();
-    void setWebThickness(IfcPositiveLengthMeasure v);
-    IfcPositiveLengthMeasure BaseWidth4();
-    void setBaseWidth4(IfcPositiveLengthMeasure v);
-    IfcPositiveLengthMeasure BaseDepth1();
-    void setBaseDepth1(IfcPositiveLengthMeasure v);
-    IfcPositiveLengthMeasure BaseDepth2();
-    void setBaseDepth2(IfcPositiveLengthMeasure v);
-    IfcPositiveLengthMeasure BaseDepth3();
-    void setBaseDepth3(IfcPositiveLengthMeasure v);
+    bool hasRadius() const;
+    double Radius() const;
+    void setRadius(double v);
+    double HeadWidth() const;
+    void setHeadWidth(double v);
+    double HeadDepth2() const;
+    void setHeadDepth2(double v);
+    double HeadDepth3() const;
+    void setHeadDepth3(double v);
+    double WebThickness() const;
+    void setWebThickness(double v);
+    double BaseWidth4() const;
+    void setBaseWidth4(double v);
+    double BaseDepth1() const;
+    void setBaseDepth1(double v);
+    double BaseDepth2() const;
+    void setBaseDepth2(double v);
+    double BaseDepth3() const;
+    void setBaseDepth3(double v);
     /// Whether the optional attribute CentreOfGravityInY is defined for this IfcCraneRailAShapeProfileDef
-    bool hasCentreOfGravityInY();
-    IfcPositiveLengthMeasure CentreOfGravityInY();
-    void setCentreOfGravityInY(IfcPositiveLengthMeasure v);
+    bool hasCentreOfGravityInY() const;
+    double CentreOfGravityInY() const;
+    void setCentreOfGravityInY(double v);
     virtual unsigned int getArgumentCount() const { return 15; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 3: return IfcUtil::Argument_DOUBLE; case 4: return IfcUtil::Argument_DOUBLE; case 5: return IfcUtil::Argument_DOUBLE; case 6: return IfcUtil::Argument_DOUBLE; case 7: return IfcUtil::Argument_DOUBLE; case 8: return IfcUtil::Argument_DOUBLE; case 9: return IfcUtil::Argument_DOUBLE; case 10: return IfcUtil::Argument_DOUBLE; case 11: return IfcUtil::Argument_DOUBLE; case 12: return IfcUtil::Argument_DOUBLE; case 13: return IfcUtil::Argument_DOUBLE; case 14: return IfcUtil::Argument_DOUBLE; } return IfcParameterizedProfileDef::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 3: return Type::IfcPositiveLengthMeasure; case 4: return Type::IfcPositiveLengthMeasure; case 5: return Type::IfcPositiveLengthMeasure; case 6: return Type::IfcPositiveLengthMeasure; case 7: return Type::IfcPositiveLengthMeasure; case 8: return Type::IfcPositiveLengthMeasure; case 9: return Type::IfcPositiveLengthMeasure; case 10: return Type::IfcPositiveLengthMeasure; case 11: return Type::IfcPositiveLengthMeasure; case 12: return Type::IfcPositiveLengthMeasure; case 13: return Type::IfcPositiveLengthMeasure; case 14: return Type::IfcPositiveLengthMeasure; } return IfcParameterizedProfileDef::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 3: return "OverallHeight"; case 4: return "BaseWidth2"; case 5: return "Radius"; case 6: return "HeadWidth"; case 7: return "HeadDepth2"; case 8: return "HeadDepth3"; case 9: return "WebThickness"; case 10: return "BaseWidth4"; case 11: return "BaseDepth1"; case 12: return "BaseDepth2"; case 13: return "BaseDepth3"; case 14: return "CentreOfGravityInY"; } return IfcParameterizedProfileDef::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcCraneRailAShapeProfileDef (IfcAbstractEntityPtr e);
-    IfcCraneRailAShapeProfileDef (IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< IfcLabel > v2_ProfileName, IfcAxis2Placement2D* v3_Position, IfcPositiveLengthMeasure v4_OverallHeight, IfcPositiveLengthMeasure v5_BaseWidth2, boost::optional< IfcPositiveLengthMeasure > v6_Radius, IfcPositiveLengthMeasure v7_HeadWidth, IfcPositiveLengthMeasure v8_HeadDepth2, IfcPositiveLengthMeasure v9_HeadDepth3, IfcPositiveLengthMeasure v10_WebThickness, IfcPositiveLengthMeasure v11_BaseWidth4, IfcPositiveLengthMeasure v12_BaseDepth1, IfcPositiveLengthMeasure v13_BaseDepth2, IfcPositiveLengthMeasure v14_BaseDepth3, boost::optional< IfcPositiveLengthMeasure > v15_CentreOfGravityInY);
-    typedef IfcCraneRailAShapeProfileDef* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcCraneRailAShapeProfileDef > > list;
-    typedef IfcTemplatedEntityList< IfcCraneRailAShapeProfileDef >::it it;
+    IfcCraneRailAShapeProfileDef (IfcAbstractEntity* e);
+    IfcCraneRailAShapeProfileDef (IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< std::string > v2_ProfileName, IfcAxis2Placement2D* v3_Position, double v4_OverallHeight, double v5_BaseWidth2, boost::optional< double > v6_Radius, double v7_HeadWidth, double v8_HeadDepth2, double v9_HeadDepth3, double v10_WebThickness, double v11_BaseWidth4, double v12_BaseDepth1, double v13_BaseDepth2, double v14_BaseDepth3, boost::optional< double > v15_CentreOfGravityInY);
+    typedef IfcTemplatedEntityList< IfcCraneRailAShapeProfileDef > list;
 };
 
 class IfcCraneRailFShapeProfileDef : public IfcParameterizedProfileDef {
 public:
-    IfcPositiveLengthMeasure OverallHeight();
-    void setOverallHeight(IfcPositiveLengthMeasure v);
-    IfcPositiveLengthMeasure HeadWidth();
-    void setHeadWidth(IfcPositiveLengthMeasure v);
+    double OverallHeight() const;
+    void setOverallHeight(double v);
+    double HeadWidth() const;
+    void setHeadWidth(double v);
     /// Whether the optional attribute Radius is defined for this IfcCraneRailFShapeProfileDef
-    bool hasRadius();
-    IfcPositiveLengthMeasure Radius();
-    void setRadius(IfcPositiveLengthMeasure v);
-    IfcPositiveLengthMeasure HeadDepth2();
-    void setHeadDepth2(IfcPositiveLengthMeasure v);
-    IfcPositiveLengthMeasure HeadDepth3();
-    void setHeadDepth3(IfcPositiveLengthMeasure v);
-    IfcPositiveLengthMeasure WebThickness();
-    void setWebThickness(IfcPositiveLengthMeasure v);
-    IfcPositiveLengthMeasure BaseDepth1();
-    void setBaseDepth1(IfcPositiveLengthMeasure v);
-    IfcPositiveLengthMeasure BaseDepth2();
-    void setBaseDepth2(IfcPositiveLengthMeasure v);
+    bool hasRadius() const;
+    double Radius() const;
+    void setRadius(double v);
+    double HeadDepth2() const;
+    void setHeadDepth2(double v);
+    double HeadDepth3() const;
+    void setHeadDepth3(double v);
+    double WebThickness() const;
+    void setWebThickness(double v);
+    double BaseDepth1() const;
+    void setBaseDepth1(double v);
+    double BaseDepth2() const;
+    void setBaseDepth2(double v);
     /// Whether the optional attribute CentreOfGravityInY is defined for this IfcCraneRailFShapeProfileDef
-    bool hasCentreOfGravityInY();
-    IfcPositiveLengthMeasure CentreOfGravityInY();
-    void setCentreOfGravityInY(IfcPositiveLengthMeasure v);
+    bool hasCentreOfGravityInY() const;
+    double CentreOfGravityInY() const;
+    void setCentreOfGravityInY(double v);
     virtual unsigned int getArgumentCount() const { return 12; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 3: return IfcUtil::Argument_DOUBLE; case 4: return IfcUtil::Argument_DOUBLE; case 5: return IfcUtil::Argument_DOUBLE; case 6: return IfcUtil::Argument_DOUBLE; case 7: return IfcUtil::Argument_DOUBLE; case 8: return IfcUtil::Argument_DOUBLE; case 9: return IfcUtil::Argument_DOUBLE; case 10: return IfcUtil::Argument_DOUBLE; case 11: return IfcUtil::Argument_DOUBLE; } return IfcParameterizedProfileDef::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 3: return Type::IfcPositiveLengthMeasure; case 4: return Type::IfcPositiveLengthMeasure; case 5: return Type::IfcPositiveLengthMeasure; case 6: return Type::IfcPositiveLengthMeasure; case 7: return Type::IfcPositiveLengthMeasure; case 8: return Type::IfcPositiveLengthMeasure; case 9: return Type::IfcPositiveLengthMeasure; case 10: return Type::IfcPositiveLengthMeasure; case 11: return Type::IfcPositiveLengthMeasure; } return IfcParameterizedProfileDef::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 3: return "OverallHeight"; case 4: return "HeadWidth"; case 5: return "Radius"; case 6: return "HeadDepth2"; case 7: return "HeadDepth3"; case 8: return "WebThickness"; case 9: return "BaseDepth1"; case 10: return "BaseDepth2"; case 11: return "CentreOfGravityInY"; } return IfcParameterizedProfileDef::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcCraneRailFShapeProfileDef (IfcAbstractEntityPtr e);
-    IfcCraneRailFShapeProfileDef (IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< IfcLabel > v2_ProfileName, IfcAxis2Placement2D* v3_Position, IfcPositiveLengthMeasure v4_OverallHeight, IfcPositiveLengthMeasure v5_HeadWidth, boost::optional< IfcPositiveLengthMeasure > v6_Radius, IfcPositiveLengthMeasure v7_HeadDepth2, IfcPositiveLengthMeasure v8_HeadDepth3, IfcPositiveLengthMeasure v9_WebThickness, IfcPositiveLengthMeasure v10_BaseDepth1, IfcPositiveLengthMeasure v11_BaseDepth2, boost::optional< IfcPositiveLengthMeasure > v12_CentreOfGravityInY);
-    typedef IfcCraneRailFShapeProfileDef* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcCraneRailFShapeProfileDef > > list;
-    typedef IfcTemplatedEntityList< IfcCraneRailFShapeProfileDef >::it it;
+    IfcCraneRailFShapeProfileDef (IfcAbstractEntity* e);
+    IfcCraneRailFShapeProfileDef (IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< std::string > v2_ProfileName, IfcAxis2Placement2D* v3_Position, double v4_OverallHeight, double v5_HeadWidth, boost::optional< double > v6_Radius, double v7_HeadDepth2, double v8_HeadDepth3, double v9_WebThickness, double v10_BaseDepth1, double v11_BaseDepth2, boost::optional< double > v12_CentreOfGravityInY);
+    typedef IfcTemplatedEntityList< IfcCraneRailFShapeProfileDef > list;
 };
 /// IfcCsgPrimitive3D is an abstract supertype of all three dimensional primitives used as either tree root item, or as Boolean results within a CSG solid model. All 3D CSG primitives are defined within a three-dimensional placement coordinate system.
 /// 
@@ -18410,20 +19277,19 @@ class IfcCraneRailFShapeProfileDef : public IfcParameterizedProfileDef {
 class IfcCsgPrimitive3D : public IfcGeometricRepresentationItem {
 public:
     /// The placement coordinate system to which the parameters of each individual CSG primitive apply.
-    IfcAxis2Placement3D* Position();
+    IfcAxis2Placement3D* Position() const;
     void setPosition(IfcAxis2Placement3D* v);
     virtual unsigned int getArgumentCount() const { return 1; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY; } return IfcGeometricRepresentationItem::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcAxis2Placement3D; } return IfcGeometricRepresentationItem::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Position"; } return IfcGeometricRepresentationItem::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcCsgPrimitive3D (IfcAbstractEntityPtr e);
+    IfcCsgPrimitive3D (IfcAbstractEntity* e);
     IfcCsgPrimitive3D (IfcAxis2Placement3D* v1_Position);
-    typedef IfcCsgPrimitive3D* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcCsgPrimitive3D > > list;
-    typedef IfcTemplatedEntityList< IfcCsgPrimitive3D >::it it;
+    typedef IfcTemplatedEntityList< IfcCsgPrimitive3D > list;
 };
 /// Definition from ISO/CD 10303-42:1992: A solid
 ///   represented as a CSG model is defined by a collection of
@@ -18469,20 +19335,19 @@ class IfcCsgPrimitive3D : public IfcGeometricRepresentationItem {
 class IfcCsgSolid : public IfcSolidModel {
 public:
     /// Boolean expression of primitives and regularized operators describing the solid. The root of the tree of Boolean expressions is given explicitly as an IfcBooleanResult entitiy or as a primitive (subtypes of IfcCsgPrimitive3D).
-    IfcCsgSelect TreeRootExpression();
-    void setTreeRootExpression(IfcCsgSelect v);
+    IfcCsgSelect* TreeRootExpression() const;
+    void setTreeRootExpression(IfcCsgSelect* v);
     virtual unsigned int getArgumentCount() const { return 1; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY; } return IfcSolidModel::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcCsgSelect; } return IfcSolidModel::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "TreeRootExpression"; } return IfcSolidModel::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcCsgSolid (IfcAbstractEntityPtr e);
-    IfcCsgSolid (IfcCsgSelect v1_TreeRootExpression);
-    typedef IfcCsgSolid* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcCsgSolid > > list;
-    typedef IfcTemplatedEntityList< IfcCsgSolid >::it it;
+    IfcCsgSolid (IfcAbstractEntity* e);
+    IfcCsgSolid (IfcCsgSelect* v1_TreeRootExpression);
+    typedef IfcTemplatedEntityList< IfcCsgSolid > list;
 };
 /// Definition from ISO/CD 10303-42:1992: A curve can be envisioned as the path of a point moving in its coordinate space.  
 /// 
@@ -18498,16 +19363,15 @@ class IfcCurve : public IfcGeometricRepresentationItem {
 public:
     virtual unsigned int getArgumentCount() const { return 0; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcGeometricRepresentationItem::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcGeometricRepresentationItem::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcGeometricRepresentationItem::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcCurve (IfcAbstractEntityPtr e);
+    IfcCurve (IfcAbstractEntity* e);
     IfcCurve ();
-    typedef IfcCurve* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcCurve > > list;
-    typedef IfcTemplatedEntityList< IfcCurve >::it it;
+    typedef IfcTemplatedEntityList< IfcCurve > list;
 };
 /// Definition from ISO/CD 10303-42:1992: The curve bounded surface is a parametric surface with curved boundaries defined by one or more boundary curves. The bounded surface is defined to be the portion of the basis surface in the direction of N x T from any point on the boundary, where N is the surface normal and T the boundary curve tangent vector at this point. The region so defined shall be arcwise connected. 
 /// 
@@ -18525,26 +19389,25 @@ class IfcCurve : public IfcGeometricRepresentationItem {
 class IfcCurveBoundedPlane : public IfcBoundedSurface {
 public:
     /// The surface to be bound.
-    IfcPlane* BasisSurface();
+    IfcPlane* BasisSurface() const;
     void setBasisSurface(IfcPlane* v);
     /// The outer boundary of the surface.
-    IfcCurve* OuterBoundary();
+    IfcCurve* OuterBoundary() const;
     void setOuterBoundary(IfcCurve* v);
     /// An optional set of inner boundaries. They shall not intersect each other or the outer boundary.
-    SHARED_PTR< IfcTemplatedEntityList< IfcCurve > > InnerBoundaries();
-    void setInnerBoundaries(SHARED_PTR< IfcTemplatedEntityList< IfcCurve > > v);
+    IfcTemplatedEntityList< IfcCurve >::ptr InnerBoundaries() const;
+    void setInnerBoundaries(IfcTemplatedEntityList< IfcCurve >::ptr v);
     virtual unsigned int getArgumentCount() const { return 3; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY; case 1: return IfcUtil::Argument_ENTITY; case 2: return IfcUtil::Argument_ENTITY_LIST; } return IfcBoundedSurface::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcPlane; case 1: return Type::IfcCurve; case 2: return Type::IfcCurve; } return IfcBoundedSurface::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "BasisSurface"; case 1: return "OuterBoundary"; case 2: return "InnerBoundaries"; } return IfcBoundedSurface::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcCurveBoundedPlane (IfcAbstractEntityPtr e);
-    IfcCurveBoundedPlane (IfcPlane* v1_BasisSurface, IfcCurve* v2_OuterBoundary, SHARED_PTR< IfcTemplatedEntityList< IfcCurve > > v3_InnerBoundaries);
-    typedef IfcCurveBoundedPlane* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcCurveBoundedPlane > > list;
-    typedef IfcTemplatedEntityList< IfcCurveBoundedPlane >::it it;
+    IfcCurveBoundedPlane (IfcAbstractEntity* e);
+    IfcCurveBoundedPlane (IfcPlane* v1_BasisSurface, IfcCurve* v2_OuterBoundary, IfcTemplatedEntityList< IfcCurve >::ptr v3_InnerBoundaries);
+    typedef IfcTemplatedEntityList< IfcCurveBoundedPlane > list;
 };
 /// A defined symbol is a symbolic representation that gets its shape information by an established convention, either through a predefined symbol, or an externally defined symbol.
 /// 
@@ -18556,58 +19419,55 @@ class IfcCurveBoundedPlane : public IfcBoundedSurface {
 class IfcDefinedSymbol : public IfcGeometricRepresentationItem {
 public:
     /// An implicit description of the symbol, either predefined or externally defined.
-    IfcDefinedSymbolSelect Definition();
-    void setDefinition(IfcDefinedSymbolSelect v);
+    IfcDefinedSymbolSelect* Definition() const;
+    void setDefinition(IfcDefinedSymbolSelect* v);
     /// A description of the placement, orientation and (uniform or non-uniform) scaling of the defined symbol.
-    IfcCartesianTransformationOperator2D* Target();
+    IfcCartesianTransformationOperator2D* Target() const;
     void setTarget(IfcCartesianTransformationOperator2D* v);
     virtual unsigned int getArgumentCount() const { return 2; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY; case 1: return IfcUtil::Argument_ENTITY; } return IfcGeometricRepresentationItem::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcDefinedSymbolSelect; case 1: return Type::IfcCartesianTransformationOperator2D; } return IfcGeometricRepresentationItem::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Definition"; case 1: return "Target"; } return IfcGeometricRepresentationItem::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcDefinedSymbol (IfcAbstractEntityPtr e);
-    IfcDefinedSymbol (IfcDefinedSymbolSelect v1_Definition, IfcCartesianTransformationOperator2D* v2_Target);
-    typedef IfcDefinedSymbol* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcDefinedSymbol > > list;
-    typedef IfcTemplatedEntityList< IfcDefinedSymbol >::it it;
+    IfcDefinedSymbol (IfcAbstractEntity* e);
+    IfcDefinedSymbol (IfcDefinedSymbolSelect* v1_Definition, IfcCartesianTransformationOperator2D* v2_Target);
+    typedef IfcTemplatedEntityList< IfcDefinedSymbol > list;
 };
 
 class IfcDimensionCurve : public IfcAnnotationCurveOccurrence {
 public:
     virtual unsigned int getArgumentCount() const { return 3; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcAnnotationCurveOccurrence::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcAnnotationCurveOccurrence::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcAnnotationCurveOccurrence::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcTerminatorSymbol > > AnnotatedBySymbols(); // INVERSE IfcTerminatorSymbol::AnnotatedCurve
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcTerminatorSymbol >::ptr AnnotatedBySymbols() const; // INVERSE IfcTerminatorSymbol::AnnotatedCurve
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcDimensionCurve (IfcAbstractEntityPtr e);
-    IfcDimensionCurve (IfcRepresentationItem* v1_Item, SHARED_PTR< IfcTemplatedEntityList< IfcPresentationStyleAssignment > > v2_Styles, boost::optional< IfcLabel > v3_Name);
-    typedef IfcDimensionCurve* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcDimensionCurve > > list;
-    typedef IfcTemplatedEntityList< IfcDimensionCurve >::it it;
+    IfcDimensionCurve (IfcAbstractEntity* e);
+    IfcDimensionCurve (IfcRepresentationItem* v1_Item, IfcTemplatedEntityList< IfcPresentationStyleAssignment >::ptr v2_Styles, boost::optional< std::string > v3_Name);
+    typedef IfcTemplatedEntityList< IfcDimensionCurve > list;
 };
 
 class IfcDimensionCurveTerminator : public IfcTerminatorSymbol {
 public:
-    IfcDimensionExtentUsage::IfcDimensionExtentUsage Role();
+    IfcDimensionExtentUsage::IfcDimensionExtentUsage Role() const;
     void setRole(IfcDimensionExtentUsage::IfcDimensionExtentUsage v);
     virtual unsigned int getArgumentCount() const { return 5; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 4: return IfcUtil::Argument_ENUMERATION; } return IfcTerminatorSymbol::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 4: return Type::IfcDimensionExtentUsage; } return IfcTerminatorSymbol::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 4: return "Role"; } return IfcTerminatorSymbol::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcDimensionCurveTerminator (IfcAbstractEntityPtr e);
-    IfcDimensionCurveTerminator (IfcRepresentationItem* v1_Item, SHARED_PTR< IfcTemplatedEntityList< IfcPresentationStyleAssignment > > v2_Styles, boost::optional< IfcLabel > v3_Name, IfcAnnotationCurveOccurrence* v4_AnnotatedCurve, IfcDimensionExtentUsage::IfcDimensionExtentUsage v5_Role);
-    typedef IfcDimensionCurveTerminator* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcDimensionCurveTerminator > > list;
-    typedef IfcTemplatedEntityList< IfcDimensionCurveTerminator >::it it;
+    IfcDimensionCurveTerminator (IfcAbstractEntity* e);
+    IfcDimensionCurveTerminator (IfcRepresentationItem* v1_Item, IfcTemplatedEntityList< IfcPresentationStyleAssignment >::ptr v2_Styles, boost::optional< std::string > v3_Name, IfcAnnotationCurveOccurrence* v4_AnnotatedCurve, IfcDimensionExtentUsage::IfcDimensionExtentUsage v5_Role);
+    typedef IfcTemplatedEntityList< IfcDimensionCurveTerminator > list;
 };
 /// Definition from ISO/CD 10303-42:1992: This entity defines a general direction vector in two or three dimensional space. The actual magnitudes of the components have no effect upon the direction being defined, only the ratios X:Y:Z or X:Y are significant.  
 /// 
@@ -18619,20 +19479,19 @@ class IfcDimensionCurveTerminator : public IfcTerminatorSymbol {
 class IfcDirection : public IfcGeometricRepresentationItem {
 public:
     /// The components in the direction of X axis (DirectionRatios[1]), of Y axis (DirectionRatios[2]), and of Z axis (DirectionRatios[3])
-    std::vector< double > /*[2:3]*/ DirectionRatios();
+    std::vector< double > /*[2:3]*/ DirectionRatios() const;
     void setDirectionRatios(std::vector< double > /*[2:3]*/ v);
     virtual unsigned int getArgumentCount() const { return 1; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_VECTOR_DOUBLE; } return IfcGeometricRepresentationItem::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::UNDEFINED; } return IfcGeometricRepresentationItem::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "DirectionRatios"; } return IfcGeometricRepresentationItem::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcDirection (IfcAbstractEntityPtr e);
+    IfcDirection (IfcAbstractEntity* e);
     IfcDirection (std::vector< double > /*[2:3]*/ v1_DirectionRatios);
-    typedef IfcDirection* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcDirection > > list;
-    typedef IfcTemplatedEntityList< IfcDirection >::it it;
+    typedef IfcTemplatedEntityList< IfcDirection > list;
 };
 /// The door lining is the frame which
 /// enables the door leaf to be fixed in position. The door lining is
@@ -18732,74 +19591,73 @@ class IfcDirection : public IfcGeometricRepresentationItem {
 class IfcDoorLiningProperties : public IfcPropertySetDefinition {
 public:
     /// Whether the optional attribute LiningDepth is defined for this IfcDoorLiningProperties
-    bool hasLiningDepth();
+    bool hasLiningDepth() const;
     /// Depth of the door lining, measured perpendicular to the plane of the door lining. If omitted (and with a given value to lining thickness) it indicates an adjustable depth (i.e. a depth that adjusts to the thickness of the wall into which the occurrence of this door style is inserted).
-    IfcPositiveLengthMeasure LiningDepth();
-    void setLiningDepth(IfcPositiveLengthMeasure v);
+    double LiningDepth() const;
+    void setLiningDepth(double v);
     /// Whether the optional attribute LiningThickness is defined for this IfcDoorLiningProperties
-    bool hasLiningThickness();
+    bool hasLiningThickness() const;
     /// Thickness (width in plane parallel to door leaf) of the door lining.
-    IfcPositiveLengthMeasure LiningThickness();
-    void setLiningThickness(IfcPositiveLengthMeasure v);
+    double LiningThickness() const;
+    void setLiningThickness(double v);
     /// Whether the optional attribute ThresholdDepth is defined for this IfcDoorLiningProperties
-    bool hasThresholdDepth();
+    bool hasThresholdDepth() const;
     /// Depth (dimension in plane perpendicular to door leaf) of the door threshold. Only given if the door lining includes a threshold. If omitted (and with a given value to threshold thickness) it indicates an adjustable depth (i.e. a depth that adjusts to the thickness of the wall into which the occurrence of this door style is inserted).
-    IfcPositiveLengthMeasure ThresholdDepth();
-    void setThresholdDepth(IfcPositiveLengthMeasure v);
+    double ThresholdDepth() const;
+    void setThresholdDepth(double v);
     /// Whether the optional attribute ThresholdThickness is defined for this IfcDoorLiningProperties
-    bool hasThresholdThickness();
+    bool hasThresholdThickness() const;
     /// Thickness (width in plane parallel to door leaf) of the door threshold. Only given if the door lining includes a threshold and the parameter is known.
-    IfcPositiveLengthMeasure ThresholdThickness();
-    void setThresholdThickness(IfcPositiveLengthMeasure v);
+    double ThresholdThickness() const;
+    void setThresholdThickness(double v);
     /// Whether the optional attribute TransomThickness is defined for this IfcDoorLiningProperties
-    bool hasTransomThickness();
+    bool hasTransomThickness() const;
     /// Thickness (width in plane parallel to door leaf) of the transom (if given) which divides the door leaf from a glazing (or window) above.
-    IfcPositiveLengthMeasure TransomThickness();
-    void setTransomThickness(IfcPositiveLengthMeasure v);
+    double TransomThickness() const;
+    void setTransomThickness(double v);
     /// Whether the optional attribute TransomOffset is defined for this IfcDoorLiningProperties
-    bool hasTransomOffset();
+    bool hasTransomOffset() const;
     /// Offset of the transom (if given) which divides the door leaf from a glazing (or window) above. The offset is given from the bottom of the door opening.
-    IfcLengthMeasure TransomOffset();
-    void setTransomOffset(IfcLengthMeasure v);
+    double TransomOffset() const;
+    void setTransomOffset(double v);
     /// Whether the optional attribute LiningOffset is defined for this IfcDoorLiningProperties
-    bool hasLiningOffset();
+    bool hasLiningOffset() const;
     /// Offset (dimension in plane perpendicular to door leaf) of the door lining. The offset is given as distance to the x axis of the local placement.
-    IfcLengthMeasure LiningOffset();
-    void setLiningOffset(IfcLengthMeasure v);
+    double LiningOffset() const;
+    void setLiningOffset(double v);
     /// Whether the optional attribute ThresholdOffset is defined for this IfcDoorLiningProperties
-    bool hasThresholdOffset();
+    bool hasThresholdOffset() const;
     /// Offset (dimension in plane perpendicular to door leaf) of the door threshold. The offset is given as distance to the x axis of the local placement. Only given if the door lining includes a threshold and the parameter is known.
-    IfcLengthMeasure ThresholdOffset();
-    void setThresholdOffset(IfcLengthMeasure v);
+    double ThresholdOffset() const;
+    void setThresholdOffset(double v);
     /// Whether the optional attribute CasingThickness is defined for this IfcDoorLiningProperties
-    bool hasCasingThickness();
+    bool hasCasingThickness() const;
     /// Thickness of the casing (dimension in plane of the door leaf). If given it is applied equally to all four sides of the adjacent wall.
-    IfcPositiveLengthMeasure CasingThickness();
-    void setCasingThickness(IfcPositiveLengthMeasure v);
+    double CasingThickness() const;
+    void setCasingThickness(double v);
     /// Whether the optional attribute CasingDepth is defined for this IfcDoorLiningProperties
-    bool hasCasingDepth();
+    bool hasCasingDepth() const;
     /// Depth of the casing (dimension in plane perpendicular to door leaf). If given it is applied equally to all four sides of the adjacent wall.
-    IfcPositiveLengthMeasure CasingDepth();
-    void setCasingDepth(IfcPositiveLengthMeasure v);
+    double CasingDepth() const;
+    void setCasingDepth(double v);
     /// Whether the optional attribute ShapeAspectStyle is defined for this IfcDoorLiningProperties
-    bool hasShapeAspectStyle();
+    bool hasShapeAspectStyle() const;
     /// Pointer to the shape aspect, if given. The shape aspect reflects the part of the door shape, which represents the door lining.
     /// 
     /// IFC2x4 CHANGE The attribute is deprecated and shall no longer be used, i.e. the value shall be NIL ($).
-    IfcShapeAspect* ShapeAspectStyle();
+    IfcShapeAspect* ShapeAspectStyle() const;
     void setShapeAspectStyle(IfcShapeAspect* v);
     virtual unsigned int getArgumentCount() const { return 15; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 4: return IfcUtil::Argument_DOUBLE; case 5: return IfcUtil::Argument_DOUBLE; case 6: return IfcUtil::Argument_DOUBLE; case 7: return IfcUtil::Argument_DOUBLE; case 8: return IfcUtil::Argument_DOUBLE; case 9: return IfcUtil::Argument_DOUBLE; case 10: return IfcUtil::Argument_DOUBLE; case 11: return IfcUtil::Argument_DOUBLE; case 12: return IfcUtil::Argument_DOUBLE; case 13: return IfcUtil::Argument_DOUBLE; case 14: return IfcUtil::Argument_ENTITY; } return IfcPropertySetDefinition::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 4: return Type::IfcPositiveLengthMeasure; case 5: return Type::IfcPositiveLengthMeasure; case 6: return Type::IfcPositiveLengthMeasure; case 7: return Type::IfcPositiveLengthMeasure; case 8: return Type::IfcPositiveLengthMeasure; case 9: return Type::IfcLengthMeasure; case 10: return Type::IfcLengthMeasure; case 11: return Type::IfcLengthMeasure; case 12: return Type::IfcPositiveLengthMeasure; case 13: return Type::IfcPositiveLengthMeasure; case 14: return Type::IfcShapeAspect; } return IfcPropertySetDefinition::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 4: return "LiningDepth"; case 5: return "LiningThickness"; case 6: return "ThresholdDepth"; case 7: return "ThresholdThickness"; case 8: return "TransomThickness"; case 9: return "TransomOffset"; case 10: return "LiningOffset"; case 11: return "ThresholdOffset"; case 12: return "CasingThickness"; case 13: return "CasingDepth"; case 14: return "ShapeAspectStyle"; } return IfcPropertySetDefinition::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcDoorLiningProperties (IfcAbstractEntityPtr e);
-    IfcDoorLiningProperties (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcPositiveLengthMeasure > v5_LiningDepth, boost::optional< IfcPositiveLengthMeasure > v6_LiningThickness, boost::optional< IfcPositiveLengthMeasure > v7_ThresholdDepth, boost::optional< IfcPositiveLengthMeasure > v8_ThresholdThickness, boost::optional< IfcPositiveLengthMeasure > v9_TransomThickness, boost::optional< IfcLengthMeasure > v10_TransomOffset, boost::optional< IfcLengthMeasure > v11_LiningOffset, boost::optional< IfcLengthMeasure > v12_ThresholdOffset, boost::optional< IfcPositiveLengthMeasure > v13_CasingThickness, boost::optional< IfcPositiveLengthMeasure > v14_CasingDepth, IfcShapeAspect* v15_ShapeAspectStyle);
-    typedef IfcDoorLiningProperties* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcDoorLiningProperties > > list;
-    typedef IfcTemplatedEntityList< IfcDoorLiningProperties >::it it;
+    IfcDoorLiningProperties (IfcAbstractEntity* e);
+    IfcDoorLiningProperties (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< double > v5_LiningDepth, boost::optional< double > v6_LiningThickness, boost::optional< double > v7_ThresholdDepth, boost::optional< double > v8_ThresholdThickness, boost::optional< double > v9_TransomThickness, boost::optional< double > v10_TransomOffset, boost::optional< double > v11_LiningOffset, boost::optional< double > v12_ThresholdOffset, boost::optional< double > v13_CasingThickness, boost::optional< double > v14_CasingDepth, IfcShapeAspect* v15_ShapeAspectStyle);
+    typedef IfcTemplatedEntityList< IfcDoorLiningProperties > list;
 };
 /// A door panel is normally a door leaf that opens to allow people or
 /// goods to pass. The parameters of the door panel define the
@@ -18849,40 +19707,39 @@ class IfcDoorLiningProperties : public IfcPropertySetDefinition {
 class IfcDoorPanelProperties : public IfcPropertySetDefinition {
 public:
     /// Whether the optional attribute PanelDepth is defined for this IfcDoorPanelProperties
-    bool hasPanelDepth();
+    bool hasPanelDepth() const;
     /// Depth of the door panel, measured perpendicular to the plane of the door leaf.
-    IfcPositiveLengthMeasure PanelDepth();
-    void setPanelDepth(IfcPositiveLengthMeasure v);
+    double PanelDepth() const;
+    void setPanelDepth(double v);
     /// The PanelOperation defines the way of operation of that panel. The PanelOperation of the door panel has to correspond with the OperationType of the IfcDoorStyle by which it is referenced.
-    IfcDoorPanelOperationEnum::IfcDoorPanelOperationEnum PanelOperation();
+    IfcDoorPanelOperationEnum::IfcDoorPanelOperationEnum PanelOperation() const;
     void setPanelOperation(IfcDoorPanelOperationEnum::IfcDoorPanelOperationEnum v);
     /// Whether the optional attribute PanelWidth is defined for this IfcDoorPanelProperties
-    bool hasPanelWidth();
+    bool hasPanelWidth() const;
     /// Width of this panel, given as ratio relative to the total clear opening width of the door. If omited, it defaults to 1. A value has to be provided for all doors with OperationType's at IfcDoorStyle defining a door with more then one panel.
-    IfcNormalisedRatioMeasure PanelWidth();
-    void setPanelWidth(IfcNormalisedRatioMeasure v);
+    double PanelWidth() const;
+    void setPanelWidth(double v);
     /// Position of this panel within the door. The PanelPosition of the door panel has to correspond with the OperationType of the IfcDoorStyle by which it is referenced.
-    IfcDoorPanelPositionEnum::IfcDoorPanelPositionEnum PanelPosition();
+    IfcDoorPanelPositionEnum::IfcDoorPanelPositionEnum PanelPosition() const;
     void setPanelPosition(IfcDoorPanelPositionEnum::IfcDoorPanelPositionEnum v);
     /// Whether the optional attribute ShapeAspectStyle is defined for this IfcDoorPanelProperties
-    bool hasShapeAspectStyle();
+    bool hasShapeAspectStyle() const;
     /// Pointer to the shape aspect, if given. The shape aspect reflects the part of the door shape, which represents the door panel.
     /// 
     /// IFC2x4 CHANGE The attribute is deprecated and shall no longer be used, i.e. the value shall be NIL ($).
-    IfcShapeAspect* ShapeAspectStyle();
+    IfcShapeAspect* ShapeAspectStyle() const;
     void setShapeAspectStyle(IfcShapeAspect* v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 4: return IfcUtil::Argument_DOUBLE; case 5: return IfcUtil::Argument_ENUMERATION; case 6: return IfcUtil::Argument_DOUBLE; case 7: return IfcUtil::Argument_ENUMERATION; case 8: return IfcUtil::Argument_ENTITY; } return IfcPropertySetDefinition::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 4: return Type::IfcPositiveLengthMeasure; case 5: return Type::IfcDoorPanelOperationEnum; case 6: return Type::IfcNormalisedRatioMeasure; case 7: return Type::IfcDoorPanelPositionEnum; case 8: return Type::IfcShapeAspect; } return IfcPropertySetDefinition::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 4: return "PanelDepth"; case 5: return "PanelOperation"; case 6: return "PanelWidth"; case 7: return "PanelPosition"; case 8: return "ShapeAspectStyle"; } return IfcPropertySetDefinition::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcDoorPanelProperties (IfcAbstractEntityPtr e);
-    IfcDoorPanelProperties (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcPositiveLengthMeasure > v5_PanelDepth, IfcDoorPanelOperationEnum::IfcDoorPanelOperationEnum v6_PanelOperation, boost::optional< IfcNormalisedRatioMeasure > v7_PanelWidth, IfcDoorPanelPositionEnum::IfcDoorPanelPositionEnum v8_PanelPosition, IfcShapeAspect* v9_ShapeAspectStyle);
-    typedef IfcDoorPanelProperties* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcDoorPanelProperties > > list;
-    typedef IfcTemplatedEntityList< IfcDoorPanelProperties >::it it;
+    IfcDoorPanelProperties (IfcAbstractEntity* e);
+    IfcDoorPanelProperties (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< double > v5_PanelDepth, IfcDoorPanelOperationEnum::IfcDoorPanelOperationEnum v6_PanelOperation, boost::optional< double > v7_PanelWidth, IfcDoorPanelPositionEnum::IfcDoorPanelPositionEnum v8_PanelPosition, IfcShapeAspect* v9_ShapeAspectStyle);
+    typedef IfcTemplatedEntityList< IfcDoorPanelProperties > list;
 };
 /// Definition: The door style, IfcDoorStyle, defines a particular style of doors, which may be included into the spatial context of the building model through instances of IfcDoor. A door style defines the overall parameter of the door style and refers to the particular parameter of the lining and one (or several) panels through the IfcDoorLiningProperties and the IfcDoorPanelProperties.
 /// 
@@ -18913,49 +19770,47 @@ class IfcDoorPanelProperties : public IfcPropertySetDefinition {
 class IfcDoorStyle : public IfcTypeProduct {
 public:
     /// Type defining the general layout and operation of the door style.
-    IfcDoorStyleOperationEnum::IfcDoorStyleOperationEnum OperationType();
+    IfcDoorStyleOperationEnum::IfcDoorStyleOperationEnum OperationType() const;
     void setOperationType(IfcDoorStyleOperationEnum::IfcDoorStyleOperationEnum v);
     /// Type defining the basic construction and material type of the door.
-    IfcDoorStyleConstructionEnum::IfcDoorStyleConstructionEnum ConstructionType();
+    IfcDoorStyleConstructionEnum::IfcDoorStyleConstructionEnum ConstructionType() const;
     void setConstructionType(IfcDoorStyleConstructionEnum::IfcDoorStyleConstructionEnum v);
     /// The Boolean value reflects, whether the parameter given in the attached lining and panel properties exactly define the geometry (TRUE), or whether the attached style shape take precedence (FALSE). In the last case the parameter have only informative value.
-    bool ParameterTakesPrecedence();
+    bool ParameterTakesPrecedence() const;
     void setParameterTakesPrecedence(bool v);
     /// The Boolean indicates, whether the attached IfcMappedRepresentation (if given) can be sized (using scale factor of transformation), or not (FALSE). If not, the IfcMappedRepresentation should be IfcShapeRepresentation of the IfcDoor (using IfcMappedItem as the Item) with the scale factor = 1.
-    bool Sizeable();
+    bool Sizeable() const;
     void setSizeable(bool v);
     virtual unsigned int getArgumentCount() const { return 12; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_ENUMERATION; case 9: return IfcUtil::Argument_ENUMERATION; case 10: return IfcUtil::Argument_BOOL; case 11: return IfcUtil::Argument_BOOL; } return IfcTypeProduct::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcDoorStyleOperationEnum; case 9: return Type::IfcDoorStyleConstructionEnum; case 10: return Type::UNDEFINED; case 11: return Type::UNDEFINED; } return IfcTypeProduct::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "OperationType"; case 9: return "ConstructionType"; case 10: return "ParameterTakesPrecedence"; case 11: return "Sizeable"; } return IfcTypeProduct::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcDoorStyle (IfcAbstractEntityPtr e);
-    IfcDoorStyle (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, IfcDoorStyleOperationEnum::IfcDoorStyleOperationEnum v9_OperationType, IfcDoorStyleConstructionEnum::IfcDoorStyleConstructionEnum v10_ConstructionType, bool v11_ParameterTakesPrecedence, bool v12_Sizeable);
-    typedef IfcDoorStyle* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcDoorStyle > > list;
-    typedef IfcTemplatedEntityList< IfcDoorStyle >::it it;
+    IfcDoorStyle (IfcAbstractEntity* e);
+    IfcDoorStyle (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, IfcDoorStyleOperationEnum::IfcDoorStyleOperationEnum v9_OperationType, IfcDoorStyleConstructionEnum::IfcDoorStyleConstructionEnum v10_ConstructionType, bool v11_ParameterTakesPrecedence, bool v12_Sizeable);
+    typedef IfcTemplatedEntityList< IfcDoorStyle > list;
 };
 
 class IfcDraughtingCallout : public IfcGeometricRepresentationItem {
 public:
-    SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > Contents();
-    void setContents(SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > v);
+    IfcEntityList::ptr Contents() const;
+    void setContents(IfcEntityList::ptr v);
     virtual unsigned int getArgumentCount() const { return 1; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY_LIST; } return IfcGeometricRepresentationItem::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcDraughtingCalloutElement; } return IfcGeometricRepresentationItem::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Contents"; } return IfcGeometricRepresentationItem::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcDraughtingCalloutRelationship > > IsRelatedFromCallout(); // INVERSE IfcDraughtingCalloutRelationship::RelatedDraughtingCallout
-    SHARED_PTR< IfcTemplatedEntityList< IfcDraughtingCalloutRelationship > > IsRelatedToCallout(); // INVERSE IfcDraughtingCalloutRelationship::RelatingDraughtingCallout
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcDraughtingCalloutRelationship >::ptr IsRelatedFromCallout() const; // INVERSE IfcDraughtingCalloutRelationship::RelatedDraughtingCallout
+    IfcTemplatedEntityList< IfcDraughtingCalloutRelationship >::ptr IsRelatedToCallout() const; // INVERSE IfcDraughtingCalloutRelationship::RelatingDraughtingCallout
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcDraughtingCallout (IfcAbstractEntityPtr e);
-    IfcDraughtingCallout (IfcEntities v1_Contents);
-    typedef IfcDraughtingCallout* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcDraughtingCallout > > list;
-    typedef IfcTemplatedEntityList< IfcDraughtingCallout >::it it;
+    IfcDraughtingCallout (IfcAbstractEntity* e);
+    IfcDraughtingCallout (IfcEntityList::ptr v1_Contents);
+    typedef IfcTemplatedEntityList< IfcDraughtingCallout > list;
 };
 /// The draughting pre defined colour is a pre defined colour for the purpose to identify a colour by name. Allowable names are:
 /// 
@@ -19033,16 +19888,15 @@ class IfcDraughtingPreDefinedColour : public IfcPreDefinedColour {
 public:
     virtual unsigned int getArgumentCount() const { return 1; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcPreDefinedColour::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcPreDefinedColour::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcPreDefinedColour::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcDraughtingPreDefinedColour (IfcAbstractEntityPtr e);
-    IfcDraughtingPreDefinedColour (IfcLabel v1_Name);
-    typedef IfcDraughtingPreDefinedColour* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcDraughtingPreDefinedColour > > list;
-    typedef IfcTemplatedEntityList< IfcDraughtingPreDefinedColour >::it it;
+    IfcDraughtingPreDefinedColour (IfcAbstractEntity* e);
+    IfcDraughtingPreDefinedColour (std::string v1_Name);
+    typedef IfcTemplatedEntityList< IfcDraughtingPreDefinedColour > list;
 };
 /// The draughting predefined curve font type defines a selection of widely used curve fonts for draughting purposes by name. 
 /// 
@@ -19061,16 +19915,15 @@ class IfcDraughtingPreDefinedCurveFont : public IfcPreDefinedCurveFont {
 public:
     virtual unsigned int getArgumentCount() const { return 1; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcPreDefinedCurveFont::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcPreDefinedCurveFont::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcPreDefinedCurveFont::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcDraughtingPreDefinedCurveFont (IfcAbstractEntityPtr e);
-    IfcDraughtingPreDefinedCurveFont (IfcLabel v1_Name);
-    typedef IfcDraughtingPreDefinedCurveFont* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcDraughtingPreDefinedCurveFont > > list;
-    typedef IfcTemplatedEntityList< IfcDraughtingPreDefinedCurveFont >::it it;
+    IfcDraughtingPreDefinedCurveFont (IfcAbstractEntity* e);
+    IfcDraughtingPreDefinedCurveFont (std::string v1_Name);
+    typedef IfcTemplatedEntityList< IfcDraughtingPreDefinedCurveFont > list;
 };
 /// Definition from ISO/CD 10303-42:1992: An edge_loop is a loop with nonzero extent. It is a path in which the start and end vertices are the same. Its domain, if present, is a closed curve. An edge_loop may overlap itself.
 /// 
@@ -19086,20 +19939,19 @@ class IfcDraughtingPreDefinedCurveFont : public IfcPreDefinedCurveFont {
 class IfcEdgeLoop : public IfcLoop {
 public:
     /// A list of oriented edge entities which are concatenated together to form this path.
-    SHARED_PTR< IfcTemplatedEntityList< IfcOrientedEdge > > EdgeList();
-    void setEdgeList(SHARED_PTR< IfcTemplatedEntityList< IfcOrientedEdge > > v);
+    IfcTemplatedEntityList< IfcOrientedEdge >::ptr EdgeList() const;
+    void setEdgeList(IfcTemplatedEntityList< IfcOrientedEdge >::ptr v);
     virtual unsigned int getArgumentCount() const { return 1; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY_LIST; } return IfcLoop::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcOrientedEdge; } return IfcLoop::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "EdgeList"; } return IfcLoop::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcEdgeLoop (IfcAbstractEntityPtr e);
-    IfcEdgeLoop (SHARED_PTR< IfcTemplatedEntityList< IfcOrientedEdge > > v1_EdgeList);
-    typedef IfcEdgeLoop* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcEdgeLoop > > list;
-    typedef IfcTemplatedEntityList< IfcEdgeLoop >::it it;
+    IfcEdgeLoop (IfcAbstractEntity* e);
+    IfcEdgeLoop (IfcTemplatedEntityList< IfcOrientedEdge >::ptr v1_EdgeList);
+    typedef IfcTemplatedEntityList< IfcEdgeLoop > list;
 };
 /// Definition from IAI: An IfcElementQuantity
 /// defines a set of derived measures of an element's physical
@@ -19181,27 +20033,26 @@ class IfcEdgeLoop : public IfcLoop {
 class IfcElementQuantity : public IfcPropertySetDefinition {
 public:
     /// Whether the optional attribute MethodOfMeasurement is defined for this IfcElementQuantity
-    bool hasMethodOfMeasurement();
+    bool hasMethodOfMeasurement() const;
     /// Name of the method of measurement used to calculate the element quantity. The method of measurement attribute has to be made recognizable by further agreements.
     /// 
     /// IFC2x2 Addendum 1 change: The attribute has been changed to be optional
-    IfcLabel MethodOfMeasurement();
-    void setMethodOfMeasurement(IfcLabel v);
+    std::string MethodOfMeasurement() const;
+    void setMethodOfMeasurement(std::string v);
     /// The individual quantities for the element, can be a set of length, area, volume, weight or count based quantities.
-    SHARED_PTR< IfcTemplatedEntityList< IfcPhysicalQuantity > > Quantities();
-    void setQuantities(SHARED_PTR< IfcTemplatedEntityList< IfcPhysicalQuantity > > v);
+    IfcTemplatedEntityList< IfcPhysicalQuantity >::ptr Quantities() const;
+    void setQuantities(IfcTemplatedEntityList< IfcPhysicalQuantity >::ptr v);
     virtual unsigned int getArgumentCount() const { return 6; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 4: return IfcUtil::Argument_STRING; case 5: return IfcUtil::Argument_ENTITY_LIST; } return IfcPropertySetDefinition::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 4: return Type::IfcLabel; case 5: return Type::IfcPhysicalQuantity; } return IfcPropertySetDefinition::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 4: return "MethodOfMeasurement"; case 5: return "Quantities"; } return IfcPropertySetDefinition::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcElementQuantity (IfcAbstractEntityPtr e);
-    IfcElementQuantity (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_MethodOfMeasurement, SHARED_PTR< IfcTemplatedEntityList< IfcPhysicalQuantity > > v6_Quantities);
-    typedef IfcElementQuantity* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcElementQuantity > > list;
-    typedef IfcTemplatedEntityList< IfcElementQuantity >::it it;
+    IfcElementQuantity (IfcAbstractEntity* e);
+    IfcElementQuantity (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_MethodOfMeasurement, IfcTemplatedEntityList< IfcPhysicalQuantity >::ptr v6_Quantities);
+    typedef IfcTemplatedEntityList< IfcElementQuantity > list;
 };
 /// Definition from IAI: The IfcElementType
 ///   defines a list of commonly shared property set definitions
@@ -19228,22 +20079,21 @@ class IfcElementQuantity : public IfcPropertySetDefinition {
 class IfcElementType : public IfcTypeProduct {
 public:
     /// Whether the optional attribute ElementType is defined for this IfcElementType
-    bool hasElementType();
+    bool hasElementType() const;
     /// The type denotes a particular type that indicates the object further. The use has to be established at the level of instantiable subtypes. In particular it holds the user defined type, if the enumeration of the attribute 'PredefinedType' is set to USERDEFINED.
-    IfcLabel ElementType();
-    void setElementType(IfcLabel v);
+    std::string ElementType() const;
+    void setElementType(std::string v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_STRING; } return IfcTypeProduct::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcLabel; } return IfcTypeProduct::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "ElementType"; } return IfcTypeProduct::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcElementType (IfcAbstractEntityPtr e);
-    IfcElementType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType);
-    typedef IfcElementType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcElementType > > list;
-    typedef IfcTemplatedEntityList< IfcElementType >::it it;
+    IfcElementType (IfcAbstractEntity* e);
+    IfcElementType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType);
+    typedef IfcTemplatedEntityList< IfcElementType > list;
 };
 /// Definition from ISO/CD 10303-42:1992: An elementary surface (IfcElementarySurface) is a simple analytic surface with defined parametric representation. 
 /// 
@@ -19253,20 +20103,19 @@ class IfcElementType : public IfcTypeProduct {
 class IfcElementarySurface : public IfcSurface {
 public:
     /// The position and orientation of the surface. This attribute is used in the definition of the parameterization of the surface.
-    IfcAxis2Placement3D* Position();
+    IfcAxis2Placement3D* Position() const;
     void setPosition(IfcAxis2Placement3D* v);
     virtual unsigned int getArgumentCount() const { return 1; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY; } return IfcSurface::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcAxis2Placement3D; } return IfcSurface::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Position"; } return IfcSurface::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcElementarySurface (IfcAbstractEntityPtr e);
+    IfcElementarySurface (IfcAbstractEntity* e);
     IfcElementarySurface (IfcAxis2Placement3D* v1_Position);
-    typedef IfcElementarySurface* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcElementarySurface > > list;
-    typedef IfcTemplatedEntityList< IfcElementarySurface >::it it;
+    typedef IfcTemplatedEntityList< IfcElementarySurface > list;
 };
 /// IfcEllipseProfileDef defines an ellipse as the profile definition used by the swept surface geometry
 /// or the swept area solid. It is given by its semi axis attributes and placed within the 2D position coordinate system, established by the Position attribute. 
@@ -19287,47 +20136,45 @@ class IfcElementarySurface : public IfcSurface {
 class IfcEllipseProfileDef : public IfcParameterizedProfileDef {
 public:
     /// The first radius of the ellipse. It is measured along the direction of Position.P[1].
-    IfcPositiveLengthMeasure SemiAxis1();
-    void setSemiAxis1(IfcPositiveLengthMeasure v);
+    double SemiAxis1() const;
+    void setSemiAxis1(double v);
     /// The second radius of the ellipse. It is measured along the direction of Position.P[2].
-    IfcPositiveLengthMeasure SemiAxis2();
-    void setSemiAxis2(IfcPositiveLengthMeasure v);
+    double SemiAxis2() const;
+    void setSemiAxis2(double v);
     virtual unsigned int getArgumentCount() const { return 5; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 3: return IfcUtil::Argument_DOUBLE; case 4: return IfcUtil::Argument_DOUBLE; } return IfcParameterizedProfileDef::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 3: return Type::IfcPositiveLengthMeasure; case 4: return Type::IfcPositiveLengthMeasure; } return IfcParameterizedProfileDef::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 3: return "SemiAxis1"; case 4: return "SemiAxis2"; } return IfcParameterizedProfileDef::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcEllipseProfileDef (IfcAbstractEntityPtr e);
-    IfcEllipseProfileDef (IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< IfcLabel > v2_ProfileName, IfcAxis2Placement2D* v3_Position, IfcPositiveLengthMeasure v4_SemiAxis1, IfcPositiveLengthMeasure v5_SemiAxis2);
-    typedef IfcEllipseProfileDef* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcEllipseProfileDef > > list;
-    typedef IfcTemplatedEntityList< IfcEllipseProfileDef >::it it;
+    IfcEllipseProfileDef (IfcAbstractEntity* e);
+    IfcEllipseProfileDef (IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< std::string > v2_ProfileName, IfcAxis2Placement2D* v3_Position, double v4_SemiAxis1, double v5_SemiAxis2);
+    typedef IfcTemplatedEntityList< IfcEllipseProfileDef > list;
 };
 
 class IfcEnergyProperties : public IfcPropertySetDefinition {
 public:
     /// Whether the optional attribute EnergySequence is defined for this IfcEnergyProperties
-    bool hasEnergySequence();
-    IfcEnergySequenceEnum::IfcEnergySequenceEnum EnergySequence();
+    bool hasEnergySequence() const;
+    IfcEnergySequenceEnum::IfcEnergySequenceEnum EnergySequence() const;
     void setEnergySequence(IfcEnergySequenceEnum::IfcEnergySequenceEnum v);
     /// Whether the optional attribute UserDefinedEnergySequence is defined for this IfcEnergyProperties
-    bool hasUserDefinedEnergySequence();
-    IfcLabel UserDefinedEnergySequence();
-    void setUserDefinedEnergySequence(IfcLabel v);
+    bool hasUserDefinedEnergySequence() const;
+    std::string UserDefinedEnergySequence() const;
+    void setUserDefinedEnergySequence(std::string v);
     virtual unsigned int getArgumentCount() const { return 6; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 4: return IfcUtil::Argument_ENUMERATION; case 5: return IfcUtil::Argument_STRING; } return IfcPropertySetDefinition::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 4: return Type::IfcEnergySequenceEnum; case 5: return Type::IfcLabel; } return IfcPropertySetDefinition::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 4: return "EnergySequence"; case 5: return "UserDefinedEnergySequence"; } return IfcPropertySetDefinition::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcEnergyProperties (IfcAbstractEntityPtr e);
-    IfcEnergyProperties (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcEnergySequenceEnum::IfcEnergySequenceEnum > v5_EnergySequence, boost::optional< IfcLabel > v6_UserDefinedEnergySequence);
-    typedef IfcEnergyProperties* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcEnergyProperties > > list;
-    typedef IfcTemplatedEntityList< IfcEnergyProperties >::it it;
+    IfcEnergyProperties (IfcAbstractEntity* e);
+    IfcEnergyProperties (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< IfcEnergySequenceEnum::IfcEnergySequenceEnum > v5_EnergySequence, boost::optional< std::string > v6_UserDefinedEnergySequence);
+    typedef IfcTemplatedEntityList< IfcEnergyProperties > list;
 };
 /// The IfcExtrudedAreaSolid is defined by sweeping a cross
 /// section provided by a profile definition. The direction of the
@@ -19400,24 +20247,23 @@ class IfcEnergyProperties : public IfcPropertySetDefinition {
 class IfcExtrudedAreaSolid : public IfcSweptAreaSolid {
 public:
     /// The direction in which the surface, provided by SweptArea is to be swept.
-    IfcDirection* ExtrudedDirection();
+    IfcDirection* ExtrudedDirection() const;
     void setExtrudedDirection(IfcDirection* v);
     /// The distance the surface is to be swept along the ExtrudedDirection
     /// .
-    IfcPositiveLengthMeasure Depth();
-    void setDepth(IfcPositiveLengthMeasure v);
+    double Depth() const;
+    void setDepth(double v);
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 2: return IfcUtil::Argument_ENTITY; case 3: return IfcUtil::Argument_DOUBLE; } return IfcSweptAreaSolid::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 2: return Type::IfcDirection; case 3: return Type::IfcPositiveLengthMeasure; } return IfcSweptAreaSolid::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 2: return "ExtrudedDirection"; case 3: return "Depth"; } return IfcSweptAreaSolid::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcExtrudedAreaSolid (IfcAbstractEntityPtr e);
-    IfcExtrudedAreaSolid (IfcProfileDef* v1_SweptArea, IfcAxis2Placement3D* v2_Position, IfcDirection* v3_ExtrudedDirection, IfcPositiveLengthMeasure v4_Depth);
-    typedef IfcExtrudedAreaSolid* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcExtrudedAreaSolid > > list;
-    typedef IfcTemplatedEntityList< IfcExtrudedAreaSolid >::it it;
+    IfcExtrudedAreaSolid (IfcAbstractEntity* e);
+    IfcExtrudedAreaSolid (IfcProfileDef* v1_SweptArea, IfcAxis2Placement3D* v2_Position, IfcDirection* v3_ExtrudedDirection, double v4_Depth);
+    typedef IfcTemplatedEntityList< IfcExtrudedAreaSolid > list;
 };
 /// Definition from ISO/CD 10303-42:1992: A face based surface model is described by a set of connected face sets of dimensionality 2. The connected face sets shall not intersect except at edges and vertices, except that a face in one connected face set may overlap a face in another connected face set, provided the face boundaries are identical. There shall be at least one connected face set.  
 /// 
@@ -19434,20 +20280,19 @@ class IfcExtrudedAreaSolid : public IfcSweptAreaSolid {
 class IfcFaceBasedSurfaceModel : public IfcGeometricRepresentationItem {
 public:
     /// The set of connected face sets comprising the face based surface model.
-    SHARED_PTR< IfcTemplatedEntityList< IfcConnectedFaceSet > > FbsmFaces();
-    void setFbsmFaces(SHARED_PTR< IfcTemplatedEntityList< IfcConnectedFaceSet > > v);
+    IfcTemplatedEntityList< IfcConnectedFaceSet >::ptr FbsmFaces() const;
+    void setFbsmFaces(IfcTemplatedEntityList< IfcConnectedFaceSet >::ptr v);
     virtual unsigned int getArgumentCount() const { return 1; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY_LIST; } return IfcGeometricRepresentationItem::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcConnectedFaceSet; } return IfcGeometricRepresentationItem::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "FbsmFaces"; } return IfcGeometricRepresentationItem::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcFaceBasedSurfaceModel (IfcAbstractEntityPtr e);
-    IfcFaceBasedSurfaceModel (SHARED_PTR< IfcTemplatedEntityList< IfcConnectedFaceSet > > v1_FbsmFaces);
-    typedef IfcFaceBasedSurfaceModel* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcFaceBasedSurfaceModel > > list;
-    typedef IfcTemplatedEntityList< IfcFaceBasedSurfaceModel >::it it;
+    IfcFaceBasedSurfaceModel (IfcAbstractEntity* e);
+    IfcFaceBasedSurfaceModel (IfcTemplatedEntityList< IfcConnectedFaceSet >::ptr v1_FbsmFaces);
+    typedef IfcTemplatedEntityList< IfcFaceBasedSurfaceModel > list;
 };
 /// Definition from ISO/CD 10303-46:1992: The fill area style hatching defines a styled pattern of curves for hatching an annotation fill area or a surface.
 /// 
@@ -19499,44 +20344,43 @@ class IfcFaceBasedSurfaceModel : public IfcGeometricRepresentationItem {
 class IfcFillAreaStyleHatching : public IfcGeometricRepresentationItem {
 public:
     /// The curve style of the hatching lines. Any curve style pattern shall start at the origin of each hatch line.
-    IfcCurveStyle* HatchLineAppearance();
+    IfcCurveStyle* HatchLineAppearance() const;
     void setHatchLineAppearance(IfcCurveStyle* v);
     /// A repetition factor that determines the distance between adjacent hatch lines.
     /// 
     /// IFC2x Edition 3 CHANGE  The attribute type of StartOfNextHatchLine has changed to a SELECT of IfcPositiveLengthMeasure (new) and IfcOneDirectionRepeatFactor.
-    IfcHatchLineDistanceSelect StartOfNextHatchLine();
-    void setStartOfNextHatchLine(IfcHatchLineDistanceSelect v);
+    IfcHatchLineDistanceSelect* StartOfNextHatchLine() const;
+    void setStartOfNextHatchLine(IfcHatchLineDistanceSelect* v);
     /// Whether the optional attribute PointOfReferenceHatchLine is defined for this IfcFillAreaStyleHatching
-    bool hasPointOfReferenceHatchLine();
+    bool hasPointOfReferenceHatchLine() const;
     /// A Cartesian point which defines the offset of the reference hatch line from the origin of the (virtual) hatching coordinate system. The origin is used for mapping the fill area style hatching onto an annotation fill area or surface. The reference hatch line would then appear with this offset from the fill style target point.
     /// If not given the reference hatch lines goes through the origin of the (virtual) hatching coordinate system.
     /// 
     /// IFC2x Edition 3 CHANGE  The usage of the attribute PointOfReferenceHatchLine has changed to not provide the Cartesian point which is the origin for mapping, but to provide an offset to the origin for the mapping. The attribute has been made OPTIONAL.
-    IfcCartesianPoint* PointOfReferenceHatchLine();
+    IfcCartesianPoint* PointOfReferenceHatchLine() const;
     void setPointOfReferenceHatchLine(IfcCartesianPoint* v);
     /// Whether the optional attribute PatternStart is defined for this IfcFillAreaStyleHatching
-    bool hasPatternStart();
+    bool hasPatternStart() const;
     /// A distance along the reference hatch line which is the start point for the curve style font pattern of the reference hatch line.
     /// If not given, the start point of the curve style font pattern is at the (virtual) hatching coordinate system.
     /// 
     /// IFC2x Edition 2 Addendum 2 CHANGE The attribute PatternStart has been made OPTIONAL.
-    IfcCartesianPoint* PatternStart();
+    IfcCartesianPoint* PatternStart() const;
     void setPatternStart(IfcCartesianPoint* v);
     /// A plane angle measure determining the direction of the parallel hatching lines.
-    IfcPlaneAngleMeasure HatchLineAngle();
-    void setHatchLineAngle(IfcPlaneAngleMeasure v);
+    double HatchLineAngle() const;
+    void setHatchLineAngle(double v);
     virtual unsigned int getArgumentCount() const { return 5; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY; case 1: return IfcUtil::Argument_ENTITY; case 2: return IfcUtil::Argument_ENTITY; case 3: return IfcUtil::Argument_ENTITY; case 4: return IfcUtil::Argument_DOUBLE; } return IfcGeometricRepresentationItem::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcCurveStyle; case 1: return Type::IfcHatchLineDistanceSelect; case 2: return Type::IfcCartesianPoint; case 3: return Type::IfcCartesianPoint; case 4: return Type::IfcPlaneAngleMeasure; } return IfcGeometricRepresentationItem::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "HatchLineAppearance"; case 1: return "StartOfNextHatchLine"; case 2: return "PointOfReferenceHatchLine"; case 3: return "PatternStart"; case 4: return "HatchLineAngle"; } return IfcGeometricRepresentationItem::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcFillAreaStyleHatching (IfcAbstractEntityPtr e);
-    IfcFillAreaStyleHatching (IfcCurveStyle* v1_HatchLineAppearance, IfcHatchLineDistanceSelect v2_StartOfNextHatchLine, IfcCartesianPoint* v3_PointOfReferenceHatchLine, IfcCartesianPoint* v4_PatternStart, IfcPlaneAngleMeasure v5_HatchLineAngle);
-    typedef IfcFillAreaStyleHatching* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcFillAreaStyleHatching > > list;
-    typedef IfcTemplatedEntityList< IfcFillAreaStyleHatching >::it it;
+    IfcFillAreaStyleHatching (IfcAbstractEntity* e);
+    IfcFillAreaStyleHatching (IfcCurveStyle* v1_HatchLineAppearance, IfcHatchLineDistanceSelect* v2_StartOfNextHatchLine, IfcCartesianPoint* v3_PointOfReferenceHatchLine, IfcCartesianPoint* v4_PatternStart, double v5_HatchLineAngle);
+    typedef IfcTemplatedEntityList< IfcFillAreaStyleHatching > list;
 };
 /// The fill area style tile symbol with style is a symbol that is used as a tile within an annotated tiling. 
 /// 
@@ -19552,20 +20396,19 @@ class IfcFillAreaStyleTileSymbolWithStyle : public IfcGeometricRepresentationIte
     /// IFC2x4 CHANGE  The data type has been changed to IfcStyleItem.
     /// 
     /// NOTE  Only IfcStyleItem's that refer to a compatible geometric representation item and presentation style shall be used.
-    IfcAnnotationSymbolOccurrence* Symbol();
+    IfcAnnotationSymbolOccurrence* Symbol() const;
     void setSymbol(IfcAnnotationSymbolOccurrence* v);
     virtual unsigned int getArgumentCount() const { return 1; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY; } return IfcGeometricRepresentationItem::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcAnnotationSymbolOccurrence; } return IfcGeometricRepresentationItem::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Symbol"; } return IfcGeometricRepresentationItem::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcFillAreaStyleTileSymbolWithStyle (IfcAbstractEntityPtr e);
+    IfcFillAreaStyleTileSymbolWithStyle (IfcAbstractEntity* e);
     IfcFillAreaStyleTileSymbolWithStyle (IfcAnnotationSymbolOccurrence* v1_Symbol);
-    typedef IfcFillAreaStyleTileSymbolWithStyle* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcFillAreaStyleTileSymbolWithStyle > > list;
-    typedef IfcTemplatedEntityList< IfcFillAreaStyleTileSymbolWithStyle >::it it;
+    typedef IfcTemplatedEntityList< IfcFillAreaStyleTileSymbolWithStyle > list;
 };
 /// Definition from ISO/CD 10303-46:1992: The fill area style tiles defines a two dimensional tile to be used for the filling of annotation fill areas or other closed regions. The content of a tile is defined by the tile set, and the placement of each tile determined by the filling pattern which indicates how to place tiles next to each other. Tiles or parts of tiles outside of the annotation fill area or closed region shall be clipped at the of the area or region. 
 /// 
@@ -19575,98 +20418,96 @@ class IfcFillAreaStyleTileSymbolWithStyle : public IfcGeometricRepresentationIte
 class IfcFillAreaStyleTiles : public IfcGeometricRepresentationItem {
 public:
     /// A two direction repeat factor defining the shape and relative positioning of the tiles.
-    IfcOneDirectionRepeatFactor* TilingPattern();
+    IfcOneDirectionRepeatFactor* TilingPattern() const;
     void setTilingPattern(IfcOneDirectionRepeatFactor* v);
     /// A set of constituents of the tile.
-    SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > Tiles();
-    void setTiles(SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > v);
+    IfcEntityList::ptr Tiles() const;
+    void setTiles(IfcEntityList::ptr v);
     /// The scale factor applied to each tile as it is placed in the annotation fill area.
-    IfcPositiveRatioMeasure TilingScale();
-    void setTilingScale(IfcPositiveRatioMeasure v);
+    double TilingScale() const;
+    void setTilingScale(double v);
     virtual unsigned int getArgumentCount() const { return 3; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY; case 1: return IfcUtil::Argument_ENTITY_LIST; case 2: return IfcUtil::Argument_DOUBLE; } return IfcGeometricRepresentationItem::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcOneDirectionRepeatFactor; case 1: return Type::IfcFillAreaStyleTileShapeSelect; case 2: return Type::IfcPositiveRatioMeasure; } return IfcGeometricRepresentationItem::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "TilingPattern"; case 1: return "Tiles"; case 2: return "TilingScale"; } return IfcGeometricRepresentationItem::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcFillAreaStyleTiles (IfcAbstractEntityPtr e);
-    IfcFillAreaStyleTiles (IfcOneDirectionRepeatFactor* v1_TilingPattern, IfcEntities v2_Tiles, IfcPositiveRatioMeasure v3_TilingScale);
-    typedef IfcFillAreaStyleTiles* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcFillAreaStyleTiles > > list;
-    typedef IfcTemplatedEntityList< IfcFillAreaStyleTiles >::it it;
+    IfcFillAreaStyleTiles (IfcAbstractEntity* e);
+    IfcFillAreaStyleTiles (IfcOneDirectionRepeatFactor* v1_TilingPattern, IfcEntityList::ptr v2_Tiles, double v3_TilingScale);
+    typedef IfcTemplatedEntityList< IfcFillAreaStyleTiles > list;
 };
 
 class IfcFluidFlowProperties : public IfcPropertySetDefinition {
 public:
-    IfcPropertySourceEnum::IfcPropertySourceEnum PropertySource();
+    IfcPropertySourceEnum::IfcPropertySourceEnum PropertySource() const;
     void setPropertySource(IfcPropertySourceEnum::IfcPropertySourceEnum v);
     /// Whether the optional attribute FlowConditionTimeSeries is defined for this IfcFluidFlowProperties
-    bool hasFlowConditionTimeSeries();
-    IfcTimeSeries* FlowConditionTimeSeries();
+    bool hasFlowConditionTimeSeries() const;
+    IfcTimeSeries* FlowConditionTimeSeries() const;
     void setFlowConditionTimeSeries(IfcTimeSeries* v);
     /// Whether the optional attribute VelocityTimeSeries is defined for this IfcFluidFlowProperties
-    bool hasVelocityTimeSeries();
-    IfcTimeSeries* VelocityTimeSeries();
+    bool hasVelocityTimeSeries() const;
+    IfcTimeSeries* VelocityTimeSeries() const;
     void setVelocityTimeSeries(IfcTimeSeries* v);
     /// Whether the optional attribute FlowrateTimeSeries is defined for this IfcFluidFlowProperties
-    bool hasFlowrateTimeSeries();
-    IfcTimeSeries* FlowrateTimeSeries();
+    bool hasFlowrateTimeSeries() const;
+    IfcTimeSeries* FlowrateTimeSeries() const;
     void setFlowrateTimeSeries(IfcTimeSeries* v);
-    IfcMaterial* Fluid();
+    IfcMaterial* Fluid() const;
     void setFluid(IfcMaterial* v);
     /// Whether the optional attribute PressureTimeSeries is defined for this IfcFluidFlowProperties
-    bool hasPressureTimeSeries();
-    IfcTimeSeries* PressureTimeSeries();
+    bool hasPressureTimeSeries() const;
+    IfcTimeSeries* PressureTimeSeries() const;
     void setPressureTimeSeries(IfcTimeSeries* v);
     /// Whether the optional attribute UserDefinedPropertySource is defined for this IfcFluidFlowProperties
-    bool hasUserDefinedPropertySource();
-    IfcLabel UserDefinedPropertySource();
-    void setUserDefinedPropertySource(IfcLabel v);
+    bool hasUserDefinedPropertySource() const;
+    std::string UserDefinedPropertySource() const;
+    void setUserDefinedPropertySource(std::string v);
     /// Whether the optional attribute TemperatureSingleValue is defined for this IfcFluidFlowProperties
-    bool hasTemperatureSingleValue();
-    IfcThermodynamicTemperatureMeasure TemperatureSingleValue();
-    void setTemperatureSingleValue(IfcThermodynamicTemperatureMeasure v);
+    bool hasTemperatureSingleValue() const;
+    double TemperatureSingleValue() const;
+    void setTemperatureSingleValue(double v);
     /// Whether the optional attribute WetBulbTemperatureSingleValue is defined for this IfcFluidFlowProperties
-    bool hasWetBulbTemperatureSingleValue();
-    IfcThermodynamicTemperatureMeasure WetBulbTemperatureSingleValue();
-    void setWetBulbTemperatureSingleValue(IfcThermodynamicTemperatureMeasure v);
+    bool hasWetBulbTemperatureSingleValue() const;
+    double WetBulbTemperatureSingleValue() const;
+    void setWetBulbTemperatureSingleValue(double v);
     /// Whether the optional attribute WetBulbTemperatureTimeSeries is defined for this IfcFluidFlowProperties
-    bool hasWetBulbTemperatureTimeSeries();
-    IfcTimeSeries* WetBulbTemperatureTimeSeries();
+    bool hasWetBulbTemperatureTimeSeries() const;
+    IfcTimeSeries* WetBulbTemperatureTimeSeries() const;
     void setWetBulbTemperatureTimeSeries(IfcTimeSeries* v);
     /// Whether the optional attribute TemperatureTimeSeries is defined for this IfcFluidFlowProperties
-    bool hasTemperatureTimeSeries();
-    IfcTimeSeries* TemperatureTimeSeries();
+    bool hasTemperatureTimeSeries() const;
+    IfcTimeSeries* TemperatureTimeSeries() const;
     void setTemperatureTimeSeries(IfcTimeSeries* v);
     /// Whether the optional attribute FlowrateSingleValue is defined for this IfcFluidFlowProperties
-    bool hasFlowrateSingleValue();
-    IfcDerivedMeasureValue FlowrateSingleValue();
-    void setFlowrateSingleValue(IfcDerivedMeasureValue v);
+    bool hasFlowrateSingleValue() const;
+    IfcDerivedMeasureValue* FlowrateSingleValue() const;
+    void setFlowrateSingleValue(IfcDerivedMeasureValue* v);
     /// Whether the optional attribute FlowConditionSingleValue is defined for this IfcFluidFlowProperties
-    bool hasFlowConditionSingleValue();
-    IfcPositiveRatioMeasure FlowConditionSingleValue();
-    void setFlowConditionSingleValue(IfcPositiveRatioMeasure v);
+    bool hasFlowConditionSingleValue() const;
+    double FlowConditionSingleValue() const;
+    void setFlowConditionSingleValue(double v);
     /// Whether the optional attribute VelocitySingleValue is defined for this IfcFluidFlowProperties
-    bool hasVelocitySingleValue();
-    IfcLinearVelocityMeasure VelocitySingleValue();
-    void setVelocitySingleValue(IfcLinearVelocityMeasure v);
+    bool hasVelocitySingleValue() const;
+    double VelocitySingleValue() const;
+    void setVelocitySingleValue(double v);
     /// Whether the optional attribute PressureSingleValue is defined for this IfcFluidFlowProperties
-    bool hasPressureSingleValue();
-    IfcPressureMeasure PressureSingleValue();
-    void setPressureSingleValue(IfcPressureMeasure v);
+    bool hasPressureSingleValue() const;
+    double PressureSingleValue() const;
+    void setPressureSingleValue(double v);
     virtual unsigned int getArgumentCount() const { return 19; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 4: return IfcUtil::Argument_ENUMERATION; case 5: return IfcUtil::Argument_ENTITY; case 6: return IfcUtil::Argument_ENTITY; case 7: return IfcUtil::Argument_ENTITY; case 8: return IfcUtil::Argument_ENTITY; case 9: return IfcUtil::Argument_ENTITY; case 10: return IfcUtil::Argument_STRING; case 11: return IfcUtil::Argument_DOUBLE; case 12: return IfcUtil::Argument_DOUBLE; case 13: return IfcUtil::Argument_ENTITY; case 14: return IfcUtil::Argument_ENTITY; case 15: return IfcUtil::Argument_ENTITY; case 16: return IfcUtil::Argument_DOUBLE; case 17: return IfcUtil::Argument_DOUBLE; case 18: return IfcUtil::Argument_DOUBLE; } return IfcPropertySetDefinition::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 4: return Type::IfcPropertySourceEnum; case 5: return Type::IfcTimeSeries; case 6: return Type::IfcTimeSeries; case 7: return Type::IfcTimeSeries; case 8: return Type::IfcMaterial; case 9: return Type::IfcTimeSeries; case 10: return Type::IfcLabel; case 11: return Type::IfcThermodynamicTemperatureMeasure; case 12: return Type::IfcThermodynamicTemperatureMeasure; case 13: return Type::IfcTimeSeries; case 14: return Type::IfcTimeSeries; case 15: return Type::IfcDerivedMeasureValue; case 16: return Type::IfcPositiveRatioMeasure; case 17: return Type::IfcLinearVelocityMeasure; case 18: return Type::IfcPressureMeasure; } return IfcPropertySetDefinition::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 4: return "PropertySource"; case 5: return "FlowConditionTimeSeries"; case 6: return "VelocityTimeSeries"; case 7: return "FlowrateTimeSeries"; case 8: return "Fluid"; case 9: return "PressureTimeSeries"; case 10: return "UserDefinedPropertySource"; case 11: return "TemperatureSingleValue"; case 12: return "WetBulbTemperatureSingleValue"; case 13: return "WetBulbTemperatureTimeSeries"; case 14: return "TemperatureTimeSeries"; case 15: return "FlowrateSingleValue"; case 16: return "FlowConditionSingleValue"; case 17: return "VelocitySingleValue"; case 18: return "PressureSingleValue"; } return IfcPropertySetDefinition::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcFluidFlowProperties (IfcAbstractEntityPtr e);
-    IfcFluidFlowProperties (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, IfcPropertySourceEnum::IfcPropertySourceEnum v5_PropertySource, IfcTimeSeries* v6_FlowConditionTimeSeries, IfcTimeSeries* v7_VelocityTimeSeries, IfcTimeSeries* v8_FlowrateTimeSeries, IfcMaterial* v9_Fluid, IfcTimeSeries* v10_PressureTimeSeries, boost::optional< IfcLabel > v11_UserDefinedPropertySource, boost::optional< IfcThermodynamicTemperatureMeasure > v12_TemperatureSingleValue, boost::optional< IfcThermodynamicTemperatureMeasure > v13_WetBulbTemperatureSingleValue, IfcTimeSeries* v14_WetBulbTemperatureTimeSeries, IfcTimeSeries* v15_TemperatureTimeSeries, boost::optional< IfcDerivedMeasureValue > v16_FlowrateSingleValue, boost::optional< IfcPositiveRatioMeasure > v17_FlowConditionSingleValue, boost::optional< IfcLinearVelocityMeasure > v18_VelocitySingleValue, boost::optional< IfcPressureMeasure > v19_PressureSingleValue);
-    typedef IfcFluidFlowProperties* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcFluidFlowProperties > > list;
-    typedef IfcTemplatedEntityList< IfcFluidFlowProperties >::it it;
+    IfcFluidFlowProperties (IfcAbstractEntity* e);
+    IfcFluidFlowProperties (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcPropertySourceEnum::IfcPropertySourceEnum v5_PropertySource, IfcTimeSeries* v6_FlowConditionTimeSeries, IfcTimeSeries* v7_VelocityTimeSeries, IfcTimeSeries* v8_FlowrateTimeSeries, IfcMaterial* v9_Fluid, IfcTimeSeries* v10_PressureTimeSeries, boost::optional< std::string > v11_UserDefinedPropertySource, boost::optional< double > v12_TemperatureSingleValue, boost::optional< double > v13_WetBulbTemperatureSingleValue, IfcTimeSeries* v14_WetBulbTemperatureTimeSeries, IfcTimeSeries* v15_TemperatureTimeSeries, IfcDerivedMeasureValue* v16_FlowrateSingleValue, boost::optional< double > v17_FlowConditionSingleValue, boost::optional< double > v18_VelocitySingleValue, boost::optional< double > v19_PressureSingleValue);
+    typedef IfcTemplatedEntityList< IfcFluidFlowProperties > list;
 };
 /// Definition from IAI: The
 /// IfcFurnishingElementType defines a list of commonly shared
@@ -19700,16 +20541,15 @@ class IfcFurnishingElementType : public IfcElementType {
 public:
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcElementType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcElementType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcElementType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcFurnishingElementType (IfcAbstractEntityPtr e);
-    IfcFurnishingElementType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType);
-    typedef IfcFurnishingElementType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcFurnishingElementType > > list;
-    typedef IfcTemplatedEntityList< IfcFurnishingElementType >::it it;
+    IfcFurnishingElementType (IfcAbstractEntity* e);
+    IfcFurnishingElementType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType);
+    typedef IfcTemplatedEntityList< IfcFurnishingElementType > list;
 };
 /// The furnishing element type IfcFurnitureType defines commonly shared information for occurrences of furnitures.  The set of shared information may include: 
 /// 
@@ -19751,20 +20591,19 @@ class IfcFurnishingElementType : public IfcElementType {
 class IfcFurnitureType : public IfcFurnishingElementType {
 public:
     /// A designation of where the assembly is intended to take place. A selection of alternatives s provided in an enumerated list.
-    IfcAssemblyPlaceEnum::IfcAssemblyPlaceEnum AssemblyPlace();
+    IfcAssemblyPlaceEnum::IfcAssemblyPlaceEnum AssemblyPlace() const;
     void setAssemblyPlace(IfcAssemblyPlaceEnum::IfcAssemblyPlaceEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcFurnishingElementType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcAssemblyPlaceEnum; } return IfcFurnishingElementType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "AssemblyPlace"; } return IfcFurnishingElementType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcFurnitureType (IfcAbstractEntityPtr e);
-    IfcFurnitureType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcAssemblyPlaceEnum::IfcAssemblyPlaceEnum v10_AssemblyPlace);
-    typedef IfcFurnitureType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcFurnitureType > > list;
-    typedef IfcTemplatedEntityList< IfcFurnitureType >::it it;
+    IfcFurnitureType (IfcAbstractEntity* e);
+    IfcFurnitureType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcAssemblyPlaceEnum::IfcAssemblyPlaceEnum v10_AssemblyPlace);
+    typedef IfcTemplatedEntityList< IfcFurnitureType > list;
 };
 /// Definition from ISO/CD 10303-42:1992: A geometric curve set is a collection of two or three dimensional points and curves.
 /// 
@@ -19777,16 +20616,15 @@ class IfcGeometricCurveSet : public IfcGeometricSet {
 public:
     virtual unsigned int getArgumentCount() const { return 1; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcGeometricSet::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcGeometricSet::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcGeometricSet::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcGeometricCurveSet (IfcAbstractEntityPtr e);
-    IfcGeometricCurveSet (IfcEntities v1_Elements);
-    typedef IfcGeometricCurveSet* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcGeometricCurveSet > > list;
-    typedef IfcTemplatedEntityList< IfcGeometricCurveSet >::it it;
+    IfcGeometricCurveSet (IfcAbstractEntity* e);
+    IfcGeometricCurveSet (IfcEntityList::ptr v1_Elements);
+    typedef IfcTemplatedEntityList< IfcGeometricCurveSet > list;
 };
 /// IfcIShapeProfileDef
 /// defines a section profile that provides the defining parameters of a
@@ -19854,34 +20692,33 @@ class IfcGeometricCurveSet : public IfcGeometricSet {
 class IfcIShapeProfileDef : public IfcParameterizedProfileDef {
 public:
     /// Total extent of the width, defined parallel to the x axis of the position coordinate system.
-    IfcPositiveLengthMeasure OverallWidth();
-    void setOverallWidth(IfcPositiveLengthMeasure v);
+    double OverallWidth() const;
+    void setOverallWidth(double v);
     /// Total extent of the depth, defined parallel to the y axis of the position coordinate system.
-    IfcPositiveLengthMeasure OverallDepth();
-    void setOverallDepth(IfcPositiveLengthMeasure v);
+    double OverallDepth() const;
+    void setOverallDepth(double v);
     /// Thickness of the web of the I-shape. The web is centred on the x-axis and the y-axis of the position coordinate system.
-    IfcPositiveLengthMeasure WebThickness();
-    void setWebThickness(IfcPositiveLengthMeasure v);
+    double WebThickness() const;
+    void setWebThickness(double v);
     /// Flange thickness of the I-shape. Both, the upper and the lower flanges have the same thickness and they are centred on the y-axis of the position coordinate system.
-    IfcPositiveLengthMeasure FlangeThickness();
-    void setFlangeThickness(IfcPositiveLengthMeasure v);
+    double FlangeThickness() const;
+    void setFlangeThickness(double v);
     /// Whether the optional attribute FilletRadius is defined for this IfcIShapeProfileDef
-    bool hasFilletRadius();
+    bool hasFilletRadius() const;
     /// The fillet between the web and the flange.
-    IfcPositiveLengthMeasure FilletRadius();
-    void setFilletRadius(IfcPositiveLengthMeasure v);
+    double FilletRadius() const;
+    void setFilletRadius(double v);
     virtual unsigned int getArgumentCount() const { return 8; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 3: return IfcUtil::Argument_DOUBLE; case 4: return IfcUtil::Argument_DOUBLE; case 5: return IfcUtil::Argument_DOUBLE; case 6: return IfcUtil::Argument_DOUBLE; case 7: return IfcUtil::Argument_DOUBLE; } return IfcParameterizedProfileDef::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 3: return Type::IfcPositiveLengthMeasure; case 4: return Type::IfcPositiveLengthMeasure; case 5: return Type::IfcPositiveLengthMeasure; case 6: return Type::IfcPositiveLengthMeasure; case 7: return Type::IfcPositiveLengthMeasure; } return IfcParameterizedProfileDef::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 3: return "OverallWidth"; case 4: return "OverallDepth"; case 5: return "WebThickness"; case 6: return "FlangeThickness"; case 7: return "FilletRadius"; } return IfcParameterizedProfileDef::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcIShapeProfileDef (IfcAbstractEntityPtr e);
-    IfcIShapeProfileDef (IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< IfcLabel > v2_ProfileName, IfcAxis2Placement2D* v3_Position, IfcPositiveLengthMeasure v4_OverallWidth, IfcPositiveLengthMeasure v5_OverallDepth, IfcPositiveLengthMeasure v6_WebThickness, IfcPositiveLengthMeasure v7_FlangeThickness, boost::optional< IfcPositiveLengthMeasure > v8_FilletRadius);
-    typedef IfcIShapeProfileDef* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcIShapeProfileDef > > list;
-    typedef IfcTemplatedEntityList< IfcIShapeProfileDef >::it it;
+    IfcIShapeProfileDef (IfcAbstractEntity* e);
+    IfcIShapeProfileDef (IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< std::string > v2_ProfileName, IfcAxis2Placement2D* v3_Position, double v4_OverallWidth, double v5_OverallDepth, double v6_WebThickness, double v7_FlangeThickness, boost::optional< double > v8_FilletRadius);
+    typedef IfcTemplatedEntityList< IfcIShapeProfileDef > list;
 };
 /// IfcLShapeProfileDef
 /// defines a section profile that provides the defining parameters of an
@@ -19937,51 +20774,50 @@ class IfcIShapeProfileDef : public IfcParameterizedProfileDef {
 class IfcLShapeProfileDef : public IfcParameterizedProfileDef {
 public:
     /// Leg length, see illustration above (= h). Same as the overall depth.
-    IfcPositiveLengthMeasure Depth();
-    void setDepth(IfcPositiveLengthMeasure v);
+    double Depth() const;
+    void setDepth(double v);
     /// Whether the optional attribute Width is defined for this IfcLShapeProfileDef
-    bool hasWidth();
+    bool hasWidth() const;
     /// Leg length, see illustration above (= b). Same as the overall width.
-    IfcPositiveLengthMeasure Width();
-    void setWidth(IfcPositiveLengthMeasure v);
+    double Width() const;
+    void setWidth(double v);
     /// Constant wall thickness of profile, see illustration above (= ts).
-    IfcPositiveLengthMeasure Thickness();
-    void setThickness(IfcPositiveLengthMeasure v);
+    double Thickness() const;
+    void setThickness(double v);
     /// Whether the optional attribute FilletRadius is defined for this IfcLShapeProfileDef
-    bool hasFilletRadius();
+    bool hasFilletRadius() const;
     /// Fillet radius according the above illustration (= r1).
-    IfcPositiveLengthMeasure FilletRadius();
-    void setFilletRadius(IfcPositiveLengthMeasure v);
+    double FilletRadius() const;
+    void setFilletRadius(double v);
     /// Whether the optional attribute EdgeRadius is defined for this IfcLShapeProfileDef
-    bool hasEdgeRadius();
+    bool hasEdgeRadius() const;
     /// Edge radius according the above illustration (= r2).
-    IfcPositiveLengthMeasure EdgeRadius();
-    void setEdgeRadius(IfcPositiveLengthMeasure v);
+    double EdgeRadius() const;
+    void setEdgeRadius(double v);
     /// Whether the optional attribute LegSlope is defined for this IfcLShapeProfileDef
-    bool hasLegSlope();
+    bool hasLegSlope() const;
     /// Slope of the inner face of each leg of the profile.
-    IfcPlaneAngleMeasure LegSlope();
-    void setLegSlope(IfcPlaneAngleMeasure v);
+    double LegSlope() const;
+    void setLegSlope(double v);
     /// Whether the optional attribute CentreOfGravityInX is defined for this IfcLShapeProfileDef
-    bool hasCentreOfGravityInX();
-    IfcPositiveLengthMeasure CentreOfGravityInX();
-    void setCentreOfGravityInX(IfcPositiveLengthMeasure v);
+    bool hasCentreOfGravityInX() const;
+    double CentreOfGravityInX() const;
+    void setCentreOfGravityInX(double v);
     /// Whether the optional attribute CentreOfGravityInY is defined for this IfcLShapeProfileDef
-    bool hasCentreOfGravityInY();
-    IfcPositiveLengthMeasure CentreOfGravityInY();
-    void setCentreOfGravityInY(IfcPositiveLengthMeasure v);
+    bool hasCentreOfGravityInY() const;
+    double CentreOfGravityInY() const;
+    void setCentreOfGravityInY(double v);
     virtual unsigned int getArgumentCount() const { return 11; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 3: return IfcUtil::Argument_DOUBLE; case 4: return IfcUtil::Argument_DOUBLE; case 5: return IfcUtil::Argument_DOUBLE; case 6: return IfcUtil::Argument_DOUBLE; case 7: return IfcUtil::Argument_DOUBLE; case 8: return IfcUtil::Argument_DOUBLE; case 9: return IfcUtil::Argument_DOUBLE; case 10: return IfcUtil::Argument_DOUBLE; } return IfcParameterizedProfileDef::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 3: return Type::IfcPositiveLengthMeasure; case 4: return Type::IfcPositiveLengthMeasure; case 5: return Type::IfcPositiveLengthMeasure; case 6: return Type::IfcPositiveLengthMeasure; case 7: return Type::IfcPositiveLengthMeasure; case 8: return Type::IfcPlaneAngleMeasure; case 9: return Type::IfcPositiveLengthMeasure; case 10: return Type::IfcPositiveLengthMeasure; } return IfcParameterizedProfileDef::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 3: return "Depth"; case 4: return "Width"; case 5: return "Thickness"; case 6: return "FilletRadius"; case 7: return "EdgeRadius"; case 8: return "LegSlope"; case 9: return "CentreOfGravityInX"; case 10: return "CentreOfGravityInY"; } return IfcParameterizedProfileDef::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcLShapeProfileDef (IfcAbstractEntityPtr e);
-    IfcLShapeProfileDef (IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< IfcLabel > v2_ProfileName, IfcAxis2Placement2D* v3_Position, IfcPositiveLengthMeasure v4_Depth, boost::optional< IfcPositiveLengthMeasure > v5_Width, IfcPositiveLengthMeasure v6_Thickness, boost::optional< IfcPositiveLengthMeasure > v7_FilletRadius, boost::optional< IfcPositiveLengthMeasure > v8_EdgeRadius, boost::optional< IfcPlaneAngleMeasure > v9_LegSlope, boost::optional< IfcPositiveLengthMeasure > v10_CentreOfGravityInX, boost::optional< IfcPositiveLengthMeasure > v11_CentreOfGravityInY);
-    typedef IfcLShapeProfileDef* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcLShapeProfileDef > > list;
-    typedef IfcTemplatedEntityList< IfcLShapeProfileDef >::it it;
+    IfcLShapeProfileDef (IfcAbstractEntity* e);
+    IfcLShapeProfileDef (IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< std::string > v2_ProfileName, IfcAxis2Placement2D* v3_Position, double v4_Depth, boost::optional< double > v5_Width, double v6_Thickness, boost::optional< double > v7_FilletRadius, boost::optional< double > v8_EdgeRadius, boost::optional< double > v9_LegSlope, boost::optional< double > v10_CentreOfGravityInX, boost::optional< double > v11_CentreOfGravityInY);
+    typedef IfcTemplatedEntityList< IfcLShapeProfileDef > list;
 };
 /// Definition from ISO/CD 10303-42:1992: A line is an unbounded curve with constant tangent direction. A line is defined by a point and a direction. The positive direction of the line is in the direction of the Dir vector. The line is parameterized as follows:
 /// 
@@ -19999,23 +20835,22 @@ class IfcLShapeProfileDef : public IfcParameterizedProfileDef {
 class IfcLine : public IfcCurve {
 public:
     /// The location of the line.
-    IfcCartesianPoint* Pnt();
+    IfcCartesianPoint* Pnt() const;
     void setPnt(IfcCartesianPoint* v);
     /// The direction of the line, the magnitude and units of Dir affect the parameterization of the line.
-    IfcVector* Dir();
+    IfcVector* Dir() const;
     void setDir(IfcVector* v);
     virtual unsigned int getArgumentCount() const { return 2; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY; case 1: return IfcUtil::Argument_ENTITY; } return IfcCurve::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcCartesianPoint; case 1: return Type::IfcVector; } return IfcCurve::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Pnt"; case 1: return "Dir"; } return IfcCurve::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcLine (IfcAbstractEntityPtr e);
+    IfcLine (IfcAbstractEntity* e);
     IfcLine (IfcCartesianPoint* v1_Pnt, IfcVector* v2_Dir);
-    typedef IfcLine* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcLine > > list;
-    typedef IfcTemplatedEntityList< IfcLine >::it it;
+    typedef IfcTemplatedEntityList< IfcLine > list;
 };
 /// Definition from ISO/CD 10303-42:1992: A manifold solid
 /// B-rep is a finite, arcwise connected volume bounded by one or
@@ -20083,20 +20918,19 @@ class IfcLine : public IfcCurve {
 class IfcManifoldSolidBrep : public IfcSolidModel {
 public:
     /// A closed shell defining the exterior boundary of the solid. The shell normal shall point away from the interior of the solid.
-    IfcClosedShell* Outer();
+    IfcClosedShell* Outer() const;
     void setOuter(IfcClosedShell* v);
     virtual unsigned int getArgumentCount() const { return 1; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY; } return IfcSolidModel::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcClosedShell; } return IfcSolidModel::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Outer"; } return IfcSolidModel::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcManifoldSolidBrep (IfcAbstractEntityPtr e);
+    IfcManifoldSolidBrep (IfcAbstractEntity* e);
     IfcManifoldSolidBrep (IfcClosedShell* v1_Outer);
-    typedef IfcManifoldSolidBrep* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcManifoldSolidBrep > > list;
-    typedef IfcTemplatedEntityList< IfcManifoldSolidBrep >::it it;
+    typedef IfcTemplatedEntityList< IfcManifoldSolidBrep > list;
 };
 /// An IfcObject is the
 /// generalization of any semantically treated thing or process.
@@ -20183,23 +21017,22 @@ class IfcManifoldSolidBrep : public IfcSolidModel {
 class IfcObject : public IfcObjectDefinition {
 public:
     /// Whether the optional attribute ObjectType is defined for this IfcObject
-    bool hasObjectType();
+    bool hasObjectType() const;
     /// The type denotes a particular type that indicates the object further. The use has to be established at the level of instantiable subtypes. In particular it holds the user defined type, if the enumeration of the attribute PredefinedType is set to USERDEFINED.
-    IfcLabel ObjectType();
-    void setObjectType(IfcLabel v);
+    std::string ObjectType() const;
+    void setObjectType(std::string v);
     virtual unsigned int getArgumentCount() const { return 5; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 4: return IfcUtil::Argument_STRING; } return IfcObjectDefinition::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 4: return Type::IfcLabel; } return IfcObjectDefinition::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 4: return "ObjectType"; } return IfcObjectDefinition::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelDefines > > IsDefinedBy(); // INVERSE IfcRelDefines::RelatedObjects
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcRelDefines >::ptr IsDefinedBy() const; // INVERSE IfcRelDefines::RelatedObjects
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcObject (IfcAbstractEntityPtr e);
-    IfcObject (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType);
-    typedef IfcObject* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcObject > > list;
-    typedef IfcTemplatedEntityList< IfcObject >::it it;
+    IfcObject (IfcAbstractEntity* e);
+    IfcObject (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType);
+    typedef IfcTemplatedEntityList< IfcObject > list;
 };
 /// Definition from ISO/CD 10303-42:1992: An offset curve 2d (IfcOffsetCurve2d) is a curve at a constant distance from a basis curve in two-dimensional space. This entity defines a simple plane-offset curve by offsetting by distance along the normal to basis curve in the plane of basis curve. The underlying curve shall have a well-defined tangent direction at every point. In the case of a composite curve, the transition code between each segment shall be cont same gradient or cont same gradient same curvature. 
 /// 
@@ -20215,26 +21048,25 @@ class IfcObject : public IfcObjectDefinition {
 class IfcOffsetCurve2D : public IfcCurve {
 public:
     /// The curve that is being offset.
-    IfcCurve* BasisCurve();
+    IfcCurve* BasisCurve() const;
     void setBasisCurve(IfcCurve* v);
     /// The distance of the offset curve from the basis curve. distance may be positive, negative or zero. A positive value of distance defines an offset in the direction which is normal to the curve in the sense of an anti-clockwise rotation through 90 degrees from the tangent vector T at the given point. (This is in the direction of orthogonal complement(T).)
-    IfcLengthMeasure Distance();
-    void setDistance(IfcLengthMeasure v);
+    double Distance() const;
+    void setDistance(double v);
     /// An indication of whether the offset curve self-intersects; this is for information only.
-    bool SelfIntersect();
+    bool SelfIntersect() const;
     void setSelfIntersect(bool v);
     virtual unsigned int getArgumentCount() const { return 3; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY; case 1: return IfcUtil::Argument_DOUBLE; case 2: return IfcUtil::Argument_BOOL; } return IfcCurve::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcCurve; case 1: return Type::IfcLengthMeasure; case 2: return Type::UNDEFINED; } return IfcCurve::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "BasisCurve"; case 1: return "Distance"; case 2: return "SelfIntersect"; } return IfcCurve::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcOffsetCurve2D (IfcAbstractEntityPtr e);
-    IfcOffsetCurve2D (IfcCurve* v1_BasisCurve, IfcLengthMeasure v2_Distance, bool v3_SelfIntersect);
-    typedef IfcOffsetCurve2D* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcOffsetCurve2D > > list;
-    typedef IfcTemplatedEntityList< IfcOffsetCurve2D >::it it;
+    IfcOffsetCurve2D (IfcAbstractEntity* e);
+    IfcOffsetCurve2D (IfcCurve* v1_BasisCurve, double v2_Distance, bool v3_SelfIntersect);
+    typedef IfcTemplatedEntityList< IfcOffsetCurve2D > list;
 };
 /// Definition from ISO/CD 10303-42:1992: An offset curve 3d is a curve at a constant distance from a basis curve in three-dimensional space. The underlying curve shall have a well-defined tangent direction at every point. In the case of a composite curve the transition code between each segment shall be cont same gradient or cont same gradient same curvature. The offset curve at any point (parameter) on the basis curve is in the direction V x T where V is the fixed reference direction and T is the unit tangent to the basis curve. For the offset direction to be well defined, T shall not at any point of the curve be in the same, or opposite, direction as V. 
 /// 
@@ -20254,29 +21086,28 @@ class IfcOffsetCurve2D : public IfcCurve {
 class IfcOffsetCurve3D : public IfcCurve {
 public:
     /// The curve that is being offset.
-    IfcCurve* BasisCurve();
+    IfcCurve* BasisCurve() const;
     void setBasisCurve(IfcCurve* v);
     /// The distance of the offset curve from the basis curve. The distance may be positive, negative or zero.
-    IfcLengthMeasure Distance();
-    void setDistance(IfcLengthMeasure v);
+    double Distance() const;
+    void setDistance(double v);
     /// An indication of whether the offset curve self-intersects, this is for information only.
-    bool SelfIntersect();
+    bool SelfIntersect() const;
     void setSelfIntersect(bool v);
     /// The direction used to define the direction of the offset curve 3d from the basis curve.
-    IfcDirection* RefDirection();
+    IfcDirection* RefDirection() const;
     void setRefDirection(IfcDirection* v);
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY; case 1: return IfcUtil::Argument_DOUBLE; case 2: return IfcUtil::Argument_BOOL; case 3: return IfcUtil::Argument_ENTITY; } return IfcCurve::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcCurve; case 1: return Type::IfcLengthMeasure; case 2: return Type::UNDEFINED; case 3: return Type::IfcDirection; } return IfcCurve::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "BasisCurve"; case 1: return "Distance"; case 2: return "SelfIntersect"; case 3: return "RefDirection"; } return IfcCurve::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcOffsetCurve3D (IfcAbstractEntityPtr e);
-    IfcOffsetCurve3D (IfcCurve* v1_BasisCurve, IfcLengthMeasure v2_Distance, bool v3_SelfIntersect, IfcDirection* v4_RefDirection);
-    typedef IfcOffsetCurve3D* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcOffsetCurve3D > > list;
-    typedef IfcTemplatedEntityList< IfcOffsetCurve3D >::it it;
+    IfcOffsetCurve3D (IfcAbstractEntity* e);
+    IfcOffsetCurve3D (IfcCurve* v1_BasisCurve, double v2_Distance, bool v3_SelfIntersect, IfcDirection* v4_RefDirection);
+    typedef IfcTemplatedEntityList< IfcOffsetCurve3D > list;
 };
 /// This entity is a description of a panel within a
 /// door or window (as fillers for opening) which allows for air
@@ -20312,38 +21143,37 @@ class IfcOffsetCurve3D : public IfcCurve {
 class IfcPermeableCoveringProperties : public IfcPropertySetDefinition {
 public:
     /// Types of permeable covering operations. Also used to assign standard symbolic presentations according to national building standards.
-    IfcPermeableCoveringOperationEnum::IfcPermeableCoveringOperationEnum OperationType();
+    IfcPermeableCoveringOperationEnum::IfcPermeableCoveringOperationEnum OperationType() const;
     void setOperationType(IfcPermeableCoveringOperationEnum::IfcPermeableCoveringOperationEnum v);
     /// Position of this permeable covering panel within the overall window or door type.
-    IfcWindowPanelPositionEnum::IfcWindowPanelPositionEnum PanelPosition();
+    IfcWindowPanelPositionEnum::IfcWindowPanelPositionEnum PanelPosition() const;
     void setPanelPosition(IfcWindowPanelPositionEnum::IfcWindowPanelPositionEnum v);
     /// Whether the optional attribute FrameDepth is defined for this IfcPermeableCoveringProperties
-    bool hasFrameDepth();
+    bool hasFrameDepth() const;
     /// Depth of panel frame (used to include the permeable covering), measured from front face to back face horizontally (i.e. perpendicular to the window or door (elevation) plane.
-    IfcPositiveLengthMeasure FrameDepth();
-    void setFrameDepth(IfcPositiveLengthMeasure v);
+    double FrameDepth() const;
+    void setFrameDepth(double v);
     /// Whether the optional attribute FrameThickness is defined for this IfcPermeableCoveringProperties
-    bool hasFrameThickness();
+    bool hasFrameThickness() const;
     /// Width of panel frame (used to include the permeable covering), measured from inside of panel (at permeable covering) to outside of panel (at lining), i.e. parallel to the window or door (elevation) plane.
-    IfcPositiveLengthMeasure FrameThickness();
-    void setFrameThickness(IfcPositiveLengthMeasure v);
+    double FrameThickness() const;
+    void setFrameThickness(double v);
     /// Whether the optional attribute ShapeAspectStyle is defined for this IfcPermeableCoveringProperties
-    bool hasShapeAspectStyle();
+    bool hasShapeAspectStyle() const;
     /// Optional link to a shape aspect definition, which points to the part of the geometric representation of the window style, which is used to represent the permeable covering.
-    IfcShapeAspect* ShapeAspectStyle();
+    IfcShapeAspect* ShapeAspectStyle() const;
     void setShapeAspectStyle(IfcShapeAspect* v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 4: return IfcUtil::Argument_ENUMERATION; case 5: return IfcUtil::Argument_ENUMERATION; case 6: return IfcUtil::Argument_DOUBLE; case 7: return IfcUtil::Argument_DOUBLE; case 8: return IfcUtil::Argument_ENTITY; } return IfcPropertySetDefinition::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 4: return Type::IfcPermeableCoveringOperationEnum; case 5: return Type::IfcWindowPanelPositionEnum; case 6: return Type::IfcPositiveLengthMeasure; case 7: return Type::IfcPositiveLengthMeasure; case 8: return Type::IfcShapeAspect; } return IfcPropertySetDefinition::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 4: return "OperationType"; case 5: return "PanelPosition"; case 6: return "FrameDepth"; case 7: return "FrameThickness"; case 8: return "ShapeAspectStyle"; } return IfcPropertySetDefinition::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcPermeableCoveringProperties (IfcAbstractEntityPtr e);
-    IfcPermeableCoveringProperties (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, IfcPermeableCoveringOperationEnum::IfcPermeableCoveringOperationEnum v5_OperationType, IfcWindowPanelPositionEnum::IfcWindowPanelPositionEnum v6_PanelPosition, boost::optional< IfcPositiveLengthMeasure > v7_FrameDepth, boost::optional< IfcPositiveLengthMeasure > v8_FrameThickness, IfcShapeAspect* v9_ShapeAspectStyle);
-    typedef IfcPermeableCoveringProperties* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcPermeableCoveringProperties > > list;
-    typedef IfcTemplatedEntityList< IfcPermeableCoveringProperties >::it it;
+    IfcPermeableCoveringProperties (IfcAbstractEntity* e);
+    IfcPermeableCoveringProperties (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcPermeableCoveringOperationEnum::IfcPermeableCoveringOperationEnum v5_OperationType, IfcWindowPanelPositionEnum::IfcWindowPanelPositionEnum v6_PanelPosition, boost::optional< double > v7_FrameDepth, boost::optional< double > v8_FrameThickness, IfcShapeAspect* v9_ShapeAspectStyle);
+    typedef IfcTemplatedEntityList< IfcPermeableCoveringProperties > list;
 };
 /// Definition from ISO/CD 10303-46:1992: A planar box specifies an arbitrary rectangular box and its location in a two dimensional Cartesian coordinate system.
 /// 
@@ -20355,20 +21185,19 @@ class IfcPlanarBox : public IfcPlanarExtent {
 public:
     /// The IfcAxis2Placement positions a local coordinate system for the definition of the rectangle. The origin of this local coordinate system serves as the lower left corner of the rectangular box.
     ///   NOTE  In case of a 3D placement by IfcAxisPlacement3D the IfcPlanarBox is defined within the xy plane of the definition coordinate system.
-    IfcAxis2Placement Placement();
-    void setPlacement(IfcAxis2Placement v);
+    IfcAxis2Placement* Placement() const;
+    void setPlacement(IfcAxis2Placement* v);
     virtual unsigned int getArgumentCount() const { return 3; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 2: return IfcUtil::Argument_ENTITY; } return IfcPlanarExtent::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 2: return Type::IfcAxis2Placement; } return IfcPlanarExtent::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 2: return "Placement"; } return IfcPlanarExtent::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcPlanarBox (IfcAbstractEntityPtr e);
-    IfcPlanarBox (IfcLengthMeasure v1_SizeInX, IfcLengthMeasure v2_SizeInY, IfcAxis2Placement v3_Placement);
-    typedef IfcPlanarBox* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcPlanarBox > > list;
-    typedef IfcTemplatedEntityList< IfcPlanarBox >::it it;
+    IfcPlanarBox (IfcAbstractEntity* e);
+    IfcPlanarBox (double v1_SizeInX, double v2_SizeInY, IfcAxis2Placement* v3_Placement);
+    typedef IfcTemplatedEntityList< IfcPlanarBox > list;
 };
 /// Definition from ISO/CD 10303-42:1992: A plane is an unbounded surface with a constant normal. A plane is defined by a point on the plane and the normal direction to the plane. The data is to be interpreted as follows:
 /// 
@@ -20410,16 +21239,15 @@ class IfcPlane : public IfcElementarySurface {
 public:
     virtual unsigned int getArgumentCount() const { return 1; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcElementarySurface::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcElementarySurface::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcElementarySurface::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcPlane (IfcAbstractEntityPtr e);
+    IfcPlane (IfcAbstractEntity* e);
     IfcPlane (IfcAxis2Placement3D* v1_Position);
-    typedef IfcPlane* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcPlane > > list;
-    typedef IfcTemplatedEntityList< IfcPlane >::it it;
+    typedef IfcTemplatedEntityList< IfcPlane > list;
 };
 /// Definition from ISO9000: A process is a set of
 /// activities that are interrelated or that interact with one
@@ -20465,19 +21293,18 @@ class IfcProcess : public IfcObject {
 public:
     virtual unsigned int getArgumentCount() const { return 5; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcObject::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcObject::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcObject::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelAssignsToProcess > > OperatesOn(); // INVERSE IfcRelAssignsToProcess::RelatingProcess
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelSequence > > IsSuccessorFrom(); // INVERSE IfcRelSequence::RelatedProcess
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelSequence > > IsPredecessorTo(); // INVERSE IfcRelSequence::RelatingProcess
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcRelAssignsToProcess >::ptr OperatesOn() const; // INVERSE IfcRelAssignsToProcess::RelatingProcess
+    IfcTemplatedEntityList< IfcRelSequence >::ptr IsSuccessorFrom() const; // INVERSE IfcRelSequence::RelatedProcess
+    IfcTemplatedEntityList< IfcRelSequence >::ptr IsPredecessorTo() const; // INVERSE IfcRelSequence::RelatingProcess
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcProcess (IfcAbstractEntityPtr e);
-    IfcProcess (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType);
-    typedef IfcProcess* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcProcess > > list;
-    typedef IfcTemplatedEntityList< IfcProcess >::it it;
+    IfcProcess (IfcAbstractEntity* e);
+    IfcProcess (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType);
+    typedef IfcTemplatedEntityList< IfcProcess > list;
 };
 /// Any object that relates to a
 /// geometric or spatial context. Subtypes of IfcProduct
@@ -20573,28 +21400,27 @@ class IfcProcess : public IfcObject {
 class IfcProduct : public IfcObject {
 public:
     /// Whether the optional attribute ObjectPlacement is defined for this IfcProduct
-    bool hasObjectPlacement();
+    bool hasObjectPlacement() const;
     /// Placement of the product in space, the placement can either be absolute (relative to the world coordinate system), relative (relative to the object placement of another product), or constraint (e.g. relative to grid axes). It is determined by the various subtypes of IfcObjectPlacement, which includes the axis placement information to determine the  transformation for the object coordinate system.
-    IfcObjectPlacement* ObjectPlacement();
+    IfcObjectPlacement* ObjectPlacement() const;
     void setObjectPlacement(IfcObjectPlacement* v);
     /// Whether the optional attribute Representation is defined for this IfcProduct
-    bool hasRepresentation();
+    bool hasRepresentation() const;
     /// Reference to the representations of the product, being either a representation (IfcProductRepresentation) or as a special case a shape representations (IfcProductDefinitionShape). The product definition shape provides for multiple geometric representations of the shape property of the object within the same object coordinate system, defined by the object placement.
-    IfcProductRepresentation* Representation();
+    IfcProductRepresentation* Representation() const;
     void setRepresentation(IfcProductRepresentation* v);
     virtual unsigned int getArgumentCount() const { return 7; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 5: return IfcUtil::Argument_ENTITY; case 6: return IfcUtil::Argument_ENTITY; } return IfcObject::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 5: return Type::IfcObjectPlacement; case 6: return Type::IfcProductRepresentation; } return IfcObject::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 5: return "ObjectPlacement"; case 6: return "Representation"; } return IfcObject::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelAssignsToProduct > > ReferencedBy(); // INVERSE IfcRelAssignsToProduct::RelatingProduct
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcRelAssignsToProduct >::ptr ReferencedBy() const; // INVERSE IfcRelAssignsToProduct::RelatingProduct
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcProduct (IfcAbstractEntityPtr e);
-    IfcProduct (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation);
-    typedef IfcProduct* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcProduct > > list;
-    typedef IfcTemplatedEntityList< IfcProduct >::it it;
+    IfcProduct (IfcAbstractEntity* e);
+    IfcProduct (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation);
+    typedef IfcTemplatedEntityList< IfcProduct > list;
 };
 /// IfcProject indicates the undertaking of some design, engineering, construction, or
 /// maintenance activities leading towards a product. The project establishes the context for information to be exchanged or shared, and it may represent a construction project but does not have to.  The IfcProject's main purpose in an exchange structure is to provide the root instance and the context for all other information items included.
@@ -20643,45 +21469,43 @@ class IfcProduct : public IfcObject {
 class IfcProject : public IfcObject {
 public:
     /// Whether the optional attribute LongName is defined for this IfcProject
-    bool hasLongName();
-    IfcLabel LongName();
-    void setLongName(IfcLabel v);
+    bool hasLongName() const;
+    std::string LongName() const;
+    void setLongName(std::string v);
     /// Whether the optional attribute Phase is defined for this IfcProject
-    bool hasPhase();
-    IfcLabel Phase();
-    void setPhase(IfcLabel v);
-    SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationContext > > RepresentationContexts();
-    void setRepresentationContexts(SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationContext > > v);
-    IfcUnitAssignment* UnitsInContext();
+    bool hasPhase() const;
+    std::string Phase() const;
+    void setPhase(std::string v);
+    IfcTemplatedEntityList< IfcRepresentationContext >::ptr RepresentationContexts() const;
+    void setRepresentationContexts(IfcTemplatedEntityList< IfcRepresentationContext >::ptr v);
+    IfcUnitAssignment* UnitsInContext() const;
     void setUnitsInContext(IfcUnitAssignment* v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 5: return IfcUtil::Argument_STRING; case 6: return IfcUtil::Argument_STRING; case 7: return IfcUtil::Argument_ENTITY_LIST; case 8: return IfcUtil::Argument_ENTITY; } return IfcObject::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 5: return Type::IfcLabel; case 6: return Type::IfcLabel; case 7: return Type::IfcRepresentationContext; case 8: return Type::IfcUnitAssignment; } return IfcObject::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 5: return "LongName"; case 6: return "Phase"; case 7: return "RepresentationContexts"; case 8: return "UnitsInContext"; } return IfcObject::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcProject (IfcAbstractEntityPtr e);
-    IfcProject (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, boost::optional< IfcLabel > v6_LongName, boost::optional< IfcLabel > v7_Phase, SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationContext > > v8_RepresentationContexts, IfcUnitAssignment* v9_UnitsInContext);
-    typedef IfcProject* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcProject > > list;
-    typedef IfcTemplatedEntityList< IfcProject >::it it;
+    IfcProject (IfcAbstractEntity* e);
+    IfcProject (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, boost::optional< std::string > v6_LongName, boost::optional< std::string > v7_Phase, IfcTemplatedEntityList< IfcRepresentationContext >::ptr v8_RepresentationContexts, IfcUnitAssignment* v9_UnitsInContext);
+    typedef IfcTemplatedEntityList< IfcProject > list;
 };
 
 class IfcProjectionCurve : public IfcAnnotationCurveOccurrence {
 public:
     virtual unsigned int getArgumentCount() const { return 3; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcAnnotationCurveOccurrence::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcAnnotationCurveOccurrence::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcAnnotationCurveOccurrence::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcProjectionCurve (IfcAbstractEntityPtr e);
-    IfcProjectionCurve (IfcRepresentationItem* v1_Item, SHARED_PTR< IfcTemplatedEntityList< IfcPresentationStyleAssignment > > v2_Styles, boost::optional< IfcLabel > v3_Name);
-    typedef IfcProjectionCurve* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcProjectionCurve > > list;
-    typedef IfcTemplatedEntityList< IfcProjectionCurve >::it it;
+    IfcProjectionCurve (IfcAbstractEntity* e);
+    IfcProjectionCurve (IfcRepresentationItem* v1_Item, IfcTemplatedEntityList< IfcPresentationStyleAssignment >::ptr v2_Styles, boost::optional< std::string > v3_Name);
+    typedef IfcTemplatedEntityList< IfcProjectionCurve > list;
 };
 /// IfcPropertySet defines all dynamically extensible
 /// properties. The property set is a container class that holds
@@ -20739,20 +21563,19 @@ class IfcProjectionCurve : public IfcAnnotationCurveOccurrence {
 class IfcPropertySet : public IfcPropertySetDefinition {
 public:
     /// Contained set of properties. For property sets defined as part of the IFC Object model, the property objects within a property set are defined as part of the standard. If a property is not contained within the set of predefined properties, its value has not been set at this time.
-    SHARED_PTR< IfcTemplatedEntityList< IfcProperty > > HasProperties();
-    void setHasProperties(SHARED_PTR< IfcTemplatedEntityList< IfcProperty > > v);
+    IfcTemplatedEntityList< IfcProperty >::ptr HasProperties() const;
+    void setHasProperties(IfcTemplatedEntityList< IfcProperty >::ptr v);
     virtual unsigned int getArgumentCount() const { return 5; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 4: return IfcUtil::Argument_ENTITY_LIST; } return IfcPropertySetDefinition::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 4: return Type::IfcProperty; } return IfcPropertySetDefinition::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 4: return "HasProperties"; } return IfcPropertySetDefinition::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcPropertySet (IfcAbstractEntityPtr e);
-    IfcPropertySet (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, SHARED_PTR< IfcTemplatedEntityList< IfcProperty > > v5_HasProperties);
-    typedef IfcPropertySet* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcPropertySet > > list;
-    typedef IfcTemplatedEntityList< IfcPropertySet >::it it;
+    IfcPropertySet (IfcAbstractEntity* e);
+    IfcPropertySet (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcTemplatedEntityList< IfcProperty >::ptr v5_HasProperties);
+    typedef IfcTemplatedEntityList< IfcPropertySet > list;
 };
 /// IfcProxy is intended to be a kind of a container for wrapping objects which are defined by associated properties, which may or may not have a geometric representation and placement in space. A proxy may have a semantic meaning, defined by the Name attribute, and property definitions, attached through the property assignment relationship, which definition may be outside of the definitions given by the current release of IFC.
 /// 
@@ -20773,25 +21596,24 @@ class IfcPropertySet : public IfcPropertySetDefinition {
 class IfcProxy : public IfcProduct {
 public:
     /// High level (and only) semantic meaning attached to the IfcProxy, defining the basic construct type behind the Proxy, e.g. Product or Process.
-    IfcObjectTypeEnum::IfcObjectTypeEnum ProxyType();
+    IfcObjectTypeEnum::IfcObjectTypeEnum ProxyType() const;
     void setProxyType(IfcObjectTypeEnum::IfcObjectTypeEnum v);
     /// Whether the optional attribute Tag is defined for this IfcProxy
-    bool hasTag();
+    bool hasTag() const;
     /// The tag (or label) identifier at the particular instance of a product, e.g. the serial number, or the position number. It is the identifier at the occurrence level.
-    IfcLabel Tag();
-    void setTag(IfcLabel v);
+    std::string Tag() const;
+    void setTag(std::string v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 7: return IfcUtil::Argument_ENUMERATION; case 8: return IfcUtil::Argument_STRING; } return IfcProduct::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 7: return Type::IfcObjectTypeEnum; case 8: return Type::IfcLabel; } return IfcProduct::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 7: return "ProxyType"; case 8: return "Tag"; } return IfcProduct::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcProxy (IfcAbstractEntityPtr e);
-    IfcProxy (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcObjectTypeEnum::IfcObjectTypeEnum v8_ProxyType, boost::optional< IfcLabel > v9_Tag);
-    typedef IfcProxy* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcProxy > > list;
-    typedef IfcTemplatedEntityList< IfcProxy >::it it;
+    IfcProxy (IfcAbstractEntity* e);
+    IfcProxy (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcObjectTypeEnum::IfcObjectTypeEnum v8_ProxyType, boost::optional< std::string > v9_Tag);
+    typedef IfcTemplatedEntityList< IfcProxy > list;
 };
 /// IfcRectangleHollowProfileDef defines a section profile that provides the defining parameters of a rectangular (or square) hollow section to be used by the swept surface geometry or the swept area solid. Its parameters and orientation relative to the position coordinate system are according to the following illustration. A square hollow section can be defined by equal values for h and b. The centre of the position coordinate system is in the profiles centre of the bounding box (for symmetric profiles identical with the centre of gravity). Normally, the longer sides are parallel to the y-axis, the shorter sides parallel to the x-axis.
 /// 
@@ -20816,30 +21638,29 @@ class IfcProxy : public IfcProduct {
 class IfcRectangleHollowProfileDef : public IfcRectangleProfileDef {
 public:
     /// Thickness of the material.
-    IfcPositiveLengthMeasure WallThickness();
-    void setWallThickness(IfcPositiveLengthMeasure v);
+    double WallThickness() const;
+    void setWallThickness(double v);
     /// Whether the optional attribute InnerFilletRadius is defined for this IfcRectangleHollowProfileDef
-    bool hasInnerFilletRadius();
+    bool hasInnerFilletRadius() const;
     /// Inner corner radius.
-    IfcPositiveLengthMeasure InnerFilletRadius();
-    void setInnerFilletRadius(IfcPositiveLengthMeasure v);
+    double InnerFilletRadius() const;
+    void setInnerFilletRadius(double v);
     /// Whether the optional attribute OuterFilletRadius is defined for this IfcRectangleHollowProfileDef
-    bool hasOuterFilletRadius();
+    bool hasOuterFilletRadius() const;
     /// Outer corner radius.
-    IfcPositiveLengthMeasure OuterFilletRadius();
-    void setOuterFilletRadius(IfcPositiveLengthMeasure v);
+    double OuterFilletRadius() const;
+    void setOuterFilletRadius(double v);
     virtual unsigned int getArgumentCount() const { return 8; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 5: return IfcUtil::Argument_DOUBLE; case 6: return IfcUtil::Argument_DOUBLE; case 7: return IfcUtil::Argument_DOUBLE; } return IfcRectangleProfileDef::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 5: return Type::IfcPositiveLengthMeasure; case 6: return Type::IfcPositiveLengthMeasure; case 7: return Type::IfcPositiveLengthMeasure; } return IfcRectangleProfileDef::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 5: return "WallThickness"; case 6: return "InnerFilletRadius"; case 7: return "OuterFilletRadius"; } return IfcRectangleProfileDef::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRectangleHollowProfileDef (IfcAbstractEntityPtr e);
-    IfcRectangleHollowProfileDef (IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< IfcLabel > v2_ProfileName, IfcAxis2Placement2D* v3_Position, IfcPositiveLengthMeasure v4_XDim, IfcPositiveLengthMeasure v5_YDim, IfcPositiveLengthMeasure v6_WallThickness, boost::optional< IfcPositiveLengthMeasure > v7_InnerFilletRadius, boost::optional< IfcPositiveLengthMeasure > v8_OuterFilletRadius);
-    typedef IfcRectangleHollowProfileDef* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRectangleHollowProfileDef > > list;
-    typedef IfcTemplatedEntityList< IfcRectangleHollowProfileDef >::it it;
+    IfcRectangleHollowProfileDef (IfcAbstractEntity* e);
+    IfcRectangleHollowProfileDef (IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< std::string > v2_ProfileName, IfcAxis2Placement2D* v3_Position, double v4_XDim, double v5_YDim, double v6_WallThickness, boost::optional< double > v7_InnerFilletRadius, boost::optional< double > v8_OuterFilletRadius);
+    typedef IfcTemplatedEntityList< IfcRectangleHollowProfileDef > list;
 };
 /// The IfcRectangularPyramid is a Construction Solid
 /// Geometry (CSG) 3D primitive. It is a solid with a rectangular base and
@@ -20932,26 +21753,25 @@ class IfcRectangleHollowProfileDef : public IfcRectangleProfileDef {
 class IfcRectangularPyramid : public IfcCsgPrimitive3D {
 public:
     /// The length of the base measured along the placement X axis. It is provided by the inherited axis placement through SELF\IfcCsgPrimitive3D.Position.P[1].
-    IfcPositiveLengthMeasure XLength();
-    void setXLength(IfcPositiveLengthMeasure v);
+    double XLength() const;
+    void setXLength(double v);
     /// The length of the base measured along the placement Y axis. It is provided by the inherited axis placement through SELF\IfcCsgPrimitive3D.Position.P[2].
-    IfcPositiveLengthMeasure YLength();
-    void setYLength(IfcPositiveLengthMeasure v);
+    double YLength() const;
+    void setYLength(double v);
     /// The height of the apex above the plane of the base, measured in the direction of the placement Z axis, the SELF\IfcCsgPrimitive3D.Position.P[2].
-    IfcPositiveLengthMeasure Height();
-    void setHeight(IfcPositiveLengthMeasure v);
+    double Height() const;
+    void setHeight(double v);
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 1: return IfcUtil::Argument_DOUBLE; case 2: return IfcUtil::Argument_DOUBLE; case 3: return IfcUtil::Argument_DOUBLE; } return IfcCsgPrimitive3D::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 1: return Type::IfcPositiveLengthMeasure; case 2: return Type::IfcPositiveLengthMeasure; case 3: return Type::IfcPositiveLengthMeasure; } return IfcCsgPrimitive3D::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 1: return "XLength"; case 2: return "YLength"; case 3: return "Height"; } return IfcCsgPrimitive3D::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRectangularPyramid (IfcAbstractEntityPtr e);
-    IfcRectangularPyramid (IfcAxis2Placement3D* v1_Position, IfcPositiveLengthMeasure v2_XLength, IfcPositiveLengthMeasure v3_YLength, IfcPositiveLengthMeasure v4_Height);
-    typedef IfcRectangularPyramid* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRectangularPyramid > > list;
-    typedef IfcTemplatedEntityList< IfcRectangularPyramid >::it it;
+    IfcRectangularPyramid (IfcAbstractEntity* e);
+    IfcRectangularPyramid (IfcAxis2Placement3D* v1_Position, double v2_XLength, double v3_YLength, double v4_Height);
+    typedef IfcTemplatedEntityList< IfcRectangularPyramid > list;
 };
 /// Definition from ISO/CD 10303-42:1992: The trimmed surface is a simple bounded surface in which the boundaries are the constant parametric lines u1 = u1, u2 = u2, v1 = v1 and v2 = v2. All these values shall be within the parametric range of the referenced surface. Cyclic properties of the parameter range are assumed.
 /// 
@@ -20971,38 +21791,37 @@ class IfcRectangularPyramid : public IfcCsgPrimitive3D {
 class IfcRectangularTrimmedSurface : public IfcBoundedSurface {
 public:
     /// Surface being trimmed.
-    IfcSurface* BasisSurface();
+    IfcSurface* BasisSurface() const;
     void setBasisSurface(IfcSurface* v);
     /// First u parametric value.
-    IfcParameterValue U1();
-    void setU1(IfcParameterValue v);
+    double U1() const;
+    void setU1(double v);
     /// First v parametric value.
-    IfcParameterValue V1();
-    void setV1(IfcParameterValue v);
+    double V1() const;
+    void setV1(double v);
     /// Second u parametric value.
-    IfcParameterValue U2();
-    void setU2(IfcParameterValue v);
+    double U2() const;
+    void setU2(double v);
     /// Second v parametric value.
-    IfcParameterValue V2();
-    void setV2(IfcParameterValue v);
+    double V2() const;
+    void setV2(double v);
     /// Flag to indicate whether the direction of the first parameter of the trimmed surface agrees with or opposes the sense of u in the basis surface.
-    bool Usense();
+    bool Usense() const;
     void setUsense(bool v);
     /// Flag to indicate whether the direction of the second parameter of the trimmed surface agrees with or opposes the sense of v in the basis surface.
-    bool Vsense();
+    bool Vsense() const;
     void setVsense(bool v);
     virtual unsigned int getArgumentCount() const { return 7; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY; case 1: return IfcUtil::Argument_DOUBLE; case 2: return IfcUtil::Argument_DOUBLE; case 3: return IfcUtil::Argument_DOUBLE; case 4: return IfcUtil::Argument_DOUBLE; case 5: return IfcUtil::Argument_BOOL; case 6: return IfcUtil::Argument_BOOL; } return IfcBoundedSurface::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcSurface; case 1: return Type::IfcParameterValue; case 2: return Type::IfcParameterValue; case 3: return Type::IfcParameterValue; case 4: return Type::IfcParameterValue; case 5: return Type::UNDEFINED; case 6: return Type::UNDEFINED; } return IfcBoundedSurface::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "BasisSurface"; case 1: return "U1"; case 2: return "V1"; case 3: return "U2"; case 4: return "V2"; case 5: return "Usense"; case 6: return "Vsense"; } return IfcBoundedSurface::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRectangularTrimmedSurface (IfcAbstractEntityPtr e);
-    IfcRectangularTrimmedSurface (IfcSurface* v1_BasisSurface, IfcParameterValue v2_U1, IfcParameterValue v3_V1, IfcParameterValue v4_U2, IfcParameterValue v5_V2, bool v6_Usense, bool v7_Vsense);
-    typedef IfcRectangularTrimmedSurface* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRectangularTrimmedSurface > > list;
-    typedef IfcTemplatedEntityList< IfcRectangularTrimmedSurface >::it it;
+    IfcRectangularTrimmedSurface (IfcAbstractEntity* e);
+    IfcRectangularTrimmedSurface (IfcSurface* v1_BasisSurface, double v2_U1, double v3_V1, double v4_U2, double v5_V2, bool v6_Usense, bool v7_Vsense);
+    typedef IfcTemplatedEntityList< IfcRectangularTrimmedSurface > list;
 };
 /// The assignment relationship, IfcRelAssigns, is a generalization of "link" relationships among instances of IfcObject and its various 1st level subtypes. A link denotes the specific association through which one object (the client) applies the services of other objects (the suppliers), or through which one object may navigate to other objects.
 /// 
@@ -21018,26 +21837,25 @@ class IfcRectangularTrimmedSurface : public IfcBoundedSurface {
 class IfcRelAssigns : public IfcRelationship {
 public:
     /// Related objects, which are assigned to a single object. The type of the single (or relating) object is defined in the subtypes of IfcRelAssigns.
-    SHARED_PTR< IfcTemplatedEntityList< IfcObjectDefinition > > RelatedObjects();
-    void setRelatedObjects(SHARED_PTR< IfcTemplatedEntityList< IfcObjectDefinition > > v);
+    IfcTemplatedEntityList< IfcObjectDefinition >::ptr RelatedObjects() const;
+    void setRelatedObjects(IfcTemplatedEntityList< IfcObjectDefinition >::ptr v);
     /// Whether the optional attribute RelatedObjectsType is defined for this IfcRelAssigns
-    bool hasRelatedObjectsType();
+    bool hasRelatedObjectsType() const;
     /// Particular type of the assignment relationship. It can constrain the applicable object types, used within the role of RelatedObjects.
     /// IFC2x4 CHANGE  The attribute is deprecated and shall no longer be used. A NIL value should always be assigned.
-    IfcObjectTypeEnum::IfcObjectTypeEnum RelatedObjectsType();
+    IfcObjectTypeEnum::IfcObjectTypeEnum RelatedObjectsType() const;
     void setRelatedObjectsType(IfcObjectTypeEnum::IfcObjectTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 6; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 4: return IfcUtil::Argument_ENTITY_LIST; case 5: return IfcUtil::Argument_ENUMERATION; } return IfcRelationship::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 4: return Type::IfcObjectDefinition; case 5: return Type::IfcObjectTypeEnum; } return IfcRelationship::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 4: return "RelatedObjects"; case 5: return "RelatedObjectsType"; } return IfcRelationship::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRelAssigns (IfcAbstractEntityPtr e);
-    IfcRelAssigns (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, SHARED_PTR< IfcTemplatedEntityList< IfcObjectDefinition > > v5_RelatedObjects, boost::optional< IfcObjectTypeEnum::IfcObjectTypeEnum > v6_RelatedObjectsType);
-    typedef IfcRelAssigns* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRelAssigns > > list;
-    typedef IfcTemplatedEntityList< IfcRelAssigns >::it it;
+    IfcRelAssigns (IfcAbstractEntity* e);
+    IfcRelAssigns (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcTemplatedEntityList< IfcObjectDefinition >::ptr v5_RelatedObjects, boost::optional< IfcObjectTypeEnum::IfcObjectTypeEnum > v6_RelatedObjectsType);
+    typedef IfcTemplatedEntityList< IfcRelAssigns > list;
 };
 /// The objectified relationship IfcRelAssignsToActor handles the assignment of objects (subtypes of IfcObject) to an actor (subtypes of IfcActor).
 /// 
@@ -21051,25 +21869,24 @@ class IfcRelAssigns : public IfcRelationship {
 class IfcRelAssignsToActor : public IfcRelAssigns {
 public:
     /// Reference to the information about the actor. It comprises the information about the person or organization and its addresses.
-    IfcActor* RelatingActor();
+    IfcActor* RelatingActor() const;
     void setRelatingActor(IfcActor* v);
     /// Whether the optional attribute ActingRole is defined for this IfcRelAssignsToActor
-    bool hasActingRole();
+    bool hasActingRole() const;
     /// Role of the actor played within the context of the assignment to the object(s).
-    IfcActorRole* ActingRole();
+    IfcActorRole* ActingRole() const;
     void setActingRole(IfcActorRole* v);
     virtual unsigned int getArgumentCount() const { return 8; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 6: return IfcUtil::Argument_ENTITY; case 7: return IfcUtil::Argument_ENTITY; } return IfcRelAssigns::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 6: return Type::IfcActor; case 7: return Type::IfcActorRole; } return IfcRelAssigns::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 6: return "RelatingActor"; case 7: return "ActingRole"; } return IfcRelAssigns::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRelAssignsToActor (IfcAbstractEntityPtr e);
-    IfcRelAssignsToActor (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, SHARED_PTR< IfcTemplatedEntityList< IfcObjectDefinition > > v5_RelatedObjects, boost::optional< IfcObjectTypeEnum::IfcObjectTypeEnum > v6_RelatedObjectsType, IfcActor* v7_RelatingActor, IfcActorRole* v8_ActingRole);
-    typedef IfcRelAssignsToActor* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRelAssignsToActor > > list;
-    typedef IfcTemplatedEntityList< IfcRelAssignsToActor >::it it;
+    IfcRelAssignsToActor (IfcAbstractEntity* e);
+    IfcRelAssignsToActor (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcTemplatedEntityList< IfcObjectDefinition >::ptr v5_RelatedObjects, boost::optional< IfcObjectTypeEnum::IfcObjectTypeEnum > v6_RelatedObjectsType, IfcActor* v7_RelatingActor, IfcActorRole* v8_ActingRole);
+    typedef IfcTemplatedEntityList< IfcRelAssignsToActor > list;
 };
 /// The objectified relationship IfcRelAssignsToControl handles the assignment of a control (represented by subtypes of IfcControl) to other objects (represented by subtypes of IfcObject, with the exception of controls).
 /// 
@@ -21079,20 +21896,19 @@ class IfcRelAssignsToActor : public IfcRelAssigns {
 class IfcRelAssignsToControl : public IfcRelAssigns {
 public:
     /// Reference to the IfcControl that applies a control upon objects.
-    IfcControl* RelatingControl();
+    IfcControl* RelatingControl() const;
     void setRelatingControl(IfcControl* v);
     virtual unsigned int getArgumentCount() const { return 7; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 6: return IfcUtil::Argument_ENTITY; } return IfcRelAssigns::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 6: return Type::IfcControl; } return IfcRelAssigns::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 6: return "RelatingControl"; } return IfcRelAssigns::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRelAssignsToControl (IfcAbstractEntityPtr e);
-    IfcRelAssignsToControl (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, SHARED_PTR< IfcTemplatedEntityList< IfcObjectDefinition > > v5_RelatedObjects, boost::optional< IfcObjectTypeEnum::IfcObjectTypeEnum > v6_RelatedObjectsType, IfcControl* v7_RelatingControl);
-    typedef IfcRelAssignsToControl* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRelAssignsToControl > > list;
-    typedef IfcTemplatedEntityList< IfcRelAssignsToControl >::it it;
+    IfcRelAssignsToControl (IfcAbstractEntity* e);
+    IfcRelAssignsToControl (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcTemplatedEntityList< IfcObjectDefinition >::ptr v5_RelatedObjects, boost::optional< IfcObjectTypeEnum::IfcObjectTypeEnum > v6_RelatedObjectsType, IfcControl* v7_RelatingControl);
+    typedef IfcTemplatedEntityList< IfcRelAssignsToControl > list;
 };
 /// The objectified relationship IfcRelAssignsToGroup handles the assignment of object definitions (individual object occurrences as subtypes of IfcObject, and object types as subtypes of IfcTypeObject) to a group (subtypes of IfcGroup).
 /// 
@@ -21110,20 +21926,19 @@ class IfcRelAssignsToControl : public IfcRelAssigns {
 class IfcRelAssignsToGroup : public IfcRelAssigns {
 public:
     /// Reference to group that contains all assigned group members.
-    IfcGroup* RelatingGroup();
+    IfcGroup* RelatingGroup() const;
     void setRelatingGroup(IfcGroup* v);
     virtual unsigned int getArgumentCount() const { return 7; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 6: return IfcUtil::Argument_ENTITY; } return IfcRelAssigns::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 6: return Type::IfcGroup; } return IfcRelAssigns::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 6: return "RelatingGroup"; } return IfcRelAssigns::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRelAssignsToGroup (IfcAbstractEntityPtr e);
-    IfcRelAssignsToGroup (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, SHARED_PTR< IfcTemplatedEntityList< IfcObjectDefinition > > v5_RelatedObjects, boost::optional< IfcObjectTypeEnum::IfcObjectTypeEnum > v6_RelatedObjectsType, IfcGroup* v7_RelatingGroup);
-    typedef IfcRelAssignsToGroup* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRelAssignsToGroup > > list;
-    typedef IfcTemplatedEntityList< IfcRelAssignsToGroup >::it it;
+    IfcRelAssignsToGroup (IfcAbstractEntity* e);
+    IfcRelAssignsToGroup (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcTemplatedEntityList< IfcObjectDefinition >::ptr v5_RelatedObjects, boost::optional< IfcObjectTypeEnum::IfcObjectTypeEnum > v6_RelatedObjectsType, IfcGroup* v7_RelatingGroup);
+    typedef IfcTemplatedEntityList< IfcRelAssignsToGroup > list;
 };
 /// The objectified relationship IfcRelAssignsToProcess handles the assignment of one or many objects to a process or activity. An object can be a product that is the item the process operates on. Processes and activities can operate on things other than products, and can operate in ways other than input and output.
 /// 
@@ -21152,25 +21967,24 @@ class IfcRelAssignsToProcess : public IfcRelAssigns {
     /// Reference to the process to which the objects are assigned to.
     /// 
     /// IFC2x4 CHANGE Datatype expanded to include IfcProcess and IfcTypeProcess.
-    IfcProcess* RelatingProcess();
+    IfcProcess* RelatingProcess() const;
     void setRelatingProcess(IfcProcess* v);
     /// Whether the optional attribute QuantityInProcess is defined for this IfcRelAssignsToProcess
-    bool hasQuantityInProcess();
+    bool hasQuantityInProcess() const;
     /// Quantity of the object specific for the operation by this process.
-    IfcMeasureWithUnit* QuantityInProcess();
+    IfcMeasureWithUnit* QuantityInProcess() const;
     void setQuantityInProcess(IfcMeasureWithUnit* v);
     virtual unsigned int getArgumentCount() const { return 8; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 6: return IfcUtil::Argument_ENTITY; case 7: return IfcUtil::Argument_ENTITY; } return IfcRelAssigns::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 6: return Type::IfcProcess; case 7: return Type::IfcMeasureWithUnit; } return IfcRelAssigns::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 6: return "RelatingProcess"; case 7: return "QuantityInProcess"; } return IfcRelAssigns::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRelAssignsToProcess (IfcAbstractEntityPtr e);
-    IfcRelAssignsToProcess (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, SHARED_PTR< IfcTemplatedEntityList< IfcObjectDefinition > > v5_RelatedObjects, boost::optional< IfcObjectTypeEnum::IfcObjectTypeEnum > v6_RelatedObjectsType, IfcProcess* v7_RelatingProcess, IfcMeasureWithUnit* v8_QuantityInProcess);
-    typedef IfcRelAssignsToProcess* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRelAssignsToProcess > > list;
-    typedef IfcTemplatedEntityList< IfcRelAssignsToProcess >::it it;
+    IfcRelAssignsToProcess (IfcAbstractEntity* e);
+    IfcRelAssignsToProcess (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcTemplatedEntityList< IfcObjectDefinition >::ptr v5_RelatedObjects, boost::optional< IfcObjectTypeEnum::IfcObjectTypeEnum > v6_RelatedObjectsType, IfcProcess* v7_RelatingProcess, IfcMeasureWithUnit* v8_QuantityInProcess);
+    typedef IfcTemplatedEntityList< IfcRelAssignsToProcess > list;
 };
 /// The objectified relationshipÿIfcRelAssignsToProduct handles the assignment of objects (subtypes of IfcObject) to a product (subtypes of IfcProduct). The Name attribute should be used to classify the usage of the IfcRelAssignsToProduct objectified relationship. The following Name values are proposed:
 /// 
@@ -21185,36 +21999,34 @@ class IfcRelAssignsToProduct : public IfcRelAssigns {
     /// Reference to the product or product type to which the objects are assigned to.
     /// 
     /// IFC2x4 CHANGE Datatype expanded to include IfcProduct and IfcTypeProduct.
-    IfcProduct* RelatingProduct();
+    IfcProduct* RelatingProduct() const;
     void setRelatingProduct(IfcProduct* v);
     virtual unsigned int getArgumentCount() const { return 7; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 6: return IfcUtil::Argument_ENTITY; } return IfcRelAssigns::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 6: return Type::IfcProduct; } return IfcRelAssigns::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 6: return "RelatingProduct"; } return IfcRelAssigns::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRelAssignsToProduct (IfcAbstractEntityPtr e);
-    IfcRelAssignsToProduct (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, SHARED_PTR< IfcTemplatedEntityList< IfcObjectDefinition > > v5_RelatedObjects, boost::optional< IfcObjectTypeEnum::IfcObjectTypeEnum > v6_RelatedObjectsType, IfcProduct* v7_RelatingProduct);
-    typedef IfcRelAssignsToProduct* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRelAssignsToProduct > > list;
-    typedef IfcTemplatedEntityList< IfcRelAssignsToProduct >::it it;
+    IfcRelAssignsToProduct (IfcAbstractEntity* e);
+    IfcRelAssignsToProduct (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcTemplatedEntityList< IfcObjectDefinition >::ptr v5_RelatedObjects, boost::optional< IfcObjectTypeEnum::IfcObjectTypeEnum > v6_RelatedObjectsType, IfcProduct* v7_RelatingProduct);
+    typedef IfcTemplatedEntityList< IfcRelAssignsToProduct > list;
 };
 
 class IfcRelAssignsToProjectOrder : public IfcRelAssignsToControl {
 public:
     virtual unsigned int getArgumentCount() const { return 7; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcRelAssignsToControl::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcRelAssignsToControl::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcRelAssignsToControl::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRelAssignsToProjectOrder (IfcAbstractEntityPtr e);
-    IfcRelAssignsToProjectOrder (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, SHARED_PTR< IfcTemplatedEntityList< IfcObjectDefinition > > v5_RelatedObjects, boost::optional< IfcObjectTypeEnum::IfcObjectTypeEnum > v6_RelatedObjectsType, IfcControl* v7_RelatingControl);
-    typedef IfcRelAssignsToProjectOrder* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRelAssignsToProjectOrder > > list;
-    typedef IfcTemplatedEntityList< IfcRelAssignsToProjectOrder >::it it;
+    IfcRelAssignsToProjectOrder (IfcAbstractEntity* e);
+    IfcRelAssignsToProjectOrder (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcTemplatedEntityList< IfcObjectDefinition >::ptr v5_RelatedObjects, boost::optional< IfcObjectTypeEnum::IfcObjectTypeEnum > v6_RelatedObjectsType, IfcControl* v7_RelatingControl);
+    typedef IfcTemplatedEntityList< IfcRelAssignsToProjectOrder > list;
 };
 /// The objectified relationship IfcRelAssignsToResource handles the assignment of objects
 /// (as subtypes of IfcObject), acting as a resource usage or consumption, to a resource (as subtypes of IfcResource).
@@ -21227,20 +22039,19 @@ class IfcRelAssignsToResource : public IfcRelAssigns {
     /// Reference to the resource to which the objects are assigned to.
     /// 
     /// IFC2x4 CHANGE Datatype expanded to include IfcResource and IfcTypeResource.
-    IfcResource* RelatingResource();
+    IfcResource* RelatingResource() const;
     void setRelatingResource(IfcResource* v);
     virtual unsigned int getArgumentCount() const { return 7; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 6: return IfcUtil::Argument_ENTITY; } return IfcRelAssigns::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 6: return Type::IfcResource; } return IfcRelAssigns::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 6: return "RelatingResource"; } return IfcRelAssigns::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRelAssignsToResource (IfcAbstractEntityPtr e);
-    IfcRelAssignsToResource (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, SHARED_PTR< IfcTemplatedEntityList< IfcObjectDefinition > > v5_RelatedObjects, boost::optional< IfcObjectTypeEnum::IfcObjectTypeEnum > v6_RelatedObjectsType, IfcResource* v7_RelatingResource);
-    typedef IfcRelAssignsToResource* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRelAssignsToResource > > list;
-    typedef IfcTemplatedEntityList< IfcRelAssignsToResource >::it it;
+    IfcRelAssignsToResource (IfcAbstractEntity* e);
+    IfcRelAssignsToResource (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcTemplatedEntityList< IfcObjectDefinition >::ptr v5_RelatedObjects, boost::optional< IfcObjectTypeEnum::IfcObjectTypeEnum > v6_RelatedObjectsType, IfcResource* v7_RelatingResource);
+    typedef IfcTemplatedEntityList< IfcRelAssignsToResource > list;
 };
 /// The association relationship
 ///   IfcRelAssociates refers to external sources of
@@ -21288,38 +22099,36 @@ class IfcRelAssociates : public IfcRelationship {
     /// Set of object or property definitions to which the external references or information is associated. It includes object and type objects, property set templates, property templates and property sets and contexts.
     /// 
     /// IFC2x4 CHANGE  The attribute datatype has been changed from IfcRoot to IfcDefinitionSelect.
-    SHARED_PTR< IfcTemplatedEntityList< IfcRoot > > RelatedObjects();
-    void setRelatedObjects(SHARED_PTR< IfcTemplatedEntityList< IfcRoot > > v);
+    IfcTemplatedEntityList< IfcRoot >::ptr RelatedObjects() const;
+    void setRelatedObjects(IfcTemplatedEntityList< IfcRoot >::ptr v);
     virtual unsigned int getArgumentCount() const { return 5; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 4: return IfcUtil::Argument_ENTITY_LIST; } return IfcRelationship::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 4: return Type::IfcRoot; } return IfcRelationship::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 4: return "RelatedObjects"; } return IfcRelationship::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRelAssociates (IfcAbstractEntityPtr e);
-    IfcRelAssociates (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, SHARED_PTR< IfcTemplatedEntityList< IfcRoot > > v5_RelatedObjects);
-    typedef IfcRelAssociates* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRelAssociates > > list;
-    typedef IfcTemplatedEntityList< IfcRelAssociates >::it it;
+    IfcRelAssociates (IfcAbstractEntity* e);
+    IfcRelAssociates (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcTemplatedEntityList< IfcRoot >::ptr v5_RelatedObjects);
+    typedef IfcTemplatedEntityList< IfcRelAssociates > list;
 };
 
 class IfcRelAssociatesAppliedValue : public IfcRelAssociates {
 public:
-    IfcAppliedValue* RelatingAppliedValue();
+    IfcAppliedValue* RelatingAppliedValue() const;
     void setRelatingAppliedValue(IfcAppliedValue* v);
     virtual unsigned int getArgumentCount() const { return 6; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 5: return IfcUtil::Argument_ENTITY; } return IfcRelAssociates::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 5: return Type::IfcAppliedValue; } return IfcRelAssociates::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 5: return "RelatingAppliedValue"; } return IfcRelAssociates::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRelAssociatesAppliedValue (IfcAbstractEntityPtr e);
-    IfcRelAssociatesAppliedValue (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, SHARED_PTR< IfcTemplatedEntityList< IfcRoot > > v5_RelatedObjects, IfcAppliedValue* v6_RelatingAppliedValue);
-    typedef IfcRelAssociatesAppliedValue* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRelAssociatesAppliedValue > > list;
-    typedef IfcTemplatedEntityList< IfcRelAssociatesAppliedValue >::it it;
+    IfcRelAssociatesAppliedValue (IfcAbstractEntity* e);
+    IfcRelAssociatesAppliedValue (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcTemplatedEntityList< IfcRoot >::ptr v5_RelatedObjects, IfcAppliedValue* v6_RelatingAppliedValue);
+    typedef IfcTemplatedEntityList< IfcRelAssociatesAppliedValue > list;
 };
 /// The entity IfcRelAssociatesApproval is used to apply approval information defined by IfcApproval, in IfcApprovalResource schema, to subtypes of IfcRoot.
 /// 
@@ -21327,20 +22136,19 @@ class IfcRelAssociatesAppliedValue : public IfcRelAssociates {
 class IfcRelAssociatesApproval : public IfcRelAssociates {
 public:
     /// Reference to approval that is being applied using this relationship.
-    IfcApproval* RelatingApproval();
+    IfcApproval* RelatingApproval() const;
     void setRelatingApproval(IfcApproval* v);
     virtual unsigned int getArgumentCount() const { return 6; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 5: return IfcUtil::Argument_ENTITY; } return IfcRelAssociates::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 5: return Type::IfcApproval; } return IfcRelAssociates::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 5: return "RelatingApproval"; } return IfcRelAssociates::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRelAssociatesApproval (IfcAbstractEntityPtr e);
-    IfcRelAssociatesApproval (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, SHARED_PTR< IfcTemplatedEntityList< IfcRoot > > v5_RelatedObjects, IfcApproval* v6_RelatingApproval);
-    typedef IfcRelAssociatesApproval* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRelAssociatesApproval > > list;
-    typedef IfcTemplatedEntityList< IfcRelAssociatesApproval >::it it;
+    IfcRelAssociatesApproval (IfcAbstractEntity* e);
+    IfcRelAssociatesApproval (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcTemplatedEntityList< IfcRoot >::ptr v5_RelatedObjects, IfcApproval* v6_RelatingApproval);
+    typedef IfcTemplatedEntityList< IfcRelAssociatesApproval > list;
 };
 /// The objectified relationship
 /// IfcRelAssociatesClassification handles the assignment of a
@@ -21375,20 +22183,19 @@ class IfcRelAssociatesApproval : public IfcRelAssociates {
 class IfcRelAssociatesClassification : public IfcRelAssociates {
 public:
     /// Classification applied to the objects.
-    IfcClassificationNotationSelect RelatingClassification();
-    void setRelatingClassification(IfcClassificationNotationSelect v);
+    IfcClassificationNotationSelect* RelatingClassification() const;
+    void setRelatingClassification(IfcClassificationNotationSelect* v);
     virtual unsigned int getArgumentCount() const { return 6; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 5: return IfcUtil::Argument_ENTITY; } return IfcRelAssociates::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 5: return Type::IfcClassificationNotationSelect; } return IfcRelAssociates::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 5: return "RelatingClassification"; } return IfcRelAssociates::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRelAssociatesClassification (IfcAbstractEntityPtr e);
-    IfcRelAssociatesClassification (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, SHARED_PTR< IfcTemplatedEntityList< IfcRoot > > v5_RelatedObjects, IfcClassificationNotationSelect v6_RelatingClassification);
-    typedef IfcRelAssociatesClassification* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRelAssociatesClassification > > list;
-    typedef IfcTemplatedEntityList< IfcRelAssociatesClassification >::it it;
+    IfcRelAssociatesClassification (IfcAbstractEntity* e);
+    IfcRelAssociatesClassification (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcTemplatedEntityList< IfcRoot >::ptr v5_RelatedObjects, IfcClassificationNotationSelect* v6_RelatingClassification);
+    typedef IfcTemplatedEntityList< IfcRelAssociatesClassification > list;
 };
 /// The entity IfcRelAssociatesConstraint is used to apply constraint information defined by IfcConstraint, in the IfcConstraintResource schema, to subtypes of IfcRoot.
 /// 
@@ -21396,23 +22203,22 @@ class IfcRelAssociatesClassification : public IfcRelAssociates {
 class IfcRelAssociatesConstraint : public IfcRelAssociates {
 public:
     /// The intent of the constraint usage with regard to its related IfcConstraint and IfcObjects, IfcPropertyDefinitions or IfcRelationships. Typical values can be e.g. RATIONALE or EXPECTED PERFORMANCE.
-    IfcLabel Intent();
-    void setIntent(IfcLabel v);
+    std::string Intent() const;
+    void setIntent(std::string v);
     /// Reference to constraint that is being applied using this relationship.
-    IfcConstraint* RelatingConstraint();
+    IfcConstraint* RelatingConstraint() const;
     void setRelatingConstraint(IfcConstraint* v);
     virtual unsigned int getArgumentCount() const { return 7; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 5: return IfcUtil::Argument_STRING; case 6: return IfcUtil::Argument_ENTITY; } return IfcRelAssociates::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 5: return Type::IfcLabel; case 6: return Type::IfcConstraint; } return IfcRelAssociates::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 5: return "Intent"; case 6: return "RelatingConstraint"; } return IfcRelAssociates::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRelAssociatesConstraint (IfcAbstractEntityPtr e);
-    IfcRelAssociatesConstraint (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, SHARED_PTR< IfcTemplatedEntityList< IfcRoot > > v5_RelatedObjects, IfcLabel v6_Intent, IfcConstraint* v7_RelatingConstraint);
-    typedef IfcRelAssociatesConstraint* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRelAssociatesConstraint > > list;
-    typedef IfcTemplatedEntityList< IfcRelAssociatesConstraint >::it it;
+    IfcRelAssociatesConstraint (IfcAbstractEntity* e);
+    IfcRelAssociatesConstraint (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcTemplatedEntityList< IfcRoot >::ptr v5_RelatedObjects, std::string v6_Intent, IfcConstraint* v7_RelatingConstraint);
+    typedef IfcTemplatedEntityList< IfcRelAssociatesConstraint > list;
 };
 /// The objectified relationship (IfcRelAssociatesDocument) handles the assignment of a document information (items of the select IfcDocumentSelect) to objects occurrences (subtypes of IfcObject) or object types (subtypes of IfcTypeObject).
 /// 
@@ -21424,20 +22230,19 @@ class IfcRelAssociatesConstraint : public IfcRelAssociates {
 class IfcRelAssociatesDocument : public IfcRelAssociates {
 public:
     /// Document information or reference which is applied to the objects.
-    IfcDocumentSelect RelatingDocument();
-    void setRelatingDocument(IfcDocumentSelect v);
+    IfcDocumentSelect* RelatingDocument() const;
+    void setRelatingDocument(IfcDocumentSelect* v);
     virtual unsigned int getArgumentCount() const { return 6; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 5: return IfcUtil::Argument_ENTITY; } return IfcRelAssociates::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 5: return Type::IfcDocumentSelect; } return IfcRelAssociates::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 5: return "RelatingDocument"; } return IfcRelAssociates::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRelAssociatesDocument (IfcAbstractEntityPtr e);
-    IfcRelAssociatesDocument (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, SHARED_PTR< IfcTemplatedEntityList< IfcRoot > > v5_RelatedObjects, IfcDocumentSelect v6_RelatingDocument);
-    typedef IfcRelAssociatesDocument* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRelAssociatesDocument > > list;
-    typedef IfcTemplatedEntityList< IfcRelAssociatesDocument >::it it;
+    IfcRelAssociatesDocument (IfcAbstractEntity* e);
+    IfcRelAssociatesDocument (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcTemplatedEntityList< IfcRoot >::ptr v5_RelatedObjects, IfcDocumentSelect* v6_RelatingDocument);
+    typedef IfcTemplatedEntityList< IfcRelAssociatesDocument > list;
 };
 /// The objectified relationship (IfcRelAssociatesLibrary) handles the assignment of a library item (items of the select IfcLibrarySelect) to subtypes of IfcObjectDefinition or IfcPropertyDefinition. 
 /// 
@@ -21449,20 +22254,19 @@ class IfcRelAssociatesDocument : public IfcRelAssociates {
 class IfcRelAssociatesLibrary : public IfcRelAssociates {
 public:
     /// Reference to a library, from which the definition of the property set is taken.
-    IfcLibrarySelect RelatingLibrary();
-    void setRelatingLibrary(IfcLibrarySelect v);
+    IfcLibrarySelect* RelatingLibrary() const;
+    void setRelatingLibrary(IfcLibrarySelect* v);
     virtual unsigned int getArgumentCount() const { return 6; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 5: return IfcUtil::Argument_ENTITY; } return IfcRelAssociates::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 5: return Type::IfcLibrarySelect; } return IfcRelAssociates::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 5: return "RelatingLibrary"; } return IfcRelAssociates::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRelAssociatesLibrary (IfcAbstractEntityPtr e);
-    IfcRelAssociatesLibrary (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, SHARED_PTR< IfcTemplatedEntityList< IfcRoot > > v5_RelatedObjects, IfcLibrarySelect v6_RelatingLibrary);
-    typedef IfcRelAssociatesLibrary* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRelAssociatesLibrary > > list;
-    typedef IfcTemplatedEntityList< IfcRelAssociatesLibrary >::it it;
+    IfcRelAssociatesLibrary (IfcAbstractEntity* e);
+    IfcRelAssociatesLibrary (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcTemplatedEntityList< IfcRoot >::ptr v5_RelatedObjects, IfcLibrarySelect* v6_RelatingLibrary);
+    typedef IfcTemplatedEntityList< IfcRelAssociatesLibrary > list;
 };
 /// Definition from IAI: Objectified relationship between a
 /// material definition and elements or element types to which this
@@ -21561,46 +22365,44 @@ class IfcRelAssociatesLibrary : public IfcRelAssociates {
 class IfcRelAssociatesMaterial : public IfcRelAssociates {
 public:
     /// Material definition assigned to the elements or element types.
-    IfcMaterialSelect RelatingMaterial();
-    void setRelatingMaterial(IfcMaterialSelect v);
+    IfcMaterialSelect* RelatingMaterial() const;
+    void setRelatingMaterial(IfcMaterialSelect* v);
     virtual unsigned int getArgumentCount() const { return 6; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 5: return IfcUtil::Argument_ENTITY; } return IfcRelAssociates::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 5: return Type::IfcMaterialSelect; } return IfcRelAssociates::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 5: return "RelatingMaterial"; } return IfcRelAssociates::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRelAssociatesMaterial (IfcAbstractEntityPtr e);
-    IfcRelAssociatesMaterial (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, SHARED_PTR< IfcTemplatedEntityList< IfcRoot > > v5_RelatedObjects, IfcMaterialSelect v6_RelatingMaterial);
-    typedef IfcRelAssociatesMaterial* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRelAssociatesMaterial > > list;
-    typedef IfcTemplatedEntityList< IfcRelAssociatesMaterial >::it it;
+    IfcRelAssociatesMaterial (IfcAbstractEntity* e);
+    IfcRelAssociatesMaterial (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcTemplatedEntityList< IfcRoot >::ptr v5_RelatedObjects, IfcMaterialSelect* v6_RelatingMaterial);
+    typedef IfcTemplatedEntityList< IfcRelAssociatesMaterial > list;
 };
 
 class IfcRelAssociatesProfileProperties : public IfcRelAssociates {
 public:
-    IfcProfileProperties* RelatingProfileProperties();
+    IfcProfileProperties* RelatingProfileProperties() const;
     void setRelatingProfileProperties(IfcProfileProperties* v);
     /// Whether the optional attribute ProfileSectionLocation is defined for this IfcRelAssociatesProfileProperties
-    bool hasProfileSectionLocation();
-    IfcShapeAspect* ProfileSectionLocation();
+    bool hasProfileSectionLocation() const;
+    IfcShapeAspect* ProfileSectionLocation() const;
     void setProfileSectionLocation(IfcShapeAspect* v);
     /// Whether the optional attribute ProfileOrientation is defined for this IfcRelAssociatesProfileProperties
-    bool hasProfileOrientation();
-    IfcOrientationSelect ProfileOrientation();
-    void setProfileOrientation(IfcOrientationSelect v);
+    bool hasProfileOrientation() const;
+    IfcOrientationSelect* ProfileOrientation() const;
+    void setProfileOrientation(IfcOrientationSelect* v);
     virtual unsigned int getArgumentCount() const { return 8; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 5: return IfcUtil::Argument_ENTITY; case 6: return IfcUtil::Argument_ENTITY; case 7: return IfcUtil::Argument_ENTITY; } return IfcRelAssociates::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 5: return Type::IfcProfileProperties; case 6: return Type::IfcShapeAspect; case 7: return Type::IfcOrientationSelect; } return IfcRelAssociates::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 5: return "RelatingProfileProperties"; case 6: return "ProfileSectionLocation"; case 7: return "ProfileOrientation"; } return IfcRelAssociates::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRelAssociatesProfileProperties (IfcAbstractEntityPtr e);
-    IfcRelAssociatesProfileProperties (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, SHARED_PTR< IfcTemplatedEntityList< IfcRoot > > v5_RelatedObjects, IfcProfileProperties* v6_RelatingProfileProperties, IfcShapeAspect* v7_ProfileSectionLocation, boost::optional< IfcOrientationSelect > v8_ProfileOrientation);
-    typedef IfcRelAssociatesProfileProperties* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRelAssociatesProfileProperties > > list;
-    typedef IfcTemplatedEntityList< IfcRelAssociatesProfileProperties >::it it;
+    IfcRelAssociatesProfileProperties (IfcAbstractEntity* e);
+    IfcRelAssociatesProfileProperties (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcTemplatedEntityList< IfcRoot >::ptr v5_RelatedObjects, IfcProfileProperties* v6_RelatingProfileProperties, IfcShapeAspect* v7_ProfileSectionLocation, IfcOrientationSelect* v8_ProfileOrientation);
+    typedef IfcTemplatedEntityList< IfcRelAssociatesProfileProperties > list;
 };
 /// IfcRelConnects is a connectivity relationship that connects objects under some criteria. As a general connectivity it does not imply constraints, however subtypes of the relationship define the applicable object types for the connectivity relationship and the semantics of the particular connectivity. 
 /// 
@@ -21609,16 +22411,15 @@ class IfcRelConnects : public IfcRelationship {
 public:
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcRelationship::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcRelationship::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcRelationship::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRelConnects (IfcAbstractEntityPtr e);
-    IfcRelConnects (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description);
-    typedef IfcRelConnects* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRelConnects > > list;
-    typedef IfcTemplatedEntityList< IfcRelConnects >::it it;
+    IfcRelConnects (IfcAbstractEntity* e);
+    IfcRelConnects (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description);
+    typedef IfcTemplatedEntityList< IfcRelConnects > list;
 };
 /// Definition from IAI: The
 ///   IfcRelConnectsElements objectified relationship
@@ -21645,28 +22446,27 @@ class IfcRelConnects : public IfcRelationship {
 class IfcRelConnectsElements : public IfcRelConnects {
 public:
     /// Whether the optional attribute ConnectionGeometry is defined for this IfcRelConnectsElements
-    bool hasConnectionGeometry();
+    bool hasConnectionGeometry() const;
     /// The geometric shape representation of the connection geometry that is provided in the object coordinate system of the RelatingElement (mandatory) and in the object coordinate system of the RelatedElement (optionally).
-    IfcConnectionGeometry* ConnectionGeometry();
+    IfcConnectionGeometry* ConnectionGeometry() const;
     void setConnectionGeometry(IfcConnectionGeometry* v);
     /// Reference to a subtype of IfcElement that is connected by the connection relationship in the role of RelatingElement.
-    IfcElement* RelatingElement();
+    IfcElement* RelatingElement() const;
     void setRelatingElement(IfcElement* v);
     /// Reference to a subtype of IfcElement that is connected by the connection relationship in the role of RelatedElement.
-    IfcElement* RelatedElement();
+    IfcElement* RelatedElement() const;
     void setRelatedElement(IfcElement* v);
     virtual unsigned int getArgumentCount() const { return 7; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 4: return IfcUtil::Argument_ENTITY; case 5: return IfcUtil::Argument_ENTITY; case 6: return IfcUtil::Argument_ENTITY; } return IfcRelConnects::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 4: return Type::IfcConnectionGeometry; case 5: return Type::IfcElement; case 6: return Type::IfcElement; } return IfcRelConnects::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 4: return "ConnectionGeometry"; case 5: return "RelatingElement"; case 6: return "RelatedElement"; } return IfcRelConnects::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRelConnectsElements (IfcAbstractEntityPtr e);
-    IfcRelConnectsElements (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, IfcConnectionGeometry* v5_ConnectionGeometry, IfcElement* v6_RelatingElement, IfcElement* v7_RelatedElement);
-    typedef IfcRelConnectsElements* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRelConnectsElements > > list;
-    typedef IfcTemplatedEntityList< IfcRelConnectsElements >::it it;
+    IfcRelConnectsElements (IfcAbstractEntity* e);
+    IfcRelConnectsElements (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcConnectionGeometry* v5_ConnectionGeometry, IfcElement* v6_RelatingElement, IfcElement* v7_RelatedElement);
+    typedef IfcTemplatedEntityList< IfcRelConnectsElements > list;
 };
 /// The
 /// IfcRelConnectsPathElements relationship provides the connectivity information between two elements, which have path information.
@@ -21703,29 +22503,28 @@ class IfcRelConnectsElements : public IfcRelConnects {
 class IfcRelConnectsPathElements : public IfcRelConnectsElements {
 public:
     /// Priorities for connection. It refers to the layers of the RelatingObject.
-    std::vector< int > /*[0:?]*/ RelatingPriorities();
+    std::vector< int > /*[0:?]*/ RelatingPriorities() const;
     void setRelatingPriorities(std::vector< int > /*[0:?]*/ v);
     /// Priorities for connection. It refers to the layers of the RelatedObject.
-    std::vector< int > /*[0:?]*/ RelatedPriorities();
+    std::vector< int > /*[0:?]*/ RelatedPriorities() const;
     void setRelatedPriorities(std::vector< int > /*[0:?]*/ v);
     /// Indication of the connection type in relation to the path of the RelatingObject.
-    IfcConnectionTypeEnum::IfcConnectionTypeEnum RelatedConnectionType();
+    IfcConnectionTypeEnum::IfcConnectionTypeEnum RelatedConnectionType() const;
     void setRelatedConnectionType(IfcConnectionTypeEnum::IfcConnectionTypeEnum v);
     /// Indication of the connection type in relation to the path of the RelatingObject.
-    IfcConnectionTypeEnum::IfcConnectionTypeEnum RelatingConnectionType();
+    IfcConnectionTypeEnum::IfcConnectionTypeEnum RelatingConnectionType() const;
     void setRelatingConnectionType(IfcConnectionTypeEnum::IfcConnectionTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 11; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 7: return IfcUtil::Argument_VECTOR_INT; case 8: return IfcUtil::Argument_VECTOR_INT; case 9: return IfcUtil::Argument_ENUMERATION; case 10: return IfcUtil::Argument_ENUMERATION; } return IfcRelConnectsElements::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 7: return Type::UNDEFINED; case 8: return Type::UNDEFINED; case 9: return Type::IfcConnectionTypeEnum; case 10: return Type::IfcConnectionTypeEnum; } return IfcRelConnectsElements::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 7: return "RelatingPriorities"; case 8: return "RelatedPriorities"; case 9: return "RelatedConnectionType"; case 10: return "RelatingConnectionType"; } return IfcRelConnectsElements::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRelConnectsPathElements (IfcAbstractEntityPtr e);
-    IfcRelConnectsPathElements (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, IfcConnectionGeometry* v5_ConnectionGeometry, IfcElement* v6_RelatingElement, IfcElement* v7_RelatedElement, std::vector< int > /*[0:?]*/ v8_RelatingPriorities, std::vector< int > /*[0:?]*/ v9_RelatedPriorities, IfcConnectionTypeEnum::IfcConnectionTypeEnum v10_RelatedConnectionType, IfcConnectionTypeEnum::IfcConnectionTypeEnum v11_RelatingConnectionType);
-    typedef IfcRelConnectsPathElements* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRelConnectsPathElements > > list;
-    typedef IfcTemplatedEntityList< IfcRelConnectsPathElements >::it it;
+    IfcRelConnectsPathElements (IfcAbstractEntity* e);
+    IfcRelConnectsPathElements (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcConnectionGeometry* v5_ConnectionGeometry, IfcElement* v6_RelatingElement, IfcElement* v7_RelatedElement, std::vector< int > /*[0:?]*/ v8_RelatingPriorities, std::vector< int > /*[0:?]*/ v9_RelatedPriorities, IfcConnectionTypeEnum::IfcConnectionTypeEnum v10_RelatedConnectionType, IfcConnectionTypeEnum::IfcConnectionTypeEnum v11_RelatingConnectionType);
+    typedef IfcTemplatedEntityList< IfcRelConnectsPathElements > list;
 };
 /// The objectified relationship
 /// IfcRelConnectsPortToElement defines the relationship that
@@ -21755,25 +22554,24 @@ class IfcRelConnectsPathElements : public IfcRelConnectsElements {
 class IfcRelConnectsPortToElement : public IfcRelConnects {
 public:
     /// Reference to an Port that is connected by the objectified relationship.
-    IfcPort* RelatingPort();
+    IfcPort* RelatingPort() const;
     void setRelatingPort(IfcPort* v);
     /// Reference to an IfcElement, or IfcElementType that has ports assigned.
     /// 
     /// IFC2x4 CHANGE  Data type extended to IfcObjectDefinition to enable elements and element types for the port relationship.
-    IfcElement* RelatedElement();
+    IfcElement* RelatedElement() const;
     void setRelatedElement(IfcElement* v);
     virtual unsigned int getArgumentCount() const { return 6; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 4: return IfcUtil::Argument_ENTITY; case 5: return IfcUtil::Argument_ENTITY; } return IfcRelConnects::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 4: return Type::IfcPort; case 5: return Type::IfcElement; } return IfcRelConnects::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 4: return "RelatingPort"; case 5: return "RelatedElement"; } return IfcRelConnects::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRelConnectsPortToElement (IfcAbstractEntityPtr e);
-    IfcRelConnectsPortToElement (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, IfcPort* v5_RelatingPort, IfcElement* v6_RelatedElement);
-    typedef IfcRelConnectsPortToElement* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRelConnectsPortToElement > > list;
-    typedef IfcTemplatedEntityList< IfcRelConnectsPortToElement >::it it;
+    IfcRelConnectsPortToElement (IfcAbstractEntity* e);
+    IfcRelConnectsPortToElement (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcPort* v5_RelatingPort, IfcElement* v6_RelatedElement);
+    typedef IfcTemplatedEntityList< IfcRelConnectsPortToElement > list;
 };
 /// Definition from IAI: An IfcRelConnectsPorts
 ///   defines the relationship that is made between two ports at
@@ -21791,28 +22589,27 @@ class IfcRelConnectsPortToElement : public IfcRelConnects {
 class IfcRelConnectsPorts : public IfcRelConnects {
 public:
     /// Reference to the first port that is connected by the objectified relationship.
-    IfcPort* RelatingPort();
+    IfcPort* RelatingPort() const;
     void setRelatingPort(IfcPort* v);
     /// Reference to the second port that is connected by the objectified relationship.
-    IfcPort* RelatedPort();
+    IfcPort* RelatedPort() const;
     void setRelatedPort(IfcPort* v);
     /// Whether the optional attribute RealizingElement is defined for this IfcRelConnectsPorts
-    bool hasRealizingElement();
+    bool hasRealizingElement() const;
     /// Defines the element that realizes a port connection relationship.
-    IfcElement* RealizingElement();
+    IfcElement* RealizingElement() const;
     void setRealizingElement(IfcElement* v);
     virtual unsigned int getArgumentCount() const { return 7; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 4: return IfcUtil::Argument_ENTITY; case 5: return IfcUtil::Argument_ENTITY; case 6: return IfcUtil::Argument_ENTITY; } return IfcRelConnects::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 4: return Type::IfcPort; case 5: return Type::IfcPort; case 6: return Type::IfcElement; } return IfcRelConnects::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 4: return "RelatingPort"; case 5: return "RelatedPort"; case 6: return "RealizingElement"; } return IfcRelConnects::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRelConnectsPorts (IfcAbstractEntityPtr e);
-    IfcRelConnectsPorts (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, IfcPort* v5_RelatingPort, IfcPort* v6_RelatedPort, IfcElement* v7_RealizingElement);
-    typedef IfcRelConnectsPorts* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRelConnectsPorts > > list;
-    typedef IfcTemplatedEntityList< IfcRelConnectsPorts >::it it;
+    IfcRelConnectsPorts (IfcAbstractEntity* e);
+    IfcRelConnectsPorts (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcPort* v5_RelatingPort, IfcPort* v6_RelatedPort, IfcElement* v7_RealizingElement);
+    typedef IfcTemplatedEntityList< IfcRelConnectsPorts > list;
 };
 /// Definition from IAI: The IfcRelConnectsStructuralActivity relationship connects a structural activity (either an action or reaction) to a structural member, structural connection, or element.
 /// 
@@ -21820,43 +22617,41 @@ class IfcRelConnectsPorts : public IfcRelConnects {
 class IfcRelConnectsStructuralActivity : public IfcRelConnects {
 public:
     /// Reference to a structural item or element to which the specified activity is applied.
-    IfcStructuralActivityAssignmentSelect RelatingElement();
-    void setRelatingElement(IfcStructuralActivityAssignmentSelect v);
+    IfcStructuralActivityAssignmentSelect* RelatingElement() const;
+    void setRelatingElement(IfcStructuralActivityAssignmentSelect* v);
     /// Reference to a structural activity which is acting upon the specified structural item or element.
-    IfcStructuralActivity* RelatedStructuralActivity();
+    IfcStructuralActivity* RelatedStructuralActivity() const;
     void setRelatedStructuralActivity(IfcStructuralActivity* v);
     virtual unsigned int getArgumentCount() const { return 6; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 4: return IfcUtil::Argument_ENTITY; case 5: return IfcUtil::Argument_ENTITY; } return IfcRelConnects::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 4: return Type::IfcStructuralActivityAssignmentSelect; case 5: return Type::IfcStructuralActivity; } return IfcRelConnects::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 4: return "RelatingElement"; case 5: return "RelatedStructuralActivity"; } return IfcRelConnects::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRelConnectsStructuralActivity (IfcAbstractEntityPtr e);
-    IfcRelConnectsStructuralActivity (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, IfcStructuralActivityAssignmentSelect v5_RelatingElement, IfcStructuralActivity* v6_RelatedStructuralActivity);
-    typedef IfcRelConnectsStructuralActivity* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRelConnectsStructuralActivity > > list;
-    typedef IfcTemplatedEntityList< IfcRelConnectsStructuralActivity >::it it;
+    IfcRelConnectsStructuralActivity (IfcAbstractEntity* e);
+    IfcRelConnectsStructuralActivity (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcStructuralActivityAssignmentSelect* v5_RelatingElement, IfcStructuralActivity* v6_RelatedStructuralActivity);
+    typedef IfcTemplatedEntityList< IfcRelConnectsStructuralActivity > list;
 };
 
 class IfcRelConnectsStructuralElement : public IfcRelConnects {
 public:
-    IfcElement* RelatingElement();
+    IfcElement* RelatingElement() const;
     void setRelatingElement(IfcElement* v);
-    IfcStructuralMember* RelatedStructuralMember();
+    IfcStructuralMember* RelatedStructuralMember() const;
     void setRelatedStructuralMember(IfcStructuralMember* v);
     virtual unsigned int getArgumentCount() const { return 6; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 4: return IfcUtil::Argument_ENTITY; case 5: return IfcUtil::Argument_ENTITY; } return IfcRelConnects::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 4: return Type::IfcElement; case 5: return Type::IfcStructuralMember; } return IfcRelConnects::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 4: return "RelatingElement"; case 5: return "RelatedStructuralMember"; } return IfcRelConnects::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRelConnectsStructuralElement (IfcAbstractEntityPtr e);
-    IfcRelConnectsStructuralElement (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, IfcElement* v5_RelatingElement, IfcStructuralMember* v6_RelatedStructuralMember);
-    typedef IfcRelConnectsStructuralElement* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRelConnectsStructuralElement > > list;
-    typedef IfcTemplatedEntityList< IfcRelConnectsStructuralElement >::it it;
+    IfcRelConnectsStructuralElement (IfcAbstractEntity* e);
+    IfcRelConnectsStructuralElement (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcElement* v5_RelatingElement, IfcStructuralMember* v6_RelatedStructuralMember);
+    typedef IfcTemplatedEntityList< IfcRelConnectsStructuralElement > list;
 };
 /// The entity IfcRelConnectsStructuralMember defines all needed properties describing the connection between structural members and structural connection objects (nodes or supports).
 /// 
@@ -21885,43 +22680,42 @@ class IfcRelConnectsStructuralElement : public IfcRelConnects {
 class IfcRelConnectsStructuralMember : public IfcRelConnects {
 public:
     /// Reference to an instance of IfcStructuralMember (or its subclasses) which is connected to the specified structural connection.
-    IfcStructuralMember* RelatingStructuralMember();
+    IfcStructuralMember* RelatingStructuralMember() const;
     void setRelatingStructuralMember(IfcStructuralMember* v);
     /// Reference to an instance of IfcStructuralConnection (or its subclasses) which is connected to the specified structural member.
-    IfcStructuralConnection* RelatedStructuralConnection();
+    IfcStructuralConnection* RelatedStructuralConnection() const;
     void setRelatedStructuralConnection(IfcStructuralConnection* v);
     /// Whether the optional attribute AppliedCondition is defined for this IfcRelConnectsStructuralMember
-    bool hasAppliedCondition();
+    bool hasAppliedCondition() const;
     /// Conditions which define the connections properties.  Connection conditions are often called "release" but are not only used to define mechanisms like hinges but also rigid, elastic, and other conditions.
-    IfcBoundaryCondition* AppliedCondition();
+    IfcBoundaryCondition* AppliedCondition() const;
     void setAppliedCondition(IfcBoundaryCondition* v);
     /// Whether the optional attribute AdditionalConditions is defined for this IfcRelConnectsStructuralMember
-    bool hasAdditionalConditions();
+    bool hasAdditionalConditions() const;
     /// Describes additional connection properties.
-    IfcStructuralConnectionCondition* AdditionalConditions();
+    IfcStructuralConnectionCondition* AdditionalConditions() const;
     void setAdditionalConditions(IfcStructuralConnectionCondition* v);
     /// Whether the optional attribute SupportedLength is defined for this IfcRelConnectsStructuralMember
-    bool hasSupportedLength();
+    bool hasSupportedLength() const;
     /// Defines the 'supported length' of this structural connection. See Fig. for more detail.
-    IfcLengthMeasure SupportedLength();
-    void setSupportedLength(IfcLengthMeasure v);
+    double SupportedLength() const;
+    void setSupportedLength(double v);
     /// Whether the optional attribute ConditionCoordinateSystem is defined for this IfcRelConnectsStructuralMember
-    bool hasConditionCoordinateSystem();
+    bool hasConditionCoordinateSystem() const;
     /// Defines a coordinate system used for the description of the connection properties in ConnectionCondition relative to the local coordinate system of RelatingStructuralMember.  If left unspecified, the placement IfcAxis2Placement3D((x,y,z), ?, ?) is implied with x,y,z being the local member coordinates where the connection is made and the default axes directions being in parallel with the local axes of RelatingStructuralMember.
-    IfcAxis2Placement3D* ConditionCoordinateSystem();
+    IfcAxis2Placement3D* ConditionCoordinateSystem() const;
     void setConditionCoordinateSystem(IfcAxis2Placement3D* v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 4: return IfcUtil::Argument_ENTITY; case 5: return IfcUtil::Argument_ENTITY; case 6: return IfcUtil::Argument_ENTITY; case 7: return IfcUtil::Argument_ENTITY; case 8: return IfcUtil::Argument_DOUBLE; case 9: return IfcUtil::Argument_ENTITY; } return IfcRelConnects::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 4: return Type::IfcStructuralMember; case 5: return Type::IfcStructuralConnection; case 6: return Type::IfcBoundaryCondition; case 7: return Type::IfcStructuralConnectionCondition; case 8: return Type::IfcLengthMeasure; case 9: return Type::IfcAxis2Placement3D; } return IfcRelConnects::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 4: return "RelatingStructuralMember"; case 5: return "RelatedStructuralConnection"; case 6: return "AppliedCondition"; case 7: return "AdditionalConditions"; case 8: return "SupportedLength"; case 9: return "ConditionCoordinateSystem"; } return IfcRelConnects::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRelConnectsStructuralMember (IfcAbstractEntityPtr e);
-    IfcRelConnectsStructuralMember (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, IfcStructuralMember* v5_RelatingStructuralMember, IfcStructuralConnection* v6_RelatedStructuralConnection, IfcBoundaryCondition* v7_AppliedCondition, IfcStructuralConnectionCondition* v8_AdditionalConditions, boost::optional< IfcLengthMeasure > v9_SupportedLength, IfcAxis2Placement3D* v10_ConditionCoordinateSystem);
-    typedef IfcRelConnectsStructuralMember* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRelConnectsStructuralMember > > list;
-    typedef IfcTemplatedEntityList< IfcRelConnectsStructuralMember >::it it;
+    IfcRelConnectsStructuralMember (IfcAbstractEntity* e);
+    IfcRelConnectsStructuralMember (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcStructuralMember* v5_RelatingStructuralMember, IfcStructuralConnection* v6_RelatedStructuralConnection, IfcBoundaryCondition* v7_AppliedCondition, IfcStructuralConnectionCondition* v8_AdditionalConditions, boost::optional< double > v9_SupportedLength, IfcAxis2Placement3D* v10_ConditionCoordinateSystem);
+    typedef IfcTemplatedEntityList< IfcRelConnectsStructuralMember > list;
 };
 /// Definition from IAI: The entity IfcRelConnectsWithEccentricity adds the definition of eccentricity to the connection between a structural member and a structural connection (representing either a node or support).
 /// 
@@ -21943,20 +22737,19 @@ class IfcRelConnectsStructuralMember : public IfcRelConnects {
 class IfcRelConnectsWithEccentricity : public IfcRelConnectsStructuralMember {
 public:
     /// The connection constraint explicitly states the eccentricity between a structural member and a structural connection by means of two topological objects (vertex and vertex, or edge and edge, or face and face).
-    IfcConnectionGeometry* ConnectionConstraint();
+    IfcConnectionGeometry* ConnectionConstraint() const;
     void setConnectionConstraint(IfcConnectionGeometry* v);
     virtual unsigned int getArgumentCount() const { return 11; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 10: return IfcUtil::Argument_ENTITY; } return IfcRelConnectsStructuralMember::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 10: return Type::IfcConnectionGeometry; } return IfcRelConnectsStructuralMember::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 10: return "ConnectionConstraint"; } return IfcRelConnectsStructuralMember::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRelConnectsWithEccentricity (IfcAbstractEntityPtr e);
-    IfcRelConnectsWithEccentricity (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, IfcStructuralMember* v5_RelatingStructuralMember, IfcStructuralConnection* v6_RelatedStructuralConnection, IfcBoundaryCondition* v7_AppliedCondition, IfcStructuralConnectionCondition* v8_AdditionalConditions, boost::optional< IfcLengthMeasure > v9_SupportedLength, IfcAxis2Placement3D* v10_ConditionCoordinateSystem, IfcConnectionGeometry* v11_ConnectionConstraint);
-    typedef IfcRelConnectsWithEccentricity* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRelConnectsWithEccentricity > > list;
-    typedef IfcTemplatedEntityList< IfcRelConnectsWithEccentricity >::it it;
+    IfcRelConnectsWithEccentricity (IfcAbstractEntity* e);
+    IfcRelConnectsWithEccentricity (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcStructuralMember* v5_RelatingStructuralMember, IfcStructuralConnection* v6_RelatedStructuralConnection, IfcBoundaryCondition* v7_AppliedCondition, IfcStructuralConnectionCondition* v8_AdditionalConditions, boost::optional< double > v9_SupportedLength, IfcAxis2Placement3D* v10_ConditionCoordinateSystem, IfcConnectionGeometry* v11_ConnectionConstraint);
+    typedef IfcTemplatedEntityList< IfcRelConnectsWithEccentricity > list;
 };
 /// Definition from IAI:
 ///   IfcRelConnectsWithRealizingElements defines a
@@ -21984,25 +22777,24 @@ class IfcRelConnectsWithEccentricity : public IfcRelConnectsStructuralMember {
 class IfcRelConnectsWithRealizingElements : public IfcRelConnectsElements {
 public:
     /// Defines the elements that realize a connection relationship.
-    SHARED_PTR< IfcTemplatedEntityList< IfcElement > > RealizingElements();
-    void setRealizingElements(SHARED_PTR< IfcTemplatedEntityList< IfcElement > > v);
+    IfcTemplatedEntityList< IfcElement >::ptr RealizingElements() const;
+    void setRealizingElements(IfcTemplatedEntityList< IfcElement >::ptr v);
     /// Whether the optional attribute ConnectionType is defined for this IfcRelConnectsWithRealizingElements
-    bool hasConnectionType();
+    bool hasConnectionType() const;
     /// The type of the connection given for informal purposes, it may include labels, like 'joint', 'rigid joint', 'flexible joint', etc.
-    IfcLabel ConnectionType();
-    void setConnectionType(IfcLabel v);
+    std::string ConnectionType() const;
+    void setConnectionType(std::string v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 7: return IfcUtil::Argument_ENTITY_LIST; case 8: return IfcUtil::Argument_STRING; } return IfcRelConnectsElements::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 7: return Type::IfcElement; case 8: return Type::IfcLabel; } return IfcRelConnectsElements::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 7: return "RealizingElements"; case 8: return "ConnectionType"; } return IfcRelConnectsElements::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRelConnectsWithRealizingElements (IfcAbstractEntityPtr e);
-    IfcRelConnectsWithRealizingElements (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, IfcConnectionGeometry* v5_ConnectionGeometry, IfcElement* v6_RelatingElement, IfcElement* v7_RelatedElement, SHARED_PTR< IfcTemplatedEntityList< IfcElement > > v8_RealizingElements, boost::optional< IfcLabel > v9_ConnectionType);
-    typedef IfcRelConnectsWithRealizingElements* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRelConnectsWithRealizingElements > > list;
-    typedef IfcTemplatedEntityList< IfcRelConnectsWithRealizingElements >::it it;
+    IfcRelConnectsWithRealizingElements (IfcAbstractEntity* e);
+    IfcRelConnectsWithRealizingElements (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcConnectionGeometry* v5_ConnectionGeometry, IfcElement* v6_RelatingElement, IfcElement* v7_RelatedElement, IfcTemplatedEntityList< IfcElement >::ptr v8_RealizingElements, boost::optional< std::string > v9_ConnectionType);
+    typedef IfcTemplatedEntityList< IfcRelConnectsWithRealizingElements > list;
 };
 /// This objectified relationship,
 ///   IfcRelContainedInSpatialStructure, is used to assign
@@ -22071,23 +22863,22 @@ class IfcRelContainedInSpatialStructure : public IfcRelConnects {
     /// Set of elements products, which are contained within this level of the spatial structure hierarchy.
     /// 
     /// IFC2x PLATFORM CHANGE  The data type has been changed from IfcElement to IfcProduct with upward compatibility
-    SHARED_PTR< IfcTemplatedEntityList< IfcProduct > > RelatedElements();
-    void setRelatedElements(SHARED_PTR< IfcTemplatedEntityList< IfcProduct > > v);
+    IfcTemplatedEntityList< IfcProduct >::ptr RelatedElements() const;
+    void setRelatedElements(IfcTemplatedEntityList< IfcProduct >::ptr v);
     /// Spatial structure element, within which the element is contained. Any element can only be contained within one element of the project spatial structure.
-    IfcSpatialStructureElement* RelatingStructure();
+    IfcSpatialStructureElement* RelatingStructure() const;
     void setRelatingStructure(IfcSpatialStructureElement* v);
     virtual unsigned int getArgumentCount() const { return 6; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 4: return IfcUtil::Argument_ENTITY_LIST; case 5: return IfcUtil::Argument_ENTITY; } return IfcRelConnects::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 4: return Type::IfcProduct; case 5: return Type::IfcSpatialStructureElement; } return IfcRelConnects::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 4: return "RelatedElements"; case 5: return "RelatingStructure"; } return IfcRelConnects::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRelContainedInSpatialStructure (IfcAbstractEntityPtr e);
-    IfcRelContainedInSpatialStructure (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, SHARED_PTR< IfcTemplatedEntityList< IfcProduct > > v5_RelatedElements, IfcSpatialStructureElement* v6_RelatingStructure);
-    typedef IfcRelContainedInSpatialStructure* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRelContainedInSpatialStructure > > list;
-    typedef IfcTemplatedEntityList< IfcRelContainedInSpatialStructure >::it it;
+    IfcRelContainedInSpatialStructure (IfcAbstractEntity* e);
+    IfcRelContainedInSpatialStructure (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcTemplatedEntityList< IfcProduct >::ptr v5_RelatedElements, IfcSpatialStructureElement* v6_RelatingStructure);
+    typedef IfcTemplatedEntityList< IfcRelContainedInSpatialStructure > list;
 };
 /// Definition from IAI: The
 /// IfcRelCoversBldgElements is an objectified relationship
@@ -22110,23 +22901,22 @@ class IfcRelCoversBldgElements : public IfcRelConnects {
     /// Relationship to the building element that is covered. 
     /// 
     /// IFC2x4 CHANGE: The attribute type has been changed from IfcElement to IfcBuildingElement.
-    IfcElement* RelatingBuildingElement();
+    IfcElement* RelatingBuildingElement() const;
     void setRelatingBuildingElement(IfcElement* v);
     /// Relationship to the set of coverings at this element.
-    SHARED_PTR< IfcTemplatedEntityList< IfcCovering > > RelatedCoverings();
-    void setRelatedCoverings(SHARED_PTR< IfcTemplatedEntityList< IfcCovering > > v);
+    IfcTemplatedEntityList< IfcCovering >::ptr RelatedCoverings() const;
+    void setRelatedCoverings(IfcTemplatedEntityList< IfcCovering >::ptr v);
     virtual unsigned int getArgumentCount() const { return 6; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 4: return IfcUtil::Argument_ENTITY; case 5: return IfcUtil::Argument_ENTITY_LIST; } return IfcRelConnects::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 4: return Type::IfcElement; case 5: return Type::IfcCovering; } return IfcRelConnects::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 4: return "RelatingBuildingElement"; case 5: return "RelatedCoverings"; } return IfcRelConnects::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRelCoversBldgElements (IfcAbstractEntityPtr e);
-    IfcRelCoversBldgElements (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, IfcElement* v5_RelatingBuildingElement, SHARED_PTR< IfcTemplatedEntityList< IfcCovering > > v6_RelatedCoverings);
-    typedef IfcRelCoversBldgElements* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRelCoversBldgElements > > list;
-    typedef IfcTemplatedEntityList< IfcRelCoversBldgElements >::it it;
+    IfcRelCoversBldgElements (IfcAbstractEntity* e);
+    IfcRelCoversBldgElements (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcElement* v5_RelatingBuildingElement, IfcTemplatedEntityList< IfcCovering >::ptr v6_RelatedCoverings);
+    typedef IfcTemplatedEntityList< IfcRelCoversBldgElements > list;
 };
 /// Definition from IAI: The objectified relationship,
 ///   IfcRelCoversSpace, relatesÿa space object to one or
@@ -22156,23 +22946,22 @@ class IfcRelCoversBldgElements : public IfcRelConnects {
 ///   IFC 2x Edition 3.
 class IfcRelCoversSpaces : public IfcRelConnects {
 public:
-    IfcSpace* RelatedSpace();
+    IfcSpace* RelatedSpace() const;
     void setRelatedSpace(IfcSpace* v);
     /// Relationship to the set of coverings covering this space.
-    SHARED_PTR< IfcTemplatedEntityList< IfcCovering > > RelatedCoverings();
-    void setRelatedCoverings(SHARED_PTR< IfcTemplatedEntityList< IfcCovering > > v);
+    IfcTemplatedEntityList< IfcCovering >::ptr RelatedCoverings() const;
+    void setRelatedCoverings(IfcTemplatedEntityList< IfcCovering >::ptr v);
     virtual unsigned int getArgumentCount() const { return 6; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 4: return IfcUtil::Argument_ENTITY; case 5: return IfcUtil::Argument_ENTITY_LIST; } return IfcRelConnects::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 4: return Type::IfcSpace; case 5: return Type::IfcCovering; } return IfcRelConnects::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 4: return "RelatedSpace"; case 5: return "RelatedCoverings"; } return IfcRelConnects::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRelCoversSpaces (IfcAbstractEntityPtr e);
-    IfcRelCoversSpaces (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, IfcSpace* v5_RelatedSpace, SHARED_PTR< IfcTemplatedEntityList< IfcCovering > > v6_RelatedCoverings);
-    typedef IfcRelCoversSpaces* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRelCoversSpaces > > list;
-    typedef IfcTemplatedEntityList< IfcRelCoversSpaces >::it it;
+    IfcRelCoversSpaces (IfcAbstractEntity* e);
+    IfcRelCoversSpaces (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcSpace* v5_RelatedSpace, IfcTemplatedEntityList< IfcCovering >::ptr v6_RelatedCoverings);
+    typedef IfcTemplatedEntityList< IfcRelCoversSpaces > list;
 };
 /// The decomposition relationship,
 /// IfcRelDecomposes, defines the general concept of elements
@@ -22206,22 +22995,21 @@ class IfcRelCoversSpaces : public IfcRelConnects {
 /// IFC2x4 CHANGE The differentiation between the aggregation and nesting is determined to be a non-ordered or an ordered collection of parts. The attributes RelatingObject and RelatedObjects have been demoted to the subtypes.
 class IfcRelDecomposes : public IfcRelationship {
 public:
-    IfcObjectDefinition* RelatingObject();
+    IfcObjectDefinition* RelatingObject() const;
     void setRelatingObject(IfcObjectDefinition* v);
-    SHARED_PTR< IfcTemplatedEntityList< IfcObjectDefinition > > RelatedObjects();
-    void setRelatedObjects(SHARED_PTR< IfcTemplatedEntityList< IfcObjectDefinition > > v);
+    IfcTemplatedEntityList< IfcObjectDefinition >::ptr RelatedObjects() const;
+    void setRelatedObjects(IfcTemplatedEntityList< IfcObjectDefinition >::ptr v);
     virtual unsigned int getArgumentCount() const { return 6; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 4: return IfcUtil::Argument_ENTITY; case 5: return IfcUtil::Argument_ENTITY_LIST; } return IfcRelationship::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 4: return Type::IfcObjectDefinition; case 5: return Type::IfcObjectDefinition; } return IfcRelationship::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 4: return "RelatingObject"; case 5: return "RelatedObjects"; } return IfcRelationship::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRelDecomposes (IfcAbstractEntityPtr e);
-    IfcRelDecomposes (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, IfcObjectDefinition* v5_RelatingObject, SHARED_PTR< IfcTemplatedEntityList< IfcObjectDefinition > > v6_RelatedObjects);
-    typedef IfcRelDecomposes* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRelDecomposes > > list;
-    typedef IfcTemplatedEntityList< IfcRelDecomposes >::it it;
+    IfcRelDecomposes (IfcAbstractEntity* e);
+    IfcRelDecomposes (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcObjectDefinition* v5_RelatingObject, IfcTemplatedEntityList< IfcObjectDefinition >::ptr v6_RelatedObjects);
+    typedef IfcTemplatedEntityList< IfcRelDecomposes > list;
 };
 /// A generic and abstract relationship which subtypes are used to:
 /// 
@@ -22252,20 +23040,19 @@ class IfcRelDecomposes : public IfcRelationship {
 /// IfcRelDefinesByType.
 class IfcRelDefines : public IfcRelationship {
 public:
-    SHARED_PTR< IfcTemplatedEntityList< IfcObject > > RelatedObjects();
-    void setRelatedObjects(SHARED_PTR< IfcTemplatedEntityList< IfcObject > > v);
+    IfcTemplatedEntityList< IfcObject >::ptr RelatedObjects() const;
+    void setRelatedObjects(IfcTemplatedEntityList< IfcObject >::ptr v);
     virtual unsigned int getArgumentCount() const { return 5; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 4: return IfcUtil::Argument_ENTITY_LIST; } return IfcRelationship::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 4: return Type::IfcObject; } return IfcRelationship::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 4: return "RelatedObjects"; } return IfcRelationship::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRelDefines (IfcAbstractEntityPtr e);
-    IfcRelDefines (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, SHARED_PTR< IfcTemplatedEntityList< IfcObject > > v5_RelatedObjects);
-    typedef IfcRelDefines* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRelDefines > > list;
-    typedef IfcTemplatedEntityList< IfcRelDefines >::it it;
+    IfcRelDefines (IfcAbstractEntity* e);
+    IfcRelDefines (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcTemplatedEntityList< IfcObject >::ptr v5_RelatedObjects);
+    typedef IfcTemplatedEntityList< IfcRelDefines > list;
 };
 /// The objectified relationship
 /// IfcRelDefinesByProperties defines the relationships
@@ -22285,20 +23072,19 @@ class IfcRelDefines : public IfcRelationship {
 class IfcRelDefinesByProperties : public IfcRelDefines {
 public:
     /// Reference to the property set definition for that object or set of objects.
-    IfcPropertySetDefinition* RelatingPropertyDefinition();
+    IfcPropertySetDefinition* RelatingPropertyDefinition() const;
     void setRelatingPropertyDefinition(IfcPropertySetDefinition* v);
     virtual unsigned int getArgumentCount() const { return 6; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 5: return IfcUtil::Argument_ENTITY; } return IfcRelDefines::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 5: return Type::IfcPropertySetDefinition; } return IfcRelDefines::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 5: return "RelatingPropertyDefinition"; } return IfcRelDefines::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRelDefinesByProperties (IfcAbstractEntityPtr e);
-    IfcRelDefinesByProperties (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, SHARED_PTR< IfcTemplatedEntityList< IfcObject > > v5_RelatedObjects, IfcPropertySetDefinition* v6_RelatingPropertyDefinition);
-    typedef IfcRelDefinesByProperties* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRelDefinesByProperties > > list;
-    typedef IfcTemplatedEntityList< IfcRelDefinesByProperties >::it it;
+    IfcRelDefinesByProperties (IfcAbstractEntity* e);
+    IfcRelDefinesByProperties (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcTemplatedEntityList< IfcObject >::ptr v5_RelatedObjects, IfcPropertySetDefinition* v6_RelatingPropertyDefinition);
+    typedef IfcTemplatedEntityList< IfcRelDefinesByProperties > list;
 };
 /// The objectified relationship
 /// IfcRelDefinesByType defines the relationship between an
@@ -22374,20 +23160,19 @@ class IfcRelDefinesByProperties : public IfcRelDefines {
 class IfcRelDefinesByType : public IfcRelDefines {
 public:
     /// Reference to the type (or style) information for that object or set of objects.
-    IfcTypeObject* RelatingType();
+    IfcTypeObject* RelatingType() const;
     void setRelatingType(IfcTypeObject* v);
     virtual unsigned int getArgumentCount() const { return 6; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 5: return IfcUtil::Argument_ENTITY; } return IfcRelDefines::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 5: return Type::IfcTypeObject; } return IfcRelDefines::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 5: return "RelatingType"; } return IfcRelDefines::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRelDefinesByType (IfcAbstractEntityPtr e);
-    IfcRelDefinesByType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, SHARED_PTR< IfcTemplatedEntityList< IfcObject > > v5_RelatedObjects, IfcTypeObject* v6_RelatingType);
-    typedef IfcRelDefinesByType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRelDefinesByType > > list;
-    typedef IfcTemplatedEntityList< IfcRelDefinesByType >::it it;
+    IfcRelDefinesByType (IfcAbstractEntity* e);
+    IfcRelDefinesByType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcTemplatedEntityList< IfcObject >::ptr v5_RelatedObjects, IfcTypeObject* v6_RelatingType);
+    typedef IfcTemplatedEntityList< IfcRelDefinesByType > list;
 };
 /// IfcRelFillsElement is an objectified relationship between an opening element and an element that fills (or partially fills) the opening element. It is an one-to-one relationship.
 /// 
@@ -22401,25 +23186,24 @@ class IfcRelDefinesByType : public IfcRelDefines {
 class IfcRelFillsElement : public IfcRelConnects {
 public:
     /// Opening Element being filled by virtue of this relationship.
-    IfcOpeningElement* RelatingOpeningElement();
+    IfcOpeningElement* RelatingOpeningElement() const;
     void setRelatingOpeningElement(IfcOpeningElement* v);
     /// Reference to building element that occupies fully or partially the associated opening.
     /// 
     /// IFC2x PLATFORM CHANGE: The data type has been changed from IfcBuildingElement to IfcElement with upward compatibility for file based exchange.
-    IfcElement* RelatedBuildingElement();
+    IfcElement* RelatedBuildingElement() const;
     void setRelatedBuildingElement(IfcElement* v);
     virtual unsigned int getArgumentCount() const { return 6; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 4: return IfcUtil::Argument_ENTITY; case 5: return IfcUtil::Argument_ENTITY; } return IfcRelConnects::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 4: return Type::IfcOpeningElement; case 5: return Type::IfcElement; } return IfcRelConnects::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 4: return "RelatingOpeningElement"; case 5: return "RelatedBuildingElement"; } return IfcRelConnects::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRelFillsElement (IfcAbstractEntityPtr e);
-    IfcRelFillsElement (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, IfcOpeningElement* v5_RelatingOpeningElement, IfcElement* v6_RelatedBuildingElement);
-    typedef IfcRelFillsElement* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRelFillsElement > > list;
-    typedef IfcTemplatedEntityList< IfcRelFillsElement >::it it;
+    IfcRelFillsElement (IfcAbstractEntity* e);
+    IfcRelFillsElement (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcOpeningElement* v5_RelatingOpeningElement, IfcElement* v6_RelatedBuildingElement);
+    typedef IfcTemplatedEntityList< IfcRelFillsElement > list;
 };
 /// Objectified relationship between a distribution flow element occurrence instance and one-to-many control element occurrence instances indicating that the control element(s) sense or control some aspect of the flow element. It is applied to IfcDistributionFlowElement and IfcDistributionControlElement.
 /// 
@@ -22431,55 +23215,53 @@ class IfcRelFillsElement : public IfcRelConnects {
 class IfcRelFlowControlElements : public IfcRelConnects {
 public:
     /// References control elements which may be used to impart control on the Distribution Element.
-    SHARED_PTR< IfcTemplatedEntityList< IfcDistributionControlElement > > RelatedControlElements();
-    void setRelatedControlElements(SHARED_PTR< IfcTemplatedEntityList< IfcDistributionControlElement > > v);
+    IfcTemplatedEntityList< IfcDistributionControlElement >::ptr RelatedControlElements() const;
+    void setRelatedControlElements(IfcTemplatedEntityList< IfcDistributionControlElement >::ptr v);
     /// Relationship to a distribution flow element
-    IfcDistributionFlowElement* RelatingFlowElement();
+    IfcDistributionFlowElement* RelatingFlowElement() const;
     void setRelatingFlowElement(IfcDistributionFlowElement* v);
     virtual unsigned int getArgumentCount() const { return 6; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 4: return IfcUtil::Argument_ENTITY_LIST; case 5: return IfcUtil::Argument_ENTITY; } return IfcRelConnects::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 4: return Type::IfcDistributionControlElement; case 5: return Type::IfcDistributionFlowElement; } return IfcRelConnects::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 4: return "RelatedControlElements"; case 5: return "RelatingFlowElement"; } return IfcRelConnects::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRelFlowControlElements (IfcAbstractEntityPtr e);
-    IfcRelFlowControlElements (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, SHARED_PTR< IfcTemplatedEntityList< IfcDistributionControlElement > > v5_RelatedControlElements, IfcDistributionFlowElement* v6_RelatingFlowElement);
-    typedef IfcRelFlowControlElements* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRelFlowControlElements > > list;
-    typedef IfcTemplatedEntityList< IfcRelFlowControlElements >::it it;
+    IfcRelFlowControlElements (IfcAbstractEntity* e);
+    IfcRelFlowControlElements (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcTemplatedEntityList< IfcDistributionControlElement >::ptr v5_RelatedControlElements, IfcDistributionFlowElement* v6_RelatingFlowElement);
+    typedef IfcTemplatedEntityList< IfcRelFlowControlElements > list;
 };
 
 class IfcRelInteractionRequirements : public IfcRelConnects {
 public:
     /// Whether the optional attribute DailyInteraction is defined for this IfcRelInteractionRequirements
-    bool hasDailyInteraction();
-    IfcCountMeasure DailyInteraction();
-    void setDailyInteraction(IfcCountMeasure v);
+    bool hasDailyInteraction() const;
+    double DailyInteraction() const;
+    void setDailyInteraction(double v);
     /// Whether the optional attribute ImportanceRating is defined for this IfcRelInteractionRequirements
-    bool hasImportanceRating();
-    IfcNormalisedRatioMeasure ImportanceRating();
-    void setImportanceRating(IfcNormalisedRatioMeasure v);
+    bool hasImportanceRating() const;
+    double ImportanceRating() const;
+    void setImportanceRating(double v);
     /// Whether the optional attribute LocationOfInteraction is defined for this IfcRelInteractionRequirements
-    bool hasLocationOfInteraction();
-    IfcSpatialStructureElement* LocationOfInteraction();
+    bool hasLocationOfInteraction() const;
+    IfcSpatialStructureElement* LocationOfInteraction() const;
     void setLocationOfInteraction(IfcSpatialStructureElement* v);
-    IfcSpaceProgram* RelatedSpaceProgram();
+    IfcSpaceProgram* RelatedSpaceProgram() const;
     void setRelatedSpaceProgram(IfcSpaceProgram* v);
-    IfcSpaceProgram* RelatingSpaceProgram();
+    IfcSpaceProgram* RelatingSpaceProgram() const;
     void setRelatingSpaceProgram(IfcSpaceProgram* v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 4: return IfcUtil::Argument_DOUBLE; case 5: return IfcUtil::Argument_DOUBLE; case 6: return IfcUtil::Argument_ENTITY; case 7: return IfcUtil::Argument_ENTITY; case 8: return IfcUtil::Argument_ENTITY; } return IfcRelConnects::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 4: return Type::IfcCountMeasure; case 5: return Type::IfcNormalisedRatioMeasure; case 6: return Type::IfcSpatialStructureElement; case 7: return Type::IfcSpaceProgram; case 8: return Type::IfcSpaceProgram; } return IfcRelConnects::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 4: return "DailyInteraction"; case 5: return "ImportanceRating"; case 6: return "LocationOfInteraction"; case 7: return "RelatedSpaceProgram"; case 8: return "RelatingSpaceProgram"; } return IfcRelConnects::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRelInteractionRequirements (IfcAbstractEntityPtr e);
-    IfcRelInteractionRequirements (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcCountMeasure > v5_DailyInteraction, boost::optional< IfcNormalisedRatioMeasure > v6_ImportanceRating, IfcSpatialStructureElement* v7_LocationOfInteraction, IfcSpaceProgram* v8_RelatedSpaceProgram, IfcSpaceProgram* v9_RelatingSpaceProgram);
-    typedef IfcRelInteractionRequirements* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRelInteractionRequirements > > list;
-    typedef IfcTemplatedEntityList< IfcRelInteractionRequirements >::it it;
+    IfcRelInteractionRequirements (IfcAbstractEntity* e);
+    IfcRelInteractionRequirements (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< double > v5_DailyInteraction, boost::optional< double > v6_ImportanceRating, IfcSpatialStructureElement* v7_LocationOfInteraction, IfcSpaceProgram* v8_RelatedSpaceProgram, IfcSpaceProgram* v9_RelatingSpaceProgram);
+    typedef IfcTemplatedEntityList< IfcRelInteractionRequirements > list;
 };
 /// The nesting relationship
 /// IfcRelNests is a special type of the general
@@ -22510,50 +23292,47 @@ class IfcRelNests : public IfcRelDecomposes {
 public:
     virtual unsigned int getArgumentCount() const { return 6; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcRelDecomposes::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcRelDecomposes::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcRelDecomposes::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRelNests (IfcAbstractEntityPtr e);
-    IfcRelNests (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, IfcObjectDefinition* v5_RelatingObject, SHARED_PTR< IfcTemplatedEntityList< IfcObjectDefinition > > v6_RelatedObjects);
-    typedef IfcRelNests* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRelNests > > list;
-    typedef IfcTemplatedEntityList< IfcRelNests >::it it;
+    IfcRelNests (IfcAbstractEntity* e);
+    IfcRelNests (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcObjectDefinition* v5_RelatingObject, IfcTemplatedEntityList< IfcObjectDefinition >::ptr v6_RelatedObjects);
+    typedef IfcTemplatedEntityList< IfcRelNests > list;
 };
 
 class IfcRelOccupiesSpaces : public IfcRelAssignsToActor {
 public:
     virtual unsigned int getArgumentCount() const { return 8; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcRelAssignsToActor::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcRelAssignsToActor::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcRelAssignsToActor::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRelOccupiesSpaces (IfcAbstractEntityPtr e);
-    IfcRelOccupiesSpaces (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, SHARED_PTR< IfcTemplatedEntityList< IfcObjectDefinition > > v5_RelatedObjects, boost::optional< IfcObjectTypeEnum::IfcObjectTypeEnum > v6_RelatedObjectsType, IfcActor* v7_RelatingActor, IfcActorRole* v8_ActingRole);
-    typedef IfcRelOccupiesSpaces* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRelOccupiesSpaces > > list;
-    typedef IfcTemplatedEntityList< IfcRelOccupiesSpaces >::it it;
+    IfcRelOccupiesSpaces (IfcAbstractEntity* e);
+    IfcRelOccupiesSpaces (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcTemplatedEntityList< IfcObjectDefinition >::ptr v5_RelatedObjects, boost::optional< IfcObjectTypeEnum::IfcObjectTypeEnum > v6_RelatedObjectsType, IfcActor* v7_RelatingActor, IfcActorRole* v8_ActingRole);
+    typedef IfcTemplatedEntityList< IfcRelOccupiesSpaces > list;
 };
 
 class IfcRelOverridesProperties : public IfcRelDefinesByProperties {
 public:
-    SHARED_PTR< IfcTemplatedEntityList< IfcProperty > > OverridingProperties();
-    void setOverridingProperties(SHARED_PTR< IfcTemplatedEntityList< IfcProperty > > v);
+    IfcTemplatedEntityList< IfcProperty >::ptr OverridingProperties() const;
+    void setOverridingProperties(IfcTemplatedEntityList< IfcProperty >::ptr v);
     virtual unsigned int getArgumentCount() const { return 7; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 6: return IfcUtil::Argument_ENTITY_LIST; } return IfcRelDefinesByProperties::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 6: return Type::IfcProperty; } return IfcRelDefinesByProperties::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 6: return "OverridingProperties"; } return IfcRelDefinesByProperties::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRelOverridesProperties (IfcAbstractEntityPtr e);
-    IfcRelOverridesProperties (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, SHARED_PTR< IfcTemplatedEntityList< IfcObject > > v5_RelatedObjects, IfcPropertySetDefinition* v6_RelatingPropertyDefinition, SHARED_PTR< IfcTemplatedEntityList< IfcProperty > > v7_OverridingProperties);
-    typedef IfcRelOverridesProperties* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRelOverridesProperties > > list;
-    typedef IfcTemplatedEntityList< IfcRelOverridesProperties >::it it;
+    IfcRelOverridesProperties (IfcAbstractEntity* e);
+    IfcRelOverridesProperties (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcTemplatedEntityList< IfcObject >::ptr v5_RelatedObjects, IfcPropertySetDefinition* v6_RelatingPropertyDefinition, IfcTemplatedEntityList< IfcProperty >::ptr v7_OverridingProperties);
+    typedef IfcTemplatedEntityList< IfcRelOverridesProperties > list;
 };
 /// The IfcRelProjectsElement is an objectified relationship
 /// between an element and one projection element that creates a
@@ -22590,23 +23369,22 @@ class IfcRelOverridesProperties : public IfcRelDefinesByProperties {
 class IfcRelProjectsElement : public IfcRelConnects {
 public:
     /// Element at which a projection is created by the associated IfcProjectionElement.
-    IfcElement* RelatingElement();
+    IfcElement* RelatingElement() const;
     void setRelatingElement(IfcElement* v);
     /// Reference to the IfcFeatureElementAddition that defines an addition to the volume of the element, by using a Boolean addition operation. An example is a projection at the associated element.
-    IfcFeatureElementAddition* RelatedFeatureElement();
+    IfcFeatureElementAddition* RelatedFeatureElement() const;
     void setRelatedFeatureElement(IfcFeatureElementAddition* v);
     virtual unsigned int getArgumentCount() const { return 6; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 4: return IfcUtil::Argument_ENTITY; case 5: return IfcUtil::Argument_ENTITY; } return IfcRelConnects::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 4: return Type::IfcElement; case 5: return Type::IfcFeatureElementAddition; } return IfcRelConnects::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 4: return "RelatingElement"; case 5: return "RelatedFeatureElement"; } return IfcRelConnects::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRelProjectsElement (IfcAbstractEntityPtr e);
-    IfcRelProjectsElement (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, IfcElement* v5_RelatingElement, IfcFeatureElementAddition* v6_RelatedFeatureElement);
-    typedef IfcRelProjectsElement* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRelProjectsElement > > list;
-    typedef IfcTemplatedEntityList< IfcRelProjectsElement >::it it;
+    IfcRelProjectsElement (IfcAbstractEntity* e);
+    IfcRelProjectsElement (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcElement* v5_RelatingElement, IfcFeatureElementAddition* v6_RelatedFeatureElement);
+    typedef IfcTemplatedEntityList< IfcRelProjectsElement > list;
 };
 /// The objectified relationship,
 ///   IfcRelReferencedInSpatialStructure is used to
@@ -22661,41 +23439,39 @@ class IfcRelReferencedInSpatialStructure : public IfcRelConnects {
 public:
     /// Set of products, which are referenced within this level of the spatial structure hierarchy.
     /// NOTE  Referenced elements are contained elsewhere within the spatial structure, they are referenced additionally by this spatial structure element, e.g., because they span several stories.
-    SHARED_PTR< IfcTemplatedEntityList< IfcProduct > > RelatedElements();
-    void setRelatedElements(SHARED_PTR< IfcTemplatedEntityList< IfcProduct > > v);
+    IfcTemplatedEntityList< IfcProduct >::ptr RelatedElements() const;
+    void setRelatedElements(IfcTemplatedEntityList< IfcProduct >::ptr v);
     /// Spatial structure element, within which the element is referenced. Any element can be contained within zero, one or many elements of the project spatial and zoning structure.
     /// 
     /// IFC2x Edition 4 CHANGE  The attribute relatingStructure as been promoted to the new supertype IfcSpatialElement with upward compatibility for file based exchange.
-    IfcSpatialStructureElement* RelatingStructure();
+    IfcSpatialStructureElement* RelatingStructure() const;
     void setRelatingStructure(IfcSpatialStructureElement* v);
     virtual unsigned int getArgumentCount() const { return 6; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 4: return IfcUtil::Argument_ENTITY_LIST; case 5: return IfcUtil::Argument_ENTITY; } return IfcRelConnects::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 4: return Type::IfcProduct; case 5: return Type::IfcSpatialStructureElement; } return IfcRelConnects::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 4: return "RelatedElements"; case 5: return "RelatingStructure"; } return IfcRelConnects::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRelReferencedInSpatialStructure (IfcAbstractEntityPtr e);
-    IfcRelReferencedInSpatialStructure (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, SHARED_PTR< IfcTemplatedEntityList< IfcProduct > > v5_RelatedElements, IfcSpatialStructureElement* v6_RelatingStructure);
-    typedef IfcRelReferencedInSpatialStructure* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRelReferencedInSpatialStructure > > list;
-    typedef IfcTemplatedEntityList< IfcRelReferencedInSpatialStructure >::it it;
+    IfcRelReferencedInSpatialStructure (IfcAbstractEntity* e);
+    IfcRelReferencedInSpatialStructure (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcTemplatedEntityList< IfcProduct >::ptr v5_RelatedElements, IfcSpatialStructureElement* v6_RelatingStructure);
+    typedef IfcTemplatedEntityList< IfcRelReferencedInSpatialStructure > list;
 };
 
 class IfcRelSchedulesCostItems : public IfcRelAssignsToControl {
 public:
     virtual unsigned int getArgumentCount() const { return 7; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcRelAssignsToControl::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcRelAssignsToControl::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcRelAssignsToControl::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRelSchedulesCostItems (IfcAbstractEntityPtr e);
-    IfcRelSchedulesCostItems (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, SHARED_PTR< IfcTemplatedEntityList< IfcObjectDefinition > > v5_RelatedObjects, boost::optional< IfcObjectTypeEnum::IfcObjectTypeEnum > v6_RelatedObjectsType, IfcControl* v7_RelatingControl);
-    typedef IfcRelSchedulesCostItems* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRelSchedulesCostItems > > list;
-    typedef IfcTemplatedEntityList< IfcRelSchedulesCostItems >::it it;
+    IfcRelSchedulesCostItems (IfcAbstractEntity* e);
+    IfcRelSchedulesCostItems (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcTemplatedEntityList< IfcObjectDefinition >::ptr v5_RelatedObjects, boost::optional< IfcObjectTypeEnum::IfcObjectTypeEnum > v6_RelatedObjectsType, IfcControl* v7_RelatingControl);
+    typedef IfcTemplatedEntityList< IfcRelSchedulesCostItems > list;
 };
 /// IfcRelSequence is a
 ///   sequential relationship between processes where one process
@@ -22754,31 +23530,30 @@ class IfcRelSchedulesCostItems : public IfcRelAssignsToControl {
 class IfcRelSequence : public IfcRelConnects {
 public:
     /// Reference to the process, that is the predecessor.
-    IfcProcess* RelatingProcess();
+    IfcProcess* RelatingProcess() const;
     void setRelatingProcess(IfcProcess* v);
     /// Reference to the process, that is the successor.
-    IfcProcess* RelatedProcess();
+    IfcProcess* RelatedProcess() const;
     void setRelatedProcess(IfcProcess* v);
     /// Time duration of the sequence, it is the time lag between the
     ///   predecessor and the successor as specified by the
     ///   SequenceType.
-    IfcTimeMeasure TimeLag();
-    void setTimeLag(IfcTimeMeasure v);
+    double TimeLag() const;
+    void setTimeLag(double v);
     /// The way in which the time lag applies to the sequence.
-    IfcSequenceEnum::IfcSequenceEnum SequenceType();
+    IfcSequenceEnum::IfcSequenceEnum SequenceType() const;
     void setSequenceType(IfcSequenceEnum::IfcSequenceEnum v);
     virtual unsigned int getArgumentCount() const { return 8; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 4: return IfcUtil::Argument_ENTITY; case 5: return IfcUtil::Argument_ENTITY; case 6: return IfcUtil::Argument_DOUBLE; case 7: return IfcUtil::Argument_ENUMERATION; } return IfcRelConnects::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 4: return Type::IfcProcess; case 5: return Type::IfcProcess; case 6: return Type::IfcTimeMeasure; case 7: return Type::IfcSequenceEnum; } return IfcRelConnects::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 4: return "RelatingProcess"; case 5: return "RelatedProcess"; case 6: return "TimeLag"; case 7: return "SequenceType"; } return IfcRelConnects::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRelSequence (IfcAbstractEntityPtr e);
-    IfcRelSequence (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, IfcProcess* v5_RelatingProcess, IfcProcess* v6_RelatedProcess, IfcTimeMeasure v7_TimeLag, IfcSequenceEnum::IfcSequenceEnum v8_SequenceType);
-    typedef IfcRelSequence* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRelSequence > > list;
-    typedef IfcTemplatedEntityList< IfcRelSequence >::it it;
+    IfcRelSequence (IfcAbstractEntity* e);
+    IfcRelSequence (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcProcess* v5_RelatingProcess, IfcProcess* v6_RelatedProcess, double v7_TimeLag, IfcSequenceEnum::IfcSequenceEnum v8_SequenceType);
+    typedef IfcTemplatedEntityList< IfcRelSequence > list;
 };
 /// Definition from IAI: An objectified relationship
 ///   that defines the relationship between a system and the
@@ -22804,27 +23579,26 @@ class IfcRelSequence : public IfcRelConnects {
 class IfcRelServicesBuildings : public IfcRelConnects {
 public:
     /// System that services the Buildings.
-    IfcSystem* RelatingSystem();
+    IfcSystem* RelatingSystem() const;
     void setRelatingSystem(IfcSystem* v);
     /// Spatial structure elements (including site, building, storeys) that are serviced by the system.
     /// 
     /// IFC2x PLATFORM CHANGE  The data type has been changed from IfcBuilding to IfcSpatialStructureElement with upward compatibility for file based exchange.
     /// 
     /// IFC2x Edition 4 CHANGE  The data type has been changed from IfcSpatialStructureElement to IfcSpatialElement with upward compatibility for file based exchange.
-    SHARED_PTR< IfcTemplatedEntityList< IfcSpatialStructureElement > > RelatedBuildings();
-    void setRelatedBuildings(SHARED_PTR< IfcTemplatedEntityList< IfcSpatialStructureElement > > v);
+    IfcTemplatedEntityList< IfcSpatialStructureElement >::ptr RelatedBuildings() const;
+    void setRelatedBuildings(IfcTemplatedEntityList< IfcSpatialStructureElement >::ptr v);
     virtual unsigned int getArgumentCount() const { return 6; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 4: return IfcUtil::Argument_ENTITY; case 5: return IfcUtil::Argument_ENTITY_LIST; } return IfcRelConnects::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 4: return Type::IfcSystem; case 5: return Type::IfcSpatialStructureElement; } return IfcRelConnects::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 4: return "RelatingSystem"; case 5: return "RelatedBuildings"; } return IfcRelConnects::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRelServicesBuildings (IfcAbstractEntityPtr e);
-    IfcRelServicesBuildings (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, IfcSystem* v5_RelatingSystem, SHARED_PTR< IfcTemplatedEntityList< IfcSpatialStructureElement > > v6_RelatedBuildings);
-    typedef IfcRelServicesBuildings* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRelServicesBuildings > > list;
-    typedef IfcTemplatedEntityList< IfcRelServicesBuildings >::it it;
+    IfcRelServicesBuildings (IfcAbstractEntity* e);
+    IfcRelServicesBuildings (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcSystem* v5_RelatingSystem, IfcTemplatedEntityList< IfcSpatialStructureElement >::ptr v6_RelatedBuildings);
+    typedef IfcTemplatedEntityList< IfcRelServicesBuildings > list;
 };
 /// The space boundary defines the
 /// physical or virtual delimiter of a space by the relationship
@@ -22991,42 +23765,41 @@ class IfcRelServicesBuildings : public IfcRelConnects {
 class IfcRelSpaceBoundary : public IfcRelConnects {
 public:
     /// Reference to one spaces that is delimited by this boundary.
-    IfcSpace* RelatingSpace();
+    IfcSpace* RelatingSpace() const;
     void setRelatingSpace(IfcSpace* v);
     /// Whether the optional attribute RelatedBuildingElement is defined for this IfcRelSpaceBoundary
-    bool hasRelatedBuildingElement();
+    bool hasRelatedBuildingElement() const;
     /// Reference to Building Element, that defines the Space Boundaries.
     /// 
     /// IFC2x PLATFORM CHANGE  The data type has been changed from IfcBuildingElement to IfcElement with upward compatibility for file based exchange.
     /// 
     /// IFC2x4 CHANGE  The attribute has been changed to be mandatory.
-    IfcElement* RelatedBuildingElement();
+    IfcElement* RelatedBuildingElement() const;
     void setRelatedBuildingElement(IfcElement* v);
     /// Whether the optional attribute ConnectionGeometry is defined for this IfcRelSpaceBoundary
-    bool hasConnectionGeometry();
+    bool hasConnectionGeometry() const;
     /// Physical representation of the space boundary. Provided as a curve or surface given within the LCS of the space.
     /// 
     /// IFC2x PLATFORM CHANGE  The data type has been changed from IfcConnectionSurfaceGeometry to IfcConnectionGeometry with upward compatibility for file based exchange.
-    IfcConnectionGeometry* ConnectionGeometry();
+    IfcConnectionGeometry* ConnectionGeometry() const;
     void setConnectionGeometry(IfcConnectionGeometry* v);
     /// Defines, whether the Space Boundary is physical (Physical) or virtual (Virtual).
-    IfcPhysicalOrVirtualEnum::IfcPhysicalOrVirtualEnum PhysicalOrVirtualBoundary();
+    IfcPhysicalOrVirtualEnum::IfcPhysicalOrVirtualEnum PhysicalOrVirtualBoundary() const;
     void setPhysicalOrVirtualBoundary(IfcPhysicalOrVirtualEnum::IfcPhysicalOrVirtualEnum v);
     /// Defines, whether the Space Boundary is internal (Internal), or external, i.e. adjacent to open space (that can be an partially enclosed space, such as terrace (External).
-    IfcInternalOrExternalEnum::IfcInternalOrExternalEnum InternalOrExternalBoundary();
+    IfcInternalOrExternalEnum::IfcInternalOrExternalEnum InternalOrExternalBoundary() const;
     void setInternalOrExternalBoundary(IfcInternalOrExternalEnum::IfcInternalOrExternalEnum v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 4: return IfcUtil::Argument_ENTITY; case 5: return IfcUtil::Argument_ENTITY; case 6: return IfcUtil::Argument_ENTITY; case 7: return IfcUtil::Argument_ENUMERATION; case 8: return IfcUtil::Argument_ENUMERATION; } return IfcRelConnects::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 4: return Type::IfcSpace; case 5: return Type::IfcElement; case 6: return Type::IfcConnectionGeometry; case 7: return Type::IfcPhysicalOrVirtualEnum; case 8: return Type::IfcInternalOrExternalEnum; } return IfcRelConnects::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 4: return "RelatingSpace"; case 5: return "RelatedBuildingElement"; case 6: return "ConnectionGeometry"; case 7: return "PhysicalOrVirtualBoundary"; case 8: return "InternalOrExternalBoundary"; } return IfcRelConnects::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRelSpaceBoundary (IfcAbstractEntityPtr e);
-    IfcRelSpaceBoundary (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, IfcSpace* v5_RelatingSpace, IfcElement* v6_RelatedBuildingElement, IfcConnectionGeometry* v7_ConnectionGeometry, IfcPhysicalOrVirtualEnum::IfcPhysicalOrVirtualEnum v8_PhysicalOrVirtualBoundary, IfcInternalOrExternalEnum::IfcInternalOrExternalEnum v9_InternalOrExternalBoundary);
-    typedef IfcRelSpaceBoundary* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRelSpaceBoundary > > list;
-    typedef IfcTemplatedEntityList< IfcRelSpaceBoundary >::it it;
+    IfcRelSpaceBoundary (IfcAbstractEntity* e);
+    IfcRelSpaceBoundary (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcSpace* v5_RelatingSpace, IfcElement* v6_RelatedBuildingElement, IfcConnectionGeometry* v7_ConnectionGeometry, IfcPhysicalOrVirtualEnum::IfcPhysicalOrVirtualEnum v8_PhysicalOrVirtualBoundary, IfcInternalOrExternalEnum::IfcInternalOrExternalEnum v9_InternalOrExternalBoundary);
+    typedef IfcTemplatedEntityList< IfcRelSpaceBoundary > list;
 };
 /// IfcRelVoidsElement is an objectified relationship between a building element and one opening element that creates a void in the element. It is a one-to-one relationship. This relationship implies a Boolean operation of subtraction between the geometric bodies of the element and the opening.
 /// 
@@ -23037,22 +23810,21 @@ class IfcRelSpaceBoundary : public IfcRelConnects {
 /// HISTORY New entity in IFC Release 1.0
 class IfcRelVoidsElement : public IfcRelConnects {
 public:
-    IfcElement* RelatingBuildingElement();
+    IfcElement* RelatingBuildingElement() const;
     void setRelatingBuildingElement(IfcElement* v);
-    IfcFeatureElementSubtraction* RelatedOpeningElement();
+    IfcFeatureElementSubtraction* RelatedOpeningElement() const;
     void setRelatedOpeningElement(IfcFeatureElementSubtraction* v);
     virtual unsigned int getArgumentCount() const { return 6; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 4: return IfcUtil::Argument_ENTITY; case 5: return IfcUtil::Argument_ENTITY; } return IfcRelConnects::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 4: return Type::IfcElement; case 5: return Type::IfcFeatureElementSubtraction; } return IfcRelConnects::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 4: return "RelatingBuildingElement"; case 5: return "RelatedOpeningElement"; } return IfcRelConnects::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRelVoidsElement (IfcAbstractEntityPtr e);
-    IfcRelVoidsElement (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, IfcElement* v5_RelatingBuildingElement, IfcFeatureElementSubtraction* v6_RelatedOpeningElement);
-    typedef IfcRelVoidsElement* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRelVoidsElement > > list;
-    typedef IfcTemplatedEntityList< IfcRelVoidsElement >::it it;
+    IfcRelVoidsElement (IfcAbstractEntity* e);
+    IfcRelVoidsElement (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcElement* v5_RelatingBuildingElement, IfcFeatureElementSubtraction* v6_RelatedOpeningElement);
+    typedef IfcTemplatedEntityList< IfcRelVoidsElement > list;
 };
 /// IfcResource contains the information needed to represent the costs, schedule, and other impacts from the use of a thing in a process. It is not intended to use IfcResource to model the general properties of the things themselves, while an optional linkage from IfcResource to the things to be used can be specified (specifically, the relationship from subtypes of IfcResource to IfcProduct through the IfcRelAssignsToResource relationship).  
 /// 
@@ -23071,17 +23843,16 @@ class IfcResource : public IfcObject {
 public:
     virtual unsigned int getArgumentCount() const { return 5; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcObject::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcObject::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcObject::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelAssignsToResource > > ResourceOf(); // INVERSE IfcRelAssignsToResource::RelatingResource
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcRelAssignsToResource >::ptr ResourceOf() const; // INVERSE IfcRelAssignsToResource::RelatingResource
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcResource (IfcAbstractEntityPtr e);
-    IfcResource (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType);
-    typedef IfcResource* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcResource > > list;
-    typedef IfcTemplatedEntityList< IfcResource >::it it;
+    IfcResource (IfcAbstractEntity* e);
+    IfcResource (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType);
+    typedef IfcTemplatedEntityList< IfcResource > list;
 };
 /// An IfcRevolvedAreaSolid is a solid created by revolving
 /// a cross section provided by a profile definition about an axis. The
@@ -23162,23 +23933,22 @@ class IfcResource : public IfcObject {
 class IfcRevolvedAreaSolid : public IfcSweptAreaSolid {
 public:
     /// Axis about which revolution will take place.
-    IfcAxis1Placement* Axis();
+    IfcAxis1Placement* Axis() const;
     void setAxis(IfcAxis1Placement* v);
     /// The angle through which the sweep will be made. This angle is measured from the plane of the swept area provided by the XY plane of the position coordinate system.
-    IfcPlaneAngleMeasure Angle();
-    void setAngle(IfcPlaneAngleMeasure v);
+    double Angle() const;
+    void setAngle(double v);
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 2: return IfcUtil::Argument_ENTITY; case 3: return IfcUtil::Argument_DOUBLE; } return IfcSweptAreaSolid::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 2: return Type::IfcAxis1Placement; case 3: return Type::IfcPlaneAngleMeasure; } return IfcSweptAreaSolid::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 2: return "Axis"; case 3: return "Angle"; } return IfcSweptAreaSolid::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRevolvedAreaSolid (IfcAbstractEntityPtr e);
-    IfcRevolvedAreaSolid (IfcProfileDef* v1_SweptArea, IfcAxis2Placement3D* v2_Position, IfcAxis1Placement* v3_Axis, IfcPlaneAngleMeasure v4_Angle);
-    typedef IfcRevolvedAreaSolid* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRevolvedAreaSolid > > list;
-    typedef IfcTemplatedEntityList< IfcRevolvedAreaSolid >::it it;
+    IfcRevolvedAreaSolid (IfcAbstractEntity* e);
+    IfcRevolvedAreaSolid (IfcProfileDef* v1_SweptArea, IfcAxis2Placement3D* v2_Position, IfcAxis1Placement* v3_Axis, double v4_Angle);
+    typedef IfcTemplatedEntityList< IfcRevolvedAreaSolid > list;
 };
 /// The IfcRightCircularCone is a Construction Solid
 /// Geometry (CSG) 3D primitive. It is a solid with a circular base and
@@ -23248,23 +24018,22 @@ class IfcRevolvedAreaSolid : public IfcSweptAreaSolid {
 class IfcRightCircularCone : public IfcCsgPrimitive3D {
 public:
     /// The distance between the base of the cone and the apex.
-    IfcPositiveLengthMeasure Height();
-    void setHeight(IfcPositiveLengthMeasure v);
+    double Height() const;
+    void setHeight(double v);
     /// The radius of the cone at the base.
-    IfcPositiveLengthMeasure BottomRadius();
-    void setBottomRadius(IfcPositiveLengthMeasure v);
+    double BottomRadius() const;
+    void setBottomRadius(double v);
     virtual unsigned int getArgumentCount() const { return 3; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 1: return IfcUtil::Argument_DOUBLE; case 2: return IfcUtil::Argument_DOUBLE; } return IfcCsgPrimitive3D::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 1: return Type::IfcPositiveLengthMeasure; case 2: return Type::IfcPositiveLengthMeasure; } return IfcCsgPrimitive3D::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 1: return "Height"; case 2: return "BottomRadius"; } return IfcCsgPrimitive3D::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRightCircularCone (IfcAbstractEntityPtr e);
-    IfcRightCircularCone (IfcAxis2Placement3D* v1_Position, IfcPositiveLengthMeasure v2_Height, IfcPositiveLengthMeasure v3_BottomRadius);
-    typedef IfcRightCircularCone* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRightCircularCone > > list;
-    typedef IfcTemplatedEntityList< IfcRightCircularCone >::it it;
+    IfcRightCircularCone (IfcAbstractEntity* e);
+    IfcRightCircularCone (IfcAxis2Placement3D* v1_Position, double v2_Height, double v3_BottomRadius);
+    typedef IfcTemplatedEntityList< IfcRightCircularCone > list;
 };
 /// The IfcRightCircularCylinder is a Construction Solid
 /// Geometry (CSG) 3D primitive. It is a solid with a circular base and
@@ -23350,23 +24119,22 @@ class IfcRightCircularCone : public IfcCsgPrimitive3D {
 class IfcRightCircularCylinder : public IfcCsgPrimitive3D {
 public:
     /// The distance between the planar circular faces of the cylinder.
-    IfcPositiveLengthMeasure Height();
-    void setHeight(IfcPositiveLengthMeasure v);
+    double Height() const;
+    void setHeight(double v);
     /// The radius of the cylinder.
-    IfcPositiveLengthMeasure Radius();
-    void setRadius(IfcPositiveLengthMeasure v);
+    double Radius() const;
+    void setRadius(double v);
     virtual unsigned int getArgumentCount() const { return 3; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 1: return IfcUtil::Argument_DOUBLE; case 2: return IfcUtil::Argument_DOUBLE; } return IfcCsgPrimitive3D::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 1: return Type::IfcPositiveLengthMeasure; case 2: return Type::IfcPositiveLengthMeasure; } return IfcCsgPrimitive3D::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 1: return "Height"; case 2: return "Radius"; } return IfcCsgPrimitive3D::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRightCircularCylinder (IfcAbstractEntityPtr e);
-    IfcRightCircularCylinder (IfcAxis2Placement3D* v1_Position, IfcPositiveLengthMeasure v2_Height, IfcPositiveLengthMeasure v3_Radius);
-    typedef IfcRightCircularCylinder* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRightCircularCylinder > > list;
-    typedef IfcTemplatedEntityList< IfcRightCircularCylinder >::it it;
+    IfcRightCircularCylinder (IfcAbstractEntity* e);
+    IfcRightCircularCylinder (IfcAxis2Placement3D* v1_Position, double v2_Height, double v3_Radius);
+    typedef IfcTemplatedEntityList< IfcRightCircularCylinder > list;
 };
 /// A spatial structure element
 /// (IfcSpatialStructureElement) is the generalization of all
@@ -23445,30 +24213,29 @@ class IfcRightCircularCylinder : public IfcCsgPrimitive3D {
 class IfcSpatialStructureElement : public IfcProduct {
 public:
     /// Whether the optional attribute LongName is defined for this IfcSpatialStructureElement
-    bool hasLongName();
-    IfcLabel LongName();
-    void setLongName(IfcLabel v);
+    bool hasLongName() const;
+    std::string LongName() const;
+    void setLongName(std::string v);
     /// Denotes, whether the predefined spatial structure element represents itself, or an aggregate (complex) or a part (part). The interpretation is given separately for each subtype of spatial structure element. If no CompositionType is asserted, the dafault value 'ELEMENT' applies.
     /// 
     /// IFC2x4 CHANGE&nbsp
     ///   Attribute made optional.
-    IfcElementCompositionEnum::IfcElementCompositionEnum CompositionType();
+    IfcElementCompositionEnum::IfcElementCompositionEnum CompositionType() const;
     void setCompositionType(IfcElementCompositionEnum::IfcElementCompositionEnum v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 7: return IfcUtil::Argument_STRING; case 8: return IfcUtil::Argument_ENUMERATION; } return IfcProduct::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 7: return Type::IfcLabel; case 8: return Type::IfcElementCompositionEnum; } return IfcProduct::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 7: return "LongName"; case 8: return "CompositionType"; } return IfcProduct::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelReferencedInSpatialStructure > > ReferencesElements(); // INVERSE IfcRelReferencedInSpatialStructure::RelatingStructure
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelServicesBuildings > > ServicedBySystems(); // INVERSE IfcRelServicesBuildings::RelatedBuildings
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelContainedInSpatialStructure > > ContainsElements(); // INVERSE IfcRelContainedInSpatialStructure::RelatingStructure
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcRelReferencedInSpatialStructure >::ptr ReferencesElements() const; // INVERSE IfcRelReferencedInSpatialStructure::RelatingStructure
+    IfcTemplatedEntityList< IfcRelServicesBuildings >::ptr ServicedBySystems() const; // INVERSE IfcRelServicesBuildings::RelatedBuildings
+    IfcTemplatedEntityList< IfcRelContainedInSpatialStructure >::ptr ContainsElements() const; // INVERSE IfcRelContainedInSpatialStructure::RelatingStructure
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcSpatialStructureElement (IfcAbstractEntityPtr e);
-    IfcSpatialStructureElement (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcLabel > v8_LongName, IfcElementCompositionEnum::IfcElementCompositionEnum v9_CompositionType);
-    typedef IfcSpatialStructureElement* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcSpatialStructureElement > > list;
-    typedef IfcTemplatedEntityList< IfcSpatialStructureElement >::it it;
+    IfcSpatialStructureElement (IfcAbstractEntity* e);
+    IfcSpatialStructureElement (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_LongName, IfcElementCompositionEnum::IfcElementCompositionEnum v9_CompositionType);
+    typedef IfcTemplatedEntityList< IfcSpatialStructureElement > list;
 };
 /// Definition from IAI: The element type
 ///   (IfcSpatialStructureElementType) defines a list of
@@ -23508,16 +24275,15 @@ class IfcSpatialStructureElementType : public IfcElementType {
 public:
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcElementType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcElementType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcElementType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcSpatialStructureElementType (IfcAbstractEntityPtr e);
-    IfcSpatialStructureElementType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType);
-    typedef IfcSpatialStructureElementType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcSpatialStructureElementType > > list;
-    typedef IfcTemplatedEntityList< IfcSpatialStructureElementType >::it it;
+    IfcSpatialStructureElementType (IfcAbstractEntity* e);
+    IfcSpatialStructureElementType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType);
+    typedef IfcTemplatedEntityList< IfcSpatialStructureElementType > list;
 };
 /// The IfcSphere is a Construction Solid Geometry (CSG) 3D
 /// primitive. It is a solid where all points at the surface have the
@@ -23572,20 +24338,19 @@ class IfcSpatialStructureElementType : public IfcElementType {
 class IfcSphere : public IfcCsgPrimitive3D {
 public:
     /// The radius of the sphere.
-    IfcPositiveLengthMeasure Radius();
-    void setRadius(IfcPositiveLengthMeasure v);
+    double Radius() const;
+    void setRadius(double v);
     virtual unsigned int getArgumentCount() const { return 2; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 1: return IfcUtil::Argument_DOUBLE; } return IfcCsgPrimitive3D::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 1: return Type::IfcPositiveLengthMeasure; } return IfcCsgPrimitive3D::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 1: return "Radius"; } return IfcCsgPrimitive3D::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcSphere (IfcAbstractEntityPtr e);
-    IfcSphere (IfcAxis2Placement3D* v1_Position, IfcPositiveLengthMeasure v2_Radius);
-    typedef IfcSphere* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcSphere > > list;
-    typedef IfcTemplatedEntityList< IfcSphere >::it it;
+    IfcSphere (IfcAbstractEntity* e);
+    IfcSphere (IfcAxis2Placement3D* v1_Position, double v2_Radius);
+    typedef IfcTemplatedEntityList< IfcSphere > list;
 };
 /// Definition from IAI: The abstract entity IfcStructuralActivity combines the definition of actions (such as forces, displacements, etc.) and reactions (support reactions, internal forces, deflections, etc.) which are specified by using the basic load definitions from the IfcStructuralLoadResource.
 /// 
@@ -23685,7 +24450,7 @@ class IfcStructuralActivity : public IfcProduct {
     /// Load or result resource object which defines the load type, direction, and load values.
     /// 
     /// In case of activities which are variably distributed over curves or surfaces, IfcStructuralLoadConfiguration is used which provides a list of load samples and their locations within the load distribution, measured in local coordinates of the curve or surface on which this activity acts.  The contents of this load or result distribution may be further restricted by definitions at subtypes of IfcStructuralActivity.
-    IfcStructuralLoad* AppliedLoad();
+    IfcStructuralLoad* AppliedLoad() const;
     void setAppliedLoad(IfcStructuralLoad* v);
     /// Indicates whether the load directions refer to the global coordinate system (global to
     /// the analysis model, i.e. as established by IfcStructuralAnalysisModel.SharedPlacement)
@@ -23704,21 +24469,20 @@ class IfcStructuralActivity : public IfcProduct {
     /// but as the analysis model specific shared coordinate system.  In contrast, LOCAL_COORDS
     /// is to be taken as coordinates which are local to individual structural items and activities,
     /// as established by subclass-specific geometry use definitions.
-    IfcGlobalOrLocalEnum::IfcGlobalOrLocalEnum GlobalOrLocal();
+    IfcGlobalOrLocalEnum::IfcGlobalOrLocalEnum GlobalOrLocal() const;
     void setGlobalOrLocal(IfcGlobalOrLocalEnum::IfcGlobalOrLocalEnum v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 7: return IfcUtil::Argument_ENTITY; case 8: return IfcUtil::Argument_ENUMERATION; } return IfcProduct::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 7: return Type::IfcStructuralLoad; case 8: return Type::IfcGlobalOrLocalEnum; } return IfcProduct::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 7: return "AppliedLoad"; case 8: return "GlobalOrLocal"; } return IfcProduct::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelConnectsStructuralActivity > > AssignedToStructuralItem(); // INVERSE IfcRelConnectsStructuralActivity::RelatedStructuralActivity
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcRelConnectsStructuralActivity >::ptr AssignedToStructuralItem() const; // INVERSE IfcRelConnectsStructuralActivity::RelatedStructuralActivity
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcStructuralActivity (IfcAbstractEntityPtr e);
-    IfcStructuralActivity (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcStructuralLoad* v8_AppliedLoad, IfcGlobalOrLocalEnum::IfcGlobalOrLocalEnum v9_GlobalOrLocal);
-    typedef IfcStructuralActivity* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcStructuralActivity > > list;
-    typedef IfcTemplatedEntityList< IfcStructuralActivity >::it it;
+    IfcStructuralActivity (IfcAbstractEntity* e);
+    IfcStructuralActivity (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcStructuralLoad* v8_AppliedLoad, IfcGlobalOrLocalEnum::IfcGlobalOrLocalEnum v9_GlobalOrLocal);
+    typedef IfcTemplatedEntityList< IfcStructuralActivity > list;
 };
 /// Definition from IAI: The abstract entity IfcStructuralItem is the generalization of structural members and structural connections, i.e. analysis idealizations of elements in the building model.  It defines the relation between structural members and connections with structural activities (actions and reactions).
 /// 
@@ -23811,17 +24575,16 @@ class IfcStructuralItem : public IfcProduct {
 public:
     virtual unsigned int getArgumentCount() const { return 7; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcProduct::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcProduct::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcProduct::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelConnectsStructuralActivity > > AssignedStructuralActivity(); // INVERSE IfcRelConnectsStructuralActivity::RelatingElement
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcRelConnectsStructuralActivity >::ptr AssignedStructuralActivity() const; // INVERSE IfcRelConnectsStructuralActivity::RelatingElement
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcStructuralItem (IfcAbstractEntityPtr e);
-    IfcStructuralItem (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation);
-    typedef IfcStructuralItem* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcStructuralItem > > list;
-    typedef IfcTemplatedEntityList< IfcStructuralItem >::it it;
+    IfcStructuralItem (IfcAbstractEntity* e);
+    IfcStructuralItem (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation);
+    typedef IfcTemplatedEntityList< IfcStructuralItem > list;
 };
 /// Definition from IAI: The abstract entity IfcStructuralMember is the superclass of all structural items which represent the idealized structural behavior of building elements.
 /// 
@@ -23831,18 +24594,17 @@ class IfcStructuralMember : public IfcStructuralItem {
 public:
     virtual unsigned int getArgumentCount() const { return 7; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcStructuralItem::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcStructuralItem::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcStructuralItem::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelConnectsStructuralElement > > ReferencesElement(); // INVERSE IfcRelConnectsStructuralElement::RelatedStructuralMember
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelConnectsStructuralMember > > ConnectedBy(); // INVERSE IfcRelConnectsStructuralMember::RelatingStructuralMember
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcRelConnectsStructuralElement >::ptr ReferencesElement() const; // INVERSE IfcRelConnectsStructuralElement::RelatedStructuralMember
+    IfcTemplatedEntityList< IfcRelConnectsStructuralMember >::ptr ConnectedBy() const; // INVERSE IfcRelConnectsStructuralMember::RelatingStructuralMember
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcStructuralMember (IfcAbstractEntityPtr e);
-    IfcStructuralMember (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation);
-    typedef IfcStructuralMember* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcStructuralMember > > list;
-    typedef IfcTemplatedEntityList< IfcStructuralMember >::it it;
+    IfcStructuralMember (IfcAbstractEntity* e);
+    IfcStructuralMember (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation);
+    typedef IfcTemplatedEntityList< IfcStructuralMember > list;
 };
 /// Definition from IAI: A structural reaction is a structural activity that results from a
 /// structural action imposed to a structural item or building element.  Examples are support reactions,
@@ -23868,17 +24630,16 @@ class IfcStructuralReaction : public IfcStructuralActivity {
 public:
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcStructuralActivity::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcStructuralActivity::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcStructuralActivity::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcStructuralAction > > Causes(); // INVERSE IfcStructuralAction::CausedBy
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcStructuralAction >::ptr Causes() const; // INVERSE IfcStructuralAction::CausedBy
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcStructuralReaction (IfcAbstractEntityPtr e);
-    IfcStructuralReaction (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcStructuralLoad* v8_AppliedLoad, IfcGlobalOrLocalEnum::IfcGlobalOrLocalEnum v9_GlobalOrLocal);
-    typedef IfcStructuralReaction* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcStructuralReaction > > list;
-    typedef IfcTemplatedEntityList< IfcStructuralReaction >::it it;
+    IfcStructuralReaction (IfcAbstractEntity* e);
+    IfcStructuralReaction (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcStructuralLoad* v8_AppliedLoad, IfcGlobalOrLocalEnum::IfcGlobalOrLocalEnum v9_GlobalOrLocal);
+    typedef IfcTemplatedEntityList< IfcStructuralReaction > list;
 };
 /// Definition from IAI: Instances of IfcStructuralSurfaceMember describe face members, i.e. structural analysis idealizations of slabs, walls, shells, etc..  Surface members may be planar or curved.
 /// 
@@ -23903,25 +24664,24 @@ class IfcStructuralReaction : public IfcStructuralActivity {
 class IfcStructuralSurfaceMember : public IfcStructuralMember {
 public:
     /// Type of member with respect to its load carrying behavior in this analysis idealization.
-    IfcStructuralSurfaceTypeEnum::IfcStructuralSurfaceTypeEnum PredefinedType();
+    IfcStructuralSurfaceTypeEnum::IfcStructuralSurfaceTypeEnum PredefinedType() const;
     void setPredefinedType(IfcStructuralSurfaceTypeEnum::IfcStructuralSurfaceTypeEnum v);
     /// Whether the optional attribute Thickness is defined for this IfcStructuralSurfaceMember
-    bool hasThickness();
+    bool hasThickness() const;
     /// Defines the typically understood thickness of the structural surface member, measured normal to its reference surface.
-    IfcPositiveLengthMeasure Thickness();
-    void setThickness(IfcPositiveLengthMeasure v);
+    double Thickness() const;
+    void setThickness(double v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 7: return IfcUtil::Argument_ENUMERATION; case 8: return IfcUtil::Argument_DOUBLE; } return IfcStructuralMember::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 7: return Type::IfcStructuralSurfaceTypeEnum; case 8: return Type::IfcPositiveLengthMeasure; } return IfcStructuralMember::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 7: return "PredefinedType"; case 8: return "Thickness"; } return IfcStructuralMember::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcStructuralSurfaceMember (IfcAbstractEntityPtr e);
-    IfcStructuralSurfaceMember (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcStructuralSurfaceTypeEnum::IfcStructuralSurfaceTypeEnum v8_PredefinedType, boost::optional< IfcPositiveLengthMeasure > v9_Thickness);
-    typedef IfcStructuralSurfaceMember* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcStructuralSurfaceMember > > list;
-    typedef IfcTemplatedEntityList< IfcStructuralSurfaceMember >::it it;
+    IfcStructuralSurfaceMember (IfcAbstractEntity* e);
+    IfcStructuralSurfaceMember (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcStructuralSurfaceTypeEnum::IfcStructuralSurfaceTypeEnum v8_PredefinedType, boost::optional< double > v9_Thickness);
+    typedef IfcTemplatedEntityList< IfcStructuralSurfaceMember > list;
 };
 /// Definition from IAI: Describes surface members with varying section properties.  The properties are provided by means of a property set and IfcRelDefinesByProperties or by means of aggregation:  An instance of IfcStructuralSurfaceMemberVarying may be composed of two or more instances of IfcStructuralSurfaceMember with differing section properties.  These subordinate members relate to the instance of IfcStructuralSurfaceMemberVarying by IfcRelAggregates.
 /// 
@@ -23943,38 +24703,36 @@ class IfcStructuralSurfaceMember : public IfcStructuralMember {
 /// In case of aggregation, instances of IfcStructuralSurfaceMemberVarying may have a topology representation which contains a single IfcConnectedFaceSet, based upon the faces of the parts.  Otherwise, definitions at IfcStructuralSurfaceMember apply.
 class IfcStructuralSurfaceMemberVarying : public IfcStructuralSurfaceMember {
 public:
-    std::vector< IfcPositiveLengthMeasure > /*[2:?]*/ SubsequentThickness();
-    void setSubsequentThickness(std::vector< IfcPositiveLengthMeasure > /*[2:?]*/ v);
-    IfcShapeAspect* VaryingThicknessLocation();
+    std::vector< double > /*[2:?]*/ SubsequentThickness() const;
+    void setSubsequentThickness(std::vector< double > /*[2:?]*/ v);
+    IfcShapeAspect* VaryingThicknessLocation() const;
     void setVaryingThicknessLocation(IfcShapeAspect* v);
     virtual unsigned int getArgumentCount() const { return 11; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_VECTOR_DOUBLE; case 10: return IfcUtil::Argument_ENTITY; } return IfcStructuralSurfaceMember::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcPositiveLengthMeasure; case 10: return Type::IfcShapeAspect; } return IfcStructuralSurfaceMember::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "SubsequentThickness"; case 10: return "VaryingThicknessLocation"; } return IfcStructuralSurfaceMember::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcStructuralSurfaceMemberVarying (IfcAbstractEntityPtr e);
-    IfcStructuralSurfaceMemberVarying (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcStructuralSurfaceTypeEnum::IfcStructuralSurfaceTypeEnum v8_PredefinedType, boost::optional< IfcPositiveLengthMeasure > v9_Thickness, std::vector< IfcPositiveLengthMeasure > /*[2:?]*/ v10_SubsequentThickness, IfcShapeAspect* v11_VaryingThicknessLocation);
-    typedef IfcStructuralSurfaceMemberVarying* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcStructuralSurfaceMemberVarying > > list;
-    typedef IfcTemplatedEntityList< IfcStructuralSurfaceMemberVarying >::it it;
+    IfcStructuralSurfaceMemberVarying (IfcAbstractEntity* e);
+    IfcStructuralSurfaceMemberVarying (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcStructuralSurfaceTypeEnum::IfcStructuralSurfaceTypeEnum v8_PredefinedType, boost::optional< double > v9_Thickness, std::vector< double > /*[2:?]*/ v10_SubsequentThickness, IfcShapeAspect* v11_VaryingThicknessLocation);
+    typedef IfcTemplatedEntityList< IfcStructuralSurfaceMemberVarying > list;
 };
 
 class IfcStructuredDimensionCallout : public IfcDraughtingCallout {
 public:
     virtual unsigned int getArgumentCount() const { return 1; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcDraughtingCallout::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcDraughtingCallout::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcDraughtingCallout::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcStructuredDimensionCallout (IfcAbstractEntityPtr e);
-    IfcStructuredDimensionCallout (IfcEntities v1_Contents);
-    typedef IfcStructuredDimensionCallout* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcStructuredDimensionCallout > > list;
-    typedef IfcTemplatedEntityList< IfcStructuredDimensionCallout >::it it;
+    IfcStructuredDimensionCallout (IfcAbstractEntity* e);
+    IfcStructuredDimensionCallout (IfcEntityList::ptr v1_Contents);
+    typedef IfcTemplatedEntityList< IfcStructuredDimensionCallout > list;
 };
 /// The IfcSurfaceCurveSweptAreaSolid is the result of
 /// sweeping an area along a directrix that lies on a reference
@@ -24041,33 +24799,32 @@ class IfcStructuredDimensionCallout : public IfcDraughtingCallout {
 class IfcSurfaceCurveSweptAreaSolid : public IfcSweptAreaSolid {
 public:
     /// The curve used to define the sweeping operation. The solid is generated by sweeping the SELF\IfcSweptAreaSolid.SweptArea along the Directrix.
-    IfcCurve* Directrix();
+    IfcCurve* Directrix() const;
     void setDirectrix(IfcCurve* v);
     /// The parameter value on the Directrix at which the sweeping operation commences. If no value is provided the start of the sweeping operation is at the start of the Directrix..
     /// 
     /// IFC2x4 CHANGE  The attribute has been changed to OPTIONAL with upward compatibility for file-based exchange.
-    IfcParameterValue StartParam();
-    void setStartParam(IfcParameterValue v);
+    double StartParam() const;
+    void setStartParam(double v);
     /// The parameter value on the Directrix at which the sweeping operation ends. If no value is provided the end of the sweeping operation is at the end of the Directrix..
     /// 
     /// IFC2x4 CHANGE  The attribute has been changed to OPTIONAL with upward compatibility for file-based exchange.
-    IfcParameterValue EndParam();
-    void setEndParam(IfcParameterValue v);
+    double EndParam() const;
+    void setEndParam(double v);
     /// The surface containing the Directrix.
-    IfcSurface* ReferenceSurface();
+    IfcSurface* ReferenceSurface() const;
     void setReferenceSurface(IfcSurface* v);
     virtual unsigned int getArgumentCount() const { return 6; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 2: return IfcUtil::Argument_ENTITY; case 3: return IfcUtil::Argument_DOUBLE; case 4: return IfcUtil::Argument_DOUBLE; case 5: return IfcUtil::Argument_ENTITY; } return IfcSweptAreaSolid::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 2: return Type::IfcCurve; case 3: return Type::IfcParameterValue; case 4: return Type::IfcParameterValue; case 5: return Type::IfcSurface; } return IfcSweptAreaSolid::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 2: return "Directrix"; case 3: return "StartParam"; case 4: return "EndParam"; case 5: return "ReferenceSurface"; } return IfcSweptAreaSolid::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcSurfaceCurveSweptAreaSolid (IfcAbstractEntityPtr e);
-    IfcSurfaceCurveSweptAreaSolid (IfcProfileDef* v1_SweptArea, IfcAxis2Placement3D* v2_Position, IfcCurve* v3_Directrix, IfcParameterValue v4_StartParam, IfcParameterValue v5_EndParam, IfcSurface* v6_ReferenceSurface);
-    typedef IfcSurfaceCurveSweptAreaSolid* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcSurfaceCurveSweptAreaSolid > > list;
-    typedef IfcTemplatedEntityList< IfcSurfaceCurveSweptAreaSolid >::it it;
+    IfcSurfaceCurveSweptAreaSolid (IfcAbstractEntity* e);
+    IfcSurfaceCurveSweptAreaSolid (IfcProfileDef* v1_SweptArea, IfcAxis2Placement3D* v2_Position, IfcCurve* v3_Directrix, double v4_StartParam, double v5_EndParam, IfcSurface* v6_ReferenceSurface);
+    typedef IfcTemplatedEntityList< IfcSurfaceCurveSweptAreaSolid > list;
 };
 /// Definition from ISO/CD 10303-42:1992: This surface is a simple swept surface or a generalized cylinder obtained by sweeping a curve in a given direction. The parameterization is as follows where the curve has a parameterization l(u): 
 /// 
@@ -24085,23 +24842,22 @@ class IfcSurfaceCurveSweptAreaSolid : public IfcSweptAreaSolid {
 class IfcSurfaceOfLinearExtrusion : public IfcSweptSurface {
 public:
     /// The direction of the extrusion.
-    IfcDirection* ExtrudedDirection();
+    IfcDirection* ExtrudedDirection() const;
     void setExtrudedDirection(IfcDirection* v);
     /// The depth of the extrusion, it determines the parameterization.
-    IfcLengthMeasure Depth();
-    void setDepth(IfcLengthMeasure v);
+    double Depth() const;
+    void setDepth(double v);
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 2: return IfcUtil::Argument_ENTITY; case 3: return IfcUtil::Argument_DOUBLE; } return IfcSweptSurface::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 2: return Type::IfcDirection; case 3: return Type::IfcLengthMeasure; } return IfcSweptSurface::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 2: return "ExtrudedDirection"; case 3: return "Depth"; } return IfcSweptSurface::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcSurfaceOfLinearExtrusion (IfcAbstractEntityPtr e);
-    IfcSurfaceOfLinearExtrusion (IfcProfileDef* v1_SweptCurve, IfcAxis2Placement3D* v2_Position, IfcDirection* v3_ExtrudedDirection, IfcLengthMeasure v4_Depth);
-    typedef IfcSurfaceOfLinearExtrusion* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcSurfaceOfLinearExtrusion > > list;
-    typedef IfcTemplatedEntityList< IfcSurfaceOfLinearExtrusion >::it it;
+    IfcSurfaceOfLinearExtrusion (IfcAbstractEntity* e);
+    IfcSurfaceOfLinearExtrusion (IfcProfileDef* v1_SweptCurve, IfcAxis2Placement3D* v2_Position, IfcDirection* v3_ExtrudedDirection, double v4_Depth);
+    typedef IfcTemplatedEntityList< IfcSurfaceOfLinearExtrusion > list;
 };
 /// Definition from ISO/CD 10303-42:1992: A surface of revolution (IfcSurfaceOfRevolution) is the surface obtained by rotating a curve one complete revolution about an axis. The data shall be interpreted as below. 
 /// 
@@ -24123,20 +24879,19 @@ class IfcSurfaceOfLinearExtrusion : public IfcSweptSurface {
 class IfcSurfaceOfRevolution : public IfcSweptSurface {
 public:
     /// A point on the axis of revolution and the direction of the axis of revolution.
-    IfcAxis1Placement* AxisPosition();
+    IfcAxis1Placement* AxisPosition() const;
     void setAxisPosition(IfcAxis1Placement* v);
     virtual unsigned int getArgumentCount() const { return 3; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 2: return IfcUtil::Argument_ENTITY; } return IfcSweptSurface::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 2: return Type::IfcAxis1Placement; } return IfcSweptSurface::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 2: return "AxisPosition"; } return IfcSweptSurface::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcSurfaceOfRevolution (IfcAbstractEntityPtr e);
+    IfcSurfaceOfRevolution (IfcAbstractEntity* e);
     IfcSurfaceOfRevolution (IfcProfileDef* v1_SweptCurve, IfcAxis2Placement3D* v2_Position, IfcAxis1Placement* v3_AxisPosition);
-    typedef IfcSurfaceOfRevolution* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcSurfaceOfRevolution > > list;
-    typedef IfcTemplatedEntityList< IfcSurfaceOfRevolution >::it it;
+    typedef IfcTemplatedEntityList< IfcSurfaceOfRevolution > list;
 };
 /// The furnishing element type IfcSystemFurnitureElementType defines commonly shared information for occurrences of furniture elements.  The set of shared information may include: 
 /// 
@@ -24172,16 +24927,15 @@ class IfcSystemFurnitureElementType : public IfcFurnishingElementType {
 public:
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcFurnishingElementType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcFurnishingElementType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcFurnishingElementType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcSystemFurnitureElementType (IfcAbstractEntityPtr e);
-    IfcSystemFurnitureElementType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType);
-    typedef IfcSystemFurnitureElementType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcSystemFurnitureElementType > > list;
-    typedef IfcTemplatedEntityList< IfcSystemFurnitureElementType >::it it;
+    IfcSystemFurnitureElementType (IfcAbstractEntity* e);
+    IfcSystemFurnitureElementType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType);
+    typedef IfcTemplatedEntityList< IfcSystemFurnitureElementType > list;
 };
 /// An IfcTask is an identifiable unit of work to be
 ///   carried out in a construction project.
@@ -24430,27 +25184,27 @@ class IfcSystemFurnitureElementType : public IfcFurnishingElementType {
 ///   track punch list items individually via IfcRelNests.
 class IfcTask : public IfcProcess {
 public:
-    IfcIdentifier TaskId();
-    void setTaskId(IfcIdentifier v);
+    std::string TaskId() const;
+    void setTaskId(std::string v);
     /// Whether the optional attribute Status is defined for this IfcTask
-    bool hasStatus();
+    bool hasStatus() const;
     /// Current status of the task.
     /// 
     /// NOTE: Particular values for status are not
     ///   specified, these should be determined and agreed by local
     ///   usage. Examples of possible status values include 'Not Yet
     ///   Started', 'Started', 'Completed'.
-    IfcLabel Status();
-    void setStatus(IfcLabel v);
+    std::string Status() const;
+    void setStatus(std::string v);
     /// Whether the optional attribute WorkMethod is defined for this IfcTask
-    bool hasWorkMethod();
+    bool hasWorkMethod() const;
     /// The method of work used in carrying out a task.
     /// 
     /// NOTE: This attribute should
     ///   not be used if the work method is specified for the
     ///   IfcTaskType
-    IfcLabel WorkMethod();
-    void setWorkMethod(IfcLabel v);
+    std::string WorkMethod() const;
+    void setWorkMethod(std::string v);
     /// Identifies whether a task is a milestone task (=TRUE) or not
     ///   (= FALSE).
     /// 
@@ -24458,26 +25212,25 @@ class IfcTask : public IfcProcess {
     ///   a milestone task may be understood to be a task having no
     ///   duration. As such, it represents a singular point in
     ///   time.
-    bool IsMilestone();
+    bool IsMilestone() const;
     void setIsMilestone(bool v);
     /// Whether the optional attribute Priority is defined for this IfcTask
-    bool hasPriority();
+    bool hasPriority() const;
     /// A value that indicates the relative priority of the task (in
     ///   comparison to the priorities of other tasks).
-    int Priority();
+    int Priority() const;
     void setPriority(int v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 5: return IfcUtil::Argument_STRING; case 6: return IfcUtil::Argument_STRING; case 7: return IfcUtil::Argument_STRING; case 8: return IfcUtil::Argument_BOOL; case 9: return IfcUtil::Argument_INT; } return IfcProcess::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 5: return Type::IfcIdentifier; case 6: return Type::IfcLabel; case 7: return Type::IfcLabel; case 8: return Type::UNDEFINED; case 9: return Type::UNDEFINED; } return IfcProcess::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 5: return "TaskId"; case 6: return "Status"; case 7: return "WorkMethod"; case 8: return "IsMilestone"; case 9: return "Priority"; } return IfcProcess::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcTask (IfcAbstractEntityPtr e);
-    IfcTask (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcIdentifier v6_TaskId, boost::optional< IfcLabel > v7_Status, boost::optional< IfcLabel > v8_WorkMethod, bool v9_IsMilestone, boost::optional< int > v10_Priority);
-    typedef IfcTask* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcTask > > list;
-    typedef IfcTemplatedEntityList< IfcTask >::it it;
+    IfcTask (IfcAbstractEntity* e);
+    IfcTask (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, std::string v6_TaskId, boost::optional< std::string > v7_Status, boost::optional< std::string > v8_WorkMethod, bool v9_IsMilestone, boost::optional< int > v10_Priority);
+    typedef IfcTemplatedEntityList< IfcTask > list;
 };
 /// Definition from IAI: The element type
 /// IfcTransportElementType defines commonly shared
@@ -24545,20 +25298,19 @@ class IfcTask : public IfcProcess {
 class IfcTransportElementType : public IfcElementType {
 public:
     /// Predefined types to define the particular type of the transport element. There may be property set definitions available for each predefined type.
-    IfcTransportElementTypeEnum::IfcTransportElementTypeEnum PredefinedType();
+    IfcTransportElementTypeEnum::IfcTransportElementTypeEnum PredefinedType() const;
     void setPredefinedType(IfcTransportElementTypeEnum::IfcTransportElementTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcElementType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcTransportElementTypeEnum; } return IfcElementType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcElementType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcTransportElementType (IfcAbstractEntityPtr e);
-    IfcTransportElementType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcTransportElementTypeEnum::IfcTransportElementTypeEnum v10_PredefinedType);
-    typedef IfcTransportElementType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcTransportElementType > > list;
-    typedef IfcTemplatedEntityList< IfcTransportElementType >::it it;
+    IfcTransportElementType (IfcAbstractEntity* e);
+    IfcTransportElementType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcTransportElementTypeEnum::IfcTransportElementTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcTransportElementType > list;
 };
 /// The IfcActor defines all actors or human agents involved in a project during its full life cycle. It facilitates the use of person and organization definitions in the resource part of the IFC object model. This includes name, address, telecommunication addresses, and roles.
 /// 
@@ -24578,21 +25330,20 @@ class IfcTransportElementType : public IfcElementType {
 class IfcActor : public IfcObject {
 public:
     /// Information about the actor.
-    IfcActorSelect TheActor();
-    void setTheActor(IfcActorSelect v);
+    IfcActorSelect* TheActor() const;
+    void setTheActor(IfcActorSelect* v);
     virtual unsigned int getArgumentCount() const { return 6; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 5: return IfcUtil::Argument_ENTITY; } return IfcObject::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 5: return Type::IfcActorSelect; } return IfcObject::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 5: return "TheActor"; } return IfcObject::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelAssignsToActor > > IsActingUpon(); // INVERSE IfcRelAssignsToActor::RelatingActor
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcRelAssignsToActor >::ptr IsActingUpon() const; // INVERSE IfcRelAssignsToActor::RelatingActor
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcActor (IfcAbstractEntityPtr e);
-    IfcActor (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcActorSelect v6_TheActor);
-    typedef IfcActor* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcActor > > list;
-    typedef IfcTemplatedEntityList< IfcActor >::it it;
+    IfcActor (IfcAbstractEntity* e);
+    IfcActor (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcActorSelect* v6_TheActor);
+    typedef IfcTemplatedEntityList< IfcActor > list;
 };
 /// Definition from IAI: An annotation is a graphical
 ///   representation within the geometric (and spatial) context
@@ -24771,17 +25522,16 @@ class IfcAnnotation : public IfcProduct {
 public:
     virtual unsigned int getArgumentCount() const { return 7; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcProduct::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcProduct::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcProduct::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelContainedInSpatialStructure > > ContainedInStructure(); // INVERSE IfcRelContainedInSpatialStructure::RelatedElements
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcRelContainedInSpatialStructure >::ptr ContainedInStructure() const; // INVERSE IfcRelContainedInSpatialStructure::RelatedElements
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcAnnotation (IfcAbstractEntityPtr e);
-    IfcAnnotation (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation);
-    typedef IfcAnnotation* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcAnnotation > > list;
-    typedef IfcTemplatedEntityList< IfcAnnotation >::it it;
+    IfcAnnotation (IfcAbstractEntity* e);
+    IfcAnnotation (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation);
+    typedef IfcTemplatedEntityList< IfcAnnotation > list;
 };
 /// IfcAsymmetricIShapeProfileDef
 /// defines a section profile that provides the defining parameters of a
@@ -24823,34 +25573,33 @@ class IfcAnnotation : public IfcProduct {
 class IfcAsymmetricIShapeProfileDef : public IfcIShapeProfileDef {
 public:
     /// Extent of the top flange, defined parallel to the x axis of the position coordinate system.
-    IfcPositiveLengthMeasure TopFlangeWidth();
-    void setTopFlangeWidth(IfcPositiveLengthMeasure v);
+    double TopFlangeWidth() const;
+    void setTopFlangeWidth(double v);
     /// Whether the optional attribute TopFlangeThickness is defined for this IfcAsymmetricIShapeProfileDef
-    bool hasTopFlangeThickness();
+    bool hasTopFlangeThickness() const;
     /// Flange thickness of the top flange of the I-shape.
-    IfcPositiveLengthMeasure TopFlangeThickness();
-    void setTopFlangeThickness(IfcPositiveLengthMeasure v);
+    double TopFlangeThickness() const;
+    void setTopFlangeThickness(double v);
     /// Whether the optional attribute TopFlangeFilletRadius is defined for this IfcAsymmetricIShapeProfileDef
-    bool hasTopFlangeFilletRadius();
+    bool hasTopFlangeFilletRadius() const;
     /// The fillet between the web and the top flange of the I-shape.
-    IfcPositiveLengthMeasure TopFlangeFilletRadius();
-    void setTopFlangeFilletRadius(IfcPositiveLengthMeasure v);
+    double TopFlangeFilletRadius() const;
+    void setTopFlangeFilletRadius(double v);
     /// Whether the optional attribute CentreOfGravityInY is defined for this IfcAsymmetricIShapeProfileDef
-    bool hasCentreOfGravityInY();
-    IfcPositiveLengthMeasure CentreOfGravityInY();
-    void setCentreOfGravityInY(IfcPositiveLengthMeasure v);
+    bool hasCentreOfGravityInY() const;
+    double CentreOfGravityInY() const;
+    void setCentreOfGravityInY(double v);
     virtual unsigned int getArgumentCount() const { return 12; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_DOUBLE; case 9: return IfcUtil::Argument_DOUBLE; case 10: return IfcUtil::Argument_DOUBLE; case 11: return IfcUtil::Argument_DOUBLE; } return IfcIShapeProfileDef::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcPositiveLengthMeasure; case 9: return Type::IfcPositiveLengthMeasure; case 10: return Type::IfcPositiveLengthMeasure; case 11: return Type::IfcPositiveLengthMeasure; } return IfcIShapeProfileDef::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "TopFlangeWidth"; case 9: return "TopFlangeThickness"; case 10: return "TopFlangeFilletRadius"; case 11: return "CentreOfGravityInY"; } return IfcIShapeProfileDef::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcAsymmetricIShapeProfileDef (IfcAbstractEntityPtr e);
-    IfcAsymmetricIShapeProfileDef (IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< IfcLabel > v2_ProfileName, IfcAxis2Placement2D* v3_Position, IfcPositiveLengthMeasure v4_OverallWidth, IfcPositiveLengthMeasure v5_OverallDepth, IfcPositiveLengthMeasure v6_WebThickness, IfcPositiveLengthMeasure v7_FlangeThickness, boost::optional< IfcPositiveLengthMeasure > v8_FilletRadius, IfcPositiveLengthMeasure v9_TopFlangeWidth, boost::optional< IfcPositiveLengthMeasure > v10_TopFlangeThickness, boost::optional< IfcPositiveLengthMeasure > v11_TopFlangeFilletRadius, boost::optional< IfcPositiveLengthMeasure > v12_CentreOfGravityInY);
-    typedef IfcAsymmetricIShapeProfileDef* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcAsymmetricIShapeProfileDef > > list;
-    typedef IfcTemplatedEntityList< IfcAsymmetricIShapeProfileDef >::it it;
+    IfcAsymmetricIShapeProfileDef (IfcAbstractEntity* e);
+    IfcAsymmetricIShapeProfileDef (IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< std::string > v2_ProfileName, IfcAxis2Placement2D* v3_Position, double v4_OverallWidth, double v5_OverallDepth, double v6_WebThickness, double v7_FlangeThickness, boost::optional< double > v8_FilletRadius, double v9_TopFlangeWidth, boost::optional< double > v10_TopFlangeThickness, boost::optional< double > v11_TopFlangeFilletRadius, boost::optional< double > v12_CentreOfGravityInY);
+    typedef IfcTemplatedEntityList< IfcAsymmetricIShapeProfileDef > list;
 };
 /// The IfcBlock is a Construction Solid Geometry (CSG) 3D
 /// primitive. It is defined by a position and a positve distance along
@@ -24952,26 +25701,25 @@ class IfcAsymmetricIShapeProfileDef : public IfcIShapeProfileDef {
 class IfcBlock : public IfcCsgPrimitive3D {
 public:
     /// The size of the block along the placement X axis. It is provided by the inherited axis placement through SELF\IfcCsgPrimitive3D.Position.P[1].
-    IfcPositiveLengthMeasure XLength();
-    void setXLength(IfcPositiveLengthMeasure v);
+    double XLength() const;
+    void setXLength(double v);
     /// The size of the block along the placement Y axis. It is provided by the inherited axis placement through SELF\IfcCsgPrimitive3D.Position.P[2].
-    IfcPositiveLengthMeasure YLength();
-    void setYLength(IfcPositiveLengthMeasure v);
+    double YLength() const;
+    void setYLength(double v);
     /// The size of the block along the placement Z axis. It is provided by the inherited axis placement through SELF\IfcCsgPrimitive3D.Position.P[3].
-    IfcPositiveLengthMeasure ZLength();
-    void setZLength(IfcPositiveLengthMeasure v);
+    double ZLength() const;
+    void setZLength(double v);
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 1: return IfcUtil::Argument_DOUBLE; case 2: return IfcUtil::Argument_DOUBLE; case 3: return IfcUtil::Argument_DOUBLE; } return IfcCsgPrimitive3D::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 1: return Type::IfcPositiveLengthMeasure; case 2: return Type::IfcPositiveLengthMeasure; case 3: return Type::IfcPositiveLengthMeasure; } return IfcCsgPrimitive3D::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 1: return "XLength"; case 2: return "YLength"; case 3: return "ZLength"; } return IfcCsgPrimitive3D::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcBlock (IfcAbstractEntityPtr e);
-    IfcBlock (IfcAxis2Placement3D* v1_Position, IfcPositiveLengthMeasure v2_XLength, IfcPositiveLengthMeasure v3_YLength, IfcPositiveLengthMeasure v4_ZLength);
-    typedef IfcBlock* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcBlock > > list;
-    typedef IfcTemplatedEntityList< IfcBlock >::it it;
+    IfcBlock (IfcAbstractEntity* e);
+    IfcBlock (IfcAxis2Placement3D* v1_Position, double v2_XLength, double v3_YLength, double v4_ZLength);
+    typedef IfcTemplatedEntityList< IfcBlock > list;
 };
 /// A clipping result is defined as a special subtype of the general Boolean result (IfcBooleanResult). It constrains the operands and the operator of the Boolean result. 
 /// 
@@ -24984,16 +25732,15 @@ class IfcBooleanClippingResult : public IfcBooleanResult {
 public:
     virtual unsigned int getArgumentCount() const { return 3; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcBooleanResult::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcBooleanResult::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcBooleanResult::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcBooleanClippingResult (IfcAbstractEntityPtr e);
-    IfcBooleanClippingResult (IfcBooleanOperator::IfcBooleanOperator v1_Operator, IfcBooleanOperand v2_FirstOperand, IfcBooleanOperand v3_SecondOperand);
-    typedef IfcBooleanClippingResult* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcBooleanClippingResult > > list;
-    typedef IfcTemplatedEntityList< IfcBooleanClippingResult >::it it;
+    IfcBooleanClippingResult (IfcAbstractEntity* e);
+    IfcBooleanClippingResult (IfcBooleanOperator::IfcBooleanOperator v1_Operator, IfcBooleanOperand* v2_FirstOperand, IfcBooleanOperand* v3_SecondOperand);
+    typedef IfcTemplatedEntityList< IfcBooleanClippingResult > list;
 };
 /// Definition from ISO/CD 10303-42:1992: A bounded curve is a curve of finite arc length with identifiable end points. 
 /// 
@@ -25009,16 +25756,15 @@ class IfcBoundedCurve : public IfcCurve {
 public:
     virtual unsigned int getArgumentCount() const { return 0; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcCurve::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcCurve::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcCurve::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcBoundedCurve (IfcAbstractEntityPtr e);
+    IfcBoundedCurve (IfcAbstractEntity* e);
     IfcBoundedCurve ();
-    typedef IfcBoundedCurve* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcBoundedCurve > > list;
-    typedef IfcTemplatedEntityList< IfcBoundedCurve >::it it;
+    typedef IfcTemplatedEntityList< IfcBoundedCurve > list;
 };
 /// Definition from ISO 6707-1:1989: Construction work that
 /// has the provision of shelter for its occupants or contents as one
@@ -25198,32 +25944,31 @@ class IfcBoundedCurve : public IfcCurve {
 class IfcBuilding : public IfcSpatialStructureElement {
 public:
     /// Whether the optional attribute ElevationOfRefHeight is defined for this IfcBuilding
-    bool hasElevationOfRefHeight();
+    bool hasElevationOfRefHeight() const;
     /// Elevation above sea level of the reference height used for all storey elevation measures, equals to height 0.0. It is usually the ground floor level.
-    IfcLengthMeasure ElevationOfRefHeight();
-    void setElevationOfRefHeight(IfcLengthMeasure v);
+    double ElevationOfRefHeight() const;
+    void setElevationOfRefHeight(double v);
     /// Whether the optional attribute ElevationOfTerrain is defined for this IfcBuilding
-    bool hasElevationOfTerrain();
+    bool hasElevationOfTerrain() const;
     /// Elevation above the minimal terrain level around the foot print of the building, given in elevation above sea level.
-    IfcLengthMeasure ElevationOfTerrain();
-    void setElevationOfTerrain(IfcLengthMeasure v);
+    double ElevationOfTerrain() const;
+    void setElevationOfTerrain(double v);
     /// Whether the optional attribute BuildingAddress is defined for this IfcBuilding
-    bool hasBuildingAddress();
+    bool hasBuildingAddress() const;
     /// Address given to the building for postal purposes.
-    IfcPostalAddress* BuildingAddress();
+    IfcPostalAddress* BuildingAddress() const;
     void setBuildingAddress(IfcPostalAddress* v);
     virtual unsigned int getArgumentCount() const { return 12; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_DOUBLE; case 10: return IfcUtil::Argument_DOUBLE; case 11: return IfcUtil::Argument_ENTITY; } return IfcSpatialStructureElement::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcLengthMeasure; case 10: return Type::IfcLengthMeasure; case 11: return Type::IfcPostalAddress; } return IfcSpatialStructureElement::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "ElevationOfRefHeight"; case 10: return "ElevationOfTerrain"; case 11: return "BuildingAddress"; } return IfcSpatialStructureElement::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcBuilding (IfcAbstractEntityPtr e);
-    IfcBuilding (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcLabel > v8_LongName, IfcElementCompositionEnum::IfcElementCompositionEnum v9_CompositionType, boost::optional< IfcLengthMeasure > v10_ElevationOfRefHeight, boost::optional< IfcLengthMeasure > v11_ElevationOfTerrain, IfcPostalAddress* v12_BuildingAddress);
-    typedef IfcBuilding* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcBuilding > > list;
-    typedef IfcTemplatedEntityList< IfcBuilding >::it it;
+    IfcBuilding (IfcAbstractEntity* e);
+    IfcBuilding (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_LongName, IfcElementCompositionEnum::IfcElementCompositionEnum v9_CompositionType, boost::optional< double > v10_ElevationOfRefHeight, boost::optional< double > v11_ElevationOfTerrain, IfcPostalAddress* v12_BuildingAddress);
+    typedef IfcTemplatedEntityList< IfcBuilding > list;
 };
 /// Definition from IAI: The element type
 ///   (IfcBuildingElementType) defines a list of commonly
@@ -25258,16 +26003,15 @@ class IfcBuildingElementType : public IfcElementType {
 public:
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcElementType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcElementType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcElementType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcBuildingElementType (IfcAbstractEntityPtr e);
-    IfcBuildingElementType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType);
-    typedef IfcBuildingElementType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcBuildingElementType > > list;
-    typedef IfcTemplatedEntityList< IfcBuildingElementType >::it it;
+    IfcBuildingElementType (IfcAbstractEntity* e);
+    IfcBuildingElementType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType);
+    typedef IfcTemplatedEntityList< IfcBuildingElementType > list;
 };
 /// The building storey has an
 /// elevation and typically represents a (nearly) horizontal
@@ -25449,22 +26193,21 @@ class IfcBuildingElementType : public IfcElementType {
 class IfcBuildingStorey : public IfcSpatialStructureElement {
 public:
     /// Whether the optional attribute Elevation is defined for this IfcBuildingStorey
-    bool hasElevation();
+    bool hasElevation() const;
     /// Elevation of the base of this storey, relative to the 0,00 internal reference height of the building. The 0.00 level is given by the absolute above sea level height by the ElevationOfRefHeight attribute given at IfcBuilding.
-    IfcLengthMeasure Elevation();
-    void setElevation(IfcLengthMeasure v);
+    double Elevation() const;
+    void setElevation(double v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_DOUBLE; } return IfcSpatialStructureElement::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcLengthMeasure; } return IfcSpatialStructureElement::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "Elevation"; } return IfcSpatialStructureElement::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcBuildingStorey (IfcAbstractEntityPtr e);
-    IfcBuildingStorey (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcLabel > v8_LongName, IfcElementCompositionEnum::IfcElementCompositionEnum v9_CompositionType, boost::optional< IfcLengthMeasure > v10_Elevation);
-    typedef IfcBuildingStorey* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcBuildingStorey > > list;
-    typedef IfcTemplatedEntityList< IfcBuildingStorey >::it it;
+    IfcBuildingStorey (IfcAbstractEntity* e);
+    IfcBuildingStorey (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_LongName, IfcElementCompositionEnum::IfcElementCompositionEnum v9_CompositionType, boost::optional< double > v10_Elevation);
+    typedef IfcTemplatedEntityList< IfcBuildingStorey > list;
 };
 /// IfcCircleHollowProfileDef
 /// defines a section profile that provides the defining parameters of a
@@ -25487,20 +26230,19 @@ class IfcBuildingStorey : public IfcSpatialStructureElement {
 class IfcCircleHollowProfileDef : public IfcCircleProfileDef {
 public:
     /// Thickness of the material, it is the difference between the outer and inner radius.
-    IfcPositiveLengthMeasure WallThickness();
-    void setWallThickness(IfcPositiveLengthMeasure v);
+    double WallThickness() const;
+    void setWallThickness(double v);
     virtual unsigned int getArgumentCount() const { return 5; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 4: return IfcUtil::Argument_DOUBLE; } return IfcCircleProfileDef::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 4: return Type::IfcPositiveLengthMeasure; } return IfcCircleProfileDef::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 4: return "WallThickness"; } return IfcCircleProfileDef::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcCircleHollowProfileDef (IfcAbstractEntityPtr e);
-    IfcCircleHollowProfileDef (IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< IfcLabel > v2_ProfileName, IfcAxis2Placement2D* v3_Position, IfcPositiveLengthMeasure v4_Radius, IfcPositiveLengthMeasure v5_WallThickness);
-    typedef IfcCircleHollowProfileDef* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcCircleHollowProfileDef > > list;
-    typedef IfcTemplatedEntityList< IfcCircleHollowProfileDef >::it it;
+    IfcCircleHollowProfileDef (IfcAbstractEntity* e);
+    IfcCircleHollowProfileDef (IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< std::string > v2_ProfileName, IfcAxis2Placement2D* v3_Position, double v4_Radius, double v5_WallThickness);
+    typedef IfcTemplatedEntityList< IfcCircleHollowProfileDef > list;
 };
 /// Definition from IAI: The element type
 /// IfcColumnType defines commonly shared information for
@@ -25603,20 +26345,19 @@ class IfcCircleHollowProfileDef : public IfcCircleProfileDef {
 class IfcColumnType : public IfcBuildingElementType {
 public:
     /// Identifies the predefined types of a column element from which the type required may be set.
-    IfcColumnTypeEnum::IfcColumnTypeEnum PredefinedType();
+    IfcColumnTypeEnum::IfcColumnTypeEnum PredefinedType() const;
     void setPredefinedType(IfcColumnTypeEnum::IfcColumnTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcBuildingElementType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcColumnTypeEnum; } return IfcBuildingElementType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcBuildingElementType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcColumnType (IfcAbstractEntityPtr e);
-    IfcColumnType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcColumnTypeEnum::IfcColumnTypeEnum v10_PredefinedType);
-    typedef IfcColumnType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcColumnType > > list;
-    typedef IfcTemplatedEntityList< IfcColumnType >::it it;
+    IfcColumnType (IfcAbstractEntity* e);
+    IfcColumnType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcColumnTypeEnum::IfcColumnTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcColumnType > list;
 };
 /// Definition from ISO/CD 10303-42:1992: A composite
 ///   curve is a collection of curves joined end-to-end. The
@@ -25687,23 +26428,22 @@ class IfcColumnType : public IfcBuildingElementType {
 class IfcCompositeCurve : public IfcBoundedCurve {
 public:
     /// The component bounded curves, their transitions and senses. The transition attribute for the last segment defines the transition between the end of the last segment and the start of the first; this transition attribute may take the value discontinuous, which indicates an open curve.
-    SHARED_PTR< IfcTemplatedEntityList< IfcCompositeCurveSegment > > Segments();
-    void setSegments(SHARED_PTR< IfcTemplatedEntityList< IfcCompositeCurveSegment > > v);
+    IfcTemplatedEntityList< IfcCompositeCurveSegment >::ptr Segments() const;
+    void setSegments(IfcTemplatedEntityList< IfcCompositeCurveSegment >::ptr v);
     /// Indication of whether the curve intersects itself or not; this is for information only.
-    bool SelfIntersect();
+    bool SelfIntersect() const;
     void setSelfIntersect(bool v);
     virtual unsigned int getArgumentCount() const { return 2; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY_LIST; case 1: return IfcUtil::Argument_BOOL; } return IfcBoundedCurve::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcCompositeCurveSegment; case 1: return Type::UNDEFINED; } return IfcBoundedCurve::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Segments"; case 1: return "SelfIntersect"; } return IfcBoundedCurve::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcCompositeCurve (IfcAbstractEntityPtr e);
-    IfcCompositeCurve (SHARED_PTR< IfcTemplatedEntityList< IfcCompositeCurveSegment > > v1_Segments, bool v2_SelfIntersect);
-    typedef IfcCompositeCurve* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcCompositeCurve > > list;
-    typedef IfcTemplatedEntityList< IfcCompositeCurve >::it it;
+    IfcCompositeCurve (IfcAbstractEntity* e);
+    IfcCompositeCurve (IfcTemplatedEntityList< IfcCompositeCurveSegment >::ptr v1_Segments, bool v2_SelfIntersect);
+    typedef IfcTemplatedEntityList< IfcCompositeCurve > list;
 };
 /// Definition from ISO/CD 10303-42:1992: A conic (IfcConic) is a planar curve which could be produced by intersecting a plane with a cone. A conic is defined in terms of its intrinsic geometric properties rather than being described in terms of other geometry. A conic class always has a placement coordinate system defined by a two or three dimensional placement. The parametric representation is defined in terms of this placement coordinate system.
 /// 
@@ -25713,20 +26453,19 @@ class IfcCompositeCurve : public IfcBoundedCurve {
 class IfcConic : public IfcCurve {
 public:
     /// The location and orientation of the conic. Further details of the interpretation of this attribute are given for the individual subtypes."
-    IfcAxis2Placement Position();
-    void setPosition(IfcAxis2Placement v);
+    IfcAxis2Placement* Position() const;
+    void setPosition(IfcAxis2Placement* v);
     virtual unsigned int getArgumentCount() const { return 1; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY; } return IfcCurve::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcAxis2Placement; } return IfcCurve::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Position"; } return IfcCurve::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcConic (IfcAbstractEntityPtr e);
-    IfcConic (IfcAxis2Placement v1_Position);
-    typedef IfcConic* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcConic > > list;
-    typedef IfcTemplatedEntityList< IfcConic >::it it;
+    IfcConic (IfcAbstractEntity* e);
+    IfcConic (IfcAxis2Placement* v1_Position);
+    typedef IfcTemplatedEntityList< IfcConic > list;
 };
 /// IfcConstructionResource is an abstract generalization of the different resources used in
 /// construction projects, mainly labor, material, equipment and product resources, plus subcontracted resources and aggregations such as a crew resource.
@@ -25803,34 +26542,33 @@ class IfcConic : public IfcCurve {
 class IfcConstructionResource : public IfcResource {
 public:
     /// Whether the optional attribute ResourceIdentifier is defined for this IfcConstructionResource
-    bool hasResourceIdentifier();
-    IfcIdentifier ResourceIdentifier();
-    void setResourceIdentifier(IfcIdentifier v);
+    bool hasResourceIdentifier() const;
+    std::string ResourceIdentifier() const;
+    void setResourceIdentifier(std::string v);
     /// Whether the optional attribute ResourceGroup is defined for this IfcConstructionResource
-    bool hasResourceGroup();
-    IfcLabel ResourceGroup();
-    void setResourceGroup(IfcLabel v);
+    bool hasResourceGroup() const;
+    std::string ResourceGroup() const;
+    void setResourceGroup(std::string v);
     /// Whether the optional attribute ResourceConsumption is defined for this IfcConstructionResource
-    bool hasResourceConsumption();
+    bool hasResourceConsumption() const;
     /// Indicates how the resource is consumed or occupied during its use in a process.  Production-based consumption is indicated by CONSUMED, PARTIALLYCONSUMED, or NOTCONSUMED, where QuantityProduced refers to a quantity on the IfcProduct to which the assigned IfcProcess is assigned.  Duration-based occupation is indicated by OCCUPIED, PARTIALLYOCCUPIED, or NOTOCCUPIED, where QuantityProduced refers to a quantity on the IfcProcess to which the resource is assigned.
-    IfcResourceConsumptionEnum::IfcResourceConsumptionEnum ResourceConsumption();
+    IfcResourceConsumptionEnum::IfcResourceConsumptionEnum ResourceConsumption() const;
     void setResourceConsumption(IfcResourceConsumptionEnum::IfcResourceConsumptionEnum v);
     /// Whether the optional attribute BaseQuantity is defined for this IfcConstructionResource
-    bool hasBaseQuantity();
-    IfcMeasureWithUnit* BaseQuantity();
+    bool hasBaseQuantity() const;
+    IfcMeasureWithUnit* BaseQuantity() const;
     void setBaseQuantity(IfcMeasureWithUnit* v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 5: return IfcUtil::Argument_STRING; case 6: return IfcUtil::Argument_STRING; case 7: return IfcUtil::Argument_ENUMERATION; case 8: return IfcUtil::Argument_ENTITY; } return IfcResource::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 5: return Type::IfcIdentifier; case 6: return Type::IfcLabel; case 7: return Type::IfcResourceConsumptionEnum; case 8: return Type::IfcMeasureWithUnit; } return IfcResource::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 5: return "ResourceIdentifier"; case 6: return "ResourceGroup"; case 7: return "ResourceConsumption"; case 8: return "BaseQuantity"; } return IfcResource::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcConstructionResource (IfcAbstractEntityPtr e);
-    IfcConstructionResource (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, boost::optional< IfcIdentifier > v6_ResourceIdentifier, boost::optional< IfcLabel > v7_ResourceGroup, boost::optional< IfcResourceConsumptionEnum::IfcResourceConsumptionEnum > v8_ResourceConsumption, IfcMeasureWithUnit* v9_BaseQuantity);
-    typedef IfcConstructionResource* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcConstructionResource > > list;
-    typedef IfcTemplatedEntityList< IfcConstructionResource >::it it;
+    IfcConstructionResource (IfcAbstractEntity* e);
+    IfcConstructionResource (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, boost::optional< std::string > v6_ResourceIdentifier, boost::optional< std::string > v7_ResourceGroup, boost::optional< IfcResourceConsumptionEnum::IfcResourceConsumptionEnum > v8_ResourceConsumption, IfcMeasureWithUnit* v9_BaseQuantity);
+    typedef IfcTemplatedEntityList< IfcConstructionResource > list;
 };
 /// IfcControl is the abstract generalization of all concepts that control or constrain the utilization of products, processes, or resources in general. It can be seen as a regulation, cost schedule, request or order, or other requirements applied to a product, process or resource whose requirements and provisions must be fulfilled.
 /// 
@@ -25846,17 +26584,16 @@ class IfcControl : public IfcObject {
 public:
     virtual unsigned int getArgumentCount() const { return 5; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcObject::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcObject::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcObject::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelAssignsToControl > > Controls(); // INVERSE IfcRelAssignsToControl::RelatingControl
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcRelAssignsToControl >::ptr Controls() const; // INVERSE IfcRelAssignsToControl::RelatingControl
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcControl (IfcAbstractEntityPtr e);
-    IfcControl (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType);
-    typedef IfcControl* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcControl > > list;
-    typedef IfcTemplatedEntityList< IfcControl >::it it;
+    IfcControl (IfcAbstractEntity* e);
+    IfcControl (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType);
+    typedef IfcTemplatedEntityList< IfcControl > list;
 };
 /// An IfcCostItem describes a cost or financial value together with descriptive information that describes its context in a form that enables it to be used within a cost schedule. An IfcCostItem can be used to represent the cost of goods and services, the execution of works by a process, lifecycle cost and more.
 /// 
@@ -25898,16 +26635,15 @@ class IfcCostItem : public IfcControl {
 public:
     virtual unsigned int getArgumentCount() const { return 5; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcControl::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcControl::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcControl::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcCostItem (IfcAbstractEntityPtr e);
-    IfcCostItem (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType);
-    typedef IfcCostItem* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcCostItem > > list;
-    typedef IfcTemplatedEntityList< IfcCostItem >::it it;
+    IfcCostItem (IfcAbstractEntity* e);
+    IfcCostItem (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType);
+    typedef IfcTemplatedEntityList< IfcCostItem > list;
 };
 /// An IfcCostSchedule brings together instances of IfcCostItem either for the purpose of identifying purely cost information as in an estimate for constructions costs or for including cost information within another presentation form such as a work order.
 /// 
@@ -25935,22 +26671,22 @@ class IfcCostItem : public IfcControl {
 class IfcCostSchedule : public IfcControl {
 public:
     /// Whether the optional attribute SubmittedBy is defined for this IfcCostSchedule
-    bool hasSubmittedBy();
-    IfcActorSelect SubmittedBy();
-    void setSubmittedBy(IfcActorSelect v);
+    bool hasSubmittedBy() const;
+    IfcActorSelect* SubmittedBy() const;
+    void setSubmittedBy(IfcActorSelect* v);
     /// Whether the optional attribute PreparedBy is defined for this IfcCostSchedule
-    bool hasPreparedBy();
-    IfcActorSelect PreparedBy();
-    void setPreparedBy(IfcActorSelect v);
+    bool hasPreparedBy() const;
+    IfcActorSelect* PreparedBy() const;
+    void setPreparedBy(IfcActorSelect* v);
     /// Whether the optional attribute SubmittedOn is defined for this IfcCostSchedule
-    bool hasSubmittedOn();
+    bool hasSubmittedOn() const;
     /// The date and time on which the cost schedule was submitted.
     /// 
     /// IFC2x4 CHANGE Type changed from IfcDateTimeSelect.
-    IfcDateTimeSelect SubmittedOn();
-    void setSubmittedOn(IfcDateTimeSelect v);
+    IfcDateTimeSelect* SubmittedOn() const;
+    void setSubmittedOn(IfcDateTimeSelect* v);
     /// Whether the optional attribute Status is defined for this IfcCostSchedule
-    bool hasStatus();
+    bool hasStatus() const;
     /// The current status of a cost schedule. Examples of status values that might be used for a cost schedule status include:
     /// 
     /// PLANNED 
@@ -25958,38 +26694,37 @@ class IfcCostSchedule : public IfcControl {
     ///   AGREED 
     ///   ISSUED 
     ///   STARTED
-    IfcLabel Status();
-    void setStatus(IfcLabel v);
+    std::string Status() const;
+    void setStatus(std::string v);
     /// Whether the optional attribute TargetUsers is defined for this IfcCostSchedule
-    bool hasTargetUsers();
-    SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > TargetUsers();
-    void setTargetUsers(SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > v);
+    bool hasTargetUsers() const;
+    IfcEntityList::ptr TargetUsers() const;
+    void setTargetUsers(IfcEntityList::ptr v);
     /// Whether the optional attribute UpdateDate is defined for this IfcCostSchedule
-    bool hasUpdateDate();
+    bool hasUpdateDate() const;
     /// The date and time that this cost schedule is updated; this allows tracking the schedule history.
     /// 
     /// IFC2x4 CHANGE Type changed from IfcDateTimeSelect.
-    IfcDateTimeSelect UpdateDate();
-    void setUpdateDate(IfcDateTimeSelect v);
-    IfcIdentifier ID();
-    void setID(IfcIdentifier v);
+    IfcDateTimeSelect* UpdateDate() const;
+    void setUpdateDate(IfcDateTimeSelect* v);
+    std::string ID() const;
+    void setID(std::string v);
     /// Predefined generic type for a cost schedule that is specified in an enumeration. There may be a property set given specifically for the predefined types.
     /// 
     /// IFC2x4 CHANGE  The attribute has been made optional.
-    IfcCostScheduleTypeEnum::IfcCostScheduleTypeEnum PredefinedType();
+    IfcCostScheduleTypeEnum::IfcCostScheduleTypeEnum PredefinedType() const;
     void setPredefinedType(IfcCostScheduleTypeEnum::IfcCostScheduleTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 13; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 5: return IfcUtil::Argument_ENTITY; case 6: return IfcUtil::Argument_ENTITY; case 7: return IfcUtil::Argument_ENTITY; case 8: return IfcUtil::Argument_STRING; case 9: return IfcUtil::Argument_ENTITY_LIST; case 10: return IfcUtil::Argument_ENTITY; case 11: return IfcUtil::Argument_STRING; case 12: return IfcUtil::Argument_ENUMERATION; } return IfcControl::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 5: return Type::IfcActorSelect; case 6: return Type::IfcActorSelect; case 7: return Type::IfcDateTimeSelect; case 8: return Type::IfcLabel; case 9: return Type::IfcActorSelect; case 10: return Type::IfcDateTimeSelect; case 11: return Type::IfcIdentifier; case 12: return Type::IfcCostScheduleTypeEnum; } return IfcControl::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 5: return "SubmittedBy"; case 6: return "PreparedBy"; case 7: return "SubmittedOn"; case 8: return "Status"; case 9: return "TargetUsers"; case 10: return "UpdateDate"; case 11: return "ID"; case 12: return "PredefinedType"; } return IfcControl::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcCostSchedule (IfcAbstractEntityPtr e);
-    IfcCostSchedule (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, boost::optional< IfcActorSelect > v6_SubmittedBy, boost::optional< IfcActorSelect > v7_PreparedBy, boost::optional< IfcDateTimeSelect > v8_SubmittedOn, boost::optional< IfcLabel > v9_Status, boost::optional< IfcEntities > v10_TargetUsers, boost::optional< IfcDateTimeSelect > v11_UpdateDate, IfcIdentifier v12_ID, IfcCostScheduleTypeEnum::IfcCostScheduleTypeEnum v13_PredefinedType);
-    typedef IfcCostSchedule* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcCostSchedule > > list;
-    typedef IfcTemplatedEntityList< IfcCostSchedule >::it it;
+    IfcCostSchedule (IfcAbstractEntity* e);
+    IfcCostSchedule (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcActorSelect* v6_SubmittedBy, IfcActorSelect* v7_PreparedBy, IfcDateTimeSelect* v8_SubmittedOn, boost::optional< std::string > v9_Status, boost::optional< IfcEntityList::ptr > v10_TargetUsers, IfcDateTimeSelect* v11_UpdateDate, std::string v12_ID, IfcCostScheduleTypeEnum::IfcCostScheduleTypeEnum v13_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcCostSchedule > list;
 };
 /// Definition from IAI: The element type
 /// IfcCoveringType defines commonly shared information for
@@ -26073,20 +26808,19 @@ class IfcCostSchedule : public IfcControl {
 class IfcCoveringType : public IfcBuildingElementType {
 public:
     /// Predefined types to define the particular type of the covering. There may be property set definitions available for each predefined type.
-    IfcCoveringTypeEnum::IfcCoveringTypeEnum PredefinedType();
+    IfcCoveringTypeEnum::IfcCoveringTypeEnum PredefinedType() const;
     void setPredefinedType(IfcCoveringTypeEnum::IfcCoveringTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcBuildingElementType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcCoveringTypeEnum; } return IfcBuildingElementType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcBuildingElementType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcCoveringType (IfcAbstractEntityPtr e);
-    IfcCoveringType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcCoveringTypeEnum::IfcCoveringTypeEnum v10_PredefinedType);
-    typedef IfcCoveringType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcCoveringType > > list;
-    typedef IfcTemplatedEntityList< IfcCoveringType >::it it;
+    IfcCoveringType (IfcAbstractEntity* e);
+    IfcCoveringType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcCoveringTypeEnum::IfcCoveringTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcCoveringType > list;
 };
 /// IfcCrewResource represents a collection of internal resources used in construction processes. 
 /// 
@@ -26102,16 +26836,15 @@ class IfcCrewResource : public IfcConstructionResource {
 public:
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcConstructionResource::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcConstructionResource::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcConstructionResource::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcCrewResource (IfcAbstractEntityPtr e);
-    IfcCrewResource (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, boost::optional< IfcIdentifier > v6_ResourceIdentifier, boost::optional< IfcLabel > v7_ResourceGroup, boost::optional< IfcResourceConsumptionEnum::IfcResourceConsumptionEnum > v8_ResourceConsumption, IfcMeasureWithUnit* v9_BaseQuantity);
-    typedef IfcCrewResource* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcCrewResource > > list;
-    typedef IfcTemplatedEntityList< IfcCrewResource >::it it;
+    IfcCrewResource (IfcAbstractEntity* e);
+    IfcCrewResource (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, boost::optional< std::string > v6_ResourceIdentifier, boost::optional< std::string > v7_ResourceGroup, boost::optional< IfcResourceConsumptionEnum::IfcResourceConsumptionEnum > v8_ResourceConsumption, IfcMeasureWithUnit* v9_BaseQuantity);
+    typedef IfcTemplatedEntityList< IfcCrewResource > list;
 };
 /// Definition from IAI: The element type (IfcCurtainWallType)
 /// defines a list of commonly shared property set definitions of a curtain
@@ -26137,36 +26870,34 @@ class IfcCrewResource : public IfcConstructionResource {
 class IfcCurtainWallType : public IfcBuildingElementType {
 public:
     /// Identifies the predefined types of a curtain wall element from which the type required may be set.
-    IfcCurtainWallTypeEnum::IfcCurtainWallTypeEnum PredefinedType();
+    IfcCurtainWallTypeEnum::IfcCurtainWallTypeEnum PredefinedType() const;
     void setPredefinedType(IfcCurtainWallTypeEnum::IfcCurtainWallTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcBuildingElementType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcCurtainWallTypeEnum; } return IfcBuildingElementType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcBuildingElementType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcCurtainWallType (IfcAbstractEntityPtr e);
-    IfcCurtainWallType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcCurtainWallTypeEnum::IfcCurtainWallTypeEnum v10_PredefinedType);
-    typedef IfcCurtainWallType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcCurtainWallType > > list;
-    typedef IfcTemplatedEntityList< IfcCurtainWallType >::it it;
+    IfcCurtainWallType (IfcAbstractEntity* e);
+    IfcCurtainWallType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcCurtainWallTypeEnum::IfcCurtainWallTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcCurtainWallType > list;
 };
 
 class IfcDimensionCurveDirectedCallout : public IfcDraughtingCallout {
 public:
     virtual unsigned int getArgumentCount() const { return 1; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcDraughtingCallout::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcDraughtingCallout::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcDraughtingCallout::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcDimensionCurveDirectedCallout (IfcAbstractEntityPtr e);
-    IfcDimensionCurveDirectedCallout (IfcEntities v1_Contents);
-    typedef IfcDimensionCurveDirectedCallout* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcDimensionCurveDirectedCallout > > list;
-    typedef IfcTemplatedEntityList< IfcDimensionCurveDirectedCallout >::it it;
+    IfcDimensionCurveDirectedCallout (IfcAbstractEntity* e);
+    IfcDimensionCurveDirectedCallout (IfcEntityList::ptr v1_Contents);
+    typedef IfcTemplatedEntityList< IfcDimensionCurveDirectedCallout > list;
 };
 /// Definition from IAI: The
 /// IfcDistributionElementType defines a list of commonly
@@ -26200,16 +26931,15 @@ class IfcDistributionElementType : public IfcElementType {
 public:
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcElementType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcElementType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcElementType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcDistributionElementType (IfcAbstractEntityPtr e);
-    IfcDistributionElementType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType);
-    typedef IfcDistributionElementType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcDistributionElementType > > list;
-    typedef IfcTemplatedEntityList< IfcDistributionElementType >::it it;
+    IfcDistributionElementType (IfcAbstractEntity* e);
+    IfcDistributionElementType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType);
+    typedef IfcTemplatedEntityList< IfcDistributionElementType > list;
 };
 /// The element type IfcDistributionFlowElementType defines a list of commonly shared property set definitions of an element and an optional set of product representations.  It is used to define an element specification (the specific product information that is common to all occurrences of that product type). 
 /// 
@@ -26280,58 +27010,56 @@ class IfcDistributionFlowElementType : public IfcDistributionElementType {
 public:
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcDistributionElementType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcDistributionElementType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcDistributionElementType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcDistributionFlowElementType (IfcAbstractEntityPtr e);
-    IfcDistributionFlowElementType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType);
-    typedef IfcDistributionFlowElementType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcDistributionFlowElementType > > list;
-    typedef IfcTemplatedEntityList< IfcDistributionFlowElementType >::it it;
+    IfcDistributionFlowElementType (IfcAbstractEntity* e);
+    IfcDistributionFlowElementType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType);
+    typedef IfcTemplatedEntityList< IfcDistributionFlowElementType > list;
 };
 
 class IfcElectricalBaseProperties : public IfcEnergyProperties {
 public:
     /// Whether the optional attribute ElectricCurrentType is defined for this IfcElectricalBaseProperties
-    bool hasElectricCurrentType();
-    IfcElectricCurrentEnum::IfcElectricCurrentEnum ElectricCurrentType();
+    bool hasElectricCurrentType() const;
+    IfcElectricCurrentEnum::IfcElectricCurrentEnum ElectricCurrentType() const;
     void setElectricCurrentType(IfcElectricCurrentEnum::IfcElectricCurrentEnum v);
-    IfcElectricVoltageMeasure InputVoltage();
-    void setInputVoltage(IfcElectricVoltageMeasure v);
-    IfcFrequencyMeasure InputFrequency();
-    void setInputFrequency(IfcFrequencyMeasure v);
+    double InputVoltage() const;
+    void setInputVoltage(double v);
+    double InputFrequency() const;
+    void setInputFrequency(double v);
     /// Whether the optional attribute FullLoadCurrent is defined for this IfcElectricalBaseProperties
-    bool hasFullLoadCurrent();
-    IfcElectricCurrentMeasure FullLoadCurrent();
-    void setFullLoadCurrent(IfcElectricCurrentMeasure v);
+    bool hasFullLoadCurrent() const;
+    double FullLoadCurrent() const;
+    void setFullLoadCurrent(double v);
     /// Whether the optional attribute MinimumCircuitCurrent is defined for this IfcElectricalBaseProperties
-    bool hasMinimumCircuitCurrent();
-    IfcElectricCurrentMeasure MinimumCircuitCurrent();
-    void setMinimumCircuitCurrent(IfcElectricCurrentMeasure v);
+    bool hasMinimumCircuitCurrent() const;
+    double MinimumCircuitCurrent() const;
+    void setMinimumCircuitCurrent(double v);
     /// Whether the optional attribute MaximumPowerInput is defined for this IfcElectricalBaseProperties
-    bool hasMaximumPowerInput();
-    IfcPowerMeasure MaximumPowerInput();
-    void setMaximumPowerInput(IfcPowerMeasure v);
+    bool hasMaximumPowerInput() const;
+    double MaximumPowerInput() const;
+    void setMaximumPowerInput(double v);
     /// Whether the optional attribute RatedPowerInput is defined for this IfcElectricalBaseProperties
-    bool hasRatedPowerInput();
-    IfcPowerMeasure RatedPowerInput();
-    void setRatedPowerInput(IfcPowerMeasure v);
-    int InputPhase();
+    bool hasRatedPowerInput() const;
+    double RatedPowerInput() const;
+    void setRatedPowerInput(double v);
+    int InputPhase() const;
     void setInputPhase(int v);
     virtual unsigned int getArgumentCount() const { return 14; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 6: return IfcUtil::Argument_ENUMERATION; case 7: return IfcUtil::Argument_DOUBLE; case 8: return IfcUtil::Argument_DOUBLE; case 9: return IfcUtil::Argument_DOUBLE; case 10: return IfcUtil::Argument_DOUBLE; case 11: return IfcUtil::Argument_DOUBLE; case 12: return IfcUtil::Argument_DOUBLE; case 13: return IfcUtil::Argument_INT; } return IfcEnergyProperties::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 6: return Type::IfcElectricCurrentEnum; case 7: return Type::IfcElectricVoltageMeasure; case 8: return Type::IfcFrequencyMeasure; case 9: return Type::IfcElectricCurrentMeasure; case 10: return Type::IfcElectricCurrentMeasure; case 11: return Type::IfcPowerMeasure; case 12: return Type::IfcPowerMeasure; case 13: return Type::UNDEFINED; } return IfcEnergyProperties::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 6: return "ElectricCurrentType"; case 7: return "InputVoltage"; case 8: return "InputFrequency"; case 9: return "FullLoadCurrent"; case 10: return "MinimumCircuitCurrent"; case 11: return "MaximumPowerInput"; case 12: return "RatedPowerInput"; case 13: return "InputPhase"; } return IfcEnergyProperties::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcElectricalBaseProperties (IfcAbstractEntityPtr e);
-    IfcElectricalBaseProperties (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcEnergySequenceEnum::IfcEnergySequenceEnum > v5_EnergySequence, boost::optional< IfcLabel > v6_UserDefinedEnergySequence, boost::optional< IfcElectricCurrentEnum::IfcElectricCurrentEnum > v7_ElectricCurrentType, IfcElectricVoltageMeasure v8_InputVoltage, IfcFrequencyMeasure v9_InputFrequency, boost::optional< IfcElectricCurrentMeasure > v10_FullLoadCurrent, boost::optional< IfcElectricCurrentMeasure > v11_MinimumCircuitCurrent, boost::optional< IfcPowerMeasure > v12_MaximumPowerInput, boost::optional< IfcPowerMeasure > v13_RatedPowerInput, int v14_InputPhase);
-    typedef IfcElectricalBaseProperties* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcElectricalBaseProperties > > list;
-    typedef IfcTemplatedEntityList< IfcElectricalBaseProperties >::it it;
+    IfcElectricalBaseProperties (IfcAbstractEntity* e);
+    IfcElectricalBaseProperties (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< IfcEnergySequenceEnum::IfcEnergySequenceEnum > v5_EnergySequence, boost::optional< std::string > v6_UserDefinedEnergySequence, boost::optional< IfcElectricCurrentEnum::IfcElectricCurrentEnum > v7_ElectricCurrentType, double v8_InputVoltage, double v9_InputFrequency, boost::optional< double > v10_FullLoadCurrent, boost::optional< double > v11_MinimumCircuitCurrent, boost::optional< double > v12_MaximumPowerInput, boost::optional< double > v13_RatedPowerInput, int v14_InputPhase);
+    typedef IfcTemplatedEntityList< IfcElectricalBaseProperties > list;
 };
 /// Definition from IAI: Generalization of all components
 /// that make up an AEC product. Those elements can be logically
@@ -26389,34 +27117,33 @@ class IfcElectricalBaseProperties : public IfcEnergyProperties {
 class IfcElement : public IfcProduct {
 public:
     /// Whether the optional attribute Tag is defined for this IfcElement
-    bool hasTag();
+    bool hasTag() const;
     /// The tag (or label) identifier at the particular instance of a product, e.g. the serial number, or the position number. It is the identifier at the occurrence level.
-    IfcIdentifier Tag();
-    void setTag(IfcIdentifier v);
+    std::string Tag() const;
+    void setTag(std::string v);
     virtual unsigned int getArgumentCount() const { return 8; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 7: return IfcUtil::Argument_STRING; } return IfcProduct::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 7: return Type::IfcIdentifier; } return IfcProduct::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 7: return "Tag"; } return IfcProduct::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelConnectsStructuralElement > > HasStructuralMember(); // INVERSE IfcRelConnectsStructuralElement::RelatingElement
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelFillsElement > > FillsVoids(); // INVERSE IfcRelFillsElement::RelatedBuildingElement
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelConnectsElements > > ConnectedTo(); // INVERSE IfcRelConnectsElements::RelatingElement
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelCoversBldgElements > > HasCoverings(); // INVERSE IfcRelCoversBldgElements::RelatingBuildingElement
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelProjectsElement > > HasProjections(); // INVERSE IfcRelProjectsElement::RelatingElement
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelReferencedInSpatialStructure > > ReferencedInStructures(); // INVERSE IfcRelReferencedInSpatialStructure::RelatedElements
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelConnectsPortToElement > > HasPorts(); // INVERSE IfcRelConnectsPortToElement::RelatedElement
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelVoidsElement > > HasOpenings(); // INVERSE IfcRelVoidsElement::RelatingBuildingElement
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelConnectsWithRealizingElements > > IsConnectionRealization(); // INVERSE IfcRelConnectsWithRealizingElements::RealizingElements
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelSpaceBoundary > > ProvidesBoundaries(); // INVERSE IfcRelSpaceBoundary::RelatedBuildingElement
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelConnectsElements > > ConnectedFrom(); // INVERSE IfcRelConnectsElements::RelatedElement
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelContainedInSpatialStructure > > ContainedInStructure(); // INVERSE IfcRelContainedInSpatialStructure::RelatedElements
-    bool is(Type::Enum v) const;
-    Type::Enum type() const;
-    static Type::Enum Class();
-    IfcElement (IfcAbstractEntityPtr e);
-    IfcElement (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag);
-    typedef IfcElement* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcElement > > list;
-    typedef IfcTemplatedEntityList< IfcElement >::it it;
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcRelConnectsStructuralElement >::ptr HasStructuralMember() const; // INVERSE IfcRelConnectsStructuralElement::RelatingElement
+    IfcTemplatedEntityList< IfcRelFillsElement >::ptr FillsVoids() const; // INVERSE IfcRelFillsElement::RelatedBuildingElement
+    IfcTemplatedEntityList< IfcRelConnectsElements >::ptr ConnectedTo() const; // INVERSE IfcRelConnectsElements::RelatingElement
+    IfcTemplatedEntityList< IfcRelCoversBldgElements >::ptr HasCoverings() const; // INVERSE IfcRelCoversBldgElements::RelatingBuildingElement
+    IfcTemplatedEntityList< IfcRelProjectsElement >::ptr HasProjections() const; // INVERSE IfcRelProjectsElement::RelatingElement
+    IfcTemplatedEntityList< IfcRelReferencedInSpatialStructure >::ptr ReferencedInStructures() const; // INVERSE IfcRelReferencedInSpatialStructure::RelatedElements
+    IfcTemplatedEntityList< IfcRelConnectsPortToElement >::ptr HasPorts() const; // INVERSE IfcRelConnectsPortToElement::RelatedElement
+    IfcTemplatedEntityList< IfcRelVoidsElement >::ptr HasOpenings() const; // INVERSE IfcRelVoidsElement::RelatingBuildingElement
+    IfcTemplatedEntityList< IfcRelConnectsWithRealizingElements >::ptr IsConnectionRealization() const; // INVERSE IfcRelConnectsWithRealizingElements::RealizingElements
+    IfcTemplatedEntityList< IfcRelSpaceBoundary >::ptr ProvidesBoundaries() const; // INVERSE IfcRelSpaceBoundary::RelatedBuildingElement
+    IfcTemplatedEntityList< IfcRelConnectsElements >::ptr ConnectedFrom() const; // INVERSE IfcRelConnectsElements::RelatedElement
+    IfcTemplatedEntityList< IfcRelContainedInSpatialStructure >::ptr ContainedInStructure() const; // INVERSE IfcRelContainedInSpatialStructure::RelatedElements
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    IfcElement (IfcAbstractEntity* e);
+    IfcElement (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag);
+    typedef IfcTemplatedEntityList< IfcElement > list;
 };
 /// The IfcElementAssembly
 /// represents complex element assemblies aggregated from several
@@ -26515,27 +27242,26 @@ class IfcElement : public IfcProduct {
 class IfcElementAssembly : public IfcElement {
 public:
     /// Whether the optional attribute AssemblyPlace is defined for this IfcElementAssembly
-    bool hasAssemblyPlace();
+    bool hasAssemblyPlace() const;
     /// A designation of where the assembly is intended to take place defined by an Enum.
-    IfcAssemblyPlaceEnum::IfcAssemblyPlaceEnum AssemblyPlace();
+    IfcAssemblyPlaceEnum::IfcAssemblyPlaceEnum AssemblyPlace() const;
     void setAssemblyPlace(IfcAssemblyPlaceEnum::IfcAssemblyPlaceEnum v);
     /// Predefined generic types for a element assembly that are specified in an enumeration. There might be property sets defined specifically for each predefined type.
     /// 
     /// IFC2x4 CHANGE  The attribute has been changed to be optional.
-    IfcElementAssemblyTypeEnum::IfcElementAssemblyTypeEnum PredefinedType();
+    IfcElementAssemblyTypeEnum::IfcElementAssemblyTypeEnum PredefinedType() const;
     void setPredefinedType(IfcElementAssemblyTypeEnum::IfcElementAssemblyTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_ENUMERATION; case 9: return IfcUtil::Argument_ENUMERATION; } return IfcElement::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcAssemblyPlaceEnum; case 9: return Type::IfcElementAssemblyTypeEnum; } return IfcElement::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "AssemblyPlace"; case 9: return "PredefinedType"; } return IfcElement::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcElementAssembly (IfcAbstractEntityPtr e);
-    IfcElementAssembly (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcAssemblyPlaceEnum::IfcAssemblyPlaceEnum > v9_AssemblyPlace, IfcElementAssemblyTypeEnum::IfcElementAssemblyTypeEnum v10_PredefinedType);
-    typedef IfcElementAssembly* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcElementAssembly > > list;
-    typedef IfcTemplatedEntityList< IfcElementAssembly >::it it;
+    IfcElementAssembly (IfcAbstractEntity* e);
+    IfcElementAssembly (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcAssemblyPlaceEnum::IfcAssemblyPlaceEnum > v9_AssemblyPlace, IfcElementAssemblyTypeEnum::IfcElementAssemblyTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcElementAssembly > list;
 };
 /// An element component is a representation for minor items included in, added to or connecting to or between
 ///   elements, which usually are not of interest from the overall building structure viewpoint.
@@ -26618,16 +27344,15 @@ class IfcElementComponent : public IfcElement {
 public:
     virtual unsigned int getArgumentCount() const { return 8; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcElement::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcElement::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcElement::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcElementComponent (IfcAbstractEntityPtr e);
-    IfcElementComponent (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag);
-    typedef IfcElementComponent* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcElementComponent > > list;
-    typedef IfcTemplatedEntityList< IfcElementComponent >::it it;
+    IfcElementComponent (IfcAbstractEntity* e);
+    IfcElementComponent (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag);
+    typedef IfcTemplatedEntityList< IfcElementComponent > list;
 };
 /// Definition from IAI:
 ///   The element type (IfcElementComponentType) represents the supertype for element 
@@ -26642,16 +27367,15 @@ class IfcElementComponentType : public IfcElementType {
 public:
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcElementType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcElementType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcElementType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcElementComponentType (IfcAbstractEntityPtr e);
-    IfcElementComponentType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType);
-    typedef IfcElementComponentType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcElementComponentType > > list;
-    typedef IfcTemplatedEntityList< IfcElementComponentType >::it it;
+    IfcElementComponentType (IfcAbstractEntity* e);
+    IfcElementComponentType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType);
+    typedef IfcTemplatedEntityList< IfcElementComponentType > list;
 };
 /// Definition from ISO/CD 10303-42:1992: An ellipse (IfcEllipse) is a conic section defined by the lengths of the semi-major and semi-minor diameters and the position (center or mid point of the line joining the foci) and orientation of the curve. Interpretation of the data shall be as follows:
 /// 
@@ -26683,23 +27407,22 @@ class IfcElementComponentType : public IfcElementType {
 class IfcEllipse : public IfcConic {
 public:
     /// The first radius of the ellipse which shall be positive. Placement.Axes[1] gives the direction of the SemiAxis1.
-    IfcPositiveLengthMeasure SemiAxis1();
-    void setSemiAxis1(IfcPositiveLengthMeasure v);
+    double SemiAxis1() const;
+    void setSemiAxis1(double v);
     /// The second radius of the ellipse which shall be positive.
-    IfcPositiveLengthMeasure SemiAxis2();
-    void setSemiAxis2(IfcPositiveLengthMeasure v);
+    double SemiAxis2() const;
+    void setSemiAxis2(double v);
     virtual unsigned int getArgumentCount() const { return 3; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 1: return IfcUtil::Argument_DOUBLE; case 2: return IfcUtil::Argument_DOUBLE; } return IfcConic::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 1: return Type::IfcPositiveLengthMeasure; case 2: return Type::IfcPositiveLengthMeasure; } return IfcConic::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 1: return "SemiAxis1"; case 2: return "SemiAxis2"; } return IfcConic::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcEllipse (IfcAbstractEntityPtr e);
-    IfcEllipse (IfcAxis2Placement v1_Position, IfcPositiveLengthMeasure v2_SemiAxis1, IfcPositiveLengthMeasure v3_SemiAxis2);
-    typedef IfcEllipse* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcEllipse > > list;
-    typedef IfcTemplatedEntityList< IfcEllipse >::it it;
+    IfcEllipse (IfcAbstractEntity* e);
+    IfcEllipse (IfcAxis2Placement* v1_Position, double v2_SemiAxis1, double v3_SemiAxis2);
+    typedef IfcTemplatedEntityList< IfcEllipse > list;
 };
 /// The element type IfcEnergyConversionType defines a list of commonly shared property
 ///   set definitions of an energy conversion device and an optional set of product representations.
@@ -26730,48 +27453,45 @@ class IfcEnergyConversionDeviceType : public IfcDistributionFlowElementType {
 public:
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcDistributionFlowElementType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcDistributionFlowElementType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcDistributionFlowElementType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcEnergyConversionDeviceType (IfcAbstractEntityPtr e);
-    IfcEnergyConversionDeviceType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType);
-    typedef IfcEnergyConversionDeviceType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcEnergyConversionDeviceType > > list;
-    typedef IfcTemplatedEntityList< IfcEnergyConversionDeviceType >::it it;
+    IfcEnergyConversionDeviceType (IfcAbstractEntity* e);
+    IfcEnergyConversionDeviceType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType);
+    typedef IfcTemplatedEntityList< IfcEnergyConversionDeviceType > list;
 };
 
 class IfcEquipmentElement : public IfcElement {
 public:
     virtual unsigned int getArgumentCount() const { return 8; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcElement::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcElement::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcElement::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcEquipmentElement (IfcAbstractEntityPtr e);
-    IfcEquipmentElement (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag);
-    typedef IfcEquipmentElement* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcEquipmentElement > > list;
-    typedef IfcTemplatedEntityList< IfcEquipmentElement >::it it;
+    IfcEquipmentElement (IfcAbstractEntity* e);
+    IfcEquipmentElement (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag);
+    typedef IfcTemplatedEntityList< IfcEquipmentElement > list;
 };
 
 class IfcEquipmentStandard : public IfcControl {
 public:
     virtual unsigned int getArgumentCount() const { return 5; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcControl::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcControl::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcControl::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcEquipmentStandard (IfcAbstractEntityPtr e);
-    IfcEquipmentStandard (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType);
-    typedef IfcEquipmentStandard* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcEquipmentStandard > > list;
-    typedef IfcTemplatedEntityList< IfcEquipmentStandard >::it it;
+    IfcEquipmentStandard (IfcAbstractEntity* e);
+    IfcEquipmentStandard (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType);
+    typedef IfcTemplatedEntityList< IfcEquipmentStandard > list;
 };
 /// The energy conversion device type IfcEvaporativeCoolerType defines commonly shared information for occurrences of evaporative coolers.  The set of shared information may include: 
 /// 
@@ -26802,20 +27522,19 @@ class IfcEquipmentStandard : public IfcControl {
 class IfcEvaporativeCoolerType : public IfcEnergyConversionDeviceType {
 public:
     /// Defines the type of evaporative cooler.
-    IfcEvaporativeCoolerTypeEnum::IfcEvaporativeCoolerTypeEnum PredefinedType();
+    IfcEvaporativeCoolerTypeEnum::IfcEvaporativeCoolerTypeEnum PredefinedType() const;
     void setPredefinedType(IfcEvaporativeCoolerTypeEnum::IfcEvaporativeCoolerTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcEnergyConversionDeviceType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcEvaporativeCoolerTypeEnum; } return IfcEnergyConversionDeviceType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcEnergyConversionDeviceType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcEvaporativeCoolerType (IfcAbstractEntityPtr e);
-    IfcEvaporativeCoolerType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcEvaporativeCoolerTypeEnum::IfcEvaporativeCoolerTypeEnum v10_PredefinedType);
-    typedef IfcEvaporativeCoolerType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcEvaporativeCoolerType > > list;
-    typedef IfcTemplatedEntityList< IfcEvaporativeCoolerType >::it it;
+    IfcEvaporativeCoolerType (IfcAbstractEntity* e);
+    IfcEvaporativeCoolerType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcEvaporativeCoolerTypeEnum::IfcEvaporativeCoolerTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcEvaporativeCoolerType > list;
 };
 /// The energy conversion device type IfcEvaporatorType defines commonly shared information for occurrences of evaporators.  The set of shared information may include: 
 /// 
@@ -26846,20 +27565,19 @@ class IfcEvaporativeCoolerType : public IfcEnergyConversionDeviceType {
 class IfcEvaporatorType : public IfcEnergyConversionDeviceType {
 public:
     /// Defines the type of evaporator.
-    IfcEvaporatorTypeEnum::IfcEvaporatorTypeEnum PredefinedType();
+    IfcEvaporatorTypeEnum::IfcEvaporatorTypeEnum PredefinedType() const;
     void setPredefinedType(IfcEvaporatorTypeEnum::IfcEvaporatorTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcEnergyConversionDeviceType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcEvaporatorTypeEnum; } return IfcEnergyConversionDeviceType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcEnergyConversionDeviceType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcEvaporatorType (IfcAbstractEntityPtr e);
-    IfcEvaporatorType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcEvaporatorTypeEnum::IfcEvaporatorTypeEnum v10_PredefinedType);
-    typedef IfcEvaporatorType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcEvaporatorType > > list;
-    typedef IfcTemplatedEntityList< IfcEvaporatorType >::it it;
+    IfcEvaporatorType (IfcAbstractEntity* e);
+    IfcEvaporatorType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcEvaporatorTypeEnum::IfcEvaporatorTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcEvaporatorType > list;
 };
 /// Definition from ISO/CD 10303-42:1992: A faceted B-rep
 /// is a simple form of boundary representation model in which all
@@ -26889,16 +27607,15 @@ class IfcFacetedBrep : public IfcManifoldSolidBrep {
 public:
     virtual unsigned int getArgumentCount() const { return 1; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcManifoldSolidBrep::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcManifoldSolidBrep::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcManifoldSolidBrep::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcFacetedBrep (IfcAbstractEntityPtr e);
+    IfcFacetedBrep (IfcAbstractEntity* e);
     IfcFacetedBrep (IfcClosedShell* v1_Outer);
-    typedef IfcFacetedBrep* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcFacetedBrep > > list;
-    typedef IfcTemplatedEntityList< IfcFacetedBrep >::it it;
+    typedef IfcTemplatedEntityList< IfcFacetedBrep > list;
 };
 /// The IfcFacetedBrepWithVoids
 /// is a specialization of a faceted B-rep which contains one or more
@@ -26927,20 +27644,19 @@ class IfcFacetedBrep : public IfcManifoldSolidBrep {
 class IfcFacetedBrepWithVoids : public IfcManifoldSolidBrep {
 public:
     /// Set of closed shells defining voids within the solid.
-    SHARED_PTR< IfcTemplatedEntityList< IfcClosedShell > > Voids();
-    void setVoids(SHARED_PTR< IfcTemplatedEntityList< IfcClosedShell > > v);
+    IfcTemplatedEntityList< IfcClosedShell >::ptr Voids() const;
+    void setVoids(IfcTemplatedEntityList< IfcClosedShell >::ptr v);
     virtual unsigned int getArgumentCount() const { return 2; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 1: return IfcUtil::Argument_ENTITY_LIST; } return IfcManifoldSolidBrep::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 1: return Type::IfcClosedShell; } return IfcManifoldSolidBrep::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 1: return "Voids"; } return IfcManifoldSolidBrep::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcFacetedBrepWithVoids (IfcAbstractEntityPtr e);
-    IfcFacetedBrepWithVoids (IfcClosedShell* v1_Outer, SHARED_PTR< IfcTemplatedEntityList< IfcClosedShell > > v2_Voids);
-    typedef IfcFacetedBrepWithVoids* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcFacetedBrepWithVoids > > list;
-    typedef IfcTemplatedEntityList< IfcFacetedBrepWithVoids >::it it;
+    IfcFacetedBrepWithVoids (IfcAbstractEntity* e);
+    IfcFacetedBrepWithVoids (IfcClosedShell* v1_Outer, IfcTemplatedEntityList< IfcClosedShell >::ptr v2_Voids);
+    typedef IfcTemplatedEntityList< IfcFacetedBrepWithVoids > list;
 };
 /// Definition from IAI:
 ///   Representations of fixing parts which are used as fasteners to connect or join elements with 
@@ -26954,16 +27670,15 @@ class IfcFastener : public IfcElementComponent {
 public:
     virtual unsigned int getArgumentCount() const { return 8; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcElementComponent::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcElementComponent::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcElementComponent::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcFastener (IfcAbstractEntityPtr e);
-    IfcFastener (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag);
-    typedef IfcFastener* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcFastener > > list;
-    typedef IfcTemplatedEntityList< IfcFastener >::it it;
+    IfcFastener (IfcAbstractEntity* e);
+    IfcFastener (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag);
+    typedef IfcTemplatedEntityList< IfcFastener > list;
 };
 /// Definition from IAI:
 ///   The element type (IfcFastenerType) defines a list of commonly shared
@@ -26992,16 +27707,15 @@ class IfcFastenerType : public IfcElementComponentType {
 public:
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcElementComponentType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcElementComponentType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcElementComponentType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcFastenerType (IfcAbstractEntityPtr e);
-    IfcFastenerType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType);
-    typedef IfcFastenerType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcFastenerType > > list;
-    typedef IfcTemplatedEntityList< IfcFastenerType >::it it;
+    IfcFastenerType (IfcAbstractEntity* e);
+    IfcFastenerType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType);
+    typedef IfcTemplatedEntityList< IfcFastenerType > list;
 };
 /// Definition from IAI: Generalization of all existence
 /// dependent elements which modify the shape and appearance of the
@@ -27101,16 +27815,15 @@ class IfcFeatureElement : public IfcElement {
 public:
     virtual unsigned int getArgumentCount() const { return 8; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcElement::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcElement::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcElement::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcFeatureElement (IfcAbstractEntityPtr e);
-    IfcFeatureElement (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag);
-    typedef IfcFeatureElement* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcFeatureElement > > list;
-    typedef IfcTemplatedEntityList< IfcFeatureElement >::it it;
+    IfcFeatureElement (IfcAbstractEntity* e);
+    IfcFeatureElement (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag);
+    typedef IfcTemplatedEntityList< IfcFeatureElement > list;
 };
 /// Definition from IAI: A specialization of the general
 ///   feature element, that represents an existence dependent
@@ -27171,17 +27884,16 @@ class IfcFeatureElementAddition : public IfcFeatureElement {
 public:
     virtual unsigned int getArgumentCount() const { return 8; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcFeatureElement::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcFeatureElement::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcFeatureElement::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelProjectsElement > > ProjectsElements(); // INVERSE IfcRelProjectsElement::RelatedFeatureElement
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcRelProjectsElement >::ptr ProjectsElements() const; // INVERSE IfcRelProjectsElement::RelatedFeatureElement
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcFeatureElementAddition (IfcAbstractEntityPtr e);
-    IfcFeatureElementAddition (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag);
-    typedef IfcFeatureElementAddition* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcFeatureElementAddition > > list;
-    typedef IfcTemplatedEntityList< IfcFeatureElementAddition >::it it;
+    IfcFeatureElementAddition (IfcAbstractEntity* e);
+    IfcFeatureElementAddition (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag);
+    typedef IfcTemplatedEntityList< IfcFeatureElementAddition > list;
 };
 /// The IfcFeatureElementSubtraction is specialization of
 /// the general feature element, that represents an existence dependent
@@ -27237,17 +27949,16 @@ class IfcFeatureElementSubtraction : public IfcFeatureElement {
 public:
     virtual unsigned int getArgumentCount() const { return 8; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcFeatureElement::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcFeatureElement::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcFeatureElement::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelVoidsElement > > VoidsElements(); // INVERSE IfcRelVoidsElement::RelatedOpeningElement
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcRelVoidsElement >::ptr VoidsElements() const; // INVERSE IfcRelVoidsElement::RelatedOpeningElement
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcFeatureElementSubtraction (IfcAbstractEntityPtr e);
-    IfcFeatureElementSubtraction (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag);
-    typedef IfcFeatureElementSubtraction* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcFeatureElementSubtraction > > list;
-    typedef IfcTemplatedEntityList< IfcFeatureElementSubtraction >::it it;
+    IfcFeatureElementSubtraction (IfcAbstractEntity* e);
+    IfcFeatureElementSubtraction (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag);
+    typedef IfcTemplatedEntityList< IfcFeatureElementSubtraction > list;
 };
 /// The element type IfcFlowControllerType defines a list of commonly shared property
 ///   set definitions of a flow controller and an optional set of product representations.
@@ -27277,16 +27988,15 @@ class IfcFlowControllerType : public IfcDistributionFlowElementType {
 public:
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcDistributionFlowElementType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcDistributionFlowElementType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcDistributionFlowElementType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcFlowControllerType (IfcAbstractEntityPtr e);
-    IfcFlowControllerType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType);
-    typedef IfcFlowControllerType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcFlowControllerType > > list;
-    typedef IfcTemplatedEntityList< IfcFlowControllerType >::it it;
+    IfcFlowControllerType (IfcAbstractEntity* e);
+    IfcFlowControllerType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType);
+    typedef IfcTemplatedEntityList< IfcFlowControllerType > list;
 };
 /// The element type IfcFlowFittingType defines a list of commonly shared property
 ///   set definitions of a flow fitting and an optional set of product representations.
@@ -27317,16 +28027,15 @@ class IfcFlowFittingType : public IfcDistributionFlowElementType {
 public:
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcDistributionFlowElementType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcDistributionFlowElementType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcDistributionFlowElementType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcFlowFittingType (IfcAbstractEntityPtr e);
-    IfcFlowFittingType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType);
-    typedef IfcFlowFittingType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcFlowFittingType > > list;
-    typedef IfcTemplatedEntityList< IfcFlowFittingType >::it it;
+    IfcFlowFittingType (IfcAbstractEntity* e);
+    IfcFlowFittingType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType);
+    typedef IfcTemplatedEntityList< IfcFlowFittingType > list;
 };
 /// The flow controller type IfcFlowMeterType defines commonly shared information for occurrences of flow meters.  The set of shared information may include: 
 /// 
@@ -27363,20 +28072,19 @@ class IfcFlowFittingType : public IfcDistributionFlowElementType {
 class IfcFlowMeterType : public IfcFlowControllerType {
 public:
     /// Defines the type of flow meter.
-    IfcFlowMeterTypeEnum::IfcFlowMeterTypeEnum PredefinedType();
+    IfcFlowMeterTypeEnum::IfcFlowMeterTypeEnum PredefinedType() const;
     void setPredefinedType(IfcFlowMeterTypeEnum::IfcFlowMeterTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcFlowControllerType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcFlowMeterTypeEnum; } return IfcFlowControllerType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcFlowControllerType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcFlowMeterType (IfcAbstractEntityPtr e);
-    IfcFlowMeterType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcFlowMeterTypeEnum::IfcFlowMeterTypeEnum v10_PredefinedType);
-    typedef IfcFlowMeterType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcFlowMeterType > > list;
-    typedef IfcTemplatedEntityList< IfcFlowMeterType >::it it;
+    IfcFlowMeterType (IfcAbstractEntity* e);
+    IfcFlowMeterType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcFlowMeterTypeEnum::IfcFlowMeterTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcFlowMeterType > list;
 };
 /// The element type IfcFlowMovingDeviceType defines a list of commonly shared property
 ///   set definitions of a flow moving device and an optional set of product representations.
@@ -27405,16 +28113,15 @@ class IfcFlowMovingDeviceType : public IfcDistributionFlowElementType {
 public:
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcDistributionFlowElementType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcDistributionFlowElementType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcDistributionFlowElementType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcFlowMovingDeviceType (IfcAbstractEntityPtr e);
-    IfcFlowMovingDeviceType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType);
-    typedef IfcFlowMovingDeviceType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcFlowMovingDeviceType > > list;
-    typedef IfcTemplatedEntityList< IfcFlowMovingDeviceType >::it it;
+    IfcFlowMovingDeviceType (IfcAbstractEntity* e);
+    IfcFlowMovingDeviceType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType);
+    typedef IfcTemplatedEntityList< IfcFlowMovingDeviceType > list;
 };
 /// The element type IfcFlowSegmentType defines a list of commonly shared property
 ///   set definitions of a flow segment and an optional set of product representations.
@@ -27452,16 +28159,15 @@ class IfcFlowSegmentType : public IfcDistributionFlowElementType {
 public:
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcDistributionFlowElementType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcDistributionFlowElementType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcDistributionFlowElementType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcFlowSegmentType (IfcAbstractEntityPtr e);
-    IfcFlowSegmentType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType);
-    typedef IfcFlowSegmentType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcFlowSegmentType > > list;
-    typedef IfcTemplatedEntityList< IfcFlowSegmentType >::it it;
+    IfcFlowSegmentType (IfcAbstractEntity* e);
+    IfcFlowSegmentType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType);
+    typedef IfcTemplatedEntityList< IfcFlowSegmentType > list;
 };
 /// The element type IfcFlowStorageDeviceType defines a list of commonly shared property set definitions of a flow storage device and an optional set of product representations.  It is used to define a flow storage device specification (the specific product information that is common to all occurrences of that product type). 
 /// 
@@ -27474,16 +28180,15 @@ class IfcFlowStorageDeviceType : public IfcDistributionFlowElementType {
 public:
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcDistributionFlowElementType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcDistributionFlowElementType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcDistributionFlowElementType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcFlowStorageDeviceType (IfcAbstractEntityPtr e);
-    IfcFlowStorageDeviceType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType);
-    typedef IfcFlowStorageDeviceType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcFlowStorageDeviceType > > list;
-    typedef IfcTemplatedEntityList< IfcFlowStorageDeviceType >::it it;
+    IfcFlowStorageDeviceType (IfcAbstractEntity* e);
+    IfcFlowStorageDeviceType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType);
+    typedef IfcTemplatedEntityList< IfcFlowStorageDeviceType > list;
 };
 /// The element type IfcFlowTerminalType defines a list of commonly shared property set definitions of a flow terminal and an optional set of product representations.  It is used to define a flow terminal specification (the specific product information that is common to all occurrences of that product type). 
 /// 
@@ -27496,16 +28201,15 @@ class IfcFlowTerminalType : public IfcDistributionFlowElementType {
 public:
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcDistributionFlowElementType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcDistributionFlowElementType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcDistributionFlowElementType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcFlowTerminalType (IfcAbstractEntityPtr e);
-    IfcFlowTerminalType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType);
-    typedef IfcFlowTerminalType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcFlowTerminalType > > list;
-    typedef IfcTemplatedEntityList< IfcFlowTerminalType >::it it;
+    IfcFlowTerminalType (IfcAbstractEntity* e);
+    IfcFlowTerminalType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType);
+    typedef IfcTemplatedEntityList< IfcFlowTerminalType > list;
 };
 /// The element type IfcFlowTreatmentDeviceType defines a list of commonly shared property set definitions of a flow treatment device and an optional set of product representations. It is used to define a flow treatment device specification (the specific product information that is common to all occurrences of that product type). 
 /// 
@@ -27520,16 +28224,15 @@ class IfcFlowTreatmentDeviceType : public IfcDistributionFlowElementType {
 public:
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcDistributionFlowElementType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcDistributionFlowElementType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcDistributionFlowElementType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcFlowTreatmentDeviceType (IfcAbstractEntityPtr e);
-    IfcFlowTreatmentDeviceType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType);
-    typedef IfcFlowTreatmentDeviceType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcFlowTreatmentDeviceType > > list;
-    typedef IfcTemplatedEntityList< IfcFlowTreatmentDeviceType >::it it;
+    IfcFlowTreatmentDeviceType (IfcAbstractEntity* e);
+    IfcFlowTreatmentDeviceType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType);
+    typedef IfcTemplatedEntityList< IfcFlowTreatmentDeviceType > list;
 };
 /// Definition from IAI: Generalization of all furniture
 /// related objects. Furnishing objects are characterized as
@@ -27639,50 +28342,47 @@ class IfcFurnishingElement : public IfcElement {
 public:
     virtual unsigned int getArgumentCount() const { return 8; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcElement::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcElement::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcElement::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcFurnishingElement (IfcAbstractEntityPtr e);
-    IfcFurnishingElement (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag);
-    typedef IfcFurnishingElement* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcFurnishingElement > > list;
-    typedef IfcTemplatedEntityList< IfcFurnishingElement >::it it;
+    IfcFurnishingElement (IfcAbstractEntity* e);
+    IfcFurnishingElement (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag);
+    typedef IfcTemplatedEntityList< IfcFurnishingElement > list;
 };
 
 class IfcFurnitureStandard : public IfcControl {
 public:
     virtual unsigned int getArgumentCount() const { return 5; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcControl::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcControl::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcControl::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcFurnitureStandard (IfcAbstractEntityPtr e);
-    IfcFurnitureStandard (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType);
-    typedef IfcFurnitureStandard* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcFurnitureStandard > > list;
-    typedef IfcTemplatedEntityList< IfcFurnitureStandard >::it it;
+    IfcFurnitureStandard (IfcAbstractEntity* e);
+    IfcFurnitureStandard (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType);
+    typedef IfcTemplatedEntityList< IfcFurnitureStandard > list;
 };
 
 class IfcGasTerminalType : public IfcFlowTerminalType {
 public:
-    IfcGasTerminalTypeEnum::IfcGasTerminalTypeEnum PredefinedType();
+    IfcGasTerminalTypeEnum::IfcGasTerminalTypeEnum PredefinedType() const;
     void setPredefinedType(IfcGasTerminalTypeEnum::IfcGasTerminalTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcFlowTerminalType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcGasTerminalTypeEnum; } return IfcFlowTerminalType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcFlowTerminalType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcGasTerminalType (IfcAbstractEntityPtr e);
-    IfcGasTerminalType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcGasTerminalTypeEnum::IfcGasTerminalTypeEnum v10_PredefinedType);
-    typedef IfcGasTerminalType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcGasTerminalType > > list;
-    typedef IfcTemplatedEntityList< IfcGasTerminalType >::it it;
+    IfcGasTerminalType (IfcAbstractEntity* e);
+    IfcGasTerminalType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcGasTerminalTypeEnum::IfcGasTerminalTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcGasTerminalType > list;
 };
 /// IfcGrid ia a planar design
 /// grid defined in 3D space used as an aid in locating structural and
@@ -27783,29 +28483,28 @@ class IfcGasTerminalType : public IfcFlowTerminalType {
 class IfcGrid : public IfcProduct {
 public:
     /// List of grid axes defining the first row of grid lines.
-    SHARED_PTR< IfcTemplatedEntityList< IfcGridAxis > > UAxes();
-    void setUAxes(SHARED_PTR< IfcTemplatedEntityList< IfcGridAxis > > v);
+    IfcTemplatedEntityList< IfcGridAxis >::ptr UAxes() const;
+    void setUAxes(IfcTemplatedEntityList< IfcGridAxis >::ptr v);
     /// List of grid axes defining the second row of grid lines.
-    SHARED_PTR< IfcTemplatedEntityList< IfcGridAxis > > VAxes();
-    void setVAxes(SHARED_PTR< IfcTemplatedEntityList< IfcGridAxis > > v);
+    IfcTemplatedEntityList< IfcGridAxis >::ptr VAxes() const;
+    void setVAxes(IfcTemplatedEntityList< IfcGridAxis >::ptr v);
     /// Whether the optional attribute WAxes is defined for this IfcGrid
-    bool hasWAxes();
+    bool hasWAxes() const;
     /// List of grid axes defining the third row of grid lines. It may be given in the case of a triangular grid.
-    SHARED_PTR< IfcTemplatedEntityList< IfcGridAxis > > WAxes();
-    void setWAxes(SHARED_PTR< IfcTemplatedEntityList< IfcGridAxis > > v);
+    IfcTemplatedEntityList< IfcGridAxis >::ptr WAxes() const;
+    void setWAxes(IfcTemplatedEntityList< IfcGridAxis >::ptr v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 7: return IfcUtil::Argument_ENTITY_LIST; case 8: return IfcUtil::Argument_ENTITY_LIST; case 9: return IfcUtil::Argument_ENTITY_LIST; } return IfcProduct::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 7: return Type::IfcGridAxis; case 8: return Type::IfcGridAxis; case 9: return Type::IfcGridAxis; } return IfcProduct::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 7: return "UAxes"; case 8: return "VAxes"; case 9: return "WAxes"; } return IfcProduct::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelContainedInSpatialStructure > > ContainedInStructure(); // INVERSE IfcRelContainedInSpatialStructure::RelatedElements
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcRelContainedInSpatialStructure >::ptr ContainedInStructure() const; // INVERSE IfcRelContainedInSpatialStructure::RelatedElements
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcGrid (IfcAbstractEntityPtr e);
-    IfcGrid (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, SHARED_PTR< IfcTemplatedEntityList< IfcGridAxis > > v8_UAxes, SHARED_PTR< IfcTemplatedEntityList< IfcGridAxis > > v9_VAxes, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcGridAxis > > > v10_WAxes);
-    typedef IfcGrid* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcGrid > > list;
-    typedef IfcTemplatedEntityList< IfcGrid >::it it;
+    IfcGrid (IfcAbstractEntity* e);
+    IfcGrid (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcTemplatedEntityList< IfcGridAxis >::ptr v8_UAxes, IfcTemplatedEntityList< IfcGridAxis >::ptr v9_VAxes, boost::optional< IfcTemplatedEntityList< IfcGridAxis >::ptr > v10_WAxes);
+    typedef IfcTemplatedEntityList< IfcGrid > list;
 };
 /// IfcGroup is an generalization of any arbitrary group. A group is a logical collection of objects. It does not have its own position, nor can it hold its own shape representation. Therefore a group is an aggregation under some non-geometrical / topological grouping aspects.
 /// 
@@ -27841,17 +28540,16 @@ class IfcGroup : public IfcObject {
 public:
     virtual unsigned int getArgumentCount() const { return 5; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcObject::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcObject::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcObject::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelAssignsToGroup > > IsGroupedBy(); // INVERSE IfcRelAssignsToGroup::RelatingGroup
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcRelAssignsToGroup >::ptr IsGroupedBy() const; // INVERSE IfcRelAssignsToGroup::RelatingGroup
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcGroup (IfcAbstractEntityPtr e);
-    IfcGroup (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType);
-    typedef IfcGroup* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcGroup > > list;
-    typedef IfcTemplatedEntityList< IfcGroup >::it it;
+    IfcGroup (IfcAbstractEntity* e);
+    IfcGroup (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType);
+    typedef IfcTemplatedEntityList< IfcGroup > list;
 };
 /// The energy conversion device type IfcHeatExchangerType defines commonly shared information for occurrences of heat exchangers.  The set of shared information may include: 
 /// 
@@ -27885,20 +28583,19 @@ class IfcGroup : public IfcObject {
 class IfcHeatExchangerType : public IfcEnergyConversionDeviceType {
 public:
     /// Defines the basic types of heat exchanger (e.g., plate, shell and tube, etc.).
-    IfcHeatExchangerTypeEnum::IfcHeatExchangerTypeEnum PredefinedType();
+    IfcHeatExchangerTypeEnum::IfcHeatExchangerTypeEnum PredefinedType() const;
     void setPredefinedType(IfcHeatExchangerTypeEnum::IfcHeatExchangerTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcEnergyConversionDeviceType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcHeatExchangerTypeEnum; } return IfcEnergyConversionDeviceType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcEnergyConversionDeviceType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcHeatExchangerType (IfcAbstractEntityPtr e);
-    IfcHeatExchangerType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcHeatExchangerTypeEnum::IfcHeatExchangerTypeEnum v10_PredefinedType);
-    typedef IfcHeatExchangerType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcHeatExchangerType > > list;
-    typedef IfcTemplatedEntityList< IfcHeatExchangerType >::it it;
+    IfcHeatExchangerType (IfcAbstractEntity* e);
+    IfcHeatExchangerType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcHeatExchangerTypeEnum::IfcHeatExchangerTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcHeatExchangerType > list;
 };
 /// The energy conversion device type IfcHumidifierType defines commonly shared information for occurrences of humidifiers.  The set of shared information may include: 
 /// 
@@ -27929,20 +28626,19 @@ class IfcHeatExchangerType : public IfcEnergyConversionDeviceType {
 class IfcHumidifierType : public IfcEnergyConversionDeviceType {
 public:
     /// Defines the type of humidifier.
-    IfcHumidifierTypeEnum::IfcHumidifierTypeEnum PredefinedType();
+    IfcHumidifierTypeEnum::IfcHumidifierTypeEnum PredefinedType() const;
     void setPredefinedType(IfcHumidifierTypeEnum::IfcHumidifierTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcEnergyConversionDeviceType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcHumidifierTypeEnum; } return IfcEnergyConversionDeviceType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcEnergyConversionDeviceType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcHumidifierType (IfcAbstractEntityPtr e);
-    IfcHumidifierType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcHumidifierTypeEnum::IfcHumidifierTypeEnum v10_PredefinedType);
-    typedef IfcHumidifierType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcHumidifierType > > list;
-    typedef IfcTemplatedEntityList< IfcHumidifierType >::it it;
+    IfcHumidifierType (IfcAbstractEntity* e);
+    IfcHumidifierType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcHumidifierTypeEnum::IfcHumidifierTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcHumidifierType > list;
 };
 /// An inventory is a list of items within an enterprise. 
 /// 
@@ -27957,41 +28653,40 @@ class IfcHumidifierType : public IfcEnergyConversionDeviceType {
 /// IfcSpace: Spaces included in the inventory.
 class IfcInventory : public IfcGroup {
 public:
-    IfcInventoryTypeEnum::IfcInventoryTypeEnum InventoryType();
+    IfcInventoryTypeEnum::IfcInventoryTypeEnum InventoryType() const;
     void setInventoryType(IfcInventoryTypeEnum::IfcInventoryTypeEnum v);
     /// The organizational unit to which the inventory is applicable.
-    IfcActorSelect Jurisdiction();
-    void setJurisdiction(IfcActorSelect v);
+    IfcActorSelect* Jurisdiction() const;
+    void setJurisdiction(IfcActorSelect* v);
     /// Persons who are responsible for the inventory.
-    SHARED_PTR< IfcTemplatedEntityList< IfcPerson > > ResponsiblePersons();
-    void setResponsiblePersons(SHARED_PTR< IfcTemplatedEntityList< IfcPerson > > v);
+    IfcTemplatedEntityList< IfcPerson >::ptr ResponsiblePersons() const;
+    void setResponsiblePersons(IfcTemplatedEntityList< IfcPerson >::ptr v);
     /// The date on which the last update of the inventory was carried out.
     /// 
     /// IFC2x4 CHANGE Type changed from IfcDateTimeSelect.
-    IfcCalendarDate* LastUpdateDate();
+    IfcCalendarDate* LastUpdateDate() const;
     void setLastUpdateDate(IfcCalendarDate* v);
     /// Whether the optional attribute CurrentValue is defined for this IfcInventory
-    bool hasCurrentValue();
+    bool hasCurrentValue() const;
     /// An estimate of the current cost value of the inventory.
-    IfcCostValue* CurrentValue();
+    IfcCostValue* CurrentValue() const;
     void setCurrentValue(IfcCostValue* v);
     /// Whether the optional attribute OriginalValue is defined for this IfcInventory
-    bool hasOriginalValue();
+    bool hasOriginalValue() const;
     /// An estimate of the original cost value of the inventory.
-    IfcCostValue* OriginalValue();
+    IfcCostValue* OriginalValue() const;
     void setOriginalValue(IfcCostValue* v);
     virtual unsigned int getArgumentCount() const { return 11; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 5: return IfcUtil::Argument_ENUMERATION; case 6: return IfcUtil::Argument_ENTITY; case 7: return IfcUtil::Argument_ENTITY_LIST; case 8: return IfcUtil::Argument_ENTITY; case 9: return IfcUtil::Argument_ENTITY; case 10: return IfcUtil::Argument_ENTITY; } return IfcGroup::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 5: return Type::IfcInventoryTypeEnum; case 6: return Type::IfcActorSelect; case 7: return Type::IfcPerson; case 8: return Type::IfcCalendarDate; case 9: return Type::IfcCostValue; case 10: return Type::IfcCostValue; } return IfcGroup::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 5: return "InventoryType"; case 6: return "Jurisdiction"; case 7: return "ResponsiblePersons"; case 8: return "LastUpdateDate"; case 9: return "CurrentValue"; case 10: return "OriginalValue"; } return IfcGroup::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcInventory (IfcAbstractEntityPtr e);
-    IfcInventory (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcInventoryTypeEnum::IfcInventoryTypeEnum v6_InventoryType, IfcActorSelect v7_Jurisdiction, SHARED_PTR< IfcTemplatedEntityList< IfcPerson > > v8_ResponsiblePersons, IfcCalendarDate* v9_LastUpdateDate, IfcCostValue* v10_CurrentValue, IfcCostValue* v11_OriginalValue);
-    typedef IfcInventory* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcInventory > > list;
-    typedef IfcTemplatedEntityList< IfcInventory >::it it;
+    IfcInventory (IfcAbstractEntity* e);
+    IfcInventory (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcInventoryTypeEnum::IfcInventoryTypeEnum v6_InventoryType, IfcActorSelect* v7_Jurisdiction, IfcTemplatedEntityList< IfcPerson >::ptr v8_ResponsiblePersons, IfcCalendarDate* v9_LastUpdateDate, IfcCostValue* v10_CurrentValue, IfcCostValue* v11_OriginalValue);
+    typedef IfcTemplatedEntityList< IfcInventory > list;
 };
 /// The flow fitting type IfcJunctionBoxType defines commonly shared information for occurrences of junction boxs.  The set of shared information may include: 
 /// 
@@ -28023,20 +28718,19 @@ class IfcInventory : public IfcGroup {
 class IfcJunctionBoxType : public IfcFlowFittingType {
 public:
     /// Identifies the predefined types of junction boxes from which the type required may be set.
-    IfcJunctionBoxTypeEnum::IfcJunctionBoxTypeEnum PredefinedType();
+    IfcJunctionBoxTypeEnum::IfcJunctionBoxTypeEnum PredefinedType() const;
     void setPredefinedType(IfcJunctionBoxTypeEnum::IfcJunctionBoxTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcFlowFittingType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcJunctionBoxTypeEnum; } return IfcFlowFittingType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcFlowFittingType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcJunctionBoxType (IfcAbstractEntityPtr e);
-    IfcJunctionBoxType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcJunctionBoxTypeEnum::IfcJunctionBoxTypeEnum v10_PredefinedType);
-    typedef IfcJunctionBoxType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcJunctionBoxType > > list;
-    typedef IfcTemplatedEntityList< IfcJunctionBoxType >::it it;
+    IfcJunctionBoxType (IfcAbstractEntity* e);
+    IfcJunctionBoxType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcJunctionBoxTypeEnum::IfcJunctionBoxTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcJunctionBoxType > list;
 };
 /// An IfcLaborResource is used in construction with particular skills or crafts required to perform certain types of construction or management related work.  
 /// 
@@ -28065,21 +28759,20 @@ class IfcJunctionBoxType : public IfcFlowFittingType {
 class IfcLaborResource : public IfcConstructionResource {
 public:
     /// Whether the optional attribute SkillSet is defined for this IfcLaborResource
-    bool hasSkillSet();
-    IfcText SkillSet();
-    void setSkillSet(IfcText v);
+    bool hasSkillSet() const;
+    std::string SkillSet() const;
+    void setSkillSet(std::string v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_STRING; } return IfcConstructionResource::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcText; } return IfcConstructionResource::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "SkillSet"; } return IfcConstructionResource::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcLaborResource (IfcAbstractEntityPtr e);
-    IfcLaborResource (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, boost::optional< IfcIdentifier > v6_ResourceIdentifier, boost::optional< IfcLabel > v7_ResourceGroup, boost::optional< IfcResourceConsumptionEnum::IfcResourceConsumptionEnum > v8_ResourceConsumption, IfcMeasureWithUnit* v9_BaseQuantity, boost::optional< IfcText > v10_SkillSet);
-    typedef IfcLaborResource* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcLaborResource > > list;
-    typedef IfcTemplatedEntityList< IfcLaborResource >::it it;
+    IfcLaborResource (IfcAbstractEntity* e);
+    IfcLaborResource (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, boost::optional< std::string > v6_ResourceIdentifier, boost::optional< std::string > v7_ResourceGroup, boost::optional< IfcResourceConsumptionEnum::IfcResourceConsumptionEnum > v8_ResourceConsumption, IfcMeasureWithUnit* v9_BaseQuantity, boost::optional< std::string > v10_SkillSet);
+    typedef IfcTemplatedEntityList< IfcLaborResource > list;
 };
 /// The flow terminal type IfcLampType defines commonly shared information for occurrences of lamps.  The set of shared information may include: 
 /// 
@@ -28113,20 +28806,19 @@ class IfcLaborResource : public IfcConstructionResource {
 class IfcLampType : public IfcFlowTerminalType {
 public:
     /// Identifies the predefined types of lamp from which the type required may be set.
-    IfcLampTypeEnum::IfcLampTypeEnum PredefinedType();
+    IfcLampTypeEnum::IfcLampTypeEnum PredefinedType() const;
     void setPredefinedType(IfcLampTypeEnum::IfcLampTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcFlowTerminalType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcLampTypeEnum; } return IfcFlowTerminalType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcFlowTerminalType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcLampType (IfcAbstractEntityPtr e);
-    IfcLampType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcLampTypeEnum::IfcLampTypeEnum v10_PredefinedType);
-    typedef IfcLampType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcLampType > > list;
-    typedef IfcTemplatedEntityList< IfcLampType >::it it;
+    IfcLampType (IfcAbstractEntity* e);
+    IfcLampType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcLampTypeEnum::IfcLampTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcLampType > list;
 };
 /// The flow terminal type IfcLightFixtureType defines commonly shared information for occurrences of light fixtures.  The set of shared information may include: 
 /// 
@@ -28162,36 +28854,34 @@ class IfcLampType : public IfcFlowTerminalType {
 class IfcLightFixtureType : public IfcFlowTerminalType {
 public:
     /// Identifies the predefined types of light fixture from which the type required may be set.
-    IfcLightFixtureTypeEnum::IfcLightFixtureTypeEnum PredefinedType();
+    IfcLightFixtureTypeEnum::IfcLightFixtureTypeEnum PredefinedType() const;
     void setPredefinedType(IfcLightFixtureTypeEnum::IfcLightFixtureTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcFlowTerminalType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcLightFixtureTypeEnum; } return IfcFlowTerminalType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcFlowTerminalType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcLightFixtureType (IfcAbstractEntityPtr e);
-    IfcLightFixtureType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcLightFixtureTypeEnum::IfcLightFixtureTypeEnum v10_PredefinedType);
-    typedef IfcLightFixtureType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcLightFixtureType > > list;
-    typedef IfcTemplatedEntityList< IfcLightFixtureType >::it it;
+    IfcLightFixtureType (IfcAbstractEntity* e);
+    IfcLightFixtureType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcLightFixtureTypeEnum::IfcLightFixtureTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcLightFixtureType > list;
 };
 
 class IfcLinearDimension : public IfcDimensionCurveDirectedCallout {
 public:
     virtual unsigned int getArgumentCount() const { return 1; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcDimensionCurveDirectedCallout::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcDimensionCurveDirectedCallout::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcDimensionCurveDirectedCallout::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcLinearDimension (IfcAbstractEntityPtr e);
-    IfcLinearDimension (IfcEntities v1_Contents);
-    typedef IfcLinearDimension* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcLinearDimension > > list;
-    typedef IfcTemplatedEntityList< IfcLinearDimension >::it it;
+    IfcLinearDimension (IfcAbstractEntity* e);
+    IfcLinearDimension (IfcEntityList::ptr v1_Contents);
+    typedef IfcTemplatedEntityList< IfcLinearDimension > list;
 };
 /// Definition from IAI: Fasteners connecting building elements mechanically.  A single instance of this class may represent one or many of actual mechanical fasteners, for example an array of bolts or a row of nails.
 /// 
@@ -28225,25 +28915,24 @@ class IfcLinearDimension : public IfcDimensionCurveDirectedCallout {
 class IfcMechanicalFastener : public IfcFastener {
 public:
     /// Whether the optional attribute NominalDiameter is defined for this IfcMechanicalFastener
-    bool hasNominalDiameter();
-    IfcPositiveLengthMeasure NominalDiameter();
-    void setNominalDiameter(IfcPositiveLengthMeasure v);
+    bool hasNominalDiameter() const;
+    double NominalDiameter() const;
+    void setNominalDiameter(double v);
     /// Whether the optional attribute NominalLength is defined for this IfcMechanicalFastener
-    bool hasNominalLength();
-    IfcPositiveLengthMeasure NominalLength();
-    void setNominalLength(IfcPositiveLengthMeasure v);
+    bool hasNominalLength() const;
+    double NominalLength() const;
+    void setNominalLength(double v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_DOUBLE; case 9: return IfcUtil::Argument_DOUBLE; } return IfcFastener::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcPositiveLengthMeasure; case 9: return Type::IfcPositiveLengthMeasure; } return IfcFastener::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "NominalDiameter"; case 9: return "NominalLength"; } return IfcFastener::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcMechanicalFastener (IfcAbstractEntityPtr e);
-    IfcMechanicalFastener (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcPositiveLengthMeasure > v9_NominalDiameter, boost::optional< IfcPositiveLengthMeasure > v10_NominalLength);
-    typedef IfcMechanicalFastener* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcMechanicalFastener > > list;
-    typedef IfcTemplatedEntityList< IfcMechanicalFastener >::it it;
+    IfcMechanicalFastener (IfcAbstractEntity* e);
+    IfcMechanicalFastener (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< double > v9_NominalDiameter, boost::optional< double > v10_NominalLength);
+    typedef IfcTemplatedEntityList< IfcMechanicalFastener > list;
 };
 /// Definition from IAI: The element type (IfcMechanicalFastenerType) defines a list of commonly shared property set definitions of a fastener and an optional set of product representations. It is used to define mechanical fasteners mainly within structural and building services domains (i.e. the specific type information common to all occurrences of that type). 
 /// 
@@ -28284,16 +28973,15 @@ class IfcMechanicalFastenerType : public IfcFastenerType {
 public:
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcFastenerType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcFastenerType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcFastenerType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcMechanicalFastenerType (IfcAbstractEntityPtr e);
-    IfcMechanicalFastenerType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType);
-    typedef IfcMechanicalFastenerType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcMechanicalFastenerType > > list;
-    typedef IfcTemplatedEntityList< IfcMechanicalFastenerType >::it it;
+    IfcMechanicalFastenerType (IfcAbstractEntity* e);
+    IfcMechanicalFastenerType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType);
+    typedef IfcTemplatedEntityList< IfcMechanicalFastenerType > list;
 };
 /// Definition from IAI: The element type
 /// IfcMemberType defines commonly shared information for
@@ -28399,20 +29087,19 @@ class IfcMechanicalFastenerType : public IfcFastenerType {
 class IfcMemberType : public IfcBuildingElementType {
 public:
     /// Identifies the predefined types of a linear structural member element from which the type required may be set.
-    IfcMemberTypeEnum::IfcMemberTypeEnum PredefinedType();
+    IfcMemberTypeEnum::IfcMemberTypeEnum PredefinedType() const;
     void setPredefinedType(IfcMemberTypeEnum::IfcMemberTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcBuildingElementType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcMemberTypeEnum; } return IfcBuildingElementType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcBuildingElementType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcMemberType (IfcAbstractEntityPtr e);
-    IfcMemberType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcMemberTypeEnum::IfcMemberTypeEnum v10_PredefinedType);
-    typedef IfcMemberType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcMemberType > > list;
-    typedef IfcTemplatedEntityList< IfcMemberType >::it it;
+    IfcMemberType (IfcAbstractEntity* e);
+    IfcMemberType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcMemberTypeEnum::IfcMemberTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcMemberType > list;
 };
 /// The energy conversion device type IfcMotorConnectionType defines commonly shared information for occurrences of motor connections.  The set of shared information may include: 
 /// 
@@ -28444,44 +29131,42 @@ class IfcMemberType : public IfcBuildingElementType {
 class IfcMotorConnectionType : public IfcEnergyConversionDeviceType {
 public:
     /// Identifies the predefined types of motor connection from which the type required may be set.
-    IfcMotorConnectionTypeEnum::IfcMotorConnectionTypeEnum PredefinedType();
+    IfcMotorConnectionTypeEnum::IfcMotorConnectionTypeEnum PredefinedType() const;
     void setPredefinedType(IfcMotorConnectionTypeEnum::IfcMotorConnectionTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcEnergyConversionDeviceType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcMotorConnectionTypeEnum; } return IfcEnergyConversionDeviceType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcEnergyConversionDeviceType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcMotorConnectionType (IfcAbstractEntityPtr e);
-    IfcMotorConnectionType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcMotorConnectionTypeEnum::IfcMotorConnectionTypeEnum v10_PredefinedType);
-    typedef IfcMotorConnectionType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcMotorConnectionType > > list;
-    typedef IfcTemplatedEntityList< IfcMotorConnectionType >::it it;
+    IfcMotorConnectionType (IfcAbstractEntity* e);
+    IfcMotorConnectionType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcMotorConnectionTypeEnum::IfcMotorConnectionTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcMotorConnectionType > list;
 };
 
 class IfcMove : public IfcTask {
 public:
-    IfcSpatialStructureElement* MoveFrom();
+    IfcSpatialStructureElement* MoveFrom() const;
     void setMoveFrom(IfcSpatialStructureElement* v);
-    IfcSpatialStructureElement* MoveTo();
+    IfcSpatialStructureElement* MoveTo() const;
     void setMoveTo(IfcSpatialStructureElement* v);
     /// Whether the optional attribute PunchList is defined for this IfcMove
-    bool hasPunchList();
-    std::vector< IfcText > /*[1:?]*/ PunchList();
-    void setPunchList(std::vector< IfcText > /*[1:?]*/ v);
+    bool hasPunchList() const;
+    std::vector< std::string > /*[1:?]*/ PunchList() const;
+    void setPunchList(std::vector< std::string > /*[1:?]*/ v);
     virtual unsigned int getArgumentCount() const { return 13; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 10: return IfcUtil::Argument_ENTITY; case 11: return IfcUtil::Argument_ENTITY; case 12: return IfcUtil::Argument_VECTOR_STRING; } return IfcTask::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 10: return Type::IfcSpatialStructureElement; case 11: return Type::IfcSpatialStructureElement; case 12: return Type::IfcText; } return IfcTask::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 10: return "MoveFrom"; case 11: return "MoveTo"; case 12: return "PunchList"; } return IfcTask::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcMove (IfcAbstractEntityPtr e);
-    IfcMove (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcIdentifier v6_TaskId, boost::optional< IfcLabel > v7_Status, boost::optional< IfcLabel > v8_WorkMethod, bool v9_IsMilestone, boost::optional< int > v10_Priority, IfcSpatialStructureElement* v11_MoveFrom, IfcSpatialStructureElement* v12_MoveTo, boost::optional< std::vector< IfcText > /*[1:?]*/ > v13_PunchList);
-    typedef IfcMove* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcMove > > list;
-    typedef IfcTemplatedEntityList< IfcMove >::it it;
+    IfcMove (IfcAbstractEntity* e);
+    IfcMove (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, std::string v6_TaskId, boost::optional< std::string > v7_Status, boost::optional< std::string > v8_WorkMethod, bool v9_IsMilestone, boost::optional< int > v10_Priority, IfcSpatialStructureElement* v11_MoveFrom, IfcSpatialStructureElement* v12_MoveTo, boost::optional< std::vector< std::string > /*[1:?]*/ > v13_PunchList);
+    typedef IfcTemplatedEntityList< IfcMove > list;
 };
 /// An occupant is a type of actor that defines the form of occupancy of a property. 
 /// 
@@ -28495,20 +29180,19 @@ class IfcOccupant : public IfcActor {
     /// Predefined occupant types from which that required may be set.
     /// 
     /// IFC2x4 CHANGE Attribute made optional.
-    IfcOccupantTypeEnum::IfcOccupantTypeEnum PredefinedType();
+    IfcOccupantTypeEnum::IfcOccupantTypeEnum PredefinedType() const;
     void setPredefinedType(IfcOccupantTypeEnum::IfcOccupantTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 7; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 6: return IfcUtil::Argument_ENUMERATION; } return IfcActor::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 6: return Type::IfcOccupantTypeEnum; } return IfcActor::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 6: return "PredefinedType"; } return IfcActor::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcOccupant (IfcAbstractEntityPtr e);
-    IfcOccupant (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcActorSelect v6_TheActor, IfcOccupantTypeEnum::IfcOccupantTypeEnum v7_PredefinedType);
-    typedef IfcOccupant* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcOccupant > > list;
-    typedef IfcTemplatedEntityList< IfcOccupant >::it it;
+    IfcOccupant (IfcAbstractEntity* e);
+    IfcOccupant (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcActorSelect* v6_TheActor, IfcOccupantTypeEnum::IfcOccupantTypeEnum v7_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcOccupant > list;
 };
 /// The opening element stands for
 /// opening, recess or chase, all reflecting voids. It represents a
@@ -28716,35 +29400,33 @@ class IfcOpeningElement : public IfcFeatureElementSubtraction {
 public:
     virtual unsigned int getArgumentCount() const { return 8; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcFeatureElementSubtraction::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcFeatureElementSubtraction::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcFeatureElementSubtraction::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelFillsElement > > HasFillings(); // INVERSE IfcRelFillsElement::RelatingOpeningElement
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcRelFillsElement >::ptr HasFillings() const; // INVERSE IfcRelFillsElement::RelatingOpeningElement
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcOpeningElement (IfcAbstractEntityPtr e);
-    IfcOpeningElement (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag);
-    typedef IfcOpeningElement* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcOpeningElement > > list;
-    typedef IfcTemplatedEntityList< IfcOpeningElement >::it it;
+    IfcOpeningElement (IfcAbstractEntity* e);
+    IfcOpeningElement (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag);
+    typedef IfcTemplatedEntityList< IfcOpeningElement > list;
 };
 
 class IfcOrderAction : public IfcTask {
 public:
-    IfcIdentifier ActionID();
-    void setActionID(IfcIdentifier v);
+    std::string ActionID() const;
+    void setActionID(std::string v);
     virtual unsigned int getArgumentCount() const { return 11; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 10: return IfcUtil::Argument_STRING; } return IfcTask::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 10: return Type::IfcIdentifier; } return IfcTask::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 10: return "ActionID"; } return IfcTask::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcOrderAction (IfcAbstractEntityPtr e);
-    IfcOrderAction (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcIdentifier v6_TaskId, boost::optional< IfcLabel > v7_Status, boost::optional< IfcLabel > v8_WorkMethod, bool v9_IsMilestone, boost::optional< int > v10_Priority, IfcIdentifier v11_ActionID);
-    typedef IfcOrderAction* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcOrderAction > > list;
-    typedef IfcTemplatedEntityList< IfcOrderAction >::it it;
+    IfcOrderAction (IfcAbstractEntity* e);
+    IfcOrderAction (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, std::string v6_TaskId, boost::optional< std::string > v7_Status, boost::optional< std::string > v8_WorkMethod, bool v9_IsMilestone, boost::optional< int > v10_Priority, std::string v11_ActionID);
+    typedef IfcTemplatedEntityList< IfcOrderAction > list;
 };
 /// The flow terminal type IfcOutletType defines commonly shared information for occurrences of outlets.  The set of shared information may include: 
 /// 
@@ -28778,20 +29460,19 @@ class IfcOrderAction : public IfcTask {
 class IfcOutletType : public IfcFlowTerminalType {
 public:
     /// Identifies the predefined types of outlet from which the type required may be set.
-    IfcOutletTypeEnum::IfcOutletTypeEnum PredefinedType();
+    IfcOutletTypeEnum::IfcOutletTypeEnum PredefinedType() const;
     void setPredefinedType(IfcOutletTypeEnum::IfcOutletTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcFlowTerminalType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcOutletTypeEnum; } return IfcFlowTerminalType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcFlowTerminalType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcOutletType (IfcAbstractEntityPtr e);
-    IfcOutletType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcOutletTypeEnum::IfcOutletTypeEnum v10_PredefinedType);
-    typedef IfcOutletType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcOutletType > > list;
-    typedef IfcTemplatedEntityList< IfcOutletType >::it it;
+    IfcOutletType (IfcAbstractEntity* e);
+    IfcOutletType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcOutletTypeEnum::IfcOutletTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcOutletType > list;
 };
 /// IfcPerformanceHistory is used to document the actual performance of an occurrence instance over time. In practice, performance-related data are generally not easy to obtain as they can originate from different sources (predicted, simulated, or measured) and occur during different stages of the building life-cycle. Such time-related data cover a large spectrum, including meteorological data, schedules, operational status measurements, trend reports, etc.
 /// 
@@ -28801,20 +29482,19 @@ class IfcOutletType : public IfcFlowTerminalType {
 class IfcPerformanceHistory : public IfcControl {
 public:
     /// Describes the applicable building life-cycle phase. Typical values should be DESIGNDEVELOPMENT, SCHEMATICDEVELOPMENT, CONSTRUCTIONDOCUMENT, CONSTRUCTION, ASBUILT, COMMISSIONING, OPERATION, etc.
-    IfcLabel LifeCyclePhase();
-    void setLifeCyclePhase(IfcLabel v);
+    std::string LifeCyclePhase() const;
+    void setLifeCyclePhase(std::string v);
     virtual unsigned int getArgumentCount() const { return 6; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 5: return IfcUtil::Argument_STRING; } return IfcControl::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 5: return Type::IfcLabel; } return IfcControl::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 5: return "LifeCyclePhase"; } return IfcControl::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcPerformanceHistory (IfcAbstractEntityPtr e);
-    IfcPerformanceHistory (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcLabel v6_LifeCyclePhase);
-    typedef IfcPerformanceHistory* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcPerformanceHistory > > list;
-    typedef IfcTemplatedEntityList< IfcPerformanceHistory >::it it;
+    IfcPerformanceHistory (IfcAbstractEntity* e);
+    IfcPerformanceHistory (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, std::string v6_LifeCyclePhase);
+    typedef IfcTemplatedEntityList< IfcPerformanceHistory > list;
 };
 /// A permit is a permission to perform work in places and on artifacts where regulatory, security or other access restrictions apply. 
 /// 
@@ -28855,20 +29535,19 @@ class IfcPerformanceHistory : public IfcControl {
 /// Approvals may be associated to indicate the status of acceptance or rejection using the IfcRelAssociatesApproval relationship where RelatingApproval refers to an IfcApproval and RelatedObjects contains the IfcPermit.  Approvals may be split into sub-approvals using IfcApprovalRelationship to track approval status separately for each party where RelatingApproval refers to the higher-level approval and RelatedApprovals contains one or more lower-level approvals.  The hierarchy of approvals implies sequencing such that a higher-level approval is not executed until all of its lower-level approvals have been accepted.
 class IfcPermit : public IfcControl {
 public:
-    IfcIdentifier PermitID();
-    void setPermitID(IfcIdentifier v);
+    std::string PermitID() const;
+    void setPermitID(std::string v);
     virtual unsigned int getArgumentCount() const { return 6; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 5: return IfcUtil::Argument_STRING; } return IfcControl::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 5: return Type::IfcIdentifier; } return IfcControl::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 5: return "PermitID"; } return IfcControl::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcPermit (IfcAbstractEntityPtr e);
-    IfcPermit (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcIdentifier v6_PermitID);
-    typedef IfcPermit* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcPermit > > list;
-    typedef IfcTemplatedEntityList< IfcPermit >::it it;
+    IfcPermit (IfcAbstractEntity* e);
+    IfcPermit (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, std::string v6_PermitID);
+    typedef IfcTemplatedEntityList< IfcPermit > list;
 };
 /// The flow fitting type IfcPipeFittingType defines commonly shared information for occurrences of pipe fittings.  The set of shared information may include: 
 /// 
@@ -28902,20 +29581,19 @@ class IfcPermit : public IfcControl {
 class IfcPipeFittingType : public IfcFlowFittingType {
 public:
     /// The type of pipe fitting.
-    IfcPipeFittingTypeEnum::IfcPipeFittingTypeEnum PredefinedType();
+    IfcPipeFittingTypeEnum::IfcPipeFittingTypeEnum PredefinedType() const;
     void setPredefinedType(IfcPipeFittingTypeEnum::IfcPipeFittingTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcFlowFittingType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcPipeFittingTypeEnum; } return IfcFlowFittingType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcFlowFittingType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcPipeFittingType (IfcAbstractEntityPtr e);
-    IfcPipeFittingType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcPipeFittingTypeEnum::IfcPipeFittingTypeEnum v10_PredefinedType);
-    typedef IfcPipeFittingType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcPipeFittingType > > list;
-    typedef IfcTemplatedEntityList< IfcPipeFittingType >::it it;
+    IfcPipeFittingType (IfcAbstractEntity* e);
+    IfcPipeFittingType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcPipeFittingTypeEnum::IfcPipeFittingTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcPipeFittingType > list;
 };
 /// The flow segment type IfcPipeSegmentType defines commonly shared information for occurrences of pipe segments.  The set of shared information may include: 
 /// 
@@ -28953,20 +29631,19 @@ class IfcPipeFittingType : public IfcFlowFittingType {
 class IfcPipeSegmentType : public IfcFlowSegmentType {
 public:
     /// The type of pipe segment.
-    IfcPipeSegmentTypeEnum::IfcPipeSegmentTypeEnum PredefinedType();
+    IfcPipeSegmentTypeEnum::IfcPipeSegmentTypeEnum PredefinedType() const;
     void setPredefinedType(IfcPipeSegmentTypeEnum::IfcPipeSegmentTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcFlowSegmentType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcPipeSegmentTypeEnum; } return IfcFlowSegmentType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcFlowSegmentType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcPipeSegmentType (IfcAbstractEntityPtr e);
-    IfcPipeSegmentType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcPipeSegmentTypeEnum::IfcPipeSegmentTypeEnum v10_PredefinedType);
-    typedef IfcPipeSegmentType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcPipeSegmentType > > list;
-    typedef IfcTemplatedEntityList< IfcPipeSegmentType >::it it;
+    IfcPipeSegmentType (IfcAbstractEntity* e);
+    IfcPipeSegmentType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcPipeSegmentTypeEnum::IfcPipeSegmentTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcPipeSegmentType > list;
 };
 /// The element type IfcPlateType defines commonly shared
 /// information for occurrences of plates. The set of shared
@@ -29048,20 +29725,19 @@ class IfcPipeSegmentType : public IfcFlowSegmentType {
 class IfcPlateType : public IfcBuildingElementType {
 public:
     /// Identifies the predefined types of a planar member element from which the type required may be set.
-    IfcPlateTypeEnum::IfcPlateTypeEnum PredefinedType();
+    IfcPlateTypeEnum::IfcPlateTypeEnum PredefinedType() const;
     void setPredefinedType(IfcPlateTypeEnum::IfcPlateTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcBuildingElementType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcPlateTypeEnum; } return IfcBuildingElementType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcBuildingElementType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcPlateType (IfcAbstractEntityPtr e);
-    IfcPlateType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcPlateTypeEnum::IfcPlateTypeEnum v10_PredefinedType);
-    typedef IfcPlateType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcPlateType > > list;
-    typedef IfcTemplatedEntityList< IfcPlateType >::it it;
+    IfcPlateType (IfcAbstractEntity* e);
+    IfcPlateType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcPlateTypeEnum::IfcPlateTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcPlateType > list;
 };
 /// Definition from ISO/CD 10303-42:1992: A polyline
 ///   is a bounded curve of n - 1 linear segments, defined by a
@@ -29080,20 +29756,19 @@ class IfcPlateType : public IfcBuildingElementType {
 class IfcPolyline : public IfcBoundedCurve {
 public:
     /// The points defining the polyline.
-    SHARED_PTR< IfcTemplatedEntityList< IfcCartesianPoint > > Points();
-    void setPoints(SHARED_PTR< IfcTemplatedEntityList< IfcCartesianPoint > > v);
+    IfcTemplatedEntityList< IfcCartesianPoint >::ptr Points() const;
+    void setPoints(IfcTemplatedEntityList< IfcCartesianPoint >::ptr v);
     virtual unsigned int getArgumentCount() const { return 1; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY_LIST; } return IfcBoundedCurve::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcCartesianPoint; } return IfcBoundedCurve::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Points"; } return IfcBoundedCurve::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcPolyline (IfcAbstractEntityPtr e);
-    IfcPolyline (SHARED_PTR< IfcTemplatedEntityList< IfcCartesianPoint > > v1_Points);
-    typedef IfcPolyline* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcPolyline > > list;
-    typedef IfcTemplatedEntityList< IfcPolyline >::it it;
+    IfcPolyline (IfcAbstractEntity* e);
+    IfcPolyline (IfcTemplatedEntityList< IfcCartesianPoint >::ptr v1_Points);
+    typedef IfcTemplatedEntityList< IfcPolyline > list;
 };
 /// Definition from IAI: An IfcPort provides the
 ///   means for an element to connect to other elements.
@@ -29152,19 +29827,18 @@ class IfcPort : public IfcProduct {
 public:
     virtual unsigned int getArgumentCount() const { return 7; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcProduct::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcProduct::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcProduct::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelConnectsPortToElement > > ContainedIn(); // INVERSE IfcRelConnectsPortToElement::RelatingPort
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelConnectsPorts > > ConnectedFrom(); // INVERSE IfcRelConnectsPorts::RelatedPort
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelConnectsPorts > > ConnectedTo(); // INVERSE IfcRelConnectsPorts::RelatingPort
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcRelConnectsPortToElement >::ptr ContainedIn() const; // INVERSE IfcRelConnectsPortToElement::RelatingPort
+    IfcTemplatedEntityList< IfcRelConnectsPorts >::ptr ConnectedFrom() const; // INVERSE IfcRelConnectsPorts::RelatedPort
+    IfcTemplatedEntityList< IfcRelConnectsPorts >::ptr ConnectedTo() const; // INVERSE IfcRelConnectsPorts::RelatingPort
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcPort (IfcAbstractEntityPtr e);
-    IfcPort (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation);
-    typedef IfcPort* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcPort > > list;
-    typedef IfcTemplatedEntityList< IfcPort >::it it;
+    IfcPort (IfcAbstractEntity* e);
+    IfcPort (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation);
+    typedef IfcTemplatedEntityList< IfcPort > list;
 };
 /// An IfcProcedure is a
 ///   logical set of actions to be taken in response to an event
@@ -29272,26 +29946,25 @@ class IfcPort : public IfcProduct {
 /// Figure 12 — Procedure relationships
 class IfcProcedure : public IfcProcess {
 public:
-    IfcIdentifier ProcedureID();
-    void setProcedureID(IfcIdentifier v);
-    IfcProcedureTypeEnum::IfcProcedureTypeEnum ProcedureType();
+    std::string ProcedureID() const;
+    void setProcedureID(std::string v);
+    IfcProcedureTypeEnum::IfcProcedureTypeEnum ProcedureType() const;
     void setProcedureType(IfcProcedureTypeEnum::IfcProcedureTypeEnum v);
     /// Whether the optional attribute UserDefinedProcedureType is defined for this IfcProcedure
-    bool hasUserDefinedProcedureType();
-    IfcLabel UserDefinedProcedureType();
-    void setUserDefinedProcedureType(IfcLabel v);
+    bool hasUserDefinedProcedureType() const;
+    std::string UserDefinedProcedureType() const;
+    void setUserDefinedProcedureType(std::string v);
     virtual unsigned int getArgumentCount() const { return 8; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 5: return IfcUtil::Argument_STRING; case 6: return IfcUtil::Argument_ENUMERATION; case 7: return IfcUtil::Argument_STRING; } return IfcProcess::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 5: return Type::IfcIdentifier; case 6: return Type::IfcProcedureTypeEnum; case 7: return Type::IfcLabel; } return IfcProcess::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 5: return "ProcedureID"; case 6: return "ProcedureType"; case 7: return "UserDefinedProcedureType"; } return IfcProcess::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcProcedure (IfcAbstractEntityPtr e);
-    IfcProcedure (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcIdentifier v6_ProcedureID, IfcProcedureTypeEnum::IfcProcedureTypeEnum v7_ProcedureType, boost::optional< IfcLabel > v8_UserDefinedProcedureType);
-    typedef IfcProcedure* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcProcedure > > list;
-    typedef IfcTemplatedEntityList< IfcProcedure >::it it;
+    IfcProcedure (IfcAbstractEntity* e);
+    IfcProcedure (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, std::string v6_ProcedureID, IfcProcedureTypeEnum::IfcProcedureTypeEnum v7_ProcedureType, boost::optional< std::string > v8_UserDefinedProcedureType);
+    typedef IfcTemplatedEntityList< IfcProcedure > list;
 };
 /// A project order is a directive to purchase products and/or perform work, such as for construction or facilities management. 
 /// 
@@ -29338,15 +30011,15 @@ class IfcProcedure : public IfcProcess {
 /// Approvals may be associated to indicate the status of acceptance or rejection using the IfcRelAssociatesApproval relationship where RelatingApproval refers to an IfcApproval and RelatedObjects contains the IfcProjectOrder.  Approvals may be split into sub-approvals using IfcApprovalRelationship to track approval status separately for each party where RelatingApproval refers to the higher-level approval and RelatedApprovals contains one or more lower-level approvals.  The hierarchy of approvals implies sequencing such that a higher-level approval is not executed until all of its lower-level approvals have been accepted.
 class IfcProjectOrder : public IfcControl {
 public:
-    IfcIdentifier ID();
-    void setID(IfcIdentifier v);
+    std::string ID() const;
+    void setID(std::string v);
     /// Predefined generic type for a project order that is specified in an enumeration. There may be a property set given specificly for the predefined types.
     /// 
     /// IFC2x4 CHANGE  The attribute has been made optional.
-    IfcProjectOrderTypeEnum::IfcProjectOrderTypeEnum PredefinedType();
+    IfcProjectOrderTypeEnum::IfcProjectOrderTypeEnum PredefinedType() const;
     void setPredefinedType(IfcProjectOrderTypeEnum::IfcProjectOrderTypeEnum v);
     /// Whether the optional attribute Status is defined for this IfcProjectOrder
-    bool hasStatus();
+    bool hasStatus() const;
     /// The current status of a project order.Examples of status values that might be used for a project order status include:
     /// 
     /// PLANNED
@@ -29356,40 +30029,38 @@ class IfcProjectOrder : public IfcControl {
     /// STARTED
     /// DELAYED
     /// DONE
-    IfcLabel Status();
-    void setStatus(IfcLabel v);
+    std::string Status() const;
+    void setStatus(std::string v);
     virtual unsigned int getArgumentCount() const { return 8; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 5: return IfcUtil::Argument_STRING; case 6: return IfcUtil::Argument_ENUMERATION; case 7: return IfcUtil::Argument_STRING; } return IfcControl::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 5: return Type::IfcIdentifier; case 6: return Type::IfcProjectOrderTypeEnum; case 7: return Type::IfcLabel; } return IfcControl::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 5: return "ID"; case 6: return "PredefinedType"; case 7: return "Status"; } return IfcControl::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcProjectOrder (IfcAbstractEntityPtr e);
-    IfcProjectOrder (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcIdentifier v6_ID, IfcProjectOrderTypeEnum::IfcProjectOrderTypeEnum v7_PredefinedType, boost::optional< IfcLabel > v8_Status);
-    typedef IfcProjectOrder* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcProjectOrder > > list;
-    typedef IfcTemplatedEntityList< IfcProjectOrder >::it it;
+    IfcProjectOrder (IfcAbstractEntity* e);
+    IfcProjectOrder (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, std::string v6_ID, IfcProjectOrderTypeEnum::IfcProjectOrderTypeEnum v7_PredefinedType, boost::optional< std::string > v8_Status);
+    typedef IfcTemplatedEntityList< IfcProjectOrder > list;
 };
 
 class IfcProjectOrderRecord : public IfcControl {
 public:
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelAssignsToProjectOrder > > Records();
-    void setRecords(SHARED_PTR< IfcTemplatedEntityList< IfcRelAssignsToProjectOrder > > v);
-    IfcProjectOrderRecordTypeEnum::IfcProjectOrderRecordTypeEnum PredefinedType();
+    IfcTemplatedEntityList< IfcRelAssignsToProjectOrder >::ptr Records() const;
+    void setRecords(IfcTemplatedEntityList< IfcRelAssignsToProjectOrder >::ptr v);
+    IfcProjectOrderRecordTypeEnum::IfcProjectOrderRecordTypeEnum PredefinedType() const;
     void setPredefinedType(IfcProjectOrderRecordTypeEnum::IfcProjectOrderRecordTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 7; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 5: return IfcUtil::Argument_ENTITY_LIST; case 6: return IfcUtil::Argument_ENUMERATION; } return IfcControl::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 5: return Type::IfcRelAssignsToProjectOrder; case 6: return Type::IfcProjectOrderRecordTypeEnum; } return IfcControl::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 5: return "Records"; case 6: return "PredefinedType"; } return IfcControl::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcProjectOrderRecord (IfcAbstractEntityPtr e);
-    IfcProjectOrderRecord (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, SHARED_PTR< IfcTemplatedEntityList< IfcRelAssignsToProjectOrder > > v6_Records, IfcProjectOrderRecordTypeEnum::IfcProjectOrderRecordTypeEnum v7_PredefinedType);
-    typedef IfcProjectOrderRecord* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcProjectOrderRecord > > list;
-    typedef IfcTemplatedEntityList< IfcProjectOrderRecord >::it it;
+    IfcProjectOrderRecord (IfcAbstractEntity* e);
+    IfcProjectOrderRecord (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcTemplatedEntityList< IfcRelAssignsToProjectOrder >::ptr v6_Records, IfcProjectOrderRecordTypeEnum::IfcProjectOrderRecordTypeEnum v7_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcProjectOrderRecord > list;
 };
 /// The projection element is a
 /// specialization of the general feature element to represent
@@ -29502,16 +30173,15 @@ class IfcProjectionElement : public IfcFeatureElementAddition {
 public:
     virtual unsigned int getArgumentCount() const { return 8; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcFeatureElementAddition::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcFeatureElementAddition::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcFeatureElementAddition::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcProjectionElement (IfcAbstractEntityPtr e);
-    IfcProjectionElement (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag);
-    typedef IfcProjectionElement* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcProjectionElement > > list;
-    typedef IfcTemplatedEntityList< IfcProjectionElement >::it it;
+    IfcProjectionElement (IfcAbstractEntity* e);
+    IfcProjectionElement (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag);
+    typedef IfcTemplatedEntityList< IfcProjectionElement > list;
 };
 /// The flow controller type IfcProtectiveDeviceType defines commonly shared information for occurrences of protective devices.  The set of shared information may include: 
 /// 
@@ -29551,20 +30221,19 @@ class IfcProjectionElement : public IfcFeatureElementAddition {
 class IfcProtectiveDeviceType : public IfcFlowControllerType {
 public:
     /// Identifies the predefined types of protective device from which the type required may be set.
-    IfcProtectiveDeviceTypeEnum::IfcProtectiveDeviceTypeEnum PredefinedType();
+    IfcProtectiveDeviceTypeEnum::IfcProtectiveDeviceTypeEnum PredefinedType() const;
     void setPredefinedType(IfcProtectiveDeviceTypeEnum::IfcProtectiveDeviceTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcFlowControllerType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcProtectiveDeviceTypeEnum; } return IfcFlowControllerType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcFlowControllerType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcProtectiveDeviceType (IfcAbstractEntityPtr e);
-    IfcProtectiveDeviceType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcProtectiveDeviceTypeEnum::IfcProtectiveDeviceTypeEnum v10_PredefinedType);
-    typedef IfcProtectiveDeviceType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcProtectiveDeviceType > > list;
-    typedef IfcTemplatedEntityList< IfcProtectiveDeviceType >::it it;
+    IfcProtectiveDeviceType (IfcAbstractEntity* e);
+    IfcProtectiveDeviceType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcProtectiveDeviceTypeEnum::IfcProtectiveDeviceTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcProtectiveDeviceType > list;
 };
 /// The flow moving device type IfcPumpType defines commonly shared information for occurrences of pumps.  The set of shared information may include: 
 /// 
@@ -29597,36 +30266,34 @@ class IfcProtectiveDeviceType : public IfcFlowControllerType {
 class IfcPumpType : public IfcFlowMovingDeviceType {
 public:
     /// Defines the type of pump typically used in building services.
-    IfcPumpTypeEnum::IfcPumpTypeEnum PredefinedType();
+    IfcPumpTypeEnum::IfcPumpTypeEnum PredefinedType() const;
     void setPredefinedType(IfcPumpTypeEnum::IfcPumpTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcFlowMovingDeviceType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcPumpTypeEnum; } return IfcFlowMovingDeviceType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcFlowMovingDeviceType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcPumpType (IfcAbstractEntityPtr e);
-    IfcPumpType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcPumpTypeEnum::IfcPumpTypeEnum v10_PredefinedType);
-    typedef IfcPumpType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcPumpType > > list;
-    typedef IfcTemplatedEntityList< IfcPumpType >::it it;
+    IfcPumpType (IfcAbstractEntity* e);
+    IfcPumpType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcPumpTypeEnum::IfcPumpTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcPumpType > list;
 };
 
 class IfcRadiusDimension : public IfcDimensionCurveDirectedCallout {
 public:
     virtual unsigned int getArgumentCount() const { return 1; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcDimensionCurveDirectedCallout::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcDimensionCurveDirectedCallout::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcDimensionCurveDirectedCallout::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRadiusDimension (IfcAbstractEntityPtr e);
-    IfcRadiusDimension (IfcEntities v1_Contents);
-    typedef IfcRadiusDimension* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRadiusDimension > > list;
-    typedef IfcTemplatedEntityList< IfcRadiusDimension >::it it;
+    IfcRadiusDimension (IfcAbstractEntity* e);
+    IfcRadiusDimension (IfcEntityList::ptr v1_Contents);
+    typedef IfcTemplatedEntityList< IfcRadiusDimension > list;
 };
 /// Definition from IAI: The element type (IfcRailingType)
 ///   defines a list of commonly shared property set definitions of a railing element
@@ -29651,20 +30318,19 @@ class IfcRadiusDimension : public IfcDimensionCurveDirectedCallout {
 class IfcRailingType : public IfcBuildingElementType {
 public:
     /// Identifies the predefined types of a railing element from which the type required may be set.
-    IfcRailingTypeEnum::IfcRailingTypeEnum PredefinedType();
+    IfcRailingTypeEnum::IfcRailingTypeEnum PredefinedType() const;
     void setPredefinedType(IfcRailingTypeEnum::IfcRailingTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcBuildingElementType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcRailingTypeEnum; } return IfcBuildingElementType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcBuildingElementType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRailingType (IfcAbstractEntityPtr e);
-    IfcRailingType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcRailingTypeEnum::IfcRailingTypeEnum v10_PredefinedType);
-    typedef IfcRailingType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRailingType > > list;
-    typedef IfcTemplatedEntityList< IfcRailingType >::it it;
+    IfcRailingType (IfcAbstractEntity* e);
+    IfcRailingType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcRailingTypeEnum::IfcRailingTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcRailingType > list;
 };
 /// Definition from IAI: The element type (IfcRampFlightType)
 ///   defines a list of commonly shared property set definitions of a ramp flight and
@@ -29689,20 +30355,19 @@ class IfcRailingType : public IfcBuildingElementType {
 class IfcRampFlightType : public IfcBuildingElementType {
 public:
     /// Identifies the predefined types of a ramp flight element from which the type required may be set.
-    IfcRampFlightTypeEnum::IfcRampFlightTypeEnum PredefinedType();
+    IfcRampFlightTypeEnum::IfcRampFlightTypeEnum PredefinedType() const;
     void setPredefinedType(IfcRampFlightTypeEnum::IfcRampFlightTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcBuildingElementType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcRampFlightTypeEnum; } return IfcBuildingElementType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcBuildingElementType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRampFlightType (IfcAbstractEntityPtr e);
-    IfcRampFlightType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcRampFlightTypeEnum::IfcRampFlightTypeEnum v10_PredefinedType);
-    typedef IfcRampFlightType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRampFlightType > > list;
-    typedef IfcTemplatedEntityList< IfcRampFlightType >::it it;
+    IfcRampFlightType (IfcAbstractEntity* e);
+    IfcRampFlightType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcRampFlightTypeEnum::IfcRampFlightTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcRampFlightType > list;
 };
 /// The aggregation relationship
 /// IfcRelAggregates is a special type of the general
@@ -29730,36 +30395,34 @@ class IfcRelAggregates : public IfcRelDecomposes {
 public:
     virtual unsigned int getArgumentCount() const { return 6; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcRelDecomposes::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcRelDecomposes::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcRelDecomposes::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRelAggregates (IfcAbstractEntityPtr e);
-    IfcRelAggregates (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, IfcObjectDefinition* v5_RelatingObject, SHARED_PTR< IfcTemplatedEntityList< IfcObjectDefinition > > v6_RelatedObjects);
-    typedef IfcRelAggregates* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRelAggregates > > list;
-    typedef IfcTemplatedEntityList< IfcRelAggregates >::it it;
+    IfcRelAggregates (IfcAbstractEntity* e);
+    IfcRelAggregates (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcObjectDefinition* v5_RelatingObject, IfcTemplatedEntityList< IfcObjectDefinition >::ptr v6_RelatedObjects);
+    typedef IfcTemplatedEntityList< IfcRelAggregates > list;
 };
 
 class IfcRelAssignsTasks : public IfcRelAssignsToControl {
 public:
     /// Whether the optional attribute TimeForTask is defined for this IfcRelAssignsTasks
-    bool hasTimeForTask();
-    IfcScheduleTimeControl* TimeForTask();
+    bool hasTimeForTask() const;
+    IfcScheduleTimeControl* TimeForTask() const;
     void setTimeForTask(IfcScheduleTimeControl* v);
     virtual unsigned int getArgumentCount() const { return 8; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 7: return IfcUtil::Argument_ENTITY; } return IfcRelAssignsToControl::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 7: return Type::IfcScheduleTimeControl; } return IfcRelAssignsToControl::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 7: return "TimeForTask"; } return IfcRelAssignsToControl::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRelAssignsTasks (IfcAbstractEntityPtr e);
-    IfcRelAssignsTasks (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, SHARED_PTR< IfcTemplatedEntityList< IfcObjectDefinition > > v5_RelatedObjects, boost::optional< IfcObjectTypeEnum::IfcObjectTypeEnum > v6_RelatedObjectsType, IfcControl* v7_RelatingControl, IfcScheduleTimeControl* v8_TimeForTask);
-    typedef IfcRelAssignsTasks* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRelAssignsTasks > > list;
-    typedef IfcTemplatedEntityList< IfcRelAssignsTasks >::it it;
+    IfcRelAssignsTasks (IfcAbstractEntity* e);
+    IfcRelAssignsTasks (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcTemplatedEntityList< IfcObjectDefinition >::ptr v5_RelatedObjects, boost::optional< IfcObjectTypeEnum::IfcObjectTypeEnum > v6_RelatedObjectsType, IfcControl* v7_RelatingControl, IfcScheduleTimeControl* v8_TimeForTask);
+    typedef IfcTemplatedEntityList< IfcRelAssignsTasks > list;
 };
 /// The flow terminal type IfcSanitaryTerminalType defines commonly shared information for occurrences of sanitary terminals.  The set of shared information may include: 
 /// 
@@ -29801,129 +30464,126 @@ class IfcRelAssignsTasks : public IfcRelAssignsToControl {
 class IfcSanitaryTerminalType : public IfcFlowTerminalType {
 public:
     /// Identifies the predefined types of sanitary terminal from which the type required may be set.
-    IfcSanitaryTerminalTypeEnum::IfcSanitaryTerminalTypeEnum PredefinedType();
+    IfcSanitaryTerminalTypeEnum::IfcSanitaryTerminalTypeEnum PredefinedType() const;
     void setPredefinedType(IfcSanitaryTerminalTypeEnum::IfcSanitaryTerminalTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcFlowTerminalType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcSanitaryTerminalTypeEnum; } return IfcFlowTerminalType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcFlowTerminalType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcSanitaryTerminalType (IfcAbstractEntityPtr e);
-    IfcSanitaryTerminalType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcSanitaryTerminalTypeEnum::IfcSanitaryTerminalTypeEnum v10_PredefinedType);
-    typedef IfcSanitaryTerminalType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcSanitaryTerminalType > > list;
-    typedef IfcTemplatedEntityList< IfcSanitaryTerminalType >::it it;
+    IfcSanitaryTerminalType (IfcAbstractEntity* e);
+    IfcSanitaryTerminalType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcSanitaryTerminalTypeEnum::IfcSanitaryTerminalTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcSanitaryTerminalType > list;
 };
 
 class IfcScheduleTimeControl : public IfcControl {
 public:
     /// Whether the optional attribute ActualStart is defined for this IfcScheduleTimeControl
-    bool hasActualStart();
-    IfcDateTimeSelect ActualStart();
-    void setActualStart(IfcDateTimeSelect v);
+    bool hasActualStart() const;
+    IfcDateTimeSelect* ActualStart() const;
+    void setActualStart(IfcDateTimeSelect* v);
     /// Whether the optional attribute EarlyStart is defined for this IfcScheduleTimeControl
-    bool hasEarlyStart();
-    IfcDateTimeSelect EarlyStart();
-    void setEarlyStart(IfcDateTimeSelect v);
+    bool hasEarlyStart() const;
+    IfcDateTimeSelect* EarlyStart() const;
+    void setEarlyStart(IfcDateTimeSelect* v);
     /// Whether the optional attribute LateStart is defined for this IfcScheduleTimeControl
-    bool hasLateStart();
-    IfcDateTimeSelect LateStart();
-    void setLateStart(IfcDateTimeSelect v);
+    bool hasLateStart() const;
+    IfcDateTimeSelect* LateStart() const;
+    void setLateStart(IfcDateTimeSelect* v);
     /// Whether the optional attribute ScheduleStart is defined for this IfcScheduleTimeControl
-    bool hasScheduleStart();
-    IfcDateTimeSelect ScheduleStart();
-    void setScheduleStart(IfcDateTimeSelect v);
+    bool hasScheduleStart() const;
+    IfcDateTimeSelect* ScheduleStart() const;
+    void setScheduleStart(IfcDateTimeSelect* v);
     /// Whether the optional attribute ActualFinish is defined for this IfcScheduleTimeControl
-    bool hasActualFinish();
-    IfcDateTimeSelect ActualFinish();
-    void setActualFinish(IfcDateTimeSelect v);
+    bool hasActualFinish() const;
+    IfcDateTimeSelect* ActualFinish() const;
+    void setActualFinish(IfcDateTimeSelect* v);
     /// Whether the optional attribute EarlyFinish is defined for this IfcScheduleTimeControl
-    bool hasEarlyFinish();
-    IfcDateTimeSelect EarlyFinish();
-    void setEarlyFinish(IfcDateTimeSelect v);
+    bool hasEarlyFinish() const;
+    IfcDateTimeSelect* EarlyFinish() const;
+    void setEarlyFinish(IfcDateTimeSelect* v);
     /// Whether the optional attribute LateFinish is defined for this IfcScheduleTimeControl
-    bool hasLateFinish();
-    IfcDateTimeSelect LateFinish();
-    void setLateFinish(IfcDateTimeSelect v);
+    bool hasLateFinish() const;
+    IfcDateTimeSelect* LateFinish() const;
+    void setLateFinish(IfcDateTimeSelect* v);
     /// Whether the optional attribute ScheduleFinish is defined for this IfcScheduleTimeControl
-    bool hasScheduleFinish();
-    IfcDateTimeSelect ScheduleFinish();
-    void setScheduleFinish(IfcDateTimeSelect v);
+    bool hasScheduleFinish() const;
+    IfcDateTimeSelect* ScheduleFinish() const;
+    void setScheduleFinish(IfcDateTimeSelect* v);
     /// Whether the optional attribute ScheduleDuration is defined for this IfcScheduleTimeControl
-    bool hasScheduleDuration();
-    IfcTimeMeasure ScheduleDuration();
-    void setScheduleDuration(IfcTimeMeasure v);
+    bool hasScheduleDuration() const;
+    double ScheduleDuration() const;
+    void setScheduleDuration(double v);
     /// Whether the optional attribute ActualDuration is defined for this IfcScheduleTimeControl
-    bool hasActualDuration();
-    IfcTimeMeasure ActualDuration();
-    void setActualDuration(IfcTimeMeasure v);
+    bool hasActualDuration() const;
+    double ActualDuration() const;
+    void setActualDuration(double v);
     /// Whether the optional attribute RemainingTime is defined for this IfcScheduleTimeControl
-    bool hasRemainingTime();
-    IfcTimeMeasure RemainingTime();
-    void setRemainingTime(IfcTimeMeasure v);
+    bool hasRemainingTime() const;
+    double RemainingTime() const;
+    void setRemainingTime(double v);
     /// Whether the optional attribute FreeFloat is defined for this IfcScheduleTimeControl
-    bool hasFreeFloat();
-    IfcTimeMeasure FreeFloat();
-    void setFreeFloat(IfcTimeMeasure v);
+    bool hasFreeFloat() const;
+    double FreeFloat() const;
+    void setFreeFloat(double v);
     /// Whether the optional attribute TotalFloat is defined for this IfcScheduleTimeControl
-    bool hasTotalFloat();
-    IfcTimeMeasure TotalFloat();
-    void setTotalFloat(IfcTimeMeasure v);
+    bool hasTotalFloat() const;
+    double TotalFloat() const;
+    void setTotalFloat(double v);
     /// Whether the optional attribute IsCritical is defined for this IfcScheduleTimeControl
-    bool hasIsCritical();
-    bool IsCritical();
+    bool hasIsCritical() const;
+    bool IsCritical() const;
     void setIsCritical(bool v);
     /// Whether the optional attribute StatusTime is defined for this IfcScheduleTimeControl
-    bool hasStatusTime();
-    IfcDateTimeSelect StatusTime();
-    void setStatusTime(IfcDateTimeSelect v);
+    bool hasStatusTime() const;
+    IfcDateTimeSelect* StatusTime() const;
+    void setStatusTime(IfcDateTimeSelect* v);
     /// Whether the optional attribute StartFloat is defined for this IfcScheduleTimeControl
-    bool hasStartFloat();
-    IfcTimeMeasure StartFloat();
-    void setStartFloat(IfcTimeMeasure v);
+    bool hasStartFloat() const;
+    double StartFloat() const;
+    void setStartFloat(double v);
     /// Whether the optional attribute FinishFloat is defined for this IfcScheduleTimeControl
-    bool hasFinishFloat();
-    IfcTimeMeasure FinishFloat();
-    void setFinishFloat(IfcTimeMeasure v);
+    bool hasFinishFloat() const;
+    double FinishFloat() const;
+    void setFinishFloat(double v);
     /// Whether the optional attribute Completion is defined for this IfcScheduleTimeControl
-    bool hasCompletion();
-    IfcPositiveRatioMeasure Completion();
-    void setCompletion(IfcPositiveRatioMeasure v);
+    bool hasCompletion() const;
+    double Completion() const;
+    void setCompletion(double v);
     virtual unsigned int getArgumentCount() const { return 23; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 5: return IfcUtil::Argument_ENTITY; case 6: return IfcUtil::Argument_ENTITY; case 7: return IfcUtil::Argument_ENTITY; case 8: return IfcUtil::Argument_ENTITY; case 9: return IfcUtil::Argument_ENTITY; case 10: return IfcUtil::Argument_ENTITY; case 11: return IfcUtil::Argument_ENTITY; case 12: return IfcUtil::Argument_ENTITY; case 13: return IfcUtil::Argument_DOUBLE; case 14: return IfcUtil::Argument_DOUBLE; case 15: return IfcUtil::Argument_DOUBLE; case 16: return IfcUtil::Argument_DOUBLE; case 17: return IfcUtil::Argument_DOUBLE; case 18: return IfcUtil::Argument_BOOL; case 19: return IfcUtil::Argument_ENTITY; case 20: return IfcUtil::Argument_DOUBLE; case 21: return IfcUtil::Argument_DOUBLE; case 22: return IfcUtil::Argument_DOUBLE; } return IfcControl::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 5: return Type::IfcDateTimeSelect; case 6: return Type::IfcDateTimeSelect; case 7: return Type::IfcDateTimeSelect; case 8: return Type::IfcDateTimeSelect; case 9: return Type::IfcDateTimeSelect; case 10: return Type::IfcDateTimeSelect; case 11: return Type::IfcDateTimeSelect; case 12: return Type::IfcDateTimeSelect; case 13: return Type::IfcTimeMeasure; case 14: return Type::IfcTimeMeasure; case 15: return Type::IfcTimeMeasure; case 16: return Type::IfcTimeMeasure; case 17: return Type::IfcTimeMeasure; case 18: return Type::UNDEFINED; case 19: return Type::IfcDateTimeSelect; case 20: return Type::IfcTimeMeasure; case 21: return Type::IfcTimeMeasure; case 22: return Type::IfcPositiveRatioMeasure; } return IfcControl::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 5: return "ActualStart"; case 6: return "EarlyStart"; case 7: return "LateStart"; case 8: return "ScheduleStart"; case 9: return "ActualFinish"; case 10: return "EarlyFinish"; case 11: return "LateFinish"; case 12: return "ScheduleFinish"; case 13: return "ScheduleDuration"; case 14: return "ActualDuration"; case 15: return "RemainingTime"; case 16: return "FreeFloat"; case 17: return "TotalFloat"; case 18: return "IsCritical"; case 19: return "StatusTime"; case 20: return "StartFloat"; case 21: return "FinishFloat"; case 22: return "Completion"; } return IfcControl::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelAssignsTasks > > ScheduleTimeControlAssigned(); // INVERSE IfcRelAssignsTasks::TimeForTask
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcRelAssignsTasks >::ptr ScheduleTimeControlAssigned() const; // INVERSE IfcRelAssignsTasks::TimeForTask
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcScheduleTimeControl (IfcAbstractEntityPtr e);
-    IfcScheduleTimeControl (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, boost::optional< IfcDateTimeSelect > v6_ActualStart, boost::optional< IfcDateTimeSelect > v7_EarlyStart, boost::optional< IfcDateTimeSelect > v8_LateStart, boost::optional< IfcDateTimeSelect > v9_ScheduleStart, boost::optional< IfcDateTimeSelect > v10_ActualFinish, boost::optional< IfcDateTimeSelect > v11_EarlyFinish, boost::optional< IfcDateTimeSelect > v12_LateFinish, boost::optional< IfcDateTimeSelect > v13_ScheduleFinish, boost::optional< IfcTimeMeasure > v14_ScheduleDuration, boost::optional< IfcTimeMeasure > v15_ActualDuration, boost::optional< IfcTimeMeasure > v16_RemainingTime, boost::optional< IfcTimeMeasure > v17_FreeFloat, boost::optional< IfcTimeMeasure > v18_TotalFloat, boost::optional< bool > v19_IsCritical, boost::optional< IfcDateTimeSelect > v20_StatusTime, boost::optional< IfcTimeMeasure > v21_StartFloat, boost::optional< IfcTimeMeasure > v22_FinishFloat, boost::optional< IfcPositiveRatioMeasure > v23_Completion);
-    typedef IfcScheduleTimeControl* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcScheduleTimeControl > > list;
-    typedef IfcTemplatedEntityList< IfcScheduleTimeControl >::it it;
+    IfcScheduleTimeControl (IfcAbstractEntity* e);
+    IfcScheduleTimeControl (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcDateTimeSelect* v6_ActualStart, IfcDateTimeSelect* v7_EarlyStart, IfcDateTimeSelect* v8_LateStart, IfcDateTimeSelect* v9_ScheduleStart, IfcDateTimeSelect* v10_ActualFinish, IfcDateTimeSelect* v11_EarlyFinish, IfcDateTimeSelect* v12_LateFinish, IfcDateTimeSelect* v13_ScheduleFinish, boost::optional< double > v14_ScheduleDuration, boost::optional< double > v15_ActualDuration, boost::optional< double > v16_RemainingTime, boost::optional< double > v17_FreeFloat, boost::optional< double > v18_TotalFloat, boost::optional< bool > v19_IsCritical, IfcDateTimeSelect* v20_StatusTime, boost::optional< double > v21_StartFloat, boost::optional< double > v22_FinishFloat, boost::optional< double > v23_Completion);
+    typedef IfcTemplatedEntityList< IfcScheduleTimeControl > list;
 };
 
 class IfcServiceLife : public IfcControl {
 public:
-    IfcServiceLifeTypeEnum::IfcServiceLifeTypeEnum ServiceLifeType();
+    IfcServiceLifeTypeEnum::IfcServiceLifeTypeEnum ServiceLifeType() const;
     void setServiceLifeType(IfcServiceLifeTypeEnum::IfcServiceLifeTypeEnum v);
-    IfcTimeMeasure ServiceLifeDuration();
-    void setServiceLifeDuration(IfcTimeMeasure v);
+    double ServiceLifeDuration() const;
+    void setServiceLifeDuration(double v);
     virtual unsigned int getArgumentCount() const { return 7; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 5: return IfcUtil::Argument_ENUMERATION; case 6: return IfcUtil::Argument_DOUBLE; } return IfcControl::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 5: return Type::IfcServiceLifeTypeEnum; case 6: return Type::IfcTimeMeasure; } return IfcControl::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 5: return "ServiceLifeType"; case 6: return "ServiceLifeDuration"; } return IfcControl::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcServiceLife (IfcAbstractEntityPtr e);
-    IfcServiceLife (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcServiceLifeTypeEnum::IfcServiceLifeTypeEnum v6_ServiceLifeType, IfcTimeMeasure v7_ServiceLifeDuration);
-    typedef IfcServiceLife* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcServiceLife > > list;
-    typedef IfcTemplatedEntityList< IfcServiceLife >::it it;
+    IfcServiceLife (IfcAbstractEntity* e);
+    IfcServiceLife (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcServiceLifeTypeEnum::IfcServiceLifeTypeEnum v6_ServiceLifeType, double v7_ServiceLifeDuration);
+    typedef IfcTemplatedEntityList< IfcServiceLife > list;
 };
 /// Definition from ISO 6707-1:1989: Area where construction
 /// works are undertaken.
@@ -30117,45 +30777,44 @@ class IfcServiceLife : public IfcControl {
 class IfcSite : public IfcSpatialStructureElement {
 public:
     /// Whether the optional attribute RefLatitude is defined for this IfcSite
-    bool hasRefLatitude();
+    bool hasRefLatitude() const;
     /// World Latitude at reference point (most likely defined in legal description). Defined as integer values for degrees, minutes, seconds, and, optionally, millionths of seconds with respect to the world geodetic system WGS84.
     ///   Latitudes are measured relative to the geodetic equator, north of the equator by positive values - from 0 till +90,   south of the equator by negative values - from 0 till  -90.
-    IfcCompoundPlaneAngleMeasure RefLatitude();
-    void setRefLatitude(IfcCompoundPlaneAngleMeasure v);
+    std::vector< int > /*[3:4]*/ RefLatitude() const;
+    void setRefLatitude(std::vector< int > /*[3:4]*/ v);
     /// Whether the optional attribute RefLongitude is defined for this IfcSite
-    bool hasRefLongitude();
+    bool hasRefLongitude() const;
     /// World Longitude at reference point (most likely defined in legal description). Defined as integer values for degrees, minutes, seconds, and, optionally, millionths of seconds with respect to the world geodetic system WGS84.
     ///   Longitudes are measured relative to the geodetic zero meridian, nominally the same as the Greenwich prime meridian: longitudes west of the zero meridian have negative values - from 0 till -180, longitudes east of the zero meridian have positive values - from 0 till -180.
     /// Example: Chicago Harbor Light has according to WGS84 a longitude -87.35.40 (or 87.35.40W) and a latitude 41.53.30 (or 41.53.30N).
-    IfcCompoundPlaneAngleMeasure RefLongitude();
-    void setRefLongitude(IfcCompoundPlaneAngleMeasure v);
+    std::vector< int > /*[3:4]*/ RefLongitude() const;
+    void setRefLongitude(std::vector< int > /*[3:4]*/ v);
     /// Whether the optional attribute RefElevation is defined for this IfcSite
-    bool hasRefElevation();
+    bool hasRefElevation() const;
     /// Datum elevation relative to sea level.
-    IfcLengthMeasure RefElevation();
-    void setRefElevation(IfcLengthMeasure v);
+    double RefElevation() const;
+    void setRefElevation(double v);
     /// Whether the optional attribute LandTitleNumber is defined for this IfcSite
-    bool hasLandTitleNumber();
+    bool hasLandTitleNumber() const;
     /// The land title number (designation of the site within a regional system).
-    IfcLabel LandTitleNumber();
-    void setLandTitleNumber(IfcLabel v);
+    std::string LandTitleNumber() const;
+    void setLandTitleNumber(std::string v);
     /// Whether the optional attribute SiteAddress is defined for this IfcSite
-    bool hasSiteAddress();
+    bool hasSiteAddress() const;
     /// Address given to the site for postal purposes.
-    IfcPostalAddress* SiteAddress();
+    IfcPostalAddress* SiteAddress() const;
     void setSiteAddress(IfcPostalAddress* v);
     virtual unsigned int getArgumentCount() const { return 14; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_VECTOR_INT; case 10: return IfcUtil::Argument_VECTOR_INT; case 11: return IfcUtil::Argument_DOUBLE; case 12: return IfcUtil::Argument_STRING; case 13: return IfcUtil::Argument_ENTITY; } return IfcSpatialStructureElement::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcCompoundPlaneAngleMeasure; case 10: return Type::IfcCompoundPlaneAngleMeasure; case 11: return Type::IfcLengthMeasure; case 12: return Type::IfcLabel; case 13: return Type::IfcPostalAddress; } return IfcSpatialStructureElement::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "RefLatitude"; case 10: return "RefLongitude"; case 11: return "RefElevation"; case 12: return "LandTitleNumber"; case 13: return "SiteAddress"; } return IfcSpatialStructureElement::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcSite (IfcAbstractEntityPtr e);
-    IfcSite (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcLabel > v8_LongName, IfcElementCompositionEnum::IfcElementCompositionEnum v9_CompositionType, boost::optional< IfcCompoundPlaneAngleMeasure > v10_RefLatitude, boost::optional< IfcCompoundPlaneAngleMeasure > v11_RefLongitude, boost::optional< IfcLengthMeasure > v12_RefElevation, boost::optional< IfcLabel > v13_LandTitleNumber, IfcPostalAddress* v14_SiteAddress);
-    typedef IfcSite* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcSite > > list;
-    typedef IfcTemplatedEntityList< IfcSite >::it it;
+    IfcSite (IfcAbstractEntity* e);
+    IfcSite (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_LongName, IfcElementCompositionEnum::IfcElementCompositionEnum v9_CompositionType, boost::optional< std::vector< int > /*[3:4]*/ > v10_RefLatitude, boost::optional< std::vector< int > /*[3:4]*/ > v11_RefLongitude, boost::optional< double > v12_RefElevation, boost::optional< std::string > v13_LandTitleNumber, IfcPostalAddress* v14_SiteAddress);
+    typedef IfcTemplatedEntityList< IfcSite > list;
 };
 /// The element type IfcSlabType defines commonly shared
 /// information for occurrences of slabs. The set of shared information
@@ -30237,20 +30896,19 @@ class IfcSite : public IfcSpatialStructureElement {
 class IfcSlabType : public IfcBuildingElementType {
 public:
     /// Identifies the predefined types of a slab element from which the type required may be set.
-    IfcSlabTypeEnum::IfcSlabTypeEnum PredefinedType();
+    IfcSlabTypeEnum::IfcSlabTypeEnum PredefinedType() const;
     void setPredefinedType(IfcSlabTypeEnum::IfcSlabTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcBuildingElementType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcSlabTypeEnum; } return IfcBuildingElementType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcBuildingElementType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcSlabType (IfcAbstractEntityPtr e);
-    IfcSlabType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcSlabTypeEnum::IfcSlabTypeEnum v10_PredefinedType);
-    typedef IfcSlabType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcSlabType > > list;
-    typedef IfcTemplatedEntityList< IfcSlabType >::it it;
+    IfcSlabType (IfcAbstractEntity* e);
+    IfcSlabType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcSlabTypeEnum::IfcSlabTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcSlabType > list;
 };
 /// A space represents an area or volume
 /// bounded actually or theoretically. Spaces are areas or volumes that
@@ -30504,27 +31162,26 @@ class IfcSlabType : public IfcBuildingElementType {
 /// 'Brep'
 class IfcSpace : public IfcSpatialStructureElement {
 public:
-    IfcInternalOrExternalEnum::IfcInternalOrExternalEnum InteriorOrExteriorSpace();
+    IfcInternalOrExternalEnum::IfcInternalOrExternalEnum InteriorOrExteriorSpace() const;
     void setInteriorOrExteriorSpace(IfcInternalOrExternalEnum::IfcInternalOrExternalEnum v);
     /// Whether the optional attribute ElevationWithFlooring is defined for this IfcSpace
-    bool hasElevationWithFlooring();
+    bool hasElevationWithFlooring() const;
     /// Level of flooring of this space; the average shall be taken, if the space ground surface is sloping or if there are level differences within this space.
-    IfcLengthMeasure ElevationWithFlooring();
-    void setElevationWithFlooring(IfcLengthMeasure v);
+    double ElevationWithFlooring() const;
+    void setElevationWithFlooring(double v);
     virtual unsigned int getArgumentCount() const { return 11; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; case 10: return IfcUtil::Argument_DOUBLE; } return IfcSpatialStructureElement::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcInternalOrExternalEnum; case 10: return Type::IfcLengthMeasure; } return IfcSpatialStructureElement::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "InteriorOrExteriorSpace"; case 10: return "ElevationWithFlooring"; } return IfcSpatialStructureElement::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelCoversSpaces > > HasCoverings(); // INVERSE IfcRelCoversSpaces::RelatedSpace
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelSpaceBoundary > > BoundedBy(); // INVERSE IfcRelSpaceBoundary::RelatingSpace
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcRelCoversSpaces >::ptr HasCoverings() const; // INVERSE IfcRelCoversSpaces::RelatedSpace
+    IfcTemplatedEntityList< IfcRelSpaceBoundary >::ptr BoundedBy() const; // INVERSE IfcRelSpaceBoundary::RelatingSpace
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcSpace (IfcAbstractEntityPtr e);
-    IfcSpace (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcLabel > v8_LongName, IfcElementCompositionEnum::IfcElementCompositionEnum v9_CompositionType, IfcInternalOrExternalEnum::IfcInternalOrExternalEnum v10_InteriorOrExteriorSpace, boost::optional< IfcLengthMeasure > v11_ElevationWithFlooring);
-    typedef IfcSpace* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcSpace > > list;
-    typedef IfcTemplatedEntityList< IfcSpace >::it it;
+    IfcSpace (IfcAbstractEntity* e);
+    IfcSpace (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_LongName, IfcElementCompositionEnum::IfcElementCompositionEnum v9_CompositionType, IfcInternalOrExternalEnum::IfcInternalOrExternalEnum v10_InteriorOrExteriorSpace, boost::optional< double > v11_ElevationWithFlooring);
+    typedef IfcTemplatedEntityList< IfcSpace > list;
 };
 /// The energy conversion device type IfcSpaceHeaterType defines commonly shared information for occurrences of space heaters.  The set of shared information may include: 
 /// 
@@ -30559,54 +31216,52 @@ class IfcSpace : public IfcSpatialStructureElement {
 class IfcSpaceHeaterType : public IfcEnergyConversionDeviceType {
 public:
     /// Enumeration of possible types of space heater (e.g., baseboard heater, convector, radiator, etc.).
-    IfcSpaceHeaterTypeEnum::IfcSpaceHeaterTypeEnum PredefinedType();
+    IfcSpaceHeaterTypeEnum::IfcSpaceHeaterTypeEnum PredefinedType() const;
     void setPredefinedType(IfcSpaceHeaterTypeEnum::IfcSpaceHeaterTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcEnergyConversionDeviceType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcSpaceHeaterTypeEnum; } return IfcEnergyConversionDeviceType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcEnergyConversionDeviceType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcSpaceHeaterType (IfcAbstractEntityPtr e);
-    IfcSpaceHeaterType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcSpaceHeaterTypeEnum::IfcSpaceHeaterTypeEnum v10_PredefinedType);
-    typedef IfcSpaceHeaterType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcSpaceHeaterType > > list;
-    typedef IfcTemplatedEntityList< IfcSpaceHeaterType >::it it;
+    IfcSpaceHeaterType (IfcAbstractEntity* e);
+    IfcSpaceHeaterType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcSpaceHeaterTypeEnum::IfcSpaceHeaterTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcSpaceHeaterType > list;
 };
 
 class IfcSpaceProgram : public IfcControl {
 public:
-    IfcIdentifier SpaceProgramIdentifier();
-    void setSpaceProgramIdentifier(IfcIdentifier v);
+    std::string SpaceProgramIdentifier() const;
+    void setSpaceProgramIdentifier(std::string v);
     /// Whether the optional attribute MaxRequiredArea is defined for this IfcSpaceProgram
-    bool hasMaxRequiredArea();
-    IfcAreaMeasure MaxRequiredArea();
-    void setMaxRequiredArea(IfcAreaMeasure v);
+    bool hasMaxRequiredArea() const;
+    double MaxRequiredArea() const;
+    void setMaxRequiredArea(double v);
     /// Whether the optional attribute MinRequiredArea is defined for this IfcSpaceProgram
-    bool hasMinRequiredArea();
-    IfcAreaMeasure MinRequiredArea();
-    void setMinRequiredArea(IfcAreaMeasure v);
+    bool hasMinRequiredArea() const;
+    double MinRequiredArea() const;
+    void setMinRequiredArea(double v);
     /// Whether the optional attribute RequestedLocation is defined for this IfcSpaceProgram
-    bool hasRequestedLocation();
-    IfcSpatialStructureElement* RequestedLocation();
+    bool hasRequestedLocation() const;
+    IfcSpatialStructureElement* RequestedLocation() const;
     void setRequestedLocation(IfcSpatialStructureElement* v);
-    IfcAreaMeasure StandardRequiredArea();
-    void setStandardRequiredArea(IfcAreaMeasure v);
+    double StandardRequiredArea() const;
+    void setStandardRequiredArea(double v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 5: return IfcUtil::Argument_STRING; case 6: return IfcUtil::Argument_DOUBLE; case 7: return IfcUtil::Argument_DOUBLE; case 8: return IfcUtil::Argument_ENTITY; case 9: return IfcUtil::Argument_DOUBLE; } return IfcControl::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 5: return Type::IfcIdentifier; case 6: return Type::IfcAreaMeasure; case 7: return Type::IfcAreaMeasure; case 8: return Type::IfcSpatialStructureElement; case 9: return Type::IfcAreaMeasure; } return IfcControl::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 5: return "SpaceProgramIdentifier"; case 6: return "MaxRequiredArea"; case 7: return "MinRequiredArea"; case 8: return "RequestedLocation"; case 9: return "StandardRequiredArea"; } return IfcControl::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelInteractionRequirements > > HasInteractionReqsFrom(); // INVERSE IfcRelInteractionRequirements::RelatedSpaceProgram
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelInteractionRequirements > > HasInteractionReqsTo(); // INVERSE IfcRelInteractionRequirements::RelatingSpaceProgram
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcRelInteractionRequirements >::ptr HasInteractionReqsFrom() const; // INVERSE IfcRelInteractionRequirements::RelatedSpaceProgram
+    IfcTemplatedEntityList< IfcRelInteractionRequirements >::ptr HasInteractionReqsTo() const; // INVERSE IfcRelInteractionRequirements::RelatingSpaceProgram
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcSpaceProgram (IfcAbstractEntityPtr e);
-    IfcSpaceProgram (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcIdentifier v6_SpaceProgramIdentifier, boost::optional< IfcAreaMeasure > v7_MaxRequiredArea, boost::optional< IfcAreaMeasure > v8_MinRequiredArea, IfcSpatialStructureElement* v9_RequestedLocation, IfcAreaMeasure v10_StandardRequiredArea);
-    typedef IfcSpaceProgram* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcSpaceProgram > > list;
-    typedef IfcTemplatedEntityList< IfcSpaceProgram >::it it;
+    IfcSpaceProgram (IfcAbstractEntity* e);
+    IfcSpaceProgram (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, std::string v6_SpaceProgramIdentifier, boost::optional< double > v7_MaxRequiredArea, boost::optional< double > v8_MinRequiredArea, IfcSpatialStructureElement* v9_RequestedLocation, double v10_StandardRequiredArea);
+    typedef IfcTemplatedEntityList< IfcSpaceProgram > list;
 };
 /// Definition from IAI: A space represents an area or
 /// volume bounded actually or theoretically. Spaces are areas or
@@ -30692,20 +31347,19 @@ class IfcSpaceProgram : public IfcControl {
 class IfcSpaceType : public IfcSpatialStructureElementType {
 public:
     /// Predefined types to define the particular type of space. There may be property set definitions available for each predefined type.
-    IfcSpaceTypeEnum::IfcSpaceTypeEnum PredefinedType();
+    IfcSpaceTypeEnum::IfcSpaceTypeEnum PredefinedType() const;
     void setPredefinedType(IfcSpaceTypeEnum::IfcSpaceTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcSpatialStructureElementType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcSpaceTypeEnum; } return IfcSpatialStructureElementType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcSpatialStructureElementType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcSpaceType (IfcAbstractEntityPtr e);
-    IfcSpaceType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcSpaceTypeEnum::IfcSpaceTypeEnum v10_PredefinedType);
-    typedef IfcSpaceType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcSpaceType > > list;
-    typedef IfcTemplatedEntityList< IfcSpaceType >::it it;
+    IfcSpaceType (IfcAbstractEntity* e);
+    IfcSpaceType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcSpaceTypeEnum::IfcSpaceTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcSpaceType > list;
 };
 /// The flow terminal type IfcStackTerminalType defines commonly shared information for occurrences of stack terminals.  The set of shared information may include: 
 /// 
@@ -30736,20 +31390,19 @@ class IfcSpaceType : public IfcSpatialStructureElementType {
 class IfcStackTerminalType : public IfcFlowTerminalType {
 public:
     /// Identifies the predefined types of stack terminal from which the type required may be set.
-    IfcStackTerminalTypeEnum::IfcStackTerminalTypeEnum PredefinedType();
+    IfcStackTerminalTypeEnum::IfcStackTerminalTypeEnum PredefinedType() const;
     void setPredefinedType(IfcStackTerminalTypeEnum::IfcStackTerminalTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcFlowTerminalType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcStackTerminalTypeEnum; } return IfcFlowTerminalType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcFlowTerminalType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcStackTerminalType (IfcAbstractEntityPtr e);
-    IfcStackTerminalType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcStackTerminalTypeEnum::IfcStackTerminalTypeEnum v10_PredefinedType);
-    typedef IfcStackTerminalType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcStackTerminalType > > list;
-    typedef IfcTemplatedEntityList< IfcStackTerminalType >::it it;
+    IfcStackTerminalType (IfcAbstractEntity* e);
+    IfcStackTerminalType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcStackTerminalTypeEnum::IfcStackTerminalTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcStackTerminalType > list;
 };
 /// Definition from IAI: The element type (IfcStairFlightType)
 ///   defines a list of commonly shared property set definitions of a stair flight
@@ -30774,20 +31427,19 @@ class IfcStackTerminalType : public IfcFlowTerminalType {
 class IfcStairFlightType : public IfcBuildingElementType {
 public:
     /// Identifies the predefined types of a stair flight element from which the type required may be set.
-    IfcStairFlightTypeEnum::IfcStairFlightTypeEnum PredefinedType();
+    IfcStairFlightTypeEnum::IfcStairFlightTypeEnum PredefinedType() const;
     void setPredefinedType(IfcStairFlightTypeEnum::IfcStairFlightTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcBuildingElementType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcStairFlightTypeEnum; } return IfcBuildingElementType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcBuildingElementType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcStairFlightType (IfcAbstractEntityPtr e);
-    IfcStairFlightType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcStairFlightTypeEnum::IfcStairFlightTypeEnum v10_PredefinedType);
-    typedef IfcStairFlightType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcStairFlightType > > list;
-    typedef IfcTemplatedEntityList< IfcStairFlightType >::it it;
+    IfcStairFlightType (IfcAbstractEntity* e);
+    IfcStairFlightType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcStairFlightTypeEnum::IfcStairFlightTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcStairFlightType > list;
 };
 /// Definition from IAI: A structural action is a structural activity that acts upon
 /// a structural item or building element.
@@ -30811,24 +31463,23 @@ class IfcStairFlightType : public IfcBuildingElementType {
 class IfcStructuralAction : public IfcStructuralActivity {
 public:
     /// Indicates if this action may cause a stability problem. If it is 'FALSE', no further investigations regarding stability problems are necessary.
-    bool DestabilizingLoad();
+    bool DestabilizingLoad() const;
     void setDestabilizingLoad(bool v);
     /// Whether the optional attribute CausedBy is defined for this IfcStructuralAction
-    bool hasCausedBy();
-    IfcStructuralReaction* CausedBy();
+    bool hasCausedBy() const;
+    IfcStructuralReaction* CausedBy() const;
     void setCausedBy(IfcStructuralReaction* v);
     virtual unsigned int getArgumentCount() const { return 11; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_BOOL; case 10: return IfcUtil::Argument_ENTITY; } return IfcStructuralActivity::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::UNDEFINED; case 10: return Type::IfcStructuralReaction; } return IfcStructuralActivity::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "DestabilizingLoad"; case 10: return "CausedBy"; } return IfcStructuralActivity::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcStructuralAction (IfcAbstractEntityPtr e);
-    IfcStructuralAction (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcStructuralLoad* v8_AppliedLoad, IfcGlobalOrLocalEnum::IfcGlobalOrLocalEnum v9_GlobalOrLocal, bool v10_DestabilizingLoad, IfcStructuralReaction* v11_CausedBy);
-    typedef IfcStructuralAction* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcStructuralAction > > list;
-    typedef IfcTemplatedEntityList< IfcStructuralAction >::it it;
+    IfcStructuralAction (IfcAbstractEntity* e);
+    IfcStructuralAction (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcStructuralLoad* v8_AppliedLoad, IfcGlobalOrLocalEnum::IfcGlobalOrLocalEnum v9_GlobalOrLocal, bool v10_DestabilizingLoad, IfcStructuralReaction* v11_CausedBy);
+    typedef IfcTemplatedEntityList< IfcStructuralAction > list;
 };
 /// Definition from IAI: An IfcStructuralConnection represents a structural connection object (node i.e. vertex connection, or edge connection, or surface connection) or supports.
 /// 
@@ -30836,23 +31487,22 @@ class IfcStructuralAction : public IfcStructuralActivity {
 class IfcStructuralConnection : public IfcStructuralItem {
 public:
     /// Whether the optional attribute AppliedCondition is defined for this IfcStructuralConnection
-    bool hasAppliedCondition();
+    bool hasAppliedCondition() const;
     /// Optional boundary conditions which define support conditions of this connection object, given in local coordinate directions of the connection object.  If left unspecified, the connection object is assumed to have no supports besides being connected with members.
-    IfcBoundaryCondition* AppliedCondition();
+    IfcBoundaryCondition* AppliedCondition() const;
     void setAppliedCondition(IfcBoundaryCondition* v);
     virtual unsigned int getArgumentCount() const { return 8; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 7: return IfcUtil::Argument_ENTITY; } return IfcStructuralItem::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 7: return Type::IfcBoundaryCondition; } return IfcStructuralItem::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 7: return "AppliedCondition"; } return IfcStructuralItem::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelConnectsStructuralMember > > ConnectsStructuralMembers(); // INVERSE IfcRelConnectsStructuralMember::RelatedStructuralConnection
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcRelConnectsStructuralMember >::ptr ConnectsStructuralMembers() const; // INVERSE IfcRelConnectsStructuralMember::RelatedStructuralConnection
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcStructuralConnection (IfcAbstractEntityPtr e);
-    IfcStructuralConnection (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcBoundaryCondition* v8_AppliedCondition);
-    typedef IfcStructuralConnection* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcStructuralConnection > > list;
-    typedef IfcTemplatedEntityList< IfcStructuralConnection >::it it;
+    IfcStructuralConnection (IfcAbstractEntity* e);
+    IfcStructuralConnection (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcBoundaryCondition* v8_AppliedCondition);
+    typedef IfcTemplatedEntityList< IfcStructuralConnection > list;
 };
 /// Definition from IAI: Instances of IfcStructuralCurveConnection describe edge 'nodes', i.e. edges where two or more surface members are joined, or edge supports.  Edge curves may be straight or curved.
 /// 
@@ -30875,16 +31525,15 @@ class IfcStructuralCurveConnection : public IfcStructuralConnection {
 public:
     virtual unsigned int getArgumentCount() const { return 8; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcStructuralConnection::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcStructuralConnection::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcStructuralConnection::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcStructuralCurveConnection (IfcAbstractEntityPtr e);
-    IfcStructuralCurveConnection (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcBoundaryCondition* v8_AppliedCondition);
-    typedef IfcStructuralCurveConnection* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcStructuralCurveConnection > > list;
-    typedef IfcTemplatedEntityList< IfcStructuralCurveConnection >::it it;
+    IfcStructuralCurveConnection (IfcAbstractEntity* e);
+    IfcStructuralCurveConnection (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcBoundaryCondition* v8_AppliedCondition);
+    typedef IfcTemplatedEntityList< IfcStructuralCurveConnection > list;
 };
 /// Definition from IAI: Instances of IfcStructuralCurveMember describe edge members, i.e. structural analysis idealizations of beams, columns, rods etc..  Curve members may be straight or curved.
 /// 
@@ -30926,20 +31575,19 @@ class IfcStructuralCurveConnection : public IfcStructuralConnection {
 class IfcStructuralCurveMember : public IfcStructuralMember {
 public:
     /// Type of member with respect to its load carrying behavior in this analysis idealization.
-    IfcStructuralCurveTypeEnum::IfcStructuralCurveTypeEnum PredefinedType();
+    IfcStructuralCurveTypeEnum::IfcStructuralCurveTypeEnum PredefinedType() const;
     void setPredefinedType(IfcStructuralCurveTypeEnum::IfcStructuralCurveTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 8; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 7: return IfcUtil::Argument_ENUMERATION; } return IfcStructuralMember::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 7: return Type::IfcStructuralCurveTypeEnum; } return IfcStructuralMember::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 7: return "PredefinedType"; } return IfcStructuralMember::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcStructuralCurveMember (IfcAbstractEntityPtr e);
-    IfcStructuralCurveMember (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcStructuralCurveTypeEnum::IfcStructuralCurveTypeEnum v8_PredefinedType);
-    typedef IfcStructuralCurveMember* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcStructuralCurveMember > > list;
-    typedef IfcTemplatedEntityList< IfcStructuralCurveMember >::it it;
+    IfcStructuralCurveMember (IfcAbstractEntity* e);
+    IfcStructuralCurveMember (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcStructuralCurveTypeEnum::IfcStructuralCurveTypeEnum v8_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcStructuralCurveMember > list;
 };
 /// Definition from IAI: Describes edge members with varying profile properties.  Each instance of IfcStructuralCurveMemberVarying is composed of two or more instances of IfcStructuralCurveMember with differing profile properties.  These subordinate members relate to the instance of IfcStructuralCurveMemberVarying by IfcRelAggregates.
 /// 
@@ -30965,16 +31613,15 @@ class IfcStructuralCurveMemberVarying : public IfcStructuralCurveMember {
 public:
     virtual unsigned int getArgumentCount() const { return 8; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcStructuralCurveMember::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcStructuralCurveMember::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcStructuralCurveMember::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcStructuralCurveMemberVarying (IfcAbstractEntityPtr e);
-    IfcStructuralCurveMemberVarying (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcStructuralCurveTypeEnum::IfcStructuralCurveTypeEnum v8_PredefinedType);
-    typedef IfcStructuralCurveMemberVarying* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcStructuralCurveMemberVarying > > list;
-    typedef IfcTemplatedEntityList< IfcStructuralCurveMemberVarying >::it it;
+    IfcStructuralCurveMemberVarying (IfcAbstractEntity* e);
+    IfcStructuralCurveMemberVarying (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcStructuralCurveTypeEnum::IfcStructuralCurveTypeEnum v8_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcStructuralCurveMemberVarying > list;
 };
 /// Definition from IAI: Defines an action with constant value which is distributed over a curve.
 /// 
@@ -30985,40 +31632,38 @@ class IfcStructuralCurveMemberVarying : public IfcStructuralCurveMember {
 /// NOTE  Like its supertype IfcStructuralCurveAction, this action type may also act on curved edges.
 class IfcStructuralLinearAction : public IfcStructuralAction {
 public:
-    IfcProjectedOrTrueLengthEnum::IfcProjectedOrTrueLengthEnum ProjectedOrTrue();
+    IfcProjectedOrTrueLengthEnum::IfcProjectedOrTrueLengthEnum ProjectedOrTrue() const;
     void setProjectedOrTrue(IfcProjectedOrTrueLengthEnum::IfcProjectedOrTrueLengthEnum v);
     virtual unsigned int getArgumentCount() const { return 12; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 11: return IfcUtil::Argument_ENUMERATION; } return IfcStructuralAction::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 11: return Type::IfcProjectedOrTrueLengthEnum; } return IfcStructuralAction::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 11: return "ProjectedOrTrue"; } return IfcStructuralAction::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcStructuralLinearAction (IfcAbstractEntityPtr e);
-    IfcStructuralLinearAction (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcStructuralLoad* v8_AppliedLoad, IfcGlobalOrLocalEnum::IfcGlobalOrLocalEnum v9_GlobalOrLocal, bool v10_DestabilizingLoad, IfcStructuralReaction* v11_CausedBy, IfcProjectedOrTrueLengthEnum::IfcProjectedOrTrueLengthEnum v12_ProjectedOrTrue);
-    typedef IfcStructuralLinearAction* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcStructuralLinearAction > > list;
-    typedef IfcTemplatedEntityList< IfcStructuralLinearAction >::it it;
+    IfcStructuralLinearAction (IfcAbstractEntity* e);
+    IfcStructuralLinearAction (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcStructuralLoad* v8_AppliedLoad, IfcGlobalOrLocalEnum::IfcGlobalOrLocalEnum v9_GlobalOrLocal, bool v10_DestabilizingLoad, IfcStructuralReaction* v11_CausedBy, IfcProjectedOrTrueLengthEnum::IfcProjectedOrTrueLengthEnum v12_ProjectedOrTrue);
+    typedef IfcTemplatedEntityList< IfcStructuralLinearAction > list;
 };
 
 class IfcStructuralLinearActionVarying : public IfcStructuralLinearAction {
 public:
-    IfcShapeAspect* VaryingAppliedLoadLocation();
+    IfcShapeAspect* VaryingAppliedLoadLocation() const;
     void setVaryingAppliedLoadLocation(IfcShapeAspect* v);
-    SHARED_PTR< IfcTemplatedEntityList< IfcStructuralLoad > > SubsequentAppliedLoads();
-    void setSubsequentAppliedLoads(SHARED_PTR< IfcTemplatedEntityList< IfcStructuralLoad > > v);
+    IfcTemplatedEntityList< IfcStructuralLoad >::ptr SubsequentAppliedLoads() const;
+    void setSubsequentAppliedLoads(IfcTemplatedEntityList< IfcStructuralLoad >::ptr v);
     virtual unsigned int getArgumentCount() const { return 14; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 12: return IfcUtil::Argument_ENTITY; case 13: return IfcUtil::Argument_ENTITY_LIST; } return IfcStructuralLinearAction::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 12: return Type::IfcShapeAspect; case 13: return Type::IfcStructuralLoad; } return IfcStructuralLinearAction::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 12: return "VaryingAppliedLoadLocation"; case 13: return "SubsequentAppliedLoads"; } return IfcStructuralLinearAction::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcStructuralLinearActionVarying (IfcAbstractEntityPtr e);
-    IfcStructuralLinearActionVarying (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcStructuralLoad* v8_AppliedLoad, IfcGlobalOrLocalEnum::IfcGlobalOrLocalEnum v9_GlobalOrLocal, bool v10_DestabilizingLoad, IfcStructuralReaction* v11_CausedBy, IfcProjectedOrTrueLengthEnum::IfcProjectedOrTrueLengthEnum v12_ProjectedOrTrue, IfcShapeAspect* v13_VaryingAppliedLoadLocation, SHARED_PTR< IfcTemplatedEntityList< IfcStructuralLoad > > v14_SubsequentAppliedLoads);
-    typedef IfcStructuralLinearActionVarying* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcStructuralLinearActionVarying > > list;
-    typedef IfcTemplatedEntityList< IfcStructuralLinearActionVarying >::it it;
+    IfcStructuralLinearActionVarying (IfcAbstractEntity* e);
+    IfcStructuralLinearActionVarying (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcStructuralLoad* v8_AppliedLoad, IfcGlobalOrLocalEnum::IfcGlobalOrLocalEnum v9_GlobalOrLocal, bool v10_DestabilizingLoad, IfcStructuralReaction* v11_CausedBy, IfcProjectedOrTrueLengthEnum::IfcProjectedOrTrueLengthEnum v12_ProjectedOrTrue, IfcShapeAspect* v13_VaryingAppliedLoadLocation, IfcTemplatedEntityList< IfcStructuralLoad >::ptr v14_SubsequentAppliedLoads);
+    typedef IfcTemplatedEntityList< IfcStructuralLinearActionVarying > list;
 };
 /// Definition from IAI: The entity IfcStructuralLoadGroup is used to structure the
 /// physical impacts.  By using the grouping features inherited from IfcGroup, instances of
@@ -31056,38 +31701,37 @@ class IfcStructuralLinearActionVarying : public IfcStructuralLinearAction {
 class IfcStructuralLoadGroup : public IfcGroup {
 public:
     /// Selects a predefined type for the load group.  It can be differentiated between load groups, load cases, load combinations, or userdefined grouping levels.
-    IfcLoadGroupTypeEnum::IfcLoadGroupTypeEnum PredefinedType();
+    IfcLoadGroupTypeEnum::IfcLoadGroupTypeEnum PredefinedType() const;
     void setPredefinedType(IfcLoadGroupTypeEnum::IfcLoadGroupTypeEnum v);
     /// Type of actions in the group. Normally needed if 'PredefinedType' specifies a LOAD_CASE.
-    IfcActionTypeEnum::IfcActionTypeEnum ActionType();
+    IfcActionTypeEnum::IfcActionTypeEnum ActionType() const;
     void setActionType(IfcActionTypeEnum::IfcActionTypeEnum v);
     /// Source of actions in the group. Normally needed if 'PredefinedType' specifies a LOAD_CASE.
-    IfcActionSourceTypeEnum::IfcActionSourceTypeEnum ActionSource();
+    IfcActionSourceTypeEnum::IfcActionSourceTypeEnum ActionSource() const;
     void setActionSource(IfcActionSourceTypeEnum::IfcActionSourceTypeEnum v);
     /// Whether the optional attribute Coefficient is defined for this IfcStructuralLoadGroup
-    bool hasCoefficient();
+    bool hasCoefficient() const;
     /// Load factor. If omitted, a factor is not yet known or not specified. A load factor of 1.0 shall be explicitly exported as Coefficient = 1.0.
-    IfcRatioMeasure Coefficient();
-    void setCoefficient(IfcRatioMeasure v);
+    double Coefficient() const;
+    void setCoefficient(double v);
     /// Whether the optional attribute Purpose is defined for this IfcStructuralLoadGroup
-    bool hasPurpose();
+    bool hasPurpose() const;
     /// Description of the purpose of this instance. Among else, possible values of the Purpose of load combinations are 'SLS', 'ULS', 'ALS' to indicate serviceability, ultimate, or accidental limit state.
-    IfcLabel Purpose();
-    void setPurpose(IfcLabel v);
+    std::string Purpose() const;
+    void setPurpose(std::string v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 5: return IfcUtil::Argument_ENUMERATION; case 6: return IfcUtil::Argument_ENUMERATION; case 7: return IfcUtil::Argument_ENUMERATION; case 8: return IfcUtil::Argument_DOUBLE; case 9: return IfcUtil::Argument_STRING; } return IfcGroup::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 5: return Type::IfcLoadGroupTypeEnum; case 6: return Type::IfcActionTypeEnum; case 7: return Type::IfcActionSourceTypeEnum; case 8: return Type::IfcRatioMeasure; case 9: return Type::IfcLabel; } return IfcGroup::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 5: return "PredefinedType"; case 6: return "ActionType"; case 7: return "ActionSource"; case 8: return "Coefficient"; case 9: return "Purpose"; } return IfcGroup::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcStructuralResultGroup > > SourceOfResultGroup(); // INVERSE IfcStructuralResultGroup::ResultForLoadGroup
-    SHARED_PTR< IfcTemplatedEntityList< IfcStructuralAnalysisModel > > LoadGroupFor(); // INVERSE IfcStructuralAnalysisModel::LoadedBy
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcStructuralResultGroup >::ptr SourceOfResultGroup() const; // INVERSE IfcStructuralResultGroup::ResultForLoadGroup
+    IfcTemplatedEntityList< IfcStructuralAnalysisModel >::ptr LoadGroupFor() const; // INVERSE IfcStructuralAnalysisModel::LoadedBy
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcStructuralLoadGroup (IfcAbstractEntityPtr e);
-    IfcStructuralLoadGroup (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcLoadGroupTypeEnum::IfcLoadGroupTypeEnum v6_PredefinedType, IfcActionTypeEnum::IfcActionTypeEnum v7_ActionType, IfcActionSourceTypeEnum::IfcActionSourceTypeEnum v8_ActionSource, boost::optional< IfcRatioMeasure > v9_Coefficient, boost::optional< IfcLabel > v10_Purpose);
-    typedef IfcStructuralLoadGroup* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcStructuralLoadGroup > > list;
-    typedef IfcTemplatedEntityList< IfcStructuralLoadGroup >::it it;
+    IfcStructuralLoadGroup (IfcAbstractEntity* e);
+    IfcStructuralLoadGroup (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcLoadGroupTypeEnum::IfcLoadGroupTypeEnum v6_PredefinedType, IfcActionTypeEnum::IfcActionTypeEnum v7_ActionType, IfcActionSourceTypeEnum::IfcActionSourceTypeEnum v8_ActionSource, boost::optional< double > v9_Coefficient, boost::optional< std::string > v10_Purpose);
+    typedef IfcTemplatedEntityList< IfcStructuralLoadGroup > list;
 };
 /// Definition from IAI: Defines an action with constant value which is distributed over a surface.
 /// 
@@ -31098,40 +31742,38 @@ class IfcStructuralLoadGroup : public IfcGroup {
 /// NOTE  Like its supertype IfcStructuralSurfaceAction, this action type may also act on curved faces.
 class IfcStructuralPlanarAction : public IfcStructuralAction {
 public:
-    IfcProjectedOrTrueLengthEnum::IfcProjectedOrTrueLengthEnum ProjectedOrTrue();
+    IfcProjectedOrTrueLengthEnum::IfcProjectedOrTrueLengthEnum ProjectedOrTrue() const;
     void setProjectedOrTrue(IfcProjectedOrTrueLengthEnum::IfcProjectedOrTrueLengthEnum v);
     virtual unsigned int getArgumentCount() const { return 12; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 11: return IfcUtil::Argument_ENUMERATION; } return IfcStructuralAction::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 11: return Type::IfcProjectedOrTrueLengthEnum; } return IfcStructuralAction::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 11: return "ProjectedOrTrue"; } return IfcStructuralAction::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcStructuralPlanarAction (IfcAbstractEntityPtr e);
-    IfcStructuralPlanarAction (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcStructuralLoad* v8_AppliedLoad, IfcGlobalOrLocalEnum::IfcGlobalOrLocalEnum v9_GlobalOrLocal, bool v10_DestabilizingLoad, IfcStructuralReaction* v11_CausedBy, IfcProjectedOrTrueLengthEnum::IfcProjectedOrTrueLengthEnum v12_ProjectedOrTrue);
-    typedef IfcStructuralPlanarAction* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcStructuralPlanarAction > > list;
-    typedef IfcTemplatedEntityList< IfcStructuralPlanarAction >::it it;
+    IfcStructuralPlanarAction (IfcAbstractEntity* e);
+    IfcStructuralPlanarAction (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcStructuralLoad* v8_AppliedLoad, IfcGlobalOrLocalEnum::IfcGlobalOrLocalEnum v9_GlobalOrLocal, bool v10_DestabilizingLoad, IfcStructuralReaction* v11_CausedBy, IfcProjectedOrTrueLengthEnum::IfcProjectedOrTrueLengthEnum v12_ProjectedOrTrue);
+    typedef IfcTemplatedEntityList< IfcStructuralPlanarAction > list;
 };
 
 class IfcStructuralPlanarActionVarying : public IfcStructuralPlanarAction {
 public:
-    IfcShapeAspect* VaryingAppliedLoadLocation();
+    IfcShapeAspect* VaryingAppliedLoadLocation() const;
     void setVaryingAppliedLoadLocation(IfcShapeAspect* v);
-    SHARED_PTR< IfcTemplatedEntityList< IfcStructuralLoad > > SubsequentAppliedLoads();
-    void setSubsequentAppliedLoads(SHARED_PTR< IfcTemplatedEntityList< IfcStructuralLoad > > v);
+    IfcTemplatedEntityList< IfcStructuralLoad >::ptr SubsequentAppliedLoads() const;
+    void setSubsequentAppliedLoads(IfcTemplatedEntityList< IfcStructuralLoad >::ptr v);
     virtual unsigned int getArgumentCount() const { return 14; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 12: return IfcUtil::Argument_ENTITY; case 13: return IfcUtil::Argument_ENTITY_LIST; } return IfcStructuralPlanarAction::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 12: return Type::IfcShapeAspect; case 13: return Type::IfcStructuralLoad; } return IfcStructuralPlanarAction::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 12: return "VaryingAppliedLoadLocation"; case 13: return "SubsequentAppliedLoads"; } return IfcStructuralPlanarAction::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcStructuralPlanarActionVarying (IfcAbstractEntityPtr e);
-    IfcStructuralPlanarActionVarying (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcStructuralLoad* v8_AppliedLoad, IfcGlobalOrLocalEnum::IfcGlobalOrLocalEnum v9_GlobalOrLocal, bool v10_DestabilizingLoad, IfcStructuralReaction* v11_CausedBy, IfcProjectedOrTrueLengthEnum::IfcProjectedOrTrueLengthEnum v12_ProjectedOrTrue, IfcShapeAspect* v13_VaryingAppliedLoadLocation, SHARED_PTR< IfcTemplatedEntityList< IfcStructuralLoad > > v14_SubsequentAppliedLoads);
-    typedef IfcStructuralPlanarActionVarying* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcStructuralPlanarActionVarying > > list;
-    typedef IfcTemplatedEntityList< IfcStructuralPlanarActionVarying >::it it;
+    IfcStructuralPlanarActionVarying (IfcAbstractEntity* e);
+    IfcStructuralPlanarActionVarying (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcStructuralLoad* v8_AppliedLoad, IfcGlobalOrLocalEnum::IfcGlobalOrLocalEnum v9_GlobalOrLocal, bool v10_DestabilizingLoad, IfcStructuralReaction* v11_CausedBy, IfcProjectedOrTrueLengthEnum::IfcProjectedOrTrueLengthEnum v12_ProjectedOrTrue, IfcShapeAspect* v13_VaryingAppliedLoadLocation, IfcTemplatedEntityList< IfcStructuralLoad >::ptr v14_SubsequentAppliedLoads);
+    typedef IfcTemplatedEntityList< IfcStructuralPlanarActionVarying > list;
 };
 /// Definition from IAI: Defines an action which acts on a point.
 /// A point action is typically connected with a point connection.
@@ -31182,16 +31824,15 @@ class IfcStructuralPointAction : public IfcStructuralAction {
 public:
     virtual unsigned int getArgumentCount() const { return 11; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcStructuralAction::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcStructuralAction::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcStructuralAction::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcStructuralPointAction (IfcAbstractEntityPtr e);
-    IfcStructuralPointAction (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcStructuralLoad* v8_AppliedLoad, IfcGlobalOrLocalEnum::IfcGlobalOrLocalEnum v9_GlobalOrLocal, bool v10_DestabilizingLoad, IfcStructuralReaction* v11_CausedBy);
-    typedef IfcStructuralPointAction* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcStructuralPointAction > > list;
-    typedef IfcTemplatedEntityList< IfcStructuralPointAction >::it it;
+    IfcStructuralPointAction (IfcAbstractEntity* e);
+    IfcStructuralPointAction (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcStructuralLoad* v8_AppliedLoad, IfcGlobalOrLocalEnum::IfcGlobalOrLocalEnum v9_GlobalOrLocal, bool v10_DestabilizingLoad, IfcStructuralReaction* v11_CausedBy);
+    typedef IfcTemplatedEntityList< IfcStructuralPointAction > list;
 };
 /// Definition from IAI: Instances of IfcStructuralPointConnection describe structural nodes or point supports.
 /// 
@@ -31210,16 +31851,15 @@ class IfcStructuralPointConnection : public IfcStructuralConnection {
 public:
     virtual unsigned int getArgumentCount() const { return 8; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcStructuralConnection::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcStructuralConnection::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcStructuralConnection::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcStructuralPointConnection (IfcAbstractEntityPtr e);
-    IfcStructuralPointConnection (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcBoundaryCondition* v8_AppliedCondition);
-    typedef IfcStructuralPointConnection* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcStructuralPointConnection > > list;
-    typedef IfcTemplatedEntityList< IfcStructuralPointConnection >::it it;
+    IfcStructuralPointConnection (IfcAbstractEntity* e);
+    IfcStructuralPointConnection (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcBoundaryCondition* v8_AppliedCondition);
+    typedef IfcTemplatedEntityList< IfcStructuralPointConnection > list;
 };
 /// Definition from IAI: Defines a reaction which occurs at a point.
 /// A point reaction is typically connected with a point connection.
@@ -31268,16 +31908,15 @@ class IfcStructuralPointReaction : public IfcStructuralReaction {
 public:
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcStructuralReaction::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcStructuralReaction::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcStructuralReaction::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcStructuralPointReaction (IfcAbstractEntityPtr e);
-    IfcStructuralPointReaction (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcStructuralLoad* v8_AppliedLoad, IfcGlobalOrLocalEnum::IfcGlobalOrLocalEnum v9_GlobalOrLocal);
-    typedef IfcStructuralPointReaction* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcStructuralPointReaction > > list;
-    typedef IfcTemplatedEntityList< IfcStructuralPointReaction >::it it;
+    IfcStructuralPointReaction (IfcAbstractEntity* e);
+    IfcStructuralPointReaction (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcStructuralLoad* v8_AppliedLoad, IfcGlobalOrLocalEnum::IfcGlobalOrLocalEnum v9_GlobalOrLocal);
+    typedef IfcTemplatedEntityList< IfcStructuralPointReaction > list;
 };
 /// Definition from IAI: Instances of the entity IfcStructuralResultGroup are used to group results of structural analysis calculations and to capture the connection to the underlying basic load group.  The basic functionality for grouping inherited from IfcGroup is used to collect instances from IfcStructuralReaction or its respective subclasses.
 /// 
@@ -31286,29 +31925,28 @@ class IfcStructuralPointReaction : public IfcStructuralReaction {
 class IfcStructuralResultGroup : public IfcGroup {
 public:
     /// Specifies the analysis theory used to obtain the respective results.
-    IfcAnalysisTheoryTypeEnum::IfcAnalysisTheoryTypeEnum TheoryType();
+    IfcAnalysisTheoryTypeEnum::IfcAnalysisTheoryTypeEnum TheoryType() const;
     void setTheoryType(IfcAnalysisTheoryTypeEnum::IfcAnalysisTheoryTypeEnum v);
     /// Whether the optional attribute ResultForLoadGroup is defined for this IfcStructuralResultGroup
-    bool hasResultForLoadGroup();
+    bool hasResultForLoadGroup() const;
     /// Reference to an instance of IfcStructuralLoadGroup for which this instance represents the result.
-    IfcStructuralLoadGroup* ResultForLoadGroup();
+    IfcStructuralLoadGroup* ResultForLoadGroup() const;
     void setResultForLoadGroup(IfcStructuralLoadGroup* v);
     /// This value allows to easily recognize whether a linear analysis has been applied (allowing the superposition of analysis results).
-    bool IsLinear();
+    bool IsLinear() const;
     void setIsLinear(bool v);
     virtual unsigned int getArgumentCount() const { return 8; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 5: return IfcUtil::Argument_ENUMERATION; case 6: return IfcUtil::Argument_ENTITY; case 7: return IfcUtil::Argument_BOOL; } return IfcGroup::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 5: return Type::IfcAnalysisTheoryTypeEnum; case 6: return Type::IfcStructuralLoadGroup; case 7: return Type::UNDEFINED; } return IfcGroup::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 5: return "TheoryType"; case 6: return "ResultForLoadGroup"; case 7: return "IsLinear"; } return IfcGroup::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcStructuralAnalysisModel > > ResultGroupFor(); // INVERSE IfcStructuralAnalysisModel::HasResults
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcStructuralAnalysisModel >::ptr ResultGroupFor() const; // INVERSE IfcStructuralAnalysisModel::HasResults
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcStructuralResultGroup (IfcAbstractEntityPtr e);
-    IfcStructuralResultGroup (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcAnalysisTheoryTypeEnum::IfcAnalysisTheoryTypeEnum v6_TheoryType, IfcStructuralLoadGroup* v7_ResultForLoadGroup, bool v8_IsLinear);
-    typedef IfcStructuralResultGroup* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcStructuralResultGroup > > list;
-    typedef IfcTemplatedEntityList< IfcStructuralResultGroup >::it it;
+    IfcStructuralResultGroup (IfcAbstractEntity* e);
+    IfcStructuralResultGroup (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcAnalysisTheoryTypeEnum::IfcAnalysisTheoryTypeEnum v6_TheoryType, IfcStructuralLoadGroup* v7_ResultForLoadGroup, bool v8_IsLinear);
+    typedef IfcTemplatedEntityList< IfcStructuralResultGroup > list;
 };
 /// Definition from IAI: Instances of IfcStructuralSurfaceConnection describe face 'nodes', i.e. faces where two or more surface members are joined, or face supports.  Face surfaces may be planar or curved.
 /// 
@@ -31326,16 +31964,15 @@ class IfcStructuralSurfaceConnection : public IfcStructuralConnection {
 public:
     virtual unsigned int getArgumentCount() const { return 8; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcStructuralConnection::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcStructuralConnection::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcStructuralConnection::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcStructuralSurfaceConnection (IfcAbstractEntityPtr e);
-    IfcStructuralSurfaceConnection (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcBoundaryCondition* v8_AppliedCondition);
-    typedef IfcStructuralSurfaceConnection* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcStructuralSurfaceConnection > > list;
-    typedef IfcTemplatedEntityList< IfcStructuralSurfaceConnection >::it it;
+    IfcStructuralSurfaceConnection (IfcAbstractEntity* e);
+    IfcStructuralSurfaceConnection (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcBoundaryCondition* v8_AppliedCondition);
+    typedef IfcTemplatedEntityList< IfcStructuralSurfaceConnection > list;
 };
 /// IfcSubContractResource is a construction resource needed in a construction process that represents a sub-contractor.  
 /// 
@@ -31364,25 +32001,24 @@ class IfcStructuralSurfaceConnection : public IfcStructuralConnection {
 class IfcSubContractResource : public IfcConstructionResource {
 public:
     /// Whether the optional attribute SubContractor is defined for this IfcSubContractResource
-    bool hasSubContractor();
-    IfcActorSelect SubContractor();
-    void setSubContractor(IfcActorSelect v);
+    bool hasSubContractor() const;
+    IfcActorSelect* SubContractor() const;
+    void setSubContractor(IfcActorSelect* v);
     /// Whether the optional attribute JobDescription is defined for this IfcSubContractResource
-    bool hasJobDescription();
-    IfcText JobDescription();
-    void setJobDescription(IfcText v);
+    bool hasJobDescription() const;
+    std::string JobDescription() const;
+    void setJobDescription(std::string v);
     virtual unsigned int getArgumentCount() const { return 11; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENTITY; case 10: return IfcUtil::Argument_STRING; } return IfcConstructionResource::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcActorSelect; case 10: return Type::IfcText; } return IfcConstructionResource::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "SubContractor"; case 10: return "JobDescription"; } return IfcConstructionResource::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcSubContractResource (IfcAbstractEntityPtr e);
-    IfcSubContractResource (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, boost::optional< IfcIdentifier > v6_ResourceIdentifier, boost::optional< IfcLabel > v7_ResourceGroup, boost::optional< IfcResourceConsumptionEnum::IfcResourceConsumptionEnum > v8_ResourceConsumption, IfcMeasureWithUnit* v9_BaseQuantity, boost::optional< IfcActorSelect > v10_SubContractor, boost::optional< IfcText > v11_JobDescription);
-    typedef IfcSubContractResource* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcSubContractResource > > list;
-    typedef IfcTemplatedEntityList< IfcSubContractResource >::it it;
+    IfcSubContractResource (IfcAbstractEntity* e);
+    IfcSubContractResource (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, boost::optional< std::string > v6_ResourceIdentifier, boost::optional< std::string > v7_ResourceGroup, boost::optional< IfcResourceConsumptionEnum::IfcResourceConsumptionEnum > v8_ResourceConsumption, IfcMeasureWithUnit* v9_BaseQuantity, IfcActorSelect* v10_SubContractor, boost::optional< std::string > v11_JobDescription);
+    typedef IfcTemplatedEntityList< IfcSubContractResource > list;
 };
 /// The flow controller type IfcSwitchingDeviceType defines commonly shared information for occurrences of switching devices.  The set of shared information may include: 
 /// 
@@ -31427,20 +32063,19 @@ class IfcSubContractResource : public IfcConstructionResource {
 class IfcSwitchingDeviceType : public IfcFlowControllerType {
 public:
     /// Identifies the predefined types of switch from which the type required may be set.
-    IfcSwitchingDeviceTypeEnum::IfcSwitchingDeviceTypeEnum PredefinedType();
+    IfcSwitchingDeviceTypeEnum::IfcSwitchingDeviceTypeEnum PredefinedType() const;
     void setPredefinedType(IfcSwitchingDeviceTypeEnum::IfcSwitchingDeviceTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcFlowControllerType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcSwitchingDeviceTypeEnum; } return IfcFlowControllerType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcFlowControllerType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcSwitchingDeviceType (IfcAbstractEntityPtr e);
-    IfcSwitchingDeviceType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcSwitchingDeviceTypeEnum::IfcSwitchingDeviceTypeEnum v10_PredefinedType);
-    typedef IfcSwitchingDeviceType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcSwitchingDeviceType > > list;
-    typedef IfcTemplatedEntityList< IfcSwitchingDeviceType >::it it;
+    IfcSwitchingDeviceType (IfcAbstractEntity* e);
+    IfcSwitchingDeviceType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcSwitchingDeviceTypeEnum::IfcSwitchingDeviceTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcSwitchingDeviceType > list;
 };
 /// Definition from IAI: Organized combination of
 ///   related parts within an AEC product, composed for a common
@@ -31463,17 +32098,16 @@ class IfcSystem : public IfcGroup {
 public:
     virtual unsigned int getArgumentCount() const { return 5; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcGroup::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcGroup::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcGroup::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelServicesBuildings > > ServicesBuildings(); // INVERSE IfcRelServicesBuildings::RelatingSystem
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcRelServicesBuildings >::ptr ServicesBuildings() const; // INVERSE IfcRelServicesBuildings::RelatingSystem
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcSystem (IfcAbstractEntityPtr e);
-    IfcSystem (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType);
-    typedef IfcSystem* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcSystem > > list;
-    typedef IfcTemplatedEntityList< IfcSystem >::it it;
+    IfcSystem (IfcAbstractEntity* e);
+    IfcSystem (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType);
+    typedef IfcTemplatedEntityList< IfcSystem > list;
 };
 /// The flow storage device type IfcTankType defines commonly shared information for occurrences of tanks.  The set of shared information may include: 
 /// 
@@ -31510,44 +32144,42 @@ class IfcSystem : public IfcGroup {
 class IfcTankType : public IfcFlowStorageDeviceType {
 public:
     /// Defines the type of tank.
-    IfcTankTypeEnum::IfcTankTypeEnum PredefinedType();
+    IfcTankTypeEnum::IfcTankTypeEnum PredefinedType() const;
     void setPredefinedType(IfcTankTypeEnum::IfcTankTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcFlowStorageDeviceType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcTankTypeEnum; } return IfcFlowStorageDeviceType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcFlowStorageDeviceType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcTankType (IfcAbstractEntityPtr e);
-    IfcTankType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcTankTypeEnum::IfcTankTypeEnum v10_PredefinedType);
-    typedef IfcTankType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcTankType > > list;
-    typedef IfcTemplatedEntityList< IfcTankType >::it it;
+    IfcTankType (IfcAbstractEntity* e);
+    IfcTankType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcTankTypeEnum::IfcTankTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcTankType > list;
 };
 
 class IfcTimeSeriesSchedule : public IfcControl {
 public:
     /// Whether the optional attribute ApplicableDates is defined for this IfcTimeSeriesSchedule
-    bool hasApplicableDates();
-    SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > ApplicableDates();
-    void setApplicableDates(SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > v);
-    IfcTimeSeriesScheduleTypeEnum::IfcTimeSeriesScheduleTypeEnum TimeSeriesScheduleType();
+    bool hasApplicableDates() const;
+    IfcEntityList::ptr ApplicableDates() const;
+    void setApplicableDates(IfcEntityList::ptr v);
+    IfcTimeSeriesScheduleTypeEnum::IfcTimeSeriesScheduleTypeEnum TimeSeriesScheduleType() const;
     void setTimeSeriesScheduleType(IfcTimeSeriesScheduleTypeEnum::IfcTimeSeriesScheduleTypeEnum v);
-    IfcTimeSeries* TimeSeries();
+    IfcTimeSeries* TimeSeries() const;
     void setTimeSeries(IfcTimeSeries* v);
     virtual unsigned int getArgumentCount() const { return 8; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 5: return IfcUtil::Argument_ENTITY_LIST; case 6: return IfcUtil::Argument_ENUMERATION; case 7: return IfcUtil::Argument_ENTITY; } return IfcControl::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 5: return Type::IfcDateTimeSelect; case 6: return Type::IfcTimeSeriesScheduleTypeEnum; case 7: return Type::IfcTimeSeries; } return IfcControl::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 5: return "ApplicableDates"; case 6: return "TimeSeriesScheduleType"; case 7: return "TimeSeries"; } return IfcControl::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcTimeSeriesSchedule (IfcAbstractEntityPtr e);
-    IfcTimeSeriesSchedule (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, boost::optional< IfcEntities > v6_ApplicableDates, IfcTimeSeriesScheduleTypeEnum::IfcTimeSeriesScheduleTypeEnum v7_TimeSeriesScheduleType, IfcTimeSeries* v8_TimeSeries);
-    typedef IfcTimeSeriesSchedule* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcTimeSeriesSchedule > > list;
-    typedef IfcTemplatedEntityList< IfcTimeSeriesSchedule >::it it;
+    IfcTimeSeriesSchedule (IfcAbstractEntity* e);
+    IfcTimeSeriesSchedule (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, boost::optional< IfcEntityList::ptr > v6_ApplicableDates, IfcTimeSeriesScheduleTypeEnum::IfcTimeSeriesScheduleTypeEnum v7_TimeSeriesScheduleType, IfcTimeSeries* v8_TimeSeries);
+    typedef IfcTemplatedEntityList< IfcTimeSeriesSchedule > list;
 };
 /// The energy conversion device type IfcTransformerType defines commonly shared information for occurrences of transformers.  The set of shared information may include: 
 /// 
@@ -31579,20 +32211,19 @@ class IfcTimeSeriesSchedule : public IfcControl {
 class IfcTransformerType : public IfcEnergyConversionDeviceType {
 public:
     /// Identifies the predefined types of transformer from which the type required may be set.
-    IfcTransformerTypeEnum::IfcTransformerTypeEnum PredefinedType();
+    IfcTransformerTypeEnum::IfcTransformerTypeEnum PredefinedType() const;
     void setPredefinedType(IfcTransformerTypeEnum::IfcTransformerTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcEnergyConversionDeviceType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcTransformerTypeEnum; } return IfcEnergyConversionDeviceType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcEnergyConversionDeviceType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcTransformerType (IfcAbstractEntityPtr e);
-    IfcTransformerType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcTransformerTypeEnum::IfcTransformerTypeEnum v10_PredefinedType);
-    typedef IfcTransformerType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcTransformerType > > list;
-    typedef IfcTemplatedEntityList< IfcTransformerType >::it it;
+    IfcTransformerType (IfcAbstractEntity* e);
+    IfcTransformerType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcTransformerTypeEnum::IfcTransformerTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcTransformerType > list;
 };
 /// Definition from IAI: Generalization of all transport
 /// related objects that move people, animals or goods within a
@@ -31713,31 +32344,30 @@ class IfcTransformerType : public IfcEnergyConversionDeviceType {
 class IfcTransportElement : public IfcElement {
 public:
     /// Whether the optional attribute OperationType is defined for this IfcTransportElement
-    bool hasOperationType();
-    IfcTransportElementTypeEnum::IfcTransportElementTypeEnum OperationType();
+    bool hasOperationType() const;
+    IfcTransportElementTypeEnum::IfcTransportElementTypeEnum OperationType() const;
     void setOperationType(IfcTransportElementTypeEnum::IfcTransportElementTypeEnum v);
     /// Whether the optional attribute CapacityByWeight is defined for this IfcTransportElement
-    bool hasCapacityByWeight();
+    bool hasCapacityByWeight() const;
     /// Capacity of the transport element measured by weight.
-    IfcMassMeasure CapacityByWeight();
-    void setCapacityByWeight(IfcMassMeasure v);
+    double CapacityByWeight() const;
+    void setCapacityByWeight(double v);
     /// Whether the optional attribute CapacityByNumber is defined for this IfcTransportElement
-    bool hasCapacityByNumber();
+    bool hasCapacityByNumber() const;
     /// Capacity of the transportation element measured in numbers of person.
-    IfcCountMeasure CapacityByNumber();
-    void setCapacityByNumber(IfcCountMeasure v);
+    double CapacityByNumber() const;
+    void setCapacityByNumber(double v);
     virtual unsigned int getArgumentCount() const { return 11; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_ENUMERATION; case 9: return IfcUtil::Argument_DOUBLE; case 10: return IfcUtil::Argument_DOUBLE; } return IfcElement::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcTransportElementTypeEnum; case 9: return Type::IfcMassMeasure; case 10: return Type::IfcCountMeasure; } return IfcElement::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "OperationType"; case 9: return "CapacityByWeight"; case 10: return "CapacityByNumber"; } return IfcElement::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcTransportElement (IfcAbstractEntityPtr e);
-    IfcTransportElement (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcTransportElementTypeEnum::IfcTransportElementTypeEnum > v9_OperationType, boost::optional< IfcMassMeasure > v10_CapacityByWeight, boost::optional< IfcCountMeasure > v11_CapacityByNumber);
-    typedef IfcTransportElement* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcTransportElement > > list;
-    typedef IfcTemplatedEntityList< IfcTransportElement >::it it;
+    IfcTransportElement (IfcAbstractEntity* e);
+    IfcTransportElement (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcTransportElementTypeEnum::IfcTransportElementTypeEnum > v9_OperationType, boost::optional< double > v10_CapacityByWeight, boost::optional< double > v11_CapacityByNumber);
+    typedef IfcTemplatedEntityList< IfcTransportElement > list;
 };
 /// Definition from ISO/CD 10303-42:1992:
 /// A trimmed curve is a bounded curve which is created by taking a selected
@@ -31820,32 +32450,31 @@ class IfcTransportElement : public IfcElement {
 class IfcTrimmedCurve : public IfcBoundedCurve {
 public:
     /// The curve to be trimmed. For curves with multiple representations any parameter values given as Trim1 or Trim2 refer to the master representation of the BasisCurve only.
-    IfcCurve* BasisCurve();
+    IfcCurve* BasisCurve() const;
     void setBasisCurve(IfcCurve* v);
     /// The first trimming point which may be specified as a Cartesian point, as a real parameter or both.
-    SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > Trim1();
-    void setTrim1(SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > v);
+    IfcEntityList::ptr Trim1() const;
+    void setTrim1(IfcEntityList::ptr v);
     /// The second trimming point which may be specified as a Cartesian point, as a real parameter or both.
-    SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > Trim2();
-    void setTrim2(SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > v);
+    IfcEntityList::ptr Trim2() const;
+    void setTrim2(IfcEntityList::ptr v);
     /// Flag to indicate whether the direction of the trimmed curve agrees with or is opposed to the direction of the basis curve.
-    bool SenseAgreement();
+    bool SenseAgreement() const;
     void setSenseAgreement(bool v);
     /// Where both parameter and point are present at either end of the curve this indicates the preferred form.
-    IfcTrimmingPreference::IfcTrimmingPreference MasterRepresentation();
+    IfcTrimmingPreference::IfcTrimmingPreference MasterRepresentation() const;
     void setMasterRepresentation(IfcTrimmingPreference::IfcTrimmingPreference v);
     virtual unsigned int getArgumentCount() const { return 5; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY; case 1: return IfcUtil::Argument_ENTITY_LIST; case 2: return IfcUtil::Argument_ENTITY_LIST; case 3: return IfcUtil::Argument_BOOL; case 4: return IfcUtil::Argument_ENUMERATION; } return IfcBoundedCurve::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcCurve; case 1: return Type::IfcTrimmingSelect; case 2: return Type::IfcTrimmingSelect; case 3: return Type::UNDEFINED; case 4: return Type::IfcTrimmingPreference; } return IfcBoundedCurve::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "BasisCurve"; case 1: return "Trim1"; case 2: return "Trim2"; case 3: return "SenseAgreement"; case 4: return "MasterRepresentation"; } return IfcBoundedCurve::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcTrimmedCurve (IfcAbstractEntityPtr e);
-    IfcTrimmedCurve (IfcCurve* v1_BasisCurve, IfcEntities v2_Trim1, IfcEntities v3_Trim2, bool v4_SenseAgreement, IfcTrimmingPreference::IfcTrimmingPreference v5_MasterRepresentation);
-    typedef IfcTrimmedCurve* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcTrimmedCurve > > list;
-    typedef IfcTemplatedEntityList< IfcTrimmedCurve >::it it;
+    IfcTrimmedCurve (IfcAbstractEntity* e);
+    IfcTrimmedCurve (IfcCurve* v1_BasisCurve, IfcEntityList::ptr v2_Trim1, IfcEntityList::ptr v3_Trim2, bool v4_SenseAgreement, IfcTrimmingPreference::IfcTrimmingPreference v5_MasterRepresentation);
+    typedef IfcTemplatedEntityList< IfcTrimmedCurve > list;
 };
 /// The energy conversion device type IfcTubeBundleType defines commonly shared information for occurrences of tube bundles.  The set of shared information may include: 
 /// 
@@ -31879,20 +32508,19 @@ class IfcTrimmedCurve : public IfcBoundedCurve {
 class IfcTubeBundleType : public IfcEnergyConversionDeviceType {
 public:
     /// Defines the type of tube bundle.
-    IfcTubeBundleTypeEnum::IfcTubeBundleTypeEnum PredefinedType();
+    IfcTubeBundleTypeEnum::IfcTubeBundleTypeEnum PredefinedType() const;
     void setPredefinedType(IfcTubeBundleTypeEnum::IfcTubeBundleTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcEnergyConversionDeviceType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcTubeBundleTypeEnum; } return IfcEnergyConversionDeviceType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcEnergyConversionDeviceType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcTubeBundleType (IfcAbstractEntityPtr e);
-    IfcTubeBundleType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcTubeBundleTypeEnum::IfcTubeBundleTypeEnum v10_PredefinedType);
-    typedef IfcTubeBundleType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcTubeBundleType > > list;
-    typedef IfcTemplatedEntityList< IfcTubeBundleType >::it it;
+    IfcTubeBundleType (IfcAbstractEntity* e);
+    IfcTubeBundleType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcTubeBundleTypeEnum::IfcTubeBundleTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcTubeBundleType > list;
 };
 /// The energy conversion device type IfcUnitaryEquipmentType defines commonly shared information for occurrences of unitary equipments.  The set of shared information may include: 
 /// 
@@ -31925,20 +32553,19 @@ class IfcTubeBundleType : public IfcEnergyConversionDeviceType {
 class IfcUnitaryEquipmentType : public IfcEnergyConversionDeviceType {
 public:
     /// The type of unitary equipment.
-    IfcUnitaryEquipmentTypeEnum::IfcUnitaryEquipmentTypeEnum PredefinedType();
+    IfcUnitaryEquipmentTypeEnum::IfcUnitaryEquipmentTypeEnum PredefinedType() const;
     void setPredefinedType(IfcUnitaryEquipmentTypeEnum::IfcUnitaryEquipmentTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcEnergyConversionDeviceType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcUnitaryEquipmentTypeEnum; } return IfcEnergyConversionDeviceType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcEnergyConversionDeviceType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcUnitaryEquipmentType (IfcAbstractEntityPtr e);
-    IfcUnitaryEquipmentType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcUnitaryEquipmentTypeEnum::IfcUnitaryEquipmentTypeEnum v10_PredefinedType);
-    typedef IfcUnitaryEquipmentType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcUnitaryEquipmentType > > list;
-    typedef IfcTemplatedEntityList< IfcUnitaryEquipmentType >::it it;
+    IfcUnitaryEquipmentType (IfcAbstractEntity* e);
+    IfcUnitaryEquipmentType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcUnitaryEquipmentTypeEnum::IfcUnitaryEquipmentTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcUnitaryEquipmentType > list;
 };
 /// The flow controller type IfcValveType defines commonly shared information for occurrences of valves.  The set of shared information may include: 
 /// 
@@ -31981,20 +32608,19 @@ class IfcUnitaryEquipmentType : public IfcEnergyConversionDeviceType {
 class IfcValveType : public IfcFlowControllerType {
 public:
     /// The type of valve.
-    IfcValveTypeEnum::IfcValveTypeEnum PredefinedType();
+    IfcValveTypeEnum::IfcValveTypeEnum PredefinedType() const;
     void setPredefinedType(IfcValveTypeEnum::IfcValveTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcFlowControllerType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcValveTypeEnum; } return IfcFlowControllerType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcFlowControllerType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcValveType (IfcAbstractEntityPtr e);
-    IfcValveType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcValveTypeEnum::IfcValveTypeEnum v10_PredefinedType);
-    typedef IfcValveType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcValveType > > list;
-    typedef IfcTemplatedEntityList< IfcValveType >::it it;
+    IfcValveType (IfcAbstractEntity* e);
+    IfcValveType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcValveTypeEnum::IfcValveTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcValveType > list;
 };
 /// A virtual element is a special element used to provide imaginary boundaries, such as between two adjacent, but not separated, spaces. Virtual elements are usually not displayed and does not have quantities and other measures. Therefore IfcVirtualElement does not have material information and quantities attached.
 /// 
@@ -32086,16 +32712,15 @@ class IfcVirtualElement : public IfcElement {
 public:
     virtual unsigned int getArgumentCount() const { return 8; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcElement::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcElement::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcElement::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcVirtualElement (IfcAbstractEntityPtr e);
-    IfcVirtualElement (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag);
-    typedef IfcVirtualElement* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcVirtualElement > > list;
-    typedef IfcTemplatedEntityList< IfcVirtualElement >::it it;
+    IfcVirtualElement (IfcAbstractEntity* e);
+    IfcVirtualElement (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag);
+    typedef IfcTemplatedEntityList< IfcVirtualElement > list;
 };
 /// Definition from IAI: The element type
 /// IfcWallType defines commonly shared information for
@@ -32184,20 +32809,19 @@ class IfcVirtualElement : public IfcElement {
 class IfcWallType : public IfcBuildingElementType {
 public:
     /// Identifies the predefined types of a wall element from which the type required may be set.
-    IfcWallTypeEnum::IfcWallTypeEnum PredefinedType();
+    IfcWallTypeEnum::IfcWallTypeEnum PredefinedType() const;
     void setPredefinedType(IfcWallTypeEnum::IfcWallTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcBuildingElementType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcWallTypeEnum; } return IfcBuildingElementType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcBuildingElementType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcWallType (IfcAbstractEntityPtr e);
-    IfcWallType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcWallTypeEnum::IfcWallTypeEnum v10_PredefinedType);
-    typedef IfcWallType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcWallType > > list;
-    typedef IfcTemplatedEntityList< IfcWallType >::it it;
+    IfcWallType (IfcAbstractEntity* e);
+    IfcWallType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcWallTypeEnum::IfcWallTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcWallType > list;
 };
 /// The flow terminal type IfcWasteTerminalType defines commonly shared information for occurrences of waste terminals.  The set of shared information may include: 
 /// 
@@ -32238,20 +32862,19 @@ class IfcWallType : public IfcBuildingElementType {
 class IfcWasteTerminalType : public IfcFlowTerminalType {
 public:
     /// Identifies the predefined types of waste terminal from which the type required may be set.
-    IfcWasteTerminalTypeEnum::IfcWasteTerminalTypeEnum PredefinedType();
+    IfcWasteTerminalTypeEnum::IfcWasteTerminalTypeEnum PredefinedType() const;
     void setPredefinedType(IfcWasteTerminalTypeEnum::IfcWasteTerminalTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcFlowTerminalType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcWasteTerminalTypeEnum; } return IfcFlowTerminalType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcFlowTerminalType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcWasteTerminalType (IfcAbstractEntityPtr e);
-    IfcWasteTerminalType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcWasteTerminalTypeEnum::IfcWasteTerminalTypeEnum v10_PredefinedType);
-    typedef IfcWasteTerminalType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcWasteTerminalType > > list;
-    typedef IfcTemplatedEntityList< IfcWasteTerminalType >::it it;
+    IfcWasteTerminalType (IfcAbstractEntity* e);
+    IfcWasteTerminalType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcWasteTerminalTypeEnum::IfcWasteTerminalTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcWasteTerminalType > list;
 };
 /// An IfcWorkControl is an abstract supertype which captures information that is common to both IfcWorkPlan and IfcWorkSchedule.
 /// 
@@ -32299,59 +32922,58 @@ class IfcWasteTerminalType : public IfcFlowTerminalType {
 ///   property set for work control
 class IfcWorkControl : public IfcControl {
 public:
-    IfcIdentifier Identifier();
-    void setIdentifier(IfcIdentifier v);
+    std::string Identifier() const;
+    void setIdentifier(std::string v);
     /// The date that the plan is created.
-    IfcDateTimeSelect CreationDate();
-    void setCreationDate(IfcDateTimeSelect v);
+    IfcDateTimeSelect* CreationDate() const;
+    void setCreationDate(IfcDateTimeSelect* v);
     /// Whether the optional attribute Creators is defined for this IfcWorkControl
-    bool hasCreators();
+    bool hasCreators() const;
     /// The authors of the work plan.
-    SHARED_PTR< IfcTemplatedEntityList< IfcPerson > > Creators();
-    void setCreators(SHARED_PTR< IfcTemplatedEntityList< IfcPerson > > v);
+    IfcTemplatedEntityList< IfcPerson >::ptr Creators() const;
+    void setCreators(IfcTemplatedEntityList< IfcPerson >::ptr v);
     /// Whether the optional attribute Purpose is defined for this IfcWorkControl
-    bool hasPurpose();
+    bool hasPurpose() const;
     /// A description of the purpose of the work schedule.
-    IfcLabel Purpose();
-    void setPurpose(IfcLabel v);
+    std::string Purpose() const;
+    void setPurpose(std::string v);
     /// Whether the optional attribute Duration is defined for this IfcWorkControl
-    bool hasDuration();
+    bool hasDuration() const;
     /// The total duration of the entire work schedule.
-    IfcTimeMeasure Duration();
-    void setDuration(IfcTimeMeasure v);
+    double Duration() const;
+    void setDuration(double v);
     /// Whether the optional attribute TotalFloat is defined for this IfcWorkControl
-    bool hasTotalFloat();
+    bool hasTotalFloat() const;
     /// The total time float of the entire work schedule.
-    IfcTimeMeasure TotalFloat();
-    void setTotalFloat(IfcTimeMeasure v);
+    double TotalFloat() const;
+    void setTotalFloat(double v);
     /// The start time of the schedule.
-    IfcDateTimeSelect StartTime();
-    void setStartTime(IfcDateTimeSelect v);
+    IfcDateTimeSelect* StartTime() const;
+    void setStartTime(IfcDateTimeSelect* v);
     /// Whether the optional attribute FinishTime is defined for this IfcWorkControl
-    bool hasFinishTime();
+    bool hasFinishTime() const;
     /// The finish time of the schedule.
-    IfcDateTimeSelect FinishTime();
-    void setFinishTime(IfcDateTimeSelect v);
+    IfcDateTimeSelect* FinishTime() const;
+    void setFinishTime(IfcDateTimeSelect* v);
     /// Whether the optional attribute WorkControlType is defined for this IfcWorkControl
-    bool hasWorkControlType();
-    IfcWorkControlTypeEnum::IfcWorkControlTypeEnum WorkControlType();
+    bool hasWorkControlType() const;
+    IfcWorkControlTypeEnum::IfcWorkControlTypeEnum WorkControlType() const;
     void setWorkControlType(IfcWorkControlTypeEnum::IfcWorkControlTypeEnum v);
     /// Whether the optional attribute UserDefinedControlType is defined for this IfcWorkControl
-    bool hasUserDefinedControlType();
-    IfcLabel UserDefinedControlType();
-    void setUserDefinedControlType(IfcLabel v);
+    bool hasUserDefinedControlType() const;
+    std::string UserDefinedControlType() const;
+    void setUserDefinedControlType(std::string v);
     virtual unsigned int getArgumentCount() const { return 15; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 5: return IfcUtil::Argument_STRING; case 6: return IfcUtil::Argument_ENTITY; case 7: return IfcUtil::Argument_ENTITY_LIST; case 8: return IfcUtil::Argument_STRING; case 9: return IfcUtil::Argument_DOUBLE; case 10: return IfcUtil::Argument_DOUBLE; case 11: return IfcUtil::Argument_ENTITY; case 12: return IfcUtil::Argument_ENTITY; case 13: return IfcUtil::Argument_ENUMERATION; case 14: return IfcUtil::Argument_STRING; } return IfcControl::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 5: return Type::IfcIdentifier; case 6: return Type::IfcDateTimeSelect; case 7: return Type::IfcPerson; case 8: return Type::IfcLabel; case 9: return Type::IfcTimeMeasure; case 10: return Type::IfcTimeMeasure; case 11: return Type::IfcDateTimeSelect; case 12: return Type::IfcDateTimeSelect; case 13: return Type::IfcWorkControlTypeEnum; case 14: return Type::IfcLabel; } return IfcControl::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 5: return "Identifier"; case 6: return "CreationDate"; case 7: return "Creators"; case 8: return "Purpose"; case 9: return "Duration"; case 10: return "TotalFloat"; case 11: return "StartTime"; case 12: return "FinishTime"; case 13: return "WorkControlType"; case 14: return "UserDefinedControlType"; } return IfcControl::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcWorkControl (IfcAbstractEntityPtr e);
-    IfcWorkControl (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcIdentifier v6_Identifier, IfcDateTimeSelect v7_CreationDate, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPerson > > > v8_Creators, boost::optional< IfcLabel > v9_Purpose, boost::optional< IfcTimeMeasure > v10_Duration, boost::optional< IfcTimeMeasure > v11_TotalFloat, IfcDateTimeSelect v12_StartTime, boost::optional< IfcDateTimeSelect > v13_FinishTime, boost::optional< IfcWorkControlTypeEnum::IfcWorkControlTypeEnum > v14_WorkControlType, boost::optional< IfcLabel > v15_UserDefinedControlType);
-    typedef IfcWorkControl* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcWorkControl > > list;
-    typedef IfcTemplatedEntityList< IfcWorkControl >::it it;
+    IfcWorkControl (IfcAbstractEntity* e);
+    IfcWorkControl (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, std::string v6_Identifier, IfcDateTimeSelect* v7_CreationDate, boost::optional< IfcTemplatedEntityList< IfcPerson >::ptr > v8_Creators, boost::optional< std::string > v9_Purpose, boost::optional< double > v10_Duration, boost::optional< double > v11_TotalFloat, IfcDateTimeSelect* v12_StartTime, IfcDateTimeSelect* v13_FinishTime, boost::optional< IfcWorkControlTypeEnum::IfcWorkControlTypeEnum > v14_WorkControlType, boost::optional< std::string > v15_UserDefinedControlType);
+    typedef IfcTemplatedEntityList< IfcWorkControl > list;
 };
 /// An IfcWorkPlan represents work plans in a construction or a facilities management project.
 /// 
@@ -32382,16 +33004,15 @@ class IfcWorkPlan : public IfcWorkControl {
 public:
     virtual unsigned int getArgumentCount() const { return 15; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcWorkControl::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcWorkControl::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcWorkControl::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcWorkPlan (IfcAbstractEntityPtr e);
-    IfcWorkPlan (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcIdentifier v6_Identifier, IfcDateTimeSelect v7_CreationDate, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPerson > > > v8_Creators, boost::optional< IfcLabel > v9_Purpose, boost::optional< IfcTimeMeasure > v10_Duration, boost::optional< IfcTimeMeasure > v11_TotalFloat, IfcDateTimeSelect v12_StartTime, boost::optional< IfcDateTimeSelect > v13_FinishTime, boost::optional< IfcWorkControlTypeEnum::IfcWorkControlTypeEnum > v14_WorkControlType, boost::optional< IfcLabel > v15_UserDefinedControlType);
-    typedef IfcWorkPlan* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcWorkPlan > > list;
-    typedef IfcTemplatedEntityList< IfcWorkPlan >::it it;
+    IfcWorkPlan (IfcAbstractEntity* e);
+    IfcWorkPlan (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, std::string v6_Identifier, IfcDateTimeSelect* v7_CreationDate, boost::optional< IfcTemplatedEntityList< IfcPerson >::ptr > v8_Creators, boost::optional< std::string > v9_Purpose, boost::optional< double > v10_Duration, boost::optional< double > v11_TotalFloat, IfcDateTimeSelect* v12_StartTime, IfcDateTimeSelect* v13_FinishTime, boost::optional< IfcWorkControlTypeEnum::IfcWorkControlTypeEnum > v14_WorkControlType, boost::optional< std::string > v15_UserDefinedControlType);
+    typedef IfcTemplatedEntityList< IfcWorkPlan > list;
 };
 /// An IfcWorkSchedule
 ///   represents a task schedule of a work plan, which in turn
@@ -32437,16 +33058,15 @@ class IfcWorkSchedule : public IfcWorkControl {
 public:
     virtual unsigned int getArgumentCount() const { return 15; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcWorkControl::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcWorkControl::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcWorkControl::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcWorkSchedule (IfcAbstractEntityPtr e);
-    IfcWorkSchedule (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcIdentifier v6_Identifier, IfcDateTimeSelect v7_CreationDate, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPerson > > > v8_Creators, boost::optional< IfcLabel > v9_Purpose, boost::optional< IfcTimeMeasure > v10_Duration, boost::optional< IfcTimeMeasure > v11_TotalFloat, IfcDateTimeSelect v12_StartTime, boost::optional< IfcDateTimeSelect > v13_FinishTime, boost::optional< IfcWorkControlTypeEnum::IfcWorkControlTypeEnum > v14_WorkControlType, boost::optional< IfcLabel > v15_UserDefinedControlType);
-    typedef IfcWorkSchedule* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcWorkSchedule > > list;
-    typedef IfcTemplatedEntityList< IfcWorkSchedule >::it it;
+    IfcWorkSchedule (IfcAbstractEntity* e);
+    IfcWorkSchedule (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, std::string v6_Identifier, IfcDateTimeSelect* v7_CreationDate, boost::optional< IfcTemplatedEntityList< IfcPerson >::ptr > v8_Creators, boost::optional< std::string > v9_Purpose, boost::optional< double > v10_Duration, boost::optional< double > v11_TotalFloat, IfcDateTimeSelect* v12_StartTime, IfcDateTimeSelect* v13_FinishTime, boost::optional< IfcWorkControlTypeEnum::IfcWorkControlTypeEnum > v14_WorkControlType, boost::optional< std::string > v15_UserDefinedControlType);
+    typedef IfcTemplatedEntityList< IfcWorkSchedule > list;
 };
 /// Definition from IAI: A zone isÿa group of spaces,
 /// partial spaces or other zones. Zone structures may not be
@@ -32537,32 +33157,30 @@ class IfcZone : public IfcGroup {
 public:
     virtual unsigned int getArgumentCount() const { return 5; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcGroup::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcGroup::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcGroup::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcZone (IfcAbstractEntityPtr e);
-    IfcZone (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType);
-    typedef IfcZone* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcZone > > list;
-    typedef IfcTemplatedEntityList< IfcZone >::it it;
+    IfcZone (IfcAbstractEntity* e);
+    IfcZone (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType);
+    typedef IfcTemplatedEntityList< IfcZone > list;
 };
 
 class Ifc2DCompositeCurve : public IfcCompositeCurve {
 public:
     virtual unsigned int getArgumentCount() const { return 2; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcCompositeCurve::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcCompositeCurve::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcCompositeCurve::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    Ifc2DCompositeCurve (IfcAbstractEntityPtr e);
-    Ifc2DCompositeCurve (SHARED_PTR< IfcTemplatedEntityList< IfcCompositeCurveSegment > > v1_Segments, bool v2_SelfIntersect);
-    typedef Ifc2DCompositeCurve* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< Ifc2DCompositeCurve > > list;
-    typedef IfcTemplatedEntityList< Ifc2DCompositeCurve >::it it;
+    Ifc2DCompositeCurve (IfcAbstractEntity* e);
+    Ifc2DCompositeCurve (IfcTemplatedEntityList< IfcCompositeCurveSegment >::ptr v1_Segments, bool v2_SelfIntersect);
+    typedef IfcTemplatedEntityList< Ifc2DCompositeCurve > list;
 };
 /// A request is the act or instance of asking for something, such as a request for information, bid submission, or performance of work. 
 /// 
@@ -32604,20 +33222,19 @@ class Ifc2DCompositeCurve : public IfcCompositeCurve {
 /// Approvals may be associated to indicate the status of acceptance or rejection using the IfcRelAssociatesApproval relationship where RelatingApproval refers to an IfcApproval and RelatedObjects contains the IfcActionRequest.  Approvals may be split into sub-approvals using IfcApprovalRelationship to track approval status separately for each party where RelatingApproval refers to the higher-level approval and RelatedApprovals contains one or more lower-level approvals.  The hierarchy of approvals implies sequencing such that a higher-level approval is not executed until all of its lower-level approvals have been accepted.
 class IfcActionRequest : public IfcControl {
 public:
-    IfcIdentifier RequestID();
-    void setRequestID(IfcIdentifier v);
+    std::string RequestID() const;
+    void setRequestID(std::string v);
     virtual unsigned int getArgumentCount() const { return 6; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 5: return IfcUtil::Argument_STRING; } return IfcControl::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 5: return Type::IfcIdentifier; } return IfcControl::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 5: return "RequestID"; } return IfcControl::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcActionRequest (IfcAbstractEntityPtr e);
-    IfcActionRequest (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcIdentifier v6_RequestID);
-    typedef IfcActionRequest* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcActionRequest > > list;
-    typedef IfcTemplatedEntityList< IfcActionRequest >::it it;
+    IfcActionRequest (IfcAbstractEntity* e);
+    IfcActionRequest (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, std::string v6_RequestID);
+    typedef IfcTemplatedEntityList< IfcActionRequest > list;
 };
 /// The flow controller type IfcAirTerminalBoxType defines commonly shared information for occurrences of air boxes.  The set of shared information may include: 
 /// 
@@ -32648,20 +33265,19 @@ class IfcActionRequest : public IfcControl {
 class IfcAirTerminalBoxType : public IfcFlowControllerType {
 public:
     /// The air terminal box type.
-    IfcAirTerminalBoxTypeEnum::IfcAirTerminalBoxTypeEnum PredefinedType();
+    IfcAirTerminalBoxTypeEnum::IfcAirTerminalBoxTypeEnum PredefinedType() const;
     void setPredefinedType(IfcAirTerminalBoxTypeEnum::IfcAirTerminalBoxTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcFlowControllerType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcAirTerminalBoxTypeEnum; } return IfcFlowControllerType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcFlowControllerType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcAirTerminalBoxType (IfcAbstractEntityPtr e);
-    IfcAirTerminalBoxType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcAirTerminalBoxTypeEnum::IfcAirTerminalBoxTypeEnum v10_PredefinedType);
-    typedef IfcAirTerminalBoxType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcAirTerminalBoxType > > list;
-    typedef IfcTemplatedEntityList< IfcAirTerminalBoxType >::it it;
+    IfcAirTerminalBoxType (IfcAbstractEntity* e);
+    IfcAirTerminalBoxType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcAirTerminalBoxTypeEnum::IfcAirTerminalBoxTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcAirTerminalBoxType > list;
 };
 /// The flow terminal type IfcAirTerminalType defines commonly shared information for occurrences of air terminals.  The set of shared information may include: 
 /// 
@@ -32691,20 +33307,19 @@ class IfcAirTerminalBoxType : public IfcFlowControllerType {
 /// The distribution ports relating to the IfcAirTerminalType type are defined by IfcDistributionPort and attached by the IfcRelConnectsPortToElement relationship.  Ports are reflected at occurrences of this type using the IfcRelDefinesByObject relationship.  Refer to the documentation at IfcAirTerminal for standard port definitions.
 class IfcAirTerminalType : public IfcFlowTerminalType {
 public:
-    IfcAirTerminalTypeEnum::IfcAirTerminalTypeEnum PredefinedType();
+    IfcAirTerminalTypeEnum::IfcAirTerminalTypeEnum PredefinedType() const;
     void setPredefinedType(IfcAirTerminalTypeEnum::IfcAirTerminalTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcFlowTerminalType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcAirTerminalTypeEnum; } return IfcFlowTerminalType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcFlowTerminalType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcAirTerminalType (IfcAbstractEntityPtr e);
-    IfcAirTerminalType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcAirTerminalTypeEnum::IfcAirTerminalTypeEnum v10_PredefinedType);
-    typedef IfcAirTerminalType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcAirTerminalType > > list;
-    typedef IfcTemplatedEntityList< IfcAirTerminalType >::it it;
+    IfcAirTerminalType (IfcAbstractEntity* e);
+    IfcAirTerminalType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcAirTerminalTypeEnum::IfcAirTerminalTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcAirTerminalType > list;
 };
 /// The energy conversion device type IfcAirToAirHeatRecoveryType defines commonly shared information for occurrences of air-to-air heat recovery devices.  The set of shared information may include: 
 /// 
@@ -32735,36 +33350,34 @@ class IfcAirTerminalType : public IfcFlowTerminalType {
 class IfcAirToAirHeatRecoveryType : public IfcEnergyConversionDeviceType {
 public:
     /// Defines the type of air to air heat recovery device.
-    IfcAirToAirHeatRecoveryTypeEnum::IfcAirToAirHeatRecoveryTypeEnum PredefinedType();
+    IfcAirToAirHeatRecoveryTypeEnum::IfcAirToAirHeatRecoveryTypeEnum PredefinedType() const;
     void setPredefinedType(IfcAirToAirHeatRecoveryTypeEnum::IfcAirToAirHeatRecoveryTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcEnergyConversionDeviceType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcAirToAirHeatRecoveryTypeEnum; } return IfcEnergyConversionDeviceType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcEnergyConversionDeviceType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcAirToAirHeatRecoveryType (IfcAbstractEntityPtr e);
-    IfcAirToAirHeatRecoveryType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcAirToAirHeatRecoveryTypeEnum::IfcAirToAirHeatRecoveryTypeEnum v10_PredefinedType);
-    typedef IfcAirToAirHeatRecoveryType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcAirToAirHeatRecoveryType > > list;
-    typedef IfcTemplatedEntityList< IfcAirToAirHeatRecoveryType >::it it;
+    IfcAirToAirHeatRecoveryType (IfcAbstractEntity* e);
+    IfcAirToAirHeatRecoveryType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcAirToAirHeatRecoveryTypeEnum::IfcAirToAirHeatRecoveryTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcAirToAirHeatRecoveryType > list;
 };
 
 class IfcAngularDimension : public IfcDimensionCurveDirectedCallout {
 public:
     virtual unsigned int getArgumentCount() const { return 1; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcDimensionCurveDirectedCallout::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcDimensionCurveDirectedCallout::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcDimensionCurveDirectedCallout::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcAngularDimension (IfcAbstractEntityPtr e);
-    IfcAngularDimension (IfcEntities v1_Contents);
-    typedef IfcAngularDimension* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcAngularDimension > > list;
-    typedef IfcTemplatedEntityList< IfcAngularDimension >::it it;
+    IfcAngularDimension (IfcAbstractEntity* e);
+    IfcAngularDimension (IfcEntityList::ptr v1_Contents);
+    typedef IfcTemplatedEntityList< IfcAngularDimension > list;
 };
 /// An asset is a uniquely identifiable grouping of elements acting as a single entity that has a financial value or that can be operated on as a single unit. 
 /// 
@@ -32792,48 +33405,47 @@ class IfcAngularDimension : public IfcDimensionCurveDirectedCallout {
 /// IfcElement: Physical elements that comprise the asset.
 class IfcAsset : public IfcGroup {
 public:
-    IfcIdentifier AssetID();
-    void setAssetID(IfcIdentifier v);
+    std::string AssetID() const;
+    void setAssetID(std::string v);
     /// The cost value of the asset at the time of purchase.
-    IfcCostValue* OriginalValue();
+    IfcCostValue* OriginalValue() const;
     void setOriginalValue(IfcCostValue* v);
     /// The current cost value of the asset.
-    IfcCostValue* CurrentValue();
+    IfcCostValue* CurrentValue() const;
     void setCurrentValue(IfcCostValue* v);
     /// The total cost of replacement of the asset.
-    IfcCostValue* TotalReplacementCost();
+    IfcCostValue* TotalReplacementCost() const;
     void setTotalReplacementCost(IfcCostValue* v);
     /// The name of the person or organization that 'owns' the asset.
-    IfcActorSelect Owner();
-    void setOwner(IfcActorSelect v);
+    IfcActorSelect* Owner() const;
+    void setOwner(IfcActorSelect* v);
     /// The name of the person or organization that 'uses' the asset.
-    IfcActorSelect User();
-    void setUser(IfcActorSelect v);
+    IfcActorSelect* User() const;
+    void setUser(IfcActorSelect* v);
     /// The person designated to be responsible for the asset.
     /// NOTE: In some regulations (for example, UK Health and Safety at Work Act, Electricity at Work Regulations), management of assets must have a person identified as being responsible and to whom regulatory, insurance and other organizations communicate. In places where there is not a legal requirement, the responsible person would be the asset manager but would not have a legal status.
-    IfcPerson* ResponsiblePerson();
+    IfcPerson* ResponsiblePerson() const;
     void setResponsiblePerson(IfcPerson* v);
     /// The date on which an asset was incorporated into the works, installed, constructed, erected or completed.
     /// NOTE: This is the date on which an asset is considered to start depreciating.
     /// 
     /// IFC2x4 CHANGE Type changed from IfcDateTimeSelect.
-    IfcCalendarDate* IncorporationDate();
+    IfcCalendarDate* IncorporationDate() const;
     void setIncorporationDate(IfcCalendarDate* v);
     /// The current value of an asset within the accounting rules and procedures of an organization.
-    IfcCostValue* DepreciatedValue();
+    IfcCostValue* DepreciatedValue() const;
     void setDepreciatedValue(IfcCostValue* v);
     virtual unsigned int getArgumentCount() const { return 14; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 5: return IfcUtil::Argument_STRING; case 6: return IfcUtil::Argument_ENTITY; case 7: return IfcUtil::Argument_ENTITY; case 8: return IfcUtil::Argument_ENTITY; case 9: return IfcUtil::Argument_ENTITY; case 10: return IfcUtil::Argument_ENTITY; case 11: return IfcUtil::Argument_ENTITY; case 12: return IfcUtil::Argument_ENTITY; case 13: return IfcUtil::Argument_ENTITY; } return IfcGroup::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 5: return Type::IfcIdentifier; case 6: return Type::IfcCostValue; case 7: return Type::IfcCostValue; case 8: return Type::IfcCostValue; case 9: return Type::IfcActorSelect; case 10: return Type::IfcActorSelect; case 11: return Type::IfcPerson; case 12: return Type::IfcCalendarDate; case 13: return Type::IfcCostValue; } return IfcGroup::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 5: return "AssetID"; case 6: return "OriginalValue"; case 7: return "CurrentValue"; case 8: return "TotalReplacementCost"; case 9: return "Owner"; case 10: return "User"; case 11: return "ResponsiblePerson"; case 12: return "IncorporationDate"; case 13: return "DepreciatedValue"; } return IfcGroup::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcAsset (IfcAbstractEntityPtr e);
-    IfcAsset (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcIdentifier v6_AssetID, IfcCostValue* v7_OriginalValue, IfcCostValue* v8_CurrentValue, IfcCostValue* v9_TotalReplacementCost, IfcActorSelect v10_Owner, IfcActorSelect v11_User, IfcPerson* v12_ResponsiblePerson, IfcCalendarDate* v13_IncorporationDate, IfcCostValue* v14_DepreciatedValue);
-    typedef IfcAsset* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcAsset > > list;
-    typedef IfcTemplatedEntityList< IfcAsset >::it it;
+    IfcAsset (IfcAbstractEntity* e);
+    IfcAsset (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, std::string v6_AssetID, IfcCostValue* v7_OriginalValue, IfcCostValue* v8_CurrentValue, IfcCostValue* v9_TotalReplacementCost, IfcActorSelect* v10_Owner, IfcActorSelect* v11_User, IfcPerson* v12_ResponsiblePerson, IfcCalendarDate* v13_IncorporationDate, IfcCostValue* v14_DepreciatedValue);
+    typedef IfcTemplatedEntityList< IfcAsset > list;
 };
 /// Definition from ISO/CD 10303-42:1992: A B-spline curve is a piecewise parametric polynomial or rational curve described in terms of control points and basis functions. The B-spline curve has been selected as the most stable format to represent all types of polynomial or rational parametric curves. With appropriate attribute values it is capable of representing single span or spline curves of explicit polynomial, rational, Bezier or B-spline type. 
 /// 
@@ -32887,32 +33499,31 @@ class IfcAsset : public IfcGroup {
 class IfcBSplineCurve : public IfcBoundedCurve {
 public:
     /// The algebraic degree of the basis functions.
-    int Degree();
+    int Degree() const;
     void setDegree(int v);
     /// The list of control points for the curve.
-    SHARED_PTR< IfcTemplatedEntityList< IfcCartesianPoint > > ControlPointsList();
-    void setControlPointsList(SHARED_PTR< IfcTemplatedEntityList< IfcCartesianPoint > > v);
+    IfcTemplatedEntityList< IfcCartesianPoint >::ptr ControlPointsList() const;
+    void setControlPointsList(IfcTemplatedEntityList< IfcCartesianPoint >::ptr v);
     /// Used to identify particular types of curve; it is for information only.
-    IfcBSplineCurveForm::IfcBSplineCurveForm CurveForm();
+    IfcBSplineCurveForm::IfcBSplineCurveForm CurveForm() const;
     void setCurveForm(IfcBSplineCurveForm::IfcBSplineCurveForm v);
     /// Indication of whether the curve is closed; it is for information only.
-    bool ClosedCurve();
+    bool ClosedCurve() const;
     void setClosedCurve(bool v);
     /// Indication whether the curve self-intersects or not; it is for information only.
-    bool SelfIntersect();
+    bool SelfIntersect() const;
     void setSelfIntersect(bool v);
     virtual unsigned int getArgumentCount() const { return 5; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_INT; case 1: return IfcUtil::Argument_ENTITY_LIST; case 2: return IfcUtil::Argument_ENUMERATION; case 3: return IfcUtil::Argument_BOOL; case 4: return IfcUtil::Argument_BOOL; } return IfcBoundedCurve::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::UNDEFINED; case 1: return Type::IfcCartesianPoint; case 2: return Type::IfcBSplineCurveForm; case 3: return Type::UNDEFINED; case 4: return Type::UNDEFINED; } return IfcBoundedCurve::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Degree"; case 1: return "ControlPointsList"; case 2: return "CurveForm"; case 3: return "ClosedCurve"; case 4: return "SelfIntersect"; } return IfcBoundedCurve::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcBSplineCurve (IfcAbstractEntityPtr e);
-    IfcBSplineCurve (int v1_Degree, SHARED_PTR< IfcTemplatedEntityList< IfcCartesianPoint > > v2_ControlPointsList, IfcBSplineCurveForm::IfcBSplineCurveForm v3_CurveForm, bool v4_ClosedCurve, bool v5_SelfIntersect);
-    typedef IfcBSplineCurve* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcBSplineCurve > > list;
-    typedef IfcTemplatedEntityList< IfcBSplineCurve >::it it;
+    IfcBSplineCurve (IfcAbstractEntity* e);
+    IfcBSplineCurve (int v1_Degree, IfcTemplatedEntityList< IfcCartesianPoint >::ptr v2_ControlPointsList, IfcBSplineCurveForm::IfcBSplineCurveForm v3_CurveForm, bool v4_ClosedCurve, bool v5_SelfIntersect);
+    typedef IfcTemplatedEntityList< IfcBSplineCurve > list;
 };
 /// Definition from IAI: The element type
 /// IfcBeamType defines commonly shared information for
@@ -33015,36 +33626,34 @@ class IfcBSplineCurve : public IfcBoundedCurve {
 class IfcBeamType : public IfcBuildingElementType {
 public:
     /// Identifies the predefined types of a beam element from which the type required may be set.
-    IfcBeamTypeEnum::IfcBeamTypeEnum PredefinedType();
+    IfcBeamTypeEnum::IfcBeamTypeEnum PredefinedType() const;
     void setPredefinedType(IfcBeamTypeEnum::IfcBeamTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcBuildingElementType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcBeamTypeEnum; } return IfcBuildingElementType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcBuildingElementType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcBeamType (IfcAbstractEntityPtr e);
-    IfcBeamType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcBeamTypeEnum::IfcBeamTypeEnum v10_PredefinedType);
-    typedef IfcBeamType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcBeamType > > list;
-    typedef IfcTemplatedEntityList< IfcBeamType >::it it;
+    IfcBeamType (IfcAbstractEntity* e);
+    IfcBeamType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcBeamTypeEnum::IfcBeamTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcBeamType > list;
 };
 
 class IfcBezierCurve : public IfcBSplineCurve {
 public:
     virtual unsigned int getArgumentCount() const { return 5; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcBSplineCurve::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcBSplineCurve::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcBSplineCurve::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcBezierCurve (IfcAbstractEntityPtr e);
-    IfcBezierCurve (int v1_Degree, SHARED_PTR< IfcTemplatedEntityList< IfcCartesianPoint > > v2_ControlPointsList, IfcBSplineCurveForm::IfcBSplineCurveForm v3_CurveForm, bool v4_ClosedCurve, bool v5_SelfIntersect);
-    typedef IfcBezierCurve* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcBezierCurve > > list;
-    typedef IfcTemplatedEntityList< IfcBezierCurve >::it it;
+    IfcBezierCurve (IfcAbstractEntity* e);
+    IfcBezierCurve (int v1_Degree, IfcTemplatedEntityList< IfcCartesianPoint >::ptr v2_ControlPointsList, IfcBSplineCurveForm::IfcBSplineCurveForm v3_CurveForm, bool v4_ClosedCurve, bool v5_SelfIntersect);
+    typedef IfcTemplatedEntityList< IfcBezierCurve > list;
 };
 /// The energy conversion device type IfcBoilerType defines commonly shared information for occurrences of boilers.  The set of shared information may include: 
 /// 
@@ -33078,20 +33687,19 @@ class IfcBezierCurve : public IfcBSplineCurve {
 class IfcBoilerType : public IfcEnergyConversionDeviceType {
 public:
     /// Defines types of boilers.
-    IfcBoilerTypeEnum::IfcBoilerTypeEnum PredefinedType();
+    IfcBoilerTypeEnum::IfcBoilerTypeEnum PredefinedType() const;
     void setPredefinedType(IfcBoilerTypeEnum::IfcBoilerTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcEnergyConversionDeviceType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcBoilerTypeEnum; } return IfcEnergyConversionDeviceType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcEnergyConversionDeviceType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcBoilerType (IfcAbstractEntityPtr e);
-    IfcBoilerType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcBoilerTypeEnum::IfcBoilerTypeEnum v10_PredefinedType);
-    typedef IfcBoilerType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcBoilerType > > list;
-    typedef IfcTemplatedEntityList< IfcBoilerType >::it it;
+    IfcBoilerType (IfcAbstractEntity* e);
+    IfcBoilerType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcBoilerTypeEnum::IfcBoilerTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcBoilerType > list;
 };
 /// Definition from ISO 6707-1:1989: Major functional part
 /// of a building, examples are foundation, floor, roof, wall.
@@ -33460,32 +34068,30 @@ class IfcBuildingElement : public IfcElement {
 public:
     virtual unsigned int getArgumentCount() const { return 8; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcElement::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcElement::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcElement::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcBuildingElement (IfcAbstractEntityPtr e);
-    IfcBuildingElement (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag);
-    typedef IfcBuildingElement* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcBuildingElement > > list;
-    typedef IfcTemplatedEntityList< IfcBuildingElement >::it it;
+    IfcBuildingElement (IfcAbstractEntity* e);
+    IfcBuildingElement (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag);
+    typedef IfcTemplatedEntityList< IfcBuildingElement > list;
 };
 
 class IfcBuildingElementComponent : public IfcBuildingElement {
 public:
     virtual unsigned int getArgumentCount() const { return 8; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcBuildingElement::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcBuildingElement::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcBuildingElement::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcBuildingElementComponent (IfcAbstractEntityPtr e);
-    IfcBuildingElementComponent (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag);
-    typedef IfcBuildingElementComponent* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcBuildingElementComponent > > list;
-    typedef IfcTemplatedEntityList< IfcBuildingElementComponent >::it it;
+    IfcBuildingElementComponent (IfcAbstractEntity* e);
+    IfcBuildingElementComponent (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag);
+    typedef IfcTemplatedEntityList< IfcBuildingElementComponent > list;
 };
 /// Definition from IAI: Layers or major components as subordinate
 /// parts of a building element. Typical usage examples include precast concrete
@@ -33508,16 +34114,15 @@ class IfcBuildingElementPart : public IfcBuildingElementComponent {
 public:
     virtual unsigned int getArgumentCount() const { return 8; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcBuildingElementComponent::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcBuildingElementComponent::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcBuildingElementComponent::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcBuildingElementPart (IfcAbstractEntityPtr e);
-    IfcBuildingElementPart (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag);
-    typedef IfcBuildingElementPart* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcBuildingElementPart > > list;
-    typedef IfcTemplatedEntityList< IfcBuildingElementPart >::it it;
+    IfcBuildingElementPart (IfcAbstractEntity* e);
+    IfcBuildingElementPart (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag);
+    typedef IfcTemplatedEntityList< IfcBuildingElementPart > list;
 };
 /// Definition from IAI: The IfcBuildingElementProxy
 /// is a proxy definition that provides the same functionality as an
@@ -33712,21 +34317,20 @@ class IfcBuildingElementPart : public IfcBuildingElementComponent {
 class IfcBuildingElementProxy : public IfcBuildingElement {
 public:
     /// Whether the optional attribute CompositionType is defined for this IfcBuildingElementProxy
-    bool hasCompositionType();
-    IfcElementCompositionEnum::IfcElementCompositionEnum CompositionType();
+    bool hasCompositionType() const;
+    IfcElementCompositionEnum::IfcElementCompositionEnum CompositionType() const;
     void setCompositionType(IfcElementCompositionEnum::IfcElementCompositionEnum v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_ENUMERATION; } return IfcBuildingElement::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcElementCompositionEnum; } return IfcBuildingElement::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "CompositionType"; } return IfcBuildingElement::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcBuildingElementProxy (IfcAbstractEntityPtr e);
-    IfcBuildingElementProxy (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcElementCompositionEnum::IfcElementCompositionEnum > v9_CompositionType);
-    typedef IfcBuildingElementProxy* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcBuildingElementProxy > > list;
-    typedef IfcTemplatedEntityList< IfcBuildingElementProxy >::it it;
+    IfcBuildingElementProxy (IfcAbstractEntity* e);
+    IfcBuildingElementProxy (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcElementCompositionEnum::IfcElementCompositionEnum > v9_CompositionType);
+    typedef IfcTemplatedEntityList< IfcBuildingElementProxy > list;
 };
 /// Definition from IAI:
 ///   TheÿIfcBuildingElementProxyType defines a list of
@@ -33765,20 +34369,19 @@ class IfcBuildingElementProxy : public IfcBuildingElement {
 class IfcBuildingElementProxyType : public IfcBuildingElementType {
 public:
     /// Predefined types to define the particular type of an building element proxy. There may be property set definitions available for each predefined or user defined type.
-    IfcBuildingElementProxyTypeEnum::IfcBuildingElementProxyTypeEnum PredefinedType();
+    IfcBuildingElementProxyTypeEnum::IfcBuildingElementProxyTypeEnum PredefinedType() const;
     void setPredefinedType(IfcBuildingElementProxyTypeEnum::IfcBuildingElementProxyTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcBuildingElementType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcBuildingElementProxyTypeEnum; } return IfcBuildingElementType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcBuildingElementType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcBuildingElementProxyType (IfcAbstractEntityPtr e);
-    IfcBuildingElementProxyType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcBuildingElementProxyTypeEnum::IfcBuildingElementProxyTypeEnum v10_PredefinedType);
-    typedef IfcBuildingElementProxyType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcBuildingElementProxyType > > list;
-    typedef IfcTemplatedEntityList< IfcBuildingElementProxyType >::it it;
+    IfcBuildingElementProxyType (IfcAbstractEntity* e);
+    IfcBuildingElementProxyType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcBuildingElementProxyTypeEnum::IfcBuildingElementProxyTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcBuildingElementProxyType > list;
 };
 /// The flow fitting type IfcCableCarrierFittingType defines commonly shared information for occurrences of cable carrier fittings.  The set of shared information may include: 
 /// 
@@ -33809,20 +34412,19 @@ class IfcBuildingElementProxyType : public IfcBuildingElementType {
 class IfcCableCarrierFittingType : public IfcFlowFittingType {
 public:
     /// Identifies the predefined types of cable carrier fitting from which the type required may be set.
-    IfcCableCarrierFittingTypeEnum::IfcCableCarrierFittingTypeEnum PredefinedType();
+    IfcCableCarrierFittingTypeEnum::IfcCableCarrierFittingTypeEnum PredefinedType() const;
     void setPredefinedType(IfcCableCarrierFittingTypeEnum::IfcCableCarrierFittingTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcFlowFittingType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcCableCarrierFittingTypeEnum; } return IfcFlowFittingType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcFlowFittingType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcCableCarrierFittingType (IfcAbstractEntityPtr e);
-    IfcCableCarrierFittingType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcCableCarrierFittingTypeEnum::IfcCableCarrierFittingTypeEnum v10_PredefinedType);
-    typedef IfcCableCarrierFittingType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcCableCarrierFittingType > > list;
-    typedef IfcTemplatedEntityList< IfcCableCarrierFittingType >::it it;
+    IfcCableCarrierFittingType (IfcAbstractEntity* e);
+    IfcCableCarrierFittingType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcCableCarrierFittingTypeEnum::IfcCableCarrierFittingTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcCableCarrierFittingType > list;
 };
 /// The flow segment type IfcCableCarrierSegmentType defines commonly shared information for occurrences of cable carrier segments.  The set of shared information may include: 
 /// 
@@ -33859,20 +34461,19 @@ class IfcCableCarrierFittingType : public IfcFlowFittingType {
 class IfcCableCarrierSegmentType : public IfcFlowSegmentType {
 public:
     /// Identifies the predefined types of cable carrier segment from which the type required may be set.
-    IfcCableCarrierSegmentTypeEnum::IfcCableCarrierSegmentTypeEnum PredefinedType();
+    IfcCableCarrierSegmentTypeEnum::IfcCableCarrierSegmentTypeEnum PredefinedType() const;
     void setPredefinedType(IfcCableCarrierSegmentTypeEnum::IfcCableCarrierSegmentTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcFlowSegmentType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcCableCarrierSegmentTypeEnum; } return IfcFlowSegmentType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcFlowSegmentType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcCableCarrierSegmentType (IfcAbstractEntityPtr e);
-    IfcCableCarrierSegmentType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcCableCarrierSegmentTypeEnum::IfcCableCarrierSegmentTypeEnum v10_PredefinedType);
-    typedef IfcCableCarrierSegmentType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcCableCarrierSegmentType > > list;
-    typedef IfcTemplatedEntityList< IfcCableCarrierSegmentType >::it it;
+    IfcCableCarrierSegmentType (IfcAbstractEntity* e);
+    IfcCableCarrierSegmentType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcCableCarrierSegmentTypeEnum::IfcCableCarrierSegmentTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcCableCarrierSegmentType > list;
 };
 /// The flow segment type IfcCableSegmentType defines commonly shared information for occurrences of cable segments.  The set of shared information may include: 
 /// 
@@ -33918,20 +34519,19 @@ class IfcCableCarrierSegmentType : public IfcFlowSegmentType {
 class IfcCableSegmentType : public IfcFlowSegmentType {
 public:
     /// Identifies the predefined types of cable segment from which the type required may be set.
-    IfcCableSegmentTypeEnum::IfcCableSegmentTypeEnum PredefinedType();
+    IfcCableSegmentTypeEnum::IfcCableSegmentTypeEnum PredefinedType() const;
     void setPredefinedType(IfcCableSegmentTypeEnum::IfcCableSegmentTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcFlowSegmentType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcCableSegmentTypeEnum; } return IfcFlowSegmentType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcFlowSegmentType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcCableSegmentType (IfcAbstractEntityPtr e);
-    IfcCableSegmentType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcCableSegmentTypeEnum::IfcCableSegmentTypeEnum v10_PredefinedType);
-    typedef IfcCableSegmentType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcCableSegmentType > > list;
-    typedef IfcTemplatedEntityList< IfcCableSegmentType >::it it;
+    IfcCableSegmentType (IfcAbstractEntity* e);
+    IfcCableSegmentType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcCableSegmentTypeEnum::IfcCableSegmentTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcCableSegmentType > list;
 };
 /// The energy conversion device type IfcChillerType defines commonly shared information for occurrences of chillers.  The set of shared information may include: 
 /// 
@@ -33968,20 +34568,19 @@ class IfcCableSegmentType : public IfcFlowSegmentType {
 class IfcChillerType : public IfcEnergyConversionDeviceType {
 public:
     /// Defines the typical types of chillers (e.g., air-cooled, water-cooled, etc.).
-    IfcChillerTypeEnum::IfcChillerTypeEnum PredefinedType();
+    IfcChillerTypeEnum::IfcChillerTypeEnum PredefinedType() const;
     void setPredefinedType(IfcChillerTypeEnum::IfcChillerTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcEnergyConversionDeviceType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcChillerTypeEnum; } return IfcEnergyConversionDeviceType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcEnergyConversionDeviceType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcChillerType (IfcAbstractEntityPtr e);
-    IfcChillerType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcChillerTypeEnum::IfcChillerTypeEnum v10_PredefinedType);
-    typedef IfcChillerType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcChillerType > > list;
-    typedef IfcTemplatedEntityList< IfcChillerType >::it it;
+    IfcChillerType (IfcAbstractEntity* e);
+    IfcChillerType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcChillerTypeEnum::IfcChillerTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcChillerType > list;
 };
 /// Definition from ISO/CD 10303-42:1992: An IfcCircle is defined by a radius and the location and orientation of the circle. Interpretation of data should be as follows: 
 /// 
@@ -34013,20 +34612,19 @@ class IfcChillerType : public IfcEnergyConversionDeviceType {
 class IfcCircle : public IfcConic {
 public:
     /// The radius of the circle, which shall be greater than zero.
-    IfcPositiveLengthMeasure Radius();
-    void setRadius(IfcPositiveLengthMeasure v);
+    double Radius() const;
+    void setRadius(double v);
     virtual unsigned int getArgumentCount() const { return 2; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 1: return IfcUtil::Argument_DOUBLE; } return IfcConic::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 1: return Type::IfcPositiveLengthMeasure; } return IfcConic::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 1: return "Radius"; } return IfcConic::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcCircle (IfcAbstractEntityPtr e);
-    IfcCircle (IfcAxis2Placement v1_Position, IfcPositiveLengthMeasure v2_Radius);
-    typedef IfcCircle* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcCircle > > list;
-    typedef IfcTemplatedEntityList< IfcCircle >::it it;
+    IfcCircle (IfcAbstractEntity* e);
+    IfcCircle (IfcAxis2Placement* v1_Position, double v2_Radius);
+    typedef IfcTemplatedEntityList< IfcCircle > list;
 };
 /// The energy conversion device type IfcCoilType defines commonly shared information for occurrences of coils.  The set of shared information may include: 
 /// 
@@ -34058,20 +34656,19 @@ class IfcCircle : public IfcConic {
 class IfcCoilType : public IfcEnergyConversionDeviceType {
 public:
     /// Defines typical types of coils (e.g., Cooling, Heating, etc.)
-    IfcCoilTypeEnum::IfcCoilTypeEnum PredefinedType();
+    IfcCoilTypeEnum::IfcCoilTypeEnum PredefinedType() const;
     void setPredefinedType(IfcCoilTypeEnum::IfcCoilTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcEnergyConversionDeviceType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcCoilTypeEnum; } return IfcEnergyConversionDeviceType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcEnergyConversionDeviceType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcCoilType (IfcAbstractEntityPtr e);
-    IfcCoilType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcCoilTypeEnum::IfcCoilTypeEnum v10_PredefinedType);
-    typedef IfcCoilType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcCoilType > > list;
-    typedef IfcTemplatedEntityList< IfcCoilType >::it it;
+    IfcCoilType (IfcAbstractEntity* e);
+    IfcCoilType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcCoilTypeEnum::IfcCoilTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcCoilType > list;
 };
 /// Definition from ISO 6707-1:1989: Structural member of
 /// slender form, usually vertical, that transmits to its base the
@@ -34348,16 +34945,15 @@ class IfcColumn : public IfcBuildingElement {
 public:
     virtual unsigned int getArgumentCount() const { return 8; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcBuildingElement::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcBuildingElement::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcBuildingElement::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcColumn (IfcAbstractEntityPtr e);
-    IfcColumn (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag);
-    typedef IfcColumn* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcColumn > > list;
-    typedef IfcTemplatedEntityList< IfcColumn >::it it;
+    IfcColumn (IfcAbstractEntity* e);
+    IfcColumn (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag);
+    typedef IfcTemplatedEntityList< IfcColumn > list;
 };
 /// The flow moving device type IfcCompressorType defines commonly shared information for occurrences of compressors.  The set of shared information may include: 
 /// 
@@ -34389,20 +34985,19 @@ class IfcColumn : public IfcBuildingElement {
 class IfcCompressorType : public IfcFlowMovingDeviceType {
 public:
     /// Defines the type of compressor (e.g., hermetic, reciprocating, etc.).
-    IfcCompressorTypeEnum::IfcCompressorTypeEnum PredefinedType();
+    IfcCompressorTypeEnum::IfcCompressorTypeEnum PredefinedType() const;
     void setPredefinedType(IfcCompressorTypeEnum::IfcCompressorTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcFlowMovingDeviceType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcCompressorTypeEnum; } return IfcFlowMovingDeviceType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcFlowMovingDeviceType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcCompressorType (IfcAbstractEntityPtr e);
-    IfcCompressorType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcCompressorTypeEnum::IfcCompressorTypeEnum v10_PredefinedType);
-    typedef IfcCompressorType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcCompressorType > > list;
-    typedef IfcTemplatedEntityList< IfcCompressorType >::it it;
+    IfcCompressorType (IfcAbstractEntity* e);
+    IfcCompressorType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcCompressorTypeEnum::IfcCompressorTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcCompressorType > list;
 };
 /// The energy conversion device type IfcCondenserType defines commonly shared information for occurrences of condensers.  The set of shared information may include: 
 /// 
@@ -34434,56 +35029,53 @@ class IfcCompressorType : public IfcFlowMovingDeviceType {
 class IfcCondenserType : public IfcEnergyConversionDeviceType {
 public:
     /// Defines the type of condenser.
-    IfcCondenserTypeEnum::IfcCondenserTypeEnum PredefinedType();
+    IfcCondenserTypeEnum::IfcCondenserTypeEnum PredefinedType() const;
     void setPredefinedType(IfcCondenserTypeEnum::IfcCondenserTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcEnergyConversionDeviceType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcCondenserTypeEnum; } return IfcEnergyConversionDeviceType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcEnergyConversionDeviceType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcCondenserType (IfcAbstractEntityPtr e);
-    IfcCondenserType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcCondenserTypeEnum::IfcCondenserTypeEnum v10_PredefinedType);
-    typedef IfcCondenserType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcCondenserType > > list;
-    typedef IfcTemplatedEntityList< IfcCondenserType >::it it;
+    IfcCondenserType (IfcAbstractEntity* e);
+    IfcCondenserType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcCondenserTypeEnum::IfcCondenserTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcCondenserType > list;
 };
 
 class IfcCondition : public IfcGroup {
 public:
     virtual unsigned int getArgumentCount() const { return 5; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcGroup::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcGroup::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcGroup::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcCondition (IfcAbstractEntityPtr e);
-    IfcCondition (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType);
-    typedef IfcCondition* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcCondition > > list;
-    typedef IfcTemplatedEntityList< IfcCondition >::it it;
+    IfcCondition (IfcAbstractEntity* e);
+    IfcCondition (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType);
+    typedef IfcTemplatedEntityList< IfcCondition > list;
 };
 
 class IfcConditionCriterion : public IfcControl {
 public:
-    IfcConditionCriterionSelect Criterion();
-    void setCriterion(IfcConditionCriterionSelect v);
-    IfcDateTimeSelect CriterionDateTime();
-    void setCriterionDateTime(IfcDateTimeSelect v);
+    IfcConditionCriterionSelect* Criterion() const;
+    void setCriterion(IfcConditionCriterionSelect* v);
+    IfcDateTimeSelect* CriterionDateTime() const;
+    void setCriterionDateTime(IfcDateTimeSelect* v);
     virtual unsigned int getArgumentCount() const { return 7; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 5: return IfcUtil::Argument_ENTITY; case 6: return IfcUtil::Argument_ENTITY; } return IfcControl::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 5: return Type::IfcConditionCriterionSelect; case 6: return Type::IfcDateTimeSelect; } return IfcControl::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 5: return "Criterion"; case 6: return "CriterionDateTime"; } return IfcControl::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcConditionCriterion (IfcAbstractEntityPtr e);
-    IfcConditionCriterion (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcConditionCriterionSelect v6_Criterion, IfcDateTimeSelect v7_CriterionDateTime);
-    typedef IfcConditionCriterion* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcConditionCriterion > > list;
-    typedef IfcTemplatedEntityList< IfcConditionCriterion >::it it;
+    IfcConditionCriterion (IfcAbstractEntity* e);
+    IfcConditionCriterion (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcConditionCriterionSelect* v6_Criterion, IfcDateTimeSelect* v7_CriterionDateTime);
+    typedef IfcTemplatedEntityList< IfcConditionCriterion > list;
 };
 /// IfcConstructionEquipmentResource is usage of construction equipment to assist in the performance of construction. Construction Equipment resources are wholly or partially consumed or occupied in the performance of construction.
 /// 
@@ -34511,16 +35103,15 @@ class IfcConstructionEquipmentResource : public IfcConstructionResource {
 public:
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcConstructionResource::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcConstructionResource::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcConstructionResource::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcConstructionEquipmentResource (IfcAbstractEntityPtr e);
-    IfcConstructionEquipmentResource (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, boost::optional< IfcIdentifier > v6_ResourceIdentifier, boost::optional< IfcLabel > v7_ResourceGroup, boost::optional< IfcResourceConsumptionEnum::IfcResourceConsumptionEnum > v8_ResourceConsumption, IfcMeasureWithUnit* v9_BaseQuantity);
-    typedef IfcConstructionEquipmentResource* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcConstructionEquipmentResource > > list;
-    typedef IfcTemplatedEntityList< IfcConstructionEquipmentResource >::it it;
+    IfcConstructionEquipmentResource (IfcAbstractEntity* e);
+    IfcConstructionEquipmentResource (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, boost::optional< std::string > v6_ResourceIdentifier, boost::optional< std::string > v7_ResourceGroup, boost::optional< IfcResourceConsumptionEnum::IfcResourceConsumptionEnum > v8_ResourceConsumption, IfcMeasureWithUnit* v9_BaseQuantity);
+    typedef IfcTemplatedEntityList< IfcConstructionEquipmentResource > list;
 };
 /// IfcConstructionMaterialResource identifies a material resource type in a construction project. 
 /// 
@@ -34551,25 +35142,24 @@ class IfcConstructionEquipmentResource : public IfcConstructionResource {
 class IfcConstructionMaterialResource : public IfcConstructionResource {
 public:
     /// Whether the optional attribute Suppliers is defined for this IfcConstructionMaterialResource
-    bool hasSuppliers();
-    SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > Suppliers();
-    void setSuppliers(SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > v);
+    bool hasSuppliers() const;
+    IfcEntityList::ptr Suppliers() const;
+    void setSuppliers(IfcEntityList::ptr v);
     /// Whether the optional attribute UsageRatio is defined for this IfcConstructionMaterialResource
-    bool hasUsageRatio();
-    IfcRatioMeasure UsageRatio();
-    void setUsageRatio(IfcRatioMeasure v);
+    bool hasUsageRatio() const;
+    double UsageRatio() const;
+    void setUsageRatio(double v);
     virtual unsigned int getArgumentCount() const { return 11; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENTITY_LIST; case 10: return IfcUtil::Argument_DOUBLE; } return IfcConstructionResource::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcActorSelect; case 10: return Type::IfcRatioMeasure; } return IfcConstructionResource::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "Suppliers"; case 10: return "UsageRatio"; } return IfcConstructionResource::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcConstructionMaterialResource (IfcAbstractEntityPtr e);
-    IfcConstructionMaterialResource (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, boost::optional< IfcIdentifier > v6_ResourceIdentifier, boost::optional< IfcLabel > v7_ResourceGroup, boost::optional< IfcResourceConsumptionEnum::IfcResourceConsumptionEnum > v8_ResourceConsumption, IfcMeasureWithUnit* v9_BaseQuantity, boost::optional< IfcEntities > v10_Suppliers, boost::optional< IfcRatioMeasure > v11_UsageRatio);
-    typedef IfcConstructionMaterialResource* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcConstructionMaterialResource > > list;
-    typedef IfcTemplatedEntityList< IfcConstructionMaterialResource >::it it;
+    IfcConstructionMaterialResource (IfcAbstractEntity* e);
+    IfcConstructionMaterialResource (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, boost::optional< std::string > v6_ResourceIdentifier, boost::optional< std::string > v7_ResourceGroup, boost::optional< IfcResourceConsumptionEnum::IfcResourceConsumptionEnum > v8_ResourceConsumption, IfcMeasureWithUnit* v9_BaseQuantity, boost::optional< IfcEntityList::ptr > v10_Suppliers, boost::optional< double > v11_UsageRatio);
+    typedef IfcTemplatedEntityList< IfcConstructionMaterialResource > list;
 };
 /// IfcConstructionProductResource defines the role of a product that is consumed (wholly or partially), or occupied in the performance of construction. 
 /// 
@@ -34590,16 +35180,15 @@ class IfcConstructionProductResource : public IfcConstructionResource {
 public:
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcConstructionResource::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcConstructionResource::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcConstructionResource::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcConstructionProductResource (IfcAbstractEntityPtr e);
-    IfcConstructionProductResource (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, boost::optional< IfcIdentifier > v6_ResourceIdentifier, boost::optional< IfcLabel > v7_ResourceGroup, boost::optional< IfcResourceConsumptionEnum::IfcResourceConsumptionEnum > v8_ResourceConsumption, IfcMeasureWithUnit* v9_BaseQuantity);
-    typedef IfcConstructionProductResource* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcConstructionProductResource > > list;
-    typedef IfcTemplatedEntityList< IfcConstructionProductResource >::it it;
+    IfcConstructionProductResource (IfcAbstractEntity* e);
+    IfcConstructionProductResource (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, boost::optional< std::string > v6_ResourceIdentifier, boost::optional< std::string > v7_ResourceGroup, boost::optional< IfcResourceConsumptionEnum::IfcResourceConsumptionEnum > v8_ResourceConsumption, IfcMeasureWithUnit* v9_BaseQuantity);
+    typedef IfcTemplatedEntityList< IfcConstructionProductResource > list;
 };
 /// The energy conversion device type IfcCooledBeamType defines commonly shared information for occurrences of cooled beams.  The set of shared information may include: 
 /// 
@@ -34633,20 +35222,19 @@ class IfcConstructionProductResource : public IfcConstructionResource {
 class IfcCooledBeamType : public IfcEnergyConversionDeviceType {
 public:
     /// Defines the type of cooled beam.
-    IfcCooledBeamTypeEnum::IfcCooledBeamTypeEnum PredefinedType();
+    IfcCooledBeamTypeEnum::IfcCooledBeamTypeEnum PredefinedType() const;
     void setPredefinedType(IfcCooledBeamTypeEnum::IfcCooledBeamTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcEnergyConversionDeviceType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcCooledBeamTypeEnum; } return IfcEnergyConversionDeviceType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcEnergyConversionDeviceType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcCooledBeamType (IfcAbstractEntityPtr e);
-    IfcCooledBeamType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcCooledBeamTypeEnum::IfcCooledBeamTypeEnum v10_PredefinedType);
-    typedef IfcCooledBeamType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcCooledBeamType > > list;
-    typedef IfcTemplatedEntityList< IfcCooledBeamType >::it it;
+    IfcCooledBeamType (IfcAbstractEntity* e);
+    IfcCooledBeamType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcCooledBeamTypeEnum::IfcCooledBeamTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcCooledBeamType > list;
 };
 /// The energy conversion device type IfcCoolingTowerType defines commonly shared information for occurrences of cooling towers.  The set of shared information may include: 
 /// 
@@ -34684,20 +35272,19 @@ class IfcCooledBeamType : public IfcEnergyConversionDeviceType {
 class IfcCoolingTowerType : public IfcEnergyConversionDeviceType {
 public:
     /// Defines the typical types of cooling towers (e.g., OpenTower, ClosedTower, CrossFlow, etc.).
-    IfcCoolingTowerTypeEnum::IfcCoolingTowerTypeEnum PredefinedType();
+    IfcCoolingTowerTypeEnum::IfcCoolingTowerTypeEnum PredefinedType() const;
     void setPredefinedType(IfcCoolingTowerTypeEnum::IfcCoolingTowerTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcEnergyConversionDeviceType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcCoolingTowerTypeEnum; } return IfcEnergyConversionDeviceType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcEnergyConversionDeviceType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcCoolingTowerType (IfcAbstractEntityPtr e);
-    IfcCoolingTowerType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcCoolingTowerTypeEnum::IfcCoolingTowerTypeEnum v10_PredefinedType);
-    typedef IfcCoolingTowerType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcCoolingTowerType > > list;
-    typedef IfcTemplatedEntityList< IfcCoolingTowerType >::it it;
+    IfcCoolingTowerType (IfcAbstractEntity* e);
+    IfcCoolingTowerType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcCoolingTowerTypeEnum::IfcCoolingTowerTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcCoolingTowerType > list;
 };
 /// Definition from ISO 6707-1:1989: term used: Finishing -
 /// final coverings and treatments of surfaces and their
@@ -34926,24 +35513,23 @@ class IfcCoolingTowerType : public IfcEnergyConversionDeviceType {
 class IfcCovering : public IfcBuildingElement {
 public:
     /// Whether the optional attribute PredefinedType is defined for this IfcCovering
-    bool hasPredefinedType();
+    bool hasPredefinedType() const;
     /// Predefined types to define the particular type of the covering. There may be property set definitions available for each predefined type.
-    IfcCoveringTypeEnum::IfcCoveringTypeEnum PredefinedType();
+    IfcCoveringTypeEnum::IfcCoveringTypeEnum PredefinedType() const;
     void setPredefinedType(IfcCoveringTypeEnum::IfcCoveringTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_ENUMERATION; } return IfcBuildingElement::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcCoveringTypeEnum; } return IfcBuildingElement::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "PredefinedType"; } return IfcBuildingElement::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelCoversSpaces > > CoversSpaces(); // INVERSE IfcRelCoversSpaces::RelatedCoverings
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelCoversBldgElements > > Covers(); // INVERSE IfcRelCoversBldgElements::RelatedCoverings
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcRelCoversSpaces >::ptr CoversSpaces() const; // INVERSE IfcRelCoversSpaces::RelatedCoverings
+    IfcTemplatedEntityList< IfcRelCoversBldgElements >::ptr Covers() const; // INVERSE IfcRelCoversBldgElements::RelatedCoverings
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcCovering (IfcAbstractEntityPtr e);
-    IfcCovering (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcCoveringTypeEnum::IfcCoveringTypeEnum > v9_PredefinedType);
-    typedef IfcCovering* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcCovering > > list;
-    typedef IfcTemplatedEntityList< IfcCovering >::it it;
+    IfcCovering (IfcAbstractEntity* e);
+    IfcCovering (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcCoveringTypeEnum::IfcCoveringTypeEnum > v9_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcCovering > list;
 };
 /// Definition from ISO 6707-1:1989: Non load bearing wall
 /// positioned on the outside of a building and enclosing it.
@@ -35087,16 +35673,15 @@ class IfcCurtainWall : public IfcBuildingElement {
 public:
     virtual unsigned int getArgumentCount() const { return 8; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcBuildingElement::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcBuildingElement::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcBuildingElement::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcCurtainWall (IfcAbstractEntityPtr e);
-    IfcCurtainWall (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag);
-    typedef IfcCurtainWall* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcCurtainWall > > list;
-    typedef IfcTemplatedEntityList< IfcCurtainWall >::it it;
+    IfcCurtainWall (IfcAbstractEntity* e);
+    IfcCurtainWall (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag);
+    typedef IfcTemplatedEntityList< IfcCurtainWall > list;
 };
 /// The flow controller type IfcDamperType defines commonly shared information for occurrences of dampers.  The set of shared information may include: 
 /// 
@@ -35135,36 +35720,34 @@ class IfcCurtainWall : public IfcBuildingElement {
 class IfcDamperType : public IfcFlowControllerType {
 public:
     /// Type of damper.
-    IfcDamperTypeEnum::IfcDamperTypeEnum PredefinedType();
+    IfcDamperTypeEnum::IfcDamperTypeEnum PredefinedType() const;
     void setPredefinedType(IfcDamperTypeEnum::IfcDamperTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcFlowControllerType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcDamperTypeEnum; } return IfcFlowControllerType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcFlowControllerType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcDamperType (IfcAbstractEntityPtr e);
-    IfcDamperType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcDamperTypeEnum::IfcDamperTypeEnum v10_PredefinedType);
-    typedef IfcDamperType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcDamperType > > list;
-    typedef IfcTemplatedEntityList< IfcDamperType >::it it;
+    IfcDamperType (IfcAbstractEntity* e);
+    IfcDamperType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcDamperTypeEnum::IfcDamperTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcDamperType > list;
 };
 
 class IfcDiameterDimension : public IfcDimensionCurveDirectedCallout {
 public:
     virtual unsigned int getArgumentCount() const { return 1; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcDimensionCurveDirectedCallout::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcDimensionCurveDirectedCallout::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcDimensionCurveDirectedCallout::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcDiameterDimension (IfcAbstractEntityPtr e);
-    IfcDiameterDimension (IfcEntities v1_Contents);
-    typedef IfcDiameterDimension* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcDiameterDimension > > list;
-    typedef IfcTemplatedEntityList< IfcDiameterDimension >::it it;
+    IfcDiameterDimension (IfcAbstractEntity* e);
+    IfcDiameterDimension (IfcEntityList::ptr v1_Contents);
+    typedef IfcTemplatedEntityList< IfcDiameterDimension > list;
 };
 /// Definition from IAI: Representation of different kinds of
 ///   accessories included in or added to elements.  
@@ -35343,16 +35926,15 @@ class IfcDiscreteAccessory : public IfcElementComponent {
 public:
     virtual unsigned int getArgumentCount() const { return 8; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcElementComponent::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcElementComponent::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcElementComponent::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcDiscreteAccessory (IfcAbstractEntityPtr e);
-    IfcDiscreteAccessory (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag);
-    typedef IfcDiscreteAccessory* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcDiscreteAccessory > > list;
-    typedef IfcTemplatedEntityList< IfcDiscreteAccessory >::it it;
+    IfcDiscreteAccessory (IfcAbstractEntity* e);
+    IfcDiscreteAccessory (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag);
+    typedef IfcTemplatedEntityList< IfcDiscreteAccessory > list;
 };
 /// Definition from IAI: The element type
 ///   (IfcDiscreteAccessoryType) defines a list of commonly shared property
@@ -35546,16 +36128,15 @@ class IfcDiscreteAccessoryType : public IfcElementComponentType {
 public:
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcElementComponentType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcElementComponentType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcElementComponentType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcDiscreteAccessoryType (IfcAbstractEntityPtr e);
-    IfcDiscreteAccessoryType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType);
-    typedef IfcDiscreteAccessoryType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcDiscreteAccessoryType > > list;
-    typedef IfcTemplatedEntityList< IfcDiscreteAccessoryType >::it it;
+    IfcDiscreteAccessoryType (IfcAbstractEntity* e);
+    IfcDiscreteAccessoryType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType);
+    typedef IfcTemplatedEntityList< IfcDiscreteAccessoryType > list;
 };
 /// The distribution flow element type IfcDistributionChamberElementType defines commonly shared information for occurrences of distribution chamber elements.  The set of shared information may include:
 /// 
@@ -35597,20 +36178,19 @@ class IfcDiscreteAccessoryType : public IfcElementComponentType {
 class IfcDistributionChamberElementType : public IfcDistributionFlowElementType {
 public:
     /// Predefined types of distribution chambers.
-    IfcDistributionChamberElementTypeEnum::IfcDistributionChamberElementTypeEnum PredefinedType();
+    IfcDistributionChamberElementTypeEnum::IfcDistributionChamberElementTypeEnum PredefinedType() const;
     void setPredefinedType(IfcDistributionChamberElementTypeEnum::IfcDistributionChamberElementTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcDistributionFlowElementType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcDistributionChamberElementTypeEnum; } return IfcDistributionFlowElementType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcDistributionFlowElementType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcDistributionChamberElementType (IfcAbstractEntityPtr e);
-    IfcDistributionChamberElementType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcDistributionChamberElementTypeEnum::IfcDistributionChamberElementTypeEnum v10_PredefinedType);
-    typedef IfcDistributionChamberElementType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcDistributionChamberElementType > > list;
-    typedef IfcTemplatedEntityList< IfcDistributionChamberElementType >::it it;
+    IfcDistributionChamberElementType (IfcAbstractEntity* e);
+    IfcDistributionChamberElementType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcDistributionChamberElementTypeEnum::IfcDistributionChamberElementTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcDistributionChamberElementType > list;
 };
 /// The element type IfcDistributionControlElementType defines a list of commonly shared property set definitions of an element and an optional set of product representations.  It is used to define an element specification (the specific product information that is common to all occurrences of that product type). 
 /// 
@@ -35670,16 +36250,15 @@ class IfcDistributionControlElementType : public IfcDistributionElementType {
 public:
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcDistributionElementType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcDistributionElementType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcDistributionElementType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcDistributionControlElementType (IfcAbstractEntityPtr e);
-    IfcDistributionControlElementType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType);
-    typedef IfcDistributionControlElementType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcDistributionControlElementType > > list;
-    typedef IfcTemplatedEntityList< IfcDistributionControlElementType >::it it;
+    IfcDistributionControlElementType (IfcAbstractEntity* e);
+    IfcDistributionControlElementType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType);
+    typedef IfcTemplatedEntityList< IfcDistributionControlElementType > list;
 };
 /// Definition from IAI: Generalization of all elements
 /// that participate in a distribution system. Typical examples of
@@ -35847,16 +36426,15 @@ class IfcDistributionElement : public IfcElement {
 public:
     virtual unsigned int getArgumentCount() const { return 8; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcElement::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcElement::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcElement::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcDistributionElement (IfcAbstractEntityPtr e);
-    IfcDistributionElement (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag);
-    typedef IfcDistributionElement* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcDistributionElement > > list;
-    typedef IfcTemplatedEntityList< IfcDistributionElement >::it it;
+    IfcDistributionElement (IfcAbstractEntity* e);
+    IfcDistributionElement (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag);
+    typedef IfcTemplatedEntityList< IfcDistributionElement > list;
 };
 /// The distribution element IfcDistributionFlowElement defines occurrence elements of a distribution system that facilitate the distribution of energy or matter, such as air, water or power.
 /// 
@@ -35930,17 +36508,16 @@ class IfcDistributionFlowElement : public IfcDistributionElement {
 public:
     virtual unsigned int getArgumentCount() const { return 8; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcDistributionElement::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcDistributionElement::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcDistributionElement::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelFlowControlElements > > HasControlElements(); // INVERSE IfcRelFlowControlElements::RelatingFlowElement
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcRelFlowControlElements >::ptr HasControlElements() const; // INVERSE IfcRelFlowControlElements::RelatingFlowElement
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcDistributionFlowElement (IfcAbstractEntityPtr e);
-    IfcDistributionFlowElement (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag);
-    typedef IfcDistributionFlowElement* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcDistributionFlowElement > > list;
-    typedef IfcTemplatedEntityList< IfcDistributionFlowElement >::it it;
+    IfcDistributionFlowElement (IfcAbstractEntity* e);
+    IfcDistributionFlowElement (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag);
+    typedef IfcTemplatedEntityList< IfcDistributionFlowElement > list;
 };
 /// A distribution port is an inlet or outlet of a product through which a particular substance may flow.
 /// 
@@ -36027,22 +36604,21 @@ class IfcDistributionFlowElement : public IfcDistributionElement {
 class IfcDistributionPort : public IfcPort {
 public:
     /// Whether the optional attribute FlowDirection is defined for this IfcDistributionPort
-    bool hasFlowDirection();
+    bool hasFlowDirection() const;
     /// Enumeration that identifies if this port is a Sink (inlet), a Source (outlet) or both a SinkAndSource.
-    IfcFlowDirectionEnum::IfcFlowDirectionEnum FlowDirection();
+    IfcFlowDirectionEnum::IfcFlowDirectionEnum FlowDirection() const;
     void setFlowDirection(IfcFlowDirectionEnum::IfcFlowDirectionEnum v);
     virtual unsigned int getArgumentCount() const { return 8; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 7: return IfcUtil::Argument_ENUMERATION; } return IfcPort::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 7: return Type::IfcFlowDirectionEnum; } return IfcPort::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 7: return "FlowDirection"; } return IfcPort::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcDistributionPort (IfcAbstractEntityPtr e);
-    IfcDistributionPort (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcFlowDirectionEnum::IfcFlowDirectionEnum > v8_FlowDirection);
-    typedef IfcDistributionPort* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcDistributionPort > > list;
-    typedef IfcTemplatedEntityList< IfcDistributionPort >::it it;
+    IfcDistributionPort (IfcAbstractEntity* e);
+    IfcDistributionPort (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcFlowDirectionEnum::IfcFlowDirectionEnum > v8_FlowDirection);
+    typedef IfcTemplatedEntityList< IfcDistributionPort > list;
 };
 /// Definition from ISO 6707-1:1989: Construction for
 /// closing an opening, intended primarily for access with hinged,
@@ -36403,31 +36979,30 @@ class IfcDistributionPort : public IfcPort {
 class IfcDoor : public IfcBuildingElement {
 public:
     /// Whether the optional attribute OverallHeight is defined for this IfcDoor
-    bool hasOverallHeight();
+    bool hasOverallHeight() const;
     /// Overall measure of the height, it reflects the Z Dimension of a bounding box, enclosing the body of the door opening. If omitted, the OverallHeight should be taken from the geometric representation of the IfcOpening in which the door is inserted. 
     /// 
     /// NOTE  The body of the door might be taller then the door opening (e.g. in cases where the door lining includes a casing). In these cases the OverallHeight shall still be given as the door opening height, and not as the total height of the door lining.
-    IfcPositiveLengthMeasure OverallHeight();
-    void setOverallHeight(IfcPositiveLengthMeasure v);
+    double OverallHeight() const;
+    void setOverallHeight(double v);
     /// Whether the optional attribute OverallWidth is defined for this IfcDoor
-    bool hasOverallWidth();
+    bool hasOverallWidth() const;
     /// Overall measure of the width, it reflects the X Dimension of a bounding box, enclosing the body of the door opening. If omitted, the OverallWidth should be taken from the geometric representation of the IfcOpening in which the door is inserted. 
     /// 
     /// NOTE  The body of the door might be wider then the door opening (e.g. in cases where the door lining includes a casing). In these cases the OverallWidth shall still be given as the door opening width, and not as the total width of the door lining.
-    IfcPositiveLengthMeasure OverallWidth();
-    void setOverallWidth(IfcPositiveLengthMeasure v);
+    double OverallWidth() const;
+    void setOverallWidth(double v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_DOUBLE; case 9: return IfcUtil::Argument_DOUBLE; } return IfcBuildingElement::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcPositiveLengthMeasure; case 9: return Type::IfcPositiveLengthMeasure; } return IfcBuildingElement::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "OverallHeight"; case 9: return "OverallWidth"; } return IfcBuildingElement::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcDoor (IfcAbstractEntityPtr e);
-    IfcDoor (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcPositiveLengthMeasure > v9_OverallHeight, boost::optional< IfcPositiveLengthMeasure > v10_OverallWidth);
-    typedef IfcDoor* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcDoor > > list;
-    typedef IfcTemplatedEntityList< IfcDoor >::it it;
+    IfcDoor (IfcAbstractEntity* e);
+    IfcDoor (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< double > v9_OverallHeight, boost::optional< double > v10_OverallWidth);
+    typedef IfcTemplatedEntityList< IfcDoor > list;
 };
 /// The flow fitting type IfcDuctFittingType defines commonly shared information for occurrences of duct fittings.  The set of shared information may include: 
 /// 
@@ -36461,20 +37036,19 @@ class IfcDoor : public IfcBuildingElement {
 class IfcDuctFittingType : public IfcFlowFittingType {
 public:
     /// The type of duct fitting.
-    IfcDuctFittingTypeEnum::IfcDuctFittingTypeEnum PredefinedType();
+    IfcDuctFittingTypeEnum::IfcDuctFittingTypeEnum PredefinedType() const;
     void setPredefinedType(IfcDuctFittingTypeEnum::IfcDuctFittingTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcFlowFittingType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcDuctFittingTypeEnum; } return IfcFlowFittingType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcFlowFittingType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcDuctFittingType (IfcAbstractEntityPtr e);
-    IfcDuctFittingType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcDuctFittingTypeEnum::IfcDuctFittingTypeEnum v10_PredefinedType);
-    typedef IfcDuctFittingType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcDuctFittingType > > list;
-    typedef IfcTemplatedEntityList< IfcDuctFittingType >::it it;
+    IfcDuctFittingType (IfcAbstractEntity* e);
+    IfcDuctFittingType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcDuctFittingTypeEnum::IfcDuctFittingTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcDuctFittingType > list;
 };
 /// The flow segment type IfcDuctSegmentType defines commonly shared information for occurrences of duct segments.  The set of shared information may include: 
 /// 
@@ -36508,20 +37082,19 @@ class IfcDuctFittingType : public IfcFlowFittingType {
 class IfcDuctSegmentType : public IfcFlowSegmentType {
 public:
     /// The type of duct segment.
-    IfcDuctSegmentTypeEnum::IfcDuctSegmentTypeEnum PredefinedType();
+    IfcDuctSegmentTypeEnum::IfcDuctSegmentTypeEnum PredefinedType() const;
     void setPredefinedType(IfcDuctSegmentTypeEnum::IfcDuctSegmentTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcFlowSegmentType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcDuctSegmentTypeEnum; } return IfcFlowSegmentType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcFlowSegmentType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcDuctSegmentType (IfcAbstractEntityPtr e);
-    IfcDuctSegmentType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcDuctSegmentTypeEnum::IfcDuctSegmentTypeEnum v10_PredefinedType);
-    typedef IfcDuctSegmentType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcDuctSegmentType > > list;
-    typedef IfcTemplatedEntityList< IfcDuctSegmentType >::it it;
+    IfcDuctSegmentType (IfcAbstractEntity* e);
+    IfcDuctSegmentType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcDuctSegmentTypeEnum::IfcDuctSegmentTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcDuctSegmentType > list;
 };
 /// The flow treatment device type IfcDuctSilencerType defines commonly shared information for occurrences of duct silencers.  The set of shared information may include: 
 /// 
@@ -36552,40 +37125,38 @@ class IfcDuctSegmentType : public IfcFlowSegmentType {
 class IfcDuctSilencerType : public IfcFlowTreatmentDeviceType {
 public:
     /// The type of duct silencer.
-    IfcDuctSilencerTypeEnum::IfcDuctSilencerTypeEnum PredefinedType();
+    IfcDuctSilencerTypeEnum::IfcDuctSilencerTypeEnum PredefinedType() const;
     void setPredefinedType(IfcDuctSilencerTypeEnum::IfcDuctSilencerTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcFlowTreatmentDeviceType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcDuctSilencerTypeEnum; } return IfcFlowTreatmentDeviceType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcFlowTreatmentDeviceType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcDuctSilencerType (IfcAbstractEntityPtr e);
-    IfcDuctSilencerType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcDuctSilencerTypeEnum::IfcDuctSilencerTypeEnum v10_PredefinedType);
-    typedef IfcDuctSilencerType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcDuctSilencerType > > list;
-    typedef IfcTemplatedEntityList< IfcDuctSilencerType >::it it;
+    IfcDuctSilencerType (IfcAbstractEntity* e);
+    IfcDuctSilencerType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcDuctSilencerTypeEnum::IfcDuctSilencerTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcDuctSilencerType > list;
 };
 
 class IfcEdgeFeature : public IfcFeatureElementSubtraction {
 public:
     /// Whether the optional attribute FeatureLength is defined for this IfcEdgeFeature
-    bool hasFeatureLength();
-    IfcPositiveLengthMeasure FeatureLength();
-    void setFeatureLength(IfcPositiveLengthMeasure v);
+    bool hasFeatureLength() const;
+    double FeatureLength() const;
+    void setFeatureLength(double v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_DOUBLE; } return IfcFeatureElementSubtraction::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcPositiveLengthMeasure; } return IfcFeatureElementSubtraction::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "FeatureLength"; } return IfcFeatureElementSubtraction::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcEdgeFeature (IfcAbstractEntityPtr e);
-    IfcEdgeFeature (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcPositiveLengthMeasure > v9_FeatureLength);
-    typedef IfcEdgeFeature* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcEdgeFeature > > list;
-    typedef IfcTemplatedEntityList< IfcEdgeFeature >::it it;
+    IfcEdgeFeature (IfcAbstractEntity* e);
+    IfcEdgeFeature (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< double > v9_FeatureLength);
+    typedef IfcTemplatedEntityList< IfcEdgeFeature > list;
 };
 /// The flow terminal type IfcElectricApplianceType defines commonly shared information for occurrences of electric appliances.  The set of shared information may include: 
 /// 
@@ -36619,20 +37190,19 @@ class IfcEdgeFeature : public IfcFeatureElementSubtraction {
 class IfcElectricApplianceType : public IfcFlowTerminalType {
 public:
     /// Identifies the predefined types of electrical appliance from which the type required may be set.
-    IfcElectricApplianceTypeEnum::IfcElectricApplianceTypeEnum PredefinedType();
+    IfcElectricApplianceTypeEnum::IfcElectricApplianceTypeEnum PredefinedType() const;
     void setPredefinedType(IfcElectricApplianceTypeEnum::IfcElectricApplianceTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcFlowTerminalType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcElectricApplianceTypeEnum; } return IfcFlowTerminalType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcFlowTerminalType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcElectricApplianceType (IfcAbstractEntityPtr e);
-    IfcElectricApplianceType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcElectricApplianceTypeEnum::IfcElectricApplianceTypeEnum v10_PredefinedType);
-    typedef IfcElectricApplianceType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcElectricApplianceType > > list;
-    typedef IfcTemplatedEntityList< IfcElectricApplianceType >::it it;
+    IfcElectricApplianceType (IfcAbstractEntity* e);
+    IfcElectricApplianceType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcElectricApplianceTypeEnum::IfcElectricApplianceTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcElectricApplianceType > list;
 };
 /// The flow storage device type IfcElectricFlowStorageDeviceType defines commonly shared information for occurrences of electric flow storage devices.  The set of shared information may include: 
 /// 
@@ -36664,20 +37234,19 @@ class IfcElectricApplianceType : public IfcFlowTerminalType {
 class IfcElectricFlowStorageDeviceType : public IfcFlowStorageDeviceType {
 public:
     /// Identifies the predefined types of electric flow storage devices from which the type required may be set.
-    IfcElectricFlowStorageDeviceTypeEnum::IfcElectricFlowStorageDeviceTypeEnum PredefinedType();
+    IfcElectricFlowStorageDeviceTypeEnum::IfcElectricFlowStorageDeviceTypeEnum PredefinedType() const;
     void setPredefinedType(IfcElectricFlowStorageDeviceTypeEnum::IfcElectricFlowStorageDeviceTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcFlowStorageDeviceType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcElectricFlowStorageDeviceTypeEnum; } return IfcFlowStorageDeviceType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcFlowStorageDeviceType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcElectricFlowStorageDeviceType (IfcAbstractEntityPtr e);
-    IfcElectricFlowStorageDeviceType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcElectricFlowStorageDeviceTypeEnum::IfcElectricFlowStorageDeviceTypeEnum v10_PredefinedType);
-    typedef IfcElectricFlowStorageDeviceType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcElectricFlowStorageDeviceType > > list;
-    typedef IfcTemplatedEntityList< IfcElectricFlowStorageDeviceType >::it it;
+    IfcElectricFlowStorageDeviceType (IfcAbstractEntity* e);
+    IfcElectricFlowStorageDeviceType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcElectricFlowStorageDeviceTypeEnum::IfcElectricFlowStorageDeviceTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcElectricFlowStorageDeviceType > list;
 };
 /// The energy conversion device type IfcElectricGeneratorType defines commonly shared information for occurrences of electric generators.  The set of shared information may include: 
 /// 
@@ -36714,38 +37283,36 @@ class IfcElectricFlowStorageDeviceType : public IfcFlowStorageDeviceType {
 class IfcElectricGeneratorType : public IfcEnergyConversionDeviceType {
 public:
     /// Identifies the predefined types of electric generators from which the type required may be set.
-    IfcElectricGeneratorTypeEnum::IfcElectricGeneratorTypeEnum PredefinedType();
+    IfcElectricGeneratorTypeEnum::IfcElectricGeneratorTypeEnum PredefinedType() const;
     void setPredefinedType(IfcElectricGeneratorTypeEnum::IfcElectricGeneratorTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcEnergyConversionDeviceType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcElectricGeneratorTypeEnum; } return IfcEnergyConversionDeviceType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcEnergyConversionDeviceType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcElectricGeneratorType (IfcAbstractEntityPtr e);
-    IfcElectricGeneratorType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcElectricGeneratorTypeEnum::IfcElectricGeneratorTypeEnum v10_PredefinedType);
-    typedef IfcElectricGeneratorType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcElectricGeneratorType > > list;
-    typedef IfcTemplatedEntityList< IfcElectricGeneratorType >::it it;
+    IfcElectricGeneratorType (IfcAbstractEntity* e);
+    IfcElectricGeneratorType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcElectricGeneratorTypeEnum::IfcElectricGeneratorTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcElectricGeneratorType > list;
 };
 
 class IfcElectricHeaterType : public IfcFlowTerminalType {
 public:
-    IfcElectricHeaterTypeEnum::IfcElectricHeaterTypeEnum PredefinedType();
+    IfcElectricHeaterTypeEnum::IfcElectricHeaterTypeEnum PredefinedType() const;
     void setPredefinedType(IfcElectricHeaterTypeEnum::IfcElectricHeaterTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcFlowTerminalType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcElectricHeaterTypeEnum; } return IfcFlowTerminalType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcFlowTerminalType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcElectricHeaterType (IfcAbstractEntityPtr e);
-    IfcElectricHeaterType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcElectricHeaterTypeEnum::IfcElectricHeaterTypeEnum v10_PredefinedType);
-    typedef IfcElectricHeaterType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcElectricHeaterType > > list;
-    typedef IfcTemplatedEntityList< IfcElectricHeaterType >::it it;
+    IfcElectricHeaterType (IfcAbstractEntity* e);
+    IfcElectricHeaterType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcElectricHeaterTypeEnum::IfcElectricHeaterTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcElectricHeaterType > list;
 };
 /// The energy conversion device type IfcElectricMotorType defines commonly shared information for occurrences of electric motors.  The set of shared information may include: 
 /// 
@@ -36777,20 +37344,19 @@ class IfcElectricHeaterType : public IfcFlowTerminalType {
 class IfcElectricMotorType : public IfcEnergyConversionDeviceType {
 public:
     /// Identifies the predefined types of electric motor from which the type required may be set.
-    IfcElectricMotorTypeEnum::IfcElectricMotorTypeEnum PredefinedType();
+    IfcElectricMotorTypeEnum::IfcElectricMotorTypeEnum PredefinedType() const;
     void setPredefinedType(IfcElectricMotorTypeEnum::IfcElectricMotorTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcEnergyConversionDeviceType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcElectricMotorTypeEnum; } return IfcEnergyConversionDeviceType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcEnergyConversionDeviceType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcElectricMotorType (IfcAbstractEntityPtr e);
-    IfcElectricMotorType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcElectricMotorTypeEnum::IfcElectricMotorTypeEnum v10_PredefinedType);
-    typedef IfcElectricMotorType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcElectricMotorType > > list;
-    typedef IfcTemplatedEntityList< IfcElectricMotorType >::it it;
+    IfcElectricMotorType (IfcAbstractEntity* e);
+    IfcElectricMotorType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcElectricMotorTypeEnum::IfcElectricMotorTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcElectricMotorType > list;
 };
 /// The flow controller type IfcElectricTimeControlType defines commonly shared information for occurrences of electric time controls.  The set of shared information may include: 
 /// 
@@ -36822,52 +37388,49 @@ class IfcElectricMotorType : public IfcEnergyConversionDeviceType {
 class IfcElectricTimeControlType : public IfcFlowControllerType {
 public:
     /// Identifies the predefined types of electrical time control from which the type required may be set.
-    IfcElectricTimeControlTypeEnum::IfcElectricTimeControlTypeEnum PredefinedType();
+    IfcElectricTimeControlTypeEnum::IfcElectricTimeControlTypeEnum PredefinedType() const;
     void setPredefinedType(IfcElectricTimeControlTypeEnum::IfcElectricTimeControlTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcFlowControllerType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcElectricTimeControlTypeEnum; } return IfcFlowControllerType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcFlowControllerType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcElectricTimeControlType (IfcAbstractEntityPtr e);
-    IfcElectricTimeControlType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcElectricTimeControlTypeEnum::IfcElectricTimeControlTypeEnum v10_PredefinedType);
-    typedef IfcElectricTimeControlType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcElectricTimeControlType > > list;
-    typedef IfcTemplatedEntityList< IfcElectricTimeControlType >::it it;
+    IfcElectricTimeControlType (IfcAbstractEntity* e);
+    IfcElectricTimeControlType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcElectricTimeControlTypeEnum::IfcElectricTimeControlTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcElectricTimeControlType > list;
 };
 
 class IfcElectricalCircuit : public IfcSystem {
 public:
     virtual unsigned int getArgumentCount() const { return 5; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcSystem::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcSystem::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcSystem::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcElectricalCircuit (IfcAbstractEntityPtr e);
-    IfcElectricalCircuit (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType);
-    typedef IfcElectricalCircuit* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcElectricalCircuit > > list;
-    typedef IfcTemplatedEntityList< IfcElectricalCircuit >::it it;
+    IfcElectricalCircuit (IfcAbstractEntity* e);
+    IfcElectricalCircuit (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType);
+    typedef IfcTemplatedEntityList< IfcElectricalCircuit > list;
 };
 
 class IfcElectricalElement : public IfcElement {
 public:
     virtual unsigned int getArgumentCount() const { return 8; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcElement::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcElement::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcElement::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcElectricalElement (IfcAbstractEntityPtr e);
-    IfcElectricalElement (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag);
-    typedef IfcElectricalElement* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcElectricalElement > > list;
-    typedef IfcTemplatedEntityList< IfcElectricalElement >::it it;
+    IfcElectricalElement (IfcAbstractEntity* e);
+    IfcElectricalElement (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag);
+    typedef IfcTemplatedEntityList< IfcElectricalElement > list;
 };
 /// The distribution flow element IfcEnergyConversionDevice defines 
 ///   the occurrence of a device used to perform
@@ -36882,16 +37445,15 @@ class IfcEnergyConversionDevice : public IfcDistributionFlowElement {
 public:
     virtual unsigned int getArgumentCount() const { return 8; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcDistributionFlowElement::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcDistributionFlowElement::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcDistributionFlowElement::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcEnergyConversionDevice (IfcAbstractEntityPtr e);
-    IfcEnergyConversionDevice (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag);
-    typedef IfcEnergyConversionDevice* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcEnergyConversionDevice > > list;
-    typedef IfcTemplatedEntityList< IfcEnergyConversionDevice >::it it;
+    IfcEnergyConversionDevice (IfcAbstractEntity* e);
+    IfcEnergyConversionDevice (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag);
+    typedef IfcTemplatedEntityList< IfcEnergyConversionDevice > list;
 };
 /// The flow moving device type IfcFanType defines commonly shared information for occurrences of fans.  The set of shared information may include: 
 /// 
@@ -36924,20 +37486,19 @@ class IfcEnergyConversionDevice : public IfcDistributionFlowElement {
 class IfcFanType : public IfcFlowMovingDeviceType {
 public:
     /// Defines the type of fan typically used in building services.
-    IfcFanTypeEnum::IfcFanTypeEnum PredefinedType();
+    IfcFanTypeEnum::IfcFanTypeEnum PredefinedType() const;
     void setPredefinedType(IfcFanTypeEnum::IfcFanTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcFlowMovingDeviceType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcFanTypeEnum; } return IfcFlowMovingDeviceType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcFlowMovingDeviceType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcFanType (IfcAbstractEntityPtr e);
-    IfcFanType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcFanTypeEnum::IfcFanTypeEnum v10_PredefinedType);
-    typedef IfcFanType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcFanType > > list;
-    typedef IfcTemplatedEntityList< IfcFanType >::it it;
+    IfcFanType (IfcAbstractEntity* e);
+    IfcFanType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcFanTypeEnum::IfcFanTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcFanType > list;
 };
 /// The flow treatment device type IfcFilterType defines commonly shared information for occurrences of filters.  The set of shared information may include: 
 /// 
@@ -36971,20 +37532,19 @@ class IfcFanType : public IfcFlowMovingDeviceType {
 class IfcFilterType : public IfcFlowTreatmentDeviceType {
 public:
     /// The type of air filter.
-    IfcFilterTypeEnum::IfcFilterTypeEnum PredefinedType();
+    IfcFilterTypeEnum::IfcFilterTypeEnum PredefinedType() const;
     void setPredefinedType(IfcFilterTypeEnum::IfcFilterTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcFlowTreatmentDeviceType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcFilterTypeEnum; } return IfcFlowTreatmentDeviceType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcFlowTreatmentDeviceType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcFilterType (IfcAbstractEntityPtr e);
-    IfcFilterType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcFilterTypeEnum::IfcFilterTypeEnum v10_PredefinedType);
-    typedef IfcFilterType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcFilterType > > list;
-    typedef IfcTemplatedEntityList< IfcFilterType >::it it;
+    IfcFilterType (IfcAbstractEntity* e);
+    IfcFilterType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcFilterTypeEnum::IfcFilterTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcFilterType > list;
 };
 /// The flow terminal type IfcFireSuppressionTerminalType defines commonly shared information for occurrences of fire suppression terminals.  The set of shared information may include: 
 /// 
@@ -37022,20 +37582,19 @@ class IfcFilterType : public IfcFlowTreatmentDeviceType {
 class IfcFireSuppressionTerminalType : public IfcFlowTerminalType {
 public:
     /// Identifies the predefined types of fire suppression terminal from which the type required may be set.
-    IfcFireSuppressionTerminalTypeEnum::IfcFireSuppressionTerminalTypeEnum PredefinedType();
+    IfcFireSuppressionTerminalTypeEnum::IfcFireSuppressionTerminalTypeEnum PredefinedType() const;
     void setPredefinedType(IfcFireSuppressionTerminalTypeEnum::IfcFireSuppressionTerminalTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcFlowTerminalType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcFireSuppressionTerminalTypeEnum; } return IfcFlowTerminalType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcFlowTerminalType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcFireSuppressionTerminalType (IfcAbstractEntityPtr e);
-    IfcFireSuppressionTerminalType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcFireSuppressionTerminalTypeEnum::IfcFireSuppressionTerminalTypeEnum v10_PredefinedType);
-    typedef IfcFireSuppressionTerminalType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcFireSuppressionTerminalType > > list;
-    typedef IfcTemplatedEntityList< IfcFireSuppressionTerminalType >::it it;
+    IfcFireSuppressionTerminalType (IfcAbstractEntity* e);
+    IfcFireSuppressionTerminalType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcFireSuppressionTerminalTypeEnum::IfcFireSuppressionTerminalTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcFireSuppressionTerminalType > list;
 };
 /// The distribution flow element IfcFlowController defines
 ///   the occurrence of elements of a distribution system that 
@@ -37050,16 +37609,15 @@ class IfcFlowController : public IfcDistributionFlowElement {
 public:
     virtual unsigned int getArgumentCount() const { return 8; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcDistributionFlowElement::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcDistributionFlowElement::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcDistributionFlowElement::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcFlowController (IfcAbstractEntityPtr e);
-    IfcFlowController (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag);
-    typedef IfcFlowController* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcFlowController > > list;
-    typedef IfcTemplatedEntityList< IfcFlowController >::it it;
+    IfcFlowController (IfcAbstractEntity* e);
+    IfcFlowController (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag);
+    typedef IfcTemplatedEntityList< IfcFlowController > list;
 };
 /// The distribution flow element IfcFlowFitting defines the occurrence of a junction or transition in a flow distribution system, such as an elbow or tee. Its type is defined by IfcFlowFittingType or its subtypes.
 /// 
@@ -37070,16 +37628,15 @@ class IfcFlowFitting : public IfcDistributionFlowElement {
 public:
     virtual unsigned int getArgumentCount() const { return 8; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcDistributionFlowElement::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcDistributionFlowElement::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcDistributionFlowElement::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcFlowFitting (IfcAbstractEntityPtr e);
-    IfcFlowFitting (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag);
-    typedef IfcFlowFitting* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcFlowFitting > > list;
-    typedef IfcTemplatedEntityList< IfcFlowFitting >::it it;
+    IfcFlowFitting (IfcAbstractEntity* e);
+    IfcFlowFitting (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag);
+    typedef IfcTemplatedEntityList< IfcFlowFitting > list;
 };
 /// The distribution control element type IfcFlowInstrumentType defines commonly shared information for occurrences of flow instruments.  The set of shared information may include: 
 /// 
@@ -37114,20 +37671,19 @@ class IfcFlowFitting : public IfcDistributionFlowElement {
 class IfcFlowInstrumentType : public IfcDistributionControlElementType {
 public:
     /// Identifies the predefined types of flow instrument from which the type required may be set.
-    IfcFlowInstrumentTypeEnum::IfcFlowInstrumentTypeEnum PredefinedType();
+    IfcFlowInstrumentTypeEnum::IfcFlowInstrumentTypeEnum PredefinedType() const;
     void setPredefinedType(IfcFlowInstrumentTypeEnum::IfcFlowInstrumentTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcDistributionControlElementType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcFlowInstrumentTypeEnum; } return IfcDistributionControlElementType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcDistributionControlElementType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcFlowInstrumentType (IfcAbstractEntityPtr e);
-    IfcFlowInstrumentType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcFlowInstrumentTypeEnum::IfcFlowInstrumentTypeEnum v10_PredefinedType);
-    typedef IfcFlowInstrumentType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcFlowInstrumentType > > list;
-    typedef IfcTemplatedEntityList< IfcFlowInstrumentType >::it it;
+    IfcFlowInstrumentType (IfcAbstractEntity* e);
+    IfcFlowInstrumentType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcFlowInstrumentTypeEnum::IfcFlowInstrumentTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcFlowInstrumentType > list;
 };
 /// The distribution flow element IfcFlowMovingDevice defines the occurrence of an apparatus used to distribute, circulate or perform conveyance of fluids, including liquids and gases (such as a pump or fan), and typically participates in a flow distribution system. Its type is defined by IfcFlowMovingDeviceType or its subtypes.
 /// 
@@ -37138,16 +37694,15 @@ class IfcFlowMovingDevice : public IfcDistributionFlowElement {
 public:
     virtual unsigned int getArgumentCount() const { return 8; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcDistributionFlowElement::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcDistributionFlowElement::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcDistributionFlowElement::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcFlowMovingDevice (IfcAbstractEntityPtr e);
-    IfcFlowMovingDevice (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag);
-    typedef IfcFlowMovingDevice* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcFlowMovingDevice > > list;
-    typedef IfcTemplatedEntityList< IfcFlowMovingDevice >::it it;
+    IfcFlowMovingDevice (IfcAbstractEntity* e);
+    IfcFlowMovingDevice (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag);
+    typedef IfcTemplatedEntityList< IfcFlowMovingDevice > list;
 };
 /// The distribution flow element IfcFlowSegment defines the occurrence of a segment of a flow distribution system.
 /// 
@@ -37176,16 +37731,15 @@ class IfcFlowSegment : public IfcDistributionFlowElement {
 public:
     virtual unsigned int getArgumentCount() const { return 8; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcDistributionFlowElement::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcDistributionFlowElement::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcDistributionFlowElement::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcFlowSegment (IfcAbstractEntityPtr e);
-    IfcFlowSegment (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag);
-    typedef IfcFlowSegment* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcFlowSegment > > list;
-    typedef IfcTemplatedEntityList< IfcFlowSegment >::it it;
+    IfcFlowSegment (IfcAbstractEntity* e);
+    IfcFlowSegment (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag);
+    typedef IfcTemplatedEntityList< IfcFlowSegment > list;
 };
 /// The distribution flow element IfcFlowStorageDevice defines
 ///   the occurrence of a device that participates in a distribution
@@ -37201,16 +37755,15 @@ class IfcFlowStorageDevice : public IfcDistributionFlowElement {
 public:
     virtual unsigned int getArgumentCount() const { return 8; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcDistributionFlowElement::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcDistributionFlowElement::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcDistributionFlowElement::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcFlowStorageDevice (IfcAbstractEntityPtr e);
-    IfcFlowStorageDevice (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag);
-    typedef IfcFlowStorageDevice* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcFlowStorageDevice > > list;
-    typedef IfcTemplatedEntityList< IfcFlowStorageDevice >::it it;
+    IfcFlowStorageDevice (IfcAbstractEntity* e);
+    IfcFlowStorageDevice (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag);
+    typedef IfcTemplatedEntityList< IfcFlowStorageDevice > list;
 };
 /// The distribution flow element IfcFlowTerminal defines the
 ///   occurrence of a permanently attached element that acts as a terminus or 
@@ -37227,16 +37780,15 @@ class IfcFlowTerminal : public IfcDistributionFlowElement {
 public:
     virtual unsigned int getArgumentCount() const { return 8; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcDistributionFlowElement::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcDistributionFlowElement::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcDistributionFlowElement::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcFlowTerminal (IfcAbstractEntityPtr e);
-    IfcFlowTerminal (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag);
-    typedef IfcFlowTerminal* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcFlowTerminal > > list;
-    typedef IfcTemplatedEntityList< IfcFlowTerminal >::it it;
+    IfcFlowTerminal (IfcAbstractEntity* e);
+    IfcFlowTerminal (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag);
+    typedef IfcTemplatedEntityList< IfcFlowTerminal > list;
 };
 /// The distribution flow element IfcFlowTreatmentDevice defines the occurrence of a device typically used to remove unwanted matter from a fluid, either liquid or gas, and typically participates in a flow distribution system.  Its type is defined by IfcFlowTreatmentDeviceType or its subtypes.
 /// 
@@ -37247,16 +37799,15 @@ class IfcFlowTreatmentDevice : public IfcDistributionFlowElement {
 public:
     virtual unsigned int getArgumentCount() const { return 8; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcDistributionFlowElement::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcDistributionFlowElement::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcDistributionFlowElement::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcFlowTreatmentDevice (IfcAbstractEntityPtr e);
-    IfcFlowTreatmentDevice (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag);
-    typedef IfcFlowTreatmentDevice* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcFlowTreatmentDevice > > list;
-    typedef IfcTemplatedEntityList< IfcFlowTreatmentDevice >::it it;
+    IfcFlowTreatmentDevice (IfcAbstractEntity* e);
+    IfcFlowTreatmentDevice (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag);
+    typedef IfcTemplatedEntityList< IfcFlowTreatmentDevice > list;
 };
 /// A footing is a part of the foundation of a structure that spreads and transmits the load to the soil, either directly or via piles.
 /// 
@@ -37285,20 +37836,19 @@ class IfcFooting : public IfcBuildingElement {
     /// The generic type of the footing.
     /// 
     /// IFC 2x4 change:  Attribute made optional.  Type information can be provided by IfcRelDefinesByType and IfcFootingType.
-    IfcFootingTypeEnum::IfcFootingTypeEnum PredefinedType();
+    IfcFootingTypeEnum::IfcFootingTypeEnum PredefinedType() const;
     void setPredefinedType(IfcFootingTypeEnum::IfcFootingTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_ENUMERATION; } return IfcBuildingElement::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcFootingTypeEnum; } return IfcBuildingElement::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "PredefinedType"; } return IfcBuildingElement::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcFooting (IfcAbstractEntityPtr e);
-    IfcFooting (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, IfcFootingTypeEnum::IfcFootingTypeEnum v9_PredefinedType);
-    typedef IfcFooting* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcFooting > > list;
-    typedef IfcTemplatedEntityList< IfcFooting >::it it;
+    IfcFooting (IfcAbstractEntity* e);
+    IfcFooting (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, IfcFootingTypeEnum::IfcFootingTypeEnum v9_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcFooting > list;
 };
 /// An IfcMember is a
 /// structural member designed to carry loads between or beyond
@@ -37554,16 +38104,15 @@ class IfcMember : public IfcBuildingElement {
 public:
     virtual unsigned int getArgumentCount() const { return 8; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcBuildingElement::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcBuildingElement::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcBuildingElement::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcMember (IfcAbstractEntityPtr e);
-    IfcMember (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag);
-    typedef IfcMember* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcMember > > list;
-    typedef IfcTemplatedEntityList< IfcMember >::it it;
+    IfcMember (IfcAbstractEntity* e);
+    IfcMember (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag);
+    typedef IfcTemplatedEntityList< IfcMember > list;
 };
 /// A pile is a slender timber, concrete, or steel structural element, driven, jetted, or otherwise embedded on end in the ground for the purpose of supporting a load.
 /// 
@@ -37588,27 +38137,26 @@ class IfcPile : public IfcBuildingElement {
     /// The predefined generic type of the pile according to function.
     /// 
     /// IFC 2x4 change:  Attribute made optional.  Type information can be provided by IfcRelDefinesByType and IfcPileType.
-    IfcPileTypeEnum::IfcPileTypeEnum PredefinedType();
+    IfcPileTypeEnum::IfcPileTypeEnum PredefinedType() const;
     void setPredefinedType(IfcPileTypeEnum::IfcPileTypeEnum v);
     /// Whether the optional attribute ConstructionType is defined for this IfcPile
-    bool hasConstructionType();
+    bool hasConstructionType() const;
     /// General designator for how the pile is constructed.
     /// 
     /// IFC 2x4 change:  Material profile association capability by means of IfcRelAssociatesMaterial has been added.  The attribute ConstructionType should not be used whenever its information can be provided by a material profile set, either associated with the IfcPile object or, if present, with a corresponding instance of IfcPileType.
-    IfcPileConstructionEnum::IfcPileConstructionEnum ConstructionType();
+    IfcPileConstructionEnum::IfcPileConstructionEnum ConstructionType() const;
     void setConstructionType(IfcPileConstructionEnum::IfcPileConstructionEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_ENUMERATION; case 9: return IfcUtil::Argument_ENUMERATION; } return IfcBuildingElement::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcPileTypeEnum; case 9: return Type::IfcPileConstructionEnum; } return IfcBuildingElement::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "PredefinedType"; case 9: return "ConstructionType"; } return IfcBuildingElement::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcPile (IfcAbstractEntityPtr e);
-    IfcPile (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, IfcPileTypeEnum::IfcPileTypeEnum v9_PredefinedType, boost::optional< IfcPileConstructionEnum::IfcPileConstructionEnum > v10_ConstructionType);
-    typedef IfcPile* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcPile > > list;
-    typedef IfcTemplatedEntityList< IfcPile >::it it;
+    IfcPile (IfcAbstractEntity* e);
+    IfcPile (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, IfcPileTypeEnum::IfcPileTypeEnum v9_PredefinedType, boost::optional< IfcPileConstructionEnum::IfcPileConstructionEnum > v10_ConstructionType);
+    typedef IfcTemplatedEntityList< IfcPile > list;
 };
 /// Definition from IAI: An IfcPlate is a planar and
 /// often flat part with constant thickness. A plate can be a
@@ -37842,16 +38390,15 @@ class IfcPlate : public IfcBuildingElement {
 public:
     virtual unsigned int getArgumentCount() const { return 8; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcBuildingElement::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcBuildingElement::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcBuildingElement::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcPlate (IfcAbstractEntityPtr e);
-    IfcPlate (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag);
-    typedef IfcPlate* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcPlate > > list;
-    typedef IfcTemplatedEntityList< IfcPlate >::it it;
+    IfcPlate (IfcAbstractEntity* e);
+    IfcPlate (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag);
+    typedef IfcTemplatedEntityList< IfcPlate > list;
 };
 /// Definition of IAI: The railing is a frame assembly
 /// adjacent to human circulation spaces and at some space boundaries
@@ -37988,24 +38535,23 @@ class IfcPlate : public IfcBuildingElement {
 class IfcRailing : public IfcBuildingElement {
 public:
     /// Whether the optional attribute PredefinedType is defined for this IfcRailing
-    bool hasPredefinedType();
+    bool hasPredefinedType() const;
     /// Predefined generic types for a railing that are specified in an enumeration. There may be a property set given for the predefined types.
     ///   NOTE: The use of the predefined type directly at the occurrence object level of IfcRailing is only permitted, if no type object IfcRailingType is assigned.
     ///   IFC2x PLATFORM CHANGE: The attribute has been changed into an OPTIONAL attribute.
-    IfcRailingTypeEnum::IfcRailingTypeEnum PredefinedType();
+    IfcRailingTypeEnum::IfcRailingTypeEnum PredefinedType() const;
     void setPredefinedType(IfcRailingTypeEnum::IfcRailingTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_ENUMERATION; } return IfcBuildingElement::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcRailingTypeEnum; } return IfcBuildingElement::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "PredefinedType"; } return IfcBuildingElement::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRailing (IfcAbstractEntityPtr e);
-    IfcRailing (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcRailingTypeEnum::IfcRailingTypeEnum > v9_PredefinedType);
-    typedef IfcRailing* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRailing > > list;
-    typedef IfcTemplatedEntityList< IfcRailing >::it it;
+    IfcRailing (IfcAbstractEntity* e);
+    IfcRailing (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcRailingTypeEnum::IfcRailingTypeEnum > v9_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcRailing > list;
 };
 /// Definition from ISO 6707-1:1989: Inclined way or floor
 /// joining two surfaces at different levels.
@@ -38142,20 +38688,19 @@ class IfcRailing : public IfcBuildingElement {
 /// Figure 111 — Ramp placement
 class IfcRamp : public IfcBuildingElement {
 public:
-    IfcRampTypeEnum::IfcRampTypeEnum ShapeType();
+    IfcRampTypeEnum::IfcRampTypeEnum ShapeType() const;
     void setShapeType(IfcRampTypeEnum::IfcRampTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_ENUMERATION; } return IfcBuildingElement::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcRampTypeEnum; } return IfcBuildingElement::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "ShapeType"; } return IfcBuildingElement::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRamp (IfcAbstractEntityPtr e);
-    IfcRamp (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, IfcRampTypeEnum::IfcRampTypeEnum v9_ShapeType);
-    typedef IfcRamp* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRamp > > list;
-    typedef IfcTemplatedEntityList< IfcRamp >::it it;
+    IfcRamp (IfcAbstractEntity* e);
+    IfcRamp (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, IfcRampTypeEnum::IfcRampTypeEnum v9_ShapeType);
+    typedef IfcTemplatedEntityList< IfcRamp > list;
 };
 /// A ramp is an inclined slab segment, normally
 /// providing a human circulation link between two landings, floors or
@@ -38349,34 +38894,32 @@ class IfcRampFlight : public IfcBuildingElement {
 public:
     virtual unsigned int getArgumentCount() const { return 8; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcBuildingElement::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcBuildingElement::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcBuildingElement::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRampFlight (IfcAbstractEntityPtr e);
-    IfcRampFlight (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag);
-    typedef IfcRampFlight* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRampFlight > > list;
-    typedef IfcTemplatedEntityList< IfcRampFlight >::it it;
+    IfcRampFlight (IfcAbstractEntity* e);
+    IfcRampFlight (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag);
+    typedef IfcTemplatedEntityList< IfcRampFlight > list;
 };
 
 class IfcRationalBezierCurve : public IfcBezierCurve {
 public:
-    std::vector< double > /*[2:?]*/ WeightsData();
+    std::vector< double > /*[2:?]*/ WeightsData() const;
     void setWeightsData(std::vector< double > /*[2:?]*/ v);
     virtual unsigned int getArgumentCount() const { return 6; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 5: return IfcUtil::Argument_VECTOR_DOUBLE; } return IfcBezierCurve::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 5: return Type::UNDEFINED; } return IfcBezierCurve::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 5: return "WeightsData"; } return IfcBezierCurve::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRationalBezierCurve (IfcAbstractEntityPtr e);
-    IfcRationalBezierCurve (int v1_Degree, SHARED_PTR< IfcTemplatedEntityList< IfcCartesianPoint > > v2_ControlPointsList, IfcBSplineCurveForm::IfcBSplineCurveForm v3_CurveForm, bool v4_ClosedCurve, bool v5_SelfIntersect, std::vector< double > /*[2:?]*/ v6_WeightsData);
-    typedef IfcRationalBezierCurve* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRationalBezierCurve > > list;
-    typedef IfcTemplatedEntityList< IfcRationalBezierCurve >::it it;
+    IfcRationalBezierCurve (IfcAbstractEntity* e);
+    IfcRationalBezierCurve (int v1_Degree, IfcTemplatedEntityList< IfcCartesianPoint >::ptr v2_ControlPointsList, IfcBSplineCurveForm::IfcBSplineCurveForm v3_CurveForm, bool v4_ClosedCurve, bool v5_SelfIntersect, std::vector< double > /*[2:?]*/ v6_WeightsData);
+    typedef IfcTemplatedEntityList< IfcRationalBezierCurve > list;
 };
 /// Definition from IAI: Bars, wires, strands, meshes, tendons, and other components embedded in concrete in such a manner that the reinforcement and the concrete act together in resisting forces.
 /// 
@@ -38389,21 +38932,20 @@ class IfcRationalBezierCurve : public IfcBezierCurve {
 class IfcReinforcingElement : public IfcBuildingElementComponent {
 public:
     /// Whether the optional attribute SteelGrade is defined for this IfcReinforcingElement
-    bool hasSteelGrade();
-    IfcLabel SteelGrade();
-    void setSteelGrade(IfcLabel v);
+    bool hasSteelGrade() const;
+    std::string SteelGrade() const;
+    void setSteelGrade(std::string v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_STRING; } return IfcBuildingElementComponent::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcLabel; } return IfcBuildingElementComponent::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "SteelGrade"; } return IfcBuildingElementComponent::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcReinforcingElement (IfcAbstractEntityPtr e);
-    IfcReinforcingElement (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcLabel > v9_SteelGrade);
-    typedef IfcReinforcingElement* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcReinforcingElement > > list;
-    typedef IfcTemplatedEntityList< IfcReinforcingElement >::it it;
+    IfcReinforcingElement (IfcAbstractEntity* e);
+    IfcReinforcingElement (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_SteelGrade);
+    typedef IfcTemplatedEntityList< IfcReinforcingElement > list;
 };
 /// Definition from IAI: A series of longitudinal and transverse wires or bars of various gauges, arranged at right angles to each other and welded at all points of intersection; usually used for concrete slab reinforcement. Also known as welded wire fabric.
 /// 
@@ -38432,37 +38974,36 @@ class IfcReinforcingElement : public IfcBuildingElementComponent {
 class IfcReinforcingMesh : public IfcReinforcingElement {
 public:
     /// Whether the optional attribute MeshLength is defined for this IfcReinforcingMesh
-    bool hasMeshLength();
-    IfcPositiveLengthMeasure MeshLength();
-    void setMeshLength(IfcPositiveLengthMeasure v);
+    bool hasMeshLength() const;
+    double MeshLength() const;
+    void setMeshLength(double v);
     /// Whether the optional attribute MeshWidth is defined for this IfcReinforcingMesh
-    bool hasMeshWidth();
-    IfcPositiveLengthMeasure MeshWidth();
-    void setMeshWidth(IfcPositiveLengthMeasure v);
-    IfcPositiveLengthMeasure LongitudinalBarNominalDiameter();
-    void setLongitudinalBarNominalDiameter(IfcPositiveLengthMeasure v);
-    IfcPositiveLengthMeasure TransverseBarNominalDiameter();
-    void setTransverseBarNominalDiameter(IfcPositiveLengthMeasure v);
-    IfcAreaMeasure LongitudinalBarCrossSectionArea();
-    void setLongitudinalBarCrossSectionArea(IfcAreaMeasure v);
-    IfcAreaMeasure TransverseBarCrossSectionArea();
-    void setTransverseBarCrossSectionArea(IfcAreaMeasure v);
-    IfcPositiveLengthMeasure LongitudinalBarSpacing();
-    void setLongitudinalBarSpacing(IfcPositiveLengthMeasure v);
-    IfcPositiveLengthMeasure TransverseBarSpacing();
-    void setTransverseBarSpacing(IfcPositiveLengthMeasure v);
+    bool hasMeshWidth() const;
+    double MeshWidth() const;
+    void setMeshWidth(double v);
+    double LongitudinalBarNominalDiameter() const;
+    void setLongitudinalBarNominalDiameter(double v);
+    double TransverseBarNominalDiameter() const;
+    void setTransverseBarNominalDiameter(double v);
+    double LongitudinalBarCrossSectionArea() const;
+    void setLongitudinalBarCrossSectionArea(double v);
+    double TransverseBarCrossSectionArea() const;
+    void setTransverseBarCrossSectionArea(double v);
+    double LongitudinalBarSpacing() const;
+    void setLongitudinalBarSpacing(double v);
+    double TransverseBarSpacing() const;
+    void setTransverseBarSpacing(double v);
     virtual unsigned int getArgumentCount() const { return 17; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_DOUBLE; case 10: return IfcUtil::Argument_DOUBLE; case 11: return IfcUtil::Argument_DOUBLE; case 12: return IfcUtil::Argument_DOUBLE; case 13: return IfcUtil::Argument_DOUBLE; case 14: return IfcUtil::Argument_DOUBLE; case 15: return IfcUtil::Argument_DOUBLE; case 16: return IfcUtil::Argument_DOUBLE; } return IfcReinforcingElement::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcPositiveLengthMeasure; case 10: return Type::IfcPositiveLengthMeasure; case 11: return Type::IfcPositiveLengthMeasure; case 12: return Type::IfcPositiveLengthMeasure; case 13: return Type::IfcAreaMeasure; case 14: return Type::IfcAreaMeasure; case 15: return Type::IfcPositiveLengthMeasure; case 16: return Type::IfcPositiveLengthMeasure; } return IfcReinforcingElement::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "MeshLength"; case 10: return "MeshWidth"; case 11: return "LongitudinalBarNominalDiameter"; case 12: return "TransverseBarNominalDiameter"; case 13: return "LongitudinalBarCrossSectionArea"; case 14: return "TransverseBarCrossSectionArea"; case 15: return "LongitudinalBarSpacing"; case 16: return "TransverseBarSpacing"; } return IfcReinforcingElement::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcReinforcingMesh (IfcAbstractEntityPtr e);
-    IfcReinforcingMesh (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcLabel > v9_SteelGrade, boost::optional< IfcPositiveLengthMeasure > v10_MeshLength, boost::optional< IfcPositiveLengthMeasure > v11_MeshWidth, IfcPositiveLengthMeasure v12_LongitudinalBarNominalDiameter, IfcPositiveLengthMeasure v13_TransverseBarNominalDiameter, IfcAreaMeasure v14_LongitudinalBarCrossSectionArea, IfcAreaMeasure v15_TransverseBarCrossSectionArea, IfcPositiveLengthMeasure v16_LongitudinalBarSpacing, IfcPositiveLengthMeasure v17_TransverseBarSpacing);
-    typedef IfcReinforcingMesh* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcReinforcingMesh > > list;
-    typedef IfcTemplatedEntityList< IfcReinforcingMesh >::it it;
+    IfcReinforcingMesh (IfcAbstractEntity* e);
+    IfcReinforcingMesh (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_SteelGrade, boost::optional< double > v10_MeshLength, boost::optional< double > v11_MeshWidth, double v12_LongitudinalBarNominalDiameter, double v13_TransverseBarNominalDiameter, double v14_LongitudinalBarCrossSectionArea, double v15_TransverseBarCrossSectionArea, double v16_LongitudinalBarSpacing, double v17_TransverseBarSpacing);
+    typedef IfcTemplatedEntityList< IfcReinforcingMesh > list;
 };
 /// Definition from ISO 6707-1:1989: Construction enclosing the building from above.
 /// The IfcRoof is a description of the total roof. It acts as a container entity, that aggregates all components of the roof, it represents. The aggregation is handled via the IfcRelAggregates relationship, relating an IfcRoof with the related roof elements, like slabs (represented by IfcSlab), rafters and purlins (represented by IfcBeam), or other included roofs, such as dormers (represented by IfcRoof).
@@ -38611,40 +39152,38 @@ class IfcReinforcingMesh : public IfcReinforcingElement {
 /// Figure 119 — Roof placement
 class IfcRoof : public IfcBuildingElement {
 public:
-    IfcRoofTypeEnum::IfcRoofTypeEnum ShapeType();
+    IfcRoofTypeEnum::IfcRoofTypeEnum ShapeType() const;
     void setShapeType(IfcRoofTypeEnum::IfcRoofTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_ENUMERATION; } return IfcBuildingElement::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcRoofTypeEnum; } return IfcBuildingElement::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "ShapeType"; } return IfcBuildingElement::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRoof (IfcAbstractEntityPtr e);
-    IfcRoof (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, IfcRoofTypeEnum::IfcRoofTypeEnum v9_ShapeType);
-    typedef IfcRoof* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRoof > > list;
-    typedef IfcTemplatedEntityList< IfcRoof >::it it;
+    IfcRoof (IfcAbstractEntity* e);
+    IfcRoof (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, IfcRoofTypeEnum::IfcRoofTypeEnum v9_ShapeType);
+    typedef IfcTemplatedEntityList< IfcRoof > list;
 };
 
 class IfcRoundedEdgeFeature : public IfcEdgeFeature {
 public:
     /// Whether the optional attribute Radius is defined for this IfcRoundedEdgeFeature
-    bool hasRadius();
-    IfcPositiveLengthMeasure Radius();
-    void setRadius(IfcPositiveLengthMeasure v);
+    bool hasRadius() const;
+    double Radius() const;
+    void setRadius(double v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_DOUBLE; } return IfcEdgeFeature::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcPositiveLengthMeasure; } return IfcEdgeFeature::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "Radius"; } return IfcEdgeFeature::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRoundedEdgeFeature (IfcAbstractEntityPtr e);
-    IfcRoundedEdgeFeature (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcPositiveLengthMeasure > v9_FeatureLength, boost::optional< IfcPositiveLengthMeasure > v10_Radius);
-    typedef IfcRoundedEdgeFeature* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRoundedEdgeFeature > > list;
-    typedef IfcTemplatedEntityList< IfcRoundedEdgeFeature >::it it;
+    IfcRoundedEdgeFeature (IfcAbstractEntity* e);
+    IfcRoundedEdgeFeature (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< double > v9_FeatureLength, boost::optional< double > v10_Radius);
+    typedef IfcTemplatedEntityList< IfcRoundedEdgeFeature > list;
 };
 /// The distribution control element type IfcSensorType defines commonly shared information for occurrences of sensors.  The set of shared information may include: 
 /// 
@@ -38697,20 +39236,19 @@ class IfcRoundedEdgeFeature : public IfcEdgeFeature {
 class IfcSensorType : public IfcDistributionControlElementType {
 public:
     /// Identifies the predefined types of sensor from which the type required may be set.
-    IfcSensorTypeEnum::IfcSensorTypeEnum PredefinedType();
+    IfcSensorTypeEnum::IfcSensorTypeEnum PredefinedType() const;
     void setPredefinedType(IfcSensorTypeEnum::IfcSensorTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcDistributionControlElementType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcSensorTypeEnum; } return IfcDistributionControlElementType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcDistributionControlElementType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcSensorType (IfcAbstractEntityPtr e);
-    IfcSensorType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcSensorTypeEnum::IfcSensorTypeEnum v10_PredefinedType);
-    typedef IfcSensorType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcSensorType > > list;
-    typedef IfcTemplatedEntityList< IfcSensorType >::it it;
+    IfcSensorType (IfcAbstractEntity* e);
+    IfcSensorType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcSensorTypeEnum::IfcSensorTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcSensorType > list;
 };
 /// A slab is a component of the
 /// construction that normally encloses a space vertically. The slab
@@ -38975,25 +39513,24 @@ class IfcSensorType : public IfcDistributionControlElementType {
 class IfcSlab : public IfcBuildingElement {
 public:
     /// Whether the optional attribute PredefinedType is defined for this IfcSlab
-    bool hasPredefinedType();
+    bool hasPredefinedType() const;
     /// Predefined generic type for a slab that is specified in an enumeration. There may be a property set given specifically for the predefined types.
     ///   NOTE The PredefinedType shall only be used, if no type object IfcSlabType is assigned, providing its own IfcSlabType.PredefinedType.
     /// 
     /// FC2x PLATFORM CHANGE: The attribute has been changed into an OPTIONAL attribute.
-    IfcSlabTypeEnum::IfcSlabTypeEnum PredefinedType();
+    IfcSlabTypeEnum::IfcSlabTypeEnum PredefinedType() const;
     void setPredefinedType(IfcSlabTypeEnum::IfcSlabTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_ENUMERATION; } return IfcBuildingElement::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcSlabTypeEnum; } return IfcBuildingElement::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "PredefinedType"; } return IfcBuildingElement::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcSlab (IfcAbstractEntityPtr e);
-    IfcSlab (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcSlabTypeEnum::IfcSlabTypeEnum > v9_PredefinedType);
-    typedef IfcSlab* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcSlab > > list;
-    typedef IfcTemplatedEntityList< IfcSlab >::it it;
+    IfcSlab (IfcAbstractEntity* e);
+    IfcSlab (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcSlabTypeEnum::IfcSlabTypeEnum > v9_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcSlab > list;
 };
 /// Definition from ISO 6707-1:1989: Construction comprising
 /// a succession of horizontal stages (steps or landings) that make it
@@ -39162,20 +39699,19 @@ class IfcSlab : public IfcBuildingElement {
 /// Figure 128 — Stair placement
 class IfcStair : public IfcBuildingElement {
 public:
-    IfcStairTypeEnum::IfcStairTypeEnum ShapeType();
+    IfcStairTypeEnum::IfcStairTypeEnum ShapeType() const;
     void setShapeType(IfcStairTypeEnum::IfcStairTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_ENUMERATION; } return IfcBuildingElement::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcStairTypeEnum; } return IfcBuildingElement::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "ShapeType"; } return IfcBuildingElement::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcStair (IfcAbstractEntityPtr e);
-    IfcStair (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, IfcStairTypeEnum::IfcStairTypeEnum v9_ShapeType);
-    typedef IfcStair* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcStair > > list;
-    typedef IfcTemplatedEntityList< IfcStair >::it it;
+    IfcStair (IfcAbstractEntity* e);
+    IfcStair (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, IfcStairTypeEnum::IfcStairTypeEnum v9_ShapeType);
+    typedef IfcTemplatedEntityList< IfcStair > list;
 };
 /// A stair flight is an assembly of
 /// building components in a single "run" of stair steps (not
@@ -39347,45 +39883,44 @@ class IfcStair : public IfcBuildingElement {
 class IfcStairFlight : public IfcBuildingElement {
 public:
     /// Whether the optional attribute NumberOfRiser is defined for this IfcStairFlight
-    bool hasNumberOfRiser();
+    bool hasNumberOfRiser() const;
     /// Number of the risers included in the stair flight
     /// 
     /// IFC2x4 CHANGE  The attribute has been deprecated it shall only be exposed with a NIL value. Use Pset_StairFlightCommon.NumberOfRisers instead.
-    int NumberOfRiser();
+    int NumberOfRiser() const;
     void setNumberOfRiser(int v);
     /// Whether the optional attribute NumberOfTreads is defined for this IfcStairFlight
-    bool hasNumberOfTreads();
+    bool hasNumberOfTreads() const;
     /// Number of treads included in the stair flight.
     /// 
     /// IFC2x4 CHANGE  The attribute has been deprecated it shall only be exposed with a NIL value. Use Pset_StairFlightCommon.NumberOfTreads instead.
-    int NumberOfTreads();
+    int NumberOfTreads() const;
     void setNumberOfTreads(int v);
     /// Whether the optional attribute RiserHeight is defined for this IfcStairFlight
-    bool hasRiserHeight();
+    bool hasRiserHeight() const;
     /// Vertical distance from tread to tread. The riser height is supposed to be equal for all stairs in a stair flight.
     /// 
     /// IFC2x4 CHANGE  The attribute has been deprecated it shall only be exposed with a NIL value. Use Pset_StairFlightCommon.RiserHeight instead.
-    IfcPositiveLengthMeasure RiserHeight();
-    void setRiserHeight(IfcPositiveLengthMeasure v);
+    double RiserHeight() const;
+    void setRiserHeight(double v);
     /// Whether the optional attribute TreadLength is defined for this IfcStairFlight
-    bool hasTreadLength();
+    bool hasTreadLength() const;
     /// Horizontal distance from the front to the back of the tread. The tread length is supposed to be equal for all steps of the stair flight.
     /// 
     /// IFC2x4 CHANGE  The attribute has been deprecated it shall only be exposed with a NIL value. Use Pset_StairFlightCommon.TreadLength instead.
-    IfcPositiveLengthMeasure TreadLength();
-    void setTreadLength(IfcPositiveLengthMeasure v);
+    double TreadLength() const;
+    void setTreadLength(double v);
     virtual unsigned int getArgumentCount() const { return 12; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_INT; case 9: return IfcUtil::Argument_INT; case 10: return IfcUtil::Argument_DOUBLE; case 11: return IfcUtil::Argument_DOUBLE; } return IfcBuildingElement::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::UNDEFINED; case 9: return Type::UNDEFINED; case 10: return Type::IfcPositiveLengthMeasure; case 11: return Type::IfcPositiveLengthMeasure; } return IfcBuildingElement::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "NumberOfRiser"; case 9: return "NumberOfTreads"; case 10: return "RiserHeight"; case 11: return "TreadLength"; } return IfcBuildingElement::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcStairFlight (IfcAbstractEntityPtr e);
-    IfcStairFlight (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< int > v9_NumberOfRiser, boost::optional< int > v10_NumberOfTreads, boost::optional< IfcPositiveLengthMeasure > v11_RiserHeight, boost::optional< IfcPositiveLengthMeasure > v12_TreadLength);
-    typedef IfcStairFlight* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcStairFlight > > list;
-    typedef IfcTemplatedEntityList< IfcStairFlight >::it it;
+    IfcStairFlight (IfcAbstractEntity* e);
+    IfcStairFlight (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< int > v9_NumberOfRiser, boost::optional< int > v10_NumberOfTreads, boost::optional< double > v11_RiserHeight, boost::optional< double > v12_TreadLength);
+    typedef IfcTemplatedEntityList< IfcStairFlight > list;
 };
 /// Definition from IAI: The IfcStructuralAnalysisModel is used to assemble all information needed to represent a structural analysis model.  It encompasses certain general properties (such as analysis type), references to all contained structural members, structural supports or connections, as well as loads and the respective load results.
 /// 
@@ -39413,10 +39948,10 @@ class IfcStairFlight : public IfcBuildingElement {
 class IfcStructuralAnalysisModel : public IfcSystem {
 public:
     /// Defines the type of the structural analysis model.
-    IfcAnalysisModelTypeEnum::IfcAnalysisModelTypeEnum PredefinedType();
+    IfcAnalysisModelTypeEnum::IfcAnalysisModelTypeEnum PredefinedType() const;
     void setPredefinedType(IfcAnalysisModelTypeEnum::IfcAnalysisModelTypeEnum v);
     /// Whether the optional attribute OrientationOf2DPlane is defined for this IfcStructuralAnalysisModel
-    bool hasOrientationOf2DPlane();
+    bool hasOrientationOf2DPlane() const;
     /// If the selected model type (PredefinedType) describes a 2D system, the orientation defines
     /// the analysis plane (P[1], P[2]) and the normal to the analysis plane (P[3]).  This is needed because
     /// structural items and activities are always defined in three-dimensional space even if they are
@@ -39427,88 +39962,85 @@ class IfcStructuralAnalysisModel : public IfcSystem {
     /// In case of predefined type OUT_PLANE_LOADING_2D, only the P[3] component of loads and their
     /// effects is meant to be analyzed.  This is used for beam grids and for typical slab analyses.
     /// In case of predefined type LOADING_3D, OrientationOf2DPlane shall be omitted.
-    IfcAxis2Placement3D* OrientationOf2DPlane();
+    IfcAxis2Placement3D* OrientationOf2DPlane() const;
     void setOrientationOf2DPlane(IfcAxis2Placement3D* v);
     /// Whether the optional attribute LoadedBy is defined for this IfcStructuralAnalysisModel
-    bool hasLoadedBy();
+    bool hasLoadedBy() const;
     /// References to all load groups to be analyzed.
-    SHARED_PTR< IfcTemplatedEntityList< IfcStructuralLoadGroup > > LoadedBy();
-    void setLoadedBy(SHARED_PTR< IfcTemplatedEntityList< IfcStructuralLoadGroup > > v);
+    IfcTemplatedEntityList< IfcStructuralLoadGroup >::ptr LoadedBy() const;
+    void setLoadedBy(IfcTemplatedEntityList< IfcStructuralLoadGroup >::ptr v);
     /// Whether the optional attribute HasResults is defined for this IfcStructuralAnalysisModel
-    bool hasHasResults();
+    bool hasHasResults() const;
     /// References to all result groups available for this structural analysis model.
-    SHARED_PTR< IfcTemplatedEntityList< IfcStructuralResultGroup > > HasResults();
-    void setHasResults(SHARED_PTR< IfcTemplatedEntityList< IfcStructuralResultGroup > > v);
+    IfcTemplatedEntityList< IfcStructuralResultGroup >::ptr HasResults() const;
+    void setHasResults(IfcTemplatedEntityList< IfcStructuralResultGroup >::ptr v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 5: return IfcUtil::Argument_ENUMERATION; case 6: return IfcUtil::Argument_ENTITY; case 7: return IfcUtil::Argument_ENTITY_LIST; case 8: return IfcUtil::Argument_ENTITY_LIST; } return IfcSystem::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 5: return Type::IfcAnalysisModelTypeEnum; case 6: return Type::IfcAxis2Placement3D; case 7: return Type::IfcStructuralLoadGroup; case 8: return Type::IfcStructuralResultGroup; } return IfcSystem::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 5: return "PredefinedType"; case 6: return "OrientationOf2DPlane"; case 7: return "LoadedBy"; case 8: return "HasResults"; } return IfcSystem::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcStructuralAnalysisModel (IfcAbstractEntityPtr e);
-    IfcStructuralAnalysisModel (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcAnalysisModelTypeEnum::IfcAnalysisModelTypeEnum v6_PredefinedType, IfcAxis2Placement3D* v7_OrientationOf2DPlane, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcStructuralLoadGroup > > > v8_LoadedBy, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcStructuralResultGroup > > > v9_HasResults);
-    typedef IfcStructuralAnalysisModel* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcStructuralAnalysisModel > > list;
-    typedef IfcTemplatedEntityList< IfcStructuralAnalysisModel >::it it;
+    IfcStructuralAnalysisModel (IfcAbstractEntity* e);
+    IfcStructuralAnalysisModel (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcAnalysisModelTypeEnum::IfcAnalysisModelTypeEnum v6_PredefinedType, IfcAxis2Placement3D* v7_OrientationOf2DPlane, boost::optional< IfcTemplatedEntityList< IfcStructuralLoadGroup >::ptr > v8_LoadedBy, boost::optional< IfcTemplatedEntityList< IfcStructuralResultGroup >::ptr > v9_HasResults);
+    typedef IfcTemplatedEntityList< IfcStructuralAnalysisModel > list;
 };
 
 class IfcTendon : public IfcReinforcingElement {
 public:
-    IfcTendonTypeEnum::IfcTendonTypeEnum PredefinedType();
+    IfcTendonTypeEnum::IfcTendonTypeEnum PredefinedType() const;
     void setPredefinedType(IfcTendonTypeEnum::IfcTendonTypeEnum v);
-    IfcPositiveLengthMeasure NominalDiameter();
-    void setNominalDiameter(IfcPositiveLengthMeasure v);
-    IfcAreaMeasure CrossSectionArea();
-    void setCrossSectionArea(IfcAreaMeasure v);
+    double NominalDiameter() const;
+    void setNominalDiameter(double v);
+    double CrossSectionArea() const;
+    void setCrossSectionArea(double v);
     /// Whether the optional attribute TensionForce is defined for this IfcTendon
-    bool hasTensionForce();
-    IfcForceMeasure TensionForce();
-    void setTensionForce(IfcForceMeasure v);
+    bool hasTensionForce() const;
+    double TensionForce() const;
+    void setTensionForce(double v);
     /// Whether the optional attribute PreStress is defined for this IfcTendon
-    bool hasPreStress();
-    IfcPressureMeasure PreStress();
-    void setPreStress(IfcPressureMeasure v);
+    bool hasPreStress() const;
+    double PreStress() const;
+    void setPreStress(double v);
     /// Whether the optional attribute FrictionCoefficient is defined for this IfcTendon
-    bool hasFrictionCoefficient();
-    IfcNormalisedRatioMeasure FrictionCoefficient();
-    void setFrictionCoefficient(IfcNormalisedRatioMeasure v);
+    bool hasFrictionCoefficient() const;
+    double FrictionCoefficient() const;
+    void setFrictionCoefficient(double v);
     /// Whether the optional attribute AnchorageSlip is defined for this IfcTendon
-    bool hasAnchorageSlip();
-    IfcPositiveLengthMeasure AnchorageSlip();
-    void setAnchorageSlip(IfcPositiveLengthMeasure v);
+    bool hasAnchorageSlip() const;
+    double AnchorageSlip() const;
+    void setAnchorageSlip(double v);
     /// Whether the optional attribute MinCurvatureRadius is defined for this IfcTendon
-    bool hasMinCurvatureRadius();
-    IfcPositiveLengthMeasure MinCurvatureRadius();
-    void setMinCurvatureRadius(IfcPositiveLengthMeasure v);
+    bool hasMinCurvatureRadius() const;
+    double MinCurvatureRadius() const;
+    void setMinCurvatureRadius(double v);
     virtual unsigned int getArgumentCount() const { return 17; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; case 10: return IfcUtil::Argument_DOUBLE; case 11: return IfcUtil::Argument_DOUBLE; case 12: return IfcUtil::Argument_DOUBLE; case 13: return IfcUtil::Argument_DOUBLE; case 14: return IfcUtil::Argument_DOUBLE; case 15: return IfcUtil::Argument_DOUBLE; case 16: return IfcUtil::Argument_DOUBLE; } return IfcReinforcingElement::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcTendonTypeEnum; case 10: return Type::IfcPositiveLengthMeasure; case 11: return Type::IfcAreaMeasure; case 12: return Type::IfcForceMeasure; case 13: return Type::IfcPressureMeasure; case 14: return Type::IfcNormalisedRatioMeasure; case 15: return Type::IfcPositiveLengthMeasure; case 16: return Type::IfcPositiveLengthMeasure; } return IfcReinforcingElement::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; case 10: return "NominalDiameter"; case 11: return "CrossSectionArea"; case 12: return "TensionForce"; case 13: return "PreStress"; case 14: return "FrictionCoefficient"; case 15: return "AnchorageSlip"; case 16: return "MinCurvatureRadius"; } return IfcReinforcingElement::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcTendon (IfcAbstractEntityPtr e);
-    IfcTendon (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcLabel > v9_SteelGrade, IfcTendonTypeEnum::IfcTendonTypeEnum v10_PredefinedType, IfcPositiveLengthMeasure v11_NominalDiameter, IfcAreaMeasure v12_CrossSectionArea, boost::optional< IfcForceMeasure > v13_TensionForce, boost::optional< IfcPressureMeasure > v14_PreStress, boost::optional< IfcNormalisedRatioMeasure > v15_FrictionCoefficient, boost::optional< IfcPositiveLengthMeasure > v16_AnchorageSlip, boost::optional< IfcPositiveLengthMeasure > v17_MinCurvatureRadius);
-    typedef IfcTendon* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcTendon > > list;
-    typedef IfcTemplatedEntityList< IfcTendon >::it it;
+    IfcTendon (IfcAbstractEntity* e);
+    IfcTendon (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_SteelGrade, IfcTendonTypeEnum::IfcTendonTypeEnum v10_PredefinedType, double v11_NominalDiameter, double v12_CrossSectionArea, boost::optional< double > v13_TensionForce, boost::optional< double > v14_PreStress, boost::optional< double > v15_FrictionCoefficient, boost::optional< double > v16_AnchorageSlip, boost::optional< double > v17_MinCurvatureRadius);
+    typedef IfcTemplatedEntityList< IfcTendon > list;
 };
 
 class IfcTendonAnchor : public IfcReinforcingElement {
 public:
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcReinforcingElement::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcReinforcingElement::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcReinforcingElement::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcTendonAnchor (IfcAbstractEntityPtr e);
-    IfcTendonAnchor (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcLabel > v9_SteelGrade);
-    typedef IfcTendonAnchor* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcTendonAnchor > > list;
-    typedef IfcTemplatedEntityList< IfcTendonAnchor >::it it;
+    IfcTendonAnchor (IfcAbstractEntity* e);
+    IfcTendonAnchor (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_SteelGrade);
+    typedef IfcTemplatedEntityList< IfcTendonAnchor > list;
 };
 /// The element component type IfcVibrationIsolatorType defines commonly shared information for occurrences of vibration isolators.  The set of shared information may include: 
 /// 
@@ -39535,20 +40067,19 @@ class IfcTendonAnchor : public IfcReinforcingElement {
 class IfcVibrationIsolatorType : public IfcDiscreteAccessoryType {
 public:
     /// Defines the type of vibration isolator.
-    IfcVibrationIsolatorTypeEnum::IfcVibrationIsolatorTypeEnum PredefinedType();
+    IfcVibrationIsolatorTypeEnum::IfcVibrationIsolatorTypeEnum PredefinedType() const;
     void setPredefinedType(IfcVibrationIsolatorTypeEnum::IfcVibrationIsolatorTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcDiscreteAccessoryType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcVibrationIsolatorTypeEnum; } return IfcDiscreteAccessoryType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcDiscreteAccessoryType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcVibrationIsolatorType (IfcAbstractEntityPtr e);
-    IfcVibrationIsolatorType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcVibrationIsolatorTypeEnum::IfcVibrationIsolatorTypeEnum v10_PredefinedType);
-    typedef IfcVibrationIsolatorType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcVibrationIsolatorType > > list;
-    typedef IfcTemplatedEntityList< IfcVibrationIsolatorType >::it it;
+    IfcVibrationIsolatorType (IfcAbstractEntity* e);
+    IfcVibrationIsolatorType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcVibrationIsolatorTypeEnum::IfcVibrationIsolatorTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcVibrationIsolatorType > list;
 };
 /// Definition from ISO 6707-1:1989: Vertical construction
 /// usually in masonry or in concrete which bounds or subdivides a
@@ -39796,16 +40327,15 @@ class IfcWall : public IfcBuildingElement {
 public:
     virtual unsigned int getArgumentCount() const { return 8; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcBuildingElement::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcBuildingElement::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcBuildingElement::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcWall (IfcAbstractEntityPtr e);
-    IfcWall (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag);
-    typedef IfcWall* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcWall > > list;
-    typedef IfcTemplatedEntityList< IfcWall >::it it;
+    IfcWall (IfcAbstractEntity* e);
+    IfcWall (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag);
+    typedef IfcTemplatedEntityList< IfcWall > list;
 };
 /// The IfcWallStandardCase defines a wall with certain
 /// constraints for the provision of parameters and with certain
@@ -40013,16 +40543,15 @@ class IfcWallStandardCase : public IfcWall {
 public:
     virtual unsigned int getArgumentCount() const { return 8; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcWall::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcWall::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcWall::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcWallStandardCase (IfcAbstractEntityPtr e);
-    IfcWallStandardCase (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag);
-    typedef IfcWallStandardCase* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcWallStandardCase > > list;
-    typedef IfcTemplatedEntityList< IfcWallStandardCase >::it it;
+    IfcWallStandardCase (IfcAbstractEntity* e);
+    IfcWallStandardCase (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag);
+    typedef IfcTemplatedEntityList< IfcWallStandardCase > list;
 };
 /// Definition form ISO 6707-1:1989: Construction for
 /// closing a vertical or near vertical opening in a wall or pitched
@@ -40385,31 +40914,30 @@ class IfcWallStandardCase : public IfcWall {
 class IfcWindow : public IfcBuildingElement {
 public:
     /// Whether the optional attribute OverallHeight is defined for this IfcWindow
-    bool hasOverallHeight();
+    bool hasOverallHeight() const;
     /// Overall measure of the height, it reflects the Z Dimension of a bounding box, enclosing the body of the window opening. If omitted, the OverallHeight should be taken from the geometric representation of the IfcOpening in which the window is inserted. 
     /// 
     /// NOTE  The body of the window might be taller then the window opening (e.g. in cases where the window lining includes a casing). In these cases the OverallHeight shall still be given as the window opening height, and not as the total height of the window lining.
-    IfcPositiveLengthMeasure OverallHeight();
-    void setOverallHeight(IfcPositiveLengthMeasure v);
+    double OverallHeight() const;
+    void setOverallHeight(double v);
     /// Whether the optional attribute OverallWidth is defined for this IfcWindow
-    bool hasOverallWidth();
+    bool hasOverallWidth() const;
     /// Overall measure of the width, it reflects the X Dimension of a bounding box, enclosing the body of the window opening. If omitted, the OverallWidth should be taken from the geometric representation of the IfcOpening in which the window is inserted. 
     /// 
     /// NOTE  The body of the window might be wider then the window opening (e.g. in cases where the window lining includes a casing). In these cases the OverallWidth shall still be given as the window opening width, and not as the total width of the window lining.
-    IfcPositiveLengthMeasure OverallWidth();
-    void setOverallWidth(IfcPositiveLengthMeasure v);
+    double OverallWidth() const;
+    void setOverallWidth(double v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_DOUBLE; case 9: return IfcUtil::Argument_DOUBLE; } return IfcBuildingElement::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcPositiveLengthMeasure; case 9: return Type::IfcPositiveLengthMeasure; } return IfcBuildingElement::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "OverallHeight"; case 9: return "OverallWidth"; } return IfcBuildingElement::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcWindow (IfcAbstractEntityPtr e);
-    IfcWindow (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcPositiveLengthMeasure > v9_OverallHeight, boost::optional< IfcPositiveLengthMeasure > v10_OverallWidth);
-    typedef IfcWindow* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcWindow > > list;
-    typedef IfcTemplatedEntityList< IfcWindow >::it it;
+    IfcWindow (IfcAbstractEntity* e);
+    IfcWindow (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< double > v9_OverallHeight, boost::optional< double > v10_OverallWidth);
+    typedef IfcTemplatedEntityList< IfcWindow > list;
 };
 /// The distribution control element type IfcActuatorType defines commonly shared information for occurrences of actuators.  The set of shared information may include: 
 /// 
@@ -40445,20 +40973,19 @@ class IfcWindow : public IfcBuildingElement {
 class IfcActuatorType : public IfcDistributionControlElementType {
 public:
     /// Identifies the predefined types of actuator from which the type required may be set.
-    IfcActuatorTypeEnum::IfcActuatorTypeEnum PredefinedType();
+    IfcActuatorTypeEnum::IfcActuatorTypeEnum PredefinedType() const;
     void setPredefinedType(IfcActuatorTypeEnum::IfcActuatorTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcDistributionControlElementType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcActuatorTypeEnum; } return IfcDistributionControlElementType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcDistributionControlElementType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcActuatorType (IfcAbstractEntityPtr e);
-    IfcActuatorType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcActuatorTypeEnum::IfcActuatorTypeEnum v10_PredefinedType);
-    typedef IfcActuatorType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcActuatorType > > list;
-    typedef IfcTemplatedEntityList< IfcActuatorType >::it it;
+    IfcActuatorType (IfcAbstractEntity* e);
+    IfcActuatorType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcActuatorTypeEnum::IfcActuatorTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcActuatorType > list;
 };
 /// The distribution control element type IfcAlarmType defines commonly shared information for occurrences of alarms.  The set of shared information may include: 
 /// 
@@ -40489,20 +41016,19 @@ class IfcActuatorType : public IfcDistributionControlElementType {
 class IfcAlarmType : public IfcDistributionControlElementType {
 public:
     /// Identifies the predefined types of alarm from which the type required may be set.
-    IfcAlarmTypeEnum::IfcAlarmTypeEnum PredefinedType();
+    IfcAlarmTypeEnum::IfcAlarmTypeEnum PredefinedType() const;
     void setPredefinedType(IfcAlarmTypeEnum::IfcAlarmTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcDistributionControlElementType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcAlarmTypeEnum; } return IfcDistributionControlElementType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcDistributionControlElementType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcAlarmType (IfcAbstractEntityPtr e);
-    IfcAlarmType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcAlarmTypeEnum::IfcAlarmTypeEnum v10_PredefinedType);
-    typedef IfcAlarmType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcAlarmType > > list;
-    typedef IfcTemplatedEntityList< IfcAlarmType >::it it;
+    IfcAlarmType (IfcAbstractEntity* e);
+    IfcAlarmType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcAlarmTypeEnum::IfcAlarmTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcAlarmType > list;
 };
 /// Definition from ISO 6707-1:1989: Structural member designed to carry loads between or beyond points of support, usually narrow in relation to its length and horizontal or nearly so.
 /// 
@@ -40745,40 +41271,38 @@ class IfcBeam : public IfcBuildingElement {
 public:
     virtual unsigned int getArgumentCount() const { return 8; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcBuildingElement::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcBuildingElement::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcBuildingElement::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcBeam (IfcAbstractEntityPtr e);
-    IfcBeam (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag);
-    typedef IfcBeam* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcBeam > > list;
-    typedef IfcTemplatedEntityList< IfcBeam >::it it;
+    IfcBeam (IfcAbstractEntity* e);
+    IfcBeam (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag);
+    typedef IfcTemplatedEntityList< IfcBeam > list;
 };
 
 class IfcChamferEdgeFeature : public IfcEdgeFeature {
 public:
     /// Whether the optional attribute Width is defined for this IfcChamferEdgeFeature
-    bool hasWidth();
-    IfcPositiveLengthMeasure Width();
-    void setWidth(IfcPositiveLengthMeasure v);
+    bool hasWidth() const;
+    double Width() const;
+    void setWidth(double v);
     /// Whether the optional attribute Height is defined for this IfcChamferEdgeFeature
-    bool hasHeight();
-    IfcPositiveLengthMeasure Height();
-    void setHeight(IfcPositiveLengthMeasure v);
+    bool hasHeight() const;
+    double Height() const;
+    void setHeight(double v);
     virtual unsigned int getArgumentCount() const { return 11; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_DOUBLE; case 10: return IfcUtil::Argument_DOUBLE; } return IfcEdgeFeature::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcPositiveLengthMeasure; case 10: return Type::IfcPositiveLengthMeasure; } return IfcEdgeFeature::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "Width"; case 10: return "Height"; } return IfcEdgeFeature::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcChamferEdgeFeature (IfcAbstractEntityPtr e);
-    IfcChamferEdgeFeature (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcPositiveLengthMeasure > v9_FeatureLength, boost::optional< IfcPositiveLengthMeasure > v10_Width, boost::optional< IfcPositiveLengthMeasure > v11_Height);
-    typedef IfcChamferEdgeFeature* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcChamferEdgeFeature > > list;
-    typedef IfcTemplatedEntityList< IfcChamferEdgeFeature >::it it;
+    IfcChamferEdgeFeature (IfcAbstractEntity* e);
+    IfcChamferEdgeFeature (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< double > v9_FeatureLength, boost::optional< double > v10_Width, boost::optional< double > v11_Height);
+    typedef IfcTemplatedEntityList< IfcChamferEdgeFeature > list;
 };
 /// The distribution control element type IfcControllerType defines commonly shared information for occurrences of controllers.  The set of shared information may include: 
 /// 
@@ -40819,20 +41343,19 @@ class IfcChamferEdgeFeature : public IfcEdgeFeature {
 class IfcControllerType : public IfcDistributionControlElementType {
 public:
     /// Identifies the predefined types of controller from which the type required may be set.
-    IfcControllerTypeEnum::IfcControllerTypeEnum PredefinedType();
+    IfcControllerTypeEnum::IfcControllerTypeEnum PredefinedType() const;
     void setPredefinedType(IfcControllerTypeEnum::IfcControllerTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcDistributionControlElementType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcControllerTypeEnum; } return IfcDistributionControlElementType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcDistributionControlElementType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcControllerType (IfcAbstractEntityPtr e);
-    IfcControllerType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcControllerTypeEnum::IfcControllerTypeEnum v10_PredefinedType);
-    typedef IfcControllerType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcControllerType > > list;
-    typedef IfcTemplatedEntityList< IfcControllerType >::it it;
+    IfcControllerType (IfcAbstractEntity* e);
+    IfcControllerType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcControllerTypeEnum::IfcControllerTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcControllerType > list;
 };
 /// A distribution chamber element defines a place at which distribution systems and their constituent elements may be inspected or through which they may travel.
 /// 
@@ -40869,16 +41392,15 @@ class IfcDistributionChamberElement : public IfcDistributionFlowElement {
 public:
     virtual unsigned int getArgumentCount() const { return 8; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcDistributionFlowElement::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcDistributionFlowElement::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcDistributionFlowElement::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcDistributionChamberElement (IfcAbstractEntityPtr e);
-    IfcDistributionChamberElement (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag);
-    typedef IfcDistributionChamberElement* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcDistributionChamberElement > > list;
-    typedef IfcTemplatedEntityList< IfcDistributionChamberElement >::it it;
+    IfcDistributionChamberElement (IfcAbstractEntity* e);
+    IfcDistributionChamberElement (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag);
+    typedef IfcTemplatedEntityList< IfcDistributionChamberElement > list;
 };
 /// The distribution element IfcDistributionControlElement defines occurrence elements of a building automation control system that are used to impart control over elements of a distribution system.
 /// 
@@ -40961,44 +41483,42 @@ class IfcDistributionChamberElement : public IfcDistributionFlowElement {
 class IfcDistributionControlElement : public IfcDistributionElement {
 public:
     /// Whether the optional attribute ControlElementId is defined for this IfcDistributionControlElement
-    bool hasControlElementId();
-    IfcIdentifier ControlElementId();
-    void setControlElementId(IfcIdentifier v);
+    bool hasControlElementId() const;
+    std::string ControlElementId() const;
+    void setControlElementId(std::string v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_STRING; } return IfcDistributionElement::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcIdentifier; } return IfcDistributionElement::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "ControlElementId"; } return IfcDistributionElement::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelFlowControlElements > > AssignedToFlowElement(); // INVERSE IfcRelFlowControlElements::RelatedControlElements
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcRelFlowControlElements >::ptr AssignedToFlowElement() const; // INVERSE IfcRelFlowControlElements::RelatedControlElements
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcDistributionControlElement (IfcAbstractEntityPtr e);
-    IfcDistributionControlElement (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcIdentifier > v9_ControlElementId);
-    typedef IfcDistributionControlElement* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcDistributionControlElement > > list;
-    typedef IfcTemplatedEntityList< IfcDistributionControlElement >::it it;
+    IfcDistributionControlElement (IfcAbstractEntity* e);
+    IfcDistributionControlElement (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ControlElementId);
+    typedef IfcTemplatedEntityList< IfcDistributionControlElement > list;
 };
 
 class IfcElectricDistributionPoint : public IfcFlowController {
 public:
-    IfcElectricDistributionPointFunctionEnum::IfcElectricDistributionPointFunctionEnum DistributionPointFunction();
+    IfcElectricDistributionPointFunctionEnum::IfcElectricDistributionPointFunctionEnum DistributionPointFunction() const;
     void setDistributionPointFunction(IfcElectricDistributionPointFunctionEnum::IfcElectricDistributionPointFunctionEnum v);
     /// Whether the optional attribute UserDefinedFunction is defined for this IfcElectricDistributionPoint
-    bool hasUserDefinedFunction();
-    IfcLabel UserDefinedFunction();
-    void setUserDefinedFunction(IfcLabel v);
+    bool hasUserDefinedFunction() const;
+    std::string UserDefinedFunction() const;
+    void setUserDefinedFunction(std::string v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_ENUMERATION; case 9: return IfcUtil::Argument_STRING; } return IfcFlowController::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcElectricDistributionPointFunctionEnum; case 9: return Type::IfcLabel; } return IfcFlowController::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "DistributionPointFunction"; case 9: return "UserDefinedFunction"; } return IfcFlowController::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcElectricDistributionPoint (IfcAbstractEntityPtr e);
-    IfcElectricDistributionPoint (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, IfcElectricDistributionPointFunctionEnum::IfcElectricDistributionPointFunctionEnum v9_DistributionPointFunction, boost::optional< IfcLabel > v10_UserDefinedFunction);
-    typedef IfcElectricDistributionPoint* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcElectricDistributionPoint > > list;
-    typedef IfcTemplatedEntityList< IfcElectricDistributionPoint >::it it;
+    IfcElectricDistributionPoint (IfcAbstractEntity* e);
+    IfcElectricDistributionPoint (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, IfcElectricDistributionPointFunctionEnum::IfcElectricDistributionPointFunctionEnum v9_DistributionPointFunction, boost::optional< std::string > v10_UserDefinedFunction);
+    typedef IfcTemplatedEntityList< IfcElectricDistributionPoint > list;
 };
 /// Definition from IAI: A steel bar, usually with manufactured deformations in the surface,
 /// used in concrete and masonry construction to provide additional strength.  A single instance
@@ -41030,36 +41550,35 @@ class IfcElectricDistributionPoint : public IfcFlowController {
 /// Simplified geometric representations may be used based on local agreements.
 class IfcReinforcingBar : public IfcReinforcingElement {
 public:
-    IfcPositiveLengthMeasure NominalDiameter();
-    void setNominalDiameter(IfcPositiveLengthMeasure v);
-    IfcAreaMeasure CrossSectionArea();
-    void setCrossSectionArea(IfcAreaMeasure v);
+    double NominalDiameter() const;
+    void setNominalDiameter(double v);
+    double CrossSectionArea() const;
+    void setCrossSectionArea(double v);
     /// Whether the optional attribute BarLength is defined for this IfcReinforcingBar
-    bool hasBarLength();
-    IfcPositiveLengthMeasure BarLength();
-    void setBarLength(IfcPositiveLengthMeasure v);
-    IfcReinforcingBarRoleEnum::IfcReinforcingBarRoleEnum BarRole();
+    bool hasBarLength() const;
+    double BarLength() const;
+    void setBarLength(double v);
+    IfcReinforcingBarRoleEnum::IfcReinforcingBarRoleEnum BarRole() const;
     void setBarRole(IfcReinforcingBarRoleEnum::IfcReinforcingBarRoleEnum v);
     /// Whether the optional attribute BarSurface is defined for this IfcReinforcingBar
-    bool hasBarSurface();
-    IfcReinforcingBarSurfaceEnum::IfcReinforcingBarSurfaceEnum BarSurface();
+    bool hasBarSurface() const;
+    IfcReinforcingBarSurfaceEnum::IfcReinforcingBarSurfaceEnum BarSurface() const;
     void setBarSurface(IfcReinforcingBarSurfaceEnum::IfcReinforcingBarSurfaceEnum v);
     virtual unsigned int getArgumentCount() const { return 14; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_DOUBLE; case 10: return IfcUtil::Argument_DOUBLE; case 11: return IfcUtil::Argument_DOUBLE; case 12: return IfcUtil::Argument_ENUMERATION; case 13: return IfcUtil::Argument_ENUMERATION; } return IfcReinforcingElement::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcPositiveLengthMeasure; case 10: return Type::IfcAreaMeasure; case 11: return Type::IfcPositiveLengthMeasure; case 12: return Type::IfcReinforcingBarRoleEnum; case 13: return Type::IfcReinforcingBarSurfaceEnum; } return IfcReinforcingElement::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "NominalDiameter"; case 10: return "CrossSectionArea"; case 11: return "BarLength"; case 12: return "BarRole"; case 13: return "BarSurface"; } return IfcReinforcingElement::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcReinforcingBar (IfcAbstractEntityPtr e);
-    IfcReinforcingBar (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcLabel > v9_SteelGrade, IfcPositiveLengthMeasure v10_NominalDiameter, IfcAreaMeasure v11_CrossSectionArea, boost::optional< IfcPositiveLengthMeasure > v12_BarLength, IfcReinforcingBarRoleEnum::IfcReinforcingBarRoleEnum v13_BarRole, boost::optional< IfcReinforcingBarSurfaceEnum::IfcReinforcingBarSurfaceEnum > v14_BarSurface);
-    typedef IfcReinforcingBar* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcReinforcingBar > > list;
-    typedef IfcTemplatedEntityList< IfcReinforcingBar >::it it;
+    IfcReinforcingBar (IfcAbstractEntity* e);
+    IfcReinforcingBar (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_SteelGrade, double v10_NominalDiameter, double v11_CrossSectionArea, boost::optional< double > v12_BarLength, IfcReinforcingBarRoleEnum::IfcReinforcingBarRoleEnum v13_BarRole, boost::optional< IfcReinforcingBarSurfaceEnum::IfcReinforcingBarSurfaceEnum > v14_BarSurface);
+    typedef IfcTemplatedEntityList< IfcReinforcingBar > list;
 };
 
 void InitStringMap();
-IfcUtil::IfcSchemaEntity SchemaEntity(IfcAbstractEntityPtr e = 0);
+IfcUtil::IfcBaseClass* SchemaEntity(IfcAbstractEntity* e = 0);
 }
 
 #endif
diff --git a/src/ifcparse/Ifc2x3enum.h b/src/ifcparse/Ifc2x3enum.h
index 95184b7..35cdc45 100644
--- a/src/ifcparse/Ifc2x3enum.h
+++ b/src/ifcparse/Ifc2x3enum.h
@@ -33,7 +33,7 @@ namespace Ifc2x3 {
 
 namespace Type {
     typedef enum {
-        Ifc2DCompositeCurve, IfcAbsorbedDoseMeasure, IfcAccelerationMeasure, IfcActionRequest, IfcActionSourceTypeEnum, IfcActionTypeEnum, IfcActor, IfcActorRole, IfcActorSelect, IfcActuatorType, IfcActuatorTypeEnum, IfcAddress, IfcAddressTypeEnum, IfcAheadOrBehind, IfcAirTerminalBoxType, IfcAirTerminalBoxTypeEnum, IfcAirTerminalType, IfcAirTerminalTypeEnum, IfcAirToAirHeatRecoveryType, IfcAirToAirHeatRecoveryTypeEnum, IfcAlarmType, IfcAlarmTypeEnum, IfcAmountOfSubstanceMeasure, IfcAnalysisModelTypeEnum, IfcAnalysisTheoryTypeEnum, IfcAngularDimension, IfcAngularVelocityMeasure, IfcAnnotation, IfcAnnotationCurveOccurrence, IfcAnnotationFillArea, IfcAnnotationFillAreaOccurrence, IfcAnnotationOccurrence, IfcAnnotationSurface, IfcAnnotationSurfaceOccurrence, IfcAnnotationSymbolOccurrence, IfcAnnotationTextOccurrence, IfcApplication, IfcAppliedValue, IfcAppliedValueRelationship, IfcAppliedValueSelect, IfcApproval, IfcApprovalActorRelationship, IfcApprovalPropertyRelationship, IfcApprovalRelationship, IfcArbitraryClosedProfileDef, IfcArbitraryOpenProfileDef, IfcArbitraryProfileDefWithVoids, IfcAreaMeasure, IfcArithmeticOperatorEnum, IfcAssemblyPlaceEnum, IfcAsset, IfcAsymmetricIShapeProfileDef, IfcAxis1Placement, IfcAxis2Placement, IfcAxis2Placement2D, IfcAxis2Placement3D, IfcBSplineCurve, IfcBSplineCurveForm, IfcBeam, IfcBeamType, IfcBeamTypeEnum, IfcBenchmarkEnum, IfcBezierCurve, IfcBlobTexture, IfcBlock, IfcBoilerType, IfcBoilerTypeEnum, IfcBoolean, IfcBooleanClippingResult, IfcBooleanOperand, IfcBooleanOperator, IfcBooleanResult, IfcBoundaryCondition, IfcBoundaryEdgeCondition, IfcBoundaryFaceCondition, IfcBoundaryNodeCondition, IfcBoundaryNodeConditionWarping, IfcBoundedCurve, IfcBoundedSurface, IfcBoundingBox, IfcBoxAlignment, IfcBoxedHalfSpace, IfcBuilding, IfcBuildingElement, IfcBuildingElementComponent, IfcBuildingElementPart, IfcBuildingElementProxy, IfcBuildingElementProxyType, IfcBuildingElementProxyTypeEnum, IfcBuildingElementType, IfcBuildingStorey, IfcCShapeProfileDef, IfcCableCarrierFittingType, IfcCableCarrierFittingTypeEnum, IfcCableCarrierSegmentType, IfcCableCarrierSegmentTypeEnum, IfcCableSegmentType, IfcCableSegmentTypeEnum, IfcCalendarDate, IfcCartesianPoint, IfcCartesianTransformationOperator, IfcCartesianTransformationOperator2D, IfcCartesianTransformationOperator2DnonUniform, IfcCartesianTransformationOperator3D, IfcCartesianTransformationOperator3DnonUniform, IfcCenterLineProfileDef, IfcChamferEdgeFeature, IfcChangeActionEnum, IfcCharacterStyleSelect, IfcChillerType, IfcChillerTypeEnum, IfcCircle, IfcCircleHollowProfileDef, IfcCircleProfileDef, IfcClassification, IfcClassificationItem, IfcClassificationItemRelationship, IfcClassificationNotation, IfcClassificationNotationFacet, IfcClassificationNotationSelect, IfcClassificationReference, IfcClosedShell, IfcCoilType, IfcCoilTypeEnum, IfcColour, IfcColourOrFactor, IfcColourRgb, IfcColourSpecification, IfcColumn, IfcColumnType, IfcColumnTypeEnum, IfcComplexNumber, IfcComplexProperty, IfcCompositeCurve, IfcCompositeCurveSegment, IfcCompositeProfileDef, IfcCompoundPlaneAngleMeasure, IfcCompressorType, IfcCompressorTypeEnum, IfcCondenserType, IfcCondenserTypeEnum, IfcCondition, IfcConditionCriterion, IfcConditionCriterionSelect, IfcConic, IfcConnectedFaceSet, IfcConnectionCurveGeometry, IfcConnectionGeometry, IfcConnectionPointEccentricity, IfcConnectionPointGeometry, IfcConnectionPortGeometry, IfcConnectionSurfaceGeometry, IfcConnectionTypeEnum, IfcConstraint, IfcConstraintAggregationRelationship, IfcConstraintClassificationRelationship, IfcConstraintEnum, IfcConstraintRelationship, IfcConstructionEquipmentResource, IfcConstructionMaterialResource, IfcConstructionProductResource, IfcConstructionResource, IfcContextDependentMeasure, IfcContextDependentUnit, IfcControl, IfcControllerType, IfcControllerTypeEnum, IfcConversionBasedUnit, IfcCooledBeamType, IfcCooledBeamTypeEnum, IfcCoolingTowerType, IfcCoolingTowerTypeEnum, IfcCoordinatedUniversalTimeOffset, IfcCostItem, IfcCostSchedule, IfcCostScheduleTypeEnum, IfcCostValue, IfcCountMeasure, IfcCovering, IfcCoveringType, IfcCoveringTypeEnum, IfcCraneRailAShapeProfileDef, IfcCraneRailFShapeProfileDef, IfcCrewResource, IfcCsgPrimitive3D, IfcCsgSelect, IfcCsgSolid, IfcCurrencyEnum, IfcCurrencyRelationship, IfcCurtainWall, IfcCurtainWallType, IfcCurtainWallTypeEnum, IfcCurvatureMeasure, IfcCurve, IfcCurveBoundedPlane, IfcCurveFontOrScaledCurveFontSelect, IfcCurveOrEdgeCurve, IfcCurveStyle, IfcCurveStyleFont, IfcCurveStyleFontAndScaling, IfcCurveStyleFontPattern, IfcCurveStyleFontSelect, IfcDamperType, IfcDamperTypeEnum, IfcDataOriginEnum, IfcDateAndTime, IfcDateTimeSelect, IfcDayInMonthNumber, IfcDaylightSavingHour, IfcDefinedSymbol, IfcDefinedSymbolSelect, IfcDerivedMeasureValue, IfcDerivedProfileDef, IfcDerivedUnit, IfcDerivedUnitElement, IfcDerivedUnitEnum, IfcDescriptiveMeasure, IfcDiameterDimension, IfcDimensionCalloutRelationship, IfcDimensionCount, IfcDimensionCurve, IfcDimensionCurveDirectedCallout, IfcDimensionCurveTerminator, IfcDimensionExtentUsage, IfcDimensionPair, IfcDimensionalExponents, IfcDirection, IfcDirectionSenseEnum, IfcDiscreteAccessory, IfcDiscreteAccessoryType, IfcDistributionChamberElement, IfcDistributionChamberElementType, IfcDistributionChamberElementTypeEnum, IfcDistributionControlElement, IfcDistributionControlElementType, IfcDistributionElement, IfcDistributionElementType, IfcDistributionFlowElement, IfcDistributionFlowElementType, IfcDistributionPort, IfcDocumentConfidentialityEnum, IfcDocumentElectronicFormat, IfcDocumentInformation, IfcDocumentInformationRelationship, IfcDocumentReference, IfcDocumentSelect, IfcDocumentStatusEnum, IfcDoor, IfcDoorLiningProperties, IfcDoorPanelOperationEnum, IfcDoorPanelPositionEnum, IfcDoorPanelProperties, IfcDoorStyle, IfcDoorStyleConstructionEnum, IfcDoorStyleOperationEnum, IfcDoseEquivalentMeasure, IfcDraughtingCallout, IfcDraughtingCalloutElement, IfcDraughtingCalloutRelationship, IfcDraughtingPreDefinedColour, IfcDraughtingPreDefinedCurveFont, IfcDraughtingPreDefinedTextFont, IfcDuctFittingType, IfcDuctFittingTypeEnum, IfcDuctSegmentType, IfcDuctSegmentTypeEnum, IfcDuctSilencerType, IfcDuctSilencerTypeEnum, IfcDynamicViscosityMeasure, IfcEdge, IfcEdgeCurve, IfcEdgeFeature, IfcEdgeLoop, IfcElectricApplianceType, IfcElectricApplianceTypeEnum, IfcElectricCapacitanceMeasure, IfcElectricChargeMeasure, IfcElectricConductanceMeasure, IfcElectricCurrentEnum, IfcElectricCurrentMeasure, IfcElectricDistributionPoint, IfcElectricDistributionPointFunctionEnum, IfcElectricFlowStorageDeviceType, IfcElectricFlowStorageDeviceTypeEnum, IfcElectricGeneratorType, IfcElectricGeneratorTypeEnum, IfcElectricHeaterType, IfcElectricHeaterTypeEnum, IfcElectricMotorType, IfcElectricMotorTypeEnum, IfcElectricResistanceMeasure, IfcElectricTimeControlType, IfcElectricTimeControlTypeEnum, IfcElectricVoltageMeasure, IfcElectricalBaseProperties, IfcElectricalCircuit, IfcElectricalElement, IfcElement, IfcElementAssembly, IfcElementAssemblyTypeEnum, IfcElementComponent, IfcElementComponentType, IfcElementCompositionEnum, IfcElementQuantity, IfcElementType, IfcElementarySurface, IfcEllipse, IfcEllipseProfileDef, IfcEnergyConversionDevice, IfcEnergyConversionDeviceType, IfcEnergyMeasure, IfcEnergyProperties, IfcEnergySequenceEnum, IfcEnvironmentalImpactCategoryEnum, IfcEnvironmentalImpactValue, IfcEquipmentElement, IfcEquipmentStandard, IfcEvaporativeCoolerType, IfcEvaporativeCoolerTypeEnum, IfcEvaporatorType, IfcEvaporatorTypeEnum, IfcExtendedMaterialProperties, IfcExternalReference, IfcExternallyDefinedHatchStyle, IfcExternallyDefinedSurfaceStyle, IfcExternallyDefinedSymbol, IfcExternallyDefinedTextFont, IfcExtrudedAreaSolid, IfcFace, IfcFaceBasedSurfaceModel, IfcFaceBound, IfcFaceOuterBound, IfcFaceSurface, IfcFacetedBrep, IfcFacetedBrepWithVoids, IfcFailureConnectionCondition, IfcFanType, IfcFanTypeEnum, IfcFastener, IfcFastenerType, IfcFeatureElement, IfcFeatureElementAddition, IfcFeatureElementSubtraction, IfcFillAreaStyle, IfcFillAreaStyleHatching, IfcFillAreaStyleTileShapeSelect, IfcFillAreaStyleTileSymbolWithStyle, IfcFillAreaStyleTiles, IfcFillStyleSelect, IfcFilterType, IfcFilterTypeEnum, IfcFireSuppressionTerminalType, IfcFireSuppressionTerminalTypeEnum, IfcFlowController, IfcFlowControllerType, IfcFlowDirectionEnum, IfcFlowFitting, IfcFlowFittingType, IfcFlowInstrumentType, IfcFlowInstrumentTypeEnum, IfcFlowMeterType, IfcFlowMeterTypeEnum, IfcFlowMovingDevice, IfcFlowMovingDeviceType, IfcFlowSegment, IfcFlowSegmentType, IfcFlowStorageDevice, IfcFlowStorageDeviceType, IfcFlowTerminal, IfcFlowTerminalType, IfcFlowTreatmentDevice, IfcFlowTreatmentDeviceType, IfcFluidFlowProperties, IfcFontStyle, IfcFontVariant, IfcFontWeight, IfcFooting, IfcFootingTypeEnum, IfcForceMeasure, IfcFrequencyMeasure, IfcFuelProperties, IfcFurnishingElement, IfcFurnishingElementType, IfcFurnitureStandard, IfcFurnitureType, IfcGasTerminalType, IfcGasTerminalTypeEnum, IfcGeneralMaterialProperties, IfcGeneralProfileProperties, IfcGeometricCurveSet, IfcGeometricProjectionEnum, IfcGeometricRepresentationContext, IfcGeometricRepresentationItem, IfcGeometricRepresentationSubContext, IfcGeometricSet, IfcGeometricSetSelect, IfcGlobalOrLocalEnum, IfcGloballyUniqueId, IfcGrid, IfcGridAxis, IfcGridPlacement, IfcGroup, IfcHalfSpaceSolid, IfcHatchLineDistanceSelect, IfcHeatExchangerType, IfcHeatExchangerTypeEnum, IfcHeatFluxDensityMeasure, IfcHeatingValueMeasure, IfcHourInDay, IfcHumidifierType, IfcHumidifierTypeEnum, IfcHygroscopicMaterialProperties, IfcIShapeProfileDef, IfcIdentifier, IfcIlluminanceMeasure, IfcImageTexture, IfcInductanceMeasure, IfcInteger, IfcIntegerCountRateMeasure, IfcInternalOrExternalEnum, IfcInventory, IfcInventoryTypeEnum, IfcIonConcentrationMeasure, IfcIrregularTimeSeries, IfcIrregularTimeSeriesValue, IfcIsothermalMoistureCapacityMeasure, IfcJunctionBoxType, IfcJunctionBoxTypeEnum, IfcKinematicViscosityMeasure, IfcLShapeProfileDef, IfcLabel, IfcLaborResource, IfcLampType, IfcLampTypeEnum, IfcLayerSetDirectionEnum, IfcLayeredItem, IfcLengthMeasure, IfcLibraryInformation, IfcLibraryReference, IfcLibrarySelect, IfcLightDistributionCurveEnum, IfcLightDistributionData, IfcLightDistributionDataSourceSelect, IfcLightEmissionSourceEnum, IfcLightFixtureType, IfcLightFixtureTypeEnum, IfcLightIntensityDistribution, IfcLightSource, IfcLightSourceAmbient, IfcLightSourceDirectional, IfcLightSourceGoniometric, IfcLightSourcePositional, IfcLightSourceSpot, IfcLine, IfcLinearDimension, IfcLinearForceMeasure, IfcLinearMomentMeasure, IfcLinearStiffnessMeasure, IfcLinearVelocityMeasure, IfcLoadGroupTypeEnum, IfcLocalPlacement, IfcLocalTime, IfcLogical, IfcLogicalOperatorEnum, IfcLoop, IfcLuminousFluxMeasure, IfcLuminousIntensityDistributionMeasure, IfcLuminousIntensityMeasure, IfcMagneticFluxDensityMeasure, IfcMagneticFluxMeasure, IfcManifoldSolidBrep, IfcMappedItem, IfcMassDensityMeasure, IfcMassFlowRateMeasure, IfcMassMeasure, IfcMassPerLengthMeasure, IfcMaterial, IfcMaterialClassificationRelationship, IfcMaterialDefinitionRepresentation, IfcMaterialLayer, IfcMaterialLayerSet, IfcMaterialLayerSetUsage, IfcMaterialList, IfcMaterialProperties, IfcMaterialSelect, IfcMeasureValue, IfcMeasureWithUnit, IfcMechanicalConcreteMaterialProperties, IfcMechanicalFastener, IfcMechanicalFastenerType, IfcMechanicalMaterialProperties, IfcMechanicalSteelMaterialProperties, IfcMember, IfcMemberType, IfcMemberTypeEnum, IfcMetric, IfcMetricValueSelect, IfcMinuteInHour, IfcModulusOfElasticityMeasure, IfcModulusOfLinearSubgradeReactionMeasure, IfcModulusOfRotationalSubgradeReactionMeasure, IfcModulusOfSubgradeReactionMeasure, IfcMoistureDiffusivityMeasure, IfcMolecularWeightMeasure, IfcMomentOfInertiaMeasure, IfcMonetaryMeasure, IfcMonetaryUnit, IfcMonthInYearNumber, IfcMotorConnectionType, IfcMotorConnectionTypeEnum, IfcMove, IfcNamedUnit, IfcNormalisedRatioMeasure, IfcNullStyle, IfcNumericMeasure, IfcObject, IfcObjectDefinition, IfcObjectPlacement, IfcObjectReferenceSelect, IfcObjectTypeEnum, IfcObjective, IfcObjectiveEnum, IfcOccupant, IfcOccupantTypeEnum, IfcOffsetCurve2D, IfcOffsetCurve3D, IfcOneDirectionRepeatFactor, IfcOpenShell, IfcOpeningElement, IfcOpticalMaterialProperties, IfcOrderAction, IfcOrganization, IfcOrganizationRelationship, IfcOrientationSelect, IfcOrientedEdge, IfcOutletType, IfcOutletTypeEnum, IfcOwnerHistory, IfcPHMeasure, IfcParameterValue, IfcParameterizedProfileDef, IfcPath, IfcPerformanceHistory, IfcPermeableCoveringOperationEnum, IfcPermeableCoveringProperties, IfcPermit, IfcPerson, IfcPersonAndOrganization, IfcPhysicalComplexQuantity, IfcPhysicalOrVirtualEnum, IfcPhysicalQuantity, IfcPhysicalSimpleQuantity, IfcPile, IfcPileConstructionEnum, IfcPileTypeEnum, IfcPipeFittingType, IfcPipeFittingTypeEnum, IfcPipeSegmentType, IfcPipeSegmentTypeEnum, IfcPixelTexture, IfcPlacement, IfcPlanarBox, IfcPlanarExtent, IfcPlanarForceMeasure, IfcPlane, IfcPlaneAngleMeasure, IfcPlate, IfcPlateType, IfcPlateTypeEnum, IfcPoint, IfcPointOnCurve, IfcPointOnSurface, IfcPointOrVertexPoint, IfcPolyLoop, IfcPolygonalBoundedHalfSpace, IfcPolyline, IfcPort, IfcPositiveLengthMeasure, IfcPositivePlaneAngleMeasure, IfcPositiveRatioMeasure, IfcPostalAddress, IfcPowerMeasure, IfcPreDefinedColour, IfcPreDefinedCurveFont, IfcPreDefinedDimensionSymbol, IfcPreDefinedItem, IfcPreDefinedPointMarkerSymbol, IfcPreDefinedSymbol, IfcPreDefinedTerminatorSymbol, IfcPreDefinedTextFont, IfcPresentableText, IfcPresentationLayerAssignment, IfcPresentationLayerWithStyle, IfcPresentationStyle, IfcPresentationStyleAssignment, IfcPresentationStyleSelect, IfcPressureMeasure, IfcProcedure, IfcProcedureTypeEnum, IfcProcess, IfcProduct, IfcProductDefinitionShape, IfcProductRepresentation, IfcProductsOfCombustionProperties, IfcProfileDef, IfcProfileProperties, IfcProfileTypeEnum, IfcProject, IfcProjectOrder, IfcProjectOrderRecord, IfcProjectOrderRecordTypeEnum, IfcProjectOrderTypeEnum, IfcProjectedOrTrueLengthEnum, IfcProjectionCurve, IfcProjectionElement, IfcProperty, IfcPropertyBoundedValue, IfcPropertyConstraintRelationship, IfcPropertyDefinition, IfcPropertyDependencyRelationship, IfcPropertyEnumeratedValue, IfcPropertyEnumeration, IfcPropertyListValue, IfcPropertyReferenceValue, IfcPropertySet, IfcPropertySetDefinition, IfcPropertySingleValue, IfcPropertySourceEnum, IfcPropertyTableValue, IfcProtectiveDeviceType, IfcProtectiveDeviceTypeEnum, IfcProxy, IfcPumpType, IfcPumpTypeEnum, IfcQuantityArea, IfcQuantityCount, IfcQuantityLength, IfcQuantityTime, IfcQuantityVolume, IfcQuantityWeight, IfcRadioActivityMeasure, IfcRadiusDimension, IfcRailing, IfcRailingType, IfcRailingTypeEnum, IfcRamp, IfcRampFlight, IfcRampFlightType, IfcRampFlightTypeEnum, IfcRampTypeEnum, IfcRatioMeasure, IfcRationalBezierCurve, IfcReal, IfcRectangleHollowProfileDef, IfcRectangleProfileDef, IfcRectangularPyramid, IfcRectangularTrimmedSurface, IfcReferencesValueDocument, IfcReflectanceMethodEnum, IfcRegularTimeSeries, IfcReinforcementBarProperties, IfcReinforcementDefinitionProperties, IfcReinforcingBar, IfcReinforcingBarRoleEnum, IfcReinforcingBarSurfaceEnum, IfcReinforcingElement, IfcReinforcingMesh, IfcRelAggregates, IfcRelAssigns, IfcRelAssignsTasks, IfcRelAssignsToActor, IfcRelAssignsToControl, IfcRelAssignsToGroup, IfcRelAssignsToProcess, IfcRelAssignsToProduct, IfcRelAssignsToProjectOrder, IfcRelAssignsToResource, IfcRelAssociates, IfcRelAssociatesAppliedValue, IfcRelAssociatesApproval, IfcRelAssociatesClassification, IfcRelAssociatesConstraint, IfcRelAssociatesDocument, IfcRelAssociatesLibrary, IfcRelAssociatesMaterial, IfcRelAssociatesProfileProperties, IfcRelConnects, IfcRelConnectsElements, IfcRelConnectsPathElements, IfcRelConnectsPortToElement, IfcRelConnectsPorts, IfcRelConnectsStructuralActivity, IfcRelConnectsStructuralElement, IfcRelConnectsStructuralMember, IfcRelConnectsWithEccentricity, IfcRelConnectsWithRealizingElements, IfcRelContainedInSpatialStructure, IfcRelCoversBldgElements, IfcRelCoversSpaces, IfcRelDecomposes, IfcRelDefines, IfcRelDefinesByProperties, IfcRelDefinesByType, IfcRelFillsElement, IfcRelFlowControlElements, IfcRelInteractionRequirements, IfcRelNests, IfcRelOccupiesSpaces, IfcRelOverridesProperties, IfcRelProjectsElement, IfcRelReferencedInSpatialStructure, IfcRelSchedulesCostItems, IfcRelSequence, IfcRelServicesBuildings, IfcRelSpaceBoundary, IfcRelVoidsElement, IfcRelationship, IfcRelaxation, IfcRepresentation, IfcRepresentationContext, IfcRepresentationItem, IfcRepresentationMap, IfcResource, IfcResourceConsumptionEnum, IfcRevolvedAreaSolid, IfcRibPlateDirectionEnum, IfcRibPlateProfileProperties, IfcRightCircularCone, IfcRightCircularCylinder, IfcRoleEnum, IfcRoof, IfcRoofTypeEnum, IfcRoot, IfcRotationalFrequencyMeasure, IfcRotationalMassMeasure, IfcRotationalStiffnessMeasure, IfcRoundedEdgeFeature, IfcRoundedRectangleProfileDef, IfcSIPrefix, IfcSIUnit, IfcSIUnitName, IfcSanitaryTerminalType, IfcSanitaryTerminalTypeEnum, IfcScheduleTimeControl, IfcSecondInMinute, IfcSectionModulusMeasure, IfcSectionProperties, IfcSectionReinforcementProperties, IfcSectionTypeEnum, IfcSectionalAreaIntegralMeasure, IfcSectionedSpine, IfcSensorType, IfcSensorTypeEnum, IfcSequenceEnum, IfcServiceLife, IfcServiceLifeFactor, IfcServiceLifeFactorTypeEnum, IfcServiceLifeTypeEnum, IfcShapeAspect, IfcShapeModel, IfcShapeRepresentation, IfcShearModulusMeasure, IfcShell, IfcShellBasedSurfaceModel, IfcSimpleProperty, IfcSimpleValue, IfcSite, IfcSizeSelect, IfcSlab, IfcSlabType, IfcSlabTypeEnum, IfcSlippageConnectionCondition, IfcSolidAngleMeasure, IfcSolidModel, IfcSoundPowerMeasure, IfcSoundPressureMeasure, IfcSoundProperties, IfcSoundScaleEnum, IfcSoundValue, IfcSpace, IfcSpaceHeaterType, IfcSpaceHeaterTypeEnum, IfcSpaceProgram, IfcSpaceThermalLoadProperties, IfcSpaceType, IfcSpaceTypeEnum, IfcSpatialStructureElement, IfcSpatialStructureElementType, IfcSpecificHeatCapacityMeasure, IfcSpecularExponent, IfcSpecularHighlightSelect, IfcSpecularRoughness, IfcSphere, IfcStackTerminalType, IfcStackTerminalTypeEnum, IfcStair, IfcStairFlight, IfcStairFlightType, IfcStairFlightTypeEnum, IfcStairTypeEnum, IfcStateEnum, IfcStructuralAction, IfcStructuralActivity, IfcStructuralActivityAssignmentSelect, IfcStructuralAnalysisModel, IfcStructuralConnection, IfcStructuralConnectionCondition, IfcStructuralCurveConnection, IfcStructuralCurveMember, IfcStructuralCurveMemberVarying, IfcStructuralCurveTypeEnum, IfcStructuralItem, IfcStructuralLinearAction, IfcStructuralLinearActionVarying, IfcStructuralLoad, IfcStructuralLoadGroup, IfcStructuralLoadLinearForce, IfcStructuralLoadPlanarForce, IfcStructuralLoadSingleDisplacement, IfcStructuralLoadSingleDisplacementDistortion, IfcStructuralLoadSingleForce, IfcStructuralLoadSingleForceWarping, IfcStructuralLoadStatic, IfcStructuralLoadTemperature, IfcStructuralMember, IfcStructuralPlanarAction, IfcStructuralPlanarActionVarying, IfcStructuralPointAction, IfcStructuralPointConnection, IfcStructuralPointReaction, IfcStructuralProfileProperties, IfcStructuralReaction, IfcStructuralResultGroup, IfcStructuralSteelProfileProperties, IfcStructuralSurfaceConnection, IfcStructuralSurfaceMember, IfcStructuralSurfaceMemberVarying, IfcStructuralSurfaceTypeEnum, IfcStructuredDimensionCallout, IfcStyleModel, IfcStyledItem, IfcStyledRepresentation, IfcSubContractResource, IfcSubedge, IfcSurface, IfcSurfaceCurveSweptAreaSolid, IfcSurfaceOfLinearExtrusion, IfcSurfaceOfRevolution, IfcSurfaceOrFaceSurface, IfcSurfaceSide, IfcSurfaceStyle, IfcSurfaceStyleElementSelect, IfcSurfaceStyleLighting, IfcSurfaceStyleRefraction, IfcSurfaceStyleRendering, IfcSurfaceStyleShading, IfcSurfaceStyleWithTextures, IfcSurfaceTexture, IfcSurfaceTextureEnum, IfcSweptAreaSolid, IfcSweptDiskSolid, IfcSweptSurface, IfcSwitchingDeviceType, IfcSwitchingDeviceTypeEnum, IfcSymbolStyle, IfcSymbolStyleSelect, IfcSystem, IfcSystemFurnitureElementType, IfcTShapeProfileDef, IfcTable, IfcTableRow, IfcTankType, IfcTankTypeEnum, IfcTask, IfcTelecomAddress, IfcTemperatureGradientMeasure, IfcTendon, IfcTendonAnchor, IfcTendonTypeEnum, IfcTerminatorSymbol, IfcText, IfcTextAlignment, IfcTextDecoration, IfcTextFontName, IfcTextFontSelect, IfcTextLiteral, IfcTextLiteralWithExtent, IfcTextPath, IfcTextStyle, IfcTextStyleFontModel, IfcTextStyleForDefinedFont, IfcTextStyleSelect, IfcTextStyleTextModel, IfcTextStyleWithBoxCharacteristics, IfcTextTransformation, IfcTextureCoordinate, IfcTextureCoordinateGenerator, IfcTextureMap, IfcTextureVertex, IfcThermalAdmittanceMeasure, IfcThermalConductivityMeasure, IfcThermalExpansionCoefficientMeasure, IfcThermalLoadSourceEnum, IfcThermalLoadTypeEnum, IfcThermalMaterialProperties, IfcThermalResistanceMeasure, IfcThermalTransmittanceMeasure, IfcThermodynamicTemperatureMeasure, IfcTimeMeasure, IfcTimeSeries, IfcTimeSeriesDataTypeEnum, IfcTimeSeriesReferenceRelationship, IfcTimeSeriesSchedule, IfcTimeSeriesScheduleTypeEnum, IfcTimeSeriesValue, IfcTimeStamp, IfcTopologicalRepresentationItem, IfcTopologyRepresentation, IfcTorqueMeasure, IfcTransformerType, IfcTransformerTypeEnum, IfcTransitionCode, IfcTransportElement, IfcTransportElementType, IfcTransportElementTypeEnum, IfcTrapeziumProfileDef, IfcTrimmedCurve, IfcTrimmingPreference, IfcTrimmingSelect, IfcTubeBundleType, IfcTubeBundleTypeEnum, IfcTwoDirectionRepeatFactor, IfcTypeObject, IfcTypeProduct, IfcUShapeProfileDef, IfcUnit, IfcUnitAssignment, IfcUnitEnum, IfcUnitaryEquipmentType, IfcUnitaryEquipmentTypeEnum, IfcValue, IfcValveType, IfcValveTypeEnum, IfcVaporPermeabilityMeasure, IfcVector, IfcVectorOrDirection, IfcVertex, IfcVertexBasedTextureMap, IfcVertexLoop, IfcVertexPoint, IfcVibrationIsolatorType, IfcVibrationIsolatorTypeEnum, IfcVirtualElement, IfcVirtualGridIntersection, IfcVolumeMeasure, IfcVolumetricFlowRateMeasure, IfcWall, IfcWallStandardCase, IfcWallType, IfcWallTypeEnum, IfcWarpingConstantMeasure, IfcWarpingMomentMeasure, IfcWasteTerminalType, IfcWasteTerminalTypeEnum, IfcWaterProperties, IfcWindow, IfcWindowLiningProperties, IfcWindowPanelOperationEnum, IfcWindowPanelPositionEnum, IfcWindowPanelProperties, IfcWindowStyle, IfcWindowStyleConstructionEnum, IfcWindowStyleOperationEnum, IfcWorkControl, IfcWorkControlTypeEnum, IfcWorkPlan, IfcWorkSchedule, IfcYearNumber, IfcZShapeProfileDef, IfcZone, ALL
+        Ifc2DCompositeCurve, IfcAbsorbedDoseMeasure, IfcAccelerationMeasure, IfcActionRequest, IfcActionSourceTypeEnum, IfcActionTypeEnum, IfcActor, IfcActorRole, IfcActorSelect, IfcActuatorType, IfcActuatorTypeEnum, IfcAddress, IfcAddressTypeEnum, IfcAheadOrBehind, IfcAirTerminalBoxType, IfcAirTerminalBoxTypeEnum, IfcAirTerminalType, IfcAirTerminalTypeEnum, IfcAirToAirHeatRecoveryType, IfcAirToAirHeatRecoveryTypeEnum, IfcAlarmType, IfcAlarmTypeEnum, IfcAmountOfSubstanceMeasure, IfcAnalysisModelTypeEnum, IfcAnalysisTheoryTypeEnum, IfcAngularDimension, IfcAngularVelocityMeasure, IfcAnnotation, IfcAnnotationCurveOccurrence, IfcAnnotationFillArea, IfcAnnotationFillAreaOccurrence, IfcAnnotationOccurrence, IfcAnnotationSurface, IfcAnnotationSurfaceOccurrence, IfcAnnotationSymbolOccurrence, IfcAnnotationTextOccurrence, IfcApplication, IfcAppliedValue, IfcAppliedValueRelationship, IfcAppliedValueSelect, IfcApproval, IfcApprovalActorRelationship, IfcApprovalPropertyRelationship, IfcApprovalRelationship, IfcArbitraryClosedProfileDef, IfcArbitraryOpenProfileDef, IfcArbitraryProfileDefWithVoids, IfcAreaMeasure, IfcArithmeticOperatorEnum, IfcAssemblyPlaceEnum, IfcAsset, IfcAsymmetricIShapeProfileDef, IfcAxis1Placement, IfcAxis2Placement, IfcAxis2Placement2D, IfcAxis2Placement3D, IfcBSplineCurve, IfcBSplineCurveForm, IfcBeam, IfcBeamType, IfcBeamTypeEnum, IfcBenchmarkEnum, IfcBezierCurve, IfcBlobTexture, IfcBlock, IfcBoilerType, IfcBoilerTypeEnum, IfcBoolean, IfcBooleanClippingResult, IfcBooleanOperand, IfcBooleanOperator, IfcBooleanResult, IfcBoundaryCondition, IfcBoundaryEdgeCondition, IfcBoundaryFaceCondition, IfcBoundaryNodeCondition, IfcBoundaryNodeConditionWarping, IfcBoundedCurve, IfcBoundedSurface, IfcBoundingBox, IfcBoxAlignment, IfcBoxedHalfSpace, IfcBuilding, IfcBuildingElement, IfcBuildingElementComponent, IfcBuildingElementPart, IfcBuildingElementProxy, IfcBuildingElementProxyType, IfcBuildingElementProxyTypeEnum, IfcBuildingElementType, IfcBuildingStorey, IfcCShapeProfileDef, IfcCableCarrierFittingType, IfcCableCarrierFittingTypeEnum, IfcCableCarrierSegmentType, IfcCableCarrierSegmentTypeEnum, IfcCableSegmentType, IfcCableSegmentTypeEnum, IfcCalendarDate, IfcCartesianPoint, IfcCartesianTransformationOperator, IfcCartesianTransformationOperator2D, IfcCartesianTransformationOperator2DnonUniform, IfcCartesianTransformationOperator3D, IfcCartesianTransformationOperator3DnonUniform, IfcCenterLineProfileDef, IfcChamferEdgeFeature, IfcChangeActionEnum, IfcCharacterStyleSelect, IfcChillerType, IfcChillerTypeEnum, IfcCircle, IfcCircleHollowProfileDef, IfcCircleProfileDef, IfcClassification, IfcClassificationItem, IfcClassificationItemRelationship, IfcClassificationNotation, IfcClassificationNotationFacet, IfcClassificationNotationSelect, IfcClassificationReference, IfcClosedShell, IfcCoilType, IfcCoilTypeEnum, IfcColour, IfcColourOrFactor, IfcColourRgb, IfcColourSpecification, IfcColumn, IfcColumnType, IfcColumnTypeEnum, IfcComplexNumber, IfcComplexProperty, IfcCompositeCurve, IfcCompositeCurveSegment, IfcCompositeProfileDef, IfcCompoundPlaneAngleMeasure, IfcCompressorType, IfcCompressorTypeEnum, IfcCondenserType, IfcCondenserTypeEnum, IfcCondition, IfcConditionCriterion, IfcConditionCriterionSelect, IfcConic, IfcConnectedFaceSet, IfcConnectionCurveGeometry, IfcConnectionGeometry, IfcConnectionPointEccentricity, IfcConnectionPointGeometry, IfcConnectionPortGeometry, IfcConnectionSurfaceGeometry, IfcConnectionTypeEnum, IfcConstraint, IfcConstraintAggregationRelationship, IfcConstraintClassificationRelationship, IfcConstraintEnum, IfcConstraintRelationship, IfcConstructionEquipmentResource, IfcConstructionMaterialResource, IfcConstructionProductResource, IfcConstructionResource, IfcContextDependentMeasure, IfcContextDependentUnit, IfcControl, IfcControllerType, IfcControllerTypeEnum, IfcConversionBasedUnit, IfcCooledBeamType, IfcCooledBeamTypeEnum, IfcCoolingTowerType, IfcCoolingTowerTypeEnum, IfcCoordinatedUniversalTimeOffset, IfcCostItem, IfcCostSchedule, IfcCostScheduleTypeEnum, IfcCostValue, IfcCountMeasure, IfcCovering, IfcCoveringType, IfcCoveringTypeEnum, IfcCraneRailAShapeProfileDef, IfcCraneRailFShapeProfileDef, IfcCrewResource, IfcCsgPrimitive3D, IfcCsgSelect, IfcCsgSolid, IfcCurrencyEnum, IfcCurrencyRelationship, IfcCurtainWall, IfcCurtainWallType, IfcCurtainWallTypeEnum, IfcCurvatureMeasure, IfcCurve, IfcCurveBoundedPlane, IfcCurveFontOrScaledCurveFontSelect, IfcCurveOrEdgeCurve, IfcCurveStyle, IfcCurveStyleFont, IfcCurveStyleFontAndScaling, IfcCurveStyleFontPattern, IfcCurveStyleFontSelect, IfcDamperType, IfcDamperTypeEnum, IfcDataOriginEnum, IfcDateAndTime, IfcDateTimeSelect, IfcDayInMonthNumber, IfcDaylightSavingHour, IfcDefinedSymbol, IfcDefinedSymbolSelect, IfcDerivedMeasureValue, IfcDerivedProfileDef, IfcDerivedUnit, IfcDerivedUnitElement, IfcDerivedUnitEnum, IfcDescriptiveMeasure, IfcDiameterDimension, IfcDimensionCalloutRelationship, IfcDimensionCount, IfcDimensionCurve, IfcDimensionCurveDirectedCallout, IfcDimensionCurveTerminator, IfcDimensionExtentUsage, IfcDimensionPair, IfcDimensionalExponents, IfcDirection, IfcDirectionSenseEnum, IfcDiscreteAccessory, IfcDiscreteAccessoryType, IfcDistributionChamberElement, IfcDistributionChamberElementType, IfcDistributionChamberElementTypeEnum, IfcDistributionControlElement, IfcDistributionControlElementType, IfcDistributionElement, IfcDistributionElementType, IfcDistributionFlowElement, IfcDistributionFlowElementType, IfcDistributionPort, IfcDocumentConfidentialityEnum, IfcDocumentElectronicFormat, IfcDocumentInformation, IfcDocumentInformationRelationship, IfcDocumentReference, IfcDocumentSelect, IfcDocumentStatusEnum, IfcDoor, IfcDoorLiningProperties, IfcDoorPanelOperationEnum, IfcDoorPanelPositionEnum, IfcDoorPanelProperties, IfcDoorStyle, IfcDoorStyleConstructionEnum, IfcDoorStyleOperationEnum, IfcDoseEquivalentMeasure, IfcDraughtingCallout, IfcDraughtingCalloutElement, IfcDraughtingCalloutRelationship, IfcDraughtingPreDefinedColour, IfcDraughtingPreDefinedCurveFont, IfcDraughtingPreDefinedTextFont, IfcDuctFittingType, IfcDuctFittingTypeEnum, IfcDuctSegmentType, IfcDuctSegmentTypeEnum, IfcDuctSilencerType, IfcDuctSilencerTypeEnum, IfcDynamicViscosityMeasure, IfcEdge, IfcEdgeCurve, IfcEdgeFeature, IfcEdgeLoop, IfcElectricApplianceType, IfcElectricApplianceTypeEnum, IfcElectricCapacitanceMeasure, IfcElectricChargeMeasure, IfcElectricConductanceMeasure, IfcElectricCurrentEnum, IfcElectricCurrentMeasure, IfcElectricDistributionPoint, IfcElectricDistributionPointFunctionEnum, IfcElectricFlowStorageDeviceType, IfcElectricFlowStorageDeviceTypeEnum, IfcElectricGeneratorType, IfcElectricGeneratorTypeEnum, IfcElectricHeaterType, IfcElectricHeaterTypeEnum, IfcElectricMotorType, IfcElectricMotorTypeEnum, IfcElectricResistanceMeasure, IfcElectricTimeControlType, IfcElectricTimeControlTypeEnum, IfcElectricVoltageMeasure, IfcElectricalBaseProperties, IfcElectricalCircuit, IfcElectricalElement, IfcElement, IfcElementAssembly, IfcElementAssemblyTypeEnum, IfcElementComponent, IfcElementComponentType, IfcElementCompositionEnum, IfcElementQuantity, IfcElementType, IfcElementarySurface, IfcEllipse, IfcEllipseProfileDef, IfcEnergyConversionDevice, IfcEnergyConversionDeviceType, IfcEnergyMeasure, IfcEnergyProperties, IfcEnergySequenceEnum, IfcEnvironmentalImpactCategoryEnum, IfcEnvironmentalImpactValue, IfcEquipmentElement, IfcEquipmentStandard, IfcEvaporativeCoolerType, IfcEvaporativeCoolerTypeEnum, IfcEvaporatorType, IfcEvaporatorTypeEnum, IfcExtendedMaterialProperties, IfcExternalReference, IfcExternallyDefinedHatchStyle, IfcExternallyDefinedSurfaceStyle, IfcExternallyDefinedSymbol, IfcExternallyDefinedTextFont, IfcExtrudedAreaSolid, IfcFace, IfcFaceBasedSurfaceModel, IfcFaceBound, IfcFaceOuterBound, IfcFaceSurface, IfcFacetedBrep, IfcFacetedBrepWithVoids, IfcFailureConnectionCondition, IfcFanType, IfcFanTypeEnum, IfcFastener, IfcFastenerType, IfcFeatureElement, IfcFeatureElementAddition, IfcFeatureElementSubtraction, IfcFillAreaStyle, IfcFillAreaStyleHatching, IfcFillAreaStyleTileShapeSelect, IfcFillAreaStyleTileSymbolWithStyle, IfcFillAreaStyleTiles, IfcFillStyleSelect, IfcFilterType, IfcFilterTypeEnum, IfcFireSuppressionTerminalType, IfcFireSuppressionTerminalTypeEnum, IfcFlowController, IfcFlowControllerType, IfcFlowDirectionEnum, IfcFlowFitting, IfcFlowFittingType, IfcFlowInstrumentType, IfcFlowInstrumentTypeEnum, IfcFlowMeterType, IfcFlowMeterTypeEnum, IfcFlowMovingDevice, IfcFlowMovingDeviceType, IfcFlowSegment, IfcFlowSegmentType, IfcFlowStorageDevice, IfcFlowStorageDeviceType, IfcFlowTerminal, IfcFlowTerminalType, IfcFlowTreatmentDevice, IfcFlowTreatmentDeviceType, IfcFluidFlowProperties, IfcFontStyle, IfcFontVariant, IfcFontWeight, IfcFooting, IfcFootingTypeEnum, IfcForceMeasure, IfcFrequencyMeasure, IfcFuelProperties, IfcFurnishingElement, IfcFurnishingElementType, IfcFurnitureStandard, IfcFurnitureType, IfcGasTerminalType, IfcGasTerminalTypeEnum, IfcGeneralMaterialProperties, IfcGeneralProfileProperties, IfcGeometricCurveSet, IfcGeometricProjectionEnum, IfcGeometricRepresentationContext, IfcGeometricRepresentationItem, IfcGeometricRepresentationSubContext, IfcGeometricSet, IfcGeometricSetSelect, IfcGlobalOrLocalEnum, IfcGloballyUniqueId, IfcGrid, IfcGridAxis, IfcGridPlacement, IfcGroup, IfcHalfSpaceSolid, IfcHatchLineDistanceSelect, IfcHeatExchangerType, IfcHeatExchangerTypeEnum, IfcHeatFluxDensityMeasure, IfcHeatingValueMeasure, IfcHourInDay, IfcHumidifierType, IfcHumidifierTypeEnum, IfcHygroscopicMaterialProperties, IfcIShapeProfileDef, IfcIdentifier, IfcIlluminanceMeasure, IfcImageTexture, IfcInductanceMeasure, IfcInteger, IfcIntegerCountRateMeasure, IfcInternalOrExternalEnum, IfcInventory, IfcInventoryTypeEnum, IfcIonConcentrationMeasure, IfcIrregularTimeSeries, IfcIrregularTimeSeriesValue, IfcIsothermalMoistureCapacityMeasure, IfcJunctionBoxType, IfcJunctionBoxTypeEnum, IfcKinematicViscosityMeasure, IfcLShapeProfileDef, IfcLabel, IfcLaborResource, IfcLampType, IfcLampTypeEnum, IfcLayerSetDirectionEnum, IfcLayeredItem, IfcLengthMeasure, IfcLibraryInformation, IfcLibraryReference, IfcLibrarySelect, IfcLightDistributionCurveEnum, IfcLightDistributionData, IfcLightDistributionDataSourceSelect, IfcLightEmissionSourceEnum, IfcLightFixtureType, IfcLightFixtureTypeEnum, IfcLightIntensityDistribution, IfcLightSource, IfcLightSourceAmbient, IfcLightSourceDirectional, IfcLightSourceGoniometric, IfcLightSourcePositional, IfcLightSourceSpot, IfcLine, IfcLinearDimension, IfcLinearForceMeasure, IfcLinearMomentMeasure, IfcLinearStiffnessMeasure, IfcLinearVelocityMeasure, IfcLoadGroupTypeEnum, IfcLocalPlacement, IfcLocalTime, IfcLogical, IfcLogicalOperatorEnum, IfcLoop, IfcLuminousFluxMeasure, IfcLuminousIntensityDistributionMeasure, IfcLuminousIntensityMeasure, IfcMagneticFluxDensityMeasure, IfcMagneticFluxMeasure, IfcManifoldSolidBrep, IfcMappedItem, IfcMassDensityMeasure, IfcMassFlowRateMeasure, IfcMassMeasure, IfcMassPerLengthMeasure, IfcMaterial, IfcMaterialClassificationRelationship, IfcMaterialDefinitionRepresentation, IfcMaterialLayer, IfcMaterialLayerSet, IfcMaterialLayerSetUsage, IfcMaterialList, IfcMaterialProperties, IfcMaterialSelect, IfcMeasureValue, IfcMeasureWithUnit, IfcMechanicalConcreteMaterialProperties, IfcMechanicalFastener, IfcMechanicalFastenerType, IfcMechanicalMaterialProperties, IfcMechanicalSteelMaterialProperties, IfcMember, IfcMemberType, IfcMemberTypeEnum, IfcMetric, IfcMetricValueSelect, IfcMinuteInHour, IfcModulusOfElasticityMeasure, IfcModulusOfLinearSubgradeReactionMeasure, IfcModulusOfRotationalSubgradeReactionMeasure, IfcModulusOfSubgradeReactionMeasure, IfcMoistureDiffusivityMeasure, IfcMolecularWeightMeasure, IfcMomentOfInertiaMeasure, IfcMonetaryMeasure, IfcMonetaryUnit, IfcMonthInYearNumber, IfcMotorConnectionType, IfcMotorConnectionTypeEnum, IfcMove, IfcNamedUnit, IfcNormalisedRatioMeasure, IfcNullStyle, IfcNumericMeasure, IfcObject, IfcObjectDefinition, IfcObjectPlacement, IfcObjectReferenceSelect, IfcObjectTypeEnum, IfcObjective, IfcObjectiveEnum, IfcOccupant, IfcOccupantTypeEnum, IfcOffsetCurve2D, IfcOffsetCurve3D, IfcOneDirectionRepeatFactor, IfcOpenShell, IfcOpeningElement, IfcOpticalMaterialProperties, IfcOrderAction, IfcOrganization, IfcOrganizationRelationship, IfcOrientationSelect, IfcOrientedEdge, IfcOutletType, IfcOutletTypeEnum, IfcOwnerHistory, IfcPHMeasure, IfcParameterValue, IfcParameterizedProfileDef, IfcPath, IfcPerformanceHistory, IfcPermeableCoveringOperationEnum, IfcPermeableCoveringProperties, IfcPermit, IfcPerson, IfcPersonAndOrganization, IfcPhysicalComplexQuantity, IfcPhysicalOrVirtualEnum, IfcPhysicalQuantity, IfcPhysicalSimpleQuantity, IfcPile, IfcPileConstructionEnum, IfcPileTypeEnum, IfcPipeFittingType, IfcPipeFittingTypeEnum, IfcPipeSegmentType, IfcPipeSegmentTypeEnum, IfcPixelTexture, IfcPlacement, IfcPlanarBox, IfcPlanarExtent, IfcPlanarForceMeasure, IfcPlane, IfcPlaneAngleMeasure, IfcPlate, IfcPlateType, IfcPlateTypeEnum, IfcPoint, IfcPointOnCurve, IfcPointOnSurface, IfcPointOrVertexPoint, IfcPolyLoop, IfcPolygonalBoundedHalfSpace, IfcPolyline, IfcPort, IfcPositiveLengthMeasure, IfcPositivePlaneAngleMeasure, IfcPositiveRatioMeasure, IfcPostalAddress, IfcPowerMeasure, IfcPreDefinedColour, IfcPreDefinedCurveFont, IfcPreDefinedDimensionSymbol, IfcPreDefinedItem, IfcPreDefinedPointMarkerSymbol, IfcPreDefinedSymbol, IfcPreDefinedTerminatorSymbol, IfcPreDefinedTextFont, IfcPresentableText, IfcPresentationLayerAssignment, IfcPresentationLayerWithStyle, IfcPresentationStyle, IfcPresentationStyleAssignment, IfcPresentationStyleSelect, IfcPressureMeasure, IfcProcedure, IfcProcedureTypeEnum, IfcProcess, IfcProduct, IfcProductDefinitionShape, IfcProductRepresentation, IfcProductsOfCombustionProperties, IfcProfileDef, IfcProfileProperties, IfcProfileTypeEnum, IfcProject, IfcProjectOrder, IfcProjectOrderRecord, IfcProjectOrderRecordTypeEnum, IfcProjectOrderTypeEnum, IfcProjectedOrTrueLengthEnum, IfcProjectionCurve, IfcProjectionElement, IfcProperty, IfcPropertyBoundedValue, IfcPropertyConstraintRelationship, IfcPropertyDefinition, IfcPropertyDependencyRelationship, IfcPropertyEnumeratedValue, IfcPropertyEnumeration, IfcPropertyListValue, IfcPropertyReferenceValue, IfcPropertySet, IfcPropertySetDefinition, IfcPropertySingleValue, IfcPropertySourceEnum, IfcPropertyTableValue, IfcProtectiveDeviceType, IfcProtectiveDeviceTypeEnum, IfcProxy, IfcPumpType, IfcPumpTypeEnum, IfcQuantityArea, IfcQuantityCount, IfcQuantityLength, IfcQuantityTime, IfcQuantityVolume, IfcQuantityWeight, IfcRadioActivityMeasure, IfcRadiusDimension, IfcRailing, IfcRailingType, IfcRailingTypeEnum, IfcRamp, IfcRampFlight, IfcRampFlightType, IfcRampFlightTypeEnum, IfcRampTypeEnum, IfcRatioMeasure, IfcRationalBezierCurve, IfcReal, IfcRectangleHollowProfileDef, IfcRectangleProfileDef, IfcRectangularPyramid, IfcRectangularTrimmedSurface, IfcReferencesValueDocument, IfcReflectanceMethodEnum, IfcRegularTimeSeries, IfcReinforcementBarProperties, IfcReinforcementDefinitionProperties, IfcReinforcingBar, IfcReinforcingBarRoleEnum, IfcReinforcingBarSurfaceEnum, IfcReinforcingElement, IfcReinforcingMesh, IfcRelAggregates, IfcRelAssigns, IfcRelAssignsTasks, IfcRelAssignsToActor, IfcRelAssignsToControl, IfcRelAssignsToGroup, IfcRelAssignsToProcess, IfcRelAssignsToProduct, IfcRelAssignsToProjectOrder, IfcRelAssignsToResource, IfcRelAssociates, IfcRelAssociatesAppliedValue, IfcRelAssociatesApproval, IfcRelAssociatesClassification, IfcRelAssociatesConstraint, IfcRelAssociatesDocument, IfcRelAssociatesLibrary, IfcRelAssociatesMaterial, IfcRelAssociatesProfileProperties, IfcRelConnects, IfcRelConnectsElements, IfcRelConnectsPathElements, IfcRelConnectsPortToElement, IfcRelConnectsPorts, IfcRelConnectsStructuralActivity, IfcRelConnectsStructuralElement, IfcRelConnectsStructuralMember, IfcRelConnectsWithEccentricity, IfcRelConnectsWithRealizingElements, IfcRelContainedInSpatialStructure, IfcRelCoversBldgElements, IfcRelCoversSpaces, IfcRelDecomposes, IfcRelDefines, IfcRelDefinesByProperties, IfcRelDefinesByType, IfcRelFillsElement, IfcRelFlowControlElements, IfcRelInteractionRequirements, IfcRelNests, IfcRelOccupiesSpaces, IfcRelOverridesProperties, IfcRelProjectsElement, IfcRelReferencedInSpatialStructure, IfcRelSchedulesCostItems, IfcRelSequence, IfcRelServicesBuildings, IfcRelSpaceBoundary, IfcRelVoidsElement, IfcRelationship, IfcRelaxation, IfcRepresentation, IfcRepresentationContext, IfcRepresentationItem, IfcRepresentationMap, IfcResource, IfcResourceConsumptionEnum, IfcRevolvedAreaSolid, IfcRibPlateDirectionEnum, IfcRibPlateProfileProperties, IfcRightCircularCone, IfcRightCircularCylinder, IfcRoleEnum, IfcRoof, IfcRoofTypeEnum, IfcRoot, IfcRotationalFrequencyMeasure, IfcRotationalMassMeasure, IfcRotationalStiffnessMeasure, IfcRoundedEdgeFeature, IfcRoundedRectangleProfileDef, IfcSIPrefix, IfcSIUnit, IfcSIUnitName, IfcSanitaryTerminalType, IfcSanitaryTerminalTypeEnum, IfcScheduleTimeControl, IfcSecondInMinute, IfcSectionModulusMeasure, IfcSectionProperties, IfcSectionReinforcementProperties, IfcSectionTypeEnum, IfcSectionalAreaIntegralMeasure, IfcSectionedSpine, IfcSensorType, IfcSensorTypeEnum, IfcSequenceEnum, IfcServiceLife, IfcServiceLifeFactor, IfcServiceLifeFactorTypeEnum, IfcServiceLifeTypeEnum, IfcShapeAspect, IfcShapeModel, IfcShapeRepresentation, IfcShearModulusMeasure, IfcShell, IfcShellBasedSurfaceModel, IfcSimpleProperty, IfcSimpleValue, IfcSite, IfcSizeSelect, IfcSlab, IfcSlabType, IfcSlabTypeEnum, IfcSlippageConnectionCondition, IfcSolidAngleMeasure, IfcSolidModel, IfcSoundPowerMeasure, IfcSoundPressureMeasure, IfcSoundProperties, IfcSoundScaleEnum, IfcSoundValue, IfcSpace, IfcSpaceHeaterType, IfcSpaceHeaterTypeEnum, IfcSpaceProgram, IfcSpaceThermalLoadProperties, IfcSpaceType, IfcSpaceTypeEnum, IfcSpatialStructureElement, IfcSpatialStructureElementType, IfcSpecificHeatCapacityMeasure, IfcSpecularExponent, IfcSpecularHighlightSelect, IfcSpecularRoughness, IfcSphere, IfcStackTerminalType, IfcStackTerminalTypeEnum, IfcStair, IfcStairFlight, IfcStairFlightType, IfcStairFlightTypeEnum, IfcStairTypeEnum, IfcStateEnum, IfcStructuralAction, IfcStructuralActivity, IfcStructuralActivityAssignmentSelect, IfcStructuralAnalysisModel, IfcStructuralConnection, IfcStructuralConnectionCondition, IfcStructuralCurveConnection, IfcStructuralCurveMember, IfcStructuralCurveMemberVarying, IfcStructuralCurveTypeEnum, IfcStructuralItem, IfcStructuralLinearAction, IfcStructuralLinearActionVarying, IfcStructuralLoad, IfcStructuralLoadGroup, IfcStructuralLoadLinearForce, IfcStructuralLoadPlanarForce, IfcStructuralLoadSingleDisplacement, IfcStructuralLoadSingleDisplacementDistortion, IfcStructuralLoadSingleForce, IfcStructuralLoadSingleForceWarping, IfcStructuralLoadStatic, IfcStructuralLoadTemperature, IfcStructuralMember, IfcStructuralPlanarAction, IfcStructuralPlanarActionVarying, IfcStructuralPointAction, IfcStructuralPointConnection, IfcStructuralPointReaction, IfcStructuralProfileProperties, IfcStructuralReaction, IfcStructuralResultGroup, IfcStructuralSteelProfileProperties, IfcStructuralSurfaceConnection, IfcStructuralSurfaceMember, IfcStructuralSurfaceMemberVarying, IfcStructuralSurfaceTypeEnum, IfcStructuredDimensionCallout, IfcStyleModel, IfcStyledItem, IfcStyledRepresentation, IfcSubContractResource, IfcSubedge, IfcSurface, IfcSurfaceCurveSweptAreaSolid, IfcSurfaceOfLinearExtrusion, IfcSurfaceOfRevolution, IfcSurfaceOrFaceSurface, IfcSurfaceSide, IfcSurfaceStyle, IfcSurfaceStyleElementSelect, IfcSurfaceStyleLighting, IfcSurfaceStyleRefraction, IfcSurfaceStyleRendering, IfcSurfaceStyleShading, IfcSurfaceStyleWithTextures, IfcSurfaceTexture, IfcSurfaceTextureEnum, IfcSweptAreaSolid, IfcSweptDiskSolid, IfcSweptSurface, IfcSwitchingDeviceType, IfcSwitchingDeviceTypeEnum, IfcSymbolStyle, IfcSymbolStyleSelect, IfcSystem, IfcSystemFurnitureElementType, IfcTShapeProfileDef, IfcTable, IfcTableRow, IfcTankType, IfcTankTypeEnum, IfcTask, IfcTelecomAddress, IfcTemperatureGradientMeasure, IfcTendon, IfcTendonAnchor, IfcTendonTypeEnum, IfcTerminatorSymbol, IfcText, IfcTextAlignment, IfcTextDecoration, IfcTextFontName, IfcTextFontSelect, IfcTextLiteral, IfcTextLiteralWithExtent, IfcTextPath, IfcTextStyle, IfcTextStyleFontModel, IfcTextStyleForDefinedFont, IfcTextStyleSelect, IfcTextStyleTextModel, IfcTextStyleWithBoxCharacteristics, IfcTextTransformation, IfcTextureCoordinate, IfcTextureCoordinateGenerator, IfcTextureMap, IfcTextureVertex, IfcThermalAdmittanceMeasure, IfcThermalConductivityMeasure, IfcThermalExpansionCoefficientMeasure, IfcThermalLoadSourceEnum, IfcThermalLoadTypeEnum, IfcThermalMaterialProperties, IfcThermalResistanceMeasure, IfcThermalTransmittanceMeasure, IfcThermodynamicTemperatureMeasure, IfcTimeMeasure, IfcTimeSeries, IfcTimeSeriesDataTypeEnum, IfcTimeSeriesReferenceRelationship, IfcTimeSeriesSchedule, IfcTimeSeriesScheduleTypeEnum, IfcTimeSeriesValue, IfcTimeStamp, IfcTopologicalRepresentationItem, IfcTopologyRepresentation, IfcTorqueMeasure, IfcTransformerType, IfcTransformerTypeEnum, IfcTransitionCode, IfcTransportElement, IfcTransportElementType, IfcTransportElementTypeEnum, IfcTrapeziumProfileDef, IfcTrimmedCurve, IfcTrimmingPreference, IfcTrimmingSelect, IfcTubeBundleType, IfcTubeBundleTypeEnum, IfcTwoDirectionRepeatFactor, IfcTypeObject, IfcTypeProduct, IfcUShapeProfileDef, IfcUnit, IfcUnitAssignment, IfcUnitEnum, IfcUnitaryEquipmentType, IfcUnitaryEquipmentTypeEnum, IfcValue, IfcValveType, IfcValveTypeEnum, IfcVaporPermeabilityMeasure, IfcVector, IfcVectorOrDirection, IfcVertex, IfcVertexBasedTextureMap, IfcVertexLoop, IfcVertexPoint, IfcVibrationIsolatorType, IfcVibrationIsolatorTypeEnum, IfcVirtualElement, IfcVirtualGridIntersection, IfcVolumeMeasure, IfcVolumetricFlowRateMeasure, IfcWall, IfcWallStandardCase, IfcWallType, IfcWallTypeEnum, IfcWarpingConstantMeasure, IfcWarpingMomentMeasure, IfcWasteTerminalType, IfcWasteTerminalTypeEnum, IfcWaterProperties, IfcWindow, IfcWindowLiningProperties, IfcWindowPanelOperationEnum, IfcWindowPanelPositionEnum, IfcWindowPanelProperties, IfcWindowStyle, IfcWindowStyleConstructionEnum, IfcWindowStyleOperationEnum, IfcWorkControl, IfcWorkControlTypeEnum, IfcWorkPlan, IfcWorkSchedule, IfcYearNumber, IfcZShapeProfileDef, IfcZone, UNDEFINED
     } Enum;
     Enum Parent(Enum v);
     Enum FromString(const std::string& s);
diff --git a/src/ifcparse/Ifc4-rt.cpp b/src/ifcparse/Ifc4-latebound.cpp
similarity index 77%
rename from src/ifcparse/Ifc4-rt.cpp
rename to src/ifcparse/Ifc4-latebound.cpp
index 5e726b1..3164ba5 100644
--- a/src/ifcparse/Ifc4-rt.cpp
+++ b/src/ifcparse/Ifc4-latebound.cpp
@@ -23,11 +23,13 @@
  * but instead modify the python script that has been used to generate this.    *
  *                                                                              *
  ********************************************************************************/
- 
+
 #ifdef USE_IFC4
 
+#include <set>
+
 #include "../ifcparse/Ifc4.h"
-#include "../ifcparse/Ifc4-rt.h"
+#include "../ifcparse/Ifc4-latebound.h"
 #include "../ifcparse/IfcException.h"
 #include "../ifcparse/IfcWrite.h"
 #include "../ifcparse/IfcWritableEntity.h"
@@ -39,9 +41,21 @@ using namespace IfcParse;
 using namespace IfcWrite;
 using namespace IfcUtil;
 
-std::map<Type::Enum,IfcEntityDescriptor*> entity_descriptor_map;
-std::map<Type::Enum,IfcEnumerationDescriptor*> enumeration_descriptor_map;
-std::map<std::pair<Type::Enum, std::string>, std::pair<Type::Enum, int> > inverse_map;
+typedef std::map<Type::Enum,IfcEntityDescriptor*> entity_descriptor_map_t;
+typedef std::map<Type::Enum,IfcEnumerationDescriptor*> enumeration_descriptor_map_t;
+typedef std::map<Type::Enum, std::map<std::string, std::pair<Type::Enum, int> > > inverse_map_t;
+typedef std::map<Type::Enum,std::set<int> > derived_map_t;
+
+entity_descriptor_map_t entity_descriptor_map;
+enumeration_descriptor_map_t enumeration_descriptor_map;
+inverse_map_t inverse_map;
+derived_map_t derived_map;
+
+
+#ifdef _MSC_VER
+#  pragma optimize( "", off )
+#endif
+
 void InitDescriptorMap() {
     IfcEntityDescriptor* current;
     current = entity_descriptor_map[Type::IfcAbsorbedDoseMeasure] = new IfcEntityDescriptor(Type::IfcAbsorbedDoseMeasure,0);
@@ -298,110 +312,110 @@ void InitDescriptorMap() {
     current->add("wrappedValue",false,IfcUtil::Argument_DOUBLE);
     current = entity_descriptor_map[Type::IfcActorRole] = new IfcEntityDescriptor(Type::IfcActorRole,0);
     current->add("Role",false,IfcUtil::Argument_ENUMERATION,Type::IfcRoleEnum);
-    current->add("UserDefinedRole",true,IfcUtil::Argument_STRING);
-    current->add("Description",true,IfcUtil::Argument_STRING);
+    current->add("UserDefinedRole",true,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("Description",true,IfcUtil::Argument_STRING,Type::IfcText);
     current = entity_descriptor_map[Type::IfcAddress] = new IfcEntityDescriptor(Type::IfcAddress,0);
     current->add("Purpose",true,IfcUtil::Argument_ENUMERATION,Type::IfcAddressTypeEnum);
-    current->add("Description",true,IfcUtil::Argument_STRING);
-    current->add("UserDefinedPurpose",true,IfcUtil::Argument_STRING);
+    current->add("Description",true,IfcUtil::Argument_STRING,Type::IfcText);
+    current->add("UserDefinedPurpose",true,IfcUtil::Argument_STRING,Type::IfcLabel);
     current = entity_descriptor_map[Type::IfcApplication] = new IfcEntityDescriptor(Type::IfcApplication,0);
-    current->add("ApplicationDeveloper",false,IfcUtil::Argument_ENTITY);
-    current->add("Version",false,IfcUtil::Argument_STRING);
-    current->add("ApplicationFullName",false,IfcUtil::Argument_STRING);
-    current->add("ApplicationIdentifier",false,IfcUtil::Argument_STRING);
+    current->add("ApplicationDeveloper",false,IfcUtil::Argument_ENTITY,Type::IfcOrganization);
+    current->add("Version",false,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("ApplicationFullName",false,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("ApplicationIdentifier",false,IfcUtil::Argument_STRING,Type::IfcIdentifier);
     current = entity_descriptor_map[Type::IfcAppliedValue] = new IfcEntityDescriptor(Type::IfcAppliedValue,0);
-    current->add("Name",true,IfcUtil::Argument_STRING);
-    current->add("Description",true,IfcUtil::Argument_STRING);
-    current->add("AppliedValue",true,IfcUtil::Argument_ENTITY);
-    current->add("UnitBasis",true,IfcUtil::Argument_ENTITY);
-    current->add("ApplicableDate",true,IfcUtil::Argument_STRING);
-    current->add("FixedUntilDate",true,IfcUtil::Argument_STRING);
-    current->add("Category",true,IfcUtil::Argument_STRING);
-    current->add("Condition",true,IfcUtil::Argument_STRING);
+    current->add("Name",true,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("Description",true,IfcUtil::Argument_STRING,Type::IfcText);
+    current->add("AppliedValue",true,IfcUtil::Argument_ENTITY,Type::IfcAppliedValueSelect);
+    current->add("UnitBasis",true,IfcUtil::Argument_ENTITY,Type::IfcMeasureWithUnit);
+    current->add("ApplicableDate",true,IfcUtil::Argument_STRING,Type::IfcDate);
+    current->add("FixedUntilDate",true,IfcUtil::Argument_STRING,Type::IfcDate);
+    current->add("Category",true,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("Condition",true,IfcUtil::Argument_STRING,Type::IfcLabel);
     current->add("ArithmeticOperator",true,IfcUtil::Argument_ENUMERATION,Type::IfcArithmeticOperatorEnum);
-    current->add("Components",true,IfcUtil::Argument_ENTITY_LIST);
+    current->add("Components",true,IfcUtil::Argument_ENTITY_LIST,Type::IfcAppliedValue);
     current = entity_descriptor_map[Type::IfcApproval] = new IfcEntityDescriptor(Type::IfcApproval,0);
-    current->add("Identifier",true,IfcUtil::Argument_STRING);
-    current->add("Name",true,IfcUtil::Argument_STRING);
-    current->add("Description",true,IfcUtil::Argument_STRING);
-    current->add("TimeOfApproval",true,IfcUtil::Argument_STRING);
-    current->add("Status",true,IfcUtil::Argument_STRING);
-    current->add("Level",true,IfcUtil::Argument_STRING);
-    current->add("Qualifier",true,IfcUtil::Argument_STRING);
-    current->add("RequestingApproval",true,IfcUtil::Argument_ENTITY);
-    current->add("GivingApproval",true,IfcUtil::Argument_ENTITY);
+    current->add("Identifier",true,IfcUtil::Argument_STRING,Type::IfcIdentifier);
+    current->add("Name",true,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("Description",true,IfcUtil::Argument_STRING,Type::IfcText);
+    current->add("TimeOfApproval",true,IfcUtil::Argument_STRING,Type::IfcDateTime);
+    current->add("Status",true,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("Level",true,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("Qualifier",true,IfcUtil::Argument_STRING,Type::IfcText);
+    current->add("RequestingApproval",true,IfcUtil::Argument_ENTITY,Type::IfcActorSelect);
+    current->add("GivingApproval",true,IfcUtil::Argument_ENTITY,Type::IfcActorSelect);
     current = entity_descriptor_map[Type::IfcBoundaryCondition] = new IfcEntityDescriptor(Type::IfcBoundaryCondition,0);
-    current->add("Name",true,IfcUtil::Argument_STRING);
+    current->add("Name",true,IfcUtil::Argument_STRING,Type::IfcLabel);
     current = entity_descriptor_map[Type::IfcBoundaryEdgeCondition] = new IfcEntityDescriptor(Type::IfcBoundaryEdgeCondition,entity_descriptor_map.find(Type::IfcBoundaryCondition)->second);
-    current->add("TranslationalStiffnessByLengthX",true,IfcUtil::Argument_ENTITY);
-    current->add("TranslationalStiffnessByLengthY",true,IfcUtil::Argument_ENTITY);
-    current->add("TranslationalStiffnessByLengthZ",true,IfcUtil::Argument_ENTITY);
-    current->add("RotationalStiffnessByLengthX",true,IfcUtil::Argument_ENTITY);
-    current->add("RotationalStiffnessByLengthY",true,IfcUtil::Argument_ENTITY);
-    current->add("RotationalStiffnessByLengthZ",true,IfcUtil::Argument_ENTITY);
+    current->add("TranslationalStiffnessByLengthX",true,IfcUtil::Argument_ENTITY,Type::IfcModulusOfTranslationalSubgradeReactionSelect);
+    current->add("TranslationalStiffnessByLengthY",true,IfcUtil::Argument_ENTITY,Type::IfcModulusOfTranslationalSubgradeReactionSelect);
+    current->add("TranslationalStiffnessByLengthZ",true,IfcUtil::Argument_ENTITY,Type::IfcModulusOfTranslationalSubgradeReactionSelect);
+    current->add("RotationalStiffnessByLengthX",true,IfcUtil::Argument_ENTITY,Type::IfcModulusOfRotationalSubgradeReactionSelect);
+    current->add("RotationalStiffnessByLengthY",true,IfcUtil::Argument_ENTITY,Type::IfcModulusOfRotationalSubgradeReactionSelect);
+    current->add("RotationalStiffnessByLengthZ",true,IfcUtil::Argument_ENTITY,Type::IfcModulusOfRotationalSubgradeReactionSelect);
     current = entity_descriptor_map[Type::IfcBoundaryFaceCondition] = new IfcEntityDescriptor(Type::IfcBoundaryFaceCondition,entity_descriptor_map.find(Type::IfcBoundaryCondition)->second);
-    current->add("TranslationalStiffnessByAreaX",true,IfcUtil::Argument_ENTITY);
-    current->add("TranslationalStiffnessByAreaY",true,IfcUtil::Argument_ENTITY);
-    current->add("TranslationalStiffnessByAreaZ",true,IfcUtil::Argument_ENTITY);
+    current->add("TranslationalStiffnessByAreaX",true,IfcUtil::Argument_ENTITY,Type::IfcModulusOfSubgradeReactionSelect);
+    current->add("TranslationalStiffnessByAreaY",true,IfcUtil::Argument_ENTITY,Type::IfcModulusOfSubgradeReactionSelect);
+    current->add("TranslationalStiffnessByAreaZ",true,IfcUtil::Argument_ENTITY,Type::IfcModulusOfSubgradeReactionSelect);
     current = entity_descriptor_map[Type::IfcBoundaryNodeCondition] = new IfcEntityDescriptor(Type::IfcBoundaryNodeCondition,entity_descriptor_map.find(Type::IfcBoundaryCondition)->second);
-    current->add("TranslationalStiffnessX",true,IfcUtil::Argument_ENTITY);
-    current->add("TranslationalStiffnessY",true,IfcUtil::Argument_ENTITY);
-    current->add("TranslationalStiffnessZ",true,IfcUtil::Argument_ENTITY);
-    current->add("RotationalStiffnessX",true,IfcUtil::Argument_ENTITY);
-    current->add("RotationalStiffnessY",true,IfcUtil::Argument_ENTITY);
-    current->add("RotationalStiffnessZ",true,IfcUtil::Argument_ENTITY);
+    current->add("TranslationalStiffnessX",true,IfcUtil::Argument_ENTITY,Type::IfcTranslationalStiffnessSelect);
+    current->add("TranslationalStiffnessY",true,IfcUtil::Argument_ENTITY,Type::IfcTranslationalStiffnessSelect);
+    current->add("TranslationalStiffnessZ",true,IfcUtil::Argument_ENTITY,Type::IfcTranslationalStiffnessSelect);
+    current->add("RotationalStiffnessX",true,IfcUtil::Argument_ENTITY,Type::IfcRotationalStiffnessSelect);
+    current->add("RotationalStiffnessY",true,IfcUtil::Argument_ENTITY,Type::IfcRotationalStiffnessSelect);
+    current->add("RotationalStiffnessZ",true,IfcUtil::Argument_ENTITY,Type::IfcRotationalStiffnessSelect);
     current = entity_descriptor_map[Type::IfcBoundaryNodeConditionWarping] = new IfcEntityDescriptor(Type::IfcBoundaryNodeConditionWarping,entity_descriptor_map.find(Type::IfcBoundaryNodeCondition)->second);
-    current->add("WarpingStiffness",true,IfcUtil::Argument_ENTITY);
+    current->add("WarpingStiffness",true,IfcUtil::Argument_ENTITY,Type::IfcWarpingStiffnessSelect);
     current = entity_descriptor_map[Type::IfcConnectionGeometry] = new IfcEntityDescriptor(Type::IfcConnectionGeometry,0);
 
     current = entity_descriptor_map[Type::IfcConnectionPointGeometry] = new IfcEntityDescriptor(Type::IfcConnectionPointGeometry,entity_descriptor_map.find(Type::IfcConnectionGeometry)->second);
-    current->add("PointOnRelatingElement",false,IfcUtil::Argument_ENTITY);
-    current->add("PointOnRelatedElement",true,IfcUtil::Argument_ENTITY);
+    current->add("PointOnRelatingElement",false,IfcUtil::Argument_ENTITY,Type::IfcPointOrVertexPoint);
+    current->add("PointOnRelatedElement",true,IfcUtil::Argument_ENTITY,Type::IfcPointOrVertexPoint);
     current = entity_descriptor_map[Type::IfcConnectionSurfaceGeometry] = new IfcEntityDescriptor(Type::IfcConnectionSurfaceGeometry,entity_descriptor_map.find(Type::IfcConnectionGeometry)->second);
-    current->add("SurfaceOnRelatingElement",false,IfcUtil::Argument_ENTITY);
-    current->add("SurfaceOnRelatedElement",true,IfcUtil::Argument_ENTITY);
+    current->add("SurfaceOnRelatingElement",false,IfcUtil::Argument_ENTITY,Type::IfcSurfaceOrFaceSurface);
+    current->add("SurfaceOnRelatedElement",true,IfcUtil::Argument_ENTITY,Type::IfcSurfaceOrFaceSurface);
     current = entity_descriptor_map[Type::IfcConnectionVolumeGeometry] = new IfcEntityDescriptor(Type::IfcConnectionVolumeGeometry,entity_descriptor_map.find(Type::IfcConnectionGeometry)->second);
-    current->add("VolumeOnRelatingElement",false,IfcUtil::Argument_ENTITY);
-    current->add("VolumeOnRelatedElement",true,IfcUtil::Argument_ENTITY);
+    current->add("VolumeOnRelatingElement",false,IfcUtil::Argument_ENTITY,Type::IfcSolidOrShell);
+    current->add("VolumeOnRelatedElement",true,IfcUtil::Argument_ENTITY,Type::IfcSolidOrShell);
     current = entity_descriptor_map[Type::IfcConstraint] = new IfcEntityDescriptor(Type::IfcConstraint,0);
-    current->add("Name",false,IfcUtil::Argument_STRING);
-    current->add("Description",true,IfcUtil::Argument_STRING);
+    current->add("Name",false,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("Description",true,IfcUtil::Argument_STRING,Type::IfcText);
     current->add("ConstraintGrade",false,IfcUtil::Argument_ENUMERATION,Type::IfcConstraintEnum);
-    current->add("ConstraintSource",true,IfcUtil::Argument_STRING);
-    current->add("CreatingActor",true,IfcUtil::Argument_ENTITY);
-    current->add("CreationTime",true,IfcUtil::Argument_STRING);
-    current->add("UserDefinedGrade",true,IfcUtil::Argument_STRING);
+    current->add("ConstraintSource",true,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("CreatingActor",true,IfcUtil::Argument_ENTITY,Type::IfcActorSelect);
+    current->add("CreationTime",true,IfcUtil::Argument_STRING,Type::IfcDateTime);
+    current->add("UserDefinedGrade",true,IfcUtil::Argument_STRING,Type::IfcLabel);
     current = entity_descriptor_map[Type::IfcCoordinateOperation] = new IfcEntityDescriptor(Type::IfcCoordinateOperation,0);
-    current->add("SourceCRS",false,IfcUtil::Argument_ENTITY);
-    current->add("TargetCRS",false,IfcUtil::Argument_ENTITY);
+    current->add("SourceCRS",false,IfcUtil::Argument_ENTITY,Type::IfcCoordinateReferenceSystemSelect);
+    current->add("TargetCRS",false,IfcUtil::Argument_ENTITY,Type::IfcCoordinateReferenceSystem);
     current = entity_descriptor_map[Type::IfcCoordinateReferenceSystem] = new IfcEntityDescriptor(Type::IfcCoordinateReferenceSystem,0);
-    current->add("Name",true,IfcUtil::Argument_STRING);
-    current->add("Description",true,IfcUtil::Argument_STRING);
-    current->add("GeodeticDatum",false,IfcUtil::Argument_STRING);
-    current->add("VerticalDatum",true,IfcUtil::Argument_STRING);
+    current->add("Name",true,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("Description",true,IfcUtil::Argument_STRING,Type::IfcText);
+    current->add("GeodeticDatum",false,IfcUtil::Argument_STRING,Type::IfcIdentifier);
+    current->add("VerticalDatum",true,IfcUtil::Argument_STRING,Type::IfcIdentifier);
     current = entity_descriptor_map[Type::IfcCostValue] = new IfcEntityDescriptor(Type::IfcCostValue,entity_descriptor_map.find(Type::IfcAppliedValue)->second);
 
     current = entity_descriptor_map[Type::IfcDerivedUnit] = new IfcEntityDescriptor(Type::IfcDerivedUnit,0);
-    current->add("Elements",false,IfcUtil::Argument_ENTITY_LIST);
+    current->add("Elements",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcDerivedUnitElement);
     current->add("UnitType",false,IfcUtil::Argument_ENUMERATION,Type::IfcDerivedUnitEnum);
-    current->add("UserDefinedType",true,IfcUtil::Argument_STRING);
+    current->add("UserDefinedType",true,IfcUtil::Argument_STRING,Type::IfcLabel);
     current = entity_descriptor_map[Type::IfcDerivedUnitElement] = new IfcEntityDescriptor(Type::IfcDerivedUnitElement,0);
-    current->add("Unit",false,IfcUtil::Argument_ENTITY);
-    current->add("Exponent",false,IfcUtil::Argument_INT);
+    current->add("Unit",false,IfcUtil::Argument_ENTITY,Type::IfcNamedUnit);
+    current->add("Exponent",false,IfcUtil::Argument_INT,Type::UNDEFINED);
     current = entity_descriptor_map[Type::IfcDimensionalExponents] = new IfcEntityDescriptor(Type::IfcDimensionalExponents,0);
-    current->add("LengthExponent",false,IfcUtil::Argument_INT);
-    current->add("MassExponent",false,IfcUtil::Argument_INT);
-    current->add("TimeExponent",false,IfcUtil::Argument_INT);
-    current->add("ElectricCurrentExponent",false,IfcUtil::Argument_INT);
-    current->add("ThermodynamicTemperatureExponent",false,IfcUtil::Argument_INT);
-    current->add("AmountOfSubstanceExponent",false,IfcUtil::Argument_INT);
-    current->add("LuminousIntensityExponent",false,IfcUtil::Argument_INT);
+    current->add("LengthExponent",false,IfcUtil::Argument_INT,Type::UNDEFINED);
+    current->add("MassExponent",false,IfcUtil::Argument_INT,Type::UNDEFINED);
+    current->add("TimeExponent",false,IfcUtil::Argument_INT,Type::UNDEFINED);
+    current->add("ElectricCurrentExponent",false,IfcUtil::Argument_INT,Type::UNDEFINED);
+    current->add("ThermodynamicTemperatureExponent",false,IfcUtil::Argument_INT,Type::UNDEFINED);
+    current->add("AmountOfSubstanceExponent",false,IfcUtil::Argument_INT,Type::UNDEFINED);
+    current->add("LuminousIntensityExponent",false,IfcUtil::Argument_INT,Type::UNDEFINED);
     current = entity_descriptor_map[Type::IfcExternalInformation] = new IfcEntityDescriptor(Type::IfcExternalInformation,0);
 
     current = entity_descriptor_map[Type::IfcExternalReference] = new IfcEntityDescriptor(Type::IfcExternalReference,0);
-    current->add("Location",true,IfcUtil::Argument_STRING);
-    current->add("Identification",true,IfcUtil::Argument_STRING);
-    current->add("Name",true,IfcUtil::Argument_STRING);
+    current->add("Location",true,IfcUtil::Argument_STRING,Type::IfcURIReference);
+    current->add("Identification",true,IfcUtil::Argument_STRING,Type::IfcIdentifier);
+    current->add("Name",true,IfcUtil::Argument_STRING,Type::IfcLabel);
     current = entity_descriptor_map[Type::IfcExternallyDefinedHatchStyle] = new IfcEntityDescriptor(Type::IfcExternallyDefinedHatchStyle,entity_descriptor_map.find(Type::IfcExternalReference)->second);
 
     current = entity_descriptor_map[Type::IfcExternallyDefinedSurfaceStyle] = new IfcEntityDescriptor(Type::IfcExternallyDefinedSurfaceStyle,entity_descriptor_map.find(Type::IfcExternalReference)->second);
@@ -409,629 +423,629 @@ void InitDescriptorMap() {
     current = entity_descriptor_map[Type::IfcExternallyDefinedTextFont] = new IfcEntityDescriptor(Type::IfcExternallyDefinedTextFont,entity_descriptor_map.find(Type::IfcExternalReference)->second);
 
     current = entity_descriptor_map[Type::IfcGridAxis] = new IfcEntityDescriptor(Type::IfcGridAxis,0);
-    current->add("AxisTag",true,IfcUtil::Argument_STRING);
-    current->add("AxisCurve",false,IfcUtil::Argument_ENTITY);
-    current->add("SameSense",false,IfcUtil::Argument_BOOL);
+    current->add("AxisTag",true,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("AxisCurve",false,IfcUtil::Argument_ENTITY,Type::IfcCurve);
+    current->add("SameSense",false,IfcUtil::Argument_BOOL,Type::IfcBoolean);
     current = entity_descriptor_map[Type::IfcIrregularTimeSeriesValue] = new IfcEntityDescriptor(Type::IfcIrregularTimeSeriesValue,0);
-    current->add("TimeStamp",false,IfcUtil::Argument_STRING);
-    current->add("ListValues",false,IfcUtil::Argument_ENTITY_LIST);
+    current->add("TimeStamp",false,IfcUtil::Argument_STRING,Type::IfcDateTime);
+    current->add("ListValues",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcValue);
     current = entity_descriptor_map[Type::IfcLibraryInformation] = new IfcEntityDescriptor(Type::IfcLibraryInformation,entity_descriptor_map.find(Type::IfcExternalInformation)->second);
-    current->add("Name",false,IfcUtil::Argument_STRING);
-    current->add("Version",true,IfcUtil::Argument_STRING);
-    current->add("Publisher",true,IfcUtil::Argument_ENTITY);
-    current->add("VersionDate",true,IfcUtil::Argument_STRING);
-    current->add("Location",true,IfcUtil::Argument_STRING);
-    current->add("Description",true,IfcUtil::Argument_STRING);
+    current->add("Name",false,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("Version",true,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("Publisher",true,IfcUtil::Argument_ENTITY,Type::IfcActorSelect);
+    current->add("VersionDate",true,IfcUtil::Argument_STRING,Type::IfcDateTime);
+    current->add("Location",true,IfcUtil::Argument_STRING,Type::IfcURIReference);
+    current->add("Description",true,IfcUtil::Argument_STRING,Type::IfcText);
     current = entity_descriptor_map[Type::IfcLibraryReference] = new IfcEntityDescriptor(Type::IfcLibraryReference,entity_descriptor_map.find(Type::IfcExternalReference)->second);
-    current->add("Description",true,IfcUtil::Argument_STRING);
-    current->add("Language",true,IfcUtil::Argument_STRING);
-    current->add("ReferencedLibrary",true,IfcUtil::Argument_ENTITY);
+    current->add("Description",true,IfcUtil::Argument_STRING,Type::IfcText);
+    current->add("Language",true,IfcUtil::Argument_STRING,Type::IfcLanguageId);
+    current->add("ReferencedLibrary",true,IfcUtil::Argument_ENTITY,Type::IfcLibraryInformation);
     current = entity_descriptor_map[Type::IfcLightDistributionData] = new IfcEntityDescriptor(Type::IfcLightDistributionData,0);
-    current->add("MainPlaneAngle",false,IfcUtil::Argument_DOUBLE);
-    current->add("SecondaryPlaneAngle",false,IfcUtil::Argument_VECTOR_DOUBLE);
-    current->add("LuminousIntensity",false,IfcUtil::Argument_VECTOR_DOUBLE);
+    current->add("MainPlaneAngle",false,IfcUtil::Argument_DOUBLE,Type::IfcPlaneAngleMeasure);
+    current->add("SecondaryPlaneAngle",false,IfcUtil::Argument_VECTOR_DOUBLE,Type::IfcPlaneAngleMeasure);
+    current->add("LuminousIntensity",false,IfcUtil::Argument_VECTOR_DOUBLE,Type::IfcLuminousIntensityDistributionMeasure);
     current = entity_descriptor_map[Type::IfcLightIntensityDistribution] = new IfcEntityDescriptor(Type::IfcLightIntensityDistribution,0);
     current->add("LightDistributionCurve",false,IfcUtil::Argument_ENUMERATION,Type::IfcLightDistributionCurveEnum);
-    current->add("DistributionData",false,IfcUtil::Argument_ENTITY_LIST);
+    current->add("DistributionData",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcLightDistributionData);
     current = entity_descriptor_map[Type::IfcMapConversion] = new IfcEntityDescriptor(Type::IfcMapConversion,entity_descriptor_map.find(Type::IfcCoordinateOperation)->second);
-    current->add("Eastings",false,IfcUtil::Argument_DOUBLE);
-    current->add("Northings",false,IfcUtil::Argument_DOUBLE);
-    current->add("OrthogonalHeight",false,IfcUtil::Argument_DOUBLE);
-    current->add("XAxisAbscissa",true,IfcUtil::Argument_DOUBLE);
-    current->add("XAxisOrdinate",true,IfcUtil::Argument_DOUBLE);
-    current->add("Scale",true,IfcUtil::Argument_DOUBLE);
+    current->add("Eastings",false,IfcUtil::Argument_DOUBLE,Type::IfcLengthMeasure);
+    current->add("Northings",false,IfcUtil::Argument_DOUBLE,Type::IfcLengthMeasure);
+    current->add("OrthogonalHeight",false,IfcUtil::Argument_DOUBLE,Type::IfcLengthMeasure);
+    current->add("XAxisAbscissa",true,IfcUtil::Argument_DOUBLE,Type::IfcReal);
+    current->add("XAxisOrdinate",true,IfcUtil::Argument_DOUBLE,Type::IfcReal);
+    current->add("Scale",true,IfcUtil::Argument_DOUBLE,Type::IfcReal);
     current = entity_descriptor_map[Type::IfcMaterialClassificationRelationship] = new IfcEntityDescriptor(Type::IfcMaterialClassificationRelationship,0);
-    current->add("MaterialClassifications",false,IfcUtil::Argument_ENTITY_LIST);
-    current->add("ClassifiedMaterial",false,IfcUtil::Argument_ENTITY);
+    current->add("MaterialClassifications",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcClassificationSelect);
+    current->add("ClassifiedMaterial",false,IfcUtil::Argument_ENTITY,Type::IfcMaterial);
     current = entity_descriptor_map[Type::IfcMaterialDefinition] = new IfcEntityDescriptor(Type::IfcMaterialDefinition,0);
 
     current = entity_descriptor_map[Type::IfcMaterialLayer] = new IfcEntityDescriptor(Type::IfcMaterialLayer,entity_descriptor_map.find(Type::IfcMaterialDefinition)->second);
-    current->add("Material",true,IfcUtil::Argument_ENTITY);
-    current->add("LayerThickness",false,IfcUtil::Argument_DOUBLE);
-    current->add("IsVentilated",true,IfcUtil::Argument_BOOL);
-    current->add("Name",true,IfcUtil::Argument_STRING);
-    current->add("Description",true,IfcUtil::Argument_STRING);
-    current->add("Category",true,IfcUtil::Argument_STRING);
-    current->add("Priority",true,IfcUtil::Argument_DOUBLE);
+    current->add("Material",true,IfcUtil::Argument_ENTITY,Type::IfcMaterial);
+    current->add("LayerThickness",false,IfcUtil::Argument_DOUBLE,Type::IfcNonNegativeLengthMeasure);
+    current->add("IsVentilated",true,IfcUtil::Argument_BOOL,Type::IfcLogical);
+    current->add("Name",true,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("Description",true,IfcUtil::Argument_STRING,Type::IfcText);
+    current->add("Category",true,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("Priority",true,IfcUtil::Argument_DOUBLE,Type::IfcNormalisedRatioMeasure);
     current = entity_descriptor_map[Type::IfcMaterialLayerSet] = new IfcEntityDescriptor(Type::IfcMaterialLayerSet,entity_descriptor_map.find(Type::IfcMaterialDefinition)->second);
-    current->add("MaterialLayers",false,IfcUtil::Argument_ENTITY_LIST);
-    current->add("LayerSetName",true,IfcUtil::Argument_STRING);
-    current->add("Description",true,IfcUtil::Argument_STRING);
+    current->add("MaterialLayers",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcMaterialLayer);
+    current->add("LayerSetName",true,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("Description",true,IfcUtil::Argument_STRING,Type::IfcText);
     current = entity_descriptor_map[Type::IfcMaterialLayerWithOffsets] = new IfcEntityDescriptor(Type::IfcMaterialLayerWithOffsets,entity_descriptor_map.find(Type::IfcMaterialLayer)->second);
     current->add("OffsetDirection",false,IfcUtil::Argument_ENUMERATION,Type::IfcLayerSetDirectionEnum);
-    current->add("OffsetValues",false,IfcUtil::Argument_VECTOR_DOUBLE);
+    current->add("OffsetValues",false,IfcUtil::Argument_VECTOR_DOUBLE,Type::IfcLengthMeasure);
     current = entity_descriptor_map[Type::IfcMaterialList] = new IfcEntityDescriptor(Type::IfcMaterialList,0);
-    current->add("Materials",false,IfcUtil::Argument_ENTITY_LIST);
+    current->add("Materials",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcMaterial);
     current = entity_descriptor_map[Type::IfcMaterialProfile] = new IfcEntityDescriptor(Type::IfcMaterialProfile,entity_descriptor_map.find(Type::IfcMaterialDefinition)->second);
-    current->add("Name",true,IfcUtil::Argument_STRING);
-    current->add("Description",true,IfcUtil::Argument_STRING);
-    current->add("Material",true,IfcUtil::Argument_ENTITY);
-    current->add("Profile",false,IfcUtil::Argument_ENTITY);
-    current->add("Priority",true,IfcUtil::Argument_DOUBLE);
-    current->add("Category",true,IfcUtil::Argument_STRING);
+    current->add("Name",true,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("Description",true,IfcUtil::Argument_STRING,Type::IfcText);
+    current->add("Material",true,IfcUtil::Argument_ENTITY,Type::IfcMaterial);
+    current->add("Profile",false,IfcUtil::Argument_ENTITY,Type::IfcProfileDef);
+    current->add("Priority",true,IfcUtil::Argument_DOUBLE,Type::IfcNormalisedRatioMeasure);
+    current->add("Category",true,IfcUtil::Argument_STRING,Type::IfcLabel);
     current = entity_descriptor_map[Type::IfcMaterialProfileSet] = new IfcEntityDescriptor(Type::IfcMaterialProfileSet,entity_descriptor_map.find(Type::IfcMaterialDefinition)->second);
-    current->add("Name",true,IfcUtil::Argument_STRING);
-    current->add("Description",true,IfcUtil::Argument_STRING);
-    current->add("MaterialProfiles",false,IfcUtil::Argument_ENTITY_LIST);
-    current->add("CompositeProfile",true,IfcUtil::Argument_ENTITY);
+    current->add("Name",true,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("Description",true,IfcUtil::Argument_STRING,Type::IfcText);
+    current->add("MaterialProfiles",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcMaterialProfile);
+    current->add("CompositeProfile",true,IfcUtil::Argument_ENTITY,Type::IfcCompositeProfileDef);
     current = entity_descriptor_map[Type::IfcMaterialProfileWithOffsets] = new IfcEntityDescriptor(Type::IfcMaterialProfileWithOffsets,entity_descriptor_map.find(Type::IfcMaterialProfile)->second);
-    current->add("OffsetValues",false,IfcUtil::Argument_VECTOR_DOUBLE);
+    current->add("OffsetValues",false,IfcUtil::Argument_VECTOR_DOUBLE,Type::IfcLengthMeasure);
     current = entity_descriptor_map[Type::IfcMaterialUsageDefinition] = new IfcEntityDescriptor(Type::IfcMaterialUsageDefinition,0);
 
     current = entity_descriptor_map[Type::IfcMeasureWithUnit] = new IfcEntityDescriptor(Type::IfcMeasureWithUnit,0);
-    current->add("ValueComponent",false,IfcUtil::Argument_ENTITY);
-    current->add("UnitComponent",false,IfcUtil::Argument_ENTITY);
+    current->add("ValueComponent",false,IfcUtil::Argument_ENTITY,Type::IfcValue);
+    current->add("UnitComponent",false,IfcUtil::Argument_ENTITY,Type::IfcUnit);
     current = entity_descriptor_map[Type::IfcMetric] = new IfcEntityDescriptor(Type::IfcMetric,entity_descriptor_map.find(Type::IfcConstraint)->second);
     current->add("Benchmark",false,IfcUtil::Argument_ENUMERATION,Type::IfcBenchmarkEnum);
-    current->add("ValueSource",true,IfcUtil::Argument_STRING);
-    current->add("DataValue",false,IfcUtil::Argument_ENTITY);
-    current->add("ReferencePath",true,IfcUtil::Argument_ENTITY);
+    current->add("ValueSource",true,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("DataValue",false,IfcUtil::Argument_ENTITY,Type::IfcMetricValueSelect);
+    current->add("ReferencePath",true,IfcUtil::Argument_ENTITY,Type::IfcReference);
     current = entity_descriptor_map[Type::IfcMonetaryUnit] = new IfcEntityDescriptor(Type::IfcMonetaryUnit,0);
-    current->add("Currency",false,IfcUtil::Argument_STRING);
+    current->add("Currency",false,IfcUtil::Argument_STRING,Type::IfcLabel);
     current = entity_descriptor_map[Type::IfcNamedUnit] = new IfcEntityDescriptor(Type::IfcNamedUnit,0);
-    current->add("Dimensions",false,IfcUtil::Argument_ENTITY);
+    current->add("Dimensions",false,IfcUtil::Argument_ENTITY,Type::IfcDimensionalExponents);
     current->add("UnitType",false,IfcUtil::Argument_ENUMERATION,Type::IfcUnitEnum);
     current = entity_descriptor_map[Type::IfcObjectPlacement] = new IfcEntityDescriptor(Type::IfcObjectPlacement,0);
 
     current = entity_descriptor_map[Type::IfcObjective] = new IfcEntityDescriptor(Type::IfcObjective,entity_descriptor_map.find(Type::IfcConstraint)->second);
-    current->add("BenchmarkValues",true,IfcUtil::Argument_ENTITY_LIST);
+    current->add("BenchmarkValues",true,IfcUtil::Argument_ENTITY_LIST,Type::IfcConstraint);
     current->add("LogicalAggregator",true,IfcUtil::Argument_ENUMERATION,Type::IfcLogicalOperatorEnum);
     current->add("ObjectiveQualifier",false,IfcUtil::Argument_ENUMERATION,Type::IfcObjectiveEnum);
-    current->add("UserDefinedQualifier",true,IfcUtil::Argument_STRING);
+    current->add("UserDefinedQualifier",true,IfcUtil::Argument_STRING,Type::IfcLabel);
     current = entity_descriptor_map[Type::IfcOrganization] = new IfcEntityDescriptor(Type::IfcOrganization,0);
-    current->add("Identification",true,IfcUtil::Argument_STRING);
-    current->add("Name",false,IfcUtil::Argument_STRING);
-    current->add("Description",true,IfcUtil::Argument_STRING);
-    current->add("Roles",true,IfcUtil::Argument_ENTITY_LIST);
-    current->add("Addresses",true,IfcUtil::Argument_ENTITY_LIST);
+    current->add("Identification",true,IfcUtil::Argument_STRING,Type::IfcIdentifier);
+    current->add("Name",false,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("Description",true,IfcUtil::Argument_STRING,Type::IfcText);
+    current->add("Roles",true,IfcUtil::Argument_ENTITY_LIST,Type::IfcActorRole);
+    current->add("Addresses",true,IfcUtil::Argument_ENTITY_LIST,Type::IfcAddress);
     current = entity_descriptor_map[Type::IfcOwnerHistory] = new IfcEntityDescriptor(Type::IfcOwnerHistory,0);
-    current->add("OwningUser",false,IfcUtil::Argument_ENTITY);
-    current->add("OwningApplication",false,IfcUtil::Argument_ENTITY);
+    current->add("OwningUser",false,IfcUtil::Argument_ENTITY,Type::IfcPersonAndOrganization);
+    current->add("OwningApplication",false,IfcUtil::Argument_ENTITY,Type::IfcApplication);
     current->add("State",true,IfcUtil::Argument_ENUMERATION,Type::IfcStateEnum);
     current->add("ChangeAction",true,IfcUtil::Argument_ENUMERATION,Type::IfcChangeActionEnum);
-    current->add("LastModifiedDate",true,IfcUtil::Argument_INT);
-    current->add("LastModifyingUser",true,IfcUtil::Argument_ENTITY);
-    current->add("LastModifyingApplication",true,IfcUtil::Argument_ENTITY);
-    current->add("CreationDate",false,IfcUtil::Argument_INT);
+    current->add("LastModifiedDate",true,IfcUtil::Argument_INT,Type::IfcTimeStamp);
+    current->add("LastModifyingUser",true,IfcUtil::Argument_ENTITY,Type::IfcPersonAndOrganization);
+    current->add("LastModifyingApplication",true,IfcUtil::Argument_ENTITY,Type::IfcApplication);
+    current->add("CreationDate",false,IfcUtil::Argument_INT,Type::IfcTimeStamp);
     current = entity_descriptor_map[Type::IfcPerson] = new IfcEntityDescriptor(Type::IfcPerson,0);
-    current->add("Identification",true,IfcUtil::Argument_STRING);
-    current->add("FamilyName",true,IfcUtil::Argument_STRING);
-    current->add("GivenName",true,IfcUtil::Argument_STRING);
-    current->add("MiddleNames",true,IfcUtil::Argument_VECTOR_STRING);
-    current->add("PrefixTitles",true,IfcUtil::Argument_VECTOR_STRING);
-    current->add("SuffixTitles",true,IfcUtil::Argument_VECTOR_STRING);
-    current->add("Roles",true,IfcUtil::Argument_ENTITY_LIST);
-    current->add("Addresses",true,IfcUtil::Argument_ENTITY_LIST);
+    current->add("Identification",true,IfcUtil::Argument_STRING,Type::IfcIdentifier);
+    current->add("FamilyName",true,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("GivenName",true,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("MiddleNames",true,IfcUtil::Argument_VECTOR_STRING,Type::IfcLabel);
+    current->add("PrefixTitles",true,IfcUtil::Argument_VECTOR_STRING,Type::IfcLabel);
+    current->add("SuffixTitles",true,IfcUtil::Argument_VECTOR_STRING,Type::IfcLabel);
+    current->add("Roles",true,IfcUtil::Argument_ENTITY_LIST,Type::IfcActorRole);
+    current->add("Addresses",true,IfcUtil::Argument_ENTITY_LIST,Type::IfcAddress);
     current = entity_descriptor_map[Type::IfcPersonAndOrganization] = new IfcEntityDescriptor(Type::IfcPersonAndOrganization,0);
-    current->add("ThePerson",false,IfcUtil::Argument_ENTITY);
-    current->add("TheOrganization",false,IfcUtil::Argument_ENTITY);
-    current->add("Roles",true,IfcUtil::Argument_ENTITY_LIST);
+    current->add("ThePerson",false,IfcUtil::Argument_ENTITY,Type::IfcPerson);
+    current->add("TheOrganization",false,IfcUtil::Argument_ENTITY,Type::IfcOrganization);
+    current->add("Roles",true,IfcUtil::Argument_ENTITY_LIST,Type::IfcActorRole);
     current = entity_descriptor_map[Type::IfcPhysicalQuantity] = new IfcEntityDescriptor(Type::IfcPhysicalQuantity,0);
-    current->add("Name",false,IfcUtil::Argument_STRING);
-    current->add("Description",true,IfcUtil::Argument_STRING);
+    current->add("Name",false,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("Description",true,IfcUtil::Argument_STRING,Type::IfcText);
     current = entity_descriptor_map[Type::IfcPhysicalSimpleQuantity] = new IfcEntityDescriptor(Type::IfcPhysicalSimpleQuantity,entity_descriptor_map.find(Type::IfcPhysicalQuantity)->second);
-    current->add("Unit",true,IfcUtil::Argument_ENTITY);
+    current->add("Unit",true,IfcUtil::Argument_ENTITY,Type::IfcNamedUnit);
     current = entity_descriptor_map[Type::IfcPostalAddress] = new IfcEntityDescriptor(Type::IfcPostalAddress,entity_descriptor_map.find(Type::IfcAddress)->second);
-    current->add("InternalLocation",true,IfcUtil::Argument_STRING);
-    current->add("AddressLines",true,IfcUtil::Argument_VECTOR_STRING);
-    current->add("PostalBox",true,IfcUtil::Argument_STRING);
-    current->add("Town",true,IfcUtil::Argument_STRING);
-    current->add("Region",true,IfcUtil::Argument_STRING);
-    current->add("PostalCode",true,IfcUtil::Argument_STRING);
-    current->add("Country",true,IfcUtil::Argument_STRING);
+    current->add("InternalLocation",true,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("AddressLines",true,IfcUtil::Argument_VECTOR_STRING,Type::IfcLabel);
+    current->add("PostalBox",true,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("Town",true,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("Region",true,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("PostalCode",true,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("Country",true,IfcUtil::Argument_STRING,Type::IfcLabel);
     current = entity_descriptor_map[Type::IfcPresentationItem] = new IfcEntityDescriptor(Type::IfcPresentationItem,0);
 
     current = entity_descriptor_map[Type::IfcPresentationLayerAssignment] = new IfcEntityDescriptor(Type::IfcPresentationLayerAssignment,0);
-    current->add("Name",false,IfcUtil::Argument_STRING);
-    current->add("Description",true,IfcUtil::Argument_STRING);
-    current->add("AssignedItems",false,IfcUtil::Argument_ENTITY_LIST);
-    current->add("Identifier",true,IfcUtil::Argument_STRING);
+    current->add("Name",false,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("Description",true,IfcUtil::Argument_STRING,Type::IfcText);
+    current->add("AssignedItems",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcLayeredItem);
+    current->add("Identifier",true,IfcUtil::Argument_STRING,Type::IfcIdentifier);
     current = entity_descriptor_map[Type::IfcPresentationLayerWithStyle] = new IfcEntityDescriptor(Type::IfcPresentationLayerWithStyle,entity_descriptor_map.find(Type::IfcPresentationLayerAssignment)->second);
-    current->add("LayerOn",false,IfcUtil::Argument_BOOL);
-    current->add("LayerFrozen",false,IfcUtil::Argument_BOOL);
-    current->add("LayerBlocked",false,IfcUtil::Argument_BOOL);
-    current->add("LayerStyles",false,IfcUtil::Argument_ENTITY_LIST);
+    current->add("LayerOn",false,IfcUtil::Argument_BOOL,Type::UNDEFINED);
+    current->add("LayerFrozen",false,IfcUtil::Argument_BOOL,Type::UNDEFINED);
+    current->add("LayerBlocked",false,IfcUtil::Argument_BOOL,Type::UNDEFINED);
+    current->add("LayerStyles",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcPresentationStyle);
     current = entity_descriptor_map[Type::IfcPresentationStyle] = new IfcEntityDescriptor(Type::IfcPresentationStyle,0);
-    current->add("Name",true,IfcUtil::Argument_STRING);
+    current->add("Name",true,IfcUtil::Argument_STRING,Type::IfcLabel);
     current = entity_descriptor_map[Type::IfcPresentationStyleAssignment] = new IfcEntityDescriptor(Type::IfcPresentationStyleAssignment,0);
-    current->add("Styles",false,IfcUtil::Argument_ENTITY_LIST);
+    current->add("Styles",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcPresentationStyleSelect);
     current = entity_descriptor_map[Type::IfcProductRepresentation] = new IfcEntityDescriptor(Type::IfcProductRepresentation,0);
-    current->add("Name",true,IfcUtil::Argument_STRING);
-    current->add("Description",true,IfcUtil::Argument_STRING);
-    current->add("Representations",false,IfcUtil::Argument_ENTITY_LIST);
+    current->add("Name",true,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("Description",true,IfcUtil::Argument_STRING,Type::IfcText);
+    current->add("Representations",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcRepresentation);
     current = entity_descriptor_map[Type::IfcProfileDef] = new IfcEntityDescriptor(Type::IfcProfileDef,0);
     current->add("ProfileType",false,IfcUtil::Argument_ENUMERATION,Type::IfcProfileTypeEnum);
-    current->add("ProfileName",true,IfcUtil::Argument_STRING);
+    current->add("ProfileName",true,IfcUtil::Argument_STRING,Type::IfcLabel);
     current = entity_descriptor_map[Type::IfcProjectedCRS] = new IfcEntityDescriptor(Type::IfcProjectedCRS,entity_descriptor_map.find(Type::IfcCoordinateReferenceSystem)->second);
-    current->add("MapProjection",true,IfcUtil::Argument_STRING);
-    current->add("MapZone",true,IfcUtil::Argument_STRING);
-    current->add("MapUnit",true,IfcUtil::Argument_ENTITY);
+    current->add("MapProjection",true,IfcUtil::Argument_STRING,Type::IfcIdentifier);
+    current->add("MapZone",true,IfcUtil::Argument_STRING,Type::IfcIdentifier);
+    current->add("MapUnit",true,IfcUtil::Argument_ENTITY,Type::IfcNamedUnit);
     current = entity_descriptor_map[Type::IfcPropertyAbstraction] = new IfcEntityDescriptor(Type::IfcPropertyAbstraction,0);
 
     current = entity_descriptor_map[Type::IfcPropertyEnumeration] = new IfcEntityDescriptor(Type::IfcPropertyEnumeration,entity_descriptor_map.find(Type::IfcPropertyAbstraction)->second);
-    current->add("Name",false,IfcUtil::Argument_STRING);
-    current->add("EnumerationValues",false,IfcUtil::Argument_ENTITY_LIST);
-    current->add("Unit",true,IfcUtil::Argument_ENTITY);
+    current->add("Name",false,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("EnumerationValues",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcValue);
+    current->add("Unit",true,IfcUtil::Argument_ENTITY,Type::IfcUnit);
     current = entity_descriptor_map[Type::IfcQuantityArea] = new IfcEntityDescriptor(Type::IfcQuantityArea,entity_descriptor_map.find(Type::IfcPhysicalSimpleQuantity)->second);
-    current->add("AreaValue",false,IfcUtil::Argument_DOUBLE);
-    current->add("Formula",true,IfcUtil::Argument_STRING);
+    current->add("AreaValue",false,IfcUtil::Argument_DOUBLE,Type::IfcAreaMeasure);
+    current->add("Formula",true,IfcUtil::Argument_STRING,Type::IfcLabel);
     current = entity_descriptor_map[Type::IfcQuantityCount] = new IfcEntityDescriptor(Type::IfcQuantityCount,entity_descriptor_map.find(Type::IfcPhysicalSimpleQuantity)->second);
-    current->add("CountValue",false,IfcUtil::Argument_DOUBLE);
-    current->add("Formula",true,IfcUtil::Argument_STRING);
+    current->add("CountValue",false,IfcUtil::Argument_DOUBLE,Type::IfcCountMeasure);
+    current->add("Formula",true,IfcUtil::Argument_STRING,Type::IfcLabel);
     current = entity_descriptor_map[Type::IfcQuantityLength] = new IfcEntityDescriptor(Type::IfcQuantityLength,entity_descriptor_map.find(Type::IfcPhysicalSimpleQuantity)->second);
-    current->add("LengthValue",false,IfcUtil::Argument_DOUBLE);
-    current->add("Formula",true,IfcUtil::Argument_STRING);
+    current->add("LengthValue",false,IfcUtil::Argument_DOUBLE,Type::IfcLengthMeasure);
+    current->add("Formula",true,IfcUtil::Argument_STRING,Type::IfcLabel);
     current = entity_descriptor_map[Type::IfcQuantityTime] = new IfcEntityDescriptor(Type::IfcQuantityTime,entity_descriptor_map.find(Type::IfcPhysicalSimpleQuantity)->second);
-    current->add("TimeValue",false,IfcUtil::Argument_DOUBLE);
-    current->add("Formula",true,IfcUtil::Argument_STRING);
+    current->add("TimeValue",false,IfcUtil::Argument_DOUBLE,Type::IfcTimeMeasure);
+    current->add("Formula",true,IfcUtil::Argument_STRING,Type::IfcLabel);
     current = entity_descriptor_map[Type::IfcQuantityVolume] = new IfcEntityDescriptor(Type::IfcQuantityVolume,entity_descriptor_map.find(Type::IfcPhysicalSimpleQuantity)->second);
-    current->add("VolumeValue",false,IfcUtil::Argument_DOUBLE);
-    current->add("Formula",true,IfcUtil::Argument_STRING);
+    current->add("VolumeValue",false,IfcUtil::Argument_DOUBLE,Type::IfcVolumeMeasure);
+    current->add("Formula",true,IfcUtil::Argument_STRING,Type::IfcLabel);
     current = entity_descriptor_map[Type::IfcQuantityWeight] = new IfcEntityDescriptor(Type::IfcQuantityWeight,entity_descriptor_map.find(Type::IfcPhysicalSimpleQuantity)->second);
-    current->add("WeightValue",false,IfcUtil::Argument_DOUBLE);
-    current->add("Formula",true,IfcUtil::Argument_STRING);
+    current->add("WeightValue",false,IfcUtil::Argument_DOUBLE,Type::IfcMassMeasure);
+    current->add("Formula",true,IfcUtil::Argument_STRING,Type::IfcLabel);
     current = entity_descriptor_map[Type::IfcRecurrencePattern] = new IfcEntityDescriptor(Type::IfcRecurrencePattern,0);
     current->add("RecurrenceType",false,IfcUtil::Argument_ENUMERATION,Type::IfcRecurrenceTypeEnum);
-    current->add("DayComponent",true,IfcUtil::Argument_VECTOR_INT);
-    current->add("WeekdayComponent",true,IfcUtil::Argument_VECTOR_INT);
-    current->add("MonthComponent",true,IfcUtil::Argument_VECTOR_INT);
-    current->add("Position",true,IfcUtil::Argument_INT);
-    current->add("Interval",true,IfcUtil::Argument_INT);
-    current->add("Occurrences",true,IfcUtil::Argument_INT);
-    current->add("TimePeriods",true,IfcUtil::Argument_ENTITY_LIST);
+    current->add("DayComponent",true,IfcUtil::Argument_VECTOR_INT,Type::IfcDayInMonthNumber);
+    current->add("WeekdayComponent",true,IfcUtil::Argument_VECTOR_INT,Type::IfcDayInWeekNumber);
+    current->add("MonthComponent",true,IfcUtil::Argument_VECTOR_INT,Type::IfcMonthInYearNumber);
+    current->add("Position",true,IfcUtil::Argument_INT,Type::IfcInteger);
+    current->add("Interval",true,IfcUtil::Argument_INT,Type::IfcInteger);
+    current->add("Occurrences",true,IfcUtil::Argument_INT,Type::IfcInteger);
+    current->add("TimePeriods",true,IfcUtil::Argument_ENTITY_LIST,Type::IfcTimePeriod);
     current = entity_descriptor_map[Type::IfcReference] = new IfcEntityDescriptor(Type::IfcReference,0);
-    current->add("TypeIdentifier",true,IfcUtil::Argument_STRING);
-    current->add("AttributeIdentifier",true,IfcUtil::Argument_STRING);
-    current->add("InstanceName",true,IfcUtil::Argument_STRING);
-    current->add("ListPositions",true,IfcUtil::Argument_VECTOR_INT);
-    current->add("InnerReference",true,IfcUtil::Argument_ENTITY);
+    current->add("TypeIdentifier",true,IfcUtil::Argument_STRING,Type::IfcIdentifier);
+    current->add("AttributeIdentifier",true,IfcUtil::Argument_STRING,Type::IfcIdentifier);
+    current->add("InstanceName",true,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("ListPositions",true,IfcUtil::Argument_VECTOR_INT,Type::UNDEFINED);
+    current->add("InnerReference",true,IfcUtil::Argument_ENTITY,Type::IfcReference);
     current = entity_descriptor_map[Type::IfcRepresentation] = new IfcEntityDescriptor(Type::IfcRepresentation,0);
-    current->add("ContextOfItems",false,IfcUtil::Argument_ENTITY);
-    current->add("RepresentationIdentifier",true,IfcUtil::Argument_STRING);
-    current->add("RepresentationType",true,IfcUtil::Argument_STRING);
-    current->add("Items",false,IfcUtil::Argument_ENTITY_LIST);
+    current->add("ContextOfItems",false,IfcUtil::Argument_ENTITY,Type::IfcRepresentationContext);
+    current->add("RepresentationIdentifier",true,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("RepresentationType",true,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("Items",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcRepresentationItem);
     current = entity_descriptor_map[Type::IfcRepresentationContext] = new IfcEntityDescriptor(Type::IfcRepresentationContext,0);
-    current->add("ContextIdentifier",true,IfcUtil::Argument_STRING);
-    current->add("ContextType",true,IfcUtil::Argument_STRING);
+    current->add("ContextIdentifier",true,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("ContextType",true,IfcUtil::Argument_STRING,Type::IfcLabel);
     current = entity_descriptor_map[Type::IfcRepresentationItem] = new IfcEntityDescriptor(Type::IfcRepresentationItem,0);
 
     current = entity_descriptor_map[Type::IfcRepresentationMap] = new IfcEntityDescriptor(Type::IfcRepresentationMap,0);
-    current->add("MappingOrigin",false,IfcUtil::Argument_ENTITY);
-    current->add("MappedRepresentation",false,IfcUtil::Argument_ENTITY);
+    current->add("MappingOrigin",false,IfcUtil::Argument_ENTITY,Type::IfcAxis2Placement);
+    current->add("MappedRepresentation",false,IfcUtil::Argument_ENTITY,Type::IfcRepresentation);
     current = entity_descriptor_map[Type::IfcResourceLevelRelationship] = new IfcEntityDescriptor(Type::IfcResourceLevelRelationship,0);
-    current->add("Name",true,IfcUtil::Argument_STRING);
-    current->add("Description",true,IfcUtil::Argument_STRING);
+    current->add("Name",true,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("Description",true,IfcUtil::Argument_STRING,Type::IfcText);
     current = entity_descriptor_map[Type::IfcRoot] = new IfcEntityDescriptor(Type::IfcRoot,0);
-    current->add("GlobalId",false,IfcUtil::Argument_STRING);
-    current->add("OwnerHistory",true,IfcUtil::Argument_ENTITY);
-    current->add("Name",true,IfcUtil::Argument_STRING);
-    current->add("Description",true,IfcUtil::Argument_STRING);
+    current->add("GlobalId",false,IfcUtil::Argument_STRING,Type::IfcGloballyUniqueId);
+    current->add("OwnerHistory",true,IfcUtil::Argument_ENTITY,Type::IfcOwnerHistory);
+    current->add("Name",true,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("Description",true,IfcUtil::Argument_STRING,Type::IfcText);
     current = entity_descriptor_map[Type::IfcSIUnit] = new IfcEntityDescriptor(Type::IfcSIUnit,entity_descriptor_map.find(Type::IfcNamedUnit)->second);
     current->add("Prefix",true,IfcUtil::Argument_ENUMERATION,Type::IfcSIPrefix);
     current->add("Name",false,IfcUtil::Argument_ENUMERATION,Type::IfcSIUnitName);
     current = entity_descriptor_map[Type::IfcSchedulingTime] = new IfcEntityDescriptor(Type::IfcSchedulingTime,0);
-    current->add("Name",true,IfcUtil::Argument_STRING);
+    current->add("Name",true,IfcUtil::Argument_STRING,Type::IfcLabel);
     current->add("DataOrigin",true,IfcUtil::Argument_ENUMERATION,Type::IfcDataOriginEnum);
-    current->add("UserDefinedDataOrigin",true,IfcUtil::Argument_STRING);
+    current->add("UserDefinedDataOrigin",true,IfcUtil::Argument_STRING,Type::IfcLabel);
     current = entity_descriptor_map[Type::IfcShapeAspect] = new IfcEntityDescriptor(Type::IfcShapeAspect,0);
-    current->add("ShapeRepresentations",false,IfcUtil::Argument_ENTITY_LIST);
-    current->add("Name",true,IfcUtil::Argument_STRING);
-    current->add("Description",true,IfcUtil::Argument_STRING);
-    current->add("ProductDefinitional",false,IfcUtil::Argument_BOOL);
-    current->add("PartOfProductDefinitionShape",true,IfcUtil::Argument_ENTITY);
+    current->add("ShapeRepresentations",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcShapeModel);
+    current->add("Name",true,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("Description",true,IfcUtil::Argument_STRING,Type::IfcText);
+    current->add("ProductDefinitional",false,IfcUtil::Argument_BOOL,Type::UNDEFINED);
+    current->add("PartOfProductDefinitionShape",true,IfcUtil::Argument_ENTITY,Type::IfcProductRepresentationSelect);
     current = entity_descriptor_map[Type::IfcShapeModel] = new IfcEntityDescriptor(Type::IfcShapeModel,entity_descriptor_map.find(Type::IfcRepresentation)->second);
 
     current = entity_descriptor_map[Type::IfcShapeRepresentation] = new IfcEntityDescriptor(Type::IfcShapeRepresentation,entity_descriptor_map.find(Type::IfcShapeModel)->second);
 
     current = entity_descriptor_map[Type::IfcStructuralConnectionCondition] = new IfcEntityDescriptor(Type::IfcStructuralConnectionCondition,0);
-    current->add("Name",true,IfcUtil::Argument_STRING);
+    current->add("Name",true,IfcUtil::Argument_STRING,Type::IfcLabel);
     current = entity_descriptor_map[Type::IfcStructuralLoad] = new IfcEntityDescriptor(Type::IfcStructuralLoad,0);
-    current->add("Name",true,IfcUtil::Argument_STRING);
+    current->add("Name",true,IfcUtil::Argument_STRING,Type::IfcLabel);
     current = entity_descriptor_map[Type::IfcStructuralLoadConfiguration] = new IfcEntityDescriptor(Type::IfcStructuralLoadConfiguration,entity_descriptor_map.find(Type::IfcStructuralLoad)->second);
-    current->add("Values",false,IfcUtil::Argument_ENTITY_LIST);
+    current->add("Values",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcStructuralLoadOrResult);
     current = entity_descriptor_map[Type::IfcStructuralLoadOrResult] = new IfcEntityDescriptor(Type::IfcStructuralLoadOrResult,entity_descriptor_map.find(Type::IfcStructuralLoad)->second);
 
     current = entity_descriptor_map[Type::IfcStructuralLoadStatic] = new IfcEntityDescriptor(Type::IfcStructuralLoadStatic,entity_descriptor_map.find(Type::IfcStructuralLoadOrResult)->second);
 
     current = entity_descriptor_map[Type::IfcStructuralLoadTemperature] = new IfcEntityDescriptor(Type::IfcStructuralLoadTemperature,entity_descriptor_map.find(Type::IfcStructuralLoadStatic)->second);
-    current->add("DeltaTConstant",true,IfcUtil::Argument_DOUBLE);
-    current->add("DeltaTY",true,IfcUtil::Argument_DOUBLE);
-    current->add("DeltaTZ",true,IfcUtil::Argument_DOUBLE);
+    current->add("DeltaTConstant",true,IfcUtil::Argument_DOUBLE,Type::IfcThermodynamicTemperatureMeasure);
+    current->add("DeltaTY",true,IfcUtil::Argument_DOUBLE,Type::IfcThermodynamicTemperatureMeasure);
+    current->add("DeltaTZ",true,IfcUtil::Argument_DOUBLE,Type::IfcThermodynamicTemperatureMeasure);
     current = entity_descriptor_map[Type::IfcStyleModel] = new IfcEntityDescriptor(Type::IfcStyleModel,entity_descriptor_map.find(Type::IfcRepresentation)->second);
 
     current = entity_descriptor_map[Type::IfcStyledItem] = new IfcEntityDescriptor(Type::IfcStyledItem,entity_descriptor_map.find(Type::IfcRepresentationItem)->second);
-    current->add("Item",true,IfcUtil::Argument_ENTITY);
-    current->add("Styles",false,IfcUtil::Argument_ENTITY_LIST);
-    current->add("Name",true,IfcUtil::Argument_STRING);
+    current->add("Item",true,IfcUtil::Argument_ENTITY,Type::IfcRepresentationItem);
+    current->add("Styles",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcStyleAssignmentSelect);
+    current->add("Name",true,IfcUtil::Argument_STRING,Type::IfcLabel);
     current = entity_descriptor_map[Type::IfcStyledRepresentation] = new IfcEntityDescriptor(Type::IfcStyledRepresentation,entity_descriptor_map.find(Type::IfcStyleModel)->second);
 
     current = entity_descriptor_map[Type::IfcSurfaceReinforcementArea] = new IfcEntityDescriptor(Type::IfcSurfaceReinforcementArea,entity_descriptor_map.find(Type::IfcStructuralLoadOrResult)->second);
-    current->add("SurfaceReinforcement1",true,IfcUtil::Argument_VECTOR_DOUBLE);
-    current->add("SurfaceReinforcement2",true,IfcUtil::Argument_VECTOR_DOUBLE);
-    current->add("ShearReinforcement",true,IfcUtil::Argument_DOUBLE);
+    current->add("SurfaceReinforcement1",true,IfcUtil::Argument_VECTOR_DOUBLE,Type::IfcLengthMeasure);
+    current->add("SurfaceReinforcement2",true,IfcUtil::Argument_VECTOR_DOUBLE,Type::IfcLengthMeasure);
+    current->add("ShearReinforcement",true,IfcUtil::Argument_DOUBLE,Type::IfcRatioMeasure);
     current = entity_descriptor_map[Type::IfcSurfaceStyle] = new IfcEntityDescriptor(Type::IfcSurfaceStyle,entity_descriptor_map.find(Type::IfcPresentationStyle)->second);
     current->add("Side",false,IfcUtil::Argument_ENUMERATION,Type::IfcSurfaceSide);
-    current->add("Styles",false,IfcUtil::Argument_ENTITY_LIST);
+    current->add("Styles",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcSurfaceStyleElementSelect);
     current = entity_descriptor_map[Type::IfcSurfaceStyleLighting] = new IfcEntityDescriptor(Type::IfcSurfaceStyleLighting,entity_descriptor_map.find(Type::IfcPresentationItem)->second);
-    current->add("DiffuseTransmissionColour",false,IfcUtil::Argument_ENTITY);
-    current->add("DiffuseReflectionColour",false,IfcUtil::Argument_ENTITY);
-    current->add("TransmissionColour",false,IfcUtil::Argument_ENTITY);
-    current->add("ReflectanceColour",false,IfcUtil::Argument_ENTITY);
+    current->add("DiffuseTransmissionColour",false,IfcUtil::Argument_ENTITY,Type::IfcColourRgb);
+    current->add("DiffuseReflectionColour",false,IfcUtil::Argument_ENTITY,Type::IfcColourRgb);
+    current->add("TransmissionColour",false,IfcUtil::Argument_ENTITY,Type::IfcColourRgb);
+    current->add("ReflectanceColour",false,IfcUtil::Argument_ENTITY,Type::IfcColourRgb);
     current = entity_descriptor_map[Type::IfcSurfaceStyleRefraction] = new IfcEntityDescriptor(Type::IfcSurfaceStyleRefraction,entity_descriptor_map.find(Type::IfcPresentationItem)->second);
-    current->add("RefractionIndex",true,IfcUtil::Argument_DOUBLE);
-    current->add("DispersionFactor",true,IfcUtil::Argument_DOUBLE);
+    current->add("RefractionIndex",true,IfcUtil::Argument_DOUBLE,Type::IfcReal);
+    current->add("DispersionFactor",true,IfcUtil::Argument_DOUBLE,Type::IfcReal);
     current = entity_descriptor_map[Type::IfcSurfaceStyleShading] = new IfcEntityDescriptor(Type::IfcSurfaceStyleShading,entity_descriptor_map.find(Type::IfcPresentationItem)->second);
-    current->add("SurfaceColour",false,IfcUtil::Argument_ENTITY);
+    current->add("SurfaceColour",false,IfcUtil::Argument_ENTITY,Type::IfcColourRgb);
     current = entity_descriptor_map[Type::IfcSurfaceStyleWithTextures] = new IfcEntityDescriptor(Type::IfcSurfaceStyleWithTextures,entity_descriptor_map.find(Type::IfcPresentationItem)->second);
-    current->add("Textures",false,IfcUtil::Argument_ENTITY_LIST);
+    current->add("Textures",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcSurfaceTexture);
     current = entity_descriptor_map[Type::IfcSurfaceTexture] = new IfcEntityDescriptor(Type::IfcSurfaceTexture,entity_descriptor_map.find(Type::IfcPresentationItem)->second);
-    current->add("RepeatS",false,IfcUtil::Argument_BOOL);
-    current->add("RepeatT",false,IfcUtil::Argument_BOOL);
-    current->add("Mode",true,IfcUtil::Argument_STRING);
-    current->add("TextureTransform",true,IfcUtil::Argument_ENTITY);
-    current->add("Parameter",true,IfcUtil::Argument_VECTOR_STRING);
+    current->add("RepeatS",false,IfcUtil::Argument_BOOL,Type::UNDEFINED);
+    current->add("RepeatT",false,IfcUtil::Argument_BOOL,Type::UNDEFINED);
+    current->add("Mode",true,IfcUtil::Argument_STRING,Type::IfcIdentifier);
+    current->add("TextureTransform",true,IfcUtil::Argument_ENTITY,Type::IfcCartesianTransformationOperator2D);
+    current->add("Parameter",true,IfcUtil::Argument_VECTOR_STRING,Type::IfcIdentifier);
     current = entity_descriptor_map[Type::IfcTable] = new IfcEntityDescriptor(Type::IfcTable,0);
-    current->add("Name",true,IfcUtil::Argument_STRING);
-    current->add("Rows",true,IfcUtil::Argument_ENTITY_LIST);
-    current->add("Columns",true,IfcUtil::Argument_ENTITY_LIST);
+    current->add("Name",true,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("Rows",true,IfcUtil::Argument_ENTITY_LIST,Type::IfcTableRow);
+    current->add("Columns",true,IfcUtil::Argument_ENTITY_LIST,Type::IfcTableColumn);
     current = entity_descriptor_map[Type::IfcTableColumn] = new IfcEntityDescriptor(Type::IfcTableColumn,0);
-    current->add("Identifier",true,IfcUtil::Argument_STRING);
-    current->add("Name",true,IfcUtil::Argument_STRING);
-    current->add("Description",true,IfcUtil::Argument_STRING);
-    current->add("Unit",true,IfcUtil::Argument_ENTITY);
-    current->add("ReferencePath",true,IfcUtil::Argument_ENTITY);
+    current->add("Identifier",true,IfcUtil::Argument_STRING,Type::IfcIdentifier);
+    current->add("Name",true,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("Description",true,IfcUtil::Argument_STRING,Type::IfcText);
+    current->add("Unit",true,IfcUtil::Argument_ENTITY,Type::IfcUnit);
+    current->add("ReferencePath",true,IfcUtil::Argument_ENTITY,Type::IfcReference);
     current = entity_descriptor_map[Type::IfcTableRow] = new IfcEntityDescriptor(Type::IfcTableRow,0);
-    current->add("RowCells",true,IfcUtil::Argument_ENTITY_LIST);
-    current->add("IsHeading",true,IfcUtil::Argument_BOOL);
+    current->add("RowCells",true,IfcUtil::Argument_ENTITY_LIST,Type::IfcValue);
+    current->add("IsHeading",true,IfcUtil::Argument_BOOL,Type::UNDEFINED);
     current = entity_descriptor_map[Type::IfcTaskTime] = new IfcEntityDescriptor(Type::IfcTaskTime,entity_descriptor_map.find(Type::IfcSchedulingTime)->second);
     current->add("DurationType",true,IfcUtil::Argument_ENUMERATION,Type::IfcTaskDurationEnum);
-    current->add("ScheduleDuration",true,IfcUtil::Argument_STRING);
-    current->add("ScheduleStart",true,IfcUtil::Argument_STRING);
-    current->add("ScheduleFinish",true,IfcUtil::Argument_STRING);
-    current->add("EarlyStart",true,IfcUtil::Argument_STRING);
-    current->add("EarlyFinish",true,IfcUtil::Argument_STRING);
-    current->add("LateStart",true,IfcUtil::Argument_STRING);
-    current->add("LateFinish",true,IfcUtil::Argument_STRING);
-    current->add("FreeFloat",true,IfcUtil::Argument_STRING);
-    current->add("TotalFloat",true,IfcUtil::Argument_STRING);
-    current->add("IsCritical",true,IfcUtil::Argument_BOOL);
-    current->add("StatusTime",true,IfcUtil::Argument_STRING);
-    current->add("ActualDuration",true,IfcUtil::Argument_STRING);
-    current->add("ActualStart",true,IfcUtil::Argument_STRING);
-    current->add("ActualFinish",true,IfcUtil::Argument_STRING);
-    current->add("RemainingTime",true,IfcUtil::Argument_STRING);
-    current->add("Completion",true,IfcUtil::Argument_DOUBLE);
+    current->add("ScheduleDuration",true,IfcUtil::Argument_STRING,Type::IfcDuration);
+    current->add("ScheduleStart",true,IfcUtil::Argument_STRING,Type::IfcDateTime);
+    current->add("ScheduleFinish",true,IfcUtil::Argument_STRING,Type::IfcDateTime);
+    current->add("EarlyStart",true,IfcUtil::Argument_STRING,Type::IfcDateTime);
+    current->add("EarlyFinish",true,IfcUtil::Argument_STRING,Type::IfcDateTime);
+    current->add("LateStart",true,IfcUtil::Argument_STRING,Type::IfcDateTime);
+    current->add("LateFinish",true,IfcUtil::Argument_STRING,Type::IfcDateTime);
+    current->add("FreeFloat",true,IfcUtil::Argument_STRING,Type::IfcDuration);
+    current->add("TotalFloat",true,IfcUtil::Argument_STRING,Type::IfcDuration);
+    current->add("IsCritical",true,IfcUtil::Argument_BOOL,Type::UNDEFINED);
+    current->add("StatusTime",true,IfcUtil::Argument_STRING,Type::IfcDateTime);
+    current->add("ActualDuration",true,IfcUtil::Argument_STRING,Type::IfcDuration);
+    current->add("ActualStart",true,IfcUtil::Argument_STRING,Type::IfcDateTime);
+    current->add("ActualFinish",true,IfcUtil::Argument_STRING,Type::IfcDateTime);
+    current->add("RemainingTime",true,IfcUtil::Argument_STRING,Type::IfcDuration);
+    current->add("Completion",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveRatioMeasure);
     current = entity_descriptor_map[Type::IfcTaskTimeRecurring] = new IfcEntityDescriptor(Type::IfcTaskTimeRecurring,entity_descriptor_map.find(Type::IfcTaskTime)->second);
-    current->add("Recurrance",false,IfcUtil::Argument_ENTITY);
+    current->add("Recurrance",false,IfcUtil::Argument_ENTITY,Type::IfcRecurrencePattern);
     current = entity_descriptor_map[Type::IfcTelecomAddress] = new IfcEntityDescriptor(Type::IfcTelecomAddress,entity_descriptor_map.find(Type::IfcAddress)->second);
-    current->add("TelephoneNumbers",true,IfcUtil::Argument_VECTOR_STRING);
-    current->add("FacsimileNumbers",true,IfcUtil::Argument_VECTOR_STRING);
-    current->add("PagerNumber",true,IfcUtil::Argument_STRING);
-    current->add("ElectronicMailAddresses",true,IfcUtil::Argument_VECTOR_STRING);
-    current->add("WWWHomePageURL",true,IfcUtil::Argument_STRING);
-    current->add("MessagingIDs",true,IfcUtil::Argument_VECTOR_STRING);
+    current->add("TelephoneNumbers",true,IfcUtil::Argument_VECTOR_STRING,Type::IfcLabel);
+    current->add("FacsimileNumbers",true,IfcUtil::Argument_VECTOR_STRING,Type::IfcLabel);
+    current->add("PagerNumber",true,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("ElectronicMailAddresses",true,IfcUtil::Argument_VECTOR_STRING,Type::IfcLabel);
+    current->add("WWWHomePageURL",true,IfcUtil::Argument_STRING,Type::IfcURIReference);
+    current->add("MessagingIDs",true,IfcUtil::Argument_VECTOR_STRING,Type::IfcURIReference);
     current = entity_descriptor_map[Type::IfcTextStyle] = new IfcEntityDescriptor(Type::IfcTextStyle,entity_descriptor_map.find(Type::IfcPresentationStyle)->second);
-    current->add("TextCharacterAppearance",true,IfcUtil::Argument_ENTITY);
-    current->add("TextStyle",true,IfcUtil::Argument_ENTITY);
-    current->add("TextFontStyle",false,IfcUtil::Argument_ENTITY);
-    current->add("ModelOrDraughting",true,IfcUtil::Argument_BOOL);
+    current->add("TextCharacterAppearance",true,IfcUtil::Argument_ENTITY,Type::IfcTextStyleForDefinedFont);
+    current->add("TextStyle",true,IfcUtil::Argument_ENTITY,Type::IfcTextStyleTextModel);
+    current->add("TextFontStyle",false,IfcUtil::Argument_ENTITY,Type::IfcTextFontSelect);
+    current->add("ModelOrDraughting",true,IfcUtil::Argument_BOOL,Type::UNDEFINED);
     current = entity_descriptor_map[Type::IfcTextStyleForDefinedFont] = new IfcEntityDescriptor(Type::IfcTextStyleForDefinedFont,entity_descriptor_map.find(Type::IfcPresentationItem)->second);
-    current->add("Colour",false,IfcUtil::Argument_ENTITY);
-    current->add("BackgroundColour",true,IfcUtil::Argument_ENTITY);
+    current->add("Colour",false,IfcUtil::Argument_ENTITY,Type::IfcColour);
+    current->add("BackgroundColour",true,IfcUtil::Argument_ENTITY,Type::IfcColour);
     current = entity_descriptor_map[Type::IfcTextStyleTextModel] = new IfcEntityDescriptor(Type::IfcTextStyleTextModel,entity_descriptor_map.find(Type::IfcPresentationItem)->second);
-    current->add("TextIndent",true,IfcUtil::Argument_ENTITY);
-    current->add("TextAlign",true,IfcUtil::Argument_STRING);
-    current->add("TextDecoration",true,IfcUtil::Argument_STRING);
-    current->add("LetterSpacing",true,IfcUtil::Argument_ENTITY);
-    current->add("WordSpacing",true,IfcUtil::Argument_ENTITY);
-    current->add("TextTransform",true,IfcUtil::Argument_STRING);
-    current->add("LineHeight",true,IfcUtil::Argument_ENTITY);
+    current->add("TextIndent",true,IfcUtil::Argument_ENTITY,Type::IfcSizeSelect);
+    current->add("TextAlign",true,IfcUtil::Argument_STRING,Type::IfcTextAlignment);
+    current->add("TextDecoration",true,IfcUtil::Argument_STRING,Type::IfcTextDecoration);
+    current->add("LetterSpacing",true,IfcUtil::Argument_ENTITY,Type::IfcSizeSelect);
+    current->add("WordSpacing",true,IfcUtil::Argument_ENTITY,Type::IfcSizeSelect);
+    current->add("TextTransform",true,IfcUtil::Argument_STRING,Type::IfcTextTransformation);
+    current->add("LineHeight",true,IfcUtil::Argument_ENTITY,Type::IfcSizeSelect);
     current = entity_descriptor_map[Type::IfcTextureCoordinate] = new IfcEntityDescriptor(Type::IfcTextureCoordinate,entity_descriptor_map.find(Type::IfcPresentationItem)->second);
-    current->add("Maps",false,IfcUtil::Argument_ENTITY_LIST);
+    current->add("Maps",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcSurfaceTexture);
     current = entity_descriptor_map[Type::IfcTextureCoordinateGenerator] = new IfcEntityDescriptor(Type::IfcTextureCoordinateGenerator,entity_descriptor_map.find(Type::IfcTextureCoordinate)->second);
-    current->add("Mode",false,IfcUtil::Argument_STRING);
-    current->add("Parameter",true,IfcUtil::Argument_VECTOR_DOUBLE);
+    current->add("Mode",false,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("Parameter",true,IfcUtil::Argument_VECTOR_DOUBLE,Type::IfcReal);
     current = entity_descriptor_map[Type::IfcTextureMap] = new IfcEntityDescriptor(Type::IfcTextureMap,entity_descriptor_map.find(Type::IfcTextureCoordinate)->second);
-    current->add("Vertices",false,IfcUtil::Argument_ENTITY_LIST);
-    current->add("MappedTo",false,IfcUtil::Argument_ENTITY);
+    current->add("Vertices",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcTextureVertex);
+    current->add("MappedTo",false,IfcUtil::Argument_ENTITY,Type::IfcFace);
     current = entity_descriptor_map[Type::IfcTextureVertex] = new IfcEntityDescriptor(Type::IfcTextureVertex,entity_descriptor_map.find(Type::IfcPresentationItem)->second);
-    current->add("Coordinates",false,IfcUtil::Argument_VECTOR_DOUBLE);
+    current->add("Coordinates",false,IfcUtil::Argument_VECTOR_DOUBLE,Type::IfcParameterValue);
     current = entity_descriptor_map[Type::IfcTextureVertexList] = new IfcEntityDescriptor(Type::IfcTextureVertexList,entity_descriptor_map.find(Type::IfcPresentationItem)->second);
 
     current = entity_descriptor_map[Type::IfcTimePeriod] = new IfcEntityDescriptor(Type::IfcTimePeriod,0);
-    current->add("StartTime",false,IfcUtil::Argument_STRING);
-    current->add("EndTime",false,IfcUtil::Argument_STRING);
+    current->add("StartTime",false,IfcUtil::Argument_STRING,Type::IfcTime);
+    current->add("EndTime",false,IfcUtil::Argument_STRING,Type::IfcTime);
     current = entity_descriptor_map[Type::IfcTimeSeries] = new IfcEntityDescriptor(Type::IfcTimeSeries,0);
-    current->add("Name",false,IfcUtil::Argument_STRING);
-    current->add("Description",true,IfcUtil::Argument_STRING);
-    current->add("StartTime",false,IfcUtil::Argument_STRING);
-    current->add("EndTime",false,IfcUtil::Argument_STRING);
+    current->add("Name",false,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("Description",true,IfcUtil::Argument_STRING,Type::IfcText);
+    current->add("StartTime",false,IfcUtil::Argument_STRING,Type::IfcDateTime);
+    current->add("EndTime",false,IfcUtil::Argument_STRING,Type::IfcDateTime);
     current->add("TimeSeriesDataType",false,IfcUtil::Argument_ENUMERATION,Type::IfcTimeSeriesDataTypeEnum);
     current->add("DataOrigin",false,IfcUtil::Argument_ENUMERATION,Type::IfcDataOriginEnum);
-    current->add("UserDefinedDataOrigin",true,IfcUtil::Argument_STRING);
-    current->add("Unit",true,IfcUtil::Argument_ENTITY);
+    current->add("UserDefinedDataOrigin",true,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("Unit",true,IfcUtil::Argument_ENTITY,Type::IfcUnit);
     current = entity_descriptor_map[Type::IfcTimeSeriesValue] = new IfcEntityDescriptor(Type::IfcTimeSeriesValue,0);
-    current->add("ListValues",false,IfcUtil::Argument_ENTITY_LIST);
+    current->add("ListValues",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcValue);
     current = entity_descriptor_map[Type::IfcTopologicalRepresentationItem] = new IfcEntityDescriptor(Type::IfcTopologicalRepresentationItem,entity_descriptor_map.find(Type::IfcRepresentationItem)->second);
 
     current = entity_descriptor_map[Type::IfcTopologyRepresentation] = new IfcEntityDescriptor(Type::IfcTopologyRepresentation,entity_descriptor_map.find(Type::IfcShapeModel)->second);
 
     current = entity_descriptor_map[Type::IfcUnitAssignment] = new IfcEntityDescriptor(Type::IfcUnitAssignment,0);
-    current->add("Units",false,IfcUtil::Argument_ENTITY_LIST);
+    current->add("Units",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcUnit);
     current = entity_descriptor_map[Type::IfcVertex] = new IfcEntityDescriptor(Type::IfcVertex,entity_descriptor_map.find(Type::IfcTopologicalRepresentationItem)->second);
 
     current = entity_descriptor_map[Type::IfcVertexPoint] = new IfcEntityDescriptor(Type::IfcVertexPoint,entity_descriptor_map.find(Type::IfcVertex)->second);
-    current->add("VertexGeometry",false,IfcUtil::Argument_ENTITY);
+    current->add("VertexGeometry",false,IfcUtil::Argument_ENTITY,Type::IfcPoint);
     current = entity_descriptor_map[Type::IfcVirtualGridIntersection] = new IfcEntityDescriptor(Type::IfcVirtualGridIntersection,0);
-    current->add("IntersectingAxes",false,IfcUtil::Argument_ENTITY_LIST);
-    current->add("OffsetDistances",false,IfcUtil::Argument_VECTOR_DOUBLE);
+    current->add("IntersectingAxes",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcGridAxis);
+    current->add("OffsetDistances",false,IfcUtil::Argument_VECTOR_DOUBLE,Type::IfcLengthMeasure);
     current = entity_descriptor_map[Type::IfcWorkTime] = new IfcEntityDescriptor(Type::IfcWorkTime,entity_descriptor_map.find(Type::IfcSchedulingTime)->second);
-    current->add("RecurrencePattern",true,IfcUtil::Argument_ENTITY);
-    current->add("Start",true,IfcUtil::Argument_STRING);
-    current->add("Finish",true,IfcUtil::Argument_STRING);
+    current->add("RecurrencePattern",true,IfcUtil::Argument_ENTITY,Type::IfcRecurrencePattern);
+    current->add("Start",true,IfcUtil::Argument_STRING,Type::IfcDate);
+    current->add("Finish",true,IfcUtil::Argument_STRING,Type::IfcDate);
     current = entity_descriptor_map[Type::IfcApprovalRelationship] = new IfcEntityDescriptor(Type::IfcApprovalRelationship,entity_descriptor_map.find(Type::IfcResourceLevelRelationship)->second);
-    current->add("RelatingApproval",false,IfcUtil::Argument_ENTITY);
-    current->add("RelatedApprovals",false,IfcUtil::Argument_ENTITY_LIST);
+    current->add("RelatingApproval",false,IfcUtil::Argument_ENTITY,Type::IfcApproval);
+    current->add("RelatedApprovals",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcApproval);
     current = entity_descriptor_map[Type::IfcArbitraryClosedProfileDef] = new IfcEntityDescriptor(Type::IfcArbitraryClosedProfileDef,entity_descriptor_map.find(Type::IfcProfileDef)->second);
-    current->add("OuterCurve",false,IfcUtil::Argument_ENTITY);
+    current->add("OuterCurve",false,IfcUtil::Argument_ENTITY,Type::IfcCurve);
     current = entity_descriptor_map[Type::IfcArbitraryOpenProfileDef] = new IfcEntityDescriptor(Type::IfcArbitraryOpenProfileDef,entity_descriptor_map.find(Type::IfcProfileDef)->second);
-    current->add("Curve",false,IfcUtil::Argument_ENTITY);
+    current->add("Curve",false,IfcUtil::Argument_ENTITY,Type::IfcBoundedCurve);
     current = entity_descriptor_map[Type::IfcArbitraryProfileDefWithVoids] = new IfcEntityDescriptor(Type::IfcArbitraryProfileDefWithVoids,entity_descriptor_map.find(Type::IfcArbitraryClosedProfileDef)->second);
-    current->add("InnerCurves",false,IfcUtil::Argument_ENTITY_LIST);
+    current->add("InnerCurves",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcCurve);
     current = entity_descriptor_map[Type::IfcBlobTexture] = new IfcEntityDescriptor(Type::IfcBlobTexture,entity_descriptor_map.find(Type::IfcSurfaceTexture)->second);
-    current->add("RasterFormat",false,IfcUtil::Argument_STRING);
+    current->add("RasterFormat",false,IfcUtil::Argument_STRING,Type::IfcIdentifier);
     current = entity_descriptor_map[Type::IfcCenterLineProfileDef] = new IfcEntityDescriptor(Type::IfcCenterLineProfileDef,entity_descriptor_map.find(Type::IfcArbitraryOpenProfileDef)->second);
-    current->add("Thickness",false,IfcUtil::Argument_DOUBLE);
+    current->add("Thickness",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
     current = entity_descriptor_map[Type::IfcClassification] = new IfcEntityDescriptor(Type::IfcClassification,entity_descriptor_map.find(Type::IfcExternalInformation)->second);
-    current->add("Source",true,IfcUtil::Argument_STRING);
-    current->add("Edition",true,IfcUtil::Argument_STRING);
-    current->add("EditionDate",true,IfcUtil::Argument_STRING);
-    current->add("Name",false,IfcUtil::Argument_STRING);
-    current->add("Description",true,IfcUtil::Argument_STRING);
-    current->add("Location",true,IfcUtil::Argument_STRING);
-    current->add("ReferenceTokens",true,IfcUtil::Argument_VECTOR_STRING);
+    current->add("Source",true,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("Edition",true,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("EditionDate",true,IfcUtil::Argument_STRING,Type::IfcDate);
+    current->add("Name",false,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("Description",true,IfcUtil::Argument_STRING,Type::IfcText);
+    current->add("Location",true,IfcUtil::Argument_STRING,Type::IfcURIReference);
+    current->add("ReferenceTokens",true,IfcUtil::Argument_VECTOR_STRING,Type::IfcIdentifier);
     current = entity_descriptor_map[Type::IfcClassificationReference] = new IfcEntityDescriptor(Type::IfcClassificationReference,entity_descriptor_map.find(Type::IfcExternalReference)->second);
-    current->add("ReferencedSource",true,IfcUtil::Argument_ENTITY);
-    current->add("Description",true,IfcUtil::Argument_STRING);
-    current->add("Sort",true,IfcUtil::Argument_STRING);
+    current->add("ReferencedSource",true,IfcUtil::Argument_ENTITY,Type::IfcClassificationReferenceSelect);
+    current->add("Description",true,IfcUtil::Argument_STRING,Type::IfcText);
+    current->add("Sort",true,IfcUtil::Argument_STRING,Type::IfcIdentifier);
     current = entity_descriptor_map[Type::IfcColourRgbList] = new IfcEntityDescriptor(Type::IfcColourRgbList,entity_descriptor_map.find(Type::IfcPresentationItem)->second);
 
     current = entity_descriptor_map[Type::IfcColourSpecification] = new IfcEntityDescriptor(Type::IfcColourSpecification,entity_descriptor_map.find(Type::IfcPresentationItem)->second);
-    current->add("Name",true,IfcUtil::Argument_STRING);
+    current->add("Name",true,IfcUtil::Argument_STRING,Type::IfcLabel);
     current = entity_descriptor_map[Type::IfcCompositeProfileDef] = new IfcEntityDescriptor(Type::IfcCompositeProfileDef,entity_descriptor_map.find(Type::IfcProfileDef)->second);
-    current->add("Profiles",false,IfcUtil::Argument_ENTITY_LIST);
-    current->add("Label",true,IfcUtil::Argument_STRING);
+    current->add("Profiles",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcProfileDef);
+    current->add("Label",true,IfcUtil::Argument_STRING,Type::IfcLabel);
     current = entity_descriptor_map[Type::IfcConnectedFaceSet] = new IfcEntityDescriptor(Type::IfcConnectedFaceSet,entity_descriptor_map.find(Type::IfcTopologicalRepresentationItem)->second);
-    current->add("CfsFaces",false,IfcUtil::Argument_ENTITY_LIST);
+    current->add("CfsFaces",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcFace);
     current = entity_descriptor_map[Type::IfcConnectionCurveGeometry] = new IfcEntityDescriptor(Type::IfcConnectionCurveGeometry,entity_descriptor_map.find(Type::IfcConnectionGeometry)->second);
-    current->add("CurveOnRelatingElement",false,IfcUtil::Argument_ENTITY);
-    current->add("CurveOnRelatedElement",true,IfcUtil::Argument_ENTITY);
+    current->add("CurveOnRelatingElement",false,IfcUtil::Argument_ENTITY,Type::IfcCurveOrEdgeCurve);
+    current->add("CurveOnRelatedElement",true,IfcUtil::Argument_ENTITY,Type::IfcCurveOrEdgeCurve);
     current = entity_descriptor_map[Type::IfcConnectionPointEccentricity] = new IfcEntityDescriptor(Type::IfcConnectionPointEccentricity,entity_descriptor_map.find(Type::IfcConnectionPointGeometry)->second);
-    current->add("EccentricityInX",true,IfcUtil::Argument_DOUBLE);
-    current->add("EccentricityInY",true,IfcUtil::Argument_DOUBLE);
-    current->add("EccentricityInZ",true,IfcUtil::Argument_DOUBLE);
+    current->add("EccentricityInX",true,IfcUtil::Argument_DOUBLE,Type::IfcLengthMeasure);
+    current->add("EccentricityInY",true,IfcUtil::Argument_DOUBLE,Type::IfcLengthMeasure);
+    current->add("EccentricityInZ",true,IfcUtil::Argument_DOUBLE,Type::IfcLengthMeasure);
     current = entity_descriptor_map[Type::IfcContextDependentUnit] = new IfcEntityDescriptor(Type::IfcContextDependentUnit,entity_descriptor_map.find(Type::IfcNamedUnit)->second);
-    current->add("Name",false,IfcUtil::Argument_STRING);
+    current->add("Name",false,IfcUtil::Argument_STRING,Type::IfcLabel);
     current = entity_descriptor_map[Type::IfcConversionBasedUnit] = new IfcEntityDescriptor(Type::IfcConversionBasedUnit,entity_descriptor_map.find(Type::IfcNamedUnit)->second);
-    current->add("Name",false,IfcUtil::Argument_STRING);
-    current->add("ConversionFactor",false,IfcUtil::Argument_ENTITY);
+    current->add("Name",false,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("ConversionFactor",false,IfcUtil::Argument_ENTITY,Type::IfcMeasureWithUnit);
     current = entity_descriptor_map[Type::IfcConversionBasedUnitWithOffset] = new IfcEntityDescriptor(Type::IfcConversionBasedUnitWithOffset,entity_descriptor_map.find(Type::IfcConversionBasedUnit)->second);
-    current->add("ConversionOffset",false,IfcUtil::Argument_DOUBLE);
+    current->add("ConversionOffset",false,IfcUtil::Argument_DOUBLE,Type::IfcReal);
     current = entity_descriptor_map[Type::IfcCurrencyRelationship] = new IfcEntityDescriptor(Type::IfcCurrencyRelationship,entity_descriptor_map.find(Type::IfcResourceLevelRelationship)->second);
-    current->add("RelatingMonetaryUnit",false,IfcUtil::Argument_ENTITY);
-    current->add("RelatedMonetaryUnit",false,IfcUtil::Argument_ENTITY);
-    current->add("ExchangeRate",false,IfcUtil::Argument_DOUBLE);
-    current->add("RateDateTime",true,IfcUtil::Argument_STRING);
-    current->add("RateSource",true,IfcUtil::Argument_ENTITY);
+    current->add("RelatingMonetaryUnit",false,IfcUtil::Argument_ENTITY,Type::IfcMonetaryUnit);
+    current->add("RelatedMonetaryUnit",false,IfcUtil::Argument_ENTITY,Type::IfcMonetaryUnit);
+    current->add("ExchangeRate",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveRatioMeasure);
+    current->add("RateDateTime",true,IfcUtil::Argument_STRING,Type::IfcDateTime);
+    current->add("RateSource",true,IfcUtil::Argument_ENTITY,Type::IfcLibraryInformation);
     current = entity_descriptor_map[Type::IfcCurveStyle] = new IfcEntityDescriptor(Type::IfcCurveStyle,entity_descriptor_map.find(Type::IfcPresentationStyle)->second);
-    current->add("CurveFont",true,IfcUtil::Argument_ENTITY);
-    current->add("CurveWidth",true,IfcUtil::Argument_ENTITY);
-    current->add("CurveColour",true,IfcUtil::Argument_ENTITY);
-    current->add("ModelOrDraughting",true,IfcUtil::Argument_BOOL);
+    current->add("CurveFont",true,IfcUtil::Argument_ENTITY,Type::IfcCurveFontOrScaledCurveFontSelect);
+    current->add("CurveWidth",true,IfcUtil::Argument_ENTITY,Type::IfcSizeSelect);
+    current->add("CurveColour",true,IfcUtil::Argument_ENTITY,Type::IfcColour);
+    current->add("ModelOrDraughting",true,IfcUtil::Argument_BOOL,Type::UNDEFINED);
     current = entity_descriptor_map[Type::IfcCurveStyleFont] = new IfcEntityDescriptor(Type::IfcCurveStyleFont,entity_descriptor_map.find(Type::IfcPresentationItem)->second);
-    current->add("Name",true,IfcUtil::Argument_STRING);
-    current->add("PatternList",false,IfcUtil::Argument_ENTITY_LIST);
+    current->add("Name",true,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("PatternList",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcCurveStyleFontPattern);
     current = entity_descriptor_map[Type::IfcCurveStyleFontAndScaling] = new IfcEntityDescriptor(Type::IfcCurveStyleFontAndScaling,entity_descriptor_map.find(Type::IfcPresentationItem)->second);
-    current->add("Name",true,IfcUtil::Argument_STRING);
-    current->add("CurveFont",false,IfcUtil::Argument_ENTITY);
-    current->add("CurveFontScaling",false,IfcUtil::Argument_DOUBLE);
+    current->add("Name",true,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("CurveFont",false,IfcUtil::Argument_ENTITY,Type::IfcCurveStyleFontSelect);
+    current->add("CurveFontScaling",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveRatioMeasure);
     current = entity_descriptor_map[Type::IfcCurveStyleFontPattern] = new IfcEntityDescriptor(Type::IfcCurveStyleFontPattern,entity_descriptor_map.find(Type::IfcPresentationItem)->second);
-    current->add("VisibleSegmentLength",false,IfcUtil::Argument_DOUBLE);
-    current->add("InvisibleSegmentLength",false,IfcUtil::Argument_DOUBLE);
+    current->add("VisibleSegmentLength",false,IfcUtil::Argument_DOUBLE,Type::IfcLengthMeasure);
+    current->add("InvisibleSegmentLength",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
     current = entity_descriptor_map[Type::IfcDerivedProfileDef] = new IfcEntityDescriptor(Type::IfcDerivedProfileDef,entity_descriptor_map.find(Type::IfcProfileDef)->second);
-    current->add("ParentProfile",false,IfcUtil::Argument_ENTITY);
-    current->add("Operator",false,IfcUtil::Argument_ENTITY);
-    current->add("Label",true,IfcUtil::Argument_STRING);
+    current->add("ParentProfile",false,IfcUtil::Argument_ENTITY,Type::IfcProfileDef);
+    current->add("Operator",false,IfcUtil::Argument_ENTITY,Type::IfcCartesianTransformationOperator2D);
+    current->add("Label",true,IfcUtil::Argument_STRING,Type::IfcLabel);
     current = entity_descriptor_map[Type::IfcDocumentInformation] = new IfcEntityDescriptor(Type::IfcDocumentInformation,entity_descriptor_map.find(Type::IfcExternalInformation)->second);
-    current->add("Identification",false,IfcUtil::Argument_STRING);
-    current->add("Name",false,IfcUtil::Argument_STRING);
-    current->add("Description",true,IfcUtil::Argument_STRING);
-    current->add("Location",true,IfcUtil::Argument_STRING);
-    current->add("Purpose",true,IfcUtil::Argument_STRING);
-    current->add("IntendedUse",true,IfcUtil::Argument_STRING);
-    current->add("Scope",true,IfcUtil::Argument_STRING);
-    current->add("Revision",true,IfcUtil::Argument_STRING);
-    current->add("DocumentOwner",true,IfcUtil::Argument_ENTITY);
-    current->add("Editors",true,IfcUtil::Argument_ENTITY_LIST);
-    current->add("CreationTime",true,IfcUtil::Argument_STRING);
-    current->add("LastRevisionTime",true,IfcUtil::Argument_STRING);
-    current->add("ElectronicFormat",true,IfcUtil::Argument_STRING);
-    current->add("ValidFrom",true,IfcUtil::Argument_STRING);
-    current->add("ValidUntil",true,IfcUtil::Argument_STRING);
+    current->add("Identification",false,IfcUtil::Argument_STRING,Type::IfcIdentifier);
+    current->add("Name",false,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("Description",true,IfcUtil::Argument_STRING,Type::IfcText);
+    current->add("Location",true,IfcUtil::Argument_STRING,Type::IfcURIReference);
+    current->add("Purpose",true,IfcUtil::Argument_STRING,Type::IfcText);
+    current->add("IntendedUse",true,IfcUtil::Argument_STRING,Type::IfcText);
+    current->add("Scope",true,IfcUtil::Argument_STRING,Type::IfcText);
+    current->add("Revision",true,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("DocumentOwner",true,IfcUtil::Argument_ENTITY,Type::IfcActorSelect);
+    current->add("Editors",true,IfcUtil::Argument_ENTITY_LIST,Type::IfcActorSelect);
+    current->add("CreationTime",true,IfcUtil::Argument_STRING,Type::IfcDateTime);
+    current->add("LastRevisionTime",true,IfcUtil::Argument_STRING,Type::IfcDateTime);
+    current->add("ElectronicFormat",true,IfcUtil::Argument_STRING,Type::IfcIdentifier);
+    current->add("ValidFrom",true,IfcUtil::Argument_STRING,Type::IfcDate);
+    current->add("ValidUntil",true,IfcUtil::Argument_STRING,Type::IfcDate);
     current->add("Confidentiality",true,IfcUtil::Argument_ENUMERATION,Type::IfcDocumentConfidentialityEnum);
     current->add("Status",true,IfcUtil::Argument_ENUMERATION,Type::IfcDocumentStatusEnum);
     current = entity_descriptor_map[Type::IfcDocumentInformationRelationship] = new IfcEntityDescriptor(Type::IfcDocumentInformationRelationship,entity_descriptor_map.find(Type::IfcResourceLevelRelationship)->second);
-    current->add("RelatingDocument",false,IfcUtil::Argument_ENTITY);
-    current->add("RelatedDocuments",false,IfcUtil::Argument_ENTITY_LIST);
-    current->add("RelationshipType",true,IfcUtil::Argument_STRING);
+    current->add("RelatingDocument",false,IfcUtil::Argument_ENTITY,Type::IfcDocumentInformation);
+    current->add("RelatedDocuments",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcDocumentInformation);
+    current->add("RelationshipType",true,IfcUtil::Argument_STRING,Type::IfcLabel);
     current = entity_descriptor_map[Type::IfcDocumentReference] = new IfcEntityDescriptor(Type::IfcDocumentReference,entity_descriptor_map.find(Type::IfcExternalReference)->second);
-    current->add("Description",true,IfcUtil::Argument_STRING);
-    current->add("ReferencedDocument",true,IfcUtil::Argument_ENTITY);
+    current->add("Description",true,IfcUtil::Argument_STRING,Type::IfcText);
+    current->add("ReferencedDocument",true,IfcUtil::Argument_ENTITY,Type::IfcDocumentInformation);
     current = entity_descriptor_map[Type::IfcEdge] = new IfcEntityDescriptor(Type::IfcEdge,entity_descriptor_map.find(Type::IfcTopologicalRepresentationItem)->second);
-    current->add("EdgeStart",false,IfcUtil::Argument_ENTITY);
-    current->add("EdgeEnd",false,IfcUtil::Argument_ENTITY);
+    current->add("EdgeStart",false,IfcUtil::Argument_ENTITY,Type::IfcVertex);
+    current->add("EdgeEnd",false,IfcUtil::Argument_ENTITY,Type::IfcVertex);
     current = entity_descriptor_map[Type::IfcEdgeCurve] = new IfcEntityDescriptor(Type::IfcEdgeCurve,entity_descriptor_map.find(Type::IfcEdge)->second);
-    current->add("EdgeGeometry",false,IfcUtil::Argument_ENTITY);
-    current->add("SameSense",false,IfcUtil::Argument_BOOL);
+    current->add("EdgeGeometry",false,IfcUtil::Argument_ENTITY,Type::IfcCurve);
+    current->add("SameSense",false,IfcUtil::Argument_BOOL,Type::UNDEFINED);
     current = entity_descriptor_map[Type::IfcEventTime] = new IfcEntityDescriptor(Type::IfcEventTime,entity_descriptor_map.find(Type::IfcSchedulingTime)->second);
-    current->add("ActualDate",true,IfcUtil::Argument_STRING);
-    current->add("EarlyDate",true,IfcUtil::Argument_STRING);
-    current->add("LateDate",true,IfcUtil::Argument_STRING);
-    current->add("ScheduleDate",true,IfcUtil::Argument_STRING);
+    current->add("ActualDate",true,IfcUtil::Argument_STRING,Type::IfcDateTime);
+    current->add("EarlyDate",true,IfcUtil::Argument_STRING,Type::IfcDateTime);
+    current->add("LateDate",true,IfcUtil::Argument_STRING,Type::IfcDateTime);
+    current->add("ScheduleDate",true,IfcUtil::Argument_STRING,Type::IfcDateTime);
     current = entity_descriptor_map[Type::IfcExtendedProperties] = new IfcEntityDescriptor(Type::IfcExtendedProperties,entity_descriptor_map.find(Type::IfcPropertyAbstraction)->second);
-    current->add("Name",true,IfcUtil::Argument_STRING);
-    current->add("Description",true,IfcUtil::Argument_STRING);
-    current->add("Properties",false,IfcUtil::Argument_ENTITY_LIST);
+    current->add("Name",true,IfcUtil::Argument_STRING,Type::IfcIdentifier);
+    current->add("Description",true,IfcUtil::Argument_STRING,Type::IfcText);
+    current->add("Properties",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcProperty);
     current = entity_descriptor_map[Type::IfcExternalReferenceRelationship] = new IfcEntityDescriptor(Type::IfcExternalReferenceRelationship,entity_descriptor_map.find(Type::IfcResourceLevelRelationship)->second);
-    current->add("RelatingReference",false,IfcUtil::Argument_ENTITY);
-    current->add("RelatedResourceObjects",false,IfcUtil::Argument_ENTITY_LIST);
+    current->add("RelatingReference",false,IfcUtil::Argument_ENTITY,Type::IfcExternalReference);
+    current->add("RelatedResourceObjects",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcResourceObjectSelect);
     current = entity_descriptor_map[Type::IfcFace] = new IfcEntityDescriptor(Type::IfcFace,entity_descriptor_map.find(Type::IfcTopologicalRepresentationItem)->second);
-    current->add("Bounds",false,IfcUtil::Argument_ENTITY_LIST);
+    current->add("Bounds",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcFaceBound);
     current = entity_descriptor_map[Type::IfcFaceBound] = new IfcEntityDescriptor(Type::IfcFaceBound,entity_descriptor_map.find(Type::IfcTopologicalRepresentationItem)->second);
-    current->add("Bound",false,IfcUtil::Argument_ENTITY);
-    current->add("Orientation",false,IfcUtil::Argument_BOOL);
+    current->add("Bound",false,IfcUtil::Argument_ENTITY,Type::IfcLoop);
+    current->add("Orientation",false,IfcUtil::Argument_BOOL,Type::UNDEFINED);
     current = entity_descriptor_map[Type::IfcFaceOuterBound] = new IfcEntityDescriptor(Type::IfcFaceOuterBound,entity_descriptor_map.find(Type::IfcFaceBound)->second);
 
     current = entity_descriptor_map[Type::IfcFaceSurface] = new IfcEntityDescriptor(Type::IfcFaceSurface,entity_descriptor_map.find(Type::IfcFace)->second);
-    current->add("FaceSurface",false,IfcUtil::Argument_ENTITY);
-    current->add("SameSense",false,IfcUtil::Argument_BOOL);
+    current->add("FaceSurface",false,IfcUtil::Argument_ENTITY,Type::IfcSurface);
+    current->add("SameSense",false,IfcUtil::Argument_BOOL,Type::UNDEFINED);
     current = entity_descriptor_map[Type::IfcFailureConnectionCondition] = new IfcEntityDescriptor(Type::IfcFailureConnectionCondition,entity_descriptor_map.find(Type::IfcStructuralConnectionCondition)->second);
-    current->add("TensionFailureX",true,IfcUtil::Argument_DOUBLE);
-    current->add("TensionFailureY",true,IfcUtil::Argument_DOUBLE);
-    current->add("TensionFailureZ",true,IfcUtil::Argument_DOUBLE);
-    current->add("CompressionFailureX",true,IfcUtil::Argument_DOUBLE);
-    current->add("CompressionFailureY",true,IfcUtil::Argument_DOUBLE);
-    current->add("CompressionFailureZ",true,IfcUtil::Argument_DOUBLE);
+    current->add("TensionFailureX",true,IfcUtil::Argument_DOUBLE,Type::IfcForceMeasure);
+    current->add("TensionFailureY",true,IfcUtil::Argument_DOUBLE,Type::IfcForceMeasure);
+    current->add("TensionFailureZ",true,IfcUtil::Argument_DOUBLE,Type::IfcForceMeasure);
+    current->add("CompressionFailureX",true,IfcUtil::Argument_DOUBLE,Type::IfcForceMeasure);
+    current->add("CompressionFailureY",true,IfcUtil::Argument_DOUBLE,Type::IfcForceMeasure);
+    current->add("CompressionFailureZ",true,IfcUtil::Argument_DOUBLE,Type::IfcForceMeasure);
     current = entity_descriptor_map[Type::IfcFillAreaStyle] = new IfcEntityDescriptor(Type::IfcFillAreaStyle,entity_descriptor_map.find(Type::IfcPresentationStyle)->second);
-    current->add("FillStyles",false,IfcUtil::Argument_ENTITY_LIST);
-    current->add("ModelorDraughting",true,IfcUtil::Argument_BOOL);
+    current->add("FillStyles",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcFillStyleSelect);
+    current->add("ModelorDraughting",true,IfcUtil::Argument_BOOL,Type::UNDEFINED);
     current = entity_descriptor_map[Type::IfcGeometricRepresentationContext] = new IfcEntityDescriptor(Type::IfcGeometricRepresentationContext,entity_descriptor_map.find(Type::IfcRepresentationContext)->second);
-    current->add("CoordinateSpaceDimension",false,IfcUtil::Argument_INT);
-    current->add("Precision",true,IfcUtil::Argument_DOUBLE);
-    current->add("WorldCoordinateSystem",false,IfcUtil::Argument_ENTITY);
-    current->add("TrueNorth",true,IfcUtil::Argument_ENTITY);
+    current->add("CoordinateSpaceDimension",false,IfcUtil::Argument_INT,Type::IfcDimensionCount);
+    current->add("Precision",true,IfcUtil::Argument_DOUBLE,Type::UNDEFINED);
+    current->add("WorldCoordinateSystem",false,IfcUtil::Argument_ENTITY,Type::IfcAxis2Placement);
+    current->add("TrueNorth",true,IfcUtil::Argument_ENTITY,Type::IfcDirection);
     current = entity_descriptor_map[Type::IfcGeometricRepresentationItem] = new IfcEntityDescriptor(Type::IfcGeometricRepresentationItem,entity_descriptor_map.find(Type::IfcRepresentationItem)->second);
 
     current = entity_descriptor_map[Type::IfcGeometricRepresentationSubContext] = new IfcEntityDescriptor(Type::IfcGeometricRepresentationSubContext,entity_descriptor_map.find(Type::IfcGeometricRepresentationContext)->second);
-    current->add("ParentContext",false,IfcUtil::Argument_ENTITY);
-    current->add("TargetScale",true,IfcUtil::Argument_DOUBLE);
+    current->add("ParentContext",false,IfcUtil::Argument_ENTITY,Type::IfcGeometricRepresentationContext);
+    current->add("TargetScale",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveRatioMeasure);
     current->add("TargetView",false,IfcUtil::Argument_ENUMERATION,Type::IfcGeometricProjectionEnum);
-    current->add("UserDefinedTargetView",true,IfcUtil::Argument_STRING);
+    current->add("UserDefinedTargetView",true,IfcUtil::Argument_STRING,Type::IfcLabel);
     current = entity_descriptor_map[Type::IfcGeometricSet] = new IfcEntityDescriptor(Type::IfcGeometricSet,entity_descriptor_map.find(Type::IfcGeometricRepresentationItem)->second);
-    current->add("Elements",false,IfcUtil::Argument_ENTITY_LIST);
+    current->add("Elements",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcGeometricSetSelect);
     current = entity_descriptor_map[Type::IfcGridPlacement] = new IfcEntityDescriptor(Type::IfcGridPlacement,entity_descriptor_map.find(Type::IfcObjectPlacement)->second);
-    current->add("PlacementLocation",false,IfcUtil::Argument_ENTITY);
-    current->add("PlacementRefDirection",true,IfcUtil::Argument_ENTITY);
+    current->add("PlacementLocation",false,IfcUtil::Argument_ENTITY,Type::IfcVirtualGridIntersection);
+    current->add("PlacementRefDirection",true,IfcUtil::Argument_ENTITY,Type::IfcGridPlacementDirectionSelect);
     current = entity_descriptor_map[Type::IfcHalfSpaceSolid] = new IfcEntityDescriptor(Type::IfcHalfSpaceSolid,entity_descriptor_map.find(Type::IfcGeometricRepresentationItem)->second);
-    current->add("BaseSurface",false,IfcUtil::Argument_ENTITY);
-    current->add("AgreementFlag",false,IfcUtil::Argument_BOOL);
+    current->add("BaseSurface",false,IfcUtil::Argument_ENTITY,Type::IfcSurface);
+    current->add("AgreementFlag",false,IfcUtil::Argument_BOOL,Type::UNDEFINED);
     current = entity_descriptor_map[Type::IfcImageTexture] = new IfcEntityDescriptor(Type::IfcImageTexture,entity_descriptor_map.find(Type::IfcSurfaceTexture)->second);
-    current->add("URLReference",false,IfcUtil::Argument_STRING);
+    current->add("URLReference",false,IfcUtil::Argument_STRING,Type::IfcURIReference);
     current = entity_descriptor_map[Type::IfcIndexedColourMap] = new IfcEntityDescriptor(Type::IfcIndexedColourMap,entity_descriptor_map.find(Type::IfcPresentationItem)->second);
-    current->add("MappedTo",false,IfcUtil::Argument_ENTITY);
-    current->add("Overrides",true,IfcUtil::Argument_ENTITY);
-    current->add("Colours",false,IfcUtil::Argument_ENTITY);
-    current->add("ColourIndex",false,IfcUtil::Argument_VECTOR_INT);
+    current->add("MappedTo",false,IfcUtil::Argument_ENTITY,Type::IfcTessellatedFaceSet);
+    current->add("Overrides",true,IfcUtil::Argument_ENTITY,Type::IfcSurfaceStyleShading);
+    current->add("Colours",false,IfcUtil::Argument_ENTITY,Type::IfcColourRgbList);
+    current->add("ColourIndex",false,IfcUtil::Argument_VECTOR_INT,Type::UNDEFINED);
     current = entity_descriptor_map[Type::IfcIndexedTextureMap] = new IfcEntityDescriptor(Type::IfcIndexedTextureMap,entity_descriptor_map.find(Type::IfcTextureCoordinate)->second);
-    current->add("MappedTo",false,IfcUtil::Argument_ENTITY);
-    current->add("TexCoords",false,IfcUtil::Argument_ENTITY);
+    current->add("MappedTo",false,IfcUtil::Argument_ENTITY,Type::IfcTessellatedFaceSet);
+    current->add("TexCoords",false,IfcUtil::Argument_ENTITY,Type::IfcTextureVertexList);
     current = entity_descriptor_map[Type::IfcIndexedTriangleTextureMap] = new IfcEntityDescriptor(Type::IfcIndexedTriangleTextureMap,entity_descriptor_map.find(Type::IfcIndexedTextureMap)->second);
 
     current = entity_descriptor_map[Type::IfcIrregularTimeSeries] = new IfcEntityDescriptor(Type::IfcIrregularTimeSeries,entity_descriptor_map.find(Type::IfcTimeSeries)->second);
-    current->add("Values",false,IfcUtil::Argument_ENTITY_LIST);
+    current->add("Values",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcIrregularTimeSeriesValue);
     current = entity_descriptor_map[Type::IfcLagTime] = new IfcEntityDescriptor(Type::IfcLagTime,entity_descriptor_map.find(Type::IfcSchedulingTime)->second);
-    current->add("LagValue",false,IfcUtil::Argument_ENTITY);
+    current->add("LagValue",false,IfcUtil::Argument_ENTITY,Type::IfcTimeOrRatioSelect);
     current->add("DurationType",false,IfcUtil::Argument_ENUMERATION,Type::IfcTaskDurationEnum);
     current = entity_descriptor_map[Type::IfcLightSource] = new IfcEntityDescriptor(Type::IfcLightSource,entity_descriptor_map.find(Type::IfcGeometricRepresentationItem)->second);
-    current->add("Name",true,IfcUtil::Argument_STRING);
-    current->add("LightColour",false,IfcUtil::Argument_ENTITY);
-    current->add("AmbientIntensity",true,IfcUtil::Argument_DOUBLE);
-    current->add("Intensity",true,IfcUtil::Argument_DOUBLE);
+    current->add("Name",true,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("LightColour",false,IfcUtil::Argument_ENTITY,Type::IfcColourRgb);
+    current->add("AmbientIntensity",true,IfcUtil::Argument_DOUBLE,Type::IfcNormalisedRatioMeasure);
+    current->add("Intensity",true,IfcUtil::Argument_DOUBLE,Type::IfcNormalisedRatioMeasure);
     current = entity_descriptor_map[Type::IfcLightSourceAmbient] = new IfcEntityDescriptor(Type::IfcLightSourceAmbient,entity_descriptor_map.find(Type::IfcLightSource)->second);
 
     current = entity_descriptor_map[Type::IfcLightSourceDirectional] = new IfcEntityDescriptor(Type::IfcLightSourceDirectional,entity_descriptor_map.find(Type::IfcLightSource)->second);
-    current->add("Orientation",false,IfcUtil::Argument_ENTITY);
+    current->add("Orientation",false,IfcUtil::Argument_ENTITY,Type::IfcDirection);
     current = entity_descriptor_map[Type::IfcLightSourceGoniometric] = new IfcEntityDescriptor(Type::IfcLightSourceGoniometric,entity_descriptor_map.find(Type::IfcLightSource)->second);
-    current->add("Position",false,IfcUtil::Argument_ENTITY);
-    current->add("ColourAppearance",true,IfcUtil::Argument_ENTITY);
-    current->add("ColourTemperature",false,IfcUtil::Argument_DOUBLE);
-    current->add("LuminousFlux",false,IfcUtil::Argument_DOUBLE);
+    current->add("Position",false,IfcUtil::Argument_ENTITY,Type::IfcAxis2Placement3D);
+    current->add("ColourAppearance",true,IfcUtil::Argument_ENTITY,Type::IfcColourRgb);
+    current->add("ColourTemperature",false,IfcUtil::Argument_DOUBLE,Type::IfcThermodynamicTemperatureMeasure);
+    current->add("LuminousFlux",false,IfcUtil::Argument_DOUBLE,Type::IfcLuminousFluxMeasure);
     current->add("LightEmissionSource",false,IfcUtil::Argument_ENUMERATION,Type::IfcLightEmissionSourceEnum);
-    current->add("LightDistributionDataSource",false,IfcUtil::Argument_ENTITY);
+    current->add("LightDistributionDataSource",false,IfcUtil::Argument_ENTITY,Type::IfcLightDistributionDataSourceSelect);
     current = entity_descriptor_map[Type::IfcLightSourcePositional] = new IfcEntityDescriptor(Type::IfcLightSourcePositional,entity_descriptor_map.find(Type::IfcLightSource)->second);
-    current->add("Position",false,IfcUtil::Argument_ENTITY);
-    current->add("Radius",false,IfcUtil::Argument_DOUBLE);
-    current->add("ConstantAttenuation",false,IfcUtil::Argument_DOUBLE);
-    current->add("DistanceAttenuation",false,IfcUtil::Argument_DOUBLE);
-    current->add("QuadricAttenuation",false,IfcUtil::Argument_DOUBLE);
+    current->add("Position",false,IfcUtil::Argument_ENTITY,Type::IfcCartesianPoint);
+    current->add("Radius",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("ConstantAttenuation",false,IfcUtil::Argument_DOUBLE,Type::IfcReal);
+    current->add("DistanceAttenuation",false,IfcUtil::Argument_DOUBLE,Type::IfcReal);
+    current->add("QuadricAttenuation",false,IfcUtil::Argument_DOUBLE,Type::IfcReal);
     current = entity_descriptor_map[Type::IfcLightSourceSpot] = new IfcEntityDescriptor(Type::IfcLightSourceSpot,entity_descriptor_map.find(Type::IfcLightSourcePositional)->second);
-    current->add("Orientation",false,IfcUtil::Argument_ENTITY);
-    current->add("ConcentrationExponent",true,IfcUtil::Argument_DOUBLE);
-    current->add("SpreadAngle",false,IfcUtil::Argument_DOUBLE);
-    current->add("BeamWidthAngle",false,IfcUtil::Argument_DOUBLE);
+    current->add("Orientation",false,IfcUtil::Argument_ENTITY,Type::IfcDirection);
+    current->add("ConcentrationExponent",true,IfcUtil::Argument_DOUBLE,Type::IfcReal);
+    current->add("SpreadAngle",false,IfcUtil::Argument_DOUBLE,Type::IfcPositivePlaneAngleMeasure);
+    current->add("BeamWidthAngle",false,IfcUtil::Argument_DOUBLE,Type::IfcPositivePlaneAngleMeasure);
     current = entity_descriptor_map[Type::IfcLocalPlacement] = new IfcEntityDescriptor(Type::IfcLocalPlacement,entity_descriptor_map.find(Type::IfcObjectPlacement)->second);
-    current->add("PlacementRelTo",true,IfcUtil::Argument_ENTITY);
-    current->add("RelativePlacement",false,IfcUtil::Argument_ENTITY);
+    current->add("PlacementRelTo",true,IfcUtil::Argument_ENTITY,Type::IfcObjectPlacement);
+    current->add("RelativePlacement",false,IfcUtil::Argument_ENTITY,Type::IfcAxis2Placement);
     current = entity_descriptor_map[Type::IfcLoop] = new IfcEntityDescriptor(Type::IfcLoop,entity_descriptor_map.find(Type::IfcTopologicalRepresentationItem)->second);
 
     current = entity_descriptor_map[Type::IfcMappedItem] = new IfcEntityDescriptor(Type::IfcMappedItem,entity_descriptor_map.find(Type::IfcRepresentationItem)->second);
-    current->add("MappingSource",false,IfcUtil::Argument_ENTITY);
-    current->add("MappingTarget",false,IfcUtil::Argument_ENTITY);
+    current->add("MappingSource",false,IfcUtil::Argument_ENTITY,Type::IfcRepresentationMap);
+    current->add("MappingTarget",false,IfcUtil::Argument_ENTITY,Type::IfcCartesianTransformationOperator);
     current = entity_descriptor_map[Type::IfcMaterial] = new IfcEntityDescriptor(Type::IfcMaterial,entity_descriptor_map.find(Type::IfcMaterialDefinition)->second);
-    current->add("Name",false,IfcUtil::Argument_STRING);
-    current->add("Description",true,IfcUtil::Argument_STRING);
-    current->add("Category",true,IfcUtil::Argument_STRING);
+    current->add("Name",false,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("Description",true,IfcUtil::Argument_STRING,Type::IfcText);
+    current->add("Category",true,IfcUtil::Argument_STRING,Type::IfcLabel);
     current = entity_descriptor_map[Type::IfcMaterialConstituent] = new IfcEntityDescriptor(Type::IfcMaterialConstituent,entity_descriptor_map.find(Type::IfcMaterialDefinition)->second);
-    current->add("Name",true,IfcUtil::Argument_STRING);
-    current->add("Description",true,IfcUtil::Argument_STRING);
-    current->add("Material",false,IfcUtil::Argument_ENTITY);
-    current->add("Fraction",true,IfcUtil::Argument_DOUBLE);
-    current->add("Category",true,IfcUtil::Argument_STRING);
+    current->add("Name",true,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("Description",true,IfcUtil::Argument_STRING,Type::IfcText);
+    current->add("Material",false,IfcUtil::Argument_ENTITY,Type::IfcMaterial);
+    current->add("Fraction",true,IfcUtil::Argument_DOUBLE,Type::IfcNormalisedRatioMeasure);
+    current->add("Category",true,IfcUtil::Argument_STRING,Type::IfcLabel);
     current = entity_descriptor_map[Type::IfcMaterialConstituentSet] = new IfcEntityDescriptor(Type::IfcMaterialConstituentSet,entity_descriptor_map.find(Type::IfcMaterialDefinition)->second);
-    current->add("Name",true,IfcUtil::Argument_STRING);
-    current->add("Description",true,IfcUtil::Argument_STRING);
-    current->add("MaterialConstituents",true,IfcUtil::Argument_ENTITY_LIST);
+    current->add("Name",true,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("Description",true,IfcUtil::Argument_STRING,Type::IfcText);
+    current->add("MaterialConstituents",true,IfcUtil::Argument_ENTITY_LIST,Type::IfcMaterialConstituent);
     current = entity_descriptor_map[Type::IfcMaterialDefinitionRepresentation] = new IfcEntityDescriptor(Type::IfcMaterialDefinitionRepresentation,entity_descriptor_map.find(Type::IfcProductRepresentation)->second);
-    current->add("RepresentedMaterial",false,IfcUtil::Argument_ENTITY);
+    current->add("RepresentedMaterial",false,IfcUtil::Argument_ENTITY,Type::IfcMaterial);
     current = entity_descriptor_map[Type::IfcMaterialLayerSetUsage] = new IfcEntityDescriptor(Type::IfcMaterialLayerSetUsage,entity_descriptor_map.find(Type::IfcMaterialUsageDefinition)->second);
-    current->add("ForLayerSet",false,IfcUtil::Argument_ENTITY);
+    current->add("ForLayerSet",false,IfcUtil::Argument_ENTITY,Type::IfcMaterialLayerSet);
     current->add("LayerSetDirection",false,IfcUtil::Argument_ENUMERATION,Type::IfcLayerSetDirectionEnum);
     current->add("DirectionSense",false,IfcUtil::Argument_ENUMERATION,Type::IfcDirectionSenseEnum);
-    current->add("OffsetFromReferenceLine",false,IfcUtil::Argument_DOUBLE);
-    current->add("ReferenceExtent",true,IfcUtil::Argument_DOUBLE);
+    current->add("OffsetFromReferenceLine",false,IfcUtil::Argument_DOUBLE,Type::IfcLengthMeasure);
+    current->add("ReferenceExtent",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
     current = entity_descriptor_map[Type::IfcMaterialProfileSetUsage] = new IfcEntityDescriptor(Type::IfcMaterialProfileSetUsage,entity_descriptor_map.find(Type::IfcMaterialUsageDefinition)->second);
-    current->add("ForProfileSet",false,IfcUtil::Argument_ENTITY);
-    current->add("CardinalPoint",true,IfcUtil::Argument_INT);
-    current->add("ReferenceExtent",true,IfcUtil::Argument_DOUBLE);
+    current->add("ForProfileSet",false,IfcUtil::Argument_ENTITY,Type::IfcMaterialProfileSet);
+    current->add("CardinalPoint",true,IfcUtil::Argument_INT,Type::IfcCardinalPointReference);
+    current->add("ReferenceExtent",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
     current = entity_descriptor_map[Type::IfcMaterialProfileSetUsageTapering] = new IfcEntityDescriptor(Type::IfcMaterialProfileSetUsageTapering,entity_descriptor_map.find(Type::IfcMaterialProfileSetUsage)->second);
-    current->add("ForProfileEndSet",false,IfcUtil::Argument_ENTITY);
-    current->add("CardinalEndPoint",true,IfcUtil::Argument_INT);
+    current->add("ForProfileEndSet",false,IfcUtil::Argument_ENTITY,Type::IfcMaterialProfileSet);
+    current->add("CardinalEndPoint",true,IfcUtil::Argument_INT,Type::IfcCardinalPointReference);
     current = entity_descriptor_map[Type::IfcMaterialProperties] = new IfcEntityDescriptor(Type::IfcMaterialProperties,entity_descriptor_map.find(Type::IfcExtendedProperties)->second);
-    current->add("Material",false,IfcUtil::Argument_ENTITY);
+    current->add("Material",false,IfcUtil::Argument_ENTITY,Type::IfcMaterialDefinition);
     current = entity_descriptor_map[Type::IfcMaterialRelationship] = new IfcEntityDescriptor(Type::IfcMaterialRelationship,entity_descriptor_map.find(Type::IfcResourceLevelRelationship)->second);
-    current->add("RelatingMaterial",false,IfcUtil::Argument_ENTITY);
-    current->add("RelatedMaterials",false,IfcUtil::Argument_ENTITY_LIST);
-    current->add("Expression",true,IfcUtil::Argument_STRING);
+    current->add("RelatingMaterial",false,IfcUtil::Argument_ENTITY,Type::IfcMaterial);
+    current->add("RelatedMaterials",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcMaterial);
+    current->add("Expression",true,IfcUtil::Argument_STRING,Type::IfcLabel);
     current = entity_descriptor_map[Type::IfcMirroredProfileDef] = new IfcEntityDescriptor(Type::IfcMirroredProfileDef,entity_descriptor_map.find(Type::IfcDerivedProfileDef)->second);
 
     current = entity_descriptor_map[Type::IfcObjectDefinition] = new IfcEntityDescriptor(Type::IfcObjectDefinition,entity_descriptor_map.find(Type::IfcRoot)->second);
@@ -1039,45 +1053,45 @@ void InitDescriptorMap() {
     current = entity_descriptor_map[Type::IfcOpenShell] = new IfcEntityDescriptor(Type::IfcOpenShell,entity_descriptor_map.find(Type::IfcConnectedFaceSet)->second);
 
     current = entity_descriptor_map[Type::IfcOrganizationRelationship] = new IfcEntityDescriptor(Type::IfcOrganizationRelationship,entity_descriptor_map.find(Type::IfcResourceLevelRelationship)->second);
-    current->add("RelatingOrganization",false,IfcUtil::Argument_ENTITY);
-    current->add("RelatedOrganizations",false,IfcUtil::Argument_ENTITY_LIST);
+    current->add("RelatingOrganization",false,IfcUtil::Argument_ENTITY,Type::IfcOrganization);
+    current->add("RelatedOrganizations",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcOrganization);
     current = entity_descriptor_map[Type::IfcOrientedEdge] = new IfcEntityDescriptor(Type::IfcOrientedEdge,entity_descriptor_map.find(Type::IfcEdge)->second);
-    current->add("EdgeElement",false,IfcUtil::Argument_ENTITY);
-    current->add("Orientation",false,IfcUtil::Argument_BOOL);
+    current->add("EdgeElement",false,IfcUtil::Argument_ENTITY,Type::IfcEdge);
+    current->add("Orientation",false,IfcUtil::Argument_BOOL,Type::UNDEFINED);
     current = entity_descriptor_map[Type::IfcParameterizedProfileDef] = new IfcEntityDescriptor(Type::IfcParameterizedProfileDef,entity_descriptor_map.find(Type::IfcProfileDef)->second);
-    current->add("Position",true,IfcUtil::Argument_ENTITY);
+    current->add("Position",true,IfcUtil::Argument_ENTITY,Type::IfcAxis2Placement2D);
     current = entity_descriptor_map[Type::IfcPath] = new IfcEntityDescriptor(Type::IfcPath,entity_descriptor_map.find(Type::IfcTopologicalRepresentationItem)->second);
-    current->add("EdgeList",false,IfcUtil::Argument_ENTITY_LIST);
+    current->add("EdgeList",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcOrientedEdge);
     current = entity_descriptor_map[Type::IfcPhysicalComplexQuantity] = new IfcEntityDescriptor(Type::IfcPhysicalComplexQuantity,entity_descriptor_map.find(Type::IfcPhysicalQuantity)->second);
-    current->add("HasQuantities",false,IfcUtil::Argument_ENTITY_LIST);
-    current->add("Discrimination",false,IfcUtil::Argument_STRING);
-    current->add("Quality",true,IfcUtil::Argument_STRING);
-    current->add("Usage",true,IfcUtil::Argument_STRING);
+    current->add("HasQuantities",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcPhysicalQuantity);
+    current->add("Discrimination",false,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("Quality",true,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("Usage",true,IfcUtil::Argument_STRING,Type::IfcLabel);
     current = entity_descriptor_map[Type::IfcPixelTexture] = new IfcEntityDescriptor(Type::IfcPixelTexture,entity_descriptor_map.find(Type::IfcSurfaceTexture)->second);
-    current->add("Width",false,IfcUtil::Argument_INT);
-    current->add("Height",false,IfcUtil::Argument_INT);
-    current->add("ColourComponents",false,IfcUtil::Argument_INT);
+    current->add("Width",false,IfcUtil::Argument_INT,Type::IfcInteger);
+    current->add("Height",false,IfcUtil::Argument_INT,Type::IfcInteger);
+    current->add("ColourComponents",false,IfcUtil::Argument_INT,Type::IfcInteger);
     current = entity_descriptor_map[Type::IfcPlacement] = new IfcEntityDescriptor(Type::IfcPlacement,entity_descriptor_map.find(Type::IfcGeometricRepresentationItem)->second);
-    current->add("Location",false,IfcUtil::Argument_ENTITY);
+    current->add("Location",false,IfcUtil::Argument_ENTITY,Type::IfcCartesianPoint);
     current = entity_descriptor_map[Type::IfcPlanarExtent] = new IfcEntityDescriptor(Type::IfcPlanarExtent,entity_descriptor_map.find(Type::IfcGeometricRepresentationItem)->second);
-    current->add("SizeInX",false,IfcUtil::Argument_DOUBLE);
-    current->add("SizeInY",false,IfcUtil::Argument_DOUBLE);
+    current->add("SizeInX",false,IfcUtil::Argument_DOUBLE,Type::IfcLengthMeasure);
+    current->add("SizeInY",false,IfcUtil::Argument_DOUBLE,Type::IfcLengthMeasure);
     current = entity_descriptor_map[Type::IfcPoint] = new IfcEntityDescriptor(Type::IfcPoint,entity_descriptor_map.find(Type::IfcGeometricRepresentationItem)->second);
 
     current = entity_descriptor_map[Type::IfcPointOnCurve] = new IfcEntityDescriptor(Type::IfcPointOnCurve,entity_descriptor_map.find(Type::IfcPoint)->second);
-    current->add("BasisCurve",false,IfcUtil::Argument_ENTITY);
-    current->add("PointParameter",false,IfcUtil::Argument_DOUBLE);
+    current->add("BasisCurve",false,IfcUtil::Argument_ENTITY,Type::IfcCurve);
+    current->add("PointParameter",false,IfcUtil::Argument_DOUBLE,Type::IfcParameterValue);
     current = entity_descriptor_map[Type::IfcPointOnSurface] = new IfcEntityDescriptor(Type::IfcPointOnSurface,entity_descriptor_map.find(Type::IfcPoint)->second);
-    current->add("BasisSurface",false,IfcUtil::Argument_ENTITY);
-    current->add("PointParameterU",false,IfcUtil::Argument_DOUBLE);
-    current->add("PointParameterV",false,IfcUtil::Argument_DOUBLE);
+    current->add("BasisSurface",false,IfcUtil::Argument_ENTITY,Type::IfcSurface);
+    current->add("PointParameterU",false,IfcUtil::Argument_DOUBLE,Type::IfcParameterValue);
+    current->add("PointParameterV",false,IfcUtil::Argument_DOUBLE,Type::IfcParameterValue);
     current = entity_descriptor_map[Type::IfcPolyLoop] = new IfcEntityDescriptor(Type::IfcPolyLoop,entity_descriptor_map.find(Type::IfcLoop)->second);
-    current->add("Polygon",false,IfcUtil::Argument_ENTITY_LIST);
+    current->add("Polygon",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcCartesianPoint);
     current = entity_descriptor_map[Type::IfcPolygonalBoundedHalfSpace] = new IfcEntityDescriptor(Type::IfcPolygonalBoundedHalfSpace,entity_descriptor_map.find(Type::IfcHalfSpaceSolid)->second);
-    current->add("Position",false,IfcUtil::Argument_ENTITY);
-    current->add("PolygonalBoundary",false,IfcUtil::Argument_ENTITY);
+    current->add("Position",false,IfcUtil::Argument_ENTITY,Type::IfcAxis2Placement3D);
+    current->add("PolygonalBoundary",false,IfcUtil::Argument_ENTITY,Type::IfcBoundedCurve);
     current = entity_descriptor_map[Type::IfcPreDefinedItem] = new IfcEntityDescriptor(Type::IfcPreDefinedItem,entity_descriptor_map.find(Type::IfcPresentationItem)->second);
-    current->add("Name",false,IfcUtil::Argument_STRING);
+    current->add("Name",false,IfcUtil::Argument_STRING,Type::IfcLabel);
     current = entity_descriptor_map[Type::IfcPreDefinedProperties] = new IfcEntityDescriptor(Type::IfcPreDefinedProperties,entity_descriptor_map.find(Type::IfcPropertyAbstraction)->second);
 
     current = entity_descriptor_map[Type::IfcPreDefinedTextFont] = new IfcEntityDescriptor(Type::IfcPreDefinedTextFont,entity_descriptor_map.find(Type::IfcPreDefinedItem)->second);
@@ -1085,16 +1099,16 @@ void InitDescriptorMap() {
     current = entity_descriptor_map[Type::IfcProductDefinitionShape] = new IfcEntityDescriptor(Type::IfcProductDefinitionShape,entity_descriptor_map.find(Type::IfcProductRepresentation)->second);
 
     current = entity_descriptor_map[Type::IfcProfileProperties] = new IfcEntityDescriptor(Type::IfcProfileProperties,entity_descriptor_map.find(Type::IfcExtendedProperties)->second);
-    current->add("ProfileDefinition",false,IfcUtil::Argument_ENTITY);
+    current->add("ProfileDefinition",false,IfcUtil::Argument_ENTITY,Type::IfcProfileDef);
     current = entity_descriptor_map[Type::IfcProperty] = new IfcEntityDescriptor(Type::IfcProperty,entity_descriptor_map.find(Type::IfcPropertyAbstraction)->second);
-    current->add("Name",false,IfcUtil::Argument_STRING);
-    current->add("Description",true,IfcUtil::Argument_STRING);
+    current->add("Name",false,IfcUtil::Argument_STRING,Type::IfcIdentifier);
+    current->add("Description",true,IfcUtil::Argument_STRING,Type::IfcText);
     current = entity_descriptor_map[Type::IfcPropertyDefinition] = new IfcEntityDescriptor(Type::IfcPropertyDefinition,entity_descriptor_map.find(Type::IfcRoot)->second);
 
     current = entity_descriptor_map[Type::IfcPropertyDependencyRelationship] = new IfcEntityDescriptor(Type::IfcPropertyDependencyRelationship,entity_descriptor_map.find(Type::IfcResourceLevelRelationship)->second);
-    current->add("DependingProperty",false,IfcUtil::Argument_ENTITY);
-    current->add("DependantProperty",false,IfcUtil::Argument_ENTITY);
-    current->add("Expression",true,IfcUtil::Argument_STRING);
+    current->add("DependingProperty",false,IfcUtil::Argument_ENTITY,Type::IfcProperty);
+    current->add("DependantProperty",false,IfcUtil::Argument_ENTITY,Type::IfcProperty);
+    current->add("Expression",true,IfcUtil::Argument_STRING,Type::IfcText);
     current = entity_descriptor_map[Type::IfcPropertySetDefinition] = new IfcEntityDescriptor(Type::IfcPropertySetDefinition,entity_descriptor_map.find(Type::IfcPropertyDefinition)->second);
 
     current = entity_descriptor_map[Type::IfcPropertyTemplateDefinition] = new IfcEntityDescriptor(Type::IfcPropertyTemplateDefinition,entity_descriptor_map.find(Type::IfcPropertyDefinition)->second);
@@ -1102,343 +1116,343 @@ void InitDescriptorMap() {
     current = entity_descriptor_map[Type::IfcQuantitySet] = new IfcEntityDescriptor(Type::IfcQuantitySet,entity_descriptor_map.find(Type::IfcPropertySetDefinition)->second);
 
     current = entity_descriptor_map[Type::IfcRectangleProfileDef] = new IfcEntityDescriptor(Type::IfcRectangleProfileDef,entity_descriptor_map.find(Type::IfcParameterizedProfileDef)->second);
-    current->add("XDim",false,IfcUtil::Argument_DOUBLE);
-    current->add("YDim",false,IfcUtil::Argument_DOUBLE);
+    current->add("XDim",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("YDim",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
     current = entity_descriptor_map[Type::IfcRegularTimeSeries] = new IfcEntityDescriptor(Type::IfcRegularTimeSeries,entity_descriptor_map.find(Type::IfcTimeSeries)->second);
-    current->add("TimeStep",false,IfcUtil::Argument_DOUBLE);
-    current->add("Values",false,IfcUtil::Argument_ENTITY_LIST);
+    current->add("TimeStep",false,IfcUtil::Argument_DOUBLE,Type::IfcTimeMeasure);
+    current->add("Values",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcTimeSeriesValue);
     current = entity_descriptor_map[Type::IfcReinforcementBarProperties] = new IfcEntityDescriptor(Type::IfcReinforcementBarProperties,entity_descriptor_map.find(Type::IfcPreDefinedProperties)->second);
-    current->add("TotalCrossSectionArea",false,IfcUtil::Argument_DOUBLE);
-    current->add("SteelGrade",false,IfcUtil::Argument_STRING);
+    current->add("TotalCrossSectionArea",false,IfcUtil::Argument_DOUBLE,Type::IfcAreaMeasure);
+    current->add("SteelGrade",false,IfcUtil::Argument_STRING,Type::IfcLabel);
     current->add("BarSurface",true,IfcUtil::Argument_ENUMERATION,Type::IfcReinforcingBarSurfaceEnum);
-    current->add("EffectiveDepth",true,IfcUtil::Argument_DOUBLE);
-    current->add("NominalBarDiameter",true,IfcUtil::Argument_DOUBLE);
-    current->add("BarCount",true,IfcUtil::Argument_DOUBLE);
+    current->add("EffectiveDepth",true,IfcUtil::Argument_DOUBLE,Type::IfcLengthMeasure);
+    current->add("NominalBarDiameter",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("BarCount",true,IfcUtil::Argument_DOUBLE,Type::IfcCountMeasure);
     current = entity_descriptor_map[Type::IfcRelationship] = new IfcEntityDescriptor(Type::IfcRelationship,entity_descriptor_map.find(Type::IfcRoot)->second);
 
     current = entity_descriptor_map[Type::IfcResourceApprovalRelationship] = new IfcEntityDescriptor(Type::IfcResourceApprovalRelationship,entity_descriptor_map.find(Type::IfcResourceLevelRelationship)->second);
-    current->add("RelatedResourceObjects",false,IfcUtil::Argument_ENTITY_LIST);
-    current->add("RelatingApproval",false,IfcUtil::Argument_ENTITY);
+    current->add("RelatedResourceObjects",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcResourceObjectSelect);
+    current->add("RelatingApproval",false,IfcUtil::Argument_ENTITY,Type::IfcApproval);
     current = entity_descriptor_map[Type::IfcResourceConstraintRelationship] = new IfcEntityDescriptor(Type::IfcResourceConstraintRelationship,entity_descriptor_map.find(Type::IfcResourceLevelRelationship)->second);
-    current->add("RelatingConstraint",false,IfcUtil::Argument_ENTITY);
-    current->add("RelatedResourceObjects",false,IfcUtil::Argument_ENTITY_LIST);
+    current->add("RelatingConstraint",false,IfcUtil::Argument_ENTITY,Type::IfcConstraint);
+    current->add("RelatedResourceObjects",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcResourceObjectSelect);
     current = entity_descriptor_map[Type::IfcResourceTime] = new IfcEntityDescriptor(Type::IfcResourceTime,entity_descriptor_map.find(Type::IfcSchedulingTime)->second);
-    current->add("ScheduleWork",true,IfcUtil::Argument_STRING);
-    current->add("ScheduleUsage",true,IfcUtil::Argument_DOUBLE);
-    current->add("ScheduleStart",true,IfcUtil::Argument_STRING);
-    current->add("ScheduleFinish",true,IfcUtil::Argument_STRING);
-    current->add("ScheduleContour",true,IfcUtil::Argument_STRING);
-    current->add("LevelingDelay",true,IfcUtil::Argument_STRING);
-    current->add("IsOverAllocated",true,IfcUtil::Argument_BOOL);
-    current->add("StatusTime",true,IfcUtil::Argument_STRING);
-    current->add("ActualWork",true,IfcUtil::Argument_STRING);
-    current->add("ActualUsage",true,IfcUtil::Argument_DOUBLE);
-    current->add("ActualStart",true,IfcUtil::Argument_STRING);
-    current->add("ActualFinish",true,IfcUtil::Argument_STRING);
-    current->add("RemainingWork",true,IfcUtil::Argument_STRING);
-    current->add("RemainingUsage",true,IfcUtil::Argument_DOUBLE);
-    current->add("Completion",true,IfcUtil::Argument_DOUBLE);
+    current->add("ScheduleWork",true,IfcUtil::Argument_STRING,Type::IfcDuration);
+    current->add("ScheduleUsage",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveRatioMeasure);
+    current->add("ScheduleStart",true,IfcUtil::Argument_STRING,Type::IfcDateTime);
+    current->add("ScheduleFinish",true,IfcUtil::Argument_STRING,Type::IfcDateTime);
+    current->add("ScheduleContour",true,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("LevelingDelay",true,IfcUtil::Argument_STRING,Type::IfcDuration);
+    current->add("IsOverAllocated",true,IfcUtil::Argument_BOOL,Type::UNDEFINED);
+    current->add("StatusTime",true,IfcUtil::Argument_STRING,Type::IfcDateTime);
+    current->add("ActualWork",true,IfcUtil::Argument_STRING,Type::IfcDuration);
+    current->add("ActualUsage",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveRatioMeasure);
+    current->add("ActualStart",true,IfcUtil::Argument_STRING,Type::IfcDateTime);
+    current->add("ActualFinish",true,IfcUtil::Argument_STRING,Type::IfcDateTime);
+    current->add("RemainingWork",true,IfcUtil::Argument_STRING,Type::IfcDuration);
+    current->add("RemainingUsage",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveRatioMeasure);
+    current->add("Completion",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveRatioMeasure);
     current = entity_descriptor_map[Type::IfcRoundedRectangleProfileDef] = new IfcEntityDescriptor(Type::IfcRoundedRectangleProfileDef,entity_descriptor_map.find(Type::IfcRectangleProfileDef)->second);
-    current->add("RoundingRadius",false,IfcUtil::Argument_DOUBLE);
+    current->add("RoundingRadius",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
     current = entity_descriptor_map[Type::IfcSectionProperties] = new IfcEntityDescriptor(Type::IfcSectionProperties,entity_descriptor_map.find(Type::IfcPreDefinedProperties)->second);
     current->add("SectionType",false,IfcUtil::Argument_ENUMERATION,Type::IfcSectionTypeEnum);
-    current->add("StartProfile",false,IfcUtil::Argument_ENTITY);
-    current->add("EndProfile",true,IfcUtil::Argument_ENTITY);
+    current->add("StartProfile",false,IfcUtil::Argument_ENTITY,Type::IfcProfileDef);
+    current->add("EndProfile",true,IfcUtil::Argument_ENTITY,Type::IfcProfileDef);
     current = entity_descriptor_map[Type::IfcSectionReinforcementProperties] = new IfcEntityDescriptor(Type::IfcSectionReinforcementProperties,entity_descriptor_map.find(Type::IfcPreDefinedProperties)->second);
-    current->add("LongitudinalStartPosition",false,IfcUtil::Argument_DOUBLE);
-    current->add("LongitudinalEndPosition",false,IfcUtil::Argument_DOUBLE);
-    current->add("TransversePosition",true,IfcUtil::Argument_DOUBLE);
+    current->add("LongitudinalStartPosition",false,IfcUtil::Argument_DOUBLE,Type::IfcLengthMeasure);
+    current->add("LongitudinalEndPosition",false,IfcUtil::Argument_DOUBLE,Type::IfcLengthMeasure);
+    current->add("TransversePosition",true,IfcUtil::Argument_DOUBLE,Type::IfcLengthMeasure);
     current->add("ReinforcementRole",false,IfcUtil::Argument_ENUMERATION,Type::IfcReinforcingBarRoleEnum);
-    current->add("SectionDefinition",false,IfcUtil::Argument_ENTITY);
-    current->add("CrossSectionReinforcementDefinitions",false,IfcUtil::Argument_ENTITY_LIST);
+    current->add("SectionDefinition",false,IfcUtil::Argument_ENTITY,Type::IfcSectionProperties);
+    current->add("CrossSectionReinforcementDefinitions",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcReinforcementBarProperties);
     current = entity_descriptor_map[Type::IfcSectionedSpine] = new IfcEntityDescriptor(Type::IfcSectionedSpine,entity_descriptor_map.find(Type::IfcGeometricRepresentationItem)->second);
-    current->add("SpineCurve",false,IfcUtil::Argument_ENTITY);
-    current->add("CrossSections",false,IfcUtil::Argument_ENTITY_LIST);
-    current->add("CrossSectionPositions",false,IfcUtil::Argument_ENTITY_LIST);
+    current->add("SpineCurve",false,IfcUtil::Argument_ENTITY,Type::IfcCompositeCurve);
+    current->add("CrossSections",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcProfileDef);
+    current->add("CrossSectionPositions",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcAxis2Placement3D);
     current = entity_descriptor_map[Type::IfcShellBasedSurfaceModel] = new IfcEntityDescriptor(Type::IfcShellBasedSurfaceModel,entity_descriptor_map.find(Type::IfcGeometricRepresentationItem)->second);
-    current->add("SbsmBoundary",false,IfcUtil::Argument_ENTITY_LIST);
+    current->add("SbsmBoundary",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcShell);
     current = entity_descriptor_map[Type::IfcSimpleProperty] = new IfcEntityDescriptor(Type::IfcSimpleProperty,entity_descriptor_map.find(Type::IfcProperty)->second);
 
     current = entity_descriptor_map[Type::IfcSlippageConnectionCondition] = new IfcEntityDescriptor(Type::IfcSlippageConnectionCondition,entity_descriptor_map.find(Type::IfcStructuralConnectionCondition)->second);
-    current->add("SlippageX",true,IfcUtil::Argument_DOUBLE);
-    current->add("SlippageY",true,IfcUtil::Argument_DOUBLE);
-    current->add("SlippageZ",true,IfcUtil::Argument_DOUBLE);
+    current->add("SlippageX",true,IfcUtil::Argument_DOUBLE,Type::IfcLengthMeasure);
+    current->add("SlippageY",true,IfcUtil::Argument_DOUBLE,Type::IfcLengthMeasure);
+    current->add("SlippageZ",true,IfcUtil::Argument_DOUBLE,Type::IfcLengthMeasure);
     current = entity_descriptor_map[Type::IfcSolidModel] = new IfcEntityDescriptor(Type::IfcSolidModel,entity_descriptor_map.find(Type::IfcGeometricRepresentationItem)->second);
 
     current = entity_descriptor_map[Type::IfcStructuralLoadLinearForce] = new IfcEntityDescriptor(Type::IfcStructuralLoadLinearForce,entity_descriptor_map.find(Type::IfcStructuralLoadStatic)->second);
-    current->add("LinearForceX",true,IfcUtil::Argument_DOUBLE);
-    current->add("LinearForceY",true,IfcUtil::Argument_DOUBLE);
-    current->add("LinearForceZ",true,IfcUtil::Argument_DOUBLE);
-    current->add("LinearMomentX",true,IfcUtil::Argument_DOUBLE);
-    current->add("LinearMomentY",true,IfcUtil::Argument_DOUBLE);
-    current->add("LinearMomentZ",true,IfcUtil::Argument_DOUBLE);
+    current->add("LinearForceX",true,IfcUtil::Argument_DOUBLE,Type::IfcLinearForceMeasure);
+    current->add("LinearForceY",true,IfcUtil::Argument_DOUBLE,Type::IfcLinearForceMeasure);
+    current->add("LinearForceZ",true,IfcUtil::Argument_DOUBLE,Type::IfcLinearForceMeasure);
+    current->add("LinearMomentX",true,IfcUtil::Argument_DOUBLE,Type::IfcLinearMomentMeasure);
+    current->add("LinearMomentY",true,IfcUtil::Argument_DOUBLE,Type::IfcLinearMomentMeasure);
+    current->add("LinearMomentZ",true,IfcUtil::Argument_DOUBLE,Type::IfcLinearMomentMeasure);
     current = entity_descriptor_map[Type::IfcStructuralLoadPlanarForce] = new IfcEntityDescriptor(Type::IfcStructuralLoadPlanarForce,entity_descriptor_map.find(Type::IfcStructuralLoadStatic)->second);
-    current->add("PlanarForceX",true,IfcUtil::Argument_DOUBLE);
-    current->add("PlanarForceY",true,IfcUtil::Argument_DOUBLE);
-    current->add("PlanarForceZ",true,IfcUtil::Argument_DOUBLE);
+    current->add("PlanarForceX",true,IfcUtil::Argument_DOUBLE,Type::IfcPlanarForceMeasure);
+    current->add("PlanarForceY",true,IfcUtil::Argument_DOUBLE,Type::IfcPlanarForceMeasure);
+    current->add("PlanarForceZ",true,IfcUtil::Argument_DOUBLE,Type::IfcPlanarForceMeasure);
     current = entity_descriptor_map[Type::IfcStructuralLoadSingleDisplacement] = new IfcEntityDescriptor(Type::IfcStructuralLoadSingleDisplacement,entity_descriptor_map.find(Type::IfcStructuralLoadStatic)->second);
-    current->add("DisplacementX",true,IfcUtil::Argument_DOUBLE);
-    current->add("DisplacementY",true,IfcUtil::Argument_DOUBLE);
-    current->add("DisplacementZ",true,IfcUtil::Argument_DOUBLE);
-    current->add("RotationalDisplacementRX",true,IfcUtil::Argument_DOUBLE);
-    current->add("RotationalDisplacementRY",true,IfcUtil::Argument_DOUBLE);
-    current->add("RotationalDisplacementRZ",true,IfcUtil::Argument_DOUBLE);
+    current->add("DisplacementX",true,IfcUtil::Argument_DOUBLE,Type::IfcLengthMeasure);
+    current->add("DisplacementY",true,IfcUtil::Argument_DOUBLE,Type::IfcLengthMeasure);
+    current->add("DisplacementZ",true,IfcUtil::Argument_DOUBLE,Type::IfcLengthMeasure);
+    current->add("RotationalDisplacementRX",true,IfcUtil::Argument_DOUBLE,Type::IfcPlaneAngleMeasure);
+    current->add("RotationalDisplacementRY",true,IfcUtil::Argument_DOUBLE,Type::IfcPlaneAngleMeasure);
+    current->add("RotationalDisplacementRZ",true,IfcUtil::Argument_DOUBLE,Type::IfcPlaneAngleMeasure);
     current = entity_descriptor_map[Type::IfcStructuralLoadSingleDisplacementDistortion] = new IfcEntityDescriptor(Type::IfcStructuralLoadSingleDisplacementDistortion,entity_descriptor_map.find(Type::IfcStructuralLoadSingleDisplacement)->second);
-    current->add("Distortion",true,IfcUtil::Argument_DOUBLE);
+    current->add("Distortion",true,IfcUtil::Argument_DOUBLE,Type::IfcCurvatureMeasure);
     current = entity_descriptor_map[Type::IfcStructuralLoadSingleForce] = new IfcEntityDescriptor(Type::IfcStructuralLoadSingleForce,entity_descriptor_map.find(Type::IfcStructuralLoadStatic)->second);
-    current->add("ForceX",true,IfcUtil::Argument_DOUBLE);
-    current->add("ForceY",true,IfcUtil::Argument_DOUBLE);
-    current->add("ForceZ",true,IfcUtil::Argument_DOUBLE);
-    current->add("MomentX",true,IfcUtil::Argument_DOUBLE);
-    current->add("MomentY",true,IfcUtil::Argument_DOUBLE);
-    current->add("MomentZ",true,IfcUtil::Argument_DOUBLE);
+    current->add("ForceX",true,IfcUtil::Argument_DOUBLE,Type::IfcForceMeasure);
+    current->add("ForceY",true,IfcUtil::Argument_DOUBLE,Type::IfcForceMeasure);
+    current->add("ForceZ",true,IfcUtil::Argument_DOUBLE,Type::IfcForceMeasure);
+    current->add("MomentX",true,IfcUtil::Argument_DOUBLE,Type::IfcTorqueMeasure);
+    current->add("MomentY",true,IfcUtil::Argument_DOUBLE,Type::IfcTorqueMeasure);
+    current->add("MomentZ",true,IfcUtil::Argument_DOUBLE,Type::IfcTorqueMeasure);
     current = entity_descriptor_map[Type::IfcStructuralLoadSingleForceWarping] = new IfcEntityDescriptor(Type::IfcStructuralLoadSingleForceWarping,entity_descriptor_map.find(Type::IfcStructuralLoadSingleForce)->second);
-    current->add("WarpingMoment",true,IfcUtil::Argument_DOUBLE);
+    current->add("WarpingMoment",true,IfcUtil::Argument_DOUBLE,Type::IfcWarpingMomentMeasure);
     current = entity_descriptor_map[Type::IfcSubedge] = new IfcEntityDescriptor(Type::IfcSubedge,entity_descriptor_map.find(Type::IfcEdge)->second);
-    current->add("ParentEdge",false,IfcUtil::Argument_ENTITY);
+    current->add("ParentEdge",false,IfcUtil::Argument_ENTITY,Type::IfcEdge);
     current = entity_descriptor_map[Type::IfcSurface] = new IfcEntityDescriptor(Type::IfcSurface,entity_descriptor_map.find(Type::IfcGeometricRepresentationItem)->second);
 
     current = entity_descriptor_map[Type::IfcSurfaceStyleRendering] = new IfcEntityDescriptor(Type::IfcSurfaceStyleRendering,entity_descriptor_map.find(Type::IfcSurfaceStyleShading)->second);
-    current->add("Transparency",true,IfcUtil::Argument_DOUBLE);
-    current->add("DiffuseColour",true,IfcUtil::Argument_ENTITY);
-    current->add("TransmissionColour",true,IfcUtil::Argument_ENTITY);
-    current->add("DiffuseTransmissionColour",true,IfcUtil::Argument_ENTITY);
-    current->add("ReflectionColour",true,IfcUtil::Argument_ENTITY);
-    current->add("SpecularColour",true,IfcUtil::Argument_ENTITY);
-    current->add("SpecularHighlight",true,IfcUtil::Argument_ENTITY);
+    current->add("Transparency",true,IfcUtil::Argument_DOUBLE,Type::IfcNormalisedRatioMeasure);
+    current->add("DiffuseColour",true,IfcUtil::Argument_ENTITY,Type::IfcColourOrFactor);
+    current->add("TransmissionColour",true,IfcUtil::Argument_ENTITY,Type::IfcColourOrFactor);
+    current->add("DiffuseTransmissionColour",true,IfcUtil::Argument_ENTITY,Type::IfcColourOrFactor);
+    current->add("ReflectionColour",true,IfcUtil::Argument_ENTITY,Type::IfcColourOrFactor);
+    current->add("SpecularColour",true,IfcUtil::Argument_ENTITY,Type::IfcColourOrFactor);
+    current->add("SpecularHighlight",true,IfcUtil::Argument_ENTITY,Type::IfcSpecularHighlightSelect);
     current->add("ReflectanceMethod",false,IfcUtil::Argument_ENUMERATION,Type::IfcReflectanceMethodEnum);
     current = entity_descriptor_map[Type::IfcSweptAreaSolid] = new IfcEntityDescriptor(Type::IfcSweptAreaSolid,entity_descriptor_map.find(Type::IfcSolidModel)->second);
-    current->add("SweptArea",false,IfcUtil::Argument_ENTITY);
-    current->add("Position",true,IfcUtil::Argument_ENTITY);
+    current->add("SweptArea",false,IfcUtil::Argument_ENTITY,Type::IfcProfileDef);
+    current->add("Position",true,IfcUtil::Argument_ENTITY,Type::IfcAxis2Placement3D);
     current = entity_descriptor_map[Type::IfcSweptDiskSolid] = new IfcEntityDescriptor(Type::IfcSweptDiskSolid,entity_descriptor_map.find(Type::IfcSolidModel)->second);
-    current->add("Directrix",false,IfcUtil::Argument_ENTITY);
-    current->add("Radius",false,IfcUtil::Argument_DOUBLE);
-    current->add("InnerRadius",true,IfcUtil::Argument_DOUBLE);
-    current->add("StartParam",true,IfcUtil::Argument_DOUBLE);
-    current->add("EndParam",true,IfcUtil::Argument_DOUBLE);
+    current->add("Directrix",false,IfcUtil::Argument_ENTITY,Type::IfcCurve);
+    current->add("Radius",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("InnerRadius",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("StartParam",true,IfcUtil::Argument_DOUBLE,Type::IfcParameterValue);
+    current->add("EndParam",true,IfcUtil::Argument_DOUBLE,Type::IfcParameterValue);
     current = entity_descriptor_map[Type::IfcSweptDiskSolidPolygonal] = new IfcEntityDescriptor(Type::IfcSweptDiskSolidPolygonal,entity_descriptor_map.find(Type::IfcSweptDiskSolid)->second);
-    current->add("FilletRadius",true,IfcUtil::Argument_DOUBLE);
+    current->add("FilletRadius",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
     current = entity_descriptor_map[Type::IfcSweptSurface] = new IfcEntityDescriptor(Type::IfcSweptSurface,entity_descriptor_map.find(Type::IfcSurface)->second);
-    current->add("SweptCurve",false,IfcUtil::Argument_ENTITY);
-    current->add("Position",true,IfcUtil::Argument_ENTITY);
+    current->add("SweptCurve",false,IfcUtil::Argument_ENTITY,Type::IfcProfileDef);
+    current->add("Position",true,IfcUtil::Argument_ENTITY,Type::IfcAxis2Placement3D);
     current = entity_descriptor_map[Type::IfcTShapeProfileDef] = new IfcEntityDescriptor(Type::IfcTShapeProfileDef,entity_descriptor_map.find(Type::IfcParameterizedProfileDef)->second);
-    current->add("Depth",false,IfcUtil::Argument_DOUBLE);
-    current->add("FlangeWidth",false,IfcUtil::Argument_DOUBLE);
-    current->add("WebThickness",false,IfcUtil::Argument_DOUBLE);
-    current->add("FlangeThickness",false,IfcUtil::Argument_DOUBLE);
-    current->add("FilletRadius",true,IfcUtil::Argument_DOUBLE);
-    current->add("FlangeEdgeRadius",true,IfcUtil::Argument_DOUBLE);
-    current->add("WebEdgeRadius",true,IfcUtil::Argument_DOUBLE);
-    current->add("WebSlope",true,IfcUtil::Argument_DOUBLE);
-    current->add("FlangeSlope",true,IfcUtil::Argument_DOUBLE);
+    current->add("Depth",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("FlangeWidth",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("WebThickness",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("FlangeThickness",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("FilletRadius",true,IfcUtil::Argument_DOUBLE,Type::IfcNonNegativeLengthMeasure);
+    current->add("FlangeEdgeRadius",true,IfcUtil::Argument_DOUBLE,Type::IfcNonNegativeLengthMeasure);
+    current->add("WebEdgeRadius",true,IfcUtil::Argument_DOUBLE,Type::IfcNonNegativeLengthMeasure);
+    current->add("WebSlope",true,IfcUtil::Argument_DOUBLE,Type::IfcPlaneAngleMeasure);
+    current->add("FlangeSlope",true,IfcUtil::Argument_DOUBLE,Type::IfcPlaneAngleMeasure);
     current = entity_descriptor_map[Type::IfcTessellatedItem] = new IfcEntityDescriptor(Type::IfcTessellatedItem,entity_descriptor_map.find(Type::IfcGeometricRepresentationItem)->second);
 
     current = entity_descriptor_map[Type::IfcTextLiteral] = new IfcEntityDescriptor(Type::IfcTextLiteral,entity_descriptor_map.find(Type::IfcGeometricRepresentationItem)->second);
-    current->add("Literal",false,IfcUtil::Argument_STRING);
-    current->add("Placement",false,IfcUtil::Argument_ENTITY);
+    current->add("Literal",false,IfcUtil::Argument_STRING,Type::IfcPresentableText);
+    current->add("Placement",false,IfcUtil::Argument_ENTITY,Type::IfcAxis2Placement);
     current->add("Path",false,IfcUtil::Argument_ENUMERATION,Type::IfcTextPath);
     current = entity_descriptor_map[Type::IfcTextLiteralWithExtent] = new IfcEntityDescriptor(Type::IfcTextLiteralWithExtent,entity_descriptor_map.find(Type::IfcTextLiteral)->second);
-    current->add("Extent",false,IfcUtil::Argument_ENTITY);
-    current->add("BoxAlignment",false,IfcUtil::Argument_STRING);
+    current->add("Extent",false,IfcUtil::Argument_ENTITY,Type::IfcPlanarExtent);
+    current->add("BoxAlignment",false,IfcUtil::Argument_STRING,Type::IfcBoxAlignment);
     current = entity_descriptor_map[Type::IfcTextStyleFontModel] = new IfcEntityDescriptor(Type::IfcTextStyleFontModel,entity_descriptor_map.find(Type::IfcPreDefinedTextFont)->second);
-    current->add("FontFamily",false,IfcUtil::Argument_VECTOR_STRING);
-    current->add("FontStyle",true,IfcUtil::Argument_STRING);
-    current->add("FontVariant",true,IfcUtil::Argument_STRING);
-    current->add("FontWeight",true,IfcUtil::Argument_STRING);
-    current->add("FontSize",false,IfcUtil::Argument_ENTITY);
+    current->add("FontFamily",false,IfcUtil::Argument_VECTOR_STRING,Type::IfcTextFontName);
+    current->add("FontStyle",true,IfcUtil::Argument_STRING,Type::IfcFontStyle);
+    current->add("FontVariant",true,IfcUtil::Argument_STRING,Type::IfcFontVariant);
+    current->add("FontWeight",true,IfcUtil::Argument_STRING,Type::IfcFontWeight);
+    current->add("FontSize",false,IfcUtil::Argument_ENTITY,Type::IfcSizeSelect);
     current = entity_descriptor_map[Type::IfcTrapeziumProfileDef] = new IfcEntityDescriptor(Type::IfcTrapeziumProfileDef,entity_descriptor_map.find(Type::IfcParameterizedProfileDef)->second);
-    current->add("BottomXDim",false,IfcUtil::Argument_DOUBLE);
-    current->add("TopXDim",false,IfcUtil::Argument_DOUBLE);
-    current->add("YDim",false,IfcUtil::Argument_DOUBLE);
-    current->add("TopXOffset",false,IfcUtil::Argument_DOUBLE);
+    current->add("BottomXDim",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("TopXDim",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("YDim",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("TopXOffset",false,IfcUtil::Argument_DOUBLE,Type::IfcLengthMeasure);
     current = entity_descriptor_map[Type::IfcTypeObject] = new IfcEntityDescriptor(Type::IfcTypeObject,entity_descriptor_map.find(Type::IfcObjectDefinition)->second);
-    current->add("ApplicableOccurrence",true,IfcUtil::Argument_STRING);
-    current->add("HasPropertySets",true,IfcUtil::Argument_ENTITY_LIST);
+    current->add("ApplicableOccurrence",true,IfcUtil::Argument_STRING,Type::IfcIdentifier);
+    current->add("HasPropertySets",true,IfcUtil::Argument_ENTITY_LIST,Type::IfcPropertySetDefinition);
     current = entity_descriptor_map[Type::IfcTypeProcess] = new IfcEntityDescriptor(Type::IfcTypeProcess,entity_descriptor_map.find(Type::IfcTypeObject)->second);
-    current->add("Identification",true,IfcUtil::Argument_STRING);
-    current->add("LongDescription",true,IfcUtil::Argument_STRING);
-    current->add("ProcessType",true,IfcUtil::Argument_STRING);
+    current->add("Identification",true,IfcUtil::Argument_STRING,Type::IfcIdentifier);
+    current->add("LongDescription",true,IfcUtil::Argument_STRING,Type::IfcText);
+    current->add("ProcessType",true,IfcUtil::Argument_STRING,Type::IfcLabel);
     current = entity_descriptor_map[Type::IfcTypeProduct] = new IfcEntityDescriptor(Type::IfcTypeProduct,entity_descriptor_map.find(Type::IfcTypeObject)->second);
-    current->add("RepresentationMaps",true,IfcUtil::Argument_ENTITY_LIST);
-    current->add("Tag",true,IfcUtil::Argument_STRING);
+    current->add("RepresentationMaps",true,IfcUtil::Argument_ENTITY_LIST,Type::IfcRepresentationMap);
+    current->add("Tag",true,IfcUtil::Argument_STRING,Type::IfcLabel);
     current = entity_descriptor_map[Type::IfcTypeResource] = new IfcEntityDescriptor(Type::IfcTypeResource,entity_descriptor_map.find(Type::IfcTypeObject)->second);
-    current->add("Identification",true,IfcUtil::Argument_STRING);
-    current->add("LongDescription",true,IfcUtil::Argument_STRING);
-    current->add("ResourceType",true,IfcUtil::Argument_STRING);
+    current->add("Identification",true,IfcUtil::Argument_STRING,Type::IfcIdentifier);
+    current->add("LongDescription",true,IfcUtil::Argument_STRING,Type::IfcText);
+    current->add("ResourceType",true,IfcUtil::Argument_STRING,Type::IfcLabel);
     current = entity_descriptor_map[Type::IfcUShapeProfileDef] = new IfcEntityDescriptor(Type::IfcUShapeProfileDef,entity_descriptor_map.find(Type::IfcParameterizedProfileDef)->second);
-    current->add("Depth",false,IfcUtil::Argument_DOUBLE);
-    current->add("FlangeWidth",false,IfcUtil::Argument_DOUBLE);
-    current->add("WebThickness",false,IfcUtil::Argument_DOUBLE);
-    current->add("FlangeThickness",false,IfcUtil::Argument_DOUBLE);
-    current->add("FilletRadius",true,IfcUtil::Argument_DOUBLE);
-    current->add("EdgeRadius",true,IfcUtil::Argument_DOUBLE);
-    current->add("FlangeSlope",true,IfcUtil::Argument_DOUBLE);
+    current->add("Depth",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("FlangeWidth",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("WebThickness",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("FlangeThickness",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("FilletRadius",true,IfcUtil::Argument_DOUBLE,Type::IfcNonNegativeLengthMeasure);
+    current->add("EdgeRadius",true,IfcUtil::Argument_DOUBLE,Type::IfcNonNegativeLengthMeasure);
+    current->add("FlangeSlope",true,IfcUtil::Argument_DOUBLE,Type::IfcPlaneAngleMeasure);
     current = entity_descriptor_map[Type::IfcVector] = new IfcEntityDescriptor(Type::IfcVector,entity_descriptor_map.find(Type::IfcGeometricRepresentationItem)->second);
-    current->add("Orientation",false,IfcUtil::Argument_ENTITY);
-    current->add("Magnitude",false,IfcUtil::Argument_DOUBLE);
+    current->add("Orientation",false,IfcUtil::Argument_ENTITY,Type::IfcDirection);
+    current->add("Magnitude",false,IfcUtil::Argument_DOUBLE,Type::IfcLengthMeasure);
     current = entity_descriptor_map[Type::IfcVertexLoop] = new IfcEntityDescriptor(Type::IfcVertexLoop,entity_descriptor_map.find(Type::IfcLoop)->second);
-    current->add("LoopVertex",false,IfcUtil::Argument_ENTITY);
+    current->add("LoopVertex",false,IfcUtil::Argument_ENTITY,Type::IfcVertex);
     current = entity_descriptor_map[Type::IfcWindowStyle] = new IfcEntityDescriptor(Type::IfcWindowStyle,entity_descriptor_map.find(Type::IfcTypeProduct)->second);
     current->add("ConstructionType",false,IfcUtil::Argument_ENUMERATION,Type::IfcWindowStyleConstructionEnum);
     current->add("OperationType",false,IfcUtil::Argument_ENUMERATION,Type::IfcWindowStyleOperationEnum);
-    current->add("ParameterTakesPrecedence",false,IfcUtil::Argument_BOOL);
-    current->add("Sizeable",false,IfcUtil::Argument_BOOL);
+    current->add("ParameterTakesPrecedence",false,IfcUtil::Argument_BOOL,Type::UNDEFINED);
+    current->add("Sizeable",false,IfcUtil::Argument_BOOL,Type::UNDEFINED);
     current = entity_descriptor_map[Type::IfcZShapeProfileDef] = new IfcEntityDescriptor(Type::IfcZShapeProfileDef,entity_descriptor_map.find(Type::IfcParameterizedProfileDef)->second);
-    current->add("Depth",false,IfcUtil::Argument_DOUBLE);
-    current->add("FlangeWidth",false,IfcUtil::Argument_DOUBLE);
-    current->add("WebThickness",false,IfcUtil::Argument_DOUBLE);
-    current->add("FlangeThickness",false,IfcUtil::Argument_DOUBLE);
-    current->add("FilletRadius",true,IfcUtil::Argument_DOUBLE);
-    current->add("EdgeRadius",true,IfcUtil::Argument_DOUBLE);
+    current->add("Depth",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("FlangeWidth",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("WebThickness",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("FlangeThickness",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("FilletRadius",true,IfcUtil::Argument_DOUBLE,Type::IfcNonNegativeLengthMeasure);
+    current->add("EdgeRadius",true,IfcUtil::Argument_DOUBLE,Type::IfcNonNegativeLengthMeasure);
     current = entity_descriptor_map[Type::IfcAdvancedFace] = new IfcEntityDescriptor(Type::IfcAdvancedFace,entity_descriptor_map.find(Type::IfcFaceSurface)->second);
 
     current = entity_descriptor_map[Type::IfcAnnotationFillArea] = new IfcEntityDescriptor(Type::IfcAnnotationFillArea,entity_descriptor_map.find(Type::IfcGeometricRepresentationItem)->second);
-    current->add("OuterBoundary",false,IfcUtil::Argument_ENTITY);
-    current->add("InnerBoundaries",true,IfcUtil::Argument_ENTITY_LIST);
+    current->add("OuterBoundary",false,IfcUtil::Argument_ENTITY,Type::IfcCurve);
+    current->add("InnerBoundaries",true,IfcUtil::Argument_ENTITY_LIST,Type::IfcCurve);
     current = entity_descriptor_map[Type::IfcAsymmetricIShapeProfileDef] = new IfcEntityDescriptor(Type::IfcAsymmetricIShapeProfileDef,entity_descriptor_map.find(Type::IfcParameterizedProfileDef)->second);
-    current->add("BottomFlangeWidth",false,IfcUtil::Argument_DOUBLE);
-    current->add("OverallDepth",false,IfcUtil::Argument_DOUBLE);
-    current->add("WebThickness",false,IfcUtil::Argument_DOUBLE);
-    current->add("BottomFlangeThickness",false,IfcUtil::Argument_DOUBLE);
-    current->add("BottomFlangeFilletRadius",true,IfcUtil::Argument_DOUBLE);
-    current->add("TopFlangeWidth",false,IfcUtil::Argument_DOUBLE);
-    current->add("TopFlangeThickness",true,IfcUtil::Argument_DOUBLE);
-    current->add("TopFlangeFilletRadius",true,IfcUtil::Argument_DOUBLE);
-    current->add("BottomFlangeEdgeRadius",true,IfcUtil::Argument_DOUBLE);
-    current->add("BottomFlangeSlope",true,IfcUtil::Argument_DOUBLE);
-    current->add("TopFlangeEdgeRadius",true,IfcUtil::Argument_DOUBLE);
-    current->add("TopFlangeSlope",true,IfcUtil::Argument_DOUBLE);
+    current->add("BottomFlangeWidth",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("OverallDepth",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("WebThickness",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("BottomFlangeThickness",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("BottomFlangeFilletRadius",true,IfcUtil::Argument_DOUBLE,Type::IfcNonNegativeLengthMeasure);
+    current->add("TopFlangeWidth",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("TopFlangeThickness",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("TopFlangeFilletRadius",true,IfcUtil::Argument_DOUBLE,Type::IfcNonNegativeLengthMeasure);
+    current->add("BottomFlangeEdgeRadius",true,IfcUtil::Argument_DOUBLE,Type::IfcNonNegativeLengthMeasure);
+    current->add("BottomFlangeSlope",true,IfcUtil::Argument_DOUBLE,Type::IfcPlaneAngleMeasure);
+    current->add("TopFlangeEdgeRadius",true,IfcUtil::Argument_DOUBLE,Type::IfcNonNegativeLengthMeasure);
+    current->add("TopFlangeSlope",true,IfcUtil::Argument_DOUBLE,Type::IfcPlaneAngleMeasure);
     current = entity_descriptor_map[Type::IfcAxis1Placement] = new IfcEntityDescriptor(Type::IfcAxis1Placement,entity_descriptor_map.find(Type::IfcPlacement)->second);
-    current->add("Axis",true,IfcUtil::Argument_ENTITY);
+    current->add("Axis",true,IfcUtil::Argument_ENTITY,Type::IfcDirection);
     current = entity_descriptor_map[Type::IfcAxis2Placement2D] = new IfcEntityDescriptor(Type::IfcAxis2Placement2D,entity_descriptor_map.find(Type::IfcPlacement)->second);
-    current->add("RefDirection",true,IfcUtil::Argument_ENTITY);
+    current->add("RefDirection",true,IfcUtil::Argument_ENTITY,Type::IfcDirection);
     current = entity_descriptor_map[Type::IfcAxis2Placement3D] = new IfcEntityDescriptor(Type::IfcAxis2Placement3D,entity_descriptor_map.find(Type::IfcPlacement)->second);
-    current->add("Axis",true,IfcUtil::Argument_ENTITY);
-    current->add("RefDirection",true,IfcUtil::Argument_ENTITY);
+    current->add("Axis",true,IfcUtil::Argument_ENTITY,Type::IfcDirection);
+    current->add("RefDirection",true,IfcUtil::Argument_ENTITY,Type::IfcDirection);
     current = entity_descriptor_map[Type::IfcBooleanResult] = new IfcEntityDescriptor(Type::IfcBooleanResult,entity_descriptor_map.find(Type::IfcGeometricRepresentationItem)->second);
     current->add("Operator",false,IfcUtil::Argument_ENUMERATION,Type::IfcBooleanOperator);
-    current->add("FirstOperand",false,IfcUtil::Argument_ENTITY);
-    current->add("SecondOperand",false,IfcUtil::Argument_ENTITY);
+    current->add("FirstOperand",false,IfcUtil::Argument_ENTITY,Type::IfcBooleanOperand);
+    current->add("SecondOperand",false,IfcUtil::Argument_ENTITY,Type::IfcBooleanOperand);
     current = entity_descriptor_map[Type::IfcBoundedSurface] = new IfcEntityDescriptor(Type::IfcBoundedSurface,entity_descriptor_map.find(Type::IfcSurface)->second);
 
     current = entity_descriptor_map[Type::IfcBoundingBox] = new IfcEntityDescriptor(Type::IfcBoundingBox,entity_descriptor_map.find(Type::IfcGeometricRepresentationItem)->second);
-    current->add("Corner",false,IfcUtil::Argument_ENTITY);
-    current->add("XDim",false,IfcUtil::Argument_DOUBLE);
-    current->add("YDim",false,IfcUtil::Argument_DOUBLE);
-    current->add("ZDim",false,IfcUtil::Argument_DOUBLE);
+    current->add("Corner",false,IfcUtil::Argument_ENTITY,Type::IfcCartesianPoint);
+    current->add("XDim",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("YDim",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("ZDim",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
     current = entity_descriptor_map[Type::IfcBoxedHalfSpace] = new IfcEntityDescriptor(Type::IfcBoxedHalfSpace,entity_descriptor_map.find(Type::IfcHalfSpaceSolid)->second);
-    current->add("Enclosure",false,IfcUtil::Argument_ENTITY);
+    current->add("Enclosure",false,IfcUtil::Argument_ENTITY,Type::IfcBoundingBox);
     current = entity_descriptor_map[Type::IfcCShapeProfileDef] = new IfcEntityDescriptor(Type::IfcCShapeProfileDef,entity_descriptor_map.find(Type::IfcParameterizedProfileDef)->second);
-    current->add("Depth",false,IfcUtil::Argument_DOUBLE);
-    current->add("Width",false,IfcUtil::Argument_DOUBLE);
-    current->add("WallThickness",false,IfcUtil::Argument_DOUBLE);
-    current->add("Girth",false,IfcUtil::Argument_DOUBLE);
-    current->add("InternalFilletRadius",true,IfcUtil::Argument_DOUBLE);
+    current->add("Depth",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("Width",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("WallThickness",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("Girth",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("InternalFilletRadius",true,IfcUtil::Argument_DOUBLE,Type::IfcNonNegativeLengthMeasure);
     current = entity_descriptor_map[Type::IfcCartesianPoint] = new IfcEntityDescriptor(Type::IfcCartesianPoint,entity_descriptor_map.find(Type::IfcPoint)->second);
-    current->add("Coordinates",false,IfcUtil::Argument_VECTOR_DOUBLE);
+    current->add("Coordinates",false,IfcUtil::Argument_VECTOR_DOUBLE,Type::IfcLengthMeasure);
     current = entity_descriptor_map[Type::IfcCartesianPointList] = new IfcEntityDescriptor(Type::IfcCartesianPointList,entity_descriptor_map.find(Type::IfcGeometricRepresentationItem)->second);
 
     current = entity_descriptor_map[Type::IfcCartesianPointList3D] = new IfcEntityDescriptor(Type::IfcCartesianPointList3D,entity_descriptor_map.find(Type::IfcCartesianPointList)->second);
 
     current = entity_descriptor_map[Type::IfcCartesianTransformationOperator] = new IfcEntityDescriptor(Type::IfcCartesianTransformationOperator,entity_descriptor_map.find(Type::IfcGeometricRepresentationItem)->second);
-    current->add("Axis1",true,IfcUtil::Argument_ENTITY);
-    current->add("Axis2",true,IfcUtil::Argument_ENTITY);
-    current->add("LocalOrigin",false,IfcUtil::Argument_ENTITY);
-    current->add("Scale",true,IfcUtil::Argument_DOUBLE);
+    current->add("Axis1",true,IfcUtil::Argument_ENTITY,Type::IfcDirection);
+    current->add("Axis2",true,IfcUtil::Argument_ENTITY,Type::IfcDirection);
+    current->add("LocalOrigin",false,IfcUtil::Argument_ENTITY,Type::IfcCartesianPoint);
+    current->add("Scale",true,IfcUtil::Argument_DOUBLE,Type::UNDEFINED);
     current = entity_descriptor_map[Type::IfcCartesianTransformationOperator2D] = new IfcEntityDescriptor(Type::IfcCartesianTransformationOperator2D,entity_descriptor_map.find(Type::IfcCartesianTransformationOperator)->second);
 
     current = entity_descriptor_map[Type::IfcCartesianTransformationOperator2DnonUniform] = new IfcEntityDescriptor(Type::IfcCartesianTransformationOperator2DnonUniform,entity_descriptor_map.find(Type::IfcCartesianTransformationOperator2D)->second);
-    current->add("Scale2",true,IfcUtil::Argument_DOUBLE);
+    current->add("Scale2",true,IfcUtil::Argument_DOUBLE,Type::UNDEFINED);
     current = entity_descriptor_map[Type::IfcCartesianTransformationOperator3D] = new IfcEntityDescriptor(Type::IfcCartesianTransformationOperator3D,entity_descriptor_map.find(Type::IfcCartesianTransformationOperator)->second);
-    current->add("Axis3",true,IfcUtil::Argument_ENTITY);
+    current->add("Axis3",true,IfcUtil::Argument_ENTITY,Type::IfcDirection);
     current = entity_descriptor_map[Type::IfcCartesianTransformationOperator3DnonUniform] = new IfcEntityDescriptor(Type::IfcCartesianTransformationOperator3DnonUniform,entity_descriptor_map.find(Type::IfcCartesianTransformationOperator3D)->second);
-    current->add("Scale2",true,IfcUtil::Argument_DOUBLE);
-    current->add("Scale3",true,IfcUtil::Argument_DOUBLE);
+    current->add("Scale2",true,IfcUtil::Argument_DOUBLE,Type::UNDEFINED);
+    current->add("Scale3",true,IfcUtil::Argument_DOUBLE,Type::UNDEFINED);
     current = entity_descriptor_map[Type::IfcCircleProfileDef] = new IfcEntityDescriptor(Type::IfcCircleProfileDef,entity_descriptor_map.find(Type::IfcParameterizedProfileDef)->second);
-    current->add("Radius",false,IfcUtil::Argument_DOUBLE);
+    current->add("Radius",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
     current = entity_descriptor_map[Type::IfcClosedShell] = new IfcEntityDescriptor(Type::IfcClosedShell,entity_descriptor_map.find(Type::IfcConnectedFaceSet)->second);
 
     current = entity_descriptor_map[Type::IfcColourRgb] = new IfcEntityDescriptor(Type::IfcColourRgb,entity_descriptor_map.find(Type::IfcColourSpecification)->second);
-    current->add("Red",false,IfcUtil::Argument_DOUBLE);
-    current->add("Green",false,IfcUtil::Argument_DOUBLE);
-    current->add("Blue",false,IfcUtil::Argument_DOUBLE);
+    current->add("Red",false,IfcUtil::Argument_DOUBLE,Type::IfcNormalisedRatioMeasure);
+    current->add("Green",false,IfcUtil::Argument_DOUBLE,Type::IfcNormalisedRatioMeasure);
+    current->add("Blue",false,IfcUtil::Argument_DOUBLE,Type::IfcNormalisedRatioMeasure);
     current = entity_descriptor_map[Type::IfcComplexProperty] = new IfcEntityDescriptor(Type::IfcComplexProperty,entity_descriptor_map.find(Type::IfcProperty)->second);
-    current->add("UsageName",false,IfcUtil::Argument_STRING);
-    current->add("HasProperties",false,IfcUtil::Argument_ENTITY_LIST);
+    current->add("UsageName",false,IfcUtil::Argument_STRING,Type::IfcIdentifier);
+    current->add("HasProperties",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcProperty);
     current = entity_descriptor_map[Type::IfcCompositeCurveSegment] = new IfcEntityDescriptor(Type::IfcCompositeCurveSegment,entity_descriptor_map.find(Type::IfcGeometricRepresentationItem)->second);
     current->add("Transition",false,IfcUtil::Argument_ENUMERATION,Type::IfcTransitionCode);
-    current->add("SameSense",false,IfcUtil::Argument_BOOL);
-    current->add("ParentCurve",false,IfcUtil::Argument_ENTITY);
+    current->add("SameSense",false,IfcUtil::Argument_BOOL,Type::UNDEFINED);
+    current->add("ParentCurve",false,IfcUtil::Argument_ENTITY,Type::IfcCurve);
     current = entity_descriptor_map[Type::IfcConstructionResourceType] = new IfcEntityDescriptor(Type::IfcConstructionResourceType,entity_descriptor_map.find(Type::IfcTypeResource)->second);
-    current->add("BaseCosts",true,IfcUtil::Argument_ENTITY_LIST);
-    current->add("BaseQuantity",true,IfcUtil::Argument_ENTITY);
+    current->add("BaseCosts",true,IfcUtil::Argument_ENTITY_LIST,Type::IfcAppliedValue);
+    current->add("BaseQuantity",true,IfcUtil::Argument_ENTITY,Type::IfcPhysicalQuantity);
     current = entity_descriptor_map[Type::IfcContext] = new IfcEntityDescriptor(Type::IfcContext,entity_descriptor_map.find(Type::IfcObjectDefinition)->second);
-    current->add("ObjectType",true,IfcUtil::Argument_STRING);
-    current->add("LongName",true,IfcUtil::Argument_STRING);
-    current->add("Phase",true,IfcUtil::Argument_STRING);
-    current->add("RepresentationContexts",true,IfcUtil::Argument_ENTITY_LIST);
-    current->add("UnitsInContext",true,IfcUtil::Argument_ENTITY);
+    current->add("ObjectType",true,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("LongName",true,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("Phase",true,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("RepresentationContexts",true,IfcUtil::Argument_ENTITY_LIST,Type::IfcRepresentationContext);
+    current->add("UnitsInContext",true,IfcUtil::Argument_ENTITY,Type::IfcUnitAssignment);
     current = entity_descriptor_map[Type::IfcCrewResourceType] = new IfcEntityDescriptor(Type::IfcCrewResourceType,entity_descriptor_map.find(Type::IfcConstructionResourceType)->second);
     current->add("PredefinedType",false,IfcUtil::Argument_ENUMERATION,Type::IfcCrewResourceTypeEnum);
     current = entity_descriptor_map[Type::IfcCsgPrimitive3D] = new IfcEntityDescriptor(Type::IfcCsgPrimitive3D,entity_descriptor_map.find(Type::IfcGeometricRepresentationItem)->second);
-    current->add("Position",false,IfcUtil::Argument_ENTITY);
+    current->add("Position",false,IfcUtil::Argument_ENTITY,Type::IfcAxis2Placement3D);
     current = entity_descriptor_map[Type::IfcCsgSolid] = new IfcEntityDescriptor(Type::IfcCsgSolid,entity_descriptor_map.find(Type::IfcSolidModel)->second);
-    current->add("TreeRootExpression",false,IfcUtil::Argument_ENTITY);
+    current->add("TreeRootExpression",false,IfcUtil::Argument_ENTITY,Type::IfcCsgSelect);
     current = entity_descriptor_map[Type::IfcCurve] = new IfcEntityDescriptor(Type::IfcCurve,entity_descriptor_map.find(Type::IfcGeometricRepresentationItem)->second);
 
     current = entity_descriptor_map[Type::IfcCurveBoundedPlane] = new IfcEntityDescriptor(Type::IfcCurveBoundedPlane,entity_descriptor_map.find(Type::IfcBoundedSurface)->second);
-    current->add("BasisSurface",false,IfcUtil::Argument_ENTITY);
-    current->add("OuterBoundary",false,IfcUtil::Argument_ENTITY);
-    current->add("InnerBoundaries",false,IfcUtil::Argument_ENTITY_LIST);
+    current->add("BasisSurface",false,IfcUtil::Argument_ENTITY,Type::IfcPlane);
+    current->add("OuterBoundary",false,IfcUtil::Argument_ENTITY,Type::IfcCurve);
+    current->add("InnerBoundaries",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcCurve);
     current = entity_descriptor_map[Type::IfcCurveBoundedSurface] = new IfcEntityDescriptor(Type::IfcCurveBoundedSurface,entity_descriptor_map.find(Type::IfcBoundedSurface)->second);
-    current->add("BasisSurface",false,IfcUtil::Argument_ENTITY);
-    current->add("Boundaries",false,IfcUtil::Argument_ENTITY_LIST);
-    current->add("ImplicitOuter",false,IfcUtil::Argument_BOOL);
+    current->add("BasisSurface",false,IfcUtil::Argument_ENTITY,Type::IfcSurface);
+    current->add("Boundaries",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcBoundaryCurve);
+    current->add("ImplicitOuter",false,IfcUtil::Argument_BOOL,Type::UNDEFINED);
     current = entity_descriptor_map[Type::IfcDirection] = new IfcEntityDescriptor(Type::IfcDirection,entity_descriptor_map.find(Type::IfcGeometricRepresentationItem)->second);
-    current->add("DirectionRatios",false,IfcUtil::Argument_VECTOR_DOUBLE);
+    current->add("DirectionRatios",false,IfcUtil::Argument_VECTOR_DOUBLE,Type::UNDEFINED);
     current = entity_descriptor_map[Type::IfcDoorStyle] = new IfcEntityDescriptor(Type::IfcDoorStyle,entity_descriptor_map.find(Type::IfcTypeProduct)->second);
     current->add("OperationType",false,IfcUtil::Argument_ENUMERATION,Type::IfcDoorStyleOperationEnum);
     current->add("ConstructionType",false,IfcUtil::Argument_ENUMERATION,Type::IfcDoorStyleConstructionEnum);
-    current->add("ParameterTakesPrecedence",false,IfcUtil::Argument_BOOL);
-    current->add("Sizeable",false,IfcUtil::Argument_BOOL);
+    current->add("ParameterTakesPrecedence",false,IfcUtil::Argument_BOOL,Type::UNDEFINED);
+    current->add("Sizeable",false,IfcUtil::Argument_BOOL,Type::UNDEFINED);
     current = entity_descriptor_map[Type::IfcEdgeLoop] = new IfcEntityDescriptor(Type::IfcEdgeLoop,entity_descriptor_map.find(Type::IfcLoop)->second);
-    current->add("EdgeList",false,IfcUtil::Argument_ENTITY_LIST);
+    current->add("EdgeList",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcOrientedEdge);
     current = entity_descriptor_map[Type::IfcElementQuantity] = new IfcEntityDescriptor(Type::IfcElementQuantity,entity_descriptor_map.find(Type::IfcQuantitySet)->second);
-    current->add("MethodOfMeasurement",true,IfcUtil::Argument_STRING);
-    current->add("Quantities",false,IfcUtil::Argument_ENTITY_LIST);
+    current->add("MethodOfMeasurement",true,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("Quantities",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcPhysicalQuantity);
     current = entity_descriptor_map[Type::IfcElementType] = new IfcEntityDescriptor(Type::IfcElementType,entity_descriptor_map.find(Type::IfcTypeProduct)->second);
-    current->add("ElementType",true,IfcUtil::Argument_STRING);
+    current->add("ElementType",true,IfcUtil::Argument_STRING,Type::IfcLabel);
     current = entity_descriptor_map[Type::IfcElementarySurface] = new IfcEntityDescriptor(Type::IfcElementarySurface,entity_descriptor_map.find(Type::IfcSurface)->second);
-    current->add("Position",false,IfcUtil::Argument_ENTITY);
+    current->add("Position",false,IfcUtil::Argument_ENTITY,Type::IfcAxis2Placement3D);
     current = entity_descriptor_map[Type::IfcEllipseProfileDef] = new IfcEntityDescriptor(Type::IfcEllipseProfileDef,entity_descriptor_map.find(Type::IfcParameterizedProfileDef)->second);
-    current->add("SemiAxis1",false,IfcUtil::Argument_DOUBLE);
-    current->add("SemiAxis2",false,IfcUtil::Argument_DOUBLE);
+    current->add("SemiAxis1",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("SemiAxis2",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
     current = entity_descriptor_map[Type::IfcEventType] = new IfcEntityDescriptor(Type::IfcEventType,entity_descriptor_map.find(Type::IfcTypeProcess)->second);
     current->add("PredefinedType",false,IfcUtil::Argument_ENUMERATION,Type::IfcEventTypeEnum);
     current->add("EventTriggerType",false,IfcUtil::Argument_ENUMERATION,Type::IfcEventTriggerTypeEnum);
-    current->add("UserDefinedEventTriggerType",true,IfcUtil::Argument_STRING);
+    current->add("UserDefinedEventTriggerType",true,IfcUtil::Argument_STRING,Type::IfcLabel);
     current = entity_descriptor_map[Type::IfcExtrudedAreaSolid] = new IfcEntityDescriptor(Type::IfcExtrudedAreaSolid,entity_descriptor_map.find(Type::IfcSweptAreaSolid)->second);
-    current->add("ExtrudedDirection",false,IfcUtil::Argument_ENTITY);
-    current->add("Depth",false,IfcUtil::Argument_DOUBLE);
+    current->add("ExtrudedDirection",false,IfcUtil::Argument_ENTITY,Type::IfcDirection);
+    current->add("Depth",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
     current = entity_descriptor_map[Type::IfcExtrudedAreaSolidTapered] = new IfcEntityDescriptor(Type::IfcExtrudedAreaSolidTapered,entity_descriptor_map.find(Type::IfcExtrudedAreaSolid)->second);
-    current->add("EndSweptArea",false,IfcUtil::Argument_ENTITY);
+    current->add("EndSweptArea",false,IfcUtil::Argument_ENTITY,Type::IfcProfileDef);
     current = entity_descriptor_map[Type::IfcFaceBasedSurfaceModel] = new IfcEntityDescriptor(Type::IfcFaceBasedSurfaceModel,entity_descriptor_map.find(Type::IfcGeometricRepresentationItem)->second);
-    current->add("FbsmFaces",false,IfcUtil::Argument_ENTITY_LIST);
+    current->add("FbsmFaces",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcConnectedFaceSet);
     current = entity_descriptor_map[Type::IfcFillAreaStyleHatching] = new IfcEntityDescriptor(Type::IfcFillAreaStyleHatching,entity_descriptor_map.find(Type::IfcGeometricRepresentationItem)->second);
-    current->add("HatchLineAppearance",false,IfcUtil::Argument_ENTITY);
-    current->add("StartOfNextHatchLine",false,IfcUtil::Argument_ENTITY);
-    current->add("PointOfReferenceHatchLine",true,IfcUtil::Argument_ENTITY);
-    current->add("PatternStart",true,IfcUtil::Argument_ENTITY);
-    current->add("HatchLineAngle",false,IfcUtil::Argument_DOUBLE);
+    current->add("HatchLineAppearance",false,IfcUtil::Argument_ENTITY,Type::IfcCurveStyle);
+    current->add("StartOfNextHatchLine",false,IfcUtil::Argument_ENTITY,Type::IfcHatchLineDistanceSelect);
+    current->add("PointOfReferenceHatchLine",true,IfcUtil::Argument_ENTITY,Type::IfcCartesianPoint);
+    current->add("PatternStart",true,IfcUtil::Argument_ENTITY,Type::IfcCartesianPoint);
+    current->add("HatchLineAngle",false,IfcUtil::Argument_DOUBLE,Type::IfcPlaneAngleMeasure);
     current = entity_descriptor_map[Type::IfcFillAreaStyleTiles] = new IfcEntityDescriptor(Type::IfcFillAreaStyleTiles,entity_descriptor_map.find(Type::IfcGeometricRepresentationItem)->second);
-    current->add("TilingPattern",false,IfcUtil::Argument_ENTITY_LIST);
-    current->add("Tiles",false,IfcUtil::Argument_ENTITY_LIST);
-    current->add("TilingScale",false,IfcUtil::Argument_DOUBLE);
+    current->add("TilingPattern",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcVector);
+    current->add("Tiles",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcStyledItem);
+    current->add("TilingScale",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveRatioMeasure);
     current = entity_descriptor_map[Type::IfcFixedReferenceSweptAreaSolid] = new IfcEntityDescriptor(Type::IfcFixedReferenceSweptAreaSolid,entity_descriptor_map.find(Type::IfcSweptAreaSolid)->second);
-    current->add("Directrix",false,IfcUtil::Argument_ENTITY);
-    current->add("StartParam",true,IfcUtil::Argument_DOUBLE);
-    current->add("EndParam",true,IfcUtil::Argument_DOUBLE);
-    current->add("FixedReference",false,IfcUtil::Argument_ENTITY);
+    current->add("Directrix",false,IfcUtil::Argument_ENTITY,Type::IfcCurve);
+    current->add("StartParam",true,IfcUtil::Argument_DOUBLE,Type::IfcParameterValue);
+    current->add("EndParam",true,IfcUtil::Argument_DOUBLE,Type::IfcParameterValue);
+    current->add("FixedReference",false,IfcUtil::Argument_ENTITY,Type::IfcDirection);
     current = entity_descriptor_map[Type::IfcFurnishingElementType] = new IfcEntityDescriptor(Type::IfcFurnishingElementType,entity_descriptor_map.find(Type::IfcElementType)->second);
 
     current = entity_descriptor_map[Type::IfcFurnitureType] = new IfcEntityDescriptor(Type::IfcFurnitureType,entity_descriptor_map.find(Type::IfcFurnishingElementType)->second);
@@ -1449,43 +1463,43 @@ void InitDescriptorMap() {
     current = entity_descriptor_map[Type::IfcGeometricCurveSet] = new IfcEntityDescriptor(Type::IfcGeometricCurveSet,entity_descriptor_map.find(Type::IfcGeometricSet)->second);
 
     current = entity_descriptor_map[Type::IfcIShapeProfileDef] = new IfcEntityDescriptor(Type::IfcIShapeProfileDef,entity_descriptor_map.find(Type::IfcParameterizedProfileDef)->second);
-    current->add("OverallWidth",false,IfcUtil::Argument_DOUBLE);
-    current->add("OverallDepth",false,IfcUtil::Argument_DOUBLE);
-    current->add("WebThickness",false,IfcUtil::Argument_DOUBLE);
-    current->add("FlangeThickness",false,IfcUtil::Argument_DOUBLE);
-    current->add("FilletRadius",true,IfcUtil::Argument_DOUBLE);
-    current->add("FlangeEdgeRadius",true,IfcUtil::Argument_DOUBLE);
-    current->add("FlangeSlope",true,IfcUtil::Argument_DOUBLE);
+    current->add("OverallWidth",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("OverallDepth",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("WebThickness",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("FlangeThickness",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("FilletRadius",true,IfcUtil::Argument_DOUBLE,Type::IfcNonNegativeLengthMeasure);
+    current->add("FlangeEdgeRadius",true,IfcUtil::Argument_DOUBLE,Type::IfcNonNegativeLengthMeasure);
+    current->add("FlangeSlope",true,IfcUtil::Argument_DOUBLE,Type::IfcPlaneAngleMeasure);
     current = entity_descriptor_map[Type::IfcLShapeProfileDef] = new IfcEntityDescriptor(Type::IfcLShapeProfileDef,entity_descriptor_map.find(Type::IfcParameterizedProfileDef)->second);
-    current->add("Depth",false,IfcUtil::Argument_DOUBLE);
-    current->add("Width",true,IfcUtil::Argument_DOUBLE);
-    current->add("Thickness",false,IfcUtil::Argument_DOUBLE);
-    current->add("FilletRadius",true,IfcUtil::Argument_DOUBLE);
-    current->add("EdgeRadius",true,IfcUtil::Argument_DOUBLE);
-    current->add("LegSlope",true,IfcUtil::Argument_DOUBLE);
+    current->add("Depth",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("Width",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("Thickness",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("FilletRadius",true,IfcUtil::Argument_DOUBLE,Type::IfcNonNegativeLengthMeasure);
+    current->add("EdgeRadius",true,IfcUtil::Argument_DOUBLE,Type::IfcNonNegativeLengthMeasure);
+    current->add("LegSlope",true,IfcUtil::Argument_DOUBLE,Type::IfcPlaneAngleMeasure);
     current = entity_descriptor_map[Type::IfcLaborResourceType] = new IfcEntityDescriptor(Type::IfcLaborResourceType,entity_descriptor_map.find(Type::IfcConstructionResourceType)->second);
     current->add("PredefinedType",false,IfcUtil::Argument_ENUMERATION,Type::IfcLaborResourceTypeEnum);
     current = entity_descriptor_map[Type::IfcLine] = new IfcEntityDescriptor(Type::IfcLine,entity_descriptor_map.find(Type::IfcCurve)->second);
-    current->add("Pnt",false,IfcUtil::Argument_ENTITY);
-    current->add("Dir",false,IfcUtil::Argument_ENTITY);
+    current->add("Pnt",false,IfcUtil::Argument_ENTITY,Type::IfcCartesianPoint);
+    current->add("Dir",false,IfcUtil::Argument_ENTITY,Type::IfcVector);
     current = entity_descriptor_map[Type::IfcManifoldSolidBrep] = new IfcEntityDescriptor(Type::IfcManifoldSolidBrep,entity_descriptor_map.find(Type::IfcSolidModel)->second);
-    current->add("Outer",false,IfcUtil::Argument_ENTITY);
+    current->add("Outer",false,IfcUtil::Argument_ENTITY,Type::IfcClosedShell);
     current = entity_descriptor_map[Type::IfcObject] = new IfcEntityDescriptor(Type::IfcObject,entity_descriptor_map.find(Type::IfcObjectDefinition)->second);
-    current->add("ObjectType",true,IfcUtil::Argument_STRING);
+    current->add("ObjectType",true,IfcUtil::Argument_STRING,Type::IfcLabel);
     current = entity_descriptor_map[Type::IfcOffsetCurve2D] = new IfcEntityDescriptor(Type::IfcOffsetCurve2D,entity_descriptor_map.find(Type::IfcCurve)->second);
-    current->add("BasisCurve",false,IfcUtil::Argument_ENTITY);
-    current->add("Distance",false,IfcUtil::Argument_DOUBLE);
-    current->add("SelfIntersect",false,IfcUtil::Argument_BOOL);
+    current->add("BasisCurve",false,IfcUtil::Argument_ENTITY,Type::IfcCurve);
+    current->add("Distance",false,IfcUtil::Argument_DOUBLE,Type::IfcLengthMeasure);
+    current->add("SelfIntersect",false,IfcUtil::Argument_BOOL,Type::UNDEFINED);
     current = entity_descriptor_map[Type::IfcOffsetCurve3D] = new IfcEntityDescriptor(Type::IfcOffsetCurve3D,entity_descriptor_map.find(Type::IfcCurve)->second);
-    current->add("BasisCurve",false,IfcUtil::Argument_ENTITY);
-    current->add("Distance",false,IfcUtil::Argument_DOUBLE);
-    current->add("SelfIntersect",false,IfcUtil::Argument_BOOL);
-    current->add("RefDirection",false,IfcUtil::Argument_ENTITY);
+    current->add("BasisCurve",false,IfcUtil::Argument_ENTITY,Type::IfcCurve);
+    current->add("Distance",false,IfcUtil::Argument_DOUBLE,Type::IfcLengthMeasure);
+    current->add("SelfIntersect",false,IfcUtil::Argument_BOOL,Type::UNDEFINED);
+    current->add("RefDirection",false,IfcUtil::Argument_ENTITY,Type::IfcDirection);
     current = entity_descriptor_map[Type::IfcPcurve] = new IfcEntityDescriptor(Type::IfcPcurve,entity_descriptor_map.find(Type::IfcCurve)->second);
-    current->add("BasisSurface",false,IfcUtil::Argument_ENTITY);
-    current->add("ReferenceCurve",false,IfcUtil::Argument_ENTITY);
+    current->add("BasisSurface",false,IfcUtil::Argument_ENTITY,Type::IfcSurface);
+    current->add("ReferenceCurve",false,IfcUtil::Argument_ENTITY,Type::IfcCurve);
     current = entity_descriptor_map[Type::IfcPlanarBox] = new IfcEntityDescriptor(Type::IfcPlanarBox,entity_descriptor_map.find(Type::IfcPlanarExtent)->second);
-    current->add("Placement",false,IfcUtil::Argument_ENTITY);
+    current->add("Placement",false,IfcUtil::Argument_ENTITY,Type::IfcAxis2Placement);
     current = entity_descriptor_map[Type::IfcPlane] = new IfcEntityDescriptor(Type::IfcPlane,entity_descriptor_map.find(Type::IfcElementarySurface)->second);
 
     current = entity_descriptor_map[Type::IfcPreDefinedColour] = new IfcEntityDescriptor(Type::IfcPreDefinedColour,entity_descriptor_map.find(Type::IfcPreDefinedItem)->second);
@@ -1497,236 +1511,236 @@ void InitDescriptorMap() {
     current = entity_descriptor_map[Type::IfcProcedureType] = new IfcEntityDescriptor(Type::IfcProcedureType,entity_descriptor_map.find(Type::IfcTypeProcess)->second);
     current->add("PredefinedType",false,IfcUtil::Argument_ENUMERATION,Type::IfcProcedureTypeEnum);
     current = entity_descriptor_map[Type::IfcProcess] = new IfcEntityDescriptor(Type::IfcProcess,entity_descriptor_map.find(Type::IfcObject)->second);
-    current->add("Identification",true,IfcUtil::Argument_STRING);
-    current->add("LongDescription",true,IfcUtil::Argument_STRING);
+    current->add("Identification",true,IfcUtil::Argument_STRING,Type::IfcIdentifier);
+    current->add("LongDescription",true,IfcUtil::Argument_STRING,Type::IfcText);
     current = entity_descriptor_map[Type::IfcProduct] = new IfcEntityDescriptor(Type::IfcProduct,entity_descriptor_map.find(Type::IfcObject)->second);
-    current->add("ObjectPlacement",true,IfcUtil::Argument_ENTITY);
-    current->add("Representation",true,IfcUtil::Argument_ENTITY);
+    current->add("ObjectPlacement",true,IfcUtil::Argument_ENTITY,Type::IfcObjectPlacement);
+    current->add("Representation",true,IfcUtil::Argument_ENTITY,Type::IfcProductRepresentation);
     current = entity_descriptor_map[Type::IfcProject] = new IfcEntityDescriptor(Type::IfcProject,entity_descriptor_map.find(Type::IfcContext)->second);
 
     current = entity_descriptor_map[Type::IfcProjectLibrary] = new IfcEntityDescriptor(Type::IfcProjectLibrary,entity_descriptor_map.find(Type::IfcContext)->second);
 
     current = entity_descriptor_map[Type::IfcPropertyBoundedValue] = new IfcEntityDescriptor(Type::IfcPropertyBoundedValue,entity_descriptor_map.find(Type::IfcSimpleProperty)->second);
-    current->add("UpperBoundValue",true,IfcUtil::Argument_ENTITY);
-    current->add("LowerBoundValue",true,IfcUtil::Argument_ENTITY);
-    current->add("Unit",true,IfcUtil::Argument_ENTITY);
-    current->add("SetPointValue",true,IfcUtil::Argument_ENTITY);
+    current->add("UpperBoundValue",true,IfcUtil::Argument_ENTITY,Type::IfcValue);
+    current->add("LowerBoundValue",true,IfcUtil::Argument_ENTITY,Type::IfcValue);
+    current->add("Unit",true,IfcUtil::Argument_ENTITY,Type::IfcUnit);
+    current->add("SetPointValue",true,IfcUtil::Argument_ENTITY,Type::IfcValue);
     current = entity_descriptor_map[Type::IfcPropertyEnumeratedValue] = new IfcEntityDescriptor(Type::IfcPropertyEnumeratedValue,entity_descriptor_map.find(Type::IfcSimpleProperty)->second);
-    current->add("EnumerationValues",true,IfcUtil::Argument_ENTITY_LIST);
-    current->add("EnumerationReference",true,IfcUtil::Argument_ENTITY);
+    current->add("EnumerationValues",true,IfcUtil::Argument_ENTITY_LIST,Type::IfcValue);
+    current->add("EnumerationReference",true,IfcUtil::Argument_ENTITY,Type::IfcPropertyEnumeration);
     current = entity_descriptor_map[Type::IfcPropertyListValue] = new IfcEntityDescriptor(Type::IfcPropertyListValue,entity_descriptor_map.find(Type::IfcSimpleProperty)->second);
-    current->add("ListValues",true,IfcUtil::Argument_ENTITY_LIST);
-    current->add("Unit",true,IfcUtil::Argument_ENTITY);
+    current->add("ListValues",true,IfcUtil::Argument_ENTITY_LIST,Type::IfcValue);
+    current->add("Unit",true,IfcUtil::Argument_ENTITY,Type::IfcUnit);
     current = entity_descriptor_map[Type::IfcPropertyReferenceValue] = new IfcEntityDescriptor(Type::IfcPropertyReferenceValue,entity_descriptor_map.find(Type::IfcSimpleProperty)->second);
-    current->add("UsageName",true,IfcUtil::Argument_STRING);
-    current->add("PropertyReference",true,IfcUtil::Argument_ENTITY);
+    current->add("UsageName",true,IfcUtil::Argument_STRING,Type::IfcText);
+    current->add("PropertyReference",true,IfcUtil::Argument_ENTITY,Type::IfcObjectReferenceSelect);
     current = entity_descriptor_map[Type::IfcPropertySet] = new IfcEntityDescriptor(Type::IfcPropertySet,entity_descriptor_map.find(Type::IfcPropertySetDefinition)->second);
-    current->add("HasProperties",false,IfcUtil::Argument_ENTITY_LIST);
+    current->add("HasProperties",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcProperty);
     current = entity_descriptor_map[Type::IfcPropertySetTemplate] = new IfcEntityDescriptor(Type::IfcPropertySetTemplate,entity_descriptor_map.find(Type::IfcPropertyTemplateDefinition)->second);
     current->add("TemplateType",true,IfcUtil::Argument_ENUMERATION,Type::IfcPropertySetTemplateTypeEnum);
-    current->add("ApplicableEntity",true,IfcUtil::Argument_STRING);
-    current->add("HasPropertyTemplates",false,IfcUtil::Argument_ENTITY_LIST);
+    current->add("ApplicableEntity",true,IfcUtil::Argument_STRING,Type::IfcIdentifier);
+    current->add("HasPropertyTemplates",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcPropertyTemplate);
     current = entity_descriptor_map[Type::IfcPropertySingleValue] = new IfcEntityDescriptor(Type::IfcPropertySingleValue,entity_descriptor_map.find(Type::IfcSimpleProperty)->second);
-    current->add("NominalValue",true,IfcUtil::Argument_ENTITY);
-    current->add("Unit",true,IfcUtil::Argument_ENTITY);
+    current->add("NominalValue",true,IfcUtil::Argument_ENTITY,Type::IfcValue);
+    current->add("Unit",true,IfcUtil::Argument_ENTITY,Type::IfcUnit);
     current = entity_descriptor_map[Type::IfcPropertyTableValue] = new IfcEntityDescriptor(Type::IfcPropertyTableValue,entity_descriptor_map.find(Type::IfcSimpleProperty)->second);
-    current->add("DefiningValues",true,IfcUtil::Argument_ENTITY_LIST);
-    current->add("DefinedValues",true,IfcUtil::Argument_ENTITY_LIST);
-    current->add("Expression",true,IfcUtil::Argument_STRING);
-    current->add("DefiningUnit",true,IfcUtil::Argument_ENTITY);
-    current->add("DefinedUnit",true,IfcUtil::Argument_ENTITY);
+    current->add("DefiningValues",true,IfcUtil::Argument_ENTITY_LIST,Type::IfcValue);
+    current->add("DefinedValues",true,IfcUtil::Argument_ENTITY_LIST,Type::IfcValue);
+    current->add("Expression",true,IfcUtil::Argument_STRING,Type::IfcText);
+    current->add("DefiningUnit",true,IfcUtil::Argument_ENTITY,Type::IfcUnit);
+    current->add("DefinedUnit",true,IfcUtil::Argument_ENTITY,Type::IfcUnit);
     current->add("CurveInterpolation",true,IfcUtil::Argument_ENUMERATION,Type::IfcCurveInterpolationEnum);
     current = entity_descriptor_map[Type::IfcPropertyTemplate] = new IfcEntityDescriptor(Type::IfcPropertyTemplate,entity_descriptor_map.find(Type::IfcPropertyTemplateDefinition)->second);
 
     current = entity_descriptor_map[Type::IfcProxy] = new IfcEntityDescriptor(Type::IfcProxy,entity_descriptor_map.find(Type::IfcProduct)->second);
     current->add("ProxyType",false,IfcUtil::Argument_ENUMERATION,Type::IfcObjectTypeEnum);
-    current->add("Tag",true,IfcUtil::Argument_STRING);
+    current->add("Tag",true,IfcUtil::Argument_STRING,Type::IfcLabel);
     current = entity_descriptor_map[Type::IfcRectangleHollowProfileDef] = new IfcEntityDescriptor(Type::IfcRectangleHollowProfileDef,entity_descriptor_map.find(Type::IfcRectangleProfileDef)->second);
-    current->add("WallThickness",false,IfcUtil::Argument_DOUBLE);
-    current->add("InnerFilletRadius",true,IfcUtil::Argument_DOUBLE);
-    current->add("OuterFilletRadius",true,IfcUtil::Argument_DOUBLE);
+    current->add("WallThickness",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("InnerFilletRadius",true,IfcUtil::Argument_DOUBLE,Type::IfcNonNegativeLengthMeasure);
+    current->add("OuterFilletRadius",true,IfcUtil::Argument_DOUBLE,Type::IfcNonNegativeLengthMeasure);
     current = entity_descriptor_map[Type::IfcRectangularPyramid] = new IfcEntityDescriptor(Type::IfcRectangularPyramid,entity_descriptor_map.find(Type::IfcCsgPrimitive3D)->second);
-    current->add("XLength",false,IfcUtil::Argument_DOUBLE);
-    current->add("YLength",false,IfcUtil::Argument_DOUBLE);
-    current->add("Height",false,IfcUtil::Argument_DOUBLE);
+    current->add("XLength",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("YLength",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("Height",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
     current = entity_descriptor_map[Type::IfcRectangularTrimmedSurface] = new IfcEntityDescriptor(Type::IfcRectangularTrimmedSurface,entity_descriptor_map.find(Type::IfcBoundedSurface)->second);
-    current->add("BasisSurface",false,IfcUtil::Argument_ENTITY);
-    current->add("U1",false,IfcUtil::Argument_DOUBLE);
-    current->add("V1",false,IfcUtil::Argument_DOUBLE);
-    current->add("U2",false,IfcUtil::Argument_DOUBLE);
-    current->add("V2",false,IfcUtil::Argument_DOUBLE);
-    current->add("Usense",false,IfcUtil::Argument_BOOL);
-    current->add("Vsense",false,IfcUtil::Argument_BOOL);
+    current->add("BasisSurface",false,IfcUtil::Argument_ENTITY,Type::IfcSurface);
+    current->add("U1",false,IfcUtil::Argument_DOUBLE,Type::IfcParameterValue);
+    current->add("V1",false,IfcUtil::Argument_DOUBLE,Type::IfcParameterValue);
+    current->add("U2",false,IfcUtil::Argument_DOUBLE,Type::IfcParameterValue);
+    current->add("V2",false,IfcUtil::Argument_DOUBLE,Type::IfcParameterValue);
+    current->add("Usense",false,IfcUtil::Argument_BOOL,Type::UNDEFINED);
+    current->add("Vsense",false,IfcUtil::Argument_BOOL,Type::UNDEFINED);
     current = entity_descriptor_map[Type::IfcReinforcementDefinitionProperties] = new IfcEntityDescriptor(Type::IfcReinforcementDefinitionProperties,entity_descriptor_map.find(Type::IfcPreDefinedPropertySet)->second);
-    current->add("DefinitionType",true,IfcUtil::Argument_STRING);
-    current->add("ReinforcementSectionDefinitions",false,IfcUtil::Argument_ENTITY_LIST);
+    current->add("DefinitionType",true,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("ReinforcementSectionDefinitions",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcSectionReinforcementProperties);
     current = entity_descriptor_map[Type::IfcRelAssigns] = new IfcEntityDescriptor(Type::IfcRelAssigns,entity_descriptor_map.find(Type::IfcRelationship)->second);
-    current->add("RelatedObjects",false,IfcUtil::Argument_ENTITY_LIST);
+    current->add("RelatedObjects",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcObjectDefinition);
     current->add("RelatedObjectsType",true,IfcUtil::Argument_ENUMERATION,Type::IfcObjectTypeEnum);
     current = entity_descriptor_map[Type::IfcRelAssignsToActor] = new IfcEntityDescriptor(Type::IfcRelAssignsToActor,entity_descriptor_map.find(Type::IfcRelAssigns)->second);
-    current->add("RelatingActor",false,IfcUtil::Argument_ENTITY);
-    current->add("ActingRole",true,IfcUtil::Argument_ENTITY);
+    current->add("RelatingActor",false,IfcUtil::Argument_ENTITY,Type::IfcActor);
+    current->add("ActingRole",true,IfcUtil::Argument_ENTITY,Type::IfcActorRole);
     current = entity_descriptor_map[Type::IfcRelAssignsToControl] = new IfcEntityDescriptor(Type::IfcRelAssignsToControl,entity_descriptor_map.find(Type::IfcRelAssigns)->second);
-    current->add("RelatingControl",false,IfcUtil::Argument_ENTITY);
+    current->add("RelatingControl",false,IfcUtil::Argument_ENTITY,Type::IfcControl);
     current = entity_descriptor_map[Type::IfcRelAssignsToGroup] = new IfcEntityDescriptor(Type::IfcRelAssignsToGroup,entity_descriptor_map.find(Type::IfcRelAssigns)->second);
-    current->add("RelatingGroup",false,IfcUtil::Argument_ENTITY);
+    current->add("RelatingGroup",false,IfcUtil::Argument_ENTITY,Type::IfcGroup);
     current = entity_descriptor_map[Type::IfcRelAssignsToGroupByFactor] = new IfcEntityDescriptor(Type::IfcRelAssignsToGroupByFactor,entity_descriptor_map.find(Type::IfcRelAssignsToGroup)->second);
-    current->add("Factor",false,IfcUtil::Argument_DOUBLE);
+    current->add("Factor",false,IfcUtil::Argument_DOUBLE,Type::IfcRatioMeasure);
     current = entity_descriptor_map[Type::IfcRelAssignsToProcess] = new IfcEntityDescriptor(Type::IfcRelAssignsToProcess,entity_descriptor_map.find(Type::IfcRelAssigns)->second);
-    current->add("RelatingProcess",false,IfcUtil::Argument_ENTITY);
-    current->add("QuantityInProcess",true,IfcUtil::Argument_ENTITY);
+    current->add("RelatingProcess",false,IfcUtil::Argument_ENTITY,Type::IfcProcessSelect);
+    current->add("QuantityInProcess",true,IfcUtil::Argument_ENTITY,Type::IfcMeasureWithUnit);
     current = entity_descriptor_map[Type::IfcRelAssignsToProduct] = new IfcEntityDescriptor(Type::IfcRelAssignsToProduct,entity_descriptor_map.find(Type::IfcRelAssigns)->second);
-    current->add("RelatingProduct",false,IfcUtil::Argument_ENTITY);
+    current->add("RelatingProduct",false,IfcUtil::Argument_ENTITY,Type::IfcProductSelect);
     current = entity_descriptor_map[Type::IfcRelAssignsToResource] = new IfcEntityDescriptor(Type::IfcRelAssignsToResource,entity_descriptor_map.find(Type::IfcRelAssigns)->second);
-    current->add("RelatingResource",false,IfcUtil::Argument_ENTITY);
+    current->add("RelatingResource",false,IfcUtil::Argument_ENTITY,Type::IfcResourceSelect);
     current = entity_descriptor_map[Type::IfcRelAssociates] = new IfcEntityDescriptor(Type::IfcRelAssociates,entity_descriptor_map.find(Type::IfcRelationship)->second);
-    current->add("RelatedObjects",false,IfcUtil::Argument_ENTITY_LIST);
+    current->add("RelatedObjects",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcDefinitionSelect);
     current = entity_descriptor_map[Type::IfcRelAssociatesApproval] = new IfcEntityDescriptor(Type::IfcRelAssociatesApproval,entity_descriptor_map.find(Type::IfcRelAssociates)->second);
-    current->add("RelatingApproval",false,IfcUtil::Argument_ENTITY);
+    current->add("RelatingApproval",false,IfcUtil::Argument_ENTITY,Type::IfcApproval);
     current = entity_descriptor_map[Type::IfcRelAssociatesClassification] = new IfcEntityDescriptor(Type::IfcRelAssociatesClassification,entity_descriptor_map.find(Type::IfcRelAssociates)->second);
-    current->add("RelatingClassification",false,IfcUtil::Argument_ENTITY);
+    current->add("RelatingClassification",false,IfcUtil::Argument_ENTITY,Type::IfcClassificationSelect);
     current = entity_descriptor_map[Type::IfcRelAssociatesConstraint] = new IfcEntityDescriptor(Type::IfcRelAssociatesConstraint,entity_descriptor_map.find(Type::IfcRelAssociates)->second);
-    current->add("Intent",true,IfcUtil::Argument_STRING);
-    current->add("RelatingConstraint",false,IfcUtil::Argument_ENTITY);
+    current->add("Intent",true,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("RelatingConstraint",false,IfcUtil::Argument_ENTITY,Type::IfcConstraint);
     current = entity_descriptor_map[Type::IfcRelAssociatesDocument] = new IfcEntityDescriptor(Type::IfcRelAssociatesDocument,entity_descriptor_map.find(Type::IfcRelAssociates)->second);
-    current->add("RelatingDocument",false,IfcUtil::Argument_ENTITY);
+    current->add("RelatingDocument",false,IfcUtil::Argument_ENTITY,Type::IfcDocumentSelect);
     current = entity_descriptor_map[Type::IfcRelAssociatesLibrary] = new IfcEntityDescriptor(Type::IfcRelAssociatesLibrary,entity_descriptor_map.find(Type::IfcRelAssociates)->second);
-    current->add("RelatingLibrary",false,IfcUtil::Argument_ENTITY);
+    current->add("RelatingLibrary",false,IfcUtil::Argument_ENTITY,Type::IfcLibrarySelect);
     current = entity_descriptor_map[Type::IfcRelAssociatesMaterial] = new IfcEntityDescriptor(Type::IfcRelAssociatesMaterial,entity_descriptor_map.find(Type::IfcRelAssociates)->second);
-    current->add("RelatingMaterial",false,IfcUtil::Argument_ENTITY);
+    current->add("RelatingMaterial",false,IfcUtil::Argument_ENTITY,Type::IfcMaterialSelect);
     current = entity_descriptor_map[Type::IfcRelConnects] = new IfcEntityDescriptor(Type::IfcRelConnects,entity_descriptor_map.find(Type::IfcRelationship)->second);
 
     current = entity_descriptor_map[Type::IfcRelConnectsElements] = new IfcEntityDescriptor(Type::IfcRelConnectsElements,entity_descriptor_map.find(Type::IfcRelConnects)->second);
-    current->add("ConnectionGeometry",true,IfcUtil::Argument_ENTITY);
-    current->add("RelatingElement",false,IfcUtil::Argument_ENTITY);
-    current->add("RelatedElement",false,IfcUtil::Argument_ENTITY);
+    current->add("ConnectionGeometry",true,IfcUtil::Argument_ENTITY,Type::IfcConnectionGeometry);
+    current->add("RelatingElement",false,IfcUtil::Argument_ENTITY,Type::IfcElement);
+    current->add("RelatedElement",false,IfcUtil::Argument_ENTITY,Type::IfcElement);
     current = entity_descriptor_map[Type::IfcRelConnectsPathElements] = new IfcEntityDescriptor(Type::IfcRelConnectsPathElements,entity_descriptor_map.find(Type::IfcRelConnectsElements)->second);
-    current->add("RelatingPriorities",false,IfcUtil::Argument_VECTOR_DOUBLE);
-    current->add("RelatedPriorities",false,IfcUtil::Argument_VECTOR_DOUBLE);
+    current->add("RelatingPriorities",false,IfcUtil::Argument_VECTOR_DOUBLE,Type::UNDEFINED);
+    current->add("RelatedPriorities",false,IfcUtil::Argument_VECTOR_DOUBLE,Type::UNDEFINED);
     current->add("RelatedConnectionType",false,IfcUtil::Argument_ENUMERATION,Type::IfcConnectionTypeEnum);
     current->add("RelatingConnectionType",false,IfcUtil::Argument_ENUMERATION,Type::IfcConnectionTypeEnum);
     current = entity_descriptor_map[Type::IfcRelConnectsPortToElement] = new IfcEntityDescriptor(Type::IfcRelConnectsPortToElement,entity_descriptor_map.find(Type::IfcRelConnects)->second);
-    current->add("RelatingPort",false,IfcUtil::Argument_ENTITY);
-    current->add("RelatedElement",false,IfcUtil::Argument_ENTITY);
+    current->add("RelatingPort",false,IfcUtil::Argument_ENTITY,Type::IfcPort);
+    current->add("RelatedElement",false,IfcUtil::Argument_ENTITY,Type::IfcDistributionElement);
     current = entity_descriptor_map[Type::IfcRelConnectsPorts] = new IfcEntityDescriptor(Type::IfcRelConnectsPorts,entity_descriptor_map.find(Type::IfcRelConnects)->second);
-    current->add("RelatingPort",false,IfcUtil::Argument_ENTITY);
-    current->add("RelatedPort",false,IfcUtil::Argument_ENTITY);
-    current->add("RealizingElement",true,IfcUtil::Argument_ENTITY);
+    current->add("RelatingPort",false,IfcUtil::Argument_ENTITY,Type::IfcPort);
+    current->add("RelatedPort",false,IfcUtil::Argument_ENTITY,Type::IfcPort);
+    current->add("RealizingElement",true,IfcUtil::Argument_ENTITY,Type::IfcElement);
     current = entity_descriptor_map[Type::IfcRelConnectsStructuralActivity] = new IfcEntityDescriptor(Type::IfcRelConnectsStructuralActivity,entity_descriptor_map.find(Type::IfcRelConnects)->second);
-    current->add("RelatingElement",false,IfcUtil::Argument_ENTITY);
-    current->add("RelatedStructuralActivity",false,IfcUtil::Argument_ENTITY);
+    current->add("RelatingElement",false,IfcUtil::Argument_ENTITY,Type::IfcStructuralActivityAssignmentSelect);
+    current->add("RelatedStructuralActivity",false,IfcUtil::Argument_ENTITY,Type::IfcStructuralActivity);
     current = entity_descriptor_map[Type::IfcRelConnectsStructuralMember] = new IfcEntityDescriptor(Type::IfcRelConnectsStructuralMember,entity_descriptor_map.find(Type::IfcRelConnects)->second);
-    current->add("RelatingStructuralMember",false,IfcUtil::Argument_ENTITY);
-    current->add("RelatedStructuralConnection",false,IfcUtil::Argument_ENTITY);
-    current->add("AppliedCondition",true,IfcUtil::Argument_ENTITY);
-    current->add("AdditionalConditions",true,IfcUtil::Argument_ENTITY);
-    current->add("SupportedLength",true,IfcUtil::Argument_DOUBLE);
-    current->add("ConditionCoordinateSystem",true,IfcUtil::Argument_ENTITY);
+    current->add("RelatingStructuralMember",false,IfcUtil::Argument_ENTITY,Type::IfcStructuralMember);
+    current->add("RelatedStructuralConnection",false,IfcUtil::Argument_ENTITY,Type::IfcStructuralConnection);
+    current->add("AppliedCondition",true,IfcUtil::Argument_ENTITY,Type::IfcBoundaryCondition);
+    current->add("AdditionalConditions",true,IfcUtil::Argument_ENTITY,Type::IfcStructuralConnectionCondition);
+    current->add("SupportedLength",true,IfcUtil::Argument_DOUBLE,Type::IfcLengthMeasure);
+    current->add("ConditionCoordinateSystem",true,IfcUtil::Argument_ENTITY,Type::IfcAxis2Placement3D);
     current = entity_descriptor_map[Type::IfcRelConnectsWithEccentricity] = new IfcEntityDescriptor(Type::IfcRelConnectsWithEccentricity,entity_descriptor_map.find(Type::IfcRelConnectsStructuralMember)->second);
-    current->add("ConnectionConstraint",false,IfcUtil::Argument_ENTITY);
+    current->add("ConnectionConstraint",false,IfcUtil::Argument_ENTITY,Type::IfcConnectionGeometry);
     current = entity_descriptor_map[Type::IfcRelConnectsWithRealizingElements] = new IfcEntityDescriptor(Type::IfcRelConnectsWithRealizingElements,entity_descriptor_map.find(Type::IfcRelConnectsElements)->second);
-    current->add("RealizingElements",false,IfcUtil::Argument_ENTITY_LIST);
-    current->add("ConnectionType",true,IfcUtil::Argument_STRING);
+    current->add("RealizingElements",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcElement);
+    current->add("ConnectionType",true,IfcUtil::Argument_STRING,Type::IfcLabel);
     current = entity_descriptor_map[Type::IfcRelContainedInSpatialStructure] = new IfcEntityDescriptor(Type::IfcRelContainedInSpatialStructure,entity_descriptor_map.find(Type::IfcRelConnects)->second);
-    current->add("RelatedElements",false,IfcUtil::Argument_ENTITY_LIST);
-    current->add("RelatingStructure",false,IfcUtil::Argument_ENTITY);
+    current->add("RelatedElements",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcProduct);
+    current->add("RelatingStructure",false,IfcUtil::Argument_ENTITY,Type::IfcSpatialElement);
     current = entity_descriptor_map[Type::IfcRelCoversBldgElements] = new IfcEntityDescriptor(Type::IfcRelCoversBldgElements,entity_descriptor_map.find(Type::IfcRelConnects)->second);
-    current->add("RelatingBuildingElement",false,IfcUtil::Argument_ENTITY);
-    current->add("RelatedCoverings",false,IfcUtil::Argument_ENTITY_LIST);
+    current->add("RelatingBuildingElement",false,IfcUtil::Argument_ENTITY,Type::IfcElement);
+    current->add("RelatedCoverings",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcCovering);
     current = entity_descriptor_map[Type::IfcRelCoversSpaces] = new IfcEntityDescriptor(Type::IfcRelCoversSpaces,entity_descriptor_map.find(Type::IfcRelConnects)->second);
-    current->add("RelatingSpace",false,IfcUtil::Argument_ENTITY);
-    current->add("RelatedCoverings",false,IfcUtil::Argument_ENTITY_LIST);
+    current->add("RelatingSpace",false,IfcUtil::Argument_ENTITY,Type::IfcSpace);
+    current->add("RelatedCoverings",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcCovering);
     current = entity_descriptor_map[Type::IfcRelDeclares] = new IfcEntityDescriptor(Type::IfcRelDeclares,entity_descriptor_map.find(Type::IfcRelationship)->second);
-    current->add("RelatingContext",false,IfcUtil::Argument_ENTITY);
-    current->add("RelatedDefinitions",false,IfcUtil::Argument_ENTITY_LIST);
+    current->add("RelatingContext",false,IfcUtil::Argument_ENTITY,Type::IfcContext);
+    current->add("RelatedDefinitions",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcDefinitionSelect);
     current = entity_descriptor_map[Type::IfcRelDecomposes] = new IfcEntityDescriptor(Type::IfcRelDecomposes,entity_descriptor_map.find(Type::IfcRelationship)->second);
 
     current = entity_descriptor_map[Type::IfcRelDefines] = new IfcEntityDescriptor(Type::IfcRelDefines,entity_descriptor_map.find(Type::IfcRelationship)->second);
 
     current = entity_descriptor_map[Type::IfcRelDefinesByObject] = new IfcEntityDescriptor(Type::IfcRelDefinesByObject,entity_descriptor_map.find(Type::IfcRelDefines)->second);
-    current->add("RelatedObjects",false,IfcUtil::Argument_ENTITY_LIST);
-    current->add("RelatingObject",false,IfcUtil::Argument_ENTITY);
+    current->add("RelatedObjects",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcObject);
+    current->add("RelatingObject",false,IfcUtil::Argument_ENTITY,Type::IfcObject);
     current = entity_descriptor_map[Type::IfcRelDefinesByProperties] = new IfcEntityDescriptor(Type::IfcRelDefinesByProperties,entity_descriptor_map.find(Type::IfcRelDefines)->second);
-    current->add("RelatedObjects",false,IfcUtil::Argument_ENTITY_LIST);
-    current->add("RelatingPropertyDefinition",false,IfcUtil::Argument_ENTITY);
+    current->add("RelatedObjects",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcObjectDefinition);
+    current->add("RelatingPropertyDefinition",false,IfcUtil::Argument_ENTITY,Type::IfcPropertySetDefinitionSelect);
     current = entity_descriptor_map[Type::IfcRelDefinesByTemplate] = new IfcEntityDescriptor(Type::IfcRelDefinesByTemplate,entity_descriptor_map.find(Type::IfcRelDefines)->second);
-    current->add("RelatedPropertySets",false,IfcUtil::Argument_ENTITY_LIST);
-    current->add("RelatingTemplate",false,IfcUtil::Argument_ENTITY);
+    current->add("RelatedPropertySets",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcPropertySetDefinition);
+    current->add("RelatingTemplate",false,IfcUtil::Argument_ENTITY,Type::IfcPropertySetTemplate);
     current = entity_descriptor_map[Type::IfcRelDefinesByType] = new IfcEntityDescriptor(Type::IfcRelDefinesByType,entity_descriptor_map.find(Type::IfcRelDefines)->second);
-    current->add("RelatedObjects",false,IfcUtil::Argument_ENTITY_LIST);
-    current->add("RelatingType",false,IfcUtil::Argument_ENTITY);
+    current->add("RelatedObjects",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcObject);
+    current->add("RelatingType",false,IfcUtil::Argument_ENTITY,Type::IfcTypeObject);
     current = entity_descriptor_map[Type::IfcRelFillsElement] = new IfcEntityDescriptor(Type::IfcRelFillsElement,entity_descriptor_map.find(Type::IfcRelConnects)->second);
-    current->add("RelatingOpeningElement",false,IfcUtil::Argument_ENTITY);
-    current->add("RelatedBuildingElement",false,IfcUtil::Argument_ENTITY);
+    current->add("RelatingOpeningElement",false,IfcUtil::Argument_ENTITY,Type::IfcOpeningElement);
+    current->add("RelatedBuildingElement",false,IfcUtil::Argument_ENTITY,Type::IfcElement);
     current = entity_descriptor_map[Type::IfcRelFlowControlElements] = new IfcEntityDescriptor(Type::IfcRelFlowControlElements,entity_descriptor_map.find(Type::IfcRelConnects)->second);
-    current->add("RelatedControlElements",false,IfcUtil::Argument_ENTITY_LIST);
-    current->add("RelatingFlowElement",false,IfcUtil::Argument_ENTITY);
+    current->add("RelatedControlElements",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcDistributionControlElement);
+    current->add("RelatingFlowElement",false,IfcUtil::Argument_ENTITY,Type::IfcDistributionFlowElement);
     current = entity_descriptor_map[Type::IfcRelInterferesElements] = new IfcEntityDescriptor(Type::IfcRelInterferesElements,entity_descriptor_map.find(Type::IfcRelConnects)->second);
-    current->add("RelatingElement",false,IfcUtil::Argument_ENTITY);
-    current->add("RelatedElement",false,IfcUtil::Argument_ENTITY);
-    current->add("InterferenceGeometry",true,IfcUtil::Argument_ENTITY);
-    current->add("InterferenceType",true,IfcUtil::Argument_STRING);
-    current->add("ImpliedOrder",false,IfcUtil::Argument_BOOL);
+    current->add("RelatingElement",false,IfcUtil::Argument_ENTITY,Type::IfcElement);
+    current->add("RelatedElement",false,IfcUtil::Argument_ENTITY,Type::IfcElement);
+    current->add("InterferenceGeometry",true,IfcUtil::Argument_ENTITY,Type::IfcConnectionGeometry);
+    current->add("InterferenceType",true,IfcUtil::Argument_STRING,Type::IfcIdentifier);
+    current->add("ImpliedOrder",false,IfcUtil::Argument_BOOL,Type::UNDEFINED);
     current = entity_descriptor_map[Type::IfcRelNests] = new IfcEntityDescriptor(Type::IfcRelNests,entity_descriptor_map.find(Type::IfcRelDecomposes)->second);
-    current->add("RelatingObject",false,IfcUtil::Argument_ENTITY);
-    current->add("RelatedObjects",false,IfcUtil::Argument_ENTITY_LIST);
+    current->add("RelatingObject",false,IfcUtil::Argument_ENTITY,Type::IfcObjectDefinition);
+    current->add("RelatedObjects",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcObjectDefinition);
     current = entity_descriptor_map[Type::IfcRelProjectsElement] = new IfcEntityDescriptor(Type::IfcRelProjectsElement,entity_descriptor_map.find(Type::IfcRelDecomposes)->second);
-    current->add("RelatingElement",false,IfcUtil::Argument_ENTITY);
-    current->add("RelatedFeatureElement",false,IfcUtil::Argument_ENTITY);
+    current->add("RelatingElement",false,IfcUtil::Argument_ENTITY,Type::IfcElement);
+    current->add("RelatedFeatureElement",false,IfcUtil::Argument_ENTITY,Type::IfcFeatureElementAddition);
     current = entity_descriptor_map[Type::IfcRelReferencedInSpatialStructure] = new IfcEntityDescriptor(Type::IfcRelReferencedInSpatialStructure,entity_descriptor_map.find(Type::IfcRelConnects)->second);
-    current->add("RelatedElements",false,IfcUtil::Argument_ENTITY_LIST);
-    current->add("RelatingStructure",false,IfcUtil::Argument_ENTITY);
+    current->add("RelatedElements",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcProduct);
+    current->add("RelatingStructure",false,IfcUtil::Argument_ENTITY,Type::IfcSpatialElement);
     current = entity_descriptor_map[Type::IfcRelSequence] = new IfcEntityDescriptor(Type::IfcRelSequence,entity_descriptor_map.find(Type::IfcRelConnects)->second);
-    current->add("RelatingProcess",false,IfcUtil::Argument_ENTITY);
-    current->add("RelatedProcess",false,IfcUtil::Argument_ENTITY);
-    current->add("TimeLag",true,IfcUtil::Argument_ENTITY);
+    current->add("RelatingProcess",false,IfcUtil::Argument_ENTITY,Type::IfcProcess);
+    current->add("RelatedProcess",false,IfcUtil::Argument_ENTITY,Type::IfcProcess);
+    current->add("TimeLag",true,IfcUtil::Argument_ENTITY,Type::IfcLagTime);
     current->add("SequenceType",true,IfcUtil::Argument_ENUMERATION,Type::IfcSequenceEnum);
-    current->add("UserDefinedSequenceType",true,IfcUtil::Argument_STRING);
+    current->add("UserDefinedSequenceType",true,IfcUtil::Argument_STRING,Type::IfcLabel);
     current = entity_descriptor_map[Type::IfcRelServicesBuildings] = new IfcEntityDescriptor(Type::IfcRelServicesBuildings,entity_descriptor_map.find(Type::IfcRelConnects)->second);
-    current->add("RelatingSystem",false,IfcUtil::Argument_ENTITY);
-    current->add("RelatedBuildings",false,IfcUtil::Argument_ENTITY_LIST);
+    current->add("RelatingSystem",false,IfcUtil::Argument_ENTITY,Type::IfcSystem);
+    current->add("RelatedBuildings",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcSpatialElement);
     current = entity_descriptor_map[Type::IfcRelSpaceBoundary] = new IfcEntityDescriptor(Type::IfcRelSpaceBoundary,entity_descriptor_map.find(Type::IfcRelConnects)->second);
-    current->add("RelatingSpace",false,IfcUtil::Argument_ENTITY);
-    current->add("RelatedBuildingElement",false,IfcUtil::Argument_ENTITY);
-    current->add("ConnectionGeometry",true,IfcUtil::Argument_ENTITY);
+    current->add("RelatingSpace",false,IfcUtil::Argument_ENTITY,Type::IfcSpaceBoundarySelect);
+    current->add("RelatedBuildingElement",false,IfcUtil::Argument_ENTITY,Type::IfcElement);
+    current->add("ConnectionGeometry",true,IfcUtil::Argument_ENTITY,Type::IfcConnectionGeometry);
     current->add("PhysicalOrVirtualBoundary",false,IfcUtil::Argument_ENUMERATION,Type::IfcPhysicalOrVirtualEnum);
     current->add("InternalOrExternalBoundary",false,IfcUtil::Argument_ENUMERATION,Type::IfcInternalOrExternalEnum);
     current = entity_descriptor_map[Type::IfcRelSpaceBoundary1stLevel] = new IfcEntityDescriptor(Type::IfcRelSpaceBoundary1stLevel,entity_descriptor_map.find(Type::IfcRelSpaceBoundary)->second);
-    current->add("ParentBoundary",true,IfcUtil::Argument_ENTITY);
+    current->add("ParentBoundary",true,IfcUtil::Argument_ENTITY,Type::IfcRelSpaceBoundary1stLevel);
     current = entity_descriptor_map[Type::IfcRelSpaceBoundary2ndLevel] = new IfcEntityDescriptor(Type::IfcRelSpaceBoundary2ndLevel,entity_descriptor_map.find(Type::IfcRelSpaceBoundary1stLevel)->second);
-    current->add("CorrespondingBoundary",true,IfcUtil::Argument_ENTITY);
+    current->add("CorrespondingBoundary",true,IfcUtil::Argument_ENTITY,Type::IfcRelSpaceBoundary2ndLevel);
     current = entity_descriptor_map[Type::IfcRelVoidsElement] = new IfcEntityDescriptor(Type::IfcRelVoidsElement,entity_descriptor_map.find(Type::IfcRelDecomposes)->second);
-    current->add("RelatingBuildingElement",false,IfcUtil::Argument_ENTITY);
-    current->add("RelatedOpeningElement",false,IfcUtil::Argument_ENTITY);
+    current->add("RelatingBuildingElement",false,IfcUtil::Argument_ENTITY,Type::IfcElement);
+    current->add("RelatedOpeningElement",false,IfcUtil::Argument_ENTITY,Type::IfcFeatureElementSubtraction);
     current = entity_descriptor_map[Type::IfcReparametrisedCompositeCurveSegment] = new IfcEntityDescriptor(Type::IfcReparametrisedCompositeCurveSegment,entity_descriptor_map.find(Type::IfcCompositeCurveSegment)->second);
-    current->add("ParamLength",false,IfcUtil::Argument_DOUBLE);
+    current->add("ParamLength",false,IfcUtil::Argument_DOUBLE,Type::IfcParameterValue);
     current = entity_descriptor_map[Type::IfcResource] = new IfcEntityDescriptor(Type::IfcResource,entity_descriptor_map.find(Type::IfcObject)->second);
-    current->add("Identification",true,IfcUtil::Argument_STRING);
-    current->add("LongDescription",true,IfcUtil::Argument_STRING);
+    current->add("Identification",true,IfcUtil::Argument_STRING,Type::IfcIdentifier);
+    current->add("LongDescription",true,IfcUtil::Argument_STRING,Type::IfcText);
     current = entity_descriptor_map[Type::IfcRevolvedAreaSolid] = new IfcEntityDescriptor(Type::IfcRevolvedAreaSolid,entity_descriptor_map.find(Type::IfcSweptAreaSolid)->second);
-    current->add("Axis",false,IfcUtil::Argument_ENTITY);
-    current->add("Angle",false,IfcUtil::Argument_DOUBLE);
+    current->add("Axis",false,IfcUtil::Argument_ENTITY,Type::IfcAxis1Placement);
+    current->add("Angle",false,IfcUtil::Argument_DOUBLE,Type::IfcPlaneAngleMeasure);
     current = entity_descriptor_map[Type::IfcRevolvedAreaSolidTapered] = new IfcEntityDescriptor(Type::IfcRevolvedAreaSolidTapered,entity_descriptor_map.find(Type::IfcRevolvedAreaSolid)->second);
-    current->add("EndSweptArea",false,IfcUtil::Argument_ENTITY);
+    current->add("EndSweptArea",false,IfcUtil::Argument_ENTITY,Type::IfcProfileDef);
     current = entity_descriptor_map[Type::IfcRightCircularCone] = new IfcEntityDescriptor(Type::IfcRightCircularCone,entity_descriptor_map.find(Type::IfcCsgPrimitive3D)->second);
-    current->add("Height",false,IfcUtil::Argument_DOUBLE);
-    current->add("BottomRadius",false,IfcUtil::Argument_DOUBLE);
+    current->add("Height",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("BottomRadius",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
     current = entity_descriptor_map[Type::IfcRightCircularCylinder] = new IfcEntityDescriptor(Type::IfcRightCircularCylinder,entity_descriptor_map.find(Type::IfcCsgPrimitive3D)->second);
-    current->add("Height",false,IfcUtil::Argument_DOUBLE);
-    current->add("Radius",false,IfcUtil::Argument_DOUBLE);
+    current->add("Height",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("Radius",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
     current = entity_descriptor_map[Type::IfcSimplePropertyTemplate] = new IfcEntityDescriptor(Type::IfcSimplePropertyTemplate,entity_descriptor_map.find(Type::IfcPropertyTemplate)->second);
     current->add("TemplateType",true,IfcUtil::Argument_ENUMERATION,Type::IfcSimplePropertyTemplateTypeEnum);
-    current->add("PrimaryMeasureType",true,IfcUtil::Argument_STRING);
-    current->add("SecondaryMeasureType",true,IfcUtil::Argument_STRING);
-    current->add("Enumerators",true,IfcUtil::Argument_ENTITY);
-    current->add("PrimaryUnit",true,IfcUtil::Argument_ENTITY);
-    current->add("SecondaryUnit",true,IfcUtil::Argument_ENTITY);
-    current->add("Expression",true,IfcUtil::Argument_STRING);
+    current->add("PrimaryMeasureType",true,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("SecondaryMeasureType",true,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("Enumerators",true,IfcUtil::Argument_ENTITY,Type::IfcPropertyEnumeration);
+    current->add("PrimaryUnit",true,IfcUtil::Argument_ENTITY,Type::IfcUnit);
+    current->add("SecondaryUnit",true,IfcUtil::Argument_ENTITY,Type::IfcUnit);
+    current->add("Expression",true,IfcUtil::Argument_STRING,Type::IfcLabel);
     current->add("AccessState",true,IfcUtil::Argument_ENUMERATION,Type::IfcStateEnum);
     current = entity_descriptor_map[Type::IfcSpatialElement] = new IfcEntityDescriptor(Type::IfcSpatialElement,entity_descriptor_map.find(Type::IfcProduct)->second);
-    current->add("LongName",true,IfcUtil::Argument_STRING);
+    current->add("LongName",true,IfcUtil::Argument_STRING,Type::IfcLabel);
     current = entity_descriptor_map[Type::IfcSpatialElementType] = new IfcEntityDescriptor(Type::IfcSpatialElementType,entity_descriptor_map.find(Type::IfcTypeProduct)->second);
-    current->add("ElementType",true,IfcUtil::Argument_STRING);
+    current->add("ElementType",true,IfcUtil::Argument_STRING,Type::IfcLabel);
     current = entity_descriptor_map[Type::IfcSpatialStructureElement] = new IfcEntityDescriptor(Type::IfcSpatialStructureElement,entity_descriptor_map.find(Type::IfcSpatialElement)->second);
     current->add("CompositionType",true,IfcUtil::Argument_ENUMERATION,Type::IfcElementCompositionEnum);
     current = entity_descriptor_map[Type::IfcSpatialStructureElementType] = new IfcEntityDescriptor(Type::IfcSpatialStructureElementType,entity_descriptor_map.find(Type::IfcSpatialElementType)->second);
@@ -1735,11 +1749,11 @@ void InitDescriptorMap() {
     current->add("PredefinedType",true,IfcUtil::Argument_ENUMERATION,Type::IfcSpatialZoneTypeEnum);
     current = entity_descriptor_map[Type::IfcSpatialZoneType] = new IfcEntityDescriptor(Type::IfcSpatialZoneType,entity_descriptor_map.find(Type::IfcSpatialElementType)->second);
     current->add("PredefinedType",false,IfcUtil::Argument_ENUMERATION,Type::IfcSpatialZoneTypeEnum);
-    current->add("LongName",true,IfcUtil::Argument_STRING);
+    current->add("LongName",true,IfcUtil::Argument_STRING,Type::IfcLabel);
     current = entity_descriptor_map[Type::IfcSphere] = new IfcEntityDescriptor(Type::IfcSphere,entity_descriptor_map.find(Type::IfcCsgPrimitive3D)->second);
-    current->add("Radius",false,IfcUtil::Argument_DOUBLE);
+    current->add("Radius",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
     current = entity_descriptor_map[Type::IfcStructuralActivity] = new IfcEntityDescriptor(Type::IfcStructuralActivity,entity_descriptor_map.find(Type::IfcProduct)->second);
-    current->add("AppliedLoad",false,IfcUtil::Argument_ENTITY);
+    current->add("AppliedLoad",false,IfcUtil::Argument_ENTITY,Type::IfcStructuralLoad);
     current->add("GlobalOrLocal",false,IfcUtil::Argument_ENUMERATION,Type::IfcGlobalOrLocalEnum);
     current = entity_descriptor_map[Type::IfcStructuralItem] = new IfcEntityDescriptor(Type::IfcStructuralItem,entity_descriptor_map.find(Type::IfcProduct)->second);
 
@@ -1749,7 +1763,7 @@ void InitDescriptorMap() {
 
     current = entity_descriptor_map[Type::IfcStructuralSurfaceMember] = new IfcEntityDescriptor(Type::IfcStructuralSurfaceMember,entity_descriptor_map.find(Type::IfcStructuralMember)->second);
     current->add("PredefinedType",false,IfcUtil::Argument_ENUMERATION,Type::IfcStructuralSurfaceMemberTypeEnum);
-    current->add("Thickness",true,IfcUtil::Argument_DOUBLE);
+    current->add("Thickness",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
     current = entity_descriptor_map[Type::IfcStructuralSurfaceMemberVarying] = new IfcEntityDescriptor(Type::IfcStructuralSurfaceMemberVarying,entity_descriptor_map.find(Type::IfcStructuralSurfaceMember)->second);
 
     current = entity_descriptor_map[Type::IfcStructuralSurfaceReaction] = new IfcEntityDescriptor(Type::IfcStructuralSurfaceReaction,entity_descriptor_map.find(Type::IfcStructuralReaction)->second);
@@ -1757,109 +1771,110 @@ void InitDescriptorMap() {
     current = entity_descriptor_map[Type::IfcSubContractResourceType] = new IfcEntityDescriptor(Type::IfcSubContractResourceType,entity_descriptor_map.find(Type::IfcConstructionResourceType)->second);
     current->add("PredefinedType",false,IfcUtil::Argument_ENUMERATION,Type::IfcSubContractResourceTypeEnum);
     current = entity_descriptor_map[Type::IfcSurfaceCurveSweptAreaSolid] = new IfcEntityDescriptor(Type::IfcSurfaceCurveSweptAreaSolid,entity_descriptor_map.find(Type::IfcSweptAreaSolid)->second);
-    current->add("Directrix",false,IfcUtil::Argument_ENTITY);
-    current->add("StartParam",true,IfcUtil::Argument_DOUBLE);
-    current->add("EndParam",true,IfcUtil::Argument_DOUBLE);
-    current->add("ReferenceSurface",false,IfcUtil::Argument_ENTITY);
+    current->add("Directrix",false,IfcUtil::Argument_ENTITY,Type::IfcCurve);
+    current->add("StartParam",true,IfcUtil::Argument_DOUBLE,Type::IfcParameterValue);
+    current->add("EndParam",true,IfcUtil::Argument_DOUBLE,Type::IfcParameterValue);
+    current->add("ReferenceSurface",false,IfcUtil::Argument_ENTITY,Type::IfcSurface);
     current = entity_descriptor_map[Type::IfcSurfaceOfLinearExtrusion] = new IfcEntityDescriptor(Type::IfcSurfaceOfLinearExtrusion,entity_descriptor_map.find(Type::IfcSweptSurface)->second);
-    current->add("ExtrudedDirection",false,IfcUtil::Argument_ENTITY);
-    current->add("Depth",false,IfcUtil::Argument_DOUBLE);
+    current->add("ExtrudedDirection",false,IfcUtil::Argument_ENTITY,Type::IfcDirection);
+    current->add("Depth",false,IfcUtil::Argument_DOUBLE,Type::IfcLengthMeasure);
     current = entity_descriptor_map[Type::IfcSurfaceOfRevolution] = new IfcEntityDescriptor(Type::IfcSurfaceOfRevolution,entity_descriptor_map.find(Type::IfcSweptSurface)->second);
-    current->add("AxisPosition",false,IfcUtil::Argument_ENTITY);
+    current->add("AxisPosition",false,IfcUtil::Argument_ENTITY,Type::IfcAxis1Placement);
     current = entity_descriptor_map[Type::IfcSystemFurnitureElementType] = new IfcEntityDescriptor(Type::IfcSystemFurnitureElementType,entity_descriptor_map.find(Type::IfcFurnishingElementType)->second);
     current->add("PredefinedType",true,IfcUtil::Argument_ENUMERATION,Type::IfcSystemFurnitureElementTypeEnum);
     current = entity_descriptor_map[Type::IfcTask] = new IfcEntityDescriptor(Type::IfcTask,entity_descriptor_map.find(Type::IfcProcess)->second);
-    current->add("Status",true,IfcUtil::Argument_STRING);
-    current->add("WorkMethod",true,IfcUtil::Argument_STRING);
-    current->add("IsMilestone",false,IfcUtil::Argument_BOOL);
-    current->add("Priority",true,IfcUtil::Argument_INT);
-    current->add("TaskTime",true,IfcUtil::Argument_ENTITY);
+    current->add("Status",true,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("WorkMethod",true,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("IsMilestone",false,IfcUtil::Argument_BOOL,Type::UNDEFINED);
+    current->add("Priority",true,IfcUtil::Argument_INT,Type::UNDEFINED);
+    current->add("TaskTime",true,IfcUtil::Argument_ENTITY,Type::IfcTaskTime);
     current->add("PredefinedType",true,IfcUtil::Argument_ENUMERATION,Type::IfcTaskTypeEnum);
     current = entity_descriptor_map[Type::IfcTaskType] = new IfcEntityDescriptor(Type::IfcTaskType,entity_descriptor_map.find(Type::IfcTypeProcess)->second);
     current->add("PredefinedType",false,IfcUtil::Argument_ENUMERATION,Type::IfcTaskTypeEnum);
-    current->add("WorkMethod",true,IfcUtil::Argument_STRING);
+    current->add("WorkMethod",true,IfcUtil::Argument_STRING,Type::IfcLabel);
     current = entity_descriptor_map[Type::IfcTessellatedFaceSet] = new IfcEntityDescriptor(Type::IfcTessellatedFaceSet,entity_descriptor_map.find(Type::IfcTessellatedItem)->second);
-    current->add("Coordinates",false,IfcUtil::Argument_ENTITY);
-    current->add("Closed",true,IfcUtil::Argument_BOOL);
+    current->add("Coordinates",false,IfcUtil::Argument_ENTITY,Type::IfcCartesianPointList3D);
+    current->add("Closed",true,IfcUtil::Argument_BOOL,Type::UNDEFINED);
     current = entity_descriptor_map[Type::IfcTransportElementType] = new IfcEntityDescriptor(Type::IfcTransportElementType,entity_descriptor_map.find(Type::IfcElementType)->second);
     current->add("PredefinedType",false,IfcUtil::Argument_ENUMERATION,Type::IfcTransportElementTypeEnum);
     current = entity_descriptor_map[Type::IfcTriangulatedFaceSet] = new IfcEntityDescriptor(Type::IfcTriangulatedFaceSet,entity_descriptor_map.find(Type::IfcTessellatedFaceSet)->second);
 
     current = entity_descriptor_map[Type::IfcWindowLiningProperties] = new IfcEntityDescriptor(Type::IfcWindowLiningProperties,entity_descriptor_map.find(Type::IfcPreDefinedPropertySet)->second);
-    current->add("LiningDepth",true,IfcUtil::Argument_DOUBLE);
-    current->add("LiningThickness",true,IfcUtil::Argument_DOUBLE);
-    current->add("TransomThickness",true,IfcUtil::Argument_DOUBLE);
-    current->add("MullionThickness",true,IfcUtil::Argument_DOUBLE);
-    current->add("FirstTransomOffset",true,IfcUtil::Argument_DOUBLE);
-    current->add("SecondTransomOffset",true,IfcUtil::Argument_DOUBLE);
-    current->add("FirstMullionOffset",true,IfcUtil::Argument_DOUBLE);
-    current->add("SecondMullionOffset",true,IfcUtil::Argument_DOUBLE);
-    current->add("ShapeAspectStyle",true,IfcUtil::Argument_ENTITY);
-    current->add("LiningOffset",true,IfcUtil::Argument_DOUBLE);
-    current->add("LiningToPanelOffsetX",true,IfcUtil::Argument_DOUBLE);
-    current->add("LiningToPanelOffsetY",true,IfcUtil::Argument_DOUBLE);
+    current->add("LiningDepth",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("LiningThickness",true,IfcUtil::Argument_DOUBLE,Type::IfcNonNegativeLengthMeasure);
+    current->add("TransomThickness",true,IfcUtil::Argument_DOUBLE,Type::IfcNonNegativeLengthMeasure);
+    current->add("MullionThickness",true,IfcUtil::Argument_DOUBLE,Type::IfcNonNegativeLengthMeasure);
+    current->add("FirstTransomOffset",true,IfcUtil::Argument_DOUBLE,Type::IfcNormalisedRatioMeasure);
+    current->add("SecondTransomOffset",true,IfcUtil::Argument_DOUBLE,Type::IfcNormalisedRatioMeasure);
+    current->add("FirstMullionOffset",true,IfcUtil::Argument_DOUBLE,Type::IfcNormalisedRatioMeasure);
+    current->add("SecondMullionOffset",true,IfcUtil::Argument_DOUBLE,Type::IfcNormalisedRatioMeasure);
+    current->add("ShapeAspectStyle",true,IfcUtil::Argument_ENTITY,Type::IfcShapeAspect);
+    current->add("LiningOffset",true,IfcUtil::Argument_DOUBLE,Type::IfcLengthMeasure);
+    current->add("LiningToPanelOffsetX",true,IfcUtil::Argument_DOUBLE,Type::IfcLengthMeasure);
+    current->add("LiningToPanelOffsetY",true,IfcUtil::Argument_DOUBLE,Type::IfcLengthMeasure);
     current = entity_descriptor_map[Type::IfcWindowPanelProperties] = new IfcEntityDescriptor(Type::IfcWindowPanelProperties,entity_descriptor_map.find(Type::IfcPreDefinedPropertySet)->second);
     current->add("OperationType",false,IfcUtil::Argument_ENUMERATION,Type::IfcWindowPanelOperationEnum);
     current->add("PanelPosition",false,IfcUtil::Argument_ENUMERATION,Type::IfcWindowPanelPositionEnum);
-    current->add("FrameDepth",true,IfcUtil::Argument_DOUBLE);
-    current->add("FrameThickness",true,IfcUtil::Argument_DOUBLE);
-    current->add("ShapeAspectStyle",true,IfcUtil::Argument_ENTITY);
+    current->add("FrameDepth",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("FrameThickness",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("ShapeAspectStyle",true,IfcUtil::Argument_ENTITY,Type::IfcShapeAspect);
     current = entity_descriptor_map[Type::IfcActor] = new IfcEntityDescriptor(Type::IfcActor,entity_descriptor_map.find(Type::IfcObject)->second);
-    current->add("TheActor",false,IfcUtil::Argument_ENTITY);
+    current->add("TheActor",false,IfcUtil::Argument_ENTITY,Type::IfcActorSelect);
     current = entity_descriptor_map[Type::IfcAdvancedBrep] = new IfcEntityDescriptor(Type::IfcAdvancedBrep,entity_descriptor_map.find(Type::IfcManifoldSolidBrep)->second);
 
     current = entity_descriptor_map[Type::IfcAdvancedBrepWithVoids] = new IfcEntityDescriptor(Type::IfcAdvancedBrepWithVoids,entity_descriptor_map.find(Type::IfcAdvancedBrep)->second);
-    current->add("Voids",false,IfcUtil::Argument_ENTITY_LIST);
+    current->add("Voids",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcClosedShell);
     current = entity_descriptor_map[Type::IfcAnnotation] = new IfcEntityDescriptor(Type::IfcAnnotation,entity_descriptor_map.find(Type::IfcProduct)->second);
 
     current = entity_descriptor_map[Type::IfcBSplineSurface] = new IfcEntityDescriptor(Type::IfcBSplineSurface,entity_descriptor_map.find(Type::IfcBoundedSurface)->second);
-    current->add("UDegree",false,IfcUtil::Argument_INT);
-    current->add("VDegree",false,IfcUtil::Argument_INT);
+    current->add("UDegree",false,IfcUtil::Argument_INT,Type::UNDEFINED);
+    current->add("VDegree",false,IfcUtil::Argument_INT,Type::UNDEFINED);
+    current->add("ControlPointsList",false,IfcUtil::Argument_ENTITY_LIST_LIST,Type::IfcCartesianPoint);
     current->add("SurfaceForm",false,IfcUtil::Argument_ENUMERATION,Type::IfcBSplineSurfaceForm);
-    current->add("UClosed",false,IfcUtil::Argument_BOOL);
-    current->add("VClosed",false,IfcUtil::Argument_BOOL);
-    current->add("SelfIntersect",false,IfcUtil::Argument_BOOL);
+    current->add("UClosed",false,IfcUtil::Argument_BOOL,Type::UNDEFINED);
+    current->add("VClosed",false,IfcUtil::Argument_BOOL,Type::UNDEFINED);
+    current->add("SelfIntersect",false,IfcUtil::Argument_BOOL,Type::UNDEFINED);
     current = entity_descriptor_map[Type::IfcBSplineSurfaceWithKnots] = new IfcEntityDescriptor(Type::IfcBSplineSurfaceWithKnots,entity_descriptor_map.find(Type::IfcBSplineSurface)->second);
-    current->add("UMultiplicities",false,IfcUtil::Argument_VECTOR_INT);
-    current->add("VMultiplicities",false,IfcUtil::Argument_VECTOR_INT);
-    current->add("UKnots",false,IfcUtil::Argument_VECTOR_DOUBLE);
-    current->add("VKnots",false,IfcUtil::Argument_VECTOR_DOUBLE);
+    current->add("UMultiplicities",false,IfcUtil::Argument_VECTOR_INT,Type::UNDEFINED);
+    current->add("VMultiplicities",false,IfcUtil::Argument_VECTOR_INT,Type::UNDEFINED);
+    current->add("UKnots",false,IfcUtil::Argument_VECTOR_DOUBLE,Type::IfcParameterValue);
+    current->add("VKnots",false,IfcUtil::Argument_VECTOR_DOUBLE,Type::IfcParameterValue);
     current->add("KnotSpec",false,IfcUtil::Argument_ENUMERATION,Type::IfcKnotType);
     current = entity_descriptor_map[Type::IfcBlock] = new IfcEntityDescriptor(Type::IfcBlock,entity_descriptor_map.find(Type::IfcCsgPrimitive3D)->second);
-    current->add("XLength",false,IfcUtil::Argument_DOUBLE);
-    current->add("YLength",false,IfcUtil::Argument_DOUBLE);
-    current->add("ZLength",false,IfcUtil::Argument_DOUBLE);
+    current->add("XLength",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("YLength",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("ZLength",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
     current = entity_descriptor_map[Type::IfcBooleanClippingResult] = new IfcEntityDescriptor(Type::IfcBooleanClippingResult,entity_descriptor_map.find(Type::IfcBooleanResult)->second);
 
     current = entity_descriptor_map[Type::IfcBoundedCurve] = new IfcEntityDescriptor(Type::IfcBoundedCurve,entity_descriptor_map.find(Type::IfcCurve)->second);
 
     current = entity_descriptor_map[Type::IfcBuilding] = new IfcEntityDescriptor(Type::IfcBuilding,entity_descriptor_map.find(Type::IfcSpatialStructureElement)->second);
-    current->add("ElevationOfRefHeight",true,IfcUtil::Argument_DOUBLE);
-    current->add("ElevationOfTerrain",true,IfcUtil::Argument_DOUBLE);
-    current->add("BuildingAddress",true,IfcUtil::Argument_ENTITY);
+    current->add("ElevationOfRefHeight",true,IfcUtil::Argument_DOUBLE,Type::IfcLengthMeasure);
+    current->add("ElevationOfTerrain",true,IfcUtil::Argument_DOUBLE,Type::IfcLengthMeasure);
+    current->add("BuildingAddress",true,IfcUtil::Argument_ENTITY,Type::IfcPostalAddress);
     current = entity_descriptor_map[Type::IfcBuildingElementType] = new IfcEntityDescriptor(Type::IfcBuildingElementType,entity_descriptor_map.find(Type::IfcElementType)->second);
 
     current = entity_descriptor_map[Type::IfcBuildingStorey] = new IfcEntityDescriptor(Type::IfcBuildingStorey,entity_descriptor_map.find(Type::IfcSpatialStructureElement)->second);
-    current->add("Elevation",true,IfcUtil::Argument_DOUBLE);
+    current->add("Elevation",true,IfcUtil::Argument_DOUBLE,Type::IfcLengthMeasure);
     current = entity_descriptor_map[Type::IfcChimneyType] = new IfcEntityDescriptor(Type::IfcChimneyType,entity_descriptor_map.find(Type::IfcBuildingElementType)->second);
     current->add("PredefinedType",false,IfcUtil::Argument_ENUMERATION,Type::IfcChimneyTypeEnum);
     current = entity_descriptor_map[Type::IfcCircleHollowProfileDef] = new IfcEntityDescriptor(Type::IfcCircleHollowProfileDef,entity_descriptor_map.find(Type::IfcCircleProfileDef)->second);
-    current->add("WallThickness",false,IfcUtil::Argument_DOUBLE);
+    current->add("WallThickness",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
     current = entity_descriptor_map[Type::IfcCivilElementType] = new IfcEntityDescriptor(Type::IfcCivilElementType,entity_descriptor_map.find(Type::IfcElementType)->second);
 
     current = entity_descriptor_map[Type::IfcColumnType] = new IfcEntityDescriptor(Type::IfcColumnType,entity_descriptor_map.find(Type::IfcBuildingElementType)->second);
     current->add("PredefinedType",false,IfcUtil::Argument_ENUMERATION,Type::IfcColumnTypeEnum);
     current = entity_descriptor_map[Type::IfcComplexPropertyTemplate] = new IfcEntityDescriptor(Type::IfcComplexPropertyTemplate,entity_descriptor_map.find(Type::IfcPropertyTemplate)->second);
-    current->add("UsageName",true,IfcUtil::Argument_STRING);
+    current->add("UsageName",true,IfcUtil::Argument_STRING,Type::IfcLabel);
     current->add("TemplateType",true,IfcUtil::Argument_ENUMERATION,Type::IfcComplexPropertyTemplateTypeEnum);
-    current->add("HasPropertyTemplates",true,IfcUtil::Argument_ENTITY_LIST);
+    current->add("HasPropertyTemplates",true,IfcUtil::Argument_ENTITY_LIST,Type::IfcPropertyTemplate);
     current = entity_descriptor_map[Type::IfcCompositeCurve] = new IfcEntityDescriptor(Type::IfcCompositeCurve,entity_descriptor_map.find(Type::IfcBoundedCurve)->second);
-    current->add("Segments",false,IfcUtil::Argument_ENTITY_LIST);
-    current->add("SelfIntersect",false,IfcUtil::Argument_BOOL);
+    current->add("Segments",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcCompositeCurveSegment);
+    current->add("SelfIntersect",false,IfcUtil::Argument_BOOL,Type::UNDEFINED);
     current = entity_descriptor_map[Type::IfcCompositeCurveOnSurface] = new IfcEntityDescriptor(Type::IfcCompositeCurveOnSurface,entity_descriptor_map.find(Type::IfcCompositeCurve)->second);
 
     current = entity_descriptor_map[Type::IfcConic] = new IfcEntityDescriptor(Type::IfcConic,entity_descriptor_map.find(Type::IfcCurve)->second);
-    current->add("Position",false,IfcUtil::Argument_ENTITY);
+    current->add("Position",false,IfcUtil::Argument_ENTITY,Type::IfcAxis2Placement);
     current = entity_descriptor_map[Type::IfcConstructionEquipmentResourceType] = new IfcEntityDescriptor(Type::IfcConstructionEquipmentResourceType,entity_descriptor_map.find(Type::IfcConstructionResourceType)->second);
     current->add("PredefinedType",false,IfcUtil::Argument_ENUMERATION,Type::IfcConstructionEquipmentResourceTypeEnum);
     current = entity_descriptor_map[Type::IfcConstructionMaterialResourceType] = new IfcEntityDescriptor(Type::IfcConstructionMaterialResourceType,entity_descriptor_map.find(Type::IfcConstructionResourceType)->second);
@@ -1867,20 +1882,20 @@ void InitDescriptorMap() {
     current = entity_descriptor_map[Type::IfcConstructionProductResourceType] = new IfcEntityDescriptor(Type::IfcConstructionProductResourceType,entity_descriptor_map.find(Type::IfcConstructionResourceType)->second);
     current->add("PredefinedType",false,IfcUtil::Argument_ENUMERATION,Type::IfcConstructionProductResourceTypeEnum);
     current = entity_descriptor_map[Type::IfcConstructionResource] = new IfcEntityDescriptor(Type::IfcConstructionResource,entity_descriptor_map.find(Type::IfcResource)->second);
-    current->add("Usage",true,IfcUtil::Argument_ENTITY);
-    current->add("BaseCosts",true,IfcUtil::Argument_ENTITY_LIST);
-    current->add("BaseQuantity",true,IfcUtil::Argument_ENTITY);
+    current->add("Usage",true,IfcUtil::Argument_ENTITY,Type::IfcResourceTime);
+    current->add("BaseCosts",true,IfcUtil::Argument_ENTITY_LIST,Type::IfcAppliedValue);
+    current->add("BaseQuantity",true,IfcUtil::Argument_ENTITY,Type::IfcPhysicalQuantity);
     current = entity_descriptor_map[Type::IfcControl] = new IfcEntityDescriptor(Type::IfcControl,entity_descriptor_map.find(Type::IfcObject)->second);
-    current->add("Identification",true,IfcUtil::Argument_STRING);
+    current->add("Identification",true,IfcUtil::Argument_STRING,Type::IfcIdentifier);
     current = entity_descriptor_map[Type::IfcCostItem] = new IfcEntityDescriptor(Type::IfcCostItem,entity_descriptor_map.find(Type::IfcControl)->second);
     current->add("PredefinedType",true,IfcUtil::Argument_ENUMERATION,Type::IfcCostItemTypeEnum);
-    current->add("CostValues",true,IfcUtil::Argument_ENTITY_LIST);
-    current->add("CostQuantities",true,IfcUtil::Argument_ENTITY_LIST);
+    current->add("CostValues",true,IfcUtil::Argument_ENTITY_LIST,Type::IfcCostValue);
+    current->add("CostQuantities",true,IfcUtil::Argument_ENTITY_LIST,Type::IfcPhysicalQuantity);
     current = entity_descriptor_map[Type::IfcCostSchedule] = new IfcEntityDescriptor(Type::IfcCostSchedule,entity_descriptor_map.find(Type::IfcControl)->second);
     current->add("PredefinedType",true,IfcUtil::Argument_ENUMERATION,Type::IfcCostScheduleTypeEnum);
-    current->add("Status",true,IfcUtil::Argument_STRING);
-    current->add("SubmittedOn",true,IfcUtil::Argument_STRING);
-    current->add("UpdateDate",true,IfcUtil::Argument_STRING);
+    current->add("Status",true,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("SubmittedOn",true,IfcUtil::Argument_STRING,Type::IfcDateTime);
+    current->add("UpdateDate",true,IfcUtil::Argument_STRING,Type::IfcDateTime);
     current = entity_descriptor_map[Type::IfcCoveringType] = new IfcEntityDescriptor(Type::IfcCoveringType,entity_descriptor_map.find(Type::IfcBuildingElementType)->second);
     current->add("PredefinedType",false,IfcUtil::Argument_ENUMERATION,Type::IfcCoveringTypeEnum);
     current = entity_descriptor_map[Type::IfcCrewResource] = new IfcEntityDescriptor(Type::IfcCrewResource,entity_descriptor_map.find(Type::IfcConstructionResource)->second);
@@ -1888,42 +1903,42 @@ void InitDescriptorMap() {
     current = entity_descriptor_map[Type::IfcCurtainWallType] = new IfcEntityDescriptor(Type::IfcCurtainWallType,entity_descriptor_map.find(Type::IfcBuildingElementType)->second);
     current->add("PredefinedType",false,IfcUtil::Argument_ENUMERATION,Type::IfcCurtainWallTypeEnum);
     current = entity_descriptor_map[Type::IfcCylindricalSurface] = new IfcEntityDescriptor(Type::IfcCylindricalSurface,entity_descriptor_map.find(Type::IfcElementarySurface)->second);
-    current->add("Radius",false,IfcUtil::Argument_DOUBLE);
+    current->add("Radius",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
     current = entity_descriptor_map[Type::IfcDistributionElementType] = new IfcEntityDescriptor(Type::IfcDistributionElementType,entity_descriptor_map.find(Type::IfcElementType)->second);
 
     current = entity_descriptor_map[Type::IfcDistributionFlowElementType] = new IfcEntityDescriptor(Type::IfcDistributionFlowElementType,entity_descriptor_map.find(Type::IfcDistributionElementType)->second);
 
     current = entity_descriptor_map[Type::IfcDoorLiningProperties] = new IfcEntityDescriptor(Type::IfcDoorLiningProperties,entity_descriptor_map.find(Type::IfcPreDefinedPropertySet)->second);
-    current->add("LiningDepth",true,IfcUtil::Argument_DOUBLE);
-    current->add("LiningThickness",true,IfcUtil::Argument_DOUBLE);
-    current->add("ThresholdDepth",true,IfcUtil::Argument_DOUBLE);
-    current->add("ThresholdThickness",true,IfcUtil::Argument_DOUBLE);
-    current->add("TransomThickness",true,IfcUtil::Argument_DOUBLE);
-    current->add("TransomOffset",true,IfcUtil::Argument_DOUBLE);
-    current->add("LiningOffset",true,IfcUtil::Argument_DOUBLE);
-    current->add("ThresholdOffset",true,IfcUtil::Argument_DOUBLE);
-    current->add("CasingThickness",true,IfcUtil::Argument_DOUBLE);
-    current->add("CasingDepth",true,IfcUtil::Argument_DOUBLE);
-    current->add("ShapeAspectStyle",true,IfcUtil::Argument_ENTITY);
-    current->add("LiningToPanelOffsetX",true,IfcUtil::Argument_DOUBLE);
-    current->add("LiningToPanelOffsetY",true,IfcUtil::Argument_DOUBLE);
+    current->add("LiningDepth",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("LiningThickness",true,IfcUtil::Argument_DOUBLE,Type::IfcNonNegativeLengthMeasure);
+    current->add("ThresholdDepth",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("ThresholdThickness",true,IfcUtil::Argument_DOUBLE,Type::IfcNonNegativeLengthMeasure);
+    current->add("TransomThickness",true,IfcUtil::Argument_DOUBLE,Type::IfcNonNegativeLengthMeasure);
+    current->add("TransomOffset",true,IfcUtil::Argument_DOUBLE,Type::IfcLengthMeasure);
+    current->add("LiningOffset",true,IfcUtil::Argument_DOUBLE,Type::IfcLengthMeasure);
+    current->add("ThresholdOffset",true,IfcUtil::Argument_DOUBLE,Type::IfcLengthMeasure);
+    current->add("CasingThickness",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("CasingDepth",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("ShapeAspectStyle",true,IfcUtil::Argument_ENTITY,Type::IfcShapeAspect);
+    current->add("LiningToPanelOffsetX",true,IfcUtil::Argument_DOUBLE,Type::IfcLengthMeasure);
+    current->add("LiningToPanelOffsetY",true,IfcUtil::Argument_DOUBLE,Type::IfcLengthMeasure);
     current = entity_descriptor_map[Type::IfcDoorPanelProperties] = new IfcEntityDescriptor(Type::IfcDoorPanelProperties,entity_descriptor_map.find(Type::IfcPreDefinedPropertySet)->second);
-    current->add("PanelDepth",true,IfcUtil::Argument_DOUBLE);
+    current->add("PanelDepth",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
     current->add("PanelOperation",false,IfcUtil::Argument_ENUMERATION,Type::IfcDoorPanelOperationEnum);
-    current->add("PanelWidth",true,IfcUtil::Argument_DOUBLE);
+    current->add("PanelWidth",true,IfcUtil::Argument_DOUBLE,Type::IfcNormalisedRatioMeasure);
     current->add("PanelPosition",false,IfcUtil::Argument_ENUMERATION,Type::IfcDoorPanelPositionEnum);
-    current->add("ShapeAspectStyle",true,IfcUtil::Argument_ENTITY);
+    current->add("ShapeAspectStyle",true,IfcUtil::Argument_ENTITY,Type::IfcShapeAspect);
     current = entity_descriptor_map[Type::IfcDoorType] = new IfcEntityDescriptor(Type::IfcDoorType,entity_descriptor_map.find(Type::IfcBuildingElementType)->second);
     current->add("PredefinedType",false,IfcUtil::Argument_ENUMERATION,Type::IfcDoorTypeEnum);
     current->add("OperationType",false,IfcUtil::Argument_ENUMERATION,Type::IfcDoorTypeOperationEnum);
-    current->add("ParameterTakesPrecedence",true,IfcUtil::Argument_BOOL);
-    current->add("UserDefinedOperationType",true,IfcUtil::Argument_STRING);
+    current->add("ParameterTakesPrecedence",true,IfcUtil::Argument_BOOL,Type::UNDEFINED);
+    current->add("UserDefinedOperationType",true,IfcUtil::Argument_STRING,Type::IfcLabel);
     current = entity_descriptor_map[Type::IfcDraughtingPreDefinedColour] = new IfcEntityDescriptor(Type::IfcDraughtingPreDefinedColour,entity_descriptor_map.find(Type::IfcPreDefinedColour)->second);
 
     current = entity_descriptor_map[Type::IfcDraughtingPreDefinedCurveFont] = new IfcEntityDescriptor(Type::IfcDraughtingPreDefinedCurveFont,entity_descriptor_map.find(Type::IfcPreDefinedCurveFont)->second);
 
     current = entity_descriptor_map[Type::IfcElement] = new IfcEntityDescriptor(Type::IfcElement,entity_descriptor_map.find(Type::IfcProduct)->second);
-    current->add("Tag",true,IfcUtil::Argument_STRING);
+    current->add("Tag",true,IfcUtil::Argument_STRING,Type::IfcIdentifier);
     current = entity_descriptor_map[Type::IfcElementAssembly] = new IfcEntityDescriptor(Type::IfcElementAssembly,entity_descriptor_map.find(Type::IfcElement)->second);
     current->add("AssemblyPlace",true,IfcUtil::Argument_ENUMERATION,Type::IfcAssemblyPlaceEnum);
     current->add("PredefinedType",true,IfcUtil::Argument_ENUMERATION,Type::IfcElementAssemblyTypeEnum);
@@ -1934,8 +1949,8 @@ void InitDescriptorMap() {
     current = entity_descriptor_map[Type::IfcElementComponentType] = new IfcEntityDescriptor(Type::IfcElementComponentType,entity_descriptor_map.find(Type::IfcElementType)->second);
 
     current = entity_descriptor_map[Type::IfcEllipse] = new IfcEntityDescriptor(Type::IfcEllipse,entity_descriptor_map.find(Type::IfcConic)->second);
-    current->add("SemiAxis1",false,IfcUtil::Argument_DOUBLE);
-    current->add("SemiAxis2",false,IfcUtil::Argument_DOUBLE);
+    current->add("SemiAxis1",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("SemiAxis2",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
     current = entity_descriptor_map[Type::IfcEnergyConversionDeviceType] = new IfcEntityDescriptor(Type::IfcEnergyConversionDeviceType,entity_descriptor_map.find(Type::IfcDistributionFlowElementType)->second);
 
     current = entity_descriptor_map[Type::IfcEngineType] = new IfcEntityDescriptor(Type::IfcEngineType,entity_descriptor_map.find(Type::IfcEnergyConversionDeviceType)->second);
@@ -1947,14 +1962,14 @@ void InitDescriptorMap() {
     current = entity_descriptor_map[Type::IfcEvent] = new IfcEntityDescriptor(Type::IfcEvent,entity_descriptor_map.find(Type::IfcProcess)->second);
     current->add("PredefinedType",true,IfcUtil::Argument_ENUMERATION,Type::IfcEventTypeEnum);
     current->add("EventTriggerType",true,IfcUtil::Argument_ENUMERATION,Type::IfcEventTriggerTypeEnum);
-    current->add("UserDefinedEventTriggerType",true,IfcUtil::Argument_STRING);
-    current->add("EventOccurenceTime",true,IfcUtil::Argument_ENTITY);
+    current->add("UserDefinedEventTriggerType",true,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("EventOccurenceTime",true,IfcUtil::Argument_ENTITY,Type::IfcEventTime);
     current = entity_descriptor_map[Type::IfcExternalSpatialStructureElement] = new IfcEntityDescriptor(Type::IfcExternalSpatialStructureElement,entity_descriptor_map.find(Type::IfcSpatialElement)->second);
 
     current = entity_descriptor_map[Type::IfcFacetedBrep] = new IfcEntityDescriptor(Type::IfcFacetedBrep,entity_descriptor_map.find(Type::IfcManifoldSolidBrep)->second);
 
     current = entity_descriptor_map[Type::IfcFacetedBrepWithVoids] = new IfcEntityDescriptor(Type::IfcFacetedBrepWithVoids,entity_descriptor_map.find(Type::IfcFacetedBrep)->second);
-    current->add("Voids",false,IfcUtil::Argument_ENTITY_LIST);
+    current->add("Voids",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcClosedShell);
     current = entity_descriptor_map[Type::IfcFastener] = new IfcEntityDescriptor(Type::IfcFastener,entity_descriptor_map.find(Type::IfcElementComponent)->second);
     current->add("PredefinedType",true,IfcUtil::Argument_ENUMERATION,Type::IfcFastenerTypeEnum);
     current = entity_descriptor_map[Type::IfcFastenerType] = new IfcEntityDescriptor(Type::IfcFastenerType,entity_descriptor_map.find(Type::IfcElementComponentType)->second);
@@ -1990,9 +2005,9 @@ void InitDescriptorMap() {
     current = entity_descriptor_map[Type::IfcGeographicElement] = new IfcEntityDescriptor(Type::IfcGeographicElement,entity_descriptor_map.find(Type::IfcElement)->second);
     current->add("PredefinedType",true,IfcUtil::Argument_ENUMERATION,Type::IfcGeographicElementTypeEnum);
     current = entity_descriptor_map[Type::IfcGrid] = new IfcEntityDescriptor(Type::IfcGrid,entity_descriptor_map.find(Type::IfcProduct)->second);
-    current->add("UAxes",false,IfcUtil::Argument_ENTITY_LIST);
-    current->add("VAxes",false,IfcUtil::Argument_ENTITY_LIST);
-    current->add("WAxes",true,IfcUtil::Argument_ENTITY_LIST);
+    current->add("UAxes",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcGridAxis);
+    current->add("VAxes",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcGridAxis);
+    current->add("WAxes",true,IfcUtil::Argument_ENTITY_LIST,Type::IfcGridAxis);
     current->add("PredefinedType",true,IfcUtil::Argument_ENUMERATION,Type::IfcGridTypeEnum);
     current = entity_descriptor_map[Type::IfcGroup] = new IfcEntityDescriptor(Type::IfcGroup,entity_descriptor_map.find(Type::IfcObject)->second);
 
@@ -2004,11 +2019,11 @@ void InitDescriptorMap() {
     current->add("PredefinedType",false,IfcUtil::Argument_ENUMERATION,Type::IfcInterceptorTypeEnum);
     current = entity_descriptor_map[Type::IfcInventory] = new IfcEntityDescriptor(Type::IfcInventory,entity_descriptor_map.find(Type::IfcGroup)->second);
     current->add("PredefinedType",true,IfcUtil::Argument_ENUMERATION,Type::IfcInventoryTypeEnum);
-    current->add("Jurisdiction",true,IfcUtil::Argument_ENTITY);
-    current->add("ResponsiblePersons",true,IfcUtil::Argument_ENTITY_LIST);
-    current->add("LastUpdateDate",true,IfcUtil::Argument_STRING);
-    current->add("CurrentValue",true,IfcUtil::Argument_ENTITY);
-    current->add("OriginalValue",true,IfcUtil::Argument_ENTITY);
+    current->add("Jurisdiction",true,IfcUtil::Argument_ENTITY,Type::IfcActorSelect);
+    current->add("ResponsiblePersons",true,IfcUtil::Argument_ENTITY_LIST,Type::IfcPerson);
+    current->add("LastUpdateDate",true,IfcUtil::Argument_STRING,Type::IfcDate);
+    current->add("CurrentValue",true,IfcUtil::Argument_ENTITY,Type::IfcCostValue);
+    current->add("OriginalValue",true,IfcUtil::Argument_ENTITY,Type::IfcCostValue);
     current = entity_descriptor_map[Type::IfcJunctionBoxType] = new IfcEntityDescriptor(Type::IfcJunctionBoxType,entity_descriptor_map.find(Type::IfcFlowFittingType)->second);
     current->add("PredefinedType",false,IfcUtil::Argument_ENUMERATION,Type::IfcJunctionBoxTypeEnum);
     current = entity_descriptor_map[Type::IfcLaborResource] = new IfcEntityDescriptor(Type::IfcLaborResource,entity_descriptor_map.find(Type::IfcConstructionResource)->second);
@@ -2018,13 +2033,13 @@ void InitDescriptorMap() {
     current = entity_descriptor_map[Type::IfcLightFixtureType] = new IfcEntityDescriptor(Type::IfcLightFixtureType,entity_descriptor_map.find(Type::IfcFlowTerminalType)->second);
     current->add("PredefinedType",false,IfcUtil::Argument_ENUMERATION,Type::IfcLightFixtureTypeEnum);
     current = entity_descriptor_map[Type::IfcMechanicalFastener] = new IfcEntityDescriptor(Type::IfcMechanicalFastener,entity_descriptor_map.find(Type::IfcElementComponent)->second);
-    current->add("NominalDiameter",true,IfcUtil::Argument_DOUBLE);
-    current->add("NominalLength",true,IfcUtil::Argument_DOUBLE);
+    current->add("NominalDiameter",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("NominalLength",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
     current->add("PredefinedType",true,IfcUtil::Argument_ENUMERATION,Type::IfcMechanicalFastenerTypeEnum);
     current = entity_descriptor_map[Type::IfcMechanicalFastenerType] = new IfcEntityDescriptor(Type::IfcMechanicalFastenerType,entity_descriptor_map.find(Type::IfcElementComponentType)->second);
     current->add("PredefinedType",false,IfcUtil::Argument_ENUMERATION,Type::IfcMechanicalFastenerTypeEnum);
-    current->add("NominalDiameter",true,IfcUtil::Argument_DOUBLE);
-    current->add("NominalLength",true,IfcUtil::Argument_DOUBLE);
+    current->add("NominalDiameter",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("NominalLength",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
     current = entity_descriptor_map[Type::IfcMedicalDeviceType] = new IfcEntityDescriptor(Type::IfcMedicalDeviceType,entity_descriptor_map.find(Type::IfcFlowTerminalType)->second);
     current->add("PredefinedType",false,IfcUtil::Argument_ENUMERATION,Type::IfcMedicalDeviceTypeEnum);
     current = entity_descriptor_map[Type::IfcMemberType] = new IfcEntityDescriptor(Type::IfcMemberType,entity_descriptor_map.find(Type::IfcBuildingElementType)->second);
@@ -2040,18 +2055,18 @@ void InitDescriptorMap() {
     current = entity_descriptor_map[Type::IfcOutletType] = new IfcEntityDescriptor(Type::IfcOutletType,entity_descriptor_map.find(Type::IfcFlowTerminalType)->second);
     current->add("PredefinedType",false,IfcUtil::Argument_ENUMERATION,Type::IfcOutletTypeEnum);
     current = entity_descriptor_map[Type::IfcPerformanceHistory] = new IfcEntityDescriptor(Type::IfcPerformanceHistory,entity_descriptor_map.find(Type::IfcControl)->second);
-    current->add("LifeCyclePhase",false,IfcUtil::Argument_STRING);
+    current->add("LifeCyclePhase",false,IfcUtil::Argument_STRING,Type::IfcLabel);
     current->add("PredefinedType",true,IfcUtil::Argument_ENUMERATION,Type::IfcPerformanceHistoryTypeEnum);
     current = entity_descriptor_map[Type::IfcPermeableCoveringProperties] = new IfcEntityDescriptor(Type::IfcPermeableCoveringProperties,entity_descriptor_map.find(Type::IfcPreDefinedPropertySet)->second);
     current->add("OperationType",false,IfcUtil::Argument_ENUMERATION,Type::IfcPermeableCoveringOperationEnum);
     current->add("PanelPosition",false,IfcUtil::Argument_ENUMERATION,Type::IfcWindowPanelPositionEnum);
-    current->add("FrameDepth",true,IfcUtil::Argument_DOUBLE);
-    current->add("FrameThickness",true,IfcUtil::Argument_DOUBLE);
-    current->add("ShapeAspectStyle",true,IfcUtil::Argument_ENTITY);
+    current->add("FrameDepth",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("FrameThickness",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("ShapeAspectStyle",true,IfcUtil::Argument_ENTITY,Type::IfcShapeAspect);
     current = entity_descriptor_map[Type::IfcPermit] = new IfcEntityDescriptor(Type::IfcPermit,entity_descriptor_map.find(Type::IfcControl)->second);
     current->add("PredefinedType",true,IfcUtil::Argument_ENUMERATION,Type::IfcPermitTypeEnum);
-    current->add("Status",true,IfcUtil::Argument_STRING);
-    current->add("LongDescription",true,IfcUtil::Argument_STRING);
+    current->add("Status",true,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("LongDescription",true,IfcUtil::Argument_STRING,Type::IfcText);
     current = entity_descriptor_map[Type::IfcPileType] = new IfcEntityDescriptor(Type::IfcPileType,entity_descriptor_map.find(Type::IfcBuildingElementType)->second);
     current->add("PredefinedType",false,IfcUtil::Argument_ENUMERATION,Type::IfcPileTypeEnum);
     current = entity_descriptor_map[Type::IfcPipeFittingType] = new IfcEntityDescriptor(Type::IfcPipeFittingType,entity_descriptor_map.find(Type::IfcFlowFittingType)->second);
@@ -2061,15 +2076,15 @@ void InitDescriptorMap() {
     current = entity_descriptor_map[Type::IfcPlateType] = new IfcEntityDescriptor(Type::IfcPlateType,entity_descriptor_map.find(Type::IfcBuildingElementType)->second);
     current->add("PredefinedType",false,IfcUtil::Argument_ENUMERATION,Type::IfcPlateTypeEnum);
     current = entity_descriptor_map[Type::IfcPolyline] = new IfcEntityDescriptor(Type::IfcPolyline,entity_descriptor_map.find(Type::IfcBoundedCurve)->second);
-    current->add("Points",false,IfcUtil::Argument_ENTITY_LIST);
+    current->add("Points",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcCartesianPoint);
     current = entity_descriptor_map[Type::IfcPort] = new IfcEntityDescriptor(Type::IfcPort,entity_descriptor_map.find(Type::IfcProduct)->second);
 
     current = entity_descriptor_map[Type::IfcProcedure] = new IfcEntityDescriptor(Type::IfcProcedure,entity_descriptor_map.find(Type::IfcProcess)->second);
     current->add("PredefinedType",true,IfcUtil::Argument_ENUMERATION,Type::IfcProcedureTypeEnum);
     current = entity_descriptor_map[Type::IfcProjectOrder] = new IfcEntityDescriptor(Type::IfcProjectOrder,entity_descriptor_map.find(Type::IfcControl)->second);
     current->add("PredefinedType",true,IfcUtil::Argument_ENUMERATION,Type::IfcProjectOrderTypeEnum);
-    current->add("Status",true,IfcUtil::Argument_STRING);
-    current->add("LongDescription",true,IfcUtil::Argument_STRING);
+    current->add("Status",true,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("LongDescription",true,IfcUtil::Argument_STRING,Type::IfcText);
     current = entity_descriptor_map[Type::IfcProjectionElement] = new IfcEntityDescriptor(Type::IfcProjectionElement,entity_descriptor_map.find(Type::IfcFeatureElementAddition)->second);
     current->add("PredefinedType",true,IfcUtil::Argument_ENUMERATION,Type::IfcProjectionElementTypeEnum);
     current = entity_descriptor_map[Type::IfcProtectiveDeviceType] = new IfcEntityDescriptor(Type::IfcProtectiveDeviceType,entity_descriptor_map.find(Type::IfcFlowControllerType)->second);
@@ -2085,34 +2100,34 @@ void InitDescriptorMap() {
     current = entity_descriptor_map[Type::IfcRationalBSplineSurfaceWithKnots] = new IfcEntityDescriptor(Type::IfcRationalBSplineSurfaceWithKnots,entity_descriptor_map.find(Type::IfcBSplineSurfaceWithKnots)->second);
 
     current = entity_descriptor_map[Type::IfcReinforcingElement] = new IfcEntityDescriptor(Type::IfcReinforcingElement,entity_descriptor_map.find(Type::IfcElementComponent)->second);
-    current->add("SteelGrade",true,IfcUtil::Argument_STRING);
+    current->add("SteelGrade",true,IfcUtil::Argument_STRING,Type::IfcLabel);
     current = entity_descriptor_map[Type::IfcReinforcingElementType] = new IfcEntityDescriptor(Type::IfcReinforcingElementType,entity_descriptor_map.find(Type::IfcElementComponentType)->second);
 
     current = entity_descriptor_map[Type::IfcReinforcingMesh] = new IfcEntityDescriptor(Type::IfcReinforcingMesh,entity_descriptor_map.find(Type::IfcReinforcingElement)->second);
-    current->add("MeshLength",true,IfcUtil::Argument_DOUBLE);
-    current->add("MeshWidth",true,IfcUtil::Argument_DOUBLE);
-    current->add("LongitudinalBarNominalDiameter",true,IfcUtil::Argument_DOUBLE);
-    current->add("TransverseBarNominalDiameter",true,IfcUtil::Argument_DOUBLE);
-    current->add("LongitudinalBarCrossSectionArea",true,IfcUtil::Argument_DOUBLE);
-    current->add("TransverseBarCrossSectionArea",true,IfcUtil::Argument_DOUBLE);
-    current->add("LongitudinalBarSpacing",true,IfcUtil::Argument_DOUBLE);
-    current->add("TransverseBarSpacing",true,IfcUtil::Argument_DOUBLE);
+    current->add("MeshLength",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("MeshWidth",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("LongitudinalBarNominalDiameter",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("TransverseBarNominalDiameter",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("LongitudinalBarCrossSectionArea",true,IfcUtil::Argument_DOUBLE,Type::IfcAreaMeasure);
+    current->add("TransverseBarCrossSectionArea",true,IfcUtil::Argument_DOUBLE,Type::IfcAreaMeasure);
+    current->add("LongitudinalBarSpacing",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("TransverseBarSpacing",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
     current->add("PredefinedType",true,IfcUtil::Argument_ENUMERATION,Type::IfcReinforcingMeshTypeEnum);
     current = entity_descriptor_map[Type::IfcReinforcingMeshType] = new IfcEntityDescriptor(Type::IfcReinforcingMeshType,entity_descriptor_map.find(Type::IfcReinforcingElementType)->second);
     current->add("PredefinedType",false,IfcUtil::Argument_ENUMERATION,Type::IfcReinforcingMeshTypeEnum);
-    current->add("MeshLength",true,IfcUtil::Argument_DOUBLE);
-    current->add("MeshWidth",true,IfcUtil::Argument_DOUBLE);
-    current->add("LongitudinalBarNominalDiameter",true,IfcUtil::Argument_DOUBLE);
-    current->add("TransverseBarNominalDiameter",true,IfcUtil::Argument_DOUBLE);
-    current->add("LongitudinalBarCrossSectionArea",true,IfcUtil::Argument_DOUBLE);
-    current->add("TransverseBarCrossSectionArea",true,IfcUtil::Argument_DOUBLE);
-    current->add("LongitudinalBarSpacing",true,IfcUtil::Argument_DOUBLE);
-    current->add("TransverseBarSpacing",true,IfcUtil::Argument_DOUBLE);
-    current->add("BendingShapeCode",true,IfcUtil::Argument_STRING);
-    current->add("BendingParameters",true,IfcUtil::Argument_ENTITY_LIST);
+    current->add("MeshLength",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("MeshWidth",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("LongitudinalBarNominalDiameter",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("TransverseBarNominalDiameter",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("LongitudinalBarCrossSectionArea",true,IfcUtil::Argument_DOUBLE,Type::IfcAreaMeasure);
+    current->add("TransverseBarCrossSectionArea",true,IfcUtil::Argument_DOUBLE,Type::IfcAreaMeasure);
+    current->add("LongitudinalBarSpacing",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("TransverseBarSpacing",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("BendingShapeCode",true,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("BendingParameters",true,IfcUtil::Argument_ENTITY_LIST,Type::IfcBendingParameterSelect);
     current = entity_descriptor_map[Type::IfcRelAggregates] = new IfcEntityDescriptor(Type::IfcRelAggregates,entity_descriptor_map.find(Type::IfcRelDecomposes)->second);
-    current->add("RelatingObject",false,IfcUtil::Argument_ENTITY);
-    current->add("RelatedObjects",false,IfcUtil::Argument_ENTITY_LIST);
+    current->add("RelatingObject",false,IfcUtil::Argument_ENTITY,Type::IfcObjectDefinition);
+    current->add("RelatedObjects",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcObjectDefinition);
     current = entity_descriptor_map[Type::IfcRoofType] = new IfcEntityDescriptor(Type::IfcRoofType,entity_descriptor_map.find(Type::IfcBuildingElementType)->second);
     current->add("PredefinedType",false,IfcUtil::Argument_ENUMERATION,Type::IfcRoofTypeEnum);
     current = entity_descriptor_map[Type::IfcSanitaryTerminalType] = new IfcEntityDescriptor(Type::IfcSanitaryTerminalType,entity_descriptor_map.find(Type::IfcFlowTerminalType)->second);
@@ -2120,23 +2135,23 @@ void InitDescriptorMap() {
     current = entity_descriptor_map[Type::IfcShadingDeviceType] = new IfcEntityDescriptor(Type::IfcShadingDeviceType,entity_descriptor_map.find(Type::IfcBuildingElementType)->second);
     current->add("PredefinedType",false,IfcUtil::Argument_ENUMERATION,Type::IfcShadingDeviceTypeEnum);
     current = entity_descriptor_map[Type::IfcSite] = new IfcEntityDescriptor(Type::IfcSite,entity_descriptor_map.find(Type::IfcSpatialStructureElement)->second);
-    current->add("RefLatitude",true,IfcUtil::Argument_VECTOR_INT);
-    current->add("RefLongitude",true,IfcUtil::Argument_VECTOR_INT);
-    current->add("RefElevation",true,IfcUtil::Argument_DOUBLE);
-    current->add("LandTitleNumber",true,IfcUtil::Argument_STRING);
-    current->add("SiteAddress",true,IfcUtil::Argument_ENTITY);
+    current->add("RefLatitude",true,IfcUtil::Argument_VECTOR_INT,Type::IfcCompoundPlaneAngleMeasure);
+    current->add("RefLongitude",true,IfcUtil::Argument_VECTOR_INT,Type::IfcCompoundPlaneAngleMeasure);
+    current->add("RefElevation",true,IfcUtil::Argument_DOUBLE,Type::IfcLengthMeasure);
+    current->add("LandTitleNumber",true,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("SiteAddress",true,IfcUtil::Argument_ENTITY,Type::IfcPostalAddress);
     current = entity_descriptor_map[Type::IfcSlabType] = new IfcEntityDescriptor(Type::IfcSlabType,entity_descriptor_map.find(Type::IfcBuildingElementType)->second);
     current->add("PredefinedType",false,IfcUtil::Argument_ENUMERATION,Type::IfcSlabTypeEnum);
     current = entity_descriptor_map[Type::IfcSolarDeviceType] = new IfcEntityDescriptor(Type::IfcSolarDeviceType,entity_descriptor_map.find(Type::IfcEnergyConversionDeviceType)->second);
     current->add("PredefinedType",false,IfcUtil::Argument_ENUMERATION,Type::IfcSolarDeviceTypeEnum);
     current = entity_descriptor_map[Type::IfcSpace] = new IfcEntityDescriptor(Type::IfcSpace,entity_descriptor_map.find(Type::IfcSpatialStructureElement)->second);
     current->add("PredefinedType",true,IfcUtil::Argument_ENUMERATION,Type::IfcSpaceTypeEnum);
-    current->add("ElevationWithFlooring",true,IfcUtil::Argument_DOUBLE);
+    current->add("ElevationWithFlooring",true,IfcUtil::Argument_DOUBLE,Type::IfcLengthMeasure);
     current = entity_descriptor_map[Type::IfcSpaceHeaterType] = new IfcEntityDescriptor(Type::IfcSpaceHeaterType,entity_descriptor_map.find(Type::IfcFlowTerminalType)->second);
     current->add("PredefinedType",false,IfcUtil::Argument_ENUMERATION,Type::IfcSpaceHeaterTypeEnum);
     current = entity_descriptor_map[Type::IfcSpaceType] = new IfcEntityDescriptor(Type::IfcSpaceType,entity_descriptor_map.find(Type::IfcSpatialStructureElementType)->second);
     current->add("PredefinedType",false,IfcUtil::Argument_ENUMERATION,Type::IfcSpaceTypeEnum);
-    current->add("LongName",true,IfcUtil::Argument_STRING);
+    current->add("LongName",true,IfcUtil::Argument_STRING,Type::IfcLabel);
     current = entity_descriptor_map[Type::IfcStackTerminalType] = new IfcEntityDescriptor(Type::IfcStackTerminalType,entity_descriptor_map.find(Type::IfcFlowTerminalType)->second);
     current->add("PredefinedType",false,IfcUtil::Argument_ENUMERATION,Type::IfcStackTerminalTypeEnum);
     current = entity_descriptor_map[Type::IfcStairFlightType] = new IfcEntityDescriptor(Type::IfcStairFlightType,entity_descriptor_map.find(Type::IfcBuildingElementType)->second);
@@ -2144,17 +2159,17 @@ void InitDescriptorMap() {
     current = entity_descriptor_map[Type::IfcStairType] = new IfcEntityDescriptor(Type::IfcStairType,entity_descriptor_map.find(Type::IfcBuildingElementType)->second);
     current->add("PredefinedType",false,IfcUtil::Argument_ENUMERATION,Type::IfcStairTypeEnum);
     current = entity_descriptor_map[Type::IfcStructuralAction] = new IfcEntityDescriptor(Type::IfcStructuralAction,entity_descriptor_map.find(Type::IfcStructuralActivity)->second);
-    current->add("DestabilizingLoad",true,IfcUtil::Argument_BOOL);
+    current->add("DestabilizingLoad",true,IfcUtil::Argument_BOOL,Type::UNDEFINED);
     current = entity_descriptor_map[Type::IfcStructuralConnection] = new IfcEntityDescriptor(Type::IfcStructuralConnection,entity_descriptor_map.find(Type::IfcStructuralItem)->second);
-    current->add("AppliedCondition",true,IfcUtil::Argument_ENTITY);
+    current->add("AppliedCondition",true,IfcUtil::Argument_ENTITY,Type::IfcBoundaryCondition);
     current = entity_descriptor_map[Type::IfcStructuralCurveAction] = new IfcEntityDescriptor(Type::IfcStructuralCurveAction,entity_descriptor_map.find(Type::IfcStructuralAction)->second);
     current->add("ProjectedOrTrue",true,IfcUtil::Argument_ENUMERATION,Type::IfcProjectedOrTrueLengthEnum);
     current->add("PredefinedType",false,IfcUtil::Argument_ENUMERATION,Type::IfcStructuralCurveActivityTypeEnum);
     current = entity_descriptor_map[Type::IfcStructuralCurveConnection] = new IfcEntityDescriptor(Type::IfcStructuralCurveConnection,entity_descriptor_map.find(Type::IfcStructuralConnection)->second);
-    current->add("Axis",false,IfcUtil::Argument_ENTITY);
+    current->add("Axis",false,IfcUtil::Argument_ENTITY,Type::IfcDirection);
     current = entity_descriptor_map[Type::IfcStructuralCurveMember] = new IfcEntityDescriptor(Type::IfcStructuralCurveMember,entity_descriptor_map.find(Type::IfcStructuralMember)->second);
     current->add("PredefinedType",false,IfcUtil::Argument_ENUMERATION,Type::IfcStructuralCurveMemberTypeEnum);
-    current->add("Axis",false,IfcUtil::Argument_ENTITY);
+    current->add("Axis",false,IfcUtil::Argument_ENTITY,Type::IfcDirection);
     current = entity_descriptor_map[Type::IfcStructuralCurveMemberVarying] = new IfcEntityDescriptor(Type::IfcStructuralCurveMemberVarying,entity_descriptor_map.find(Type::IfcStructuralCurveMember)->second);
 
     current = entity_descriptor_map[Type::IfcStructuralCurveReaction] = new IfcEntityDescriptor(Type::IfcStructuralCurveReaction,entity_descriptor_map.find(Type::IfcStructuralReaction)->second);
@@ -2165,18 +2180,18 @@ void InitDescriptorMap() {
     current->add("PredefinedType",false,IfcUtil::Argument_ENUMERATION,Type::IfcLoadGroupTypeEnum);
     current->add("ActionType",false,IfcUtil::Argument_ENUMERATION,Type::IfcActionTypeEnum);
     current->add("ActionSource",false,IfcUtil::Argument_ENUMERATION,Type::IfcActionSourceTypeEnum);
-    current->add("Coefficient",true,IfcUtil::Argument_DOUBLE);
-    current->add("Purpose",true,IfcUtil::Argument_STRING);
+    current->add("Coefficient",true,IfcUtil::Argument_DOUBLE,Type::IfcRatioMeasure);
+    current->add("Purpose",true,IfcUtil::Argument_STRING,Type::IfcLabel);
     current = entity_descriptor_map[Type::IfcStructuralPointAction] = new IfcEntityDescriptor(Type::IfcStructuralPointAction,entity_descriptor_map.find(Type::IfcStructuralAction)->second);
 
     current = entity_descriptor_map[Type::IfcStructuralPointConnection] = new IfcEntityDescriptor(Type::IfcStructuralPointConnection,entity_descriptor_map.find(Type::IfcStructuralConnection)->second);
-    current->add("ConditionCoordinateSystem",true,IfcUtil::Argument_ENTITY);
+    current->add("ConditionCoordinateSystem",true,IfcUtil::Argument_ENTITY,Type::IfcAxis2Placement3D);
     current = entity_descriptor_map[Type::IfcStructuralPointReaction] = new IfcEntityDescriptor(Type::IfcStructuralPointReaction,entity_descriptor_map.find(Type::IfcStructuralReaction)->second);
 
     current = entity_descriptor_map[Type::IfcStructuralResultGroup] = new IfcEntityDescriptor(Type::IfcStructuralResultGroup,entity_descriptor_map.find(Type::IfcGroup)->second);
     current->add("TheoryType",false,IfcUtil::Argument_ENUMERATION,Type::IfcAnalysisTheoryTypeEnum);
-    current->add("ResultForLoadGroup",true,IfcUtil::Argument_ENTITY);
-    current->add("IsLinear",false,IfcUtil::Argument_BOOL);
+    current->add("ResultForLoadGroup",true,IfcUtil::Argument_ENTITY,Type::IfcStructuralLoadGroup);
+    current->add("IsLinear",false,IfcUtil::Argument_BOOL,Type::UNDEFINED);
     current = entity_descriptor_map[Type::IfcStructuralSurfaceAction] = new IfcEntityDescriptor(Type::IfcStructuralSurfaceAction,entity_descriptor_map.find(Type::IfcStructuralAction)->second);
     current->add("ProjectedOrTrue",true,IfcUtil::Argument_ENUMERATION,Type::IfcProjectedOrTrueLengthEnum);
     current->add("PredefinedType",false,IfcUtil::Argument_ENUMERATION,Type::IfcStructuralSurfaceActivityTypeEnum);
@@ -2196,31 +2211,31 @@ void InitDescriptorMap() {
     current->add("PredefinedType",false,IfcUtil::Argument_ENUMERATION,Type::IfcTankTypeEnum);
     current = entity_descriptor_map[Type::IfcTendon] = new IfcEntityDescriptor(Type::IfcTendon,entity_descriptor_map.find(Type::IfcReinforcingElement)->second);
     current->add("PredefinedType",true,IfcUtil::Argument_ENUMERATION,Type::IfcTendonTypeEnum);
-    current->add("NominalDiameter",true,IfcUtil::Argument_DOUBLE);
-    current->add("CrossSectionArea",true,IfcUtil::Argument_DOUBLE);
-    current->add("TensionForce",true,IfcUtil::Argument_DOUBLE);
-    current->add("PreStress",true,IfcUtil::Argument_DOUBLE);
-    current->add("FrictionCoefficient",true,IfcUtil::Argument_DOUBLE);
-    current->add("AnchorageSlip",true,IfcUtil::Argument_DOUBLE);
-    current->add("MinCurvatureRadius",true,IfcUtil::Argument_DOUBLE);
+    current->add("NominalDiameter",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("CrossSectionArea",true,IfcUtil::Argument_DOUBLE,Type::IfcAreaMeasure);
+    current->add("TensionForce",true,IfcUtil::Argument_DOUBLE,Type::IfcForceMeasure);
+    current->add("PreStress",true,IfcUtil::Argument_DOUBLE,Type::IfcPressureMeasure);
+    current->add("FrictionCoefficient",true,IfcUtil::Argument_DOUBLE,Type::IfcNormalisedRatioMeasure);
+    current->add("AnchorageSlip",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("MinCurvatureRadius",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
     current = entity_descriptor_map[Type::IfcTendonAnchor] = new IfcEntityDescriptor(Type::IfcTendonAnchor,entity_descriptor_map.find(Type::IfcReinforcingElement)->second);
     current->add("PredefinedType",true,IfcUtil::Argument_ENUMERATION,Type::IfcTendonAnchorTypeEnum);
     current = entity_descriptor_map[Type::IfcTendonAnchorType] = new IfcEntityDescriptor(Type::IfcTendonAnchorType,entity_descriptor_map.find(Type::IfcReinforcingElementType)->second);
     current->add("PredefinedType",false,IfcUtil::Argument_ENUMERATION,Type::IfcTendonAnchorTypeEnum);
     current = entity_descriptor_map[Type::IfcTendonType] = new IfcEntityDescriptor(Type::IfcTendonType,entity_descriptor_map.find(Type::IfcReinforcingElementType)->second);
     current->add("PredefinedType",false,IfcUtil::Argument_ENUMERATION,Type::IfcTendonTypeEnum);
-    current->add("NominalDiameter",true,IfcUtil::Argument_DOUBLE);
-    current->add("CrossSectionArea",true,IfcUtil::Argument_DOUBLE);
-    current->add("SheethDiameter",true,IfcUtil::Argument_DOUBLE);
+    current->add("NominalDiameter",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("CrossSectionArea",true,IfcUtil::Argument_DOUBLE,Type::IfcAreaMeasure);
+    current->add("SheethDiameter",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
     current = entity_descriptor_map[Type::IfcTransformerType] = new IfcEntityDescriptor(Type::IfcTransformerType,entity_descriptor_map.find(Type::IfcEnergyConversionDeviceType)->second);
     current->add("PredefinedType",false,IfcUtil::Argument_ENUMERATION,Type::IfcTransformerTypeEnum);
     current = entity_descriptor_map[Type::IfcTransportElement] = new IfcEntityDescriptor(Type::IfcTransportElement,entity_descriptor_map.find(Type::IfcElement)->second);
     current->add("PredefinedType",true,IfcUtil::Argument_ENUMERATION,Type::IfcTransportElementTypeEnum);
     current = entity_descriptor_map[Type::IfcTrimmedCurve] = new IfcEntityDescriptor(Type::IfcTrimmedCurve,entity_descriptor_map.find(Type::IfcBoundedCurve)->second);
-    current->add("BasisCurve",false,IfcUtil::Argument_ENTITY);
-    current->add("Trim1",false,IfcUtil::Argument_ENTITY_LIST);
-    current->add("Trim2",false,IfcUtil::Argument_ENTITY_LIST);
-    current->add("SenseAgreement",false,IfcUtil::Argument_BOOL);
+    current->add("BasisCurve",false,IfcUtil::Argument_ENTITY,Type::IfcCurve);
+    current->add("Trim1",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcTrimmingSelect);
+    current->add("Trim2",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcTrimmingSelect);
+    current->add("SenseAgreement",false,IfcUtil::Argument_BOOL,Type::UNDEFINED);
     current->add("MasterRepresentation",false,IfcUtil::Argument_ENUMERATION,Type::IfcTrimmingPreference);
     current = entity_descriptor_map[Type::IfcTubeBundleType] = new IfcEntityDescriptor(Type::IfcTubeBundleType,entity_descriptor_map.find(Type::IfcEnergyConversionDeviceType)->second);
     current->add("PredefinedType",false,IfcUtil::Argument_ENUMERATION,Type::IfcTubeBundleTypeEnum);
@@ -2243,30 +2258,30 @@ void InitDescriptorMap() {
     current = entity_descriptor_map[Type::IfcWindowType] = new IfcEntityDescriptor(Type::IfcWindowType,entity_descriptor_map.find(Type::IfcBuildingElementType)->second);
     current->add("PredefinedType",false,IfcUtil::Argument_ENUMERATION,Type::IfcWindowTypeEnum);
     current->add("PartitioningType",false,IfcUtil::Argument_ENUMERATION,Type::IfcWindowTypePartitioningEnum);
-    current->add("ParameterTakesPrecedence",true,IfcUtil::Argument_BOOL);
-    current->add("UserDefinedPartitioningType",true,IfcUtil::Argument_STRING);
+    current->add("ParameterTakesPrecedence",true,IfcUtil::Argument_BOOL,Type::UNDEFINED);
+    current->add("UserDefinedPartitioningType",true,IfcUtil::Argument_STRING,Type::IfcLabel);
     current = entity_descriptor_map[Type::IfcWorkCalendar] = new IfcEntityDescriptor(Type::IfcWorkCalendar,entity_descriptor_map.find(Type::IfcControl)->second);
-    current->add("WorkingTimes",true,IfcUtil::Argument_ENTITY_LIST);
-    current->add("ExceptionTimes",true,IfcUtil::Argument_ENTITY_LIST);
+    current->add("WorkingTimes",true,IfcUtil::Argument_ENTITY_LIST,Type::IfcWorkTime);
+    current->add("ExceptionTimes",true,IfcUtil::Argument_ENTITY_LIST,Type::IfcWorkTime);
     current->add("PredefinedType",true,IfcUtil::Argument_ENUMERATION,Type::IfcWorkCalendarTypeEnum);
     current = entity_descriptor_map[Type::IfcWorkControl] = new IfcEntityDescriptor(Type::IfcWorkControl,entity_descriptor_map.find(Type::IfcControl)->second);
-    current->add("CreationDate",false,IfcUtil::Argument_STRING);
-    current->add("Creators",true,IfcUtil::Argument_ENTITY_LIST);
-    current->add("Purpose",true,IfcUtil::Argument_STRING);
-    current->add("Duration",true,IfcUtil::Argument_STRING);
-    current->add("TotalFloat",true,IfcUtil::Argument_STRING);
-    current->add("StartTime",false,IfcUtil::Argument_STRING);
-    current->add("FinishTime",true,IfcUtil::Argument_STRING);
+    current->add("CreationDate",false,IfcUtil::Argument_STRING,Type::IfcDateTime);
+    current->add("Creators",true,IfcUtil::Argument_ENTITY_LIST,Type::IfcPerson);
+    current->add("Purpose",true,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("Duration",true,IfcUtil::Argument_STRING,Type::IfcDuration);
+    current->add("TotalFloat",true,IfcUtil::Argument_STRING,Type::IfcDuration);
+    current->add("StartTime",false,IfcUtil::Argument_STRING,Type::IfcDateTime);
+    current->add("FinishTime",true,IfcUtil::Argument_STRING,Type::IfcDateTime);
     current = entity_descriptor_map[Type::IfcWorkPlan] = new IfcEntityDescriptor(Type::IfcWorkPlan,entity_descriptor_map.find(Type::IfcWorkControl)->second);
     current->add("PredefinedType",true,IfcUtil::Argument_ENUMERATION,Type::IfcWorkPlanTypeEnum);
     current = entity_descriptor_map[Type::IfcWorkSchedule] = new IfcEntityDescriptor(Type::IfcWorkSchedule,entity_descriptor_map.find(Type::IfcWorkControl)->second);
     current->add("PredefinedType",true,IfcUtil::Argument_ENUMERATION,Type::IfcWorkScheduleTypeEnum);
     current = entity_descriptor_map[Type::IfcZone] = new IfcEntityDescriptor(Type::IfcZone,entity_descriptor_map.find(Type::IfcSystem)->second);
-    current->add("LongName",true,IfcUtil::Argument_STRING);
+    current->add("LongName",true,IfcUtil::Argument_STRING,Type::IfcLabel);
     current = entity_descriptor_map[Type::IfcActionRequest] = new IfcEntityDescriptor(Type::IfcActionRequest,entity_descriptor_map.find(Type::IfcControl)->second);
     current->add("PredefinedType",true,IfcUtil::Argument_ENUMERATION,Type::IfcActionRequestTypeEnum);
-    current->add("Status",true,IfcUtil::Argument_STRING);
-    current->add("LongDescription",true,IfcUtil::Argument_STRING);
+    current->add("Status",true,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("LongDescription",true,IfcUtil::Argument_STRING,Type::IfcText);
     current = entity_descriptor_map[Type::IfcAirTerminalBoxType] = new IfcEntityDescriptor(Type::IfcAirTerminalBoxType,entity_descriptor_map.find(Type::IfcFlowControllerType)->second);
     current->add("PredefinedType",false,IfcUtil::Argument_ENUMERATION,Type::IfcAirTerminalBoxTypeEnum);
     current = entity_descriptor_map[Type::IfcAirTerminalType] = new IfcEntityDescriptor(Type::IfcAirTerminalType,entity_descriptor_map.find(Type::IfcFlowTerminalType)->second);
@@ -2274,26 +2289,26 @@ void InitDescriptorMap() {
     current = entity_descriptor_map[Type::IfcAirToAirHeatRecoveryType] = new IfcEntityDescriptor(Type::IfcAirToAirHeatRecoveryType,entity_descriptor_map.find(Type::IfcEnergyConversionDeviceType)->second);
     current->add("PredefinedType",false,IfcUtil::Argument_ENUMERATION,Type::IfcAirToAirHeatRecoveryTypeEnum);
     current = entity_descriptor_map[Type::IfcAsset] = new IfcEntityDescriptor(Type::IfcAsset,entity_descriptor_map.find(Type::IfcGroup)->second);
-    current->add("Identification",true,IfcUtil::Argument_STRING);
-    current->add("OriginalValue",true,IfcUtil::Argument_ENTITY);
-    current->add("CurrentValue",true,IfcUtil::Argument_ENTITY);
-    current->add("TotalReplacementCost",true,IfcUtil::Argument_ENTITY);
-    current->add("Owner",true,IfcUtil::Argument_ENTITY);
-    current->add("User",true,IfcUtil::Argument_ENTITY);
-    current->add("ResponsiblePerson",true,IfcUtil::Argument_ENTITY);
-    current->add("IncorporationDate",true,IfcUtil::Argument_STRING);
-    current->add("DepreciatedValue",true,IfcUtil::Argument_ENTITY);
+    current->add("Identification",true,IfcUtil::Argument_STRING,Type::IfcIdentifier);
+    current->add("OriginalValue",true,IfcUtil::Argument_ENTITY,Type::IfcCostValue);
+    current->add("CurrentValue",true,IfcUtil::Argument_ENTITY,Type::IfcCostValue);
+    current->add("TotalReplacementCost",true,IfcUtil::Argument_ENTITY,Type::IfcCostValue);
+    current->add("Owner",true,IfcUtil::Argument_ENTITY,Type::IfcActorSelect);
+    current->add("User",true,IfcUtil::Argument_ENTITY,Type::IfcActorSelect);
+    current->add("ResponsiblePerson",true,IfcUtil::Argument_ENTITY,Type::IfcPerson);
+    current->add("IncorporationDate",true,IfcUtil::Argument_STRING,Type::IfcDate);
+    current->add("DepreciatedValue",true,IfcUtil::Argument_ENTITY,Type::IfcCostValue);
     current = entity_descriptor_map[Type::IfcAudioVisualApplianceType] = new IfcEntityDescriptor(Type::IfcAudioVisualApplianceType,entity_descriptor_map.find(Type::IfcFlowTerminalType)->second);
     current->add("PredefinedType",false,IfcUtil::Argument_ENUMERATION,Type::IfcAudioVisualApplianceTypeEnum);
     current = entity_descriptor_map[Type::IfcBSplineCurve] = new IfcEntityDescriptor(Type::IfcBSplineCurve,entity_descriptor_map.find(Type::IfcBoundedCurve)->second);
-    current->add("Degree",false,IfcUtil::Argument_INT);
-    current->add("ControlPointsList",false,IfcUtil::Argument_ENTITY_LIST);
+    current->add("Degree",false,IfcUtil::Argument_INT,Type::UNDEFINED);
+    current->add("ControlPointsList",false,IfcUtil::Argument_ENTITY_LIST,Type::IfcCartesianPoint);
     current->add("CurveForm",false,IfcUtil::Argument_ENUMERATION,Type::IfcBSplineCurveForm);
-    current->add("ClosedCurve",false,IfcUtil::Argument_BOOL);
-    current->add("SelfIntersect",false,IfcUtil::Argument_BOOL);
+    current->add("ClosedCurve",false,IfcUtil::Argument_BOOL,Type::UNDEFINED);
+    current->add("SelfIntersect",false,IfcUtil::Argument_BOOL,Type::UNDEFINED);
     current = entity_descriptor_map[Type::IfcBSplineCurveWithKnots] = new IfcEntityDescriptor(Type::IfcBSplineCurveWithKnots,entity_descriptor_map.find(Type::IfcBSplineCurve)->second);
-    current->add("KnotMultiplicities",false,IfcUtil::Argument_VECTOR_INT);
-    current->add("Knots",false,IfcUtil::Argument_VECTOR_DOUBLE);
+    current->add("KnotMultiplicities",false,IfcUtil::Argument_VECTOR_INT,Type::UNDEFINED);
+    current->add("Knots",false,IfcUtil::Argument_VECTOR_DOUBLE,Type::IfcParameterValue);
     current->add("KnotSpec",false,IfcUtil::Argument_ENUMERATION,Type::IfcKnotType);
     current = entity_descriptor_map[Type::IfcBeamType] = new IfcEntityDescriptor(Type::IfcBeamType,entity_descriptor_map.find(Type::IfcBuildingElementType)->second);
     current->add("PredefinedType",false,IfcUtil::Argument_ENUMERATION,Type::IfcBeamTypeEnum);
@@ -2328,7 +2343,7 @@ void InitDescriptorMap() {
     current = entity_descriptor_map[Type::IfcChimney] = new IfcEntityDescriptor(Type::IfcChimney,entity_descriptor_map.find(Type::IfcBuildingElement)->second);
     current->add("PredefinedType",true,IfcUtil::Argument_ENUMERATION,Type::IfcChimneyTypeEnum);
     current = entity_descriptor_map[Type::IfcCircle] = new IfcEntityDescriptor(Type::IfcCircle,entity_descriptor_map.find(Type::IfcConic)->second);
-    current->add("Radius",false,IfcUtil::Argument_DOUBLE);
+    current->add("Radius",false,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
     current = entity_descriptor_map[Type::IfcCivilElement] = new IfcEntityDescriptor(Type::IfcCivilElement,entity_descriptor_map.find(Type::IfcElement)->second);
 
     current = entity_descriptor_map[Type::IfcCoilType] = new IfcEntityDescriptor(Type::IfcCoilType,entity_descriptor_map.find(Type::IfcEnergyConversionDeviceType)->second);
@@ -2376,14 +2391,14 @@ void InitDescriptorMap() {
     current->add("PredefinedType",true,IfcUtil::Argument_ENUMERATION,Type::IfcDistributionPortTypeEnum);
     current->add("SystemType",true,IfcUtil::Argument_ENUMERATION,Type::IfcDistributionSystemEnum);
     current = entity_descriptor_map[Type::IfcDistributionSystem] = new IfcEntityDescriptor(Type::IfcDistributionSystem,entity_descriptor_map.find(Type::IfcSystem)->second);
-    current->add("LongName",true,IfcUtil::Argument_STRING);
+    current->add("LongName",true,IfcUtil::Argument_STRING,Type::IfcLabel);
     current->add("PredefinedType",true,IfcUtil::Argument_ENUMERATION,Type::IfcDistributionSystemEnum);
     current = entity_descriptor_map[Type::IfcDoor] = new IfcEntityDescriptor(Type::IfcDoor,entity_descriptor_map.find(Type::IfcBuildingElement)->second);
-    current->add("OverallHeight",true,IfcUtil::Argument_DOUBLE);
-    current->add("OverallWidth",true,IfcUtil::Argument_DOUBLE);
+    current->add("OverallHeight",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("OverallWidth",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
     current->add("PredefinedType",true,IfcUtil::Argument_ENUMERATION,Type::IfcDoorTypeEnum);
     current->add("OperationType",true,IfcUtil::Argument_ENUMERATION,Type::IfcDoorTypeOperationEnum);
-    current->add("UserDefinedOperationType",true,IfcUtil::Argument_STRING);
+    current->add("UserDefinedOperationType",true,IfcUtil::Argument_STRING,Type::IfcLabel);
     current = entity_descriptor_map[Type::IfcDoorStandardCase] = new IfcEntityDescriptor(Type::IfcDoorStandardCase,entity_descriptor_map.find(Type::IfcDoor)->second);
 
     current = entity_descriptor_map[Type::IfcDuctFittingType] = new IfcEntityDescriptor(Type::IfcDuctFittingType,entity_descriptor_map.find(Type::IfcFlowFittingType)->second);
@@ -2488,21 +2503,21 @@ void InitDescriptorMap() {
     current = entity_descriptor_map[Type::IfcRampFlight] = new IfcEntityDescriptor(Type::IfcRampFlight,entity_descriptor_map.find(Type::IfcBuildingElement)->second);
     current->add("PredefinedType",true,IfcUtil::Argument_ENUMERATION,Type::IfcRampFlightTypeEnum);
     current = entity_descriptor_map[Type::IfcRationalBSplineCurveWithKnots] = new IfcEntityDescriptor(Type::IfcRationalBSplineCurveWithKnots,entity_descriptor_map.find(Type::IfcBSplineCurveWithKnots)->second);
-    current->add("WeightsData",false,IfcUtil::Argument_VECTOR_DOUBLE);
+    current->add("WeightsData",false,IfcUtil::Argument_VECTOR_DOUBLE,Type::UNDEFINED);
     current = entity_descriptor_map[Type::IfcReinforcingBar] = new IfcEntityDescriptor(Type::IfcReinforcingBar,entity_descriptor_map.find(Type::IfcReinforcingElement)->second);
-    current->add("NominalDiameter",true,IfcUtil::Argument_DOUBLE);
-    current->add("CrossSectionArea",true,IfcUtil::Argument_DOUBLE);
-    current->add("BarLength",true,IfcUtil::Argument_DOUBLE);
+    current->add("NominalDiameter",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("CrossSectionArea",true,IfcUtil::Argument_DOUBLE,Type::IfcAreaMeasure);
+    current->add("BarLength",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
     current->add("PredefinedType",true,IfcUtil::Argument_ENUMERATION,Type::IfcReinforcingBarTypeEnum);
     current->add("BarSurface",true,IfcUtil::Argument_ENUMERATION,Type::IfcReinforcingBarSurfaceEnum);
     current = entity_descriptor_map[Type::IfcReinforcingBarType] = new IfcEntityDescriptor(Type::IfcReinforcingBarType,entity_descriptor_map.find(Type::IfcReinforcingElementType)->second);
     current->add("PredefinedType",false,IfcUtil::Argument_ENUMERATION,Type::IfcReinforcingBarTypeEnum);
-    current->add("NominalDiameter",true,IfcUtil::Argument_DOUBLE);
-    current->add("CrossSectionArea",true,IfcUtil::Argument_DOUBLE);
-    current->add("BarLength",true,IfcUtil::Argument_DOUBLE);
+    current->add("NominalDiameter",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("CrossSectionArea",true,IfcUtil::Argument_DOUBLE,Type::IfcAreaMeasure);
+    current->add("BarLength",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
     current->add("BarSurface",true,IfcUtil::Argument_ENUMERATION,Type::IfcReinforcingBarSurfaceEnum);
-    current->add("BendingShapeCode",true,IfcUtil::Argument_STRING);
-    current->add("BendingParameters",true,IfcUtil::Argument_ENTITY_LIST);
+    current->add("BendingShapeCode",true,IfcUtil::Argument_STRING,Type::IfcLabel);
+    current->add("BendingParameters",true,IfcUtil::Argument_ENTITY_LIST,Type::IfcBendingParameterSelect);
     current = entity_descriptor_map[Type::IfcRoof] = new IfcEntityDescriptor(Type::IfcRoof,entity_descriptor_map.find(Type::IfcBuildingElement)->second);
     current->add("PredefinedType",true,IfcUtil::Argument_ENUMERATION,Type::IfcRoofTypeEnum);
     current = entity_descriptor_map[Type::IfcSanitaryTerminal] = new IfcEntityDescriptor(Type::IfcSanitaryTerminal,entity_descriptor_map.find(Type::IfcFlowTerminal)->second);
@@ -2526,19 +2541,19 @@ void InitDescriptorMap() {
     current = entity_descriptor_map[Type::IfcStair] = new IfcEntityDescriptor(Type::IfcStair,entity_descriptor_map.find(Type::IfcBuildingElement)->second);
     current->add("PredefinedType",true,IfcUtil::Argument_ENUMERATION,Type::IfcStairTypeEnum);
     current = entity_descriptor_map[Type::IfcStairFlight] = new IfcEntityDescriptor(Type::IfcStairFlight,entity_descriptor_map.find(Type::IfcBuildingElement)->second);
-    current->add("NumberOfRiser",true,IfcUtil::Argument_INT);
-    current->add("NumberOfTreads",true,IfcUtil::Argument_INT);
-    current->add("RiserHeight",true,IfcUtil::Argument_DOUBLE);
-    current->add("TreadLength",true,IfcUtil::Argument_DOUBLE);
+    current->add("NumberOfRiser",true,IfcUtil::Argument_INT,Type::UNDEFINED);
+    current->add("NumberOfTreads",true,IfcUtil::Argument_INT,Type::UNDEFINED);
+    current->add("RiserHeight",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("TreadLength",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
     current->add("PredefinedType",true,IfcUtil::Argument_ENUMERATION,Type::IfcStairFlightTypeEnum);
     current = entity_descriptor_map[Type::IfcStructuralAnalysisModel] = new IfcEntityDescriptor(Type::IfcStructuralAnalysisModel,entity_descriptor_map.find(Type::IfcSystem)->second);
     current->add("PredefinedType",false,IfcUtil::Argument_ENUMERATION,Type::IfcAnalysisModelTypeEnum);
-    current->add("OrientationOf2DPlane",true,IfcUtil::Argument_ENTITY);
-    current->add("LoadedBy",true,IfcUtil::Argument_ENTITY_LIST);
-    current->add("HasResults",true,IfcUtil::Argument_ENTITY_LIST);
-    current->add("SharedPlacement",true,IfcUtil::Argument_ENTITY);
+    current->add("OrientationOf2DPlane",true,IfcUtil::Argument_ENTITY,Type::IfcAxis2Placement3D);
+    current->add("LoadedBy",true,IfcUtil::Argument_ENTITY_LIST,Type::IfcStructuralLoadGroup);
+    current->add("HasResults",true,IfcUtil::Argument_ENTITY_LIST,Type::IfcStructuralResultGroup);
+    current->add("SharedPlacement",true,IfcUtil::Argument_ENTITY,Type::IfcObjectPlacement);
     current = entity_descriptor_map[Type::IfcStructuralLoadCase] = new IfcEntityDescriptor(Type::IfcStructuralLoadCase,entity_descriptor_map.find(Type::IfcStructuralLoadGroup)->second);
-    current->add("SelfWeightCoefficients",true,IfcUtil::Argument_VECTOR_DOUBLE);
+    current->add("SelfWeightCoefficients",true,IfcUtil::Argument_VECTOR_DOUBLE,Type::IfcRatioMeasure);
     current = entity_descriptor_map[Type::IfcStructuralPlanarAction] = new IfcEntityDescriptor(Type::IfcStructuralPlanarAction,entity_descriptor_map.find(Type::IfcStructuralSurfaceAction)->second);
 
     current = entity_descriptor_map[Type::IfcSwitchingDevice] = new IfcEntityDescriptor(Type::IfcSwitchingDevice,entity_descriptor_map.find(Type::IfcFlowController)->second);
@@ -2564,11 +2579,11 @@ void InitDescriptorMap() {
     current = entity_descriptor_map[Type::IfcWasteTerminal] = new IfcEntityDescriptor(Type::IfcWasteTerminal,entity_descriptor_map.find(Type::IfcFlowTerminal)->second);
     current->add("PredefinedType",true,IfcUtil::Argument_ENUMERATION,Type::IfcWasteTerminalTypeEnum);
     current = entity_descriptor_map[Type::IfcWindow] = new IfcEntityDescriptor(Type::IfcWindow,entity_descriptor_map.find(Type::IfcBuildingElement)->second);
-    current->add("OverallHeight",true,IfcUtil::Argument_DOUBLE);
-    current->add("OverallWidth",true,IfcUtil::Argument_DOUBLE);
+    current->add("OverallHeight",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
+    current->add("OverallWidth",true,IfcUtil::Argument_DOUBLE,Type::IfcPositiveLengthMeasure);
     current->add("PredefinedType",true,IfcUtil::Argument_ENUMERATION,Type::IfcWindowTypeEnum);
     current->add("PartitioningType",true,IfcUtil::Argument_ENUMERATION,Type::IfcWindowTypePartitioningEnum);
-    current->add("UserDefinedPartitioningType",true,IfcUtil::Argument_STRING);
+    current->add("UserDefinedPartitioningType",true,IfcUtil::Argument_STRING,Type::IfcLabel);
     current = entity_descriptor_map[Type::IfcWindowStandardCase] = new IfcEntityDescriptor(Type::IfcWindowStandardCase,entity_descriptor_map.find(Type::IfcWindow)->second);
 
     current = entity_descriptor_map[Type::IfcActuatorType] = new IfcEntityDescriptor(Type::IfcActuatorType,entity_descriptor_map.find(Type::IfcDistributionControlElementType)->second);
@@ -4702,156 +4717,167 @@ void InitDescriptorMap() {
     current_enum = enumeration_descriptor_map[Type::IfcWorkScheduleTypeEnum] = new IfcEnumerationDescriptor(Type::IfcWorkScheduleTypeEnum, values);
 }
 
+#ifdef _MSC_VER
+#  pragma optimize( "", on )
+#endif
+
 void InitInverseMap() {
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcActor, "IsActingUpon"), std::make_pair(Type::IfcRelAssignsToActor, 6)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcActorRole, "HasExternalReference"), std::make_pair(Type::IfcExternalReferenceRelationship, 3)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcAddress, "OfPerson"), std::make_pair(Type::IfcPerson, 7)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcAddress, "OfOrganization"), std::make_pair(Type::IfcOrganization, 4)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcAnnotation, "ContainedInStructure"), std::make_pair(Type::IfcRelContainedInSpatialStructure, 4)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcAppliedValue, "HasExternalReference"), std::make_pair(Type::IfcExternalReferenceRelationship, 3)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcApproval, "HasExternalReferences"), std::make_pair(Type::IfcExternalReferenceRelationship, 3)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcApproval, "ApprovedObjects"), std::make_pair(Type::IfcRelAssociatesApproval, 5)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcApproval, "ApprovedResources"), std::make_pair(Type::IfcResourceApprovalRelationship, 3)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcApproval, "IsRelatedWith"), std::make_pair(Type::IfcApprovalRelationship, 3)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcApproval, "Relates"), std::make_pair(Type::IfcApprovalRelationship, 2)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcBuildingElement, "HasCoverings"), std::make_pair(Type::IfcRelCoversBldgElements, 4)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcClassification, "ClassificationForObjects"), std::make_pair(Type::IfcRelAssociatesClassification, 5)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcClassification, "HasReferences"), std::make_pair(Type::IfcClassificationReference, 3)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcClassificationReference, "ClassificationRefForObjects"), std::make_pair(Type::IfcRelAssociatesClassification, 5)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcClassificationReference, "HasReferences"), std::make_pair(Type::IfcClassificationReference, 3)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcCompositeCurveSegment, "UsingCurves"), std::make_pair(Type::IfcCompositeCurve, 0)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcConstraint, "HasExternalReferences"), std::make_pair(Type::IfcExternalReferenceRelationship, 3)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcConstraint, "PropertiesForConstraint"), std::make_pair(Type::IfcResourceConstraintRelationship, 2)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcContext, "IsDefinedBy"), std::make_pair(Type::IfcRelDefinesByProperties, 4)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcContext, "Declares"), std::make_pair(Type::IfcRelDeclares, 4)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcContextDependentUnit, "HasExternalReference"), std::make_pair(Type::IfcExternalReferenceRelationship, 3)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcControl, "Controls"), std::make_pair(Type::IfcRelAssignsToControl, 6)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcConversionBasedUnit, "HasExternalReference"), std::make_pair(Type::IfcExternalReferenceRelationship, 3)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcCovering, "CoversSpaces"), std::make_pair(Type::IfcRelCoversSpaces, 5)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcCovering, "CoversElements"), std::make_pair(Type::IfcRelCoversBldgElements, 5)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcDistributionControlElement, "AssignedToFlowElement"), std::make_pair(Type::IfcRelFlowControlElements, 4)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcDistributionElement, "HasPorts"), std::make_pair(Type::IfcRelConnectsPortToElement, 5)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcDistributionFlowElement, "HasControlElements"), std::make_pair(Type::IfcRelFlowControlElements, 5)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcDocumentInformation, "DocumentInfoForObjects"), std::make_pair(Type::IfcRelAssociatesDocument, 5)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcDocumentInformation, "HasDocumentReferences"), std::make_pair(Type::IfcDocumentReference, 4)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcDocumentInformation, "IsPointedTo"), std::make_pair(Type::IfcDocumentInformationRelationship, 3)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcDocumentInformation, "IsPointer"), std::make_pair(Type::IfcDocumentInformationRelationship, 2)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcDocumentReference, "DocumentRefForObjects"), std::make_pair(Type::IfcRelAssociatesDocument, 5)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcElement, "FillsVoids"), std::make_pair(Type::IfcRelFillsElement, 5)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcElement, "ConnectedTo"), std::make_pair(Type::IfcRelConnectsElements, 5)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcElement, "IsInterferedByElements"), std::make_pair(Type::IfcRelInterferesElements, 5)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcElement, "InterferesElements"), std::make_pair(Type::IfcRelInterferesElements, 4)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcElement, "HasProjections"), std::make_pair(Type::IfcRelProjectsElement, 4)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcElement, "ReferencedInStructures"), std::make_pair(Type::IfcRelReferencedInSpatialStructure, 4)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcElement, "HasOpenings"), std::make_pair(Type::IfcRelVoidsElement, 4)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcElement, "IsConnectionRealization"), std::make_pair(Type::IfcRelConnectsWithRealizingElements, 7)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcElement, "ProvidesBoundaries"), std::make_pair(Type::IfcRelSpaceBoundary, 5)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcElement, "ConnectedFrom"), std::make_pair(Type::IfcRelConnectsElements, 6)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcElement, "ContainedInStructure"), std::make_pair(Type::IfcRelContainedInSpatialStructure, 4)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcExternalReference, "ExternalReferenceForResources"), std::make_pair(Type::IfcExternalReferenceRelationship, 2)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcExternalSpatialElement, "BoundedBy"), std::make_pair(Type::IfcRelSpaceBoundary, 4)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcFace, "HasTextureMaps"), std::make_pair(Type::IfcTextureMap, 2)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcFeatureElementAddition, "ProjectsElements"), std::make_pair(Type::IfcRelProjectsElement, 5)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcFeatureElementSubtraction, "VoidsElements"), std::make_pair(Type::IfcRelVoidsElement, 5)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcGeometricRepresentationContext, "HasSubContexts"), std::make_pair(Type::IfcGeometricRepresentationSubContext, 6)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcGrid, "ContainedInStructure"), std::make_pair(Type::IfcRelContainedInSpatialStructure, 4)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcGridAxis, "PartOfW"), std::make_pair(Type::IfcGrid, 9)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcGridAxis, "PartOfV"), std::make_pair(Type::IfcGrid, 8)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcGridAxis, "PartOfU"), std::make_pair(Type::IfcGrid, 7)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcGridAxis, "HasIntersections"), std::make_pair(Type::IfcVirtualGridIntersection, 0)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcGroup, "IsGroupedBy"), std::make_pair(Type::IfcRelAssignsToGroup, 6)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcLibraryInformation, "LibraryInfoForObjects"), std::make_pair(Type::IfcRelAssociatesLibrary, 5)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcLibraryInformation, "HasLibraryReferences"), std::make_pair(Type::IfcLibraryReference, 5)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcLibraryReference, "LibraryRefForObjects"), std::make_pair(Type::IfcRelAssociatesLibrary, 5)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcMaterial, "HasRepresentation"), std::make_pair(Type::IfcMaterialDefinitionRepresentation, 3)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcMaterial, "IsRelatedWith"), std::make_pair(Type::IfcMaterialRelationship, 3)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcMaterial, "RelatesTo"), std::make_pair(Type::IfcMaterialRelationship, 2)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcMaterialConstituent, "ToMaterialConstituentSet"), std::make_pair(Type::IfcMaterialConstituentSet, 2)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcMaterialDefinition, "AssociatedTo"), std::make_pair(Type::IfcRelAssociatesMaterial, 5)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcMaterialDefinition, "HasExternalReferences"), std::make_pair(Type::IfcExternalReferenceRelationship, 3)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcMaterialDefinition, "HasProperties"), std::make_pair(Type::IfcMaterialProperties, 3)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcMaterialLayer, "ToMaterialLayerSet"), std::make_pair(Type::IfcMaterialLayerSet, 0)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcMaterialProfile, "ToMaterialProfileSet"), std::make_pair(Type::IfcMaterialProfileSet, 2)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcMaterialUsageDefinition, "AssociatedTo"), std::make_pair(Type::IfcRelAssociatesMaterial, 5)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcObject, "IsDeclaredBy"), std::make_pair(Type::IfcRelDefinesByObject, 4)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcObject, "Declares"), std::make_pair(Type::IfcRelDefinesByObject, 5)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcObject, "IsTypedBy"), std::make_pair(Type::IfcRelDefinesByType, 4)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcObject, "IsDefinedBy"), std::make_pair(Type::IfcRelDefinesByProperties, 4)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcObjectDefinition, "HasAssignments"), std::make_pair(Type::IfcRelAssigns, 4)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcObjectDefinition, "Nests"), std::make_pair(Type::IfcRelNests, 5)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcObjectDefinition, "IsNestedBy"), std::make_pair(Type::IfcRelNests, 4)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcObjectDefinition, "HasContext"), std::make_pair(Type::IfcRelDeclares, 5)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcObjectDefinition, "IsDecomposedBy"), std::make_pair(Type::IfcRelAggregates, 4)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcObjectDefinition, "Decomposes"), std::make_pair(Type::IfcRelAggregates, 5)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcObjectDefinition, "HasAssociations"), std::make_pair(Type::IfcRelAssociates, 4)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcObjectPlacement, "PlacesObject"), std::make_pair(Type::IfcProduct, 5)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcObjectPlacement, "ReferencedByPlacements"), std::make_pair(Type::IfcLocalPlacement, 0)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcOpeningElement, "HasFillings"), std::make_pair(Type::IfcRelFillsElement, 4)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcOrganization, "IsRelatedBy"), std::make_pair(Type::IfcOrganizationRelationship, 3)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcOrganization, "Relates"), std::make_pair(Type::IfcOrganizationRelationship, 2)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcOrganization, "Engages"), std::make_pair(Type::IfcPersonAndOrganization, 1)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcPerson, "EngagedIn"), std::make_pair(Type::IfcPersonAndOrganization, 0)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcPhysicalQuantity, "HasExternalReferences"), std::make_pair(Type::IfcExternalReferenceRelationship, 3)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcPhysicalQuantity, "PartOfComplex"), std::make_pair(Type::IfcPhysicalComplexQuantity, 2)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcPort, "ContainedIn"), std::make_pair(Type::IfcRelConnectsPortToElement, 4)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcPort, "ConnectedFrom"), std::make_pair(Type::IfcRelConnectsPorts, 5)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcPort, "ConnectedTo"), std::make_pair(Type::IfcRelConnectsPorts, 4)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcProcess, "IsPredecessorTo"), std::make_pair(Type::IfcRelSequence, 4)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcProcess, "IsSuccessorFrom"), std::make_pair(Type::IfcRelSequence, 5)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcProcess, "OperatesOn"), std::make_pair(Type::IfcRelAssignsToProcess, 6)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcProduct, "ReferencedBy"), std::make_pair(Type::IfcRelAssignsToProduct, 6)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcProductDefinitionShape, "ShapeOfProduct"), std::make_pair(Type::IfcProduct, 6)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcProductDefinitionShape, "HasShapeAspects"), std::make_pair(Type::IfcShapeAspect, 4)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcProfileDef, "HasExternalReference"), std::make_pair(Type::IfcExternalReferenceRelationship, 3)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcProfileDef, "HasProperties"), std::make_pair(Type::IfcProfileProperties, 3)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcProperty, "PartOfPset"), std::make_pair(Type::IfcPropertySet, 4)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcProperty, "PropertyForDependance"), std::make_pair(Type::IfcPropertyDependencyRelationship, 2)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcProperty, "PropertyDependsOn"), std::make_pair(Type::IfcPropertyDependencyRelationship, 3)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcProperty, "PartOfComplex"), std::make_pair(Type::IfcComplexProperty, 3)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcPropertyAbstraction, "HasExternalReferences"), std::make_pair(Type::IfcExternalReferenceRelationship, 3)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcPropertyDefinition, "HasContext"), std::make_pair(Type::IfcRelDeclares, 5)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcPropertyDefinition, "HasAssociations"), std::make_pair(Type::IfcRelAssociates, 4)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcPropertySetDefinition, "DefinesType"), std::make_pair(Type::IfcTypeObject, 5)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcPropertySetDefinition, "IsDefinedBy"), std::make_pair(Type::IfcRelDefinesByTemplate, 4)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcPropertySetDefinition, "DefinesOccurrence"), std::make_pair(Type::IfcRelDefinesByProperties, 5)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcPropertySetTemplate, "Defines"), std::make_pair(Type::IfcRelDefinesByTemplate, 5)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcPropertyTemplate, "PartOfComplexTemplate"), std::make_pair(Type::IfcComplexPropertyTemplate, 6)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcPropertyTemplate, "PartOfPsetTemplate"), std::make_pair(Type::IfcPropertySetTemplate, 6)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcRelSpaceBoundary1stLevel, "InnerBoundaries"), std::make_pair(Type::IfcRelSpaceBoundary1stLevel, 9)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcRelSpaceBoundary2ndLevel, "Corresponds"), std::make_pair(Type::IfcRelSpaceBoundary2ndLevel, 10)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcRepresentation, "RepresentationMap"), std::make_pair(Type::IfcRepresentationMap, 1)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcRepresentation, "LayerAssignments"), std::make_pair(Type::IfcPresentationLayerAssignment, 2)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcRepresentation, "OfProductRepresentation"), std::make_pair(Type::IfcProductRepresentation, 2)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcRepresentationContext, "RepresentationsInContext"), std::make_pair(Type::IfcRepresentation, 0)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcRepresentationItem, "LayerAssignment"), std::make_pair(Type::IfcPresentationLayerAssignment, 2)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcRepresentationItem, "StyledByItem"), std::make_pair(Type::IfcStyledItem, 0)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcRepresentationMap, "HasShapeAspects"), std::make_pair(Type::IfcShapeAspect, 4)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcRepresentationMap, "MapUsage"), std::make_pair(Type::IfcMappedItem, 0)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcResource, "ResourceOf"), std::make_pair(Type::IfcRelAssignsToResource, 6)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcShapeModel, "OfShapeAspect"), std::make_pair(Type::IfcShapeAspect, 0)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcSpace, "HasCoverings"), std::make_pair(Type::IfcRelCoversSpaces, 4)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcSpace, "BoundedBy"), std::make_pair(Type::IfcRelSpaceBoundary, 4)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcSpatialElement, "ContainsElements"), std::make_pair(Type::IfcRelContainedInSpatialStructure, 5)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcSpatialElement, "ServicedBySystems"), std::make_pair(Type::IfcRelServicesBuildings, 5)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcSpatialElement, "ReferencesElements"), std::make_pair(Type::IfcRelReferencedInSpatialStructure, 5)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcStructuralActivity, "AssignedToStructuralItem"), std::make_pair(Type::IfcRelConnectsStructuralActivity, 5)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcStructuralConnection, "ConnectsStructuralMembers"), std::make_pair(Type::IfcRelConnectsStructuralMember, 5)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcStructuralItem, "AssignedStructuralActivity"), std::make_pair(Type::IfcRelConnectsStructuralActivity, 4)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcStructuralLoadGroup, "SourceOfResultGroup"), std::make_pair(Type::IfcStructuralResultGroup, 6)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcStructuralLoadGroup, "LoadGroupFor"), std::make_pair(Type::IfcStructuralAnalysisModel, 7)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcStructuralMember, "ConnectedBy"), std::make_pair(Type::IfcRelConnectsStructuralMember, 4)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcStructuralResultGroup, "ResultGroupFor"), std::make_pair(Type::IfcStructuralAnalysisModel, 8)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcSurfaceTexture, "IsMappedBy"), std::make_pair(Type::IfcTextureCoordinate, 0)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcSurfaceTexture, "UsedInStyles"), std::make_pair(Type::IfcSurfaceStyleWithTextures, 0)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcSystem, "ServicesBuildings"), std::make_pair(Type::IfcRelServicesBuildings, 4)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcTableRow, "OfTable"), std::make_pair(Type::IfcTable, 1)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcTessellatedFaceSet, "HasColours"), std::make_pair(Type::IfcIndexedColourMap, 0)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcTessellatedFaceSet, "HasTextures"), std::make_pair(Type::IfcIndexedTextureMap, 1)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcTimeSeries, "HasExternalReference"), std::make_pair(Type::IfcExternalReferenceRelationship, 3)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcTypeObject, "Types"), std::make_pair(Type::IfcRelDefinesByType, 5)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcTypeProcess, "OperatesOn"), std::make_pair(Type::IfcRelAssignsToProcess, 6)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcTypeProduct, "ReferencedBy"), std::make_pair(Type::IfcRelAssignsToProduct, 6)));
-    inverse_map.insert(std::make_pair(std::make_pair(Type::IfcTypeResource, "ResourceOf"), std::make_pair(Type::IfcRelAssignsToResource, 6)));
+    inverse_map[Type::IfcActor].insert(std::make_pair("IsActingUpon", std::make_pair(Type::IfcRelAssignsToActor, 6)));
+    inverse_map[Type::IfcActorRole].insert(std::make_pair("HasExternalReference", std::make_pair(Type::IfcExternalReferenceRelationship, 3)));
+    inverse_map[Type::IfcAddress].insert(std::make_pair("OfPerson", std::make_pair(Type::IfcPerson, 7)));
+    inverse_map[Type::IfcAddress].insert(std::make_pair("OfOrganization", std::make_pair(Type::IfcOrganization, 4)));
+    inverse_map[Type::IfcAnnotation].insert(std::make_pair("ContainedInStructure", std::make_pair(Type::IfcRelContainedInSpatialStructure, 4)));
+    inverse_map[Type::IfcAppliedValue].insert(std::make_pair("HasExternalReference", std::make_pair(Type::IfcExternalReferenceRelationship, 3)));
+    inverse_map[Type::IfcApproval].insert(std::make_pair("HasExternalReferences", std::make_pair(Type::IfcExternalReferenceRelationship, 3)));
+    inverse_map[Type::IfcApproval].insert(std::make_pair("ApprovedObjects", std::make_pair(Type::IfcRelAssociatesApproval, 5)));
+    inverse_map[Type::IfcApproval].insert(std::make_pair("ApprovedResources", std::make_pair(Type::IfcResourceApprovalRelationship, 3)));
+    inverse_map[Type::IfcApproval].insert(std::make_pair("IsRelatedWith", std::make_pair(Type::IfcApprovalRelationship, 3)));
+    inverse_map[Type::IfcApproval].insert(std::make_pair("Relates", std::make_pair(Type::IfcApprovalRelationship, 2)));
+    inverse_map[Type::IfcBuildingElement].insert(std::make_pair("HasCoverings", std::make_pair(Type::IfcRelCoversBldgElements, 4)));
+    inverse_map[Type::IfcClassification].insert(std::make_pair("ClassificationForObjects", std::make_pair(Type::IfcRelAssociatesClassification, 5)));
+    inverse_map[Type::IfcClassification].insert(std::make_pair("HasReferences", std::make_pair(Type::IfcClassificationReference, 3)));
+    inverse_map[Type::IfcClassificationReference].insert(std::make_pair("ClassificationRefForObjects", std::make_pair(Type::IfcRelAssociatesClassification, 5)));
+    inverse_map[Type::IfcClassificationReference].insert(std::make_pair("HasReferences", std::make_pair(Type::IfcClassificationReference, 3)));
+    inverse_map[Type::IfcCompositeCurveSegment].insert(std::make_pair("UsingCurves", std::make_pair(Type::IfcCompositeCurve, 0)));
+    inverse_map[Type::IfcConstraint].insert(std::make_pair("HasExternalReferences", std::make_pair(Type::IfcExternalReferenceRelationship, 3)));
+    inverse_map[Type::IfcConstraint].insert(std::make_pair("PropertiesForConstraint", std::make_pair(Type::IfcResourceConstraintRelationship, 2)));
+    inverse_map[Type::IfcContext].insert(std::make_pair("IsDefinedBy", std::make_pair(Type::IfcRelDefinesByProperties, 4)));
+    inverse_map[Type::IfcContext].insert(std::make_pair("Declares", std::make_pair(Type::IfcRelDeclares, 4)));
+    inverse_map[Type::IfcContextDependentUnit].insert(std::make_pair("HasExternalReference", std::make_pair(Type::IfcExternalReferenceRelationship, 3)));
+    inverse_map[Type::IfcControl].insert(std::make_pair("Controls", std::make_pair(Type::IfcRelAssignsToControl, 6)));
+    inverse_map[Type::IfcConversionBasedUnit].insert(std::make_pair("HasExternalReference", std::make_pair(Type::IfcExternalReferenceRelationship, 3)));
+    inverse_map[Type::IfcCovering].insert(std::make_pair("CoversSpaces", std::make_pair(Type::IfcRelCoversSpaces, 5)));
+    inverse_map[Type::IfcCovering].insert(std::make_pair("CoversElements", std::make_pair(Type::IfcRelCoversBldgElements, 5)));
+    inverse_map[Type::IfcDistributionControlElement].insert(std::make_pair("AssignedToFlowElement", std::make_pair(Type::IfcRelFlowControlElements, 4)));
+    inverse_map[Type::IfcDistributionElement].insert(std::make_pair("HasPorts", std::make_pair(Type::IfcRelConnectsPortToElement, 5)));
+    inverse_map[Type::IfcDistributionFlowElement].insert(std::make_pair("HasControlElements", std::make_pair(Type::IfcRelFlowControlElements, 5)));
+    inverse_map[Type::IfcDocumentInformation].insert(std::make_pair("DocumentInfoForObjects", std::make_pair(Type::IfcRelAssociatesDocument, 5)));
+    inverse_map[Type::IfcDocumentInformation].insert(std::make_pair("HasDocumentReferences", std::make_pair(Type::IfcDocumentReference, 4)));
+    inverse_map[Type::IfcDocumentInformation].insert(std::make_pair("IsPointedTo", std::make_pair(Type::IfcDocumentInformationRelationship, 3)));
+    inverse_map[Type::IfcDocumentInformation].insert(std::make_pair("IsPointer", std::make_pair(Type::IfcDocumentInformationRelationship, 2)));
+    inverse_map[Type::IfcDocumentReference].insert(std::make_pair("DocumentRefForObjects", std::make_pair(Type::IfcRelAssociatesDocument, 5)));
+    inverse_map[Type::IfcElement].insert(std::make_pair("FillsVoids", std::make_pair(Type::IfcRelFillsElement, 5)));
+    inverse_map[Type::IfcElement].insert(std::make_pair("ConnectedTo", std::make_pair(Type::IfcRelConnectsElements, 5)));
+    inverse_map[Type::IfcElement].insert(std::make_pair("IsInterferedByElements", std::make_pair(Type::IfcRelInterferesElements, 5)));
+    inverse_map[Type::IfcElement].insert(std::make_pair("InterferesElements", std::make_pair(Type::IfcRelInterferesElements, 4)));
+    inverse_map[Type::IfcElement].insert(std::make_pair("HasProjections", std::make_pair(Type::IfcRelProjectsElement, 4)));
+    inverse_map[Type::IfcElement].insert(std::make_pair("ReferencedInStructures", std::make_pair(Type::IfcRelReferencedInSpatialStructure, 4)));
+    inverse_map[Type::IfcElement].insert(std::make_pair("HasOpenings", std::make_pair(Type::IfcRelVoidsElement, 4)));
+    inverse_map[Type::IfcElement].insert(std::make_pair("IsConnectionRealization", std::make_pair(Type::IfcRelConnectsWithRealizingElements, 7)));
+    inverse_map[Type::IfcElement].insert(std::make_pair("ProvidesBoundaries", std::make_pair(Type::IfcRelSpaceBoundary, 5)));
+    inverse_map[Type::IfcElement].insert(std::make_pair("ConnectedFrom", std::make_pair(Type::IfcRelConnectsElements, 6)));
+    inverse_map[Type::IfcElement].insert(std::make_pair("ContainedInStructure", std::make_pair(Type::IfcRelContainedInSpatialStructure, 4)));
+    inverse_map[Type::IfcExternalReference].insert(std::make_pair("ExternalReferenceForResources", std::make_pair(Type::IfcExternalReferenceRelationship, 2)));
+    inverse_map[Type::IfcExternalSpatialElement].insert(std::make_pair("BoundedBy", std::make_pair(Type::IfcRelSpaceBoundary, 4)));
+    inverse_map[Type::IfcFace].insert(std::make_pair("HasTextureMaps", std::make_pair(Type::IfcTextureMap, 2)));
+    inverse_map[Type::IfcFeatureElementAddition].insert(std::make_pair("ProjectsElements", std::make_pair(Type::IfcRelProjectsElement, 5)));
+    inverse_map[Type::IfcFeatureElementSubtraction].insert(std::make_pair("VoidsElements", std::make_pair(Type::IfcRelVoidsElement, 5)));
+    inverse_map[Type::IfcGeometricRepresentationContext].insert(std::make_pair("HasSubContexts", std::make_pair(Type::IfcGeometricRepresentationSubContext, 6)));
+    inverse_map[Type::IfcGrid].insert(std::make_pair("ContainedInStructure", std::make_pair(Type::IfcRelContainedInSpatialStructure, 4)));
+    inverse_map[Type::IfcGridAxis].insert(std::make_pair("PartOfW", std::make_pair(Type::IfcGrid, 9)));
+    inverse_map[Type::IfcGridAxis].insert(std::make_pair("PartOfV", std::make_pair(Type::IfcGrid, 8)));
+    inverse_map[Type::IfcGridAxis].insert(std::make_pair("PartOfU", std::make_pair(Type::IfcGrid, 7)));
+    inverse_map[Type::IfcGridAxis].insert(std::make_pair("HasIntersections", std::make_pair(Type::IfcVirtualGridIntersection, 0)));
+    inverse_map[Type::IfcGroup].insert(std::make_pair("IsGroupedBy", std::make_pair(Type::IfcRelAssignsToGroup, 6)));
+    inverse_map[Type::IfcLibraryInformation].insert(std::make_pair("LibraryInfoForObjects", std::make_pair(Type::IfcRelAssociatesLibrary, 5)));
+    inverse_map[Type::IfcLibraryInformation].insert(std::make_pair("HasLibraryReferences", std::make_pair(Type::IfcLibraryReference, 5)));
+    inverse_map[Type::IfcLibraryReference].insert(std::make_pair("LibraryRefForObjects", std::make_pair(Type::IfcRelAssociatesLibrary, 5)));
+    inverse_map[Type::IfcMaterial].insert(std::make_pair("HasRepresentation", std::make_pair(Type::IfcMaterialDefinitionRepresentation, 3)));
+    inverse_map[Type::IfcMaterial].insert(std::make_pair("IsRelatedWith", std::make_pair(Type::IfcMaterialRelationship, 3)));
+    inverse_map[Type::IfcMaterial].insert(std::make_pair("RelatesTo", std::make_pair(Type::IfcMaterialRelationship, 2)));
+    inverse_map[Type::IfcMaterialConstituent].insert(std::make_pair("ToMaterialConstituentSet", std::make_pair(Type::IfcMaterialConstituentSet, 2)));
+    inverse_map[Type::IfcMaterialDefinition].insert(std::make_pair("AssociatedTo", std::make_pair(Type::IfcRelAssociatesMaterial, 5)));
+    inverse_map[Type::IfcMaterialDefinition].insert(std::make_pair("HasExternalReferences", std::make_pair(Type::IfcExternalReferenceRelationship, 3)));
+    inverse_map[Type::IfcMaterialDefinition].insert(std::make_pair("HasProperties", std::make_pair(Type::IfcMaterialProperties, 3)));
+    inverse_map[Type::IfcMaterialLayer].insert(std::make_pair("ToMaterialLayerSet", std::make_pair(Type::IfcMaterialLayerSet, 0)));
+    inverse_map[Type::IfcMaterialProfile].insert(std::make_pair("ToMaterialProfileSet", std::make_pair(Type::IfcMaterialProfileSet, 2)));
+    inverse_map[Type::IfcMaterialUsageDefinition].insert(std::make_pair("AssociatedTo", std::make_pair(Type::IfcRelAssociatesMaterial, 5)));
+    inverse_map[Type::IfcObject].insert(std::make_pair("IsDeclaredBy", std::make_pair(Type::IfcRelDefinesByObject, 4)));
+    inverse_map[Type::IfcObject].insert(std::make_pair("Declares", std::make_pair(Type::IfcRelDefinesByObject, 5)));
+    inverse_map[Type::IfcObject].insert(std::make_pair("IsTypedBy", std::make_pair(Type::IfcRelDefinesByType, 4)));
+    inverse_map[Type::IfcObject].insert(std::make_pair("IsDefinedBy", std::make_pair(Type::IfcRelDefinesByProperties, 4)));
+    inverse_map[Type::IfcObjectDefinition].insert(std::make_pair("HasAssignments", std::make_pair(Type::IfcRelAssigns, 4)));
+    inverse_map[Type::IfcObjectDefinition].insert(std::make_pair("Nests", std::make_pair(Type::IfcRelNests, 5)));
+    inverse_map[Type::IfcObjectDefinition].insert(std::make_pair("IsNestedBy", std::make_pair(Type::IfcRelNests, 4)));
+    inverse_map[Type::IfcObjectDefinition].insert(std::make_pair("HasContext", std::make_pair(Type::IfcRelDeclares, 5)));
+    inverse_map[Type::IfcObjectDefinition].insert(std::make_pair("IsDecomposedBy", std::make_pair(Type::IfcRelAggregates, 4)));
+    inverse_map[Type::IfcObjectDefinition].insert(std::make_pair("Decomposes", std::make_pair(Type::IfcRelAggregates, 5)));
+    inverse_map[Type::IfcObjectDefinition].insert(std::make_pair("HasAssociations", std::make_pair(Type::IfcRelAssociates, 4)));
+    inverse_map[Type::IfcObjectPlacement].insert(std::make_pair("PlacesObject", std::make_pair(Type::IfcProduct, 5)));
+    inverse_map[Type::IfcObjectPlacement].insert(std::make_pair("ReferencedByPlacements", std::make_pair(Type::IfcLocalPlacement, 0)));
+    inverse_map[Type::IfcOpeningElement].insert(std::make_pair("HasFillings", std::make_pair(Type::IfcRelFillsElement, 4)));
+    inverse_map[Type::IfcOrganization].insert(std::make_pair("IsRelatedBy", std::make_pair(Type::IfcOrganizationRelationship, 3)));
+    inverse_map[Type::IfcOrganization].insert(std::make_pair("Relates", std::make_pair(Type::IfcOrganizationRelationship, 2)));
+    inverse_map[Type::IfcOrganization].insert(std::make_pair("Engages", std::make_pair(Type::IfcPersonAndOrganization, 1)));
+    inverse_map[Type::IfcPerson].insert(std::make_pair("EngagedIn", std::make_pair(Type::IfcPersonAndOrganization, 0)));
+    inverse_map[Type::IfcPhysicalQuantity].insert(std::make_pair("HasExternalReferences", std::make_pair(Type::IfcExternalReferenceRelationship, 3)));
+    inverse_map[Type::IfcPhysicalQuantity].insert(std::make_pair("PartOfComplex", std::make_pair(Type::IfcPhysicalComplexQuantity, 2)));
+    inverse_map[Type::IfcPort].insert(std::make_pair("ContainedIn", std::make_pair(Type::IfcRelConnectsPortToElement, 4)));
+    inverse_map[Type::IfcPort].insert(std::make_pair("ConnectedFrom", std::make_pair(Type::IfcRelConnectsPorts, 5)));
+    inverse_map[Type::IfcPort].insert(std::make_pair("ConnectedTo", std::make_pair(Type::IfcRelConnectsPorts, 4)));
+    inverse_map[Type::IfcProcess].insert(std::make_pair("IsPredecessorTo", std::make_pair(Type::IfcRelSequence, 4)));
+    inverse_map[Type::IfcProcess].insert(std::make_pair("IsSuccessorFrom", std::make_pair(Type::IfcRelSequence, 5)));
+    inverse_map[Type::IfcProcess].insert(std::make_pair("OperatesOn", std::make_pair(Type::IfcRelAssignsToProcess, 6)));
+    inverse_map[Type::IfcProduct].insert(std::make_pair("ReferencedBy", std::make_pair(Type::IfcRelAssignsToProduct, 6)));
+    inverse_map[Type::IfcProductDefinitionShape].insert(std::make_pair("ShapeOfProduct", std::make_pair(Type::IfcProduct, 6)));
+    inverse_map[Type::IfcProductDefinitionShape].insert(std::make_pair("HasShapeAspects", std::make_pair(Type::IfcShapeAspect, 4)));
+    inverse_map[Type::IfcProfileDef].insert(std::make_pair("HasExternalReference", std::make_pair(Type::IfcExternalReferenceRelationship, 3)));
+    inverse_map[Type::IfcProfileDef].insert(std::make_pair("HasProperties", std::make_pair(Type::IfcProfileProperties, 3)));
+    inverse_map[Type::IfcProperty].insert(std::make_pair("PartOfPset", std::make_pair(Type::IfcPropertySet, 4)));
+    inverse_map[Type::IfcProperty].insert(std::make_pair("PropertyForDependance", std::make_pair(Type::IfcPropertyDependencyRelationship, 2)));
+    inverse_map[Type::IfcProperty].insert(std::make_pair("PropertyDependsOn", std::make_pair(Type::IfcPropertyDependencyRelationship, 3)));
+    inverse_map[Type::IfcProperty].insert(std::make_pair("PartOfComplex", std::make_pair(Type::IfcComplexProperty, 3)));
+    inverse_map[Type::IfcPropertyAbstraction].insert(std::make_pair("HasExternalReferences", std::make_pair(Type::IfcExternalReferenceRelationship, 3)));
+    inverse_map[Type::IfcPropertyDefinition].insert(std::make_pair("HasContext", std::make_pair(Type::IfcRelDeclares, 5)));
+    inverse_map[Type::IfcPropertyDefinition].insert(std::make_pair("HasAssociations", std::make_pair(Type::IfcRelAssociates, 4)));
+    inverse_map[Type::IfcPropertySetDefinition].insert(std::make_pair("DefinesType", std::make_pair(Type::IfcTypeObject, 5)));
+    inverse_map[Type::IfcPropertySetDefinition].insert(std::make_pair("IsDefinedBy", std::make_pair(Type::IfcRelDefinesByTemplate, 4)));
+    inverse_map[Type::IfcPropertySetDefinition].insert(std::make_pair("DefinesOccurrence", std::make_pair(Type::IfcRelDefinesByProperties, 5)));
+    inverse_map[Type::IfcPropertySetTemplate].insert(std::make_pair("Defines", std::make_pair(Type::IfcRelDefinesByTemplate, 5)));
+    inverse_map[Type::IfcPropertyTemplate].insert(std::make_pair("PartOfComplexTemplate", std::make_pair(Type::IfcComplexPropertyTemplate, 6)));
+    inverse_map[Type::IfcPropertyTemplate].insert(std::make_pair("PartOfPsetTemplate", std::make_pair(Type::IfcPropertySetTemplate, 6)));
+    inverse_map[Type::IfcRelSpaceBoundary1stLevel].insert(std::make_pair("InnerBoundaries", std::make_pair(Type::IfcRelSpaceBoundary1stLevel, 9)));
+    inverse_map[Type::IfcRelSpaceBoundary2ndLevel].insert(std::make_pair("Corresponds", std::make_pair(Type::IfcRelSpaceBoundary2ndLevel, 10)));
+    inverse_map[Type::IfcRepresentation].insert(std::make_pair("RepresentationMap", std::make_pair(Type::IfcRepresentationMap, 1)));
+    inverse_map[Type::IfcRepresentation].insert(std::make_pair("LayerAssignments", std::make_pair(Type::IfcPresentationLayerAssignment, 2)));
+    inverse_map[Type::IfcRepresentation].insert(std::make_pair("OfProductRepresentation", std::make_pair(Type::IfcProductRepresentation, 2)));
+    inverse_map[Type::IfcRepresentationContext].insert(std::make_pair("RepresentationsInContext", std::make_pair(Type::IfcRepresentation, 0)));
+    inverse_map[Type::IfcRepresentationItem].insert(std::make_pair("LayerAssignment", std::make_pair(Type::IfcPresentationLayerAssignment, 2)));
+    inverse_map[Type::IfcRepresentationItem].insert(std::make_pair("StyledByItem", std::make_pair(Type::IfcStyledItem, 0)));
+    inverse_map[Type::IfcRepresentationMap].insert(std::make_pair("HasShapeAspects", std::make_pair(Type::IfcShapeAspect, 4)));
+    inverse_map[Type::IfcRepresentationMap].insert(std::make_pair("MapUsage", std::make_pair(Type::IfcMappedItem, 0)));
+    inverse_map[Type::IfcResource].insert(std::make_pair("ResourceOf", std::make_pair(Type::IfcRelAssignsToResource, 6)));
+    inverse_map[Type::IfcShapeModel].insert(std::make_pair("OfShapeAspect", std::make_pair(Type::IfcShapeAspect, 0)));
+    inverse_map[Type::IfcSpace].insert(std::make_pair("HasCoverings", std::make_pair(Type::IfcRelCoversSpaces, 4)));
+    inverse_map[Type::IfcSpace].insert(std::make_pair("BoundedBy", std::make_pair(Type::IfcRelSpaceBoundary, 4)));
+    inverse_map[Type::IfcSpatialElement].insert(std::make_pair("ContainsElements", std::make_pair(Type::IfcRelContainedInSpatialStructure, 5)));
+    inverse_map[Type::IfcSpatialElement].insert(std::make_pair("ServicedBySystems", std::make_pair(Type::IfcRelServicesBuildings, 5)));
+    inverse_map[Type::IfcSpatialElement].insert(std::make_pair("ReferencesElements", std::make_pair(Type::IfcRelReferencedInSpatialStructure, 5)));
+    inverse_map[Type::IfcStructuralActivity].insert(std::make_pair("AssignedToStructuralItem", std::make_pair(Type::IfcRelConnectsStructuralActivity, 5)));
+    inverse_map[Type::IfcStructuralConnection].insert(std::make_pair("ConnectsStructuralMembers", std::make_pair(Type::IfcRelConnectsStructuralMember, 5)));
+    inverse_map[Type::IfcStructuralItem].insert(std::make_pair("AssignedStructuralActivity", std::make_pair(Type::IfcRelConnectsStructuralActivity, 4)));
+    inverse_map[Type::IfcStructuralLoadGroup].insert(std::make_pair("SourceOfResultGroup", std::make_pair(Type::IfcStructuralResultGroup, 6)));
+    inverse_map[Type::IfcStructuralLoadGroup].insert(std::make_pair("LoadGroupFor", std::make_pair(Type::IfcStructuralAnalysisModel, 7)));
+    inverse_map[Type::IfcStructuralMember].insert(std::make_pair("ConnectedBy", std::make_pair(Type::IfcRelConnectsStructuralMember, 4)));
+    inverse_map[Type::IfcStructuralResultGroup].insert(std::make_pair("ResultGroupFor", std::make_pair(Type::IfcStructuralAnalysisModel, 8)));
+    inverse_map[Type::IfcSurfaceTexture].insert(std::make_pair("IsMappedBy", std::make_pair(Type::IfcTextureCoordinate, 0)));
+    inverse_map[Type::IfcSurfaceTexture].insert(std::make_pair("UsedInStyles", std::make_pair(Type::IfcSurfaceStyleWithTextures, 0)));
+    inverse_map[Type::IfcSystem].insert(std::make_pair("ServicesBuildings", std::make_pair(Type::IfcRelServicesBuildings, 4)));
+    inverse_map[Type::IfcTableRow].insert(std::make_pair("OfTable", std::make_pair(Type::IfcTable, 1)));
+    inverse_map[Type::IfcTessellatedFaceSet].insert(std::make_pair("HasColours", std::make_pair(Type::IfcIndexedColourMap, 0)));
+    inverse_map[Type::IfcTessellatedFaceSet].insert(std::make_pair("HasTextures", std::make_pair(Type::IfcIndexedTextureMap, 1)));
+    inverse_map[Type::IfcTimeSeries].insert(std::make_pair("HasExternalReference", std::make_pair(Type::IfcExternalReferenceRelationship, 3)));
+    inverse_map[Type::IfcTypeObject].insert(std::make_pair("Types", std::make_pair(Type::IfcRelDefinesByType, 5)));
+    inverse_map[Type::IfcTypeProcess].insert(std::make_pair("OperatesOn", std::make_pair(Type::IfcRelAssignsToProcess, 6)));
+    inverse_map[Type::IfcTypeProduct].insert(std::make_pair("ReferencedBy", std::make_pair(Type::IfcRelAssignsToProduct, 6)));
+    inverse_map[Type::IfcTypeResource].insert(std::make_pair("ResourceOf", std::make_pair(Type::IfcRelAssignsToResource, 6)));
+}
+
+void InitDerivedMap() {
+    {std::set<int> idxs; idxs.insert(2); idxs.insert(3); idxs.insert(4); idxs.insert(5); derived_map[Type::IfcGeometricRepresentationSubContext] = idxs;}
+    {std::set<int> idxs; idxs.insert(3); derived_map[Type::IfcMirroredProfileDef] = idxs;}
+    {std::set<int> idxs; idxs.insert(0); idxs.insert(1); derived_map[Type::IfcOrientedEdge] = idxs;}
+    {std::set<int> idxs; idxs.insert(0); derived_map[Type::IfcSIUnit] = idxs;}
 }
 
 int Type::GetAttributeIndex(Enum t, const std::string& a) {
@@ -4875,6 +4901,13 @@ ArgumentType Type::GetAttributeType(Enum t, unsigned char a) {
     else return i->second->getArgumentType(a);
 }
 
+Type::Enum Type::GetAttributeEntity(Enum t, unsigned char a) {
+    if (entity_descriptor_map.empty()) ::InitDescriptorMap();
+    std::map<Type::Enum,IfcEntityDescriptor*>::const_iterator i = entity_descriptor_map.find(t);
+    if ( i == entity_descriptor_map.end() ) throw IfcException("Type not found");
+    else return i->second->getArgumentEntity(a);
+}
+
 const std::string& Type::GetAttributeName(Enum t, unsigned char a) {
     if (entity_descriptor_map.empty()) ::InitDescriptorMap();
     std::map<Type::Enum,IfcEntityDescriptor*>::const_iterator i = entity_descriptor_map.find(t);
@@ -4889,6 +4922,12 @@ bool Type::GetAttributeOptional(Enum t, unsigned char a) {
     else return i->second->getArgumentOptional(a);
 }
 
+bool Type::GetAttributeDerived(Enum t, unsigned char a) {
+    if (derived_map.empty()) ::InitDerivedMap();
+    std::map<Type::Enum,std::set<int> >::const_iterator i = derived_map.find(t);
+    return i != derived_map.end() && i->second.find(a) != i->second.end();
+}
+
 std::pair<const char*, int> Type::GetEnumerationIndex(Enum t, const std::string& a) {
     if (enumeration_descriptor_map.empty()) ::InitDescriptorMap();
     std::map<Type::Enum,IfcEnumerationDescriptor*>::const_iterator i = enumeration_descriptor_map.find(t);
@@ -4898,32 +4937,48 @@ std::pair<const char*, int> Type::GetEnumerationIndex(Enum t, const std::string&
 
 std::pair<Type::Enum, unsigned> Type::GetInverseAttribute(Enum t, const std::string& a) {
 	if (inverse_map.empty()) ::InitInverseMap();
-	std::map<std::pair<Type::Enum, std::string>, std::pair<Type::Enum, int> >::const_iterator it;
-    std::pair<Type::Enum, std::string> key = std::make_pair(t, a);
+	inverse_map_t::const_iterator it;
+	inverse_map_t::mapped_type::const_iterator jt;
     while (true) {
-        it = inverse_map.find(key);
-        if (it != inverse_map.end()) return it->second;
-        if ((key.first = Parent(key.first)) == -1) break;
+        it = inverse_map.find(t);
+        if (it != inverse_map.end()) {
+			jt = it->second.find(a);
+			if (jt != it->second.end()) {
+				return jt->second;
+			}
+		}
+        if ((t = Parent(t)) == -1) break;
     }
     throw IfcException("Attribute not found");
 }
 
-Type::Enum Type::GetAttributeEnumerationClass(Enum t, unsigned char a) {
-    if (entity_descriptor_map.empty()) ::InitDescriptorMap();
-    std::map<Type::Enum,IfcEntityDescriptor*>::const_iterator i = entity_descriptor_map.find(t);
-    if ( i == entity_descriptor_map.end() ) throw IfcException("Type not found");
-    else {
-        Type::Enum t = i->second->getArgumentEnumerationClass(a);
-        if ( t == Type::ALL ) throw IfcException("Not an enumeration");
-        else return t;
+std::set<std::string> Type::GetInverseAttributeNames(Enum t) {
+	if (inverse_map.empty()) ::InitInverseMap();
+	inverse_map_t::const_iterator it;
+	inverse_map_t::mapped_type::const_iterator jt;
+
+	std::set<std::string> return_value;
+
+    while (true) {
+        it = inverse_map.find(t);
+        if (it != inverse_map.end()) {
+			for (jt = it->second.begin(); jt != it->second.end(); ++jt) {
+				return_value.insert(jt->first);
+			}
+		}
+        if ((t = Parent(t)) == -1) break;
     }
+    
+	return return_value;
 }
 
 void Type::PopulateDerivedFields(IfcWrite::IfcWritableEntity* e) {
-    Type::Enum type = e->type();
-    if (type == Type::IfcGeometricRepresentationSubContext) { e->setArgumentDerived(2); e->setArgumentDerived(3); e->setArgumentDerived(4); e->setArgumentDerived(5); }
-    if (type == Type::IfcMirroredProfileDef) { e->setArgumentDerived(3); }
-    if (type == Type::IfcOrientedEdge) { e->setArgumentDerived(0); e->setArgumentDerived(1); }
-    if (type == Type::IfcSIUnit) { e->setArgumentDerived(0); }
+    std::map<Type::Enum, std::set<int> >::const_iterator i = derived_map.find(e->type());
+	if (i != derived_map.end()) {
+		for (std::set<int>::const_iterator it = i->second.begin(); it != i->second.end(); ++it) {
+			e->setArgumentDerived(*it);
+		}
+	}
 }
+
 #endif
diff --git a/src/ifcparse/Ifc4-rt.h b/src/ifcparse/Ifc4-latebound.h
similarity index 94%
rename from src/ifcparse/Ifc4-rt.h
rename to src/ifcparse/Ifc4-latebound.h
index d5233f0..2c059b3 100644
--- a/src/ifcparse/Ifc4-rt.h
+++ b/src/ifcparse/Ifc4-latebound.h
@@ -23,7 +23,7 @@
  * but instead modify the python script that has been used to generate this.    *
  *                                                                              *
  ********************************************************************************/
- 
+
 #ifndef IFC4RT_H
 #define IFC4RT_H
 
@@ -38,11 +38,13 @@ namespace Type {
     int GetAttributeCount(Enum t);
     int GetAttributeIndex(Enum t, const std::string& a);
     IfcUtil::ArgumentType GetAttributeType(Enum t, unsigned char a);
+    Enum GetAttributeEntity(Enum t, unsigned char a);
     const std::string& GetAttributeName(Enum t, unsigned char a);
     bool GetAttributeOptional(Enum t, unsigned char a);
+    bool GetAttributeDerived(Enum t, unsigned char a);
     std::pair<const char*, int> GetEnumerationIndex(Enum t, const std::string& a);
     std::pair<Enum, unsigned> GetInverseAttribute(Enum t, const std::string& a);
-    Enum GetAttributeEnumerationClass(Enum t, unsigned char a);
+    std::set<std::string> GetInverseAttributeNames(Enum t);
     void PopulateDerivedFields(IfcWrite::IfcWritableEntity* e);
 }}
 
diff --git a/src/ifcparse/Ifc4.cpp b/src/ifcparse/Ifc4.cpp
index 7cd2b98..11a59bc 100644
--- a/src/ifcparse/Ifc4.cpp
+++ b/src/ifcparse/Ifc4.cpp
@@ -35,124 +35,134 @@ using namespace Ifc4;
 using namespace IfcParse;
 using namespace IfcWrite;
 
-IfcUtil::IfcSchemaEntity Ifc4::SchemaEntity(IfcAbstractEntityPtr e) {
+IfcUtil::IfcBaseClass* Ifc4::SchemaEntity(IfcAbstractEntity* e) {
     switch(e->type()) {
-        case Type::IfcAbsorbedDoseMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcAccelerationMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcAmountOfSubstanceMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcAngularVelocityMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcAreaDensityMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcAreaMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcBoolean: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcColour: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcComplexNumber: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcCompoundPlaneAngleMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcContextDependentMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcCountMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcCurvatureMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcCurveStyleFontSelect: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcDate: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcDateTime: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcDerivedMeasureValue: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcDescriptiveMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcDoseEquivalentMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcDuration: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcDynamicViscosityMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcElectricCapacitanceMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcElectricChargeMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcElectricConductanceMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcElectricCurrentMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcElectricResistanceMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcElectricVoltageMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcEnergyMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcForceMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcFrequencyMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcHeatFluxDensityMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcHeatingValueMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcIdentifier: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcIlluminanceMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcInductanceMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcInteger: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcIntegerCountRateMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcIonConcentrationMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcIsothermalMoistureCapacityMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcKinematicViscosityMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcLabel: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcLengthMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcLinearForceMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcLinearMomentMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcLinearStiffnessMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcLinearVelocityMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcLogical: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcLuminousFluxMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcLuminousIntensityDistributionMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcLuminousIntensityMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcMagneticFluxDensityMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcMagneticFluxMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcMassDensityMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcMassFlowRateMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcMassMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcMassPerLengthMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcMeasureValue: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcModulusOfElasticityMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcModulusOfLinearSubgradeReactionMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcModulusOfRotationalSubgradeReactionMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcModulusOfSubgradeReactionMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcMoistureDiffusivityMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcMolecularWeightMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcMomentOfInertiaMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcMonetaryMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcNonNegativeLengthMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcNormalisedRatioMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcNullStyle: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcNumericMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcPHMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcParameterValue: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcPlanarForceMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcPlaneAngleMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcPositiveLengthMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcPositivePlaneAngleMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcPositiveRatioMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcPowerMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcPressureMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcPropertySetDefinitionSet: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcRadioActivityMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcRatioMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcReal: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcRotationalFrequencyMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcRotationalMassMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcRotationalStiffnessMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcSectionModulusMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcSectionalAreaIntegralMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcShearModulusMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcSimpleValue: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcSolidAngleMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcSoundPowerLevelMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcSoundPowerMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcSoundPressureLevelMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcSoundPressureMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcSpecificHeatCapacityMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcSpecularExponent: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcSpecularRoughness: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcTemperatureGradientMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcTemperatureRateOfChangeMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcText: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcThermalAdmittanceMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcThermalConductivityMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcThermalExpansionCoefficientMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcThermalResistanceMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcThermalTransmittanceMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcThermodynamicTemperatureMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcTime: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcTimeMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcTimeStamp: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcTorqueMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcValue: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcVaporPermeabilityMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcVolumeMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcVolumetricFlowRateMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcWarpingConstantMeasure: return new IfcUtil::IfcEntitySelect(e); break;
-        case Type::IfcWarpingMomentMeasure: return new IfcUtil::IfcEntitySelect(e); break;
+        case Type::IfcAbsorbedDoseMeasure: return new IfcAbsorbedDoseMeasure(e); break;
+        case Type::IfcAccelerationMeasure: return new IfcAccelerationMeasure(e); break;
+        case Type::IfcAmountOfSubstanceMeasure: return new IfcAmountOfSubstanceMeasure(e); break;
+        case Type::IfcAngularVelocityMeasure: return new IfcAngularVelocityMeasure(e); break;
+        case Type::IfcAreaDensityMeasure: return new IfcAreaDensityMeasure(e); break;
+        case Type::IfcAreaMeasure: return new IfcAreaMeasure(e); break;
+        case Type::IfcBoolean: return new IfcBoolean(e); break;
+        case Type::IfcBoxAlignment: return new IfcBoxAlignment(e); break;
+        case Type::IfcCardinalPointReference: return new IfcCardinalPointReference(e); break;
+        case Type::IfcComplexNumber: return new IfcComplexNumber(e); break;
+        case Type::IfcCompoundPlaneAngleMeasure: return new IfcCompoundPlaneAngleMeasure(e); break;
+        case Type::IfcContextDependentMeasure: return new IfcContextDependentMeasure(e); break;
+        case Type::IfcCountMeasure: return new IfcCountMeasure(e); break;
+        case Type::IfcCurvatureMeasure: return new IfcCurvatureMeasure(e); break;
+        case Type::IfcDate: return new IfcDate(e); break;
+        case Type::IfcDateTime: return new IfcDateTime(e); break;
+        case Type::IfcDayInMonthNumber: return new IfcDayInMonthNumber(e); break;
+        case Type::IfcDayInWeekNumber: return new IfcDayInWeekNumber(e); break;
+        case Type::IfcDescriptiveMeasure: return new IfcDescriptiveMeasure(e); break;
+        case Type::IfcDimensionCount: return new IfcDimensionCount(e); break;
+        case Type::IfcDoseEquivalentMeasure: return new IfcDoseEquivalentMeasure(e); break;
+        case Type::IfcDuration: return new IfcDuration(e); break;
+        case Type::IfcDynamicViscosityMeasure: return new IfcDynamicViscosityMeasure(e); break;
+        case Type::IfcElectricCapacitanceMeasure: return new IfcElectricCapacitanceMeasure(e); break;
+        case Type::IfcElectricChargeMeasure: return new IfcElectricChargeMeasure(e); break;
+        case Type::IfcElectricConductanceMeasure: return new IfcElectricConductanceMeasure(e); break;
+        case Type::IfcElectricCurrentMeasure: return new IfcElectricCurrentMeasure(e); break;
+        case Type::IfcElectricResistanceMeasure: return new IfcElectricResistanceMeasure(e); break;
+        case Type::IfcElectricVoltageMeasure: return new IfcElectricVoltageMeasure(e); break;
+        case Type::IfcEnergyMeasure: return new IfcEnergyMeasure(e); break;
+        case Type::IfcFontStyle: return new IfcFontStyle(e); break;
+        case Type::IfcFontVariant: return new IfcFontVariant(e); break;
+        case Type::IfcFontWeight: return new IfcFontWeight(e); break;
+        case Type::IfcForceMeasure: return new IfcForceMeasure(e); break;
+        case Type::IfcFrequencyMeasure: return new IfcFrequencyMeasure(e); break;
+        case Type::IfcGloballyUniqueId: return new IfcGloballyUniqueId(e); break;
+        case Type::IfcHeatFluxDensityMeasure: return new IfcHeatFluxDensityMeasure(e); break;
+        case Type::IfcHeatingValueMeasure: return new IfcHeatingValueMeasure(e); break;
+        case Type::IfcIdentifier: return new IfcIdentifier(e); break;
+        case Type::IfcIlluminanceMeasure: return new IfcIlluminanceMeasure(e); break;
+        case Type::IfcInductanceMeasure: return new IfcInductanceMeasure(e); break;
+        case Type::IfcInteger: return new IfcInteger(e); break;
+        case Type::IfcIntegerCountRateMeasure: return new IfcIntegerCountRateMeasure(e); break;
+        case Type::IfcIonConcentrationMeasure: return new IfcIonConcentrationMeasure(e); break;
+        case Type::IfcIsothermalMoistureCapacityMeasure: return new IfcIsothermalMoistureCapacityMeasure(e); break;
+        case Type::IfcKinematicViscosityMeasure: return new IfcKinematicViscosityMeasure(e); break;
+        case Type::IfcLabel: return new IfcLabel(e); break;
+        case Type::IfcLanguageId: return new IfcLanguageId(e); break;
+        case Type::IfcLengthMeasure: return new IfcLengthMeasure(e); break;
+        case Type::IfcLinearForceMeasure: return new IfcLinearForceMeasure(e); break;
+        case Type::IfcLinearMomentMeasure: return new IfcLinearMomentMeasure(e); break;
+        case Type::IfcLinearStiffnessMeasure: return new IfcLinearStiffnessMeasure(e); break;
+        case Type::IfcLinearVelocityMeasure: return new IfcLinearVelocityMeasure(e); break;
+        case Type::IfcLogical: return new IfcLogical(e); break;
+        case Type::IfcLuminousFluxMeasure: return new IfcLuminousFluxMeasure(e); break;
+        case Type::IfcLuminousIntensityDistributionMeasure: return new IfcLuminousIntensityDistributionMeasure(e); break;
+        case Type::IfcLuminousIntensityMeasure: return new IfcLuminousIntensityMeasure(e); break;
+        case Type::IfcMagneticFluxDensityMeasure: return new IfcMagneticFluxDensityMeasure(e); break;
+        case Type::IfcMagneticFluxMeasure: return new IfcMagneticFluxMeasure(e); break;
+        case Type::IfcMassDensityMeasure: return new IfcMassDensityMeasure(e); break;
+        case Type::IfcMassFlowRateMeasure: return new IfcMassFlowRateMeasure(e); break;
+        case Type::IfcMassMeasure: return new IfcMassMeasure(e); break;
+        case Type::IfcMassPerLengthMeasure: return new IfcMassPerLengthMeasure(e); break;
+        case Type::IfcModulusOfElasticityMeasure: return new IfcModulusOfElasticityMeasure(e); break;
+        case Type::IfcModulusOfLinearSubgradeReactionMeasure: return new IfcModulusOfLinearSubgradeReactionMeasure(e); break;
+        case Type::IfcModulusOfRotationalSubgradeReactionMeasure: return new IfcModulusOfRotationalSubgradeReactionMeasure(e); break;
+        case Type::IfcModulusOfSubgradeReactionMeasure: return new IfcModulusOfSubgradeReactionMeasure(e); break;
+        case Type::IfcMoistureDiffusivityMeasure: return new IfcMoistureDiffusivityMeasure(e); break;
+        case Type::IfcMolecularWeightMeasure: return new IfcMolecularWeightMeasure(e); break;
+        case Type::IfcMomentOfInertiaMeasure: return new IfcMomentOfInertiaMeasure(e); break;
+        case Type::IfcMonetaryMeasure: return new IfcMonetaryMeasure(e); break;
+        case Type::IfcMonthInYearNumber: return new IfcMonthInYearNumber(e); break;
+        case Type::IfcNonNegativeLengthMeasure: return new IfcNonNegativeLengthMeasure(e); break;
+        case Type::IfcNormalisedRatioMeasure: return new IfcNormalisedRatioMeasure(e); break;
+        case Type::IfcNumericMeasure: return new IfcNumericMeasure(e); break;
+        case Type::IfcPHMeasure: return new IfcPHMeasure(e); break;
+        case Type::IfcParameterValue: return new IfcParameterValue(e); break;
+        case Type::IfcPlanarForceMeasure: return new IfcPlanarForceMeasure(e); break;
+        case Type::IfcPlaneAngleMeasure: return new IfcPlaneAngleMeasure(e); break;
+        case Type::IfcPositiveLengthMeasure: return new IfcPositiveLengthMeasure(e); break;
+        case Type::IfcPositivePlaneAngleMeasure: return new IfcPositivePlaneAngleMeasure(e); break;
+        case Type::IfcPositiveRatioMeasure: return new IfcPositiveRatioMeasure(e); break;
+        case Type::IfcPowerMeasure: return new IfcPowerMeasure(e); break;
+        case Type::IfcPresentableText: return new IfcPresentableText(e); break;
+        case Type::IfcPressureMeasure: return new IfcPressureMeasure(e); break;
+        case Type::IfcPropertySetDefinitionSet: return new IfcPropertySetDefinitionSet(e); break;
+        case Type::IfcRadioActivityMeasure: return new IfcRadioActivityMeasure(e); break;
+        case Type::IfcRatioMeasure: return new IfcRatioMeasure(e); break;
+        case Type::IfcReal: return new IfcReal(e); break;
+        case Type::IfcRotationalFrequencyMeasure: return new IfcRotationalFrequencyMeasure(e); break;
+        case Type::IfcRotationalMassMeasure: return new IfcRotationalMassMeasure(e); break;
+        case Type::IfcRotationalStiffnessMeasure: return new IfcRotationalStiffnessMeasure(e); break;
+        case Type::IfcSectionModulusMeasure: return new IfcSectionModulusMeasure(e); break;
+        case Type::IfcSectionalAreaIntegralMeasure: return new IfcSectionalAreaIntegralMeasure(e); break;
+        case Type::IfcShearModulusMeasure: return new IfcShearModulusMeasure(e); break;
+        case Type::IfcSolidAngleMeasure: return new IfcSolidAngleMeasure(e); break;
+        case Type::IfcSoundPowerLevelMeasure: return new IfcSoundPowerLevelMeasure(e); break;
+        case Type::IfcSoundPowerMeasure: return new IfcSoundPowerMeasure(e); break;
+        case Type::IfcSoundPressureLevelMeasure: return new IfcSoundPressureLevelMeasure(e); break;
+        case Type::IfcSoundPressureMeasure: return new IfcSoundPressureMeasure(e); break;
+        case Type::IfcSpecificHeatCapacityMeasure: return new IfcSpecificHeatCapacityMeasure(e); break;
+        case Type::IfcSpecularExponent: return new IfcSpecularExponent(e); break;
+        case Type::IfcSpecularRoughness: return new IfcSpecularRoughness(e); break;
+        case Type::IfcTemperatureGradientMeasure: return new IfcTemperatureGradientMeasure(e); break;
+        case Type::IfcTemperatureRateOfChangeMeasure: return new IfcTemperatureRateOfChangeMeasure(e); break;
+        case Type::IfcText: return new IfcText(e); break;
+        case Type::IfcTextAlignment: return new IfcTextAlignment(e); break;
+        case Type::IfcTextDecoration: return new IfcTextDecoration(e); break;
+        case Type::IfcTextFontName: return new IfcTextFontName(e); break;
+        case Type::IfcTextTransformation: return new IfcTextTransformation(e); break;
+        case Type::IfcThermalAdmittanceMeasure: return new IfcThermalAdmittanceMeasure(e); break;
+        case Type::IfcThermalConductivityMeasure: return new IfcThermalConductivityMeasure(e); break;
+        case Type::IfcThermalExpansionCoefficientMeasure: return new IfcThermalExpansionCoefficientMeasure(e); break;
+        case Type::IfcThermalResistanceMeasure: return new IfcThermalResistanceMeasure(e); break;
+        case Type::IfcThermalTransmittanceMeasure: return new IfcThermalTransmittanceMeasure(e); break;
+        case Type::IfcThermodynamicTemperatureMeasure: return new IfcThermodynamicTemperatureMeasure(e); break;
+        case Type::IfcTime: return new IfcTime(e); break;
+        case Type::IfcTimeMeasure: return new IfcTimeMeasure(e); break;
+        case Type::IfcTimeStamp: return new IfcTimeStamp(e); break;
+        case Type::IfcTorqueMeasure: return new IfcTorqueMeasure(e); break;
+        case Type::IfcURIReference: return new IfcURIReference(e); break;
+        case Type::IfcVaporPermeabilityMeasure: return new IfcVaporPermeabilityMeasure(e); break;
+        case Type::IfcVolumeMeasure: return new IfcVolumeMeasure(e); break;
+        case Type::IfcVolumetricFlowRateMeasure: return new IfcVolumetricFlowRateMeasure(e); break;
+        case Type::IfcWarpingConstantMeasure: return new IfcWarpingConstantMeasure(e); break;
+        case Type::IfcWarpingMomentMeasure: return new IfcWarpingMomentMeasure(e); break;
         case Type::IfcActionRequest: return new IfcActionRequest(e); break;
         case Type::IfcActor: return new IfcActor(e); break;
         case Type::IfcActorRole: return new IfcActorRole(e); break;
@@ -6499,9255 +6509,10512 @@ IfcWorkScheduleTypeEnum::IfcWorkScheduleTypeEnum IfcWorkScheduleTypeEnum::FromSt
 }
 
 
-#define RETURN_INVERSE(T)     IfcEntities e = entity->getInverse(T::Class());     SHARED_PTR< IfcTemplatedEntityList<T> > l ( new IfcTemplatedEntityList<T>() );     for ( IfcEntityList::it it = e->begin(); it != e->end(); ++ it ) {         l->push(reinterpret_pointer_cast<IfcBaseClass,T>(*it));     }     return l;
+// Function implementations for IfcAbsorbedDoseMeasure
+IfcUtil::ArgumentType IfcAbsorbedDoseMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcAbsorbedDoseMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcAbsorbedDoseMeasure::is(Type::Enum v) const { return v == IfcAbsorbedDoseMeasure::Class(); }
+Type::Enum IfcAbsorbedDoseMeasure::type() const { return Type::IfcAbsorbedDoseMeasure; }
+Type::Enum IfcAbsorbedDoseMeasure::Class() { return Type::IfcAbsorbedDoseMeasure; }
+IfcAbsorbedDoseMeasure::IfcAbsorbedDoseMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcAbsorbedDoseMeasure::IfcAbsorbedDoseMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcAbsorbedDoseMeasure); e->setArgument(0, v); entity = e; }
+IfcAbsorbedDoseMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcAccelerationMeasure
+IfcUtil::ArgumentType IfcAccelerationMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcAccelerationMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcAccelerationMeasure::is(Type::Enum v) const { return v == IfcAccelerationMeasure::Class(); }
+Type::Enum IfcAccelerationMeasure::type() const { return Type::IfcAccelerationMeasure; }
+Type::Enum IfcAccelerationMeasure::Class() { return Type::IfcAccelerationMeasure; }
+IfcAccelerationMeasure::IfcAccelerationMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcAccelerationMeasure::IfcAccelerationMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcAccelerationMeasure); e->setArgument(0, v); entity = e; }
+IfcAccelerationMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcAmountOfSubstanceMeasure
+IfcUtil::ArgumentType IfcAmountOfSubstanceMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcAmountOfSubstanceMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcAmountOfSubstanceMeasure::is(Type::Enum v) const { return v == IfcAmountOfSubstanceMeasure::Class(); }
+Type::Enum IfcAmountOfSubstanceMeasure::type() const { return Type::IfcAmountOfSubstanceMeasure; }
+Type::Enum IfcAmountOfSubstanceMeasure::Class() { return Type::IfcAmountOfSubstanceMeasure; }
+IfcAmountOfSubstanceMeasure::IfcAmountOfSubstanceMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcAmountOfSubstanceMeasure::IfcAmountOfSubstanceMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcAmountOfSubstanceMeasure); e->setArgument(0, v); entity = e; }
+IfcAmountOfSubstanceMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcAngularVelocityMeasure
+IfcUtil::ArgumentType IfcAngularVelocityMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcAngularVelocityMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcAngularVelocityMeasure::is(Type::Enum v) const { return v == IfcAngularVelocityMeasure::Class(); }
+Type::Enum IfcAngularVelocityMeasure::type() const { return Type::IfcAngularVelocityMeasure; }
+Type::Enum IfcAngularVelocityMeasure::Class() { return Type::IfcAngularVelocityMeasure; }
+IfcAngularVelocityMeasure::IfcAngularVelocityMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcAngularVelocityMeasure::IfcAngularVelocityMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcAngularVelocityMeasure); e->setArgument(0, v); entity = e; }
+IfcAngularVelocityMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcAreaDensityMeasure
+IfcUtil::ArgumentType IfcAreaDensityMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcAreaDensityMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcAreaDensityMeasure::is(Type::Enum v) const { return v == IfcAreaDensityMeasure::Class(); }
+Type::Enum IfcAreaDensityMeasure::type() const { return Type::IfcAreaDensityMeasure; }
+Type::Enum IfcAreaDensityMeasure::Class() { return Type::IfcAreaDensityMeasure; }
+IfcAreaDensityMeasure::IfcAreaDensityMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcAreaDensityMeasure::IfcAreaDensityMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcAreaDensityMeasure); e->setArgument(0, v); entity = e; }
+IfcAreaDensityMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcAreaMeasure
+IfcUtil::ArgumentType IfcAreaMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcAreaMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcAreaMeasure::is(Type::Enum v) const { return v == IfcAreaMeasure::Class(); }
+Type::Enum IfcAreaMeasure::type() const { return Type::IfcAreaMeasure; }
+Type::Enum IfcAreaMeasure::Class() { return Type::IfcAreaMeasure; }
+IfcAreaMeasure::IfcAreaMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcAreaMeasure::IfcAreaMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcAreaMeasure); e->setArgument(0, v); entity = e; }
+IfcAreaMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcBoolean
+IfcUtil::ArgumentType IfcBoolean::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_BOOL; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcBoolean::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcBoolean::is(Type::Enum v) const { return v == IfcBoolean::Class(); }
+Type::Enum IfcBoolean::type() const { return Type::IfcBoolean; }
+Type::Enum IfcBoolean::Class() { return Type::IfcBoolean; }
+IfcBoolean::IfcBoolean(IfcAbstractEntity* e) { entity = e; }
+IfcBoolean::IfcBoolean(bool v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcBoolean); e->setArgument(0, v); entity = e; }
+IfcBoolean::operator bool() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcBoxAlignment
+IfcUtil::ArgumentType IfcBoxAlignment::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_STRING; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcBoxAlignment::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcBoxAlignment::is(Type::Enum v) const { return v == Type::IfcBoxAlignment || IfcLabel::is(v); }
+Type::Enum IfcBoxAlignment::type() const { return Type::IfcBoxAlignment; }
+Type::Enum IfcBoxAlignment::Class() { return Type::IfcBoxAlignment; }
+IfcBoxAlignment::IfcBoxAlignment(IfcAbstractEntity* e) : IfcLabel((IfcAbstractEntity*)0) { entity = e; }
+IfcBoxAlignment::IfcBoxAlignment(std::string v) : IfcLabel((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcBoxAlignment); e->setArgument(0, v); entity = e; }
+IfcBoxAlignment::operator std::string() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcCardinalPointReference
+IfcUtil::ArgumentType IfcCardinalPointReference::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_INT; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcCardinalPointReference::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcCardinalPointReference::is(Type::Enum v) const { return v == IfcCardinalPointReference::Class(); }
+Type::Enum IfcCardinalPointReference::type() const { return Type::IfcCardinalPointReference; }
+Type::Enum IfcCardinalPointReference::Class() { return Type::IfcCardinalPointReference; }
+IfcCardinalPointReference::IfcCardinalPointReference(IfcAbstractEntity* e) { entity = e; }
+IfcCardinalPointReference::IfcCardinalPointReference(int v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcCardinalPointReference); e->setArgument(0, v); entity = e; }
+IfcCardinalPointReference::operator int() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcComplexNumber
+IfcUtil::ArgumentType IfcComplexNumber::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcComplexNumber::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcComplexNumber::is(Type::Enum v) const { return v == IfcComplexNumber::Class(); }
+Type::Enum IfcComplexNumber::type() const { return Type::IfcComplexNumber; }
+Type::Enum IfcComplexNumber::Class() { return Type::IfcComplexNumber; }
+IfcComplexNumber::IfcComplexNumber(IfcAbstractEntity* e) { entity = e; }
+IfcComplexNumber::IfcComplexNumber(std::vector< double > /*[1:2]*/ v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcComplexNumber); e->setArgument(0, v); entity = e; }
+IfcComplexNumber::operator std::vector< double > /*[1:2]*/() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcCompoundPlaneAngleMeasure
+IfcUtil::ArgumentType IfcCompoundPlaneAngleMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_INT; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcCompoundPlaneAngleMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcCompoundPlaneAngleMeasure::is(Type::Enum v) const { return v == IfcCompoundPlaneAngleMeasure::Class(); }
+Type::Enum IfcCompoundPlaneAngleMeasure::type() const { return Type::IfcCompoundPlaneAngleMeasure; }
+Type::Enum IfcCompoundPlaneAngleMeasure::Class() { return Type::IfcCompoundPlaneAngleMeasure; }
+IfcCompoundPlaneAngleMeasure::IfcCompoundPlaneAngleMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcCompoundPlaneAngleMeasure::IfcCompoundPlaneAngleMeasure(std::vector< int > /*[3:4]*/ v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcCompoundPlaneAngleMeasure); e->setArgument(0, v); entity = e; }
+IfcCompoundPlaneAngleMeasure::operator std::vector< int > /*[3:4]*/() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcContextDependentMeasure
+IfcUtil::ArgumentType IfcContextDependentMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcContextDependentMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcContextDependentMeasure::is(Type::Enum v) const { return v == IfcContextDependentMeasure::Class(); }
+Type::Enum IfcContextDependentMeasure::type() const { return Type::IfcContextDependentMeasure; }
+Type::Enum IfcContextDependentMeasure::Class() { return Type::IfcContextDependentMeasure; }
+IfcContextDependentMeasure::IfcContextDependentMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcContextDependentMeasure::IfcContextDependentMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcContextDependentMeasure); e->setArgument(0, v); entity = e; }
+IfcContextDependentMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcCountMeasure
+IfcUtil::ArgumentType IfcCountMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcCountMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcCountMeasure::is(Type::Enum v) const { return v == IfcCountMeasure::Class(); }
+Type::Enum IfcCountMeasure::type() const { return Type::IfcCountMeasure; }
+Type::Enum IfcCountMeasure::Class() { return Type::IfcCountMeasure; }
+IfcCountMeasure::IfcCountMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcCountMeasure::IfcCountMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcCountMeasure); e->setArgument(0, v); entity = e; }
+IfcCountMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcCurvatureMeasure
+IfcUtil::ArgumentType IfcCurvatureMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcCurvatureMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcCurvatureMeasure::is(Type::Enum v) const { return v == IfcCurvatureMeasure::Class(); }
+Type::Enum IfcCurvatureMeasure::type() const { return Type::IfcCurvatureMeasure; }
+Type::Enum IfcCurvatureMeasure::Class() { return Type::IfcCurvatureMeasure; }
+IfcCurvatureMeasure::IfcCurvatureMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcCurvatureMeasure::IfcCurvatureMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcCurvatureMeasure); e->setArgument(0, v); entity = e; }
+IfcCurvatureMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcDate
+IfcUtil::ArgumentType IfcDate::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_STRING; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcDate::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcDate::is(Type::Enum v) const { return v == IfcDate::Class(); }
+Type::Enum IfcDate::type() const { return Type::IfcDate; }
+Type::Enum IfcDate::Class() { return Type::IfcDate; }
+IfcDate::IfcDate(IfcAbstractEntity* e) { entity = e; }
+IfcDate::IfcDate(std::string v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcDate); e->setArgument(0, v); entity = e; }
+IfcDate::operator std::string() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcDateTime
+IfcUtil::ArgumentType IfcDateTime::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_STRING; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcDateTime::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcDateTime::is(Type::Enum v) const { return v == IfcDateTime::Class(); }
+Type::Enum IfcDateTime::type() const { return Type::IfcDateTime; }
+Type::Enum IfcDateTime::Class() { return Type::IfcDateTime; }
+IfcDateTime::IfcDateTime(IfcAbstractEntity* e) { entity = e; }
+IfcDateTime::IfcDateTime(std::string v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcDateTime); e->setArgument(0, v); entity = e; }
+IfcDateTime::operator std::string() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcDayInMonthNumber
+IfcUtil::ArgumentType IfcDayInMonthNumber::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_INT; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcDayInMonthNumber::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcDayInMonthNumber::is(Type::Enum v) const { return v == IfcDayInMonthNumber::Class(); }
+Type::Enum IfcDayInMonthNumber::type() const { return Type::IfcDayInMonthNumber; }
+Type::Enum IfcDayInMonthNumber::Class() { return Type::IfcDayInMonthNumber; }
+IfcDayInMonthNumber::IfcDayInMonthNumber(IfcAbstractEntity* e) { entity = e; }
+IfcDayInMonthNumber::IfcDayInMonthNumber(int v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcDayInMonthNumber); e->setArgument(0, v); entity = e; }
+IfcDayInMonthNumber::operator int() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcDayInWeekNumber
+IfcUtil::ArgumentType IfcDayInWeekNumber::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_INT; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcDayInWeekNumber::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcDayInWeekNumber::is(Type::Enum v) const { return v == IfcDayInWeekNumber::Class(); }
+Type::Enum IfcDayInWeekNumber::type() const { return Type::IfcDayInWeekNumber; }
+Type::Enum IfcDayInWeekNumber::Class() { return Type::IfcDayInWeekNumber; }
+IfcDayInWeekNumber::IfcDayInWeekNumber(IfcAbstractEntity* e) { entity = e; }
+IfcDayInWeekNumber::IfcDayInWeekNumber(int v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcDayInWeekNumber); e->setArgument(0, v); entity = e; }
+IfcDayInWeekNumber::operator int() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcDescriptiveMeasure
+IfcUtil::ArgumentType IfcDescriptiveMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_STRING; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcDescriptiveMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcDescriptiveMeasure::is(Type::Enum v) const { return v == IfcDescriptiveMeasure::Class(); }
+Type::Enum IfcDescriptiveMeasure::type() const { return Type::IfcDescriptiveMeasure; }
+Type::Enum IfcDescriptiveMeasure::Class() { return Type::IfcDescriptiveMeasure; }
+IfcDescriptiveMeasure::IfcDescriptiveMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcDescriptiveMeasure::IfcDescriptiveMeasure(std::string v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcDescriptiveMeasure); e->setArgument(0, v); entity = e; }
+IfcDescriptiveMeasure::operator std::string() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcDimensionCount
+IfcUtil::ArgumentType IfcDimensionCount::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_INT; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcDimensionCount::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcDimensionCount::is(Type::Enum v) const { return v == IfcDimensionCount::Class(); }
+Type::Enum IfcDimensionCount::type() const { return Type::IfcDimensionCount; }
+Type::Enum IfcDimensionCount::Class() { return Type::IfcDimensionCount; }
+IfcDimensionCount::IfcDimensionCount(IfcAbstractEntity* e) { entity = e; }
+IfcDimensionCount::IfcDimensionCount(int v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcDimensionCount); e->setArgument(0, v); entity = e; }
+IfcDimensionCount::operator int() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcDoseEquivalentMeasure
+IfcUtil::ArgumentType IfcDoseEquivalentMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcDoseEquivalentMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcDoseEquivalentMeasure::is(Type::Enum v) const { return v == IfcDoseEquivalentMeasure::Class(); }
+Type::Enum IfcDoseEquivalentMeasure::type() const { return Type::IfcDoseEquivalentMeasure; }
+Type::Enum IfcDoseEquivalentMeasure::Class() { return Type::IfcDoseEquivalentMeasure; }
+IfcDoseEquivalentMeasure::IfcDoseEquivalentMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcDoseEquivalentMeasure::IfcDoseEquivalentMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcDoseEquivalentMeasure); e->setArgument(0, v); entity = e; }
+IfcDoseEquivalentMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcDuration
+IfcUtil::ArgumentType IfcDuration::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_STRING; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcDuration::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcDuration::is(Type::Enum v) const { return v == IfcDuration::Class(); }
+Type::Enum IfcDuration::type() const { return Type::IfcDuration; }
+Type::Enum IfcDuration::Class() { return Type::IfcDuration; }
+IfcDuration::IfcDuration(IfcAbstractEntity* e) { entity = e; }
+IfcDuration::IfcDuration(std::string v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcDuration); e->setArgument(0, v); entity = e; }
+IfcDuration::operator std::string() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcDynamicViscosityMeasure
+IfcUtil::ArgumentType IfcDynamicViscosityMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcDynamicViscosityMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcDynamicViscosityMeasure::is(Type::Enum v) const { return v == IfcDynamicViscosityMeasure::Class(); }
+Type::Enum IfcDynamicViscosityMeasure::type() const { return Type::IfcDynamicViscosityMeasure; }
+Type::Enum IfcDynamicViscosityMeasure::Class() { return Type::IfcDynamicViscosityMeasure; }
+IfcDynamicViscosityMeasure::IfcDynamicViscosityMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcDynamicViscosityMeasure::IfcDynamicViscosityMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcDynamicViscosityMeasure); e->setArgument(0, v); entity = e; }
+IfcDynamicViscosityMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcElectricCapacitanceMeasure
+IfcUtil::ArgumentType IfcElectricCapacitanceMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcElectricCapacitanceMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcElectricCapacitanceMeasure::is(Type::Enum v) const { return v == IfcElectricCapacitanceMeasure::Class(); }
+Type::Enum IfcElectricCapacitanceMeasure::type() const { return Type::IfcElectricCapacitanceMeasure; }
+Type::Enum IfcElectricCapacitanceMeasure::Class() { return Type::IfcElectricCapacitanceMeasure; }
+IfcElectricCapacitanceMeasure::IfcElectricCapacitanceMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcElectricCapacitanceMeasure::IfcElectricCapacitanceMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcElectricCapacitanceMeasure); e->setArgument(0, v); entity = e; }
+IfcElectricCapacitanceMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcElectricChargeMeasure
+IfcUtil::ArgumentType IfcElectricChargeMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcElectricChargeMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcElectricChargeMeasure::is(Type::Enum v) const { return v == IfcElectricChargeMeasure::Class(); }
+Type::Enum IfcElectricChargeMeasure::type() const { return Type::IfcElectricChargeMeasure; }
+Type::Enum IfcElectricChargeMeasure::Class() { return Type::IfcElectricChargeMeasure; }
+IfcElectricChargeMeasure::IfcElectricChargeMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcElectricChargeMeasure::IfcElectricChargeMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcElectricChargeMeasure); e->setArgument(0, v); entity = e; }
+IfcElectricChargeMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcElectricConductanceMeasure
+IfcUtil::ArgumentType IfcElectricConductanceMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcElectricConductanceMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcElectricConductanceMeasure::is(Type::Enum v) const { return v == IfcElectricConductanceMeasure::Class(); }
+Type::Enum IfcElectricConductanceMeasure::type() const { return Type::IfcElectricConductanceMeasure; }
+Type::Enum IfcElectricConductanceMeasure::Class() { return Type::IfcElectricConductanceMeasure; }
+IfcElectricConductanceMeasure::IfcElectricConductanceMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcElectricConductanceMeasure::IfcElectricConductanceMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcElectricConductanceMeasure); e->setArgument(0, v); entity = e; }
+IfcElectricConductanceMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcElectricCurrentMeasure
+IfcUtil::ArgumentType IfcElectricCurrentMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcElectricCurrentMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcElectricCurrentMeasure::is(Type::Enum v) const { return v == IfcElectricCurrentMeasure::Class(); }
+Type::Enum IfcElectricCurrentMeasure::type() const { return Type::IfcElectricCurrentMeasure; }
+Type::Enum IfcElectricCurrentMeasure::Class() { return Type::IfcElectricCurrentMeasure; }
+IfcElectricCurrentMeasure::IfcElectricCurrentMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcElectricCurrentMeasure::IfcElectricCurrentMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcElectricCurrentMeasure); e->setArgument(0, v); entity = e; }
+IfcElectricCurrentMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcElectricResistanceMeasure
+IfcUtil::ArgumentType IfcElectricResistanceMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcElectricResistanceMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcElectricResistanceMeasure::is(Type::Enum v) const { return v == IfcElectricResistanceMeasure::Class(); }
+Type::Enum IfcElectricResistanceMeasure::type() const { return Type::IfcElectricResistanceMeasure; }
+Type::Enum IfcElectricResistanceMeasure::Class() { return Type::IfcElectricResistanceMeasure; }
+IfcElectricResistanceMeasure::IfcElectricResistanceMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcElectricResistanceMeasure::IfcElectricResistanceMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcElectricResistanceMeasure); e->setArgument(0, v); entity = e; }
+IfcElectricResistanceMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcElectricVoltageMeasure
+IfcUtil::ArgumentType IfcElectricVoltageMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcElectricVoltageMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcElectricVoltageMeasure::is(Type::Enum v) const { return v == IfcElectricVoltageMeasure::Class(); }
+Type::Enum IfcElectricVoltageMeasure::type() const { return Type::IfcElectricVoltageMeasure; }
+Type::Enum IfcElectricVoltageMeasure::Class() { return Type::IfcElectricVoltageMeasure; }
+IfcElectricVoltageMeasure::IfcElectricVoltageMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcElectricVoltageMeasure::IfcElectricVoltageMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcElectricVoltageMeasure); e->setArgument(0, v); entity = e; }
+IfcElectricVoltageMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcEnergyMeasure
+IfcUtil::ArgumentType IfcEnergyMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcEnergyMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcEnergyMeasure::is(Type::Enum v) const { return v == IfcEnergyMeasure::Class(); }
+Type::Enum IfcEnergyMeasure::type() const { return Type::IfcEnergyMeasure; }
+Type::Enum IfcEnergyMeasure::Class() { return Type::IfcEnergyMeasure; }
+IfcEnergyMeasure::IfcEnergyMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcEnergyMeasure::IfcEnergyMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcEnergyMeasure); e->setArgument(0, v); entity = e; }
+IfcEnergyMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcFontStyle
+IfcUtil::ArgumentType IfcFontStyle::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_STRING; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcFontStyle::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcFontStyle::is(Type::Enum v) const { return v == IfcFontStyle::Class(); }
+Type::Enum IfcFontStyle::type() const { return Type::IfcFontStyle; }
+Type::Enum IfcFontStyle::Class() { return Type::IfcFontStyle; }
+IfcFontStyle::IfcFontStyle(IfcAbstractEntity* e) { entity = e; }
+IfcFontStyle::IfcFontStyle(std::string v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcFontStyle); e->setArgument(0, v); entity = e; }
+IfcFontStyle::operator std::string() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcFontVariant
+IfcUtil::ArgumentType IfcFontVariant::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_STRING; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcFontVariant::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcFontVariant::is(Type::Enum v) const { return v == IfcFontVariant::Class(); }
+Type::Enum IfcFontVariant::type() const { return Type::IfcFontVariant; }
+Type::Enum IfcFontVariant::Class() { return Type::IfcFontVariant; }
+IfcFontVariant::IfcFontVariant(IfcAbstractEntity* e) { entity = e; }
+IfcFontVariant::IfcFontVariant(std::string v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcFontVariant); e->setArgument(0, v); entity = e; }
+IfcFontVariant::operator std::string() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcFontWeight
+IfcUtil::ArgumentType IfcFontWeight::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_STRING; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcFontWeight::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcFontWeight::is(Type::Enum v) const { return v == IfcFontWeight::Class(); }
+Type::Enum IfcFontWeight::type() const { return Type::IfcFontWeight; }
+Type::Enum IfcFontWeight::Class() { return Type::IfcFontWeight; }
+IfcFontWeight::IfcFontWeight(IfcAbstractEntity* e) { entity = e; }
+IfcFontWeight::IfcFontWeight(std::string v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcFontWeight); e->setArgument(0, v); entity = e; }
+IfcFontWeight::operator std::string() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcForceMeasure
+IfcUtil::ArgumentType IfcForceMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcForceMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcForceMeasure::is(Type::Enum v) const { return v == IfcForceMeasure::Class(); }
+Type::Enum IfcForceMeasure::type() const { return Type::IfcForceMeasure; }
+Type::Enum IfcForceMeasure::Class() { return Type::IfcForceMeasure; }
+IfcForceMeasure::IfcForceMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcForceMeasure::IfcForceMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcForceMeasure); e->setArgument(0, v); entity = e; }
+IfcForceMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcFrequencyMeasure
+IfcUtil::ArgumentType IfcFrequencyMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcFrequencyMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcFrequencyMeasure::is(Type::Enum v) const { return v == IfcFrequencyMeasure::Class(); }
+Type::Enum IfcFrequencyMeasure::type() const { return Type::IfcFrequencyMeasure; }
+Type::Enum IfcFrequencyMeasure::Class() { return Type::IfcFrequencyMeasure; }
+IfcFrequencyMeasure::IfcFrequencyMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcFrequencyMeasure::IfcFrequencyMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcFrequencyMeasure); e->setArgument(0, v); entity = e; }
+IfcFrequencyMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcGloballyUniqueId
+IfcUtil::ArgumentType IfcGloballyUniqueId::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_STRING; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcGloballyUniqueId::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcGloballyUniqueId::is(Type::Enum v) const { return v == IfcGloballyUniqueId::Class(); }
+Type::Enum IfcGloballyUniqueId::type() const { return Type::IfcGloballyUniqueId; }
+Type::Enum IfcGloballyUniqueId::Class() { return Type::IfcGloballyUniqueId; }
+IfcGloballyUniqueId::IfcGloballyUniqueId(IfcAbstractEntity* e) { entity = e; }
+IfcGloballyUniqueId::IfcGloballyUniqueId(std::string v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcGloballyUniqueId); e->setArgument(0, v); entity = e; }
+IfcGloballyUniqueId::operator std::string() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcHeatFluxDensityMeasure
+IfcUtil::ArgumentType IfcHeatFluxDensityMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcHeatFluxDensityMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcHeatFluxDensityMeasure::is(Type::Enum v) const { return v == IfcHeatFluxDensityMeasure::Class(); }
+Type::Enum IfcHeatFluxDensityMeasure::type() const { return Type::IfcHeatFluxDensityMeasure; }
+Type::Enum IfcHeatFluxDensityMeasure::Class() { return Type::IfcHeatFluxDensityMeasure; }
+IfcHeatFluxDensityMeasure::IfcHeatFluxDensityMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcHeatFluxDensityMeasure::IfcHeatFluxDensityMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcHeatFluxDensityMeasure); e->setArgument(0, v); entity = e; }
+IfcHeatFluxDensityMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcHeatingValueMeasure
+IfcUtil::ArgumentType IfcHeatingValueMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcHeatingValueMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcHeatingValueMeasure::is(Type::Enum v) const { return v == IfcHeatingValueMeasure::Class(); }
+Type::Enum IfcHeatingValueMeasure::type() const { return Type::IfcHeatingValueMeasure; }
+Type::Enum IfcHeatingValueMeasure::Class() { return Type::IfcHeatingValueMeasure; }
+IfcHeatingValueMeasure::IfcHeatingValueMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcHeatingValueMeasure::IfcHeatingValueMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcHeatingValueMeasure); e->setArgument(0, v); entity = e; }
+IfcHeatingValueMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcIdentifier
+IfcUtil::ArgumentType IfcIdentifier::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_STRING; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcIdentifier::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcIdentifier::is(Type::Enum v) const { return v == IfcIdentifier::Class(); }
+Type::Enum IfcIdentifier::type() const { return Type::IfcIdentifier; }
+Type::Enum IfcIdentifier::Class() { return Type::IfcIdentifier; }
+IfcIdentifier::IfcIdentifier(IfcAbstractEntity* e) { entity = e; }
+IfcIdentifier::IfcIdentifier(std::string v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcIdentifier); e->setArgument(0, v); entity = e; }
+IfcIdentifier::operator std::string() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcIlluminanceMeasure
+IfcUtil::ArgumentType IfcIlluminanceMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcIlluminanceMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcIlluminanceMeasure::is(Type::Enum v) const { return v == IfcIlluminanceMeasure::Class(); }
+Type::Enum IfcIlluminanceMeasure::type() const { return Type::IfcIlluminanceMeasure; }
+Type::Enum IfcIlluminanceMeasure::Class() { return Type::IfcIlluminanceMeasure; }
+IfcIlluminanceMeasure::IfcIlluminanceMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcIlluminanceMeasure::IfcIlluminanceMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcIlluminanceMeasure); e->setArgument(0, v); entity = e; }
+IfcIlluminanceMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcInductanceMeasure
+IfcUtil::ArgumentType IfcInductanceMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcInductanceMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcInductanceMeasure::is(Type::Enum v) const { return v == IfcInductanceMeasure::Class(); }
+Type::Enum IfcInductanceMeasure::type() const { return Type::IfcInductanceMeasure; }
+Type::Enum IfcInductanceMeasure::Class() { return Type::IfcInductanceMeasure; }
+IfcInductanceMeasure::IfcInductanceMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcInductanceMeasure::IfcInductanceMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcInductanceMeasure); e->setArgument(0, v); entity = e; }
+IfcInductanceMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcInteger
+IfcUtil::ArgumentType IfcInteger::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_INT; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcInteger::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcInteger::is(Type::Enum v) const { return v == IfcInteger::Class(); }
+Type::Enum IfcInteger::type() const { return Type::IfcInteger; }
+Type::Enum IfcInteger::Class() { return Type::IfcInteger; }
+IfcInteger::IfcInteger(IfcAbstractEntity* e) { entity = e; }
+IfcInteger::IfcInteger(int v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcInteger); e->setArgument(0, v); entity = e; }
+IfcInteger::operator int() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcIntegerCountRateMeasure
+IfcUtil::ArgumentType IfcIntegerCountRateMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_INT; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcIntegerCountRateMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcIntegerCountRateMeasure::is(Type::Enum v) const { return v == IfcIntegerCountRateMeasure::Class(); }
+Type::Enum IfcIntegerCountRateMeasure::type() const { return Type::IfcIntegerCountRateMeasure; }
+Type::Enum IfcIntegerCountRateMeasure::Class() { return Type::IfcIntegerCountRateMeasure; }
+IfcIntegerCountRateMeasure::IfcIntegerCountRateMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcIntegerCountRateMeasure::IfcIntegerCountRateMeasure(int v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcIntegerCountRateMeasure); e->setArgument(0, v); entity = e; }
+IfcIntegerCountRateMeasure::operator int() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcIonConcentrationMeasure
+IfcUtil::ArgumentType IfcIonConcentrationMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcIonConcentrationMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcIonConcentrationMeasure::is(Type::Enum v) const { return v == IfcIonConcentrationMeasure::Class(); }
+Type::Enum IfcIonConcentrationMeasure::type() const { return Type::IfcIonConcentrationMeasure; }
+Type::Enum IfcIonConcentrationMeasure::Class() { return Type::IfcIonConcentrationMeasure; }
+IfcIonConcentrationMeasure::IfcIonConcentrationMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcIonConcentrationMeasure::IfcIonConcentrationMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcIonConcentrationMeasure); e->setArgument(0, v); entity = e; }
+IfcIonConcentrationMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcIsothermalMoistureCapacityMeasure
+IfcUtil::ArgumentType IfcIsothermalMoistureCapacityMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcIsothermalMoistureCapacityMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcIsothermalMoistureCapacityMeasure::is(Type::Enum v) const { return v == IfcIsothermalMoistureCapacityMeasure::Class(); }
+Type::Enum IfcIsothermalMoistureCapacityMeasure::type() const { return Type::IfcIsothermalMoistureCapacityMeasure; }
+Type::Enum IfcIsothermalMoistureCapacityMeasure::Class() { return Type::IfcIsothermalMoistureCapacityMeasure; }
+IfcIsothermalMoistureCapacityMeasure::IfcIsothermalMoistureCapacityMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcIsothermalMoistureCapacityMeasure::IfcIsothermalMoistureCapacityMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcIsothermalMoistureCapacityMeasure); e->setArgument(0, v); entity = e; }
+IfcIsothermalMoistureCapacityMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcKinematicViscosityMeasure
+IfcUtil::ArgumentType IfcKinematicViscosityMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcKinematicViscosityMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcKinematicViscosityMeasure::is(Type::Enum v) const { return v == IfcKinematicViscosityMeasure::Class(); }
+Type::Enum IfcKinematicViscosityMeasure::type() const { return Type::IfcKinematicViscosityMeasure; }
+Type::Enum IfcKinematicViscosityMeasure::Class() { return Type::IfcKinematicViscosityMeasure; }
+IfcKinematicViscosityMeasure::IfcKinematicViscosityMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcKinematicViscosityMeasure::IfcKinematicViscosityMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcKinematicViscosityMeasure); e->setArgument(0, v); entity = e; }
+IfcKinematicViscosityMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcLabel
+IfcUtil::ArgumentType IfcLabel::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_STRING; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcLabel::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcLabel::is(Type::Enum v) const { return v == IfcLabel::Class(); }
+Type::Enum IfcLabel::type() const { return Type::IfcLabel; }
+Type::Enum IfcLabel::Class() { return Type::IfcLabel; }
+IfcLabel::IfcLabel(IfcAbstractEntity* e) { entity = e; }
+IfcLabel::IfcLabel(std::string v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcLabel); e->setArgument(0, v); entity = e; }
+IfcLabel::operator std::string() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcLanguageId
+IfcUtil::ArgumentType IfcLanguageId::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_STRING; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcLanguageId::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcLanguageId::is(Type::Enum v) const { return v == Type::IfcLanguageId || IfcIdentifier::is(v); }
+Type::Enum IfcLanguageId::type() const { return Type::IfcLanguageId; }
+Type::Enum IfcLanguageId::Class() { return Type::IfcLanguageId; }
+IfcLanguageId::IfcLanguageId(IfcAbstractEntity* e) : IfcIdentifier((IfcAbstractEntity*)0) { entity = e; }
+IfcLanguageId::IfcLanguageId(std::string v) : IfcIdentifier((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcLanguageId); e->setArgument(0, v); entity = e; }
+IfcLanguageId::operator std::string() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcLengthMeasure
+IfcUtil::ArgumentType IfcLengthMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcLengthMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcLengthMeasure::is(Type::Enum v) const { return v == IfcLengthMeasure::Class(); }
+Type::Enum IfcLengthMeasure::type() const { return Type::IfcLengthMeasure; }
+Type::Enum IfcLengthMeasure::Class() { return Type::IfcLengthMeasure; }
+IfcLengthMeasure::IfcLengthMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcLengthMeasure::IfcLengthMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcLengthMeasure); e->setArgument(0, v); entity = e; }
+IfcLengthMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcLinearForceMeasure
+IfcUtil::ArgumentType IfcLinearForceMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcLinearForceMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcLinearForceMeasure::is(Type::Enum v) const { return v == IfcLinearForceMeasure::Class(); }
+Type::Enum IfcLinearForceMeasure::type() const { return Type::IfcLinearForceMeasure; }
+Type::Enum IfcLinearForceMeasure::Class() { return Type::IfcLinearForceMeasure; }
+IfcLinearForceMeasure::IfcLinearForceMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcLinearForceMeasure::IfcLinearForceMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcLinearForceMeasure); e->setArgument(0, v); entity = e; }
+IfcLinearForceMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcLinearMomentMeasure
+IfcUtil::ArgumentType IfcLinearMomentMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcLinearMomentMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcLinearMomentMeasure::is(Type::Enum v) const { return v == IfcLinearMomentMeasure::Class(); }
+Type::Enum IfcLinearMomentMeasure::type() const { return Type::IfcLinearMomentMeasure; }
+Type::Enum IfcLinearMomentMeasure::Class() { return Type::IfcLinearMomentMeasure; }
+IfcLinearMomentMeasure::IfcLinearMomentMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcLinearMomentMeasure::IfcLinearMomentMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcLinearMomentMeasure); e->setArgument(0, v); entity = e; }
+IfcLinearMomentMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcLinearStiffnessMeasure
+IfcUtil::ArgumentType IfcLinearStiffnessMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcLinearStiffnessMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcLinearStiffnessMeasure::is(Type::Enum v) const { return v == IfcLinearStiffnessMeasure::Class(); }
+Type::Enum IfcLinearStiffnessMeasure::type() const { return Type::IfcLinearStiffnessMeasure; }
+Type::Enum IfcLinearStiffnessMeasure::Class() { return Type::IfcLinearStiffnessMeasure; }
+IfcLinearStiffnessMeasure::IfcLinearStiffnessMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcLinearStiffnessMeasure::IfcLinearStiffnessMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcLinearStiffnessMeasure); e->setArgument(0, v); entity = e; }
+IfcLinearStiffnessMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcLinearVelocityMeasure
+IfcUtil::ArgumentType IfcLinearVelocityMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcLinearVelocityMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcLinearVelocityMeasure::is(Type::Enum v) const { return v == IfcLinearVelocityMeasure::Class(); }
+Type::Enum IfcLinearVelocityMeasure::type() const { return Type::IfcLinearVelocityMeasure; }
+Type::Enum IfcLinearVelocityMeasure::Class() { return Type::IfcLinearVelocityMeasure; }
+IfcLinearVelocityMeasure::IfcLinearVelocityMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcLinearVelocityMeasure::IfcLinearVelocityMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcLinearVelocityMeasure); e->setArgument(0, v); entity = e; }
+IfcLinearVelocityMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcLogical
+IfcUtil::ArgumentType IfcLogical::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_BOOL; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcLogical::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcLogical::is(Type::Enum v) const { return v == IfcLogical::Class(); }
+Type::Enum IfcLogical::type() const { return Type::IfcLogical; }
+Type::Enum IfcLogical::Class() { return Type::IfcLogical; }
+IfcLogical::IfcLogical(IfcAbstractEntity* e) { entity = e; }
+IfcLogical::IfcLogical(bool v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcLogical); e->setArgument(0, v); entity = e; }
+IfcLogical::operator bool() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcLuminousFluxMeasure
+IfcUtil::ArgumentType IfcLuminousFluxMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcLuminousFluxMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcLuminousFluxMeasure::is(Type::Enum v) const { return v == IfcLuminousFluxMeasure::Class(); }
+Type::Enum IfcLuminousFluxMeasure::type() const { return Type::IfcLuminousFluxMeasure; }
+Type::Enum IfcLuminousFluxMeasure::Class() { return Type::IfcLuminousFluxMeasure; }
+IfcLuminousFluxMeasure::IfcLuminousFluxMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcLuminousFluxMeasure::IfcLuminousFluxMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcLuminousFluxMeasure); e->setArgument(0, v); entity = e; }
+IfcLuminousFluxMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcLuminousIntensityDistributionMeasure
+IfcUtil::ArgumentType IfcLuminousIntensityDistributionMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcLuminousIntensityDistributionMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcLuminousIntensityDistributionMeasure::is(Type::Enum v) const { return v == IfcLuminousIntensityDistributionMeasure::Class(); }
+Type::Enum IfcLuminousIntensityDistributionMeasure::type() const { return Type::IfcLuminousIntensityDistributionMeasure; }
+Type::Enum IfcLuminousIntensityDistributionMeasure::Class() { return Type::IfcLuminousIntensityDistributionMeasure; }
+IfcLuminousIntensityDistributionMeasure::IfcLuminousIntensityDistributionMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcLuminousIntensityDistributionMeasure::IfcLuminousIntensityDistributionMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcLuminousIntensityDistributionMeasure); e->setArgument(0, v); entity = e; }
+IfcLuminousIntensityDistributionMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcLuminousIntensityMeasure
+IfcUtil::ArgumentType IfcLuminousIntensityMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcLuminousIntensityMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcLuminousIntensityMeasure::is(Type::Enum v) const { return v == IfcLuminousIntensityMeasure::Class(); }
+Type::Enum IfcLuminousIntensityMeasure::type() const { return Type::IfcLuminousIntensityMeasure; }
+Type::Enum IfcLuminousIntensityMeasure::Class() { return Type::IfcLuminousIntensityMeasure; }
+IfcLuminousIntensityMeasure::IfcLuminousIntensityMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcLuminousIntensityMeasure::IfcLuminousIntensityMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcLuminousIntensityMeasure); e->setArgument(0, v); entity = e; }
+IfcLuminousIntensityMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcMagneticFluxDensityMeasure
+IfcUtil::ArgumentType IfcMagneticFluxDensityMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcMagneticFluxDensityMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcMagneticFluxDensityMeasure::is(Type::Enum v) const { return v == IfcMagneticFluxDensityMeasure::Class(); }
+Type::Enum IfcMagneticFluxDensityMeasure::type() const { return Type::IfcMagneticFluxDensityMeasure; }
+Type::Enum IfcMagneticFluxDensityMeasure::Class() { return Type::IfcMagneticFluxDensityMeasure; }
+IfcMagneticFluxDensityMeasure::IfcMagneticFluxDensityMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcMagneticFluxDensityMeasure::IfcMagneticFluxDensityMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcMagneticFluxDensityMeasure); e->setArgument(0, v); entity = e; }
+IfcMagneticFluxDensityMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcMagneticFluxMeasure
+IfcUtil::ArgumentType IfcMagneticFluxMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcMagneticFluxMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcMagneticFluxMeasure::is(Type::Enum v) const { return v == IfcMagneticFluxMeasure::Class(); }
+Type::Enum IfcMagneticFluxMeasure::type() const { return Type::IfcMagneticFluxMeasure; }
+Type::Enum IfcMagneticFluxMeasure::Class() { return Type::IfcMagneticFluxMeasure; }
+IfcMagneticFluxMeasure::IfcMagneticFluxMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcMagneticFluxMeasure::IfcMagneticFluxMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcMagneticFluxMeasure); e->setArgument(0, v); entity = e; }
+IfcMagneticFluxMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcMassDensityMeasure
+IfcUtil::ArgumentType IfcMassDensityMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcMassDensityMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcMassDensityMeasure::is(Type::Enum v) const { return v == IfcMassDensityMeasure::Class(); }
+Type::Enum IfcMassDensityMeasure::type() const { return Type::IfcMassDensityMeasure; }
+Type::Enum IfcMassDensityMeasure::Class() { return Type::IfcMassDensityMeasure; }
+IfcMassDensityMeasure::IfcMassDensityMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcMassDensityMeasure::IfcMassDensityMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcMassDensityMeasure); e->setArgument(0, v); entity = e; }
+IfcMassDensityMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcMassFlowRateMeasure
+IfcUtil::ArgumentType IfcMassFlowRateMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcMassFlowRateMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcMassFlowRateMeasure::is(Type::Enum v) const { return v == IfcMassFlowRateMeasure::Class(); }
+Type::Enum IfcMassFlowRateMeasure::type() const { return Type::IfcMassFlowRateMeasure; }
+Type::Enum IfcMassFlowRateMeasure::Class() { return Type::IfcMassFlowRateMeasure; }
+IfcMassFlowRateMeasure::IfcMassFlowRateMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcMassFlowRateMeasure::IfcMassFlowRateMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcMassFlowRateMeasure); e->setArgument(0, v); entity = e; }
+IfcMassFlowRateMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcMassMeasure
+IfcUtil::ArgumentType IfcMassMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcMassMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcMassMeasure::is(Type::Enum v) const { return v == IfcMassMeasure::Class(); }
+Type::Enum IfcMassMeasure::type() const { return Type::IfcMassMeasure; }
+Type::Enum IfcMassMeasure::Class() { return Type::IfcMassMeasure; }
+IfcMassMeasure::IfcMassMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcMassMeasure::IfcMassMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcMassMeasure); e->setArgument(0, v); entity = e; }
+IfcMassMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcMassPerLengthMeasure
+IfcUtil::ArgumentType IfcMassPerLengthMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcMassPerLengthMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcMassPerLengthMeasure::is(Type::Enum v) const { return v == IfcMassPerLengthMeasure::Class(); }
+Type::Enum IfcMassPerLengthMeasure::type() const { return Type::IfcMassPerLengthMeasure; }
+Type::Enum IfcMassPerLengthMeasure::Class() { return Type::IfcMassPerLengthMeasure; }
+IfcMassPerLengthMeasure::IfcMassPerLengthMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcMassPerLengthMeasure::IfcMassPerLengthMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcMassPerLengthMeasure); e->setArgument(0, v); entity = e; }
+IfcMassPerLengthMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcModulusOfElasticityMeasure
+IfcUtil::ArgumentType IfcModulusOfElasticityMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcModulusOfElasticityMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcModulusOfElasticityMeasure::is(Type::Enum v) const { return v == IfcModulusOfElasticityMeasure::Class(); }
+Type::Enum IfcModulusOfElasticityMeasure::type() const { return Type::IfcModulusOfElasticityMeasure; }
+Type::Enum IfcModulusOfElasticityMeasure::Class() { return Type::IfcModulusOfElasticityMeasure; }
+IfcModulusOfElasticityMeasure::IfcModulusOfElasticityMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcModulusOfElasticityMeasure::IfcModulusOfElasticityMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcModulusOfElasticityMeasure); e->setArgument(0, v); entity = e; }
+IfcModulusOfElasticityMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcModulusOfLinearSubgradeReactionMeasure
+IfcUtil::ArgumentType IfcModulusOfLinearSubgradeReactionMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcModulusOfLinearSubgradeReactionMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcModulusOfLinearSubgradeReactionMeasure::is(Type::Enum v) const { return v == IfcModulusOfLinearSubgradeReactionMeasure::Class(); }
+Type::Enum IfcModulusOfLinearSubgradeReactionMeasure::type() const { return Type::IfcModulusOfLinearSubgradeReactionMeasure; }
+Type::Enum IfcModulusOfLinearSubgradeReactionMeasure::Class() { return Type::IfcModulusOfLinearSubgradeReactionMeasure; }
+IfcModulusOfLinearSubgradeReactionMeasure::IfcModulusOfLinearSubgradeReactionMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcModulusOfLinearSubgradeReactionMeasure::IfcModulusOfLinearSubgradeReactionMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcModulusOfLinearSubgradeReactionMeasure); e->setArgument(0, v); entity = e; }
+IfcModulusOfLinearSubgradeReactionMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcModulusOfRotationalSubgradeReactionMeasure
+IfcUtil::ArgumentType IfcModulusOfRotationalSubgradeReactionMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcModulusOfRotationalSubgradeReactionMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcModulusOfRotationalSubgradeReactionMeasure::is(Type::Enum v) const { return v == IfcModulusOfRotationalSubgradeReactionMeasure::Class(); }
+Type::Enum IfcModulusOfRotationalSubgradeReactionMeasure::type() const { return Type::IfcModulusOfRotationalSubgradeReactionMeasure; }
+Type::Enum IfcModulusOfRotationalSubgradeReactionMeasure::Class() { return Type::IfcModulusOfRotationalSubgradeReactionMeasure; }
+IfcModulusOfRotationalSubgradeReactionMeasure::IfcModulusOfRotationalSubgradeReactionMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcModulusOfRotationalSubgradeReactionMeasure::IfcModulusOfRotationalSubgradeReactionMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcModulusOfRotationalSubgradeReactionMeasure); e->setArgument(0, v); entity = e; }
+IfcModulusOfRotationalSubgradeReactionMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcModulusOfSubgradeReactionMeasure
+IfcUtil::ArgumentType IfcModulusOfSubgradeReactionMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcModulusOfSubgradeReactionMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcModulusOfSubgradeReactionMeasure::is(Type::Enum v) const { return v == IfcModulusOfSubgradeReactionMeasure::Class(); }
+Type::Enum IfcModulusOfSubgradeReactionMeasure::type() const { return Type::IfcModulusOfSubgradeReactionMeasure; }
+Type::Enum IfcModulusOfSubgradeReactionMeasure::Class() { return Type::IfcModulusOfSubgradeReactionMeasure; }
+IfcModulusOfSubgradeReactionMeasure::IfcModulusOfSubgradeReactionMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcModulusOfSubgradeReactionMeasure::IfcModulusOfSubgradeReactionMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcModulusOfSubgradeReactionMeasure); e->setArgument(0, v); entity = e; }
+IfcModulusOfSubgradeReactionMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcMoistureDiffusivityMeasure
+IfcUtil::ArgumentType IfcMoistureDiffusivityMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcMoistureDiffusivityMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcMoistureDiffusivityMeasure::is(Type::Enum v) const { return v == IfcMoistureDiffusivityMeasure::Class(); }
+Type::Enum IfcMoistureDiffusivityMeasure::type() const { return Type::IfcMoistureDiffusivityMeasure; }
+Type::Enum IfcMoistureDiffusivityMeasure::Class() { return Type::IfcMoistureDiffusivityMeasure; }
+IfcMoistureDiffusivityMeasure::IfcMoistureDiffusivityMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcMoistureDiffusivityMeasure::IfcMoistureDiffusivityMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcMoistureDiffusivityMeasure); e->setArgument(0, v); entity = e; }
+IfcMoistureDiffusivityMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcMolecularWeightMeasure
+IfcUtil::ArgumentType IfcMolecularWeightMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcMolecularWeightMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcMolecularWeightMeasure::is(Type::Enum v) const { return v == IfcMolecularWeightMeasure::Class(); }
+Type::Enum IfcMolecularWeightMeasure::type() const { return Type::IfcMolecularWeightMeasure; }
+Type::Enum IfcMolecularWeightMeasure::Class() { return Type::IfcMolecularWeightMeasure; }
+IfcMolecularWeightMeasure::IfcMolecularWeightMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcMolecularWeightMeasure::IfcMolecularWeightMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcMolecularWeightMeasure); e->setArgument(0, v); entity = e; }
+IfcMolecularWeightMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcMomentOfInertiaMeasure
+IfcUtil::ArgumentType IfcMomentOfInertiaMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcMomentOfInertiaMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcMomentOfInertiaMeasure::is(Type::Enum v) const { return v == IfcMomentOfInertiaMeasure::Class(); }
+Type::Enum IfcMomentOfInertiaMeasure::type() const { return Type::IfcMomentOfInertiaMeasure; }
+Type::Enum IfcMomentOfInertiaMeasure::Class() { return Type::IfcMomentOfInertiaMeasure; }
+IfcMomentOfInertiaMeasure::IfcMomentOfInertiaMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcMomentOfInertiaMeasure::IfcMomentOfInertiaMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcMomentOfInertiaMeasure); e->setArgument(0, v); entity = e; }
+IfcMomentOfInertiaMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcMonetaryMeasure
+IfcUtil::ArgumentType IfcMonetaryMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcMonetaryMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcMonetaryMeasure::is(Type::Enum v) const { return v == IfcMonetaryMeasure::Class(); }
+Type::Enum IfcMonetaryMeasure::type() const { return Type::IfcMonetaryMeasure; }
+Type::Enum IfcMonetaryMeasure::Class() { return Type::IfcMonetaryMeasure; }
+IfcMonetaryMeasure::IfcMonetaryMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcMonetaryMeasure::IfcMonetaryMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcMonetaryMeasure); e->setArgument(0, v); entity = e; }
+IfcMonetaryMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcMonthInYearNumber
+IfcUtil::ArgumentType IfcMonthInYearNumber::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_INT; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcMonthInYearNumber::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcMonthInYearNumber::is(Type::Enum v) const { return v == IfcMonthInYearNumber::Class(); }
+Type::Enum IfcMonthInYearNumber::type() const { return Type::IfcMonthInYearNumber; }
+Type::Enum IfcMonthInYearNumber::Class() { return Type::IfcMonthInYearNumber; }
+IfcMonthInYearNumber::IfcMonthInYearNumber(IfcAbstractEntity* e) { entity = e; }
+IfcMonthInYearNumber::IfcMonthInYearNumber(int v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcMonthInYearNumber); e->setArgument(0, v); entity = e; }
+IfcMonthInYearNumber::operator int() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcNonNegativeLengthMeasure
+IfcUtil::ArgumentType IfcNonNegativeLengthMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcNonNegativeLengthMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcNonNegativeLengthMeasure::is(Type::Enum v) const { return v == Type::IfcNonNegativeLengthMeasure || IfcLengthMeasure::is(v); }
+Type::Enum IfcNonNegativeLengthMeasure::type() const { return Type::IfcNonNegativeLengthMeasure; }
+Type::Enum IfcNonNegativeLengthMeasure::Class() { return Type::IfcNonNegativeLengthMeasure; }
+IfcNonNegativeLengthMeasure::IfcNonNegativeLengthMeasure(IfcAbstractEntity* e) : IfcLengthMeasure((IfcAbstractEntity*)0) { entity = e; }
+IfcNonNegativeLengthMeasure::IfcNonNegativeLengthMeasure(double v) : IfcLengthMeasure((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcNonNegativeLengthMeasure); e->setArgument(0, v); entity = e; }
+IfcNonNegativeLengthMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcNormalisedRatioMeasure
+IfcUtil::ArgumentType IfcNormalisedRatioMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcNormalisedRatioMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcNormalisedRatioMeasure::is(Type::Enum v) const { return v == Type::IfcNormalisedRatioMeasure || IfcRatioMeasure::is(v); }
+Type::Enum IfcNormalisedRatioMeasure::type() const { return Type::IfcNormalisedRatioMeasure; }
+Type::Enum IfcNormalisedRatioMeasure::Class() { return Type::IfcNormalisedRatioMeasure; }
+IfcNormalisedRatioMeasure::IfcNormalisedRatioMeasure(IfcAbstractEntity* e) : IfcRatioMeasure((IfcAbstractEntity*)0) { entity = e; }
+IfcNormalisedRatioMeasure::IfcNormalisedRatioMeasure(double v) : IfcRatioMeasure((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcNormalisedRatioMeasure); e->setArgument(0, v); entity = e; }
+IfcNormalisedRatioMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcNumericMeasure
+IfcUtil::ArgumentType IfcNumericMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcNumericMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcNumericMeasure::is(Type::Enum v) const { return v == IfcNumericMeasure::Class(); }
+Type::Enum IfcNumericMeasure::type() const { return Type::IfcNumericMeasure; }
+Type::Enum IfcNumericMeasure::Class() { return Type::IfcNumericMeasure; }
+IfcNumericMeasure::IfcNumericMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcNumericMeasure::IfcNumericMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcNumericMeasure); e->setArgument(0, v); entity = e; }
+IfcNumericMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcPHMeasure
+IfcUtil::ArgumentType IfcPHMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcPHMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcPHMeasure::is(Type::Enum v) const { return v == IfcPHMeasure::Class(); }
+Type::Enum IfcPHMeasure::type() const { return Type::IfcPHMeasure; }
+Type::Enum IfcPHMeasure::Class() { return Type::IfcPHMeasure; }
+IfcPHMeasure::IfcPHMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcPHMeasure::IfcPHMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcPHMeasure); e->setArgument(0, v); entity = e; }
+IfcPHMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcParameterValue
+IfcUtil::ArgumentType IfcParameterValue::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcParameterValue::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcParameterValue::is(Type::Enum v) const { return v == IfcParameterValue::Class(); }
+Type::Enum IfcParameterValue::type() const { return Type::IfcParameterValue; }
+Type::Enum IfcParameterValue::Class() { return Type::IfcParameterValue; }
+IfcParameterValue::IfcParameterValue(IfcAbstractEntity* e) { entity = e; }
+IfcParameterValue::IfcParameterValue(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcParameterValue); e->setArgument(0, v); entity = e; }
+IfcParameterValue::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcPlanarForceMeasure
+IfcUtil::ArgumentType IfcPlanarForceMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcPlanarForceMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcPlanarForceMeasure::is(Type::Enum v) const { return v == IfcPlanarForceMeasure::Class(); }
+Type::Enum IfcPlanarForceMeasure::type() const { return Type::IfcPlanarForceMeasure; }
+Type::Enum IfcPlanarForceMeasure::Class() { return Type::IfcPlanarForceMeasure; }
+IfcPlanarForceMeasure::IfcPlanarForceMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcPlanarForceMeasure::IfcPlanarForceMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcPlanarForceMeasure); e->setArgument(0, v); entity = e; }
+IfcPlanarForceMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcPlaneAngleMeasure
+IfcUtil::ArgumentType IfcPlaneAngleMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcPlaneAngleMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcPlaneAngleMeasure::is(Type::Enum v) const { return v == IfcPlaneAngleMeasure::Class(); }
+Type::Enum IfcPlaneAngleMeasure::type() const { return Type::IfcPlaneAngleMeasure; }
+Type::Enum IfcPlaneAngleMeasure::Class() { return Type::IfcPlaneAngleMeasure; }
+IfcPlaneAngleMeasure::IfcPlaneAngleMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcPlaneAngleMeasure::IfcPlaneAngleMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcPlaneAngleMeasure); e->setArgument(0, v); entity = e; }
+IfcPlaneAngleMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcPositiveLengthMeasure
+IfcUtil::ArgumentType IfcPositiveLengthMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcPositiveLengthMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcPositiveLengthMeasure::is(Type::Enum v) const { return v == Type::IfcPositiveLengthMeasure || IfcLengthMeasure::is(v); }
+Type::Enum IfcPositiveLengthMeasure::type() const { return Type::IfcPositiveLengthMeasure; }
+Type::Enum IfcPositiveLengthMeasure::Class() { return Type::IfcPositiveLengthMeasure; }
+IfcPositiveLengthMeasure::IfcPositiveLengthMeasure(IfcAbstractEntity* e) : IfcLengthMeasure((IfcAbstractEntity*)0) { entity = e; }
+IfcPositiveLengthMeasure::IfcPositiveLengthMeasure(double v) : IfcLengthMeasure((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcPositiveLengthMeasure); e->setArgument(0, v); entity = e; }
+IfcPositiveLengthMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcPositivePlaneAngleMeasure
+IfcUtil::ArgumentType IfcPositivePlaneAngleMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcPositivePlaneAngleMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcPositivePlaneAngleMeasure::is(Type::Enum v) const { return v == Type::IfcPositivePlaneAngleMeasure || IfcPlaneAngleMeasure::is(v); }
+Type::Enum IfcPositivePlaneAngleMeasure::type() const { return Type::IfcPositivePlaneAngleMeasure; }
+Type::Enum IfcPositivePlaneAngleMeasure::Class() { return Type::IfcPositivePlaneAngleMeasure; }
+IfcPositivePlaneAngleMeasure::IfcPositivePlaneAngleMeasure(IfcAbstractEntity* e) : IfcPlaneAngleMeasure((IfcAbstractEntity*)0) { entity = e; }
+IfcPositivePlaneAngleMeasure::IfcPositivePlaneAngleMeasure(double v) : IfcPlaneAngleMeasure((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcPositivePlaneAngleMeasure); e->setArgument(0, v); entity = e; }
+IfcPositivePlaneAngleMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcPositiveRatioMeasure
+IfcUtil::ArgumentType IfcPositiveRatioMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcPositiveRatioMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcPositiveRatioMeasure::is(Type::Enum v) const { return v == Type::IfcPositiveRatioMeasure || IfcRatioMeasure::is(v); }
+Type::Enum IfcPositiveRatioMeasure::type() const { return Type::IfcPositiveRatioMeasure; }
+Type::Enum IfcPositiveRatioMeasure::Class() { return Type::IfcPositiveRatioMeasure; }
+IfcPositiveRatioMeasure::IfcPositiveRatioMeasure(IfcAbstractEntity* e) : IfcRatioMeasure((IfcAbstractEntity*)0) { entity = e; }
+IfcPositiveRatioMeasure::IfcPositiveRatioMeasure(double v) : IfcRatioMeasure((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcPositiveRatioMeasure); e->setArgument(0, v); entity = e; }
+IfcPositiveRatioMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcPowerMeasure
+IfcUtil::ArgumentType IfcPowerMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcPowerMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcPowerMeasure::is(Type::Enum v) const { return v == IfcPowerMeasure::Class(); }
+Type::Enum IfcPowerMeasure::type() const { return Type::IfcPowerMeasure; }
+Type::Enum IfcPowerMeasure::Class() { return Type::IfcPowerMeasure; }
+IfcPowerMeasure::IfcPowerMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcPowerMeasure::IfcPowerMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcPowerMeasure); e->setArgument(0, v); entity = e; }
+IfcPowerMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcPresentableText
+IfcUtil::ArgumentType IfcPresentableText::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_STRING; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcPresentableText::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcPresentableText::is(Type::Enum v) const { return v == IfcPresentableText::Class(); }
+Type::Enum IfcPresentableText::type() const { return Type::IfcPresentableText; }
+Type::Enum IfcPresentableText::Class() { return Type::IfcPresentableText; }
+IfcPresentableText::IfcPresentableText(IfcAbstractEntity* e) { entity = e; }
+IfcPresentableText::IfcPresentableText(std::string v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcPresentableText); e->setArgument(0, v); entity = e; }
+IfcPresentableText::operator std::string() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcPressureMeasure
+IfcUtil::ArgumentType IfcPressureMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcPressureMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcPressureMeasure::is(Type::Enum v) const { return v == IfcPressureMeasure::Class(); }
+Type::Enum IfcPressureMeasure::type() const { return Type::IfcPressureMeasure; }
+Type::Enum IfcPressureMeasure::Class() { return Type::IfcPressureMeasure; }
+IfcPressureMeasure::IfcPressureMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcPressureMeasure::IfcPressureMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcPressureMeasure); e->setArgument(0, v); entity = e; }
+IfcPressureMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcPropertySetDefinitionSet
+IfcUtil::ArgumentType IfcPropertySetDefinitionSet::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_ENTITY; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcPropertySetDefinitionSet::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcPropertySetDefinitionSet::is(Type::Enum v) const { return v == IfcPropertySetDefinitionSet::Class(); }
+Type::Enum IfcPropertySetDefinitionSet::type() const { return Type::IfcPropertySetDefinitionSet; }
+Type::Enum IfcPropertySetDefinitionSet::Class() { return Type::IfcPropertySetDefinitionSet; }
+IfcPropertySetDefinitionSet::IfcPropertySetDefinitionSet(IfcAbstractEntity* e) { entity = e; }
+IfcPropertySetDefinitionSet::IfcPropertySetDefinitionSet(IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcPropertySetDefinitionSet); e->setArgument(0, v); entity = e; }
+IfcPropertySetDefinitionSet::operator IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcRadioActivityMeasure
+IfcUtil::ArgumentType IfcRadioActivityMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcRadioActivityMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcRadioActivityMeasure::is(Type::Enum v) const { return v == IfcRadioActivityMeasure::Class(); }
+Type::Enum IfcRadioActivityMeasure::type() const { return Type::IfcRadioActivityMeasure; }
+Type::Enum IfcRadioActivityMeasure::Class() { return Type::IfcRadioActivityMeasure; }
+IfcRadioActivityMeasure::IfcRadioActivityMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcRadioActivityMeasure::IfcRadioActivityMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcRadioActivityMeasure); e->setArgument(0, v); entity = e; }
+IfcRadioActivityMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcRatioMeasure
+IfcUtil::ArgumentType IfcRatioMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcRatioMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcRatioMeasure::is(Type::Enum v) const { return v == IfcRatioMeasure::Class(); }
+Type::Enum IfcRatioMeasure::type() const { return Type::IfcRatioMeasure; }
+Type::Enum IfcRatioMeasure::Class() { return Type::IfcRatioMeasure; }
+IfcRatioMeasure::IfcRatioMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcRatioMeasure::IfcRatioMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcRatioMeasure); e->setArgument(0, v); entity = e; }
+IfcRatioMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcReal
+IfcUtil::ArgumentType IfcReal::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcReal::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcReal::is(Type::Enum v) const { return v == IfcReal::Class(); }
+Type::Enum IfcReal::type() const { return Type::IfcReal; }
+Type::Enum IfcReal::Class() { return Type::IfcReal; }
+IfcReal::IfcReal(IfcAbstractEntity* e) { entity = e; }
+IfcReal::IfcReal(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcReal); e->setArgument(0, v); entity = e; }
+IfcReal::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcRotationalFrequencyMeasure
+IfcUtil::ArgumentType IfcRotationalFrequencyMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcRotationalFrequencyMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcRotationalFrequencyMeasure::is(Type::Enum v) const { return v == IfcRotationalFrequencyMeasure::Class(); }
+Type::Enum IfcRotationalFrequencyMeasure::type() const { return Type::IfcRotationalFrequencyMeasure; }
+Type::Enum IfcRotationalFrequencyMeasure::Class() { return Type::IfcRotationalFrequencyMeasure; }
+IfcRotationalFrequencyMeasure::IfcRotationalFrequencyMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcRotationalFrequencyMeasure::IfcRotationalFrequencyMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcRotationalFrequencyMeasure); e->setArgument(0, v); entity = e; }
+IfcRotationalFrequencyMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcRotationalMassMeasure
+IfcUtil::ArgumentType IfcRotationalMassMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcRotationalMassMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcRotationalMassMeasure::is(Type::Enum v) const { return v == IfcRotationalMassMeasure::Class(); }
+Type::Enum IfcRotationalMassMeasure::type() const { return Type::IfcRotationalMassMeasure; }
+Type::Enum IfcRotationalMassMeasure::Class() { return Type::IfcRotationalMassMeasure; }
+IfcRotationalMassMeasure::IfcRotationalMassMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcRotationalMassMeasure::IfcRotationalMassMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcRotationalMassMeasure); e->setArgument(0, v); entity = e; }
+IfcRotationalMassMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcRotationalStiffnessMeasure
+IfcUtil::ArgumentType IfcRotationalStiffnessMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcRotationalStiffnessMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcRotationalStiffnessMeasure::is(Type::Enum v) const { return v == IfcRotationalStiffnessMeasure::Class(); }
+Type::Enum IfcRotationalStiffnessMeasure::type() const { return Type::IfcRotationalStiffnessMeasure; }
+Type::Enum IfcRotationalStiffnessMeasure::Class() { return Type::IfcRotationalStiffnessMeasure; }
+IfcRotationalStiffnessMeasure::IfcRotationalStiffnessMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcRotationalStiffnessMeasure::IfcRotationalStiffnessMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcRotationalStiffnessMeasure); e->setArgument(0, v); entity = e; }
+IfcRotationalStiffnessMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcSectionModulusMeasure
+IfcUtil::ArgumentType IfcSectionModulusMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcSectionModulusMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcSectionModulusMeasure::is(Type::Enum v) const { return v == IfcSectionModulusMeasure::Class(); }
+Type::Enum IfcSectionModulusMeasure::type() const { return Type::IfcSectionModulusMeasure; }
+Type::Enum IfcSectionModulusMeasure::Class() { return Type::IfcSectionModulusMeasure; }
+IfcSectionModulusMeasure::IfcSectionModulusMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcSectionModulusMeasure::IfcSectionModulusMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcSectionModulusMeasure); e->setArgument(0, v); entity = e; }
+IfcSectionModulusMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcSectionalAreaIntegralMeasure
+IfcUtil::ArgumentType IfcSectionalAreaIntegralMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcSectionalAreaIntegralMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcSectionalAreaIntegralMeasure::is(Type::Enum v) const { return v == IfcSectionalAreaIntegralMeasure::Class(); }
+Type::Enum IfcSectionalAreaIntegralMeasure::type() const { return Type::IfcSectionalAreaIntegralMeasure; }
+Type::Enum IfcSectionalAreaIntegralMeasure::Class() { return Type::IfcSectionalAreaIntegralMeasure; }
+IfcSectionalAreaIntegralMeasure::IfcSectionalAreaIntegralMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcSectionalAreaIntegralMeasure::IfcSectionalAreaIntegralMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcSectionalAreaIntegralMeasure); e->setArgument(0, v); entity = e; }
+IfcSectionalAreaIntegralMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcShearModulusMeasure
+IfcUtil::ArgumentType IfcShearModulusMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcShearModulusMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcShearModulusMeasure::is(Type::Enum v) const { return v == IfcShearModulusMeasure::Class(); }
+Type::Enum IfcShearModulusMeasure::type() const { return Type::IfcShearModulusMeasure; }
+Type::Enum IfcShearModulusMeasure::Class() { return Type::IfcShearModulusMeasure; }
+IfcShearModulusMeasure::IfcShearModulusMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcShearModulusMeasure::IfcShearModulusMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcShearModulusMeasure); e->setArgument(0, v); entity = e; }
+IfcShearModulusMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcSolidAngleMeasure
+IfcUtil::ArgumentType IfcSolidAngleMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcSolidAngleMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcSolidAngleMeasure::is(Type::Enum v) const { return v == IfcSolidAngleMeasure::Class(); }
+Type::Enum IfcSolidAngleMeasure::type() const { return Type::IfcSolidAngleMeasure; }
+Type::Enum IfcSolidAngleMeasure::Class() { return Type::IfcSolidAngleMeasure; }
+IfcSolidAngleMeasure::IfcSolidAngleMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcSolidAngleMeasure::IfcSolidAngleMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcSolidAngleMeasure); e->setArgument(0, v); entity = e; }
+IfcSolidAngleMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcSoundPowerLevelMeasure
+IfcUtil::ArgumentType IfcSoundPowerLevelMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcSoundPowerLevelMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcSoundPowerLevelMeasure::is(Type::Enum v) const { return v == IfcSoundPowerLevelMeasure::Class(); }
+Type::Enum IfcSoundPowerLevelMeasure::type() const { return Type::IfcSoundPowerLevelMeasure; }
+Type::Enum IfcSoundPowerLevelMeasure::Class() { return Type::IfcSoundPowerLevelMeasure; }
+IfcSoundPowerLevelMeasure::IfcSoundPowerLevelMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcSoundPowerLevelMeasure::IfcSoundPowerLevelMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcSoundPowerLevelMeasure); e->setArgument(0, v); entity = e; }
+IfcSoundPowerLevelMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcSoundPowerMeasure
+IfcUtil::ArgumentType IfcSoundPowerMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcSoundPowerMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcSoundPowerMeasure::is(Type::Enum v) const { return v == IfcSoundPowerMeasure::Class(); }
+Type::Enum IfcSoundPowerMeasure::type() const { return Type::IfcSoundPowerMeasure; }
+Type::Enum IfcSoundPowerMeasure::Class() { return Type::IfcSoundPowerMeasure; }
+IfcSoundPowerMeasure::IfcSoundPowerMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcSoundPowerMeasure::IfcSoundPowerMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcSoundPowerMeasure); e->setArgument(0, v); entity = e; }
+IfcSoundPowerMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcSoundPressureLevelMeasure
+IfcUtil::ArgumentType IfcSoundPressureLevelMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcSoundPressureLevelMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcSoundPressureLevelMeasure::is(Type::Enum v) const { return v == IfcSoundPressureLevelMeasure::Class(); }
+Type::Enum IfcSoundPressureLevelMeasure::type() const { return Type::IfcSoundPressureLevelMeasure; }
+Type::Enum IfcSoundPressureLevelMeasure::Class() { return Type::IfcSoundPressureLevelMeasure; }
+IfcSoundPressureLevelMeasure::IfcSoundPressureLevelMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcSoundPressureLevelMeasure::IfcSoundPressureLevelMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcSoundPressureLevelMeasure); e->setArgument(0, v); entity = e; }
+IfcSoundPressureLevelMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcSoundPressureMeasure
+IfcUtil::ArgumentType IfcSoundPressureMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcSoundPressureMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcSoundPressureMeasure::is(Type::Enum v) const { return v == IfcSoundPressureMeasure::Class(); }
+Type::Enum IfcSoundPressureMeasure::type() const { return Type::IfcSoundPressureMeasure; }
+Type::Enum IfcSoundPressureMeasure::Class() { return Type::IfcSoundPressureMeasure; }
+IfcSoundPressureMeasure::IfcSoundPressureMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcSoundPressureMeasure::IfcSoundPressureMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcSoundPressureMeasure); e->setArgument(0, v); entity = e; }
+IfcSoundPressureMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcSpecificHeatCapacityMeasure
+IfcUtil::ArgumentType IfcSpecificHeatCapacityMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcSpecificHeatCapacityMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcSpecificHeatCapacityMeasure::is(Type::Enum v) const { return v == IfcSpecificHeatCapacityMeasure::Class(); }
+Type::Enum IfcSpecificHeatCapacityMeasure::type() const { return Type::IfcSpecificHeatCapacityMeasure; }
+Type::Enum IfcSpecificHeatCapacityMeasure::Class() { return Type::IfcSpecificHeatCapacityMeasure; }
+IfcSpecificHeatCapacityMeasure::IfcSpecificHeatCapacityMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcSpecificHeatCapacityMeasure::IfcSpecificHeatCapacityMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcSpecificHeatCapacityMeasure); e->setArgument(0, v); entity = e; }
+IfcSpecificHeatCapacityMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcSpecularExponent
+IfcUtil::ArgumentType IfcSpecularExponent::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcSpecularExponent::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcSpecularExponent::is(Type::Enum v) const { return v == IfcSpecularExponent::Class(); }
+Type::Enum IfcSpecularExponent::type() const { return Type::IfcSpecularExponent; }
+Type::Enum IfcSpecularExponent::Class() { return Type::IfcSpecularExponent; }
+IfcSpecularExponent::IfcSpecularExponent(IfcAbstractEntity* e) { entity = e; }
+IfcSpecularExponent::IfcSpecularExponent(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcSpecularExponent); e->setArgument(0, v); entity = e; }
+IfcSpecularExponent::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcSpecularRoughness
+IfcUtil::ArgumentType IfcSpecularRoughness::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcSpecularRoughness::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcSpecularRoughness::is(Type::Enum v) const { return v == IfcSpecularRoughness::Class(); }
+Type::Enum IfcSpecularRoughness::type() const { return Type::IfcSpecularRoughness; }
+Type::Enum IfcSpecularRoughness::Class() { return Type::IfcSpecularRoughness; }
+IfcSpecularRoughness::IfcSpecularRoughness(IfcAbstractEntity* e) { entity = e; }
+IfcSpecularRoughness::IfcSpecularRoughness(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcSpecularRoughness); e->setArgument(0, v); entity = e; }
+IfcSpecularRoughness::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcTemperatureGradientMeasure
+IfcUtil::ArgumentType IfcTemperatureGradientMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcTemperatureGradientMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcTemperatureGradientMeasure::is(Type::Enum v) const { return v == IfcTemperatureGradientMeasure::Class(); }
+Type::Enum IfcTemperatureGradientMeasure::type() const { return Type::IfcTemperatureGradientMeasure; }
+Type::Enum IfcTemperatureGradientMeasure::Class() { return Type::IfcTemperatureGradientMeasure; }
+IfcTemperatureGradientMeasure::IfcTemperatureGradientMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcTemperatureGradientMeasure::IfcTemperatureGradientMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcTemperatureGradientMeasure); e->setArgument(0, v); entity = e; }
+IfcTemperatureGradientMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcTemperatureRateOfChangeMeasure
+IfcUtil::ArgumentType IfcTemperatureRateOfChangeMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcTemperatureRateOfChangeMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcTemperatureRateOfChangeMeasure::is(Type::Enum v) const { return v == IfcTemperatureRateOfChangeMeasure::Class(); }
+Type::Enum IfcTemperatureRateOfChangeMeasure::type() const { return Type::IfcTemperatureRateOfChangeMeasure; }
+Type::Enum IfcTemperatureRateOfChangeMeasure::Class() { return Type::IfcTemperatureRateOfChangeMeasure; }
+IfcTemperatureRateOfChangeMeasure::IfcTemperatureRateOfChangeMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcTemperatureRateOfChangeMeasure::IfcTemperatureRateOfChangeMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcTemperatureRateOfChangeMeasure); e->setArgument(0, v); entity = e; }
+IfcTemperatureRateOfChangeMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcText
+IfcUtil::ArgumentType IfcText::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_STRING; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcText::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcText::is(Type::Enum v) const { return v == IfcText::Class(); }
+Type::Enum IfcText::type() const { return Type::IfcText; }
+Type::Enum IfcText::Class() { return Type::IfcText; }
+IfcText::IfcText(IfcAbstractEntity* e) { entity = e; }
+IfcText::IfcText(std::string v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcText); e->setArgument(0, v); entity = e; }
+IfcText::operator std::string() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcTextAlignment
+IfcUtil::ArgumentType IfcTextAlignment::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_STRING; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcTextAlignment::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcTextAlignment::is(Type::Enum v) const { return v == IfcTextAlignment::Class(); }
+Type::Enum IfcTextAlignment::type() const { return Type::IfcTextAlignment; }
+Type::Enum IfcTextAlignment::Class() { return Type::IfcTextAlignment; }
+IfcTextAlignment::IfcTextAlignment(IfcAbstractEntity* e) { entity = e; }
+IfcTextAlignment::IfcTextAlignment(std::string v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcTextAlignment); e->setArgument(0, v); entity = e; }
+IfcTextAlignment::operator std::string() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcTextDecoration
+IfcUtil::ArgumentType IfcTextDecoration::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_STRING; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcTextDecoration::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcTextDecoration::is(Type::Enum v) const { return v == IfcTextDecoration::Class(); }
+Type::Enum IfcTextDecoration::type() const { return Type::IfcTextDecoration; }
+Type::Enum IfcTextDecoration::Class() { return Type::IfcTextDecoration; }
+IfcTextDecoration::IfcTextDecoration(IfcAbstractEntity* e) { entity = e; }
+IfcTextDecoration::IfcTextDecoration(std::string v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcTextDecoration); e->setArgument(0, v); entity = e; }
+IfcTextDecoration::operator std::string() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcTextFontName
+IfcUtil::ArgumentType IfcTextFontName::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_STRING; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcTextFontName::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcTextFontName::is(Type::Enum v) const { return v == IfcTextFontName::Class(); }
+Type::Enum IfcTextFontName::type() const { return Type::IfcTextFontName; }
+Type::Enum IfcTextFontName::Class() { return Type::IfcTextFontName; }
+IfcTextFontName::IfcTextFontName(IfcAbstractEntity* e) { entity = e; }
+IfcTextFontName::IfcTextFontName(std::string v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcTextFontName); e->setArgument(0, v); entity = e; }
+IfcTextFontName::operator std::string() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcTextTransformation
+IfcUtil::ArgumentType IfcTextTransformation::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_STRING; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcTextTransformation::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcTextTransformation::is(Type::Enum v) const { return v == IfcTextTransformation::Class(); }
+Type::Enum IfcTextTransformation::type() const { return Type::IfcTextTransformation; }
+Type::Enum IfcTextTransformation::Class() { return Type::IfcTextTransformation; }
+IfcTextTransformation::IfcTextTransformation(IfcAbstractEntity* e) { entity = e; }
+IfcTextTransformation::IfcTextTransformation(std::string v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcTextTransformation); e->setArgument(0, v); entity = e; }
+IfcTextTransformation::operator std::string() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcThermalAdmittanceMeasure
+IfcUtil::ArgumentType IfcThermalAdmittanceMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcThermalAdmittanceMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcThermalAdmittanceMeasure::is(Type::Enum v) const { return v == IfcThermalAdmittanceMeasure::Class(); }
+Type::Enum IfcThermalAdmittanceMeasure::type() const { return Type::IfcThermalAdmittanceMeasure; }
+Type::Enum IfcThermalAdmittanceMeasure::Class() { return Type::IfcThermalAdmittanceMeasure; }
+IfcThermalAdmittanceMeasure::IfcThermalAdmittanceMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcThermalAdmittanceMeasure::IfcThermalAdmittanceMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcThermalAdmittanceMeasure); e->setArgument(0, v); entity = e; }
+IfcThermalAdmittanceMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcThermalConductivityMeasure
+IfcUtil::ArgumentType IfcThermalConductivityMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcThermalConductivityMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcThermalConductivityMeasure::is(Type::Enum v) const { return v == IfcThermalConductivityMeasure::Class(); }
+Type::Enum IfcThermalConductivityMeasure::type() const { return Type::IfcThermalConductivityMeasure; }
+Type::Enum IfcThermalConductivityMeasure::Class() { return Type::IfcThermalConductivityMeasure; }
+IfcThermalConductivityMeasure::IfcThermalConductivityMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcThermalConductivityMeasure::IfcThermalConductivityMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcThermalConductivityMeasure); e->setArgument(0, v); entity = e; }
+IfcThermalConductivityMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcThermalExpansionCoefficientMeasure
+IfcUtil::ArgumentType IfcThermalExpansionCoefficientMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcThermalExpansionCoefficientMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcThermalExpansionCoefficientMeasure::is(Type::Enum v) const { return v == IfcThermalExpansionCoefficientMeasure::Class(); }
+Type::Enum IfcThermalExpansionCoefficientMeasure::type() const { return Type::IfcThermalExpansionCoefficientMeasure; }
+Type::Enum IfcThermalExpansionCoefficientMeasure::Class() { return Type::IfcThermalExpansionCoefficientMeasure; }
+IfcThermalExpansionCoefficientMeasure::IfcThermalExpansionCoefficientMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcThermalExpansionCoefficientMeasure::IfcThermalExpansionCoefficientMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcThermalExpansionCoefficientMeasure); e->setArgument(0, v); entity = e; }
+IfcThermalExpansionCoefficientMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcThermalResistanceMeasure
+IfcUtil::ArgumentType IfcThermalResistanceMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcThermalResistanceMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcThermalResistanceMeasure::is(Type::Enum v) const { return v == IfcThermalResistanceMeasure::Class(); }
+Type::Enum IfcThermalResistanceMeasure::type() const { return Type::IfcThermalResistanceMeasure; }
+Type::Enum IfcThermalResistanceMeasure::Class() { return Type::IfcThermalResistanceMeasure; }
+IfcThermalResistanceMeasure::IfcThermalResistanceMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcThermalResistanceMeasure::IfcThermalResistanceMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcThermalResistanceMeasure); e->setArgument(0, v); entity = e; }
+IfcThermalResistanceMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcThermalTransmittanceMeasure
+IfcUtil::ArgumentType IfcThermalTransmittanceMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcThermalTransmittanceMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcThermalTransmittanceMeasure::is(Type::Enum v) const { return v == IfcThermalTransmittanceMeasure::Class(); }
+Type::Enum IfcThermalTransmittanceMeasure::type() const { return Type::IfcThermalTransmittanceMeasure; }
+Type::Enum IfcThermalTransmittanceMeasure::Class() { return Type::IfcThermalTransmittanceMeasure; }
+IfcThermalTransmittanceMeasure::IfcThermalTransmittanceMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcThermalTransmittanceMeasure::IfcThermalTransmittanceMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcThermalTransmittanceMeasure); e->setArgument(0, v); entity = e; }
+IfcThermalTransmittanceMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcThermodynamicTemperatureMeasure
+IfcUtil::ArgumentType IfcThermodynamicTemperatureMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcThermodynamicTemperatureMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcThermodynamicTemperatureMeasure::is(Type::Enum v) const { return v == IfcThermodynamicTemperatureMeasure::Class(); }
+Type::Enum IfcThermodynamicTemperatureMeasure::type() const { return Type::IfcThermodynamicTemperatureMeasure; }
+Type::Enum IfcThermodynamicTemperatureMeasure::Class() { return Type::IfcThermodynamicTemperatureMeasure; }
+IfcThermodynamicTemperatureMeasure::IfcThermodynamicTemperatureMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcThermodynamicTemperatureMeasure::IfcThermodynamicTemperatureMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcThermodynamicTemperatureMeasure); e->setArgument(0, v); entity = e; }
+IfcThermodynamicTemperatureMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcTime
+IfcUtil::ArgumentType IfcTime::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_STRING; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcTime::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcTime::is(Type::Enum v) const { return v == IfcTime::Class(); }
+Type::Enum IfcTime::type() const { return Type::IfcTime; }
+Type::Enum IfcTime::Class() { return Type::IfcTime; }
+IfcTime::IfcTime(IfcAbstractEntity* e) { entity = e; }
+IfcTime::IfcTime(std::string v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcTime); e->setArgument(0, v); entity = e; }
+IfcTime::operator std::string() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcTimeMeasure
+IfcUtil::ArgumentType IfcTimeMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcTimeMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcTimeMeasure::is(Type::Enum v) const { return v == IfcTimeMeasure::Class(); }
+Type::Enum IfcTimeMeasure::type() const { return Type::IfcTimeMeasure; }
+Type::Enum IfcTimeMeasure::Class() { return Type::IfcTimeMeasure; }
+IfcTimeMeasure::IfcTimeMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcTimeMeasure::IfcTimeMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcTimeMeasure); e->setArgument(0, v); entity = e; }
+IfcTimeMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcTimeStamp
+IfcUtil::ArgumentType IfcTimeStamp::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_INT; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcTimeStamp::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcTimeStamp::is(Type::Enum v) const { return v == IfcTimeStamp::Class(); }
+Type::Enum IfcTimeStamp::type() const { return Type::IfcTimeStamp; }
+Type::Enum IfcTimeStamp::Class() { return Type::IfcTimeStamp; }
+IfcTimeStamp::IfcTimeStamp(IfcAbstractEntity* e) { entity = e; }
+IfcTimeStamp::IfcTimeStamp(int v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcTimeStamp); e->setArgument(0, v); entity = e; }
+IfcTimeStamp::operator int() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcTorqueMeasure
+IfcUtil::ArgumentType IfcTorqueMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcTorqueMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcTorqueMeasure::is(Type::Enum v) const { return v == IfcTorqueMeasure::Class(); }
+Type::Enum IfcTorqueMeasure::type() const { return Type::IfcTorqueMeasure; }
+Type::Enum IfcTorqueMeasure::Class() { return Type::IfcTorqueMeasure; }
+IfcTorqueMeasure::IfcTorqueMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcTorqueMeasure::IfcTorqueMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcTorqueMeasure); e->setArgument(0, v); entity = e; }
+IfcTorqueMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcURIReference
+IfcUtil::ArgumentType IfcURIReference::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_STRING; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcURIReference::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcURIReference::is(Type::Enum v) const { return v == IfcURIReference::Class(); }
+Type::Enum IfcURIReference::type() const { return Type::IfcURIReference; }
+Type::Enum IfcURIReference::Class() { return Type::IfcURIReference; }
+IfcURIReference::IfcURIReference(IfcAbstractEntity* e) { entity = e; }
+IfcURIReference::IfcURIReference(std::string v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcURIReference); e->setArgument(0, v); entity = e; }
+IfcURIReference::operator std::string() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcVaporPermeabilityMeasure
+IfcUtil::ArgumentType IfcVaporPermeabilityMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcVaporPermeabilityMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcVaporPermeabilityMeasure::is(Type::Enum v) const { return v == IfcVaporPermeabilityMeasure::Class(); }
+Type::Enum IfcVaporPermeabilityMeasure::type() const { return Type::IfcVaporPermeabilityMeasure; }
+Type::Enum IfcVaporPermeabilityMeasure::Class() { return Type::IfcVaporPermeabilityMeasure; }
+IfcVaporPermeabilityMeasure::IfcVaporPermeabilityMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcVaporPermeabilityMeasure::IfcVaporPermeabilityMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcVaporPermeabilityMeasure); e->setArgument(0, v); entity = e; }
+IfcVaporPermeabilityMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcVolumeMeasure
+IfcUtil::ArgumentType IfcVolumeMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcVolumeMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcVolumeMeasure::is(Type::Enum v) const { return v == IfcVolumeMeasure::Class(); }
+Type::Enum IfcVolumeMeasure::type() const { return Type::IfcVolumeMeasure; }
+Type::Enum IfcVolumeMeasure::Class() { return Type::IfcVolumeMeasure; }
+IfcVolumeMeasure::IfcVolumeMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcVolumeMeasure::IfcVolumeMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcVolumeMeasure); e->setArgument(0, v); entity = e; }
+IfcVolumeMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcVolumetricFlowRateMeasure
+IfcUtil::ArgumentType IfcVolumetricFlowRateMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcVolumetricFlowRateMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcVolumetricFlowRateMeasure::is(Type::Enum v) const { return v == IfcVolumetricFlowRateMeasure::Class(); }
+Type::Enum IfcVolumetricFlowRateMeasure::type() const { return Type::IfcVolumetricFlowRateMeasure; }
+Type::Enum IfcVolumetricFlowRateMeasure::Class() { return Type::IfcVolumetricFlowRateMeasure; }
+IfcVolumetricFlowRateMeasure::IfcVolumetricFlowRateMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcVolumetricFlowRateMeasure::IfcVolumetricFlowRateMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcVolumetricFlowRateMeasure); e->setArgument(0, v); entity = e; }
+IfcVolumetricFlowRateMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcWarpingConstantMeasure
+IfcUtil::ArgumentType IfcWarpingConstantMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcWarpingConstantMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcWarpingConstantMeasure::is(Type::Enum v) const { return v == IfcWarpingConstantMeasure::Class(); }
+Type::Enum IfcWarpingConstantMeasure::type() const { return Type::IfcWarpingConstantMeasure; }
+Type::Enum IfcWarpingConstantMeasure::Class() { return Type::IfcWarpingConstantMeasure; }
+IfcWarpingConstantMeasure::IfcWarpingConstantMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcWarpingConstantMeasure::IfcWarpingConstantMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcWarpingConstantMeasure); e->setArgument(0, v); entity = e; }
+IfcWarpingConstantMeasure::operator double() const { return *entity->getArgument(0); }
+
+// Function implementations for IfcWarpingMomentMeasure
+IfcUtil::ArgumentType IfcWarpingMomentMeasure::getArgumentType(unsigned int i) const { if (i == 0) { return IfcUtil::Argument_DOUBLE; } else { throw IfcParse::IfcException("argument out of range"); } }
+Argument* IfcWarpingMomentMeasure::getArgument(unsigned int i) const { return entity->getArgument(i); }
+bool IfcWarpingMomentMeasure::is(Type::Enum v) const { return v == IfcWarpingMomentMeasure::Class(); }
+Type::Enum IfcWarpingMomentMeasure::type() const { return Type::IfcWarpingMomentMeasure; }
+Type::Enum IfcWarpingMomentMeasure::Class() { return Type::IfcWarpingMomentMeasure; }
+IfcWarpingMomentMeasure::IfcWarpingMomentMeasure(IfcAbstractEntity* e) { entity = e; }
+IfcWarpingMomentMeasure::IfcWarpingMomentMeasure(double v) { IfcWritableEntity* e = new IfcWritableEntity(Type::IfcWarpingMomentMeasure); e->setArgument(0, v); entity = e; }
+IfcWarpingMomentMeasure::operator double() const { return *entity->getArgument(0); }
 
-#define RETURN_AS_SINGLE(T,a)     return reinterpret_pointer_cast<IfcBaseClass,T>(*entity->getArgument(a));
-
-#define RETURN_AS_LIST(T,a)      IfcEntities e = *entity->getArgument(a);      SHARED_PTR< IfcTemplatedEntityList<T> > l ( new IfcTemplatedEntityList<T>() );      for ( IfcEntityList::it it = e->begin(); it != e->end(); ++ it ) {          l->push(reinterpret_pointer_cast<IfcBaseClass,T>(*it));     }      return l;
 
 // Function implementations for IfcActionRequest
-bool IfcActionRequest::hasPredefinedType() { return !entity->getArgument(6)->isNull(); }
-IfcActionRequestTypeEnum::IfcActionRequestTypeEnum IfcActionRequest::PredefinedType() { return IfcActionRequestTypeEnum::FromString(*entity->getArgument(6)); }
+bool IfcActionRequest::hasPredefinedType() const { return !entity->getArgument(6)->isNull(); }
+IfcActionRequestTypeEnum::IfcActionRequestTypeEnum IfcActionRequest::PredefinedType() const { return IfcActionRequestTypeEnum::FromString(*entity->getArgument(6)); }
 void IfcActionRequest::setPredefinedType(IfcActionRequestTypeEnum::IfcActionRequestTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v,IfcActionRequestTypeEnum::ToString(v)); }
-bool IfcActionRequest::hasStatus() { return !entity->getArgument(7)->isNull(); }
-IfcLabel IfcActionRequest::Status() { return *entity->getArgument(7); }
-void IfcActionRequest::setStatus(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
-bool IfcActionRequest::hasLongDescription() { return !entity->getArgument(8)->isNull(); }
-IfcText IfcActionRequest::LongDescription() { return *entity->getArgument(8); }
-void IfcActionRequest::setLongDescription(IfcText v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
+bool IfcActionRequest::hasStatus() const { return !entity->getArgument(7)->isNull(); }
+std::string IfcActionRequest::Status() const { return *entity->getArgument(7); }
+void IfcActionRequest::setStatus(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
+bool IfcActionRequest::hasLongDescription() const { return !entity->getArgument(8)->isNull(); }
+std::string IfcActionRequest::LongDescription() const { return *entity->getArgument(8); }
+void IfcActionRequest::setLongDescription(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
 bool IfcActionRequest::is(Type::Enum v) const { return v == Type::IfcActionRequest || IfcControl::is(v); }
 Type::Enum IfcActionRequest::type() const { return Type::IfcActionRequest; }
 Type::Enum IfcActionRequest::Class() { return Type::IfcActionRequest; }
-IfcActionRequest::IfcActionRequest(IfcAbstractEntityPtr e) : IfcControl((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcActionRequest)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcActionRequest::IfcActionRequest(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, boost::optional< IfcIdentifier > v6_Identification, boost::optional< IfcActionRequestTypeEnum::IfcActionRequestTypeEnum > v7_PredefinedType, boost::optional< IfcLabel > v8_Status, boost::optional< IfcText > v9_LongDescription) : IfcControl((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } if (v6_Identification) { e->setArgument(5,(*v6_Identification)); } else { e->setArgument(5); } if (v7_PredefinedType) { e->setArgument(6,*v7_PredefinedType,IfcActionRequestTypeEnum::ToString(*v7_PredefinedType)); } else { e->setArgument(6); } if (v8_Status) { e->setArgument(7,(*v8_Status)); } else { e->setArgument(7); } if (v9_LongDescription) { e->setArgument(8,(*v9_LongDescription)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcActionRequest::IfcActionRequest(IfcAbstractEntity* e) : IfcControl((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcActionRequest)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcActionRequest::IfcActionRequest(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, boost::optional< std::string > v6_Identification, boost::optional< IfcActionRequestTypeEnum::IfcActionRequestTypeEnum > v7_PredefinedType, boost::optional< std::string > v8_Status, boost::optional< std::string > v9_LongDescription) : IfcControl((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } if (v6_Identification) { e->setArgument(5,(*v6_Identification)); } else { e->setArgument(5); } if (v7_PredefinedType) { e->setArgument(6,*v7_PredefinedType,IfcActionRequestTypeEnum::ToString(*v7_PredefinedType)); } else { e->setArgument(6); } if (v8_Status) { e->setArgument(7,(*v8_Status)); } else { e->setArgument(7); } if (v9_LongDescription) { e->setArgument(8,(*v9_LongDescription)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcActor
-IfcActorSelect IfcActor::TheActor() { return *entity->getArgument(5); }
-void IfcActor::setTheActor(IfcActorSelect v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-IfcRelAssignsToActor::list IfcActor::IsActingUpon() { RETURN_INVERSE(IfcRelAssignsToActor) }
+IfcActorSelect* IfcActor::TheActor() const { return (IfcActorSelect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(5))); }
+void IfcActor::setTheActor(IfcActorSelect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+IfcRelAssignsToActor::list::ptr IfcActor::IsActingUpon() const { return entity->getInverse(Type::IfcRelAssignsToActor, 6)->as<IfcRelAssignsToActor>(); }
 bool IfcActor::is(Type::Enum v) const { return v == Type::IfcActor || IfcObject::is(v); }
 Type::Enum IfcActor::type() const { return Type::IfcActor; }
 Type::Enum IfcActor::Class() { return Type::IfcActor; }
-IfcActor::IfcActor(IfcAbstractEntityPtr e) : IfcObject((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcActor)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcActor::IfcActor(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcActorSelect v6_TheActor) : IfcObject((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_TheActor)); entity = e; EntityBuffer::Add(this); }
+IfcActor::IfcActor(IfcAbstractEntity* e) : IfcObject((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcActor)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcActor::IfcActor(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcActorSelect* v6_TheActor) : IfcObject((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_TheActor)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcActorRole
-IfcRoleEnum::IfcRoleEnum IfcActorRole::Role() { return IfcRoleEnum::FromString(*entity->getArgument(0)); }
+IfcRoleEnum::IfcRoleEnum IfcActorRole::Role() const { return IfcRoleEnum::FromString(*entity->getArgument(0)); }
 void IfcActorRole::setRole(IfcRoleEnum::IfcRoleEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v,IfcRoleEnum::ToString(v)); }
-bool IfcActorRole::hasUserDefinedRole() { return !entity->getArgument(1)->isNull(); }
-IfcLabel IfcActorRole::UserDefinedRole() { return *entity->getArgument(1); }
-void IfcActorRole::setUserDefinedRole(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-bool IfcActorRole::hasDescription() { return !entity->getArgument(2)->isNull(); }
-IfcText IfcActorRole::Description() { return *entity->getArgument(2); }
-void IfcActorRole::setDescription(IfcText v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-IfcExternalReferenceRelationship::list IfcActorRole::HasExternalReference() { RETURN_INVERSE(IfcExternalReferenceRelationship) }
+bool IfcActorRole::hasUserDefinedRole() const { return !entity->getArgument(1)->isNull(); }
+std::string IfcActorRole::UserDefinedRole() const { return *entity->getArgument(1); }
+void IfcActorRole::setUserDefinedRole(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+bool IfcActorRole::hasDescription() const { return !entity->getArgument(2)->isNull(); }
+std::string IfcActorRole::Description() const { return *entity->getArgument(2); }
+void IfcActorRole::setDescription(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+IfcExternalReferenceRelationship::list::ptr IfcActorRole::HasExternalReference() const { return entity->getInverse(Type::IfcExternalReferenceRelationship, 3)->as<IfcExternalReferenceRelationship>(); }
 bool IfcActorRole::is(Type::Enum v) const { return v == Type::IfcActorRole; }
 Type::Enum IfcActorRole::type() const { return Type::IfcActorRole; }
 Type::Enum IfcActorRole::Class() { return Type::IfcActorRole; }
-IfcActorRole::IfcActorRole(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcActorRole)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcActorRole::IfcActorRole(IfcRoleEnum::IfcRoleEnum v1_Role, boost::optional< IfcLabel > v2_UserDefinedRole, boost::optional< IfcText > v3_Description) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,v1_Role,IfcRoleEnum::ToString(v1_Role)); if (v2_UserDefinedRole) { e->setArgument(1,(*v2_UserDefinedRole)); } else { e->setArgument(1); } if (v3_Description) { e->setArgument(2,(*v3_Description)); } else { e->setArgument(2); } entity = e; EntityBuffer::Add(this); }
+IfcActorRole::IfcActorRole(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcActorRole)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcActorRole::IfcActorRole(IfcRoleEnum::IfcRoleEnum v1_Role, boost::optional< std::string > v2_UserDefinedRole, boost::optional< std::string > v3_Description) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,v1_Role,IfcRoleEnum::ToString(v1_Role)); if (v2_UserDefinedRole) { e->setArgument(1,(*v2_UserDefinedRole)); } else { e->setArgument(1); } if (v3_Description) { e->setArgument(2,(*v3_Description)); } else { e->setArgument(2); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcActuator
-bool IfcActuator::hasPredefinedType() { return !entity->getArgument(8)->isNull(); }
-IfcActuatorTypeEnum::IfcActuatorTypeEnum IfcActuator::PredefinedType() { return IfcActuatorTypeEnum::FromString(*entity->getArgument(8)); }
+bool IfcActuator::hasPredefinedType() const { return !entity->getArgument(8)->isNull(); }
+IfcActuatorTypeEnum::IfcActuatorTypeEnum IfcActuator::PredefinedType() const { return IfcActuatorTypeEnum::FromString(*entity->getArgument(8)); }
 void IfcActuator::setPredefinedType(IfcActuatorTypeEnum::IfcActuatorTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcActuatorTypeEnum::ToString(v)); }
 bool IfcActuator::is(Type::Enum v) const { return v == Type::IfcActuator || IfcDistributionControlElement::is(v); }
 Type::Enum IfcActuator::type() const { return Type::IfcActuator; }
 Type::Enum IfcActuator::Class() { return Type::IfcActuator; }
-IfcActuator::IfcActuator(IfcAbstractEntityPtr e) : IfcDistributionControlElement((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcActuator)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcActuator::IfcActuator(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcActuatorTypeEnum::IfcActuatorTypeEnum > v9_PredefinedType) : IfcDistributionControlElement((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcActuatorTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcActuator::IfcActuator(IfcAbstractEntity* e) : IfcDistributionControlElement((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcActuator)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcActuator::IfcActuator(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcActuatorTypeEnum::IfcActuatorTypeEnum > v9_PredefinedType) : IfcDistributionControlElement((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcActuatorTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcActuatorType
-IfcActuatorTypeEnum::IfcActuatorTypeEnum IfcActuatorType::PredefinedType() { return IfcActuatorTypeEnum::FromString(*entity->getArgument(9)); }
+IfcActuatorTypeEnum::IfcActuatorTypeEnum IfcActuatorType::PredefinedType() const { return IfcActuatorTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcActuatorType::setPredefinedType(IfcActuatorTypeEnum::IfcActuatorTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcActuatorTypeEnum::ToString(v)); }
 bool IfcActuatorType::is(Type::Enum v) const { return v == Type::IfcActuatorType || IfcDistributionControlElementType::is(v); }
 Type::Enum IfcActuatorType::type() const { return Type::IfcActuatorType; }
 Type::Enum IfcActuatorType::Class() { return Type::IfcActuatorType; }
-IfcActuatorType::IfcActuatorType(IfcAbstractEntityPtr e) : IfcDistributionControlElementType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcActuatorType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcActuatorType::IfcActuatorType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcActuatorTypeEnum::IfcActuatorTypeEnum v10_PredefinedType) : IfcDistributionControlElementType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcActuatorTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcActuatorType::IfcActuatorType(IfcAbstractEntity* e) : IfcDistributionControlElementType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcActuatorType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcActuatorType::IfcActuatorType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcActuatorTypeEnum::IfcActuatorTypeEnum v10_PredefinedType) : IfcDistributionControlElementType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcActuatorTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcAddress
-bool IfcAddress::hasPurpose() { return !entity->getArgument(0)->isNull(); }
-IfcAddressTypeEnum::IfcAddressTypeEnum IfcAddress::Purpose() { return IfcAddressTypeEnum::FromString(*entity->getArgument(0)); }
+bool IfcAddress::hasPurpose() const { return !entity->getArgument(0)->isNull(); }
+IfcAddressTypeEnum::IfcAddressTypeEnum IfcAddress::Purpose() const { return IfcAddressTypeEnum::FromString(*entity->getArgument(0)); }
 void IfcAddress::setPurpose(IfcAddressTypeEnum::IfcAddressTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v,IfcAddressTypeEnum::ToString(v)); }
-bool IfcAddress::hasDescription() { return !entity->getArgument(1)->isNull(); }
-IfcText IfcAddress::Description() { return *entity->getArgument(1); }
-void IfcAddress::setDescription(IfcText v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-bool IfcAddress::hasUserDefinedPurpose() { return !entity->getArgument(2)->isNull(); }
-IfcLabel IfcAddress::UserDefinedPurpose() { return *entity->getArgument(2); }
-void IfcAddress::setUserDefinedPurpose(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-IfcPerson::list IfcAddress::OfPerson() { RETURN_INVERSE(IfcPerson) }
-IfcOrganization::list IfcAddress::OfOrganization() { RETURN_INVERSE(IfcOrganization) }
+bool IfcAddress::hasDescription() const { return !entity->getArgument(1)->isNull(); }
+std::string IfcAddress::Description() const { return *entity->getArgument(1); }
+void IfcAddress::setDescription(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+bool IfcAddress::hasUserDefinedPurpose() const { return !entity->getArgument(2)->isNull(); }
+std::string IfcAddress::UserDefinedPurpose() const { return *entity->getArgument(2); }
+void IfcAddress::setUserDefinedPurpose(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+IfcPerson::list::ptr IfcAddress::OfPerson() const { return entity->getInverse(Type::IfcPerson, 7)->as<IfcPerson>(); }
+IfcOrganization::list::ptr IfcAddress::OfOrganization() const { return entity->getInverse(Type::IfcOrganization, 4)->as<IfcOrganization>(); }
 bool IfcAddress::is(Type::Enum v) const { return v == Type::IfcAddress; }
 Type::Enum IfcAddress::type() const { return Type::IfcAddress; }
 Type::Enum IfcAddress::Class() { return Type::IfcAddress; }
-IfcAddress::IfcAddress(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcAddress)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcAddress::IfcAddress(boost::optional< IfcAddressTypeEnum::IfcAddressTypeEnum > v1_Purpose, boost::optional< IfcText > v2_Description, boost::optional< IfcLabel > v3_UserDefinedPurpose) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Purpose) { e->setArgument(0,*v1_Purpose,IfcAddressTypeEnum::ToString(*v1_Purpose)); } else { e->setArgument(0); } if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } if (v3_UserDefinedPurpose) { e->setArgument(2,(*v3_UserDefinedPurpose)); } else { e->setArgument(2); } entity = e; EntityBuffer::Add(this); }
+IfcAddress::IfcAddress(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcAddress)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcAddress::IfcAddress(boost::optional< IfcAddressTypeEnum::IfcAddressTypeEnum > v1_Purpose, boost::optional< std::string > v2_Description, boost::optional< std::string > v3_UserDefinedPurpose) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Purpose) { e->setArgument(0,*v1_Purpose,IfcAddressTypeEnum::ToString(*v1_Purpose)); } else { e->setArgument(0); } if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } if (v3_UserDefinedPurpose) { e->setArgument(2,(*v3_UserDefinedPurpose)); } else { e->setArgument(2); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcAdvancedBrep
 bool IfcAdvancedBrep::is(Type::Enum v) const { return v == Type::IfcAdvancedBrep || IfcManifoldSolidBrep::is(v); }
 Type::Enum IfcAdvancedBrep::type() const { return Type::IfcAdvancedBrep; }
 Type::Enum IfcAdvancedBrep::Class() { return Type::IfcAdvancedBrep; }
-IfcAdvancedBrep::IfcAdvancedBrep(IfcAbstractEntityPtr e) : IfcManifoldSolidBrep((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcAdvancedBrep)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcAdvancedBrep::IfcAdvancedBrep(IfcClosedShell* v1_Outer) : IfcManifoldSolidBrep((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Outer)); entity = e; EntityBuffer::Add(this); }
+IfcAdvancedBrep::IfcAdvancedBrep(IfcAbstractEntity* e) : IfcManifoldSolidBrep((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcAdvancedBrep)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcAdvancedBrep::IfcAdvancedBrep(IfcClosedShell* v1_Outer) : IfcManifoldSolidBrep((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Outer)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcAdvancedBrepWithVoids
-SHARED_PTR< IfcTemplatedEntityList< IfcClosedShell > > IfcAdvancedBrepWithVoids::Voids() { RETURN_AS_LIST(IfcClosedShell,1) }
-void IfcAdvancedBrepWithVoids::setVoids(SHARED_PTR< IfcTemplatedEntityList< IfcClosedShell > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v->generalize()); }
+IfcTemplatedEntityList< IfcClosedShell >::ptr IfcAdvancedBrepWithVoids::Voids() const { IfcEntityList::ptr es = *entity->getArgument(1); return es->as<IfcClosedShell>(); }
+void IfcAdvancedBrepWithVoids::setVoids(IfcTemplatedEntityList< IfcClosedShell >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v->generalize()); }
 bool IfcAdvancedBrepWithVoids::is(Type::Enum v) const { return v == Type::IfcAdvancedBrepWithVoids || IfcAdvancedBrep::is(v); }
 Type::Enum IfcAdvancedBrepWithVoids::type() const { return Type::IfcAdvancedBrepWithVoids; }
 Type::Enum IfcAdvancedBrepWithVoids::Class() { return Type::IfcAdvancedBrepWithVoids; }
-IfcAdvancedBrepWithVoids::IfcAdvancedBrepWithVoids(IfcAbstractEntityPtr e) : IfcAdvancedBrep((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcAdvancedBrepWithVoids)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcAdvancedBrepWithVoids::IfcAdvancedBrepWithVoids(IfcClosedShell* v1_Outer, SHARED_PTR< IfcTemplatedEntityList< IfcClosedShell > > v2_Voids) : IfcAdvancedBrep((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Outer)); e->setArgument(1,(v2_Voids)->generalize()); entity = e; EntityBuffer::Add(this); }
+IfcAdvancedBrepWithVoids::IfcAdvancedBrepWithVoids(IfcAbstractEntity* e) : IfcAdvancedBrep((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcAdvancedBrepWithVoids)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcAdvancedBrepWithVoids::IfcAdvancedBrepWithVoids(IfcClosedShell* v1_Outer, IfcTemplatedEntityList< IfcClosedShell >::ptr v2_Voids) : IfcAdvancedBrep((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Outer)); e->setArgument(1,(v2_Voids)->generalize()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcAdvancedFace
 bool IfcAdvancedFace::is(Type::Enum v) const { return v == Type::IfcAdvancedFace || IfcFaceSurface::is(v); }
 Type::Enum IfcAdvancedFace::type() const { return Type::IfcAdvancedFace; }
 Type::Enum IfcAdvancedFace::Class() { return Type::IfcAdvancedFace; }
-IfcAdvancedFace::IfcAdvancedFace(IfcAbstractEntityPtr e) : IfcFaceSurface((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcAdvancedFace)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcAdvancedFace::IfcAdvancedFace(SHARED_PTR< IfcTemplatedEntityList< IfcFaceBound > > v1_Bounds, IfcSurface* v2_FaceSurface, bool v3_SameSense) : IfcFaceSurface((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Bounds)->generalize()); e->setArgument(1,(v2_FaceSurface)); e->setArgument(2,(v3_SameSense)); entity = e; EntityBuffer::Add(this); }
+IfcAdvancedFace::IfcAdvancedFace(IfcAbstractEntity* e) : IfcFaceSurface((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcAdvancedFace)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcAdvancedFace::IfcAdvancedFace(IfcTemplatedEntityList< IfcFaceBound >::ptr v1_Bounds, IfcSurface* v2_FaceSurface, bool v3_SameSense) : IfcFaceSurface((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Bounds)->generalize()); e->setArgument(1,(v2_FaceSurface)); e->setArgument(2,(v3_SameSense)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcAirTerminal
-bool IfcAirTerminal::hasPredefinedType() { return !entity->getArgument(8)->isNull(); }
-IfcAirTerminalTypeEnum::IfcAirTerminalTypeEnum IfcAirTerminal::PredefinedType() { return IfcAirTerminalTypeEnum::FromString(*entity->getArgument(8)); }
+bool IfcAirTerminal::hasPredefinedType() const { return !entity->getArgument(8)->isNull(); }
+IfcAirTerminalTypeEnum::IfcAirTerminalTypeEnum IfcAirTerminal::PredefinedType() const { return IfcAirTerminalTypeEnum::FromString(*entity->getArgument(8)); }
 void IfcAirTerminal::setPredefinedType(IfcAirTerminalTypeEnum::IfcAirTerminalTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcAirTerminalTypeEnum::ToString(v)); }
 bool IfcAirTerminal::is(Type::Enum v) const { return v == Type::IfcAirTerminal || IfcFlowTerminal::is(v); }
 Type::Enum IfcAirTerminal::type() const { return Type::IfcAirTerminal; }
 Type::Enum IfcAirTerminal::Class() { return Type::IfcAirTerminal; }
-IfcAirTerminal::IfcAirTerminal(IfcAbstractEntityPtr e) : IfcFlowTerminal((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcAirTerminal)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcAirTerminal::IfcAirTerminal(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcAirTerminalTypeEnum::IfcAirTerminalTypeEnum > v9_PredefinedType) : IfcFlowTerminal((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcAirTerminalTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcAirTerminal::IfcAirTerminal(IfcAbstractEntity* e) : IfcFlowTerminal((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcAirTerminal)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcAirTerminal::IfcAirTerminal(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcAirTerminalTypeEnum::IfcAirTerminalTypeEnum > v9_PredefinedType) : IfcFlowTerminal((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcAirTerminalTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcAirTerminalBox
-bool IfcAirTerminalBox::hasPredefinedType() { return !entity->getArgument(8)->isNull(); }
-IfcAirTerminalBoxTypeEnum::IfcAirTerminalBoxTypeEnum IfcAirTerminalBox::PredefinedType() { return IfcAirTerminalBoxTypeEnum::FromString(*entity->getArgument(8)); }
+bool IfcAirTerminalBox::hasPredefinedType() const { return !entity->getArgument(8)->isNull(); }
+IfcAirTerminalBoxTypeEnum::IfcAirTerminalBoxTypeEnum IfcAirTerminalBox::PredefinedType() const { return IfcAirTerminalBoxTypeEnum::FromString(*entity->getArgument(8)); }
 void IfcAirTerminalBox::setPredefinedType(IfcAirTerminalBoxTypeEnum::IfcAirTerminalBoxTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcAirTerminalBoxTypeEnum::ToString(v)); }
 bool IfcAirTerminalBox::is(Type::Enum v) const { return v == Type::IfcAirTerminalBox || IfcFlowController::is(v); }
 Type::Enum IfcAirTerminalBox::type() const { return Type::IfcAirTerminalBox; }
 Type::Enum IfcAirTerminalBox::Class() { return Type::IfcAirTerminalBox; }
-IfcAirTerminalBox::IfcAirTerminalBox(IfcAbstractEntityPtr e) : IfcFlowController((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcAirTerminalBox)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcAirTerminalBox::IfcAirTerminalBox(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcAirTerminalBoxTypeEnum::IfcAirTerminalBoxTypeEnum > v9_PredefinedType) : IfcFlowController((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcAirTerminalBoxTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcAirTerminalBox::IfcAirTerminalBox(IfcAbstractEntity* e) : IfcFlowController((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcAirTerminalBox)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcAirTerminalBox::IfcAirTerminalBox(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcAirTerminalBoxTypeEnum::IfcAirTerminalBoxTypeEnum > v9_PredefinedType) : IfcFlowController((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcAirTerminalBoxTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcAirTerminalBoxType
-IfcAirTerminalBoxTypeEnum::IfcAirTerminalBoxTypeEnum IfcAirTerminalBoxType::PredefinedType() { return IfcAirTerminalBoxTypeEnum::FromString(*entity->getArgument(9)); }
+IfcAirTerminalBoxTypeEnum::IfcAirTerminalBoxTypeEnum IfcAirTerminalBoxType::PredefinedType() const { return IfcAirTerminalBoxTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcAirTerminalBoxType::setPredefinedType(IfcAirTerminalBoxTypeEnum::IfcAirTerminalBoxTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcAirTerminalBoxTypeEnum::ToString(v)); }
 bool IfcAirTerminalBoxType::is(Type::Enum v) const { return v == Type::IfcAirTerminalBoxType || IfcFlowControllerType::is(v); }
 Type::Enum IfcAirTerminalBoxType::type() const { return Type::IfcAirTerminalBoxType; }
 Type::Enum IfcAirTerminalBoxType::Class() { return Type::IfcAirTerminalBoxType; }
-IfcAirTerminalBoxType::IfcAirTerminalBoxType(IfcAbstractEntityPtr e) : IfcFlowControllerType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcAirTerminalBoxType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcAirTerminalBoxType::IfcAirTerminalBoxType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcAirTerminalBoxTypeEnum::IfcAirTerminalBoxTypeEnum v10_PredefinedType) : IfcFlowControllerType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcAirTerminalBoxTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcAirTerminalBoxType::IfcAirTerminalBoxType(IfcAbstractEntity* e) : IfcFlowControllerType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcAirTerminalBoxType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcAirTerminalBoxType::IfcAirTerminalBoxType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcAirTerminalBoxTypeEnum::IfcAirTerminalBoxTypeEnum v10_PredefinedType) : IfcFlowControllerType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcAirTerminalBoxTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcAirTerminalType
-IfcAirTerminalTypeEnum::IfcAirTerminalTypeEnum IfcAirTerminalType::PredefinedType() { return IfcAirTerminalTypeEnum::FromString(*entity->getArgument(9)); }
+IfcAirTerminalTypeEnum::IfcAirTerminalTypeEnum IfcAirTerminalType::PredefinedType() const { return IfcAirTerminalTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcAirTerminalType::setPredefinedType(IfcAirTerminalTypeEnum::IfcAirTerminalTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcAirTerminalTypeEnum::ToString(v)); }
 bool IfcAirTerminalType::is(Type::Enum v) const { return v == Type::IfcAirTerminalType || IfcFlowTerminalType::is(v); }
 Type::Enum IfcAirTerminalType::type() const { return Type::IfcAirTerminalType; }
 Type::Enum IfcAirTerminalType::Class() { return Type::IfcAirTerminalType; }
-IfcAirTerminalType::IfcAirTerminalType(IfcAbstractEntityPtr e) : IfcFlowTerminalType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcAirTerminalType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcAirTerminalType::IfcAirTerminalType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcAirTerminalTypeEnum::IfcAirTerminalTypeEnum v10_PredefinedType) : IfcFlowTerminalType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcAirTerminalTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcAirTerminalType::IfcAirTerminalType(IfcAbstractEntity* e) : IfcFlowTerminalType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcAirTerminalType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcAirTerminalType::IfcAirTerminalType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcAirTerminalTypeEnum::IfcAirTerminalTypeEnum v10_PredefinedType) : IfcFlowTerminalType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcAirTerminalTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcAirToAirHeatRecovery
-bool IfcAirToAirHeatRecovery::hasPredefinedType() { return !entity->getArgument(8)->isNull(); }
-IfcAirToAirHeatRecoveryTypeEnum::IfcAirToAirHeatRecoveryTypeEnum IfcAirToAirHeatRecovery::PredefinedType() { return IfcAirToAirHeatRecoveryTypeEnum::FromString(*entity->getArgument(8)); }
+bool IfcAirToAirHeatRecovery::hasPredefinedType() const { return !entity->getArgument(8)->isNull(); }
+IfcAirToAirHeatRecoveryTypeEnum::IfcAirToAirHeatRecoveryTypeEnum IfcAirToAirHeatRecovery::PredefinedType() const { return IfcAirToAirHeatRecoveryTypeEnum::FromString(*entity->getArgument(8)); }
 void IfcAirToAirHeatRecovery::setPredefinedType(IfcAirToAirHeatRecoveryTypeEnum::IfcAirToAirHeatRecoveryTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcAirToAirHeatRecoveryTypeEnum::ToString(v)); }
 bool IfcAirToAirHeatRecovery::is(Type::Enum v) const { return v == Type::IfcAirToAirHeatRecovery || IfcEnergyConversionDevice::is(v); }
 Type::Enum IfcAirToAirHeatRecovery::type() const { return Type::IfcAirToAirHeatRecovery; }
 Type::Enum IfcAirToAirHeatRecovery::Class() { return Type::IfcAirToAirHeatRecovery; }
-IfcAirToAirHeatRecovery::IfcAirToAirHeatRecovery(IfcAbstractEntityPtr e) : IfcEnergyConversionDevice((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcAirToAirHeatRecovery)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcAirToAirHeatRecovery::IfcAirToAirHeatRecovery(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcAirToAirHeatRecoveryTypeEnum::IfcAirToAirHeatRecoveryTypeEnum > v9_PredefinedType) : IfcEnergyConversionDevice((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcAirToAirHeatRecoveryTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcAirToAirHeatRecovery::IfcAirToAirHeatRecovery(IfcAbstractEntity* e) : IfcEnergyConversionDevice((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcAirToAirHeatRecovery)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcAirToAirHeatRecovery::IfcAirToAirHeatRecovery(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcAirToAirHeatRecoveryTypeEnum::IfcAirToAirHeatRecoveryTypeEnum > v9_PredefinedType) : IfcEnergyConversionDevice((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcAirToAirHeatRecoveryTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcAirToAirHeatRecoveryType
-IfcAirToAirHeatRecoveryTypeEnum::IfcAirToAirHeatRecoveryTypeEnum IfcAirToAirHeatRecoveryType::PredefinedType() { return IfcAirToAirHeatRecoveryTypeEnum::FromString(*entity->getArgument(9)); }
+IfcAirToAirHeatRecoveryTypeEnum::IfcAirToAirHeatRecoveryTypeEnum IfcAirToAirHeatRecoveryType::PredefinedType() const { return IfcAirToAirHeatRecoveryTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcAirToAirHeatRecoveryType::setPredefinedType(IfcAirToAirHeatRecoveryTypeEnum::IfcAirToAirHeatRecoveryTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcAirToAirHeatRecoveryTypeEnum::ToString(v)); }
 bool IfcAirToAirHeatRecoveryType::is(Type::Enum v) const { return v == Type::IfcAirToAirHeatRecoveryType || IfcEnergyConversionDeviceType::is(v); }
 Type::Enum IfcAirToAirHeatRecoveryType::type() const { return Type::IfcAirToAirHeatRecoveryType; }
 Type::Enum IfcAirToAirHeatRecoveryType::Class() { return Type::IfcAirToAirHeatRecoveryType; }
-IfcAirToAirHeatRecoveryType::IfcAirToAirHeatRecoveryType(IfcAbstractEntityPtr e) : IfcEnergyConversionDeviceType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcAirToAirHeatRecoveryType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcAirToAirHeatRecoveryType::IfcAirToAirHeatRecoveryType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcAirToAirHeatRecoveryTypeEnum::IfcAirToAirHeatRecoveryTypeEnum v10_PredefinedType) : IfcEnergyConversionDeviceType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcAirToAirHeatRecoveryTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcAirToAirHeatRecoveryType::IfcAirToAirHeatRecoveryType(IfcAbstractEntity* e) : IfcEnergyConversionDeviceType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcAirToAirHeatRecoveryType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcAirToAirHeatRecoveryType::IfcAirToAirHeatRecoveryType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcAirToAirHeatRecoveryTypeEnum::IfcAirToAirHeatRecoveryTypeEnum v10_PredefinedType) : IfcEnergyConversionDeviceType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcAirToAirHeatRecoveryTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcAlarm
-bool IfcAlarm::hasPredefinedType() { return !entity->getArgument(8)->isNull(); }
-IfcAlarmTypeEnum::IfcAlarmTypeEnum IfcAlarm::PredefinedType() { return IfcAlarmTypeEnum::FromString(*entity->getArgument(8)); }
+bool IfcAlarm::hasPredefinedType() const { return !entity->getArgument(8)->isNull(); }
+IfcAlarmTypeEnum::IfcAlarmTypeEnum IfcAlarm::PredefinedType() const { return IfcAlarmTypeEnum::FromString(*entity->getArgument(8)); }
 void IfcAlarm::setPredefinedType(IfcAlarmTypeEnum::IfcAlarmTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcAlarmTypeEnum::ToString(v)); }
 bool IfcAlarm::is(Type::Enum v) const { return v == Type::IfcAlarm || IfcDistributionControlElement::is(v); }
 Type::Enum IfcAlarm::type() const { return Type::IfcAlarm; }
 Type::Enum IfcAlarm::Class() { return Type::IfcAlarm; }
-IfcAlarm::IfcAlarm(IfcAbstractEntityPtr e) : IfcDistributionControlElement((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcAlarm)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcAlarm::IfcAlarm(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcAlarmTypeEnum::IfcAlarmTypeEnum > v9_PredefinedType) : IfcDistributionControlElement((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcAlarmTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcAlarm::IfcAlarm(IfcAbstractEntity* e) : IfcDistributionControlElement((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcAlarm)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcAlarm::IfcAlarm(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcAlarmTypeEnum::IfcAlarmTypeEnum > v9_PredefinedType) : IfcDistributionControlElement((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcAlarmTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcAlarmType
-IfcAlarmTypeEnum::IfcAlarmTypeEnum IfcAlarmType::PredefinedType() { return IfcAlarmTypeEnum::FromString(*entity->getArgument(9)); }
+IfcAlarmTypeEnum::IfcAlarmTypeEnum IfcAlarmType::PredefinedType() const { return IfcAlarmTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcAlarmType::setPredefinedType(IfcAlarmTypeEnum::IfcAlarmTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcAlarmTypeEnum::ToString(v)); }
 bool IfcAlarmType::is(Type::Enum v) const { return v == Type::IfcAlarmType || IfcDistributionControlElementType::is(v); }
 Type::Enum IfcAlarmType::type() const { return Type::IfcAlarmType; }
 Type::Enum IfcAlarmType::Class() { return Type::IfcAlarmType; }
-IfcAlarmType::IfcAlarmType(IfcAbstractEntityPtr e) : IfcDistributionControlElementType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcAlarmType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcAlarmType::IfcAlarmType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcAlarmTypeEnum::IfcAlarmTypeEnum v10_PredefinedType) : IfcDistributionControlElementType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcAlarmTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcAlarmType::IfcAlarmType(IfcAbstractEntity* e) : IfcDistributionControlElementType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcAlarmType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcAlarmType::IfcAlarmType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcAlarmTypeEnum::IfcAlarmTypeEnum v10_PredefinedType) : IfcDistributionControlElementType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcAlarmTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcAnnotation
-IfcRelContainedInSpatialStructure::list IfcAnnotation::ContainedInStructure() { RETURN_INVERSE(IfcRelContainedInSpatialStructure) }
+IfcRelContainedInSpatialStructure::list::ptr IfcAnnotation::ContainedInStructure() const { return entity->getInverse(Type::IfcRelContainedInSpatialStructure, 4)->as<IfcRelContainedInSpatialStructure>(); }
 bool IfcAnnotation::is(Type::Enum v) const { return v == Type::IfcAnnotation || IfcProduct::is(v); }
 Type::Enum IfcAnnotation::type() const { return Type::IfcAnnotation; }
 Type::Enum IfcAnnotation::Class() { return Type::IfcAnnotation; }
-IfcAnnotation::IfcAnnotation(IfcAbstractEntityPtr e) : IfcProduct((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcAnnotation)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcAnnotation::IfcAnnotation(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation) : IfcProduct((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); entity = e; EntityBuffer::Add(this); }
+IfcAnnotation::IfcAnnotation(IfcAbstractEntity* e) : IfcProduct((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcAnnotation)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcAnnotation::IfcAnnotation(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation) : IfcProduct((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcAnnotationFillArea
-IfcCurve* IfcAnnotationFillArea::OuterBoundary() { return (IfcCurve*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(0))); }
+IfcCurve* IfcAnnotationFillArea::OuterBoundary() const { return (IfcCurve*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(0))); }
 void IfcAnnotationFillArea::setOuterBoundary(IfcCurve* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-bool IfcAnnotationFillArea::hasInnerBoundaries() { return !entity->getArgument(1)->isNull(); }
-SHARED_PTR< IfcTemplatedEntityList< IfcCurve > > IfcAnnotationFillArea::InnerBoundaries() { RETURN_AS_LIST(IfcCurve,1) }
-void IfcAnnotationFillArea::setInnerBoundaries(SHARED_PTR< IfcTemplatedEntityList< IfcCurve > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v->generalize()); }
+bool IfcAnnotationFillArea::hasInnerBoundaries() const { return !entity->getArgument(1)->isNull(); }
+IfcTemplatedEntityList< IfcCurve >::ptr IfcAnnotationFillArea::InnerBoundaries() const { IfcEntityList::ptr es = *entity->getArgument(1); return es->as<IfcCurve>(); }
+void IfcAnnotationFillArea::setInnerBoundaries(IfcTemplatedEntityList< IfcCurve >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v->generalize()); }
 bool IfcAnnotationFillArea::is(Type::Enum v) const { return v == Type::IfcAnnotationFillArea || IfcGeometricRepresentationItem::is(v); }
 Type::Enum IfcAnnotationFillArea::type() const { return Type::IfcAnnotationFillArea; }
 Type::Enum IfcAnnotationFillArea::Class() { return Type::IfcAnnotationFillArea; }
-IfcAnnotationFillArea::IfcAnnotationFillArea(IfcAbstractEntityPtr e) : IfcGeometricRepresentationItem((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcAnnotationFillArea)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcAnnotationFillArea::IfcAnnotationFillArea(IfcCurve* v1_OuterBoundary, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcCurve > > > v2_InnerBoundaries) : IfcGeometricRepresentationItem((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_OuterBoundary)); if (v2_InnerBoundaries) { e->setArgument(1,(*v2_InnerBoundaries)->generalize()); } else { e->setArgument(1); } entity = e; EntityBuffer::Add(this); }
+IfcAnnotationFillArea::IfcAnnotationFillArea(IfcAbstractEntity* e) : IfcGeometricRepresentationItem((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcAnnotationFillArea)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcAnnotationFillArea::IfcAnnotationFillArea(IfcCurve* v1_OuterBoundary, boost::optional< IfcTemplatedEntityList< IfcCurve >::ptr > v2_InnerBoundaries) : IfcGeometricRepresentationItem((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_OuterBoundary)); if (v2_InnerBoundaries) { e->setArgument(1,(*v2_InnerBoundaries)->generalize()); } else { e->setArgument(1); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcApplication
-IfcOrganization* IfcApplication::ApplicationDeveloper() { return (IfcOrganization*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(0))); }
+IfcOrganization* IfcApplication::ApplicationDeveloper() const { return (IfcOrganization*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(0))); }
 void IfcApplication::setApplicationDeveloper(IfcOrganization* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-IfcLabel IfcApplication::Version() { return *entity->getArgument(1); }
-void IfcApplication::setVersion(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-IfcLabel IfcApplication::ApplicationFullName() { return *entity->getArgument(2); }
-void IfcApplication::setApplicationFullName(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-IfcIdentifier IfcApplication::ApplicationIdentifier() { return *entity->getArgument(3); }
-void IfcApplication::setApplicationIdentifier(IfcIdentifier v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+std::string IfcApplication::Version() const { return *entity->getArgument(1); }
+void IfcApplication::setVersion(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+std::string IfcApplication::ApplicationFullName() const { return *entity->getArgument(2); }
+void IfcApplication::setApplicationFullName(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+std::string IfcApplication::ApplicationIdentifier() const { return *entity->getArgument(3); }
+void IfcApplication::setApplicationIdentifier(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
 bool IfcApplication::is(Type::Enum v) const { return v == Type::IfcApplication; }
 Type::Enum IfcApplication::type() const { return Type::IfcApplication; }
 Type::Enum IfcApplication::Class() { return Type::IfcApplication; }
-IfcApplication::IfcApplication(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcApplication)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcApplication::IfcApplication(IfcOrganization* v1_ApplicationDeveloper, IfcLabel v2_Version, IfcLabel v3_ApplicationFullName, IfcIdentifier v4_ApplicationIdentifier) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_ApplicationDeveloper)); e->setArgument(1,(v2_Version)); e->setArgument(2,(v3_ApplicationFullName)); e->setArgument(3,(v4_ApplicationIdentifier)); entity = e; EntityBuffer::Add(this); }
+IfcApplication::IfcApplication(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcApplication)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcApplication::IfcApplication(IfcOrganization* v1_ApplicationDeveloper, std::string v2_Version, std::string v3_ApplicationFullName, std::string v4_ApplicationIdentifier) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_ApplicationDeveloper)); e->setArgument(1,(v2_Version)); e->setArgument(2,(v3_ApplicationFullName)); e->setArgument(3,(v4_ApplicationIdentifier)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcAppliedValue
-bool IfcAppliedValue::hasName() { return !entity->getArgument(0)->isNull(); }
-IfcLabel IfcAppliedValue::Name() { return *entity->getArgument(0); }
-void IfcAppliedValue::setName(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-bool IfcAppliedValue::hasDescription() { return !entity->getArgument(1)->isNull(); }
-IfcText IfcAppliedValue::Description() { return *entity->getArgument(1); }
-void IfcAppliedValue::setDescription(IfcText v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-bool IfcAppliedValue::hasAppliedValue() { return !entity->getArgument(2)->isNull(); }
-IfcAppliedValueSelect IfcAppliedValue::AppliedValue() { return *entity->getArgument(2); }
-void IfcAppliedValue::setAppliedValue(IfcAppliedValueSelect v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-bool IfcAppliedValue::hasUnitBasis() { return !entity->getArgument(3)->isNull(); }
-IfcMeasureWithUnit* IfcAppliedValue::UnitBasis() { return (IfcMeasureWithUnit*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(3))); }
+bool IfcAppliedValue::hasName() const { return !entity->getArgument(0)->isNull(); }
+std::string IfcAppliedValue::Name() const { return *entity->getArgument(0); }
+void IfcAppliedValue::setName(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+bool IfcAppliedValue::hasDescription() const { return !entity->getArgument(1)->isNull(); }
+std::string IfcAppliedValue::Description() const { return *entity->getArgument(1); }
+void IfcAppliedValue::setDescription(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+bool IfcAppliedValue::hasAppliedValue() const { return !entity->getArgument(2)->isNull(); }
+IfcAppliedValueSelect* IfcAppliedValue::AppliedValue() const { return (IfcAppliedValueSelect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(2))); }
+void IfcAppliedValue::setAppliedValue(IfcAppliedValueSelect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+bool IfcAppliedValue::hasUnitBasis() const { return !entity->getArgument(3)->isNull(); }
+IfcMeasureWithUnit* IfcAppliedValue::UnitBasis() const { return (IfcMeasureWithUnit*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(3))); }
 void IfcAppliedValue::setUnitBasis(IfcMeasureWithUnit* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-bool IfcAppliedValue::hasApplicableDate() { return !entity->getArgument(4)->isNull(); }
-IfcDate IfcAppliedValue::ApplicableDate() { return *entity->getArgument(4); }
-void IfcAppliedValue::setApplicableDate(IfcDate v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-bool IfcAppliedValue::hasFixedUntilDate() { return !entity->getArgument(5)->isNull(); }
-IfcDate IfcAppliedValue::FixedUntilDate() { return *entity->getArgument(5); }
-void IfcAppliedValue::setFixedUntilDate(IfcDate v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-bool IfcAppliedValue::hasCategory() { return !entity->getArgument(6)->isNull(); }
-IfcLabel IfcAppliedValue::Category() { return *entity->getArgument(6); }
-void IfcAppliedValue::setCategory(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
-bool IfcAppliedValue::hasCondition() { return !entity->getArgument(7)->isNull(); }
-IfcLabel IfcAppliedValue::Condition() { return *entity->getArgument(7); }
-void IfcAppliedValue::setCondition(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
-bool IfcAppliedValue::hasArithmeticOperator() { return !entity->getArgument(8)->isNull(); }
-IfcArithmeticOperatorEnum::IfcArithmeticOperatorEnum IfcAppliedValue::ArithmeticOperator() { return IfcArithmeticOperatorEnum::FromString(*entity->getArgument(8)); }
+bool IfcAppliedValue::hasApplicableDate() const { return !entity->getArgument(4)->isNull(); }
+std::string IfcAppliedValue::ApplicableDate() const { return *entity->getArgument(4); }
+void IfcAppliedValue::setApplicableDate(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+bool IfcAppliedValue::hasFixedUntilDate() const { return !entity->getArgument(5)->isNull(); }
+std::string IfcAppliedValue::FixedUntilDate() const { return *entity->getArgument(5); }
+void IfcAppliedValue::setFixedUntilDate(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+bool IfcAppliedValue::hasCategory() const { return !entity->getArgument(6)->isNull(); }
+std::string IfcAppliedValue::Category() const { return *entity->getArgument(6); }
+void IfcAppliedValue::setCategory(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
+bool IfcAppliedValue::hasCondition() const { return !entity->getArgument(7)->isNull(); }
+std::string IfcAppliedValue::Condition() const { return *entity->getArgument(7); }
+void IfcAppliedValue::setCondition(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
+bool IfcAppliedValue::hasArithmeticOperator() const { return !entity->getArgument(8)->isNull(); }
+IfcArithmeticOperatorEnum::IfcArithmeticOperatorEnum IfcAppliedValue::ArithmeticOperator() const { return IfcArithmeticOperatorEnum::FromString(*entity->getArgument(8)); }
 void IfcAppliedValue::setArithmeticOperator(IfcArithmeticOperatorEnum::IfcArithmeticOperatorEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcArithmeticOperatorEnum::ToString(v)); }
-bool IfcAppliedValue::hasComponents() { return !entity->getArgument(9)->isNull(); }
-SHARED_PTR< IfcTemplatedEntityList< IfcAppliedValue > > IfcAppliedValue::Components() { RETURN_AS_LIST(IfcAppliedValue,9) }
-void IfcAppliedValue::setComponents(SHARED_PTR< IfcTemplatedEntityList< IfcAppliedValue > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v->generalize()); }
-IfcExternalReferenceRelationship::list IfcAppliedValue::HasExternalReference() { RETURN_INVERSE(IfcExternalReferenceRelationship) }
+bool IfcAppliedValue::hasComponents() const { return !entity->getArgument(9)->isNull(); }
+IfcTemplatedEntityList< IfcAppliedValue >::ptr IfcAppliedValue::Components() const { IfcEntityList::ptr es = *entity->getArgument(9); return es->as<IfcAppliedValue>(); }
+void IfcAppliedValue::setComponents(IfcTemplatedEntityList< IfcAppliedValue >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v->generalize()); }
+IfcExternalReferenceRelationship::list::ptr IfcAppliedValue::HasExternalReference() const { return entity->getInverse(Type::IfcExternalReferenceRelationship, 3)->as<IfcExternalReferenceRelationship>(); }
 bool IfcAppliedValue::is(Type::Enum v) const { return v == Type::IfcAppliedValue; }
 Type::Enum IfcAppliedValue::type() const { return Type::IfcAppliedValue; }
 Type::Enum IfcAppliedValue::Class() { return Type::IfcAppliedValue; }
-IfcAppliedValue::IfcAppliedValue(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcAppliedValue)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcAppliedValue::IfcAppliedValue(boost::optional< IfcLabel > v1_Name, boost::optional< IfcText > v2_Description, boost::optional< IfcAppliedValueSelect > v3_AppliedValue, IfcMeasureWithUnit* v4_UnitBasis, boost::optional< IfcDate > v5_ApplicableDate, boost::optional< IfcDate > v6_FixedUntilDate, boost::optional< IfcLabel > v7_Category, boost::optional< IfcLabel > v8_Condition, boost::optional< IfcArithmeticOperatorEnum::IfcArithmeticOperatorEnum > v9_ArithmeticOperator, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcAppliedValue > > > v10_Components) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } if (v3_AppliedValue) { e->setArgument(2,(*v3_AppliedValue)); } else { e->setArgument(2); } e->setArgument(3,(v4_UnitBasis)); if (v5_ApplicableDate) { e->setArgument(4,(*v5_ApplicableDate)); } else { e->setArgument(4); } if (v6_FixedUntilDate) { e->setArgument(5,(*v6_FixedUntilDate)); } else { e->setArgument(5); } if (v7_Category) { e->setArgument(6,(*v7_Category)); } else { e->setArgument(6); } if (v8_Condition) { e->setArgument(7,(*v8_Condition)); } else { e->setArgument(7); } if (v9_ArithmeticOperator) { e->setArgument(8,*v9_ArithmeticOperator,IfcArithmeticOperatorEnum::ToString(*v9_ArithmeticOperator)); } else { e->setArgument(8); } if (v10_Components) { e->setArgument(9,(*v10_Components)->generalize()); } else { e->setArgument(9); } entity = e; EntityBuffer::Add(this); }
+IfcAppliedValue::IfcAppliedValue(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcAppliedValue)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcAppliedValue::IfcAppliedValue(boost::optional< std::string > v1_Name, boost::optional< std::string > v2_Description, IfcAppliedValueSelect* v3_AppliedValue, IfcMeasureWithUnit* v4_UnitBasis, boost::optional< std::string > v5_ApplicableDate, boost::optional< std::string > v6_FixedUntilDate, boost::optional< std::string > v7_Category, boost::optional< std::string > v8_Condition, boost::optional< IfcArithmeticOperatorEnum::IfcArithmeticOperatorEnum > v9_ArithmeticOperator, boost::optional< IfcTemplatedEntityList< IfcAppliedValue >::ptr > v10_Components) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_AppliedValue)); e->setArgument(3,(v4_UnitBasis)); if (v5_ApplicableDate) { e->setArgument(4,(*v5_ApplicableDate)); } else { e->setArgument(4); } if (v6_FixedUntilDate) { e->setArgument(5,(*v6_FixedUntilDate)); } else { e->setArgument(5); } if (v7_Category) { e->setArgument(6,(*v7_Category)); } else { e->setArgument(6); } if (v8_Condition) { e->setArgument(7,(*v8_Condition)); } else { e->setArgument(7); } if (v9_ArithmeticOperator) { e->setArgument(8,*v9_ArithmeticOperator,IfcArithmeticOperatorEnum::ToString(*v9_ArithmeticOperator)); } else { e->setArgument(8); } if (v10_Components) { e->setArgument(9,(*v10_Components)->generalize()); } else { e->setArgument(9); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcApproval
-bool IfcApproval::hasIdentifier() { return !entity->getArgument(0)->isNull(); }
-IfcIdentifier IfcApproval::Identifier() { return *entity->getArgument(0); }
-void IfcApproval::setIdentifier(IfcIdentifier v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-bool IfcApproval::hasName() { return !entity->getArgument(1)->isNull(); }
-IfcLabel IfcApproval::Name() { return *entity->getArgument(1); }
-void IfcApproval::setName(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-bool IfcApproval::hasDescription() { return !entity->getArgument(2)->isNull(); }
-IfcText IfcApproval::Description() { return *entity->getArgument(2); }
-void IfcApproval::setDescription(IfcText v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-bool IfcApproval::hasTimeOfApproval() { return !entity->getArgument(3)->isNull(); }
-IfcDateTime IfcApproval::TimeOfApproval() { return *entity->getArgument(3); }
-void IfcApproval::setTimeOfApproval(IfcDateTime v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-bool IfcApproval::hasStatus() { return !entity->getArgument(4)->isNull(); }
-IfcLabel IfcApproval::Status() { return *entity->getArgument(4); }
-void IfcApproval::setStatus(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-bool IfcApproval::hasLevel() { return !entity->getArgument(5)->isNull(); }
-IfcLabel IfcApproval::Level() { return *entity->getArgument(5); }
-void IfcApproval::setLevel(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-bool IfcApproval::hasQualifier() { return !entity->getArgument(6)->isNull(); }
-IfcText IfcApproval::Qualifier() { return *entity->getArgument(6); }
-void IfcApproval::setQualifier(IfcText v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
-bool IfcApproval::hasRequestingApproval() { return !entity->getArgument(7)->isNull(); }
-IfcActorSelect IfcApproval::RequestingApproval() { return *entity->getArgument(7); }
-void IfcApproval::setRequestingApproval(IfcActorSelect v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
-bool IfcApproval::hasGivingApproval() { return !entity->getArgument(8)->isNull(); }
-IfcActorSelect IfcApproval::GivingApproval() { return *entity->getArgument(8); }
-void IfcApproval::setGivingApproval(IfcActorSelect v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
-IfcExternalReferenceRelationship::list IfcApproval::HasExternalReferences() { RETURN_INVERSE(IfcExternalReferenceRelationship) }
-IfcRelAssociatesApproval::list IfcApproval::ApprovedObjects() { RETURN_INVERSE(IfcRelAssociatesApproval) }
-IfcResourceApprovalRelationship::list IfcApproval::ApprovedResources() { RETURN_INVERSE(IfcResourceApprovalRelationship) }
-IfcApprovalRelationship::list IfcApproval::IsRelatedWith() { RETURN_INVERSE(IfcApprovalRelationship) }
-IfcApprovalRelationship::list IfcApproval::Relates() { RETURN_INVERSE(IfcApprovalRelationship) }
+bool IfcApproval::hasIdentifier() const { return !entity->getArgument(0)->isNull(); }
+std::string IfcApproval::Identifier() const { return *entity->getArgument(0); }
+void IfcApproval::setIdentifier(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+bool IfcApproval::hasName() const { return !entity->getArgument(1)->isNull(); }
+std::string IfcApproval::Name() const { return *entity->getArgument(1); }
+void IfcApproval::setName(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+bool IfcApproval::hasDescription() const { return !entity->getArgument(2)->isNull(); }
+std::string IfcApproval::Description() const { return *entity->getArgument(2); }
+void IfcApproval::setDescription(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+bool IfcApproval::hasTimeOfApproval() const { return !entity->getArgument(3)->isNull(); }
+std::string IfcApproval::TimeOfApproval() const { return *entity->getArgument(3); }
+void IfcApproval::setTimeOfApproval(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+bool IfcApproval::hasStatus() const { return !entity->getArgument(4)->isNull(); }
+std::string IfcApproval::Status() const { return *entity->getArgument(4); }
+void IfcApproval::setStatus(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+bool IfcApproval::hasLevel() const { return !entity->getArgument(5)->isNull(); }
+std::string IfcApproval::Level() const { return *entity->getArgument(5); }
+void IfcApproval::setLevel(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+bool IfcApproval::hasQualifier() const { return !entity->getArgument(6)->isNull(); }
+std::string IfcApproval::Qualifier() const { return *entity->getArgument(6); }
+void IfcApproval::setQualifier(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
+bool IfcApproval::hasRequestingApproval() const { return !entity->getArgument(7)->isNull(); }
+IfcActorSelect* IfcApproval::RequestingApproval() const { return (IfcActorSelect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(7))); }
+void IfcApproval::setRequestingApproval(IfcActorSelect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
+bool IfcApproval::hasGivingApproval() const { return !entity->getArgument(8)->isNull(); }
+IfcActorSelect* IfcApproval::GivingApproval() const { return (IfcActorSelect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(8))); }
+void IfcApproval::setGivingApproval(IfcActorSelect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
+IfcExternalReferenceRelationship::list::ptr IfcApproval::HasExternalReferences() const { return entity->getInverse(Type::IfcExternalReferenceRelationship, 3)->as<IfcExternalReferenceRelationship>(); }
+IfcRelAssociatesApproval::list::ptr IfcApproval::ApprovedObjects() const { return entity->getInverse(Type::IfcRelAssociatesApproval, 5)->as<IfcRelAssociatesApproval>(); }
+IfcResourceApprovalRelationship::list::ptr IfcApproval::ApprovedResources() const { return entity->getInverse(Type::IfcResourceApprovalRelationship, 3)->as<IfcResourceApprovalRelationship>(); }
+IfcApprovalRelationship::list::ptr IfcApproval::IsRelatedWith() const { return entity->getInverse(Type::IfcApprovalRelationship, 3)->as<IfcApprovalRelationship>(); }
+IfcApprovalRelationship::list::ptr IfcApproval::Relates() const { return entity->getInverse(Type::IfcApprovalRelationship, 2)->as<IfcApprovalRelationship>(); }
 bool IfcApproval::is(Type::Enum v) const { return v == Type::IfcApproval; }
 Type::Enum IfcApproval::type() const { return Type::IfcApproval; }
 Type::Enum IfcApproval::Class() { return Type::IfcApproval; }
-IfcApproval::IfcApproval(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcApproval)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcApproval::IfcApproval(boost::optional< IfcIdentifier > v1_Identifier, boost::optional< IfcLabel > v2_Name, boost::optional< IfcText > v3_Description, boost::optional< IfcDateTime > v4_TimeOfApproval, boost::optional< IfcLabel > v5_Status, boost::optional< IfcLabel > v6_Level, boost::optional< IfcText > v7_Qualifier, boost::optional< IfcActorSelect > v8_RequestingApproval, boost::optional< IfcActorSelect > v9_GivingApproval) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Identifier) { e->setArgument(0,(*v1_Identifier)); } else { e->setArgument(0); } if (v2_Name) { e->setArgument(1,(*v2_Name)); } else { e->setArgument(1); } if (v3_Description) { e->setArgument(2,(*v3_Description)); } else { e->setArgument(2); } if (v4_TimeOfApproval) { e->setArgument(3,(*v4_TimeOfApproval)); } else { e->setArgument(3); } if (v5_Status) { e->setArgument(4,(*v5_Status)); } else { e->setArgument(4); } if (v6_Level) { e->setArgument(5,(*v6_Level)); } else { e->setArgument(5); } if (v7_Qualifier) { e->setArgument(6,(*v7_Qualifier)); } else { e->setArgument(6); } if (v8_RequestingApproval) { e->setArgument(7,(*v8_RequestingApproval)); } else { e->setArgument(7); } if (v9_GivingApproval) { e->setArgument(8,(*v9_GivingApproval)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcApproval::IfcApproval(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcApproval)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcApproval::IfcApproval(boost::optional< std::string > v1_Identifier, boost::optional< std::string > v2_Name, boost::optional< std::string > v3_Description, boost::optional< std::string > v4_TimeOfApproval, boost::optional< std::string > v5_Status, boost::optional< std::string > v6_Level, boost::optional< std::string > v7_Qualifier, IfcActorSelect* v8_RequestingApproval, IfcActorSelect* v9_GivingApproval) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Identifier) { e->setArgument(0,(*v1_Identifier)); } else { e->setArgument(0); } if (v2_Name) { e->setArgument(1,(*v2_Name)); } else { e->setArgument(1); } if (v3_Description) { e->setArgument(2,(*v3_Description)); } else { e->setArgument(2); } if (v4_TimeOfApproval) { e->setArgument(3,(*v4_TimeOfApproval)); } else { e->setArgument(3); } if (v5_Status) { e->setArgument(4,(*v5_Status)); } else { e->setArgument(4); } if (v6_Level) { e->setArgument(5,(*v6_Level)); } else { e->setArgument(5); } if (v7_Qualifier) { e->setArgument(6,(*v7_Qualifier)); } else { e->setArgument(6); } e->setArgument(7,(v8_RequestingApproval)); e->setArgument(8,(v9_GivingApproval)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcApprovalRelationship
-IfcApproval* IfcApprovalRelationship::RelatingApproval() { return (IfcApproval*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(2))); }
+IfcApproval* IfcApprovalRelationship::RelatingApproval() const { return (IfcApproval*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(2))); }
 void IfcApprovalRelationship::setRelatingApproval(IfcApproval* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-SHARED_PTR< IfcTemplatedEntityList< IfcApproval > > IfcApprovalRelationship::RelatedApprovals() { RETURN_AS_LIST(IfcApproval,3) }
-void IfcApprovalRelationship::setRelatedApprovals(SHARED_PTR< IfcTemplatedEntityList< IfcApproval > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v->generalize()); }
+IfcTemplatedEntityList< IfcApproval >::ptr IfcApprovalRelationship::RelatedApprovals() const { IfcEntityList::ptr es = *entity->getArgument(3); return es->as<IfcApproval>(); }
+void IfcApprovalRelationship::setRelatedApprovals(IfcTemplatedEntityList< IfcApproval >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v->generalize()); }
 bool IfcApprovalRelationship::is(Type::Enum v) const { return v == Type::IfcApprovalRelationship || IfcResourceLevelRelationship::is(v); }
 Type::Enum IfcApprovalRelationship::type() const { return Type::IfcApprovalRelationship; }
 Type::Enum IfcApprovalRelationship::Class() { return Type::IfcApprovalRelationship; }
-IfcApprovalRelationship::IfcApprovalRelationship(IfcAbstractEntityPtr e) : IfcResourceLevelRelationship((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcApprovalRelationship)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcApprovalRelationship::IfcApprovalRelationship(boost::optional< IfcLabel > v1_Name, boost::optional< IfcText > v2_Description, IfcApproval* v3_RelatingApproval, SHARED_PTR< IfcTemplatedEntityList< IfcApproval > > v4_RelatedApprovals) : IfcResourceLevelRelationship((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_RelatingApproval)); e->setArgument(3,(v4_RelatedApprovals)->generalize()); entity = e; EntityBuffer::Add(this); }
+IfcApprovalRelationship::IfcApprovalRelationship(IfcAbstractEntity* e) : IfcResourceLevelRelationship((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcApprovalRelationship)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcApprovalRelationship::IfcApprovalRelationship(boost::optional< std::string > v1_Name, boost::optional< std::string > v2_Description, IfcApproval* v3_RelatingApproval, IfcTemplatedEntityList< IfcApproval >::ptr v4_RelatedApprovals) : IfcResourceLevelRelationship((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_RelatingApproval)); e->setArgument(3,(v4_RelatedApprovals)->generalize()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcArbitraryClosedProfileDef
-IfcCurve* IfcArbitraryClosedProfileDef::OuterCurve() { return (IfcCurve*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(2))); }
+IfcCurve* IfcArbitraryClosedProfileDef::OuterCurve() const { return (IfcCurve*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(2))); }
 void IfcArbitraryClosedProfileDef::setOuterCurve(IfcCurve* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
 bool IfcArbitraryClosedProfileDef::is(Type::Enum v) const { return v == Type::IfcArbitraryClosedProfileDef || IfcProfileDef::is(v); }
 Type::Enum IfcArbitraryClosedProfileDef::type() const { return Type::IfcArbitraryClosedProfileDef; }
 Type::Enum IfcArbitraryClosedProfileDef::Class() { return Type::IfcArbitraryClosedProfileDef; }
-IfcArbitraryClosedProfileDef::IfcArbitraryClosedProfileDef(IfcAbstractEntityPtr e) : IfcProfileDef((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcArbitraryClosedProfileDef)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcArbitraryClosedProfileDef::IfcArbitraryClosedProfileDef(IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< IfcLabel > v2_ProfileName, IfcCurve* v3_OuterCurve) : IfcProfileDef((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,v1_ProfileType,IfcProfileTypeEnum::ToString(v1_ProfileType)); if (v2_ProfileName) { e->setArgument(1,(*v2_ProfileName)); } else { e->setArgument(1); } e->setArgument(2,(v3_OuterCurve)); entity = e; EntityBuffer::Add(this); }
+IfcArbitraryClosedProfileDef::IfcArbitraryClosedProfileDef(IfcAbstractEntity* e) : IfcProfileDef((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcArbitraryClosedProfileDef)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcArbitraryClosedProfileDef::IfcArbitraryClosedProfileDef(IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< std::string > v2_ProfileName, IfcCurve* v3_OuterCurve) : IfcProfileDef((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,v1_ProfileType,IfcProfileTypeEnum::ToString(v1_ProfileType)); if (v2_ProfileName) { e->setArgument(1,(*v2_ProfileName)); } else { e->setArgument(1); } e->setArgument(2,(v3_OuterCurve)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcArbitraryOpenProfileDef
-IfcBoundedCurve* IfcArbitraryOpenProfileDef::Curve() { return (IfcBoundedCurve*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(2))); }
+IfcBoundedCurve* IfcArbitraryOpenProfileDef::Curve() const { return (IfcBoundedCurve*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(2))); }
 void IfcArbitraryOpenProfileDef::setCurve(IfcBoundedCurve* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
 bool IfcArbitraryOpenProfileDef::is(Type::Enum v) const { return v == Type::IfcArbitraryOpenProfileDef || IfcProfileDef::is(v); }
 Type::Enum IfcArbitraryOpenProfileDef::type() const { return Type::IfcArbitraryOpenProfileDef; }
 Type::Enum IfcArbitraryOpenProfileDef::Class() { return Type::IfcArbitraryOpenProfileDef; }
-IfcArbitraryOpenProfileDef::IfcArbitraryOpenProfileDef(IfcAbstractEntityPtr e) : IfcProfileDef((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcArbitraryOpenProfileDef)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcArbitraryOpenProfileDef::IfcArbitraryOpenProfileDef(IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< IfcLabel > v2_ProfileName, IfcBoundedCurve* v3_Curve) : IfcProfileDef((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,v1_ProfileType,IfcProfileTypeEnum::ToString(v1_ProfileType)); if (v2_ProfileName) { e->setArgument(1,(*v2_ProfileName)); } else { e->setArgument(1); } e->setArgument(2,(v3_Curve)); entity = e; EntityBuffer::Add(this); }
+IfcArbitraryOpenProfileDef::IfcArbitraryOpenProfileDef(IfcAbstractEntity* e) : IfcProfileDef((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcArbitraryOpenProfileDef)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcArbitraryOpenProfileDef::IfcArbitraryOpenProfileDef(IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< std::string > v2_ProfileName, IfcBoundedCurve* v3_Curve) : IfcProfileDef((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,v1_ProfileType,IfcProfileTypeEnum::ToString(v1_ProfileType)); if (v2_ProfileName) { e->setArgument(1,(*v2_ProfileName)); } else { e->setArgument(1); } e->setArgument(2,(v3_Curve)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcArbitraryProfileDefWithVoids
-SHARED_PTR< IfcTemplatedEntityList< IfcCurve > > IfcArbitraryProfileDefWithVoids::InnerCurves() { RETURN_AS_LIST(IfcCurve,3) }
-void IfcArbitraryProfileDefWithVoids::setInnerCurves(SHARED_PTR< IfcTemplatedEntityList< IfcCurve > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v->generalize()); }
+IfcTemplatedEntityList< IfcCurve >::ptr IfcArbitraryProfileDefWithVoids::InnerCurves() const { IfcEntityList::ptr es = *entity->getArgument(3); return es->as<IfcCurve>(); }
+void IfcArbitraryProfileDefWithVoids::setInnerCurves(IfcTemplatedEntityList< IfcCurve >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v->generalize()); }
 bool IfcArbitraryProfileDefWithVoids::is(Type::Enum v) const { return v == Type::IfcArbitraryProfileDefWithVoids || IfcArbitraryClosedProfileDef::is(v); }
 Type::Enum IfcArbitraryProfileDefWithVoids::type() const { return Type::IfcArbitraryProfileDefWithVoids; }
 Type::Enum IfcArbitraryProfileDefWithVoids::Class() { return Type::IfcArbitraryProfileDefWithVoids; }
-IfcArbitraryProfileDefWithVoids::IfcArbitraryProfileDefWithVoids(IfcAbstractEntityPtr e) : IfcArbitraryClosedProfileDef((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcArbitraryProfileDefWithVoids)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcArbitraryProfileDefWithVoids::IfcArbitraryProfileDefWithVoids(IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< IfcLabel > v2_ProfileName, IfcCurve* v3_OuterCurve, SHARED_PTR< IfcTemplatedEntityList< IfcCurve > > v4_InnerCurves) : IfcArbitraryClosedProfileDef((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,v1_ProfileType,IfcProfileTypeEnum::ToString(v1_ProfileType)); if (v2_ProfileName) { e->setArgument(1,(*v2_ProfileName)); } else { e->setArgument(1); } e->setArgument(2,(v3_OuterCurve)); e->setArgument(3,(v4_InnerCurves)->generalize()); entity = e; EntityBuffer::Add(this); }
+IfcArbitraryProfileDefWithVoids::IfcArbitraryProfileDefWithVoids(IfcAbstractEntity* e) : IfcArbitraryClosedProfileDef((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcArbitraryProfileDefWithVoids)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcArbitraryProfileDefWithVoids::IfcArbitraryProfileDefWithVoids(IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< std::string > v2_ProfileName, IfcCurve* v3_OuterCurve, IfcTemplatedEntityList< IfcCurve >::ptr v4_InnerCurves) : IfcArbitraryClosedProfileDef((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,v1_ProfileType,IfcProfileTypeEnum::ToString(v1_ProfileType)); if (v2_ProfileName) { e->setArgument(1,(*v2_ProfileName)); } else { e->setArgument(1); } e->setArgument(2,(v3_OuterCurve)); e->setArgument(3,(v4_InnerCurves)->generalize()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcAsset
-bool IfcAsset::hasIdentification() { return !entity->getArgument(5)->isNull(); }
-IfcIdentifier IfcAsset::Identification() { return *entity->getArgument(5); }
-void IfcAsset::setIdentification(IfcIdentifier v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-bool IfcAsset::hasOriginalValue() { return !entity->getArgument(6)->isNull(); }
-IfcCostValue* IfcAsset::OriginalValue() { return (IfcCostValue*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(6))); }
+bool IfcAsset::hasIdentification() const { return !entity->getArgument(5)->isNull(); }
+std::string IfcAsset::Identification() const { return *entity->getArgument(5); }
+void IfcAsset::setIdentification(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+bool IfcAsset::hasOriginalValue() const { return !entity->getArgument(6)->isNull(); }
+IfcCostValue* IfcAsset::OriginalValue() const { return (IfcCostValue*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(6))); }
 void IfcAsset::setOriginalValue(IfcCostValue* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
-bool IfcAsset::hasCurrentValue() { return !entity->getArgument(7)->isNull(); }
-IfcCostValue* IfcAsset::CurrentValue() { return (IfcCostValue*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(7))); }
+bool IfcAsset::hasCurrentValue() const { return !entity->getArgument(7)->isNull(); }
+IfcCostValue* IfcAsset::CurrentValue() const { return (IfcCostValue*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(7))); }
 void IfcAsset::setCurrentValue(IfcCostValue* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
-bool IfcAsset::hasTotalReplacementCost() { return !entity->getArgument(8)->isNull(); }
-IfcCostValue* IfcAsset::TotalReplacementCost() { return (IfcCostValue*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(8))); }
+bool IfcAsset::hasTotalReplacementCost() const { return !entity->getArgument(8)->isNull(); }
+IfcCostValue* IfcAsset::TotalReplacementCost() const { return (IfcCostValue*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(8))); }
 void IfcAsset::setTotalReplacementCost(IfcCostValue* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
-bool IfcAsset::hasOwner() { return !entity->getArgument(9)->isNull(); }
-IfcActorSelect IfcAsset::Owner() { return *entity->getArgument(9); }
-void IfcAsset::setOwner(IfcActorSelect v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
-bool IfcAsset::hasUser() { return !entity->getArgument(10)->isNull(); }
-IfcActorSelect IfcAsset::User() { return *entity->getArgument(10); }
-void IfcAsset::setUser(IfcActorSelect v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
-bool IfcAsset::hasResponsiblePerson() { return !entity->getArgument(11)->isNull(); }
-IfcPerson* IfcAsset::ResponsiblePerson() { return (IfcPerson*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(11))); }
+bool IfcAsset::hasOwner() const { return !entity->getArgument(9)->isNull(); }
+IfcActorSelect* IfcAsset::Owner() const { return (IfcActorSelect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(9))); }
+void IfcAsset::setOwner(IfcActorSelect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
+bool IfcAsset::hasUser() const { return !entity->getArgument(10)->isNull(); }
+IfcActorSelect* IfcAsset::User() const { return (IfcActorSelect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(10))); }
+void IfcAsset::setUser(IfcActorSelect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
+bool IfcAsset::hasResponsiblePerson() const { return !entity->getArgument(11)->isNull(); }
+IfcPerson* IfcAsset::ResponsiblePerson() const { return (IfcPerson*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(11))); }
 void IfcAsset::setResponsiblePerson(IfcPerson* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(11,v); }
-bool IfcAsset::hasIncorporationDate() { return !entity->getArgument(12)->isNull(); }
-IfcDate IfcAsset::IncorporationDate() { return *entity->getArgument(12); }
-void IfcAsset::setIncorporationDate(IfcDate v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(12,v); }
-bool IfcAsset::hasDepreciatedValue() { return !entity->getArgument(13)->isNull(); }
-IfcCostValue* IfcAsset::DepreciatedValue() { return (IfcCostValue*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(13))); }
+bool IfcAsset::hasIncorporationDate() const { return !entity->getArgument(12)->isNull(); }
+std::string IfcAsset::IncorporationDate() const { return *entity->getArgument(12); }
+void IfcAsset::setIncorporationDate(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(12,v); }
+bool IfcAsset::hasDepreciatedValue() const { return !entity->getArgument(13)->isNull(); }
+IfcCostValue* IfcAsset::DepreciatedValue() const { return (IfcCostValue*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(13))); }
 void IfcAsset::setDepreciatedValue(IfcCostValue* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(13,v); }
 bool IfcAsset::is(Type::Enum v) const { return v == Type::IfcAsset || IfcGroup::is(v); }
 Type::Enum IfcAsset::type() const { return Type::IfcAsset; }
 Type::Enum IfcAsset::Class() { return Type::IfcAsset; }
-IfcAsset::IfcAsset(IfcAbstractEntityPtr e) : IfcGroup((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcAsset)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcAsset::IfcAsset(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, boost::optional< IfcIdentifier > v6_Identification, IfcCostValue* v7_OriginalValue, IfcCostValue* v8_CurrentValue, IfcCostValue* v9_TotalReplacementCost, boost::optional< IfcActorSelect > v10_Owner, boost::optional< IfcActorSelect > v11_User, IfcPerson* v12_ResponsiblePerson, boost::optional< IfcDate > v13_IncorporationDate, IfcCostValue* v14_DepreciatedValue) : IfcGroup((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } if (v6_Identification) { e->setArgument(5,(*v6_Identification)); } else { e->setArgument(5); } e->setArgument(6,(v7_OriginalValue)); e->setArgument(7,(v8_CurrentValue)); e->setArgument(8,(v9_TotalReplacementCost)); if (v10_Owner) { e->setArgument(9,(*v10_Owner)); } else { e->setArgument(9); } if (v11_User) { e->setArgument(10,(*v11_User)); } else { e->setArgument(10); } e->setArgument(11,(v12_ResponsiblePerson)); if (v13_IncorporationDate) { e->setArgument(12,(*v13_IncorporationDate)); } else { e->setArgument(12); } e->setArgument(13,(v14_DepreciatedValue)); entity = e; EntityBuffer::Add(this); }
+IfcAsset::IfcAsset(IfcAbstractEntity* e) : IfcGroup((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcAsset)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcAsset::IfcAsset(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, boost::optional< std::string > v6_Identification, IfcCostValue* v7_OriginalValue, IfcCostValue* v8_CurrentValue, IfcCostValue* v9_TotalReplacementCost, IfcActorSelect* v10_Owner, IfcActorSelect* v11_User, IfcPerson* v12_ResponsiblePerson, boost::optional< std::string > v13_IncorporationDate, IfcCostValue* v14_DepreciatedValue) : IfcGroup((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } if (v6_Identification) { e->setArgument(5,(*v6_Identification)); } else { e->setArgument(5); } e->setArgument(6,(v7_OriginalValue)); e->setArgument(7,(v8_CurrentValue)); e->setArgument(8,(v9_TotalReplacementCost)); e->setArgument(9,(v10_Owner)); e->setArgument(10,(v11_User)); e->setArgument(11,(v12_ResponsiblePerson)); if (v13_IncorporationDate) { e->setArgument(12,(*v13_IncorporationDate)); } else { e->setArgument(12); } e->setArgument(13,(v14_DepreciatedValue)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcAsymmetricIShapeProfileDef
-IfcPositiveLengthMeasure IfcAsymmetricIShapeProfileDef::BottomFlangeWidth() { return *entity->getArgument(3); }
-void IfcAsymmetricIShapeProfileDef::setBottomFlangeWidth(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-IfcPositiveLengthMeasure IfcAsymmetricIShapeProfileDef::OverallDepth() { return *entity->getArgument(4); }
-void IfcAsymmetricIShapeProfileDef::setOverallDepth(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-IfcPositiveLengthMeasure IfcAsymmetricIShapeProfileDef::WebThickness() { return *entity->getArgument(5); }
-void IfcAsymmetricIShapeProfileDef::setWebThickness(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-IfcPositiveLengthMeasure IfcAsymmetricIShapeProfileDef::BottomFlangeThickness() { return *entity->getArgument(6); }
-void IfcAsymmetricIShapeProfileDef::setBottomFlangeThickness(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
-bool IfcAsymmetricIShapeProfileDef::hasBottomFlangeFilletRadius() { return !entity->getArgument(7)->isNull(); }
-IfcNonNegativeLengthMeasure IfcAsymmetricIShapeProfileDef::BottomFlangeFilletRadius() { return *entity->getArgument(7); }
-void IfcAsymmetricIShapeProfileDef::setBottomFlangeFilletRadius(IfcNonNegativeLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
-IfcPositiveLengthMeasure IfcAsymmetricIShapeProfileDef::TopFlangeWidth() { return *entity->getArgument(8); }
-void IfcAsymmetricIShapeProfileDef::setTopFlangeWidth(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
-bool IfcAsymmetricIShapeProfileDef::hasTopFlangeThickness() { return !entity->getArgument(9)->isNull(); }
-IfcPositiveLengthMeasure IfcAsymmetricIShapeProfileDef::TopFlangeThickness() { return *entity->getArgument(9); }
-void IfcAsymmetricIShapeProfileDef::setTopFlangeThickness(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
-bool IfcAsymmetricIShapeProfileDef::hasTopFlangeFilletRadius() { return !entity->getArgument(10)->isNull(); }
-IfcNonNegativeLengthMeasure IfcAsymmetricIShapeProfileDef::TopFlangeFilletRadius() { return *entity->getArgument(10); }
-void IfcAsymmetricIShapeProfileDef::setTopFlangeFilletRadius(IfcNonNegativeLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
-bool IfcAsymmetricIShapeProfileDef::hasBottomFlangeEdgeRadius() { return !entity->getArgument(11)->isNull(); }
-IfcNonNegativeLengthMeasure IfcAsymmetricIShapeProfileDef::BottomFlangeEdgeRadius() { return *entity->getArgument(11); }
-void IfcAsymmetricIShapeProfileDef::setBottomFlangeEdgeRadius(IfcNonNegativeLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(11,v); }
-bool IfcAsymmetricIShapeProfileDef::hasBottomFlangeSlope() { return !entity->getArgument(12)->isNull(); }
-IfcPlaneAngleMeasure IfcAsymmetricIShapeProfileDef::BottomFlangeSlope() { return *entity->getArgument(12); }
-void IfcAsymmetricIShapeProfileDef::setBottomFlangeSlope(IfcPlaneAngleMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(12,v); }
-bool IfcAsymmetricIShapeProfileDef::hasTopFlangeEdgeRadius() { return !entity->getArgument(13)->isNull(); }
-IfcNonNegativeLengthMeasure IfcAsymmetricIShapeProfileDef::TopFlangeEdgeRadius() { return *entity->getArgument(13); }
-void IfcAsymmetricIShapeProfileDef::setTopFlangeEdgeRadius(IfcNonNegativeLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(13,v); }
-bool IfcAsymmetricIShapeProfileDef::hasTopFlangeSlope() { return !entity->getArgument(14)->isNull(); }
-IfcPlaneAngleMeasure IfcAsymmetricIShapeProfileDef::TopFlangeSlope() { return *entity->getArgument(14); }
-void IfcAsymmetricIShapeProfileDef::setTopFlangeSlope(IfcPlaneAngleMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(14,v); }
+double IfcAsymmetricIShapeProfileDef::BottomFlangeWidth() const { return *entity->getArgument(3); }
+void IfcAsymmetricIShapeProfileDef::setBottomFlangeWidth(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+double IfcAsymmetricIShapeProfileDef::OverallDepth() const { return *entity->getArgument(4); }
+void IfcAsymmetricIShapeProfileDef::setOverallDepth(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+double IfcAsymmetricIShapeProfileDef::WebThickness() const { return *entity->getArgument(5); }
+void IfcAsymmetricIShapeProfileDef::setWebThickness(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+double IfcAsymmetricIShapeProfileDef::BottomFlangeThickness() const { return *entity->getArgument(6); }
+void IfcAsymmetricIShapeProfileDef::setBottomFlangeThickness(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
+bool IfcAsymmetricIShapeProfileDef::hasBottomFlangeFilletRadius() const { return !entity->getArgument(7)->isNull(); }
+double IfcAsymmetricIShapeProfileDef::BottomFlangeFilletRadius() const { return *entity->getArgument(7); }
+void IfcAsymmetricIShapeProfileDef::setBottomFlangeFilletRadius(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
+double IfcAsymmetricIShapeProfileDef::TopFlangeWidth() const { return *entity->getArgument(8); }
+void IfcAsymmetricIShapeProfileDef::setTopFlangeWidth(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
+bool IfcAsymmetricIShapeProfileDef::hasTopFlangeThickness() const { return !entity->getArgument(9)->isNull(); }
+double IfcAsymmetricIShapeProfileDef::TopFlangeThickness() const { return *entity->getArgument(9); }
+void IfcAsymmetricIShapeProfileDef::setTopFlangeThickness(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
+bool IfcAsymmetricIShapeProfileDef::hasTopFlangeFilletRadius() const { return !entity->getArgument(10)->isNull(); }
+double IfcAsymmetricIShapeProfileDef::TopFlangeFilletRadius() const { return *entity->getArgument(10); }
+void IfcAsymmetricIShapeProfileDef::setTopFlangeFilletRadius(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
+bool IfcAsymmetricIShapeProfileDef::hasBottomFlangeEdgeRadius() const { return !entity->getArgument(11)->isNull(); }
+double IfcAsymmetricIShapeProfileDef::BottomFlangeEdgeRadius() const { return *entity->getArgument(11); }
+void IfcAsymmetricIShapeProfileDef::setBottomFlangeEdgeRadius(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(11,v); }
+bool IfcAsymmetricIShapeProfileDef::hasBottomFlangeSlope() const { return !entity->getArgument(12)->isNull(); }
+double IfcAsymmetricIShapeProfileDef::BottomFlangeSlope() const { return *entity->getArgument(12); }
+void IfcAsymmetricIShapeProfileDef::setBottomFlangeSlope(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(12,v); }
+bool IfcAsymmetricIShapeProfileDef::hasTopFlangeEdgeRadius() const { return !entity->getArgument(13)->isNull(); }
+double IfcAsymmetricIShapeProfileDef::TopFlangeEdgeRadius() const { return *entity->getArgument(13); }
+void IfcAsymmetricIShapeProfileDef::setTopFlangeEdgeRadius(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(13,v); }
+bool IfcAsymmetricIShapeProfileDef::hasTopFlangeSlope() const { return !entity->getArgument(14)->isNull(); }
+double IfcAsymmetricIShapeProfileDef::TopFlangeSlope() const { return *entity->getArgument(14); }
+void IfcAsymmetricIShapeProfileDef::setTopFlangeSlope(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(14,v); }
 bool IfcAsymmetricIShapeProfileDef::is(Type::Enum v) const { return v == Type::IfcAsymmetricIShapeProfileDef || IfcParameterizedProfileDef::is(v); }
 Type::Enum IfcAsymmetricIShapeProfileDef::type() const { return Type::IfcAsymmetricIShapeProfileDef; }
 Type::Enum IfcAsymmetricIShapeProfileDef::Class() { return Type::IfcAsymmetricIShapeProfileDef; }
-IfcAsymmetricIShapeProfileDef::IfcAsymmetricIShapeProfileDef(IfcAbstractEntityPtr e) : IfcParameterizedProfileDef((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcAsymmetricIShapeProfileDef)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcAsymmetricIShapeProfileDef::IfcAsymmetricIShapeProfileDef(IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< IfcLabel > v2_ProfileName, IfcAxis2Placement2D* v3_Position, IfcPositiveLengthMeasure v4_BottomFlangeWidth, IfcPositiveLengthMeasure v5_OverallDepth, IfcPositiveLengthMeasure v6_WebThickness, IfcPositiveLengthMeasure v7_BottomFlangeThickness, boost::optional< IfcNonNegativeLengthMeasure > v8_BottomFlangeFilletRadius, IfcPositiveLengthMeasure v9_TopFlangeWidth, boost::optional< IfcPositiveLengthMeasure > v10_TopFlangeThickness, boost::optional< IfcNonNegativeLengthMeasure > v11_TopFlangeFilletRadius, boost::optional< IfcNonNegativeLengthMeasure > v12_BottomFlangeEdgeRadius, boost::optional< IfcPlaneAngleMeasure > v13_BottomFlangeSlope, boost::optional< IfcNonNegativeLengthMeasure > v14_TopFlangeEdgeRadius, boost::optional< IfcPlaneAngleMeasure > v15_TopFlangeSlope) : IfcParameterizedProfileDef((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,v1_ProfileType,IfcProfileTypeEnum::ToString(v1_ProfileType)); if (v2_ProfileName) { e->setArgument(1,(*v2_ProfileName)); } else { e->setArgument(1); } e->setArgument(2,(v3_Position)); e->setArgument(3,(v4_BottomFlangeWidth)); e->setArgument(4,(v5_OverallDepth)); e->setArgument(5,(v6_WebThickness)); e->setArgument(6,(v7_BottomFlangeThickness)); if (v8_BottomFlangeFilletRadius) { e->setArgument(7,(*v8_BottomFlangeFilletRadius)); } else { e->setArgument(7); } e->setArgument(8,(v9_TopFlangeWidth)); if (v10_TopFlangeThickness) { e->setArgument(9,(*v10_TopFlangeThickness)); } else { e->setArgument(9); } if (v11_TopFlangeFilletRadius) { e->setArgument(10,(*v11_TopFlangeFilletRadius)); } else { e->setArgument(10); } if (v12_BottomFlangeEdgeRadius) { e->setArgument(11,(*v12_BottomFlangeEdgeRadius)); } else { e->setArgument(11); } if (v13_BottomFlangeSlope) { e->setArgument(12,(*v13_BottomFlangeSlope)); } else { e->setArgument(12); } if (v14_TopFlangeEdgeRadius) { e->setArgument(13,(*v14_TopFlangeEdgeRadius)); } else { e->setArgument(13); } if (v15_TopFlangeSlope) { e->setArgument(14,(*v15_TopFlangeSlope)); } else { e->setArgument(14); } entity = e; EntityBuffer::Add(this); }
+IfcAsymmetricIShapeProfileDef::IfcAsymmetricIShapeProfileDef(IfcAbstractEntity* e) : IfcParameterizedProfileDef((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcAsymmetricIShapeProfileDef)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcAsymmetricIShapeProfileDef::IfcAsymmetricIShapeProfileDef(IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< std::string > v2_ProfileName, IfcAxis2Placement2D* v3_Position, double v4_BottomFlangeWidth, double v5_OverallDepth, double v6_WebThickness, double v7_BottomFlangeThickness, boost::optional< double > v8_BottomFlangeFilletRadius, double v9_TopFlangeWidth, boost::optional< double > v10_TopFlangeThickness, boost::optional< double > v11_TopFlangeFilletRadius, boost::optional< double > v12_BottomFlangeEdgeRadius, boost::optional< double > v13_BottomFlangeSlope, boost::optional< double > v14_TopFlangeEdgeRadius, boost::optional< double > v15_TopFlangeSlope) : IfcParameterizedProfileDef((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,v1_ProfileType,IfcProfileTypeEnum::ToString(v1_ProfileType)); if (v2_ProfileName) { e->setArgument(1,(*v2_ProfileName)); } else { e->setArgument(1); } e->setArgument(2,(v3_Position)); e->setArgument(3,(v4_BottomFlangeWidth)); e->setArgument(4,(v5_OverallDepth)); e->setArgument(5,(v6_WebThickness)); e->setArgument(6,(v7_BottomFlangeThickness)); if (v8_BottomFlangeFilletRadius) { e->setArgument(7,(*v8_BottomFlangeFilletRadius)); } else { e->setArgument(7); } e->setArgument(8,(v9_TopFlangeWidth)); if (v10_TopFlangeThickness) { e->setArgument(9,(*v10_TopFlangeThickness)); } else { e->setArgument(9); } if (v11_TopFlangeFilletRadius) { e->setArgument(10,(*v11_TopFlangeFilletRadius)); } else { e->setArgument(10); } if (v12_BottomFlangeEdgeRadius) { e->setArgument(11,(*v12_BottomFlangeEdgeRadius)); } else { e->setArgument(11); } if (v13_BottomFlangeSlope) { e->setArgument(12,(*v13_BottomFlangeSlope)); } else { e->setArgument(12); } if (v14_TopFlangeEdgeRadius) { e->setArgument(13,(*v14_TopFlangeEdgeRadius)); } else { e->setArgument(13); } if (v15_TopFlangeSlope) { e->setArgument(14,(*v15_TopFlangeSlope)); } else { e->setArgument(14); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcAudioVisualAppliance
-bool IfcAudioVisualAppliance::hasPredefinedType() { return !entity->getArgument(8)->isNull(); }
-IfcAudioVisualApplianceTypeEnum::IfcAudioVisualApplianceTypeEnum IfcAudioVisualAppliance::PredefinedType() { return IfcAudioVisualApplianceTypeEnum::FromString(*entity->getArgument(8)); }
+bool IfcAudioVisualAppliance::hasPredefinedType() const { return !entity->getArgument(8)->isNull(); }
+IfcAudioVisualApplianceTypeEnum::IfcAudioVisualApplianceTypeEnum IfcAudioVisualAppliance::PredefinedType() const { return IfcAudioVisualApplianceTypeEnum::FromString(*entity->getArgument(8)); }
 void IfcAudioVisualAppliance::setPredefinedType(IfcAudioVisualApplianceTypeEnum::IfcAudioVisualApplianceTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcAudioVisualApplianceTypeEnum::ToString(v)); }
 bool IfcAudioVisualAppliance::is(Type::Enum v) const { return v == Type::IfcAudioVisualAppliance || IfcFlowTerminal::is(v); }
 Type::Enum IfcAudioVisualAppliance::type() const { return Type::IfcAudioVisualAppliance; }
 Type::Enum IfcAudioVisualAppliance::Class() { return Type::IfcAudioVisualAppliance; }
-IfcAudioVisualAppliance::IfcAudioVisualAppliance(IfcAbstractEntityPtr e) : IfcFlowTerminal((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcAudioVisualAppliance)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcAudioVisualAppliance::IfcAudioVisualAppliance(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcAudioVisualApplianceTypeEnum::IfcAudioVisualApplianceTypeEnum > v9_PredefinedType) : IfcFlowTerminal((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcAudioVisualApplianceTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcAudioVisualAppliance::IfcAudioVisualAppliance(IfcAbstractEntity* e) : IfcFlowTerminal((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcAudioVisualAppliance)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcAudioVisualAppliance::IfcAudioVisualAppliance(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcAudioVisualApplianceTypeEnum::IfcAudioVisualApplianceTypeEnum > v9_PredefinedType) : IfcFlowTerminal((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcAudioVisualApplianceTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcAudioVisualApplianceType
-IfcAudioVisualApplianceTypeEnum::IfcAudioVisualApplianceTypeEnum IfcAudioVisualApplianceType::PredefinedType() { return IfcAudioVisualApplianceTypeEnum::FromString(*entity->getArgument(9)); }
+IfcAudioVisualApplianceTypeEnum::IfcAudioVisualApplianceTypeEnum IfcAudioVisualApplianceType::PredefinedType() const { return IfcAudioVisualApplianceTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcAudioVisualApplianceType::setPredefinedType(IfcAudioVisualApplianceTypeEnum::IfcAudioVisualApplianceTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcAudioVisualApplianceTypeEnum::ToString(v)); }
 bool IfcAudioVisualApplianceType::is(Type::Enum v) const { return v == Type::IfcAudioVisualApplianceType || IfcFlowTerminalType::is(v); }
 Type::Enum IfcAudioVisualApplianceType::type() const { return Type::IfcAudioVisualApplianceType; }
 Type::Enum IfcAudioVisualApplianceType::Class() { return Type::IfcAudioVisualApplianceType; }
-IfcAudioVisualApplianceType::IfcAudioVisualApplianceType(IfcAbstractEntityPtr e) : IfcFlowTerminalType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcAudioVisualApplianceType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcAudioVisualApplianceType::IfcAudioVisualApplianceType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcAudioVisualApplianceTypeEnum::IfcAudioVisualApplianceTypeEnum v10_PredefinedType) : IfcFlowTerminalType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcAudioVisualApplianceTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcAudioVisualApplianceType::IfcAudioVisualApplianceType(IfcAbstractEntity* e) : IfcFlowTerminalType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcAudioVisualApplianceType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcAudioVisualApplianceType::IfcAudioVisualApplianceType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcAudioVisualApplianceTypeEnum::IfcAudioVisualApplianceTypeEnum v10_PredefinedType) : IfcFlowTerminalType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcAudioVisualApplianceTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcAxis1Placement
-bool IfcAxis1Placement::hasAxis() { return !entity->getArgument(1)->isNull(); }
-IfcDirection* IfcAxis1Placement::Axis() { return (IfcDirection*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(1))); }
+bool IfcAxis1Placement::hasAxis() const { return !entity->getArgument(1)->isNull(); }
+IfcDirection* IfcAxis1Placement::Axis() const { return (IfcDirection*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(1))); }
 void IfcAxis1Placement::setAxis(IfcDirection* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
 bool IfcAxis1Placement::is(Type::Enum v) const { return v == Type::IfcAxis1Placement || IfcPlacement::is(v); }
 Type::Enum IfcAxis1Placement::type() const { return Type::IfcAxis1Placement; }
 Type::Enum IfcAxis1Placement::Class() { return Type::IfcAxis1Placement; }
-IfcAxis1Placement::IfcAxis1Placement(IfcAbstractEntityPtr e) : IfcPlacement((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcAxis1Placement)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcAxis1Placement::IfcAxis1Placement(IfcCartesianPoint* v1_Location, IfcDirection* v2_Axis) : IfcPlacement((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Location)); e->setArgument(1,(v2_Axis)); entity = e; EntityBuffer::Add(this); }
+IfcAxis1Placement::IfcAxis1Placement(IfcAbstractEntity* e) : IfcPlacement((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcAxis1Placement)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcAxis1Placement::IfcAxis1Placement(IfcCartesianPoint* v1_Location, IfcDirection* v2_Axis) : IfcPlacement((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Location)); e->setArgument(1,(v2_Axis)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcAxis2Placement2D
-bool IfcAxis2Placement2D::hasRefDirection() { return !entity->getArgument(1)->isNull(); }
-IfcDirection* IfcAxis2Placement2D::RefDirection() { return (IfcDirection*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(1))); }
+bool IfcAxis2Placement2D::hasRefDirection() const { return !entity->getArgument(1)->isNull(); }
+IfcDirection* IfcAxis2Placement2D::RefDirection() const { return (IfcDirection*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(1))); }
 void IfcAxis2Placement2D::setRefDirection(IfcDirection* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
 bool IfcAxis2Placement2D::is(Type::Enum v) const { return v == Type::IfcAxis2Placement2D || IfcPlacement::is(v); }
 Type::Enum IfcAxis2Placement2D::type() const { return Type::IfcAxis2Placement2D; }
 Type::Enum IfcAxis2Placement2D::Class() { return Type::IfcAxis2Placement2D; }
-IfcAxis2Placement2D::IfcAxis2Placement2D(IfcAbstractEntityPtr e) : IfcPlacement((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcAxis2Placement2D)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcAxis2Placement2D::IfcAxis2Placement2D(IfcCartesianPoint* v1_Location, IfcDirection* v2_RefDirection) : IfcPlacement((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Location)); e->setArgument(1,(v2_RefDirection)); entity = e; EntityBuffer::Add(this); }
+IfcAxis2Placement2D::IfcAxis2Placement2D(IfcAbstractEntity* e) : IfcPlacement((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcAxis2Placement2D)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcAxis2Placement2D::IfcAxis2Placement2D(IfcCartesianPoint* v1_Location, IfcDirection* v2_RefDirection) : IfcPlacement((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Location)); e->setArgument(1,(v2_RefDirection)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcAxis2Placement3D
-bool IfcAxis2Placement3D::hasAxis() { return !entity->getArgument(1)->isNull(); }
-IfcDirection* IfcAxis2Placement3D::Axis() { return (IfcDirection*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(1))); }
+bool IfcAxis2Placement3D::hasAxis() const { return !entity->getArgument(1)->isNull(); }
+IfcDirection* IfcAxis2Placement3D::Axis() const { return (IfcDirection*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(1))); }
 void IfcAxis2Placement3D::setAxis(IfcDirection* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-bool IfcAxis2Placement3D::hasRefDirection() { return !entity->getArgument(2)->isNull(); }
-IfcDirection* IfcAxis2Placement3D::RefDirection() { return (IfcDirection*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(2))); }
+bool IfcAxis2Placement3D::hasRefDirection() const { return !entity->getArgument(2)->isNull(); }
+IfcDirection* IfcAxis2Placement3D::RefDirection() const { return (IfcDirection*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(2))); }
 void IfcAxis2Placement3D::setRefDirection(IfcDirection* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
 bool IfcAxis2Placement3D::is(Type::Enum v) const { return v == Type::IfcAxis2Placement3D || IfcPlacement::is(v); }
 Type::Enum IfcAxis2Placement3D::type() const { return Type::IfcAxis2Placement3D; }
 Type::Enum IfcAxis2Placement3D::Class() { return Type::IfcAxis2Placement3D; }
-IfcAxis2Placement3D::IfcAxis2Placement3D(IfcAbstractEntityPtr e) : IfcPlacement((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcAxis2Placement3D)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcAxis2Placement3D::IfcAxis2Placement3D(IfcCartesianPoint* v1_Location, IfcDirection* v2_Axis, IfcDirection* v3_RefDirection) : IfcPlacement((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Location)); e->setArgument(1,(v2_Axis)); e->setArgument(2,(v3_RefDirection)); entity = e; EntityBuffer::Add(this); }
+IfcAxis2Placement3D::IfcAxis2Placement3D(IfcAbstractEntity* e) : IfcPlacement((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcAxis2Placement3D)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcAxis2Placement3D::IfcAxis2Placement3D(IfcCartesianPoint* v1_Location, IfcDirection* v2_Axis, IfcDirection* v3_RefDirection) : IfcPlacement((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Location)); e->setArgument(1,(v2_Axis)); e->setArgument(2,(v3_RefDirection)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcBSplineCurve
-int IfcBSplineCurve::Degree() { return *entity->getArgument(0); }
+int IfcBSplineCurve::Degree() const { return *entity->getArgument(0); }
 void IfcBSplineCurve::setDegree(int v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-SHARED_PTR< IfcTemplatedEntityList< IfcCartesianPoint > > IfcBSplineCurve::ControlPointsList() { RETURN_AS_LIST(IfcCartesianPoint,1) }
-void IfcBSplineCurve::setControlPointsList(SHARED_PTR< IfcTemplatedEntityList< IfcCartesianPoint > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v->generalize()); }
-IfcBSplineCurveForm::IfcBSplineCurveForm IfcBSplineCurve::CurveForm() { return IfcBSplineCurveForm::FromString(*entity->getArgument(2)); }
+IfcTemplatedEntityList< IfcCartesianPoint >::ptr IfcBSplineCurve::ControlPointsList() const { IfcEntityList::ptr es = *entity->getArgument(1); return es->as<IfcCartesianPoint>(); }
+void IfcBSplineCurve::setControlPointsList(IfcTemplatedEntityList< IfcCartesianPoint >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v->generalize()); }
+IfcBSplineCurveForm::IfcBSplineCurveForm IfcBSplineCurve::CurveForm() const { return IfcBSplineCurveForm::FromString(*entity->getArgument(2)); }
 void IfcBSplineCurve::setCurveForm(IfcBSplineCurveForm::IfcBSplineCurveForm v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v,IfcBSplineCurveForm::ToString(v)); }
-bool IfcBSplineCurve::ClosedCurve() { return *entity->getArgument(3); }
+bool IfcBSplineCurve::ClosedCurve() const { return *entity->getArgument(3); }
 void IfcBSplineCurve::setClosedCurve(bool v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-bool IfcBSplineCurve::SelfIntersect() { return *entity->getArgument(4); }
+bool IfcBSplineCurve::SelfIntersect() const { return *entity->getArgument(4); }
 void IfcBSplineCurve::setSelfIntersect(bool v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
 bool IfcBSplineCurve::is(Type::Enum v) const { return v == Type::IfcBSplineCurve || IfcBoundedCurve::is(v); }
 Type::Enum IfcBSplineCurve::type() const { return Type::IfcBSplineCurve; }
 Type::Enum IfcBSplineCurve::Class() { return Type::IfcBSplineCurve; }
-IfcBSplineCurve::IfcBSplineCurve(IfcAbstractEntityPtr e) : IfcBoundedCurve((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcBSplineCurve)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcBSplineCurve::IfcBSplineCurve(int v1_Degree, SHARED_PTR< IfcTemplatedEntityList< IfcCartesianPoint > > v2_ControlPointsList, IfcBSplineCurveForm::IfcBSplineCurveForm v3_CurveForm, bool v4_ClosedCurve, bool v5_SelfIntersect) : IfcBoundedCurve((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Degree)); e->setArgument(1,(v2_ControlPointsList)->generalize()); e->setArgument(2,v3_CurveForm,IfcBSplineCurveForm::ToString(v3_CurveForm)); e->setArgument(3,(v4_ClosedCurve)); e->setArgument(4,(v5_SelfIntersect)); entity = e; EntityBuffer::Add(this); }
+IfcBSplineCurve::IfcBSplineCurve(IfcAbstractEntity* e) : IfcBoundedCurve((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcBSplineCurve)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcBSplineCurve::IfcBSplineCurve(int v1_Degree, IfcTemplatedEntityList< IfcCartesianPoint >::ptr v2_ControlPointsList, IfcBSplineCurveForm::IfcBSplineCurveForm v3_CurveForm, bool v4_ClosedCurve, bool v5_SelfIntersect) : IfcBoundedCurve((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Degree)); e->setArgument(1,(v2_ControlPointsList)->generalize()); e->setArgument(2,v3_CurveForm,IfcBSplineCurveForm::ToString(v3_CurveForm)); e->setArgument(3,(v4_ClosedCurve)); e->setArgument(4,(v5_SelfIntersect)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcBSplineCurveWithKnots
-std::vector< int > /*[2:?]*/ IfcBSplineCurveWithKnots::KnotMultiplicities() { return *entity->getArgument(5); }
+std::vector< int > /*[2:?]*/ IfcBSplineCurveWithKnots::KnotMultiplicities() const { return *entity->getArgument(5); }
 void IfcBSplineCurveWithKnots::setKnotMultiplicities(std::vector< int > /*[2:?]*/ v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-std::vector< IfcParameterValue > /*[2:?]*/ IfcBSplineCurveWithKnots::Knots() { return *entity->getArgument(6); }
-void IfcBSplineCurveWithKnots::setKnots(std::vector< IfcParameterValue > /*[2:?]*/ v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
-IfcKnotType::IfcKnotType IfcBSplineCurveWithKnots::KnotSpec() { return IfcKnotType::FromString(*entity->getArgument(7)); }
+std::vector< double > /*[2:?]*/ IfcBSplineCurveWithKnots::Knots() const { return *entity->getArgument(6); }
+void IfcBSplineCurveWithKnots::setKnots(std::vector< double > /*[2:?]*/ v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
+IfcKnotType::IfcKnotType IfcBSplineCurveWithKnots::KnotSpec() const { return IfcKnotType::FromString(*entity->getArgument(7)); }
 void IfcBSplineCurveWithKnots::setKnotSpec(IfcKnotType::IfcKnotType v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v,IfcKnotType::ToString(v)); }
 bool IfcBSplineCurveWithKnots::is(Type::Enum v) const { return v == Type::IfcBSplineCurveWithKnots || IfcBSplineCurve::is(v); }
 Type::Enum IfcBSplineCurveWithKnots::type() const { return Type::IfcBSplineCurveWithKnots; }
 Type::Enum IfcBSplineCurveWithKnots::Class() { return Type::IfcBSplineCurveWithKnots; }
-IfcBSplineCurveWithKnots::IfcBSplineCurveWithKnots(IfcAbstractEntityPtr e) : IfcBSplineCurve((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcBSplineCurveWithKnots)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcBSplineCurveWithKnots::IfcBSplineCurveWithKnots(int v1_Degree, SHARED_PTR< IfcTemplatedEntityList< IfcCartesianPoint > > v2_ControlPointsList, IfcBSplineCurveForm::IfcBSplineCurveForm v3_CurveForm, bool v4_ClosedCurve, bool v5_SelfIntersect, std::vector< int > /*[2:?]*/ v6_KnotMultiplicities, std::vector< IfcParameterValue > /*[2:?]*/ v7_Knots, IfcKnotType::IfcKnotType v8_KnotSpec) : IfcBSplineCurve((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Degree)); e->setArgument(1,(v2_ControlPointsList)->generalize()); e->setArgument(2,v3_CurveForm,IfcBSplineCurveForm::ToString(v3_CurveForm)); e->setArgument(3,(v4_ClosedCurve)); e->setArgument(4,(v5_SelfIntersect)); e->setArgument(5,(v6_KnotMultiplicities)); e->setArgument(6,(v7_Knots)); e->setArgument(7,v8_KnotSpec,IfcKnotType::ToString(v8_KnotSpec)); entity = e; EntityBuffer::Add(this); }
+IfcBSplineCurveWithKnots::IfcBSplineCurveWithKnots(IfcAbstractEntity* e) : IfcBSplineCurve((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcBSplineCurveWithKnots)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcBSplineCurveWithKnots::IfcBSplineCurveWithKnots(int v1_Degree, IfcTemplatedEntityList< IfcCartesianPoint >::ptr v2_ControlPointsList, IfcBSplineCurveForm::IfcBSplineCurveForm v3_CurveForm, bool v4_ClosedCurve, bool v5_SelfIntersect, std::vector< int > /*[2:?]*/ v6_KnotMultiplicities, std::vector< double > /*[2:?]*/ v7_Knots, IfcKnotType::IfcKnotType v8_KnotSpec) : IfcBSplineCurve((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Degree)); e->setArgument(1,(v2_ControlPointsList)->generalize()); e->setArgument(2,v3_CurveForm,IfcBSplineCurveForm::ToString(v3_CurveForm)); e->setArgument(3,(v4_ClosedCurve)); e->setArgument(4,(v5_SelfIntersect)); e->setArgument(5,(v6_KnotMultiplicities)); e->setArgument(6,(v7_Knots)); e->setArgument(7,v8_KnotSpec,IfcKnotType::ToString(v8_KnotSpec)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcBSplineSurface
-int IfcBSplineSurface::UDegree() { return *entity->getArgument(0); }
+int IfcBSplineSurface::UDegree() const { return *entity->getArgument(0); }
 void IfcBSplineSurface::setUDegree(int v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-int IfcBSplineSurface::VDegree() { return *entity->getArgument(1); }
+int IfcBSplineSurface::VDegree() const { return *entity->getArgument(1); }
 void IfcBSplineSurface::setVDegree(int v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-IfcBSplineSurfaceForm::IfcBSplineSurfaceForm IfcBSplineSurface::SurfaceForm() { return IfcBSplineSurfaceForm::FromString(*entity->getArgument(3)); }
+IfcTemplatedEntityListList< IfcCartesianPoint >::ptr IfcBSplineSurface::ControlPointsList() const { IfcEntityListList::ptr es = *entity->getArgument(2); return es->as<IfcCartesianPoint>(); }
+void IfcBSplineSurface::setControlPointsList(IfcTemplatedEntityListList< IfcCartesianPoint >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v->generalize()); }
+IfcBSplineSurfaceForm::IfcBSplineSurfaceForm IfcBSplineSurface::SurfaceForm() const { return IfcBSplineSurfaceForm::FromString(*entity->getArgument(3)); }
 void IfcBSplineSurface::setSurfaceForm(IfcBSplineSurfaceForm::IfcBSplineSurfaceForm v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v,IfcBSplineSurfaceForm::ToString(v)); }
-bool IfcBSplineSurface::UClosed() { return *entity->getArgument(4); }
+bool IfcBSplineSurface::UClosed() const { return *entity->getArgument(4); }
 void IfcBSplineSurface::setUClosed(bool v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-bool IfcBSplineSurface::VClosed() { return *entity->getArgument(5); }
+bool IfcBSplineSurface::VClosed() const { return *entity->getArgument(5); }
 void IfcBSplineSurface::setVClosed(bool v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-bool IfcBSplineSurface::SelfIntersect() { return *entity->getArgument(6); }
+bool IfcBSplineSurface::SelfIntersect() const { return *entity->getArgument(6); }
 void IfcBSplineSurface::setSelfIntersect(bool v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
 bool IfcBSplineSurface::is(Type::Enum v) const { return v == Type::IfcBSplineSurface || IfcBoundedSurface::is(v); }
 Type::Enum IfcBSplineSurface::type() const { return Type::IfcBSplineSurface; }
 Type::Enum IfcBSplineSurface::Class() { return Type::IfcBSplineSurface; }
-IfcBSplineSurface::IfcBSplineSurface(IfcAbstractEntityPtr e) : IfcBoundedSurface((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcBSplineSurface)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcBSplineSurface::IfcBSplineSurface(int v1_UDegree, int v2_VDegree, IfcBSplineSurfaceForm::IfcBSplineSurfaceForm v4_SurfaceForm, bool v5_UClosed, bool v6_VClosed, bool v7_SelfIntersect) : IfcBoundedSurface((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_UDegree)); e->setArgument(1,(v2_VDegree)); e->setArgument(3,v4_SurfaceForm,IfcBSplineSurfaceForm::ToString(v4_SurfaceForm)); e->setArgument(4,(v5_UClosed)); e->setArgument(5,(v6_VClosed)); e->setArgument(6,(v7_SelfIntersect)); entity = e; EntityBuffer::Add(this); }
+IfcBSplineSurface::IfcBSplineSurface(IfcAbstractEntity* e) : IfcBoundedSurface((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcBSplineSurface)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcBSplineSurface::IfcBSplineSurface(int v1_UDegree, int v2_VDegree, IfcTemplatedEntityListList< IfcCartesianPoint >::ptr v3_ControlPointsList, IfcBSplineSurfaceForm::IfcBSplineSurfaceForm v4_SurfaceForm, bool v5_UClosed, bool v6_VClosed, bool v7_SelfIntersect) : IfcBoundedSurface((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_UDegree)); e->setArgument(1,(v2_VDegree)); e->setArgument(2,(v3_ControlPointsList)->generalize()); e->setArgument(3,v4_SurfaceForm,IfcBSplineSurfaceForm::ToString(v4_SurfaceForm)); e->setArgument(4,(v5_UClosed)); e->setArgument(5,(v6_VClosed)); e->setArgument(6,(v7_SelfIntersect)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcBSplineSurfaceWithKnots
-std::vector< int > /*[2:?]*/ IfcBSplineSurfaceWithKnots::UMultiplicities() { return *entity->getArgument(7); }
+std::vector< int > /*[2:?]*/ IfcBSplineSurfaceWithKnots::UMultiplicities() const { return *entity->getArgument(7); }
 void IfcBSplineSurfaceWithKnots::setUMultiplicities(std::vector< int > /*[2:?]*/ v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
-std::vector< int > /*[2:?]*/ IfcBSplineSurfaceWithKnots::VMultiplicities() { return *entity->getArgument(8); }
+std::vector< int > /*[2:?]*/ IfcBSplineSurfaceWithKnots::VMultiplicities() const { return *entity->getArgument(8); }
 void IfcBSplineSurfaceWithKnots::setVMultiplicities(std::vector< int > /*[2:?]*/ v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
-std::vector< IfcParameterValue > /*[2:?]*/ IfcBSplineSurfaceWithKnots::UKnots() { return *entity->getArgument(9); }
-void IfcBSplineSurfaceWithKnots::setUKnots(std::vector< IfcParameterValue > /*[2:?]*/ v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
-std::vector< IfcParameterValue > /*[2:?]*/ IfcBSplineSurfaceWithKnots::VKnots() { return *entity->getArgument(10); }
-void IfcBSplineSurfaceWithKnots::setVKnots(std::vector< IfcParameterValue > /*[2:?]*/ v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
-IfcKnotType::IfcKnotType IfcBSplineSurfaceWithKnots::KnotSpec() { return IfcKnotType::FromString(*entity->getArgument(11)); }
+std::vector< double > /*[2:?]*/ IfcBSplineSurfaceWithKnots::UKnots() const { return *entity->getArgument(9); }
+void IfcBSplineSurfaceWithKnots::setUKnots(std::vector< double > /*[2:?]*/ v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
+std::vector< double > /*[2:?]*/ IfcBSplineSurfaceWithKnots::VKnots() const { return *entity->getArgument(10); }
+void IfcBSplineSurfaceWithKnots::setVKnots(std::vector< double > /*[2:?]*/ v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
+IfcKnotType::IfcKnotType IfcBSplineSurfaceWithKnots::KnotSpec() const { return IfcKnotType::FromString(*entity->getArgument(11)); }
 void IfcBSplineSurfaceWithKnots::setKnotSpec(IfcKnotType::IfcKnotType v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(11,v,IfcKnotType::ToString(v)); }
 bool IfcBSplineSurfaceWithKnots::is(Type::Enum v) const { return v == Type::IfcBSplineSurfaceWithKnots || IfcBSplineSurface::is(v); }
 Type::Enum IfcBSplineSurfaceWithKnots::type() const { return Type::IfcBSplineSurfaceWithKnots; }
 Type::Enum IfcBSplineSurfaceWithKnots::Class() { return Type::IfcBSplineSurfaceWithKnots; }
-IfcBSplineSurfaceWithKnots::IfcBSplineSurfaceWithKnots(IfcAbstractEntityPtr e) : IfcBSplineSurface((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcBSplineSurfaceWithKnots)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcBSplineSurfaceWithKnots::IfcBSplineSurfaceWithKnots(int v1_UDegree, int v2_VDegree, IfcBSplineSurfaceForm::IfcBSplineSurfaceForm v4_SurfaceForm, bool v5_UClosed, bool v6_VClosed, bool v7_SelfIntersect, std::vector< int > /*[2:?]*/ v8_UMultiplicities, std::vector< int > /*[2:?]*/ v9_VMultiplicities, std::vector< IfcParameterValue > /*[2:?]*/ v10_UKnots, std::vector< IfcParameterValue > /*[2:?]*/ v11_VKnots, IfcKnotType::IfcKnotType v12_KnotSpec) : IfcBSplineSurface((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_UDegree)); e->setArgument(1,(v2_VDegree)); e->setArgument(3,v4_SurfaceForm,IfcBSplineSurfaceForm::ToString(v4_SurfaceForm)); e->setArgument(4,(v5_UClosed)); e->setArgument(5,(v6_VClosed)); e->setArgument(6,(v7_SelfIntersect)); e->setArgument(7,(v8_UMultiplicities)); e->setArgument(8,(v9_VMultiplicities)); e->setArgument(9,(v10_UKnots)); e->setArgument(10,(v11_VKnots)); e->setArgument(11,v12_KnotSpec,IfcKnotType::ToString(v12_KnotSpec)); entity = e; EntityBuffer::Add(this); }
+IfcBSplineSurfaceWithKnots::IfcBSplineSurfaceWithKnots(IfcAbstractEntity* e) : IfcBSplineSurface((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcBSplineSurfaceWithKnots)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcBSplineSurfaceWithKnots::IfcBSplineSurfaceWithKnots(int v1_UDegree, int v2_VDegree, IfcTemplatedEntityListList< IfcCartesianPoint >::ptr v3_ControlPointsList, IfcBSplineSurfaceForm::IfcBSplineSurfaceForm v4_SurfaceForm, bool v5_UClosed, bool v6_VClosed, bool v7_SelfIntersect, std::vector< int > /*[2:?]*/ v8_UMultiplicities, std::vector< int > /*[2:?]*/ v9_VMultiplicities, std::vector< double > /*[2:?]*/ v10_UKnots, std::vector< double > /*[2:?]*/ v11_VKnots, IfcKnotType::IfcKnotType v12_KnotSpec) : IfcBSplineSurface((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_UDegree)); e->setArgument(1,(v2_VDegree)); e->setArgument(2,(v3_ControlPointsList)->generalize()); e->setArgument(3,v4_SurfaceForm,IfcBSplineSurfaceForm::ToString(v4_SurfaceForm)); e->setArgument(4,(v5_UClosed)); e->setArgument(5,(v6_VClosed)); e->setArgument(6,(v7_SelfIntersect)); e->setArgument(7,(v8_UMultiplicities)); e->setArgument(8,(v9_VMultiplicities)); e->setArgument(9,(v10_UKnots)); e->setArgument(10,(v11_VKnots)); e->setArgument(11,v12_KnotSpec,IfcKnotType::ToString(v12_KnotSpec)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcBeam
-bool IfcBeam::hasPredefinedType() { return !entity->getArgument(8)->isNull(); }
-IfcBeamTypeEnum::IfcBeamTypeEnum IfcBeam::PredefinedType() { return IfcBeamTypeEnum::FromString(*entity->getArgument(8)); }
+bool IfcBeam::hasPredefinedType() const { return !entity->getArgument(8)->isNull(); }
+IfcBeamTypeEnum::IfcBeamTypeEnum IfcBeam::PredefinedType() const { return IfcBeamTypeEnum::FromString(*entity->getArgument(8)); }
 void IfcBeam::setPredefinedType(IfcBeamTypeEnum::IfcBeamTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcBeamTypeEnum::ToString(v)); }
 bool IfcBeam::is(Type::Enum v) const { return v == Type::IfcBeam || IfcBuildingElement::is(v); }
 Type::Enum IfcBeam::type() const { return Type::IfcBeam; }
 Type::Enum IfcBeam::Class() { return Type::IfcBeam; }
-IfcBeam::IfcBeam(IfcAbstractEntityPtr e) : IfcBuildingElement((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcBeam)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcBeam::IfcBeam(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcBeamTypeEnum::IfcBeamTypeEnum > v9_PredefinedType) : IfcBuildingElement((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcBeamTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcBeam::IfcBeam(IfcAbstractEntity* e) : IfcBuildingElement((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcBeam)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcBeam::IfcBeam(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcBeamTypeEnum::IfcBeamTypeEnum > v9_PredefinedType) : IfcBuildingElement((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcBeamTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcBeamStandardCase
 bool IfcBeamStandardCase::is(Type::Enum v) const { return v == Type::IfcBeamStandardCase || IfcBeam::is(v); }
 Type::Enum IfcBeamStandardCase::type() const { return Type::IfcBeamStandardCase; }
 Type::Enum IfcBeamStandardCase::Class() { return Type::IfcBeamStandardCase; }
-IfcBeamStandardCase::IfcBeamStandardCase(IfcAbstractEntityPtr e) : IfcBeam((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcBeamStandardCase)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcBeamStandardCase::IfcBeamStandardCase(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcBeamTypeEnum::IfcBeamTypeEnum > v9_PredefinedType) : IfcBeam((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcBeamTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcBeamStandardCase::IfcBeamStandardCase(IfcAbstractEntity* e) : IfcBeam((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcBeamStandardCase)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcBeamStandardCase::IfcBeamStandardCase(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcBeamTypeEnum::IfcBeamTypeEnum > v9_PredefinedType) : IfcBeam((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcBeamTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcBeamType
-IfcBeamTypeEnum::IfcBeamTypeEnum IfcBeamType::PredefinedType() { return IfcBeamTypeEnum::FromString(*entity->getArgument(9)); }
+IfcBeamTypeEnum::IfcBeamTypeEnum IfcBeamType::PredefinedType() const { return IfcBeamTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcBeamType::setPredefinedType(IfcBeamTypeEnum::IfcBeamTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcBeamTypeEnum::ToString(v)); }
 bool IfcBeamType::is(Type::Enum v) const { return v == Type::IfcBeamType || IfcBuildingElementType::is(v); }
 Type::Enum IfcBeamType::type() const { return Type::IfcBeamType; }
 Type::Enum IfcBeamType::Class() { return Type::IfcBeamType; }
-IfcBeamType::IfcBeamType(IfcAbstractEntityPtr e) : IfcBuildingElementType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcBeamType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcBeamType::IfcBeamType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcBeamTypeEnum::IfcBeamTypeEnum v10_PredefinedType) : IfcBuildingElementType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcBeamTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcBeamType::IfcBeamType(IfcAbstractEntity* e) : IfcBuildingElementType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcBeamType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcBeamType::IfcBeamType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcBeamTypeEnum::IfcBeamTypeEnum v10_PredefinedType) : IfcBuildingElementType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcBeamTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcBlobTexture
-IfcIdentifier IfcBlobTexture::RasterFormat() { return *entity->getArgument(5); }
-void IfcBlobTexture::setRasterFormat(IfcIdentifier v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+std::string IfcBlobTexture::RasterFormat() const { return *entity->getArgument(5); }
+void IfcBlobTexture::setRasterFormat(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
 bool IfcBlobTexture::is(Type::Enum v) const { return v == Type::IfcBlobTexture || IfcSurfaceTexture::is(v); }
 Type::Enum IfcBlobTexture::type() const { return Type::IfcBlobTexture; }
 Type::Enum IfcBlobTexture::Class() { return Type::IfcBlobTexture; }
-IfcBlobTexture::IfcBlobTexture(IfcAbstractEntityPtr e) : IfcSurfaceTexture((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcBlobTexture)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcBlobTexture::IfcBlobTexture(bool v1_RepeatS, bool v2_RepeatT, boost::optional< IfcIdentifier > v3_Mode, IfcCartesianTransformationOperator2D* v4_TextureTransform, boost::optional< std::vector< IfcIdentifier > /*[1:?]*/ > v5_Parameter, IfcIdentifier v6_RasterFormat) : IfcSurfaceTexture((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_RepeatS)); e->setArgument(1,(v2_RepeatT)); if (v3_Mode) { e->setArgument(2,(*v3_Mode)); } else { e->setArgument(2); } e->setArgument(3,(v4_TextureTransform)); if (v5_Parameter) { e->setArgument(4,(*v5_Parameter)); } else { e->setArgument(4); } e->setArgument(5,(v6_RasterFormat)); entity = e; EntityBuffer::Add(this); }
+IfcBlobTexture::IfcBlobTexture(IfcAbstractEntity* e) : IfcSurfaceTexture((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcBlobTexture)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcBlobTexture::IfcBlobTexture(bool v1_RepeatS, bool v2_RepeatT, boost::optional< std::string > v3_Mode, IfcCartesianTransformationOperator2D* v4_TextureTransform, boost::optional< std::vector< std::string > /*[1:?]*/ > v5_Parameter, std::string v6_RasterFormat) : IfcSurfaceTexture((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_RepeatS)); e->setArgument(1,(v2_RepeatT)); if (v3_Mode) { e->setArgument(2,(*v3_Mode)); } else { e->setArgument(2); } e->setArgument(3,(v4_TextureTransform)); if (v5_Parameter) { e->setArgument(4,(*v5_Parameter)); } else { e->setArgument(4); } e->setArgument(5,(v6_RasterFormat)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcBlock
-IfcPositiveLengthMeasure IfcBlock::XLength() { return *entity->getArgument(1); }
-void IfcBlock::setXLength(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-IfcPositiveLengthMeasure IfcBlock::YLength() { return *entity->getArgument(2); }
-void IfcBlock::setYLength(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-IfcPositiveLengthMeasure IfcBlock::ZLength() { return *entity->getArgument(3); }
-void IfcBlock::setZLength(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+double IfcBlock::XLength() const { return *entity->getArgument(1); }
+void IfcBlock::setXLength(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+double IfcBlock::YLength() const { return *entity->getArgument(2); }
+void IfcBlock::setYLength(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+double IfcBlock::ZLength() const { return *entity->getArgument(3); }
+void IfcBlock::setZLength(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
 bool IfcBlock::is(Type::Enum v) const { return v == Type::IfcBlock || IfcCsgPrimitive3D::is(v); }
 Type::Enum IfcBlock::type() const { return Type::IfcBlock; }
 Type::Enum IfcBlock::Class() { return Type::IfcBlock; }
-IfcBlock::IfcBlock(IfcAbstractEntityPtr e) : IfcCsgPrimitive3D((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcBlock)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcBlock::IfcBlock(IfcAxis2Placement3D* v1_Position, IfcPositiveLengthMeasure v2_XLength, IfcPositiveLengthMeasure v3_YLength, IfcPositiveLengthMeasure v4_ZLength) : IfcCsgPrimitive3D((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Position)); e->setArgument(1,(v2_XLength)); e->setArgument(2,(v3_YLength)); e->setArgument(3,(v4_ZLength)); entity = e; EntityBuffer::Add(this); }
+IfcBlock::IfcBlock(IfcAbstractEntity* e) : IfcCsgPrimitive3D((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcBlock)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcBlock::IfcBlock(IfcAxis2Placement3D* v1_Position, double v2_XLength, double v3_YLength, double v4_ZLength) : IfcCsgPrimitive3D((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Position)); e->setArgument(1,(v2_XLength)); e->setArgument(2,(v3_YLength)); e->setArgument(3,(v4_ZLength)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcBoiler
-bool IfcBoiler::hasPredefinedType() { return !entity->getArgument(8)->isNull(); }
-IfcBoilerTypeEnum::IfcBoilerTypeEnum IfcBoiler::PredefinedType() { return IfcBoilerTypeEnum::FromString(*entity->getArgument(8)); }
+bool IfcBoiler::hasPredefinedType() const { return !entity->getArgument(8)->isNull(); }
+IfcBoilerTypeEnum::IfcBoilerTypeEnum IfcBoiler::PredefinedType() const { return IfcBoilerTypeEnum::FromString(*entity->getArgument(8)); }
 void IfcBoiler::setPredefinedType(IfcBoilerTypeEnum::IfcBoilerTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcBoilerTypeEnum::ToString(v)); }
 bool IfcBoiler::is(Type::Enum v) const { return v == Type::IfcBoiler || IfcEnergyConversionDevice::is(v); }
 Type::Enum IfcBoiler::type() const { return Type::IfcBoiler; }
 Type::Enum IfcBoiler::Class() { return Type::IfcBoiler; }
-IfcBoiler::IfcBoiler(IfcAbstractEntityPtr e) : IfcEnergyConversionDevice((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcBoiler)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcBoiler::IfcBoiler(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcBoilerTypeEnum::IfcBoilerTypeEnum > v9_PredefinedType) : IfcEnergyConversionDevice((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcBoilerTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcBoiler::IfcBoiler(IfcAbstractEntity* e) : IfcEnergyConversionDevice((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcBoiler)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcBoiler::IfcBoiler(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcBoilerTypeEnum::IfcBoilerTypeEnum > v9_PredefinedType) : IfcEnergyConversionDevice((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcBoilerTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcBoilerType
-IfcBoilerTypeEnum::IfcBoilerTypeEnum IfcBoilerType::PredefinedType() { return IfcBoilerTypeEnum::FromString(*entity->getArgument(9)); }
+IfcBoilerTypeEnum::IfcBoilerTypeEnum IfcBoilerType::PredefinedType() const { return IfcBoilerTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcBoilerType::setPredefinedType(IfcBoilerTypeEnum::IfcBoilerTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcBoilerTypeEnum::ToString(v)); }
 bool IfcBoilerType::is(Type::Enum v) const { return v == Type::IfcBoilerType || IfcEnergyConversionDeviceType::is(v); }
 Type::Enum IfcBoilerType::type() const { return Type::IfcBoilerType; }
 Type::Enum IfcBoilerType::Class() { return Type::IfcBoilerType; }
-IfcBoilerType::IfcBoilerType(IfcAbstractEntityPtr e) : IfcEnergyConversionDeviceType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcBoilerType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcBoilerType::IfcBoilerType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcBoilerTypeEnum::IfcBoilerTypeEnum v10_PredefinedType) : IfcEnergyConversionDeviceType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcBoilerTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcBoilerType::IfcBoilerType(IfcAbstractEntity* e) : IfcEnergyConversionDeviceType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcBoilerType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcBoilerType::IfcBoilerType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcBoilerTypeEnum::IfcBoilerTypeEnum v10_PredefinedType) : IfcEnergyConversionDeviceType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcBoilerTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcBooleanClippingResult
 bool IfcBooleanClippingResult::is(Type::Enum v) const { return v == Type::IfcBooleanClippingResult || IfcBooleanResult::is(v); }
 Type::Enum IfcBooleanClippingResult::type() const { return Type::IfcBooleanClippingResult; }
 Type::Enum IfcBooleanClippingResult::Class() { return Type::IfcBooleanClippingResult; }
-IfcBooleanClippingResult::IfcBooleanClippingResult(IfcAbstractEntityPtr e) : IfcBooleanResult((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcBooleanClippingResult)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcBooleanClippingResult::IfcBooleanClippingResult(IfcBooleanOperator::IfcBooleanOperator v1_Operator, IfcBooleanOperand v2_FirstOperand, IfcBooleanOperand v3_SecondOperand) : IfcBooleanResult((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,v1_Operator,IfcBooleanOperator::ToString(v1_Operator)); e->setArgument(1,(v2_FirstOperand)); e->setArgument(2,(v3_SecondOperand)); entity = e; EntityBuffer::Add(this); }
+IfcBooleanClippingResult::IfcBooleanClippingResult(IfcAbstractEntity* e) : IfcBooleanResult((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcBooleanClippingResult)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcBooleanClippingResult::IfcBooleanClippingResult(IfcBooleanOperator::IfcBooleanOperator v1_Operator, IfcBooleanOperand* v2_FirstOperand, IfcBooleanOperand* v3_SecondOperand) : IfcBooleanResult((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,v1_Operator,IfcBooleanOperator::ToString(v1_Operator)); e->setArgument(1,(v2_FirstOperand)); e->setArgument(2,(v3_SecondOperand)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcBooleanResult
-IfcBooleanOperator::IfcBooleanOperator IfcBooleanResult::Operator() { return IfcBooleanOperator::FromString(*entity->getArgument(0)); }
+IfcBooleanOperator::IfcBooleanOperator IfcBooleanResult::Operator() const { return IfcBooleanOperator::FromString(*entity->getArgument(0)); }
 void IfcBooleanResult::setOperator(IfcBooleanOperator::IfcBooleanOperator v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v,IfcBooleanOperator::ToString(v)); }
-IfcBooleanOperand IfcBooleanResult::FirstOperand() { return *entity->getArgument(1); }
-void IfcBooleanResult::setFirstOperand(IfcBooleanOperand v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-IfcBooleanOperand IfcBooleanResult::SecondOperand() { return *entity->getArgument(2); }
-void IfcBooleanResult::setSecondOperand(IfcBooleanOperand v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+IfcBooleanOperand* IfcBooleanResult::FirstOperand() const { return (IfcBooleanOperand*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(1))); }
+void IfcBooleanResult::setFirstOperand(IfcBooleanOperand* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+IfcBooleanOperand* IfcBooleanResult::SecondOperand() const { return (IfcBooleanOperand*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(2))); }
+void IfcBooleanResult::setSecondOperand(IfcBooleanOperand* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
 bool IfcBooleanResult::is(Type::Enum v) const { return v == Type::IfcBooleanResult || IfcGeometricRepresentationItem::is(v); }
 Type::Enum IfcBooleanResult::type() const { return Type::IfcBooleanResult; }
 Type::Enum IfcBooleanResult::Class() { return Type::IfcBooleanResult; }
-IfcBooleanResult::IfcBooleanResult(IfcAbstractEntityPtr e) : IfcGeometricRepresentationItem((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcBooleanResult)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcBooleanResult::IfcBooleanResult(IfcBooleanOperator::IfcBooleanOperator v1_Operator, IfcBooleanOperand v2_FirstOperand, IfcBooleanOperand v3_SecondOperand) : IfcGeometricRepresentationItem((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,v1_Operator,IfcBooleanOperator::ToString(v1_Operator)); e->setArgument(1,(v2_FirstOperand)); e->setArgument(2,(v3_SecondOperand)); entity = e; EntityBuffer::Add(this); }
+IfcBooleanResult::IfcBooleanResult(IfcAbstractEntity* e) : IfcGeometricRepresentationItem((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcBooleanResult)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcBooleanResult::IfcBooleanResult(IfcBooleanOperator::IfcBooleanOperator v1_Operator, IfcBooleanOperand* v2_FirstOperand, IfcBooleanOperand* v3_SecondOperand) : IfcGeometricRepresentationItem((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,v1_Operator,IfcBooleanOperator::ToString(v1_Operator)); e->setArgument(1,(v2_FirstOperand)); e->setArgument(2,(v3_SecondOperand)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcBoundaryCondition
-bool IfcBoundaryCondition::hasName() { return !entity->getArgument(0)->isNull(); }
-IfcLabel IfcBoundaryCondition::Name() { return *entity->getArgument(0); }
-void IfcBoundaryCondition::setName(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+bool IfcBoundaryCondition::hasName() const { return !entity->getArgument(0)->isNull(); }
+std::string IfcBoundaryCondition::Name() const { return *entity->getArgument(0); }
+void IfcBoundaryCondition::setName(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
 bool IfcBoundaryCondition::is(Type::Enum v) const { return v == Type::IfcBoundaryCondition; }
 Type::Enum IfcBoundaryCondition::type() const { return Type::IfcBoundaryCondition; }
 Type::Enum IfcBoundaryCondition::Class() { return Type::IfcBoundaryCondition; }
-IfcBoundaryCondition::IfcBoundaryCondition(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcBoundaryCondition)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcBoundaryCondition::IfcBoundaryCondition(boost::optional< IfcLabel > v1_Name) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } entity = e; EntityBuffer::Add(this); }
+IfcBoundaryCondition::IfcBoundaryCondition(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcBoundaryCondition)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcBoundaryCondition::IfcBoundaryCondition(boost::optional< std::string > v1_Name) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcBoundaryCurve
 bool IfcBoundaryCurve::is(Type::Enum v) const { return v == Type::IfcBoundaryCurve || IfcCompositeCurveOnSurface::is(v); }
 Type::Enum IfcBoundaryCurve::type() const { return Type::IfcBoundaryCurve; }
 Type::Enum IfcBoundaryCurve::Class() { return Type::IfcBoundaryCurve; }
-IfcBoundaryCurve::IfcBoundaryCurve(IfcAbstractEntityPtr e) : IfcCompositeCurveOnSurface((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcBoundaryCurve)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcBoundaryCurve::IfcBoundaryCurve(SHARED_PTR< IfcTemplatedEntityList< IfcCompositeCurveSegment > > v1_Segments, bool v2_SelfIntersect) : IfcCompositeCurveOnSurface((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Segments)->generalize()); e->setArgument(1,(v2_SelfIntersect)); entity = e; EntityBuffer::Add(this); }
+IfcBoundaryCurve::IfcBoundaryCurve(IfcAbstractEntity* e) : IfcCompositeCurveOnSurface((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcBoundaryCurve)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcBoundaryCurve::IfcBoundaryCurve(IfcTemplatedEntityList< IfcCompositeCurveSegment >::ptr v1_Segments, bool v2_SelfIntersect) : IfcCompositeCurveOnSurface((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Segments)->generalize()); e->setArgument(1,(v2_SelfIntersect)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcBoundaryEdgeCondition
-bool IfcBoundaryEdgeCondition::hasTranslationalStiffnessByLengthX() { return !entity->getArgument(1)->isNull(); }
-IfcModulusOfTranslationalSubgradeReactionSelect IfcBoundaryEdgeCondition::TranslationalStiffnessByLengthX() { return *entity->getArgument(1); }
-void IfcBoundaryEdgeCondition::setTranslationalStiffnessByLengthX(IfcModulusOfTranslationalSubgradeReactionSelect v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-bool IfcBoundaryEdgeCondition::hasTranslationalStiffnessByLengthY() { return !entity->getArgument(2)->isNull(); }
-IfcModulusOfTranslationalSubgradeReactionSelect IfcBoundaryEdgeCondition::TranslationalStiffnessByLengthY() { return *entity->getArgument(2); }
-void IfcBoundaryEdgeCondition::setTranslationalStiffnessByLengthY(IfcModulusOfTranslationalSubgradeReactionSelect v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-bool IfcBoundaryEdgeCondition::hasTranslationalStiffnessByLengthZ() { return !entity->getArgument(3)->isNull(); }
-IfcModulusOfTranslationalSubgradeReactionSelect IfcBoundaryEdgeCondition::TranslationalStiffnessByLengthZ() { return *entity->getArgument(3); }
-void IfcBoundaryEdgeCondition::setTranslationalStiffnessByLengthZ(IfcModulusOfTranslationalSubgradeReactionSelect v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-bool IfcBoundaryEdgeCondition::hasRotationalStiffnessByLengthX() { return !entity->getArgument(4)->isNull(); }
-IfcModulusOfRotationalSubgradeReactionSelect IfcBoundaryEdgeCondition::RotationalStiffnessByLengthX() { return *entity->getArgument(4); }
-void IfcBoundaryEdgeCondition::setRotationalStiffnessByLengthX(IfcModulusOfRotationalSubgradeReactionSelect v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-bool IfcBoundaryEdgeCondition::hasRotationalStiffnessByLengthY() { return !entity->getArgument(5)->isNull(); }
-IfcModulusOfRotationalSubgradeReactionSelect IfcBoundaryEdgeCondition::RotationalStiffnessByLengthY() { return *entity->getArgument(5); }
-void IfcBoundaryEdgeCondition::setRotationalStiffnessByLengthY(IfcModulusOfRotationalSubgradeReactionSelect v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-bool IfcBoundaryEdgeCondition::hasRotationalStiffnessByLengthZ() { return !entity->getArgument(6)->isNull(); }
-IfcModulusOfRotationalSubgradeReactionSelect IfcBoundaryEdgeCondition::RotationalStiffnessByLengthZ() { return *entity->getArgument(6); }
-void IfcBoundaryEdgeCondition::setRotationalStiffnessByLengthZ(IfcModulusOfRotationalSubgradeReactionSelect v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
+bool IfcBoundaryEdgeCondition::hasTranslationalStiffnessByLengthX() const { return !entity->getArgument(1)->isNull(); }
+IfcModulusOfTranslationalSubgradeReactionSelect* IfcBoundaryEdgeCondition::TranslationalStiffnessByLengthX() const { return (IfcModulusOfTranslationalSubgradeReactionSelect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(1))); }
+void IfcBoundaryEdgeCondition::setTranslationalStiffnessByLengthX(IfcModulusOfTranslationalSubgradeReactionSelect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+bool IfcBoundaryEdgeCondition::hasTranslationalStiffnessByLengthY() const { return !entity->getArgument(2)->isNull(); }
+IfcModulusOfTranslationalSubgradeReactionSelect* IfcBoundaryEdgeCondition::TranslationalStiffnessByLengthY() const { return (IfcModulusOfTranslationalSubgradeReactionSelect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(2))); }
+void IfcBoundaryEdgeCondition::setTranslationalStiffnessByLengthY(IfcModulusOfTranslationalSubgradeReactionSelect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+bool IfcBoundaryEdgeCondition::hasTranslationalStiffnessByLengthZ() const { return !entity->getArgument(3)->isNull(); }
+IfcModulusOfTranslationalSubgradeReactionSelect* IfcBoundaryEdgeCondition::TranslationalStiffnessByLengthZ() const { return (IfcModulusOfTranslationalSubgradeReactionSelect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(3))); }
+void IfcBoundaryEdgeCondition::setTranslationalStiffnessByLengthZ(IfcModulusOfTranslationalSubgradeReactionSelect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+bool IfcBoundaryEdgeCondition::hasRotationalStiffnessByLengthX() const { return !entity->getArgument(4)->isNull(); }
+IfcModulusOfRotationalSubgradeReactionSelect* IfcBoundaryEdgeCondition::RotationalStiffnessByLengthX() const { return (IfcModulusOfRotationalSubgradeReactionSelect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(4))); }
+void IfcBoundaryEdgeCondition::setRotationalStiffnessByLengthX(IfcModulusOfRotationalSubgradeReactionSelect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+bool IfcBoundaryEdgeCondition::hasRotationalStiffnessByLengthY() const { return !entity->getArgument(5)->isNull(); }
+IfcModulusOfRotationalSubgradeReactionSelect* IfcBoundaryEdgeCondition::RotationalStiffnessByLengthY() const { return (IfcModulusOfRotationalSubgradeReactionSelect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(5))); }
+void IfcBoundaryEdgeCondition::setRotationalStiffnessByLengthY(IfcModulusOfRotationalSubgradeReactionSelect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+bool IfcBoundaryEdgeCondition::hasRotationalStiffnessByLengthZ() const { return !entity->getArgument(6)->isNull(); }
+IfcModulusOfRotationalSubgradeReactionSelect* IfcBoundaryEdgeCondition::RotationalStiffnessByLengthZ() const { return (IfcModulusOfRotationalSubgradeReactionSelect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(6))); }
+void IfcBoundaryEdgeCondition::setRotationalStiffnessByLengthZ(IfcModulusOfRotationalSubgradeReactionSelect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
 bool IfcBoundaryEdgeCondition::is(Type::Enum v) const { return v == Type::IfcBoundaryEdgeCondition || IfcBoundaryCondition::is(v); }
 Type::Enum IfcBoundaryEdgeCondition::type() const { return Type::IfcBoundaryEdgeCondition; }
 Type::Enum IfcBoundaryEdgeCondition::Class() { return Type::IfcBoundaryEdgeCondition; }
-IfcBoundaryEdgeCondition::IfcBoundaryEdgeCondition(IfcAbstractEntityPtr e) : IfcBoundaryCondition((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcBoundaryEdgeCondition)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcBoundaryEdgeCondition::IfcBoundaryEdgeCondition(boost::optional< IfcLabel > v1_Name, boost::optional< IfcModulusOfTranslationalSubgradeReactionSelect > v2_TranslationalStiffnessByLengthX, boost::optional< IfcModulusOfTranslationalSubgradeReactionSelect > v3_TranslationalStiffnessByLengthY, boost::optional< IfcModulusOfTranslationalSubgradeReactionSelect > v4_TranslationalStiffnessByLengthZ, boost::optional< IfcModulusOfRotationalSubgradeReactionSelect > v5_RotationalStiffnessByLengthX, boost::optional< IfcModulusOfRotationalSubgradeReactionSelect > v6_RotationalStiffnessByLengthY, boost::optional< IfcModulusOfRotationalSubgradeReactionSelect > v7_RotationalStiffnessByLengthZ) : IfcBoundaryCondition((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_TranslationalStiffnessByLengthX) { e->setArgument(1,(*v2_TranslationalStiffnessByLengthX)); } else { e->setArgument(1); } if (v3_TranslationalStiffnessByLengthY) { e->setArgument(2,(*v3_TranslationalStiffnessByLengthY)); } else { e->setArgument(2); } if (v4_TranslationalStiffnessByLengthZ) { e->setArgument(3,(*v4_TranslationalStiffnessByLengthZ)); } else { e->setArgument(3); } if (v5_RotationalStiffnessByLengthX) { e->setArgument(4,(*v5_RotationalStiffnessByLengthX)); } else { e->setArgument(4); } if (v6_RotationalStiffnessByLengthY) { e->setArgument(5,(*v6_RotationalStiffnessByLengthY)); } else { e->setArgument(5); } if (v7_RotationalStiffnessByLengthZ) { e->setArgument(6,(*v7_RotationalStiffnessByLengthZ)); } else { e->setArgument(6); } entity = e; EntityBuffer::Add(this); }
+IfcBoundaryEdgeCondition::IfcBoundaryEdgeCondition(IfcAbstractEntity* e) : IfcBoundaryCondition((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcBoundaryEdgeCondition)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcBoundaryEdgeCondition::IfcBoundaryEdgeCondition(boost::optional< std::string > v1_Name, IfcModulusOfTranslationalSubgradeReactionSelect* v2_TranslationalStiffnessByLengthX, IfcModulusOfTranslationalSubgradeReactionSelect* v3_TranslationalStiffnessByLengthY, IfcModulusOfTranslationalSubgradeReactionSelect* v4_TranslationalStiffnessByLengthZ, IfcModulusOfRotationalSubgradeReactionSelect* v5_RotationalStiffnessByLengthX, IfcModulusOfRotationalSubgradeReactionSelect* v6_RotationalStiffnessByLengthY, IfcModulusOfRotationalSubgradeReactionSelect* v7_RotationalStiffnessByLengthZ) : IfcBoundaryCondition((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } e->setArgument(1,(v2_TranslationalStiffnessByLengthX)); e->setArgument(2,(v3_TranslationalStiffnessByLengthY)); e->setArgument(3,(v4_TranslationalStiffnessByLengthZ)); e->setArgument(4,(v5_RotationalStiffnessByLengthX)); e->setArgument(5,(v6_RotationalStiffnessByLengthY)); e->setArgument(6,(v7_RotationalStiffnessByLengthZ)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcBoundaryFaceCondition
-bool IfcBoundaryFaceCondition::hasTranslationalStiffnessByAreaX() { return !entity->getArgument(1)->isNull(); }
-IfcModulusOfSubgradeReactionSelect IfcBoundaryFaceCondition::TranslationalStiffnessByAreaX() { return *entity->getArgument(1); }
-void IfcBoundaryFaceCondition::setTranslationalStiffnessByAreaX(IfcModulusOfSubgradeReactionSelect v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-bool IfcBoundaryFaceCondition::hasTranslationalStiffnessByAreaY() { return !entity->getArgument(2)->isNull(); }
-IfcModulusOfSubgradeReactionSelect IfcBoundaryFaceCondition::TranslationalStiffnessByAreaY() { return *entity->getArgument(2); }
-void IfcBoundaryFaceCondition::setTranslationalStiffnessByAreaY(IfcModulusOfSubgradeReactionSelect v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-bool IfcBoundaryFaceCondition::hasTranslationalStiffnessByAreaZ() { return !entity->getArgument(3)->isNull(); }
-IfcModulusOfSubgradeReactionSelect IfcBoundaryFaceCondition::TranslationalStiffnessByAreaZ() { return *entity->getArgument(3); }
-void IfcBoundaryFaceCondition::setTranslationalStiffnessByAreaZ(IfcModulusOfSubgradeReactionSelect v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+bool IfcBoundaryFaceCondition::hasTranslationalStiffnessByAreaX() const { return !entity->getArgument(1)->isNull(); }
+IfcModulusOfSubgradeReactionSelect* IfcBoundaryFaceCondition::TranslationalStiffnessByAreaX() const { return (IfcModulusOfSubgradeReactionSelect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(1))); }
+void IfcBoundaryFaceCondition::setTranslationalStiffnessByAreaX(IfcModulusOfSubgradeReactionSelect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+bool IfcBoundaryFaceCondition::hasTranslationalStiffnessByAreaY() const { return !entity->getArgument(2)->isNull(); }
+IfcModulusOfSubgradeReactionSelect* IfcBoundaryFaceCondition::TranslationalStiffnessByAreaY() const { return (IfcModulusOfSubgradeReactionSelect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(2))); }
+void IfcBoundaryFaceCondition::setTranslationalStiffnessByAreaY(IfcModulusOfSubgradeReactionSelect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+bool IfcBoundaryFaceCondition::hasTranslationalStiffnessByAreaZ() const { return !entity->getArgument(3)->isNull(); }
+IfcModulusOfSubgradeReactionSelect* IfcBoundaryFaceCondition::TranslationalStiffnessByAreaZ() const { return (IfcModulusOfSubgradeReactionSelect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(3))); }
+void IfcBoundaryFaceCondition::setTranslationalStiffnessByAreaZ(IfcModulusOfSubgradeReactionSelect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
 bool IfcBoundaryFaceCondition::is(Type::Enum v) const { return v == Type::IfcBoundaryFaceCondition || IfcBoundaryCondition::is(v); }
 Type::Enum IfcBoundaryFaceCondition::type() const { return Type::IfcBoundaryFaceCondition; }
 Type::Enum IfcBoundaryFaceCondition::Class() { return Type::IfcBoundaryFaceCondition; }
-IfcBoundaryFaceCondition::IfcBoundaryFaceCondition(IfcAbstractEntityPtr e) : IfcBoundaryCondition((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcBoundaryFaceCondition)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcBoundaryFaceCondition::IfcBoundaryFaceCondition(boost::optional< IfcLabel > v1_Name, boost::optional< IfcModulusOfSubgradeReactionSelect > v2_TranslationalStiffnessByAreaX, boost::optional< IfcModulusOfSubgradeReactionSelect > v3_TranslationalStiffnessByAreaY, boost::optional< IfcModulusOfSubgradeReactionSelect > v4_TranslationalStiffnessByAreaZ) : IfcBoundaryCondition((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_TranslationalStiffnessByAreaX) { e->setArgument(1,(*v2_TranslationalStiffnessByAreaX)); } else { e->setArgument(1); } if (v3_TranslationalStiffnessByAreaY) { e->setArgument(2,(*v3_TranslationalStiffnessByAreaY)); } else { e->setArgument(2); } if (v4_TranslationalStiffnessByAreaZ) { e->setArgument(3,(*v4_TranslationalStiffnessByAreaZ)); } else { e->setArgument(3); } entity = e; EntityBuffer::Add(this); }
+IfcBoundaryFaceCondition::IfcBoundaryFaceCondition(IfcAbstractEntity* e) : IfcBoundaryCondition((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcBoundaryFaceCondition)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcBoundaryFaceCondition::IfcBoundaryFaceCondition(boost::optional< std::string > v1_Name, IfcModulusOfSubgradeReactionSelect* v2_TranslationalStiffnessByAreaX, IfcModulusOfSubgradeReactionSelect* v3_TranslationalStiffnessByAreaY, IfcModulusOfSubgradeReactionSelect* v4_TranslationalStiffnessByAreaZ) : IfcBoundaryCondition((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } e->setArgument(1,(v2_TranslationalStiffnessByAreaX)); e->setArgument(2,(v3_TranslationalStiffnessByAreaY)); e->setArgument(3,(v4_TranslationalStiffnessByAreaZ)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcBoundaryNodeCondition
-bool IfcBoundaryNodeCondition::hasTranslationalStiffnessX() { return !entity->getArgument(1)->isNull(); }
-IfcTranslationalStiffnessSelect IfcBoundaryNodeCondition::TranslationalStiffnessX() { return *entity->getArgument(1); }
-void IfcBoundaryNodeCondition::setTranslationalStiffnessX(IfcTranslationalStiffnessSelect v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-bool IfcBoundaryNodeCondition::hasTranslationalStiffnessY() { return !entity->getArgument(2)->isNull(); }
-IfcTranslationalStiffnessSelect IfcBoundaryNodeCondition::TranslationalStiffnessY() { return *entity->getArgument(2); }
-void IfcBoundaryNodeCondition::setTranslationalStiffnessY(IfcTranslationalStiffnessSelect v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-bool IfcBoundaryNodeCondition::hasTranslationalStiffnessZ() { return !entity->getArgument(3)->isNull(); }
-IfcTranslationalStiffnessSelect IfcBoundaryNodeCondition::TranslationalStiffnessZ() { return *entity->getArgument(3); }
-void IfcBoundaryNodeCondition::setTranslationalStiffnessZ(IfcTranslationalStiffnessSelect v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-bool IfcBoundaryNodeCondition::hasRotationalStiffnessX() { return !entity->getArgument(4)->isNull(); }
-IfcRotationalStiffnessSelect IfcBoundaryNodeCondition::RotationalStiffnessX() { return *entity->getArgument(4); }
-void IfcBoundaryNodeCondition::setRotationalStiffnessX(IfcRotationalStiffnessSelect v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-bool IfcBoundaryNodeCondition::hasRotationalStiffnessY() { return !entity->getArgument(5)->isNull(); }
-IfcRotationalStiffnessSelect IfcBoundaryNodeCondition::RotationalStiffnessY() { return *entity->getArgument(5); }
-void IfcBoundaryNodeCondition::setRotationalStiffnessY(IfcRotationalStiffnessSelect v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-bool IfcBoundaryNodeCondition::hasRotationalStiffnessZ() { return !entity->getArgument(6)->isNull(); }
-IfcRotationalStiffnessSelect IfcBoundaryNodeCondition::RotationalStiffnessZ() { return *entity->getArgument(6); }
-void IfcBoundaryNodeCondition::setRotationalStiffnessZ(IfcRotationalStiffnessSelect v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
+bool IfcBoundaryNodeCondition::hasTranslationalStiffnessX() const { return !entity->getArgument(1)->isNull(); }
+IfcTranslationalStiffnessSelect* IfcBoundaryNodeCondition::TranslationalStiffnessX() const { return (IfcTranslationalStiffnessSelect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(1))); }
+void IfcBoundaryNodeCondition::setTranslationalStiffnessX(IfcTranslationalStiffnessSelect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+bool IfcBoundaryNodeCondition::hasTranslationalStiffnessY() const { return !entity->getArgument(2)->isNull(); }
+IfcTranslationalStiffnessSelect* IfcBoundaryNodeCondition::TranslationalStiffnessY() const { return (IfcTranslationalStiffnessSelect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(2))); }
+void IfcBoundaryNodeCondition::setTranslationalStiffnessY(IfcTranslationalStiffnessSelect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+bool IfcBoundaryNodeCondition::hasTranslationalStiffnessZ() const { return !entity->getArgument(3)->isNull(); }
+IfcTranslationalStiffnessSelect* IfcBoundaryNodeCondition::TranslationalStiffnessZ() const { return (IfcTranslationalStiffnessSelect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(3))); }
+void IfcBoundaryNodeCondition::setTranslationalStiffnessZ(IfcTranslationalStiffnessSelect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+bool IfcBoundaryNodeCondition::hasRotationalStiffnessX() const { return !entity->getArgument(4)->isNull(); }
+IfcRotationalStiffnessSelect* IfcBoundaryNodeCondition::RotationalStiffnessX() const { return (IfcRotationalStiffnessSelect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(4))); }
+void IfcBoundaryNodeCondition::setRotationalStiffnessX(IfcRotationalStiffnessSelect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+bool IfcBoundaryNodeCondition::hasRotationalStiffnessY() const { return !entity->getArgument(5)->isNull(); }
+IfcRotationalStiffnessSelect* IfcBoundaryNodeCondition::RotationalStiffnessY() const { return (IfcRotationalStiffnessSelect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(5))); }
+void IfcBoundaryNodeCondition::setRotationalStiffnessY(IfcRotationalStiffnessSelect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+bool IfcBoundaryNodeCondition::hasRotationalStiffnessZ() const { return !entity->getArgument(6)->isNull(); }
+IfcRotationalStiffnessSelect* IfcBoundaryNodeCondition::RotationalStiffnessZ() const { return (IfcRotationalStiffnessSelect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(6))); }
+void IfcBoundaryNodeCondition::setRotationalStiffnessZ(IfcRotationalStiffnessSelect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
 bool IfcBoundaryNodeCondition::is(Type::Enum v) const { return v == Type::IfcBoundaryNodeCondition || IfcBoundaryCondition::is(v); }
 Type::Enum IfcBoundaryNodeCondition::type() const { return Type::IfcBoundaryNodeCondition; }
 Type::Enum IfcBoundaryNodeCondition::Class() { return Type::IfcBoundaryNodeCondition; }
-IfcBoundaryNodeCondition::IfcBoundaryNodeCondition(IfcAbstractEntityPtr e) : IfcBoundaryCondition((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcBoundaryNodeCondition)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcBoundaryNodeCondition::IfcBoundaryNodeCondition(boost::optional< IfcLabel > v1_Name, boost::optional< IfcTranslationalStiffnessSelect > v2_TranslationalStiffnessX, boost::optional< IfcTranslationalStiffnessSelect > v3_TranslationalStiffnessY, boost::optional< IfcTranslationalStiffnessSelect > v4_TranslationalStiffnessZ, boost::optional< IfcRotationalStiffnessSelect > v5_RotationalStiffnessX, boost::optional< IfcRotationalStiffnessSelect > v6_RotationalStiffnessY, boost::optional< IfcRotationalStiffnessSelect > v7_RotationalStiffnessZ) : IfcBoundaryCondition((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_TranslationalStiffnessX) { e->setArgument(1,(*v2_TranslationalStiffnessX)); } else { e->setArgument(1); } if (v3_TranslationalStiffnessY) { e->setArgument(2,(*v3_TranslationalStiffnessY)); } else { e->setArgument(2); } if (v4_TranslationalStiffnessZ) { e->setArgument(3,(*v4_TranslationalStiffnessZ)); } else { e->setArgument(3); } if (v5_RotationalStiffnessX) { e->setArgument(4,(*v5_RotationalStiffnessX)); } else { e->setArgument(4); } if (v6_RotationalStiffnessY) { e->setArgument(5,(*v6_RotationalStiffnessY)); } else { e->setArgument(5); } if (v7_RotationalStiffnessZ) { e->setArgument(6,(*v7_RotationalStiffnessZ)); } else { e->setArgument(6); } entity = e; EntityBuffer::Add(this); }
+IfcBoundaryNodeCondition::IfcBoundaryNodeCondition(IfcAbstractEntity* e) : IfcBoundaryCondition((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcBoundaryNodeCondition)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcBoundaryNodeCondition::IfcBoundaryNodeCondition(boost::optional< std::string > v1_Name, IfcTranslationalStiffnessSelect* v2_TranslationalStiffnessX, IfcTranslationalStiffnessSelect* v3_TranslationalStiffnessY, IfcTranslationalStiffnessSelect* v4_TranslationalStiffnessZ, IfcRotationalStiffnessSelect* v5_RotationalStiffnessX, IfcRotationalStiffnessSelect* v6_RotationalStiffnessY, IfcRotationalStiffnessSelect* v7_RotationalStiffnessZ) : IfcBoundaryCondition((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } e->setArgument(1,(v2_TranslationalStiffnessX)); e->setArgument(2,(v3_TranslationalStiffnessY)); e->setArgument(3,(v4_TranslationalStiffnessZ)); e->setArgument(4,(v5_RotationalStiffnessX)); e->setArgument(5,(v6_RotationalStiffnessY)); e->setArgument(6,(v7_RotationalStiffnessZ)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcBoundaryNodeConditionWarping
-bool IfcBoundaryNodeConditionWarping::hasWarpingStiffness() { return !entity->getArgument(7)->isNull(); }
-IfcWarpingStiffnessSelect IfcBoundaryNodeConditionWarping::WarpingStiffness() { return *entity->getArgument(7); }
-void IfcBoundaryNodeConditionWarping::setWarpingStiffness(IfcWarpingStiffnessSelect v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
+bool IfcBoundaryNodeConditionWarping::hasWarpingStiffness() const { return !entity->getArgument(7)->isNull(); }
+IfcWarpingStiffnessSelect* IfcBoundaryNodeConditionWarping::WarpingStiffness() const { return (IfcWarpingStiffnessSelect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(7))); }
+void IfcBoundaryNodeConditionWarping::setWarpingStiffness(IfcWarpingStiffnessSelect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
 bool IfcBoundaryNodeConditionWarping::is(Type::Enum v) const { return v == Type::IfcBoundaryNodeConditionWarping || IfcBoundaryNodeCondition::is(v); }
 Type::Enum IfcBoundaryNodeConditionWarping::type() const { return Type::IfcBoundaryNodeConditionWarping; }
 Type::Enum IfcBoundaryNodeConditionWarping::Class() { return Type::IfcBoundaryNodeConditionWarping; }
-IfcBoundaryNodeConditionWarping::IfcBoundaryNodeConditionWarping(IfcAbstractEntityPtr e) : IfcBoundaryNodeCondition((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcBoundaryNodeConditionWarping)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcBoundaryNodeConditionWarping::IfcBoundaryNodeConditionWarping(boost::optional< IfcLabel > v1_Name, boost::optional< IfcTranslationalStiffnessSelect > v2_TranslationalStiffnessX, boost::optional< IfcTranslationalStiffnessSelect > v3_TranslationalStiffnessY, boost::optional< IfcTranslationalStiffnessSelect > v4_TranslationalStiffnessZ, boost::optional< IfcRotationalStiffnessSelect > v5_RotationalStiffnessX, boost::optional< IfcRotationalStiffnessSelect > v6_RotationalStiffnessY, boost::optional< IfcRotationalStiffnessSelect > v7_RotationalStiffnessZ, boost::optional< IfcWarpingStiffnessSelect > v8_WarpingStiffness) : IfcBoundaryNodeCondition((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_TranslationalStiffnessX) { e->setArgument(1,(*v2_TranslationalStiffnessX)); } else { e->setArgument(1); } if (v3_TranslationalStiffnessY) { e->setArgument(2,(*v3_TranslationalStiffnessY)); } else { e->setArgument(2); } if (v4_TranslationalStiffnessZ) { e->setArgument(3,(*v4_TranslationalStiffnessZ)); } else { e->setArgument(3); } if (v5_RotationalStiffnessX) { e->setArgument(4,(*v5_RotationalStiffnessX)); } else { e->setArgument(4); } if (v6_RotationalStiffnessY) { e->setArgument(5,(*v6_RotationalStiffnessY)); } else { e->setArgument(5); } if (v7_RotationalStiffnessZ) { e->setArgument(6,(*v7_RotationalStiffnessZ)); } else { e->setArgument(6); } if (v8_WarpingStiffness) { e->setArgument(7,(*v8_WarpingStiffness)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
+IfcBoundaryNodeConditionWarping::IfcBoundaryNodeConditionWarping(IfcAbstractEntity* e) : IfcBoundaryNodeCondition((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcBoundaryNodeConditionWarping)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcBoundaryNodeConditionWarping::IfcBoundaryNodeConditionWarping(boost::optional< std::string > v1_Name, IfcTranslationalStiffnessSelect* v2_TranslationalStiffnessX, IfcTranslationalStiffnessSelect* v3_TranslationalStiffnessY, IfcTranslationalStiffnessSelect* v4_TranslationalStiffnessZ, IfcRotationalStiffnessSelect* v5_RotationalStiffnessX, IfcRotationalStiffnessSelect* v6_RotationalStiffnessY, IfcRotationalStiffnessSelect* v7_RotationalStiffnessZ, IfcWarpingStiffnessSelect* v8_WarpingStiffness) : IfcBoundaryNodeCondition((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } e->setArgument(1,(v2_TranslationalStiffnessX)); e->setArgument(2,(v3_TranslationalStiffnessY)); e->setArgument(3,(v4_TranslationalStiffnessZ)); e->setArgument(4,(v5_RotationalStiffnessX)); e->setArgument(5,(v6_RotationalStiffnessY)); e->setArgument(6,(v7_RotationalStiffnessZ)); e->setArgument(7,(v8_WarpingStiffness)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcBoundedCurve
 bool IfcBoundedCurve::is(Type::Enum v) const { return v == Type::IfcBoundedCurve || IfcCurve::is(v); }
 Type::Enum IfcBoundedCurve::type() const { return Type::IfcBoundedCurve; }
 Type::Enum IfcBoundedCurve::Class() { return Type::IfcBoundedCurve; }
-IfcBoundedCurve::IfcBoundedCurve(IfcAbstractEntityPtr e) : IfcCurve((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcBoundedCurve)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcBoundedCurve::IfcBoundedCurve() : IfcCurve((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); entity = e; EntityBuffer::Add(this); }
+IfcBoundedCurve::IfcBoundedCurve(IfcAbstractEntity* e) : IfcCurve((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcBoundedCurve)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcBoundedCurve::IfcBoundedCurve() : IfcCurve((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcBoundedSurface
 bool IfcBoundedSurface::is(Type::Enum v) const { return v == Type::IfcBoundedSurface || IfcSurface::is(v); }
 Type::Enum IfcBoundedSurface::type() const { return Type::IfcBoundedSurface; }
 Type::Enum IfcBoundedSurface::Class() { return Type::IfcBoundedSurface; }
-IfcBoundedSurface::IfcBoundedSurface(IfcAbstractEntityPtr e) : IfcSurface((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcBoundedSurface)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcBoundedSurface::IfcBoundedSurface() : IfcSurface((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); entity = e; EntityBuffer::Add(this); }
+IfcBoundedSurface::IfcBoundedSurface(IfcAbstractEntity* e) : IfcSurface((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcBoundedSurface)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcBoundedSurface::IfcBoundedSurface() : IfcSurface((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcBoundingBox
-IfcCartesianPoint* IfcBoundingBox::Corner() { return (IfcCartesianPoint*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(0))); }
+IfcCartesianPoint* IfcBoundingBox::Corner() const { return (IfcCartesianPoint*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(0))); }
 void IfcBoundingBox::setCorner(IfcCartesianPoint* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-IfcPositiveLengthMeasure IfcBoundingBox::XDim() { return *entity->getArgument(1); }
-void IfcBoundingBox::setXDim(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-IfcPositiveLengthMeasure IfcBoundingBox::YDim() { return *entity->getArgument(2); }
-void IfcBoundingBox::setYDim(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-IfcPositiveLengthMeasure IfcBoundingBox::ZDim() { return *entity->getArgument(3); }
-void IfcBoundingBox::setZDim(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+double IfcBoundingBox::XDim() const { return *entity->getArgument(1); }
+void IfcBoundingBox::setXDim(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+double IfcBoundingBox::YDim() const { return *entity->getArgument(2); }
+void IfcBoundingBox::setYDim(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+double IfcBoundingBox::ZDim() const { return *entity->getArgument(3); }
+void IfcBoundingBox::setZDim(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
 bool IfcBoundingBox::is(Type::Enum v) const { return v == Type::IfcBoundingBox || IfcGeometricRepresentationItem::is(v); }
 Type::Enum IfcBoundingBox::type() const { return Type::IfcBoundingBox; }
 Type::Enum IfcBoundingBox::Class() { return Type::IfcBoundingBox; }
-IfcBoundingBox::IfcBoundingBox(IfcAbstractEntityPtr e) : IfcGeometricRepresentationItem((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcBoundingBox)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcBoundingBox::IfcBoundingBox(IfcCartesianPoint* v1_Corner, IfcPositiveLengthMeasure v2_XDim, IfcPositiveLengthMeasure v3_YDim, IfcPositiveLengthMeasure v4_ZDim) : IfcGeometricRepresentationItem((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Corner)); e->setArgument(1,(v2_XDim)); e->setArgument(2,(v3_YDim)); e->setArgument(3,(v4_ZDim)); entity = e; EntityBuffer::Add(this); }
+IfcBoundingBox::IfcBoundingBox(IfcAbstractEntity* e) : IfcGeometricRepresentationItem((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcBoundingBox)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcBoundingBox::IfcBoundingBox(IfcCartesianPoint* v1_Corner, double v2_XDim, double v3_YDim, double v4_ZDim) : IfcGeometricRepresentationItem((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Corner)); e->setArgument(1,(v2_XDim)); e->setArgument(2,(v3_YDim)); e->setArgument(3,(v4_ZDim)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcBoxedHalfSpace
-IfcBoundingBox* IfcBoxedHalfSpace::Enclosure() { return (IfcBoundingBox*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(2))); }
+IfcBoundingBox* IfcBoxedHalfSpace::Enclosure() const { return (IfcBoundingBox*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(2))); }
 void IfcBoxedHalfSpace::setEnclosure(IfcBoundingBox* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
 bool IfcBoxedHalfSpace::is(Type::Enum v) const { return v == Type::IfcBoxedHalfSpace || IfcHalfSpaceSolid::is(v); }
 Type::Enum IfcBoxedHalfSpace::type() const { return Type::IfcBoxedHalfSpace; }
 Type::Enum IfcBoxedHalfSpace::Class() { return Type::IfcBoxedHalfSpace; }
-IfcBoxedHalfSpace::IfcBoxedHalfSpace(IfcAbstractEntityPtr e) : IfcHalfSpaceSolid((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcBoxedHalfSpace)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcBoxedHalfSpace::IfcBoxedHalfSpace(IfcSurface* v1_BaseSurface, bool v2_AgreementFlag, IfcBoundingBox* v3_Enclosure) : IfcHalfSpaceSolid((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_BaseSurface)); e->setArgument(1,(v2_AgreementFlag)); e->setArgument(2,(v3_Enclosure)); entity = e; EntityBuffer::Add(this); }
+IfcBoxedHalfSpace::IfcBoxedHalfSpace(IfcAbstractEntity* e) : IfcHalfSpaceSolid((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcBoxedHalfSpace)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcBoxedHalfSpace::IfcBoxedHalfSpace(IfcSurface* v1_BaseSurface, bool v2_AgreementFlag, IfcBoundingBox* v3_Enclosure) : IfcHalfSpaceSolid((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_BaseSurface)); e->setArgument(1,(v2_AgreementFlag)); e->setArgument(2,(v3_Enclosure)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcBuilding
-bool IfcBuilding::hasElevationOfRefHeight() { return !entity->getArgument(9)->isNull(); }
-IfcLengthMeasure IfcBuilding::ElevationOfRefHeight() { return *entity->getArgument(9); }
-void IfcBuilding::setElevationOfRefHeight(IfcLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
-bool IfcBuilding::hasElevationOfTerrain() { return !entity->getArgument(10)->isNull(); }
-IfcLengthMeasure IfcBuilding::ElevationOfTerrain() { return *entity->getArgument(10); }
-void IfcBuilding::setElevationOfTerrain(IfcLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
-bool IfcBuilding::hasBuildingAddress() { return !entity->getArgument(11)->isNull(); }
-IfcPostalAddress* IfcBuilding::BuildingAddress() { return (IfcPostalAddress*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(11))); }
+bool IfcBuilding::hasElevationOfRefHeight() const { return !entity->getArgument(9)->isNull(); }
+double IfcBuilding::ElevationOfRefHeight() const { return *entity->getArgument(9); }
+void IfcBuilding::setElevationOfRefHeight(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
+bool IfcBuilding::hasElevationOfTerrain() const { return !entity->getArgument(10)->isNull(); }
+double IfcBuilding::ElevationOfTerrain() const { return *entity->getArgument(10); }
+void IfcBuilding::setElevationOfTerrain(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
+bool IfcBuilding::hasBuildingAddress() const { return !entity->getArgument(11)->isNull(); }
+IfcPostalAddress* IfcBuilding::BuildingAddress() const { return (IfcPostalAddress*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(11))); }
 void IfcBuilding::setBuildingAddress(IfcPostalAddress* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(11,v); }
 bool IfcBuilding::is(Type::Enum v) const { return v == Type::IfcBuilding || IfcSpatialStructureElement::is(v); }
 Type::Enum IfcBuilding::type() const { return Type::IfcBuilding; }
 Type::Enum IfcBuilding::Class() { return Type::IfcBuilding; }
-IfcBuilding::IfcBuilding(IfcAbstractEntityPtr e) : IfcSpatialStructureElement((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcBuilding)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcBuilding::IfcBuilding(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcLabel > v8_LongName, boost::optional< IfcElementCompositionEnum::IfcElementCompositionEnum > v9_CompositionType, boost::optional< IfcLengthMeasure > v10_ElevationOfRefHeight, boost::optional< IfcLengthMeasure > v11_ElevationOfTerrain, IfcPostalAddress* v12_BuildingAddress) : IfcSpatialStructureElement((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_LongName) { e->setArgument(7,(*v8_LongName)); } else { e->setArgument(7); } if (v9_CompositionType) { e->setArgument(8,*v9_CompositionType,IfcElementCompositionEnum::ToString(*v9_CompositionType)); } else { e->setArgument(8); } if (v10_ElevationOfRefHeight) { e->setArgument(9,(*v10_ElevationOfRefHeight)); } else { e->setArgument(9); } if (v11_ElevationOfTerrain) { e->setArgument(10,(*v11_ElevationOfTerrain)); } else { e->setArgument(10); } e->setArgument(11,(v12_BuildingAddress)); entity = e; EntityBuffer::Add(this); }
+IfcBuilding::IfcBuilding(IfcAbstractEntity* e) : IfcSpatialStructureElement((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcBuilding)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcBuilding::IfcBuilding(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_LongName, boost::optional< IfcElementCompositionEnum::IfcElementCompositionEnum > v9_CompositionType, boost::optional< double > v10_ElevationOfRefHeight, boost::optional< double > v11_ElevationOfTerrain, IfcPostalAddress* v12_BuildingAddress) : IfcSpatialStructureElement((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_LongName) { e->setArgument(7,(*v8_LongName)); } else { e->setArgument(7); } if (v9_CompositionType) { e->setArgument(8,*v9_CompositionType,IfcElementCompositionEnum::ToString(*v9_CompositionType)); } else { e->setArgument(8); } if (v10_ElevationOfRefHeight) { e->setArgument(9,(*v10_ElevationOfRefHeight)); } else { e->setArgument(9); } if (v11_ElevationOfTerrain) { e->setArgument(10,(*v11_ElevationOfTerrain)); } else { e->setArgument(10); } e->setArgument(11,(v12_BuildingAddress)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcBuildingElement
-IfcRelCoversBldgElements::list IfcBuildingElement::HasCoverings() { RETURN_INVERSE(IfcRelCoversBldgElements) }
+IfcRelCoversBldgElements::list::ptr IfcBuildingElement::HasCoverings() const { return entity->getInverse(Type::IfcRelCoversBldgElements, 4)->as<IfcRelCoversBldgElements>(); }
 bool IfcBuildingElement::is(Type::Enum v) const { return v == Type::IfcBuildingElement || IfcElement::is(v); }
 Type::Enum IfcBuildingElement::type() const { return Type::IfcBuildingElement; }
 Type::Enum IfcBuildingElement::Class() { return Type::IfcBuildingElement; }
-IfcBuildingElement::IfcBuildingElement(IfcAbstractEntityPtr e) : IfcElement((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcBuildingElement)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcBuildingElement::IfcBuildingElement(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag) : IfcElement((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
+IfcBuildingElement::IfcBuildingElement(IfcAbstractEntity* e) : IfcElement((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcBuildingElement)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcBuildingElement::IfcBuildingElement(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag) : IfcElement((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcBuildingElementPart
-bool IfcBuildingElementPart::hasPredefinedType() { return !entity->getArgument(8)->isNull(); }
-IfcBuildingElementPartTypeEnum::IfcBuildingElementPartTypeEnum IfcBuildingElementPart::PredefinedType() { return IfcBuildingElementPartTypeEnum::FromString(*entity->getArgument(8)); }
+bool IfcBuildingElementPart::hasPredefinedType() const { return !entity->getArgument(8)->isNull(); }
+IfcBuildingElementPartTypeEnum::IfcBuildingElementPartTypeEnum IfcBuildingElementPart::PredefinedType() const { return IfcBuildingElementPartTypeEnum::FromString(*entity->getArgument(8)); }
 void IfcBuildingElementPart::setPredefinedType(IfcBuildingElementPartTypeEnum::IfcBuildingElementPartTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcBuildingElementPartTypeEnum::ToString(v)); }
 bool IfcBuildingElementPart::is(Type::Enum v) const { return v == Type::IfcBuildingElementPart || IfcElementComponent::is(v); }
 Type::Enum IfcBuildingElementPart::type() const { return Type::IfcBuildingElementPart; }
 Type::Enum IfcBuildingElementPart::Class() { return Type::IfcBuildingElementPart; }
-IfcBuildingElementPart::IfcBuildingElementPart(IfcAbstractEntityPtr e) : IfcElementComponent((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcBuildingElementPart)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcBuildingElementPart::IfcBuildingElementPart(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcBuildingElementPartTypeEnum::IfcBuildingElementPartTypeEnum > v9_PredefinedType) : IfcElementComponent((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcBuildingElementPartTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcBuildingElementPart::IfcBuildingElementPart(IfcAbstractEntity* e) : IfcElementComponent((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcBuildingElementPart)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcBuildingElementPart::IfcBuildingElementPart(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcBuildingElementPartTypeEnum::IfcBuildingElementPartTypeEnum > v9_PredefinedType) : IfcElementComponent((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcBuildingElementPartTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcBuildingElementPartType
-IfcBuildingElementPartTypeEnum::IfcBuildingElementPartTypeEnum IfcBuildingElementPartType::PredefinedType() { return IfcBuildingElementPartTypeEnum::FromString(*entity->getArgument(9)); }
+IfcBuildingElementPartTypeEnum::IfcBuildingElementPartTypeEnum IfcBuildingElementPartType::PredefinedType() const { return IfcBuildingElementPartTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcBuildingElementPartType::setPredefinedType(IfcBuildingElementPartTypeEnum::IfcBuildingElementPartTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcBuildingElementPartTypeEnum::ToString(v)); }
 bool IfcBuildingElementPartType::is(Type::Enum v) const { return v == Type::IfcBuildingElementPartType || IfcElementComponentType::is(v); }
 Type::Enum IfcBuildingElementPartType::type() const { return Type::IfcBuildingElementPartType; }
 Type::Enum IfcBuildingElementPartType::Class() { return Type::IfcBuildingElementPartType; }
-IfcBuildingElementPartType::IfcBuildingElementPartType(IfcAbstractEntityPtr e) : IfcElementComponentType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcBuildingElementPartType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcBuildingElementPartType::IfcBuildingElementPartType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcBuildingElementPartTypeEnum::IfcBuildingElementPartTypeEnum v10_PredefinedType) : IfcElementComponentType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcBuildingElementPartTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcBuildingElementPartType::IfcBuildingElementPartType(IfcAbstractEntity* e) : IfcElementComponentType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcBuildingElementPartType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcBuildingElementPartType::IfcBuildingElementPartType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcBuildingElementPartTypeEnum::IfcBuildingElementPartTypeEnum v10_PredefinedType) : IfcElementComponentType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcBuildingElementPartTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcBuildingElementProxy
-bool IfcBuildingElementProxy::hasPredefinedType() { return !entity->getArgument(8)->isNull(); }
-IfcBuildingElementProxyTypeEnum::IfcBuildingElementProxyTypeEnum IfcBuildingElementProxy::PredefinedType() { return IfcBuildingElementProxyTypeEnum::FromString(*entity->getArgument(8)); }
+bool IfcBuildingElementProxy::hasPredefinedType() const { return !entity->getArgument(8)->isNull(); }
+IfcBuildingElementProxyTypeEnum::IfcBuildingElementProxyTypeEnum IfcBuildingElementProxy::PredefinedType() const { return IfcBuildingElementProxyTypeEnum::FromString(*entity->getArgument(8)); }
 void IfcBuildingElementProxy::setPredefinedType(IfcBuildingElementProxyTypeEnum::IfcBuildingElementProxyTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcBuildingElementProxyTypeEnum::ToString(v)); }
 bool IfcBuildingElementProxy::is(Type::Enum v) const { return v == Type::IfcBuildingElementProxy || IfcBuildingElement::is(v); }
 Type::Enum IfcBuildingElementProxy::type() const { return Type::IfcBuildingElementProxy; }
 Type::Enum IfcBuildingElementProxy::Class() { return Type::IfcBuildingElementProxy; }
-IfcBuildingElementProxy::IfcBuildingElementProxy(IfcAbstractEntityPtr e) : IfcBuildingElement((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcBuildingElementProxy)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcBuildingElementProxy::IfcBuildingElementProxy(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcBuildingElementProxyTypeEnum::IfcBuildingElementProxyTypeEnum > v9_PredefinedType) : IfcBuildingElement((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcBuildingElementProxyTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcBuildingElementProxy::IfcBuildingElementProxy(IfcAbstractEntity* e) : IfcBuildingElement((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcBuildingElementProxy)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcBuildingElementProxy::IfcBuildingElementProxy(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcBuildingElementProxyTypeEnum::IfcBuildingElementProxyTypeEnum > v9_PredefinedType) : IfcBuildingElement((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcBuildingElementProxyTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcBuildingElementProxyType
-IfcBuildingElementProxyTypeEnum::IfcBuildingElementProxyTypeEnum IfcBuildingElementProxyType::PredefinedType() { return IfcBuildingElementProxyTypeEnum::FromString(*entity->getArgument(9)); }
+IfcBuildingElementProxyTypeEnum::IfcBuildingElementProxyTypeEnum IfcBuildingElementProxyType::PredefinedType() const { return IfcBuildingElementProxyTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcBuildingElementProxyType::setPredefinedType(IfcBuildingElementProxyTypeEnum::IfcBuildingElementProxyTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcBuildingElementProxyTypeEnum::ToString(v)); }
 bool IfcBuildingElementProxyType::is(Type::Enum v) const { return v == Type::IfcBuildingElementProxyType || IfcBuildingElementType::is(v); }
 Type::Enum IfcBuildingElementProxyType::type() const { return Type::IfcBuildingElementProxyType; }
 Type::Enum IfcBuildingElementProxyType::Class() { return Type::IfcBuildingElementProxyType; }
-IfcBuildingElementProxyType::IfcBuildingElementProxyType(IfcAbstractEntityPtr e) : IfcBuildingElementType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcBuildingElementProxyType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcBuildingElementProxyType::IfcBuildingElementProxyType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcBuildingElementProxyTypeEnum::IfcBuildingElementProxyTypeEnum v10_PredefinedType) : IfcBuildingElementType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcBuildingElementProxyTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcBuildingElementProxyType::IfcBuildingElementProxyType(IfcAbstractEntity* e) : IfcBuildingElementType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcBuildingElementProxyType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcBuildingElementProxyType::IfcBuildingElementProxyType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcBuildingElementProxyTypeEnum::IfcBuildingElementProxyTypeEnum v10_PredefinedType) : IfcBuildingElementType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcBuildingElementProxyTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcBuildingElementType
 bool IfcBuildingElementType::is(Type::Enum v) const { return v == Type::IfcBuildingElementType || IfcElementType::is(v); }
 Type::Enum IfcBuildingElementType::type() const { return Type::IfcBuildingElementType; }
 Type::Enum IfcBuildingElementType::Class() { return Type::IfcBuildingElementType; }
-IfcBuildingElementType::IfcBuildingElementType(IfcAbstractEntityPtr e) : IfcElementType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcBuildingElementType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcBuildingElementType::IfcBuildingElementType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType) : IfcElementType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcBuildingElementType::IfcBuildingElementType(IfcAbstractEntity* e) : IfcElementType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcBuildingElementType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcBuildingElementType::IfcBuildingElementType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType) : IfcElementType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcBuildingStorey
-bool IfcBuildingStorey::hasElevation() { return !entity->getArgument(9)->isNull(); }
-IfcLengthMeasure IfcBuildingStorey::Elevation() { return *entity->getArgument(9); }
-void IfcBuildingStorey::setElevation(IfcLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
+bool IfcBuildingStorey::hasElevation() const { return !entity->getArgument(9)->isNull(); }
+double IfcBuildingStorey::Elevation() const { return *entity->getArgument(9); }
+void IfcBuildingStorey::setElevation(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
 bool IfcBuildingStorey::is(Type::Enum v) const { return v == Type::IfcBuildingStorey || IfcSpatialStructureElement::is(v); }
 Type::Enum IfcBuildingStorey::type() const { return Type::IfcBuildingStorey; }
 Type::Enum IfcBuildingStorey::Class() { return Type::IfcBuildingStorey; }
-IfcBuildingStorey::IfcBuildingStorey(IfcAbstractEntityPtr e) : IfcSpatialStructureElement((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcBuildingStorey)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcBuildingStorey::IfcBuildingStorey(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcLabel > v8_LongName, boost::optional< IfcElementCompositionEnum::IfcElementCompositionEnum > v9_CompositionType, boost::optional< IfcLengthMeasure > v10_Elevation) : IfcSpatialStructureElement((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_LongName) { e->setArgument(7,(*v8_LongName)); } else { e->setArgument(7); } if (v9_CompositionType) { e->setArgument(8,*v9_CompositionType,IfcElementCompositionEnum::ToString(*v9_CompositionType)); } else { e->setArgument(8); } if (v10_Elevation) { e->setArgument(9,(*v10_Elevation)); } else { e->setArgument(9); } entity = e; EntityBuffer::Add(this); }
+IfcBuildingStorey::IfcBuildingStorey(IfcAbstractEntity* e) : IfcSpatialStructureElement((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcBuildingStorey)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcBuildingStorey::IfcBuildingStorey(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_LongName, boost::optional< IfcElementCompositionEnum::IfcElementCompositionEnum > v9_CompositionType, boost::optional< double > v10_Elevation) : IfcSpatialStructureElement((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_LongName) { e->setArgument(7,(*v8_LongName)); } else { e->setArgument(7); } if (v9_CompositionType) { e->setArgument(8,*v9_CompositionType,IfcElementCompositionEnum::ToString(*v9_CompositionType)); } else { e->setArgument(8); } if (v10_Elevation) { e->setArgument(9,(*v10_Elevation)); } else { e->setArgument(9); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcBuildingSystem
-bool IfcBuildingSystem::hasPredefinedType() { return !entity->getArgument(5)->isNull(); }
-IfcBuildingSystemTypeEnum::IfcBuildingSystemTypeEnum IfcBuildingSystem::PredefinedType() { return IfcBuildingSystemTypeEnum::FromString(*entity->getArgument(5)); }
+bool IfcBuildingSystem::hasPredefinedType() const { return !entity->getArgument(5)->isNull(); }
+IfcBuildingSystemTypeEnum::IfcBuildingSystemTypeEnum IfcBuildingSystem::PredefinedType() const { return IfcBuildingSystemTypeEnum::FromString(*entity->getArgument(5)); }
 void IfcBuildingSystem::setPredefinedType(IfcBuildingSystemTypeEnum::IfcBuildingSystemTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v,IfcBuildingSystemTypeEnum::ToString(v)); }
 bool IfcBuildingSystem::is(Type::Enum v) const { return v == Type::IfcBuildingSystem || IfcSystem::is(v); }
 Type::Enum IfcBuildingSystem::type() const { return Type::IfcBuildingSystem; }
 Type::Enum IfcBuildingSystem::Class() { return Type::IfcBuildingSystem; }
-IfcBuildingSystem::IfcBuildingSystem(IfcAbstractEntityPtr e) : IfcSystem((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcBuildingSystem)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcBuildingSystem::IfcBuildingSystem(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, boost::optional< IfcBuildingSystemTypeEnum::IfcBuildingSystemTypeEnum > v6_PredefinedType) : IfcSystem((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } if (v6_PredefinedType) { e->setArgument(5,*v6_PredefinedType,IfcBuildingSystemTypeEnum::ToString(*v6_PredefinedType)); } else { e->setArgument(5); } entity = e; EntityBuffer::Add(this); }
+IfcBuildingSystem::IfcBuildingSystem(IfcAbstractEntity* e) : IfcSystem((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcBuildingSystem)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcBuildingSystem::IfcBuildingSystem(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, boost::optional< IfcBuildingSystemTypeEnum::IfcBuildingSystemTypeEnum > v6_PredefinedType) : IfcSystem((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } if (v6_PredefinedType) { e->setArgument(5,*v6_PredefinedType,IfcBuildingSystemTypeEnum::ToString(*v6_PredefinedType)); } else { e->setArgument(5); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcBurner
-bool IfcBurner::hasPredefinedType() { return !entity->getArgument(8)->isNull(); }
-IfcBurnerTypeEnum::IfcBurnerTypeEnum IfcBurner::PredefinedType() { return IfcBurnerTypeEnum::FromString(*entity->getArgument(8)); }
+bool IfcBurner::hasPredefinedType() const { return !entity->getArgument(8)->isNull(); }
+IfcBurnerTypeEnum::IfcBurnerTypeEnum IfcBurner::PredefinedType() const { return IfcBurnerTypeEnum::FromString(*entity->getArgument(8)); }
 void IfcBurner::setPredefinedType(IfcBurnerTypeEnum::IfcBurnerTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcBurnerTypeEnum::ToString(v)); }
 bool IfcBurner::is(Type::Enum v) const { return v == Type::IfcBurner || IfcEnergyConversionDevice::is(v); }
 Type::Enum IfcBurner::type() const { return Type::IfcBurner; }
 Type::Enum IfcBurner::Class() { return Type::IfcBurner; }
-IfcBurner::IfcBurner(IfcAbstractEntityPtr e) : IfcEnergyConversionDevice((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcBurner)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcBurner::IfcBurner(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcBurnerTypeEnum::IfcBurnerTypeEnum > v9_PredefinedType) : IfcEnergyConversionDevice((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcBurnerTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcBurner::IfcBurner(IfcAbstractEntity* e) : IfcEnergyConversionDevice((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcBurner)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcBurner::IfcBurner(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcBurnerTypeEnum::IfcBurnerTypeEnum > v9_PredefinedType) : IfcEnergyConversionDevice((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcBurnerTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcBurnerType
-IfcBurnerTypeEnum::IfcBurnerTypeEnum IfcBurnerType::PredefinedType() { return IfcBurnerTypeEnum::FromString(*entity->getArgument(9)); }
+IfcBurnerTypeEnum::IfcBurnerTypeEnum IfcBurnerType::PredefinedType() const { return IfcBurnerTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcBurnerType::setPredefinedType(IfcBurnerTypeEnum::IfcBurnerTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcBurnerTypeEnum::ToString(v)); }
 bool IfcBurnerType::is(Type::Enum v) const { return v == Type::IfcBurnerType || IfcEnergyConversionDeviceType::is(v); }
 Type::Enum IfcBurnerType::type() const { return Type::IfcBurnerType; }
 Type::Enum IfcBurnerType::Class() { return Type::IfcBurnerType; }
-IfcBurnerType::IfcBurnerType(IfcAbstractEntityPtr e) : IfcEnergyConversionDeviceType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcBurnerType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcBurnerType::IfcBurnerType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcBurnerTypeEnum::IfcBurnerTypeEnum v10_PredefinedType) : IfcEnergyConversionDeviceType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcBurnerTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcBurnerType::IfcBurnerType(IfcAbstractEntity* e) : IfcEnergyConversionDeviceType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcBurnerType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcBurnerType::IfcBurnerType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcBurnerTypeEnum::IfcBurnerTypeEnum v10_PredefinedType) : IfcEnergyConversionDeviceType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcBurnerTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcCShapeProfileDef
-IfcPositiveLengthMeasure IfcCShapeProfileDef::Depth() { return *entity->getArgument(3); }
-void IfcCShapeProfileDef::setDepth(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-IfcPositiveLengthMeasure IfcCShapeProfileDef::Width() { return *entity->getArgument(4); }
-void IfcCShapeProfileDef::setWidth(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-IfcPositiveLengthMeasure IfcCShapeProfileDef::WallThickness() { return *entity->getArgument(5); }
-void IfcCShapeProfileDef::setWallThickness(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-IfcPositiveLengthMeasure IfcCShapeProfileDef::Girth() { return *entity->getArgument(6); }
-void IfcCShapeProfileDef::setGirth(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
-bool IfcCShapeProfileDef::hasInternalFilletRadius() { return !entity->getArgument(7)->isNull(); }
-IfcNonNegativeLengthMeasure IfcCShapeProfileDef::InternalFilletRadius() { return *entity->getArgument(7); }
-void IfcCShapeProfileDef::setInternalFilletRadius(IfcNonNegativeLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
+double IfcCShapeProfileDef::Depth() const { return *entity->getArgument(3); }
+void IfcCShapeProfileDef::setDepth(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+double IfcCShapeProfileDef::Width() const { return *entity->getArgument(4); }
+void IfcCShapeProfileDef::setWidth(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+double IfcCShapeProfileDef::WallThickness() const { return *entity->getArgument(5); }
+void IfcCShapeProfileDef::setWallThickness(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+double IfcCShapeProfileDef::Girth() const { return *entity->getArgument(6); }
+void IfcCShapeProfileDef::setGirth(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
+bool IfcCShapeProfileDef::hasInternalFilletRadius() const { return !entity->getArgument(7)->isNull(); }
+double IfcCShapeProfileDef::InternalFilletRadius() const { return *entity->getArgument(7); }
+void IfcCShapeProfileDef::setInternalFilletRadius(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
 bool IfcCShapeProfileDef::is(Type::Enum v) const { return v == Type::IfcCShapeProfileDef || IfcParameterizedProfileDef::is(v); }
 Type::Enum IfcCShapeProfileDef::type() const { return Type::IfcCShapeProfileDef; }
 Type::Enum IfcCShapeProfileDef::Class() { return Type::IfcCShapeProfileDef; }
-IfcCShapeProfileDef::IfcCShapeProfileDef(IfcAbstractEntityPtr e) : IfcParameterizedProfileDef((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcCShapeProfileDef)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcCShapeProfileDef::IfcCShapeProfileDef(IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< IfcLabel > v2_ProfileName, IfcAxis2Placement2D* v3_Position, IfcPositiveLengthMeasure v4_Depth, IfcPositiveLengthMeasure v5_Width, IfcPositiveLengthMeasure v6_WallThickness, IfcPositiveLengthMeasure v7_Girth, boost::optional< IfcNonNegativeLengthMeasure > v8_InternalFilletRadius) : IfcParameterizedProfileDef((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,v1_ProfileType,IfcProfileTypeEnum::ToString(v1_ProfileType)); if (v2_ProfileName) { e->setArgument(1,(*v2_ProfileName)); } else { e->setArgument(1); } e->setArgument(2,(v3_Position)); e->setArgument(3,(v4_Depth)); e->setArgument(4,(v5_Width)); e->setArgument(5,(v6_WallThickness)); e->setArgument(6,(v7_Girth)); if (v8_InternalFilletRadius) { e->setArgument(7,(*v8_InternalFilletRadius)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
+IfcCShapeProfileDef::IfcCShapeProfileDef(IfcAbstractEntity* e) : IfcParameterizedProfileDef((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcCShapeProfileDef)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcCShapeProfileDef::IfcCShapeProfileDef(IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< std::string > v2_ProfileName, IfcAxis2Placement2D* v3_Position, double v4_Depth, double v5_Width, double v6_WallThickness, double v7_Girth, boost::optional< double > v8_InternalFilletRadius) : IfcParameterizedProfileDef((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,v1_ProfileType,IfcProfileTypeEnum::ToString(v1_ProfileType)); if (v2_ProfileName) { e->setArgument(1,(*v2_ProfileName)); } else { e->setArgument(1); } e->setArgument(2,(v3_Position)); e->setArgument(3,(v4_Depth)); e->setArgument(4,(v5_Width)); e->setArgument(5,(v6_WallThickness)); e->setArgument(6,(v7_Girth)); if (v8_InternalFilletRadius) { e->setArgument(7,(*v8_InternalFilletRadius)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcCableCarrierFitting
-bool IfcCableCarrierFitting::hasPredefinedType() { return !entity->getArgument(8)->isNull(); }
-IfcCableCarrierFittingTypeEnum::IfcCableCarrierFittingTypeEnum IfcCableCarrierFitting::PredefinedType() { return IfcCableCarrierFittingTypeEnum::FromString(*entity->getArgument(8)); }
+bool IfcCableCarrierFitting::hasPredefinedType() const { return !entity->getArgument(8)->isNull(); }
+IfcCableCarrierFittingTypeEnum::IfcCableCarrierFittingTypeEnum IfcCableCarrierFitting::PredefinedType() const { return IfcCableCarrierFittingTypeEnum::FromString(*entity->getArgument(8)); }
 void IfcCableCarrierFitting::setPredefinedType(IfcCableCarrierFittingTypeEnum::IfcCableCarrierFittingTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcCableCarrierFittingTypeEnum::ToString(v)); }
 bool IfcCableCarrierFitting::is(Type::Enum v) const { return v == Type::IfcCableCarrierFitting || IfcFlowFitting::is(v); }
 Type::Enum IfcCableCarrierFitting::type() const { return Type::IfcCableCarrierFitting; }
 Type::Enum IfcCableCarrierFitting::Class() { return Type::IfcCableCarrierFitting; }
-IfcCableCarrierFitting::IfcCableCarrierFitting(IfcAbstractEntityPtr e) : IfcFlowFitting((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcCableCarrierFitting)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcCableCarrierFitting::IfcCableCarrierFitting(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcCableCarrierFittingTypeEnum::IfcCableCarrierFittingTypeEnum > v9_PredefinedType) : IfcFlowFitting((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcCableCarrierFittingTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcCableCarrierFitting::IfcCableCarrierFitting(IfcAbstractEntity* e) : IfcFlowFitting((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcCableCarrierFitting)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcCableCarrierFitting::IfcCableCarrierFitting(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcCableCarrierFittingTypeEnum::IfcCableCarrierFittingTypeEnum > v9_PredefinedType) : IfcFlowFitting((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcCableCarrierFittingTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcCableCarrierFittingType
-IfcCableCarrierFittingTypeEnum::IfcCableCarrierFittingTypeEnum IfcCableCarrierFittingType::PredefinedType() { return IfcCableCarrierFittingTypeEnum::FromString(*entity->getArgument(9)); }
+IfcCableCarrierFittingTypeEnum::IfcCableCarrierFittingTypeEnum IfcCableCarrierFittingType::PredefinedType() const { return IfcCableCarrierFittingTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcCableCarrierFittingType::setPredefinedType(IfcCableCarrierFittingTypeEnum::IfcCableCarrierFittingTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcCableCarrierFittingTypeEnum::ToString(v)); }
 bool IfcCableCarrierFittingType::is(Type::Enum v) const { return v == Type::IfcCableCarrierFittingType || IfcFlowFittingType::is(v); }
 Type::Enum IfcCableCarrierFittingType::type() const { return Type::IfcCableCarrierFittingType; }
 Type::Enum IfcCableCarrierFittingType::Class() { return Type::IfcCableCarrierFittingType; }
-IfcCableCarrierFittingType::IfcCableCarrierFittingType(IfcAbstractEntityPtr e) : IfcFlowFittingType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcCableCarrierFittingType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcCableCarrierFittingType::IfcCableCarrierFittingType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcCableCarrierFittingTypeEnum::IfcCableCarrierFittingTypeEnum v10_PredefinedType) : IfcFlowFittingType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcCableCarrierFittingTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcCableCarrierFittingType::IfcCableCarrierFittingType(IfcAbstractEntity* e) : IfcFlowFittingType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcCableCarrierFittingType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcCableCarrierFittingType::IfcCableCarrierFittingType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcCableCarrierFittingTypeEnum::IfcCableCarrierFittingTypeEnum v10_PredefinedType) : IfcFlowFittingType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcCableCarrierFittingTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcCableCarrierSegment
-bool IfcCableCarrierSegment::hasPredefinedType() { return !entity->getArgument(8)->isNull(); }
-IfcCableCarrierSegmentTypeEnum::IfcCableCarrierSegmentTypeEnum IfcCableCarrierSegment::PredefinedType() { return IfcCableCarrierSegmentTypeEnum::FromString(*entity->getArgument(8)); }
+bool IfcCableCarrierSegment::hasPredefinedType() const { return !entity->getArgument(8)->isNull(); }
+IfcCableCarrierSegmentTypeEnum::IfcCableCarrierSegmentTypeEnum IfcCableCarrierSegment::PredefinedType() const { return IfcCableCarrierSegmentTypeEnum::FromString(*entity->getArgument(8)); }
 void IfcCableCarrierSegment::setPredefinedType(IfcCableCarrierSegmentTypeEnum::IfcCableCarrierSegmentTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcCableCarrierSegmentTypeEnum::ToString(v)); }
 bool IfcCableCarrierSegment::is(Type::Enum v) const { return v == Type::IfcCableCarrierSegment || IfcFlowSegment::is(v); }
 Type::Enum IfcCableCarrierSegment::type() const { return Type::IfcCableCarrierSegment; }
 Type::Enum IfcCableCarrierSegment::Class() { return Type::IfcCableCarrierSegment; }
-IfcCableCarrierSegment::IfcCableCarrierSegment(IfcAbstractEntityPtr e) : IfcFlowSegment((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcCableCarrierSegment)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcCableCarrierSegment::IfcCableCarrierSegment(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcCableCarrierSegmentTypeEnum::IfcCableCarrierSegmentTypeEnum > v9_PredefinedType) : IfcFlowSegment((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcCableCarrierSegmentTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcCableCarrierSegment::IfcCableCarrierSegment(IfcAbstractEntity* e) : IfcFlowSegment((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcCableCarrierSegment)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcCableCarrierSegment::IfcCableCarrierSegment(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcCableCarrierSegmentTypeEnum::IfcCableCarrierSegmentTypeEnum > v9_PredefinedType) : IfcFlowSegment((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcCableCarrierSegmentTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcCableCarrierSegmentType
-IfcCableCarrierSegmentTypeEnum::IfcCableCarrierSegmentTypeEnum IfcCableCarrierSegmentType::PredefinedType() { return IfcCableCarrierSegmentTypeEnum::FromString(*entity->getArgument(9)); }
+IfcCableCarrierSegmentTypeEnum::IfcCableCarrierSegmentTypeEnum IfcCableCarrierSegmentType::PredefinedType() const { return IfcCableCarrierSegmentTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcCableCarrierSegmentType::setPredefinedType(IfcCableCarrierSegmentTypeEnum::IfcCableCarrierSegmentTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcCableCarrierSegmentTypeEnum::ToString(v)); }
 bool IfcCableCarrierSegmentType::is(Type::Enum v) const { return v == Type::IfcCableCarrierSegmentType || IfcFlowSegmentType::is(v); }
 Type::Enum IfcCableCarrierSegmentType::type() const { return Type::IfcCableCarrierSegmentType; }
 Type::Enum IfcCableCarrierSegmentType::Class() { return Type::IfcCableCarrierSegmentType; }
-IfcCableCarrierSegmentType::IfcCableCarrierSegmentType(IfcAbstractEntityPtr e) : IfcFlowSegmentType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcCableCarrierSegmentType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcCableCarrierSegmentType::IfcCableCarrierSegmentType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcCableCarrierSegmentTypeEnum::IfcCableCarrierSegmentTypeEnum v10_PredefinedType) : IfcFlowSegmentType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcCableCarrierSegmentTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcCableCarrierSegmentType::IfcCableCarrierSegmentType(IfcAbstractEntity* e) : IfcFlowSegmentType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcCableCarrierSegmentType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcCableCarrierSegmentType::IfcCableCarrierSegmentType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcCableCarrierSegmentTypeEnum::IfcCableCarrierSegmentTypeEnum v10_PredefinedType) : IfcFlowSegmentType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcCableCarrierSegmentTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcCableFitting
-bool IfcCableFitting::hasPredefinedType() { return !entity->getArgument(8)->isNull(); }
-IfcCableFittingTypeEnum::IfcCableFittingTypeEnum IfcCableFitting::PredefinedType() { return IfcCableFittingTypeEnum::FromString(*entity->getArgument(8)); }
+bool IfcCableFitting::hasPredefinedType() const { return !entity->getArgument(8)->isNull(); }
+IfcCableFittingTypeEnum::IfcCableFittingTypeEnum IfcCableFitting::PredefinedType() const { return IfcCableFittingTypeEnum::FromString(*entity->getArgument(8)); }
 void IfcCableFitting::setPredefinedType(IfcCableFittingTypeEnum::IfcCableFittingTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcCableFittingTypeEnum::ToString(v)); }
 bool IfcCableFitting::is(Type::Enum v) const { return v == Type::IfcCableFitting || IfcFlowFitting::is(v); }
 Type::Enum IfcCableFitting::type() const { return Type::IfcCableFitting; }
 Type::Enum IfcCableFitting::Class() { return Type::IfcCableFitting; }
-IfcCableFitting::IfcCableFitting(IfcAbstractEntityPtr e) : IfcFlowFitting((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcCableFitting)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcCableFitting::IfcCableFitting(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcCableFittingTypeEnum::IfcCableFittingTypeEnum > v9_PredefinedType) : IfcFlowFitting((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcCableFittingTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcCableFitting::IfcCableFitting(IfcAbstractEntity* e) : IfcFlowFitting((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcCableFitting)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcCableFitting::IfcCableFitting(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcCableFittingTypeEnum::IfcCableFittingTypeEnum > v9_PredefinedType) : IfcFlowFitting((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcCableFittingTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcCableFittingType
-IfcCableFittingTypeEnum::IfcCableFittingTypeEnum IfcCableFittingType::PredefinedType() { return IfcCableFittingTypeEnum::FromString(*entity->getArgument(9)); }
+IfcCableFittingTypeEnum::IfcCableFittingTypeEnum IfcCableFittingType::PredefinedType() const { return IfcCableFittingTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcCableFittingType::setPredefinedType(IfcCableFittingTypeEnum::IfcCableFittingTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcCableFittingTypeEnum::ToString(v)); }
 bool IfcCableFittingType::is(Type::Enum v) const { return v == Type::IfcCableFittingType || IfcFlowFittingType::is(v); }
 Type::Enum IfcCableFittingType::type() const { return Type::IfcCableFittingType; }
 Type::Enum IfcCableFittingType::Class() { return Type::IfcCableFittingType; }
-IfcCableFittingType::IfcCableFittingType(IfcAbstractEntityPtr e) : IfcFlowFittingType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcCableFittingType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcCableFittingType::IfcCableFittingType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcCableFittingTypeEnum::IfcCableFittingTypeEnum v10_PredefinedType) : IfcFlowFittingType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcCableFittingTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcCableFittingType::IfcCableFittingType(IfcAbstractEntity* e) : IfcFlowFittingType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcCableFittingType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcCableFittingType::IfcCableFittingType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcCableFittingTypeEnum::IfcCableFittingTypeEnum v10_PredefinedType) : IfcFlowFittingType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcCableFittingTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcCableSegment
-bool IfcCableSegment::hasPredefinedType() { return !entity->getArgument(8)->isNull(); }
-IfcCableSegmentTypeEnum::IfcCableSegmentTypeEnum IfcCableSegment::PredefinedType() { return IfcCableSegmentTypeEnum::FromString(*entity->getArgument(8)); }
+bool IfcCableSegment::hasPredefinedType() const { return !entity->getArgument(8)->isNull(); }
+IfcCableSegmentTypeEnum::IfcCableSegmentTypeEnum IfcCableSegment::PredefinedType() const { return IfcCableSegmentTypeEnum::FromString(*entity->getArgument(8)); }
 void IfcCableSegment::setPredefinedType(IfcCableSegmentTypeEnum::IfcCableSegmentTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcCableSegmentTypeEnum::ToString(v)); }
 bool IfcCableSegment::is(Type::Enum v) const { return v == Type::IfcCableSegment || IfcFlowSegment::is(v); }
 Type::Enum IfcCableSegment::type() const { return Type::IfcCableSegment; }
 Type::Enum IfcCableSegment::Class() { return Type::IfcCableSegment; }
-IfcCableSegment::IfcCableSegment(IfcAbstractEntityPtr e) : IfcFlowSegment((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcCableSegment)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcCableSegment::IfcCableSegment(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcCableSegmentTypeEnum::IfcCableSegmentTypeEnum > v9_PredefinedType) : IfcFlowSegment((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcCableSegmentTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcCableSegment::IfcCableSegment(IfcAbstractEntity* e) : IfcFlowSegment((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcCableSegment)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcCableSegment::IfcCableSegment(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcCableSegmentTypeEnum::IfcCableSegmentTypeEnum > v9_PredefinedType) : IfcFlowSegment((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcCableSegmentTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcCableSegmentType
-IfcCableSegmentTypeEnum::IfcCableSegmentTypeEnum IfcCableSegmentType::PredefinedType() { return IfcCableSegmentTypeEnum::FromString(*entity->getArgument(9)); }
+IfcCableSegmentTypeEnum::IfcCableSegmentTypeEnum IfcCableSegmentType::PredefinedType() const { return IfcCableSegmentTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcCableSegmentType::setPredefinedType(IfcCableSegmentTypeEnum::IfcCableSegmentTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcCableSegmentTypeEnum::ToString(v)); }
 bool IfcCableSegmentType::is(Type::Enum v) const { return v == Type::IfcCableSegmentType || IfcFlowSegmentType::is(v); }
 Type::Enum IfcCableSegmentType::type() const { return Type::IfcCableSegmentType; }
 Type::Enum IfcCableSegmentType::Class() { return Type::IfcCableSegmentType; }
-IfcCableSegmentType::IfcCableSegmentType(IfcAbstractEntityPtr e) : IfcFlowSegmentType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcCableSegmentType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcCableSegmentType::IfcCableSegmentType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcCableSegmentTypeEnum::IfcCableSegmentTypeEnum v10_PredefinedType) : IfcFlowSegmentType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcCableSegmentTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcCableSegmentType::IfcCableSegmentType(IfcAbstractEntity* e) : IfcFlowSegmentType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcCableSegmentType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcCableSegmentType::IfcCableSegmentType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcCableSegmentTypeEnum::IfcCableSegmentTypeEnum v10_PredefinedType) : IfcFlowSegmentType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcCableSegmentTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcCartesianPoint
-std::vector< IfcLengthMeasure > /*[1:3]*/ IfcCartesianPoint::Coordinates() { return *entity->getArgument(0); }
-void IfcCartesianPoint::setCoordinates(std::vector< IfcLengthMeasure > /*[1:3]*/ v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+std::vector< double > /*[1:3]*/ IfcCartesianPoint::Coordinates() const { return *entity->getArgument(0); }
+void IfcCartesianPoint::setCoordinates(std::vector< double > /*[1:3]*/ v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
 bool IfcCartesianPoint::is(Type::Enum v) const { return v == Type::IfcCartesianPoint || IfcPoint::is(v); }
 Type::Enum IfcCartesianPoint::type() const { return Type::IfcCartesianPoint; }
 Type::Enum IfcCartesianPoint::Class() { return Type::IfcCartesianPoint; }
-IfcCartesianPoint::IfcCartesianPoint(IfcAbstractEntityPtr e) : IfcPoint((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcCartesianPoint)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcCartesianPoint::IfcCartesianPoint(std::vector< IfcLengthMeasure > /*[1:3]*/ v1_Coordinates) : IfcPoint((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Coordinates)); entity = e; EntityBuffer::Add(this); }
+IfcCartesianPoint::IfcCartesianPoint(IfcAbstractEntity* e) : IfcPoint((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcCartesianPoint)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcCartesianPoint::IfcCartesianPoint(std::vector< double > /*[1:3]*/ v1_Coordinates) : IfcPoint((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Coordinates)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcCartesianPointList
 bool IfcCartesianPointList::is(Type::Enum v) const { return v == Type::IfcCartesianPointList || IfcGeometricRepresentationItem::is(v); }
 Type::Enum IfcCartesianPointList::type() const { return Type::IfcCartesianPointList; }
 Type::Enum IfcCartesianPointList::Class() { return Type::IfcCartesianPointList; }
-IfcCartesianPointList::IfcCartesianPointList(IfcAbstractEntityPtr e) : IfcGeometricRepresentationItem((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcCartesianPointList)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcCartesianPointList::IfcCartesianPointList() : IfcGeometricRepresentationItem((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); entity = e; EntityBuffer::Add(this); }
+IfcCartesianPointList::IfcCartesianPointList(IfcAbstractEntity* e) : IfcGeometricRepresentationItem((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcCartesianPointList)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcCartesianPointList::IfcCartesianPointList() : IfcGeometricRepresentationItem((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcCartesianPointList3D
 bool IfcCartesianPointList3D::is(Type::Enum v) const { return v == Type::IfcCartesianPointList3D || IfcCartesianPointList::is(v); }
 Type::Enum IfcCartesianPointList3D::type() const { return Type::IfcCartesianPointList3D; }
 Type::Enum IfcCartesianPointList3D::Class() { return Type::IfcCartesianPointList3D; }
-IfcCartesianPointList3D::IfcCartesianPointList3D(IfcAbstractEntityPtr e) : IfcCartesianPointList((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcCartesianPointList3D)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcCartesianPointList3D::IfcCartesianPointList3D() : IfcCartesianPointList((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); entity = e; EntityBuffer::Add(this); }
+IfcCartesianPointList3D::IfcCartesianPointList3D(IfcAbstractEntity* e) : IfcCartesianPointList((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcCartesianPointList3D)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcCartesianPointList3D::IfcCartesianPointList3D() : IfcCartesianPointList((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcCartesianTransformationOperator
-bool IfcCartesianTransformationOperator::hasAxis1() { return !entity->getArgument(0)->isNull(); }
-IfcDirection* IfcCartesianTransformationOperator::Axis1() { return (IfcDirection*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(0))); }
+bool IfcCartesianTransformationOperator::hasAxis1() const { return !entity->getArgument(0)->isNull(); }
+IfcDirection* IfcCartesianTransformationOperator::Axis1() const { return (IfcDirection*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(0))); }
 void IfcCartesianTransformationOperator::setAxis1(IfcDirection* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-bool IfcCartesianTransformationOperator::hasAxis2() { return !entity->getArgument(1)->isNull(); }
-IfcDirection* IfcCartesianTransformationOperator::Axis2() { return (IfcDirection*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(1))); }
+bool IfcCartesianTransformationOperator::hasAxis2() const { return !entity->getArgument(1)->isNull(); }
+IfcDirection* IfcCartesianTransformationOperator::Axis2() const { return (IfcDirection*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(1))); }
 void IfcCartesianTransformationOperator::setAxis2(IfcDirection* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-IfcCartesianPoint* IfcCartesianTransformationOperator::LocalOrigin() { return (IfcCartesianPoint*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(2))); }
+IfcCartesianPoint* IfcCartesianTransformationOperator::LocalOrigin() const { return (IfcCartesianPoint*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(2))); }
 void IfcCartesianTransformationOperator::setLocalOrigin(IfcCartesianPoint* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-bool IfcCartesianTransformationOperator::hasScale() { return !entity->getArgument(3)->isNull(); }
-double IfcCartesianTransformationOperator::Scale() { return *entity->getArgument(3); }
+bool IfcCartesianTransformationOperator::hasScale() const { return !entity->getArgument(3)->isNull(); }
+double IfcCartesianTransformationOperator::Scale() const { return *entity->getArgument(3); }
 void IfcCartesianTransformationOperator::setScale(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
 bool IfcCartesianTransformationOperator::is(Type::Enum v) const { return v == Type::IfcCartesianTransformationOperator || IfcGeometricRepresentationItem::is(v); }
 Type::Enum IfcCartesianTransformationOperator::type() const { return Type::IfcCartesianTransformationOperator; }
 Type::Enum IfcCartesianTransformationOperator::Class() { return Type::IfcCartesianTransformationOperator; }
-IfcCartesianTransformationOperator::IfcCartesianTransformationOperator(IfcAbstractEntityPtr e) : IfcGeometricRepresentationItem((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcCartesianTransformationOperator)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcCartesianTransformationOperator::IfcCartesianTransformationOperator(IfcDirection* v1_Axis1, IfcDirection* v2_Axis2, IfcCartesianPoint* v3_LocalOrigin, boost::optional< double > v4_Scale) : IfcGeometricRepresentationItem((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Axis1)); e->setArgument(1,(v2_Axis2)); e->setArgument(2,(v3_LocalOrigin)); if (v4_Scale) { e->setArgument(3,(*v4_Scale)); } else { e->setArgument(3); } entity = e; EntityBuffer::Add(this); }
+IfcCartesianTransformationOperator::IfcCartesianTransformationOperator(IfcAbstractEntity* e) : IfcGeometricRepresentationItem((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcCartesianTransformationOperator)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcCartesianTransformationOperator::IfcCartesianTransformationOperator(IfcDirection* v1_Axis1, IfcDirection* v2_Axis2, IfcCartesianPoint* v3_LocalOrigin, boost::optional< double > v4_Scale) : IfcGeometricRepresentationItem((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Axis1)); e->setArgument(1,(v2_Axis2)); e->setArgument(2,(v3_LocalOrigin)); if (v4_Scale) { e->setArgument(3,(*v4_Scale)); } else { e->setArgument(3); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcCartesianTransformationOperator2D
 bool IfcCartesianTransformationOperator2D::is(Type::Enum v) const { return v == Type::IfcCartesianTransformationOperator2D || IfcCartesianTransformationOperator::is(v); }
 Type::Enum IfcCartesianTransformationOperator2D::type() const { return Type::IfcCartesianTransformationOperator2D; }
 Type::Enum IfcCartesianTransformationOperator2D::Class() { return Type::IfcCartesianTransformationOperator2D; }
-IfcCartesianTransformationOperator2D::IfcCartesianTransformationOperator2D(IfcAbstractEntityPtr e) : IfcCartesianTransformationOperator((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcCartesianTransformationOperator2D)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcCartesianTransformationOperator2D::IfcCartesianTransformationOperator2D(IfcDirection* v1_Axis1, IfcDirection* v2_Axis2, IfcCartesianPoint* v3_LocalOrigin, boost::optional< double > v4_Scale) : IfcCartesianTransformationOperator((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Axis1)); e->setArgument(1,(v2_Axis2)); e->setArgument(2,(v3_LocalOrigin)); if (v4_Scale) { e->setArgument(3,(*v4_Scale)); } else { e->setArgument(3); } entity = e; EntityBuffer::Add(this); }
+IfcCartesianTransformationOperator2D::IfcCartesianTransformationOperator2D(IfcAbstractEntity* e) : IfcCartesianTransformationOperator((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcCartesianTransformationOperator2D)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcCartesianTransformationOperator2D::IfcCartesianTransformationOperator2D(IfcDirection* v1_Axis1, IfcDirection* v2_Axis2, IfcCartesianPoint* v3_LocalOrigin, boost::optional< double > v4_Scale) : IfcCartesianTransformationOperator((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Axis1)); e->setArgument(1,(v2_Axis2)); e->setArgument(2,(v3_LocalOrigin)); if (v4_Scale) { e->setArgument(3,(*v4_Scale)); } else { e->setArgument(3); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcCartesianTransformationOperator2DnonUniform
-bool IfcCartesianTransformationOperator2DnonUniform::hasScale2() { return !entity->getArgument(4)->isNull(); }
-double IfcCartesianTransformationOperator2DnonUniform::Scale2() { return *entity->getArgument(4); }
+bool IfcCartesianTransformationOperator2DnonUniform::hasScale2() const { return !entity->getArgument(4)->isNull(); }
+double IfcCartesianTransformationOperator2DnonUniform::Scale2() const { return *entity->getArgument(4); }
 void IfcCartesianTransformationOperator2DnonUniform::setScale2(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
 bool IfcCartesianTransformationOperator2DnonUniform::is(Type::Enum v) const { return v == Type::IfcCartesianTransformationOperator2DnonUniform || IfcCartesianTransformationOperator2D::is(v); }
 Type::Enum IfcCartesianTransformationOperator2DnonUniform::type() const { return Type::IfcCartesianTransformationOperator2DnonUniform; }
 Type::Enum IfcCartesianTransformationOperator2DnonUniform::Class() { return Type::IfcCartesianTransformationOperator2DnonUniform; }
-IfcCartesianTransformationOperator2DnonUniform::IfcCartesianTransformationOperator2DnonUniform(IfcAbstractEntityPtr e) : IfcCartesianTransformationOperator2D((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcCartesianTransformationOperator2DnonUniform)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcCartesianTransformationOperator2DnonUniform::IfcCartesianTransformationOperator2DnonUniform(IfcDirection* v1_Axis1, IfcDirection* v2_Axis2, IfcCartesianPoint* v3_LocalOrigin, boost::optional< double > v4_Scale, boost::optional< double > v5_Scale2) : IfcCartesianTransformationOperator2D((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Axis1)); e->setArgument(1,(v2_Axis2)); e->setArgument(2,(v3_LocalOrigin)); if (v4_Scale) { e->setArgument(3,(*v4_Scale)); } else { e->setArgument(3); } if (v5_Scale2) { e->setArgument(4,(*v5_Scale2)); } else { e->setArgument(4); } entity = e; EntityBuffer::Add(this); }
+IfcCartesianTransformationOperator2DnonUniform::IfcCartesianTransformationOperator2DnonUniform(IfcAbstractEntity* e) : IfcCartesianTransformationOperator2D((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcCartesianTransformationOperator2DnonUniform)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcCartesianTransformationOperator2DnonUniform::IfcCartesianTransformationOperator2DnonUniform(IfcDirection* v1_Axis1, IfcDirection* v2_Axis2, IfcCartesianPoint* v3_LocalOrigin, boost::optional< double > v4_Scale, boost::optional< double > v5_Scale2) : IfcCartesianTransformationOperator2D((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Axis1)); e->setArgument(1,(v2_Axis2)); e->setArgument(2,(v3_LocalOrigin)); if (v4_Scale) { e->setArgument(3,(*v4_Scale)); } else { e->setArgument(3); } if (v5_Scale2) { e->setArgument(4,(*v5_Scale2)); } else { e->setArgument(4); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcCartesianTransformationOperator3D
-bool IfcCartesianTransformationOperator3D::hasAxis3() { return !entity->getArgument(4)->isNull(); }
-IfcDirection* IfcCartesianTransformationOperator3D::Axis3() { return (IfcDirection*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(4))); }
+bool IfcCartesianTransformationOperator3D::hasAxis3() const { return !entity->getArgument(4)->isNull(); }
+IfcDirection* IfcCartesianTransformationOperator3D::Axis3() const { return (IfcDirection*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(4))); }
 void IfcCartesianTransformationOperator3D::setAxis3(IfcDirection* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
 bool IfcCartesianTransformationOperator3D::is(Type::Enum v) const { return v == Type::IfcCartesianTransformationOperator3D || IfcCartesianTransformationOperator::is(v); }
 Type::Enum IfcCartesianTransformationOperator3D::type() const { return Type::IfcCartesianTransformationOperator3D; }
 Type::Enum IfcCartesianTransformationOperator3D::Class() { return Type::IfcCartesianTransformationOperator3D; }
-IfcCartesianTransformationOperator3D::IfcCartesianTransformationOperator3D(IfcAbstractEntityPtr e) : IfcCartesianTransformationOperator((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcCartesianTransformationOperator3D)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcCartesianTransformationOperator3D::IfcCartesianTransformationOperator3D(IfcDirection* v1_Axis1, IfcDirection* v2_Axis2, IfcCartesianPoint* v3_LocalOrigin, boost::optional< double > v4_Scale, IfcDirection* v5_Axis3) : IfcCartesianTransformationOperator((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Axis1)); e->setArgument(1,(v2_Axis2)); e->setArgument(2,(v3_LocalOrigin)); if (v4_Scale) { e->setArgument(3,(*v4_Scale)); } else { e->setArgument(3); } e->setArgument(4,(v5_Axis3)); entity = e; EntityBuffer::Add(this); }
+IfcCartesianTransformationOperator3D::IfcCartesianTransformationOperator3D(IfcAbstractEntity* e) : IfcCartesianTransformationOperator((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcCartesianTransformationOperator3D)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcCartesianTransformationOperator3D::IfcCartesianTransformationOperator3D(IfcDirection* v1_Axis1, IfcDirection* v2_Axis2, IfcCartesianPoint* v3_LocalOrigin, boost::optional< double > v4_Scale, IfcDirection* v5_Axis3) : IfcCartesianTransformationOperator((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Axis1)); e->setArgument(1,(v2_Axis2)); e->setArgument(2,(v3_LocalOrigin)); if (v4_Scale) { e->setArgument(3,(*v4_Scale)); } else { e->setArgument(3); } e->setArgument(4,(v5_Axis3)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcCartesianTransformationOperator3DnonUniform
-bool IfcCartesianTransformationOperator3DnonUniform::hasScale2() { return !entity->getArgument(5)->isNull(); }
-double IfcCartesianTransformationOperator3DnonUniform::Scale2() { return *entity->getArgument(5); }
+bool IfcCartesianTransformationOperator3DnonUniform::hasScale2() const { return !entity->getArgument(5)->isNull(); }
+double IfcCartesianTransformationOperator3DnonUniform::Scale2() const { return *entity->getArgument(5); }
 void IfcCartesianTransformationOperator3DnonUniform::setScale2(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-bool IfcCartesianTransformationOperator3DnonUniform::hasScale3() { return !entity->getArgument(6)->isNull(); }
-double IfcCartesianTransformationOperator3DnonUniform::Scale3() { return *entity->getArgument(6); }
+bool IfcCartesianTransformationOperator3DnonUniform::hasScale3() const { return !entity->getArgument(6)->isNull(); }
+double IfcCartesianTransformationOperator3DnonUniform::Scale3() const { return *entity->getArgument(6); }
 void IfcCartesianTransformationOperator3DnonUniform::setScale3(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
 bool IfcCartesianTransformationOperator3DnonUniform::is(Type::Enum v) const { return v == Type::IfcCartesianTransformationOperator3DnonUniform || IfcCartesianTransformationOperator3D::is(v); }
 Type::Enum IfcCartesianTransformationOperator3DnonUniform::type() const { return Type::IfcCartesianTransformationOperator3DnonUniform; }
 Type::Enum IfcCartesianTransformationOperator3DnonUniform::Class() { return Type::IfcCartesianTransformationOperator3DnonUniform; }
-IfcCartesianTransformationOperator3DnonUniform::IfcCartesianTransformationOperator3DnonUniform(IfcAbstractEntityPtr e) : IfcCartesianTransformationOperator3D((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcCartesianTransformationOperator3DnonUniform)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcCartesianTransformationOperator3DnonUniform::IfcCartesianTransformationOperator3DnonUniform(IfcDirection* v1_Axis1, IfcDirection* v2_Axis2, IfcCartesianPoint* v3_LocalOrigin, boost::optional< double > v4_Scale, IfcDirection* v5_Axis3, boost::optional< double > v6_Scale2, boost::optional< double > v7_Scale3) : IfcCartesianTransformationOperator3D((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Axis1)); e->setArgument(1,(v2_Axis2)); e->setArgument(2,(v3_LocalOrigin)); if (v4_Scale) { e->setArgument(3,(*v4_Scale)); } else { e->setArgument(3); } e->setArgument(4,(v5_Axis3)); if (v6_Scale2) { e->setArgument(5,(*v6_Scale2)); } else { e->setArgument(5); } if (v7_Scale3) { e->setArgument(6,(*v7_Scale3)); } else { e->setArgument(6); } entity = e; EntityBuffer::Add(this); }
+IfcCartesianTransformationOperator3DnonUniform::IfcCartesianTransformationOperator3DnonUniform(IfcAbstractEntity* e) : IfcCartesianTransformationOperator3D((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcCartesianTransformationOperator3DnonUniform)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcCartesianTransformationOperator3DnonUniform::IfcCartesianTransformationOperator3DnonUniform(IfcDirection* v1_Axis1, IfcDirection* v2_Axis2, IfcCartesianPoint* v3_LocalOrigin, boost::optional< double > v4_Scale, IfcDirection* v5_Axis3, boost::optional< double > v6_Scale2, boost::optional< double > v7_Scale3) : IfcCartesianTransformationOperator3D((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Axis1)); e->setArgument(1,(v2_Axis2)); e->setArgument(2,(v3_LocalOrigin)); if (v4_Scale) { e->setArgument(3,(*v4_Scale)); } else { e->setArgument(3); } e->setArgument(4,(v5_Axis3)); if (v6_Scale2) { e->setArgument(5,(*v6_Scale2)); } else { e->setArgument(5); } if (v7_Scale3) { e->setArgument(6,(*v7_Scale3)); } else { e->setArgument(6); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcCenterLineProfileDef
-IfcPositiveLengthMeasure IfcCenterLineProfileDef::Thickness() { return *entity->getArgument(3); }
-void IfcCenterLineProfileDef::setThickness(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+double IfcCenterLineProfileDef::Thickness() const { return *entity->getArgument(3); }
+void IfcCenterLineProfileDef::setThickness(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
 bool IfcCenterLineProfileDef::is(Type::Enum v) const { return v == Type::IfcCenterLineProfileDef || IfcArbitraryOpenProfileDef::is(v); }
 Type::Enum IfcCenterLineProfileDef::type() const { return Type::IfcCenterLineProfileDef; }
 Type::Enum IfcCenterLineProfileDef::Class() { return Type::IfcCenterLineProfileDef; }
-IfcCenterLineProfileDef::IfcCenterLineProfileDef(IfcAbstractEntityPtr e) : IfcArbitraryOpenProfileDef((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcCenterLineProfileDef)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcCenterLineProfileDef::IfcCenterLineProfileDef(IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< IfcLabel > v2_ProfileName, IfcBoundedCurve* v3_Curve, IfcPositiveLengthMeasure v4_Thickness) : IfcArbitraryOpenProfileDef((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,v1_ProfileType,IfcProfileTypeEnum::ToString(v1_ProfileType)); if (v2_ProfileName) { e->setArgument(1,(*v2_ProfileName)); } else { e->setArgument(1); } e->setArgument(2,(v3_Curve)); e->setArgument(3,(v4_Thickness)); entity = e; EntityBuffer::Add(this); }
+IfcCenterLineProfileDef::IfcCenterLineProfileDef(IfcAbstractEntity* e) : IfcArbitraryOpenProfileDef((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcCenterLineProfileDef)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcCenterLineProfileDef::IfcCenterLineProfileDef(IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< std::string > v2_ProfileName, IfcBoundedCurve* v3_Curve, double v4_Thickness) : IfcArbitraryOpenProfileDef((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,v1_ProfileType,IfcProfileTypeEnum::ToString(v1_ProfileType)); if (v2_ProfileName) { e->setArgument(1,(*v2_ProfileName)); } else { e->setArgument(1); } e->setArgument(2,(v3_Curve)); e->setArgument(3,(v4_Thickness)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcChiller
-bool IfcChiller::hasPredefinedType() { return !entity->getArgument(8)->isNull(); }
-IfcChillerTypeEnum::IfcChillerTypeEnum IfcChiller::PredefinedType() { return IfcChillerTypeEnum::FromString(*entity->getArgument(8)); }
+bool IfcChiller::hasPredefinedType() const { return !entity->getArgument(8)->isNull(); }
+IfcChillerTypeEnum::IfcChillerTypeEnum IfcChiller::PredefinedType() const { return IfcChillerTypeEnum::FromString(*entity->getArgument(8)); }
 void IfcChiller::setPredefinedType(IfcChillerTypeEnum::IfcChillerTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcChillerTypeEnum::ToString(v)); }
 bool IfcChiller::is(Type::Enum v) const { return v == Type::IfcChiller || IfcEnergyConversionDevice::is(v); }
 Type::Enum IfcChiller::type() const { return Type::IfcChiller; }
 Type::Enum IfcChiller::Class() { return Type::IfcChiller; }
-IfcChiller::IfcChiller(IfcAbstractEntityPtr e) : IfcEnergyConversionDevice((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcChiller)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcChiller::IfcChiller(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcChillerTypeEnum::IfcChillerTypeEnum > v9_PredefinedType) : IfcEnergyConversionDevice((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcChillerTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcChiller::IfcChiller(IfcAbstractEntity* e) : IfcEnergyConversionDevice((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcChiller)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcChiller::IfcChiller(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcChillerTypeEnum::IfcChillerTypeEnum > v9_PredefinedType) : IfcEnergyConversionDevice((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcChillerTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcChillerType
-IfcChillerTypeEnum::IfcChillerTypeEnum IfcChillerType::PredefinedType() { return IfcChillerTypeEnum::FromString(*entity->getArgument(9)); }
+IfcChillerTypeEnum::IfcChillerTypeEnum IfcChillerType::PredefinedType() const { return IfcChillerTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcChillerType::setPredefinedType(IfcChillerTypeEnum::IfcChillerTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcChillerTypeEnum::ToString(v)); }
 bool IfcChillerType::is(Type::Enum v) const { return v == Type::IfcChillerType || IfcEnergyConversionDeviceType::is(v); }
 Type::Enum IfcChillerType::type() const { return Type::IfcChillerType; }
 Type::Enum IfcChillerType::Class() { return Type::IfcChillerType; }
-IfcChillerType::IfcChillerType(IfcAbstractEntityPtr e) : IfcEnergyConversionDeviceType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcChillerType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcChillerType::IfcChillerType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcChillerTypeEnum::IfcChillerTypeEnum v10_PredefinedType) : IfcEnergyConversionDeviceType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcChillerTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcChillerType::IfcChillerType(IfcAbstractEntity* e) : IfcEnergyConversionDeviceType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcChillerType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcChillerType::IfcChillerType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcChillerTypeEnum::IfcChillerTypeEnum v10_PredefinedType) : IfcEnergyConversionDeviceType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcChillerTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcChimney
-bool IfcChimney::hasPredefinedType() { return !entity->getArgument(8)->isNull(); }
-IfcChimneyTypeEnum::IfcChimneyTypeEnum IfcChimney::PredefinedType() { return IfcChimneyTypeEnum::FromString(*entity->getArgument(8)); }
+bool IfcChimney::hasPredefinedType() const { return !entity->getArgument(8)->isNull(); }
+IfcChimneyTypeEnum::IfcChimneyTypeEnum IfcChimney::PredefinedType() const { return IfcChimneyTypeEnum::FromString(*entity->getArgument(8)); }
 void IfcChimney::setPredefinedType(IfcChimneyTypeEnum::IfcChimneyTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcChimneyTypeEnum::ToString(v)); }
 bool IfcChimney::is(Type::Enum v) const { return v == Type::IfcChimney || IfcBuildingElement::is(v); }
 Type::Enum IfcChimney::type() const { return Type::IfcChimney; }
 Type::Enum IfcChimney::Class() { return Type::IfcChimney; }
-IfcChimney::IfcChimney(IfcAbstractEntityPtr e) : IfcBuildingElement((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcChimney)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcChimney::IfcChimney(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcChimneyTypeEnum::IfcChimneyTypeEnum > v9_PredefinedType) : IfcBuildingElement((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcChimneyTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcChimney::IfcChimney(IfcAbstractEntity* e) : IfcBuildingElement((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcChimney)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcChimney::IfcChimney(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcChimneyTypeEnum::IfcChimneyTypeEnum > v9_PredefinedType) : IfcBuildingElement((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcChimneyTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcChimneyType
-IfcChimneyTypeEnum::IfcChimneyTypeEnum IfcChimneyType::PredefinedType() { return IfcChimneyTypeEnum::FromString(*entity->getArgument(9)); }
+IfcChimneyTypeEnum::IfcChimneyTypeEnum IfcChimneyType::PredefinedType() const { return IfcChimneyTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcChimneyType::setPredefinedType(IfcChimneyTypeEnum::IfcChimneyTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcChimneyTypeEnum::ToString(v)); }
 bool IfcChimneyType::is(Type::Enum v) const { return v == Type::IfcChimneyType || IfcBuildingElementType::is(v); }
 Type::Enum IfcChimneyType::type() const { return Type::IfcChimneyType; }
 Type::Enum IfcChimneyType::Class() { return Type::IfcChimneyType; }
-IfcChimneyType::IfcChimneyType(IfcAbstractEntityPtr e) : IfcBuildingElementType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcChimneyType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcChimneyType::IfcChimneyType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcChimneyTypeEnum::IfcChimneyTypeEnum v10_PredefinedType) : IfcBuildingElementType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcChimneyTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcChimneyType::IfcChimneyType(IfcAbstractEntity* e) : IfcBuildingElementType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcChimneyType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcChimneyType::IfcChimneyType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcChimneyTypeEnum::IfcChimneyTypeEnum v10_PredefinedType) : IfcBuildingElementType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcChimneyTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcCircle
-IfcPositiveLengthMeasure IfcCircle::Radius() { return *entity->getArgument(1); }
-void IfcCircle::setRadius(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+double IfcCircle::Radius() const { return *entity->getArgument(1); }
+void IfcCircle::setRadius(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
 bool IfcCircle::is(Type::Enum v) const { return v == Type::IfcCircle || IfcConic::is(v); }
 Type::Enum IfcCircle::type() const { return Type::IfcCircle; }
 Type::Enum IfcCircle::Class() { return Type::IfcCircle; }
-IfcCircle::IfcCircle(IfcAbstractEntityPtr e) : IfcConic((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcCircle)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcCircle::IfcCircle(IfcAxis2Placement v1_Position, IfcPositiveLengthMeasure v2_Radius) : IfcConic((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Position)); e->setArgument(1,(v2_Radius)); entity = e; EntityBuffer::Add(this); }
+IfcCircle::IfcCircle(IfcAbstractEntity* e) : IfcConic((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcCircle)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcCircle::IfcCircle(IfcAxis2Placement* v1_Position, double v2_Radius) : IfcConic((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Position)); e->setArgument(1,(v2_Radius)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcCircleHollowProfileDef
-IfcPositiveLengthMeasure IfcCircleHollowProfileDef::WallThickness() { return *entity->getArgument(4); }
-void IfcCircleHollowProfileDef::setWallThickness(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+double IfcCircleHollowProfileDef::WallThickness() const { return *entity->getArgument(4); }
+void IfcCircleHollowProfileDef::setWallThickness(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
 bool IfcCircleHollowProfileDef::is(Type::Enum v) const { return v == Type::IfcCircleHollowProfileDef || IfcCircleProfileDef::is(v); }
 Type::Enum IfcCircleHollowProfileDef::type() const { return Type::IfcCircleHollowProfileDef; }
 Type::Enum IfcCircleHollowProfileDef::Class() { return Type::IfcCircleHollowProfileDef; }
-IfcCircleHollowProfileDef::IfcCircleHollowProfileDef(IfcAbstractEntityPtr e) : IfcCircleProfileDef((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcCircleHollowProfileDef)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcCircleHollowProfileDef::IfcCircleHollowProfileDef(IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< IfcLabel > v2_ProfileName, IfcAxis2Placement2D* v3_Position, IfcPositiveLengthMeasure v4_Radius, IfcPositiveLengthMeasure v5_WallThickness) : IfcCircleProfileDef((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,v1_ProfileType,IfcProfileTypeEnum::ToString(v1_ProfileType)); if (v2_ProfileName) { e->setArgument(1,(*v2_ProfileName)); } else { e->setArgument(1); } e->setArgument(2,(v3_Position)); e->setArgument(3,(v4_Radius)); e->setArgument(4,(v5_WallThickness)); entity = e; EntityBuffer::Add(this); }
+IfcCircleHollowProfileDef::IfcCircleHollowProfileDef(IfcAbstractEntity* e) : IfcCircleProfileDef((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcCircleHollowProfileDef)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcCircleHollowProfileDef::IfcCircleHollowProfileDef(IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< std::string > v2_ProfileName, IfcAxis2Placement2D* v3_Position, double v4_Radius, double v5_WallThickness) : IfcCircleProfileDef((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,v1_ProfileType,IfcProfileTypeEnum::ToString(v1_ProfileType)); if (v2_ProfileName) { e->setArgument(1,(*v2_ProfileName)); } else { e->setArgument(1); } e->setArgument(2,(v3_Position)); e->setArgument(3,(v4_Radius)); e->setArgument(4,(v5_WallThickness)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcCircleProfileDef
-IfcPositiveLengthMeasure IfcCircleProfileDef::Radius() { return *entity->getArgument(3); }
-void IfcCircleProfileDef::setRadius(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+double IfcCircleProfileDef::Radius() const { return *entity->getArgument(3); }
+void IfcCircleProfileDef::setRadius(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
 bool IfcCircleProfileDef::is(Type::Enum v) const { return v == Type::IfcCircleProfileDef || IfcParameterizedProfileDef::is(v); }
 Type::Enum IfcCircleProfileDef::type() const { return Type::IfcCircleProfileDef; }
 Type::Enum IfcCircleProfileDef::Class() { return Type::IfcCircleProfileDef; }
-IfcCircleProfileDef::IfcCircleProfileDef(IfcAbstractEntityPtr e) : IfcParameterizedProfileDef((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcCircleProfileDef)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcCircleProfileDef::IfcCircleProfileDef(IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< IfcLabel > v2_ProfileName, IfcAxis2Placement2D* v3_Position, IfcPositiveLengthMeasure v4_Radius) : IfcParameterizedProfileDef((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,v1_ProfileType,IfcProfileTypeEnum::ToString(v1_ProfileType)); if (v2_ProfileName) { e->setArgument(1,(*v2_ProfileName)); } else { e->setArgument(1); } e->setArgument(2,(v3_Position)); e->setArgument(3,(v4_Radius)); entity = e; EntityBuffer::Add(this); }
+IfcCircleProfileDef::IfcCircleProfileDef(IfcAbstractEntity* e) : IfcParameterizedProfileDef((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcCircleProfileDef)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcCircleProfileDef::IfcCircleProfileDef(IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< std::string > v2_ProfileName, IfcAxis2Placement2D* v3_Position, double v4_Radius) : IfcParameterizedProfileDef((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,v1_ProfileType,IfcProfileTypeEnum::ToString(v1_ProfileType)); if (v2_ProfileName) { e->setArgument(1,(*v2_ProfileName)); } else { e->setArgument(1); } e->setArgument(2,(v3_Position)); e->setArgument(3,(v4_Radius)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcCivilElement
 bool IfcCivilElement::is(Type::Enum v) const { return v == Type::IfcCivilElement || IfcElement::is(v); }
 Type::Enum IfcCivilElement::type() const { return Type::IfcCivilElement; }
 Type::Enum IfcCivilElement::Class() { return Type::IfcCivilElement; }
-IfcCivilElement::IfcCivilElement(IfcAbstractEntityPtr e) : IfcElement((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcCivilElement)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcCivilElement::IfcCivilElement(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag) : IfcElement((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
+IfcCivilElement::IfcCivilElement(IfcAbstractEntity* e) : IfcElement((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcCivilElement)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcCivilElement::IfcCivilElement(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag) : IfcElement((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcCivilElementType
 bool IfcCivilElementType::is(Type::Enum v) const { return v == Type::IfcCivilElementType || IfcElementType::is(v); }
 Type::Enum IfcCivilElementType::type() const { return Type::IfcCivilElementType; }
 Type::Enum IfcCivilElementType::Class() { return Type::IfcCivilElementType; }
-IfcCivilElementType::IfcCivilElementType(IfcAbstractEntityPtr e) : IfcElementType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcCivilElementType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcCivilElementType::IfcCivilElementType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType) : IfcElementType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcCivilElementType::IfcCivilElementType(IfcAbstractEntity* e) : IfcElementType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcCivilElementType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcCivilElementType::IfcCivilElementType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType) : IfcElementType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcClassification
-bool IfcClassification::hasSource() { return !entity->getArgument(0)->isNull(); }
-IfcLabel IfcClassification::Source() { return *entity->getArgument(0); }
-void IfcClassification::setSource(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-bool IfcClassification::hasEdition() { return !entity->getArgument(1)->isNull(); }
-IfcLabel IfcClassification::Edition() { return *entity->getArgument(1); }
-void IfcClassification::setEdition(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-bool IfcClassification::hasEditionDate() { return !entity->getArgument(2)->isNull(); }
-IfcDate IfcClassification::EditionDate() { return *entity->getArgument(2); }
-void IfcClassification::setEditionDate(IfcDate v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-IfcLabel IfcClassification::Name() { return *entity->getArgument(3); }
-void IfcClassification::setName(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-bool IfcClassification::hasDescription() { return !entity->getArgument(4)->isNull(); }
-IfcText IfcClassification::Description() { return *entity->getArgument(4); }
-void IfcClassification::setDescription(IfcText v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-bool IfcClassification::hasLocation() { return !entity->getArgument(5)->isNull(); }
-IfcURIReference IfcClassification::Location() { return *entity->getArgument(5); }
-void IfcClassification::setLocation(IfcURIReference v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-bool IfcClassification::hasReferenceTokens() { return !entity->getArgument(6)->isNull(); }
-std::vector< IfcIdentifier > /*[1:?]*/ IfcClassification::ReferenceTokens() { return *entity->getArgument(6); }
-void IfcClassification::setReferenceTokens(std::vector< IfcIdentifier > /*[1:?]*/ v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
-IfcRelAssociatesClassification::list IfcClassification::ClassificationForObjects() { RETURN_INVERSE(IfcRelAssociatesClassification) }
-IfcClassificationReference::list IfcClassification::HasReferences() { RETURN_INVERSE(IfcClassificationReference) }
+bool IfcClassification::hasSource() const { return !entity->getArgument(0)->isNull(); }
+std::string IfcClassification::Source() const { return *entity->getArgument(0); }
+void IfcClassification::setSource(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+bool IfcClassification::hasEdition() const { return !entity->getArgument(1)->isNull(); }
+std::string IfcClassification::Edition() const { return *entity->getArgument(1); }
+void IfcClassification::setEdition(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+bool IfcClassification::hasEditionDate() const { return !entity->getArgument(2)->isNull(); }
+std::string IfcClassification::EditionDate() const { return *entity->getArgument(2); }
+void IfcClassification::setEditionDate(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+std::string IfcClassification::Name() const { return *entity->getArgument(3); }
+void IfcClassification::setName(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+bool IfcClassification::hasDescription() const { return !entity->getArgument(4)->isNull(); }
+std::string IfcClassification::Description() const { return *entity->getArgument(4); }
+void IfcClassification::setDescription(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+bool IfcClassification::hasLocation() const { return !entity->getArgument(5)->isNull(); }
+std::string IfcClassification::Location() const { return *entity->getArgument(5); }
+void IfcClassification::setLocation(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+bool IfcClassification::hasReferenceTokens() const { return !entity->getArgument(6)->isNull(); }
+std::vector< std::string > /*[1:?]*/ IfcClassification::ReferenceTokens() const { return *entity->getArgument(6); }
+void IfcClassification::setReferenceTokens(std::vector< std::string > /*[1:?]*/ v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
+IfcRelAssociatesClassification::list::ptr IfcClassification::ClassificationForObjects() const { return entity->getInverse(Type::IfcRelAssociatesClassification, 5)->as<IfcRelAssociatesClassification>(); }
+IfcClassificationReference::list::ptr IfcClassification::HasReferences() const { return entity->getInverse(Type::IfcClassificationReference, 3)->as<IfcClassificationReference>(); }
 bool IfcClassification::is(Type::Enum v) const { return v == Type::IfcClassification || IfcExternalInformation::is(v); }
 Type::Enum IfcClassification::type() const { return Type::IfcClassification; }
 Type::Enum IfcClassification::Class() { return Type::IfcClassification; }
-IfcClassification::IfcClassification(IfcAbstractEntityPtr e) : IfcExternalInformation((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcClassification)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcClassification::IfcClassification(boost::optional< IfcLabel > v1_Source, boost::optional< IfcLabel > v2_Edition, boost::optional< IfcDate > v3_EditionDate, IfcLabel v4_Name, boost::optional< IfcText > v5_Description, boost::optional< IfcURIReference > v6_Location, boost::optional< std::vector< IfcIdentifier > /*[1:?]*/ > v7_ReferenceTokens) : IfcExternalInformation((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Source) { e->setArgument(0,(*v1_Source)); } else { e->setArgument(0); } if (v2_Edition) { e->setArgument(1,(*v2_Edition)); } else { e->setArgument(1); } if (v3_EditionDate) { e->setArgument(2,(*v3_EditionDate)); } else { e->setArgument(2); } e->setArgument(3,(v4_Name)); if (v5_Description) { e->setArgument(4,(*v5_Description)); } else { e->setArgument(4); } if (v6_Location) { e->setArgument(5,(*v6_Location)); } else { e->setArgument(5); } if (v7_ReferenceTokens) { e->setArgument(6,(*v7_ReferenceTokens)); } else { e->setArgument(6); } entity = e; EntityBuffer::Add(this); }
+IfcClassification::IfcClassification(IfcAbstractEntity* e) : IfcExternalInformation((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcClassification)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcClassification::IfcClassification(boost::optional< std::string > v1_Source, boost::optional< std::string > v2_Edition, boost::optional< std::string > v3_EditionDate, std::string v4_Name, boost::optional< std::string > v5_Description, boost::optional< std::string > v6_Location, boost::optional< std::vector< std::string > /*[1:?]*/ > v7_ReferenceTokens) : IfcExternalInformation((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Source) { e->setArgument(0,(*v1_Source)); } else { e->setArgument(0); } if (v2_Edition) { e->setArgument(1,(*v2_Edition)); } else { e->setArgument(1); } if (v3_EditionDate) { e->setArgument(2,(*v3_EditionDate)); } else { e->setArgument(2); } e->setArgument(3,(v4_Name)); if (v5_Description) { e->setArgument(4,(*v5_Description)); } else { e->setArgument(4); } if (v6_Location) { e->setArgument(5,(*v6_Location)); } else { e->setArgument(5); } if (v7_ReferenceTokens) { e->setArgument(6,(*v7_ReferenceTokens)); } else { e->setArgument(6); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcClassificationReference
-bool IfcClassificationReference::hasReferencedSource() { return !entity->getArgument(3)->isNull(); }
-IfcClassificationReferenceSelect IfcClassificationReference::ReferencedSource() { return *entity->getArgument(3); }
-void IfcClassificationReference::setReferencedSource(IfcClassificationReferenceSelect v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-bool IfcClassificationReference::hasDescription() { return !entity->getArgument(4)->isNull(); }
-IfcText IfcClassificationReference::Description() { return *entity->getArgument(4); }
-void IfcClassificationReference::setDescription(IfcText v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-bool IfcClassificationReference::hasSort() { return !entity->getArgument(5)->isNull(); }
-IfcIdentifier IfcClassificationReference::Sort() { return *entity->getArgument(5); }
-void IfcClassificationReference::setSort(IfcIdentifier v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-IfcRelAssociatesClassification::list IfcClassificationReference::ClassificationRefForObjects() { RETURN_INVERSE(IfcRelAssociatesClassification) }
-IfcClassificationReference::list IfcClassificationReference::HasReferences() { RETURN_INVERSE(IfcClassificationReference) }
+bool IfcClassificationReference::hasReferencedSource() const { return !entity->getArgument(3)->isNull(); }
+IfcClassificationReferenceSelect* IfcClassificationReference::ReferencedSource() const { return (IfcClassificationReferenceSelect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(3))); }
+void IfcClassificationReference::setReferencedSource(IfcClassificationReferenceSelect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+bool IfcClassificationReference::hasDescription() const { return !entity->getArgument(4)->isNull(); }
+std::string IfcClassificationReference::Description() const { return *entity->getArgument(4); }
+void IfcClassificationReference::setDescription(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+bool IfcClassificationReference::hasSort() const { return !entity->getArgument(5)->isNull(); }
+std::string IfcClassificationReference::Sort() const { return *entity->getArgument(5); }
+void IfcClassificationReference::setSort(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+IfcRelAssociatesClassification::list::ptr IfcClassificationReference::ClassificationRefForObjects() const { return entity->getInverse(Type::IfcRelAssociatesClassification, 5)->as<IfcRelAssociatesClassification>(); }
+IfcClassificationReference::list::ptr IfcClassificationReference::HasReferences() const { return entity->getInverse(Type::IfcClassificationReference, 3)->as<IfcClassificationReference>(); }
 bool IfcClassificationReference::is(Type::Enum v) const { return v == Type::IfcClassificationReference || IfcExternalReference::is(v); }
 Type::Enum IfcClassificationReference::type() const { return Type::IfcClassificationReference; }
 Type::Enum IfcClassificationReference::Class() { return Type::IfcClassificationReference; }
-IfcClassificationReference::IfcClassificationReference(IfcAbstractEntityPtr e) : IfcExternalReference((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcClassificationReference)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcClassificationReference::IfcClassificationReference(boost::optional< IfcURIReference > v1_Location, boost::optional< IfcIdentifier > v2_Identification, boost::optional< IfcLabel > v3_Name, boost::optional< IfcClassificationReferenceSelect > v4_ReferencedSource, boost::optional< IfcText > v5_Description, boost::optional< IfcIdentifier > v6_Sort) : IfcExternalReference((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Location) { e->setArgument(0,(*v1_Location)); } else { e->setArgument(0); } if (v2_Identification) { e->setArgument(1,(*v2_Identification)); } else { e->setArgument(1); } if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_ReferencedSource) { e->setArgument(3,(*v4_ReferencedSource)); } else { e->setArgument(3); } if (v5_Description) { e->setArgument(4,(*v5_Description)); } else { e->setArgument(4); } if (v6_Sort) { e->setArgument(5,(*v6_Sort)); } else { e->setArgument(5); } entity = e; EntityBuffer::Add(this); }
+IfcClassificationReference::IfcClassificationReference(IfcAbstractEntity* e) : IfcExternalReference((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcClassificationReference)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcClassificationReference::IfcClassificationReference(boost::optional< std::string > v1_Location, boost::optional< std::string > v2_Identification, boost::optional< std::string > v3_Name, IfcClassificationReferenceSelect* v4_ReferencedSource, boost::optional< std::string > v5_Description, boost::optional< std::string > v6_Sort) : IfcExternalReference((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Location) { e->setArgument(0,(*v1_Location)); } else { e->setArgument(0); } if (v2_Identification) { e->setArgument(1,(*v2_Identification)); } else { e->setArgument(1); } if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } e->setArgument(3,(v4_ReferencedSource)); if (v5_Description) { e->setArgument(4,(*v5_Description)); } else { e->setArgument(4); } if (v6_Sort) { e->setArgument(5,(*v6_Sort)); } else { e->setArgument(5); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcClosedShell
 bool IfcClosedShell::is(Type::Enum v) const { return v == Type::IfcClosedShell || IfcConnectedFaceSet::is(v); }
 Type::Enum IfcClosedShell::type() const { return Type::IfcClosedShell; }
 Type::Enum IfcClosedShell::Class() { return Type::IfcClosedShell; }
-IfcClosedShell::IfcClosedShell(IfcAbstractEntityPtr e) : IfcConnectedFaceSet((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcClosedShell)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcClosedShell::IfcClosedShell(SHARED_PTR< IfcTemplatedEntityList< IfcFace > > v1_CfsFaces) : IfcConnectedFaceSet((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_CfsFaces)->generalize()); entity = e; EntityBuffer::Add(this); }
+IfcClosedShell::IfcClosedShell(IfcAbstractEntity* e) : IfcConnectedFaceSet((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcClosedShell)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcClosedShell::IfcClosedShell(IfcTemplatedEntityList< IfcFace >::ptr v1_CfsFaces) : IfcConnectedFaceSet((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_CfsFaces)->generalize()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcCoil
-bool IfcCoil::hasPredefinedType() { return !entity->getArgument(8)->isNull(); }
-IfcCoilTypeEnum::IfcCoilTypeEnum IfcCoil::PredefinedType() { return IfcCoilTypeEnum::FromString(*entity->getArgument(8)); }
+bool IfcCoil::hasPredefinedType() const { return !entity->getArgument(8)->isNull(); }
+IfcCoilTypeEnum::IfcCoilTypeEnum IfcCoil::PredefinedType() const { return IfcCoilTypeEnum::FromString(*entity->getArgument(8)); }
 void IfcCoil::setPredefinedType(IfcCoilTypeEnum::IfcCoilTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcCoilTypeEnum::ToString(v)); }
 bool IfcCoil::is(Type::Enum v) const { return v == Type::IfcCoil || IfcEnergyConversionDevice::is(v); }
 Type::Enum IfcCoil::type() const { return Type::IfcCoil; }
 Type::Enum IfcCoil::Class() { return Type::IfcCoil; }
-IfcCoil::IfcCoil(IfcAbstractEntityPtr e) : IfcEnergyConversionDevice((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcCoil)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcCoil::IfcCoil(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcCoilTypeEnum::IfcCoilTypeEnum > v9_PredefinedType) : IfcEnergyConversionDevice((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcCoilTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcCoil::IfcCoil(IfcAbstractEntity* e) : IfcEnergyConversionDevice((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcCoil)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcCoil::IfcCoil(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcCoilTypeEnum::IfcCoilTypeEnum > v9_PredefinedType) : IfcEnergyConversionDevice((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcCoilTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcCoilType
-IfcCoilTypeEnum::IfcCoilTypeEnum IfcCoilType::PredefinedType() { return IfcCoilTypeEnum::FromString(*entity->getArgument(9)); }
+IfcCoilTypeEnum::IfcCoilTypeEnum IfcCoilType::PredefinedType() const { return IfcCoilTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcCoilType::setPredefinedType(IfcCoilTypeEnum::IfcCoilTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcCoilTypeEnum::ToString(v)); }
 bool IfcCoilType::is(Type::Enum v) const { return v == Type::IfcCoilType || IfcEnergyConversionDeviceType::is(v); }
 Type::Enum IfcCoilType::type() const { return Type::IfcCoilType; }
 Type::Enum IfcCoilType::Class() { return Type::IfcCoilType; }
-IfcCoilType::IfcCoilType(IfcAbstractEntityPtr e) : IfcEnergyConversionDeviceType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcCoilType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcCoilType::IfcCoilType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcCoilTypeEnum::IfcCoilTypeEnum v10_PredefinedType) : IfcEnergyConversionDeviceType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcCoilTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcCoilType::IfcCoilType(IfcAbstractEntity* e) : IfcEnergyConversionDeviceType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcCoilType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcCoilType::IfcCoilType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcCoilTypeEnum::IfcCoilTypeEnum v10_PredefinedType) : IfcEnergyConversionDeviceType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcCoilTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcColourRgb
-IfcNormalisedRatioMeasure IfcColourRgb::Red() { return *entity->getArgument(1); }
-void IfcColourRgb::setRed(IfcNormalisedRatioMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-IfcNormalisedRatioMeasure IfcColourRgb::Green() { return *entity->getArgument(2); }
-void IfcColourRgb::setGreen(IfcNormalisedRatioMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-IfcNormalisedRatioMeasure IfcColourRgb::Blue() { return *entity->getArgument(3); }
-void IfcColourRgb::setBlue(IfcNormalisedRatioMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+double IfcColourRgb::Red() const { return *entity->getArgument(1); }
+void IfcColourRgb::setRed(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+double IfcColourRgb::Green() const { return *entity->getArgument(2); }
+void IfcColourRgb::setGreen(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+double IfcColourRgb::Blue() const { return *entity->getArgument(3); }
+void IfcColourRgb::setBlue(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
 bool IfcColourRgb::is(Type::Enum v) const { return v == Type::IfcColourRgb || IfcColourSpecification::is(v); }
 Type::Enum IfcColourRgb::type() const { return Type::IfcColourRgb; }
 Type::Enum IfcColourRgb::Class() { return Type::IfcColourRgb; }
-IfcColourRgb::IfcColourRgb(IfcAbstractEntityPtr e) : IfcColourSpecification((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcColourRgb)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcColourRgb::IfcColourRgb(boost::optional< IfcLabel > v1_Name, IfcNormalisedRatioMeasure v2_Red, IfcNormalisedRatioMeasure v3_Green, IfcNormalisedRatioMeasure v4_Blue) : IfcColourSpecification((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } e->setArgument(1,(v2_Red)); e->setArgument(2,(v3_Green)); e->setArgument(3,(v4_Blue)); entity = e; EntityBuffer::Add(this); }
+IfcColourRgb::IfcColourRgb(IfcAbstractEntity* e) : IfcColourSpecification((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcColourRgb)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcColourRgb::IfcColourRgb(boost::optional< std::string > v1_Name, double v2_Red, double v3_Green, double v4_Blue) : IfcColourSpecification((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } e->setArgument(1,(v2_Red)); e->setArgument(2,(v3_Green)); e->setArgument(3,(v4_Blue)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcColourRgbList
 bool IfcColourRgbList::is(Type::Enum v) const { return v == Type::IfcColourRgbList || IfcPresentationItem::is(v); }
 Type::Enum IfcColourRgbList::type() const { return Type::IfcColourRgbList; }
 Type::Enum IfcColourRgbList::Class() { return Type::IfcColourRgbList; }
-IfcColourRgbList::IfcColourRgbList(IfcAbstractEntityPtr e) : IfcPresentationItem((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcColourRgbList)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcColourRgbList::IfcColourRgbList() : IfcPresentationItem((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); entity = e; EntityBuffer::Add(this); }
+IfcColourRgbList::IfcColourRgbList(IfcAbstractEntity* e) : IfcPresentationItem((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcColourRgbList)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcColourRgbList::IfcColourRgbList() : IfcPresentationItem((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcColourSpecification
-bool IfcColourSpecification::hasName() { return !entity->getArgument(0)->isNull(); }
-IfcLabel IfcColourSpecification::Name() { return *entity->getArgument(0); }
-void IfcColourSpecification::setName(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+bool IfcColourSpecification::hasName() const { return !entity->getArgument(0)->isNull(); }
+std::string IfcColourSpecification::Name() const { return *entity->getArgument(0); }
+void IfcColourSpecification::setName(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
 bool IfcColourSpecification::is(Type::Enum v) const { return v == Type::IfcColourSpecification || IfcPresentationItem::is(v); }
 Type::Enum IfcColourSpecification::type() const { return Type::IfcColourSpecification; }
 Type::Enum IfcColourSpecification::Class() { return Type::IfcColourSpecification; }
-IfcColourSpecification::IfcColourSpecification(IfcAbstractEntityPtr e) : IfcPresentationItem((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcColourSpecification)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcColourSpecification::IfcColourSpecification(boost::optional< IfcLabel > v1_Name) : IfcPresentationItem((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } entity = e; EntityBuffer::Add(this); }
+IfcColourSpecification::IfcColourSpecification(IfcAbstractEntity* e) : IfcPresentationItem((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcColourSpecification)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcColourSpecification::IfcColourSpecification(boost::optional< std::string > v1_Name) : IfcPresentationItem((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcColumn
-bool IfcColumn::hasPredefinedType() { return !entity->getArgument(8)->isNull(); }
-IfcColumnTypeEnum::IfcColumnTypeEnum IfcColumn::PredefinedType() { return IfcColumnTypeEnum::FromString(*entity->getArgument(8)); }
+bool IfcColumn::hasPredefinedType() const { return !entity->getArgument(8)->isNull(); }
+IfcColumnTypeEnum::IfcColumnTypeEnum IfcColumn::PredefinedType() const { return IfcColumnTypeEnum::FromString(*entity->getArgument(8)); }
 void IfcColumn::setPredefinedType(IfcColumnTypeEnum::IfcColumnTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcColumnTypeEnum::ToString(v)); }
 bool IfcColumn::is(Type::Enum v) const { return v == Type::IfcColumn || IfcBuildingElement::is(v); }
 Type::Enum IfcColumn::type() const { return Type::IfcColumn; }
 Type::Enum IfcColumn::Class() { return Type::IfcColumn; }
-IfcColumn::IfcColumn(IfcAbstractEntityPtr e) : IfcBuildingElement((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcColumn)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcColumn::IfcColumn(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcColumnTypeEnum::IfcColumnTypeEnum > v9_PredefinedType) : IfcBuildingElement((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcColumnTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcColumn::IfcColumn(IfcAbstractEntity* e) : IfcBuildingElement((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcColumn)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcColumn::IfcColumn(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcColumnTypeEnum::IfcColumnTypeEnum > v9_PredefinedType) : IfcBuildingElement((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcColumnTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcColumnStandardCase
 bool IfcColumnStandardCase::is(Type::Enum v) const { return v == Type::IfcColumnStandardCase || IfcColumn::is(v); }
 Type::Enum IfcColumnStandardCase::type() const { return Type::IfcColumnStandardCase; }
 Type::Enum IfcColumnStandardCase::Class() { return Type::IfcColumnStandardCase; }
-IfcColumnStandardCase::IfcColumnStandardCase(IfcAbstractEntityPtr e) : IfcColumn((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcColumnStandardCase)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcColumnStandardCase::IfcColumnStandardCase(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcColumnTypeEnum::IfcColumnTypeEnum > v9_PredefinedType) : IfcColumn((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcColumnTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcColumnStandardCase::IfcColumnStandardCase(IfcAbstractEntity* e) : IfcColumn((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcColumnStandardCase)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcColumnStandardCase::IfcColumnStandardCase(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcColumnTypeEnum::IfcColumnTypeEnum > v9_PredefinedType) : IfcColumn((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcColumnTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcColumnType
-IfcColumnTypeEnum::IfcColumnTypeEnum IfcColumnType::PredefinedType() { return IfcColumnTypeEnum::FromString(*entity->getArgument(9)); }
+IfcColumnTypeEnum::IfcColumnTypeEnum IfcColumnType::PredefinedType() const { return IfcColumnTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcColumnType::setPredefinedType(IfcColumnTypeEnum::IfcColumnTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcColumnTypeEnum::ToString(v)); }
 bool IfcColumnType::is(Type::Enum v) const { return v == Type::IfcColumnType || IfcBuildingElementType::is(v); }
 Type::Enum IfcColumnType::type() const { return Type::IfcColumnType; }
 Type::Enum IfcColumnType::Class() { return Type::IfcColumnType; }
-IfcColumnType::IfcColumnType(IfcAbstractEntityPtr e) : IfcBuildingElementType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcColumnType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcColumnType::IfcColumnType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcColumnTypeEnum::IfcColumnTypeEnum v10_PredefinedType) : IfcBuildingElementType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcColumnTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcColumnType::IfcColumnType(IfcAbstractEntity* e) : IfcBuildingElementType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcColumnType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcColumnType::IfcColumnType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcColumnTypeEnum::IfcColumnTypeEnum v10_PredefinedType) : IfcBuildingElementType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcColumnTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcCommunicationsAppliance
-bool IfcCommunicationsAppliance::hasPredefinedType() { return !entity->getArgument(8)->isNull(); }
-IfcCommunicationsApplianceTypeEnum::IfcCommunicationsApplianceTypeEnum IfcCommunicationsAppliance::PredefinedType() { return IfcCommunicationsApplianceTypeEnum::FromString(*entity->getArgument(8)); }
+bool IfcCommunicationsAppliance::hasPredefinedType() const { return !entity->getArgument(8)->isNull(); }
+IfcCommunicationsApplianceTypeEnum::IfcCommunicationsApplianceTypeEnum IfcCommunicationsAppliance::PredefinedType() const { return IfcCommunicationsApplianceTypeEnum::FromString(*entity->getArgument(8)); }
 void IfcCommunicationsAppliance::setPredefinedType(IfcCommunicationsApplianceTypeEnum::IfcCommunicationsApplianceTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcCommunicationsApplianceTypeEnum::ToString(v)); }
 bool IfcCommunicationsAppliance::is(Type::Enum v) const { return v == Type::IfcCommunicationsAppliance || IfcFlowTerminal::is(v); }
 Type::Enum IfcCommunicationsAppliance::type() const { return Type::IfcCommunicationsAppliance; }
 Type::Enum IfcCommunicationsAppliance::Class() { return Type::IfcCommunicationsAppliance; }
-IfcCommunicationsAppliance::IfcCommunicationsAppliance(IfcAbstractEntityPtr e) : IfcFlowTerminal((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcCommunicationsAppliance)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcCommunicationsAppliance::IfcCommunicationsAppliance(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcCommunicationsApplianceTypeEnum::IfcCommunicationsApplianceTypeEnum > v9_PredefinedType) : IfcFlowTerminal((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcCommunicationsApplianceTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcCommunicationsAppliance::IfcCommunicationsAppliance(IfcAbstractEntity* e) : IfcFlowTerminal((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcCommunicationsAppliance)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcCommunicationsAppliance::IfcCommunicationsAppliance(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcCommunicationsApplianceTypeEnum::IfcCommunicationsApplianceTypeEnum > v9_PredefinedType) : IfcFlowTerminal((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcCommunicationsApplianceTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcCommunicationsApplianceType
-IfcCommunicationsApplianceTypeEnum::IfcCommunicationsApplianceTypeEnum IfcCommunicationsApplianceType::PredefinedType() { return IfcCommunicationsApplianceTypeEnum::FromString(*entity->getArgument(9)); }
+IfcCommunicationsApplianceTypeEnum::IfcCommunicationsApplianceTypeEnum IfcCommunicationsApplianceType::PredefinedType() const { return IfcCommunicationsApplianceTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcCommunicationsApplianceType::setPredefinedType(IfcCommunicationsApplianceTypeEnum::IfcCommunicationsApplianceTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcCommunicationsApplianceTypeEnum::ToString(v)); }
 bool IfcCommunicationsApplianceType::is(Type::Enum v) const { return v == Type::IfcCommunicationsApplianceType || IfcFlowTerminalType::is(v); }
 Type::Enum IfcCommunicationsApplianceType::type() const { return Type::IfcCommunicationsApplianceType; }
 Type::Enum IfcCommunicationsApplianceType::Class() { return Type::IfcCommunicationsApplianceType; }
-IfcCommunicationsApplianceType::IfcCommunicationsApplianceType(IfcAbstractEntityPtr e) : IfcFlowTerminalType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcCommunicationsApplianceType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcCommunicationsApplianceType::IfcCommunicationsApplianceType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcCommunicationsApplianceTypeEnum::IfcCommunicationsApplianceTypeEnum v10_PredefinedType) : IfcFlowTerminalType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcCommunicationsApplianceTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcCommunicationsApplianceType::IfcCommunicationsApplianceType(IfcAbstractEntity* e) : IfcFlowTerminalType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcCommunicationsApplianceType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcCommunicationsApplianceType::IfcCommunicationsApplianceType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcCommunicationsApplianceTypeEnum::IfcCommunicationsApplianceTypeEnum v10_PredefinedType) : IfcFlowTerminalType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcCommunicationsApplianceTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcComplexProperty
-IfcIdentifier IfcComplexProperty::UsageName() { return *entity->getArgument(2); }
-void IfcComplexProperty::setUsageName(IfcIdentifier v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-SHARED_PTR< IfcTemplatedEntityList< IfcProperty > > IfcComplexProperty::HasProperties() { RETURN_AS_LIST(IfcProperty,3) }
-void IfcComplexProperty::setHasProperties(SHARED_PTR< IfcTemplatedEntityList< IfcProperty > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v->generalize()); }
+std::string IfcComplexProperty::UsageName() const { return *entity->getArgument(2); }
+void IfcComplexProperty::setUsageName(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+IfcTemplatedEntityList< IfcProperty >::ptr IfcComplexProperty::HasProperties() const { IfcEntityList::ptr es = *entity->getArgument(3); return es->as<IfcProperty>(); }
+void IfcComplexProperty::setHasProperties(IfcTemplatedEntityList< IfcProperty >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v->generalize()); }
 bool IfcComplexProperty::is(Type::Enum v) const { return v == Type::IfcComplexProperty || IfcProperty::is(v); }
 Type::Enum IfcComplexProperty::type() const { return Type::IfcComplexProperty; }
 Type::Enum IfcComplexProperty::Class() { return Type::IfcComplexProperty; }
-IfcComplexProperty::IfcComplexProperty(IfcAbstractEntityPtr e) : IfcProperty((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcComplexProperty)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcComplexProperty::IfcComplexProperty(IfcIdentifier v1_Name, boost::optional< IfcText > v2_Description, IfcIdentifier v3_UsageName, SHARED_PTR< IfcTemplatedEntityList< IfcProperty > > v4_HasProperties) : IfcProperty((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_UsageName)); e->setArgument(3,(v4_HasProperties)->generalize()); entity = e; EntityBuffer::Add(this); }
+IfcComplexProperty::IfcComplexProperty(IfcAbstractEntity* e) : IfcProperty((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcComplexProperty)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcComplexProperty::IfcComplexProperty(std::string v1_Name, boost::optional< std::string > v2_Description, std::string v3_UsageName, IfcTemplatedEntityList< IfcProperty >::ptr v4_HasProperties) : IfcProperty((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_UsageName)); e->setArgument(3,(v4_HasProperties)->generalize()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcComplexPropertyTemplate
-bool IfcComplexPropertyTemplate::hasUsageName() { return !entity->getArgument(4)->isNull(); }
-IfcLabel IfcComplexPropertyTemplate::UsageName() { return *entity->getArgument(4); }
-void IfcComplexPropertyTemplate::setUsageName(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-bool IfcComplexPropertyTemplate::hasTemplateType() { return !entity->getArgument(5)->isNull(); }
-IfcComplexPropertyTemplateTypeEnum::IfcComplexPropertyTemplateTypeEnum IfcComplexPropertyTemplate::TemplateType() { return IfcComplexPropertyTemplateTypeEnum::FromString(*entity->getArgument(5)); }
+bool IfcComplexPropertyTemplate::hasUsageName() const { return !entity->getArgument(4)->isNull(); }
+std::string IfcComplexPropertyTemplate::UsageName() const { return *entity->getArgument(4); }
+void IfcComplexPropertyTemplate::setUsageName(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+bool IfcComplexPropertyTemplate::hasTemplateType() const { return !entity->getArgument(5)->isNull(); }
+IfcComplexPropertyTemplateTypeEnum::IfcComplexPropertyTemplateTypeEnum IfcComplexPropertyTemplate::TemplateType() const { return IfcComplexPropertyTemplateTypeEnum::FromString(*entity->getArgument(5)); }
 void IfcComplexPropertyTemplate::setTemplateType(IfcComplexPropertyTemplateTypeEnum::IfcComplexPropertyTemplateTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v,IfcComplexPropertyTemplateTypeEnum::ToString(v)); }
-bool IfcComplexPropertyTemplate::hasHasPropertyTemplates() { return !entity->getArgument(6)->isNull(); }
-SHARED_PTR< IfcTemplatedEntityList< IfcPropertyTemplate > > IfcComplexPropertyTemplate::HasPropertyTemplates() { RETURN_AS_LIST(IfcPropertyTemplate,6) }
-void IfcComplexPropertyTemplate::setHasPropertyTemplates(SHARED_PTR< IfcTemplatedEntityList< IfcPropertyTemplate > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v->generalize()); }
+bool IfcComplexPropertyTemplate::hasHasPropertyTemplates() const { return !entity->getArgument(6)->isNull(); }
+IfcTemplatedEntityList< IfcPropertyTemplate >::ptr IfcComplexPropertyTemplate::HasPropertyTemplates() const { IfcEntityList::ptr es = *entity->getArgument(6); return es->as<IfcPropertyTemplate>(); }
+void IfcComplexPropertyTemplate::setHasPropertyTemplates(IfcTemplatedEntityList< IfcPropertyTemplate >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v->generalize()); }
 bool IfcComplexPropertyTemplate::is(Type::Enum v) const { return v == Type::IfcComplexPropertyTemplate || IfcPropertyTemplate::is(v); }
 Type::Enum IfcComplexPropertyTemplate::type() const { return Type::IfcComplexPropertyTemplate; }
 Type::Enum IfcComplexPropertyTemplate::Class() { return Type::IfcComplexPropertyTemplate; }
-IfcComplexPropertyTemplate::IfcComplexPropertyTemplate(IfcAbstractEntityPtr e) : IfcPropertyTemplate((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcComplexPropertyTemplate)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcComplexPropertyTemplate::IfcComplexPropertyTemplate(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_UsageName, boost::optional< IfcComplexPropertyTemplateTypeEnum::IfcComplexPropertyTemplateTypeEnum > v6_TemplateType, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertyTemplate > > > v7_HasPropertyTemplates) : IfcPropertyTemplate((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_UsageName) { e->setArgument(4,(*v5_UsageName)); } else { e->setArgument(4); } if (v6_TemplateType) { e->setArgument(5,*v6_TemplateType,IfcComplexPropertyTemplateTypeEnum::ToString(*v6_TemplateType)); } else { e->setArgument(5); } if (v7_HasPropertyTemplates) { e->setArgument(6,(*v7_HasPropertyTemplates)->generalize()); } else { e->setArgument(6); } entity = e; EntityBuffer::Add(this); }
+IfcComplexPropertyTemplate::IfcComplexPropertyTemplate(IfcAbstractEntity* e) : IfcPropertyTemplate((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcComplexPropertyTemplate)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcComplexPropertyTemplate::IfcComplexPropertyTemplate(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_UsageName, boost::optional< IfcComplexPropertyTemplateTypeEnum::IfcComplexPropertyTemplateTypeEnum > v6_TemplateType, boost::optional< IfcTemplatedEntityList< IfcPropertyTemplate >::ptr > v7_HasPropertyTemplates) : IfcPropertyTemplate((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_UsageName) { e->setArgument(4,(*v5_UsageName)); } else { e->setArgument(4); } if (v6_TemplateType) { e->setArgument(5,*v6_TemplateType,IfcComplexPropertyTemplateTypeEnum::ToString(*v6_TemplateType)); } else { e->setArgument(5); } if (v7_HasPropertyTemplates) { e->setArgument(6,(*v7_HasPropertyTemplates)->generalize()); } else { e->setArgument(6); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcCompositeCurve
-SHARED_PTR< IfcTemplatedEntityList< IfcCompositeCurveSegment > > IfcCompositeCurve::Segments() { RETURN_AS_LIST(IfcCompositeCurveSegment,0) }
-void IfcCompositeCurve::setSegments(SHARED_PTR< IfcTemplatedEntityList< IfcCompositeCurveSegment > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v->generalize()); }
-bool IfcCompositeCurve::SelfIntersect() { return *entity->getArgument(1); }
+IfcTemplatedEntityList< IfcCompositeCurveSegment >::ptr IfcCompositeCurve::Segments() const { IfcEntityList::ptr es = *entity->getArgument(0); return es->as<IfcCompositeCurveSegment>(); }
+void IfcCompositeCurve::setSegments(IfcTemplatedEntityList< IfcCompositeCurveSegment >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v->generalize()); }
+bool IfcCompositeCurve::SelfIntersect() const { return *entity->getArgument(1); }
 void IfcCompositeCurve::setSelfIntersect(bool v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
 bool IfcCompositeCurve::is(Type::Enum v) const { return v == Type::IfcCompositeCurve || IfcBoundedCurve::is(v); }
 Type::Enum IfcCompositeCurve::type() const { return Type::IfcCompositeCurve; }
 Type::Enum IfcCompositeCurve::Class() { return Type::IfcCompositeCurve; }
-IfcCompositeCurve::IfcCompositeCurve(IfcAbstractEntityPtr e) : IfcBoundedCurve((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcCompositeCurve)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcCompositeCurve::IfcCompositeCurve(SHARED_PTR< IfcTemplatedEntityList< IfcCompositeCurveSegment > > v1_Segments, bool v2_SelfIntersect) : IfcBoundedCurve((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Segments)->generalize()); e->setArgument(1,(v2_SelfIntersect)); entity = e; EntityBuffer::Add(this); }
+IfcCompositeCurve::IfcCompositeCurve(IfcAbstractEntity* e) : IfcBoundedCurve((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcCompositeCurve)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcCompositeCurve::IfcCompositeCurve(IfcTemplatedEntityList< IfcCompositeCurveSegment >::ptr v1_Segments, bool v2_SelfIntersect) : IfcBoundedCurve((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Segments)->generalize()); e->setArgument(1,(v2_SelfIntersect)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcCompositeCurveOnSurface
 bool IfcCompositeCurveOnSurface::is(Type::Enum v) const { return v == Type::IfcCompositeCurveOnSurface || IfcCompositeCurve::is(v); }
 Type::Enum IfcCompositeCurveOnSurface::type() const { return Type::IfcCompositeCurveOnSurface; }
 Type::Enum IfcCompositeCurveOnSurface::Class() { return Type::IfcCompositeCurveOnSurface; }
-IfcCompositeCurveOnSurface::IfcCompositeCurveOnSurface(IfcAbstractEntityPtr e) : IfcCompositeCurve((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcCompositeCurveOnSurface)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcCompositeCurveOnSurface::IfcCompositeCurveOnSurface(SHARED_PTR< IfcTemplatedEntityList< IfcCompositeCurveSegment > > v1_Segments, bool v2_SelfIntersect) : IfcCompositeCurve((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Segments)->generalize()); e->setArgument(1,(v2_SelfIntersect)); entity = e; EntityBuffer::Add(this); }
+IfcCompositeCurveOnSurface::IfcCompositeCurveOnSurface(IfcAbstractEntity* e) : IfcCompositeCurve((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcCompositeCurveOnSurface)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcCompositeCurveOnSurface::IfcCompositeCurveOnSurface(IfcTemplatedEntityList< IfcCompositeCurveSegment >::ptr v1_Segments, bool v2_SelfIntersect) : IfcCompositeCurve((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Segments)->generalize()); e->setArgument(1,(v2_SelfIntersect)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcCompositeCurveSegment
-IfcTransitionCode::IfcTransitionCode IfcCompositeCurveSegment::Transition() { return IfcTransitionCode::FromString(*entity->getArgument(0)); }
+IfcTransitionCode::IfcTransitionCode IfcCompositeCurveSegment::Transition() const { return IfcTransitionCode::FromString(*entity->getArgument(0)); }
 void IfcCompositeCurveSegment::setTransition(IfcTransitionCode::IfcTransitionCode v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v,IfcTransitionCode::ToString(v)); }
-bool IfcCompositeCurveSegment::SameSense() { return *entity->getArgument(1); }
+bool IfcCompositeCurveSegment::SameSense() const { return *entity->getArgument(1); }
 void IfcCompositeCurveSegment::setSameSense(bool v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-IfcCurve* IfcCompositeCurveSegment::ParentCurve() { return (IfcCurve*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(2))); }
+IfcCurve* IfcCompositeCurveSegment::ParentCurve() const { return (IfcCurve*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(2))); }
 void IfcCompositeCurveSegment::setParentCurve(IfcCurve* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-IfcCompositeCurve::list IfcCompositeCurveSegment::UsingCurves() { RETURN_INVERSE(IfcCompositeCurve) }
+IfcCompositeCurve::list::ptr IfcCompositeCurveSegment::UsingCurves() const { return entity->getInverse(Type::IfcCompositeCurve, 0)->as<IfcCompositeCurve>(); }
 bool IfcCompositeCurveSegment::is(Type::Enum v) const { return v == Type::IfcCompositeCurveSegment || IfcGeometricRepresentationItem::is(v); }
 Type::Enum IfcCompositeCurveSegment::type() const { return Type::IfcCompositeCurveSegment; }
 Type::Enum IfcCompositeCurveSegment::Class() { return Type::IfcCompositeCurveSegment; }
-IfcCompositeCurveSegment::IfcCompositeCurveSegment(IfcAbstractEntityPtr e) : IfcGeometricRepresentationItem((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcCompositeCurveSegment)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcCompositeCurveSegment::IfcCompositeCurveSegment(IfcTransitionCode::IfcTransitionCode v1_Transition, bool v2_SameSense, IfcCurve* v3_ParentCurve) : IfcGeometricRepresentationItem((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,v1_Transition,IfcTransitionCode::ToString(v1_Transition)); e->setArgument(1,(v2_SameSense)); e->setArgument(2,(v3_ParentCurve)); entity = e; EntityBuffer::Add(this); }
+IfcCompositeCurveSegment::IfcCompositeCurveSegment(IfcAbstractEntity* e) : IfcGeometricRepresentationItem((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcCompositeCurveSegment)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcCompositeCurveSegment::IfcCompositeCurveSegment(IfcTransitionCode::IfcTransitionCode v1_Transition, bool v2_SameSense, IfcCurve* v3_ParentCurve) : IfcGeometricRepresentationItem((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,v1_Transition,IfcTransitionCode::ToString(v1_Transition)); e->setArgument(1,(v2_SameSense)); e->setArgument(2,(v3_ParentCurve)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcCompositeProfileDef
-SHARED_PTR< IfcTemplatedEntityList< IfcProfileDef > > IfcCompositeProfileDef::Profiles() { RETURN_AS_LIST(IfcProfileDef,2) }
-void IfcCompositeProfileDef::setProfiles(SHARED_PTR< IfcTemplatedEntityList< IfcProfileDef > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v->generalize()); }
-bool IfcCompositeProfileDef::hasLabel() { return !entity->getArgument(3)->isNull(); }
-IfcLabel IfcCompositeProfileDef::Label() { return *entity->getArgument(3); }
-void IfcCompositeProfileDef::setLabel(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+IfcTemplatedEntityList< IfcProfileDef >::ptr IfcCompositeProfileDef::Profiles() const { IfcEntityList::ptr es = *entity->getArgument(2); return es->as<IfcProfileDef>(); }
+void IfcCompositeProfileDef::setProfiles(IfcTemplatedEntityList< IfcProfileDef >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v->generalize()); }
+bool IfcCompositeProfileDef::hasLabel() const { return !entity->getArgument(3)->isNull(); }
+std::string IfcCompositeProfileDef::Label() const { return *entity->getArgument(3); }
+void IfcCompositeProfileDef::setLabel(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
 bool IfcCompositeProfileDef::is(Type::Enum v) const { return v == Type::IfcCompositeProfileDef || IfcProfileDef::is(v); }
 Type::Enum IfcCompositeProfileDef::type() const { return Type::IfcCompositeProfileDef; }
 Type::Enum IfcCompositeProfileDef::Class() { return Type::IfcCompositeProfileDef; }
-IfcCompositeProfileDef::IfcCompositeProfileDef(IfcAbstractEntityPtr e) : IfcProfileDef((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcCompositeProfileDef)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcCompositeProfileDef::IfcCompositeProfileDef(IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< IfcLabel > v2_ProfileName, SHARED_PTR< IfcTemplatedEntityList< IfcProfileDef > > v3_Profiles, boost::optional< IfcLabel > v4_Label) : IfcProfileDef((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,v1_ProfileType,IfcProfileTypeEnum::ToString(v1_ProfileType)); if (v2_ProfileName) { e->setArgument(1,(*v2_ProfileName)); } else { e->setArgument(1); } e->setArgument(2,(v3_Profiles)->generalize()); if (v4_Label) { e->setArgument(3,(*v4_Label)); } else { e->setArgument(3); } entity = e; EntityBuffer::Add(this); }
+IfcCompositeProfileDef::IfcCompositeProfileDef(IfcAbstractEntity* e) : IfcProfileDef((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcCompositeProfileDef)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcCompositeProfileDef::IfcCompositeProfileDef(IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< std::string > v2_ProfileName, IfcTemplatedEntityList< IfcProfileDef >::ptr v3_Profiles, boost::optional< std::string > v4_Label) : IfcProfileDef((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,v1_ProfileType,IfcProfileTypeEnum::ToString(v1_ProfileType)); if (v2_ProfileName) { e->setArgument(1,(*v2_ProfileName)); } else { e->setArgument(1); } e->setArgument(2,(v3_Profiles)->generalize()); if (v4_Label) { e->setArgument(3,(*v4_Label)); } else { e->setArgument(3); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcCompressor
-bool IfcCompressor::hasPredefinedType() { return !entity->getArgument(8)->isNull(); }
-IfcCompressorTypeEnum::IfcCompressorTypeEnum IfcCompressor::PredefinedType() { return IfcCompressorTypeEnum::FromString(*entity->getArgument(8)); }
+bool IfcCompressor::hasPredefinedType() const { return !entity->getArgument(8)->isNull(); }
+IfcCompressorTypeEnum::IfcCompressorTypeEnum IfcCompressor::PredefinedType() const { return IfcCompressorTypeEnum::FromString(*entity->getArgument(8)); }
 void IfcCompressor::setPredefinedType(IfcCompressorTypeEnum::IfcCompressorTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcCompressorTypeEnum::ToString(v)); }
 bool IfcCompressor::is(Type::Enum v) const { return v == Type::IfcCompressor || IfcFlowMovingDevice::is(v); }
 Type::Enum IfcCompressor::type() const { return Type::IfcCompressor; }
 Type::Enum IfcCompressor::Class() { return Type::IfcCompressor; }
-IfcCompressor::IfcCompressor(IfcAbstractEntityPtr e) : IfcFlowMovingDevice((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcCompressor)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcCompressor::IfcCompressor(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcCompressorTypeEnum::IfcCompressorTypeEnum > v9_PredefinedType) : IfcFlowMovingDevice((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcCompressorTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcCompressor::IfcCompressor(IfcAbstractEntity* e) : IfcFlowMovingDevice((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcCompressor)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcCompressor::IfcCompressor(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcCompressorTypeEnum::IfcCompressorTypeEnum > v9_PredefinedType) : IfcFlowMovingDevice((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcCompressorTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcCompressorType
-IfcCompressorTypeEnum::IfcCompressorTypeEnum IfcCompressorType::PredefinedType() { return IfcCompressorTypeEnum::FromString(*entity->getArgument(9)); }
+IfcCompressorTypeEnum::IfcCompressorTypeEnum IfcCompressorType::PredefinedType() const { return IfcCompressorTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcCompressorType::setPredefinedType(IfcCompressorTypeEnum::IfcCompressorTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcCompressorTypeEnum::ToString(v)); }
 bool IfcCompressorType::is(Type::Enum v) const { return v == Type::IfcCompressorType || IfcFlowMovingDeviceType::is(v); }
 Type::Enum IfcCompressorType::type() const { return Type::IfcCompressorType; }
 Type::Enum IfcCompressorType::Class() { return Type::IfcCompressorType; }
-IfcCompressorType::IfcCompressorType(IfcAbstractEntityPtr e) : IfcFlowMovingDeviceType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcCompressorType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcCompressorType::IfcCompressorType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcCompressorTypeEnum::IfcCompressorTypeEnum v10_PredefinedType) : IfcFlowMovingDeviceType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcCompressorTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcCompressorType::IfcCompressorType(IfcAbstractEntity* e) : IfcFlowMovingDeviceType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcCompressorType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcCompressorType::IfcCompressorType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcCompressorTypeEnum::IfcCompressorTypeEnum v10_PredefinedType) : IfcFlowMovingDeviceType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcCompressorTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcCondenser
-bool IfcCondenser::hasPredefinedType() { return !entity->getArgument(8)->isNull(); }
-IfcCondenserTypeEnum::IfcCondenserTypeEnum IfcCondenser::PredefinedType() { return IfcCondenserTypeEnum::FromString(*entity->getArgument(8)); }
+bool IfcCondenser::hasPredefinedType() const { return !entity->getArgument(8)->isNull(); }
+IfcCondenserTypeEnum::IfcCondenserTypeEnum IfcCondenser::PredefinedType() const { return IfcCondenserTypeEnum::FromString(*entity->getArgument(8)); }
 void IfcCondenser::setPredefinedType(IfcCondenserTypeEnum::IfcCondenserTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcCondenserTypeEnum::ToString(v)); }
 bool IfcCondenser::is(Type::Enum v) const { return v == Type::IfcCondenser || IfcEnergyConversionDevice::is(v); }
 Type::Enum IfcCondenser::type() const { return Type::IfcCondenser; }
 Type::Enum IfcCondenser::Class() { return Type::IfcCondenser; }
-IfcCondenser::IfcCondenser(IfcAbstractEntityPtr e) : IfcEnergyConversionDevice((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcCondenser)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcCondenser::IfcCondenser(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcCondenserTypeEnum::IfcCondenserTypeEnum > v9_PredefinedType) : IfcEnergyConversionDevice((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcCondenserTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcCondenser::IfcCondenser(IfcAbstractEntity* e) : IfcEnergyConversionDevice((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcCondenser)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcCondenser::IfcCondenser(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcCondenserTypeEnum::IfcCondenserTypeEnum > v9_PredefinedType) : IfcEnergyConversionDevice((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcCondenserTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcCondenserType
-IfcCondenserTypeEnum::IfcCondenserTypeEnum IfcCondenserType::PredefinedType() { return IfcCondenserTypeEnum::FromString(*entity->getArgument(9)); }
+IfcCondenserTypeEnum::IfcCondenserTypeEnum IfcCondenserType::PredefinedType() const { return IfcCondenserTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcCondenserType::setPredefinedType(IfcCondenserTypeEnum::IfcCondenserTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcCondenserTypeEnum::ToString(v)); }
 bool IfcCondenserType::is(Type::Enum v) const { return v == Type::IfcCondenserType || IfcEnergyConversionDeviceType::is(v); }
 Type::Enum IfcCondenserType::type() const { return Type::IfcCondenserType; }
 Type::Enum IfcCondenserType::Class() { return Type::IfcCondenserType; }
-IfcCondenserType::IfcCondenserType(IfcAbstractEntityPtr e) : IfcEnergyConversionDeviceType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcCondenserType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcCondenserType::IfcCondenserType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcCondenserTypeEnum::IfcCondenserTypeEnum v10_PredefinedType) : IfcEnergyConversionDeviceType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcCondenserTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcCondenserType::IfcCondenserType(IfcAbstractEntity* e) : IfcEnergyConversionDeviceType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcCondenserType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcCondenserType::IfcCondenserType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcCondenserTypeEnum::IfcCondenserTypeEnum v10_PredefinedType) : IfcEnergyConversionDeviceType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcCondenserTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcConic
-IfcAxis2Placement IfcConic::Position() { return *entity->getArgument(0); }
-void IfcConic::setPosition(IfcAxis2Placement v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+IfcAxis2Placement* IfcConic::Position() const { return (IfcAxis2Placement*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(0))); }
+void IfcConic::setPosition(IfcAxis2Placement* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
 bool IfcConic::is(Type::Enum v) const { return v == Type::IfcConic || IfcCurve::is(v); }
 Type::Enum IfcConic::type() const { return Type::IfcConic; }
 Type::Enum IfcConic::Class() { return Type::IfcConic; }
-IfcConic::IfcConic(IfcAbstractEntityPtr e) : IfcCurve((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcConic)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcConic::IfcConic(IfcAxis2Placement v1_Position) : IfcCurve((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Position)); entity = e; EntityBuffer::Add(this); }
+IfcConic::IfcConic(IfcAbstractEntity* e) : IfcCurve((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcConic)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcConic::IfcConic(IfcAxis2Placement* v1_Position) : IfcCurve((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Position)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcConnectedFaceSet
-SHARED_PTR< IfcTemplatedEntityList< IfcFace > > IfcConnectedFaceSet::CfsFaces() { RETURN_AS_LIST(IfcFace,0) }
-void IfcConnectedFaceSet::setCfsFaces(SHARED_PTR< IfcTemplatedEntityList< IfcFace > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v->generalize()); }
+IfcTemplatedEntityList< IfcFace >::ptr IfcConnectedFaceSet::CfsFaces() const { IfcEntityList::ptr es = *entity->getArgument(0); return es->as<IfcFace>(); }
+void IfcConnectedFaceSet::setCfsFaces(IfcTemplatedEntityList< IfcFace >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v->generalize()); }
 bool IfcConnectedFaceSet::is(Type::Enum v) const { return v == Type::IfcConnectedFaceSet || IfcTopologicalRepresentationItem::is(v); }
 Type::Enum IfcConnectedFaceSet::type() const { return Type::IfcConnectedFaceSet; }
 Type::Enum IfcConnectedFaceSet::Class() { return Type::IfcConnectedFaceSet; }
-IfcConnectedFaceSet::IfcConnectedFaceSet(IfcAbstractEntityPtr e) : IfcTopologicalRepresentationItem((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcConnectedFaceSet)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcConnectedFaceSet::IfcConnectedFaceSet(SHARED_PTR< IfcTemplatedEntityList< IfcFace > > v1_CfsFaces) : IfcTopologicalRepresentationItem((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_CfsFaces)->generalize()); entity = e; EntityBuffer::Add(this); }
+IfcConnectedFaceSet::IfcConnectedFaceSet(IfcAbstractEntity* e) : IfcTopologicalRepresentationItem((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcConnectedFaceSet)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcConnectedFaceSet::IfcConnectedFaceSet(IfcTemplatedEntityList< IfcFace >::ptr v1_CfsFaces) : IfcTopologicalRepresentationItem((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_CfsFaces)->generalize()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcConnectionCurveGeometry
-IfcCurveOrEdgeCurve IfcConnectionCurveGeometry::CurveOnRelatingElement() { return *entity->getArgument(0); }
-void IfcConnectionCurveGeometry::setCurveOnRelatingElement(IfcCurveOrEdgeCurve v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-bool IfcConnectionCurveGeometry::hasCurveOnRelatedElement() { return !entity->getArgument(1)->isNull(); }
-IfcCurveOrEdgeCurve IfcConnectionCurveGeometry::CurveOnRelatedElement() { return *entity->getArgument(1); }
-void IfcConnectionCurveGeometry::setCurveOnRelatedElement(IfcCurveOrEdgeCurve v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+IfcCurveOrEdgeCurve* IfcConnectionCurveGeometry::CurveOnRelatingElement() const { return (IfcCurveOrEdgeCurve*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(0))); }
+void IfcConnectionCurveGeometry::setCurveOnRelatingElement(IfcCurveOrEdgeCurve* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+bool IfcConnectionCurveGeometry::hasCurveOnRelatedElement() const { return !entity->getArgument(1)->isNull(); }
+IfcCurveOrEdgeCurve* IfcConnectionCurveGeometry::CurveOnRelatedElement() const { return (IfcCurveOrEdgeCurve*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(1))); }
+void IfcConnectionCurveGeometry::setCurveOnRelatedElement(IfcCurveOrEdgeCurve* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
 bool IfcConnectionCurveGeometry::is(Type::Enum v) const { return v == Type::IfcConnectionCurveGeometry || IfcConnectionGeometry::is(v); }
 Type::Enum IfcConnectionCurveGeometry::type() const { return Type::IfcConnectionCurveGeometry; }
 Type::Enum IfcConnectionCurveGeometry::Class() { return Type::IfcConnectionCurveGeometry; }
-IfcConnectionCurveGeometry::IfcConnectionCurveGeometry(IfcAbstractEntityPtr e) : IfcConnectionGeometry((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcConnectionCurveGeometry)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcConnectionCurveGeometry::IfcConnectionCurveGeometry(IfcCurveOrEdgeCurve v1_CurveOnRelatingElement, boost::optional< IfcCurveOrEdgeCurve > v2_CurveOnRelatedElement) : IfcConnectionGeometry((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_CurveOnRelatingElement)); if (v2_CurveOnRelatedElement) { e->setArgument(1,(*v2_CurveOnRelatedElement)); } else { e->setArgument(1); } entity = e; EntityBuffer::Add(this); }
+IfcConnectionCurveGeometry::IfcConnectionCurveGeometry(IfcAbstractEntity* e) : IfcConnectionGeometry((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcConnectionCurveGeometry)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcConnectionCurveGeometry::IfcConnectionCurveGeometry(IfcCurveOrEdgeCurve* v1_CurveOnRelatingElement, IfcCurveOrEdgeCurve* v2_CurveOnRelatedElement) : IfcConnectionGeometry((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_CurveOnRelatingElement)); e->setArgument(1,(v2_CurveOnRelatedElement)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcConnectionGeometry
 bool IfcConnectionGeometry::is(Type::Enum v) const { return v == Type::IfcConnectionGeometry; }
 Type::Enum IfcConnectionGeometry::type() const { return Type::IfcConnectionGeometry; }
 Type::Enum IfcConnectionGeometry::Class() { return Type::IfcConnectionGeometry; }
-IfcConnectionGeometry::IfcConnectionGeometry(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcConnectionGeometry)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcConnectionGeometry::IfcConnectionGeometry(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcConnectionGeometry)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
 IfcConnectionGeometry::IfcConnectionGeometry() : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcConnectionPointEccentricity
-bool IfcConnectionPointEccentricity::hasEccentricityInX() { return !entity->getArgument(2)->isNull(); }
-IfcLengthMeasure IfcConnectionPointEccentricity::EccentricityInX() { return *entity->getArgument(2); }
-void IfcConnectionPointEccentricity::setEccentricityInX(IfcLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-bool IfcConnectionPointEccentricity::hasEccentricityInY() { return !entity->getArgument(3)->isNull(); }
-IfcLengthMeasure IfcConnectionPointEccentricity::EccentricityInY() { return *entity->getArgument(3); }
-void IfcConnectionPointEccentricity::setEccentricityInY(IfcLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-bool IfcConnectionPointEccentricity::hasEccentricityInZ() { return !entity->getArgument(4)->isNull(); }
-IfcLengthMeasure IfcConnectionPointEccentricity::EccentricityInZ() { return *entity->getArgument(4); }
-void IfcConnectionPointEccentricity::setEccentricityInZ(IfcLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+bool IfcConnectionPointEccentricity::hasEccentricityInX() const { return !entity->getArgument(2)->isNull(); }
+double IfcConnectionPointEccentricity::EccentricityInX() const { return *entity->getArgument(2); }
+void IfcConnectionPointEccentricity::setEccentricityInX(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+bool IfcConnectionPointEccentricity::hasEccentricityInY() const { return !entity->getArgument(3)->isNull(); }
+double IfcConnectionPointEccentricity::EccentricityInY() const { return *entity->getArgument(3); }
+void IfcConnectionPointEccentricity::setEccentricityInY(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+bool IfcConnectionPointEccentricity::hasEccentricityInZ() const { return !entity->getArgument(4)->isNull(); }
+double IfcConnectionPointEccentricity::EccentricityInZ() const { return *entity->getArgument(4); }
+void IfcConnectionPointEccentricity::setEccentricityInZ(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
 bool IfcConnectionPointEccentricity::is(Type::Enum v) const { return v == Type::IfcConnectionPointEccentricity || IfcConnectionPointGeometry::is(v); }
 Type::Enum IfcConnectionPointEccentricity::type() const { return Type::IfcConnectionPointEccentricity; }
 Type::Enum IfcConnectionPointEccentricity::Class() { return Type::IfcConnectionPointEccentricity; }
-IfcConnectionPointEccentricity::IfcConnectionPointEccentricity(IfcAbstractEntityPtr e) : IfcConnectionPointGeometry((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcConnectionPointEccentricity)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcConnectionPointEccentricity::IfcConnectionPointEccentricity(IfcPointOrVertexPoint v1_PointOnRelatingElement, boost::optional< IfcPointOrVertexPoint > v2_PointOnRelatedElement, boost::optional< IfcLengthMeasure > v3_EccentricityInX, boost::optional< IfcLengthMeasure > v4_EccentricityInY, boost::optional< IfcLengthMeasure > v5_EccentricityInZ) : IfcConnectionPointGeometry((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_PointOnRelatingElement)); if (v2_PointOnRelatedElement) { e->setArgument(1,(*v2_PointOnRelatedElement)); } else { e->setArgument(1); } if (v3_EccentricityInX) { e->setArgument(2,(*v3_EccentricityInX)); } else { e->setArgument(2); } if (v4_EccentricityInY) { e->setArgument(3,(*v4_EccentricityInY)); } else { e->setArgument(3); } if (v5_EccentricityInZ) { e->setArgument(4,(*v5_EccentricityInZ)); } else { e->setArgument(4); } entity = e; EntityBuffer::Add(this); }
+IfcConnectionPointEccentricity::IfcConnectionPointEccentricity(IfcAbstractEntity* e) : IfcConnectionPointGeometry((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcConnectionPointEccentricity)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcConnectionPointEccentricity::IfcConnectionPointEccentricity(IfcPointOrVertexPoint* v1_PointOnRelatingElement, IfcPointOrVertexPoint* v2_PointOnRelatedElement, boost::optional< double > v3_EccentricityInX, boost::optional< double > v4_EccentricityInY, boost::optional< double > v5_EccentricityInZ) : IfcConnectionPointGeometry((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_PointOnRelatingElement)); e->setArgument(1,(v2_PointOnRelatedElement)); if (v3_EccentricityInX) { e->setArgument(2,(*v3_EccentricityInX)); } else { e->setArgument(2); } if (v4_EccentricityInY) { e->setArgument(3,(*v4_EccentricityInY)); } else { e->setArgument(3); } if (v5_EccentricityInZ) { e->setArgument(4,(*v5_EccentricityInZ)); } else { e->setArgument(4); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcConnectionPointGeometry
-IfcPointOrVertexPoint IfcConnectionPointGeometry::PointOnRelatingElement() { return *entity->getArgument(0); }
-void IfcConnectionPointGeometry::setPointOnRelatingElement(IfcPointOrVertexPoint v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-bool IfcConnectionPointGeometry::hasPointOnRelatedElement() { return !entity->getArgument(1)->isNull(); }
-IfcPointOrVertexPoint IfcConnectionPointGeometry::PointOnRelatedElement() { return *entity->getArgument(1); }
-void IfcConnectionPointGeometry::setPointOnRelatedElement(IfcPointOrVertexPoint v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+IfcPointOrVertexPoint* IfcConnectionPointGeometry::PointOnRelatingElement() const { return (IfcPointOrVertexPoint*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(0))); }
+void IfcConnectionPointGeometry::setPointOnRelatingElement(IfcPointOrVertexPoint* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+bool IfcConnectionPointGeometry::hasPointOnRelatedElement() const { return !entity->getArgument(1)->isNull(); }
+IfcPointOrVertexPoint* IfcConnectionPointGeometry::PointOnRelatedElement() const { return (IfcPointOrVertexPoint*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(1))); }
+void IfcConnectionPointGeometry::setPointOnRelatedElement(IfcPointOrVertexPoint* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
 bool IfcConnectionPointGeometry::is(Type::Enum v) const { return v == Type::IfcConnectionPointGeometry || IfcConnectionGeometry::is(v); }
 Type::Enum IfcConnectionPointGeometry::type() const { return Type::IfcConnectionPointGeometry; }
 Type::Enum IfcConnectionPointGeometry::Class() { return Type::IfcConnectionPointGeometry; }
-IfcConnectionPointGeometry::IfcConnectionPointGeometry(IfcAbstractEntityPtr e) : IfcConnectionGeometry((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcConnectionPointGeometry)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcConnectionPointGeometry::IfcConnectionPointGeometry(IfcPointOrVertexPoint v1_PointOnRelatingElement, boost::optional< IfcPointOrVertexPoint > v2_PointOnRelatedElement) : IfcConnectionGeometry((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_PointOnRelatingElement)); if (v2_PointOnRelatedElement) { e->setArgument(1,(*v2_PointOnRelatedElement)); } else { e->setArgument(1); } entity = e; EntityBuffer::Add(this); }
+IfcConnectionPointGeometry::IfcConnectionPointGeometry(IfcAbstractEntity* e) : IfcConnectionGeometry((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcConnectionPointGeometry)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcConnectionPointGeometry::IfcConnectionPointGeometry(IfcPointOrVertexPoint* v1_PointOnRelatingElement, IfcPointOrVertexPoint* v2_PointOnRelatedElement) : IfcConnectionGeometry((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_PointOnRelatingElement)); e->setArgument(1,(v2_PointOnRelatedElement)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcConnectionSurfaceGeometry
-IfcSurfaceOrFaceSurface IfcConnectionSurfaceGeometry::SurfaceOnRelatingElement() { return *entity->getArgument(0); }
-void IfcConnectionSurfaceGeometry::setSurfaceOnRelatingElement(IfcSurfaceOrFaceSurface v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-bool IfcConnectionSurfaceGeometry::hasSurfaceOnRelatedElement() { return !entity->getArgument(1)->isNull(); }
-IfcSurfaceOrFaceSurface IfcConnectionSurfaceGeometry::SurfaceOnRelatedElement() { return *entity->getArgument(1); }
-void IfcConnectionSurfaceGeometry::setSurfaceOnRelatedElement(IfcSurfaceOrFaceSurface v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+IfcSurfaceOrFaceSurface* IfcConnectionSurfaceGeometry::SurfaceOnRelatingElement() const { return (IfcSurfaceOrFaceSurface*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(0))); }
+void IfcConnectionSurfaceGeometry::setSurfaceOnRelatingElement(IfcSurfaceOrFaceSurface* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+bool IfcConnectionSurfaceGeometry::hasSurfaceOnRelatedElement() const { return !entity->getArgument(1)->isNull(); }
+IfcSurfaceOrFaceSurface* IfcConnectionSurfaceGeometry::SurfaceOnRelatedElement() const { return (IfcSurfaceOrFaceSurface*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(1))); }
+void IfcConnectionSurfaceGeometry::setSurfaceOnRelatedElement(IfcSurfaceOrFaceSurface* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
 bool IfcConnectionSurfaceGeometry::is(Type::Enum v) const { return v == Type::IfcConnectionSurfaceGeometry || IfcConnectionGeometry::is(v); }
 Type::Enum IfcConnectionSurfaceGeometry::type() const { return Type::IfcConnectionSurfaceGeometry; }
 Type::Enum IfcConnectionSurfaceGeometry::Class() { return Type::IfcConnectionSurfaceGeometry; }
-IfcConnectionSurfaceGeometry::IfcConnectionSurfaceGeometry(IfcAbstractEntityPtr e) : IfcConnectionGeometry((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcConnectionSurfaceGeometry)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcConnectionSurfaceGeometry::IfcConnectionSurfaceGeometry(IfcSurfaceOrFaceSurface v1_SurfaceOnRelatingElement, boost::optional< IfcSurfaceOrFaceSurface > v2_SurfaceOnRelatedElement) : IfcConnectionGeometry((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_SurfaceOnRelatingElement)); if (v2_SurfaceOnRelatedElement) { e->setArgument(1,(*v2_SurfaceOnRelatedElement)); } else { e->setArgument(1); } entity = e; EntityBuffer::Add(this); }
+IfcConnectionSurfaceGeometry::IfcConnectionSurfaceGeometry(IfcAbstractEntity* e) : IfcConnectionGeometry((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcConnectionSurfaceGeometry)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcConnectionSurfaceGeometry::IfcConnectionSurfaceGeometry(IfcSurfaceOrFaceSurface* v1_SurfaceOnRelatingElement, IfcSurfaceOrFaceSurface* v2_SurfaceOnRelatedElement) : IfcConnectionGeometry((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_SurfaceOnRelatingElement)); e->setArgument(1,(v2_SurfaceOnRelatedElement)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcConnectionVolumeGeometry
-IfcSolidOrShell IfcConnectionVolumeGeometry::VolumeOnRelatingElement() { return *entity->getArgument(0); }
-void IfcConnectionVolumeGeometry::setVolumeOnRelatingElement(IfcSolidOrShell v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-bool IfcConnectionVolumeGeometry::hasVolumeOnRelatedElement() { return !entity->getArgument(1)->isNull(); }
-IfcSolidOrShell IfcConnectionVolumeGeometry::VolumeOnRelatedElement() { return *entity->getArgument(1); }
-void IfcConnectionVolumeGeometry::setVolumeOnRelatedElement(IfcSolidOrShell v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+IfcSolidOrShell* IfcConnectionVolumeGeometry::VolumeOnRelatingElement() const { return (IfcSolidOrShell*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(0))); }
+void IfcConnectionVolumeGeometry::setVolumeOnRelatingElement(IfcSolidOrShell* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+bool IfcConnectionVolumeGeometry::hasVolumeOnRelatedElement() const { return !entity->getArgument(1)->isNull(); }
+IfcSolidOrShell* IfcConnectionVolumeGeometry::VolumeOnRelatedElement() const { return (IfcSolidOrShell*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(1))); }
+void IfcConnectionVolumeGeometry::setVolumeOnRelatedElement(IfcSolidOrShell* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
 bool IfcConnectionVolumeGeometry::is(Type::Enum v) const { return v == Type::IfcConnectionVolumeGeometry || IfcConnectionGeometry::is(v); }
 Type::Enum IfcConnectionVolumeGeometry::type() const { return Type::IfcConnectionVolumeGeometry; }
 Type::Enum IfcConnectionVolumeGeometry::Class() { return Type::IfcConnectionVolumeGeometry; }
-IfcConnectionVolumeGeometry::IfcConnectionVolumeGeometry(IfcAbstractEntityPtr e) : IfcConnectionGeometry((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcConnectionVolumeGeometry)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcConnectionVolumeGeometry::IfcConnectionVolumeGeometry(IfcSolidOrShell v1_VolumeOnRelatingElement, boost::optional< IfcSolidOrShell > v2_VolumeOnRelatedElement) : IfcConnectionGeometry((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_VolumeOnRelatingElement)); if (v2_VolumeOnRelatedElement) { e->setArgument(1,(*v2_VolumeOnRelatedElement)); } else { e->setArgument(1); } entity = e; EntityBuffer::Add(this); }
+IfcConnectionVolumeGeometry::IfcConnectionVolumeGeometry(IfcAbstractEntity* e) : IfcConnectionGeometry((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcConnectionVolumeGeometry)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcConnectionVolumeGeometry::IfcConnectionVolumeGeometry(IfcSolidOrShell* v1_VolumeOnRelatingElement, IfcSolidOrShell* v2_VolumeOnRelatedElement) : IfcConnectionGeometry((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_VolumeOnRelatingElement)); e->setArgument(1,(v2_VolumeOnRelatedElement)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcConstraint
-IfcLabel IfcConstraint::Name() { return *entity->getArgument(0); }
-void IfcConstraint::setName(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-bool IfcConstraint::hasDescription() { return !entity->getArgument(1)->isNull(); }
-IfcText IfcConstraint::Description() { return *entity->getArgument(1); }
-void IfcConstraint::setDescription(IfcText v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-IfcConstraintEnum::IfcConstraintEnum IfcConstraint::ConstraintGrade() { return IfcConstraintEnum::FromString(*entity->getArgument(2)); }
+std::string IfcConstraint::Name() const { return *entity->getArgument(0); }
+void IfcConstraint::setName(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+bool IfcConstraint::hasDescription() const { return !entity->getArgument(1)->isNull(); }
+std::string IfcConstraint::Description() const { return *entity->getArgument(1); }
+void IfcConstraint::setDescription(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+IfcConstraintEnum::IfcConstraintEnum IfcConstraint::ConstraintGrade() const { return IfcConstraintEnum::FromString(*entity->getArgument(2)); }
 void IfcConstraint::setConstraintGrade(IfcConstraintEnum::IfcConstraintEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v,IfcConstraintEnum::ToString(v)); }
-bool IfcConstraint::hasConstraintSource() { return !entity->getArgument(3)->isNull(); }
-IfcLabel IfcConstraint::ConstraintSource() { return *entity->getArgument(3); }
-void IfcConstraint::setConstraintSource(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-bool IfcConstraint::hasCreatingActor() { return !entity->getArgument(4)->isNull(); }
-IfcActorSelect IfcConstraint::CreatingActor() { return *entity->getArgument(4); }
-void IfcConstraint::setCreatingActor(IfcActorSelect v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-bool IfcConstraint::hasCreationTime() { return !entity->getArgument(5)->isNull(); }
-IfcDateTime IfcConstraint::CreationTime() { return *entity->getArgument(5); }
-void IfcConstraint::setCreationTime(IfcDateTime v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-bool IfcConstraint::hasUserDefinedGrade() { return !entity->getArgument(6)->isNull(); }
-IfcLabel IfcConstraint::UserDefinedGrade() { return *entity->getArgument(6); }
-void IfcConstraint::setUserDefinedGrade(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
-IfcExternalReferenceRelationship::list IfcConstraint::HasExternalReferences() { RETURN_INVERSE(IfcExternalReferenceRelationship) }
-IfcResourceConstraintRelationship::list IfcConstraint::PropertiesForConstraint() { RETURN_INVERSE(IfcResourceConstraintRelationship) }
+bool IfcConstraint::hasConstraintSource() const { return !entity->getArgument(3)->isNull(); }
+std::string IfcConstraint::ConstraintSource() const { return *entity->getArgument(3); }
+void IfcConstraint::setConstraintSource(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+bool IfcConstraint::hasCreatingActor() const { return !entity->getArgument(4)->isNull(); }
+IfcActorSelect* IfcConstraint::CreatingActor() const { return (IfcActorSelect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(4))); }
+void IfcConstraint::setCreatingActor(IfcActorSelect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+bool IfcConstraint::hasCreationTime() const { return !entity->getArgument(5)->isNull(); }
+std::string IfcConstraint::CreationTime() const { return *entity->getArgument(5); }
+void IfcConstraint::setCreationTime(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+bool IfcConstraint::hasUserDefinedGrade() const { return !entity->getArgument(6)->isNull(); }
+std::string IfcConstraint::UserDefinedGrade() const { return *entity->getArgument(6); }
+void IfcConstraint::setUserDefinedGrade(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
+IfcExternalReferenceRelationship::list::ptr IfcConstraint::HasExternalReferences() const { return entity->getInverse(Type::IfcExternalReferenceRelationship, 3)->as<IfcExternalReferenceRelationship>(); }
+IfcResourceConstraintRelationship::list::ptr IfcConstraint::PropertiesForConstraint() const { return entity->getInverse(Type::IfcResourceConstraintRelationship, 2)->as<IfcResourceConstraintRelationship>(); }
 bool IfcConstraint::is(Type::Enum v) const { return v == Type::IfcConstraint; }
 Type::Enum IfcConstraint::type() const { return Type::IfcConstraint; }
 Type::Enum IfcConstraint::Class() { return Type::IfcConstraint; }
-IfcConstraint::IfcConstraint(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcConstraint)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcConstraint::IfcConstraint(IfcLabel v1_Name, boost::optional< IfcText > v2_Description, IfcConstraintEnum::IfcConstraintEnum v3_ConstraintGrade, boost::optional< IfcLabel > v4_ConstraintSource, boost::optional< IfcActorSelect > v5_CreatingActor, boost::optional< IfcDateTime > v6_CreationTime, boost::optional< IfcLabel > v7_UserDefinedGrade) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,v3_ConstraintGrade,IfcConstraintEnum::ToString(v3_ConstraintGrade)); if (v4_ConstraintSource) { e->setArgument(3,(*v4_ConstraintSource)); } else { e->setArgument(3); } if (v5_CreatingActor) { e->setArgument(4,(*v5_CreatingActor)); } else { e->setArgument(4); } if (v6_CreationTime) { e->setArgument(5,(*v6_CreationTime)); } else { e->setArgument(5); } if (v7_UserDefinedGrade) { e->setArgument(6,(*v7_UserDefinedGrade)); } else { e->setArgument(6); } entity = e; EntityBuffer::Add(this); }
+IfcConstraint::IfcConstraint(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcConstraint)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcConstraint::IfcConstraint(std::string v1_Name, boost::optional< std::string > v2_Description, IfcConstraintEnum::IfcConstraintEnum v3_ConstraintGrade, boost::optional< std::string > v4_ConstraintSource, IfcActorSelect* v5_CreatingActor, boost::optional< std::string > v6_CreationTime, boost::optional< std::string > v7_UserDefinedGrade) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,v3_ConstraintGrade,IfcConstraintEnum::ToString(v3_ConstraintGrade)); if (v4_ConstraintSource) { e->setArgument(3,(*v4_ConstraintSource)); } else { e->setArgument(3); } e->setArgument(4,(v5_CreatingActor)); if (v6_CreationTime) { e->setArgument(5,(*v6_CreationTime)); } else { e->setArgument(5); } if (v7_UserDefinedGrade) { e->setArgument(6,(*v7_UserDefinedGrade)); } else { e->setArgument(6); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcConstructionEquipmentResource
-bool IfcConstructionEquipmentResource::hasPredefinedType() { return !entity->getArgument(10)->isNull(); }
-IfcConstructionEquipmentResourceTypeEnum::IfcConstructionEquipmentResourceTypeEnum IfcConstructionEquipmentResource::PredefinedType() { return IfcConstructionEquipmentResourceTypeEnum::FromString(*entity->getArgument(10)); }
+bool IfcConstructionEquipmentResource::hasPredefinedType() const { return !entity->getArgument(10)->isNull(); }
+IfcConstructionEquipmentResourceTypeEnum::IfcConstructionEquipmentResourceTypeEnum IfcConstructionEquipmentResource::PredefinedType() const { return IfcConstructionEquipmentResourceTypeEnum::FromString(*entity->getArgument(10)); }
 void IfcConstructionEquipmentResource::setPredefinedType(IfcConstructionEquipmentResourceTypeEnum::IfcConstructionEquipmentResourceTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v,IfcConstructionEquipmentResourceTypeEnum::ToString(v)); }
 bool IfcConstructionEquipmentResource::is(Type::Enum v) const { return v == Type::IfcConstructionEquipmentResource || IfcConstructionResource::is(v); }
 Type::Enum IfcConstructionEquipmentResource::type() const { return Type::IfcConstructionEquipmentResource; }
 Type::Enum IfcConstructionEquipmentResource::Class() { return Type::IfcConstructionEquipmentResource; }
-IfcConstructionEquipmentResource::IfcConstructionEquipmentResource(IfcAbstractEntityPtr e) : IfcConstructionResource((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcConstructionEquipmentResource)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcConstructionEquipmentResource::IfcConstructionEquipmentResource(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, boost::optional< IfcIdentifier > v6_Identification, boost::optional< IfcText > v7_LongDescription, IfcResourceTime* v8_Usage, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcAppliedValue > > > v9_BaseCosts, IfcPhysicalQuantity* v10_BaseQuantity, boost::optional< IfcConstructionEquipmentResourceTypeEnum::IfcConstructionEquipmentResourceTypeEnum > v11_PredefinedType) : IfcConstructionResource((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } if (v6_Identification) { e->setArgument(5,(*v6_Identification)); } else { e->setArgument(5); } if (v7_LongDescription) { e->setArgument(6,(*v7_LongDescription)); } else { e->setArgument(6); } e->setArgument(7,(v8_Usage)); if (v9_BaseCosts) { e->setArgument(8,(*v9_BaseCosts)->generalize()); } else { e->setArgument(8); } e->setArgument(9,(v10_BaseQuantity)); if (v11_PredefinedType) { e->setArgument(10,*v11_PredefinedType,IfcConstructionEquipmentResourceTypeEnum::ToString(*v11_PredefinedType)); } else { e->setArgument(10); } entity = e; EntityBuffer::Add(this); }
+IfcConstructionEquipmentResource::IfcConstructionEquipmentResource(IfcAbstractEntity* e) : IfcConstructionResource((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcConstructionEquipmentResource)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcConstructionEquipmentResource::IfcConstructionEquipmentResource(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, boost::optional< std::string > v6_Identification, boost::optional< std::string > v7_LongDescription, IfcResourceTime* v8_Usage, boost::optional< IfcTemplatedEntityList< IfcAppliedValue >::ptr > v9_BaseCosts, IfcPhysicalQuantity* v10_BaseQuantity, boost::optional< IfcConstructionEquipmentResourceTypeEnum::IfcConstructionEquipmentResourceTypeEnum > v11_PredefinedType) : IfcConstructionResource((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } if (v6_Identification) { e->setArgument(5,(*v6_Identification)); } else { e->setArgument(5); } if (v7_LongDescription) { e->setArgument(6,(*v7_LongDescription)); } else { e->setArgument(6); } e->setArgument(7,(v8_Usage)); if (v9_BaseCosts) { e->setArgument(8,(*v9_BaseCosts)->generalize()); } else { e->setArgument(8); } e->setArgument(9,(v10_BaseQuantity)); if (v11_PredefinedType) { e->setArgument(10,*v11_PredefinedType,IfcConstructionEquipmentResourceTypeEnum::ToString(*v11_PredefinedType)); } else { e->setArgument(10); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcConstructionEquipmentResourceType
-IfcConstructionEquipmentResourceTypeEnum::IfcConstructionEquipmentResourceTypeEnum IfcConstructionEquipmentResourceType::PredefinedType() { return IfcConstructionEquipmentResourceTypeEnum::FromString(*entity->getArgument(11)); }
+IfcConstructionEquipmentResourceTypeEnum::IfcConstructionEquipmentResourceTypeEnum IfcConstructionEquipmentResourceType::PredefinedType() const { return IfcConstructionEquipmentResourceTypeEnum::FromString(*entity->getArgument(11)); }
 void IfcConstructionEquipmentResourceType::setPredefinedType(IfcConstructionEquipmentResourceTypeEnum::IfcConstructionEquipmentResourceTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(11,v,IfcConstructionEquipmentResourceTypeEnum::ToString(v)); }
 bool IfcConstructionEquipmentResourceType::is(Type::Enum v) const { return v == Type::IfcConstructionEquipmentResourceType || IfcConstructionResourceType::is(v); }
 Type::Enum IfcConstructionEquipmentResourceType::type() const { return Type::IfcConstructionEquipmentResourceType; }
 Type::Enum IfcConstructionEquipmentResourceType::Class() { return Type::IfcConstructionEquipmentResourceType; }
-IfcConstructionEquipmentResourceType::IfcConstructionEquipmentResourceType(IfcAbstractEntityPtr e) : IfcConstructionResourceType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcConstructionEquipmentResourceType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcConstructionEquipmentResourceType::IfcConstructionEquipmentResourceType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< IfcIdentifier > v7_Identification, boost::optional< IfcText > v8_LongDescription, boost::optional< IfcLabel > v9_ResourceType, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcAppliedValue > > > v10_BaseCosts, IfcPhysicalQuantity* v11_BaseQuantity, IfcConstructionEquipmentResourceTypeEnum::IfcConstructionEquipmentResourceTypeEnum v12_PredefinedType) : IfcConstructionResourceType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_Identification) { e->setArgument(6,(*v7_Identification)); } else { e->setArgument(6); } if (v8_LongDescription) { e->setArgument(7,(*v8_LongDescription)); } else { e->setArgument(7); } if (v9_ResourceType) { e->setArgument(8,(*v9_ResourceType)); } else { e->setArgument(8); } if (v10_BaseCosts) { e->setArgument(9,(*v10_BaseCosts)->generalize()); } else { e->setArgument(9); } e->setArgument(10,(v11_BaseQuantity)); e->setArgument(11,v12_PredefinedType,IfcConstructionEquipmentResourceTypeEnum::ToString(v12_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcConstructionEquipmentResourceType::IfcConstructionEquipmentResourceType(IfcAbstractEntity* e) : IfcConstructionResourceType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcConstructionEquipmentResourceType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcConstructionEquipmentResourceType::IfcConstructionEquipmentResourceType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< std::string > v7_Identification, boost::optional< std::string > v8_LongDescription, boost::optional< std::string > v9_ResourceType, boost::optional< IfcTemplatedEntityList< IfcAppliedValue >::ptr > v10_BaseCosts, IfcPhysicalQuantity* v11_BaseQuantity, IfcConstructionEquipmentResourceTypeEnum::IfcConstructionEquipmentResourceTypeEnum v12_PredefinedType) : IfcConstructionResourceType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_Identification) { e->setArgument(6,(*v7_Identification)); } else { e->setArgument(6); } if (v8_LongDescription) { e->setArgument(7,(*v8_LongDescription)); } else { e->setArgument(7); } if (v9_ResourceType) { e->setArgument(8,(*v9_ResourceType)); } else { e->setArgument(8); } if (v10_BaseCosts) { e->setArgument(9,(*v10_BaseCosts)->generalize()); } else { e->setArgument(9); } e->setArgument(10,(v11_BaseQuantity)); e->setArgument(11,v12_PredefinedType,IfcConstructionEquipmentResourceTypeEnum::ToString(v12_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcConstructionMaterialResource
-bool IfcConstructionMaterialResource::hasPredefinedType() { return !entity->getArgument(10)->isNull(); }
-IfcConstructionMaterialResourceTypeEnum::IfcConstructionMaterialResourceTypeEnum IfcConstructionMaterialResource::PredefinedType() { return IfcConstructionMaterialResourceTypeEnum::FromString(*entity->getArgument(10)); }
+bool IfcConstructionMaterialResource::hasPredefinedType() const { return !entity->getArgument(10)->isNull(); }
+IfcConstructionMaterialResourceTypeEnum::IfcConstructionMaterialResourceTypeEnum IfcConstructionMaterialResource::PredefinedType() const { return IfcConstructionMaterialResourceTypeEnum::FromString(*entity->getArgument(10)); }
 void IfcConstructionMaterialResource::setPredefinedType(IfcConstructionMaterialResourceTypeEnum::IfcConstructionMaterialResourceTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v,IfcConstructionMaterialResourceTypeEnum::ToString(v)); }
 bool IfcConstructionMaterialResource::is(Type::Enum v) const { return v == Type::IfcConstructionMaterialResource || IfcConstructionResource::is(v); }
 Type::Enum IfcConstructionMaterialResource::type() const { return Type::IfcConstructionMaterialResource; }
 Type::Enum IfcConstructionMaterialResource::Class() { return Type::IfcConstructionMaterialResource; }
-IfcConstructionMaterialResource::IfcConstructionMaterialResource(IfcAbstractEntityPtr e) : IfcConstructionResource((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcConstructionMaterialResource)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcConstructionMaterialResource::IfcConstructionMaterialResource(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, boost::optional< IfcIdentifier > v6_Identification, boost::optional< IfcText > v7_LongDescription, IfcResourceTime* v8_Usage, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcAppliedValue > > > v9_BaseCosts, IfcPhysicalQuantity* v10_BaseQuantity, boost::optional< IfcConstructionMaterialResourceTypeEnum::IfcConstructionMaterialResourceTypeEnum > v11_PredefinedType) : IfcConstructionResource((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } if (v6_Identification) { e->setArgument(5,(*v6_Identification)); } else { e->setArgument(5); } if (v7_LongDescription) { e->setArgument(6,(*v7_LongDescription)); } else { e->setArgument(6); } e->setArgument(7,(v8_Usage)); if (v9_BaseCosts) { e->setArgument(8,(*v9_BaseCosts)->generalize()); } else { e->setArgument(8); } e->setArgument(9,(v10_BaseQuantity)); if (v11_PredefinedType) { e->setArgument(10,*v11_PredefinedType,IfcConstructionMaterialResourceTypeEnum::ToString(*v11_PredefinedType)); } else { e->setArgument(10); } entity = e; EntityBuffer::Add(this); }
+IfcConstructionMaterialResource::IfcConstructionMaterialResource(IfcAbstractEntity* e) : IfcConstructionResource((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcConstructionMaterialResource)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcConstructionMaterialResource::IfcConstructionMaterialResource(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, boost::optional< std::string > v6_Identification, boost::optional< std::string > v7_LongDescription, IfcResourceTime* v8_Usage, boost::optional< IfcTemplatedEntityList< IfcAppliedValue >::ptr > v9_BaseCosts, IfcPhysicalQuantity* v10_BaseQuantity, boost::optional< IfcConstructionMaterialResourceTypeEnum::IfcConstructionMaterialResourceTypeEnum > v11_PredefinedType) : IfcConstructionResource((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } if (v6_Identification) { e->setArgument(5,(*v6_Identification)); } else { e->setArgument(5); } if (v7_LongDescription) { e->setArgument(6,(*v7_LongDescription)); } else { e->setArgument(6); } e->setArgument(7,(v8_Usage)); if (v9_BaseCosts) { e->setArgument(8,(*v9_BaseCosts)->generalize()); } else { e->setArgument(8); } e->setArgument(9,(v10_BaseQuantity)); if (v11_PredefinedType) { e->setArgument(10,*v11_PredefinedType,IfcConstructionMaterialResourceTypeEnum::ToString(*v11_PredefinedType)); } else { e->setArgument(10); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcConstructionMaterialResourceType
-IfcConstructionMaterialResourceTypeEnum::IfcConstructionMaterialResourceTypeEnum IfcConstructionMaterialResourceType::PredefinedType() { return IfcConstructionMaterialResourceTypeEnum::FromString(*entity->getArgument(11)); }
+IfcConstructionMaterialResourceTypeEnum::IfcConstructionMaterialResourceTypeEnum IfcConstructionMaterialResourceType::PredefinedType() const { return IfcConstructionMaterialResourceTypeEnum::FromString(*entity->getArgument(11)); }
 void IfcConstructionMaterialResourceType::setPredefinedType(IfcConstructionMaterialResourceTypeEnum::IfcConstructionMaterialResourceTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(11,v,IfcConstructionMaterialResourceTypeEnum::ToString(v)); }
 bool IfcConstructionMaterialResourceType::is(Type::Enum v) const { return v == Type::IfcConstructionMaterialResourceType || IfcConstructionResourceType::is(v); }
 Type::Enum IfcConstructionMaterialResourceType::type() const { return Type::IfcConstructionMaterialResourceType; }
 Type::Enum IfcConstructionMaterialResourceType::Class() { return Type::IfcConstructionMaterialResourceType; }
-IfcConstructionMaterialResourceType::IfcConstructionMaterialResourceType(IfcAbstractEntityPtr e) : IfcConstructionResourceType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcConstructionMaterialResourceType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcConstructionMaterialResourceType::IfcConstructionMaterialResourceType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< IfcIdentifier > v7_Identification, boost::optional< IfcText > v8_LongDescription, boost::optional< IfcLabel > v9_ResourceType, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcAppliedValue > > > v10_BaseCosts, IfcPhysicalQuantity* v11_BaseQuantity, IfcConstructionMaterialResourceTypeEnum::IfcConstructionMaterialResourceTypeEnum v12_PredefinedType) : IfcConstructionResourceType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_Identification) { e->setArgument(6,(*v7_Identification)); } else { e->setArgument(6); } if (v8_LongDescription) { e->setArgument(7,(*v8_LongDescription)); } else { e->setArgument(7); } if (v9_ResourceType) { e->setArgument(8,(*v9_ResourceType)); } else { e->setArgument(8); } if (v10_BaseCosts) { e->setArgument(9,(*v10_BaseCosts)->generalize()); } else { e->setArgument(9); } e->setArgument(10,(v11_BaseQuantity)); e->setArgument(11,v12_PredefinedType,IfcConstructionMaterialResourceTypeEnum::ToString(v12_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcConstructionMaterialResourceType::IfcConstructionMaterialResourceType(IfcAbstractEntity* e) : IfcConstructionResourceType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcConstructionMaterialResourceType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcConstructionMaterialResourceType::IfcConstructionMaterialResourceType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< std::string > v7_Identification, boost::optional< std::string > v8_LongDescription, boost::optional< std::string > v9_ResourceType, boost::optional< IfcTemplatedEntityList< IfcAppliedValue >::ptr > v10_BaseCosts, IfcPhysicalQuantity* v11_BaseQuantity, IfcConstructionMaterialResourceTypeEnum::IfcConstructionMaterialResourceTypeEnum v12_PredefinedType) : IfcConstructionResourceType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_Identification) { e->setArgument(6,(*v7_Identification)); } else { e->setArgument(6); } if (v8_LongDescription) { e->setArgument(7,(*v8_LongDescription)); } else { e->setArgument(7); } if (v9_ResourceType) { e->setArgument(8,(*v9_ResourceType)); } else { e->setArgument(8); } if (v10_BaseCosts) { e->setArgument(9,(*v10_BaseCosts)->generalize()); } else { e->setArgument(9); } e->setArgument(10,(v11_BaseQuantity)); e->setArgument(11,v12_PredefinedType,IfcConstructionMaterialResourceTypeEnum::ToString(v12_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcConstructionProductResource
-bool IfcConstructionProductResource::hasPredefinedType() { return !entity->getArgument(10)->isNull(); }
-IfcConstructionProductResourceTypeEnum::IfcConstructionProductResourceTypeEnum IfcConstructionProductResource::PredefinedType() { return IfcConstructionProductResourceTypeEnum::FromString(*entity->getArgument(10)); }
+bool IfcConstructionProductResource::hasPredefinedType() const { return !entity->getArgument(10)->isNull(); }
+IfcConstructionProductResourceTypeEnum::IfcConstructionProductResourceTypeEnum IfcConstructionProductResource::PredefinedType() const { return IfcConstructionProductResourceTypeEnum::FromString(*entity->getArgument(10)); }
 void IfcConstructionProductResource::setPredefinedType(IfcConstructionProductResourceTypeEnum::IfcConstructionProductResourceTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v,IfcConstructionProductResourceTypeEnum::ToString(v)); }
 bool IfcConstructionProductResource::is(Type::Enum v) const { return v == Type::IfcConstructionProductResource || IfcConstructionResource::is(v); }
 Type::Enum IfcConstructionProductResource::type() const { return Type::IfcConstructionProductResource; }
 Type::Enum IfcConstructionProductResource::Class() { return Type::IfcConstructionProductResource; }
-IfcConstructionProductResource::IfcConstructionProductResource(IfcAbstractEntityPtr e) : IfcConstructionResource((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcConstructionProductResource)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcConstructionProductResource::IfcConstructionProductResource(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, boost::optional< IfcIdentifier > v6_Identification, boost::optional< IfcText > v7_LongDescription, IfcResourceTime* v8_Usage, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcAppliedValue > > > v9_BaseCosts, IfcPhysicalQuantity* v10_BaseQuantity, boost::optional< IfcConstructionProductResourceTypeEnum::IfcConstructionProductResourceTypeEnum > v11_PredefinedType) : IfcConstructionResource((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } if (v6_Identification) { e->setArgument(5,(*v6_Identification)); } else { e->setArgument(5); } if (v7_LongDescription) { e->setArgument(6,(*v7_LongDescription)); } else { e->setArgument(6); } e->setArgument(7,(v8_Usage)); if (v9_BaseCosts) { e->setArgument(8,(*v9_BaseCosts)->generalize()); } else { e->setArgument(8); } e->setArgument(9,(v10_BaseQuantity)); if (v11_PredefinedType) { e->setArgument(10,*v11_PredefinedType,IfcConstructionProductResourceTypeEnum::ToString(*v11_PredefinedType)); } else { e->setArgument(10); } entity = e; EntityBuffer::Add(this); }
+IfcConstructionProductResource::IfcConstructionProductResource(IfcAbstractEntity* e) : IfcConstructionResource((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcConstructionProductResource)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcConstructionProductResource::IfcConstructionProductResource(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, boost::optional< std::string > v6_Identification, boost::optional< std::string > v7_LongDescription, IfcResourceTime* v8_Usage, boost::optional< IfcTemplatedEntityList< IfcAppliedValue >::ptr > v9_BaseCosts, IfcPhysicalQuantity* v10_BaseQuantity, boost::optional< IfcConstructionProductResourceTypeEnum::IfcConstructionProductResourceTypeEnum > v11_PredefinedType) : IfcConstructionResource((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } if (v6_Identification) { e->setArgument(5,(*v6_Identification)); } else { e->setArgument(5); } if (v7_LongDescription) { e->setArgument(6,(*v7_LongDescription)); } else { e->setArgument(6); } e->setArgument(7,(v8_Usage)); if (v9_BaseCosts) { e->setArgument(8,(*v9_BaseCosts)->generalize()); } else { e->setArgument(8); } e->setArgument(9,(v10_BaseQuantity)); if (v11_PredefinedType) { e->setArgument(10,*v11_PredefinedType,IfcConstructionProductResourceTypeEnum::ToString(*v11_PredefinedType)); } else { e->setArgument(10); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcConstructionProductResourceType
-IfcConstructionProductResourceTypeEnum::IfcConstructionProductResourceTypeEnum IfcConstructionProductResourceType::PredefinedType() { return IfcConstructionProductResourceTypeEnum::FromString(*entity->getArgument(11)); }
+IfcConstructionProductResourceTypeEnum::IfcConstructionProductResourceTypeEnum IfcConstructionProductResourceType::PredefinedType() const { return IfcConstructionProductResourceTypeEnum::FromString(*entity->getArgument(11)); }
 void IfcConstructionProductResourceType::setPredefinedType(IfcConstructionProductResourceTypeEnum::IfcConstructionProductResourceTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(11,v,IfcConstructionProductResourceTypeEnum::ToString(v)); }
 bool IfcConstructionProductResourceType::is(Type::Enum v) const { return v == Type::IfcConstructionProductResourceType || IfcConstructionResourceType::is(v); }
 Type::Enum IfcConstructionProductResourceType::type() const { return Type::IfcConstructionProductResourceType; }
 Type::Enum IfcConstructionProductResourceType::Class() { return Type::IfcConstructionProductResourceType; }
-IfcConstructionProductResourceType::IfcConstructionProductResourceType(IfcAbstractEntityPtr e) : IfcConstructionResourceType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcConstructionProductResourceType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcConstructionProductResourceType::IfcConstructionProductResourceType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< IfcIdentifier > v7_Identification, boost::optional< IfcText > v8_LongDescription, boost::optional< IfcLabel > v9_ResourceType, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcAppliedValue > > > v10_BaseCosts, IfcPhysicalQuantity* v11_BaseQuantity, IfcConstructionProductResourceTypeEnum::IfcConstructionProductResourceTypeEnum v12_PredefinedType) : IfcConstructionResourceType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_Identification) { e->setArgument(6,(*v7_Identification)); } else { e->setArgument(6); } if (v8_LongDescription) { e->setArgument(7,(*v8_LongDescription)); } else { e->setArgument(7); } if (v9_ResourceType) { e->setArgument(8,(*v9_ResourceType)); } else { e->setArgument(8); } if (v10_BaseCosts) { e->setArgument(9,(*v10_BaseCosts)->generalize()); } else { e->setArgument(9); } e->setArgument(10,(v11_BaseQuantity)); e->setArgument(11,v12_PredefinedType,IfcConstructionProductResourceTypeEnum::ToString(v12_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcConstructionProductResourceType::IfcConstructionProductResourceType(IfcAbstractEntity* e) : IfcConstructionResourceType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcConstructionProductResourceType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcConstructionProductResourceType::IfcConstructionProductResourceType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< std::string > v7_Identification, boost::optional< std::string > v8_LongDescription, boost::optional< std::string > v9_ResourceType, boost::optional< IfcTemplatedEntityList< IfcAppliedValue >::ptr > v10_BaseCosts, IfcPhysicalQuantity* v11_BaseQuantity, IfcConstructionProductResourceTypeEnum::IfcConstructionProductResourceTypeEnum v12_PredefinedType) : IfcConstructionResourceType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_Identification) { e->setArgument(6,(*v7_Identification)); } else { e->setArgument(6); } if (v8_LongDescription) { e->setArgument(7,(*v8_LongDescription)); } else { e->setArgument(7); } if (v9_ResourceType) { e->setArgument(8,(*v9_ResourceType)); } else { e->setArgument(8); } if (v10_BaseCosts) { e->setArgument(9,(*v10_BaseCosts)->generalize()); } else { e->setArgument(9); } e->setArgument(10,(v11_BaseQuantity)); e->setArgument(11,v12_PredefinedType,IfcConstructionProductResourceTypeEnum::ToString(v12_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcConstructionResource
-bool IfcConstructionResource::hasUsage() { return !entity->getArgument(7)->isNull(); }
-IfcResourceTime* IfcConstructionResource::Usage() { return (IfcResourceTime*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(7))); }
+bool IfcConstructionResource::hasUsage() const { return !entity->getArgument(7)->isNull(); }
+IfcResourceTime* IfcConstructionResource::Usage() const { return (IfcResourceTime*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(7))); }
 void IfcConstructionResource::setUsage(IfcResourceTime* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
-bool IfcConstructionResource::hasBaseCosts() { return !entity->getArgument(8)->isNull(); }
-SHARED_PTR< IfcTemplatedEntityList< IfcAppliedValue > > IfcConstructionResource::BaseCosts() { RETURN_AS_LIST(IfcAppliedValue,8) }
-void IfcConstructionResource::setBaseCosts(SHARED_PTR< IfcTemplatedEntityList< IfcAppliedValue > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v->generalize()); }
-bool IfcConstructionResource::hasBaseQuantity() { return !entity->getArgument(9)->isNull(); }
-IfcPhysicalQuantity* IfcConstructionResource::BaseQuantity() { return (IfcPhysicalQuantity*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(9))); }
+bool IfcConstructionResource::hasBaseCosts() const { return !entity->getArgument(8)->isNull(); }
+IfcTemplatedEntityList< IfcAppliedValue >::ptr IfcConstructionResource::BaseCosts() const { IfcEntityList::ptr es = *entity->getArgument(8); return es->as<IfcAppliedValue>(); }
+void IfcConstructionResource::setBaseCosts(IfcTemplatedEntityList< IfcAppliedValue >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v->generalize()); }
+bool IfcConstructionResource::hasBaseQuantity() const { return !entity->getArgument(9)->isNull(); }
+IfcPhysicalQuantity* IfcConstructionResource::BaseQuantity() const { return (IfcPhysicalQuantity*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(9))); }
 void IfcConstructionResource::setBaseQuantity(IfcPhysicalQuantity* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
 bool IfcConstructionResource::is(Type::Enum v) const { return v == Type::IfcConstructionResource || IfcResource::is(v); }
 Type::Enum IfcConstructionResource::type() const { return Type::IfcConstructionResource; }
 Type::Enum IfcConstructionResource::Class() { return Type::IfcConstructionResource; }
-IfcConstructionResource::IfcConstructionResource(IfcAbstractEntityPtr e) : IfcResource((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcConstructionResource)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcConstructionResource::IfcConstructionResource(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, boost::optional< IfcIdentifier > v6_Identification, boost::optional< IfcText > v7_LongDescription, IfcResourceTime* v8_Usage, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcAppliedValue > > > v9_BaseCosts, IfcPhysicalQuantity* v10_BaseQuantity) : IfcResource((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } if (v6_Identification) { e->setArgument(5,(*v6_Identification)); } else { e->setArgument(5); } if (v7_LongDescription) { e->setArgument(6,(*v7_LongDescription)); } else { e->setArgument(6); } e->setArgument(7,(v8_Usage)); if (v9_BaseCosts) { e->setArgument(8,(*v9_BaseCosts)->generalize()); } else { e->setArgument(8); } e->setArgument(9,(v10_BaseQuantity)); entity = e; EntityBuffer::Add(this); }
+IfcConstructionResource::IfcConstructionResource(IfcAbstractEntity* e) : IfcResource((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcConstructionResource)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcConstructionResource::IfcConstructionResource(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, boost::optional< std::string > v6_Identification, boost::optional< std::string > v7_LongDescription, IfcResourceTime* v8_Usage, boost::optional< IfcTemplatedEntityList< IfcAppliedValue >::ptr > v9_BaseCosts, IfcPhysicalQuantity* v10_BaseQuantity) : IfcResource((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } if (v6_Identification) { e->setArgument(5,(*v6_Identification)); } else { e->setArgument(5); } if (v7_LongDescription) { e->setArgument(6,(*v7_LongDescription)); } else { e->setArgument(6); } e->setArgument(7,(v8_Usage)); if (v9_BaseCosts) { e->setArgument(8,(*v9_BaseCosts)->generalize()); } else { e->setArgument(8); } e->setArgument(9,(v10_BaseQuantity)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcConstructionResourceType
-bool IfcConstructionResourceType::hasBaseCosts() { return !entity->getArgument(9)->isNull(); }
-SHARED_PTR< IfcTemplatedEntityList< IfcAppliedValue > > IfcConstructionResourceType::BaseCosts() { RETURN_AS_LIST(IfcAppliedValue,9) }
-void IfcConstructionResourceType::setBaseCosts(SHARED_PTR< IfcTemplatedEntityList< IfcAppliedValue > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v->generalize()); }
-bool IfcConstructionResourceType::hasBaseQuantity() { return !entity->getArgument(10)->isNull(); }
-IfcPhysicalQuantity* IfcConstructionResourceType::BaseQuantity() { return (IfcPhysicalQuantity*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(10))); }
+bool IfcConstructionResourceType::hasBaseCosts() const { return !entity->getArgument(9)->isNull(); }
+IfcTemplatedEntityList< IfcAppliedValue >::ptr IfcConstructionResourceType::BaseCosts() const { IfcEntityList::ptr es = *entity->getArgument(9); return es->as<IfcAppliedValue>(); }
+void IfcConstructionResourceType::setBaseCosts(IfcTemplatedEntityList< IfcAppliedValue >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v->generalize()); }
+bool IfcConstructionResourceType::hasBaseQuantity() const { return !entity->getArgument(10)->isNull(); }
+IfcPhysicalQuantity* IfcConstructionResourceType::BaseQuantity() const { return (IfcPhysicalQuantity*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(10))); }
 void IfcConstructionResourceType::setBaseQuantity(IfcPhysicalQuantity* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
 bool IfcConstructionResourceType::is(Type::Enum v) const { return v == Type::IfcConstructionResourceType || IfcTypeResource::is(v); }
 Type::Enum IfcConstructionResourceType::type() const { return Type::IfcConstructionResourceType; }
 Type::Enum IfcConstructionResourceType::Class() { return Type::IfcConstructionResourceType; }
-IfcConstructionResourceType::IfcConstructionResourceType(IfcAbstractEntityPtr e) : IfcTypeResource((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcConstructionResourceType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcConstructionResourceType::IfcConstructionResourceType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< IfcIdentifier > v7_Identification, boost::optional< IfcText > v8_LongDescription, boost::optional< IfcLabel > v9_ResourceType, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcAppliedValue > > > v10_BaseCosts, IfcPhysicalQuantity* v11_BaseQuantity) : IfcTypeResource((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_Identification) { e->setArgument(6,(*v7_Identification)); } else { e->setArgument(6); } if (v8_LongDescription) { e->setArgument(7,(*v8_LongDescription)); } else { e->setArgument(7); } if (v9_ResourceType) { e->setArgument(8,(*v9_ResourceType)); } else { e->setArgument(8); } if (v10_BaseCosts) { e->setArgument(9,(*v10_BaseCosts)->generalize()); } else { e->setArgument(9); } e->setArgument(10,(v11_BaseQuantity)); entity = e; EntityBuffer::Add(this); }
+IfcConstructionResourceType::IfcConstructionResourceType(IfcAbstractEntity* e) : IfcTypeResource((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcConstructionResourceType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcConstructionResourceType::IfcConstructionResourceType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< std::string > v7_Identification, boost::optional< std::string > v8_LongDescription, boost::optional< std::string > v9_ResourceType, boost::optional< IfcTemplatedEntityList< IfcAppliedValue >::ptr > v10_BaseCosts, IfcPhysicalQuantity* v11_BaseQuantity) : IfcTypeResource((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_Identification) { e->setArgument(6,(*v7_Identification)); } else { e->setArgument(6); } if (v8_LongDescription) { e->setArgument(7,(*v8_LongDescription)); } else { e->setArgument(7); } if (v9_ResourceType) { e->setArgument(8,(*v9_ResourceType)); } else { e->setArgument(8); } if (v10_BaseCosts) { e->setArgument(9,(*v10_BaseCosts)->generalize()); } else { e->setArgument(9); } e->setArgument(10,(v11_BaseQuantity)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcContext
-bool IfcContext::hasObjectType() { return !entity->getArgument(4)->isNull(); }
-IfcLabel IfcContext::ObjectType() { return *entity->getArgument(4); }
-void IfcContext::setObjectType(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-bool IfcContext::hasLongName() { return !entity->getArgument(5)->isNull(); }
-IfcLabel IfcContext::LongName() { return *entity->getArgument(5); }
-void IfcContext::setLongName(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-bool IfcContext::hasPhase() { return !entity->getArgument(6)->isNull(); }
-IfcLabel IfcContext::Phase() { return *entity->getArgument(6); }
-void IfcContext::setPhase(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
-bool IfcContext::hasRepresentationContexts() { return !entity->getArgument(7)->isNull(); }
-SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationContext > > IfcContext::RepresentationContexts() { RETURN_AS_LIST(IfcRepresentationContext,7) }
-void IfcContext::setRepresentationContexts(SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationContext > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v->generalize()); }
-bool IfcContext::hasUnitsInContext() { return !entity->getArgument(8)->isNull(); }
-IfcUnitAssignment* IfcContext::UnitsInContext() { return (IfcUnitAssignment*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(8))); }
+bool IfcContext::hasObjectType() const { return !entity->getArgument(4)->isNull(); }
+std::string IfcContext::ObjectType() const { return *entity->getArgument(4); }
+void IfcContext::setObjectType(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+bool IfcContext::hasLongName() const { return !entity->getArgument(5)->isNull(); }
+std::string IfcContext::LongName() const { return *entity->getArgument(5); }
+void IfcContext::setLongName(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+bool IfcContext::hasPhase() const { return !entity->getArgument(6)->isNull(); }
+std::string IfcContext::Phase() const { return *entity->getArgument(6); }
+void IfcContext::setPhase(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
+bool IfcContext::hasRepresentationContexts() const { return !entity->getArgument(7)->isNull(); }
+IfcTemplatedEntityList< IfcRepresentationContext >::ptr IfcContext::RepresentationContexts() const { IfcEntityList::ptr es = *entity->getArgument(7); return es->as<IfcRepresentationContext>(); }
+void IfcContext::setRepresentationContexts(IfcTemplatedEntityList< IfcRepresentationContext >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v->generalize()); }
+bool IfcContext::hasUnitsInContext() const { return !entity->getArgument(8)->isNull(); }
+IfcUnitAssignment* IfcContext::UnitsInContext() const { return (IfcUnitAssignment*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(8))); }
 void IfcContext::setUnitsInContext(IfcUnitAssignment* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
-IfcRelDefinesByProperties::list IfcContext::IsDefinedBy() { RETURN_INVERSE(IfcRelDefinesByProperties) }
-IfcRelDeclares::list IfcContext::Declares() { RETURN_INVERSE(IfcRelDeclares) }
+IfcRelDefinesByProperties::list::ptr IfcContext::IsDefinedBy() const { return entity->getInverse(Type::IfcRelDefinesByProperties, 4)->as<IfcRelDefinesByProperties>(); }
+IfcRelDeclares::list::ptr IfcContext::Declares() const { return entity->getInverse(Type::IfcRelDeclares, 4)->as<IfcRelDeclares>(); }
 bool IfcContext::is(Type::Enum v) const { return v == Type::IfcContext || IfcObjectDefinition::is(v); }
 Type::Enum IfcContext::type() const { return Type::IfcContext; }
 Type::Enum IfcContext::Class() { return Type::IfcContext; }
-IfcContext::IfcContext(IfcAbstractEntityPtr e) : IfcObjectDefinition((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcContext)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcContext::IfcContext(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, boost::optional< IfcLabel > v6_LongName, boost::optional< IfcLabel > v7_Phase, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationContext > > > v8_RepresentationContexts, IfcUnitAssignment* v9_UnitsInContext) : IfcObjectDefinition((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } if (v6_LongName) { e->setArgument(5,(*v6_LongName)); } else { e->setArgument(5); } if (v7_Phase) { e->setArgument(6,(*v7_Phase)); } else { e->setArgument(6); } if (v8_RepresentationContexts) { e->setArgument(7,(*v8_RepresentationContexts)->generalize()); } else { e->setArgument(7); } e->setArgument(8,(v9_UnitsInContext)); entity = e; EntityBuffer::Add(this); }
+IfcContext::IfcContext(IfcAbstractEntity* e) : IfcObjectDefinition((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcContext)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcContext::IfcContext(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, boost::optional< std::string > v6_LongName, boost::optional< std::string > v7_Phase, boost::optional< IfcTemplatedEntityList< IfcRepresentationContext >::ptr > v8_RepresentationContexts, IfcUnitAssignment* v9_UnitsInContext) : IfcObjectDefinition((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } if (v6_LongName) { e->setArgument(5,(*v6_LongName)); } else { e->setArgument(5); } if (v7_Phase) { e->setArgument(6,(*v7_Phase)); } else { e->setArgument(6); } if (v8_RepresentationContexts) { e->setArgument(7,(*v8_RepresentationContexts)->generalize()); } else { e->setArgument(7); } e->setArgument(8,(v9_UnitsInContext)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcContextDependentUnit
-IfcLabel IfcContextDependentUnit::Name() { return *entity->getArgument(2); }
-void IfcContextDependentUnit::setName(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-IfcExternalReferenceRelationship::list IfcContextDependentUnit::HasExternalReference() { RETURN_INVERSE(IfcExternalReferenceRelationship) }
+std::string IfcContextDependentUnit::Name() const { return *entity->getArgument(2); }
+void IfcContextDependentUnit::setName(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+IfcExternalReferenceRelationship::list::ptr IfcContextDependentUnit::HasExternalReference() const { return entity->getInverse(Type::IfcExternalReferenceRelationship, 3)->as<IfcExternalReferenceRelationship>(); }
 bool IfcContextDependentUnit::is(Type::Enum v) const { return v == Type::IfcContextDependentUnit || IfcNamedUnit::is(v); }
 Type::Enum IfcContextDependentUnit::type() const { return Type::IfcContextDependentUnit; }
 Type::Enum IfcContextDependentUnit::Class() { return Type::IfcContextDependentUnit; }
-IfcContextDependentUnit::IfcContextDependentUnit(IfcAbstractEntityPtr e) : IfcNamedUnit((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcContextDependentUnit)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcContextDependentUnit::IfcContextDependentUnit(IfcDimensionalExponents* v1_Dimensions, IfcUnitEnum::IfcUnitEnum v2_UnitType, IfcLabel v3_Name) : IfcNamedUnit((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Dimensions)); e->setArgument(1,v2_UnitType,IfcUnitEnum::ToString(v2_UnitType)); e->setArgument(2,(v3_Name)); entity = e; EntityBuffer::Add(this); }
+IfcContextDependentUnit::IfcContextDependentUnit(IfcAbstractEntity* e) : IfcNamedUnit((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcContextDependentUnit)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcContextDependentUnit::IfcContextDependentUnit(IfcDimensionalExponents* v1_Dimensions, IfcUnitEnum::IfcUnitEnum v2_UnitType, std::string v3_Name) : IfcNamedUnit((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Dimensions)); e->setArgument(1,v2_UnitType,IfcUnitEnum::ToString(v2_UnitType)); e->setArgument(2,(v3_Name)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcControl
-bool IfcControl::hasIdentification() { return !entity->getArgument(5)->isNull(); }
-IfcIdentifier IfcControl::Identification() { return *entity->getArgument(5); }
-void IfcControl::setIdentification(IfcIdentifier v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-IfcRelAssignsToControl::list IfcControl::Controls() { RETURN_INVERSE(IfcRelAssignsToControl) }
+bool IfcControl::hasIdentification() const { return !entity->getArgument(5)->isNull(); }
+std::string IfcControl::Identification() const { return *entity->getArgument(5); }
+void IfcControl::setIdentification(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+IfcRelAssignsToControl::list::ptr IfcControl::Controls() const { return entity->getInverse(Type::IfcRelAssignsToControl, 6)->as<IfcRelAssignsToControl>(); }
 bool IfcControl::is(Type::Enum v) const { return v == Type::IfcControl || IfcObject::is(v); }
 Type::Enum IfcControl::type() const { return Type::IfcControl; }
 Type::Enum IfcControl::Class() { return Type::IfcControl; }
-IfcControl::IfcControl(IfcAbstractEntityPtr e) : IfcObject((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcControl)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcControl::IfcControl(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, boost::optional< IfcIdentifier > v6_Identification) : IfcObject((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } if (v6_Identification) { e->setArgument(5,(*v6_Identification)); } else { e->setArgument(5); } entity = e; EntityBuffer::Add(this); }
+IfcControl::IfcControl(IfcAbstractEntity* e) : IfcObject((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcControl)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcControl::IfcControl(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, boost::optional< std::string > v6_Identification) : IfcObject((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } if (v6_Identification) { e->setArgument(5,(*v6_Identification)); } else { e->setArgument(5); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcController
-bool IfcController::hasPredefinedType() { return !entity->getArgument(8)->isNull(); }
-IfcControllerTypeEnum::IfcControllerTypeEnum IfcController::PredefinedType() { return IfcControllerTypeEnum::FromString(*entity->getArgument(8)); }
+bool IfcController::hasPredefinedType() const { return !entity->getArgument(8)->isNull(); }
+IfcControllerTypeEnum::IfcControllerTypeEnum IfcController::PredefinedType() const { return IfcControllerTypeEnum::FromString(*entity->getArgument(8)); }
 void IfcController::setPredefinedType(IfcControllerTypeEnum::IfcControllerTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcControllerTypeEnum::ToString(v)); }
 bool IfcController::is(Type::Enum v) const { return v == Type::IfcController || IfcDistributionControlElement::is(v); }
 Type::Enum IfcController::type() const { return Type::IfcController; }
 Type::Enum IfcController::Class() { return Type::IfcController; }
-IfcController::IfcController(IfcAbstractEntityPtr e) : IfcDistributionControlElement((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcController)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcController::IfcController(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcControllerTypeEnum::IfcControllerTypeEnum > v9_PredefinedType) : IfcDistributionControlElement((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcControllerTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcController::IfcController(IfcAbstractEntity* e) : IfcDistributionControlElement((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcController)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcController::IfcController(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcControllerTypeEnum::IfcControllerTypeEnum > v9_PredefinedType) : IfcDistributionControlElement((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcControllerTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcControllerType
-IfcControllerTypeEnum::IfcControllerTypeEnum IfcControllerType::PredefinedType() { return IfcControllerTypeEnum::FromString(*entity->getArgument(9)); }
+IfcControllerTypeEnum::IfcControllerTypeEnum IfcControllerType::PredefinedType() const { return IfcControllerTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcControllerType::setPredefinedType(IfcControllerTypeEnum::IfcControllerTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcControllerTypeEnum::ToString(v)); }
 bool IfcControllerType::is(Type::Enum v) const { return v == Type::IfcControllerType || IfcDistributionControlElementType::is(v); }
 Type::Enum IfcControllerType::type() const { return Type::IfcControllerType; }
 Type::Enum IfcControllerType::Class() { return Type::IfcControllerType; }
-IfcControllerType::IfcControllerType(IfcAbstractEntityPtr e) : IfcDistributionControlElementType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcControllerType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcControllerType::IfcControllerType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcControllerTypeEnum::IfcControllerTypeEnum v10_PredefinedType) : IfcDistributionControlElementType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcControllerTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcControllerType::IfcControllerType(IfcAbstractEntity* e) : IfcDistributionControlElementType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcControllerType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcControllerType::IfcControllerType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcControllerTypeEnum::IfcControllerTypeEnum v10_PredefinedType) : IfcDistributionControlElementType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcControllerTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcConversionBasedUnit
-IfcLabel IfcConversionBasedUnit::Name() { return *entity->getArgument(2); }
-void IfcConversionBasedUnit::setName(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-IfcMeasureWithUnit* IfcConversionBasedUnit::ConversionFactor() { return (IfcMeasureWithUnit*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(3))); }
+std::string IfcConversionBasedUnit::Name() const { return *entity->getArgument(2); }
+void IfcConversionBasedUnit::setName(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+IfcMeasureWithUnit* IfcConversionBasedUnit::ConversionFactor() const { return (IfcMeasureWithUnit*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(3))); }
 void IfcConversionBasedUnit::setConversionFactor(IfcMeasureWithUnit* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-IfcExternalReferenceRelationship::list IfcConversionBasedUnit::HasExternalReference() { RETURN_INVERSE(IfcExternalReferenceRelationship) }
+IfcExternalReferenceRelationship::list::ptr IfcConversionBasedUnit::HasExternalReference() const { return entity->getInverse(Type::IfcExternalReferenceRelationship, 3)->as<IfcExternalReferenceRelationship>(); }
 bool IfcConversionBasedUnit::is(Type::Enum v) const { return v == Type::IfcConversionBasedUnit || IfcNamedUnit::is(v); }
 Type::Enum IfcConversionBasedUnit::type() const { return Type::IfcConversionBasedUnit; }
 Type::Enum IfcConversionBasedUnit::Class() { return Type::IfcConversionBasedUnit; }
-IfcConversionBasedUnit::IfcConversionBasedUnit(IfcAbstractEntityPtr e) : IfcNamedUnit((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcConversionBasedUnit)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcConversionBasedUnit::IfcConversionBasedUnit(IfcDimensionalExponents* v1_Dimensions, IfcUnitEnum::IfcUnitEnum v2_UnitType, IfcLabel v3_Name, IfcMeasureWithUnit* v4_ConversionFactor) : IfcNamedUnit((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Dimensions)); e->setArgument(1,v2_UnitType,IfcUnitEnum::ToString(v2_UnitType)); e->setArgument(2,(v3_Name)); e->setArgument(3,(v4_ConversionFactor)); entity = e; EntityBuffer::Add(this); }
+IfcConversionBasedUnit::IfcConversionBasedUnit(IfcAbstractEntity* e) : IfcNamedUnit((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcConversionBasedUnit)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcConversionBasedUnit::IfcConversionBasedUnit(IfcDimensionalExponents* v1_Dimensions, IfcUnitEnum::IfcUnitEnum v2_UnitType, std::string v3_Name, IfcMeasureWithUnit* v4_ConversionFactor) : IfcNamedUnit((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Dimensions)); e->setArgument(1,v2_UnitType,IfcUnitEnum::ToString(v2_UnitType)); e->setArgument(2,(v3_Name)); e->setArgument(3,(v4_ConversionFactor)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcConversionBasedUnitWithOffset
-IfcReal IfcConversionBasedUnitWithOffset::ConversionOffset() { return *entity->getArgument(4); }
-void IfcConversionBasedUnitWithOffset::setConversionOffset(IfcReal v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+double IfcConversionBasedUnitWithOffset::ConversionOffset() const { return *entity->getArgument(4); }
+void IfcConversionBasedUnitWithOffset::setConversionOffset(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
 bool IfcConversionBasedUnitWithOffset::is(Type::Enum v) const { return v == Type::IfcConversionBasedUnitWithOffset || IfcConversionBasedUnit::is(v); }
 Type::Enum IfcConversionBasedUnitWithOffset::type() const { return Type::IfcConversionBasedUnitWithOffset; }
 Type::Enum IfcConversionBasedUnitWithOffset::Class() { return Type::IfcConversionBasedUnitWithOffset; }
-IfcConversionBasedUnitWithOffset::IfcConversionBasedUnitWithOffset(IfcAbstractEntityPtr e) : IfcConversionBasedUnit((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcConversionBasedUnitWithOffset)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcConversionBasedUnitWithOffset::IfcConversionBasedUnitWithOffset(IfcDimensionalExponents* v1_Dimensions, IfcUnitEnum::IfcUnitEnum v2_UnitType, IfcLabel v3_Name, IfcMeasureWithUnit* v4_ConversionFactor, IfcReal v5_ConversionOffset) : IfcConversionBasedUnit((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Dimensions)); e->setArgument(1,v2_UnitType,IfcUnitEnum::ToString(v2_UnitType)); e->setArgument(2,(v3_Name)); e->setArgument(3,(v4_ConversionFactor)); e->setArgument(4,(v5_ConversionOffset)); entity = e; EntityBuffer::Add(this); }
+IfcConversionBasedUnitWithOffset::IfcConversionBasedUnitWithOffset(IfcAbstractEntity* e) : IfcConversionBasedUnit((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcConversionBasedUnitWithOffset)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcConversionBasedUnitWithOffset::IfcConversionBasedUnitWithOffset(IfcDimensionalExponents* v1_Dimensions, IfcUnitEnum::IfcUnitEnum v2_UnitType, std::string v3_Name, IfcMeasureWithUnit* v4_ConversionFactor, double v5_ConversionOffset) : IfcConversionBasedUnit((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Dimensions)); e->setArgument(1,v2_UnitType,IfcUnitEnum::ToString(v2_UnitType)); e->setArgument(2,(v3_Name)); e->setArgument(3,(v4_ConversionFactor)); e->setArgument(4,(v5_ConversionOffset)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcCooledBeam
-bool IfcCooledBeam::hasPredefinedType() { return !entity->getArgument(8)->isNull(); }
-IfcCooledBeamTypeEnum::IfcCooledBeamTypeEnum IfcCooledBeam::PredefinedType() { return IfcCooledBeamTypeEnum::FromString(*entity->getArgument(8)); }
+bool IfcCooledBeam::hasPredefinedType() const { return !entity->getArgument(8)->isNull(); }
+IfcCooledBeamTypeEnum::IfcCooledBeamTypeEnum IfcCooledBeam::PredefinedType() const { return IfcCooledBeamTypeEnum::FromString(*entity->getArgument(8)); }
 void IfcCooledBeam::setPredefinedType(IfcCooledBeamTypeEnum::IfcCooledBeamTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcCooledBeamTypeEnum::ToString(v)); }
 bool IfcCooledBeam::is(Type::Enum v) const { return v == Type::IfcCooledBeam || IfcEnergyConversionDevice::is(v); }
 Type::Enum IfcCooledBeam::type() const { return Type::IfcCooledBeam; }
 Type::Enum IfcCooledBeam::Class() { return Type::IfcCooledBeam; }
-IfcCooledBeam::IfcCooledBeam(IfcAbstractEntityPtr e) : IfcEnergyConversionDevice((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcCooledBeam)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcCooledBeam::IfcCooledBeam(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcCooledBeamTypeEnum::IfcCooledBeamTypeEnum > v9_PredefinedType) : IfcEnergyConversionDevice((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcCooledBeamTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcCooledBeam::IfcCooledBeam(IfcAbstractEntity* e) : IfcEnergyConversionDevice((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcCooledBeam)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcCooledBeam::IfcCooledBeam(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcCooledBeamTypeEnum::IfcCooledBeamTypeEnum > v9_PredefinedType) : IfcEnergyConversionDevice((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcCooledBeamTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcCooledBeamType
-IfcCooledBeamTypeEnum::IfcCooledBeamTypeEnum IfcCooledBeamType::PredefinedType() { return IfcCooledBeamTypeEnum::FromString(*entity->getArgument(9)); }
+IfcCooledBeamTypeEnum::IfcCooledBeamTypeEnum IfcCooledBeamType::PredefinedType() const { return IfcCooledBeamTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcCooledBeamType::setPredefinedType(IfcCooledBeamTypeEnum::IfcCooledBeamTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcCooledBeamTypeEnum::ToString(v)); }
 bool IfcCooledBeamType::is(Type::Enum v) const { return v == Type::IfcCooledBeamType || IfcEnergyConversionDeviceType::is(v); }
 Type::Enum IfcCooledBeamType::type() const { return Type::IfcCooledBeamType; }
 Type::Enum IfcCooledBeamType::Class() { return Type::IfcCooledBeamType; }
-IfcCooledBeamType::IfcCooledBeamType(IfcAbstractEntityPtr e) : IfcEnergyConversionDeviceType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcCooledBeamType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcCooledBeamType::IfcCooledBeamType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcCooledBeamTypeEnum::IfcCooledBeamTypeEnum v10_PredefinedType) : IfcEnergyConversionDeviceType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcCooledBeamTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcCooledBeamType::IfcCooledBeamType(IfcAbstractEntity* e) : IfcEnergyConversionDeviceType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcCooledBeamType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcCooledBeamType::IfcCooledBeamType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcCooledBeamTypeEnum::IfcCooledBeamTypeEnum v10_PredefinedType) : IfcEnergyConversionDeviceType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcCooledBeamTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcCoolingTower
-bool IfcCoolingTower::hasPredefinedType() { return !entity->getArgument(8)->isNull(); }
-IfcCoolingTowerTypeEnum::IfcCoolingTowerTypeEnum IfcCoolingTower::PredefinedType() { return IfcCoolingTowerTypeEnum::FromString(*entity->getArgument(8)); }
+bool IfcCoolingTower::hasPredefinedType() const { return !entity->getArgument(8)->isNull(); }
+IfcCoolingTowerTypeEnum::IfcCoolingTowerTypeEnum IfcCoolingTower::PredefinedType() const { return IfcCoolingTowerTypeEnum::FromString(*entity->getArgument(8)); }
 void IfcCoolingTower::setPredefinedType(IfcCoolingTowerTypeEnum::IfcCoolingTowerTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcCoolingTowerTypeEnum::ToString(v)); }
 bool IfcCoolingTower::is(Type::Enum v) const { return v == Type::IfcCoolingTower || IfcEnergyConversionDevice::is(v); }
 Type::Enum IfcCoolingTower::type() const { return Type::IfcCoolingTower; }
 Type::Enum IfcCoolingTower::Class() { return Type::IfcCoolingTower; }
-IfcCoolingTower::IfcCoolingTower(IfcAbstractEntityPtr e) : IfcEnergyConversionDevice((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcCoolingTower)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcCoolingTower::IfcCoolingTower(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcCoolingTowerTypeEnum::IfcCoolingTowerTypeEnum > v9_PredefinedType) : IfcEnergyConversionDevice((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcCoolingTowerTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcCoolingTower::IfcCoolingTower(IfcAbstractEntity* e) : IfcEnergyConversionDevice((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcCoolingTower)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcCoolingTower::IfcCoolingTower(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcCoolingTowerTypeEnum::IfcCoolingTowerTypeEnum > v9_PredefinedType) : IfcEnergyConversionDevice((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcCoolingTowerTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcCoolingTowerType
-IfcCoolingTowerTypeEnum::IfcCoolingTowerTypeEnum IfcCoolingTowerType::PredefinedType() { return IfcCoolingTowerTypeEnum::FromString(*entity->getArgument(9)); }
+IfcCoolingTowerTypeEnum::IfcCoolingTowerTypeEnum IfcCoolingTowerType::PredefinedType() const { return IfcCoolingTowerTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcCoolingTowerType::setPredefinedType(IfcCoolingTowerTypeEnum::IfcCoolingTowerTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcCoolingTowerTypeEnum::ToString(v)); }
 bool IfcCoolingTowerType::is(Type::Enum v) const { return v == Type::IfcCoolingTowerType || IfcEnergyConversionDeviceType::is(v); }
 Type::Enum IfcCoolingTowerType::type() const { return Type::IfcCoolingTowerType; }
 Type::Enum IfcCoolingTowerType::Class() { return Type::IfcCoolingTowerType; }
-IfcCoolingTowerType::IfcCoolingTowerType(IfcAbstractEntityPtr e) : IfcEnergyConversionDeviceType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcCoolingTowerType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcCoolingTowerType::IfcCoolingTowerType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcCoolingTowerTypeEnum::IfcCoolingTowerTypeEnum v10_PredefinedType) : IfcEnergyConversionDeviceType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcCoolingTowerTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcCoolingTowerType::IfcCoolingTowerType(IfcAbstractEntity* e) : IfcEnergyConversionDeviceType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcCoolingTowerType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcCoolingTowerType::IfcCoolingTowerType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcCoolingTowerTypeEnum::IfcCoolingTowerTypeEnum v10_PredefinedType) : IfcEnergyConversionDeviceType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcCoolingTowerTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcCoordinateOperation
-IfcCoordinateReferenceSystemSelect IfcCoordinateOperation::SourceCRS() { return *entity->getArgument(0); }
-void IfcCoordinateOperation::setSourceCRS(IfcCoordinateReferenceSystemSelect v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-IfcCoordinateReferenceSystem* IfcCoordinateOperation::TargetCRS() { return (IfcCoordinateReferenceSystem*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(1))); }
+IfcCoordinateReferenceSystemSelect* IfcCoordinateOperation::SourceCRS() const { return (IfcCoordinateReferenceSystemSelect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(0))); }
+void IfcCoordinateOperation::setSourceCRS(IfcCoordinateReferenceSystemSelect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+IfcCoordinateReferenceSystem* IfcCoordinateOperation::TargetCRS() const { return (IfcCoordinateReferenceSystem*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(1))); }
 void IfcCoordinateOperation::setTargetCRS(IfcCoordinateReferenceSystem* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
 bool IfcCoordinateOperation::is(Type::Enum v) const { return v == Type::IfcCoordinateOperation; }
 Type::Enum IfcCoordinateOperation::type() const { return Type::IfcCoordinateOperation; }
 Type::Enum IfcCoordinateOperation::Class() { return Type::IfcCoordinateOperation; }
-IfcCoordinateOperation::IfcCoordinateOperation(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcCoordinateOperation)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcCoordinateOperation::IfcCoordinateOperation(IfcCoordinateReferenceSystemSelect v1_SourceCRS, IfcCoordinateReferenceSystem* v2_TargetCRS) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_SourceCRS)); e->setArgument(1,(v2_TargetCRS)); entity = e; EntityBuffer::Add(this); }
+IfcCoordinateOperation::IfcCoordinateOperation(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcCoordinateOperation)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcCoordinateOperation::IfcCoordinateOperation(IfcCoordinateReferenceSystemSelect* v1_SourceCRS, IfcCoordinateReferenceSystem* v2_TargetCRS) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_SourceCRS)); e->setArgument(1,(v2_TargetCRS)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcCoordinateReferenceSystem
-bool IfcCoordinateReferenceSystem::hasName() { return !entity->getArgument(0)->isNull(); }
-IfcLabel IfcCoordinateReferenceSystem::Name() { return *entity->getArgument(0); }
-void IfcCoordinateReferenceSystem::setName(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-bool IfcCoordinateReferenceSystem::hasDescription() { return !entity->getArgument(1)->isNull(); }
-IfcText IfcCoordinateReferenceSystem::Description() { return *entity->getArgument(1); }
-void IfcCoordinateReferenceSystem::setDescription(IfcText v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-IfcIdentifier IfcCoordinateReferenceSystem::GeodeticDatum() { return *entity->getArgument(2); }
-void IfcCoordinateReferenceSystem::setGeodeticDatum(IfcIdentifier v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-bool IfcCoordinateReferenceSystem::hasVerticalDatum() { return !entity->getArgument(3)->isNull(); }
-IfcIdentifier IfcCoordinateReferenceSystem::VerticalDatum() { return *entity->getArgument(3); }
-void IfcCoordinateReferenceSystem::setVerticalDatum(IfcIdentifier v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+bool IfcCoordinateReferenceSystem::hasName() const { return !entity->getArgument(0)->isNull(); }
+std::string IfcCoordinateReferenceSystem::Name() const { return *entity->getArgument(0); }
+void IfcCoordinateReferenceSystem::setName(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+bool IfcCoordinateReferenceSystem::hasDescription() const { return !entity->getArgument(1)->isNull(); }
+std::string IfcCoordinateReferenceSystem::Description() const { return *entity->getArgument(1); }
+void IfcCoordinateReferenceSystem::setDescription(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+std::string IfcCoordinateReferenceSystem::GeodeticDatum() const { return *entity->getArgument(2); }
+void IfcCoordinateReferenceSystem::setGeodeticDatum(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+bool IfcCoordinateReferenceSystem::hasVerticalDatum() const { return !entity->getArgument(3)->isNull(); }
+std::string IfcCoordinateReferenceSystem::VerticalDatum() const { return *entity->getArgument(3); }
+void IfcCoordinateReferenceSystem::setVerticalDatum(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
 bool IfcCoordinateReferenceSystem::is(Type::Enum v) const { return v == Type::IfcCoordinateReferenceSystem; }
 Type::Enum IfcCoordinateReferenceSystem::type() const { return Type::IfcCoordinateReferenceSystem; }
 Type::Enum IfcCoordinateReferenceSystem::Class() { return Type::IfcCoordinateReferenceSystem; }
-IfcCoordinateReferenceSystem::IfcCoordinateReferenceSystem(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcCoordinateReferenceSystem)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcCoordinateReferenceSystem::IfcCoordinateReferenceSystem(boost::optional< IfcLabel > v1_Name, boost::optional< IfcText > v2_Description, IfcIdentifier v3_GeodeticDatum, boost::optional< IfcIdentifier > v4_VerticalDatum) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_GeodeticDatum)); if (v4_VerticalDatum) { e->setArgument(3,(*v4_VerticalDatum)); } else { e->setArgument(3); } entity = e; EntityBuffer::Add(this); }
+IfcCoordinateReferenceSystem::IfcCoordinateReferenceSystem(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcCoordinateReferenceSystem)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcCoordinateReferenceSystem::IfcCoordinateReferenceSystem(boost::optional< std::string > v1_Name, boost::optional< std::string > v2_Description, std::string v3_GeodeticDatum, boost::optional< std::string > v4_VerticalDatum) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_GeodeticDatum)); if (v4_VerticalDatum) { e->setArgument(3,(*v4_VerticalDatum)); } else { e->setArgument(3); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcCostItem
-bool IfcCostItem::hasPredefinedType() { return !entity->getArgument(6)->isNull(); }
-IfcCostItemTypeEnum::IfcCostItemTypeEnum IfcCostItem::PredefinedType() { return IfcCostItemTypeEnum::FromString(*entity->getArgument(6)); }
+bool IfcCostItem::hasPredefinedType() const { return !entity->getArgument(6)->isNull(); }
+IfcCostItemTypeEnum::IfcCostItemTypeEnum IfcCostItem::PredefinedType() const { return IfcCostItemTypeEnum::FromString(*entity->getArgument(6)); }
 void IfcCostItem::setPredefinedType(IfcCostItemTypeEnum::IfcCostItemTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v,IfcCostItemTypeEnum::ToString(v)); }
-bool IfcCostItem::hasCostValues() { return !entity->getArgument(7)->isNull(); }
-SHARED_PTR< IfcTemplatedEntityList< IfcCostValue > > IfcCostItem::CostValues() { RETURN_AS_LIST(IfcCostValue,7) }
-void IfcCostItem::setCostValues(SHARED_PTR< IfcTemplatedEntityList< IfcCostValue > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v->generalize()); }
-bool IfcCostItem::hasCostQuantities() { return !entity->getArgument(8)->isNull(); }
-SHARED_PTR< IfcTemplatedEntityList< IfcPhysicalQuantity > > IfcCostItem::CostQuantities() { RETURN_AS_LIST(IfcPhysicalQuantity,8) }
-void IfcCostItem::setCostQuantities(SHARED_PTR< IfcTemplatedEntityList< IfcPhysicalQuantity > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v->generalize()); }
+bool IfcCostItem::hasCostValues() const { return !entity->getArgument(7)->isNull(); }
+IfcTemplatedEntityList< IfcCostValue >::ptr IfcCostItem::CostValues() const { IfcEntityList::ptr es = *entity->getArgument(7); return es->as<IfcCostValue>(); }
+void IfcCostItem::setCostValues(IfcTemplatedEntityList< IfcCostValue >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v->generalize()); }
+bool IfcCostItem::hasCostQuantities() const { return !entity->getArgument(8)->isNull(); }
+IfcTemplatedEntityList< IfcPhysicalQuantity >::ptr IfcCostItem::CostQuantities() const { IfcEntityList::ptr es = *entity->getArgument(8); return es->as<IfcPhysicalQuantity>(); }
+void IfcCostItem::setCostQuantities(IfcTemplatedEntityList< IfcPhysicalQuantity >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v->generalize()); }
 bool IfcCostItem::is(Type::Enum v) const { return v == Type::IfcCostItem || IfcControl::is(v); }
 Type::Enum IfcCostItem::type() const { return Type::IfcCostItem; }
 Type::Enum IfcCostItem::Class() { return Type::IfcCostItem; }
-IfcCostItem::IfcCostItem(IfcAbstractEntityPtr e) : IfcControl((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcCostItem)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcCostItem::IfcCostItem(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, boost::optional< IfcIdentifier > v6_Identification, boost::optional< IfcCostItemTypeEnum::IfcCostItemTypeEnum > v7_PredefinedType, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcCostValue > > > v8_CostValues, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPhysicalQuantity > > > v9_CostQuantities) : IfcControl((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } if (v6_Identification) { e->setArgument(5,(*v6_Identification)); } else { e->setArgument(5); } if (v7_PredefinedType) { e->setArgument(6,*v7_PredefinedType,IfcCostItemTypeEnum::ToString(*v7_PredefinedType)); } else { e->setArgument(6); } if (v8_CostValues) { e->setArgument(7,(*v8_CostValues)->generalize()); } else { e->setArgument(7); } if (v9_CostQuantities) { e->setArgument(8,(*v9_CostQuantities)->generalize()); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcCostItem::IfcCostItem(IfcAbstractEntity* e) : IfcControl((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcCostItem)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcCostItem::IfcCostItem(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, boost::optional< std::string > v6_Identification, boost::optional< IfcCostItemTypeEnum::IfcCostItemTypeEnum > v7_PredefinedType, boost::optional< IfcTemplatedEntityList< IfcCostValue >::ptr > v8_CostValues, boost::optional< IfcTemplatedEntityList< IfcPhysicalQuantity >::ptr > v9_CostQuantities) : IfcControl((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } if (v6_Identification) { e->setArgument(5,(*v6_Identification)); } else { e->setArgument(5); } if (v7_PredefinedType) { e->setArgument(6,*v7_PredefinedType,IfcCostItemTypeEnum::ToString(*v7_PredefinedType)); } else { e->setArgument(6); } if (v8_CostValues) { e->setArgument(7,(*v8_CostValues)->generalize()); } else { e->setArgument(7); } if (v9_CostQuantities) { e->setArgument(8,(*v9_CostQuantities)->generalize()); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcCostSchedule
-bool IfcCostSchedule::hasPredefinedType() { return !entity->getArgument(6)->isNull(); }
-IfcCostScheduleTypeEnum::IfcCostScheduleTypeEnum IfcCostSchedule::PredefinedType() { return IfcCostScheduleTypeEnum::FromString(*entity->getArgument(6)); }
+bool IfcCostSchedule::hasPredefinedType() const { return !entity->getArgument(6)->isNull(); }
+IfcCostScheduleTypeEnum::IfcCostScheduleTypeEnum IfcCostSchedule::PredefinedType() const { return IfcCostScheduleTypeEnum::FromString(*entity->getArgument(6)); }
 void IfcCostSchedule::setPredefinedType(IfcCostScheduleTypeEnum::IfcCostScheduleTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v,IfcCostScheduleTypeEnum::ToString(v)); }
-bool IfcCostSchedule::hasStatus() { return !entity->getArgument(7)->isNull(); }
-IfcLabel IfcCostSchedule::Status() { return *entity->getArgument(7); }
-void IfcCostSchedule::setStatus(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
-bool IfcCostSchedule::hasSubmittedOn() { return !entity->getArgument(8)->isNull(); }
-IfcDateTime IfcCostSchedule::SubmittedOn() { return *entity->getArgument(8); }
-void IfcCostSchedule::setSubmittedOn(IfcDateTime v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
-bool IfcCostSchedule::hasUpdateDate() { return !entity->getArgument(9)->isNull(); }
-IfcDateTime IfcCostSchedule::UpdateDate() { return *entity->getArgument(9); }
-void IfcCostSchedule::setUpdateDate(IfcDateTime v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
+bool IfcCostSchedule::hasStatus() const { return !entity->getArgument(7)->isNull(); }
+std::string IfcCostSchedule::Status() const { return *entity->getArgument(7); }
+void IfcCostSchedule::setStatus(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
+bool IfcCostSchedule::hasSubmittedOn() const { return !entity->getArgument(8)->isNull(); }
+std::string IfcCostSchedule::SubmittedOn() const { return *entity->getArgument(8); }
+void IfcCostSchedule::setSubmittedOn(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
+bool IfcCostSchedule::hasUpdateDate() const { return !entity->getArgument(9)->isNull(); }
+std::string IfcCostSchedule::UpdateDate() const { return *entity->getArgument(9); }
+void IfcCostSchedule::setUpdateDate(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
 bool IfcCostSchedule::is(Type::Enum v) const { return v == Type::IfcCostSchedule || IfcControl::is(v); }
 Type::Enum IfcCostSchedule::type() const { return Type::IfcCostSchedule; }
 Type::Enum IfcCostSchedule::Class() { return Type::IfcCostSchedule; }
-IfcCostSchedule::IfcCostSchedule(IfcAbstractEntityPtr e) : IfcControl((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcCostSchedule)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcCostSchedule::IfcCostSchedule(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, boost::optional< IfcIdentifier > v6_Identification, boost::optional< IfcCostScheduleTypeEnum::IfcCostScheduleTypeEnum > v7_PredefinedType, boost::optional< IfcLabel > v8_Status, boost::optional< IfcDateTime > v9_SubmittedOn, boost::optional< IfcDateTime > v10_UpdateDate) : IfcControl((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } if (v6_Identification) { e->setArgument(5,(*v6_Identification)); } else { e->setArgument(5); } if (v7_PredefinedType) { e->setArgument(6,*v7_PredefinedType,IfcCostScheduleTypeEnum::ToString(*v7_PredefinedType)); } else { e->setArgument(6); } if (v8_Status) { e->setArgument(7,(*v8_Status)); } else { e->setArgument(7); } if (v9_SubmittedOn) { e->setArgument(8,(*v9_SubmittedOn)); } else { e->setArgument(8); } if (v10_UpdateDate) { e->setArgument(9,(*v10_UpdateDate)); } else { e->setArgument(9); } entity = e; EntityBuffer::Add(this); }
+IfcCostSchedule::IfcCostSchedule(IfcAbstractEntity* e) : IfcControl((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcCostSchedule)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcCostSchedule::IfcCostSchedule(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, boost::optional< std::string > v6_Identification, boost::optional< IfcCostScheduleTypeEnum::IfcCostScheduleTypeEnum > v7_PredefinedType, boost::optional< std::string > v8_Status, boost::optional< std::string > v9_SubmittedOn, boost::optional< std::string > v10_UpdateDate) : IfcControl((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } if (v6_Identification) { e->setArgument(5,(*v6_Identification)); } else { e->setArgument(5); } if (v7_PredefinedType) { e->setArgument(6,*v7_PredefinedType,IfcCostScheduleTypeEnum::ToString(*v7_PredefinedType)); } else { e->setArgument(6); } if (v8_Status) { e->setArgument(7,(*v8_Status)); } else { e->setArgument(7); } if (v9_SubmittedOn) { e->setArgument(8,(*v9_SubmittedOn)); } else { e->setArgument(8); } if (v10_UpdateDate) { e->setArgument(9,(*v10_UpdateDate)); } else { e->setArgument(9); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcCostValue
 bool IfcCostValue::is(Type::Enum v) const { return v == Type::IfcCostValue || IfcAppliedValue::is(v); }
 Type::Enum IfcCostValue::type() const { return Type::IfcCostValue; }
 Type::Enum IfcCostValue::Class() { return Type::IfcCostValue; }
-IfcCostValue::IfcCostValue(IfcAbstractEntityPtr e) : IfcAppliedValue((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcCostValue)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcCostValue::IfcCostValue(boost::optional< IfcLabel > v1_Name, boost::optional< IfcText > v2_Description, boost::optional< IfcAppliedValueSelect > v3_AppliedValue, IfcMeasureWithUnit* v4_UnitBasis, boost::optional< IfcDate > v5_ApplicableDate, boost::optional< IfcDate > v6_FixedUntilDate, boost::optional< IfcLabel > v7_Category, boost::optional< IfcLabel > v8_Condition, boost::optional< IfcArithmeticOperatorEnum::IfcArithmeticOperatorEnum > v9_ArithmeticOperator, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcAppliedValue > > > v10_Components) : IfcAppliedValue((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } if (v3_AppliedValue) { e->setArgument(2,(*v3_AppliedValue)); } else { e->setArgument(2); } e->setArgument(3,(v4_UnitBasis)); if (v5_ApplicableDate) { e->setArgument(4,(*v5_ApplicableDate)); } else { e->setArgument(4); } if (v6_FixedUntilDate) { e->setArgument(5,(*v6_FixedUntilDate)); } else { e->setArgument(5); } if (v7_Category) { e->setArgument(6,(*v7_Category)); } else { e->setArgument(6); } if (v8_Condition) { e->setArgument(7,(*v8_Condition)); } else { e->setArgument(7); } if (v9_ArithmeticOperator) { e->setArgument(8,*v9_ArithmeticOperator,IfcArithmeticOperatorEnum::ToString(*v9_ArithmeticOperator)); } else { e->setArgument(8); } if (v10_Components) { e->setArgument(9,(*v10_Components)->generalize()); } else { e->setArgument(9); } entity = e; EntityBuffer::Add(this); }
+IfcCostValue::IfcCostValue(IfcAbstractEntity* e) : IfcAppliedValue((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcCostValue)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcCostValue::IfcCostValue(boost::optional< std::string > v1_Name, boost::optional< std::string > v2_Description, IfcAppliedValueSelect* v3_AppliedValue, IfcMeasureWithUnit* v4_UnitBasis, boost::optional< std::string > v5_ApplicableDate, boost::optional< std::string > v6_FixedUntilDate, boost::optional< std::string > v7_Category, boost::optional< std::string > v8_Condition, boost::optional< IfcArithmeticOperatorEnum::IfcArithmeticOperatorEnum > v9_ArithmeticOperator, boost::optional< IfcTemplatedEntityList< IfcAppliedValue >::ptr > v10_Components) : IfcAppliedValue((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_AppliedValue)); e->setArgument(3,(v4_UnitBasis)); if (v5_ApplicableDate) { e->setArgument(4,(*v5_ApplicableDate)); } else { e->setArgument(4); } if (v6_FixedUntilDate) { e->setArgument(5,(*v6_FixedUntilDate)); } else { e->setArgument(5); } if (v7_Category) { e->setArgument(6,(*v7_Category)); } else { e->setArgument(6); } if (v8_Condition) { e->setArgument(7,(*v8_Condition)); } else { e->setArgument(7); } if (v9_ArithmeticOperator) { e->setArgument(8,*v9_ArithmeticOperator,IfcArithmeticOperatorEnum::ToString(*v9_ArithmeticOperator)); } else { e->setArgument(8); } if (v10_Components) { e->setArgument(9,(*v10_Components)->generalize()); } else { e->setArgument(9); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcCovering
-bool IfcCovering::hasPredefinedType() { return !entity->getArgument(8)->isNull(); }
-IfcCoveringTypeEnum::IfcCoveringTypeEnum IfcCovering::PredefinedType() { return IfcCoveringTypeEnum::FromString(*entity->getArgument(8)); }
+bool IfcCovering::hasPredefinedType() const { return !entity->getArgument(8)->isNull(); }
+IfcCoveringTypeEnum::IfcCoveringTypeEnum IfcCovering::PredefinedType() const { return IfcCoveringTypeEnum::FromString(*entity->getArgument(8)); }
 void IfcCovering::setPredefinedType(IfcCoveringTypeEnum::IfcCoveringTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcCoveringTypeEnum::ToString(v)); }
-IfcRelCoversSpaces::list IfcCovering::CoversSpaces() { RETURN_INVERSE(IfcRelCoversSpaces) }
-IfcRelCoversBldgElements::list IfcCovering::CoversElements() { RETURN_INVERSE(IfcRelCoversBldgElements) }
+IfcRelCoversSpaces::list::ptr IfcCovering::CoversSpaces() const { return entity->getInverse(Type::IfcRelCoversSpaces, 5)->as<IfcRelCoversSpaces>(); }
+IfcRelCoversBldgElements::list::ptr IfcCovering::CoversElements() const { return entity->getInverse(Type::IfcRelCoversBldgElements, 5)->as<IfcRelCoversBldgElements>(); }
 bool IfcCovering::is(Type::Enum v) const { return v == Type::IfcCovering || IfcBuildingElement::is(v); }
 Type::Enum IfcCovering::type() const { return Type::IfcCovering; }
 Type::Enum IfcCovering::Class() { return Type::IfcCovering; }
-IfcCovering::IfcCovering(IfcAbstractEntityPtr e) : IfcBuildingElement((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcCovering)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcCovering::IfcCovering(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcCoveringTypeEnum::IfcCoveringTypeEnum > v9_PredefinedType) : IfcBuildingElement((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcCoveringTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcCovering::IfcCovering(IfcAbstractEntity* e) : IfcBuildingElement((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcCovering)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcCovering::IfcCovering(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcCoveringTypeEnum::IfcCoveringTypeEnum > v9_PredefinedType) : IfcBuildingElement((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcCoveringTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcCoveringType
-IfcCoveringTypeEnum::IfcCoveringTypeEnum IfcCoveringType::PredefinedType() { return IfcCoveringTypeEnum::FromString(*entity->getArgument(9)); }
+IfcCoveringTypeEnum::IfcCoveringTypeEnum IfcCoveringType::PredefinedType() const { return IfcCoveringTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcCoveringType::setPredefinedType(IfcCoveringTypeEnum::IfcCoveringTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcCoveringTypeEnum::ToString(v)); }
 bool IfcCoveringType::is(Type::Enum v) const { return v == Type::IfcCoveringType || IfcBuildingElementType::is(v); }
 Type::Enum IfcCoveringType::type() const { return Type::IfcCoveringType; }
 Type::Enum IfcCoveringType::Class() { return Type::IfcCoveringType; }
-IfcCoveringType::IfcCoveringType(IfcAbstractEntityPtr e) : IfcBuildingElementType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcCoveringType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcCoveringType::IfcCoveringType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcCoveringTypeEnum::IfcCoveringTypeEnum v10_PredefinedType) : IfcBuildingElementType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcCoveringTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcCoveringType::IfcCoveringType(IfcAbstractEntity* e) : IfcBuildingElementType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcCoveringType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcCoveringType::IfcCoveringType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcCoveringTypeEnum::IfcCoveringTypeEnum v10_PredefinedType) : IfcBuildingElementType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcCoveringTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcCrewResource
-bool IfcCrewResource::hasPredefinedType() { return !entity->getArgument(10)->isNull(); }
-IfcCrewResourceTypeEnum::IfcCrewResourceTypeEnum IfcCrewResource::PredefinedType() { return IfcCrewResourceTypeEnum::FromString(*entity->getArgument(10)); }
+bool IfcCrewResource::hasPredefinedType() const { return !entity->getArgument(10)->isNull(); }
+IfcCrewResourceTypeEnum::IfcCrewResourceTypeEnum IfcCrewResource::PredefinedType() const { return IfcCrewResourceTypeEnum::FromString(*entity->getArgument(10)); }
 void IfcCrewResource::setPredefinedType(IfcCrewResourceTypeEnum::IfcCrewResourceTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v,IfcCrewResourceTypeEnum::ToString(v)); }
 bool IfcCrewResource::is(Type::Enum v) const { return v == Type::IfcCrewResource || IfcConstructionResource::is(v); }
 Type::Enum IfcCrewResource::type() const { return Type::IfcCrewResource; }
 Type::Enum IfcCrewResource::Class() { return Type::IfcCrewResource; }
-IfcCrewResource::IfcCrewResource(IfcAbstractEntityPtr e) : IfcConstructionResource((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcCrewResource)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcCrewResource::IfcCrewResource(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, boost::optional< IfcIdentifier > v6_Identification, boost::optional< IfcText > v7_LongDescription, IfcResourceTime* v8_Usage, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcAppliedValue > > > v9_BaseCosts, IfcPhysicalQuantity* v10_BaseQuantity, boost::optional< IfcCrewResourceTypeEnum::IfcCrewResourceTypeEnum > v11_PredefinedType) : IfcConstructionResource((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } if (v6_Identification) { e->setArgument(5,(*v6_Identification)); } else { e->setArgument(5); } if (v7_LongDescription) { e->setArgument(6,(*v7_LongDescription)); } else { e->setArgument(6); } e->setArgument(7,(v8_Usage)); if (v9_BaseCosts) { e->setArgument(8,(*v9_BaseCosts)->generalize()); } else { e->setArgument(8); } e->setArgument(9,(v10_BaseQuantity)); if (v11_PredefinedType) { e->setArgument(10,*v11_PredefinedType,IfcCrewResourceTypeEnum::ToString(*v11_PredefinedType)); } else { e->setArgument(10); } entity = e; EntityBuffer::Add(this); }
+IfcCrewResource::IfcCrewResource(IfcAbstractEntity* e) : IfcConstructionResource((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcCrewResource)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcCrewResource::IfcCrewResource(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, boost::optional< std::string > v6_Identification, boost::optional< std::string > v7_LongDescription, IfcResourceTime* v8_Usage, boost::optional< IfcTemplatedEntityList< IfcAppliedValue >::ptr > v9_BaseCosts, IfcPhysicalQuantity* v10_BaseQuantity, boost::optional< IfcCrewResourceTypeEnum::IfcCrewResourceTypeEnum > v11_PredefinedType) : IfcConstructionResource((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } if (v6_Identification) { e->setArgument(5,(*v6_Identification)); } else { e->setArgument(5); } if (v7_LongDescription) { e->setArgument(6,(*v7_LongDescription)); } else { e->setArgument(6); } e->setArgument(7,(v8_Usage)); if (v9_BaseCosts) { e->setArgument(8,(*v9_BaseCosts)->generalize()); } else { e->setArgument(8); } e->setArgument(9,(v10_BaseQuantity)); if (v11_PredefinedType) { e->setArgument(10,*v11_PredefinedType,IfcCrewResourceTypeEnum::ToString(*v11_PredefinedType)); } else { e->setArgument(10); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcCrewResourceType
-IfcCrewResourceTypeEnum::IfcCrewResourceTypeEnum IfcCrewResourceType::PredefinedType() { return IfcCrewResourceTypeEnum::FromString(*entity->getArgument(11)); }
+IfcCrewResourceTypeEnum::IfcCrewResourceTypeEnum IfcCrewResourceType::PredefinedType() const { return IfcCrewResourceTypeEnum::FromString(*entity->getArgument(11)); }
 void IfcCrewResourceType::setPredefinedType(IfcCrewResourceTypeEnum::IfcCrewResourceTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(11,v,IfcCrewResourceTypeEnum::ToString(v)); }
 bool IfcCrewResourceType::is(Type::Enum v) const { return v == Type::IfcCrewResourceType || IfcConstructionResourceType::is(v); }
 Type::Enum IfcCrewResourceType::type() const { return Type::IfcCrewResourceType; }
 Type::Enum IfcCrewResourceType::Class() { return Type::IfcCrewResourceType; }
-IfcCrewResourceType::IfcCrewResourceType(IfcAbstractEntityPtr e) : IfcConstructionResourceType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcCrewResourceType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcCrewResourceType::IfcCrewResourceType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< IfcIdentifier > v7_Identification, boost::optional< IfcText > v8_LongDescription, boost::optional< IfcLabel > v9_ResourceType, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcAppliedValue > > > v10_BaseCosts, IfcPhysicalQuantity* v11_BaseQuantity, IfcCrewResourceTypeEnum::IfcCrewResourceTypeEnum v12_PredefinedType) : IfcConstructionResourceType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_Identification) { e->setArgument(6,(*v7_Identification)); } else { e->setArgument(6); } if (v8_LongDescription) { e->setArgument(7,(*v8_LongDescription)); } else { e->setArgument(7); } if (v9_ResourceType) { e->setArgument(8,(*v9_ResourceType)); } else { e->setArgument(8); } if (v10_BaseCosts) { e->setArgument(9,(*v10_BaseCosts)->generalize()); } else { e->setArgument(9); } e->setArgument(10,(v11_BaseQuantity)); e->setArgument(11,v12_PredefinedType,IfcCrewResourceTypeEnum::ToString(v12_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcCrewResourceType::IfcCrewResourceType(IfcAbstractEntity* e) : IfcConstructionResourceType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcCrewResourceType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcCrewResourceType::IfcCrewResourceType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< std::string > v7_Identification, boost::optional< std::string > v8_LongDescription, boost::optional< std::string > v9_ResourceType, boost::optional< IfcTemplatedEntityList< IfcAppliedValue >::ptr > v10_BaseCosts, IfcPhysicalQuantity* v11_BaseQuantity, IfcCrewResourceTypeEnum::IfcCrewResourceTypeEnum v12_PredefinedType) : IfcConstructionResourceType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_Identification) { e->setArgument(6,(*v7_Identification)); } else { e->setArgument(6); } if (v8_LongDescription) { e->setArgument(7,(*v8_LongDescription)); } else { e->setArgument(7); } if (v9_ResourceType) { e->setArgument(8,(*v9_ResourceType)); } else { e->setArgument(8); } if (v10_BaseCosts) { e->setArgument(9,(*v10_BaseCosts)->generalize()); } else { e->setArgument(9); } e->setArgument(10,(v11_BaseQuantity)); e->setArgument(11,v12_PredefinedType,IfcCrewResourceTypeEnum::ToString(v12_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcCsgPrimitive3D
-IfcAxis2Placement3D* IfcCsgPrimitive3D::Position() { return (IfcAxis2Placement3D*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(0))); }
+IfcAxis2Placement3D* IfcCsgPrimitive3D::Position() const { return (IfcAxis2Placement3D*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(0))); }
 void IfcCsgPrimitive3D::setPosition(IfcAxis2Placement3D* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
 bool IfcCsgPrimitive3D::is(Type::Enum v) const { return v == Type::IfcCsgPrimitive3D || IfcGeometricRepresentationItem::is(v); }
 Type::Enum IfcCsgPrimitive3D::type() const { return Type::IfcCsgPrimitive3D; }
 Type::Enum IfcCsgPrimitive3D::Class() { return Type::IfcCsgPrimitive3D; }
-IfcCsgPrimitive3D::IfcCsgPrimitive3D(IfcAbstractEntityPtr e) : IfcGeometricRepresentationItem((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcCsgPrimitive3D)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcCsgPrimitive3D::IfcCsgPrimitive3D(IfcAxis2Placement3D* v1_Position) : IfcGeometricRepresentationItem((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Position)); entity = e; EntityBuffer::Add(this); }
+IfcCsgPrimitive3D::IfcCsgPrimitive3D(IfcAbstractEntity* e) : IfcGeometricRepresentationItem((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcCsgPrimitive3D)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcCsgPrimitive3D::IfcCsgPrimitive3D(IfcAxis2Placement3D* v1_Position) : IfcGeometricRepresentationItem((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Position)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcCsgSolid
-IfcCsgSelect IfcCsgSolid::TreeRootExpression() { return *entity->getArgument(0); }
-void IfcCsgSolid::setTreeRootExpression(IfcCsgSelect v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+IfcCsgSelect* IfcCsgSolid::TreeRootExpression() const { return (IfcCsgSelect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(0))); }
+void IfcCsgSolid::setTreeRootExpression(IfcCsgSelect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
 bool IfcCsgSolid::is(Type::Enum v) const { return v == Type::IfcCsgSolid || IfcSolidModel::is(v); }
 Type::Enum IfcCsgSolid::type() const { return Type::IfcCsgSolid; }
 Type::Enum IfcCsgSolid::Class() { return Type::IfcCsgSolid; }
-IfcCsgSolid::IfcCsgSolid(IfcAbstractEntityPtr e) : IfcSolidModel((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcCsgSolid)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcCsgSolid::IfcCsgSolid(IfcCsgSelect v1_TreeRootExpression) : IfcSolidModel((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_TreeRootExpression)); entity = e; EntityBuffer::Add(this); }
+IfcCsgSolid::IfcCsgSolid(IfcAbstractEntity* e) : IfcSolidModel((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcCsgSolid)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcCsgSolid::IfcCsgSolid(IfcCsgSelect* v1_TreeRootExpression) : IfcSolidModel((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_TreeRootExpression)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcCurrencyRelationship
-IfcMonetaryUnit* IfcCurrencyRelationship::RelatingMonetaryUnit() { return (IfcMonetaryUnit*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(2))); }
+IfcMonetaryUnit* IfcCurrencyRelationship::RelatingMonetaryUnit() const { return (IfcMonetaryUnit*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(2))); }
 void IfcCurrencyRelationship::setRelatingMonetaryUnit(IfcMonetaryUnit* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-IfcMonetaryUnit* IfcCurrencyRelationship::RelatedMonetaryUnit() { return (IfcMonetaryUnit*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(3))); }
+IfcMonetaryUnit* IfcCurrencyRelationship::RelatedMonetaryUnit() const { return (IfcMonetaryUnit*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(3))); }
 void IfcCurrencyRelationship::setRelatedMonetaryUnit(IfcMonetaryUnit* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-IfcPositiveRatioMeasure IfcCurrencyRelationship::ExchangeRate() { return *entity->getArgument(4); }
-void IfcCurrencyRelationship::setExchangeRate(IfcPositiveRatioMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-bool IfcCurrencyRelationship::hasRateDateTime() { return !entity->getArgument(5)->isNull(); }
-IfcDateTime IfcCurrencyRelationship::RateDateTime() { return *entity->getArgument(5); }
-void IfcCurrencyRelationship::setRateDateTime(IfcDateTime v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-bool IfcCurrencyRelationship::hasRateSource() { return !entity->getArgument(6)->isNull(); }
-IfcLibraryInformation* IfcCurrencyRelationship::RateSource() { return (IfcLibraryInformation*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(6))); }
+double IfcCurrencyRelationship::ExchangeRate() const { return *entity->getArgument(4); }
+void IfcCurrencyRelationship::setExchangeRate(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+bool IfcCurrencyRelationship::hasRateDateTime() const { return !entity->getArgument(5)->isNull(); }
+std::string IfcCurrencyRelationship::RateDateTime() const { return *entity->getArgument(5); }
+void IfcCurrencyRelationship::setRateDateTime(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+bool IfcCurrencyRelationship::hasRateSource() const { return !entity->getArgument(6)->isNull(); }
+IfcLibraryInformation* IfcCurrencyRelationship::RateSource() const { return (IfcLibraryInformation*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(6))); }
 void IfcCurrencyRelationship::setRateSource(IfcLibraryInformation* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
 bool IfcCurrencyRelationship::is(Type::Enum v) const { return v == Type::IfcCurrencyRelationship || IfcResourceLevelRelationship::is(v); }
 Type::Enum IfcCurrencyRelationship::type() const { return Type::IfcCurrencyRelationship; }
 Type::Enum IfcCurrencyRelationship::Class() { return Type::IfcCurrencyRelationship; }
-IfcCurrencyRelationship::IfcCurrencyRelationship(IfcAbstractEntityPtr e) : IfcResourceLevelRelationship((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcCurrencyRelationship)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcCurrencyRelationship::IfcCurrencyRelationship(boost::optional< IfcLabel > v1_Name, boost::optional< IfcText > v2_Description, IfcMonetaryUnit* v3_RelatingMonetaryUnit, IfcMonetaryUnit* v4_RelatedMonetaryUnit, IfcPositiveRatioMeasure v5_ExchangeRate, boost::optional< IfcDateTime > v6_RateDateTime, IfcLibraryInformation* v7_RateSource) : IfcResourceLevelRelationship((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_RelatingMonetaryUnit)); e->setArgument(3,(v4_RelatedMonetaryUnit)); e->setArgument(4,(v5_ExchangeRate)); if (v6_RateDateTime) { e->setArgument(5,(*v6_RateDateTime)); } else { e->setArgument(5); } e->setArgument(6,(v7_RateSource)); entity = e; EntityBuffer::Add(this); }
+IfcCurrencyRelationship::IfcCurrencyRelationship(IfcAbstractEntity* e) : IfcResourceLevelRelationship((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcCurrencyRelationship)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcCurrencyRelationship::IfcCurrencyRelationship(boost::optional< std::string > v1_Name, boost::optional< std::string > v2_Description, IfcMonetaryUnit* v3_RelatingMonetaryUnit, IfcMonetaryUnit* v4_RelatedMonetaryUnit, double v5_ExchangeRate, boost::optional< std::string > v6_RateDateTime, IfcLibraryInformation* v7_RateSource) : IfcResourceLevelRelationship((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_RelatingMonetaryUnit)); e->setArgument(3,(v4_RelatedMonetaryUnit)); e->setArgument(4,(v5_ExchangeRate)); if (v6_RateDateTime) { e->setArgument(5,(*v6_RateDateTime)); } else { e->setArgument(5); } e->setArgument(6,(v7_RateSource)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcCurtainWall
-bool IfcCurtainWall::hasPredefinedType() { return !entity->getArgument(8)->isNull(); }
-IfcCurtainWallTypeEnum::IfcCurtainWallTypeEnum IfcCurtainWall::PredefinedType() { return IfcCurtainWallTypeEnum::FromString(*entity->getArgument(8)); }
+bool IfcCurtainWall::hasPredefinedType() const { return !entity->getArgument(8)->isNull(); }
+IfcCurtainWallTypeEnum::IfcCurtainWallTypeEnum IfcCurtainWall::PredefinedType() const { return IfcCurtainWallTypeEnum::FromString(*entity->getArgument(8)); }
 void IfcCurtainWall::setPredefinedType(IfcCurtainWallTypeEnum::IfcCurtainWallTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcCurtainWallTypeEnum::ToString(v)); }
 bool IfcCurtainWall::is(Type::Enum v) const { return v == Type::IfcCurtainWall || IfcBuildingElement::is(v); }
 Type::Enum IfcCurtainWall::type() const { return Type::IfcCurtainWall; }
 Type::Enum IfcCurtainWall::Class() { return Type::IfcCurtainWall; }
-IfcCurtainWall::IfcCurtainWall(IfcAbstractEntityPtr e) : IfcBuildingElement((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcCurtainWall)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcCurtainWall::IfcCurtainWall(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcCurtainWallTypeEnum::IfcCurtainWallTypeEnum > v9_PredefinedType) : IfcBuildingElement((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcCurtainWallTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcCurtainWall::IfcCurtainWall(IfcAbstractEntity* e) : IfcBuildingElement((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcCurtainWall)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcCurtainWall::IfcCurtainWall(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcCurtainWallTypeEnum::IfcCurtainWallTypeEnum > v9_PredefinedType) : IfcBuildingElement((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcCurtainWallTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcCurtainWallType
-IfcCurtainWallTypeEnum::IfcCurtainWallTypeEnum IfcCurtainWallType::PredefinedType() { return IfcCurtainWallTypeEnum::FromString(*entity->getArgument(9)); }
+IfcCurtainWallTypeEnum::IfcCurtainWallTypeEnum IfcCurtainWallType::PredefinedType() const { return IfcCurtainWallTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcCurtainWallType::setPredefinedType(IfcCurtainWallTypeEnum::IfcCurtainWallTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcCurtainWallTypeEnum::ToString(v)); }
 bool IfcCurtainWallType::is(Type::Enum v) const { return v == Type::IfcCurtainWallType || IfcBuildingElementType::is(v); }
 Type::Enum IfcCurtainWallType::type() const { return Type::IfcCurtainWallType; }
 Type::Enum IfcCurtainWallType::Class() { return Type::IfcCurtainWallType; }
-IfcCurtainWallType::IfcCurtainWallType(IfcAbstractEntityPtr e) : IfcBuildingElementType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcCurtainWallType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcCurtainWallType::IfcCurtainWallType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcCurtainWallTypeEnum::IfcCurtainWallTypeEnum v10_PredefinedType) : IfcBuildingElementType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcCurtainWallTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcCurtainWallType::IfcCurtainWallType(IfcAbstractEntity* e) : IfcBuildingElementType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcCurtainWallType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcCurtainWallType::IfcCurtainWallType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcCurtainWallTypeEnum::IfcCurtainWallTypeEnum v10_PredefinedType) : IfcBuildingElementType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcCurtainWallTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcCurve
 bool IfcCurve::is(Type::Enum v) const { return v == Type::IfcCurve || IfcGeometricRepresentationItem::is(v); }
 Type::Enum IfcCurve::type() const { return Type::IfcCurve; }
 Type::Enum IfcCurve::Class() { return Type::IfcCurve; }
-IfcCurve::IfcCurve(IfcAbstractEntityPtr e) : IfcGeometricRepresentationItem((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcCurve)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcCurve::IfcCurve() : IfcGeometricRepresentationItem((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); entity = e; EntityBuffer::Add(this); }
+IfcCurve::IfcCurve(IfcAbstractEntity* e) : IfcGeometricRepresentationItem((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcCurve)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcCurve::IfcCurve() : IfcGeometricRepresentationItem((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcCurveBoundedPlane
-IfcPlane* IfcCurveBoundedPlane::BasisSurface() { return (IfcPlane*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(0))); }
+IfcPlane* IfcCurveBoundedPlane::BasisSurface() const { return (IfcPlane*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(0))); }
 void IfcCurveBoundedPlane::setBasisSurface(IfcPlane* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-IfcCurve* IfcCurveBoundedPlane::OuterBoundary() { return (IfcCurve*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(1))); }
+IfcCurve* IfcCurveBoundedPlane::OuterBoundary() const { return (IfcCurve*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(1))); }
 void IfcCurveBoundedPlane::setOuterBoundary(IfcCurve* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-SHARED_PTR< IfcTemplatedEntityList< IfcCurve > > IfcCurveBoundedPlane::InnerBoundaries() { RETURN_AS_LIST(IfcCurve,2) }
-void IfcCurveBoundedPlane::setInnerBoundaries(SHARED_PTR< IfcTemplatedEntityList< IfcCurve > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v->generalize()); }
+IfcTemplatedEntityList< IfcCurve >::ptr IfcCurveBoundedPlane::InnerBoundaries() const { IfcEntityList::ptr es = *entity->getArgument(2); return es->as<IfcCurve>(); }
+void IfcCurveBoundedPlane::setInnerBoundaries(IfcTemplatedEntityList< IfcCurve >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v->generalize()); }
 bool IfcCurveBoundedPlane::is(Type::Enum v) const { return v == Type::IfcCurveBoundedPlane || IfcBoundedSurface::is(v); }
 Type::Enum IfcCurveBoundedPlane::type() const { return Type::IfcCurveBoundedPlane; }
 Type::Enum IfcCurveBoundedPlane::Class() { return Type::IfcCurveBoundedPlane; }
-IfcCurveBoundedPlane::IfcCurveBoundedPlane(IfcAbstractEntityPtr e) : IfcBoundedSurface((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcCurveBoundedPlane)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcCurveBoundedPlane::IfcCurveBoundedPlane(IfcPlane* v1_BasisSurface, IfcCurve* v2_OuterBoundary, SHARED_PTR< IfcTemplatedEntityList< IfcCurve > > v3_InnerBoundaries) : IfcBoundedSurface((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_BasisSurface)); e->setArgument(1,(v2_OuterBoundary)); e->setArgument(2,(v3_InnerBoundaries)->generalize()); entity = e; EntityBuffer::Add(this); }
+IfcCurveBoundedPlane::IfcCurveBoundedPlane(IfcAbstractEntity* e) : IfcBoundedSurface((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcCurveBoundedPlane)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcCurveBoundedPlane::IfcCurveBoundedPlane(IfcPlane* v1_BasisSurface, IfcCurve* v2_OuterBoundary, IfcTemplatedEntityList< IfcCurve >::ptr v3_InnerBoundaries) : IfcBoundedSurface((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_BasisSurface)); e->setArgument(1,(v2_OuterBoundary)); e->setArgument(2,(v3_InnerBoundaries)->generalize()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcCurveBoundedSurface
-IfcSurface* IfcCurveBoundedSurface::BasisSurface() { return (IfcSurface*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(0))); }
+IfcSurface* IfcCurveBoundedSurface::BasisSurface() const { return (IfcSurface*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(0))); }
 void IfcCurveBoundedSurface::setBasisSurface(IfcSurface* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-SHARED_PTR< IfcTemplatedEntityList< IfcBoundaryCurve > > IfcCurveBoundedSurface::Boundaries() { RETURN_AS_LIST(IfcBoundaryCurve,1) }
-void IfcCurveBoundedSurface::setBoundaries(SHARED_PTR< IfcTemplatedEntityList< IfcBoundaryCurve > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v->generalize()); }
-bool IfcCurveBoundedSurface::ImplicitOuter() { return *entity->getArgument(2); }
+IfcTemplatedEntityList< IfcBoundaryCurve >::ptr IfcCurveBoundedSurface::Boundaries() const { IfcEntityList::ptr es = *entity->getArgument(1); return es->as<IfcBoundaryCurve>(); }
+void IfcCurveBoundedSurface::setBoundaries(IfcTemplatedEntityList< IfcBoundaryCurve >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v->generalize()); }
+bool IfcCurveBoundedSurface::ImplicitOuter() const { return *entity->getArgument(2); }
 void IfcCurveBoundedSurface::setImplicitOuter(bool v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
 bool IfcCurveBoundedSurface::is(Type::Enum v) const { return v == Type::IfcCurveBoundedSurface || IfcBoundedSurface::is(v); }
 Type::Enum IfcCurveBoundedSurface::type() const { return Type::IfcCurveBoundedSurface; }
 Type::Enum IfcCurveBoundedSurface::Class() { return Type::IfcCurveBoundedSurface; }
-IfcCurveBoundedSurface::IfcCurveBoundedSurface(IfcAbstractEntityPtr e) : IfcBoundedSurface((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcCurveBoundedSurface)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcCurveBoundedSurface::IfcCurveBoundedSurface(IfcSurface* v1_BasisSurface, SHARED_PTR< IfcTemplatedEntityList< IfcBoundaryCurve > > v2_Boundaries, bool v3_ImplicitOuter) : IfcBoundedSurface((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_BasisSurface)); e->setArgument(1,(v2_Boundaries)->generalize()); e->setArgument(2,(v3_ImplicitOuter)); entity = e; EntityBuffer::Add(this); }
+IfcCurveBoundedSurface::IfcCurveBoundedSurface(IfcAbstractEntity* e) : IfcBoundedSurface((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcCurveBoundedSurface)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcCurveBoundedSurface::IfcCurveBoundedSurface(IfcSurface* v1_BasisSurface, IfcTemplatedEntityList< IfcBoundaryCurve >::ptr v2_Boundaries, bool v3_ImplicitOuter) : IfcBoundedSurface((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_BasisSurface)); e->setArgument(1,(v2_Boundaries)->generalize()); e->setArgument(2,(v3_ImplicitOuter)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcCurveStyle
-bool IfcCurveStyle::hasCurveFont() { return !entity->getArgument(1)->isNull(); }
-IfcCurveFontOrScaledCurveFontSelect IfcCurveStyle::CurveFont() { return *entity->getArgument(1); }
-void IfcCurveStyle::setCurveFont(IfcCurveFontOrScaledCurveFontSelect v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-bool IfcCurveStyle::hasCurveWidth() { return !entity->getArgument(2)->isNull(); }
-IfcSizeSelect IfcCurveStyle::CurveWidth() { return *entity->getArgument(2); }
-void IfcCurveStyle::setCurveWidth(IfcSizeSelect v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-bool IfcCurveStyle::hasCurveColour() { return !entity->getArgument(3)->isNull(); }
-IfcColour IfcCurveStyle::CurveColour() { return *entity->getArgument(3); }
-void IfcCurveStyle::setCurveColour(IfcColour v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-bool IfcCurveStyle::hasModelOrDraughting() { return !entity->getArgument(4)->isNull(); }
-bool IfcCurveStyle::ModelOrDraughting() { return *entity->getArgument(4); }
+bool IfcCurveStyle::hasCurveFont() const { return !entity->getArgument(1)->isNull(); }
+IfcCurveFontOrScaledCurveFontSelect* IfcCurveStyle::CurveFont() const { return (IfcCurveFontOrScaledCurveFontSelect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(1))); }
+void IfcCurveStyle::setCurveFont(IfcCurveFontOrScaledCurveFontSelect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+bool IfcCurveStyle::hasCurveWidth() const { return !entity->getArgument(2)->isNull(); }
+IfcSizeSelect* IfcCurveStyle::CurveWidth() const { return (IfcSizeSelect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(2))); }
+void IfcCurveStyle::setCurveWidth(IfcSizeSelect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+bool IfcCurveStyle::hasCurveColour() const { return !entity->getArgument(3)->isNull(); }
+IfcColour* IfcCurveStyle::CurveColour() const { return (IfcColour*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(3))); }
+void IfcCurveStyle::setCurveColour(IfcColour* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+bool IfcCurveStyle::hasModelOrDraughting() const { return !entity->getArgument(4)->isNull(); }
+bool IfcCurveStyle::ModelOrDraughting() const { return *entity->getArgument(4); }
 void IfcCurveStyle::setModelOrDraughting(bool v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
 bool IfcCurveStyle::is(Type::Enum v) const { return v == Type::IfcCurveStyle || IfcPresentationStyle::is(v); }
 Type::Enum IfcCurveStyle::type() const { return Type::IfcCurveStyle; }
 Type::Enum IfcCurveStyle::Class() { return Type::IfcCurveStyle; }
-IfcCurveStyle::IfcCurveStyle(IfcAbstractEntityPtr e) : IfcPresentationStyle((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcCurveStyle)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcCurveStyle::IfcCurveStyle(boost::optional< IfcLabel > v1_Name, boost::optional< IfcCurveFontOrScaledCurveFontSelect > v2_CurveFont, boost::optional< IfcSizeSelect > v3_CurveWidth, boost::optional< IfcColour > v4_CurveColour, boost::optional< bool > v5_ModelOrDraughting) : IfcPresentationStyle((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_CurveFont) { e->setArgument(1,(*v2_CurveFont)); } else { e->setArgument(1); } if (v3_CurveWidth) { e->setArgument(2,(*v3_CurveWidth)); } else { e->setArgument(2); } if (v4_CurveColour) { e->setArgument(3,(*v4_CurveColour)); } else { e->setArgument(3); } if (v5_ModelOrDraughting) { e->setArgument(4,(*v5_ModelOrDraughting)); } else { e->setArgument(4); } entity = e; EntityBuffer::Add(this); }
+IfcCurveStyle::IfcCurveStyle(IfcAbstractEntity* e) : IfcPresentationStyle((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcCurveStyle)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcCurveStyle::IfcCurveStyle(boost::optional< std::string > v1_Name, IfcCurveFontOrScaledCurveFontSelect* v2_CurveFont, IfcSizeSelect* v3_CurveWidth, IfcColour* v4_CurveColour, boost::optional< bool > v5_ModelOrDraughting) : IfcPresentationStyle((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } e->setArgument(1,(v2_CurveFont)); e->setArgument(2,(v3_CurveWidth)); e->setArgument(3,(v4_CurveColour)); if (v5_ModelOrDraughting) { e->setArgument(4,(*v5_ModelOrDraughting)); } else { e->setArgument(4); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcCurveStyleFont
-bool IfcCurveStyleFont::hasName() { return !entity->getArgument(0)->isNull(); }
-IfcLabel IfcCurveStyleFont::Name() { return *entity->getArgument(0); }
-void IfcCurveStyleFont::setName(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-SHARED_PTR< IfcTemplatedEntityList< IfcCurveStyleFontPattern > > IfcCurveStyleFont::PatternList() { RETURN_AS_LIST(IfcCurveStyleFontPattern,1) }
-void IfcCurveStyleFont::setPatternList(SHARED_PTR< IfcTemplatedEntityList< IfcCurveStyleFontPattern > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v->generalize()); }
+bool IfcCurveStyleFont::hasName() const { return !entity->getArgument(0)->isNull(); }
+std::string IfcCurveStyleFont::Name() const { return *entity->getArgument(0); }
+void IfcCurveStyleFont::setName(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+IfcTemplatedEntityList< IfcCurveStyleFontPattern >::ptr IfcCurveStyleFont::PatternList() const { IfcEntityList::ptr es = *entity->getArgument(1); return es->as<IfcCurveStyleFontPattern>(); }
+void IfcCurveStyleFont::setPatternList(IfcTemplatedEntityList< IfcCurveStyleFontPattern >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v->generalize()); }
 bool IfcCurveStyleFont::is(Type::Enum v) const { return v == Type::IfcCurveStyleFont || IfcPresentationItem::is(v); }
 Type::Enum IfcCurveStyleFont::type() const { return Type::IfcCurveStyleFont; }
 Type::Enum IfcCurveStyleFont::Class() { return Type::IfcCurveStyleFont; }
-IfcCurveStyleFont::IfcCurveStyleFont(IfcAbstractEntityPtr e) : IfcPresentationItem((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcCurveStyleFont)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcCurveStyleFont::IfcCurveStyleFont(boost::optional< IfcLabel > v1_Name, SHARED_PTR< IfcTemplatedEntityList< IfcCurveStyleFontPattern > > v2_PatternList) : IfcPresentationItem((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } e->setArgument(1,(v2_PatternList)->generalize()); entity = e; EntityBuffer::Add(this); }
+IfcCurveStyleFont::IfcCurveStyleFont(IfcAbstractEntity* e) : IfcPresentationItem((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcCurveStyleFont)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcCurveStyleFont::IfcCurveStyleFont(boost::optional< std::string > v1_Name, IfcTemplatedEntityList< IfcCurveStyleFontPattern >::ptr v2_PatternList) : IfcPresentationItem((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } e->setArgument(1,(v2_PatternList)->generalize()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcCurveStyleFontAndScaling
-bool IfcCurveStyleFontAndScaling::hasName() { return !entity->getArgument(0)->isNull(); }
-IfcLabel IfcCurveStyleFontAndScaling::Name() { return *entity->getArgument(0); }
-void IfcCurveStyleFontAndScaling::setName(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-IfcCurveStyleFontSelect IfcCurveStyleFontAndScaling::CurveFont() { return *entity->getArgument(1); }
-void IfcCurveStyleFontAndScaling::setCurveFont(IfcCurveStyleFontSelect v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-IfcPositiveRatioMeasure IfcCurveStyleFontAndScaling::CurveFontScaling() { return *entity->getArgument(2); }
-void IfcCurveStyleFontAndScaling::setCurveFontScaling(IfcPositiveRatioMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+bool IfcCurveStyleFontAndScaling::hasName() const { return !entity->getArgument(0)->isNull(); }
+std::string IfcCurveStyleFontAndScaling::Name() const { return *entity->getArgument(0); }
+void IfcCurveStyleFontAndScaling::setName(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+IfcCurveStyleFontSelect* IfcCurveStyleFontAndScaling::CurveFont() const { return (IfcCurveStyleFontSelect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(1))); }
+void IfcCurveStyleFontAndScaling::setCurveFont(IfcCurveStyleFontSelect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+double IfcCurveStyleFontAndScaling::CurveFontScaling() const { return *entity->getArgument(2); }
+void IfcCurveStyleFontAndScaling::setCurveFontScaling(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
 bool IfcCurveStyleFontAndScaling::is(Type::Enum v) const { return v == Type::IfcCurveStyleFontAndScaling || IfcPresentationItem::is(v); }
 Type::Enum IfcCurveStyleFontAndScaling::type() const { return Type::IfcCurveStyleFontAndScaling; }
 Type::Enum IfcCurveStyleFontAndScaling::Class() { return Type::IfcCurveStyleFontAndScaling; }
-IfcCurveStyleFontAndScaling::IfcCurveStyleFontAndScaling(IfcAbstractEntityPtr e) : IfcPresentationItem((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcCurveStyleFontAndScaling)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcCurveStyleFontAndScaling::IfcCurveStyleFontAndScaling(boost::optional< IfcLabel > v1_Name, IfcCurveStyleFontSelect v2_CurveFont, IfcPositiveRatioMeasure v3_CurveFontScaling) : IfcPresentationItem((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } e->setArgument(1,(v2_CurveFont)); e->setArgument(2,(v3_CurveFontScaling)); entity = e; EntityBuffer::Add(this); }
+IfcCurveStyleFontAndScaling::IfcCurveStyleFontAndScaling(IfcAbstractEntity* e) : IfcPresentationItem((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcCurveStyleFontAndScaling)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcCurveStyleFontAndScaling::IfcCurveStyleFontAndScaling(boost::optional< std::string > v1_Name, IfcCurveStyleFontSelect* v2_CurveFont, double v3_CurveFontScaling) : IfcPresentationItem((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } e->setArgument(1,(v2_CurveFont)); e->setArgument(2,(v3_CurveFontScaling)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcCurveStyleFontPattern
-IfcLengthMeasure IfcCurveStyleFontPattern::VisibleSegmentLength() { return *entity->getArgument(0); }
-void IfcCurveStyleFontPattern::setVisibleSegmentLength(IfcLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-IfcPositiveLengthMeasure IfcCurveStyleFontPattern::InvisibleSegmentLength() { return *entity->getArgument(1); }
-void IfcCurveStyleFontPattern::setInvisibleSegmentLength(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+double IfcCurveStyleFontPattern::VisibleSegmentLength() const { return *entity->getArgument(0); }
+void IfcCurveStyleFontPattern::setVisibleSegmentLength(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+double IfcCurveStyleFontPattern::InvisibleSegmentLength() const { return *entity->getArgument(1); }
+void IfcCurveStyleFontPattern::setInvisibleSegmentLength(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
 bool IfcCurveStyleFontPattern::is(Type::Enum v) const { return v == Type::IfcCurveStyleFontPattern || IfcPresentationItem::is(v); }
 Type::Enum IfcCurveStyleFontPattern::type() const { return Type::IfcCurveStyleFontPattern; }
 Type::Enum IfcCurveStyleFontPattern::Class() { return Type::IfcCurveStyleFontPattern; }
-IfcCurveStyleFontPattern::IfcCurveStyleFontPattern(IfcAbstractEntityPtr e) : IfcPresentationItem((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcCurveStyleFontPattern)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcCurveStyleFontPattern::IfcCurveStyleFontPattern(IfcLengthMeasure v1_VisibleSegmentLength, IfcPositiveLengthMeasure v2_InvisibleSegmentLength) : IfcPresentationItem((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_VisibleSegmentLength)); e->setArgument(1,(v2_InvisibleSegmentLength)); entity = e; EntityBuffer::Add(this); }
+IfcCurveStyleFontPattern::IfcCurveStyleFontPattern(IfcAbstractEntity* e) : IfcPresentationItem((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcCurveStyleFontPattern)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcCurveStyleFontPattern::IfcCurveStyleFontPattern(double v1_VisibleSegmentLength, double v2_InvisibleSegmentLength) : IfcPresentationItem((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_VisibleSegmentLength)); e->setArgument(1,(v2_InvisibleSegmentLength)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcCylindricalSurface
-IfcPositiveLengthMeasure IfcCylindricalSurface::Radius() { return *entity->getArgument(1); }
-void IfcCylindricalSurface::setRadius(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+double IfcCylindricalSurface::Radius() const { return *entity->getArgument(1); }
+void IfcCylindricalSurface::setRadius(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
 bool IfcCylindricalSurface::is(Type::Enum v) const { return v == Type::IfcCylindricalSurface || IfcElementarySurface::is(v); }
 Type::Enum IfcCylindricalSurface::type() const { return Type::IfcCylindricalSurface; }
 Type::Enum IfcCylindricalSurface::Class() { return Type::IfcCylindricalSurface; }
-IfcCylindricalSurface::IfcCylindricalSurface(IfcAbstractEntityPtr e) : IfcElementarySurface((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcCylindricalSurface)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcCylindricalSurface::IfcCylindricalSurface(IfcAxis2Placement3D* v1_Position, IfcPositiveLengthMeasure v2_Radius) : IfcElementarySurface((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Position)); e->setArgument(1,(v2_Radius)); entity = e; EntityBuffer::Add(this); }
+IfcCylindricalSurface::IfcCylindricalSurface(IfcAbstractEntity* e) : IfcElementarySurface((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcCylindricalSurface)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcCylindricalSurface::IfcCylindricalSurface(IfcAxis2Placement3D* v1_Position, double v2_Radius) : IfcElementarySurface((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Position)); e->setArgument(1,(v2_Radius)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcDamper
-bool IfcDamper::hasPredefinedType() { return !entity->getArgument(8)->isNull(); }
-IfcDamperTypeEnum::IfcDamperTypeEnum IfcDamper::PredefinedType() { return IfcDamperTypeEnum::FromString(*entity->getArgument(8)); }
+bool IfcDamper::hasPredefinedType() const { return !entity->getArgument(8)->isNull(); }
+IfcDamperTypeEnum::IfcDamperTypeEnum IfcDamper::PredefinedType() const { return IfcDamperTypeEnum::FromString(*entity->getArgument(8)); }
 void IfcDamper::setPredefinedType(IfcDamperTypeEnum::IfcDamperTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcDamperTypeEnum::ToString(v)); }
 bool IfcDamper::is(Type::Enum v) const { return v == Type::IfcDamper || IfcFlowController::is(v); }
 Type::Enum IfcDamper::type() const { return Type::IfcDamper; }
 Type::Enum IfcDamper::Class() { return Type::IfcDamper; }
-IfcDamper::IfcDamper(IfcAbstractEntityPtr e) : IfcFlowController((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcDamper)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcDamper::IfcDamper(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcDamperTypeEnum::IfcDamperTypeEnum > v9_PredefinedType) : IfcFlowController((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcDamperTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcDamper::IfcDamper(IfcAbstractEntity* e) : IfcFlowController((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcDamper)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcDamper::IfcDamper(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcDamperTypeEnum::IfcDamperTypeEnum > v9_PredefinedType) : IfcFlowController((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcDamperTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcDamperType
-IfcDamperTypeEnum::IfcDamperTypeEnum IfcDamperType::PredefinedType() { return IfcDamperTypeEnum::FromString(*entity->getArgument(9)); }
+IfcDamperTypeEnum::IfcDamperTypeEnum IfcDamperType::PredefinedType() const { return IfcDamperTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcDamperType::setPredefinedType(IfcDamperTypeEnum::IfcDamperTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcDamperTypeEnum::ToString(v)); }
 bool IfcDamperType::is(Type::Enum v) const { return v == Type::IfcDamperType || IfcFlowControllerType::is(v); }
 Type::Enum IfcDamperType::type() const { return Type::IfcDamperType; }
 Type::Enum IfcDamperType::Class() { return Type::IfcDamperType; }
-IfcDamperType::IfcDamperType(IfcAbstractEntityPtr e) : IfcFlowControllerType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcDamperType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcDamperType::IfcDamperType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcDamperTypeEnum::IfcDamperTypeEnum v10_PredefinedType) : IfcFlowControllerType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcDamperTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcDamperType::IfcDamperType(IfcAbstractEntity* e) : IfcFlowControllerType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcDamperType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcDamperType::IfcDamperType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcDamperTypeEnum::IfcDamperTypeEnum v10_PredefinedType) : IfcFlowControllerType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcDamperTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcDerivedProfileDef
-IfcProfileDef* IfcDerivedProfileDef::ParentProfile() { return (IfcProfileDef*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(2))); }
+IfcProfileDef* IfcDerivedProfileDef::ParentProfile() const { return (IfcProfileDef*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(2))); }
 void IfcDerivedProfileDef::setParentProfile(IfcProfileDef* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-IfcCartesianTransformationOperator2D* IfcDerivedProfileDef::Operator() { return (IfcCartesianTransformationOperator2D*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(3))); }
+IfcCartesianTransformationOperator2D* IfcDerivedProfileDef::Operator() const { return (IfcCartesianTransformationOperator2D*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(3))); }
 void IfcDerivedProfileDef::setOperator(IfcCartesianTransformationOperator2D* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-bool IfcDerivedProfileDef::hasLabel() { return !entity->getArgument(4)->isNull(); }
-IfcLabel IfcDerivedProfileDef::Label() { return *entity->getArgument(4); }
-void IfcDerivedProfileDef::setLabel(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+bool IfcDerivedProfileDef::hasLabel() const { return !entity->getArgument(4)->isNull(); }
+std::string IfcDerivedProfileDef::Label() const { return *entity->getArgument(4); }
+void IfcDerivedProfileDef::setLabel(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
 bool IfcDerivedProfileDef::is(Type::Enum v) const { return v == Type::IfcDerivedProfileDef || IfcProfileDef::is(v); }
 Type::Enum IfcDerivedProfileDef::type() const { return Type::IfcDerivedProfileDef; }
 Type::Enum IfcDerivedProfileDef::Class() { return Type::IfcDerivedProfileDef; }
-IfcDerivedProfileDef::IfcDerivedProfileDef(IfcAbstractEntityPtr e) : IfcProfileDef((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcDerivedProfileDef)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcDerivedProfileDef::IfcDerivedProfileDef(IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< IfcLabel > v2_ProfileName, IfcProfileDef* v3_ParentProfile, IfcCartesianTransformationOperator2D* v4_Operator, boost::optional< IfcLabel > v5_Label) : IfcProfileDef((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,v1_ProfileType,IfcProfileTypeEnum::ToString(v1_ProfileType)); if (v2_ProfileName) { e->setArgument(1,(*v2_ProfileName)); } else { e->setArgument(1); } e->setArgument(2,(v3_ParentProfile)); e->setArgument(3,(v4_Operator)); if (v5_Label) { e->setArgument(4,(*v5_Label)); } else { e->setArgument(4); } entity = e; EntityBuffer::Add(this); }
+IfcDerivedProfileDef::IfcDerivedProfileDef(IfcAbstractEntity* e) : IfcProfileDef((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcDerivedProfileDef)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcDerivedProfileDef::IfcDerivedProfileDef(IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< std::string > v2_ProfileName, IfcProfileDef* v3_ParentProfile, IfcCartesianTransformationOperator2D* v4_Operator, boost::optional< std::string > v5_Label) : IfcProfileDef((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,v1_ProfileType,IfcProfileTypeEnum::ToString(v1_ProfileType)); if (v2_ProfileName) { e->setArgument(1,(*v2_ProfileName)); } else { e->setArgument(1); } e->setArgument(2,(v3_ParentProfile)); e->setArgument(3,(v4_Operator)); if (v5_Label) { e->setArgument(4,(*v5_Label)); } else { e->setArgument(4); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcDerivedUnit
-SHARED_PTR< IfcTemplatedEntityList< IfcDerivedUnitElement > > IfcDerivedUnit::Elements() { RETURN_AS_LIST(IfcDerivedUnitElement,0) }
-void IfcDerivedUnit::setElements(SHARED_PTR< IfcTemplatedEntityList< IfcDerivedUnitElement > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v->generalize()); }
-IfcDerivedUnitEnum::IfcDerivedUnitEnum IfcDerivedUnit::UnitType() { return IfcDerivedUnitEnum::FromString(*entity->getArgument(1)); }
+IfcTemplatedEntityList< IfcDerivedUnitElement >::ptr IfcDerivedUnit::Elements() const { IfcEntityList::ptr es = *entity->getArgument(0); return es->as<IfcDerivedUnitElement>(); }
+void IfcDerivedUnit::setElements(IfcTemplatedEntityList< IfcDerivedUnitElement >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v->generalize()); }
+IfcDerivedUnitEnum::IfcDerivedUnitEnum IfcDerivedUnit::UnitType() const { return IfcDerivedUnitEnum::FromString(*entity->getArgument(1)); }
 void IfcDerivedUnit::setUnitType(IfcDerivedUnitEnum::IfcDerivedUnitEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v,IfcDerivedUnitEnum::ToString(v)); }
-bool IfcDerivedUnit::hasUserDefinedType() { return !entity->getArgument(2)->isNull(); }
-IfcLabel IfcDerivedUnit::UserDefinedType() { return *entity->getArgument(2); }
-void IfcDerivedUnit::setUserDefinedType(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+bool IfcDerivedUnit::hasUserDefinedType() const { return !entity->getArgument(2)->isNull(); }
+std::string IfcDerivedUnit::UserDefinedType() const { return *entity->getArgument(2); }
+void IfcDerivedUnit::setUserDefinedType(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
 bool IfcDerivedUnit::is(Type::Enum v) const { return v == Type::IfcDerivedUnit; }
 Type::Enum IfcDerivedUnit::type() const { return Type::IfcDerivedUnit; }
 Type::Enum IfcDerivedUnit::Class() { return Type::IfcDerivedUnit; }
-IfcDerivedUnit::IfcDerivedUnit(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcDerivedUnit)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcDerivedUnit::IfcDerivedUnit(SHARED_PTR< IfcTemplatedEntityList< IfcDerivedUnitElement > > v1_Elements, IfcDerivedUnitEnum::IfcDerivedUnitEnum v2_UnitType, boost::optional< IfcLabel > v3_UserDefinedType) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Elements)->generalize()); e->setArgument(1,v2_UnitType,IfcDerivedUnitEnum::ToString(v2_UnitType)); if (v3_UserDefinedType) { e->setArgument(2,(*v3_UserDefinedType)); } else { e->setArgument(2); } entity = e; EntityBuffer::Add(this); }
+IfcDerivedUnit::IfcDerivedUnit(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcDerivedUnit)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcDerivedUnit::IfcDerivedUnit(IfcTemplatedEntityList< IfcDerivedUnitElement >::ptr v1_Elements, IfcDerivedUnitEnum::IfcDerivedUnitEnum v2_UnitType, boost::optional< std::string > v3_UserDefinedType) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Elements)->generalize()); e->setArgument(1,v2_UnitType,IfcDerivedUnitEnum::ToString(v2_UnitType)); if (v3_UserDefinedType) { e->setArgument(2,(*v3_UserDefinedType)); } else { e->setArgument(2); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcDerivedUnitElement
-IfcNamedUnit* IfcDerivedUnitElement::Unit() { return (IfcNamedUnit*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(0))); }
+IfcNamedUnit* IfcDerivedUnitElement::Unit() const { return (IfcNamedUnit*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(0))); }
 void IfcDerivedUnitElement::setUnit(IfcNamedUnit* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-int IfcDerivedUnitElement::Exponent() { return *entity->getArgument(1); }
+int IfcDerivedUnitElement::Exponent() const { return *entity->getArgument(1); }
 void IfcDerivedUnitElement::setExponent(int v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
 bool IfcDerivedUnitElement::is(Type::Enum v) const { return v == Type::IfcDerivedUnitElement; }
 Type::Enum IfcDerivedUnitElement::type() const { return Type::IfcDerivedUnitElement; }
 Type::Enum IfcDerivedUnitElement::Class() { return Type::IfcDerivedUnitElement; }
-IfcDerivedUnitElement::IfcDerivedUnitElement(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcDerivedUnitElement)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcDerivedUnitElement::IfcDerivedUnitElement(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcDerivedUnitElement)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
 IfcDerivedUnitElement::IfcDerivedUnitElement(IfcNamedUnit* v1_Unit, int v2_Exponent) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Unit)); e->setArgument(1,(v2_Exponent)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcDimensionalExponents
-int IfcDimensionalExponents::LengthExponent() { return *entity->getArgument(0); }
+int IfcDimensionalExponents::LengthExponent() const { return *entity->getArgument(0); }
 void IfcDimensionalExponents::setLengthExponent(int v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-int IfcDimensionalExponents::MassExponent() { return *entity->getArgument(1); }
+int IfcDimensionalExponents::MassExponent() const { return *entity->getArgument(1); }
 void IfcDimensionalExponents::setMassExponent(int v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-int IfcDimensionalExponents::TimeExponent() { return *entity->getArgument(2); }
+int IfcDimensionalExponents::TimeExponent() const { return *entity->getArgument(2); }
 void IfcDimensionalExponents::setTimeExponent(int v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-int IfcDimensionalExponents::ElectricCurrentExponent() { return *entity->getArgument(3); }
+int IfcDimensionalExponents::ElectricCurrentExponent() const { return *entity->getArgument(3); }
 void IfcDimensionalExponents::setElectricCurrentExponent(int v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-int IfcDimensionalExponents::ThermodynamicTemperatureExponent() { return *entity->getArgument(4); }
+int IfcDimensionalExponents::ThermodynamicTemperatureExponent() const { return *entity->getArgument(4); }
 void IfcDimensionalExponents::setThermodynamicTemperatureExponent(int v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-int IfcDimensionalExponents::AmountOfSubstanceExponent() { return *entity->getArgument(5); }
+int IfcDimensionalExponents::AmountOfSubstanceExponent() const { return *entity->getArgument(5); }
 void IfcDimensionalExponents::setAmountOfSubstanceExponent(int v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-int IfcDimensionalExponents::LuminousIntensityExponent() { return *entity->getArgument(6); }
+int IfcDimensionalExponents::LuminousIntensityExponent() const { return *entity->getArgument(6); }
 void IfcDimensionalExponents::setLuminousIntensityExponent(int v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
 bool IfcDimensionalExponents::is(Type::Enum v) const { return v == Type::IfcDimensionalExponents; }
 Type::Enum IfcDimensionalExponents::type() const { return Type::IfcDimensionalExponents; }
 Type::Enum IfcDimensionalExponents::Class() { return Type::IfcDimensionalExponents; }
-IfcDimensionalExponents::IfcDimensionalExponents(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcDimensionalExponents)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcDimensionalExponents::IfcDimensionalExponents(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcDimensionalExponents)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
 IfcDimensionalExponents::IfcDimensionalExponents(int v1_LengthExponent, int v2_MassExponent, int v3_TimeExponent, int v4_ElectricCurrentExponent, int v5_ThermodynamicTemperatureExponent, int v6_AmountOfSubstanceExponent, int v7_LuminousIntensityExponent) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_LengthExponent)); e->setArgument(1,(v2_MassExponent)); e->setArgument(2,(v3_TimeExponent)); e->setArgument(3,(v4_ElectricCurrentExponent)); e->setArgument(4,(v5_ThermodynamicTemperatureExponent)); e->setArgument(5,(v6_AmountOfSubstanceExponent)); e->setArgument(6,(v7_LuminousIntensityExponent)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcDirection
-std::vector< double > /*[2:3]*/ IfcDirection::DirectionRatios() { return *entity->getArgument(0); }
+std::vector< double > /*[2:3]*/ IfcDirection::DirectionRatios() const { return *entity->getArgument(0); }
 void IfcDirection::setDirectionRatios(std::vector< double > /*[2:3]*/ v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
 bool IfcDirection::is(Type::Enum v) const { return v == Type::IfcDirection || IfcGeometricRepresentationItem::is(v); }
 Type::Enum IfcDirection::type() const { return Type::IfcDirection; }
 Type::Enum IfcDirection::Class() { return Type::IfcDirection; }
-IfcDirection::IfcDirection(IfcAbstractEntityPtr e) : IfcGeometricRepresentationItem((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcDirection)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcDirection::IfcDirection(std::vector< double > /*[2:3]*/ v1_DirectionRatios) : IfcGeometricRepresentationItem((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_DirectionRatios)); entity = e; EntityBuffer::Add(this); }
+IfcDirection::IfcDirection(IfcAbstractEntity* e) : IfcGeometricRepresentationItem((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcDirection)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcDirection::IfcDirection(std::vector< double > /*[2:3]*/ v1_DirectionRatios) : IfcGeometricRepresentationItem((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_DirectionRatios)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcDiscreteAccessory
-bool IfcDiscreteAccessory::hasPredefinedType() { return !entity->getArgument(8)->isNull(); }
-IfcDiscreteAccessoryTypeEnum::IfcDiscreteAccessoryTypeEnum IfcDiscreteAccessory::PredefinedType() { return IfcDiscreteAccessoryTypeEnum::FromString(*entity->getArgument(8)); }
+bool IfcDiscreteAccessory::hasPredefinedType() const { return !entity->getArgument(8)->isNull(); }
+IfcDiscreteAccessoryTypeEnum::IfcDiscreteAccessoryTypeEnum IfcDiscreteAccessory::PredefinedType() const { return IfcDiscreteAccessoryTypeEnum::FromString(*entity->getArgument(8)); }
 void IfcDiscreteAccessory::setPredefinedType(IfcDiscreteAccessoryTypeEnum::IfcDiscreteAccessoryTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcDiscreteAccessoryTypeEnum::ToString(v)); }
 bool IfcDiscreteAccessory::is(Type::Enum v) const { return v == Type::IfcDiscreteAccessory || IfcElementComponent::is(v); }
 Type::Enum IfcDiscreteAccessory::type() const { return Type::IfcDiscreteAccessory; }
 Type::Enum IfcDiscreteAccessory::Class() { return Type::IfcDiscreteAccessory; }
-IfcDiscreteAccessory::IfcDiscreteAccessory(IfcAbstractEntityPtr e) : IfcElementComponent((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcDiscreteAccessory)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcDiscreteAccessory::IfcDiscreteAccessory(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcDiscreteAccessoryTypeEnum::IfcDiscreteAccessoryTypeEnum > v9_PredefinedType) : IfcElementComponent((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcDiscreteAccessoryTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcDiscreteAccessory::IfcDiscreteAccessory(IfcAbstractEntity* e) : IfcElementComponent((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcDiscreteAccessory)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcDiscreteAccessory::IfcDiscreteAccessory(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcDiscreteAccessoryTypeEnum::IfcDiscreteAccessoryTypeEnum > v9_PredefinedType) : IfcElementComponent((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcDiscreteAccessoryTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcDiscreteAccessoryType
-IfcDiscreteAccessoryTypeEnum::IfcDiscreteAccessoryTypeEnum IfcDiscreteAccessoryType::PredefinedType() { return IfcDiscreteAccessoryTypeEnum::FromString(*entity->getArgument(9)); }
+IfcDiscreteAccessoryTypeEnum::IfcDiscreteAccessoryTypeEnum IfcDiscreteAccessoryType::PredefinedType() const { return IfcDiscreteAccessoryTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcDiscreteAccessoryType::setPredefinedType(IfcDiscreteAccessoryTypeEnum::IfcDiscreteAccessoryTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcDiscreteAccessoryTypeEnum::ToString(v)); }
 bool IfcDiscreteAccessoryType::is(Type::Enum v) const { return v == Type::IfcDiscreteAccessoryType || IfcElementComponentType::is(v); }
 Type::Enum IfcDiscreteAccessoryType::type() const { return Type::IfcDiscreteAccessoryType; }
 Type::Enum IfcDiscreteAccessoryType::Class() { return Type::IfcDiscreteAccessoryType; }
-IfcDiscreteAccessoryType::IfcDiscreteAccessoryType(IfcAbstractEntityPtr e) : IfcElementComponentType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcDiscreteAccessoryType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcDiscreteAccessoryType::IfcDiscreteAccessoryType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcDiscreteAccessoryTypeEnum::IfcDiscreteAccessoryTypeEnum v10_PredefinedType) : IfcElementComponentType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcDiscreteAccessoryTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcDiscreteAccessoryType::IfcDiscreteAccessoryType(IfcAbstractEntity* e) : IfcElementComponentType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcDiscreteAccessoryType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcDiscreteAccessoryType::IfcDiscreteAccessoryType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcDiscreteAccessoryTypeEnum::IfcDiscreteAccessoryTypeEnum v10_PredefinedType) : IfcElementComponentType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcDiscreteAccessoryTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcDistributionChamberElement
-bool IfcDistributionChamberElement::hasPredefinedType() { return !entity->getArgument(8)->isNull(); }
-IfcDistributionChamberElementTypeEnum::IfcDistributionChamberElementTypeEnum IfcDistributionChamberElement::PredefinedType() { return IfcDistributionChamberElementTypeEnum::FromString(*entity->getArgument(8)); }
+bool IfcDistributionChamberElement::hasPredefinedType() const { return !entity->getArgument(8)->isNull(); }
+IfcDistributionChamberElementTypeEnum::IfcDistributionChamberElementTypeEnum IfcDistributionChamberElement::PredefinedType() const { return IfcDistributionChamberElementTypeEnum::FromString(*entity->getArgument(8)); }
 void IfcDistributionChamberElement::setPredefinedType(IfcDistributionChamberElementTypeEnum::IfcDistributionChamberElementTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcDistributionChamberElementTypeEnum::ToString(v)); }
 bool IfcDistributionChamberElement::is(Type::Enum v) const { return v == Type::IfcDistributionChamberElement || IfcDistributionFlowElement::is(v); }
 Type::Enum IfcDistributionChamberElement::type() const { return Type::IfcDistributionChamberElement; }
 Type::Enum IfcDistributionChamberElement::Class() { return Type::IfcDistributionChamberElement; }
-IfcDistributionChamberElement::IfcDistributionChamberElement(IfcAbstractEntityPtr e) : IfcDistributionFlowElement((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcDistributionChamberElement)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcDistributionChamberElement::IfcDistributionChamberElement(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcDistributionChamberElementTypeEnum::IfcDistributionChamberElementTypeEnum > v9_PredefinedType) : IfcDistributionFlowElement((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcDistributionChamberElementTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcDistributionChamberElement::IfcDistributionChamberElement(IfcAbstractEntity* e) : IfcDistributionFlowElement((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcDistributionChamberElement)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcDistributionChamberElement::IfcDistributionChamberElement(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcDistributionChamberElementTypeEnum::IfcDistributionChamberElementTypeEnum > v9_PredefinedType) : IfcDistributionFlowElement((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcDistributionChamberElementTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcDistributionChamberElementType
-IfcDistributionChamberElementTypeEnum::IfcDistributionChamberElementTypeEnum IfcDistributionChamberElementType::PredefinedType() { return IfcDistributionChamberElementTypeEnum::FromString(*entity->getArgument(9)); }
+IfcDistributionChamberElementTypeEnum::IfcDistributionChamberElementTypeEnum IfcDistributionChamberElementType::PredefinedType() const { return IfcDistributionChamberElementTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcDistributionChamberElementType::setPredefinedType(IfcDistributionChamberElementTypeEnum::IfcDistributionChamberElementTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcDistributionChamberElementTypeEnum::ToString(v)); }
 bool IfcDistributionChamberElementType::is(Type::Enum v) const { return v == Type::IfcDistributionChamberElementType || IfcDistributionFlowElementType::is(v); }
 Type::Enum IfcDistributionChamberElementType::type() const { return Type::IfcDistributionChamberElementType; }
 Type::Enum IfcDistributionChamberElementType::Class() { return Type::IfcDistributionChamberElementType; }
-IfcDistributionChamberElementType::IfcDistributionChamberElementType(IfcAbstractEntityPtr e) : IfcDistributionFlowElementType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcDistributionChamberElementType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcDistributionChamberElementType::IfcDistributionChamberElementType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcDistributionChamberElementTypeEnum::IfcDistributionChamberElementTypeEnum v10_PredefinedType) : IfcDistributionFlowElementType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcDistributionChamberElementTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcDistributionChamberElementType::IfcDistributionChamberElementType(IfcAbstractEntity* e) : IfcDistributionFlowElementType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcDistributionChamberElementType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcDistributionChamberElementType::IfcDistributionChamberElementType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcDistributionChamberElementTypeEnum::IfcDistributionChamberElementTypeEnum v10_PredefinedType) : IfcDistributionFlowElementType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcDistributionChamberElementTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcDistributionCircuit
 bool IfcDistributionCircuit::is(Type::Enum v) const { return v == Type::IfcDistributionCircuit || IfcDistributionSystem::is(v); }
 Type::Enum IfcDistributionCircuit::type() const { return Type::IfcDistributionCircuit; }
 Type::Enum IfcDistributionCircuit::Class() { return Type::IfcDistributionCircuit; }
-IfcDistributionCircuit::IfcDistributionCircuit(IfcAbstractEntityPtr e) : IfcDistributionSystem((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcDistributionCircuit)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcDistributionCircuit::IfcDistributionCircuit(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, boost::optional< IfcLabel > v6_LongName, boost::optional< IfcDistributionSystemEnum::IfcDistributionSystemEnum > v7_PredefinedType) : IfcDistributionSystem((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } if (v6_LongName) { e->setArgument(5,(*v6_LongName)); } else { e->setArgument(5); } if (v7_PredefinedType) { e->setArgument(6,*v7_PredefinedType,IfcDistributionSystemEnum::ToString(*v7_PredefinedType)); } else { e->setArgument(6); } entity = e; EntityBuffer::Add(this); }
+IfcDistributionCircuit::IfcDistributionCircuit(IfcAbstractEntity* e) : IfcDistributionSystem((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcDistributionCircuit)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcDistributionCircuit::IfcDistributionCircuit(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, boost::optional< std::string > v6_LongName, boost::optional< IfcDistributionSystemEnum::IfcDistributionSystemEnum > v7_PredefinedType) : IfcDistributionSystem((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } if (v6_LongName) { e->setArgument(5,(*v6_LongName)); } else { e->setArgument(5); } if (v7_PredefinedType) { e->setArgument(6,*v7_PredefinedType,IfcDistributionSystemEnum::ToString(*v7_PredefinedType)); } else { e->setArgument(6); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcDistributionControlElement
-IfcRelFlowControlElements::list IfcDistributionControlElement::AssignedToFlowElement() { RETURN_INVERSE(IfcRelFlowControlElements) }
+IfcRelFlowControlElements::list::ptr IfcDistributionControlElement::AssignedToFlowElement() const { return entity->getInverse(Type::IfcRelFlowControlElements, 4)->as<IfcRelFlowControlElements>(); }
 bool IfcDistributionControlElement::is(Type::Enum v) const { return v == Type::IfcDistributionControlElement || IfcDistributionElement::is(v); }
 Type::Enum IfcDistributionControlElement::type() const { return Type::IfcDistributionControlElement; }
 Type::Enum IfcDistributionControlElement::Class() { return Type::IfcDistributionControlElement; }
-IfcDistributionControlElement::IfcDistributionControlElement(IfcAbstractEntityPtr e) : IfcDistributionElement((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcDistributionControlElement)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcDistributionControlElement::IfcDistributionControlElement(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag) : IfcDistributionElement((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
+IfcDistributionControlElement::IfcDistributionControlElement(IfcAbstractEntity* e) : IfcDistributionElement((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcDistributionControlElement)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcDistributionControlElement::IfcDistributionControlElement(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag) : IfcDistributionElement((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcDistributionControlElementType
 bool IfcDistributionControlElementType::is(Type::Enum v) const { return v == Type::IfcDistributionControlElementType || IfcDistributionElementType::is(v); }
 Type::Enum IfcDistributionControlElementType::type() const { return Type::IfcDistributionControlElementType; }
 Type::Enum IfcDistributionControlElementType::Class() { return Type::IfcDistributionControlElementType; }
-IfcDistributionControlElementType::IfcDistributionControlElementType(IfcAbstractEntityPtr e) : IfcDistributionElementType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcDistributionControlElementType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcDistributionControlElementType::IfcDistributionControlElementType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType) : IfcDistributionElementType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcDistributionControlElementType::IfcDistributionControlElementType(IfcAbstractEntity* e) : IfcDistributionElementType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcDistributionControlElementType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcDistributionControlElementType::IfcDistributionControlElementType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType) : IfcDistributionElementType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcDistributionElement
-IfcRelConnectsPortToElement::list IfcDistributionElement::HasPorts() { RETURN_INVERSE(IfcRelConnectsPortToElement) }
+IfcRelConnectsPortToElement::list::ptr IfcDistributionElement::HasPorts() const { return entity->getInverse(Type::IfcRelConnectsPortToElement, 5)->as<IfcRelConnectsPortToElement>(); }
 bool IfcDistributionElement::is(Type::Enum v) const { return v == Type::IfcDistributionElement || IfcElement::is(v); }
 Type::Enum IfcDistributionElement::type() const { return Type::IfcDistributionElement; }
 Type::Enum IfcDistributionElement::Class() { return Type::IfcDistributionElement; }
-IfcDistributionElement::IfcDistributionElement(IfcAbstractEntityPtr e) : IfcElement((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcDistributionElement)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcDistributionElement::IfcDistributionElement(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag) : IfcElement((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
+IfcDistributionElement::IfcDistributionElement(IfcAbstractEntity* e) : IfcElement((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcDistributionElement)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcDistributionElement::IfcDistributionElement(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag) : IfcElement((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcDistributionElementType
 bool IfcDistributionElementType::is(Type::Enum v) const { return v == Type::IfcDistributionElementType || IfcElementType::is(v); }
 Type::Enum IfcDistributionElementType::type() const { return Type::IfcDistributionElementType; }
 Type::Enum IfcDistributionElementType::Class() { return Type::IfcDistributionElementType; }
-IfcDistributionElementType::IfcDistributionElementType(IfcAbstractEntityPtr e) : IfcElementType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcDistributionElementType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcDistributionElementType::IfcDistributionElementType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType) : IfcElementType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcDistributionElementType::IfcDistributionElementType(IfcAbstractEntity* e) : IfcElementType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcDistributionElementType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcDistributionElementType::IfcDistributionElementType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType) : IfcElementType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcDistributionFlowElement
-IfcRelFlowControlElements::list IfcDistributionFlowElement::HasControlElements() { RETURN_INVERSE(IfcRelFlowControlElements) }
+IfcRelFlowControlElements::list::ptr IfcDistributionFlowElement::HasControlElements() const { return entity->getInverse(Type::IfcRelFlowControlElements, 5)->as<IfcRelFlowControlElements>(); }
 bool IfcDistributionFlowElement::is(Type::Enum v) const { return v == Type::IfcDistributionFlowElement || IfcDistributionElement::is(v); }
 Type::Enum IfcDistributionFlowElement::type() const { return Type::IfcDistributionFlowElement; }
 Type::Enum IfcDistributionFlowElement::Class() { return Type::IfcDistributionFlowElement; }
-IfcDistributionFlowElement::IfcDistributionFlowElement(IfcAbstractEntityPtr e) : IfcDistributionElement((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcDistributionFlowElement)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcDistributionFlowElement::IfcDistributionFlowElement(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag) : IfcDistributionElement((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
+IfcDistributionFlowElement::IfcDistributionFlowElement(IfcAbstractEntity* e) : IfcDistributionElement((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcDistributionFlowElement)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcDistributionFlowElement::IfcDistributionFlowElement(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag) : IfcDistributionElement((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcDistributionFlowElementType
 bool IfcDistributionFlowElementType::is(Type::Enum v) const { return v == Type::IfcDistributionFlowElementType || IfcDistributionElementType::is(v); }
 Type::Enum IfcDistributionFlowElementType::type() const { return Type::IfcDistributionFlowElementType; }
 Type::Enum IfcDistributionFlowElementType::Class() { return Type::IfcDistributionFlowElementType; }
-IfcDistributionFlowElementType::IfcDistributionFlowElementType(IfcAbstractEntityPtr e) : IfcDistributionElementType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcDistributionFlowElementType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcDistributionFlowElementType::IfcDistributionFlowElementType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType) : IfcDistributionElementType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcDistributionFlowElementType::IfcDistributionFlowElementType(IfcAbstractEntity* e) : IfcDistributionElementType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcDistributionFlowElementType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcDistributionFlowElementType::IfcDistributionFlowElementType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType) : IfcDistributionElementType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcDistributionPort
-bool IfcDistributionPort::hasFlowDirection() { return !entity->getArgument(7)->isNull(); }
-IfcFlowDirectionEnum::IfcFlowDirectionEnum IfcDistributionPort::FlowDirection() { return IfcFlowDirectionEnum::FromString(*entity->getArgument(7)); }
+bool IfcDistributionPort::hasFlowDirection() const { return !entity->getArgument(7)->isNull(); }
+IfcFlowDirectionEnum::IfcFlowDirectionEnum IfcDistributionPort::FlowDirection() const { return IfcFlowDirectionEnum::FromString(*entity->getArgument(7)); }
 void IfcDistributionPort::setFlowDirection(IfcFlowDirectionEnum::IfcFlowDirectionEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v,IfcFlowDirectionEnum::ToString(v)); }
-bool IfcDistributionPort::hasPredefinedType() { return !entity->getArgument(8)->isNull(); }
-IfcDistributionPortTypeEnum::IfcDistributionPortTypeEnum IfcDistributionPort::PredefinedType() { return IfcDistributionPortTypeEnum::FromString(*entity->getArgument(8)); }
+bool IfcDistributionPort::hasPredefinedType() const { return !entity->getArgument(8)->isNull(); }
+IfcDistributionPortTypeEnum::IfcDistributionPortTypeEnum IfcDistributionPort::PredefinedType() const { return IfcDistributionPortTypeEnum::FromString(*entity->getArgument(8)); }
 void IfcDistributionPort::setPredefinedType(IfcDistributionPortTypeEnum::IfcDistributionPortTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcDistributionPortTypeEnum::ToString(v)); }
-bool IfcDistributionPort::hasSystemType() { return !entity->getArgument(9)->isNull(); }
-IfcDistributionSystemEnum::IfcDistributionSystemEnum IfcDistributionPort::SystemType() { return IfcDistributionSystemEnum::FromString(*entity->getArgument(9)); }
+bool IfcDistributionPort::hasSystemType() const { return !entity->getArgument(9)->isNull(); }
+IfcDistributionSystemEnum::IfcDistributionSystemEnum IfcDistributionPort::SystemType() const { return IfcDistributionSystemEnum::FromString(*entity->getArgument(9)); }
 void IfcDistributionPort::setSystemType(IfcDistributionSystemEnum::IfcDistributionSystemEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcDistributionSystemEnum::ToString(v)); }
 bool IfcDistributionPort::is(Type::Enum v) const { return v == Type::IfcDistributionPort || IfcPort::is(v); }
 Type::Enum IfcDistributionPort::type() const { return Type::IfcDistributionPort; }
 Type::Enum IfcDistributionPort::Class() { return Type::IfcDistributionPort; }
-IfcDistributionPort::IfcDistributionPort(IfcAbstractEntityPtr e) : IfcPort((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcDistributionPort)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcDistributionPort::IfcDistributionPort(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcFlowDirectionEnum::IfcFlowDirectionEnum > v8_FlowDirection, boost::optional< IfcDistributionPortTypeEnum::IfcDistributionPortTypeEnum > v9_PredefinedType, boost::optional< IfcDistributionSystemEnum::IfcDistributionSystemEnum > v10_SystemType) : IfcPort((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_FlowDirection) { e->setArgument(7,*v8_FlowDirection,IfcFlowDirectionEnum::ToString(*v8_FlowDirection)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcDistributionPortTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } if (v10_SystemType) { e->setArgument(9,*v10_SystemType,IfcDistributionSystemEnum::ToString(*v10_SystemType)); } else { e->setArgument(9); } entity = e; EntityBuffer::Add(this); }
+IfcDistributionPort::IfcDistributionPort(IfcAbstractEntity* e) : IfcPort((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcDistributionPort)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcDistributionPort::IfcDistributionPort(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcFlowDirectionEnum::IfcFlowDirectionEnum > v8_FlowDirection, boost::optional< IfcDistributionPortTypeEnum::IfcDistributionPortTypeEnum > v9_PredefinedType, boost::optional< IfcDistributionSystemEnum::IfcDistributionSystemEnum > v10_SystemType) : IfcPort((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_FlowDirection) { e->setArgument(7,*v8_FlowDirection,IfcFlowDirectionEnum::ToString(*v8_FlowDirection)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcDistributionPortTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } if (v10_SystemType) { e->setArgument(9,*v10_SystemType,IfcDistributionSystemEnum::ToString(*v10_SystemType)); } else { e->setArgument(9); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcDistributionSystem
-bool IfcDistributionSystem::hasLongName() { return !entity->getArgument(5)->isNull(); }
-IfcLabel IfcDistributionSystem::LongName() { return *entity->getArgument(5); }
-void IfcDistributionSystem::setLongName(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-bool IfcDistributionSystem::hasPredefinedType() { return !entity->getArgument(6)->isNull(); }
-IfcDistributionSystemEnum::IfcDistributionSystemEnum IfcDistributionSystem::PredefinedType() { return IfcDistributionSystemEnum::FromString(*entity->getArgument(6)); }
+bool IfcDistributionSystem::hasLongName() const { return !entity->getArgument(5)->isNull(); }
+std::string IfcDistributionSystem::LongName() const { return *entity->getArgument(5); }
+void IfcDistributionSystem::setLongName(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+bool IfcDistributionSystem::hasPredefinedType() const { return !entity->getArgument(6)->isNull(); }
+IfcDistributionSystemEnum::IfcDistributionSystemEnum IfcDistributionSystem::PredefinedType() const { return IfcDistributionSystemEnum::FromString(*entity->getArgument(6)); }
 void IfcDistributionSystem::setPredefinedType(IfcDistributionSystemEnum::IfcDistributionSystemEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v,IfcDistributionSystemEnum::ToString(v)); }
 bool IfcDistributionSystem::is(Type::Enum v) const { return v == Type::IfcDistributionSystem || IfcSystem::is(v); }
 Type::Enum IfcDistributionSystem::type() const { return Type::IfcDistributionSystem; }
 Type::Enum IfcDistributionSystem::Class() { return Type::IfcDistributionSystem; }
-IfcDistributionSystem::IfcDistributionSystem(IfcAbstractEntityPtr e) : IfcSystem((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcDistributionSystem)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcDistributionSystem::IfcDistributionSystem(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, boost::optional< IfcLabel > v6_LongName, boost::optional< IfcDistributionSystemEnum::IfcDistributionSystemEnum > v7_PredefinedType) : IfcSystem((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } if (v6_LongName) { e->setArgument(5,(*v6_LongName)); } else { e->setArgument(5); } if (v7_PredefinedType) { e->setArgument(6,*v7_PredefinedType,IfcDistributionSystemEnum::ToString(*v7_PredefinedType)); } else { e->setArgument(6); } entity = e; EntityBuffer::Add(this); }
+IfcDistributionSystem::IfcDistributionSystem(IfcAbstractEntity* e) : IfcSystem((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcDistributionSystem)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcDistributionSystem::IfcDistributionSystem(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, boost::optional< std::string > v6_LongName, boost::optional< IfcDistributionSystemEnum::IfcDistributionSystemEnum > v7_PredefinedType) : IfcSystem((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } if (v6_LongName) { e->setArgument(5,(*v6_LongName)); } else { e->setArgument(5); } if (v7_PredefinedType) { e->setArgument(6,*v7_PredefinedType,IfcDistributionSystemEnum::ToString(*v7_PredefinedType)); } else { e->setArgument(6); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcDocumentInformation
-IfcIdentifier IfcDocumentInformation::Identification() { return *entity->getArgument(0); }
-void IfcDocumentInformation::setIdentification(IfcIdentifier v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-IfcLabel IfcDocumentInformation::Name() { return *entity->getArgument(1); }
-void IfcDocumentInformation::setName(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-bool IfcDocumentInformation::hasDescription() { return !entity->getArgument(2)->isNull(); }
-IfcText IfcDocumentInformation::Description() { return *entity->getArgument(2); }
-void IfcDocumentInformation::setDescription(IfcText v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-bool IfcDocumentInformation::hasLocation() { return !entity->getArgument(3)->isNull(); }
-IfcURIReference IfcDocumentInformation::Location() { return *entity->getArgument(3); }
-void IfcDocumentInformation::setLocation(IfcURIReference v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-bool IfcDocumentInformation::hasPurpose() { return !entity->getArgument(4)->isNull(); }
-IfcText IfcDocumentInformation::Purpose() { return *entity->getArgument(4); }
-void IfcDocumentInformation::setPurpose(IfcText v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-bool IfcDocumentInformation::hasIntendedUse() { return !entity->getArgument(5)->isNull(); }
-IfcText IfcDocumentInformation::IntendedUse() { return *entity->getArgument(5); }
-void IfcDocumentInformation::setIntendedUse(IfcText v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-bool IfcDocumentInformation::hasScope() { return !entity->getArgument(6)->isNull(); }
-IfcText IfcDocumentInformation::Scope() { return *entity->getArgument(6); }
-void IfcDocumentInformation::setScope(IfcText v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
-bool IfcDocumentInformation::hasRevision() { return !entity->getArgument(7)->isNull(); }
-IfcLabel IfcDocumentInformation::Revision() { return *entity->getArgument(7); }
-void IfcDocumentInformation::setRevision(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
-bool IfcDocumentInformation::hasDocumentOwner() { return !entity->getArgument(8)->isNull(); }
-IfcActorSelect IfcDocumentInformation::DocumentOwner() { return *entity->getArgument(8); }
-void IfcDocumentInformation::setDocumentOwner(IfcActorSelect v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
-bool IfcDocumentInformation::hasEditors() { return !entity->getArgument(9)->isNull(); }
-SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > IfcDocumentInformation::Editors() { RETURN_AS_LIST(IfcUtil::IfcAbstractSelect,9) }
-void IfcDocumentInformation::setEditors(SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v->generalize()); }
-bool IfcDocumentInformation::hasCreationTime() { return !entity->getArgument(10)->isNull(); }
-IfcDateTime IfcDocumentInformation::CreationTime() { return *entity->getArgument(10); }
-void IfcDocumentInformation::setCreationTime(IfcDateTime v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
-bool IfcDocumentInformation::hasLastRevisionTime() { return !entity->getArgument(11)->isNull(); }
-IfcDateTime IfcDocumentInformation::LastRevisionTime() { return *entity->getArgument(11); }
-void IfcDocumentInformation::setLastRevisionTime(IfcDateTime v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(11,v); }
-bool IfcDocumentInformation::hasElectronicFormat() { return !entity->getArgument(12)->isNull(); }
-IfcIdentifier IfcDocumentInformation::ElectronicFormat() { return *entity->getArgument(12); }
-void IfcDocumentInformation::setElectronicFormat(IfcIdentifier v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(12,v); }
-bool IfcDocumentInformation::hasValidFrom() { return !entity->getArgument(13)->isNull(); }
-IfcDate IfcDocumentInformation::ValidFrom() { return *entity->getArgument(13); }
-void IfcDocumentInformation::setValidFrom(IfcDate v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(13,v); }
-bool IfcDocumentInformation::hasValidUntil() { return !entity->getArgument(14)->isNull(); }
-IfcDate IfcDocumentInformation::ValidUntil() { return *entity->getArgument(14); }
-void IfcDocumentInformation::setValidUntil(IfcDate v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(14,v); }
-bool IfcDocumentInformation::hasConfidentiality() { return !entity->getArgument(15)->isNull(); }
-IfcDocumentConfidentialityEnum::IfcDocumentConfidentialityEnum IfcDocumentInformation::Confidentiality() { return IfcDocumentConfidentialityEnum::FromString(*entity->getArgument(15)); }
+std::string IfcDocumentInformation::Identification() const { return *entity->getArgument(0); }
+void IfcDocumentInformation::setIdentification(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+std::string IfcDocumentInformation::Name() const { return *entity->getArgument(1); }
+void IfcDocumentInformation::setName(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+bool IfcDocumentInformation::hasDescription() const { return !entity->getArgument(2)->isNull(); }
+std::string IfcDocumentInformation::Description() const { return *entity->getArgument(2); }
+void IfcDocumentInformation::setDescription(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+bool IfcDocumentInformation::hasLocation() const { return !entity->getArgument(3)->isNull(); }
+std::string IfcDocumentInformation::Location() const { return *entity->getArgument(3); }
+void IfcDocumentInformation::setLocation(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+bool IfcDocumentInformation::hasPurpose() const { return !entity->getArgument(4)->isNull(); }
+std::string IfcDocumentInformation::Purpose() const { return *entity->getArgument(4); }
+void IfcDocumentInformation::setPurpose(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+bool IfcDocumentInformation::hasIntendedUse() const { return !entity->getArgument(5)->isNull(); }
+std::string IfcDocumentInformation::IntendedUse() const { return *entity->getArgument(5); }
+void IfcDocumentInformation::setIntendedUse(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+bool IfcDocumentInformation::hasScope() const { return !entity->getArgument(6)->isNull(); }
+std::string IfcDocumentInformation::Scope() const { return *entity->getArgument(6); }
+void IfcDocumentInformation::setScope(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
+bool IfcDocumentInformation::hasRevision() const { return !entity->getArgument(7)->isNull(); }
+std::string IfcDocumentInformation::Revision() const { return *entity->getArgument(7); }
+void IfcDocumentInformation::setRevision(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
+bool IfcDocumentInformation::hasDocumentOwner() const { return !entity->getArgument(8)->isNull(); }
+IfcActorSelect* IfcDocumentInformation::DocumentOwner() const { return (IfcActorSelect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(8))); }
+void IfcDocumentInformation::setDocumentOwner(IfcActorSelect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
+bool IfcDocumentInformation::hasEditors() const { return !entity->getArgument(9)->isNull(); }
+IfcEntityList::ptr IfcDocumentInformation::Editors() const { return *entity->getArgument(9); }
+void IfcDocumentInformation::setEditors(IfcEntityList::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
+bool IfcDocumentInformation::hasCreationTime() const { return !entity->getArgument(10)->isNull(); }
+std::string IfcDocumentInformation::CreationTime() const { return *entity->getArgument(10); }
+void IfcDocumentInformation::setCreationTime(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
+bool IfcDocumentInformation::hasLastRevisionTime() const { return !entity->getArgument(11)->isNull(); }
+std::string IfcDocumentInformation::LastRevisionTime() const { return *entity->getArgument(11); }
+void IfcDocumentInformation::setLastRevisionTime(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(11,v); }
+bool IfcDocumentInformation::hasElectronicFormat() const { return !entity->getArgument(12)->isNull(); }
+std::string IfcDocumentInformation::ElectronicFormat() const { return *entity->getArgument(12); }
+void IfcDocumentInformation::setElectronicFormat(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(12,v); }
+bool IfcDocumentInformation::hasValidFrom() const { return !entity->getArgument(13)->isNull(); }
+std::string IfcDocumentInformation::ValidFrom() const { return *entity->getArgument(13); }
+void IfcDocumentInformation::setValidFrom(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(13,v); }
+bool IfcDocumentInformation::hasValidUntil() const { return !entity->getArgument(14)->isNull(); }
+std::string IfcDocumentInformation::ValidUntil() const { return *entity->getArgument(14); }
+void IfcDocumentInformation::setValidUntil(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(14,v); }
+bool IfcDocumentInformation::hasConfidentiality() const { return !entity->getArgument(15)->isNull(); }
+IfcDocumentConfidentialityEnum::IfcDocumentConfidentialityEnum IfcDocumentInformation::Confidentiality() const { return IfcDocumentConfidentialityEnum::FromString(*entity->getArgument(15)); }
 void IfcDocumentInformation::setConfidentiality(IfcDocumentConfidentialityEnum::IfcDocumentConfidentialityEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(15,v,IfcDocumentConfidentialityEnum::ToString(v)); }
-bool IfcDocumentInformation::hasStatus() { return !entity->getArgument(16)->isNull(); }
-IfcDocumentStatusEnum::IfcDocumentStatusEnum IfcDocumentInformation::Status() { return IfcDocumentStatusEnum::FromString(*entity->getArgument(16)); }
+bool IfcDocumentInformation::hasStatus() const { return !entity->getArgument(16)->isNull(); }
+IfcDocumentStatusEnum::IfcDocumentStatusEnum IfcDocumentInformation::Status() const { return IfcDocumentStatusEnum::FromString(*entity->getArgument(16)); }
 void IfcDocumentInformation::setStatus(IfcDocumentStatusEnum::IfcDocumentStatusEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(16,v,IfcDocumentStatusEnum::ToString(v)); }
-IfcRelAssociatesDocument::list IfcDocumentInformation::DocumentInfoForObjects() { RETURN_INVERSE(IfcRelAssociatesDocument) }
-IfcDocumentReference::list IfcDocumentInformation::HasDocumentReferences() { RETURN_INVERSE(IfcDocumentReference) }
-IfcDocumentInformationRelationship::list IfcDocumentInformation::IsPointedTo() { RETURN_INVERSE(IfcDocumentInformationRelationship) }
-IfcDocumentInformationRelationship::list IfcDocumentInformation::IsPointer() { RETURN_INVERSE(IfcDocumentInformationRelationship) }
+IfcRelAssociatesDocument::list::ptr IfcDocumentInformation::DocumentInfoForObjects() const { return entity->getInverse(Type::IfcRelAssociatesDocument, 5)->as<IfcRelAssociatesDocument>(); }
+IfcDocumentReference::list::ptr IfcDocumentInformation::HasDocumentReferences() const { return entity->getInverse(Type::IfcDocumentReference, 4)->as<IfcDocumentReference>(); }
+IfcDocumentInformationRelationship::list::ptr IfcDocumentInformation::IsPointedTo() const { return entity->getInverse(Type::IfcDocumentInformationRelationship, 3)->as<IfcDocumentInformationRelationship>(); }
+IfcDocumentInformationRelationship::list::ptr IfcDocumentInformation::IsPointer() const { return entity->getInverse(Type::IfcDocumentInformationRelationship, 2)->as<IfcDocumentInformationRelationship>(); }
 bool IfcDocumentInformation::is(Type::Enum v) const { return v == Type::IfcDocumentInformation || IfcExternalInformation::is(v); }
 Type::Enum IfcDocumentInformation::type() const { return Type::IfcDocumentInformation; }
 Type::Enum IfcDocumentInformation::Class() { return Type::IfcDocumentInformation; }
-IfcDocumentInformation::IfcDocumentInformation(IfcAbstractEntityPtr e) : IfcExternalInformation((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcDocumentInformation)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcDocumentInformation::IfcDocumentInformation(IfcIdentifier v1_Identification, IfcLabel v2_Name, boost::optional< IfcText > v3_Description, boost::optional< IfcURIReference > v4_Location, boost::optional< IfcText > v5_Purpose, boost::optional< IfcText > v6_IntendedUse, boost::optional< IfcText > v7_Scope, boost::optional< IfcLabel > v8_Revision, boost::optional< IfcActorSelect > v9_DocumentOwner, boost::optional< IfcEntities > v10_Editors, boost::optional< IfcDateTime > v11_CreationTime, boost::optional< IfcDateTime > v12_LastRevisionTime, boost::optional< IfcIdentifier > v13_ElectronicFormat, boost::optional< IfcDate > v14_ValidFrom, boost::optional< IfcDate > v15_ValidUntil, boost::optional< IfcDocumentConfidentialityEnum::IfcDocumentConfidentialityEnum > v16_Confidentiality, boost::optional< IfcDocumentStatusEnum::IfcDocumentStatusEnum > v17_Status) : IfcExternalInformation((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Identification)); e->setArgument(1,(v2_Name)); if (v3_Description) { e->setArgument(2,(*v3_Description)); } else { e->setArgument(2); } if (v4_Location) { e->setArgument(3,(*v4_Location)); } else { e->setArgument(3); } if (v5_Purpose) { e->setArgument(4,(*v5_Purpose)); } else { e->setArgument(4); } if (v6_IntendedUse) { e->setArgument(5,(*v6_IntendedUse)); } else { e->setArgument(5); } if (v7_Scope) { e->setArgument(6,(*v7_Scope)); } else { e->setArgument(6); } if (v8_Revision) { e->setArgument(7,(*v8_Revision)); } else { e->setArgument(7); } if (v9_DocumentOwner) { e->setArgument(8,(*v9_DocumentOwner)); } else { e->setArgument(8); } if (v10_Editors) { e->setArgument(9,(*v10_Editors)); } else { e->setArgument(9); } if (v11_CreationTime) { e->setArgument(10,(*v11_CreationTime)); } else { e->setArgument(10); } if (v12_LastRevisionTime) { e->setArgument(11,(*v12_LastRevisionTime)); } else { e->setArgument(11); } if (v13_ElectronicFormat) { e->setArgument(12,(*v13_ElectronicFormat)); } else { e->setArgument(12); } if (v14_ValidFrom) { e->setArgument(13,(*v14_ValidFrom)); } else { e->setArgument(13); } if (v15_ValidUntil) { e->setArgument(14,(*v15_ValidUntil)); } else { e->setArgument(14); } if (v16_Confidentiality) { e->setArgument(15,*v16_Confidentiality,IfcDocumentConfidentialityEnum::ToString(*v16_Confidentiality)); } else { e->setArgument(15); } if (v17_Status) { e->setArgument(16,*v17_Status,IfcDocumentStatusEnum::ToString(*v17_Status)); } else { e->setArgument(16); } entity = e; EntityBuffer::Add(this); }
+IfcDocumentInformation::IfcDocumentInformation(IfcAbstractEntity* e) : IfcExternalInformation((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcDocumentInformation)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcDocumentInformation::IfcDocumentInformation(std::string v1_Identification, std::string v2_Name, boost::optional< std::string > v3_Description, boost::optional< std::string > v4_Location, boost::optional< std::string > v5_Purpose, boost::optional< std::string > v6_IntendedUse, boost::optional< std::string > v7_Scope, boost::optional< std::string > v8_Revision, IfcActorSelect* v9_DocumentOwner, boost::optional< IfcEntityList::ptr > v10_Editors, boost::optional< std::string > v11_CreationTime, boost::optional< std::string > v12_LastRevisionTime, boost::optional< std::string > v13_ElectronicFormat, boost::optional< std::string > v14_ValidFrom, boost::optional< std::string > v15_ValidUntil, boost::optional< IfcDocumentConfidentialityEnum::IfcDocumentConfidentialityEnum > v16_Confidentiality, boost::optional< IfcDocumentStatusEnum::IfcDocumentStatusEnum > v17_Status) : IfcExternalInformation((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Identification)); e->setArgument(1,(v2_Name)); if (v3_Description) { e->setArgument(2,(*v3_Description)); } else { e->setArgument(2); } if (v4_Location) { e->setArgument(3,(*v4_Location)); } else { e->setArgument(3); } if (v5_Purpose) { e->setArgument(4,(*v5_Purpose)); } else { e->setArgument(4); } if (v6_IntendedUse) { e->setArgument(5,(*v6_IntendedUse)); } else { e->setArgument(5); } if (v7_Scope) { e->setArgument(6,(*v7_Scope)); } else { e->setArgument(6); } if (v8_Revision) { e->setArgument(7,(*v8_Revision)); } else { e->setArgument(7); } e->setArgument(8,(v9_DocumentOwner)); if (v10_Editors) { e->setArgument(9,(*v10_Editors)); } else { e->setArgument(9); } if (v11_CreationTime) { e->setArgument(10,(*v11_CreationTime)); } else { e->setArgument(10); } if (v12_LastRevisionTime) { e->setArgument(11,(*v12_LastRevisionTime)); } else { e->setArgument(11); } if (v13_ElectronicFormat) { e->setArgument(12,(*v13_ElectronicFormat)); } else { e->setArgument(12); } if (v14_ValidFrom) { e->setArgument(13,(*v14_ValidFrom)); } else { e->setArgument(13); } if (v15_ValidUntil) { e->setArgument(14,(*v15_ValidUntil)); } else { e->setArgument(14); } if (v16_Confidentiality) { e->setArgument(15,*v16_Confidentiality,IfcDocumentConfidentialityEnum::ToString(*v16_Confidentiality)); } else { e->setArgument(15); } if (v17_Status) { e->setArgument(16,*v17_Status,IfcDocumentStatusEnum::ToString(*v17_Status)); } else { e->setArgument(16); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcDocumentInformationRelationship
-IfcDocumentInformation* IfcDocumentInformationRelationship::RelatingDocument() { return (IfcDocumentInformation*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(2))); }
+IfcDocumentInformation* IfcDocumentInformationRelationship::RelatingDocument() const { return (IfcDocumentInformation*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(2))); }
 void IfcDocumentInformationRelationship::setRelatingDocument(IfcDocumentInformation* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-SHARED_PTR< IfcTemplatedEntityList< IfcDocumentInformation > > IfcDocumentInformationRelationship::RelatedDocuments() { RETURN_AS_LIST(IfcDocumentInformation,3) }
-void IfcDocumentInformationRelationship::setRelatedDocuments(SHARED_PTR< IfcTemplatedEntityList< IfcDocumentInformation > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v->generalize()); }
-bool IfcDocumentInformationRelationship::hasRelationshipType() { return !entity->getArgument(4)->isNull(); }
-IfcLabel IfcDocumentInformationRelationship::RelationshipType() { return *entity->getArgument(4); }
-void IfcDocumentInformationRelationship::setRelationshipType(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+IfcTemplatedEntityList< IfcDocumentInformation >::ptr IfcDocumentInformationRelationship::RelatedDocuments() const { IfcEntityList::ptr es = *entity->getArgument(3); return es->as<IfcDocumentInformation>(); }
+void IfcDocumentInformationRelationship::setRelatedDocuments(IfcTemplatedEntityList< IfcDocumentInformation >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v->generalize()); }
+bool IfcDocumentInformationRelationship::hasRelationshipType() const { return !entity->getArgument(4)->isNull(); }
+std::string IfcDocumentInformationRelationship::RelationshipType() const { return *entity->getArgument(4); }
+void IfcDocumentInformationRelationship::setRelationshipType(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
 bool IfcDocumentInformationRelationship::is(Type::Enum v) const { return v == Type::IfcDocumentInformationRelationship || IfcResourceLevelRelationship::is(v); }
 Type::Enum IfcDocumentInformationRelationship::type() const { return Type::IfcDocumentInformationRelationship; }
 Type::Enum IfcDocumentInformationRelationship::Class() { return Type::IfcDocumentInformationRelationship; }
-IfcDocumentInformationRelationship::IfcDocumentInformationRelationship(IfcAbstractEntityPtr e) : IfcResourceLevelRelationship((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcDocumentInformationRelationship)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcDocumentInformationRelationship::IfcDocumentInformationRelationship(boost::optional< IfcLabel > v1_Name, boost::optional< IfcText > v2_Description, IfcDocumentInformation* v3_RelatingDocument, SHARED_PTR< IfcTemplatedEntityList< IfcDocumentInformation > > v4_RelatedDocuments, boost::optional< IfcLabel > v5_RelationshipType) : IfcResourceLevelRelationship((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_RelatingDocument)); e->setArgument(3,(v4_RelatedDocuments)->generalize()); if (v5_RelationshipType) { e->setArgument(4,(*v5_RelationshipType)); } else { e->setArgument(4); } entity = e; EntityBuffer::Add(this); }
+IfcDocumentInformationRelationship::IfcDocumentInformationRelationship(IfcAbstractEntity* e) : IfcResourceLevelRelationship((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcDocumentInformationRelationship)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcDocumentInformationRelationship::IfcDocumentInformationRelationship(boost::optional< std::string > v1_Name, boost::optional< std::string > v2_Description, IfcDocumentInformation* v3_RelatingDocument, IfcTemplatedEntityList< IfcDocumentInformation >::ptr v4_RelatedDocuments, boost::optional< std::string > v5_RelationshipType) : IfcResourceLevelRelationship((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_RelatingDocument)); e->setArgument(3,(v4_RelatedDocuments)->generalize()); if (v5_RelationshipType) { e->setArgument(4,(*v5_RelationshipType)); } else { e->setArgument(4); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcDocumentReference
-bool IfcDocumentReference::hasDescription() { return !entity->getArgument(3)->isNull(); }
-IfcText IfcDocumentReference::Description() { return *entity->getArgument(3); }
-void IfcDocumentReference::setDescription(IfcText v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-bool IfcDocumentReference::hasReferencedDocument() { return !entity->getArgument(4)->isNull(); }
-IfcDocumentInformation* IfcDocumentReference::ReferencedDocument() { return (IfcDocumentInformation*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(4))); }
+bool IfcDocumentReference::hasDescription() const { return !entity->getArgument(3)->isNull(); }
+std::string IfcDocumentReference::Description() const { return *entity->getArgument(3); }
+void IfcDocumentReference::setDescription(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+bool IfcDocumentReference::hasReferencedDocument() const { return !entity->getArgument(4)->isNull(); }
+IfcDocumentInformation* IfcDocumentReference::ReferencedDocument() const { return (IfcDocumentInformation*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(4))); }
 void IfcDocumentReference::setReferencedDocument(IfcDocumentInformation* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-IfcRelAssociatesDocument::list IfcDocumentReference::DocumentRefForObjects() { RETURN_INVERSE(IfcRelAssociatesDocument) }
+IfcRelAssociatesDocument::list::ptr IfcDocumentReference::DocumentRefForObjects() const { return entity->getInverse(Type::IfcRelAssociatesDocument, 5)->as<IfcRelAssociatesDocument>(); }
 bool IfcDocumentReference::is(Type::Enum v) const { return v == Type::IfcDocumentReference || IfcExternalReference::is(v); }
 Type::Enum IfcDocumentReference::type() const { return Type::IfcDocumentReference; }
 Type::Enum IfcDocumentReference::Class() { return Type::IfcDocumentReference; }
-IfcDocumentReference::IfcDocumentReference(IfcAbstractEntityPtr e) : IfcExternalReference((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcDocumentReference)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcDocumentReference::IfcDocumentReference(boost::optional< IfcURIReference > v1_Location, boost::optional< IfcIdentifier > v2_Identification, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, IfcDocumentInformation* v5_ReferencedDocument) : IfcExternalReference((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Location) { e->setArgument(0,(*v1_Location)); } else { e->setArgument(0); } if (v2_Identification) { e->setArgument(1,(*v2_Identification)); } else { e->setArgument(1); } if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_ReferencedDocument)); entity = e; EntityBuffer::Add(this); }
+IfcDocumentReference::IfcDocumentReference(IfcAbstractEntity* e) : IfcExternalReference((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcDocumentReference)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcDocumentReference::IfcDocumentReference(boost::optional< std::string > v1_Location, boost::optional< std::string > v2_Identification, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcDocumentInformation* v5_ReferencedDocument) : IfcExternalReference((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Location) { e->setArgument(0,(*v1_Location)); } else { e->setArgument(0); } if (v2_Identification) { e->setArgument(1,(*v2_Identification)); } else { e->setArgument(1); } if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_ReferencedDocument)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcDoor
-bool IfcDoor::hasOverallHeight() { return !entity->getArgument(8)->isNull(); }
-IfcPositiveLengthMeasure IfcDoor::OverallHeight() { return *entity->getArgument(8); }
-void IfcDoor::setOverallHeight(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
-bool IfcDoor::hasOverallWidth() { return !entity->getArgument(9)->isNull(); }
-IfcPositiveLengthMeasure IfcDoor::OverallWidth() { return *entity->getArgument(9); }
-void IfcDoor::setOverallWidth(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
-bool IfcDoor::hasPredefinedType() { return !entity->getArgument(10)->isNull(); }
-IfcDoorTypeEnum::IfcDoorTypeEnum IfcDoor::PredefinedType() { return IfcDoorTypeEnum::FromString(*entity->getArgument(10)); }
+bool IfcDoor::hasOverallHeight() const { return !entity->getArgument(8)->isNull(); }
+double IfcDoor::OverallHeight() const { return *entity->getArgument(8); }
+void IfcDoor::setOverallHeight(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
+bool IfcDoor::hasOverallWidth() const { return !entity->getArgument(9)->isNull(); }
+double IfcDoor::OverallWidth() const { return *entity->getArgument(9); }
+void IfcDoor::setOverallWidth(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
+bool IfcDoor::hasPredefinedType() const { return !entity->getArgument(10)->isNull(); }
+IfcDoorTypeEnum::IfcDoorTypeEnum IfcDoor::PredefinedType() const { return IfcDoorTypeEnum::FromString(*entity->getArgument(10)); }
 void IfcDoor::setPredefinedType(IfcDoorTypeEnum::IfcDoorTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v,IfcDoorTypeEnum::ToString(v)); }
-bool IfcDoor::hasOperationType() { return !entity->getArgument(11)->isNull(); }
-IfcDoorTypeOperationEnum::IfcDoorTypeOperationEnum IfcDoor::OperationType() { return IfcDoorTypeOperationEnum::FromString(*entity->getArgument(11)); }
+bool IfcDoor::hasOperationType() const { return !entity->getArgument(11)->isNull(); }
+IfcDoorTypeOperationEnum::IfcDoorTypeOperationEnum IfcDoor::OperationType() const { return IfcDoorTypeOperationEnum::FromString(*entity->getArgument(11)); }
 void IfcDoor::setOperationType(IfcDoorTypeOperationEnum::IfcDoorTypeOperationEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(11,v,IfcDoorTypeOperationEnum::ToString(v)); }
-bool IfcDoor::hasUserDefinedOperationType() { return !entity->getArgument(12)->isNull(); }
-IfcLabel IfcDoor::UserDefinedOperationType() { return *entity->getArgument(12); }
-void IfcDoor::setUserDefinedOperationType(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(12,v); }
+bool IfcDoor::hasUserDefinedOperationType() const { return !entity->getArgument(12)->isNull(); }
+std::string IfcDoor::UserDefinedOperationType() const { return *entity->getArgument(12); }
+void IfcDoor::setUserDefinedOperationType(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(12,v); }
 bool IfcDoor::is(Type::Enum v) const { return v == Type::IfcDoor || IfcBuildingElement::is(v); }
 Type::Enum IfcDoor::type() const { return Type::IfcDoor; }
 Type::Enum IfcDoor::Class() { return Type::IfcDoor; }
-IfcDoor::IfcDoor(IfcAbstractEntityPtr e) : IfcBuildingElement((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcDoor)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcDoor::IfcDoor(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcPositiveLengthMeasure > v9_OverallHeight, boost::optional< IfcPositiveLengthMeasure > v10_OverallWidth, boost::optional< IfcDoorTypeEnum::IfcDoorTypeEnum > v11_PredefinedType, boost::optional< IfcDoorTypeOperationEnum::IfcDoorTypeOperationEnum > v12_OperationType, boost::optional< IfcLabel > v13_UserDefinedOperationType) : IfcBuildingElement((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_OverallHeight) { e->setArgument(8,(*v9_OverallHeight)); } else { e->setArgument(8); } if (v10_OverallWidth) { e->setArgument(9,(*v10_OverallWidth)); } else { e->setArgument(9); } if (v11_PredefinedType) { e->setArgument(10,*v11_PredefinedType,IfcDoorTypeEnum::ToString(*v11_PredefinedType)); } else { e->setArgument(10); } if (v12_OperationType) { e->setArgument(11,*v12_OperationType,IfcDoorTypeOperationEnum::ToString(*v12_OperationType)); } else { e->setArgument(11); } if (v13_UserDefinedOperationType) { e->setArgument(12,(*v13_UserDefinedOperationType)); } else { e->setArgument(12); } entity = e; EntityBuffer::Add(this); }
+IfcDoor::IfcDoor(IfcAbstractEntity* e) : IfcBuildingElement((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcDoor)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcDoor::IfcDoor(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< double > v9_OverallHeight, boost::optional< double > v10_OverallWidth, boost::optional< IfcDoorTypeEnum::IfcDoorTypeEnum > v11_PredefinedType, boost::optional< IfcDoorTypeOperationEnum::IfcDoorTypeOperationEnum > v12_OperationType, boost::optional< std::string > v13_UserDefinedOperationType) : IfcBuildingElement((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_OverallHeight) { e->setArgument(8,(*v9_OverallHeight)); } else { e->setArgument(8); } if (v10_OverallWidth) { e->setArgument(9,(*v10_OverallWidth)); } else { e->setArgument(9); } if (v11_PredefinedType) { e->setArgument(10,*v11_PredefinedType,IfcDoorTypeEnum::ToString(*v11_PredefinedType)); } else { e->setArgument(10); } if (v12_OperationType) { e->setArgument(11,*v12_OperationType,IfcDoorTypeOperationEnum::ToString(*v12_OperationType)); } else { e->setArgument(11); } if (v13_UserDefinedOperationType) { e->setArgument(12,(*v13_UserDefinedOperationType)); } else { e->setArgument(12); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcDoorLiningProperties
-bool IfcDoorLiningProperties::hasLiningDepth() { return !entity->getArgument(4)->isNull(); }
-IfcPositiveLengthMeasure IfcDoorLiningProperties::LiningDepth() { return *entity->getArgument(4); }
-void IfcDoorLiningProperties::setLiningDepth(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-bool IfcDoorLiningProperties::hasLiningThickness() { return !entity->getArgument(5)->isNull(); }
-IfcNonNegativeLengthMeasure IfcDoorLiningProperties::LiningThickness() { return *entity->getArgument(5); }
-void IfcDoorLiningProperties::setLiningThickness(IfcNonNegativeLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-bool IfcDoorLiningProperties::hasThresholdDepth() { return !entity->getArgument(6)->isNull(); }
-IfcPositiveLengthMeasure IfcDoorLiningProperties::ThresholdDepth() { return *entity->getArgument(6); }
-void IfcDoorLiningProperties::setThresholdDepth(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
-bool IfcDoorLiningProperties::hasThresholdThickness() { return !entity->getArgument(7)->isNull(); }
-IfcNonNegativeLengthMeasure IfcDoorLiningProperties::ThresholdThickness() { return *entity->getArgument(7); }
-void IfcDoorLiningProperties::setThresholdThickness(IfcNonNegativeLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
-bool IfcDoorLiningProperties::hasTransomThickness() { return !entity->getArgument(8)->isNull(); }
-IfcNonNegativeLengthMeasure IfcDoorLiningProperties::TransomThickness() { return *entity->getArgument(8); }
-void IfcDoorLiningProperties::setTransomThickness(IfcNonNegativeLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
-bool IfcDoorLiningProperties::hasTransomOffset() { return !entity->getArgument(9)->isNull(); }
-IfcLengthMeasure IfcDoorLiningProperties::TransomOffset() { return *entity->getArgument(9); }
-void IfcDoorLiningProperties::setTransomOffset(IfcLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
-bool IfcDoorLiningProperties::hasLiningOffset() { return !entity->getArgument(10)->isNull(); }
-IfcLengthMeasure IfcDoorLiningProperties::LiningOffset() { return *entity->getArgument(10); }
-void IfcDoorLiningProperties::setLiningOffset(IfcLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
-bool IfcDoorLiningProperties::hasThresholdOffset() { return !entity->getArgument(11)->isNull(); }
-IfcLengthMeasure IfcDoorLiningProperties::ThresholdOffset() { return *entity->getArgument(11); }
-void IfcDoorLiningProperties::setThresholdOffset(IfcLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(11,v); }
-bool IfcDoorLiningProperties::hasCasingThickness() { return !entity->getArgument(12)->isNull(); }
-IfcPositiveLengthMeasure IfcDoorLiningProperties::CasingThickness() { return *entity->getArgument(12); }
-void IfcDoorLiningProperties::setCasingThickness(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(12,v); }
-bool IfcDoorLiningProperties::hasCasingDepth() { return !entity->getArgument(13)->isNull(); }
-IfcPositiveLengthMeasure IfcDoorLiningProperties::CasingDepth() { return *entity->getArgument(13); }
-void IfcDoorLiningProperties::setCasingDepth(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(13,v); }
-bool IfcDoorLiningProperties::hasShapeAspectStyle() { return !entity->getArgument(14)->isNull(); }
-IfcShapeAspect* IfcDoorLiningProperties::ShapeAspectStyle() { return (IfcShapeAspect*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(14))); }
+bool IfcDoorLiningProperties::hasLiningDepth() const { return !entity->getArgument(4)->isNull(); }
+double IfcDoorLiningProperties::LiningDepth() const { return *entity->getArgument(4); }
+void IfcDoorLiningProperties::setLiningDepth(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+bool IfcDoorLiningProperties::hasLiningThickness() const { return !entity->getArgument(5)->isNull(); }
+double IfcDoorLiningProperties::LiningThickness() const { return *entity->getArgument(5); }
+void IfcDoorLiningProperties::setLiningThickness(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+bool IfcDoorLiningProperties::hasThresholdDepth() const { return !entity->getArgument(6)->isNull(); }
+double IfcDoorLiningProperties::ThresholdDepth() const { return *entity->getArgument(6); }
+void IfcDoorLiningProperties::setThresholdDepth(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
+bool IfcDoorLiningProperties::hasThresholdThickness() const { return !entity->getArgument(7)->isNull(); }
+double IfcDoorLiningProperties::ThresholdThickness() const { return *entity->getArgument(7); }
+void IfcDoorLiningProperties::setThresholdThickness(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
+bool IfcDoorLiningProperties::hasTransomThickness() const { return !entity->getArgument(8)->isNull(); }
+double IfcDoorLiningProperties::TransomThickness() const { return *entity->getArgument(8); }
+void IfcDoorLiningProperties::setTransomThickness(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
+bool IfcDoorLiningProperties::hasTransomOffset() const { return !entity->getArgument(9)->isNull(); }
+double IfcDoorLiningProperties::TransomOffset() const { return *entity->getArgument(9); }
+void IfcDoorLiningProperties::setTransomOffset(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
+bool IfcDoorLiningProperties::hasLiningOffset() const { return !entity->getArgument(10)->isNull(); }
+double IfcDoorLiningProperties::LiningOffset() const { return *entity->getArgument(10); }
+void IfcDoorLiningProperties::setLiningOffset(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
+bool IfcDoorLiningProperties::hasThresholdOffset() const { return !entity->getArgument(11)->isNull(); }
+double IfcDoorLiningProperties::ThresholdOffset() const { return *entity->getArgument(11); }
+void IfcDoorLiningProperties::setThresholdOffset(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(11,v); }
+bool IfcDoorLiningProperties::hasCasingThickness() const { return !entity->getArgument(12)->isNull(); }
+double IfcDoorLiningProperties::CasingThickness() const { return *entity->getArgument(12); }
+void IfcDoorLiningProperties::setCasingThickness(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(12,v); }
+bool IfcDoorLiningProperties::hasCasingDepth() const { return !entity->getArgument(13)->isNull(); }
+double IfcDoorLiningProperties::CasingDepth() const { return *entity->getArgument(13); }
+void IfcDoorLiningProperties::setCasingDepth(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(13,v); }
+bool IfcDoorLiningProperties::hasShapeAspectStyle() const { return !entity->getArgument(14)->isNull(); }
+IfcShapeAspect* IfcDoorLiningProperties::ShapeAspectStyle() const { return (IfcShapeAspect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(14))); }
 void IfcDoorLiningProperties::setShapeAspectStyle(IfcShapeAspect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(14,v); }
-bool IfcDoorLiningProperties::hasLiningToPanelOffsetX() { return !entity->getArgument(15)->isNull(); }
-IfcLengthMeasure IfcDoorLiningProperties::LiningToPanelOffsetX() { return *entity->getArgument(15); }
-void IfcDoorLiningProperties::setLiningToPanelOffsetX(IfcLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(15,v); }
-bool IfcDoorLiningProperties::hasLiningToPanelOffsetY() { return !entity->getArgument(16)->isNull(); }
-IfcLengthMeasure IfcDoorLiningProperties::LiningToPanelOffsetY() { return *entity->getArgument(16); }
-void IfcDoorLiningProperties::setLiningToPanelOffsetY(IfcLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(16,v); }
+bool IfcDoorLiningProperties::hasLiningToPanelOffsetX() const { return !entity->getArgument(15)->isNull(); }
+double IfcDoorLiningProperties::LiningToPanelOffsetX() const { return *entity->getArgument(15); }
+void IfcDoorLiningProperties::setLiningToPanelOffsetX(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(15,v); }
+bool IfcDoorLiningProperties::hasLiningToPanelOffsetY() const { return !entity->getArgument(16)->isNull(); }
+double IfcDoorLiningProperties::LiningToPanelOffsetY() const { return *entity->getArgument(16); }
+void IfcDoorLiningProperties::setLiningToPanelOffsetY(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(16,v); }
 bool IfcDoorLiningProperties::is(Type::Enum v) const { return v == Type::IfcDoorLiningProperties || IfcPreDefinedPropertySet::is(v); }
 Type::Enum IfcDoorLiningProperties::type() const { return Type::IfcDoorLiningProperties; }
 Type::Enum IfcDoorLiningProperties::Class() { return Type::IfcDoorLiningProperties; }
-IfcDoorLiningProperties::IfcDoorLiningProperties(IfcAbstractEntityPtr e) : IfcPreDefinedPropertySet((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcDoorLiningProperties)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcDoorLiningProperties::IfcDoorLiningProperties(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcPositiveLengthMeasure > v5_LiningDepth, boost::optional< IfcNonNegativeLengthMeasure > v6_LiningThickness, boost::optional< IfcPositiveLengthMeasure > v7_ThresholdDepth, boost::optional< IfcNonNegativeLengthMeasure > v8_ThresholdThickness, boost::optional< IfcNonNegativeLengthMeasure > v9_TransomThickness, boost::optional< IfcLengthMeasure > v10_TransomOffset, boost::optional< IfcLengthMeasure > v11_LiningOffset, boost::optional< IfcLengthMeasure > v12_ThresholdOffset, boost::optional< IfcPositiveLengthMeasure > v13_CasingThickness, boost::optional< IfcPositiveLengthMeasure > v14_CasingDepth, IfcShapeAspect* v15_ShapeAspectStyle, boost::optional< IfcLengthMeasure > v16_LiningToPanelOffsetX, boost::optional< IfcLengthMeasure > v17_LiningToPanelOffsetY) : IfcPreDefinedPropertySet((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_LiningDepth) { e->setArgument(4,(*v5_LiningDepth)); } else { e->setArgument(4); } if (v6_LiningThickness) { e->setArgument(5,(*v6_LiningThickness)); } else { e->setArgument(5); } if (v7_ThresholdDepth) { e->setArgument(6,(*v7_ThresholdDepth)); } else { e->setArgument(6); } if (v8_ThresholdThickness) { e->setArgument(7,(*v8_ThresholdThickness)); } else { e->setArgument(7); } if (v9_TransomThickness) { e->setArgument(8,(*v9_TransomThickness)); } else { e->setArgument(8); } if (v10_TransomOffset) { e->setArgument(9,(*v10_TransomOffset)); } else { e->setArgument(9); } if (v11_LiningOffset) { e->setArgument(10,(*v11_LiningOffset)); } else { e->setArgument(10); } if (v12_ThresholdOffset) { e->setArgument(11,(*v12_ThresholdOffset)); } else { e->setArgument(11); } if (v13_CasingThickness) { e->setArgument(12,(*v13_CasingThickness)); } else { e->setArgument(12); } if (v14_CasingDepth) { e->setArgument(13,(*v14_CasingDepth)); } else { e->setArgument(13); } e->setArgument(14,(v15_ShapeAspectStyle)); if (v16_LiningToPanelOffsetX) { e->setArgument(15,(*v16_LiningToPanelOffsetX)); } else { e->setArgument(15); } if (v17_LiningToPanelOffsetY) { e->setArgument(16,(*v17_LiningToPanelOffsetY)); } else { e->setArgument(16); } entity = e; EntityBuffer::Add(this); }
+IfcDoorLiningProperties::IfcDoorLiningProperties(IfcAbstractEntity* e) : IfcPreDefinedPropertySet((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcDoorLiningProperties)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcDoorLiningProperties::IfcDoorLiningProperties(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< double > v5_LiningDepth, boost::optional< double > v6_LiningThickness, boost::optional< double > v7_ThresholdDepth, boost::optional< double > v8_ThresholdThickness, boost::optional< double > v9_TransomThickness, boost::optional< double > v10_TransomOffset, boost::optional< double > v11_LiningOffset, boost::optional< double > v12_ThresholdOffset, boost::optional< double > v13_CasingThickness, boost::optional< double > v14_CasingDepth, IfcShapeAspect* v15_ShapeAspectStyle, boost::optional< double > v16_LiningToPanelOffsetX, boost::optional< double > v17_LiningToPanelOffsetY) : IfcPreDefinedPropertySet((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_LiningDepth) { e->setArgument(4,(*v5_LiningDepth)); } else { e->setArgument(4); } if (v6_LiningThickness) { e->setArgument(5,(*v6_LiningThickness)); } else { e->setArgument(5); } if (v7_ThresholdDepth) { e->setArgument(6,(*v7_ThresholdDepth)); } else { e->setArgument(6); } if (v8_ThresholdThickness) { e->setArgument(7,(*v8_ThresholdThickness)); } else { e->setArgument(7); } if (v9_TransomThickness) { e->setArgument(8,(*v9_TransomThickness)); } else { e->setArgument(8); } if (v10_TransomOffset) { e->setArgument(9,(*v10_TransomOffset)); } else { e->setArgument(9); } if (v11_LiningOffset) { e->setArgument(10,(*v11_LiningOffset)); } else { e->setArgument(10); } if (v12_ThresholdOffset) { e->setArgument(11,(*v12_ThresholdOffset)); } else { e->setArgument(11); } if (v13_CasingThickness) { e->setArgument(12,(*v13_CasingThickness)); } else { e->setArgument(12); } if (v14_CasingDepth) { e->setArgument(13,(*v14_CasingDepth)); } else { e->setArgument(13); } e->setArgument(14,(v15_ShapeAspectStyle)); if (v16_LiningToPanelOffsetX) { e->setArgument(15,(*v16_LiningToPanelOffsetX)); } else { e->setArgument(15); } if (v17_LiningToPanelOffsetY) { e->setArgument(16,(*v17_LiningToPanelOffsetY)); } else { e->setArgument(16); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcDoorPanelProperties
-bool IfcDoorPanelProperties::hasPanelDepth() { return !entity->getArgument(4)->isNull(); }
-IfcPositiveLengthMeasure IfcDoorPanelProperties::PanelDepth() { return *entity->getArgument(4); }
-void IfcDoorPanelProperties::setPanelDepth(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-IfcDoorPanelOperationEnum::IfcDoorPanelOperationEnum IfcDoorPanelProperties::PanelOperation() { return IfcDoorPanelOperationEnum::FromString(*entity->getArgument(5)); }
+bool IfcDoorPanelProperties::hasPanelDepth() const { return !entity->getArgument(4)->isNull(); }
+double IfcDoorPanelProperties::PanelDepth() const { return *entity->getArgument(4); }
+void IfcDoorPanelProperties::setPanelDepth(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+IfcDoorPanelOperationEnum::IfcDoorPanelOperationEnum IfcDoorPanelProperties::PanelOperation() const { return IfcDoorPanelOperationEnum::FromString(*entity->getArgument(5)); }
 void IfcDoorPanelProperties::setPanelOperation(IfcDoorPanelOperationEnum::IfcDoorPanelOperationEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v,IfcDoorPanelOperationEnum::ToString(v)); }
-bool IfcDoorPanelProperties::hasPanelWidth() { return !entity->getArgument(6)->isNull(); }
-IfcNormalisedRatioMeasure IfcDoorPanelProperties::PanelWidth() { return *entity->getArgument(6); }
-void IfcDoorPanelProperties::setPanelWidth(IfcNormalisedRatioMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
-IfcDoorPanelPositionEnum::IfcDoorPanelPositionEnum IfcDoorPanelProperties::PanelPosition() { return IfcDoorPanelPositionEnum::FromString(*entity->getArgument(7)); }
+bool IfcDoorPanelProperties::hasPanelWidth() const { return !entity->getArgument(6)->isNull(); }
+double IfcDoorPanelProperties::PanelWidth() const { return *entity->getArgument(6); }
+void IfcDoorPanelProperties::setPanelWidth(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
+IfcDoorPanelPositionEnum::IfcDoorPanelPositionEnum IfcDoorPanelProperties::PanelPosition() const { return IfcDoorPanelPositionEnum::FromString(*entity->getArgument(7)); }
 void IfcDoorPanelProperties::setPanelPosition(IfcDoorPanelPositionEnum::IfcDoorPanelPositionEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v,IfcDoorPanelPositionEnum::ToString(v)); }
-bool IfcDoorPanelProperties::hasShapeAspectStyle() { return !entity->getArgument(8)->isNull(); }
-IfcShapeAspect* IfcDoorPanelProperties::ShapeAspectStyle() { return (IfcShapeAspect*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(8))); }
+bool IfcDoorPanelProperties::hasShapeAspectStyle() const { return !entity->getArgument(8)->isNull(); }
+IfcShapeAspect* IfcDoorPanelProperties::ShapeAspectStyle() const { return (IfcShapeAspect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(8))); }
 void IfcDoorPanelProperties::setShapeAspectStyle(IfcShapeAspect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
 bool IfcDoorPanelProperties::is(Type::Enum v) const { return v == Type::IfcDoorPanelProperties || IfcPreDefinedPropertySet::is(v); }
 Type::Enum IfcDoorPanelProperties::type() const { return Type::IfcDoorPanelProperties; }
 Type::Enum IfcDoorPanelProperties::Class() { return Type::IfcDoorPanelProperties; }
-IfcDoorPanelProperties::IfcDoorPanelProperties(IfcAbstractEntityPtr e) : IfcPreDefinedPropertySet((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcDoorPanelProperties)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcDoorPanelProperties::IfcDoorPanelProperties(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcPositiveLengthMeasure > v5_PanelDepth, IfcDoorPanelOperationEnum::IfcDoorPanelOperationEnum v6_PanelOperation, boost::optional< IfcNormalisedRatioMeasure > v7_PanelWidth, IfcDoorPanelPositionEnum::IfcDoorPanelPositionEnum v8_PanelPosition, IfcShapeAspect* v9_ShapeAspectStyle) : IfcPreDefinedPropertySet((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_PanelDepth) { e->setArgument(4,(*v5_PanelDepth)); } else { e->setArgument(4); } e->setArgument(5,v6_PanelOperation,IfcDoorPanelOperationEnum::ToString(v6_PanelOperation)); if (v7_PanelWidth) { e->setArgument(6,(*v7_PanelWidth)); } else { e->setArgument(6); } e->setArgument(7,v8_PanelPosition,IfcDoorPanelPositionEnum::ToString(v8_PanelPosition)); e->setArgument(8,(v9_ShapeAspectStyle)); entity = e; EntityBuffer::Add(this); }
+IfcDoorPanelProperties::IfcDoorPanelProperties(IfcAbstractEntity* e) : IfcPreDefinedPropertySet((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcDoorPanelProperties)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcDoorPanelProperties::IfcDoorPanelProperties(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< double > v5_PanelDepth, IfcDoorPanelOperationEnum::IfcDoorPanelOperationEnum v6_PanelOperation, boost::optional< double > v7_PanelWidth, IfcDoorPanelPositionEnum::IfcDoorPanelPositionEnum v8_PanelPosition, IfcShapeAspect* v9_ShapeAspectStyle) : IfcPreDefinedPropertySet((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_PanelDepth) { e->setArgument(4,(*v5_PanelDepth)); } else { e->setArgument(4); } e->setArgument(5,v6_PanelOperation,IfcDoorPanelOperationEnum::ToString(v6_PanelOperation)); if (v7_PanelWidth) { e->setArgument(6,(*v7_PanelWidth)); } else { e->setArgument(6); } e->setArgument(7,v8_PanelPosition,IfcDoorPanelPositionEnum::ToString(v8_PanelPosition)); e->setArgument(8,(v9_ShapeAspectStyle)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcDoorStandardCase
 bool IfcDoorStandardCase::is(Type::Enum v) const { return v == Type::IfcDoorStandardCase || IfcDoor::is(v); }
 Type::Enum IfcDoorStandardCase::type() const { return Type::IfcDoorStandardCase; }
 Type::Enum IfcDoorStandardCase::Class() { return Type::IfcDoorStandardCase; }
-IfcDoorStandardCase::IfcDoorStandardCase(IfcAbstractEntityPtr e) : IfcDoor((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcDoorStandardCase)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcDoorStandardCase::IfcDoorStandardCase(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcPositiveLengthMeasure > v9_OverallHeight, boost::optional< IfcPositiveLengthMeasure > v10_OverallWidth, boost::optional< IfcDoorTypeEnum::IfcDoorTypeEnum > v11_PredefinedType, boost::optional< IfcDoorTypeOperationEnum::IfcDoorTypeOperationEnum > v12_OperationType, boost::optional< IfcLabel > v13_UserDefinedOperationType) : IfcDoor((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_OverallHeight) { e->setArgument(8,(*v9_OverallHeight)); } else { e->setArgument(8); } if (v10_OverallWidth) { e->setArgument(9,(*v10_OverallWidth)); } else { e->setArgument(9); } if (v11_PredefinedType) { e->setArgument(10,*v11_PredefinedType,IfcDoorTypeEnum::ToString(*v11_PredefinedType)); } else { e->setArgument(10); } if (v12_OperationType) { e->setArgument(11,*v12_OperationType,IfcDoorTypeOperationEnum::ToString(*v12_OperationType)); } else { e->setArgument(11); } if (v13_UserDefinedOperationType) { e->setArgument(12,(*v13_UserDefinedOperationType)); } else { e->setArgument(12); } entity = e; EntityBuffer::Add(this); }
+IfcDoorStandardCase::IfcDoorStandardCase(IfcAbstractEntity* e) : IfcDoor((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcDoorStandardCase)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcDoorStandardCase::IfcDoorStandardCase(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< double > v9_OverallHeight, boost::optional< double > v10_OverallWidth, boost::optional< IfcDoorTypeEnum::IfcDoorTypeEnum > v11_PredefinedType, boost::optional< IfcDoorTypeOperationEnum::IfcDoorTypeOperationEnum > v12_OperationType, boost::optional< std::string > v13_UserDefinedOperationType) : IfcDoor((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_OverallHeight) { e->setArgument(8,(*v9_OverallHeight)); } else { e->setArgument(8); } if (v10_OverallWidth) { e->setArgument(9,(*v10_OverallWidth)); } else { e->setArgument(9); } if (v11_PredefinedType) { e->setArgument(10,*v11_PredefinedType,IfcDoorTypeEnum::ToString(*v11_PredefinedType)); } else { e->setArgument(10); } if (v12_OperationType) { e->setArgument(11,*v12_OperationType,IfcDoorTypeOperationEnum::ToString(*v12_OperationType)); } else { e->setArgument(11); } if (v13_UserDefinedOperationType) { e->setArgument(12,(*v13_UserDefinedOperationType)); } else { e->setArgument(12); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcDoorStyle
-IfcDoorStyleOperationEnum::IfcDoorStyleOperationEnum IfcDoorStyle::OperationType() { return IfcDoorStyleOperationEnum::FromString(*entity->getArgument(8)); }
+IfcDoorStyleOperationEnum::IfcDoorStyleOperationEnum IfcDoorStyle::OperationType() const { return IfcDoorStyleOperationEnum::FromString(*entity->getArgument(8)); }
 void IfcDoorStyle::setOperationType(IfcDoorStyleOperationEnum::IfcDoorStyleOperationEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcDoorStyleOperationEnum::ToString(v)); }
-IfcDoorStyleConstructionEnum::IfcDoorStyleConstructionEnum IfcDoorStyle::ConstructionType() { return IfcDoorStyleConstructionEnum::FromString(*entity->getArgument(9)); }
+IfcDoorStyleConstructionEnum::IfcDoorStyleConstructionEnum IfcDoorStyle::ConstructionType() const { return IfcDoorStyleConstructionEnum::FromString(*entity->getArgument(9)); }
 void IfcDoorStyle::setConstructionType(IfcDoorStyleConstructionEnum::IfcDoorStyleConstructionEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcDoorStyleConstructionEnum::ToString(v)); }
-bool IfcDoorStyle::ParameterTakesPrecedence() { return *entity->getArgument(10); }
+bool IfcDoorStyle::ParameterTakesPrecedence() const { return *entity->getArgument(10); }
 void IfcDoorStyle::setParameterTakesPrecedence(bool v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
-bool IfcDoorStyle::Sizeable() { return *entity->getArgument(11); }
+bool IfcDoorStyle::Sizeable() const { return *entity->getArgument(11); }
 void IfcDoorStyle::setSizeable(bool v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(11,v); }
 bool IfcDoorStyle::is(Type::Enum v) const { return v == Type::IfcDoorStyle || IfcTypeProduct::is(v); }
 Type::Enum IfcDoorStyle::type() const { return Type::IfcDoorStyle; }
 Type::Enum IfcDoorStyle::Class() { return Type::IfcDoorStyle; }
-IfcDoorStyle::IfcDoorStyle(IfcAbstractEntityPtr e) : IfcTypeProduct((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcDoorStyle)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcDoorStyle::IfcDoorStyle(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, IfcDoorStyleOperationEnum::IfcDoorStyleOperationEnum v9_OperationType, IfcDoorStyleConstructionEnum::IfcDoorStyleConstructionEnum v10_ConstructionType, bool v11_ParameterTakesPrecedence, bool v12_Sizeable) : IfcTypeProduct((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } e->setArgument(8,v9_OperationType,IfcDoorStyleOperationEnum::ToString(v9_OperationType)); e->setArgument(9,v10_ConstructionType,IfcDoorStyleConstructionEnum::ToString(v10_ConstructionType)); e->setArgument(10,(v11_ParameterTakesPrecedence)); e->setArgument(11,(v12_Sizeable)); entity = e; EntityBuffer::Add(this); }
+IfcDoorStyle::IfcDoorStyle(IfcAbstractEntity* e) : IfcTypeProduct((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcDoorStyle)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcDoorStyle::IfcDoorStyle(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, IfcDoorStyleOperationEnum::IfcDoorStyleOperationEnum v9_OperationType, IfcDoorStyleConstructionEnum::IfcDoorStyleConstructionEnum v10_ConstructionType, bool v11_ParameterTakesPrecedence, bool v12_Sizeable) : IfcTypeProduct((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } e->setArgument(8,v9_OperationType,IfcDoorStyleOperationEnum::ToString(v9_OperationType)); e->setArgument(9,v10_ConstructionType,IfcDoorStyleConstructionEnum::ToString(v10_ConstructionType)); e->setArgument(10,(v11_ParameterTakesPrecedence)); e->setArgument(11,(v12_Sizeable)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcDoorType
-IfcDoorTypeEnum::IfcDoorTypeEnum IfcDoorType::PredefinedType() { return IfcDoorTypeEnum::FromString(*entity->getArgument(9)); }
+IfcDoorTypeEnum::IfcDoorTypeEnum IfcDoorType::PredefinedType() const { return IfcDoorTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcDoorType::setPredefinedType(IfcDoorTypeEnum::IfcDoorTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcDoorTypeEnum::ToString(v)); }
-IfcDoorTypeOperationEnum::IfcDoorTypeOperationEnum IfcDoorType::OperationType() { return IfcDoorTypeOperationEnum::FromString(*entity->getArgument(10)); }
+IfcDoorTypeOperationEnum::IfcDoorTypeOperationEnum IfcDoorType::OperationType() const { return IfcDoorTypeOperationEnum::FromString(*entity->getArgument(10)); }
 void IfcDoorType::setOperationType(IfcDoorTypeOperationEnum::IfcDoorTypeOperationEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v,IfcDoorTypeOperationEnum::ToString(v)); }
-bool IfcDoorType::hasParameterTakesPrecedence() { return !entity->getArgument(11)->isNull(); }
-bool IfcDoorType::ParameterTakesPrecedence() { return *entity->getArgument(11); }
+bool IfcDoorType::hasParameterTakesPrecedence() const { return !entity->getArgument(11)->isNull(); }
+bool IfcDoorType::ParameterTakesPrecedence() const { return *entity->getArgument(11); }
 void IfcDoorType::setParameterTakesPrecedence(bool v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(11,v); }
-bool IfcDoorType::hasUserDefinedOperationType() { return !entity->getArgument(12)->isNull(); }
-IfcLabel IfcDoorType::UserDefinedOperationType() { return *entity->getArgument(12); }
-void IfcDoorType::setUserDefinedOperationType(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(12,v); }
+bool IfcDoorType::hasUserDefinedOperationType() const { return !entity->getArgument(12)->isNull(); }
+std::string IfcDoorType::UserDefinedOperationType() const { return *entity->getArgument(12); }
+void IfcDoorType::setUserDefinedOperationType(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(12,v); }
 bool IfcDoorType::is(Type::Enum v) const { return v == Type::IfcDoorType || IfcBuildingElementType::is(v); }
 Type::Enum IfcDoorType::type() const { return Type::IfcDoorType; }
 Type::Enum IfcDoorType::Class() { return Type::IfcDoorType; }
-IfcDoorType::IfcDoorType(IfcAbstractEntityPtr e) : IfcBuildingElementType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcDoorType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcDoorType::IfcDoorType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcDoorTypeEnum::IfcDoorTypeEnum v10_PredefinedType, IfcDoorTypeOperationEnum::IfcDoorTypeOperationEnum v11_OperationType, boost::optional< bool > v12_ParameterTakesPrecedence, boost::optional< IfcLabel > v13_UserDefinedOperationType) : IfcBuildingElementType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcDoorTypeEnum::ToString(v10_PredefinedType)); e->setArgument(10,v11_OperationType,IfcDoorTypeOperationEnum::ToString(v11_OperationType)); if (v12_ParameterTakesPrecedence) { e->setArgument(11,(*v12_ParameterTakesPrecedence)); } else { e->setArgument(11); } if (v13_UserDefinedOperationType) { e->setArgument(12,(*v13_UserDefinedOperationType)); } else { e->setArgument(12); } entity = e; EntityBuffer::Add(this); }
+IfcDoorType::IfcDoorType(IfcAbstractEntity* e) : IfcBuildingElementType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcDoorType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcDoorType::IfcDoorType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcDoorTypeEnum::IfcDoorTypeEnum v10_PredefinedType, IfcDoorTypeOperationEnum::IfcDoorTypeOperationEnum v11_OperationType, boost::optional< bool > v12_ParameterTakesPrecedence, boost::optional< std::string > v13_UserDefinedOperationType) : IfcBuildingElementType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcDoorTypeEnum::ToString(v10_PredefinedType)); e->setArgument(10,v11_OperationType,IfcDoorTypeOperationEnum::ToString(v11_OperationType)); if (v12_ParameterTakesPrecedence) { e->setArgument(11,(*v12_ParameterTakesPrecedence)); } else { e->setArgument(11); } if (v13_UserDefinedOperationType) { e->setArgument(12,(*v13_UserDefinedOperationType)); } else { e->setArgument(12); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcDraughtingPreDefinedColour
 bool IfcDraughtingPreDefinedColour::is(Type::Enum v) const { return v == Type::IfcDraughtingPreDefinedColour || IfcPreDefinedColour::is(v); }
 Type::Enum IfcDraughtingPreDefinedColour::type() const { return Type::IfcDraughtingPreDefinedColour; }
 Type::Enum IfcDraughtingPreDefinedColour::Class() { return Type::IfcDraughtingPreDefinedColour; }
-IfcDraughtingPreDefinedColour::IfcDraughtingPreDefinedColour(IfcAbstractEntityPtr e) : IfcPreDefinedColour((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcDraughtingPreDefinedColour)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcDraughtingPreDefinedColour::IfcDraughtingPreDefinedColour(IfcLabel v1_Name) : IfcPreDefinedColour((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); entity = e; EntityBuffer::Add(this); }
+IfcDraughtingPreDefinedColour::IfcDraughtingPreDefinedColour(IfcAbstractEntity* e) : IfcPreDefinedColour((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcDraughtingPreDefinedColour)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcDraughtingPreDefinedColour::IfcDraughtingPreDefinedColour(std::string v1_Name) : IfcPreDefinedColour((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcDraughtingPreDefinedCurveFont
 bool IfcDraughtingPreDefinedCurveFont::is(Type::Enum v) const { return v == Type::IfcDraughtingPreDefinedCurveFont || IfcPreDefinedCurveFont::is(v); }
 Type::Enum IfcDraughtingPreDefinedCurveFont::type() const { return Type::IfcDraughtingPreDefinedCurveFont; }
 Type::Enum IfcDraughtingPreDefinedCurveFont::Class() { return Type::IfcDraughtingPreDefinedCurveFont; }
-IfcDraughtingPreDefinedCurveFont::IfcDraughtingPreDefinedCurveFont(IfcAbstractEntityPtr e) : IfcPreDefinedCurveFont((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcDraughtingPreDefinedCurveFont)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcDraughtingPreDefinedCurveFont::IfcDraughtingPreDefinedCurveFont(IfcLabel v1_Name) : IfcPreDefinedCurveFont((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); entity = e; EntityBuffer::Add(this); }
+IfcDraughtingPreDefinedCurveFont::IfcDraughtingPreDefinedCurveFont(IfcAbstractEntity* e) : IfcPreDefinedCurveFont((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcDraughtingPreDefinedCurveFont)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcDraughtingPreDefinedCurveFont::IfcDraughtingPreDefinedCurveFont(std::string v1_Name) : IfcPreDefinedCurveFont((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcDuctFitting
-bool IfcDuctFitting::hasPredefinedType() { return !entity->getArgument(8)->isNull(); }
-IfcDuctFittingTypeEnum::IfcDuctFittingTypeEnum IfcDuctFitting::PredefinedType() { return IfcDuctFittingTypeEnum::FromString(*entity->getArgument(8)); }
+bool IfcDuctFitting::hasPredefinedType() const { return !entity->getArgument(8)->isNull(); }
+IfcDuctFittingTypeEnum::IfcDuctFittingTypeEnum IfcDuctFitting::PredefinedType() const { return IfcDuctFittingTypeEnum::FromString(*entity->getArgument(8)); }
 void IfcDuctFitting::setPredefinedType(IfcDuctFittingTypeEnum::IfcDuctFittingTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcDuctFittingTypeEnum::ToString(v)); }
 bool IfcDuctFitting::is(Type::Enum v) const { return v == Type::IfcDuctFitting || IfcFlowFitting::is(v); }
 Type::Enum IfcDuctFitting::type() const { return Type::IfcDuctFitting; }
 Type::Enum IfcDuctFitting::Class() { return Type::IfcDuctFitting; }
-IfcDuctFitting::IfcDuctFitting(IfcAbstractEntityPtr e) : IfcFlowFitting((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcDuctFitting)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcDuctFitting::IfcDuctFitting(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcDuctFittingTypeEnum::IfcDuctFittingTypeEnum > v9_PredefinedType) : IfcFlowFitting((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcDuctFittingTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcDuctFitting::IfcDuctFitting(IfcAbstractEntity* e) : IfcFlowFitting((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcDuctFitting)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcDuctFitting::IfcDuctFitting(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcDuctFittingTypeEnum::IfcDuctFittingTypeEnum > v9_PredefinedType) : IfcFlowFitting((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcDuctFittingTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcDuctFittingType
-IfcDuctFittingTypeEnum::IfcDuctFittingTypeEnum IfcDuctFittingType::PredefinedType() { return IfcDuctFittingTypeEnum::FromString(*entity->getArgument(9)); }
+IfcDuctFittingTypeEnum::IfcDuctFittingTypeEnum IfcDuctFittingType::PredefinedType() const { return IfcDuctFittingTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcDuctFittingType::setPredefinedType(IfcDuctFittingTypeEnum::IfcDuctFittingTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcDuctFittingTypeEnum::ToString(v)); }
 bool IfcDuctFittingType::is(Type::Enum v) const { return v == Type::IfcDuctFittingType || IfcFlowFittingType::is(v); }
 Type::Enum IfcDuctFittingType::type() const { return Type::IfcDuctFittingType; }
 Type::Enum IfcDuctFittingType::Class() { return Type::IfcDuctFittingType; }
-IfcDuctFittingType::IfcDuctFittingType(IfcAbstractEntityPtr e) : IfcFlowFittingType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcDuctFittingType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcDuctFittingType::IfcDuctFittingType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcDuctFittingTypeEnum::IfcDuctFittingTypeEnum v10_PredefinedType) : IfcFlowFittingType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcDuctFittingTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcDuctFittingType::IfcDuctFittingType(IfcAbstractEntity* e) : IfcFlowFittingType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcDuctFittingType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcDuctFittingType::IfcDuctFittingType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcDuctFittingTypeEnum::IfcDuctFittingTypeEnum v10_PredefinedType) : IfcFlowFittingType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcDuctFittingTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcDuctSegment
-bool IfcDuctSegment::hasPredefinedType() { return !entity->getArgument(8)->isNull(); }
-IfcDuctSegmentTypeEnum::IfcDuctSegmentTypeEnum IfcDuctSegment::PredefinedType() { return IfcDuctSegmentTypeEnum::FromString(*entity->getArgument(8)); }
+bool IfcDuctSegment::hasPredefinedType() const { return !entity->getArgument(8)->isNull(); }
+IfcDuctSegmentTypeEnum::IfcDuctSegmentTypeEnum IfcDuctSegment::PredefinedType() const { return IfcDuctSegmentTypeEnum::FromString(*entity->getArgument(8)); }
 void IfcDuctSegment::setPredefinedType(IfcDuctSegmentTypeEnum::IfcDuctSegmentTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcDuctSegmentTypeEnum::ToString(v)); }
 bool IfcDuctSegment::is(Type::Enum v) const { return v == Type::IfcDuctSegment || IfcFlowSegment::is(v); }
 Type::Enum IfcDuctSegment::type() const { return Type::IfcDuctSegment; }
 Type::Enum IfcDuctSegment::Class() { return Type::IfcDuctSegment; }
-IfcDuctSegment::IfcDuctSegment(IfcAbstractEntityPtr e) : IfcFlowSegment((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcDuctSegment)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcDuctSegment::IfcDuctSegment(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcDuctSegmentTypeEnum::IfcDuctSegmentTypeEnum > v9_PredefinedType) : IfcFlowSegment((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcDuctSegmentTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcDuctSegment::IfcDuctSegment(IfcAbstractEntity* e) : IfcFlowSegment((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcDuctSegment)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcDuctSegment::IfcDuctSegment(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcDuctSegmentTypeEnum::IfcDuctSegmentTypeEnum > v9_PredefinedType) : IfcFlowSegment((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcDuctSegmentTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcDuctSegmentType
-IfcDuctSegmentTypeEnum::IfcDuctSegmentTypeEnum IfcDuctSegmentType::PredefinedType() { return IfcDuctSegmentTypeEnum::FromString(*entity->getArgument(9)); }
+IfcDuctSegmentTypeEnum::IfcDuctSegmentTypeEnum IfcDuctSegmentType::PredefinedType() const { return IfcDuctSegmentTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcDuctSegmentType::setPredefinedType(IfcDuctSegmentTypeEnum::IfcDuctSegmentTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcDuctSegmentTypeEnum::ToString(v)); }
 bool IfcDuctSegmentType::is(Type::Enum v) const { return v == Type::IfcDuctSegmentType || IfcFlowSegmentType::is(v); }
 Type::Enum IfcDuctSegmentType::type() const { return Type::IfcDuctSegmentType; }
 Type::Enum IfcDuctSegmentType::Class() { return Type::IfcDuctSegmentType; }
-IfcDuctSegmentType::IfcDuctSegmentType(IfcAbstractEntityPtr e) : IfcFlowSegmentType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcDuctSegmentType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcDuctSegmentType::IfcDuctSegmentType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcDuctSegmentTypeEnum::IfcDuctSegmentTypeEnum v10_PredefinedType) : IfcFlowSegmentType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcDuctSegmentTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcDuctSegmentType::IfcDuctSegmentType(IfcAbstractEntity* e) : IfcFlowSegmentType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcDuctSegmentType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcDuctSegmentType::IfcDuctSegmentType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcDuctSegmentTypeEnum::IfcDuctSegmentTypeEnum v10_PredefinedType) : IfcFlowSegmentType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcDuctSegmentTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcDuctSilencer
-bool IfcDuctSilencer::hasPredefinedType() { return !entity->getArgument(8)->isNull(); }
-IfcDuctSilencerTypeEnum::IfcDuctSilencerTypeEnum IfcDuctSilencer::PredefinedType() { return IfcDuctSilencerTypeEnum::FromString(*entity->getArgument(8)); }
+bool IfcDuctSilencer::hasPredefinedType() const { return !entity->getArgument(8)->isNull(); }
+IfcDuctSilencerTypeEnum::IfcDuctSilencerTypeEnum IfcDuctSilencer::PredefinedType() const { return IfcDuctSilencerTypeEnum::FromString(*entity->getArgument(8)); }
 void IfcDuctSilencer::setPredefinedType(IfcDuctSilencerTypeEnum::IfcDuctSilencerTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcDuctSilencerTypeEnum::ToString(v)); }
 bool IfcDuctSilencer::is(Type::Enum v) const { return v == Type::IfcDuctSilencer || IfcFlowTreatmentDevice::is(v); }
 Type::Enum IfcDuctSilencer::type() const { return Type::IfcDuctSilencer; }
 Type::Enum IfcDuctSilencer::Class() { return Type::IfcDuctSilencer; }
-IfcDuctSilencer::IfcDuctSilencer(IfcAbstractEntityPtr e) : IfcFlowTreatmentDevice((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcDuctSilencer)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcDuctSilencer::IfcDuctSilencer(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcDuctSilencerTypeEnum::IfcDuctSilencerTypeEnum > v9_PredefinedType) : IfcFlowTreatmentDevice((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcDuctSilencerTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcDuctSilencer::IfcDuctSilencer(IfcAbstractEntity* e) : IfcFlowTreatmentDevice((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcDuctSilencer)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcDuctSilencer::IfcDuctSilencer(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcDuctSilencerTypeEnum::IfcDuctSilencerTypeEnum > v9_PredefinedType) : IfcFlowTreatmentDevice((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcDuctSilencerTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcDuctSilencerType
-IfcDuctSilencerTypeEnum::IfcDuctSilencerTypeEnum IfcDuctSilencerType::PredefinedType() { return IfcDuctSilencerTypeEnum::FromString(*entity->getArgument(9)); }
+IfcDuctSilencerTypeEnum::IfcDuctSilencerTypeEnum IfcDuctSilencerType::PredefinedType() const { return IfcDuctSilencerTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcDuctSilencerType::setPredefinedType(IfcDuctSilencerTypeEnum::IfcDuctSilencerTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcDuctSilencerTypeEnum::ToString(v)); }
 bool IfcDuctSilencerType::is(Type::Enum v) const { return v == Type::IfcDuctSilencerType || IfcFlowTreatmentDeviceType::is(v); }
 Type::Enum IfcDuctSilencerType::type() const { return Type::IfcDuctSilencerType; }
 Type::Enum IfcDuctSilencerType::Class() { return Type::IfcDuctSilencerType; }
-IfcDuctSilencerType::IfcDuctSilencerType(IfcAbstractEntityPtr e) : IfcFlowTreatmentDeviceType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcDuctSilencerType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcDuctSilencerType::IfcDuctSilencerType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcDuctSilencerTypeEnum::IfcDuctSilencerTypeEnum v10_PredefinedType) : IfcFlowTreatmentDeviceType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcDuctSilencerTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcDuctSilencerType::IfcDuctSilencerType(IfcAbstractEntity* e) : IfcFlowTreatmentDeviceType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcDuctSilencerType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcDuctSilencerType::IfcDuctSilencerType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcDuctSilencerTypeEnum::IfcDuctSilencerTypeEnum v10_PredefinedType) : IfcFlowTreatmentDeviceType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcDuctSilencerTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcEdge
-IfcVertex* IfcEdge::EdgeStart() { return (IfcVertex*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(0))); }
+IfcVertex* IfcEdge::EdgeStart() const { return (IfcVertex*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(0))); }
 void IfcEdge::setEdgeStart(IfcVertex* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-IfcVertex* IfcEdge::EdgeEnd() { return (IfcVertex*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(1))); }
+IfcVertex* IfcEdge::EdgeEnd() const { return (IfcVertex*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(1))); }
 void IfcEdge::setEdgeEnd(IfcVertex* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
 bool IfcEdge::is(Type::Enum v) const { return v == Type::IfcEdge || IfcTopologicalRepresentationItem::is(v); }
 Type::Enum IfcEdge::type() const { return Type::IfcEdge; }
 Type::Enum IfcEdge::Class() { return Type::IfcEdge; }
-IfcEdge::IfcEdge(IfcAbstractEntityPtr e) : IfcTopologicalRepresentationItem((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcEdge)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcEdge::IfcEdge(IfcVertex* v1_EdgeStart, IfcVertex* v2_EdgeEnd) : IfcTopologicalRepresentationItem((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_EdgeStart)); e->setArgument(1,(v2_EdgeEnd)); entity = e; EntityBuffer::Add(this); }
+IfcEdge::IfcEdge(IfcAbstractEntity* e) : IfcTopologicalRepresentationItem((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcEdge)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcEdge::IfcEdge(IfcVertex* v1_EdgeStart, IfcVertex* v2_EdgeEnd) : IfcTopologicalRepresentationItem((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_EdgeStart)); e->setArgument(1,(v2_EdgeEnd)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcEdgeCurve
-IfcCurve* IfcEdgeCurve::EdgeGeometry() { return (IfcCurve*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(2))); }
+IfcCurve* IfcEdgeCurve::EdgeGeometry() const { return (IfcCurve*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(2))); }
 void IfcEdgeCurve::setEdgeGeometry(IfcCurve* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-bool IfcEdgeCurve::SameSense() { return *entity->getArgument(3); }
+bool IfcEdgeCurve::SameSense() const { return *entity->getArgument(3); }
 void IfcEdgeCurve::setSameSense(bool v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
 bool IfcEdgeCurve::is(Type::Enum v) const { return v == Type::IfcEdgeCurve || IfcEdge::is(v); }
 Type::Enum IfcEdgeCurve::type() const { return Type::IfcEdgeCurve; }
 Type::Enum IfcEdgeCurve::Class() { return Type::IfcEdgeCurve; }
-IfcEdgeCurve::IfcEdgeCurve(IfcAbstractEntityPtr e) : IfcEdge((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcEdgeCurve)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcEdgeCurve::IfcEdgeCurve(IfcVertex* v1_EdgeStart, IfcVertex* v2_EdgeEnd, IfcCurve* v3_EdgeGeometry, bool v4_SameSense) : IfcEdge((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_EdgeStart)); e->setArgument(1,(v2_EdgeEnd)); e->setArgument(2,(v3_EdgeGeometry)); e->setArgument(3,(v4_SameSense)); entity = e; EntityBuffer::Add(this); }
+IfcEdgeCurve::IfcEdgeCurve(IfcAbstractEntity* e) : IfcEdge((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcEdgeCurve)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcEdgeCurve::IfcEdgeCurve(IfcVertex* v1_EdgeStart, IfcVertex* v2_EdgeEnd, IfcCurve* v3_EdgeGeometry, bool v4_SameSense) : IfcEdge((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_EdgeStart)); e->setArgument(1,(v2_EdgeEnd)); e->setArgument(2,(v3_EdgeGeometry)); e->setArgument(3,(v4_SameSense)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcEdgeLoop
-SHARED_PTR< IfcTemplatedEntityList< IfcOrientedEdge > > IfcEdgeLoop::EdgeList() { RETURN_AS_LIST(IfcOrientedEdge,0) }
-void IfcEdgeLoop::setEdgeList(SHARED_PTR< IfcTemplatedEntityList< IfcOrientedEdge > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v->generalize()); }
+IfcTemplatedEntityList< IfcOrientedEdge >::ptr IfcEdgeLoop::EdgeList() const { IfcEntityList::ptr es = *entity->getArgument(0); return es->as<IfcOrientedEdge>(); }
+void IfcEdgeLoop::setEdgeList(IfcTemplatedEntityList< IfcOrientedEdge >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v->generalize()); }
 bool IfcEdgeLoop::is(Type::Enum v) const { return v == Type::IfcEdgeLoop || IfcLoop::is(v); }
 Type::Enum IfcEdgeLoop::type() const { return Type::IfcEdgeLoop; }
 Type::Enum IfcEdgeLoop::Class() { return Type::IfcEdgeLoop; }
-IfcEdgeLoop::IfcEdgeLoop(IfcAbstractEntityPtr e) : IfcLoop((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcEdgeLoop)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcEdgeLoop::IfcEdgeLoop(SHARED_PTR< IfcTemplatedEntityList< IfcOrientedEdge > > v1_EdgeList) : IfcLoop((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_EdgeList)->generalize()); entity = e; EntityBuffer::Add(this); }
+IfcEdgeLoop::IfcEdgeLoop(IfcAbstractEntity* e) : IfcLoop((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcEdgeLoop)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcEdgeLoop::IfcEdgeLoop(IfcTemplatedEntityList< IfcOrientedEdge >::ptr v1_EdgeList) : IfcLoop((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_EdgeList)->generalize()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcElectricAppliance
-bool IfcElectricAppliance::hasPredefinedType() { return !entity->getArgument(8)->isNull(); }
-IfcElectricApplianceTypeEnum::IfcElectricApplianceTypeEnum IfcElectricAppliance::PredefinedType() { return IfcElectricApplianceTypeEnum::FromString(*entity->getArgument(8)); }
+bool IfcElectricAppliance::hasPredefinedType() const { return !entity->getArgument(8)->isNull(); }
+IfcElectricApplianceTypeEnum::IfcElectricApplianceTypeEnum IfcElectricAppliance::PredefinedType() const { return IfcElectricApplianceTypeEnum::FromString(*entity->getArgument(8)); }
 void IfcElectricAppliance::setPredefinedType(IfcElectricApplianceTypeEnum::IfcElectricApplianceTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcElectricApplianceTypeEnum::ToString(v)); }
 bool IfcElectricAppliance::is(Type::Enum v) const { return v == Type::IfcElectricAppliance || IfcFlowTerminal::is(v); }
 Type::Enum IfcElectricAppliance::type() const { return Type::IfcElectricAppliance; }
 Type::Enum IfcElectricAppliance::Class() { return Type::IfcElectricAppliance; }
-IfcElectricAppliance::IfcElectricAppliance(IfcAbstractEntityPtr e) : IfcFlowTerminal((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcElectricAppliance)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcElectricAppliance::IfcElectricAppliance(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcElectricApplianceTypeEnum::IfcElectricApplianceTypeEnum > v9_PredefinedType) : IfcFlowTerminal((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcElectricApplianceTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcElectricAppliance::IfcElectricAppliance(IfcAbstractEntity* e) : IfcFlowTerminal((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcElectricAppliance)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcElectricAppliance::IfcElectricAppliance(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcElectricApplianceTypeEnum::IfcElectricApplianceTypeEnum > v9_PredefinedType) : IfcFlowTerminal((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcElectricApplianceTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcElectricApplianceType
-IfcElectricApplianceTypeEnum::IfcElectricApplianceTypeEnum IfcElectricApplianceType::PredefinedType() { return IfcElectricApplianceTypeEnum::FromString(*entity->getArgument(9)); }
+IfcElectricApplianceTypeEnum::IfcElectricApplianceTypeEnum IfcElectricApplianceType::PredefinedType() const { return IfcElectricApplianceTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcElectricApplianceType::setPredefinedType(IfcElectricApplianceTypeEnum::IfcElectricApplianceTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcElectricApplianceTypeEnum::ToString(v)); }
 bool IfcElectricApplianceType::is(Type::Enum v) const { return v == Type::IfcElectricApplianceType || IfcFlowTerminalType::is(v); }
 Type::Enum IfcElectricApplianceType::type() const { return Type::IfcElectricApplianceType; }
 Type::Enum IfcElectricApplianceType::Class() { return Type::IfcElectricApplianceType; }
-IfcElectricApplianceType::IfcElectricApplianceType(IfcAbstractEntityPtr e) : IfcFlowTerminalType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcElectricApplianceType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcElectricApplianceType::IfcElectricApplianceType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcElectricApplianceTypeEnum::IfcElectricApplianceTypeEnum v10_PredefinedType) : IfcFlowTerminalType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcElectricApplianceTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcElectricApplianceType::IfcElectricApplianceType(IfcAbstractEntity* e) : IfcFlowTerminalType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcElectricApplianceType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcElectricApplianceType::IfcElectricApplianceType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcElectricApplianceTypeEnum::IfcElectricApplianceTypeEnum v10_PredefinedType) : IfcFlowTerminalType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcElectricApplianceTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcElectricDistributionBoard
-bool IfcElectricDistributionBoard::hasPredefinedType() { return !entity->getArgument(8)->isNull(); }
-IfcElectricDistributionBoardTypeEnum::IfcElectricDistributionBoardTypeEnum IfcElectricDistributionBoard::PredefinedType() { return IfcElectricDistributionBoardTypeEnum::FromString(*entity->getArgument(8)); }
+bool IfcElectricDistributionBoard::hasPredefinedType() const { return !entity->getArgument(8)->isNull(); }
+IfcElectricDistributionBoardTypeEnum::IfcElectricDistributionBoardTypeEnum IfcElectricDistributionBoard::PredefinedType() const { return IfcElectricDistributionBoardTypeEnum::FromString(*entity->getArgument(8)); }
 void IfcElectricDistributionBoard::setPredefinedType(IfcElectricDistributionBoardTypeEnum::IfcElectricDistributionBoardTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcElectricDistributionBoardTypeEnum::ToString(v)); }
 bool IfcElectricDistributionBoard::is(Type::Enum v) const { return v == Type::IfcElectricDistributionBoard || IfcFlowController::is(v); }
 Type::Enum IfcElectricDistributionBoard::type() const { return Type::IfcElectricDistributionBoard; }
 Type::Enum IfcElectricDistributionBoard::Class() { return Type::IfcElectricDistributionBoard; }
-IfcElectricDistributionBoard::IfcElectricDistributionBoard(IfcAbstractEntityPtr e) : IfcFlowController((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcElectricDistributionBoard)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcElectricDistributionBoard::IfcElectricDistributionBoard(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcElectricDistributionBoardTypeEnum::IfcElectricDistributionBoardTypeEnum > v9_PredefinedType) : IfcFlowController((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcElectricDistributionBoardTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcElectricDistributionBoard::IfcElectricDistributionBoard(IfcAbstractEntity* e) : IfcFlowController((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcElectricDistributionBoard)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcElectricDistributionBoard::IfcElectricDistributionBoard(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcElectricDistributionBoardTypeEnum::IfcElectricDistributionBoardTypeEnum > v9_PredefinedType) : IfcFlowController((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcElectricDistributionBoardTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcElectricDistributionBoardType
-IfcElectricDistributionBoardTypeEnum::IfcElectricDistributionBoardTypeEnum IfcElectricDistributionBoardType::PredefinedType() { return IfcElectricDistributionBoardTypeEnum::FromString(*entity->getArgument(9)); }
+IfcElectricDistributionBoardTypeEnum::IfcElectricDistributionBoardTypeEnum IfcElectricDistributionBoardType::PredefinedType() const { return IfcElectricDistributionBoardTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcElectricDistributionBoardType::setPredefinedType(IfcElectricDistributionBoardTypeEnum::IfcElectricDistributionBoardTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcElectricDistributionBoardTypeEnum::ToString(v)); }
 bool IfcElectricDistributionBoardType::is(Type::Enum v) const { return v == Type::IfcElectricDistributionBoardType || IfcFlowControllerType::is(v); }
 Type::Enum IfcElectricDistributionBoardType::type() const { return Type::IfcElectricDistributionBoardType; }
 Type::Enum IfcElectricDistributionBoardType::Class() { return Type::IfcElectricDistributionBoardType; }
-IfcElectricDistributionBoardType::IfcElectricDistributionBoardType(IfcAbstractEntityPtr e) : IfcFlowControllerType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcElectricDistributionBoardType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcElectricDistributionBoardType::IfcElectricDistributionBoardType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcElectricDistributionBoardTypeEnum::IfcElectricDistributionBoardTypeEnum v10_PredefinedType) : IfcFlowControllerType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcElectricDistributionBoardTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcElectricDistributionBoardType::IfcElectricDistributionBoardType(IfcAbstractEntity* e) : IfcFlowControllerType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcElectricDistributionBoardType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcElectricDistributionBoardType::IfcElectricDistributionBoardType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcElectricDistributionBoardTypeEnum::IfcElectricDistributionBoardTypeEnum v10_PredefinedType) : IfcFlowControllerType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcElectricDistributionBoardTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcElectricFlowStorageDevice
-bool IfcElectricFlowStorageDevice::hasPredefinedType() { return !entity->getArgument(8)->isNull(); }
-IfcElectricFlowStorageDeviceTypeEnum::IfcElectricFlowStorageDeviceTypeEnum IfcElectricFlowStorageDevice::PredefinedType() { return IfcElectricFlowStorageDeviceTypeEnum::FromString(*entity->getArgument(8)); }
+bool IfcElectricFlowStorageDevice::hasPredefinedType() const { return !entity->getArgument(8)->isNull(); }
+IfcElectricFlowStorageDeviceTypeEnum::IfcElectricFlowStorageDeviceTypeEnum IfcElectricFlowStorageDevice::PredefinedType() const { return IfcElectricFlowStorageDeviceTypeEnum::FromString(*entity->getArgument(8)); }
 void IfcElectricFlowStorageDevice::setPredefinedType(IfcElectricFlowStorageDeviceTypeEnum::IfcElectricFlowStorageDeviceTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcElectricFlowStorageDeviceTypeEnum::ToString(v)); }
 bool IfcElectricFlowStorageDevice::is(Type::Enum v) const { return v == Type::IfcElectricFlowStorageDevice || IfcFlowStorageDevice::is(v); }
 Type::Enum IfcElectricFlowStorageDevice::type() const { return Type::IfcElectricFlowStorageDevice; }
 Type::Enum IfcElectricFlowStorageDevice::Class() { return Type::IfcElectricFlowStorageDevice; }
-IfcElectricFlowStorageDevice::IfcElectricFlowStorageDevice(IfcAbstractEntityPtr e) : IfcFlowStorageDevice((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcElectricFlowStorageDevice)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcElectricFlowStorageDevice::IfcElectricFlowStorageDevice(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcElectricFlowStorageDeviceTypeEnum::IfcElectricFlowStorageDeviceTypeEnum > v9_PredefinedType) : IfcFlowStorageDevice((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcElectricFlowStorageDeviceTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcElectricFlowStorageDevice::IfcElectricFlowStorageDevice(IfcAbstractEntity* e) : IfcFlowStorageDevice((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcElectricFlowStorageDevice)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcElectricFlowStorageDevice::IfcElectricFlowStorageDevice(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcElectricFlowStorageDeviceTypeEnum::IfcElectricFlowStorageDeviceTypeEnum > v9_PredefinedType) : IfcFlowStorageDevice((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcElectricFlowStorageDeviceTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcElectricFlowStorageDeviceType
-IfcElectricFlowStorageDeviceTypeEnum::IfcElectricFlowStorageDeviceTypeEnum IfcElectricFlowStorageDeviceType::PredefinedType() { return IfcElectricFlowStorageDeviceTypeEnum::FromString(*entity->getArgument(9)); }
+IfcElectricFlowStorageDeviceTypeEnum::IfcElectricFlowStorageDeviceTypeEnum IfcElectricFlowStorageDeviceType::PredefinedType() const { return IfcElectricFlowStorageDeviceTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcElectricFlowStorageDeviceType::setPredefinedType(IfcElectricFlowStorageDeviceTypeEnum::IfcElectricFlowStorageDeviceTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcElectricFlowStorageDeviceTypeEnum::ToString(v)); }
 bool IfcElectricFlowStorageDeviceType::is(Type::Enum v) const { return v == Type::IfcElectricFlowStorageDeviceType || IfcFlowStorageDeviceType::is(v); }
 Type::Enum IfcElectricFlowStorageDeviceType::type() const { return Type::IfcElectricFlowStorageDeviceType; }
 Type::Enum IfcElectricFlowStorageDeviceType::Class() { return Type::IfcElectricFlowStorageDeviceType; }
-IfcElectricFlowStorageDeviceType::IfcElectricFlowStorageDeviceType(IfcAbstractEntityPtr e) : IfcFlowStorageDeviceType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcElectricFlowStorageDeviceType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcElectricFlowStorageDeviceType::IfcElectricFlowStorageDeviceType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcElectricFlowStorageDeviceTypeEnum::IfcElectricFlowStorageDeviceTypeEnum v10_PredefinedType) : IfcFlowStorageDeviceType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcElectricFlowStorageDeviceTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcElectricFlowStorageDeviceType::IfcElectricFlowStorageDeviceType(IfcAbstractEntity* e) : IfcFlowStorageDeviceType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcElectricFlowStorageDeviceType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcElectricFlowStorageDeviceType::IfcElectricFlowStorageDeviceType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcElectricFlowStorageDeviceTypeEnum::IfcElectricFlowStorageDeviceTypeEnum v10_PredefinedType) : IfcFlowStorageDeviceType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcElectricFlowStorageDeviceTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcElectricGenerator
-bool IfcElectricGenerator::hasPredefinedType() { return !entity->getArgument(8)->isNull(); }
-IfcElectricGeneratorTypeEnum::IfcElectricGeneratorTypeEnum IfcElectricGenerator::PredefinedType() { return IfcElectricGeneratorTypeEnum::FromString(*entity->getArgument(8)); }
+bool IfcElectricGenerator::hasPredefinedType() const { return !entity->getArgument(8)->isNull(); }
+IfcElectricGeneratorTypeEnum::IfcElectricGeneratorTypeEnum IfcElectricGenerator::PredefinedType() const { return IfcElectricGeneratorTypeEnum::FromString(*entity->getArgument(8)); }
 void IfcElectricGenerator::setPredefinedType(IfcElectricGeneratorTypeEnum::IfcElectricGeneratorTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcElectricGeneratorTypeEnum::ToString(v)); }
 bool IfcElectricGenerator::is(Type::Enum v) const { return v == Type::IfcElectricGenerator || IfcEnergyConversionDevice::is(v); }
 Type::Enum IfcElectricGenerator::type() const { return Type::IfcElectricGenerator; }
 Type::Enum IfcElectricGenerator::Class() { return Type::IfcElectricGenerator; }
-IfcElectricGenerator::IfcElectricGenerator(IfcAbstractEntityPtr e) : IfcEnergyConversionDevice((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcElectricGenerator)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcElectricGenerator::IfcElectricGenerator(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcElectricGeneratorTypeEnum::IfcElectricGeneratorTypeEnum > v9_PredefinedType) : IfcEnergyConversionDevice((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcElectricGeneratorTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcElectricGenerator::IfcElectricGenerator(IfcAbstractEntity* e) : IfcEnergyConversionDevice((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcElectricGenerator)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcElectricGenerator::IfcElectricGenerator(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcElectricGeneratorTypeEnum::IfcElectricGeneratorTypeEnum > v9_PredefinedType) : IfcEnergyConversionDevice((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcElectricGeneratorTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcElectricGeneratorType
-IfcElectricGeneratorTypeEnum::IfcElectricGeneratorTypeEnum IfcElectricGeneratorType::PredefinedType() { return IfcElectricGeneratorTypeEnum::FromString(*entity->getArgument(9)); }
+IfcElectricGeneratorTypeEnum::IfcElectricGeneratorTypeEnum IfcElectricGeneratorType::PredefinedType() const { return IfcElectricGeneratorTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcElectricGeneratorType::setPredefinedType(IfcElectricGeneratorTypeEnum::IfcElectricGeneratorTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcElectricGeneratorTypeEnum::ToString(v)); }
 bool IfcElectricGeneratorType::is(Type::Enum v) const { return v == Type::IfcElectricGeneratorType || IfcEnergyConversionDeviceType::is(v); }
 Type::Enum IfcElectricGeneratorType::type() const { return Type::IfcElectricGeneratorType; }
 Type::Enum IfcElectricGeneratorType::Class() { return Type::IfcElectricGeneratorType; }
-IfcElectricGeneratorType::IfcElectricGeneratorType(IfcAbstractEntityPtr e) : IfcEnergyConversionDeviceType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcElectricGeneratorType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcElectricGeneratorType::IfcElectricGeneratorType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcElectricGeneratorTypeEnum::IfcElectricGeneratorTypeEnum v10_PredefinedType) : IfcEnergyConversionDeviceType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcElectricGeneratorTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcElectricGeneratorType::IfcElectricGeneratorType(IfcAbstractEntity* e) : IfcEnergyConversionDeviceType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcElectricGeneratorType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcElectricGeneratorType::IfcElectricGeneratorType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcElectricGeneratorTypeEnum::IfcElectricGeneratorTypeEnum v10_PredefinedType) : IfcEnergyConversionDeviceType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcElectricGeneratorTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcElectricMotor
-bool IfcElectricMotor::hasPredefinedType() { return !entity->getArgument(8)->isNull(); }
-IfcElectricMotorTypeEnum::IfcElectricMotorTypeEnum IfcElectricMotor::PredefinedType() { return IfcElectricMotorTypeEnum::FromString(*entity->getArgument(8)); }
+bool IfcElectricMotor::hasPredefinedType() const { return !entity->getArgument(8)->isNull(); }
+IfcElectricMotorTypeEnum::IfcElectricMotorTypeEnum IfcElectricMotor::PredefinedType() const { return IfcElectricMotorTypeEnum::FromString(*entity->getArgument(8)); }
 void IfcElectricMotor::setPredefinedType(IfcElectricMotorTypeEnum::IfcElectricMotorTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcElectricMotorTypeEnum::ToString(v)); }
 bool IfcElectricMotor::is(Type::Enum v) const { return v == Type::IfcElectricMotor || IfcEnergyConversionDevice::is(v); }
 Type::Enum IfcElectricMotor::type() const { return Type::IfcElectricMotor; }
 Type::Enum IfcElectricMotor::Class() { return Type::IfcElectricMotor; }
-IfcElectricMotor::IfcElectricMotor(IfcAbstractEntityPtr e) : IfcEnergyConversionDevice((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcElectricMotor)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcElectricMotor::IfcElectricMotor(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcElectricMotorTypeEnum::IfcElectricMotorTypeEnum > v9_PredefinedType) : IfcEnergyConversionDevice((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcElectricMotorTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcElectricMotor::IfcElectricMotor(IfcAbstractEntity* e) : IfcEnergyConversionDevice((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcElectricMotor)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcElectricMotor::IfcElectricMotor(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcElectricMotorTypeEnum::IfcElectricMotorTypeEnum > v9_PredefinedType) : IfcEnergyConversionDevice((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcElectricMotorTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcElectricMotorType
-IfcElectricMotorTypeEnum::IfcElectricMotorTypeEnum IfcElectricMotorType::PredefinedType() { return IfcElectricMotorTypeEnum::FromString(*entity->getArgument(9)); }
+IfcElectricMotorTypeEnum::IfcElectricMotorTypeEnum IfcElectricMotorType::PredefinedType() const { return IfcElectricMotorTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcElectricMotorType::setPredefinedType(IfcElectricMotorTypeEnum::IfcElectricMotorTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcElectricMotorTypeEnum::ToString(v)); }
 bool IfcElectricMotorType::is(Type::Enum v) const { return v == Type::IfcElectricMotorType || IfcEnergyConversionDeviceType::is(v); }
 Type::Enum IfcElectricMotorType::type() const { return Type::IfcElectricMotorType; }
 Type::Enum IfcElectricMotorType::Class() { return Type::IfcElectricMotorType; }
-IfcElectricMotorType::IfcElectricMotorType(IfcAbstractEntityPtr e) : IfcEnergyConversionDeviceType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcElectricMotorType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcElectricMotorType::IfcElectricMotorType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcElectricMotorTypeEnum::IfcElectricMotorTypeEnum v10_PredefinedType) : IfcEnergyConversionDeviceType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcElectricMotorTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcElectricMotorType::IfcElectricMotorType(IfcAbstractEntity* e) : IfcEnergyConversionDeviceType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcElectricMotorType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcElectricMotorType::IfcElectricMotorType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcElectricMotorTypeEnum::IfcElectricMotorTypeEnum v10_PredefinedType) : IfcEnergyConversionDeviceType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcElectricMotorTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcElectricTimeControl
-bool IfcElectricTimeControl::hasPredefinedType() { return !entity->getArgument(8)->isNull(); }
-IfcElectricTimeControlTypeEnum::IfcElectricTimeControlTypeEnum IfcElectricTimeControl::PredefinedType() { return IfcElectricTimeControlTypeEnum::FromString(*entity->getArgument(8)); }
+bool IfcElectricTimeControl::hasPredefinedType() const { return !entity->getArgument(8)->isNull(); }
+IfcElectricTimeControlTypeEnum::IfcElectricTimeControlTypeEnum IfcElectricTimeControl::PredefinedType() const { return IfcElectricTimeControlTypeEnum::FromString(*entity->getArgument(8)); }
 void IfcElectricTimeControl::setPredefinedType(IfcElectricTimeControlTypeEnum::IfcElectricTimeControlTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcElectricTimeControlTypeEnum::ToString(v)); }
 bool IfcElectricTimeControl::is(Type::Enum v) const { return v == Type::IfcElectricTimeControl || IfcFlowController::is(v); }
 Type::Enum IfcElectricTimeControl::type() const { return Type::IfcElectricTimeControl; }
 Type::Enum IfcElectricTimeControl::Class() { return Type::IfcElectricTimeControl; }
-IfcElectricTimeControl::IfcElectricTimeControl(IfcAbstractEntityPtr e) : IfcFlowController((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcElectricTimeControl)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcElectricTimeControl::IfcElectricTimeControl(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcElectricTimeControlTypeEnum::IfcElectricTimeControlTypeEnum > v9_PredefinedType) : IfcFlowController((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcElectricTimeControlTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcElectricTimeControl::IfcElectricTimeControl(IfcAbstractEntity* e) : IfcFlowController((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcElectricTimeControl)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcElectricTimeControl::IfcElectricTimeControl(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcElectricTimeControlTypeEnum::IfcElectricTimeControlTypeEnum > v9_PredefinedType) : IfcFlowController((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcElectricTimeControlTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcElectricTimeControlType
-IfcElectricTimeControlTypeEnum::IfcElectricTimeControlTypeEnum IfcElectricTimeControlType::PredefinedType() { return IfcElectricTimeControlTypeEnum::FromString(*entity->getArgument(9)); }
+IfcElectricTimeControlTypeEnum::IfcElectricTimeControlTypeEnum IfcElectricTimeControlType::PredefinedType() const { return IfcElectricTimeControlTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcElectricTimeControlType::setPredefinedType(IfcElectricTimeControlTypeEnum::IfcElectricTimeControlTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcElectricTimeControlTypeEnum::ToString(v)); }
 bool IfcElectricTimeControlType::is(Type::Enum v) const { return v == Type::IfcElectricTimeControlType || IfcFlowControllerType::is(v); }
 Type::Enum IfcElectricTimeControlType::type() const { return Type::IfcElectricTimeControlType; }
 Type::Enum IfcElectricTimeControlType::Class() { return Type::IfcElectricTimeControlType; }
-IfcElectricTimeControlType::IfcElectricTimeControlType(IfcAbstractEntityPtr e) : IfcFlowControllerType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcElectricTimeControlType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcElectricTimeControlType::IfcElectricTimeControlType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcElectricTimeControlTypeEnum::IfcElectricTimeControlTypeEnum v10_PredefinedType) : IfcFlowControllerType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcElectricTimeControlTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcElectricTimeControlType::IfcElectricTimeControlType(IfcAbstractEntity* e) : IfcFlowControllerType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcElectricTimeControlType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcElectricTimeControlType::IfcElectricTimeControlType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcElectricTimeControlTypeEnum::IfcElectricTimeControlTypeEnum v10_PredefinedType) : IfcFlowControllerType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcElectricTimeControlTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcElement
-bool IfcElement::hasTag() { return !entity->getArgument(7)->isNull(); }
-IfcIdentifier IfcElement::Tag() { return *entity->getArgument(7); }
-void IfcElement::setTag(IfcIdentifier v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
-IfcRelFillsElement::list IfcElement::FillsVoids() { RETURN_INVERSE(IfcRelFillsElement) }
-IfcRelConnectsElements::list IfcElement::ConnectedTo() { RETURN_INVERSE(IfcRelConnectsElements) }
-IfcRelInterferesElements::list IfcElement::IsInterferedByElements() { RETURN_INVERSE(IfcRelInterferesElements) }
-IfcRelInterferesElements::list IfcElement::InterferesElements() { RETURN_INVERSE(IfcRelInterferesElements) }
-IfcRelProjectsElement::list IfcElement::HasProjections() { RETURN_INVERSE(IfcRelProjectsElement) }
-IfcRelReferencedInSpatialStructure::list IfcElement::ReferencedInStructures() { RETURN_INVERSE(IfcRelReferencedInSpatialStructure) }
-IfcRelVoidsElement::list IfcElement::HasOpenings() { RETURN_INVERSE(IfcRelVoidsElement) }
-IfcRelConnectsWithRealizingElements::list IfcElement::IsConnectionRealization() { RETURN_INVERSE(IfcRelConnectsWithRealizingElements) }
-IfcRelSpaceBoundary::list IfcElement::ProvidesBoundaries() { RETURN_INVERSE(IfcRelSpaceBoundary) }
-IfcRelConnectsElements::list IfcElement::ConnectedFrom() { RETURN_INVERSE(IfcRelConnectsElements) }
-IfcRelContainedInSpatialStructure::list IfcElement::ContainedInStructure() { RETURN_INVERSE(IfcRelContainedInSpatialStructure) }
+bool IfcElement::hasTag() const { return !entity->getArgument(7)->isNull(); }
+std::string IfcElement::Tag() const { return *entity->getArgument(7); }
+void IfcElement::setTag(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
+IfcRelFillsElement::list::ptr IfcElement::FillsVoids() const { return entity->getInverse(Type::IfcRelFillsElement, 5)->as<IfcRelFillsElement>(); }
+IfcRelConnectsElements::list::ptr IfcElement::ConnectedTo() const { return entity->getInverse(Type::IfcRelConnectsElements, 5)->as<IfcRelConnectsElements>(); }
+IfcRelInterferesElements::list::ptr IfcElement::IsInterferedByElements() const { return entity->getInverse(Type::IfcRelInterferesElements, 5)->as<IfcRelInterferesElements>(); }
+IfcRelInterferesElements::list::ptr IfcElement::InterferesElements() const { return entity->getInverse(Type::IfcRelInterferesElements, 4)->as<IfcRelInterferesElements>(); }
+IfcRelProjectsElement::list::ptr IfcElement::HasProjections() const { return entity->getInverse(Type::IfcRelProjectsElement, 4)->as<IfcRelProjectsElement>(); }
+IfcRelReferencedInSpatialStructure::list::ptr IfcElement::ReferencedInStructures() const { return entity->getInverse(Type::IfcRelReferencedInSpatialStructure, 4)->as<IfcRelReferencedInSpatialStructure>(); }
+IfcRelVoidsElement::list::ptr IfcElement::HasOpenings() const { return entity->getInverse(Type::IfcRelVoidsElement, 4)->as<IfcRelVoidsElement>(); }
+IfcRelConnectsWithRealizingElements::list::ptr IfcElement::IsConnectionRealization() const { return entity->getInverse(Type::IfcRelConnectsWithRealizingElements, 7)->as<IfcRelConnectsWithRealizingElements>(); }
+IfcRelSpaceBoundary::list::ptr IfcElement::ProvidesBoundaries() const { return entity->getInverse(Type::IfcRelSpaceBoundary, 5)->as<IfcRelSpaceBoundary>(); }
+IfcRelConnectsElements::list::ptr IfcElement::ConnectedFrom() const { return entity->getInverse(Type::IfcRelConnectsElements, 6)->as<IfcRelConnectsElements>(); }
+IfcRelContainedInSpatialStructure::list::ptr IfcElement::ContainedInStructure() const { return entity->getInverse(Type::IfcRelContainedInSpatialStructure, 4)->as<IfcRelContainedInSpatialStructure>(); }
 bool IfcElement::is(Type::Enum v) const { return v == Type::IfcElement || IfcProduct::is(v); }
 Type::Enum IfcElement::type() const { return Type::IfcElement; }
 Type::Enum IfcElement::Class() { return Type::IfcElement; }
-IfcElement::IfcElement(IfcAbstractEntityPtr e) : IfcProduct((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcElement)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcElement::IfcElement(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag) : IfcProduct((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
+IfcElement::IfcElement(IfcAbstractEntity* e) : IfcProduct((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcElement)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcElement::IfcElement(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag) : IfcProduct((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcElementAssembly
-bool IfcElementAssembly::hasAssemblyPlace() { return !entity->getArgument(8)->isNull(); }
-IfcAssemblyPlaceEnum::IfcAssemblyPlaceEnum IfcElementAssembly::AssemblyPlace() { return IfcAssemblyPlaceEnum::FromString(*entity->getArgument(8)); }
+bool IfcElementAssembly::hasAssemblyPlace() const { return !entity->getArgument(8)->isNull(); }
+IfcAssemblyPlaceEnum::IfcAssemblyPlaceEnum IfcElementAssembly::AssemblyPlace() const { return IfcAssemblyPlaceEnum::FromString(*entity->getArgument(8)); }
 void IfcElementAssembly::setAssemblyPlace(IfcAssemblyPlaceEnum::IfcAssemblyPlaceEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcAssemblyPlaceEnum::ToString(v)); }
-bool IfcElementAssembly::hasPredefinedType() { return !entity->getArgument(9)->isNull(); }
-IfcElementAssemblyTypeEnum::IfcElementAssemblyTypeEnum IfcElementAssembly::PredefinedType() { return IfcElementAssemblyTypeEnum::FromString(*entity->getArgument(9)); }
+bool IfcElementAssembly::hasPredefinedType() const { return !entity->getArgument(9)->isNull(); }
+IfcElementAssemblyTypeEnum::IfcElementAssemblyTypeEnum IfcElementAssembly::PredefinedType() const { return IfcElementAssemblyTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcElementAssembly::setPredefinedType(IfcElementAssemblyTypeEnum::IfcElementAssemblyTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcElementAssemblyTypeEnum::ToString(v)); }
 bool IfcElementAssembly::is(Type::Enum v) const { return v == Type::IfcElementAssembly || IfcElement::is(v); }
 Type::Enum IfcElementAssembly::type() const { return Type::IfcElementAssembly; }
 Type::Enum IfcElementAssembly::Class() { return Type::IfcElementAssembly; }
-IfcElementAssembly::IfcElementAssembly(IfcAbstractEntityPtr e) : IfcElement((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcElementAssembly)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcElementAssembly::IfcElementAssembly(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcAssemblyPlaceEnum::IfcAssemblyPlaceEnum > v9_AssemblyPlace, boost::optional< IfcElementAssemblyTypeEnum::IfcElementAssemblyTypeEnum > v10_PredefinedType) : IfcElement((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_AssemblyPlace) { e->setArgument(8,*v9_AssemblyPlace,IfcAssemblyPlaceEnum::ToString(*v9_AssemblyPlace)); } else { e->setArgument(8); } if (v10_PredefinedType) { e->setArgument(9,*v10_PredefinedType,IfcElementAssemblyTypeEnum::ToString(*v10_PredefinedType)); } else { e->setArgument(9); } entity = e; EntityBuffer::Add(this); }
+IfcElementAssembly::IfcElementAssembly(IfcAbstractEntity* e) : IfcElement((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcElementAssembly)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcElementAssembly::IfcElementAssembly(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcAssemblyPlaceEnum::IfcAssemblyPlaceEnum > v9_AssemblyPlace, boost::optional< IfcElementAssemblyTypeEnum::IfcElementAssemblyTypeEnum > v10_PredefinedType) : IfcElement((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_AssemblyPlace) { e->setArgument(8,*v9_AssemblyPlace,IfcAssemblyPlaceEnum::ToString(*v9_AssemblyPlace)); } else { e->setArgument(8); } if (v10_PredefinedType) { e->setArgument(9,*v10_PredefinedType,IfcElementAssemblyTypeEnum::ToString(*v10_PredefinedType)); } else { e->setArgument(9); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcElementAssemblyType
-IfcElementAssemblyTypeEnum::IfcElementAssemblyTypeEnum IfcElementAssemblyType::PredefinedType() { return IfcElementAssemblyTypeEnum::FromString(*entity->getArgument(9)); }
+IfcElementAssemblyTypeEnum::IfcElementAssemblyTypeEnum IfcElementAssemblyType::PredefinedType() const { return IfcElementAssemblyTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcElementAssemblyType::setPredefinedType(IfcElementAssemblyTypeEnum::IfcElementAssemblyTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcElementAssemblyTypeEnum::ToString(v)); }
 bool IfcElementAssemblyType::is(Type::Enum v) const { return v == Type::IfcElementAssemblyType || IfcElementType::is(v); }
 Type::Enum IfcElementAssemblyType::type() const { return Type::IfcElementAssemblyType; }
 Type::Enum IfcElementAssemblyType::Class() { return Type::IfcElementAssemblyType; }
-IfcElementAssemblyType::IfcElementAssemblyType(IfcAbstractEntityPtr e) : IfcElementType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcElementAssemblyType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcElementAssemblyType::IfcElementAssemblyType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcElementAssemblyTypeEnum::IfcElementAssemblyTypeEnum v10_PredefinedType) : IfcElementType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcElementAssemblyTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcElementAssemblyType::IfcElementAssemblyType(IfcAbstractEntity* e) : IfcElementType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcElementAssemblyType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcElementAssemblyType::IfcElementAssemblyType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcElementAssemblyTypeEnum::IfcElementAssemblyTypeEnum v10_PredefinedType) : IfcElementType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcElementAssemblyTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcElementComponent
 bool IfcElementComponent::is(Type::Enum v) const { return v == Type::IfcElementComponent || IfcElement::is(v); }
 Type::Enum IfcElementComponent::type() const { return Type::IfcElementComponent; }
 Type::Enum IfcElementComponent::Class() { return Type::IfcElementComponent; }
-IfcElementComponent::IfcElementComponent(IfcAbstractEntityPtr e) : IfcElement((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcElementComponent)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcElementComponent::IfcElementComponent(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag) : IfcElement((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
+IfcElementComponent::IfcElementComponent(IfcAbstractEntity* e) : IfcElement((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcElementComponent)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcElementComponent::IfcElementComponent(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag) : IfcElement((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcElementComponentType
 bool IfcElementComponentType::is(Type::Enum v) const { return v == Type::IfcElementComponentType || IfcElementType::is(v); }
 Type::Enum IfcElementComponentType::type() const { return Type::IfcElementComponentType; }
 Type::Enum IfcElementComponentType::Class() { return Type::IfcElementComponentType; }
-IfcElementComponentType::IfcElementComponentType(IfcAbstractEntityPtr e) : IfcElementType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcElementComponentType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcElementComponentType::IfcElementComponentType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType) : IfcElementType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcElementComponentType::IfcElementComponentType(IfcAbstractEntity* e) : IfcElementType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcElementComponentType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcElementComponentType::IfcElementComponentType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType) : IfcElementType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcElementQuantity
-bool IfcElementQuantity::hasMethodOfMeasurement() { return !entity->getArgument(4)->isNull(); }
-IfcLabel IfcElementQuantity::MethodOfMeasurement() { return *entity->getArgument(4); }
-void IfcElementQuantity::setMethodOfMeasurement(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-SHARED_PTR< IfcTemplatedEntityList< IfcPhysicalQuantity > > IfcElementQuantity::Quantities() { RETURN_AS_LIST(IfcPhysicalQuantity,5) }
-void IfcElementQuantity::setQuantities(SHARED_PTR< IfcTemplatedEntityList< IfcPhysicalQuantity > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v->generalize()); }
+bool IfcElementQuantity::hasMethodOfMeasurement() const { return !entity->getArgument(4)->isNull(); }
+std::string IfcElementQuantity::MethodOfMeasurement() const { return *entity->getArgument(4); }
+void IfcElementQuantity::setMethodOfMeasurement(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+IfcTemplatedEntityList< IfcPhysicalQuantity >::ptr IfcElementQuantity::Quantities() const { IfcEntityList::ptr es = *entity->getArgument(5); return es->as<IfcPhysicalQuantity>(); }
+void IfcElementQuantity::setQuantities(IfcTemplatedEntityList< IfcPhysicalQuantity >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v->generalize()); }
 bool IfcElementQuantity::is(Type::Enum v) const { return v == Type::IfcElementQuantity || IfcQuantitySet::is(v); }
 Type::Enum IfcElementQuantity::type() const { return Type::IfcElementQuantity; }
 Type::Enum IfcElementQuantity::Class() { return Type::IfcElementQuantity; }
-IfcElementQuantity::IfcElementQuantity(IfcAbstractEntityPtr e) : IfcQuantitySet((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcElementQuantity)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcElementQuantity::IfcElementQuantity(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_MethodOfMeasurement, SHARED_PTR< IfcTemplatedEntityList< IfcPhysicalQuantity > > v6_Quantities) : IfcQuantitySet((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_MethodOfMeasurement) { e->setArgument(4,(*v5_MethodOfMeasurement)); } else { e->setArgument(4); } e->setArgument(5,(v6_Quantities)->generalize()); entity = e; EntityBuffer::Add(this); }
+IfcElementQuantity::IfcElementQuantity(IfcAbstractEntity* e) : IfcQuantitySet((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcElementQuantity)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcElementQuantity::IfcElementQuantity(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_MethodOfMeasurement, IfcTemplatedEntityList< IfcPhysicalQuantity >::ptr v6_Quantities) : IfcQuantitySet((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_MethodOfMeasurement) { e->setArgument(4,(*v5_MethodOfMeasurement)); } else { e->setArgument(4); } e->setArgument(5,(v6_Quantities)->generalize()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcElementType
-bool IfcElementType::hasElementType() { return !entity->getArgument(8)->isNull(); }
-IfcLabel IfcElementType::ElementType() { return *entity->getArgument(8); }
-void IfcElementType::setElementType(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
+bool IfcElementType::hasElementType() const { return !entity->getArgument(8)->isNull(); }
+std::string IfcElementType::ElementType() const { return *entity->getArgument(8); }
+void IfcElementType::setElementType(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
 bool IfcElementType::is(Type::Enum v) const { return v == Type::IfcElementType || IfcTypeProduct::is(v); }
 Type::Enum IfcElementType::type() const { return Type::IfcElementType; }
 Type::Enum IfcElementType::Class() { return Type::IfcElementType; }
-IfcElementType::IfcElementType(IfcAbstractEntityPtr e) : IfcTypeProduct((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcElementType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcElementType::IfcElementType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType) : IfcTypeProduct((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcElementType::IfcElementType(IfcAbstractEntity* e) : IfcTypeProduct((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcElementType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcElementType::IfcElementType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType) : IfcTypeProduct((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcElementarySurface
-IfcAxis2Placement3D* IfcElementarySurface::Position() { return (IfcAxis2Placement3D*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(0))); }
+IfcAxis2Placement3D* IfcElementarySurface::Position() const { return (IfcAxis2Placement3D*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(0))); }
 void IfcElementarySurface::setPosition(IfcAxis2Placement3D* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
 bool IfcElementarySurface::is(Type::Enum v) const { return v == Type::IfcElementarySurface || IfcSurface::is(v); }
 Type::Enum IfcElementarySurface::type() const { return Type::IfcElementarySurface; }
 Type::Enum IfcElementarySurface::Class() { return Type::IfcElementarySurface; }
-IfcElementarySurface::IfcElementarySurface(IfcAbstractEntityPtr e) : IfcSurface((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcElementarySurface)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcElementarySurface::IfcElementarySurface(IfcAxis2Placement3D* v1_Position) : IfcSurface((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Position)); entity = e; EntityBuffer::Add(this); }
+IfcElementarySurface::IfcElementarySurface(IfcAbstractEntity* e) : IfcSurface((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcElementarySurface)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcElementarySurface::IfcElementarySurface(IfcAxis2Placement3D* v1_Position) : IfcSurface((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Position)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcEllipse
-IfcPositiveLengthMeasure IfcEllipse::SemiAxis1() { return *entity->getArgument(1); }
-void IfcEllipse::setSemiAxis1(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-IfcPositiveLengthMeasure IfcEllipse::SemiAxis2() { return *entity->getArgument(2); }
-void IfcEllipse::setSemiAxis2(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+double IfcEllipse::SemiAxis1() const { return *entity->getArgument(1); }
+void IfcEllipse::setSemiAxis1(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+double IfcEllipse::SemiAxis2() const { return *entity->getArgument(2); }
+void IfcEllipse::setSemiAxis2(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
 bool IfcEllipse::is(Type::Enum v) const { return v == Type::IfcEllipse || IfcConic::is(v); }
 Type::Enum IfcEllipse::type() const { return Type::IfcEllipse; }
 Type::Enum IfcEllipse::Class() { return Type::IfcEllipse; }
-IfcEllipse::IfcEllipse(IfcAbstractEntityPtr e) : IfcConic((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcEllipse)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcEllipse::IfcEllipse(IfcAxis2Placement v1_Position, IfcPositiveLengthMeasure v2_SemiAxis1, IfcPositiveLengthMeasure v3_SemiAxis2) : IfcConic((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Position)); e->setArgument(1,(v2_SemiAxis1)); e->setArgument(2,(v3_SemiAxis2)); entity = e; EntityBuffer::Add(this); }
+IfcEllipse::IfcEllipse(IfcAbstractEntity* e) : IfcConic((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcEllipse)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcEllipse::IfcEllipse(IfcAxis2Placement* v1_Position, double v2_SemiAxis1, double v3_SemiAxis2) : IfcConic((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Position)); e->setArgument(1,(v2_SemiAxis1)); e->setArgument(2,(v3_SemiAxis2)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcEllipseProfileDef
-IfcPositiveLengthMeasure IfcEllipseProfileDef::SemiAxis1() { return *entity->getArgument(3); }
-void IfcEllipseProfileDef::setSemiAxis1(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-IfcPositiveLengthMeasure IfcEllipseProfileDef::SemiAxis2() { return *entity->getArgument(4); }
-void IfcEllipseProfileDef::setSemiAxis2(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+double IfcEllipseProfileDef::SemiAxis1() const { return *entity->getArgument(3); }
+void IfcEllipseProfileDef::setSemiAxis1(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+double IfcEllipseProfileDef::SemiAxis2() const { return *entity->getArgument(4); }
+void IfcEllipseProfileDef::setSemiAxis2(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
 bool IfcEllipseProfileDef::is(Type::Enum v) const { return v == Type::IfcEllipseProfileDef || IfcParameterizedProfileDef::is(v); }
 Type::Enum IfcEllipseProfileDef::type() const { return Type::IfcEllipseProfileDef; }
 Type::Enum IfcEllipseProfileDef::Class() { return Type::IfcEllipseProfileDef; }
-IfcEllipseProfileDef::IfcEllipseProfileDef(IfcAbstractEntityPtr e) : IfcParameterizedProfileDef((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcEllipseProfileDef)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcEllipseProfileDef::IfcEllipseProfileDef(IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< IfcLabel > v2_ProfileName, IfcAxis2Placement2D* v3_Position, IfcPositiveLengthMeasure v4_SemiAxis1, IfcPositiveLengthMeasure v5_SemiAxis2) : IfcParameterizedProfileDef((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,v1_ProfileType,IfcProfileTypeEnum::ToString(v1_ProfileType)); if (v2_ProfileName) { e->setArgument(1,(*v2_ProfileName)); } else { e->setArgument(1); } e->setArgument(2,(v3_Position)); e->setArgument(3,(v4_SemiAxis1)); e->setArgument(4,(v5_SemiAxis2)); entity = e; EntityBuffer::Add(this); }
+IfcEllipseProfileDef::IfcEllipseProfileDef(IfcAbstractEntity* e) : IfcParameterizedProfileDef((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcEllipseProfileDef)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcEllipseProfileDef::IfcEllipseProfileDef(IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< std::string > v2_ProfileName, IfcAxis2Placement2D* v3_Position, double v4_SemiAxis1, double v5_SemiAxis2) : IfcParameterizedProfileDef((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,v1_ProfileType,IfcProfileTypeEnum::ToString(v1_ProfileType)); if (v2_ProfileName) { e->setArgument(1,(*v2_ProfileName)); } else { e->setArgument(1); } e->setArgument(2,(v3_Position)); e->setArgument(3,(v4_SemiAxis1)); e->setArgument(4,(v5_SemiAxis2)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcEnergyConversionDevice
 bool IfcEnergyConversionDevice::is(Type::Enum v) const { return v == Type::IfcEnergyConversionDevice || IfcDistributionFlowElement::is(v); }
 Type::Enum IfcEnergyConversionDevice::type() const { return Type::IfcEnergyConversionDevice; }
 Type::Enum IfcEnergyConversionDevice::Class() { return Type::IfcEnergyConversionDevice; }
-IfcEnergyConversionDevice::IfcEnergyConversionDevice(IfcAbstractEntityPtr e) : IfcDistributionFlowElement((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcEnergyConversionDevice)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcEnergyConversionDevice::IfcEnergyConversionDevice(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag) : IfcDistributionFlowElement((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
+IfcEnergyConversionDevice::IfcEnergyConversionDevice(IfcAbstractEntity* e) : IfcDistributionFlowElement((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcEnergyConversionDevice)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcEnergyConversionDevice::IfcEnergyConversionDevice(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag) : IfcDistributionFlowElement((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcEnergyConversionDeviceType
 bool IfcEnergyConversionDeviceType::is(Type::Enum v) const { return v == Type::IfcEnergyConversionDeviceType || IfcDistributionFlowElementType::is(v); }
 Type::Enum IfcEnergyConversionDeviceType::type() const { return Type::IfcEnergyConversionDeviceType; }
 Type::Enum IfcEnergyConversionDeviceType::Class() { return Type::IfcEnergyConversionDeviceType; }
-IfcEnergyConversionDeviceType::IfcEnergyConversionDeviceType(IfcAbstractEntityPtr e) : IfcDistributionFlowElementType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcEnergyConversionDeviceType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcEnergyConversionDeviceType::IfcEnergyConversionDeviceType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType) : IfcDistributionFlowElementType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcEnergyConversionDeviceType::IfcEnergyConversionDeviceType(IfcAbstractEntity* e) : IfcDistributionFlowElementType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcEnergyConversionDeviceType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcEnergyConversionDeviceType::IfcEnergyConversionDeviceType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType) : IfcDistributionFlowElementType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcEngine
-bool IfcEngine::hasPredefinedType() { return !entity->getArgument(8)->isNull(); }
-IfcEngineTypeEnum::IfcEngineTypeEnum IfcEngine::PredefinedType() { return IfcEngineTypeEnum::FromString(*entity->getArgument(8)); }
+bool IfcEngine::hasPredefinedType() const { return !entity->getArgument(8)->isNull(); }
+IfcEngineTypeEnum::IfcEngineTypeEnum IfcEngine::PredefinedType() const { return IfcEngineTypeEnum::FromString(*entity->getArgument(8)); }
 void IfcEngine::setPredefinedType(IfcEngineTypeEnum::IfcEngineTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcEngineTypeEnum::ToString(v)); }
 bool IfcEngine::is(Type::Enum v) const { return v == Type::IfcEngine || IfcEnergyConversionDevice::is(v); }
 Type::Enum IfcEngine::type() const { return Type::IfcEngine; }
 Type::Enum IfcEngine::Class() { return Type::IfcEngine; }
-IfcEngine::IfcEngine(IfcAbstractEntityPtr e) : IfcEnergyConversionDevice((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcEngine)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcEngine::IfcEngine(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcEngineTypeEnum::IfcEngineTypeEnum > v9_PredefinedType) : IfcEnergyConversionDevice((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcEngineTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcEngine::IfcEngine(IfcAbstractEntity* e) : IfcEnergyConversionDevice((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcEngine)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcEngine::IfcEngine(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcEngineTypeEnum::IfcEngineTypeEnum > v9_PredefinedType) : IfcEnergyConversionDevice((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcEngineTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcEngineType
-IfcEngineTypeEnum::IfcEngineTypeEnum IfcEngineType::PredefinedType() { return IfcEngineTypeEnum::FromString(*entity->getArgument(9)); }
+IfcEngineTypeEnum::IfcEngineTypeEnum IfcEngineType::PredefinedType() const { return IfcEngineTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcEngineType::setPredefinedType(IfcEngineTypeEnum::IfcEngineTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcEngineTypeEnum::ToString(v)); }
 bool IfcEngineType::is(Type::Enum v) const { return v == Type::IfcEngineType || IfcEnergyConversionDeviceType::is(v); }
 Type::Enum IfcEngineType::type() const { return Type::IfcEngineType; }
 Type::Enum IfcEngineType::Class() { return Type::IfcEngineType; }
-IfcEngineType::IfcEngineType(IfcAbstractEntityPtr e) : IfcEnergyConversionDeviceType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcEngineType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcEngineType::IfcEngineType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcEngineTypeEnum::IfcEngineTypeEnum v10_PredefinedType) : IfcEnergyConversionDeviceType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcEngineTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcEngineType::IfcEngineType(IfcAbstractEntity* e) : IfcEnergyConversionDeviceType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcEngineType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcEngineType::IfcEngineType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcEngineTypeEnum::IfcEngineTypeEnum v10_PredefinedType) : IfcEnergyConversionDeviceType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcEngineTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcEvaporativeCooler
-bool IfcEvaporativeCooler::hasPredefinedType() { return !entity->getArgument(8)->isNull(); }
-IfcEvaporativeCoolerTypeEnum::IfcEvaporativeCoolerTypeEnum IfcEvaporativeCooler::PredefinedType() { return IfcEvaporativeCoolerTypeEnum::FromString(*entity->getArgument(8)); }
+bool IfcEvaporativeCooler::hasPredefinedType() const { return !entity->getArgument(8)->isNull(); }
+IfcEvaporativeCoolerTypeEnum::IfcEvaporativeCoolerTypeEnum IfcEvaporativeCooler::PredefinedType() const { return IfcEvaporativeCoolerTypeEnum::FromString(*entity->getArgument(8)); }
 void IfcEvaporativeCooler::setPredefinedType(IfcEvaporativeCoolerTypeEnum::IfcEvaporativeCoolerTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcEvaporativeCoolerTypeEnum::ToString(v)); }
 bool IfcEvaporativeCooler::is(Type::Enum v) const { return v == Type::IfcEvaporativeCooler || IfcEnergyConversionDevice::is(v); }
 Type::Enum IfcEvaporativeCooler::type() const { return Type::IfcEvaporativeCooler; }
 Type::Enum IfcEvaporativeCooler::Class() { return Type::IfcEvaporativeCooler; }
-IfcEvaporativeCooler::IfcEvaporativeCooler(IfcAbstractEntityPtr e) : IfcEnergyConversionDevice((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcEvaporativeCooler)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcEvaporativeCooler::IfcEvaporativeCooler(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcEvaporativeCoolerTypeEnum::IfcEvaporativeCoolerTypeEnum > v9_PredefinedType) : IfcEnergyConversionDevice((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcEvaporativeCoolerTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcEvaporativeCooler::IfcEvaporativeCooler(IfcAbstractEntity* e) : IfcEnergyConversionDevice((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcEvaporativeCooler)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcEvaporativeCooler::IfcEvaporativeCooler(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcEvaporativeCoolerTypeEnum::IfcEvaporativeCoolerTypeEnum > v9_PredefinedType) : IfcEnergyConversionDevice((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcEvaporativeCoolerTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcEvaporativeCoolerType
-IfcEvaporativeCoolerTypeEnum::IfcEvaporativeCoolerTypeEnum IfcEvaporativeCoolerType::PredefinedType() { return IfcEvaporativeCoolerTypeEnum::FromString(*entity->getArgument(9)); }
+IfcEvaporativeCoolerTypeEnum::IfcEvaporativeCoolerTypeEnum IfcEvaporativeCoolerType::PredefinedType() const { return IfcEvaporativeCoolerTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcEvaporativeCoolerType::setPredefinedType(IfcEvaporativeCoolerTypeEnum::IfcEvaporativeCoolerTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcEvaporativeCoolerTypeEnum::ToString(v)); }
 bool IfcEvaporativeCoolerType::is(Type::Enum v) const { return v == Type::IfcEvaporativeCoolerType || IfcEnergyConversionDeviceType::is(v); }
 Type::Enum IfcEvaporativeCoolerType::type() const { return Type::IfcEvaporativeCoolerType; }
 Type::Enum IfcEvaporativeCoolerType::Class() { return Type::IfcEvaporativeCoolerType; }
-IfcEvaporativeCoolerType::IfcEvaporativeCoolerType(IfcAbstractEntityPtr e) : IfcEnergyConversionDeviceType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcEvaporativeCoolerType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcEvaporativeCoolerType::IfcEvaporativeCoolerType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcEvaporativeCoolerTypeEnum::IfcEvaporativeCoolerTypeEnum v10_PredefinedType) : IfcEnergyConversionDeviceType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcEvaporativeCoolerTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcEvaporativeCoolerType::IfcEvaporativeCoolerType(IfcAbstractEntity* e) : IfcEnergyConversionDeviceType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcEvaporativeCoolerType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcEvaporativeCoolerType::IfcEvaporativeCoolerType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcEvaporativeCoolerTypeEnum::IfcEvaporativeCoolerTypeEnum v10_PredefinedType) : IfcEnergyConversionDeviceType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcEvaporativeCoolerTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcEvaporator
-bool IfcEvaporator::hasPredefinedType() { return !entity->getArgument(8)->isNull(); }
-IfcEvaporatorTypeEnum::IfcEvaporatorTypeEnum IfcEvaporator::PredefinedType() { return IfcEvaporatorTypeEnum::FromString(*entity->getArgument(8)); }
+bool IfcEvaporator::hasPredefinedType() const { return !entity->getArgument(8)->isNull(); }
+IfcEvaporatorTypeEnum::IfcEvaporatorTypeEnum IfcEvaporator::PredefinedType() const { return IfcEvaporatorTypeEnum::FromString(*entity->getArgument(8)); }
 void IfcEvaporator::setPredefinedType(IfcEvaporatorTypeEnum::IfcEvaporatorTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcEvaporatorTypeEnum::ToString(v)); }
 bool IfcEvaporator::is(Type::Enum v) const { return v == Type::IfcEvaporator || IfcEnergyConversionDevice::is(v); }
 Type::Enum IfcEvaporator::type() const { return Type::IfcEvaporator; }
 Type::Enum IfcEvaporator::Class() { return Type::IfcEvaporator; }
-IfcEvaporator::IfcEvaporator(IfcAbstractEntityPtr e) : IfcEnergyConversionDevice((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcEvaporator)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcEvaporator::IfcEvaporator(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcEvaporatorTypeEnum::IfcEvaporatorTypeEnum > v9_PredefinedType) : IfcEnergyConversionDevice((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcEvaporatorTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcEvaporator::IfcEvaporator(IfcAbstractEntity* e) : IfcEnergyConversionDevice((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcEvaporator)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcEvaporator::IfcEvaporator(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcEvaporatorTypeEnum::IfcEvaporatorTypeEnum > v9_PredefinedType) : IfcEnergyConversionDevice((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcEvaporatorTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcEvaporatorType
-IfcEvaporatorTypeEnum::IfcEvaporatorTypeEnum IfcEvaporatorType::PredefinedType() { return IfcEvaporatorTypeEnum::FromString(*entity->getArgument(9)); }
+IfcEvaporatorTypeEnum::IfcEvaporatorTypeEnum IfcEvaporatorType::PredefinedType() const { return IfcEvaporatorTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcEvaporatorType::setPredefinedType(IfcEvaporatorTypeEnum::IfcEvaporatorTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcEvaporatorTypeEnum::ToString(v)); }
 bool IfcEvaporatorType::is(Type::Enum v) const { return v == Type::IfcEvaporatorType || IfcEnergyConversionDeviceType::is(v); }
 Type::Enum IfcEvaporatorType::type() const { return Type::IfcEvaporatorType; }
 Type::Enum IfcEvaporatorType::Class() { return Type::IfcEvaporatorType; }
-IfcEvaporatorType::IfcEvaporatorType(IfcAbstractEntityPtr e) : IfcEnergyConversionDeviceType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcEvaporatorType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcEvaporatorType::IfcEvaporatorType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcEvaporatorTypeEnum::IfcEvaporatorTypeEnum v10_PredefinedType) : IfcEnergyConversionDeviceType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcEvaporatorTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcEvaporatorType::IfcEvaporatorType(IfcAbstractEntity* e) : IfcEnergyConversionDeviceType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcEvaporatorType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcEvaporatorType::IfcEvaporatorType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcEvaporatorTypeEnum::IfcEvaporatorTypeEnum v10_PredefinedType) : IfcEnergyConversionDeviceType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcEvaporatorTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcEvent
-bool IfcEvent::hasPredefinedType() { return !entity->getArgument(7)->isNull(); }
-IfcEventTypeEnum::IfcEventTypeEnum IfcEvent::PredefinedType() { return IfcEventTypeEnum::FromString(*entity->getArgument(7)); }
+bool IfcEvent::hasPredefinedType() const { return !entity->getArgument(7)->isNull(); }
+IfcEventTypeEnum::IfcEventTypeEnum IfcEvent::PredefinedType() const { return IfcEventTypeEnum::FromString(*entity->getArgument(7)); }
 void IfcEvent::setPredefinedType(IfcEventTypeEnum::IfcEventTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v,IfcEventTypeEnum::ToString(v)); }
-bool IfcEvent::hasEventTriggerType() { return !entity->getArgument(8)->isNull(); }
-IfcEventTriggerTypeEnum::IfcEventTriggerTypeEnum IfcEvent::EventTriggerType() { return IfcEventTriggerTypeEnum::FromString(*entity->getArgument(8)); }
+bool IfcEvent::hasEventTriggerType() const { return !entity->getArgument(8)->isNull(); }
+IfcEventTriggerTypeEnum::IfcEventTriggerTypeEnum IfcEvent::EventTriggerType() const { return IfcEventTriggerTypeEnum::FromString(*entity->getArgument(8)); }
 void IfcEvent::setEventTriggerType(IfcEventTriggerTypeEnum::IfcEventTriggerTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcEventTriggerTypeEnum::ToString(v)); }
-bool IfcEvent::hasUserDefinedEventTriggerType() { return !entity->getArgument(9)->isNull(); }
-IfcLabel IfcEvent::UserDefinedEventTriggerType() { return *entity->getArgument(9); }
-void IfcEvent::setUserDefinedEventTriggerType(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
-bool IfcEvent::hasEventOccurenceTime() { return !entity->getArgument(10)->isNull(); }
-IfcEventTime* IfcEvent::EventOccurenceTime() { return (IfcEventTime*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(10))); }
+bool IfcEvent::hasUserDefinedEventTriggerType() const { return !entity->getArgument(9)->isNull(); }
+std::string IfcEvent::UserDefinedEventTriggerType() const { return *entity->getArgument(9); }
+void IfcEvent::setUserDefinedEventTriggerType(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
+bool IfcEvent::hasEventOccurenceTime() const { return !entity->getArgument(10)->isNull(); }
+IfcEventTime* IfcEvent::EventOccurenceTime() const { return (IfcEventTime*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(10))); }
 void IfcEvent::setEventOccurenceTime(IfcEventTime* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
 bool IfcEvent::is(Type::Enum v) const { return v == Type::IfcEvent || IfcProcess::is(v); }
 Type::Enum IfcEvent::type() const { return Type::IfcEvent; }
 Type::Enum IfcEvent::Class() { return Type::IfcEvent; }
-IfcEvent::IfcEvent(IfcAbstractEntityPtr e) : IfcProcess((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcEvent)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcEvent::IfcEvent(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, boost::optional< IfcIdentifier > v6_Identification, boost::optional< IfcText > v7_LongDescription, boost::optional< IfcEventTypeEnum::IfcEventTypeEnum > v8_PredefinedType, boost::optional< IfcEventTriggerTypeEnum::IfcEventTriggerTypeEnum > v9_EventTriggerType, boost::optional< IfcLabel > v10_UserDefinedEventTriggerType, IfcEventTime* v11_EventOccurenceTime) : IfcProcess((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } if (v6_Identification) { e->setArgument(5,(*v6_Identification)); } else { e->setArgument(5); } if (v7_LongDescription) { e->setArgument(6,(*v7_LongDescription)); } else { e->setArgument(6); } if (v8_PredefinedType) { e->setArgument(7,*v8_PredefinedType,IfcEventTypeEnum::ToString(*v8_PredefinedType)); } else { e->setArgument(7); } if (v9_EventTriggerType) { e->setArgument(8,*v9_EventTriggerType,IfcEventTriggerTypeEnum::ToString(*v9_EventTriggerType)); } else { e->setArgument(8); } if (v10_UserDefinedEventTriggerType) { e->setArgument(9,(*v10_UserDefinedEventTriggerType)); } else { e->setArgument(9); } e->setArgument(10,(v11_EventOccurenceTime)); entity = e; EntityBuffer::Add(this); }
+IfcEvent::IfcEvent(IfcAbstractEntity* e) : IfcProcess((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcEvent)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcEvent::IfcEvent(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, boost::optional< std::string > v6_Identification, boost::optional< std::string > v7_LongDescription, boost::optional< IfcEventTypeEnum::IfcEventTypeEnum > v8_PredefinedType, boost::optional< IfcEventTriggerTypeEnum::IfcEventTriggerTypeEnum > v9_EventTriggerType, boost::optional< std::string > v10_UserDefinedEventTriggerType, IfcEventTime* v11_EventOccurenceTime) : IfcProcess((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } if (v6_Identification) { e->setArgument(5,(*v6_Identification)); } else { e->setArgument(5); } if (v7_LongDescription) { e->setArgument(6,(*v7_LongDescription)); } else { e->setArgument(6); } if (v8_PredefinedType) { e->setArgument(7,*v8_PredefinedType,IfcEventTypeEnum::ToString(*v8_PredefinedType)); } else { e->setArgument(7); } if (v9_EventTriggerType) { e->setArgument(8,*v9_EventTriggerType,IfcEventTriggerTypeEnum::ToString(*v9_EventTriggerType)); } else { e->setArgument(8); } if (v10_UserDefinedEventTriggerType) { e->setArgument(9,(*v10_UserDefinedEventTriggerType)); } else { e->setArgument(9); } e->setArgument(10,(v11_EventOccurenceTime)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcEventTime
-bool IfcEventTime::hasActualDate() { return !entity->getArgument(3)->isNull(); }
-IfcDateTime IfcEventTime::ActualDate() { return *entity->getArgument(3); }
-void IfcEventTime::setActualDate(IfcDateTime v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-bool IfcEventTime::hasEarlyDate() { return !entity->getArgument(4)->isNull(); }
-IfcDateTime IfcEventTime::EarlyDate() { return *entity->getArgument(4); }
-void IfcEventTime::setEarlyDate(IfcDateTime v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-bool IfcEventTime::hasLateDate() { return !entity->getArgument(5)->isNull(); }
-IfcDateTime IfcEventTime::LateDate() { return *entity->getArgument(5); }
-void IfcEventTime::setLateDate(IfcDateTime v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-bool IfcEventTime::hasScheduleDate() { return !entity->getArgument(6)->isNull(); }
-IfcDateTime IfcEventTime::ScheduleDate() { return *entity->getArgument(6); }
-void IfcEventTime::setScheduleDate(IfcDateTime v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
+bool IfcEventTime::hasActualDate() const { return !entity->getArgument(3)->isNull(); }
+std::string IfcEventTime::ActualDate() const { return *entity->getArgument(3); }
+void IfcEventTime::setActualDate(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+bool IfcEventTime::hasEarlyDate() const { return !entity->getArgument(4)->isNull(); }
+std::string IfcEventTime::EarlyDate() const { return *entity->getArgument(4); }
+void IfcEventTime::setEarlyDate(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+bool IfcEventTime::hasLateDate() const { return !entity->getArgument(5)->isNull(); }
+std::string IfcEventTime::LateDate() const { return *entity->getArgument(5); }
+void IfcEventTime::setLateDate(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+bool IfcEventTime::hasScheduleDate() const { return !entity->getArgument(6)->isNull(); }
+std::string IfcEventTime::ScheduleDate() const { return *entity->getArgument(6); }
+void IfcEventTime::setScheduleDate(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
 bool IfcEventTime::is(Type::Enum v) const { return v == Type::IfcEventTime || IfcSchedulingTime::is(v); }
 Type::Enum IfcEventTime::type() const { return Type::IfcEventTime; }
 Type::Enum IfcEventTime::Class() { return Type::IfcEventTime; }
-IfcEventTime::IfcEventTime(IfcAbstractEntityPtr e) : IfcSchedulingTime((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcEventTime)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcEventTime::IfcEventTime(boost::optional< IfcLabel > v1_Name, boost::optional< IfcDataOriginEnum::IfcDataOriginEnum > v2_DataOrigin, boost::optional< IfcLabel > v3_UserDefinedDataOrigin, boost::optional< IfcDateTime > v4_ActualDate, boost::optional< IfcDateTime > v5_EarlyDate, boost::optional< IfcDateTime > v6_LateDate, boost::optional< IfcDateTime > v7_ScheduleDate) : IfcSchedulingTime((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_DataOrigin) { e->setArgument(1,*v2_DataOrigin,IfcDataOriginEnum::ToString(*v2_DataOrigin)); } else { e->setArgument(1); } if (v3_UserDefinedDataOrigin) { e->setArgument(2,(*v3_UserDefinedDataOrigin)); } else { e->setArgument(2); } if (v4_ActualDate) { e->setArgument(3,(*v4_ActualDate)); } else { e->setArgument(3); } if (v5_EarlyDate) { e->setArgument(4,(*v5_EarlyDate)); } else { e->setArgument(4); } if (v6_LateDate) { e->setArgument(5,(*v6_LateDate)); } else { e->setArgument(5); } if (v7_ScheduleDate) { e->setArgument(6,(*v7_ScheduleDate)); } else { e->setArgument(6); } entity = e; EntityBuffer::Add(this); }
+IfcEventTime::IfcEventTime(IfcAbstractEntity* e) : IfcSchedulingTime((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcEventTime)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcEventTime::IfcEventTime(boost::optional< std::string > v1_Name, boost::optional< IfcDataOriginEnum::IfcDataOriginEnum > v2_DataOrigin, boost::optional< std::string > v3_UserDefinedDataOrigin, boost::optional< std::string > v4_ActualDate, boost::optional< std::string > v5_EarlyDate, boost::optional< std::string > v6_LateDate, boost::optional< std::string > v7_ScheduleDate) : IfcSchedulingTime((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_DataOrigin) { e->setArgument(1,*v2_DataOrigin,IfcDataOriginEnum::ToString(*v2_DataOrigin)); } else { e->setArgument(1); } if (v3_UserDefinedDataOrigin) { e->setArgument(2,(*v3_UserDefinedDataOrigin)); } else { e->setArgument(2); } if (v4_ActualDate) { e->setArgument(3,(*v4_ActualDate)); } else { e->setArgument(3); } if (v5_EarlyDate) { e->setArgument(4,(*v5_EarlyDate)); } else { e->setArgument(4); } if (v6_LateDate) { e->setArgument(5,(*v6_LateDate)); } else { e->setArgument(5); } if (v7_ScheduleDate) { e->setArgument(6,(*v7_ScheduleDate)); } else { e->setArgument(6); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcEventType
-IfcEventTypeEnum::IfcEventTypeEnum IfcEventType::PredefinedType() { return IfcEventTypeEnum::FromString(*entity->getArgument(9)); }
+IfcEventTypeEnum::IfcEventTypeEnum IfcEventType::PredefinedType() const { return IfcEventTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcEventType::setPredefinedType(IfcEventTypeEnum::IfcEventTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcEventTypeEnum::ToString(v)); }
-IfcEventTriggerTypeEnum::IfcEventTriggerTypeEnum IfcEventType::EventTriggerType() { return IfcEventTriggerTypeEnum::FromString(*entity->getArgument(10)); }
+IfcEventTriggerTypeEnum::IfcEventTriggerTypeEnum IfcEventType::EventTriggerType() const { return IfcEventTriggerTypeEnum::FromString(*entity->getArgument(10)); }
 void IfcEventType::setEventTriggerType(IfcEventTriggerTypeEnum::IfcEventTriggerTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v,IfcEventTriggerTypeEnum::ToString(v)); }
-bool IfcEventType::hasUserDefinedEventTriggerType() { return !entity->getArgument(11)->isNull(); }
-IfcLabel IfcEventType::UserDefinedEventTriggerType() { return *entity->getArgument(11); }
-void IfcEventType::setUserDefinedEventTriggerType(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(11,v); }
+bool IfcEventType::hasUserDefinedEventTriggerType() const { return !entity->getArgument(11)->isNull(); }
+std::string IfcEventType::UserDefinedEventTriggerType() const { return *entity->getArgument(11); }
+void IfcEventType::setUserDefinedEventTriggerType(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(11,v); }
 bool IfcEventType::is(Type::Enum v) const { return v == Type::IfcEventType || IfcTypeProcess::is(v); }
 Type::Enum IfcEventType::type() const { return Type::IfcEventType; }
 Type::Enum IfcEventType::Class() { return Type::IfcEventType; }
-IfcEventType::IfcEventType(IfcAbstractEntityPtr e) : IfcTypeProcess((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcEventType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcEventType::IfcEventType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< IfcIdentifier > v7_Identification, boost::optional< IfcText > v8_LongDescription, boost::optional< IfcLabel > v9_ProcessType, IfcEventTypeEnum::IfcEventTypeEnum v10_PredefinedType, IfcEventTriggerTypeEnum::IfcEventTriggerTypeEnum v11_EventTriggerType, boost::optional< IfcLabel > v12_UserDefinedEventTriggerType) : IfcTypeProcess((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_Identification) { e->setArgument(6,(*v7_Identification)); } else { e->setArgument(6); } if (v8_LongDescription) { e->setArgument(7,(*v8_LongDescription)); } else { e->setArgument(7); } if (v9_ProcessType) { e->setArgument(8,(*v9_ProcessType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcEventTypeEnum::ToString(v10_PredefinedType)); e->setArgument(10,v11_EventTriggerType,IfcEventTriggerTypeEnum::ToString(v11_EventTriggerType)); if (v12_UserDefinedEventTriggerType) { e->setArgument(11,(*v12_UserDefinedEventTriggerType)); } else { e->setArgument(11); } entity = e; EntityBuffer::Add(this); }
+IfcEventType::IfcEventType(IfcAbstractEntity* e) : IfcTypeProcess((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcEventType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcEventType::IfcEventType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< std::string > v7_Identification, boost::optional< std::string > v8_LongDescription, boost::optional< std::string > v9_ProcessType, IfcEventTypeEnum::IfcEventTypeEnum v10_PredefinedType, IfcEventTriggerTypeEnum::IfcEventTriggerTypeEnum v11_EventTriggerType, boost::optional< std::string > v12_UserDefinedEventTriggerType) : IfcTypeProcess((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_Identification) { e->setArgument(6,(*v7_Identification)); } else { e->setArgument(6); } if (v8_LongDescription) { e->setArgument(7,(*v8_LongDescription)); } else { e->setArgument(7); } if (v9_ProcessType) { e->setArgument(8,(*v9_ProcessType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcEventTypeEnum::ToString(v10_PredefinedType)); e->setArgument(10,v11_EventTriggerType,IfcEventTriggerTypeEnum::ToString(v11_EventTriggerType)); if (v12_UserDefinedEventTriggerType) { e->setArgument(11,(*v12_UserDefinedEventTriggerType)); } else { e->setArgument(11); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcExtendedProperties
-bool IfcExtendedProperties::hasName() { return !entity->getArgument(0)->isNull(); }
-IfcIdentifier IfcExtendedProperties::Name() { return *entity->getArgument(0); }
-void IfcExtendedProperties::setName(IfcIdentifier v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-bool IfcExtendedProperties::hasDescription() { return !entity->getArgument(1)->isNull(); }
-IfcText IfcExtendedProperties::Description() { return *entity->getArgument(1); }
-void IfcExtendedProperties::setDescription(IfcText v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-SHARED_PTR< IfcTemplatedEntityList< IfcProperty > > IfcExtendedProperties::Properties() { RETURN_AS_LIST(IfcProperty,2) }
-void IfcExtendedProperties::setProperties(SHARED_PTR< IfcTemplatedEntityList< IfcProperty > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v->generalize()); }
+bool IfcExtendedProperties::hasName() const { return !entity->getArgument(0)->isNull(); }
+std::string IfcExtendedProperties::Name() const { return *entity->getArgument(0); }
+void IfcExtendedProperties::setName(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+bool IfcExtendedProperties::hasDescription() const { return !entity->getArgument(1)->isNull(); }
+std::string IfcExtendedProperties::Description() const { return *entity->getArgument(1); }
+void IfcExtendedProperties::setDescription(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+IfcTemplatedEntityList< IfcProperty >::ptr IfcExtendedProperties::Properties() const { IfcEntityList::ptr es = *entity->getArgument(2); return es->as<IfcProperty>(); }
+void IfcExtendedProperties::setProperties(IfcTemplatedEntityList< IfcProperty >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v->generalize()); }
 bool IfcExtendedProperties::is(Type::Enum v) const { return v == Type::IfcExtendedProperties || IfcPropertyAbstraction::is(v); }
 Type::Enum IfcExtendedProperties::type() const { return Type::IfcExtendedProperties; }
 Type::Enum IfcExtendedProperties::Class() { return Type::IfcExtendedProperties; }
-IfcExtendedProperties::IfcExtendedProperties(IfcAbstractEntityPtr e) : IfcPropertyAbstraction((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcExtendedProperties)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcExtendedProperties::IfcExtendedProperties(boost::optional< IfcIdentifier > v1_Name, boost::optional< IfcText > v2_Description, SHARED_PTR< IfcTemplatedEntityList< IfcProperty > > v3_Properties) : IfcPropertyAbstraction((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_Properties)->generalize()); entity = e; EntityBuffer::Add(this); }
+IfcExtendedProperties::IfcExtendedProperties(IfcAbstractEntity* e) : IfcPropertyAbstraction((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcExtendedProperties)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcExtendedProperties::IfcExtendedProperties(boost::optional< std::string > v1_Name, boost::optional< std::string > v2_Description, IfcTemplatedEntityList< IfcProperty >::ptr v3_Properties) : IfcPropertyAbstraction((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_Properties)->generalize()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcExternalInformation
 bool IfcExternalInformation::is(Type::Enum v) const { return v == Type::IfcExternalInformation; }
 Type::Enum IfcExternalInformation::type() const { return Type::IfcExternalInformation; }
 Type::Enum IfcExternalInformation::Class() { return Type::IfcExternalInformation; }
-IfcExternalInformation::IfcExternalInformation(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcExternalInformation)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcExternalInformation::IfcExternalInformation(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcExternalInformation)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
 IfcExternalInformation::IfcExternalInformation() : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcExternalReference
-bool IfcExternalReference::hasLocation() { return !entity->getArgument(0)->isNull(); }
-IfcURIReference IfcExternalReference::Location() { return *entity->getArgument(0); }
-void IfcExternalReference::setLocation(IfcURIReference v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-bool IfcExternalReference::hasIdentification() { return !entity->getArgument(1)->isNull(); }
-IfcIdentifier IfcExternalReference::Identification() { return *entity->getArgument(1); }
-void IfcExternalReference::setIdentification(IfcIdentifier v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-bool IfcExternalReference::hasName() { return !entity->getArgument(2)->isNull(); }
-IfcLabel IfcExternalReference::Name() { return *entity->getArgument(2); }
-void IfcExternalReference::setName(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-IfcExternalReferenceRelationship::list IfcExternalReference::ExternalReferenceForResources() { RETURN_INVERSE(IfcExternalReferenceRelationship) }
+bool IfcExternalReference::hasLocation() const { return !entity->getArgument(0)->isNull(); }
+std::string IfcExternalReference::Location() const { return *entity->getArgument(0); }
+void IfcExternalReference::setLocation(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+bool IfcExternalReference::hasIdentification() const { return !entity->getArgument(1)->isNull(); }
+std::string IfcExternalReference::Identification() const { return *entity->getArgument(1); }
+void IfcExternalReference::setIdentification(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+bool IfcExternalReference::hasName() const { return !entity->getArgument(2)->isNull(); }
+std::string IfcExternalReference::Name() const { return *entity->getArgument(2); }
+void IfcExternalReference::setName(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+IfcExternalReferenceRelationship::list::ptr IfcExternalReference::ExternalReferenceForResources() const { return entity->getInverse(Type::IfcExternalReferenceRelationship, 2)->as<IfcExternalReferenceRelationship>(); }
 bool IfcExternalReference::is(Type::Enum v) const { return v == Type::IfcExternalReference; }
 Type::Enum IfcExternalReference::type() const { return Type::IfcExternalReference; }
 Type::Enum IfcExternalReference::Class() { return Type::IfcExternalReference; }
-IfcExternalReference::IfcExternalReference(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcExternalReference)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcExternalReference::IfcExternalReference(boost::optional< IfcURIReference > v1_Location, boost::optional< IfcIdentifier > v2_Identification, boost::optional< IfcLabel > v3_Name) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Location) { e->setArgument(0,(*v1_Location)); } else { e->setArgument(0); } if (v2_Identification) { e->setArgument(1,(*v2_Identification)); } else { e->setArgument(1); } if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } entity = e; EntityBuffer::Add(this); }
+IfcExternalReference::IfcExternalReference(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcExternalReference)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcExternalReference::IfcExternalReference(boost::optional< std::string > v1_Location, boost::optional< std::string > v2_Identification, boost::optional< std::string > v3_Name) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Location) { e->setArgument(0,(*v1_Location)); } else { e->setArgument(0); } if (v2_Identification) { e->setArgument(1,(*v2_Identification)); } else { e->setArgument(1); } if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcExternalReferenceRelationship
-IfcExternalReference* IfcExternalReferenceRelationship::RelatingReference() { return (IfcExternalReference*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(2))); }
+IfcExternalReference* IfcExternalReferenceRelationship::RelatingReference() const { return (IfcExternalReference*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(2))); }
 void IfcExternalReferenceRelationship::setRelatingReference(IfcExternalReference* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > IfcExternalReferenceRelationship::RelatedResourceObjects() { RETURN_AS_LIST(IfcUtil::IfcAbstractSelect,3) }
-void IfcExternalReferenceRelationship::setRelatedResourceObjects(SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v->generalize()); }
+IfcEntityList::ptr IfcExternalReferenceRelationship::RelatedResourceObjects() const { return *entity->getArgument(3); }
+void IfcExternalReferenceRelationship::setRelatedResourceObjects(IfcEntityList::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
 bool IfcExternalReferenceRelationship::is(Type::Enum v) const { return v == Type::IfcExternalReferenceRelationship || IfcResourceLevelRelationship::is(v); }
 Type::Enum IfcExternalReferenceRelationship::type() const { return Type::IfcExternalReferenceRelationship; }
 Type::Enum IfcExternalReferenceRelationship::Class() { return Type::IfcExternalReferenceRelationship; }
-IfcExternalReferenceRelationship::IfcExternalReferenceRelationship(IfcAbstractEntityPtr e) : IfcResourceLevelRelationship((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcExternalReferenceRelationship)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcExternalReferenceRelationship::IfcExternalReferenceRelationship(boost::optional< IfcLabel > v1_Name, boost::optional< IfcText > v2_Description, IfcExternalReference* v3_RelatingReference, IfcEntities v4_RelatedResourceObjects) : IfcResourceLevelRelationship((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_RelatingReference)); e->setArgument(3,(v4_RelatedResourceObjects)); entity = e; EntityBuffer::Add(this); }
+IfcExternalReferenceRelationship::IfcExternalReferenceRelationship(IfcAbstractEntity* e) : IfcResourceLevelRelationship((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcExternalReferenceRelationship)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcExternalReferenceRelationship::IfcExternalReferenceRelationship(boost::optional< std::string > v1_Name, boost::optional< std::string > v2_Description, IfcExternalReference* v3_RelatingReference, IfcEntityList::ptr v4_RelatedResourceObjects) : IfcResourceLevelRelationship((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_RelatingReference)); e->setArgument(3,(v4_RelatedResourceObjects)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcExternalSpatialElement
-bool IfcExternalSpatialElement::hasPredefinedType() { return !entity->getArgument(8)->isNull(); }
-IfcExternalSpatialElementTypeEnum::IfcExternalSpatialElementTypeEnum IfcExternalSpatialElement::PredefinedType() { return IfcExternalSpatialElementTypeEnum::FromString(*entity->getArgument(8)); }
+bool IfcExternalSpatialElement::hasPredefinedType() const { return !entity->getArgument(8)->isNull(); }
+IfcExternalSpatialElementTypeEnum::IfcExternalSpatialElementTypeEnum IfcExternalSpatialElement::PredefinedType() const { return IfcExternalSpatialElementTypeEnum::FromString(*entity->getArgument(8)); }
 void IfcExternalSpatialElement::setPredefinedType(IfcExternalSpatialElementTypeEnum::IfcExternalSpatialElementTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcExternalSpatialElementTypeEnum::ToString(v)); }
-IfcRelSpaceBoundary::list IfcExternalSpatialElement::BoundedBy() { RETURN_INVERSE(IfcRelSpaceBoundary) }
+IfcRelSpaceBoundary::list::ptr IfcExternalSpatialElement::BoundedBy() const { return entity->getInverse(Type::IfcRelSpaceBoundary, 4)->as<IfcRelSpaceBoundary>(); }
 bool IfcExternalSpatialElement::is(Type::Enum v) const { return v == Type::IfcExternalSpatialElement || IfcExternalSpatialStructureElement::is(v); }
 Type::Enum IfcExternalSpatialElement::type() const { return Type::IfcExternalSpatialElement; }
 Type::Enum IfcExternalSpatialElement::Class() { return Type::IfcExternalSpatialElement; }
-IfcExternalSpatialElement::IfcExternalSpatialElement(IfcAbstractEntityPtr e) : IfcExternalSpatialStructureElement((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcExternalSpatialElement)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcExternalSpatialElement::IfcExternalSpatialElement(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcLabel > v8_LongName, boost::optional< IfcExternalSpatialElementTypeEnum::IfcExternalSpatialElementTypeEnum > v9_PredefinedType) : IfcExternalSpatialStructureElement((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_LongName) { e->setArgument(7,(*v8_LongName)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcExternalSpatialElementTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcExternalSpatialElement::IfcExternalSpatialElement(IfcAbstractEntity* e) : IfcExternalSpatialStructureElement((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcExternalSpatialElement)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcExternalSpatialElement::IfcExternalSpatialElement(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_LongName, boost::optional< IfcExternalSpatialElementTypeEnum::IfcExternalSpatialElementTypeEnum > v9_PredefinedType) : IfcExternalSpatialStructureElement((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_LongName) { e->setArgument(7,(*v8_LongName)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcExternalSpatialElementTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcExternalSpatialStructureElement
 bool IfcExternalSpatialStructureElement::is(Type::Enum v) const { return v == Type::IfcExternalSpatialStructureElement || IfcSpatialElement::is(v); }
 Type::Enum IfcExternalSpatialStructureElement::type() const { return Type::IfcExternalSpatialStructureElement; }
 Type::Enum IfcExternalSpatialStructureElement::Class() { return Type::IfcExternalSpatialStructureElement; }
-IfcExternalSpatialStructureElement::IfcExternalSpatialStructureElement(IfcAbstractEntityPtr e) : IfcSpatialElement((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcExternalSpatialStructureElement)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcExternalSpatialStructureElement::IfcExternalSpatialStructureElement(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcLabel > v8_LongName) : IfcSpatialElement((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_LongName) { e->setArgument(7,(*v8_LongName)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
+IfcExternalSpatialStructureElement::IfcExternalSpatialStructureElement(IfcAbstractEntity* e) : IfcSpatialElement((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcExternalSpatialStructureElement)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcExternalSpatialStructureElement::IfcExternalSpatialStructureElement(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_LongName) : IfcSpatialElement((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_LongName) { e->setArgument(7,(*v8_LongName)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcExternallyDefinedHatchStyle
 bool IfcExternallyDefinedHatchStyle::is(Type::Enum v) const { return v == Type::IfcExternallyDefinedHatchStyle || IfcExternalReference::is(v); }
 Type::Enum IfcExternallyDefinedHatchStyle::type() const { return Type::IfcExternallyDefinedHatchStyle; }
 Type::Enum IfcExternallyDefinedHatchStyle::Class() { return Type::IfcExternallyDefinedHatchStyle; }
-IfcExternallyDefinedHatchStyle::IfcExternallyDefinedHatchStyle(IfcAbstractEntityPtr e) : IfcExternalReference((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcExternallyDefinedHatchStyle)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcExternallyDefinedHatchStyle::IfcExternallyDefinedHatchStyle(boost::optional< IfcURIReference > v1_Location, boost::optional< IfcIdentifier > v2_Identification, boost::optional< IfcLabel > v3_Name) : IfcExternalReference((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Location) { e->setArgument(0,(*v1_Location)); } else { e->setArgument(0); } if (v2_Identification) { e->setArgument(1,(*v2_Identification)); } else { e->setArgument(1); } if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } entity = e; EntityBuffer::Add(this); }
+IfcExternallyDefinedHatchStyle::IfcExternallyDefinedHatchStyle(IfcAbstractEntity* e) : IfcExternalReference((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcExternallyDefinedHatchStyle)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcExternallyDefinedHatchStyle::IfcExternallyDefinedHatchStyle(boost::optional< std::string > v1_Location, boost::optional< std::string > v2_Identification, boost::optional< std::string > v3_Name) : IfcExternalReference((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Location) { e->setArgument(0,(*v1_Location)); } else { e->setArgument(0); } if (v2_Identification) { e->setArgument(1,(*v2_Identification)); } else { e->setArgument(1); } if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcExternallyDefinedSurfaceStyle
 bool IfcExternallyDefinedSurfaceStyle::is(Type::Enum v) const { return v == Type::IfcExternallyDefinedSurfaceStyle || IfcExternalReference::is(v); }
 Type::Enum IfcExternallyDefinedSurfaceStyle::type() const { return Type::IfcExternallyDefinedSurfaceStyle; }
 Type::Enum IfcExternallyDefinedSurfaceStyle::Class() { return Type::IfcExternallyDefinedSurfaceStyle; }
-IfcExternallyDefinedSurfaceStyle::IfcExternallyDefinedSurfaceStyle(IfcAbstractEntityPtr e) : IfcExternalReference((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcExternallyDefinedSurfaceStyle)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcExternallyDefinedSurfaceStyle::IfcExternallyDefinedSurfaceStyle(boost::optional< IfcURIReference > v1_Location, boost::optional< IfcIdentifier > v2_Identification, boost::optional< IfcLabel > v3_Name) : IfcExternalReference((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Location) { e->setArgument(0,(*v1_Location)); } else { e->setArgument(0); } if (v2_Identification) { e->setArgument(1,(*v2_Identification)); } else { e->setArgument(1); } if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } entity = e; EntityBuffer::Add(this); }
+IfcExternallyDefinedSurfaceStyle::IfcExternallyDefinedSurfaceStyle(IfcAbstractEntity* e) : IfcExternalReference((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcExternallyDefinedSurfaceStyle)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcExternallyDefinedSurfaceStyle::IfcExternallyDefinedSurfaceStyle(boost::optional< std::string > v1_Location, boost::optional< std::string > v2_Identification, boost::optional< std::string > v3_Name) : IfcExternalReference((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Location) { e->setArgument(0,(*v1_Location)); } else { e->setArgument(0); } if (v2_Identification) { e->setArgument(1,(*v2_Identification)); } else { e->setArgument(1); } if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcExternallyDefinedTextFont
 bool IfcExternallyDefinedTextFont::is(Type::Enum v) const { return v == Type::IfcExternallyDefinedTextFont || IfcExternalReference::is(v); }
 Type::Enum IfcExternallyDefinedTextFont::type() const { return Type::IfcExternallyDefinedTextFont; }
 Type::Enum IfcExternallyDefinedTextFont::Class() { return Type::IfcExternallyDefinedTextFont; }
-IfcExternallyDefinedTextFont::IfcExternallyDefinedTextFont(IfcAbstractEntityPtr e) : IfcExternalReference((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcExternallyDefinedTextFont)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcExternallyDefinedTextFont::IfcExternallyDefinedTextFont(boost::optional< IfcURIReference > v1_Location, boost::optional< IfcIdentifier > v2_Identification, boost::optional< IfcLabel > v3_Name) : IfcExternalReference((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Location) { e->setArgument(0,(*v1_Location)); } else { e->setArgument(0); } if (v2_Identification) { e->setArgument(1,(*v2_Identification)); } else { e->setArgument(1); } if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } entity = e; EntityBuffer::Add(this); }
+IfcExternallyDefinedTextFont::IfcExternallyDefinedTextFont(IfcAbstractEntity* e) : IfcExternalReference((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcExternallyDefinedTextFont)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcExternallyDefinedTextFont::IfcExternallyDefinedTextFont(boost::optional< std::string > v1_Location, boost::optional< std::string > v2_Identification, boost::optional< std::string > v3_Name) : IfcExternalReference((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Location) { e->setArgument(0,(*v1_Location)); } else { e->setArgument(0); } if (v2_Identification) { e->setArgument(1,(*v2_Identification)); } else { e->setArgument(1); } if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcExtrudedAreaSolid
-IfcDirection* IfcExtrudedAreaSolid::ExtrudedDirection() { return (IfcDirection*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(2))); }
+IfcDirection* IfcExtrudedAreaSolid::ExtrudedDirection() const { return (IfcDirection*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(2))); }
 void IfcExtrudedAreaSolid::setExtrudedDirection(IfcDirection* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-IfcPositiveLengthMeasure IfcExtrudedAreaSolid::Depth() { return *entity->getArgument(3); }
-void IfcExtrudedAreaSolid::setDepth(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+double IfcExtrudedAreaSolid::Depth() const { return *entity->getArgument(3); }
+void IfcExtrudedAreaSolid::setDepth(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
 bool IfcExtrudedAreaSolid::is(Type::Enum v) const { return v == Type::IfcExtrudedAreaSolid || IfcSweptAreaSolid::is(v); }
 Type::Enum IfcExtrudedAreaSolid::type() const { return Type::IfcExtrudedAreaSolid; }
 Type::Enum IfcExtrudedAreaSolid::Class() { return Type::IfcExtrudedAreaSolid; }
-IfcExtrudedAreaSolid::IfcExtrudedAreaSolid(IfcAbstractEntityPtr e) : IfcSweptAreaSolid((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcExtrudedAreaSolid)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcExtrudedAreaSolid::IfcExtrudedAreaSolid(IfcProfileDef* v1_SweptArea, IfcAxis2Placement3D* v2_Position, IfcDirection* v3_ExtrudedDirection, IfcPositiveLengthMeasure v4_Depth) : IfcSweptAreaSolid((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_SweptArea)); e->setArgument(1,(v2_Position)); e->setArgument(2,(v3_ExtrudedDirection)); e->setArgument(3,(v4_Depth)); entity = e; EntityBuffer::Add(this); }
+IfcExtrudedAreaSolid::IfcExtrudedAreaSolid(IfcAbstractEntity* e) : IfcSweptAreaSolid((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcExtrudedAreaSolid)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcExtrudedAreaSolid::IfcExtrudedAreaSolid(IfcProfileDef* v1_SweptArea, IfcAxis2Placement3D* v2_Position, IfcDirection* v3_ExtrudedDirection, double v4_Depth) : IfcSweptAreaSolid((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_SweptArea)); e->setArgument(1,(v2_Position)); e->setArgument(2,(v3_ExtrudedDirection)); e->setArgument(3,(v4_Depth)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcExtrudedAreaSolidTapered
-IfcProfileDef* IfcExtrudedAreaSolidTapered::EndSweptArea() { return (IfcProfileDef*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(4))); }
+IfcProfileDef* IfcExtrudedAreaSolidTapered::EndSweptArea() const { return (IfcProfileDef*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(4))); }
 void IfcExtrudedAreaSolidTapered::setEndSweptArea(IfcProfileDef* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
 bool IfcExtrudedAreaSolidTapered::is(Type::Enum v) const { return v == Type::IfcExtrudedAreaSolidTapered || IfcExtrudedAreaSolid::is(v); }
 Type::Enum IfcExtrudedAreaSolidTapered::type() const { return Type::IfcExtrudedAreaSolidTapered; }
 Type::Enum IfcExtrudedAreaSolidTapered::Class() { return Type::IfcExtrudedAreaSolidTapered; }
-IfcExtrudedAreaSolidTapered::IfcExtrudedAreaSolidTapered(IfcAbstractEntityPtr e) : IfcExtrudedAreaSolid((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcExtrudedAreaSolidTapered)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcExtrudedAreaSolidTapered::IfcExtrudedAreaSolidTapered(IfcProfileDef* v1_SweptArea, IfcAxis2Placement3D* v2_Position, IfcDirection* v3_ExtrudedDirection, IfcPositiveLengthMeasure v4_Depth, IfcProfileDef* v5_EndSweptArea) : IfcExtrudedAreaSolid((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_SweptArea)); e->setArgument(1,(v2_Position)); e->setArgument(2,(v3_ExtrudedDirection)); e->setArgument(3,(v4_Depth)); e->setArgument(4,(v5_EndSweptArea)); entity = e; EntityBuffer::Add(this); }
+IfcExtrudedAreaSolidTapered::IfcExtrudedAreaSolidTapered(IfcAbstractEntity* e) : IfcExtrudedAreaSolid((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcExtrudedAreaSolidTapered)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcExtrudedAreaSolidTapered::IfcExtrudedAreaSolidTapered(IfcProfileDef* v1_SweptArea, IfcAxis2Placement3D* v2_Position, IfcDirection* v3_ExtrudedDirection, double v4_Depth, IfcProfileDef* v5_EndSweptArea) : IfcExtrudedAreaSolid((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_SweptArea)); e->setArgument(1,(v2_Position)); e->setArgument(2,(v3_ExtrudedDirection)); e->setArgument(3,(v4_Depth)); e->setArgument(4,(v5_EndSweptArea)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcFace
-SHARED_PTR< IfcTemplatedEntityList< IfcFaceBound > > IfcFace::Bounds() { RETURN_AS_LIST(IfcFaceBound,0) }
-void IfcFace::setBounds(SHARED_PTR< IfcTemplatedEntityList< IfcFaceBound > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v->generalize()); }
-IfcTextureMap::list IfcFace::HasTextureMaps() { RETURN_INVERSE(IfcTextureMap) }
+IfcTemplatedEntityList< IfcFaceBound >::ptr IfcFace::Bounds() const { IfcEntityList::ptr es = *entity->getArgument(0); return es->as<IfcFaceBound>(); }
+void IfcFace::setBounds(IfcTemplatedEntityList< IfcFaceBound >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v->generalize()); }
+IfcTextureMap::list::ptr IfcFace::HasTextureMaps() const { return entity->getInverse(Type::IfcTextureMap, 2)->as<IfcTextureMap>(); }
 bool IfcFace::is(Type::Enum v) const { return v == Type::IfcFace || IfcTopologicalRepresentationItem::is(v); }
 Type::Enum IfcFace::type() const { return Type::IfcFace; }
 Type::Enum IfcFace::Class() { return Type::IfcFace; }
-IfcFace::IfcFace(IfcAbstractEntityPtr e) : IfcTopologicalRepresentationItem((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcFace)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcFace::IfcFace(SHARED_PTR< IfcTemplatedEntityList< IfcFaceBound > > v1_Bounds) : IfcTopologicalRepresentationItem((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Bounds)->generalize()); entity = e; EntityBuffer::Add(this); }
+IfcFace::IfcFace(IfcAbstractEntity* e) : IfcTopologicalRepresentationItem((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcFace)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcFace::IfcFace(IfcTemplatedEntityList< IfcFaceBound >::ptr v1_Bounds) : IfcTopologicalRepresentationItem((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Bounds)->generalize()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcFaceBasedSurfaceModel
-SHARED_PTR< IfcTemplatedEntityList< IfcConnectedFaceSet > > IfcFaceBasedSurfaceModel::FbsmFaces() { RETURN_AS_LIST(IfcConnectedFaceSet,0) }
-void IfcFaceBasedSurfaceModel::setFbsmFaces(SHARED_PTR< IfcTemplatedEntityList< IfcConnectedFaceSet > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v->generalize()); }
+IfcTemplatedEntityList< IfcConnectedFaceSet >::ptr IfcFaceBasedSurfaceModel::FbsmFaces() const { IfcEntityList::ptr es = *entity->getArgument(0); return es->as<IfcConnectedFaceSet>(); }
+void IfcFaceBasedSurfaceModel::setFbsmFaces(IfcTemplatedEntityList< IfcConnectedFaceSet >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v->generalize()); }
 bool IfcFaceBasedSurfaceModel::is(Type::Enum v) const { return v == Type::IfcFaceBasedSurfaceModel || IfcGeometricRepresentationItem::is(v); }
 Type::Enum IfcFaceBasedSurfaceModel::type() const { return Type::IfcFaceBasedSurfaceModel; }
 Type::Enum IfcFaceBasedSurfaceModel::Class() { return Type::IfcFaceBasedSurfaceModel; }
-IfcFaceBasedSurfaceModel::IfcFaceBasedSurfaceModel(IfcAbstractEntityPtr e) : IfcGeometricRepresentationItem((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcFaceBasedSurfaceModel)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcFaceBasedSurfaceModel::IfcFaceBasedSurfaceModel(SHARED_PTR< IfcTemplatedEntityList< IfcConnectedFaceSet > > v1_FbsmFaces) : IfcGeometricRepresentationItem((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_FbsmFaces)->generalize()); entity = e; EntityBuffer::Add(this); }
+IfcFaceBasedSurfaceModel::IfcFaceBasedSurfaceModel(IfcAbstractEntity* e) : IfcGeometricRepresentationItem((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcFaceBasedSurfaceModel)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcFaceBasedSurfaceModel::IfcFaceBasedSurfaceModel(IfcTemplatedEntityList< IfcConnectedFaceSet >::ptr v1_FbsmFaces) : IfcGeometricRepresentationItem((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_FbsmFaces)->generalize()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcFaceBound
-IfcLoop* IfcFaceBound::Bound() { return (IfcLoop*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(0))); }
+IfcLoop* IfcFaceBound::Bound() const { return (IfcLoop*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(0))); }
 void IfcFaceBound::setBound(IfcLoop* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-bool IfcFaceBound::Orientation() { return *entity->getArgument(1); }
+bool IfcFaceBound::Orientation() const { return *entity->getArgument(1); }
 void IfcFaceBound::setOrientation(bool v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
 bool IfcFaceBound::is(Type::Enum v) const { return v == Type::IfcFaceBound || IfcTopologicalRepresentationItem::is(v); }
 Type::Enum IfcFaceBound::type() const { return Type::IfcFaceBound; }
 Type::Enum IfcFaceBound::Class() { return Type::IfcFaceBound; }
-IfcFaceBound::IfcFaceBound(IfcAbstractEntityPtr e) : IfcTopologicalRepresentationItem((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcFaceBound)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcFaceBound::IfcFaceBound(IfcLoop* v1_Bound, bool v2_Orientation) : IfcTopologicalRepresentationItem((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Bound)); e->setArgument(1,(v2_Orientation)); entity = e; EntityBuffer::Add(this); }
+IfcFaceBound::IfcFaceBound(IfcAbstractEntity* e) : IfcTopologicalRepresentationItem((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcFaceBound)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcFaceBound::IfcFaceBound(IfcLoop* v1_Bound, bool v2_Orientation) : IfcTopologicalRepresentationItem((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Bound)); e->setArgument(1,(v2_Orientation)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcFaceOuterBound
 bool IfcFaceOuterBound::is(Type::Enum v) const { return v == Type::IfcFaceOuterBound || IfcFaceBound::is(v); }
 Type::Enum IfcFaceOuterBound::type() const { return Type::IfcFaceOuterBound; }
 Type::Enum IfcFaceOuterBound::Class() { return Type::IfcFaceOuterBound; }
-IfcFaceOuterBound::IfcFaceOuterBound(IfcAbstractEntityPtr e) : IfcFaceBound((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcFaceOuterBound)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcFaceOuterBound::IfcFaceOuterBound(IfcLoop* v1_Bound, bool v2_Orientation) : IfcFaceBound((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Bound)); e->setArgument(1,(v2_Orientation)); entity = e; EntityBuffer::Add(this); }
+IfcFaceOuterBound::IfcFaceOuterBound(IfcAbstractEntity* e) : IfcFaceBound((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcFaceOuterBound)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcFaceOuterBound::IfcFaceOuterBound(IfcLoop* v1_Bound, bool v2_Orientation) : IfcFaceBound((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Bound)); e->setArgument(1,(v2_Orientation)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcFaceSurface
-IfcSurface* IfcFaceSurface::FaceSurface() { return (IfcSurface*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(1))); }
+IfcSurface* IfcFaceSurface::FaceSurface() const { return (IfcSurface*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(1))); }
 void IfcFaceSurface::setFaceSurface(IfcSurface* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-bool IfcFaceSurface::SameSense() { return *entity->getArgument(2); }
+bool IfcFaceSurface::SameSense() const { return *entity->getArgument(2); }
 void IfcFaceSurface::setSameSense(bool v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
 bool IfcFaceSurface::is(Type::Enum v) const { return v == Type::IfcFaceSurface || IfcFace::is(v); }
 Type::Enum IfcFaceSurface::type() const { return Type::IfcFaceSurface; }
 Type::Enum IfcFaceSurface::Class() { return Type::IfcFaceSurface; }
-IfcFaceSurface::IfcFaceSurface(IfcAbstractEntityPtr e) : IfcFace((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcFaceSurface)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcFaceSurface::IfcFaceSurface(SHARED_PTR< IfcTemplatedEntityList< IfcFaceBound > > v1_Bounds, IfcSurface* v2_FaceSurface, bool v3_SameSense) : IfcFace((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Bounds)->generalize()); e->setArgument(1,(v2_FaceSurface)); e->setArgument(2,(v3_SameSense)); entity = e; EntityBuffer::Add(this); }
+IfcFaceSurface::IfcFaceSurface(IfcAbstractEntity* e) : IfcFace((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcFaceSurface)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcFaceSurface::IfcFaceSurface(IfcTemplatedEntityList< IfcFaceBound >::ptr v1_Bounds, IfcSurface* v2_FaceSurface, bool v3_SameSense) : IfcFace((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Bounds)->generalize()); e->setArgument(1,(v2_FaceSurface)); e->setArgument(2,(v3_SameSense)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcFacetedBrep
 bool IfcFacetedBrep::is(Type::Enum v) const { return v == Type::IfcFacetedBrep || IfcManifoldSolidBrep::is(v); }
 Type::Enum IfcFacetedBrep::type() const { return Type::IfcFacetedBrep; }
 Type::Enum IfcFacetedBrep::Class() { return Type::IfcFacetedBrep; }
-IfcFacetedBrep::IfcFacetedBrep(IfcAbstractEntityPtr e) : IfcManifoldSolidBrep((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcFacetedBrep)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcFacetedBrep::IfcFacetedBrep(IfcClosedShell* v1_Outer) : IfcManifoldSolidBrep((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Outer)); entity = e; EntityBuffer::Add(this); }
+IfcFacetedBrep::IfcFacetedBrep(IfcAbstractEntity* e) : IfcManifoldSolidBrep((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcFacetedBrep)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcFacetedBrep::IfcFacetedBrep(IfcClosedShell* v1_Outer) : IfcManifoldSolidBrep((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Outer)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcFacetedBrepWithVoids
-SHARED_PTR< IfcTemplatedEntityList< IfcClosedShell > > IfcFacetedBrepWithVoids::Voids() { RETURN_AS_LIST(IfcClosedShell,1) }
-void IfcFacetedBrepWithVoids::setVoids(SHARED_PTR< IfcTemplatedEntityList< IfcClosedShell > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v->generalize()); }
+IfcTemplatedEntityList< IfcClosedShell >::ptr IfcFacetedBrepWithVoids::Voids() const { IfcEntityList::ptr es = *entity->getArgument(1); return es->as<IfcClosedShell>(); }
+void IfcFacetedBrepWithVoids::setVoids(IfcTemplatedEntityList< IfcClosedShell >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v->generalize()); }
 bool IfcFacetedBrepWithVoids::is(Type::Enum v) const { return v == Type::IfcFacetedBrepWithVoids || IfcFacetedBrep::is(v); }
 Type::Enum IfcFacetedBrepWithVoids::type() const { return Type::IfcFacetedBrepWithVoids; }
 Type::Enum IfcFacetedBrepWithVoids::Class() { return Type::IfcFacetedBrepWithVoids; }
-IfcFacetedBrepWithVoids::IfcFacetedBrepWithVoids(IfcAbstractEntityPtr e) : IfcFacetedBrep((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcFacetedBrepWithVoids)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcFacetedBrepWithVoids::IfcFacetedBrepWithVoids(IfcClosedShell* v1_Outer, SHARED_PTR< IfcTemplatedEntityList< IfcClosedShell > > v2_Voids) : IfcFacetedBrep((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Outer)); e->setArgument(1,(v2_Voids)->generalize()); entity = e; EntityBuffer::Add(this); }
+IfcFacetedBrepWithVoids::IfcFacetedBrepWithVoids(IfcAbstractEntity* e) : IfcFacetedBrep((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcFacetedBrepWithVoids)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcFacetedBrepWithVoids::IfcFacetedBrepWithVoids(IfcClosedShell* v1_Outer, IfcTemplatedEntityList< IfcClosedShell >::ptr v2_Voids) : IfcFacetedBrep((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Outer)); e->setArgument(1,(v2_Voids)->generalize()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcFailureConnectionCondition
-bool IfcFailureConnectionCondition::hasTensionFailureX() { return !entity->getArgument(1)->isNull(); }
-IfcForceMeasure IfcFailureConnectionCondition::TensionFailureX() { return *entity->getArgument(1); }
-void IfcFailureConnectionCondition::setTensionFailureX(IfcForceMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-bool IfcFailureConnectionCondition::hasTensionFailureY() { return !entity->getArgument(2)->isNull(); }
-IfcForceMeasure IfcFailureConnectionCondition::TensionFailureY() { return *entity->getArgument(2); }
-void IfcFailureConnectionCondition::setTensionFailureY(IfcForceMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-bool IfcFailureConnectionCondition::hasTensionFailureZ() { return !entity->getArgument(3)->isNull(); }
-IfcForceMeasure IfcFailureConnectionCondition::TensionFailureZ() { return *entity->getArgument(3); }
-void IfcFailureConnectionCondition::setTensionFailureZ(IfcForceMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-bool IfcFailureConnectionCondition::hasCompressionFailureX() { return !entity->getArgument(4)->isNull(); }
-IfcForceMeasure IfcFailureConnectionCondition::CompressionFailureX() { return *entity->getArgument(4); }
-void IfcFailureConnectionCondition::setCompressionFailureX(IfcForceMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-bool IfcFailureConnectionCondition::hasCompressionFailureY() { return !entity->getArgument(5)->isNull(); }
-IfcForceMeasure IfcFailureConnectionCondition::CompressionFailureY() { return *entity->getArgument(5); }
-void IfcFailureConnectionCondition::setCompressionFailureY(IfcForceMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-bool IfcFailureConnectionCondition::hasCompressionFailureZ() { return !entity->getArgument(6)->isNull(); }
-IfcForceMeasure IfcFailureConnectionCondition::CompressionFailureZ() { return *entity->getArgument(6); }
-void IfcFailureConnectionCondition::setCompressionFailureZ(IfcForceMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
+bool IfcFailureConnectionCondition::hasTensionFailureX() const { return !entity->getArgument(1)->isNull(); }
+double IfcFailureConnectionCondition::TensionFailureX() const { return *entity->getArgument(1); }
+void IfcFailureConnectionCondition::setTensionFailureX(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+bool IfcFailureConnectionCondition::hasTensionFailureY() const { return !entity->getArgument(2)->isNull(); }
+double IfcFailureConnectionCondition::TensionFailureY() const { return *entity->getArgument(2); }
+void IfcFailureConnectionCondition::setTensionFailureY(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+bool IfcFailureConnectionCondition::hasTensionFailureZ() const { return !entity->getArgument(3)->isNull(); }
+double IfcFailureConnectionCondition::TensionFailureZ() const { return *entity->getArgument(3); }
+void IfcFailureConnectionCondition::setTensionFailureZ(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+bool IfcFailureConnectionCondition::hasCompressionFailureX() const { return !entity->getArgument(4)->isNull(); }
+double IfcFailureConnectionCondition::CompressionFailureX() const { return *entity->getArgument(4); }
+void IfcFailureConnectionCondition::setCompressionFailureX(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+bool IfcFailureConnectionCondition::hasCompressionFailureY() const { return !entity->getArgument(5)->isNull(); }
+double IfcFailureConnectionCondition::CompressionFailureY() const { return *entity->getArgument(5); }
+void IfcFailureConnectionCondition::setCompressionFailureY(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+bool IfcFailureConnectionCondition::hasCompressionFailureZ() const { return !entity->getArgument(6)->isNull(); }
+double IfcFailureConnectionCondition::CompressionFailureZ() const { return *entity->getArgument(6); }
+void IfcFailureConnectionCondition::setCompressionFailureZ(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
 bool IfcFailureConnectionCondition::is(Type::Enum v) const { return v == Type::IfcFailureConnectionCondition || IfcStructuralConnectionCondition::is(v); }
 Type::Enum IfcFailureConnectionCondition::type() const { return Type::IfcFailureConnectionCondition; }
 Type::Enum IfcFailureConnectionCondition::Class() { return Type::IfcFailureConnectionCondition; }
-IfcFailureConnectionCondition::IfcFailureConnectionCondition(IfcAbstractEntityPtr e) : IfcStructuralConnectionCondition((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcFailureConnectionCondition)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcFailureConnectionCondition::IfcFailureConnectionCondition(boost::optional< IfcLabel > v1_Name, boost::optional< IfcForceMeasure > v2_TensionFailureX, boost::optional< IfcForceMeasure > v3_TensionFailureY, boost::optional< IfcForceMeasure > v4_TensionFailureZ, boost::optional< IfcForceMeasure > v5_CompressionFailureX, boost::optional< IfcForceMeasure > v6_CompressionFailureY, boost::optional< IfcForceMeasure > v7_CompressionFailureZ) : IfcStructuralConnectionCondition((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_TensionFailureX) { e->setArgument(1,(*v2_TensionFailureX)); } else { e->setArgument(1); } if (v3_TensionFailureY) { e->setArgument(2,(*v3_TensionFailureY)); } else { e->setArgument(2); } if (v4_TensionFailureZ) { e->setArgument(3,(*v4_TensionFailureZ)); } else { e->setArgument(3); } if (v5_CompressionFailureX) { e->setArgument(4,(*v5_CompressionFailureX)); } else { e->setArgument(4); } if (v6_CompressionFailureY) { e->setArgument(5,(*v6_CompressionFailureY)); } else { e->setArgument(5); } if (v7_CompressionFailureZ) { e->setArgument(6,(*v7_CompressionFailureZ)); } else { e->setArgument(6); } entity = e; EntityBuffer::Add(this); }
+IfcFailureConnectionCondition::IfcFailureConnectionCondition(IfcAbstractEntity* e) : IfcStructuralConnectionCondition((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcFailureConnectionCondition)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcFailureConnectionCondition::IfcFailureConnectionCondition(boost::optional< std::string > v1_Name, boost::optional< double > v2_TensionFailureX, boost::optional< double > v3_TensionFailureY, boost::optional< double > v4_TensionFailureZ, boost::optional< double > v5_CompressionFailureX, boost::optional< double > v6_CompressionFailureY, boost::optional< double > v7_CompressionFailureZ) : IfcStructuralConnectionCondition((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_TensionFailureX) { e->setArgument(1,(*v2_TensionFailureX)); } else { e->setArgument(1); } if (v3_TensionFailureY) { e->setArgument(2,(*v3_TensionFailureY)); } else { e->setArgument(2); } if (v4_TensionFailureZ) { e->setArgument(3,(*v4_TensionFailureZ)); } else { e->setArgument(3); } if (v5_CompressionFailureX) { e->setArgument(4,(*v5_CompressionFailureX)); } else { e->setArgument(4); } if (v6_CompressionFailureY) { e->setArgument(5,(*v6_CompressionFailureY)); } else { e->setArgument(5); } if (v7_CompressionFailureZ) { e->setArgument(6,(*v7_CompressionFailureZ)); } else { e->setArgument(6); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcFan
-bool IfcFan::hasPredefinedType() { return !entity->getArgument(8)->isNull(); }
-IfcFanTypeEnum::IfcFanTypeEnum IfcFan::PredefinedType() { return IfcFanTypeEnum::FromString(*entity->getArgument(8)); }
+bool IfcFan::hasPredefinedType() const { return !entity->getArgument(8)->isNull(); }
+IfcFanTypeEnum::IfcFanTypeEnum IfcFan::PredefinedType() const { return IfcFanTypeEnum::FromString(*entity->getArgument(8)); }
 void IfcFan::setPredefinedType(IfcFanTypeEnum::IfcFanTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcFanTypeEnum::ToString(v)); }
 bool IfcFan::is(Type::Enum v) const { return v == Type::IfcFan || IfcFlowMovingDevice::is(v); }
 Type::Enum IfcFan::type() const { return Type::IfcFan; }
 Type::Enum IfcFan::Class() { return Type::IfcFan; }
-IfcFan::IfcFan(IfcAbstractEntityPtr e) : IfcFlowMovingDevice((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcFan)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcFan::IfcFan(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcFanTypeEnum::IfcFanTypeEnum > v9_PredefinedType) : IfcFlowMovingDevice((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcFanTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcFan::IfcFan(IfcAbstractEntity* e) : IfcFlowMovingDevice((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcFan)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcFan::IfcFan(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcFanTypeEnum::IfcFanTypeEnum > v9_PredefinedType) : IfcFlowMovingDevice((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcFanTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcFanType
-IfcFanTypeEnum::IfcFanTypeEnum IfcFanType::PredefinedType() { return IfcFanTypeEnum::FromString(*entity->getArgument(9)); }
+IfcFanTypeEnum::IfcFanTypeEnum IfcFanType::PredefinedType() const { return IfcFanTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcFanType::setPredefinedType(IfcFanTypeEnum::IfcFanTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcFanTypeEnum::ToString(v)); }
 bool IfcFanType::is(Type::Enum v) const { return v == Type::IfcFanType || IfcFlowMovingDeviceType::is(v); }
 Type::Enum IfcFanType::type() const { return Type::IfcFanType; }
 Type::Enum IfcFanType::Class() { return Type::IfcFanType; }
-IfcFanType::IfcFanType(IfcAbstractEntityPtr e) : IfcFlowMovingDeviceType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcFanType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcFanType::IfcFanType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcFanTypeEnum::IfcFanTypeEnum v10_PredefinedType) : IfcFlowMovingDeviceType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcFanTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcFanType::IfcFanType(IfcAbstractEntity* e) : IfcFlowMovingDeviceType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcFanType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcFanType::IfcFanType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcFanTypeEnum::IfcFanTypeEnum v10_PredefinedType) : IfcFlowMovingDeviceType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcFanTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcFastener
-bool IfcFastener::hasPredefinedType() { return !entity->getArgument(8)->isNull(); }
-IfcFastenerTypeEnum::IfcFastenerTypeEnum IfcFastener::PredefinedType() { return IfcFastenerTypeEnum::FromString(*entity->getArgument(8)); }
+bool IfcFastener::hasPredefinedType() const { return !entity->getArgument(8)->isNull(); }
+IfcFastenerTypeEnum::IfcFastenerTypeEnum IfcFastener::PredefinedType() const { return IfcFastenerTypeEnum::FromString(*entity->getArgument(8)); }
 void IfcFastener::setPredefinedType(IfcFastenerTypeEnum::IfcFastenerTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcFastenerTypeEnum::ToString(v)); }
 bool IfcFastener::is(Type::Enum v) const { return v == Type::IfcFastener || IfcElementComponent::is(v); }
 Type::Enum IfcFastener::type() const { return Type::IfcFastener; }
 Type::Enum IfcFastener::Class() { return Type::IfcFastener; }
-IfcFastener::IfcFastener(IfcAbstractEntityPtr e) : IfcElementComponent((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcFastener)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcFastener::IfcFastener(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcFastenerTypeEnum::IfcFastenerTypeEnum > v9_PredefinedType) : IfcElementComponent((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcFastenerTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcFastener::IfcFastener(IfcAbstractEntity* e) : IfcElementComponent((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcFastener)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcFastener::IfcFastener(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcFastenerTypeEnum::IfcFastenerTypeEnum > v9_PredefinedType) : IfcElementComponent((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcFastenerTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcFastenerType
-IfcFastenerTypeEnum::IfcFastenerTypeEnum IfcFastenerType::PredefinedType() { return IfcFastenerTypeEnum::FromString(*entity->getArgument(9)); }
+IfcFastenerTypeEnum::IfcFastenerTypeEnum IfcFastenerType::PredefinedType() const { return IfcFastenerTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcFastenerType::setPredefinedType(IfcFastenerTypeEnum::IfcFastenerTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcFastenerTypeEnum::ToString(v)); }
 bool IfcFastenerType::is(Type::Enum v) const { return v == Type::IfcFastenerType || IfcElementComponentType::is(v); }
 Type::Enum IfcFastenerType::type() const { return Type::IfcFastenerType; }
 Type::Enum IfcFastenerType::Class() { return Type::IfcFastenerType; }
-IfcFastenerType::IfcFastenerType(IfcAbstractEntityPtr e) : IfcElementComponentType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcFastenerType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcFastenerType::IfcFastenerType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcFastenerTypeEnum::IfcFastenerTypeEnum v10_PredefinedType) : IfcElementComponentType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcFastenerTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcFastenerType::IfcFastenerType(IfcAbstractEntity* e) : IfcElementComponentType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcFastenerType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcFastenerType::IfcFastenerType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcFastenerTypeEnum::IfcFastenerTypeEnum v10_PredefinedType) : IfcElementComponentType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcFastenerTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcFeatureElement
 bool IfcFeatureElement::is(Type::Enum v) const { return v == Type::IfcFeatureElement || IfcElement::is(v); }
 Type::Enum IfcFeatureElement::type() const { return Type::IfcFeatureElement; }
 Type::Enum IfcFeatureElement::Class() { return Type::IfcFeatureElement; }
-IfcFeatureElement::IfcFeatureElement(IfcAbstractEntityPtr e) : IfcElement((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcFeatureElement)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcFeatureElement::IfcFeatureElement(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag) : IfcElement((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
+IfcFeatureElement::IfcFeatureElement(IfcAbstractEntity* e) : IfcElement((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcFeatureElement)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcFeatureElement::IfcFeatureElement(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag) : IfcElement((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcFeatureElementAddition
-IfcRelProjectsElement::list IfcFeatureElementAddition::ProjectsElements() { RETURN_INVERSE(IfcRelProjectsElement) }
+IfcRelProjectsElement::list::ptr IfcFeatureElementAddition::ProjectsElements() const { return entity->getInverse(Type::IfcRelProjectsElement, 5)->as<IfcRelProjectsElement>(); }
 bool IfcFeatureElementAddition::is(Type::Enum v) const { return v == Type::IfcFeatureElementAddition || IfcFeatureElement::is(v); }
 Type::Enum IfcFeatureElementAddition::type() const { return Type::IfcFeatureElementAddition; }
 Type::Enum IfcFeatureElementAddition::Class() { return Type::IfcFeatureElementAddition; }
-IfcFeatureElementAddition::IfcFeatureElementAddition(IfcAbstractEntityPtr e) : IfcFeatureElement((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcFeatureElementAddition)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcFeatureElementAddition::IfcFeatureElementAddition(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag) : IfcFeatureElement((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
+IfcFeatureElementAddition::IfcFeatureElementAddition(IfcAbstractEntity* e) : IfcFeatureElement((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcFeatureElementAddition)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcFeatureElementAddition::IfcFeatureElementAddition(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag) : IfcFeatureElement((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcFeatureElementSubtraction
-IfcRelVoidsElement::list IfcFeatureElementSubtraction::VoidsElements() { RETURN_INVERSE(IfcRelVoidsElement) }
+IfcRelVoidsElement::list::ptr IfcFeatureElementSubtraction::VoidsElements() const { return entity->getInverse(Type::IfcRelVoidsElement, 5)->as<IfcRelVoidsElement>(); }
 bool IfcFeatureElementSubtraction::is(Type::Enum v) const { return v == Type::IfcFeatureElementSubtraction || IfcFeatureElement::is(v); }
 Type::Enum IfcFeatureElementSubtraction::type() const { return Type::IfcFeatureElementSubtraction; }
 Type::Enum IfcFeatureElementSubtraction::Class() { return Type::IfcFeatureElementSubtraction; }
-IfcFeatureElementSubtraction::IfcFeatureElementSubtraction(IfcAbstractEntityPtr e) : IfcFeatureElement((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcFeatureElementSubtraction)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcFeatureElementSubtraction::IfcFeatureElementSubtraction(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag) : IfcFeatureElement((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
+IfcFeatureElementSubtraction::IfcFeatureElementSubtraction(IfcAbstractEntity* e) : IfcFeatureElement((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcFeatureElementSubtraction)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcFeatureElementSubtraction::IfcFeatureElementSubtraction(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag) : IfcFeatureElement((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcFillAreaStyle
-SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > IfcFillAreaStyle::FillStyles() { RETURN_AS_LIST(IfcUtil::IfcAbstractSelect,1) }
-void IfcFillAreaStyle::setFillStyles(SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v->generalize()); }
-bool IfcFillAreaStyle::hasModelorDraughting() { return !entity->getArgument(2)->isNull(); }
-bool IfcFillAreaStyle::ModelorDraughting() { return *entity->getArgument(2); }
+IfcEntityList::ptr IfcFillAreaStyle::FillStyles() const { return *entity->getArgument(1); }
+void IfcFillAreaStyle::setFillStyles(IfcEntityList::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+bool IfcFillAreaStyle::hasModelorDraughting() const { return !entity->getArgument(2)->isNull(); }
+bool IfcFillAreaStyle::ModelorDraughting() const { return *entity->getArgument(2); }
 void IfcFillAreaStyle::setModelorDraughting(bool v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
 bool IfcFillAreaStyle::is(Type::Enum v) const { return v == Type::IfcFillAreaStyle || IfcPresentationStyle::is(v); }
 Type::Enum IfcFillAreaStyle::type() const { return Type::IfcFillAreaStyle; }
 Type::Enum IfcFillAreaStyle::Class() { return Type::IfcFillAreaStyle; }
-IfcFillAreaStyle::IfcFillAreaStyle(IfcAbstractEntityPtr e) : IfcPresentationStyle((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcFillAreaStyle)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcFillAreaStyle::IfcFillAreaStyle(boost::optional< IfcLabel > v1_Name, IfcEntities v2_FillStyles, boost::optional< bool > v3_ModelorDraughting) : IfcPresentationStyle((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } e->setArgument(1,(v2_FillStyles)); if (v3_ModelorDraughting) { e->setArgument(2,(*v3_ModelorDraughting)); } else { e->setArgument(2); } entity = e; EntityBuffer::Add(this); }
+IfcFillAreaStyle::IfcFillAreaStyle(IfcAbstractEntity* e) : IfcPresentationStyle((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcFillAreaStyle)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcFillAreaStyle::IfcFillAreaStyle(boost::optional< std::string > v1_Name, IfcEntityList::ptr v2_FillStyles, boost::optional< bool > v3_ModelorDraughting) : IfcPresentationStyle((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } e->setArgument(1,(v2_FillStyles)); if (v3_ModelorDraughting) { e->setArgument(2,(*v3_ModelorDraughting)); } else { e->setArgument(2); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcFillAreaStyleHatching
-IfcCurveStyle* IfcFillAreaStyleHatching::HatchLineAppearance() { return (IfcCurveStyle*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(0))); }
+IfcCurveStyle* IfcFillAreaStyleHatching::HatchLineAppearance() const { return (IfcCurveStyle*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(0))); }
 void IfcFillAreaStyleHatching::setHatchLineAppearance(IfcCurveStyle* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-IfcHatchLineDistanceSelect IfcFillAreaStyleHatching::StartOfNextHatchLine() { return *entity->getArgument(1); }
-void IfcFillAreaStyleHatching::setStartOfNextHatchLine(IfcHatchLineDistanceSelect v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-bool IfcFillAreaStyleHatching::hasPointOfReferenceHatchLine() { return !entity->getArgument(2)->isNull(); }
-IfcCartesianPoint* IfcFillAreaStyleHatching::PointOfReferenceHatchLine() { return (IfcCartesianPoint*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(2))); }
+IfcHatchLineDistanceSelect* IfcFillAreaStyleHatching::StartOfNextHatchLine() const { return (IfcHatchLineDistanceSelect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(1))); }
+void IfcFillAreaStyleHatching::setStartOfNextHatchLine(IfcHatchLineDistanceSelect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+bool IfcFillAreaStyleHatching::hasPointOfReferenceHatchLine() const { return !entity->getArgument(2)->isNull(); }
+IfcCartesianPoint* IfcFillAreaStyleHatching::PointOfReferenceHatchLine() const { return (IfcCartesianPoint*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(2))); }
 void IfcFillAreaStyleHatching::setPointOfReferenceHatchLine(IfcCartesianPoint* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-bool IfcFillAreaStyleHatching::hasPatternStart() { return !entity->getArgument(3)->isNull(); }
-IfcCartesianPoint* IfcFillAreaStyleHatching::PatternStart() { return (IfcCartesianPoint*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(3))); }
+bool IfcFillAreaStyleHatching::hasPatternStart() const { return !entity->getArgument(3)->isNull(); }
+IfcCartesianPoint* IfcFillAreaStyleHatching::PatternStart() const { return (IfcCartesianPoint*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(3))); }
 void IfcFillAreaStyleHatching::setPatternStart(IfcCartesianPoint* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-IfcPlaneAngleMeasure IfcFillAreaStyleHatching::HatchLineAngle() { return *entity->getArgument(4); }
-void IfcFillAreaStyleHatching::setHatchLineAngle(IfcPlaneAngleMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+double IfcFillAreaStyleHatching::HatchLineAngle() const { return *entity->getArgument(4); }
+void IfcFillAreaStyleHatching::setHatchLineAngle(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
 bool IfcFillAreaStyleHatching::is(Type::Enum v) const { return v == Type::IfcFillAreaStyleHatching || IfcGeometricRepresentationItem::is(v); }
 Type::Enum IfcFillAreaStyleHatching::type() const { return Type::IfcFillAreaStyleHatching; }
 Type::Enum IfcFillAreaStyleHatching::Class() { return Type::IfcFillAreaStyleHatching; }
-IfcFillAreaStyleHatching::IfcFillAreaStyleHatching(IfcAbstractEntityPtr e) : IfcGeometricRepresentationItem((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcFillAreaStyleHatching)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcFillAreaStyleHatching::IfcFillAreaStyleHatching(IfcCurveStyle* v1_HatchLineAppearance, IfcHatchLineDistanceSelect v2_StartOfNextHatchLine, IfcCartesianPoint* v3_PointOfReferenceHatchLine, IfcCartesianPoint* v4_PatternStart, IfcPlaneAngleMeasure v5_HatchLineAngle) : IfcGeometricRepresentationItem((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_HatchLineAppearance)); e->setArgument(1,(v2_StartOfNextHatchLine)); e->setArgument(2,(v3_PointOfReferenceHatchLine)); e->setArgument(3,(v4_PatternStart)); e->setArgument(4,(v5_HatchLineAngle)); entity = e; EntityBuffer::Add(this); }
+IfcFillAreaStyleHatching::IfcFillAreaStyleHatching(IfcAbstractEntity* e) : IfcGeometricRepresentationItem((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcFillAreaStyleHatching)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcFillAreaStyleHatching::IfcFillAreaStyleHatching(IfcCurveStyle* v1_HatchLineAppearance, IfcHatchLineDistanceSelect* v2_StartOfNextHatchLine, IfcCartesianPoint* v3_PointOfReferenceHatchLine, IfcCartesianPoint* v4_PatternStart, double v5_HatchLineAngle) : IfcGeometricRepresentationItem((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_HatchLineAppearance)); e->setArgument(1,(v2_StartOfNextHatchLine)); e->setArgument(2,(v3_PointOfReferenceHatchLine)); e->setArgument(3,(v4_PatternStart)); e->setArgument(4,(v5_HatchLineAngle)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcFillAreaStyleTiles
-SHARED_PTR< IfcTemplatedEntityList< IfcVector > > IfcFillAreaStyleTiles::TilingPattern() { RETURN_AS_LIST(IfcVector,0) }
-void IfcFillAreaStyleTiles::setTilingPattern(SHARED_PTR< IfcTemplatedEntityList< IfcVector > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v->generalize()); }
-SHARED_PTR< IfcTemplatedEntityList< IfcStyledItem > > IfcFillAreaStyleTiles::Tiles() { RETURN_AS_LIST(IfcStyledItem,1) }
-void IfcFillAreaStyleTiles::setTiles(SHARED_PTR< IfcTemplatedEntityList< IfcStyledItem > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v->generalize()); }
-IfcPositiveRatioMeasure IfcFillAreaStyleTiles::TilingScale() { return *entity->getArgument(2); }
-void IfcFillAreaStyleTiles::setTilingScale(IfcPositiveRatioMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+IfcTemplatedEntityList< IfcVector >::ptr IfcFillAreaStyleTiles::TilingPattern() const { IfcEntityList::ptr es = *entity->getArgument(0); return es->as<IfcVector>(); }
+void IfcFillAreaStyleTiles::setTilingPattern(IfcTemplatedEntityList< IfcVector >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v->generalize()); }
+IfcTemplatedEntityList< IfcStyledItem >::ptr IfcFillAreaStyleTiles::Tiles() const { IfcEntityList::ptr es = *entity->getArgument(1); return es->as<IfcStyledItem>(); }
+void IfcFillAreaStyleTiles::setTiles(IfcTemplatedEntityList< IfcStyledItem >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v->generalize()); }
+double IfcFillAreaStyleTiles::TilingScale() const { return *entity->getArgument(2); }
+void IfcFillAreaStyleTiles::setTilingScale(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
 bool IfcFillAreaStyleTiles::is(Type::Enum v) const { return v == Type::IfcFillAreaStyleTiles || IfcGeometricRepresentationItem::is(v); }
 Type::Enum IfcFillAreaStyleTiles::type() const { return Type::IfcFillAreaStyleTiles; }
 Type::Enum IfcFillAreaStyleTiles::Class() { return Type::IfcFillAreaStyleTiles; }
-IfcFillAreaStyleTiles::IfcFillAreaStyleTiles(IfcAbstractEntityPtr e) : IfcGeometricRepresentationItem((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcFillAreaStyleTiles)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcFillAreaStyleTiles::IfcFillAreaStyleTiles(SHARED_PTR< IfcTemplatedEntityList< IfcVector > > v1_TilingPattern, SHARED_PTR< IfcTemplatedEntityList< IfcStyledItem > > v2_Tiles, IfcPositiveRatioMeasure v3_TilingScale) : IfcGeometricRepresentationItem((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_TilingPattern)->generalize()); e->setArgument(1,(v2_Tiles)->generalize()); e->setArgument(2,(v3_TilingScale)); entity = e; EntityBuffer::Add(this); }
+IfcFillAreaStyleTiles::IfcFillAreaStyleTiles(IfcAbstractEntity* e) : IfcGeometricRepresentationItem((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcFillAreaStyleTiles)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcFillAreaStyleTiles::IfcFillAreaStyleTiles(IfcTemplatedEntityList< IfcVector >::ptr v1_TilingPattern, IfcTemplatedEntityList< IfcStyledItem >::ptr v2_Tiles, double v3_TilingScale) : IfcGeometricRepresentationItem((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_TilingPattern)->generalize()); e->setArgument(1,(v2_Tiles)->generalize()); e->setArgument(2,(v3_TilingScale)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcFilter
-bool IfcFilter::hasPredefinedType() { return !entity->getArgument(8)->isNull(); }
-IfcFilterTypeEnum::IfcFilterTypeEnum IfcFilter::PredefinedType() { return IfcFilterTypeEnum::FromString(*entity->getArgument(8)); }
+bool IfcFilter::hasPredefinedType() const { return !entity->getArgument(8)->isNull(); }
+IfcFilterTypeEnum::IfcFilterTypeEnum IfcFilter::PredefinedType() const { return IfcFilterTypeEnum::FromString(*entity->getArgument(8)); }
 void IfcFilter::setPredefinedType(IfcFilterTypeEnum::IfcFilterTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcFilterTypeEnum::ToString(v)); }
 bool IfcFilter::is(Type::Enum v) const { return v == Type::IfcFilter || IfcFlowTreatmentDevice::is(v); }
 Type::Enum IfcFilter::type() const { return Type::IfcFilter; }
 Type::Enum IfcFilter::Class() { return Type::IfcFilter; }
-IfcFilter::IfcFilter(IfcAbstractEntityPtr e) : IfcFlowTreatmentDevice((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcFilter)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcFilter::IfcFilter(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcFilterTypeEnum::IfcFilterTypeEnum > v9_PredefinedType) : IfcFlowTreatmentDevice((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcFilterTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcFilter::IfcFilter(IfcAbstractEntity* e) : IfcFlowTreatmentDevice((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcFilter)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcFilter::IfcFilter(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcFilterTypeEnum::IfcFilterTypeEnum > v9_PredefinedType) : IfcFlowTreatmentDevice((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcFilterTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcFilterType
-IfcFilterTypeEnum::IfcFilterTypeEnum IfcFilterType::PredefinedType() { return IfcFilterTypeEnum::FromString(*entity->getArgument(9)); }
+IfcFilterTypeEnum::IfcFilterTypeEnum IfcFilterType::PredefinedType() const { return IfcFilterTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcFilterType::setPredefinedType(IfcFilterTypeEnum::IfcFilterTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcFilterTypeEnum::ToString(v)); }
 bool IfcFilterType::is(Type::Enum v) const { return v == Type::IfcFilterType || IfcFlowTreatmentDeviceType::is(v); }
 Type::Enum IfcFilterType::type() const { return Type::IfcFilterType; }
 Type::Enum IfcFilterType::Class() { return Type::IfcFilterType; }
-IfcFilterType::IfcFilterType(IfcAbstractEntityPtr e) : IfcFlowTreatmentDeviceType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcFilterType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcFilterType::IfcFilterType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcFilterTypeEnum::IfcFilterTypeEnum v10_PredefinedType) : IfcFlowTreatmentDeviceType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcFilterTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcFilterType::IfcFilterType(IfcAbstractEntity* e) : IfcFlowTreatmentDeviceType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcFilterType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcFilterType::IfcFilterType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcFilterTypeEnum::IfcFilterTypeEnum v10_PredefinedType) : IfcFlowTreatmentDeviceType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcFilterTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcFireSuppressionTerminal
-bool IfcFireSuppressionTerminal::hasPredefinedType() { return !entity->getArgument(8)->isNull(); }
-IfcFireSuppressionTerminalTypeEnum::IfcFireSuppressionTerminalTypeEnum IfcFireSuppressionTerminal::PredefinedType() { return IfcFireSuppressionTerminalTypeEnum::FromString(*entity->getArgument(8)); }
+bool IfcFireSuppressionTerminal::hasPredefinedType() const { return !entity->getArgument(8)->isNull(); }
+IfcFireSuppressionTerminalTypeEnum::IfcFireSuppressionTerminalTypeEnum IfcFireSuppressionTerminal::PredefinedType() const { return IfcFireSuppressionTerminalTypeEnum::FromString(*entity->getArgument(8)); }
 void IfcFireSuppressionTerminal::setPredefinedType(IfcFireSuppressionTerminalTypeEnum::IfcFireSuppressionTerminalTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcFireSuppressionTerminalTypeEnum::ToString(v)); }
 bool IfcFireSuppressionTerminal::is(Type::Enum v) const { return v == Type::IfcFireSuppressionTerminal || IfcFlowTerminal::is(v); }
 Type::Enum IfcFireSuppressionTerminal::type() const { return Type::IfcFireSuppressionTerminal; }
 Type::Enum IfcFireSuppressionTerminal::Class() { return Type::IfcFireSuppressionTerminal; }
-IfcFireSuppressionTerminal::IfcFireSuppressionTerminal(IfcAbstractEntityPtr e) : IfcFlowTerminal((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcFireSuppressionTerminal)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcFireSuppressionTerminal::IfcFireSuppressionTerminal(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcFireSuppressionTerminalTypeEnum::IfcFireSuppressionTerminalTypeEnum > v9_PredefinedType) : IfcFlowTerminal((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcFireSuppressionTerminalTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcFireSuppressionTerminal::IfcFireSuppressionTerminal(IfcAbstractEntity* e) : IfcFlowTerminal((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcFireSuppressionTerminal)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcFireSuppressionTerminal::IfcFireSuppressionTerminal(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcFireSuppressionTerminalTypeEnum::IfcFireSuppressionTerminalTypeEnum > v9_PredefinedType) : IfcFlowTerminal((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcFireSuppressionTerminalTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcFireSuppressionTerminalType
-IfcFireSuppressionTerminalTypeEnum::IfcFireSuppressionTerminalTypeEnum IfcFireSuppressionTerminalType::PredefinedType() { return IfcFireSuppressionTerminalTypeEnum::FromString(*entity->getArgument(9)); }
+IfcFireSuppressionTerminalTypeEnum::IfcFireSuppressionTerminalTypeEnum IfcFireSuppressionTerminalType::PredefinedType() const { return IfcFireSuppressionTerminalTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcFireSuppressionTerminalType::setPredefinedType(IfcFireSuppressionTerminalTypeEnum::IfcFireSuppressionTerminalTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcFireSuppressionTerminalTypeEnum::ToString(v)); }
 bool IfcFireSuppressionTerminalType::is(Type::Enum v) const { return v == Type::IfcFireSuppressionTerminalType || IfcFlowTerminalType::is(v); }
 Type::Enum IfcFireSuppressionTerminalType::type() const { return Type::IfcFireSuppressionTerminalType; }
 Type::Enum IfcFireSuppressionTerminalType::Class() { return Type::IfcFireSuppressionTerminalType; }
-IfcFireSuppressionTerminalType::IfcFireSuppressionTerminalType(IfcAbstractEntityPtr e) : IfcFlowTerminalType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcFireSuppressionTerminalType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcFireSuppressionTerminalType::IfcFireSuppressionTerminalType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcFireSuppressionTerminalTypeEnum::IfcFireSuppressionTerminalTypeEnum v10_PredefinedType) : IfcFlowTerminalType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcFireSuppressionTerminalTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcFireSuppressionTerminalType::IfcFireSuppressionTerminalType(IfcAbstractEntity* e) : IfcFlowTerminalType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcFireSuppressionTerminalType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcFireSuppressionTerminalType::IfcFireSuppressionTerminalType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcFireSuppressionTerminalTypeEnum::IfcFireSuppressionTerminalTypeEnum v10_PredefinedType) : IfcFlowTerminalType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcFireSuppressionTerminalTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcFixedReferenceSweptAreaSolid
-IfcCurve* IfcFixedReferenceSweptAreaSolid::Directrix() { return (IfcCurve*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(2))); }
+IfcCurve* IfcFixedReferenceSweptAreaSolid::Directrix() const { return (IfcCurve*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(2))); }
 void IfcFixedReferenceSweptAreaSolid::setDirectrix(IfcCurve* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-bool IfcFixedReferenceSweptAreaSolid::hasStartParam() { return !entity->getArgument(3)->isNull(); }
-IfcParameterValue IfcFixedReferenceSweptAreaSolid::StartParam() { return *entity->getArgument(3); }
-void IfcFixedReferenceSweptAreaSolid::setStartParam(IfcParameterValue v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-bool IfcFixedReferenceSweptAreaSolid::hasEndParam() { return !entity->getArgument(4)->isNull(); }
-IfcParameterValue IfcFixedReferenceSweptAreaSolid::EndParam() { return *entity->getArgument(4); }
-void IfcFixedReferenceSweptAreaSolid::setEndParam(IfcParameterValue v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-IfcDirection* IfcFixedReferenceSweptAreaSolid::FixedReference() { return (IfcDirection*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(5))); }
+bool IfcFixedReferenceSweptAreaSolid::hasStartParam() const { return !entity->getArgument(3)->isNull(); }
+double IfcFixedReferenceSweptAreaSolid::StartParam() const { return *entity->getArgument(3); }
+void IfcFixedReferenceSweptAreaSolid::setStartParam(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+bool IfcFixedReferenceSweptAreaSolid::hasEndParam() const { return !entity->getArgument(4)->isNull(); }
+double IfcFixedReferenceSweptAreaSolid::EndParam() const { return *entity->getArgument(4); }
+void IfcFixedReferenceSweptAreaSolid::setEndParam(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+IfcDirection* IfcFixedReferenceSweptAreaSolid::FixedReference() const { return (IfcDirection*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(5))); }
 void IfcFixedReferenceSweptAreaSolid::setFixedReference(IfcDirection* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
 bool IfcFixedReferenceSweptAreaSolid::is(Type::Enum v) const { return v == Type::IfcFixedReferenceSweptAreaSolid || IfcSweptAreaSolid::is(v); }
 Type::Enum IfcFixedReferenceSweptAreaSolid::type() const { return Type::IfcFixedReferenceSweptAreaSolid; }
 Type::Enum IfcFixedReferenceSweptAreaSolid::Class() { return Type::IfcFixedReferenceSweptAreaSolid; }
-IfcFixedReferenceSweptAreaSolid::IfcFixedReferenceSweptAreaSolid(IfcAbstractEntityPtr e) : IfcSweptAreaSolid((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcFixedReferenceSweptAreaSolid)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcFixedReferenceSweptAreaSolid::IfcFixedReferenceSweptAreaSolid(IfcProfileDef* v1_SweptArea, IfcAxis2Placement3D* v2_Position, IfcCurve* v3_Directrix, boost::optional< IfcParameterValue > v4_StartParam, boost::optional< IfcParameterValue > v5_EndParam, IfcDirection* v6_FixedReference) : IfcSweptAreaSolid((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_SweptArea)); e->setArgument(1,(v2_Position)); e->setArgument(2,(v3_Directrix)); if (v4_StartParam) { e->setArgument(3,(*v4_StartParam)); } else { e->setArgument(3); } if (v5_EndParam) { e->setArgument(4,(*v5_EndParam)); } else { e->setArgument(4); } e->setArgument(5,(v6_FixedReference)); entity = e; EntityBuffer::Add(this); }
+IfcFixedReferenceSweptAreaSolid::IfcFixedReferenceSweptAreaSolid(IfcAbstractEntity* e) : IfcSweptAreaSolid((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcFixedReferenceSweptAreaSolid)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcFixedReferenceSweptAreaSolid::IfcFixedReferenceSweptAreaSolid(IfcProfileDef* v1_SweptArea, IfcAxis2Placement3D* v2_Position, IfcCurve* v3_Directrix, boost::optional< double > v4_StartParam, boost::optional< double > v5_EndParam, IfcDirection* v6_FixedReference) : IfcSweptAreaSolid((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_SweptArea)); e->setArgument(1,(v2_Position)); e->setArgument(2,(v3_Directrix)); if (v4_StartParam) { e->setArgument(3,(*v4_StartParam)); } else { e->setArgument(3); } if (v5_EndParam) { e->setArgument(4,(*v5_EndParam)); } else { e->setArgument(4); } e->setArgument(5,(v6_FixedReference)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcFlowController
 bool IfcFlowController::is(Type::Enum v) const { return v == Type::IfcFlowController || IfcDistributionFlowElement::is(v); }
 Type::Enum IfcFlowController::type() const { return Type::IfcFlowController; }
 Type::Enum IfcFlowController::Class() { return Type::IfcFlowController; }
-IfcFlowController::IfcFlowController(IfcAbstractEntityPtr e) : IfcDistributionFlowElement((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcFlowController)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcFlowController::IfcFlowController(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag) : IfcDistributionFlowElement((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
+IfcFlowController::IfcFlowController(IfcAbstractEntity* e) : IfcDistributionFlowElement((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcFlowController)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcFlowController::IfcFlowController(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag) : IfcDistributionFlowElement((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcFlowControllerType
 bool IfcFlowControllerType::is(Type::Enum v) const { return v == Type::IfcFlowControllerType || IfcDistributionFlowElementType::is(v); }
 Type::Enum IfcFlowControllerType::type() const { return Type::IfcFlowControllerType; }
 Type::Enum IfcFlowControllerType::Class() { return Type::IfcFlowControllerType; }
-IfcFlowControllerType::IfcFlowControllerType(IfcAbstractEntityPtr e) : IfcDistributionFlowElementType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcFlowControllerType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcFlowControllerType::IfcFlowControllerType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType) : IfcDistributionFlowElementType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcFlowControllerType::IfcFlowControllerType(IfcAbstractEntity* e) : IfcDistributionFlowElementType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcFlowControllerType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcFlowControllerType::IfcFlowControllerType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType) : IfcDistributionFlowElementType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcFlowFitting
 bool IfcFlowFitting::is(Type::Enum v) const { return v == Type::IfcFlowFitting || IfcDistributionFlowElement::is(v); }
 Type::Enum IfcFlowFitting::type() const { return Type::IfcFlowFitting; }
 Type::Enum IfcFlowFitting::Class() { return Type::IfcFlowFitting; }
-IfcFlowFitting::IfcFlowFitting(IfcAbstractEntityPtr e) : IfcDistributionFlowElement((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcFlowFitting)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcFlowFitting::IfcFlowFitting(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag) : IfcDistributionFlowElement((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
+IfcFlowFitting::IfcFlowFitting(IfcAbstractEntity* e) : IfcDistributionFlowElement((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcFlowFitting)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcFlowFitting::IfcFlowFitting(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag) : IfcDistributionFlowElement((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcFlowFittingType
 bool IfcFlowFittingType::is(Type::Enum v) const { return v == Type::IfcFlowFittingType || IfcDistributionFlowElementType::is(v); }
 Type::Enum IfcFlowFittingType::type() const { return Type::IfcFlowFittingType; }
 Type::Enum IfcFlowFittingType::Class() { return Type::IfcFlowFittingType; }
-IfcFlowFittingType::IfcFlowFittingType(IfcAbstractEntityPtr e) : IfcDistributionFlowElementType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcFlowFittingType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcFlowFittingType::IfcFlowFittingType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType) : IfcDistributionFlowElementType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcFlowFittingType::IfcFlowFittingType(IfcAbstractEntity* e) : IfcDistributionFlowElementType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcFlowFittingType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcFlowFittingType::IfcFlowFittingType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType) : IfcDistributionFlowElementType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcFlowInstrument
-bool IfcFlowInstrument::hasPredefinedType() { return !entity->getArgument(8)->isNull(); }
-IfcFlowInstrumentTypeEnum::IfcFlowInstrumentTypeEnum IfcFlowInstrument::PredefinedType() { return IfcFlowInstrumentTypeEnum::FromString(*entity->getArgument(8)); }
+bool IfcFlowInstrument::hasPredefinedType() const { return !entity->getArgument(8)->isNull(); }
+IfcFlowInstrumentTypeEnum::IfcFlowInstrumentTypeEnum IfcFlowInstrument::PredefinedType() const { return IfcFlowInstrumentTypeEnum::FromString(*entity->getArgument(8)); }
 void IfcFlowInstrument::setPredefinedType(IfcFlowInstrumentTypeEnum::IfcFlowInstrumentTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcFlowInstrumentTypeEnum::ToString(v)); }
 bool IfcFlowInstrument::is(Type::Enum v) const { return v == Type::IfcFlowInstrument || IfcDistributionControlElement::is(v); }
 Type::Enum IfcFlowInstrument::type() const { return Type::IfcFlowInstrument; }
 Type::Enum IfcFlowInstrument::Class() { return Type::IfcFlowInstrument; }
-IfcFlowInstrument::IfcFlowInstrument(IfcAbstractEntityPtr e) : IfcDistributionControlElement((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcFlowInstrument)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcFlowInstrument::IfcFlowInstrument(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcFlowInstrumentTypeEnum::IfcFlowInstrumentTypeEnum > v9_PredefinedType) : IfcDistributionControlElement((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcFlowInstrumentTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcFlowInstrument::IfcFlowInstrument(IfcAbstractEntity* e) : IfcDistributionControlElement((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcFlowInstrument)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcFlowInstrument::IfcFlowInstrument(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcFlowInstrumentTypeEnum::IfcFlowInstrumentTypeEnum > v9_PredefinedType) : IfcDistributionControlElement((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcFlowInstrumentTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcFlowInstrumentType
-IfcFlowInstrumentTypeEnum::IfcFlowInstrumentTypeEnum IfcFlowInstrumentType::PredefinedType() { return IfcFlowInstrumentTypeEnum::FromString(*entity->getArgument(9)); }
+IfcFlowInstrumentTypeEnum::IfcFlowInstrumentTypeEnum IfcFlowInstrumentType::PredefinedType() const { return IfcFlowInstrumentTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcFlowInstrumentType::setPredefinedType(IfcFlowInstrumentTypeEnum::IfcFlowInstrumentTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcFlowInstrumentTypeEnum::ToString(v)); }
 bool IfcFlowInstrumentType::is(Type::Enum v) const { return v == Type::IfcFlowInstrumentType || IfcDistributionControlElementType::is(v); }
 Type::Enum IfcFlowInstrumentType::type() const { return Type::IfcFlowInstrumentType; }
 Type::Enum IfcFlowInstrumentType::Class() { return Type::IfcFlowInstrumentType; }
-IfcFlowInstrumentType::IfcFlowInstrumentType(IfcAbstractEntityPtr e) : IfcDistributionControlElementType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcFlowInstrumentType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcFlowInstrumentType::IfcFlowInstrumentType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcFlowInstrumentTypeEnum::IfcFlowInstrumentTypeEnum v10_PredefinedType) : IfcDistributionControlElementType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcFlowInstrumentTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcFlowInstrumentType::IfcFlowInstrumentType(IfcAbstractEntity* e) : IfcDistributionControlElementType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcFlowInstrumentType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcFlowInstrumentType::IfcFlowInstrumentType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcFlowInstrumentTypeEnum::IfcFlowInstrumentTypeEnum v10_PredefinedType) : IfcDistributionControlElementType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcFlowInstrumentTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcFlowMeter
-bool IfcFlowMeter::hasPredefinedType() { return !entity->getArgument(8)->isNull(); }
-IfcFlowMeterTypeEnum::IfcFlowMeterTypeEnum IfcFlowMeter::PredefinedType() { return IfcFlowMeterTypeEnum::FromString(*entity->getArgument(8)); }
+bool IfcFlowMeter::hasPredefinedType() const { return !entity->getArgument(8)->isNull(); }
+IfcFlowMeterTypeEnum::IfcFlowMeterTypeEnum IfcFlowMeter::PredefinedType() const { return IfcFlowMeterTypeEnum::FromString(*entity->getArgument(8)); }
 void IfcFlowMeter::setPredefinedType(IfcFlowMeterTypeEnum::IfcFlowMeterTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcFlowMeterTypeEnum::ToString(v)); }
 bool IfcFlowMeter::is(Type::Enum v) const { return v == Type::IfcFlowMeter || IfcFlowController::is(v); }
 Type::Enum IfcFlowMeter::type() const { return Type::IfcFlowMeter; }
 Type::Enum IfcFlowMeter::Class() { return Type::IfcFlowMeter; }
-IfcFlowMeter::IfcFlowMeter(IfcAbstractEntityPtr e) : IfcFlowController((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcFlowMeter)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcFlowMeter::IfcFlowMeter(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcFlowMeterTypeEnum::IfcFlowMeterTypeEnum > v9_PredefinedType) : IfcFlowController((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcFlowMeterTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcFlowMeter::IfcFlowMeter(IfcAbstractEntity* e) : IfcFlowController((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcFlowMeter)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcFlowMeter::IfcFlowMeter(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcFlowMeterTypeEnum::IfcFlowMeterTypeEnum > v9_PredefinedType) : IfcFlowController((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcFlowMeterTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcFlowMeterType
-IfcFlowMeterTypeEnum::IfcFlowMeterTypeEnum IfcFlowMeterType::PredefinedType() { return IfcFlowMeterTypeEnum::FromString(*entity->getArgument(9)); }
+IfcFlowMeterTypeEnum::IfcFlowMeterTypeEnum IfcFlowMeterType::PredefinedType() const { return IfcFlowMeterTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcFlowMeterType::setPredefinedType(IfcFlowMeterTypeEnum::IfcFlowMeterTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcFlowMeterTypeEnum::ToString(v)); }
 bool IfcFlowMeterType::is(Type::Enum v) const { return v == Type::IfcFlowMeterType || IfcFlowControllerType::is(v); }
 Type::Enum IfcFlowMeterType::type() const { return Type::IfcFlowMeterType; }
 Type::Enum IfcFlowMeterType::Class() { return Type::IfcFlowMeterType; }
-IfcFlowMeterType::IfcFlowMeterType(IfcAbstractEntityPtr e) : IfcFlowControllerType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcFlowMeterType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcFlowMeterType::IfcFlowMeterType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcFlowMeterTypeEnum::IfcFlowMeterTypeEnum v10_PredefinedType) : IfcFlowControllerType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcFlowMeterTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcFlowMeterType::IfcFlowMeterType(IfcAbstractEntity* e) : IfcFlowControllerType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcFlowMeterType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcFlowMeterType::IfcFlowMeterType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcFlowMeterTypeEnum::IfcFlowMeterTypeEnum v10_PredefinedType) : IfcFlowControllerType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcFlowMeterTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcFlowMovingDevice
 bool IfcFlowMovingDevice::is(Type::Enum v) const { return v == Type::IfcFlowMovingDevice || IfcDistributionFlowElement::is(v); }
 Type::Enum IfcFlowMovingDevice::type() const { return Type::IfcFlowMovingDevice; }
 Type::Enum IfcFlowMovingDevice::Class() { return Type::IfcFlowMovingDevice; }
-IfcFlowMovingDevice::IfcFlowMovingDevice(IfcAbstractEntityPtr e) : IfcDistributionFlowElement((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcFlowMovingDevice)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcFlowMovingDevice::IfcFlowMovingDevice(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag) : IfcDistributionFlowElement((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
+IfcFlowMovingDevice::IfcFlowMovingDevice(IfcAbstractEntity* e) : IfcDistributionFlowElement((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcFlowMovingDevice)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcFlowMovingDevice::IfcFlowMovingDevice(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag) : IfcDistributionFlowElement((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcFlowMovingDeviceType
 bool IfcFlowMovingDeviceType::is(Type::Enum v) const { return v == Type::IfcFlowMovingDeviceType || IfcDistributionFlowElementType::is(v); }
 Type::Enum IfcFlowMovingDeviceType::type() const { return Type::IfcFlowMovingDeviceType; }
 Type::Enum IfcFlowMovingDeviceType::Class() { return Type::IfcFlowMovingDeviceType; }
-IfcFlowMovingDeviceType::IfcFlowMovingDeviceType(IfcAbstractEntityPtr e) : IfcDistributionFlowElementType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcFlowMovingDeviceType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcFlowMovingDeviceType::IfcFlowMovingDeviceType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType) : IfcDistributionFlowElementType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcFlowMovingDeviceType::IfcFlowMovingDeviceType(IfcAbstractEntity* e) : IfcDistributionFlowElementType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcFlowMovingDeviceType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcFlowMovingDeviceType::IfcFlowMovingDeviceType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType) : IfcDistributionFlowElementType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcFlowSegment
 bool IfcFlowSegment::is(Type::Enum v) const { return v == Type::IfcFlowSegment || IfcDistributionFlowElement::is(v); }
 Type::Enum IfcFlowSegment::type() const { return Type::IfcFlowSegment; }
 Type::Enum IfcFlowSegment::Class() { return Type::IfcFlowSegment; }
-IfcFlowSegment::IfcFlowSegment(IfcAbstractEntityPtr e) : IfcDistributionFlowElement((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcFlowSegment)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcFlowSegment::IfcFlowSegment(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag) : IfcDistributionFlowElement((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
+IfcFlowSegment::IfcFlowSegment(IfcAbstractEntity* e) : IfcDistributionFlowElement((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcFlowSegment)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcFlowSegment::IfcFlowSegment(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag) : IfcDistributionFlowElement((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcFlowSegmentType
 bool IfcFlowSegmentType::is(Type::Enum v) const { return v == Type::IfcFlowSegmentType || IfcDistributionFlowElementType::is(v); }
 Type::Enum IfcFlowSegmentType::type() const { return Type::IfcFlowSegmentType; }
 Type::Enum IfcFlowSegmentType::Class() { return Type::IfcFlowSegmentType; }
-IfcFlowSegmentType::IfcFlowSegmentType(IfcAbstractEntityPtr e) : IfcDistributionFlowElementType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcFlowSegmentType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcFlowSegmentType::IfcFlowSegmentType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType) : IfcDistributionFlowElementType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcFlowSegmentType::IfcFlowSegmentType(IfcAbstractEntity* e) : IfcDistributionFlowElementType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcFlowSegmentType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcFlowSegmentType::IfcFlowSegmentType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType) : IfcDistributionFlowElementType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcFlowStorageDevice
 bool IfcFlowStorageDevice::is(Type::Enum v) const { return v == Type::IfcFlowStorageDevice || IfcDistributionFlowElement::is(v); }
 Type::Enum IfcFlowStorageDevice::type() const { return Type::IfcFlowStorageDevice; }
 Type::Enum IfcFlowStorageDevice::Class() { return Type::IfcFlowStorageDevice; }
-IfcFlowStorageDevice::IfcFlowStorageDevice(IfcAbstractEntityPtr e) : IfcDistributionFlowElement((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcFlowStorageDevice)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcFlowStorageDevice::IfcFlowStorageDevice(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag) : IfcDistributionFlowElement((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
+IfcFlowStorageDevice::IfcFlowStorageDevice(IfcAbstractEntity* e) : IfcDistributionFlowElement((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcFlowStorageDevice)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcFlowStorageDevice::IfcFlowStorageDevice(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag) : IfcDistributionFlowElement((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcFlowStorageDeviceType
 bool IfcFlowStorageDeviceType::is(Type::Enum v) const { return v == Type::IfcFlowStorageDeviceType || IfcDistributionFlowElementType::is(v); }
 Type::Enum IfcFlowStorageDeviceType::type() const { return Type::IfcFlowStorageDeviceType; }
 Type::Enum IfcFlowStorageDeviceType::Class() { return Type::IfcFlowStorageDeviceType; }
-IfcFlowStorageDeviceType::IfcFlowStorageDeviceType(IfcAbstractEntityPtr e) : IfcDistributionFlowElementType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcFlowStorageDeviceType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcFlowStorageDeviceType::IfcFlowStorageDeviceType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType) : IfcDistributionFlowElementType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcFlowStorageDeviceType::IfcFlowStorageDeviceType(IfcAbstractEntity* e) : IfcDistributionFlowElementType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcFlowStorageDeviceType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcFlowStorageDeviceType::IfcFlowStorageDeviceType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType) : IfcDistributionFlowElementType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcFlowTerminal
 bool IfcFlowTerminal::is(Type::Enum v) const { return v == Type::IfcFlowTerminal || IfcDistributionFlowElement::is(v); }
 Type::Enum IfcFlowTerminal::type() const { return Type::IfcFlowTerminal; }
 Type::Enum IfcFlowTerminal::Class() { return Type::IfcFlowTerminal; }
-IfcFlowTerminal::IfcFlowTerminal(IfcAbstractEntityPtr e) : IfcDistributionFlowElement((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcFlowTerminal)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcFlowTerminal::IfcFlowTerminal(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag) : IfcDistributionFlowElement((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
+IfcFlowTerminal::IfcFlowTerminal(IfcAbstractEntity* e) : IfcDistributionFlowElement((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcFlowTerminal)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcFlowTerminal::IfcFlowTerminal(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag) : IfcDistributionFlowElement((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcFlowTerminalType
 bool IfcFlowTerminalType::is(Type::Enum v) const { return v == Type::IfcFlowTerminalType || IfcDistributionFlowElementType::is(v); }
 Type::Enum IfcFlowTerminalType::type() const { return Type::IfcFlowTerminalType; }
 Type::Enum IfcFlowTerminalType::Class() { return Type::IfcFlowTerminalType; }
-IfcFlowTerminalType::IfcFlowTerminalType(IfcAbstractEntityPtr e) : IfcDistributionFlowElementType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcFlowTerminalType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcFlowTerminalType::IfcFlowTerminalType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType) : IfcDistributionFlowElementType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcFlowTerminalType::IfcFlowTerminalType(IfcAbstractEntity* e) : IfcDistributionFlowElementType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcFlowTerminalType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcFlowTerminalType::IfcFlowTerminalType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType) : IfcDistributionFlowElementType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcFlowTreatmentDevice
 bool IfcFlowTreatmentDevice::is(Type::Enum v) const { return v == Type::IfcFlowTreatmentDevice || IfcDistributionFlowElement::is(v); }
 Type::Enum IfcFlowTreatmentDevice::type() const { return Type::IfcFlowTreatmentDevice; }
 Type::Enum IfcFlowTreatmentDevice::Class() { return Type::IfcFlowTreatmentDevice; }
-IfcFlowTreatmentDevice::IfcFlowTreatmentDevice(IfcAbstractEntityPtr e) : IfcDistributionFlowElement((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcFlowTreatmentDevice)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcFlowTreatmentDevice::IfcFlowTreatmentDevice(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag) : IfcDistributionFlowElement((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
+IfcFlowTreatmentDevice::IfcFlowTreatmentDevice(IfcAbstractEntity* e) : IfcDistributionFlowElement((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcFlowTreatmentDevice)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcFlowTreatmentDevice::IfcFlowTreatmentDevice(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag) : IfcDistributionFlowElement((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcFlowTreatmentDeviceType
 bool IfcFlowTreatmentDeviceType::is(Type::Enum v) const { return v == Type::IfcFlowTreatmentDeviceType || IfcDistributionFlowElementType::is(v); }
 Type::Enum IfcFlowTreatmentDeviceType::type() const { return Type::IfcFlowTreatmentDeviceType; }
 Type::Enum IfcFlowTreatmentDeviceType::Class() { return Type::IfcFlowTreatmentDeviceType; }
-IfcFlowTreatmentDeviceType::IfcFlowTreatmentDeviceType(IfcAbstractEntityPtr e) : IfcDistributionFlowElementType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcFlowTreatmentDeviceType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcFlowTreatmentDeviceType::IfcFlowTreatmentDeviceType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType) : IfcDistributionFlowElementType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcFlowTreatmentDeviceType::IfcFlowTreatmentDeviceType(IfcAbstractEntity* e) : IfcDistributionFlowElementType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcFlowTreatmentDeviceType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcFlowTreatmentDeviceType::IfcFlowTreatmentDeviceType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType) : IfcDistributionFlowElementType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcFooting
-bool IfcFooting::hasPredefinedType() { return !entity->getArgument(8)->isNull(); }
-IfcFootingTypeEnum::IfcFootingTypeEnum IfcFooting::PredefinedType() { return IfcFootingTypeEnum::FromString(*entity->getArgument(8)); }
+bool IfcFooting::hasPredefinedType() const { return !entity->getArgument(8)->isNull(); }
+IfcFootingTypeEnum::IfcFootingTypeEnum IfcFooting::PredefinedType() const { return IfcFootingTypeEnum::FromString(*entity->getArgument(8)); }
 void IfcFooting::setPredefinedType(IfcFootingTypeEnum::IfcFootingTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcFootingTypeEnum::ToString(v)); }
 bool IfcFooting::is(Type::Enum v) const { return v == Type::IfcFooting || IfcBuildingElement::is(v); }
 Type::Enum IfcFooting::type() const { return Type::IfcFooting; }
 Type::Enum IfcFooting::Class() { return Type::IfcFooting; }
-IfcFooting::IfcFooting(IfcAbstractEntityPtr e) : IfcBuildingElement((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcFooting)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcFooting::IfcFooting(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcFootingTypeEnum::IfcFootingTypeEnum > v9_PredefinedType) : IfcBuildingElement((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcFootingTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcFooting::IfcFooting(IfcAbstractEntity* e) : IfcBuildingElement((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcFooting)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcFooting::IfcFooting(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcFootingTypeEnum::IfcFootingTypeEnum > v9_PredefinedType) : IfcBuildingElement((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcFootingTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcFootingType
-IfcFootingTypeEnum::IfcFootingTypeEnum IfcFootingType::PredefinedType() { return IfcFootingTypeEnum::FromString(*entity->getArgument(9)); }
+IfcFootingTypeEnum::IfcFootingTypeEnum IfcFootingType::PredefinedType() const { return IfcFootingTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcFootingType::setPredefinedType(IfcFootingTypeEnum::IfcFootingTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcFootingTypeEnum::ToString(v)); }
 bool IfcFootingType::is(Type::Enum v) const { return v == Type::IfcFootingType || IfcBuildingElementType::is(v); }
 Type::Enum IfcFootingType::type() const { return Type::IfcFootingType; }
 Type::Enum IfcFootingType::Class() { return Type::IfcFootingType; }
-IfcFootingType::IfcFootingType(IfcAbstractEntityPtr e) : IfcBuildingElementType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcFootingType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcFootingType::IfcFootingType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcFootingTypeEnum::IfcFootingTypeEnum v10_PredefinedType) : IfcBuildingElementType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcFootingTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcFootingType::IfcFootingType(IfcAbstractEntity* e) : IfcBuildingElementType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcFootingType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcFootingType::IfcFootingType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcFootingTypeEnum::IfcFootingTypeEnum v10_PredefinedType) : IfcBuildingElementType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcFootingTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcFurnishingElement
 bool IfcFurnishingElement::is(Type::Enum v) const { return v == Type::IfcFurnishingElement || IfcElement::is(v); }
 Type::Enum IfcFurnishingElement::type() const { return Type::IfcFurnishingElement; }
 Type::Enum IfcFurnishingElement::Class() { return Type::IfcFurnishingElement; }
-IfcFurnishingElement::IfcFurnishingElement(IfcAbstractEntityPtr e) : IfcElement((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcFurnishingElement)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcFurnishingElement::IfcFurnishingElement(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag) : IfcElement((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
+IfcFurnishingElement::IfcFurnishingElement(IfcAbstractEntity* e) : IfcElement((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcFurnishingElement)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcFurnishingElement::IfcFurnishingElement(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag) : IfcElement((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcFurnishingElementType
 bool IfcFurnishingElementType::is(Type::Enum v) const { return v == Type::IfcFurnishingElementType || IfcElementType::is(v); }
 Type::Enum IfcFurnishingElementType::type() const { return Type::IfcFurnishingElementType; }
 Type::Enum IfcFurnishingElementType::Class() { return Type::IfcFurnishingElementType; }
-IfcFurnishingElementType::IfcFurnishingElementType(IfcAbstractEntityPtr e) : IfcElementType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcFurnishingElementType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcFurnishingElementType::IfcFurnishingElementType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType) : IfcElementType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcFurnishingElementType::IfcFurnishingElementType(IfcAbstractEntity* e) : IfcElementType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcFurnishingElementType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcFurnishingElementType::IfcFurnishingElementType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType) : IfcElementType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcFurniture
-bool IfcFurniture::hasPredefinedType() { return !entity->getArgument(8)->isNull(); }
-IfcFurnitureTypeEnum::IfcFurnitureTypeEnum IfcFurniture::PredefinedType() { return IfcFurnitureTypeEnum::FromString(*entity->getArgument(8)); }
+bool IfcFurniture::hasPredefinedType() const { return !entity->getArgument(8)->isNull(); }
+IfcFurnitureTypeEnum::IfcFurnitureTypeEnum IfcFurniture::PredefinedType() const { return IfcFurnitureTypeEnum::FromString(*entity->getArgument(8)); }
 void IfcFurniture::setPredefinedType(IfcFurnitureTypeEnum::IfcFurnitureTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcFurnitureTypeEnum::ToString(v)); }
 bool IfcFurniture::is(Type::Enum v) const { return v == Type::IfcFurniture || IfcFurnishingElement::is(v); }
 Type::Enum IfcFurniture::type() const { return Type::IfcFurniture; }
 Type::Enum IfcFurniture::Class() { return Type::IfcFurniture; }
-IfcFurniture::IfcFurniture(IfcAbstractEntityPtr e) : IfcFurnishingElement((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcFurniture)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcFurniture::IfcFurniture(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcFurnitureTypeEnum::IfcFurnitureTypeEnum > v9_PredefinedType) : IfcFurnishingElement((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcFurnitureTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcFurniture::IfcFurniture(IfcAbstractEntity* e) : IfcFurnishingElement((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcFurniture)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcFurniture::IfcFurniture(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcFurnitureTypeEnum::IfcFurnitureTypeEnum > v9_PredefinedType) : IfcFurnishingElement((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcFurnitureTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcFurnitureType
-IfcAssemblyPlaceEnum::IfcAssemblyPlaceEnum IfcFurnitureType::AssemblyPlace() { return IfcAssemblyPlaceEnum::FromString(*entity->getArgument(9)); }
+IfcAssemblyPlaceEnum::IfcAssemblyPlaceEnum IfcFurnitureType::AssemblyPlace() const { return IfcAssemblyPlaceEnum::FromString(*entity->getArgument(9)); }
 void IfcFurnitureType::setAssemblyPlace(IfcAssemblyPlaceEnum::IfcAssemblyPlaceEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcAssemblyPlaceEnum::ToString(v)); }
-bool IfcFurnitureType::hasPredefinedType() { return !entity->getArgument(10)->isNull(); }
-IfcFurnitureTypeEnum::IfcFurnitureTypeEnum IfcFurnitureType::PredefinedType() { return IfcFurnitureTypeEnum::FromString(*entity->getArgument(10)); }
+bool IfcFurnitureType::hasPredefinedType() const { return !entity->getArgument(10)->isNull(); }
+IfcFurnitureTypeEnum::IfcFurnitureTypeEnum IfcFurnitureType::PredefinedType() const { return IfcFurnitureTypeEnum::FromString(*entity->getArgument(10)); }
 void IfcFurnitureType::setPredefinedType(IfcFurnitureTypeEnum::IfcFurnitureTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v,IfcFurnitureTypeEnum::ToString(v)); }
 bool IfcFurnitureType::is(Type::Enum v) const { return v == Type::IfcFurnitureType || IfcFurnishingElementType::is(v); }
 Type::Enum IfcFurnitureType::type() const { return Type::IfcFurnitureType; }
 Type::Enum IfcFurnitureType::Class() { return Type::IfcFurnitureType; }
-IfcFurnitureType::IfcFurnitureType(IfcAbstractEntityPtr e) : IfcFurnishingElementType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcFurnitureType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcFurnitureType::IfcFurnitureType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcAssemblyPlaceEnum::IfcAssemblyPlaceEnum v10_AssemblyPlace, boost::optional< IfcFurnitureTypeEnum::IfcFurnitureTypeEnum > v11_PredefinedType) : IfcFurnishingElementType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_AssemblyPlace,IfcAssemblyPlaceEnum::ToString(v10_AssemblyPlace)); if (v11_PredefinedType) { e->setArgument(10,*v11_PredefinedType,IfcFurnitureTypeEnum::ToString(*v11_PredefinedType)); } else { e->setArgument(10); } entity = e; EntityBuffer::Add(this); }
+IfcFurnitureType::IfcFurnitureType(IfcAbstractEntity* e) : IfcFurnishingElementType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcFurnitureType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcFurnitureType::IfcFurnitureType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcAssemblyPlaceEnum::IfcAssemblyPlaceEnum v10_AssemblyPlace, boost::optional< IfcFurnitureTypeEnum::IfcFurnitureTypeEnum > v11_PredefinedType) : IfcFurnishingElementType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_AssemblyPlace,IfcAssemblyPlaceEnum::ToString(v10_AssemblyPlace)); if (v11_PredefinedType) { e->setArgument(10,*v11_PredefinedType,IfcFurnitureTypeEnum::ToString(*v11_PredefinedType)); } else { e->setArgument(10); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcGeographicElement
-bool IfcGeographicElement::hasPredefinedType() { return !entity->getArgument(8)->isNull(); }
-IfcGeographicElementTypeEnum::IfcGeographicElementTypeEnum IfcGeographicElement::PredefinedType() { return IfcGeographicElementTypeEnum::FromString(*entity->getArgument(8)); }
+bool IfcGeographicElement::hasPredefinedType() const { return !entity->getArgument(8)->isNull(); }
+IfcGeographicElementTypeEnum::IfcGeographicElementTypeEnum IfcGeographicElement::PredefinedType() const { return IfcGeographicElementTypeEnum::FromString(*entity->getArgument(8)); }
 void IfcGeographicElement::setPredefinedType(IfcGeographicElementTypeEnum::IfcGeographicElementTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcGeographicElementTypeEnum::ToString(v)); }
 bool IfcGeographicElement::is(Type::Enum v) const { return v == Type::IfcGeographicElement || IfcElement::is(v); }
 Type::Enum IfcGeographicElement::type() const { return Type::IfcGeographicElement; }
 Type::Enum IfcGeographicElement::Class() { return Type::IfcGeographicElement; }
-IfcGeographicElement::IfcGeographicElement(IfcAbstractEntityPtr e) : IfcElement((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcGeographicElement)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcGeographicElement::IfcGeographicElement(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcGeographicElementTypeEnum::IfcGeographicElementTypeEnum > v9_PredefinedType) : IfcElement((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcGeographicElementTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcGeographicElement::IfcGeographicElement(IfcAbstractEntity* e) : IfcElement((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcGeographicElement)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcGeographicElement::IfcGeographicElement(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcGeographicElementTypeEnum::IfcGeographicElementTypeEnum > v9_PredefinedType) : IfcElement((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcGeographicElementTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcGeographicElementType
-IfcGeographicElementTypeEnum::IfcGeographicElementTypeEnum IfcGeographicElementType::PredefinedType() { return IfcGeographicElementTypeEnum::FromString(*entity->getArgument(9)); }
+IfcGeographicElementTypeEnum::IfcGeographicElementTypeEnum IfcGeographicElementType::PredefinedType() const { return IfcGeographicElementTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcGeographicElementType::setPredefinedType(IfcGeographicElementTypeEnum::IfcGeographicElementTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcGeographicElementTypeEnum::ToString(v)); }
 bool IfcGeographicElementType::is(Type::Enum v) const { return v == Type::IfcGeographicElementType || IfcElementType::is(v); }
 Type::Enum IfcGeographicElementType::type() const { return Type::IfcGeographicElementType; }
 Type::Enum IfcGeographicElementType::Class() { return Type::IfcGeographicElementType; }
-IfcGeographicElementType::IfcGeographicElementType(IfcAbstractEntityPtr e) : IfcElementType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcGeographicElementType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcGeographicElementType::IfcGeographicElementType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcGeographicElementTypeEnum::IfcGeographicElementTypeEnum v10_PredefinedType) : IfcElementType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcGeographicElementTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcGeographicElementType::IfcGeographicElementType(IfcAbstractEntity* e) : IfcElementType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcGeographicElementType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcGeographicElementType::IfcGeographicElementType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcGeographicElementTypeEnum::IfcGeographicElementTypeEnum v10_PredefinedType) : IfcElementType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcGeographicElementTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcGeometricCurveSet
 bool IfcGeometricCurveSet::is(Type::Enum v) const { return v == Type::IfcGeometricCurveSet || IfcGeometricSet::is(v); }
 Type::Enum IfcGeometricCurveSet::type() const { return Type::IfcGeometricCurveSet; }
 Type::Enum IfcGeometricCurveSet::Class() { return Type::IfcGeometricCurveSet; }
-IfcGeometricCurveSet::IfcGeometricCurveSet(IfcAbstractEntityPtr e) : IfcGeometricSet((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcGeometricCurveSet)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcGeometricCurveSet::IfcGeometricCurveSet(IfcEntities v1_Elements) : IfcGeometricSet((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Elements)); entity = e; EntityBuffer::Add(this); }
+IfcGeometricCurveSet::IfcGeometricCurveSet(IfcAbstractEntity* e) : IfcGeometricSet((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcGeometricCurveSet)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcGeometricCurveSet::IfcGeometricCurveSet(IfcEntityList::ptr v1_Elements) : IfcGeometricSet((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Elements)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcGeometricRepresentationContext
-IfcDimensionCount IfcGeometricRepresentationContext::CoordinateSpaceDimension() { return *entity->getArgument(2); }
-void IfcGeometricRepresentationContext::setCoordinateSpaceDimension(IfcDimensionCount v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-bool IfcGeometricRepresentationContext::hasPrecision() { return !entity->getArgument(3)->isNull(); }
-double IfcGeometricRepresentationContext::Precision() { return *entity->getArgument(3); }
+int IfcGeometricRepresentationContext::CoordinateSpaceDimension() const { return *entity->getArgument(2); }
+void IfcGeometricRepresentationContext::setCoordinateSpaceDimension(int v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+bool IfcGeometricRepresentationContext::hasPrecision() const { return !entity->getArgument(3)->isNull(); }
+double IfcGeometricRepresentationContext::Precision() const { return *entity->getArgument(3); }
 void IfcGeometricRepresentationContext::setPrecision(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-IfcAxis2Placement IfcGeometricRepresentationContext::WorldCoordinateSystem() { return *entity->getArgument(4); }
-void IfcGeometricRepresentationContext::setWorldCoordinateSystem(IfcAxis2Placement v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-bool IfcGeometricRepresentationContext::hasTrueNorth() { return !entity->getArgument(5)->isNull(); }
-IfcDirection* IfcGeometricRepresentationContext::TrueNorth() { return (IfcDirection*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(5))); }
+IfcAxis2Placement* IfcGeometricRepresentationContext::WorldCoordinateSystem() const { return (IfcAxis2Placement*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(4))); }
+void IfcGeometricRepresentationContext::setWorldCoordinateSystem(IfcAxis2Placement* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+bool IfcGeometricRepresentationContext::hasTrueNorth() const { return !entity->getArgument(5)->isNull(); }
+IfcDirection* IfcGeometricRepresentationContext::TrueNorth() const { return (IfcDirection*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(5))); }
 void IfcGeometricRepresentationContext::setTrueNorth(IfcDirection* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-IfcGeometricRepresentationSubContext::list IfcGeometricRepresentationContext::HasSubContexts() { RETURN_INVERSE(IfcGeometricRepresentationSubContext) }
+IfcGeometricRepresentationSubContext::list::ptr IfcGeometricRepresentationContext::HasSubContexts() const { return entity->getInverse(Type::IfcGeometricRepresentationSubContext, 6)->as<IfcGeometricRepresentationSubContext>(); }
 bool IfcGeometricRepresentationContext::is(Type::Enum v) const { return v == Type::IfcGeometricRepresentationContext || IfcRepresentationContext::is(v); }
 Type::Enum IfcGeometricRepresentationContext::type() const { return Type::IfcGeometricRepresentationContext; }
 Type::Enum IfcGeometricRepresentationContext::Class() { return Type::IfcGeometricRepresentationContext; }
-IfcGeometricRepresentationContext::IfcGeometricRepresentationContext(IfcAbstractEntityPtr e) : IfcRepresentationContext((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcGeometricRepresentationContext)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcGeometricRepresentationContext::IfcGeometricRepresentationContext(boost::optional< IfcLabel > v1_ContextIdentifier, boost::optional< IfcLabel > v2_ContextType, IfcDimensionCount v3_CoordinateSpaceDimension, boost::optional< double > v4_Precision, IfcAxis2Placement v5_WorldCoordinateSystem, IfcDirection* v6_TrueNorth) : IfcRepresentationContext((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_ContextIdentifier) { e->setArgument(0,(*v1_ContextIdentifier)); } else { e->setArgument(0); } if (v2_ContextType) { e->setArgument(1,(*v2_ContextType)); } else { e->setArgument(1); } e->setArgument(2,(v3_CoordinateSpaceDimension)); if (v4_Precision) { e->setArgument(3,(*v4_Precision)); } else { e->setArgument(3); } e->setArgument(4,(v5_WorldCoordinateSystem)); e->setArgument(5,(v6_TrueNorth)); entity = e; EntityBuffer::Add(this); }
+IfcGeometricRepresentationContext::IfcGeometricRepresentationContext(IfcAbstractEntity* e) : IfcRepresentationContext((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcGeometricRepresentationContext)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcGeometricRepresentationContext::IfcGeometricRepresentationContext(boost::optional< std::string > v1_ContextIdentifier, boost::optional< std::string > v2_ContextType, int v3_CoordinateSpaceDimension, boost::optional< double > v4_Precision, IfcAxis2Placement* v5_WorldCoordinateSystem, IfcDirection* v6_TrueNorth) : IfcRepresentationContext((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_ContextIdentifier) { e->setArgument(0,(*v1_ContextIdentifier)); } else { e->setArgument(0); } if (v2_ContextType) { e->setArgument(1,(*v2_ContextType)); } else { e->setArgument(1); } e->setArgument(2,(v3_CoordinateSpaceDimension)); if (v4_Precision) { e->setArgument(3,(*v4_Precision)); } else { e->setArgument(3); } e->setArgument(4,(v5_WorldCoordinateSystem)); e->setArgument(5,(v6_TrueNorth)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcGeometricRepresentationItem
 bool IfcGeometricRepresentationItem::is(Type::Enum v) const { return v == Type::IfcGeometricRepresentationItem || IfcRepresentationItem::is(v); }
 Type::Enum IfcGeometricRepresentationItem::type() const { return Type::IfcGeometricRepresentationItem; }
 Type::Enum IfcGeometricRepresentationItem::Class() { return Type::IfcGeometricRepresentationItem; }
-IfcGeometricRepresentationItem::IfcGeometricRepresentationItem(IfcAbstractEntityPtr e) : IfcRepresentationItem((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcGeometricRepresentationItem)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcGeometricRepresentationItem::IfcGeometricRepresentationItem() : IfcRepresentationItem((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); entity = e; EntityBuffer::Add(this); }
+IfcGeometricRepresentationItem::IfcGeometricRepresentationItem(IfcAbstractEntity* e) : IfcRepresentationItem((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcGeometricRepresentationItem)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcGeometricRepresentationItem::IfcGeometricRepresentationItem() : IfcRepresentationItem((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcGeometricRepresentationSubContext
-IfcGeometricRepresentationContext* IfcGeometricRepresentationSubContext::ParentContext() { return (IfcGeometricRepresentationContext*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(6))); }
+IfcGeometricRepresentationContext* IfcGeometricRepresentationSubContext::ParentContext() const { return (IfcGeometricRepresentationContext*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(6))); }
 void IfcGeometricRepresentationSubContext::setParentContext(IfcGeometricRepresentationContext* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
-bool IfcGeometricRepresentationSubContext::hasTargetScale() { return !entity->getArgument(7)->isNull(); }
-IfcPositiveRatioMeasure IfcGeometricRepresentationSubContext::TargetScale() { return *entity->getArgument(7); }
-void IfcGeometricRepresentationSubContext::setTargetScale(IfcPositiveRatioMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
-IfcGeometricProjectionEnum::IfcGeometricProjectionEnum IfcGeometricRepresentationSubContext::TargetView() { return IfcGeometricProjectionEnum::FromString(*entity->getArgument(8)); }
+bool IfcGeometricRepresentationSubContext::hasTargetScale() const { return !entity->getArgument(7)->isNull(); }
+double IfcGeometricRepresentationSubContext::TargetScale() const { return *entity->getArgument(7); }
+void IfcGeometricRepresentationSubContext::setTargetScale(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
+IfcGeometricProjectionEnum::IfcGeometricProjectionEnum IfcGeometricRepresentationSubContext::TargetView() const { return IfcGeometricProjectionEnum::FromString(*entity->getArgument(8)); }
 void IfcGeometricRepresentationSubContext::setTargetView(IfcGeometricProjectionEnum::IfcGeometricProjectionEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcGeometricProjectionEnum::ToString(v)); }
-bool IfcGeometricRepresentationSubContext::hasUserDefinedTargetView() { return !entity->getArgument(9)->isNull(); }
-IfcLabel IfcGeometricRepresentationSubContext::UserDefinedTargetView() { return *entity->getArgument(9); }
-void IfcGeometricRepresentationSubContext::setUserDefinedTargetView(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
+bool IfcGeometricRepresentationSubContext::hasUserDefinedTargetView() const { return !entity->getArgument(9)->isNull(); }
+std::string IfcGeometricRepresentationSubContext::UserDefinedTargetView() const { return *entity->getArgument(9); }
+void IfcGeometricRepresentationSubContext::setUserDefinedTargetView(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
 bool IfcGeometricRepresentationSubContext::is(Type::Enum v) const { return v == Type::IfcGeometricRepresentationSubContext || IfcGeometricRepresentationContext::is(v); }
 Type::Enum IfcGeometricRepresentationSubContext::type() const { return Type::IfcGeometricRepresentationSubContext; }
 Type::Enum IfcGeometricRepresentationSubContext::Class() { return Type::IfcGeometricRepresentationSubContext; }
-IfcGeometricRepresentationSubContext::IfcGeometricRepresentationSubContext(IfcAbstractEntityPtr e) : IfcGeometricRepresentationContext((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcGeometricRepresentationSubContext)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcGeometricRepresentationSubContext::IfcGeometricRepresentationSubContext(boost::optional< IfcLabel > v1_ContextIdentifier, boost::optional< IfcLabel > v2_ContextType, IfcGeometricRepresentationContext* v7_ParentContext, boost::optional< IfcPositiveRatioMeasure > v8_TargetScale, IfcGeometricProjectionEnum::IfcGeometricProjectionEnum v9_TargetView, boost::optional< IfcLabel > v10_UserDefinedTargetView) : IfcGeometricRepresentationContext((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_ContextIdentifier) { e->setArgument(0,(*v1_ContextIdentifier)); } else { e->setArgument(0); } if (v2_ContextType) { e->setArgument(1,(*v2_ContextType)); } else { e->setArgument(1); } e->setArgumentDerived(2); e->setArgumentDerived(3); e->setArgumentDerived(4); e->setArgumentDerived(5); e->setArgument(6,(v7_ParentContext)); if (v8_TargetScale) { e->setArgument(7,(*v8_TargetScale)); } else { e->setArgument(7); } e->setArgument(8,v9_TargetView,IfcGeometricProjectionEnum::ToString(v9_TargetView)); if (v10_UserDefinedTargetView) { e->setArgument(9,(*v10_UserDefinedTargetView)); } else { e->setArgument(9); } entity = e; EntityBuffer::Add(this); }
+IfcGeometricRepresentationSubContext::IfcGeometricRepresentationSubContext(IfcAbstractEntity* e) : IfcGeometricRepresentationContext((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcGeometricRepresentationSubContext)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcGeometricRepresentationSubContext::IfcGeometricRepresentationSubContext(boost::optional< std::string > v1_ContextIdentifier, boost::optional< std::string > v2_ContextType, IfcGeometricRepresentationContext* v7_ParentContext, boost::optional< double > v8_TargetScale, IfcGeometricProjectionEnum::IfcGeometricProjectionEnum v9_TargetView, boost::optional< std::string > v10_UserDefinedTargetView) : IfcGeometricRepresentationContext((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_ContextIdentifier) { e->setArgument(0,(*v1_ContextIdentifier)); } else { e->setArgument(0); } if (v2_ContextType) { e->setArgument(1,(*v2_ContextType)); } else { e->setArgument(1); } e->setArgumentDerived(2); e->setArgumentDerived(3); e->setArgumentDerived(4); e->setArgumentDerived(5); e->setArgument(6,(v7_ParentContext)); if (v8_TargetScale) { e->setArgument(7,(*v8_TargetScale)); } else { e->setArgument(7); } e->setArgument(8,v9_TargetView,IfcGeometricProjectionEnum::ToString(v9_TargetView)); if (v10_UserDefinedTargetView) { e->setArgument(9,(*v10_UserDefinedTargetView)); } else { e->setArgument(9); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcGeometricSet
-SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > IfcGeometricSet::Elements() { RETURN_AS_LIST(IfcUtil::IfcAbstractSelect,0) }
-void IfcGeometricSet::setElements(SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v->generalize()); }
+IfcEntityList::ptr IfcGeometricSet::Elements() const { return *entity->getArgument(0); }
+void IfcGeometricSet::setElements(IfcEntityList::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
 bool IfcGeometricSet::is(Type::Enum v) const { return v == Type::IfcGeometricSet || IfcGeometricRepresentationItem::is(v); }
 Type::Enum IfcGeometricSet::type() const { return Type::IfcGeometricSet; }
 Type::Enum IfcGeometricSet::Class() { return Type::IfcGeometricSet; }
-IfcGeometricSet::IfcGeometricSet(IfcAbstractEntityPtr e) : IfcGeometricRepresentationItem((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcGeometricSet)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcGeometricSet::IfcGeometricSet(IfcEntities v1_Elements) : IfcGeometricRepresentationItem((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Elements)); entity = e; EntityBuffer::Add(this); }
+IfcGeometricSet::IfcGeometricSet(IfcAbstractEntity* e) : IfcGeometricRepresentationItem((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcGeometricSet)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcGeometricSet::IfcGeometricSet(IfcEntityList::ptr v1_Elements) : IfcGeometricRepresentationItem((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Elements)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcGrid
-SHARED_PTR< IfcTemplatedEntityList< IfcGridAxis > > IfcGrid::UAxes() { RETURN_AS_LIST(IfcGridAxis,7) }
-void IfcGrid::setUAxes(SHARED_PTR< IfcTemplatedEntityList< IfcGridAxis > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v->generalize()); }
-SHARED_PTR< IfcTemplatedEntityList< IfcGridAxis > > IfcGrid::VAxes() { RETURN_AS_LIST(IfcGridAxis,8) }
-void IfcGrid::setVAxes(SHARED_PTR< IfcTemplatedEntityList< IfcGridAxis > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v->generalize()); }
-bool IfcGrid::hasWAxes() { return !entity->getArgument(9)->isNull(); }
-SHARED_PTR< IfcTemplatedEntityList< IfcGridAxis > > IfcGrid::WAxes() { RETURN_AS_LIST(IfcGridAxis,9) }
-void IfcGrid::setWAxes(SHARED_PTR< IfcTemplatedEntityList< IfcGridAxis > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v->generalize()); }
-bool IfcGrid::hasPredefinedType() { return !entity->getArgument(10)->isNull(); }
-IfcGridTypeEnum::IfcGridTypeEnum IfcGrid::PredefinedType() { return IfcGridTypeEnum::FromString(*entity->getArgument(10)); }
+IfcTemplatedEntityList< IfcGridAxis >::ptr IfcGrid::UAxes() const { IfcEntityList::ptr es = *entity->getArgument(7); return es->as<IfcGridAxis>(); }
+void IfcGrid::setUAxes(IfcTemplatedEntityList< IfcGridAxis >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v->generalize()); }
+IfcTemplatedEntityList< IfcGridAxis >::ptr IfcGrid::VAxes() const { IfcEntityList::ptr es = *entity->getArgument(8); return es->as<IfcGridAxis>(); }
+void IfcGrid::setVAxes(IfcTemplatedEntityList< IfcGridAxis >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v->generalize()); }
+bool IfcGrid::hasWAxes() const { return !entity->getArgument(9)->isNull(); }
+IfcTemplatedEntityList< IfcGridAxis >::ptr IfcGrid::WAxes() const { IfcEntityList::ptr es = *entity->getArgument(9); return es->as<IfcGridAxis>(); }
+void IfcGrid::setWAxes(IfcTemplatedEntityList< IfcGridAxis >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v->generalize()); }
+bool IfcGrid::hasPredefinedType() const { return !entity->getArgument(10)->isNull(); }
+IfcGridTypeEnum::IfcGridTypeEnum IfcGrid::PredefinedType() const { return IfcGridTypeEnum::FromString(*entity->getArgument(10)); }
 void IfcGrid::setPredefinedType(IfcGridTypeEnum::IfcGridTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v,IfcGridTypeEnum::ToString(v)); }
-IfcRelContainedInSpatialStructure::list IfcGrid::ContainedInStructure() { RETURN_INVERSE(IfcRelContainedInSpatialStructure) }
+IfcRelContainedInSpatialStructure::list::ptr IfcGrid::ContainedInStructure() const { return entity->getInverse(Type::IfcRelContainedInSpatialStructure, 4)->as<IfcRelContainedInSpatialStructure>(); }
 bool IfcGrid::is(Type::Enum v) const { return v == Type::IfcGrid || IfcProduct::is(v); }
 Type::Enum IfcGrid::type() const { return Type::IfcGrid; }
 Type::Enum IfcGrid::Class() { return Type::IfcGrid; }
-IfcGrid::IfcGrid(IfcAbstractEntityPtr e) : IfcProduct((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcGrid)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcGrid::IfcGrid(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, SHARED_PTR< IfcTemplatedEntityList< IfcGridAxis > > v8_UAxes, SHARED_PTR< IfcTemplatedEntityList< IfcGridAxis > > v9_VAxes, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcGridAxis > > > v10_WAxes, boost::optional< IfcGridTypeEnum::IfcGridTypeEnum > v11_PredefinedType) : IfcProduct((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); e->setArgument(7,(v8_UAxes)->generalize()); e->setArgument(8,(v9_VAxes)->generalize()); if (v10_WAxes) { e->setArgument(9,(*v10_WAxes)->generalize()); } else { e->setArgument(9); } if (v11_PredefinedType) { e->setArgument(10,*v11_PredefinedType,IfcGridTypeEnum::ToString(*v11_PredefinedType)); } else { e->setArgument(10); } entity = e; EntityBuffer::Add(this); }
+IfcGrid::IfcGrid(IfcAbstractEntity* e) : IfcProduct((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcGrid)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcGrid::IfcGrid(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcTemplatedEntityList< IfcGridAxis >::ptr v8_UAxes, IfcTemplatedEntityList< IfcGridAxis >::ptr v9_VAxes, boost::optional< IfcTemplatedEntityList< IfcGridAxis >::ptr > v10_WAxes, boost::optional< IfcGridTypeEnum::IfcGridTypeEnum > v11_PredefinedType) : IfcProduct((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); e->setArgument(7,(v8_UAxes)->generalize()); e->setArgument(8,(v9_VAxes)->generalize()); if (v10_WAxes) { e->setArgument(9,(*v10_WAxes)->generalize()); } else { e->setArgument(9); } if (v11_PredefinedType) { e->setArgument(10,*v11_PredefinedType,IfcGridTypeEnum::ToString(*v11_PredefinedType)); } else { e->setArgument(10); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcGridAxis
-bool IfcGridAxis::hasAxisTag() { return !entity->getArgument(0)->isNull(); }
-IfcLabel IfcGridAxis::AxisTag() { return *entity->getArgument(0); }
-void IfcGridAxis::setAxisTag(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-IfcCurve* IfcGridAxis::AxisCurve() { return (IfcCurve*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(1))); }
+bool IfcGridAxis::hasAxisTag() const { return !entity->getArgument(0)->isNull(); }
+std::string IfcGridAxis::AxisTag() const { return *entity->getArgument(0); }
+void IfcGridAxis::setAxisTag(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+IfcCurve* IfcGridAxis::AxisCurve() const { return (IfcCurve*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(1))); }
 void IfcGridAxis::setAxisCurve(IfcCurve* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-IfcBoolean IfcGridAxis::SameSense() { return *entity->getArgument(2); }
-void IfcGridAxis::setSameSense(IfcBoolean v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-IfcGrid::list IfcGridAxis::PartOfW() { RETURN_INVERSE(IfcGrid) }
-IfcGrid::list IfcGridAxis::PartOfV() { RETURN_INVERSE(IfcGrid) }
-IfcGrid::list IfcGridAxis::PartOfU() { RETURN_INVERSE(IfcGrid) }
-IfcVirtualGridIntersection::list IfcGridAxis::HasIntersections() { RETURN_INVERSE(IfcVirtualGridIntersection) }
+bool IfcGridAxis::SameSense() const { return *entity->getArgument(2); }
+void IfcGridAxis::setSameSense(bool v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+IfcGrid::list::ptr IfcGridAxis::PartOfW() const { return entity->getInverse(Type::IfcGrid, 9)->as<IfcGrid>(); }
+IfcGrid::list::ptr IfcGridAxis::PartOfV() const { return entity->getInverse(Type::IfcGrid, 8)->as<IfcGrid>(); }
+IfcGrid::list::ptr IfcGridAxis::PartOfU() const { return entity->getInverse(Type::IfcGrid, 7)->as<IfcGrid>(); }
+IfcVirtualGridIntersection::list::ptr IfcGridAxis::HasIntersections() const { return entity->getInverse(Type::IfcVirtualGridIntersection, 0)->as<IfcVirtualGridIntersection>(); }
 bool IfcGridAxis::is(Type::Enum v) const { return v == Type::IfcGridAxis; }
 Type::Enum IfcGridAxis::type() const { return Type::IfcGridAxis; }
 Type::Enum IfcGridAxis::Class() { return Type::IfcGridAxis; }
-IfcGridAxis::IfcGridAxis(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcGridAxis)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcGridAxis::IfcGridAxis(boost::optional< IfcLabel > v1_AxisTag, IfcCurve* v2_AxisCurve, IfcBoolean v3_SameSense) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_AxisTag) { e->setArgument(0,(*v1_AxisTag)); } else { e->setArgument(0); } e->setArgument(1,(v2_AxisCurve)); e->setArgument(2,(v3_SameSense)); entity = e; EntityBuffer::Add(this); }
+IfcGridAxis::IfcGridAxis(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcGridAxis)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcGridAxis::IfcGridAxis(boost::optional< std::string > v1_AxisTag, IfcCurve* v2_AxisCurve, bool v3_SameSense) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_AxisTag) { e->setArgument(0,(*v1_AxisTag)); } else { e->setArgument(0); } e->setArgument(1,(v2_AxisCurve)); e->setArgument(2,(v3_SameSense)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcGridPlacement
-IfcVirtualGridIntersection* IfcGridPlacement::PlacementLocation() { return (IfcVirtualGridIntersection*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(0))); }
+IfcVirtualGridIntersection* IfcGridPlacement::PlacementLocation() const { return (IfcVirtualGridIntersection*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(0))); }
 void IfcGridPlacement::setPlacementLocation(IfcVirtualGridIntersection* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-bool IfcGridPlacement::hasPlacementRefDirection() { return !entity->getArgument(1)->isNull(); }
-IfcGridPlacementDirectionSelect IfcGridPlacement::PlacementRefDirection() { return *entity->getArgument(1); }
-void IfcGridPlacement::setPlacementRefDirection(IfcGridPlacementDirectionSelect v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+bool IfcGridPlacement::hasPlacementRefDirection() const { return !entity->getArgument(1)->isNull(); }
+IfcGridPlacementDirectionSelect* IfcGridPlacement::PlacementRefDirection() const { return (IfcGridPlacementDirectionSelect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(1))); }
+void IfcGridPlacement::setPlacementRefDirection(IfcGridPlacementDirectionSelect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
 bool IfcGridPlacement::is(Type::Enum v) const { return v == Type::IfcGridPlacement || IfcObjectPlacement::is(v); }
 Type::Enum IfcGridPlacement::type() const { return Type::IfcGridPlacement; }
 Type::Enum IfcGridPlacement::Class() { return Type::IfcGridPlacement; }
-IfcGridPlacement::IfcGridPlacement(IfcAbstractEntityPtr e) : IfcObjectPlacement((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcGridPlacement)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcGridPlacement::IfcGridPlacement(IfcVirtualGridIntersection* v1_PlacementLocation, boost::optional< IfcGridPlacementDirectionSelect > v2_PlacementRefDirection) : IfcObjectPlacement((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_PlacementLocation)); if (v2_PlacementRefDirection) { e->setArgument(1,(*v2_PlacementRefDirection)); } else { e->setArgument(1); } entity = e; EntityBuffer::Add(this); }
+IfcGridPlacement::IfcGridPlacement(IfcAbstractEntity* e) : IfcObjectPlacement((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcGridPlacement)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcGridPlacement::IfcGridPlacement(IfcVirtualGridIntersection* v1_PlacementLocation, IfcGridPlacementDirectionSelect* v2_PlacementRefDirection) : IfcObjectPlacement((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_PlacementLocation)); e->setArgument(1,(v2_PlacementRefDirection)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcGroup
-IfcRelAssignsToGroup::list IfcGroup::IsGroupedBy() { RETURN_INVERSE(IfcRelAssignsToGroup) }
+IfcRelAssignsToGroup::list::ptr IfcGroup::IsGroupedBy() const { return entity->getInverse(Type::IfcRelAssignsToGroup, 6)->as<IfcRelAssignsToGroup>(); }
 bool IfcGroup::is(Type::Enum v) const { return v == Type::IfcGroup || IfcObject::is(v); }
 Type::Enum IfcGroup::type() const { return Type::IfcGroup; }
 Type::Enum IfcGroup::Class() { return Type::IfcGroup; }
-IfcGroup::IfcGroup(IfcAbstractEntityPtr e) : IfcObject((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcGroup)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcGroup::IfcGroup(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType) : IfcObject((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } entity = e; EntityBuffer::Add(this); }
+IfcGroup::IfcGroup(IfcAbstractEntity* e) : IfcObject((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcGroup)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcGroup::IfcGroup(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType) : IfcObject((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcHalfSpaceSolid
-IfcSurface* IfcHalfSpaceSolid::BaseSurface() { return (IfcSurface*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(0))); }
+IfcSurface* IfcHalfSpaceSolid::BaseSurface() const { return (IfcSurface*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(0))); }
 void IfcHalfSpaceSolid::setBaseSurface(IfcSurface* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-bool IfcHalfSpaceSolid::AgreementFlag() { return *entity->getArgument(1); }
+bool IfcHalfSpaceSolid::AgreementFlag() const { return *entity->getArgument(1); }
 void IfcHalfSpaceSolid::setAgreementFlag(bool v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
 bool IfcHalfSpaceSolid::is(Type::Enum v) const { return v == Type::IfcHalfSpaceSolid || IfcGeometricRepresentationItem::is(v); }
 Type::Enum IfcHalfSpaceSolid::type() const { return Type::IfcHalfSpaceSolid; }
 Type::Enum IfcHalfSpaceSolid::Class() { return Type::IfcHalfSpaceSolid; }
-IfcHalfSpaceSolid::IfcHalfSpaceSolid(IfcAbstractEntityPtr e) : IfcGeometricRepresentationItem((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcHalfSpaceSolid)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcHalfSpaceSolid::IfcHalfSpaceSolid(IfcSurface* v1_BaseSurface, bool v2_AgreementFlag) : IfcGeometricRepresentationItem((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_BaseSurface)); e->setArgument(1,(v2_AgreementFlag)); entity = e; EntityBuffer::Add(this); }
+IfcHalfSpaceSolid::IfcHalfSpaceSolid(IfcAbstractEntity* e) : IfcGeometricRepresentationItem((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcHalfSpaceSolid)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcHalfSpaceSolid::IfcHalfSpaceSolid(IfcSurface* v1_BaseSurface, bool v2_AgreementFlag) : IfcGeometricRepresentationItem((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_BaseSurface)); e->setArgument(1,(v2_AgreementFlag)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcHeatExchanger
-bool IfcHeatExchanger::hasPredefinedType() { return !entity->getArgument(8)->isNull(); }
-IfcHeatExchangerTypeEnum::IfcHeatExchangerTypeEnum IfcHeatExchanger::PredefinedType() { return IfcHeatExchangerTypeEnum::FromString(*entity->getArgument(8)); }
+bool IfcHeatExchanger::hasPredefinedType() const { return !entity->getArgument(8)->isNull(); }
+IfcHeatExchangerTypeEnum::IfcHeatExchangerTypeEnum IfcHeatExchanger::PredefinedType() const { return IfcHeatExchangerTypeEnum::FromString(*entity->getArgument(8)); }
 void IfcHeatExchanger::setPredefinedType(IfcHeatExchangerTypeEnum::IfcHeatExchangerTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcHeatExchangerTypeEnum::ToString(v)); }
 bool IfcHeatExchanger::is(Type::Enum v) const { return v == Type::IfcHeatExchanger || IfcEnergyConversionDevice::is(v); }
 Type::Enum IfcHeatExchanger::type() const { return Type::IfcHeatExchanger; }
 Type::Enum IfcHeatExchanger::Class() { return Type::IfcHeatExchanger; }
-IfcHeatExchanger::IfcHeatExchanger(IfcAbstractEntityPtr e) : IfcEnergyConversionDevice((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcHeatExchanger)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcHeatExchanger::IfcHeatExchanger(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcHeatExchangerTypeEnum::IfcHeatExchangerTypeEnum > v9_PredefinedType) : IfcEnergyConversionDevice((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcHeatExchangerTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcHeatExchanger::IfcHeatExchanger(IfcAbstractEntity* e) : IfcEnergyConversionDevice((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcHeatExchanger)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcHeatExchanger::IfcHeatExchanger(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcHeatExchangerTypeEnum::IfcHeatExchangerTypeEnum > v9_PredefinedType) : IfcEnergyConversionDevice((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcHeatExchangerTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcHeatExchangerType
-IfcHeatExchangerTypeEnum::IfcHeatExchangerTypeEnum IfcHeatExchangerType::PredefinedType() { return IfcHeatExchangerTypeEnum::FromString(*entity->getArgument(9)); }
+IfcHeatExchangerTypeEnum::IfcHeatExchangerTypeEnum IfcHeatExchangerType::PredefinedType() const { return IfcHeatExchangerTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcHeatExchangerType::setPredefinedType(IfcHeatExchangerTypeEnum::IfcHeatExchangerTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcHeatExchangerTypeEnum::ToString(v)); }
 bool IfcHeatExchangerType::is(Type::Enum v) const { return v == Type::IfcHeatExchangerType || IfcEnergyConversionDeviceType::is(v); }
 Type::Enum IfcHeatExchangerType::type() const { return Type::IfcHeatExchangerType; }
 Type::Enum IfcHeatExchangerType::Class() { return Type::IfcHeatExchangerType; }
-IfcHeatExchangerType::IfcHeatExchangerType(IfcAbstractEntityPtr e) : IfcEnergyConversionDeviceType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcHeatExchangerType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcHeatExchangerType::IfcHeatExchangerType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcHeatExchangerTypeEnum::IfcHeatExchangerTypeEnum v10_PredefinedType) : IfcEnergyConversionDeviceType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcHeatExchangerTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcHeatExchangerType::IfcHeatExchangerType(IfcAbstractEntity* e) : IfcEnergyConversionDeviceType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcHeatExchangerType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcHeatExchangerType::IfcHeatExchangerType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcHeatExchangerTypeEnum::IfcHeatExchangerTypeEnum v10_PredefinedType) : IfcEnergyConversionDeviceType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcHeatExchangerTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcHumidifier
-bool IfcHumidifier::hasPredefinedType() { return !entity->getArgument(8)->isNull(); }
-IfcHumidifierTypeEnum::IfcHumidifierTypeEnum IfcHumidifier::PredefinedType() { return IfcHumidifierTypeEnum::FromString(*entity->getArgument(8)); }
+bool IfcHumidifier::hasPredefinedType() const { return !entity->getArgument(8)->isNull(); }
+IfcHumidifierTypeEnum::IfcHumidifierTypeEnum IfcHumidifier::PredefinedType() const { return IfcHumidifierTypeEnum::FromString(*entity->getArgument(8)); }
 void IfcHumidifier::setPredefinedType(IfcHumidifierTypeEnum::IfcHumidifierTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcHumidifierTypeEnum::ToString(v)); }
 bool IfcHumidifier::is(Type::Enum v) const { return v == Type::IfcHumidifier || IfcEnergyConversionDevice::is(v); }
 Type::Enum IfcHumidifier::type() const { return Type::IfcHumidifier; }
 Type::Enum IfcHumidifier::Class() { return Type::IfcHumidifier; }
-IfcHumidifier::IfcHumidifier(IfcAbstractEntityPtr e) : IfcEnergyConversionDevice((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcHumidifier)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcHumidifier::IfcHumidifier(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcHumidifierTypeEnum::IfcHumidifierTypeEnum > v9_PredefinedType) : IfcEnergyConversionDevice((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcHumidifierTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcHumidifier::IfcHumidifier(IfcAbstractEntity* e) : IfcEnergyConversionDevice((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcHumidifier)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcHumidifier::IfcHumidifier(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcHumidifierTypeEnum::IfcHumidifierTypeEnum > v9_PredefinedType) : IfcEnergyConversionDevice((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcHumidifierTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcHumidifierType
-IfcHumidifierTypeEnum::IfcHumidifierTypeEnum IfcHumidifierType::PredefinedType() { return IfcHumidifierTypeEnum::FromString(*entity->getArgument(9)); }
+IfcHumidifierTypeEnum::IfcHumidifierTypeEnum IfcHumidifierType::PredefinedType() const { return IfcHumidifierTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcHumidifierType::setPredefinedType(IfcHumidifierTypeEnum::IfcHumidifierTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcHumidifierTypeEnum::ToString(v)); }
 bool IfcHumidifierType::is(Type::Enum v) const { return v == Type::IfcHumidifierType || IfcEnergyConversionDeviceType::is(v); }
 Type::Enum IfcHumidifierType::type() const { return Type::IfcHumidifierType; }
 Type::Enum IfcHumidifierType::Class() { return Type::IfcHumidifierType; }
-IfcHumidifierType::IfcHumidifierType(IfcAbstractEntityPtr e) : IfcEnergyConversionDeviceType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcHumidifierType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcHumidifierType::IfcHumidifierType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcHumidifierTypeEnum::IfcHumidifierTypeEnum v10_PredefinedType) : IfcEnergyConversionDeviceType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcHumidifierTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcHumidifierType::IfcHumidifierType(IfcAbstractEntity* e) : IfcEnergyConversionDeviceType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcHumidifierType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcHumidifierType::IfcHumidifierType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcHumidifierTypeEnum::IfcHumidifierTypeEnum v10_PredefinedType) : IfcEnergyConversionDeviceType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcHumidifierTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcIShapeProfileDef
-IfcPositiveLengthMeasure IfcIShapeProfileDef::OverallWidth() { return *entity->getArgument(3); }
-void IfcIShapeProfileDef::setOverallWidth(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-IfcPositiveLengthMeasure IfcIShapeProfileDef::OverallDepth() { return *entity->getArgument(4); }
-void IfcIShapeProfileDef::setOverallDepth(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-IfcPositiveLengthMeasure IfcIShapeProfileDef::WebThickness() { return *entity->getArgument(5); }
-void IfcIShapeProfileDef::setWebThickness(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-IfcPositiveLengthMeasure IfcIShapeProfileDef::FlangeThickness() { return *entity->getArgument(6); }
-void IfcIShapeProfileDef::setFlangeThickness(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
-bool IfcIShapeProfileDef::hasFilletRadius() { return !entity->getArgument(7)->isNull(); }
-IfcNonNegativeLengthMeasure IfcIShapeProfileDef::FilletRadius() { return *entity->getArgument(7); }
-void IfcIShapeProfileDef::setFilletRadius(IfcNonNegativeLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
-bool IfcIShapeProfileDef::hasFlangeEdgeRadius() { return !entity->getArgument(8)->isNull(); }
-IfcNonNegativeLengthMeasure IfcIShapeProfileDef::FlangeEdgeRadius() { return *entity->getArgument(8); }
-void IfcIShapeProfileDef::setFlangeEdgeRadius(IfcNonNegativeLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
-bool IfcIShapeProfileDef::hasFlangeSlope() { return !entity->getArgument(9)->isNull(); }
-IfcPlaneAngleMeasure IfcIShapeProfileDef::FlangeSlope() { return *entity->getArgument(9); }
-void IfcIShapeProfileDef::setFlangeSlope(IfcPlaneAngleMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
+double IfcIShapeProfileDef::OverallWidth() const { return *entity->getArgument(3); }
+void IfcIShapeProfileDef::setOverallWidth(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+double IfcIShapeProfileDef::OverallDepth() const { return *entity->getArgument(4); }
+void IfcIShapeProfileDef::setOverallDepth(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+double IfcIShapeProfileDef::WebThickness() const { return *entity->getArgument(5); }
+void IfcIShapeProfileDef::setWebThickness(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+double IfcIShapeProfileDef::FlangeThickness() const { return *entity->getArgument(6); }
+void IfcIShapeProfileDef::setFlangeThickness(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
+bool IfcIShapeProfileDef::hasFilletRadius() const { return !entity->getArgument(7)->isNull(); }
+double IfcIShapeProfileDef::FilletRadius() const { return *entity->getArgument(7); }
+void IfcIShapeProfileDef::setFilletRadius(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
+bool IfcIShapeProfileDef::hasFlangeEdgeRadius() const { return !entity->getArgument(8)->isNull(); }
+double IfcIShapeProfileDef::FlangeEdgeRadius() const { return *entity->getArgument(8); }
+void IfcIShapeProfileDef::setFlangeEdgeRadius(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
+bool IfcIShapeProfileDef::hasFlangeSlope() const { return !entity->getArgument(9)->isNull(); }
+double IfcIShapeProfileDef::FlangeSlope() const { return *entity->getArgument(9); }
+void IfcIShapeProfileDef::setFlangeSlope(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
 bool IfcIShapeProfileDef::is(Type::Enum v) const { return v == Type::IfcIShapeProfileDef || IfcParameterizedProfileDef::is(v); }
 Type::Enum IfcIShapeProfileDef::type() const { return Type::IfcIShapeProfileDef; }
 Type::Enum IfcIShapeProfileDef::Class() { return Type::IfcIShapeProfileDef; }
-IfcIShapeProfileDef::IfcIShapeProfileDef(IfcAbstractEntityPtr e) : IfcParameterizedProfileDef((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcIShapeProfileDef)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcIShapeProfileDef::IfcIShapeProfileDef(IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< IfcLabel > v2_ProfileName, IfcAxis2Placement2D* v3_Position, IfcPositiveLengthMeasure v4_OverallWidth, IfcPositiveLengthMeasure v5_OverallDepth, IfcPositiveLengthMeasure v6_WebThickness, IfcPositiveLengthMeasure v7_FlangeThickness, boost::optional< IfcNonNegativeLengthMeasure > v8_FilletRadius, boost::optional< IfcNonNegativeLengthMeasure > v9_FlangeEdgeRadius, boost::optional< IfcPlaneAngleMeasure > v10_FlangeSlope) : IfcParameterizedProfileDef((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,v1_ProfileType,IfcProfileTypeEnum::ToString(v1_ProfileType)); if (v2_ProfileName) { e->setArgument(1,(*v2_ProfileName)); } else { e->setArgument(1); } e->setArgument(2,(v3_Position)); e->setArgument(3,(v4_OverallWidth)); e->setArgument(4,(v5_OverallDepth)); e->setArgument(5,(v6_WebThickness)); e->setArgument(6,(v7_FlangeThickness)); if (v8_FilletRadius) { e->setArgument(7,(*v8_FilletRadius)); } else { e->setArgument(7); } if (v9_FlangeEdgeRadius) { e->setArgument(8,(*v9_FlangeEdgeRadius)); } else { e->setArgument(8); } if (v10_FlangeSlope) { e->setArgument(9,(*v10_FlangeSlope)); } else { e->setArgument(9); } entity = e; EntityBuffer::Add(this); }
+IfcIShapeProfileDef::IfcIShapeProfileDef(IfcAbstractEntity* e) : IfcParameterizedProfileDef((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcIShapeProfileDef)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcIShapeProfileDef::IfcIShapeProfileDef(IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< std::string > v2_ProfileName, IfcAxis2Placement2D* v3_Position, double v4_OverallWidth, double v5_OverallDepth, double v6_WebThickness, double v7_FlangeThickness, boost::optional< double > v8_FilletRadius, boost::optional< double > v9_FlangeEdgeRadius, boost::optional< double > v10_FlangeSlope) : IfcParameterizedProfileDef((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,v1_ProfileType,IfcProfileTypeEnum::ToString(v1_ProfileType)); if (v2_ProfileName) { e->setArgument(1,(*v2_ProfileName)); } else { e->setArgument(1); } e->setArgument(2,(v3_Position)); e->setArgument(3,(v4_OverallWidth)); e->setArgument(4,(v5_OverallDepth)); e->setArgument(5,(v6_WebThickness)); e->setArgument(6,(v7_FlangeThickness)); if (v8_FilletRadius) { e->setArgument(7,(*v8_FilletRadius)); } else { e->setArgument(7); } if (v9_FlangeEdgeRadius) { e->setArgument(8,(*v9_FlangeEdgeRadius)); } else { e->setArgument(8); } if (v10_FlangeSlope) { e->setArgument(9,(*v10_FlangeSlope)); } else { e->setArgument(9); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcImageTexture
-IfcURIReference IfcImageTexture::URLReference() { return *entity->getArgument(5); }
-void IfcImageTexture::setURLReference(IfcURIReference v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+std::string IfcImageTexture::URLReference() const { return *entity->getArgument(5); }
+void IfcImageTexture::setURLReference(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
 bool IfcImageTexture::is(Type::Enum v) const { return v == Type::IfcImageTexture || IfcSurfaceTexture::is(v); }
 Type::Enum IfcImageTexture::type() const { return Type::IfcImageTexture; }
 Type::Enum IfcImageTexture::Class() { return Type::IfcImageTexture; }
-IfcImageTexture::IfcImageTexture(IfcAbstractEntityPtr e) : IfcSurfaceTexture((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcImageTexture)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcImageTexture::IfcImageTexture(bool v1_RepeatS, bool v2_RepeatT, boost::optional< IfcIdentifier > v3_Mode, IfcCartesianTransformationOperator2D* v4_TextureTransform, boost::optional< std::vector< IfcIdentifier > /*[1:?]*/ > v5_Parameter, IfcURIReference v6_URLReference) : IfcSurfaceTexture((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_RepeatS)); e->setArgument(1,(v2_RepeatT)); if (v3_Mode) { e->setArgument(2,(*v3_Mode)); } else { e->setArgument(2); } e->setArgument(3,(v4_TextureTransform)); if (v5_Parameter) { e->setArgument(4,(*v5_Parameter)); } else { e->setArgument(4); } e->setArgument(5,(v6_URLReference)); entity = e; EntityBuffer::Add(this); }
+IfcImageTexture::IfcImageTexture(IfcAbstractEntity* e) : IfcSurfaceTexture((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcImageTexture)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcImageTexture::IfcImageTexture(bool v1_RepeatS, bool v2_RepeatT, boost::optional< std::string > v3_Mode, IfcCartesianTransformationOperator2D* v4_TextureTransform, boost::optional< std::vector< std::string > /*[1:?]*/ > v5_Parameter, std::string v6_URLReference) : IfcSurfaceTexture((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_RepeatS)); e->setArgument(1,(v2_RepeatT)); if (v3_Mode) { e->setArgument(2,(*v3_Mode)); } else { e->setArgument(2); } e->setArgument(3,(v4_TextureTransform)); if (v5_Parameter) { e->setArgument(4,(*v5_Parameter)); } else { e->setArgument(4); } e->setArgument(5,(v6_URLReference)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcIndexedColourMap
-IfcTessellatedFaceSet* IfcIndexedColourMap::MappedTo() { return (IfcTessellatedFaceSet*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(0))); }
+IfcTessellatedFaceSet* IfcIndexedColourMap::MappedTo() const { return (IfcTessellatedFaceSet*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(0))); }
 void IfcIndexedColourMap::setMappedTo(IfcTessellatedFaceSet* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-bool IfcIndexedColourMap::hasOverrides() { return !entity->getArgument(1)->isNull(); }
-IfcSurfaceStyleShading* IfcIndexedColourMap::Overrides() { return (IfcSurfaceStyleShading*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(1))); }
+bool IfcIndexedColourMap::hasOverrides() const { return !entity->getArgument(1)->isNull(); }
+IfcSurfaceStyleShading* IfcIndexedColourMap::Overrides() const { return (IfcSurfaceStyleShading*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(1))); }
 void IfcIndexedColourMap::setOverrides(IfcSurfaceStyleShading* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-IfcColourRgbList* IfcIndexedColourMap::Colours() { return (IfcColourRgbList*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(2))); }
+IfcColourRgbList* IfcIndexedColourMap::Colours() const { return (IfcColourRgbList*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(2))); }
 void IfcIndexedColourMap::setColours(IfcColourRgbList* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-std::vector< int > /*[1:?]*/ IfcIndexedColourMap::ColourIndex() { return *entity->getArgument(3); }
+std::vector< int > /*[1:?]*/ IfcIndexedColourMap::ColourIndex() const { return *entity->getArgument(3); }
 void IfcIndexedColourMap::setColourIndex(std::vector< int > /*[1:?]*/ v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
 bool IfcIndexedColourMap::is(Type::Enum v) const { return v == Type::IfcIndexedColourMap || IfcPresentationItem::is(v); }
 Type::Enum IfcIndexedColourMap::type() const { return Type::IfcIndexedColourMap; }
 Type::Enum IfcIndexedColourMap::Class() { return Type::IfcIndexedColourMap; }
-IfcIndexedColourMap::IfcIndexedColourMap(IfcAbstractEntityPtr e) : IfcPresentationItem((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcIndexedColourMap)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcIndexedColourMap::IfcIndexedColourMap(IfcTessellatedFaceSet* v1_MappedTo, IfcSurfaceStyleShading* v2_Overrides, IfcColourRgbList* v3_Colours, std::vector< int > /*[1:?]*/ v4_ColourIndex) : IfcPresentationItem((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_MappedTo)); e->setArgument(1,(v2_Overrides)); e->setArgument(2,(v3_Colours)); e->setArgument(3,(v4_ColourIndex)); entity = e; EntityBuffer::Add(this); }
+IfcIndexedColourMap::IfcIndexedColourMap(IfcAbstractEntity* e) : IfcPresentationItem((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcIndexedColourMap)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcIndexedColourMap::IfcIndexedColourMap(IfcTessellatedFaceSet* v1_MappedTo, IfcSurfaceStyleShading* v2_Overrides, IfcColourRgbList* v3_Colours, std::vector< int > /*[1:?]*/ v4_ColourIndex) : IfcPresentationItem((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_MappedTo)); e->setArgument(1,(v2_Overrides)); e->setArgument(2,(v3_Colours)); e->setArgument(3,(v4_ColourIndex)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcIndexedTextureMap
-IfcTessellatedFaceSet* IfcIndexedTextureMap::MappedTo() { return (IfcTessellatedFaceSet*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(1))); }
+IfcTessellatedFaceSet* IfcIndexedTextureMap::MappedTo() const { return (IfcTessellatedFaceSet*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(1))); }
 void IfcIndexedTextureMap::setMappedTo(IfcTessellatedFaceSet* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-IfcTextureVertexList* IfcIndexedTextureMap::TexCoords() { return (IfcTextureVertexList*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(2))); }
+IfcTextureVertexList* IfcIndexedTextureMap::TexCoords() const { return (IfcTextureVertexList*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(2))); }
 void IfcIndexedTextureMap::setTexCoords(IfcTextureVertexList* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
 bool IfcIndexedTextureMap::is(Type::Enum v) const { return v == Type::IfcIndexedTextureMap || IfcTextureCoordinate::is(v); }
 Type::Enum IfcIndexedTextureMap::type() const { return Type::IfcIndexedTextureMap; }
 Type::Enum IfcIndexedTextureMap::Class() { return Type::IfcIndexedTextureMap; }
-IfcIndexedTextureMap::IfcIndexedTextureMap(IfcAbstractEntityPtr e) : IfcTextureCoordinate((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcIndexedTextureMap)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcIndexedTextureMap::IfcIndexedTextureMap(SHARED_PTR< IfcTemplatedEntityList< IfcSurfaceTexture > > v1_Maps, IfcTessellatedFaceSet* v2_MappedTo, IfcTextureVertexList* v3_TexCoords) : IfcTextureCoordinate((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Maps)->generalize()); e->setArgument(1,(v2_MappedTo)); e->setArgument(2,(v3_TexCoords)); entity = e; EntityBuffer::Add(this); }
+IfcIndexedTextureMap::IfcIndexedTextureMap(IfcAbstractEntity* e) : IfcTextureCoordinate((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcIndexedTextureMap)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcIndexedTextureMap::IfcIndexedTextureMap(IfcTemplatedEntityList< IfcSurfaceTexture >::ptr v1_Maps, IfcTessellatedFaceSet* v2_MappedTo, IfcTextureVertexList* v3_TexCoords) : IfcTextureCoordinate((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Maps)->generalize()); e->setArgument(1,(v2_MappedTo)); e->setArgument(2,(v3_TexCoords)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcIndexedTriangleTextureMap
 bool IfcIndexedTriangleTextureMap::is(Type::Enum v) const { return v == Type::IfcIndexedTriangleTextureMap || IfcIndexedTextureMap::is(v); }
 Type::Enum IfcIndexedTriangleTextureMap::type() const { return Type::IfcIndexedTriangleTextureMap; }
 Type::Enum IfcIndexedTriangleTextureMap::Class() { return Type::IfcIndexedTriangleTextureMap; }
-IfcIndexedTriangleTextureMap::IfcIndexedTriangleTextureMap(IfcAbstractEntityPtr e) : IfcIndexedTextureMap((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcIndexedTriangleTextureMap)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcIndexedTriangleTextureMap::IfcIndexedTriangleTextureMap(SHARED_PTR< IfcTemplatedEntityList< IfcSurfaceTexture > > v1_Maps, IfcTessellatedFaceSet* v2_MappedTo, IfcTextureVertexList* v3_TexCoords) : IfcIndexedTextureMap((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Maps)->generalize()); e->setArgument(1,(v2_MappedTo)); e->setArgument(2,(v3_TexCoords)); entity = e; EntityBuffer::Add(this); }
+IfcIndexedTriangleTextureMap::IfcIndexedTriangleTextureMap(IfcAbstractEntity* e) : IfcIndexedTextureMap((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcIndexedTriangleTextureMap)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcIndexedTriangleTextureMap::IfcIndexedTriangleTextureMap(IfcTemplatedEntityList< IfcSurfaceTexture >::ptr v1_Maps, IfcTessellatedFaceSet* v2_MappedTo, IfcTextureVertexList* v3_TexCoords) : IfcIndexedTextureMap((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Maps)->generalize()); e->setArgument(1,(v2_MappedTo)); e->setArgument(2,(v3_TexCoords)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcInterceptor
-bool IfcInterceptor::hasPredefinedType() { return !entity->getArgument(8)->isNull(); }
-IfcInterceptorTypeEnum::IfcInterceptorTypeEnum IfcInterceptor::PredefinedType() { return IfcInterceptorTypeEnum::FromString(*entity->getArgument(8)); }
+bool IfcInterceptor::hasPredefinedType() const { return !entity->getArgument(8)->isNull(); }
+IfcInterceptorTypeEnum::IfcInterceptorTypeEnum IfcInterceptor::PredefinedType() const { return IfcInterceptorTypeEnum::FromString(*entity->getArgument(8)); }
 void IfcInterceptor::setPredefinedType(IfcInterceptorTypeEnum::IfcInterceptorTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcInterceptorTypeEnum::ToString(v)); }
 bool IfcInterceptor::is(Type::Enum v) const { return v == Type::IfcInterceptor || IfcFlowTreatmentDevice::is(v); }
 Type::Enum IfcInterceptor::type() const { return Type::IfcInterceptor; }
 Type::Enum IfcInterceptor::Class() { return Type::IfcInterceptor; }
-IfcInterceptor::IfcInterceptor(IfcAbstractEntityPtr e) : IfcFlowTreatmentDevice((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcInterceptor)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcInterceptor::IfcInterceptor(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcInterceptorTypeEnum::IfcInterceptorTypeEnum > v9_PredefinedType) : IfcFlowTreatmentDevice((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcInterceptorTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcInterceptor::IfcInterceptor(IfcAbstractEntity* e) : IfcFlowTreatmentDevice((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcInterceptor)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcInterceptor::IfcInterceptor(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcInterceptorTypeEnum::IfcInterceptorTypeEnum > v9_PredefinedType) : IfcFlowTreatmentDevice((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcInterceptorTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcInterceptorType
-IfcInterceptorTypeEnum::IfcInterceptorTypeEnum IfcInterceptorType::PredefinedType() { return IfcInterceptorTypeEnum::FromString(*entity->getArgument(9)); }
+IfcInterceptorTypeEnum::IfcInterceptorTypeEnum IfcInterceptorType::PredefinedType() const { return IfcInterceptorTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcInterceptorType::setPredefinedType(IfcInterceptorTypeEnum::IfcInterceptorTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcInterceptorTypeEnum::ToString(v)); }
 bool IfcInterceptorType::is(Type::Enum v) const { return v == Type::IfcInterceptorType || IfcFlowTreatmentDeviceType::is(v); }
 Type::Enum IfcInterceptorType::type() const { return Type::IfcInterceptorType; }
 Type::Enum IfcInterceptorType::Class() { return Type::IfcInterceptorType; }
-IfcInterceptorType::IfcInterceptorType(IfcAbstractEntityPtr e) : IfcFlowTreatmentDeviceType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcInterceptorType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcInterceptorType::IfcInterceptorType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcInterceptorTypeEnum::IfcInterceptorTypeEnum v10_PredefinedType) : IfcFlowTreatmentDeviceType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcInterceptorTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcInterceptorType::IfcInterceptorType(IfcAbstractEntity* e) : IfcFlowTreatmentDeviceType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcInterceptorType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcInterceptorType::IfcInterceptorType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcInterceptorTypeEnum::IfcInterceptorTypeEnum v10_PredefinedType) : IfcFlowTreatmentDeviceType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcInterceptorTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcInventory
-bool IfcInventory::hasPredefinedType() { return !entity->getArgument(5)->isNull(); }
-IfcInventoryTypeEnum::IfcInventoryTypeEnum IfcInventory::PredefinedType() { return IfcInventoryTypeEnum::FromString(*entity->getArgument(5)); }
+bool IfcInventory::hasPredefinedType() const { return !entity->getArgument(5)->isNull(); }
+IfcInventoryTypeEnum::IfcInventoryTypeEnum IfcInventory::PredefinedType() const { return IfcInventoryTypeEnum::FromString(*entity->getArgument(5)); }
 void IfcInventory::setPredefinedType(IfcInventoryTypeEnum::IfcInventoryTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v,IfcInventoryTypeEnum::ToString(v)); }
-bool IfcInventory::hasJurisdiction() { return !entity->getArgument(6)->isNull(); }
-IfcActorSelect IfcInventory::Jurisdiction() { return *entity->getArgument(6); }
-void IfcInventory::setJurisdiction(IfcActorSelect v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
-bool IfcInventory::hasResponsiblePersons() { return !entity->getArgument(7)->isNull(); }
-SHARED_PTR< IfcTemplatedEntityList< IfcPerson > > IfcInventory::ResponsiblePersons() { RETURN_AS_LIST(IfcPerson,7) }
-void IfcInventory::setResponsiblePersons(SHARED_PTR< IfcTemplatedEntityList< IfcPerson > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v->generalize()); }
-bool IfcInventory::hasLastUpdateDate() { return !entity->getArgument(8)->isNull(); }
-IfcDate IfcInventory::LastUpdateDate() { return *entity->getArgument(8); }
-void IfcInventory::setLastUpdateDate(IfcDate v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
-bool IfcInventory::hasCurrentValue() { return !entity->getArgument(9)->isNull(); }
-IfcCostValue* IfcInventory::CurrentValue() { return (IfcCostValue*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(9))); }
+bool IfcInventory::hasJurisdiction() const { return !entity->getArgument(6)->isNull(); }
+IfcActorSelect* IfcInventory::Jurisdiction() const { return (IfcActorSelect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(6))); }
+void IfcInventory::setJurisdiction(IfcActorSelect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
+bool IfcInventory::hasResponsiblePersons() const { return !entity->getArgument(7)->isNull(); }
+IfcTemplatedEntityList< IfcPerson >::ptr IfcInventory::ResponsiblePersons() const { IfcEntityList::ptr es = *entity->getArgument(7); return es->as<IfcPerson>(); }
+void IfcInventory::setResponsiblePersons(IfcTemplatedEntityList< IfcPerson >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v->generalize()); }
+bool IfcInventory::hasLastUpdateDate() const { return !entity->getArgument(8)->isNull(); }
+std::string IfcInventory::LastUpdateDate() const { return *entity->getArgument(8); }
+void IfcInventory::setLastUpdateDate(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
+bool IfcInventory::hasCurrentValue() const { return !entity->getArgument(9)->isNull(); }
+IfcCostValue* IfcInventory::CurrentValue() const { return (IfcCostValue*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(9))); }
 void IfcInventory::setCurrentValue(IfcCostValue* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
-bool IfcInventory::hasOriginalValue() { return !entity->getArgument(10)->isNull(); }
-IfcCostValue* IfcInventory::OriginalValue() { return (IfcCostValue*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(10))); }
+bool IfcInventory::hasOriginalValue() const { return !entity->getArgument(10)->isNull(); }
+IfcCostValue* IfcInventory::OriginalValue() const { return (IfcCostValue*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(10))); }
 void IfcInventory::setOriginalValue(IfcCostValue* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
 bool IfcInventory::is(Type::Enum v) const { return v == Type::IfcInventory || IfcGroup::is(v); }
 Type::Enum IfcInventory::type() const { return Type::IfcInventory; }
 Type::Enum IfcInventory::Class() { return Type::IfcInventory; }
-IfcInventory::IfcInventory(IfcAbstractEntityPtr e) : IfcGroup((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcInventory)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcInventory::IfcInventory(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, boost::optional< IfcInventoryTypeEnum::IfcInventoryTypeEnum > v6_PredefinedType, boost::optional< IfcActorSelect > v7_Jurisdiction, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPerson > > > v8_ResponsiblePersons, boost::optional< IfcDate > v9_LastUpdateDate, IfcCostValue* v10_CurrentValue, IfcCostValue* v11_OriginalValue) : IfcGroup((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } if (v6_PredefinedType) { e->setArgument(5,*v6_PredefinedType,IfcInventoryTypeEnum::ToString(*v6_PredefinedType)); } else { e->setArgument(5); } if (v7_Jurisdiction) { e->setArgument(6,(*v7_Jurisdiction)); } else { e->setArgument(6); } if (v8_ResponsiblePersons) { e->setArgument(7,(*v8_ResponsiblePersons)->generalize()); } else { e->setArgument(7); } if (v9_LastUpdateDate) { e->setArgument(8,(*v9_LastUpdateDate)); } else { e->setArgument(8); } e->setArgument(9,(v10_CurrentValue)); e->setArgument(10,(v11_OriginalValue)); entity = e; EntityBuffer::Add(this); }
+IfcInventory::IfcInventory(IfcAbstractEntity* e) : IfcGroup((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcInventory)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcInventory::IfcInventory(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, boost::optional< IfcInventoryTypeEnum::IfcInventoryTypeEnum > v6_PredefinedType, IfcActorSelect* v7_Jurisdiction, boost::optional< IfcTemplatedEntityList< IfcPerson >::ptr > v8_ResponsiblePersons, boost::optional< std::string > v9_LastUpdateDate, IfcCostValue* v10_CurrentValue, IfcCostValue* v11_OriginalValue) : IfcGroup((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } if (v6_PredefinedType) { e->setArgument(5,*v6_PredefinedType,IfcInventoryTypeEnum::ToString(*v6_PredefinedType)); } else { e->setArgument(5); } e->setArgument(6,(v7_Jurisdiction)); if (v8_ResponsiblePersons) { e->setArgument(7,(*v8_ResponsiblePersons)->generalize()); } else { e->setArgument(7); } if (v9_LastUpdateDate) { e->setArgument(8,(*v9_LastUpdateDate)); } else { e->setArgument(8); } e->setArgument(9,(v10_CurrentValue)); e->setArgument(10,(v11_OriginalValue)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcIrregularTimeSeries
-SHARED_PTR< IfcTemplatedEntityList< IfcIrregularTimeSeriesValue > > IfcIrregularTimeSeries::Values() { RETURN_AS_LIST(IfcIrregularTimeSeriesValue,8) }
-void IfcIrregularTimeSeries::setValues(SHARED_PTR< IfcTemplatedEntityList< IfcIrregularTimeSeriesValue > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v->generalize()); }
+IfcTemplatedEntityList< IfcIrregularTimeSeriesValue >::ptr IfcIrregularTimeSeries::Values() const { IfcEntityList::ptr es = *entity->getArgument(8); return es->as<IfcIrregularTimeSeriesValue>(); }
+void IfcIrregularTimeSeries::setValues(IfcTemplatedEntityList< IfcIrregularTimeSeriesValue >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v->generalize()); }
 bool IfcIrregularTimeSeries::is(Type::Enum v) const { return v == Type::IfcIrregularTimeSeries || IfcTimeSeries::is(v); }
 Type::Enum IfcIrregularTimeSeries::type() const { return Type::IfcIrregularTimeSeries; }
 Type::Enum IfcIrregularTimeSeries::Class() { return Type::IfcIrregularTimeSeries; }
-IfcIrregularTimeSeries::IfcIrregularTimeSeries(IfcAbstractEntityPtr e) : IfcTimeSeries((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcIrregularTimeSeries)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcIrregularTimeSeries::IfcIrregularTimeSeries(IfcLabel v1_Name, boost::optional< IfcText > v2_Description, IfcDateTime v3_StartTime, IfcDateTime v4_EndTime, IfcTimeSeriesDataTypeEnum::IfcTimeSeriesDataTypeEnum v5_TimeSeriesDataType, IfcDataOriginEnum::IfcDataOriginEnum v6_DataOrigin, boost::optional< IfcLabel > v7_UserDefinedDataOrigin, boost::optional< IfcUnit > v8_Unit, SHARED_PTR< IfcTemplatedEntityList< IfcIrregularTimeSeriesValue > > v9_Values) : IfcTimeSeries((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_StartTime)); e->setArgument(3,(v4_EndTime)); e->setArgument(4,v5_TimeSeriesDataType,IfcTimeSeriesDataTypeEnum::ToString(v5_TimeSeriesDataType)); e->setArgument(5,v6_DataOrigin,IfcDataOriginEnum::ToString(v6_DataOrigin)); if (v7_UserDefinedDataOrigin) { e->setArgument(6,(*v7_UserDefinedDataOrigin)); } else { e->setArgument(6); } if (v8_Unit) { e->setArgument(7,(*v8_Unit)); } else { e->setArgument(7); } e->setArgument(8,(v9_Values)->generalize()); entity = e; EntityBuffer::Add(this); }
+IfcIrregularTimeSeries::IfcIrregularTimeSeries(IfcAbstractEntity* e) : IfcTimeSeries((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcIrregularTimeSeries)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcIrregularTimeSeries::IfcIrregularTimeSeries(std::string v1_Name, boost::optional< std::string > v2_Description, std::string v3_StartTime, std::string v4_EndTime, IfcTimeSeriesDataTypeEnum::IfcTimeSeriesDataTypeEnum v5_TimeSeriesDataType, IfcDataOriginEnum::IfcDataOriginEnum v6_DataOrigin, boost::optional< std::string > v7_UserDefinedDataOrigin, IfcUnit* v8_Unit, IfcTemplatedEntityList< IfcIrregularTimeSeriesValue >::ptr v9_Values) : IfcTimeSeries((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_StartTime)); e->setArgument(3,(v4_EndTime)); e->setArgument(4,v5_TimeSeriesDataType,IfcTimeSeriesDataTypeEnum::ToString(v5_TimeSeriesDataType)); e->setArgument(5,v6_DataOrigin,IfcDataOriginEnum::ToString(v6_DataOrigin)); if (v7_UserDefinedDataOrigin) { e->setArgument(6,(*v7_UserDefinedDataOrigin)); } else { e->setArgument(6); } e->setArgument(7,(v8_Unit)); e->setArgument(8,(v9_Values)->generalize()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcIrregularTimeSeriesValue
-IfcDateTime IfcIrregularTimeSeriesValue::TimeStamp() { return *entity->getArgument(0); }
-void IfcIrregularTimeSeriesValue::setTimeStamp(IfcDateTime v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > IfcIrregularTimeSeriesValue::ListValues() { RETURN_AS_LIST(IfcUtil::IfcAbstractSelect,1) }
-void IfcIrregularTimeSeriesValue::setListValues(SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v->generalize()); }
+std::string IfcIrregularTimeSeriesValue::TimeStamp() const { return *entity->getArgument(0); }
+void IfcIrregularTimeSeriesValue::setTimeStamp(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+IfcEntityList::ptr IfcIrregularTimeSeriesValue::ListValues() const { return *entity->getArgument(1); }
+void IfcIrregularTimeSeriesValue::setListValues(IfcEntityList::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
 bool IfcIrregularTimeSeriesValue::is(Type::Enum v) const { return v == Type::IfcIrregularTimeSeriesValue; }
 Type::Enum IfcIrregularTimeSeriesValue::type() const { return Type::IfcIrregularTimeSeriesValue; }
 Type::Enum IfcIrregularTimeSeriesValue::Class() { return Type::IfcIrregularTimeSeriesValue; }
-IfcIrregularTimeSeriesValue::IfcIrregularTimeSeriesValue(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcIrregularTimeSeriesValue)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcIrregularTimeSeriesValue::IfcIrregularTimeSeriesValue(IfcDateTime v1_TimeStamp, IfcEntities v2_ListValues) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_TimeStamp)); e->setArgument(1,(v2_ListValues)); entity = e; EntityBuffer::Add(this); }
+IfcIrregularTimeSeriesValue::IfcIrregularTimeSeriesValue(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcIrregularTimeSeriesValue)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcIrregularTimeSeriesValue::IfcIrregularTimeSeriesValue(std::string v1_TimeStamp, IfcEntityList::ptr v2_ListValues) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_TimeStamp)); e->setArgument(1,(v2_ListValues)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcJunctionBox
-bool IfcJunctionBox::hasPredefinedType() { return !entity->getArgument(8)->isNull(); }
-IfcJunctionBoxTypeEnum::IfcJunctionBoxTypeEnum IfcJunctionBox::PredefinedType() { return IfcJunctionBoxTypeEnum::FromString(*entity->getArgument(8)); }
+bool IfcJunctionBox::hasPredefinedType() const { return !entity->getArgument(8)->isNull(); }
+IfcJunctionBoxTypeEnum::IfcJunctionBoxTypeEnum IfcJunctionBox::PredefinedType() const { return IfcJunctionBoxTypeEnum::FromString(*entity->getArgument(8)); }
 void IfcJunctionBox::setPredefinedType(IfcJunctionBoxTypeEnum::IfcJunctionBoxTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcJunctionBoxTypeEnum::ToString(v)); }
 bool IfcJunctionBox::is(Type::Enum v) const { return v == Type::IfcJunctionBox || IfcFlowFitting::is(v); }
 Type::Enum IfcJunctionBox::type() const { return Type::IfcJunctionBox; }
 Type::Enum IfcJunctionBox::Class() { return Type::IfcJunctionBox; }
-IfcJunctionBox::IfcJunctionBox(IfcAbstractEntityPtr e) : IfcFlowFitting((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcJunctionBox)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcJunctionBox::IfcJunctionBox(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcJunctionBoxTypeEnum::IfcJunctionBoxTypeEnum > v9_PredefinedType) : IfcFlowFitting((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcJunctionBoxTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcJunctionBox::IfcJunctionBox(IfcAbstractEntity* e) : IfcFlowFitting((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcJunctionBox)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcJunctionBox::IfcJunctionBox(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcJunctionBoxTypeEnum::IfcJunctionBoxTypeEnum > v9_PredefinedType) : IfcFlowFitting((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcJunctionBoxTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcJunctionBoxType
-IfcJunctionBoxTypeEnum::IfcJunctionBoxTypeEnum IfcJunctionBoxType::PredefinedType() { return IfcJunctionBoxTypeEnum::FromString(*entity->getArgument(9)); }
+IfcJunctionBoxTypeEnum::IfcJunctionBoxTypeEnum IfcJunctionBoxType::PredefinedType() const { return IfcJunctionBoxTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcJunctionBoxType::setPredefinedType(IfcJunctionBoxTypeEnum::IfcJunctionBoxTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcJunctionBoxTypeEnum::ToString(v)); }
 bool IfcJunctionBoxType::is(Type::Enum v) const { return v == Type::IfcJunctionBoxType || IfcFlowFittingType::is(v); }
 Type::Enum IfcJunctionBoxType::type() const { return Type::IfcJunctionBoxType; }
 Type::Enum IfcJunctionBoxType::Class() { return Type::IfcJunctionBoxType; }
-IfcJunctionBoxType::IfcJunctionBoxType(IfcAbstractEntityPtr e) : IfcFlowFittingType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcJunctionBoxType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcJunctionBoxType::IfcJunctionBoxType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcJunctionBoxTypeEnum::IfcJunctionBoxTypeEnum v10_PredefinedType) : IfcFlowFittingType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcJunctionBoxTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcJunctionBoxType::IfcJunctionBoxType(IfcAbstractEntity* e) : IfcFlowFittingType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcJunctionBoxType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcJunctionBoxType::IfcJunctionBoxType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcJunctionBoxTypeEnum::IfcJunctionBoxTypeEnum v10_PredefinedType) : IfcFlowFittingType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcJunctionBoxTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcLShapeProfileDef
-IfcPositiveLengthMeasure IfcLShapeProfileDef::Depth() { return *entity->getArgument(3); }
-void IfcLShapeProfileDef::setDepth(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-bool IfcLShapeProfileDef::hasWidth() { return !entity->getArgument(4)->isNull(); }
-IfcPositiveLengthMeasure IfcLShapeProfileDef::Width() { return *entity->getArgument(4); }
-void IfcLShapeProfileDef::setWidth(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-IfcPositiveLengthMeasure IfcLShapeProfileDef::Thickness() { return *entity->getArgument(5); }
-void IfcLShapeProfileDef::setThickness(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-bool IfcLShapeProfileDef::hasFilletRadius() { return !entity->getArgument(6)->isNull(); }
-IfcNonNegativeLengthMeasure IfcLShapeProfileDef::FilletRadius() { return *entity->getArgument(6); }
-void IfcLShapeProfileDef::setFilletRadius(IfcNonNegativeLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
-bool IfcLShapeProfileDef::hasEdgeRadius() { return !entity->getArgument(7)->isNull(); }
-IfcNonNegativeLengthMeasure IfcLShapeProfileDef::EdgeRadius() { return *entity->getArgument(7); }
-void IfcLShapeProfileDef::setEdgeRadius(IfcNonNegativeLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
-bool IfcLShapeProfileDef::hasLegSlope() { return !entity->getArgument(8)->isNull(); }
-IfcPlaneAngleMeasure IfcLShapeProfileDef::LegSlope() { return *entity->getArgument(8); }
-void IfcLShapeProfileDef::setLegSlope(IfcPlaneAngleMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
+double IfcLShapeProfileDef::Depth() const { return *entity->getArgument(3); }
+void IfcLShapeProfileDef::setDepth(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+bool IfcLShapeProfileDef::hasWidth() const { return !entity->getArgument(4)->isNull(); }
+double IfcLShapeProfileDef::Width() const { return *entity->getArgument(4); }
+void IfcLShapeProfileDef::setWidth(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+double IfcLShapeProfileDef::Thickness() const { return *entity->getArgument(5); }
+void IfcLShapeProfileDef::setThickness(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+bool IfcLShapeProfileDef::hasFilletRadius() const { return !entity->getArgument(6)->isNull(); }
+double IfcLShapeProfileDef::FilletRadius() const { return *entity->getArgument(6); }
+void IfcLShapeProfileDef::setFilletRadius(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
+bool IfcLShapeProfileDef::hasEdgeRadius() const { return !entity->getArgument(7)->isNull(); }
+double IfcLShapeProfileDef::EdgeRadius() const { return *entity->getArgument(7); }
+void IfcLShapeProfileDef::setEdgeRadius(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
+bool IfcLShapeProfileDef::hasLegSlope() const { return !entity->getArgument(8)->isNull(); }
+double IfcLShapeProfileDef::LegSlope() const { return *entity->getArgument(8); }
+void IfcLShapeProfileDef::setLegSlope(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
 bool IfcLShapeProfileDef::is(Type::Enum v) const { return v == Type::IfcLShapeProfileDef || IfcParameterizedProfileDef::is(v); }
 Type::Enum IfcLShapeProfileDef::type() const { return Type::IfcLShapeProfileDef; }
 Type::Enum IfcLShapeProfileDef::Class() { return Type::IfcLShapeProfileDef; }
-IfcLShapeProfileDef::IfcLShapeProfileDef(IfcAbstractEntityPtr e) : IfcParameterizedProfileDef((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcLShapeProfileDef)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcLShapeProfileDef::IfcLShapeProfileDef(IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< IfcLabel > v2_ProfileName, IfcAxis2Placement2D* v3_Position, IfcPositiveLengthMeasure v4_Depth, boost::optional< IfcPositiveLengthMeasure > v5_Width, IfcPositiveLengthMeasure v6_Thickness, boost::optional< IfcNonNegativeLengthMeasure > v7_FilletRadius, boost::optional< IfcNonNegativeLengthMeasure > v8_EdgeRadius, boost::optional< IfcPlaneAngleMeasure > v9_LegSlope) : IfcParameterizedProfileDef((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,v1_ProfileType,IfcProfileTypeEnum::ToString(v1_ProfileType)); if (v2_ProfileName) { e->setArgument(1,(*v2_ProfileName)); } else { e->setArgument(1); } e->setArgument(2,(v3_Position)); e->setArgument(3,(v4_Depth)); if (v5_Width) { e->setArgument(4,(*v5_Width)); } else { e->setArgument(4); } e->setArgument(5,(v6_Thickness)); if (v7_FilletRadius) { e->setArgument(6,(*v7_FilletRadius)); } else { e->setArgument(6); } if (v8_EdgeRadius) { e->setArgument(7,(*v8_EdgeRadius)); } else { e->setArgument(7); } if (v9_LegSlope) { e->setArgument(8,(*v9_LegSlope)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcLShapeProfileDef::IfcLShapeProfileDef(IfcAbstractEntity* e) : IfcParameterizedProfileDef((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcLShapeProfileDef)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcLShapeProfileDef::IfcLShapeProfileDef(IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< std::string > v2_ProfileName, IfcAxis2Placement2D* v3_Position, double v4_Depth, boost::optional< double > v5_Width, double v6_Thickness, boost::optional< double > v7_FilletRadius, boost::optional< double > v8_EdgeRadius, boost::optional< double > v9_LegSlope) : IfcParameterizedProfileDef((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,v1_ProfileType,IfcProfileTypeEnum::ToString(v1_ProfileType)); if (v2_ProfileName) { e->setArgument(1,(*v2_ProfileName)); } else { e->setArgument(1); } e->setArgument(2,(v3_Position)); e->setArgument(3,(v4_Depth)); if (v5_Width) { e->setArgument(4,(*v5_Width)); } else { e->setArgument(4); } e->setArgument(5,(v6_Thickness)); if (v7_FilletRadius) { e->setArgument(6,(*v7_FilletRadius)); } else { e->setArgument(6); } if (v8_EdgeRadius) { e->setArgument(7,(*v8_EdgeRadius)); } else { e->setArgument(7); } if (v9_LegSlope) { e->setArgument(8,(*v9_LegSlope)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcLaborResource
-bool IfcLaborResource::hasPredefinedType() { return !entity->getArgument(10)->isNull(); }
-IfcLaborResourceTypeEnum::IfcLaborResourceTypeEnum IfcLaborResource::PredefinedType() { return IfcLaborResourceTypeEnum::FromString(*entity->getArgument(10)); }
+bool IfcLaborResource::hasPredefinedType() const { return !entity->getArgument(10)->isNull(); }
+IfcLaborResourceTypeEnum::IfcLaborResourceTypeEnum IfcLaborResource::PredefinedType() const { return IfcLaborResourceTypeEnum::FromString(*entity->getArgument(10)); }
 void IfcLaborResource::setPredefinedType(IfcLaborResourceTypeEnum::IfcLaborResourceTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v,IfcLaborResourceTypeEnum::ToString(v)); }
 bool IfcLaborResource::is(Type::Enum v) const { return v == Type::IfcLaborResource || IfcConstructionResource::is(v); }
 Type::Enum IfcLaborResource::type() const { return Type::IfcLaborResource; }
 Type::Enum IfcLaborResource::Class() { return Type::IfcLaborResource; }
-IfcLaborResource::IfcLaborResource(IfcAbstractEntityPtr e) : IfcConstructionResource((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcLaborResource)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcLaborResource::IfcLaborResource(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, boost::optional< IfcIdentifier > v6_Identification, boost::optional< IfcText > v7_LongDescription, IfcResourceTime* v8_Usage, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcAppliedValue > > > v9_BaseCosts, IfcPhysicalQuantity* v10_BaseQuantity, boost::optional< IfcLaborResourceTypeEnum::IfcLaborResourceTypeEnum > v11_PredefinedType) : IfcConstructionResource((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } if (v6_Identification) { e->setArgument(5,(*v6_Identification)); } else { e->setArgument(5); } if (v7_LongDescription) { e->setArgument(6,(*v7_LongDescription)); } else { e->setArgument(6); } e->setArgument(7,(v8_Usage)); if (v9_BaseCosts) { e->setArgument(8,(*v9_BaseCosts)->generalize()); } else { e->setArgument(8); } e->setArgument(9,(v10_BaseQuantity)); if (v11_PredefinedType) { e->setArgument(10,*v11_PredefinedType,IfcLaborResourceTypeEnum::ToString(*v11_PredefinedType)); } else { e->setArgument(10); } entity = e; EntityBuffer::Add(this); }
+IfcLaborResource::IfcLaborResource(IfcAbstractEntity* e) : IfcConstructionResource((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcLaborResource)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcLaborResource::IfcLaborResource(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, boost::optional< std::string > v6_Identification, boost::optional< std::string > v7_LongDescription, IfcResourceTime* v8_Usage, boost::optional< IfcTemplatedEntityList< IfcAppliedValue >::ptr > v9_BaseCosts, IfcPhysicalQuantity* v10_BaseQuantity, boost::optional< IfcLaborResourceTypeEnum::IfcLaborResourceTypeEnum > v11_PredefinedType) : IfcConstructionResource((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } if (v6_Identification) { e->setArgument(5,(*v6_Identification)); } else { e->setArgument(5); } if (v7_LongDescription) { e->setArgument(6,(*v7_LongDescription)); } else { e->setArgument(6); } e->setArgument(7,(v8_Usage)); if (v9_BaseCosts) { e->setArgument(8,(*v9_BaseCosts)->generalize()); } else { e->setArgument(8); } e->setArgument(9,(v10_BaseQuantity)); if (v11_PredefinedType) { e->setArgument(10,*v11_PredefinedType,IfcLaborResourceTypeEnum::ToString(*v11_PredefinedType)); } else { e->setArgument(10); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcLaborResourceType
-IfcLaborResourceTypeEnum::IfcLaborResourceTypeEnum IfcLaborResourceType::PredefinedType() { return IfcLaborResourceTypeEnum::FromString(*entity->getArgument(11)); }
+IfcLaborResourceTypeEnum::IfcLaborResourceTypeEnum IfcLaborResourceType::PredefinedType() const { return IfcLaborResourceTypeEnum::FromString(*entity->getArgument(11)); }
 void IfcLaborResourceType::setPredefinedType(IfcLaborResourceTypeEnum::IfcLaborResourceTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(11,v,IfcLaborResourceTypeEnum::ToString(v)); }
 bool IfcLaborResourceType::is(Type::Enum v) const { return v == Type::IfcLaborResourceType || IfcConstructionResourceType::is(v); }
 Type::Enum IfcLaborResourceType::type() const { return Type::IfcLaborResourceType; }
 Type::Enum IfcLaborResourceType::Class() { return Type::IfcLaborResourceType; }
-IfcLaborResourceType::IfcLaborResourceType(IfcAbstractEntityPtr e) : IfcConstructionResourceType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcLaborResourceType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcLaborResourceType::IfcLaborResourceType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< IfcIdentifier > v7_Identification, boost::optional< IfcText > v8_LongDescription, boost::optional< IfcLabel > v9_ResourceType, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcAppliedValue > > > v10_BaseCosts, IfcPhysicalQuantity* v11_BaseQuantity, IfcLaborResourceTypeEnum::IfcLaborResourceTypeEnum v12_PredefinedType) : IfcConstructionResourceType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_Identification) { e->setArgument(6,(*v7_Identification)); } else { e->setArgument(6); } if (v8_LongDescription) { e->setArgument(7,(*v8_LongDescription)); } else { e->setArgument(7); } if (v9_ResourceType) { e->setArgument(8,(*v9_ResourceType)); } else { e->setArgument(8); } if (v10_BaseCosts) { e->setArgument(9,(*v10_BaseCosts)->generalize()); } else { e->setArgument(9); } e->setArgument(10,(v11_BaseQuantity)); e->setArgument(11,v12_PredefinedType,IfcLaborResourceTypeEnum::ToString(v12_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcLaborResourceType::IfcLaborResourceType(IfcAbstractEntity* e) : IfcConstructionResourceType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcLaborResourceType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcLaborResourceType::IfcLaborResourceType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< std::string > v7_Identification, boost::optional< std::string > v8_LongDescription, boost::optional< std::string > v9_ResourceType, boost::optional< IfcTemplatedEntityList< IfcAppliedValue >::ptr > v10_BaseCosts, IfcPhysicalQuantity* v11_BaseQuantity, IfcLaborResourceTypeEnum::IfcLaborResourceTypeEnum v12_PredefinedType) : IfcConstructionResourceType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_Identification) { e->setArgument(6,(*v7_Identification)); } else { e->setArgument(6); } if (v8_LongDescription) { e->setArgument(7,(*v8_LongDescription)); } else { e->setArgument(7); } if (v9_ResourceType) { e->setArgument(8,(*v9_ResourceType)); } else { e->setArgument(8); } if (v10_BaseCosts) { e->setArgument(9,(*v10_BaseCosts)->generalize()); } else { e->setArgument(9); } e->setArgument(10,(v11_BaseQuantity)); e->setArgument(11,v12_PredefinedType,IfcLaborResourceTypeEnum::ToString(v12_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcLagTime
-IfcTimeOrRatioSelect IfcLagTime::LagValue() { return *entity->getArgument(3); }
-void IfcLagTime::setLagValue(IfcTimeOrRatioSelect v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-IfcTaskDurationEnum::IfcTaskDurationEnum IfcLagTime::DurationType() { return IfcTaskDurationEnum::FromString(*entity->getArgument(4)); }
+IfcTimeOrRatioSelect* IfcLagTime::LagValue() const { return (IfcTimeOrRatioSelect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(3))); }
+void IfcLagTime::setLagValue(IfcTimeOrRatioSelect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+IfcTaskDurationEnum::IfcTaskDurationEnum IfcLagTime::DurationType() const { return IfcTaskDurationEnum::FromString(*entity->getArgument(4)); }
 void IfcLagTime::setDurationType(IfcTaskDurationEnum::IfcTaskDurationEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v,IfcTaskDurationEnum::ToString(v)); }
 bool IfcLagTime::is(Type::Enum v) const { return v == Type::IfcLagTime || IfcSchedulingTime::is(v); }
 Type::Enum IfcLagTime::type() const { return Type::IfcLagTime; }
 Type::Enum IfcLagTime::Class() { return Type::IfcLagTime; }
-IfcLagTime::IfcLagTime(IfcAbstractEntityPtr e) : IfcSchedulingTime((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcLagTime)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcLagTime::IfcLagTime(boost::optional< IfcLabel > v1_Name, boost::optional< IfcDataOriginEnum::IfcDataOriginEnum > v2_DataOrigin, boost::optional< IfcLabel > v3_UserDefinedDataOrigin, IfcTimeOrRatioSelect v4_LagValue, IfcTaskDurationEnum::IfcTaskDurationEnum v5_DurationType) : IfcSchedulingTime((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_DataOrigin) { e->setArgument(1,*v2_DataOrigin,IfcDataOriginEnum::ToString(*v2_DataOrigin)); } else { e->setArgument(1); } if (v3_UserDefinedDataOrigin) { e->setArgument(2,(*v3_UserDefinedDataOrigin)); } else { e->setArgument(2); } e->setArgument(3,(v4_LagValue)); e->setArgument(4,v5_DurationType,IfcTaskDurationEnum::ToString(v5_DurationType)); entity = e; EntityBuffer::Add(this); }
+IfcLagTime::IfcLagTime(IfcAbstractEntity* e) : IfcSchedulingTime((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcLagTime)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcLagTime::IfcLagTime(boost::optional< std::string > v1_Name, boost::optional< IfcDataOriginEnum::IfcDataOriginEnum > v2_DataOrigin, boost::optional< std::string > v3_UserDefinedDataOrigin, IfcTimeOrRatioSelect* v4_LagValue, IfcTaskDurationEnum::IfcTaskDurationEnum v5_DurationType) : IfcSchedulingTime((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_DataOrigin) { e->setArgument(1,*v2_DataOrigin,IfcDataOriginEnum::ToString(*v2_DataOrigin)); } else { e->setArgument(1); } if (v3_UserDefinedDataOrigin) { e->setArgument(2,(*v3_UserDefinedDataOrigin)); } else { e->setArgument(2); } e->setArgument(3,(v4_LagValue)); e->setArgument(4,v5_DurationType,IfcTaskDurationEnum::ToString(v5_DurationType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcLamp
-bool IfcLamp::hasPredefinedType() { return !entity->getArgument(8)->isNull(); }
-IfcLampTypeEnum::IfcLampTypeEnum IfcLamp::PredefinedType() { return IfcLampTypeEnum::FromString(*entity->getArgument(8)); }
+bool IfcLamp::hasPredefinedType() const { return !entity->getArgument(8)->isNull(); }
+IfcLampTypeEnum::IfcLampTypeEnum IfcLamp::PredefinedType() const { return IfcLampTypeEnum::FromString(*entity->getArgument(8)); }
 void IfcLamp::setPredefinedType(IfcLampTypeEnum::IfcLampTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcLampTypeEnum::ToString(v)); }
 bool IfcLamp::is(Type::Enum v) const { return v == Type::IfcLamp || IfcFlowTerminal::is(v); }
 Type::Enum IfcLamp::type() const { return Type::IfcLamp; }
 Type::Enum IfcLamp::Class() { return Type::IfcLamp; }
-IfcLamp::IfcLamp(IfcAbstractEntityPtr e) : IfcFlowTerminal((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcLamp)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcLamp::IfcLamp(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcLampTypeEnum::IfcLampTypeEnum > v9_PredefinedType) : IfcFlowTerminal((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcLampTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcLamp::IfcLamp(IfcAbstractEntity* e) : IfcFlowTerminal((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcLamp)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcLamp::IfcLamp(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcLampTypeEnum::IfcLampTypeEnum > v9_PredefinedType) : IfcFlowTerminal((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcLampTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcLampType
-IfcLampTypeEnum::IfcLampTypeEnum IfcLampType::PredefinedType() { return IfcLampTypeEnum::FromString(*entity->getArgument(9)); }
+IfcLampTypeEnum::IfcLampTypeEnum IfcLampType::PredefinedType() const { return IfcLampTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcLampType::setPredefinedType(IfcLampTypeEnum::IfcLampTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcLampTypeEnum::ToString(v)); }
 bool IfcLampType::is(Type::Enum v) const { return v == Type::IfcLampType || IfcFlowTerminalType::is(v); }
 Type::Enum IfcLampType::type() const { return Type::IfcLampType; }
 Type::Enum IfcLampType::Class() { return Type::IfcLampType; }
-IfcLampType::IfcLampType(IfcAbstractEntityPtr e) : IfcFlowTerminalType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcLampType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcLampType::IfcLampType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcLampTypeEnum::IfcLampTypeEnum v10_PredefinedType) : IfcFlowTerminalType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcLampTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcLampType::IfcLampType(IfcAbstractEntity* e) : IfcFlowTerminalType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcLampType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcLampType::IfcLampType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcLampTypeEnum::IfcLampTypeEnum v10_PredefinedType) : IfcFlowTerminalType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcLampTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcLibraryInformation
-IfcLabel IfcLibraryInformation::Name() { return *entity->getArgument(0); }
-void IfcLibraryInformation::setName(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-bool IfcLibraryInformation::hasVersion() { return !entity->getArgument(1)->isNull(); }
-IfcLabel IfcLibraryInformation::Version() { return *entity->getArgument(1); }
-void IfcLibraryInformation::setVersion(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-bool IfcLibraryInformation::hasPublisher() { return !entity->getArgument(2)->isNull(); }
-IfcActorSelect IfcLibraryInformation::Publisher() { return *entity->getArgument(2); }
-void IfcLibraryInformation::setPublisher(IfcActorSelect v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-bool IfcLibraryInformation::hasVersionDate() { return !entity->getArgument(3)->isNull(); }
-IfcDateTime IfcLibraryInformation::VersionDate() { return *entity->getArgument(3); }
-void IfcLibraryInformation::setVersionDate(IfcDateTime v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-bool IfcLibraryInformation::hasLocation() { return !entity->getArgument(4)->isNull(); }
-IfcURIReference IfcLibraryInformation::Location() { return *entity->getArgument(4); }
-void IfcLibraryInformation::setLocation(IfcURIReference v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-bool IfcLibraryInformation::hasDescription() { return !entity->getArgument(5)->isNull(); }
-IfcText IfcLibraryInformation::Description() { return *entity->getArgument(5); }
-void IfcLibraryInformation::setDescription(IfcText v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-IfcRelAssociatesLibrary::list IfcLibraryInformation::LibraryInfoForObjects() { RETURN_INVERSE(IfcRelAssociatesLibrary) }
-IfcLibraryReference::list IfcLibraryInformation::HasLibraryReferences() { RETURN_INVERSE(IfcLibraryReference) }
+std::string IfcLibraryInformation::Name() const { return *entity->getArgument(0); }
+void IfcLibraryInformation::setName(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+bool IfcLibraryInformation::hasVersion() const { return !entity->getArgument(1)->isNull(); }
+std::string IfcLibraryInformation::Version() const { return *entity->getArgument(1); }
+void IfcLibraryInformation::setVersion(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+bool IfcLibraryInformation::hasPublisher() const { return !entity->getArgument(2)->isNull(); }
+IfcActorSelect* IfcLibraryInformation::Publisher() const { return (IfcActorSelect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(2))); }
+void IfcLibraryInformation::setPublisher(IfcActorSelect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+bool IfcLibraryInformation::hasVersionDate() const { return !entity->getArgument(3)->isNull(); }
+std::string IfcLibraryInformation::VersionDate() const { return *entity->getArgument(3); }
+void IfcLibraryInformation::setVersionDate(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+bool IfcLibraryInformation::hasLocation() const { return !entity->getArgument(4)->isNull(); }
+std::string IfcLibraryInformation::Location() const { return *entity->getArgument(4); }
+void IfcLibraryInformation::setLocation(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+bool IfcLibraryInformation::hasDescription() const { return !entity->getArgument(5)->isNull(); }
+std::string IfcLibraryInformation::Description() const { return *entity->getArgument(5); }
+void IfcLibraryInformation::setDescription(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+IfcRelAssociatesLibrary::list::ptr IfcLibraryInformation::LibraryInfoForObjects() const { return entity->getInverse(Type::IfcRelAssociatesLibrary, 5)->as<IfcRelAssociatesLibrary>(); }
+IfcLibraryReference::list::ptr IfcLibraryInformation::HasLibraryReferences() const { return entity->getInverse(Type::IfcLibraryReference, 5)->as<IfcLibraryReference>(); }
 bool IfcLibraryInformation::is(Type::Enum v) const { return v == Type::IfcLibraryInformation || IfcExternalInformation::is(v); }
 Type::Enum IfcLibraryInformation::type() const { return Type::IfcLibraryInformation; }
 Type::Enum IfcLibraryInformation::Class() { return Type::IfcLibraryInformation; }
-IfcLibraryInformation::IfcLibraryInformation(IfcAbstractEntityPtr e) : IfcExternalInformation((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcLibraryInformation)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcLibraryInformation::IfcLibraryInformation(IfcLabel v1_Name, boost::optional< IfcLabel > v2_Version, boost::optional< IfcActorSelect > v3_Publisher, boost::optional< IfcDateTime > v4_VersionDate, boost::optional< IfcURIReference > v5_Location, boost::optional< IfcText > v6_Description) : IfcExternalInformation((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); if (v2_Version) { e->setArgument(1,(*v2_Version)); } else { e->setArgument(1); } if (v3_Publisher) { e->setArgument(2,(*v3_Publisher)); } else { e->setArgument(2); } if (v4_VersionDate) { e->setArgument(3,(*v4_VersionDate)); } else { e->setArgument(3); } if (v5_Location) { e->setArgument(4,(*v5_Location)); } else { e->setArgument(4); } if (v6_Description) { e->setArgument(5,(*v6_Description)); } else { e->setArgument(5); } entity = e; EntityBuffer::Add(this); }
+IfcLibraryInformation::IfcLibraryInformation(IfcAbstractEntity* e) : IfcExternalInformation((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcLibraryInformation)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcLibraryInformation::IfcLibraryInformation(std::string v1_Name, boost::optional< std::string > v2_Version, IfcActorSelect* v3_Publisher, boost::optional< std::string > v4_VersionDate, boost::optional< std::string > v5_Location, boost::optional< std::string > v6_Description) : IfcExternalInformation((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); if (v2_Version) { e->setArgument(1,(*v2_Version)); } else { e->setArgument(1); } e->setArgument(2,(v3_Publisher)); if (v4_VersionDate) { e->setArgument(3,(*v4_VersionDate)); } else { e->setArgument(3); } if (v5_Location) { e->setArgument(4,(*v5_Location)); } else { e->setArgument(4); } if (v6_Description) { e->setArgument(5,(*v6_Description)); } else { e->setArgument(5); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcLibraryReference
-bool IfcLibraryReference::hasDescription() { return !entity->getArgument(3)->isNull(); }
-IfcText IfcLibraryReference::Description() { return *entity->getArgument(3); }
-void IfcLibraryReference::setDescription(IfcText v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-bool IfcLibraryReference::hasLanguage() { return !entity->getArgument(4)->isNull(); }
-IfcLanguageId IfcLibraryReference::Language() { return *entity->getArgument(4); }
-void IfcLibraryReference::setLanguage(IfcLanguageId v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-bool IfcLibraryReference::hasReferencedLibrary() { return !entity->getArgument(5)->isNull(); }
-IfcLibraryInformation* IfcLibraryReference::ReferencedLibrary() { return (IfcLibraryInformation*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(5))); }
+bool IfcLibraryReference::hasDescription() const { return !entity->getArgument(3)->isNull(); }
+std::string IfcLibraryReference::Description() const { return *entity->getArgument(3); }
+void IfcLibraryReference::setDescription(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+bool IfcLibraryReference::hasLanguage() const { return !entity->getArgument(4)->isNull(); }
+std::string IfcLibraryReference::Language() const { return *entity->getArgument(4); }
+void IfcLibraryReference::setLanguage(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+bool IfcLibraryReference::hasReferencedLibrary() const { return !entity->getArgument(5)->isNull(); }
+IfcLibraryInformation* IfcLibraryReference::ReferencedLibrary() const { return (IfcLibraryInformation*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(5))); }
 void IfcLibraryReference::setReferencedLibrary(IfcLibraryInformation* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-IfcRelAssociatesLibrary::list IfcLibraryReference::LibraryRefForObjects() { RETURN_INVERSE(IfcRelAssociatesLibrary) }
+IfcRelAssociatesLibrary::list::ptr IfcLibraryReference::LibraryRefForObjects() const { return entity->getInverse(Type::IfcRelAssociatesLibrary, 5)->as<IfcRelAssociatesLibrary>(); }
 bool IfcLibraryReference::is(Type::Enum v) const { return v == Type::IfcLibraryReference || IfcExternalReference::is(v); }
 Type::Enum IfcLibraryReference::type() const { return Type::IfcLibraryReference; }
 Type::Enum IfcLibraryReference::Class() { return Type::IfcLibraryReference; }
-IfcLibraryReference::IfcLibraryReference(IfcAbstractEntityPtr e) : IfcExternalReference((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcLibraryReference)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcLibraryReference::IfcLibraryReference(boost::optional< IfcURIReference > v1_Location, boost::optional< IfcIdentifier > v2_Identification, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLanguageId > v5_Language, IfcLibraryInformation* v6_ReferencedLibrary) : IfcExternalReference((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Location) { e->setArgument(0,(*v1_Location)); } else { e->setArgument(0); } if (v2_Identification) { e->setArgument(1,(*v2_Identification)); } else { e->setArgument(1); } if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_Language) { e->setArgument(4,(*v5_Language)); } else { e->setArgument(4); } e->setArgument(5,(v6_ReferencedLibrary)); entity = e; EntityBuffer::Add(this); }
+IfcLibraryReference::IfcLibraryReference(IfcAbstractEntity* e) : IfcExternalReference((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcLibraryReference)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcLibraryReference::IfcLibraryReference(boost::optional< std::string > v1_Location, boost::optional< std::string > v2_Identification, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_Language, IfcLibraryInformation* v6_ReferencedLibrary) : IfcExternalReference((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Location) { e->setArgument(0,(*v1_Location)); } else { e->setArgument(0); } if (v2_Identification) { e->setArgument(1,(*v2_Identification)); } else { e->setArgument(1); } if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_Language) { e->setArgument(4,(*v5_Language)); } else { e->setArgument(4); } e->setArgument(5,(v6_ReferencedLibrary)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcLightDistributionData
-IfcPlaneAngleMeasure IfcLightDistributionData::MainPlaneAngle() { return *entity->getArgument(0); }
-void IfcLightDistributionData::setMainPlaneAngle(IfcPlaneAngleMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-std::vector< IfcPlaneAngleMeasure > /*[1:?]*/ IfcLightDistributionData::SecondaryPlaneAngle() { return *entity->getArgument(1); }
-void IfcLightDistributionData::setSecondaryPlaneAngle(std::vector< IfcPlaneAngleMeasure > /*[1:?]*/ v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-std::vector< IfcLuminousIntensityDistributionMeasure > /*[1:?]*/ IfcLightDistributionData::LuminousIntensity() { return *entity->getArgument(2); }
-void IfcLightDistributionData::setLuminousIntensity(std::vector< IfcLuminousIntensityDistributionMeasure > /*[1:?]*/ v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+double IfcLightDistributionData::MainPlaneAngle() const { return *entity->getArgument(0); }
+void IfcLightDistributionData::setMainPlaneAngle(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+std::vector< double > /*[1:?]*/ IfcLightDistributionData::SecondaryPlaneAngle() const { return *entity->getArgument(1); }
+void IfcLightDistributionData::setSecondaryPlaneAngle(std::vector< double > /*[1:?]*/ v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+std::vector< double > /*[1:?]*/ IfcLightDistributionData::LuminousIntensity() const { return *entity->getArgument(2); }
+void IfcLightDistributionData::setLuminousIntensity(std::vector< double > /*[1:?]*/ v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
 bool IfcLightDistributionData::is(Type::Enum v) const { return v == Type::IfcLightDistributionData; }
 Type::Enum IfcLightDistributionData::type() const { return Type::IfcLightDistributionData; }
 Type::Enum IfcLightDistributionData::Class() { return Type::IfcLightDistributionData; }
-IfcLightDistributionData::IfcLightDistributionData(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcLightDistributionData)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcLightDistributionData::IfcLightDistributionData(IfcPlaneAngleMeasure v1_MainPlaneAngle, std::vector< IfcPlaneAngleMeasure > /*[1:?]*/ v2_SecondaryPlaneAngle, std::vector< IfcLuminousIntensityDistributionMeasure > /*[1:?]*/ v3_LuminousIntensity) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_MainPlaneAngle)); e->setArgument(1,(v2_SecondaryPlaneAngle)); e->setArgument(2,(v3_LuminousIntensity)); entity = e; EntityBuffer::Add(this); }
+IfcLightDistributionData::IfcLightDistributionData(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcLightDistributionData)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcLightDistributionData::IfcLightDistributionData(double v1_MainPlaneAngle, std::vector< double > /*[1:?]*/ v2_SecondaryPlaneAngle, std::vector< double > /*[1:?]*/ v3_LuminousIntensity) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_MainPlaneAngle)); e->setArgument(1,(v2_SecondaryPlaneAngle)); e->setArgument(2,(v3_LuminousIntensity)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcLightFixture
-bool IfcLightFixture::hasPredefinedType() { return !entity->getArgument(8)->isNull(); }
-IfcLightFixtureTypeEnum::IfcLightFixtureTypeEnum IfcLightFixture::PredefinedType() { return IfcLightFixtureTypeEnum::FromString(*entity->getArgument(8)); }
+bool IfcLightFixture::hasPredefinedType() const { return !entity->getArgument(8)->isNull(); }
+IfcLightFixtureTypeEnum::IfcLightFixtureTypeEnum IfcLightFixture::PredefinedType() const { return IfcLightFixtureTypeEnum::FromString(*entity->getArgument(8)); }
 void IfcLightFixture::setPredefinedType(IfcLightFixtureTypeEnum::IfcLightFixtureTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcLightFixtureTypeEnum::ToString(v)); }
 bool IfcLightFixture::is(Type::Enum v) const { return v == Type::IfcLightFixture || IfcFlowTerminal::is(v); }
 Type::Enum IfcLightFixture::type() const { return Type::IfcLightFixture; }
 Type::Enum IfcLightFixture::Class() { return Type::IfcLightFixture; }
-IfcLightFixture::IfcLightFixture(IfcAbstractEntityPtr e) : IfcFlowTerminal((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcLightFixture)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcLightFixture::IfcLightFixture(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcLightFixtureTypeEnum::IfcLightFixtureTypeEnum > v9_PredefinedType) : IfcFlowTerminal((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcLightFixtureTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcLightFixture::IfcLightFixture(IfcAbstractEntity* e) : IfcFlowTerminal((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcLightFixture)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcLightFixture::IfcLightFixture(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcLightFixtureTypeEnum::IfcLightFixtureTypeEnum > v9_PredefinedType) : IfcFlowTerminal((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcLightFixtureTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcLightFixtureType
-IfcLightFixtureTypeEnum::IfcLightFixtureTypeEnum IfcLightFixtureType::PredefinedType() { return IfcLightFixtureTypeEnum::FromString(*entity->getArgument(9)); }
+IfcLightFixtureTypeEnum::IfcLightFixtureTypeEnum IfcLightFixtureType::PredefinedType() const { return IfcLightFixtureTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcLightFixtureType::setPredefinedType(IfcLightFixtureTypeEnum::IfcLightFixtureTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcLightFixtureTypeEnum::ToString(v)); }
 bool IfcLightFixtureType::is(Type::Enum v) const { return v == Type::IfcLightFixtureType || IfcFlowTerminalType::is(v); }
 Type::Enum IfcLightFixtureType::type() const { return Type::IfcLightFixtureType; }
 Type::Enum IfcLightFixtureType::Class() { return Type::IfcLightFixtureType; }
-IfcLightFixtureType::IfcLightFixtureType(IfcAbstractEntityPtr e) : IfcFlowTerminalType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcLightFixtureType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcLightFixtureType::IfcLightFixtureType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcLightFixtureTypeEnum::IfcLightFixtureTypeEnum v10_PredefinedType) : IfcFlowTerminalType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcLightFixtureTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcLightFixtureType::IfcLightFixtureType(IfcAbstractEntity* e) : IfcFlowTerminalType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcLightFixtureType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcLightFixtureType::IfcLightFixtureType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcLightFixtureTypeEnum::IfcLightFixtureTypeEnum v10_PredefinedType) : IfcFlowTerminalType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcLightFixtureTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcLightIntensityDistribution
-IfcLightDistributionCurveEnum::IfcLightDistributionCurveEnum IfcLightIntensityDistribution::LightDistributionCurve() { return IfcLightDistributionCurveEnum::FromString(*entity->getArgument(0)); }
+IfcLightDistributionCurveEnum::IfcLightDistributionCurveEnum IfcLightIntensityDistribution::LightDistributionCurve() const { return IfcLightDistributionCurveEnum::FromString(*entity->getArgument(0)); }
 void IfcLightIntensityDistribution::setLightDistributionCurve(IfcLightDistributionCurveEnum::IfcLightDistributionCurveEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v,IfcLightDistributionCurveEnum::ToString(v)); }
-SHARED_PTR< IfcTemplatedEntityList< IfcLightDistributionData > > IfcLightIntensityDistribution::DistributionData() { RETURN_AS_LIST(IfcLightDistributionData,1) }
-void IfcLightIntensityDistribution::setDistributionData(SHARED_PTR< IfcTemplatedEntityList< IfcLightDistributionData > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v->generalize()); }
+IfcTemplatedEntityList< IfcLightDistributionData >::ptr IfcLightIntensityDistribution::DistributionData() const { IfcEntityList::ptr es = *entity->getArgument(1); return es->as<IfcLightDistributionData>(); }
+void IfcLightIntensityDistribution::setDistributionData(IfcTemplatedEntityList< IfcLightDistributionData >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v->generalize()); }
 bool IfcLightIntensityDistribution::is(Type::Enum v) const { return v == Type::IfcLightIntensityDistribution; }
 Type::Enum IfcLightIntensityDistribution::type() const { return Type::IfcLightIntensityDistribution; }
 Type::Enum IfcLightIntensityDistribution::Class() { return Type::IfcLightIntensityDistribution; }
-IfcLightIntensityDistribution::IfcLightIntensityDistribution(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcLightIntensityDistribution)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcLightIntensityDistribution::IfcLightIntensityDistribution(IfcLightDistributionCurveEnum::IfcLightDistributionCurveEnum v1_LightDistributionCurve, SHARED_PTR< IfcTemplatedEntityList< IfcLightDistributionData > > v2_DistributionData) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,v1_LightDistributionCurve,IfcLightDistributionCurveEnum::ToString(v1_LightDistributionCurve)); e->setArgument(1,(v2_DistributionData)->generalize()); entity = e; EntityBuffer::Add(this); }
+IfcLightIntensityDistribution::IfcLightIntensityDistribution(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcLightIntensityDistribution)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcLightIntensityDistribution::IfcLightIntensityDistribution(IfcLightDistributionCurveEnum::IfcLightDistributionCurveEnum v1_LightDistributionCurve, IfcTemplatedEntityList< IfcLightDistributionData >::ptr v2_DistributionData) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,v1_LightDistributionCurve,IfcLightDistributionCurveEnum::ToString(v1_LightDistributionCurve)); e->setArgument(1,(v2_DistributionData)->generalize()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcLightSource
-bool IfcLightSource::hasName() { return !entity->getArgument(0)->isNull(); }
-IfcLabel IfcLightSource::Name() { return *entity->getArgument(0); }
-void IfcLightSource::setName(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-IfcColourRgb* IfcLightSource::LightColour() { return (IfcColourRgb*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(1))); }
+bool IfcLightSource::hasName() const { return !entity->getArgument(0)->isNull(); }
+std::string IfcLightSource::Name() const { return *entity->getArgument(0); }
+void IfcLightSource::setName(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+IfcColourRgb* IfcLightSource::LightColour() const { return (IfcColourRgb*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(1))); }
 void IfcLightSource::setLightColour(IfcColourRgb* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-bool IfcLightSource::hasAmbientIntensity() { return !entity->getArgument(2)->isNull(); }
-IfcNormalisedRatioMeasure IfcLightSource::AmbientIntensity() { return *entity->getArgument(2); }
-void IfcLightSource::setAmbientIntensity(IfcNormalisedRatioMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-bool IfcLightSource::hasIntensity() { return !entity->getArgument(3)->isNull(); }
-IfcNormalisedRatioMeasure IfcLightSource::Intensity() { return *entity->getArgument(3); }
-void IfcLightSource::setIntensity(IfcNormalisedRatioMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+bool IfcLightSource::hasAmbientIntensity() const { return !entity->getArgument(2)->isNull(); }
+double IfcLightSource::AmbientIntensity() const { return *entity->getArgument(2); }
+void IfcLightSource::setAmbientIntensity(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+bool IfcLightSource::hasIntensity() const { return !entity->getArgument(3)->isNull(); }
+double IfcLightSource::Intensity() const { return *entity->getArgument(3); }
+void IfcLightSource::setIntensity(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
 bool IfcLightSource::is(Type::Enum v) const { return v == Type::IfcLightSource || IfcGeometricRepresentationItem::is(v); }
 Type::Enum IfcLightSource::type() const { return Type::IfcLightSource; }
 Type::Enum IfcLightSource::Class() { return Type::IfcLightSource; }
-IfcLightSource::IfcLightSource(IfcAbstractEntityPtr e) : IfcGeometricRepresentationItem((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcLightSource)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcLightSource::IfcLightSource(boost::optional< IfcLabel > v1_Name, IfcColourRgb* v2_LightColour, boost::optional< IfcNormalisedRatioMeasure > v3_AmbientIntensity, boost::optional< IfcNormalisedRatioMeasure > v4_Intensity) : IfcGeometricRepresentationItem((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } e->setArgument(1,(v2_LightColour)); if (v3_AmbientIntensity) { e->setArgument(2,(*v3_AmbientIntensity)); } else { e->setArgument(2); } if (v4_Intensity) { e->setArgument(3,(*v4_Intensity)); } else { e->setArgument(3); } entity = e; EntityBuffer::Add(this); }
+IfcLightSource::IfcLightSource(IfcAbstractEntity* e) : IfcGeometricRepresentationItem((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcLightSource)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcLightSource::IfcLightSource(boost::optional< std::string > v1_Name, IfcColourRgb* v2_LightColour, boost::optional< double > v3_AmbientIntensity, boost::optional< double > v4_Intensity) : IfcGeometricRepresentationItem((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } e->setArgument(1,(v2_LightColour)); if (v3_AmbientIntensity) { e->setArgument(2,(*v3_AmbientIntensity)); } else { e->setArgument(2); } if (v4_Intensity) { e->setArgument(3,(*v4_Intensity)); } else { e->setArgument(3); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcLightSourceAmbient
 bool IfcLightSourceAmbient::is(Type::Enum v) const { return v == Type::IfcLightSourceAmbient || IfcLightSource::is(v); }
 Type::Enum IfcLightSourceAmbient::type() const { return Type::IfcLightSourceAmbient; }
 Type::Enum IfcLightSourceAmbient::Class() { return Type::IfcLightSourceAmbient; }
-IfcLightSourceAmbient::IfcLightSourceAmbient(IfcAbstractEntityPtr e) : IfcLightSource((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcLightSourceAmbient)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcLightSourceAmbient::IfcLightSourceAmbient(boost::optional< IfcLabel > v1_Name, IfcColourRgb* v2_LightColour, boost::optional< IfcNormalisedRatioMeasure > v3_AmbientIntensity, boost::optional< IfcNormalisedRatioMeasure > v4_Intensity) : IfcLightSource((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } e->setArgument(1,(v2_LightColour)); if (v3_AmbientIntensity) { e->setArgument(2,(*v3_AmbientIntensity)); } else { e->setArgument(2); } if (v4_Intensity) { e->setArgument(3,(*v4_Intensity)); } else { e->setArgument(3); } entity = e; EntityBuffer::Add(this); }
+IfcLightSourceAmbient::IfcLightSourceAmbient(IfcAbstractEntity* e) : IfcLightSource((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcLightSourceAmbient)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcLightSourceAmbient::IfcLightSourceAmbient(boost::optional< std::string > v1_Name, IfcColourRgb* v2_LightColour, boost::optional< double > v3_AmbientIntensity, boost::optional< double > v4_Intensity) : IfcLightSource((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } e->setArgument(1,(v2_LightColour)); if (v3_AmbientIntensity) { e->setArgument(2,(*v3_AmbientIntensity)); } else { e->setArgument(2); } if (v4_Intensity) { e->setArgument(3,(*v4_Intensity)); } else { e->setArgument(3); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcLightSourceDirectional
-IfcDirection* IfcLightSourceDirectional::Orientation() { return (IfcDirection*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(4))); }
+IfcDirection* IfcLightSourceDirectional::Orientation() const { return (IfcDirection*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(4))); }
 void IfcLightSourceDirectional::setOrientation(IfcDirection* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
 bool IfcLightSourceDirectional::is(Type::Enum v) const { return v == Type::IfcLightSourceDirectional || IfcLightSource::is(v); }
 Type::Enum IfcLightSourceDirectional::type() const { return Type::IfcLightSourceDirectional; }
 Type::Enum IfcLightSourceDirectional::Class() { return Type::IfcLightSourceDirectional; }
-IfcLightSourceDirectional::IfcLightSourceDirectional(IfcAbstractEntityPtr e) : IfcLightSource((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcLightSourceDirectional)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcLightSourceDirectional::IfcLightSourceDirectional(boost::optional< IfcLabel > v1_Name, IfcColourRgb* v2_LightColour, boost::optional< IfcNormalisedRatioMeasure > v3_AmbientIntensity, boost::optional< IfcNormalisedRatioMeasure > v4_Intensity, IfcDirection* v5_Orientation) : IfcLightSource((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } e->setArgument(1,(v2_LightColour)); if (v3_AmbientIntensity) { e->setArgument(2,(*v3_AmbientIntensity)); } else { e->setArgument(2); } if (v4_Intensity) { e->setArgument(3,(*v4_Intensity)); } else { e->setArgument(3); } e->setArgument(4,(v5_Orientation)); entity = e; EntityBuffer::Add(this); }
+IfcLightSourceDirectional::IfcLightSourceDirectional(IfcAbstractEntity* e) : IfcLightSource((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcLightSourceDirectional)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcLightSourceDirectional::IfcLightSourceDirectional(boost::optional< std::string > v1_Name, IfcColourRgb* v2_LightColour, boost::optional< double > v3_AmbientIntensity, boost::optional< double > v4_Intensity, IfcDirection* v5_Orientation) : IfcLightSource((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } e->setArgument(1,(v2_LightColour)); if (v3_AmbientIntensity) { e->setArgument(2,(*v3_AmbientIntensity)); } else { e->setArgument(2); } if (v4_Intensity) { e->setArgument(3,(*v4_Intensity)); } else { e->setArgument(3); } e->setArgument(4,(v5_Orientation)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcLightSourceGoniometric
-IfcAxis2Placement3D* IfcLightSourceGoniometric::Position() { return (IfcAxis2Placement3D*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(4))); }
+IfcAxis2Placement3D* IfcLightSourceGoniometric::Position() const { return (IfcAxis2Placement3D*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(4))); }
 void IfcLightSourceGoniometric::setPosition(IfcAxis2Placement3D* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-bool IfcLightSourceGoniometric::hasColourAppearance() { return !entity->getArgument(5)->isNull(); }
-IfcColourRgb* IfcLightSourceGoniometric::ColourAppearance() { return (IfcColourRgb*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(5))); }
+bool IfcLightSourceGoniometric::hasColourAppearance() const { return !entity->getArgument(5)->isNull(); }
+IfcColourRgb* IfcLightSourceGoniometric::ColourAppearance() const { return (IfcColourRgb*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(5))); }
 void IfcLightSourceGoniometric::setColourAppearance(IfcColourRgb* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-IfcThermodynamicTemperatureMeasure IfcLightSourceGoniometric::ColourTemperature() { return *entity->getArgument(6); }
-void IfcLightSourceGoniometric::setColourTemperature(IfcThermodynamicTemperatureMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
-IfcLuminousFluxMeasure IfcLightSourceGoniometric::LuminousFlux() { return *entity->getArgument(7); }
-void IfcLightSourceGoniometric::setLuminousFlux(IfcLuminousFluxMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
-IfcLightEmissionSourceEnum::IfcLightEmissionSourceEnum IfcLightSourceGoniometric::LightEmissionSource() { return IfcLightEmissionSourceEnum::FromString(*entity->getArgument(8)); }
+double IfcLightSourceGoniometric::ColourTemperature() const { return *entity->getArgument(6); }
+void IfcLightSourceGoniometric::setColourTemperature(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
+double IfcLightSourceGoniometric::LuminousFlux() const { return *entity->getArgument(7); }
+void IfcLightSourceGoniometric::setLuminousFlux(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
+IfcLightEmissionSourceEnum::IfcLightEmissionSourceEnum IfcLightSourceGoniometric::LightEmissionSource() const { return IfcLightEmissionSourceEnum::FromString(*entity->getArgument(8)); }
 void IfcLightSourceGoniometric::setLightEmissionSource(IfcLightEmissionSourceEnum::IfcLightEmissionSourceEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcLightEmissionSourceEnum::ToString(v)); }
-IfcLightDistributionDataSourceSelect IfcLightSourceGoniometric::LightDistributionDataSource() { return *entity->getArgument(9); }
-void IfcLightSourceGoniometric::setLightDistributionDataSource(IfcLightDistributionDataSourceSelect v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
+IfcLightDistributionDataSourceSelect* IfcLightSourceGoniometric::LightDistributionDataSource() const { return (IfcLightDistributionDataSourceSelect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(9))); }
+void IfcLightSourceGoniometric::setLightDistributionDataSource(IfcLightDistributionDataSourceSelect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
 bool IfcLightSourceGoniometric::is(Type::Enum v) const { return v == Type::IfcLightSourceGoniometric || IfcLightSource::is(v); }
 Type::Enum IfcLightSourceGoniometric::type() const { return Type::IfcLightSourceGoniometric; }
 Type::Enum IfcLightSourceGoniometric::Class() { return Type::IfcLightSourceGoniometric; }
-IfcLightSourceGoniometric::IfcLightSourceGoniometric(IfcAbstractEntityPtr e) : IfcLightSource((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcLightSourceGoniometric)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcLightSourceGoniometric::IfcLightSourceGoniometric(boost::optional< IfcLabel > v1_Name, IfcColourRgb* v2_LightColour, boost::optional< IfcNormalisedRatioMeasure > v3_AmbientIntensity, boost::optional< IfcNormalisedRatioMeasure > v4_Intensity, IfcAxis2Placement3D* v5_Position, IfcColourRgb* v6_ColourAppearance, IfcThermodynamicTemperatureMeasure v7_ColourTemperature, IfcLuminousFluxMeasure v8_LuminousFlux, IfcLightEmissionSourceEnum::IfcLightEmissionSourceEnum v9_LightEmissionSource, IfcLightDistributionDataSourceSelect v10_LightDistributionDataSource) : IfcLightSource((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } e->setArgument(1,(v2_LightColour)); if (v3_AmbientIntensity) { e->setArgument(2,(*v3_AmbientIntensity)); } else { e->setArgument(2); } if (v4_Intensity) { e->setArgument(3,(*v4_Intensity)); } else { e->setArgument(3); } e->setArgument(4,(v5_Position)); e->setArgument(5,(v6_ColourAppearance)); e->setArgument(6,(v7_ColourTemperature)); e->setArgument(7,(v8_LuminousFlux)); e->setArgument(8,v9_LightEmissionSource,IfcLightEmissionSourceEnum::ToString(v9_LightEmissionSource)); e->setArgument(9,(v10_LightDistributionDataSource)); entity = e; EntityBuffer::Add(this); }
+IfcLightSourceGoniometric::IfcLightSourceGoniometric(IfcAbstractEntity* e) : IfcLightSource((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcLightSourceGoniometric)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcLightSourceGoniometric::IfcLightSourceGoniometric(boost::optional< std::string > v1_Name, IfcColourRgb* v2_LightColour, boost::optional< double > v3_AmbientIntensity, boost::optional< double > v4_Intensity, IfcAxis2Placement3D* v5_Position, IfcColourRgb* v6_ColourAppearance, double v7_ColourTemperature, double v8_LuminousFlux, IfcLightEmissionSourceEnum::IfcLightEmissionSourceEnum v9_LightEmissionSource, IfcLightDistributionDataSourceSelect* v10_LightDistributionDataSource) : IfcLightSource((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } e->setArgument(1,(v2_LightColour)); if (v3_AmbientIntensity) { e->setArgument(2,(*v3_AmbientIntensity)); } else { e->setArgument(2); } if (v4_Intensity) { e->setArgument(3,(*v4_Intensity)); } else { e->setArgument(3); } e->setArgument(4,(v5_Position)); e->setArgument(5,(v6_ColourAppearance)); e->setArgument(6,(v7_ColourTemperature)); e->setArgument(7,(v8_LuminousFlux)); e->setArgument(8,v9_LightEmissionSource,IfcLightEmissionSourceEnum::ToString(v9_LightEmissionSource)); e->setArgument(9,(v10_LightDistributionDataSource)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcLightSourcePositional
-IfcCartesianPoint* IfcLightSourcePositional::Position() { return (IfcCartesianPoint*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(4))); }
+IfcCartesianPoint* IfcLightSourcePositional::Position() const { return (IfcCartesianPoint*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(4))); }
 void IfcLightSourcePositional::setPosition(IfcCartesianPoint* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-IfcPositiveLengthMeasure IfcLightSourcePositional::Radius() { return *entity->getArgument(5); }
-void IfcLightSourcePositional::setRadius(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-IfcReal IfcLightSourcePositional::ConstantAttenuation() { return *entity->getArgument(6); }
-void IfcLightSourcePositional::setConstantAttenuation(IfcReal v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
-IfcReal IfcLightSourcePositional::DistanceAttenuation() { return *entity->getArgument(7); }
-void IfcLightSourcePositional::setDistanceAttenuation(IfcReal v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
-IfcReal IfcLightSourcePositional::QuadricAttenuation() { return *entity->getArgument(8); }
-void IfcLightSourcePositional::setQuadricAttenuation(IfcReal v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
+double IfcLightSourcePositional::Radius() const { return *entity->getArgument(5); }
+void IfcLightSourcePositional::setRadius(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+double IfcLightSourcePositional::ConstantAttenuation() const { return *entity->getArgument(6); }
+void IfcLightSourcePositional::setConstantAttenuation(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
+double IfcLightSourcePositional::DistanceAttenuation() const { return *entity->getArgument(7); }
+void IfcLightSourcePositional::setDistanceAttenuation(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
+double IfcLightSourcePositional::QuadricAttenuation() const { return *entity->getArgument(8); }
+void IfcLightSourcePositional::setQuadricAttenuation(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
 bool IfcLightSourcePositional::is(Type::Enum v) const { return v == Type::IfcLightSourcePositional || IfcLightSource::is(v); }
 Type::Enum IfcLightSourcePositional::type() const { return Type::IfcLightSourcePositional; }
 Type::Enum IfcLightSourcePositional::Class() { return Type::IfcLightSourcePositional; }
-IfcLightSourcePositional::IfcLightSourcePositional(IfcAbstractEntityPtr e) : IfcLightSource((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcLightSourcePositional)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcLightSourcePositional::IfcLightSourcePositional(boost::optional< IfcLabel > v1_Name, IfcColourRgb* v2_LightColour, boost::optional< IfcNormalisedRatioMeasure > v3_AmbientIntensity, boost::optional< IfcNormalisedRatioMeasure > v4_Intensity, IfcCartesianPoint* v5_Position, IfcPositiveLengthMeasure v6_Radius, IfcReal v7_ConstantAttenuation, IfcReal v8_DistanceAttenuation, IfcReal v9_QuadricAttenuation) : IfcLightSource((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } e->setArgument(1,(v2_LightColour)); if (v3_AmbientIntensity) { e->setArgument(2,(*v3_AmbientIntensity)); } else { e->setArgument(2); } if (v4_Intensity) { e->setArgument(3,(*v4_Intensity)); } else { e->setArgument(3); } e->setArgument(4,(v5_Position)); e->setArgument(5,(v6_Radius)); e->setArgument(6,(v7_ConstantAttenuation)); e->setArgument(7,(v8_DistanceAttenuation)); e->setArgument(8,(v9_QuadricAttenuation)); entity = e; EntityBuffer::Add(this); }
+IfcLightSourcePositional::IfcLightSourcePositional(IfcAbstractEntity* e) : IfcLightSource((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcLightSourcePositional)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcLightSourcePositional::IfcLightSourcePositional(boost::optional< std::string > v1_Name, IfcColourRgb* v2_LightColour, boost::optional< double > v3_AmbientIntensity, boost::optional< double > v4_Intensity, IfcCartesianPoint* v5_Position, double v6_Radius, double v7_ConstantAttenuation, double v8_DistanceAttenuation, double v9_QuadricAttenuation) : IfcLightSource((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } e->setArgument(1,(v2_LightColour)); if (v3_AmbientIntensity) { e->setArgument(2,(*v3_AmbientIntensity)); } else { e->setArgument(2); } if (v4_Intensity) { e->setArgument(3,(*v4_Intensity)); } else { e->setArgument(3); } e->setArgument(4,(v5_Position)); e->setArgument(5,(v6_Radius)); e->setArgument(6,(v7_ConstantAttenuation)); e->setArgument(7,(v8_DistanceAttenuation)); e->setArgument(8,(v9_QuadricAttenuation)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcLightSourceSpot
-IfcDirection* IfcLightSourceSpot::Orientation() { return (IfcDirection*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(9))); }
+IfcDirection* IfcLightSourceSpot::Orientation() const { return (IfcDirection*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(9))); }
 void IfcLightSourceSpot::setOrientation(IfcDirection* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
-bool IfcLightSourceSpot::hasConcentrationExponent() { return !entity->getArgument(10)->isNull(); }
-IfcReal IfcLightSourceSpot::ConcentrationExponent() { return *entity->getArgument(10); }
-void IfcLightSourceSpot::setConcentrationExponent(IfcReal v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
-IfcPositivePlaneAngleMeasure IfcLightSourceSpot::SpreadAngle() { return *entity->getArgument(11); }
-void IfcLightSourceSpot::setSpreadAngle(IfcPositivePlaneAngleMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(11,v); }
-IfcPositivePlaneAngleMeasure IfcLightSourceSpot::BeamWidthAngle() { return *entity->getArgument(12); }
-void IfcLightSourceSpot::setBeamWidthAngle(IfcPositivePlaneAngleMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(12,v); }
+bool IfcLightSourceSpot::hasConcentrationExponent() const { return !entity->getArgument(10)->isNull(); }
+double IfcLightSourceSpot::ConcentrationExponent() const { return *entity->getArgument(10); }
+void IfcLightSourceSpot::setConcentrationExponent(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
+double IfcLightSourceSpot::SpreadAngle() const { return *entity->getArgument(11); }
+void IfcLightSourceSpot::setSpreadAngle(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(11,v); }
+double IfcLightSourceSpot::BeamWidthAngle() const { return *entity->getArgument(12); }
+void IfcLightSourceSpot::setBeamWidthAngle(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(12,v); }
 bool IfcLightSourceSpot::is(Type::Enum v) const { return v == Type::IfcLightSourceSpot || IfcLightSourcePositional::is(v); }
 Type::Enum IfcLightSourceSpot::type() const { return Type::IfcLightSourceSpot; }
 Type::Enum IfcLightSourceSpot::Class() { return Type::IfcLightSourceSpot; }
-IfcLightSourceSpot::IfcLightSourceSpot(IfcAbstractEntityPtr e) : IfcLightSourcePositional((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcLightSourceSpot)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcLightSourceSpot::IfcLightSourceSpot(boost::optional< IfcLabel > v1_Name, IfcColourRgb* v2_LightColour, boost::optional< IfcNormalisedRatioMeasure > v3_AmbientIntensity, boost::optional< IfcNormalisedRatioMeasure > v4_Intensity, IfcCartesianPoint* v5_Position, IfcPositiveLengthMeasure v6_Radius, IfcReal v7_ConstantAttenuation, IfcReal v8_DistanceAttenuation, IfcReal v9_QuadricAttenuation, IfcDirection* v10_Orientation, boost::optional< IfcReal > v11_ConcentrationExponent, IfcPositivePlaneAngleMeasure v12_SpreadAngle, IfcPositivePlaneAngleMeasure v13_BeamWidthAngle) : IfcLightSourcePositional((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } e->setArgument(1,(v2_LightColour)); if (v3_AmbientIntensity) { e->setArgument(2,(*v3_AmbientIntensity)); } else { e->setArgument(2); } if (v4_Intensity) { e->setArgument(3,(*v4_Intensity)); } else { e->setArgument(3); } e->setArgument(4,(v5_Position)); e->setArgument(5,(v6_Radius)); e->setArgument(6,(v7_ConstantAttenuation)); e->setArgument(7,(v8_DistanceAttenuation)); e->setArgument(8,(v9_QuadricAttenuation)); e->setArgument(9,(v10_Orientation)); if (v11_ConcentrationExponent) { e->setArgument(10,(*v11_ConcentrationExponent)); } else { e->setArgument(10); } e->setArgument(11,(v12_SpreadAngle)); e->setArgument(12,(v13_BeamWidthAngle)); entity = e; EntityBuffer::Add(this); }
+IfcLightSourceSpot::IfcLightSourceSpot(IfcAbstractEntity* e) : IfcLightSourcePositional((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcLightSourceSpot)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcLightSourceSpot::IfcLightSourceSpot(boost::optional< std::string > v1_Name, IfcColourRgb* v2_LightColour, boost::optional< double > v3_AmbientIntensity, boost::optional< double > v4_Intensity, IfcCartesianPoint* v5_Position, double v6_Radius, double v7_ConstantAttenuation, double v8_DistanceAttenuation, double v9_QuadricAttenuation, IfcDirection* v10_Orientation, boost::optional< double > v11_ConcentrationExponent, double v12_SpreadAngle, double v13_BeamWidthAngle) : IfcLightSourcePositional((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } e->setArgument(1,(v2_LightColour)); if (v3_AmbientIntensity) { e->setArgument(2,(*v3_AmbientIntensity)); } else { e->setArgument(2); } if (v4_Intensity) { e->setArgument(3,(*v4_Intensity)); } else { e->setArgument(3); } e->setArgument(4,(v5_Position)); e->setArgument(5,(v6_Radius)); e->setArgument(6,(v7_ConstantAttenuation)); e->setArgument(7,(v8_DistanceAttenuation)); e->setArgument(8,(v9_QuadricAttenuation)); e->setArgument(9,(v10_Orientation)); if (v11_ConcentrationExponent) { e->setArgument(10,(*v11_ConcentrationExponent)); } else { e->setArgument(10); } e->setArgument(11,(v12_SpreadAngle)); e->setArgument(12,(v13_BeamWidthAngle)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcLine
-IfcCartesianPoint* IfcLine::Pnt() { return (IfcCartesianPoint*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(0))); }
+IfcCartesianPoint* IfcLine::Pnt() const { return (IfcCartesianPoint*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(0))); }
 void IfcLine::setPnt(IfcCartesianPoint* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-IfcVector* IfcLine::Dir() { return (IfcVector*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(1))); }
+IfcVector* IfcLine::Dir() const { return (IfcVector*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(1))); }
 void IfcLine::setDir(IfcVector* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
 bool IfcLine::is(Type::Enum v) const { return v == Type::IfcLine || IfcCurve::is(v); }
 Type::Enum IfcLine::type() const { return Type::IfcLine; }
 Type::Enum IfcLine::Class() { return Type::IfcLine; }
-IfcLine::IfcLine(IfcAbstractEntityPtr e) : IfcCurve((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcLine)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcLine::IfcLine(IfcCartesianPoint* v1_Pnt, IfcVector* v2_Dir) : IfcCurve((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Pnt)); e->setArgument(1,(v2_Dir)); entity = e; EntityBuffer::Add(this); }
+IfcLine::IfcLine(IfcAbstractEntity* e) : IfcCurve((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcLine)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcLine::IfcLine(IfcCartesianPoint* v1_Pnt, IfcVector* v2_Dir) : IfcCurve((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Pnt)); e->setArgument(1,(v2_Dir)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcLocalPlacement
-bool IfcLocalPlacement::hasPlacementRelTo() { return !entity->getArgument(0)->isNull(); }
-IfcObjectPlacement* IfcLocalPlacement::PlacementRelTo() { return (IfcObjectPlacement*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(0))); }
+bool IfcLocalPlacement::hasPlacementRelTo() const { return !entity->getArgument(0)->isNull(); }
+IfcObjectPlacement* IfcLocalPlacement::PlacementRelTo() const { return (IfcObjectPlacement*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(0))); }
 void IfcLocalPlacement::setPlacementRelTo(IfcObjectPlacement* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-IfcAxis2Placement IfcLocalPlacement::RelativePlacement() { return *entity->getArgument(1); }
-void IfcLocalPlacement::setRelativePlacement(IfcAxis2Placement v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+IfcAxis2Placement* IfcLocalPlacement::RelativePlacement() const { return (IfcAxis2Placement*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(1))); }
+void IfcLocalPlacement::setRelativePlacement(IfcAxis2Placement* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
 bool IfcLocalPlacement::is(Type::Enum v) const { return v == Type::IfcLocalPlacement || IfcObjectPlacement::is(v); }
 Type::Enum IfcLocalPlacement::type() const { return Type::IfcLocalPlacement; }
 Type::Enum IfcLocalPlacement::Class() { return Type::IfcLocalPlacement; }
-IfcLocalPlacement::IfcLocalPlacement(IfcAbstractEntityPtr e) : IfcObjectPlacement((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcLocalPlacement)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcLocalPlacement::IfcLocalPlacement(IfcObjectPlacement* v1_PlacementRelTo, IfcAxis2Placement v2_RelativePlacement) : IfcObjectPlacement((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_PlacementRelTo)); e->setArgument(1,(v2_RelativePlacement)); entity = e; EntityBuffer::Add(this); }
+IfcLocalPlacement::IfcLocalPlacement(IfcAbstractEntity* e) : IfcObjectPlacement((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcLocalPlacement)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcLocalPlacement::IfcLocalPlacement(IfcObjectPlacement* v1_PlacementRelTo, IfcAxis2Placement* v2_RelativePlacement) : IfcObjectPlacement((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_PlacementRelTo)); e->setArgument(1,(v2_RelativePlacement)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcLoop
 bool IfcLoop::is(Type::Enum v) const { return v == Type::IfcLoop || IfcTopologicalRepresentationItem::is(v); }
 Type::Enum IfcLoop::type() const { return Type::IfcLoop; }
 Type::Enum IfcLoop::Class() { return Type::IfcLoop; }
-IfcLoop::IfcLoop(IfcAbstractEntityPtr e) : IfcTopologicalRepresentationItem((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcLoop)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcLoop::IfcLoop() : IfcTopologicalRepresentationItem((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); entity = e; EntityBuffer::Add(this); }
+IfcLoop::IfcLoop(IfcAbstractEntity* e) : IfcTopologicalRepresentationItem((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcLoop)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcLoop::IfcLoop() : IfcTopologicalRepresentationItem((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcManifoldSolidBrep
-IfcClosedShell* IfcManifoldSolidBrep::Outer() { return (IfcClosedShell*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(0))); }
+IfcClosedShell* IfcManifoldSolidBrep::Outer() const { return (IfcClosedShell*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(0))); }
 void IfcManifoldSolidBrep::setOuter(IfcClosedShell* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
 bool IfcManifoldSolidBrep::is(Type::Enum v) const { return v == Type::IfcManifoldSolidBrep || IfcSolidModel::is(v); }
 Type::Enum IfcManifoldSolidBrep::type() const { return Type::IfcManifoldSolidBrep; }
 Type::Enum IfcManifoldSolidBrep::Class() { return Type::IfcManifoldSolidBrep; }
-IfcManifoldSolidBrep::IfcManifoldSolidBrep(IfcAbstractEntityPtr e) : IfcSolidModel((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcManifoldSolidBrep)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcManifoldSolidBrep::IfcManifoldSolidBrep(IfcClosedShell* v1_Outer) : IfcSolidModel((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Outer)); entity = e; EntityBuffer::Add(this); }
+IfcManifoldSolidBrep::IfcManifoldSolidBrep(IfcAbstractEntity* e) : IfcSolidModel((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcManifoldSolidBrep)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcManifoldSolidBrep::IfcManifoldSolidBrep(IfcClosedShell* v1_Outer) : IfcSolidModel((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Outer)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcMapConversion
-IfcLengthMeasure IfcMapConversion::Eastings() { return *entity->getArgument(2); }
-void IfcMapConversion::setEastings(IfcLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-IfcLengthMeasure IfcMapConversion::Northings() { return *entity->getArgument(3); }
-void IfcMapConversion::setNorthings(IfcLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-IfcLengthMeasure IfcMapConversion::OrthogonalHeight() { return *entity->getArgument(4); }
-void IfcMapConversion::setOrthogonalHeight(IfcLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-bool IfcMapConversion::hasXAxisAbscissa() { return !entity->getArgument(5)->isNull(); }
-IfcReal IfcMapConversion::XAxisAbscissa() { return *entity->getArgument(5); }
-void IfcMapConversion::setXAxisAbscissa(IfcReal v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-bool IfcMapConversion::hasXAxisOrdinate() { return !entity->getArgument(6)->isNull(); }
-IfcReal IfcMapConversion::XAxisOrdinate() { return *entity->getArgument(6); }
-void IfcMapConversion::setXAxisOrdinate(IfcReal v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
-bool IfcMapConversion::hasScale() { return !entity->getArgument(7)->isNull(); }
-IfcReal IfcMapConversion::Scale() { return *entity->getArgument(7); }
-void IfcMapConversion::setScale(IfcReal v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
+double IfcMapConversion::Eastings() const { return *entity->getArgument(2); }
+void IfcMapConversion::setEastings(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+double IfcMapConversion::Northings() const { return *entity->getArgument(3); }
+void IfcMapConversion::setNorthings(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+double IfcMapConversion::OrthogonalHeight() const { return *entity->getArgument(4); }
+void IfcMapConversion::setOrthogonalHeight(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+bool IfcMapConversion::hasXAxisAbscissa() const { return !entity->getArgument(5)->isNull(); }
+double IfcMapConversion::XAxisAbscissa() const { return *entity->getArgument(5); }
+void IfcMapConversion::setXAxisAbscissa(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+bool IfcMapConversion::hasXAxisOrdinate() const { return !entity->getArgument(6)->isNull(); }
+double IfcMapConversion::XAxisOrdinate() const { return *entity->getArgument(6); }
+void IfcMapConversion::setXAxisOrdinate(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
+bool IfcMapConversion::hasScale() const { return !entity->getArgument(7)->isNull(); }
+double IfcMapConversion::Scale() const { return *entity->getArgument(7); }
+void IfcMapConversion::setScale(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
 bool IfcMapConversion::is(Type::Enum v) const { return v == Type::IfcMapConversion || IfcCoordinateOperation::is(v); }
 Type::Enum IfcMapConversion::type() const { return Type::IfcMapConversion; }
 Type::Enum IfcMapConversion::Class() { return Type::IfcMapConversion; }
-IfcMapConversion::IfcMapConversion(IfcAbstractEntityPtr e) : IfcCoordinateOperation((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcMapConversion)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcMapConversion::IfcMapConversion(IfcCoordinateReferenceSystemSelect v1_SourceCRS, IfcCoordinateReferenceSystem* v2_TargetCRS, IfcLengthMeasure v3_Eastings, IfcLengthMeasure v4_Northings, IfcLengthMeasure v5_OrthogonalHeight, boost::optional< IfcReal > v6_XAxisAbscissa, boost::optional< IfcReal > v7_XAxisOrdinate, boost::optional< IfcReal > v8_Scale) : IfcCoordinateOperation((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_SourceCRS)); e->setArgument(1,(v2_TargetCRS)); e->setArgument(2,(v3_Eastings)); e->setArgument(3,(v4_Northings)); e->setArgument(4,(v5_OrthogonalHeight)); if (v6_XAxisAbscissa) { e->setArgument(5,(*v6_XAxisAbscissa)); } else { e->setArgument(5); } if (v7_XAxisOrdinate) { e->setArgument(6,(*v7_XAxisOrdinate)); } else { e->setArgument(6); } if (v8_Scale) { e->setArgument(7,(*v8_Scale)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
+IfcMapConversion::IfcMapConversion(IfcAbstractEntity* e) : IfcCoordinateOperation((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcMapConversion)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcMapConversion::IfcMapConversion(IfcCoordinateReferenceSystemSelect* v1_SourceCRS, IfcCoordinateReferenceSystem* v2_TargetCRS, double v3_Eastings, double v4_Northings, double v5_OrthogonalHeight, boost::optional< double > v6_XAxisAbscissa, boost::optional< double > v7_XAxisOrdinate, boost::optional< double > v8_Scale) : IfcCoordinateOperation((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_SourceCRS)); e->setArgument(1,(v2_TargetCRS)); e->setArgument(2,(v3_Eastings)); e->setArgument(3,(v4_Northings)); e->setArgument(4,(v5_OrthogonalHeight)); if (v6_XAxisAbscissa) { e->setArgument(5,(*v6_XAxisAbscissa)); } else { e->setArgument(5); } if (v7_XAxisOrdinate) { e->setArgument(6,(*v7_XAxisOrdinate)); } else { e->setArgument(6); } if (v8_Scale) { e->setArgument(7,(*v8_Scale)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcMappedItem
-IfcRepresentationMap* IfcMappedItem::MappingSource() { return (IfcRepresentationMap*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(0))); }
+IfcRepresentationMap* IfcMappedItem::MappingSource() const { return (IfcRepresentationMap*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(0))); }
 void IfcMappedItem::setMappingSource(IfcRepresentationMap* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-IfcCartesianTransformationOperator* IfcMappedItem::MappingTarget() { return (IfcCartesianTransformationOperator*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(1))); }
+IfcCartesianTransformationOperator* IfcMappedItem::MappingTarget() const { return (IfcCartesianTransformationOperator*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(1))); }
 void IfcMappedItem::setMappingTarget(IfcCartesianTransformationOperator* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
 bool IfcMappedItem::is(Type::Enum v) const { return v == Type::IfcMappedItem || IfcRepresentationItem::is(v); }
 Type::Enum IfcMappedItem::type() const { return Type::IfcMappedItem; }
 Type::Enum IfcMappedItem::Class() { return Type::IfcMappedItem; }
-IfcMappedItem::IfcMappedItem(IfcAbstractEntityPtr e) : IfcRepresentationItem((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcMappedItem)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcMappedItem::IfcMappedItem(IfcRepresentationMap* v1_MappingSource, IfcCartesianTransformationOperator* v2_MappingTarget) : IfcRepresentationItem((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_MappingSource)); e->setArgument(1,(v2_MappingTarget)); entity = e; EntityBuffer::Add(this); }
+IfcMappedItem::IfcMappedItem(IfcAbstractEntity* e) : IfcRepresentationItem((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcMappedItem)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcMappedItem::IfcMappedItem(IfcRepresentationMap* v1_MappingSource, IfcCartesianTransformationOperator* v2_MappingTarget) : IfcRepresentationItem((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_MappingSource)); e->setArgument(1,(v2_MappingTarget)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcMaterial
-IfcLabel IfcMaterial::Name() { return *entity->getArgument(0); }
-void IfcMaterial::setName(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-bool IfcMaterial::hasDescription() { return !entity->getArgument(1)->isNull(); }
-IfcText IfcMaterial::Description() { return *entity->getArgument(1); }
-void IfcMaterial::setDescription(IfcText v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-bool IfcMaterial::hasCategory() { return !entity->getArgument(2)->isNull(); }
-IfcLabel IfcMaterial::Category() { return *entity->getArgument(2); }
-void IfcMaterial::setCategory(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-IfcMaterialDefinitionRepresentation::list IfcMaterial::HasRepresentation() { RETURN_INVERSE(IfcMaterialDefinitionRepresentation) }
-IfcMaterialRelationship::list IfcMaterial::IsRelatedWith() { RETURN_INVERSE(IfcMaterialRelationship) }
-IfcMaterialRelationship::list IfcMaterial::RelatesTo() { RETURN_INVERSE(IfcMaterialRelationship) }
+std::string IfcMaterial::Name() const { return *entity->getArgument(0); }
+void IfcMaterial::setName(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+bool IfcMaterial::hasDescription() const { return !entity->getArgument(1)->isNull(); }
+std::string IfcMaterial::Description() const { return *entity->getArgument(1); }
+void IfcMaterial::setDescription(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+bool IfcMaterial::hasCategory() const { return !entity->getArgument(2)->isNull(); }
+std::string IfcMaterial::Category() const { return *entity->getArgument(2); }
+void IfcMaterial::setCategory(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+IfcMaterialDefinitionRepresentation::list::ptr IfcMaterial::HasRepresentation() const { return entity->getInverse(Type::IfcMaterialDefinitionRepresentation, 3)->as<IfcMaterialDefinitionRepresentation>(); }
+IfcMaterialRelationship::list::ptr IfcMaterial::IsRelatedWith() const { return entity->getInverse(Type::IfcMaterialRelationship, 3)->as<IfcMaterialRelationship>(); }
+IfcMaterialRelationship::list::ptr IfcMaterial::RelatesTo() const { return entity->getInverse(Type::IfcMaterialRelationship, 2)->as<IfcMaterialRelationship>(); }
 bool IfcMaterial::is(Type::Enum v) const { return v == Type::IfcMaterial || IfcMaterialDefinition::is(v); }
 Type::Enum IfcMaterial::type() const { return Type::IfcMaterial; }
 Type::Enum IfcMaterial::Class() { return Type::IfcMaterial; }
-IfcMaterial::IfcMaterial(IfcAbstractEntityPtr e) : IfcMaterialDefinition((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcMaterial)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcMaterial::IfcMaterial(IfcLabel v1_Name, boost::optional< IfcText > v2_Description, boost::optional< IfcLabel > v3_Category) : IfcMaterialDefinition((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } if (v3_Category) { e->setArgument(2,(*v3_Category)); } else { e->setArgument(2); } entity = e; EntityBuffer::Add(this); }
+IfcMaterial::IfcMaterial(IfcAbstractEntity* e) : IfcMaterialDefinition((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcMaterial)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcMaterial::IfcMaterial(std::string v1_Name, boost::optional< std::string > v2_Description, boost::optional< std::string > v3_Category) : IfcMaterialDefinition((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } if (v3_Category) { e->setArgument(2,(*v3_Category)); } else { e->setArgument(2); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcMaterialClassificationRelationship
-SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > IfcMaterialClassificationRelationship::MaterialClassifications() { RETURN_AS_LIST(IfcUtil::IfcAbstractSelect,0) }
-void IfcMaterialClassificationRelationship::setMaterialClassifications(SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v->generalize()); }
-IfcMaterial* IfcMaterialClassificationRelationship::ClassifiedMaterial() { return (IfcMaterial*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(1))); }
+IfcEntityList::ptr IfcMaterialClassificationRelationship::MaterialClassifications() const { return *entity->getArgument(0); }
+void IfcMaterialClassificationRelationship::setMaterialClassifications(IfcEntityList::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+IfcMaterial* IfcMaterialClassificationRelationship::ClassifiedMaterial() const { return (IfcMaterial*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(1))); }
 void IfcMaterialClassificationRelationship::setClassifiedMaterial(IfcMaterial* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
 bool IfcMaterialClassificationRelationship::is(Type::Enum v) const { return v == Type::IfcMaterialClassificationRelationship; }
 Type::Enum IfcMaterialClassificationRelationship::type() const { return Type::IfcMaterialClassificationRelationship; }
 Type::Enum IfcMaterialClassificationRelationship::Class() { return Type::IfcMaterialClassificationRelationship; }
-IfcMaterialClassificationRelationship::IfcMaterialClassificationRelationship(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcMaterialClassificationRelationship)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcMaterialClassificationRelationship::IfcMaterialClassificationRelationship(IfcEntities v1_MaterialClassifications, IfcMaterial* v2_ClassifiedMaterial) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_MaterialClassifications)); e->setArgument(1,(v2_ClassifiedMaterial)); entity = e; EntityBuffer::Add(this); }
+IfcMaterialClassificationRelationship::IfcMaterialClassificationRelationship(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcMaterialClassificationRelationship)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcMaterialClassificationRelationship::IfcMaterialClassificationRelationship(IfcEntityList::ptr v1_MaterialClassifications, IfcMaterial* v2_ClassifiedMaterial) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_MaterialClassifications)); e->setArgument(1,(v2_ClassifiedMaterial)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcMaterialConstituent
-bool IfcMaterialConstituent::hasName() { return !entity->getArgument(0)->isNull(); }
-IfcLabel IfcMaterialConstituent::Name() { return *entity->getArgument(0); }
-void IfcMaterialConstituent::setName(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-bool IfcMaterialConstituent::hasDescription() { return !entity->getArgument(1)->isNull(); }
-IfcText IfcMaterialConstituent::Description() { return *entity->getArgument(1); }
-void IfcMaterialConstituent::setDescription(IfcText v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-IfcMaterial* IfcMaterialConstituent::Material() { return (IfcMaterial*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(2))); }
+bool IfcMaterialConstituent::hasName() const { return !entity->getArgument(0)->isNull(); }
+std::string IfcMaterialConstituent::Name() const { return *entity->getArgument(0); }
+void IfcMaterialConstituent::setName(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+bool IfcMaterialConstituent::hasDescription() const { return !entity->getArgument(1)->isNull(); }
+std::string IfcMaterialConstituent::Description() const { return *entity->getArgument(1); }
+void IfcMaterialConstituent::setDescription(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+IfcMaterial* IfcMaterialConstituent::Material() const { return (IfcMaterial*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(2))); }
 void IfcMaterialConstituent::setMaterial(IfcMaterial* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-bool IfcMaterialConstituent::hasFraction() { return !entity->getArgument(3)->isNull(); }
-IfcNormalisedRatioMeasure IfcMaterialConstituent::Fraction() { return *entity->getArgument(3); }
-void IfcMaterialConstituent::setFraction(IfcNormalisedRatioMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-bool IfcMaterialConstituent::hasCategory() { return !entity->getArgument(4)->isNull(); }
-IfcLabel IfcMaterialConstituent::Category() { return *entity->getArgument(4); }
-void IfcMaterialConstituent::setCategory(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-IfcMaterialConstituentSet::list IfcMaterialConstituent::ToMaterialConstituentSet() { RETURN_INVERSE(IfcMaterialConstituentSet) }
+bool IfcMaterialConstituent::hasFraction() const { return !entity->getArgument(3)->isNull(); }
+double IfcMaterialConstituent::Fraction() const { return *entity->getArgument(3); }
+void IfcMaterialConstituent::setFraction(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+bool IfcMaterialConstituent::hasCategory() const { return !entity->getArgument(4)->isNull(); }
+std::string IfcMaterialConstituent::Category() const { return *entity->getArgument(4); }
+void IfcMaterialConstituent::setCategory(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+IfcMaterialConstituentSet::list::ptr IfcMaterialConstituent::ToMaterialConstituentSet() const { return entity->getInverse(Type::IfcMaterialConstituentSet, 2)->as<IfcMaterialConstituentSet>(); }
 bool IfcMaterialConstituent::is(Type::Enum v) const { return v == Type::IfcMaterialConstituent || IfcMaterialDefinition::is(v); }
 Type::Enum IfcMaterialConstituent::type() const { return Type::IfcMaterialConstituent; }
 Type::Enum IfcMaterialConstituent::Class() { return Type::IfcMaterialConstituent; }
-IfcMaterialConstituent::IfcMaterialConstituent(IfcAbstractEntityPtr e) : IfcMaterialDefinition((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcMaterialConstituent)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcMaterialConstituent::IfcMaterialConstituent(boost::optional< IfcLabel > v1_Name, boost::optional< IfcText > v2_Description, IfcMaterial* v3_Material, boost::optional< IfcNormalisedRatioMeasure > v4_Fraction, boost::optional< IfcLabel > v5_Category) : IfcMaterialDefinition((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_Material)); if (v4_Fraction) { e->setArgument(3,(*v4_Fraction)); } else { e->setArgument(3); } if (v5_Category) { e->setArgument(4,(*v5_Category)); } else { e->setArgument(4); } entity = e; EntityBuffer::Add(this); }
+IfcMaterialConstituent::IfcMaterialConstituent(IfcAbstractEntity* e) : IfcMaterialDefinition((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcMaterialConstituent)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcMaterialConstituent::IfcMaterialConstituent(boost::optional< std::string > v1_Name, boost::optional< std::string > v2_Description, IfcMaterial* v3_Material, boost::optional< double > v4_Fraction, boost::optional< std::string > v5_Category) : IfcMaterialDefinition((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_Material)); if (v4_Fraction) { e->setArgument(3,(*v4_Fraction)); } else { e->setArgument(3); } if (v5_Category) { e->setArgument(4,(*v5_Category)); } else { e->setArgument(4); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcMaterialConstituentSet
-bool IfcMaterialConstituentSet::hasName() { return !entity->getArgument(0)->isNull(); }
-IfcLabel IfcMaterialConstituentSet::Name() { return *entity->getArgument(0); }
-void IfcMaterialConstituentSet::setName(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-bool IfcMaterialConstituentSet::hasDescription() { return !entity->getArgument(1)->isNull(); }
-IfcText IfcMaterialConstituentSet::Description() { return *entity->getArgument(1); }
-void IfcMaterialConstituentSet::setDescription(IfcText v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-bool IfcMaterialConstituentSet::hasMaterialConstituents() { return !entity->getArgument(2)->isNull(); }
-SHARED_PTR< IfcTemplatedEntityList< IfcMaterialConstituent > > IfcMaterialConstituentSet::MaterialConstituents() { RETURN_AS_LIST(IfcMaterialConstituent,2) }
-void IfcMaterialConstituentSet::setMaterialConstituents(SHARED_PTR< IfcTemplatedEntityList< IfcMaterialConstituent > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v->generalize()); }
+bool IfcMaterialConstituentSet::hasName() const { return !entity->getArgument(0)->isNull(); }
+std::string IfcMaterialConstituentSet::Name() const { return *entity->getArgument(0); }
+void IfcMaterialConstituentSet::setName(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+bool IfcMaterialConstituentSet::hasDescription() const { return !entity->getArgument(1)->isNull(); }
+std::string IfcMaterialConstituentSet::Description() const { return *entity->getArgument(1); }
+void IfcMaterialConstituentSet::setDescription(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+bool IfcMaterialConstituentSet::hasMaterialConstituents() const { return !entity->getArgument(2)->isNull(); }
+IfcTemplatedEntityList< IfcMaterialConstituent >::ptr IfcMaterialConstituentSet::MaterialConstituents() const { IfcEntityList::ptr es = *entity->getArgument(2); return es->as<IfcMaterialConstituent>(); }
+void IfcMaterialConstituentSet::setMaterialConstituents(IfcTemplatedEntityList< IfcMaterialConstituent >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v->generalize()); }
 bool IfcMaterialConstituentSet::is(Type::Enum v) const { return v == Type::IfcMaterialConstituentSet || IfcMaterialDefinition::is(v); }
 Type::Enum IfcMaterialConstituentSet::type() const { return Type::IfcMaterialConstituentSet; }
 Type::Enum IfcMaterialConstituentSet::Class() { return Type::IfcMaterialConstituentSet; }
-IfcMaterialConstituentSet::IfcMaterialConstituentSet(IfcAbstractEntityPtr e) : IfcMaterialDefinition((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcMaterialConstituentSet)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcMaterialConstituentSet::IfcMaterialConstituentSet(boost::optional< IfcLabel > v1_Name, boost::optional< IfcText > v2_Description, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcMaterialConstituent > > > v3_MaterialConstituents) : IfcMaterialDefinition((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } if (v3_MaterialConstituents) { e->setArgument(2,(*v3_MaterialConstituents)->generalize()); } else { e->setArgument(2); } entity = e; EntityBuffer::Add(this); }
+IfcMaterialConstituentSet::IfcMaterialConstituentSet(IfcAbstractEntity* e) : IfcMaterialDefinition((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcMaterialConstituentSet)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcMaterialConstituentSet::IfcMaterialConstituentSet(boost::optional< std::string > v1_Name, boost::optional< std::string > v2_Description, boost::optional< IfcTemplatedEntityList< IfcMaterialConstituent >::ptr > v3_MaterialConstituents) : IfcMaterialDefinition((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } if (v3_MaterialConstituents) { e->setArgument(2,(*v3_MaterialConstituents)->generalize()); } else { e->setArgument(2); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcMaterialDefinition
-IfcRelAssociatesMaterial::list IfcMaterialDefinition::AssociatedTo() { RETURN_INVERSE(IfcRelAssociatesMaterial) }
-IfcExternalReferenceRelationship::list IfcMaterialDefinition::HasExternalReferences() { RETURN_INVERSE(IfcExternalReferenceRelationship) }
-IfcMaterialProperties::list IfcMaterialDefinition::HasProperties() { RETURN_INVERSE(IfcMaterialProperties) }
+IfcRelAssociatesMaterial::list::ptr IfcMaterialDefinition::AssociatedTo() const { return entity->getInverse(Type::IfcRelAssociatesMaterial, 5)->as<IfcRelAssociatesMaterial>(); }
+IfcExternalReferenceRelationship::list::ptr IfcMaterialDefinition::HasExternalReferences() const { return entity->getInverse(Type::IfcExternalReferenceRelationship, 3)->as<IfcExternalReferenceRelationship>(); }
+IfcMaterialProperties::list::ptr IfcMaterialDefinition::HasProperties() const { return entity->getInverse(Type::IfcMaterialProperties, 3)->as<IfcMaterialProperties>(); }
 bool IfcMaterialDefinition::is(Type::Enum v) const { return v == Type::IfcMaterialDefinition; }
 Type::Enum IfcMaterialDefinition::type() const { return Type::IfcMaterialDefinition; }
 Type::Enum IfcMaterialDefinition::Class() { return Type::IfcMaterialDefinition; }
-IfcMaterialDefinition::IfcMaterialDefinition(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcMaterialDefinition)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcMaterialDefinition::IfcMaterialDefinition(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcMaterialDefinition)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
 IfcMaterialDefinition::IfcMaterialDefinition() : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcMaterialDefinitionRepresentation
-IfcMaterial* IfcMaterialDefinitionRepresentation::RepresentedMaterial() { return (IfcMaterial*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(3))); }
+IfcMaterial* IfcMaterialDefinitionRepresentation::RepresentedMaterial() const { return (IfcMaterial*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(3))); }
 void IfcMaterialDefinitionRepresentation::setRepresentedMaterial(IfcMaterial* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
 bool IfcMaterialDefinitionRepresentation::is(Type::Enum v) const { return v == Type::IfcMaterialDefinitionRepresentation || IfcProductRepresentation::is(v); }
 Type::Enum IfcMaterialDefinitionRepresentation::type() const { return Type::IfcMaterialDefinitionRepresentation; }
 Type::Enum IfcMaterialDefinitionRepresentation::Class() { return Type::IfcMaterialDefinitionRepresentation; }
-IfcMaterialDefinitionRepresentation::IfcMaterialDefinitionRepresentation(IfcAbstractEntityPtr e) : IfcProductRepresentation((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcMaterialDefinitionRepresentation)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcMaterialDefinitionRepresentation::IfcMaterialDefinitionRepresentation(boost::optional< IfcLabel > v1_Name, boost::optional< IfcText > v2_Description, SHARED_PTR< IfcTemplatedEntityList< IfcRepresentation > > v3_Representations, IfcMaterial* v4_RepresentedMaterial) : IfcProductRepresentation((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_Representations)->generalize()); e->setArgument(3,(v4_RepresentedMaterial)); entity = e; EntityBuffer::Add(this); }
+IfcMaterialDefinitionRepresentation::IfcMaterialDefinitionRepresentation(IfcAbstractEntity* e) : IfcProductRepresentation((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcMaterialDefinitionRepresentation)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcMaterialDefinitionRepresentation::IfcMaterialDefinitionRepresentation(boost::optional< std::string > v1_Name, boost::optional< std::string > v2_Description, IfcTemplatedEntityList< IfcRepresentation >::ptr v3_Representations, IfcMaterial* v4_RepresentedMaterial) : IfcProductRepresentation((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_Representations)->generalize()); e->setArgument(3,(v4_RepresentedMaterial)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcMaterialLayer
-bool IfcMaterialLayer::hasMaterial() { return !entity->getArgument(0)->isNull(); }
-IfcMaterial* IfcMaterialLayer::Material() { return (IfcMaterial*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(0))); }
+bool IfcMaterialLayer::hasMaterial() const { return !entity->getArgument(0)->isNull(); }
+IfcMaterial* IfcMaterialLayer::Material() const { return (IfcMaterial*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(0))); }
 void IfcMaterialLayer::setMaterial(IfcMaterial* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-IfcNonNegativeLengthMeasure IfcMaterialLayer::LayerThickness() { return *entity->getArgument(1); }
-void IfcMaterialLayer::setLayerThickness(IfcNonNegativeLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-bool IfcMaterialLayer::hasIsVentilated() { return !entity->getArgument(2)->isNull(); }
-IfcLogical IfcMaterialLayer::IsVentilated() { return *entity->getArgument(2); }
-void IfcMaterialLayer::setIsVentilated(IfcLogical v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-bool IfcMaterialLayer::hasName() { return !entity->getArgument(3)->isNull(); }
-IfcLabel IfcMaterialLayer::Name() { return *entity->getArgument(3); }
-void IfcMaterialLayer::setName(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-bool IfcMaterialLayer::hasDescription() { return !entity->getArgument(4)->isNull(); }
-IfcText IfcMaterialLayer::Description() { return *entity->getArgument(4); }
-void IfcMaterialLayer::setDescription(IfcText v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-bool IfcMaterialLayer::hasCategory() { return !entity->getArgument(5)->isNull(); }
-IfcLabel IfcMaterialLayer::Category() { return *entity->getArgument(5); }
-void IfcMaterialLayer::setCategory(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-bool IfcMaterialLayer::hasPriority() { return !entity->getArgument(6)->isNull(); }
-IfcNormalisedRatioMeasure IfcMaterialLayer::Priority() { return *entity->getArgument(6); }
-void IfcMaterialLayer::setPriority(IfcNormalisedRatioMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
-IfcMaterialLayerSet::list IfcMaterialLayer::ToMaterialLayerSet() { RETURN_INVERSE(IfcMaterialLayerSet) }
+double IfcMaterialLayer::LayerThickness() const { return *entity->getArgument(1); }
+void IfcMaterialLayer::setLayerThickness(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+bool IfcMaterialLayer::hasIsVentilated() const { return !entity->getArgument(2)->isNull(); }
+bool IfcMaterialLayer::IsVentilated() const { return *entity->getArgument(2); }
+void IfcMaterialLayer::setIsVentilated(bool v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+bool IfcMaterialLayer::hasName() const { return !entity->getArgument(3)->isNull(); }
+std::string IfcMaterialLayer::Name() const { return *entity->getArgument(3); }
+void IfcMaterialLayer::setName(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+bool IfcMaterialLayer::hasDescription() const { return !entity->getArgument(4)->isNull(); }
+std::string IfcMaterialLayer::Description() const { return *entity->getArgument(4); }
+void IfcMaterialLayer::setDescription(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+bool IfcMaterialLayer::hasCategory() const { return !entity->getArgument(5)->isNull(); }
+std::string IfcMaterialLayer::Category() const { return *entity->getArgument(5); }
+void IfcMaterialLayer::setCategory(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+bool IfcMaterialLayer::hasPriority() const { return !entity->getArgument(6)->isNull(); }
+double IfcMaterialLayer::Priority() const { return *entity->getArgument(6); }
+void IfcMaterialLayer::setPriority(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
+IfcMaterialLayerSet::list::ptr IfcMaterialLayer::ToMaterialLayerSet() const { return entity->getInverse(Type::IfcMaterialLayerSet, 0)->as<IfcMaterialLayerSet>(); }
 bool IfcMaterialLayer::is(Type::Enum v) const { return v == Type::IfcMaterialLayer || IfcMaterialDefinition::is(v); }
 Type::Enum IfcMaterialLayer::type() const { return Type::IfcMaterialLayer; }
 Type::Enum IfcMaterialLayer::Class() { return Type::IfcMaterialLayer; }
-IfcMaterialLayer::IfcMaterialLayer(IfcAbstractEntityPtr e) : IfcMaterialDefinition((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcMaterialLayer)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcMaterialLayer::IfcMaterialLayer(IfcMaterial* v1_Material, IfcNonNegativeLengthMeasure v2_LayerThickness, boost::optional< IfcLogical > v3_IsVentilated, boost::optional< IfcLabel > v4_Name, boost::optional< IfcText > v5_Description, boost::optional< IfcLabel > v6_Category, boost::optional< IfcNormalisedRatioMeasure > v7_Priority) : IfcMaterialDefinition((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Material)); e->setArgument(1,(v2_LayerThickness)); if (v3_IsVentilated) { e->setArgument(2,(*v3_IsVentilated)); } else { e->setArgument(2); } if (v4_Name) { e->setArgument(3,(*v4_Name)); } else { e->setArgument(3); } if (v5_Description) { e->setArgument(4,(*v5_Description)); } else { e->setArgument(4); } if (v6_Category) { e->setArgument(5,(*v6_Category)); } else { e->setArgument(5); } if (v7_Priority) { e->setArgument(6,(*v7_Priority)); } else { e->setArgument(6); } entity = e; EntityBuffer::Add(this); }
+IfcMaterialLayer::IfcMaterialLayer(IfcAbstractEntity* e) : IfcMaterialDefinition((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcMaterialLayer)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcMaterialLayer::IfcMaterialLayer(IfcMaterial* v1_Material, double v2_LayerThickness, boost::optional< bool > v3_IsVentilated, boost::optional< std::string > v4_Name, boost::optional< std::string > v5_Description, boost::optional< std::string > v6_Category, boost::optional< double > v7_Priority) : IfcMaterialDefinition((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Material)); e->setArgument(1,(v2_LayerThickness)); if (v3_IsVentilated) { e->setArgument(2,(*v3_IsVentilated)); } else { e->setArgument(2); } if (v4_Name) { e->setArgument(3,(*v4_Name)); } else { e->setArgument(3); } if (v5_Description) { e->setArgument(4,(*v5_Description)); } else { e->setArgument(4); } if (v6_Category) { e->setArgument(5,(*v6_Category)); } else { e->setArgument(5); } if (v7_Priority) { e->setArgument(6,(*v7_Priority)); } else { e->setArgument(6); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcMaterialLayerSet
-SHARED_PTR< IfcTemplatedEntityList< IfcMaterialLayer > > IfcMaterialLayerSet::MaterialLayers() { RETURN_AS_LIST(IfcMaterialLayer,0) }
-void IfcMaterialLayerSet::setMaterialLayers(SHARED_PTR< IfcTemplatedEntityList< IfcMaterialLayer > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v->generalize()); }
-bool IfcMaterialLayerSet::hasLayerSetName() { return !entity->getArgument(1)->isNull(); }
-IfcLabel IfcMaterialLayerSet::LayerSetName() { return *entity->getArgument(1); }
-void IfcMaterialLayerSet::setLayerSetName(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-bool IfcMaterialLayerSet::hasDescription() { return !entity->getArgument(2)->isNull(); }
-IfcText IfcMaterialLayerSet::Description() { return *entity->getArgument(2); }
-void IfcMaterialLayerSet::setDescription(IfcText v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+IfcTemplatedEntityList< IfcMaterialLayer >::ptr IfcMaterialLayerSet::MaterialLayers() const { IfcEntityList::ptr es = *entity->getArgument(0); return es->as<IfcMaterialLayer>(); }
+void IfcMaterialLayerSet::setMaterialLayers(IfcTemplatedEntityList< IfcMaterialLayer >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v->generalize()); }
+bool IfcMaterialLayerSet::hasLayerSetName() const { return !entity->getArgument(1)->isNull(); }
+std::string IfcMaterialLayerSet::LayerSetName() const { return *entity->getArgument(1); }
+void IfcMaterialLayerSet::setLayerSetName(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+bool IfcMaterialLayerSet::hasDescription() const { return !entity->getArgument(2)->isNull(); }
+std::string IfcMaterialLayerSet::Description() const { return *entity->getArgument(2); }
+void IfcMaterialLayerSet::setDescription(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
 bool IfcMaterialLayerSet::is(Type::Enum v) const { return v == Type::IfcMaterialLayerSet || IfcMaterialDefinition::is(v); }
 Type::Enum IfcMaterialLayerSet::type() const { return Type::IfcMaterialLayerSet; }
 Type::Enum IfcMaterialLayerSet::Class() { return Type::IfcMaterialLayerSet; }
-IfcMaterialLayerSet::IfcMaterialLayerSet(IfcAbstractEntityPtr e) : IfcMaterialDefinition((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcMaterialLayerSet)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcMaterialLayerSet::IfcMaterialLayerSet(SHARED_PTR< IfcTemplatedEntityList< IfcMaterialLayer > > v1_MaterialLayers, boost::optional< IfcLabel > v2_LayerSetName, boost::optional< IfcText > v3_Description) : IfcMaterialDefinition((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_MaterialLayers)->generalize()); if (v2_LayerSetName) { e->setArgument(1,(*v2_LayerSetName)); } else { e->setArgument(1); } if (v3_Description) { e->setArgument(2,(*v3_Description)); } else { e->setArgument(2); } entity = e; EntityBuffer::Add(this); }
+IfcMaterialLayerSet::IfcMaterialLayerSet(IfcAbstractEntity* e) : IfcMaterialDefinition((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcMaterialLayerSet)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcMaterialLayerSet::IfcMaterialLayerSet(IfcTemplatedEntityList< IfcMaterialLayer >::ptr v1_MaterialLayers, boost::optional< std::string > v2_LayerSetName, boost::optional< std::string > v3_Description) : IfcMaterialDefinition((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_MaterialLayers)->generalize()); if (v2_LayerSetName) { e->setArgument(1,(*v2_LayerSetName)); } else { e->setArgument(1); } if (v3_Description) { e->setArgument(2,(*v3_Description)); } else { e->setArgument(2); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcMaterialLayerSetUsage
-IfcMaterialLayerSet* IfcMaterialLayerSetUsage::ForLayerSet() { return (IfcMaterialLayerSet*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(0))); }
+IfcMaterialLayerSet* IfcMaterialLayerSetUsage::ForLayerSet() const { return (IfcMaterialLayerSet*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(0))); }
 void IfcMaterialLayerSetUsage::setForLayerSet(IfcMaterialLayerSet* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-IfcLayerSetDirectionEnum::IfcLayerSetDirectionEnum IfcMaterialLayerSetUsage::LayerSetDirection() { return IfcLayerSetDirectionEnum::FromString(*entity->getArgument(1)); }
+IfcLayerSetDirectionEnum::IfcLayerSetDirectionEnum IfcMaterialLayerSetUsage::LayerSetDirection() const { return IfcLayerSetDirectionEnum::FromString(*entity->getArgument(1)); }
 void IfcMaterialLayerSetUsage::setLayerSetDirection(IfcLayerSetDirectionEnum::IfcLayerSetDirectionEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v,IfcLayerSetDirectionEnum::ToString(v)); }
-IfcDirectionSenseEnum::IfcDirectionSenseEnum IfcMaterialLayerSetUsage::DirectionSense() { return IfcDirectionSenseEnum::FromString(*entity->getArgument(2)); }
+IfcDirectionSenseEnum::IfcDirectionSenseEnum IfcMaterialLayerSetUsage::DirectionSense() const { return IfcDirectionSenseEnum::FromString(*entity->getArgument(2)); }
 void IfcMaterialLayerSetUsage::setDirectionSense(IfcDirectionSenseEnum::IfcDirectionSenseEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v,IfcDirectionSenseEnum::ToString(v)); }
-IfcLengthMeasure IfcMaterialLayerSetUsage::OffsetFromReferenceLine() { return *entity->getArgument(3); }
-void IfcMaterialLayerSetUsage::setOffsetFromReferenceLine(IfcLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-bool IfcMaterialLayerSetUsage::hasReferenceExtent() { return !entity->getArgument(4)->isNull(); }
-IfcPositiveLengthMeasure IfcMaterialLayerSetUsage::ReferenceExtent() { return *entity->getArgument(4); }
-void IfcMaterialLayerSetUsage::setReferenceExtent(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+double IfcMaterialLayerSetUsage::OffsetFromReferenceLine() const { return *entity->getArgument(3); }
+void IfcMaterialLayerSetUsage::setOffsetFromReferenceLine(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+bool IfcMaterialLayerSetUsage::hasReferenceExtent() const { return !entity->getArgument(4)->isNull(); }
+double IfcMaterialLayerSetUsage::ReferenceExtent() const { return *entity->getArgument(4); }
+void IfcMaterialLayerSetUsage::setReferenceExtent(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
 bool IfcMaterialLayerSetUsage::is(Type::Enum v) const { return v == Type::IfcMaterialLayerSetUsage || IfcMaterialUsageDefinition::is(v); }
 Type::Enum IfcMaterialLayerSetUsage::type() const { return Type::IfcMaterialLayerSetUsage; }
 Type::Enum IfcMaterialLayerSetUsage::Class() { return Type::IfcMaterialLayerSetUsage; }
-IfcMaterialLayerSetUsage::IfcMaterialLayerSetUsage(IfcAbstractEntityPtr e) : IfcMaterialUsageDefinition((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcMaterialLayerSetUsage)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcMaterialLayerSetUsage::IfcMaterialLayerSetUsage(IfcMaterialLayerSet* v1_ForLayerSet, IfcLayerSetDirectionEnum::IfcLayerSetDirectionEnum v2_LayerSetDirection, IfcDirectionSenseEnum::IfcDirectionSenseEnum v3_DirectionSense, IfcLengthMeasure v4_OffsetFromReferenceLine, boost::optional< IfcPositiveLengthMeasure > v5_ReferenceExtent) : IfcMaterialUsageDefinition((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_ForLayerSet)); e->setArgument(1,v2_LayerSetDirection,IfcLayerSetDirectionEnum::ToString(v2_LayerSetDirection)); e->setArgument(2,v3_DirectionSense,IfcDirectionSenseEnum::ToString(v3_DirectionSense)); e->setArgument(3,(v4_OffsetFromReferenceLine)); if (v5_ReferenceExtent) { e->setArgument(4,(*v5_ReferenceExtent)); } else { e->setArgument(4); } entity = e; EntityBuffer::Add(this); }
+IfcMaterialLayerSetUsage::IfcMaterialLayerSetUsage(IfcAbstractEntity* e) : IfcMaterialUsageDefinition((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcMaterialLayerSetUsage)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcMaterialLayerSetUsage::IfcMaterialLayerSetUsage(IfcMaterialLayerSet* v1_ForLayerSet, IfcLayerSetDirectionEnum::IfcLayerSetDirectionEnum v2_LayerSetDirection, IfcDirectionSenseEnum::IfcDirectionSenseEnum v3_DirectionSense, double v4_OffsetFromReferenceLine, boost::optional< double > v5_ReferenceExtent) : IfcMaterialUsageDefinition((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_ForLayerSet)); e->setArgument(1,v2_LayerSetDirection,IfcLayerSetDirectionEnum::ToString(v2_LayerSetDirection)); e->setArgument(2,v3_DirectionSense,IfcDirectionSenseEnum::ToString(v3_DirectionSense)); e->setArgument(3,(v4_OffsetFromReferenceLine)); if (v5_ReferenceExtent) { e->setArgument(4,(*v5_ReferenceExtent)); } else { e->setArgument(4); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcMaterialLayerWithOffsets
-IfcLayerSetDirectionEnum::IfcLayerSetDirectionEnum IfcMaterialLayerWithOffsets::OffsetDirection() { return IfcLayerSetDirectionEnum::FromString(*entity->getArgument(7)); }
+IfcLayerSetDirectionEnum::IfcLayerSetDirectionEnum IfcMaterialLayerWithOffsets::OffsetDirection() const { return IfcLayerSetDirectionEnum::FromString(*entity->getArgument(7)); }
 void IfcMaterialLayerWithOffsets::setOffsetDirection(IfcLayerSetDirectionEnum::IfcLayerSetDirectionEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v,IfcLayerSetDirectionEnum::ToString(v)); }
-std::vector< IfcLengthMeasure > /*[1:2]*/ IfcMaterialLayerWithOffsets::OffsetValues() { return *entity->getArgument(8); }
-void IfcMaterialLayerWithOffsets::setOffsetValues(std::vector< IfcLengthMeasure > /*[1:2]*/ v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
+std::vector< double > /*[1:2]*/ IfcMaterialLayerWithOffsets::OffsetValues() const { return *entity->getArgument(8); }
+void IfcMaterialLayerWithOffsets::setOffsetValues(std::vector< double > /*[1:2]*/ v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
 bool IfcMaterialLayerWithOffsets::is(Type::Enum v) const { return v == Type::IfcMaterialLayerWithOffsets || IfcMaterialLayer::is(v); }
 Type::Enum IfcMaterialLayerWithOffsets::type() const { return Type::IfcMaterialLayerWithOffsets; }
 Type::Enum IfcMaterialLayerWithOffsets::Class() { return Type::IfcMaterialLayerWithOffsets; }
-IfcMaterialLayerWithOffsets::IfcMaterialLayerWithOffsets(IfcAbstractEntityPtr e) : IfcMaterialLayer((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcMaterialLayerWithOffsets)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcMaterialLayerWithOffsets::IfcMaterialLayerWithOffsets(IfcMaterial* v1_Material, IfcNonNegativeLengthMeasure v2_LayerThickness, boost::optional< IfcLogical > v3_IsVentilated, boost::optional< IfcLabel > v4_Name, boost::optional< IfcText > v5_Description, boost::optional< IfcLabel > v6_Category, boost::optional< IfcNormalisedRatioMeasure > v7_Priority, IfcLayerSetDirectionEnum::IfcLayerSetDirectionEnum v8_OffsetDirection, std::vector< IfcLengthMeasure > /*[1:2]*/ v9_OffsetValues) : IfcMaterialLayer((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Material)); e->setArgument(1,(v2_LayerThickness)); if (v3_IsVentilated) { e->setArgument(2,(*v3_IsVentilated)); } else { e->setArgument(2); } if (v4_Name) { e->setArgument(3,(*v4_Name)); } else { e->setArgument(3); } if (v5_Description) { e->setArgument(4,(*v5_Description)); } else { e->setArgument(4); } if (v6_Category) { e->setArgument(5,(*v6_Category)); } else { e->setArgument(5); } if (v7_Priority) { e->setArgument(6,(*v7_Priority)); } else { e->setArgument(6); } e->setArgument(7,v8_OffsetDirection,IfcLayerSetDirectionEnum::ToString(v8_OffsetDirection)); e->setArgument(8,(v9_OffsetValues)); entity = e; EntityBuffer::Add(this); }
+IfcMaterialLayerWithOffsets::IfcMaterialLayerWithOffsets(IfcAbstractEntity* e) : IfcMaterialLayer((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcMaterialLayerWithOffsets)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcMaterialLayerWithOffsets::IfcMaterialLayerWithOffsets(IfcMaterial* v1_Material, double v2_LayerThickness, boost::optional< bool > v3_IsVentilated, boost::optional< std::string > v4_Name, boost::optional< std::string > v5_Description, boost::optional< std::string > v6_Category, boost::optional< double > v7_Priority, IfcLayerSetDirectionEnum::IfcLayerSetDirectionEnum v8_OffsetDirection, std::vector< double > /*[1:2]*/ v9_OffsetValues) : IfcMaterialLayer((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Material)); e->setArgument(1,(v2_LayerThickness)); if (v3_IsVentilated) { e->setArgument(2,(*v3_IsVentilated)); } else { e->setArgument(2); } if (v4_Name) { e->setArgument(3,(*v4_Name)); } else { e->setArgument(3); } if (v5_Description) { e->setArgument(4,(*v5_Description)); } else { e->setArgument(4); } if (v6_Category) { e->setArgument(5,(*v6_Category)); } else { e->setArgument(5); } if (v7_Priority) { e->setArgument(6,(*v7_Priority)); } else { e->setArgument(6); } e->setArgument(7,v8_OffsetDirection,IfcLayerSetDirectionEnum::ToString(v8_OffsetDirection)); e->setArgument(8,(v9_OffsetValues)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcMaterialList
-SHARED_PTR< IfcTemplatedEntityList< IfcMaterial > > IfcMaterialList::Materials() { RETURN_AS_LIST(IfcMaterial,0) }
-void IfcMaterialList::setMaterials(SHARED_PTR< IfcTemplatedEntityList< IfcMaterial > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v->generalize()); }
+IfcTemplatedEntityList< IfcMaterial >::ptr IfcMaterialList::Materials() const { IfcEntityList::ptr es = *entity->getArgument(0); return es->as<IfcMaterial>(); }
+void IfcMaterialList::setMaterials(IfcTemplatedEntityList< IfcMaterial >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v->generalize()); }
 bool IfcMaterialList::is(Type::Enum v) const { return v == Type::IfcMaterialList; }
 Type::Enum IfcMaterialList::type() const { return Type::IfcMaterialList; }
 Type::Enum IfcMaterialList::Class() { return Type::IfcMaterialList; }
-IfcMaterialList::IfcMaterialList(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcMaterialList)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcMaterialList::IfcMaterialList(SHARED_PTR< IfcTemplatedEntityList< IfcMaterial > > v1_Materials) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Materials)->generalize()); entity = e; EntityBuffer::Add(this); }
+IfcMaterialList::IfcMaterialList(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcMaterialList)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcMaterialList::IfcMaterialList(IfcTemplatedEntityList< IfcMaterial >::ptr v1_Materials) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Materials)->generalize()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcMaterialProfile
-bool IfcMaterialProfile::hasName() { return !entity->getArgument(0)->isNull(); }
-IfcLabel IfcMaterialProfile::Name() { return *entity->getArgument(0); }
-void IfcMaterialProfile::setName(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-bool IfcMaterialProfile::hasDescription() { return !entity->getArgument(1)->isNull(); }
-IfcText IfcMaterialProfile::Description() { return *entity->getArgument(1); }
-void IfcMaterialProfile::setDescription(IfcText v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-bool IfcMaterialProfile::hasMaterial() { return !entity->getArgument(2)->isNull(); }
-IfcMaterial* IfcMaterialProfile::Material() { return (IfcMaterial*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(2))); }
+bool IfcMaterialProfile::hasName() const { return !entity->getArgument(0)->isNull(); }
+std::string IfcMaterialProfile::Name() const { return *entity->getArgument(0); }
+void IfcMaterialProfile::setName(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+bool IfcMaterialProfile::hasDescription() const { return !entity->getArgument(1)->isNull(); }
+std::string IfcMaterialProfile::Description() const { return *entity->getArgument(1); }
+void IfcMaterialProfile::setDescription(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+bool IfcMaterialProfile::hasMaterial() const { return !entity->getArgument(2)->isNull(); }
+IfcMaterial* IfcMaterialProfile::Material() const { return (IfcMaterial*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(2))); }
 void IfcMaterialProfile::setMaterial(IfcMaterial* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-IfcProfileDef* IfcMaterialProfile::Profile() { return (IfcProfileDef*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(3))); }
+IfcProfileDef* IfcMaterialProfile::Profile() const { return (IfcProfileDef*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(3))); }
 void IfcMaterialProfile::setProfile(IfcProfileDef* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-bool IfcMaterialProfile::hasPriority() { return !entity->getArgument(4)->isNull(); }
-IfcNormalisedRatioMeasure IfcMaterialProfile::Priority() { return *entity->getArgument(4); }
-void IfcMaterialProfile::setPriority(IfcNormalisedRatioMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-bool IfcMaterialProfile::hasCategory() { return !entity->getArgument(5)->isNull(); }
-IfcLabel IfcMaterialProfile::Category() { return *entity->getArgument(5); }
-void IfcMaterialProfile::setCategory(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-IfcMaterialProfileSet::list IfcMaterialProfile::ToMaterialProfileSet() { RETURN_INVERSE(IfcMaterialProfileSet) }
+bool IfcMaterialProfile::hasPriority() const { return !entity->getArgument(4)->isNull(); }
+double IfcMaterialProfile::Priority() const { return *entity->getArgument(4); }
+void IfcMaterialProfile::setPriority(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+bool IfcMaterialProfile::hasCategory() const { return !entity->getArgument(5)->isNull(); }
+std::string IfcMaterialProfile::Category() const { return *entity->getArgument(5); }
+void IfcMaterialProfile::setCategory(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+IfcMaterialProfileSet::list::ptr IfcMaterialProfile::ToMaterialProfileSet() const { return entity->getInverse(Type::IfcMaterialProfileSet, 2)->as<IfcMaterialProfileSet>(); }
 bool IfcMaterialProfile::is(Type::Enum v) const { return v == Type::IfcMaterialProfile || IfcMaterialDefinition::is(v); }
 Type::Enum IfcMaterialProfile::type() const { return Type::IfcMaterialProfile; }
 Type::Enum IfcMaterialProfile::Class() { return Type::IfcMaterialProfile; }
-IfcMaterialProfile::IfcMaterialProfile(IfcAbstractEntityPtr e) : IfcMaterialDefinition((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcMaterialProfile)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcMaterialProfile::IfcMaterialProfile(boost::optional< IfcLabel > v1_Name, boost::optional< IfcText > v2_Description, IfcMaterial* v3_Material, IfcProfileDef* v4_Profile, boost::optional< IfcNormalisedRatioMeasure > v5_Priority, boost::optional< IfcLabel > v6_Category) : IfcMaterialDefinition((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_Material)); e->setArgument(3,(v4_Profile)); if (v5_Priority) { e->setArgument(4,(*v5_Priority)); } else { e->setArgument(4); } if (v6_Category) { e->setArgument(5,(*v6_Category)); } else { e->setArgument(5); } entity = e; EntityBuffer::Add(this); }
+IfcMaterialProfile::IfcMaterialProfile(IfcAbstractEntity* e) : IfcMaterialDefinition((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcMaterialProfile)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcMaterialProfile::IfcMaterialProfile(boost::optional< std::string > v1_Name, boost::optional< std::string > v2_Description, IfcMaterial* v3_Material, IfcProfileDef* v4_Profile, boost::optional< double > v5_Priority, boost::optional< std::string > v6_Category) : IfcMaterialDefinition((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_Material)); e->setArgument(3,(v4_Profile)); if (v5_Priority) { e->setArgument(4,(*v5_Priority)); } else { e->setArgument(4); } if (v6_Category) { e->setArgument(5,(*v6_Category)); } else { e->setArgument(5); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcMaterialProfileSet
-bool IfcMaterialProfileSet::hasName() { return !entity->getArgument(0)->isNull(); }
-IfcLabel IfcMaterialProfileSet::Name() { return *entity->getArgument(0); }
-void IfcMaterialProfileSet::setName(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-bool IfcMaterialProfileSet::hasDescription() { return !entity->getArgument(1)->isNull(); }
-IfcText IfcMaterialProfileSet::Description() { return *entity->getArgument(1); }
-void IfcMaterialProfileSet::setDescription(IfcText v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-SHARED_PTR< IfcTemplatedEntityList< IfcMaterialProfile > > IfcMaterialProfileSet::MaterialProfiles() { RETURN_AS_LIST(IfcMaterialProfile,2) }
-void IfcMaterialProfileSet::setMaterialProfiles(SHARED_PTR< IfcTemplatedEntityList< IfcMaterialProfile > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v->generalize()); }
-bool IfcMaterialProfileSet::hasCompositeProfile() { return !entity->getArgument(3)->isNull(); }
-IfcCompositeProfileDef* IfcMaterialProfileSet::CompositeProfile() { return (IfcCompositeProfileDef*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(3))); }
+bool IfcMaterialProfileSet::hasName() const { return !entity->getArgument(0)->isNull(); }
+std::string IfcMaterialProfileSet::Name() const { return *entity->getArgument(0); }
+void IfcMaterialProfileSet::setName(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+bool IfcMaterialProfileSet::hasDescription() const { return !entity->getArgument(1)->isNull(); }
+std::string IfcMaterialProfileSet::Description() const { return *entity->getArgument(1); }
+void IfcMaterialProfileSet::setDescription(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+IfcTemplatedEntityList< IfcMaterialProfile >::ptr IfcMaterialProfileSet::MaterialProfiles() const { IfcEntityList::ptr es = *entity->getArgument(2); return es->as<IfcMaterialProfile>(); }
+void IfcMaterialProfileSet::setMaterialProfiles(IfcTemplatedEntityList< IfcMaterialProfile >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v->generalize()); }
+bool IfcMaterialProfileSet::hasCompositeProfile() const { return !entity->getArgument(3)->isNull(); }
+IfcCompositeProfileDef* IfcMaterialProfileSet::CompositeProfile() const { return (IfcCompositeProfileDef*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(3))); }
 void IfcMaterialProfileSet::setCompositeProfile(IfcCompositeProfileDef* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
 bool IfcMaterialProfileSet::is(Type::Enum v) const { return v == Type::IfcMaterialProfileSet || IfcMaterialDefinition::is(v); }
 Type::Enum IfcMaterialProfileSet::type() const { return Type::IfcMaterialProfileSet; }
 Type::Enum IfcMaterialProfileSet::Class() { return Type::IfcMaterialProfileSet; }
-IfcMaterialProfileSet::IfcMaterialProfileSet(IfcAbstractEntityPtr e) : IfcMaterialDefinition((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcMaterialProfileSet)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcMaterialProfileSet::IfcMaterialProfileSet(boost::optional< IfcLabel > v1_Name, boost::optional< IfcText > v2_Description, SHARED_PTR< IfcTemplatedEntityList< IfcMaterialProfile > > v3_MaterialProfiles, IfcCompositeProfileDef* v4_CompositeProfile) : IfcMaterialDefinition((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_MaterialProfiles)->generalize()); e->setArgument(3,(v4_CompositeProfile)); entity = e; EntityBuffer::Add(this); }
+IfcMaterialProfileSet::IfcMaterialProfileSet(IfcAbstractEntity* e) : IfcMaterialDefinition((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcMaterialProfileSet)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcMaterialProfileSet::IfcMaterialProfileSet(boost::optional< std::string > v1_Name, boost::optional< std::string > v2_Description, IfcTemplatedEntityList< IfcMaterialProfile >::ptr v3_MaterialProfiles, IfcCompositeProfileDef* v4_CompositeProfile) : IfcMaterialDefinition((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_MaterialProfiles)->generalize()); e->setArgument(3,(v4_CompositeProfile)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcMaterialProfileSetUsage
-IfcMaterialProfileSet* IfcMaterialProfileSetUsage::ForProfileSet() { return (IfcMaterialProfileSet*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(0))); }
+IfcMaterialProfileSet* IfcMaterialProfileSetUsage::ForProfileSet() const { return (IfcMaterialProfileSet*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(0))); }
 void IfcMaterialProfileSetUsage::setForProfileSet(IfcMaterialProfileSet* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-bool IfcMaterialProfileSetUsage::hasCardinalPoint() { return !entity->getArgument(1)->isNull(); }
-IfcCardinalPointReference IfcMaterialProfileSetUsage::CardinalPoint() { return *entity->getArgument(1); }
-void IfcMaterialProfileSetUsage::setCardinalPoint(IfcCardinalPointReference v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-bool IfcMaterialProfileSetUsage::hasReferenceExtent() { return !entity->getArgument(2)->isNull(); }
-IfcPositiveLengthMeasure IfcMaterialProfileSetUsage::ReferenceExtent() { return *entity->getArgument(2); }
-void IfcMaterialProfileSetUsage::setReferenceExtent(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+bool IfcMaterialProfileSetUsage::hasCardinalPoint() const { return !entity->getArgument(1)->isNull(); }
+int IfcMaterialProfileSetUsage::CardinalPoint() const { return *entity->getArgument(1); }
+void IfcMaterialProfileSetUsage::setCardinalPoint(int v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+bool IfcMaterialProfileSetUsage::hasReferenceExtent() const { return !entity->getArgument(2)->isNull(); }
+double IfcMaterialProfileSetUsage::ReferenceExtent() const { return *entity->getArgument(2); }
+void IfcMaterialProfileSetUsage::setReferenceExtent(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
 bool IfcMaterialProfileSetUsage::is(Type::Enum v) const { return v == Type::IfcMaterialProfileSetUsage || IfcMaterialUsageDefinition::is(v); }
 Type::Enum IfcMaterialProfileSetUsage::type() const { return Type::IfcMaterialProfileSetUsage; }
 Type::Enum IfcMaterialProfileSetUsage::Class() { return Type::IfcMaterialProfileSetUsage; }
-IfcMaterialProfileSetUsage::IfcMaterialProfileSetUsage(IfcAbstractEntityPtr e) : IfcMaterialUsageDefinition((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcMaterialProfileSetUsage)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcMaterialProfileSetUsage::IfcMaterialProfileSetUsage(IfcMaterialProfileSet* v1_ForProfileSet, boost::optional< IfcCardinalPointReference > v2_CardinalPoint, boost::optional< IfcPositiveLengthMeasure > v3_ReferenceExtent) : IfcMaterialUsageDefinition((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_ForProfileSet)); if (v2_CardinalPoint) { e->setArgument(1,(*v2_CardinalPoint)); } else { e->setArgument(1); } if (v3_ReferenceExtent) { e->setArgument(2,(*v3_ReferenceExtent)); } else { e->setArgument(2); } entity = e; EntityBuffer::Add(this); }
+IfcMaterialProfileSetUsage::IfcMaterialProfileSetUsage(IfcAbstractEntity* e) : IfcMaterialUsageDefinition((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcMaterialProfileSetUsage)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcMaterialProfileSetUsage::IfcMaterialProfileSetUsage(IfcMaterialProfileSet* v1_ForProfileSet, boost::optional< int > v2_CardinalPoint, boost::optional< double > v3_ReferenceExtent) : IfcMaterialUsageDefinition((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_ForProfileSet)); if (v2_CardinalPoint) { e->setArgument(1,(*v2_CardinalPoint)); } else { e->setArgument(1); } if (v3_ReferenceExtent) { e->setArgument(2,(*v3_ReferenceExtent)); } else { e->setArgument(2); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcMaterialProfileSetUsageTapering
-IfcMaterialProfileSet* IfcMaterialProfileSetUsageTapering::ForProfileEndSet() { return (IfcMaterialProfileSet*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(3))); }
+IfcMaterialProfileSet* IfcMaterialProfileSetUsageTapering::ForProfileEndSet() const { return (IfcMaterialProfileSet*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(3))); }
 void IfcMaterialProfileSetUsageTapering::setForProfileEndSet(IfcMaterialProfileSet* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-bool IfcMaterialProfileSetUsageTapering::hasCardinalEndPoint() { return !entity->getArgument(4)->isNull(); }
-IfcCardinalPointReference IfcMaterialProfileSetUsageTapering::CardinalEndPoint() { return *entity->getArgument(4); }
-void IfcMaterialProfileSetUsageTapering::setCardinalEndPoint(IfcCardinalPointReference v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+bool IfcMaterialProfileSetUsageTapering::hasCardinalEndPoint() const { return !entity->getArgument(4)->isNull(); }
+int IfcMaterialProfileSetUsageTapering::CardinalEndPoint() const { return *entity->getArgument(4); }
+void IfcMaterialProfileSetUsageTapering::setCardinalEndPoint(int v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
 bool IfcMaterialProfileSetUsageTapering::is(Type::Enum v) const { return v == Type::IfcMaterialProfileSetUsageTapering || IfcMaterialProfileSetUsage::is(v); }
 Type::Enum IfcMaterialProfileSetUsageTapering::type() const { return Type::IfcMaterialProfileSetUsageTapering; }
 Type::Enum IfcMaterialProfileSetUsageTapering::Class() { return Type::IfcMaterialProfileSetUsageTapering; }
-IfcMaterialProfileSetUsageTapering::IfcMaterialProfileSetUsageTapering(IfcAbstractEntityPtr e) : IfcMaterialProfileSetUsage((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcMaterialProfileSetUsageTapering)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcMaterialProfileSetUsageTapering::IfcMaterialProfileSetUsageTapering(IfcMaterialProfileSet* v1_ForProfileSet, boost::optional< IfcCardinalPointReference > v2_CardinalPoint, boost::optional< IfcPositiveLengthMeasure > v3_ReferenceExtent, IfcMaterialProfileSet* v4_ForProfileEndSet, boost::optional< IfcCardinalPointReference > v5_CardinalEndPoint) : IfcMaterialProfileSetUsage((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_ForProfileSet)); if (v2_CardinalPoint) { e->setArgument(1,(*v2_CardinalPoint)); } else { e->setArgument(1); } if (v3_ReferenceExtent) { e->setArgument(2,(*v3_ReferenceExtent)); } else { e->setArgument(2); } e->setArgument(3,(v4_ForProfileEndSet)); if (v5_CardinalEndPoint) { e->setArgument(4,(*v5_CardinalEndPoint)); } else { e->setArgument(4); } entity = e; EntityBuffer::Add(this); }
+IfcMaterialProfileSetUsageTapering::IfcMaterialProfileSetUsageTapering(IfcAbstractEntity* e) : IfcMaterialProfileSetUsage((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcMaterialProfileSetUsageTapering)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcMaterialProfileSetUsageTapering::IfcMaterialProfileSetUsageTapering(IfcMaterialProfileSet* v1_ForProfileSet, boost::optional< int > v2_CardinalPoint, boost::optional< double > v3_ReferenceExtent, IfcMaterialProfileSet* v4_ForProfileEndSet, boost::optional< int > v5_CardinalEndPoint) : IfcMaterialProfileSetUsage((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_ForProfileSet)); if (v2_CardinalPoint) { e->setArgument(1,(*v2_CardinalPoint)); } else { e->setArgument(1); } if (v3_ReferenceExtent) { e->setArgument(2,(*v3_ReferenceExtent)); } else { e->setArgument(2); } e->setArgument(3,(v4_ForProfileEndSet)); if (v5_CardinalEndPoint) { e->setArgument(4,(*v5_CardinalEndPoint)); } else { e->setArgument(4); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcMaterialProfileWithOffsets
-std::vector< IfcLengthMeasure > /*[1:2]*/ IfcMaterialProfileWithOffsets::OffsetValues() { return *entity->getArgument(6); }
-void IfcMaterialProfileWithOffsets::setOffsetValues(std::vector< IfcLengthMeasure > /*[1:2]*/ v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
+std::vector< double > /*[1:2]*/ IfcMaterialProfileWithOffsets::OffsetValues() const { return *entity->getArgument(6); }
+void IfcMaterialProfileWithOffsets::setOffsetValues(std::vector< double > /*[1:2]*/ v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
 bool IfcMaterialProfileWithOffsets::is(Type::Enum v) const { return v == Type::IfcMaterialProfileWithOffsets || IfcMaterialProfile::is(v); }
 Type::Enum IfcMaterialProfileWithOffsets::type() const { return Type::IfcMaterialProfileWithOffsets; }
 Type::Enum IfcMaterialProfileWithOffsets::Class() { return Type::IfcMaterialProfileWithOffsets; }
-IfcMaterialProfileWithOffsets::IfcMaterialProfileWithOffsets(IfcAbstractEntityPtr e) : IfcMaterialProfile((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcMaterialProfileWithOffsets)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcMaterialProfileWithOffsets::IfcMaterialProfileWithOffsets(boost::optional< IfcLabel > v1_Name, boost::optional< IfcText > v2_Description, IfcMaterial* v3_Material, IfcProfileDef* v4_Profile, boost::optional< IfcNormalisedRatioMeasure > v5_Priority, boost::optional< IfcLabel > v6_Category, std::vector< IfcLengthMeasure > /*[1:2]*/ v7_OffsetValues) : IfcMaterialProfile((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_Material)); e->setArgument(3,(v4_Profile)); if (v5_Priority) { e->setArgument(4,(*v5_Priority)); } else { e->setArgument(4); } if (v6_Category) { e->setArgument(5,(*v6_Category)); } else { e->setArgument(5); } e->setArgument(6,(v7_OffsetValues)); entity = e; EntityBuffer::Add(this); }
+IfcMaterialProfileWithOffsets::IfcMaterialProfileWithOffsets(IfcAbstractEntity* e) : IfcMaterialProfile((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcMaterialProfileWithOffsets)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcMaterialProfileWithOffsets::IfcMaterialProfileWithOffsets(boost::optional< std::string > v1_Name, boost::optional< std::string > v2_Description, IfcMaterial* v3_Material, IfcProfileDef* v4_Profile, boost::optional< double > v5_Priority, boost::optional< std::string > v6_Category, std::vector< double > /*[1:2]*/ v7_OffsetValues) : IfcMaterialProfile((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_Material)); e->setArgument(3,(v4_Profile)); if (v5_Priority) { e->setArgument(4,(*v5_Priority)); } else { e->setArgument(4); } if (v6_Category) { e->setArgument(5,(*v6_Category)); } else { e->setArgument(5); } e->setArgument(6,(v7_OffsetValues)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcMaterialProperties
-IfcMaterialDefinition* IfcMaterialProperties::Material() { return (IfcMaterialDefinition*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(3))); }
+IfcMaterialDefinition* IfcMaterialProperties::Material() const { return (IfcMaterialDefinition*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(3))); }
 void IfcMaterialProperties::setMaterial(IfcMaterialDefinition* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
 bool IfcMaterialProperties::is(Type::Enum v) const { return v == Type::IfcMaterialProperties || IfcExtendedProperties::is(v); }
 Type::Enum IfcMaterialProperties::type() const { return Type::IfcMaterialProperties; }
 Type::Enum IfcMaterialProperties::Class() { return Type::IfcMaterialProperties; }
-IfcMaterialProperties::IfcMaterialProperties(IfcAbstractEntityPtr e) : IfcExtendedProperties((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcMaterialProperties)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcMaterialProperties::IfcMaterialProperties(boost::optional< IfcIdentifier > v1_Name, boost::optional< IfcText > v2_Description, SHARED_PTR< IfcTemplatedEntityList< IfcProperty > > v3_Properties, IfcMaterialDefinition* v4_Material) : IfcExtendedProperties((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_Properties)->generalize()); e->setArgument(3,(v4_Material)); entity = e; EntityBuffer::Add(this); }
+IfcMaterialProperties::IfcMaterialProperties(IfcAbstractEntity* e) : IfcExtendedProperties((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcMaterialProperties)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcMaterialProperties::IfcMaterialProperties(boost::optional< std::string > v1_Name, boost::optional< std::string > v2_Description, IfcTemplatedEntityList< IfcProperty >::ptr v3_Properties, IfcMaterialDefinition* v4_Material) : IfcExtendedProperties((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_Properties)->generalize()); e->setArgument(3,(v4_Material)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcMaterialRelationship
-IfcMaterial* IfcMaterialRelationship::RelatingMaterial() { return (IfcMaterial*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(2))); }
+IfcMaterial* IfcMaterialRelationship::RelatingMaterial() const { return (IfcMaterial*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(2))); }
 void IfcMaterialRelationship::setRelatingMaterial(IfcMaterial* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-SHARED_PTR< IfcTemplatedEntityList< IfcMaterial > > IfcMaterialRelationship::RelatedMaterials() { RETURN_AS_LIST(IfcMaterial,3) }
-void IfcMaterialRelationship::setRelatedMaterials(SHARED_PTR< IfcTemplatedEntityList< IfcMaterial > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v->generalize()); }
-bool IfcMaterialRelationship::hasExpression() { return !entity->getArgument(4)->isNull(); }
-IfcLabel IfcMaterialRelationship::Expression() { return *entity->getArgument(4); }
-void IfcMaterialRelationship::setExpression(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+IfcTemplatedEntityList< IfcMaterial >::ptr IfcMaterialRelationship::RelatedMaterials() const { IfcEntityList::ptr es = *entity->getArgument(3); return es->as<IfcMaterial>(); }
+void IfcMaterialRelationship::setRelatedMaterials(IfcTemplatedEntityList< IfcMaterial >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v->generalize()); }
+bool IfcMaterialRelationship::hasExpression() const { return !entity->getArgument(4)->isNull(); }
+std::string IfcMaterialRelationship::Expression() const { return *entity->getArgument(4); }
+void IfcMaterialRelationship::setExpression(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
 bool IfcMaterialRelationship::is(Type::Enum v) const { return v == Type::IfcMaterialRelationship || IfcResourceLevelRelationship::is(v); }
 Type::Enum IfcMaterialRelationship::type() const { return Type::IfcMaterialRelationship; }
 Type::Enum IfcMaterialRelationship::Class() { return Type::IfcMaterialRelationship; }
-IfcMaterialRelationship::IfcMaterialRelationship(IfcAbstractEntityPtr e) : IfcResourceLevelRelationship((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcMaterialRelationship)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcMaterialRelationship::IfcMaterialRelationship(boost::optional< IfcLabel > v1_Name, boost::optional< IfcText > v2_Description, IfcMaterial* v3_RelatingMaterial, SHARED_PTR< IfcTemplatedEntityList< IfcMaterial > > v4_RelatedMaterials, boost::optional< IfcLabel > v5_Expression) : IfcResourceLevelRelationship((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_RelatingMaterial)); e->setArgument(3,(v4_RelatedMaterials)->generalize()); if (v5_Expression) { e->setArgument(4,(*v5_Expression)); } else { e->setArgument(4); } entity = e; EntityBuffer::Add(this); }
+IfcMaterialRelationship::IfcMaterialRelationship(IfcAbstractEntity* e) : IfcResourceLevelRelationship((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcMaterialRelationship)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcMaterialRelationship::IfcMaterialRelationship(boost::optional< std::string > v1_Name, boost::optional< std::string > v2_Description, IfcMaterial* v3_RelatingMaterial, IfcTemplatedEntityList< IfcMaterial >::ptr v4_RelatedMaterials, boost::optional< std::string > v5_Expression) : IfcResourceLevelRelationship((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_RelatingMaterial)); e->setArgument(3,(v4_RelatedMaterials)->generalize()); if (v5_Expression) { e->setArgument(4,(*v5_Expression)); } else { e->setArgument(4); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcMaterialUsageDefinition
-IfcRelAssociatesMaterial::list IfcMaterialUsageDefinition::AssociatedTo() { RETURN_INVERSE(IfcRelAssociatesMaterial) }
+IfcRelAssociatesMaterial::list::ptr IfcMaterialUsageDefinition::AssociatedTo() const { return entity->getInverse(Type::IfcRelAssociatesMaterial, 5)->as<IfcRelAssociatesMaterial>(); }
 bool IfcMaterialUsageDefinition::is(Type::Enum v) const { return v == Type::IfcMaterialUsageDefinition; }
 Type::Enum IfcMaterialUsageDefinition::type() const { return Type::IfcMaterialUsageDefinition; }
 Type::Enum IfcMaterialUsageDefinition::Class() { return Type::IfcMaterialUsageDefinition; }
-IfcMaterialUsageDefinition::IfcMaterialUsageDefinition(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcMaterialUsageDefinition)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcMaterialUsageDefinition::IfcMaterialUsageDefinition(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcMaterialUsageDefinition)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
 IfcMaterialUsageDefinition::IfcMaterialUsageDefinition() : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcMeasureWithUnit
-IfcValue IfcMeasureWithUnit::ValueComponent() { return *entity->getArgument(0); }
-void IfcMeasureWithUnit::setValueComponent(IfcValue v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-IfcUnit IfcMeasureWithUnit::UnitComponent() { return *entity->getArgument(1); }
-void IfcMeasureWithUnit::setUnitComponent(IfcUnit v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+IfcValue* IfcMeasureWithUnit::ValueComponent() const { return (IfcValue*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(0))); }
+void IfcMeasureWithUnit::setValueComponent(IfcValue* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+IfcUnit* IfcMeasureWithUnit::UnitComponent() const { return (IfcUnit*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(1))); }
+void IfcMeasureWithUnit::setUnitComponent(IfcUnit* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
 bool IfcMeasureWithUnit::is(Type::Enum v) const { return v == Type::IfcMeasureWithUnit; }
 Type::Enum IfcMeasureWithUnit::type() const { return Type::IfcMeasureWithUnit; }
 Type::Enum IfcMeasureWithUnit::Class() { return Type::IfcMeasureWithUnit; }
-IfcMeasureWithUnit::IfcMeasureWithUnit(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcMeasureWithUnit)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcMeasureWithUnit::IfcMeasureWithUnit(IfcValue v1_ValueComponent, IfcUnit v2_UnitComponent) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_ValueComponent)); e->setArgument(1,(v2_UnitComponent)); entity = e; EntityBuffer::Add(this); }
+IfcMeasureWithUnit::IfcMeasureWithUnit(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcMeasureWithUnit)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcMeasureWithUnit::IfcMeasureWithUnit(IfcValue* v1_ValueComponent, IfcUnit* v2_UnitComponent) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_ValueComponent)); e->setArgument(1,(v2_UnitComponent)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcMechanicalFastener
-bool IfcMechanicalFastener::hasNominalDiameter() { return !entity->getArgument(8)->isNull(); }
-IfcPositiveLengthMeasure IfcMechanicalFastener::NominalDiameter() { return *entity->getArgument(8); }
-void IfcMechanicalFastener::setNominalDiameter(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
-bool IfcMechanicalFastener::hasNominalLength() { return !entity->getArgument(9)->isNull(); }
-IfcPositiveLengthMeasure IfcMechanicalFastener::NominalLength() { return *entity->getArgument(9); }
-void IfcMechanicalFastener::setNominalLength(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
-bool IfcMechanicalFastener::hasPredefinedType() { return !entity->getArgument(10)->isNull(); }
-IfcMechanicalFastenerTypeEnum::IfcMechanicalFastenerTypeEnum IfcMechanicalFastener::PredefinedType() { return IfcMechanicalFastenerTypeEnum::FromString(*entity->getArgument(10)); }
+bool IfcMechanicalFastener::hasNominalDiameter() const { return !entity->getArgument(8)->isNull(); }
+double IfcMechanicalFastener::NominalDiameter() const { return *entity->getArgument(8); }
+void IfcMechanicalFastener::setNominalDiameter(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
+bool IfcMechanicalFastener::hasNominalLength() const { return !entity->getArgument(9)->isNull(); }
+double IfcMechanicalFastener::NominalLength() const { return *entity->getArgument(9); }
+void IfcMechanicalFastener::setNominalLength(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
+bool IfcMechanicalFastener::hasPredefinedType() const { return !entity->getArgument(10)->isNull(); }
+IfcMechanicalFastenerTypeEnum::IfcMechanicalFastenerTypeEnum IfcMechanicalFastener::PredefinedType() const { return IfcMechanicalFastenerTypeEnum::FromString(*entity->getArgument(10)); }
 void IfcMechanicalFastener::setPredefinedType(IfcMechanicalFastenerTypeEnum::IfcMechanicalFastenerTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v,IfcMechanicalFastenerTypeEnum::ToString(v)); }
 bool IfcMechanicalFastener::is(Type::Enum v) const { return v == Type::IfcMechanicalFastener || IfcElementComponent::is(v); }
 Type::Enum IfcMechanicalFastener::type() const { return Type::IfcMechanicalFastener; }
 Type::Enum IfcMechanicalFastener::Class() { return Type::IfcMechanicalFastener; }
-IfcMechanicalFastener::IfcMechanicalFastener(IfcAbstractEntityPtr e) : IfcElementComponent((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcMechanicalFastener)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcMechanicalFastener::IfcMechanicalFastener(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcPositiveLengthMeasure > v9_NominalDiameter, boost::optional< IfcPositiveLengthMeasure > v10_NominalLength, boost::optional< IfcMechanicalFastenerTypeEnum::IfcMechanicalFastenerTypeEnum > v11_PredefinedType) : IfcElementComponent((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_NominalDiameter) { e->setArgument(8,(*v9_NominalDiameter)); } else { e->setArgument(8); } if (v10_NominalLength) { e->setArgument(9,(*v10_NominalLength)); } else { e->setArgument(9); } if (v11_PredefinedType) { e->setArgument(10,*v11_PredefinedType,IfcMechanicalFastenerTypeEnum::ToString(*v11_PredefinedType)); } else { e->setArgument(10); } entity = e; EntityBuffer::Add(this); }
+IfcMechanicalFastener::IfcMechanicalFastener(IfcAbstractEntity* e) : IfcElementComponent((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcMechanicalFastener)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcMechanicalFastener::IfcMechanicalFastener(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< double > v9_NominalDiameter, boost::optional< double > v10_NominalLength, boost::optional< IfcMechanicalFastenerTypeEnum::IfcMechanicalFastenerTypeEnum > v11_PredefinedType) : IfcElementComponent((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_NominalDiameter) { e->setArgument(8,(*v9_NominalDiameter)); } else { e->setArgument(8); } if (v10_NominalLength) { e->setArgument(9,(*v10_NominalLength)); } else { e->setArgument(9); } if (v11_PredefinedType) { e->setArgument(10,*v11_PredefinedType,IfcMechanicalFastenerTypeEnum::ToString(*v11_PredefinedType)); } else { e->setArgument(10); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcMechanicalFastenerType
-IfcMechanicalFastenerTypeEnum::IfcMechanicalFastenerTypeEnum IfcMechanicalFastenerType::PredefinedType() { return IfcMechanicalFastenerTypeEnum::FromString(*entity->getArgument(9)); }
+IfcMechanicalFastenerTypeEnum::IfcMechanicalFastenerTypeEnum IfcMechanicalFastenerType::PredefinedType() const { return IfcMechanicalFastenerTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcMechanicalFastenerType::setPredefinedType(IfcMechanicalFastenerTypeEnum::IfcMechanicalFastenerTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcMechanicalFastenerTypeEnum::ToString(v)); }
-bool IfcMechanicalFastenerType::hasNominalDiameter() { return !entity->getArgument(10)->isNull(); }
-IfcPositiveLengthMeasure IfcMechanicalFastenerType::NominalDiameter() { return *entity->getArgument(10); }
-void IfcMechanicalFastenerType::setNominalDiameter(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
-bool IfcMechanicalFastenerType::hasNominalLength() { return !entity->getArgument(11)->isNull(); }
-IfcPositiveLengthMeasure IfcMechanicalFastenerType::NominalLength() { return *entity->getArgument(11); }
-void IfcMechanicalFastenerType::setNominalLength(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(11,v); }
+bool IfcMechanicalFastenerType::hasNominalDiameter() const { return !entity->getArgument(10)->isNull(); }
+double IfcMechanicalFastenerType::NominalDiameter() const { return *entity->getArgument(10); }
+void IfcMechanicalFastenerType::setNominalDiameter(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
+bool IfcMechanicalFastenerType::hasNominalLength() const { return !entity->getArgument(11)->isNull(); }
+double IfcMechanicalFastenerType::NominalLength() const { return *entity->getArgument(11); }
+void IfcMechanicalFastenerType::setNominalLength(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(11,v); }
 bool IfcMechanicalFastenerType::is(Type::Enum v) const { return v == Type::IfcMechanicalFastenerType || IfcElementComponentType::is(v); }
 Type::Enum IfcMechanicalFastenerType::type() const { return Type::IfcMechanicalFastenerType; }
 Type::Enum IfcMechanicalFastenerType::Class() { return Type::IfcMechanicalFastenerType; }
-IfcMechanicalFastenerType::IfcMechanicalFastenerType(IfcAbstractEntityPtr e) : IfcElementComponentType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcMechanicalFastenerType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcMechanicalFastenerType::IfcMechanicalFastenerType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcMechanicalFastenerTypeEnum::IfcMechanicalFastenerTypeEnum v10_PredefinedType, boost::optional< IfcPositiveLengthMeasure > v11_NominalDiameter, boost::optional< IfcPositiveLengthMeasure > v12_NominalLength) : IfcElementComponentType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcMechanicalFastenerTypeEnum::ToString(v10_PredefinedType)); if (v11_NominalDiameter) { e->setArgument(10,(*v11_NominalDiameter)); } else { e->setArgument(10); } if (v12_NominalLength) { e->setArgument(11,(*v12_NominalLength)); } else { e->setArgument(11); } entity = e; EntityBuffer::Add(this); }
+IfcMechanicalFastenerType::IfcMechanicalFastenerType(IfcAbstractEntity* e) : IfcElementComponentType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcMechanicalFastenerType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcMechanicalFastenerType::IfcMechanicalFastenerType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcMechanicalFastenerTypeEnum::IfcMechanicalFastenerTypeEnum v10_PredefinedType, boost::optional< double > v11_NominalDiameter, boost::optional< double > v12_NominalLength) : IfcElementComponentType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcMechanicalFastenerTypeEnum::ToString(v10_PredefinedType)); if (v11_NominalDiameter) { e->setArgument(10,(*v11_NominalDiameter)); } else { e->setArgument(10); } if (v12_NominalLength) { e->setArgument(11,(*v12_NominalLength)); } else { e->setArgument(11); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcMedicalDevice
-bool IfcMedicalDevice::hasPredefinedType() { return !entity->getArgument(8)->isNull(); }
-IfcMedicalDeviceTypeEnum::IfcMedicalDeviceTypeEnum IfcMedicalDevice::PredefinedType() { return IfcMedicalDeviceTypeEnum::FromString(*entity->getArgument(8)); }
+bool IfcMedicalDevice::hasPredefinedType() const { return !entity->getArgument(8)->isNull(); }
+IfcMedicalDeviceTypeEnum::IfcMedicalDeviceTypeEnum IfcMedicalDevice::PredefinedType() const { return IfcMedicalDeviceTypeEnum::FromString(*entity->getArgument(8)); }
 void IfcMedicalDevice::setPredefinedType(IfcMedicalDeviceTypeEnum::IfcMedicalDeviceTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcMedicalDeviceTypeEnum::ToString(v)); }
 bool IfcMedicalDevice::is(Type::Enum v) const { return v == Type::IfcMedicalDevice || IfcFlowTerminal::is(v); }
 Type::Enum IfcMedicalDevice::type() const { return Type::IfcMedicalDevice; }
 Type::Enum IfcMedicalDevice::Class() { return Type::IfcMedicalDevice; }
-IfcMedicalDevice::IfcMedicalDevice(IfcAbstractEntityPtr e) : IfcFlowTerminal((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcMedicalDevice)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcMedicalDevice::IfcMedicalDevice(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcMedicalDeviceTypeEnum::IfcMedicalDeviceTypeEnum > v9_PredefinedType) : IfcFlowTerminal((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcMedicalDeviceTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcMedicalDevice::IfcMedicalDevice(IfcAbstractEntity* e) : IfcFlowTerminal((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcMedicalDevice)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcMedicalDevice::IfcMedicalDevice(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcMedicalDeviceTypeEnum::IfcMedicalDeviceTypeEnum > v9_PredefinedType) : IfcFlowTerminal((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcMedicalDeviceTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcMedicalDeviceType
-IfcMedicalDeviceTypeEnum::IfcMedicalDeviceTypeEnum IfcMedicalDeviceType::PredefinedType() { return IfcMedicalDeviceTypeEnum::FromString(*entity->getArgument(9)); }
+IfcMedicalDeviceTypeEnum::IfcMedicalDeviceTypeEnum IfcMedicalDeviceType::PredefinedType() const { return IfcMedicalDeviceTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcMedicalDeviceType::setPredefinedType(IfcMedicalDeviceTypeEnum::IfcMedicalDeviceTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcMedicalDeviceTypeEnum::ToString(v)); }
 bool IfcMedicalDeviceType::is(Type::Enum v) const { return v == Type::IfcMedicalDeviceType || IfcFlowTerminalType::is(v); }
 Type::Enum IfcMedicalDeviceType::type() const { return Type::IfcMedicalDeviceType; }
 Type::Enum IfcMedicalDeviceType::Class() { return Type::IfcMedicalDeviceType; }
-IfcMedicalDeviceType::IfcMedicalDeviceType(IfcAbstractEntityPtr e) : IfcFlowTerminalType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcMedicalDeviceType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcMedicalDeviceType::IfcMedicalDeviceType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcMedicalDeviceTypeEnum::IfcMedicalDeviceTypeEnum v10_PredefinedType) : IfcFlowTerminalType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcMedicalDeviceTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcMedicalDeviceType::IfcMedicalDeviceType(IfcAbstractEntity* e) : IfcFlowTerminalType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcMedicalDeviceType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcMedicalDeviceType::IfcMedicalDeviceType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcMedicalDeviceTypeEnum::IfcMedicalDeviceTypeEnum v10_PredefinedType) : IfcFlowTerminalType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcMedicalDeviceTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcMember
-bool IfcMember::hasPredefinedType() { return !entity->getArgument(8)->isNull(); }
-IfcMemberTypeEnum::IfcMemberTypeEnum IfcMember::PredefinedType() { return IfcMemberTypeEnum::FromString(*entity->getArgument(8)); }
+bool IfcMember::hasPredefinedType() const { return !entity->getArgument(8)->isNull(); }
+IfcMemberTypeEnum::IfcMemberTypeEnum IfcMember::PredefinedType() const { return IfcMemberTypeEnum::FromString(*entity->getArgument(8)); }
 void IfcMember::setPredefinedType(IfcMemberTypeEnum::IfcMemberTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcMemberTypeEnum::ToString(v)); }
 bool IfcMember::is(Type::Enum v) const { return v == Type::IfcMember || IfcBuildingElement::is(v); }
 Type::Enum IfcMember::type() const { return Type::IfcMember; }
 Type::Enum IfcMember::Class() { return Type::IfcMember; }
-IfcMember::IfcMember(IfcAbstractEntityPtr e) : IfcBuildingElement((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcMember)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcMember::IfcMember(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcMemberTypeEnum::IfcMemberTypeEnum > v9_PredefinedType) : IfcBuildingElement((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcMemberTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcMember::IfcMember(IfcAbstractEntity* e) : IfcBuildingElement((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcMember)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcMember::IfcMember(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcMemberTypeEnum::IfcMemberTypeEnum > v9_PredefinedType) : IfcBuildingElement((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcMemberTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcMemberStandardCase
 bool IfcMemberStandardCase::is(Type::Enum v) const { return v == Type::IfcMemberStandardCase || IfcMember::is(v); }
 Type::Enum IfcMemberStandardCase::type() const { return Type::IfcMemberStandardCase; }
 Type::Enum IfcMemberStandardCase::Class() { return Type::IfcMemberStandardCase; }
-IfcMemberStandardCase::IfcMemberStandardCase(IfcAbstractEntityPtr e) : IfcMember((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcMemberStandardCase)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcMemberStandardCase::IfcMemberStandardCase(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcMemberTypeEnum::IfcMemberTypeEnum > v9_PredefinedType) : IfcMember((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcMemberTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcMemberStandardCase::IfcMemberStandardCase(IfcAbstractEntity* e) : IfcMember((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcMemberStandardCase)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcMemberStandardCase::IfcMemberStandardCase(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcMemberTypeEnum::IfcMemberTypeEnum > v9_PredefinedType) : IfcMember((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcMemberTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcMemberType
-IfcMemberTypeEnum::IfcMemberTypeEnum IfcMemberType::PredefinedType() { return IfcMemberTypeEnum::FromString(*entity->getArgument(9)); }
+IfcMemberTypeEnum::IfcMemberTypeEnum IfcMemberType::PredefinedType() const { return IfcMemberTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcMemberType::setPredefinedType(IfcMemberTypeEnum::IfcMemberTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcMemberTypeEnum::ToString(v)); }
 bool IfcMemberType::is(Type::Enum v) const { return v == Type::IfcMemberType || IfcBuildingElementType::is(v); }
 Type::Enum IfcMemberType::type() const { return Type::IfcMemberType; }
 Type::Enum IfcMemberType::Class() { return Type::IfcMemberType; }
-IfcMemberType::IfcMemberType(IfcAbstractEntityPtr e) : IfcBuildingElementType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcMemberType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcMemberType::IfcMemberType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcMemberTypeEnum::IfcMemberTypeEnum v10_PredefinedType) : IfcBuildingElementType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcMemberTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcMemberType::IfcMemberType(IfcAbstractEntity* e) : IfcBuildingElementType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcMemberType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcMemberType::IfcMemberType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcMemberTypeEnum::IfcMemberTypeEnum v10_PredefinedType) : IfcBuildingElementType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcMemberTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcMetric
-IfcBenchmarkEnum::IfcBenchmarkEnum IfcMetric::Benchmark() { return IfcBenchmarkEnum::FromString(*entity->getArgument(7)); }
+IfcBenchmarkEnum::IfcBenchmarkEnum IfcMetric::Benchmark() const { return IfcBenchmarkEnum::FromString(*entity->getArgument(7)); }
 void IfcMetric::setBenchmark(IfcBenchmarkEnum::IfcBenchmarkEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v,IfcBenchmarkEnum::ToString(v)); }
-bool IfcMetric::hasValueSource() { return !entity->getArgument(8)->isNull(); }
-IfcLabel IfcMetric::ValueSource() { return *entity->getArgument(8); }
-void IfcMetric::setValueSource(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
-IfcMetricValueSelect IfcMetric::DataValue() { return *entity->getArgument(9); }
-void IfcMetric::setDataValue(IfcMetricValueSelect v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
-bool IfcMetric::hasReferencePath() { return !entity->getArgument(10)->isNull(); }
-IfcReference* IfcMetric::ReferencePath() { return (IfcReference*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(10))); }
+bool IfcMetric::hasValueSource() const { return !entity->getArgument(8)->isNull(); }
+std::string IfcMetric::ValueSource() const { return *entity->getArgument(8); }
+void IfcMetric::setValueSource(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
+IfcMetricValueSelect* IfcMetric::DataValue() const { return (IfcMetricValueSelect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(9))); }
+void IfcMetric::setDataValue(IfcMetricValueSelect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
+bool IfcMetric::hasReferencePath() const { return !entity->getArgument(10)->isNull(); }
+IfcReference* IfcMetric::ReferencePath() const { return (IfcReference*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(10))); }
 void IfcMetric::setReferencePath(IfcReference* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
 bool IfcMetric::is(Type::Enum v) const { return v == Type::IfcMetric || IfcConstraint::is(v); }
 Type::Enum IfcMetric::type() const { return Type::IfcMetric; }
 Type::Enum IfcMetric::Class() { return Type::IfcMetric; }
-IfcMetric::IfcMetric(IfcAbstractEntityPtr e) : IfcConstraint((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcMetric)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcMetric::IfcMetric(IfcLabel v1_Name, boost::optional< IfcText > v2_Description, IfcConstraintEnum::IfcConstraintEnum v3_ConstraintGrade, boost::optional< IfcLabel > v4_ConstraintSource, boost::optional< IfcActorSelect > v5_CreatingActor, boost::optional< IfcDateTime > v6_CreationTime, boost::optional< IfcLabel > v7_UserDefinedGrade, IfcBenchmarkEnum::IfcBenchmarkEnum v8_Benchmark, boost::optional< IfcLabel > v9_ValueSource, IfcMetricValueSelect v10_DataValue, IfcReference* v11_ReferencePath) : IfcConstraint((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,v3_ConstraintGrade,IfcConstraintEnum::ToString(v3_ConstraintGrade)); if (v4_ConstraintSource) { e->setArgument(3,(*v4_ConstraintSource)); } else { e->setArgument(3); } if (v5_CreatingActor) { e->setArgument(4,(*v5_CreatingActor)); } else { e->setArgument(4); } if (v6_CreationTime) { e->setArgument(5,(*v6_CreationTime)); } else { e->setArgument(5); } if (v7_UserDefinedGrade) { e->setArgument(6,(*v7_UserDefinedGrade)); } else { e->setArgument(6); } e->setArgument(7,v8_Benchmark,IfcBenchmarkEnum::ToString(v8_Benchmark)); if (v9_ValueSource) { e->setArgument(8,(*v9_ValueSource)); } else { e->setArgument(8); } e->setArgument(9,(v10_DataValue)); e->setArgument(10,(v11_ReferencePath)); entity = e; EntityBuffer::Add(this); }
+IfcMetric::IfcMetric(IfcAbstractEntity* e) : IfcConstraint((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcMetric)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcMetric::IfcMetric(std::string v1_Name, boost::optional< std::string > v2_Description, IfcConstraintEnum::IfcConstraintEnum v3_ConstraintGrade, boost::optional< std::string > v4_ConstraintSource, IfcActorSelect* v5_CreatingActor, boost::optional< std::string > v6_CreationTime, boost::optional< std::string > v7_UserDefinedGrade, IfcBenchmarkEnum::IfcBenchmarkEnum v8_Benchmark, boost::optional< std::string > v9_ValueSource, IfcMetricValueSelect* v10_DataValue, IfcReference* v11_ReferencePath) : IfcConstraint((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,v3_ConstraintGrade,IfcConstraintEnum::ToString(v3_ConstraintGrade)); if (v4_ConstraintSource) { e->setArgument(3,(*v4_ConstraintSource)); } else { e->setArgument(3); } e->setArgument(4,(v5_CreatingActor)); if (v6_CreationTime) { e->setArgument(5,(*v6_CreationTime)); } else { e->setArgument(5); } if (v7_UserDefinedGrade) { e->setArgument(6,(*v7_UserDefinedGrade)); } else { e->setArgument(6); } e->setArgument(7,v8_Benchmark,IfcBenchmarkEnum::ToString(v8_Benchmark)); if (v9_ValueSource) { e->setArgument(8,(*v9_ValueSource)); } else { e->setArgument(8); } e->setArgument(9,(v10_DataValue)); e->setArgument(10,(v11_ReferencePath)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcMirroredProfileDef
 bool IfcMirroredProfileDef::is(Type::Enum v) const { return v == Type::IfcMirroredProfileDef || IfcDerivedProfileDef::is(v); }
 Type::Enum IfcMirroredProfileDef::type() const { return Type::IfcMirroredProfileDef; }
 Type::Enum IfcMirroredProfileDef::Class() { return Type::IfcMirroredProfileDef; }
-IfcMirroredProfileDef::IfcMirroredProfileDef(IfcAbstractEntityPtr e) : IfcDerivedProfileDef((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcMirroredProfileDef)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcMirroredProfileDef::IfcMirroredProfileDef(IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< IfcLabel > v2_ProfileName, IfcProfileDef* v3_ParentProfile, boost::optional< IfcLabel > v5_Label) : IfcDerivedProfileDef((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,v1_ProfileType,IfcProfileTypeEnum::ToString(v1_ProfileType)); if (v2_ProfileName) { e->setArgument(1,(*v2_ProfileName)); } else { e->setArgument(1); } e->setArgument(2,(v3_ParentProfile)); e->setArgumentDerived(3); if (v5_Label) { e->setArgument(4,(*v5_Label)); } else { e->setArgument(4); } entity = e; EntityBuffer::Add(this); }
+IfcMirroredProfileDef::IfcMirroredProfileDef(IfcAbstractEntity* e) : IfcDerivedProfileDef((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcMirroredProfileDef)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcMirroredProfileDef::IfcMirroredProfileDef(IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< std::string > v2_ProfileName, IfcProfileDef* v3_ParentProfile, boost::optional< std::string > v5_Label) : IfcDerivedProfileDef((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,v1_ProfileType,IfcProfileTypeEnum::ToString(v1_ProfileType)); if (v2_ProfileName) { e->setArgument(1,(*v2_ProfileName)); } else { e->setArgument(1); } e->setArgument(2,(v3_ParentProfile)); e->setArgumentDerived(3); if (v5_Label) { e->setArgument(4,(*v5_Label)); } else { e->setArgument(4); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcMonetaryUnit
-IfcLabel IfcMonetaryUnit::Currency() { return *entity->getArgument(0); }
-void IfcMonetaryUnit::setCurrency(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+std::string IfcMonetaryUnit::Currency() const { return *entity->getArgument(0); }
+void IfcMonetaryUnit::setCurrency(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
 bool IfcMonetaryUnit::is(Type::Enum v) const { return v == Type::IfcMonetaryUnit; }
 Type::Enum IfcMonetaryUnit::type() const { return Type::IfcMonetaryUnit; }
 Type::Enum IfcMonetaryUnit::Class() { return Type::IfcMonetaryUnit; }
-IfcMonetaryUnit::IfcMonetaryUnit(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcMonetaryUnit)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcMonetaryUnit::IfcMonetaryUnit(IfcLabel v1_Currency) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Currency)); entity = e; EntityBuffer::Add(this); }
+IfcMonetaryUnit::IfcMonetaryUnit(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcMonetaryUnit)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcMonetaryUnit::IfcMonetaryUnit(std::string v1_Currency) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Currency)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcMotorConnection
-bool IfcMotorConnection::hasPredefinedType() { return !entity->getArgument(8)->isNull(); }
-IfcMotorConnectionTypeEnum::IfcMotorConnectionTypeEnum IfcMotorConnection::PredefinedType() { return IfcMotorConnectionTypeEnum::FromString(*entity->getArgument(8)); }
+bool IfcMotorConnection::hasPredefinedType() const { return !entity->getArgument(8)->isNull(); }
+IfcMotorConnectionTypeEnum::IfcMotorConnectionTypeEnum IfcMotorConnection::PredefinedType() const { return IfcMotorConnectionTypeEnum::FromString(*entity->getArgument(8)); }
 void IfcMotorConnection::setPredefinedType(IfcMotorConnectionTypeEnum::IfcMotorConnectionTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcMotorConnectionTypeEnum::ToString(v)); }
 bool IfcMotorConnection::is(Type::Enum v) const { return v == Type::IfcMotorConnection || IfcEnergyConversionDevice::is(v); }
 Type::Enum IfcMotorConnection::type() const { return Type::IfcMotorConnection; }
 Type::Enum IfcMotorConnection::Class() { return Type::IfcMotorConnection; }
-IfcMotorConnection::IfcMotorConnection(IfcAbstractEntityPtr e) : IfcEnergyConversionDevice((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcMotorConnection)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcMotorConnection::IfcMotorConnection(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcMotorConnectionTypeEnum::IfcMotorConnectionTypeEnum > v9_PredefinedType) : IfcEnergyConversionDevice((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcMotorConnectionTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcMotorConnection::IfcMotorConnection(IfcAbstractEntity* e) : IfcEnergyConversionDevice((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcMotorConnection)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcMotorConnection::IfcMotorConnection(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcMotorConnectionTypeEnum::IfcMotorConnectionTypeEnum > v9_PredefinedType) : IfcEnergyConversionDevice((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcMotorConnectionTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcMotorConnectionType
-IfcMotorConnectionTypeEnum::IfcMotorConnectionTypeEnum IfcMotorConnectionType::PredefinedType() { return IfcMotorConnectionTypeEnum::FromString(*entity->getArgument(9)); }
+IfcMotorConnectionTypeEnum::IfcMotorConnectionTypeEnum IfcMotorConnectionType::PredefinedType() const { return IfcMotorConnectionTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcMotorConnectionType::setPredefinedType(IfcMotorConnectionTypeEnum::IfcMotorConnectionTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcMotorConnectionTypeEnum::ToString(v)); }
 bool IfcMotorConnectionType::is(Type::Enum v) const { return v == Type::IfcMotorConnectionType || IfcEnergyConversionDeviceType::is(v); }
 Type::Enum IfcMotorConnectionType::type() const { return Type::IfcMotorConnectionType; }
 Type::Enum IfcMotorConnectionType::Class() { return Type::IfcMotorConnectionType; }
-IfcMotorConnectionType::IfcMotorConnectionType(IfcAbstractEntityPtr e) : IfcEnergyConversionDeviceType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcMotorConnectionType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcMotorConnectionType::IfcMotorConnectionType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcMotorConnectionTypeEnum::IfcMotorConnectionTypeEnum v10_PredefinedType) : IfcEnergyConversionDeviceType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcMotorConnectionTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcMotorConnectionType::IfcMotorConnectionType(IfcAbstractEntity* e) : IfcEnergyConversionDeviceType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcMotorConnectionType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcMotorConnectionType::IfcMotorConnectionType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcMotorConnectionTypeEnum::IfcMotorConnectionTypeEnum v10_PredefinedType) : IfcEnergyConversionDeviceType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcMotorConnectionTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcNamedUnit
-IfcDimensionalExponents* IfcNamedUnit::Dimensions() { return (IfcDimensionalExponents*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(0))); }
+IfcDimensionalExponents* IfcNamedUnit::Dimensions() const { return (IfcDimensionalExponents*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(0))); }
 void IfcNamedUnit::setDimensions(IfcDimensionalExponents* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-IfcUnitEnum::IfcUnitEnum IfcNamedUnit::UnitType() { return IfcUnitEnum::FromString(*entity->getArgument(1)); }
+IfcUnitEnum::IfcUnitEnum IfcNamedUnit::UnitType() const { return IfcUnitEnum::FromString(*entity->getArgument(1)); }
 void IfcNamedUnit::setUnitType(IfcUnitEnum::IfcUnitEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v,IfcUnitEnum::ToString(v)); }
 bool IfcNamedUnit::is(Type::Enum v) const { return v == Type::IfcNamedUnit; }
 Type::Enum IfcNamedUnit::type() const { return Type::IfcNamedUnit; }
 Type::Enum IfcNamedUnit::Class() { return Type::IfcNamedUnit; }
-IfcNamedUnit::IfcNamedUnit(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcNamedUnit)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcNamedUnit::IfcNamedUnit(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcNamedUnit)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
 IfcNamedUnit::IfcNamedUnit(IfcDimensionalExponents* v1_Dimensions, IfcUnitEnum::IfcUnitEnum v2_UnitType) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Dimensions)); e->setArgument(1,v2_UnitType,IfcUnitEnum::ToString(v2_UnitType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcObject
-bool IfcObject::hasObjectType() { return !entity->getArgument(4)->isNull(); }
-IfcLabel IfcObject::ObjectType() { return *entity->getArgument(4); }
-void IfcObject::setObjectType(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-IfcRelDefinesByObject::list IfcObject::IsDeclaredBy() { RETURN_INVERSE(IfcRelDefinesByObject) }
-IfcRelDefinesByObject::list IfcObject::Declares() { RETURN_INVERSE(IfcRelDefinesByObject) }
-IfcRelDefinesByType::list IfcObject::IsTypedBy() { RETURN_INVERSE(IfcRelDefinesByType) }
-IfcRelDefinesByProperties::list IfcObject::IsDefinedBy() { RETURN_INVERSE(IfcRelDefinesByProperties) }
+bool IfcObject::hasObjectType() const { return !entity->getArgument(4)->isNull(); }
+std::string IfcObject::ObjectType() const { return *entity->getArgument(4); }
+void IfcObject::setObjectType(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+IfcRelDefinesByObject::list::ptr IfcObject::IsDeclaredBy() const { return entity->getInverse(Type::IfcRelDefinesByObject, 4)->as<IfcRelDefinesByObject>(); }
+IfcRelDefinesByObject::list::ptr IfcObject::Declares() const { return entity->getInverse(Type::IfcRelDefinesByObject, 5)->as<IfcRelDefinesByObject>(); }
+IfcRelDefinesByType::list::ptr IfcObject::IsTypedBy() const { return entity->getInverse(Type::IfcRelDefinesByType, 4)->as<IfcRelDefinesByType>(); }
+IfcRelDefinesByProperties::list::ptr IfcObject::IsDefinedBy() const { return entity->getInverse(Type::IfcRelDefinesByProperties, 4)->as<IfcRelDefinesByProperties>(); }
 bool IfcObject::is(Type::Enum v) const { return v == Type::IfcObject || IfcObjectDefinition::is(v); }
 Type::Enum IfcObject::type() const { return Type::IfcObject; }
 Type::Enum IfcObject::Class() { return Type::IfcObject; }
-IfcObject::IfcObject(IfcAbstractEntityPtr e) : IfcObjectDefinition((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcObject)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcObject::IfcObject(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType) : IfcObjectDefinition((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } entity = e; EntityBuffer::Add(this); }
+IfcObject::IfcObject(IfcAbstractEntity* e) : IfcObjectDefinition((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcObject)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcObject::IfcObject(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType) : IfcObjectDefinition((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcObjectDefinition
-IfcRelAssigns::list IfcObjectDefinition::HasAssignments() { RETURN_INVERSE(IfcRelAssigns) }
-IfcRelNests::list IfcObjectDefinition::Nests() { RETURN_INVERSE(IfcRelNests) }
-IfcRelNests::list IfcObjectDefinition::IsNestedBy() { RETURN_INVERSE(IfcRelNests) }
-IfcRelDeclares::list IfcObjectDefinition::HasContext() { RETURN_INVERSE(IfcRelDeclares) }
-IfcRelAggregates::list IfcObjectDefinition::IsDecomposedBy() { RETURN_INVERSE(IfcRelAggregates) }
-IfcRelAggregates::list IfcObjectDefinition::Decomposes() { RETURN_INVERSE(IfcRelAggregates) }
-IfcRelAssociates::list IfcObjectDefinition::HasAssociations() { RETURN_INVERSE(IfcRelAssociates) }
+IfcRelAssigns::list::ptr IfcObjectDefinition::HasAssignments() const { return entity->getInverse(Type::IfcRelAssigns, 4)->as<IfcRelAssigns>(); }
+IfcRelNests::list::ptr IfcObjectDefinition::Nests() const { return entity->getInverse(Type::IfcRelNests, 5)->as<IfcRelNests>(); }
+IfcRelNests::list::ptr IfcObjectDefinition::IsNestedBy() const { return entity->getInverse(Type::IfcRelNests, 4)->as<IfcRelNests>(); }
+IfcRelDeclares::list::ptr IfcObjectDefinition::HasContext() const { return entity->getInverse(Type::IfcRelDeclares, 5)->as<IfcRelDeclares>(); }
+IfcRelAggregates::list::ptr IfcObjectDefinition::IsDecomposedBy() const { return entity->getInverse(Type::IfcRelAggregates, 4)->as<IfcRelAggregates>(); }
+IfcRelAggregates::list::ptr IfcObjectDefinition::Decomposes() const { return entity->getInverse(Type::IfcRelAggregates, 5)->as<IfcRelAggregates>(); }
+IfcRelAssociates::list::ptr IfcObjectDefinition::HasAssociations() const { return entity->getInverse(Type::IfcRelAssociates, 4)->as<IfcRelAssociates>(); }
 bool IfcObjectDefinition::is(Type::Enum v) const { return v == Type::IfcObjectDefinition || IfcRoot::is(v); }
 Type::Enum IfcObjectDefinition::type() const { return Type::IfcObjectDefinition; }
 Type::Enum IfcObjectDefinition::Class() { return Type::IfcObjectDefinition; }
-IfcObjectDefinition::IfcObjectDefinition(IfcAbstractEntityPtr e) : IfcRoot((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcObjectDefinition)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcObjectDefinition::IfcObjectDefinition(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description) : IfcRoot((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } entity = e; EntityBuffer::Add(this); }
+IfcObjectDefinition::IfcObjectDefinition(IfcAbstractEntity* e) : IfcRoot((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcObjectDefinition)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcObjectDefinition::IfcObjectDefinition(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description) : IfcRoot((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcObjectPlacement
-IfcProduct::list IfcObjectPlacement::PlacesObject() { RETURN_INVERSE(IfcProduct) }
-IfcLocalPlacement::list IfcObjectPlacement::ReferencedByPlacements() { RETURN_INVERSE(IfcLocalPlacement) }
+IfcProduct::list::ptr IfcObjectPlacement::PlacesObject() const { return entity->getInverse(Type::IfcProduct, 5)->as<IfcProduct>(); }
+IfcLocalPlacement::list::ptr IfcObjectPlacement::ReferencedByPlacements() const { return entity->getInverse(Type::IfcLocalPlacement, 0)->as<IfcLocalPlacement>(); }
 bool IfcObjectPlacement::is(Type::Enum v) const { return v == Type::IfcObjectPlacement; }
 Type::Enum IfcObjectPlacement::type() const { return Type::IfcObjectPlacement; }
 Type::Enum IfcObjectPlacement::Class() { return Type::IfcObjectPlacement; }
-IfcObjectPlacement::IfcObjectPlacement(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcObjectPlacement)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcObjectPlacement::IfcObjectPlacement(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcObjectPlacement)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
 IfcObjectPlacement::IfcObjectPlacement() : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcObjective
-bool IfcObjective::hasBenchmarkValues() { return !entity->getArgument(7)->isNull(); }
-SHARED_PTR< IfcTemplatedEntityList< IfcConstraint > > IfcObjective::BenchmarkValues() { RETURN_AS_LIST(IfcConstraint,7) }
-void IfcObjective::setBenchmarkValues(SHARED_PTR< IfcTemplatedEntityList< IfcConstraint > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v->generalize()); }
-bool IfcObjective::hasLogicalAggregator() { return !entity->getArgument(8)->isNull(); }
-IfcLogicalOperatorEnum::IfcLogicalOperatorEnum IfcObjective::LogicalAggregator() { return IfcLogicalOperatorEnum::FromString(*entity->getArgument(8)); }
+bool IfcObjective::hasBenchmarkValues() const { return !entity->getArgument(7)->isNull(); }
+IfcTemplatedEntityList< IfcConstraint >::ptr IfcObjective::BenchmarkValues() const { IfcEntityList::ptr es = *entity->getArgument(7); return es->as<IfcConstraint>(); }
+void IfcObjective::setBenchmarkValues(IfcTemplatedEntityList< IfcConstraint >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v->generalize()); }
+bool IfcObjective::hasLogicalAggregator() const { return !entity->getArgument(8)->isNull(); }
+IfcLogicalOperatorEnum::IfcLogicalOperatorEnum IfcObjective::LogicalAggregator() const { return IfcLogicalOperatorEnum::FromString(*entity->getArgument(8)); }
 void IfcObjective::setLogicalAggregator(IfcLogicalOperatorEnum::IfcLogicalOperatorEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcLogicalOperatorEnum::ToString(v)); }
-IfcObjectiveEnum::IfcObjectiveEnum IfcObjective::ObjectiveQualifier() { return IfcObjectiveEnum::FromString(*entity->getArgument(9)); }
+IfcObjectiveEnum::IfcObjectiveEnum IfcObjective::ObjectiveQualifier() const { return IfcObjectiveEnum::FromString(*entity->getArgument(9)); }
 void IfcObjective::setObjectiveQualifier(IfcObjectiveEnum::IfcObjectiveEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcObjectiveEnum::ToString(v)); }
-bool IfcObjective::hasUserDefinedQualifier() { return !entity->getArgument(10)->isNull(); }
-IfcLabel IfcObjective::UserDefinedQualifier() { return *entity->getArgument(10); }
-void IfcObjective::setUserDefinedQualifier(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
+bool IfcObjective::hasUserDefinedQualifier() const { return !entity->getArgument(10)->isNull(); }
+std::string IfcObjective::UserDefinedQualifier() const { return *entity->getArgument(10); }
+void IfcObjective::setUserDefinedQualifier(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
 bool IfcObjective::is(Type::Enum v) const { return v == Type::IfcObjective || IfcConstraint::is(v); }
 Type::Enum IfcObjective::type() const { return Type::IfcObjective; }
 Type::Enum IfcObjective::Class() { return Type::IfcObjective; }
-IfcObjective::IfcObjective(IfcAbstractEntityPtr e) : IfcConstraint((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcObjective)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcObjective::IfcObjective(IfcLabel v1_Name, boost::optional< IfcText > v2_Description, IfcConstraintEnum::IfcConstraintEnum v3_ConstraintGrade, boost::optional< IfcLabel > v4_ConstraintSource, boost::optional< IfcActorSelect > v5_CreatingActor, boost::optional< IfcDateTime > v6_CreationTime, boost::optional< IfcLabel > v7_UserDefinedGrade, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcConstraint > > > v8_BenchmarkValues, boost::optional< IfcLogicalOperatorEnum::IfcLogicalOperatorEnum > v9_LogicalAggregator, IfcObjectiveEnum::IfcObjectiveEnum v10_ObjectiveQualifier, boost::optional< IfcLabel > v11_UserDefinedQualifier) : IfcConstraint((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,v3_ConstraintGrade,IfcConstraintEnum::ToString(v3_ConstraintGrade)); if (v4_ConstraintSource) { e->setArgument(3,(*v4_ConstraintSource)); } else { e->setArgument(3); } if (v5_CreatingActor) { e->setArgument(4,(*v5_CreatingActor)); } else { e->setArgument(4); } if (v6_CreationTime) { e->setArgument(5,(*v6_CreationTime)); } else { e->setArgument(5); } if (v7_UserDefinedGrade) { e->setArgument(6,(*v7_UserDefinedGrade)); } else { e->setArgument(6); } if (v8_BenchmarkValues) { e->setArgument(7,(*v8_BenchmarkValues)->generalize()); } else { e->setArgument(7); } if (v9_LogicalAggregator) { e->setArgument(8,*v9_LogicalAggregator,IfcLogicalOperatorEnum::ToString(*v9_LogicalAggregator)); } else { e->setArgument(8); } e->setArgument(9,v10_ObjectiveQualifier,IfcObjectiveEnum::ToString(v10_ObjectiveQualifier)); if (v11_UserDefinedQualifier) { e->setArgument(10,(*v11_UserDefinedQualifier)); } else { e->setArgument(10); } entity = e; EntityBuffer::Add(this); }
+IfcObjective::IfcObjective(IfcAbstractEntity* e) : IfcConstraint((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcObjective)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcObjective::IfcObjective(std::string v1_Name, boost::optional< std::string > v2_Description, IfcConstraintEnum::IfcConstraintEnum v3_ConstraintGrade, boost::optional< std::string > v4_ConstraintSource, IfcActorSelect* v5_CreatingActor, boost::optional< std::string > v6_CreationTime, boost::optional< std::string > v7_UserDefinedGrade, boost::optional< IfcTemplatedEntityList< IfcConstraint >::ptr > v8_BenchmarkValues, boost::optional< IfcLogicalOperatorEnum::IfcLogicalOperatorEnum > v9_LogicalAggregator, IfcObjectiveEnum::IfcObjectiveEnum v10_ObjectiveQualifier, boost::optional< std::string > v11_UserDefinedQualifier) : IfcConstraint((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,v3_ConstraintGrade,IfcConstraintEnum::ToString(v3_ConstraintGrade)); if (v4_ConstraintSource) { e->setArgument(3,(*v4_ConstraintSource)); } else { e->setArgument(3); } e->setArgument(4,(v5_CreatingActor)); if (v6_CreationTime) { e->setArgument(5,(*v6_CreationTime)); } else { e->setArgument(5); } if (v7_UserDefinedGrade) { e->setArgument(6,(*v7_UserDefinedGrade)); } else { e->setArgument(6); } if (v8_BenchmarkValues) { e->setArgument(7,(*v8_BenchmarkValues)->generalize()); } else { e->setArgument(7); } if (v9_LogicalAggregator) { e->setArgument(8,*v9_LogicalAggregator,IfcLogicalOperatorEnum::ToString(*v9_LogicalAggregator)); } else { e->setArgument(8); } e->setArgument(9,v10_ObjectiveQualifier,IfcObjectiveEnum::ToString(v10_ObjectiveQualifier)); if (v11_UserDefinedQualifier) { e->setArgument(10,(*v11_UserDefinedQualifier)); } else { e->setArgument(10); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcOccupant
-bool IfcOccupant::hasPredefinedType() { return !entity->getArgument(6)->isNull(); }
-IfcOccupantTypeEnum::IfcOccupantTypeEnum IfcOccupant::PredefinedType() { return IfcOccupantTypeEnum::FromString(*entity->getArgument(6)); }
+bool IfcOccupant::hasPredefinedType() const { return !entity->getArgument(6)->isNull(); }
+IfcOccupantTypeEnum::IfcOccupantTypeEnum IfcOccupant::PredefinedType() const { return IfcOccupantTypeEnum::FromString(*entity->getArgument(6)); }
 void IfcOccupant::setPredefinedType(IfcOccupantTypeEnum::IfcOccupantTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v,IfcOccupantTypeEnum::ToString(v)); }
 bool IfcOccupant::is(Type::Enum v) const { return v == Type::IfcOccupant || IfcActor::is(v); }
 Type::Enum IfcOccupant::type() const { return Type::IfcOccupant; }
 Type::Enum IfcOccupant::Class() { return Type::IfcOccupant; }
-IfcOccupant::IfcOccupant(IfcAbstractEntityPtr e) : IfcActor((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcOccupant)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcOccupant::IfcOccupant(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcActorSelect v6_TheActor, boost::optional< IfcOccupantTypeEnum::IfcOccupantTypeEnum > v7_PredefinedType) : IfcActor((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_TheActor)); if (v7_PredefinedType) { e->setArgument(6,*v7_PredefinedType,IfcOccupantTypeEnum::ToString(*v7_PredefinedType)); } else { e->setArgument(6); } entity = e; EntityBuffer::Add(this); }
+IfcOccupant::IfcOccupant(IfcAbstractEntity* e) : IfcActor((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcOccupant)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcOccupant::IfcOccupant(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcActorSelect* v6_TheActor, boost::optional< IfcOccupantTypeEnum::IfcOccupantTypeEnum > v7_PredefinedType) : IfcActor((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_TheActor)); if (v7_PredefinedType) { e->setArgument(6,*v7_PredefinedType,IfcOccupantTypeEnum::ToString(*v7_PredefinedType)); } else { e->setArgument(6); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcOffsetCurve2D
-IfcCurve* IfcOffsetCurve2D::BasisCurve() { return (IfcCurve*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(0))); }
+IfcCurve* IfcOffsetCurve2D::BasisCurve() const { return (IfcCurve*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(0))); }
 void IfcOffsetCurve2D::setBasisCurve(IfcCurve* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-IfcLengthMeasure IfcOffsetCurve2D::Distance() { return *entity->getArgument(1); }
-void IfcOffsetCurve2D::setDistance(IfcLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-bool IfcOffsetCurve2D::SelfIntersect() { return *entity->getArgument(2); }
+double IfcOffsetCurve2D::Distance() const { return *entity->getArgument(1); }
+void IfcOffsetCurve2D::setDistance(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+bool IfcOffsetCurve2D::SelfIntersect() const { return *entity->getArgument(2); }
 void IfcOffsetCurve2D::setSelfIntersect(bool v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
 bool IfcOffsetCurve2D::is(Type::Enum v) const { return v == Type::IfcOffsetCurve2D || IfcCurve::is(v); }
 Type::Enum IfcOffsetCurve2D::type() const { return Type::IfcOffsetCurve2D; }
 Type::Enum IfcOffsetCurve2D::Class() { return Type::IfcOffsetCurve2D; }
-IfcOffsetCurve2D::IfcOffsetCurve2D(IfcAbstractEntityPtr e) : IfcCurve((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcOffsetCurve2D)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcOffsetCurve2D::IfcOffsetCurve2D(IfcCurve* v1_BasisCurve, IfcLengthMeasure v2_Distance, bool v3_SelfIntersect) : IfcCurve((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_BasisCurve)); e->setArgument(1,(v2_Distance)); e->setArgument(2,(v3_SelfIntersect)); entity = e; EntityBuffer::Add(this); }
+IfcOffsetCurve2D::IfcOffsetCurve2D(IfcAbstractEntity* e) : IfcCurve((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcOffsetCurve2D)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcOffsetCurve2D::IfcOffsetCurve2D(IfcCurve* v1_BasisCurve, double v2_Distance, bool v3_SelfIntersect) : IfcCurve((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_BasisCurve)); e->setArgument(1,(v2_Distance)); e->setArgument(2,(v3_SelfIntersect)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcOffsetCurve3D
-IfcCurve* IfcOffsetCurve3D::BasisCurve() { return (IfcCurve*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(0))); }
+IfcCurve* IfcOffsetCurve3D::BasisCurve() const { return (IfcCurve*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(0))); }
 void IfcOffsetCurve3D::setBasisCurve(IfcCurve* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-IfcLengthMeasure IfcOffsetCurve3D::Distance() { return *entity->getArgument(1); }
-void IfcOffsetCurve3D::setDistance(IfcLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-bool IfcOffsetCurve3D::SelfIntersect() { return *entity->getArgument(2); }
+double IfcOffsetCurve3D::Distance() const { return *entity->getArgument(1); }
+void IfcOffsetCurve3D::setDistance(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+bool IfcOffsetCurve3D::SelfIntersect() const { return *entity->getArgument(2); }
 void IfcOffsetCurve3D::setSelfIntersect(bool v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-IfcDirection* IfcOffsetCurve3D::RefDirection() { return (IfcDirection*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(3))); }
+IfcDirection* IfcOffsetCurve3D::RefDirection() const { return (IfcDirection*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(3))); }
 void IfcOffsetCurve3D::setRefDirection(IfcDirection* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
 bool IfcOffsetCurve3D::is(Type::Enum v) const { return v == Type::IfcOffsetCurve3D || IfcCurve::is(v); }
 Type::Enum IfcOffsetCurve3D::type() const { return Type::IfcOffsetCurve3D; }
 Type::Enum IfcOffsetCurve3D::Class() { return Type::IfcOffsetCurve3D; }
-IfcOffsetCurve3D::IfcOffsetCurve3D(IfcAbstractEntityPtr e) : IfcCurve((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcOffsetCurve3D)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcOffsetCurve3D::IfcOffsetCurve3D(IfcCurve* v1_BasisCurve, IfcLengthMeasure v2_Distance, bool v3_SelfIntersect, IfcDirection* v4_RefDirection) : IfcCurve((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_BasisCurve)); e->setArgument(1,(v2_Distance)); e->setArgument(2,(v3_SelfIntersect)); e->setArgument(3,(v4_RefDirection)); entity = e; EntityBuffer::Add(this); }
+IfcOffsetCurve3D::IfcOffsetCurve3D(IfcAbstractEntity* e) : IfcCurve((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcOffsetCurve3D)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcOffsetCurve3D::IfcOffsetCurve3D(IfcCurve* v1_BasisCurve, double v2_Distance, bool v3_SelfIntersect, IfcDirection* v4_RefDirection) : IfcCurve((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_BasisCurve)); e->setArgument(1,(v2_Distance)); e->setArgument(2,(v3_SelfIntersect)); e->setArgument(3,(v4_RefDirection)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcOpenShell
 bool IfcOpenShell::is(Type::Enum v) const { return v == Type::IfcOpenShell || IfcConnectedFaceSet::is(v); }
 Type::Enum IfcOpenShell::type() const { return Type::IfcOpenShell; }
 Type::Enum IfcOpenShell::Class() { return Type::IfcOpenShell; }
-IfcOpenShell::IfcOpenShell(IfcAbstractEntityPtr e) : IfcConnectedFaceSet((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcOpenShell)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcOpenShell::IfcOpenShell(SHARED_PTR< IfcTemplatedEntityList< IfcFace > > v1_CfsFaces) : IfcConnectedFaceSet((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_CfsFaces)->generalize()); entity = e; EntityBuffer::Add(this); }
+IfcOpenShell::IfcOpenShell(IfcAbstractEntity* e) : IfcConnectedFaceSet((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcOpenShell)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcOpenShell::IfcOpenShell(IfcTemplatedEntityList< IfcFace >::ptr v1_CfsFaces) : IfcConnectedFaceSet((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_CfsFaces)->generalize()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcOpeningElement
-bool IfcOpeningElement::hasPredefinedType() { return !entity->getArgument(8)->isNull(); }
-IfcOpeningElementTypeEnum::IfcOpeningElementTypeEnum IfcOpeningElement::PredefinedType() { return IfcOpeningElementTypeEnum::FromString(*entity->getArgument(8)); }
+bool IfcOpeningElement::hasPredefinedType() const { return !entity->getArgument(8)->isNull(); }
+IfcOpeningElementTypeEnum::IfcOpeningElementTypeEnum IfcOpeningElement::PredefinedType() const { return IfcOpeningElementTypeEnum::FromString(*entity->getArgument(8)); }
 void IfcOpeningElement::setPredefinedType(IfcOpeningElementTypeEnum::IfcOpeningElementTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcOpeningElementTypeEnum::ToString(v)); }
-IfcRelFillsElement::list IfcOpeningElement::HasFillings() { RETURN_INVERSE(IfcRelFillsElement) }
+IfcRelFillsElement::list::ptr IfcOpeningElement::HasFillings() const { return entity->getInverse(Type::IfcRelFillsElement, 4)->as<IfcRelFillsElement>(); }
 bool IfcOpeningElement::is(Type::Enum v) const { return v == Type::IfcOpeningElement || IfcFeatureElementSubtraction::is(v); }
 Type::Enum IfcOpeningElement::type() const { return Type::IfcOpeningElement; }
 Type::Enum IfcOpeningElement::Class() { return Type::IfcOpeningElement; }
-IfcOpeningElement::IfcOpeningElement(IfcAbstractEntityPtr e) : IfcFeatureElementSubtraction((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcOpeningElement)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcOpeningElement::IfcOpeningElement(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcOpeningElementTypeEnum::IfcOpeningElementTypeEnum > v9_PredefinedType) : IfcFeatureElementSubtraction((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcOpeningElementTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcOpeningElement::IfcOpeningElement(IfcAbstractEntity* e) : IfcFeatureElementSubtraction((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcOpeningElement)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcOpeningElement::IfcOpeningElement(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcOpeningElementTypeEnum::IfcOpeningElementTypeEnum > v9_PredefinedType) : IfcFeatureElementSubtraction((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcOpeningElementTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcOpeningStandardCase
 bool IfcOpeningStandardCase::is(Type::Enum v) const { return v == Type::IfcOpeningStandardCase || IfcOpeningElement::is(v); }
 Type::Enum IfcOpeningStandardCase::type() const { return Type::IfcOpeningStandardCase; }
 Type::Enum IfcOpeningStandardCase::Class() { return Type::IfcOpeningStandardCase; }
-IfcOpeningStandardCase::IfcOpeningStandardCase(IfcAbstractEntityPtr e) : IfcOpeningElement((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcOpeningStandardCase)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcOpeningStandardCase::IfcOpeningStandardCase(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcOpeningElementTypeEnum::IfcOpeningElementTypeEnum > v9_PredefinedType) : IfcOpeningElement((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcOpeningElementTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcOpeningStandardCase::IfcOpeningStandardCase(IfcAbstractEntity* e) : IfcOpeningElement((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcOpeningStandardCase)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcOpeningStandardCase::IfcOpeningStandardCase(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcOpeningElementTypeEnum::IfcOpeningElementTypeEnum > v9_PredefinedType) : IfcOpeningElement((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcOpeningElementTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcOrganization
-bool IfcOrganization::hasIdentification() { return !entity->getArgument(0)->isNull(); }
-IfcIdentifier IfcOrganization::Identification() { return *entity->getArgument(0); }
-void IfcOrganization::setIdentification(IfcIdentifier v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-IfcLabel IfcOrganization::Name() { return *entity->getArgument(1); }
-void IfcOrganization::setName(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-bool IfcOrganization::hasDescription() { return !entity->getArgument(2)->isNull(); }
-IfcText IfcOrganization::Description() { return *entity->getArgument(2); }
-void IfcOrganization::setDescription(IfcText v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-bool IfcOrganization::hasRoles() { return !entity->getArgument(3)->isNull(); }
-SHARED_PTR< IfcTemplatedEntityList< IfcActorRole > > IfcOrganization::Roles() { RETURN_AS_LIST(IfcActorRole,3) }
-void IfcOrganization::setRoles(SHARED_PTR< IfcTemplatedEntityList< IfcActorRole > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v->generalize()); }
-bool IfcOrganization::hasAddresses() { return !entity->getArgument(4)->isNull(); }
-SHARED_PTR< IfcTemplatedEntityList< IfcAddress > > IfcOrganization::Addresses() { RETURN_AS_LIST(IfcAddress,4) }
-void IfcOrganization::setAddresses(SHARED_PTR< IfcTemplatedEntityList< IfcAddress > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v->generalize()); }
-IfcOrganizationRelationship::list IfcOrganization::IsRelatedBy() { RETURN_INVERSE(IfcOrganizationRelationship) }
-IfcOrganizationRelationship::list IfcOrganization::Relates() { RETURN_INVERSE(IfcOrganizationRelationship) }
-IfcPersonAndOrganization::list IfcOrganization::Engages() { RETURN_INVERSE(IfcPersonAndOrganization) }
+bool IfcOrganization::hasIdentification() const { return !entity->getArgument(0)->isNull(); }
+std::string IfcOrganization::Identification() const { return *entity->getArgument(0); }
+void IfcOrganization::setIdentification(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+std::string IfcOrganization::Name() const { return *entity->getArgument(1); }
+void IfcOrganization::setName(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+bool IfcOrganization::hasDescription() const { return !entity->getArgument(2)->isNull(); }
+std::string IfcOrganization::Description() const { return *entity->getArgument(2); }
+void IfcOrganization::setDescription(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+bool IfcOrganization::hasRoles() const { return !entity->getArgument(3)->isNull(); }
+IfcTemplatedEntityList< IfcActorRole >::ptr IfcOrganization::Roles() const { IfcEntityList::ptr es = *entity->getArgument(3); return es->as<IfcActorRole>(); }
+void IfcOrganization::setRoles(IfcTemplatedEntityList< IfcActorRole >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v->generalize()); }
+bool IfcOrganization::hasAddresses() const { return !entity->getArgument(4)->isNull(); }
+IfcTemplatedEntityList< IfcAddress >::ptr IfcOrganization::Addresses() const { IfcEntityList::ptr es = *entity->getArgument(4); return es->as<IfcAddress>(); }
+void IfcOrganization::setAddresses(IfcTemplatedEntityList< IfcAddress >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v->generalize()); }
+IfcOrganizationRelationship::list::ptr IfcOrganization::IsRelatedBy() const { return entity->getInverse(Type::IfcOrganizationRelationship, 3)->as<IfcOrganizationRelationship>(); }
+IfcOrganizationRelationship::list::ptr IfcOrganization::Relates() const { return entity->getInverse(Type::IfcOrganizationRelationship, 2)->as<IfcOrganizationRelationship>(); }
+IfcPersonAndOrganization::list::ptr IfcOrganization::Engages() const { return entity->getInverse(Type::IfcPersonAndOrganization, 1)->as<IfcPersonAndOrganization>(); }
 bool IfcOrganization::is(Type::Enum v) const { return v == Type::IfcOrganization; }
 Type::Enum IfcOrganization::type() const { return Type::IfcOrganization; }
 Type::Enum IfcOrganization::Class() { return Type::IfcOrganization; }
-IfcOrganization::IfcOrganization(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcOrganization)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcOrganization::IfcOrganization(boost::optional< IfcIdentifier > v1_Identification, IfcLabel v2_Name, boost::optional< IfcText > v3_Description, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcActorRole > > > v4_Roles, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcAddress > > > v5_Addresses) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Identification) { e->setArgument(0,(*v1_Identification)); } else { e->setArgument(0); } e->setArgument(1,(v2_Name)); if (v3_Description) { e->setArgument(2,(*v3_Description)); } else { e->setArgument(2); } if (v4_Roles) { e->setArgument(3,(*v4_Roles)->generalize()); } else { e->setArgument(3); } if (v5_Addresses) { e->setArgument(4,(*v5_Addresses)->generalize()); } else { e->setArgument(4); } entity = e; EntityBuffer::Add(this); }
+IfcOrganization::IfcOrganization(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcOrganization)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcOrganization::IfcOrganization(boost::optional< std::string > v1_Identification, std::string v2_Name, boost::optional< std::string > v3_Description, boost::optional< IfcTemplatedEntityList< IfcActorRole >::ptr > v4_Roles, boost::optional< IfcTemplatedEntityList< IfcAddress >::ptr > v5_Addresses) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Identification) { e->setArgument(0,(*v1_Identification)); } else { e->setArgument(0); } e->setArgument(1,(v2_Name)); if (v3_Description) { e->setArgument(2,(*v3_Description)); } else { e->setArgument(2); } if (v4_Roles) { e->setArgument(3,(*v4_Roles)->generalize()); } else { e->setArgument(3); } if (v5_Addresses) { e->setArgument(4,(*v5_Addresses)->generalize()); } else { e->setArgument(4); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcOrganizationRelationship
-IfcOrganization* IfcOrganizationRelationship::RelatingOrganization() { return (IfcOrganization*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(2))); }
+IfcOrganization* IfcOrganizationRelationship::RelatingOrganization() const { return (IfcOrganization*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(2))); }
 void IfcOrganizationRelationship::setRelatingOrganization(IfcOrganization* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-SHARED_PTR< IfcTemplatedEntityList< IfcOrganization > > IfcOrganizationRelationship::RelatedOrganizations() { RETURN_AS_LIST(IfcOrganization,3) }
-void IfcOrganizationRelationship::setRelatedOrganizations(SHARED_PTR< IfcTemplatedEntityList< IfcOrganization > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v->generalize()); }
+IfcTemplatedEntityList< IfcOrganization >::ptr IfcOrganizationRelationship::RelatedOrganizations() const { IfcEntityList::ptr es = *entity->getArgument(3); return es->as<IfcOrganization>(); }
+void IfcOrganizationRelationship::setRelatedOrganizations(IfcTemplatedEntityList< IfcOrganization >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v->generalize()); }
 bool IfcOrganizationRelationship::is(Type::Enum v) const { return v == Type::IfcOrganizationRelationship || IfcResourceLevelRelationship::is(v); }
 Type::Enum IfcOrganizationRelationship::type() const { return Type::IfcOrganizationRelationship; }
 Type::Enum IfcOrganizationRelationship::Class() { return Type::IfcOrganizationRelationship; }
-IfcOrganizationRelationship::IfcOrganizationRelationship(IfcAbstractEntityPtr e) : IfcResourceLevelRelationship((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcOrganizationRelationship)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcOrganizationRelationship::IfcOrganizationRelationship(boost::optional< IfcLabel > v1_Name, boost::optional< IfcText > v2_Description, IfcOrganization* v3_RelatingOrganization, SHARED_PTR< IfcTemplatedEntityList< IfcOrganization > > v4_RelatedOrganizations) : IfcResourceLevelRelationship((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_RelatingOrganization)); e->setArgument(3,(v4_RelatedOrganizations)->generalize()); entity = e; EntityBuffer::Add(this); }
+IfcOrganizationRelationship::IfcOrganizationRelationship(IfcAbstractEntity* e) : IfcResourceLevelRelationship((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcOrganizationRelationship)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcOrganizationRelationship::IfcOrganizationRelationship(boost::optional< std::string > v1_Name, boost::optional< std::string > v2_Description, IfcOrganization* v3_RelatingOrganization, IfcTemplatedEntityList< IfcOrganization >::ptr v4_RelatedOrganizations) : IfcResourceLevelRelationship((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_RelatingOrganization)); e->setArgument(3,(v4_RelatedOrganizations)->generalize()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcOrientedEdge
-IfcEdge* IfcOrientedEdge::EdgeElement() { return (IfcEdge*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(2))); }
+IfcEdge* IfcOrientedEdge::EdgeElement() const { return (IfcEdge*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(2))); }
 void IfcOrientedEdge::setEdgeElement(IfcEdge* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-bool IfcOrientedEdge::Orientation() { return *entity->getArgument(3); }
+bool IfcOrientedEdge::Orientation() const { return *entity->getArgument(3); }
 void IfcOrientedEdge::setOrientation(bool v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
 bool IfcOrientedEdge::is(Type::Enum v) const { return v == Type::IfcOrientedEdge || IfcEdge::is(v); }
 Type::Enum IfcOrientedEdge::type() const { return Type::IfcOrientedEdge; }
 Type::Enum IfcOrientedEdge::Class() { return Type::IfcOrientedEdge; }
-IfcOrientedEdge::IfcOrientedEdge(IfcAbstractEntityPtr e) : IfcEdge((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcOrientedEdge)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcOrientedEdge::IfcOrientedEdge(IfcEdge* v3_EdgeElement, bool v4_Orientation) : IfcEdge((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgumentDerived(0); e->setArgumentDerived(1); e->setArgument(2,(v3_EdgeElement)); e->setArgument(3,(v4_Orientation)); entity = e; EntityBuffer::Add(this); }
+IfcOrientedEdge::IfcOrientedEdge(IfcAbstractEntity* e) : IfcEdge((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcOrientedEdge)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcOrientedEdge::IfcOrientedEdge(IfcEdge* v3_EdgeElement, bool v4_Orientation) : IfcEdge((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgumentDerived(0); e->setArgumentDerived(1); e->setArgument(2,(v3_EdgeElement)); e->setArgument(3,(v4_Orientation)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcOuterBoundaryCurve
 bool IfcOuterBoundaryCurve::is(Type::Enum v) const { return v == Type::IfcOuterBoundaryCurve || IfcBoundaryCurve::is(v); }
 Type::Enum IfcOuterBoundaryCurve::type() const { return Type::IfcOuterBoundaryCurve; }
 Type::Enum IfcOuterBoundaryCurve::Class() { return Type::IfcOuterBoundaryCurve; }
-IfcOuterBoundaryCurve::IfcOuterBoundaryCurve(IfcAbstractEntityPtr e) : IfcBoundaryCurve((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcOuterBoundaryCurve)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcOuterBoundaryCurve::IfcOuterBoundaryCurve(SHARED_PTR< IfcTemplatedEntityList< IfcCompositeCurveSegment > > v1_Segments, bool v2_SelfIntersect) : IfcBoundaryCurve((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Segments)->generalize()); e->setArgument(1,(v2_SelfIntersect)); entity = e; EntityBuffer::Add(this); }
+IfcOuterBoundaryCurve::IfcOuterBoundaryCurve(IfcAbstractEntity* e) : IfcBoundaryCurve((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcOuterBoundaryCurve)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcOuterBoundaryCurve::IfcOuterBoundaryCurve(IfcTemplatedEntityList< IfcCompositeCurveSegment >::ptr v1_Segments, bool v2_SelfIntersect) : IfcBoundaryCurve((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Segments)->generalize()); e->setArgument(1,(v2_SelfIntersect)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcOutlet
-bool IfcOutlet::hasPredefinedType() { return !entity->getArgument(8)->isNull(); }
-IfcOutletTypeEnum::IfcOutletTypeEnum IfcOutlet::PredefinedType() { return IfcOutletTypeEnum::FromString(*entity->getArgument(8)); }
+bool IfcOutlet::hasPredefinedType() const { return !entity->getArgument(8)->isNull(); }
+IfcOutletTypeEnum::IfcOutletTypeEnum IfcOutlet::PredefinedType() const { return IfcOutletTypeEnum::FromString(*entity->getArgument(8)); }
 void IfcOutlet::setPredefinedType(IfcOutletTypeEnum::IfcOutletTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcOutletTypeEnum::ToString(v)); }
 bool IfcOutlet::is(Type::Enum v) const { return v == Type::IfcOutlet || IfcFlowTerminal::is(v); }
 Type::Enum IfcOutlet::type() const { return Type::IfcOutlet; }
 Type::Enum IfcOutlet::Class() { return Type::IfcOutlet; }
-IfcOutlet::IfcOutlet(IfcAbstractEntityPtr e) : IfcFlowTerminal((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcOutlet)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcOutlet::IfcOutlet(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcOutletTypeEnum::IfcOutletTypeEnum > v9_PredefinedType) : IfcFlowTerminal((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcOutletTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcOutlet::IfcOutlet(IfcAbstractEntity* e) : IfcFlowTerminal((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcOutlet)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcOutlet::IfcOutlet(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcOutletTypeEnum::IfcOutletTypeEnum > v9_PredefinedType) : IfcFlowTerminal((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcOutletTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcOutletType
-IfcOutletTypeEnum::IfcOutletTypeEnum IfcOutletType::PredefinedType() { return IfcOutletTypeEnum::FromString(*entity->getArgument(9)); }
+IfcOutletTypeEnum::IfcOutletTypeEnum IfcOutletType::PredefinedType() const { return IfcOutletTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcOutletType::setPredefinedType(IfcOutletTypeEnum::IfcOutletTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcOutletTypeEnum::ToString(v)); }
 bool IfcOutletType::is(Type::Enum v) const { return v == Type::IfcOutletType || IfcFlowTerminalType::is(v); }
 Type::Enum IfcOutletType::type() const { return Type::IfcOutletType; }
 Type::Enum IfcOutletType::Class() { return Type::IfcOutletType; }
-IfcOutletType::IfcOutletType(IfcAbstractEntityPtr e) : IfcFlowTerminalType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcOutletType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcOutletType::IfcOutletType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcOutletTypeEnum::IfcOutletTypeEnum v10_PredefinedType) : IfcFlowTerminalType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcOutletTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcOutletType::IfcOutletType(IfcAbstractEntity* e) : IfcFlowTerminalType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcOutletType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcOutletType::IfcOutletType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcOutletTypeEnum::IfcOutletTypeEnum v10_PredefinedType) : IfcFlowTerminalType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcOutletTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcOwnerHistory
-IfcPersonAndOrganization* IfcOwnerHistory::OwningUser() { return (IfcPersonAndOrganization*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(0))); }
+IfcPersonAndOrganization* IfcOwnerHistory::OwningUser() const { return (IfcPersonAndOrganization*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(0))); }
 void IfcOwnerHistory::setOwningUser(IfcPersonAndOrganization* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-IfcApplication* IfcOwnerHistory::OwningApplication() { return (IfcApplication*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(1))); }
+IfcApplication* IfcOwnerHistory::OwningApplication() const { return (IfcApplication*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(1))); }
 void IfcOwnerHistory::setOwningApplication(IfcApplication* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-bool IfcOwnerHistory::hasState() { return !entity->getArgument(2)->isNull(); }
-IfcStateEnum::IfcStateEnum IfcOwnerHistory::State() { return IfcStateEnum::FromString(*entity->getArgument(2)); }
+bool IfcOwnerHistory::hasState() const { return !entity->getArgument(2)->isNull(); }
+IfcStateEnum::IfcStateEnum IfcOwnerHistory::State() const { return IfcStateEnum::FromString(*entity->getArgument(2)); }
 void IfcOwnerHistory::setState(IfcStateEnum::IfcStateEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v,IfcStateEnum::ToString(v)); }
-bool IfcOwnerHistory::hasChangeAction() { return !entity->getArgument(3)->isNull(); }
-IfcChangeActionEnum::IfcChangeActionEnum IfcOwnerHistory::ChangeAction() { return IfcChangeActionEnum::FromString(*entity->getArgument(3)); }
+bool IfcOwnerHistory::hasChangeAction() const { return !entity->getArgument(3)->isNull(); }
+IfcChangeActionEnum::IfcChangeActionEnum IfcOwnerHistory::ChangeAction() const { return IfcChangeActionEnum::FromString(*entity->getArgument(3)); }
 void IfcOwnerHistory::setChangeAction(IfcChangeActionEnum::IfcChangeActionEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v,IfcChangeActionEnum::ToString(v)); }
-bool IfcOwnerHistory::hasLastModifiedDate() { return !entity->getArgument(4)->isNull(); }
-IfcTimeStamp IfcOwnerHistory::LastModifiedDate() { return *entity->getArgument(4); }
-void IfcOwnerHistory::setLastModifiedDate(IfcTimeStamp v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-bool IfcOwnerHistory::hasLastModifyingUser() { return !entity->getArgument(5)->isNull(); }
-IfcPersonAndOrganization* IfcOwnerHistory::LastModifyingUser() { return (IfcPersonAndOrganization*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(5))); }
+bool IfcOwnerHistory::hasLastModifiedDate() const { return !entity->getArgument(4)->isNull(); }
+int IfcOwnerHistory::LastModifiedDate() const { return *entity->getArgument(4); }
+void IfcOwnerHistory::setLastModifiedDate(int v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+bool IfcOwnerHistory::hasLastModifyingUser() const { return !entity->getArgument(5)->isNull(); }
+IfcPersonAndOrganization* IfcOwnerHistory::LastModifyingUser() const { return (IfcPersonAndOrganization*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(5))); }
 void IfcOwnerHistory::setLastModifyingUser(IfcPersonAndOrganization* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-bool IfcOwnerHistory::hasLastModifyingApplication() { return !entity->getArgument(6)->isNull(); }
-IfcApplication* IfcOwnerHistory::LastModifyingApplication() { return (IfcApplication*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(6))); }
+bool IfcOwnerHistory::hasLastModifyingApplication() const { return !entity->getArgument(6)->isNull(); }
+IfcApplication* IfcOwnerHistory::LastModifyingApplication() const { return (IfcApplication*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(6))); }
 void IfcOwnerHistory::setLastModifyingApplication(IfcApplication* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
-IfcTimeStamp IfcOwnerHistory::CreationDate() { return *entity->getArgument(7); }
-void IfcOwnerHistory::setCreationDate(IfcTimeStamp v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
+int IfcOwnerHistory::CreationDate() const { return *entity->getArgument(7); }
+void IfcOwnerHistory::setCreationDate(int v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
 bool IfcOwnerHistory::is(Type::Enum v) const { return v == Type::IfcOwnerHistory; }
 Type::Enum IfcOwnerHistory::type() const { return Type::IfcOwnerHistory; }
 Type::Enum IfcOwnerHistory::Class() { return Type::IfcOwnerHistory; }
-IfcOwnerHistory::IfcOwnerHistory(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcOwnerHistory)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcOwnerHistory::IfcOwnerHistory(IfcPersonAndOrganization* v1_OwningUser, IfcApplication* v2_OwningApplication, boost::optional< IfcStateEnum::IfcStateEnum > v3_State, boost::optional< IfcChangeActionEnum::IfcChangeActionEnum > v4_ChangeAction, boost::optional< IfcTimeStamp > v5_LastModifiedDate, IfcPersonAndOrganization* v6_LastModifyingUser, IfcApplication* v7_LastModifyingApplication, IfcTimeStamp v8_CreationDate) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_OwningUser)); e->setArgument(1,(v2_OwningApplication)); if (v3_State) { e->setArgument(2,*v3_State,IfcStateEnum::ToString(*v3_State)); } else { e->setArgument(2); } if (v4_ChangeAction) { e->setArgument(3,*v4_ChangeAction,IfcChangeActionEnum::ToString(*v4_ChangeAction)); } else { e->setArgument(3); } if (v5_LastModifiedDate) { e->setArgument(4,(*v5_LastModifiedDate)); } else { e->setArgument(4); } e->setArgument(5,(v6_LastModifyingUser)); e->setArgument(6,(v7_LastModifyingApplication)); e->setArgument(7,(v8_CreationDate)); entity = e; EntityBuffer::Add(this); }
+IfcOwnerHistory::IfcOwnerHistory(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcOwnerHistory)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcOwnerHistory::IfcOwnerHistory(IfcPersonAndOrganization* v1_OwningUser, IfcApplication* v2_OwningApplication, boost::optional< IfcStateEnum::IfcStateEnum > v3_State, boost::optional< IfcChangeActionEnum::IfcChangeActionEnum > v4_ChangeAction, boost::optional< int > v5_LastModifiedDate, IfcPersonAndOrganization* v6_LastModifyingUser, IfcApplication* v7_LastModifyingApplication, int v8_CreationDate) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_OwningUser)); e->setArgument(1,(v2_OwningApplication)); if (v3_State) { e->setArgument(2,*v3_State,IfcStateEnum::ToString(*v3_State)); } else { e->setArgument(2); } if (v4_ChangeAction) { e->setArgument(3,*v4_ChangeAction,IfcChangeActionEnum::ToString(*v4_ChangeAction)); } else { e->setArgument(3); } if (v5_LastModifiedDate) { e->setArgument(4,(*v5_LastModifiedDate)); } else { e->setArgument(4); } e->setArgument(5,(v6_LastModifyingUser)); e->setArgument(6,(v7_LastModifyingApplication)); e->setArgument(7,(v8_CreationDate)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcParameterizedProfileDef
-bool IfcParameterizedProfileDef::hasPosition() { return !entity->getArgument(2)->isNull(); }
-IfcAxis2Placement2D* IfcParameterizedProfileDef::Position() { return (IfcAxis2Placement2D*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(2))); }
+bool IfcParameterizedProfileDef::hasPosition() const { return !entity->getArgument(2)->isNull(); }
+IfcAxis2Placement2D* IfcParameterizedProfileDef::Position() const { return (IfcAxis2Placement2D*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(2))); }
 void IfcParameterizedProfileDef::setPosition(IfcAxis2Placement2D* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
 bool IfcParameterizedProfileDef::is(Type::Enum v) const { return v == Type::IfcParameterizedProfileDef || IfcProfileDef::is(v); }
 Type::Enum IfcParameterizedProfileDef::type() const { return Type::IfcParameterizedProfileDef; }
 Type::Enum IfcParameterizedProfileDef::Class() { return Type::IfcParameterizedProfileDef; }
-IfcParameterizedProfileDef::IfcParameterizedProfileDef(IfcAbstractEntityPtr e) : IfcProfileDef((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcParameterizedProfileDef)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcParameterizedProfileDef::IfcParameterizedProfileDef(IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< IfcLabel > v2_ProfileName, IfcAxis2Placement2D* v3_Position) : IfcProfileDef((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,v1_ProfileType,IfcProfileTypeEnum::ToString(v1_ProfileType)); if (v2_ProfileName) { e->setArgument(1,(*v2_ProfileName)); } else { e->setArgument(1); } e->setArgument(2,(v3_Position)); entity = e; EntityBuffer::Add(this); }
+IfcParameterizedProfileDef::IfcParameterizedProfileDef(IfcAbstractEntity* e) : IfcProfileDef((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcParameterizedProfileDef)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcParameterizedProfileDef::IfcParameterizedProfileDef(IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< std::string > v2_ProfileName, IfcAxis2Placement2D* v3_Position) : IfcProfileDef((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,v1_ProfileType,IfcProfileTypeEnum::ToString(v1_ProfileType)); if (v2_ProfileName) { e->setArgument(1,(*v2_ProfileName)); } else { e->setArgument(1); } e->setArgument(2,(v3_Position)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcPath
-SHARED_PTR< IfcTemplatedEntityList< IfcOrientedEdge > > IfcPath::EdgeList() { RETURN_AS_LIST(IfcOrientedEdge,0) }
-void IfcPath::setEdgeList(SHARED_PTR< IfcTemplatedEntityList< IfcOrientedEdge > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v->generalize()); }
+IfcTemplatedEntityList< IfcOrientedEdge >::ptr IfcPath::EdgeList() const { IfcEntityList::ptr es = *entity->getArgument(0); return es->as<IfcOrientedEdge>(); }
+void IfcPath::setEdgeList(IfcTemplatedEntityList< IfcOrientedEdge >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v->generalize()); }
 bool IfcPath::is(Type::Enum v) const { return v == Type::IfcPath || IfcTopologicalRepresentationItem::is(v); }
 Type::Enum IfcPath::type() const { return Type::IfcPath; }
 Type::Enum IfcPath::Class() { return Type::IfcPath; }
-IfcPath::IfcPath(IfcAbstractEntityPtr e) : IfcTopologicalRepresentationItem((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcPath)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcPath::IfcPath(SHARED_PTR< IfcTemplatedEntityList< IfcOrientedEdge > > v1_EdgeList) : IfcTopologicalRepresentationItem((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_EdgeList)->generalize()); entity = e; EntityBuffer::Add(this); }
+IfcPath::IfcPath(IfcAbstractEntity* e) : IfcTopologicalRepresentationItem((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcPath)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcPath::IfcPath(IfcTemplatedEntityList< IfcOrientedEdge >::ptr v1_EdgeList) : IfcTopologicalRepresentationItem((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_EdgeList)->generalize()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcPcurve
-IfcSurface* IfcPcurve::BasisSurface() { return (IfcSurface*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(0))); }
+IfcSurface* IfcPcurve::BasisSurface() const { return (IfcSurface*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(0))); }
 void IfcPcurve::setBasisSurface(IfcSurface* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-IfcCurve* IfcPcurve::ReferenceCurve() { return (IfcCurve*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(1))); }
+IfcCurve* IfcPcurve::ReferenceCurve() const { return (IfcCurve*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(1))); }
 void IfcPcurve::setReferenceCurve(IfcCurve* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
 bool IfcPcurve::is(Type::Enum v) const { return v == Type::IfcPcurve || IfcCurve::is(v); }
 Type::Enum IfcPcurve::type() const { return Type::IfcPcurve; }
 Type::Enum IfcPcurve::Class() { return Type::IfcPcurve; }
-IfcPcurve::IfcPcurve(IfcAbstractEntityPtr e) : IfcCurve((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcPcurve)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcPcurve::IfcPcurve(IfcSurface* v1_BasisSurface, IfcCurve* v2_ReferenceCurve) : IfcCurve((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_BasisSurface)); e->setArgument(1,(v2_ReferenceCurve)); entity = e; EntityBuffer::Add(this); }
+IfcPcurve::IfcPcurve(IfcAbstractEntity* e) : IfcCurve((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcPcurve)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcPcurve::IfcPcurve(IfcSurface* v1_BasisSurface, IfcCurve* v2_ReferenceCurve) : IfcCurve((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_BasisSurface)); e->setArgument(1,(v2_ReferenceCurve)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcPerformanceHistory
-IfcLabel IfcPerformanceHistory::LifeCyclePhase() { return *entity->getArgument(6); }
-void IfcPerformanceHistory::setLifeCyclePhase(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
-bool IfcPerformanceHistory::hasPredefinedType() { return !entity->getArgument(7)->isNull(); }
-IfcPerformanceHistoryTypeEnum::IfcPerformanceHistoryTypeEnum IfcPerformanceHistory::PredefinedType() { return IfcPerformanceHistoryTypeEnum::FromString(*entity->getArgument(7)); }
+std::string IfcPerformanceHistory::LifeCyclePhase() const { return *entity->getArgument(6); }
+void IfcPerformanceHistory::setLifeCyclePhase(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
+bool IfcPerformanceHistory::hasPredefinedType() const { return !entity->getArgument(7)->isNull(); }
+IfcPerformanceHistoryTypeEnum::IfcPerformanceHistoryTypeEnum IfcPerformanceHistory::PredefinedType() const { return IfcPerformanceHistoryTypeEnum::FromString(*entity->getArgument(7)); }
 void IfcPerformanceHistory::setPredefinedType(IfcPerformanceHistoryTypeEnum::IfcPerformanceHistoryTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v,IfcPerformanceHistoryTypeEnum::ToString(v)); }
 bool IfcPerformanceHistory::is(Type::Enum v) const { return v == Type::IfcPerformanceHistory || IfcControl::is(v); }
 Type::Enum IfcPerformanceHistory::type() const { return Type::IfcPerformanceHistory; }
 Type::Enum IfcPerformanceHistory::Class() { return Type::IfcPerformanceHistory; }
-IfcPerformanceHistory::IfcPerformanceHistory(IfcAbstractEntityPtr e) : IfcControl((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcPerformanceHistory)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcPerformanceHistory::IfcPerformanceHistory(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, boost::optional< IfcIdentifier > v6_Identification, IfcLabel v7_LifeCyclePhase, boost::optional< IfcPerformanceHistoryTypeEnum::IfcPerformanceHistoryTypeEnum > v8_PredefinedType) : IfcControl((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } if (v6_Identification) { e->setArgument(5,(*v6_Identification)); } else { e->setArgument(5); } e->setArgument(6,(v7_LifeCyclePhase)); if (v8_PredefinedType) { e->setArgument(7,*v8_PredefinedType,IfcPerformanceHistoryTypeEnum::ToString(*v8_PredefinedType)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
+IfcPerformanceHistory::IfcPerformanceHistory(IfcAbstractEntity* e) : IfcControl((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcPerformanceHistory)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcPerformanceHistory::IfcPerformanceHistory(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, boost::optional< std::string > v6_Identification, std::string v7_LifeCyclePhase, boost::optional< IfcPerformanceHistoryTypeEnum::IfcPerformanceHistoryTypeEnum > v8_PredefinedType) : IfcControl((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } if (v6_Identification) { e->setArgument(5,(*v6_Identification)); } else { e->setArgument(5); } e->setArgument(6,(v7_LifeCyclePhase)); if (v8_PredefinedType) { e->setArgument(7,*v8_PredefinedType,IfcPerformanceHistoryTypeEnum::ToString(*v8_PredefinedType)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcPermeableCoveringProperties
-IfcPermeableCoveringOperationEnum::IfcPermeableCoveringOperationEnum IfcPermeableCoveringProperties::OperationType() { return IfcPermeableCoveringOperationEnum::FromString(*entity->getArgument(4)); }
+IfcPermeableCoveringOperationEnum::IfcPermeableCoveringOperationEnum IfcPermeableCoveringProperties::OperationType() const { return IfcPermeableCoveringOperationEnum::FromString(*entity->getArgument(4)); }
 void IfcPermeableCoveringProperties::setOperationType(IfcPermeableCoveringOperationEnum::IfcPermeableCoveringOperationEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v,IfcPermeableCoveringOperationEnum::ToString(v)); }
-IfcWindowPanelPositionEnum::IfcWindowPanelPositionEnum IfcPermeableCoveringProperties::PanelPosition() { return IfcWindowPanelPositionEnum::FromString(*entity->getArgument(5)); }
+IfcWindowPanelPositionEnum::IfcWindowPanelPositionEnum IfcPermeableCoveringProperties::PanelPosition() const { return IfcWindowPanelPositionEnum::FromString(*entity->getArgument(5)); }
 void IfcPermeableCoveringProperties::setPanelPosition(IfcWindowPanelPositionEnum::IfcWindowPanelPositionEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v,IfcWindowPanelPositionEnum::ToString(v)); }
-bool IfcPermeableCoveringProperties::hasFrameDepth() { return !entity->getArgument(6)->isNull(); }
-IfcPositiveLengthMeasure IfcPermeableCoveringProperties::FrameDepth() { return *entity->getArgument(6); }
-void IfcPermeableCoveringProperties::setFrameDepth(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
-bool IfcPermeableCoveringProperties::hasFrameThickness() { return !entity->getArgument(7)->isNull(); }
-IfcPositiveLengthMeasure IfcPermeableCoveringProperties::FrameThickness() { return *entity->getArgument(7); }
-void IfcPermeableCoveringProperties::setFrameThickness(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
-bool IfcPermeableCoveringProperties::hasShapeAspectStyle() { return !entity->getArgument(8)->isNull(); }
-IfcShapeAspect* IfcPermeableCoveringProperties::ShapeAspectStyle() { return (IfcShapeAspect*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(8))); }
+bool IfcPermeableCoveringProperties::hasFrameDepth() const { return !entity->getArgument(6)->isNull(); }
+double IfcPermeableCoveringProperties::FrameDepth() const { return *entity->getArgument(6); }
+void IfcPermeableCoveringProperties::setFrameDepth(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
+bool IfcPermeableCoveringProperties::hasFrameThickness() const { return !entity->getArgument(7)->isNull(); }
+double IfcPermeableCoveringProperties::FrameThickness() const { return *entity->getArgument(7); }
+void IfcPermeableCoveringProperties::setFrameThickness(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
+bool IfcPermeableCoveringProperties::hasShapeAspectStyle() const { return !entity->getArgument(8)->isNull(); }
+IfcShapeAspect* IfcPermeableCoveringProperties::ShapeAspectStyle() const { return (IfcShapeAspect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(8))); }
 void IfcPermeableCoveringProperties::setShapeAspectStyle(IfcShapeAspect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
 bool IfcPermeableCoveringProperties::is(Type::Enum v) const { return v == Type::IfcPermeableCoveringProperties || IfcPreDefinedPropertySet::is(v); }
 Type::Enum IfcPermeableCoveringProperties::type() const { return Type::IfcPermeableCoveringProperties; }
 Type::Enum IfcPermeableCoveringProperties::Class() { return Type::IfcPermeableCoveringProperties; }
-IfcPermeableCoveringProperties::IfcPermeableCoveringProperties(IfcAbstractEntityPtr e) : IfcPreDefinedPropertySet((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcPermeableCoveringProperties)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcPermeableCoveringProperties::IfcPermeableCoveringProperties(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, IfcPermeableCoveringOperationEnum::IfcPermeableCoveringOperationEnum v5_OperationType, IfcWindowPanelPositionEnum::IfcWindowPanelPositionEnum v6_PanelPosition, boost::optional< IfcPositiveLengthMeasure > v7_FrameDepth, boost::optional< IfcPositiveLengthMeasure > v8_FrameThickness, IfcShapeAspect* v9_ShapeAspectStyle) : IfcPreDefinedPropertySet((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,v5_OperationType,IfcPermeableCoveringOperationEnum::ToString(v5_OperationType)); e->setArgument(5,v6_PanelPosition,IfcWindowPanelPositionEnum::ToString(v6_PanelPosition)); if (v7_FrameDepth) { e->setArgument(6,(*v7_FrameDepth)); } else { e->setArgument(6); } if (v8_FrameThickness) { e->setArgument(7,(*v8_FrameThickness)); } else { e->setArgument(7); } e->setArgument(8,(v9_ShapeAspectStyle)); entity = e; EntityBuffer::Add(this); }
+IfcPermeableCoveringProperties::IfcPermeableCoveringProperties(IfcAbstractEntity* e) : IfcPreDefinedPropertySet((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcPermeableCoveringProperties)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcPermeableCoveringProperties::IfcPermeableCoveringProperties(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcPermeableCoveringOperationEnum::IfcPermeableCoveringOperationEnum v5_OperationType, IfcWindowPanelPositionEnum::IfcWindowPanelPositionEnum v6_PanelPosition, boost::optional< double > v7_FrameDepth, boost::optional< double > v8_FrameThickness, IfcShapeAspect* v9_ShapeAspectStyle) : IfcPreDefinedPropertySet((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,v5_OperationType,IfcPermeableCoveringOperationEnum::ToString(v5_OperationType)); e->setArgument(5,v6_PanelPosition,IfcWindowPanelPositionEnum::ToString(v6_PanelPosition)); if (v7_FrameDepth) { e->setArgument(6,(*v7_FrameDepth)); } else { e->setArgument(6); } if (v8_FrameThickness) { e->setArgument(7,(*v8_FrameThickness)); } else { e->setArgument(7); } e->setArgument(8,(v9_ShapeAspectStyle)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcPermit
-bool IfcPermit::hasPredefinedType() { return !entity->getArgument(6)->isNull(); }
-IfcPermitTypeEnum::IfcPermitTypeEnum IfcPermit::PredefinedType() { return IfcPermitTypeEnum::FromString(*entity->getArgument(6)); }
+bool IfcPermit::hasPredefinedType() const { return !entity->getArgument(6)->isNull(); }
+IfcPermitTypeEnum::IfcPermitTypeEnum IfcPermit::PredefinedType() const { return IfcPermitTypeEnum::FromString(*entity->getArgument(6)); }
 void IfcPermit::setPredefinedType(IfcPermitTypeEnum::IfcPermitTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v,IfcPermitTypeEnum::ToString(v)); }
-bool IfcPermit::hasStatus() { return !entity->getArgument(7)->isNull(); }
-IfcLabel IfcPermit::Status() { return *entity->getArgument(7); }
-void IfcPermit::setStatus(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
-bool IfcPermit::hasLongDescription() { return !entity->getArgument(8)->isNull(); }
-IfcText IfcPermit::LongDescription() { return *entity->getArgument(8); }
-void IfcPermit::setLongDescription(IfcText v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
+bool IfcPermit::hasStatus() const { return !entity->getArgument(7)->isNull(); }
+std::string IfcPermit::Status() const { return *entity->getArgument(7); }
+void IfcPermit::setStatus(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
+bool IfcPermit::hasLongDescription() const { return !entity->getArgument(8)->isNull(); }
+std::string IfcPermit::LongDescription() const { return *entity->getArgument(8); }
+void IfcPermit::setLongDescription(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
 bool IfcPermit::is(Type::Enum v) const { return v == Type::IfcPermit || IfcControl::is(v); }
 Type::Enum IfcPermit::type() const { return Type::IfcPermit; }
 Type::Enum IfcPermit::Class() { return Type::IfcPermit; }
-IfcPermit::IfcPermit(IfcAbstractEntityPtr e) : IfcControl((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcPermit)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcPermit::IfcPermit(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, boost::optional< IfcIdentifier > v6_Identification, boost::optional< IfcPermitTypeEnum::IfcPermitTypeEnum > v7_PredefinedType, boost::optional< IfcLabel > v8_Status, boost::optional< IfcText > v9_LongDescription) : IfcControl((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } if (v6_Identification) { e->setArgument(5,(*v6_Identification)); } else { e->setArgument(5); } if (v7_PredefinedType) { e->setArgument(6,*v7_PredefinedType,IfcPermitTypeEnum::ToString(*v7_PredefinedType)); } else { e->setArgument(6); } if (v8_Status) { e->setArgument(7,(*v8_Status)); } else { e->setArgument(7); } if (v9_LongDescription) { e->setArgument(8,(*v9_LongDescription)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcPermit::IfcPermit(IfcAbstractEntity* e) : IfcControl((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcPermit)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcPermit::IfcPermit(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, boost::optional< std::string > v6_Identification, boost::optional< IfcPermitTypeEnum::IfcPermitTypeEnum > v7_PredefinedType, boost::optional< std::string > v8_Status, boost::optional< std::string > v9_LongDescription) : IfcControl((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } if (v6_Identification) { e->setArgument(5,(*v6_Identification)); } else { e->setArgument(5); } if (v7_PredefinedType) { e->setArgument(6,*v7_PredefinedType,IfcPermitTypeEnum::ToString(*v7_PredefinedType)); } else { e->setArgument(6); } if (v8_Status) { e->setArgument(7,(*v8_Status)); } else { e->setArgument(7); } if (v9_LongDescription) { e->setArgument(8,(*v9_LongDescription)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcPerson
-bool IfcPerson::hasIdentification() { return !entity->getArgument(0)->isNull(); }
-IfcIdentifier IfcPerson::Identification() { return *entity->getArgument(0); }
-void IfcPerson::setIdentification(IfcIdentifier v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-bool IfcPerson::hasFamilyName() { return !entity->getArgument(1)->isNull(); }
-IfcLabel IfcPerson::FamilyName() { return *entity->getArgument(1); }
-void IfcPerson::setFamilyName(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-bool IfcPerson::hasGivenName() { return !entity->getArgument(2)->isNull(); }
-IfcLabel IfcPerson::GivenName() { return *entity->getArgument(2); }
-void IfcPerson::setGivenName(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-bool IfcPerson::hasMiddleNames() { return !entity->getArgument(3)->isNull(); }
-std::vector< IfcLabel > /*[1:?]*/ IfcPerson::MiddleNames() { return *entity->getArgument(3); }
-void IfcPerson::setMiddleNames(std::vector< IfcLabel > /*[1:?]*/ v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-bool IfcPerson::hasPrefixTitles() { return !entity->getArgument(4)->isNull(); }
-std::vector< IfcLabel > /*[1:?]*/ IfcPerson::PrefixTitles() { return *entity->getArgument(4); }
-void IfcPerson::setPrefixTitles(std::vector< IfcLabel > /*[1:?]*/ v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-bool IfcPerson::hasSuffixTitles() { return !entity->getArgument(5)->isNull(); }
-std::vector< IfcLabel > /*[1:?]*/ IfcPerson::SuffixTitles() { return *entity->getArgument(5); }
-void IfcPerson::setSuffixTitles(std::vector< IfcLabel > /*[1:?]*/ v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-bool IfcPerson::hasRoles() { return !entity->getArgument(6)->isNull(); }
-SHARED_PTR< IfcTemplatedEntityList< IfcActorRole > > IfcPerson::Roles() { RETURN_AS_LIST(IfcActorRole,6) }
-void IfcPerson::setRoles(SHARED_PTR< IfcTemplatedEntityList< IfcActorRole > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v->generalize()); }
-bool IfcPerson::hasAddresses() { return !entity->getArgument(7)->isNull(); }
-SHARED_PTR< IfcTemplatedEntityList< IfcAddress > > IfcPerson::Addresses() { RETURN_AS_LIST(IfcAddress,7) }
-void IfcPerson::setAddresses(SHARED_PTR< IfcTemplatedEntityList< IfcAddress > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v->generalize()); }
-IfcPersonAndOrganization::list IfcPerson::EngagedIn() { RETURN_INVERSE(IfcPersonAndOrganization) }
+bool IfcPerson::hasIdentification() const { return !entity->getArgument(0)->isNull(); }
+std::string IfcPerson::Identification() const { return *entity->getArgument(0); }
+void IfcPerson::setIdentification(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+bool IfcPerson::hasFamilyName() const { return !entity->getArgument(1)->isNull(); }
+std::string IfcPerson::FamilyName() const { return *entity->getArgument(1); }
+void IfcPerson::setFamilyName(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+bool IfcPerson::hasGivenName() const { return !entity->getArgument(2)->isNull(); }
+std::string IfcPerson::GivenName() const { return *entity->getArgument(2); }
+void IfcPerson::setGivenName(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+bool IfcPerson::hasMiddleNames() const { return !entity->getArgument(3)->isNull(); }
+std::vector< std::string > /*[1:?]*/ IfcPerson::MiddleNames() const { return *entity->getArgument(3); }
+void IfcPerson::setMiddleNames(std::vector< std::string > /*[1:?]*/ v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+bool IfcPerson::hasPrefixTitles() const { return !entity->getArgument(4)->isNull(); }
+std::vector< std::string > /*[1:?]*/ IfcPerson::PrefixTitles() const { return *entity->getArgument(4); }
+void IfcPerson::setPrefixTitles(std::vector< std::string > /*[1:?]*/ v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+bool IfcPerson::hasSuffixTitles() const { return !entity->getArgument(5)->isNull(); }
+std::vector< std::string > /*[1:?]*/ IfcPerson::SuffixTitles() const { return *entity->getArgument(5); }
+void IfcPerson::setSuffixTitles(std::vector< std::string > /*[1:?]*/ v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+bool IfcPerson::hasRoles() const { return !entity->getArgument(6)->isNull(); }
+IfcTemplatedEntityList< IfcActorRole >::ptr IfcPerson::Roles() const { IfcEntityList::ptr es = *entity->getArgument(6); return es->as<IfcActorRole>(); }
+void IfcPerson::setRoles(IfcTemplatedEntityList< IfcActorRole >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v->generalize()); }
+bool IfcPerson::hasAddresses() const { return !entity->getArgument(7)->isNull(); }
+IfcTemplatedEntityList< IfcAddress >::ptr IfcPerson::Addresses() const { IfcEntityList::ptr es = *entity->getArgument(7); return es->as<IfcAddress>(); }
+void IfcPerson::setAddresses(IfcTemplatedEntityList< IfcAddress >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v->generalize()); }
+IfcPersonAndOrganization::list::ptr IfcPerson::EngagedIn() const { return entity->getInverse(Type::IfcPersonAndOrganization, 0)->as<IfcPersonAndOrganization>(); }
 bool IfcPerson::is(Type::Enum v) const { return v == Type::IfcPerson; }
 Type::Enum IfcPerson::type() const { return Type::IfcPerson; }
 Type::Enum IfcPerson::Class() { return Type::IfcPerson; }
-IfcPerson::IfcPerson(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcPerson)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcPerson::IfcPerson(boost::optional< IfcIdentifier > v1_Identification, boost::optional< IfcLabel > v2_FamilyName, boost::optional< IfcLabel > v3_GivenName, boost::optional< std::vector< IfcLabel > /*[1:?]*/ > v4_MiddleNames, boost::optional< std::vector< IfcLabel > /*[1:?]*/ > v5_PrefixTitles, boost::optional< std::vector< IfcLabel > /*[1:?]*/ > v6_SuffixTitles, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcActorRole > > > v7_Roles, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcAddress > > > v8_Addresses) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Identification) { e->setArgument(0,(*v1_Identification)); } else { e->setArgument(0); } if (v2_FamilyName) { e->setArgument(1,(*v2_FamilyName)); } else { e->setArgument(1); } if (v3_GivenName) { e->setArgument(2,(*v3_GivenName)); } else { e->setArgument(2); } if (v4_MiddleNames) { e->setArgument(3,(*v4_MiddleNames)); } else { e->setArgument(3); } if (v5_PrefixTitles) { e->setArgument(4,(*v5_PrefixTitles)); } else { e->setArgument(4); } if (v6_SuffixTitles) { e->setArgument(5,(*v6_SuffixTitles)); } else { e->setArgument(5); } if (v7_Roles) { e->setArgument(6,(*v7_Roles)->generalize()); } else { e->setArgument(6); } if (v8_Addresses) { e->setArgument(7,(*v8_Addresses)->generalize()); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
+IfcPerson::IfcPerson(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcPerson)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcPerson::IfcPerson(boost::optional< std::string > v1_Identification, boost::optional< std::string > v2_FamilyName, boost::optional< std::string > v3_GivenName, boost::optional< std::vector< std::string > /*[1:?]*/ > v4_MiddleNames, boost::optional< std::vector< std::string > /*[1:?]*/ > v5_PrefixTitles, boost::optional< std::vector< std::string > /*[1:?]*/ > v6_SuffixTitles, boost::optional< IfcTemplatedEntityList< IfcActorRole >::ptr > v7_Roles, boost::optional< IfcTemplatedEntityList< IfcAddress >::ptr > v8_Addresses) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Identification) { e->setArgument(0,(*v1_Identification)); } else { e->setArgument(0); } if (v2_FamilyName) { e->setArgument(1,(*v2_FamilyName)); } else { e->setArgument(1); } if (v3_GivenName) { e->setArgument(2,(*v3_GivenName)); } else { e->setArgument(2); } if (v4_MiddleNames) { e->setArgument(3,(*v4_MiddleNames)); } else { e->setArgument(3); } if (v5_PrefixTitles) { e->setArgument(4,(*v5_PrefixTitles)); } else { e->setArgument(4); } if (v6_SuffixTitles) { e->setArgument(5,(*v6_SuffixTitles)); } else { e->setArgument(5); } if (v7_Roles) { e->setArgument(6,(*v7_Roles)->generalize()); } else { e->setArgument(6); } if (v8_Addresses) { e->setArgument(7,(*v8_Addresses)->generalize()); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcPersonAndOrganization
-IfcPerson* IfcPersonAndOrganization::ThePerson() { return (IfcPerson*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(0))); }
+IfcPerson* IfcPersonAndOrganization::ThePerson() const { return (IfcPerson*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(0))); }
 void IfcPersonAndOrganization::setThePerson(IfcPerson* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-IfcOrganization* IfcPersonAndOrganization::TheOrganization() { return (IfcOrganization*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(1))); }
+IfcOrganization* IfcPersonAndOrganization::TheOrganization() const { return (IfcOrganization*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(1))); }
 void IfcPersonAndOrganization::setTheOrganization(IfcOrganization* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-bool IfcPersonAndOrganization::hasRoles() { return !entity->getArgument(2)->isNull(); }
-SHARED_PTR< IfcTemplatedEntityList< IfcActorRole > > IfcPersonAndOrganization::Roles() { RETURN_AS_LIST(IfcActorRole,2) }
-void IfcPersonAndOrganization::setRoles(SHARED_PTR< IfcTemplatedEntityList< IfcActorRole > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v->generalize()); }
+bool IfcPersonAndOrganization::hasRoles() const { return !entity->getArgument(2)->isNull(); }
+IfcTemplatedEntityList< IfcActorRole >::ptr IfcPersonAndOrganization::Roles() const { IfcEntityList::ptr es = *entity->getArgument(2); return es->as<IfcActorRole>(); }
+void IfcPersonAndOrganization::setRoles(IfcTemplatedEntityList< IfcActorRole >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v->generalize()); }
 bool IfcPersonAndOrganization::is(Type::Enum v) const { return v == Type::IfcPersonAndOrganization; }
 Type::Enum IfcPersonAndOrganization::type() const { return Type::IfcPersonAndOrganization; }
 Type::Enum IfcPersonAndOrganization::Class() { return Type::IfcPersonAndOrganization; }
-IfcPersonAndOrganization::IfcPersonAndOrganization(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcPersonAndOrganization)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcPersonAndOrganization::IfcPersonAndOrganization(IfcPerson* v1_ThePerson, IfcOrganization* v2_TheOrganization, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcActorRole > > > v3_Roles) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_ThePerson)); e->setArgument(1,(v2_TheOrganization)); if (v3_Roles) { e->setArgument(2,(*v3_Roles)->generalize()); } else { e->setArgument(2); } entity = e; EntityBuffer::Add(this); }
+IfcPersonAndOrganization::IfcPersonAndOrganization(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcPersonAndOrganization)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcPersonAndOrganization::IfcPersonAndOrganization(IfcPerson* v1_ThePerson, IfcOrganization* v2_TheOrganization, boost::optional< IfcTemplatedEntityList< IfcActorRole >::ptr > v3_Roles) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_ThePerson)); e->setArgument(1,(v2_TheOrganization)); if (v3_Roles) { e->setArgument(2,(*v3_Roles)->generalize()); } else { e->setArgument(2); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcPhysicalComplexQuantity
-SHARED_PTR< IfcTemplatedEntityList< IfcPhysicalQuantity > > IfcPhysicalComplexQuantity::HasQuantities() { RETURN_AS_LIST(IfcPhysicalQuantity,2) }
-void IfcPhysicalComplexQuantity::setHasQuantities(SHARED_PTR< IfcTemplatedEntityList< IfcPhysicalQuantity > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v->generalize()); }
-IfcLabel IfcPhysicalComplexQuantity::Discrimination() { return *entity->getArgument(3); }
-void IfcPhysicalComplexQuantity::setDiscrimination(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-bool IfcPhysicalComplexQuantity::hasQuality() { return !entity->getArgument(4)->isNull(); }
-IfcLabel IfcPhysicalComplexQuantity::Quality() { return *entity->getArgument(4); }
-void IfcPhysicalComplexQuantity::setQuality(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-bool IfcPhysicalComplexQuantity::hasUsage() { return !entity->getArgument(5)->isNull(); }
-IfcLabel IfcPhysicalComplexQuantity::Usage() { return *entity->getArgument(5); }
-void IfcPhysicalComplexQuantity::setUsage(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+IfcTemplatedEntityList< IfcPhysicalQuantity >::ptr IfcPhysicalComplexQuantity::HasQuantities() const { IfcEntityList::ptr es = *entity->getArgument(2); return es->as<IfcPhysicalQuantity>(); }
+void IfcPhysicalComplexQuantity::setHasQuantities(IfcTemplatedEntityList< IfcPhysicalQuantity >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v->generalize()); }
+std::string IfcPhysicalComplexQuantity::Discrimination() const { return *entity->getArgument(3); }
+void IfcPhysicalComplexQuantity::setDiscrimination(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+bool IfcPhysicalComplexQuantity::hasQuality() const { return !entity->getArgument(4)->isNull(); }
+std::string IfcPhysicalComplexQuantity::Quality() const { return *entity->getArgument(4); }
+void IfcPhysicalComplexQuantity::setQuality(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+bool IfcPhysicalComplexQuantity::hasUsage() const { return !entity->getArgument(5)->isNull(); }
+std::string IfcPhysicalComplexQuantity::Usage() const { return *entity->getArgument(5); }
+void IfcPhysicalComplexQuantity::setUsage(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
 bool IfcPhysicalComplexQuantity::is(Type::Enum v) const { return v == Type::IfcPhysicalComplexQuantity || IfcPhysicalQuantity::is(v); }
 Type::Enum IfcPhysicalComplexQuantity::type() const { return Type::IfcPhysicalComplexQuantity; }
 Type::Enum IfcPhysicalComplexQuantity::Class() { return Type::IfcPhysicalComplexQuantity; }
-IfcPhysicalComplexQuantity::IfcPhysicalComplexQuantity(IfcAbstractEntityPtr e) : IfcPhysicalQuantity((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcPhysicalComplexQuantity)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcPhysicalComplexQuantity::IfcPhysicalComplexQuantity(IfcLabel v1_Name, boost::optional< IfcText > v2_Description, SHARED_PTR< IfcTemplatedEntityList< IfcPhysicalQuantity > > v3_HasQuantities, IfcLabel v4_Discrimination, boost::optional< IfcLabel > v5_Quality, boost::optional< IfcLabel > v6_Usage) : IfcPhysicalQuantity((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_HasQuantities)->generalize()); e->setArgument(3,(v4_Discrimination)); if (v5_Quality) { e->setArgument(4,(*v5_Quality)); } else { e->setArgument(4); } if (v6_Usage) { e->setArgument(5,(*v6_Usage)); } else { e->setArgument(5); } entity = e; EntityBuffer::Add(this); }
+IfcPhysicalComplexQuantity::IfcPhysicalComplexQuantity(IfcAbstractEntity* e) : IfcPhysicalQuantity((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcPhysicalComplexQuantity)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcPhysicalComplexQuantity::IfcPhysicalComplexQuantity(std::string v1_Name, boost::optional< std::string > v2_Description, IfcTemplatedEntityList< IfcPhysicalQuantity >::ptr v3_HasQuantities, std::string v4_Discrimination, boost::optional< std::string > v5_Quality, boost::optional< std::string > v6_Usage) : IfcPhysicalQuantity((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_HasQuantities)->generalize()); e->setArgument(3,(v4_Discrimination)); if (v5_Quality) { e->setArgument(4,(*v5_Quality)); } else { e->setArgument(4); } if (v6_Usage) { e->setArgument(5,(*v6_Usage)); } else { e->setArgument(5); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcPhysicalQuantity
-IfcLabel IfcPhysicalQuantity::Name() { return *entity->getArgument(0); }
-void IfcPhysicalQuantity::setName(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-bool IfcPhysicalQuantity::hasDescription() { return !entity->getArgument(1)->isNull(); }
-IfcText IfcPhysicalQuantity::Description() { return *entity->getArgument(1); }
-void IfcPhysicalQuantity::setDescription(IfcText v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-IfcExternalReferenceRelationship::list IfcPhysicalQuantity::HasExternalReferences() { RETURN_INVERSE(IfcExternalReferenceRelationship) }
-IfcPhysicalComplexQuantity::list IfcPhysicalQuantity::PartOfComplex() { RETURN_INVERSE(IfcPhysicalComplexQuantity) }
+std::string IfcPhysicalQuantity::Name() const { return *entity->getArgument(0); }
+void IfcPhysicalQuantity::setName(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+bool IfcPhysicalQuantity::hasDescription() const { return !entity->getArgument(1)->isNull(); }
+std::string IfcPhysicalQuantity::Description() const { return *entity->getArgument(1); }
+void IfcPhysicalQuantity::setDescription(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+IfcExternalReferenceRelationship::list::ptr IfcPhysicalQuantity::HasExternalReferences() const { return entity->getInverse(Type::IfcExternalReferenceRelationship, 3)->as<IfcExternalReferenceRelationship>(); }
+IfcPhysicalComplexQuantity::list::ptr IfcPhysicalQuantity::PartOfComplex() const { return entity->getInverse(Type::IfcPhysicalComplexQuantity, 2)->as<IfcPhysicalComplexQuantity>(); }
 bool IfcPhysicalQuantity::is(Type::Enum v) const { return v == Type::IfcPhysicalQuantity; }
 Type::Enum IfcPhysicalQuantity::type() const { return Type::IfcPhysicalQuantity; }
 Type::Enum IfcPhysicalQuantity::Class() { return Type::IfcPhysicalQuantity; }
-IfcPhysicalQuantity::IfcPhysicalQuantity(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcPhysicalQuantity)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcPhysicalQuantity::IfcPhysicalQuantity(IfcLabel v1_Name, boost::optional< IfcText > v2_Description) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } entity = e; EntityBuffer::Add(this); }
+IfcPhysicalQuantity::IfcPhysicalQuantity(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcPhysicalQuantity)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcPhysicalQuantity::IfcPhysicalQuantity(std::string v1_Name, boost::optional< std::string > v2_Description) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcPhysicalSimpleQuantity
-bool IfcPhysicalSimpleQuantity::hasUnit() { return !entity->getArgument(2)->isNull(); }
-IfcNamedUnit* IfcPhysicalSimpleQuantity::Unit() { return (IfcNamedUnit*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(2))); }
+bool IfcPhysicalSimpleQuantity::hasUnit() const { return !entity->getArgument(2)->isNull(); }
+IfcNamedUnit* IfcPhysicalSimpleQuantity::Unit() const { return (IfcNamedUnit*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(2))); }
 void IfcPhysicalSimpleQuantity::setUnit(IfcNamedUnit* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
 bool IfcPhysicalSimpleQuantity::is(Type::Enum v) const { return v == Type::IfcPhysicalSimpleQuantity || IfcPhysicalQuantity::is(v); }
 Type::Enum IfcPhysicalSimpleQuantity::type() const { return Type::IfcPhysicalSimpleQuantity; }
 Type::Enum IfcPhysicalSimpleQuantity::Class() { return Type::IfcPhysicalSimpleQuantity; }
-IfcPhysicalSimpleQuantity::IfcPhysicalSimpleQuantity(IfcAbstractEntityPtr e) : IfcPhysicalQuantity((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcPhysicalSimpleQuantity)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcPhysicalSimpleQuantity::IfcPhysicalSimpleQuantity(IfcLabel v1_Name, boost::optional< IfcText > v2_Description, IfcNamedUnit* v3_Unit) : IfcPhysicalQuantity((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_Unit)); entity = e; EntityBuffer::Add(this); }
+IfcPhysicalSimpleQuantity::IfcPhysicalSimpleQuantity(IfcAbstractEntity* e) : IfcPhysicalQuantity((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcPhysicalSimpleQuantity)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcPhysicalSimpleQuantity::IfcPhysicalSimpleQuantity(std::string v1_Name, boost::optional< std::string > v2_Description, IfcNamedUnit* v3_Unit) : IfcPhysicalQuantity((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_Unit)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcPile
-bool IfcPile::hasPredefinedType() { return !entity->getArgument(8)->isNull(); }
-IfcPileTypeEnum::IfcPileTypeEnum IfcPile::PredefinedType() { return IfcPileTypeEnum::FromString(*entity->getArgument(8)); }
+bool IfcPile::hasPredefinedType() const { return !entity->getArgument(8)->isNull(); }
+IfcPileTypeEnum::IfcPileTypeEnum IfcPile::PredefinedType() const { return IfcPileTypeEnum::FromString(*entity->getArgument(8)); }
 void IfcPile::setPredefinedType(IfcPileTypeEnum::IfcPileTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcPileTypeEnum::ToString(v)); }
-bool IfcPile::hasConstructionType() { return !entity->getArgument(9)->isNull(); }
-IfcPileConstructionEnum::IfcPileConstructionEnum IfcPile::ConstructionType() { return IfcPileConstructionEnum::FromString(*entity->getArgument(9)); }
+bool IfcPile::hasConstructionType() const { return !entity->getArgument(9)->isNull(); }
+IfcPileConstructionEnum::IfcPileConstructionEnum IfcPile::ConstructionType() const { return IfcPileConstructionEnum::FromString(*entity->getArgument(9)); }
 void IfcPile::setConstructionType(IfcPileConstructionEnum::IfcPileConstructionEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcPileConstructionEnum::ToString(v)); }
 bool IfcPile::is(Type::Enum v) const { return v == Type::IfcPile || IfcBuildingElement::is(v); }
 Type::Enum IfcPile::type() const { return Type::IfcPile; }
 Type::Enum IfcPile::Class() { return Type::IfcPile; }
-IfcPile::IfcPile(IfcAbstractEntityPtr e) : IfcBuildingElement((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcPile)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcPile::IfcPile(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcPileTypeEnum::IfcPileTypeEnum > v9_PredefinedType, boost::optional< IfcPileConstructionEnum::IfcPileConstructionEnum > v10_ConstructionType) : IfcBuildingElement((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcPileTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } if (v10_ConstructionType) { e->setArgument(9,*v10_ConstructionType,IfcPileConstructionEnum::ToString(*v10_ConstructionType)); } else { e->setArgument(9); } entity = e; EntityBuffer::Add(this); }
+IfcPile::IfcPile(IfcAbstractEntity* e) : IfcBuildingElement((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcPile)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcPile::IfcPile(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcPileTypeEnum::IfcPileTypeEnum > v9_PredefinedType, boost::optional< IfcPileConstructionEnum::IfcPileConstructionEnum > v10_ConstructionType) : IfcBuildingElement((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcPileTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } if (v10_ConstructionType) { e->setArgument(9,*v10_ConstructionType,IfcPileConstructionEnum::ToString(*v10_ConstructionType)); } else { e->setArgument(9); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcPileType
-IfcPileTypeEnum::IfcPileTypeEnum IfcPileType::PredefinedType() { return IfcPileTypeEnum::FromString(*entity->getArgument(9)); }
+IfcPileTypeEnum::IfcPileTypeEnum IfcPileType::PredefinedType() const { return IfcPileTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcPileType::setPredefinedType(IfcPileTypeEnum::IfcPileTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcPileTypeEnum::ToString(v)); }
 bool IfcPileType::is(Type::Enum v) const { return v == Type::IfcPileType || IfcBuildingElementType::is(v); }
 Type::Enum IfcPileType::type() const { return Type::IfcPileType; }
 Type::Enum IfcPileType::Class() { return Type::IfcPileType; }
-IfcPileType::IfcPileType(IfcAbstractEntityPtr e) : IfcBuildingElementType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcPileType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcPileType::IfcPileType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcPileTypeEnum::IfcPileTypeEnum v10_PredefinedType) : IfcBuildingElementType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcPileTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcPileType::IfcPileType(IfcAbstractEntity* e) : IfcBuildingElementType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcPileType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcPileType::IfcPileType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcPileTypeEnum::IfcPileTypeEnum v10_PredefinedType) : IfcBuildingElementType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcPileTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcPipeFitting
-bool IfcPipeFitting::hasPredefinedType() { return !entity->getArgument(8)->isNull(); }
-IfcPipeFittingTypeEnum::IfcPipeFittingTypeEnum IfcPipeFitting::PredefinedType() { return IfcPipeFittingTypeEnum::FromString(*entity->getArgument(8)); }
+bool IfcPipeFitting::hasPredefinedType() const { return !entity->getArgument(8)->isNull(); }
+IfcPipeFittingTypeEnum::IfcPipeFittingTypeEnum IfcPipeFitting::PredefinedType() const { return IfcPipeFittingTypeEnum::FromString(*entity->getArgument(8)); }
 void IfcPipeFitting::setPredefinedType(IfcPipeFittingTypeEnum::IfcPipeFittingTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcPipeFittingTypeEnum::ToString(v)); }
 bool IfcPipeFitting::is(Type::Enum v) const { return v == Type::IfcPipeFitting || IfcFlowFitting::is(v); }
 Type::Enum IfcPipeFitting::type() const { return Type::IfcPipeFitting; }
 Type::Enum IfcPipeFitting::Class() { return Type::IfcPipeFitting; }
-IfcPipeFitting::IfcPipeFitting(IfcAbstractEntityPtr e) : IfcFlowFitting((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcPipeFitting)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcPipeFitting::IfcPipeFitting(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcPipeFittingTypeEnum::IfcPipeFittingTypeEnum > v9_PredefinedType) : IfcFlowFitting((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcPipeFittingTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcPipeFitting::IfcPipeFitting(IfcAbstractEntity* e) : IfcFlowFitting((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcPipeFitting)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcPipeFitting::IfcPipeFitting(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcPipeFittingTypeEnum::IfcPipeFittingTypeEnum > v9_PredefinedType) : IfcFlowFitting((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcPipeFittingTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcPipeFittingType
-IfcPipeFittingTypeEnum::IfcPipeFittingTypeEnum IfcPipeFittingType::PredefinedType() { return IfcPipeFittingTypeEnum::FromString(*entity->getArgument(9)); }
+IfcPipeFittingTypeEnum::IfcPipeFittingTypeEnum IfcPipeFittingType::PredefinedType() const { return IfcPipeFittingTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcPipeFittingType::setPredefinedType(IfcPipeFittingTypeEnum::IfcPipeFittingTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcPipeFittingTypeEnum::ToString(v)); }
 bool IfcPipeFittingType::is(Type::Enum v) const { return v == Type::IfcPipeFittingType || IfcFlowFittingType::is(v); }
 Type::Enum IfcPipeFittingType::type() const { return Type::IfcPipeFittingType; }
 Type::Enum IfcPipeFittingType::Class() { return Type::IfcPipeFittingType; }
-IfcPipeFittingType::IfcPipeFittingType(IfcAbstractEntityPtr e) : IfcFlowFittingType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcPipeFittingType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcPipeFittingType::IfcPipeFittingType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcPipeFittingTypeEnum::IfcPipeFittingTypeEnum v10_PredefinedType) : IfcFlowFittingType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcPipeFittingTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcPipeFittingType::IfcPipeFittingType(IfcAbstractEntity* e) : IfcFlowFittingType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcPipeFittingType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcPipeFittingType::IfcPipeFittingType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcPipeFittingTypeEnum::IfcPipeFittingTypeEnum v10_PredefinedType) : IfcFlowFittingType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcPipeFittingTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcPipeSegment
-bool IfcPipeSegment::hasPredefinedType() { return !entity->getArgument(8)->isNull(); }
-IfcPipeSegmentTypeEnum::IfcPipeSegmentTypeEnum IfcPipeSegment::PredefinedType() { return IfcPipeSegmentTypeEnum::FromString(*entity->getArgument(8)); }
+bool IfcPipeSegment::hasPredefinedType() const { return !entity->getArgument(8)->isNull(); }
+IfcPipeSegmentTypeEnum::IfcPipeSegmentTypeEnum IfcPipeSegment::PredefinedType() const { return IfcPipeSegmentTypeEnum::FromString(*entity->getArgument(8)); }
 void IfcPipeSegment::setPredefinedType(IfcPipeSegmentTypeEnum::IfcPipeSegmentTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcPipeSegmentTypeEnum::ToString(v)); }
 bool IfcPipeSegment::is(Type::Enum v) const { return v == Type::IfcPipeSegment || IfcFlowSegment::is(v); }
 Type::Enum IfcPipeSegment::type() const { return Type::IfcPipeSegment; }
 Type::Enum IfcPipeSegment::Class() { return Type::IfcPipeSegment; }
-IfcPipeSegment::IfcPipeSegment(IfcAbstractEntityPtr e) : IfcFlowSegment((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcPipeSegment)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcPipeSegment::IfcPipeSegment(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcPipeSegmentTypeEnum::IfcPipeSegmentTypeEnum > v9_PredefinedType) : IfcFlowSegment((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcPipeSegmentTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcPipeSegment::IfcPipeSegment(IfcAbstractEntity* e) : IfcFlowSegment((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcPipeSegment)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcPipeSegment::IfcPipeSegment(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcPipeSegmentTypeEnum::IfcPipeSegmentTypeEnum > v9_PredefinedType) : IfcFlowSegment((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcPipeSegmentTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcPipeSegmentType
-IfcPipeSegmentTypeEnum::IfcPipeSegmentTypeEnum IfcPipeSegmentType::PredefinedType() { return IfcPipeSegmentTypeEnum::FromString(*entity->getArgument(9)); }
+IfcPipeSegmentTypeEnum::IfcPipeSegmentTypeEnum IfcPipeSegmentType::PredefinedType() const { return IfcPipeSegmentTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcPipeSegmentType::setPredefinedType(IfcPipeSegmentTypeEnum::IfcPipeSegmentTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcPipeSegmentTypeEnum::ToString(v)); }
 bool IfcPipeSegmentType::is(Type::Enum v) const { return v == Type::IfcPipeSegmentType || IfcFlowSegmentType::is(v); }
 Type::Enum IfcPipeSegmentType::type() const { return Type::IfcPipeSegmentType; }
 Type::Enum IfcPipeSegmentType::Class() { return Type::IfcPipeSegmentType; }
-IfcPipeSegmentType::IfcPipeSegmentType(IfcAbstractEntityPtr e) : IfcFlowSegmentType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcPipeSegmentType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcPipeSegmentType::IfcPipeSegmentType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcPipeSegmentTypeEnum::IfcPipeSegmentTypeEnum v10_PredefinedType) : IfcFlowSegmentType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcPipeSegmentTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcPipeSegmentType::IfcPipeSegmentType(IfcAbstractEntity* e) : IfcFlowSegmentType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcPipeSegmentType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcPipeSegmentType::IfcPipeSegmentType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcPipeSegmentTypeEnum::IfcPipeSegmentTypeEnum v10_PredefinedType) : IfcFlowSegmentType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcPipeSegmentTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcPixelTexture
-IfcInteger IfcPixelTexture::Width() { return *entity->getArgument(5); }
-void IfcPixelTexture::setWidth(IfcInteger v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-IfcInteger IfcPixelTexture::Height() { return *entity->getArgument(6); }
-void IfcPixelTexture::setHeight(IfcInteger v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
-IfcInteger IfcPixelTexture::ColourComponents() { return *entity->getArgument(7); }
-void IfcPixelTexture::setColourComponents(IfcInteger v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
+int IfcPixelTexture::Width() const { return *entity->getArgument(5); }
+void IfcPixelTexture::setWidth(int v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+int IfcPixelTexture::Height() const { return *entity->getArgument(6); }
+void IfcPixelTexture::setHeight(int v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
+int IfcPixelTexture::ColourComponents() const { return *entity->getArgument(7); }
+void IfcPixelTexture::setColourComponents(int v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
 bool IfcPixelTexture::is(Type::Enum v) const { return v == Type::IfcPixelTexture || IfcSurfaceTexture::is(v); }
 Type::Enum IfcPixelTexture::type() const { return Type::IfcPixelTexture; }
 Type::Enum IfcPixelTexture::Class() { return Type::IfcPixelTexture; }
-IfcPixelTexture::IfcPixelTexture(IfcAbstractEntityPtr e) : IfcSurfaceTexture((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcPixelTexture)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcPixelTexture::IfcPixelTexture(bool v1_RepeatS, bool v2_RepeatT, boost::optional< IfcIdentifier > v3_Mode, IfcCartesianTransformationOperator2D* v4_TextureTransform, boost::optional< std::vector< IfcIdentifier > /*[1:?]*/ > v5_Parameter, IfcInteger v6_Width, IfcInteger v7_Height, IfcInteger v8_ColourComponents) : IfcSurfaceTexture((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_RepeatS)); e->setArgument(1,(v2_RepeatT)); if (v3_Mode) { e->setArgument(2,(*v3_Mode)); } else { e->setArgument(2); } e->setArgument(3,(v4_TextureTransform)); if (v5_Parameter) { e->setArgument(4,(*v5_Parameter)); } else { e->setArgument(4); } e->setArgument(5,(v6_Width)); e->setArgument(6,(v7_Height)); e->setArgument(7,(v8_ColourComponents)); entity = e; EntityBuffer::Add(this); }
+IfcPixelTexture::IfcPixelTexture(IfcAbstractEntity* e) : IfcSurfaceTexture((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcPixelTexture)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcPixelTexture::IfcPixelTexture(bool v1_RepeatS, bool v2_RepeatT, boost::optional< std::string > v3_Mode, IfcCartesianTransformationOperator2D* v4_TextureTransform, boost::optional< std::vector< std::string > /*[1:?]*/ > v5_Parameter, int v6_Width, int v7_Height, int v8_ColourComponents) : IfcSurfaceTexture((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_RepeatS)); e->setArgument(1,(v2_RepeatT)); if (v3_Mode) { e->setArgument(2,(*v3_Mode)); } else { e->setArgument(2); } e->setArgument(3,(v4_TextureTransform)); if (v5_Parameter) { e->setArgument(4,(*v5_Parameter)); } else { e->setArgument(4); } e->setArgument(5,(v6_Width)); e->setArgument(6,(v7_Height)); e->setArgument(7,(v8_ColourComponents)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcPlacement
-IfcCartesianPoint* IfcPlacement::Location() { return (IfcCartesianPoint*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(0))); }
+IfcCartesianPoint* IfcPlacement::Location() const { return (IfcCartesianPoint*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(0))); }
 void IfcPlacement::setLocation(IfcCartesianPoint* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
 bool IfcPlacement::is(Type::Enum v) const { return v == Type::IfcPlacement || IfcGeometricRepresentationItem::is(v); }
 Type::Enum IfcPlacement::type() const { return Type::IfcPlacement; }
 Type::Enum IfcPlacement::Class() { return Type::IfcPlacement; }
-IfcPlacement::IfcPlacement(IfcAbstractEntityPtr e) : IfcGeometricRepresentationItem((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcPlacement)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcPlacement::IfcPlacement(IfcCartesianPoint* v1_Location) : IfcGeometricRepresentationItem((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Location)); entity = e; EntityBuffer::Add(this); }
+IfcPlacement::IfcPlacement(IfcAbstractEntity* e) : IfcGeometricRepresentationItem((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcPlacement)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcPlacement::IfcPlacement(IfcCartesianPoint* v1_Location) : IfcGeometricRepresentationItem((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Location)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcPlanarBox
-IfcAxis2Placement IfcPlanarBox::Placement() { return *entity->getArgument(2); }
-void IfcPlanarBox::setPlacement(IfcAxis2Placement v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+IfcAxis2Placement* IfcPlanarBox::Placement() const { return (IfcAxis2Placement*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(2))); }
+void IfcPlanarBox::setPlacement(IfcAxis2Placement* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
 bool IfcPlanarBox::is(Type::Enum v) const { return v == Type::IfcPlanarBox || IfcPlanarExtent::is(v); }
 Type::Enum IfcPlanarBox::type() const { return Type::IfcPlanarBox; }
 Type::Enum IfcPlanarBox::Class() { return Type::IfcPlanarBox; }
-IfcPlanarBox::IfcPlanarBox(IfcAbstractEntityPtr e) : IfcPlanarExtent((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcPlanarBox)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcPlanarBox::IfcPlanarBox(IfcLengthMeasure v1_SizeInX, IfcLengthMeasure v2_SizeInY, IfcAxis2Placement v3_Placement) : IfcPlanarExtent((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_SizeInX)); e->setArgument(1,(v2_SizeInY)); e->setArgument(2,(v3_Placement)); entity = e; EntityBuffer::Add(this); }
+IfcPlanarBox::IfcPlanarBox(IfcAbstractEntity* e) : IfcPlanarExtent((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcPlanarBox)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcPlanarBox::IfcPlanarBox(double v1_SizeInX, double v2_SizeInY, IfcAxis2Placement* v3_Placement) : IfcPlanarExtent((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_SizeInX)); e->setArgument(1,(v2_SizeInY)); e->setArgument(2,(v3_Placement)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcPlanarExtent
-IfcLengthMeasure IfcPlanarExtent::SizeInX() { return *entity->getArgument(0); }
-void IfcPlanarExtent::setSizeInX(IfcLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-IfcLengthMeasure IfcPlanarExtent::SizeInY() { return *entity->getArgument(1); }
-void IfcPlanarExtent::setSizeInY(IfcLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+double IfcPlanarExtent::SizeInX() const { return *entity->getArgument(0); }
+void IfcPlanarExtent::setSizeInX(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+double IfcPlanarExtent::SizeInY() const { return *entity->getArgument(1); }
+void IfcPlanarExtent::setSizeInY(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
 bool IfcPlanarExtent::is(Type::Enum v) const { return v == Type::IfcPlanarExtent || IfcGeometricRepresentationItem::is(v); }
 Type::Enum IfcPlanarExtent::type() const { return Type::IfcPlanarExtent; }
 Type::Enum IfcPlanarExtent::Class() { return Type::IfcPlanarExtent; }
-IfcPlanarExtent::IfcPlanarExtent(IfcAbstractEntityPtr e) : IfcGeometricRepresentationItem((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcPlanarExtent)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcPlanarExtent::IfcPlanarExtent(IfcLengthMeasure v1_SizeInX, IfcLengthMeasure v2_SizeInY) : IfcGeometricRepresentationItem((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_SizeInX)); e->setArgument(1,(v2_SizeInY)); entity = e; EntityBuffer::Add(this); }
+IfcPlanarExtent::IfcPlanarExtent(IfcAbstractEntity* e) : IfcGeometricRepresentationItem((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcPlanarExtent)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcPlanarExtent::IfcPlanarExtent(double v1_SizeInX, double v2_SizeInY) : IfcGeometricRepresentationItem((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_SizeInX)); e->setArgument(1,(v2_SizeInY)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcPlane
 bool IfcPlane::is(Type::Enum v) const { return v == Type::IfcPlane || IfcElementarySurface::is(v); }
 Type::Enum IfcPlane::type() const { return Type::IfcPlane; }
 Type::Enum IfcPlane::Class() { return Type::IfcPlane; }
-IfcPlane::IfcPlane(IfcAbstractEntityPtr e) : IfcElementarySurface((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcPlane)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcPlane::IfcPlane(IfcAxis2Placement3D* v1_Position) : IfcElementarySurface((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Position)); entity = e; EntityBuffer::Add(this); }
+IfcPlane::IfcPlane(IfcAbstractEntity* e) : IfcElementarySurface((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcPlane)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcPlane::IfcPlane(IfcAxis2Placement3D* v1_Position) : IfcElementarySurface((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Position)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcPlate
-bool IfcPlate::hasPredefinedType() { return !entity->getArgument(8)->isNull(); }
-IfcPlateTypeEnum::IfcPlateTypeEnum IfcPlate::PredefinedType() { return IfcPlateTypeEnum::FromString(*entity->getArgument(8)); }
+bool IfcPlate::hasPredefinedType() const { return !entity->getArgument(8)->isNull(); }
+IfcPlateTypeEnum::IfcPlateTypeEnum IfcPlate::PredefinedType() const { return IfcPlateTypeEnum::FromString(*entity->getArgument(8)); }
 void IfcPlate::setPredefinedType(IfcPlateTypeEnum::IfcPlateTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcPlateTypeEnum::ToString(v)); }
 bool IfcPlate::is(Type::Enum v) const { return v == Type::IfcPlate || IfcBuildingElement::is(v); }
 Type::Enum IfcPlate::type() const { return Type::IfcPlate; }
 Type::Enum IfcPlate::Class() { return Type::IfcPlate; }
-IfcPlate::IfcPlate(IfcAbstractEntityPtr e) : IfcBuildingElement((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcPlate)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcPlate::IfcPlate(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcPlateTypeEnum::IfcPlateTypeEnum > v9_PredefinedType) : IfcBuildingElement((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcPlateTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcPlate::IfcPlate(IfcAbstractEntity* e) : IfcBuildingElement((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcPlate)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcPlate::IfcPlate(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcPlateTypeEnum::IfcPlateTypeEnum > v9_PredefinedType) : IfcBuildingElement((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcPlateTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcPlateStandardCase
 bool IfcPlateStandardCase::is(Type::Enum v) const { return v == Type::IfcPlateStandardCase || IfcPlate::is(v); }
 Type::Enum IfcPlateStandardCase::type() const { return Type::IfcPlateStandardCase; }
 Type::Enum IfcPlateStandardCase::Class() { return Type::IfcPlateStandardCase; }
-IfcPlateStandardCase::IfcPlateStandardCase(IfcAbstractEntityPtr e) : IfcPlate((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcPlateStandardCase)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcPlateStandardCase::IfcPlateStandardCase(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcPlateTypeEnum::IfcPlateTypeEnum > v9_PredefinedType) : IfcPlate((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcPlateTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcPlateStandardCase::IfcPlateStandardCase(IfcAbstractEntity* e) : IfcPlate((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcPlateStandardCase)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcPlateStandardCase::IfcPlateStandardCase(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcPlateTypeEnum::IfcPlateTypeEnum > v9_PredefinedType) : IfcPlate((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcPlateTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcPlateType
-IfcPlateTypeEnum::IfcPlateTypeEnum IfcPlateType::PredefinedType() { return IfcPlateTypeEnum::FromString(*entity->getArgument(9)); }
+IfcPlateTypeEnum::IfcPlateTypeEnum IfcPlateType::PredefinedType() const { return IfcPlateTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcPlateType::setPredefinedType(IfcPlateTypeEnum::IfcPlateTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcPlateTypeEnum::ToString(v)); }
 bool IfcPlateType::is(Type::Enum v) const { return v == Type::IfcPlateType || IfcBuildingElementType::is(v); }
 Type::Enum IfcPlateType::type() const { return Type::IfcPlateType; }
 Type::Enum IfcPlateType::Class() { return Type::IfcPlateType; }
-IfcPlateType::IfcPlateType(IfcAbstractEntityPtr e) : IfcBuildingElementType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcPlateType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcPlateType::IfcPlateType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcPlateTypeEnum::IfcPlateTypeEnum v10_PredefinedType) : IfcBuildingElementType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcPlateTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcPlateType::IfcPlateType(IfcAbstractEntity* e) : IfcBuildingElementType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcPlateType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcPlateType::IfcPlateType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcPlateTypeEnum::IfcPlateTypeEnum v10_PredefinedType) : IfcBuildingElementType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcPlateTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcPoint
 bool IfcPoint::is(Type::Enum v) const { return v == Type::IfcPoint || IfcGeometricRepresentationItem::is(v); }
 Type::Enum IfcPoint::type() const { return Type::IfcPoint; }
 Type::Enum IfcPoint::Class() { return Type::IfcPoint; }
-IfcPoint::IfcPoint(IfcAbstractEntityPtr e) : IfcGeometricRepresentationItem((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcPoint)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcPoint::IfcPoint() : IfcGeometricRepresentationItem((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); entity = e; EntityBuffer::Add(this); }
+IfcPoint::IfcPoint(IfcAbstractEntity* e) : IfcGeometricRepresentationItem((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcPoint)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcPoint::IfcPoint() : IfcGeometricRepresentationItem((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcPointOnCurve
-IfcCurve* IfcPointOnCurve::BasisCurve() { return (IfcCurve*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(0))); }
+IfcCurve* IfcPointOnCurve::BasisCurve() const { return (IfcCurve*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(0))); }
 void IfcPointOnCurve::setBasisCurve(IfcCurve* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-IfcParameterValue IfcPointOnCurve::PointParameter() { return *entity->getArgument(1); }
-void IfcPointOnCurve::setPointParameter(IfcParameterValue v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+double IfcPointOnCurve::PointParameter() const { return *entity->getArgument(1); }
+void IfcPointOnCurve::setPointParameter(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
 bool IfcPointOnCurve::is(Type::Enum v) const { return v == Type::IfcPointOnCurve || IfcPoint::is(v); }
 Type::Enum IfcPointOnCurve::type() const { return Type::IfcPointOnCurve; }
 Type::Enum IfcPointOnCurve::Class() { return Type::IfcPointOnCurve; }
-IfcPointOnCurve::IfcPointOnCurve(IfcAbstractEntityPtr e) : IfcPoint((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcPointOnCurve)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcPointOnCurve::IfcPointOnCurve(IfcCurve* v1_BasisCurve, IfcParameterValue v2_PointParameter) : IfcPoint((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_BasisCurve)); e->setArgument(1,(v2_PointParameter)); entity = e; EntityBuffer::Add(this); }
+IfcPointOnCurve::IfcPointOnCurve(IfcAbstractEntity* e) : IfcPoint((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcPointOnCurve)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcPointOnCurve::IfcPointOnCurve(IfcCurve* v1_BasisCurve, double v2_PointParameter) : IfcPoint((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_BasisCurve)); e->setArgument(1,(v2_PointParameter)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcPointOnSurface
-IfcSurface* IfcPointOnSurface::BasisSurface() { return (IfcSurface*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(0))); }
+IfcSurface* IfcPointOnSurface::BasisSurface() const { return (IfcSurface*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(0))); }
 void IfcPointOnSurface::setBasisSurface(IfcSurface* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-IfcParameterValue IfcPointOnSurface::PointParameterU() { return *entity->getArgument(1); }
-void IfcPointOnSurface::setPointParameterU(IfcParameterValue v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-IfcParameterValue IfcPointOnSurface::PointParameterV() { return *entity->getArgument(2); }
-void IfcPointOnSurface::setPointParameterV(IfcParameterValue v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+double IfcPointOnSurface::PointParameterU() const { return *entity->getArgument(1); }
+void IfcPointOnSurface::setPointParameterU(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+double IfcPointOnSurface::PointParameterV() const { return *entity->getArgument(2); }
+void IfcPointOnSurface::setPointParameterV(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
 bool IfcPointOnSurface::is(Type::Enum v) const { return v == Type::IfcPointOnSurface || IfcPoint::is(v); }
 Type::Enum IfcPointOnSurface::type() const { return Type::IfcPointOnSurface; }
 Type::Enum IfcPointOnSurface::Class() { return Type::IfcPointOnSurface; }
-IfcPointOnSurface::IfcPointOnSurface(IfcAbstractEntityPtr e) : IfcPoint((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcPointOnSurface)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcPointOnSurface::IfcPointOnSurface(IfcSurface* v1_BasisSurface, IfcParameterValue v2_PointParameterU, IfcParameterValue v3_PointParameterV) : IfcPoint((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_BasisSurface)); e->setArgument(1,(v2_PointParameterU)); e->setArgument(2,(v3_PointParameterV)); entity = e; EntityBuffer::Add(this); }
+IfcPointOnSurface::IfcPointOnSurface(IfcAbstractEntity* e) : IfcPoint((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcPointOnSurface)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcPointOnSurface::IfcPointOnSurface(IfcSurface* v1_BasisSurface, double v2_PointParameterU, double v3_PointParameterV) : IfcPoint((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_BasisSurface)); e->setArgument(1,(v2_PointParameterU)); e->setArgument(2,(v3_PointParameterV)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcPolyLoop
-SHARED_PTR< IfcTemplatedEntityList< IfcCartesianPoint > > IfcPolyLoop::Polygon() { RETURN_AS_LIST(IfcCartesianPoint,0) }
-void IfcPolyLoop::setPolygon(SHARED_PTR< IfcTemplatedEntityList< IfcCartesianPoint > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v->generalize()); }
+IfcTemplatedEntityList< IfcCartesianPoint >::ptr IfcPolyLoop::Polygon() const { IfcEntityList::ptr es = *entity->getArgument(0); return es->as<IfcCartesianPoint>(); }
+void IfcPolyLoop::setPolygon(IfcTemplatedEntityList< IfcCartesianPoint >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v->generalize()); }
 bool IfcPolyLoop::is(Type::Enum v) const { return v == Type::IfcPolyLoop || IfcLoop::is(v); }
 Type::Enum IfcPolyLoop::type() const { return Type::IfcPolyLoop; }
 Type::Enum IfcPolyLoop::Class() { return Type::IfcPolyLoop; }
-IfcPolyLoop::IfcPolyLoop(IfcAbstractEntityPtr e) : IfcLoop((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcPolyLoop)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcPolyLoop::IfcPolyLoop(SHARED_PTR< IfcTemplatedEntityList< IfcCartesianPoint > > v1_Polygon) : IfcLoop((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Polygon)->generalize()); entity = e; EntityBuffer::Add(this); }
+IfcPolyLoop::IfcPolyLoop(IfcAbstractEntity* e) : IfcLoop((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcPolyLoop)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcPolyLoop::IfcPolyLoop(IfcTemplatedEntityList< IfcCartesianPoint >::ptr v1_Polygon) : IfcLoop((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Polygon)->generalize()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcPolygonalBoundedHalfSpace
-IfcAxis2Placement3D* IfcPolygonalBoundedHalfSpace::Position() { return (IfcAxis2Placement3D*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(2))); }
+IfcAxis2Placement3D* IfcPolygonalBoundedHalfSpace::Position() const { return (IfcAxis2Placement3D*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(2))); }
 void IfcPolygonalBoundedHalfSpace::setPosition(IfcAxis2Placement3D* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-IfcBoundedCurve* IfcPolygonalBoundedHalfSpace::PolygonalBoundary() { return (IfcBoundedCurve*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(3))); }
+IfcBoundedCurve* IfcPolygonalBoundedHalfSpace::PolygonalBoundary() const { return (IfcBoundedCurve*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(3))); }
 void IfcPolygonalBoundedHalfSpace::setPolygonalBoundary(IfcBoundedCurve* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
 bool IfcPolygonalBoundedHalfSpace::is(Type::Enum v) const { return v == Type::IfcPolygonalBoundedHalfSpace || IfcHalfSpaceSolid::is(v); }
 Type::Enum IfcPolygonalBoundedHalfSpace::type() const { return Type::IfcPolygonalBoundedHalfSpace; }
 Type::Enum IfcPolygonalBoundedHalfSpace::Class() { return Type::IfcPolygonalBoundedHalfSpace; }
-IfcPolygonalBoundedHalfSpace::IfcPolygonalBoundedHalfSpace(IfcAbstractEntityPtr e) : IfcHalfSpaceSolid((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcPolygonalBoundedHalfSpace)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcPolygonalBoundedHalfSpace::IfcPolygonalBoundedHalfSpace(IfcSurface* v1_BaseSurface, bool v2_AgreementFlag, IfcAxis2Placement3D* v3_Position, IfcBoundedCurve* v4_PolygonalBoundary) : IfcHalfSpaceSolid((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_BaseSurface)); e->setArgument(1,(v2_AgreementFlag)); e->setArgument(2,(v3_Position)); e->setArgument(3,(v4_PolygonalBoundary)); entity = e; EntityBuffer::Add(this); }
+IfcPolygonalBoundedHalfSpace::IfcPolygonalBoundedHalfSpace(IfcAbstractEntity* e) : IfcHalfSpaceSolid((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcPolygonalBoundedHalfSpace)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcPolygonalBoundedHalfSpace::IfcPolygonalBoundedHalfSpace(IfcSurface* v1_BaseSurface, bool v2_AgreementFlag, IfcAxis2Placement3D* v3_Position, IfcBoundedCurve* v4_PolygonalBoundary) : IfcHalfSpaceSolid((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_BaseSurface)); e->setArgument(1,(v2_AgreementFlag)); e->setArgument(2,(v3_Position)); e->setArgument(3,(v4_PolygonalBoundary)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcPolyline
-SHARED_PTR< IfcTemplatedEntityList< IfcCartesianPoint > > IfcPolyline::Points() { RETURN_AS_LIST(IfcCartesianPoint,0) }
-void IfcPolyline::setPoints(SHARED_PTR< IfcTemplatedEntityList< IfcCartesianPoint > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v->generalize()); }
+IfcTemplatedEntityList< IfcCartesianPoint >::ptr IfcPolyline::Points() const { IfcEntityList::ptr es = *entity->getArgument(0); return es->as<IfcCartesianPoint>(); }
+void IfcPolyline::setPoints(IfcTemplatedEntityList< IfcCartesianPoint >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v->generalize()); }
 bool IfcPolyline::is(Type::Enum v) const { return v == Type::IfcPolyline || IfcBoundedCurve::is(v); }
 Type::Enum IfcPolyline::type() const { return Type::IfcPolyline; }
 Type::Enum IfcPolyline::Class() { return Type::IfcPolyline; }
-IfcPolyline::IfcPolyline(IfcAbstractEntityPtr e) : IfcBoundedCurve((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcPolyline)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcPolyline::IfcPolyline(SHARED_PTR< IfcTemplatedEntityList< IfcCartesianPoint > > v1_Points) : IfcBoundedCurve((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Points)->generalize()); entity = e; EntityBuffer::Add(this); }
+IfcPolyline::IfcPolyline(IfcAbstractEntity* e) : IfcBoundedCurve((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcPolyline)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcPolyline::IfcPolyline(IfcTemplatedEntityList< IfcCartesianPoint >::ptr v1_Points) : IfcBoundedCurve((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Points)->generalize()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcPort
-IfcRelConnectsPortToElement::list IfcPort::ContainedIn() { RETURN_INVERSE(IfcRelConnectsPortToElement) }
-IfcRelConnectsPorts::list IfcPort::ConnectedFrom() { RETURN_INVERSE(IfcRelConnectsPorts) }
-IfcRelConnectsPorts::list IfcPort::ConnectedTo() { RETURN_INVERSE(IfcRelConnectsPorts) }
+IfcRelConnectsPortToElement::list::ptr IfcPort::ContainedIn() const { return entity->getInverse(Type::IfcRelConnectsPortToElement, 4)->as<IfcRelConnectsPortToElement>(); }
+IfcRelConnectsPorts::list::ptr IfcPort::ConnectedFrom() const { return entity->getInverse(Type::IfcRelConnectsPorts, 5)->as<IfcRelConnectsPorts>(); }
+IfcRelConnectsPorts::list::ptr IfcPort::ConnectedTo() const { return entity->getInverse(Type::IfcRelConnectsPorts, 4)->as<IfcRelConnectsPorts>(); }
 bool IfcPort::is(Type::Enum v) const { return v == Type::IfcPort || IfcProduct::is(v); }
 Type::Enum IfcPort::type() const { return Type::IfcPort; }
 Type::Enum IfcPort::Class() { return Type::IfcPort; }
-IfcPort::IfcPort(IfcAbstractEntityPtr e) : IfcProduct((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcPort)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcPort::IfcPort(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation) : IfcProduct((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); entity = e; EntityBuffer::Add(this); }
+IfcPort::IfcPort(IfcAbstractEntity* e) : IfcProduct((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcPort)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcPort::IfcPort(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation) : IfcProduct((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcPostalAddress
-bool IfcPostalAddress::hasInternalLocation() { return !entity->getArgument(3)->isNull(); }
-IfcLabel IfcPostalAddress::InternalLocation() { return *entity->getArgument(3); }
-void IfcPostalAddress::setInternalLocation(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-bool IfcPostalAddress::hasAddressLines() { return !entity->getArgument(4)->isNull(); }
-std::vector< IfcLabel > /*[1:?]*/ IfcPostalAddress::AddressLines() { return *entity->getArgument(4); }
-void IfcPostalAddress::setAddressLines(std::vector< IfcLabel > /*[1:?]*/ v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-bool IfcPostalAddress::hasPostalBox() { return !entity->getArgument(5)->isNull(); }
-IfcLabel IfcPostalAddress::PostalBox() { return *entity->getArgument(5); }
-void IfcPostalAddress::setPostalBox(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-bool IfcPostalAddress::hasTown() { return !entity->getArgument(6)->isNull(); }
-IfcLabel IfcPostalAddress::Town() { return *entity->getArgument(6); }
-void IfcPostalAddress::setTown(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
-bool IfcPostalAddress::hasRegion() { return !entity->getArgument(7)->isNull(); }
-IfcLabel IfcPostalAddress::Region() { return *entity->getArgument(7); }
-void IfcPostalAddress::setRegion(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
-bool IfcPostalAddress::hasPostalCode() { return !entity->getArgument(8)->isNull(); }
-IfcLabel IfcPostalAddress::PostalCode() { return *entity->getArgument(8); }
-void IfcPostalAddress::setPostalCode(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
-bool IfcPostalAddress::hasCountry() { return !entity->getArgument(9)->isNull(); }
-IfcLabel IfcPostalAddress::Country() { return *entity->getArgument(9); }
-void IfcPostalAddress::setCountry(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
+bool IfcPostalAddress::hasInternalLocation() const { return !entity->getArgument(3)->isNull(); }
+std::string IfcPostalAddress::InternalLocation() const { return *entity->getArgument(3); }
+void IfcPostalAddress::setInternalLocation(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+bool IfcPostalAddress::hasAddressLines() const { return !entity->getArgument(4)->isNull(); }
+std::vector< std::string > /*[1:?]*/ IfcPostalAddress::AddressLines() const { return *entity->getArgument(4); }
+void IfcPostalAddress::setAddressLines(std::vector< std::string > /*[1:?]*/ v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+bool IfcPostalAddress::hasPostalBox() const { return !entity->getArgument(5)->isNull(); }
+std::string IfcPostalAddress::PostalBox() const { return *entity->getArgument(5); }
+void IfcPostalAddress::setPostalBox(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+bool IfcPostalAddress::hasTown() const { return !entity->getArgument(6)->isNull(); }
+std::string IfcPostalAddress::Town() const { return *entity->getArgument(6); }
+void IfcPostalAddress::setTown(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
+bool IfcPostalAddress::hasRegion() const { return !entity->getArgument(7)->isNull(); }
+std::string IfcPostalAddress::Region() const { return *entity->getArgument(7); }
+void IfcPostalAddress::setRegion(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
+bool IfcPostalAddress::hasPostalCode() const { return !entity->getArgument(8)->isNull(); }
+std::string IfcPostalAddress::PostalCode() const { return *entity->getArgument(8); }
+void IfcPostalAddress::setPostalCode(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
+bool IfcPostalAddress::hasCountry() const { return !entity->getArgument(9)->isNull(); }
+std::string IfcPostalAddress::Country() const { return *entity->getArgument(9); }
+void IfcPostalAddress::setCountry(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
 bool IfcPostalAddress::is(Type::Enum v) const { return v == Type::IfcPostalAddress || IfcAddress::is(v); }
 Type::Enum IfcPostalAddress::type() const { return Type::IfcPostalAddress; }
 Type::Enum IfcPostalAddress::Class() { return Type::IfcPostalAddress; }
-IfcPostalAddress::IfcPostalAddress(IfcAbstractEntityPtr e) : IfcAddress((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcPostalAddress)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcPostalAddress::IfcPostalAddress(boost::optional< IfcAddressTypeEnum::IfcAddressTypeEnum > v1_Purpose, boost::optional< IfcText > v2_Description, boost::optional< IfcLabel > v3_UserDefinedPurpose, boost::optional< IfcLabel > v4_InternalLocation, boost::optional< std::vector< IfcLabel > /*[1:?]*/ > v5_AddressLines, boost::optional< IfcLabel > v6_PostalBox, boost::optional< IfcLabel > v7_Town, boost::optional< IfcLabel > v8_Region, boost::optional< IfcLabel > v9_PostalCode, boost::optional< IfcLabel > v10_Country) : IfcAddress((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Purpose) { e->setArgument(0,*v1_Purpose,IfcAddressTypeEnum::ToString(*v1_Purpose)); } else { e->setArgument(0); } if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } if (v3_UserDefinedPurpose) { e->setArgument(2,(*v3_UserDefinedPurpose)); } else { e->setArgument(2); } if (v4_InternalLocation) { e->setArgument(3,(*v4_InternalLocation)); } else { e->setArgument(3); } if (v5_AddressLines) { e->setArgument(4,(*v5_AddressLines)); } else { e->setArgument(4); } if (v6_PostalBox) { e->setArgument(5,(*v6_PostalBox)); } else { e->setArgument(5); } if (v7_Town) { e->setArgument(6,(*v7_Town)); } else { e->setArgument(6); } if (v8_Region) { e->setArgument(7,(*v8_Region)); } else { e->setArgument(7); } if (v9_PostalCode) { e->setArgument(8,(*v9_PostalCode)); } else { e->setArgument(8); } if (v10_Country) { e->setArgument(9,(*v10_Country)); } else { e->setArgument(9); } entity = e; EntityBuffer::Add(this); }
+IfcPostalAddress::IfcPostalAddress(IfcAbstractEntity* e) : IfcAddress((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcPostalAddress)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcPostalAddress::IfcPostalAddress(boost::optional< IfcAddressTypeEnum::IfcAddressTypeEnum > v1_Purpose, boost::optional< std::string > v2_Description, boost::optional< std::string > v3_UserDefinedPurpose, boost::optional< std::string > v4_InternalLocation, boost::optional< std::vector< std::string > /*[1:?]*/ > v5_AddressLines, boost::optional< std::string > v6_PostalBox, boost::optional< std::string > v7_Town, boost::optional< std::string > v8_Region, boost::optional< std::string > v9_PostalCode, boost::optional< std::string > v10_Country) : IfcAddress((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Purpose) { e->setArgument(0,*v1_Purpose,IfcAddressTypeEnum::ToString(*v1_Purpose)); } else { e->setArgument(0); } if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } if (v3_UserDefinedPurpose) { e->setArgument(2,(*v3_UserDefinedPurpose)); } else { e->setArgument(2); } if (v4_InternalLocation) { e->setArgument(3,(*v4_InternalLocation)); } else { e->setArgument(3); } if (v5_AddressLines) { e->setArgument(4,(*v5_AddressLines)); } else { e->setArgument(4); } if (v6_PostalBox) { e->setArgument(5,(*v6_PostalBox)); } else { e->setArgument(5); } if (v7_Town) { e->setArgument(6,(*v7_Town)); } else { e->setArgument(6); } if (v8_Region) { e->setArgument(7,(*v8_Region)); } else { e->setArgument(7); } if (v9_PostalCode) { e->setArgument(8,(*v9_PostalCode)); } else { e->setArgument(8); } if (v10_Country) { e->setArgument(9,(*v10_Country)); } else { e->setArgument(9); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcPreDefinedColour
 bool IfcPreDefinedColour::is(Type::Enum v) const { return v == Type::IfcPreDefinedColour || IfcPreDefinedItem::is(v); }
 Type::Enum IfcPreDefinedColour::type() const { return Type::IfcPreDefinedColour; }
 Type::Enum IfcPreDefinedColour::Class() { return Type::IfcPreDefinedColour; }
-IfcPreDefinedColour::IfcPreDefinedColour(IfcAbstractEntityPtr e) : IfcPreDefinedItem((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcPreDefinedColour)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcPreDefinedColour::IfcPreDefinedColour(IfcLabel v1_Name) : IfcPreDefinedItem((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); entity = e; EntityBuffer::Add(this); }
+IfcPreDefinedColour::IfcPreDefinedColour(IfcAbstractEntity* e) : IfcPreDefinedItem((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcPreDefinedColour)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcPreDefinedColour::IfcPreDefinedColour(std::string v1_Name) : IfcPreDefinedItem((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcPreDefinedCurveFont
 bool IfcPreDefinedCurveFont::is(Type::Enum v) const { return v == Type::IfcPreDefinedCurveFont || IfcPreDefinedItem::is(v); }
 Type::Enum IfcPreDefinedCurveFont::type() const { return Type::IfcPreDefinedCurveFont; }
 Type::Enum IfcPreDefinedCurveFont::Class() { return Type::IfcPreDefinedCurveFont; }
-IfcPreDefinedCurveFont::IfcPreDefinedCurveFont(IfcAbstractEntityPtr e) : IfcPreDefinedItem((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcPreDefinedCurveFont)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcPreDefinedCurveFont::IfcPreDefinedCurveFont(IfcLabel v1_Name) : IfcPreDefinedItem((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); entity = e; EntityBuffer::Add(this); }
+IfcPreDefinedCurveFont::IfcPreDefinedCurveFont(IfcAbstractEntity* e) : IfcPreDefinedItem((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcPreDefinedCurveFont)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcPreDefinedCurveFont::IfcPreDefinedCurveFont(std::string v1_Name) : IfcPreDefinedItem((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcPreDefinedItem
-IfcLabel IfcPreDefinedItem::Name() { return *entity->getArgument(0); }
-void IfcPreDefinedItem::setName(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+std::string IfcPreDefinedItem::Name() const { return *entity->getArgument(0); }
+void IfcPreDefinedItem::setName(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
 bool IfcPreDefinedItem::is(Type::Enum v) const { return v == Type::IfcPreDefinedItem || IfcPresentationItem::is(v); }
 Type::Enum IfcPreDefinedItem::type() const { return Type::IfcPreDefinedItem; }
 Type::Enum IfcPreDefinedItem::Class() { return Type::IfcPreDefinedItem; }
-IfcPreDefinedItem::IfcPreDefinedItem(IfcAbstractEntityPtr e) : IfcPresentationItem((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcPreDefinedItem)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcPreDefinedItem::IfcPreDefinedItem(IfcLabel v1_Name) : IfcPresentationItem((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); entity = e; EntityBuffer::Add(this); }
+IfcPreDefinedItem::IfcPreDefinedItem(IfcAbstractEntity* e) : IfcPresentationItem((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcPreDefinedItem)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcPreDefinedItem::IfcPreDefinedItem(std::string v1_Name) : IfcPresentationItem((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcPreDefinedProperties
 bool IfcPreDefinedProperties::is(Type::Enum v) const { return v == Type::IfcPreDefinedProperties || IfcPropertyAbstraction::is(v); }
 Type::Enum IfcPreDefinedProperties::type() const { return Type::IfcPreDefinedProperties; }
 Type::Enum IfcPreDefinedProperties::Class() { return Type::IfcPreDefinedProperties; }
-IfcPreDefinedProperties::IfcPreDefinedProperties(IfcAbstractEntityPtr e) : IfcPropertyAbstraction((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcPreDefinedProperties)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcPreDefinedProperties::IfcPreDefinedProperties() : IfcPropertyAbstraction((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); entity = e; EntityBuffer::Add(this); }
+IfcPreDefinedProperties::IfcPreDefinedProperties(IfcAbstractEntity* e) : IfcPropertyAbstraction((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcPreDefinedProperties)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcPreDefinedProperties::IfcPreDefinedProperties() : IfcPropertyAbstraction((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcPreDefinedPropertySet
 bool IfcPreDefinedPropertySet::is(Type::Enum v) const { return v == Type::IfcPreDefinedPropertySet || IfcPropertySetDefinition::is(v); }
 Type::Enum IfcPreDefinedPropertySet::type() const { return Type::IfcPreDefinedPropertySet; }
 Type::Enum IfcPreDefinedPropertySet::Class() { return Type::IfcPreDefinedPropertySet; }
-IfcPreDefinedPropertySet::IfcPreDefinedPropertySet(IfcAbstractEntityPtr e) : IfcPropertySetDefinition((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcPreDefinedPropertySet)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcPreDefinedPropertySet::IfcPreDefinedPropertySet(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description) : IfcPropertySetDefinition((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } entity = e; EntityBuffer::Add(this); }
+IfcPreDefinedPropertySet::IfcPreDefinedPropertySet(IfcAbstractEntity* e) : IfcPropertySetDefinition((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcPreDefinedPropertySet)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcPreDefinedPropertySet::IfcPreDefinedPropertySet(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description) : IfcPropertySetDefinition((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcPreDefinedTextFont
 bool IfcPreDefinedTextFont::is(Type::Enum v) const { return v == Type::IfcPreDefinedTextFont || IfcPreDefinedItem::is(v); }
 Type::Enum IfcPreDefinedTextFont::type() const { return Type::IfcPreDefinedTextFont; }
 Type::Enum IfcPreDefinedTextFont::Class() { return Type::IfcPreDefinedTextFont; }
-IfcPreDefinedTextFont::IfcPreDefinedTextFont(IfcAbstractEntityPtr e) : IfcPreDefinedItem((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcPreDefinedTextFont)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcPreDefinedTextFont::IfcPreDefinedTextFont(IfcLabel v1_Name) : IfcPreDefinedItem((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); entity = e; EntityBuffer::Add(this); }
+IfcPreDefinedTextFont::IfcPreDefinedTextFont(IfcAbstractEntity* e) : IfcPreDefinedItem((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcPreDefinedTextFont)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcPreDefinedTextFont::IfcPreDefinedTextFont(std::string v1_Name) : IfcPreDefinedItem((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcPresentationItem
 bool IfcPresentationItem::is(Type::Enum v) const { return v == Type::IfcPresentationItem; }
 Type::Enum IfcPresentationItem::type() const { return Type::IfcPresentationItem; }
 Type::Enum IfcPresentationItem::Class() { return Type::IfcPresentationItem; }
-IfcPresentationItem::IfcPresentationItem(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcPresentationItem)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcPresentationItem::IfcPresentationItem(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcPresentationItem)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
 IfcPresentationItem::IfcPresentationItem() : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcPresentationLayerAssignment
-IfcLabel IfcPresentationLayerAssignment::Name() { return *entity->getArgument(0); }
-void IfcPresentationLayerAssignment::setName(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-bool IfcPresentationLayerAssignment::hasDescription() { return !entity->getArgument(1)->isNull(); }
-IfcText IfcPresentationLayerAssignment::Description() { return *entity->getArgument(1); }
-void IfcPresentationLayerAssignment::setDescription(IfcText v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > IfcPresentationLayerAssignment::AssignedItems() { RETURN_AS_LIST(IfcUtil::IfcAbstractSelect,2) }
-void IfcPresentationLayerAssignment::setAssignedItems(SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v->generalize()); }
-bool IfcPresentationLayerAssignment::hasIdentifier() { return !entity->getArgument(3)->isNull(); }
-IfcIdentifier IfcPresentationLayerAssignment::Identifier() { return *entity->getArgument(3); }
-void IfcPresentationLayerAssignment::setIdentifier(IfcIdentifier v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+std::string IfcPresentationLayerAssignment::Name() const { return *entity->getArgument(0); }
+void IfcPresentationLayerAssignment::setName(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+bool IfcPresentationLayerAssignment::hasDescription() const { return !entity->getArgument(1)->isNull(); }
+std::string IfcPresentationLayerAssignment::Description() const { return *entity->getArgument(1); }
+void IfcPresentationLayerAssignment::setDescription(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+IfcEntityList::ptr IfcPresentationLayerAssignment::AssignedItems() const { return *entity->getArgument(2); }
+void IfcPresentationLayerAssignment::setAssignedItems(IfcEntityList::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+bool IfcPresentationLayerAssignment::hasIdentifier() const { return !entity->getArgument(3)->isNull(); }
+std::string IfcPresentationLayerAssignment::Identifier() const { return *entity->getArgument(3); }
+void IfcPresentationLayerAssignment::setIdentifier(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
 bool IfcPresentationLayerAssignment::is(Type::Enum v) const { return v == Type::IfcPresentationLayerAssignment; }
 Type::Enum IfcPresentationLayerAssignment::type() const { return Type::IfcPresentationLayerAssignment; }
 Type::Enum IfcPresentationLayerAssignment::Class() { return Type::IfcPresentationLayerAssignment; }
-IfcPresentationLayerAssignment::IfcPresentationLayerAssignment(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcPresentationLayerAssignment)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcPresentationLayerAssignment::IfcPresentationLayerAssignment(IfcLabel v1_Name, boost::optional< IfcText > v2_Description, IfcEntities v3_AssignedItems, boost::optional< IfcIdentifier > v4_Identifier) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_AssignedItems)); if (v4_Identifier) { e->setArgument(3,(*v4_Identifier)); } else { e->setArgument(3); } entity = e; EntityBuffer::Add(this); }
+IfcPresentationLayerAssignment::IfcPresentationLayerAssignment(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcPresentationLayerAssignment)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcPresentationLayerAssignment::IfcPresentationLayerAssignment(std::string v1_Name, boost::optional< std::string > v2_Description, IfcEntityList::ptr v3_AssignedItems, boost::optional< std::string > v4_Identifier) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_AssignedItems)); if (v4_Identifier) { e->setArgument(3,(*v4_Identifier)); } else { e->setArgument(3); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcPresentationLayerWithStyle
-bool IfcPresentationLayerWithStyle::LayerOn() { return *entity->getArgument(4); }
+bool IfcPresentationLayerWithStyle::LayerOn() const { return *entity->getArgument(4); }
 void IfcPresentationLayerWithStyle::setLayerOn(bool v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-bool IfcPresentationLayerWithStyle::LayerFrozen() { return *entity->getArgument(5); }
+bool IfcPresentationLayerWithStyle::LayerFrozen() const { return *entity->getArgument(5); }
 void IfcPresentationLayerWithStyle::setLayerFrozen(bool v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-bool IfcPresentationLayerWithStyle::LayerBlocked() { return *entity->getArgument(6); }
+bool IfcPresentationLayerWithStyle::LayerBlocked() const { return *entity->getArgument(6); }
 void IfcPresentationLayerWithStyle::setLayerBlocked(bool v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
-SHARED_PTR< IfcTemplatedEntityList< IfcPresentationStyle > > IfcPresentationLayerWithStyle::LayerStyles() { RETURN_AS_LIST(IfcPresentationStyle,7) }
-void IfcPresentationLayerWithStyle::setLayerStyles(SHARED_PTR< IfcTemplatedEntityList< IfcPresentationStyle > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v->generalize()); }
+IfcTemplatedEntityList< IfcPresentationStyle >::ptr IfcPresentationLayerWithStyle::LayerStyles() const { IfcEntityList::ptr es = *entity->getArgument(7); return es->as<IfcPresentationStyle>(); }
+void IfcPresentationLayerWithStyle::setLayerStyles(IfcTemplatedEntityList< IfcPresentationStyle >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v->generalize()); }
 bool IfcPresentationLayerWithStyle::is(Type::Enum v) const { return v == Type::IfcPresentationLayerWithStyle || IfcPresentationLayerAssignment::is(v); }
 Type::Enum IfcPresentationLayerWithStyle::type() const { return Type::IfcPresentationLayerWithStyle; }
 Type::Enum IfcPresentationLayerWithStyle::Class() { return Type::IfcPresentationLayerWithStyle; }
-IfcPresentationLayerWithStyle::IfcPresentationLayerWithStyle(IfcAbstractEntityPtr e) : IfcPresentationLayerAssignment((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcPresentationLayerWithStyle)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcPresentationLayerWithStyle::IfcPresentationLayerWithStyle(IfcLabel v1_Name, boost::optional< IfcText > v2_Description, IfcEntities v3_AssignedItems, boost::optional< IfcIdentifier > v4_Identifier, bool v5_LayerOn, bool v6_LayerFrozen, bool v7_LayerBlocked, SHARED_PTR< IfcTemplatedEntityList< IfcPresentationStyle > > v8_LayerStyles) : IfcPresentationLayerAssignment((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_AssignedItems)); if (v4_Identifier) { e->setArgument(3,(*v4_Identifier)); } else { e->setArgument(3); } e->setArgument(4,(v5_LayerOn)); e->setArgument(5,(v6_LayerFrozen)); e->setArgument(6,(v7_LayerBlocked)); e->setArgument(7,(v8_LayerStyles)->generalize()); entity = e; EntityBuffer::Add(this); }
+IfcPresentationLayerWithStyle::IfcPresentationLayerWithStyle(IfcAbstractEntity* e) : IfcPresentationLayerAssignment((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcPresentationLayerWithStyle)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcPresentationLayerWithStyle::IfcPresentationLayerWithStyle(std::string v1_Name, boost::optional< std::string > v2_Description, IfcEntityList::ptr v3_AssignedItems, boost::optional< std::string > v4_Identifier, bool v5_LayerOn, bool v6_LayerFrozen, bool v7_LayerBlocked, IfcTemplatedEntityList< IfcPresentationStyle >::ptr v8_LayerStyles) : IfcPresentationLayerAssignment((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_AssignedItems)); if (v4_Identifier) { e->setArgument(3,(*v4_Identifier)); } else { e->setArgument(3); } e->setArgument(4,(v5_LayerOn)); e->setArgument(5,(v6_LayerFrozen)); e->setArgument(6,(v7_LayerBlocked)); e->setArgument(7,(v8_LayerStyles)->generalize()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcPresentationStyle
-bool IfcPresentationStyle::hasName() { return !entity->getArgument(0)->isNull(); }
-IfcLabel IfcPresentationStyle::Name() { return *entity->getArgument(0); }
-void IfcPresentationStyle::setName(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+bool IfcPresentationStyle::hasName() const { return !entity->getArgument(0)->isNull(); }
+std::string IfcPresentationStyle::Name() const { return *entity->getArgument(0); }
+void IfcPresentationStyle::setName(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
 bool IfcPresentationStyle::is(Type::Enum v) const { return v == Type::IfcPresentationStyle; }
 Type::Enum IfcPresentationStyle::type() const { return Type::IfcPresentationStyle; }
 Type::Enum IfcPresentationStyle::Class() { return Type::IfcPresentationStyle; }
-IfcPresentationStyle::IfcPresentationStyle(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcPresentationStyle)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcPresentationStyle::IfcPresentationStyle(boost::optional< IfcLabel > v1_Name) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } entity = e; EntityBuffer::Add(this); }
+IfcPresentationStyle::IfcPresentationStyle(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcPresentationStyle)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcPresentationStyle::IfcPresentationStyle(boost::optional< std::string > v1_Name) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcPresentationStyleAssignment
-SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > IfcPresentationStyleAssignment::Styles() { RETURN_AS_LIST(IfcUtil::IfcAbstractSelect,0) }
-void IfcPresentationStyleAssignment::setStyles(SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v->generalize()); }
+IfcEntityList::ptr IfcPresentationStyleAssignment::Styles() const { return *entity->getArgument(0); }
+void IfcPresentationStyleAssignment::setStyles(IfcEntityList::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
 bool IfcPresentationStyleAssignment::is(Type::Enum v) const { return v == Type::IfcPresentationStyleAssignment; }
 Type::Enum IfcPresentationStyleAssignment::type() const { return Type::IfcPresentationStyleAssignment; }
 Type::Enum IfcPresentationStyleAssignment::Class() { return Type::IfcPresentationStyleAssignment; }
-IfcPresentationStyleAssignment::IfcPresentationStyleAssignment(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcPresentationStyleAssignment)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcPresentationStyleAssignment::IfcPresentationStyleAssignment(IfcEntities v1_Styles) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Styles)); entity = e; EntityBuffer::Add(this); }
+IfcPresentationStyleAssignment::IfcPresentationStyleAssignment(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcPresentationStyleAssignment)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcPresentationStyleAssignment::IfcPresentationStyleAssignment(IfcEntityList::ptr v1_Styles) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Styles)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcProcedure
-bool IfcProcedure::hasPredefinedType() { return !entity->getArgument(7)->isNull(); }
-IfcProcedureTypeEnum::IfcProcedureTypeEnum IfcProcedure::PredefinedType() { return IfcProcedureTypeEnum::FromString(*entity->getArgument(7)); }
+bool IfcProcedure::hasPredefinedType() const { return !entity->getArgument(7)->isNull(); }
+IfcProcedureTypeEnum::IfcProcedureTypeEnum IfcProcedure::PredefinedType() const { return IfcProcedureTypeEnum::FromString(*entity->getArgument(7)); }
 void IfcProcedure::setPredefinedType(IfcProcedureTypeEnum::IfcProcedureTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v,IfcProcedureTypeEnum::ToString(v)); }
 bool IfcProcedure::is(Type::Enum v) const { return v == Type::IfcProcedure || IfcProcess::is(v); }
 Type::Enum IfcProcedure::type() const { return Type::IfcProcedure; }
 Type::Enum IfcProcedure::Class() { return Type::IfcProcedure; }
-IfcProcedure::IfcProcedure(IfcAbstractEntityPtr e) : IfcProcess((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcProcedure)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcProcedure::IfcProcedure(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, boost::optional< IfcIdentifier > v6_Identification, boost::optional< IfcText > v7_LongDescription, boost::optional< IfcProcedureTypeEnum::IfcProcedureTypeEnum > v8_PredefinedType) : IfcProcess((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } if (v6_Identification) { e->setArgument(5,(*v6_Identification)); } else { e->setArgument(5); } if (v7_LongDescription) { e->setArgument(6,(*v7_LongDescription)); } else { e->setArgument(6); } if (v8_PredefinedType) { e->setArgument(7,*v8_PredefinedType,IfcProcedureTypeEnum::ToString(*v8_PredefinedType)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
+IfcProcedure::IfcProcedure(IfcAbstractEntity* e) : IfcProcess((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcProcedure)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcProcedure::IfcProcedure(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, boost::optional< std::string > v6_Identification, boost::optional< std::string > v7_LongDescription, boost::optional< IfcProcedureTypeEnum::IfcProcedureTypeEnum > v8_PredefinedType) : IfcProcess((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } if (v6_Identification) { e->setArgument(5,(*v6_Identification)); } else { e->setArgument(5); } if (v7_LongDescription) { e->setArgument(6,(*v7_LongDescription)); } else { e->setArgument(6); } if (v8_PredefinedType) { e->setArgument(7,*v8_PredefinedType,IfcProcedureTypeEnum::ToString(*v8_PredefinedType)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcProcedureType
-IfcProcedureTypeEnum::IfcProcedureTypeEnum IfcProcedureType::PredefinedType() { return IfcProcedureTypeEnum::FromString(*entity->getArgument(9)); }
+IfcProcedureTypeEnum::IfcProcedureTypeEnum IfcProcedureType::PredefinedType() const { return IfcProcedureTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcProcedureType::setPredefinedType(IfcProcedureTypeEnum::IfcProcedureTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcProcedureTypeEnum::ToString(v)); }
 bool IfcProcedureType::is(Type::Enum v) const { return v == Type::IfcProcedureType || IfcTypeProcess::is(v); }
 Type::Enum IfcProcedureType::type() const { return Type::IfcProcedureType; }
 Type::Enum IfcProcedureType::Class() { return Type::IfcProcedureType; }
-IfcProcedureType::IfcProcedureType(IfcAbstractEntityPtr e) : IfcTypeProcess((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcProcedureType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcProcedureType::IfcProcedureType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< IfcIdentifier > v7_Identification, boost::optional< IfcText > v8_LongDescription, boost::optional< IfcLabel > v9_ProcessType, IfcProcedureTypeEnum::IfcProcedureTypeEnum v10_PredefinedType) : IfcTypeProcess((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_Identification) { e->setArgument(6,(*v7_Identification)); } else { e->setArgument(6); } if (v8_LongDescription) { e->setArgument(7,(*v8_LongDescription)); } else { e->setArgument(7); } if (v9_ProcessType) { e->setArgument(8,(*v9_ProcessType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcProcedureTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcProcedureType::IfcProcedureType(IfcAbstractEntity* e) : IfcTypeProcess((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcProcedureType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcProcedureType::IfcProcedureType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< std::string > v7_Identification, boost::optional< std::string > v8_LongDescription, boost::optional< std::string > v9_ProcessType, IfcProcedureTypeEnum::IfcProcedureTypeEnum v10_PredefinedType) : IfcTypeProcess((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_Identification) { e->setArgument(6,(*v7_Identification)); } else { e->setArgument(6); } if (v8_LongDescription) { e->setArgument(7,(*v8_LongDescription)); } else { e->setArgument(7); } if (v9_ProcessType) { e->setArgument(8,(*v9_ProcessType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcProcedureTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcProcess
-bool IfcProcess::hasIdentification() { return !entity->getArgument(5)->isNull(); }
-IfcIdentifier IfcProcess::Identification() { return *entity->getArgument(5); }
-void IfcProcess::setIdentification(IfcIdentifier v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-bool IfcProcess::hasLongDescription() { return !entity->getArgument(6)->isNull(); }
-IfcText IfcProcess::LongDescription() { return *entity->getArgument(6); }
-void IfcProcess::setLongDescription(IfcText v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
-IfcRelSequence::list IfcProcess::IsPredecessorTo() { RETURN_INVERSE(IfcRelSequence) }
-IfcRelSequence::list IfcProcess::IsSuccessorFrom() { RETURN_INVERSE(IfcRelSequence) }
-IfcRelAssignsToProcess::list IfcProcess::OperatesOn() { RETURN_INVERSE(IfcRelAssignsToProcess) }
+bool IfcProcess::hasIdentification() const { return !entity->getArgument(5)->isNull(); }
+std::string IfcProcess::Identification() const { return *entity->getArgument(5); }
+void IfcProcess::setIdentification(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+bool IfcProcess::hasLongDescription() const { return !entity->getArgument(6)->isNull(); }
+std::string IfcProcess::LongDescription() const { return *entity->getArgument(6); }
+void IfcProcess::setLongDescription(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
+IfcRelSequence::list::ptr IfcProcess::IsPredecessorTo() const { return entity->getInverse(Type::IfcRelSequence, 4)->as<IfcRelSequence>(); }
+IfcRelSequence::list::ptr IfcProcess::IsSuccessorFrom() const { return entity->getInverse(Type::IfcRelSequence, 5)->as<IfcRelSequence>(); }
+IfcRelAssignsToProcess::list::ptr IfcProcess::OperatesOn() const { return entity->getInverse(Type::IfcRelAssignsToProcess, 6)->as<IfcRelAssignsToProcess>(); }
 bool IfcProcess::is(Type::Enum v) const { return v == Type::IfcProcess || IfcObject::is(v); }
 Type::Enum IfcProcess::type() const { return Type::IfcProcess; }
 Type::Enum IfcProcess::Class() { return Type::IfcProcess; }
-IfcProcess::IfcProcess(IfcAbstractEntityPtr e) : IfcObject((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcProcess)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcProcess::IfcProcess(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, boost::optional< IfcIdentifier > v6_Identification, boost::optional< IfcText > v7_LongDescription) : IfcObject((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } if (v6_Identification) { e->setArgument(5,(*v6_Identification)); } else { e->setArgument(5); } if (v7_LongDescription) { e->setArgument(6,(*v7_LongDescription)); } else { e->setArgument(6); } entity = e; EntityBuffer::Add(this); }
+IfcProcess::IfcProcess(IfcAbstractEntity* e) : IfcObject((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcProcess)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcProcess::IfcProcess(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, boost::optional< std::string > v6_Identification, boost::optional< std::string > v7_LongDescription) : IfcObject((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } if (v6_Identification) { e->setArgument(5,(*v6_Identification)); } else { e->setArgument(5); } if (v7_LongDescription) { e->setArgument(6,(*v7_LongDescription)); } else { e->setArgument(6); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcProduct
-bool IfcProduct::hasObjectPlacement() { return !entity->getArgument(5)->isNull(); }
-IfcObjectPlacement* IfcProduct::ObjectPlacement() { return (IfcObjectPlacement*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(5))); }
+bool IfcProduct::hasObjectPlacement() const { return !entity->getArgument(5)->isNull(); }
+IfcObjectPlacement* IfcProduct::ObjectPlacement() const { return (IfcObjectPlacement*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(5))); }
 void IfcProduct::setObjectPlacement(IfcObjectPlacement* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-bool IfcProduct::hasRepresentation() { return !entity->getArgument(6)->isNull(); }
-IfcProductRepresentation* IfcProduct::Representation() { return (IfcProductRepresentation*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(6))); }
+bool IfcProduct::hasRepresentation() const { return !entity->getArgument(6)->isNull(); }
+IfcProductRepresentation* IfcProduct::Representation() const { return (IfcProductRepresentation*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(6))); }
 void IfcProduct::setRepresentation(IfcProductRepresentation* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
-IfcRelAssignsToProduct::list IfcProduct::ReferencedBy() { RETURN_INVERSE(IfcRelAssignsToProduct) }
+IfcRelAssignsToProduct::list::ptr IfcProduct::ReferencedBy() const { return entity->getInverse(Type::IfcRelAssignsToProduct, 6)->as<IfcRelAssignsToProduct>(); }
 bool IfcProduct::is(Type::Enum v) const { return v == Type::IfcProduct || IfcObject::is(v); }
 Type::Enum IfcProduct::type() const { return Type::IfcProduct; }
 Type::Enum IfcProduct::Class() { return Type::IfcProduct; }
-IfcProduct::IfcProduct(IfcAbstractEntityPtr e) : IfcObject((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcProduct)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcProduct::IfcProduct(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation) : IfcObject((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); entity = e; EntityBuffer::Add(this); }
+IfcProduct::IfcProduct(IfcAbstractEntity* e) : IfcObject((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcProduct)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcProduct::IfcProduct(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation) : IfcObject((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcProductDefinitionShape
-IfcProduct::list IfcProductDefinitionShape::ShapeOfProduct() { RETURN_INVERSE(IfcProduct) }
-IfcShapeAspect::list IfcProductDefinitionShape::HasShapeAspects() { RETURN_INVERSE(IfcShapeAspect) }
+IfcProduct::list::ptr IfcProductDefinitionShape::ShapeOfProduct() const { return entity->getInverse(Type::IfcProduct, 6)->as<IfcProduct>(); }
+IfcShapeAspect::list::ptr IfcProductDefinitionShape::HasShapeAspects() const { return entity->getInverse(Type::IfcShapeAspect, 4)->as<IfcShapeAspect>(); }
 bool IfcProductDefinitionShape::is(Type::Enum v) const { return v == Type::IfcProductDefinitionShape || IfcProductRepresentation::is(v); }
 Type::Enum IfcProductDefinitionShape::type() const { return Type::IfcProductDefinitionShape; }
 Type::Enum IfcProductDefinitionShape::Class() { return Type::IfcProductDefinitionShape; }
-IfcProductDefinitionShape::IfcProductDefinitionShape(IfcAbstractEntityPtr e) : IfcProductRepresentation((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcProductDefinitionShape)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcProductDefinitionShape::IfcProductDefinitionShape(boost::optional< IfcLabel > v1_Name, boost::optional< IfcText > v2_Description, SHARED_PTR< IfcTemplatedEntityList< IfcRepresentation > > v3_Representations) : IfcProductRepresentation((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_Representations)->generalize()); entity = e; EntityBuffer::Add(this); }
+IfcProductDefinitionShape::IfcProductDefinitionShape(IfcAbstractEntity* e) : IfcProductRepresentation((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcProductDefinitionShape)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcProductDefinitionShape::IfcProductDefinitionShape(boost::optional< std::string > v1_Name, boost::optional< std::string > v2_Description, IfcTemplatedEntityList< IfcRepresentation >::ptr v3_Representations) : IfcProductRepresentation((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_Representations)->generalize()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcProductRepresentation
-bool IfcProductRepresentation::hasName() { return !entity->getArgument(0)->isNull(); }
-IfcLabel IfcProductRepresentation::Name() { return *entity->getArgument(0); }
-void IfcProductRepresentation::setName(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-bool IfcProductRepresentation::hasDescription() { return !entity->getArgument(1)->isNull(); }
-IfcText IfcProductRepresentation::Description() { return *entity->getArgument(1); }
-void IfcProductRepresentation::setDescription(IfcText v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-SHARED_PTR< IfcTemplatedEntityList< IfcRepresentation > > IfcProductRepresentation::Representations() { RETURN_AS_LIST(IfcRepresentation,2) }
-void IfcProductRepresentation::setRepresentations(SHARED_PTR< IfcTemplatedEntityList< IfcRepresentation > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v->generalize()); }
+bool IfcProductRepresentation::hasName() const { return !entity->getArgument(0)->isNull(); }
+std::string IfcProductRepresentation::Name() const { return *entity->getArgument(0); }
+void IfcProductRepresentation::setName(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+bool IfcProductRepresentation::hasDescription() const { return !entity->getArgument(1)->isNull(); }
+std::string IfcProductRepresentation::Description() const { return *entity->getArgument(1); }
+void IfcProductRepresentation::setDescription(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+IfcTemplatedEntityList< IfcRepresentation >::ptr IfcProductRepresentation::Representations() const { IfcEntityList::ptr es = *entity->getArgument(2); return es->as<IfcRepresentation>(); }
+void IfcProductRepresentation::setRepresentations(IfcTemplatedEntityList< IfcRepresentation >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v->generalize()); }
 bool IfcProductRepresentation::is(Type::Enum v) const { return v == Type::IfcProductRepresentation; }
 Type::Enum IfcProductRepresentation::type() const { return Type::IfcProductRepresentation; }
 Type::Enum IfcProductRepresentation::Class() { return Type::IfcProductRepresentation; }
-IfcProductRepresentation::IfcProductRepresentation(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcProductRepresentation)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcProductRepresentation::IfcProductRepresentation(boost::optional< IfcLabel > v1_Name, boost::optional< IfcText > v2_Description, SHARED_PTR< IfcTemplatedEntityList< IfcRepresentation > > v3_Representations) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_Representations)->generalize()); entity = e; EntityBuffer::Add(this); }
+IfcProductRepresentation::IfcProductRepresentation(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcProductRepresentation)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcProductRepresentation::IfcProductRepresentation(boost::optional< std::string > v1_Name, boost::optional< std::string > v2_Description, IfcTemplatedEntityList< IfcRepresentation >::ptr v3_Representations) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_Representations)->generalize()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcProfileDef
-IfcProfileTypeEnum::IfcProfileTypeEnum IfcProfileDef::ProfileType() { return IfcProfileTypeEnum::FromString(*entity->getArgument(0)); }
+IfcProfileTypeEnum::IfcProfileTypeEnum IfcProfileDef::ProfileType() const { return IfcProfileTypeEnum::FromString(*entity->getArgument(0)); }
 void IfcProfileDef::setProfileType(IfcProfileTypeEnum::IfcProfileTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v,IfcProfileTypeEnum::ToString(v)); }
-bool IfcProfileDef::hasProfileName() { return !entity->getArgument(1)->isNull(); }
-IfcLabel IfcProfileDef::ProfileName() { return *entity->getArgument(1); }
-void IfcProfileDef::setProfileName(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-IfcExternalReferenceRelationship::list IfcProfileDef::HasExternalReference() { RETURN_INVERSE(IfcExternalReferenceRelationship) }
-IfcProfileProperties::list IfcProfileDef::HasProperties() { RETURN_INVERSE(IfcProfileProperties) }
+bool IfcProfileDef::hasProfileName() const { return !entity->getArgument(1)->isNull(); }
+std::string IfcProfileDef::ProfileName() const { return *entity->getArgument(1); }
+void IfcProfileDef::setProfileName(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+IfcExternalReferenceRelationship::list::ptr IfcProfileDef::HasExternalReference() const { return entity->getInverse(Type::IfcExternalReferenceRelationship, 3)->as<IfcExternalReferenceRelationship>(); }
+IfcProfileProperties::list::ptr IfcProfileDef::HasProperties() const { return entity->getInverse(Type::IfcProfileProperties, 3)->as<IfcProfileProperties>(); }
 bool IfcProfileDef::is(Type::Enum v) const { return v == Type::IfcProfileDef; }
 Type::Enum IfcProfileDef::type() const { return Type::IfcProfileDef; }
 Type::Enum IfcProfileDef::Class() { return Type::IfcProfileDef; }
-IfcProfileDef::IfcProfileDef(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcProfileDef)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcProfileDef::IfcProfileDef(IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< IfcLabel > v2_ProfileName) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,v1_ProfileType,IfcProfileTypeEnum::ToString(v1_ProfileType)); if (v2_ProfileName) { e->setArgument(1,(*v2_ProfileName)); } else { e->setArgument(1); } entity = e; EntityBuffer::Add(this); }
+IfcProfileDef::IfcProfileDef(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcProfileDef)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcProfileDef::IfcProfileDef(IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< std::string > v2_ProfileName) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,v1_ProfileType,IfcProfileTypeEnum::ToString(v1_ProfileType)); if (v2_ProfileName) { e->setArgument(1,(*v2_ProfileName)); } else { e->setArgument(1); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcProfileProperties
-IfcProfileDef* IfcProfileProperties::ProfileDefinition() { return (IfcProfileDef*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(3))); }
+IfcProfileDef* IfcProfileProperties::ProfileDefinition() const { return (IfcProfileDef*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(3))); }
 void IfcProfileProperties::setProfileDefinition(IfcProfileDef* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
 bool IfcProfileProperties::is(Type::Enum v) const { return v == Type::IfcProfileProperties || IfcExtendedProperties::is(v); }
 Type::Enum IfcProfileProperties::type() const { return Type::IfcProfileProperties; }
 Type::Enum IfcProfileProperties::Class() { return Type::IfcProfileProperties; }
-IfcProfileProperties::IfcProfileProperties(IfcAbstractEntityPtr e) : IfcExtendedProperties((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcProfileProperties)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcProfileProperties::IfcProfileProperties(boost::optional< IfcIdentifier > v1_Name, boost::optional< IfcText > v2_Description, SHARED_PTR< IfcTemplatedEntityList< IfcProperty > > v3_Properties, IfcProfileDef* v4_ProfileDefinition) : IfcExtendedProperties((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_Properties)->generalize()); e->setArgument(3,(v4_ProfileDefinition)); entity = e; EntityBuffer::Add(this); }
+IfcProfileProperties::IfcProfileProperties(IfcAbstractEntity* e) : IfcExtendedProperties((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcProfileProperties)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcProfileProperties::IfcProfileProperties(boost::optional< std::string > v1_Name, boost::optional< std::string > v2_Description, IfcTemplatedEntityList< IfcProperty >::ptr v3_Properties, IfcProfileDef* v4_ProfileDefinition) : IfcExtendedProperties((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_Properties)->generalize()); e->setArgument(3,(v4_ProfileDefinition)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcProject
 bool IfcProject::is(Type::Enum v) const { return v == Type::IfcProject || IfcContext::is(v); }
 Type::Enum IfcProject::type() const { return Type::IfcProject; }
 Type::Enum IfcProject::Class() { return Type::IfcProject; }
-IfcProject::IfcProject(IfcAbstractEntityPtr e) : IfcContext((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcProject)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcProject::IfcProject(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, boost::optional< IfcLabel > v6_LongName, boost::optional< IfcLabel > v7_Phase, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationContext > > > v8_RepresentationContexts, IfcUnitAssignment* v9_UnitsInContext) : IfcContext((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } if (v6_LongName) { e->setArgument(5,(*v6_LongName)); } else { e->setArgument(5); } if (v7_Phase) { e->setArgument(6,(*v7_Phase)); } else { e->setArgument(6); } if (v8_RepresentationContexts) { e->setArgument(7,(*v8_RepresentationContexts)->generalize()); } else { e->setArgument(7); } e->setArgument(8,(v9_UnitsInContext)); entity = e; EntityBuffer::Add(this); }
+IfcProject::IfcProject(IfcAbstractEntity* e) : IfcContext((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcProject)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcProject::IfcProject(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, boost::optional< std::string > v6_LongName, boost::optional< std::string > v7_Phase, boost::optional< IfcTemplatedEntityList< IfcRepresentationContext >::ptr > v8_RepresentationContexts, IfcUnitAssignment* v9_UnitsInContext) : IfcContext((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } if (v6_LongName) { e->setArgument(5,(*v6_LongName)); } else { e->setArgument(5); } if (v7_Phase) { e->setArgument(6,(*v7_Phase)); } else { e->setArgument(6); } if (v8_RepresentationContexts) { e->setArgument(7,(*v8_RepresentationContexts)->generalize()); } else { e->setArgument(7); } e->setArgument(8,(v9_UnitsInContext)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcProjectLibrary
 bool IfcProjectLibrary::is(Type::Enum v) const { return v == Type::IfcProjectLibrary || IfcContext::is(v); }
 Type::Enum IfcProjectLibrary::type() const { return Type::IfcProjectLibrary; }
 Type::Enum IfcProjectLibrary::Class() { return Type::IfcProjectLibrary; }
-IfcProjectLibrary::IfcProjectLibrary(IfcAbstractEntityPtr e) : IfcContext((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcProjectLibrary)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcProjectLibrary::IfcProjectLibrary(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, boost::optional< IfcLabel > v6_LongName, boost::optional< IfcLabel > v7_Phase, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationContext > > > v8_RepresentationContexts, IfcUnitAssignment* v9_UnitsInContext) : IfcContext((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } if (v6_LongName) { e->setArgument(5,(*v6_LongName)); } else { e->setArgument(5); } if (v7_Phase) { e->setArgument(6,(*v7_Phase)); } else { e->setArgument(6); } if (v8_RepresentationContexts) { e->setArgument(7,(*v8_RepresentationContexts)->generalize()); } else { e->setArgument(7); } e->setArgument(8,(v9_UnitsInContext)); entity = e; EntityBuffer::Add(this); }
+IfcProjectLibrary::IfcProjectLibrary(IfcAbstractEntity* e) : IfcContext((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcProjectLibrary)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcProjectLibrary::IfcProjectLibrary(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, boost::optional< std::string > v6_LongName, boost::optional< std::string > v7_Phase, boost::optional< IfcTemplatedEntityList< IfcRepresentationContext >::ptr > v8_RepresentationContexts, IfcUnitAssignment* v9_UnitsInContext) : IfcContext((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } if (v6_LongName) { e->setArgument(5,(*v6_LongName)); } else { e->setArgument(5); } if (v7_Phase) { e->setArgument(6,(*v7_Phase)); } else { e->setArgument(6); } if (v8_RepresentationContexts) { e->setArgument(7,(*v8_RepresentationContexts)->generalize()); } else { e->setArgument(7); } e->setArgument(8,(v9_UnitsInContext)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcProjectOrder
-bool IfcProjectOrder::hasPredefinedType() { return !entity->getArgument(6)->isNull(); }
-IfcProjectOrderTypeEnum::IfcProjectOrderTypeEnum IfcProjectOrder::PredefinedType() { return IfcProjectOrderTypeEnum::FromString(*entity->getArgument(6)); }
+bool IfcProjectOrder::hasPredefinedType() const { return !entity->getArgument(6)->isNull(); }
+IfcProjectOrderTypeEnum::IfcProjectOrderTypeEnum IfcProjectOrder::PredefinedType() const { return IfcProjectOrderTypeEnum::FromString(*entity->getArgument(6)); }
 void IfcProjectOrder::setPredefinedType(IfcProjectOrderTypeEnum::IfcProjectOrderTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v,IfcProjectOrderTypeEnum::ToString(v)); }
-bool IfcProjectOrder::hasStatus() { return !entity->getArgument(7)->isNull(); }
-IfcLabel IfcProjectOrder::Status() { return *entity->getArgument(7); }
-void IfcProjectOrder::setStatus(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
-bool IfcProjectOrder::hasLongDescription() { return !entity->getArgument(8)->isNull(); }
-IfcText IfcProjectOrder::LongDescription() { return *entity->getArgument(8); }
-void IfcProjectOrder::setLongDescription(IfcText v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
+bool IfcProjectOrder::hasStatus() const { return !entity->getArgument(7)->isNull(); }
+std::string IfcProjectOrder::Status() const { return *entity->getArgument(7); }
+void IfcProjectOrder::setStatus(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
+bool IfcProjectOrder::hasLongDescription() const { return !entity->getArgument(8)->isNull(); }
+std::string IfcProjectOrder::LongDescription() const { return *entity->getArgument(8); }
+void IfcProjectOrder::setLongDescription(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
 bool IfcProjectOrder::is(Type::Enum v) const { return v == Type::IfcProjectOrder || IfcControl::is(v); }
 Type::Enum IfcProjectOrder::type() const { return Type::IfcProjectOrder; }
 Type::Enum IfcProjectOrder::Class() { return Type::IfcProjectOrder; }
-IfcProjectOrder::IfcProjectOrder(IfcAbstractEntityPtr e) : IfcControl((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcProjectOrder)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcProjectOrder::IfcProjectOrder(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, boost::optional< IfcIdentifier > v6_Identification, boost::optional< IfcProjectOrderTypeEnum::IfcProjectOrderTypeEnum > v7_PredefinedType, boost::optional< IfcLabel > v8_Status, boost::optional< IfcText > v9_LongDescription) : IfcControl((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } if (v6_Identification) { e->setArgument(5,(*v6_Identification)); } else { e->setArgument(5); } if (v7_PredefinedType) { e->setArgument(6,*v7_PredefinedType,IfcProjectOrderTypeEnum::ToString(*v7_PredefinedType)); } else { e->setArgument(6); } if (v8_Status) { e->setArgument(7,(*v8_Status)); } else { e->setArgument(7); } if (v9_LongDescription) { e->setArgument(8,(*v9_LongDescription)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcProjectOrder::IfcProjectOrder(IfcAbstractEntity* e) : IfcControl((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcProjectOrder)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcProjectOrder::IfcProjectOrder(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, boost::optional< std::string > v6_Identification, boost::optional< IfcProjectOrderTypeEnum::IfcProjectOrderTypeEnum > v7_PredefinedType, boost::optional< std::string > v8_Status, boost::optional< std::string > v9_LongDescription) : IfcControl((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } if (v6_Identification) { e->setArgument(5,(*v6_Identification)); } else { e->setArgument(5); } if (v7_PredefinedType) { e->setArgument(6,*v7_PredefinedType,IfcProjectOrderTypeEnum::ToString(*v7_PredefinedType)); } else { e->setArgument(6); } if (v8_Status) { e->setArgument(7,(*v8_Status)); } else { e->setArgument(7); } if (v9_LongDescription) { e->setArgument(8,(*v9_LongDescription)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcProjectedCRS
-bool IfcProjectedCRS::hasMapProjection() { return !entity->getArgument(4)->isNull(); }
-IfcIdentifier IfcProjectedCRS::MapProjection() { return *entity->getArgument(4); }
-void IfcProjectedCRS::setMapProjection(IfcIdentifier v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-bool IfcProjectedCRS::hasMapZone() { return !entity->getArgument(5)->isNull(); }
-IfcIdentifier IfcProjectedCRS::MapZone() { return *entity->getArgument(5); }
-void IfcProjectedCRS::setMapZone(IfcIdentifier v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-bool IfcProjectedCRS::hasMapUnit() { return !entity->getArgument(6)->isNull(); }
-IfcNamedUnit* IfcProjectedCRS::MapUnit() { return (IfcNamedUnit*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(6))); }
+bool IfcProjectedCRS::hasMapProjection() const { return !entity->getArgument(4)->isNull(); }
+std::string IfcProjectedCRS::MapProjection() const { return *entity->getArgument(4); }
+void IfcProjectedCRS::setMapProjection(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+bool IfcProjectedCRS::hasMapZone() const { return !entity->getArgument(5)->isNull(); }
+std::string IfcProjectedCRS::MapZone() const { return *entity->getArgument(5); }
+void IfcProjectedCRS::setMapZone(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+bool IfcProjectedCRS::hasMapUnit() const { return !entity->getArgument(6)->isNull(); }
+IfcNamedUnit* IfcProjectedCRS::MapUnit() const { return (IfcNamedUnit*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(6))); }
 void IfcProjectedCRS::setMapUnit(IfcNamedUnit* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
 bool IfcProjectedCRS::is(Type::Enum v) const { return v == Type::IfcProjectedCRS || IfcCoordinateReferenceSystem::is(v); }
 Type::Enum IfcProjectedCRS::type() const { return Type::IfcProjectedCRS; }
 Type::Enum IfcProjectedCRS::Class() { return Type::IfcProjectedCRS; }
-IfcProjectedCRS::IfcProjectedCRS(IfcAbstractEntityPtr e) : IfcCoordinateReferenceSystem((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcProjectedCRS)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcProjectedCRS::IfcProjectedCRS(boost::optional< IfcLabel > v1_Name, boost::optional< IfcText > v2_Description, IfcIdentifier v3_GeodeticDatum, boost::optional< IfcIdentifier > v4_VerticalDatum, boost::optional< IfcIdentifier > v5_MapProjection, boost::optional< IfcIdentifier > v6_MapZone, IfcNamedUnit* v7_MapUnit) : IfcCoordinateReferenceSystem((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_GeodeticDatum)); if (v4_VerticalDatum) { e->setArgument(3,(*v4_VerticalDatum)); } else { e->setArgument(3); } if (v5_MapProjection) { e->setArgument(4,(*v5_MapProjection)); } else { e->setArgument(4); } if (v6_MapZone) { e->setArgument(5,(*v6_MapZone)); } else { e->setArgument(5); } e->setArgument(6,(v7_MapUnit)); entity = e; EntityBuffer::Add(this); }
+IfcProjectedCRS::IfcProjectedCRS(IfcAbstractEntity* e) : IfcCoordinateReferenceSystem((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcProjectedCRS)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcProjectedCRS::IfcProjectedCRS(boost::optional< std::string > v1_Name, boost::optional< std::string > v2_Description, std::string v3_GeodeticDatum, boost::optional< std::string > v4_VerticalDatum, boost::optional< std::string > v5_MapProjection, boost::optional< std::string > v6_MapZone, IfcNamedUnit* v7_MapUnit) : IfcCoordinateReferenceSystem((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_GeodeticDatum)); if (v4_VerticalDatum) { e->setArgument(3,(*v4_VerticalDatum)); } else { e->setArgument(3); } if (v5_MapProjection) { e->setArgument(4,(*v5_MapProjection)); } else { e->setArgument(4); } if (v6_MapZone) { e->setArgument(5,(*v6_MapZone)); } else { e->setArgument(5); } e->setArgument(6,(v7_MapUnit)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcProjectionElement
-bool IfcProjectionElement::hasPredefinedType() { return !entity->getArgument(8)->isNull(); }
-IfcProjectionElementTypeEnum::IfcProjectionElementTypeEnum IfcProjectionElement::PredefinedType() { return IfcProjectionElementTypeEnum::FromString(*entity->getArgument(8)); }
+bool IfcProjectionElement::hasPredefinedType() const { return !entity->getArgument(8)->isNull(); }
+IfcProjectionElementTypeEnum::IfcProjectionElementTypeEnum IfcProjectionElement::PredefinedType() const { return IfcProjectionElementTypeEnum::FromString(*entity->getArgument(8)); }
 void IfcProjectionElement::setPredefinedType(IfcProjectionElementTypeEnum::IfcProjectionElementTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcProjectionElementTypeEnum::ToString(v)); }
 bool IfcProjectionElement::is(Type::Enum v) const { return v == Type::IfcProjectionElement || IfcFeatureElementAddition::is(v); }
 Type::Enum IfcProjectionElement::type() const { return Type::IfcProjectionElement; }
 Type::Enum IfcProjectionElement::Class() { return Type::IfcProjectionElement; }
-IfcProjectionElement::IfcProjectionElement(IfcAbstractEntityPtr e) : IfcFeatureElementAddition((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcProjectionElement)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcProjectionElement::IfcProjectionElement(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcProjectionElementTypeEnum::IfcProjectionElementTypeEnum > v9_PredefinedType) : IfcFeatureElementAddition((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcProjectionElementTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcProjectionElement::IfcProjectionElement(IfcAbstractEntity* e) : IfcFeatureElementAddition((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcProjectionElement)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcProjectionElement::IfcProjectionElement(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcProjectionElementTypeEnum::IfcProjectionElementTypeEnum > v9_PredefinedType) : IfcFeatureElementAddition((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcProjectionElementTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcProperty
-IfcIdentifier IfcProperty::Name() { return *entity->getArgument(0); }
-void IfcProperty::setName(IfcIdentifier v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-bool IfcProperty::hasDescription() { return !entity->getArgument(1)->isNull(); }
-IfcText IfcProperty::Description() { return *entity->getArgument(1); }
-void IfcProperty::setDescription(IfcText v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-IfcPropertySet::list IfcProperty::PartOfPset() { RETURN_INVERSE(IfcPropertySet) }
-IfcPropertyDependencyRelationship::list IfcProperty::PropertyForDependance() { RETURN_INVERSE(IfcPropertyDependencyRelationship) }
-IfcPropertyDependencyRelationship::list IfcProperty::PropertyDependsOn() { RETURN_INVERSE(IfcPropertyDependencyRelationship) }
-IfcComplexProperty::list IfcProperty::PartOfComplex() { RETURN_INVERSE(IfcComplexProperty) }
+std::string IfcProperty::Name() const { return *entity->getArgument(0); }
+void IfcProperty::setName(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+bool IfcProperty::hasDescription() const { return !entity->getArgument(1)->isNull(); }
+std::string IfcProperty::Description() const { return *entity->getArgument(1); }
+void IfcProperty::setDescription(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+IfcPropertySet::list::ptr IfcProperty::PartOfPset() const { return entity->getInverse(Type::IfcPropertySet, 4)->as<IfcPropertySet>(); }
+IfcPropertyDependencyRelationship::list::ptr IfcProperty::PropertyForDependance() const { return entity->getInverse(Type::IfcPropertyDependencyRelationship, 2)->as<IfcPropertyDependencyRelationship>(); }
+IfcPropertyDependencyRelationship::list::ptr IfcProperty::PropertyDependsOn() const { return entity->getInverse(Type::IfcPropertyDependencyRelationship, 3)->as<IfcPropertyDependencyRelationship>(); }
+IfcComplexProperty::list::ptr IfcProperty::PartOfComplex() const { return entity->getInverse(Type::IfcComplexProperty, 3)->as<IfcComplexProperty>(); }
 bool IfcProperty::is(Type::Enum v) const { return v == Type::IfcProperty || IfcPropertyAbstraction::is(v); }
 Type::Enum IfcProperty::type() const { return Type::IfcProperty; }
 Type::Enum IfcProperty::Class() { return Type::IfcProperty; }
-IfcProperty::IfcProperty(IfcAbstractEntityPtr e) : IfcPropertyAbstraction((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcProperty)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcProperty::IfcProperty(IfcIdentifier v1_Name, boost::optional< IfcText > v2_Description) : IfcPropertyAbstraction((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } entity = e; EntityBuffer::Add(this); }
+IfcProperty::IfcProperty(IfcAbstractEntity* e) : IfcPropertyAbstraction((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcProperty)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcProperty::IfcProperty(std::string v1_Name, boost::optional< std::string > v2_Description) : IfcPropertyAbstraction((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcPropertyAbstraction
-IfcExternalReferenceRelationship::list IfcPropertyAbstraction::HasExternalReferences() { RETURN_INVERSE(IfcExternalReferenceRelationship) }
+IfcExternalReferenceRelationship::list::ptr IfcPropertyAbstraction::HasExternalReferences() const { return entity->getInverse(Type::IfcExternalReferenceRelationship, 3)->as<IfcExternalReferenceRelationship>(); }
 bool IfcPropertyAbstraction::is(Type::Enum v) const { return v == Type::IfcPropertyAbstraction; }
 Type::Enum IfcPropertyAbstraction::type() const { return Type::IfcPropertyAbstraction; }
 Type::Enum IfcPropertyAbstraction::Class() { return Type::IfcPropertyAbstraction; }
-IfcPropertyAbstraction::IfcPropertyAbstraction(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcPropertyAbstraction)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcPropertyAbstraction::IfcPropertyAbstraction(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcPropertyAbstraction)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
 IfcPropertyAbstraction::IfcPropertyAbstraction() : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcPropertyBoundedValue
-bool IfcPropertyBoundedValue::hasUpperBoundValue() { return !entity->getArgument(2)->isNull(); }
-IfcValue IfcPropertyBoundedValue::UpperBoundValue() { return *entity->getArgument(2); }
-void IfcPropertyBoundedValue::setUpperBoundValue(IfcValue v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-bool IfcPropertyBoundedValue::hasLowerBoundValue() { return !entity->getArgument(3)->isNull(); }
-IfcValue IfcPropertyBoundedValue::LowerBoundValue() { return *entity->getArgument(3); }
-void IfcPropertyBoundedValue::setLowerBoundValue(IfcValue v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-bool IfcPropertyBoundedValue::hasUnit() { return !entity->getArgument(4)->isNull(); }
-IfcUnit IfcPropertyBoundedValue::Unit() { return *entity->getArgument(4); }
-void IfcPropertyBoundedValue::setUnit(IfcUnit v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-bool IfcPropertyBoundedValue::hasSetPointValue() { return !entity->getArgument(5)->isNull(); }
-IfcValue IfcPropertyBoundedValue::SetPointValue() { return *entity->getArgument(5); }
-void IfcPropertyBoundedValue::setSetPointValue(IfcValue v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+bool IfcPropertyBoundedValue::hasUpperBoundValue() const { return !entity->getArgument(2)->isNull(); }
+IfcValue* IfcPropertyBoundedValue::UpperBoundValue() const { return (IfcValue*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(2))); }
+void IfcPropertyBoundedValue::setUpperBoundValue(IfcValue* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+bool IfcPropertyBoundedValue::hasLowerBoundValue() const { return !entity->getArgument(3)->isNull(); }
+IfcValue* IfcPropertyBoundedValue::LowerBoundValue() const { return (IfcValue*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(3))); }
+void IfcPropertyBoundedValue::setLowerBoundValue(IfcValue* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+bool IfcPropertyBoundedValue::hasUnit() const { return !entity->getArgument(4)->isNull(); }
+IfcUnit* IfcPropertyBoundedValue::Unit() const { return (IfcUnit*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(4))); }
+void IfcPropertyBoundedValue::setUnit(IfcUnit* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+bool IfcPropertyBoundedValue::hasSetPointValue() const { return !entity->getArgument(5)->isNull(); }
+IfcValue* IfcPropertyBoundedValue::SetPointValue() const { return (IfcValue*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(5))); }
+void IfcPropertyBoundedValue::setSetPointValue(IfcValue* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
 bool IfcPropertyBoundedValue::is(Type::Enum v) const { return v == Type::IfcPropertyBoundedValue || IfcSimpleProperty::is(v); }
 Type::Enum IfcPropertyBoundedValue::type() const { return Type::IfcPropertyBoundedValue; }
 Type::Enum IfcPropertyBoundedValue::Class() { return Type::IfcPropertyBoundedValue; }
-IfcPropertyBoundedValue::IfcPropertyBoundedValue(IfcAbstractEntityPtr e) : IfcSimpleProperty((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcPropertyBoundedValue)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcPropertyBoundedValue::IfcPropertyBoundedValue(IfcIdentifier v1_Name, boost::optional< IfcText > v2_Description, boost::optional< IfcValue > v3_UpperBoundValue, boost::optional< IfcValue > v4_LowerBoundValue, boost::optional< IfcUnit > v5_Unit, boost::optional< IfcValue > v6_SetPointValue) : IfcSimpleProperty((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } if (v3_UpperBoundValue) { e->setArgument(2,(*v3_UpperBoundValue)); } else { e->setArgument(2); } if (v4_LowerBoundValue) { e->setArgument(3,(*v4_LowerBoundValue)); } else { e->setArgument(3); } if (v5_Unit) { e->setArgument(4,(*v5_Unit)); } else { e->setArgument(4); } if (v6_SetPointValue) { e->setArgument(5,(*v6_SetPointValue)); } else { e->setArgument(5); } entity = e; EntityBuffer::Add(this); }
+IfcPropertyBoundedValue::IfcPropertyBoundedValue(IfcAbstractEntity* e) : IfcSimpleProperty((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcPropertyBoundedValue)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcPropertyBoundedValue::IfcPropertyBoundedValue(std::string v1_Name, boost::optional< std::string > v2_Description, IfcValue* v3_UpperBoundValue, IfcValue* v4_LowerBoundValue, IfcUnit* v5_Unit, IfcValue* v6_SetPointValue) : IfcSimpleProperty((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_UpperBoundValue)); e->setArgument(3,(v4_LowerBoundValue)); e->setArgument(4,(v5_Unit)); e->setArgument(5,(v6_SetPointValue)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcPropertyDefinition
-IfcRelDeclares::list IfcPropertyDefinition::HasContext() { RETURN_INVERSE(IfcRelDeclares) }
-IfcRelAssociates::list IfcPropertyDefinition::HasAssociations() { RETURN_INVERSE(IfcRelAssociates) }
+IfcRelDeclares::list::ptr IfcPropertyDefinition::HasContext() const { return entity->getInverse(Type::IfcRelDeclares, 5)->as<IfcRelDeclares>(); }
+IfcRelAssociates::list::ptr IfcPropertyDefinition::HasAssociations() const { return entity->getInverse(Type::IfcRelAssociates, 4)->as<IfcRelAssociates>(); }
 bool IfcPropertyDefinition::is(Type::Enum v) const { return v == Type::IfcPropertyDefinition || IfcRoot::is(v); }
 Type::Enum IfcPropertyDefinition::type() const { return Type::IfcPropertyDefinition; }
 Type::Enum IfcPropertyDefinition::Class() { return Type::IfcPropertyDefinition; }
-IfcPropertyDefinition::IfcPropertyDefinition(IfcAbstractEntityPtr e) : IfcRoot((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcPropertyDefinition)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcPropertyDefinition::IfcPropertyDefinition(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description) : IfcRoot((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } entity = e; EntityBuffer::Add(this); }
+IfcPropertyDefinition::IfcPropertyDefinition(IfcAbstractEntity* e) : IfcRoot((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcPropertyDefinition)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcPropertyDefinition::IfcPropertyDefinition(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description) : IfcRoot((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcPropertyDependencyRelationship
-IfcProperty* IfcPropertyDependencyRelationship::DependingProperty() { return (IfcProperty*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(2))); }
+IfcProperty* IfcPropertyDependencyRelationship::DependingProperty() const { return (IfcProperty*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(2))); }
 void IfcPropertyDependencyRelationship::setDependingProperty(IfcProperty* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-IfcProperty* IfcPropertyDependencyRelationship::DependantProperty() { return (IfcProperty*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(3))); }
+IfcProperty* IfcPropertyDependencyRelationship::DependantProperty() const { return (IfcProperty*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(3))); }
 void IfcPropertyDependencyRelationship::setDependantProperty(IfcProperty* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-bool IfcPropertyDependencyRelationship::hasExpression() { return !entity->getArgument(4)->isNull(); }
-IfcText IfcPropertyDependencyRelationship::Expression() { return *entity->getArgument(4); }
-void IfcPropertyDependencyRelationship::setExpression(IfcText v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+bool IfcPropertyDependencyRelationship::hasExpression() const { return !entity->getArgument(4)->isNull(); }
+std::string IfcPropertyDependencyRelationship::Expression() const { return *entity->getArgument(4); }
+void IfcPropertyDependencyRelationship::setExpression(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
 bool IfcPropertyDependencyRelationship::is(Type::Enum v) const { return v == Type::IfcPropertyDependencyRelationship || IfcResourceLevelRelationship::is(v); }
 Type::Enum IfcPropertyDependencyRelationship::type() const { return Type::IfcPropertyDependencyRelationship; }
 Type::Enum IfcPropertyDependencyRelationship::Class() { return Type::IfcPropertyDependencyRelationship; }
-IfcPropertyDependencyRelationship::IfcPropertyDependencyRelationship(IfcAbstractEntityPtr e) : IfcResourceLevelRelationship((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcPropertyDependencyRelationship)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcPropertyDependencyRelationship::IfcPropertyDependencyRelationship(boost::optional< IfcLabel > v1_Name, boost::optional< IfcText > v2_Description, IfcProperty* v3_DependingProperty, IfcProperty* v4_DependantProperty, boost::optional< IfcText > v5_Expression) : IfcResourceLevelRelationship((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_DependingProperty)); e->setArgument(3,(v4_DependantProperty)); if (v5_Expression) { e->setArgument(4,(*v5_Expression)); } else { e->setArgument(4); } entity = e; EntityBuffer::Add(this); }
+IfcPropertyDependencyRelationship::IfcPropertyDependencyRelationship(IfcAbstractEntity* e) : IfcResourceLevelRelationship((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcPropertyDependencyRelationship)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcPropertyDependencyRelationship::IfcPropertyDependencyRelationship(boost::optional< std::string > v1_Name, boost::optional< std::string > v2_Description, IfcProperty* v3_DependingProperty, IfcProperty* v4_DependantProperty, boost::optional< std::string > v5_Expression) : IfcResourceLevelRelationship((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_DependingProperty)); e->setArgument(3,(v4_DependantProperty)); if (v5_Expression) { e->setArgument(4,(*v5_Expression)); } else { e->setArgument(4); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcPropertyEnumeratedValue
-bool IfcPropertyEnumeratedValue::hasEnumerationValues() { return !entity->getArgument(2)->isNull(); }
-SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > IfcPropertyEnumeratedValue::EnumerationValues() { RETURN_AS_LIST(IfcUtil::IfcAbstractSelect,2) }
-void IfcPropertyEnumeratedValue::setEnumerationValues(SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v->generalize()); }
-bool IfcPropertyEnumeratedValue::hasEnumerationReference() { return !entity->getArgument(3)->isNull(); }
-IfcPropertyEnumeration* IfcPropertyEnumeratedValue::EnumerationReference() { return (IfcPropertyEnumeration*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(3))); }
+bool IfcPropertyEnumeratedValue::hasEnumerationValues() const { return !entity->getArgument(2)->isNull(); }
+IfcEntityList::ptr IfcPropertyEnumeratedValue::EnumerationValues() const { return *entity->getArgument(2); }
+void IfcPropertyEnumeratedValue::setEnumerationValues(IfcEntityList::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+bool IfcPropertyEnumeratedValue::hasEnumerationReference() const { return !entity->getArgument(3)->isNull(); }
+IfcPropertyEnumeration* IfcPropertyEnumeratedValue::EnumerationReference() const { return (IfcPropertyEnumeration*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(3))); }
 void IfcPropertyEnumeratedValue::setEnumerationReference(IfcPropertyEnumeration* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
 bool IfcPropertyEnumeratedValue::is(Type::Enum v) const { return v == Type::IfcPropertyEnumeratedValue || IfcSimpleProperty::is(v); }
 Type::Enum IfcPropertyEnumeratedValue::type() const { return Type::IfcPropertyEnumeratedValue; }
 Type::Enum IfcPropertyEnumeratedValue::Class() { return Type::IfcPropertyEnumeratedValue; }
-IfcPropertyEnumeratedValue::IfcPropertyEnumeratedValue(IfcAbstractEntityPtr e) : IfcSimpleProperty((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcPropertyEnumeratedValue)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcPropertyEnumeratedValue::IfcPropertyEnumeratedValue(IfcIdentifier v1_Name, boost::optional< IfcText > v2_Description, boost::optional< IfcEntities > v3_EnumerationValues, IfcPropertyEnumeration* v4_EnumerationReference) : IfcSimpleProperty((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } if (v3_EnumerationValues) { e->setArgument(2,(*v3_EnumerationValues)); } else { e->setArgument(2); } e->setArgument(3,(v4_EnumerationReference)); entity = e; EntityBuffer::Add(this); }
+IfcPropertyEnumeratedValue::IfcPropertyEnumeratedValue(IfcAbstractEntity* e) : IfcSimpleProperty((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcPropertyEnumeratedValue)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcPropertyEnumeratedValue::IfcPropertyEnumeratedValue(std::string v1_Name, boost::optional< std::string > v2_Description, boost::optional< IfcEntityList::ptr > v3_EnumerationValues, IfcPropertyEnumeration* v4_EnumerationReference) : IfcSimpleProperty((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } if (v3_EnumerationValues) { e->setArgument(2,(*v3_EnumerationValues)); } else { e->setArgument(2); } e->setArgument(3,(v4_EnumerationReference)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcPropertyEnumeration
-IfcLabel IfcPropertyEnumeration::Name() { return *entity->getArgument(0); }
-void IfcPropertyEnumeration::setName(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > IfcPropertyEnumeration::EnumerationValues() { RETURN_AS_LIST(IfcUtil::IfcAbstractSelect,1) }
-void IfcPropertyEnumeration::setEnumerationValues(SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v->generalize()); }
-bool IfcPropertyEnumeration::hasUnit() { return !entity->getArgument(2)->isNull(); }
-IfcUnit IfcPropertyEnumeration::Unit() { return *entity->getArgument(2); }
-void IfcPropertyEnumeration::setUnit(IfcUnit v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+std::string IfcPropertyEnumeration::Name() const { return *entity->getArgument(0); }
+void IfcPropertyEnumeration::setName(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+IfcEntityList::ptr IfcPropertyEnumeration::EnumerationValues() const { return *entity->getArgument(1); }
+void IfcPropertyEnumeration::setEnumerationValues(IfcEntityList::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+bool IfcPropertyEnumeration::hasUnit() const { return !entity->getArgument(2)->isNull(); }
+IfcUnit* IfcPropertyEnumeration::Unit() const { return (IfcUnit*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(2))); }
+void IfcPropertyEnumeration::setUnit(IfcUnit* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
 bool IfcPropertyEnumeration::is(Type::Enum v) const { return v == Type::IfcPropertyEnumeration || IfcPropertyAbstraction::is(v); }
 Type::Enum IfcPropertyEnumeration::type() const { return Type::IfcPropertyEnumeration; }
 Type::Enum IfcPropertyEnumeration::Class() { return Type::IfcPropertyEnumeration; }
-IfcPropertyEnumeration::IfcPropertyEnumeration(IfcAbstractEntityPtr e) : IfcPropertyAbstraction((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcPropertyEnumeration)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcPropertyEnumeration::IfcPropertyEnumeration(IfcLabel v1_Name, IfcEntities v2_EnumerationValues, boost::optional< IfcUnit > v3_Unit) : IfcPropertyAbstraction((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); e->setArgument(1,(v2_EnumerationValues)); if (v3_Unit) { e->setArgument(2,(*v3_Unit)); } else { e->setArgument(2); } entity = e; EntityBuffer::Add(this); }
+IfcPropertyEnumeration::IfcPropertyEnumeration(IfcAbstractEntity* e) : IfcPropertyAbstraction((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcPropertyEnumeration)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcPropertyEnumeration::IfcPropertyEnumeration(std::string v1_Name, IfcEntityList::ptr v2_EnumerationValues, IfcUnit* v3_Unit) : IfcPropertyAbstraction((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); e->setArgument(1,(v2_EnumerationValues)); e->setArgument(2,(v3_Unit)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcPropertyListValue
-bool IfcPropertyListValue::hasListValues() { return !entity->getArgument(2)->isNull(); }
-SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > IfcPropertyListValue::ListValues() { RETURN_AS_LIST(IfcUtil::IfcAbstractSelect,2) }
-void IfcPropertyListValue::setListValues(SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v->generalize()); }
-bool IfcPropertyListValue::hasUnit() { return !entity->getArgument(3)->isNull(); }
-IfcUnit IfcPropertyListValue::Unit() { return *entity->getArgument(3); }
-void IfcPropertyListValue::setUnit(IfcUnit v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+bool IfcPropertyListValue::hasListValues() const { return !entity->getArgument(2)->isNull(); }
+IfcEntityList::ptr IfcPropertyListValue::ListValues() const { return *entity->getArgument(2); }
+void IfcPropertyListValue::setListValues(IfcEntityList::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+bool IfcPropertyListValue::hasUnit() const { return !entity->getArgument(3)->isNull(); }
+IfcUnit* IfcPropertyListValue::Unit() const { return (IfcUnit*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(3))); }
+void IfcPropertyListValue::setUnit(IfcUnit* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
 bool IfcPropertyListValue::is(Type::Enum v) const { return v == Type::IfcPropertyListValue || IfcSimpleProperty::is(v); }
 Type::Enum IfcPropertyListValue::type() const { return Type::IfcPropertyListValue; }
 Type::Enum IfcPropertyListValue::Class() { return Type::IfcPropertyListValue; }
-IfcPropertyListValue::IfcPropertyListValue(IfcAbstractEntityPtr e) : IfcSimpleProperty((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcPropertyListValue)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcPropertyListValue::IfcPropertyListValue(IfcIdentifier v1_Name, boost::optional< IfcText > v2_Description, boost::optional< IfcEntities > v3_ListValues, boost::optional< IfcUnit > v4_Unit) : IfcSimpleProperty((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } if (v3_ListValues) { e->setArgument(2,(*v3_ListValues)); } else { e->setArgument(2); } if (v4_Unit) { e->setArgument(3,(*v4_Unit)); } else { e->setArgument(3); } entity = e; EntityBuffer::Add(this); }
+IfcPropertyListValue::IfcPropertyListValue(IfcAbstractEntity* e) : IfcSimpleProperty((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcPropertyListValue)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcPropertyListValue::IfcPropertyListValue(std::string v1_Name, boost::optional< std::string > v2_Description, boost::optional< IfcEntityList::ptr > v3_ListValues, IfcUnit* v4_Unit) : IfcSimpleProperty((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } if (v3_ListValues) { e->setArgument(2,(*v3_ListValues)); } else { e->setArgument(2); } e->setArgument(3,(v4_Unit)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcPropertyReferenceValue
-bool IfcPropertyReferenceValue::hasUsageName() { return !entity->getArgument(2)->isNull(); }
-IfcText IfcPropertyReferenceValue::UsageName() { return *entity->getArgument(2); }
-void IfcPropertyReferenceValue::setUsageName(IfcText v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-bool IfcPropertyReferenceValue::hasPropertyReference() { return !entity->getArgument(3)->isNull(); }
-IfcObjectReferenceSelect IfcPropertyReferenceValue::PropertyReference() { return *entity->getArgument(3); }
-void IfcPropertyReferenceValue::setPropertyReference(IfcObjectReferenceSelect v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+bool IfcPropertyReferenceValue::hasUsageName() const { return !entity->getArgument(2)->isNull(); }
+std::string IfcPropertyReferenceValue::UsageName() const { return *entity->getArgument(2); }
+void IfcPropertyReferenceValue::setUsageName(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+bool IfcPropertyReferenceValue::hasPropertyReference() const { return !entity->getArgument(3)->isNull(); }
+IfcObjectReferenceSelect* IfcPropertyReferenceValue::PropertyReference() const { return (IfcObjectReferenceSelect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(3))); }
+void IfcPropertyReferenceValue::setPropertyReference(IfcObjectReferenceSelect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
 bool IfcPropertyReferenceValue::is(Type::Enum v) const { return v == Type::IfcPropertyReferenceValue || IfcSimpleProperty::is(v); }
 Type::Enum IfcPropertyReferenceValue::type() const { return Type::IfcPropertyReferenceValue; }
 Type::Enum IfcPropertyReferenceValue::Class() { return Type::IfcPropertyReferenceValue; }
-IfcPropertyReferenceValue::IfcPropertyReferenceValue(IfcAbstractEntityPtr e) : IfcSimpleProperty((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcPropertyReferenceValue)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcPropertyReferenceValue::IfcPropertyReferenceValue(IfcIdentifier v1_Name, boost::optional< IfcText > v2_Description, boost::optional< IfcText > v3_UsageName, boost::optional< IfcObjectReferenceSelect > v4_PropertyReference) : IfcSimpleProperty((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } if (v3_UsageName) { e->setArgument(2,(*v3_UsageName)); } else { e->setArgument(2); } if (v4_PropertyReference) { e->setArgument(3,(*v4_PropertyReference)); } else { e->setArgument(3); } entity = e; EntityBuffer::Add(this); }
+IfcPropertyReferenceValue::IfcPropertyReferenceValue(IfcAbstractEntity* e) : IfcSimpleProperty((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcPropertyReferenceValue)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcPropertyReferenceValue::IfcPropertyReferenceValue(std::string v1_Name, boost::optional< std::string > v2_Description, boost::optional< std::string > v3_UsageName, IfcObjectReferenceSelect* v4_PropertyReference) : IfcSimpleProperty((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } if (v3_UsageName) { e->setArgument(2,(*v3_UsageName)); } else { e->setArgument(2); } e->setArgument(3,(v4_PropertyReference)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcPropertySet
-SHARED_PTR< IfcTemplatedEntityList< IfcProperty > > IfcPropertySet::HasProperties() { RETURN_AS_LIST(IfcProperty,4) }
-void IfcPropertySet::setHasProperties(SHARED_PTR< IfcTemplatedEntityList< IfcProperty > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v->generalize()); }
+IfcTemplatedEntityList< IfcProperty >::ptr IfcPropertySet::HasProperties() const { IfcEntityList::ptr es = *entity->getArgument(4); return es->as<IfcProperty>(); }
+void IfcPropertySet::setHasProperties(IfcTemplatedEntityList< IfcProperty >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v->generalize()); }
 bool IfcPropertySet::is(Type::Enum v) const { return v == Type::IfcPropertySet || IfcPropertySetDefinition::is(v); }
 Type::Enum IfcPropertySet::type() const { return Type::IfcPropertySet; }
 Type::Enum IfcPropertySet::Class() { return Type::IfcPropertySet; }
-IfcPropertySet::IfcPropertySet(IfcAbstractEntityPtr e) : IfcPropertySetDefinition((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcPropertySet)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcPropertySet::IfcPropertySet(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, SHARED_PTR< IfcTemplatedEntityList< IfcProperty > > v5_HasProperties) : IfcPropertySetDefinition((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_HasProperties)->generalize()); entity = e; EntityBuffer::Add(this); }
+IfcPropertySet::IfcPropertySet(IfcAbstractEntity* e) : IfcPropertySetDefinition((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcPropertySet)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcPropertySet::IfcPropertySet(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcTemplatedEntityList< IfcProperty >::ptr v5_HasProperties) : IfcPropertySetDefinition((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_HasProperties)->generalize()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcPropertySetDefinition
-IfcTypeObject::list IfcPropertySetDefinition::DefinesType() { RETURN_INVERSE(IfcTypeObject) }
-IfcRelDefinesByTemplate::list IfcPropertySetDefinition::IsDefinedBy() { RETURN_INVERSE(IfcRelDefinesByTemplate) }
-IfcRelDefinesByProperties::list IfcPropertySetDefinition::DefinesOccurrence() { RETURN_INVERSE(IfcRelDefinesByProperties) }
+IfcTypeObject::list::ptr IfcPropertySetDefinition::DefinesType() const { return entity->getInverse(Type::IfcTypeObject, 5)->as<IfcTypeObject>(); }
+IfcRelDefinesByTemplate::list::ptr IfcPropertySetDefinition::IsDefinedBy() const { return entity->getInverse(Type::IfcRelDefinesByTemplate, 4)->as<IfcRelDefinesByTemplate>(); }
+IfcRelDefinesByProperties::list::ptr IfcPropertySetDefinition::DefinesOccurrence() const { return entity->getInverse(Type::IfcRelDefinesByProperties, 5)->as<IfcRelDefinesByProperties>(); }
 bool IfcPropertySetDefinition::is(Type::Enum v) const { return v == Type::IfcPropertySetDefinition || IfcPropertyDefinition::is(v); }
 Type::Enum IfcPropertySetDefinition::type() const { return Type::IfcPropertySetDefinition; }
 Type::Enum IfcPropertySetDefinition::Class() { return Type::IfcPropertySetDefinition; }
-IfcPropertySetDefinition::IfcPropertySetDefinition(IfcAbstractEntityPtr e) : IfcPropertyDefinition((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcPropertySetDefinition)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcPropertySetDefinition::IfcPropertySetDefinition(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description) : IfcPropertyDefinition((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } entity = e; EntityBuffer::Add(this); }
+IfcPropertySetDefinition::IfcPropertySetDefinition(IfcAbstractEntity* e) : IfcPropertyDefinition((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcPropertySetDefinition)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcPropertySetDefinition::IfcPropertySetDefinition(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description) : IfcPropertyDefinition((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcPropertySetTemplate
-bool IfcPropertySetTemplate::hasTemplateType() { return !entity->getArgument(4)->isNull(); }
-IfcPropertySetTemplateTypeEnum::IfcPropertySetTemplateTypeEnum IfcPropertySetTemplate::TemplateType() { return IfcPropertySetTemplateTypeEnum::FromString(*entity->getArgument(4)); }
+bool IfcPropertySetTemplate::hasTemplateType() const { return !entity->getArgument(4)->isNull(); }
+IfcPropertySetTemplateTypeEnum::IfcPropertySetTemplateTypeEnum IfcPropertySetTemplate::TemplateType() const { return IfcPropertySetTemplateTypeEnum::FromString(*entity->getArgument(4)); }
 void IfcPropertySetTemplate::setTemplateType(IfcPropertySetTemplateTypeEnum::IfcPropertySetTemplateTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v,IfcPropertySetTemplateTypeEnum::ToString(v)); }
-bool IfcPropertySetTemplate::hasApplicableEntity() { return !entity->getArgument(5)->isNull(); }
-IfcIdentifier IfcPropertySetTemplate::ApplicableEntity() { return *entity->getArgument(5); }
-void IfcPropertySetTemplate::setApplicableEntity(IfcIdentifier v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-SHARED_PTR< IfcTemplatedEntityList< IfcPropertyTemplate > > IfcPropertySetTemplate::HasPropertyTemplates() { RETURN_AS_LIST(IfcPropertyTemplate,6) }
-void IfcPropertySetTemplate::setHasPropertyTemplates(SHARED_PTR< IfcTemplatedEntityList< IfcPropertyTemplate > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v->generalize()); }
-IfcRelDefinesByTemplate::list IfcPropertySetTemplate::Defines() { RETURN_INVERSE(IfcRelDefinesByTemplate) }
+bool IfcPropertySetTemplate::hasApplicableEntity() const { return !entity->getArgument(5)->isNull(); }
+std::string IfcPropertySetTemplate::ApplicableEntity() const { return *entity->getArgument(5); }
+void IfcPropertySetTemplate::setApplicableEntity(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+IfcTemplatedEntityList< IfcPropertyTemplate >::ptr IfcPropertySetTemplate::HasPropertyTemplates() const { IfcEntityList::ptr es = *entity->getArgument(6); return es->as<IfcPropertyTemplate>(); }
+void IfcPropertySetTemplate::setHasPropertyTemplates(IfcTemplatedEntityList< IfcPropertyTemplate >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v->generalize()); }
+IfcRelDefinesByTemplate::list::ptr IfcPropertySetTemplate::Defines() const { return entity->getInverse(Type::IfcRelDefinesByTemplate, 5)->as<IfcRelDefinesByTemplate>(); }
 bool IfcPropertySetTemplate::is(Type::Enum v) const { return v == Type::IfcPropertySetTemplate || IfcPropertyTemplateDefinition::is(v); }
 Type::Enum IfcPropertySetTemplate::type() const { return Type::IfcPropertySetTemplate; }
 Type::Enum IfcPropertySetTemplate::Class() { return Type::IfcPropertySetTemplate; }
-IfcPropertySetTemplate::IfcPropertySetTemplate(IfcAbstractEntityPtr e) : IfcPropertyTemplateDefinition((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcPropertySetTemplate)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcPropertySetTemplate::IfcPropertySetTemplate(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcPropertySetTemplateTypeEnum::IfcPropertySetTemplateTypeEnum > v5_TemplateType, boost::optional< IfcIdentifier > v6_ApplicableEntity, SHARED_PTR< IfcTemplatedEntityList< IfcPropertyTemplate > > v7_HasPropertyTemplates) : IfcPropertyTemplateDefinition((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_TemplateType) { e->setArgument(4,*v5_TemplateType,IfcPropertySetTemplateTypeEnum::ToString(*v5_TemplateType)); } else { e->setArgument(4); } if (v6_ApplicableEntity) { e->setArgument(5,(*v6_ApplicableEntity)); } else { e->setArgument(5); } e->setArgument(6,(v7_HasPropertyTemplates)->generalize()); entity = e; EntityBuffer::Add(this); }
+IfcPropertySetTemplate::IfcPropertySetTemplate(IfcAbstractEntity* e) : IfcPropertyTemplateDefinition((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcPropertySetTemplate)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcPropertySetTemplate::IfcPropertySetTemplate(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< IfcPropertySetTemplateTypeEnum::IfcPropertySetTemplateTypeEnum > v5_TemplateType, boost::optional< std::string > v6_ApplicableEntity, IfcTemplatedEntityList< IfcPropertyTemplate >::ptr v7_HasPropertyTemplates) : IfcPropertyTemplateDefinition((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_TemplateType) { e->setArgument(4,*v5_TemplateType,IfcPropertySetTemplateTypeEnum::ToString(*v5_TemplateType)); } else { e->setArgument(4); } if (v6_ApplicableEntity) { e->setArgument(5,(*v6_ApplicableEntity)); } else { e->setArgument(5); } e->setArgument(6,(v7_HasPropertyTemplates)->generalize()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcPropertySingleValue
-bool IfcPropertySingleValue::hasNominalValue() { return !entity->getArgument(2)->isNull(); }
-IfcValue IfcPropertySingleValue::NominalValue() { return *entity->getArgument(2); }
-void IfcPropertySingleValue::setNominalValue(IfcValue v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-bool IfcPropertySingleValue::hasUnit() { return !entity->getArgument(3)->isNull(); }
-IfcUnit IfcPropertySingleValue::Unit() { return *entity->getArgument(3); }
-void IfcPropertySingleValue::setUnit(IfcUnit v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+bool IfcPropertySingleValue::hasNominalValue() const { return !entity->getArgument(2)->isNull(); }
+IfcValue* IfcPropertySingleValue::NominalValue() const { return (IfcValue*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(2))); }
+void IfcPropertySingleValue::setNominalValue(IfcValue* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+bool IfcPropertySingleValue::hasUnit() const { return !entity->getArgument(3)->isNull(); }
+IfcUnit* IfcPropertySingleValue::Unit() const { return (IfcUnit*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(3))); }
+void IfcPropertySingleValue::setUnit(IfcUnit* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
 bool IfcPropertySingleValue::is(Type::Enum v) const { return v == Type::IfcPropertySingleValue || IfcSimpleProperty::is(v); }
 Type::Enum IfcPropertySingleValue::type() const { return Type::IfcPropertySingleValue; }
 Type::Enum IfcPropertySingleValue::Class() { return Type::IfcPropertySingleValue; }
-IfcPropertySingleValue::IfcPropertySingleValue(IfcAbstractEntityPtr e) : IfcSimpleProperty((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcPropertySingleValue)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcPropertySingleValue::IfcPropertySingleValue(IfcIdentifier v1_Name, boost::optional< IfcText > v2_Description, boost::optional< IfcValue > v3_NominalValue, boost::optional< IfcUnit > v4_Unit) : IfcSimpleProperty((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } if (v3_NominalValue) { e->setArgument(2,(*v3_NominalValue)); } else { e->setArgument(2); } if (v4_Unit) { e->setArgument(3,(*v4_Unit)); } else { e->setArgument(3); } entity = e; EntityBuffer::Add(this); }
+IfcPropertySingleValue::IfcPropertySingleValue(IfcAbstractEntity* e) : IfcSimpleProperty((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcPropertySingleValue)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcPropertySingleValue::IfcPropertySingleValue(std::string v1_Name, boost::optional< std::string > v2_Description, IfcValue* v3_NominalValue, IfcUnit* v4_Unit) : IfcSimpleProperty((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_NominalValue)); e->setArgument(3,(v4_Unit)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcPropertyTableValue
-bool IfcPropertyTableValue::hasDefiningValues() { return !entity->getArgument(2)->isNull(); }
-SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > IfcPropertyTableValue::DefiningValues() { RETURN_AS_LIST(IfcUtil::IfcAbstractSelect,2) }
-void IfcPropertyTableValue::setDefiningValues(SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v->generalize()); }
-bool IfcPropertyTableValue::hasDefinedValues() { return !entity->getArgument(3)->isNull(); }
-SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > IfcPropertyTableValue::DefinedValues() { RETURN_AS_LIST(IfcUtil::IfcAbstractSelect,3) }
-void IfcPropertyTableValue::setDefinedValues(SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v->generalize()); }
-bool IfcPropertyTableValue::hasExpression() { return !entity->getArgument(4)->isNull(); }
-IfcText IfcPropertyTableValue::Expression() { return *entity->getArgument(4); }
-void IfcPropertyTableValue::setExpression(IfcText v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-bool IfcPropertyTableValue::hasDefiningUnit() { return !entity->getArgument(5)->isNull(); }
-IfcUnit IfcPropertyTableValue::DefiningUnit() { return *entity->getArgument(5); }
-void IfcPropertyTableValue::setDefiningUnit(IfcUnit v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-bool IfcPropertyTableValue::hasDefinedUnit() { return !entity->getArgument(6)->isNull(); }
-IfcUnit IfcPropertyTableValue::DefinedUnit() { return *entity->getArgument(6); }
-void IfcPropertyTableValue::setDefinedUnit(IfcUnit v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
-bool IfcPropertyTableValue::hasCurveInterpolation() { return !entity->getArgument(7)->isNull(); }
-IfcCurveInterpolationEnum::IfcCurveInterpolationEnum IfcPropertyTableValue::CurveInterpolation() { return IfcCurveInterpolationEnum::FromString(*entity->getArgument(7)); }
+bool IfcPropertyTableValue::hasDefiningValues() const { return !entity->getArgument(2)->isNull(); }
+IfcEntityList::ptr IfcPropertyTableValue::DefiningValues() const { return *entity->getArgument(2); }
+void IfcPropertyTableValue::setDefiningValues(IfcEntityList::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+bool IfcPropertyTableValue::hasDefinedValues() const { return !entity->getArgument(3)->isNull(); }
+IfcEntityList::ptr IfcPropertyTableValue::DefinedValues() const { return *entity->getArgument(3); }
+void IfcPropertyTableValue::setDefinedValues(IfcEntityList::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+bool IfcPropertyTableValue::hasExpression() const { return !entity->getArgument(4)->isNull(); }
+std::string IfcPropertyTableValue::Expression() const { return *entity->getArgument(4); }
+void IfcPropertyTableValue::setExpression(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+bool IfcPropertyTableValue::hasDefiningUnit() const { return !entity->getArgument(5)->isNull(); }
+IfcUnit* IfcPropertyTableValue::DefiningUnit() const { return (IfcUnit*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(5))); }
+void IfcPropertyTableValue::setDefiningUnit(IfcUnit* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+bool IfcPropertyTableValue::hasDefinedUnit() const { return !entity->getArgument(6)->isNull(); }
+IfcUnit* IfcPropertyTableValue::DefinedUnit() const { return (IfcUnit*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(6))); }
+void IfcPropertyTableValue::setDefinedUnit(IfcUnit* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
+bool IfcPropertyTableValue::hasCurveInterpolation() const { return !entity->getArgument(7)->isNull(); }
+IfcCurveInterpolationEnum::IfcCurveInterpolationEnum IfcPropertyTableValue::CurveInterpolation() const { return IfcCurveInterpolationEnum::FromString(*entity->getArgument(7)); }
 void IfcPropertyTableValue::setCurveInterpolation(IfcCurveInterpolationEnum::IfcCurveInterpolationEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v,IfcCurveInterpolationEnum::ToString(v)); }
 bool IfcPropertyTableValue::is(Type::Enum v) const { return v == Type::IfcPropertyTableValue || IfcSimpleProperty::is(v); }
 Type::Enum IfcPropertyTableValue::type() const { return Type::IfcPropertyTableValue; }
 Type::Enum IfcPropertyTableValue::Class() { return Type::IfcPropertyTableValue; }
-IfcPropertyTableValue::IfcPropertyTableValue(IfcAbstractEntityPtr e) : IfcSimpleProperty((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcPropertyTableValue)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcPropertyTableValue::IfcPropertyTableValue(IfcIdentifier v1_Name, boost::optional< IfcText > v2_Description, boost::optional< IfcEntities > v3_DefiningValues, boost::optional< IfcEntities > v4_DefinedValues, boost::optional< IfcText > v5_Expression, boost::optional< IfcUnit > v6_DefiningUnit, boost::optional< IfcUnit > v7_DefinedUnit, boost::optional< IfcCurveInterpolationEnum::IfcCurveInterpolationEnum > v8_CurveInterpolation) : IfcSimpleProperty((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } if (v3_DefiningValues) { e->setArgument(2,(*v3_DefiningValues)); } else { e->setArgument(2); } if (v4_DefinedValues) { e->setArgument(3,(*v4_DefinedValues)); } else { e->setArgument(3); } if (v5_Expression) { e->setArgument(4,(*v5_Expression)); } else { e->setArgument(4); } if (v6_DefiningUnit) { e->setArgument(5,(*v6_DefiningUnit)); } else { e->setArgument(5); } if (v7_DefinedUnit) { e->setArgument(6,(*v7_DefinedUnit)); } else { e->setArgument(6); } if (v8_CurveInterpolation) { e->setArgument(7,*v8_CurveInterpolation,IfcCurveInterpolationEnum::ToString(*v8_CurveInterpolation)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
+IfcPropertyTableValue::IfcPropertyTableValue(IfcAbstractEntity* e) : IfcSimpleProperty((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcPropertyTableValue)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcPropertyTableValue::IfcPropertyTableValue(std::string v1_Name, boost::optional< std::string > v2_Description, boost::optional< IfcEntityList::ptr > v3_DefiningValues, boost::optional< IfcEntityList::ptr > v4_DefinedValues, boost::optional< std::string > v5_Expression, IfcUnit* v6_DefiningUnit, IfcUnit* v7_DefinedUnit, boost::optional< IfcCurveInterpolationEnum::IfcCurveInterpolationEnum > v8_CurveInterpolation) : IfcSimpleProperty((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } if (v3_DefiningValues) { e->setArgument(2,(*v3_DefiningValues)); } else { e->setArgument(2); } if (v4_DefinedValues) { e->setArgument(3,(*v4_DefinedValues)); } else { e->setArgument(3); } if (v5_Expression) { e->setArgument(4,(*v5_Expression)); } else { e->setArgument(4); } e->setArgument(5,(v6_DefiningUnit)); e->setArgument(6,(v7_DefinedUnit)); if (v8_CurveInterpolation) { e->setArgument(7,*v8_CurveInterpolation,IfcCurveInterpolationEnum::ToString(*v8_CurveInterpolation)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcPropertyTemplate
-IfcComplexPropertyTemplate::list IfcPropertyTemplate::PartOfComplexTemplate() { RETURN_INVERSE(IfcComplexPropertyTemplate) }
-IfcPropertySetTemplate::list IfcPropertyTemplate::PartOfPsetTemplate() { RETURN_INVERSE(IfcPropertySetTemplate) }
+IfcComplexPropertyTemplate::list::ptr IfcPropertyTemplate::PartOfComplexTemplate() const { return entity->getInverse(Type::IfcComplexPropertyTemplate, 6)->as<IfcComplexPropertyTemplate>(); }
+IfcPropertySetTemplate::list::ptr IfcPropertyTemplate::PartOfPsetTemplate() const { return entity->getInverse(Type::IfcPropertySetTemplate, 6)->as<IfcPropertySetTemplate>(); }
 bool IfcPropertyTemplate::is(Type::Enum v) const { return v == Type::IfcPropertyTemplate || IfcPropertyTemplateDefinition::is(v); }
 Type::Enum IfcPropertyTemplate::type() const { return Type::IfcPropertyTemplate; }
 Type::Enum IfcPropertyTemplate::Class() { return Type::IfcPropertyTemplate; }
-IfcPropertyTemplate::IfcPropertyTemplate(IfcAbstractEntityPtr e) : IfcPropertyTemplateDefinition((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcPropertyTemplate)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcPropertyTemplate::IfcPropertyTemplate(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description) : IfcPropertyTemplateDefinition((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } entity = e; EntityBuffer::Add(this); }
+IfcPropertyTemplate::IfcPropertyTemplate(IfcAbstractEntity* e) : IfcPropertyTemplateDefinition((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcPropertyTemplate)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcPropertyTemplate::IfcPropertyTemplate(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description) : IfcPropertyTemplateDefinition((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcPropertyTemplateDefinition
 bool IfcPropertyTemplateDefinition::is(Type::Enum v) const { return v == Type::IfcPropertyTemplateDefinition || IfcPropertyDefinition::is(v); }
 Type::Enum IfcPropertyTemplateDefinition::type() const { return Type::IfcPropertyTemplateDefinition; }
 Type::Enum IfcPropertyTemplateDefinition::Class() { return Type::IfcPropertyTemplateDefinition; }
-IfcPropertyTemplateDefinition::IfcPropertyTemplateDefinition(IfcAbstractEntityPtr e) : IfcPropertyDefinition((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcPropertyTemplateDefinition)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcPropertyTemplateDefinition::IfcPropertyTemplateDefinition(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description) : IfcPropertyDefinition((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } entity = e; EntityBuffer::Add(this); }
+IfcPropertyTemplateDefinition::IfcPropertyTemplateDefinition(IfcAbstractEntity* e) : IfcPropertyDefinition((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcPropertyTemplateDefinition)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcPropertyTemplateDefinition::IfcPropertyTemplateDefinition(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description) : IfcPropertyDefinition((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcProtectiveDevice
-bool IfcProtectiveDevice::hasPredefinedType() { return !entity->getArgument(8)->isNull(); }
-IfcProtectiveDeviceTypeEnum::IfcProtectiveDeviceTypeEnum IfcProtectiveDevice::PredefinedType() { return IfcProtectiveDeviceTypeEnum::FromString(*entity->getArgument(8)); }
+bool IfcProtectiveDevice::hasPredefinedType() const { return !entity->getArgument(8)->isNull(); }
+IfcProtectiveDeviceTypeEnum::IfcProtectiveDeviceTypeEnum IfcProtectiveDevice::PredefinedType() const { return IfcProtectiveDeviceTypeEnum::FromString(*entity->getArgument(8)); }
 void IfcProtectiveDevice::setPredefinedType(IfcProtectiveDeviceTypeEnum::IfcProtectiveDeviceTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcProtectiveDeviceTypeEnum::ToString(v)); }
 bool IfcProtectiveDevice::is(Type::Enum v) const { return v == Type::IfcProtectiveDevice || IfcFlowController::is(v); }
 Type::Enum IfcProtectiveDevice::type() const { return Type::IfcProtectiveDevice; }
 Type::Enum IfcProtectiveDevice::Class() { return Type::IfcProtectiveDevice; }
-IfcProtectiveDevice::IfcProtectiveDevice(IfcAbstractEntityPtr e) : IfcFlowController((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcProtectiveDevice)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcProtectiveDevice::IfcProtectiveDevice(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcProtectiveDeviceTypeEnum::IfcProtectiveDeviceTypeEnum > v9_PredefinedType) : IfcFlowController((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcProtectiveDeviceTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcProtectiveDevice::IfcProtectiveDevice(IfcAbstractEntity* e) : IfcFlowController((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcProtectiveDevice)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcProtectiveDevice::IfcProtectiveDevice(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcProtectiveDeviceTypeEnum::IfcProtectiveDeviceTypeEnum > v9_PredefinedType) : IfcFlowController((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcProtectiveDeviceTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcProtectiveDeviceTrippingUnit
-bool IfcProtectiveDeviceTrippingUnit::hasPredefinedType() { return !entity->getArgument(8)->isNull(); }
-IfcProtectiveDeviceTrippingUnitTypeEnum::IfcProtectiveDeviceTrippingUnitTypeEnum IfcProtectiveDeviceTrippingUnit::PredefinedType() { return IfcProtectiveDeviceTrippingUnitTypeEnum::FromString(*entity->getArgument(8)); }
+bool IfcProtectiveDeviceTrippingUnit::hasPredefinedType() const { return !entity->getArgument(8)->isNull(); }
+IfcProtectiveDeviceTrippingUnitTypeEnum::IfcProtectiveDeviceTrippingUnitTypeEnum IfcProtectiveDeviceTrippingUnit::PredefinedType() const { return IfcProtectiveDeviceTrippingUnitTypeEnum::FromString(*entity->getArgument(8)); }
 void IfcProtectiveDeviceTrippingUnit::setPredefinedType(IfcProtectiveDeviceTrippingUnitTypeEnum::IfcProtectiveDeviceTrippingUnitTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcProtectiveDeviceTrippingUnitTypeEnum::ToString(v)); }
 bool IfcProtectiveDeviceTrippingUnit::is(Type::Enum v) const { return v == Type::IfcProtectiveDeviceTrippingUnit || IfcDistributionControlElement::is(v); }
 Type::Enum IfcProtectiveDeviceTrippingUnit::type() const { return Type::IfcProtectiveDeviceTrippingUnit; }
 Type::Enum IfcProtectiveDeviceTrippingUnit::Class() { return Type::IfcProtectiveDeviceTrippingUnit; }
-IfcProtectiveDeviceTrippingUnit::IfcProtectiveDeviceTrippingUnit(IfcAbstractEntityPtr e) : IfcDistributionControlElement((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcProtectiveDeviceTrippingUnit)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcProtectiveDeviceTrippingUnit::IfcProtectiveDeviceTrippingUnit(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcProtectiveDeviceTrippingUnitTypeEnum::IfcProtectiveDeviceTrippingUnitTypeEnum > v9_PredefinedType) : IfcDistributionControlElement((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcProtectiveDeviceTrippingUnitTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcProtectiveDeviceTrippingUnit::IfcProtectiveDeviceTrippingUnit(IfcAbstractEntity* e) : IfcDistributionControlElement((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcProtectiveDeviceTrippingUnit)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcProtectiveDeviceTrippingUnit::IfcProtectiveDeviceTrippingUnit(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcProtectiveDeviceTrippingUnitTypeEnum::IfcProtectiveDeviceTrippingUnitTypeEnum > v9_PredefinedType) : IfcDistributionControlElement((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcProtectiveDeviceTrippingUnitTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcProtectiveDeviceTrippingUnitType
-IfcProtectiveDeviceTrippingUnitTypeEnum::IfcProtectiveDeviceTrippingUnitTypeEnum IfcProtectiveDeviceTrippingUnitType::PredefinedType() { return IfcProtectiveDeviceTrippingUnitTypeEnum::FromString(*entity->getArgument(9)); }
+IfcProtectiveDeviceTrippingUnitTypeEnum::IfcProtectiveDeviceTrippingUnitTypeEnum IfcProtectiveDeviceTrippingUnitType::PredefinedType() const { return IfcProtectiveDeviceTrippingUnitTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcProtectiveDeviceTrippingUnitType::setPredefinedType(IfcProtectiveDeviceTrippingUnitTypeEnum::IfcProtectiveDeviceTrippingUnitTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcProtectiveDeviceTrippingUnitTypeEnum::ToString(v)); }
 bool IfcProtectiveDeviceTrippingUnitType::is(Type::Enum v) const { return v == Type::IfcProtectiveDeviceTrippingUnitType || IfcDistributionControlElementType::is(v); }
 Type::Enum IfcProtectiveDeviceTrippingUnitType::type() const { return Type::IfcProtectiveDeviceTrippingUnitType; }
 Type::Enum IfcProtectiveDeviceTrippingUnitType::Class() { return Type::IfcProtectiveDeviceTrippingUnitType; }
-IfcProtectiveDeviceTrippingUnitType::IfcProtectiveDeviceTrippingUnitType(IfcAbstractEntityPtr e) : IfcDistributionControlElementType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcProtectiveDeviceTrippingUnitType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcProtectiveDeviceTrippingUnitType::IfcProtectiveDeviceTrippingUnitType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcProtectiveDeviceTrippingUnitTypeEnum::IfcProtectiveDeviceTrippingUnitTypeEnum v10_PredefinedType) : IfcDistributionControlElementType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcProtectiveDeviceTrippingUnitTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcProtectiveDeviceTrippingUnitType::IfcProtectiveDeviceTrippingUnitType(IfcAbstractEntity* e) : IfcDistributionControlElementType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcProtectiveDeviceTrippingUnitType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcProtectiveDeviceTrippingUnitType::IfcProtectiveDeviceTrippingUnitType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcProtectiveDeviceTrippingUnitTypeEnum::IfcProtectiveDeviceTrippingUnitTypeEnum v10_PredefinedType) : IfcDistributionControlElementType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcProtectiveDeviceTrippingUnitTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcProtectiveDeviceType
-IfcProtectiveDeviceTypeEnum::IfcProtectiveDeviceTypeEnum IfcProtectiveDeviceType::PredefinedType() { return IfcProtectiveDeviceTypeEnum::FromString(*entity->getArgument(9)); }
+IfcProtectiveDeviceTypeEnum::IfcProtectiveDeviceTypeEnum IfcProtectiveDeviceType::PredefinedType() const { return IfcProtectiveDeviceTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcProtectiveDeviceType::setPredefinedType(IfcProtectiveDeviceTypeEnum::IfcProtectiveDeviceTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcProtectiveDeviceTypeEnum::ToString(v)); }
 bool IfcProtectiveDeviceType::is(Type::Enum v) const { return v == Type::IfcProtectiveDeviceType || IfcFlowControllerType::is(v); }
 Type::Enum IfcProtectiveDeviceType::type() const { return Type::IfcProtectiveDeviceType; }
 Type::Enum IfcProtectiveDeviceType::Class() { return Type::IfcProtectiveDeviceType; }
-IfcProtectiveDeviceType::IfcProtectiveDeviceType(IfcAbstractEntityPtr e) : IfcFlowControllerType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcProtectiveDeviceType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcProtectiveDeviceType::IfcProtectiveDeviceType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcProtectiveDeviceTypeEnum::IfcProtectiveDeviceTypeEnum v10_PredefinedType) : IfcFlowControllerType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcProtectiveDeviceTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcProtectiveDeviceType::IfcProtectiveDeviceType(IfcAbstractEntity* e) : IfcFlowControllerType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcProtectiveDeviceType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcProtectiveDeviceType::IfcProtectiveDeviceType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcProtectiveDeviceTypeEnum::IfcProtectiveDeviceTypeEnum v10_PredefinedType) : IfcFlowControllerType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcProtectiveDeviceTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcProxy
-IfcObjectTypeEnum::IfcObjectTypeEnum IfcProxy::ProxyType() { return IfcObjectTypeEnum::FromString(*entity->getArgument(7)); }
+IfcObjectTypeEnum::IfcObjectTypeEnum IfcProxy::ProxyType() const { return IfcObjectTypeEnum::FromString(*entity->getArgument(7)); }
 void IfcProxy::setProxyType(IfcObjectTypeEnum::IfcObjectTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v,IfcObjectTypeEnum::ToString(v)); }
-bool IfcProxy::hasTag() { return !entity->getArgument(8)->isNull(); }
-IfcLabel IfcProxy::Tag() { return *entity->getArgument(8); }
-void IfcProxy::setTag(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
+bool IfcProxy::hasTag() const { return !entity->getArgument(8)->isNull(); }
+std::string IfcProxy::Tag() const { return *entity->getArgument(8); }
+void IfcProxy::setTag(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
 bool IfcProxy::is(Type::Enum v) const { return v == Type::IfcProxy || IfcProduct::is(v); }
 Type::Enum IfcProxy::type() const { return Type::IfcProxy; }
 Type::Enum IfcProxy::Class() { return Type::IfcProxy; }
-IfcProxy::IfcProxy(IfcAbstractEntityPtr e) : IfcProduct((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcProxy)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcProxy::IfcProxy(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcObjectTypeEnum::IfcObjectTypeEnum v8_ProxyType, boost::optional< IfcLabel > v9_Tag) : IfcProduct((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); e->setArgument(7,v8_ProxyType,IfcObjectTypeEnum::ToString(v8_ProxyType)); if (v9_Tag) { e->setArgument(8,(*v9_Tag)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcProxy::IfcProxy(IfcAbstractEntity* e) : IfcProduct((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcProxy)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcProxy::IfcProxy(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcObjectTypeEnum::IfcObjectTypeEnum v8_ProxyType, boost::optional< std::string > v9_Tag) : IfcProduct((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); e->setArgument(7,v8_ProxyType,IfcObjectTypeEnum::ToString(v8_ProxyType)); if (v9_Tag) { e->setArgument(8,(*v9_Tag)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcPump
-bool IfcPump::hasPredefinedType() { return !entity->getArgument(8)->isNull(); }
-IfcPumpTypeEnum::IfcPumpTypeEnum IfcPump::PredefinedType() { return IfcPumpTypeEnum::FromString(*entity->getArgument(8)); }
+bool IfcPump::hasPredefinedType() const { return !entity->getArgument(8)->isNull(); }
+IfcPumpTypeEnum::IfcPumpTypeEnum IfcPump::PredefinedType() const { return IfcPumpTypeEnum::FromString(*entity->getArgument(8)); }
 void IfcPump::setPredefinedType(IfcPumpTypeEnum::IfcPumpTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcPumpTypeEnum::ToString(v)); }
 bool IfcPump::is(Type::Enum v) const { return v == Type::IfcPump || IfcFlowMovingDevice::is(v); }
 Type::Enum IfcPump::type() const { return Type::IfcPump; }
 Type::Enum IfcPump::Class() { return Type::IfcPump; }
-IfcPump::IfcPump(IfcAbstractEntityPtr e) : IfcFlowMovingDevice((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcPump)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcPump::IfcPump(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcPumpTypeEnum::IfcPumpTypeEnum > v9_PredefinedType) : IfcFlowMovingDevice((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcPumpTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcPump::IfcPump(IfcAbstractEntity* e) : IfcFlowMovingDevice((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcPump)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcPump::IfcPump(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcPumpTypeEnum::IfcPumpTypeEnum > v9_PredefinedType) : IfcFlowMovingDevice((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcPumpTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcPumpType
-IfcPumpTypeEnum::IfcPumpTypeEnum IfcPumpType::PredefinedType() { return IfcPumpTypeEnum::FromString(*entity->getArgument(9)); }
+IfcPumpTypeEnum::IfcPumpTypeEnum IfcPumpType::PredefinedType() const { return IfcPumpTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcPumpType::setPredefinedType(IfcPumpTypeEnum::IfcPumpTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcPumpTypeEnum::ToString(v)); }
 bool IfcPumpType::is(Type::Enum v) const { return v == Type::IfcPumpType || IfcFlowMovingDeviceType::is(v); }
 Type::Enum IfcPumpType::type() const { return Type::IfcPumpType; }
 Type::Enum IfcPumpType::Class() { return Type::IfcPumpType; }
-IfcPumpType::IfcPumpType(IfcAbstractEntityPtr e) : IfcFlowMovingDeviceType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcPumpType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcPumpType::IfcPumpType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcPumpTypeEnum::IfcPumpTypeEnum v10_PredefinedType) : IfcFlowMovingDeviceType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcPumpTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcPumpType::IfcPumpType(IfcAbstractEntity* e) : IfcFlowMovingDeviceType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcPumpType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcPumpType::IfcPumpType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcPumpTypeEnum::IfcPumpTypeEnum v10_PredefinedType) : IfcFlowMovingDeviceType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcPumpTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcQuantityArea
-IfcAreaMeasure IfcQuantityArea::AreaValue() { return *entity->getArgument(3); }
-void IfcQuantityArea::setAreaValue(IfcAreaMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-bool IfcQuantityArea::hasFormula() { return !entity->getArgument(4)->isNull(); }
-IfcLabel IfcQuantityArea::Formula() { return *entity->getArgument(4); }
-void IfcQuantityArea::setFormula(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+double IfcQuantityArea::AreaValue() const { return *entity->getArgument(3); }
+void IfcQuantityArea::setAreaValue(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+bool IfcQuantityArea::hasFormula() const { return !entity->getArgument(4)->isNull(); }
+std::string IfcQuantityArea::Formula() const { return *entity->getArgument(4); }
+void IfcQuantityArea::setFormula(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
 bool IfcQuantityArea::is(Type::Enum v) const { return v == Type::IfcQuantityArea || IfcPhysicalSimpleQuantity::is(v); }
 Type::Enum IfcQuantityArea::type() const { return Type::IfcQuantityArea; }
 Type::Enum IfcQuantityArea::Class() { return Type::IfcQuantityArea; }
-IfcQuantityArea::IfcQuantityArea(IfcAbstractEntityPtr e) : IfcPhysicalSimpleQuantity((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcQuantityArea)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcQuantityArea::IfcQuantityArea(IfcLabel v1_Name, boost::optional< IfcText > v2_Description, IfcNamedUnit* v3_Unit, IfcAreaMeasure v4_AreaValue, boost::optional< IfcLabel > v5_Formula) : IfcPhysicalSimpleQuantity((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_Unit)); e->setArgument(3,(v4_AreaValue)); if (v5_Formula) { e->setArgument(4,(*v5_Formula)); } else { e->setArgument(4); } entity = e; EntityBuffer::Add(this); }
+IfcQuantityArea::IfcQuantityArea(IfcAbstractEntity* e) : IfcPhysicalSimpleQuantity((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcQuantityArea)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcQuantityArea::IfcQuantityArea(std::string v1_Name, boost::optional< std::string > v2_Description, IfcNamedUnit* v3_Unit, double v4_AreaValue, boost::optional< std::string > v5_Formula) : IfcPhysicalSimpleQuantity((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_Unit)); e->setArgument(3,(v4_AreaValue)); if (v5_Formula) { e->setArgument(4,(*v5_Formula)); } else { e->setArgument(4); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcQuantityCount
-IfcCountMeasure IfcQuantityCount::CountValue() { return *entity->getArgument(3); }
-void IfcQuantityCount::setCountValue(IfcCountMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-bool IfcQuantityCount::hasFormula() { return !entity->getArgument(4)->isNull(); }
-IfcLabel IfcQuantityCount::Formula() { return *entity->getArgument(4); }
-void IfcQuantityCount::setFormula(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+double IfcQuantityCount::CountValue() const { return *entity->getArgument(3); }
+void IfcQuantityCount::setCountValue(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+bool IfcQuantityCount::hasFormula() const { return !entity->getArgument(4)->isNull(); }
+std::string IfcQuantityCount::Formula() const { return *entity->getArgument(4); }
+void IfcQuantityCount::setFormula(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
 bool IfcQuantityCount::is(Type::Enum v) const { return v == Type::IfcQuantityCount || IfcPhysicalSimpleQuantity::is(v); }
 Type::Enum IfcQuantityCount::type() const { return Type::IfcQuantityCount; }
 Type::Enum IfcQuantityCount::Class() { return Type::IfcQuantityCount; }
-IfcQuantityCount::IfcQuantityCount(IfcAbstractEntityPtr e) : IfcPhysicalSimpleQuantity((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcQuantityCount)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcQuantityCount::IfcQuantityCount(IfcLabel v1_Name, boost::optional< IfcText > v2_Description, IfcNamedUnit* v3_Unit, IfcCountMeasure v4_CountValue, boost::optional< IfcLabel > v5_Formula) : IfcPhysicalSimpleQuantity((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_Unit)); e->setArgument(3,(v4_CountValue)); if (v5_Formula) { e->setArgument(4,(*v5_Formula)); } else { e->setArgument(4); } entity = e; EntityBuffer::Add(this); }
+IfcQuantityCount::IfcQuantityCount(IfcAbstractEntity* e) : IfcPhysicalSimpleQuantity((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcQuantityCount)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcQuantityCount::IfcQuantityCount(std::string v1_Name, boost::optional< std::string > v2_Description, IfcNamedUnit* v3_Unit, double v4_CountValue, boost::optional< std::string > v5_Formula) : IfcPhysicalSimpleQuantity((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_Unit)); e->setArgument(3,(v4_CountValue)); if (v5_Formula) { e->setArgument(4,(*v5_Formula)); } else { e->setArgument(4); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcQuantityLength
-IfcLengthMeasure IfcQuantityLength::LengthValue() { return *entity->getArgument(3); }
-void IfcQuantityLength::setLengthValue(IfcLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-bool IfcQuantityLength::hasFormula() { return !entity->getArgument(4)->isNull(); }
-IfcLabel IfcQuantityLength::Formula() { return *entity->getArgument(4); }
-void IfcQuantityLength::setFormula(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+double IfcQuantityLength::LengthValue() const { return *entity->getArgument(3); }
+void IfcQuantityLength::setLengthValue(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+bool IfcQuantityLength::hasFormula() const { return !entity->getArgument(4)->isNull(); }
+std::string IfcQuantityLength::Formula() const { return *entity->getArgument(4); }
+void IfcQuantityLength::setFormula(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
 bool IfcQuantityLength::is(Type::Enum v) const { return v == Type::IfcQuantityLength || IfcPhysicalSimpleQuantity::is(v); }
 Type::Enum IfcQuantityLength::type() const { return Type::IfcQuantityLength; }
 Type::Enum IfcQuantityLength::Class() { return Type::IfcQuantityLength; }
-IfcQuantityLength::IfcQuantityLength(IfcAbstractEntityPtr e) : IfcPhysicalSimpleQuantity((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcQuantityLength)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcQuantityLength::IfcQuantityLength(IfcLabel v1_Name, boost::optional< IfcText > v2_Description, IfcNamedUnit* v3_Unit, IfcLengthMeasure v4_LengthValue, boost::optional< IfcLabel > v5_Formula) : IfcPhysicalSimpleQuantity((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_Unit)); e->setArgument(3,(v4_LengthValue)); if (v5_Formula) { e->setArgument(4,(*v5_Formula)); } else { e->setArgument(4); } entity = e; EntityBuffer::Add(this); }
+IfcQuantityLength::IfcQuantityLength(IfcAbstractEntity* e) : IfcPhysicalSimpleQuantity((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcQuantityLength)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcQuantityLength::IfcQuantityLength(std::string v1_Name, boost::optional< std::string > v2_Description, IfcNamedUnit* v3_Unit, double v4_LengthValue, boost::optional< std::string > v5_Formula) : IfcPhysicalSimpleQuantity((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_Unit)); e->setArgument(3,(v4_LengthValue)); if (v5_Formula) { e->setArgument(4,(*v5_Formula)); } else { e->setArgument(4); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcQuantitySet
 bool IfcQuantitySet::is(Type::Enum v) const { return v == Type::IfcQuantitySet || IfcPropertySetDefinition::is(v); }
 Type::Enum IfcQuantitySet::type() const { return Type::IfcQuantitySet; }
 Type::Enum IfcQuantitySet::Class() { return Type::IfcQuantitySet; }
-IfcQuantitySet::IfcQuantitySet(IfcAbstractEntityPtr e) : IfcPropertySetDefinition((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcQuantitySet)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcQuantitySet::IfcQuantitySet(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description) : IfcPropertySetDefinition((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } entity = e; EntityBuffer::Add(this); }
+IfcQuantitySet::IfcQuantitySet(IfcAbstractEntity* e) : IfcPropertySetDefinition((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcQuantitySet)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcQuantitySet::IfcQuantitySet(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description) : IfcPropertySetDefinition((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcQuantityTime
-IfcTimeMeasure IfcQuantityTime::TimeValue() { return *entity->getArgument(3); }
-void IfcQuantityTime::setTimeValue(IfcTimeMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-bool IfcQuantityTime::hasFormula() { return !entity->getArgument(4)->isNull(); }
-IfcLabel IfcQuantityTime::Formula() { return *entity->getArgument(4); }
-void IfcQuantityTime::setFormula(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+double IfcQuantityTime::TimeValue() const { return *entity->getArgument(3); }
+void IfcQuantityTime::setTimeValue(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+bool IfcQuantityTime::hasFormula() const { return !entity->getArgument(4)->isNull(); }
+std::string IfcQuantityTime::Formula() const { return *entity->getArgument(4); }
+void IfcQuantityTime::setFormula(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
 bool IfcQuantityTime::is(Type::Enum v) const { return v == Type::IfcQuantityTime || IfcPhysicalSimpleQuantity::is(v); }
 Type::Enum IfcQuantityTime::type() const { return Type::IfcQuantityTime; }
 Type::Enum IfcQuantityTime::Class() { return Type::IfcQuantityTime; }
-IfcQuantityTime::IfcQuantityTime(IfcAbstractEntityPtr e) : IfcPhysicalSimpleQuantity((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcQuantityTime)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcQuantityTime::IfcQuantityTime(IfcLabel v1_Name, boost::optional< IfcText > v2_Description, IfcNamedUnit* v3_Unit, IfcTimeMeasure v4_TimeValue, boost::optional< IfcLabel > v5_Formula) : IfcPhysicalSimpleQuantity((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_Unit)); e->setArgument(3,(v4_TimeValue)); if (v5_Formula) { e->setArgument(4,(*v5_Formula)); } else { e->setArgument(4); } entity = e; EntityBuffer::Add(this); }
+IfcQuantityTime::IfcQuantityTime(IfcAbstractEntity* e) : IfcPhysicalSimpleQuantity((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcQuantityTime)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcQuantityTime::IfcQuantityTime(std::string v1_Name, boost::optional< std::string > v2_Description, IfcNamedUnit* v3_Unit, double v4_TimeValue, boost::optional< std::string > v5_Formula) : IfcPhysicalSimpleQuantity((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_Unit)); e->setArgument(3,(v4_TimeValue)); if (v5_Formula) { e->setArgument(4,(*v5_Formula)); } else { e->setArgument(4); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcQuantityVolume
-IfcVolumeMeasure IfcQuantityVolume::VolumeValue() { return *entity->getArgument(3); }
-void IfcQuantityVolume::setVolumeValue(IfcVolumeMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-bool IfcQuantityVolume::hasFormula() { return !entity->getArgument(4)->isNull(); }
-IfcLabel IfcQuantityVolume::Formula() { return *entity->getArgument(4); }
-void IfcQuantityVolume::setFormula(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+double IfcQuantityVolume::VolumeValue() const { return *entity->getArgument(3); }
+void IfcQuantityVolume::setVolumeValue(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+bool IfcQuantityVolume::hasFormula() const { return !entity->getArgument(4)->isNull(); }
+std::string IfcQuantityVolume::Formula() const { return *entity->getArgument(4); }
+void IfcQuantityVolume::setFormula(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
 bool IfcQuantityVolume::is(Type::Enum v) const { return v == Type::IfcQuantityVolume || IfcPhysicalSimpleQuantity::is(v); }
 Type::Enum IfcQuantityVolume::type() const { return Type::IfcQuantityVolume; }
 Type::Enum IfcQuantityVolume::Class() { return Type::IfcQuantityVolume; }
-IfcQuantityVolume::IfcQuantityVolume(IfcAbstractEntityPtr e) : IfcPhysicalSimpleQuantity((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcQuantityVolume)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcQuantityVolume::IfcQuantityVolume(IfcLabel v1_Name, boost::optional< IfcText > v2_Description, IfcNamedUnit* v3_Unit, IfcVolumeMeasure v4_VolumeValue, boost::optional< IfcLabel > v5_Formula) : IfcPhysicalSimpleQuantity((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_Unit)); e->setArgument(3,(v4_VolumeValue)); if (v5_Formula) { e->setArgument(4,(*v5_Formula)); } else { e->setArgument(4); } entity = e; EntityBuffer::Add(this); }
+IfcQuantityVolume::IfcQuantityVolume(IfcAbstractEntity* e) : IfcPhysicalSimpleQuantity((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcQuantityVolume)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcQuantityVolume::IfcQuantityVolume(std::string v1_Name, boost::optional< std::string > v2_Description, IfcNamedUnit* v3_Unit, double v4_VolumeValue, boost::optional< std::string > v5_Formula) : IfcPhysicalSimpleQuantity((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_Unit)); e->setArgument(3,(v4_VolumeValue)); if (v5_Formula) { e->setArgument(4,(*v5_Formula)); } else { e->setArgument(4); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcQuantityWeight
-IfcMassMeasure IfcQuantityWeight::WeightValue() { return *entity->getArgument(3); }
-void IfcQuantityWeight::setWeightValue(IfcMassMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-bool IfcQuantityWeight::hasFormula() { return !entity->getArgument(4)->isNull(); }
-IfcLabel IfcQuantityWeight::Formula() { return *entity->getArgument(4); }
-void IfcQuantityWeight::setFormula(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+double IfcQuantityWeight::WeightValue() const { return *entity->getArgument(3); }
+void IfcQuantityWeight::setWeightValue(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+bool IfcQuantityWeight::hasFormula() const { return !entity->getArgument(4)->isNull(); }
+std::string IfcQuantityWeight::Formula() const { return *entity->getArgument(4); }
+void IfcQuantityWeight::setFormula(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
 bool IfcQuantityWeight::is(Type::Enum v) const { return v == Type::IfcQuantityWeight || IfcPhysicalSimpleQuantity::is(v); }
 Type::Enum IfcQuantityWeight::type() const { return Type::IfcQuantityWeight; }
 Type::Enum IfcQuantityWeight::Class() { return Type::IfcQuantityWeight; }
-IfcQuantityWeight::IfcQuantityWeight(IfcAbstractEntityPtr e) : IfcPhysicalSimpleQuantity((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcQuantityWeight)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcQuantityWeight::IfcQuantityWeight(IfcLabel v1_Name, boost::optional< IfcText > v2_Description, IfcNamedUnit* v3_Unit, IfcMassMeasure v4_WeightValue, boost::optional< IfcLabel > v5_Formula) : IfcPhysicalSimpleQuantity((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_Unit)); e->setArgument(3,(v4_WeightValue)); if (v5_Formula) { e->setArgument(4,(*v5_Formula)); } else { e->setArgument(4); } entity = e; EntityBuffer::Add(this); }
+IfcQuantityWeight::IfcQuantityWeight(IfcAbstractEntity* e) : IfcPhysicalSimpleQuantity((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcQuantityWeight)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcQuantityWeight::IfcQuantityWeight(std::string v1_Name, boost::optional< std::string > v2_Description, IfcNamedUnit* v3_Unit, double v4_WeightValue, boost::optional< std::string > v5_Formula) : IfcPhysicalSimpleQuantity((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_Unit)); e->setArgument(3,(v4_WeightValue)); if (v5_Formula) { e->setArgument(4,(*v5_Formula)); } else { e->setArgument(4); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRailing
-bool IfcRailing::hasPredefinedType() { return !entity->getArgument(8)->isNull(); }
-IfcRailingTypeEnum::IfcRailingTypeEnum IfcRailing::PredefinedType() { return IfcRailingTypeEnum::FromString(*entity->getArgument(8)); }
+bool IfcRailing::hasPredefinedType() const { return !entity->getArgument(8)->isNull(); }
+IfcRailingTypeEnum::IfcRailingTypeEnum IfcRailing::PredefinedType() const { return IfcRailingTypeEnum::FromString(*entity->getArgument(8)); }
 void IfcRailing::setPredefinedType(IfcRailingTypeEnum::IfcRailingTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcRailingTypeEnum::ToString(v)); }
 bool IfcRailing::is(Type::Enum v) const { return v == Type::IfcRailing || IfcBuildingElement::is(v); }
 Type::Enum IfcRailing::type() const { return Type::IfcRailing; }
 Type::Enum IfcRailing::Class() { return Type::IfcRailing; }
-IfcRailing::IfcRailing(IfcAbstractEntityPtr e) : IfcBuildingElement((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRailing)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRailing::IfcRailing(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcRailingTypeEnum::IfcRailingTypeEnum > v9_PredefinedType) : IfcBuildingElement((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcRailingTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcRailing::IfcRailing(IfcAbstractEntity* e) : IfcBuildingElement((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRailing)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRailing::IfcRailing(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcRailingTypeEnum::IfcRailingTypeEnum > v9_PredefinedType) : IfcBuildingElement((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcRailingTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRailingType
-IfcRailingTypeEnum::IfcRailingTypeEnum IfcRailingType::PredefinedType() { return IfcRailingTypeEnum::FromString(*entity->getArgument(9)); }
+IfcRailingTypeEnum::IfcRailingTypeEnum IfcRailingType::PredefinedType() const { return IfcRailingTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcRailingType::setPredefinedType(IfcRailingTypeEnum::IfcRailingTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcRailingTypeEnum::ToString(v)); }
 bool IfcRailingType::is(Type::Enum v) const { return v == Type::IfcRailingType || IfcBuildingElementType::is(v); }
 Type::Enum IfcRailingType::type() const { return Type::IfcRailingType; }
 Type::Enum IfcRailingType::Class() { return Type::IfcRailingType; }
-IfcRailingType::IfcRailingType(IfcAbstractEntityPtr e) : IfcBuildingElementType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRailingType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRailingType::IfcRailingType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcRailingTypeEnum::IfcRailingTypeEnum v10_PredefinedType) : IfcBuildingElementType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcRailingTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcRailingType::IfcRailingType(IfcAbstractEntity* e) : IfcBuildingElementType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRailingType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRailingType::IfcRailingType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcRailingTypeEnum::IfcRailingTypeEnum v10_PredefinedType) : IfcBuildingElementType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcRailingTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRamp
-bool IfcRamp::hasPredefinedType() { return !entity->getArgument(8)->isNull(); }
-IfcRampTypeEnum::IfcRampTypeEnum IfcRamp::PredefinedType() { return IfcRampTypeEnum::FromString(*entity->getArgument(8)); }
+bool IfcRamp::hasPredefinedType() const { return !entity->getArgument(8)->isNull(); }
+IfcRampTypeEnum::IfcRampTypeEnum IfcRamp::PredefinedType() const { return IfcRampTypeEnum::FromString(*entity->getArgument(8)); }
 void IfcRamp::setPredefinedType(IfcRampTypeEnum::IfcRampTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcRampTypeEnum::ToString(v)); }
 bool IfcRamp::is(Type::Enum v) const { return v == Type::IfcRamp || IfcBuildingElement::is(v); }
 Type::Enum IfcRamp::type() const { return Type::IfcRamp; }
 Type::Enum IfcRamp::Class() { return Type::IfcRamp; }
-IfcRamp::IfcRamp(IfcAbstractEntityPtr e) : IfcBuildingElement((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRamp)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRamp::IfcRamp(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcRampTypeEnum::IfcRampTypeEnum > v9_PredefinedType) : IfcBuildingElement((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcRampTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcRamp::IfcRamp(IfcAbstractEntity* e) : IfcBuildingElement((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRamp)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRamp::IfcRamp(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcRampTypeEnum::IfcRampTypeEnum > v9_PredefinedType) : IfcBuildingElement((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcRampTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRampFlight
-bool IfcRampFlight::hasPredefinedType() { return !entity->getArgument(8)->isNull(); }
-IfcRampFlightTypeEnum::IfcRampFlightTypeEnum IfcRampFlight::PredefinedType() { return IfcRampFlightTypeEnum::FromString(*entity->getArgument(8)); }
+bool IfcRampFlight::hasPredefinedType() const { return !entity->getArgument(8)->isNull(); }
+IfcRampFlightTypeEnum::IfcRampFlightTypeEnum IfcRampFlight::PredefinedType() const { return IfcRampFlightTypeEnum::FromString(*entity->getArgument(8)); }
 void IfcRampFlight::setPredefinedType(IfcRampFlightTypeEnum::IfcRampFlightTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcRampFlightTypeEnum::ToString(v)); }
 bool IfcRampFlight::is(Type::Enum v) const { return v == Type::IfcRampFlight || IfcBuildingElement::is(v); }
 Type::Enum IfcRampFlight::type() const { return Type::IfcRampFlight; }
 Type::Enum IfcRampFlight::Class() { return Type::IfcRampFlight; }
-IfcRampFlight::IfcRampFlight(IfcAbstractEntityPtr e) : IfcBuildingElement((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRampFlight)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRampFlight::IfcRampFlight(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcRampFlightTypeEnum::IfcRampFlightTypeEnum > v9_PredefinedType) : IfcBuildingElement((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcRampFlightTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcRampFlight::IfcRampFlight(IfcAbstractEntity* e) : IfcBuildingElement((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRampFlight)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRampFlight::IfcRampFlight(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcRampFlightTypeEnum::IfcRampFlightTypeEnum > v9_PredefinedType) : IfcBuildingElement((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcRampFlightTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRampFlightType
-IfcRampFlightTypeEnum::IfcRampFlightTypeEnum IfcRampFlightType::PredefinedType() { return IfcRampFlightTypeEnum::FromString(*entity->getArgument(9)); }
+IfcRampFlightTypeEnum::IfcRampFlightTypeEnum IfcRampFlightType::PredefinedType() const { return IfcRampFlightTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcRampFlightType::setPredefinedType(IfcRampFlightTypeEnum::IfcRampFlightTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcRampFlightTypeEnum::ToString(v)); }
 bool IfcRampFlightType::is(Type::Enum v) const { return v == Type::IfcRampFlightType || IfcBuildingElementType::is(v); }
 Type::Enum IfcRampFlightType::type() const { return Type::IfcRampFlightType; }
 Type::Enum IfcRampFlightType::Class() { return Type::IfcRampFlightType; }
-IfcRampFlightType::IfcRampFlightType(IfcAbstractEntityPtr e) : IfcBuildingElementType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRampFlightType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRampFlightType::IfcRampFlightType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcRampFlightTypeEnum::IfcRampFlightTypeEnum v10_PredefinedType) : IfcBuildingElementType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcRampFlightTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcRampFlightType::IfcRampFlightType(IfcAbstractEntity* e) : IfcBuildingElementType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRampFlightType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRampFlightType::IfcRampFlightType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcRampFlightTypeEnum::IfcRampFlightTypeEnum v10_PredefinedType) : IfcBuildingElementType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcRampFlightTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRampType
-IfcRampTypeEnum::IfcRampTypeEnum IfcRampType::PredefinedType() { return IfcRampTypeEnum::FromString(*entity->getArgument(9)); }
+IfcRampTypeEnum::IfcRampTypeEnum IfcRampType::PredefinedType() const { return IfcRampTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcRampType::setPredefinedType(IfcRampTypeEnum::IfcRampTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcRampTypeEnum::ToString(v)); }
 bool IfcRampType::is(Type::Enum v) const { return v == Type::IfcRampType || IfcBuildingElementType::is(v); }
 Type::Enum IfcRampType::type() const { return Type::IfcRampType; }
 Type::Enum IfcRampType::Class() { return Type::IfcRampType; }
-IfcRampType::IfcRampType(IfcAbstractEntityPtr e) : IfcBuildingElementType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRampType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRampType::IfcRampType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcRampTypeEnum::IfcRampTypeEnum v10_PredefinedType) : IfcBuildingElementType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcRampTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcRampType::IfcRampType(IfcAbstractEntity* e) : IfcBuildingElementType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRampType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRampType::IfcRampType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcRampTypeEnum::IfcRampTypeEnum v10_PredefinedType) : IfcBuildingElementType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcRampTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRationalBSplineCurveWithKnots
-std::vector< double > /*[2:?]*/ IfcRationalBSplineCurveWithKnots::WeightsData() { return *entity->getArgument(8); }
+std::vector< double > /*[2:?]*/ IfcRationalBSplineCurveWithKnots::WeightsData() const { return *entity->getArgument(8); }
 void IfcRationalBSplineCurveWithKnots::setWeightsData(std::vector< double > /*[2:?]*/ v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
 bool IfcRationalBSplineCurveWithKnots::is(Type::Enum v) const { return v == Type::IfcRationalBSplineCurveWithKnots || IfcBSplineCurveWithKnots::is(v); }
 Type::Enum IfcRationalBSplineCurveWithKnots::type() const { return Type::IfcRationalBSplineCurveWithKnots; }
 Type::Enum IfcRationalBSplineCurveWithKnots::Class() { return Type::IfcRationalBSplineCurveWithKnots; }
-IfcRationalBSplineCurveWithKnots::IfcRationalBSplineCurveWithKnots(IfcAbstractEntityPtr e) : IfcBSplineCurveWithKnots((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRationalBSplineCurveWithKnots)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRationalBSplineCurveWithKnots::IfcRationalBSplineCurveWithKnots(int v1_Degree, SHARED_PTR< IfcTemplatedEntityList< IfcCartesianPoint > > v2_ControlPointsList, IfcBSplineCurveForm::IfcBSplineCurveForm v3_CurveForm, bool v4_ClosedCurve, bool v5_SelfIntersect, std::vector< int > /*[2:?]*/ v6_KnotMultiplicities, std::vector< IfcParameterValue > /*[2:?]*/ v7_Knots, IfcKnotType::IfcKnotType v8_KnotSpec, std::vector< double > /*[2:?]*/ v9_WeightsData) : IfcBSplineCurveWithKnots((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Degree)); e->setArgument(1,(v2_ControlPointsList)->generalize()); e->setArgument(2,v3_CurveForm,IfcBSplineCurveForm::ToString(v3_CurveForm)); e->setArgument(3,(v4_ClosedCurve)); e->setArgument(4,(v5_SelfIntersect)); e->setArgument(5,(v6_KnotMultiplicities)); e->setArgument(6,(v7_Knots)); e->setArgument(7,v8_KnotSpec,IfcKnotType::ToString(v8_KnotSpec)); e->setArgument(8,(v9_WeightsData)); entity = e; EntityBuffer::Add(this); }
+IfcRationalBSplineCurveWithKnots::IfcRationalBSplineCurveWithKnots(IfcAbstractEntity* e) : IfcBSplineCurveWithKnots((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRationalBSplineCurveWithKnots)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRationalBSplineCurveWithKnots::IfcRationalBSplineCurveWithKnots(int v1_Degree, IfcTemplatedEntityList< IfcCartesianPoint >::ptr v2_ControlPointsList, IfcBSplineCurveForm::IfcBSplineCurveForm v3_CurveForm, bool v4_ClosedCurve, bool v5_SelfIntersect, std::vector< int > /*[2:?]*/ v6_KnotMultiplicities, std::vector< double > /*[2:?]*/ v7_Knots, IfcKnotType::IfcKnotType v8_KnotSpec, std::vector< double > /*[2:?]*/ v9_WeightsData) : IfcBSplineCurveWithKnots((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Degree)); e->setArgument(1,(v2_ControlPointsList)->generalize()); e->setArgument(2,v3_CurveForm,IfcBSplineCurveForm::ToString(v3_CurveForm)); e->setArgument(3,(v4_ClosedCurve)); e->setArgument(4,(v5_SelfIntersect)); e->setArgument(5,(v6_KnotMultiplicities)); e->setArgument(6,(v7_Knots)); e->setArgument(7,v8_KnotSpec,IfcKnotType::ToString(v8_KnotSpec)); e->setArgument(8,(v9_WeightsData)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRationalBSplineSurfaceWithKnots
 bool IfcRationalBSplineSurfaceWithKnots::is(Type::Enum v) const { return v == Type::IfcRationalBSplineSurfaceWithKnots || IfcBSplineSurfaceWithKnots::is(v); }
 Type::Enum IfcRationalBSplineSurfaceWithKnots::type() const { return Type::IfcRationalBSplineSurfaceWithKnots; }
 Type::Enum IfcRationalBSplineSurfaceWithKnots::Class() { return Type::IfcRationalBSplineSurfaceWithKnots; }
-IfcRationalBSplineSurfaceWithKnots::IfcRationalBSplineSurfaceWithKnots(IfcAbstractEntityPtr e) : IfcBSplineSurfaceWithKnots((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRationalBSplineSurfaceWithKnots)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRationalBSplineSurfaceWithKnots::IfcRationalBSplineSurfaceWithKnots(int v1_UDegree, int v2_VDegree, IfcBSplineSurfaceForm::IfcBSplineSurfaceForm v4_SurfaceForm, bool v5_UClosed, bool v6_VClosed, bool v7_SelfIntersect, std::vector< int > /*[2:?]*/ v8_UMultiplicities, std::vector< int > /*[2:?]*/ v9_VMultiplicities, std::vector< IfcParameterValue > /*[2:?]*/ v10_UKnots, std::vector< IfcParameterValue > /*[2:?]*/ v11_VKnots, IfcKnotType::IfcKnotType v12_KnotSpec) : IfcBSplineSurfaceWithKnots((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_UDegree)); e->setArgument(1,(v2_VDegree)); e->setArgument(3,v4_SurfaceForm,IfcBSplineSurfaceForm::ToString(v4_SurfaceForm)); e->setArgument(4,(v5_UClosed)); e->setArgument(5,(v6_VClosed)); e->setArgument(6,(v7_SelfIntersect)); e->setArgument(7,(v8_UMultiplicities)); e->setArgument(8,(v9_VMultiplicities)); e->setArgument(9,(v10_UKnots)); e->setArgument(10,(v11_VKnots)); e->setArgument(11,v12_KnotSpec,IfcKnotType::ToString(v12_KnotSpec)); entity = e; EntityBuffer::Add(this); }
+IfcRationalBSplineSurfaceWithKnots::IfcRationalBSplineSurfaceWithKnots(IfcAbstractEntity* e) : IfcBSplineSurfaceWithKnots((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRationalBSplineSurfaceWithKnots)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRationalBSplineSurfaceWithKnots::IfcRationalBSplineSurfaceWithKnots(int v1_UDegree, int v2_VDegree, IfcTemplatedEntityListList< IfcCartesianPoint >::ptr v3_ControlPointsList, IfcBSplineSurfaceForm::IfcBSplineSurfaceForm v4_SurfaceForm, bool v5_UClosed, bool v6_VClosed, bool v7_SelfIntersect, std::vector< int > /*[2:?]*/ v8_UMultiplicities, std::vector< int > /*[2:?]*/ v9_VMultiplicities, std::vector< double > /*[2:?]*/ v10_UKnots, std::vector< double > /*[2:?]*/ v11_VKnots, IfcKnotType::IfcKnotType v12_KnotSpec) : IfcBSplineSurfaceWithKnots((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_UDegree)); e->setArgument(1,(v2_VDegree)); e->setArgument(2,(v3_ControlPointsList)->generalize()); e->setArgument(3,v4_SurfaceForm,IfcBSplineSurfaceForm::ToString(v4_SurfaceForm)); e->setArgument(4,(v5_UClosed)); e->setArgument(5,(v6_VClosed)); e->setArgument(6,(v7_SelfIntersect)); e->setArgument(7,(v8_UMultiplicities)); e->setArgument(8,(v9_VMultiplicities)); e->setArgument(9,(v10_UKnots)); e->setArgument(10,(v11_VKnots)); e->setArgument(11,v12_KnotSpec,IfcKnotType::ToString(v12_KnotSpec)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRectangleHollowProfileDef
-IfcPositiveLengthMeasure IfcRectangleHollowProfileDef::WallThickness() { return *entity->getArgument(5); }
-void IfcRectangleHollowProfileDef::setWallThickness(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-bool IfcRectangleHollowProfileDef::hasInnerFilletRadius() { return !entity->getArgument(6)->isNull(); }
-IfcNonNegativeLengthMeasure IfcRectangleHollowProfileDef::InnerFilletRadius() { return *entity->getArgument(6); }
-void IfcRectangleHollowProfileDef::setInnerFilletRadius(IfcNonNegativeLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
-bool IfcRectangleHollowProfileDef::hasOuterFilletRadius() { return !entity->getArgument(7)->isNull(); }
-IfcNonNegativeLengthMeasure IfcRectangleHollowProfileDef::OuterFilletRadius() { return *entity->getArgument(7); }
-void IfcRectangleHollowProfileDef::setOuterFilletRadius(IfcNonNegativeLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
+double IfcRectangleHollowProfileDef::WallThickness() const { return *entity->getArgument(5); }
+void IfcRectangleHollowProfileDef::setWallThickness(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+bool IfcRectangleHollowProfileDef::hasInnerFilletRadius() const { return !entity->getArgument(6)->isNull(); }
+double IfcRectangleHollowProfileDef::InnerFilletRadius() const { return *entity->getArgument(6); }
+void IfcRectangleHollowProfileDef::setInnerFilletRadius(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
+bool IfcRectangleHollowProfileDef::hasOuterFilletRadius() const { return !entity->getArgument(7)->isNull(); }
+double IfcRectangleHollowProfileDef::OuterFilletRadius() const { return *entity->getArgument(7); }
+void IfcRectangleHollowProfileDef::setOuterFilletRadius(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
 bool IfcRectangleHollowProfileDef::is(Type::Enum v) const { return v == Type::IfcRectangleHollowProfileDef || IfcRectangleProfileDef::is(v); }
 Type::Enum IfcRectangleHollowProfileDef::type() const { return Type::IfcRectangleHollowProfileDef; }
 Type::Enum IfcRectangleHollowProfileDef::Class() { return Type::IfcRectangleHollowProfileDef; }
-IfcRectangleHollowProfileDef::IfcRectangleHollowProfileDef(IfcAbstractEntityPtr e) : IfcRectangleProfileDef((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRectangleHollowProfileDef)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRectangleHollowProfileDef::IfcRectangleHollowProfileDef(IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< IfcLabel > v2_ProfileName, IfcAxis2Placement2D* v3_Position, IfcPositiveLengthMeasure v4_XDim, IfcPositiveLengthMeasure v5_YDim, IfcPositiveLengthMeasure v6_WallThickness, boost::optional< IfcNonNegativeLengthMeasure > v7_InnerFilletRadius, boost::optional< IfcNonNegativeLengthMeasure > v8_OuterFilletRadius) : IfcRectangleProfileDef((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,v1_ProfileType,IfcProfileTypeEnum::ToString(v1_ProfileType)); if (v2_ProfileName) { e->setArgument(1,(*v2_ProfileName)); } else { e->setArgument(1); } e->setArgument(2,(v3_Position)); e->setArgument(3,(v4_XDim)); e->setArgument(4,(v5_YDim)); e->setArgument(5,(v6_WallThickness)); if (v7_InnerFilletRadius) { e->setArgument(6,(*v7_InnerFilletRadius)); } else { e->setArgument(6); } if (v8_OuterFilletRadius) { e->setArgument(7,(*v8_OuterFilletRadius)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
+IfcRectangleHollowProfileDef::IfcRectangleHollowProfileDef(IfcAbstractEntity* e) : IfcRectangleProfileDef((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRectangleHollowProfileDef)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRectangleHollowProfileDef::IfcRectangleHollowProfileDef(IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< std::string > v2_ProfileName, IfcAxis2Placement2D* v3_Position, double v4_XDim, double v5_YDim, double v6_WallThickness, boost::optional< double > v7_InnerFilletRadius, boost::optional< double > v8_OuterFilletRadius) : IfcRectangleProfileDef((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,v1_ProfileType,IfcProfileTypeEnum::ToString(v1_ProfileType)); if (v2_ProfileName) { e->setArgument(1,(*v2_ProfileName)); } else { e->setArgument(1); } e->setArgument(2,(v3_Position)); e->setArgument(3,(v4_XDim)); e->setArgument(4,(v5_YDim)); e->setArgument(5,(v6_WallThickness)); if (v7_InnerFilletRadius) { e->setArgument(6,(*v7_InnerFilletRadius)); } else { e->setArgument(6); } if (v8_OuterFilletRadius) { e->setArgument(7,(*v8_OuterFilletRadius)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRectangleProfileDef
-IfcPositiveLengthMeasure IfcRectangleProfileDef::XDim() { return *entity->getArgument(3); }
-void IfcRectangleProfileDef::setXDim(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-IfcPositiveLengthMeasure IfcRectangleProfileDef::YDim() { return *entity->getArgument(4); }
-void IfcRectangleProfileDef::setYDim(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+double IfcRectangleProfileDef::XDim() const { return *entity->getArgument(3); }
+void IfcRectangleProfileDef::setXDim(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+double IfcRectangleProfileDef::YDim() const { return *entity->getArgument(4); }
+void IfcRectangleProfileDef::setYDim(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
 bool IfcRectangleProfileDef::is(Type::Enum v) const { return v == Type::IfcRectangleProfileDef || IfcParameterizedProfileDef::is(v); }
 Type::Enum IfcRectangleProfileDef::type() const { return Type::IfcRectangleProfileDef; }
 Type::Enum IfcRectangleProfileDef::Class() { return Type::IfcRectangleProfileDef; }
-IfcRectangleProfileDef::IfcRectangleProfileDef(IfcAbstractEntityPtr e) : IfcParameterizedProfileDef((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRectangleProfileDef)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRectangleProfileDef::IfcRectangleProfileDef(IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< IfcLabel > v2_ProfileName, IfcAxis2Placement2D* v3_Position, IfcPositiveLengthMeasure v4_XDim, IfcPositiveLengthMeasure v5_YDim) : IfcParameterizedProfileDef((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,v1_ProfileType,IfcProfileTypeEnum::ToString(v1_ProfileType)); if (v2_ProfileName) { e->setArgument(1,(*v2_ProfileName)); } else { e->setArgument(1); } e->setArgument(2,(v3_Position)); e->setArgument(3,(v4_XDim)); e->setArgument(4,(v5_YDim)); entity = e; EntityBuffer::Add(this); }
+IfcRectangleProfileDef::IfcRectangleProfileDef(IfcAbstractEntity* e) : IfcParameterizedProfileDef((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRectangleProfileDef)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRectangleProfileDef::IfcRectangleProfileDef(IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< std::string > v2_ProfileName, IfcAxis2Placement2D* v3_Position, double v4_XDim, double v5_YDim) : IfcParameterizedProfileDef((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,v1_ProfileType,IfcProfileTypeEnum::ToString(v1_ProfileType)); if (v2_ProfileName) { e->setArgument(1,(*v2_ProfileName)); } else { e->setArgument(1); } e->setArgument(2,(v3_Position)); e->setArgument(3,(v4_XDim)); e->setArgument(4,(v5_YDim)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRectangularPyramid
-IfcPositiveLengthMeasure IfcRectangularPyramid::XLength() { return *entity->getArgument(1); }
-void IfcRectangularPyramid::setXLength(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-IfcPositiveLengthMeasure IfcRectangularPyramid::YLength() { return *entity->getArgument(2); }
-void IfcRectangularPyramid::setYLength(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-IfcPositiveLengthMeasure IfcRectangularPyramid::Height() { return *entity->getArgument(3); }
-void IfcRectangularPyramid::setHeight(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+double IfcRectangularPyramid::XLength() const { return *entity->getArgument(1); }
+void IfcRectangularPyramid::setXLength(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+double IfcRectangularPyramid::YLength() const { return *entity->getArgument(2); }
+void IfcRectangularPyramid::setYLength(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+double IfcRectangularPyramid::Height() const { return *entity->getArgument(3); }
+void IfcRectangularPyramid::setHeight(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
 bool IfcRectangularPyramid::is(Type::Enum v) const { return v == Type::IfcRectangularPyramid || IfcCsgPrimitive3D::is(v); }
 Type::Enum IfcRectangularPyramid::type() const { return Type::IfcRectangularPyramid; }
 Type::Enum IfcRectangularPyramid::Class() { return Type::IfcRectangularPyramid; }
-IfcRectangularPyramid::IfcRectangularPyramid(IfcAbstractEntityPtr e) : IfcCsgPrimitive3D((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRectangularPyramid)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRectangularPyramid::IfcRectangularPyramid(IfcAxis2Placement3D* v1_Position, IfcPositiveLengthMeasure v2_XLength, IfcPositiveLengthMeasure v3_YLength, IfcPositiveLengthMeasure v4_Height) : IfcCsgPrimitive3D((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Position)); e->setArgument(1,(v2_XLength)); e->setArgument(2,(v3_YLength)); e->setArgument(3,(v4_Height)); entity = e; EntityBuffer::Add(this); }
+IfcRectangularPyramid::IfcRectangularPyramid(IfcAbstractEntity* e) : IfcCsgPrimitive3D((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRectangularPyramid)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRectangularPyramid::IfcRectangularPyramid(IfcAxis2Placement3D* v1_Position, double v2_XLength, double v3_YLength, double v4_Height) : IfcCsgPrimitive3D((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Position)); e->setArgument(1,(v2_XLength)); e->setArgument(2,(v3_YLength)); e->setArgument(3,(v4_Height)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRectangularTrimmedSurface
-IfcSurface* IfcRectangularTrimmedSurface::BasisSurface() { return (IfcSurface*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(0))); }
+IfcSurface* IfcRectangularTrimmedSurface::BasisSurface() const { return (IfcSurface*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(0))); }
 void IfcRectangularTrimmedSurface::setBasisSurface(IfcSurface* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-IfcParameterValue IfcRectangularTrimmedSurface::U1() { return *entity->getArgument(1); }
-void IfcRectangularTrimmedSurface::setU1(IfcParameterValue v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-IfcParameterValue IfcRectangularTrimmedSurface::V1() { return *entity->getArgument(2); }
-void IfcRectangularTrimmedSurface::setV1(IfcParameterValue v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-IfcParameterValue IfcRectangularTrimmedSurface::U2() { return *entity->getArgument(3); }
-void IfcRectangularTrimmedSurface::setU2(IfcParameterValue v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-IfcParameterValue IfcRectangularTrimmedSurface::V2() { return *entity->getArgument(4); }
-void IfcRectangularTrimmedSurface::setV2(IfcParameterValue v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-bool IfcRectangularTrimmedSurface::Usense() { return *entity->getArgument(5); }
+double IfcRectangularTrimmedSurface::U1() const { return *entity->getArgument(1); }
+void IfcRectangularTrimmedSurface::setU1(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+double IfcRectangularTrimmedSurface::V1() const { return *entity->getArgument(2); }
+void IfcRectangularTrimmedSurface::setV1(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+double IfcRectangularTrimmedSurface::U2() const { return *entity->getArgument(3); }
+void IfcRectangularTrimmedSurface::setU2(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+double IfcRectangularTrimmedSurface::V2() const { return *entity->getArgument(4); }
+void IfcRectangularTrimmedSurface::setV2(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+bool IfcRectangularTrimmedSurface::Usense() const { return *entity->getArgument(5); }
 void IfcRectangularTrimmedSurface::setUsense(bool v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-bool IfcRectangularTrimmedSurface::Vsense() { return *entity->getArgument(6); }
+bool IfcRectangularTrimmedSurface::Vsense() const { return *entity->getArgument(6); }
 void IfcRectangularTrimmedSurface::setVsense(bool v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
 bool IfcRectangularTrimmedSurface::is(Type::Enum v) const { return v == Type::IfcRectangularTrimmedSurface || IfcBoundedSurface::is(v); }
 Type::Enum IfcRectangularTrimmedSurface::type() const { return Type::IfcRectangularTrimmedSurface; }
 Type::Enum IfcRectangularTrimmedSurface::Class() { return Type::IfcRectangularTrimmedSurface; }
-IfcRectangularTrimmedSurface::IfcRectangularTrimmedSurface(IfcAbstractEntityPtr e) : IfcBoundedSurface((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRectangularTrimmedSurface)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRectangularTrimmedSurface::IfcRectangularTrimmedSurface(IfcSurface* v1_BasisSurface, IfcParameterValue v2_U1, IfcParameterValue v3_V1, IfcParameterValue v4_U2, IfcParameterValue v5_V2, bool v6_Usense, bool v7_Vsense) : IfcBoundedSurface((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_BasisSurface)); e->setArgument(1,(v2_U1)); e->setArgument(2,(v3_V1)); e->setArgument(3,(v4_U2)); e->setArgument(4,(v5_V2)); e->setArgument(5,(v6_Usense)); e->setArgument(6,(v7_Vsense)); entity = e; EntityBuffer::Add(this); }
+IfcRectangularTrimmedSurface::IfcRectangularTrimmedSurface(IfcAbstractEntity* e) : IfcBoundedSurface((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRectangularTrimmedSurface)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRectangularTrimmedSurface::IfcRectangularTrimmedSurface(IfcSurface* v1_BasisSurface, double v2_U1, double v3_V1, double v4_U2, double v5_V2, bool v6_Usense, bool v7_Vsense) : IfcBoundedSurface((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_BasisSurface)); e->setArgument(1,(v2_U1)); e->setArgument(2,(v3_V1)); e->setArgument(3,(v4_U2)); e->setArgument(4,(v5_V2)); e->setArgument(5,(v6_Usense)); e->setArgument(6,(v7_Vsense)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRecurrencePattern
-IfcRecurrenceTypeEnum::IfcRecurrenceTypeEnum IfcRecurrencePattern::RecurrenceType() { return IfcRecurrenceTypeEnum::FromString(*entity->getArgument(0)); }
+IfcRecurrenceTypeEnum::IfcRecurrenceTypeEnum IfcRecurrencePattern::RecurrenceType() const { return IfcRecurrenceTypeEnum::FromString(*entity->getArgument(0)); }
 void IfcRecurrencePattern::setRecurrenceType(IfcRecurrenceTypeEnum::IfcRecurrenceTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v,IfcRecurrenceTypeEnum::ToString(v)); }
-bool IfcRecurrencePattern::hasDayComponent() { return !entity->getArgument(1)->isNull(); }
-std::vector< IfcDayInMonthNumber > /*[1:?]*/ IfcRecurrencePattern::DayComponent() { return *entity->getArgument(1); }
-void IfcRecurrencePattern::setDayComponent(std::vector< IfcDayInMonthNumber > /*[1:?]*/ v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-bool IfcRecurrencePattern::hasWeekdayComponent() { return !entity->getArgument(2)->isNull(); }
-std::vector< IfcDayInWeekNumber > /*[1:?]*/ IfcRecurrencePattern::WeekdayComponent() { return *entity->getArgument(2); }
-void IfcRecurrencePattern::setWeekdayComponent(std::vector< IfcDayInWeekNumber > /*[1:?]*/ v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-bool IfcRecurrencePattern::hasMonthComponent() { return !entity->getArgument(3)->isNull(); }
-std::vector< IfcMonthInYearNumber > /*[1:?]*/ IfcRecurrencePattern::MonthComponent() { return *entity->getArgument(3); }
-void IfcRecurrencePattern::setMonthComponent(std::vector< IfcMonthInYearNumber > /*[1:?]*/ v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-bool IfcRecurrencePattern::hasPosition() { return !entity->getArgument(4)->isNull(); }
-IfcInteger IfcRecurrencePattern::Position() { return *entity->getArgument(4); }
-void IfcRecurrencePattern::setPosition(IfcInteger v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-bool IfcRecurrencePattern::hasInterval() { return !entity->getArgument(5)->isNull(); }
-IfcInteger IfcRecurrencePattern::Interval() { return *entity->getArgument(5); }
-void IfcRecurrencePattern::setInterval(IfcInteger v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-bool IfcRecurrencePattern::hasOccurrences() { return !entity->getArgument(6)->isNull(); }
-IfcInteger IfcRecurrencePattern::Occurrences() { return *entity->getArgument(6); }
-void IfcRecurrencePattern::setOccurrences(IfcInteger v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
-bool IfcRecurrencePattern::hasTimePeriods() { return !entity->getArgument(7)->isNull(); }
-SHARED_PTR< IfcTemplatedEntityList< IfcTimePeriod > > IfcRecurrencePattern::TimePeriods() { RETURN_AS_LIST(IfcTimePeriod,7) }
-void IfcRecurrencePattern::setTimePeriods(SHARED_PTR< IfcTemplatedEntityList< IfcTimePeriod > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v->generalize()); }
+bool IfcRecurrencePattern::hasDayComponent() const { return !entity->getArgument(1)->isNull(); }
+std::vector< int > /*[1:?]*/ IfcRecurrencePattern::DayComponent() const { return *entity->getArgument(1); }
+void IfcRecurrencePattern::setDayComponent(std::vector< int > /*[1:?]*/ v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+bool IfcRecurrencePattern::hasWeekdayComponent() const { return !entity->getArgument(2)->isNull(); }
+std::vector< int > /*[1:?]*/ IfcRecurrencePattern::WeekdayComponent() const { return *entity->getArgument(2); }
+void IfcRecurrencePattern::setWeekdayComponent(std::vector< int > /*[1:?]*/ v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+bool IfcRecurrencePattern::hasMonthComponent() const { return !entity->getArgument(3)->isNull(); }
+std::vector< int > /*[1:?]*/ IfcRecurrencePattern::MonthComponent() const { return *entity->getArgument(3); }
+void IfcRecurrencePattern::setMonthComponent(std::vector< int > /*[1:?]*/ v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+bool IfcRecurrencePattern::hasPosition() const { return !entity->getArgument(4)->isNull(); }
+int IfcRecurrencePattern::Position() const { return *entity->getArgument(4); }
+void IfcRecurrencePattern::setPosition(int v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+bool IfcRecurrencePattern::hasInterval() const { return !entity->getArgument(5)->isNull(); }
+int IfcRecurrencePattern::Interval() const { return *entity->getArgument(5); }
+void IfcRecurrencePattern::setInterval(int v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+bool IfcRecurrencePattern::hasOccurrences() const { return !entity->getArgument(6)->isNull(); }
+int IfcRecurrencePattern::Occurrences() const { return *entity->getArgument(6); }
+void IfcRecurrencePattern::setOccurrences(int v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
+bool IfcRecurrencePattern::hasTimePeriods() const { return !entity->getArgument(7)->isNull(); }
+IfcTemplatedEntityList< IfcTimePeriod >::ptr IfcRecurrencePattern::TimePeriods() const { IfcEntityList::ptr es = *entity->getArgument(7); return es->as<IfcTimePeriod>(); }
+void IfcRecurrencePattern::setTimePeriods(IfcTemplatedEntityList< IfcTimePeriod >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v->generalize()); }
 bool IfcRecurrencePattern::is(Type::Enum v) const { return v == Type::IfcRecurrencePattern; }
 Type::Enum IfcRecurrencePattern::type() const { return Type::IfcRecurrencePattern; }
 Type::Enum IfcRecurrencePattern::Class() { return Type::IfcRecurrencePattern; }
-IfcRecurrencePattern::IfcRecurrencePattern(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcRecurrencePattern)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRecurrencePattern::IfcRecurrencePattern(IfcRecurrenceTypeEnum::IfcRecurrenceTypeEnum v1_RecurrenceType, boost::optional< std::vector< IfcDayInMonthNumber > /*[1:?]*/ > v2_DayComponent, boost::optional< std::vector< IfcDayInWeekNumber > /*[1:?]*/ > v3_WeekdayComponent, boost::optional< std::vector< IfcMonthInYearNumber > /*[1:?]*/ > v4_MonthComponent, boost::optional< IfcInteger > v5_Position, boost::optional< IfcInteger > v6_Interval, boost::optional< IfcInteger > v7_Occurrences, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcTimePeriod > > > v8_TimePeriods) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,v1_RecurrenceType,IfcRecurrenceTypeEnum::ToString(v1_RecurrenceType)); if (v2_DayComponent) { e->setArgument(1,(*v2_DayComponent)); } else { e->setArgument(1); } if (v3_WeekdayComponent) { e->setArgument(2,(*v3_WeekdayComponent)); } else { e->setArgument(2); } if (v4_MonthComponent) { e->setArgument(3,(*v4_MonthComponent)); } else { e->setArgument(3); } if (v5_Position) { e->setArgument(4,(*v5_Position)); } else { e->setArgument(4); } if (v6_Interval) { e->setArgument(5,(*v6_Interval)); } else { e->setArgument(5); } if (v7_Occurrences) { e->setArgument(6,(*v7_Occurrences)); } else { e->setArgument(6); } if (v8_TimePeriods) { e->setArgument(7,(*v8_TimePeriods)->generalize()); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
+IfcRecurrencePattern::IfcRecurrencePattern(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcRecurrencePattern)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRecurrencePattern::IfcRecurrencePattern(IfcRecurrenceTypeEnum::IfcRecurrenceTypeEnum v1_RecurrenceType, boost::optional< std::vector< int > /*[1:?]*/ > v2_DayComponent, boost::optional< std::vector< int > /*[1:?]*/ > v3_WeekdayComponent, boost::optional< std::vector< int > /*[1:?]*/ > v4_MonthComponent, boost::optional< int > v5_Position, boost::optional< int > v6_Interval, boost::optional< int > v7_Occurrences, boost::optional< IfcTemplatedEntityList< IfcTimePeriod >::ptr > v8_TimePeriods) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,v1_RecurrenceType,IfcRecurrenceTypeEnum::ToString(v1_RecurrenceType)); if (v2_DayComponent) { e->setArgument(1,(*v2_DayComponent)); } else { e->setArgument(1); } if (v3_WeekdayComponent) { e->setArgument(2,(*v3_WeekdayComponent)); } else { e->setArgument(2); } if (v4_MonthComponent) { e->setArgument(3,(*v4_MonthComponent)); } else { e->setArgument(3); } if (v5_Position) { e->setArgument(4,(*v5_Position)); } else { e->setArgument(4); } if (v6_Interval) { e->setArgument(5,(*v6_Interval)); } else { e->setArgument(5); } if (v7_Occurrences) { e->setArgument(6,(*v7_Occurrences)); } else { e->setArgument(6); } if (v8_TimePeriods) { e->setArgument(7,(*v8_TimePeriods)->generalize()); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcReference
-bool IfcReference::hasTypeIdentifier() { return !entity->getArgument(0)->isNull(); }
-IfcIdentifier IfcReference::TypeIdentifier() { return *entity->getArgument(0); }
-void IfcReference::setTypeIdentifier(IfcIdentifier v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-bool IfcReference::hasAttributeIdentifier() { return !entity->getArgument(1)->isNull(); }
-IfcIdentifier IfcReference::AttributeIdentifier() { return *entity->getArgument(1); }
-void IfcReference::setAttributeIdentifier(IfcIdentifier v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-bool IfcReference::hasInstanceName() { return !entity->getArgument(2)->isNull(); }
-IfcLabel IfcReference::InstanceName() { return *entity->getArgument(2); }
-void IfcReference::setInstanceName(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-bool IfcReference::hasListPositions() { return !entity->getArgument(3)->isNull(); }
-std::vector< int > /*[1:?]*/ IfcReference::ListPositions() { return *entity->getArgument(3); }
+bool IfcReference::hasTypeIdentifier() const { return !entity->getArgument(0)->isNull(); }
+std::string IfcReference::TypeIdentifier() const { return *entity->getArgument(0); }
+void IfcReference::setTypeIdentifier(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+bool IfcReference::hasAttributeIdentifier() const { return !entity->getArgument(1)->isNull(); }
+std::string IfcReference::AttributeIdentifier() const { return *entity->getArgument(1); }
+void IfcReference::setAttributeIdentifier(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+bool IfcReference::hasInstanceName() const { return !entity->getArgument(2)->isNull(); }
+std::string IfcReference::InstanceName() const { return *entity->getArgument(2); }
+void IfcReference::setInstanceName(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+bool IfcReference::hasListPositions() const { return !entity->getArgument(3)->isNull(); }
+std::vector< int > /*[1:?]*/ IfcReference::ListPositions() const { return *entity->getArgument(3); }
 void IfcReference::setListPositions(std::vector< int > /*[1:?]*/ v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-bool IfcReference::hasInnerReference() { return !entity->getArgument(4)->isNull(); }
-IfcReference* IfcReference::InnerReference() { return (IfcReference*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(4))); }
+bool IfcReference::hasInnerReference() const { return !entity->getArgument(4)->isNull(); }
+IfcReference* IfcReference::InnerReference() const { return (IfcReference*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(4))); }
 void IfcReference::setInnerReference(IfcReference* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
 bool IfcReference::is(Type::Enum v) const { return v == Type::IfcReference; }
 Type::Enum IfcReference::type() const { return Type::IfcReference; }
 Type::Enum IfcReference::Class() { return Type::IfcReference; }
-IfcReference::IfcReference(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcReference)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcReference::IfcReference(boost::optional< IfcIdentifier > v1_TypeIdentifier, boost::optional< IfcIdentifier > v2_AttributeIdentifier, boost::optional< IfcLabel > v3_InstanceName, boost::optional< std::vector< int > /*[1:?]*/ > v4_ListPositions, IfcReference* v5_InnerReference) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_TypeIdentifier) { e->setArgument(0,(*v1_TypeIdentifier)); } else { e->setArgument(0); } if (v2_AttributeIdentifier) { e->setArgument(1,(*v2_AttributeIdentifier)); } else { e->setArgument(1); } if (v3_InstanceName) { e->setArgument(2,(*v3_InstanceName)); } else { e->setArgument(2); } if (v4_ListPositions) { e->setArgument(3,(*v4_ListPositions)); } else { e->setArgument(3); } e->setArgument(4,(v5_InnerReference)); entity = e; EntityBuffer::Add(this); }
+IfcReference::IfcReference(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcReference)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcReference::IfcReference(boost::optional< std::string > v1_TypeIdentifier, boost::optional< std::string > v2_AttributeIdentifier, boost::optional< std::string > v3_InstanceName, boost::optional< std::vector< int > /*[1:?]*/ > v4_ListPositions, IfcReference* v5_InnerReference) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_TypeIdentifier) { e->setArgument(0,(*v1_TypeIdentifier)); } else { e->setArgument(0); } if (v2_AttributeIdentifier) { e->setArgument(1,(*v2_AttributeIdentifier)); } else { e->setArgument(1); } if (v3_InstanceName) { e->setArgument(2,(*v3_InstanceName)); } else { e->setArgument(2); } if (v4_ListPositions) { e->setArgument(3,(*v4_ListPositions)); } else { e->setArgument(3); } e->setArgument(4,(v5_InnerReference)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRegularTimeSeries
-IfcTimeMeasure IfcRegularTimeSeries::TimeStep() { return *entity->getArgument(8); }
-void IfcRegularTimeSeries::setTimeStep(IfcTimeMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
-SHARED_PTR< IfcTemplatedEntityList< IfcTimeSeriesValue > > IfcRegularTimeSeries::Values() { RETURN_AS_LIST(IfcTimeSeriesValue,9) }
-void IfcRegularTimeSeries::setValues(SHARED_PTR< IfcTemplatedEntityList< IfcTimeSeriesValue > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v->generalize()); }
+double IfcRegularTimeSeries::TimeStep() const { return *entity->getArgument(8); }
+void IfcRegularTimeSeries::setTimeStep(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
+IfcTemplatedEntityList< IfcTimeSeriesValue >::ptr IfcRegularTimeSeries::Values() const { IfcEntityList::ptr es = *entity->getArgument(9); return es->as<IfcTimeSeriesValue>(); }
+void IfcRegularTimeSeries::setValues(IfcTemplatedEntityList< IfcTimeSeriesValue >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v->generalize()); }
 bool IfcRegularTimeSeries::is(Type::Enum v) const { return v == Type::IfcRegularTimeSeries || IfcTimeSeries::is(v); }
 Type::Enum IfcRegularTimeSeries::type() const { return Type::IfcRegularTimeSeries; }
 Type::Enum IfcRegularTimeSeries::Class() { return Type::IfcRegularTimeSeries; }
-IfcRegularTimeSeries::IfcRegularTimeSeries(IfcAbstractEntityPtr e) : IfcTimeSeries((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRegularTimeSeries)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRegularTimeSeries::IfcRegularTimeSeries(IfcLabel v1_Name, boost::optional< IfcText > v2_Description, IfcDateTime v3_StartTime, IfcDateTime v4_EndTime, IfcTimeSeriesDataTypeEnum::IfcTimeSeriesDataTypeEnum v5_TimeSeriesDataType, IfcDataOriginEnum::IfcDataOriginEnum v6_DataOrigin, boost::optional< IfcLabel > v7_UserDefinedDataOrigin, boost::optional< IfcUnit > v8_Unit, IfcTimeMeasure v9_TimeStep, SHARED_PTR< IfcTemplatedEntityList< IfcTimeSeriesValue > > v10_Values) : IfcTimeSeries((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_StartTime)); e->setArgument(3,(v4_EndTime)); e->setArgument(4,v5_TimeSeriesDataType,IfcTimeSeriesDataTypeEnum::ToString(v5_TimeSeriesDataType)); e->setArgument(5,v6_DataOrigin,IfcDataOriginEnum::ToString(v6_DataOrigin)); if (v7_UserDefinedDataOrigin) { e->setArgument(6,(*v7_UserDefinedDataOrigin)); } else { e->setArgument(6); } if (v8_Unit) { e->setArgument(7,(*v8_Unit)); } else { e->setArgument(7); } e->setArgument(8,(v9_TimeStep)); e->setArgument(9,(v10_Values)->generalize()); entity = e; EntityBuffer::Add(this); }
+IfcRegularTimeSeries::IfcRegularTimeSeries(IfcAbstractEntity* e) : IfcTimeSeries((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRegularTimeSeries)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRegularTimeSeries::IfcRegularTimeSeries(std::string v1_Name, boost::optional< std::string > v2_Description, std::string v3_StartTime, std::string v4_EndTime, IfcTimeSeriesDataTypeEnum::IfcTimeSeriesDataTypeEnum v5_TimeSeriesDataType, IfcDataOriginEnum::IfcDataOriginEnum v6_DataOrigin, boost::optional< std::string > v7_UserDefinedDataOrigin, IfcUnit* v8_Unit, double v9_TimeStep, IfcTemplatedEntityList< IfcTimeSeriesValue >::ptr v10_Values) : IfcTimeSeries((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_StartTime)); e->setArgument(3,(v4_EndTime)); e->setArgument(4,v5_TimeSeriesDataType,IfcTimeSeriesDataTypeEnum::ToString(v5_TimeSeriesDataType)); e->setArgument(5,v6_DataOrigin,IfcDataOriginEnum::ToString(v6_DataOrigin)); if (v7_UserDefinedDataOrigin) { e->setArgument(6,(*v7_UserDefinedDataOrigin)); } else { e->setArgument(6); } e->setArgument(7,(v8_Unit)); e->setArgument(8,(v9_TimeStep)); e->setArgument(9,(v10_Values)->generalize()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcReinforcementBarProperties
-IfcAreaMeasure IfcReinforcementBarProperties::TotalCrossSectionArea() { return *entity->getArgument(0); }
-void IfcReinforcementBarProperties::setTotalCrossSectionArea(IfcAreaMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-IfcLabel IfcReinforcementBarProperties::SteelGrade() { return *entity->getArgument(1); }
-void IfcReinforcementBarProperties::setSteelGrade(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-bool IfcReinforcementBarProperties::hasBarSurface() { return !entity->getArgument(2)->isNull(); }
-IfcReinforcingBarSurfaceEnum::IfcReinforcingBarSurfaceEnum IfcReinforcementBarProperties::BarSurface() { return IfcReinforcingBarSurfaceEnum::FromString(*entity->getArgument(2)); }
+double IfcReinforcementBarProperties::TotalCrossSectionArea() const { return *entity->getArgument(0); }
+void IfcReinforcementBarProperties::setTotalCrossSectionArea(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+std::string IfcReinforcementBarProperties::SteelGrade() const { return *entity->getArgument(1); }
+void IfcReinforcementBarProperties::setSteelGrade(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+bool IfcReinforcementBarProperties::hasBarSurface() const { return !entity->getArgument(2)->isNull(); }
+IfcReinforcingBarSurfaceEnum::IfcReinforcingBarSurfaceEnum IfcReinforcementBarProperties::BarSurface() const { return IfcReinforcingBarSurfaceEnum::FromString(*entity->getArgument(2)); }
 void IfcReinforcementBarProperties::setBarSurface(IfcReinforcingBarSurfaceEnum::IfcReinforcingBarSurfaceEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v,IfcReinforcingBarSurfaceEnum::ToString(v)); }
-bool IfcReinforcementBarProperties::hasEffectiveDepth() { return !entity->getArgument(3)->isNull(); }
-IfcLengthMeasure IfcReinforcementBarProperties::EffectiveDepth() { return *entity->getArgument(3); }
-void IfcReinforcementBarProperties::setEffectiveDepth(IfcLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-bool IfcReinforcementBarProperties::hasNominalBarDiameter() { return !entity->getArgument(4)->isNull(); }
-IfcPositiveLengthMeasure IfcReinforcementBarProperties::NominalBarDiameter() { return *entity->getArgument(4); }
-void IfcReinforcementBarProperties::setNominalBarDiameter(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-bool IfcReinforcementBarProperties::hasBarCount() { return !entity->getArgument(5)->isNull(); }
-IfcCountMeasure IfcReinforcementBarProperties::BarCount() { return *entity->getArgument(5); }
-void IfcReinforcementBarProperties::setBarCount(IfcCountMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+bool IfcReinforcementBarProperties::hasEffectiveDepth() const { return !entity->getArgument(3)->isNull(); }
+double IfcReinforcementBarProperties::EffectiveDepth() const { return *entity->getArgument(3); }
+void IfcReinforcementBarProperties::setEffectiveDepth(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+bool IfcReinforcementBarProperties::hasNominalBarDiameter() const { return !entity->getArgument(4)->isNull(); }
+double IfcReinforcementBarProperties::NominalBarDiameter() const { return *entity->getArgument(4); }
+void IfcReinforcementBarProperties::setNominalBarDiameter(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+bool IfcReinforcementBarProperties::hasBarCount() const { return !entity->getArgument(5)->isNull(); }
+double IfcReinforcementBarProperties::BarCount() const { return *entity->getArgument(5); }
+void IfcReinforcementBarProperties::setBarCount(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
 bool IfcReinforcementBarProperties::is(Type::Enum v) const { return v == Type::IfcReinforcementBarProperties || IfcPreDefinedProperties::is(v); }
 Type::Enum IfcReinforcementBarProperties::type() const { return Type::IfcReinforcementBarProperties; }
 Type::Enum IfcReinforcementBarProperties::Class() { return Type::IfcReinforcementBarProperties; }
-IfcReinforcementBarProperties::IfcReinforcementBarProperties(IfcAbstractEntityPtr e) : IfcPreDefinedProperties((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcReinforcementBarProperties)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcReinforcementBarProperties::IfcReinforcementBarProperties(IfcAreaMeasure v1_TotalCrossSectionArea, IfcLabel v2_SteelGrade, boost::optional< IfcReinforcingBarSurfaceEnum::IfcReinforcingBarSurfaceEnum > v3_BarSurface, boost::optional< IfcLengthMeasure > v4_EffectiveDepth, boost::optional< IfcPositiveLengthMeasure > v5_NominalBarDiameter, boost::optional< IfcCountMeasure > v6_BarCount) : IfcPreDefinedProperties((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_TotalCrossSectionArea)); e->setArgument(1,(v2_SteelGrade)); if (v3_BarSurface) { e->setArgument(2,*v3_BarSurface,IfcReinforcingBarSurfaceEnum::ToString(*v3_BarSurface)); } else { e->setArgument(2); } if (v4_EffectiveDepth) { e->setArgument(3,(*v4_EffectiveDepth)); } else { e->setArgument(3); } if (v5_NominalBarDiameter) { e->setArgument(4,(*v5_NominalBarDiameter)); } else { e->setArgument(4); } if (v6_BarCount) { e->setArgument(5,(*v6_BarCount)); } else { e->setArgument(5); } entity = e; EntityBuffer::Add(this); }
+IfcReinforcementBarProperties::IfcReinforcementBarProperties(IfcAbstractEntity* e) : IfcPreDefinedProperties((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcReinforcementBarProperties)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcReinforcementBarProperties::IfcReinforcementBarProperties(double v1_TotalCrossSectionArea, std::string v2_SteelGrade, boost::optional< IfcReinforcingBarSurfaceEnum::IfcReinforcingBarSurfaceEnum > v3_BarSurface, boost::optional< double > v4_EffectiveDepth, boost::optional< double > v5_NominalBarDiameter, boost::optional< double > v6_BarCount) : IfcPreDefinedProperties((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_TotalCrossSectionArea)); e->setArgument(1,(v2_SteelGrade)); if (v3_BarSurface) { e->setArgument(2,*v3_BarSurface,IfcReinforcingBarSurfaceEnum::ToString(*v3_BarSurface)); } else { e->setArgument(2); } if (v4_EffectiveDepth) { e->setArgument(3,(*v4_EffectiveDepth)); } else { e->setArgument(3); } if (v5_NominalBarDiameter) { e->setArgument(4,(*v5_NominalBarDiameter)); } else { e->setArgument(4); } if (v6_BarCount) { e->setArgument(5,(*v6_BarCount)); } else { e->setArgument(5); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcReinforcementDefinitionProperties
-bool IfcReinforcementDefinitionProperties::hasDefinitionType() { return !entity->getArgument(4)->isNull(); }
-IfcLabel IfcReinforcementDefinitionProperties::DefinitionType() { return *entity->getArgument(4); }
-void IfcReinforcementDefinitionProperties::setDefinitionType(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-SHARED_PTR< IfcTemplatedEntityList< IfcSectionReinforcementProperties > > IfcReinforcementDefinitionProperties::ReinforcementSectionDefinitions() { RETURN_AS_LIST(IfcSectionReinforcementProperties,5) }
-void IfcReinforcementDefinitionProperties::setReinforcementSectionDefinitions(SHARED_PTR< IfcTemplatedEntityList< IfcSectionReinforcementProperties > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v->generalize()); }
+bool IfcReinforcementDefinitionProperties::hasDefinitionType() const { return !entity->getArgument(4)->isNull(); }
+std::string IfcReinforcementDefinitionProperties::DefinitionType() const { return *entity->getArgument(4); }
+void IfcReinforcementDefinitionProperties::setDefinitionType(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+IfcTemplatedEntityList< IfcSectionReinforcementProperties >::ptr IfcReinforcementDefinitionProperties::ReinforcementSectionDefinitions() const { IfcEntityList::ptr es = *entity->getArgument(5); return es->as<IfcSectionReinforcementProperties>(); }
+void IfcReinforcementDefinitionProperties::setReinforcementSectionDefinitions(IfcTemplatedEntityList< IfcSectionReinforcementProperties >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v->generalize()); }
 bool IfcReinforcementDefinitionProperties::is(Type::Enum v) const { return v == Type::IfcReinforcementDefinitionProperties || IfcPreDefinedPropertySet::is(v); }
 Type::Enum IfcReinforcementDefinitionProperties::type() const { return Type::IfcReinforcementDefinitionProperties; }
 Type::Enum IfcReinforcementDefinitionProperties::Class() { return Type::IfcReinforcementDefinitionProperties; }
-IfcReinforcementDefinitionProperties::IfcReinforcementDefinitionProperties(IfcAbstractEntityPtr e) : IfcPreDefinedPropertySet((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcReinforcementDefinitionProperties)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcReinforcementDefinitionProperties::IfcReinforcementDefinitionProperties(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_DefinitionType, SHARED_PTR< IfcTemplatedEntityList< IfcSectionReinforcementProperties > > v6_ReinforcementSectionDefinitions) : IfcPreDefinedPropertySet((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_DefinitionType) { e->setArgument(4,(*v5_DefinitionType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ReinforcementSectionDefinitions)->generalize()); entity = e; EntityBuffer::Add(this); }
+IfcReinforcementDefinitionProperties::IfcReinforcementDefinitionProperties(IfcAbstractEntity* e) : IfcPreDefinedPropertySet((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcReinforcementDefinitionProperties)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcReinforcementDefinitionProperties::IfcReinforcementDefinitionProperties(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_DefinitionType, IfcTemplatedEntityList< IfcSectionReinforcementProperties >::ptr v6_ReinforcementSectionDefinitions) : IfcPreDefinedPropertySet((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_DefinitionType) { e->setArgument(4,(*v5_DefinitionType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ReinforcementSectionDefinitions)->generalize()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcReinforcingBar
-bool IfcReinforcingBar::hasNominalDiameter() { return !entity->getArgument(9)->isNull(); }
-IfcPositiveLengthMeasure IfcReinforcingBar::NominalDiameter() { return *entity->getArgument(9); }
-void IfcReinforcingBar::setNominalDiameter(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
-bool IfcReinforcingBar::hasCrossSectionArea() { return !entity->getArgument(10)->isNull(); }
-IfcAreaMeasure IfcReinforcingBar::CrossSectionArea() { return *entity->getArgument(10); }
-void IfcReinforcingBar::setCrossSectionArea(IfcAreaMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
-bool IfcReinforcingBar::hasBarLength() { return !entity->getArgument(11)->isNull(); }
-IfcPositiveLengthMeasure IfcReinforcingBar::BarLength() { return *entity->getArgument(11); }
-void IfcReinforcingBar::setBarLength(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(11,v); }
-bool IfcReinforcingBar::hasPredefinedType() { return !entity->getArgument(12)->isNull(); }
-IfcReinforcingBarTypeEnum::IfcReinforcingBarTypeEnum IfcReinforcingBar::PredefinedType() { return IfcReinforcingBarTypeEnum::FromString(*entity->getArgument(12)); }
+bool IfcReinforcingBar::hasNominalDiameter() const { return !entity->getArgument(9)->isNull(); }
+double IfcReinforcingBar::NominalDiameter() const { return *entity->getArgument(9); }
+void IfcReinforcingBar::setNominalDiameter(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
+bool IfcReinforcingBar::hasCrossSectionArea() const { return !entity->getArgument(10)->isNull(); }
+double IfcReinforcingBar::CrossSectionArea() const { return *entity->getArgument(10); }
+void IfcReinforcingBar::setCrossSectionArea(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
+bool IfcReinforcingBar::hasBarLength() const { return !entity->getArgument(11)->isNull(); }
+double IfcReinforcingBar::BarLength() const { return *entity->getArgument(11); }
+void IfcReinforcingBar::setBarLength(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(11,v); }
+bool IfcReinforcingBar::hasPredefinedType() const { return !entity->getArgument(12)->isNull(); }
+IfcReinforcingBarTypeEnum::IfcReinforcingBarTypeEnum IfcReinforcingBar::PredefinedType() const { return IfcReinforcingBarTypeEnum::FromString(*entity->getArgument(12)); }
 void IfcReinforcingBar::setPredefinedType(IfcReinforcingBarTypeEnum::IfcReinforcingBarTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(12,v,IfcReinforcingBarTypeEnum::ToString(v)); }
-bool IfcReinforcingBar::hasBarSurface() { return !entity->getArgument(13)->isNull(); }
-IfcReinforcingBarSurfaceEnum::IfcReinforcingBarSurfaceEnum IfcReinforcingBar::BarSurface() { return IfcReinforcingBarSurfaceEnum::FromString(*entity->getArgument(13)); }
+bool IfcReinforcingBar::hasBarSurface() const { return !entity->getArgument(13)->isNull(); }
+IfcReinforcingBarSurfaceEnum::IfcReinforcingBarSurfaceEnum IfcReinforcingBar::BarSurface() const { return IfcReinforcingBarSurfaceEnum::FromString(*entity->getArgument(13)); }
 void IfcReinforcingBar::setBarSurface(IfcReinforcingBarSurfaceEnum::IfcReinforcingBarSurfaceEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(13,v,IfcReinforcingBarSurfaceEnum::ToString(v)); }
 bool IfcReinforcingBar::is(Type::Enum v) const { return v == Type::IfcReinforcingBar || IfcReinforcingElement::is(v); }
 Type::Enum IfcReinforcingBar::type() const { return Type::IfcReinforcingBar; }
 Type::Enum IfcReinforcingBar::Class() { return Type::IfcReinforcingBar; }
-IfcReinforcingBar::IfcReinforcingBar(IfcAbstractEntityPtr e) : IfcReinforcingElement((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcReinforcingBar)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcReinforcingBar::IfcReinforcingBar(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcLabel > v9_SteelGrade, boost::optional< IfcPositiveLengthMeasure > v10_NominalDiameter, boost::optional< IfcAreaMeasure > v11_CrossSectionArea, boost::optional< IfcPositiveLengthMeasure > v12_BarLength, boost::optional< IfcReinforcingBarTypeEnum::IfcReinforcingBarTypeEnum > v13_PredefinedType, boost::optional< IfcReinforcingBarSurfaceEnum::IfcReinforcingBarSurfaceEnum > v14_BarSurface) : IfcReinforcingElement((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_SteelGrade) { e->setArgument(8,(*v9_SteelGrade)); } else { e->setArgument(8); } if (v10_NominalDiameter) { e->setArgument(9,(*v10_NominalDiameter)); } else { e->setArgument(9); } if (v11_CrossSectionArea) { e->setArgument(10,(*v11_CrossSectionArea)); } else { e->setArgument(10); } if (v12_BarLength) { e->setArgument(11,(*v12_BarLength)); } else { e->setArgument(11); } if (v13_PredefinedType) { e->setArgument(12,*v13_PredefinedType,IfcReinforcingBarTypeEnum::ToString(*v13_PredefinedType)); } else { e->setArgument(12); } if (v14_BarSurface) { e->setArgument(13,*v14_BarSurface,IfcReinforcingBarSurfaceEnum::ToString(*v14_BarSurface)); } else { e->setArgument(13); } entity = e; EntityBuffer::Add(this); }
+IfcReinforcingBar::IfcReinforcingBar(IfcAbstractEntity* e) : IfcReinforcingElement((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcReinforcingBar)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcReinforcingBar::IfcReinforcingBar(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_SteelGrade, boost::optional< double > v10_NominalDiameter, boost::optional< double > v11_CrossSectionArea, boost::optional< double > v12_BarLength, boost::optional< IfcReinforcingBarTypeEnum::IfcReinforcingBarTypeEnum > v13_PredefinedType, boost::optional< IfcReinforcingBarSurfaceEnum::IfcReinforcingBarSurfaceEnum > v14_BarSurface) : IfcReinforcingElement((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_SteelGrade) { e->setArgument(8,(*v9_SteelGrade)); } else { e->setArgument(8); } if (v10_NominalDiameter) { e->setArgument(9,(*v10_NominalDiameter)); } else { e->setArgument(9); } if (v11_CrossSectionArea) { e->setArgument(10,(*v11_CrossSectionArea)); } else { e->setArgument(10); } if (v12_BarLength) { e->setArgument(11,(*v12_BarLength)); } else { e->setArgument(11); } if (v13_PredefinedType) { e->setArgument(12,*v13_PredefinedType,IfcReinforcingBarTypeEnum::ToString(*v13_PredefinedType)); } else { e->setArgument(12); } if (v14_BarSurface) { e->setArgument(13,*v14_BarSurface,IfcReinforcingBarSurfaceEnum::ToString(*v14_BarSurface)); } else { e->setArgument(13); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcReinforcingBarType
-IfcReinforcingBarTypeEnum::IfcReinforcingBarTypeEnum IfcReinforcingBarType::PredefinedType() { return IfcReinforcingBarTypeEnum::FromString(*entity->getArgument(9)); }
+IfcReinforcingBarTypeEnum::IfcReinforcingBarTypeEnum IfcReinforcingBarType::PredefinedType() const { return IfcReinforcingBarTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcReinforcingBarType::setPredefinedType(IfcReinforcingBarTypeEnum::IfcReinforcingBarTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcReinforcingBarTypeEnum::ToString(v)); }
-bool IfcReinforcingBarType::hasNominalDiameter() { return !entity->getArgument(10)->isNull(); }
-IfcPositiveLengthMeasure IfcReinforcingBarType::NominalDiameter() { return *entity->getArgument(10); }
-void IfcReinforcingBarType::setNominalDiameter(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
-bool IfcReinforcingBarType::hasCrossSectionArea() { return !entity->getArgument(11)->isNull(); }
-IfcAreaMeasure IfcReinforcingBarType::CrossSectionArea() { return *entity->getArgument(11); }
-void IfcReinforcingBarType::setCrossSectionArea(IfcAreaMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(11,v); }
-bool IfcReinforcingBarType::hasBarLength() { return !entity->getArgument(12)->isNull(); }
-IfcPositiveLengthMeasure IfcReinforcingBarType::BarLength() { return *entity->getArgument(12); }
-void IfcReinforcingBarType::setBarLength(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(12,v); }
-bool IfcReinforcingBarType::hasBarSurface() { return !entity->getArgument(13)->isNull(); }
-IfcReinforcingBarSurfaceEnum::IfcReinforcingBarSurfaceEnum IfcReinforcingBarType::BarSurface() { return IfcReinforcingBarSurfaceEnum::FromString(*entity->getArgument(13)); }
+bool IfcReinforcingBarType::hasNominalDiameter() const { return !entity->getArgument(10)->isNull(); }
+double IfcReinforcingBarType::NominalDiameter() const { return *entity->getArgument(10); }
+void IfcReinforcingBarType::setNominalDiameter(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
+bool IfcReinforcingBarType::hasCrossSectionArea() const { return !entity->getArgument(11)->isNull(); }
+double IfcReinforcingBarType::CrossSectionArea() const { return *entity->getArgument(11); }
+void IfcReinforcingBarType::setCrossSectionArea(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(11,v); }
+bool IfcReinforcingBarType::hasBarLength() const { return !entity->getArgument(12)->isNull(); }
+double IfcReinforcingBarType::BarLength() const { return *entity->getArgument(12); }
+void IfcReinforcingBarType::setBarLength(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(12,v); }
+bool IfcReinforcingBarType::hasBarSurface() const { return !entity->getArgument(13)->isNull(); }
+IfcReinforcingBarSurfaceEnum::IfcReinforcingBarSurfaceEnum IfcReinforcingBarType::BarSurface() const { return IfcReinforcingBarSurfaceEnum::FromString(*entity->getArgument(13)); }
 void IfcReinforcingBarType::setBarSurface(IfcReinforcingBarSurfaceEnum::IfcReinforcingBarSurfaceEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(13,v,IfcReinforcingBarSurfaceEnum::ToString(v)); }
-bool IfcReinforcingBarType::hasBendingShapeCode() { return !entity->getArgument(14)->isNull(); }
-IfcLabel IfcReinforcingBarType::BendingShapeCode() { return *entity->getArgument(14); }
-void IfcReinforcingBarType::setBendingShapeCode(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(14,v); }
-bool IfcReinforcingBarType::hasBendingParameters() { return !entity->getArgument(15)->isNull(); }
-SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > IfcReinforcingBarType::BendingParameters() { RETURN_AS_LIST(IfcUtil::IfcAbstractSelect,15) }
-void IfcReinforcingBarType::setBendingParameters(SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(15,v->generalize()); }
+bool IfcReinforcingBarType::hasBendingShapeCode() const { return !entity->getArgument(14)->isNull(); }
+std::string IfcReinforcingBarType::BendingShapeCode() const { return *entity->getArgument(14); }
+void IfcReinforcingBarType::setBendingShapeCode(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(14,v); }
+bool IfcReinforcingBarType::hasBendingParameters() const { return !entity->getArgument(15)->isNull(); }
+IfcEntityList::ptr IfcReinforcingBarType::BendingParameters() const { return *entity->getArgument(15); }
+void IfcReinforcingBarType::setBendingParameters(IfcEntityList::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(15,v); }
 bool IfcReinforcingBarType::is(Type::Enum v) const { return v == Type::IfcReinforcingBarType || IfcReinforcingElementType::is(v); }
 Type::Enum IfcReinforcingBarType::type() const { return Type::IfcReinforcingBarType; }
 Type::Enum IfcReinforcingBarType::Class() { return Type::IfcReinforcingBarType; }
-IfcReinforcingBarType::IfcReinforcingBarType(IfcAbstractEntityPtr e) : IfcReinforcingElementType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcReinforcingBarType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcReinforcingBarType::IfcReinforcingBarType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcReinforcingBarTypeEnum::IfcReinforcingBarTypeEnum v10_PredefinedType, boost::optional< IfcPositiveLengthMeasure > v11_NominalDiameter, boost::optional< IfcAreaMeasure > v12_CrossSectionArea, boost::optional< IfcPositiveLengthMeasure > v13_BarLength, boost::optional< IfcReinforcingBarSurfaceEnum::IfcReinforcingBarSurfaceEnum > v14_BarSurface, boost::optional< IfcLabel > v15_BendingShapeCode, boost::optional< IfcEntities > v16_BendingParameters) : IfcReinforcingElementType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcReinforcingBarTypeEnum::ToString(v10_PredefinedType)); if (v11_NominalDiameter) { e->setArgument(10,(*v11_NominalDiameter)); } else { e->setArgument(10); } if (v12_CrossSectionArea) { e->setArgument(11,(*v12_CrossSectionArea)); } else { e->setArgument(11); } if (v13_BarLength) { e->setArgument(12,(*v13_BarLength)); } else { e->setArgument(12); } if (v14_BarSurface) { e->setArgument(13,*v14_BarSurface,IfcReinforcingBarSurfaceEnum::ToString(*v14_BarSurface)); } else { e->setArgument(13); } if (v15_BendingShapeCode) { e->setArgument(14,(*v15_BendingShapeCode)); } else { e->setArgument(14); } if (v16_BendingParameters) { e->setArgument(15,(*v16_BendingParameters)); } else { e->setArgument(15); } entity = e; EntityBuffer::Add(this); }
+IfcReinforcingBarType::IfcReinforcingBarType(IfcAbstractEntity* e) : IfcReinforcingElementType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcReinforcingBarType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcReinforcingBarType::IfcReinforcingBarType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcReinforcingBarTypeEnum::IfcReinforcingBarTypeEnum v10_PredefinedType, boost::optional< double > v11_NominalDiameter, boost::optional< double > v12_CrossSectionArea, boost::optional< double > v13_BarLength, boost::optional< IfcReinforcingBarSurfaceEnum::IfcReinforcingBarSurfaceEnum > v14_BarSurface, boost::optional< std::string > v15_BendingShapeCode, boost::optional< IfcEntityList::ptr > v16_BendingParameters) : IfcReinforcingElementType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcReinforcingBarTypeEnum::ToString(v10_PredefinedType)); if (v11_NominalDiameter) { e->setArgument(10,(*v11_NominalDiameter)); } else { e->setArgument(10); } if (v12_CrossSectionArea) { e->setArgument(11,(*v12_CrossSectionArea)); } else { e->setArgument(11); } if (v13_BarLength) { e->setArgument(12,(*v13_BarLength)); } else { e->setArgument(12); } if (v14_BarSurface) { e->setArgument(13,*v14_BarSurface,IfcReinforcingBarSurfaceEnum::ToString(*v14_BarSurface)); } else { e->setArgument(13); } if (v15_BendingShapeCode) { e->setArgument(14,(*v15_BendingShapeCode)); } else { e->setArgument(14); } if (v16_BendingParameters) { e->setArgument(15,(*v16_BendingParameters)); } else { e->setArgument(15); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcReinforcingElement
-bool IfcReinforcingElement::hasSteelGrade() { return !entity->getArgument(8)->isNull(); }
-IfcLabel IfcReinforcingElement::SteelGrade() { return *entity->getArgument(8); }
-void IfcReinforcingElement::setSteelGrade(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
+bool IfcReinforcingElement::hasSteelGrade() const { return !entity->getArgument(8)->isNull(); }
+std::string IfcReinforcingElement::SteelGrade() const { return *entity->getArgument(8); }
+void IfcReinforcingElement::setSteelGrade(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
 bool IfcReinforcingElement::is(Type::Enum v) const { return v == Type::IfcReinforcingElement || IfcElementComponent::is(v); }
 Type::Enum IfcReinforcingElement::type() const { return Type::IfcReinforcingElement; }
 Type::Enum IfcReinforcingElement::Class() { return Type::IfcReinforcingElement; }
-IfcReinforcingElement::IfcReinforcingElement(IfcAbstractEntityPtr e) : IfcElementComponent((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcReinforcingElement)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcReinforcingElement::IfcReinforcingElement(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcLabel > v9_SteelGrade) : IfcElementComponent((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_SteelGrade) { e->setArgument(8,(*v9_SteelGrade)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcReinforcingElement::IfcReinforcingElement(IfcAbstractEntity* e) : IfcElementComponent((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcReinforcingElement)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcReinforcingElement::IfcReinforcingElement(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_SteelGrade) : IfcElementComponent((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_SteelGrade) { e->setArgument(8,(*v9_SteelGrade)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcReinforcingElementType
 bool IfcReinforcingElementType::is(Type::Enum v) const { return v == Type::IfcReinforcingElementType || IfcElementComponentType::is(v); }
 Type::Enum IfcReinforcingElementType::type() const { return Type::IfcReinforcingElementType; }
 Type::Enum IfcReinforcingElementType::Class() { return Type::IfcReinforcingElementType; }
-IfcReinforcingElementType::IfcReinforcingElementType(IfcAbstractEntityPtr e) : IfcElementComponentType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcReinforcingElementType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcReinforcingElementType::IfcReinforcingElementType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType) : IfcElementComponentType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcReinforcingElementType::IfcReinforcingElementType(IfcAbstractEntity* e) : IfcElementComponentType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcReinforcingElementType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcReinforcingElementType::IfcReinforcingElementType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType) : IfcElementComponentType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcReinforcingMesh
-bool IfcReinforcingMesh::hasMeshLength() { return !entity->getArgument(9)->isNull(); }
-IfcPositiveLengthMeasure IfcReinforcingMesh::MeshLength() { return *entity->getArgument(9); }
-void IfcReinforcingMesh::setMeshLength(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
-bool IfcReinforcingMesh::hasMeshWidth() { return !entity->getArgument(10)->isNull(); }
-IfcPositiveLengthMeasure IfcReinforcingMesh::MeshWidth() { return *entity->getArgument(10); }
-void IfcReinforcingMesh::setMeshWidth(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
-bool IfcReinforcingMesh::hasLongitudinalBarNominalDiameter() { return !entity->getArgument(11)->isNull(); }
-IfcPositiveLengthMeasure IfcReinforcingMesh::LongitudinalBarNominalDiameter() { return *entity->getArgument(11); }
-void IfcReinforcingMesh::setLongitudinalBarNominalDiameter(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(11,v); }
-bool IfcReinforcingMesh::hasTransverseBarNominalDiameter() { return !entity->getArgument(12)->isNull(); }
-IfcPositiveLengthMeasure IfcReinforcingMesh::TransverseBarNominalDiameter() { return *entity->getArgument(12); }
-void IfcReinforcingMesh::setTransverseBarNominalDiameter(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(12,v); }
-bool IfcReinforcingMesh::hasLongitudinalBarCrossSectionArea() { return !entity->getArgument(13)->isNull(); }
-IfcAreaMeasure IfcReinforcingMesh::LongitudinalBarCrossSectionArea() { return *entity->getArgument(13); }
-void IfcReinforcingMesh::setLongitudinalBarCrossSectionArea(IfcAreaMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(13,v); }
-bool IfcReinforcingMesh::hasTransverseBarCrossSectionArea() { return !entity->getArgument(14)->isNull(); }
-IfcAreaMeasure IfcReinforcingMesh::TransverseBarCrossSectionArea() { return *entity->getArgument(14); }
-void IfcReinforcingMesh::setTransverseBarCrossSectionArea(IfcAreaMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(14,v); }
-bool IfcReinforcingMesh::hasLongitudinalBarSpacing() { return !entity->getArgument(15)->isNull(); }
-IfcPositiveLengthMeasure IfcReinforcingMesh::LongitudinalBarSpacing() { return *entity->getArgument(15); }
-void IfcReinforcingMesh::setLongitudinalBarSpacing(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(15,v); }
-bool IfcReinforcingMesh::hasTransverseBarSpacing() { return !entity->getArgument(16)->isNull(); }
-IfcPositiveLengthMeasure IfcReinforcingMesh::TransverseBarSpacing() { return *entity->getArgument(16); }
-void IfcReinforcingMesh::setTransverseBarSpacing(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(16,v); }
-bool IfcReinforcingMesh::hasPredefinedType() { return !entity->getArgument(17)->isNull(); }
-IfcReinforcingMeshTypeEnum::IfcReinforcingMeshTypeEnum IfcReinforcingMesh::PredefinedType() { return IfcReinforcingMeshTypeEnum::FromString(*entity->getArgument(17)); }
+bool IfcReinforcingMesh::hasMeshLength() const { return !entity->getArgument(9)->isNull(); }
+double IfcReinforcingMesh::MeshLength() const { return *entity->getArgument(9); }
+void IfcReinforcingMesh::setMeshLength(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
+bool IfcReinforcingMesh::hasMeshWidth() const { return !entity->getArgument(10)->isNull(); }
+double IfcReinforcingMesh::MeshWidth() const { return *entity->getArgument(10); }
+void IfcReinforcingMesh::setMeshWidth(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
+bool IfcReinforcingMesh::hasLongitudinalBarNominalDiameter() const { return !entity->getArgument(11)->isNull(); }
+double IfcReinforcingMesh::LongitudinalBarNominalDiameter() const { return *entity->getArgument(11); }
+void IfcReinforcingMesh::setLongitudinalBarNominalDiameter(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(11,v); }
+bool IfcReinforcingMesh::hasTransverseBarNominalDiameter() const { return !entity->getArgument(12)->isNull(); }
+double IfcReinforcingMesh::TransverseBarNominalDiameter() const { return *entity->getArgument(12); }
+void IfcReinforcingMesh::setTransverseBarNominalDiameter(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(12,v); }
+bool IfcReinforcingMesh::hasLongitudinalBarCrossSectionArea() const { return !entity->getArgument(13)->isNull(); }
+double IfcReinforcingMesh::LongitudinalBarCrossSectionArea() const { return *entity->getArgument(13); }
+void IfcReinforcingMesh::setLongitudinalBarCrossSectionArea(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(13,v); }
+bool IfcReinforcingMesh::hasTransverseBarCrossSectionArea() const { return !entity->getArgument(14)->isNull(); }
+double IfcReinforcingMesh::TransverseBarCrossSectionArea() const { return *entity->getArgument(14); }
+void IfcReinforcingMesh::setTransverseBarCrossSectionArea(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(14,v); }
+bool IfcReinforcingMesh::hasLongitudinalBarSpacing() const { return !entity->getArgument(15)->isNull(); }
+double IfcReinforcingMesh::LongitudinalBarSpacing() const { return *entity->getArgument(15); }
+void IfcReinforcingMesh::setLongitudinalBarSpacing(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(15,v); }
+bool IfcReinforcingMesh::hasTransverseBarSpacing() const { return !entity->getArgument(16)->isNull(); }
+double IfcReinforcingMesh::TransverseBarSpacing() const { return *entity->getArgument(16); }
+void IfcReinforcingMesh::setTransverseBarSpacing(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(16,v); }
+bool IfcReinforcingMesh::hasPredefinedType() const { return !entity->getArgument(17)->isNull(); }
+IfcReinforcingMeshTypeEnum::IfcReinforcingMeshTypeEnum IfcReinforcingMesh::PredefinedType() const { return IfcReinforcingMeshTypeEnum::FromString(*entity->getArgument(17)); }
 void IfcReinforcingMesh::setPredefinedType(IfcReinforcingMeshTypeEnum::IfcReinforcingMeshTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(17,v,IfcReinforcingMeshTypeEnum::ToString(v)); }
 bool IfcReinforcingMesh::is(Type::Enum v) const { return v == Type::IfcReinforcingMesh || IfcReinforcingElement::is(v); }
 Type::Enum IfcReinforcingMesh::type() const { return Type::IfcReinforcingMesh; }
 Type::Enum IfcReinforcingMesh::Class() { return Type::IfcReinforcingMesh; }
-IfcReinforcingMesh::IfcReinforcingMesh(IfcAbstractEntityPtr e) : IfcReinforcingElement((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcReinforcingMesh)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcReinforcingMesh::IfcReinforcingMesh(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcLabel > v9_SteelGrade, boost::optional< IfcPositiveLengthMeasure > v10_MeshLength, boost::optional< IfcPositiveLengthMeasure > v11_MeshWidth, boost::optional< IfcPositiveLengthMeasure > v12_LongitudinalBarNominalDiameter, boost::optional< IfcPositiveLengthMeasure > v13_TransverseBarNominalDiameter, boost::optional< IfcAreaMeasure > v14_LongitudinalBarCrossSectionArea, boost::optional< IfcAreaMeasure > v15_TransverseBarCrossSectionArea, boost::optional< IfcPositiveLengthMeasure > v16_LongitudinalBarSpacing, boost::optional< IfcPositiveLengthMeasure > v17_TransverseBarSpacing, boost::optional< IfcReinforcingMeshTypeEnum::IfcReinforcingMeshTypeEnum > v18_PredefinedType) : IfcReinforcingElement((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_SteelGrade) { e->setArgument(8,(*v9_SteelGrade)); } else { e->setArgument(8); } if (v10_MeshLength) { e->setArgument(9,(*v10_MeshLength)); } else { e->setArgument(9); } if (v11_MeshWidth) { e->setArgument(10,(*v11_MeshWidth)); } else { e->setArgument(10); } if (v12_LongitudinalBarNominalDiameter) { e->setArgument(11,(*v12_LongitudinalBarNominalDiameter)); } else { e->setArgument(11); } if (v13_TransverseBarNominalDiameter) { e->setArgument(12,(*v13_TransverseBarNominalDiameter)); } else { e->setArgument(12); } if (v14_LongitudinalBarCrossSectionArea) { e->setArgument(13,(*v14_LongitudinalBarCrossSectionArea)); } else { e->setArgument(13); } if (v15_TransverseBarCrossSectionArea) { e->setArgument(14,(*v15_TransverseBarCrossSectionArea)); } else { e->setArgument(14); } if (v16_LongitudinalBarSpacing) { e->setArgument(15,(*v16_LongitudinalBarSpacing)); } else { e->setArgument(15); } if (v17_TransverseBarSpacing) { e->setArgument(16,(*v17_TransverseBarSpacing)); } else { e->setArgument(16); } if (v18_PredefinedType) { e->setArgument(17,*v18_PredefinedType,IfcReinforcingMeshTypeEnum::ToString(*v18_PredefinedType)); } else { e->setArgument(17); } entity = e; EntityBuffer::Add(this); }
+IfcReinforcingMesh::IfcReinforcingMesh(IfcAbstractEntity* e) : IfcReinforcingElement((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcReinforcingMesh)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcReinforcingMesh::IfcReinforcingMesh(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_SteelGrade, boost::optional< double > v10_MeshLength, boost::optional< double > v11_MeshWidth, boost::optional< double > v12_LongitudinalBarNominalDiameter, boost::optional< double > v13_TransverseBarNominalDiameter, boost::optional< double > v14_LongitudinalBarCrossSectionArea, boost::optional< double > v15_TransverseBarCrossSectionArea, boost::optional< double > v16_LongitudinalBarSpacing, boost::optional< double > v17_TransverseBarSpacing, boost::optional< IfcReinforcingMeshTypeEnum::IfcReinforcingMeshTypeEnum > v18_PredefinedType) : IfcReinforcingElement((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_SteelGrade) { e->setArgument(8,(*v9_SteelGrade)); } else { e->setArgument(8); } if (v10_MeshLength) { e->setArgument(9,(*v10_MeshLength)); } else { e->setArgument(9); } if (v11_MeshWidth) { e->setArgument(10,(*v11_MeshWidth)); } else { e->setArgument(10); } if (v12_LongitudinalBarNominalDiameter) { e->setArgument(11,(*v12_LongitudinalBarNominalDiameter)); } else { e->setArgument(11); } if (v13_TransverseBarNominalDiameter) { e->setArgument(12,(*v13_TransverseBarNominalDiameter)); } else { e->setArgument(12); } if (v14_LongitudinalBarCrossSectionArea) { e->setArgument(13,(*v14_LongitudinalBarCrossSectionArea)); } else { e->setArgument(13); } if (v15_TransverseBarCrossSectionArea) { e->setArgument(14,(*v15_TransverseBarCrossSectionArea)); } else { e->setArgument(14); } if (v16_LongitudinalBarSpacing) { e->setArgument(15,(*v16_LongitudinalBarSpacing)); } else { e->setArgument(15); } if (v17_TransverseBarSpacing) { e->setArgument(16,(*v17_TransverseBarSpacing)); } else { e->setArgument(16); } if (v18_PredefinedType) { e->setArgument(17,*v18_PredefinedType,IfcReinforcingMeshTypeEnum::ToString(*v18_PredefinedType)); } else { e->setArgument(17); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcReinforcingMeshType
-IfcReinforcingMeshTypeEnum::IfcReinforcingMeshTypeEnum IfcReinforcingMeshType::PredefinedType() { return IfcReinforcingMeshTypeEnum::FromString(*entity->getArgument(9)); }
+IfcReinforcingMeshTypeEnum::IfcReinforcingMeshTypeEnum IfcReinforcingMeshType::PredefinedType() const { return IfcReinforcingMeshTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcReinforcingMeshType::setPredefinedType(IfcReinforcingMeshTypeEnum::IfcReinforcingMeshTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcReinforcingMeshTypeEnum::ToString(v)); }
-bool IfcReinforcingMeshType::hasMeshLength() { return !entity->getArgument(10)->isNull(); }
-IfcPositiveLengthMeasure IfcReinforcingMeshType::MeshLength() { return *entity->getArgument(10); }
-void IfcReinforcingMeshType::setMeshLength(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
-bool IfcReinforcingMeshType::hasMeshWidth() { return !entity->getArgument(11)->isNull(); }
-IfcPositiveLengthMeasure IfcReinforcingMeshType::MeshWidth() { return *entity->getArgument(11); }
-void IfcReinforcingMeshType::setMeshWidth(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(11,v); }
-bool IfcReinforcingMeshType::hasLongitudinalBarNominalDiameter() { return !entity->getArgument(12)->isNull(); }
-IfcPositiveLengthMeasure IfcReinforcingMeshType::LongitudinalBarNominalDiameter() { return *entity->getArgument(12); }
-void IfcReinforcingMeshType::setLongitudinalBarNominalDiameter(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(12,v); }
-bool IfcReinforcingMeshType::hasTransverseBarNominalDiameter() { return !entity->getArgument(13)->isNull(); }
-IfcPositiveLengthMeasure IfcReinforcingMeshType::TransverseBarNominalDiameter() { return *entity->getArgument(13); }
-void IfcReinforcingMeshType::setTransverseBarNominalDiameter(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(13,v); }
-bool IfcReinforcingMeshType::hasLongitudinalBarCrossSectionArea() { return !entity->getArgument(14)->isNull(); }
-IfcAreaMeasure IfcReinforcingMeshType::LongitudinalBarCrossSectionArea() { return *entity->getArgument(14); }
-void IfcReinforcingMeshType::setLongitudinalBarCrossSectionArea(IfcAreaMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(14,v); }
-bool IfcReinforcingMeshType::hasTransverseBarCrossSectionArea() { return !entity->getArgument(15)->isNull(); }
-IfcAreaMeasure IfcReinforcingMeshType::TransverseBarCrossSectionArea() { return *entity->getArgument(15); }
-void IfcReinforcingMeshType::setTransverseBarCrossSectionArea(IfcAreaMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(15,v); }
-bool IfcReinforcingMeshType::hasLongitudinalBarSpacing() { return !entity->getArgument(16)->isNull(); }
-IfcPositiveLengthMeasure IfcReinforcingMeshType::LongitudinalBarSpacing() { return *entity->getArgument(16); }
-void IfcReinforcingMeshType::setLongitudinalBarSpacing(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(16,v); }
-bool IfcReinforcingMeshType::hasTransverseBarSpacing() { return !entity->getArgument(17)->isNull(); }
-IfcPositiveLengthMeasure IfcReinforcingMeshType::TransverseBarSpacing() { return *entity->getArgument(17); }
-void IfcReinforcingMeshType::setTransverseBarSpacing(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(17,v); }
-bool IfcReinforcingMeshType::hasBendingShapeCode() { return !entity->getArgument(18)->isNull(); }
-IfcLabel IfcReinforcingMeshType::BendingShapeCode() { return *entity->getArgument(18); }
-void IfcReinforcingMeshType::setBendingShapeCode(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(18,v); }
-bool IfcReinforcingMeshType::hasBendingParameters() { return !entity->getArgument(19)->isNull(); }
-SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > IfcReinforcingMeshType::BendingParameters() { RETURN_AS_LIST(IfcUtil::IfcAbstractSelect,19) }
-void IfcReinforcingMeshType::setBendingParameters(SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(19,v->generalize()); }
+bool IfcReinforcingMeshType::hasMeshLength() const { return !entity->getArgument(10)->isNull(); }
+double IfcReinforcingMeshType::MeshLength() const { return *entity->getArgument(10); }
+void IfcReinforcingMeshType::setMeshLength(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
+bool IfcReinforcingMeshType::hasMeshWidth() const { return !entity->getArgument(11)->isNull(); }
+double IfcReinforcingMeshType::MeshWidth() const { return *entity->getArgument(11); }
+void IfcReinforcingMeshType::setMeshWidth(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(11,v); }
+bool IfcReinforcingMeshType::hasLongitudinalBarNominalDiameter() const { return !entity->getArgument(12)->isNull(); }
+double IfcReinforcingMeshType::LongitudinalBarNominalDiameter() const { return *entity->getArgument(12); }
+void IfcReinforcingMeshType::setLongitudinalBarNominalDiameter(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(12,v); }
+bool IfcReinforcingMeshType::hasTransverseBarNominalDiameter() const { return !entity->getArgument(13)->isNull(); }
+double IfcReinforcingMeshType::TransverseBarNominalDiameter() const { return *entity->getArgument(13); }
+void IfcReinforcingMeshType::setTransverseBarNominalDiameter(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(13,v); }
+bool IfcReinforcingMeshType::hasLongitudinalBarCrossSectionArea() const { return !entity->getArgument(14)->isNull(); }
+double IfcReinforcingMeshType::LongitudinalBarCrossSectionArea() const { return *entity->getArgument(14); }
+void IfcReinforcingMeshType::setLongitudinalBarCrossSectionArea(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(14,v); }
+bool IfcReinforcingMeshType::hasTransverseBarCrossSectionArea() const { return !entity->getArgument(15)->isNull(); }
+double IfcReinforcingMeshType::TransverseBarCrossSectionArea() const { return *entity->getArgument(15); }
+void IfcReinforcingMeshType::setTransverseBarCrossSectionArea(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(15,v); }
+bool IfcReinforcingMeshType::hasLongitudinalBarSpacing() const { return !entity->getArgument(16)->isNull(); }
+double IfcReinforcingMeshType::LongitudinalBarSpacing() const { return *entity->getArgument(16); }
+void IfcReinforcingMeshType::setLongitudinalBarSpacing(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(16,v); }
+bool IfcReinforcingMeshType::hasTransverseBarSpacing() const { return !entity->getArgument(17)->isNull(); }
+double IfcReinforcingMeshType::TransverseBarSpacing() const { return *entity->getArgument(17); }
+void IfcReinforcingMeshType::setTransverseBarSpacing(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(17,v); }
+bool IfcReinforcingMeshType::hasBendingShapeCode() const { return !entity->getArgument(18)->isNull(); }
+std::string IfcReinforcingMeshType::BendingShapeCode() const { return *entity->getArgument(18); }
+void IfcReinforcingMeshType::setBendingShapeCode(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(18,v); }
+bool IfcReinforcingMeshType::hasBendingParameters() const { return !entity->getArgument(19)->isNull(); }
+IfcEntityList::ptr IfcReinforcingMeshType::BendingParameters() const { return *entity->getArgument(19); }
+void IfcReinforcingMeshType::setBendingParameters(IfcEntityList::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(19,v); }
 bool IfcReinforcingMeshType::is(Type::Enum v) const { return v == Type::IfcReinforcingMeshType || IfcReinforcingElementType::is(v); }
 Type::Enum IfcReinforcingMeshType::type() const { return Type::IfcReinforcingMeshType; }
 Type::Enum IfcReinforcingMeshType::Class() { return Type::IfcReinforcingMeshType; }
-IfcReinforcingMeshType::IfcReinforcingMeshType(IfcAbstractEntityPtr e) : IfcReinforcingElementType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcReinforcingMeshType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcReinforcingMeshType::IfcReinforcingMeshType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcReinforcingMeshTypeEnum::IfcReinforcingMeshTypeEnum v10_PredefinedType, boost::optional< IfcPositiveLengthMeasure > v11_MeshLength, boost::optional< IfcPositiveLengthMeasure > v12_MeshWidth, boost::optional< IfcPositiveLengthMeasure > v13_LongitudinalBarNominalDiameter, boost::optional< IfcPositiveLengthMeasure > v14_TransverseBarNominalDiameter, boost::optional< IfcAreaMeasure > v15_LongitudinalBarCrossSectionArea, boost::optional< IfcAreaMeasure > v16_TransverseBarCrossSectionArea, boost::optional< IfcPositiveLengthMeasure > v17_LongitudinalBarSpacing, boost::optional< IfcPositiveLengthMeasure > v18_TransverseBarSpacing, boost::optional< IfcLabel > v19_BendingShapeCode, boost::optional< IfcEntities > v20_BendingParameters) : IfcReinforcingElementType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcReinforcingMeshTypeEnum::ToString(v10_PredefinedType)); if (v11_MeshLength) { e->setArgument(10,(*v11_MeshLength)); } else { e->setArgument(10); } if (v12_MeshWidth) { e->setArgument(11,(*v12_MeshWidth)); } else { e->setArgument(11); } if (v13_LongitudinalBarNominalDiameter) { e->setArgument(12,(*v13_LongitudinalBarNominalDiameter)); } else { e->setArgument(12); } if (v14_TransverseBarNominalDiameter) { e->setArgument(13,(*v14_TransverseBarNominalDiameter)); } else { e->setArgument(13); } if (v15_LongitudinalBarCrossSectionArea) { e->setArgument(14,(*v15_LongitudinalBarCrossSectionArea)); } else { e->setArgument(14); } if (v16_TransverseBarCrossSectionArea) { e->setArgument(15,(*v16_TransverseBarCrossSectionArea)); } else { e->setArgument(15); } if (v17_LongitudinalBarSpacing) { e->setArgument(16,(*v17_LongitudinalBarSpacing)); } else { e->setArgument(16); } if (v18_TransverseBarSpacing) { e->setArgument(17,(*v18_TransverseBarSpacing)); } else { e->setArgument(17); } if (v19_BendingShapeCode) { e->setArgument(18,(*v19_BendingShapeCode)); } else { e->setArgument(18); } if (v20_BendingParameters) { e->setArgument(19,(*v20_BendingParameters)); } else { e->setArgument(19); } entity = e; EntityBuffer::Add(this); }
+IfcReinforcingMeshType::IfcReinforcingMeshType(IfcAbstractEntity* e) : IfcReinforcingElementType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcReinforcingMeshType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcReinforcingMeshType::IfcReinforcingMeshType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcReinforcingMeshTypeEnum::IfcReinforcingMeshTypeEnum v10_PredefinedType, boost::optional< double > v11_MeshLength, boost::optional< double > v12_MeshWidth, boost::optional< double > v13_LongitudinalBarNominalDiameter, boost::optional< double > v14_TransverseBarNominalDiameter, boost::optional< double > v15_LongitudinalBarCrossSectionArea, boost::optional< double > v16_TransverseBarCrossSectionArea, boost::optional< double > v17_LongitudinalBarSpacing, boost::optional< double > v18_TransverseBarSpacing, boost::optional< std::string > v19_BendingShapeCode, boost::optional< IfcEntityList::ptr > v20_BendingParameters) : IfcReinforcingElementType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcReinforcingMeshTypeEnum::ToString(v10_PredefinedType)); if (v11_MeshLength) { e->setArgument(10,(*v11_MeshLength)); } else { e->setArgument(10); } if (v12_MeshWidth) { e->setArgument(11,(*v12_MeshWidth)); } else { e->setArgument(11); } if (v13_LongitudinalBarNominalDiameter) { e->setArgument(12,(*v13_LongitudinalBarNominalDiameter)); } else { e->setArgument(12); } if (v14_TransverseBarNominalDiameter) { e->setArgument(13,(*v14_TransverseBarNominalDiameter)); } else { e->setArgument(13); } if (v15_LongitudinalBarCrossSectionArea) { e->setArgument(14,(*v15_LongitudinalBarCrossSectionArea)); } else { e->setArgument(14); } if (v16_TransverseBarCrossSectionArea) { e->setArgument(15,(*v16_TransverseBarCrossSectionArea)); } else { e->setArgument(15); } if (v17_LongitudinalBarSpacing) { e->setArgument(16,(*v17_LongitudinalBarSpacing)); } else { e->setArgument(16); } if (v18_TransverseBarSpacing) { e->setArgument(17,(*v18_TransverseBarSpacing)); } else { e->setArgument(17); } if (v19_BendingShapeCode) { e->setArgument(18,(*v19_BendingShapeCode)); } else { e->setArgument(18); } if (v20_BendingParameters) { e->setArgument(19,(*v20_BendingParameters)); } else { e->setArgument(19); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRelAggregates
-IfcObjectDefinition* IfcRelAggregates::RelatingObject() { return (IfcObjectDefinition*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(4))); }
+IfcObjectDefinition* IfcRelAggregates::RelatingObject() const { return (IfcObjectDefinition*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(4))); }
 void IfcRelAggregates::setRelatingObject(IfcObjectDefinition* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-SHARED_PTR< IfcTemplatedEntityList< IfcObjectDefinition > > IfcRelAggregates::RelatedObjects() { RETURN_AS_LIST(IfcObjectDefinition,5) }
-void IfcRelAggregates::setRelatedObjects(SHARED_PTR< IfcTemplatedEntityList< IfcObjectDefinition > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v->generalize()); }
+IfcTemplatedEntityList< IfcObjectDefinition >::ptr IfcRelAggregates::RelatedObjects() const { IfcEntityList::ptr es = *entity->getArgument(5); return es->as<IfcObjectDefinition>(); }
+void IfcRelAggregates::setRelatedObjects(IfcTemplatedEntityList< IfcObjectDefinition >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v->generalize()); }
 bool IfcRelAggregates::is(Type::Enum v) const { return v == Type::IfcRelAggregates || IfcRelDecomposes::is(v); }
 Type::Enum IfcRelAggregates::type() const { return Type::IfcRelAggregates; }
 Type::Enum IfcRelAggregates::Class() { return Type::IfcRelAggregates; }
-IfcRelAggregates::IfcRelAggregates(IfcAbstractEntityPtr e) : IfcRelDecomposes((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRelAggregates)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRelAggregates::IfcRelAggregates(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, IfcObjectDefinition* v5_RelatingObject, SHARED_PTR< IfcTemplatedEntityList< IfcObjectDefinition > > v6_RelatedObjects) : IfcRelDecomposes((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatingObject)); e->setArgument(5,(v6_RelatedObjects)->generalize()); entity = e; EntityBuffer::Add(this); }
+IfcRelAggregates::IfcRelAggregates(IfcAbstractEntity* e) : IfcRelDecomposes((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRelAggregates)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRelAggregates::IfcRelAggregates(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcObjectDefinition* v5_RelatingObject, IfcTemplatedEntityList< IfcObjectDefinition >::ptr v6_RelatedObjects) : IfcRelDecomposes((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatingObject)); e->setArgument(5,(v6_RelatedObjects)->generalize()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRelAssigns
-SHARED_PTR< IfcTemplatedEntityList< IfcObjectDefinition > > IfcRelAssigns::RelatedObjects() { RETURN_AS_LIST(IfcObjectDefinition,4) }
-void IfcRelAssigns::setRelatedObjects(SHARED_PTR< IfcTemplatedEntityList< IfcObjectDefinition > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v->generalize()); }
-bool IfcRelAssigns::hasRelatedObjectsType() { return !entity->getArgument(5)->isNull(); }
-IfcObjectTypeEnum::IfcObjectTypeEnum IfcRelAssigns::RelatedObjectsType() { return IfcObjectTypeEnum::FromString(*entity->getArgument(5)); }
+IfcTemplatedEntityList< IfcObjectDefinition >::ptr IfcRelAssigns::RelatedObjects() const { IfcEntityList::ptr es = *entity->getArgument(4); return es->as<IfcObjectDefinition>(); }
+void IfcRelAssigns::setRelatedObjects(IfcTemplatedEntityList< IfcObjectDefinition >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v->generalize()); }
+bool IfcRelAssigns::hasRelatedObjectsType() const { return !entity->getArgument(5)->isNull(); }
+IfcObjectTypeEnum::IfcObjectTypeEnum IfcRelAssigns::RelatedObjectsType() const { return IfcObjectTypeEnum::FromString(*entity->getArgument(5)); }
 void IfcRelAssigns::setRelatedObjectsType(IfcObjectTypeEnum::IfcObjectTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v,IfcObjectTypeEnum::ToString(v)); }
 bool IfcRelAssigns::is(Type::Enum v) const { return v == Type::IfcRelAssigns || IfcRelationship::is(v); }
 Type::Enum IfcRelAssigns::type() const { return Type::IfcRelAssigns; }
 Type::Enum IfcRelAssigns::Class() { return Type::IfcRelAssigns; }
-IfcRelAssigns::IfcRelAssigns(IfcAbstractEntityPtr e) : IfcRelationship((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRelAssigns)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRelAssigns::IfcRelAssigns(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, SHARED_PTR< IfcTemplatedEntityList< IfcObjectDefinition > > v5_RelatedObjects, boost::optional< IfcObjectTypeEnum::IfcObjectTypeEnum > v6_RelatedObjectsType) : IfcRelationship((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatedObjects)->generalize()); if (v6_RelatedObjectsType) { e->setArgument(5,*v6_RelatedObjectsType,IfcObjectTypeEnum::ToString(*v6_RelatedObjectsType)); } else { e->setArgument(5); } entity = e; EntityBuffer::Add(this); }
+IfcRelAssigns::IfcRelAssigns(IfcAbstractEntity* e) : IfcRelationship((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRelAssigns)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRelAssigns::IfcRelAssigns(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcTemplatedEntityList< IfcObjectDefinition >::ptr v5_RelatedObjects, boost::optional< IfcObjectTypeEnum::IfcObjectTypeEnum > v6_RelatedObjectsType) : IfcRelationship((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatedObjects)->generalize()); if (v6_RelatedObjectsType) { e->setArgument(5,*v6_RelatedObjectsType,IfcObjectTypeEnum::ToString(*v6_RelatedObjectsType)); } else { e->setArgument(5); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRelAssignsToActor
-IfcActor* IfcRelAssignsToActor::RelatingActor() { return (IfcActor*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(6))); }
+IfcActor* IfcRelAssignsToActor::RelatingActor() const { return (IfcActor*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(6))); }
 void IfcRelAssignsToActor::setRelatingActor(IfcActor* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
-bool IfcRelAssignsToActor::hasActingRole() { return !entity->getArgument(7)->isNull(); }
-IfcActorRole* IfcRelAssignsToActor::ActingRole() { return (IfcActorRole*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(7))); }
+bool IfcRelAssignsToActor::hasActingRole() const { return !entity->getArgument(7)->isNull(); }
+IfcActorRole* IfcRelAssignsToActor::ActingRole() const { return (IfcActorRole*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(7))); }
 void IfcRelAssignsToActor::setActingRole(IfcActorRole* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
 bool IfcRelAssignsToActor::is(Type::Enum v) const { return v == Type::IfcRelAssignsToActor || IfcRelAssigns::is(v); }
 Type::Enum IfcRelAssignsToActor::type() const { return Type::IfcRelAssignsToActor; }
 Type::Enum IfcRelAssignsToActor::Class() { return Type::IfcRelAssignsToActor; }
-IfcRelAssignsToActor::IfcRelAssignsToActor(IfcAbstractEntityPtr e) : IfcRelAssigns((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRelAssignsToActor)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRelAssignsToActor::IfcRelAssignsToActor(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, SHARED_PTR< IfcTemplatedEntityList< IfcObjectDefinition > > v5_RelatedObjects, boost::optional< IfcObjectTypeEnum::IfcObjectTypeEnum > v6_RelatedObjectsType, IfcActor* v7_RelatingActor, IfcActorRole* v8_ActingRole) : IfcRelAssigns((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatedObjects)->generalize()); if (v6_RelatedObjectsType) { e->setArgument(5,*v6_RelatedObjectsType,IfcObjectTypeEnum::ToString(*v6_RelatedObjectsType)); } else { e->setArgument(5); } e->setArgument(6,(v7_RelatingActor)); e->setArgument(7,(v8_ActingRole)); entity = e; EntityBuffer::Add(this); }
+IfcRelAssignsToActor::IfcRelAssignsToActor(IfcAbstractEntity* e) : IfcRelAssigns((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRelAssignsToActor)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRelAssignsToActor::IfcRelAssignsToActor(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcTemplatedEntityList< IfcObjectDefinition >::ptr v5_RelatedObjects, boost::optional< IfcObjectTypeEnum::IfcObjectTypeEnum > v6_RelatedObjectsType, IfcActor* v7_RelatingActor, IfcActorRole* v8_ActingRole) : IfcRelAssigns((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatedObjects)->generalize()); if (v6_RelatedObjectsType) { e->setArgument(5,*v6_RelatedObjectsType,IfcObjectTypeEnum::ToString(*v6_RelatedObjectsType)); } else { e->setArgument(5); } e->setArgument(6,(v7_RelatingActor)); e->setArgument(7,(v8_ActingRole)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRelAssignsToControl
-IfcControl* IfcRelAssignsToControl::RelatingControl() { return (IfcControl*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(6))); }
+IfcControl* IfcRelAssignsToControl::RelatingControl() const { return (IfcControl*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(6))); }
 void IfcRelAssignsToControl::setRelatingControl(IfcControl* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
 bool IfcRelAssignsToControl::is(Type::Enum v) const { return v == Type::IfcRelAssignsToControl || IfcRelAssigns::is(v); }
 Type::Enum IfcRelAssignsToControl::type() const { return Type::IfcRelAssignsToControl; }
 Type::Enum IfcRelAssignsToControl::Class() { return Type::IfcRelAssignsToControl; }
-IfcRelAssignsToControl::IfcRelAssignsToControl(IfcAbstractEntityPtr e) : IfcRelAssigns((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRelAssignsToControl)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRelAssignsToControl::IfcRelAssignsToControl(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, SHARED_PTR< IfcTemplatedEntityList< IfcObjectDefinition > > v5_RelatedObjects, boost::optional< IfcObjectTypeEnum::IfcObjectTypeEnum > v6_RelatedObjectsType, IfcControl* v7_RelatingControl) : IfcRelAssigns((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatedObjects)->generalize()); if (v6_RelatedObjectsType) { e->setArgument(5,*v6_RelatedObjectsType,IfcObjectTypeEnum::ToString(*v6_RelatedObjectsType)); } else { e->setArgument(5); } e->setArgument(6,(v7_RelatingControl)); entity = e; EntityBuffer::Add(this); }
+IfcRelAssignsToControl::IfcRelAssignsToControl(IfcAbstractEntity* e) : IfcRelAssigns((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRelAssignsToControl)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRelAssignsToControl::IfcRelAssignsToControl(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcTemplatedEntityList< IfcObjectDefinition >::ptr v5_RelatedObjects, boost::optional< IfcObjectTypeEnum::IfcObjectTypeEnum > v6_RelatedObjectsType, IfcControl* v7_RelatingControl) : IfcRelAssigns((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatedObjects)->generalize()); if (v6_RelatedObjectsType) { e->setArgument(5,*v6_RelatedObjectsType,IfcObjectTypeEnum::ToString(*v6_RelatedObjectsType)); } else { e->setArgument(5); } e->setArgument(6,(v7_RelatingControl)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRelAssignsToGroup
-IfcGroup* IfcRelAssignsToGroup::RelatingGroup() { return (IfcGroup*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(6))); }
+IfcGroup* IfcRelAssignsToGroup::RelatingGroup() const { return (IfcGroup*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(6))); }
 void IfcRelAssignsToGroup::setRelatingGroup(IfcGroup* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
 bool IfcRelAssignsToGroup::is(Type::Enum v) const { return v == Type::IfcRelAssignsToGroup || IfcRelAssigns::is(v); }
 Type::Enum IfcRelAssignsToGroup::type() const { return Type::IfcRelAssignsToGroup; }
 Type::Enum IfcRelAssignsToGroup::Class() { return Type::IfcRelAssignsToGroup; }
-IfcRelAssignsToGroup::IfcRelAssignsToGroup(IfcAbstractEntityPtr e) : IfcRelAssigns((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRelAssignsToGroup)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRelAssignsToGroup::IfcRelAssignsToGroup(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, SHARED_PTR< IfcTemplatedEntityList< IfcObjectDefinition > > v5_RelatedObjects, boost::optional< IfcObjectTypeEnum::IfcObjectTypeEnum > v6_RelatedObjectsType, IfcGroup* v7_RelatingGroup) : IfcRelAssigns((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatedObjects)->generalize()); if (v6_RelatedObjectsType) { e->setArgument(5,*v6_RelatedObjectsType,IfcObjectTypeEnum::ToString(*v6_RelatedObjectsType)); } else { e->setArgument(5); } e->setArgument(6,(v7_RelatingGroup)); entity = e; EntityBuffer::Add(this); }
+IfcRelAssignsToGroup::IfcRelAssignsToGroup(IfcAbstractEntity* e) : IfcRelAssigns((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRelAssignsToGroup)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRelAssignsToGroup::IfcRelAssignsToGroup(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcTemplatedEntityList< IfcObjectDefinition >::ptr v5_RelatedObjects, boost::optional< IfcObjectTypeEnum::IfcObjectTypeEnum > v6_RelatedObjectsType, IfcGroup* v7_RelatingGroup) : IfcRelAssigns((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatedObjects)->generalize()); if (v6_RelatedObjectsType) { e->setArgument(5,*v6_RelatedObjectsType,IfcObjectTypeEnum::ToString(*v6_RelatedObjectsType)); } else { e->setArgument(5); } e->setArgument(6,(v7_RelatingGroup)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRelAssignsToGroupByFactor
-IfcRatioMeasure IfcRelAssignsToGroupByFactor::Factor() { return *entity->getArgument(7); }
-void IfcRelAssignsToGroupByFactor::setFactor(IfcRatioMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
+double IfcRelAssignsToGroupByFactor::Factor() const { return *entity->getArgument(7); }
+void IfcRelAssignsToGroupByFactor::setFactor(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
 bool IfcRelAssignsToGroupByFactor::is(Type::Enum v) const { return v == Type::IfcRelAssignsToGroupByFactor || IfcRelAssignsToGroup::is(v); }
 Type::Enum IfcRelAssignsToGroupByFactor::type() const { return Type::IfcRelAssignsToGroupByFactor; }
 Type::Enum IfcRelAssignsToGroupByFactor::Class() { return Type::IfcRelAssignsToGroupByFactor; }
-IfcRelAssignsToGroupByFactor::IfcRelAssignsToGroupByFactor(IfcAbstractEntityPtr e) : IfcRelAssignsToGroup((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRelAssignsToGroupByFactor)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRelAssignsToGroupByFactor::IfcRelAssignsToGroupByFactor(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, SHARED_PTR< IfcTemplatedEntityList< IfcObjectDefinition > > v5_RelatedObjects, boost::optional< IfcObjectTypeEnum::IfcObjectTypeEnum > v6_RelatedObjectsType, IfcGroup* v7_RelatingGroup, IfcRatioMeasure v8_Factor) : IfcRelAssignsToGroup((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatedObjects)->generalize()); if (v6_RelatedObjectsType) { e->setArgument(5,*v6_RelatedObjectsType,IfcObjectTypeEnum::ToString(*v6_RelatedObjectsType)); } else { e->setArgument(5); } e->setArgument(6,(v7_RelatingGroup)); e->setArgument(7,(v8_Factor)); entity = e; EntityBuffer::Add(this); }
+IfcRelAssignsToGroupByFactor::IfcRelAssignsToGroupByFactor(IfcAbstractEntity* e) : IfcRelAssignsToGroup((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRelAssignsToGroupByFactor)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRelAssignsToGroupByFactor::IfcRelAssignsToGroupByFactor(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcTemplatedEntityList< IfcObjectDefinition >::ptr v5_RelatedObjects, boost::optional< IfcObjectTypeEnum::IfcObjectTypeEnum > v6_RelatedObjectsType, IfcGroup* v7_RelatingGroup, double v8_Factor) : IfcRelAssignsToGroup((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatedObjects)->generalize()); if (v6_RelatedObjectsType) { e->setArgument(5,*v6_RelatedObjectsType,IfcObjectTypeEnum::ToString(*v6_RelatedObjectsType)); } else { e->setArgument(5); } e->setArgument(6,(v7_RelatingGroup)); e->setArgument(7,(v8_Factor)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRelAssignsToProcess
-IfcProcessSelect IfcRelAssignsToProcess::RelatingProcess() { return *entity->getArgument(6); }
-void IfcRelAssignsToProcess::setRelatingProcess(IfcProcessSelect v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
-bool IfcRelAssignsToProcess::hasQuantityInProcess() { return !entity->getArgument(7)->isNull(); }
-IfcMeasureWithUnit* IfcRelAssignsToProcess::QuantityInProcess() { return (IfcMeasureWithUnit*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(7))); }
+IfcProcessSelect* IfcRelAssignsToProcess::RelatingProcess() const { return (IfcProcessSelect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(6))); }
+void IfcRelAssignsToProcess::setRelatingProcess(IfcProcessSelect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
+bool IfcRelAssignsToProcess::hasQuantityInProcess() const { return !entity->getArgument(7)->isNull(); }
+IfcMeasureWithUnit* IfcRelAssignsToProcess::QuantityInProcess() const { return (IfcMeasureWithUnit*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(7))); }
 void IfcRelAssignsToProcess::setQuantityInProcess(IfcMeasureWithUnit* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
 bool IfcRelAssignsToProcess::is(Type::Enum v) const { return v == Type::IfcRelAssignsToProcess || IfcRelAssigns::is(v); }
 Type::Enum IfcRelAssignsToProcess::type() const { return Type::IfcRelAssignsToProcess; }
 Type::Enum IfcRelAssignsToProcess::Class() { return Type::IfcRelAssignsToProcess; }
-IfcRelAssignsToProcess::IfcRelAssignsToProcess(IfcAbstractEntityPtr e) : IfcRelAssigns((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRelAssignsToProcess)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRelAssignsToProcess::IfcRelAssignsToProcess(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, SHARED_PTR< IfcTemplatedEntityList< IfcObjectDefinition > > v5_RelatedObjects, boost::optional< IfcObjectTypeEnum::IfcObjectTypeEnum > v6_RelatedObjectsType, IfcProcessSelect v7_RelatingProcess, IfcMeasureWithUnit* v8_QuantityInProcess) : IfcRelAssigns((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatedObjects)->generalize()); if (v6_RelatedObjectsType) { e->setArgument(5,*v6_RelatedObjectsType,IfcObjectTypeEnum::ToString(*v6_RelatedObjectsType)); } else { e->setArgument(5); } e->setArgument(6,(v7_RelatingProcess)); e->setArgument(7,(v8_QuantityInProcess)); entity = e; EntityBuffer::Add(this); }
+IfcRelAssignsToProcess::IfcRelAssignsToProcess(IfcAbstractEntity* e) : IfcRelAssigns((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRelAssignsToProcess)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRelAssignsToProcess::IfcRelAssignsToProcess(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcTemplatedEntityList< IfcObjectDefinition >::ptr v5_RelatedObjects, boost::optional< IfcObjectTypeEnum::IfcObjectTypeEnum > v6_RelatedObjectsType, IfcProcessSelect* v7_RelatingProcess, IfcMeasureWithUnit* v8_QuantityInProcess) : IfcRelAssigns((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatedObjects)->generalize()); if (v6_RelatedObjectsType) { e->setArgument(5,*v6_RelatedObjectsType,IfcObjectTypeEnum::ToString(*v6_RelatedObjectsType)); } else { e->setArgument(5); } e->setArgument(6,(v7_RelatingProcess)); e->setArgument(7,(v8_QuantityInProcess)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRelAssignsToProduct
-IfcProductSelect IfcRelAssignsToProduct::RelatingProduct() { return *entity->getArgument(6); }
-void IfcRelAssignsToProduct::setRelatingProduct(IfcProductSelect v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
+IfcProductSelect* IfcRelAssignsToProduct::RelatingProduct() const { return (IfcProductSelect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(6))); }
+void IfcRelAssignsToProduct::setRelatingProduct(IfcProductSelect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
 bool IfcRelAssignsToProduct::is(Type::Enum v) const { return v == Type::IfcRelAssignsToProduct || IfcRelAssigns::is(v); }
 Type::Enum IfcRelAssignsToProduct::type() const { return Type::IfcRelAssignsToProduct; }
 Type::Enum IfcRelAssignsToProduct::Class() { return Type::IfcRelAssignsToProduct; }
-IfcRelAssignsToProduct::IfcRelAssignsToProduct(IfcAbstractEntityPtr e) : IfcRelAssigns((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRelAssignsToProduct)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRelAssignsToProduct::IfcRelAssignsToProduct(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, SHARED_PTR< IfcTemplatedEntityList< IfcObjectDefinition > > v5_RelatedObjects, boost::optional< IfcObjectTypeEnum::IfcObjectTypeEnum > v6_RelatedObjectsType, IfcProductSelect v7_RelatingProduct) : IfcRelAssigns((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatedObjects)->generalize()); if (v6_RelatedObjectsType) { e->setArgument(5,*v6_RelatedObjectsType,IfcObjectTypeEnum::ToString(*v6_RelatedObjectsType)); } else { e->setArgument(5); } e->setArgument(6,(v7_RelatingProduct)); entity = e; EntityBuffer::Add(this); }
+IfcRelAssignsToProduct::IfcRelAssignsToProduct(IfcAbstractEntity* e) : IfcRelAssigns((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRelAssignsToProduct)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRelAssignsToProduct::IfcRelAssignsToProduct(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcTemplatedEntityList< IfcObjectDefinition >::ptr v5_RelatedObjects, boost::optional< IfcObjectTypeEnum::IfcObjectTypeEnum > v6_RelatedObjectsType, IfcProductSelect* v7_RelatingProduct) : IfcRelAssigns((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatedObjects)->generalize()); if (v6_RelatedObjectsType) { e->setArgument(5,*v6_RelatedObjectsType,IfcObjectTypeEnum::ToString(*v6_RelatedObjectsType)); } else { e->setArgument(5); } e->setArgument(6,(v7_RelatingProduct)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRelAssignsToResource
-IfcResourceSelect IfcRelAssignsToResource::RelatingResource() { return *entity->getArgument(6); }
-void IfcRelAssignsToResource::setRelatingResource(IfcResourceSelect v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
+IfcResourceSelect* IfcRelAssignsToResource::RelatingResource() const { return (IfcResourceSelect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(6))); }
+void IfcRelAssignsToResource::setRelatingResource(IfcResourceSelect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
 bool IfcRelAssignsToResource::is(Type::Enum v) const { return v == Type::IfcRelAssignsToResource || IfcRelAssigns::is(v); }
 Type::Enum IfcRelAssignsToResource::type() const { return Type::IfcRelAssignsToResource; }
 Type::Enum IfcRelAssignsToResource::Class() { return Type::IfcRelAssignsToResource; }
-IfcRelAssignsToResource::IfcRelAssignsToResource(IfcAbstractEntityPtr e) : IfcRelAssigns((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRelAssignsToResource)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRelAssignsToResource::IfcRelAssignsToResource(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, SHARED_PTR< IfcTemplatedEntityList< IfcObjectDefinition > > v5_RelatedObjects, boost::optional< IfcObjectTypeEnum::IfcObjectTypeEnum > v6_RelatedObjectsType, IfcResourceSelect v7_RelatingResource) : IfcRelAssigns((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatedObjects)->generalize()); if (v6_RelatedObjectsType) { e->setArgument(5,*v6_RelatedObjectsType,IfcObjectTypeEnum::ToString(*v6_RelatedObjectsType)); } else { e->setArgument(5); } e->setArgument(6,(v7_RelatingResource)); entity = e; EntityBuffer::Add(this); }
+IfcRelAssignsToResource::IfcRelAssignsToResource(IfcAbstractEntity* e) : IfcRelAssigns((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRelAssignsToResource)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRelAssignsToResource::IfcRelAssignsToResource(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcTemplatedEntityList< IfcObjectDefinition >::ptr v5_RelatedObjects, boost::optional< IfcObjectTypeEnum::IfcObjectTypeEnum > v6_RelatedObjectsType, IfcResourceSelect* v7_RelatingResource) : IfcRelAssigns((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatedObjects)->generalize()); if (v6_RelatedObjectsType) { e->setArgument(5,*v6_RelatedObjectsType,IfcObjectTypeEnum::ToString(*v6_RelatedObjectsType)); } else { e->setArgument(5); } e->setArgument(6,(v7_RelatingResource)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRelAssociates
-SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > IfcRelAssociates::RelatedObjects() { RETURN_AS_LIST(IfcUtil::IfcAbstractSelect,4) }
-void IfcRelAssociates::setRelatedObjects(SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v->generalize()); }
+IfcEntityList::ptr IfcRelAssociates::RelatedObjects() const { return *entity->getArgument(4); }
+void IfcRelAssociates::setRelatedObjects(IfcEntityList::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
 bool IfcRelAssociates::is(Type::Enum v) const { return v == Type::IfcRelAssociates || IfcRelationship::is(v); }
 Type::Enum IfcRelAssociates::type() const { return Type::IfcRelAssociates; }
 Type::Enum IfcRelAssociates::Class() { return Type::IfcRelAssociates; }
-IfcRelAssociates::IfcRelAssociates(IfcAbstractEntityPtr e) : IfcRelationship((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRelAssociates)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRelAssociates::IfcRelAssociates(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, IfcEntities v5_RelatedObjects) : IfcRelationship((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatedObjects)); entity = e; EntityBuffer::Add(this); }
+IfcRelAssociates::IfcRelAssociates(IfcAbstractEntity* e) : IfcRelationship((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRelAssociates)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRelAssociates::IfcRelAssociates(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcEntityList::ptr v5_RelatedObjects) : IfcRelationship((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatedObjects)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRelAssociatesApproval
-IfcApproval* IfcRelAssociatesApproval::RelatingApproval() { return (IfcApproval*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(5))); }
+IfcApproval* IfcRelAssociatesApproval::RelatingApproval() const { return (IfcApproval*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(5))); }
 void IfcRelAssociatesApproval::setRelatingApproval(IfcApproval* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
 bool IfcRelAssociatesApproval::is(Type::Enum v) const { return v == Type::IfcRelAssociatesApproval || IfcRelAssociates::is(v); }
 Type::Enum IfcRelAssociatesApproval::type() const { return Type::IfcRelAssociatesApproval; }
 Type::Enum IfcRelAssociatesApproval::Class() { return Type::IfcRelAssociatesApproval; }
-IfcRelAssociatesApproval::IfcRelAssociatesApproval(IfcAbstractEntityPtr e) : IfcRelAssociates((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRelAssociatesApproval)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRelAssociatesApproval::IfcRelAssociatesApproval(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, IfcEntities v5_RelatedObjects, IfcApproval* v6_RelatingApproval) : IfcRelAssociates((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatedObjects)); e->setArgument(5,(v6_RelatingApproval)); entity = e; EntityBuffer::Add(this); }
+IfcRelAssociatesApproval::IfcRelAssociatesApproval(IfcAbstractEntity* e) : IfcRelAssociates((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRelAssociatesApproval)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRelAssociatesApproval::IfcRelAssociatesApproval(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcEntityList::ptr v5_RelatedObjects, IfcApproval* v6_RelatingApproval) : IfcRelAssociates((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatedObjects)); e->setArgument(5,(v6_RelatingApproval)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRelAssociatesClassification
-IfcClassificationSelect IfcRelAssociatesClassification::RelatingClassification() { return *entity->getArgument(5); }
-void IfcRelAssociatesClassification::setRelatingClassification(IfcClassificationSelect v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+IfcClassificationSelect* IfcRelAssociatesClassification::RelatingClassification() const { return (IfcClassificationSelect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(5))); }
+void IfcRelAssociatesClassification::setRelatingClassification(IfcClassificationSelect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
 bool IfcRelAssociatesClassification::is(Type::Enum v) const { return v == Type::IfcRelAssociatesClassification || IfcRelAssociates::is(v); }
 Type::Enum IfcRelAssociatesClassification::type() const { return Type::IfcRelAssociatesClassification; }
 Type::Enum IfcRelAssociatesClassification::Class() { return Type::IfcRelAssociatesClassification; }
-IfcRelAssociatesClassification::IfcRelAssociatesClassification(IfcAbstractEntityPtr e) : IfcRelAssociates((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRelAssociatesClassification)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRelAssociatesClassification::IfcRelAssociatesClassification(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, IfcEntities v5_RelatedObjects, IfcClassificationSelect v6_RelatingClassification) : IfcRelAssociates((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatedObjects)); e->setArgument(5,(v6_RelatingClassification)); entity = e; EntityBuffer::Add(this); }
+IfcRelAssociatesClassification::IfcRelAssociatesClassification(IfcAbstractEntity* e) : IfcRelAssociates((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRelAssociatesClassification)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRelAssociatesClassification::IfcRelAssociatesClassification(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcEntityList::ptr v5_RelatedObjects, IfcClassificationSelect* v6_RelatingClassification) : IfcRelAssociates((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatedObjects)); e->setArgument(5,(v6_RelatingClassification)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRelAssociatesConstraint
-bool IfcRelAssociatesConstraint::hasIntent() { return !entity->getArgument(5)->isNull(); }
-IfcLabel IfcRelAssociatesConstraint::Intent() { return *entity->getArgument(5); }
-void IfcRelAssociatesConstraint::setIntent(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-IfcConstraint* IfcRelAssociatesConstraint::RelatingConstraint() { return (IfcConstraint*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(6))); }
+bool IfcRelAssociatesConstraint::hasIntent() const { return !entity->getArgument(5)->isNull(); }
+std::string IfcRelAssociatesConstraint::Intent() const { return *entity->getArgument(5); }
+void IfcRelAssociatesConstraint::setIntent(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+IfcConstraint* IfcRelAssociatesConstraint::RelatingConstraint() const { return (IfcConstraint*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(6))); }
 void IfcRelAssociatesConstraint::setRelatingConstraint(IfcConstraint* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
 bool IfcRelAssociatesConstraint::is(Type::Enum v) const { return v == Type::IfcRelAssociatesConstraint || IfcRelAssociates::is(v); }
 Type::Enum IfcRelAssociatesConstraint::type() const { return Type::IfcRelAssociatesConstraint; }
 Type::Enum IfcRelAssociatesConstraint::Class() { return Type::IfcRelAssociatesConstraint; }
-IfcRelAssociatesConstraint::IfcRelAssociatesConstraint(IfcAbstractEntityPtr e) : IfcRelAssociates((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRelAssociatesConstraint)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRelAssociatesConstraint::IfcRelAssociatesConstraint(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, IfcEntities v5_RelatedObjects, boost::optional< IfcLabel > v6_Intent, IfcConstraint* v7_RelatingConstraint) : IfcRelAssociates((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatedObjects)); if (v6_Intent) { e->setArgument(5,(*v6_Intent)); } else { e->setArgument(5); } e->setArgument(6,(v7_RelatingConstraint)); entity = e; EntityBuffer::Add(this); }
+IfcRelAssociatesConstraint::IfcRelAssociatesConstraint(IfcAbstractEntity* e) : IfcRelAssociates((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRelAssociatesConstraint)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRelAssociatesConstraint::IfcRelAssociatesConstraint(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcEntityList::ptr v5_RelatedObjects, boost::optional< std::string > v6_Intent, IfcConstraint* v7_RelatingConstraint) : IfcRelAssociates((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatedObjects)); if (v6_Intent) { e->setArgument(5,(*v6_Intent)); } else { e->setArgument(5); } e->setArgument(6,(v7_RelatingConstraint)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRelAssociatesDocument
-IfcDocumentSelect IfcRelAssociatesDocument::RelatingDocument() { return *entity->getArgument(5); }
-void IfcRelAssociatesDocument::setRelatingDocument(IfcDocumentSelect v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+IfcDocumentSelect* IfcRelAssociatesDocument::RelatingDocument() const { return (IfcDocumentSelect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(5))); }
+void IfcRelAssociatesDocument::setRelatingDocument(IfcDocumentSelect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
 bool IfcRelAssociatesDocument::is(Type::Enum v) const { return v == Type::IfcRelAssociatesDocument || IfcRelAssociates::is(v); }
 Type::Enum IfcRelAssociatesDocument::type() const { return Type::IfcRelAssociatesDocument; }
 Type::Enum IfcRelAssociatesDocument::Class() { return Type::IfcRelAssociatesDocument; }
-IfcRelAssociatesDocument::IfcRelAssociatesDocument(IfcAbstractEntityPtr e) : IfcRelAssociates((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRelAssociatesDocument)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRelAssociatesDocument::IfcRelAssociatesDocument(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, IfcEntities v5_RelatedObjects, IfcDocumentSelect v6_RelatingDocument) : IfcRelAssociates((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatedObjects)); e->setArgument(5,(v6_RelatingDocument)); entity = e; EntityBuffer::Add(this); }
+IfcRelAssociatesDocument::IfcRelAssociatesDocument(IfcAbstractEntity* e) : IfcRelAssociates((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRelAssociatesDocument)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRelAssociatesDocument::IfcRelAssociatesDocument(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcEntityList::ptr v5_RelatedObjects, IfcDocumentSelect* v6_RelatingDocument) : IfcRelAssociates((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatedObjects)); e->setArgument(5,(v6_RelatingDocument)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRelAssociatesLibrary
-IfcLibrarySelect IfcRelAssociatesLibrary::RelatingLibrary() { return *entity->getArgument(5); }
-void IfcRelAssociatesLibrary::setRelatingLibrary(IfcLibrarySelect v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+IfcLibrarySelect* IfcRelAssociatesLibrary::RelatingLibrary() const { return (IfcLibrarySelect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(5))); }
+void IfcRelAssociatesLibrary::setRelatingLibrary(IfcLibrarySelect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
 bool IfcRelAssociatesLibrary::is(Type::Enum v) const { return v == Type::IfcRelAssociatesLibrary || IfcRelAssociates::is(v); }
 Type::Enum IfcRelAssociatesLibrary::type() const { return Type::IfcRelAssociatesLibrary; }
 Type::Enum IfcRelAssociatesLibrary::Class() { return Type::IfcRelAssociatesLibrary; }
-IfcRelAssociatesLibrary::IfcRelAssociatesLibrary(IfcAbstractEntityPtr e) : IfcRelAssociates((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRelAssociatesLibrary)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRelAssociatesLibrary::IfcRelAssociatesLibrary(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, IfcEntities v5_RelatedObjects, IfcLibrarySelect v6_RelatingLibrary) : IfcRelAssociates((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatedObjects)); e->setArgument(5,(v6_RelatingLibrary)); entity = e; EntityBuffer::Add(this); }
+IfcRelAssociatesLibrary::IfcRelAssociatesLibrary(IfcAbstractEntity* e) : IfcRelAssociates((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRelAssociatesLibrary)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRelAssociatesLibrary::IfcRelAssociatesLibrary(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcEntityList::ptr v5_RelatedObjects, IfcLibrarySelect* v6_RelatingLibrary) : IfcRelAssociates((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatedObjects)); e->setArgument(5,(v6_RelatingLibrary)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRelAssociatesMaterial
-IfcMaterialSelect IfcRelAssociatesMaterial::RelatingMaterial() { return *entity->getArgument(5); }
-void IfcRelAssociatesMaterial::setRelatingMaterial(IfcMaterialSelect v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+IfcMaterialSelect* IfcRelAssociatesMaterial::RelatingMaterial() const { return (IfcMaterialSelect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(5))); }
+void IfcRelAssociatesMaterial::setRelatingMaterial(IfcMaterialSelect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
 bool IfcRelAssociatesMaterial::is(Type::Enum v) const { return v == Type::IfcRelAssociatesMaterial || IfcRelAssociates::is(v); }
 Type::Enum IfcRelAssociatesMaterial::type() const { return Type::IfcRelAssociatesMaterial; }
 Type::Enum IfcRelAssociatesMaterial::Class() { return Type::IfcRelAssociatesMaterial; }
-IfcRelAssociatesMaterial::IfcRelAssociatesMaterial(IfcAbstractEntityPtr e) : IfcRelAssociates((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRelAssociatesMaterial)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRelAssociatesMaterial::IfcRelAssociatesMaterial(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, IfcEntities v5_RelatedObjects, IfcMaterialSelect v6_RelatingMaterial) : IfcRelAssociates((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatedObjects)); e->setArgument(5,(v6_RelatingMaterial)); entity = e; EntityBuffer::Add(this); }
+IfcRelAssociatesMaterial::IfcRelAssociatesMaterial(IfcAbstractEntity* e) : IfcRelAssociates((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRelAssociatesMaterial)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRelAssociatesMaterial::IfcRelAssociatesMaterial(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcEntityList::ptr v5_RelatedObjects, IfcMaterialSelect* v6_RelatingMaterial) : IfcRelAssociates((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatedObjects)); e->setArgument(5,(v6_RelatingMaterial)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRelConnects
 bool IfcRelConnects::is(Type::Enum v) const { return v == Type::IfcRelConnects || IfcRelationship::is(v); }
 Type::Enum IfcRelConnects::type() const { return Type::IfcRelConnects; }
 Type::Enum IfcRelConnects::Class() { return Type::IfcRelConnects; }
-IfcRelConnects::IfcRelConnects(IfcAbstractEntityPtr e) : IfcRelationship((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRelConnects)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRelConnects::IfcRelConnects(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description) : IfcRelationship((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } entity = e; EntityBuffer::Add(this); }
+IfcRelConnects::IfcRelConnects(IfcAbstractEntity* e) : IfcRelationship((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRelConnects)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRelConnects::IfcRelConnects(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description) : IfcRelationship((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRelConnectsElements
-bool IfcRelConnectsElements::hasConnectionGeometry() { return !entity->getArgument(4)->isNull(); }
-IfcConnectionGeometry* IfcRelConnectsElements::ConnectionGeometry() { return (IfcConnectionGeometry*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(4))); }
+bool IfcRelConnectsElements::hasConnectionGeometry() const { return !entity->getArgument(4)->isNull(); }
+IfcConnectionGeometry* IfcRelConnectsElements::ConnectionGeometry() const { return (IfcConnectionGeometry*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(4))); }
 void IfcRelConnectsElements::setConnectionGeometry(IfcConnectionGeometry* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-IfcElement* IfcRelConnectsElements::RelatingElement() { return (IfcElement*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(5))); }
+IfcElement* IfcRelConnectsElements::RelatingElement() const { return (IfcElement*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(5))); }
 void IfcRelConnectsElements::setRelatingElement(IfcElement* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-IfcElement* IfcRelConnectsElements::RelatedElement() { return (IfcElement*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(6))); }
+IfcElement* IfcRelConnectsElements::RelatedElement() const { return (IfcElement*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(6))); }
 void IfcRelConnectsElements::setRelatedElement(IfcElement* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
 bool IfcRelConnectsElements::is(Type::Enum v) const { return v == Type::IfcRelConnectsElements || IfcRelConnects::is(v); }
 Type::Enum IfcRelConnectsElements::type() const { return Type::IfcRelConnectsElements; }
 Type::Enum IfcRelConnectsElements::Class() { return Type::IfcRelConnectsElements; }
-IfcRelConnectsElements::IfcRelConnectsElements(IfcAbstractEntityPtr e) : IfcRelConnects((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRelConnectsElements)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRelConnectsElements::IfcRelConnectsElements(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, IfcConnectionGeometry* v5_ConnectionGeometry, IfcElement* v6_RelatingElement, IfcElement* v7_RelatedElement) : IfcRelConnects((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_ConnectionGeometry)); e->setArgument(5,(v6_RelatingElement)); e->setArgument(6,(v7_RelatedElement)); entity = e; EntityBuffer::Add(this); }
+IfcRelConnectsElements::IfcRelConnectsElements(IfcAbstractEntity* e) : IfcRelConnects((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRelConnectsElements)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRelConnectsElements::IfcRelConnectsElements(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcConnectionGeometry* v5_ConnectionGeometry, IfcElement* v6_RelatingElement, IfcElement* v7_RelatedElement) : IfcRelConnects((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_ConnectionGeometry)); e->setArgument(5,(v6_RelatingElement)); e->setArgument(6,(v7_RelatedElement)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRelConnectsPathElements
-std::vector< double > /*[0:?]*/ IfcRelConnectsPathElements::RelatingPriorities() { return *entity->getArgument(7); }
+std::vector< double > /*[0:?]*/ IfcRelConnectsPathElements::RelatingPriorities() const { return *entity->getArgument(7); }
 void IfcRelConnectsPathElements::setRelatingPriorities(std::vector< double > /*[0:?]*/ v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
-std::vector< double > /*[0:?]*/ IfcRelConnectsPathElements::RelatedPriorities() { return *entity->getArgument(8); }
+std::vector< double > /*[0:?]*/ IfcRelConnectsPathElements::RelatedPriorities() const { return *entity->getArgument(8); }
 void IfcRelConnectsPathElements::setRelatedPriorities(std::vector< double > /*[0:?]*/ v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
-IfcConnectionTypeEnum::IfcConnectionTypeEnum IfcRelConnectsPathElements::RelatedConnectionType() { return IfcConnectionTypeEnum::FromString(*entity->getArgument(9)); }
+IfcConnectionTypeEnum::IfcConnectionTypeEnum IfcRelConnectsPathElements::RelatedConnectionType() const { return IfcConnectionTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcRelConnectsPathElements::setRelatedConnectionType(IfcConnectionTypeEnum::IfcConnectionTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcConnectionTypeEnum::ToString(v)); }
-IfcConnectionTypeEnum::IfcConnectionTypeEnum IfcRelConnectsPathElements::RelatingConnectionType() { return IfcConnectionTypeEnum::FromString(*entity->getArgument(10)); }
+IfcConnectionTypeEnum::IfcConnectionTypeEnum IfcRelConnectsPathElements::RelatingConnectionType() const { return IfcConnectionTypeEnum::FromString(*entity->getArgument(10)); }
 void IfcRelConnectsPathElements::setRelatingConnectionType(IfcConnectionTypeEnum::IfcConnectionTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v,IfcConnectionTypeEnum::ToString(v)); }
 bool IfcRelConnectsPathElements::is(Type::Enum v) const { return v == Type::IfcRelConnectsPathElements || IfcRelConnectsElements::is(v); }
 Type::Enum IfcRelConnectsPathElements::type() const { return Type::IfcRelConnectsPathElements; }
 Type::Enum IfcRelConnectsPathElements::Class() { return Type::IfcRelConnectsPathElements; }
-IfcRelConnectsPathElements::IfcRelConnectsPathElements(IfcAbstractEntityPtr e) : IfcRelConnectsElements((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRelConnectsPathElements)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRelConnectsPathElements::IfcRelConnectsPathElements(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, IfcConnectionGeometry* v5_ConnectionGeometry, IfcElement* v6_RelatingElement, IfcElement* v7_RelatedElement, std::vector< double > /*[0:?]*/ v8_RelatingPriorities, std::vector< double > /*[0:?]*/ v9_RelatedPriorities, IfcConnectionTypeEnum::IfcConnectionTypeEnum v10_RelatedConnectionType, IfcConnectionTypeEnum::IfcConnectionTypeEnum v11_RelatingConnectionType) : IfcRelConnectsElements((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_ConnectionGeometry)); e->setArgument(5,(v6_RelatingElement)); e->setArgument(6,(v7_RelatedElement)); e->setArgument(7,(v8_RelatingPriorities)); e->setArgument(8,(v9_RelatedPriorities)); e->setArgument(9,v10_RelatedConnectionType,IfcConnectionTypeEnum::ToString(v10_RelatedConnectionType)); e->setArgument(10,v11_RelatingConnectionType,IfcConnectionTypeEnum::ToString(v11_RelatingConnectionType)); entity = e; EntityBuffer::Add(this); }
+IfcRelConnectsPathElements::IfcRelConnectsPathElements(IfcAbstractEntity* e) : IfcRelConnectsElements((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRelConnectsPathElements)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRelConnectsPathElements::IfcRelConnectsPathElements(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcConnectionGeometry* v5_ConnectionGeometry, IfcElement* v6_RelatingElement, IfcElement* v7_RelatedElement, std::vector< double > /*[0:?]*/ v8_RelatingPriorities, std::vector< double > /*[0:?]*/ v9_RelatedPriorities, IfcConnectionTypeEnum::IfcConnectionTypeEnum v10_RelatedConnectionType, IfcConnectionTypeEnum::IfcConnectionTypeEnum v11_RelatingConnectionType) : IfcRelConnectsElements((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_ConnectionGeometry)); e->setArgument(5,(v6_RelatingElement)); e->setArgument(6,(v7_RelatedElement)); e->setArgument(7,(v8_RelatingPriorities)); e->setArgument(8,(v9_RelatedPriorities)); e->setArgument(9,v10_RelatedConnectionType,IfcConnectionTypeEnum::ToString(v10_RelatedConnectionType)); e->setArgument(10,v11_RelatingConnectionType,IfcConnectionTypeEnum::ToString(v11_RelatingConnectionType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRelConnectsPortToElement
-IfcPort* IfcRelConnectsPortToElement::RelatingPort() { return (IfcPort*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(4))); }
+IfcPort* IfcRelConnectsPortToElement::RelatingPort() const { return (IfcPort*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(4))); }
 void IfcRelConnectsPortToElement::setRelatingPort(IfcPort* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-IfcDistributionElement* IfcRelConnectsPortToElement::RelatedElement() { return (IfcDistributionElement*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(5))); }
+IfcDistributionElement* IfcRelConnectsPortToElement::RelatedElement() const { return (IfcDistributionElement*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(5))); }
 void IfcRelConnectsPortToElement::setRelatedElement(IfcDistributionElement* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
 bool IfcRelConnectsPortToElement::is(Type::Enum v) const { return v == Type::IfcRelConnectsPortToElement || IfcRelConnects::is(v); }
 Type::Enum IfcRelConnectsPortToElement::type() const { return Type::IfcRelConnectsPortToElement; }
 Type::Enum IfcRelConnectsPortToElement::Class() { return Type::IfcRelConnectsPortToElement; }
-IfcRelConnectsPortToElement::IfcRelConnectsPortToElement(IfcAbstractEntityPtr e) : IfcRelConnects((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRelConnectsPortToElement)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRelConnectsPortToElement::IfcRelConnectsPortToElement(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, IfcPort* v5_RelatingPort, IfcDistributionElement* v6_RelatedElement) : IfcRelConnects((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatingPort)); e->setArgument(5,(v6_RelatedElement)); entity = e; EntityBuffer::Add(this); }
+IfcRelConnectsPortToElement::IfcRelConnectsPortToElement(IfcAbstractEntity* e) : IfcRelConnects((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRelConnectsPortToElement)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRelConnectsPortToElement::IfcRelConnectsPortToElement(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcPort* v5_RelatingPort, IfcDistributionElement* v6_RelatedElement) : IfcRelConnects((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatingPort)); e->setArgument(5,(v6_RelatedElement)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRelConnectsPorts
-IfcPort* IfcRelConnectsPorts::RelatingPort() { return (IfcPort*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(4))); }
+IfcPort* IfcRelConnectsPorts::RelatingPort() const { return (IfcPort*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(4))); }
 void IfcRelConnectsPorts::setRelatingPort(IfcPort* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-IfcPort* IfcRelConnectsPorts::RelatedPort() { return (IfcPort*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(5))); }
+IfcPort* IfcRelConnectsPorts::RelatedPort() const { return (IfcPort*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(5))); }
 void IfcRelConnectsPorts::setRelatedPort(IfcPort* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-bool IfcRelConnectsPorts::hasRealizingElement() { return !entity->getArgument(6)->isNull(); }
-IfcElement* IfcRelConnectsPorts::RealizingElement() { return (IfcElement*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(6))); }
+bool IfcRelConnectsPorts::hasRealizingElement() const { return !entity->getArgument(6)->isNull(); }
+IfcElement* IfcRelConnectsPorts::RealizingElement() const { return (IfcElement*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(6))); }
 void IfcRelConnectsPorts::setRealizingElement(IfcElement* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
 bool IfcRelConnectsPorts::is(Type::Enum v) const { return v == Type::IfcRelConnectsPorts || IfcRelConnects::is(v); }
 Type::Enum IfcRelConnectsPorts::type() const { return Type::IfcRelConnectsPorts; }
 Type::Enum IfcRelConnectsPorts::Class() { return Type::IfcRelConnectsPorts; }
-IfcRelConnectsPorts::IfcRelConnectsPorts(IfcAbstractEntityPtr e) : IfcRelConnects((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRelConnectsPorts)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRelConnectsPorts::IfcRelConnectsPorts(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, IfcPort* v5_RelatingPort, IfcPort* v6_RelatedPort, IfcElement* v7_RealizingElement) : IfcRelConnects((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatingPort)); e->setArgument(5,(v6_RelatedPort)); e->setArgument(6,(v7_RealizingElement)); entity = e; EntityBuffer::Add(this); }
+IfcRelConnectsPorts::IfcRelConnectsPorts(IfcAbstractEntity* e) : IfcRelConnects((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRelConnectsPorts)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRelConnectsPorts::IfcRelConnectsPorts(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcPort* v5_RelatingPort, IfcPort* v6_RelatedPort, IfcElement* v7_RealizingElement) : IfcRelConnects((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatingPort)); e->setArgument(5,(v6_RelatedPort)); e->setArgument(6,(v7_RealizingElement)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRelConnectsStructuralActivity
-IfcStructuralActivityAssignmentSelect IfcRelConnectsStructuralActivity::RelatingElement() { return *entity->getArgument(4); }
-void IfcRelConnectsStructuralActivity::setRelatingElement(IfcStructuralActivityAssignmentSelect v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-IfcStructuralActivity* IfcRelConnectsStructuralActivity::RelatedStructuralActivity() { return (IfcStructuralActivity*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(5))); }
+IfcStructuralActivityAssignmentSelect* IfcRelConnectsStructuralActivity::RelatingElement() const { return (IfcStructuralActivityAssignmentSelect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(4))); }
+void IfcRelConnectsStructuralActivity::setRelatingElement(IfcStructuralActivityAssignmentSelect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+IfcStructuralActivity* IfcRelConnectsStructuralActivity::RelatedStructuralActivity() const { return (IfcStructuralActivity*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(5))); }
 void IfcRelConnectsStructuralActivity::setRelatedStructuralActivity(IfcStructuralActivity* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
 bool IfcRelConnectsStructuralActivity::is(Type::Enum v) const { return v == Type::IfcRelConnectsStructuralActivity || IfcRelConnects::is(v); }
 Type::Enum IfcRelConnectsStructuralActivity::type() const { return Type::IfcRelConnectsStructuralActivity; }
 Type::Enum IfcRelConnectsStructuralActivity::Class() { return Type::IfcRelConnectsStructuralActivity; }
-IfcRelConnectsStructuralActivity::IfcRelConnectsStructuralActivity(IfcAbstractEntityPtr e) : IfcRelConnects((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRelConnectsStructuralActivity)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRelConnectsStructuralActivity::IfcRelConnectsStructuralActivity(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, IfcStructuralActivityAssignmentSelect v5_RelatingElement, IfcStructuralActivity* v6_RelatedStructuralActivity) : IfcRelConnects((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatingElement)); e->setArgument(5,(v6_RelatedStructuralActivity)); entity = e; EntityBuffer::Add(this); }
+IfcRelConnectsStructuralActivity::IfcRelConnectsStructuralActivity(IfcAbstractEntity* e) : IfcRelConnects((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRelConnectsStructuralActivity)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRelConnectsStructuralActivity::IfcRelConnectsStructuralActivity(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcStructuralActivityAssignmentSelect* v5_RelatingElement, IfcStructuralActivity* v6_RelatedStructuralActivity) : IfcRelConnects((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatingElement)); e->setArgument(5,(v6_RelatedStructuralActivity)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRelConnectsStructuralMember
-IfcStructuralMember* IfcRelConnectsStructuralMember::RelatingStructuralMember() { return (IfcStructuralMember*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(4))); }
+IfcStructuralMember* IfcRelConnectsStructuralMember::RelatingStructuralMember() const { return (IfcStructuralMember*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(4))); }
 void IfcRelConnectsStructuralMember::setRelatingStructuralMember(IfcStructuralMember* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-IfcStructuralConnection* IfcRelConnectsStructuralMember::RelatedStructuralConnection() { return (IfcStructuralConnection*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(5))); }
+IfcStructuralConnection* IfcRelConnectsStructuralMember::RelatedStructuralConnection() const { return (IfcStructuralConnection*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(5))); }
 void IfcRelConnectsStructuralMember::setRelatedStructuralConnection(IfcStructuralConnection* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-bool IfcRelConnectsStructuralMember::hasAppliedCondition() { return !entity->getArgument(6)->isNull(); }
-IfcBoundaryCondition* IfcRelConnectsStructuralMember::AppliedCondition() { return (IfcBoundaryCondition*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(6))); }
+bool IfcRelConnectsStructuralMember::hasAppliedCondition() const { return !entity->getArgument(6)->isNull(); }
+IfcBoundaryCondition* IfcRelConnectsStructuralMember::AppliedCondition() const { return (IfcBoundaryCondition*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(6))); }
 void IfcRelConnectsStructuralMember::setAppliedCondition(IfcBoundaryCondition* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
-bool IfcRelConnectsStructuralMember::hasAdditionalConditions() { return !entity->getArgument(7)->isNull(); }
-IfcStructuralConnectionCondition* IfcRelConnectsStructuralMember::AdditionalConditions() { return (IfcStructuralConnectionCondition*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(7))); }
+bool IfcRelConnectsStructuralMember::hasAdditionalConditions() const { return !entity->getArgument(7)->isNull(); }
+IfcStructuralConnectionCondition* IfcRelConnectsStructuralMember::AdditionalConditions() const { return (IfcStructuralConnectionCondition*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(7))); }
 void IfcRelConnectsStructuralMember::setAdditionalConditions(IfcStructuralConnectionCondition* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
-bool IfcRelConnectsStructuralMember::hasSupportedLength() { return !entity->getArgument(8)->isNull(); }
-IfcLengthMeasure IfcRelConnectsStructuralMember::SupportedLength() { return *entity->getArgument(8); }
-void IfcRelConnectsStructuralMember::setSupportedLength(IfcLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
-bool IfcRelConnectsStructuralMember::hasConditionCoordinateSystem() { return !entity->getArgument(9)->isNull(); }
-IfcAxis2Placement3D* IfcRelConnectsStructuralMember::ConditionCoordinateSystem() { return (IfcAxis2Placement3D*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(9))); }
+bool IfcRelConnectsStructuralMember::hasSupportedLength() const { return !entity->getArgument(8)->isNull(); }
+double IfcRelConnectsStructuralMember::SupportedLength() const { return *entity->getArgument(8); }
+void IfcRelConnectsStructuralMember::setSupportedLength(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
+bool IfcRelConnectsStructuralMember::hasConditionCoordinateSystem() const { return !entity->getArgument(9)->isNull(); }
+IfcAxis2Placement3D* IfcRelConnectsStructuralMember::ConditionCoordinateSystem() const { return (IfcAxis2Placement3D*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(9))); }
 void IfcRelConnectsStructuralMember::setConditionCoordinateSystem(IfcAxis2Placement3D* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
 bool IfcRelConnectsStructuralMember::is(Type::Enum v) const { return v == Type::IfcRelConnectsStructuralMember || IfcRelConnects::is(v); }
 Type::Enum IfcRelConnectsStructuralMember::type() const { return Type::IfcRelConnectsStructuralMember; }
 Type::Enum IfcRelConnectsStructuralMember::Class() { return Type::IfcRelConnectsStructuralMember; }
-IfcRelConnectsStructuralMember::IfcRelConnectsStructuralMember(IfcAbstractEntityPtr e) : IfcRelConnects((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRelConnectsStructuralMember)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRelConnectsStructuralMember::IfcRelConnectsStructuralMember(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, IfcStructuralMember* v5_RelatingStructuralMember, IfcStructuralConnection* v6_RelatedStructuralConnection, IfcBoundaryCondition* v7_AppliedCondition, IfcStructuralConnectionCondition* v8_AdditionalConditions, boost::optional< IfcLengthMeasure > v9_SupportedLength, IfcAxis2Placement3D* v10_ConditionCoordinateSystem) : IfcRelConnects((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatingStructuralMember)); e->setArgument(5,(v6_RelatedStructuralConnection)); e->setArgument(6,(v7_AppliedCondition)); e->setArgument(7,(v8_AdditionalConditions)); if (v9_SupportedLength) { e->setArgument(8,(*v9_SupportedLength)); } else { e->setArgument(8); } e->setArgument(9,(v10_ConditionCoordinateSystem)); entity = e; EntityBuffer::Add(this); }
+IfcRelConnectsStructuralMember::IfcRelConnectsStructuralMember(IfcAbstractEntity* e) : IfcRelConnects((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRelConnectsStructuralMember)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRelConnectsStructuralMember::IfcRelConnectsStructuralMember(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcStructuralMember* v5_RelatingStructuralMember, IfcStructuralConnection* v6_RelatedStructuralConnection, IfcBoundaryCondition* v7_AppliedCondition, IfcStructuralConnectionCondition* v8_AdditionalConditions, boost::optional< double > v9_SupportedLength, IfcAxis2Placement3D* v10_ConditionCoordinateSystem) : IfcRelConnects((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatingStructuralMember)); e->setArgument(5,(v6_RelatedStructuralConnection)); e->setArgument(6,(v7_AppliedCondition)); e->setArgument(7,(v8_AdditionalConditions)); if (v9_SupportedLength) { e->setArgument(8,(*v9_SupportedLength)); } else { e->setArgument(8); } e->setArgument(9,(v10_ConditionCoordinateSystem)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRelConnectsWithEccentricity
-IfcConnectionGeometry* IfcRelConnectsWithEccentricity::ConnectionConstraint() { return (IfcConnectionGeometry*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(10))); }
+IfcConnectionGeometry* IfcRelConnectsWithEccentricity::ConnectionConstraint() const { return (IfcConnectionGeometry*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(10))); }
 void IfcRelConnectsWithEccentricity::setConnectionConstraint(IfcConnectionGeometry* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
 bool IfcRelConnectsWithEccentricity::is(Type::Enum v) const { return v == Type::IfcRelConnectsWithEccentricity || IfcRelConnectsStructuralMember::is(v); }
 Type::Enum IfcRelConnectsWithEccentricity::type() const { return Type::IfcRelConnectsWithEccentricity; }
 Type::Enum IfcRelConnectsWithEccentricity::Class() { return Type::IfcRelConnectsWithEccentricity; }
-IfcRelConnectsWithEccentricity::IfcRelConnectsWithEccentricity(IfcAbstractEntityPtr e) : IfcRelConnectsStructuralMember((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRelConnectsWithEccentricity)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRelConnectsWithEccentricity::IfcRelConnectsWithEccentricity(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, IfcStructuralMember* v5_RelatingStructuralMember, IfcStructuralConnection* v6_RelatedStructuralConnection, IfcBoundaryCondition* v7_AppliedCondition, IfcStructuralConnectionCondition* v8_AdditionalConditions, boost::optional< IfcLengthMeasure > v9_SupportedLength, IfcAxis2Placement3D* v10_ConditionCoordinateSystem, IfcConnectionGeometry* v11_ConnectionConstraint) : IfcRelConnectsStructuralMember((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatingStructuralMember)); e->setArgument(5,(v6_RelatedStructuralConnection)); e->setArgument(6,(v7_AppliedCondition)); e->setArgument(7,(v8_AdditionalConditions)); if (v9_SupportedLength) { e->setArgument(8,(*v9_SupportedLength)); } else { e->setArgument(8); } e->setArgument(9,(v10_ConditionCoordinateSystem)); e->setArgument(10,(v11_ConnectionConstraint)); entity = e; EntityBuffer::Add(this); }
+IfcRelConnectsWithEccentricity::IfcRelConnectsWithEccentricity(IfcAbstractEntity* e) : IfcRelConnectsStructuralMember((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRelConnectsWithEccentricity)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRelConnectsWithEccentricity::IfcRelConnectsWithEccentricity(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcStructuralMember* v5_RelatingStructuralMember, IfcStructuralConnection* v6_RelatedStructuralConnection, IfcBoundaryCondition* v7_AppliedCondition, IfcStructuralConnectionCondition* v8_AdditionalConditions, boost::optional< double > v9_SupportedLength, IfcAxis2Placement3D* v10_ConditionCoordinateSystem, IfcConnectionGeometry* v11_ConnectionConstraint) : IfcRelConnectsStructuralMember((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatingStructuralMember)); e->setArgument(5,(v6_RelatedStructuralConnection)); e->setArgument(6,(v7_AppliedCondition)); e->setArgument(7,(v8_AdditionalConditions)); if (v9_SupportedLength) { e->setArgument(8,(*v9_SupportedLength)); } else { e->setArgument(8); } e->setArgument(9,(v10_ConditionCoordinateSystem)); e->setArgument(10,(v11_ConnectionConstraint)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRelConnectsWithRealizingElements
-SHARED_PTR< IfcTemplatedEntityList< IfcElement > > IfcRelConnectsWithRealizingElements::RealizingElements() { RETURN_AS_LIST(IfcElement,7) }
-void IfcRelConnectsWithRealizingElements::setRealizingElements(SHARED_PTR< IfcTemplatedEntityList< IfcElement > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v->generalize()); }
-bool IfcRelConnectsWithRealizingElements::hasConnectionType() { return !entity->getArgument(8)->isNull(); }
-IfcLabel IfcRelConnectsWithRealizingElements::ConnectionType() { return *entity->getArgument(8); }
-void IfcRelConnectsWithRealizingElements::setConnectionType(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
+IfcTemplatedEntityList< IfcElement >::ptr IfcRelConnectsWithRealizingElements::RealizingElements() const { IfcEntityList::ptr es = *entity->getArgument(7); return es->as<IfcElement>(); }
+void IfcRelConnectsWithRealizingElements::setRealizingElements(IfcTemplatedEntityList< IfcElement >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v->generalize()); }
+bool IfcRelConnectsWithRealizingElements::hasConnectionType() const { return !entity->getArgument(8)->isNull(); }
+std::string IfcRelConnectsWithRealizingElements::ConnectionType() const { return *entity->getArgument(8); }
+void IfcRelConnectsWithRealizingElements::setConnectionType(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
 bool IfcRelConnectsWithRealizingElements::is(Type::Enum v) const { return v == Type::IfcRelConnectsWithRealizingElements || IfcRelConnectsElements::is(v); }
 Type::Enum IfcRelConnectsWithRealizingElements::type() const { return Type::IfcRelConnectsWithRealizingElements; }
 Type::Enum IfcRelConnectsWithRealizingElements::Class() { return Type::IfcRelConnectsWithRealizingElements; }
-IfcRelConnectsWithRealizingElements::IfcRelConnectsWithRealizingElements(IfcAbstractEntityPtr e) : IfcRelConnectsElements((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRelConnectsWithRealizingElements)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRelConnectsWithRealizingElements::IfcRelConnectsWithRealizingElements(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, IfcConnectionGeometry* v5_ConnectionGeometry, IfcElement* v6_RelatingElement, IfcElement* v7_RelatedElement, SHARED_PTR< IfcTemplatedEntityList< IfcElement > > v8_RealizingElements, boost::optional< IfcLabel > v9_ConnectionType) : IfcRelConnectsElements((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_ConnectionGeometry)); e->setArgument(5,(v6_RelatingElement)); e->setArgument(6,(v7_RelatedElement)); e->setArgument(7,(v8_RealizingElements)->generalize()); if (v9_ConnectionType) { e->setArgument(8,(*v9_ConnectionType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcRelConnectsWithRealizingElements::IfcRelConnectsWithRealizingElements(IfcAbstractEntity* e) : IfcRelConnectsElements((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRelConnectsWithRealizingElements)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRelConnectsWithRealizingElements::IfcRelConnectsWithRealizingElements(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcConnectionGeometry* v5_ConnectionGeometry, IfcElement* v6_RelatingElement, IfcElement* v7_RelatedElement, IfcTemplatedEntityList< IfcElement >::ptr v8_RealizingElements, boost::optional< std::string > v9_ConnectionType) : IfcRelConnectsElements((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_ConnectionGeometry)); e->setArgument(5,(v6_RelatingElement)); e->setArgument(6,(v7_RelatedElement)); e->setArgument(7,(v8_RealizingElements)->generalize()); if (v9_ConnectionType) { e->setArgument(8,(*v9_ConnectionType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRelContainedInSpatialStructure
-SHARED_PTR< IfcTemplatedEntityList< IfcProduct > > IfcRelContainedInSpatialStructure::RelatedElements() { RETURN_AS_LIST(IfcProduct,4) }
-void IfcRelContainedInSpatialStructure::setRelatedElements(SHARED_PTR< IfcTemplatedEntityList< IfcProduct > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v->generalize()); }
-IfcSpatialElement* IfcRelContainedInSpatialStructure::RelatingStructure() { return (IfcSpatialElement*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(5))); }
+IfcTemplatedEntityList< IfcProduct >::ptr IfcRelContainedInSpatialStructure::RelatedElements() const { IfcEntityList::ptr es = *entity->getArgument(4); return es->as<IfcProduct>(); }
+void IfcRelContainedInSpatialStructure::setRelatedElements(IfcTemplatedEntityList< IfcProduct >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v->generalize()); }
+IfcSpatialElement* IfcRelContainedInSpatialStructure::RelatingStructure() const { return (IfcSpatialElement*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(5))); }
 void IfcRelContainedInSpatialStructure::setRelatingStructure(IfcSpatialElement* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
 bool IfcRelContainedInSpatialStructure::is(Type::Enum v) const { return v == Type::IfcRelContainedInSpatialStructure || IfcRelConnects::is(v); }
 Type::Enum IfcRelContainedInSpatialStructure::type() const { return Type::IfcRelContainedInSpatialStructure; }
 Type::Enum IfcRelContainedInSpatialStructure::Class() { return Type::IfcRelContainedInSpatialStructure; }
-IfcRelContainedInSpatialStructure::IfcRelContainedInSpatialStructure(IfcAbstractEntityPtr e) : IfcRelConnects((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRelContainedInSpatialStructure)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRelContainedInSpatialStructure::IfcRelContainedInSpatialStructure(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, SHARED_PTR< IfcTemplatedEntityList< IfcProduct > > v5_RelatedElements, IfcSpatialElement* v6_RelatingStructure) : IfcRelConnects((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatedElements)->generalize()); e->setArgument(5,(v6_RelatingStructure)); entity = e; EntityBuffer::Add(this); }
+IfcRelContainedInSpatialStructure::IfcRelContainedInSpatialStructure(IfcAbstractEntity* e) : IfcRelConnects((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRelContainedInSpatialStructure)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRelContainedInSpatialStructure::IfcRelContainedInSpatialStructure(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcTemplatedEntityList< IfcProduct >::ptr v5_RelatedElements, IfcSpatialElement* v6_RelatingStructure) : IfcRelConnects((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatedElements)->generalize()); e->setArgument(5,(v6_RelatingStructure)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRelCoversBldgElements
-IfcElement* IfcRelCoversBldgElements::RelatingBuildingElement() { return (IfcElement*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(4))); }
+IfcElement* IfcRelCoversBldgElements::RelatingBuildingElement() const { return (IfcElement*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(4))); }
 void IfcRelCoversBldgElements::setRelatingBuildingElement(IfcElement* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-SHARED_PTR< IfcTemplatedEntityList< IfcCovering > > IfcRelCoversBldgElements::RelatedCoverings() { RETURN_AS_LIST(IfcCovering,5) }
-void IfcRelCoversBldgElements::setRelatedCoverings(SHARED_PTR< IfcTemplatedEntityList< IfcCovering > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v->generalize()); }
+IfcTemplatedEntityList< IfcCovering >::ptr IfcRelCoversBldgElements::RelatedCoverings() const { IfcEntityList::ptr es = *entity->getArgument(5); return es->as<IfcCovering>(); }
+void IfcRelCoversBldgElements::setRelatedCoverings(IfcTemplatedEntityList< IfcCovering >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v->generalize()); }
 bool IfcRelCoversBldgElements::is(Type::Enum v) const { return v == Type::IfcRelCoversBldgElements || IfcRelConnects::is(v); }
 Type::Enum IfcRelCoversBldgElements::type() const { return Type::IfcRelCoversBldgElements; }
 Type::Enum IfcRelCoversBldgElements::Class() { return Type::IfcRelCoversBldgElements; }
-IfcRelCoversBldgElements::IfcRelCoversBldgElements(IfcAbstractEntityPtr e) : IfcRelConnects((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRelCoversBldgElements)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRelCoversBldgElements::IfcRelCoversBldgElements(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, IfcElement* v5_RelatingBuildingElement, SHARED_PTR< IfcTemplatedEntityList< IfcCovering > > v6_RelatedCoverings) : IfcRelConnects((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatingBuildingElement)); e->setArgument(5,(v6_RelatedCoverings)->generalize()); entity = e; EntityBuffer::Add(this); }
+IfcRelCoversBldgElements::IfcRelCoversBldgElements(IfcAbstractEntity* e) : IfcRelConnects((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRelCoversBldgElements)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRelCoversBldgElements::IfcRelCoversBldgElements(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcElement* v5_RelatingBuildingElement, IfcTemplatedEntityList< IfcCovering >::ptr v6_RelatedCoverings) : IfcRelConnects((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatingBuildingElement)); e->setArgument(5,(v6_RelatedCoverings)->generalize()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRelCoversSpaces
-IfcSpace* IfcRelCoversSpaces::RelatingSpace() { return (IfcSpace*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(4))); }
+IfcSpace* IfcRelCoversSpaces::RelatingSpace() const { return (IfcSpace*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(4))); }
 void IfcRelCoversSpaces::setRelatingSpace(IfcSpace* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-SHARED_PTR< IfcTemplatedEntityList< IfcCovering > > IfcRelCoversSpaces::RelatedCoverings() { RETURN_AS_LIST(IfcCovering,5) }
-void IfcRelCoversSpaces::setRelatedCoverings(SHARED_PTR< IfcTemplatedEntityList< IfcCovering > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v->generalize()); }
+IfcTemplatedEntityList< IfcCovering >::ptr IfcRelCoversSpaces::RelatedCoverings() const { IfcEntityList::ptr es = *entity->getArgument(5); return es->as<IfcCovering>(); }
+void IfcRelCoversSpaces::setRelatedCoverings(IfcTemplatedEntityList< IfcCovering >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v->generalize()); }
 bool IfcRelCoversSpaces::is(Type::Enum v) const { return v == Type::IfcRelCoversSpaces || IfcRelConnects::is(v); }
 Type::Enum IfcRelCoversSpaces::type() const { return Type::IfcRelCoversSpaces; }
 Type::Enum IfcRelCoversSpaces::Class() { return Type::IfcRelCoversSpaces; }
-IfcRelCoversSpaces::IfcRelCoversSpaces(IfcAbstractEntityPtr e) : IfcRelConnects((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRelCoversSpaces)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRelCoversSpaces::IfcRelCoversSpaces(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, IfcSpace* v5_RelatingSpace, SHARED_PTR< IfcTemplatedEntityList< IfcCovering > > v6_RelatedCoverings) : IfcRelConnects((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatingSpace)); e->setArgument(5,(v6_RelatedCoverings)->generalize()); entity = e; EntityBuffer::Add(this); }
+IfcRelCoversSpaces::IfcRelCoversSpaces(IfcAbstractEntity* e) : IfcRelConnects((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRelCoversSpaces)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRelCoversSpaces::IfcRelCoversSpaces(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcSpace* v5_RelatingSpace, IfcTemplatedEntityList< IfcCovering >::ptr v6_RelatedCoverings) : IfcRelConnects((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatingSpace)); e->setArgument(5,(v6_RelatedCoverings)->generalize()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRelDeclares
-IfcContext* IfcRelDeclares::RelatingContext() { return (IfcContext*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(4))); }
+IfcContext* IfcRelDeclares::RelatingContext() const { return (IfcContext*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(4))); }
 void IfcRelDeclares::setRelatingContext(IfcContext* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > IfcRelDeclares::RelatedDefinitions() { RETURN_AS_LIST(IfcUtil::IfcAbstractSelect,5) }
-void IfcRelDeclares::setRelatedDefinitions(SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v->generalize()); }
+IfcEntityList::ptr IfcRelDeclares::RelatedDefinitions() const { return *entity->getArgument(5); }
+void IfcRelDeclares::setRelatedDefinitions(IfcEntityList::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
 bool IfcRelDeclares::is(Type::Enum v) const { return v == Type::IfcRelDeclares || IfcRelationship::is(v); }
 Type::Enum IfcRelDeclares::type() const { return Type::IfcRelDeclares; }
 Type::Enum IfcRelDeclares::Class() { return Type::IfcRelDeclares; }
-IfcRelDeclares::IfcRelDeclares(IfcAbstractEntityPtr e) : IfcRelationship((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRelDeclares)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRelDeclares::IfcRelDeclares(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, IfcContext* v5_RelatingContext, IfcEntities v6_RelatedDefinitions) : IfcRelationship((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatingContext)); e->setArgument(5,(v6_RelatedDefinitions)); entity = e; EntityBuffer::Add(this); }
+IfcRelDeclares::IfcRelDeclares(IfcAbstractEntity* e) : IfcRelationship((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRelDeclares)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRelDeclares::IfcRelDeclares(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcContext* v5_RelatingContext, IfcEntityList::ptr v6_RelatedDefinitions) : IfcRelationship((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatingContext)); e->setArgument(5,(v6_RelatedDefinitions)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRelDecomposes
 bool IfcRelDecomposes::is(Type::Enum v) const { return v == Type::IfcRelDecomposes || IfcRelationship::is(v); }
 Type::Enum IfcRelDecomposes::type() const { return Type::IfcRelDecomposes; }
 Type::Enum IfcRelDecomposes::Class() { return Type::IfcRelDecomposes; }
-IfcRelDecomposes::IfcRelDecomposes(IfcAbstractEntityPtr e) : IfcRelationship((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRelDecomposes)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRelDecomposes::IfcRelDecomposes(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description) : IfcRelationship((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } entity = e; EntityBuffer::Add(this); }
+IfcRelDecomposes::IfcRelDecomposes(IfcAbstractEntity* e) : IfcRelationship((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRelDecomposes)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRelDecomposes::IfcRelDecomposes(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description) : IfcRelationship((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRelDefines
 bool IfcRelDefines::is(Type::Enum v) const { return v == Type::IfcRelDefines || IfcRelationship::is(v); }
 Type::Enum IfcRelDefines::type() const { return Type::IfcRelDefines; }
 Type::Enum IfcRelDefines::Class() { return Type::IfcRelDefines; }
-IfcRelDefines::IfcRelDefines(IfcAbstractEntityPtr e) : IfcRelationship((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRelDefines)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRelDefines::IfcRelDefines(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description) : IfcRelationship((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } entity = e; EntityBuffer::Add(this); }
+IfcRelDefines::IfcRelDefines(IfcAbstractEntity* e) : IfcRelationship((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRelDefines)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRelDefines::IfcRelDefines(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description) : IfcRelationship((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRelDefinesByObject
-SHARED_PTR< IfcTemplatedEntityList< IfcObject > > IfcRelDefinesByObject::RelatedObjects() { RETURN_AS_LIST(IfcObject,4) }
-void IfcRelDefinesByObject::setRelatedObjects(SHARED_PTR< IfcTemplatedEntityList< IfcObject > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v->generalize()); }
-IfcObject* IfcRelDefinesByObject::RelatingObject() { return (IfcObject*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(5))); }
+IfcTemplatedEntityList< IfcObject >::ptr IfcRelDefinesByObject::RelatedObjects() const { IfcEntityList::ptr es = *entity->getArgument(4); return es->as<IfcObject>(); }
+void IfcRelDefinesByObject::setRelatedObjects(IfcTemplatedEntityList< IfcObject >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v->generalize()); }
+IfcObject* IfcRelDefinesByObject::RelatingObject() const { return (IfcObject*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(5))); }
 void IfcRelDefinesByObject::setRelatingObject(IfcObject* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
 bool IfcRelDefinesByObject::is(Type::Enum v) const { return v == Type::IfcRelDefinesByObject || IfcRelDefines::is(v); }
 Type::Enum IfcRelDefinesByObject::type() const { return Type::IfcRelDefinesByObject; }
 Type::Enum IfcRelDefinesByObject::Class() { return Type::IfcRelDefinesByObject; }
-IfcRelDefinesByObject::IfcRelDefinesByObject(IfcAbstractEntityPtr e) : IfcRelDefines((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRelDefinesByObject)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRelDefinesByObject::IfcRelDefinesByObject(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, SHARED_PTR< IfcTemplatedEntityList< IfcObject > > v5_RelatedObjects, IfcObject* v6_RelatingObject) : IfcRelDefines((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatedObjects)->generalize()); e->setArgument(5,(v6_RelatingObject)); entity = e; EntityBuffer::Add(this); }
+IfcRelDefinesByObject::IfcRelDefinesByObject(IfcAbstractEntity* e) : IfcRelDefines((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRelDefinesByObject)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRelDefinesByObject::IfcRelDefinesByObject(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcTemplatedEntityList< IfcObject >::ptr v5_RelatedObjects, IfcObject* v6_RelatingObject) : IfcRelDefines((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatedObjects)->generalize()); e->setArgument(5,(v6_RelatingObject)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRelDefinesByProperties
-SHARED_PTR< IfcTemplatedEntityList< IfcObjectDefinition > > IfcRelDefinesByProperties::RelatedObjects() { RETURN_AS_LIST(IfcObjectDefinition,4) }
-void IfcRelDefinesByProperties::setRelatedObjects(SHARED_PTR< IfcTemplatedEntityList< IfcObjectDefinition > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v->generalize()); }
-IfcPropertySetDefinitionSelect IfcRelDefinesByProperties::RelatingPropertyDefinition() { return *entity->getArgument(5); }
-void IfcRelDefinesByProperties::setRelatingPropertyDefinition(IfcPropertySetDefinitionSelect v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+IfcTemplatedEntityList< IfcObjectDefinition >::ptr IfcRelDefinesByProperties::RelatedObjects() const { IfcEntityList::ptr es = *entity->getArgument(4); return es->as<IfcObjectDefinition>(); }
+void IfcRelDefinesByProperties::setRelatedObjects(IfcTemplatedEntityList< IfcObjectDefinition >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v->generalize()); }
+IfcPropertySetDefinitionSelect* IfcRelDefinesByProperties::RelatingPropertyDefinition() const { return (IfcPropertySetDefinitionSelect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(5))); }
+void IfcRelDefinesByProperties::setRelatingPropertyDefinition(IfcPropertySetDefinitionSelect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
 bool IfcRelDefinesByProperties::is(Type::Enum v) const { return v == Type::IfcRelDefinesByProperties || IfcRelDefines::is(v); }
 Type::Enum IfcRelDefinesByProperties::type() const { return Type::IfcRelDefinesByProperties; }
 Type::Enum IfcRelDefinesByProperties::Class() { return Type::IfcRelDefinesByProperties; }
-IfcRelDefinesByProperties::IfcRelDefinesByProperties(IfcAbstractEntityPtr e) : IfcRelDefines((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRelDefinesByProperties)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRelDefinesByProperties::IfcRelDefinesByProperties(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, SHARED_PTR< IfcTemplatedEntityList< IfcObjectDefinition > > v5_RelatedObjects, IfcPropertySetDefinitionSelect v6_RelatingPropertyDefinition) : IfcRelDefines((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatedObjects)->generalize()); e->setArgument(5,(v6_RelatingPropertyDefinition)); entity = e; EntityBuffer::Add(this); }
+IfcRelDefinesByProperties::IfcRelDefinesByProperties(IfcAbstractEntity* e) : IfcRelDefines((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRelDefinesByProperties)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRelDefinesByProperties::IfcRelDefinesByProperties(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcTemplatedEntityList< IfcObjectDefinition >::ptr v5_RelatedObjects, IfcPropertySetDefinitionSelect* v6_RelatingPropertyDefinition) : IfcRelDefines((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatedObjects)->generalize()); e->setArgument(5,(v6_RelatingPropertyDefinition)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRelDefinesByTemplate
-SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > IfcRelDefinesByTemplate::RelatedPropertySets() { RETURN_AS_LIST(IfcPropertySetDefinition,4) }
-void IfcRelDefinesByTemplate::setRelatedPropertySets(SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v->generalize()); }
-IfcPropertySetTemplate* IfcRelDefinesByTemplate::RelatingTemplate() { return (IfcPropertySetTemplate*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(5))); }
+IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr IfcRelDefinesByTemplate::RelatedPropertySets() const { IfcEntityList::ptr es = *entity->getArgument(4); return es->as<IfcPropertySetDefinition>(); }
+void IfcRelDefinesByTemplate::setRelatedPropertySets(IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v->generalize()); }
+IfcPropertySetTemplate* IfcRelDefinesByTemplate::RelatingTemplate() const { return (IfcPropertySetTemplate*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(5))); }
 void IfcRelDefinesByTemplate::setRelatingTemplate(IfcPropertySetTemplate* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
 bool IfcRelDefinesByTemplate::is(Type::Enum v) const { return v == Type::IfcRelDefinesByTemplate || IfcRelDefines::is(v); }
 Type::Enum IfcRelDefinesByTemplate::type() const { return Type::IfcRelDefinesByTemplate; }
 Type::Enum IfcRelDefinesByTemplate::Class() { return Type::IfcRelDefinesByTemplate; }
-IfcRelDefinesByTemplate::IfcRelDefinesByTemplate(IfcAbstractEntityPtr e) : IfcRelDefines((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRelDefinesByTemplate)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRelDefinesByTemplate::IfcRelDefinesByTemplate(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > v5_RelatedPropertySets, IfcPropertySetTemplate* v6_RelatingTemplate) : IfcRelDefines((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatedPropertySets)->generalize()); e->setArgument(5,(v6_RelatingTemplate)); entity = e; EntityBuffer::Add(this); }
+IfcRelDefinesByTemplate::IfcRelDefinesByTemplate(IfcAbstractEntity* e) : IfcRelDefines((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRelDefinesByTemplate)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRelDefinesByTemplate::IfcRelDefinesByTemplate(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr v5_RelatedPropertySets, IfcPropertySetTemplate* v6_RelatingTemplate) : IfcRelDefines((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatedPropertySets)->generalize()); e->setArgument(5,(v6_RelatingTemplate)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRelDefinesByType
-SHARED_PTR< IfcTemplatedEntityList< IfcObject > > IfcRelDefinesByType::RelatedObjects() { RETURN_AS_LIST(IfcObject,4) }
-void IfcRelDefinesByType::setRelatedObjects(SHARED_PTR< IfcTemplatedEntityList< IfcObject > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v->generalize()); }
-IfcTypeObject* IfcRelDefinesByType::RelatingType() { return (IfcTypeObject*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(5))); }
+IfcTemplatedEntityList< IfcObject >::ptr IfcRelDefinesByType::RelatedObjects() const { IfcEntityList::ptr es = *entity->getArgument(4); return es->as<IfcObject>(); }
+void IfcRelDefinesByType::setRelatedObjects(IfcTemplatedEntityList< IfcObject >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v->generalize()); }
+IfcTypeObject* IfcRelDefinesByType::RelatingType() const { return (IfcTypeObject*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(5))); }
 void IfcRelDefinesByType::setRelatingType(IfcTypeObject* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
 bool IfcRelDefinesByType::is(Type::Enum v) const { return v == Type::IfcRelDefinesByType || IfcRelDefines::is(v); }
 Type::Enum IfcRelDefinesByType::type() const { return Type::IfcRelDefinesByType; }
 Type::Enum IfcRelDefinesByType::Class() { return Type::IfcRelDefinesByType; }
-IfcRelDefinesByType::IfcRelDefinesByType(IfcAbstractEntityPtr e) : IfcRelDefines((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRelDefinesByType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRelDefinesByType::IfcRelDefinesByType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, SHARED_PTR< IfcTemplatedEntityList< IfcObject > > v5_RelatedObjects, IfcTypeObject* v6_RelatingType) : IfcRelDefines((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatedObjects)->generalize()); e->setArgument(5,(v6_RelatingType)); entity = e; EntityBuffer::Add(this); }
+IfcRelDefinesByType::IfcRelDefinesByType(IfcAbstractEntity* e) : IfcRelDefines((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRelDefinesByType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRelDefinesByType::IfcRelDefinesByType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcTemplatedEntityList< IfcObject >::ptr v5_RelatedObjects, IfcTypeObject* v6_RelatingType) : IfcRelDefines((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatedObjects)->generalize()); e->setArgument(5,(v6_RelatingType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRelFillsElement
-IfcOpeningElement* IfcRelFillsElement::RelatingOpeningElement() { return (IfcOpeningElement*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(4))); }
+IfcOpeningElement* IfcRelFillsElement::RelatingOpeningElement() const { return (IfcOpeningElement*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(4))); }
 void IfcRelFillsElement::setRelatingOpeningElement(IfcOpeningElement* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-IfcElement* IfcRelFillsElement::RelatedBuildingElement() { return (IfcElement*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(5))); }
+IfcElement* IfcRelFillsElement::RelatedBuildingElement() const { return (IfcElement*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(5))); }
 void IfcRelFillsElement::setRelatedBuildingElement(IfcElement* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
 bool IfcRelFillsElement::is(Type::Enum v) const { return v == Type::IfcRelFillsElement || IfcRelConnects::is(v); }
 Type::Enum IfcRelFillsElement::type() const { return Type::IfcRelFillsElement; }
 Type::Enum IfcRelFillsElement::Class() { return Type::IfcRelFillsElement; }
-IfcRelFillsElement::IfcRelFillsElement(IfcAbstractEntityPtr e) : IfcRelConnects((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRelFillsElement)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRelFillsElement::IfcRelFillsElement(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, IfcOpeningElement* v5_RelatingOpeningElement, IfcElement* v6_RelatedBuildingElement) : IfcRelConnects((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatingOpeningElement)); e->setArgument(5,(v6_RelatedBuildingElement)); entity = e; EntityBuffer::Add(this); }
+IfcRelFillsElement::IfcRelFillsElement(IfcAbstractEntity* e) : IfcRelConnects((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRelFillsElement)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRelFillsElement::IfcRelFillsElement(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcOpeningElement* v5_RelatingOpeningElement, IfcElement* v6_RelatedBuildingElement) : IfcRelConnects((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatingOpeningElement)); e->setArgument(5,(v6_RelatedBuildingElement)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRelFlowControlElements
-SHARED_PTR< IfcTemplatedEntityList< IfcDistributionControlElement > > IfcRelFlowControlElements::RelatedControlElements() { RETURN_AS_LIST(IfcDistributionControlElement,4) }
-void IfcRelFlowControlElements::setRelatedControlElements(SHARED_PTR< IfcTemplatedEntityList< IfcDistributionControlElement > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v->generalize()); }
-IfcDistributionFlowElement* IfcRelFlowControlElements::RelatingFlowElement() { return (IfcDistributionFlowElement*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(5))); }
+IfcTemplatedEntityList< IfcDistributionControlElement >::ptr IfcRelFlowControlElements::RelatedControlElements() const { IfcEntityList::ptr es = *entity->getArgument(4); return es->as<IfcDistributionControlElement>(); }
+void IfcRelFlowControlElements::setRelatedControlElements(IfcTemplatedEntityList< IfcDistributionControlElement >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v->generalize()); }
+IfcDistributionFlowElement* IfcRelFlowControlElements::RelatingFlowElement() const { return (IfcDistributionFlowElement*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(5))); }
 void IfcRelFlowControlElements::setRelatingFlowElement(IfcDistributionFlowElement* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
 bool IfcRelFlowControlElements::is(Type::Enum v) const { return v == Type::IfcRelFlowControlElements || IfcRelConnects::is(v); }
 Type::Enum IfcRelFlowControlElements::type() const { return Type::IfcRelFlowControlElements; }
 Type::Enum IfcRelFlowControlElements::Class() { return Type::IfcRelFlowControlElements; }
-IfcRelFlowControlElements::IfcRelFlowControlElements(IfcAbstractEntityPtr e) : IfcRelConnects((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRelFlowControlElements)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRelFlowControlElements::IfcRelFlowControlElements(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, SHARED_PTR< IfcTemplatedEntityList< IfcDistributionControlElement > > v5_RelatedControlElements, IfcDistributionFlowElement* v6_RelatingFlowElement) : IfcRelConnects((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatedControlElements)->generalize()); e->setArgument(5,(v6_RelatingFlowElement)); entity = e; EntityBuffer::Add(this); }
+IfcRelFlowControlElements::IfcRelFlowControlElements(IfcAbstractEntity* e) : IfcRelConnects((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRelFlowControlElements)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRelFlowControlElements::IfcRelFlowControlElements(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcTemplatedEntityList< IfcDistributionControlElement >::ptr v5_RelatedControlElements, IfcDistributionFlowElement* v6_RelatingFlowElement) : IfcRelConnects((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatedControlElements)->generalize()); e->setArgument(5,(v6_RelatingFlowElement)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRelInterferesElements
-IfcElement* IfcRelInterferesElements::RelatingElement() { return (IfcElement*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(4))); }
+IfcElement* IfcRelInterferesElements::RelatingElement() const { return (IfcElement*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(4))); }
 void IfcRelInterferesElements::setRelatingElement(IfcElement* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-IfcElement* IfcRelInterferesElements::RelatedElement() { return (IfcElement*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(5))); }
+IfcElement* IfcRelInterferesElements::RelatedElement() const { return (IfcElement*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(5))); }
 void IfcRelInterferesElements::setRelatedElement(IfcElement* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-bool IfcRelInterferesElements::hasInterferenceGeometry() { return !entity->getArgument(6)->isNull(); }
-IfcConnectionGeometry* IfcRelInterferesElements::InterferenceGeometry() { return (IfcConnectionGeometry*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(6))); }
+bool IfcRelInterferesElements::hasInterferenceGeometry() const { return !entity->getArgument(6)->isNull(); }
+IfcConnectionGeometry* IfcRelInterferesElements::InterferenceGeometry() const { return (IfcConnectionGeometry*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(6))); }
 void IfcRelInterferesElements::setInterferenceGeometry(IfcConnectionGeometry* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
-bool IfcRelInterferesElements::hasInterferenceType() { return !entity->getArgument(7)->isNull(); }
-IfcIdentifier IfcRelInterferesElements::InterferenceType() { return *entity->getArgument(7); }
-void IfcRelInterferesElements::setInterferenceType(IfcIdentifier v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
-bool IfcRelInterferesElements::ImpliedOrder() { return *entity->getArgument(8); }
+bool IfcRelInterferesElements::hasInterferenceType() const { return !entity->getArgument(7)->isNull(); }
+std::string IfcRelInterferesElements::InterferenceType() const { return *entity->getArgument(7); }
+void IfcRelInterferesElements::setInterferenceType(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
+bool IfcRelInterferesElements::ImpliedOrder() const { return *entity->getArgument(8); }
 void IfcRelInterferesElements::setImpliedOrder(bool v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
 bool IfcRelInterferesElements::is(Type::Enum v) const { return v == Type::IfcRelInterferesElements || IfcRelConnects::is(v); }
 Type::Enum IfcRelInterferesElements::type() const { return Type::IfcRelInterferesElements; }
 Type::Enum IfcRelInterferesElements::Class() { return Type::IfcRelInterferesElements; }
-IfcRelInterferesElements::IfcRelInterferesElements(IfcAbstractEntityPtr e) : IfcRelConnects((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRelInterferesElements)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRelInterferesElements::IfcRelInterferesElements(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, IfcElement* v5_RelatingElement, IfcElement* v6_RelatedElement, IfcConnectionGeometry* v7_InterferenceGeometry, boost::optional< IfcIdentifier > v8_InterferenceType, bool v9_ImpliedOrder) : IfcRelConnects((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatingElement)); e->setArgument(5,(v6_RelatedElement)); e->setArgument(6,(v7_InterferenceGeometry)); if (v8_InterferenceType) { e->setArgument(7,(*v8_InterferenceType)); } else { e->setArgument(7); } e->setArgument(8,(v9_ImpliedOrder)); entity = e; EntityBuffer::Add(this); }
+IfcRelInterferesElements::IfcRelInterferesElements(IfcAbstractEntity* e) : IfcRelConnects((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRelInterferesElements)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRelInterferesElements::IfcRelInterferesElements(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcElement* v5_RelatingElement, IfcElement* v6_RelatedElement, IfcConnectionGeometry* v7_InterferenceGeometry, boost::optional< std::string > v8_InterferenceType, bool v9_ImpliedOrder) : IfcRelConnects((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatingElement)); e->setArgument(5,(v6_RelatedElement)); e->setArgument(6,(v7_InterferenceGeometry)); if (v8_InterferenceType) { e->setArgument(7,(*v8_InterferenceType)); } else { e->setArgument(7); } e->setArgument(8,(v9_ImpliedOrder)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRelNests
-IfcObjectDefinition* IfcRelNests::RelatingObject() { return (IfcObjectDefinition*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(4))); }
+IfcObjectDefinition* IfcRelNests::RelatingObject() const { return (IfcObjectDefinition*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(4))); }
 void IfcRelNests::setRelatingObject(IfcObjectDefinition* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-SHARED_PTR< IfcTemplatedEntityList< IfcObjectDefinition > > IfcRelNests::RelatedObjects() { RETURN_AS_LIST(IfcObjectDefinition,5) }
-void IfcRelNests::setRelatedObjects(SHARED_PTR< IfcTemplatedEntityList< IfcObjectDefinition > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v->generalize()); }
+IfcTemplatedEntityList< IfcObjectDefinition >::ptr IfcRelNests::RelatedObjects() const { IfcEntityList::ptr es = *entity->getArgument(5); return es->as<IfcObjectDefinition>(); }
+void IfcRelNests::setRelatedObjects(IfcTemplatedEntityList< IfcObjectDefinition >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v->generalize()); }
 bool IfcRelNests::is(Type::Enum v) const { return v == Type::IfcRelNests || IfcRelDecomposes::is(v); }
 Type::Enum IfcRelNests::type() const { return Type::IfcRelNests; }
 Type::Enum IfcRelNests::Class() { return Type::IfcRelNests; }
-IfcRelNests::IfcRelNests(IfcAbstractEntityPtr e) : IfcRelDecomposes((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRelNests)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRelNests::IfcRelNests(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, IfcObjectDefinition* v5_RelatingObject, SHARED_PTR< IfcTemplatedEntityList< IfcObjectDefinition > > v6_RelatedObjects) : IfcRelDecomposes((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatingObject)); e->setArgument(5,(v6_RelatedObjects)->generalize()); entity = e; EntityBuffer::Add(this); }
+IfcRelNests::IfcRelNests(IfcAbstractEntity* e) : IfcRelDecomposes((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRelNests)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRelNests::IfcRelNests(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcObjectDefinition* v5_RelatingObject, IfcTemplatedEntityList< IfcObjectDefinition >::ptr v6_RelatedObjects) : IfcRelDecomposes((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatingObject)); e->setArgument(5,(v6_RelatedObjects)->generalize()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRelProjectsElement
-IfcElement* IfcRelProjectsElement::RelatingElement() { return (IfcElement*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(4))); }
+IfcElement* IfcRelProjectsElement::RelatingElement() const { return (IfcElement*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(4))); }
 void IfcRelProjectsElement::setRelatingElement(IfcElement* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-IfcFeatureElementAddition* IfcRelProjectsElement::RelatedFeatureElement() { return (IfcFeatureElementAddition*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(5))); }
+IfcFeatureElementAddition* IfcRelProjectsElement::RelatedFeatureElement() const { return (IfcFeatureElementAddition*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(5))); }
 void IfcRelProjectsElement::setRelatedFeatureElement(IfcFeatureElementAddition* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
 bool IfcRelProjectsElement::is(Type::Enum v) const { return v == Type::IfcRelProjectsElement || IfcRelDecomposes::is(v); }
 Type::Enum IfcRelProjectsElement::type() const { return Type::IfcRelProjectsElement; }
 Type::Enum IfcRelProjectsElement::Class() { return Type::IfcRelProjectsElement; }
-IfcRelProjectsElement::IfcRelProjectsElement(IfcAbstractEntityPtr e) : IfcRelDecomposes((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRelProjectsElement)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRelProjectsElement::IfcRelProjectsElement(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, IfcElement* v5_RelatingElement, IfcFeatureElementAddition* v6_RelatedFeatureElement) : IfcRelDecomposes((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatingElement)); e->setArgument(5,(v6_RelatedFeatureElement)); entity = e; EntityBuffer::Add(this); }
+IfcRelProjectsElement::IfcRelProjectsElement(IfcAbstractEntity* e) : IfcRelDecomposes((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRelProjectsElement)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRelProjectsElement::IfcRelProjectsElement(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcElement* v5_RelatingElement, IfcFeatureElementAddition* v6_RelatedFeatureElement) : IfcRelDecomposes((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatingElement)); e->setArgument(5,(v6_RelatedFeatureElement)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRelReferencedInSpatialStructure
-SHARED_PTR< IfcTemplatedEntityList< IfcProduct > > IfcRelReferencedInSpatialStructure::RelatedElements() { RETURN_AS_LIST(IfcProduct,4) }
-void IfcRelReferencedInSpatialStructure::setRelatedElements(SHARED_PTR< IfcTemplatedEntityList< IfcProduct > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v->generalize()); }
-IfcSpatialElement* IfcRelReferencedInSpatialStructure::RelatingStructure() { return (IfcSpatialElement*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(5))); }
+IfcTemplatedEntityList< IfcProduct >::ptr IfcRelReferencedInSpatialStructure::RelatedElements() const { IfcEntityList::ptr es = *entity->getArgument(4); return es->as<IfcProduct>(); }
+void IfcRelReferencedInSpatialStructure::setRelatedElements(IfcTemplatedEntityList< IfcProduct >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v->generalize()); }
+IfcSpatialElement* IfcRelReferencedInSpatialStructure::RelatingStructure() const { return (IfcSpatialElement*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(5))); }
 void IfcRelReferencedInSpatialStructure::setRelatingStructure(IfcSpatialElement* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
 bool IfcRelReferencedInSpatialStructure::is(Type::Enum v) const { return v == Type::IfcRelReferencedInSpatialStructure || IfcRelConnects::is(v); }
 Type::Enum IfcRelReferencedInSpatialStructure::type() const { return Type::IfcRelReferencedInSpatialStructure; }
 Type::Enum IfcRelReferencedInSpatialStructure::Class() { return Type::IfcRelReferencedInSpatialStructure; }
-IfcRelReferencedInSpatialStructure::IfcRelReferencedInSpatialStructure(IfcAbstractEntityPtr e) : IfcRelConnects((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRelReferencedInSpatialStructure)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRelReferencedInSpatialStructure::IfcRelReferencedInSpatialStructure(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, SHARED_PTR< IfcTemplatedEntityList< IfcProduct > > v5_RelatedElements, IfcSpatialElement* v6_RelatingStructure) : IfcRelConnects((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatedElements)->generalize()); e->setArgument(5,(v6_RelatingStructure)); entity = e; EntityBuffer::Add(this); }
+IfcRelReferencedInSpatialStructure::IfcRelReferencedInSpatialStructure(IfcAbstractEntity* e) : IfcRelConnects((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRelReferencedInSpatialStructure)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRelReferencedInSpatialStructure::IfcRelReferencedInSpatialStructure(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcTemplatedEntityList< IfcProduct >::ptr v5_RelatedElements, IfcSpatialElement* v6_RelatingStructure) : IfcRelConnects((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatedElements)->generalize()); e->setArgument(5,(v6_RelatingStructure)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRelSequence
-IfcProcess* IfcRelSequence::RelatingProcess() { return (IfcProcess*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(4))); }
+IfcProcess* IfcRelSequence::RelatingProcess() const { return (IfcProcess*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(4))); }
 void IfcRelSequence::setRelatingProcess(IfcProcess* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-IfcProcess* IfcRelSequence::RelatedProcess() { return (IfcProcess*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(5))); }
+IfcProcess* IfcRelSequence::RelatedProcess() const { return (IfcProcess*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(5))); }
 void IfcRelSequence::setRelatedProcess(IfcProcess* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-bool IfcRelSequence::hasTimeLag() { return !entity->getArgument(6)->isNull(); }
-IfcLagTime* IfcRelSequence::TimeLag() { return (IfcLagTime*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(6))); }
+bool IfcRelSequence::hasTimeLag() const { return !entity->getArgument(6)->isNull(); }
+IfcLagTime* IfcRelSequence::TimeLag() const { return (IfcLagTime*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(6))); }
 void IfcRelSequence::setTimeLag(IfcLagTime* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
-bool IfcRelSequence::hasSequenceType() { return !entity->getArgument(7)->isNull(); }
-IfcSequenceEnum::IfcSequenceEnum IfcRelSequence::SequenceType() { return IfcSequenceEnum::FromString(*entity->getArgument(7)); }
+bool IfcRelSequence::hasSequenceType() const { return !entity->getArgument(7)->isNull(); }
+IfcSequenceEnum::IfcSequenceEnum IfcRelSequence::SequenceType() const { return IfcSequenceEnum::FromString(*entity->getArgument(7)); }
 void IfcRelSequence::setSequenceType(IfcSequenceEnum::IfcSequenceEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v,IfcSequenceEnum::ToString(v)); }
-bool IfcRelSequence::hasUserDefinedSequenceType() { return !entity->getArgument(8)->isNull(); }
-IfcLabel IfcRelSequence::UserDefinedSequenceType() { return *entity->getArgument(8); }
-void IfcRelSequence::setUserDefinedSequenceType(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
+bool IfcRelSequence::hasUserDefinedSequenceType() const { return !entity->getArgument(8)->isNull(); }
+std::string IfcRelSequence::UserDefinedSequenceType() const { return *entity->getArgument(8); }
+void IfcRelSequence::setUserDefinedSequenceType(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
 bool IfcRelSequence::is(Type::Enum v) const { return v == Type::IfcRelSequence || IfcRelConnects::is(v); }
 Type::Enum IfcRelSequence::type() const { return Type::IfcRelSequence; }
 Type::Enum IfcRelSequence::Class() { return Type::IfcRelSequence; }
-IfcRelSequence::IfcRelSequence(IfcAbstractEntityPtr e) : IfcRelConnects((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRelSequence)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRelSequence::IfcRelSequence(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, IfcProcess* v5_RelatingProcess, IfcProcess* v6_RelatedProcess, IfcLagTime* v7_TimeLag, boost::optional< IfcSequenceEnum::IfcSequenceEnum > v8_SequenceType, boost::optional< IfcLabel > v9_UserDefinedSequenceType) : IfcRelConnects((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatingProcess)); e->setArgument(5,(v6_RelatedProcess)); e->setArgument(6,(v7_TimeLag)); if (v8_SequenceType) { e->setArgument(7,*v8_SequenceType,IfcSequenceEnum::ToString(*v8_SequenceType)); } else { e->setArgument(7); } if (v9_UserDefinedSequenceType) { e->setArgument(8,(*v9_UserDefinedSequenceType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcRelSequence::IfcRelSequence(IfcAbstractEntity* e) : IfcRelConnects((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRelSequence)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRelSequence::IfcRelSequence(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcProcess* v5_RelatingProcess, IfcProcess* v6_RelatedProcess, IfcLagTime* v7_TimeLag, boost::optional< IfcSequenceEnum::IfcSequenceEnum > v8_SequenceType, boost::optional< std::string > v9_UserDefinedSequenceType) : IfcRelConnects((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatingProcess)); e->setArgument(5,(v6_RelatedProcess)); e->setArgument(6,(v7_TimeLag)); if (v8_SequenceType) { e->setArgument(7,*v8_SequenceType,IfcSequenceEnum::ToString(*v8_SequenceType)); } else { e->setArgument(7); } if (v9_UserDefinedSequenceType) { e->setArgument(8,(*v9_UserDefinedSequenceType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRelServicesBuildings
-IfcSystem* IfcRelServicesBuildings::RelatingSystem() { return (IfcSystem*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(4))); }
+IfcSystem* IfcRelServicesBuildings::RelatingSystem() const { return (IfcSystem*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(4))); }
 void IfcRelServicesBuildings::setRelatingSystem(IfcSystem* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-SHARED_PTR< IfcTemplatedEntityList< IfcSpatialElement > > IfcRelServicesBuildings::RelatedBuildings() { RETURN_AS_LIST(IfcSpatialElement,5) }
-void IfcRelServicesBuildings::setRelatedBuildings(SHARED_PTR< IfcTemplatedEntityList< IfcSpatialElement > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v->generalize()); }
+IfcTemplatedEntityList< IfcSpatialElement >::ptr IfcRelServicesBuildings::RelatedBuildings() const { IfcEntityList::ptr es = *entity->getArgument(5); return es->as<IfcSpatialElement>(); }
+void IfcRelServicesBuildings::setRelatedBuildings(IfcTemplatedEntityList< IfcSpatialElement >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v->generalize()); }
 bool IfcRelServicesBuildings::is(Type::Enum v) const { return v == Type::IfcRelServicesBuildings || IfcRelConnects::is(v); }
 Type::Enum IfcRelServicesBuildings::type() const { return Type::IfcRelServicesBuildings; }
 Type::Enum IfcRelServicesBuildings::Class() { return Type::IfcRelServicesBuildings; }
-IfcRelServicesBuildings::IfcRelServicesBuildings(IfcAbstractEntityPtr e) : IfcRelConnects((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRelServicesBuildings)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRelServicesBuildings::IfcRelServicesBuildings(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, IfcSystem* v5_RelatingSystem, SHARED_PTR< IfcTemplatedEntityList< IfcSpatialElement > > v6_RelatedBuildings) : IfcRelConnects((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatingSystem)); e->setArgument(5,(v6_RelatedBuildings)->generalize()); entity = e; EntityBuffer::Add(this); }
+IfcRelServicesBuildings::IfcRelServicesBuildings(IfcAbstractEntity* e) : IfcRelConnects((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRelServicesBuildings)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRelServicesBuildings::IfcRelServicesBuildings(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcSystem* v5_RelatingSystem, IfcTemplatedEntityList< IfcSpatialElement >::ptr v6_RelatedBuildings) : IfcRelConnects((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatingSystem)); e->setArgument(5,(v6_RelatedBuildings)->generalize()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRelSpaceBoundary
-IfcSpaceBoundarySelect IfcRelSpaceBoundary::RelatingSpace() { return *entity->getArgument(4); }
-void IfcRelSpaceBoundary::setRelatingSpace(IfcSpaceBoundarySelect v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-IfcElement* IfcRelSpaceBoundary::RelatedBuildingElement() { return (IfcElement*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(5))); }
+IfcSpaceBoundarySelect* IfcRelSpaceBoundary::RelatingSpace() const { return (IfcSpaceBoundarySelect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(4))); }
+void IfcRelSpaceBoundary::setRelatingSpace(IfcSpaceBoundarySelect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+IfcElement* IfcRelSpaceBoundary::RelatedBuildingElement() const { return (IfcElement*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(5))); }
 void IfcRelSpaceBoundary::setRelatedBuildingElement(IfcElement* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-bool IfcRelSpaceBoundary::hasConnectionGeometry() { return !entity->getArgument(6)->isNull(); }
-IfcConnectionGeometry* IfcRelSpaceBoundary::ConnectionGeometry() { return (IfcConnectionGeometry*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(6))); }
+bool IfcRelSpaceBoundary::hasConnectionGeometry() const { return !entity->getArgument(6)->isNull(); }
+IfcConnectionGeometry* IfcRelSpaceBoundary::ConnectionGeometry() const { return (IfcConnectionGeometry*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(6))); }
 void IfcRelSpaceBoundary::setConnectionGeometry(IfcConnectionGeometry* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
-IfcPhysicalOrVirtualEnum::IfcPhysicalOrVirtualEnum IfcRelSpaceBoundary::PhysicalOrVirtualBoundary() { return IfcPhysicalOrVirtualEnum::FromString(*entity->getArgument(7)); }
+IfcPhysicalOrVirtualEnum::IfcPhysicalOrVirtualEnum IfcRelSpaceBoundary::PhysicalOrVirtualBoundary() const { return IfcPhysicalOrVirtualEnum::FromString(*entity->getArgument(7)); }
 void IfcRelSpaceBoundary::setPhysicalOrVirtualBoundary(IfcPhysicalOrVirtualEnum::IfcPhysicalOrVirtualEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v,IfcPhysicalOrVirtualEnum::ToString(v)); }
-IfcInternalOrExternalEnum::IfcInternalOrExternalEnum IfcRelSpaceBoundary::InternalOrExternalBoundary() { return IfcInternalOrExternalEnum::FromString(*entity->getArgument(8)); }
+IfcInternalOrExternalEnum::IfcInternalOrExternalEnum IfcRelSpaceBoundary::InternalOrExternalBoundary() const { return IfcInternalOrExternalEnum::FromString(*entity->getArgument(8)); }
 void IfcRelSpaceBoundary::setInternalOrExternalBoundary(IfcInternalOrExternalEnum::IfcInternalOrExternalEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcInternalOrExternalEnum::ToString(v)); }
 bool IfcRelSpaceBoundary::is(Type::Enum v) const { return v == Type::IfcRelSpaceBoundary || IfcRelConnects::is(v); }
 Type::Enum IfcRelSpaceBoundary::type() const { return Type::IfcRelSpaceBoundary; }
 Type::Enum IfcRelSpaceBoundary::Class() { return Type::IfcRelSpaceBoundary; }
-IfcRelSpaceBoundary::IfcRelSpaceBoundary(IfcAbstractEntityPtr e) : IfcRelConnects((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRelSpaceBoundary)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRelSpaceBoundary::IfcRelSpaceBoundary(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, IfcSpaceBoundarySelect v5_RelatingSpace, IfcElement* v6_RelatedBuildingElement, IfcConnectionGeometry* v7_ConnectionGeometry, IfcPhysicalOrVirtualEnum::IfcPhysicalOrVirtualEnum v8_PhysicalOrVirtualBoundary, IfcInternalOrExternalEnum::IfcInternalOrExternalEnum v9_InternalOrExternalBoundary) : IfcRelConnects((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatingSpace)); e->setArgument(5,(v6_RelatedBuildingElement)); e->setArgument(6,(v7_ConnectionGeometry)); e->setArgument(7,v8_PhysicalOrVirtualBoundary,IfcPhysicalOrVirtualEnum::ToString(v8_PhysicalOrVirtualBoundary)); e->setArgument(8,v9_InternalOrExternalBoundary,IfcInternalOrExternalEnum::ToString(v9_InternalOrExternalBoundary)); entity = e; EntityBuffer::Add(this); }
+IfcRelSpaceBoundary::IfcRelSpaceBoundary(IfcAbstractEntity* e) : IfcRelConnects((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRelSpaceBoundary)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRelSpaceBoundary::IfcRelSpaceBoundary(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcSpaceBoundarySelect* v5_RelatingSpace, IfcElement* v6_RelatedBuildingElement, IfcConnectionGeometry* v7_ConnectionGeometry, IfcPhysicalOrVirtualEnum::IfcPhysicalOrVirtualEnum v8_PhysicalOrVirtualBoundary, IfcInternalOrExternalEnum::IfcInternalOrExternalEnum v9_InternalOrExternalBoundary) : IfcRelConnects((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatingSpace)); e->setArgument(5,(v6_RelatedBuildingElement)); e->setArgument(6,(v7_ConnectionGeometry)); e->setArgument(7,v8_PhysicalOrVirtualBoundary,IfcPhysicalOrVirtualEnum::ToString(v8_PhysicalOrVirtualBoundary)); e->setArgument(8,v9_InternalOrExternalBoundary,IfcInternalOrExternalEnum::ToString(v9_InternalOrExternalBoundary)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRelSpaceBoundary1stLevel
-bool IfcRelSpaceBoundary1stLevel::hasParentBoundary() { return !entity->getArgument(9)->isNull(); }
-IfcRelSpaceBoundary1stLevel* IfcRelSpaceBoundary1stLevel::ParentBoundary() { return (IfcRelSpaceBoundary1stLevel*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(9))); }
+bool IfcRelSpaceBoundary1stLevel::hasParentBoundary() const { return !entity->getArgument(9)->isNull(); }
+IfcRelSpaceBoundary1stLevel* IfcRelSpaceBoundary1stLevel::ParentBoundary() const { return (IfcRelSpaceBoundary1stLevel*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(9))); }
 void IfcRelSpaceBoundary1stLevel::setParentBoundary(IfcRelSpaceBoundary1stLevel* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
-IfcRelSpaceBoundary1stLevel::list IfcRelSpaceBoundary1stLevel::InnerBoundaries() { RETURN_INVERSE(IfcRelSpaceBoundary1stLevel) }
+IfcRelSpaceBoundary1stLevel::list::ptr IfcRelSpaceBoundary1stLevel::InnerBoundaries() const { return entity->getInverse(Type::IfcRelSpaceBoundary1stLevel, 9)->as<IfcRelSpaceBoundary1stLevel>(); }
 bool IfcRelSpaceBoundary1stLevel::is(Type::Enum v) const { return v == Type::IfcRelSpaceBoundary1stLevel || IfcRelSpaceBoundary::is(v); }
 Type::Enum IfcRelSpaceBoundary1stLevel::type() const { return Type::IfcRelSpaceBoundary1stLevel; }
 Type::Enum IfcRelSpaceBoundary1stLevel::Class() { return Type::IfcRelSpaceBoundary1stLevel; }
-IfcRelSpaceBoundary1stLevel::IfcRelSpaceBoundary1stLevel(IfcAbstractEntityPtr e) : IfcRelSpaceBoundary((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRelSpaceBoundary1stLevel)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRelSpaceBoundary1stLevel::IfcRelSpaceBoundary1stLevel(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, IfcSpaceBoundarySelect v5_RelatingSpace, IfcElement* v6_RelatedBuildingElement, IfcConnectionGeometry* v7_ConnectionGeometry, IfcPhysicalOrVirtualEnum::IfcPhysicalOrVirtualEnum v8_PhysicalOrVirtualBoundary, IfcInternalOrExternalEnum::IfcInternalOrExternalEnum v9_InternalOrExternalBoundary, IfcRelSpaceBoundary1stLevel* v10_ParentBoundary) : IfcRelSpaceBoundary((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatingSpace)); e->setArgument(5,(v6_RelatedBuildingElement)); e->setArgument(6,(v7_ConnectionGeometry)); e->setArgument(7,v8_PhysicalOrVirtualBoundary,IfcPhysicalOrVirtualEnum::ToString(v8_PhysicalOrVirtualBoundary)); e->setArgument(8,v9_InternalOrExternalBoundary,IfcInternalOrExternalEnum::ToString(v9_InternalOrExternalBoundary)); e->setArgument(9,(v10_ParentBoundary)); entity = e; EntityBuffer::Add(this); }
+IfcRelSpaceBoundary1stLevel::IfcRelSpaceBoundary1stLevel(IfcAbstractEntity* e) : IfcRelSpaceBoundary((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRelSpaceBoundary1stLevel)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRelSpaceBoundary1stLevel::IfcRelSpaceBoundary1stLevel(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcSpaceBoundarySelect* v5_RelatingSpace, IfcElement* v6_RelatedBuildingElement, IfcConnectionGeometry* v7_ConnectionGeometry, IfcPhysicalOrVirtualEnum::IfcPhysicalOrVirtualEnum v8_PhysicalOrVirtualBoundary, IfcInternalOrExternalEnum::IfcInternalOrExternalEnum v9_InternalOrExternalBoundary, IfcRelSpaceBoundary1stLevel* v10_ParentBoundary) : IfcRelSpaceBoundary((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatingSpace)); e->setArgument(5,(v6_RelatedBuildingElement)); e->setArgument(6,(v7_ConnectionGeometry)); e->setArgument(7,v8_PhysicalOrVirtualBoundary,IfcPhysicalOrVirtualEnum::ToString(v8_PhysicalOrVirtualBoundary)); e->setArgument(8,v9_InternalOrExternalBoundary,IfcInternalOrExternalEnum::ToString(v9_InternalOrExternalBoundary)); e->setArgument(9,(v10_ParentBoundary)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRelSpaceBoundary2ndLevel
-bool IfcRelSpaceBoundary2ndLevel::hasCorrespondingBoundary() { return !entity->getArgument(10)->isNull(); }
-IfcRelSpaceBoundary2ndLevel* IfcRelSpaceBoundary2ndLevel::CorrespondingBoundary() { return (IfcRelSpaceBoundary2ndLevel*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(10))); }
+bool IfcRelSpaceBoundary2ndLevel::hasCorrespondingBoundary() const { return !entity->getArgument(10)->isNull(); }
+IfcRelSpaceBoundary2ndLevel* IfcRelSpaceBoundary2ndLevel::CorrespondingBoundary() const { return (IfcRelSpaceBoundary2ndLevel*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(10))); }
 void IfcRelSpaceBoundary2ndLevel::setCorrespondingBoundary(IfcRelSpaceBoundary2ndLevel* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
-IfcRelSpaceBoundary2ndLevel::list IfcRelSpaceBoundary2ndLevel::Corresponds() { RETURN_INVERSE(IfcRelSpaceBoundary2ndLevel) }
+IfcRelSpaceBoundary2ndLevel::list::ptr IfcRelSpaceBoundary2ndLevel::Corresponds() const { return entity->getInverse(Type::IfcRelSpaceBoundary2ndLevel, 10)->as<IfcRelSpaceBoundary2ndLevel>(); }
 bool IfcRelSpaceBoundary2ndLevel::is(Type::Enum v) const { return v == Type::IfcRelSpaceBoundary2ndLevel || IfcRelSpaceBoundary1stLevel::is(v); }
 Type::Enum IfcRelSpaceBoundary2ndLevel::type() const { return Type::IfcRelSpaceBoundary2ndLevel; }
 Type::Enum IfcRelSpaceBoundary2ndLevel::Class() { return Type::IfcRelSpaceBoundary2ndLevel; }
-IfcRelSpaceBoundary2ndLevel::IfcRelSpaceBoundary2ndLevel(IfcAbstractEntityPtr e) : IfcRelSpaceBoundary1stLevel((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRelSpaceBoundary2ndLevel)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRelSpaceBoundary2ndLevel::IfcRelSpaceBoundary2ndLevel(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, IfcSpaceBoundarySelect v5_RelatingSpace, IfcElement* v6_RelatedBuildingElement, IfcConnectionGeometry* v7_ConnectionGeometry, IfcPhysicalOrVirtualEnum::IfcPhysicalOrVirtualEnum v8_PhysicalOrVirtualBoundary, IfcInternalOrExternalEnum::IfcInternalOrExternalEnum v9_InternalOrExternalBoundary, IfcRelSpaceBoundary1stLevel* v10_ParentBoundary, IfcRelSpaceBoundary2ndLevel* v11_CorrespondingBoundary) : IfcRelSpaceBoundary1stLevel((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatingSpace)); e->setArgument(5,(v6_RelatedBuildingElement)); e->setArgument(6,(v7_ConnectionGeometry)); e->setArgument(7,v8_PhysicalOrVirtualBoundary,IfcPhysicalOrVirtualEnum::ToString(v8_PhysicalOrVirtualBoundary)); e->setArgument(8,v9_InternalOrExternalBoundary,IfcInternalOrExternalEnum::ToString(v9_InternalOrExternalBoundary)); e->setArgument(9,(v10_ParentBoundary)); e->setArgument(10,(v11_CorrespondingBoundary)); entity = e; EntityBuffer::Add(this); }
+IfcRelSpaceBoundary2ndLevel::IfcRelSpaceBoundary2ndLevel(IfcAbstractEntity* e) : IfcRelSpaceBoundary1stLevel((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRelSpaceBoundary2ndLevel)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRelSpaceBoundary2ndLevel::IfcRelSpaceBoundary2ndLevel(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcSpaceBoundarySelect* v5_RelatingSpace, IfcElement* v6_RelatedBuildingElement, IfcConnectionGeometry* v7_ConnectionGeometry, IfcPhysicalOrVirtualEnum::IfcPhysicalOrVirtualEnum v8_PhysicalOrVirtualBoundary, IfcInternalOrExternalEnum::IfcInternalOrExternalEnum v9_InternalOrExternalBoundary, IfcRelSpaceBoundary1stLevel* v10_ParentBoundary, IfcRelSpaceBoundary2ndLevel* v11_CorrespondingBoundary) : IfcRelSpaceBoundary1stLevel((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatingSpace)); e->setArgument(5,(v6_RelatedBuildingElement)); e->setArgument(6,(v7_ConnectionGeometry)); e->setArgument(7,v8_PhysicalOrVirtualBoundary,IfcPhysicalOrVirtualEnum::ToString(v8_PhysicalOrVirtualBoundary)); e->setArgument(8,v9_InternalOrExternalBoundary,IfcInternalOrExternalEnum::ToString(v9_InternalOrExternalBoundary)); e->setArgument(9,(v10_ParentBoundary)); e->setArgument(10,(v11_CorrespondingBoundary)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRelVoidsElement
-IfcElement* IfcRelVoidsElement::RelatingBuildingElement() { return (IfcElement*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(4))); }
+IfcElement* IfcRelVoidsElement::RelatingBuildingElement() const { return (IfcElement*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(4))); }
 void IfcRelVoidsElement::setRelatingBuildingElement(IfcElement* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-IfcFeatureElementSubtraction* IfcRelVoidsElement::RelatedOpeningElement() { return (IfcFeatureElementSubtraction*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(5))); }
+IfcFeatureElementSubtraction* IfcRelVoidsElement::RelatedOpeningElement() const { return (IfcFeatureElementSubtraction*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(5))); }
 void IfcRelVoidsElement::setRelatedOpeningElement(IfcFeatureElementSubtraction* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
 bool IfcRelVoidsElement::is(Type::Enum v) const { return v == Type::IfcRelVoidsElement || IfcRelDecomposes::is(v); }
 Type::Enum IfcRelVoidsElement::type() const { return Type::IfcRelVoidsElement; }
 Type::Enum IfcRelVoidsElement::Class() { return Type::IfcRelVoidsElement; }
-IfcRelVoidsElement::IfcRelVoidsElement(IfcAbstractEntityPtr e) : IfcRelDecomposes((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRelVoidsElement)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRelVoidsElement::IfcRelVoidsElement(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, IfcElement* v5_RelatingBuildingElement, IfcFeatureElementSubtraction* v6_RelatedOpeningElement) : IfcRelDecomposes((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatingBuildingElement)); e->setArgument(5,(v6_RelatedOpeningElement)); entity = e; EntityBuffer::Add(this); }
+IfcRelVoidsElement::IfcRelVoidsElement(IfcAbstractEntity* e) : IfcRelDecomposes((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRelVoidsElement)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRelVoidsElement::IfcRelVoidsElement(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcElement* v5_RelatingBuildingElement, IfcFeatureElementSubtraction* v6_RelatedOpeningElement) : IfcRelDecomposes((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,(v5_RelatingBuildingElement)); e->setArgument(5,(v6_RelatedOpeningElement)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRelationship
 bool IfcRelationship::is(Type::Enum v) const { return v == Type::IfcRelationship || IfcRoot::is(v); }
 Type::Enum IfcRelationship::type() const { return Type::IfcRelationship; }
 Type::Enum IfcRelationship::Class() { return Type::IfcRelationship; }
-IfcRelationship::IfcRelationship(IfcAbstractEntityPtr e) : IfcRoot((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRelationship)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRelationship::IfcRelationship(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description) : IfcRoot((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } entity = e; EntityBuffer::Add(this); }
+IfcRelationship::IfcRelationship(IfcAbstractEntity* e) : IfcRoot((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRelationship)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRelationship::IfcRelationship(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description) : IfcRoot((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcReparametrisedCompositeCurveSegment
-IfcParameterValue IfcReparametrisedCompositeCurveSegment::ParamLength() { return *entity->getArgument(3); }
-void IfcReparametrisedCompositeCurveSegment::setParamLength(IfcParameterValue v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+double IfcReparametrisedCompositeCurveSegment::ParamLength() const { return *entity->getArgument(3); }
+void IfcReparametrisedCompositeCurveSegment::setParamLength(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
 bool IfcReparametrisedCompositeCurveSegment::is(Type::Enum v) const { return v == Type::IfcReparametrisedCompositeCurveSegment || IfcCompositeCurveSegment::is(v); }
 Type::Enum IfcReparametrisedCompositeCurveSegment::type() const { return Type::IfcReparametrisedCompositeCurveSegment; }
 Type::Enum IfcReparametrisedCompositeCurveSegment::Class() { return Type::IfcReparametrisedCompositeCurveSegment; }
-IfcReparametrisedCompositeCurveSegment::IfcReparametrisedCompositeCurveSegment(IfcAbstractEntityPtr e) : IfcCompositeCurveSegment((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcReparametrisedCompositeCurveSegment)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcReparametrisedCompositeCurveSegment::IfcReparametrisedCompositeCurveSegment(IfcTransitionCode::IfcTransitionCode v1_Transition, bool v2_SameSense, IfcCurve* v3_ParentCurve, IfcParameterValue v4_ParamLength) : IfcCompositeCurveSegment((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,v1_Transition,IfcTransitionCode::ToString(v1_Transition)); e->setArgument(1,(v2_SameSense)); e->setArgument(2,(v3_ParentCurve)); e->setArgument(3,(v4_ParamLength)); entity = e; EntityBuffer::Add(this); }
+IfcReparametrisedCompositeCurveSegment::IfcReparametrisedCompositeCurveSegment(IfcAbstractEntity* e) : IfcCompositeCurveSegment((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcReparametrisedCompositeCurveSegment)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcReparametrisedCompositeCurveSegment::IfcReparametrisedCompositeCurveSegment(IfcTransitionCode::IfcTransitionCode v1_Transition, bool v2_SameSense, IfcCurve* v3_ParentCurve, double v4_ParamLength) : IfcCompositeCurveSegment((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,v1_Transition,IfcTransitionCode::ToString(v1_Transition)); e->setArgument(1,(v2_SameSense)); e->setArgument(2,(v3_ParentCurve)); e->setArgument(3,(v4_ParamLength)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRepresentation
-IfcRepresentationContext* IfcRepresentation::ContextOfItems() { return (IfcRepresentationContext*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(0))); }
+IfcRepresentationContext* IfcRepresentation::ContextOfItems() const { return (IfcRepresentationContext*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(0))); }
 void IfcRepresentation::setContextOfItems(IfcRepresentationContext* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-bool IfcRepresentation::hasRepresentationIdentifier() { return !entity->getArgument(1)->isNull(); }
-IfcLabel IfcRepresentation::RepresentationIdentifier() { return *entity->getArgument(1); }
-void IfcRepresentation::setRepresentationIdentifier(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-bool IfcRepresentation::hasRepresentationType() { return !entity->getArgument(2)->isNull(); }
-IfcLabel IfcRepresentation::RepresentationType() { return *entity->getArgument(2); }
-void IfcRepresentation::setRepresentationType(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationItem > > IfcRepresentation::Items() { RETURN_AS_LIST(IfcRepresentationItem,3) }
-void IfcRepresentation::setItems(SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationItem > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v->generalize()); }
-IfcRepresentationMap::list IfcRepresentation::RepresentationMap() { RETURN_INVERSE(IfcRepresentationMap) }
-IfcPresentationLayerAssignment::list IfcRepresentation::LayerAssignments() { RETURN_INVERSE(IfcPresentationLayerAssignment) }
-IfcProductRepresentation::list IfcRepresentation::OfProductRepresentation() { RETURN_INVERSE(IfcProductRepresentation) }
+bool IfcRepresentation::hasRepresentationIdentifier() const { return !entity->getArgument(1)->isNull(); }
+std::string IfcRepresentation::RepresentationIdentifier() const { return *entity->getArgument(1); }
+void IfcRepresentation::setRepresentationIdentifier(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+bool IfcRepresentation::hasRepresentationType() const { return !entity->getArgument(2)->isNull(); }
+std::string IfcRepresentation::RepresentationType() const { return *entity->getArgument(2); }
+void IfcRepresentation::setRepresentationType(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+IfcTemplatedEntityList< IfcRepresentationItem >::ptr IfcRepresentation::Items() const { IfcEntityList::ptr es = *entity->getArgument(3); return es->as<IfcRepresentationItem>(); }
+void IfcRepresentation::setItems(IfcTemplatedEntityList< IfcRepresentationItem >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v->generalize()); }
+IfcRepresentationMap::list::ptr IfcRepresentation::RepresentationMap() const { return entity->getInverse(Type::IfcRepresentationMap, 1)->as<IfcRepresentationMap>(); }
+IfcPresentationLayerAssignment::list::ptr IfcRepresentation::LayerAssignments() const { return entity->getInverse(Type::IfcPresentationLayerAssignment, 2)->as<IfcPresentationLayerAssignment>(); }
+IfcProductRepresentation::list::ptr IfcRepresentation::OfProductRepresentation() const { return entity->getInverse(Type::IfcProductRepresentation, 2)->as<IfcProductRepresentation>(); }
 bool IfcRepresentation::is(Type::Enum v) const { return v == Type::IfcRepresentation; }
 Type::Enum IfcRepresentation::type() const { return Type::IfcRepresentation; }
 Type::Enum IfcRepresentation::Class() { return Type::IfcRepresentation; }
-IfcRepresentation::IfcRepresentation(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcRepresentation)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRepresentation::IfcRepresentation(IfcRepresentationContext* v1_ContextOfItems, boost::optional< IfcLabel > v2_RepresentationIdentifier, boost::optional< IfcLabel > v3_RepresentationType, SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationItem > > v4_Items) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_ContextOfItems)); if (v2_RepresentationIdentifier) { e->setArgument(1,(*v2_RepresentationIdentifier)); } else { e->setArgument(1); } if (v3_RepresentationType) { e->setArgument(2,(*v3_RepresentationType)); } else { e->setArgument(2); } e->setArgument(3,(v4_Items)->generalize()); entity = e; EntityBuffer::Add(this); }
+IfcRepresentation::IfcRepresentation(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcRepresentation)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRepresentation::IfcRepresentation(IfcRepresentationContext* v1_ContextOfItems, boost::optional< std::string > v2_RepresentationIdentifier, boost::optional< std::string > v3_RepresentationType, IfcTemplatedEntityList< IfcRepresentationItem >::ptr v4_Items) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_ContextOfItems)); if (v2_RepresentationIdentifier) { e->setArgument(1,(*v2_RepresentationIdentifier)); } else { e->setArgument(1); } if (v3_RepresentationType) { e->setArgument(2,(*v3_RepresentationType)); } else { e->setArgument(2); } e->setArgument(3,(v4_Items)->generalize()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRepresentationContext
-bool IfcRepresentationContext::hasContextIdentifier() { return !entity->getArgument(0)->isNull(); }
-IfcLabel IfcRepresentationContext::ContextIdentifier() { return *entity->getArgument(0); }
-void IfcRepresentationContext::setContextIdentifier(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-bool IfcRepresentationContext::hasContextType() { return !entity->getArgument(1)->isNull(); }
-IfcLabel IfcRepresentationContext::ContextType() { return *entity->getArgument(1); }
-void IfcRepresentationContext::setContextType(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-IfcRepresentation::list IfcRepresentationContext::RepresentationsInContext() { RETURN_INVERSE(IfcRepresentation) }
+bool IfcRepresentationContext::hasContextIdentifier() const { return !entity->getArgument(0)->isNull(); }
+std::string IfcRepresentationContext::ContextIdentifier() const { return *entity->getArgument(0); }
+void IfcRepresentationContext::setContextIdentifier(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+bool IfcRepresentationContext::hasContextType() const { return !entity->getArgument(1)->isNull(); }
+std::string IfcRepresentationContext::ContextType() const { return *entity->getArgument(1); }
+void IfcRepresentationContext::setContextType(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+IfcRepresentation::list::ptr IfcRepresentationContext::RepresentationsInContext() const { return entity->getInverse(Type::IfcRepresentation, 0)->as<IfcRepresentation>(); }
 bool IfcRepresentationContext::is(Type::Enum v) const { return v == Type::IfcRepresentationContext; }
 Type::Enum IfcRepresentationContext::type() const { return Type::IfcRepresentationContext; }
 Type::Enum IfcRepresentationContext::Class() { return Type::IfcRepresentationContext; }
-IfcRepresentationContext::IfcRepresentationContext(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcRepresentationContext)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRepresentationContext::IfcRepresentationContext(boost::optional< IfcLabel > v1_ContextIdentifier, boost::optional< IfcLabel > v2_ContextType) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_ContextIdentifier) { e->setArgument(0,(*v1_ContextIdentifier)); } else { e->setArgument(0); } if (v2_ContextType) { e->setArgument(1,(*v2_ContextType)); } else { e->setArgument(1); } entity = e; EntityBuffer::Add(this); }
+IfcRepresentationContext::IfcRepresentationContext(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcRepresentationContext)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRepresentationContext::IfcRepresentationContext(boost::optional< std::string > v1_ContextIdentifier, boost::optional< std::string > v2_ContextType) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_ContextIdentifier) { e->setArgument(0,(*v1_ContextIdentifier)); } else { e->setArgument(0); } if (v2_ContextType) { e->setArgument(1,(*v2_ContextType)); } else { e->setArgument(1); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRepresentationItem
-IfcPresentationLayerAssignment::list IfcRepresentationItem::LayerAssignment() { RETURN_INVERSE(IfcPresentationLayerAssignment) }
-IfcStyledItem::list IfcRepresentationItem::StyledByItem() { RETURN_INVERSE(IfcStyledItem) }
+IfcPresentationLayerAssignment::list::ptr IfcRepresentationItem::LayerAssignment() const { return entity->getInverse(Type::IfcPresentationLayerAssignment, 2)->as<IfcPresentationLayerAssignment>(); }
+IfcStyledItem::list::ptr IfcRepresentationItem::StyledByItem() const { return entity->getInverse(Type::IfcStyledItem, 0)->as<IfcStyledItem>(); }
 bool IfcRepresentationItem::is(Type::Enum v) const { return v == Type::IfcRepresentationItem; }
 Type::Enum IfcRepresentationItem::type() const { return Type::IfcRepresentationItem; }
 Type::Enum IfcRepresentationItem::Class() { return Type::IfcRepresentationItem; }
-IfcRepresentationItem::IfcRepresentationItem(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcRepresentationItem)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRepresentationItem::IfcRepresentationItem(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcRepresentationItem)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
 IfcRepresentationItem::IfcRepresentationItem() : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRepresentationMap
-IfcAxis2Placement IfcRepresentationMap::MappingOrigin() { return *entity->getArgument(0); }
-void IfcRepresentationMap::setMappingOrigin(IfcAxis2Placement v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-IfcRepresentation* IfcRepresentationMap::MappedRepresentation() { return (IfcRepresentation*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(1))); }
+IfcAxis2Placement* IfcRepresentationMap::MappingOrigin() const { return (IfcAxis2Placement*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(0))); }
+void IfcRepresentationMap::setMappingOrigin(IfcAxis2Placement* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+IfcRepresentation* IfcRepresentationMap::MappedRepresentation() const { return (IfcRepresentation*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(1))); }
 void IfcRepresentationMap::setMappedRepresentation(IfcRepresentation* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-IfcShapeAspect::list IfcRepresentationMap::HasShapeAspects() { RETURN_INVERSE(IfcShapeAspect) }
-IfcMappedItem::list IfcRepresentationMap::MapUsage() { RETURN_INVERSE(IfcMappedItem) }
+IfcShapeAspect::list::ptr IfcRepresentationMap::HasShapeAspects() const { return entity->getInverse(Type::IfcShapeAspect, 4)->as<IfcShapeAspect>(); }
+IfcMappedItem::list::ptr IfcRepresentationMap::MapUsage() const { return entity->getInverse(Type::IfcMappedItem, 0)->as<IfcMappedItem>(); }
 bool IfcRepresentationMap::is(Type::Enum v) const { return v == Type::IfcRepresentationMap; }
 Type::Enum IfcRepresentationMap::type() const { return Type::IfcRepresentationMap; }
 Type::Enum IfcRepresentationMap::Class() { return Type::IfcRepresentationMap; }
-IfcRepresentationMap::IfcRepresentationMap(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcRepresentationMap)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRepresentationMap::IfcRepresentationMap(IfcAxis2Placement v1_MappingOrigin, IfcRepresentation* v2_MappedRepresentation) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_MappingOrigin)); e->setArgument(1,(v2_MappedRepresentation)); entity = e; EntityBuffer::Add(this); }
+IfcRepresentationMap::IfcRepresentationMap(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcRepresentationMap)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRepresentationMap::IfcRepresentationMap(IfcAxis2Placement* v1_MappingOrigin, IfcRepresentation* v2_MappedRepresentation) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_MappingOrigin)); e->setArgument(1,(v2_MappedRepresentation)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcResource
-bool IfcResource::hasIdentification() { return !entity->getArgument(5)->isNull(); }
-IfcIdentifier IfcResource::Identification() { return *entity->getArgument(5); }
-void IfcResource::setIdentification(IfcIdentifier v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-bool IfcResource::hasLongDescription() { return !entity->getArgument(6)->isNull(); }
-IfcText IfcResource::LongDescription() { return *entity->getArgument(6); }
-void IfcResource::setLongDescription(IfcText v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
-IfcRelAssignsToResource::list IfcResource::ResourceOf() { RETURN_INVERSE(IfcRelAssignsToResource) }
+bool IfcResource::hasIdentification() const { return !entity->getArgument(5)->isNull(); }
+std::string IfcResource::Identification() const { return *entity->getArgument(5); }
+void IfcResource::setIdentification(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+bool IfcResource::hasLongDescription() const { return !entity->getArgument(6)->isNull(); }
+std::string IfcResource::LongDescription() const { return *entity->getArgument(6); }
+void IfcResource::setLongDescription(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
+IfcRelAssignsToResource::list::ptr IfcResource::ResourceOf() const { return entity->getInverse(Type::IfcRelAssignsToResource, 6)->as<IfcRelAssignsToResource>(); }
 bool IfcResource::is(Type::Enum v) const { return v == Type::IfcResource || IfcObject::is(v); }
 Type::Enum IfcResource::type() const { return Type::IfcResource; }
 Type::Enum IfcResource::Class() { return Type::IfcResource; }
-IfcResource::IfcResource(IfcAbstractEntityPtr e) : IfcObject((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcResource)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcResource::IfcResource(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, boost::optional< IfcIdentifier > v6_Identification, boost::optional< IfcText > v7_LongDescription) : IfcObject((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } if (v6_Identification) { e->setArgument(5,(*v6_Identification)); } else { e->setArgument(5); } if (v7_LongDescription) { e->setArgument(6,(*v7_LongDescription)); } else { e->setArgument(6); } entity = e; EntityBuffer::Add(this); }
+IfcResource::IfcResource(IfcAbstractEntity* e) : IfcObject((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcResource)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcResource::IfcResource(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, boost::optional< std::string > v6_Identification, boost::optional< std::string > v7_LongDescription) : IfcObject((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } if (v6_Identification) { e->setArgument(5,(*v6_Identification)); } else { e->setArgument(5); } if (v7_LongDescription) { e->setArgument(6,(*v7_LongDescription)); } else { e->setArgument(6); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcResourceApprovalRelationship
-SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > IfcResourceApprovalRelationship::RelatedResourceObjects() { RETURN_AS_LIST(IfcUtil::IfcAbstractSelect,2) }
-void IfcResourceApprovalRelationship::setRelatedResourceObjects(SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v->generalize()); }
-IfcApproval* IfcResourceApprovalRelationship::RelatingApproval() { return (IfcApproval*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(3))); }
+IfcEntityList::ptr IfcResourceApprovalRelationship::RelatedResourceObjects() const { return *entity->getArgument(2); }
+void IfcResourceApprovalRelationship::setRelatedResourceObjects(IfcEntityList::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+IfcApproval* IfcResourceApprovalRelationship::RelatingApproval() const { return (IfcApproval*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(3))); }
 void IfcResourceApprovalRelationship::setRelatingApproval(IfcApproval* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
 bool IfcResourceApprovalRelationship::is(Type::Enum v) const { return v == Type::IfcResourceApprovalRelationship || IfcResourceLevelRelationship::is(v); }
 Type::Enum IfcResourceApprovalRelationship::type() const { return Type::IfcResourceApprovalRelationship; }
 Type::Enum IfcResourceApprovalRelationship::Class() { return Type::IfcResourceApprovalRelationship; }
-IfcResourceApprovalRelationship::IfcResourceApprovalRelationship(IfcAbstractEntityPtr e) : IfcResourceLevelRelationship((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcResourceApprovalRelationship)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcResourceApprovalRelationship::IfcResourceApprovalRelationship(boost::optional< IfcLabel > v1_Name, boost::optional< IfcText > v2_Description, IfcEntities v3_RelatedResourceObjects, IfcApproval* v4_RelatingApproval) : IfcResourceLevelRelationship((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_RelatedResourceObjects)); e->setArgument(3,(v4_RelatingApproval)); entity = e; EntityBuffer::Add(this); }
+IfcResourceApprovalRelationship::IfcResourceApprovalRelationship(IfcAbstractEntity* e) : IfcResourceLevelRelationship((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcResourceApprovalRelationship)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcResourceApprovalRelationship::IfcResourceApprovalRelationship(boost::optional< std::string > v1_Name, boost::optional< std::string > v2_Description, IfcEntityList::ptr v3_RelatedResourceObjects, IfcApproval* v4_RelatingApproval) : IfcResourceLevelRelationship((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_RelatedResourceObjects)); e->setArgument(3,(v4_RelatingApproval)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcResourceConstraintRelationship
-IfcConstraint* IfcResourceConstraintRelationship::RelatingConstraint() { return (IfcConstraint*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(2))); }
+IfcConstraint* IfcResourceConstraintRelationship::RelatingConstraint() const { return (IfcConstraint*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(2))); }
 void IfcResourceConstraintRelationship::setRelatingConstraint(IfcConstraint* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > IfcResourceConstraintRelationship::RelatedResourceObjects() { RETURN_AS_LIST(IfcUtil::IfcAbstractSelect,3) }
-void IfcResourceConstraintRelationship::setRelatedResourceObjects(SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v->generalize()); }
+IfcEntityList::ptr IfcResourceConstraintRelationship::RelatedResourceObjects() const { return *entity->getArgument(3); }
+void IfcResourceConstraintRelationship::setRelatedResourceObjects(IfcEntityList::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
 bool IfcResourceConstraintRelationship::is(Type::Enum v) const { return v == Type::IfcResourceConstraintRelationship || IfcResourceLevelRelationship::is(v); }
 Type::Enum IfcResourceConstraintRelationship::type() const { return Type::IfcResourceConstraintRelationship; }
 Type::Enum IfcResourceConstraintRelationship::Class() { return Type::IfcResourceConstraintRelationship; }
-IfcResourceConstraintRelationship::IfcResourceConstraintRelationship(IfcAbstractEntityPtr e) : IfcResourceLevelRelationship((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcResourceConstraintRelationship)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcResourceConstraintRelationship::IfcResourceConstraintRelationship(boost::optional< IfcLabel > v1_Name, boost::optional< IfcText > v2_Description, IfcConstraint* v3_RelatingConstraint, IfcEntities v4_RelatedResourceObjects) : IfcResourceLevelRelationship((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_RelatingConstraint)); e->setArgument(3,(v4_RelatedResourceObjects)); entity = e; EntityBuffer::Add(this); }
+IfcResourceConstraintRelationship::IfcResourceConstraintRelationship(IfcAbstractEntity* e) : IfcResourceLevelRelationship((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcResourceConstraintRelationship)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcResourceConstraintRelationship::IfcResourceConstraintRelationship(boost::optional< std::string > v1_Name, boost::optional< std::string > v2_Description, IfcConstraint* v3_RelatingConstraint, IfcEntityList::ptr v4_RelatedResourceObjects) : IfcResourceLevelRelationship((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_RelatingConstraint)); e->setArgument(3,(v4_RelatedResourceObjects)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcResourceLevelRelationship
-bool IfcResourceLevelRelationship::hasName() { return !entity->getArgument(0)->isNull(); }
-IfcLabel IfcResourceLevelRelationship::Name() { return *entity->getArgument(0); }
-void IfcResourceLevelRelationship::setName(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-bool IfcResourceLevelRelationship::hasDescription() { return !entity->getArgument(1)->isNull(); }
-IfcText IfcResourceLevelRelationship::Description() { return *entity->getArgument(1); }
-void IfcResourceLevelRelationship::setDescription(IfcText v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+bool IfcResourceLevelRelationship::hasName() const { return !entity->getArgument(0)->isNull(); }
+std::string IfcResourceLevelRelationship::Name() const { return *entity->getArgument(0); }
+void IfcResourceLevelRelationship::setName(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+bool IfcResourceLevelRelationship::hasDescription() const { return !entity->getArgument(1)->isNull(); }
+std::string IfcResourceLevelRelationship::Description() const { return *entity->getArgument(1); }
+void IfcResourceLevelRelationship::setDescription(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
 bool IfcResourceLevelRelationship::is(Type::Enum v) const { return v == Type::IfcResourceLevelRelationship; }
 Type::Enum IfcResourceLevelRelationship::type() const { return Type::IfcResourceLevelRelationship; }
 Type::Enum IfcResourceLevelRelationship::Class() { return Type::IfcResourceLevelRelationship; }
-IfcResourceLevelRelationship::IfcResourceLevelRelationship(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcResourceLevelRelationship)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcResourceLevelRelationship::IfcResourceLevelRelationship(boost::optional< IfcLabel > v1_Name, boost::optional< IfcText > v2_Description) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } entity = e; EntityBuffer::Add(this); }
+IfcResourceLevelRelationship::IfcResourceLevelRelationship(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcResourceLevelRelationship)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcResourceLevelRelationship::IfcResourceLevelRelationship(boost::optional< std::string > v1_Name, boost::optional< std::string > v2_Description) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcResourceTime
-bool IfcResourceTime::hasScheduleWork() { return !entity->getArgument(3)->isNull(); }
-IfcDuration IfcResourceTime::ScheduleWork() { return *entity->getArgument(3); }
-void IfcResourceTime::setScheduleWork(IfcDuration v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-bool IfcResourceTime::hasScheduleUsage() { return !entity->getArgument(4)->isNull(); }
-IfcPositiveRatioMeasure IfcResourceTime::ScheduleUsage() { return *entity->getArgument(4); }
-void IfcResourceTime::setScheduleUsage(IfcPositiveRatioMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-bool IfcResourceTime::hasScheduleStart() { return !entity->getArgument(5)->isNull(); }
-IfcDateTime IfcResourceTime::ScheduleStart() { return *entity->getArgument(5); }
-void IfcResourceTime::setScheduleStart(IfcDateTime v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-bool IfcResourceTime::hasScheduleFinish() { return !entity->getArgument(6)->isNull(); }
-IfcDateTime IfcResourceTime::ScheduleFinish() { return *entity->getArgument(6); }
-void IfcResourceTime::setScheduleFinish(IfcDateTime v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
-bool IfcResourceTime::hasScheduleContour() { return !entity->getArgument(7)->isNull(); }
-IfcLabel IfcResourceTime::ScheduleContour() { return *entity->getArgument(7); }
-void IfcResourceTime::setScheduleContour(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
-bool IfcResourceTime::hasLevelingDelay() { return !entity->getArgument(8)->isNull(); }
-IfcDuration IfcResourceTime::LevelingDelay() { return *entity->getArgument(8); }
-void IfcResourceTime::setLevelingDelay(IfcDuration v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
-bool IfcResourceTime::hasIsOverAllocated() { return !entity->getArgument(9)->isNull(); }
-bool IfcResourceTime::IsOverAllocated() { return *entity->getArgument(9); }
+bool IfcResourceTime::hasScheduleWork() const { return !entity->getArgument(3)->isNull(); }
+std::string IfcResourceTime::ScheduleWork() const { return *entity->getArgument(3); }
+void IfcResourceTime::setScheduleWork(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+bool IfcResourceTime::hasScheduleUsage() const { return !entity->getArgument(4)->isNull(); }
+double IfcResourceTime::ScheduleUsage() const { return *entity->getArgument(4); }
+void IfcResourceTime::setScheduleUsage(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+bool IfcResourceTime::hasScheduleStart() const { return !entity->getArgument(5)->isNull(); }
+std::string IfcResourceTime::ScheduleStart() const { return *entity->getArgument(5); }
+void IfcResourceTime::setScheduleStart(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+bool IfcResourceTime::hasScheduleFinish() const { return !entity->getArgument(6)->isNull(); }
+std::string IfcResourceTime::ScheduleFinish() const { return *entity->getArgument(6); }
+void IfcResourceTime::setScheduleFinish(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
+bool IfcResourceTime::hasScheduleContour() const { return !entity->getArgument(7)->isNull(); }
+std::string IfcResourceTime::ScheduleContour() const { return *entity->getArgument(7); }
+void IfcResourceTime::setScheduleContour(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
+bool IfcResourceTime::hasLevelingDelay() const { return !entity->getArgument(8)->isNull(); }
+std::string IfcResourceTime::LevelingDelay() const { return *entity->getArgument(8); }
+void IfcResourceTime::setLevelingDelay(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
+bool IfcResourceTime::hasIsOverAllocated() const { return !entity->getArgument(9)->isNull(); }
+bool IfcResourceTime::IsOverAllocated() const { return *entity->getArgument(9); }
 void IfcResourceTime::setIsOverAllocated(bool v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
-bool IfcResourceTime::hasStatusTime() { return !entity->getArgument(10)->isNull(); }
-IfcDateTime IfcResourceTime::StatusTime() { return *entity->getArgument(10); }
-void IfcResourceTime::setStatusTime(IfcDateTime v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
-bool IfcResourceTime::hasActualWork() { return !entity->getArgument(11)->isNull(); }
-IfcDuration IfcResourceTime::ActualWork() { return *entity->getArgument(11); }
-void IfcResourceTime::setActualWork(IfcDuration v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(11,v); }
-bool IfcResourceTime::hasActualUsage() { return !entity->getArgument(12)->isNull(); }
-IfcPositiveRatioMeasure IfcResourceTime::ActualUsage() { return *entity->getArgument(12); }
-void IfcResourceTime::setActualUsage(IfcPositiveRatioMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(12,v); }
-bool IfcResourceTime::hasActualStart() { return !entity->getArgument(13)->isNull(); }
-IfcDateTime IfcResourceTime::ActualStart() { return *entity->getArgument(13); }
-void IfcResourceTime::setActualStart(IfcDateTime v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(13,v); }
-bool IfcResourceTime::hasActualFinish() { return !entity->getArgument(14)->isNull(); }
-IfcDateTime IfcResourceTime::ActualFinish() { return *entity->getArgument(14); }
-void IfcResourceTime::setActualFinish(IfcDateTime v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(14,v); }
-bool IfcResourceTime::hasRemainingWork() { return !entity->getArgument(15)->isNull(); }
-IfcDuration IfcResourceTime::RemainingWork() { return *entity->getArgument(15); }
-void IfcResourceTime::setRemainingWork(IfcDuration v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(15,v); }
-bool IfcResourceTime::hasRemainingUsage() { return !entity->getArgument(16)->isNull(); }
-IfcPositiveRatioMeasure IfcResourceTime::RemainingUsage() { return *entity->getArgument(16); }
-void IfcResourceTime::setRemainingUsage(IfcPositiveRatioMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(16,v); }
-bool IfcResourceTime::hasCompletion() { return !entity->getArgument(17)->isNull(); }
-IfcPositiveRatioMeasure IfcResourceTime::Completion() { return *entity->getArgument(17); }
-void IfcResourceTime::setCompletion(IfcPositiveRatioMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(17,v); }
+bool IfcResourceTime::hasStatusTime() const { return !entity->getArgument(10)->isNull(); }
+std::string IfcResourceTime::StatusTime() const { return *entity->getArgument(10); }
+void IfcResourceTime::setStatusTime(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
+bool IfcResourceTime::hasActualWork() const { return !entity->getArgument(11)->isNull(); }
+std::string IfcResourceTime::ActualWork() const { return *entity->getArgument(11); }
+void IfcResourceTime::setActualWork(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(11,v); }
+bool IfcResourceTime::hasActualUsage() const { return !entity->getArgument(12)->isNull(); }
+double IfcResourceTime::ActualUsage() const { return *entity->getArgument(12); }
+void IfcResourceTime::setActualUsage(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(12,v); }
+bool IfcResourceTime::hasActualStart() const { return !entity->getArgument(13)->isNull(); }
+std::string IfcResourceTime::ActualStart() const { return *entity->getArgument(13); }
+void IfcResourceTime::setActualStart(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(13,v); }
+bool IfcResourceTime::hasActualFinish() const { return !entity->getArgument(14)->isNull(); }
+std::string IfcResourceTime::ActualFinish() const { return *entity->getArgument(14); }
+void IfcResourceTime::setActualFinish(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(14,v); }
+bool IfcResourceTime::hasRemainingWork() const { return !entity->getArgument(15)->isNull(); }
+std::string IfcResourceTime::RemainingWork() const { return *entity->getArgument(15); }
+void IfcResourceTime::setRemainingWork(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(15,v); }
+bool IfcResourceTime::hasRemainingUsage() const { return !entity->getArgument(16)->isNull(); }
+double IfcResourceTime::RemainingUsage() const { return *entity->getArgument(16); }
+void IfcResourceTime::setRemainingUsage(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(16,v); }
+bool IfcResourceTime::hasCompletion() const { return !entity->getArgument(17)->isNull(); }
+double IfcResourceTime::Completion() const { return *entity->getArgument(17); }
+void IfcResourceTime::setCompletion(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(17,v); }
 bool IfcResourceTime::is(Type::Enum v) const { return v == Type::IfcResourceTime || IfcSchedulingTime::is(v); }
 Type::Enum IfcResourceTime::type() const { return Type::IfcResourceTime; }
 Type::Enum IfcResourceTime::Class() { return Type::IfcResourceTime; }
-IfcResourceTime::IfcResourceTime(IfcAbstractEntityPtr e) : IfcSchedulingTime((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcResourceTime)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcResourceTime::IfcResourceTime(boost::optional< IfcLabel > v1_Name, boost::optional< IfcDataOriginEnum::IfcDataOriginEnum > v2_DataOrigin, boost::optional< IfcLabel > v3_UserDefinedDataOrigin, boost::optional< IfcDuration > v4_ScheduleWork, boost::optional< IfcPositiveRatioMeasure > v5_ScheduleUsage, boost::optional< IfcDateTime > v6_ScheduleStart, boost::optional< IfcDateTime > v7_ScheduleFinish, boost::optional< IfcLabel > v8_ScheduleContour, boost::optional< IfcDuration > v9_LevelingDelay, boost::optional< bool > v10_IsOverAllocated, boost::optional< IfcDateTime > v11_StatusTime, boost::optional< IfcDuration > v12_ActualWork, boost::optional< IfcPositiveRatioMeasure > v13_ActualUsage, boost::optional< IfcDateTime > v14_ActualStart, boost::optional< IfcDateTime > v15_ActualFinish, boost::optional< IfcDuration > v16_RemainingWork, boost::optional< IfcPositiveRatioMeasure > v17_RemainingUsage, boost::optional< IfcPositiveRatioMeasure > v18_Completion) : IfcSchedulingTime((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_DataOrigin) { e->setArgument(1,*v2_DataOrigin,IfcDataOriginEnum::ToString(*v2_DataOrigin)); } else { e->setArgument(1); } if (v3_UserDefinedDataOrigin) { e->setArgument(2,(*v3_UserDefinedDataOrigin)); } else { e->setArgument(2); } if (v4_ScheduleWork) { e->setArgument(3,(*v4_ScheduleWork)); } else { e->setArgument(3); } if (v5_ScheduleUsage) { e->setArgument(4,(*v5_ScheduleUsage)); } else { e->setArgument(4); } if (v6_ScheduleStart) { e->setArgument(5,(*v6_ScheduleStart)); } else { e->setArgument(5); } if (v7_ScheduleFinish) { e->setArgument(6,(*v7_ScheduleFinish)); } else { e->setArgument(6); } if (v8_ScheduleContour) { e->setArgument(7,(*v8_ScheduleContour)); } else { e->setArgument(7); } if (v9_LevelingDelay) { e->setArgument(8,(*v9_LevelingDelay)); } else { e->setArgument(8); } if (v10_IsOverAllocated) { e->setArgument(9,(*v10_IsOverAllocated)); } else { e->setArgument(9); } if (v11_StatusTime) { e->setArgument(10,(*v11_StatusTime)); } else { e->setArgument(10); } if (v12_ActualWork) { e->setArgument(11,(*v12_ActualWork)); } else { e->setArgument(11); } if (v13_ActualUsage) { e->setArgument(12,(*v13_ActualUsage)); } else { e->setArgument(12); } if (v14_ActualStart) { e->setArgument(13,(*v14_ActualStart)); } else { e->setArgument(13); } if (v15_ActualFinish) { e->setArgument(14,(*v15_ActualFinish)); } else { e->setArgument(14); } if (v16_RemainingWork) { e->setArgument(15,(*v16_RemainingWork)); } else { e->setArgument(15); } if (v17_RemainingUsage) { e->setArgument(16,(*v17_RemainingUsage)); } else { e->setArgument(16); } if (v18_Completion) { e->setArgument(17,(*v18_Completion)); } else { e->setArgument(17); } entity = e; EntityBuffer::Add(this); }
+IfcResourceTime::IfcResourceTime(IfcAbstractEntity* e) : IfcSchedulingTime((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcResourceTime)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcResourceTime::IfcResourceTime(boost::optional< std::string > v1_Name, boost::optional< IfcDataOriginEnum::IfcDataOriginEnum > v2_DataOrigin, boost::optional< std::string > v3_UserDefinedDataOrigin, boost::optional< std::string > v4_ScheduleWork, boost::optional< double > v5_ScheduleUsage, boost::optional< std::string > v6_ScheduleStart, boost::optional< std::string > v7_ScheduleFinish, boost::optional< std::string > v8_ScheduleContour, boost::optional< std::string > v9_LevelingDelay, boost::optional< bool > v10_IsOverAllocated, boost::optional< std::string > v11_StatusTime, boost::optional< std::string > v12_ActualWork, boost::optional< double > v13_ActualUsage, boost::optional< std::string > v14_ActualStart, boost::optional< std::string > v15_ActualFinish, boost::optional< std::string > v16_RemainingWork, boost::optional< double > v17_RemainingUsage, boost::optional< double > v18_Completion) : IfcSchedulingTime((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_DataOrigin) { e->setArgument(1,*v2_DataOrigin,IfcDataOriginEnum::ToString(*v2_DataOrigin)); } else { e->setArgument(1); } if (v3_UserDefinedDataOrigin) { e->setArgument(2,(*v3_UserDefinedDataOrigin)); } else { e->setArgument(2); } if (v4_ScheduleWork) { e->setArgument(3,(*v4_ScheduleWork)); } else { e->setArgument(3); } if (v5_ScheduleUsage) { e->setArgument(4,(*v5_ScheduleUsage)); } else { e->setArgument(4); } if (v6_ScheduleStart) { e->setArgument(5,(*v6_ScheduleStart)); } else { e->setArgument(5); } if (v7_ScheduleFinish) { e->setArgument(6,(*v7_ScheduleFinish)); } else { e->setArgument(6); } if (v8_ScheduleContour) { e->setArgument(7,(*v8_ScheduleContour)); } else { e->setArgument(7); } if (v9_LevelingDelay) { e->setArgument(8,(*v9_LevelingDelay)); } else { e->setArgument(8); } if (v10_IsOverAllocated) { e->setArgument(9,(*v10_IsOverAllocated)); } else { e->setArgument(9); } if (v11_StatusTime) { e->setArgument(10,(*v11_StatusTime)); } else { e->setArgument(10); } if (v12_ActualWork) { e->setArgument(11,(*v12_ActualWork)); } else { e->setArgument(11); } if (v13_ActualUsage) { e->setArgument(12,(*v13_ActualUsage)); } else { e->setArgument(12); } if (v14_ActualStart) { e->setArgument(13,(*v14_ActualStart)); } else { e->setArgument(13); } if (v15_ActualFinish) { e->setArgument(14,(*v15_ActualFinish)); } else { e->setArgument(14); } if (v16_RemainingWork) { e->setArgument(15,(*v16_RemainingWork)); } else { e->setArgument(15); } if (v17_RemainingUsage) { e->setArgument(16,(*v17_RemainingUsage)); } else { e->setArgument(16); } if (v18_Completion) { e->setArgument(17,(*v18_Completion)); } else { e->setArgument(17); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRevolvedAreaSolid
-IfcAxis1Placement* IfcRevolvedAreaSolid::Axis() { return (IfcAxis1Placement*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(2))); }
+IfcAxis1Placement* IfcRevolvedAreaSolid::Axis() const { return (IfcAxis1Placement*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(2))); }
 void IfcRevolvedAreaSolid::setAxis(IfcAxis1Placement* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-IfcPlaneAngleMeasure IfcRevolvedAreaSolid::Angle() { return *entity->getArgument(3); }
-void IfcRevolvedAreaSolid::setAngle(IfcPlaneAngleMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+double IfcRevolvedAreaSolid::Angle() const { return *entity->getArgument(3); }
+void IfcRevolvedAreaSolid::setAngle(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
 bool IfcRevolvedAreaSolid::is(Type::Enum v) const { return v == Type::IfcRevolvedAreaSolid || IfcSweptAreaSolid::is(v); }
 Type::Enum IfcRevolvedAreaSolid::type() const { return Type::IfcRevolvedAreaSolid; }
 Type::Enum IfcRevolvedAreaSolid::Class() { return Type::IfcRevolvedAreaSolid; }
-IfcRevolvedAreaSolid::IfcRevolvedAreaSolid(IfcAbstractEntityPtr e) : IfcSweptAreaSolid((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRevolvedAreaSolid)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRevolvedAreaSolid::IfcRevolvedAreaSolid(IfcProfileDef* v1_SweptArea, IfcAxis2Placement3D* v2_Position, IfcAxis1Placement* v3_Axis, IfcPlaneAngleMeasure v4_Angle) : IfcSweptAreaSolid((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_SweptArea)); e->setArgument(1,(v2_Position)); e->setArgument(2,(v3_Axis)); e->setArgument(3,(v4_Angle)); entity = e; EntityBuffer::Add(this); }
+IfcRevolvedAreaSolid::IfcRevolvedAreaSolid(IfcAbstractEntity* e) : IfcSweptAreaSolid((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRevolvedAreaSolid)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRevolvedAreaSolid::IfcRevolvedAreaSolid(IfcProfileDef* v1_SweptArea, IfcAxis2Placement3D* v2_Position, IfcAxis1Placement* v3_Axis, double v4_Angle) : IfcSweptAreaSolid((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_SweptArea)); e->setArgument(1,(v2_Position)); e->setArgument(2,(v3_Axis)); e->setArgument(3,(v4_Angle)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRevolvedAreaSolidTapered
-IfcProfileDef* IfcRevolvedAreaSolidTapered::EndSweptArea() { return (IfcProfileDef*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(4))); }
+IfcProfileDef* IfcRevolvedAreaSolidTapered::EndSweptArea() const { return (IfcProfileDef*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(4))); }
 void IfcRevolvedAreaSolidTapered::setEndSweptArea(IfcProfileDef* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
 bool IfcRevolvedAreaSolidTapered::is(Type::Enum v) const { return v == Type::IfcRevolvedAreaSolidTapered || IfcRevolvedAreaSolid::is(v); }
 Type::Enum IfcRevolvedAreaSolidTapered::type() const { return Type::IfcRevolvedAreaSolidTapered; }
 Type::Enum IfcRevolvedAreaSolidTapered::Class() { return Type::IfcRevolvedAreaSolidTapered; }
-IfcRevolvedAreaSolidTapered::IfcRevolvedAreaSolidTapered(IfcAbstractEntityPtr e) : IfcRevolvedAreaSolid((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRevolvedAreaSolidTapered)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRevolvedAreaSolidTapered::IfcRevolvedAreaSolidTapered(IfcProfileDef* v1_SweptArea, IfcAxis2Placement3D* v2_Position, IfcAxis1Placement* v3_Axis, IfcPlaneAngleMeasure v4_Angle, IfcProfileDef* v5_EndSweptArea) : IfcRevolvedAreaSolid((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_SweptArea)); e->setArgument(1,(v2_Position)); e->setArgument(2,(v3_Axis)); e->setArgument(3,(v4_Angle)); e->setArgument(4,(v5_EndSweptArea)); entity = e; EntityBuffer::Add(this); }
+IfcRevolvedAreaSolidTapered::IfcRevolvedAreaSolidTapered(IfcAbstractEntity* e) : IfcRevolvedAreaSolid((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRevolvedAreaSolidTapered)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRevolvedAreaSolidTapered::IfcRevolvedAreaSolidTapered(IfcProfileDef* v1_SweptArea, IfcAxis2Placement3D* v2_Position, IfcAxis1Placement* v3_Axis, double v4_Angle, IfcProfileDef* v5_EndSweptArea) : IfcRevolvedAreaSolid((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_SweptArea)); e->setArgument(1,(v2_Position)); e->setArgument(2,(v3_Axis)); e->setArgument(3,(v4_Angle)); e->setArgument(4,(v5_EndSweptArea)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRightCircularCone
-IfcPositiveLengthMeasure IfcRightCircularCone::Height() { return *entity->getArgument(1); }
-void IfcRightCircularCone::setHeight(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-IfcPositiveLengthMeasure IfcRightCircularCone::BottomRadius() { return *entity->getArgument(2); }
-void IfcRightCircularCone::setBottomRadius(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+double IfcRightCircularCone::Height() const { return *entity->getArgument(1); }
+void IfcRightCircularCone::setHeight(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+double IfcRightCircularCone::BottomRadius() const { return *entity->getArgument(2); }
+void IfcRightCircularCone::setBottomRadius(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
 bool IfcRightCircularCone::is(Type::Enum v) const { return v == Type::IfcRightCircularCone || IfcCsgPrimitive3D::is(v); }
 Type::Enum IfcRightCircularCone::type() const { return Type::IfcRightCircularCone; }
 Type::Enum IfcRightCircularCone::Class() { return Type::IfcRightCircularCone; }
-IfcRightCircularCone::IfcRightCircularCone(IfcAbstractEntityPtr e) : IfcCsgPrimitive3D((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRightCircularCone)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRightCircularCone::IfcRightCircularCone(IfcAxis2Placement3D* v1_Position, IfcPositiveLengthMeasure v2_Height, IfcPositiveLengthMeasure v3_BottomRadius) : IfcCsgPrimitive3D((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Position)); e->setArgument(1,(v2_Height)); e->setArgument(2,(v3_BottomRadius)); entity = e; EntityBuffer::Add(this); }
+IfcRightCircularCone::IfcRightCircularCone(IfcAbstractEntity* e) : IfcCsgPrimitive3D((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRightCircularCone)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRightCircularCone::IfcRightCircularCone(IfcAxis2Placement3D* v1_Position, double v2_Height, double v3_BottomRadius) : IfcCsgPrimitive3D((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Position)); e->setArgument(1,(v2_Height)); e->setArgument(2,(v3_BottomRadius)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRightCircularCylinder
-IfcPositiveLengthMeasure IfcRightCircularCylinder::Height() { return *entity->getArgument(1); }
-void IfcRightCircularCylinder::setHeight(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-IfcPositiveLengthMeasure IfcRightCircularCylinder::Radius() { return *entity->getArgument(2); }
-void IfcRightCircularCylinder::setRadius(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+double IfcRightCircularCylinder::Height() const { return *entity->getArgument(1); }
+void IfcRightCircularCylinder::setHeight(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+double IfcRightCircularCylinder::Radius() const { return *entity->getArgument(2); }
+void IfcRightCircularCylinder::setRadius(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
 bool IfcRightCircularCylinder::is(Type::Enum v) const { return v == Type::IfcRightCircularCylinder || IfcCsgPrimitive3D::is(v); }
 Type::Enum IfcRightCircularCylinder::type() const { return Type::IfcRightCircularCylinder; }
 Type::Enum IfcRightCircularCylinder::Class() { return Type::IfcRightCircularCylinder; }
-IfcRightCircularCylinder::IfcRightCircularCylinder(IfcAbstractEntityPtr e) : IfcCsgPrimitive3D((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRightCircularCylinder)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRightCircularCylinder::IfcRightCircularCylinder(IfcAxis2Placement3D* v1_Position, IfcPositiveLengthMeasure v2_Height, IfcPositiveLengthMeasure v3_Radius) : IfcCsgPrimitive3D((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Position)); e->setArgument(1,(v2_Height)); e->setArgument(2,(v3_Radius)); entity = e; EntityBuffer::Add(this); }
+IfcRightCircularCylinder::IfcRightCircularCylinder(IfcAbstractEntity* e) : IfcCsgPrimitive3D((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRightCircularCylinder)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRightCircularCylinder::IfcRightCircularCylinder(IfcAxis2Placement3D* v1_Position, double v2_Height, double v3_Radius) : IfcCsgPrimitive3D((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Position)); e->setArgument(1,(v2_Height)); e->setArgument(2,(v3_Radius)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRoof
-bool IfcRoof::hasPredefinedType() { return !entity->getArgument(8)->isNull(); }
-IfcRoofTypeEnum::IfcRoofTypeEnum IfcRoof::PredefinedType() { return IfcRoofTypeEnum::FromString(*entity->getArgument(8)); }
+bool IfcRoof::hasPredefinedType() const { return !entity->getArgument(8)->isNull(); }
+IfcRoofTypeEnum::IfcRoofTypeEnum IfcRoof::PredefinedType() const { return IfcRoofTypeEnum::FromString(*entity->getArgument(8)); }
 void IfcRoof::setPredefinedType(IfcRoofTypeEnum::IfcRoofTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcRoofTypeEnum::ToString(v)); }
 bool IfcRoof::is(Type::Enum v) const { return v == Type::IfcRoof || IfcBuildingElement::is(v); }
 Type::Enum IfcRoof::type() const { return Type::IfcRoof; }
 Type::Enum IfcRoof::Class() { return Type::IfcRoof; }
-IfcRoof::IfcRoof(IfcAbstractEntityPtr e) : IfcBuildingElement((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRoof)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRoof::IfcRoof(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcRoofTypeEnum::IfcRoofTypeEnum > v9_PredefinedType) : IfcBuildingElement((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcRoofTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcRoof::IfcRoof(IfcAbstractEntity* e) : IfcBuildingElement((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRoof)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRoof::IfcRoof(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcRoofTypeEnum::IfcRoofTypeEnum > v9_PredefinedType) : IfcBuildingElement((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcRoofTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRoofType
-IfcRoofTypeEnum::IfcRoofTypeEnum IfcRoofType::PredefinedType() { return IfcRoofTypeEnum::FromString(*entity->getArgument(9)); }
+IfcRoofTypeEnum::IfcRoofTypeEnum IfcRoofType::PredefinedType() const { return IfcRoofTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcRoofType::setPredefinedType(IfcRoofTypeEnum::IfcRoofTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcRoofTypeEnum::ToString(v)); }
 bool IfcRoofType::is(Type::Enum v) const { return v == Type::IfcRoofType || IfcBuildingElementType::is(v); }
 Type::Enum IfcRoofType::type() const { return Type::IfcRoofType; }
 Type::Enum IfcRoofType::Class() { return Type::IfcRoofType; }
-IfcRoofType::IfcRoofType(IfcAbstractEntityPtr e) : IfcBuildingElementType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRoofType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRoofType::IfcRoofType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcRoofTypeEnum::IfcRoofTypeEnum v10_PredefinedType) : IfcBuildingElementType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcRoofTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcRoofType::IfcRoofType(IfcAbstractEntity* e) : IfcBuildingElementType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRoofType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRoofType::IfcRoofType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcRoofTypeEnum::IfcRoofTypeEnum v10_PredefinedType) : IfcBuildingElementType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcRoofTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRoot
-IfcGloballyUniqueId IfcRoot::GlobalId() { return *entity->getArgument(0); }
-void IfcRoot::setGlobalId(IfcGloballyUniqueId v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-bool IfcRoot::hasOwnerHistory() { return !entity->getArgument(1)->isNull(); }
-IfcOwnerHistory* IfcRoot::OwnerHistory() { return (IfcOwnerHistory*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(1))); }
+std::string IfcRoot::GlobalId() const { return *entity->getArgument(0); }
+void IfcRoot::setGlobalId(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+bool IfcRoot::hasOwnerHistory() const { return !entity->getArgument(1)->isNull(); }
+IfcOwnerHistory* IfcRoot::OwnerHistory() const { return (IfcOwnerHistory*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(1))); }
 void IfcRoot::setOwnerHistory(IfcOwnerHistory* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-bool IfcRoot::hasName() { return !entity->getArgument(2)->isNull(); }
-IfcLabel IfcRoot::Name() { return *entity->getArgument(2); }
-void IfcRoot::setName(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-bool IfcRoot::hasDescription() { return !entity->getArgument(3)->isNull(); }
-IfcText IfcRoot::Description() { return *entity->getArgument(3); }
-void IfcRoot::setDescription(IfcText v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+bool IfcRoot::hasName() const { return !entity->getArgument(2)->isNull(); }
+std::string IfcRoot::Name() const { return *entity->getArgument(2); }
+void IfcRoot::setName(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+bool IfcRoot::hasDescription() const { return !entity->getArgument(3)->isNull(); }
+std::string IfcRoot::Description() const { return *entity->getArgument(3); }
+void IfcRoot::setDescription(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
 bool IfcRoot::is(Type::Enum v) const { return v == Type::IfcRoot; }
 Type::Enum IfcRoot::type() const { return Type::IfcRoot; }
 Type::Enum IfcRoot::Class() { return Type::IfcRoot; }
-IfcRoot::IfcRoot(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcRoot)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRoot::IfcRoot(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } entity = e; EntityBuffer::Add(this); }
+IfcRoot::IfcRoot(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcRoot)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRoot::IfcRoot(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcRoundedRectangleProfileDef
-IfcPositiveLengthMeasure IfcRoundedRectangleProfileDef::RoundingRadius() { return *entity->getArgument(5); }
-void IfcRoundedRectangleProfileDef::setRoundingRadius(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+double IfcRoundedRectangleProfileDef::RoundingRadius() const { return *entity->getArgument(5); }
+void IfcRoundedRectangleProfileDef::setRoundingRadius(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
 bool IfcRoundedRectangleProfileDef::is(Type::Enum v) const { return v == Type::IfcRoundedRectangleProfileDef || IfcRectangleProfileDef::is(v); }
 Type::Enum IfcRoundedRectangleProfileDef::type() const { return Type::IfcRoundedRectangleProfileDef; }
 Type::Enum IfcRoundedRectangleProfileDef::Class() { return Type::IfcRoundedRectangleProfileDef; }
-IfcRoundedRectangleProfileDef::IfcRoundedRectangleProfileDef(IfcAbstractEntityPtr e) : IfcRectangleProfileDef((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcRoundedRectangleProfileDef)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcRoundedRectangleProfileDef::IfcRoundedRectangleProfileDef(IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< IfcLabel > v2_ProfileName, IfcAxis2Placement2D* v3_Position, IfcPositiveLengthMeasure v4_XDim, IfcPositiveLengthMeasure v5_YDim, IfcPositiveLengthMeasure v6_RoundingRadius) : IfcRectangleProfileDef((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,v1_ProfileType,IfcProfileTypeEnum::ToString(v1_ProfileType)); if (v2_ProfileName) { e->setArgument(1,(*v2_ProfileName)); } else { e->setArgument(1); } e->setArgument(2,(v3_Position)); e->setArgument(3,(v4_XDim)); e->setArgument(4,(v5_YDim)); e->setArgument(5,(v6_RoundingRadius)); entity = e; EntityBuffer::Add(this); }
+IfcRoundedRectangleProfileDef::IfcRoundedRectangleProfileDef(IfcAbstractEntity* e) : IfcRectangleProfileDef((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcRoundedRectangleProfileDef)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcRoundedRectangleProfileDef::IfcRoundedRectangleProfileDef(IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< std::string > v2_ProfileName, IfcAxis2Placement2D* v3_Position, double v4_XDim, double v5_YDim, double v6_RoundingRadius) : IfcRectangleProfileDef((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,v1_ProfileType,IfcProfileTypeEnum::ToString(v1_ProfileType)); if (v2_ProfileName) { e->setArgument(1,(*v2_ProfileName)); } else { e->setArgument(1); } e->setArgument(2,(v3_Position)); e->setArgument(3,(v4_XDim)); e->setArgument(4,(v5_YDim)); e->setArgument(5,(v6_RoundingRadius)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcSIUnit
-bool IfcSIUnit::hasPrefix() { return !entity->getArgument(2)->isNull(); }
-IfcSIPrefix::IfcSIPrefix IfcSIUnit::Prefix() { return IfcSIPrefix::FromString(*entity->getArgument(2)); }
+bool IfcSIUnit::hasPrefix() const { return !entity->getArgument(2)->isNull(); }
+IfcSIPrefix::IfcSIPrefix IfcSIUnit::Prefix() const { return IfcSIPrefix::FromString(*entity->getArgument(2)); }
 void IfcSIUnit::setPrefix(IfcSIPrefix::IfcSIPrefix v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v,IfcSIPrefix::ToString(v)); }
-IfcSIUnitName::IfcSIUnitName IfcSIUnit::Name() { return IfcSIUnitName::FromString(*entity->getArgument(3)); }
+IfcSIUnitName::IfcSIUnitName IfcSIUnit::Name() const { return IfcSIUnitName::FromString(*entity->getArgument(3)); }
 void IfcSIUnit::setName(IfcSIUnitName::IfcSIUnitName v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v,IfcSIUnitName::ToString(v)); }
 bool IfcSIUnit::is(Type::Enum v) const { return v == Type::IfcSIUnit || IfcNamedUnit::is(v); }
 Type::Enum IfcSIUnit::type() const { return Type::IfcSIUnit; }
 Type::Enum IfcSIUnit::Class() { return Type::IfcSIUnit; }
-IfcSIUnit::IfcSIUnit(IfcAbstractEntityPtr e) : IfcNamedUnit((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcSIUnit)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcSIUnit::IfcSIUnit(IfcUnitEnum::IfcUnitEnum v2_UnitType, boost::optional< IfcSIPrefix::IfcSIPrefix > v3_Prefix, IfcSIUnitName::IfcSIUnitName v4_Name) : IfcNamedUnit((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgumentDerived(0); e->setArgument(1,v2_UnitType,IfcUnitEnum::ToString(v2_UnitType)); if (v3_Prefix) { e->setArgument(2,*v3_Prefix,IfcSIPrefix::ToString(*v3_Prefix)); } else { e->setArgument(2); } e->setArgument(3,v4_Name,IfcSIUnitName::ToString(v4_Name)); entity = e; EntityBuffer::Add(this); }
+IfcSIUnit::IfcSIUnit(IfcAbstractEntity* e) : IfcNamedUnit((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcSIUnit)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcSIUnit::IfcSIUnit(IfcUnitEnum::IfcUnitEnum v2_UnitType, boost::optional< IfcSIPrefix::IfcSIPrefix > v3_Prefix, IfcSIUnitName::IfcSIUnitName v4_Name) : IfcNamedUnit((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgumentDerived(0); e->setArgument(1,v2_UnitType,IfcUnitEnum::ToString(v2_UnitType)); if (v3_Prefix) { e->setArgument(2,*v3_Prefix,IfcSIPrefix::ToString(*v3_Prefix)); } else { e->setArgument(2); } e->setArgument(3,v4_Name,IfcSIUnitName::ToString(v4_Name)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcSanitaryTerminal
-bool IfcSanitaryTerminal::hasPredefinedType() { return !entity->getArgument(8)->isNull(); }
-IfcSanitaryTerminalTypeEnum::IfcSanitaryTerminalTypeEnum IfcSanitaryTerminal::PredefinedType() { return IfcSanitaryTerminalTypeEnum::FromString(*entity->getArgument(8)); }
+bool IfcSanitaryTerminal::hasPredefinedType() const { return !entity->getArgument(8)->isNull(); }
+IfcSanitaryTerminalTypeEnum::IfcSanitaryTerminalTypeEnum IfcSanitaryTerminal::PredefinedType() const { return IfcSanitaryTerminalTypeEnum::FromString(*entity->getArgument(8)); }
 void IfcSanitaryTerminal::setPredefinedType(IfcSanitaryTerminalTypeEnum::IfcSanitaryTerminalTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcSanitaryTerminalTypeEnum::ToString(v)); }
 bool IfcSanitaryTerminal::is(Type::Enum v) const { return v == Type::IfcSanitaryTerminal || IfcFlowTerminal::is(v); }
 Type::Enum IfcSanitaryTerminal::type() const { return Type::IfcSanitaryTerminal; }
 Type::Enum IfcSanitaryTerminal::Class() { return Type::IfcSanitaryTerminal; }
-IfcSanitaryTerminal::IfcSanitaryTerminal(IfcAbstractEntityPtr e) : IfcFlowTerminal((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcSanitaryTerminal)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcSanitaryTerminal::IfcSanitaryTerminal(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcSanitaryTerminalTypeEnum::IfcSanitaryTerminalTypeEnum > v9_PredefinedType) : IfcFlowTerminal((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcSanitaryTerminalTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcSanitaryTerminal::IfcSanitaryTerminal(IfcAbstractEntity* e) : IfcFlowTerminal((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcSanitaryTerminal)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcSanitaryTerminal::IfcSanitaryTerminal(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcSanitaryTerminalTypeEnum::IfcSanitaryTerminalTypeEnum > v9_PredefinedType) : IfcFlowTerminal((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcSanitaryTerminalTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcSanitaryTerminalType
-IfcSanitaryTerminalTypeEnum::IfcSanitaryTerminalTypeEnum IfcSanitaryTerminalType::PredefinedType() { return IfcSanitaryTerminalTypeEnum::FromString(*entity->getArgument(9)); }
+IfcSanitaryTerminalTypeEnum::IfcSanitaryTerminalTypeEnum IfcSanitaryTerminalType::PredefinedType() const { return IfcSanitaryTerminalTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcSanitaryTerminalType::setPredefinedType(IfcSanitaryTerminalTypeEnum::IfcSanitaryTerminalTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcSanitaryTerminalTypeEnum::ToString(v)); }
 bool IfcSanitaryTerminalType::is(Type::Enum v) const { return v == Type::IfcSanitaryTerminalType || IfcFlowTerminalType::is(v); }
 Type::Enum IfcSanitaryTerminalType::type() const { return Type::IfcSanitaryTerminalType; }
 Type::Enum IfcSanitaryTerminalType::Class() { return Type::IfcSanitaryTerminalType; }
-IfcSanitaryTerminalType::IfcSanitaryTerminalType(IfcAbstractEntityPtr e) : IfcFlowTerminalType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcSanitaryTerminalType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcSanitaryTerminalType::IfcSanitaryTerminalType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcSanitaryTerminalTypeEnum::IfcSanitaryTerminalTypeEnum v10_PredefinedType) : IfcFlowTerminalType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcSanitaryTerminalTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcSanitaryTerminalType::IfcSanitaryTerminalType(IfcAbstractEntity* e) : IfcFlowTerminalType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcSanitaryTerminalType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcSanitaryTerminalType::IfcSanitaryTerminalType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcSanitaryTerminalTypeEnum::IfcSanitaryTerminalTypeEnum v10_PredefinedType) : IfcFlowTerminalType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcSanitaryTerminalTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcSchedulingTime
-bool IfcSchedulingTime::hasName() { return !entity->getArgument(0)->isNull(); }
-IfcLabel IfcSchedulingTime::Name() { return *entity->getArgument(0); }
-void IfcSchedulingTime::setName(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-bool IfcSchedulingTime::hasDataOrigin() { return !entity->getArgument(1)->isNull(); }
-IfcDataOriginEnum::IfcDataOriginEnum IfcSchedulingTime::DataOrigin() { return IfcDataOriginEnum::FromString(*entity->getArgument(1)); }
+bool IfcSchedulingTime::hasName() const { return !entity->getArgument(0)->isNull(); }
+std::string IfcSchedulingTime::Name() const { return *entity->getArgument(0); }
+void IfcSchedulingTime::setName(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+bool IfcSchedulingTime::hasDataOrigin() const { return !entity->getArgument(1)->isNull(); }
+IfcDataOriginEnum::IfcDataOriginEnum IfcSchedulingTime::DataOrigin() const { return IfcDataOriginEnum::FromString(*entity->getArgument(1)); }
 void IfcSchedulingTime::setDataOrigin(IfcDataOriginEnum::IfcDataOriginEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v,IfcDataOriginEnum::ToString(v)); }
-bool IfcSchedulingTime::hasUserDefinedDataOrigin() { return !entity->getArgument(2)->isNull(); }
-IfcLabel IfcSchedulingTime::UserDefinedDataOrigin() { return *entity->getArgument(2); }
-void IfcSchedulingTime::setUserDefinedDataOrigin(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+bool IfcSchedulingTime::hasUserDefinedDataOrigin() const { return !entity->getArgument(2)->isNull(); }
+std::string IfcSchedulingTime::UserDefinedDataOrigin() const { return *entity->getArgument(2); }
+void IfcSchedulingTime::setUserDefinedDataOrigin(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
 bool IfcSchedulingTime::is(Type::Enum v) const { return v == Type::IfcSchedulingTime; }
 Type::Enum IfcSchedulingTime::type() const { return Type::IfcSchedulingTime; }
 Type::Enum IfcSchedulingTime::Class() { return Type::IfcSchedulingTime; }
-IfcSchedulingTime::IfcSchedulingTime(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcSchedulingTime)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcSchedulingTime::IfcSchedulingTime(boost::optional< IfcLabel > v1_Name, boost::optional< IfcDataOriginEnum::IfcDataOriginEnum > v2_DataOrigin, boost::optional< IfcLabel > v3_UserDefinedDataOrigin) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_DataOrigin) { e->setArgument(1,*v2_DataOrigin,IfcDataOriginEnum::ToString(*v2_DataOrigin)); } else { e->setArgument(1); } if (v3_UserDefinedDataOrigin) { e->setArgument(2,(*v3_UserDefinedDataOrigin)); } else { e->setArgument(2); } entity = e; EntityBuffer::Add(this); }
+IfcSchedulingTime::IfcSchedulingTime(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcSchedulingTime)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcSchedulingTime::IfcSchedulingTime(boost::optional< std::string > v1_Name, boost::optional< IfcDataOriginEnum::IfcDataOriginEnum > v2_DataOrigin, boost::optional< std::string > v3_UserDefinedDataOrigin) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_DataOrigin) { e->setArgument(1,*v2_DataOrigin,IfcDataOriginEnum::ToString(*v2_DataOrigin)); } else { e->setArgument(1); } if (v3_UserDefinedDataOrigin) { e->setArgument(2,(*v3_UserDefinedDataOrigin)); } else { e->setArgument(2); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcSectionProperties
-IfcSectionTypeEnum::IfcSectionTypeEnum IfcSectionProperties::SectionType() { return IfcSectionTypeEnum::FromString(*entity->getArgument(0)); }
+IfcSectionTypeEnum::IfcSectionTypeEnum IfcSectionProperties::SectionType() const { return IfcSectionTypeEnum::FromString(*entity->getArgument(0)); }
 void IfcSectionProperties::setSectionType(IfcSectionTypeEnum::IfcSectionTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v,IfcSectionTypeEnum::ToString(v)); }
-IfcProfileDef* IfcSectionProperties::StartProfile() { return (IfcProfileDef*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(1))); }
+IfcProfileDef* IfcSectionProperties::StartProfile() const { return (IfcProfileDef*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(1))); }
 void IfcSectionProperties::setStartProfile(IfcProfileDef* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-bool IfcSectionProperties::hasEndProfile() { return !entity->getArgument(2)->isNull(); }
-IfcProfileDef* IfcSectionProperties::EndProfile() { return (IfcProfileDef*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(2))); }
+bool IfcSectionProperties::hasEndProfile() const { return !entity->getArgument(2)->isNull(); }
+IfcProfileDef* IfcSectionProperties::EndProfile() const { return (IfcProfileDef*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(2))); }
 void IfcSectionProperties::setEndProfile(IfcProfileDef* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
 bool IfcSectionProperties::is(Type::Enum v) const { return v == Type::IfcSectionProperties || IfcPreDefinedProperties::is(v); }
 Type::Enum IfcSectionProperties::type() const { return Type::IfcSectionProperties; }
 Type::Enum IfcSectionProperties::Class() { return Type::IfcSectionProperties; }
-IfcSectionProperties::IfcSectionProperties(IfcAbstractEntityPtr e) : IfcPreDefinedProperties((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcSectionProperties)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcSectionProperties::IfcSectionProperties(IfcSectionTypeEnum::IfcSectionTypeEnum v1_SectionType, IfcProfileDef* v2_StartProfile, IfcProfileDef* v3_EndProfile) : IfcPreDefinedProperties((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,v1_SectionType,IfcSectionTypeEnum::ToString(v1_SectionType)); e->setArgument(1,(v2_StartProfile)); e->setArgument(2,(v3_EndProfile)); entity = e; EntityBuffer::Add(this); }
+IfcSectionProperties::IfcSectionProperties(IfcAbstractEntity* e) : IfcPreDefinedProperties((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcSectionProperties)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcSectionProperties::IfcSectionProperties(IfcSectionTypeEnum::IfcSectionTypeEnum v1_SectionType, IfcProfileDef* v2_StartProfile, IfcProfileDef* v3_EndProfile) : IfcPreDefinedProperties((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,v1_SectionType,IfcSectionTypeEnum::ToString(v1_SectionType)); e->setArgument(1,(v2_StartProfile)); e->setArgument(2,(v3_EndProfile)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcSectionReinforcementProperties
-IfcLengthMeasure IfcSectionReinforcementProperties::LongitudinalStartPosition() { return *entity->getArgument(0); }
-void IfcSectionReinforcementProperties::setLongitudinalStartPosition(IfcLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-IfcLengthMeasure IfcSectionReinforcementProperties::LongitudinalEndPosition() { return *entity->getArgument(1); }
-void IfcSectionReinforcementProperties::setLongitudinalEndPosition(IfcLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-bool IfcSectionReinforcementProperties::hasTransversePosition() { return !entity->getArgument(2)->isNull(); }
-IfcLengthMeasure IfcSectionReinforcementProperties::TransversePosition() { return *entity->getArgument(2); }
-void IfcSectionReinforcementProperties::setTransversePosition(IfcLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-IfcReinforcingBarRoleEnum::IfcReinforcingBarRoleEnum IfcSectionReinforcementProperties::ReinforcementRole() { return IfcReinforcingBarRoleEnum::FromString(*entity->getArgument(3)); }
+double IfcSectionReinforcementProperties::LongitudinalStartPosition() const { return *entity->getArgument(0); }
+void IfcSectionReinforcementProperties::setLongitudinalStartPosition(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+double IfcSectionReinforcementProperties::LongitudinalEndPosition() const { return *entity->getArgument(1); }
+void IfcSectionReinforcementProperties::setLongitudinalEndPosition(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+bool IfcSectionReinforcementProperties::hasTransversePosition() const { return !entity->getArgument(2)->isNull(); }
+double IfcSectionReinforcementProperties::TransversePosition() const { return *entity->getArgument(2); }
+void IfcSectionReinforcementProperties::setTransversePosition(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+IfcReinforcingBarRoleEnum::IfcReinforcingBarRoleEnum IfcSectionReinforcementProperties::ReinforcementRole() const { return IfcReinforcingBarRoleEnum::FromString(*entity->getArgument(3)); }
 void IfcSectionReinforcementProperties::setReinforcementRole(IfcReinforcingBarRoleEnum::IfcReinforcingBarRoleEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v,IfcReinforcingBarRoleEnum::ToString(v)); }
-IfcSectionProperties* IfcSectionReinforcementProperties::SectionDefinition() { return (IfcSectionProperties*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(4))); }
+IfcSectionProperties* IfcSectionReinforcementProperties::SectionDefinition() const { return (IfcSectionProperties*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(4))); }
 void IfcSectionReinforcementProperties::setSectionDefinition(IfcSectionProperties* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-SHARED_PTR< IfcTemplatedEntityList< IfcReinforcementBarProperties > > IfcSectionReinforcementProperties::CrossSectionReinforcementDefinitions() { RETURN_AS_LIST(IfcReinforcementBarProperties,5) }
-void IfcSectionReinforcementProperties::setCrossSectionReinforcementDefinitions(SHARED_PTR< IfcTemplatedEntityList< IfcReinforcementBarProperties > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v->generalize()); }
+IfcTemplatedEntityList< IfcReinforcementBarProperties >::ptr IfcSectionReinforcementProperties::CrossSectionReinforcementDefinitions() const { IfcEntityList::ptr es = *entity->getArgument(5); return es->as<IfcReinforcementBarProperties>(); }
+void IfcSectionReinforcementProperties::setCrossSectionReinforcementDefinitions(IfcTemplatedEntityList< IfcReinforcementBarProperties >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v->generalize()); }
 bool IfcSectionReinforcementProperties::is(Type::Enum v) const { return v == Type::IfcSectionReinforcementProperties || IfcPreDefinedProperties::is(v); }
 Type::Enum IfcSectionReinforcementProperties::type() const { return Type::IfcSectionReinforcementProperties; }
 Type::Enum IfcSectionReinforcementProperties::Class() { return Type::IfcSectionReinforcementProperties; }
-IfcSectionReinforcementProperties::IfcSectionReinforcementProperties(IfcAbstractEntityPtr e) : IfcPreDefinedProperties((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcSectionReinforcementProperties)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcSectionReinforcementProperties::IfcSectionReinforcementProperties(IfcLengthMeasure v1_LongitudinalStartPosition, IfcLengthMeasure v2_LongitudinalEndPosition, boost::optional< IfcLengthMeasure > v3_TransversePosition, IfcReinforcingBarRoleEnum::IfcReinforcingBarRoleEnum v4_ReinforcementRole, IfcSectionProperties* v5_SectionDefinition, SHARED_PTR< IfcTemplatedEntityList< IfcReinforcementBarProperties > > v6_CrossSectionReinforcementDefinitions) : IfcPreDefinedProperties((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_LongitudinalStartPosition)); e->setArgument(1,(v2_LongitudinalEndPosition)); if (v3_TransversePosition) { e->setArgument(2,(*v3_TransversePosition)); } else { e->setArgument(2); } e->setArgument(3,v4_ReinforcementRole,IfcReinforcingBarRoleEnum::ToString(v4_ReinforcementRole)); e->setArgument(4,(v5_SectionDefinition)); e->setArgument(5,(v6_CrossSectionReinforcementDefinitions)->generalize()); entity = e; EntityBuffer::Add(this); }
+IfcSectionReinforcementProperties::IfcSectionReinforcementProperties(IfcAbstractEntity* e) : IfcPreDefinedProperties((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcSectionReinforcementProperties)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcSectionReinforcementProperties::IfcSectionReinforcementProperties(double v1_LongitudinalStartPosition, double v2_LongitudinalEndPosition, boost::optional< double > v3_TransversePosition, IfcReinforcingBarRoleEnum::IfcReinforcingBarRoleEnum v4_ReinforcementRole, IfcSectionProperties* v5_SectionDefinition, IfcTemplatedEntityList< IfcReinforcementBarProperties >::ptr v6_CrossSectionReinforcementDefinitions) : IfcPreDefinedProperties((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_LongitudinalStartPosition)); e->setArgument(1,(v2_LongitudinalEndPosition)); if (v3_TransversePosition) { e->setArgument(2,(*v3_TransversePosition)); } else { e->setArgument(2); } e->setArgument(3,v4_ReinforcementRole,IfcReinforcingBarRoleEnum::ToString(v4_ReinforcementRole)); e->setArgument(4,(v5_SectionDefinition)); e->setArgument(5,(v6_CrossSectionReinforcementDefinitions)->generalize()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcSectionedSpine
-IfcCompositeCurve* IfcSectionedSpine::SpineCurve() { return (IfcCompositeCurve*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(0))); }
+IfcCompositeCurve* IfcSectionedSpine::SpineCurve() const { return (IfcCompositeCurve*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(0))); }
 void IfcSectionedSpine::setSpineCurve(IfcCompositeCurve* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-SHARED_PTR< IfcTemplatedEntityList< IfcProfileDef > > IfcSectionedSpine::CrossSections() { RETURN_AS_LIST(IfcProfileDef,1) }
-void IfcSectionedSpine::setCrossSections(SHARED_PTR< IfcTemplatedEntityList< IfcProfileDef > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v->generalize()); }
-SHARED_PTR< IfcTemplatedEntityList< IfcAxis2Placement3D > > IfcSectionedSpine::CrossSectionPositions() { RETURN_AS_LIST(IfcAxis2Placement3D,2) }
-void IfcSectionedSpine::setCrossSectionPositions(SHARED_PTR< IfcTemplatedEntityList< IfcAxis2Placement3D > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v->generalize()); }
+IfcTemplatedEntityList< IfcProfileDef >::ptr IfcSectionedSpine::CrossSections() const { IfcEntityList::ptr es = *entity->getArgument(1); return es->as<IfcProfileDef>(); }
+void IfcSectionedSpine::setCrossSections(IfcTemplatedEntityList< IfcProfileDef >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v->generalize()); }
+IfcTemplatedEntityList< IfcAxis2Placement3D >::ptr IfcSectionedSpine::CrossSectionPositions() const { IfcEntityList::ptr es = *entity->getArgument(2); return es->as<IfcAxis2Placement3D>(); }
+void IfcSectionedSpine::setCrossSectionPositions(IfcTemplatedEntityList< IfcAxis2Placement3D >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v->generalize()); }
 bool IfcSectionedSpine::is(Type::Enum v) const { return v == Type::IfcSectionedSpine || IfcGeometricRepresentationItem::is(v); }
 Type::Enum IfcSectionedSpine::type() const { return Type::IfcSectionedSpine; }
 Type::Enum IfcSectionedSpine::Class() { return Type::IfcSectionedSpine; }
-IfcSectionedSpine::IfcSectionedSpine(IfcAbstractEntityPtr e) : IfcGeometricRepresentationItem((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcSectionedSpine)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcSectionedSpine::IfcSectionedSpine(IfcCompositeCurve* v1_SpineCurve, SHARED_PTR< IfcTemplatedEntityList< IfcProfileDef > > v2_CrossSections, SHARED_PTR< IfcTemplatedEntityList< IfcAxis2Placement3D > > v3_CrossSectionPositions) : IfcGeometricRepresentationItem((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_SpineCurve)); e->setArgument(1,(v2_CrossSections)->generalize()); e->setArgument(2,(v3_CrossSectionPositions)->generalize()); entity = e; EntityBuffer::Add(this); }
+IfcSectionedSpine::IfcSectionedSpine(IfcAbstractEntity* e) : IfcGeometricRepresentationItem((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcSectionedSpine)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcSectionedSpine::IfcSectionedSpine(IfcCompositeCurve* v1_SpineCurve, IfcTemplatedEntityList< IfcProfileDef >::ptr v2_CrossSections, IfcTemplatedEntityList< IfcAxis2Placement3D >::ptr v3_CrossSectionPositions) : IfcGeometricRepresentationItem((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_SpineCurve)); e->setArgument(1,(v2_CrossSections)->generalize()); e->setArgument(2,(v3_CrossSectionPositions)->generalize()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcSensor
-bool IfcSensor::hasPredefinedType() { return !entity->getArgument(8)->isNull(); }
-IfcSensorTypeEnum::IfcSensorTypeEnum IfcSensor::PredefinedType() { return IfcSensorTypeEnum::FromString(*entity->getArgument(8)); }
+bool IfcSensor::hasPredefinedType() const { return !entity->getArgument(8)->isNull(); }
+IfcSensorTypeEnum::IfcSensorTypeEnum IfcSensor::PredefinedType() const { return IfcSensorTypeEnum::FromString(*entity->getArgument(8)); }
 void IfcSensor::setPredefinedType(IfcSensorTypeEnum::IfcSensorTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcSensorTypeEnum::ToString(v)); }
 bool IfcSensor::is(Type::Enum v) const { return v == Type::IfcSensor || IfcDistributionControlElement::is(v); }
 Type::Enum IfcSensor::type() const { return Type::IfcSensor; }
 Type::Enum IfcSensor::Class() { return Type::IfcSensor; }
-IfcSensor::IfcSensor(IfcAbstractEntityPtr e) : IfcDistributionControlElement((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcSensor)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcSensor::IfcSensor(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcSensorTypeEnum::IfcSensorTypeEnum > v9_PredefinedType) : IfcDistributionControlElement((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcSensorTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcSensor::IfcSensor(IfcAbstractEntity* e) : IfcDistributionControlElement((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcSensor)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcSensor::IfcSensor(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcSensorTypeEnum::IfcSensorTypeEnum > v9_PredefinedType) : IfcDistributionControlElement((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcSensorTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcSensorType
-IfcSensorTypeEnum::IfcSensorTypeEnum IfcSensorType::PredefinedType() { return IfcSensorTypeEnum::FromString(*entity->getArgument(9)); }
+IfcSensorTypeEnum::IfcSensorTypeEnum IfcSensorType::PredefinedType() const { return IfcSensorTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcSensorType::setPredefinedType(IfcSensorTypeEnum::IfcSensorTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcSensorTypeEnum::ToString(v)); }
 bool IfcSensorType::is(Type::Enum v) const { return v == Type::IfcSensorType || IfcDistributionControlElementType::is(v); }
 Type::Enum IfcSensorType::type() const { return Type::IfcSensorType; }
 Type::Enum IfcSensorType::Class() { return Type::IfcSensorType; }
-IfcSensorType::IfcSensorType(IfcAbstractEntityPtr e) : IfcDistributionControlElementType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcSensorType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcSensorType::IfcSensorType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcSensorTypeEnum::IfcSensorTypeEnum v10_PredefinedType) : IfcDistributionControlElementType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcSensorTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcSensorType::IfcSensorType(IfcAbstractEntity* e) : IfcDistributionControlElementType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcSensorType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcSensorType::IfcSensorType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcSensorTypeEnum::IfcSensorTypeEnum v10_PredefinedType) : IfcDistributionControlElementType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcSensorTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcShadingDevice
-bool IfcShadingDevice::hasPredefinedType() { return !entity->getArgument(8)->isNull(); }
-IfcShadingDeviceTypeEnum::IfcShadingDeviceTypeEnum IfcShadingDevice::PredefinedType() { return IfcShadingDeviceTypeEnum::FromString(*entity->getArgument(8)); }
+bool IfcShadingDevice::hasPredefinedType() const { return !entity->getArgument(8)->isNull(); }
+IfcShadingDeviceTypeEnum::IfcShadingDeviceTypeEnum IfcShadingDevice::PredefinedType() const { return IfcShadingDeviceTypeEnum::FromString(*entity->getArgument(8)); }
 void IfcShadingDevice::setPredefinedType(IfcShadingDeviceTypeEnum::IfcShadingDeviceTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcShadingDeviceTypeEnum::ToString(v)); }
 bool IfcShadingDevice::is(Type::Enum v) const { return v == Type::IfcShadingDevice || IfcBuildingElement::is(v); }
 Type::Enum IfcShadingDevice::type() const { return Type::IfcShadingDevice; }
 Type::Enum IfcShadingDevice::Class() { return Type::IfcShadingDevice; }
-IfcShadingDevice::IfcShadingDevice(IfcAbstractEntityPtr e) : IfcBuildingElement((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcShadingDevice)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcShadingDevice::IfcShadingDevice(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcShadingDeviceTypeEnum::IfcShadingDeviceTypeEnum > v9_PredefinedType) : IfcBuildingElement((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcShadingDeviceTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcShadingDevice::IfcShadingDevice(IfcAbstractEntity* e) : IfcBuildingElement((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcShadingDevice)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcShadingDevice::IfcShadingDevice(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcShadingDeviceTypeEnum::IfcShadingDeviceTypeEnum > v9_PredefinedType) : IfcBuildingElement((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcShadingDeviceTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcShadingDeviceType
-IfcShadingDeviceTypeEnum::IfcShadingDeviceTypeEnum IfcShadingDeviceType::PredefinedType() { return IfcShadingDeviceTypeEnum::FromString(*entity->getArgument(9)); }
+IfcShadingDeviceTypeEnum::IfcShadingDeviceTypeEnum IfcShadingDeviceType::PredefinedType() const { return IfcShadingDeviceTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcShadingDeviceType::setPredefinedType(IfcShadingDeviceTypeEnum::IfcShadingDeviceTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcShadingDeviceTypeEnum::ToString(v)); }
 bool IfcShadingDeviceType::is(Type::Enum v) const { return v == Type::IfcShadingDeviceType || IfcBuildingElementType::is(v); }
 Type::Enum IfcShadingDeviceType::type() const { return Type::IfcShadingDeviceType; }
 Type::Enum IfcShadingDeviceType::Class() { return Type::IfcShadingDeviceType; }
-IfcShadingDeviceType::IfcShadingDeviceType(IfcAbstractEntityPtr e) : IfcBuildingElementType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcShadingDeviceType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcShadingDeviceType::IfcShadingDeviceType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcShadingDeviceTypeEnum::IfcShadingDeviceTypeEnum v10_PredefinedType) : IfcBuildingElementType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcShadingDeviceTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcShadingDeviceType::IfcShadingDeviceType(IfcAbstractEntity* e) : IfcBuildingElementType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcShadingDeviceType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcShadingDeviceType::IfcShadingDeviceType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcShadingDeviceTypeEnum::IfcShadingDeviceTypeEnum v10_PredefinedType) : IfcBuildingElementType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcShadingDeviceTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcShapeAspect
-SHARED_PTR< IfcTemplatedEntityList< IfcShapeModel > > IfcShapeAspect::ShapeRepresentations() { RETURN_AS_LIST(IfcShapeModel,0) }
-void IfcShapeAspect::setShapeRepresentations(SHARED_PTR< IfcTemplatedEntityList< IfcShapeModel > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v->generalize()); }
-bool IfcShapeAspect::hasName() { return !entity->getArgument(1)->isNull(); }
-IfcLabel IfcShapeAspect::Name() { return *entity->getArgument(1); }
-void IfcShapeAspect::setName(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-bool IfcShapeAspect::hasDescription() { return !entity->getArgument(2)->isNull(); }
-IfcText IfcShapeAspect::Description() { return *entity->getArgument(2); }
-void IfcShapeAspect::setDescription(IfcText v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-bool IfcShapeAspect::ProductDefinitional() { return *entity->getArgument(3); }
+IfcTemplatedEntityList< IfcShapeModel >::ptr IfcShapeAspect::ShapeRepresentations() const { IfcEntityList::ptr es = *entity->getArgument(0); return es->as<IfcShapeModel>(); }
+void IfcShapeAspect::setShapeRepresentations(IfcTemplatedEntityList< IfcShapeModel >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v->generalize()); }
+bool IfcShapeAspect::hasName() const { return !entity->getArgument(1)->isNull(); }
+std::string IfcShapeAspect::Name() const { return *entity->getArgument(1); }
+void IfcShapeAspect::setName(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+bool IfcShapeAspect::hasDescription() const { return !entity->getArgument(2)->isNull(); }
+std::string IfcShapeAspect::Description() const { return *entity->getArgument(2); }
+void IfcShapeAspect::setDescription(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+bool IfcShapeAspect::ProductDefinitional() const { return *entity->getArgument(3); }
 void IfcShapeAspect::setProductDefinitional(bool v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-bool IfcShapeAspect::hasPartOfProductDefinitionShape() { return !entity->getArgument(4)->isNull(); }
-IfcProductRepresentationSelect IfcShapeAspect::PartOfProductDefinitionShape() { return *entity->getArgument(4); }
-void IfcShapeAspect::setPartOfProductDefinitionShape(IfcProductRepresentationSelect v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+bool IfcShapeAspect::hasPartOfProductDefinitionShape() const { return !entity->getArgument(4)->isNull(); }
+IfcProductRepresentationSelect* IfcShapeAspect::PartOfProductDefinitionShape() const { return (IfcProductRepresentationSelect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(4))); }
+void IfcShapeAspect::setPartOfProductDefinitionShape(IfcProductRepresentationSelect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
 bool IfcShapeAspect::is(Type::Enum v) const { return v == Type::IfcShapeAspect; }
 Type::Enum IfcShapeAspect::type() const { return Type::IfcShapeAspect; }
 Type::Enum IfcShapeAspect::Class() { return Type::IfcShapeAspect; }
-IfcShapeAspect::IfcShapeAspect(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcShapeAspect)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcShapeAspect::IfcShapeAspect(SHARED_PTR< IfcTemplatedEntityList< IfcShapeModel > > v1_ShapeRepresentations, boost::optional< IfcLabel > v2_Name, boost::optional< IfcText > v3_Description, bool v4_ProductDefinitional, boost::optional< IfcProductRepresentationSelect > v5_PartOfProductDefinitionShape) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_ShapeRepresentations)->generalize()); if (v2_Name) { e->setArgument(1,(*v2_Name)); } else { e->setArgument(1); } if (v3_Description) { e->setArgument(2,(*v3_Description)); } else { e->setArgument(2); } e->setArgument(3,(v4_ProductDefinitional)); if (v5_PartOfProductDefinitionShape) { e->setArgument(4,(*v5_PartOfProductDefinitionShape)); } else { e->setArgument(4); } entity = e; EntityBuffer::Add(this); }
+IfcShapeAspect::IfcShapeAspect(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcShapeAspect)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcShapeAspect::IfcShapeAspect(IfcTemplatedEntityList< IfcShapeModel >::ptr v1_ShapeRepresentations, boost::optional< std::string > v2_Name, boost::optional< std::string > v3_Description, bool v4_ProductDefinitional, IfcProductRepresentationSelect* v5_PartOfProductDefinitionShape) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_ShapeRepresentations)->generalize()); if (v2_Name) { e->setArgument(1,(*v2_Name)); } else { e->setArgument(1); } if (v3_Description) { e->setArgument(2,(*v3_Description)); } else { e->setArgument(2); } e->setArgument(3,(v4_ProductDefinitional)); e->setArgument(4,(v5_PartOfProductDefinitionShape)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcShapeModel
-IfcShapeAspect::list IfcShapeModel::OfShapeAspect() { RETURN_INVERSE(IfcShapeAspect) }
+IfcShapeAspect::list::ptr IfcShapeModel::OfShapeAspect() const { return entity->getInverse(Type::IfcShapeAspect, 0)->as<IfcShapeAspect>(); }
 bool IfcShapeModel::is(Type::Enum v) const { return v == Type::IfcShapeModel || IfcRepresentation::is(v); }
 Type::Enum IfcShapeModel::type() const { return Type::IfcShapeModel; }
 Type::Enum IfcShapeModel::Class() { return Type::IfcShapeModel; }
-IfcShapeModel::IfcShapeModel(IfcAbstractEntityPtr e) : IfcRepresentation((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcShapeModel)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcShapeModel::IfcShapeModel(IfcRepresentationContext* v1_ContextOfItems, boost::optional< IfcLabel > v2_RepresentationIdentifier, boost::optional< IfcLabel > v3_RepresentationType, SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationItem > > v4_Items) : IfcRepresentation((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_ContextOfItems)); if (v2_RepresentationIdentifier) { e->setArgument(1,(*v2_RepresentationIdentifier)); } else { e->setArgument(1); } if (v3_RepresentationType) { e->setArgument(2,(*v3_RepresentationType)); } else { e->setArgument(2); } e->setArgument(3,(v4_Items)->generalize()); entity = e; EntityBuffer::Add(this); }
+IfcShapeModel::IfcShapeModel(IfcAbstractEntity* e) : IfcRepresentation((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcShapeModel)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcShapeModel::IfcShapeModel(IfcRepresentationContext* v1_ContextOfItems, boost::optional< std::string > v2_RepresentationIdentifier, boost::optional< std::string > v3_RepresentationType, IfcTemplatedEntityList< IfcRepresentationItem >::ptr v4_Items) : IfcRepresentation((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_ContextOfItems)); if (v2_RepresentationIdentifier) { e->setArgument(1,(*v2_RepresentationIdentifier)); } else { e->setArgument(1); } if (v3_RepresentationType) { e->setArgument(2,(*v3_RepresentationType)); } else { e->setArgument(2); } e->setArgument(3,(v4_Items)->generalize()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcShapeRepresentation
 bool IfcShapeRepresentation::is(Type::Enum v) const { return v == Type::IfcShapeRepresentation || IfcShapeModel::is(v); }
 Type::Enum IfcShapeRepresentation::type() const { return Type::IfcShapeRepresentation; }
 Type::Enum IfcShapeRepresentation::Class() { return Type::IfcShapeRepresentation; }
-IfcShapeRepresentation::IfcShapeRepresentation(IfcAbstractEntityPtr e) : IfcShapeModel((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcShapeRepresentation)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcShapeRepresentation::IfcShapeRepresentation(IfcRepresentationContext* v1_ContextOfItems, boost::optional< IfcLabel > v2_RepresentationIdentifier, boost::optional< IfcLabel > v3_RepresentationType, SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationItem > > v4_Items) : IfcShapeModel((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_ContextOfItems)); if (v2_RepresentationIdentifier) { e->setArgument(1,(*v2_RepresentationIdentifier)); } else { e->setArgument(1); } if (v3_RepresentationType) { e->setArgument(2,(*v3_RepresentationType)); } else { e->setArgument(2); } e->setArgument(3,(v4_Items)->generalize()); entity = e; EntityBuffer::Add(this); }
+IfcShapeRepresentation::IfcShapeRepresentation(IfcAbstractEntity* e) : IfcShapeModel((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcShapeRepresentation)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcShapeRepresentation::IfcShapeRepresentation(IfcRepresentationContext* v1_ContextOfItems, boost::optional< std::string > v2_RepresentationIdentifier, boost::optional< std::string > v3_RepresentationType, IfcTemplatedEntityList< IfcRepresentationItem >::ptr v4_Items) : IfcShapeModel((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_ContextOfItems)); if (v2_RepresentationIdentifier) { e->setArgument(1,(*v2_RepresentationIdentifier)); } else { e->setArgument(1); } if (v3_RepresentationType) { e->setArgument(2,(*v3_RepresentationType)); } else { e->setArgument(2); } e->setArgument(3,(v4_Items)->generalize()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcShellBasedSurfaceModel
-SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > IfcShellBasedSurfaceModel::SbsmBoundary() { RETURN_AS_LIST(IfcUtil::IfcAbstractSelect,0) }
-void IfcShellBasedSurfaceModel::setSbsmBoundary(SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v->generalize()); }
+IfcEntityList::ptr IfcShellBasedSurfaceModel::SbsmBoundary() const { return *entity->getArgument(0); }
+void IfcShellBasedSurfaceModel::setSbsmBoundary(IfcEntityList::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
 bool IfcShellBasedSurfaceModel::is(Type::Enum v) const { return v == Type::IfcShellBasedSurfaceModel || IfcGeometricRepresentationItem::is(v); }
 Type::Enum IfcShellBasedSurfaceModel::type() const { return Type::IfcShellBasedSurfaceModel; }
 Type::Enum IfcShellBasedSurfaceModel::Class() { return Type::IfcShellBasedSurfaceModel; }
-IfcShellBasedSurfaceModel::IfcShellBasedSurfaceModel(IfcAbstractEntityPtr e) : IfcGeometricRepresentationItem((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcShellBasedSurfaceModel)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcShellBasedSurfaceModel::IfcShellBasedSurfaceModel(IfcEntities v1_SbsmBoundary) : IfcGeometricRepresentationItem((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_SbsmBoundary)); entity = e; EntityBuffer::Add(this); }
+IfcShellBasedSurfaceModel::IfcShellBasedSurfaceModel(IfcAbstractEntity* e) : IfcGeometricRepresentationItem((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcShellBasedSurfaceModel)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcShellBasedSurfaceModel::IfcShellBasedSurfaceModel(IfcEntityList::ptr v1_SbsmBoundary) : IfcGeometricRepresentationItem((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_SbsmBoundary)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcSimpleProperty
 bool IfcSimpleProperty::is(Type::Enum v) const { return v == Type::IfcSimpleProperty || IfcProperty::is(v); }
 Type::Enum IfcSimpleProperty::type() const { return Type::IfcSimpleProperty; }
 Type::Enum IfcSimpleProperty::Class() { return Type::IfcSimpleProperty; }
-IfcSimpleProperty::IfcSimpleProperty(IfcAbstractEntityPtr e) : IfcProperty((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcSimpleProperty)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcSimpleProperty::IfcSimpleProperty(IfcIdentifier v1_Name, boost::optional< IfcText > v2_Description) : IfcProperty((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } entity = e; EntityBuffer::Add(this); }
+IfcSimpleProperty::IfcSimpleProperty(IfcAbstractEntity* e) : IfcProperty((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcSimpleProperty)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcSimpleProperty::IfcSimpleProperty(std::string v1_Name, boost::optional< std::string > v2_Description) : IfcProperty((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcSimplePropertyTemplate
-bool IfcSimplePropertyTemplate::hasTemplateType() { return !entity->getArgument(4)->isNull(); }
-IfcSimplePropertyTemplateTypeEnum::IfcSimplePropertyTemplateTypeEnum IfcSimplePropertyTemplate::TemplateType() { return IfcSimplePropertyTemplateTypeEnum::FromString(*entity->getArgument(4)); }
+bool IfcSimplePropertyTemplate::hasTemplateType() const { return !entity->getArgument(4)->isNull(); }
+IfcSimplePropertyTemplateTypeEnum::IfcSimplePropertyTemplateTypeEnum IfcSimplePropertyTemplate::TemplateType() const { return IfcSimplePropertyTemplateTypeEnum::FromString(*entity->getArgument(4)); }
 void IfcSimplePropertyTemplate::setTemplateType(IfcSimplePropertyTemplateTypeEnum::IfcSimplePropertyTemplateTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v,IfcSimplePropertyTemplateTypeEnum::ToString(v)); }
-bool IfcSimplePropertyTemplate::hasPrimaryMeasureType() { return !entity->getArgument(5)->isNull(); }
-IfcLabel IfcSimplePropertyTemplate::PrimaryMeasureType() { return *entity->getArgument(5); }
-void IfcSimplePropertyTemplate::setPrimaryMeasureType(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-bool IfcSimplePropertyTemplate::hasSecondaryMeasureType() { return !entity->getArgument(6)->isNull(); }
-IfcLabel IfcSimplePropertyTemplate::SecondaryMeasureType() { return *entity->getArgument(6); }
-void IfcSimplePropertyTemplate::setSecondaryMeasureType(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
-bool IfcSimplePropertyTemplate::hasEnumerators() { return !entity->getArgument(7)->isNull(); }
-IfcPropertyEnumeration* IfcSimplePropertyTemplate::Enumerators() { return (IfcPropertyEnumeration*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(7))); }
+bool IfcSimplePropertyTemplate::hasPrimaryMeasureType() const { return !entity->getArgument(5)->isNull(); }
+std::string IfcSimplePropertyTemplate::PrimaryMeasureType() const { return *entity->getArgument(5); }
+void IfcSimplePropertyTemplate::setPrimaryMeasureType(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+bool IfcSimplePropertyTemplate::hasSecondaryMeasureType() const { return !entity->getArgument(6)->isNull(); }
+std::string IfcSimplePropertyTemplate::SecondaryMeasureType() const { return *entity->getArgument(6); }
+void IfcSimplePropertyTemplate::setSecondaryMeasureType(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
+bool IfcSimplePropertyTemplate::hasEnumerators() const { return !entity->getArgument(7)->isNull(); }
+IfcPropertyEnumeration* IfcSimplePropertyTemplate::Enumerators() const { return (IfcPropertyEnumeration*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(7))); }
 void IfcSimplePropertyTemplate::setEnumerators(IfcPropertyEnumeration* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
-bool IfcSimplePropertyTemplate::hasPrimaryUnit() { return !entity->getArgument(8)->isNull(); }
-IfcUnit IfcSimplePropertyTemplate::PrimaryUnit() { return *entity->getArgument(8); }
-void IfcSimplePropertyTemplate::setPrimaryUnit(IfcUnit v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
-bool IfcSimplePropertyTemplate::hasSecondaryUnit() { return !entity->getArgument(9)->isNull(); }
-IfcUnit IfcSimplePropertyTemplate::SecondaryUnit() { return *entity->getArgument(9); }
-void IfcSimplePropertyTemplate::setSecondaryUnit(IfcUnit v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
-bool IfcSimplePropertyTemplate::hasExpression() { return !entity->getArgument(10)->isNull(); }
-IfcLabel IfcSimplePropertyTemplate::Expression() { return *entity->getArgument(10); }
-void IfcSimplePropertyTemplate::setExpression(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
-bool IfcSimplePropertyTemplate::hasAccessState() { return !entity->getArgument(11)->isNull(); }
-IfcStateEnum::IfcStateEnum IfcSimplePropertyTemplate::AccessState() { return IfcStateEnum::FromString(*entity->getArgument(11)); }
+bool IfcSimplePropertyTemplate::hasPrimaryUnit() const { return !entity->getArgument(8)->isNull(); }
+IfcUnit* IfcSimplePropertyTemplate::PrimaryUnit() const { return (IfcUnit*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(8))); }
+void IfcSimplePropertyTemplate::setPrimaryUnit(IfcUnit* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
+bool IfcSimplePropertyTemplate::hasSecondaryUnit() const { return !entity->getArgument(9)->isNull(); }
+IfcUnit* IfcSimplePropertyTemplate::SecondaryUnit() const { return (IfcUnit*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(9))); }
+void IfcSimplePropertyTemplate::setSecondaryUnit(IfcUnit* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
+bool IfcSimplePropertyTemplate::hasExpression() const { return !entity->getArgument(10)->isNull(); }
+std::string IfcSimplePropertyTemplate::Expression() const { return *entity->getArgument(10); }
+void IfcSimplePropertyTemplate::setExpression(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
+bool IfcSimplePropertyTemplate::hasAccessState() const { return !entity->getArgument(11)->isNull(); }
+IfcStateEnum::IfcStateEnum IfcSimplePropertyTemplate::AccessState() const { return IfcStateEnum::FromString(*entity->getArgument(11)); }
 void IfcSimplePropertyTemplate::setAccessState(IfcStateEnum::IfcStateEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(11,v,IfcStateEnum::ToString(v)); }
 bool IfcSimplePropertyTemplate::is(Type::Enum v) const { return v == Type::IfcSimplePropertyTemplate || IfcPropertyTemplate::is(v); }
 Type::Enum IfcSimplePropertyTemplate::type() const { return Type::IfcSimplePropertyTemplate; }
 Type::Enum IfcSimplePropertyTemplate::Class() { return Type::IfcSimplePropertyTemplate; }
-IfcSimplePropertyTemplate::IfcSimplePropertyTemplate(IfcAbstractEntityPtr e) : IfcPropertyTemplate((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcSimplePropertyTemplate)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcSimplePropertyTemplate::IfcSimplePropertyTemplate(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcSimplePropertyTemplateTypeEnum::IfcSimplePropertyTemplateTypeEnum > v5_TemplateType, boost::optional< IfcLabel > v6_PrimaryMeasureType, boost::optional< IfcLabel > v7_SecondaryMeasureType, IfcPropertyEnumeration* v8_Enumerators, boost::optional< IfcUnit > v9_PrimaryUnit, boost::optional< IfcUnit > v10_SecondaryUnit, boost::optional< IfcLabel > v11_Expression, boost::optional< IfcStateEnum::IfcStateEnum > v12_AccessState) : IfcPropertyTemplate((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_TemplateType) { e->setArgument(4,*v5_TemplateType,IfcSimplePropertyTemplateTypeEnum::ToString(*v5_TemplateType)); } else { e->setArgument(4); } if (v6_PrimaryMeasureType) { e->setArgument(5,(*v6_PrimaryMeasureType)); } else { e->setArgument(5); } if (v7_SecondaryMeasureType) { e->setArgument(6,(*v7_SecondaryMeasureType)); } else { e->setArgument(6); } e->setArgument(7,(v8_Enumerators)); if (v9_PrimaryUnit) { e->setArgument(8,(*v9_PrimaryUnit)); } else { e->setArgument(8); } if (v10_SecondaryUnit) { e->setArgument(9,(*v10_SecondaryUnit)); } else { e->setArgument(9); } if (v11_Expression) { e->setArgument(10,(*v11_Expression)); } else { e->setArgument(10); } if (v12_AccessState) { e->setArgument(11,*v12_AccessState,IfcStateEnum::ToString(*v12_AccessState)); } else { e->setArgument(11); } entity = e; EntityBuffer::Add(this); }
+IfcSimplePropertyTemplate::IfcSimplePropertyTemplate(IfcAbstractEntity* e) : IfcPropertyTemplate((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcSimplePropertyTemplate)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcSimplePropertyTemplate::IfcSimplePropertyTemplate(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< IfcSimplePropertyTemplateTypeEnum::IfcSimplePropertyTemplateTypeEnum > v5_TemplateType, boost::optional< std::string > v6_PrimaryMeasureType, boost::optional< std::string > v7_SecondaryMeasureType, IfcPropertyEnumeration* v8_Enumerators, IfcUnit* v9_PrimaryUnit, IfcUnit* v10_SecondaryUnit, boost::optional< std::string > v11_Expression, boost::optional< IfcStateEnum::IfcStateEnum > v12_AccessState) : IfcPropertyTemplate((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_TemplateType) { e->setArgument(4,*v5_TemplateType,IfcSimplePropertyTemplateTypeEnum::ToString(*v5_TemplateType)); } else { e->setArgument(4); } if (v6_PrimaryMeasureType) { e->setArgument(5,(*v6_PrimaryMeasureType)); } else { e->setArgument(5); } if (v7_SecondaryMeasureType) { e->setArgument(6,(*v7_SecondaryMeasureType)); } else { e->setArgument(6); } e->setArgument(7,(v8_Enumerators)); e->setArgument(8,(v9_PrimaryUnit)); e->setArgument(9,(v10_SecondaryUnit)); if (v11_Expression) { e->setArgument(10,(*v11_Expression)); } else { e->setArgument(10); } if (v12_AccessState) { e->setArgument(11,*v12_AccessState,IfcStateEnum::ToString(*v12_AccessState)); } else { e->setArgument(11); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcSite
-bool IfcSite::hasRefLatitude() { return !entity->getArgument(9)->isNull(); }
-IfcCompoundPlaneAngleMeasure IfcSite::RefLatitude() { return *entity->getArgument(9); }
-void IfcSite::setRefLatitude(IfcCompoundPlaneAngleMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
-bool IfcSite::hasRefLongitude() { return !entity->getArgument(10)->isNull(); }
-IfcCompoundPlaneAngleMeasure IfcSite::RefLongitude() { return *entity->getArgument(10); }
-void IfcSite::setRefLongitude(IfcCompoundPlaneAngleMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
-bool IfcSite::hasRefElevation() { return !entity->getArgument(11)->isNull(); }
-IfcLengthMeasure IfcSite::RefElevation() { return *entity->getArgument(11); }
-void IfcSite::setRefElevation(IfcLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(11,v); }
-bool IfcSite::hasLandTitleNumber() { return !entity->getArgument(12)->isNull(); }
-IfcLabel IfcSite::LandTitleNumber() { return *entity->getArgument(12); }
-void IfcSite::setLandTitleNumber(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(12,v); }
-bool IfcSite::hasSiteAddress() { return !entity->getArgument(13)->isNull(); }
-IfcPostalAddress* IfcSite::SiteAddress() { return (IfcPostalAddress*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(13))); }
+bool IfcSite::hasRefLatitude() const { return !entity->getArgument(9)->isNull(); }
+std::vector< int > /*[3:4]*/ IfcSite::RefLatitude() const { return *entity->getArgument(9); }
+void IfcSite::setRefLatitude(std::vector< int > /*[3:4]*/ v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
+bool IfcSite::hasRefLongitude() const { return !entity->getArgument(10)->isNull(); }
+std::vector< int > /*[3:4]*/ IfcSite::RefLongitude() const { return *entity->getArgument(10); }
+void IfcSite::setRefLongitude(std::vector< int > /*[3:4]*/ v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
+bool IfcSite::hasRefElevation() const { return !entity->getArgument(11)->isNull(); }
+double IfcSite::RefElevation() const { return *entity->getArgument(11); }
+void IfcSite::setRefElevation(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(11,v); }
+bool IfcSite::hasLandTitleNumber() const { return !entity->getArgument(12)->isNull(); }
+std::string IfcSite::LandTitleNumber() const { return *entity->getArgument(12); }
+void IfcSite::setLandTitleNumber(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(12,v); }
+bool IfcSite::hasSiteAddress() const { return !entity->getArgument(13)->isNull(); }
+IfcPostalAddress* IfcSite::SiteAddress() const { return (IfcPostalAddress*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(13))); }
 void IfcSite::setSiteAddress(IfcPostalAddress* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(13,v); }
 bool IfcSite::is(Type::Enum v) const { return v == Type::IfcSite || IfcSpatialStructureElement::is(v); }
 Type::Enum IfcSite::type() const { return Type::IfcSite; }
 Type::Enum IfcSite::Class() { return Type::IfcSite; }
-IfcSite::IfcSite(IfcAbstractEntityPtr e) : IfcSpatialStructureElement((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcSite)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcSite::IfcSite(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcLabel > v8_LongName, boost::optional< IfcElementCompositionEnum::IfcElementCompositionEnum > v9_CompositionType, boost::optional< IfcCompoundPlaneAngleMeasure > v10_RefLatitude, boost::optional< IfcCompoundPlaneAngleMeasure > v11_RefLongitude, boost::optional< IfcLengthMeasure > v12_RefElevation, boost::optional< IfcLabel > v13_LandTitleNumber, IfcPostalAddress* v14_SiteAddress) : IfcSpatialStructureElement((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_LongName) { e->setArgument(7,(*v8_LongName)); } else { e->setArgument(7); } if (v9_CompositionType) { e->setArgument(8,*v9_CompositionType,IfcElementCompositionEnum::ToString(*v9_CompositionType)); } else { e->setArgument(8); } if (v10_RefLatitude) { e->setArgument(9,(*v10_RefLatitude)); } else { e->setArgument(9); } if (v11_RefLongitude) { e->setArgument(10,(*v11_RefLongitude)); } else { e->setArgument(10); } if (v12_RefElevation) { e->setArgument(11,(*v12_RefElevation)); } else { e->setArgument(11); } if (v13_LandTitleNumber) { e->setArgument(12,(*v13_LandTitleNumber)); } else { e->setArgument(12); } e->setArgument(13,(v14_SiteAddress)); entity = e; EntityBuffer::Add(this); }
+IfcSite::IfcSite(IfcAbstractEntity* e) : IfcSpatialStructureElement((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcSite)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcSite::IfcSite(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_LongName, boost::optional< IfcElementCompositionEnum::IfcElementCompositionEnum > v9_CompositionType, boost::optional< std::vector< int > /*[3:4]*/ > v10_RefLatitude, boost::optional< std::vector< int > /*[3:4]*/ > v11_RefLongitude, boost::optional< double > v12_RefElevation, boost::optional< std::string > v13_LandTitleNumber, IfcPostalAddress* v14_SiteAddress) : IfcSpatialStructureElement((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_LongName) { e->setArgument(7,(*v8_LongName)); } else { e->setArgument(7); } if (v9_CompositionType) { e->setArgument(8,*v9_CompositionType,IfcElementCompositionEnum::ToString(*v9_CompositionType)); } else { e->setArgument(8); } if (v10_RefLatitude) { e->setArgument(9,(*v10_RefLatitude)); } else { e->setArgument(9); } if (v11_RefLongitude) { e->setArgument(10,(*v11_RefLongitude)); } else { e->setArgument(10); } if (v12_RefElevation) { e->setArgument(11,(*v12_RefElevation)); } else { e->setArgument(11); } if (v13_LandTitleNumber) { e->setArgument(12,(*v13_LandTitleNumber)); } else { e->setArgument(12); } e->setArgument(13,(v14_SiteAddress)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcSlab
-bool IfcSlab::hasPredefinedType() { return !entity->getArgument(8)->isNull(); }
-IfcSlabTypeEnum::IfcSlabTypeEnum IfcSlab::PredefinedType() { return IfcSlabTypeEnum::FromString(*entity->getArgument(8)); }
+bool IfcSlab::hasPredefinedType() const { return !entity->getArgument(8)->isNull(); }
+IfcSlabTypeEnum::IfcSlabTypeEnum IfcSlab::PredefinedType() const { return IfcSlabTypeEnum::FromString(*entity->getArgument(8)); }
 void IfcSlab::setPredefinedType(IfcSlabTypeEnum::IfcSlabTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcSlabTypeEnum::ToString(v)); }
 bool IfcSlab::is(Type::Enum v) const { return v == Type::IfcSlab || IfcBuildingElement::is(v); }
 Type::Enum IfcSlab::type() const { return Type::IfcSlab; }
 Type::Enum IfcSlab::Class() { return Type::IfcSlab; }
-IfcSlab::IfcSlab(IfcAbstractEntityPtr e) : IfcBuildingElement((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcSlab)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcSlab::IfcSlab(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcSlabTypeEnum::IfcSlabTypeEnum > v9_PredefinedType) : IfcBuildingElement((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcSlabTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcSlab::IfcSlab(IfcAbstractEntity* e) : IfcBuildingElement((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcSlab)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcSlab::IfcSlab(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcSlabTypeEnum::IfcSlabTypeEnum > v9_PredefinedType) : IfcBuildingElement((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcSlabTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcSlabElementedCase
 bool IfcSlabElementedCase::is(Type::Enum v) const { return v == Type::IfcSlabElementedCase || IfcSlab::is(v); }
 Type::Enum IfcSlabElementedCase::type() const { return Type::IfcSlabElementedCase; }
 Type::Enum IfcSlabElementedCase::Class() { return Type::IfcSlabElementedCase; }
-IfcSlabElementedCase::IfcSlabElementedCase(IfcAbstractEntityPtr e) : IfcSlab((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcSlabElementedCase)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcSlabElementedCase::IfcSlabElementedCase(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcSlabTypeEnum::IfcSlabTypeEnum > v9_PredefinedType) : IfcSlab((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcSlabTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcSlabElementedCase::IfcSlabElementedCase(IfcAbstractEntity* e) : IfcSlab((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcSlabElementedCase)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcSlabElementedCase::IfcSlabElementedCase(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcSlabTypeEnum::IfcSlabTypeEnum > v9_PredefinedType) : IfcSlab((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcSlabTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcSlabStandardCase
 bool IfcSlabStandardCase::is(Type::Enum v) const { return v == Type::IfcSlabStandardCase || IfcSlab::is(v); }
 Type::Enum IfcSlabStandardCase::type() const { return Type::IfcSlabStandardCase; }
 Type::Enum IfcSlabStandardCase::Class() { return Type::IfcSlabStandardCase; }
-IfcSlabStandardCase::IfcSlabStandardCase(IfcAbstractEntityPtr e) : IfcSlab((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcSlabStandardCase)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcSlabStandardCase::IfcSlabStandardCase(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcSlabTypeEnum::IfcSlabTypeEnum > v9_PredefinedType) : IfcSlab((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcSlabTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcSlabStandardCase::IfcSlabStandardCase(IfcAbstractEntity* e) : IfcSlab((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcSlabStandardCase)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcSlabStandardCase::IfcSlabStandardCase(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcSlabTypeEnum::IfcSlabTypeEnum > v9_PredefinedType) : IfcSlab((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcSlabTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcSlabType
-IfcSlabTypeEnum::IfcSlabTypeEnum IfcSlabType::PredefinedType() { return IfcSlabTypeEnum::FromString(*entity->getArgument(9)); }
+IfcSlabTypeEnum::IfcSlabTypeEnum IfcSlabType::PredefinedType() const { return IfcSlabTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcSlabType::setPredefinedType(IfcSlabTypeEnum::IfcSlabTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcSlabTypeEnum::ToString(v)); }
 bool IfcSlabType::is(Type::Enum v) const { return v == Type::IfcSlabType || IfcBuildingElementType::is(v); }
 Type::Enum IfcSlabType::type() const { return Type::IfcSlabType; }
 Type::Enum IfcSlabType::Class() { return Type::IfcSlabType; }
-IfcSlabType::IfcSlabType(IfcAbstractEntityPtr e) : IfcBuildingElementType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcSlabType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcSlabType::IfcSlabType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcSlabTypeEnum::IfcSlabTypeEnum v10_PredefinedType) : IfcBuildingElementType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcSlabTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcSlabType::IfcSlabType(IfcAbstractEntity* e) : IfcBuildingElementType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcSlabType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcSlabType::IfcSlabType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcSlabTypeEnum::IfcSlabTypeEnum v10_PredefinedType) : IfcBuildingElementType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcSlabTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcSlippageConnectionCondition
-bool IfcSlippageConnectionCondition::hasSlippageX() { return !entity->getArgument(1)->isNull(); }
-IfcLengthMeasure IfcSlippageConnectionCondition::SlippageX() { return *entity->getArgument(1); }
-void IfcSlippageConnectionCondition::setSlippageX(IfcLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-bool IfcSlippageConnectionCondition::hasSlippageY() { return !entity->getArgument(2)->isNull(); }
-IfcLengthMeasure IfcSlippageConnectionCondition::SlippageY() { return *entity->getArgument(2); }
-void IfcSlippageConnectionCondition::setSlippageY(IfcLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-bool IfcSlippageConnectionCondition::hasSlippageZ() { return !entity->getArgument(3)->isNull(); }
-IfcLengthMeasure IfcSlippageConnectionCondition::SlippageZ() { return *entity->getArgument(3); }
-void IfcSlippageConnectionCondition::setSlippageZ(IfcLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+bool IfcSlippageConnectionCondition::hasSlippageX() const { return !entity->getArgument(1)->isNull(); }
+double IfcSlippageConnectionCondition::SlippageX() const { return *entity->getArgument(1); }
+void IfcSlippageConnectionCondition::setSlippageX(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+bool IfcSlippageConnectionCondition::hasSlippageY() const { return !entity->getArgument(2)->isNull(); }
+double IfcSlippageConnectionCondition::SlippageY() const { return *entity->getArgument(2); }
+void IfcSlippageConnectionCondition::setSlippageY(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+bool IfcSlippageConnectionCondition::hasSlippageZ() const { return !entity->getArgument(3)->isNull(); }
+double IfcSlippageConnectionCondition::SlippageZ() const { return *entity->getArgument(3); }
+void IfcSlippageConnectionCondition::setSlippageZ(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
 bool IfcSlippageConnectionCondition::is(Type::Enum v) const { return v == Type::IfcSlippageConnectionCondition || IfcStructuralConnectionCondition::is(v); }
 Type::Enum IfcSlippageConnectionCondition::type() const { return Type::IfcSlippageConnectionCondition; }
 Type::Enum IfcSlippageConnectionCondition::Class() { return Type::IfcSlippageConnectionCondition; }
-IfcSlippageConnectionCondition::IfcSlippageConnectionCondition(IfcAbstractEntityPtr e) : IfcStructuralConnectionCondition((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcSlippageConnectionCondition)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcSlippageConnectionCondition::IfcSlippageConnectionCondition(boost::optional< IfcLabel > v1_Name, boost::optional< IfcLengthMeasure > v2_SlippageX, boost::optional< IfcLengthMeasure > v3_SlippageY, boost::optional< IfcLengthMeasure > v4_SlippageZ) : IfcStructuralConnectionCondition((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_SlippageX) { e->setArgument(1,(*v2_SlippageX)); } else { e->setArgument(1); } if (v3_SlippageY) { e->setArgument(2,(*v3_SlippageY)); } else { e->setArgument(2); } if (v4_SlippageZ) { e->setArgument(3,(*v4_SlippageZ)); } else { e->setArgument(3); } entity = e; EntityBuffer::Add(this); }
+IfcSlippageConnectionCondition::IfcSlippageConnectionCondition(IfcAbstractEntity* e) : IfcStructuralConnectionCondition((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcSlippageConnectionCondition)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcSlippageConnectionCondition::IfcSlippageConnectionCondition(boost::optional< std::string > v1_Name, boost::optional< double > v2_SlippageX, boost::optional< double > v3_SlippageY, boost::optional< double > v4_SlippageZ) : IfcStructuralConnectionCondition((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_SlippageX) { e->setArgument(1,(*v2_SlippageX)); } else { e->setArgument(1); } if (v3_SlippageY) { e->setArgument(2,(*v3_SlippageY)); } else { e->setArgument(2); } if (v4_SlippageZ) { e->setArgument(3,(*v4_SlippageZ)); } else { e->setArgument(3); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcSolarDevice
-bool IfcSolarDevice::hasPredefinedType() { return !entity->getArgument(8)->isNull(); }
-IfcSolarDeviceTypeEnum::IfcSolarDeviceTypeEnum IfcSolarDevice::PredefinedType() { return IfcSolarDeviceTypeEnum::FromString(*entity->getArgument(8)); }
+bool IfcSolarDevice::hasPredefinedType() const { return !entity->getArgument(8)->isNull(); }
+IfcSolarDeviceTypeEnum::IfcSolarDeviceTypeEnum IfcSolarDevice::PredefinedType() const { return IfcSolarDeviceTypeEnum::FromString(*entity->getArgument(8)); }
 void IfcSolarDevice::setPredefinedType(IfcSolarDeviceTypeEnum::IfcSolarDeviceTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcSolarDeviceTypeEnum::ToString(v)); }
 bool IfcSolarDevice::is(Type::Enum v) const { return v == Type::IfcSolarDevice || IfcEnergyConversionDevice::is(v); }
 Type::Enum IfcSolarDevice::type() const { return Type::IfcSolarDevice; }
 Type::Enum IfcSolarDevice::Class() { return Type::IfcSolarDevice; }
-IfcSolarDevice::IfcSolarDevice(IfcAbstractEntityPtr e) : IfcEnergyConversionDevice((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcSolarDevice)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcSolarDevice::IfcSolarDevice(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcSolarDeviceTypeEnum::IfcSolarDeviceTypeEnum > v9_PredefinedType) : IfcEnergyConversionDevice((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcSolarDeviceTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcSolarDevice::IfcSolarDevice(IfcAbstractEntity* e) : IfcEnergyConversionDevice((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcSolarDevice)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcSolarDevice::IfcSolarDevice(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcSolarDeviceTypeEnum::IfcSolarDeviceTypeEnum > v9_PredefinedType) : IfcEnergyConversionDevice((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcSolarDeviceTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcSolarDeviceType
-IfcSolarDeviceTypeEnum::IfcSolarDeviceTypeEnum IfcSolarDeviceType::PredefinedType() { return IfcSolarDeviceTypeEnum::FromString(*entity->getArgument(9)); }
+IfcSolarDeviceTypeEnum::IfcSolarDeviceTypeEnum IfcSolarDeviceType::PredefinedType() const { return IfcSolarDeviceTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcSolarDeviceType::setPredefinedType(IfcSolarDeviceTypeEnum::IfcSolarDeviceTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcSolarDeviceTypeEnum::ToString(v)); }
 bool IfcSolarDeviceType::is(Type::Enum v) const { return v == Type::IfcSolarDeviceType || IfcEnergyConversionDeviceType::is(v); }
 Type::Enum IfcSolarDeviceType::type() const { return Type::IfcSolarDeviceType; }
 Type::Enum IfcSolarDeviceType::Class() { return Type::IfcSolarDeviceType; }
-IfcSolarDeviceType::IfcSolarDeviceType(IfcAbstractEntityPtr e) : IfcEnergyConversionDeviceType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcSolarDeviceType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcSolarDeviceType::IfcSolarDeviceType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcSolarDeviceTypeEnum::IfcSolarDeviceTypeEnum v10_PredefinedType) : IfcEnergyConversionDeviceType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcSolarDeviceTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcSolarDeviceType::IfcSolarDeviceType(IfcAbstractEntity* e) : IfcEnergyConversionDeviceType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcSolarDeviceType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcSolarDeviceType::IfcSolarDeviceType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcSolarDeviceTypeEnum::IfcSolarDeviceTypeEnum v10_PredefinedType) : IfcEnergyConversionDeviceType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcSolarDeviceTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcSolidModel
 bool IfcSolidModel::is(Type::Enum v) const { return v == Type::IfcSolidModel || IfcGeometricRepresentationItem::is(v); }
 Type::Enum IfcSolidModel::type() const { return Type::IfcSolidModel; }
 Type::Enum IfcSolidModel::Class() { return Type::IfcSolidModel; }
-IfcSolidModel::IfcSolidModel(IfcAbstractEntityPtr e) : IfcGeometricRepresentationItem((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcSolidModel)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcSolidModel::IfcSolidModel() : IfcGeometricRepresentationItem((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); entity = e; EntityBuffer::Add(this); }
+IfcSolidModel::IfcSolidModel(IfcAbstractEntity* e) : IfcGeometricRepresentationItem((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcSolidModel)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcSolidModel::IfcSolidModel() : IfcGeometricRepresentationItem((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcSpace
-bool IfcSpace::hasPredefinedType() { return !entity->getArgument(9)->isNull(); }
-IfcSpaceTypeEnum::IfcSpaceTypeEnum IfcSpace::PredefinedType() { return IfcSpaceTypeEnum::FromString(*entity->getArgument(9)); }
+bool IfcSpace::hasPredefinedType() const { return !entity->getArgument(9)->isNull(); }
+IfcSpaceTypeEnum::IfcSpaceTypeEnum IfcSpace::PredefinedType() const { return IfcSpaceTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcSpace::setPredefinedType(IfcSpaceTypeEnum::IfcSpaceTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcSpaceTypeEnum::ToString(v)); }
-bool IfcSpace::hasElevationWithFlooring() { return !entity->getArgument(10)->isNull(); }
-IfcLengthMeasure IfcSpace::ElevationWithFlooring() { return *entity->getArgument(10); }
-void IfcSpace::setElevationWithFlooring(IfcLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
-IfcRelCoversSpaces::list IfcSpace::HasCoverings() { RETURN_INVERSE(IfcRelCoversSpaces) }
-IfcRelSpaceBoundary::list IfcSpace::BoundedBy() { RETURN_INVERSE(IfcRelSpaceBoundary) }
+bool IfcSpace::hasElevationWithFlooring() const { return !entity->getArgument(10)->isNull(); }
+double IfcSpace::ElevationWithFlooring() const { return *entity->getArgument(10); }
+void IfcSpace::setElevationWithFlooring(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
+IfcRelCoversSpaces::list::ptr IfcSpace::HasCoverings() const { return entity->getInverse(Type::IfcRelCoversSpaces, 4)->as<IfcRelCoversSpaces>(); }
+IfcRelSpaceBoundary::list::ptr IfcSpace::BoundedBy() const { return entity->getInverse(Type::IfcRelSpaceBoundary, 4)->as<IfcRelSpaceBoundary>(); }
 bool IfcSpace::is(Type::Enum v) const { return v == Type::IfcSpace || IfcSpatialStructureElement::is(v); }
 Type::Enum IfcSpace::type() const { return Type::IfcSpace; }
 Type::Enum IfcSpace::Class() { return Type::IfcSpace; }
-IfcSpace::IfcSpace(IfcAbstractEntityPtr e) : IfcSpatialStructureElement((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcSpace)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcSpace::IfcSpace(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcLabel > v8_LongName, boost::optional< IfcElementCompositionEnum::IfcElementCompositionEnum > v9_CompositionType, boost::optional< IfcSpaceTypeEnum::IfcSpaceTypeEnum > v10_PredefinedType, boost::optional< IfcLengthMeasure > v11_ElevationWithFlooring) : IfcSpatialStructureElement((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_LongName) { e->setArgument(7,(*v8_LongName)); } else { e->setArgument(7); } if (v9_CompositionType) { e->setArgument(8,*v9_CompositionType,IfcElementCompositionEnum::ToString(*v9_CompositionType)); } else { e->setArgument(8); } if (v10_PredefinedType) { e->setArgument(9,*v10_PredefinedType,IfcSpaceTypeEnum::ToString(*v10_PredefinedType)); } else { e->setArgument(9); } if (v11_ElevationWithFlooring) { e->setArgument(10,(*v11_ElevationWithFlooring)); } else { e->setArgument(10); } entity = e; EntityBuffer::Add(this); }
+IfcSpace::IfcSpace(IfcAbstractEntity* e) : IfcSpatialStructureElement((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcSpace)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcSpace::IfcSpace(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_LongName, boost::optional< IfcElementCompositionEnum::IfcElementCompositionEnum > v9_CompositionType, boost::optional< IfcSpaceTypeEnum::IfcSpaceTypeEnum > v10_PredefinedType, boost::optional< double > v11_ElevationWithFlooring) : IfcSpatialStructureElement((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_LongName) { e->setArgument(7,(*v8_LongName)); } else { e->setArgument(7); } if (v9_CompositionType) { e->setArgument(8,*v9_CompositionType,IfcElementCompositionEnum::ToString(*v9_CompositionType)); } else { e->setArgument(8); } if (v10_PredefinedType) { e->setArgument(9,*v10_PredefinedType,IfcSpaceTypeEnum::ToString(*v10_PredefinedType)); } else { e->setArgument(9); } if (v11_ElevationWithFlooring) { e->setArgument(10,(*v11_ElevationWithFlooring)); } else { e->setArgument(10); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcSpaceHeater
-bool IfcSpaceHeater::hasPredefinedType() { return !entity->getArgument(8)->isNull(); }
-IfcSpaceHeaterTypeEnum::IfcSpaceHeaterTypeEnum IfcSpaceHeater::PredefinedType() { return IfcSpaceHeaterTypeEnum::FromString(*entity->getArgument(8)); }
+bool IfcSpaceHeater::hasPredefinedType() const { return !entity->getArgument(8)->isNull(); }
+IfcSpaceHeaterTypeEnum::IfcSpaceHeaterTypeEnum IfcSpaceHeater::PredefinedType() const { return IfcSpaceHeaterTypeEnum::FromString(*entity->getArgument(8)); }
 void IfcSpaceHeater::setPredefinedType(IfcSpaceHeaterTypeEnum::IfcSpaceHeaterTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcSpaceHeaterTypeEnum::ToString(v)); }
 bool IfcSpaceHeater::is(Type::Enum v) const { return v == Type::IfcSpaceHeater || IfcFlowTerminal::is(v); }
 Type::Enum IfcSpaceHeater::type() const { return Type::IfcSpaceHeater; }
 Type::Enum IfcSpaceHeater::Class() { return Type::IfcSpaceHeater; }
-IfcSpaceHeater::IfcSpaceHeater(IfcAbstractEntityPtr e) : IfcFlowTerminal((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcSpaceHeater)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcSpaceHeater::IfcSpaceHeater(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcSpaceHeaterTypeEnum::IfcSpaceHeaterTypeEnum > v9_PredefinedType) : IfcFlowTerminal((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcSpaceHeaterTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcSpaceHeater::IfcSpaceHeater(IfcAbstractEntity* e) : IfcFlowTerminal((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcSpaceHeater)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcSpaceHeater::IfcSpaceHeater(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcSpaceHeaterTypeEnum::IfcSpaceHeaterTypeEnum > v9_PredefinedType) : IfcFlowTerminal((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcSpaceHeaterTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcSpaceHeaterType
-IfcSpaceHeaterTypeEnum::IfcSpaceHeaterTypeEnum IfcSpaceHeaterType::PredefinedType() { return IfcSpaceHeaterTypeEnum::FromString(*entity->getArgument(9)); }
+IfcSpaceHeaterTypeEnum::IfcSpaceHeaterTypeEnum IfcSpaceHeaterType::PredefinedType() const { return IfcSpaceHeaterTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcSpaceHeaterType::setPredefinedType(IfcSpaceHeaterTypeEnum::IfcSpaceHeaterTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcSpaceHeaterTypeEnum::ToString(v)); }
 bool IfcSpaceHeaterType::is(Type::Enum v) const { return v == Type::IfcSpaceHeaterType || IfcFlowTerminalType::is(v); }
 Type::Enum IfcSpaceHeaterType::type() const { return Type::IfcSpaceHeaterType; }
 Type::Enum IfcSpaceHeaterType::Class() { return Type::IfcSpaceHeaterType; }
-IfcSpaceHeaterType::IfcSpaceHeaterType(IfcAbstractEntityPtr e) : IfcFlowTerminalType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcSpaceHeaterType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcSpaceHeaterType::IfcSpaceHeaterType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcSpaceHeaterTypeEnum::IfcSpaceHeaterTypeEnum v10_PredefinedType) : IfcFlowTerminalType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcSpaceHeaterTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcSpaceHeaterType::IfcSpaceHeaterType(IfcAbstractEntity* e) : IfcFlowTerminalType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcSpaceHeaterType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcSpaceHeaterType::IfcSpaceHeaterType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcSpaceHeaterTypeEnum::IfcSpaceHeaterTypeEnum v10_PredefinedType) : IfcFlowTerminalType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcSpaceHeaterTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcSpaceType
-IfcSpaceTypeEnum::IfcSpaceTypeEnum IfcSpaceType::PredefinedType() { return IfcSpaceTypeEnum::FromString(*entity->getArgument(9)); }
+IfcSpaceTypeEnum::IfcSpaceTypeEnum IfcSpaceType::PredefinedType() const { return IfcSpaceTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcSpaceType::setPredefinedType(IfcSpaceTypeEnum::IfcSpaceTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcSpaceTypeEnum::ToString(v)); }
-bool IfcSpaceType::hasLongName() { return !entity->getArgument(10)->isNull(); }
-IfcLabel IfcSpaceType::LongName() { return *entity->getArgument(10); }
-void IfcSpaceType::setLongName(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
+bool IfcSpaceType::hasLongName() const { return !entity->getArgument(10)->isNull(); }
+std::string IfcSpaceType::LongName() const { return *entity->getArgument(10); }
+void IfcSpaceType::setLongName(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
 bool IfcSpaceType::is(Type::Enum v) const { return v == Type::IfcSpaceType || IfcSpatialStructureElementType::is(v); }
 Type::Enum IfcSpaceType::type() const { return Type::IfcSpaceType; }
 Type::Enum IfcSpaceType::Class() { return Type::IfcSpaceType; }
-IfcSpaceType::IfcSpaceType(IfcAbstractEntityPtr e) : IfcSpatialStructureElementType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcSpaceType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcSpaceType::IfcSpaceType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcSpaceTypeEnum::IfcSpaceTypeEnum v10_PredefinedType, boost::optional< IfcLabel > v11_LongName) : IfcSpatialStructureElementType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcSpaceTypeEnum::ToString(v10_PredefinedType)); if (v11_LongName) { e->setArgument(10,(*v11_LongName)); } else { e->setArgument(10); } entity = e; EntityBuffer::Add(this); }
+IfcSpaceType::IfcSpaceType(IfcAbstractEntity* e) : IfcSpatialStructureElementType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcSpaceType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcSpaceType::IfcSpaceType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcSpaceTypeEnum::IfcSpaceTypeEnum v10_PredefinedType, boost::optional< std::string > v11_LongName) : IfcSpatialStructureElementType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcSpaceTypeEnum::ToString(v10_PredefinedType)); if (v11_LongName) { e->setArgument(10,(*v11_LongName)); } else { e->setArgument(10); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcSpatialElement
-bool IfcSpatialElement::hasLongName() { return !entity->getArgument(7)->isNull(); }
-IfcLabel IfcSpatialElement::LongName() { return *entity->getArgument(7); }
-void IfcSpatialElement::setLongName(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
-IfcRelContainedInSpatialStructure::list IfcSpatialElement::ContainsElements() { RETURN_INVERSE(IfcRelContainedInSpatialStructure) }
-IfcRelServicesBuildings::list IfcSpatialElement::ServicedBySystems() { RETURN_INVERSE(IfcRelServicesBuildings) }
-IfcRelReferencedInSpatialStructure::list IfcSpatialElement::ReferencesElements() { RETURN_INVERSE(IfcRelReferencedInSpatialStructure) }
+bool IfcSpatialElement::hasLongName() const { return !entity->getArgument(7)->isNull(); }
+std::string IfcSpatialElement::LongName() const { return *entity->getArgument(7); }
+void IfcSpatialElement::setLongName(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
+IfcRelContainedInSpatialStructure::list::ptr IfcSpatialElement::ContainsElements() const { return entity->getInverse(Type::IfcRelContainedInSpatialStructure, 5)->as<IfcRelContainedInSpatialStructure>(); }
+IfcRelServicesBuildings::list::ptr IfcSpatialElement::ServicedBySystems() const { return entity->getInverse(Type::IfcRelServicesBuildings, 5)->as<IfcRelServicesBuildings>(); }
+IfcRelReferencedInSpatialStructure::list::ptr IfcSpatialElement::ReferencesElements() const { return entity->getInverse(Type::IfcRelReferencedInSpatialStructure, 5)->as<IfcRelReferencedInSpatialStructure>(); }
 bool IfcSpatialElement::is(Type::Enum v) const { return v == Type::IfcSpatialElement || IfcProduct::is(v); }
 Type::Enum IfcSpatialElement::type() const { return Type::IfcSpatialElement; }
 Type::Enum IfcSpatialElement::Class() { return Type::IfcSpatialElement; }
-IfcSpatialElement::IfcSpatialElement(IfcAbstractEntityPtr e) : IfcProduct((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcSpatialElement)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcSpatialElement::IfcSpatialElement(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcLabel > v8_LongName) : IfcProduct((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_LongName) { e->setArgument(7,(*v8_LongName)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
+IfcSpatialElement::IfcSpatialElement(IfcAbstractEntity* e) : IfcProduct((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcSpatialElement)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcSpatialElement::IfcSpatialElement(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_LongName) : IfcProduct((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_LongName) { e->setArgument(7,(*v8_LongName)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcSpatialElementType
-bool IfcSpatialElementType::hasElementType() { return !entity->getArgument(8)->isNull(); }
-IfcLabel IfcSpatialElementType::ElementType() { return *entity->getArgument(8); }
-void IfcSpatialElementType::setElementType(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
+bool IfcSpatialElementType::hasElementType() const { return !entity->getArgument(8)->isNull(); }
+std::string IfcSpatialElementType::ElementType() const { return *entity->getArgument(8); }
+void IfcSpatialElementType::setElementType(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
 bool IfcSpatialElementType::is(Type::Enum v) const { return v == Type::IfcSpatialElementType || IfcTypeProduct::is(v); }
 Type::Enum IfcSpatialElementType::type() const { return Type::IfcSpatialElementType; }
 Type::Enum IfcSpatialElementType::Class() { return Type::IfcSpatialElementType; }
-IfcSpatialElementType::IfcSpatialElementType(IfcAbstractEntityPtr e) : IfcTypeProduct((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcSpatialElementType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcSpatialElementType::IfcSpatialElementType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType) : IfcTypeProduct((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcSpatialElementType::IfcSpatialElementType(IfcAbstractEntity* e) : IfcTypeProduct((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcSpatialElementType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcSpatialElementType::IfcSpatialElementType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType) : IfcTypeProduct((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcSpatialStructureElement
-bool IfcSpatialStructureElement::hasCompositionType() { return !entity->getArgument(8)->isNull(); }
-IfcElementCompositionEnum::IfcElementCompositionEnum IfcSpatialStructureElement::CompositionType() { return IfcElementCompositionEnum::FromString(*entity->getArgument(8)); }
+bool IfcSpatialStructureElement::hasCompositionType() const { return !entity->getArgument(8)->isNull(); }
+IfcElementCompositionEnum::IfcElementCompositionEnum IfcSpatialStructureElement::CompositionType() const { return IfcElementCompositionEnum::FromString(*entity->getArgument(8)); }
 void IfcSpatialStructureElement::setCompositionType(IfcElementCompositionEnum::IfcElementCompositionEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcElementCompositionEnum::ToString(v)); }
 bool IfcSpatialStructureElement::is(Type::Enum v) const { return v == Type::IfcSpatialStructureElement || IfcSpatialElement::is(v); }
 Type::Enum IfcSpatialStructureElement::type() const { return Type::IfcSpatialStructureElement; }
 Type::Enum IfcSpatialStructureElement::Class() { return Type::IfcSpatialStructureElement; }
-IfcSpatialStructureElement::IfcSpatialStructureElement(IfcAbstractEntityPtr e) : IfcSpatialElement((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcSpatialStructureElement)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcSpatialStructureElement::IfcSpatialStructureElement(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcLabel > v8_LongName, boost::optional< IfcElementCompositionEnum::IfcElementCompositionEnum > v9_CompositionType) : IfcSpatialElement((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_LongName) { e->setArgument(7,(*v8_LongName)); } else { e->setArgument(7); } if (v9_CompositionType) { e->setArgument(8,*v9_CompositionType,IfcElementCompositionEnum::ToString(*v9_CompositionType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcSpatialStructureElement::IfcSpatialStructureElement(IfcAbstractEntity* e) : IfcSpatialElement((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcSpatialStructureElement)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcSpatialStructureElement::IfcSpatialStructureElement(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_LongName, boost::optional< IfcElementCompositionEnum::IfcElementCompositionEnum > v9_CompositionType) : IfcSpatialElement((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_LongName) { e->setArgument(7,(*v8_LongName)); } else { e->setArgument(7); } if (v9_CompositionType) { e->setArgument(8,*v9_CompositionType,IfcElementCompositionEnum::ToString(*v9_CompositionType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcSpatialStructureElementType
 bool IfcSpatialStructureElementType::is(Type::Enum v) const { return v == Type::IfcSpatialStructureElementType || IfcSpatialElementType::is(v); }
 Type::Enum IfcSpatialStructureElementType::type() const { return Type::IfcSpatialStructureElementType; }
 Type::Enum IfcSpatialStructureElementType::Class() { return Type::IfcSpatialStructureElementType; }
-IfcSpatialStructureElementType::IfcSpatialStructureElementType(IfcAbstractEntityPtr e) : IfcSpatialElementType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcSpatialStructureElementType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcSpatialStructureElementType::IfcSpatialStructureElementType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType) : IfcSpatialElementType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcSpatialStructureElementType::IfcSpatialStructureElementType(IfcAbstractEntity* e) : IfcSpatialElementType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcSpatialStructureElementType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcSpatialStructureElementType::IfcSpatialStructureElementType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType) : IfcSpatialElementType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcSpatialZone
-bool IfcSpatialZone::hasPredefinedType() { return !entity->getArgument(8)->isNull(); }
-IfcSpatialZoneTypeEnum::IfcSpatialZoneTypeEnum IfcSpatialZone::PredefinedType() { return IfcSpatialZoneTypeEnum::FromString(*entity->getArgument(8)); }
+bool IfcSpatialZone::hasPredefinedType() const { return !entity->getArgument(8)->isNull(); }
+IfcSpatialZoneTypeEnum::IfcSpatialZoneTypeEnum IfcSpatialZone::PredefinedType() const { return IfcSpatialZoneTypeEnum::FromString(*entity->getArgument(8)); }
 void IfcSpatialZone::setPredefinedType(IfcSpatialZoneTypeEnum::IfcSpatialZoneTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcSpatialZoneTypeEnum::ToString(v)); }
 bool IfcSpatialZone::is(Type::Enum v) const { return v == Type::IfcSpatialZone || IfcSpatialElement::is(v); }
 Type::Enum IfcSpatialZone::type() const { return Type::IfcSpatialZone; }
 Type::Enum IfcSpatialZone::Class() { return Type::IfcSpatialZone; }
-IfcSpatialZone::IfcSpatialZone(IfcAbstractEntityPtr e) : IfcSpatialElement((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcSpatialZone)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcSpatialZone::IfcSpatialZone(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcLabel > v8_LongName, boost::optional< IfcSpatialZoneTypeEnum::IfcSpatialZoneTypeEnum > v9_PredefinedType) : IfcSpatialElement((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_LongName) { e->setArgument(7,(*v8_LongName)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcSpatialZoneTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcSpatialZone::IfcSpatialZone(IfcAbstractEntity* e) : IfcSpatialElement((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcSpatialZone)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcSpatialZone::IfcSpatialZone(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_LongName, boost::optional< IfcSpatialZoneTypeEnum::IfcSpatialZoneTypeEnum > v9_PredefinedType) : IfcSpatialElement((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_LongName) { e->setArgument(7,(*v8_LongName)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcSpatialZoneTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcSpatialZoneType
-IfcSpatialZoneTypeEnum::IfcSpatialZoneTypeEnum IfcSpatialZoneType::PredefinedType() { return IfcSpatialZoneTypeEnum::FromString(*entity->getArgument(9)); }
+IfcSpatialZoneTypeEnum::IfcSpatialZoneTypeEnum IfcSpatialZoneType::PredefinedType() const { return IfcSpatialZoneTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcSpatialZoneType::setPredefinedType(IfcSpatialZoneTypeEnum::IfcSpatialZoneTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcSpatialZoneTypeEnum::ToString(v)); }
-bool IfcSpatialZoneType::hasLongName() { return !entity->getArgument(10)->isNull(); }
-IfcLabel IfcSpatialZoneType::LongName() { return *entity->getArgument(10); }
-void IfcSpatialZoneType::setLongName(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
+bool IfcSpatialZoneType::hasLongName() const { return !entity->getArgument(10)->isNull(); }
+std::string IfcSpatialZoneType::LongName() const { return *entity->getArgument(10); }
+void IfcSpatialZoneType::setLongName(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
 bool IfcSpatialZoneType::is(Type::Enum v) const { return v == Type::IfcSpatialZoneType || IfcSpatialElementType::is(v); }
 Type::Enum IfcSpatialZoneType::type() const { return Type::IfcSpatialZoneType; }
 Type::Enum IfcSpatialZoneType::Class() { return Type::IfcSpatialZoneType; }
-IfcSpatialZoneType::IfcSpatialZoneType(IfcAbstractEntityPtr e) : IfcSpatialElementType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcSpatialZoneType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcSpatialZoneType::IfcSpatialZoneType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcSpatialZoneTypeEnum::IfcSpatialZoneTypeEnum v10_PredefinedType, boost::optional< IfcLabel > v11_LongName) : IfcSpatialElementType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcSpatialZoneTypeEnum::ToString(v10_PredefinedType)); if (v11_LongName) { e->setArgument(10,(*v11_LongName)); } else { e->setArgument(10); } entity = e; EntityBuffer::Add(this); }
+IfcSpatialZoneType::IfcSpatialZoneType(IfcAbstractEntity* e) : IfcSpatialElementType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcSpatialZoneType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcSpatialZoneType::IfcSpatialZoneType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcSpatialZoneTypeEnum::IfcSpatialZoneTypeEnum v10_PredefinedType, boost::optional< std::string > v11_LongName) : IfcSpatialElementType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcSpatialZoneTypeEnum::ToString(v10_PredefinedType)); if (v11_LongName) { e->setArgument(10,(*v11_LongName)); } else { e->setArgument(10); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcSphere
-IfcPositiveLengthMeasure IfcSphere::Radius() { return *entity->getArgument(1); }
-void IfcSphere::setRadius(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+double IfcSphere::Radius() const { return *entity->getArgument(1); }
+void IfcSphere::setRadius(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
 bool IfcSphere::is(Type::Enum v) const { return v == Type::IfcSphere || IfcCsgPrimitive3D::is(v); }
 Type::Enum IfcSphere::type() const { return Type::IfcSphere; }
 Type::Enum IfcSphere::Class() { return Type::IfcSphere; }
-IfcSphere::IfcSphere(IfcAbstractEntityPtr e) : IfcCsgPrimitive3D((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcSphere)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcSphere::IfcSphere(IfcAxis2Placement3D* v1_Position, IfcPositiveLengthMeasure v2_Radius) : IfcCsgPrimitive3D((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Position)); e->setArgument(1,(v2_Radius)); entity = e; EntityBuffer::Add(this); }
+IfcSphere::IfcSphere(IfcAbstractEntity* e) : IfcCsgPrimitive3D((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcSphere)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcSphere::IfcSphere(IfcAxis2Placement3D* v1_Position, double v2_Radius) : IfcCsgPrimitive3D((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Position)); e->setArgument(1,(v2_Radius)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcStackTerminal
-bool IfcStackTerminal::hasPredefinedType() { return !entity->getArgument(8)->isNull(); }
-IfcStackTerminalTypeEnum::IfcStackTerminalTypeEnum IfcStackTerminal::PredefinedType() { return IfcStackTerminalTypeEnum::FromString(*entity->getArgument(8)); }
+bool IfcStackTerminal::hasPredefinedType() const { return !entity->getArgument(8)->isNull(); }
+IfcStackTerminalTypeEnum::IfcStackTerminalTypeEnum IfcStackTerminal::PredefinedType() const { return IfcStackTerminalTypeEnum::FromString(*entity->getArgument(8)); }
 void IfcStackTerminal::setPredefinedType(IfcStackTerminalTypeEnum::IfcStackTerminalTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcStackTerminalTypeEnum::ToString(v)); }
 bool IfcStackTerminal::is(Type::Enum v) const { return v == Type::IfcStackTerminal || IfcFlowTerminal::is(v); }
 Type::Enum IfcStackTerminal::type() const { return Type::IfcStackTerminal; }
 Type::Enum IfcStackTerminal::Class() { return Type::IfcStackTerminal; }
-IfcStackTerminal::IfcStackTerminal(IfcAbstractEntityPtr e) : IfcFlowTerminal((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcStackTerminal)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcStackTerminal::IfcStackTerminal(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcStackTerminalTypeEnum::IfcStackTerminalTypeEnum > v9_PredefinedType) : IfcFlowTerminal((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcStackTerminalTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcStackTerminal::IfcStackTerminal(IfcAbstractEntity* e) : IfcFlowTerminal((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcStackTerminal)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcStackTerminal::IfcStackTerminal(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcStackTerminalTypeEnum::IfcStackTerminalTypeEnum > v9_PredefinedType) : IfcFlowTerminal((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcStackTerminalTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcStackTerminalType
-IfcStackTerminalTypeEnum::IfcStackTerminalTypeEnum IfcStackTerminalType::PredefinedType() { return IfcStackTerminalTypeEnum::FromString(*entity->getArgument(9)); }
+IfcStackTerminalTypeEnum::IfcStackTerminalTypeEnum IfcStackTerminalType::PredefinedType() const { return IfcStackTerminalTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcStackTerminalType::setPredefinedType(IfcStackTerminalTypeEnum::IfcStackTerminalTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcStackTerminalTypeEnum::ToString(v)); }
 bool IfcStackTerminalType::is(Type::Enum v) const { return v == Type::IfcStackTerminalType || IfcFlowTerminalType::is(v); }
 Type::Enum IfcStackTerminalType::type() const { return Type::IfcStackTerminalType; }
 Type::Enum IfcStackTerminalType::Class() { return Type::IfcStackTerminalType; }
-IfcStackTerminalType::IfcStackTerminalType(IfcAbstractEntityPtr e) : IfcFlowTerminalType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcStackTerminalType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcStackTerminalType::IfcStackTerminalType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcStackTerminalTypeEnum::IfcStackTerminalTypeEnum v10_PredefinedType) : IfcFlowTerminalType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcStackTerminalTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcStackTerminalType::IfcStackTerminalType(IfcAbstractEntity* e) : IfcFlowTerminalType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcStackTerminalType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcStackTerminalType::IfcStackTerminalType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcStackTerminalTypeEnum::IfcStackTerminalTypeEnum v10_PredefinedType) : IfcFlowTerminalType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcStackTerminalTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcStair
-bool IfcStair::hasPredefinedType() { return !entity->getArgument(8)->isNull(); }
-IfcStairTypeEnum::IfcStairTypeEnum IfcStair::PredefinedType() { return IfcStairTypeEnum::FromString(*entity->getArgument(8)); }
+bool IfcStair::hasPredefinedType() const { return !entity->getArgument(8)->isNull(); }
+IfcStairTypeEnum::IfcStairTypeEnum IfcStair::PredefinedType() const { return IfcStairTypeEnum::FromString(*entity->getArgument(8)); }
 void IfcStair::setPredefinedType(IfcStairTypeEnum::IfcStairTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcStairTypeEnum::ToString(v)); }
 bool IfcStair::is(Type::Enum v) const { return v == Type::IfcStair || IfcBuildingElement::is(v); }
 Type::Enum IfcStair::type() const { return Type::IfcStair; }
 Type::Enum IfcStair::Class() { return Type::IfcStair; }
-IfcStair::IfcStair(IfcAbstractEntityPtr e) : IfcBuildingElement((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcStair)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcStair::IfcStair(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcStairTypeEnum::IfcStairTypeEnum > v9_PredefinedType) : IfcBuildingElement((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcStairTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcStair::IfcStair(IfcAbstractEntity* e) : IfcBuildingElement((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcStair)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcStair::IfcStair(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcStairTypeEnum::IfcStairTypeEnum > v9_PredefinedType) : IfcBuildingElement((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcStairTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcStairFlight
-bool IfcStairFlight::hasNumberOfRiser() { return !entity->getArgument(8)->isNull(); }
-int IfcStairFlight::NumberOfRiser() { return *entity->getArgument(8); }
+bool IfcStairFlight::hasNumberOfRiser() const { return !entity->getArgument(8)->isNull(); }
+int IfcStairFlight::NumberOfRiser() const { return *entity->getArgument(8); }
 void IfcStairFlight::setNumberOfRiser(int v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
-bool IfcStairFlight::hasNumberOfTreads() { return !entity->getArgument(9)->isNull(); }
-int IfcStairFlight::NumberOfTreads() { return *entity->getArgument(9); }
+bool IfcStairFlight::hasNumberOfTreads() const { return !entity->getArgument(9)->isNull(); }
+int IfcStairFlight::NumberOfTreads() const { return *entity->getArgument(9); }
 void IfcStairFlight::setNumberOfTreads(int v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
-bool IfcStairFlight::hasRiserHeight() { return !entity->getArgument(10)->isNull(); }
-IfcPositiveLengthMeasure IfcStairFlight::RiserHeight() { return *entity->getArgument(10); }
-void IfcStairFlight::setRiserHeight(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
-bool IfcStairFlight::hasTreadLength() { return !entity->getArgument(11)->isNull(); }
-IfcPositiveLengthMeasure IfcStairFlight::TreadLength() { return *entity->getArgument(11); }
-void IfcStairFlight::setTreadLength(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(11,v); }
-bool IfcStairFlight::hasPredefinedType() { return !entity->getArgument(12)->isNull(); }
-IfcStairFlightTypeEnum::IfcStairFlightTypeEnum IfcStairFlight::PredefinedType() { return IfcStairFlightTypeEnum::FromString(*entity->getArgument(12)); }
+bool IfcStairFlight::hasRiserHeight() const { return !entity->getArgument(10)->isNull(); }
+double IfcStairFlight::RiserHeight() const { return *entity->getArgument(10); }
+void IfcStairFlight::setRiserHeight(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
+bool IfcStairFlight::hasTreadLength() const { return !entity->getArgument(11)->isNull(); }
+double IfcStairFlight::TreadLength() const { return *entity->getArgument(11); }
+void IfcStairFlight::setTreadLength(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(11,v); }
+bool IfcStairFlight::hasPredefinedType() const { return !entity->getArgument(12)->isNull(); }
+IfcStairFlightTypeEnum::IfcStairFlightTypeEnum IfcStairFlight::PredefinedType() const { return IfcStairFlightTypeEnum::FromString(*entity->getArgument(12)); }
 void IfcStairFlight::setPredefinedType(IfcStairFlightTypeEnum::IfcStairFlightTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(12,v,IfcStairFlightTypeEnum::ToString(v)); }
 bool IfcStairFlight::is(Type::Enum v) const { return v == Type::IfcStairFlight || IfcBuildingElement::is(v); }
 Type::Enum IfcStairFlight::type() const { return Type::IfcStairFlight; }
 Type::Enum IfcStairFlight::Class() { return Type::IfcStairFlight; }
-IfcStairFlight::IfcStairFlight(IfcAbstractEntityPtr e) : IfcBuildingElement((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcStairFlight)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcStairFlight::IfcStairFlight(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< int > v9_NumberOfRiser, boost::optional< int > v10_NumberOfTreads, boost::optional< IfcPositiveLengthMeasure > v11_RiserHeight, boost::optional< IfcPositiveLengthMeasure > v12_TreadLength, boost::optional< IfcStairFlightTypeEnum::IfcStairFlightTypeEnum > v13_PredefinedType) : IfcBuildingElement((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_NumberOfRiser) { e->setArgument(8,(*v9_NumberOfRiser)); } else { e->setArgument(8); } if (v10_NumberOfTreads) { e->setArgument(9,(*v10_NumberOfTreads)); } else { e->setArgument(9); } if (v11_RiserHeight) { e->setArgument(10,(*v11_RiserHeight)); } else { e->setArgument(10); } if (v12_TreadLength) { e->setArgument(11,(*v12_TreadLength)); } else { e->setArgument(11); } if (v13_PredefinedType) { e->setArgument(12,*v13_PredefinedType,IfcStairFlightTypeEnum::ToString(*v13_PredefinedType)); } else { e->setArgument(12); } entity = e; EntityBuffer::Add(this); }
+IfcStairFlight::IfcStairFlight(IfcAbstractEntity* e) : IfcBuildingElement((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcStairFlight)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcStairFlight::IfcStairFlight(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< int > v9_NumberOfRiser, boost::optional< int > v10_NumberOfTreads, boost::optional< double > v11_RiserHeight, boost::optional< double > v12_TreadLength, boost::optional< IfcStairFlightTypeEnum::IfcStairFlightTypeEnum > v13_PredefinedType) : IfcBuildingElement((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_NumberOfRiser) { e->setArgument(8,(*v9_NumberOfRiser)); } else { e->setArgument(8); } if (v10_NumberOfTreads) { e->setArgument(9,(*v10_NumberOfTreads)); } else { e->setArgument(9); } if (v11_RiserHeight) { e->setArgument(10,(*v11_RiserHeight)); } else { e->setArgument(10); } if (v12_TreadLength) { e->setArgument(11,(*v12_TreadLength)); } else { e->setArgument(11); } if (v13_PredefinedType) { e->setArgument(12,*v13_PredefinedType,IfcStairFlightTypeEnum::ToString(*v13_PredefinedType)); } else { e->setArgument(12); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcStairFlightType
-IfcStairFlightTypeEnum::IfcStairFlightTypeEnum IfcStairFlightType::PredefinedType() { return IfcStairFlightTypeEnum::FromString(*entity->getArgument(9)); }
+IfcStairFlightTypeEnum::IfcStairFlightTypeEnum IfcStairFlightType::PredefinedType() const { return IfcStairFlightTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcStairFlightType::setPredefinedType(IfcStairFlightTypeEnum::IfcStairFlightTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcStairFlightTypeEnum::ToString(v)); }
 bool IfcStairFlightType::is(Type::Enum v) const { return v == Type::IfcStairFlightType || IfcBuildingElementType::is(v); }
 Type::Enum IfcStairFlightType::type() const { return Type::IfcStairFlightType; }
 Type::Enum IfcStairFlightType::Class() { return Type::IfcStairFlightType; }
-IfcStairFlightType::IfcStairFlightType(IfcAbstractEntityPtr e) : IfcBuildingElementType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcStairFlightType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcStairFlightType::IfcStairFlightType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcStairFlightTypeEnum::IfcStairFlightTypeEnum v10_PredefinedType) : IfcBuildingElementType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcStairFlightTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcStairFlightType::IfcStairFlightType(IfcAbstractEntity* e) : IfcBuildingElementType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcStairFlightType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcStairFlightType::IfcStairFlightType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcStairFlightTypeEnum::IfcStairFlightTypeEnum v10_PredefinedType) : IfcBuildingElementType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcStairFlightTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcStairType
-IfcStairTypeEnum::IfcStairTypeEnum IfcStairType::PredefinedType() { return IfcStairTypeEnum::FromString(*entity->getArgument(9)); }
+IfcStairTypeEnum::IfcStairTypeEnum IfcStairType::PredefinedType() const { return IfcStairTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcStairType::setPredefinedType(IfcStairTypeEnum::IfcStairTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcStairTypeEnum::ToString(v)); }
 bool IfcStairType::is(Type::Enum v) const { return v == Type::IfcStairType || IfcBuildingElementType::is(v); }
 Type::Enum IfcStairType::type() const { return Type::IfcStairType; }
 Type::Enum IfcStairType::Class() { return Type::IfcStairType; }
-IfcStairType::IfcStairType(IfcAbstractEntityPtr e) : IfcBuildingElementType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcStairType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcStairType::IfcStairType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcStairTypeEnum::IfcStairTypeEnum v10_PredefinedType) : IfcBuildingElementType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcStairTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcStairType::IfcStairType(IfcAbstractEntity* e) : IfcBuildingElementType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcStairType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcStairType::IfcStairType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcStairTypeEnum::IfcStairTypeEnum v10_PredefinedType) : IfcBuildingElementType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcStairTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcStructuralAction
-bool IfcStructuralAction::hasDestabilizingLoad() { return !entity->getArgument(9)->isNull(); }
-bool IfcStructuralAction::DestabilizingLoad() { return *entity->getArgument(9); }
+bool IfcStructuralAction::hasDestabilizingLoad() const { return !entity->getArgument(9)->isNull(); }
+bool IfcStructuralAction::DestabilizingLoad() const { return *entity->getArgument(9); }
 void IfcStructuralAction::setDestabilizingLoad(bool v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
 bool IfcStructuralAction::is(Type::Enum v) const { return v == Type::IfcStructuralAction || IfcStructuralActivity::is(v); }
 Type::Enum IfcStructuralAction::type() const { return Type::IfcStructuralAction; }
 Type::Enum IfcStructuralAction::Class() { return Type::IfcStructuralAction; }
-IfcStructuralAction::IfcStructuralAction(IfcAbstractEntityPtr e) : IfcStructuralActivity((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcStructuralAction)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcStructuralAction::IfcStructuralAction(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcStructuralLoad* v8_AppliedLoad, IfcGlobalOrLocalEnum::IfcGlobalOrLocalEnum v9_GlobalOrLocal, boost::optional< bool > v10_DestabilizingLoad) : IfcStructuralActivity((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); e->setArgument(7,(v8_AppliedLoad)); e->setArgument(8,v9_GlobalOrLocal,IfcGlobalOrLocalEnum::ToString(v9_GlobalOrLocal)); if (v10_DestabilizingLoad) { e->setArgument(9,(*v10_DestabilizingLoad)); } else { e->setArgument(9); } entity = e; EntityBuffer::Add(this); }
+IfcStructuralAction::IfcStructuralAction(IfcAbstractEntity* e) : IfcStructuralActivity((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcStructuralAction)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcStructuralAction::IfcStructuralAction(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcStructuralLoad* v8_AppliedLoad, IfcGlobalOrLocalEnum::IfcGlobalOrLocalEnum v9_GlobalOrLocal, boost::optional< bool > v10_DestabilizingLoad) : IfcStructuralActivity((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); e->setArgument(7,(v8_AppliedLoad)); e->setArgument(8,v9_GlobalOrLocal,IfcGlobalOrLocalEnum::ToString(v9_GlobalOrLocal)); if (v10_DestabilizingLoad) { e->setArgument(9,(*v10_DestabilizingLoad)); } else { e->setArgument(9); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcStructuralActivity
-IfcStructuralLoad* IfcStructuralActivity::AppliedLoad() { return (IfcStructuralLoad*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(7))); }
+IfcStructuralLoad* IfcStructuralActivity::AppliedLoad() const { return (IfcStructuralLoad*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(7))); }
 void IfcStructuralActivity::setAppliedLoad(IfcStructuralLoad* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
-IfcGlobalOrLocalEnum::IfcGlobalOrLocalEnum IfcStructuralActivity::GlobalOrLocal() { return IfcGlobalOrLocalEnum::FromString(*entity->getArgument(8)); }
+IfcGlobalOrLocalEnum::IfcGlobalOrLocalEnum IfcStructuralActivity::GlobalOrLocal() const { return IfcGlobalOrLocalEnum::FromString(*entity->getArgument(8)); }
 void IfcStructuralActivity::setGlobalOrLocal(IfcGlobalOrLocalEnum::IfcGlobalOrLocalEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcGlobalOrLocalEnum::ToString(v)); }
-IfcRelConnectsStructuralActivity::list IfcStructuralActivity::AssignedToStructuralItem() { RETURN_INVERSE(IfcRelConnectsStructuralActivity) }
+IfcRelConnectsStructuralActivity::list::ptr IfcStructuralActivity::AssignedToStructuralItem() const { return entity->getInverse(Type::IfcRelConnectsStructuralActivity, 5)->as<IfcRelConnectsStructuralActivity>(); }
 bool IfcStructuralActivity::is(Type::Enum v) const { return v == Type::IfcStructuralActivity || IfcProduct::is(v); }
 Type::Enum IfcStructuralActivity::type() const { return Type::IfcStructuralActivity; }
 Type::Enum IfcStructuralActivity::Class() { return Type::IfcStructuralActivity; }
-IfcStructuralActivity::IfcStructuralActivity(IfcAbstractEntityPtr e) : IfcProduct((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcStructuralActivity)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcStructuralActivity::IfcStructuralActivity(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcStructuralLoad* v8_AppliedLoad, IfcGlobalOrLocalEnum::IfcGlobalOrLocalEnum v9_GlobalOrLocal) : IfcProduct((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); e->setArgument(7,(v8_AppliedLoad)); e->setArgument(8,v9_GlobalOrLocal,IfcGlobalOrLocalEnum::ToString(v9_GlobalOrLocal)); entity = e; EntityBuffer::Add(this); }
+IfcStructuralActivity::IfcStructuralActivity(IfcAbstractEntity* e) : IfcProduct((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcStructuralActivity)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcStructuralActivity::IfcStructuralActivity(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcStructuralLoad* v8_AppliedLoad, IfcGlobalOrLocalEnum::IfcGlobalOrLocalEnum v9_GlobalOrLocal) : IfcProduct((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); e->setArgument(7,(v8_AppliedLoad)); e->setArgument(8,v9_GlobalOrLocal,IfcGlobalOrLocalEnum::ToString(v9_GlobalOrLocal)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcStructuralAnalysisModel
-IfcAnalysisModelTypeEnum::IfcAnalysisModelTypeEnum IfcStructuralAnalysisModel::PredefinedType() { return IfcAnalysisModelTypeEnum::FromString(*entity->getArgument(5)); }
+IfcAnalysisModelTypeEnum::IfcAnalysisModelTypeEnum IfcStructuralAnalysisModel::PredefinedType() const { return IfcAnalysisModelTypeEnum::FromString(*entity->getArgument(5)); }
 void IfcStructuralAnalysisModel::setPredefinedType(IfcAnalysisModelTypeEnum::IfcAnalysisModelTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v,IfcAnalysisModelTypeEnum::ToString(v)); }
-bool IfcStructuralAnalysisModel::hasOrientationOf2DPlane() { return !entity->getArgument(6)->isNull(); }
-IfcAxis2Placement3D* IfcStructuralAnalysisModel::OrientationOf2DPlane() { return (IfcAxis2Placement3D*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(6))); }
+bool IfcStructuralAnalysisModel::hasOrientationOf2DPlane() const { return !entity->getArgument(6)->isNull(); }
+IfcAxis2Placement3D* IfcStructuralAnalysisModel::OrientationOf2DPlane() const { return (IfcAxis2Placement3D*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(6))); }
 void IfcStructuralAnalysisModel::setOrientationOf2DPlane(IfcAxis2Placement3D* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
-bool IfcStructuralAnalysisModel::hasLoadedBy() { return !entity->getArgument(7)->isNull(); }
-SHARED_PTR< IfcTemplatedEntityList< IfcStructuralLoadGroup > > IfcStructuralAnalysisModel::LoadedBy() { RETURN_AS_LIST(IfcStructuralLoadGroup,7) }
-void IfcStructuralAnalysisModel::setLoadedBy(SHARED_PTR< IfcTemplatedEntityList< IfcStructuralLoadGroup > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v->generalize()); }
-bool IfcStructuralAnalysisModel::hasHasResults() { return !entity->getArgument(8)->isNull(); }
-SHARED_PTR< IfcTemplatedEntityList< IfcStructuralResultGroup > > IfcStructuralAnalysisModel::HasResults() { RETURN_AS_LIST(IfcStructuralResultGroup,8) }
-void IfcStructuralAnalysisModel::setHasResults(SHARED_PTR< IfcTemplatedEntityList< IfcStructuralResultGroup > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v->generalize()); }
-bool IfcStructuralAnalysisModel::hasSharedPlacement() { return !entity->getArgument(9)->isNull(); }
-IfcObjectPlacement* IfcStructuralAnalysisModel::SharedPlacement() { return (IfcObjectPlacement*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(9))); }
+bool IfcStructuralAnalysisModel::hasLoadedBy() const { return !entity->getArgument(7)->isNull(); }
+IfcTemplatedEntityList< IfcStructuralLoadGroup >::ptr IfcStructuralAnalysisModel::LoadedBy() const { IfcEntityList::ptr es = *entity->getArgument(7); return es->as<IfcStructuralLoadGroup>(); }
+void IfcStructuralAnalysisModel::setLoadedBy(IfcTemplatedEntityList< IfcStructuralLoadGroup >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v->generalize()); }
+bool IfcStructuralAnalysisModel::hasHasResults() const { return !entity->getArgument(8)->isNull(); }
+IfcTemplatedEntityList< IfcStructuralResultGroup >::ptr IfcStructuralAnalysisModel::HasResults() const { IfcEntityList::ptr es = *entity->getArgument(8); return es->as<IfcStructuralResultGroup>(); }
+void IfcStructuralAnalysisModel::setHasResults(IfcTemplatedEntityList< IfcStructuralResultGroup >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v->generalize()); }
+bool IfcStructuralAnalysisModel::hasSharedPlacement() const { return !entity->getArgument(9)->isNull(); }
+IfcObjectPlacement* IfcStructuralAnalysisModel::SharedPlacement() const { return (IfcObjectPlacement*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(9))); }
 void IfcStructuralAnalysisModel::setSharedPlacement(IfcObjectPlacement* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
 bool IfcStructuralAnalysisModel::is(Type::Enum v) const { return v == Type::IfcStructuralAnalysisModel || IfcSystem::is(v); }
 Type::Enum IfcStructuralAnalysisModel::type() const { return Type::IfcStructuralAnalysisModel; }
 Type::Enum IfcStructuralAnalysisModel::Class() { return Type::IfcStructuralAnalysisModel; }
-IfcStructuralAnalysisModel::IfcStructuralAnalysisModel(IfcAbstractEntityPtr e) : IfcSystem((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcStructuralAnalysisModel)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcStructuralAnalysisModel::IfcStructuralAnalysisModel(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcAnalysisModelTypeEnum::IfcAnalysisModelTypeEnum v6_PredefinedType, IfcAxis2Placement3D* v7_OrientationOf2DPlane, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcStructuralLoadGroup > > > v8_LoadedBy, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcStructuralResultGroup > > > v9_HasResults, IfcObjectPlacement* v10_SharedPlacement) : IfcSystem((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,v6_PredefinedType,IfcAnalysisModelTypeEnum::ToString(v6_PredefinedType)); e->setArgument(6,(v7_OrientationOf2DPlane)); if (v8_LoadedBy) { e->setArgument(7,(*v8_LoadedBy)->generalize()); } else { e->setArgument(7); } if (v9_HasResults) { e->setArgument(8,(*v9_HasResults)->generalize()); } else { e->setArgument(8); } e->setArgument(9,(v10_SharedPlacement)); entity = e; EntityBuffer::Add(this); }
+IfcStructuralAnalysisModel::IfcStructuralAnalysisModel(IfcAbstractEntity* e) : IfcSystem((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcStructuralAnalysisModel)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcStructuralAnalysisModel::IfcStructuralAnalysisModel(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcAnalysisModelTypeEnum::IfcAnalysisModelTypeEnum v6_PredefinedType, IfcAxis2Placement3D* v7_OrientationOf2DPlane, boost::optional< IfcTemplatedEntityList< IfcStructuralLoadGroup >::ptr > v8_LoadedBy, boost::optional< IfcTemplatedEntityList< IfcStructuralResultGroup >::ptr > v9_HasResults, IfcObjectPlacement* v10_SharedPlacement) : IfcSystem((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,v6_PredefinedType,IfcAnalysisModelTypeEnum::ToString(v6_PredefinedType)); e->setArgument(6,(v7_OrientationOf2DPlane)); if (v8_LoadedBy) { e->setArgument(7,(*v8_LoadedBy)->generalize()); } else { e->setArgument(7); } if (v9_HasResults) { e->setArgument(8,(*v9_HasResults)->generalize()); } else { e->setArgument(8); } e->setArgument(9,(v10_SharedPlacement)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcStructuralConnection
-bool IfcStructuralConnection::hasAppliedCondition() { return !entity->getArgument(7)->isNull(); }
-IfcBoundaryCondition* IfcStructuralConnection::AppliedCondition() { return (IfcBoundaryCondition*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(7))); }
+bool IfcStructuralConnection::hasAppliedCondition() const { return !entity->getArgument(7)->isNull(); }
+IfcBoundaryCondition* IfcStructuralConnection::AppliedCondition() const { return (IfcBoundaryCondition*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(7))); }
 void IfcStructuralConnection::setAppliedCondition(IfcBoundaryCondition* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
-IfcRelConnectsStructuralMember::list IfcStructuralConnection::ConnectsStructuralMembers() { RETURN_INVERSE(IfcRelConnectsStructuralMember) }
+IfcRelConnectsStructuralMember::list::ptr IfcStructuralConnection::ConnectsStructuralMembers() const { return entity->getInverse(Type::IfcRelConnectsStructuralMember, 5)->as<IfcRelConnectsStructuralMember>(); }
 bool IfcStructuralConnection::is(Type::Enum v) const { return v == Type::IfcStructuralConnection || IfcStructuralItem::is(v); }
 Type::Enum IfcStructuralConnection::type() const { return Type::IfcStructuralConnection; }
 Type::Enum IfcStructuralConnection::Class() { return Type::IfcStructuralConnection; }
-IfcStructuralConnection::IfcStructuralConnection(IfcAbstractEntityPtr e) : IfcStructuralItem((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcStructuralConnection)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcStructuralConnection::IfcStructuralConnection(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcBoundaryCondition* v8_AppliedCondition) : IfcStructuralItem((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); e->setArgument(7,(v8_AppliedCondition)); entity = e; EntityBuffer::Add(this); }
+IfcStructuralConnection::IfcStructuralConnection(IfcAbstractEntity* e) : IfcStructuralItem((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcStructuralConnection)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcStructuralConnection::IfcStructuralConnection(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcBoundaryCondition* v8_AppliedCondition) : IfcStructuralItem((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); e->setArgument(7,(v8_AppliedCondition)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcStructuralConnectionCondition
-bool IfcStructuralConnectionCondition::hasName() { return !entity->getArgument(0)->isNull(); }
-IfcLabel IfcStructuralConnectionCondition::Name() { return *entity->getArgument(0); }
-void IfcStructuralConnectionCondition::setName(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+bool IfcStructuralConnectionCondition::hasName() const { return !entity->getArgument(0)->isNull(); }
+std::string IfcStructuralConnectionCondition::Name() const { return *entity->getArgument(0); }
+void IfcStructuralConnectionCondition::setName(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
 bool IfcStructuralConnectionCondition::is(Type::Enum v) const { return v == Type::IfcStructuralConnectionCondition; }
 Type::Enum IfcStructuralConnectionCondition::type() const { return Type::IfcStructuralConnectionCondition; }
 Type::Enum IfcStructuralConnectionCondition::Class() { return Type::IfcStructuralConnectionCondition; }
-IfcStructuralConnectionCondition::IfcStructuralConnectionCondition(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcStructuralConnectionCondition)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcStructuralConnectionCondition::IfcStructuralConnectionCondition(boost::optional< IfcLabel > v1_Name) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } entity = e; EntityBuffer::Add(this); }
+IfcStructuralConnectionCondition::IfcStructuralConnectionCondition(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcStructuralConnectionCondition)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcStructuralConnectionCondition::IfcStructuralConnectionCondition(boost::optional< std::string > v1_Name) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcStructuralCurveAction
-bool IfcStructuralCurveAction::hasProjectedOrTrue() { return !entity->getArgument(10)->isNull(); }
-IfcProjectedOrTrueLengthEnum::IfcProjectedOrTrueLengthEnum IfcStructuralCurveAction::ProjectedOrTrue() { return IfcProjectedOrTrueLengthEnum::FromString(*entity->getArgument(10)); }
+bool IfcStructuralCurveAction::hasProjectedOrTrue() const { return !entity->getArgument(10)->isNull(); }
+IfcProjectedOrTrueLengthEnum::IfcProjectedOrTrueLengthEnum IfcStructuralCurveAction::ProjectedOrTrue() const { return IfcProjectedOrTrueLengthEnum::FromString(*entity->getArgument(10)); }
 void IfcStructuralCurveAction::setProjectedOrTrue(IfcProjectedOrTrueLengthEnum::IfcProjectedOrTrueLengthEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v,IfcProjectedOrTrueLengthEnum::ToString(v)); }
-IfcStructuralCurveActivityTypeEnum::IfcStructuralCurveActivityTypeEnum IfcStructuralCurveAction::PredefinedType() { return IfcStructuralCurveActivityTypeEnum::FromString(*entity->getArgument(11)); }
+IfcStructuralCurveActivityTypeEnum::IfcStructuralCurveActivityTypeEnum IfcStructuralCurveAction::PredefinedType() const { return IfcStructuralCurveActivityTypeEnum::FromString(*entity->getArgument(11)); }
 void IfcStructuralCurveAction::setPredefinedType(IfcStructuralCurveActivityTypeEnum::IfcStructuralCurveActivityTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(11,v,IfcStructuralCurveActivityTypeEnum::ToString(v)); }
 bool IfcStructuralCurveAction::is(Type::Enum v) const { return v == Type::IfcStructuralCurveAction || IfcStructuralAction::is(v); }
 Type::Enum IfcStructuralCurveAction::type() const { return Type::IfcStructuralCurveAction; }
 Type::Enum IfcStructuralCurveAction::Class() { return Type::IfcStructuralCurveAction; }
-IfcStructuralCurveAction::IfcStructuralCurveAction(IfcAbstractEntityPtr e) : IfcStructuralAction((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcStructuralCurveAction)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcStructuralCurveAction::IfcStructuralCurveAction(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcStructuralLoad* v8_AppliedLoad, IfcGlobalOrLocalEnum::IfcGlobalOrLocalEnum v9_GlobalOrLocal, boost::optional< bool > v10_DestabilizingLoad, boost::optional< IfcProjectedOrTrueLengthEnum::IfcProjectedOrTrueLengthEnum > v11_ProjectedOrTrue, IfcStructuralCurveActivityTypeEnum::IfcStructuralCurveActivityTypeEnum v12_PredefinedType) : IfcStructuralAction((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); e->setArgument(7,(v8_AppliedLoad)); e->setArgument(8,v9_GlobalOrLocal,IfcGlobalOrLocalEnum::ToString(v9_GlobalOrLocal)); if (v10_DestabilizingLoad) { e->setArgument(9,(*v10_DestabilizingLoad)); } else { e->setArgument(9); } if (v11_ProjectedOrTrue) { e->setArgument(10,*v11_ProjectedOrTrue,IfcProjectedOrTrueLengthEnum::ToString(*v11_ProjectedOrTrue)); } else { e->setArgument(10); } e->setArgument(11,v12_PredefinedType,IfcStructuralCurveActivityTypeEnum::ToString(v12_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcStructuralCurveAction::IfcStructuralCurveAction(IfcAbstractEntity* e) : IfcStructuralAction((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcStructuralCurveAction)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcStructuralCurveAction::IfcStructuralCurveAction(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcStructuralLoad* v8_AppliedLoad, IfcGlobalOrLocalEnum::IfcGlobalOrLocalEnum v9_GlobalOrLocal, boost::optional< bool > v10_DestabilizingLoad, boost::optional< IfcProjectedOrTrueLengthEnum::IfcProjectedOrTrueLengthEnum > v11_ProjectedOrTrue, IfcStructuralCurveActivityTypeEnum::IfcStructuralCurveActivityTypeEnum v12_PredefinedType) : IfcStructuralAction((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); e->setArgument(7,(v8_AppliedLoad)); e->setArgument(8,v9_GlobalOrLocal,IfcGlobalOrLocalEnum::ToString(v9_GlobalOrLocal)); if (v10_DestabilizingLoad) { e->setArgument(9,(*v10_DestabilizingLoad)); } else { e->setArgument(9); } if (v11_ProjectedOrTrue) { e->setArgument(10,*v11_ProjectedOrTrue,IfcProjectedOrTrueLengthEnum::ToString(*v11_ProjectedOrTrue)); } else { e->setArgument(10); } e->setArgument(11,v12_PredefinedType,IfcStructuralCurveActivityTypeEnum::ToString(v12_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcStructuralCurveConnection
-IfcDirection* IfcStructuralCurveConnection::Axis() { return (IfcDirection*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(8))); }
+IfcDirection* IfcStructuralCurveConnection::Axis() const { return (IfcDirection*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(8))); }
 void IfcStructuralCurveConnection::setAxis(IfcDirection* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
 bool IfcStructuralCurveConnection::is(Type::Enum v) const { return v == Type::IfcStructuralCurveConnection || IfcStructuralConnection::is(v); }
 Type::Enum IfcStructuralCurveConnection::type() const { return Type::IfcStructuralCurveConnection; }
 Type::Enum IfcStructuralCurveConnection::Class() { return Type::IfcStructuralCurveConnection; }
-IfcStructuralCurveConnection::IfcStructuralCurveConnection(IfcAbstractEntityPtr e) : IfcStructuralConnection((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcStructuralCurveConnection)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcStructuralCurveConnection::IfcStructuralCurveConnection(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcBoundaryCondition* v8_AppliedCondition, IfcDirection* v9_Axis) : IfcStructuralConnection((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); e->setArgument(7,(v8_AppliedCondition)); e->setArgument(8,(v9_Axis)); entity = e; EntityBuffer::Add(this); }
+IfcStructuralCurveConnection::IfcStructuralCurveConnection(IfcAbstractEntity* e) : IfcStructuralConnection((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcStructuralCurveConnection)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcStructuralCurveConnection::IfcStructuralCurveConnection(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcBoundaryCondition* v8_AppliedCondition, IfcDirection* v9_Axis) : IfcStructuralConnection((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); e->setArgument(7,(v8_AppliedCondition)); e->setArgument(8,(v9_Axis)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcStructuralCurveMember
-IfcStructuralCurveMemberTypeEnum::IfcStructuralCurveMemberTypeEnum IfcStructuralCurveMember::PredefinedType() { return IfcStructuralCurveMemberTypeEnum::FromString(*entity->getArgument(7)); }
+IfcStructuralCurveMemberTypeEnum::IfcStructuralCurveMemberTypeEnum IfcStructuralCurveMember::PredefinedType() const { return IfcStructuralCurveMemberTypeEnum::FromString(*entity->getArgument(7)); }
 void IfcStructuralCurveMember::setPredefinedType(IfcStructuralCurveMemberTypeEnum::IfcStructuralCurveMemberTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v,IfcStructuralCurveMemberTypeEnum::ToString(v)); }
-IfcDirection* IfcStructuralCurveMember::Axis() { return (IfcDirection*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(8))); }
+IfcDirection* IfcStructuralCurveMember::Axis() const { return (IfcDirection*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(8))); }
 void IfcStructuralCurveMember::setAxis(IfcDirection* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
 bool IfcStructuralCurveMember::is(Type::Enum v) const { return v == Type::IfcStructuralCurveMember || IfcStructuralMember::is(v); }
 Type::Enum IfcStructuralCurveMember::type() const { return Type::IfcStructuralCurveMember; }
 Type::Enum IfcStructuralCurveMember::Class() { return Type::IfcStructuralCurveMember; }
-IfcStructuralCurveMember::IfcStructuralCurveMember(IfcAbstractEntityPtr e) : IfcStructuralMember((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcStructuralCurveMember)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcStructuralCurveMember::IfcStructuralCurveMember(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcStructuralCurveMemberTypeEnum::IfcStructuralCurveMemberTypeEnum v8_PredefinedType, IfcDirection* v9_Axis) : IfcStructuralMember((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); e->setArgument(7,v8_PredefinedType,IfcStructuralCurveMemberTypeEnum::ToString(v8_PredefinedType)); e->setArgument(8,(v9_Axis)); entity = e; EntityBuffer::Add(this); }
+IfcStructuralCurveMember::IfcStructuralCurveMember(IfcAbstractEntity* e) : IfcStructuralMember((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcStructuralCurveMember)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcStructuralCurveMember::IfcStructuralCurveMember(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcStructuralCurveMemberTypeEnum::IfcStructuralCurveMemberTypeEnum v8_PredefinedType, IfcDirection* v9_Axis) : IfcStructuralMember((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); e->setArgument(7,v8_PredefinedType,IfcStructuralCurveMemberTypeEnum::ToString(v8_PredefinedType)); e->setArgument(8,(v9_Axis)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcStructuralCurveMemberVarying
 bool IfcStructuralCurveMemberVarying::is(Type::Enum v) const { return v == Type::IfcStructuralCurveMemberVarying || IfcStructuralCurveMember::is(v); }
 Type::Enum IfcStructuralCurveMemberVarying::type() const { return Type::IfcStructuralCurveMemberVarying; }
 Type::Enum IfcStructuralCurveMemberVarying::Class() { return Type::IfcStructuralCurveMemberVarying; }
-IfcStructuralCurveMemberVarying::IfcStructuralCurveMemberVarying(IfcAbstractEntityPtr e) : IfcStructuralCurveMember((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcStructuralCurveMemberVarying)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcStructuralCurveMemberVarying::IfcStructuralCurveMemberVarying(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcStructuralCurveMemberTypeEnum::IfcStructuralCurveMemberTypeEnum v8_PredefinedType, IfcDirection* v9_Axis) : IfcStructuralCurveMember((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); e->setArgument(7,v8_PredefinedType,IfcStructuralCurveMemberTypeEnum::ToString(v8_PredefinedType)); e->setArgument(8,(v9_Axis)); entity = e; EntityBuffer::Add(this); }
+IfcStructuralCurveMemberVarying::IfcStructuralCurveMemberVarying(IfcAbstractEntity* e) : IfcStructuralCurveMember((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcStructuralCurveMemberVarying)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcStructuralCurveMemberVarying::IfcStructuralCurveMemberVarying(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcStructuralCurveMemberTypeEnum::IfcStructuralCurveMemberTypeEnum v8_PredefinedType, IfcDirection* v9_Axis) : IfcStructuralCurveMember((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); e->setArgument(7,v8_PredefinedType,IfcStructuralCurveMemberTypeEnum::ToString(v8_PredefinedType)); e->setArgument(8,(v9_Axis)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcStructuralCurveReaction
-IfcStructuralCurveActivityTypeEnum::IfcStructuralCurveActivityTypeEnum IfcStructuralCurveReaction::PredefinedType() { return IfcStructuralCurveActivityTypeEnum::FromString(*entity->getArgument(9)); }
+IfcStructuralCurveActivityTypeEnum::IfcStructuralCurveActivityTypeEnum IfcStructuralCurveReaction::PredefinedType() const { return IfcStructuralCurveActivityTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcStructuralCurveReaction::setPredefinedType(IfcStructuralCurveActivityTypeEnum::IfcStructuralCurveActivityTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcStructuralCurveActivityTypeEnum::ToString(v)); }
 bool IfcStructuralCurveReaction::is(Type::Enum v) const { return v == Type::IfcStructuralCurveReaction || IfcStructuralReaction::is(v); }
 Type::Enum IfcStructuralCurveReaction::type() const { return Type::IfcStructuralCurveReaction; }
 Type::Enum IfcStructuralCurveReaction::Class() { return Type::IfcStructuralCurveReaction; }
-IfcStructuralCurveReaction::IfcStructuralCurveReaction(IfcAbstractEntityPtr e) : IfcStructuralReaction((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcStructuralCurveReaction)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcStructuralCurveReaction::IfcStructuralCurveReaction(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcStructuralLoad* v8_AppliedLoad, IfcGlobalOrLocalEnum::IfcGlobalOrLocalEnum v9_GlobalOrLocal, IfcStructuralCurveActivityTypeEnum::IfcStructuralCurveActivityTypeEnum v10_PredefinedType) : IfcStructuralReaction((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); e->setArgument(7,(v8_AppliedLoad)); e->setArgument(8,v9_GlobalOrLocal,IfcGlobalOrLocalEnum::ToString(v9_GlobalOrLocal)); e->setArgument(9,v10_PredefinedType,IfcStructuralCurveActivityTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcStructuralCurveReaction::IfcStructuralCurveReaction(IfcAbstractEntity* e) : IfcStructuralReaction((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcStructuralCurveReaction)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcStructuralCurveReaction::IfcStructuralCurveReaction(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcStructuralLoad* v8_AppliedLoad, IfcGlobalOrLocalEnum::IfcGlobalOrLocalEnum v9_GlobalOrLocal, IfcStructuralCurveActivityTypeEnum::IfcStructuralCurveActivityTypeEnum v10_PredefinedType) : IfcStructuralReaction((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); e->setArgument(7,(v8_AppliedLoad)); e->setArgument(8,v9_GlobalOrLocal,IfcGlobalOrLocalEnum::ToString(v9_GlobalOrLocal)); e->setArgument(9,v10_PredefinedType,IfcStructuralCurveActivityTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcStructuralItem
-IfcRelConnectsStructuralActivity::list IfcStructuralItem::AssignedStructuralActivity() { RETURN_INVERSE(IfcRelConnectsStructuralActivity) }
+IfcRelConnectsStructuralActivity::list::ptr IfcStructuralItem::AssignedStructuralActivity() const { return entity->getInverse(Type::IfcRelConnectsStructuralActivity, 4)->as<IfcRelConnectsStructuralActivity>(); }
 bool IfcStructuralItem::is(Type::Enum v) const { return v == Type::IfcStructuralItem || IfcProduct::is(v); }
 Type::Enum IfcStructuralItem::type() const { return Type::IfcStructuralItem; }
 Type::Enum IfcStructuralItem::Class() { return Type::IfcStructuralItem; }
-IfcStructuralItem::IfcStructuralItem(IfcAbstractEntityPtr e) : IfcProduct((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcStructuralItem)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcStructuralItem::IfcStructuralItem(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation) : IfcProduct((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); entity = e; EntityBuffer::Add(this); }
+IfcStructuralItem::IfcStructuralItem(IfcAbstractEntity* e) : IfcProduct((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcStructuralItem)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcStructuralItem::IfcStructuralItem(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation) : IfcProduct((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcStructuralLinearAction
 bool IfcStructuralLinearAction::is(Type::Enum v) const { return v == Type::IfcStructuralLinearAction || IfcStructuralCurveAction::is(v); }
 Type::Enum IfcStructuralLinearAction::type() const { return Type::IfcStructuralLinearAction; }
 Type::Enum IfcStructuralLinearAction::Class() { return Type::IfcStructuralLinearAction; }
-IfcStructuralLinearAction::IfcStructuralLinearAction(IfcAbstractEntityPtr e) : IfcStructuralCurveAction((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcStructuralLinearAction)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcStructuralLinearAction::IfcStructuralLinearAction(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcStructuralLoad* v8_AppliedLoad, IfcGlobalOrLocalEnum::IfcGlobalOrLocalEnum v9_GlobalOrLocal, boost::optional< bool > v10_DestabilizingLoad, boost::optional< IfcProjectedOrTrueLengthEnum::IfcProjectedOrTrueLengthEnum > v11_ProjectedOrTrue, IfcStructuralCurveActivityTypeEnum::IfcStructuralCurveActivityTypeEnum v12_PredefinedType) : IfcStructuralCurveAction((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); e->setArgument(7,(v8_AppliedLoad)); e->setArgument(8,v9_GlobalOrLocal,IfcGlobalOrLocalEnum::ToString(v9_GlobalOrLocal)); if (v10_DestabilizingLoad) { e->setArgument(9,(*v10_DestabilizingLoad)); } else { e->setArgument(9); } if (v11_ProjectedOrTrue) { e->setArgument(10,*v11_ProjectedOrTrue,IfcProjectedOrTrueLengthEnum::ToString(*v11_ProjectedOrTrue)); } else { e->setArgument(10); } e->setArgument(11,v12_PredefinedType,IfcStructuralCurveActivityTypeEnum::ToString(v12_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcStructuralLinearAction::IfcStructuralLinearAction(IfcAbstractEntity* e) : IfcStructuralCurveAction((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcStructuralLinearAction)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcStructuralLinearAction::IfcStructuralLinearAction(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcStructuralLoad* v8_AppliedLoad, IfcGlobalOrLocalEnum::IfcGlobalOrLocalEnum v9_GlobalOrLocal, boost::optional< bool > v10_DestabilizingLoad, boost::optional< IfcProjectedOrTrueLengthEnum::IfcProjectedOrTrueLengthEnum > v11_ProjectedOrTrue, IfcStructuralCurveActivityTypeEnum::IfcStructuralCurveActivityTypeEnum v12_PredefinedType) : IfcStructuralCurveAction((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); e->setArgument(7,(v8_AppliedLoad)); e->setArgument(8,v9_GlobalOrLocal,IfcGlobalOrLocalEnum::ToString(v9_GlobalOrLocal)); if (v10_DestabilizingLoad) { e->setArgument(9,(*v10_DestabilizingLoad)); } else { e->setArgument(9); } if (v11_ProjectedOrTrue) { e->setArgument(10,*v11_ProjectedOrTrue,IfcProjectedOrTrueLengthEnum::ToString(*v11_ProjectedOrTrue)); } else { e->setArgument(10); } e->setArgument(11,v12_PredefinedType,IfcStructuralCurveActivityTypeEnum::ToString(v12_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcStructuralLoad
-bool IfcStructuralLoad::hasName() { return !entity->getArgument(0)->isNull(); }
-IfcLabel IfcStructuralLoad::Name() { return *entity->getArgument(0); }
-void IfcStructuralLoad::setName(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+bool IfcStructuralLoad::hasName() const { return !entity->getArgument(0)->isNull(); }
+std::string IfcStructuralLoad::Name() const { return *entity->getArgument(0); }
+void IfcStructuralLoad::setName(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
 bool IfcStructuralLoad::is(Type::Enum v) const { return v == Type::IfcStructuralLoad; }
 Type::Enum IfcStructuralLoad::type() const { return Type::IfcStructuralLoad; }
 Type::Enum IfcStructuralLoad::Class() { return Type::IfcStructuralLoad; }
-IfcStructuralLoad::IfcStructuralLoad(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcStructuralLoad)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcStructuralLoad::IfcStructuralLoad(boost::optional< IfcLabel > v1_Name) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } entity = e; EntityBuffer::Add(this); }
+IfcStructuralLoad::IfcStructuralLoad(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcStructuralLoad)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcStructuralLoad::IfcStructuralLoad(boost::optional< std::string > v1_Name) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcStructuralLoadCase
-bool IfcStructuralLoadCase::hasSelfWeightCoefficients() { return !entity->getArgument(10)->isNull(); }
-std::vector< IfcRatioMeasure > /*[3:3]*/ IfcStructuralLoadCase::SelfWeightCoefficients() { return *entity->getArgument(10); }
-void IfcStructuralLoadCase::setSelfWeightCoefficients(std::vector< IfcRatioMeasure > /*[3:3]*/ v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
+bool IfcStructuralLoadCase::hasSelfWeightCoefficients() const { return !entity->getArgument(10)->isNull(); }
+std::vector< double > /*[3:3]*/ IfcStructuralLoadCase::SelfWeightCoefficients() const { return *entity->getArgument(10); }
+void IfcStructuralLoadCase::setSelfWeightCoefficients(std::vector< double > /*[3:3]*/ v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
 bool IfcStructuralLoadCase::is(Type::Enum v) const { return v == Type::IfcStructuralLoadCase || IfcStructuralLoadGroup::is(v); }
 Type::Enum IfcStructuralLoadCase::type() const { return Type::IfcStructuralLoadCase; }
 Type::Enum IfcStructuralLoadCase::Class() { return Type::IfcStructuralLoadCase; }
-IfcStructuralLoadCase::IfcStructuralLoadCase(IfcAbstractEntityPtr e) : IfcStructuralLoadGroup((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcStructuralLoadCase)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcStructuralLoadCase::IfcStructuralLoadCase(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcLoadGroupTypeEnum::IfcLoadGroupTypeEnum v6_PredefinedType, IfcActionTypeEnum::IfcActionTypeEnum v7_ActionType, IfcActionSourceTypeEnum::IfcActionSourceTypeEnum v8_ActionSource, boost::optional< IfcRatioMeasure > v9_Coefficient, boost::optional< IfcLabel > v10_Purpose, boost::optional< std::vector< IfcRatioMeasure > /*[3:3]*/ > v11_SelfWeightCoefficients) : IfcStructuralLoadGroup((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,v6_PredefinedType,IfcLoadGroupTypeEnum::ToString(v6_PredefinedType)); e->setArgument(6,v7_ActionType,IfcActionTypeEnum::ToString(v7_ActionType)); e->setArgument(7,v8_ActionSource,IfcActionSourceTypeEnum::ToString(v8_ActionSource)); if (v9_Coefficient) { e->setArgument(8,(*v9_Coefficient)); } else { e->setArgument(8); } if (v10_Purpose) { e->setArgument(9,(*v10_Purpose)); } else { e->setArgument(9); } if (v11_SelfWeightCoefficients) { e->setArgument(10,(*v11_SelfWeightCoefficients)); } else { e->setArgument(10); } entity = e; EntityBuffer::Add(this); }
+IfcStructuralLoadCase::IfcStructuralLoadCase(IfcAbstractEntity* e) : IfcStructuralLoadGroup((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcStructuralLoadCase)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcStructuralLoadCase::IfcStructuralLoadCase(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcLoadGroupTypeEnum::IfcLoadGroupTypeEnum v6_PredefinedType, IfcActionTypeEnum::IfcActionTypeEnum v7_ActionType, IfcActionSourceTypeEnum::IfcActionSourceTypeEnum v8_ActionSource, boost::optional< double > v9_Coefficient, boost::optional< std::string > v10_Purpose, boost::optional< std::vector< double > /*[3:3]*/ > v11_SelfWeightCoefficients) : IfcStructuralLoadGroup((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,v6_PredefinedType,IfcLoadGroupTypeEnum::ToString(v6_PredefinedType)); e->setArgument(6,v7_ActionType,IfcActionTypeEnum::ToString(v7_ActionType)); e->setArgument(7,v8_ActionSource,IfcActionSourceTypeEnum::ToString(v8_ActionSource)); if (v9_Coefficient) { e->setArgument(8,(*v9_Coefficient)); } else { e->setArgument(8); } if (v10_Purpose) { e->setArgument(9,(*v10_Purpose)); } else { e->setArgument(9); } if (v11_SelfWeightCoefficients) { e->setArgument(10,(*v11_SelfWeightCoefficients)); } else { e->setArgument(10); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcStructuralLoadConfiguration
-SHARED_PTR< IfcTemplatedEntityList< IfcStructuralLoadOrResult > > IfcStructuralLoadConfiguration::Values() { RETURN_AS_LIST(IfcStructuralLoadOrResult,1) }
-void IfcStructuralLoadConfiguration::setValues(SHARED_PTR< IfcTemplatedEntityList< IfcStructuralLoadOrResult > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v->generalize()); }
+IfcTemplatedEntityList< IfcStructuralLoadOrResult >::ptr IfcStructuralLoadConfiguration::Values() const { IfcEntityList::ptr es = *entity->getArgument(1); return es->as<IfcStructuralLoadOrResult>(); }
+void IfcStructuralLoadConfiguration::setValues(IfcTemplatedEntityList< IfcStructuralLoadOrResult >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v->generalize()); }
 bool IfcStructuralLoadConfiguration::is(Type::Enum v) const { return v == Type::IfcStructuralLoadConfiguration || IfcStructuralLoad::is(v); }
 Type::Enum IfcStructuralLoadConfiguration::type() const { return Type::IfcStructuralLoadConfiguration; }
 Type::Enum IfcStructuralLoadConfiguration::Class() { return Type::IfcStructuralLoadConfiguration; }
-IfcStructuralLoadConfiguration::IfcStructuralLoadConfiguration(IfcAbstractEntityPtr e) : IfcStructuralLoad((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcStructuralLoadConfiguration)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcStructuralLoadConfiguration::IfcStructuralLoadConfiguration(boost::optional< IfcLabel > v1_Name, SHARED_PTR< IfcTemplatedEntityList< IfcStructuralLoadOrResult > > v2_Values) : IfcStructuralLoad((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } e->setArgument(1,(v2_Values)->generalize()); entity = e; EntityBuffer::Add(this); }
+IfcStructuralLoadConfiguration::IfcStructuralLoadConfiguration(IfcAbstractEntity* e) : IfcStructuralLoad((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcStructuralLoadConfiguration)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcStructuralLoadConfiguration::IfcStructuralLoadConfiguration(boost::optional< std::string > v1_Name, IfcTemplatedEntityList< IfcStructuralLoadOrResult >::ptr v2_Values) : IfcStructuralLoad((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } e->setArgument(1,(v2_Values)->generalize()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcStructuralLoadGroup
-IfcLoadGroupTypeEnum::IfcLoadGroupTypeEnum IfcStructuralLoadGroup::PredefinedType() { return IfcLoadGroupTypeEnum::FromString(*entity->getArgument(5)); }
+IfcLoadGroupTypeEnum::IfcLoadGroupTypeEnum IfcStructuralLoadGroup::PredefinedType() const { return IfcLoadGroupTypeEnum::FromString(*entity->getArgument(5)); }
 void IfcStructuralLoadGroup::setPredefinedType(IfcLoadGroupTypeEnum::IfcLoadGroupTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v,IfcLoadGroupTypeEnum::ToString(v)); }
-IfcActionTypeEnum::IfcActionTypeEnum IfcStructuralLoadGroup::ActionType() { return IfcActionTypeEnum::FromString(*entity->getArgument(6)); }
+IfcActionTypeEnum::IfcActionTypeEnum IfcStructuralLoadGroup::ActionType() const { return IfcActionTypeEnum::FromString(*entity->getArgument(6)); }
 void IfcStructuralLoadGroup::setActionType(IfcActionTypeEnum::IfcActionTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v,IfcActionTypeEnum::ToString(v)); }
-IfcActionSourceTypeEnum::IfcActionSourceTypeEnum IfcStructuralLoadGroup::ActionSource() { return IfcActionSourceTypeEnum::FromString(*entity->getArgument(7)); }
+IfcActionSourceTypeEnum::IfcActionSourceTypeEnum IfcStructuralLoadGroup::ActionSource() const { return IfcActionSourceTypeEnum::FromString(*entity->getArgument(7)); }
 void IfcStructuralLoadGroup::setActionSource(IfcActionSourceTypeEnum::IfcActionSourceTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v,IfcActionSourceTypeEnum::ToString(v)); }
-bool IfcStructuralLoadGroup::hasCoefficient() { return !entity->getArgument(8)->isNull(); }
-IfcRatioMeasure IfcStructuralLoadGroup::Coefficient() { return *entity->getArgument(8); }
-void IfcStructuralLoadGroup::setCoefficient(IfcRatioMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
-bool IfcStructuralLoadGroup::hasPurpose() { return !entity->getArgument(9)->isNull(); }
-IfcLabel IfcStructuralLoadGroup::Purpose() { return *entity->getArgument(9); }
-void IfcStructuralLoadGroup::setPurpose(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
-IfcStructuralResultGroup::list IfcStructuralLoadGroup::SourceOfResultGroup() { RETURN_INVERSE(IfcStructuralResultGroup) }
-IfcStructuralAnalysisModel::list IfcStructuralLoadGroup::LoadGroupFor() { RETURN_INVERSE(IfcStructuralAnalysisModel) }
+bool IfcStructuralLoadGroup::hasCoefficient() const { return !entity->getArgument(8)->isNull(); }
+double IfcStructuralLoadGroup::Coefficient() const { return *entity->getArgument(8); }
+void IfcStructuralLoadGroup::setCoefficient(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
+bool IfcStructuralLoadGroup::hasPurpose() const { return !entity->getArgument(9)->isNull(); }
+std::string IfcStructuralLoadGroup::Purpose() const { return *entity->getArgument(9); }
+void IfcStructuralLoadGroup::setPurpose(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
+IfcStructuralResultGroup::list::ptr IfcStructuralLoadGroup::SourceOfResultGroup() const { return entity->getInverse(Type::IfcStructuralResultGroup, 6)->as<IfcStructuralResultGroup>(); }
+IfcStructuralAnalysisModel::list::ptr IfcStructuralLoadGroup::LoadGroupFor() const { return entity->getInverse(Type::IfcStructuralAnalysisModel, 7)->as<IfcStructuralAnalysisModel>(); }
 bool IfcStructuralLoadGroup::is(Type::Enum v) const { return v == Type::IfcStructuralLoadGroup || IfcGroup::is(v); }
 Type::Enum IfcStructuralLoadGroup::type() const { return Type::IfcStructuralLoadGroup; }
 Type::Enum IfcStructuralLoadGroup::Class() { return Type::IfcStructuralLoadGroup; }
-IfcStructuralLoadGroup::IfcStructuralLoadGroup(IfcAbstractEntityPtr e) : IfcGroup((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcStructuralLoadGroup)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcStructuralLoadGroup::IfcStructuralLoadGroup(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcLoadGroupTypeEnum::IfcLoadGroupTypeEnum v6_PredefinedType, IfcActionTypeEnum::IfcActionTypeEnum v7_ActionType, IfcActionSourceTypeEnum::IfcActionSourceTypeEnum v8_ActionSource, boost::optional< IfcRatioMeasure > v9_Coefficient, boost::optional< IfcLabel > v10_Purpose) : IfcGroup((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,v6_PredefinedType,IfcLoadGroupTypeEnum::ToString(v6_PredefinedType)); e->setArgument(6,v7_ActionType,IfcActionTypeEnum::ToString(v7_ActionType)); e->setArgument(7,v8_ActionSource,IfcActionSourceTypeEnum::ToString(v8_ActionSource)); if (v9_Coefficient) { e->setArgument(8,(*v9_Coefficient)); } else { e->setArgument(8); } if (v10_Purpose) { e->setArgument(9,(*v10_Purpose)); } else { e->setArgument(9); } entity = e; EntityBuffer::Add(this); }
+IfcStructuralLoadGroup::IfcStructuralLoadGroup(IfcAbstractEntity* e) : IfcGroup((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcStructuralLoadGroup)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcStructuralLoadGroup::IfcStructuralLoadGroup(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcLoadGroupTypeEnum::IfcLoadGroupTypeEnum v6_PredefinedType, IfcActionTypeEnum::IfcActionTypeEnum v7_ActionType, IfcActionSourceTypeEnum::IfcActionSourceTypeEnum v8_ActionSource, boost::optional< double > v9_Coefficient, boost::optional< std::string > v10_Purpose) : IfcGroup((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,v6_PredefinedType,IfcLoadGroupTypeEnum::ToString(v6_PredefinedType)); e->setArgument(6,v7_ActionType,IfcActionTypeEnum::ToString(v7_ActionType)); e->setArgument(7,v8_ActionSource,IfcActionSourceTypeEnum::ToString(v8_ActionSource)); if (v9_Coefficient) { e->setArgument(8,(*v9_Coefficient)); } else { e->setArgument(8); } if (v10_Purpose) { e->setArgument(9,(*v10_Purpose)); } else { e->setArgument(9); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcStructuralLoadLinearForce
-bool IfcStructuralLoadLinearForce::hasLinearForceX() { return !entity->getArgument(1)->isNull(); }
-IfcLinearForceMeasure IfcStructuralLoadLinearForce::LinearForceX() { return *entity->getArgument(1); }
-void IfcStructuralLoadLinearForce::setLinearForceX(IfcLinearForceMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-bool IfcStructuralLoadLinearForce::hasLinearForceY() { return !entity->getArgument(2)->isNull(); }
-IfcLinearForceMeasure IfcStructuralLoadLinearForce::LinearForceY() { return *entity->getArgument(2); }
-void IfcStructuralLoadLinearForce::setLinearForceY(IfcLinearForceMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-bool IfcStructuralLoadLinearForce::hasLinearForceZ() { return !entity->getArgument(3)->isNull(); }
-IfcLinearForceMeasure IfcStructuralLoadLinearForce::LinearForceZ() { return *entity->getArgument(3); }
-void IfcStructuralLoadLinearForce::setLinearForceZ(IfcLinearForceMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-bool IfcStructuralLoadLinearForce::hasLinearMomentX() { return !entity->getArgument(4)->isNull(); }
-IfcLinearMomentMeasure IfcStructuralLoadLinearForce::LinearMomentX() { return *entity->getArgument(4); }
-void IfcStructuralLoadLinearForce::setLinearMomentX(IfcLinearMomentMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-bool IfcStructuralLoadLinearForce::hasLinearMomentY() { return !entity->getArgument(5)->isNull(); }
-IfcLinearMomentMeasure IfcStructuralLoadLinearForce::LinearMomentY() { return *entity->getArgument(5); }
-void IfcStructuralLoadLinearForce::setLinearMomentY(IfcLinearMomentMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-bool IfcStructuralLoadLinearForce::hasLinearMomentZ() { return !entity->getArgument(6)->isNull(); }
-IfcLinearMomentMeasure IfcStructuralLoadLinearForce::LinearMomentZ() { return *entity->getArgument(6); }
-void IfcStructuralLoadLinearForce::setLinearMomentZ(IfcLinearMomentMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
+bool IfcStructuralLoadLinearForce::hasLinearForceX() const { return !entity->getArgument(1)->isNull(); }
+double IfcStructuralLoadLinearForce::LinearForceX() const { return *entity->getArgument(1); }
+void IfcStructuralLoadLinearForce::setLinearForceX(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+bool IfcStructuralLoadLinearForce::hasLinearForceY() const { return !entity->getArgument(2)->isNull(); }
+double IfcStructuralLoadLinearForce::LinearForceY() const { return *entity->getArgument(2); }
+void IfcStructuralLoadLinearForce::setLinearForceY(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+bool IfcStructuralLoadLinearForce::hasLinearForceZ() const { return !entity->getArgument(3)->isNull(); }
+double IfcStructuralLoadLinearForce::LinearForceZ() const { return *entity->getArgument(3); }
+void IfcStructuralLoadLinearForce::setLinearForceZ(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+bool IfcStructuralLoadLinearForce::hasLinearMomentX() const { return !entity->getArgument(4)->isNull(); }
+double IfcStructuralLoadLinearForce::LinearMomentX() const { return *entity->getArgument(4); }
+void IfcStructuralLoadLinearForce::setLinearMomentX(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+bool IfcStructuralLoadLinearForce::hasLinearMomentY() const { return !entity->getArgument(5)->isNull(); }
+double IfcStructuralLoadLinearForce::LinearMomentY() const { return *entity->getArgument(5); }
+void IfcStructuralLoadLinearForce::setLinearMomentY(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+bool IfcStructuralLoadLinearForce::hasLinearMomentZ() const { return !entity->getArgument(6)->isNull(); }
+double IfcStructuralLoadLinearForce::LinearMomentZ() const { return *entity->getArgument(6); }
+void IfcStructuralLoadLinearForce::setLinearMomentZ(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
 bool IfcStructuralLoadLinearForce::is(Type::Enum v) const { return v == Type::IfcStructuralLoadLinearForce || IfcStructuralLoadStatic::is(v); }
 Type::Enum IfcStructuralLoadLinearForce::type() const { return Type::IfcStructuralLoadLinearForce; }
 Type::Enum IfcStructuralLoadLinearForce::Class() { return Type::IfcStructuralLoadLinearForce; }
-IfcStructuralLoadLinearForce::IfcStructuralLoadLinearForce(IfcAbstractEntityPtr e) : IfcStructuralLoadStatic((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcStructuralLoadLinearForce)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcStructuralLoadLinearForce::IfcStructuralLoadLinearForce(boost::optional< IfcLabel > v1_Name, boost::optional< IfcLinearForceMeasure > v2_LinearForceX, boost::optional< IfcLinearForceMeasure > v3_LinearForceY, boost::optional< IfcLinearForceMeasure > v4_LinearForceZ, boost::optional< IfcLinearMomentMeasure > v5_LinearMomentX, boost::optional< IfcLinearMomentMeasure > v6_LinearMomentY, boost::optional< IfcLinearMomentMeasure > v7_LinearMomentZ) : IfcStructuralLoadStatic((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_LinearForceX) { e->setArgument(1,(*v2_LinearForceX)); } else { e->setArgument(1); } if (v3_LinearForceY) { e->setArgument(2,(*v3_LinearForceY)); } else { e->setArgument(2); } if (v4_LinearForceZ) { e->setArgument(3,(*v4_LinearForceZ)); } else { e->setArgument(3); } if (v5_LinearMomentX) { e->setArgument(4,(*v5_LinearMomentX)); } else { e->setArgument(4); } if (v6_LinearMomentY) { e->setArgument(5,(*v6_LinearMomentY)); } else { e->setArgument(5); } if (v7_LinearMomentZ) { e->setArgument(6,(*v7_LinearMomentZ)); } else { e->setArgument(6); } entity = e; EntityBuffer::Add(this); }
+IfcStructuralLoadLinearForce::IfcStructuralLoadLinearForce(IfcAbstractEntity* e) : IfcStructuralLoadStatic((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcStructuralLoadLinearForce)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcStructuralLoadLinearForce::IfcStructuralLoadLinearForce(boost::optional< std::string > v1_Name, boost::optional< double > v2_LinearForceX, boost::optional< double > v3_LinearForceY, boost::optional< double > v4_LinearForceZ, boost::optional< double > v5_LinearMomentX, boost::optional< double > v6_LinearMomentY, boost::optional< double > v7_LinearMomentZ) : IfcStructuralLoadStatic((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_LinearForceX) { e->setArgument(1,(*v2_LinearForceX)); } else { e->setArgument(1); } if (v3_LinearForceY) { e->setArgument(2,(*v3_LinearForceY)); } else { e->setArgument(2); } if (v4_LinearForceZ) { e->setArgument(3,(*v4_LinearForceZ)); } else { e->setArgument(3); } if (v5_LinearMomentX) { e->setArgument(4,(*v5_LinearMomentX)); } else { e->setArgument(4); } if (v6_LinearMomentY) { e->setArgument(5,(*v6_LinearMomentY)); } else { e->setArgument(5); } if (v7_LinearMomentZ) { e->setArgument(6,(*v7_LinearMomentZ)); } else { e->setArgument(6); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcStructuralLoadOrResult
 bool IfcStructuralLoadOrResult::is(Type::Enum v) const { return v == Type::IfcStructuralLoadOrResult || IfcStructuralLoad::is(v); }
 Type::Enum IfcStructuralLoadOrResult::type() const { return Type::IfcStructuralLoadOrResult; }
 Type::Enum IfcStructuralLoadOrResult::Class() { return Type::IfcStructuralLoadOrResult; }
-IfcStructuralLoadOrResult::IfcStructuralLoadOrResult(IfcAbstractEntityPtr e) : IfcStructuralLoad((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcStructuralLoadOrResult)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcStructuralLoadOrResult::IfcStructuralLoadOrResult(boost::optional< IfcLabel > v1_Name) : IfcStructuralLoad((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } entity = e; EntityBuffer::Add(this); }
+IfcStructuralLoadOrResult::IfcStructuralLoadOrResult(IfcAbstractEntity* e) : IfcStructuralLoad((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcStructuralLoadOrResult)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcStructuralLoadOrResult::IfcStructuralLoadOrResult(boost::optional< std::string > v1_Name) : IfcStructuralLoad((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcStructuralLoadPlanarForce
-bool IfcStructuralLoadPlanarForce::hasPlanarForceX() { return !entity->getArgument(1)->isNull(); }
-IfcPlanarForceMeasure IfcStructuralLoadPlanarForce::PlanarForceX() { return *entity->getArgument(1); }
-void IfcStructuralLoadPlanarForce::setPlanarForceX(IfcPlanarForceMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-bool IfcStructuralLoadPlanarForce::hasPlanarForceY() { return !entity->getArgument(2)->isNull(); }
-IfcPlanarForceMeasure IfcStructuralLoadPlanarForce::PlanarForceY() { return *entity->getArgument(2); }
-void IfcStructuralLoadPlanarForce::setPlanarForceY(IfcPlanarForceMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-bool IfcStructuralLoadPlanarForce::hasPlanarForceZ() { return !entity->getArgument(3)->isNull(); }
-IfcPlanarForceMeasure IfcStructuralLoadPlanarForce::PlanarForceZ() { return *entity->getArgument(3); }
-void IfcStructuralLoadPlanarForce::setPlanarForceZ(IfcPlanarForceMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+bool IfcStructuralLoadPlanarForce::hasPlanarForceX() const { return !entity->getArgument(1)->isNull(); }
+double IfcStructuralLoadPlanarForce::PlanarForceX() const { return *entity->getArgument(1); }
+void IfcStructuralLoadPlanarForce::setPlanarForceX(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+bool IfcStructuralLoadPlanarForce::hasPlanarForceY() const { return !entity->getArgument(2)->isNull(); }
+double IfcStructuralLoadPlanarForce::PlanarForceY() const { return *entity->getArgument(2); }
+void IfcStructuralLoadPlanarForce::setPlanarForceY(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+bool IfcStructuralLoadPlanarForce::hasPlanarForceZ() const { return !entity->getArgument(3)->isNull(); }
+double IfcStructuralLoadPlanarForce::PlanarForceZ() const { return *entity->getArgument(3); }
+void IfcStructuralLoadPlanarForce::setPlanarForceZ(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
 bool IfcStructuralLoadPlanarForce::is(Type::Enum v) const { return v == Type::IfcStructuralLoadPlanarForce || IfcStructuralLoadStatic::is(v); }
 Type::Enum IfcStructuralLoadPlanarForce::type() const { return Type::IfcStructuralLoadPlanarForce; }
 Type::Enum IfcStructuralLoadPlanarForce::Class() { return Type::IfcStructuralLoadPlanarForce; }
-IfcStructuralLoadPlanarForce::IfcStructuralLoadPlanarForce(IfcAbstractEntityPtr e) : IfcStructuralLoadStatic((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcStructuralLoadPlanarForce)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcStructuralLoadPlanarForce::IfcStructuralLoadPlanarForce(boost::optional< IfcLabel > v1_Name, boost::optional< IfcPlanarForceMeasure > v2_PlanarForceX, boost::optional< IfcPlanarForceMeasure > v3_PlanarForceY, boost::optional< IfcPlanarForceMeasure > v4_PlanarForceZ) : IfcStructuralLoadStatic((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_PlanarForceX) { e->setArgument(1,(*v2_PlanarForceX)); } else { e->setArgument(1); } if (v3_PlanarForceY) { e->setArgument(2,(*v3_PlanarForceY)); } else { e->setArgument(2); } if (v4_PlanarForceZ) { e->setArgument(3,(*v4_PlanarForceZ)); } else { e->setArgument(3); } entity = e; EntityBuffer::Add(this); }
+IfcStructuralLoadPlanarForce::IfcStructuralLoadPlanarForce(IfcAbstractEntity* e) : IfcStructuralLoadStatic((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcStructuralLoadPlanarForce)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcStructuralLoadPlanarForce::IfcStructuralLoadPlanarForce(boost::optional< std::string > v1_Name, boost::optional< double > v2_PlanarForceX, boost::optional< double > v3_PlanarForceY, boost::optional< double > v4_PlanarForceZ) : IfcStructuralLoadStatic((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_PlanarForceX) { e->setArgument(1,(*v2_PlanarForceX)); } else { e->setArgument(1); } if (v3_PlanarForceY) { e->setArgument(2,(*v3_PlanarForceY)); } else { e->setArgument(2); } if (v4_PlanarForceZ) { e->setArgument(3,(*v4_PlanarForceZ)); } else { e->setArgument(3); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcStructuralLoadSingleDisplacement
-bool IfcStructuralLoadSingleDisplacement::hasDisplacementX() { return !entity->getArgument(1)->isNull(); }
-IfcLengthMeasure IfcStructuralLoadSingleDisplacement::DisplacementX() { return *entity->getArgument(1); }
-void IfcStructuralLoadSingleDisplacement::setDisplacementX(IfcLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-bool IfcStructuralLoadSingleDisplacement::hasDisplacementY() { return !entity->getArgument(2)->isNull(); }
-IfcLengthMeasure IfcStructuralLoadSingleDisplacement::DisplacementY() { return *entity->getArgument(2); }
-void IfcStructuralLoadSingleDisplacement::setDisplacementY(IfcLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-bool IfcStructuralLoadSingleDisplacement::hasDisplacementZ() { return !entity->getArgument(3)->isNull(); }
-IfcLengthMeasure IfcStructuralLoadSingleDisplacement::DisplacementZ() { return *entity->getArgument(3); }
-void IfcStructuralLoadSingleDisplacement::setDisplacementZ(IfcLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-bool IfcStructuralLoadSingleDisplacement::hasRotationalDisplacementRX() { return !entity->getArgument(4)->isNull(); }
-IfcPlaneAngleMeasure IfcStructuralLoadSingleDisplacement::RotationalDisplacementRX() { return *entity->getArgument(4); }
-void IfcStructuralLoadSingleDisplacement::setRotationalDisplacementRX(IfcPlaneAngleMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-bool IfcStructuralLoadSingleDisplacement::hasRotationalDisplacementRY() { return !entity->getArgument(5)->isNull(); }
-IfcPlaneAngleMeasure IfcStructuralLoadSingleDisplacement::RotationalDisplacementRY() { return *entity->getArgument(5); }
-void IfcStructuralLoadSingleDisplacement::setRotationalDisplacementRY(IfcPlaneAngleMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-bool IfcStructuralLoadSingleDisplacement::hasRotationalDisplacementRZ() { return !entity->getArgument(6)->isNull(); }
-IfcPlaneAngleMeasure IfcStructuralLoadSingleDisplacement::RotationalDisplacementRZ() { return *entity->getArgument(6); }
-void IfcStructuralLoadSingleDisplacement::setRotationalDisplacementRZ(IfcPlaneAngleMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
+bool IfcStructuralLoadSingleDisplacement::hasDisplacementX() const { return !entity->getArgument(1)->isNull(); }
+double IfcStructuralLoadSingleDisplacement::DisplacementX() const { return *entity->getArgument(1); }
+void IfcStructuralLoadSingleDisplacement::setDisplacementX(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+bool IfcStructuralLoadSingleDisplacement::hasDisplacementY() const { return !entity->getArgument(2)->isNull(); }
+double IfcStructuralLoadSingleDisplacement::DisplacementY() const { return *entity->getArgument(2); }
+void IfcStructuralLoadSingleDisplacement::setDisplacementY(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+bool IfcStructuralLoadSingleDisplacement::hasDisplacementZ() const { return !entity->getArgument(3)->isNull(); }
+double IfcStructuralLoadSingleDisplacement::DisplacementZ() const { return *entity->getArgument(3); }
+void IfcStructuralLoadSingleDisplacement::setDisplacementZ(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+bool IfcStructuralLoadSingleDisplacement::hasRotationalDisplacementRX() const { return !entity->getArgument(4)->isNull(); }
+double IfcStructuralLoadSingleDisplacement::RotationalDisplacementRX() const { return *entity->getArgument(4); }
+void IfcStructuralLoadSingleDisplacement::setRotationalDisplacementRX(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+bool IfcStructuralLoadSingleDisplacement::hasRotationalDisplacementRY() const { return !entity->getArgument(5)->isNull(); }
+double IfcStructuralLoadSingleDisplacement::RotationalDisplacementRY() const { return *entity->getArgument(5); }
+void IfcStructuralLoadSingleDisplacement::setRotationalDisplacementRY(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+bool IfcStructuralLoadSingleDisplacement::hasRotationalDisplacementRZ() const { return !entity->getArgument(6)->isNull(); }
+double IfcStructuralLoadSingleDisplacement::RotationalDisplacementRZ() const { return *entity->getArgument(6); }
+void IfcStructuralLoadSingleDisplacement::setRotationalDisplacementRZ(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
 bool IfcStructuralLoadSingleDisplacement::is(Type::Enum v) const { return v == Type::IfcStructuralLoadSingleDisplacement || IfcStructuralLoadStatic::is(v); }
 Type::Enum IfcStructuralLoadSingleDisplacement::type() const { return Type::IfcStructuralLoadSingleDisplacement; }
 Type::Enum IfcStructuralLoadSingleDisplacement::Class() { return Type::IfcStructuralLoadSingleDisplacement; }
-IfcStructuralLoadSingleDisplacement::IfcStructuralLoadSingleDisplacement(IfcAbstractEntityPtr e) : IfcStructuralLoadStatic((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcStructuralLoadSingleDisplacement)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcStructuralLoadSingleDisplacement::IfcStructuralLoadSingleDisplacement(boost::optional< IfcLabel > v1_Name, boost::optional< IfcLengthMeasure > v2_DisplacementX, boost::optional< IfcLengthMeasure > v3_DisplacementY, boost::optional< IfcLengthMeasure > v4_DisplacementZ, boost::optional< IfcPlaneAngleMeasure > v5_RotationalDisplacementRX, boost::optional< IfcPlaneAngleMeasure > v6_RotationalDisplacementRY, boost::optional< IfcPlaneAngleMeasure > v7_RotationalDisplacementRZ) : IfcStructuralLoadStatic((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_DisplacementX) { e->setArgument(1,(*v2_DisplacementX)); } else { e->setArgument(1); } if (v3_DisplacementY) { e->setArgument(2,(*v3_DisplacementY)); } else { e->setArgument(2); } if (v4_DisplacementZ) { e->setArgument(3,(*v4_DisplacementZ)); } else { e->setArgument(3); } if (v5_RotationalDisplacementRX) { e->setArgument(4,(*v5_RotationalDisplacementRX)); } else { e->setArgument(4); } if (v6_RotationalDisplacementRY) { e->setArgument(5,(*v6_RotationalDisplacementRY)); } else { e->setArgument(5); } if (v7_RotationalDisplacementRZ) { e->setArgument(6,(*v7_RotationalDisplacementRZ)); } else { e->setArgument(6); } entity = e; EntityBuffer::Add(this); }
+IfcStructuralLoadSingleDisplacement::IfcStructuralLoadSingleDisplacement(IfcAbstractEntity* e) : IfcStructuralLoadStatic((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcStructuralLoadSingleDisplacement)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcStructuralLoadSingleDisplacement::IfcStructuralLoadSingleDisplacement(boost::optional< std::string > v1_Name, boost::optional< double > v2_DisplacementX, boost::optional< double > v3_DisplacementY, boost::optional< double > v4_DisplacementZ, boost::optional< double > v5_RotationalDisplacementRX, boost::optional< double > v6_RotationalDisplacementRY, boost::optional< double > v7_RotationalDisplacementRZ) : IfcStructuralLoadStatic((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_DisplacementX) { e->setArgument(1,(*v2_DisplacementX)); } else { e->setArgument(1); } if (v3_DisplacementY) { e->setArgument(2,(*v3_DisplacementY)); } else { e->setArgument(2); } if (v4_DisplacementZ) { e->setArgument(3,(*v4_DisplacementZ)); } else { e->setArgument(3); } if (v5_RotationalDisplacementRX) { e->setArgument(4,(*v5_RotationalDisplacementRX)); } else { e->setArgument(4); } if (v6_RotationalDisplacementRY) { e->setArgument(5,(*v6_RotationalDisplacementRY)); } else { e->setArgument(5); } if (v7_RotationalDisplacementRZ) { e->setArgument(6,(*v7_RotationalDisplacementRZ)); } else { e->setArgument(6); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcStructuralLoadSingleDisplacementDistortion
-bool IfcStructuralLoadSingleDisplacementDistortion::hasDistortion() { return !entity->getArgument(7)->isNull(); }
-IfcCurvatureMeasure IfcStructuralLoadSingleDisplacementDistortion::Distortion() { return *entity->getArgument(7); }
-void IfcStructuralLoadSingleDisplacementDistortion::setDistortion(IfcCurvatureMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
+bool IfcStructuralLoadSingleDisplacementDistortion::hasDistortion() const { return !entity->getArgument(7)->isNull(); }
+double IfcStructuralLoadSingleDisplacementDistortion::Distortion() const { return *entity->getArgument(7); }
+void IfcStructuralLoadSingleDisplacementDistortion::setDistortion(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
 bool IfcStructuralLoadSingleDisplacementDistortion::is(Type::Enum v) const { return v == Type::IfcStructuralLoadSingleDisplacementDistortion || IfcStructuralLoadSingleDisplacement::is(v); }
 Type::Enum IfcStructuralLoadSingleDisplacementDistortion::type() const { return Type::IfcStructuralLoadSingleDisplacementDistortion; }
 Type::Enum IfcStructuralLoadSingleDisplacementDistortion::Class() { return Type::IfcStructuralLoadSingleDisplacementDistortion; }
-IfcStructuralLoadSingleDisplacementDistortion::IfcStructuralLoadSingleDisplacementDistortion(IfcAbstractEntityPtr e) : IfcStructuralLoadSingleDisplacement((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcStructuralLoadSingleDisplacementDistortion)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcStructuralLoadSingleDisplacementDistortion::IfcStructuralLoadSingleDisplacementDistortion(boost::optional< IfcLabel > v1_Name, boost::optional< IfcLengthMeasure > v2_DisplacementX, boost::optional< IfcLengthMeasure > v3_DisplacementY, boost::optional< IfcLengthMeasure > v4_DisplacementZ, boost::optional< IfcPlaneAngleMeasure > v5_RotationalDisplacementRX, boost::optional< IfcPlaneAngleMeasure > v6_RotationalDisplacementRY, boost::optional< IfcPlaneAngleMeasure > v7_RotationalDisplacementRZ, boost::optional< IfcCurvatureMeasure > v8_Distortion) : IfcStructuralLoadSingleDisplacement((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_DisplacementX) { e->setArgument(1,(*v2_DisplacementX)); } else { e->setArgument(1); } if (v3_DisplacementY) { e->setArgument(2,(*v3_DisplacementY)); } else { e->setArgument(2); } if (v4_DisplacementZ) { e->setArgument(3,(*v4_DisplacementZ)); } else { e->setArgument(3); } if (v5_RotationalDisplacementRX) { e->setArgument(4,(*v5_RotationalDisplacementRX)); } else { e->setArgument(4); } if (v6_RotationalDisplacementRY) { e->setArgument(5,(*v6_RotationalDisplacementRY)); } else { e->setArgument(5); } if (v7_RotationalDisplacementRZ) { e->setArgument(6,(*v7_RotationalDisplacementRZ)); } else { e->setArgument(6); } if (v8_Distortion) { e->setArgument(7,(*v8_Distortion)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
+IfcStructuralLoadSingleDisplacementDistortion::IfcStructuralLoadSingleDisplacementDistortion(IfcAbstractEntity* e) : IfcStructuralLoadSingleDisplacement((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcStructuralLoadSingleDisplacementDistortion)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcStructuralLoadSingleDisplacementDistortion::IfcStructuralLoadSingleDisplacementDistortion(boost::optional< std::string > v1_Name, boost::optional< double > v2_DisplacementX, boost::optional< double > v3_DisplacementY, boost::optional< double > v4_DisplacementZ, boost::optional< double > v5_RotationalDisplacementRX, boost::optional< double > v6_RotationalDisplacementRY, boost::optional< double > v7_RotationalDisplacementRZ, boost::optional< double > v8_Distortion) : IfcStructuralLoadSingleDisplacement((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_DisplacementX) { e->setArgument(1,(*v2_DisplacementX)); } else { e->setArgument(1); } if (v3_DisplacementY) { e->setArgument(2,(*v3_DisplacementY)); } else { e->setArgument(2); } if (v4_DisplacementZ) { e->setArgument(3,(*v4_DisplacementZ)); } else { e->setArgument(3); } if (v5_RotationalDisplacementRX) { e->setArgument(4,(*v5_RotationalDisplacementRX)); } else { e->setArgument(4); } if (v6_RotationalDisplacementRY) { e->setArgument(5,(*v6_RotationalDisplacementRY)); } else { e->setArgument(5); } if (v7_RotationalDisplacementRZ) { e->setArgument(6,(*v7_RotationalDisplacementRZ)); } else { e->setArgument(6); } if (v8_Distortion) { e->setArgument(7,(*v8_Distortion)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcStructuralLoadSingleForce
-bool IfcStructuralLoadSingleForce::hasForceX() { return !entity->getArgument(1)->isNull(); }
-IfcForceMeasure IfcStructuralLoadSingleForce::ForceX() { return *entity->getArgument(1); }
-void IfcStructuralLoadSingleForce::setForceX(IfcForceMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-bool IfcStructuralLoadSingleForce::hasForceY() { return !entity->getArgument(2)->isNull(); }
-IfcForceMeasure IfcStructuralLoadSingleForce::ForceY() { return *entity->getArgument(2); }
-void IfcStructuralLoadSingleForce::setForceY(IfcForceMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-bool IfcStructuralLoadSingleForce::hasForceZ() { return !entity->getArgument(3)->isNull(); }
-IfcForceMeasure IfcStructuralLoadSingleForce::ForceZ() { return *entity->getArgument(3); }
-void IfcStructuralLoadSingleForce::setForceZ(IfcForceMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-bool IfcStructuralLoadSingleForce::hasMomentX() { return !entity->getArgument(4)->isNull(); }
-IfcTorqueMeasure IfcStructuralLoadSingleForce::MomentX() { return *entity->getArgument(4); }
-void IfcStructuralLoadSingleForce::setMomentX(IfcTorqueMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-bool IfcStructuralLoadSingleForce::hasMomentY() { return !entity->getArgument(5)->isNull(); }
-IfcTorqueMeasure IfcStructuralLoadSingleForce::MomentY() { return *entity->getArgument(5); }
-void IfcStructuralLoadSingleForce::setMomentY(IfcTorqueMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-bool IfcStructuralLoadSingleForce::hasMomentZ() { return !entity->getArgument(6)->isNull(); }
-IfcTorqueMeasure IfcStructuralLoadSingleForce::MomentZ() { return *entity->getArgument(6); }
-void IfcStructuralLoadSingleForce::setMomentZ(IfcTorqueMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
+bool IfcStructuralLoadSingleForce::hasForceX() const { return !entity->getArgument(1)->isNull(); }
+double IfcStructuralLoadSingleForce::ForceX() const { return *entity->getArgument(1); }
+void IfcStructuralLoadSingleForce::setForceX(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+bool IfcStructuralLoadSingleForce::hasForceY() const { return !entity->getArgument(2)->isNull(); }
+double IfcStructuralLoadSingleForce::ForceY() const { return *entity->getArgument(2); }
+void IfcStructuralLoadSingleForce::setForceY(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+bool IfcStructuralLoadSingleForce::hasForceZ() const { return !entity->getArgument(3)->isNull(); }
+double IfcStructuralLoadSingleForce::ForceZ() const { return *entity->getArgument(3); }
+void IfcStructuralLoadSingleForce::setForceZ(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+bool IfcStructuralLoadSingleForce::hasMomentX() const { return !entity->getArgument(4)->isNull(); }
+double IfcStructuralLoadSingleForce::MomentX() const { return *entity->getArgument(4); }
+void IfcStructuralLoadSingleForce::setMomentX(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+bool IfcStructuralLoadSingleForce::hasMomentY() const { return !entity->getArgument(5)->isNull(); }
+double IfcStructuralLoadSingleForce::MomentY() const { return *entity->getArgument(5); }
+void IfcStructuralLoadSingleForce::setMomentY(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+bool IfcStructuralLoadSingleForce::hasMomentZ() const { return !entity->getArgument(6)->isNull(); }
+double IfcStructuralLoadSingleForce::MomentZ() const { return *entity->getArgument(6); }
+void IfcStructuralLoadSingleForce::setMomentZ(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
 bool IfcStructuralLoadSingleForce::is(Type::Enum v) const { return v == Type::IfcStructuralLoadSingleForce || IfcStructuralLoadStatic::is(v); }
 Type::Enum IfcStructuralLoadSingleForce::type() const { return Type::IfcStructuralLoadSingleForce; }
 Type::Enum IfcStructuralLoadSingleForce::Class() { return Type::IfcStructuralLoadSingleForce; }
-IfcStructuralLoadSingleForce::IfcStructuralLoadSingleForce(IfcAbstractEntityPtr e) : IfcStructuralLoadStatic((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcStructuralLoadSingleForce)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcStructuralLoadSingleForce::IfcStructuralLoadSingleForce(boost::optional< IfcLabel > v1_Name, boost::optional< IfcForceMeasure > v2_ForceX, boost::optional< IfcForceMeasure > v3_ForceY, boost::optional< IfcForceMeasure > v4_ForceZ, boost::optional< IfcTorqueMeasure > v5_MomentX, boost::optional< IfcTorqueMeasure > v6_MomentY, boost::optional< IfcTorqueMeasure > v7_MomentZ) : IfcStructuralLoadStatic((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_ForceX) { e->setArgument(1,(*v2_ForceX)); } else { e->setArgument(1); } if (v3_ForceY) { e->setArgument(2,(*v3_ForceY)); } else { e->setArgument(2); } if (v4_ForceZ) { e->setArgument(3,(*v4_ForceZ)); } else { e->setArgument(3); } if (v5_MomentX) { e->setArgument(4,(*v5_MomentX)); } else { e->setArgument(4); } if (v6_MomentY) { e->setArgument(5,(*v6_MomentY)); } else { e->setArgument(5); } if (v7_MomentZ) { e->setArgument(6,(*v7_MomentZ)); } else { e->setArgument(6); } entity = e; EntityBuffer::Add(this); }
+IfcStructuralLoadSingleForce::IfcStructuralLoadSingleForce(IfcAbstractEntity* e) : IfcStructuralLoadStatic((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcStructuralLoadSingleForce)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcStructuralLoadSingleForce::IfcStructuralLoadSingleForce(boost::optional< std::string > v1_Name, boost::optional< double > v2_ForceX, boost::optional< double > v3_ForceY, boost::optional< double > v4_ForceZ, boost::optional< double > v5_MomentX, boost::optional< double > v6_MomentY, boost::optional< double > v7_MomentZ) : IfcStructuralLoadStatic((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_ForceX) { e->setArgument(1,(*v2_ForceX)); } else { e->setArgument(1); } if (v3_ForceY) { e->setArgument(2,(*v3_ForceY)); } else { e->setArgument(2); } if (v4_ForceZ) { e->setArgument(3,(*v4_ForceZ)); } else { e->setArgument(3); } if (v5_MomentX) { e->setArgument(4,(*v5_MomentX)); } else { e->setArgument(4); } if (v6_MomentY) { e->setArgument(5,(*v6_MomentY)); } else { e->setArgument(5); } if (v7_MomentZ) { e->setArgument(6,(*v7_MomentZ)); } else { e->setArgument(6); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcStructuralLoadSingleForceWarping
-bool IfcStructuralLoadSingleForceWarping::hasWarpingMoment() { return !entity->getArgument(7)->isNull(); }
-IfcWarpingMomentMeasure IfcStructuralLoadSingleForceWarping::WarpingMoment() { return *entity->getArgument(7); }
-void IfcStructuralLoadSingleForceWarping::setWarpingMoment(IfcWarpingMomentMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
+bool IfcStructuralLoadSingleForceWarping::hasWarpingMoment() const { return !entity->getArgument(7)->isNull(); }
+double IfcStructuralLoadSingleForceWarping::WarpingMoment() const { return *entity->getArgument(7); }
+void IfcStructuralLoadSingleForceWarping::setWarpingMoment(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
 bool IfcStructuralLoadSingleForceWarping::is(Type::Enum v) const { return v == Type::IfcStructuralLoadSingleForceWarping || IfcStructuralLoadSingleForce::is(v); }
 Type::Enum IfcStructuralLoadSingleForceWarping::type() const { return Type::IfcStructuralLoadSingleForceWarping; }
 Type::Enum IfcStructuralLoadSingleForceWarping::Class() { return Type::IfcStructuralLoadSingleForceWarping; }
-IfcStructuralLoadSingleForceWarping::IfcStructuralLoadSingleForceWarping(IfcAbstractEntityPtr e) : IfcStructuralLoadSingleForce((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcStructuralLoadSingleForceWarping)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcStructuralLoadSingleForceWarping::IfcStructuralLoadSingleForceWarping(boost::optional< IfcLabel > v1_Name, boost::optional< IfcForceMeasure > v2_ForceX, boost::optional< IfcForceMeasure > v3_ForceY, boost::optional< IfcForceMeasure > v4_ForceZ, boost::optional< IfcTorqueMeasure > v5_MomentX, boost::optional< IfcTorqueMeasure > v6_MomentY, boost::optional< IfcTorqueMeasure > v7_MomentZ, boost::optional< IfcWarpingMomentMeasure > v8_WarpingMoment) : IfcStructuralLoadSingleForce((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_ForceX) { e->setArgument(1,(*v2_ForceX)); } else { e->setArgument(1); } if (v3_ForceY) { e->setArgument(2,(*v3_ForceY)); } else { e->setArgument(2); } if (v4_ForceZ) { e->setArgument(3,(*v4_ForceZ)); } else { e->setArgument(3); } if (v5_MomentX) { e->setArgument(4,(*v5_MomentX)); } else { e->setArgument(4); } if (v6_MomentY) { e->setArgument(5,(*v6_MomentY)); } else { e->setArgument(5); } if (v7_MomentZ) { e->setArgument(6,(*v7_MomentZ)); } else { e->setArgument(6); } if (v8_WarpingMoment) { e->setArgument(7,(*v8_WarpingMoment)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
+IfcStructuralLoadSingleForceWarping::IfcStructuralLoadSingleForceWarping(IfcAbstractEntity* e) : IfcStructuralLoadSingleForce((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcStructuralLoadSingleForceWarping)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcStructuralLoadSingleForceWarping::IfcStructuralLoadSingleForceWarping(boost::optional< std::string > v1_Name, boost::optional< double > v2_ForceX, boost::optional< double > v3_ForceY, boost::optional< double > v4_ForceZ, boost::optional< double > v5_MomentX, boost::optional< double > v6_MomentY, boost::optional< double > v7_MomentZ, boost::optional< double > v8_WarpingMoment) : IfcStructuralLoadSingleForce((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_ForceX) { e->setArgument(1,(*v2_ForceX)); } else { e->setArgument(1); } if (v3_ForceY) { e->setArgument(2,(*v3_ForceY)); } else { e->setArgument(2); } if (v4_ForceZ) { e->setArgument(3,(*v4_ForceZ)); } else { e->setArgument(3); } if (v5_MomentX) { e->setArgument(4,(*v5_MomentX)); } else { e->setArgument(4); } if (v6_MomentY) { e->setArgument(5,(*v6_MomentY)); } else { e->setArgument(5); } if (v7_MomentZ) { e->setArgument(6,(*v7_MomentZ)); } else { e->setArgument(6); } if (v8_WarpingMoment) { e->setArgument(7,(*v8_WarpingMoment)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcStructuralLoadStatic
 bool IfcStructuralLoadStatic::is(Type::Enum v) const { return v == Type::IfcStructuralLoadStatic || IfcStructuralLoadOrResult::is(v); }
 Type::Enum IfcStructuralLoadStatic::type() const { return Type::IfcStructuralLoadStatic; }
 Type::Enum IfcStructuralLoadStatic::Class() { return Type::IfcStructuralLoadStatic; }
-IfcStructuralLoadStatic::IfcStructuralLoadStatic(IfcAbstractEntityPtr e) : IfcStructuralLoadOrResult((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcStructuralLoadStatic)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcStructuralLoadStatic::IfcStructuralLoadStatic(boost::optional< IfcLabel > v1_Name) : IfcStructuralLoadOrResult((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } entity = e; EntityBuffer::Add(this); }
+IfcStructuralLoadStatic::IfcStructuralLoadStatic(IfcAbstractEntity* e) : IfcStructuralLoadOrResult((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcStructuralLoadStatic)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcStructuralLoadStatic::IfcStructuralLoadStatic(boost::optional< std::string > v1_Name) : IfcStructuralLoadOrResult((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcStructuralLoadTemperature
-bool IfcStructuralLoadTemperature::hasDeltaTConstant() { return !entity->getArgument(1)->isNull(); }
-IfcThermodynamicTemperatureMeasure IfcStructuralLoadTemperature::DeltaTConstant() { return *entity->getArgument(1); }
-void IfcStructuralLoadTemperature::setDeltaTConstant(IfcThermodynamicTemperatureMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-bool IfcStructuralLoadTemperature::hasDeltaTY() { return !entity->getArgument(2)->isNull(); }
-IfcThermodynamicTemperatureMeasure IfcStructuralLoadTemperature::DeltaTY() { return *entity->getArgument(2); }
-void IfcStructuralLoadTemperature::setDeltaTY(IfcThermodynamicTemperatureMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-bool IfcStructuralLoadTemperature::hasDeltaTZ() { return !entity->getArgument(3)->isNull(); }
-IfcThermodynamicTemperatureMeasure IfcStructuralLoadTemperature::DeltaTZ() { return *entity->getArgument(3); }
-void IfcStructuralLoadTemperature::setDeltaTZ(IfcThermodynamicTemperatureMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+bool IfcStructuralLoadTemperature::hasDeltaTConstant() const { return !entity->getArgument(1)->isNull(); }
+double IfcStructuralLoadTemperature::DeltaTConstant() const { return *entity->getArgument(1); }
+void IfcStructuralLoadTemperature::setDeltaTConstant(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+bool IfcStructuralLoadTemperature::hasDeltaTY() const { return !entity->getArgument(2)->isNull(); }
+double IfcStructuralLoadTemperature::DeltaTY() const { return *entity->getArgument(2); }
+void IfcStructuralLoadTemperature::setDeltaTY(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+bool IfcStructuralLoadTemperature::hasDeltaTZ() const { return !entity->getArgument(3)->isNull(); }
+double IfcStructuralLoadTemperature::DeltaTZ() const { return *entity->getArgument(3); }
+void IfcStructuralLoadTemperature::setDeltaTZ(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
 bool IfcStructuralLoadTemperature::is(Type::Enum v) const { return v == Type::IfcStructuralLoadTemperature || IfcStructuralLoadStatic::is(v); }
 Type::Enum IfcStructuralLoadTemperature::type() const { return Type::IfcStructuralLoadTemperature; }
 Type::Enum IfcStructuralLoadTemperature::Class() { return Type::IfcStructuralLoadTemperature; }
-IfcStructuralLoadTemperature::IfcStructuralLoadTemperature(IfcAbstractEntityPtr e) : IfcStructuralLoadStatic((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcStructuralLoadTemperature)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcStructuralLoadTemperature::IfcStructuralLoadTemperature(boost::optional< IfcLabel > v1_Name, boost::optional< IfcThermodynamicTemperatureMeasure > v2_DeltaTConstant, boost::optional< IfcThermodynamicTemperatureMeasure > v3_DeltaTY, boost::optional< IfcThermodynamicTemperatureMeasure > v4_DeltaTZ) : IfcStructuralLoadStatic((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_DeltaTConstant) { e->setArgument(1,(*v2_DeltaTConstant)); } else { e->setArgument(1); } if (v3_DeltaTY) { e->setArgument(2,(*v3_DeltaTY)); } else { e->setArgument(2); } if (v4_DeltaTZ) { e->setArgument(3,(*v4_DeltaTZ)); } else { e->setArgument(3); } entity = e; EntityBuffer::Add(this); }
+IfcStructuralLoadTemperature::IfcStructuralLoadTemperature(IfcAbstractEntity* e) : IfcStructuralLoadStatic((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcStructuralLoadTemperature)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcStructuralLoadTemperature::IfcStructuralLoadTemperature(boost::optional< std::string > v1_Name, boost::optional< double > v2_DeltaTConstant, boost::optional< double > v3_DeltaTY, boost::optional< double > v4_DeltaTZ) : IfcStructuralLoadStatic((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_DeltaTConstant) { e->setArgument(1,(*v2_DeltaTConstant)); } else { e->setArgument(1); } if (v3_DeltaTY) { e->setArgument(2,(*v3_DeltaTY)); } else { e->setArgument(2); } if (v4_DeltaTZ) { e->setArgument(3,(*v4_DeltaTZ)); } else { e->setArgument(3); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcStructuralMember
-IfcRelConnectsStructuralMember::list IfcStructuralMember::ConnectedBy() { RETURN_INVERSE(IfcRelConnectsStructuralMember) }
+IfcRelConnectsStructuralMember::list::ptr IfcStructuralMember::ConnectedBy() const { return entity->getInverse(Type::IfcRelConnectsStructuralMember, 4)->as<IfcRelConnectsStructuralMember>(); }
 bool IfcStructuralMember::is(Type::Enum v) const { return v == Type::IfcStructuralMember || IfcStructuralItem::is(v); }
 Type::Enum IfcStructuralMember::type() const { return Type::IfcStructuralMember; }
 Type::Enum IfcStructuralMember::Class() { return Type::IfcStructuralMember; }
-IfcStructuralMember::IfcStructuralMember(IfcAbstractEntityPtr e) : IfcStructuralItem((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcStructuralMember)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcStructuralMember::IfcStructuralMember(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation) : IfcStructuralItem((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); entity = e; EntityBuffer::Add(this); }
+IfcStructuralMember::IfcStructuralMember(IfcAbstractEntity* e) : IfcStructuralItem((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcStructuralMember)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcStructuralMember::IfcStructuralMember(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation) : IfcStructuralItem((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcStructuralPlanarAction
 bool IfcStructuralPlanarAction::is(Type::Enum v) const { return v == Type::IfcStructuralPlanarAction || IfcStructuralSurfaceAction::is(v); }
 Type::Enum IfcStructuralPlanarAction::type() const { return Type::IfcStructuralPlanarAction; }
 Type::Enum IfcStructuralPlanarAction::Class() { return Type::IfcStructuralPlanarAction; }
-IfcStructuralPlanarAction::IfcStructuralPlanarAction(IfcAbstractEntityPtr e) : IfcStructuralSurfaceAction((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcStructuralPlanarAction)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcStructuralPlanarAction::IfcStructuralPlanarAction(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcStructuralLoad* v8_AppliedLoad, IfcGlobalOrLocalEnum::IfcGlobalOrLocalEnum v9_GlobalOrLocal, boost::optional< bool > v10_DestabilizingLoad, boost::optional< IfcProjectedOrTrueLengthEnum::IfcProjectedOrTrueLengthEnum > v11_ProjectedOrTrue, IfcStructuralSurfaceActivityTypeEnum::IfcStructuralSurfaceActivityTypeEnum v12_PredefinedType) : IfcStructuralSurfaceAction((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); e->setArgument(7,(v8_AppliedLoad)); e->setArgument(8,v9_GlobalOrLocal,IfcGlobalOrLocalEnum::ToString(v9_GlobalOrLocal)); if (v10_DestabilizingLoad) { e->setArgument(9,(*v10_DestabilizingLoad)); } else { e->setArgument(9); } if (v11_ProjectedOrTrue) { e->setArgument(10,*v11_ProjectedOrTrue,IfcProjectedOrTrueLengthEnum::ToString(*v11_ProjectedOrTrue)); } else { e->setArgument(10); } e->setArgument(11,v12_PredefinedType,IfcStructuralSurfaceActivityTypeEnum::ToString(v12_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcStructuralPlanarAction::IfcStructuralPlanarAction(IfcAbstractEntity* e) : IfcStructuralSurfaceAction((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcStructuralPlanarAction)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcStructuralPlanarAction::IfcStructuralPlanarAction(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcStructuralLoad* v8_AppliedLoad, IfcGlobalOrLocalEnum::IfcGlobalOrLocalEnum v9_GlobalOrLocal, boost::optional< bool > v10_DestabilizingLoad, boost::optional< IfcProjectedOrTrueLengthEnum::IfcProjectedOrTrueLengthEnum > v11_ProjectedOrTrue, IfcStructuralSurfaceActivityTypeEnum::IfcStructuralSurfaceActivityTypeEnum v12_PredefinedType) : IfcStructuralSurfaceAction((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); e->setArgument(7,(v8_AppliedLoad)); e->setArgument(8,v9_GlobalOrLocal,IfcGlobalOrLocalEnum::ToString(v9_GlobalOrLocal)); if (v10_DestabilizingLoad) { e->setArgument(9,(*v10_DestabilizingLoad)); } else { e->setArgument(9); } if (v11_ProjectedOrTrue) { e->setArgument(10,*v11_ProjectedOrTrue,IfcProjectedOrTrueLengthEnum::ToString(*v11_ProjectedOrTrue)); } else { e->setArgument(10); } e->setArgument(11,v12_PredefinedType,IfcStructuralSurfaceActivityTypeEnum::ToString(v12_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcStructuralPointAction
 bool IfcStructuralPointAction::is(Type::Enum v) const { return v == Type::IfcStructuralPointAction || IfcStructuralAction::is(v); }
 Type::Enum IfcStructuralPointAction::type() const { return Type::IfcStructuralPointAction; }
 Type::Enum IfcStructuralPointAction::Class() { return Type::IfcStructuralPointAction; }
-IfcStructuralPointAction::IfcStructuralPointAction(IfcAbstractEntityPtr e) : IfcStructuralAction((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcStructuralPointAction)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcStructuralPointAction::IfcStructuralPointAction(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcStructuralLoad* v8_AppliedLoad, IfcGlobalOrLocalEnum::IfcGlobalOrLocalEnum v9_GlobalOrLocal, boost::optional< bool > v10_DestabilizingLoad) : IfcStructuralAction((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); e->setArgument(7,(v8_AppliedLoad)); e->setArgument(8,v9_GlobalOrLocal,IfcGlobalOrLocalEnum::ToString(v9_GlobalOrLocal)); if (v10_DestabilizingLoad) { e->setArgument(9,(*v10_DestabilizingLoad)); } else { e->setArgument(9); } entity = e; EntityBuffer::Add(this); }
+IfcStructuralPointAction::IfcStructuralPointAction(IfcAbstractEntity* e) : IfcStructuralAction((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcStructuralPointAction)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcStructuralPointAction::IfcStructuralPointAction(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcStructuralLoad* v8_AppliedLoad, IfcGlobalOrLocalEnum::IfcGlobalOrLocalEnum v9_GlobalOrLocal, boost::optional< bool > v10_DestabilizingLoad) : IfcStructuralAction((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); e->setArgument(7,(v8_AppliedLoad)); e->setArgument(8,v9_GlobalOrLocal,IfcGlobalOrLocalEnum::ToString(v9_GlobalOrLocal)); if (v10_DestabilizingLoad) { e->setArgument(9,(*v10_DestabilizingLoad)); } else { e->setArgument(9); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcStructuralPointConnection
-bool IfcStructuralPointConnection::hasConditionCoordinateSystem() { return !entity->getArgument(8)->isNull(); }
-IfcAxis2Placement3D* IfcStructuralPointConnection::ConditionCoordinateSystem() { return (IfcAxis2Placement3D*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(8))); }
+bool IfcStructuralPointConnection::hasConditionCoordinateSystem() const { return !entity->getArgument(8)->isNull(); }
+IfcAxis2Placement3D* IfcStructuralPointConnection::ConditionCoordinateSystem() const { return (IfcAxis2Placement3D*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(8))); }
 void IfcStructuralPointConnection::setConditionCoordinateSystem(IfcAxis2Placement3D* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
 bool IfcStructuralPointConnection::is(Type::Enum v) const { return v == Type::IfcStructuralPointConnection || IfcStructuralConnection::is(v); }
 Type::Enum IfcStructuralPointConnection::type() const { return Type::IfcStructuralPointConnection; }
 Type::Enum IfcStructuralPointConnection::Class() { return Type::IfcStructuralPointConnection; }
-IfcStructuralPointConnection::IfcStructuralPointConnection(IfcAbstractEntityPtr e) : IfcStructuralConnection((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcStructuralPointConnection)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcStructuralPointConnection::IfcStructuralPointConnection(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcBoundaryCondition* v8_AppliedCondition, IfcAxis2Placement3D* v9_ConditionCoordinateSystem) : IfcStructuralConnection((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); e->setArgument(7,(v8_AppliedCondition)); e->setArgument(8,(v9_ConditionCoordinateSystem)); entity = e; EntityBuffer::Add(this); }
+IfcStructuralPointConnection::IfcStructuralPointConnection(IfcAbstractEntity* e) : IfcStructuralConnection((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcStructuralPointConnection)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcStructuralPointConnection::IfcStructuralPointConnection(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcBoundaryCondition* v8_AppliedCondition, IfcAxis2Placement3D* v9_ConditionCoordinateSystem) : IfcStructuralConnection((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); e->setArgument(7,(v8_AppliedCondition)); e->setArgument(8,(v9_ConditionCoordinateSystem)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcStructuralPointReaction
 bool IfcStructuralPointReaction::is(Type::Enum v) const { return v == Type::IfcStructuralPointReaction || IfcStructuralReaction::is(v); }
 Type::Enum IfcStructuralPointReaction::type() const { return Type::IfcStructuralPointReaction; }
 Type::Enum IfcStructuralPointReaction::Class() { return Type::IfcStructuralPointReaction; }
-IfcStructuralPointReaction::IfcStructuralPointReaction(IfcAbstractEntityPtr e) : IfcStructuralReaction((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcStructuralPointReaction)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcStructuralPointReaction::IfcStructuralPointReaction(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcStructuralLoad* v8_AppliedLoad, IfcGlobalOrLocalEnum::IfcGlobalOrLocalEnum v9_GlobalOrLocal) : IfcStructuralReaction((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); e->setArgument(7,(v8_AppliedLoad)); e->setArgument(8,v9_GlobalOrLocal,IfcGlobalOrLocalEnum::ToString(v9_GlobalOrLocal)); entity = e; EntityBuffer::Add(this); }
+IfcStructuralPointReaction::IfcStructuralPointReaction(IfcAbstractEntity* e) : IfcStructuralReaction((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcStructuralPointReaction)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcStructuralPointReaction::IfcStructuralPointReaction(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcStructuralLoad* v8_AppliedLoad, IfcGlobalOrLocalEnum::IfcGlobalOrLocalEnum v9_GlobalOrLocal) : IfcStructuralReaction((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); e->setArgument(7,(v8_AppliedLoad)); e->setArgument(8,v9_GlobalOrLocal,IfcGlobalOrLocalEnum::ToString(v9_GlobalOrLocal)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcStructuralReaction
 bool IfcStructuralReaction::is(Type::Enum v) const { return v == Type::IfcStructuralReaction || IfcStructuralActivity::is(v); }
 Type::Enum IfcStructuralReaction::type() const { return Type::IfcStructuralReaction; }
 Type::Enum IfcStructuralReaction::Class() { return Type::IfcStructuralReaction; }
-IfcStructuralReaction::IfcStructuralReaction(IfcAbstractEntityPtr e) : IfcStructuralActivity((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcStructuralReaction)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcStructuralReaction::IfcStructuralReaction(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcStructuralLoad* v8_AppliedLoad, IfcGlobalOrLocalEnum::IfcGlobalOrLocalEnum v9_GlobalOrLocal) : IfcStructuralActivity((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); e->setArgument(7,(v8_AppliedLoad)); e->setArgument(8,v9_GlobalOrLocal,IfcGlobalOrLocalEnum::ToString(v9_GlobalOrLocal)); entity = e; EntityBuffer::Add(this); }
+IfcStructuralReaction::IfcStructuralReaction(IfcAbstractEntity* e) : IfcStructuralActivity((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcStructuralReaction)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcStructuralReaction::IfcStructuralReaction(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcStructuralLoad* v8_AppliedLoad, IfcGlobalOrLocalEnum::IfcGlobalOrLocalEnum v9_GlobalOrLocal) : IfcStructuralActivity((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); e->setArgument(7,(v8_AppliedLoad)); e->setArgument(8,v9_GlobalOrLocal,IfcGlobalOrLocalEnum::ToString(v9_GlobalOrLocal)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcStructuralResultGroup
-IfcAnalysisTheoryTypeEnum::IfcAnalysisTheoryTypeEnum IfcStructuralResultGroup::TheoryType() { return IfcAnalysisTheoryTypeEnum::FromString(*entity->getArgument(5)); }
+IfcAnalysisTheoryTypeEnum::IfcAnalysisTheoryTypeEnum IfcStructuralResultGroup::TheoryType() const { return IfcAnalysisTheoryTypeEnum::FromString(*entity->getArgument(5)); }
 void IfcStructuralResultGroup::setTheoryType(IfcAnalysisTheoryTypeEnum::IfcAnalysisTheoryTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v,IfcAnalysisTheoryTypeEnum::ToString(v)); }
-bool IfcStructuralResultGroup::hasResultForLoadGroup() { return !entity->getArgument(6)->isNull(); }
-IfcStructuralLoadGroup* IfcStructuralResultGroup::ResultForLoadGroup() { return (IfcStructuralLoadGroup*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(6))); }
+bool IfcStructuralResultGroup::hasResultForLoadGroup() const { return !entity->getArgument(6)->isNull(); }
+IfcStructuralLoadGroup* IfcStructuralResultGroup::ResultForLoadGroup() const { return (IfcStructuralLoadGroup*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(6))); }
 void IfcStructuralResultGroup::setResultForLoadGroup(IfcStructuralLoadGroup* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
-bool IfcStructuralResultGroup::IsLinear() { return *entity->getArgument(7); }
+bool IfcStructuralResultGroup::IsLinear() const { return *entity->getArgument(7); }
 void IfcStructuralResultGroup::setIsLinear(bool v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
-IfcStructuralAnalysisModel::list IfcStructuralResultGroup::ResultGroupFor() { RETURN_INVERSE(IfcStructuralAnalysisModel) }
+IfcStructuralAnalysisModel::list::ptr IfcStructuralResultGroup::ResultGroupFor() const { return entity->getInverse(Type::IfcStructuralAnalysisModel, 8)->as<IfcStructuralAnalysisModel>(); }
 bool IfcStructuralResultGroup::is(Type::Enum v) const { return v == Type::IfcStructuralResultGroup || IfcGroup::is(v); }
 Type::Enum IfcStructuralResultGroup::type() const { return Type::IfcStructuralResultGroup; }
 Type::Enum IfcStructuralResultGroup::Class() { return Type::IfcStructuralResultGroup; }
-IfcStructuralResultGroup::IfcStructuralResultGroup(IfcAbstractEntityPtr e) : IfcGroup((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcStructuralResultGroup)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcStructuralResultGroup::IfcStructuralResultGroup(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcAnalysisTheoryTypeEnum::IfcAnalysisTheoryTypeEnum v6_TheoryType, IfcStructuralLoadGroup* v7_ResultForLoadGroup, bool v8_IsLinear) : IfcGroup((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,v6_TheoryType,IfcAnalysisTheoryTypeEnum::ToString(v6_TheoryType)); e->setArgument(6,(v7_ResultForLoadGroup)); e->setArgument(7,(v8_IsLinear)); entity = e; EntityBuffer::Add(this); }
+IfcStructuralResultGroup::IfcStructuralResultGroup(IfcAbstractEntity* e) : IfcGroup((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcStructuralResultGroup)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcStructuralResultGroup::IfcStructuralResultGroup(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcAnalysisTheoryTypeEnum::IfcAnalysisTheoryTypeEnum v6_TheoryType, IfcStructuralLoadGroup* v7_ResultForLoadGroup, bool v8_IsLinear) : IfcGroup((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,v6_TheoryType,IfcAnalysisTheoryTypeEnum::ToString(v6_TheoryType)); e->setArgument(6,(v7_ResultForLoadGroup)); e->setArgument(7,(v8_IsLinear)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcStructuralSurfaceAction
-bool IfcStructuralSurfaceAction::hasProjectedOrTrue() { return !entity->getArgument(10)->isNull(); }
-IfcProjectedOrTrueLengthEnum::IfcProjectedOrTrueLengthEnum IfcStructuralSurfaceAction::ProjectedOrTrue() { return IfcProjectedOrTrueLengthEnum::FromString(*entity->getArgument(10)); }
+bool IfcStructuralSurfaceAction::hasProjectedOrTrue() const { return !entity->getArgument(10)->isNull(); }
+IfcProjectedOrTrueLengthEnum::IfcProjectedOrTrueLengthEnum IfcStructuralSurfaceAction::ProjectedOrTrue() const { return IfcProjectedOrTrueLengthEnum::FromString(*entity->getArgument(10)); }
 void IfcStructuralSurfaceAction::setProjectedOrTrue(IfcProjectedOrTrueLengthEnum::IfcProjectedOrTrueLengthEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v,IfcProjectedOrTrueLengthEnum::ToString(v)); }
-IfcStructuralSurfaceActivityTypeEnum::IfcStructuralSurfaceActivityTypeEnum IfcStructuralSurfaceAction::PredefinedType() { return IfcStructuralSurfaceActivityTypeEnum::FromString(*entity->getArgument(11)); }
+IfcStructuralSurfaceActivityTypeEnum::IfcStructuralSurfaceActivityTypeEnum IfcStructuralSurfaceAction::PredefinedType() const { return IfcStructuralSurfaceActivityTypeEnum::FromString(*entity->getArgument(11)); }
 void IfcStructuralSurfaceAction::setPredefinedType(IfcStructuralSurfaceActivityTypeEnum::IfcStructuralSurfaceActivityTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(11,v,IfcStructuralSurfaceActivityTypeEnum::ToString(v)); }
 bool IfcStructuralSurfaceAction::is(Type::Enum v) const { return v == Type::IfcStructuralSurfaceAction || IfcStructuralAction::is(v); }
 Type::Enum IfcStructuralSurfaceAction::type() const { return Type::IfcStructuralSurfaceAction; }
 Type::Enum IfcStructuralSurfaceAction::Class() { return Type::IfcStructuralSurfaceAction; }
-IfcStructuralSurfaceAction::IfcStructuralSurfaceAction(IfcAbstractEntityPtr e) : IfcStructuralAction((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcStructuralSurfaceAction)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcStructuralSurfaceAction::IfcStructuralSurfaceAction(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcStructuralLoad* v8_AppliedLoad, IfcGlobalOrLocalEnum::IfcGlobalOrLocalEnum v9_GlobalOrLocal, boost::optional< bool > v10_DestabilizingLoad, boost::optional< IfcProjectedOrTrueLengthEnum::IfcProjectedOrTrueLengthEnum > v11_ProjectedOrTrue, IfcStructuralSurfaceActivityTypeEnum::IfcStructuralSurfaceActivityTypeEnum v12_PredefinedType) : IfcStructuralAction((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); e->setArgument(7,(v8_AppliedLoad)); e->setArgument(8,v9_GlobalOrLocal,IfcGlobalOrLocalEnum::ToString(v9_GlobalOrLocal)); if (v10_DestabilizingLoad) { e->setArgument(9,(*v10_DestabilizingLoad)); } else { e->setArgument(9); } if (v11_ProjectedOrTrue) { e->setArgument(10,*v11_ProjectedOrTrue,IfcProjectedOrTrueLengthEnum::ToString(*v11_ProjectedOrTrue)); } else { e->setArgument(10); } e->setArgument(11,v12_PredefinedType,IfcStructuralSurfaceActivityTypeEnum::ToString(v12_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcStructuralSurfaceAction::IfcStructuralSurfaceAction(IfcAbstractEntity* e) : IfcStructuralAction((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcStructuralSurfaceAction)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcStructuralSurfaceAction::IfcStructuralSurfaceAction(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcStructuralLoad* v8_AppliedLoad, IfcGlobalOrLocalEnum::IfcGlobalOrLocalEnum v9_GlobalOrLocal, boost::optional< bool > v10_DestabilizingLoad, boost::optional< IfcProjectedOrTrueLengthEnum::IfcProjectedOrTrueLengthEnum > v11_ProjectedOrTrue, IfcStructuralSurfaceActivityTypeEnum::IfcStructuralSurfaceActivityTypeEnum v12_PredefinedType) : IfcStructuralAction((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); e->setArgument(7,(v8_AppliedLoad)); e->setArgument(8,v9_GlobalOrLocal,IfcGlobalOrLocalEnum::ToString(v9_GlobalOrLocal)); if (v10_DestabilizingLoad) { e->setArgument(9,(*v10_DestabilizingLoad)); } else { e->setArgument(9); } if (v11_ProjectedOrTrue) { e->setArgument(10,*v11_ProjectedOrTrue,IfcProjectedOrTrueLengthEnum::ToString(*v11_ProjectedOrTrue)); } else { e->setArgument(10); } e->setArgument(11,v12_PredefinedType,IfcStructuralSurfaceActivityTypeEnum::ToString(v12_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcStructuralSurfaceConnection
 bool IfcStructuralSurfaceConnection::is(Type::Enum v) const { return v == Type::IfcStructuralSurfaceConnection || IfcStructuralConnection::is(v); }
 Type::Enum IfcStructuralSurfaceConnection::type() const { return Type::IfcStructuralSurfaceConnection; }
 Type::Enum IfcStructuralSurfaceConnection::Class() { return Type::IfcStructuralSurfaceConnection; }
-IfcStructuralSurfaceConnection::IfcStructuralSurfaceConnection(IfcAbstractEntityPtr e) : IfcStructuralConnection((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcStructuralSurfaceConnection)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcStructuralSurfaceConnection::IfcStructuralSurfaceConnection(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcBoundaryCondition* v8_AppliedCondition) : IfcStructuralConnection((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); e->setArgument(7,(v8_AppliedCondition)); entity = e; EntityBuffer::Add(this); }
+IfcStructuralSurfaceConnection::IfcStructuralSurfaceConnection(IfcAbstractEntity* e) : IfcStructuralConnection((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcStructuralSurfaceConnection)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcStructuralSurfaceConnection::IfcStructuralSurfaceConnection(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcBoundaryCondition* v8_AppliedCondition) : IfcStructuralConnection((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); e->setArgument(7,(v8_AppliedCondition)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcStructuralSurfaceMember
-IfcStructuralSurfaceMemberTypeEnum::IfcStructuralSurfaceMemberTypeEnum IfcStructuralSurfaceMember::PredefinedType() { return IfcStructuralSurfaceMemberTypeEnum::FromString(*entity->getArgument(7)); }
+IfcStructuralSurfaceMemberTypeEnum::IfcStructuralSurfaceMemberTypeEnum IfcStructuralSurfaceMember::PredefinedType() const { return IfcStructuralSurfaceMemberTypeEnum::FromString(*entity->getArgument(7)); }
 void IfcStructuralSurfaceMember::setPredefinedType(IfcStructuralSurfaceMemberTypeEnum::IfcStructuralSurfaceMemberTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v,IfcStructuralSurfaceMemberTypeEnum::ToString(v)); }
-bool IfcStructuralSurfaceMember::hasThickness() { return !entity->getArgument(8)->isNull(); }
-IfcPositiveLengthMeasure IfcStructuralSurfaceMember::Thickness() { return *entity->getArgument(8); }
-void IfcStructuralSurfaceMember::setThickness(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
+bool IfcStructuralSurfaceMember::hasThickness() const { return !entity->getArgument(8)->isNull(); }
+double IfcStructuralSurfaceMember::Thickness() const { return *entity->getArgument(8); }
+void IfcStructuralSurfaceMember::setThickness(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
 bool IfcStructuralSurfaceMember::is(Type::Enum v) const { return v == Type::IfcStructuralSurfaceMember || IfcStructuralMember::is(v); }
 Type::Enum IfcStructuralSurfaceMember::type() const { return Type::IfcStructuralSurfaceMember; }
 Type::Enum IfcStructuralSurfaceMember::Class() { return Type::IfcStructuralSurfaceMember; }
-IfcStructuralSurfaceMember::IfcStructuralSurfaceMember(IfcAbstractEntityPtr e) : IfcStructuralMember((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcStructuralSurfaceMember)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcStructuralSurfaceMember::IfcStructuralSurfaceMember(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcStructuralSurfaceMemberTypeEnum::IfcStructuralSurfaceMemberTypeEnum v8_PredefinedType, boost::optional< IfcPositiveLengthMeasure > v9_Thickness) : IfcStructuralMember((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); e->setArgument(7,v8_PredefinedType,IfcStructuralSurfaceMemberTypeEnum::ToString(v8_PredefinedType)); if (v9_Thickness) { e->setArgument(8,(*v9_Thickness)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcStructuralSurfaceMember::IfcStructuralSurfaceMember(IfcAbstractEntity* e) : IfcStructuralMember((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcStructuralSurfaceMember)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcStructuralSurfaceMember::IfcStructuralSurfaceMember(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcStructuralSurfaceMemberTypeEnum::IfcStructuralSurfaceMemberTypeEnum v8_PredefinedType, boost::optional< double > v9_Thickness) : IfcStructuralMember((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); e->setArgument(7,v8_PredefinedType,IfcStructuralSurfaceMemberTypeEnum::ToString(v8_PredefinedType)); if (v9_Thickness) { e->setArgument(8,(*v9_Thickness)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcStructuralSurfaceMemberVarying
 bool IfcStructuralSurfaceMemberVarying::is(Type::Enum v) const { return v == Type::IfcStructuralSurfaceMemberVarying || IfcStructuralSurfaceMember::is(v); }
 Type::Enum IfcStructuralSurfaceMemberVarying::type() const { return Type::IfcStructuralSurfaceMemberVarying; }
 Type::Enum IfcStructuralSurfaceMemberVarying::Class() { return Type::IfcStructuralSurfaceMemberVarying; }
-IfcStructuralSurfaceMemberVarying::IfcStructuralSurfaceMemberVarying(IfcAbstractEntityPtr e) : IfcStructuralSurfaceMember((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcStructuralSurfaceMemberVarying)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcStructuralSurfaceMemberVarying::IfcStructuralSurfaceMemberVarying(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcStructuralSurfaceMemberTypeEnum::IfcStructuralSurfaceMemberTypeEnum v8_PredefinedType, boost::optional< IfcPositiveLengthMeasure > v9_Thickness) : IfcStructuralSurfaceMember((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); e->setArgument(7,v8_PredefinedType,IfcStructuralSurfaceMemberTypeEnum::ToString(v8_PredefinedType)); if (v9_Thickness) { e->setArgument(8,(*v9_Thickness)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcStructuralSurfaceMemberVarying::IfcStructuralSurfaceMemberVarying(IfcAbstractEntity* e) : IfcStructuralSurfaceMember((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcStructuralSurfaceMemberVarying)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcStructuralSurfaceMemberVarying::IfcStructuralSurfaceMemberVarying(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcStructuralSurfaceMemberTypeEnum::IfcStructuralSurfaceMemberTypeEnum v8_PredefinedType, boost::optional< double > v9_Thickness) : IfcStructuralSurfaceMember((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); e->setArgument(7,v8_PredefinedType,IfcStructuralSurfaceMemberTypeEnum::ToString(v8_PredefinedType)); if (v9_Thickness) { e->setArgument(8,(*v9_Thickness)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcStructuralSurfaceReaction
-IfcStructuralSurfaceActivityTypeEnum::IfcStructuralSurfaceActivityTypeEnum IfcStructuralSurfaceReaction::PredefinedType() { return IfcStructuralSurfaceActivityTypeEnum::FromString(*entity->getArgument(9)); }
+IfcStructuralSurfaceActivityTypeEnum::IfcStructuralSurfaceActivityTypeEnum IfcStructuralSurfaceReaction::PredefinedType() const { return IfcStructuralSurfaceActivityTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcStructuralSurfaceReaction::setPredefinedType(IfcStructuralSurfaceActivityTypeEnum::IfcStructuralSurfaceActivityTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcStructuralSurfaceActivityTypeEnum::ToString(v)); }
 bool IfcStructuralSurfaceReaction::is(Type::Enum v) const { return v == Type::IfcStructuralSurfaceReaction || IfcStructuralReaction::is(v); }
 Type::Enum IfcStructuralSurfaceReaction::type() const { return Type::IfcStructuralSurfaceReaction; }
 Type::Enum IfcStructuralSurfaceReaction::Class() { return Type::IfcStructuralSurfaceReaction; }
-IfcStructuralSurfaceReaction::IfcStructuralSurfaceReaction(IfcAbstractEntityPtr e) : IfcStructuralReaction((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcStructuralSurfaceReaction)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcStructuralSurfaceReaction::IfcStructuralSurfaceReaction(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcStructuralLoad* v8_AppliedLoad, IfcGlobalOrLocalEnum::IfcGlobalOrLocalEnum v9_GlobalOrLocal, IfcStructuralSurfaceActivityTypeEnum::IfcStructuralSurfaceActivityTypeEnum v10_PredefinedType) : IfcStructuralReaction((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); e->setArgument(7,(v8_AppliedLoad)); e->setArgument(8,v9_GlobalOrLocal,IfcGlobalOrLocalEnum::ToString(v9_GlobalOrLocal)); e->setArgument(9,v10_PredefinedType,IfcStructuralSurfaceActivityTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcStructuralSurfaceReaction::IfcStructuralSurfaceReaction(IfcAbstractEntity* e) : IfcStructuralReaction((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcStructuralSurfaceReaction)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcStructuralSurfaceReaction::IfcStructuralSurfaceReaction(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcStructuralLoad* v8_AppliedLoad, IfcGlobalOrLocalEnum::IfcGlobalOrLocalEnum v9_GlobalOrLocal, IfcStructuralSurfaceActivityTypeEnum::IfcStructuralSurfaceActivityTypeEnum v10_PredefinedType) : IfcStructuralReaction((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); e->setArgument(7,(v8_AppliedLoad)); e->setArgument(8,v9_GlobalOrLocal,IfcGlobalOrLocalEnum::ToString(v9_GlobalOrLocal)); e->setArgument(9,v10_PredefinedType,IfcStructuralSurfaceActivityTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcStyleModel
 bool IfcStyleModel::is(Type::Enum v) const { return v == Type::IfcStyleModel || IfcRepresentation::is(v); }
 Type::Enum IfcStyleModel::type() const { return Type::IfcStyleModel; }
 Type::Enum IfcStyleModel::Class() { return Type::IfcStyleModel; }
-IfcStyleModel::IfcStyleModel(IfcAbstractEntityPtr e) : IfcRepresentation((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcStyleModel)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcStyleModel::IfcStyleModel(IfcRepresentationContext* v1_ContextOfItems, boost::optional< IfcLabel > v2_RepresentationIdentifier, boost::optional< IfcLabel > v3_RepresentationType, SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationItem > > v4_Items) : IfcRepresentation((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_ContextOfItems)); if (v2_RepresentationIdentifier) { e->setArgument(1,(*v2_RepresentationIdentifier)); } else { e->setArgument(1); } if (v3_RepresentationType) { e->setArgument(2,(*v3_RepresentationType)); } else { e->setArgument(2); } e->setArgument(3,(v4_Items)->generalize()); entity = e; EntityBuffer::Add(this); }
+IfcStyleModel::IfcStyleModel(IfcAbstractEntity* e) : IfcRepresentation((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcStyleModel)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcStyleModel::IfcStyleModel(IfcRepresentationContext* v1_ContextOfItems, boost::optional< std::string > v2_RepresentationIdentifier, boost::optional< std::string > v3_RepresentationType, IfcTemplatedEntityList< IfcRepresentationItem >::ptr v4_Items) : IfcRepresentation((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_ContextOfItems)); if (v2_RepresentationIdentifier) { e->setArgument(1,(*v2_RepresentationIdentifier)); } else { e->setArgument(1); } if (v3_RepresentationType) { e->setArgument(2,(*v3_RepresentationType)); } else { e->setArgument(2); } e->setArgument(3,(v4_Items)->generalize()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcStyledItem
-bool IfcStyledItem::hasItem() { return !entity->getArgument(0)->isNull(); }
-IfcRepresentationItem* IfcStyledItem::Item() { return (IfcRepresentationItem*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(0))); }
+bool IfcStyledItem::hasItem() const { return !entity->getArgument(0)->isNull(); }
+IfcRepresentationItem* IfcStyledItem::Item() const { return (IfcRepresentationItem*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(0))); }
 void IfcStyledItem::setItem(IfcRepresentationItem* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > IfcStyledItem::Styles() { RETURN_AS_LIST(IfcUtil::IfcAbstractSelect,1) }
-void IfcStyledItem::setStyles(SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v->generalize()); }
-bool IfcStyledItem::hasName() { return !entity->getArgument(2)->isNull(); }
-IfcLabel IfcStyledItem::Name() { return *entity->getArgument(2); }
-void IfcStyledItem::setName(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+IfcEntityList::ptr IfcStyledItem::Styles() const { return *entity->getArgument(1); }
+void IfcStyledItem::setStyles(IfcEntityList::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+bool IfcStyledItem::hasName() const { return !entity->getArgument(2)->isNull(); }
+std::string IfcStyledItem::Name() const { return *entity->getArgument(2); }
+void IfcStyledItem::setName(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
 bool IfcStyledItem::is(Type::Enum v) const { return v == Type::IfcStyledItem || IfcRepresentationItem::is(v); }
 Type::Enum IfcStyledItem::type() const { return Type::IfcStyledItem; }
 Type::Enum IfcStyledItem::Class() { return Type::IfcStyledItem; }
-IfcStyledItem::IfcStyledItem(IfcAbstractEntityPtr e) : IfcRepresentationItem((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcStyledItem)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcStyledItem::IfcStyledItem(IfcRepresentationItem* v1_Item, IfcEntities v2_Styles, boost::optional< IfcLabel > v3_Name) : IfcRepresentationItem((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Item)); e->setArgument(1,(v2_Styles)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } entity = e; EntityBuffer::Add(this); }
+IfcStyledItem::IfcStyledItem(IfcAbstractEntity* e) : IfcRepresentationItem((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcStyledItem)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcStyledItem::IfcStyledItem(IfcRepresentationItem* v1_Item, IfcEntityList::ptr v2_Styles, boost::optional< std::string > v3_Name) : IfcRepresentationItem((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Item)); e->setArgument(1,(v2_Styles)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcStyledRepresentation
 bool IfcStyledRepresentation::is(Type::Enum v) const { return v == Type::IfcStyledRepresentation || IfcStyleModel::is(v); }
 Type::Enum IfcStyledRepresentation::type() const { return Type::IfcStyledRepresentation; }
 Type::Enum IfcStyledRepresentation::Class() { return Type::IfcStyledRepresentation; }
-IfcStyledRepresentation::IfcStyledRepresentation(IfcAbstractEntityPtr e) : IfcStyleModel((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcStyledRepresentation)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcStyledRepresentation::IfcStyledRepresentation(IfcRepresentationContext* v1_ContextOfItems, boost::optional< IfcLabel > v2_RepresentationIdentifier, boost::optional< IfcLabel > v3_RepresentationType, SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationItem > > v4_Items) : IfcStyleModel((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_ContextOfItems)); if (v2_RepresentationIdentifier) { e->setArgument(1,(*v2_RepresentationIdentifier)); } else { e->setArgument(1); } if (v3_RepresentationType) { e->setArgument(2,(*v3_RepresentationType)); } else { e->setArgument(2); } e->setArgument(3,(v4_Items)->generalize()); entity = e; EntityBuffer::Add(this); }
+IfcStyledRepresentation::IfcStyledRepresentation(IfcAbstractEntity* e) : IfcStyleModel((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcStyledRepresentation)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcStyledRepresentation::IfcStyledRepresentation(IfcRepresentationContext* v1_ContextOfItems, boost::optional< std::string > v2_RepresentationIdentifier, boost::optional< std::string > v3_RepresentationType, IfcTemplatedEntityList< IfcRepresentationItem >::ptr v4_Items) : IfcStyleModel((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_ContextOfItems)); if (v2_RepresentationIdentifier) { e->setArgument(1,(*v2_RepresentationIdentifier)); } else { e->setArgument(1); } if (v3_RepresentationType) { e->setArgument(2,(*v3_RepresentationType)); } else { e->setArgument(2); } e->setArgument(3,(v4_Items)->generalize()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcSubContractResource
-bool IfcSubContractResource::hasPredefinedType() { return !entity->getArgument(10)->isNull(); }
-IfcSubContractResourceTypeEnum::IfcSubContractResourceTypeEnum IfcSubContractResource::PredefinedType() { return IfcSubContractResourceTypeEnum::FromString(*entity->getArgument(10)); }
+bool IfcSubContractResource::hasPredefinedType() const { return !entity->getArgument(10)->isNull(); }
+IfcSubContractResourceTypeEnum::IfcSubContractResourceTypeEnum IfcSubContractResource::PredefinedType() const { return IfcSubContractResourceTypeEnum::FromString(*entity->getArgument(10)); }
 void IfcSubContractResource::setPredefinedType(IfcSubContractResourceTypeEnum::IfcSubContractResourceTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v,IfcSubContractResourceTypeEnum::ToString(v)); }
 bool IfcSubContractResource::is(Type::Enum v) const { return v == Type::IfcSubContractResource || IfcConstructionResource::is(v); }
 Type::Enum IfcSubContractResource::type() const { return Type::IfcSubContractResource; }
 Type::Enum IfcSubContractResource::Class() { return Type::IfcSubContractResource; }
-IfcSubContractResource::IfcSubContractResource(IfcAbstractEntityPtr e) : IfcConstructionResource((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcSubContractResource)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcSubContractResource::IfcSubContractResource(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, boost::optional< IfcIdentifier > v6_Identification, boost::optional< IfcText > v7_LongDescription, IfcResourceTime* v8_Usage, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcAppliedValue > > > v9_BaseCosts, IfcPhysicalQuantity* v10_BaseQuantity, boost::optional< IfcSubContractResourceTypeEnum::IfcSubContractResourceTypeEnum > v11_PredefinedType) : IfcConstructionResource((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } if (v6_Identification) { e->setArgument(5,(*v6_Identification)); } else { e->setArgument(5); } if (v7_LongDescription) { e->setArgument(6,(*v7_LongDescription)); } else { e->setArgument(6); } e->setArgument(7,(v8_Usage)); if (v9_BaseCosts) { e->setArgument(8,(*v9_BaseCosts)->generalize()); } else { e->setArgument(8); } e->setArgument(9,(v10_BaseQuantity)); if (v11_PredefinedType) { e->setArgument(10,*v11_PredefinedType,IfcSubContractResourceTypeEnum::ToString(*v11_PredefinedType)); } else { e->setArgument(10); } entity = e; EntityBuffer::Add(this); }
+IfcSubContractResource::IfcSubContractResource(IfcAbstractEntity* e) : IfcConstructionResource((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcSubContractResource)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcSubContractResource::IfcSubContractResource(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, boost::optional< std::string > v6_Identification, boost::optional< std::string > v7_LongDescription, IfcResourceTime* v8_Usage, boost::optional< IfcTemplatedEntityList< IfcAppliedValue >::ptr > v9_BaseCosts, IfcPhysicalQuantity* v10_BaseQuantity, boost::optional< IfcSubContractResourceTypeEnum::IfcSubContractResourceTypeEnum > v11_PredefinedType) : IfcConstructionResource((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } if (v6_Identification) { e->setArgument(5,(*v6_Identification)); } else { e->setArgument(5); } if (v7_LongDescription) { e->setArgument(6,(*v7_LongDescription)); } else { e->setArgument(6); } e->setArgument(7,(v8_Usage)); if (v9_BaseCosts) { e->setArgument(8,(*v9_BaseCosts)->generalize()); } else { e->setArgument(8); } e->setArgument(9,(v10_BaseQuantity)); if (v11_PredefinedType) { e->setArgument(10,*v11_PredefinedType,IfcSubContractResourceTypeEnum::ToString(*v11_PredefinedType)); } else { e->setArgument(10); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcSubContractResourceType
-IfcSubContractResourceTypeEnum::IfcSubContractResourceTypeEnum IfcSubContractResourceType::PredefinedType() { return IfcSubContractResourceTypeEnum::FromString(*entity->getArgument(11)); }
+IfcSubContractResourceTypeEnum::IfcSubContractResourceTypeEnum IfcSubContractResourceType::PredefinedType() const { return IfcSubContractResourceTypeEnum::FromString(*entity->getArgument(11)); }
 void IfcSubContractResourceType::setPredefinedType(IfcSubContractResourceTypeEnum::IfcSubContractResourceTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(11,v,IfcSubContractResourceTypeEnum::ToString(v)); }
 bool IfcSubContractResourceType::is(Type::Enum v) const { return v == Type::IfcSubContractResourceType || IfcConstructionResourceType::is(v); }
 Type::Enum IfcSubContractResourceType::type() const { return Type::IfcSubContractResourceType; }
 Type::Enum IfcSubContractResourceType::Class() { return Type::IfcSubContractResourceType; }
-IfcSubContractResourceType::IfcSubContractResourceType(IfcAbstractEntityPtr e) : IfcConstructionResourceType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcSubContractResourceType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcSubContractResourceType::IfcSubContractResourceType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< IfcIdentifier > v7_Identification, boost::optional< IfcText > v8_LongDescription, boost::optional< IfcLabel > v9_ResourceType, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcAppliedValue > > > v10_BaseCosts, IfcPhysicalQuantity* v11_BaseQuantity, IfcSubContractResourceTypeEnum::IfcSubContractResourceTypeEnum v12_PredefinedType) : IfcConstructionResourceType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_Identification) { e->setArgument(6,(*v7_Identification)); } else { e->setArgument(6); } if (v8_LongDescription) { e->setArgument(7,(*v8_LongDescription)); } else { e->setArgument(7); } if (v9_ResourceType) { e->setArgument(8,(*v9_ResourceType)); } else { e->setArgument(8); } if (v10_BaseCosts) { e->setArgument(9,(*v10_BaseCosts)->generalize()); } else { e->setArgument(9); } e->setArgument(10,(v11_BaseQuantity)); e->setArgument(11,v12_PredefinedType,IfcSubContractResourceTypeEnum::ToString(v12_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcSubContractResourceType::IfcSubContractResourceType(IfcAbstractEntity* e) : IfcConstructionResourceType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcSubContractResourceType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcSubContractResourceType::IfcSubContractResourceType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< std::string > v7_Identification, boost::optional< std::string > v8_LongDescription, boost::optional< std::string > v9_ResourceType, boost::optional< IfcTemplatedEntityList< IfcAppliedValue >::ptr > v10_BaseCosts, IfcPhysicalQuantity* v11_BaseQuantity, IfcSubContractResourceTypeEnum::IfcSubContractResourceTypeEnum v12_PredefinedType) : IfcConstructionResourceType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_Identification) { e->setArgument(6,(*v7_Identification)); } else { e->setArgument(6); } if (v8_LongDescription) { e->setArgument(7,(*v8_LongDescription)); } else { e->setArgument(7); } if (v9_ResourceType) { e->setArgument(8,(*v9_ResourceType)); } else { e->setArgument(8); } if (v10_BaseCosts) { e->setArgument(9,(*v10_BaseCosts)->generalize()); } else { e->setArgument(9); } e->setArgument(10,(v11_BaseQuantity)); e->setArgument(11,v12_PredefinedType,IfcSubContractResourceTypeEnum::ToString(v12_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcSubedge
-IfcEdge* IfcSubedge::ParentEdge() { return (IfcEdge*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(2))); }
+IfcEdge* IfcSubedge::ParentEdge() const { return (IfcEdge*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(2))); }
 void IfcSubedge::setParentEdge(IfcEdge* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
 bool IfcSubedge::is(Type::Enum v) const { return v == Type::IfcSubedge || IfcEdge::is(v); }
 Type::Enum IfcSubedge::type() const { return Type::IfcSubedge; }
 Type::Enum IfcSubedge::Class() { return Type::IfcSubedge; }
-IfcSubedge::IfcSubedge(IfcAbstractEntityPtr e) : IfcEdge((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcSubedge)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcSubedge::IfcSubedge(IfcVertex* v1_EdgeStart, IfcVertex* v2_EdgeEnd, IfcEdge* v3_ParentEdge) : IfcEdge((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_EdgeStart)); e->setArgument(1,(v2_EdgeEnd)); e->setArgument(2,(v3_ParentEdge)); entity = e; EntityBuffer::Add(this); }
+IfcSubedge::IfcSubedge(IfcAbstractEntity* e) : IfcEdge((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcSubedge)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcSubedge::IfcSubedge(IfcVertex* v1_EdgeStart, IfcVertex* v2_EdgeEnd, IfcEdge* v3_ParentEdge) : IfcEdge((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_EdgeStart)); e->setArgument(1,(v2_EdgeEnd)); e->setArgument(2,(v3_ParentEdge)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcSurface
 bool IfcSurface::is(Type::Enum v) const { return v == Type::IfcSurface || IfcGeometricRepresentationItem::is(v); }
 Type::Enum IfcSurface::type() const { return Type::IfcSurface; }
 Type::Enum IfcSurface::Class() { return Type::IfcSurface; }
-IfcSurface::IfcSurface(IfcAbstractEntityPtr e) : IfcGeometricRepresentationItem((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcSurface)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcSurface::IfcSurface() : IfcGeometricRepresentationItem((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); entity = e; EntityBuffer::Add(this); }
+IfcSurface::IfcSurface(IfcAbstractEntity* e) : IfcGeometricRepresentationItem((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcSurface)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcSurface::IfcSurface() : IfcGeometricRepresentationItem((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcSurfaceCurveSweptAreaSolid
-IfcCurve* IfcSurfaceCurveSweptAreaSolid::Directrix() { return (IfcCurve*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(2))); }
+IfcCurve* IfcSurfaceCurveSweptAreaSolid::Directrix() const { return (IfcCurve*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(2))); }
 void IfcSurfaceCurveSweptAreaSolid::setDirectrix(IfcCurve* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-bool IfcSurfaceCurveSweptAreaSolid::hasStartParam() { return !entity->getArgument(3)->isNull(); }
-IfcParameterValue IfcSurfaceCurveSweptAreaSolid::StartParam() { return *entity->getArgument(3); }
-void IfcSurfaceCurveSweptAreaSolid::setStartParam(IfcParameterValue v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-bool IfcSurfaceCurveSweptAreaSolid::hasEndParam() { return !entity->getArgument(4)->isNull(); }
-IfcParameterValue IfcSurfaceCurveSweptAreaSolid::EndParam() { return *entity->getArgument(4); }
-void IfcSurfaceCurveSweptAreaSolid::setEndParam(IfcParameterValue v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-IfcSurface* IfcSurfaceCurveSweptAreaSolid::ReferenceSurface() { return (IfcSurface*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(5))); }
+bool IfcSurfaceCurveSweptAreaSolid::hasStartParam() const { return !entity->getArgument(3)->isNull(); }
+double IfcSurfaceCurveSweptAreaSolid::StartParam() const { return *entity->getArgument(3); }
+void IfcSurfaceCurveSweptAreaSolid::setStartParam(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+bool IfcSurfaceCurveSweptAreaSolid::hasEndParam() const { return !entity->getArgument(4)->isNull(); }
+double IfcSurfaceCurveSweptAreaSolid::EndParam() const { return *entity->getArgument(4); }
+void IfcSurfaceCurveSweptAreaSolid::setEndParam(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+IfcSurface* IfcSurfaceCurveSweptAreaSolid::ReferenceSurface() const { return (IfcSurface*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(5))); }
 void IfcSurfaceCurveSweptAreaSolid::setReferenceSurface(IfcSurface* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
 bool IfcSurfaceCurveSweptAreaSolid::is(Type::Enum v) const { return v == Type::IfcSurfaceCurveSweptAreaSolid || IfcSweptAreaSolid::is(v); }
 Type::Enum IfcSurfaceCurveSweptAreaSolid::type() const { return Type::IfcSurfaceCurveSweptAreaSolid; }
 Type::Enum IfcSurfaceCurveSweptAreaSolid::Class() { return Type::IfcSurfaceCurveSweptAreaSolid; }
-IfcSurfaceCurveSweptAreaSolid::IfcSurfaceCurveSweptAreaSolid(IfcAbstractEntityPtr e) : IfcSweptAreaSolid((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcSurfaceCurveSweptAreaSolid)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcSurfaceCurveSweptAreaSolid::IfcSurfaceCurveSweptAreaSolid(IfcProfileDef* v1_SweptArea, IfcAxis2Placement3D* v2_Position, IfcCurve* v3_Directrix, boost::optional< IfcParameterValue > v4_StartParam, boost::optional< IfcParameterValue > v5_EndParam, IfcSurface* v6_ReferenceSurface) : IfcSweptAreaSolid((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_SweptArea)); e->setArgument(1,(v2_Position)); e->setArgument(2,(v3_Directrix)); if (v4_StartParam) { e->setArgument(3,(*v4_StartParam)); } else { e->setArgument(3); } if (v5_EndParam) { e->setArgument(4,(*v5_EndParam)); } else { e->setArgument(4); } e->setArgument(5,(v6_ReferenceSurface)); entity = e; EntityBuffer::Add(this); }
+IfcSurfaceCurveSweptAreaSolid::IfcSurfaceCurveSweptAreaSolid(IfcAbstractEntity* e) : IfcSweptAreaSolid((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcSurfaceCurveSweptAreaSolid)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcSurfaceCurveSweptAreaSolid::IfcSurfaceCurveSweptAreaSolid(IfcProfileDef* v1_SweptArea, IfcAxis2Placement3D* v2_Position, IfcCurve* v3_Directrix, boost::optional< double > v4_StartParam, boost::optional< double > v5_EndParam, IfcSurface* v6_ReferenceSurface) : IfcSweptAreaSolid((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_SweptArea)); e->setArgument(1,(v2_Position)); e->setArgument(2,(v3_Directrix)); if (v4_StartParam) { e->setArgument(3,(*v4_StartParam)); } else { e->setArgument(3); } if (v5_EndParam) { e->setArgument(4,(*v5_EndParam)); } else { e->setArgument(4); } e->setArgument(5,(v6_ReferenceSurface)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcSurfaceFeature
-bool IfcSurfaceFeature::hasPredefinedType() { return !entity->getArgument(8)->isNull(); }
-IfcSurfaceFeatureTypeEnum::IfcSurfaceFeatureTypeEnum IfcSurfaceFeature::PredefinedType() { return IfcSurfaceFeatureTypeEnum::FromString(*entity->getArgument(8)); }
+bool IfcSurfaceFeature::hasPredefinedType() const { return !entity->getArgument(8)->isNull(); }
+IfcSurfaceFeatureTypeEnum::IfcSurfaceFeatureTypeEnum IfcSurfaceFeature::PredefinedType() const { return IfcSurfaceFeatureTypeEnum::FromString(*entity->getArgument(8)); }
 void IfcSurfaceFeature::setPredefinedType(IfcSurfaceFeatureTypeEnum::IfcSurfaceFeatureTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcSurfaceFeatureTypeEnum::ToString(v)); }
 bool IfcSurfaceFeature::is(Type::Enum v) const { return v == Type::IfcSurfaceFeature || IfcFeatureElement::is(v); }
 Type::Enum IfcSurfaceFeature::type() const { return Type::IfcSurfaceFeature; }
 Type::Enum IfcSurfaceFeature::Class() { return Type::IfcSurfaceFeature; }
-IfcSurfaceFeature::IfcSurfaceFeature(IfcAbstractEntityPtr e) : IfcFeatureElement((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcSurfaceFeature)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcSurfaceFeature::IfcSurfaceFeature(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcSurfaceFeatureTypeEnum::IfcSurfaceFeatureTypeEnum > v9_PredefinedType) : IfcFeatureElement((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcSurfaceFeatureTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcSurfaceFeature::IfcSurfaceFeature(IfcAbstractEntity* e) : IfcFeatureElement((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcSurfaceFeature)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcSurfaceFeature::IfcSurfaceFeature(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcSurfaceFeatureTypeEnum::IfcSurfaceFeatureTypeEnum > v9_PredefinedType) : IfcFeatureElement((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcSurfaceFeatureTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcSurfaceOfLinearExtrusion
-IfcDirection* IfcSurfaceOfLinearExtrusion::ExtrudedDirection() { return (IfcDirection*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(2))); }
+IfcDirection* IfcSurfaceOfLinearExtrusion::ExtrudedDirection() const { return (IfcDirection*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(2))); }
 void IfcSurfaceOfLinearExtrusion::setExtrudedDirection(IfcDirection* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-IfcLengthMeasure IfcSurfaceOfLinearExtrusion::Depth() { return *entity->getArgument(3); }
-void IfcSurfaceOfLinearExtrusion::setDepth(IfcLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+double IfcSurfaceOfLinearExtrusion::Depth() const { return *entity->getArgument(3); }
+void IfcSurfaceOfLinearExtrusion::setDepth(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
 bool IfcSurfaceOfLinearExtrusion::is(Type::Enum v) const { return v == Type::IfcSurfaceOfLinearExtrusion || IfcSweptSurface::is(v); }
 Type::Enum IfcSurfaceOfLinearExtrusion::type() const { return Type::IfcSurfaceOfLinearExtrusion; }
 Type::Enum IfcSurfaceOfLinearExtrusion::Class() { return Type::IfcSurfaceOfLinearExtrusion; }
-IfcSurfaceOfLinearExtrusion::IfcSurfaceOfLinearExtrusion(IfcAbstractEntityPtr e) : IfcSweptSurface((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcSurfaceOfLinearExtrusion)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcSurfaceOfLinearExtrusion::IfcSurfaceOfLinearExtrusion(IfcProfileDef* v1_SweptCurve, IfcAxis2Placement3D* v2_Position, IfcDirection* v3_ExtrudedDirection, IfcLengthMeasure v4_Depth) : IfcSweptSurface((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_SweptCurve)); e->setArgument(1,(v2_Position)); e->setArgument(2,(v3_ExtrudedDirection)); e->setArgument(3,(v4_Depth)); entity = e; EntityBuffer::Add(this); }
+IfcSurfaceOfLinearExtrusion::IfcSurfaceOfLinearExtrusion(IfcAbstractEntity* e) : IfcSweptSurface((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcSurfaceOfLinearExtrusion)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcSurfaceOfLinearExtrusion::IfcSurfaceOfLinearExtrusion(IfcProfileDef* v1_SweptCurve, IfcAxis2Placement3D* v2_Position, IfcDirection* v3_ExtrudedDirection, double v4_Depth) : IfcSweptSurface((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_SweptCurve)); e->setArgument(1,(v2_Position)); e->setArgument(2,(v3_ExtrudedDirection)); e->setArgument(3,(v4_Depth)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcSurfaceOfRevolution
-IfcAxis1Placement* IfcSurfaceOfRevolution::AxisPosition() { return (IfcAxis1Placement*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(2))); }
+IfcAxis1Placement* IfcSurfaceOfRevolution::AxisPosition() const { return (IfcAxis1Placement*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(2))); }
 void IfcSurfaceOfRevolution::setAxisPosition(IfcAxis1Placement* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
 bool IfcSurfaceOfRevolution::is(Type::Enum v) const { return v == Type::IfcSurfaceOfRevolution || IfcSweptSurface::is(v); }
 Type::Enum IfcSurfaceOfRevolution::type() const { return Type::IfcSurfaceOfRevolution; }
 Type::Enum IfcSurfaceOfRevolution::Class() { return Type::IfcSurfaceOfRevolution; }
-IfcSurfaceOfRevolution::IfcSurfaceOfRevolution(IfcAbstractEntityPtr e) : IfcSweptSurface((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcSurfaceOfRevolution)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcSurfaceOfRevolution::IfcSurfaceOfRevolution(IfcProfileDef* v1_SweptCurve, IfcAxis2Placement3D* v2_Position, IfcAxis1Placement* v3_AxisPosition) : IfcSweptSurface((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_SweptCurve)); e->setArgument(1,(v2_Position)); e->setArgument(2,(v3_AxisPosition)); entity = e; EntityBuffer::Add(this); }
+IfcSurfaceOfRevolution::IfcSurfaceOfRevolution(IfcAbstractEntity* e) : IfcSweptSurface((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcSurfaceOfRevolution)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcSurfaceOfRevolution::IfcSurfaceOfRevolution(IfcProfileDef* v1_SweptCurve, IfcAxis2Placement3D* v2_Position, IfcAxis1Placement* v3_AxisPosition) : IfcSweptSurface((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_SweptCurve)); e->setArgument(1,(v2_Position)); e->setArgument(2,(v3_AxisPosition)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcSurfaceReinforcementArea
-bool IfcSurfaceReinforcementArea::hasSurfaceReinforcement1() { return !entity->getArgument(1)->isNull(); }
-std::vector< IfcLengthMeasure > /*[2:3]*/ IfcSurfaceReinforcementArea::SurfaceReinforcement1() { return *entity->getArgument(1); }
-void IfcSurfaceReinforcementArea::setSurfaceReinforcement1(std::vector< IfcLengthMeasure > /*[2:3]*/ v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-bool IfcSurfaceReinforcementArea::hasSurfaceReinforcement2() { return !entity->getArgument(2)->isNull(); }
-std::vector< IfcLengthMeasure > /*[2:3]*/ IfcSurfaceReinforcementArea::SurfaceReinforcement2() { return *entity->getArgument(2); }
-void IfcSurfaceReinforcementArea::setSurfaceReinforcement2(std::vector< IfcLengthMeasure > /*[2:3]*/ v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-bool IfcSurfaceReinforcementArea::hasShearReinforcement() { return !entity->getArgument(3)->isNull(); }
-IfcRatioMeasure IfcSurfaceReinforcementArea::ShearReinforcement() { return *entity->getArgument(3); }
-void IfcSurfaceReinforcementArea::setShearReinforcement(IfcRatioMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+bool IfcSurfaceReinforcementArea::hasSurfaceReinforcement1() const { return !entity->getArgument(1)->isNull(); }
+std::vector< double > /*[2:3]*/ IfcSurfaceReinforcementArea::SurfaceReinforcement1() const { return *entity->getArgument(1); }
+void IfcSurfaceReinforcementArea::setSurfaceReinforcement1(std::vector< double > /*[2:3]*/ v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+bool IfcSurfaceReinforcementArea::hasSurfaceReinforcement2() const { return !entity->getArgument(2)->isNull(); }
+std::vector< double > /*[2:3]*/ IfcSurfaceReinforcementArea::SurfaceReinforcement2() const { return *entity->getArgument(2); }
+void IfcSurfaceReinforcementArea::setSurfaceReinforcement2(std::vector< double > /*[2:3]*/ v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+bool IfcSurfaceReinforcementArea::hasShearReinforcement() const { return !entity->getArgument(3)->isNull(); }
+double IfcSurfaceReinforcementArea::ShearReinforcement() const { return *entity->getArgument(3); }
+void IfcSurfaceReinforcementArea::setShearReinforcement(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
 bool IfcSurfaceReinforcementArea::is(Type::Enum v) const { return v == Type::IfcSurfaceReinforcementArea || IfcStructuralLoadOrResult::is(v); }
 Type::Enum IfcSurfaceReinforcementArea::type() const { return Type::IfcSurfaceReinforcementArea; }
 Type::Enum IfcSurfaceReinforcementArea::Class() { return Type::IfcSurfaceReinforcementArea; }
-IfcSurfaceReinforcementArea::IfcSurfaceReinforcementArea(IfcAbstractEntityPtr e) : IfcStructuralLoadOrResult((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcSurfaceReinforcementArea)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcSurfaceReinforcementArea::IfcSurfaceReinforcementArea(boost::optional< IfcLabel > v1_Name, boost::optional< std::vector< IfcLengthMeasure > /*[2:3]*/ > v2_SurfaceReinforcement1, boost::optional< std::vector< IfcLengthMeasure > /*[2:3]*/ > v3_SurfaceReinforcement2, boost::optional< IfcRatioMeasure > v4_ShearReinforcement) : IfcStructuralLoadOrResult((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_SurfaceReinforcement1) { e->setArgument(1,(*v2_SurfaceReinforcement1)); } else { e->setArgument(1); } if (v3_SurfaceReinforcement2) { e->setArgument(2,(*v3_SurfaceReinforcement2)); } else { e->setArgument(2); } if (v4_ShearReinforcement) { e->setArgument(3,(*v4_ShearReinforcement)); } else { e->setArgument(3); } entity = e; EntityBuffer::Add(this); }
+IfcSurfaceReinforcementArea::IfcSurfaceReinforcementArea(IfcAbstractEntity* e) : IfcStructuralLoadOrResult((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcSurfaceReinforcementArea)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcSurfaceReinforcementArea::IfcSurfaceReinforcementArea(boost::optional< std::string > v1_Name, boost::optional< std::vector< double > /*[2:3]*/ > v2_SurfaceReinforcement1, boost::optional< std::vector< double > /*[2:3]*/ > v3_SurfaceReinforcement2, boost::optional< double > v4_ShearReinforcement) : IfcStructuralLoadOrResult((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_SurfaceReinforcement1) { e->setArgument(1,(*v2_SurfaceReinforcement1)); } else { e->setArgument(1); } if (v3_SurfaceReinforcement2) { e->setArgument(2,(*v3_SurfaceReinforcement2)); } else { e->setArgument(2); } if (v4_ShearReinforcement) { e->setArgument(3,(*v4_ShearReinforcement)); } else { e->setArgument(3); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcSurfaceStyle
-IfcSurfaceSide::IfcSurfaceSide IfcSurfaceStyle::Side() { return IfcSurfaceSide::FromString(*entity->getArgument(1)); }
+IfcSurfaceSide::IfcSurfaceSide IfcSurfaceStyle::Side() const { return IfcSurfaceSide::FromString(*entity->getArgument(1)); }
 void IfcSurfaceStyle::setSide(IfcSurfaceSide::IfcSurfaceSide v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v,IfcSurfaceSide::ToString(v)); }
-SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > IfcSurfaceStyle::Styles() { RETURN_AS_LIST(IfcUtil::IfcAbstractSelect,2) }
-void IfcSurfaceStyle::setStyles(SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v->generalize()); }
+IfcEntityList::ptr IfcSurfaceStyle::Styles() const { return *entity->getArgument(2); }
+void IfcSurfaceStyle::setStyles(IfcEntityList::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
 bool IfcSurfaceStyle::is(Type::Enum v) const { return v == Type::IfcSurfaceStyle || IfcPresentationStyle::is(v); }
 Type::Enum IfcSurfaceStyle::type() const { return Type::IfcSurfaceStyle; }
 Type::Enum IfcSurfaceStyle::Class() { return Type::IfcSurfaceStyle; }
-IfcSurfaceStyle::IfcSurfaceStyle(IfcAbstractEntityPtr e) : IfcPresentationStyle((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcSurfaceStyle)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcSurfaceStyle::IfcSurfaceStyle(boost::optional< IfcLabel > v1_Name, IfcSurfaceSide::IfcSurfaceSide v2_Side, IfcEntities v3_Styles) : IfcPresentationStyle((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } e->setArgument(1,v2_Side,IfcSurfaceSide::ToString(v2_Side)); e->setArgument(2,(v3_Styles)); entity = e; EntityBuffer::Add(this); }
+IfcSurfaceStyle::IfcSurfaceStyle(IfcAbstractEntity* e) : IfcPresentationStyle((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcSurfaceStyle)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcSurfaceStyle::IfcSurfaceStyle(boost::optional< std::string > v1_Name, IfcSurfaceSide::IfcSurfaceSide v2_Side, IfcEntityList::ptr v3_Styles) : IfcPresentationStyle((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } e->setArgument(1,v2_Side,IfcSurfaceSide::ToString(v2_Side)); e->setArgument(2,(v3_Styles)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcSurfaceStyleLighting
-IfcColourRgb* IfcSurfaceStyleLighting::DiffuseTransmissionColour() { return (IfcColourRgb*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(0))); }
+IfcColourRgb* IfcSurfaceStyleLighting::DiffuseTransmissionColour() const { return (IfcColourRgb*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(0))); }
 void IfcSurfaceStyleLighting::setDiffuseTransmissionColour(IfcColourRgb* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-IfcColourRgb* IfcSurfaceStyleLighting::DiffuseReflectionColour() { return (IfcColourRgb*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(1))); }
+IfcColourRgb* IfcSurfaceStyleLighting::DiffuseReflectionColour() const { return (IfcColourRgb*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(1))); }
 void IfcSurfaceStyleLighting::setDiffuseReflectionColour(IfcColourRgb* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-IfcColourRgb* IfcSurfaceStyleLighting::TransmissionColour() { return (IfcColourRgb*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(2))); }
+IfcColourRgb* IfcSurfaceStyleLighting::TransmissionColour() const { return (IfcColourRgb*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(2))); }
 void IfcSurfaceStyleLighting::setTransmissionColour(IfcColourRgb* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-IfcColourRgb* IfcSurfaceStyleLighting::ReflectanceColour() { return (IfcColourRgb*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(3))); }
+IfcColourRgb* IfcSurfaceStyleLighting::ReflectanceColour() const { return (IfcColourRgb*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(3))); }
 void IfcSurfaceStyleLighting::setReflectanceColour(IfcColourRgb* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
 bool IfcSurfaceStyleLighting::is(Type::Enum v) const { return v == Type::IfcSurfaceStyleLighting || IfcPresentationItem::is(v); }
 Type::Enum IfcSurfaceStyleLighting::type() const { return Type::IfcSurfaceStyleLighting; }
 Type::Enum IfcSurfaceStyleLighting::Class() { return Type::IfcSurfaceStyleLighting; }
-IfcSurfaceStyleLighting::IfcSurfaceStyleLighting(IfcAbstractEntityPtr e) : IfcPresentationItem((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcSurfaceStyleLighting)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcSurfaceStyleLighting::IfcSurfaceStyleLighting(IfcColourRgb* v1_DiffuseTransmissionColour, IfcColourRgb* v2_DiffuseReflectionColour, IfcColourRgb* v3_TransmissionColour, IfcColourRgb* v4_ReflectanceColour) : IfcPresentationItem((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_DiffuseTransmissionColour)); e->setArgument(1,(v2_DiffuseReflectionColour)); e->setArgument(2,(v3_TransmissionColour)); e->setArgument(3,(v4_ReflectanceColour)); entity = e; EntityBuffer::Add(this); }
+IfcSurfaceStyleLighting::IfcSurfaceStyleLighting(IfcAbstractEntity* e) : IfcPresentationItem((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcSurfaceStyleLighting)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcSurfaceStyleLighting::IfcSurfaceStyleLighting(IfcColourRgb* v1_DiffuseTransmissionColour, IfcColourRgb* v2_DiffuseReflectionColour, IfcColourRgb* v3_TransmissionColour, IfcColourRgb* v4_ReflectanceColour) : IfcPresentationItem((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_DiffuseTransmissionColour)); e->setArgument(1,(v2_DiffuseReflectionColour)); e->setArgument(2,(v3_TransmissionColour)); e->setArgument(3,(v4_ReflectanceColour)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcSurfaceStyleRefraction
-bool IfcSurfaceStyleRefraction::hasRefractionIndex() { return !entity->getArgument(0)->isNull(); }
-IfcReal IfcSurfaceStyleRefraction::RefractionIndex() { return *entity->getArgument(0); }
-void IfcSurfaceStyleRefraction::setRefractionIndex(IfcReal v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-bool IfcSurfaceStyleRefraction::hasDispersionFactor() { return !entity->getArgument(1)->isNull(); }
-IfcReal IfcSurfaceStyleRefraction::DispersionFactor() { return *entity->getArgument(1); }
-void IfcSurfaceStyleRefraction::setDispersionFactor(IfcReal v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+bool IfcSurfaceStyleRefraction::hasRefractionIndex() const { return !entity->getArgument(0)->isNull(); }
+double IfcSurfaceStyleRefraction::RefractionIndex() const { return *entity->getArgument(0); }
+void IfcSurfaceStyleRefraction::setRefractionIndex(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+bool IfcSurfaceStyleRefraction::hasDispersionFactor() const { return !entity->getArgument(1)->isNull(); }
+double IfcSurfaceStyleRefraction::DispersionFactor() const { return *entity->getArgument(1); }
+void IfcSurfaceStyleRefraction::setDispersionFactor(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
 bool IfcSurfaceStyleRefraction::is(Type::Enum v) const { return v == Type::IfcSurfaceStyleRefraction || IfcPresentationItem::is(v); }
 Type::Enum IfcSurfaceStyleRefraction::type() const { return Type::IfcSurfaceStyleRefraction; }
 Type::Enum IfcSurfaceStyleRefraction::Class() { return Type::IfcSurfaceStyleRefraction; }
-IfcSurfaceStyleRefraction::IfcSurfaceStyleRefraction(IfcAbstractEntityPtr e) : IfcPresentationItem((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcSurfaceStyleRefraction)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcSurfaceStyleRefraction::IfcSurfaceStyleRefraction(boost::optional< IfcReal > v1_RefractionIndex, boost::optional< IfcReal > v2_DispersionFactor) : IfcPresentationItem((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_RefractionIndex) { e->setArgument(0,(*v1_RefractionIndex)); } else { e->setArgument(0); } if (v2_DispersionFactor) { e->setArgument(1,(*v2_DispersionFactor)); } else { e->setArgument(1); } entity = e; EntityBuffer::Add(this); }
+IfcSurfaceStyleRefraction::IfcSurfaceStyleRefraction(IfcAbstractEntity* e) : IfcPresentationItem((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcSurfaceStyleRefraction)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcSurfaceStyleRefraction::IfcSurfaceStyleRefraction(boost::optional< double > v1_RefractionIndex, boost::optional< double > v2_DispersionFactor) : IfcPresentationItem((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_RefractionIndex) { e->setArgument(0,(*v1_RefractionIndex)); } else { e->setArgument(0); } if (v2_DispersionFactor) { e->setArgument(1,(*v2_DispersionFactor)); } else { e->setArgument(1); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcSurfaceStyleRendering
-bool IfcSurfaceStyleRendering::hasTransparency() { return !entity->getArgument(1)->isNull(); }
-IfcNormalisedRatioMeasure IfcSurfaceStyleRendering::Transparency() { return *entity->getArgument(1); }
-void IfcSurfaceStyleRendering::setTransparency(IfcNormalisedRatioMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-bool IfcSurfaceStyleRendering::hasDiffuseColour() { return !entity->getArgument(2)->isNull(); }
-IfcColourOrFactor IfcSurfaceStyleRendering::DiffuseColour() { return *entity->getArgument(2); }
-void IfcSurfaceStyleRendering::setDiffuseColour(IfcColourOrFactor v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-bool IfcSurfaceStyleRendering::hasTransmissionColour() { return !entity->getArgument(3)->isNull(); }
-IfcColourOrFactor IfcSurfaceStyleRendering::TransmissionColour() { return *entity->getArgument(3); }
-void IfcSurfaceStyleRendering::setTransmissionColour(IfcColourOrFactor v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-bool IfcSurfaceStyleRendering::hasDiffuseTransmissionColour() { return !entity->getArgument(4)->isNull(); }
-IfcColourOrFactor IfcSurfaceStyleRendering::DiffuseTransmissionColour() { return *entity->getArgument(4); }
-void IfcSurfaceStyleRendering::setDiffuseTransmissionColour(IfcColourOrFactor v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-bool IfcSurfaceStyleRendering::hasReflectionColour() { return !entity->getArgument(5)->isNull(); }
-IfcColourOrFactor IfcSurfaceStyleRendering::ReflectionColour() { return *entity->getArgument(5); }
-void IfcSurfaceStyleRendering::setReflectionColour(IfcColourOrFactor v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-bool IfcSurfaceStyleRendering::hasSpecularColour() { return !entity->getArgument(6)->isNull(); }
-IfcColourOrFactor IfcSurfaceStyleRendering::SpecularColour() { return *entity->getArgument(6); }
-void IfcSurfaceStyleRendering::setSpecularColour(IfcColourOrFactor v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
-bool IfcSurfaceStyleRendering::hasSpecularHighlight() { return !entity->getArgument(7)->isNull(); }
-IfcSpecularHighlightSelect IfcSurfaceStyleRendering::SpecularHighlight() { return *entity->getArgument(7); }
-void IfcSurfaceStyleRendering::setSpecularHighlight(IfcSpecularHighlightSelect v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
-IfcReflectanceMethodEnum::IfcReflectanceMethodEnum IfcSurfaceStyleRendering::ReflectanceMethod() { return IfcReflectanceMethodEnum::FromString(*entity->getArgument(8)); }
+bool IfcSurfaceStyleRendering::hasTransparency() const { return !entity->getArgument(1)->isNull(); }
+double IfcSurfaceStyleRendering::Transparency() const { return *entity->getArgument(1); }
+void IfcSurfaceStyleRendering::setTransparency(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+bool IfcSurfaceStyleRendering::hasDiffuseColour() const { return !entity->getArgument(2)->isNull(); }
+IfcColourOrFactor* IfcSurfaceStyleRendering::DiffuseColour() const { return (IfcColourOrFactor*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(2))); }
+void IfcSurfaceStyleRendering::setDiffuseColour(IfcColourOrFactor* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+bool IfcSurfaceStyleRendering::hasTransmissionColour() const { return !entity->getArgument(3)->isNull(); }
+IfcColourOrFactor* IfcSurfaceStyleRendering::TransmissionColour() const { return (IfcColourOrFactor*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(3))); }
+void IfcSurfaceStyleRendering::setTransmissionColour(IfcColourOrFactor* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+bool IfcSurfaceStyleRendering::hasDiffuseTransmissionColour() const { return !entity->getArgument(4)->isNull(); }
+IfcColourOrFactor* IfcSurfaceStyleRendering::DiffuseTransmissionColour() const { return (IfcColourOrFactor*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(4))); }
+void IfcSurfaceStyleRendering::setDiffuseTransmissionColour(IfcColourOrFactor* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+bool IfcSurfaceStyleRendering::hasReflectionColour() const { return !entity->getArgument(5)->isNull(); }
+IfcColourOrFactor* IfcSurfaceStyleRendering::ReflectionColour() const { return (IfcColourOrFactor*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(5))); }
+void IfcSurfaceStyleRendering::setReflectionColour(IfcColourOrFactor* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+bool IfcSurfaceStyleRendering::hasSpecularColour() const { return !entity->getArgument(6)->isNull(); }
+IfcColourOrFactor* IfcSurfaceStyleRendering::SpecularColour() const { return (IfcColourOrFactor*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(6))); }
+void IfcSurfaceStyleRendering::setSpecularColour(IfcColourOrFactor* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
+bool IfcSurfaceStyleRendering::hasSpecularHighlight() const { return !entity->getArgument(7)->isNull(); }
+IfcSpecularHighlightSelect* IfcSurfaceStyleRendering::SpecularHighlight() const { return (IfcSpecularHighlightSelect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(7))); }
+void IfcSurfaceStyleRendering::setSpecularHighlight(IfcSpecularHighlightSelect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
+IfcReflectanceMethodEnum::IfcReflectanceMethodEnum IfcSurfaceStyleRendering::ReflectanceMethod() const { return IfcReflectanceMethodEnum::FromString(*entity->getArgument(8)); }
 void IfcSurfaceStyleRendering::setReflectanceMethod(IfcReflectanceMethodEnum::IfcReflectanceMethodEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcReflectanceMethodEnum::ToString(v)); }
 bool IfcSurfaceStyleRendering::is(Type::Enum v) const { return v == Type::IfcSurfaceStyleRendering || IfcSurfaceStyleShading::is(v); }
 Type::Enum IfcSurfaceStyleRendering::type() const { return Type::IfcSurfaceStyleRendering; }
 Type::Enum IfcSurfaceStyleRendering::Class() { return Type::IfcSurfaceStyleRendering; }
-IfcSurfaceStyleRendering::IfcSurfaceStyleRendering(IfcAbstractEntityPtr e) : IfcSurfaceStyleShading((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcSurfaceStyleRendering)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcSurfaceStyleRendering::IfcSurfaceStyleRendering(IfcColourRgb* v1_SurfaceColour, boost::optional< IfcNormalisedRatioMeasure > v2_Transparency, boost::optional< IfcColourOrFactor > v3_DiffuseColour, boost::optional< IfcColourOrFactor > v4_TransmissionColour, boost::optional< IfcColourOrFactor > v5_DiffuseTransmissionColour, boost::optional< IfcColourOrFactor > v6_ReflectionColour, boost::optional< IfcColourOrFactor > v7_SpecularColour, boost::optional< IfcSpecularHighlightSelect > v8_SpecularHighlight, IfcReflectanceMethodEnum::IfcReflectanceMethodEnum v9_ReflectanceMethod) : IfcSurfaceStyleShading((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_SurfaceColour)); if (v2_Transparency) { e->setArgument(1,(*v2_Transparency)); } else { e->setArgument(1); } if (v3_DiffuseColour) { e->setArgument(2,(*v3_DiffuseColour)); } else { e->setArgument(2); } if (v4_TransmissionColour) { e->setArgument(3,(*v4_TransmissionColour)); } else { e->setArgument(3); } if (v5_DiffuseTransmissionColour) { e->setArgument(4,(*v5_DiffuseTransmissionColour)); } else { e->setArgument(4); } if (v6_ReflectionColour) { e->setArgument(5,(*v6_ReflectionColour)); } else { e->setArgument(5); } if (v7_SpecularColour) { e->setArgument(6,(*v7_SpecularColour)); } else { e->setArgument(6); } if (v8_SpecularHighlight) { e->setArgument(7,(*v8_SpecularHighlight)); } else { e->setArgument(7); } e->setArgument(8,v9_ReflectanceMethod,IfcReflectanceMethodEnum::ToString(v9_ReflectanceMethod)); entity = e; EntityBuffer::Add(this); }
+IfcSurfaceStyleRendering::IfcSurfaceStyleRendering(IfcAbstractEntity* e) : IfcSurfaceStyleShading((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcSurfaceStyleRendering)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcSurfaceStyleRendering::IfcSurfaceStyleRendering(IfcColourRgb* v1_SurfaceColour, boost::optional< double > v2_Transparency, IfcColourOrFactor* v3_DiffuseColour, IfcColourOrFactor* v4_TransmissionColour, IfcColourOrFactor* v5_DiffuseTransmissionColour, IfcColourOrFactor* v6_ReflectionColour, IfcColourOrFactor* v7_SpecularColour, IfcSpecularHighlightSelect* v8_SpecularHighlight, IfcReflectanceMethodEnum::IfcReflectanceMethodEnum v9_ReflectanceMethod) : IfcSurfaceStyleShading((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_SurfaceColour)); if (v2_Transparency) { e->setArgument(1,(*v2_Transparency)); } else { e->setArgument(1); } e->setArgument(2,(v3_DiffuseColour)); e->setArgument(3,(v4_TransmissionColour)); e->setArgument(4,(v5_DiffuseTransmissionColour)); e->setArgument(5,(v6_ReflectionColour)); e->setArgument(6,(v7_SpecularColour)); e->setArgument(7,(v8_SpecularHighlight)); e->setArgument(8,v9_ReflectanceMethod,IfcReflectanceMethodEnum::ToString(v9_ReflectanceMethod)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcSurfaceStyleShading
-IfcColourRgb* IfcSurfaceStyleShading::SurfaceColour() { return (IfcColourRgb*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(0))); }
+IfcColourRgb* IfcSurfaceStyleShading::SurfaceColour() const { return (IfcColourRgb*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(0))); }
 void IfcSurfaceStyleShading::setSurfaceColour(IfcColourRgb* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
 bool IfcSurfaceStyleShading::is(Type::Enum v) const { return v == Type::IfcSurfaceStyleShading || IfcPresentationItem::is(v); }
 Type::Enum IfcSurfaceStyleShading::type() const { return Type::IfcSurfaceStyleShading; }
 Type::Enum IfcSurfaceStyleShading::Class() { return Type::IfcSurfaceStyleShading; }
-IfcSurfaceStyleShading::IfcSurfaceStyleShading(IfcAbstractEntityPtr e) : IfcPresentationItem((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcSurfaceStyleShading)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcSurfaceStyleShading::IfcSurfaceStyleShading(IfcColourRgb* v1_SurfaceColour) : IfcPresentationItem((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_SurfaceColour)); entity = e; EntityBuffer::Add(this); }
+IfcSurfaceStyleShading::IfcSurfaceStyleShading(IfcAbstractEntity* e) : IfcPresentationItem((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcSurfaceStyleShading)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcSurfaceStyleShading::IfcSurfaceStyleShading(IfcColourRgb* v1_SurfaceColour) : IfcPresentationItem((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_SurfaceColour)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcSurfaceStyleWithTextures
-SHARED_PTR< IfcTemplatedEntityList< IfcSurfaceTexture > > IfcSurfaceStyleWithTextures::Textures() { RETURN_AS_LIST(IfcSurfaceTexture,0) }
-void IfcSurfaceStyleWithTextures::setTextures(SHARED_PTR< IfcTemplatedEntityList< IfcSurfaceTexture > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v->generalize()); }
+IfcTemplatedEntityList< IfcSurfaceTexture >::ptr IfcSurfaceStyleWithTextures::Textures() const { IfcEntityList::ptr es = *entity->getArgument(0); return es->as<IfcSurfaceTexture>(); }
+void IfcSurfaceStyleWithTextures::setTextures(IfcTemplatedEntityList< IfcSurfaceTexture >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v->generalize()); }
 bool IfcSurfaceStyleWithTextures::is(Type::Enum v) const { return v == Type::IfcSurfaceStyleWithTextures || IfcPresentationItem::is(v); }
 Type::Enum IfcSurfaceStyleWithTextures::type() const { return Type::IfcSurfaceStyleWithTextures; }
 Type::Enum IfcSurfaceStyleWithTextures::Class() { return Type::IfcSurfaceStyleWithTextures; }
-IfcSurfaceStyleWithTextures::IfcSurfaceStyleWithTextures(IfcAbstractEntityPtr e) : IfcPresentationItem((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcSurfaceStyleWithTextures)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcSurfaceStyleWithTextures::IfcSurfaceStyleWithTextures(SHARED_PTR< IfcTemplatedEntityList< IfcSurfaceTexture > > v1_Textures) : IfcPresentationItem((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Textures)->generalize()); entity = e; EntityBuffer::Add(this); }
+IfcSurfaceStyleWithTextures::IfcSurfaceStyleWithTextures(IfcAbstractEntity* e) : IfcPresentationItem((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcSurfaceStyleWithTextures)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcSurfaceStyleWithTextures::IfcSurfaceStyleWithTextures(IfcTemplatedEntityList< IfcSurfaceTexture >::ptr v1_Textures) : IfcPresentationItem((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Textures)->generalize()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcSurfaceTexture
-bool IfcSurfaceTexture::RepeatS() { return *entity->getArgument(0); }
+bool IfcSurfaceTexture::RepeatS() const { return *entity->getArgument(0); }
 void IfcSurfaceTexture::setRepeatS(bool v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-bool IfcSurfaceTexture::RepeatT() { return *entity->getArgument(1); }
+bool IfcSurfaceTexture::RepeatT() const { return *entity->getArgument(1); }
 void IfcSurfaceTexture::setRepeatT(bool v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-bool IfcSurfaceTexture::hasMode() { return !entity->getArgument(2)->isNull(); }
-IfcIdentifier IfcSurfaceTexture::Mode() { return *entity->getArgument(2); }
-void IfcSurfaceTexture::setMode(IfcIdentifier v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-bool IfcSurfaceTexture::hasTextureTransform() { return !entity->getArgument(3)->isNull(); }
-IfcCartesianTransformationOperator2D* IfcSurfaceTexture::TextureTransform() { return (IfcCartesianTransformationOperator2D*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(3))); }
+bool IfcSurfaceTexture::hasMode() const { return !entity->getArgument(2)->isNull(); }
+std::string IfcSurfaceTexture::Mode() const { return *entity->getArgument(2); }
+void IfcSurfaceTexture::setMode(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+bool IfcSurfaceTexture::hasTextureTransform() const { return !entity->getArgument(3)->isNull(); }
+IfcCartesianTransformationOperator2D* IfcSurfaceTexture::TextureTransform() const { return (IfcCartesianTransformationOperator2D*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(3))); }
 void IfcSurfaceTexture::setTextureTransform(IfcCartesianTransformationOperator2D* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-bool IfcSurfaceTexture::hasParameter() { return !entity->getArgument(4)->isNull(); }
-std::vector< IfcIdentifier > /*[1:?]*/ IfcSurfaceTexture::Parameter() { return *entity->getArgument(4); }
-void IfcSurfaceTexture::setParameter(std::vector< IfcIdentifier > /*[1:?]*/ v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-IfcTextureCoordinate::list IfcSurfaceTexture::IsMappedBy() { RETURN_INVERSE(IfcTextureCoordinate) }
-IfcSurfaceStyleWithTextures::list IfcSurfaceTexture::UsedInStyles() { RETURN_INVERSE(IfcSurfaceStyleWithTextures) }
+bool IfcSurfaceTexture::hasParameter() const { return !entity->getArgument(4)->isNull(); }
+std::vector< std::string > /*[1:?]*/ IfcSurfaceTexture::Parameter() const { return *entity->getArgument(4); }
+void IfcSurfaceTexture::setParameter(std::vector< std::string > /*[1:?]*/ v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+IfcTextureCoordinate::list::ptr IfcSurfaceTexture::IsMappedBy() const { return entity->getInverse(Type::IfcTextureCoordinate, 0)->as<IfcTextureCoordinate>(); }
+IfcSurfaceStyleWithTextures::list::ptr IfcSurfaceTexture::UsedInStyles() const { return entity->getInverse(Type::IfcSurfaceStyleWithTextures, 0)->as<IfcSurfaceStyleWithTextures>(); }
 bool IfcSurfaceTexture::is(Type::Enum v) const { return v == Type::IfcSurfaceTexture || IfcPresentationItem::is(v); }
 Type::Enum IfcSurfaceTexture::type() const { return Type::IfcSurfaceTexture; }
 Type::Enum IfcSurfaceTexture::Class() { return Type::IfcSurfaceTexture; }
-IfcSurfaceTexture::IfcSurfaceTexture(IfcAbstractEntityPtr e) : IfcPresentationItem((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcSurfaceTexture)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcSurfaceTexture::IfcSurfaceTexture(bool v1_RepeatS, bool v2_RepeatT, boost::optional< IfcIdentifier > v3_Mode, IfcCartesianTransformationOperator2D* v4_TextureTransform, boost::optional< std::vector< IfcIdentifier > /*[1:?]*/ > v5_Parameter) : IfcPresentationItem((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_RepeatS)); e->setArgument(1,(v2_RepeatT)); if (v3_Mode) { e->setArgument(2,(*v3_Mode)); } else { e->setArgument(2); } e->setArgument(3,(v4_TextureTransform)); if (v5_Parameter) { e->setArgument(4,(*v5_Parameter)); } else { e->setArgument(4); } entity = e; EntityBuffer::Add(this); }
+IfcSurfaceTexture::IfcSurfaceTexture(IfcAbstractEntity* e) : IfcPresentationItem((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcSurfaceTexture)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcSurfaceTexture::IfcSurfaceTexture(bool v1_RepeatS, bool v2_RepeatT, boost::optional< std::string > v3_Mode, IfcCartesianTransformationOperator2D* v4_TextureTransform, boost::optional< std::vector< std::string > /*[1:?]*/ > v5_Parameter) : IfcPresentationItem((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_RepeatS)); e->setArgument(1,(v2_RepeatT)); if (v3_Mode) { e->setArgument(2,(*v3_Mode)); } else { e->setArgument(2); } e->setArgument(3,(v4_TextureTransform)); if (v5_Parameter) { e->setArgument(4,(*v5_Parameter)); } else { e->setArgument(4); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcSweptAreaSolid
-IfcProfileDef* IfcSweptAreaSolid::SweptArea() { return (IfcProfileDef*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(0))); }
+IfcProfileDef* IfcSweptAreaSolid::SweptArea() const { return (IfcProfileDef*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(0))); }
 void IfcSweptAreaSolid::setSweptArea(IfcProfileDef* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-bool IfcSweptAreaSolid::hasPosition() { return !entity->getArgument(1)->isNull(); }
-IfcAxis2Placement3D* IfcSweptAreaSolid::Position() { return (IfcAxis2Placement3D*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(1))); }
+bool IfcSweptAreaSolid::hasPosition() const { return !entity->getArgument(1)->isNull(); }
+IfcAxis2Placement3D* IfcSweptAreaSolid::Position() const { return (IfcAxis2Placement3D*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(1))); }
 void IfcSweptAreaSolid::setPosition(IfcAxis2Placement3D* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
 bool IfcSweptAreaSolid::is(Type::Enum v) const { return v == Type::IfcSweptAreaSolid || IfcSolidModel::is(v); }
 Type::Enum IfcSweptAreaSolid::type() const { return Type::IfcSweptAreaSolid; }
 Type::Enum IfcSweptAreaSolid::Class() { return Type::IfcSweptAreaSolid; }
-IfcSweptAreaSolid::IfcSweptAreaSolid(IfcAbstractEntityPtr e) : IfcSolidModel((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcSweptAreaSolid)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcSweptAreaSolid::IfcSweptAreaSolid(IfcProfileDef* v1_SweptArea, IfcAxis2Placement3D* v2_Position) : IfcSolidModel((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_SweptArea)); e->setArgument(1,(v2_Position)); entity = e; EntityBuffer::Add(this); }
+IfcSweptAreaSolid::IfcSweptAreaSolid(IfcAbstractEntity* e) : IfcSolidModel((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcSweptAreaSolid)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcSweptAreaSolid::IfcSweptAreaSolid(IfcProfileDef* v1_SweptArea, IfcAxis2Placement3D* v2_Position) : IfcSolidModel((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_SweptArea)); e->setArgument(1,(v2_Position)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcSweptDiskSolid
-IfcCurve* IfcSweptDiskSolid::Directrix() { return (IfcCurve*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(0))); }
+IfcCurve* IfcSweptDiskSolid::Directrix() const { return (IfcCurve*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(0))); }
 void IfcSweptDiskSolid::setDirectrix(IfcCurve* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-IfcPositiveLengthMeasure IfcSweptDiskSolid::Radius() { return *entity->getArgument(1); }
-void IfcSweptDiskSolid::setRadius(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-bool IfcSweptDiskSolid::hasInnerRadius() { return !entity->getArgument(2)->isNull(); }
-IfcPositiveLengthMeasure IfcSweptDiskSolid::InnerRadius() { return *entity->getArgument(2); }
-void IfcSweptDiskSolid::setInnerRadius(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-bool IfcSweptDiskSolid::hasStartParam() { return !entity->getArgument(3)->isNull(); }
-IfcParameterValue IfcSweptDiskSolid::StartParam() { return *entity->getArgument(3); }
-void IfcSweptDiskSolid::setStartParam(IfcParameterValue v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-bool IfcSweptDiskSolid::hasEndParam() { return !entity->getArgument(4)->isNull(); }
-IfcParameterValue IfcSweptDiskSolid::EndParam() { return *entity->getArgument(4); }
-void IfcSweptDiskSolid::setEndParam(IfcParameterValue v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+double IfcSweptDiskSolid::Radius() const { return *entity->getArgument(1); }
+void IfcSweptDiskSolid::setRadius(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+bool IfcSweptDiskSolid::hasInnerRadius() const { return !entity->getArgument(2)->isNull(); }
+double IfcSweptDiskSolid::InnerRadius() const { return *entity->getArgument(2); }
+void IfcSweptDiskSolid::setInnerRadius(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+bool IfcSweptDiskSolid::hasStartParam() const { return !entity->getArgument(3)->isNull(); }
+double IfcSweptDiskSolid::StartParam() const { return *entity->getArgument(3); }
+void IfcSweptDiskSolid::setStartParam(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+bool IfcSweptDiskSolid::hasEndParam() const { return !entity->getArgument(4)->isNull(); }
+double IfcSweptDiskSolid::EndParam() const { return *entity->getArgument(4); }
+void IfcSweptDiskSolid::setEndParam(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
 bool IfcSweptDiskSolid::is(Type::Enum v) const { return v == Type::IfcSweptDiskSolid || IfcSolidModel::is(v); }
 Type::Enum IfcSweptDiskSolid::type() const { return Type::IfcSweptDiskSolid; }
 Type::Enum IfcSweptDiskSolid::Class() { return Type::IfcSweptDiskSolid; }
-IfcSweptDiskSolid::IfcSweptDiskSolid(IfcAbstractEntityPtr e) : IfcSolidModel((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcSweptDiskSolid)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcSweptDiskSolid::IfcSweptDiskSolid(IfcCurve* v1_Directrix, IfcPositiveLengthMeasure v2_Radius, boost::optional< IfcPositiveLengthMeasure > v3_InnerRadius, boost::optional< IfcParameterValue > v4_StartParam, boost::optional< IfcParameterValue > v5_EndParam) : IfcSolidModel((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Directrix)); e->setArgument(1,(v2_Radius)); if (v3_InnerRadius) { e->setArgument(2,(*v3_InnerRadius)); } else { e->setArgument(2); } if (v4_StartParam) { e->setArgument(3,(*v4_StartParam)); } else { e->setArgument(3); } if (v5_EndParam) { e->setArgument(4,(*v5_EndParam)); } else { e->setArgument(4); } entity = e; EntityBuffer::Add(this); }
+IfcSweptDiskSolid::IfcSweptDiskSolid(IfcAbstractEntity* e) : IfcSolidModel((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcSweptDiskSolid)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcSweptDiskSolid::IfcSweptDiskSolid(IfcCurve* v1_Directrix, double v2_Radius, boost::optional< double > v3_InnerRadius, boost::optional< double > v4_StartParam, boost::optional< double > v5_EndParam) : IfcSolidModel((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Directrix)); e->setArgument(1,(v2_Radius)); if (v3_InnerRadius) { e->setArgument(2,(*v3_InnerRadius)); } else { e->setArgument(2); } if (v4_StartParam) { e->setArgument(3,(*v4_StartParam)); } else { e->setArgument(3); } if (v5_EndParam) { e->setArgument(4,(*v5_EndParam)); } else { e->setArgument(4); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcSweptDiskSolidPolygonal
-bool IfcSweptDiskSolidPolygonal::hasFilletRadius() { return !entity->getArgument(5)->isNull(); }
-IfcPositiveLengthMeasure IfcSweptDiskSolidPolygonal::FilletRadius() { return *entity->getArgument(5); }
-void IfcSweptDiskSolidPolygonal::setFilletRadius(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+bool IfcSweptDiskSolidPolygonal::hasFilletRadius() const { return !entity->getArgument(5)->isNull(); }
+double IfcSweptDiskSolidPolygonal::FilletRadius() const { return *entity->getArgument(5); }
+void IfcSweptDiskSolidPolygonal::setFilletRadius(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
 bool IfcSweptDiskSolidPolygonal::is(Type::Enum v) const { return v == Type::IfcSweptDiskSolidPolygonal || IfcSweptDiskSolid::is(v); }
 Type::Enum IfcSweptDiskSolidPolygonal::type() const { return Type::IfcSweptDiskSolidPolygonal; }
 Type::Enum IfcSweptDiskSolidPolygonal::Class() { return Type::IfcSweptDiskSolidPolygonal; }
-IfcSweptDiskSolidPolygonal::IfcSweptDiskSolidPolygonal(IfcAbstractEntityPtr e) : IfcSweptDiskSolid((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcSweptDiskSolidPolygonal)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcSweptDiskSolidPolygonal::IfcSweptDiskSolidPolygonal(IfcCurve* v1_Directrix, IfcPositiveLengthMeasure v2_Radius, boost::optional< IfcPositiveLengthMeasure > v3_InnerRadius, boost::optional< IfcParameterValue > v4_StartParam, boost::optional< IfcParameterValue > v5_EndParam, boost::optional< IfcPositiveLengthMeasure > v6_FilletRadius) : IfcSweptDiskSolid((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Directrix)); e->setArgument(1,(v2_Radius)); if (v3_InnerRadius) { e->setArgument(2,(*v3_InnerRadius)); } else { e->setArgument(2); } if (v4_StartParam) { e->setArgument(3,(*v4_StartParam)); } else { e->setArgument(3); } if (v5_EndParam) { e->setArgument(4,(*v5_EndParam)); } else { e->setArgument(4); } if (v6_FilletRadius) { e->setArgument(5,(*v6_FilletRadius)); } else { e->setArgument(5); } entity = e; EntityBuffer::Add(this); }
+IfcSweptDiskSolidPolygonal::IfcSweptDiskSolidPolygonal(IfcAbstractEntity* e) : IfcSweptDiskSolid((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcSweptDiskSolidPolygonal)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcSweptDiskSolidPolygonal::IfcSweptDiskSolidPolygonal(IfcCurve* v1_Directrix, double v2_Radius, boost::optional< double > v3_InnerRadius, boost::optional< double > v4_StartParam, boost::optional< double > v5_EndParam, boost::optional< double > v6_FilletRadius) : IfcSweptDiskSolid((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Directrix)); e->setArgument(1,(v2_Radius)); if (v3_InnerRadius) { e->setArgument(2,(*v3_InnerRadius)); } else { e->setArgument(2); } if (v4_StartParam) { e->setArgument(3,(*v4_StartParam)); } else { e->setArgument(3); } if (v5_EndParam) { e->setArgument(4,(*v5_EndParam)); } else { e->setArgument(4); } if (v6_FilletRadius) { e->setArgument(5,(*v6_FilletRadius)); } else { e->setArgument(5); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcSweptSurface
-IfcProfileDef* IfcSweptSurface::SweptCurve() { return (IfcProfileDef*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(0))); }
+IfcProfileDef* IfcSweptSurface::SweptCurve() const { return (IfcProfileDef*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(0))); }
 void IfcSweptSurface::setSweptCurve(IfcProfileDef* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-bool IfcSweptSurface::hasPosition() { return !entity->getArgument(1)->isNull(); }
-IfcAxis2Placement3D* IfcSweptSurface::Position() { return (IfcAxis2Placement3D*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(1))); }
+bool IfcSweptSurface::hasPosition() const { return !entity->getArgument(1)->isNull(); }
+IfcAxis2Placement3D* IfcSweptSurface::Position() const { return (IfcAxis2Placement3D*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(1))); }
 void IfcSweptSurface::setPosition(IfcAxis2Placement3D* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
 bool IfcSweptSurface::is(Type::Enum v) const { return v == Type::IfcSweptSurface || IfcSurface::is(v); }
 Type::Enum IfcSweptSurface::type() const { return Type::IfcSweptSurface; }
 Type::Enum IfcSweptSurface::Class() { return Type::IfcSweptSurface; }
-IfcSweptSurface::IfcSweptSurface(IfcAbstractEntityPtr e) : IfcSurface((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcSweptSurface)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcSweptSurface::IfcSweptSurface(IfcProfileDef* v1_SweptCurve, IfcAxis2Placement3D* v2_Position) : IfcSurface((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_SweptCurve)); e->setArgument(1,(v2_Position)); entity = e; EntityBuffer::Add(this); }
+IfcSweptSurface::IfcSweptSurface(IfcAbstractEntity* e) : IfcSurface((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcSweptSurface)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcSweptSurface::IfcSweptSurface(IfcProfileDef* v1_SweptCurve, IfcAxis2Placement3D* v2_Position) : IfcSurface((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_SweptCurve)); e->setArgument(1,(v2_Position)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcSwitchingDevice
-bool IfcSwitchingDevice::hasPredefinedType() { return !entity->getArgument(8)->isNull(); }
-IfcSwitchingDeviceTypeEnum::IfcSwitchingDeviceTypeEnum IfcSwitchingDevice::PredefinedType() { return IfcSwitchingDeviceTypeEnum::FromString(*entity->getArgument(8)); }
+bool IfcSwitchingDevice::hasPredefinedType() const { return !entity->getArgument(8)->isNull(); }
+IfcSwitchingDeviceTypeEnum::IfcSwitchingDeviceTypeEnum IfcSwitchingDevice::PredefinedType() const { return IfcSwitchingDeviceTypeEnum::FromString(*entity->getArgument(8)); }
 void IfcSwitchingDevice::setPredefinedType(IfcSwitchingDeviceTypeEnum::IfcSwitchingDeviceTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcSwitchingDeviceTypeEnum::ToString(v)); }
 bool IfcSwitchingDevice::is(Type::Enum v) const { return v == Type::IfcSwitchingDevice || IfcFlowController::is(v); }
 Type::Enum IfcSwitchingDevice::type() const { return Type::IfcSwitchingDevice; }
 Type::Enum IfcSwitchingDevice::Class() { return Type::IfcSwitchingDevice; }
-IfcSwitchingDevice::IfcSwitchingDevice(IfcAbstractEntityPtr e) : IfcFlowController((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcSwitchingDevice)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcSwitchingDevice::IfcSwitchingDevice(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcSwitchingDeviceTypeEnum::IfcSwitchingDeviceTypeEnum > v9_PredefinedType) : IfcFlowController((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcSwitchingDeviceTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcSwitchingDevice::IfcSwitchingDevice(IfcAbstractEntity* e) : IfcFlowController((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcSwitchingDevice)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcSwitchingDevice::IfcSwitchingDevice(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcSwitchingDeviceTypeEnum::IfcSwitchingDeviceTypeEnum > v9_PredefinedType) : IfcFlowController((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcSwitchingDeviceTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcSwitchingDeviceType
-IfcSwitchingDeviceTypeEnum::IfcSwitchingDeviceTypeEnum IfcSwitchingDeviceType::PredefinedType() { return IfcSwitchingDeviceTypeEnum::FromString(*entity->getArgument(9)); }
+IfcSwitchingDeviceTypeEnum::IfcSwitchingDeviceTypeEnum IfcSwitchingDeviceType::PredefinedType() const { return IfcSwitchingDeviceTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcSwitchingDeviceType::setPredefinedType(IfcSwitchingDeviceTypeEnum::IfcSwitchingDeviceTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcSwitchingDeviceTypeEnum::ToString(v)); }
 bool IfcSwitchingDeviceType::is(Type::Enum v) const { return v == Type::IfcSwitchingDeviceType || IfcFlowControllerType::is(v); }
 Type::Enum IfcSwitchingDeviceType::type() const { return Type::IfcSwitchingDeviceType; }
 Type::Enum IfcSwitchingDeviceType::Class() { return Type::IfcSwitchingDeviceType; }
-IfcSwitchingDeviceType::IfcSwitchingDeviceType(IfcAbstractEntityPtr e) : IfcFlowControllerType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcSwitchingDeviceType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcSwitchingDeviceType::IfcSwitchingDeviceType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcSwitchingDeviceTypeEnum::IfcSwitchingDeviceTypeEnum v10_PredefinedType) : IfcFlowControllerType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcSwitchingDeviceTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcSwitchingDeviceType::IfcSwitchingDeviceType(IfcAbstractEntity* e) : IfcFlowControllerType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcSwitchingDeviceType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcSwitchingDeviceType::IfcSwitchingDeviceType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcSwitchingDeviceTypeEnum::IfcSwitchingDeviceTypeEnum v10_PredefinedType) : IfcFlowControllerType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcSwitchingDeviceTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcSystem
-IfcRelServicesBuildings::list IfcSystem::ServicesBuildings() { RETURN_INVERSE(IfcRelServicesBuildings) }
+IfcRelServicesBuildings::list::ptr IfcSystem::ServicesBuildings() const { return entity->getInverse(Type::IfcRelServicesBuildings, 4)->as<IfcRelServicesBuildings>(); }
 bool IfcSystem::is(Type::Enum v) const { return v == Type::IfcSystem || IfcGroup::is(v); }
 Type::Enum IfcSystem::type() const { return Type::IfcSystem; }
 Type::Enum IfcSystem::Class() { return Type::IfcSystem; }
-IfcSystem::IfcSystem(IfcAbstractEntityPtr e) : IfcGroup((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcSystem)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcSystem::IfcSystem(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType) : IfcGroup((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } entity = e; EntityBuffer::Add(this); }
+IfcSystem::IfcSystem(IfcAbstractEntity* e) : IfcGroup((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcSystem)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcSystem::IfcSystem(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType) : IfcGroup((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcSystemFurnitureElement
-bool IfcSystemFurnitureElement::hasPredefinedType() { return !entity->getArgument(8)->isNull(); }
-IfcSystemFurnitureElementTypeEnum::IfcSystemFurnitureElementTypeEnum IfcSystemFurnitureElement::PredefinedType() { return IfcSystemFurnitureElementTypeEnum::FromString(*entity->getArgument(8)); }
+bool IfcSystemFurnitureElement::hasPredefinedType() const { return !entity->getArgument(8)->isNull(); }
+IfcSystemFurnitureElementTypeEnum::IfcSystemFurnitureElementTypeEnum IfcSystemFurnitureElement::PredefinedType() const { return IfcSystemFurnitureElementTypeEnum::FromString(*entity->getArgument(8)); }
 void IfcSystemFurnitureElement::setPredefinedType(IfcSystemFurnitureElementTypeEnum::IfcSystemFurnitureElementTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcSystemFurnitureElementTypeEnum::ToString(v)); }
 bool IfcSystemFurnitureElement::is(Type::Enum v) const { return v == Type::IfcSystemFurnitureElement || IfcFurnishingElement::is(v); }
 Type::Enum IfcSystemFurnitureElement::type() const { return Type::IfcSystemFurnitureElement; }
 Type::Enum IfcSystemFurnitureElement::Class() { return Type::IfcSystemFurnitureElement; }
-IfcSystemFurnitureElement::IfcSystemFurnitureElement(IfcAbstractEntityPtr e) : IfcFurnishingElement((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcSystemFurnitureElement)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcSystemFurnitureElement::IfcSystemFurnitureElement(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcSystemFurnitureElementTypeEnum::IfcSystemFurnitureElementTypeEnum > v9_PredefinedType) : IfcFurnishingElement((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcSystemFurnitureElementTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcSystemFurnitureElement::IfcSystemFurnitureElement(IfcAbstractEntity* e) : IfcFurnishingElement((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcSystemFurnitureElement)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcSystemFurnitureElement::IfcSystemFurnitureElement(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcSystemFurnitureElementTypeEnum::IfcSystemFurnitureElementTypeEnum > v9_PredefinedType) : IfcFurnishingElement((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcSystemFurnitureElementTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcSystemFurnitureElementType
-bool IfcSystemFurnitureElementType::hasPredefinedType() { return !entity->getArgument(9)->isNull(); }
-IfcSystemFurnitureElementTypeEnum::IfcSystemFurnitureElementTypeEnum IfcSystemFurnitureElementType::PredefinedType() { return IfcSystemFurnitureElementTypeEnum::FromString(*entity->getArgument(9)); }
+bool IfcSystemFurnitureElementType::hasPredefinedType() const { return !entity->getArgument(9)->isNull(); }
+IfcSystemFurnitureElementTypeEnum::IfcSystemFurnitureElementTypeEnum IfcSystemFurnitureElementType::PredefinedType() const { return IfcSystemFurnitureElementTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcSystemFurnitureElementType::setPredefinedType(IfcSystemFurnitureElementTypeEnum::IfcSystemFurnitureElementTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcSystemFurnitureElementTypeEnum::ToString(v)); }
 bool IfcSystemFurnitureElementType::is(Type::Enum v) const { return v == Type::IfcSystemFurnitureElementType || IfcFurnishingElementType::is(v); }
 Type::Enum IfcSystemFurnitureElementType::type() const { return Type::IfcSystemFurnitureElementType; }
 Type::Enum IfcSystemFurnitureElementType::Class() { return Type::IfcSystemFurnitureElementType; }
-IfcSystemFurnitureElementType::IfcSystemFurnitureElementType(IfcAbstractEntityPtr e) : IfcFurnishingElementType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcSystemFurnitureElementType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcSystemFurnitureElementType::IfcSystemFurnitureElementType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, boost::optional< IfcSystemFurnitureElementTypeEnum::IfcSystemFurnitureElementTypeEnum > v10_PredefinedType) : IfcFurnishingElementType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } if (v10_PredefinedType) { e->setArgument(9,*v10_PredefinedType,IfcSystemFurnitureElementTypeEnum::ToString(*v10_PredefinedType)); } else { e->setArgument(9); } entity = e; EntityBuffer::Add(this); }
+IfcSystemFurnitureElementType::IfcSystemFurnitureElementType(IfcAbstractEntity* e) : IfcFurnishingElementType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcSystemFurnitureElementType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcSystemFurnitureElementType::IfcSystemFurnitureElementType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, boost::optional< IfcSystemFurnitureElementTypeEnum::IfcSystemFurnitureElementTypeEnum > v10_PredefinedType) : IfcFurnishingElementType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } if (v10_PredefinedType) { e->setArgument(9,*v10_PredefinedType,IfcSystemFurnitureElementTypeEnum::ToString(*v10_PredefinedType)); } else { e->setArgument(9); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcTShapeProfileDef
-IfcPositiveLengthMeasure IfcTShapeProfileDef::Depth() { return *entity->getArgument(3); }
-void IfcTShapeProfileDef::setDepth(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-IfcPositiveLengthMeasure IfcTShapeProfileDef::FlangeWidth() { return *entity->getArgument(4); }
-void IfcTShapeProfileDef::setFlangeWidth(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-IfcPositiveLengthMeasure IfcTShapeProfileDef::WebThickness() { return *entity->getArgument(5); }
-void IfcTShapeProfileDef::setWebThickness(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-IfcPositiveLengthMeasure IfcTShapeProfileDef::FlangeThickness() { return *entity->getArgument(6); }
-void IfcTShapeProfileDef::setFlangeThickness(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
-bool IfcTShapeProfileDef::hasFilletRadius() { return !entity->getArgument(7)->isNull(); }
-IfcNonNegativeLengthMeasure IfcTShapeProfileDef::FilletRadius() { return *entity->getArgument(7); }
-void IfcTShapeProfileDef::setFilletRadius(IfcNonNegativeLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
-bool IfcTShapeProfileDef::hasFlangeEdgeRadius() { return !entity->getArgument(8)->isNull(); }
-IfcNonNegativeLengthMeasure IfcTShapeProfileDef::FlangeEdgeRadius() { return *entity->getArgument(8); }
-void IfcTShapeProfileDef::setFlangeEdgeRadius(IfcNonNegativeLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
-bool IfcTShapeProfileDef::hasWebEdgeRadius() { return !entity->getArgument(9)->isNull(); }
-IfcNonNegativeLengthMeasure IfcTShapeProfileDef::WebEdgeRadius() { return *entity->getArgument(9); }
-void IfcTShapeProfileDef::setWebEdgeRadius(IfcNonNegativeLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
-bool IfcTShapeProfileDef::hasWebSlope() { return !entity->getArgument(10)->isNull(); }
-IfcPlaneAngleMeasure IfcTShapeProfileDef::WebSlope() { return *entity->getArgument(10); }
-void IfcTShapeProfileDef::setWebSlope(IfcPlaneAngleMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
-bool IfcTShapeProfileDef::hasFlangeSlope() { return !entity->getArgument(11)->isNull(); }
-IfcPlaneAngleMeasure IfcTShapeProfileDef::FlangeSlope() { return *entity->getArgument(11); }
-void IfcTShapeProfileDef::setFlangeSlope(IfcPlaneAngleMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(11,v); }
+double IfcTShapeProfileDef::Depth() const { return *entity->getArgument(3); }
+void IfcTShapeProfileDef::setDepth(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+double IfcTShapeProfileDef::FlangeWidth() const { return *entity->getArgument(4); }
+void IfcTShapeProfileDef::setFlangeWidth(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+double IfcTShapeProfileDef::WebThickness() const { return *entity->getArgument(5); }
+void IfcTShapeProfileDef::setWebThickness(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+double IfcTShapeProfileDef::FlangeThickness() const { return *entity->getArgument(6); }
+void IfcTShapeProfileDef::setFlangeThickness(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
+bool IfcTShapeProfileDef::hasFilletRadius() const { return !entity->getArgument(7)->isNull(); }
+double IfcTShapeProfileDef::FilletRadius() const { return *entity->getArgument(7); }
+void IfcTShapeProfileDef::setFilletRadius(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
+bool IfcTShapeProfileDef::hasFlangeEdgeRadius() const { return !entity->getArgument(8)->isNull(); }
+double IfcTShapeProfileDef::FlangeEdgeRadius() const { return *entity->getArgument(8); }
+void IfcTShapeProfileDef::setFlangeEdgeRadius(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
+bool IfcTShapeProfileDef::hasWebEdgeRadius() const { return !entity->getArgument(9)->isNull(); }
+double IfcTShapeProfileDef::WebEdgeRadius() const { return *entity->getArgument(9); }
+void IfcTShapeProfileDef::setWebEdgeRadius(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
+bool IfcTShapeProfileDef::hasWebSlope() const { return !entity->getArgument(10)->isNull(); }
+double IfcTShapeProfileDef::WebSlope() const { return *entity->getArgument(10); }
+void IfcTShapeProfileDef::setWebSlope(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
+bool IfcTShapeProfileDef::hasFlangeSlope() const { return !entity->getArgument(11)->isNull(); }
+double IfcTShapeProfileDef::FlangeSlope() const { return *entity->getArgument(11); }
+void IfcTShapeProfileDef::setFlangeSlope(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(11,v); }
 bool IfcTShapeProfileDef::is(Type::Enum v) const { return v == Type::IfcTShapeProfileDef || IfcParameterizedProfileDef::is(v); }
 Type::Enum IfcTShapeProfileDef::type() const { return Type::IfcTShapeProfileDef; }
 Type::Enum IfcTShapeProfileDef::Class() { return Type::IfcTShapeProfileDef; }
-IfcTShapeProfileDef::IfcTShapeProfileDef(IfcAbstractEntityPtr e) : IfcParameterizedProfileDef((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcTShapeProfileDef)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcTShapeProfileDef::IfcTShapeProfileDef(IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< IfcLabel > v2_ProfileName, IfcAxis2Placement2D* v3_Position, IfcPositiveLengthMeasure v4_Depth, IfcPositiveLengthMeasure v5_FlangeWidth, IfcPositiveLengthMeasure v6_WebThickness, IfcPositiveLengthMeasure v7_FlangeThickness, boost::optional< IfcNonNegativeLengthMeasure > v8_FilletRadius, boost::optional< IfcNonNegativeLengthMeasure > v9_FlangeEdgeRadius, boost::optional< IfcNonNegativeLengthMeasure > v10_WebEdgeRadius, boost::optional< IfcPlaneAngleMeasure > v11_WebSlope, boost::optional< IfcPlaneAngleMeasure > v12_FlangeSlope) : IfcParameterizedProfileDef((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,v1_ProfileType,IfcProfileTypeEnum::ToString(v1_ProfileType)); if (v2_ProfileName) { e->setArgument(1,(*v2_ProfileName)); } else { e->setArgument(1); } e->setArgument(2,(v3_Position)); e->setArgument(3,(v4_Depth)); e->setArgument(4,(v5_FlangeWidth)); e->setArgument(5,(v6_WebThickness)); e->setArgument(6,(v7_FlangeThickness)); if (v8_FilletRadius) { e->setArgument(7,(*v8_FilletRadius)); } else { e->setArgument(7); } if (v9_FlangeEdgeRadius) { e->setArgument(8,(*v9_FlangeEdgeRadius)); } else { e->setArgument(8); } if (v10_WebEdgeRadius) { e->setArgument(9,(*v10_WebEdgeRadius)); } else { e->setArgument(9); } if (v11_WebSlope) { e->setArgument(10,(*v11_WebSlope)); } else { e->setArgument(10); } if (v12_FlangeSlope) { e->setArgument(11,(*v12_FlangeSlope)); } else { e->setArgument(11); } entity = e; EntityBuffer::Add(this); }
+IfcTShapeProfileDef::IfcTShapeProfileDef(IfcAbstractEntity* e) : IfcParameterizedProfileDef((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcTShapeProfileDef)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcTShapeProfileDef::IfcTShapeProfileDef(IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< std::string > v2_ProfileName, IfcAxis2Placement2D* v3_Position, double v4_Depth, double v5_FlangeWidth, double v6_WebThickness, double v7_FlangeThickness, boost::optional< double > v8_FilletRadius, boost::optional< double > v9_FlangeEdgeRadius, boost::optional< double > v10_WebEdgeRadius, boost::optional< double > v11_WebSlope, boost::optional< double > v12_FlangeSlope) : IfcParameterizedProfileDef((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,v1_ProfileType,IfcProfileTypeEnum::ToString(v1_ProfileType)); if (v2_ProfileName) { e->setArgument(1,(*v2_ProfileName)); } else { e->setArgument(1); } e->setArgument(2,(v3_Position)); e->setArgument(3,(v4_Depth)); e->setArgument(4,(v5_FlangeWidth)); e->setArgument(5,(v6_WebThickness)); e->setArgument(6,(v7_FlangeThickness)); if (v8_FilletRadius) { e->setArgument(7,(*v8_FilletRadius)); } else { e->setArgument(7); } if (v9_FlangeEdgeRadius) { e->setArgument(8,(*v9_FlangeEdgeRadius)); } else { e->setArgument(8); } if (v10_WebEdgeRadius) { e->setArgument(9,(*v10_WebEdgeRadius)); } else { e->setArgument(9); } if (v11_WebSlope) { e->setArgument(10,(*v11_WebSlope)); } else { e->setArgument(10); } if (v12_FlangeSlope) { e->setArgument(11,(*v12_FlangeSlope)); } else { e->setArgument(11); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcTable
-bool IfcTable::hasName() { return !entity->getArgument(0)->isNull(); }
-IfcLabel IfcTable::Name() { return *entity->getArgument(0); }
-void IfcTable::setName(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-bool IfcTable::hasRows() { return !entity->getArgument(1)->isNull(); }
-SHARED_PTR< IfcTemplatedEntityList< IfcTableRow > > IfcTable::Rows() { RETURN_AS_LIST(IfcTableRow,1) }
-void IfcTable::setRows(SHARED_PTR< IfcTemplatedEntityList< IfcTableRow > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v->generalize()); }
-bool IfcTable::hasColumns() { return !entity->getArgument(2)->isNull(); }
-SHARED_PTR< IfcTemplatedEntityList< IfcTableColumn > > IfcTable::Columns() { RETURN_AS_LIST(IfcTableColumn,2) }
-void IfcTable::setColumns(SHARED_PTR< IfcTemplatedEntityList< IfcTableColumn > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v->generalize()); }
+bool IfcTable::hasName() const { return !entity->getArgument(0)->isNull(); }
+std::string IfcTable::Name() const { return *entity->getArgument(0); }
+void IfcTable::setName(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+bool IfcTable::hasRows() const { return !entity->getArgument(1)->isNull(); }
+IfcTemplatedEntityList< IfcTableRow >::ptr IfcTable::Rows() const { IfcEntityList::ptr es = *entity->getArgument(1); return es->as<IfcTableRow>(); }
+void IfcTable::setRows(IfcTemplatedEntityList< IfcTableRow >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v->generalize()); }
+bool IfcTable::hasColumns() const { return !entity->getArgument(2)->isNull(); }
+IfcTemplatedEntityList< IfcTableColumn >::ptr IfcTable::Columns() const { IfcEntityList::ptr es = *entity->getArgument(2); return es->as<IfcTableColumn>(); }
+void IfcTable::setColumns(IfcTemplatedEntityList< IfcTableColumn >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v->generalize()); }
 bool IfcTable::is(Type::Enum v) const { return v == Type::IfcTable; }
 Type::Enum IfcTable::type() const { return Type::IfcTable; }
 Type::Enum IfcTable::Class() { return Type::IfcTable; }
-IfcTable::IfcTable(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcTable)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcTable::IfcTable(boost::optional< IfcLabel > v1_Name, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcTableRow > > > v2_Rows, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcTableColumn > > > v3_Columns) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_Rows) { e->setArgument(1,(*v2_Rows)->generalize()); } else { e->setArgument(1); } if (v3_Columns) { e->setArgument(2,(*v3_Columns)->generalize()); } else { e->setArgument(2); } entity = e; EntityBuffer::Add(this); }
+IfcTable::IfcTable(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcTable)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcTable::IfcTable(boost::optional< std::string > v1_Name, boost::optional< IfcTemplatedEntityList< IfcTableRow >::ptr > v2_Rows, boost::optional< IfcTemplatedEntityList< IfcTableColumn >::ptr > v3_Columns) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_Rows) { e->setArgument(1,(*v2_Rows)->generalize()); } else { e->setArgument(1); } if (v3_Columns) { e->setArgument(2,(*v3_Columns)->generalize()); } else { e->setArgument(2); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcTableColumn
-bool IfcTableColumn::hasIdentifier() { return !entity->getArgument(0)->isNull(); }
-IfcIdentifier IfcTableColumn::Identifier() { return *entity->getArgument(0); }
-void IfcTableColumn::setIdentifier(IfcIdentifier v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-bool IfcTableColumn::hasName() { return !entity->getArgument(1)->isNull(); }
-IfcLabel IfcTableColumn::Name() { return *entity->getArgument(1); }
-void IfcTableColumn::setName(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-bool IfcTableColumn::hasDescription() { return !entity->getArgument(2)->isNull(); }
-IfcText IfcTableColumn::Description() { return *entity->getArgument(2); }
-void IfcTableColumn::setDescription(IfcText v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-bool IfcTableColumn::hasUnit() { return !entity->getArgument(3)->isNull(); }
-IfcUnit IfcTableColumn::Unit() { return *entity->getArgument(3); }
-void IfcTableColumn::setUnit(IfcUnit v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-bool IfcTableColumn::hasReferencePath() { return !entity->getArgument(4)->isNull(); }
-IfcReference* IfcTableColumn::ReferencePath() { return (IfcReference*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(4))); }
+bool IfcTableColumn::hasIdentifier() const { return !entity->getArgument(0)->isNull(); }
+std::string IfcTableColumn::Identifier() const { return *entity->getArgument(0); }
+void IfcTableColumn::setIdentifier(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+bool IfcTableColumn::hasName() const { return !entity->getArgument(1)->isNull(); }
+std::string IfcTableColumn::Name() const { return *entity->getArgument(1); }
+void IfcTableColumn::setName(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+bool IfcTableColumn::hasDescription() const { return !entity->getArgument(2)->isNull(); }
+std::string IfcTableColumn::Description() const { return *entity->getArgument(2); }
+void IfcTableColumn::setDescription(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+bool IfcTableColumn::hasUnit() const { return !entity->getArgument(3)->isNull(); }
+IfcUnit* IfcTableColumn::Unit() const { return (IfcUnit*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(3))); }
+void IfcTableColumn::setUnit(IfcUnit* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+bool IfcTableColumn::hasReferencePath() const { return !entity->getArgument(4)->isNull(); }
+IfcReference* IfcTableColumn::ReferencePath() const { return (IfcReference*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(4))); }
 void IfcTableColumn::setReferencePath(IfcReference* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
 bool IfcTableColumn::is(Type::Enum v) const { return v == Type::IfcTableColumn; }
 Type::Enum IfcTableColumn::type() const { return Type::IfcTableColumn; }
 Type::Enum IfcTableColumn::Class() { return Type::IfcTableColumn; }
-IfcTableColumn::IfcTableColumn(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcTableColumn)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcTableColumn::IfcTableColumn(boost::optional< IfcIdentifier > v1_Identifier, boost::optional< IfcLabel > v2_Name, boost::optional< IfcText > v3_Description, boost::optional< IfcUnit > v4_Unit, IfcReference* v5_ReferencePath) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Identifier) { e->setArgument(0,(*v1_Identifier)); } else { e->setArgument(0); } if (v2_Name) { e->setArgument(1,(*v2_Name)); } else { e->setArgument(1); } if (v3_Description) { e->setArgument(2,(*v3_Description)); } else { e->setArgument(2); } if (v4_Unit) { e->setArgument(3,(*v4_Unit)); } else { e->setArgument(3); } e->setArgument(4,(v5_ReferencePath)); entity = e; EntityBuffer::Add(this); }
+IfcTableColumn::IfcTableColumn(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcTableColumn)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcTableColumn::IfcTableColumn(boost::optional< std::string > v1_Identifier, boost::optional< std::string > v2_Name, boost::optional< std::string > v3_Description, IfcUnit* v4_Unit, IfcReference* v5_ReferencePath) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Identifier) { e->setArgument(0,(*v1_Identifier)); } else { e->setArgument(0); } if (v2_Name) { e->setArgument(1,(*v2_Name)); } else { e->setArgument(1); } if (v3_Description) { e->setArgument(2,(*v3_Description)); } else { e->setArgument(2); } e->setArgument(3,(v4_Unit)); e->setArgument(4,(v5_ReferencePath)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcTableRow
-bool IfcTableRow::hasRowCells() { return !entity->getArgument(0)->isNull(); }
-SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > IfcTableRow::RowCells() { RETURN_AS_LIST(IfcUtil::IfcAbstractSelect,0) }
-void IfcTableRow::setRowCells(SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v->generalize()); }
-bool IfcTableRow::hasIsHeading() { return !entity->getArgument(1)->isNull(); }
-bool IfcTableRow::IsHeading() { return *entity->getArgument(1); }
+bool IfcTableRow::hasRowCells() const { return !entity->getArgument(0)->isNull(); }
+IfcEntityList::ptr IfcTableRow::RowCells() const { return *entity->getArgument(0); }
+void IfcTableRow::setRowCells(IfcEntityList::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+bool IfcTableRow::hasIsHeading() const { return !entity->getArgument(1)->isNull(); }
+bool IfcTableRow::IsHeading() const { return *entity->getArgument(1); }
 void IfcTableRow::setIsHeading(bool v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-IfcTable::list IfcTableRow::OfTable() { RETURN_INVERSE(IfcTable) }
+IfcTable::list::ptr IfcTableRow::OfTable() const { return entity->getInverse(Type::IfcTable, 1)->as<IfcTable>(); }
 bool IfcTableRow::is(Type::Enum v) const { return v == Type::IfcTableRow; }
 Type::Enum IfcTableRow::type() const { return Type::IfcTableRow; }
 Type::Enum IfcTableRow::Class() { return Type::IfcTableRow; }
-IfcTableRow::IfcTableRow(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcTableRow)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcTableRow::IfcTableRow(boost::optional< IfcEntities > v1_RowCells, boost::optional< bool > v2_IsHeading) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_RowCells) { e->setArgument(0,(*v1_RowCells)); } else { e->setArgument(0); } if (v2_IsHeading) { e->setArgument(1,(*v2_IsHeading)); } else { e->setArgument(1); } entity = e; EntityBuffer::Add(this); }
+IfcTableRow::IfcTableRow(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcTableRow)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcTableRow::IfcTableRow(boost::optional< IfcEntityList::ptr > v1_RowCells, boost::optional< bool > v2_IsHeading) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_RowCells) { e->setArgument(0,(*v1_RowCells)); } else { e->setArgument(0); } if (v2_IsHeading) { e->setArgument(1,(*v2_IsHeading)); } else { e->setArgument(1); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcTank
-bool IfcTank::hasPredefinedType() { return !entity->getArgument(8)->isNull(); }
-IfcTankTypeEnum::IfcTankTypeEnum IfcTank::PredefinedType() { return IfcTankTypeEnum::FromString(*entity->getArgument(8)); }
+bool IfcTank::hasPredefinedType() const { return !entity->getArgument(8)->isNull(); }
+IfcTankTypeEnum::IfcTankTypeEnum IfcTank::PredefinedType() const { return IfcTankTypeEnum::FromString(*entity->getArgument(8)); }
 void IfcTank::setPredefinedType(IfcTankTypeEnum::IfcTankTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcTankTypeEnum::ToString(v)); }
 bool IfcTank::is(Type::Enum v) const { return v == Type::IfcTank || IfcFlowStorageDevice::is(v); }
 Type::Enum IfcTank::type() const { return Type::IfcTank; }
 Type::Enum IfcTank::Class() { return Type::IfcTank; }
-IfcTank::IfcTank(IfcAbstractEntityPtr e) : IfcFlowStorageDevice((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcTank)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcTank::IfcTank(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcTankTypeEnum::IfcTankTypeEnum > v9_PredefinedType) : IfcFlowStorageDevice((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcTankTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcTank::IfcTank(IfcAbstractEntity* e) : IfcFlowStorageDevice((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcTank)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcTank::IfcTank(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcTankTypeEnum::IfcTankTypeEnum > v9_PredefinedType) : IfcFlowStorageDevice((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcTankTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcTankType
-IfcTankTypeEnum::IfcTankTypeEnum IfcTankType::PredefinedType() { return IfcTankTypeEnum::FromString(*entity->getArgument(9)); }
+IfcTankTypeEnum::IfcTankTypeEnum IfcTankType::PredefinedType() const { return IfcTankTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcTankType::setPredefinedType(IfcTankTypeEnum::IfcTankTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcTankTypeEnum::ToString(v)); }
 bool IfcTankType::is(Type::Enum v) const { return v == Type::IfcTankType || IfcFlowStorageDeviceType::is(v); }
 Type::Enum IfcTankType::type() const { return Type::IfcTankType; }
 Type::Enum IfcTankType::Class() { return Type::IfcTankType; }
-IfcTankType::IfcTankType(IfcAbstractEntityPtr e) : IfcFlowStorageDeviceType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcTankType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcTankType::IfcTankType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcTankTypeEnum::IfcTankTypeEnum v10_PredefinedType) : IfcFlowStorageDeviceType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcTankTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcTankType::IfcTankType(IfcAbstractEntity* e) : IfcFlowStorageDeviceType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcTankType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcTankType::IfcTankType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcTankTypeEnum::IfcTankTypeEnum v10_PredefinedType) : IfcFlowStorageDeviceType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcTankTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcTask
-bool IfcTask::hasStatus() { return !entity->getArgument(7)->isNull(); }
-IfcLabel IfcTask::Status() { return *entity->getArgument(7); }
-void IfcTask::setStatus(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
-bool IfcTask::hasWorkMethod() { return !entity->getArgument(8)->isNull(); }
-IfcLabel IfcTask::WorkMethod() { return *entity->getArgument(8); }
-void IfcTask::setWorkMethod(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
-bool IfcTask::IsMilestone() { return *entity->getArgument(9); }
+bool IfcTask::hasStatus() const { return !entity->getArgument(7)->isNull(); }
+std::string IfcTask::Status() const { return *entity->getArgument(7); }
+void IfcTask::setStatus(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
+bool IfcTask::hasWorkMethod() const { return !entity->getArgument(8)->isNull(); }
+std::string IfcTask::WorkMethod() const { return *entity->getArgument(8); }
+void IfcTask::setWorkMethod(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
+bool IfcTask::IsMilestone() const { return *entity->getArgument(9); }
 void IfcTask::setIsMilestone(bool v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
-bool IfcTask::hasPriority() { return !entity->getArgument(10)->isNull(); }
-int IfcTask::Priority() { return *entity->getArgument(10); }
+bool IfcTask::hasPriority() const { return !entity->getArgument(10)->isNull(); }
+int IfcTask::Priority() const { return *entity->getArgument(10); }
 void IfcTask::setPriority(int v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
-bool IfcTask::hasTaskTime() { return !entity->getArgument(11)->isNull(); }
-IfcTaskTime* IfcTask::TaskTime() { return (IfcTaskTime*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(11))); }
+bool IfcTask::hasTaskTime() const { return !entity->getArgument(11)->isNull(); }
+IfcTaskTime* IfcTask::TaskTime() const { return (IfcTaskTime*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(11))); }
 void IfcTask::setTaskTime(IfcTaskTime* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(11,v); }
-bool IfcTask::hasPredefinedType() { return !entity->getArgument(12)->isNull(); }
-IfcTaskTypeEnum::IfcTaskTypeEnum IfcTask::PredefinedType() { return IfcTaskTypeEnum::FromString(*entity->getArgument(12)); }
+bool IfcTask::hasPredefinedType() const { return !entity->getArgument(12)->isNull(); }
+IfcTaskTypeEnum::IfcTaskTypeEnum IfcTask::PredefinedType() const { return IfcTaskTypeEnum::FromString(*entity->getArgument(12)); }
 void IfcTask::setPredefinedType(IfcTaskTypeEnum::IfcTaskTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(12,v,IfcTaskTypeEnum::ToString(v)); }
 bool IfcTask::is(Type::Enum v) const { return v == Type::IfcTask || IfcProcess::is(v); }
 Type::Enum IfcTask::type() const { return Type::IfcTask; }
 Type::Enum IfcTask::Class() { return Type::IfcTask; }
-IfcTask::IfcTask(IfcAbstractEntityPtr e) : IfcProcess((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcTask)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcTask::IfcTask(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, boost::optional< IfcIdentifier > v6_Identification, boost::optional< IfcText > v7_LongDescription, boost::optional< IfcLabel > v8_Status, boost::optional< IfcLabel > v9_WorkMethod, bool v10_IsMilestone, boost::optional< int > v11_Priority, IfcTaskTime* v12_TaskTime, boost::optional< IfcTaskTypeEnum::IfcTaskTypeEnum > v13_PredefinedType) : IfcProcess((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } if (v6_Identification) { e->setArgument(5,(*v6_Identification)); } else { e->setArgument(5); } if (v7_LongDescription) { e->setArgument(6,(*v7_LongDescription)); } else { e->setArgument(6); } if (v8_Status) { e->setArgument(7,(*v8_Status)); } else { e->setArgument(7); } if (v9_WorkMethod) { e->setArgument(8,(*v9_WorkMethod)); } else { e->setArgument(8); } e->setArgument(9,(v10_IsMilestone)); if (v11_Priority) { e->setArgument(10,(*v11_Priority)); } else { e->setArgument(10); } e->setArgument(11,(v12_TaskTime)); if (v13_PredefinedType) { e->setArgument(12,*v13_PredefinedType,IfcTaskTypeEnum::ToString(*v13_PredefinedType)); } else { e->setArgument(12); } entity = e; EntityBuffer::Add(this); }
+IfcTask::IfcTask(IfcAbstractEntity* e) : IfcProcess((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcTask)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcTask::IfcTask(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, boost::optional< std::string > v6_Identification, boost::optional< std::string > v7_LongDescription, boost::optional< std::string > v8_Status, boost::optional< std::string > v9_WorkMethod, bool v10_IsMilestone, boost::optional< int > v11_Priority, IfcTaskTime* v12_TaskTime, boost::optional< IfcTaskTypeEnum::IfcTaskTypeEnum > v13_PredefinedType) : IfcProcess((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } if (v6_Identification) { e->setArgument(5,(*v6_Identification)); } else { e->setArgument(5); } if (v7_LongDescription) { e->setArgument(6,(*v7_LongDescription)); } else { e->setArgument(6); } if (v8_Status) { e->setArgument(7,(*v8_Status)); } else { e->setArgument(7); } if (v9_WorkMethod) { e->setArgument(8,(*v9_WorkMethod)); } else { e->setArgument(8); } e->setArgument(9,(v10_IsMilestone)); if (v11_Priority) { e->setArgument(10,(*v11_Priority)); } else { e->setArgument(10); } e->setArgument(11,(v12_TaskTime)); if (v13_PredefinedType) { e->setArgument(12,*v13_PredefinedType,IfcTaskTypeEnum::ToString(*v13_PredefinedType)); } else { e->setArgument(12); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcTaskTime
-bool IfcTaskTime::hasDurationType() { return !entity->getArgument(3)->isNull(); }
-IfcTaskDurationEnum::IfcTaskDurationEnum IfcTaskTime::DurationType() { return IfcTaskDurationEnum::FromString(*entity->getArgument(3)); }
+bool IfcTaskTime::hasDurationType() const { return !entity->getArgument(3)->isNull(); }
+IfcTaskDurationEnum::IfcTaskDurationEnum IfcTaskTime::DurationType() const { return IfcTaskDurationEnum::FromString(*entity->getArgument(3)); }
 void IfcTaskTime::setDurationType(IfcTaskDurationEnum::IfcTaskDurationEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v,IfcTaskDurationEnum::ToString(v)); }
-bool IfcTaskTime::hasScheduleDuration() { return !entity->getArgument(4)->isNull(); }
-IfcDuration IfcTaskTime::ScheduleDuration() { return *entity->getArgument(4); }
-void IfcTaskTime::setScheduleDuration(IfcDuration v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-bool IfcTaskTime::hasScheduleStart() { return !entity->getArgument(5)->isNull(); }
-IfcDateTime IfcTaskTime::ScheduleStart() { return *entity->getArgument(5); }
-void IfcTaskTime::setScheduleStart(IfcDateTime v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-bool IfcTaskTime::hasScheduleFinish() { return !entity->getArgument(6)->isNull(); }
-IfcDateTime IfcTaskTime::ScheduleFinish() { return *entity->getArgument(6); }
-void IfcTaskTime::setScheduleFinish(IfcDateTime v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
-bool IfcTaskTime::hasEarlyStart() { return !entity->getArgument(7)->isNull(); }
-IfcDateTime IfcTaskTime::EarlyStart() { return *entity->getArgument(7); }
-void IfcTaskTime::setEarlyStart(IfcDateTime v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
-bool IfcTaskTime::hasEarlyFinish() { return !entity->getArgument(8)->isNull(); }
-IfcDateTime IfcTaskTime::EarlyFinish() { return *entity->getArgument(8); }
-void IfcTaskTime::setEarlyFinish(IfcDateTime v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
-bool IfcTaskTime::hasLateStart() { return !entity->getArgument(9)->isNull(); }
-IfcDateTime IfcTaskTime::LateStart() { return *entity->getArgument(9); }
-void IfcTaskTime::setLateStart(IfcDateTime v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
-bool IfcTaskTime::hasLateFinish() { return !entity->getArgument(10)->isNull(); }
-IfcDateTime IfcTaskTime::LateFinish() { return *entity->getArgument(10); }
-void IfcTaskTime::setLateFinish(IfcDateTime v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
-bool IfcTaskTime::hasFreeFloat() { return !entity->getArgument(11)->isNull(); }
-IfcDuration IfcTaskTime::FreeFloat() { return *entity->getArgument(11); }
-void IfcTaskTime::setFreeFloat(IfcDuration v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(11,v); }
-bool IfcTaskTime::hasTotalFloat() { return !entity->getArgument(12)->isNull(); }
-IfcDuration IfcTaskTime::TotalFloat() { return *entity->getArgument(12); }
-void IfcTaskTime::setTotalFloat(IfcDuration v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(12,v); }
-bool IfcTaskTime::hasIsCritical() { return !entity->getArgument(13)->isNull(); }
-bool IfcTaskTime::IsCritical() { return *entity->getArgument(13); }
+bool IfcTaskTime::hasScheduleDuration() const { return !entity->getArgument(4)->isNull(); }
+std::string IfcTaskTime::ScheduleDuration() const { return *entity->getArgument(4); }
+void IfcTaskTime::setScheduleDuration(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+bool IfcTaskTime::hasScheduleStart() const { return !entity->getArgument(5)->isNull(); }
+std::string IfcTaskTime::ScheduleStart() const { return *entity->getArgument(5); }
+void IfcTaskTime::setScheduleStart(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+bool IfcTaskTime::hasScheduleFinish() const { return !entity->getArgument(6)->isNull(); }
+std::string IfcTaskTime::ScheduleFinish() const { return *entity->getArgument(6); }
+void IfcTaskTime::setScheduleFinish(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
+bool IfcTaskTime::hasEarlyStart() const { return !entity->getArgument(7)->isNull(); }
+std::string IfcTaskTime::EarlyStart() const { return *entity->getArgument(7); }
+void IfcTaskTime::setEarlyStart(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
+bool IfcTaskTime::hasEarlyFinish() const { return !entity->getArgument(8)->isNull(); }
+std::string IfcTaskTime::EarlyFinish() const { return *entity->getArgument(8); }
+void IfcTaskTime::setEarlyFinish(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
+bool IfcTaskTime::hasLateStart() const { return !entity->getArgument(9)->isNull(); }
+std::string IfcTaskTime::LateStart() const { return *entity->getArgument(9); }
+void IfcTaskTime::setLateStart(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
+bool IfcTaskTime::hasLateFinish() const { return !entity->getArgument(10)->isNull(); }
+std::string IfcTaskTime::LateFinish() const { return *entity->getArgument(10); }
+void IfcTaskTime::setLateFinish(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
+bool IfcTaskTime::hasFreeFloat() const { return !entity->getArgument(11)->isNull(); }
+std::string IfcTaskTime::FreeFloat() const { return *entity->getArgument(11); }
+void IfcTaskTime::setFreeFloat(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(11,v); }
+bool IfcTaskTime::hasTotalFloat() const { return !entity->getArgument(12)->isNull(); }
+std::string IfcTaskTime::TotalFloat() const { return *entity->getArgument(12); }
+void IfcTaskTime::setTotalFloat(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(12,v); }
+bool IfcTaskTime::hasIsCritical() const { return !entity->getArgument(13)->isNull(); }
+bool IfcTaskTime::IsCritical() const { return *entity->getArgument(13); }
 void IfcTaskTime::setIsCritical(bool v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(13,v); }
-bool IfcTaskTime::hasStatusTime() { return !entity->getArgument(14)->isNull(); }
-IfcDateTime IfcTaskTime::StatusTime() { return *entity->getArgument(14); }
-void IfcTaskTime::setStatusTime(IfcDateTime v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(14,v); }
-bool IfcTaskTime::hasActualDuration() { return !entity->getArgument(15)->isNull(); }
-IfcDuration IfcTaskTime::ActualDuration() { return *entity->getArgument(15); }
-void IfcTaskTime::setActualDuration(IfcDuration v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(15,v); }
-bool IfcTaskTime::hasActualStart() { return !entity->getArgument(16)->isNull(); }
-IfcDateTime IfcTaskTime::ActualStart() { return *entity->getArgument(16); }
-void IfcTaskTime::setActualStart(IfcDateTime v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(16,v); }
-bool IfcTaskTime::hasActualFinish() { return !entity->getArgument(17)->isNull(); }
-IfcDateTime IfcTaskTime::ActualFinish() { return *entity->getArgument(17); }
-void IfcTaskTime::setActualFinish(IfcDateTime v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(17,v); }
-bool IfcTaskTime::hasRemainingTime() { return !entity->getArgument(18)->isNull(); }
-IfcDuration IfcTaskTime::RemainingTime() { return *entity->getArgument(18); }
-void IfcTaskTime::setRemainingTime(IfcDuration v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(18,v); }
-bool IfcTaskTime::hasCompletion() { return !entity->getArgument(19)->isNull(); }
-IfcPositiveRatioMeasure IfcTaskTime::Completion() { return *entity->getArgument(19); }
-void IfcTaskTime::setCompletion(IfcPositiveRatioMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(19,v); }
+bool IfcTaskTime::hasStatusTime() const { return !entity->getArgument(14)->isNull(); }
+std::string IfcTaskTime::StatusTime() const { return *entity->getArgument(14); }
+void IfcTaskTime::setStatusTime(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(14,v); }
+bool IfcTaskTime::hasActualDuration() const { return !entity->getArgument(15)->isNull(); }
+std::string IfcTaskTime::ActualDuration() const { return *entity->getArgument(15); }
+void IfcTaskTime::setActualDuration(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(15,v); }
+bool IfcTaskTime::hasActualStart() const { return !entity->getArgument(16)->isNull(); }
+std::string IfcTaskTime::ActualStart() const { return *entity->getArgument(16); }
+void IfcTaskTime::setActualStart(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(16,v); }
+bool IfcTaskTime::hasActualFinish() const { return !entity->getArgument(17)->isNull(); }
+std::string IfcTaskTime::ActualFinish() const { return *entity->getArgument(17); }
+void IfcTaskTime::setActualFinish(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(17,v); }
+bool IfcTaskTime::hasRemainingTime() const { return !entity->getArgument(18)->isNull(); }
+std::string IfcTaskTime::RemainingTime() const { return *entity->getArgument(18); }
+void IfcTaskTime::setRemainingTime(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(18,v); }
+bool IfcTaskTime::hasCompletion() const { return !entity->getArgument(19)->isNull(); }
+double IfcTaskTime::Completion() const { return *entity->getArgument(19); }
+void IfcTaskTime::setCompletion(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(19,v); }
 bool IfcTaskTime::is(Type::Enum v) const { return v == Type::IfcTaskTime || IfcSchedulingTime::is(v); }
 Type::Enum IfcTaskTime::type() const { return Type::IfcTaskTime; }
 Type::Enum IfcTaskTime::Class() { return Type::IfcTaskTime; }
-IfcTaskTime::IfcTaskTime(IfcAbstractEntityPtr e) : IfcSchedulingTime((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcTaskTime)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcTaskTime::IfcTaskTime(boost::optional< IfcLabel > v1_Name, boost::optional< IfcDataOriginEnum::IfcDataOriginEnum > v2_DataOrigin, boost::optional< IfcLabel > v3_UserDefinedDataOrigin, boost::optional< IfcTaskDurationEnum::IfcTaskDurationEnum > v4_DurationType, boost::optional< IfcDuration > v5_ScheduleDuration, boost::optional< IfcDateTime > v6_ScheduleStart, boost::optional< IfcDateTime > v7_ScheduleFinish, boost::optional< IfcDateTime > v8_EarlyStart, boost::optional< IfcDateTime > v9_EarlyFinish, boost::optional< IfcDateTime > v10_LateStart, boost::optional< IfcDateTime > v11_LateFinish, boost::optional< IfcDuration > v12_FreeFloat, boost::optional< IfcDuration > v13_TotalFloat, boost::optional< bool > v14_IsCritical, boost::optional< IfcDateTime > v15_StatusTime, boost::optional< IfcDuration > v16_ActualDuration, boost::optional< IfcDateTime > v17_ActualStart, boost::optional< IfcDateTime > v18_ActualFinish, boost::optional< IfcDuration > v19_RemainingTime, boost::optional< IfcPositiveRatioMeasure > v20_Completion) : IfcSchedulingTime((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_DataOrigin) { e->setArgument(1,*v2_DataOrigin,IfcDataOriginEnum::ToString(*v2_DataOrigin)); } else { e->setArgument(1); } if (v3_UserDefinedDataOrigin) { e->setArgument(2,(*v3_UserDefinedDataOrigin)); } else { e->setArgument(2); } if (v4_DurationType) { e->setArgument(3,*v4_DurationType,IfcTaskDurationEnum::ToString(*v4_DurationType)); } else { e->setArgument(3); } if (v5_ScheduleDuration) { e->setArgument(4,(*v5_ScheduleDuration)); } else { e->setArgument(4); } if (v6_ScheduleStart) { e->setArgument(5,(*v6_ScheduleStart)); } else { e->setArgument(5); } if (v7_ScheduleFinish) { e->setArgument(6,(*v7_ScheduleFinish)); } else { e->setArgument(6); } if (v8_EarlyStart) { e->setArgument(7,(*v8_EarlyStart)); } else { e->setArgument(7); } if (v9_EarlyFinish) { e->setArgument(8,(*v9_EarlyFinish)); } else { e->setArgument(8); } if (v10_LateStart) { e->setArgument(9,(*v10_LateStart)); } else { e->setArgument(9); } if (v11_LateFinish) { e->setArgument(10,(*v11_LateFinish)); } else { e->setArgument(10); } if (v12_FreeFloat) { e->setArgument(11,(*v12_FreeFloat)); } else { e->setArgument(11); } if (v13_TotalFloat) { e->setArgument(12,(*v13_TotalFloat)); } else { e->setArgument(12); } if (v14_IsCritical) { e->setArgument(13,(*v14_IsCritical)); } else { e->setArgument(13); } if (v15_StatusTime) { e->setArgument(14,(*v15_StatusTime)); } else { e->setArgument(14); } if (v16_ActualDuration) { e->setArgument(15,(*v16_ActualDuration)); } else { e->setArgument(15); } if (v17_ActualStart) { e->setArgument(16,(*v17_ActualStart)); } else { e->setArgument(16); } if (v18_ActualFinish) { e->setArgument(17,(*v18_ActualFinish)); } else { e->setArgument(17); } if (v19_RemainingTime) { e->setArgument(18,(*v19_RemainingTime)); } else { e->setArgument(18); } if (v20_Completion) { e->setArgument(19,(*v20_Completion)); } else { e->setArgument(19); } entity = e; EntityBuffer::Add(this); }
+IfcTaskTime::IfcTaskTime(IfcAbstractEntity* e) : IfcSchedulingTime((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcTaskTime)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcTaskTime::IfcTaskTime(boost::optional< std::string > v1_Name, boost::optional< IfcDataOriginEnum::IfcDataOriginEnum > v2_DataOrigin, boost::optional< std::string > v3_UserDefinedDataOrigin, boost::optional< IfcTaskDurationEnum::IfcTaskDurationEnum > v4_DurationType, boost::optional< std::string > v5_ScheduleDuration, boost::optional< std::string > v6_ScheduleStart, boost::optional< std::string > v7_ScheduleFinish, boost::optional< std::string > v8_EarlyStart, boost::optional< std::string > v9_EarlyFinish, boost::optional< std::string > v10_LateStart, boost::optional< std::string > v11_LateFinish, boost::optional< std::string > v12_FreeFloat, boost::optional< std::string > v13_TotalFloat, boost::optional< bool > v14_IsCritical, boost::optional< std::string > v15_StatusTime, boost::optional< std::string > v16_ActualDuration, boost::optional< std::string > v17_ActualStart, boost::optional< std::string > v18_ActualFinish, boost::optional< std::string > v19_RemainingTime, boost::optional< double > v20_Completion) : IfcSchedulingTime((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_DataOrigin) { e->setArgument(1,*v2_DataOrigin,IfcDataOriginEnum::ToString(*v2_DataOrigin)); } else { e->setArgument(1); } if (v3_UserDefinedDataOrigin) { e->setArgument(2,(*v3_UserDefinedDataOrigin)); } else { e->setArgument(2); } if (v4_DurationType) { e->setArgument(3,*v4_DurationType,IfcTaskDurationEnum::ToString(*v4_DurationType)); } else { e->setArgument(3); } if (v5_ScheduleDuration) { e->setArgument(4,(*v5_ScheduleDuration)); } else { e->setArgument(4); } if (v6_ScheduleStart) { e->setArgument(5,(*v6_ScheduleStart)); } else { e->setArgument(5); } if (v7_ScheduleFinish) { e->setArgument(6,(*v7_ScheduleFinish)); } else { e->setArgument(6); } if (v8_EarlyStart) { e->setArgument(7,(*v8_EarlyStart)); } else { e->setArgument(7); } if (v9_EarlyFinish) { e->setArgument(8,(*v9_EarlyFinish)); } else { e->setArgument(8); } if (v10_LateStart) { e->setArgument(9,(*v10_LateStart)); } else { e->setArgument(9); } if (v11_LateFinish) { e->setArgument(10,(*v11_LateFinish)); } else { e->setArgument(10); } if (v12_FreeFloat) { e->setArgument(11,(*v12_FreeFloat)); } else { e->setArgument(11); } if (v13_TotalFloat) { e->setArgument(12,(*v13_TotalFloat)); } else { e->setArgument(12); } if (v14_IsCritical) { e->setArgument(13,(*v14_IsCritical)); } else { e->setArgument(13); } if (v15_StatusTime) { e->setArgument(14,(*v15_StatusTime)); } else { e->setArgument(14); } if (v16_ActualDuration) { e->setArgument(15,(*v16_ActualDuration)); } else { e->setArgument(15); } if (v17_ActualStart) { e->setArgument(16,(*v17_ActualStart)); } else { e->setArgument(16); } if (v18_ActualFinish) { e->setArgument(17,(*v18_ActualFinish)); } else { e->setArgument(17); } if (v19_RemainingTime) { e->setArgument(18,(*v19_RemainingTime)); } else { e->setArgument(18); } if (v20_Completion) { e->setArgument(19,(*v20_Completion)); } else { e->setArgument(19); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcTaskTimeRecurring
-IfcRecurrencePattern* IfcTaskTimeRecurring::Recurrance() { return (IfcRecurrencePattern*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(20))); }
+IfcRecurrencePattern* IfcTaskTimeRecurring::Recurrance() const { return (IfcRecurrencePattern*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(20))); }
 void IfcTaskTimeRecurring::setRecurrance(IfcRecurrencePattern* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(20,v); }
 bool IfcTaskTimeRecurring::is(Type::Enum v) const { return v == Type::IfcTaskTimeRecurring || IfcTaskTime::is(v); }
 Type::Enum IfcTaskTimeRecurring::type() const { return Type::IfcTaskTimeRecurring; }
 Type::Enum IfcTaskTimeRecurring::Class() { return Type::IfcTaskTimeRecurring; }
-IfcTaskTimeRecurring::IfcTaskTimeRecurring(IfcAbstractEntityPtr e) : IfcTaskTime((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcTaskTimeRecurring)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcTaskTimeRecurring::IfcTaskTimeRecurring(boost::optional< IfcLabel > v1_Name, boost::optional< IfcDataOriginEnum::IfcDataOriginEnum > v2_DataOrigin, boost::optional< IfcLabel > v3_UserDefinedDataOrigin, boost::optional< IfcTaskDurationEnum::IfcTaskDurationEnum > v4_DurationType, boost::optional< IfcDuration > v5_ScheduleDuration, boost::optional< IfcDateTime > v6_ScheduleStart, boost::optional< IfcDateTime > v7_ScheduleFinish, boost::optional< IfcDateTime > v8_EarlyStart, boost::optional< IfcDateTime > v9_EarlyFinish, boost::optional< IfcDateTime > v10_LateStart, boost::optional< IfcDateTime > v11_LateFinish, boost::optional< IfcDuration > v12_FreeFloat, boost::optional< IfcDuration > v13_TotalFloat, boost::optional< bool > v14_IsCritical, boost::optional< IfcDateTime > v15_StatusTime, boost::optional< IfcDuration > v16_ActualDuration, boost::optional< IfcDateTime > v17_ActualStart, boost::optional< IfcDateTime > v18_ActualFinish, boost::optional< IfcDuration > v19_RemainingTime, boost::optional< IfcPositiveRatioMeasure > v20_Completion, IfcRecurrencePattern* v21_Recurrance) : IfcTaskTime((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_DataOrigin) { e->setArgument(1,*v2_DataOrigin,IfcDataOriginEnum::ToString(*v2_DataOrigin)); } else { e->setArgument(1); } if (v3_UserDefinedDataOrigin) { e->setArgument(2,(*v3_UserDefinedDataOrigin)); } else { e->setArgument(2); } if (v4_DurationType) { e->setArgument(3,*v4_DurationType,IfcTaskDurationEnum::ToString(*v4_DurationType)); } else { e->setArgument(3); } if (v5_ScheduleDuration) { e->setArgument(4,(*v5_ScheduleDuration)); } else { e->setArgument(4); } if (v6_ScheduleStart) { e->setArgument(5,(*v6_ScheduleStart)); } else { e->setArgument(5); } if (v7_ScheduleFinish) { e->setArgument(6,(*v7_ScheduleFinish)); } else { e->setArgument(6); } if (v8_EarlyStart) { e->setArgument(7,(*v8_EarlyStart)); } else { e->setArgument(7); } if (v9_EarlyFinish) { e->setArgument(8,(*v9_EarlyFinish)); } else { e->setArgument(8); } if (v10_LateStart) { e->setArgument(9,(*v10_LateStart)); } else { e->setArgument(9); } if (v11_LateFinish) { e->setArgument(10,(*v11_LateFinish)); } else { e->setArgument(10); } if (v12_FreeFloat) { e->setArgument(11,(*v12_FreeFloat)); } else { e->setArgument(11); } if (v13_TotalFloat) { e->setArgument(12,(*v13_TotalFloat)); } else { e->setArgument(12); } if (v14_IsCritical) { e->setArgument(13,(*v14_IsCritical)); } else { e->setArgument(13); } if (v15_StatusTime) { e->setArgument(14,(*v15_StatusTime)); } else { e->setArgument(14); } if (v16_ActualDuration) { e->setArgument(15,(*v16_ActualDuration)); } else { e->setArgument(15); } if (v17_ActualStart) { e->setArgument(16,(*v17_ActualStart)); } else { e->setArgument(16); } if (v18_ActualFinish) { e->setArgument(17,(*v18_ActualFinish)); } else { e->setArgument(17); } if (v19_RemainingTime) { e->setArgument(18,(*v19_RemainingTime)); } else { e->setArgument(18); } if (v20_Completion) { e->setArgument(19,(*v20_Completion)); } else { e->setArgument(19); } e->setArgument(20,(v21_Recurrance)); entity = e; EntityBuffer::Add(this); }
+IfcTaskTimeRecurring::IfcTaskTimeRecurring(IfcAbstractEntity* e) : IfcTaskTime((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcTaskTimeRecurring)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcTaskTimeRecurring::IfcTaskTimeRecurring(boost::optional< std::string > v1_Name, boost::optional< IfcDataOriginEnum::IfcDataOriginEnum > v2_DataOrigin, boost::optional< std::string > v3_UserDefinedDataOrigin, boost::optional< IfcTaskDurationEnum::IfcTaskDurationEnum > v4_DurationType, boost::optional< std::string > v5_ScheduleDuration, boost::optional< std::string > v6_ScheduleStart, boost::optional< std::string > v7_ScheduleFinish, boost::optional< std::string > v8_EarlyStart, boost::optional< std::string > v9_EarlyFinish, boost::optional< std::string > v10_LateStart, boost::optional< std::string > v11_LateFinish, boost::optional< std::string > v12_FreeFloat, boost::optional< std::string > v13_TotalFloat, boost::optional< bool > v14_IsCritical, boost::optional< std::string > v15_StatusTime, boost::optional< std::string > v16_ActualDuration, boost::optional< std::string > v17_ActualStart, boost::optional< std::string > v18_ActualFinish, boost::optional< std::string > v19_RemainingTime, boost::optional< double > v20_Completion, IfcRecurrencePattern* v21_Recurrance) : IfcTaskTime((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_DataOrigin) { e->setArgument(1,*v2_DataOrigin,IfcDataOriginEnum::ToString(*v2_DataOrigin)); } else { e->setArgument(1); } if (v3_UserDefinedDataOrigin) { e->setArgument(2,(*v3_UserDefinedDataOrigin)); } else { e->setArgument(2); } if (v4_DurationType) { e->setArgument(3,*v4_DurationType,IfcTaskDurationEnum::ToString(*v4_DurationType)); } else { e->setArgument(3); } if (v5_ScheduleDuration) { e->setArgument(4,(*v5_ScheduleDuration)); } else { e->setArgument(4); } if (v6_ScheduleStart) { e->setArgument(5,(*v6_ScheduleStart)); } else { e->setArgument(5); } if (v7_ScheduleFinish) { e->setArgument(6,(*v7_ScheduleFinish)); } else { e->setArgument(6); } if (v8_EarlyStart) { e->setArgument(7,(*v8_EarlyStart)); } else { e->setArgument(7); } if (v9_EarlyFinish) { e->setArgument(8,(*v9_EarlyFinish)); } else { e->setArgument(8); } if (v10_LateStart) { e->setArgument(9,(*v10_LateStart)); } else { e->setArgument(9); } if (v11_LateFinish) { e->setArgument(10,(*v11_LateFinish)); } else { e->setArgument(10); } if (v12_FreeFloat) { e->setArgument(11,(*v12_FreeFloat)); } else { e->setArgument(11); } if (v13_TotalFloat) { e->setArgument(12,(*v13_TotalFloat)); } else { e->setArgument(12); } if (v14_IsCritical) { e->setArgument(13,(*v14_IsCritical)); } else { e->setArgument(13); } if (v15_StatusTime) { e->setArgument(14,(*v15_StatusTime)); } else { e->setArgument(14); } if (v16_ActualDuration) { e->setArgument(15,(*v16_ActualDuration)); } else { e->setArgument(15); } if (v17_ActualStart) { e->setArgument(16,(*v17_ActualStart)); } else { e->setArgument(16); } if (v18_ActualFinish) { e->setArgument(17,(*v18_ActualFinish)); } else { e->setArgument(17); } if (v19_RemainingTime) { e->setArgument(18,(*v19_RemainingTime)); } else { e->setArgument(18); } if (v20_Completion) { e->setArgument(19,(*v20_Completion)); } else { e->setArgument(19); } e->setArgument(20,(v21_Recurrance)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcTaskType
-IfcTaskTypeEnum::IfcTaskTypeEnum IfcTaskType::PredefinedType() { return IfcTaskTypeEnum::FromString(*entity->getArgument(9)); }
+IfcTaskTypeEnum::IfcTaskTypeEnum IfcTaskType::PredefinedType() const { return IfcTaskTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcTaskType::setPredefinedType(IfcTaskTypeEnum::IfcTaskTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcTaskTypeEnum::ToString(v)); }
-bool IfcTaskType::hasWorkMethod() { return !entity->getArgument(10)->isNull(); }
-IfcLabel IfcTaskType::WorkMethod() { return *entity->getArgument(10); }
-void IfcTaskType::setWorkMethod(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
+bool IfcTaskType::hasWorkMethod() const { return !entity->getArgument(10)->isNull(); }
+std::string IfcTaskType::WorkMethod() const { return *entity->getArgument(10); }
+void IfcTaskType::setWorkMethod(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
 bool IfcTaskType::is(Type::Enum v) const { return v == Type::IfcTaskType || IfcTypeProcess::is(v); }
 Type::Enum IfcTaskType::type() const { return Type::IfcTaskType; }
 Type::Enum IfcTaskType::Class() { return Type::IfcTaskType; }
-IfcTaskType::IfcTaskType(IfcAbstractEntityPtr e) : IfcTypeProcess((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcTaskType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcTaskType::IfcTaskType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< IfcIdentifier > v7_Identification, boost::optional< IfcText > v8_LongDescription, boost::optional< IfcLabel > v9_ProcessType, IfcTaskTypeEnum::IfcTaskTypeEnum v10_PredefinedType, boost::optional< IfcLabel > v11_WorkMethod) : IfcTypeProcess((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_Identification) { e->setArgument(6,(*v7_Identification)); } else { e->setArgument(6); } if (v8_LongDescription) { e->setArgument(7,(*v8_LongDescription)); } else { e->setArgument(7); } if (v9_ProcessType) { e->setArgument(8,(*v9_ProcessType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcTaskTypeEnum::ToString(v10_PredefinedType)); if (v11_WorkMethod) { e->setArgument(10,(*v11_WorkMethod)); } else { e->setArgument(10); } entity = e; EntityBuffer::Add(this); }
+IfcTaskType::IfcTaskType(IfcAbstractEntity* e) : IfcTypeProcess((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcTaskType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcTaskType::IfcTaskType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< std::string > v7_Identification, boost::optional< std::string > v8_LongDescription, boost::optional< std::string > v9_ProcessType, IfcTaskTypeEnum::IfcTaskTypeEnum v10_PredefinedType, boost::optional< std::string > v11_WorkMethod) : IfcTypeProcess((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_Identification) { e->setArgument(6,(*v7_Identification)); } else { e->setArgument(6); } if (v8_LongDescription) { e->setArgument(7,(*v8_LongDescription)); } else { e->setArgument(7); } if (v9_ProcessType) { e->setArgument(8,(*v9_ProcessType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcTaskTypeEnum::ToString(v10_PredefinedType)); if (v11_WorkMethod) { e->setArgument(10,(*v11_WorkMethod)); } else { e->setArgument(10); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcTelecomAddress
-bool IfcTelecomAddress::hasTelephoneNumbers() { return !entity->getArgument(3)->isNull(); }
-std::vector< IfcLabel > /*[1:?]*/ IfcTelecomAddress::TelephoneNumbers() { return *entity->getArgument(3); }
-void IfcTelecomAddress::setTelephoneNumbers(std::vector< IfcLabel > /*[1:?]*/ v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-bool IfcTelecomAddress::hasFacsimileNumbers() { return !entity->getArgument(4)->isNull(); }
-std::vector< IfcLabel > /*[1:?]*/ IfcTelecomAddress::FacsimileNumbers() { return *entity->getArgument(4); }
-void IfcTelecomAddress::setFacsimileNumbers(std::vector< IfcLabel > /*[1:?]*/ v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-bool IfcTelecomAddress::hasPagerNumber() { return !entity->getArgument(5)->isNull(); }
-IfcLabel IfcTelecomAddress::PagerNumber() { return *entity->getArgument(5); }
-void IfcTelecomAddress::setPagerNumber(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-bool IfcTelecomAddress::hasElectronicMailAddresses() { return !entity->getArgument(6)->isNull(); }
-std::vector< IfcLabel > /*[1:?]*/ IfcTelecomAddress::ElectronicMailAddresses() { return *entity->getArgument(6); }
-void IfcTelecomAddress::setElectronicMailAddresses(std::vector< IfcLabel > /*[1:?]*/ v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
-bool IfcTelecomAddress::hasWWWHomePageURL() { return !entity->getArgument(7)->isNull(); }
-IfcURIReference IfcTelecomAddress::WWWHomePageURL() { return *entity->getArgument(7); }
-void IfcTelecomAddress::setWWWHomePageURL(IfcURIReference v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
-bool IfcTelecomAddress::hasMessagingIDs() { return !entity->getArgument(8)->isNull(); }
-std::vector< IfcURIReference > /*[1:?]*/ IfcTelecomAddress::MessagingIDs() { return *entity->getArgument(8); }
-void IfcTelecomAddress::setMessagingIDs(std::vector< IfcURIReference > /*[1:?]*/ v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
+bool IfcTelecomAddress::hasTelephoneNumbers() const { return !entity->getArgument(3)->isNull(); }
+std::vector< std::string > /*[1:?]*/ IfcTelecomAddress::TelephoneNumbers() const { return *entity->getArgument(3); }
+void IfcTelecomAddress::setTelephoneNumbers(std::vector< std::string > /*[1:?]*/ v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+bool IfcTelecomAddress::hasFacsimileNumbers() const { return !entity->getArgument(4)->isNull(); }
+std::vector< std::string > /*[1:?]*/ IfcTelecomAddress::FacsimileNumbers() const { return *entity->getArgument(4); }
+void IfcTelecomAddress::setFacsimileNumbers(std::vector< std::string > /*[1:?]*/ v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+bool IfcTelecomAddress::hasPagerNumber() const { return !entity->getArgument(5)->isNull(); }
+std::string IfcTelecomAddress::PagerNumber() const { return *entity->getArgument(5); }
+void IfcTelecomAddress::setPagerNumber(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+bool IfcTelecomAddress::hasElectronicMailAddresses() const { return !entity->getArgument(6)->isNull(); }
+std::vector< std::string > /*[1:?]*/ IfcTelecomAddress::ElectronicMailAddresses() const { return *entity->getArgument(6); }
+void IfcTelecomAddress::setElectronicMailAddresses(std::vector< std::string > /*[1:?]*/ v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
+bool IfcTelecomAddress::hasWWWHomePageURL() const { return !entity->getArgument(7)->isNull(); }
+std::string IfcTelecomAddress::WWWHomePageURL() const { return *entity->getArgument(7); }
+void IfcTelecomAddress::setWWWHomePageURL(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
+bool IfcTelecomAddress::hasMessagingIDs() const { return !entity->getArgument(8)->isNull(); }
+std::vector< std::string > /*[1:?]*/ IfcTelecomAddress::MessagingIDs() const { return *entity->getArgument(8); }
+void IfcTelecomAddress::setMessagingIDs(std::vector< std::string > /*[1:?]*/ v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
 bool IfcTelecomAddress::is(Type::Enum v) const { return v == Type::IfcTelecomAddress || IfcAddress::is(v); }
 Type::Enum IfcTelecomAddress::type() const { return Type::IfcTelecomAddress; }
 Type::Enum IfcTelecomAddress::Class() { return Type::IfcTelecomAddress; }
-IfcTelecomAddress::IfcTelecomAddress(IfcAbstractEntityPtr e) : IfcAddress((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcTelecomAddress)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcTelecomAddress::IfcTelecomAddress(boost::optional< IfcAddressTypeEnum::IfcAddressTypeEnum > v1_Purpose, boost::optional< IfcText > v2_Description, boost::optional< IfcLabel > v3_UserDefinedPurpose, boost::optional< std::vector< IfcLabel > /*[1:?]*/ > v4_TelephoneNumbers, boost::optional< std::vector< IfcLabel > /*[1:?]*/ > v5_FacsimileNumbers, boost::optional< IfcLabel > v6_PagerNumber, boost::optional< std::vector< IfcLabel > /*[1:?]*/ > v7_ElectronicMailAddresses, boost::optional< IfcURIReference > v8_WWWHomePageURL, boost::optional< std::vector< IfcURIReference > /*[1:?]*/ > v9_MessagingIDs) : IfcAddress((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Purpose) { e->setArgument(0,*v1_Purpose,IfcAddressTypeEnum::ToString(*v1_Purpose)); } else { e->setArgument(0); } if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } if (v3_UserDefinedPurpose) { e->setArgument(2,(*v3_UserDefinedPurpose)); } else { e->setArgument(2); } if (v4_TelephoneNumbers) { e->setArgument(3,(*v4_TelephoneNumbers)); } else { e->setArgument(3); } if (v5_FacsimileNumbers) { e->setArgument(4,(*v5_FacsimileNumbers)); } else { e->setArgument(4); } if (v6_PagerNumber) { e->setArgument(5,(*v6_PagerNumber)); } else { e->setArgument(5); } if (v7_ElectronicMailAddresses) { e->setArgument(6,(*v7_ElectronicMailAddresses)); } else { e->setArgument(6); } if (v8_WWWHomePageURL) { e->setArgument(7,(*v8_WWWHomePageURL)); } else { e->setArgument(7); } if (v9_MessagingIDs) { e->setArgument(8,(*v9_MessagingIDs)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcTelecomAddress::IfcTelecomAddress(IfcAbstractEntity* e) : IfcAddress((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcTelecomAddress)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcTelecomAddress::IfcTelecomAddress(boost::optional< IfcAddressTypeEnum::IfcAddressTypeEnum > v1_Purpose, boost::optional< std::string > v2_Description, boost::optional< std::string > v3_UserDefinedPurpose, boost::optional< std::vector< std::string > /*[1:?]*/ > v4_TelephoneNumbers, boost::optional< std::vector< std::string > /*[1:?]*/ > v5_FacsimileNumbers, boost::optional< std::string > v6_PagerNumber, boost::optional< std::vector< std::string > /*[1:?]*/ > v7_ElectronicMailAddresses, boost::optional< std::string > v8_WWWHomePageURL, boost::optional< std::vector< std::string > /*[1:?]*/ > v9_MessagingIDs) : IfcAddress((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Purpose) { e->setArgument(0,*v1_Purpose,IfcAddressTypeEnum::ToString(*v1_Purpose)); } else { e->setArgument(0); } if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } if (v3_UserDefinedPurpose) { e->setArgument(2,(*v3_UserDefinedPurpose)); } else { e->setArgument(2); } if (v4_TelephoneNumbers) { e->setArgument(3,(*v4_TelephoneNumbers)); } else { e->setArgument(3); } if (v5_FacsimileNumbers) { e->setArgument(4,(*v5_FacsimileNumbers)); } else { e->setArgument(4); } if (v6_PagerNumber) { e->setArgument(5,(*v6_PagerNumber)); } else { e->setArgument(5); } if (v7_ElectronicMailAddresses) { e->setArgument(6,(*v7_ElectronicMailAddresses)); } else { e->setArgument(6); } if (v8_WWWHomePageURL) { e->setArgument(7,(*v8_WWWHomePageURL)); } else { e->setArgument(7); } if (v9_MessagingIDs) { e->setArgument(8,(*v9_MessagingIDs)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcTendon
-bool IfcTendon::hasPredefinedType() { return !entity->getArgument(9)->isNull(); }
-IfcTendonTypeEnum::IfcTendonTypeEnum IfcTendon::PredefinedType() { return IfcTendonTypeEnum::FromString(*entity->getArgument(9)); }
+bool IfcTendon::hasPredefinedType() const { return !entity->getArgument(9)->isNull(); }
+IfcTendonTypeEnum::IfcTendonTypeEnum IfcTendon::PredefinedType() const { return IfcTendonTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcTendon::setPredefinedType(IfcTendonTypeEnum::IfcTendonTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcTendonTypeEnum::ToString(v)); }
-bool IfcTendon::hasNominalDiameter() { return !entity->getArgument(10)->isNull(); }
-IfcPositiveLengthMeasure IfcTendon::NominalDiameter() { return *entity->getArgument(10); }
-void IfcTendon::setNominalDiameter(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
-bool IfcTendon::hasCrossSectionArea() { return !entity->getArgument(11)->isNull(); }
-IfcAreaMeasure IfcTendon::CrossSectionArea() { return *entity->getArgument(11); }
-void IfcTendon::setCrossSectionArea(IfcAreaMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(11,v); }
-bool IfcTendon::hasTensionForce() { return !entity->getArgument(12)->isNull(); }
-IfcForceMeasure IfcTendon::TensionForce() { return *entity->getArgument(12); }
-void IfcTendon::setTensionForce(IfcForceMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(12,v); }
-bool IfcTendon::hasPreStress() { return !entity->getArgument(13)->isNull(); }
-IfcPressureMeasure IfcTendon::PreStress() { return *entity->getArgument(13); }
-void IfcTendon::setPreStress(IfcPressureMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(13,v); }
-bool IfcTendon::hasFrictionCoefficient() { return !entity->getArgument(14)->isNull(); }
-IfcNormalisedRatioMeasure IfcTendon::FrictionCoefficient() { return *entity->getArgument(14); }
-void IfcTendon::setFrictionCoefficient(IfcNormalisedRatioMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(14,v); }
-bool IfcTendon::hasAnchorageSlip() { return !entity->getArgument(15)->isNull(); }
-IfcPositiveLengthMeasure IfcTendon::AnchorageSlip() { return *entity->getArgument(15); }
-void IfcTendon::setAnchorageSlip(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(15,v); }
-bool IfcTendon::hasMinCurvatureRadius() { return !entity->getArgument(16)->isNull(); }
-IfcPositiveLengthMeasure IfcTendon::MinCurvatureRadius() { return *entity->getArgument(16); }
-void IfcTendon::setMinCurvatureRadius(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(16,v); }
+bool IfcTendon::hasNominalDiameter() const { return !entity->getArgument(10)->isNull(); }
+double IfcTendon::NominalDiameter() const { return *entity->getArgument(10); }
+void IfcTendon::setNominalDiameter(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
+bool IfcTendon::hasCrossSectionArea() const { return !entity->getArgument(11)->isNull(); }
+double IfcTendon::CrossSectionArea() const { return *entity->getArgument(11); }
+void IfcTendon::setCrossSectionArea(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(11,v); }
+bool IfcTendon::hasTensionForce() const { return !entity->getArgument(12)->isNull(); }
+double IfcTendon::TensionForce() const { return *entity->getArgument(12); }
+void IfcTendon::setTensionForce(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(12,v); }
+bool IfcTendon::hasPreStress() const { return !entity->getArgument(13)->isNull(); }
+double IfcTendon::PreStress() const { return *entity->getArgument(13); }
+void IfcTendon::setPreStress(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(13,v); }
+bool IfcTendon::hasFrictionCoefficient() const { return !entity->getArgument(14)->isNull(); }
+double IfcTendon::FrictionCoefficient() const { return *entity->getArgument(14); }
+void IfcTendon::setFrictionCoefficient(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(14,v); }
+bool IfcTendon::hasAnchorageSlip() const { return !entity->getArgument(15)->isNull(); }
+double IfcTendon::AnchorageSlip() const { return *entity->getArgument(15); }
+void IfcTendon::setAnchorageSlip(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(15,v); }
+bool IfcTendon::hasMinCurvatureRadius() const { return !entity->getArgument(16)->isNull(); }
+double IfcTendon::MinCurvatureRadius() const { return *entity->getArgument(16); }
+void IfcTendon::setMinCurvatureRadius(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(16,v); }
 bool IfcTendon::is(Type::Enum v) const { return v == Type::IfcTendon || IfcReinforcingElement::is(v); }
 Type::Enum IfcTendon::type() const { return Type::IfcTendon; }
 Type::Enum IfcTendon::Class() { return Type::IfcTendon; }
-IfcTendon::IfcTendon(IfcAbstractEntityPtr e) : IfcReinforcingElement((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcTendon)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcTendon::IfcTendon(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcLabel > v9_SteelGrade, boost::optional< IfcTendonTypeEnum::IfcTendonTypeEnum > v10_PredefinedType, boost::optional< IfcPositiveLengthMeasure > v11_NominalDiameter, boost::optional< IfcAreaMeasure > v12_CrossSectionArea, boost::optional< IfcForceMeasure > v13_TensionForce, boost::optional< IfcPressureMeasure > v14_PreStress, boost::optional< IfcNormalisedRatioMeasure > v15_FrictionCoefficient, boost::optional< IfcPositiveLengthMeasure > v16_AnchorageSlip, boost::optional< IfcPositiveLengthMeasure > v17_MinCurvatureRadius) : IfcReinforcingElement((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_SteelGrade) { e->setArgument(8,(*v9_SteelGrade)); } else { e->setArgument(8); } if (v10_PredefinedType) { e->setArgument(9,*v10_PredefinedType,IfcTendonTypeEnum::ToString(*v10_PredefinedType)); } else { e->setArgument(9); } if (v11_NominalDiameter) { e->setArgument(10,(*v11_NominalDiameter)); } else { e->setArgument(10); } if (v12_CrossSectionArea) { e->setArgument(11,(*v12_CrossSectionArea)); } else { e->setArgument(11); } if (v13_TensionForce) { e->setArgument(12,(*v13_TensionForce)); } else { e->setArgument(12); } if (v14_PreStress) { e->setArgument(13,(*v14_PreStress)); } else { e->setArgument(13); } if (v15_FrictionCoefficient) { e->setArgument(14,(*v15_FrictionCoefficient)); } else { e->setArgument(14); } if (v16_AnchorageSlip) { e->setArgument(15,(*v16_AnchorageSlip)); } else { e->setArgument(15); } if (v17_MinCurvatureRadius) { e->setArgument(16,(*v17_MinCurvatureRadius)); } else { e->setArgument(16); } entity = e; EntityBuffer::Add(this); }
+IfcTendon::IfcTendon(IfcAbstractEntity* e) : IfcReinforcingElement((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcTendon)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcTendon::IfcTendon(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_SteelGrade, boost::optional< IfcTendonTypeEnum::IfcTendonTypeEnum > v10_PredefinedType, boost::optional< double > v11_NominalDiameter, boost::optional< double > v12_CrossSectionArea, boost::optional< double > v13_TensionForce, boost::optional< double > v14_PreStress, boost::optional< double > v15_FrictionCoefficient, boost::optional< double > v16_AnchorageSlip, boost::optional< double > v17_MinCurvatureRadius) : IfcReinforcingElement((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_SteelGrade) { e->setArgument(8,(*v9_SteelGrade)); } else { e->setArgument(8); } if (v10_PredefinedType) { e->setArgument(9,*v10_PredefinedType,IfcTendonTypeEnum::ToString(*v10_PredefinedType)); } else { e->setArgument(9); } if (v11_NominalDiameter) { e->setArgument(10,(*v11_NominalDiameter)); } else { e->setArgument(10); } if (v12_CrossSectionArea) { e->setArgument(11,(*v12_CrossSectionArea)); } else { e->setArgument(11); } if (v13_TensionForce) { e->setArgument(12,(*v13_TensionForce)); } else { e->setArgument(12); } if (v14_PreStress) { e->setArgument(13,(*v14_PreStress)); } else { e->setArgument(13); } if (v15_FrictionCoefficient) { e->setArgument(14,(*v15_FrictionCoefficient)); } else { e->setArgument(14); } if (v16_AnchorageSlip) { e->setArgument(15,(*v16_AnchorageSlip)); } else { e->setArgument(15); } if (v17_MinCurvatureRadius) { e->setArgument(16,(*v17_MinCurvatureRadius)); } else { e->setArgument(16); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcTendonAnchor
-bool IfcTendonAnchor::hasPredefinedType() { return !entity->getArgument(9)->isNull(); }
-IfcTendonAnchorTypeEnum::IfcTendonAnchorTypeEnum IfcTendonAnchor::PredefinedType() { return IfcTendonAnchorTypeEnum::FromString(*entity->getArgument(9)); }
+bool IfcTendonAnchor::hasPredefinedType() const { return !entity->getArgument(9)->isNull(); }
+IfcTendonAnchorTypeEnum::IfcTendonAnchorTypeEnum IfcTendonAnchor::PredefinedType() const { return IfcTendonAnchorTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcTendonAnchor::setPredefinedType(IfcTendonAnchorTypeEnum::IfcTendonAnchorTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcTendonAnchorTypeEnum::ToString(v)); }
 bool IfcTendonAnchor::is(Type::Enum v) const { return v == Type::IfcTendonAnchor || IfcReinforcingElement::is(v); }
 Type::Enum IfcTendonAnchor::type() const { return Type::IfcTendonAnchor; }
 Type::Enum IfcTendonAnchor::Class() { return Type::IfcTendonAnchor; }
-IfcTendonAnchor::IfcTendonAnchor(IfcAbstractEntityPtr e) : IfcReinforcingElement((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcTendonAnchor)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcTendonAnchor::IfcTendonAnchor(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcLabel > v9_SteelGrade, boost::optional< IfcTendonAnchorTypeEnum::IfcTendonAnchorTypeEnum > v10_PredefinedType) : IfcReinforcingElement((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_SteelGrade) { e->setArgument(8,(*v9_SteelGrade)); } else { e->setArgument(8); } if (v10_PredefinedType) { e->setArgument(9,*v10_PredefinedType,IfcTendonAnchorTypeEnum::ToString(*v10_PredefinedType)); } else { e->setArgument(9); } entity = e; EntityBuffer::Add(this); }
+IfcTendonAnchor::IfcTendonAnchor(IfcAbstractEntity* e) : IfcReinforcingElement((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcTendonAnchor)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcTendonAnchor::IfcTendonAnchor(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_SteelGrade, boost::optional< IfcTendonAnchorTypeEnum::IfcTendonAnchorTypeEnum > v10_PredefinedType) : IfcReinforcingElement((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_SteelGrade) { e->setArgument(8,(*v9_SteelGrade)); } else { e->setArgument(8); } if (v10_PredefinedType) { e->setArgument(9,*v10_PredefinedType,IfcTendonAnchorTypeEnum::ToString(*v10_PredefinedType)); } else { e->setArgument(9); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcTendonAnchorType
-IfcTendonAnchorTypeEnum::IfcTendonAnchorTypeEnum IfcTendonAnchorType::PredefinedType() { return IfcTendonAnchorTypeEnum::FromString(*entity->getArgument(9)); }
+IfcTendonAnchorTypeEnum::IfcTendonAnchorTypeEnum IfcTendonAnchorType::PredefinedType() const { return IfcTendonAnchorTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcTendonAnchorType::setPredefinedType(IfcTendonAnchorTypeEnum::IfcTendonAnchorTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcTendonAnchorTypeEnum::ToString(v)); }
 bool IfcTendonAnchorType::is(Type::Enum v) const { return v == Type::IfcTendonAnchorType || IfcReinforcingElementType::is(v); }
 Type::Enum IfcTendonAnchorType::type() const { return Type::IfcTendonAnchorType; }
 Type::Enum IfcTendonAnchorType::Class() { return Type::IfcTendonAnchorType; }
-IfcTendonAnchorType::IfcTendonAnchorType(IfcAbstractEntityPtr e) : IfcReinforcingElementType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcTendonAnchorType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcTendonAnchorType::IfcTendonAnchorType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcTendonAnchorTypeEnum::IfcTendonAnchorTypeEnum v10_PredefinedType) : IfcReinforcingElementType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcTendonAnchorTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcTendonAnchorType::IfcTendonAnchorType(IfcAbstractEntity* e) : IfcReinforcingElementType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcTendonAnchorType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcTendonAnchorType::IfcTendonAnchorType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcTendonAnchorTypeEnum::IfcTendonAnchorTypeEnum v10_PredefinedType) : IfcReinforcingElementType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcTendonAnchorTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcTendonType
-IfcTendonTypeEnum::IfcTendonTypeEnum IfcTendonType::PredefinedType() { return IfcTendonTypeEnum::FromString(*entity->getArgument(9)); }
+IfcTendonTypeEnum::IfcTendonTypeEnum IfcTendonType::PredefinedType() const { return IfcTendonTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcTendonType::setPredefinedType(IfcTendonTypeEnum::IfcTendonTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcTendonTypeEnum::ToString(v)); }
-bool IfcTendonType::hasNominalDiameter() { return !entity->getArgument(10)->isNull(); }
-IfcPositiveLengthMeasure IfcTendonType::NominalDiameter() { return *entity->getArgument(10); }
-void IfcTendonType::setNominalDiameter(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
-bool IfcTendonType::hasCrossSectionArea() { return !entity->getArgument(11)->isNull(); }
-IfcAreaMeasure IfcTendonType::CrossSectionArea() { return *entity->getArgument(11); }
-void IfcTendonType::setCrossSectionArea(IfcAreaMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(11,v); }
-bool IfcTendonType::hasSheethDiameter() { return !entity->getArgument(12)->isNull(); }
-IfcPositiveLengthMeasure IfcTendonType::SheethDiameter() { return *entity->getArgument(12); }
-void IfcTendonType::setSheethDiameter(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(12,v); }
+bool IfcTendonType::hasNominalDiameter() const { return !entity->getArgument(10)->isNull(); }
+double IfcTendonType::NominalDiameter() const { return *entity->getArgument(10); }
+void IfcTendonType::setNominalDiameter(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
+bool IfcTendonType::hasCrossSectionArea() const { return !entity->getArgument(11)->isNull(); }
+double IfcTendonType::CrossSectionArea() const { return *entity->getArgument(11); }
+void IfcTendonType::setCrossSectionArea(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(11,v); }
+bool IfcTendonType::hasSheethDiameter() const { return !entity->getArgument(12)->isNull(); }
+double IfcTendonType::SheethDiameter() const { return *entity->getArgument(12); }
+void IfcTendonType::setSheethDiameter(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(12,v); }
 bool IfcTendonType::is(Type::Enum v) const { return v == Type::IfcTendonType || IfcReinforcingElementType::is(v); }
 Type::Enum IfcTendonType::type() const { return Type::IfcTendonType; }
 Type::Enum IfcTendonType::Class() { return Type::IfcTendonType; }
-IfcTendonType::IfcTendonType(IfcAbstractEntityPtr e) : IfcReinforcingElementType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcTendonType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcTendonType::IfcTendonType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcTendonTypeEnum::IfcTendonTypeEnum v10_PredefinedType, boost::optional< IfcPositiveLengthMeasure > v11_NominalDiameter, boost::optional< IfcAreaMeasure > v12_CrossSectionArea, boost::optional< IfcPositiveLengthMeasure > v13_SheethDiameter) : IfcReinforcingElementType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcTendonTypeEnum::ToString(v10_PredefinedType)); if (v11_NominalDiameter) { e->setArgument(10,(*v11_NominalDiameter)); } else { e->setArgument(10); } if (v12_CrossSectionArea) { e->setArgument(11,(*v12_CrossSectionArea)); } else { e->setArgument(11); } if (v13_SheethDiameter) { e->setArgument(12,(*v13_SheethDiameter)); } else { e->setArgument(12); } entity = e; EntityBuffer::Add(this); }
+IfcTendonType::IfcTendonType(IfcAbstractEntity* e) : IfcReinforcingElementType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcTendonType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcTendonType::IfcTendonType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcTendonTypeEnum::IfcTendonTypeEnum v10_PredefinedType, boost::optional< double > v11_NominalDiameter, boost::optional< double > v12_CrossSectionArea, boost::optional< double > v13_SheethDiameter) : IfcReinforcingElementType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcTendonTypeEnum::ToString(v10_PredefinedType)); if (v11_NominalDiameter) { e->setArgument(10,(*v11_NominalDiameter)); } else { e->setArgument(10); } if (v12_CrossSectionArea) { e->setArgument(11,(*v12_CrossSectionArea)); } else { e->setArgument(11); } if (v13_SheethDiameter) { e->setArgument(12,(*v13_SheethDiameter)); } else { e->setArgument(12); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcTessellatedFaceSet
-IfcCartesianPointList3D* IfcTessellatedFaceSet::Coordinates() { return (IfcCartesianPointList3D*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(0))); }
+IfcCartesianPointList3D* IfcTessellatedFaceSet::Coordinates() const { return (IfcCartesianPointList3D*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(0))); }
 void IfcTessellatedFaceSet::setCoordinates(IfcCartesianPointList3D* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-bool IfcTessellatedFaceSet::hasClosed() { return !entity->getArgument(2)->isNull(); }
-bool IfcTessellatedFaceSet::Closed() { return *entity->getArgument(2); }
+bool IfcTessellatedFaceSet::hasClosed() const { return !entity->getArgument(2)->isNull(); }
+bool IfcTessellatedFaceSet::Closed() const { return *entity->getArgument(2); }
 void IfcTessellatedFaceSet::setClosed(bool v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-IfcIndexedColourMap::list IfcTessellatedFaceSet::HasColours() { RETURN_INVERSE(IfcIndexedColourMap) }
-IfcIndexedTextureMap::list IfcTessellatedFaceSet::HasTextures() { RETURN_INVERSE(IfcIndexedTextureMap) }
+IfcIndexedColourMap::list::ptr IfcTessellatedFaceSet::HasColours() const { return entity->getInverse(Type::IfcIndexedColourMap, 0)->as<IfcIndexedColourMap>(); }
+IfcIndexedTextureMap::list::ptr IfcTessellatedFaceSet::HasTextures() const { return entity->getInverse(Type::IfcIndexedTextureMap, 1)->as<IfcIndexedTextureMap>(); }
 bool IfcTessellatedFaceSet::is(Type::Enum v) const { return v == Type::IfcTessellatedFaceSet || IfcTessellatedItem::is(v); }
 Type::Enum IfcTessellatedFaceSet::type() const { return Type::IfcTessellatedFaceSet; }
 Type::Enum IfcTessellatedFaceSet::Class() { return Type::IfcTessellatedFaceSet; }
-IfcTessellatedFaceSet::IfcTessellatedFaceSet(IfcAbstractEntityPtr e) : IfcTessellatedItem((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcTessellatedFaceSet)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcTessellatedFaceSet::IfcTessellatedFaceSet(IfcCartesianPointList3D* v1_Coordinates, boost::optional< bool > v3_Closed) : IfcTessellatedItem((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Coordinates)); if (v3_Closed) { e->setArgument(2,(*v3_Closed)); } else { e->setArgument(2); } entity = e; EntityBuffer::Add(this); }
+IfcTessellatedFaceSet::IfcTessellatedFaceSet(IfcAbstractEntity* e) : IfcTessellatedItem((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcTessellatedFaceSet)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcTessellatedFaceSet::IfcTessellatedFaceSet(IfcCartesianPointList3D* v1_Coordinates, boost::optional< bool > v3_Closed) : IfcTessellatedItem((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Coordinates)); if (v3_Closed) { e->setArgument(2,(*v3_Closed)); } else { e->setArgument(2); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcTessellatedItem
 bool IfcTessellatedItem::is(Type::Enum v) const { return v == Type::IfcTessellatedItem || IfcGeometricRepresentationItem::is(v); }
 Type::Enum IfcTessellatedItem::type() const { return Type::IfcTessellatedItem; }
 Type::Enum IfcTessellatedItem::Class() { return Type::IfcTessellatedItem; }
-IfcTessellatedItem::IfcTessellatedItem(IfcAbstractEntityPtr e) : IfcGeometricRepresentationItem((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcTessellatedItem)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcTessellatedItem::IfcTessellatedItem() : IfcGeometricRepresentationItem((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); entity = e; EntityBuffer::Add(this); }
+IfcTessellatedItem::IfcTessellatedItem(IfcAbstractEntity* e) : IfcGeometricRepresentationItem((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcTessellatedItem)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcTessellatedItem::IfcTessellatedItem() : IfcGeometricRepresentationItem((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcTextLiteral
-IfcPresentableText IfcTextLiteral::Literal() { return *entity->getArgument(0); }
-void IfcTextLiteral::setLiteral(IfcPresentableText v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-IfcAxis2Placement IfcTextLiteral::Placement() { return *entity->getArgument(1); }
-void IfcTextLiteral::setPlacement(IfcAxis2Placement v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-IfcTextPath::IfcTextPath IfcTextLiteral::Path() { return IfcTextPath::FromString(*entity->getArgument(2)); }
+std::string IfcTextLiteral::Literal() const { return *entity->getArgument(0); }
+void IfcTextLiteral::setLiteral(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+IfcAxis2Placement* IfcTextLiteral::Placement() const { return (IfcAxis2Placement*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(1))); }
+void IfcTextLiteral::setPlacement(IfcAxis2Placement* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+IfcTextPath::IfcTextPath IfcTextLiteral::Path() const { return IfcTextPath::FromString(*entity->getArgument(2)); }
 void IfcTextLiteral::setPath(IfcTextPath::IfcTextPath v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v,IfcTextPath::ToString(v)); }
 bool IfcTextLiteral::is(Type::Enum v) const { return v == Type::IfcTextLiteral || IfcGeometricRepresentationItem::is(v); }
 Type::Enum IfcTextLiteral::type() const { return Type::IfcTextLiteral; }
 Type::Enum IfcTextLiteral::Class() { return Type::IfcTextLiteral; }
-IfcTextLiteral::IfcTextLiteral(IfcAbstractEntityPtr e) : IfcGeometricRepresentationItem((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcTextLiteral)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcTextLiteral::IfcTextLiteral(IfcPresentableText v1_Literal, IfcAxis2Placement v2_Placement, IfcTextPath::IfcTextPath v3_Path) : IfcGeometricRepresentationItem((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Literal)); e->setArgument(1,(v2_Placement)); e->setArgument(2,v3_Path,IfcTextPath::ToString(v3_Path)); entity = e; EntityBuffer::Add(this); }
+IfcTextLiteral::IfcTextLiteral(IfcAbstractEntity* e) : IfcGeometricRepresentationItem((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcTextLiteral)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcTextLiteral::IfcTextLiteral(std::string v1_Literal, IfcAxis2Placement* v2_Placement, IfcTextPath::IfcTextPath v3_Path) : IfcGeometricRepresentationItem((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Literal)); e->setArgument(1,(v2_Placement)); e->setArgument(2,v3_Path,IfcTextPath::ToString(v3_Path)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcTextLiteralWithExtent
-IfcPlanarExtent* IfcTextLiteralWithExtent::Extent() { return (IfcPlanarExtent*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(3))); }
+IfcPlanarExtent* IfcTextLiteralWithExtent::Extent() const { return (IfcPlanarExtent*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(3))); }
 void IfcTextLiteralWithExtent::setExtent(IfcPlanarExtent* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-IfcBoxAlignment IfcTextLiteralWithExtent::BoxAlignment() { return *entity->getArgument(4); }
-void IfcTextLiteralWithExtent::setBoxAlignment(IfcBoxAlignment v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+std::string IfcTextLiteralWithExtent::BoxAlignment() const { return *entity->getArgument(4); }
+void IfcTextLiteralWithExtent::setBoxAlignment(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
 bool IfcTextLiteralWithExtent::is(Type::Enum v) const { return v == Type::IfcTextLiteralWithExtent || IfcTextLiteral::is(v); }
 Type::Enum IfcTextLiteralWithExtent::type() const { return Type::IfcTextLiteralWithExtent; }
 Type::Enum IfcTextLiteralWithExtent::Class() { return Type::IfcTextLiteralWithExtent; }
-IfcTextLiteralWithExtent::IfcTextLiteralWithExtent(IfcAbstractEntityPtr e) : IfcTextLiteral((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcTextLiteralWithExtent)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcTextLiteralWithExtent::IfcTextLiteralWithExtent(IfcPresentableText v1_Literal, IfcAxis2Placement v2_Placement, IfcTextPath::IfcTextPath v3_Path, IfcPlanarExtent* v4_Extent, IfcBoxAlignment v5_BoxAlignment) : IfcTextLiteral((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Literal)); e->setArgument(1,(v2_Placement)); e->setArgument(2,v3_Path,IfcTextPath::ToString(v3_Path)); e->setArgument(3,(v4_Extent)); e->setArgument(4,(v5_BoxAlignment)); entity = e; EntityBuffer::Add(this); }
+IfcTextLiteralWithExtent::IfcTextLiteralWithExtent(IfcAbstractEntity* e) : IfcTextLiteral((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcTextLiteralWithExtent)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcTextLiteralWithExtent::IfcTextLiteralWithExtent(std::string v1_Literal, IfcAxis2Placement* v2_Placement, IfcTextPath::IfcTextPath v3_Path, IfcPlanarExtent* v4_Extent, std::string v5_BoxAlignment) : IfcTextLiteral((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Literal)); e->setArgument(1,(v2_Placement)); e->setArgument(2,v3_Path,IfcTextPath::ToString(v3_Path)); e->setArgument(3,(v4_Extent)); e->setArgument(4,(v5_BoxAlignment)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcTextStyle
-bool IfcTextStyle::hasTextCharacterAppearance() { return !entity->getArgument(1)->isNull(); }
-IfcTextStyleForDefinedFont* IfcTextStyle::TextCharacterAppearance() { return (IfcTextStyleForDefinedFont*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(1))); }
+bool IfcTextStyle::hasTextCharacterAppearance() const { return !entity->getArgument(1)->isNull(); }
+IfcTextStyleForDefinedFont* IfcTextStyle::TextCharacterAppearance() const { return (IfcTextStyleForDefinedFont*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(1))); }
 void IfcTextStyle::setTextCharacterAppearance(IfcTextStyleForDefinedFont* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-bool IfcTextStyle::hasTextStyle() { return !entity->getArgument(2)->isNull(); }
-IfcTextStyleTextModel* IfcTextStyle::TextStyle() { return (IfcTextStyleTextModel*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(2))); }
+bool IfcTextStyle::hasTextStyle() const { return !entity->getArgument(2)->isNull(); }
+IfcTextStyleTextModel* IfcTextStyle::TextStyle() const { return (IfcTextStyleTextModel*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(2))); }
 void IfcTextStyle::setTextStyle(IfcTextStyleTextModel* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-IfcTextFontSelect IfcTextStyle::TextFontStyle() { return *entity->getArgument(3); }
-void IfcTextStyle::setTextFontStyle(IfcTextFontSelect v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-bool IfcTextStyle::hasModelOrDraughting() { return !entity->getArgument(4)->isNull(); }
-bool IfcTextStyle::ModelOrDraughting() { return *entity->getArgument(4); }
+IfcTextFontSelect* IfcTextStyle::TextFontStyle() const { return (IfcTextFontSelect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(3))); }
+void IfcTextStyle::setTextFontStyle(IfcTextFontSelect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+bool IfcTextStyle::hasModelOrDraughting() const { return !entity->getArgument(4)->isNull(); }
+bool IfcTextStyle::ModelOrDraughting() const { return *entity->getArgument(4); }
 void IfcTextStyle::setModelOrDraughting(bool v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
 bool IfcTextStyle::is(Type::Enum v) const { return v == Type::IfcTextStyle || IfcPresentationStyle::is(v); }
 Type::Enum IfcTextStyle::type() const { return Type::IfcTextStyle; }
 Type::Enum IfcTextStyle::Class() { return Type::IfcTextStyle; }
-IfcTextStyle::IfcTextStyle(IfcAbstractEntityPtr e) : IfcPresentationStyle((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcTextStyle)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcTextStyle::IfcTextStyle(boost::optional< IfcLabel > v1_Name, IfcTextStyleForDefinedFont* v2_TextCharacterAppearance, IfcTextStyleTextModel* v3_TextStyle, IfcTextFontSelect v4_TextFontStyle, boost::optional< bool > v5_ModelOrDraughting) : IfcPresentationStyle((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } e->setArgument(1,(v2_TextCharacterAppearance)); e->setArgument(2,(v3_TextStyle)); e->setArgument(3,(v4_TextFontStyle)); if (v5_ModelOrDraughting) { e->setArgument(4,(*v5_ModelOrDraughting)); } else { e->setArgument(4); } entity = e; EntityBuffer::Add(this); }
+IfcTextStyle::IfcTextStyle(IfcAbstractEntity* e) : IfcPresentationStyle((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcTextStyle)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcTextStyle::IfcTextStyle(boost::optional< std::string > v1_Name, IfcTextStyleForDefinedFont* v2_TextCharacterAppearance, IfcTextStyleTextModel* v3_TextStyle, IfcTextFontSelect* v4_TextFontStyle, boost::optional< bool > v5_ModelOrDraughting) : IfcPresentationStyle((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } e->setArgument(1,(v2_TextCharacterAppearance)); e->setArgument(2,(v3_TextStyle)); e->setArgument(3,(v4_TextFontStyle)); if (v5_ModelOrDraughting) { e->setArgument(4,(*v5_ModelOrDraughting)); } else { e->setArgument(4); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcTextStyleFontModel
-std::vector< IfcTextFontName > /*[1:?]*/ IfcTextStyleFontModel::FontFamily() { return *entity->getArgument(1); }
-void IfcTextStyleFontModel::setFontFamily(std::vector< IfcTextFontName > /*[1:?]*/ v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-bool IfcTextStyleFontModel::hasFontStyle() { return !entity->getArgument(2)->isNull(); }
-IfcFontStyle IfcTextStyleFontModel::FontStyle() { return *entity->getArgument(2); }
-void IfcTextStyleFontModel::setFontStyle(IfcFontStyle v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-bool IfcTextStyleFontModel::hasFontVariant() { return !entity->getArgument(3)->isNull(); }
-IfcFontVariant IfcTextStyleFontModel::FontVariant() { return *entity->getArgument(3); }
-void IfcTextStyleFontModel::setFontVariant(IfcFontVariant v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-bool IfcTextStyleFontModel::hasFontWeight() { return !entity->getArgument(4)->isNull(); }
-IfcFontWeight IfcTextStyleFontModel::FontWeight() { return *entity->getArgument(4); }
-void IfcTextStyleFontModel::setFontWeight(IfcFontWeight v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-IfcSizeSelect IfcTextStyleFontModel::FontSize() { return *entity->getArgument(5); }
-void IfcTextStyleFontModel::setFontSize(IfcSizeSelect v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+std::vector< std::string > /*[1:?]*/ IfcTextStyleFontModel::FontFamily() const { return *entity->getArgument(1); }
+void IfcTextStyleFontModel::setFontFamily(std::vector< std::string > /*[1:?]*/ v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+bool IfcTextStyleFontModel::hasFontStyle() const { return !entity->getArgument(2)->isNull(); }
+std::string IfcTextStyleFontModel::FontStyle() const { return *entity->getArgument(2); }
+void IfcTextStyleFontModel::setFontStyle(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+bool IfcTextStyleFontModel::hasFontVariant() const { return !entity->getArgument(3)->isNull(); }
+std::string IfcTextStyleFontModel::FontVariant() const { return *entity->getArgument(3); }
+void IfcTextStyleFontModel::setFontVariant(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+bool IfcTextStyleFontModel::hasFontWeight() const { return !entity->getArgument(4)->isNull(); }
+std::string IfcTextStyleFontModel::FontWeight() const { return *entity->getArgument(4); }
+void IfcTextStyleFontModel::setFontWeight(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+IfcSizeSelect* IfcTextStyleFontModel::FontSize() const { return (IfcSizeSelect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(5))); }
+void IfcTextStyleFontModel::setFontSize(IfcSizeSelect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
 bool IfcTextStyleFontModel::is(Type::Enum v) const { return v == Type::IfcTextStyleFontModel || IfcPreDefinedTextFont::is(v); }
 Type::Enum IfcTextStyleFontModel::type() const { return Type::IfcTextStyleFontModel; }
 Type::Enum IfcTextStyleFontModel::Class() { return Type::IfcTextStyleFontModel; }
-IfcTextStyleFontModel::IfcTextStyleFontModel(IfcAbstractEntityPtr e) : IfcPreDefinedTextFont((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcTextStyleFontModel)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcTextStyleFontModel::IfcTextStyleFontModel(IfcLabel v1_Name, std::vector< IfcTextFontName > /*[1:?]*/ v2_FontFamily, boost::optional< IfcFontStyle > v3_FontStyle, boost::optional< IfcFontVariant > v4_FontVariant, boost::optional< IfcFontWeight > v5_FontWeight, IfcSizeSelect v6_FontSize) : IfcPreDefinedTextFont((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); e->setArgument(1,(v2_FontFamily)); if (v3_FontStyle) { e->setArgument(2,(*v3_FontStyle)); } else { e->setArgument(2); } if (v4_FontVariant) { e->setArgument(3,(*v4_FontVariant)); } else { e->setArgument(3); } if (v5_FontWeight) { e->setArgument(4,(*v5_FontWeight)); } else { e->setArgument(4); } e->setArgument(5,(v6_FontSize)); entity = e; EntityBuffer::Add(this); }
+IfcTextStyleFontModel::IfcTextStyleFontModel(IfcAbstractEntity* e) : IfcPreDefinedTextFont((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcTextStyleFontModel)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcTextStyleFontModel::IfcTextStyleFontModel(std::string v1_Name, std::vector< std::string > /*[1:?]*/ v2_FontFamily, boost::optional< std::string > v3_FontStyle, boost::optional< std::string > v4_FontVariant, boost::optional< std::string > v5_FontWeight, IfcSizeSelect* v6_FontSize) : IfcPreDefinedTextFont((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); e->setArgument(1,(v2_FontFamily)); if (v3_FontStyle) { e->setArgument(2,(*v3_FontStyle)); } else { e->setArgument(2); } if (v4_FontVariant) { e->setArgument(3,(*v4_FontVariant)); } else { e->setArgument(3); } if (v5_FontWeight) { e->setArgument(4,(*v5_FontWeight)); } else { e->setArgument(4); } e->setArgument(5,(v6_FontSize)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcTextStyleForDefinedFont
-IfcColour IfcTextStyleForDefinedFont::Colour() { return *entity->getArgument(0); }
-void IfcTextStyleForDefinedFont::setColour(IfcColour v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-bool IfcTextStyleForDefinedFont::hasBackgroundColour() { return !entity->getArgument(1)->isNull(); }
-IfcColour IfcTextStyleForDefinedFont::BackgroundColour() { return *entity->getArgument(1); }
-void IfcTextStyleForDefinedFont::setBackgroundColour(IfcColour v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+IfcColour* IfcTextStyleForDefinedFont::Colour() const { return (IfcColour*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(0))); }
+void IfcTextStyleForDefinedFont::setColour(IfcColour* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+bool IfcTextStyleForDefinedFont::hasBackgroundColour() const { return !entity->getArgument(1)->isNull(); }
+IfcColour* IfcTextStyleForDefinedFont::BackgroundColour() const { return (IfcColour*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(1))); }
+void IfcTextStyleForDefinedFont::setBackgroundColour(IfcColour* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
 bool IfcTextStyleForDefinedFont::is(Type::Enum v) const { return v == Type::IfcTextStyleForDefinedFont || IfcPresentationItem::is(v); }
 Type::Enum IfcTextStyleForDefinedFont::type() const { return Type::IfcTextStyleForDefinedFont; }
 Type::Enum IfcTextStyleForDefinedFont::Class() { return Type::IfcTextStyleForDefinedFont; }
-IfcTextStyleForDefinedFont::IfcTextStyleForDefinedFont(IfcAbstractEntityPtr e) : IfcPresentationItem((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcTextStyleForDefinedFont)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcTextStyleForDefinedFont::IfcTextStyleForDefinedFont(IfcColour v1_Colour, boost::optional< IfcColour > v2_BackgroundColour) : IfcPresentationItem((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Colour)); if (v2_BackgroundColour) { e->setArgument(1,(*v2_BackgroundColour)); } else { e->setArgument(1); } entity = e; EntityBuffer::Add(this); }
+IfcTextStyleForDefinedFont::IfcTextStyleForDefinedFont(IfcAbstractEntity* e) : IfcPresentationItem((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcTextStyleForDefinedFont)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcTextStyleForDefinedFont::IfcTextStyleForDefinedFont(IfcColour* v1_Colour, IfcColour* v2_BackgroundColour) : IfcPresentationItem((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Colour)); e->setArgument(1,(v2_BackgroundColour)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcTextStyleTextModel
-bool IfcTextStyleTextModel::hasTextIndent() { return !entity->getArgument(0)->isNull(); }
-IfcSizeSelect IfcTextStyleTextModel::TextIndent() { return *entity->getArgument(0); }
-void IfcTextStyleTextModel::setTextIndent(IfcSizeSelect v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-bool IfcTextStyleTextModel::hasTextAlign() { return !entity->getArgument(1)->isNull(); }
-IfcTextAlignment IfcTextStyleTextModel::TextAlign() { return *entity->getArgument(1); }
-void IfcTextStyleTextModel::setTextAlign(IfcTextAlignment v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-bool IfcTextStyleTextModel::hasTextDecoration() { return !entity->getArgument(2)->isNull(); }
-IfcTextDecoration IfcTextStyleTextModel::TextDecoration() { return *entity->getArgument(2); }
-void IfcTextStyleTextModel::setTextDecoration(IfcTextDecoration v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-bool IfcTextStyleTextModel::hasLetterSpacing() { return !entity->getArgument(3)->isNull(); }
-IfcSizeSelect IfcTextStyleTextModel::LetterSpacing() { return *entity->getArgument(3); }
-void IfcTextStyleTextModel::setLetterSpacing(IfcSizeSelect v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-bool IfcTextStyleTextModel::hasWordSpacing() { return !entity->getArgument(4)->isNull(); }
-IfcSizeSelect IfcTextStyleTextModel::WordSpacing() { return *entity->getArgument(4); }
-void IfcTextStyleTextModel::setWordSpacing(IfcSizeSelect v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-bool IfcTextStyleTextModel::hasTextTransform() { return !entity->getArgument(5)->isNull(); }
-IfcTextTransformation IfcTextStyleTextModel::TextTransform() { return *entity->getArgument(5); }
-void IfcTextStyleTextModel::setTextTransform(IfcTextTransformation v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-bool IfcTextStyleTextModel::hasLineHeight() { return !entity->getArgument(6)->isNull(); }
-IfcSizeSelect IfcTextStyleTextModel::LineHeight() { return *entity->getArgument(6); }
-void IfcTextStyleTextModel::setLineHeight(IfcSizeSelect v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
+bool IfcTextStyleTextModel::hasTextIndent() const { return !entity->getArgument(0)->isNull(); }
+IfcSizeSelect* IfcTextStyleTextModel::TextIndent() const { return (IfcSizeSelect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(0))); }
+void IfcTextStyleTextModel::setTextIndent(IfcSizeSelect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+bool IfcTextStyleTextModel::hasTextAlign() const { return !entity->getArgument(1)->isNull(); }
+std::string IfcTextStyleTextModel::TextAlign() const { return *entity->getArgument(1); }
+void IfcTextStyleTextModel::setTextAlign(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+bool IfcTextStyleTextModel::hasTextDecoration() const { return !entity->getArgument(2)->isNull(); }
+std::string IfcTextStyleTextModel::TextDecoration() const { return *entity->getArgument(2); }
+void IfcTextStyleTextModel::setTextDecoration(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+bool IfcTextStyleTextModel::hasLetterSpacing() const { return !entity->getArgument(3)->isNull(); }
+IfcSizeSelect* IfcTextStyleTextModel::LetterSpacing() const { return (IfcSizeSelect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(3))); }
+void IfcTextStyleTextModel::setLetterSpacing(IfcSizeSelect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+bool IfcTextStyleTextModel::hasWordSpacing() const { return !entity->getArgument(4)->isNull(); }
+IfcSizeSelect* IfcTextStyleTextModel::WordSpacing() const { return (IfcSizeSelect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(4))); }
+void IfcTextStyleTextModel::setWordSpacing(IfcSizeSelect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+bool IfcTextStyleTextModel::hasTextTransform() const { return !entity->getArgument(5)->isNull(); }
+std::string IfcTextStyleTextModel::TextTransform() const { return *entity->getArgument(5); }
+void IfcTextStyleTextModel::setTextTransform(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+bool IfcTextStyleTextModel::hasLineHeight() const { return !entity->getArgument(6)->isNull(); }
+IfcSizeSelect* IfcTextStyleTextModel::LineHeight() const { return (IfcSizeSelect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(6))); }
+void IfcTextStyleTextModel::setLineHeight(IfcSizeSelect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
 bool IfcTextStyleTextModel::is(Type::Enum v) const { return v == Type::IfcTextStyleTextModel || IfcPresentationItem::is(v); }
 Type::Enum IfcTextStyleTextModel::type() const { return Type::IfcTextStyleTextModel; }
 Type::Enum IfcTextStyleTextModel::Class() { return Type::IfcTextStyleTextModel; }
-IfcTextStyleTextModel::IfcTextStyleTextModel(IfcAbstractEntityPtr e) : IfcPresentationItem((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcTextStyleTextModel)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcTextStyleTextModel::IfcTextStyleTextModel(boost::optional< IfcSizeSelect > v1_TextIndent, boost::optional< IfcTextAlignment > v2_TextAlign, boost::optional< IfcTextDecoration > v3_TextDecoration, boost::optional< IfcSizeSelect > v4_LetterSpacing, boost::optional< IfcSizeSelect > v5_WordSpacing, boost::optional< IfcTextTransformation > v6_TextTransform, boost::optional< IfcSizeSelect > v7_LineHeight) : IfcPresentationItem((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_TextIndent) { e->setArgument(0,(*v1_TextIndent)); } else { e->setArgument(0); } if (v2_TextAlign) { e->setArgument(1,(*v2_TextAlign)); } else { e->setArgument(1); } if (v3_TextDecoration) { e->setArgument(2,(*v3_TextDecoration)); } else { e->setArgument(2); } if (v4_LetterSpacing) { e->setArgument(3,(*v4_LetterSpacing)); } else { e->setArgument(3); } if (v5_WordSpacing) { e->setArgument(4,(*v5_WordSpacing)); } else { e->setArgument(4); } if (v6_TextTransform) { e->setArgument(5,(*v6_TextTransform)); } else { e->setArgument(5); } if (v7_LineHeight) { e->setArgument(6,(*v7_LineHeight)); } else { e->setArgument(6); } entity = e; EntityBuffer::Add(this); }
+IfcTextStyleTextModel::IfcTextStyleTextModel(IfcAbstractEntity* e) : IfcPresentationItem((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcTextStyleTextModel)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcTextStyleTextModel::IfcTextStyleTextModel(IfcSizeSelect* v1_TextIndent, boost::optional< std::string > v2_TextAlign, boost::optional< std::string > v3_TextDecoration, IfcSizeSelect* v4_LetterSpacing, IfcSizeSelect* v5_WordSpacing, boost::optional< std::string > v6_TextTransform, IfcSizeSelect* v7_LineHeight) : IfcPresentationItem((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_TextIndent)); if (v2_TextAlign) { e->setArgument(1,(*v2_TextAlign)); } else { e->setArgument(1); } if (v3_TextDecoration) { e->setArgument(2,(*v3_TextDecoration)); } else { e->setArgument(2); } e->setArgument(3,(v4_LetterSpacing)); e->setArgument(4,(v5_WordSpacing)); if (v6_TextTransform) { e->setArgument(5,(*v6_TextTransform)); } else { e->setArgument(5); } e->setArgument(6,(v7_LineHeight)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcTextureCoordinate
-SHARED_PTR< IfcTemplatedEntityList< IfcSurfaceTexture > > IfcTextureCoordinate::Maps() { RETURN_AS_LIST(IfcSurfaceTexture,0) }
-void IfcTextureCoordinate::setMaps(SHARED_PTR< IfcTemplatedEntityList< IfcSurfaceTexture > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v->generalize()); }
+IfcTemplatedEntityList< IfcSurfaceTexture >::ptr IfcTextureCoordinate::Maps() const { IfcEntityList::ptr es = *entity->getArgument(0); return es->as<IfcSurfaceTexture>(); }
+void IfcTextureCoordinate::setMaps(IfcTemplatedEntityList< IfcSurfaceTexture >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v->generalize()); }
 bool IfcTextureCoordinate::is(Type::Enum v) const { return v == Type::IfcTextureCoordinate || IfcPresentationItem::is(v); }
 Type::Enum IfcTextureCoordinate::type() const { return Type::IfcTextureCoordinate; }
 Type::Enum IfcTextureCoordinate::Class() { return Type::IfcTextureCoordinate; }
-IfcTextureCoordinate::IfcTextureCoordinate(IfcAbstractEntityPtr e) : IfcPresentationItem((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcTextureCoordinate)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcTextureCoordinate::IfcTextureCoordinate(SHARED_PTR< IfcTemplatedEntityList< IfcSurfaceTexture > > v1_Maps) : IfcPresentationItem((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Maps)->generalize()); entity = e; EntityBuffer::Add(this); }
+IfcTextureCoordinate::IfcTextureCoordinate(IfcAbstractEntity* e) : IfcPresentationItem((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcTextureCoordinate)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcTextureCoordinate::IfcTextureCoordinate(IfcTemplatedEntityList< IfcSurfaceTexture >::ptr v1_Maps) : IfcPresentationItem((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Maps)->generalize()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcTextureCoordinateGenerator
-IfcLabel IfcTextureCoordinateGenerator::Mode() { return *entity->getArgument(1); }
-void IfcTextureCoordinateGenerator::setMode(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-bool IfcTextureCoordinateGenerator::hasParameter() { return !entity->getArgument(2)->isNull(); }
-std::vector< IfcReal > /*[1:?]*/ IfcTextureCoordinateGenerator::Parameter() { return *entity->getArgument(2); }
-void IfcTextureCoordinateGenerator::setParameter(std::vector< IfcReal > /*[1:?]*/ v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+std::string IfcTextureCoordinateGenerator::Mode() const { return *entity->getArgument(1); }
+void IfcTextureCoordinateGenerator::setMode(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+bool IfcTextureCoordinateGenerator::hasParameter() const { return !entity->getArgument(2)->isNull(); }
+std::vector< double > /*[1:?]*/ IfcTextureCoordinateGenerator::Parameter() const { return *entity->getArgument(2); }
+void IfcTextureCoordinateGenerator::setParameter(std::vector< double > /*[1:?]*/ v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
 bool IfcTextureCoordinateGenerator::is(Type::Enum v) const { return v == Type::IfcTextureCoordinateGenerator || IfcTextureCoordinate::is(v); }
 Type::Enum IfcTextureCoordinateGenerator::type() const { return Type::IfcTextureCoordinateGenerator; }
 Type::Enum IfcTextureCoordinateGenerator::Class() { return Type::IfcTextureCoordinateGenerator; }
-IfcTextureCoordinateGenerator::IfcTextureCoordinateGenerator(IfcAbstractEntityPtr e) : IfcTextureCoordinate((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcTextureCoordinateGenerator)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcTextureCoordinateGenerator::IfcTextureCoordinateGenerator(SHARED_PTR< IfcTemplatedEntityList< IfcSurfaceTexture > > v1_Maps, IfcLabel v2_Mode, boost::optional< std::vector< IfcReal > /*[1:?]*/ > v3_Parameter) : IfcTextureCoordinate((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Maps)->generalize()); e->setArgument(1,(v2_Mode)); if (v3_Parameter) { e->setArgument(2,(*v3_Parameter)); } else { e->setArgument(2); } entity = e; EntityBuffer::Add(this); }
+IfcTextureCoordinateGenerator::IfcTextureCoordinateGenerator(IfcAbstractEntity* e) : IfcTextureCoordinate((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcTextureCoordinateGenerator)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcTextureCoordinateGenerator::IfcTextureCoordinateGenerator(IfcTemplatedEntityList< IfcSurfaceTexture >::ptr v1_Maps, std::string v2_Mode, boost::optional< std::vector< double > /*[1:?]*/ > v3_Parameter) : IfcTextureCoordinate((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Maps)->generalize()); e->setArgument(1,(v2_Mode)); if (v3_Parameter) { e->setArgument(2,(*v3_Parameter)); } else { e->setArgument(2); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcTextureMap
-SHARED_PTR< IfcTemplatedEntityList< IfcTextureVertex > > IfcTextureMap::Vertices() { RETURN_AS_LIST(IfcTextureVertex,1) }
-void IfcTextureMap::setVertices(SHARED_PTR< IfcTemplatedEntityList< IfcTextureVertex > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v->generalize()); }
-IfcFace* IfcTextureMap::MappedTo() { return (IfcFace*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(2))); }
+IfcTemplatedEntityList< IfcTextureVertex >::ptr IfcTextureMap::Vertices() const { IfcEntityList::ptr es = *entity->getArgument(1); return es->as<IfcTextureVertex>(); }
+void IfcTextureMap::setVertices(IfcTemplatedEntityList< IfcTextureVertex >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v->generalize()); }
+IfcFace* IfcTextureMap::MappedTo() const { return (IfcFace*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(2))); }
 void IfcTextureMap::setMappedTo(IfcFace* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
 bool IfcTextureMap::is(Type::Enum v) const { return v == Type::IfcTextureMap || IfcTextureCoordinate::is(v); }
 Type::Enum IfcTextureMap::type() const { return Type::IfcTextureMap; }
 Type::Enum IfcTextureMap::Class() { return Type::IfcTextureMap; }
-IfcTextureMap::IfcTextureMap(IfcAbstractEntityPtr e) : IfcTextureCoordinate((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcTextureMap)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcTextureMap::IfcTextureMap(SHARED_PTR< IfcTemplatedEntityList< IfcSurfaceTexture > > v1_Maps, SHARED_PTR< IfcTemplatedEntityList< IfcTextureVertex > > v2_Vertices, IfcFace* v3_MappedTo) : IfcTextureCoordinate((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Maps)->generalize()); e->setArgument(1,(v2_Vertices)->generalize()); e->setArgument(2,(v3_MappedTo)); entity = e; EntityBuffer::Add(this); }
+IfcTextureMap::IfcTextureMap(IfcAbstractEntity* e) : IfcTextureCoordinate((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcTextureMap)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcTextureMap::IfcTextureMap(IfcTemplatedEntityList< IfcSurfaceTexture >::ptr v1_Maps, IfcTemplatedEntityList< IfcTextureVertex >::ptr v2_Vertices, IfcFace* v3_MappedTo) : IfcTextureCoordinate((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Maps)->generalize()); e->setArgument(1,(v2_Vertices)->generalize()); e->setArgument(2,(v3_MappedTo)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcTextureVertex
-std::vector< IfcParameterValue > /*[2:2]*/ IfcTextureVertex::Coordinates() { return *entity->getArgument(0); }
-void IfcTextureVertex::setCoordinates(std::vector< IfcParameterValue > /*[2:2]*/ v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+std::vector< double > /*[2:2]*/ IfcTextureVertex::Coordinates() const { return *entity->getArgument(0); }
+void IfcTextureVertex::setCoordinates(std::vector< double > /*[2:2]*/ v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
 bool IfcTextureVertex::is(Type::Enum v) const { return v == Type::IfcTextureVertex || IfcPresentationItem::is(v); }
 Type::Enum IfcTextureVertex::type() const { return Type::IfcTextureVertex; }
 Type::Enum IfcTextureVertex::Class() { return Type::IfcTextureVertex; }
-IfcTextureVertex::IfcTextureVertex(IfcAbstractEntityPtr e) : IfcPresentationItem((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcTextureVertex)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcTextureVertex::IfcTextureVertex(std::vector< IfcParameterValue > /*[2:2]*/ v1_Coordinates) : IfcPresentationItem((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Coordinates)); entity = e; EntityBuffer::Add(this); }
+IfcTextureVertex::IfcTextureVertex(IfcAbstractEntity* e) : IfcPresentationItem((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcTextureVertex)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcTextureVertex::IfcTextureVertex(std::vector< double > /*[2:2]*/ v1_Coordinates) : IfcPresentationItem((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Coordinates)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcTextureVertexList
 bool IfcTextureVertexList::is(Type::Enum v) const { return v == Type::IfcTextureVertexList || IfcPresentationItem::is(v); }
 Type::Enum IfcTextureVertexList::type() const { return Type::IfcTextureVertexList; }
 Type::Enum IfcTextureVertexList::Class() { return Type::IfcTextureVertexList; }
-IfcTextureVertexList::IfcTextureVertexList(IfcAbstractEntityPtr e) : IfcPresentationItem((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcTextureVertexList)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcTextureVertexList::IfcTextureVertexList() : IfcPresentationItem((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); entity = e; EntityBuffer::Add(this); }
+IfcTextureVertexList::IfcTextureVertexList(IfcAbstractEntity* e) : IfcPresentationItem((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcTextureVertexList)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcTextureVertexList::IfcTextureVertexList() : IfcPresentationItem((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcTimePeriod
-IfcTime IfcTimePeriod::StartTime() { return *entity->getArgument(0); }
-void IfcTimePeriod::setStartTime(IfcTime v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-IfcTime IfcTimePeriod::EndTime() { return *entity->getArgument(1); }
-void IfcTimePeriod::setEndTime(IfcTime v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+std::string IfcTimePeriod::StartTime() const { return *entity->getArgument(0); }
+void IfcTimePeriod::setStartTime(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+std::string IfcTimePeriod::EndTime() const { return *entity->getArgument(1); }
+void IfcTimePeriod::setEndTime(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
 bool IfcTimePeriod::is(Type::Enum v) const { return v == Type::IfcTimePeriod; }
 Type::Enum IfcTimePeriod::type() const { return Type::IfcTimePeriod; }
 Type::Enum IfcTimePeriod::Class() { return Type::IfcTimePeriod; }
-IfcTimePeriod::IfcTimePeriod(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcTimePeriod)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcTimePeriod::IfcTimePeriod(IfcTime v1_StartTime, IfcTime v2_EndTime) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_StartTime)); e->setArgument(1,(v2_EndTime)); entity = e; EntityBuffer::Add(this); }
+IfcTimePeriod::IfcTimePeriod(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcTimePeriod)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcTimePeriod::IfcTimePeriod(std::string v1_StartTime, std::string v2_EndTime) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_StartTime)); e->setArgument(1,(v2_EndTime)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcTimeSeries
-IfcLabel IfcTimeSeries::Name() { return *entity->getArgument(0); }
-void IfcTimeSeries::setName(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-bool IfcTimeSeries::hasDescription() { return !entity->getArgument(1)->isNull(); }
-IfcText IfcTimeSeries::Description() { return *entity->getArgument(1); }
-void IfcTimeSeries::setDescription(IfcText v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
-IfcDateTime IfcTimeSeries::StartTime() { return *entity->getArgument(2); }
-void IfcTimeSeries::setStartTime(IfcDateTime v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
-IfcDateTime IfcTimeSeries::EndTime() { return *entity->getArgument(3); }
-void IfcTimeSeries::setEndTime(IfcDateTime v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-IfcTimeSeriesDataTypeEnum::IfcTimeSeriesDataTypeEnum IfcTimeSeries::TimeSeriesDataType() { return IfcTimeSeriesDataTypeEnum::FromString(*entity->getArgument(4)); }
+std::string IfcTimeSeries::Name() const { return *entity->getArgument(0); }
+void IfcTimeSeries::setName(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
+bool IfcTimeSeries::hasDescription() const { return !entity->getArgument(1)->isNull(); }
+std::string IfcTimeSeries::Description() const { return *entity->getArgument(1); }
+void IfcTimeSeries::setDescription(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+std::string IfcTimeSeries::StartTime() const { return *entity->getArgument(2); }
+void IfcTimeSeries::setStartTime(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+std::string IfcTimeSeries::EndTime() const { return *entity->getArgument(3); }
+void IfcTimeSeries::setEndTime(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+IfcTimeSeriesDataTypeEnum::IfcTimeSeriesDataTypeEnum IfcTimeSeries::TimeSeriesDataType() const { return IfcTimeSeriesDataTypeEnum::FromString(*entity->getArgument(4)); }
 void IfcTimeSeries::setTimeSeriesDataType(IfcTimeSeriesDataTypeEnum::IfcTimeSeriesDataTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v,IfcTimeSeriesDataTypeEnum::ToString(v)); }
-IfcDataOriginEnum::IfcDataOriginEnum IfcTimeSeries::DataOrigin() { return IfcDataOriginEnum::FromString(*entity->getArgument(5)); }
+IfcDataOriginEnum::IfcDataOriginEnum IfcTimeSeries::DataOrigin() const { return IfcDataOriginEnum::FromString(*entity->getArgument(5)); }
 void IfcTimeSeries::setDataOrigin(IfcDataOriginEnum::IfcDataOriginEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v,IfcDataOriginEnum::ToString(v)); }
-bool IfcTimeSeries::hasUserDefinedDataOrigin() { return !entity->getArgument(6)->isNull(); }
-IfcLabel IfcTimeSeries::UserDefinedDataOrigin() { return *entity->getArgument(6); }
-void IfcTimeSeries::setUserDefinedDataOrigin(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
-bool IfcTimeSeries::hasUnit() { return !entity->getArgument(7)->isNull(); }
-IfcUnit IfcTimeSeries::Unit() { return *entity->getArgument(7); }
-void IfcTimeSeries::setUnit(IfcUnit v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
-IfcExternalReferenceRelationship::list IfcTimeSeries::HasExternalReference() { RETURN_INVERSE(IfcExternalReferenceRelationship) }
+bool IfcTimeSeries::hasUserDefinedDataOrigin() const { return !entity->getArgument(6)->isNull(); }
+std::string IfcTimeSeries::UserDefinedDataOrigin() const { return *entity->getArgument(6); }
+void IfcTimeSeries::setUserDefinedDataOrigin(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
+bool IfcTimeSeries::hasUnit() const { return !entity->getArgument(7)->isNull(); }
+IfcUnit* IfcTimeSeries::Unit() const { return (IfcUnit*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(7))); }
+void IfcTimeSeries::setUnit(IfcUnit* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
+IfcExternalReferenceRelationship::list::ptr IfcTimeSeries::HasExternalReference() const { return entity->getInverse(Type::IfcExternalReferenceRelationship, 3)->as<IfcExternalReferenceRelationship>(); }
 bool IfcTimeSeries::is(Type::Enum v) const { return v == Type::IfcTimeSeries; }
 Type::Enum IfcTimeSeries::type() const { return Type::IfcTimeSeries; }
 Type::Enum IfcTimeSeries::Class() { return Type::IfcTimeSeries; }
-IfcTimeSeries::IfcTimeSeries(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcTimeSeries)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcTimeSeries::IfcTimeSeries(IfcLabel v1_Name, boost::optional< IfcText > v2_Description, IfcDateTime v3_StartTime, IfcDateTime v4_EndTime, IfcTimeSeriesDataTypeEnum::IfcTimeSeriesDataTypeEnum v5_TimeSeriesDataType, IfcDataOriginEnum::IfcDataOriginEnum v6_DataOrigin, boost::optional< IfcLabel > v7_UserDefinedDataOrigin, boost::optional< IfcUnit > v8_Unit) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_StartTime)); e->setArgument(3,(v4_EndTime)); e->setArgument(4,v5_TimeSeriesDataType,IfcTimeSeriesDataTypeEnum::ToString(v5_TimeSeriesDataType)); e->setArgument(5,v6_DataOrigin,IfcDataOriginEnum::ToString(v6_DataOrigin)); if (v7_UserDefinedDataOrigin) { e->setArgument(6,(*v7_UserDefinedDataOrigin)); } else { e->setArgument(6); } if (v8_Unit) { e->setArgument(7,(*v8_Unit)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
+IfcTimeSeries::IfcTimeSeries(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcTimeSeries)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcTimeSeries::IfcTimeSeries(std::string v1_Name, boost::optional< std::string > v2_Description, std::string v3_StartTime, std::string v4_EndTime, IfcTimeSeriesDataTypeEnum::IfcTimeSeriesDataTypeEnum v5_TimeSeriesDataType, IfcDataOriginEnum::IfcDataOriginEnum v6_DataOrigin, boost::optional< std::string > v7_UserDefinedDataOrigin, IfcUnit* v8_Unit) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Name)); if (v2_Description) { e->setArgument(1,(*v2_Description)); } else { e->setArgument(1); } e->setArgument(2,(v3_StartTime)); e->setArgument(3,(v4_EndTime)); e->setArgument(4,v5_TimeSeriesDataType,IfcTimeSeriesDataTypeEnum::ToString(v5_TimeSeriesDataType)); e->setArgument(5,v6_DataOrigin,IfcDataOriginEnum::ToString(v6_DataOrigin)); if (v7_UserDefinedDataOrigin) { e->setArgument(6,(*v7_UserDefinedDataOrigin)); } else { e->setArgument(6); } e->setArgument(7,(v8_Unit)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcTimeSeriesValue
-SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > IfcTimeSeriesValue::ListValues() { RETURN_AS_LIST(IfcUtil::IfcAbstractSelect,0) }
-void IfcTimeSeriesValue::setListValues(SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v->generalize()); }
+IfcEntityList::ptr IfcTimeSeriesValue::ListValues() const { return *entity->getArgument(0); }
+void IfcTimeSeriesValue::setListValues(IfcEntityList::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
 bool IfcTimeSeriesValue::is(Type::Enum v) const { return v == Type::IfcTimeSeriesValue; }
 Type::Enum IfcTimeSeriesValue::type() const { return Type::IfcTimeSeriesValue; }
 Type::Enum IfcTimeSeriesValue::Class() { return Type::IfcTimeSeriesValue; }
-IfcTimeSeriesValue::IfcTimeSeriesValue(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcTimeSeriesValue)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcTimeSeriesValue::IfcTimeSeriesValue(IfcEntities v1_ListValues) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_ListValues)); entity = e; EntityBuffer::Add(this); }
+IfcTimeSeriesValue::IfcTimeSeriesValue(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcTimeSeriesValue)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcTimeSeriesValue::IfcTimeSeriesValue(IfcEntityList::ptr v1_ListValues) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_ListValues)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcTopologicalRepresentationItem
 bool IfcTopologicalRepresentationItem::is(Type::Enum v) const { return v == Type::IfcTopologicalRepresentationItem || IfcRepresentationItem::is(v); }
 Type::Enum IfcTopologicalRepresentationItem::type() const { return Type::IfcTopologicalRepresentationItem; }
 Type::Enum IfcTopologicalRepresentationItem::Class() { return Type::IfcTopologicalRepresentationItem; }
-IfcTopologicalRepresentationItem::IfcTopologicalRepresentationItem(IfcAbstractEntityPtr e) : IfcRepresentationItem((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcTopologicalRepresentationItem)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcTopologicalRepresentationItem::IfcTopologicalRepresentationItem() : IfcRepresentationItem((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); entity = e; EntityBuffer::Add(this); }
+IfcTopologicalRepresentationItem::IfcTopologicalRepresentationItem(IfcAbstractEntity* e) : IfcRepresentationItem((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcTopologicalRepresentationItem)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcTopologicalRepresentationItem::IfcTopologicalRepresentationItem() : IfcRepresentationItem((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcTopologyRepresentation
 bool IfcTopologyRepresentation::is(Type::Enum v) const { return v == Type::IfcTopologyRepresentation || IfcShapeModel::is(v); }
 Type::Enum IfcTopologyRepresentation::type() const { return Type::IfcTopologyRepresentation; }
 Type::Enum IfcTopologyRepresentation::Class() { return Type::IfcTopologyRepresentation; }
-IfcTopologyRepresentation::IfcTopologyRepresentation(IfcAbstractEntityPtr e) : IfcShapeModel((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcTopologyRepresentation)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcTopologyRepresentation::IfcTopologyRepresentation(IfcRepresentationContext* v1_ContextOfItems, boost::optional< IfcLabel > v2_RepresentationIdentifier, boost::optional< IfcLabel > v3_RepresentationType, SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationItem > > v4_Items) : IfcShapeModel((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_ContextOfItems)); if (v2_RepresentationIdentifier) { e->setArgument(1,(*v2_RepresentationIdentifier)); } else { e->setArgument(1); } if (v3_RepresentationType) { e->setArgument(2,(*v3_RepresentationType)); } else { e->setArgument(2); } e->setArgument(3,(v4_Items)->generalize()); entity = e; EntityBuffer::Add(this); }
+IfcTopologyRepresentation::IfcTopologyRepresentation(IfcAbstractEntity* e) : IfcShapeModel((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcTopologyRepresentation)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcTopologyRepresentation::IfcTopologyRepresentation(IfcRepresentationContext* v1_ContextOfItems, boost::optional< std::string > v2_RepresentationIdentifier, boost::optional< std::string > v3_RepresentationType, IfcTemplatedEntityList< IfcRepresentationItem >::ptr v4_Items) : IfcShapeModel((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_ContextOfItems)); if (v2_RepresentationIdentifier) { e->setArgument(1,(*v2_RepresentationIdentifier)); } else { e->setArgument(1); } if (v3_RepresentationType) { e->setArgument(2,(*v3_RepresentationType)); } else { e->setArgument(2); } e->setArgument(3,(v4_Items)->generalize()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcTransformer
-bool IfcTransformer::hasPredefinedType() { return !entity->getArgument(8)->isNull(); }
-IfcTransformerTypeEnum::IfcTransformerTypeEnum IfcTransformer::PredefinedType() { return IfcTransformerTypeEnum::FromString(*entity->getArgument(8)); }
+bool IfcTransformer::hasPredefinedType() const { return !entity->getArgument(8)->isNull(); }
+IfcTransformerTypeEnum::IfcTransformerTypeEnum IfcTransformer::PredefinedType() const { return IfcTransformerTypeEnum::FromString(*entity->getArgument(8)); }
 void IfcTransformer::setPredefinedType(IfcTransformerTypeEnum::IfcTransformerTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcTransformerTypeEnum::ToString(v)); }
 bool IfcTransformer::is(Type::Enum v) const { return v == Type::IfcTransformer || IfcEnergyConversionDevice::is(v); }
 Type::Enum IfcTransformer::type() const { return Type::IfcTransformer; }
 Type::Enum IfcTransformer::Class() { return Type::IfcTransformer; }
-IfcTransformer::IfcTransformer(IfcAbstractEntityPtr e) : IfcEnergyConversionDevice((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcTransformer)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcTransformer::IfcTransformer(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcTransformerTypeEnum::IfcTransformerTypeEnum > v9_PredefinedType) : IfcEnergyConversionDevice((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcTransformerTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcTransformer::IfcTransformer(IfcAbstractEntity* e) : IfcEnergyConversionDevice((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcTransformer)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcTransformer::IfcTransformer(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcTransformerTypeEnum::IfcTransformerTypeEnum > v9_PredefinedType) : IfcEnergyConversionDevice((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcTransformerTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcTransformerType
-IfcTransformerTypeEnum::IfcTransformerTypeEnum IfcTransformerType::PredefinedType() { return IfcTransformerTypeEnum::FromString(*entity->getArgument(9)); }
+IfcTransformerTypeEnum::IfcTransformerTypeEnum IfcTransformerType::PredefinedType() const { return IfcTransformerTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcTransformerType::setPredefinedType(IfcTransformerTypeEnum::IfcTransformerTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcTransformerTypeEnum::ToString(v)); }
 bool IfcTransformerType::is(Type::Enum v) const { return v == Type::IfcTransformerType || IfcEnergyConversionDeviceType::is(v); }
 Type::Enum IfcTransformerType::type() const { return Type::IfcTransformerType; }
 Type::Enum IfcTransformerType::Class() { return Type::IfcTransformerType; }
-IfcTransformerType::IfcTransformerType(IfcAbstractEntityPtr e) : IfcEnergyConversionDeviceType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcTransformerType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcTransformerType::IfcTransformerType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcTransformerTypeEnum::IfcTransformerTypeEnum v10_PredefinedType) : IfcEnergyConversionDeviceType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcTransformerTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcTransformerType::IfcTransformerType(IfcAbstractEntity* e) : IfcEnergyConversionDeviceType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcTransformerType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcTransformerType::IfcTransformerType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcTransformerTypeEnum::IfcTransformerTypeEnum v10_PredefinedType) : IfcEnergyConversionDeviceType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcTransformerTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcTransportElement
-bool IfcTransportElement::hasPredefinedType() { return !entity->getArgument(8)->isNull(); }
-IfcTransportElementTypeEnum::IfcTransportElementTypeEnum IfcTransportElement::PredefinedType() { return IfcTransportElementTypeEnum::FromString(*entity->getArgument(8)); }
+bool IfcTransportElement::hasPredefinedType() const { return !entity->getArgument(8)->isNull(); }
+IfcTransportElementTypeEnum::IfcTransportElementTypeEnum IfcTransportElement::PredefinedType() const { return IfcTransportElementTypeEnum::FromString(*entity->getArgument(8)); }
 void IfcTransportElement::setPredefinedType(IfcTransportElementTypeEnum::IfcTransportElementTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcTransportElementTypeEnum::ToString(v)); }
 bool IfcTransportElement::is(Type::Enum v) const { return v == Type::IfcTransportElement || IfcElement::is(v); }
 Type::Enum IfcTransportElement::type() const { return Type::IfcTransportElement; }
 Type::Enum IfcTransportElement::Class() { return Type::IfcTransportElement; }
-IfcTransportElement::IfcTransportElement(IfcAbstractEntityPtr e) : IfcElement((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcTransportElement)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcTransportElement::IfcTransportElement(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcTransportElementTypeEnum::IfcTransportElementTypeEnum > v9_PredefinedType) : IfcElement((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcTransportElementTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcTransportElement::IfcTransportElement(IfcAbstractEntity* e) : IfcElement((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcTransportElement)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcTransportElement::IfcTransportElement(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcTransportElementTypeEnum::IfcTransportElementTypeEnum > v9_PredefinedType) : IfcElement((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcTransportElementTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcTransportElementType
-IfcTransportElementTypeEnum::IfcTransportElementTypeEnum IfcTransportElementType::PredefinedType() { return IfcTransportElementTypeEnum::FromString(*entity->getArgument(9)); }
+IfcTransportElementTypeEnum::IfcTransportElementTypeEnum IfcTransportElementType::PredefinedType() const { return IfcTransportElementTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcTransportElementType::setPredefinedType(IfcTransportElementTypeEnum::IfcTransportElementTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcTransportElementTypeEnum::ToString(v)); }
 bool IfcTransportElementType::is(Type::Enum v) const { return v == Type::IfcTransportElementType || IfcElementType::is(v); }
 Type::Enum IfcTransportElementType::type() const { return Type::IfcTransportElementType; }
 Type::Enum IfcTransportElementType::Class() { return Type::IfcTransportElementType; }
-IfcTransportElementType::IfcTransportElementType(IfcAbstractEntityPtr e) : IfcElementType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcTransportElementType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcTransportElementType::IfcTransportElementType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcTransportElementTypeEnum::IfcTransportElementTypeEnum v10_PredefinedType) : IfcElementType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcTransportElementTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcTransportElementType::IfcTransportElementType(IfcAbstractEntity* e) : IfcElementType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcTransportElementType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcTransportElementType::IfcTransportElementType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcTransportElementTypeEnum::IfcTransportElementTypeEnum v10_PredefinedType) : IfcElementType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcTransportElementTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcTrapeziumProfileDef
-IfcPositiveLengthMeasure IfcTrapeziumProfileDef::BottomXDim() { return *entity->getArgument(3); }
-void IfcTrapeziumProfileDef::setBottomXDim(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-IfcPositiveLengthMeasure IfcTrapeziumProfileDef::TopXDim() { return *entity->getArgument(4); }
-void IfcTrapeziumProfileDef::setTopXDim(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-IfcPositiveLengthMeasure IfcTrapeziumProfileDef::YDim() { return *entity->getArgument(5); }
-void IfcTrapeziumProfileDef::setYDim(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-IfcLengthMeasure IfcTrapeziumProfileDef::TopXOffset() { return *entity->getArgument(6); }
-void IfcTrapeziumProfileDef::setTopXOffset(IfcLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
+double IfcTrapeziumProfileDef::BottomXDim() const { return *entity->getArgument(3); }
+void IfcTrapeziumProfileDef::setBottomXDim(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+double IfcTrapeziumProfileDef::TopXDim() const { return *entity->getArgument(4); }
+void IfcTrapeziumProfileDef::setTopXDim(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+double IfcTrapeziumProfileDef::YDim() const { return *entity->getArgument(5); }
+void IfcTrapeziumProfileDef::setYDim(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+double IfcTrapeziumProfileDef::TopXOffset() const { return *entity->getArgument(6); }
+void IfcTrapeziumProfileDef::setTopXOffset(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
 bool IfcTrapeziumProfileDef::is(Type::Enum v) const { return v == Type::IfcTrapeziumProfileDef || IfcParameterizedProfileDef::is(v); }
 Type::Enum IfcTrapeziumProfileDef::type() const { return Type::IfcTrapeziumProfileDef; }
 Type::Enum IfcTrapeziumProfileDef::Class() { return Type::IfcTrapeziumProfileDef; }
-IfcTrapeziumProfileDef::IfcTrapeziumProfileDef(IfcAbstractEntityPtr e) : IfcParameterizedProfileDef((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcTrapeziumProfileDef)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcTrapeziumProfileDef::IfcTrapeziumProfileDef(IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< IfcLabel > v2_ProfileName, IfcAxis2Placement2D* v3_Position, IfcPositiveLengthMeasure v4_BottomXDim, IfcPositiveLengthMeasure v5_TopXDim, IfcPositiveLengthMeasure v6_YDim, IfcLengthMeasure v7_TopXOffset) : IfcParameterizedProfileDef((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,v1_ProfileType,IfcProfileTypeEnum::ToString(v1_ProfileType)); if (v2_ProfileName) { e->setArgument(1,(*v2_ProfileName)); } else { e->setArgument(1); } e->setArgument(2,(v3_Position)); e->setArgument(3,(v4_BottomXDim)); e->setArgument(4,(v5_TopXDim)); e->setArgument(5,(v6_YDim)); e->setArgument(6,(v7_TopXOffset)); entity = e; EntityBuffer::Add(this); }
+IfcTrapeziumProfileDef::IfcTrapeziumProfileDef(IfcAbstractEntity* e) : IfcParameterizedProfileDef((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcTrapeziumProfileDef)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcTrapeziumProfileDef::IfcTrapeziumProfileDef(IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< std::string > v2_ProfileName, IfcAxis2Placement2D* v3_Position, double v4_BottomXDim, double v5_TopXDim, double v6_YDim, double v7_TopXOffset) : IfcParameterizedProfileDef((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,v1_ProfileType,IfcProfileTypeEnum::ToString(v1_ProfileType)); if (v2_ProfileName) { e->setArgument(1,(*v2_ProfileName)); } else { e->setArgument(1); } e->setArgument(2,(v3_Position)); e->setArgument(3,(v4_BottomXDim)); e->setArgument(4,(v5_TopXDim)); e->setArgument(5,(v6_YDim)); e->setArgument(6,(v7_TopXOffset)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcTriangulatedFaceSet
 bool IfcTriangulatedFaceSet::is(Type::Enum v) const { return v == Type::IfcTriangulatedFaceSet || IfcTessellatedFaceSet::is(v); }
 Type::Enum IfcTriangulatedFaceSet::type() const { return Type::IfcTriangulatedFaceSet; }
 Type::Enum IfcTriangulatedFaceSet::Class() { return Type::IfcTriangulatedFaceSet; }
-IfcTriangulatedFaceSet::IfcTriangulatedFaceSet(IfcAbstractEntityPtr e) : IfcTessellatedFaceSet((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcTriangulatedFaceSet)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcTriangulatedFaceSet::IfcTriangulatedFaceSet(IfcCartesianPointList3D* v1_Coordinates, boost::optional< bool > v3_Closed) : IfcTessellatedFaceSet((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Coordinates)); if (v3_Closed) { e->setArgument(2,(*v3_Closed)); } else { e->setArgument(2); } entity = e; EntityBuffer::Add(this); }
+IfcTriangulatedFaceSet::IfcTriangulatedFaceSet(IfcAbstractEntity* e) : IfcTessellatedFaceSet((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcTriangulatedFaceSet)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcTriangulatedFaceSet::IfcTriangulatedFaceSet(IfcCartesianPointList3D* v1_Coordinates, boost::optional< bool > v3_Closed) : IfcTessellatedFaceSet((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Coordinates)); if (v3_Closed) { e->setArgument(2,(*v3_Closed)); } else { e->setArgument(2); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcTrimmedCurve
-IfcCurve* IfcTrimmedCurve::BasisCurve() { return (IfcCurve*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(0))); }
+IfcCurve* IfcTrimmedCurve::BasisCurve() const { return (IfcCurve*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(0))); }
 void IfcTrimmedCurve::setBasisCurve(IfcCurve* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > IfcTrimmedCurve::Trim1() { RETURN_AS_LIST(IfcUtil::IfcAbstractSelect,1) }
-void IfcTrimmedCurve::setTrim1(SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v->generalize()); }
-SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > IfcTrimmedCurve::Trim2() { RETURN_AS_LIST(IfcUtil::IfcAbstractSelect,2) }
-void IfcTrimmedCurve::setTrim2(SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v->generalize()); }
-bool IfcTrimmedCurve::SenseAgreement() { return *entity->getArgument(3); }
+IfcEntityList::ptr IfcTrimmedCurve::Trim1() const { return *entity->getArgument(1); }
+void IfcTrimmedCurve::setTrim1(IfcEntityList::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+IfcEntityList::ptr IfcTrimmedCurve::Trim2() const { return *entity->getArgument(2); }
+void IfcTrimmedCurve::setTrim2(IfcEntityList::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(2,v); }
+bool IfcTrimmedCurve::SenseAgreement() const { return *entity->getArgument(3); }
 void IfcTrimmedCurve::setSenseAgreement(bool v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-IfcTrimmingPreference::IfcTrimmingPreference IfcTrimmedCurve::MasterRepresentation() { return IfcTrimmingPreference::FromString(*entity->getArgument(4)); }
+IfcTrimmingPreference::IfcTrimmingPreference IfcTrimmedCurve::MasterRepresentation() const { return IfcTrimmingPreference::FromString(*entity->getArgument(4)); }
 void IfcTrimmedCurve::setMasterRepresentation(IfcTrimmingPreference::IfcTrimmingPreference v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v,IfcTrimmingPreference::ToString(v)); }
 bool IfcTrimmedCurve::is(Type::Enum v) const { return v == Type::IfcTrimmedCurve || IfcBoundedCurve::is(v); }
 Type::Enum IfcTrimmedCurve::type() const { return Type::IfcTrimmedCurve; }
 Type::Enum IfcTrimmedCurve::Class() { return Type::IfcTrimmedCurve; }
-IfcTrimmedCurve::IfcTrimmedCurve(IfcAbstractEntityPtr e) : IfcBoundedCurve((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcTrimmedCurve)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcTrimmedCurve::IfcTrimmedCurve(IfcCurve* v1_BasisCurve, IfcEntities v2_Trim1, IfcEntities v3_Trim2, bool v4_SenseAgreement, IfcTrimmingPreference::IfcTrimmingPreference v5_MasterRepresentation) : IfcBoundedCurve((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_BasisCurve)); e->setArgument(1,(v2_Trim1)); e->setArgument(2,(v3_Trim2)); e->setArgument(3,(v4_SenseAgreement)); e->setArgument(4,v5_MasterRepresentation,IfcTrimmingPreference::ToString(v5_MasterRepresentation)); entity = e; EntityBuffer::Add(this); }
+IfcTrimmedCurve::IfcTrimmedCurve(IfcAbstractEntity* e) : IfcBoundedCurve((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcTrimmedCurve)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcTrimmedCurve::IfcTrimmedCurve(IfcCurve* v1_BasisCurve, IfcEntityList::ptr v2_Trim1, IfcEntityList::ptr v3_Trim2, bool v4_SenseAgreement, IfcTrimmingPreference::IfcTrimmingPreference v5_MasterRepresentation) : IfcBoundedCurve((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_BasisCurve)); e->setArgument(1,(v2_Trim1)); e->setArgument(2,(v3_Trim2)); e->setArgument(3,(v4_SenseAgreement)); e->setArgument(4,v5_MasterRepresentation,IfcTrimmingPreference::ToString(v5_MasterRepresentation)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcTubeBundle
-bool IfcTubeBundle::hasPredefinedType() { return !entity->getArgument(8)->isNull(); }
-IfcTubeBundleTypeEnum::IfcTubeBundleTypeEnum IfcTubeBundle::PredefinedType() { return IfcTubeBundleTypeEnum::FromString(*entity->getArgument(8)); }
+bool IfcTubeBundle::hasPredefinedType() const { return !entity->getArgument(8)->isNull(); }
+IfcTubeBundleTypeEnum::IfcTubeBundleTypeEnum IfcTubeBundle::PredefinedType() const { return IfcTubeBundleTypeEnum::FromString(*entity->getArgument(8)); }
 void IfcTubeBundle::setPredefinedType(IfcTubeBundleTypeEnum::IfcTubeBundleTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcTubeBundleTypeEnum::ToString(v)); }
 bool IfcTubeBundle::is(Type::Enum v) const { return v == Type::IfcTubeBundle || IfcEnergyConversionDevice::is(v); }
 Type::Enum IfcTubeBundle::type() const { return Type::IfcTubeBundle; }
 Type::Enum IfcTubeBundle::Class() { return Type::IfcTubeBundle; }
-IfcTubeBundle::IfcTubeBundle(IfcAbstractEntityPtr e) : IfcEnergyConversionDevice((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcTubeBundle)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcTubeBundle::IfcTubeBundle(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcTubeBundleTypeEnum::IfcTubeBundleTypeEnum > v9_PredefinedType) : IfcEnergyConversionDevice((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcTubeBundleTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcTubeBundle::IfcTubeBundle(IfcAbstractEntity* e) : IfcEnergyConversionDevice((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcTubeBundle)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcTubeBundle::IfcTubeBundle(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcTubeBundleTypeEnum::IfcTubeBundleTypeEnum > v9_PredefinedType) : IfcEnergyConversionDevice((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcTubeBundleTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcTubeBundleType
-IfcTubeBundleTypeEnum::IfcTubeBundleTypeEnum IfcTubeBundleType::PredefinedType() { return IfcTubeBundleTypeEnum::FromString(*entity->getArgument(9)); }
+IfcTubeBundleTypeEnum::IfcTubeBundleTypeEnum IfcTubeBundleType::PredefinedType() const { return IfcTubeBundleTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcTubeBundleType::setPredefinedType(IfcTubeBundleTypeEnum::IfcTubeBundleTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcTubeBundleTypeEnum::ToString(v)); }
 bool IfcTubeBundleType::is(Type::Enum v) const { return v == Type::IfcTubeBundleType || IfcEnergyConversionDeviceType::is(v); }
 Type::Enum IfcTubeBundleType::type() const { return Type::IfcTubeBundleType; }
 Type::Enum IfcTubeBundleType::Class() { return Type::IfcTubeBundleType; }
-IfcTubeBundleType::IfcTubeBundleType(IfcAbstractEntityPtr e) : IfcEnergyConversionDeviceType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcTubeBundleType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcTubeBundleType::IfcTubeBundleType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcTubeBundleTypeEnum::IfcTubeBundleTypeEnum v10_PredefinedType) : IfcEnergyConversionDeviceType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcTubeBundleTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcTubeBundleType::IfcTubeBundleType(IfcAbstractEntity* e) : IfcEnergyConversionDeviceType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcTubeBundleType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcTubeBundleType::IfcTubeBundleType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcTubeBundleTypeEnum::IfcTubeBundleTypeEnum v10_PredefinedType) : IfcEnergyConversionDeviceType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcTubeBundleTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcTypeObject
-bool IfcTypeObject::hasApplicableOccurrence() { return !entity->getArgument(4)->isNull(); }
-IfcIdentifier IfcTypeObject::ApplicableOccurrence() { return *entity->getArgument(4); }
-void IfcTypeObject::setApplicableOccurrence(IfcIdentifier v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-bool IfcTypeObject::hasHasPropertySets() { return !entity->getArgument(5)->isNull(); }
-SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > IfcTypeObject::HasPropertySets() { RETURN_AS_LIST(IfcPropertySetDefinition,5) }
-void IfcTypeObject::setHasPropertySets(SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v->generalize()); }
-IfcRelDefinesByType::list IfcTypeObject::Types() { RETURN_INVERSE(IfcRelDefinesByType) }
+bool IfcTypeObject::hasApplicableOccurrence() const { return !entity->getArgument(4)->isNull(); }
+std::string IfcTypeObject::ApplicableOccurrence() const { return *entity->getArgument(4); }
+void IfcTypeObject::setApplicableOccurrence(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+bool IfcTypeObject::hasHasPropertySets() const { return !entity->getArgument(5)->isNull(); }
+IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr IfcTypeObject::HasPropertySets() const { IfcEntityList::ptr es = *entity->getArgument(5); return es->as<IfcPropertySetDefinition>(); }
+void IfcTypeObject::setHasPropertySets(IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v->generalize()); }
+IfcRelDefinesByType::list::ptr IfcTypeObject::Types() const { return entity->getInverse(Type::IfcRelDefinesByType, 5)->as<IfcRelDefinesByType>(); }
 bool IfcTypeObject::is(Type::Enum v) const { return v == Type::IfcTypeObject || IfcObjectDefinition::is(v); }
 Type::Enum IfcTypeObject::type() const { return Type::IfcTypeObject; }
 Type::Enum IfcTypeObject::Class() { return Type::IfcTypeObject; }
-IfcTypeObject::IfcTypeObject(IfcAbstractEntityPtr e) : IfcObjectDefinition((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcTypeObject)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcTypeObject::IfcTypeObject(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets) : IfcObjectDefinition((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } entity = e; EntityBuffer::Add(this); }
+IfcTypeObject::IfcTypeObject(IfcAbstractEntity* e) : IfcObjectDefinition((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcTypeObject)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcTypeObject::IfcTypeObject(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets) : IfcObjectDefinition((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcTypeProcess
-bool IfcTypeProcess::hasIdentification() { return !entity->getArgument(6)->isNull(); }
-IfcIdentifier IfcTypeProcess::Identification() { return *entity->getArgument(6); }
-void IfcTypeProcess::setIdentification(IfcIdentifier v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
-bool IfcTypeProcess::hasLongDescription() { return !entity->getArgument(7)->isNull(); }
-IfcText IfcTypeProcess::LongDescription() { return *entity->getArgument(7); }
-void IfcTypeProcess::setLongDescription(IfcText v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
-bool IfcTypeProcess::hasProcessType() { return !entity->getArgument(8)->isNull(); }
-IfcLabel IfcTypeProcess::ProcessType() { return *entity->getArgument(8); }
-void IfcTypeProcess::setProcessType(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
-IfcRelAssignsToProcess::list IfcTypeProcess::OperatesOn() { RETURN_INVERSE(IfcRelAssignsToProcess) }
+bool IfcTypeProcess::hasIdentification() const { return !entity->getArgument(6)->isNull(); }
+std::string IfcTypeProcess::Identification() const { return *entity->getArgument(6); }
+void IfcTypeProcess::setIdentification(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
+bool IfcTypeProcess::hasLongDescription() const { return !entity->getArgument(7)->isNull(); }
+std::string IfcTypeProcess::LongDescription() const { return *entity->getArgument(7); }
+void IfcTypeProcess::setLongDescription(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
+bool IfcTypeProcess::hasProcessType() const { return !entity->getArgument(8)->isNull(); }
+std::string IfcTypeProcess::ProcessType() const { return *entity->getArgument(8); }
+void IfcTypeProcess::setProcessType(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
+IfcRelAssignsToProcess::list::ptr IfcTypeProcess::OperatesOn() const { return entity->getInverse(Type::IfcRelAssignsToProcess, 6)->as<IfcRelAssignsToProcess>(); }
 bool IfcTypeProcess::is(Type::Enum v) const { return v == Type::IfcTypeProcess || IfcTypeObject::is(v); }
 Type::Enum IfcTypeProcess::type() const { return Type::IfcTypeProcess; }
 Type::Enum IfcTypeProcess::Class() { return Type::IfcTypeProcess; }
-IfcTypeProcess::IfcTypeProcess(IfcAbstractEntityPtr e) : IfcTypeObject((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcTypeProcess)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcTypeProcess::IfcTypeProcess(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< IfcIdentifier > v7_Identification, boost::optional< IfcText > v8_LongDescription, boost::optional< IfcLabel > v9_ProcessType) : IfcTypeObject((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_Identification) { e->setArgument(6,(*v7_Identification)); } else { e->setArgument(6); } if (v8_LongDescription) { e->setArgument(7,(*v8_LongDescription)); } else { e->setArgument(7); } if (v9_ProcessType) { e->setArgument(8,(*v9_ProcessType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcTypeProcess::IfcTypeProcess(IfcAbstractEntity* e) : IfcTypeObject((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcTypeProcess)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcTypeProcess::IfcTypeProcess(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< std::string > v7_Identification, boost::optional< std::string > v8_LongDescription, boost::optional< std::string > v9_ProcessType) : IfcTypeObject((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_Identification) { e->setArgument(6,(*v7_Identification)); } else { e->setArgument(6); } if (v8_LongDescription) { e->setArgument(7,(*v8_LongDescription)); } else { e->setArgument(7); } if (v9_ProcessType) { e->setArgument(8,(*v9_ProcessType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcTypeProduct
-bool IfcTypeProduct::hasRepresentationMaps() { return !entity->getArgument(6)->isNull(); }
-SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > IfcTypeProduct::RepresentationMaps() { RETURN_AS_LIST(IfcRepresentationMap,6) }
-void IfcTypeProduct::setRepresentationMaps(SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v->generalize()); }
-bool IfcTypeProduct::hasTag() { return !entity->getArgument(7)->isNull(); }
-IfcLabel IfcTypeProduct::Tag() { return *entity->getArgument(7); }
-void IfcTypeProduct::setTag(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
-IfcRelAssignsToProduct::list IfcTypeProduct::ReferencedBy() { RETURN_INVERSE(IfcRelAssignsToProduct) }
+bool IfcTypeProduct::hasRepresentationMaps() const { return !entity->getArgument(6)->isNull(); }
+IfcTemplatedEntityList< IfcRepresentationMap >::ptr IfcTypeProduct::RepresentationMaps() const { IfcEntityList::ptr es = *entity->getArgument(6); return es->as<IfcRepresentationMap>(); }
+void IfcTypeProduct::setRepresentationMaps(IfcTemplatedEntityList< IfcRepresentationMap >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v->generalize()); }
+bool IfcTypeProduct::hasTag() const { return !entity->getArgument(7)->isNull(); }
+std::string IfcTypeProduct::Tag() const { return *entity->getArgument(7); }
+void IfcTypeProduct::setTag(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
+IfcRelAssignsToProduct::list::ptr IfcTypeProduct::ReferencedBy() const { return entity->getInverse(Type::IfcRelAssignsToProduct, 6)->as<IfcRelAssignsToProduct>(); }
 bool IfcTypeProduct::is(Type::Enum v) const { return v == Type::IfcTypeProduct || IfcTypeObject::is(v); }
 Type::Enum IfcTypeProduct::type() const { return Type::IfcTypeProduct; }
 Type::Enum IfcTypeProduct::Class() { return Type::IfcTypeProduct; }
-IfcTypeProduct::IfcTypeProduct(IfcAbstractEntityPtr e) : IfcTypeObject((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcTypeProduct)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcTypeProduct::IfcTypeProduct(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag) : IfcTypeObject((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
+IfcTypeProduct::IfcTypeProduct(IfcAbstractEntity* e) : IfcTypeObject((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcTypeProduct)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcTypeProduct::IfcTypeProduct(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag) : IfcTypeObject((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcTypeResource
-bool IfcTypeResource::hasIdentification() { return !entity->getArgument(6)->isNull(); }
-IfcIdentifier IfcTypeResource::Identification() { return *entity->getArgument(6); }
-void IfcTypeResource::setIdentification(IfcIdentifier v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
-bool IfcTypeResource::hasLongDescription() { return !entity->getArgument(7)->isNull(); }
-IfcText IfcTypeResource::LongDescription() { return *entity->getArgument(7); }
-void IfcTypeResource::setLongDescription(IfcText v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
-bool IfcTypeResource::hasResourceType() { return !entity->getArgument(8)->isNull(); }
-IfcLabel IfcTypeResource::ResourceType() { return *entity->getArgument(8); }
-void IfcTypeResource::setResourceType(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
-IfcRelAssignsToResource::list IfcTypeResource::ResourceOf() { RETURN_INVERSE(IfcRelAssignsToResource) }
+bool IfcTypeResource::hasIdentification() const { return !entity->getArgument(6)->isNull(); }
+std::string IfcTypeResource::Identification() const { return *entity->getArgument(6); }
+void IfcTypeResource::setIdentification(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
+bool IfcTypeResource::hasLongDescription() const { return !entity->getArgument(7)->isNull(); }
+std::string IfcTypeResource::LongDescription() const { return *entity->getArgument(7); }
+void IfcTypeResource::setLongDescription(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
+bool IfcTypeResource::hasResourceType() const { return !entity->getArgument(8)->isNull(); }
+std::string IfcTypeResource::ResourceType() const { return *entity->getArgument(8); }
+void IfcTypeResource::setResourceType(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
+IfcRelAssignsToResource::list::ptr IfcTypeResource::ResourceOf() const { return entity->getInverse(Type::IfcRelAssignsToResource, 6)->as<IfcRelAssignsToResource>(); }
 bool IfcTypeResource::is(Type::Enum v) const { return v == Type::IfcTypeResource || IfcTypeObject::is(v); }
 Type::Enum IfcTypeResource::type() const { return Type::IfcTypeResource; }
 Type::Enum IfcTypeResource::Class() { return Type::IfcTypeResource; }
-IfcTypeResource::IfcTypeResource(IfcAbstractEntityPtr e) : IfcTypeObject((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcTypeResource)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcTypeResource::IfcTypeResource(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< IfcIdentifier > v7_Identification, boost::optional< IfcText > v8_LongDescription, boost::optional< IfcLabel > v9_ResourceType) : IfcTypeObject((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_Identification) { e->setArgument(6,(*v7_Identification)); } else { e->setArgument(6); } if (v8_LongDescription) { e->setArgument(7,(*v8_LongDescription)); } else { e->setArgument(7); } if (v9_ResourceType) { e->setArgument(8,(*v9_ResourceType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcTypeResource::IfcTypeResource(IfcAbstractEntity* e) : IfcTypeObject((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcTypeResource)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcTypeResource::IfcTypeResource(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< std::string > v7_Identification, boost::optional< std::string > v8_LongDescription, boost::optional< std::string > v9_ResourceType) : IfcTypeObject((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_Identification) { e->setArgument(6,(*v7_Identification)); } else { e->setArgument(6); } if (v8_LongDescription) { e->setArgument(7,(*v8_LongDescription)); } else { e->setArgument(7); } if (v9_ResourceType) { e->setArgument(8,(*v9_ResourceType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcUShapeProfileDef
-IfcPositiveLengthMeasure IfcUShapeProfileDef::Depth() { return *entity->getArgument(3); }
-void IfcUShapeProfileDef::setDepth(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-IfcPositiveLengthMeasure IfcUShapeProfileDef::FlangeWidth() { return *entity->getArgument(4); }
-void IfcUShapeProfileDef::setFlangeWidth(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-IfcPositiveLengthMeasure IfcUShapeProfileDef::WebThickness() { return *entity->getArgument(5); }
-void IfcUShapeProfileDef::setWebThickness(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-IfcPositiveLengthMeasure IfcUShapeProfileDef::FlangeThickness() { return *entity->getArgument(6); }
-void IfcUShapeProfileDef::setFlangeThickness(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
-bool IfcUShapeProfileDef::hasFilletRadius() { return !entity->getArgument(7)->isNull(); }
-IfcNonNegativeLengthMeasure IfcUShapeProfileDef::FilletRadius() { return *entity->getArgument(7); }
-void IfcUShapeProfileDef::setFilletRadius(IfcNonNegativeLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
-bool IfcUShapeProfileDef::hasEdgeRadius() { return !entity->getArgument(8)->isNull(); }
-IfcNonNegativeLengthMeasure IfcUShapeProfileDef::EdgeRadius() { return *entity->getArgument(8); }
-void IfcUShapeProfileDef::setEdgeRadius(IfcNonNegativeLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
-bool IfcUShapeProfileDef::hasFlangeSlope() { return !entity->getArgument(9)->isNull(); }
-IfcPlaneAngleMeasure IfcUShapeProfileDef::FlangeSlope() { return *entity->getArgument(9); }
-void IfcUShapeProfileDef::setFlangeSlope(IfcPlaneAngleMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
+double IfcUShapeProfileDef::Depth() const { return *entity->getArgument(3); }
+void IfcUShapeProfileDef::setDepth(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+double IfcUShapeProfileDef::FlangeWidth() const { return *entity->getArgument(4); }
+void IfcUShapeProfileDef::setFlangeWidth(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+double IfcUShapeProfileDef::WebThickness() const { return *entity->getArgument(5); }
+void IfcUShapeProfileDef::setWebThickness(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+double IfcUShapeProfileDef::FlangeThickness() const { return *entity->getArgument(6); }
+void IfcUShapeProfileDef::setFlangeThickness(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
+bool IfcUShapeProfileDef::hasFilletRadius() const { return !entity->getArgument(7)->isNull(); }
+double IfcUShapeProfileDef::FilletRadius() const { return *entity->getArgument(7); }
+void IfcUShapeProfileDef::setFilletRadius(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
+bool IfcUShapeProfileDef::hasEdgeRadius() const { return !entity->getArgument(8)->isNull(); }
+double IfcUShapeProfileDef::EdgeRadius() const { return *entity->getArgument(8); }
+void IfcUShapeProfileDef::setEdgeRadius(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
+bool IfcUShapeProfileDef::hasFlangeSlope() const { return !entity->getArgument(9)->isNull(); }
+double IfcUShapeProfileDef::FlangeSlope() const { return *entity->getArgument(9); }
+void IfcUShapeProfileDef::setFlangeSlope(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
 bool IfcUShapeProfileDef::is(Type::Enum v) const { return v == Type::IfcUShapeProfileDef || IfcParameterizedProfileDef::is(v); }
 Type::Enum IfcUShapeProfileDef::type() const { return Type::IfcUShapeProfileDef; }
 Type::Enum IfcUShapeProfileDef::Class() { return Type::IfcUShapeProfileDef; }
-IfcUShapeProfileDef::IfcUShapeProfileDef(IfcAbstractEntityPtr e) : IfcParameterizedProfileDef((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcUShapeProfileDef)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcUShapeProfileDef::IfcUShapeProfileDef(IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< IfcLabel > v2_ProfileName, IfcAxis2Placement2D* v3_Position, IfcPositiveLengthMeasure v4_Depth, IfcPositiveLengthMeasure v5_FlangeWidth, IfcPositiveLengthMeasure v6_WebThickness, IfcPositiveLengthMeasure v7_FlangeThickness, boost::optional< IfcNonNegativeLengthMeasure > v8_FilletRadius, boost::optional< IfcNonNegativeLengthMeasure > v9_EdgeRadius, boost::optional< IfcPlaneAngleMeasure > v10_FlangeSlope) : IfcParameterizedProfileDef((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,v1_ProfileType,IfcProfileTypeEnum::ToString(v1_ProfileType)); if (v2_ProfileName) { e->setArgument(1,(*v2_ProfileName)); } else { e->setArgument(1); } e->setArgument(2,(v3_Position)); e->setArgument(3,(v4_Depth)); e->setArgument(4,(v5_FlangeWidth)); e->setArgument(5,(v6_WebThickness)); e->setArgument(6,(v7_FlangeThickness)); if (v8_FilletRadius) { e->setArgument(7,(*v8_FilletRadius)); } else { e->setArgument(7); } if (v9_EdgeRadius) { e->setArgument(8,(*v9_EdgeRadius)); } else { e->setArgument(8); } if (v10_FlangeSlope) { e->setArgument(9,(*v10_FlangeSlope)); } else { e->setArgument(9); } entity = e; EntityBuffer::Add(this); }
+IfcUShapeProfileDef::IfcUShapeProfileDef(IfcAbstractEntity* e) : IfcParameterizedProfileDef((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcUShapeProfileDef)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcUShapeProfileDef::IfcUShapeProfileDef(IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< std::string > v2_ProfileName, IfcAxis2Placement2D* v3_Position, double v4_Depth, double v5_FlangeWidth, double v6_WebThickness, double v7_FlangeThickness, boost::optional< double > v8_FilletRadius, boost::optional< double > v9_EdgeRadius, boost::optional< double > v10_FlangeSlope) : IfcParameterizedProfileDef((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,v1_ProfileType,IfcProfileTypeEnum::ToString(v1_ProfileType)); if (v2_ProfileName) { e->setArgument(1,(*v2_ProfileName)); } else { e->setArgument(1); } e->setArgument(2,(v3_Position)); e->setArgument(3,(v4_Depth)); e->setArgument(4,(v5_FlangeWidth)); e->setArgument(5,(v6_WebThickness)); e->setArgument(6,(v7_FlangeThickness)); if (v8_FilletRadius) { e->setArgument(7,(*v8_FilletRadius)); } else { e->setArgument(7); } if (v9_EdgeRadius) { e->setArgument(8,(*v9_EdgeRadius)); } else { e->setArgument(8); } if (v10_FlangeSlope) { e->setArgument(9,(*v10_FlangeSlope)); } else { e->setArgument(9); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcUnitAssignment
-SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > IfcUnitAssignment::Units() { RETURN_AS_LIST(IfcUtil::IfcAbstractSelect,0) }
-void IfcUnitAssignment::setUnits(SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v->generalize()); }
+IfcEntityList::ptr IfcUnitAssignment::Units() const { return *entity->getArgument(0); }
+void IfcUnitAssignment::setUnits(IfcEntityList::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
 bool IfcUnitAssignment::is(Type::Enum v) const { return v == Type::IfcUnitAssignment; }
 Type::Enum IfcUnitAssignment::type() const { return Type::IfcUnitAssignment; }
 Type::Enum IfcUnitAssignment::Class() { return Type::IfcUnitAssignment; }
-IfcUnitAssignment::IfcUnitAssignment(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcUnitAssignment)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcUnitAssignment::IfcUnitAssignment(IfcEntities v1_Units) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Units)); entity = e; EntityBuffer::Add(this); }
+IfcUnitAssignment::IfcUnitAssignment(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcUnitAssignment)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcUnitAssignment::IfcUnitAssignment(IfcEntityList::ptr v1_Units) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Units)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcUnitaryControlElement
-bool IfcUnitaryControlElement::hasPredefinedType() { return !entity->getArgument(8)->isNull(); }
-IfcUnitaryControlElementTypeEnum::IfcUnitaryControlElementTypeEnum IfcUnitaryControlElement::PredefinedType() { return IfcUnitaryControlElementTypeEnum::FromString(*entity->getArgument(8)); }
+bool IfcUnitaryControlElement::hasPredefinedType() const { return !entity->getArgument(8)->isNull(); }
+IfcUnitaryControlElementTypeEnum::IfcUnitaryControlElementTypeEnum IfcUnitaryControlElement::PredefinedType() const { return IfcUnitaryControlElementTypeEnum::FromString(*entity->getArgument(8)); }
 void IfcUnitaryControlElement::setPredefinedType(IfcUnitaryControlElementTypeEnum::IfcUnitaryControlElementTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcUnitaryControlElementTypeEnum::ToString(v)); }
 bool IfcUnitaryControlElement::is(Type::Enum v) const { return v == Type::IfcUnitaryControlElement || IfcDistributionControlElement::is(v); }
 Type::Enum IfcUnitaryControlElement::type() const { return Type::IfcUnitaryControlElement; }
 Type::Enum IfcUnitaryControlElement::Class() { return Type::IfcUnitaryControlElement; }
-IfcUnitaryControlElement::IfcUnitaryControlElement(IfcAbstractEntityPtr e) : IfcDistributionControlElement((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcUnitaryControlElement)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcUnitaryControlElement::IfcUnitaryControlElement(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcUnitaryControlElementTypeEnum::IfcUnitaryControlElementTypeEnum > v9_PredefinedType) : IfcDistributionControlElement((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcUnitaryControlElementTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcUnitaryControlElement::IfcUnitaryControlElement(IfcAbstractEntity* e) : IfcDistributionControlElement((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcUnitaryControlElement)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcUnitaryControlElement::IfcUnitaryControlElement(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcUnitaryControlElementTypeEnum::IfcUnitaryControlElementTypeEnum > v9_PredefinedType) : IfcDistributionControlElement((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcUnitaryControlElementTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcUnitaryControlElementType
-IfcUnitaryControlElementTypeEnum::IfcUnitaryControlElementTypeEnum IfcUnitaryControlElementType::PredefinedType() { return IfcUnitaryControlElementTypeEnum::FromString(*entity->getArgument(9)); }
+IfcUnitaryControlElementTypeEnum::IfcUnitaryControlElementTypeEnum IfcUnitaryControlElementType::PredefinedType() const { return IfcUnitaryControlElementTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcUnitaryControlElementType::setPredefinedType(IfcUnitaryControlElementTypeEnum::IfcUnitaryControlElementTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcUnitaryControlElementTypeEnum::ToString(v)); }
 bool IfcUnitaryControlElementType::is(Type::Enum v) const { return v == Type::IfcUnitaryControlElementType || IfcDistributionControlElementType::is(v); }
 Type::Enum IfcUnitaryControlElementType::type() const { return Type::IfcUnitaryControlElementType; }
 Type::Enum IfcUnitaryControlElementType::Class() { return Type::IfcUnitaryControlElementType; }
-IfcUnitaryControlElementType::IfcUnitaryControlElementType(IfcAbstractEntityPtr e) : IfcDistributionControlElementType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcUnitaryControlElementType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcUnitaryControlElementType::IfcUnitaryControlElementType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcUnitaryControlElementTypeEnum::IfcUnitaryControlElementTypeEnum v10_PredefinedType) : IfcDistributionControlElementType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcUnitaryControlElementTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcUnitaryControlElementType::IfcUnitaryControlElementType(IfcAbstractEntity* e) : IfcDistributionControlElementType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcUnitaryControlElementType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcUnitaryControlElementType::IfcUnitaryControlElementType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcUnitaryControlElementTypeEnum::IfcUnitaryControlElementTypeEnum v10_PredefinedType) : IfcDistributionControlElementType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcUnitaryControlElementTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcUnitaryEquipment
-bool IfcUnitaryEquipment::hasPredefinedType() { return !entity->getArgument(8)->isNull(); }
-IfcUnitaryEquipmentTypeEnum::IfcUnitaryEquipmentTypeEnum IfcUnitaryEquipment::PredefinedType() { return IfcUnitaryEquipmentTypeEnum::FromString(*entity->getArgument(8)); }
+bool IfcUnitaryEquipment::hasPredefinedType() const { return !entity->getArgument(8)->isNull(); }
+IfcUnitaryEquipmentTypeEnum::IfcUnitaryEquipmentTypeEnum IfcUnitaryEquipment::PredefinedType() const { return IfcUnitaryEquipmentTypeEnum::FromString(*entity->getArgument(8)); }
 void IfcUnitaryEquipment::setPredefinedType(IfcUnitaryEquipmentTypeEnum::IfcUnitaryEquipmentTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcUnitaryEquipmentTypeEnum::ToString(v)); }
 bool IfcUnitaryEquipment::is(Type::Enum v) const { return v == Type::IfcUnitaryEquipment || IfcEnergyConversionDevice::is(v); }
 Type::Enum IfcUnitaryEquipment::type() const { return Type::IfcUnitaryEquipment; }
 Type::Enum IfcUnitaryEquipment::Class() { return Type::IfcUnitaryEquipment; }
-IfcUnitaryEquipment::IfcUnitaryEquipment(IfcAbstractEntityPtr e) : IfcEnergyConversionDevice((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcUnitaryEquipment)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcUnitaryEquipment::IfcUnitaryEquipment(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcUnitaryEquipmentTypeEnum::IfcUnitaryEquipmentTypeEnum > v9_PredefinedType) : IfcEnergyConversionDevice((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcUnitaryEquipmentTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcUnitaryEquipment::IfcUnitaryEquipment(IfcAbstractEntity* e) : IfcEnergyConversionDevice((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcUnitaryEquipment)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcUnitaryEquipment::IfcUnitaryEquipment(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcUnitaryEquipmentTypeEnum::IfcUnitaryEquipmentTypeEnum > v9_PredefinedType) : IfcEnergyConversionDevice((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcUnitaryEquipmentTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcUnitaryEquipmentType
-IfcUnitaryEquipmentTypeEnum::IfcUnitaryEquipmentTypeEnum IfcUnitaryEquipmentType::PredefinedType() { return IfcUnitaryEquipmentTypeEnum::FromString(*entity->getArgument(9)); }
+IfcUnitaryEquipmentTypeEnum::IfcUnitaryEquipmentTypeEnum IfcUnitaryEquipmentType::PredefinedType() const { return IfcUnitaryEquipmentTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcUnitaryEquipmentType::setPredefinedType(IfcUnitaryEquipmentTypeEnum::IfcUnitaryEquipmentTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcUnitaryEquipmentTypeEnum::ToString(v)); }
 bool IfcUnitaryEquipmentType::is(Type::Enum v) const { return v == Type::IfcUnitaryEquipmentType || IfcEnergyConversionDeviceType::is(v); }
 Type::Enum IfcUnitaryEquipmentType::type() const { return Type::IfcUnitaryEquipmentType; }
 Type::Enum IfcUnitaryEquipmentType::Class() { return Type::IfcUnitaryEquipmentType; }
-IfcUnitaryEquipmentType::IfcUnitaryEquipmentType(IfcAbstractEntityPtr e) : IfcEnergyConversionDeviceType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcUnitaryEquipmentType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcUnitaryEquipmentType::IfcUnitaryEquipmentType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcUnitaryEquipmentTypeEnum::IfcUnitaryEquipmentTypeEnum v10_PredefinedType) : IfcEnergyConversionDeviceType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcUnitaryEquipmentTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcUnitaryEquipmentType::IfcUnitaryEquipmentType(IfcAbstractEntity* e) : IfcEnergyConversionDeviceType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcUnitaryEquipmentType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcUnitaryEquipmentType::IfcUnitaryEquipmentType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcUnitaryEquipmentTypeEnum::IfcUnitaryEquipmentTypeEnum v10_PredefinedType) : IfcEnergyConversionDeviceType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcUnitaryEquipmentTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcValve
-bool IfcValve::hasPredefinedType() { return !entity->getArgument(8)->isNull(); }
-IfcValveTypeEnum::IfcValveTypeEnum IfcValve::PredefinedType() { return IfcValveTypeEnum::FromString(*entity->getArgument(8)); }
+bool IfcValve::hasPredefinedType() const { return !entity->getArgument(8)->isNull(); }
+IfcValveTypeEnum::IfcValveTypeEnum IfcValve::PredefinedType() const { return IfcValveTypeEnum::FromString(*entity->getArgument(8)); }
 void IfcValve::setPredefinedType(IfcValveTypeEnum::IfcValveTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcValveTypeEnum::ToString(v)); }
 bool IfcValve::is(Type::Enum v) const { return v == Type::IfcValve || IfcFlowController::is(v); }
 Type::Enum IfcValve::type() const { return Type::IfcValve; }
 Type::Enum IfcValve::Class() { return Type::IfcValve; }
-IfcValve::IfcValve(IfcAbstractEntityPtr e) : IfcFlowController((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcValve)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcValve::IfcValve(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcValveTypeEnum::IfcValveTypeEnum > v9_PredefinedType) : IfcFlowController((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcValveTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcValve::IfcValve(IfcAbstractEntity* e) : IfcFlowController((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcValve)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcValve::IfcValve(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcValveTypeEnum::IfcValveTypeEnum > v9_PredefinedType) : IfcFlowController((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcValveTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcValveType
-IfcValveTypeEnum::IfcValveTypeEnum IfcValveType::PredefinedType() { return IfcValveTypeEnum::FromString(*entity->getArgument(9)); }
+IfcValveTypeEnum::IfcValveTypeEnum IfcValveType::PredefinedType() const { return IfcValveTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcValveType::setPredefinedType(IfcValveTypeEnum::IfcValveTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcValveTypeEnum::ToString(v)); }
 bool IfcValveType::is(Type::Enum v) const { return v == Type::IfcValveType || IfcFlowControllerType::is(v); }
 Type::Enum IfcValveType::type() const { return Type::IfcValveType; }
 Type::Enum IfcValveType::Class() { return Type::IfcValveType; }
-IfcValveType::IfcValveType(IfcAbstractEntityPtr e) : IfcFlowControllerType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcValveType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcValveType::IfcValveType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcValveTypeEnum::IfcValveTypeEnum v10_PredefinedType) : IfcFlowControllerType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcValveTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcValveType::IfcValveType(IfcAbstractEntity* e) : IfcFlowControllerType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcValveType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcValveType::IfcValveType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcValveTypeEnum::IfcValveTypeEnum v10_PredefinedType) : IfcFlowControllerType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcValveTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcVector
-IfcDirection* IfcVector::Orientation() { return (IfcDirection*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(0))); }
+IfcDirection* IfcVector::Orientation() const { return (IfcDirection*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(0))); }
 void IfcVector::setOrientation(IfcDirection* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
-IfcLengthMeasure IfcVector::Magnitude() { return *entity->getArgument(1); }
-void IfcVector::setMagnitude(IfcLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+double IfcVector::Magnitude() const { return *entity->getArgument(1); }
+void IfcVector::setMagnitude(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
 bool IfcVector::is(Type::Enum v) const { return v == Type::IfcVector || IfcGeometricRepresentationItem::is(v); }
 Type::Enum IfcVector::type() const { return Type::IfcVector; }
 Type::Enum IfcVector::Class() { return Type::IfcVector; }
-IfcVector::IfcVector(IfcAbstractEntityPtr e) : IfcGeometricRepresentationItem((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcVector)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcVector::IfcVector(IfcDirection* v1_Orientation, IfcLengthMeasure v2_Magnitude) : IfcGeometricRepresentationItem((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Orientation)); e->setArgument(1,(v2_Magnitude)); entity = e; EntityBuffer::Add(this); }
+IfcVector::IfcVector(IfcAbstractEntity* e) : IfcGeometricRepresentationItem((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcVector)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcVector::IfcVector(IfcDirection* v1_Orientation, double v2_Magnitude) : IfcGeometricRepresentationItem((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_Orientation)); e->setArgument(1,(v2_Magnitude)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcVertex
 bool IfcVertex::is(Type::Enum v) const { return v == Type::IfcVertex || IfcTopologicalRepresentationItem::is(v); }
 Type::Enum IfcVertex::type() const { return Type::IfcVertex; }
 Type::Enum IfcVertex::Class() { return Type::IfcVertex; }
-IfcVertex::IfcVertex(IfcAbstractEntityPtr e) : IfcTopologicalRepresentationItem((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcVertex)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcVertex::IfcVertex() : IfcTopologicalRepresentationItem((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); entity = e; EntityBuffer::Add(this); }
+IfcVertex::IfcVertex(IfcAbstractEntity* e) : IfcTopologicalRepresentationItem((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcVertex)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcVertex::IfcVertex() : IfcTopologicalRepresentationItem((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcVertexLoop
-IfcVertex* IfcVertexLoop::LoopVertex() { return (IfcVertex*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(0))); }
+IfcVertex* IfcVertexLoop::LoopVertex() const { return (IfcVertex*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(0))); }
 void IfcVertexLoop::setLoopVertex(IfcVertex* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
 bool IfcVertexLoop::is(Type::Enum v) const { return v == Type::IfcVertexLoop || IfcLoop::is(v); }
 Type::Enum IfcVertexLoop::type() const { return Type::IfcVertexLoop; }
 Type::Enum IfcVertexLoop::Class() { return Type::IfcVertexLoop; }
-IfcVertexLoop::IfcVertexLoop(IfcAbstractEntityPtr e) : IfcLoop((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcVertexLoop)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcVertexLoop::IfcVertexLoop(IfcVertex* v1_LoopVertex) : IfcLoop((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_LoopVertex)); entity = e; EntityBuffer::Add(this); }
+IfcVertexLoop::IfcVertexLoop(IfcAbstractEntity* e) : IfcLoop((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcVertexLoop)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcVertexLoop::IfcVertexLoop(IfcVertex* v1_LoopVertex) : IfcLoop((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_LoopVertex)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcVertexPoint
-IfcPoint* IfcVertexPoint::VertexGeometry() { return (IfcPoint*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(0))); }
+IfcPoint* IfcVertexPoint::VertexGeometry() const { return (IfcPoint*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(0))); }
 void IfcVertexPoint::setVertexGeometry(IfcPoint* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v); }
 bool IfcVertexPoint::is(Type::Enum v) const { return v == Type::IfcVertexPoint || IfcVertex::is(v); }
 Type::Enum IfcVertexPoint::type() const { return Type::IfcVertexPoint; }
 Type::Enum IfcVertexPoint::Class() { return Type::IfcVertexPoint; }
-IfcVertexPoint::IfcVertexPoint(IfcAbstractEntityPtr e) : IfcVertex((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcVertexPoint)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcVertexPoint::IfcVertexPoint(IfcPoint* v1_VertexGeometry) : IfcVertex((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_VertexGeometry)); entity = e; EntityBuffer::Add(this); }
+IfcVertexPoint::IfcVertexPoint(IfcAbstractEntity* e) : IfcVertex((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcVertexPoint)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcVertexPoint::IfcVertexPoint(IfcPoint* v1_VertexGeometry) : IfcVertex((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_VertexGeometry)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcVibrationIsolator
-bool IfcVibrationIsolator::hasPredefinedType() { return !entity->getArgument(8)->isNull(); }
-IfcVibrationIsolatorTypeEnum::IfcVibrationIsolatorTypeEnum IfcVibrationIsolator::PredefinedType() { return IfcVibrationIsolatorTypeEnum::FromString(*entity->getArgument(8)); }
+bool IfcVibrationIsolator::hasPredefinedType() const { return !entity->getArgument(8)->isNull(); }
+IfcVibrationIsolatorTypeEnum::IfcVibrationIsolatorTypeEnum IfcVibrationIsolator::PredefinedType() const { return IfcVibrationIsolatorTypeEnum::FromString(*entity->getArgument(8)); }
 void IfcVibrationIsolator::setPredefinedType(IfcVibrationIsolatorTypeEnum::IfcVibrationIsolatorTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcVibrationIsolatorTypeEnum::ToString(v)); }
 bool IfcVibrationIsolator::is(Type::Enum v) const { return v == Type::IfcVibrationIsolator || IfcElementComponent::is(v); }
 Type::Enum IfcVibrationIsolator::type() const { return Type::IfcVibrationIsolator; }
 Type::Enum IfcVibrationIsolator::Class() { return Type::IfcVibrationIsolator; }
-IfcVibrationIsolator::IfcVibrationIsolator(IfcAbstractEntityPtr e) : IfcElementComponent((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcVibrationIsolator)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcVibrationIsolator::IfcVibrationIsolator(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcVibrationIsolatorTypeEnum::IfcVibrationIsolatorTypeEnum > v9_PredefinedType) : IfcElementComponent((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcVibrationIsolatorTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcVibrationIsolator::IfcVibrationIsolator(IfcAbstractEntity* e) : IfcElementComponent((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcVibrationIsolator)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcVibrationIsolator::IfcVibrationIsolator(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcVibrationIsolatorTypeEnum::IfcVibrationIsolatorTypeEnum > v9_PredefinedType) : IfcElementComponent((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcVibrationIsolatorTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcVibrationIsolatorType
-IfcVibrationIsolatorTypeEnum::IfcVibrationIsolatorTypeEnum IfcVibrationIsolatorType::PredefinedType() { return IfcVibrationIsolatorTypeEnum::FromString(*entity->getArgument(9)); }
+IfcVibrationIsolatorTypeEnum::IfcVibrationIsolatorTypeEnum IfcVibrationIsolatorType::PredefinedType() const { return IfcVibrationIsolatorTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcVibrationIsolatorType::setPredefinedType(IfcVibrationIsolatorTypeEnum::IfcVibrationIsolatorTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcVibrationIsolatorTypeEnum::ToString(v)); }
 bool IfcVibrationIsolatorType::is(Type::Enum v) const { return v == Type::IfcVibrationIsolatorType || IfcElementComponentType::is(v); }
 Type::Enum IfcVibrationIsolatorType::type() const { return Type::IfcVibrationIsolatorType; }
 Type::Enum IfcVibrationIsolatorType::Class() { return Type::IfcVibrationIsolatorType; }
-IfcVibrationIsolatorType::IfcVibrationIsolatorType(IfcAbstractEntityPtr e) : IfcElementComponentType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcVibrationIsolatorType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcVibrationIsolatorType::IfcVibrationIsolatorType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcVibrationIsolatorTypeEnum::IfcVibrationIsolatorTypeEnum v10_PredefinedType) : IfcElementComponentType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcVibrationIsolatorTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcVibrationIsolatorType::IfcVibrationIsolatorType(IfcAbstractEntity* e) : IfcElementComponentType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcVibrationIsolatorType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcVibrationIsolatorType::IfcVibrationIsolatorType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcVibrationIsolatorTypeEnum::IfcVibrationIsolatorTypeEnum v10_PredefinedType) : IfcElementComponentType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcVibrationIsolatorTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcVirtualElement
 bool IfcVirtualElement::is(Type::Enum v) const { return v == Type::IfcVirtualElement || IfcElement::is(v); }
 Type::Enum IfcVirtualElement::type() const { return Type::IfcVirtualElement; }
 Type::Enum IfcVirtualElement::Class() { return Type::IfcVirtualElement; }
-IfcVirtualElement::IfcVirtualElement(IfcAbstractEntityPtr e) : IfcElement((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcVirtualElement)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcVirtualElement::IfcVirtualElement(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag) : IfcElement((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
+IfcVirtualElement::IfcVirtualElement(IfcAbstractEntity* e) : IfcElement((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcVirtualElement)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcVirtualElement::IfcVirtualElement(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag) : IfcElement((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcVirtualGridIntersection
-SHARED_PTR< IfcTemplatedEntityList< IfcGridAxis > > IfcVirtualGridIntersection::IntersectingAxes() { RETURN_AS_LIST(IfcGridAxis,0) }
-void IfcVirtualGridIntersection::setIntersectingAxes(SHARED_PTR< IfcTemplatedEntityList< IfcGridAxis > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v->generalize()); }
-std::vector< IfcLengthMeasure > /*[2:3]*/ IfcVirtualGridIntersection::OffsetDistances() { return *entity->getArgument(1); }
-void IfcVirtualGridIntersection::setOffsetDistances(std::vector< IfcLengthMeasure > /*[2:3]*/ v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
+IfcTemplatedEntityList< IfcGridAxis >::ptr IfcVirtualGridIntersection::IntersectingAxes() const { IfcEntityList::ptr es = *entity->getArgument(0); return es->as<IfcGridAxis>(); }
+void IfcVirtualGridIntersection::setIntersectingAxes(IfcTemplatedEntityList< IfcGridAxis >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(0,v->generalize()); }
+std::vector< double > /*[2:3]*/ IfcVirtualGridIntersection::OffsetDistances() const { return *entity->getArgument(1); }
+void IfcVirtualGridIntersection::setOffsetDistances(std::vector< double > /*[2:3]*/ v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(1,v); }
 bool IfcVirtualGridIntersection::is(Type::Enum v) const { return v == Type::IfcVirtualGridIntersection; }
 Type::Enum IfcVirtualGridIntersection::type() const { return Type::IfcVirtualGridIntersection; }
 Type::Enum IfcVirtualGridIntersection::Class() { return Type::IfcVirtualGridIntersection; }
-IfcVirtualGridIntersection::IfcVirtualGridIntersection(IfcAbstractEntityPtr e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcVirtualGridIntersection)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcVirtualGridIntersection::IfcVirtualGridIntersection(SHARED_PTR< IfcTemplatedEntityList< IfcGridAxis > > v1_IntersectingAxes, std::vector< IfcLengthMeasure > /*[2:3]*/ v2_OffsetDistances) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_IntersectingAxes)->generalize()); e->setArgument(1,(v2_OffsetDistances)); entity = e; EntityBuffer::Add(this); }
+IfcVirtualGridIntersection::IfcVirtualGridIntersection(IfcAbstractEntity* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (!e->is(Type::IfcVirtualGridIntersection)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcVirtualGridIntersection::IfcVirtualGridIntersection(IfcTemplatedEntityList< IfcGridAxis >::ptr v1_IntersectingAxes, std::vector< double > /*[2:3]*/ v2_OffsetDistances) : IfcUtil::IfcBaseEntity() { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_IntersectingAxes)->generalize()); e->setArgument(1,(v2_OffsetDistances)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcVoidingFeature
-bool IfcVoidingFeature::hasPredefinedType() { return !entity->getArgument(8)->isNull(); }
-IfcVoidingFeatureTypeEnum::IfcVoidingFeatureTypeEnum IfcVoidingFeature::PredefinedType() { return IfcVoidingFeatureTypeEnum::FromString(*entity->getArgument(8)); }
+bool IfcVoidingFeature::hasPredefinedType() const { return !entity->getArgument(8)->isNull(); }
+IfcVoidingFeatureTypeEnum::IfcVoidingFeatureTypeEnum IfcVoidingFeature::PredefinedType() const { return IfcVoidingFeatureTypeEnum::FromString(*entity->getArgument(8)); }
 void IfcVoidingFeature::setPredefinedType(IfcVoidingFeatureTypeEnum::IfcVoidingFeatureTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcVoidingFeatureTypeEnum::ToString(v)); }
 bool IfcVoidingFeature::is(Type::Enum v) const { return v == Type::IfcVoidingFeature || IfcFeatureElementSubtraction::is(v); }
 Type::Enum IfcVoidingFeature::type() const { return Type::IfcVoidingFeature; }
 Type::Enum IfcVoidingFeature::Class() { return Type::IfcVoidingFeature; }
-IfcVoidingFeature::IfcVoidingFeature(IfcAbstractEntityPtr e) : IfcFeatureElementSubtraction((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcVoidingFeature)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcVoidingFeature::IfcVoidingFeature(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcVoidingFeatureTypeEnum::IfcVoidingFeatureTypeEnum > v9_PredefinedType) : IfcFeatureElementSubtraction((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcVoidingFeatureTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcVoidingFeature::IfcVoidingFeature(IfcAbstractEntity* e) : IfcFeatureElementSubtraction((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcVoidingFeature)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcVoidingFeature::IfcVoidingFeature(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcVoidingFeatureTypeEnum::IfcVoidingFeatureTypeEnum > v9_PredefinedType) : IfcFeatureElementSubtraction((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcVoidingFeatureTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcWall
-bool IfcWall::hasPredefinedType() { return !entity->getArgument(8)->isNull(); }
-IfcWallTypeEnum::IfcWallTypeEnum IfcWall::PredefinedType() { return IfcWallTypeEnum::FromString(*entity->getArgument(8)); }
+bool IfcWall::hasPredefinedType() const { return !entity->getArgument(8)->isNull(); }
+IfcWallTypeEnum::IfcWallTypeEnum IfcWall::PredefinedType() const { return IfcWallTypeEnum::FromString(*entity->getArgument(8)); }
 void IfcWall::setPredefinedType(IfcWallTypeEnum::IfcWallTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcWallTypeEnum::ToString(v)); }
 bool IfcWall::is(Type::Enum v) const { return v == Type::IfcWall || IfcBuildingElement::is(v); }
 Type::Enum IfcWall::type() const { return Type::IfcWall; }
 Type::Enum IfcWall::Class() { return Type::IfcWall; }
-IfcWall::IfcWall(IfcAbstractEntityPtr e) : IfcBuildingElement((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcWall)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcWall::IfcWall(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcWallTypeEnum::IfcWallTypeEnum > v9_PredefinedType) : IfcBuildingElement((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcWallTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcWall::IfcWall(IfcAbstractEntity* e) : IfcBuildingElement((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcWall)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcWall::IfcWall(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcWallTypeEnum::IfcWallTypeEnum > v9_PredefinedType) : IfcBuildingElement((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcWallTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcWallElementedCase
 bool IfcWallElementedCase::is(Type::Enum v) const { return v == Type::IfcWallElementedCase || IfcWall::is(v); }
 Type::Enum IfcWallElementedCase::type() const { return Type::IfcWallElementedCase; }
 Type::Enum IfcWallElementedCase::Class() { return Type::IfcWallElementedCase; }
-IfcWallElementedCase::IfcWallElementedCase(IfcAbstractEntityPtr e) : IfcWall((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcWallElementedCase)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcWallElementedCase::IfcWallElementedCase(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcWallTypeEnum::IfcWallTypeEnum > v9_PredefinedType) : IfcWall((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcWallTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcWallElementedCase::IfcWallElementedCase(IfcAbstractEntity* e) : IfcWall((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcWallElementedCase)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcWallElementedCase::IfcWallElementedCase(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcWallTypeEnum::IfcWallTypeEnum > v9_PredefinedType) : IfcWall((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcWallTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcWallStandardCase
 bool IfcWallStandardCase::is(Type::Enum v) const { return v == Type::IfcWallStandardCase || IfcWall::is(v); }
 Type::Enum IfcWallStandardCase::type() const { return Type::IfcWallStandardCase; }
 Type::Enum IfcWallStandardCase::Class() { return Type::IfcWallStandardCase; }
-IfcWallStandardCase::IfcWallStandardCase(IfcAbstractEntityPtr e) : IfcWall((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcWallStandardCase)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcWallStandardCase::IfcWallStandardCase(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcWallTypeEnum::IfcWallTypeEnum > v9_PredefinedType) : IfcWall((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcWallTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcWallStandardCase::IfcWallStandardCase(IfcAbstractEntity* e) : IfcWall((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcWallStandardCase)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcWallStandardCase::IfcWallStandardCase(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcWallTypeEnum::IfcWallTypeEnum > v9_PredefinedType) : IfcWall((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcWallTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcWallType
-IfcWallTypeEnum::IfcWallTypeEnum IfcWallType::PredefinedType() { return IfcWallTypeEnum::FromString(*entity->getArgument(9)); }
+IfcWallTypeEnum::IfcWallTypeEnum IfcWallType::PredefinedType() const { return IfcWallTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcWallType::setPredefinedType(IfcWallTypeEnum::IfcWallTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcWallTypeEnum::ToString(v)); }
 bool IfcWallType::is(Type::Enum v) const { return v == Type::IfcWallType || IfcBuildingElementType::is(v); }
 Type::Enum IfcWallType::type() const { return Type::IfcWallType; }
 Type::Enum IfcWallType::Class() { return Type::IfcWallType; }
-IfcWallType::IfcWallType(IfcAbstractEntityPtr e) : IfcBuildingElementType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcWallType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcWallType::IfcWallType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcWallTypeEnum::IfcWallTypeEnum v10_PredefinedType) : IfcBuildingElementType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcWallTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcWallType::IfcWallType(IfcAbstractEntity* e) : IfcBuildingElementType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcWallType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcWallType::IfcWallType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcWallTypeEnum::IfcWallTypeEnum v10_PredefinedType) : IfcBuildingElementType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcWallTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcWasteTerminal
-bool IfcWasteTerminal::hasPredefinedType() { return !entity->getArgument(8)->isNull(); }
-IfcWasteTerminalTypeEnum::IfcWasteTerminalTypeEnum IfcWasteTerminal::PredefinedType() { return IfcWasteTerminalTypeEnum::FromString(*entity->getArgument(8)); }
+bool IfcWasteTerminal::hasPredefinedType() const { return !entity->getArgument(8)->isNull(); }
+IfcWasteTerminalTypeEnum::IfcWasteTerminalTypeEnum IfcWasteTerminal::PredefinedType() const { return IfcWasteTerminalTypeEnum::FromString(*entity->getArgument(8)); }
 void IfcWasteTerminal::setPredefinedType(IfcWasteTerminalTypeEnum::IfcWasteTerminalTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcWasteTerminalTypeEnum::ToString(v)); }
 bool IfcWasteTerminal::is(Type::Enum v) const { return v == Type::IfcWasteTerminal || IfcFlowTerminal::is(v); }
 Type::Enum IfcWasteTerminal::type() const { return Type::IfcWasteTerminal; }
 Type::Enum IfcWasteTerminal::Class() { return Type::IfcWasteTerminal; }
-IfcWasteTerminal::IfcWasteTerminal(IfcAbstractEntityPtr e) : IfcFlowTerminal((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcWasteTerminal)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcWasteTerminal::IfcWasteTerminal(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcWasteTerminalTypeEnum::IfcWasteTerminalTypeEnum > v9_PredefinedType) : IfcFlowTerminal((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcWasteTerminalTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcWasteTerminal::IfcWasteTerminal(IfcAbstractEntity* e) : IfcFlowTerminal((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcWasteTerminal)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcWasteTerminal::IfcWasteTerminal(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcWasteTerminalTypeEnum::IfcWasteTerminalTypeEnum > v9_PredefinedType) : IfcFlowTerminal((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcWasteTerminalTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcWasteTerminalType
-IfcWasteTerminalTypeEnum::IfcWasteTerminalTypeEnum IfcWasteTerminalType::PredefinedType() { return IfcWasteTerminalTypeEnum::FromString(*entity->getArgument(9)); }
+IfcWasteTerminalTypeEnum::IfcWasteTerminalTypeEnum IfcWasteTerminalType::PredefinedType() const { return IfcWasteTerminalTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcWasteTerminalType::setPredefinedType(IfcWasteTerminalTypeEnum::IfcWasteTerminalTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcWasteTerminalTypeEnum::ToString(v)); }
 bool IfcWasteTerminalType::is(Type::Enum v) const { return v == Type::IfcWasteTerminalType || IfcFlowTerminalType::is(v); }
 Type::Enum IfcWasteTerminalType::type() const { return Type::IfcWasteTerminalType; }
 Type::Enum IfcWasteTerminalType::Class() { return Type::IfcWasteTerminalType; }
-IfcWasteTerminalType::IfcWasteTerminalType(IfcAbstractEntityPtr e) : IfcFlowTerminalType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcWasteTerminalType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcWasteTerminalType::IfcWasteTerminalType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcWasteTerminalTypeEnum::IfcWasteTerminalTypeEnum v10_PredefinedType) : IfcFlowTerminalType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcWasteTerminalTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
+IfcWasteTerminalType::IfcWasteTerminalType(IfcAbstractEntity* e) : IfcFlowTerminalType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcWasteTerminalType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcWasteTerminalType::IfcWasteTerminalType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcWasteTerminalTypeEnum::IfcWasteTerminalTypeEnum v10_PredefinedType) : IfcFlowTerminalType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcWasteTerminalTypeEnum::ToString(v10_PredefinedType)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcWindow
-bool IfcWindow::hasOverallHeight() { return !entity->getArgument(8)->isNull(); }
-IfcPositiveLengthMeasure IfcWindow::OverallHeight() { return *entity->getArgument(8); }
-void IfcWindow::setOverallHeight(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
-bool IfcWindow::hasOverallWidth() { return !entity->getArgument(9)->isNull(); }
-IfcPositiveLengthMeasure IfcWindow::OverallWidth() { return *entity->getArgument(9); }
-void IfcWindow::setOverallWidth(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
-bool IfcWindow::hasPredefinedType() { return !entity->getArgument(10)->isNull(); }
-IfcWindowTypeEnum::IfcWindowTypeEnum IfcWindow::PredefinedType() { return IfcWindowTypeEnum::FromString(*entity->getArgument(10)); }
+bool IfcWindow::hasOverallHeight() const { return !entity->getArgument(8)->isNull(); }
+double IfcWindow::OverallHeight() const { return *entity->getArgument(8); }
+void IfcWindow::setOverallHeight(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
+bool IfcWindow::hasOverallWidth() const { return !entity->getArgument(9)->isNull(); }
+double IfcWindow::OverallWidth() const { return *entity->getArgument(9); }
+void IfcWindow::setOverallWidth(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
+bool IfcWindow::hasPredefinedType() const { return !entity->getArgument(10)->isNull(); }
+IfcWindowTypeEnum::IfcWindowTypeEnum IfcWindow::PredefinedType() const { return IfcWindowTypeEnum::FromString(*entity->getArgument(10)); }
 void IfcWindow::setPredefinedType(IfcWindowTypeEnum::IfcWindowTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v,IfcWindowTypeEnum::ToString(v)); }
-bool IfcWindow::hasPartitioningType() { return !entity->getArgument(11)->isNull(); }
-IfcWindowTypePartitioningEnum::IfcWindowTypePartitioningEnum IfcWindow::PartitioningType() { return IfcWindowTypePartitioningEnum::FromString(*entity->getArgument(11)); }
+bool IfcWindow::hasPartitioningType() const { return !entity->getArgument(11)->isNull(); }
+IfcWindowTypePartitioningEnum::IfcWindowTypePartitioningEnum IfcWindow::PartitioningType() const { return IfcWindowTypePartitioningEnum::FromString(*entity->getArgument(11)); }
 void IfcWindow::setPartitioningType(IfcWindowTypePartitioningEnum::IfcWindowTypePartitioningEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(11,v,IfcWindowTypePartitioningEnum::ToString(v)); }
-bool IfcWindow::hasUserDefinedPartitioningType() { return !entity->getArgument(12)->isNull(); }
-IfcLabel IfcWindow::UserDefinedPartitioningType() { return *entity->getArgument(12); }
-void IfcWindow::setUserDefinedPartitioningType(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(12,v); }
+bool IfcWindow::hasUserDefinedPartitioningType() const { return !entity->getArgument(12)->isNull(); }
+std::string IfcWindow::UserDefinedPartitioningType() const { return *entity->getArgument(12); }
+void IfcWindow::setUserDefinedPartitioningType(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(12,v); }
 bool IfcWindow::is(Type::Enum v) const { return v == Type::IfcWindow || IfcBuildingElement::is(v); }
 Type::Enum IfcWindow::type() const { return Type::IfcWindow; }
 Type::Enum IfcWindow::Class() { return Type::IfcWindow; }
-IfcWindow::IfcWindow(IfcAbstractEntityPtr e) : IfcBuildingElement((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcWindow)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcWindow::IfcWindow(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcPositiveLengthMeasure > v9_OverallHeight, boost::optional< IfcPositiveLengthMeasure > v10_OverallWidth, boost::optional< IfcWindowTypeEnum::IfcWindowTypeEnum > v11_PredefinedType, boost::optional< IfcWindowTypePartitioningEnum::IfcWindowTypePartitioningEnum > v12_PartitioningType, boost::optional< IfcLabel > v13_UserDefinedPartitioningType) : IfcBuildingElement((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_OverallHeight) { e->setArgument(8,(*v9_OverallHeight)); } else { e->setArgument(8); } if (v10_OverallWidth) { e->setArgument(9,(*v10_OverallWidth)); } else { e->setArgument(9); } if (v11_PredefinedType) { e->setArgument(10,*v11_PredefinedType,IfcWindowTypeEnum::ToString(*v11_PredefinedType)); } else { e->setArgument(10); } if (v12_PartitioningType) { e->setArgument(11,*v12_PartitioningType,IfcWindowTypePartitioningEnum::ToString(*v12_PartitioningType)); } else { e->setArgument(11); } if (v13_UserDefinedPartitioningType) { e->setArgument(12,(*v13_UserDefinedPartitioningType)); } else { e->setArgument(12); } entity = e; EntityBuffer::Add(this); }
+IfcWindow::IfcWindow(IfcAbstractEntity* e) : IfcBuildingElement((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcWindow)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcWindow::IfcWindow(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< double > v9_OverallHeight, boost::optional< double > v10_OverallWidth, boost::optional< IfcWindowTypeEnum::IfcWindowTypeEnum > v11_PredefinedType, boost::optional< IfcWindowTypePartitioningEnum::IfcWindowTypePartitioningEnum > v12_PartitioningType, boost::optional< std::string > v13_UserDefinedPartitioningType) : IfcBuildingElement((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_OverallHeight) { e->setArgument(8,(*v9_OverallHeight)); } else { e->setArgument(8); } if (v10_OverallWidth) { e->setArgument(9,(*v10_OverallWidth)); } else { e->setArgument(9); } if (v11_PredefinedType) { e->setArgument(10,*v11_PredefinedType,IfcWindowTypeEnum::ToString(*v11_PredefinedType)); } else { e->setArgument(10); } if (v12_PartitioningType) { e->setArgument(11,*v12_PartitioningType,IfcWindowTypePartitioningEnum::ToString(*v12_PartitioningType)); } else { e->setArgument(11); } if (v13_UserDefinedPartitioningType) { e->setArgument(12,(*v13_UserDefinedPartitioningType)); } else { e->setArgument(12); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcWindowLiningProperties
-bool IfcWindowLiningProperties::hasLiningDepth() { return !entity->getArgument(4)->isNull(); }
-IfcPositiveLengthMeasure IfcWindowLiningProperties::LiningDepth() { return *entity->getArgument(4); }
-void IfcWindowLiningProperties::setLiningDepth(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-bool IfcWindowLiningProperties::hasLiningThickness() { return !entity->getArgument(5)->isNull(); }
-IfcNonNegativeLengthMeasure IfcWindowLiningProperties::LiningThickness() { return *entity->getArgument(5); }
-void IfcWindowLiningProperties::setLiningThickness(IfcNonNegativeLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-bool IfcWindowLiningProperties::hasTransomThickness() { return !entity->getArgument(6)->isNull(); }
-IfcNonNegativeLengthMeasure IfcWindowLiningProperties::TransomThickness() { return *entity->getArgument(6); }
-void IfcWindowLiningProperties::setTransomThickness(IfcNonNegativeLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
-bool IfcWindowLiningProperties::hasMullionThickness() { return !entity->getArgument(7)->isNull(); }
-IfcNonNegativeLengthMeasure IfcWindowLiningProperties::MullionThickness() { return *entity->getArgument(7); }
-void IfcWindowLiningProperties::setMullionThickness(IfcNonNegativeLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
-bool IfcWindowLiningProperties::hasFirstTransomOffset() { return !entity->getArgument(8)->isNull(); }
-IfcNormalisedRatioMeasure IfcWindowLiningProperties::FirstTransomOffset() { return *entity->getArgument(8); }
-void IfcWindowLiningProperties::setFirstTransomOffset(IfcNormalisedRatioMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
-bool IfcWindowLiningProperties::hasSecondTransomOffset() { return !entity->getArgument(9)->isNull(); }
-IfcNormalisedRatioMeasure IfcWindowLiningProperties::SecondTransomOffset() { return *entity->getArgument(9); }
-void IfcWindowLiningProperties::setSecondTransomOffset(IfcNormalisedRatioMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
-bool IfcWindowLiningProperties::hasFirstMullionOffset() { return !entity->getArgument(10)->isNull(); }
-IfcNormalisedRatioMeasure IfcWindowLiningProperties::FirstMullionOffset() { return *entity->getArgument(10); }
-void IfcWindowLiningProperties::setFirstMullionOffset(IfcNormalisedRatioMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
-bool IfcWindowLiningProperties::hasSecondMullionOffset() { return !entity->getArgument(11)->isNull(); }
-IfcNormalisedRatioMeasure IfcWindowLiningProperties::SecondMullionOffset() { return *entity->getArgument(11); }
-void IfcWindowLiningProperties::setSecondMullionOffset(IfcNormalisedRatioMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(11,v); }
-bool IfcWindowLiningProperties::hasShapeAspectStyle() { return !entity->getArgument(12)->isNull(); }
-IfcShapeAspect* IfcWindowLiningProperties::ShapeAspectStyle() { return (IfcShapeAspect*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(12))); }
+bool IfcWindowLiningProperties::hasLiningDepth() const { return !entity->getArgument(4)->isNull(); }
+double IfcWindowLiningProperties::LiningDepth() const { return *entity->getArgument(4); }
+void IfcWindowLiningProperties::setLiningDepth(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+bool IfcWindowLiningProperties::hasLiningThickness() const { return !entity->getArgument(5)->isNull(); }
+double IfcWindowLiningProperties::LiningThickness() const { return *entity->getArgument(5); }
+void IfcWindowLiningProperties::setLiningThickness(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+bool IfcWindowLiningProperties::hasTransomThickness() const { return !entity->getArgument(6)->isNull(); }
+double IfcWindowLiningProperties::TransomThickness() const { return *entity->getArgument(6); }
+void IfcWindowLiningProperties::setTransomThickness(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
+bool IfcWindowLiningProperties::hasMullionThickness() const { return !entity->getArgument(7)->isNull(); }
+double IfcWindowLiningProperties::MullionThickness() const { return *entity->getArgument(7); }
+void IfcWindowLiningProperties::setMullionThickness(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
+bool IfcWindowLiningProperties::hasFirstTransomOffset() const { return !entity->getArgument(8)->isNull(); }
+double IfcWindowLiningProperties::FirstTransomOffset() const { return *entity->getArgument(8); }
+void IfcWindowLiningProperties::setFirstTransomOffset(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
+bool IfcWindowLiningProperties::hasSecondTransomOffset() const { return !entity->getArgument(9)->isNull(); }
+double IfcWindowLiningProperties::SecondTransomOffset() const { return *entity->getArgument(9); }
+void IfcWindowLiningProperties::setSecondTransomOffset(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
+bool IfcWindowLiningProperties::hasFirstMullionOffset() const { return !entity->getArgument(10)->isNull(); }
+double IfcWindowLiningProperties::FirstMullionOffset() const { return *entity->getArgument(10); }
+void IfcWindowLiningProperties::setFirstMullionOffset(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
+bool IfcWindowLiningProperties::hasSecondMullionOffset() const { return !entity->getArgument(11)->isNull(); }
+double IfcWindowLiningProperties::SecondMullionOffset() const { return *entity->getArgument(11); }
+void IfcWindowLiningProperties::setSecondMullionOffset(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(11,v); }
+bool IfcWindowLiningProperties::hasShapeAspectStyle() const { return !entity->getArgument(12)->isNull(); }
+IfcShapeAspect* IfcWindowLiningProperties::ShapeAspectStyle() const { return (IfcShapeAspect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(12))); }
 void IfcWindowLiningProperties::setShapeAspectStyle(IfcShapeAspect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(12,v); }
-bool IfcWindowLiningProperties::hasLiningOffset() { return !entity->getArgument(13)->isNull(); }
-IfcLengthMeasure IfcWindowLiningProperties::LiningOffset() { return *entity->getArgument(13); }
-void IfcWindowLiningProperties::setLiningOffset(IfcLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(13,v); }
-bool IfcWindowLiningProperties::hasLiningToPanelOffsetX() { return !entity->getArgument(14)->isNull(); }
-IfcLengthMeasure IfcWindowLiningProperties::LiningToPanelOffsetX() { return *entity->getArgument(14); }
-void IfcWindowLiningProperties::setLiningToPanelOffsetX(IfcLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(14,v); }
-bool IfcWindowLiningProperties::hasLiningToPanelOffsetY() { return !entity->getArgument(15)->isNull(); }
-IfcLengthMeasure IfcWindowLiningProperties::LiningToPanelOffsetY() { return *entity->getArgument(15); }
-void IfcWindowLiningProperties::setLiningToPanelOffsetY(IfcLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(15,v); }
+bool IfcWindowLiningProperties::hasLiningOffset() const { return !entity->getArgument(13)->isNull(); }
+double IfcWindowLiningProperties::LiningOffset() const { return *entity->getArgument(13); }
+void IfcWindowLiningProperties::setLiningOffset(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(13,v); }
+bool IfcWindowLiningProperties::hasLiningToPanelOffsetX() const { return !entity->getArgument(14)->isNull(); }
+double IfcWindowLiningProperties::LiningToPanelOffsetX() const { return *entity->getArgument(14); }
+void IfcWindowLiningProperties::setLiningToPanelOffsetX(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(14,v); }
+bool IfcWindowLiningProperties::hasLiningToPanelOffsetY() const { return !entity->getArgument(15)->isNull(); }
+double IfcWindowLiningProperties::LiningToPanelOffsetY() const { return *entity->getArgument(15); }
+void IfcWindowLiningProperties::setLiningToPanelOffsetY(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(15,v); }
 bool IfcWindowLiningProperties::is(Type::Enum v) const { return v == Type::IfcWindowLiningProperties || IfcPreDefinedPropertySet::is(v); }
 Type::Enum IfcWindowLiningProperties::type() const { return Type::IfcWindowLiningProperties; }
 Type::Enum IfcWindowLiningProperties::Class() { return Type::IfcWindowLiningProperties; }
-IfcWindowLiningProperties::IfcWindowLiningProperties(IfcAbstractEntityPtr e) : IfcPreDefinedPropertySet((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcWindowLiningProperties)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcWindowLiningProperties::IfcWindowLiningProperties(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcPositiveLengthMeasure > v5_LiningDepth, boost::optional< IfcNonNegativeLengthMeasure > v6_LiningThickness, boost::optional< IfcNonNegativeLengthMeasure > v7_TransomThickness, boost::optional< IfcNonNegativeLengthMeasure > v8_MullionThickness, boost::optional< IfcNormalisedRatioMeasure > v9_FirstTransomOffset, boost::optional< IfcNormalisedRatioMeasure > v10_SecondTransomOffset, boost::optional< IfcNormalisedRatioMeasure > v11_FirstMullionOffset, boost::optional< IfcNormalisedRatioMeasure > v12_SecondMullionOffset, IfcShapeAspect* v13_ShapeAspectStyle, boost::optional< IfcLengthMeasure > v14_LiningOffset, boost::optional< IfcLengthMeasure > v15_LiningToPanelOffsetX, boost::optional< IfcLengthMeasure > v16_LiningToPanelOffsetY) : IfcPreDefinedPropertySet((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_LiningDepth) { e->setArgument(4,(*v5_LiningDepth)); } else { e->setArgument(4); } if (v6_LiningThickness) { e->setArgument(5,(*v6_LiningThickness)); } else { e->setArgument(5); } if (v7_TransomThickness) { e->setArgument(6,(*v7_TransomThickness)); } else { e->setArgument(6); } if (v8_MullionThickness) { e->setArgument(7,(*v8_MullionThickness)); } else { e->setArgument(7); } if (v9_FirstTransomOffset) { e->setArgument(8,(*v9_FirstTransomOffset)); } else { e->setArgument(8); } if (v10_SecondTransomOffset) { e->setArgument(9,(*v10_SecondTransomOffset)); } else { e->setArgument(9); } if (v11_FirstMullionOffset) { e->setArgument(10,(*v11_FirstMullionOffset)); } else { e->setArgument(10); } if (v12_SecondMullionOffset) { e->setArgument(11,(*v12_SecondMullionOffset)); } else { e->setArgument(11); } e->setArgument(12,(v13_ShapeAspectStyle)); if (v14_LiningOffset) { e->setArgument(13,(*v14_LiningOffset)); } else { e->setArgument(13); } if (v15_LiningToPanelOffsetX) { e->setArgument(14,(*v15_LiningToPanelOffsetX)); } else { e->setArgument(14); } if (v16_LiningToPanelOffsetY) { e->setArgument(15,(*v16_LiningToPanelOffsetY)); } else { e->setArgument(15); } entity = e; EntityBuffer::Add(this); }
+IfcWindowLiningProperties::IfcWindowLiningProperties(IfcAbstractEntity* e) : IfcPreDefinedPropertySet((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcWindowLiningProperties)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcWindowLiningProperties::IfcWindowLiningProperties(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< double > v5_LiningDepth, boost::optional< double > v6_LiningThickness, boost::optional< double > v7_TransomThickness, boost::optional< double > v8_MullionThickness, boost::optional< double > v9_FirstTransomOffset, boost::optional< double > v10_SecondTransomOffset, boost::optional< double > v11_FirstMullionOffset, boost::optional< double > v12_SecondMullionOffset, IfcShapeAspect* v13_ShapeAspectStyle, boost::optional< double > v14_LiningOffset, boost::optional< double > v15_LiningToPanelOffsetX, boost::optional< double > v16_LiningToPanelOffsetY) : IfcPreDefinedPropertySet((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_LiningDepth) { e->setArgument(4,(*v5_LiningDepth)); } else { e->setArgument(4); } if (v6_LiningThickness) { e->setArgument(5,(*v6_LiningThickness)); } else { e->setArgument(5); } if (v7_TransomThickness) { e->setArgument(6,(*v7_TransomThickness)); } else { e->setArgument(6); } if (v8_MullionThickness) { e->setArgument(7,(*v8_MullionThickness)); } else { e->setArgument(7); } if (v9_FirstTransomOffset) { e->setArgument(8,(*v9_FirstTransomOffset)); } else { e->setArgument(8); } if (v10_SecondTransomOffset) { e->setArgument(9,(*v10_SecondTransomOffset)); } else { e->setArgument(9); } if (v11_FirstMullionOffset) { e->setArgument(10,(*v11_FirstMullionOffset)); } else { e->setArgument(10); } if (v12_SecondMullionOffset) { e->setArgument(11,(*v12_SecondMullionOffset)); } else { e->setArgument(11); } e->setArgument(12,(v13_ShapeAspectStyle)); if (v14_LiningOffset) { e->setArgument(13,(*v14_LiningOffset)); } else { e->setArgument(13); } if (v15_LiningToPanelOffsetX) { e->setArgument(14,(*v15_LiningToPanelOffsetX)); } else { e->setArgument(14); } if (v16_LiningToPanelOffsetY) { e->setArgument(15,(*v16_LiningToPanelOffsetY)); } else { e->setArgument(15); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcWindowPanelProperties
-IfcWindowPanelOperationEnum::IfcWindowPanelOperationEnum IfcWindowPanelProperties::OperationType() { return IfcWindowPanelOperationEnum::FromString(*entity->getArgument(4)); }
+IfcWindowPanelOperationEnum::IfcWindowPanelOperationEnum IfcWindowPanelProperties::OperationType() const { return IfcWindowPanelOperationEnum::FromString(*entity->getArgument(4)); }
 void IfcWindowPanelProperties::setOperationType(IfcWindowPanelOperationEnum::IfcWindowPanelOperationEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v,IfcWindowPanelOperationEnum::ToString(v)); }
-IfcWindowPanelPositionEnum::IfcWindowPanelPositionEnum IfcWindowPanelProperties::PanelPosition() { return IfcWindowPanelPositionEnum::FromString(*entity->getArgument(5)); }
+IfcWindowPanelPositionEnum::IfcWindowPanelPositionEnum IfcWindowPanelProperties::PanelPosition() const { return IfcWindowPanelPositionEnum::FromString(*entity->getArgument(5)); }
 void IfcWindowPanelProperties::setPanelPosition(IfcWindowPanelPositionEnum::IfcWindowPanelPositionEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v,IfcWindowPanelPositionEnum::ToString(v)); }
-bool IfcWindowPanelProperties::hasFrameDepth() { return !entity->getArgument(6)->isNull(); }
-IfcPositiveLengthMeasure IfcWindowPanelProperties::FrameDepth() { return *entity->getArgument(6); }
-void IfcWindowPanelProperties::setFrameDepth(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
-bool IfcWindowPanelProperties::hasFrameThickness() { return !entity->getArgument(7)->isNull(); }
-IfcPositiveLengthMeasure IfcWindowPanelProperties::FrameThickness() { return *entity->getArgument(7); }
-void IfcWindowPanelProperties::setFrameThickness(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
-bool IfcWindowPanelProperties::hasShapeAspectStyle() { return !entity->getArgument(8)->isNull(); }
-IfcShapeAspect* IfcWindowPanelProperties::ShapeAspectStyle() { return (IfcShapeAspect*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(8))); }
+bool IfcWindowPanelProperties::hasFrameDepth() const { return !entity->getArgument(6)->isNull(); }
+double IfcWindowPanelProperties::FrameDepth() const { return *entity->getArgument(6); }
+void IfcWindowPanelProperties::setFrameDepth(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
+bool IfcWindowPanelProperties::hasFrameThickness() const { return !entity->getArgument(7)->isNull(); }
+double IfcWindowPanelProperties::FrameThickness() const { return *entity->getArgument(7); }
+void IfcWindowPanelProperties::setFrameThickness(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
+bool IfcWindowPanelProperties::hasShapeAspectStyle() const { return !entity->getArgument(8)->isNull(); }
+IfcShapeAspect* IfcWindowPanelProperties::ShapeAspectStyle() const { return (IfcShapeAspect*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(8))); }
 void IfcWindowPanelProperties::setShapeAspectStyle(IfcShapeAspect* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
 bool IfcWindowPanelProperties::is(Type::Enum v) const { return v == Type::IfcWindowPanelProperties || IfcPreDefinedPropertySet::is(v); }
 Type::Enum IfcWindowPanelProperties::type() const { return Type::IfcWindowPanelProperties; }
 Type::Enum IfcWindowPanelProperties::Class() { return Type::IfcWindowPanelProperties; }
-IfcWindowPanelProperties::IfcWindowPanelProperties(IfcAbstractEntityPtr e) : IfcPreDefinedPropertySet((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcWindowPanelProperties)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcWindowPanelProperties::IfcWindowPanelProperties(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, IfcWindowPanelOperationEnum::IfcWindowPanelOperationEnum v5_OperationType, IfcWindowPanelPositionEnum::IfcWindowPanelPositionEnum v6_PanelPosition, boost::optional< IfcPositiveLengthMeasure > v7_FrameDepth, boost::optional< IfcPositiveLengthMeasure > v8_FrameThickness, IfcShapeAspect* v9_ShapeAspectStyle) : IfcPreDefinedPropertySet((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,v5_OperationType,IfcWindowPanelOperationEnum::ToString(v5_OperationType)); e->setArgument(5,v6_PanelPosition,IfcWindowPanelPositionEnum::ToString(v6_PanelPosition)); if (v7_FrameDepth) { e->setArgument(6,(*v7_FrameDepth)); } else { e->setArgument(6); } if (v8_FrameThickness) { e->setArgument(7,(*v8_FrameThickness)); } else { e->setArgument(7); } e->setArgument(8,(v9_ShapeAspectStyle)); entity = e; EntityBuffer::Add(this); }
+IfcWindowPanelProperties::IfcWindowPanelProperties(IfcAbstractEntity* e) : IfcPreDefinedPropertySet((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcWindowPanelProperties)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcWindowPanelProperties::IfcWindowPanelProperties(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcWindowPanelOperationEnum::IfcWindowPanelOperationEnum v5_OperationType, IfcWindowPanelPositionEnum::IfcWindowPanelPositionEnum v6_PanelPosition, boost::optional< double > v7_FrameDepth, boost::optional< double > v8_FrameThickness, IfcShapeAspect* v9_ShapeAspectStyle) : IfcPreDefinedPropertySet((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } e->setArgument(4,v5_OperationType,IfcWindowPanelOperationEnum::ToString(v5_OperationType)); e->setArgument(5,v6_PanelPosition,IfcWindowPanelPositionEnum::ToString(v6_PanelPosition)); if (v7_FrameDepth) { e->setArgument(6,(*v7_FrameDepth)); } else { e->setArgument(6); } if (v8_FrameThickness) { e->setArgument(7,(*v8_FrameThickness)); } else { e->setArgument(7); } e->setArgument(8,(v9_ShapeAspectStyle)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcWindowStandardCase
 bool IfcWindowStandardCase::is(Type::Enum v) const { return v == Type::IfcWindowStandardCase || IfcWindow::is(v); }
 Type::Enum IfcWindowStandardCase::type() const { return Type::IfcWindowStandardCase; }
 Type::Enum IfcWindowStandardCase::Class() { return Type::IfcWindowStandardCase; }
-IfcWindowStandardCase::IfcWindowStandardCase(IfcAbstractEntityPtr e) : IfcWindow((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcWindowStandardCase)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcWindowStandardCase::IfcWindowStandardCase(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcPositiveLengthMeasure > v9_OverallHeight, boost::optional< IfcPositiveLengthMeasure > v10_OverallWidth, boost::optional< IfcWindowTypeEnum::IfcWindowTypeEnum > v11_PredefinedType, boost::optional< IfcWindowTypePartitioningEnum::IfcWindowTypePartitioningEnum > v12_PartitioningType, boost::optional< IfcLabel > v13_UserDefinedPartitioningType) : IfcWindow((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_OverallHeight) { e->setArgument(8,(*v9_OverallHeight)); } else { e->setArgument(8); } if (v10_OverallWidth) { e->setArgument(9,(*v10_OverallWidth)); } else { e->setArgument(9); } if (v11_PredefinedType) { e->setArgument(10,*v11_PredefinedType,IfcWindowTypeEnum::ToString(*v11_PredefinedType)); } else { e->setArgument(10); } if (v12_PartitioningType) { e->setArgument(11,*v12_PartitioningType,IfcWindowTypePartitioningEnum::ToString(*v12_PartitioningType)); } else { e->setArgument(11); } if (v13_UserDefinedPartitioningType) { e->setArgument(12,(*v13_UserDefinedPartitioningType)); } else { e->setArgument(12); } entity = e; EntityBuffer::Add(this); }
+IfcWindowStandardCase::IfcWindowStandardCase(IfcAbstractEntity* e) : IfcWindow((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcWindowStandardCase)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcWindowStandardCase::IfcWindowStandardCase(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< double > v9_OverallHeight, boost::optional< double > v10_OverallWidth, boost::optional< IfcWindowTypeEnum::IfcWindowTypeEnum > v11_PredefinedType, boost::optional< IfcWindowTypePartitioningEnum::IfcWindowTypePartitioningEnum > v12_PartitioningType, boost::optional< std::string > v13_UserDefinedPartitioningType) : IfcWindow((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } e->setArgument(5,(v6_ObjectPlacement)); e->setArgument(6,(v7_Representation)); if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_OverallHeight) { e->setArgument(8,(*v9_OverallHeight)); } else { e->setArgument(8); } if (v10_OverallWidth) { e->setArgument(9,(*v10_OverallWidth)); } else { e->setArgument(9); } if (v11_PredefinedType) { e->setArgument(10,*v11_PredefinedType,IfcWindowTypeEnum::ToString(*v11_PredefinedType)); } else { e->setArgument(10); } if (v12_PartitioningType) { e->setArgument(11,*v12_PartitioningType,IfcWindowTypePartitioningEnum::ToString(*v12_PartitioningType)); } else { e->setArgument(11); } if (v13_UserDefinedPartitioningType) { e->setArgument(12,(*v13_UserDefinedPartitioningType)); } else { e->setArgument(12); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcWindowStyle
-IfcWindowStyleConstructionEnum::IfcWindowStyleConstructionEnum IfcWindowStyle::ConstructionType() { return IfcWindowStyleConstructionEnum::FromString(*entity->getArgument(8)); }
+IfcWindowStyleConstructionEnum::IfcWindowStyleConstructionEnum IfcWindowStyle::ConstructionType() const { return IfcWindowStyleConstructionEnum::FromString(*entity->getArgument(8)); }
 void IfcWindowStyle::setConstructionType(IfcWindowStyleConstructionEnum::IfcWindowStyleConstructionEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcWindowStyleConstructionEnum::ToString(v)); }
-IfcWindowStyleOperationEnum::IfcWindowStyleOperationEnum IfcWindowStyle::OperationType() { return IfcWindowStyleOperationEnum::FromString(*entity->getArgument(9)); }
+IfcWindowStyleOperationEnum::IfcWindowStyleOperationEnum IfcWindowStyle::OperationType() const { return IfcWindowStyleOperationEnum::FromString(*entity->getArgument(9)); }
 void IfcWindowStyle::setOperationType(IfcWindowStyleOperationEnum::IfcWindowStyleOperationEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcWindowStyleOperationEnum::ToString(v)); }
-bool IfcWindowStyle::ParameterTakesPrecedence() { return *entity->getArgument(10); }
+bool IfcWindowStyle::ParameterTakesPrecedence() const { return *entity->getArgument(10); }
 void IfcWindowStyle::setParameterTakesPrecedence(bool v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
-bool IfcWindowStyle::Sizeable() { return *entity->getArgument(11); }
+bool IfcWindowStyle::Sizeable() const { return *entity->getArgument(11); }
 void IfcWindowStyle::setSizeable(bool v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(11,v); }
 bool IfcWindowStyle::is(Type::Enum v) const { return v == Type::IfcWindowStyle || IfcTypeProduct::is(v); }
 Type::Enum IfcWindowStyle::type() const { return Type::IfcWindowStyle; }
 Type::Enum IfcWindowStyle::Class() { return Type::IfcWindowStyle; }
-IfcWindowStyle::IfcWindowStyle(IfcAbstractEntityPtr e) : IfcTypeProduct((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcWindowStyle)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcWindowStyle::IfcWindowStyle(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, IfcWindowStyleConstructionEnum::IfcWindowStyleConstructionEnum v9_ConstructionType, IfcWindowStyleOperationEnum::IfcWindowStyleOperationEnum v10_OperationType, bool v11_ParameterTakesPrecedence, bool v12_Sizeable) : IfcTypeProduct((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } e->setArgument(8,v9_ConstructionType,IfcWindowStyleConstructionEnum::ToString(v9_ConstructionType)); e->setArgument(9,v10_OperationType,IfcWindowStyleOperationEnum::ToString(v10_OperationType)); e->setArgument(10,(v11_ParameterTakesPrecedence)); e->setArgument(11,(v12_Sizeable)); entity = e; EntityBuffer::Add(this); }
+IfcWindowStyle::IfcWindowStyle(IfcAbstractEntity* e) : IfcTypeProduct((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcWindowStyle)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcWindowStyle::IfcWindowStyle(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, IfcWindowStyleConstructionEnum::IfcWindowStyleConstructionEnum v9_ConstructionType, IfcWindowStyleOperationEnum::IfcWindowStyleOperationEnum v10_OperationType, bool v11_ParameterTakesPrecedence, bool v12_Sizeable) : IfcTypeProduct((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } e->setArgument(8,v9_ConstructionType,IfcWindowStyleConstructionEnum::ToString(v9_ConstructionType)); e->setArgument(9,v10_OperationType,IfcWindowStyleOperationEnum::ToString(v10_OperationType)); e->setArgument(10,(v11_ParameterTakesPrecedence)); e->setArgument(11,(v12_Sizeable)); entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcWindowType
-IfcWindowTypeEnum::IfcWindowTypeEnum IfcWindowType::PredefinedType() { return IfcWindowTypeEnum::FromString(*entity->getArgument(9)); }
+IfcWindowTypeEnum::IfcWindowTypeEnum IfcWindowType::PredefinedType() const { return IfcWindowTypeEnum::FromString(*entity->getArgument(9)); }
 void IfcWindowType::setPredefinedType(IfcWindowTypeEnum::IfcWindowTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v,IfcWindowTypeEnum::ToString(v)); }
-IfcWindowTypePartitioningEnum::IfcWindowTypePartitioningEnum IfcWindowType::PartitioningType() { return IfcWindowTypePartitioningEnum::FromString(*entity->getArgument(10)); }
+IfcWindowTypePartitioningEnum::IfcWindowTypePartitioningEnum IfcWindowType::PartitioningType() const { return IfcWindowTypePartitioningEnum::FromString(*entity->getArgument(10)); }
 void IfcWindowType::setPartitioningType(IfcWindowTypePartitioningEnum::IfcWindowTypePartitioningEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v,IfcWindowTypePartitioningEnum::ToString(v)); }
-bool IfcWindowType::hasParameterTakesPrecedence() { return !entity->getArgument(11)->isNull(); }
-bool IfcWindowType::ParameterTakesPrecedence() { return *entity->getArgument(11); }
+bool IfcWindowType::hasParameterTakesPrecedence() const { return !entity->getArgument(11)->isNull(); }
+bool IfcWindowType::ParameterTakesPrecedence() const { return *entity->getArgument(11); }
 void IfcWindowType::setParameterTakesPrecedence(bool v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(11,v); }
-bool IfcWindowType::hasUserDefinedPartitioningType() { return !entity->getArgument(12)->isNull(); }
-IfcLabel IfcWindowType::UserDefinedPartitioningType() { return *entity->getArgument(12); }
-void IfcWindowType::setUserDefinedPartitioningType(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(12,v); }
+bool IfcWindowType::hasUserDefinedPartitioningType() const { return !entity->getArgument(12)->isNull(); }
+std::string IfcWindowType::UserDefinedPartitioningType() const { return *entity->getArgument(12); }
+void IfcWindowType::setUserDefinedPartitioningType(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(12,v); }
 bool IfcWindowType::is(Type::Enum v) const { return v == Type::IfcWindowType || IfcBuildingElementType::is(v); }
 Type::Enum IfcWindowType::type() const { return Type::IfcWindowType; }
 Type::Enum IfcWindowType::Class() { return Type::IfcWindowType; }
-IfcWindowType::IfcWindowType(IfcAbstractEntityPtr e) : IfcBuildingElementType((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcWindowType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcWindowType::IfcWindowType(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcWindowTypeEnum::IfcWindowTypeEnum v10_PredefinedType, IfcWindowTypePartitioningEnum::IfcWindowTypePartitioningEnum v11_PartitioningType, boost::optional< bool > v12_ParameterTakesPrecedence, boost::optional< IfcLabel > v13_UserDefinedPartitioningType) : IfcBuildingElementType((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcWindowTypeEnum::ToString(v10_PredefinedType)); e->setArgument(10,v11_PartitioningType,IfcWindowTypePartitioningEnum::ToString(v11_PartitioningType)); if (v12_ParameterTakesPrecedence) { e->setArgument(11,(*v12_ParameterTakesPrecedence)); } else { e->setArgument(11); } if (v13_UserDefinedPartitioningType) { e->setArgument(12,(*v13_UserDefinedPartitioningType)); } else { e->setArgument(12); } entity = e; EntityBuffer::Add(this); }
+IfcWindowType::IfcWindowType(IfcAbstractEntity* e) : IfcBuildingElementType((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcWindowType)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcWindowType::IfcWindowType(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcWindowTypeEnum::IfcWindowTypeEnum v10_PredefinedType, IfcWindowTypePartitioningEnum::IfcWindowTypePartitioningEnum v11_PartitioningType, boost::optional< bool > v12_ParameterTakesPrecedence, boost::optional< std::string > v13_UserDefinedPartitioningType) : IfcBuildingElementType((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ApplicableOccurrence) { e->setArgument(4,(*v5_ApplicableOccurrence)); } else { e->setArgument(4); } if (v6_HasPropertySets) { e->setArgument(5,(*v6_HasPropertySets)->generalize()); } else { e->setArgument(5); } if (v7_RepresentationMaps) { e->setArgument(6,(*v7_RepresentationMaps)->generalize()); } else { e->setArgument(6); } if (v8_Tag) { e->setArgument(7,(*v8_Tag)); } else { e->setArgument(7); } if (v9_ElementType) { e->setArgument(8,(*v9_ElementType)); } else { e->setArgument(8); } e->setArgument(9,v10_PredefinedType,IfcWindowTypeEnum::ToString(v10_PredefinedType)); e->setArgument(10,v11_PartitioningType,IfcWindowTypePartitioningEnum::ToString(v11_PartitioningType)); if (v12_ParameterTakesPrecedence) { e->setArgument(11,(*v12_ParameterTakesPrecedence)); } else { e->setArgument(11); } if (v13_UserDefinedPartitioningType) { e->setArgument(12,(*v13_UserDefinedPartitioningType)); } else { e->setArgument(12); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcWorkCalendar
-bool IfcWorkCalendar::hasWorkingTimes() { return !entity->getArgument(6)->isNull(); }
-SHARED_PTR< IfcTemplatedEntityList< IfcWorkTime > > IfcWorkCalendar::WorkingTimes() { RETURN_AS_LIST(IfcWorkTime,6) }
-void IfcWorkCalendar::setWorkingTimes(SHARED_PTR< IfcTemplatedEntityList< IfcWorkTime > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v->generalize()); }
-bool IfcWorkCalendar::hasExceptionTimes() { return !entity->getArgument(7)->isNull(); }
-SHARED_PTR< IfcTemplatedEntityList< IfcWorkTime > > IfcWorkCalendar::ExceptionTimes() { RETURN_AS_LIST(IfcWorkTime,7) }
-void IfcWorkCalendar::setExceptionTimes(SHARED_PTR< IfcTemplatedEntityList< IfcWorkTime > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v->generalize()); }
-bool IfcWorkCalendar::hasPredefinedType() { return !entity->getArgument(8)->isNull(); }
-IfcWorkCalendarTypeEnum::IfcWorkCalendarTypeEnum IfcWorkCalendar::PredefinedType() { return IfcWorkCalendarTypeEnum::FromString(*entity->getArgument(8)); }
+bool IfcWorkCalendar::hasWorkingTimes() const { return !entity->getArgument(6)->isNull(); }
+IfcTemplatedEntityList< IfcWorkTime >::ptr IfcWorkCalendar::WorkingTimes() const { IfcEntityList::ptr es = *entity->getArgument(6); return es->as<IfcWorkTime>(); }
+void IfcWorkCalendar::setWorkingTimes(IfcTemplatedEntityList< IfcWorkTime >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v->generalize()); }
+bool IfcWorkCalendar::hasExceptionTimes() const { return !entity->getArgument(7)->isNull(); }
+IfcTemplatedEntityList< IfcWorkTime >::ptr IfcWorkCalendar::ExceptionTimes() const { IfcEntityList::ptr es = *entity->getArgument(7); return es->as<IfcWorkTime>(); }
+void IfcWorkCalendar::setExceptionTimes(IfcTemplatedEntityList< IfcWorkTime >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v->generalize()); }
+bool IfcWorkCalendar::hasPredefinedType() const { return !entity->getArgument(8)->isNull(); }
+IfcWorkCalendarTypeEnum::IfcWorkCalendarTypeEnum IfcWorkCalendar::PredefinedType() const { return IfcWorkCalendarTypeEnum::FromString(*entity->getArgument(8)); }
 void IfcWorkCalendar::setPredefinedType(IfcWorkCalendarTypeEnum::IfcWorkCalendarTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v,IfcWorkCalendarTypeEnum::ToString(v)); }
 bool IfcWorkCalendar::is(Type::Enum v) const { return v == Type::IfcWorkCalendar || IfcControl::is(v); }
 Type::Enum IfcWorkCalendar::type() const { return Type::IfcWorkCalendar; }
 Type::Enum IfcWorkCalendar::Class() { return Type::IfcWorkCalendar; }
-IfcWorkCalendar::IfcWorkCalendar(IfcAbstractEntityPtr e) : IfcControl((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcWorkCalendar)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcWorkCalendar::IfcWorkCalendar(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, boost::optional< IfcIdentifier > v6_Identification, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcWorkTime > > > v7_WorkingTimes, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcWorkTime > > > v8_ExceptionTimes, boost::optional< IfcWorkCalendarTypeEnum::IfcWorkCalendarTypeEnum > v9_PredefinedType) : IfcControl((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } if (v6_Identification) { e->setArgument(5,(*v6_Identification)); } else { e->setArgument(5); } if (v7_WorkingTimes) { e->setArgument(6,(*v7_WorkingTimes)->generalize()); } else { e->setArgument(6); } if (v8_ExceptionTimes) { e->setArgument(7,(*v8_ExceptionTimes)->generalize()); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcWorkCalendarTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcWorkCalendar::IfcWorkCalendar(IfcAbstractEntity* e) : IfcControl((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcWorkCalendar)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcWorkCalendar::IfcWorkCalendar(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, boost::optional< std::string > v6_Identification, boost::optional< IfcTemplatedEntityList< IfcWorkTime >::ptr > v7_WorkingTimes, boost::optional< IfcTemplatedEntityList< IfcWorkTime >::ptr > v8_ExceptionTimes, boost::optional< IfcWorkCalendarTypeEnum::IfcWorkCalendarTypeEnum > v9_PredefinedType) : IfcControl((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } if (v6_Identification) { e->setArgument(5,(*v6_Identification)); } else { e->setArgument(5); } if (v7_WorkingTimes) { e->setArgument(6,(*v7_WorkingTimes)->generalize()); } else { e->setArgument(6); } if (v8_ExceptionTimes) { e->setArgument(7,(*v8_ExceptionTimes)->generalize()); } else { e->setArgument(7); } if (v9_PredefinedType) { e->setArgument(8,*v9_PredefinedType,IfcWorkCalendarTypeEnum::ToString(*v9_PredefinedType)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcWorkControl
-IfcDateTime IfcWorkControl::CreationDate() { return *entity->getArgument(6); }
-void IfcWorkControl::setCreationDate(IfcDateTime v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
-bool IfcWorkControl::hasCreators() { return !entity->getArgument(7)->isNull(); }
-SHARED_PTR< IfcTemplatedEntityList< IfcPerson > > IfcWorkControl::Creators() { RETURN_AS_LIST(IfcPerson,7) }
-void IfcWorkControl::setCreators(SHARED_PTR< IfcTemplatedEntityList< IfcPerson > > v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v->generalize()); }
-bool IfcWorkControl::hasPurpose() { return !entity->getArgument(8)->isNull(); }
-IfcLabel IfcWorkControl::Purpose() { return *entity->getArgument(8); }
-void IfcWorkControl::setPurpose(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
-bool IfcWorkControl::hasDuration() { return !entity->getArgument(9)->isNull(); }
-IfcDuration IfcWorkControl::Duration() { return *entity->getArgument(9); }
-void IfcWorkControl::setDuration(IfcDuration v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
-bool IfcWorkControl::hasTotalFloat() { return !entity->getArgument(10)->isNull(); }
-IfcDuration IfcWorkControl::TotalFloat() { return *entity->getArgument(10); }
-void IfcWorkControl::setTotalFloat(IfcDuration v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
-IfcDateTime IfcWorkControl::StartTime() { return *entity->getArgument(11); }
-void IfcWorkControl::setStartTime(IfcDateTime v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(11,v); }
-bool IfcWorkControl::hasFinishTime() { return !entity->getArgument(12)->isNull(); }
-IfcDateTime IfcWorkControl::FinishTime() { return *entity->getArgument(12); }
-void IfcWorkControl::setFinishTime(IfcDateTime v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(12,v); }
+std::string IfcWorkControl::CreationDate() const { return *entity->getArgument(6); }
+void IfcWorkControl::setCreationDate(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
+bool IfcWorkControl::hasCreators() const { return !entity->getArgument(7)->isNull(); }
+IfcTemplatedEntityList< IfcPerson >::ptr IfcWorkControl::Creators() const { IfcEntityList::ptr es = *entity->getArgument(7); return es->as<IfcPerson>(); }
+void IfcWorkControl::setCreators(IfcTemplatedEntityList< IfcPerson >::ptr v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v->generalize()); }
+bool IfcWorkControl::hasPurpose() const { return !entity->getArgument(8)->isNull(); }
+std::string IfcWorkControl::Purpose() const { return *entity->getArgument(8); }
+void IfcWorkControl::setPurpose(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
+bool IfcWorkControl::hasDuration() const { return !entity->getArgument(9)->isNull(); }
+std::string IfcWorkControl::Duration() const { return *entity->getArgument(9); }
+void IfcWorkControl::setDuration(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(9,v); }
+bool IfcWorkControl::hasTotalFloat() const { return !entity->getArgument(10)->isNull(); }
+std::string IfcWorkControl::TotalFloat() const { return *entity->getArgument(10); }
+void IfcWorkControl::setTotalFloat(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(10,v); }
+std::string IfcWorkControl::StartTime() const { return *entity->getArgument(11); }
+void IfcWorkControl::setStartTime(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(11,v); }
+bool IfcWorkControl::hasFinishTime() const { return !entity->getArgument(12)->isNull(); }
+std::string IfcWorkControl::FinishTime() const { return *entity->getArgument(12); }
+void IfcWorkControl::setFinishTime(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(12,v); }
 bool IfcWorkControl::is(Type::Enum v) const { return v == Type::IfcWorkControl || IfcControl::is(v); }
 Type::Enum IfcWorkControl::type() const { return Type::IfcWorkControl; }
 Type::Enum IfcWorkControl::Class() { return Type::IfcWorkControl; }
-IfcWorkControl::IfcWorkControl(IfcAbstractEntityPtr e) : IfcControl((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcWorkControl)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcWorkControl::IfcWorkControl(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, boost::optional< IfcIdentifier > v6_Identification, IfcDateTime v7_CreationDate, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPerson > > > v8_Creators, boost::optional< IfcLabel > v9_Purpose, boost::optional< IfcDuration > v10_Duration, boost::optional< IfcDuration > v11_TotalFloat, IfcDateTime v12_StartTime, boost::optional< IfcDateTime > v13_FinishTime) : IfcControl((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } if (v6_Identification) { e->setArgument(5,(*v6_Identification)); } else { e->setArgument(5); } e->setArgument(6,(v7_CreationDate)); if (v8_Creators) { e->setArgument(7,(*v8_Creators)->generalize()); } else { e->setArgument(7); } if (v9_Purpose) { e->setArgument(8,(*v9_Purpose)); } else { e->setArgument(8); } if (v10_Duration) { e->setArgument(9,(*v10_Duration)); } else { e->setArgument(9); } if (v11_TotalFloat) { e->setArgument(10,(*v11_TotalFloat)); } else { e->setArgument(10); } e->setArgument(11,(v12_StartTime)); if (v13_FinishTime) { e->setArgument(12,(*v13_FinishTime)); } else { e->setArgument(12); } entity = e; EntityBuffer::Add(this); }
+IfcWorkControl::IfcWorkControl(IfcAbstractEntity* e) : IfcControl((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcWorkControl)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcWorkControl::IfcWorkControl(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, boost::optional< std::string > v6_Identification, std::string v7_CreationDate, boost::optional< IfcTemplatedEntityList< IfcPerson >::ptr > v8_Creators, boost::optional< std::string > v9_Purpose, boost::optional< std::string > v10_Duration, boost::optional< std::string > v11_TotalFloat, std::string v12_StartTime, boost::optional< std::string > v13_FinishTime) : IfcControl((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } if (v6_Identification) { e->setArgument(5,(*v6_Identification)); } else { e->setArgument(5); } e->setArgument(6,(v7_CreationDate)); if (v8_Creators) { e->setArgument(7,(*v8_Creators)->generalize()); } else { e->setArgument(7); } if (v9_Purpose) { e->setArgument(8,(*v9_Purpose)); } else { e->setArgument(8); } if (v10_Duration) { e->setArgument(9,(*v10_Duration)); } else { e->setArgument(9); } if (v11_TotalFloat) { e->setArgument(10,(*v11_TotalFloat)); } else { e->setArgument(10); } e->setArgument(11,(v12_StartTime)); if (v13_FinishTime) { e->setArgument(12,(*v13_FinishTime)); } else { e->setArgument(12); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcWorkPlan
-bool IfcWorkPlan::hasPredefinedType() { return !entity->getArgument(13)->isNull(); }
-IfcWorkPlanTypeEnum::IfcWorkPlanTypeEnum IfcWorkPlan::PredefinedType() { return IfcWorkPlanTypeEnum::FromString(*entity->getArgument(13)); }
+bool IfcWorkPlan::hasPredefinedType() const { return !entity->getArgument(13)->isNull(); }
+IfcWorkPlanTypeEnum::IfcWorkPlanTypeEnum IfcWorkPlan::PredefinedType() const { return IfcWorkPlanTypeEnum::FromString(*entity->getArgument(13)); }
 void IfcWorkPlan::setPredefinedType(IfcWorkPlanTypeEnum::IfcWorkPlanTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(13,v,IfcWorkPlanTypeEnum::ToString(v)); }
 bool IfcWorkPlan::is(Type::Enum v) const { return v == Type::IfcWorkPlan || IfcWorkControl::is(v); }
 Type::Enum IfcWorkPlan::type() const { return Type::IfcWorkPlan; }
 Type::Enum IfcWorkPlan::Class() { return Type::IfcWorkPlan; }
-IfcWorkPlan::IfcWorkPlan(IfcAbstractEntityPtr e) : IfcWorkControl((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcWorkPlan)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcWorkPlan::IfcWorkPlan(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, boost::optional< IfcIdentifier > v6_Identification, IfcDateTime v7_CreationDate, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPerson > > > v8_Creators, boost::optional< IfcLabel > v9_Purpose, boost::optional< IfcDuration > v10_Duration, boost::optional< IfcDuration > v11_TotalFloat, IfcDateTime v12_StartTime, boost::optional< IfcDateTime > v13_FinishTime, boost::optional< IfcWorkPlanTypeEnum::IfcWorkPlanTypeEnum > v14_PredefinedType) : IfcWorkControl((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } if (v6_Identification) { e->setArgument(5,(*v6_Identification)); } else { e->setArgument(5); } e->setArgument(6,(v7_CreationDate)); if (v8_Creators) { e->setArgument(7,(*v8_Creators)->generalize()); } else { e->setArgument(7); } if (v9_Purpose) { e->setArgument(8,(*v9_Purpose)); } else { e->setArgument(8); } if (v10_Duration) { e->setArgument(9,(*v10_Duration)); } else { e->setArgument(9); } if (v11_TotalFloat) { e->setArgument(10,(*v11_TotalFloat)); } else { e->setArgument(10); } e->setArgument(11,(v12_StartTime)); if (v13_FinishTime) { e->setArgument(12,(*v13_FinishTime)); } else { e->setArgument(12); } if (v14_PredefinedType) { e->setArgument(13,*v14_PredefinedType,IfcWorkPlanTypeEnum::ToString(*v14_PredefinedType)); } else { e->setArgument(13); } entity = e; EntityBuffer::Add(this); }
+IfcWorkPlan::IfcWorkPlan(IfcAbstractEntity* e) : IfcWorkControl((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcWorkPlan)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcWorkPlan::IfcWorkPlan(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, boost::optional< std::string > v6_Identification, std::string v7_CreationDate, boost::optional< IfcTemplatedEntityList< IfcPerson >::ptr > v8_Creators, boost::optional< std::string > v9_Purpose, boost::optional< std::string > v10_Duration, boost::optional< std::string > v11_TotalFloat, std::string v12_StartTime, boost::optional< std::string > v13_FinishTime, boost::optional< IfcWorkPlanTypeEnum::IfcWorkPlanTypeEnum > v14_PredefinedType) : IfcWorkControl((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } if (v6_Identification) { e->setArgument(5,(*v6_Identification)); } else { e->setArgument(5); } e->setArgument(6,(v7_CreationDate)); if (v8_Creators) { e->setArgument(7,(*v8_Creators)->generalize()); } else { e->setArgument(7); } if (v9_Purpose) { e->setArgument(8,(*v9_Purpose)); } else { e->setArgument(8); } if (v10_Duration) { e->setArgument(9,(*v10_Duration)); } else { e->setArgument(9); } if (v11_TotalFloat) { e->setArgument(10,(*v11_TotalFloat)); } else { e->setArgument(10); } e->setArgument(11,(v12_StartTime)); if (v13_FinishTime) { e->setArgument(12,(*v13_FinishTime)); } else { e->setArgument(12); } if (v14_PredefinedType) { e->setArgument(13,*v14_PredefinedType,IfcWorkPlanTypeEnum::ToString(*v14_PredefinedType)); } else { e->setArgument(13); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcWorkSchedule
-bool IfcWorkSchedule::hasPredefinedType() { return !entity->getArgument(13)->isNull(); }
-IfcWorkScheduleTypeEnum::IfcWorkScheduleTypeEnum IfcWorkSchedule::PredefinedType() { return IfcWorkScheduleTypeEnum::FromString(*entity->getArgument(13)); }
+bool IfcWorkSchedule::hasPredefinedType() const { return !entity->getArgument(13)->isNull(); }
+IfcWorkScheduleTypeEnum::IfcWorkScheduleTypeEnum IfcWorkSchedule::PredefinedType() const { return IfcWorkScheduleTypeEnum::FromString(*entity->getArgument(13)); }
 void IfcWorkSchedule::setPredefinedType(IfcWorkScheduleTypeEnum::IfcWorkScheduleTypeEnum v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(13,v,IfcWorkScheduleTypeEnum::ToString(v)); }
 bool IfcWorkSchedule::is(Type::Enum v) const { return v == Type::IfcWorkSchedule || IfcWorkControl::is(v); }
 Type::Enum IfcWorkSchedule::type() const { return Type::IfcWorkSchedule; }
 Type::Enum IfcWorkSchedule::Class() { return Type::IfcWorkSchedule; }
-IfcWorkSchedule::IfcWorkSchedule(IfcAbstractEntityPtr e) : IfcWorkControl((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcWorkSchedule)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcWorkSchedule::IfcWorkSchedule(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, boost::optional< IfcIdentifier > v6_Identification, IfcDateTime v7_CreationDate, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPerson > > > v8_Creators, boost::optional< IfcLabel > v9_Purpose, boost::optional< IfcDuration > v10_Duration, boost::optional< IfcDuration > v11_TotalFloat, IfcDateTime v12_StartTime, boost::optional< IfcDateTime > v13_FinishTime, boost::optional< IfcWorkScheduleTypeEnum::IfcWorkScheduleTypeEnum > v14_PredefinedType) : IfcWorkControl((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } if (v6_Identification) { e->setArgument(5,(*v6_Identification)); } else { e->setArgument(5); } e->setArgument(6,(v7_CreationDate)); if (v8_Creators) { e->setArgument(7,(*v8_Creators)->generalize()); } else { e->setArgument(7); } if (v9_Purpose) { e->setArgument(8,(*v9_Purpose)); } else { e->setArgument(8); } if (v10_Duration) { e->setArgument(9,(*v10_Duration)); } else { e->setArgument(9); } if (v11_TotalFloat) { e->setArgument(10,(*v11_TotalFloat)); } else { e->setArgument(10); } e->setArgument(11,(v12_StartTime)); if (v13_FinishTime) { e->setArgument(12,(*v13_FinishTime)); } else { e->setArgument(12); } if (v14_PredefinedType) { e->setArgument(13,*v14_PredefinedType,IfcWorkScheduleTypeEnum::ToString(*v14_PredefinedType)); } else { e->setArgument(13); } entity = e; EntityBuffer::Add(this); }
+IfcWorkSchedule::IfcWorkSchedule(IfcAbstractEntity* e) : IfcWorkControl((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcWorkSchedule)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcWorkSchedule::IfcWorkSchedule(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, boost::optional< std::string > v6_Identification, std::string v7_CreationDate, boost::optional< IfcTemplatedEntityList< IfcPerson >::ptr > v8_Creators, boost::optional< std::string > v9_Purpose, boost::optional< std::string > v10_Duration, boost::optional< std::string > v11_TotalFloat, std::string v12_StartTime, boost::optional< std::string > v13_FinishTime, boost::optional< IfcWorkScheduleTypeEnum::IfcWorkScheduleTypeEnum > v14_PredefinedType) : IfcWorkControl((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } if (v6_Identification) { e->setArgument(5,(*v6_Identification)); } else { e->setArgument(5); } e->setArgument(6,(v7_CreationDate)); if (v8_Creators) { e->setArgument(7,(*v8_Creators)->generalize()); } else { e->setArgument(7); } if (v9_Purpose) { e->setArgument(8,(*v9_Purpose)); } else { e->setArgument(8); } if (v10_Duration) { e->setArgument(9,(*v10_Duration)); } else { e->setArgument(9); } if (v11_TotalFloat) { e->setArgument(10,(*v11_TotalFloat)); } else { e->setArgument(10); } e->setArgument(11,(v12_StartTime)); if (v13_FinishTime) { e->setArgument(12,(*v13_FinishTime)); } else { e->setArgument(12); } if (v14_PredefinedType) { e->setArgument(13,*v14_PredefinedType,IfcWorkScheduleTypeEnum::ToString(*v14_PredefinedType)); } else { e->setArgument(13); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcWorkTime
-bool IfcWorkTime::hasRecurrencePattern() { return !entity->getArgument(3)->isNull(); }
-IfcRecurrencePattern* IfcWorkTime::RecurrencePattern() { return (IfcRecurrencePattern*)((IfcUtil::IfcSchemaEntity)(*entity->getArgument(3))); }
+bool IfcWorkTime::hasRecurrencePattern() const { return !entity->getArgument(3)->isNull(); }
+IfcRecurrencePattern* IfcWorkTime::RecurrencePattern() const { return (IfcRecurrencePattern*)((IfcUtil::IfcBaseClass*)(*entity->getArgument(3))); }
 void IfcWorkTime::setRecurrencePattern(IfcRecurrencePattern* v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-bool IfcWorkTime::hasStart() { return !entity->getArgument(4)->isNull(); }
-IfcDate IfcWorkTime::Start() { return *entity->getArgument(4); }
-void IfcWorkTime::setStart(IfcDate v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-bool IfcWorkTime::hasFinish() { return !entity->getArgument(5)->isNull(); }
-IfcDate IfcWorkTime::Finish() { return *entity->getArgument(5); }
-void IfcWorkTime::setFinish(IfcDate v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+bool IfcWorkTime::hasStart() const { return !entity->getArgument(4)->isNull(); }
+std::string IfcWorkTime::Start() const { return *entity->getArgument(4); }
+void IfcWorkTime::setStart(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+bool IfcWorkTime::hasFinish() const { return !entity->getArgument(5)->isNull(); }
+std::string IfcWorkTime::Finish() const { return *entity->getArgument(5); }
+void IfcWorkTime::setFinish(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
 bool IfcWorkTime::is(Type::Enum v) const { return v == Type::IfcWorkTime || IfcSchedulingTime::is(v); }
 Type::Enum IfcWorkTime::type() const { return Type::IfcWorkTime; }
 Type::Enum IfcWorkTime::Class() { return Type::IfcWorkTime; }
-IfcWorkTime::IfcWorkTime(IfcAbstractEntityPtr e) : IfcSchedulingTime((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcWorkTime)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcWorkTime::IfcWorkTime(boost::optional< IfcLabel > v1_Name, boost::optional< IfcDataOriginEnum::IfcDataOriginEnum > v2_DataOrigin, boost::optional< IfcLabel > v3_UserDefinedDataOrigin, IfcRecurrencePattern* v4_RecurrencePattern, boost::optional< IfcDate > v5_Start, boost::optional< IfcDate > v6_Finish) : IfcSchedulingTime((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_DataOrigin) { e->setArgument(1,*v2_DataOrigin,IfcDataOriginEnum::ToString(*v2_DataOrigin)); } else { e->setArgument(1); } if (v3_UserDefinedDataOrigin) { e->setArgument(2,(*v3_UserDefinedDataOrigin)); } else { e->setArgument(2); } e->setArgument(3,(v4_RecurrencePattern)); if (v5_Start) { e->setArgument(4,(*v5_Start)); } else { e->setArgument(4); } if (v6_Finish) { e->setArgument(5,(*v6_Finish)); } else { e->setArgument(5); } entity = e; EntityBuffer::Add(this); }
+IfcWorkTime::IfcWorkTime(IfcAbstractEntity* e) : IfcSchedulingTime((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcWorkTime)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcWorkTime::IfcWorkTime(boost::optional< std::string > v1_Name, boost::optional< IfcDataOriginEnum::IfcDataOriginEnum > v2_DataOrigin, boost::optional< std::string > v3_UserDefinedDataOrigin, IfcRecurrencePattern* v4_RecurrencePattern, boost::optional< std::string > v5_Start, boost::optional< std::string > v6_Finish) : IfcSchedulingTime((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); if (v1_Name) { e->setArgument(0,(*v1_Name)); } else { e->setArgument(0); } if (v2_DataOrigin) { e->setArgument(1,*v2_DataOrigin,IfcDataOriginEnum::ToString(*v2_DataOrigin)); } else { e->setArgument(1); } if (v3_UserDefinedDataOrigin) { e->setArgument(2,(*v3_UserDefinedDataOrigin)); } else { e->setArgument(2); } e->setArgument(3,(v4_RecurrencePattern)); if (v5_Start) { e->setArgument(4,(*v5_Start)); } else { e->setArgument(4); } if (v6_Finish) { e->setArgument(5,(*v6_Finish)); } else { e->setArgument(5); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcZShapeProfileDef
-IfcPositiveLengthMeasure IfcZShapeProfileDef::Depth() { return *entity->getArgument(3); }
-void IfcZShapeProfileDef::setDepth(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
-IfcPositiveLengthMeasure IfcZShapeProfileDef::FlangeWidth() { return *entity->getArgument(4); }
-void IfcZShapeProfileDef::setFlangeWidth(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
-IfcPositiveLengthMeasure IfcZShapeProfileDef::WebThickness() { return *entity->getArgument(5); }
-void IfcZShapeProfileDef::setWebThickness(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
-IfcPositiveLengthMeasure IfcZShapeProfileDef::FlangeThickness() { return *entity->getArgument(6); }
-void IfcZShapeProfileDef::setFlangeThickness(IfcPositiveLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
-bool IfcZShapeProfileDef::hasFilletRadius() { return !entity->getArgument(7)->isNull(); }
-IfcNonNegativeLengthMeasure IfcZShapeProfileDef::FilletRadius() { return *entity->getArgument(7); }
-void IfcZShapeProfileDef::setFilletRadius(IfcNonNegativeLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
-bool IfcZShapeProfileDef::hasEdgeRadius() { return !entity->getArgument(8)->isNull(); }
-IfcNonNegativeLengthMeasure IfcZShapeProfileDef::EdgeRadius() { return *entity->getArgument(8); }
-void IfcZShapeProfileDef::setEdgeRadius(IfcNonNegativeLengthMeasure v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
+double IfcZShapeProfileDef::Depth() const { return *entity->getArgument(3); }
+void IfcZShapeProfileDef::setDepth(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(3,v); }
+double IfcZShapeProfileDef::FlangeWidth() const { return *entity->getArgument(4); }
+void IfcZShapeProfileDef::setFlangeWidth(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(4,v); }
+double IfcZShapeProfileDef::WebThickness() const { return *entity->getArgument(5); }
+void IfcZShapeProfileDef::setWebThickness(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+double IfcZShapeProfileDef::FlangeThickness() const { return *entity->getArgument(6); }
+void IfcZShapeProfileDef::setFlangeThickness(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(6,v); }
+bool IfcZShapeProfileDef::hasFilletRadius() const { return !entity->getArgument(7)->isNull(); }
+double IfcZShapeProfileDef::FilletRadius() const { return *entity->getArgument(7); }
+void IfcZShapeProfileDef::setFilletRadius(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(7,v); }
+bool IfcZShapeProfileDef::hasEdgeRadius() const { return !entity->getArgument(8)->isNull(); }
+double IfcZShapeProfileDef::EdgeRadius() const { return *entity->getArgument(8); }
+void IfcZShapeProfileDef::setEdgeRadius(double v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(8,v); }
 bool IfcZShapeProfileDef::is(Type::Enum v) const { return v == Type::IfcZShapeProfileDef || IfcParameterizedProfileDef::is(v); }
 Type::Enum IfcZShapeProfileDef::type() const { return Type::IfcZShapeProfileDef; }
 Type::Enum IfcZShapeProfileDef::Class() { return Type::IfcZShapeProfileDef; }
-IfcZShapeProfileDef::IfcZShapeProfileDef(IfcAbstractEntityPtr e) : IfcParameterizedProfileDef((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcZShapeProfileDef)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcZShapeProfileDef::IfcZShapeProfileDef(IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< IfcLabel > v2_ProfileName, IfcAxis2Placement2D* v3_Position, IfcPositiveLengthMeasure v4_Depth, IfcPositiveLengthMeasure v5_FlangeWidth, IfcPositiveLengthMeasure v6_WebThickness, IfcPositiveLengthMeasure v7_FlangeThickness, boost::optional< IfcNonNegativeLengthMeasure > v8_FilletRadius, boost::optional< IfcNonNegativeLengthMeasure > v9_EdgeRadius) : IfcParameterizedProfileDef((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,v1_ProfileType,IfcProfileTypeEnum::ToString(v1_ProfileType)); if (v2_ProfileName) { e->setArgument(1,(*v2_ProfileName)); } else { e->setArgument(1); } e->setArgument(2,(v3_Position)); e->setArgument(3,(v4_Depth)); e->setArgument(4,(v5_FlangeWidth)); e->setArgument(5,(v6_WebThickness)); e->setArgument(6,(v7_FlangeThickness)); if (v8_FilletRadius) { e->setArgument(7,(*v8_FilletRadius)); } else { e->setArgument(7); } if (v9_EdgeRadius) { e->setArgument(8,(*v9_EdgeRadius)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
+IfcZShapeProfileDef::IfcZShapeProfileDef(IfcAbstractEntity* e) : IfcParameterizedProfileDef((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcZShapeProfileDef)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcZShapeProfileDef::IfcZShapeProfileDef(IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< std::string > v2_ProfileName, IfcAxis2Placement2D* v3_Position, double v4_Depth, double v5_FlangeWidth, double v6_WebThickness, double v7_FlangeThickness, boost::optional< double > v8_FilletRadius, boost::optional< double > v9_EdgeRadius) : IfcParameterizedProfileDef((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,v1_ProfileType,IfcProfileTypeEnum::ToString(v1_ProfileType)); if (v2_ProfileName) { e->setArgument(1,(*v2_ProfileName)); } else { e->setArgument(1); } e->setArgument(2,(v3_Position)); e->setArgument(3,(v4_Depth)); e->setArgument(4,(v5_FlangeWidth)); e->setArgument(5,(v6_WebThickness)); e->setArgument(6,(v7_FlangeThickness)); if (v8_FilletRadius) { e->setArgument(7,(*v8_FilletRadius)); } else { e->setArgument(7); } if (v9_EdgeRadius) { e->setArgument(8,(*v9_EdgeRadius)); } else { e->setArgument(8); } entity = e; EntityBuffer::Add(this); }
 
 // Function implementations for IfcZone
-bool IfcZone::hasLongName() { return !entity->getArgument(5)->isNull(); }
-IfcLabel IfcZone::LongName() { return *entity->getArgument(5); }
-void IfcZone::setLongName(IfcLabel v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
+bool IfcZone::hasLongName() const { return !entity->getArgument(5)->isNull(); }
+std::string IfcZone::LongName() const { return *entity->getArgument(5); }
+void IfcZone::setLongName(std::string v) { if ( ! entity->isWritable() ) { entity = new IfcWritableEntity(entity); } ((IfcWritableEntity*)entity)->setArgument(5,v); }
 bool IfcZone::is(Type::Enum v) const { return v == Type::IfcZone || IfcSystem::is(v); }
 Type::Enum IfcZone::type() const { return Type::IfcZone; }
 Type::Enum IfcZone::Class() { return Type::IfcZone; }
-IfcZone::IfcZone(IfcAbstractEntityPtr e) : IfcSystem((IfcAbstractEntityPtr)0) { if (!e) return; if (!e->is(Type::IfcZone)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
-IfcZone::IfcZone(IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, boost::optional< IfcLabel > v6_LongName) : IfcSystem((IfcAbstractEntityPtr)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } if (v6_LongName) { e->setArgument(5,(*v6_LongName)); } else { e->setArgument(5); } entity = e; EntityBuffer::Add(this); }
+IfcZone::IfcZone(IfcAbstractEntity* e) : IfcSystem((IfcAbstractEntity*)0) { if (!e) return; if (!e->is(Type::IfcZone)) throw IfcException("Unable to find find keyword in schema"); entity = e; }
+IfcZone::IfcZone(std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, boost::optional< std::string > v6_LongName) : IfcSystem((IfcAbstractEntity*)0) { IfcWritableEntity* e = new IfcWritableEntity(Class()); e->setArgument(0,(v1_GlobalId)); e->setArgument(1,(v2_OwnerHistory)); if (v3_Name) { e->setArgument(2,(*v3_Name)); } else { e->setArgument(2); } if (v4_Description) { e->setArgument(3,(*v4_Description)); } else { e->setArgument(3); } if (v5_ObjectType) { e->setArgument(4,(*v5_ObjectType)); } else { e->setArgument(4); } if (v6_LongName) { e->setArgument(5,(*v6_LongName)); } else { e->setArgument(5); } entity = e; EntityBuffer::Add(this); }
 
 #endif
diff --git a/src/ifcparse/Ifc4.h b/src/ifcparse/Ifc4.h
index 76845cc..0a3392e 100644
--- a/src/ifcparse/Ifc4.h
+++ b/src/ifcparse/Ifc4.h
@@ -41,6815 +41,8077 @@
 
 namespace Ifc4 {
 
+const char* const Identifier = "IFC4";
+
 // Forward definitions
-class IfcActionRequest; class IfcActor; class IfcActorRole; class IfcActuator; class IfcActuatorType; class IfcAddress; class IfcAdvancedBrep; class IfcAdvancedBrepWithVoids; class IfcAdvancedFace; class IfcAirTerminal; class IfcAirTerminalBox; class IfcAirTerminalBoxType; class IfcAirTerminalType; class IfcAirToAirHeatRecovery; class IfcAirToAirHeatRecoveryType; class IfcAlarm; class IfcAlarmType; class IfcAnnotation; class IfcAnnotationFillArea; class IfcApplication; class IfcAppliedValue; class IfcApproval; class IfcApprovalRelationship; class IfcArbitraryClosedProfileDef; class IfcArbitraryOpenProfileDef; class IfcArbitraryProfileDefWithVoids; class IfcAsset; class IfcAsymmetricIShapeProfileDef; class IfcAudioVisualAppliance; class IfcAudioVisualApplianceType; class IfcAxis1Placement; class IfcAxis2Placement2D; class IfcAxis2Placement3D; class IfcBSplineCurve; class IfcBSplineCurveWithKnots; class IfcBSplineSurface; class IfcBSplineSurfaceWithKnots; class IfcBeam; class IfcBeamStandardCase; class IfcBeamType; class IfcBlobTexture; class IfcBlock; class IfcBoiler; class IfcBoilerType; class IfcBooleanClippingResult; class IfcBooleanResult; class IfcBoundaryCondition; class IfcBoundaryCurve; class IfcBoundaryEdgeCondition; class IfcBoundaryFaceCondition; class IfcBoundaryNodeCondition; class IfcBoundaryNodeConditionWarping; class IfcBoundedCurve; class IfcBoundedSurface; class IfcBoundingBox; class IfcBoxedHalfSpace; class IfcBuilding; class IfcBuildingElement; class IfcBuildingElementPart; class IfcBuildingElementPartType; class IfcBuildingElementProxy; class IfcBuildingElementProxyType; class IfcBuildingElementType; class IfcBuildingStorey; class IfcBuildingSystem; class IfcBurner; class IfcBurnerType; class IfcCShapeProfileDef; class IfcCableCarrierFitting; class IfcCableCarrierFittingType; class IfcCableCarrierSegment; class IfcCableCarrierSegmentType; class IfcCableFitting; class IfcCableFittingType; class IfcCableSegment; class IfcCableSegmentType; class IfcCartesianPoint; class IfcCartesianPointList; class IfcCartesianPointList3D; class IfcCartesianTransformationOperator; class IfcCartesianTransformationOperator2D; class IfcCartesianTransformationOperator2DnonUniform; class IfcCartesianTransformationOperator3D; class IfcCartesianTransformationOperator3DnonUniform; class IfcCenterLineProfileDef; class IfcChiller; class IfcChillerType; class IfcChimney; class IfcChimneyType; class IfcCircle; class IfcCircleHollowProfileDef; class IfcCircleProfileDef; class IfcCivilElement; class IfcCivilElementType; class IfcClassification; class IfcClassificationReference; class IfcClosedShell; class IfcCoil; class IfcCoilType; class IfcColourRgb; class IfcColourRgbList; class IfcColourSpecification; class IfcColumn; class IfcColumnStandardCase; class IfcColumnType; class IfcCommunicationsAppliance; class IfcCommunicationsApplianceType; class IfcComplexProperty; class IfcComplexPropertyTemplate; class IfcCompositeCurve; class IfcCompositeCurveOnSurface; class IfcCompositeCurveSegment; class IfcCompositeProfileDef; class IfcCompressor; class IfcCompressorType; class IfcCondenser; class IfcCondenserType; class IfcConic; class IfcConnectedFaceSet; class IfcConnectionCurveGeometry; class IfcConnectionGeometry; class IfcConnectionPointEccentricity; class IfcConnectionPointGeometry; class IfcConnectionSurfaceGeometry; class IfcConnectionVolumeGeometry; class IfcConstraint; class IfcConstructionEquipmentResource; class IfcConstructionEquipmentResourceType; class IfcConstructionMaterialResource; class IfcConstructionMaterialResourceType; class IfcConstructionProductResource; class IfcConstructionProductResourceType; class IfcConstructionResource; class IfcConstructionResourceType; class IfcContext; class IfcContextDependentUnit; class IfcControl; class IfcController; class IfcControllerType; class IfcConversionBasedUnit; class IfcConversionBasedUnitWithOffset; class IfcCooledBeam; class IfcCooledBeamType; class IfcCoolingTower; class IfcCoolingTowerType; class IfcCoordinateOperation; class IfcCoordinateReferenceSystem; class IfcCostItem; class IfcCostSchedule; class IfcCostValue; class IfcCovering; class IfcCoveringType; class IfcCrewResource; class IfcCrewResourceType; class IfcCsgPrimitive3D; class IfcCsgSolid; class IfcCurrencyRelationship; class IfcCurtainWall; class IfcCurtainWallType; class IfcCurve; class IfcCurveBoundedPlane; class IfcCurveBoundedSurface; class IfcCurveStyle; class IfcCurveStyleFont; class IfcCurveStyleFontAndScaling; class IfcCurveStyleFontPattern; class IfcCylindricalSurface; class IfcDamper; class IfcDamperType; class IfcDerivedProfileDef; class IfcDerivedUnit; class IfcDerivedUnitElement; class IfcDimensionalExponents; class IfcDirection; class IfcDiscreteAccessory; class IfcDiscreteAccessoryType; class IfcDistributionChamberElement; class IfcDistributionChamberElementType; class IfcDistributionCircuit; class IfcDistributionControlElement; class IfcDistributionControlElementType; class IfcDistributionElement; class IfcDistributionElementType; class IfcDistributionFlowElement; class IfcDistributionFlowElementType; class IfcDistributionPort; class IfcDistributionSystem; class IfcDocumentInformation; class IfcDocumentInformationRelationship; class IfcDocumentReference; class IfcDoor; class IfcDoorLiningProperties; class IfcDoorPanelProperties; class IfcDoorStandardCase; class IfcDoorStyle; class IfcDoorType; class IfcDraughtingPreDefinedColour; class IfcDraughtingPreDefinedCurveFont; class IfcDuctFitting; class IfcDuctFittingType; class IfcDuctSegment; class IfcDuctSegmentType; class IfcDuctSilencer; class IfcDuctSilencerType; class IfcEdge; class IfcEdgeCurve; class IfcEdgeLoop; class IfcElectricAppliance; class IfcElectricApplianceType; class IfcElectricDistributionBoard; class IfcElectricDistributionBoardType; class IfcElectricFlowStorageDevice; class IfcElectricFlowStorageDeviceType; class IfcElectricGenerator; class IfcElectricGeneratorType; class IfcElectricMotor; class IfcElectricMotorType; class IfcElectricTimeControl; class IfcElectricTimeControlType; class IfcElement; class IfcElementAssembly; class IfcElementAssemblyType; class IfcElementComponent; class IfcElementComponentType; class IfcElementQuantity; class IfcElementType; class IfcElementarySurface; class IfcEllipse; class IfcEllipseProfileDef; class IfcEnergyConversionDevice; class IfcEnergyConversionDeviceType; class IfcEngine; class IfcEngineType; class IfcEvaporativeCooler; class IfcEvaporativeCoolerType; class IfcEvaporator; class IfcEvaporatorType; class IfcEvent; class IfcEventTime; class IfcEventType; class IfcExtendedProperties; class IfcExternalInformation; class IfcExternalReference; class IfcExternalReferenceRelationship; class IfcExternalSpatialElement; class IfcExternalSpatialStructureElement; class IfcExternallyDefinedHatchStyle; class IfcExternallyDefinedSurfaceStyle; class IfcExternallyDefinedTextFont; class IfcExtrudedAreaSolid; class IfcExtrudedAreaSolidTapered; class IfcFace; class IfcFaceBasedSurfaceModel; class IfcFaceBound; class IfcFaceOuterBound; class IfcFaceSurface; class IfcFacetedBrep; class IfcFacetedBrepWithVoids; class IfcFailureConnectionCondition; class IfcFan; class IfcFanType; class IfcFastener; class IfcFastenerType; class IfcFeatureElement; class IfcFeatureElementAddition; class IfcFeatureElementSubtraction; class IfcFillAreaStyle; class IfcFillAreaStyleHatching; class IfcFillAreaStyleTiles; class IfcFilter; class IfcFilterType; class IfcFireSuppressionTerminal; class IfcFireSuppressionTerminalType; class IfcFixedReferenceSweptAreaSolid; class IfcFlowController; class IfcFlowControllerType; class IfcFlowFitting; class IfcFlowFittingType; class IfcFlowInstrument; class IfcFlowInstrumentType; class IfcFlowMeter; class IfcFlowMeterType; class IfcFlowMovingDevice; class IfcFlowMovingDeviceType; class IfcFlowSegment; class IfcFlowSegmentType; class IfcFlowStorageDevice; class IfcFlowStorageDeviceType; class IfcFlowTerminal; class IfcFlowTerminalType; class IfcFlowTreatmentDevice; class IfcFlowTreatmentDeviceType; class IfcFooting; class IfcFootingType; class IfcFurnishingElement; class IfcFurnishingElementType; class IfcFurniture; class IfcFurnitureType; class IfcGeographicElement; class IfcGeographicElementType; class IfcGeometricCurveSet; class IfcGeometricRepresentationContext; class IfcGeometricRepresentationItem; class IfcGeometricRepresentationSubContext; class IfcGeometricSet; class IfcGrid; class IfcGridAxis; class IfcGridPlacement; class IfcGroup; class IfcHalfSpaceSolid; class IfcHeatExchanger; class IfcHeatExchangerType; class IfcHumidifier; class IfcHumidifierType; class IfcIShapeProfileDef; class IfcImageTexture; class IfcIndexedColourMap; class IfcIndexedTextureMap; class IfcIndexedTriangleTextureMap; class IfcInterceptor; class IfcInterceptorType; class IfcInventory; class IfcIrregularTimeSeries; class IfcIrregularTimeSeriesValue; class IfcJunctionBox; class IfcJunctionBoxType; class IfcLShapeProfileDef; class IfcLaborResource; class IfcLaborResourceType; class IfcLagTime; class IfcLamp; class IfcLampType; class IfcLibraryInformation; class IfcLibraryReference; class IfcLightDistributionData; class IfcLightFixture; class IfcLightFixtureType; class IfcLightIntensityDistribution; class IfcLightSource; class IfcLightSourceAmbient; class IfcLightSourceDirectional; class IfcLightSourceGoniometric; class IfcLightSourcePositional; class IfcLightSourceSpot; class IfcLine; class IfcLocalPlacement; class IfcLoop; class IfcManifoldSolidBrep; class IfcMapConversion; class IfcMappedItem; class IfcMaterial; class IfcMaterialClassificationRelationship; class IfcMaterialConstituent; class IfcMaterialConstituentSet; class IfcMaterialDefinition; class IfcMaterialDefinitionRepresentation; class IfcMaterialLayer; class IfcMaterialLayerSet; class IfcMaterialLayerSetUsage; class IfcMaterialLayerWithOffsets; class IfcMaterialList; class IfcMaterialProfile; class IfcMaterialProfileSet; class IfcMaterialProfileSetUsage; class IfcMaterialProfileSetUsageTapering; class IfcMaterialProfileWithOffsets; class IfcMaterialProperties; class IfcMaterialRelationship; class IfcMaterialUsageDefinition; class IfcMeasureWithUnit; class IfcMechanicalFastener; class IfcMechanicalFastenerType; class IfcMedicalDevice; class IfcMedicalDeviceType; class IfcMember; class IfcMemberStandardCase; class IfcMemberType; class IfcMetric; class IfcMirroredProfileDef; class IfcMonetaryUnit; class IfcMotorConnection; class IfcMotorConnectionType; class IfcNamedUnit; class IfcObject; class IfcObjectDefinition; class IfcObjectPlacement; class IfcObjective; class IfcOccupant; class IfcOffsetCurve2D; class IfcOffsetCurve3D; class IfcOpenShell; class IfcOpeningElement; class IfcOpeningStandardCase; class IfcOrganization; class IfcOrganizationRelationship; class IfcOrientedEdge; class IfcOuterBoundaryCurve; class IfcOutlet; class IfcOutletType; class IfcOwnerHistory; class IfcParameterizedProfileDef; class IfcPath; class IfcPcurve; class IfcPerformanceHistory; class IfcPermeableCoveringProperties; class IfcPermit; class IfcPerson; class IfcPersonAndOrganization; class IfcPhysicalComplexQuantity; class IfcPhysicalQuantity; class IfcPhysicalSimpleQuantity; class IfcPile; class IfcPileType; class IfcPipeFitting; class IfcPipeFittingType; class IfcPipeSegment; class IfcPipeSegmentType; class IfcPixelTexture; class IfcPlacement; class IfcPlanarBox; class IfcPlanarExtent; class IfcPlane; class IfcPlate; class IfcPlateStandardCase; class IfcPlateType; class IfcPoint; class IfcPointOnCurve; class IfcPointOnSurface; class IfcPolyLoop; class IfcPolygonalBoundedHalfSpace; class IfcPolyline; class IfcPort; class IfcPostalAddress; class IfcPreDefinedColour; class IfcPreDefinedCurveFont; class IfcPreDefinedItem; class IfcPreDefinedProperties; class IfcPreDefinedPropertySet; class IfcPreDefinedTextFont; class IfcPresentationItem; class IfcPresentationLayerAssignment; class IfcPresentationLayerWithStyle; class IfcPresentationStyle; class IfcPresentationStyleAssignment; class IfcProcedure; class IfcProcedureType; class IfcProcess; class IfcProduct; class IfcProductDefinitionShape; class IfcProductRepresentation; class IfcProfileDef; class IfcProfileProperties; class IfcProject; class IfcProjectLibrary; class IfcProjectOrder; class IfcProjectedCRS; class IfcProjectionElement; class IfcProperty; class IfcPropertyAbstraction; class IfcPropertyBoundedValue; class IfcPropertyDefinition; class IfcPropertyDependencyRelationship; class IfcPropertyEnumeratedValue; class IfcPropertyEnumeration; class IfcPropertyListValue; class IfcPropertyReferenceValue; class IfcPropertySet; class IfcPropertySetDefinition; class IfcPropertySetTemplate; class IfcPropertySingleValue; class IfcPropertyTableValue; class IfcPropertyTemplate; class IfcPropertyTemplateDefinition; class IfcProtectiveDevice; class IfcProtectiveDeviceTrippingUnit; class IfcProtectiveDeviceTrippingUnitType; class IfcProtectiveDeviceType; class IfcProxy; class IfcPump; class IfcPumpType; class IfcQuantityArea; class IfcQuantityCount; class IfcQuantityLength; class IfcQuantitySet; class IfcQuantityTime; class IfcQuantityVolume; class IfcQuantityWeight; class IfcRailing; class IfcRailingType; class IfcRamp; class IfcRampFlight; class IfcRampFlightType; class IfcRampType; class IfcRationalBSplineCurveWithKnots; class IfcRationalBSplineSurfaceWithKnots; class IfcRectangleHollowProfileDef; class IfcRectangleProfileDef; class IfcRectangularPyramid; class IfcRectangularTrimmedSurface; class IfcRecurrencePattern; class IfcReference; class IfcRegularTimeSeries; class IfcReinforcementBarProperties; class IfcReinforcementDefinitionProperties; class IfcReinforcingBar; class IfcReinforcingBarType; class IfcReinforcingElement; class IfcReinforcingElementType; class IfcReinforcingMesh; class IfcReinforcingMeshType; class IfcRelAggregates; class IfcRelAssigns; class IfcRelAssignsToActor; class IfcRelAssignsToControl; class IfcRelAssignsToGroup; class IfcRelAssignsToGroupByFactor; class IfcRelAssignsToProcess; class IfcRelAssignsToProduct; class IfcRelAssignsToResource; class IfcRelAssociates; class IfcRelAssociatesApproval; class IfcRelAssociatesClassification; class IfcRelAssociatesConstraint; class IfcRelAssociatesDocument; class IfcRelAssociatesLibrary; class IfcRelAssociatesMaterial; class IfcRelConnects; class IfcRelConnectsElements; class IfcRelConnectsPathElements; class IfcRelConnectsPortToElement; class IfcRelConnectsPorts; class IfcRelConnectsStructuralActivity; class IfcRelConnectsStructuralMember; class IfcRelConnectsWithEccentricity; class IfcRelConnectsWithRealizingElements; class IfcRelContainedInSpatialStructure; class IfcRelCoversBldgElements; class IfcRelCoversSpaces; class IfcRelDeclares; class IfcRelDecomposes; class IfcRelDefines; class IfcRelDefinesByObject; class IfcRelDefinesByProperties; class IfcRelDefinesByTemplate; class IfcRelDefinesByType; class IfcRelFillsElement; class IfcRelFlowControlElements; class IfcRelInterferesElements; class IfcRelNests; class IfcRelProjectsElement; class IfcRelReferencedInSpatialStructure; class IfcRelSequence; class IfcRelServicesBuildings; class IfcRelSpaceBoundary; class IfcRelSpaceBoundary1stLevel; class IfcRelSpaceBoundary2ndLevel; class IfcRelVoidsElement; class IfcRelationship; class IfcReparametrisedCompositeCurveSegment; class IfcRepresentation; class IfcRepresentationContext; class IfcRepresentationItem; class IfcRepresentationMap; class IfcResource; class IfcResourceApprovalRelationship; class IfcResourceConstraintRelationship; class IfcResourceLevelRelationship; class IfcResourceTime; class IfcRevolvedAreaSolid; class IfcRevolvedAreaSolidTapered; class IfcRightCircularCone; class IfcRightCircularCylinder; class IfcRoof; class IfcRoofType; class IfcRoot; class IfcRoundedRectangleProfileDef; class IfcSIUnit; class IfcSanitaryTerminal; class IfcSanitaryTerminalType; class IfcSchedulingTime; class IfcSectionProperties; class IfcSectionReinforcementProperties; class IfcSectionedSpine; class IfcSensor; class IfcSensorType; class IfcShadingDevice; class IfcShadingDeviceType; class IfcShapeAspect; class IfcShapeModel; class IfcShapeRepresentation; class IfcShellBasedSurfaceModel; class IfcSimpleProperty; class IfcSimplePropertyTemplate; class IfcSite; class IfcSlab; class IfcSlabElementedCase; class IfcSlabStandardCase; class IfcSlabType; class IfcSlippageConnectionCondition; class IfcSolarDevice; class IfcSolarDeviceType; class IfcSolidModel; class IfcSpace; class IfcSpaceHeater; class IfcSpaceHeaterType; class IfcSpaceType; class IfcSpatialElement; class IfcSpatialElementType; class IfcSpatialStructureElement; class IfcSpatialStructureElementType; class IfcSpatialZone; class IfcSpatialZoneType; class IfcSphere; class IfcStackTerminal; class IfcStackTerminalType; class IfcStair; class IfcStairFlight; class IfcStairFlightType; class IfcStairType; class IfcStructuralAction; class IfcStructuralActivity; class IfcStructuralAnalysisModel; class IfcStructuralConnection; class IfcStructuralConnectionCondition; class IfcStructuralCurveAction; class IfcStructuralCurveConnection; class IfcStructuralCurveMember; class IfcStructuralCurveMemberVarying; class IfcStructuralCurveReaction; class IfcStructuralItem; class IfcStructuralLinearAction; class IfcStructuralLoad; class IfcStructuralLoadCase; class IfcStructuralLoadConfiguration; class IfcStructuralLoadGroup; class IfcStructuralLoadLinearForce; class IfcStructuralLoadOrResult; class IfcStructuralLoadPlanarForce; class IfcStructuralLoadSingleDisplacement; class IfcStructuralLoadSingleDisplacementDistortion; class IfcStructuralLoadSingleForce; class IfcStructuralLoadSingleForceWarping; class IfcStructuralLoadStatic; class IfcStructuralLoadTemperature; class IfcStructuralMember; class IfcStructuralPlanarAction; class IfcStructuralPointAction; class IfcStructuralPointConnection; class IfcStructuralPointReaction; class IfcStructuralReaction; class IfcStructuralResultGroup; class IfcStructuralSurfaceAction; class IfcStructuralSurfaceConnection; class IfcStructuralSurfaceMember; class IfcStructuralSurfaceMemberVarying; class IfcStructuralSurfaceReaction; class IfcStyleModel; class IfcStyledItem; class IfcStyledRepresentation; class IfcSubContractResource; class IfcSubContractResourceType; class IfcSubedge; class IfcSurface; class IfcSurfaceCurveSweptAreaSolid; class IfcSurfaceFeature; class IfcSurfaceOfLinearExtrusion; class IfcSurfaceOfRevolution; class IfcSurfaceReinforcementArea; class IfcSurfaceStyle; class IfcSurfaceStyleLighting; class IfcSurfaceStyleRefraction; class IfcSurfaceStyleRendering; class IfcSurfaceStyleShading; class IfcSurfaceStyleWithTextures; class IfcSurfaceTexture; class IfcSweptAreaSolid; class IfcSweptDiskSolid; class IfcSweptDiskSolidPolygonal; class IfcSweptSurface; class IfcSwitchingDevice; class IfcSwitchingDeviceType; class IfcSystem; class IfcSystemFurnitureElement; class IfcSystemFurnitureElementType; class IfcTShapeProfileDef; class IfcTable; class IfcTableColumn; class IfcTableRow; class IfcTank; class IfcTankType; class IfcTask; class IfcTaskTime; class IfcTaskTimeRecurring; class IfcTaskType; class IfcTelecomAddress; class IfcTendon; class IfcTendonAnchor; class IfcTendonAnchorType; class IfcTendonType; class IfcTessellatedFaceSet; class IfcTessellatedItem; class IfcTextLiteral; class IfcTextLiteralWithExtent; class IfcTextStyle; class IfcTextStyleFontModel; class IfcTextStyleForDefinedFont; class IfcTextStyleTextModel; class IfcTextureCoordinate; class IfcTextureCoordinateGenerator; class IfcTextureMap; class IfcTextureVertex; class IfcTextureVertexList; class IfcTimePeriod; class IfcTimeSeries; class IfcTimeSeriesValue; class IfcTopologicalRepresentationItem; class IfcTopologyRepresentation; class IfcTransformer; class IfcTransformerType; class IfcTransportElement; class IfcTransportElementType; class IfcTrapeziumProfileDef; class IfcTriangulatedFaceSet; class IfcTrimmedCurve; class IfcTubeBundle; class IfcTubeBundleType; class IfcTypeObject; class IfcTypeProcess; class IfcTypeProduct; class IfcTypeResource; class IfcUShapeProfileDef; class IfcUnitAssignment; class IfcUnitaryControlElement; class IfcUnitaryControlElementType; class IfcUnitaryEquipment; class IfcUnitaryEquipmentType; class IfcValve; class IfcValveType; class IfcVector; class IfcVertex; class IfcVertexLoop; class IfcVertexPoint; class IfcVibrationIsolator; class IfcVibrationIsolatorType; class IfcVirtualElement; class IfcVirtualGridIntersection; class IfcVoidingFeature; class IfcWall; class IfcWallElementedCase; class IfcWallStandardCase; class IfcWallType; class IfcWasteTerminal; class IfcWasteTerminalType; class IfcWindow; class IfcWindowLiningProperties; class IfcWindowPanelProperties; class IfcWindowStandardCase; class IfcWindowStyle; class IfcWindowType; class IfcWorkCalendar; class IfcWorkControl; class IfcWorkPlan; class IfcWorkSchedule; class IfcWorkTime; class IfcZShapeProfileDef; class IfcZone; 
+class IfcActionRequest; class IfcActor; class IfcActorRole; class IfcActuator; class IfcActuatorType; class IfcAddress; class IfcAdvancedBrep; class IfcAdvancedBrepWithVoids; class IfcAdvancedFace; class IfcAirTerminal; class IfcAirTerminalBox; class IfcAirTerminalBoxType; class IfcAirTerminalType; class IfcAirToAirHeatRecovery; class IfcAirToAirHeatRecoveryType; class IfcAlarm; class IfcAlarmType; class IfcAnnotation; class IfcAnnotationFillArea; class IfcApplication; class IfcAppliedValue; class IfcApproval; class IfcApprovalRelationship; class IfcArbitraryClosedProfileDef; class IfcArbitraryOpenProfileDef; class IfcArbitraryProfileDefWithVoids; class IfcAsset; class IfcAsymmetricIShapeProfileDef; class IfcAudioVisualAppliance; class IfcAudioVisualApplianceType; class IfcAxis1Placement; class IfcAxis2Placement2D; class IfcAxis2Placement3D; class IfcBSplineCurve; class IfcBSplineCurveWithKnots; class IfcBSplineSurface; class IfcBSplineSurfaceWithKnots; class IfcBeam; class IfcBeamStandardCase; class IfcBeamType; class IfcBlobTexture; class IfcBlock; class IfcBoiler; class IfcBoilerType; class IfcBooleanClippingResult; class IfcBooleanResult; class IfcBoundaryCondition; class IfcBoundaryCurve; class IfcBoundaryEdgeCondition; class IfcBoundaryFaceCondition; class IfcBoundaryNodeCondition; class IfcBoundaryNodeConditionWarping; class IfcBoundedCurve; class IfcBoundedSurface; class IfcBoundingBox; class IfcBoxedHalfSpace; class IfcBuilding; class IfcBuildingElement; class IfcBuildingElementPart; class IfcBuildingElementPartType; class IfcBuildingElementProxy; class IfcBuildingElementProxyType; class IfcBuildingElementType; class IfcBuildingStorey; class IfcBuildingSystem; class IfcBurner; class IfcBurnerType; class IfcCShapeProfileDef; class IfcCableCarrierFitting; class IfcCableCarrierFittingType; class IfcCableCarrierSegment; class IfcCableCarrierSegmentType; class IfcCableFitting; class IfcCableFittingType; class IfcCableSegment; class IfcCableSegmentType; class IfcCartesianPoint; class IfcCartesianPointList; class IfcCartesianPointList3D; class IfcCartesianTransformationOperator; class IfcCartesianTransformationOperator2D; class IfcCartesianTransformationOperator2DnonUniform; class IfcCartesianTransformationOperator3D; class IfcCartesianTransformationOperator3DnonUniform; class IfcCenterLineProfileDef; class IfcChiller; class IfcChillerType; class IfcChimney; class IfcChimneyType; class IfcCircle; class IfcCircleHollowProfileDef; class IfcCircleProfileDef; class IfcCivilElement; class IfcCivilElementType; class IfcClassification; class IfcClassificationReference; class IfcClosedShell; class IfcCoil; class IfcCoilType; class IfcColourRgb; class IfcColourRgbList; class IfcColourSpecification; class IfcColumn; class IfcColumnStandardCase; class IfcColumnType; class IfcCommunicationsAppliance; class IfcCommunicationsApplianceType; class IfcComplexProperty; class IfcComplexPropertyTemplate; class IfcCompositeCurve; class IfcCompositeCurveOnSurface; class IfcCompositeCurveSegment; class IfcCompositeProfileDef; class IfcCompressor; class IfcCompressorType; class IfcCondenser; class IfcCondenserType; class IfcConic; class IfcConnectedFaceSet; class IfcConnectionCurveGeometry; class IfcConnectionGeometry; class IfcConnectionPointEccentricity; class IfcConnectionPointGeometry; class IfcConnectionSurfaceGeometry; class IfcConnectionVolumeGeometry; class IfcConstraint; class IfcConstructionEquipmentResource; class IfcConstructionEquipmentResourceType; class IfcConstructionMaterialResource; class IfcConstructionMaterialResourceType; class IfcConstructionProductResource; class IfcConstructionProductResourceType; class IfcConstructionResource; class IfcConstructionResourceType; class IfcContext; class IfcContextDependentUnit; class IfcControl; class IfcController; class IfcControllerType; class IfcConversionBasedUnit; class IfcConversionBasedUnitWithOffset; class IfcCooledBeam; class IfcCooledBeamType; class IfcCoolingTower; class IfcCoolingTowerType; class IfcCoordinateOperation; class IfcCoordinateReferenceSystem; class IfcCostItem; class IfcCostSchedule; class IfcCostValue; class IfcCovering; class IfcCoveringType; class IfcCrewResource; class IfcCrewResourceType; class IfcCsgPrimitive3D; class IfcCsgSolid; class IfcCurrencyRelationship; class IfcCurtainWall; class IfcCurtainWallType; class IfcCurve; class IfcCurveBoundedPlane; class IfcCurveBoundedSurface; class IfcCurveStyle; class IfcCurveStyleFont; class IfcCurveStyleFontAndScaling; class IfcCurveStyleFontPattern; class IfcCylindricalSurface; class IfcDamper; class IfcDamperType; class IfcDerivedProfileDef; class IfcDerivedUnit; class IfcDerivedUnitElement; class IfcDimensionalExponents; class IfcDirection; class IfcDiscreteAccessory; class IfcDiscreteAccessoryType; class IfcDistributionChamberElement; class IfcDistributionChamberElementType; class IfcDistributionCircuit; class IfcDistributionControlElement; class IfcDistributionControlElementType; class IfcDistributionElement; class IfcDistributionElementType; class IfcDistributionFlowElement; class IfcDistributionFlowElementType; class IfcDistributionPort; class IfcDistributionSystem; class IfcDocumentInformation; class IfcDocumentInformationRelationship; class IfcDocumentReference; class IfcDoor; class IfcDoorLiningProperties; class IfcDoorPanelProperties; class IfcDoorStandardCase; class IfcDoorStyle; class IfcDoorType; class IfcDraughtingPreDefinedColour; class IfcDraughtingPreDefinedCurveFont; class IfcDuctFitting; class IfcDuctFittingType; class IfcDuctSegment; class IfcDuctSegmentType; class IfcDuctSilencer; class IfcDuctSilencerType; class IfcEdge; class IfcEdgeCurve; class IfcEdgeLoop; class IfcElectricAppliance; class IfcElectricApplianceType; class IfcElectricDistributionBoard; class IfcElectricDistributionBoardType; class IfcElectricFlowStorageDevice; class IfcElectricFlowStorageDeviceType; class IfcElectricGenerator; class IfcElectricGeneratorType; class IfcElectricMotor; class IfcElectricMotorType; class IfcElectricTimeControl; class IfcElectricTimeControlType; class IfcElement; class IfcElementAssembly; class IfcElementAssemblyType; class IfcElementComponent; class IfcElementComponentType; class IfcElementQuantity; class IfcElementType; class IfcElementarySurface; class IfcEllipse; class IfcEllipseProfileDef; class IfcEnergyConversionDevice; class IfcEnergyConversionDeviceType; class IfcEngine; class IfcEngineType; class IfcEvaporativeCooler; class IfcEvaporativeCoolerType; class IfcEvaporator; class IfcEvaporatorType; class IfcEvent; class IfcEventTime; class IfcEventType; class IfcExtendedProperties; class IfcExternalInformation; class IfcExternalReference; class IfcExternalReferenceRelationship; class IfcExternalSpatialElement; class IfcExternalSpatialStructureElement; class IfcExternallyDefinedHatchStyle; class IfcExternallyDefinedSurfaceStyle; class IfcExternallyDefinedTextFont; class IfcExtrudedAreaSolid; class IfcExtrudedAreaSolidTapered; class IfcFace; class IfcFaceBasedSurfaceModel; class IfcFaceBound; class IfcFaceOuterBound; class IfcFaceSurface; class IfcFacetedBrep; class IfcFacetedBrepWithVoids; class IfcFailureConnectionCondition; class IfcFan; class IfcFanType; class IfcFastener; class IfcFastenerType; class IfcFeatureElement; class IfcFeatureElementAddition; class IfcFeatureElementSubtraction; class IfcFillAreaStyle; class IfcFillAreaStyleHatching; class IfcFillAreaStyleTiles; class IfcFilter; class IfcFilterType; class IfcFireSuppressionTerminal; class IfcFireSuppressionTerminalType; class IfcFixedReferenceSweptAreaSolid; class IfcFlowController; class IfcFlowControllerType; class IfcFlowFitting; class IfcFlowFittingType; class IfcFlowInstrument; class IfcFlowInstrumentType; class IfcFlowMeter; class IfcFlowMeterType; class IfcFlowMovingDevice; class IfcFlowMovingDeviceType; class IfcFlowSegment; class IfcFlowSegmentType; class IfcFlowStorageDevice; class IfcFlowStorageDeviceType; class IfcFlowTerminal; class IfcFlowTerminalType; class IfcFlowTreatmentDevice; class IfcFlowTreatmentDeviceType; class IfcFooting; class IfcFootingType; class IfcFurnishingElement; class IfcFurnishingElementType; class IfcFurniture; class IfcFurnitureType; class IfcGeographicElement; class IfcGeographicElementType; class IfcGeometricCurveSet; class IfcGeometricRepresentationContext; class IfcGeometricRepresentationItem; class IfcGeometricRepresentationSubContext; class IfcGeometricSet; class IfcGrid; class IfcGridAxis; class IfcGridPlacement; class IfcGroup; class IfcHalfSpaceSolid; class IfcHeatExchanger; class IfcHeatExchangerType; class IfcHumidifier; class IfcHumidifierType; class IfcIShapeProfileDef; class IfcImageTexture; class IfcIndexedColourMap; class IfcIndexedTextureMap; class IfcIndexedTriangleTextureMap; class IfcInterceptor; class IfcInterceptorType; class IfcInventory; class IfcIrregularTimeSeries; class IfcIrregularTimeSeriesValue; class IfcJunctionBox; class IfcJunctionBoxType; class IfcLShapeProfileDef; class IfcLaborResource; class IfcLaborResourceType; class IfcLagTime; class IfcLamp; class IfcLampType; class IfcLibraryInformation; class IfcLibraryReference; class IfcLightDistributionData; class IfcLightFixture; class IfcLightFixtureType; class IfcLightIntensityDistribution; class IfcLightSource; class IfcLightSourceAmbient; class IfcLightSourceDirectional; class IfcLightSourceGoniometric; class IfcLightSourcePositional; class IfcLightSourceSpot; class IfcLine; class IfcLocalPlacement; class IfcLoop; class IfcManifoldSolidBrep; class IfcMapConversion; class IfcMappedItem; class IfcMaterial; class IfcMaterialClassificationRelationship; class IfcMaterialConstituent; class IfcMaterialConstituentSet; class IfcMaterialDefinition; class IfcMaterialDefinitionRepresentation; class IfcMaterialLayer; class IfcMaterialLayerSet; class IfcMaterialLayerSetUsage; class IfcMaterialLayerWithOffsets; class IfcMaterialList; class IfcMaterialProfile; class IfcMaterialProfileSet; class IfcMaterialProfileSetUsage; class IfcMaterialProfileSetUsageTapering; class IfcMaterialProfileWithOffsets; class IfcMaterialProperties; class IfcMaterialRelationship; class IfcMaterialUsageDefinition; class IfcMeasureWithUnit; class IfcMechanicalFastener; class IfcMechanicalFastenerType; class IfcMedicalDevice; class IfcMedicalDeviceType; class IfcMember; class IfcMemberStandardCase; class IfcMemberType; class IfcMetric; class IfcMirroredProfileDef; class IfcMonetaryUnit; class IfcMotorConnection; class IfcMotorConnectionType; class IfcNamedUnit; class IfcObject; class IfcObjectDefinition; class IfcObjectPlacement; class IfcObjective; class IfcOccupant; class IfcOffsetCurve2D; class IfcOffsetCurve3D; class IfcOpenShell; class IfcOpeningElement; class IfcOpeningStandardCase; class IfcOrganization; class IfcOrganizationRelationship; class IfcOrientedEdge; class IfcOuterBoundaryCurve; class IfcOutlet; class IfcOutletType; class IfcOwnerHistory; class IfcParameterizedProfileDef; class IfcPath; class IfcPcurve; class IfcPerformanceHistory; class IfcPermeableCoveringProperties; class IfcPermit; class IfcPerson; class IfcPersonAndOrganization; class IfcPhysicalComplexQuantity; class IfcPhysicalQuantity; class IfcPhysicalSimpleQuantity; class IfcPile; class IfcPileType; class IfcPipeFitting; class IfcPipeFittingType; class IfcPipeSegment; class IfcPipeSegmentType; class IfcPixelTexture; class IfcPlacement; class IfcPlanarBox; class IfcPlanarExtent; class IfcPlane; class IfcPlate; class IfcPlateStandardCase; class IfcPlateType; class IfcPoint; class IfcPointOnCurve; class IfcPointOnSurface; class IfcPolyLoop; class IfcPolygonalBoundedHalfSpace; class IfcPolyline; class IfcPort; class IfcPostalAddress; class IfcPreDefinedColour; class IfcPreDefinedCurveFont; class IfcPreDefinedItem; class IfcPreDefinedProperties; class IfcPreDefinedPropertySet; class IfcPreDefinedTextFont; class IfcPresentationItem; class IfcPresentationLayerAssignment; class IfcPresentationLayerWithStyle; class IfcPresentationStyle; class IfcPresentationStyleAssignment; class IfcProcedure; class IfcProcedureType; class IfcProcess; class IfcProduct; class IfcProductDefinitionShape; class IfcProductRepresentation; class IfcProfileDef; class IfcProfileProperties; class IfcProject; class IfcProjectLibrary; class IfcProjectOrder; class IfcProjectedCRS; class IfcProjectionElement; class IfcProperty; class IfcPropertyAbstraction; class IfcPropertyBoundedValue; class IfcPropertyDefinition; class IfcPropertyDependencyRelationship; class IfcPropertyEnumeratedValue; class IfcPropertyEnumeration; class IfcPropertyListValue; class IfcPropertyReferenceValue; class IfcPropertySet; class IfcPropertySetDefinition; class IfcPropertySetTemplate; class IfcPropertySingleValue; class IfcPropertyTableValue; class IfcPropertyTemplate; class IfcPropertyTemplateDefinition; class IfcProtectiveDevice; class IfcProtectiveDeviceTrippingUnit; class IfcProtectiveDeviceTrippingUnitType; class IfcProtectiveDeviceType; class IfcProxy; class IfcPump; class IfcPumpType; class IfcQuantityArea; class IfcQuantityCount; class IfcQuantityLength; class IfcQuantitySet; class IfcQuantityTime; class IfcQuantityVolume; class IfcQuantityWeight; class IfcRailing; class IfcRailingType; class IfcRamp; class IfcRampFlight; class IfcRampFlightType; class IfcRampType; class IfcRationalBSplineCurveWithKnots; class IfcRationalBSplineSurfaceWithKnots; class IfcRectangleHollowProfileDef; class IfcRectangleProfileDef; class IfcRectangularPyramid; class IfcRectangularTrimmedSurface; class IfcRecurrencePattern; class IfcReference; class IfcRegularTimeSeries; class IfcReinforcementBarProperties; class IfcReinforcementDefinitionProperties; class IfcReinforcingBar; class IfcReinforcingBarType; class IfcReinforcingElement; class IfcReinforcingElementType; class IfcReinforcingMesh; class IfcReinforcingMeshType; class IfcRelAggregates; class IfcRelAssigns; class IfcRelAssignsToActor; class IfcRelAssignsToControl; class IfcRelAssignsToGroup; class IfcRelAssignsToGroupByFactor; class IfcRelAssignsToProcess; class IfcRelAssignsToProduct; class IfcRelAssignsToResource; class IfcRelAssociates; class IfcRelAssociatesApproval; class IfcRelAssociatesClassification; class IfcRelAssociatesConstraint; class IfcRelAssociatesDocument; class IfcRelAssociatesLibrary; class IfcRelAssociatesMaterial; class IfcRelConnects; class IfcRelConnectsElements; class IfcRelConnectsPathElements; class IfcRelConnectsPortToElement; class IfcRelConnectsPorts; class IfcRelConnectsStructuralActivity; class IfcRelConnectsStructuralMember; class IfcRelConnectsWithEccentricity; class IfcRelConnectsWithRealizingElements; class IfcRelContainedInSpatialStructure; class IfcRelCoversBldgElements; class IfcRelCoversSpaces; class IfcRelDeclares; class IfcRelDecomposes; class IfcRelDefines; class IfcRelDefinesByObject; class IfcRelDefinesByProperties; class IfcRelDefinesByTemplate; class IfcRelDefinesByType; class IfcRelFillsElement; class IfcRelFlowControlElements; class IfcRelInterferesElements; class IfcRelNests; class IfcRelProjectsElement; class IfcRelReferencedInSpatialStructure; class IfcRelSequence; class IfcRelServicesBuildings; class IfcRelSpaceBoundary; class IfcRelSpaceBoundary1stLevel; class IfcRelSpaceBoundary2ndLevel; class IfcRelVoidsElement; class IfcRelationship; class IfcReparametrisedCompositeCurveSegment; class IfcRepresentation; class IfcRepresentationContext; class IfcRepresentationItem; class IfcRepresentationMap; class IfcResource; class IfcResourceApprovalRelationship; class IfcResourceConstraintRelationship; class IfcResourceLevelRelationship; class IfcResourceTime; class IfcRevolvedAreaSolid; class IfcRevolvedAreaSolidTapered; class IfcRightCircularCone; class IfcRightCircularCylinder; class IfcRoof; class IfcRoofType; class IfcRoot; class IfcRoundedRectangleProfileDef; class IfcSIUnit; class IfcSanitaryTerminal; class IfcSanitaryTerminalType; class IfcSchedulingTime; class IfcSectionProperties; class IfcSectionReinforcementProperties; class IfcSectionedSpine; class IfcSensor; class IfcSensorType; class IfcShadingDevice; class IfcShadingDeviceType; class IfcShapeAspect; class IfcShapeModel; class IfcShapeRepresentation; class IfcShellBasedSurfaceModel; class IfcSimpleProperty; class IfcSimplePropertyTemplate; class IfcSite; class IfcSlab; class IfcSlabElementedCase; class IfcSlabStandardCase; class IfcSlabType; class IfcSlippageConnectionCondition; class IfcSolarDevice; class IfcSolarDeviceType; class IfcSolidModel; class IfcSpace; class IfcSpaceHeater; class IfcSpaceHeaterType; class IfcSpaceType; class IfcSpatialElement; class IfcSpatialElementType; class IfcSpatialStructureElement; class IfcSpatialStructureElementType; class IfcSpatialZone; class IfcSpatialZoneType; class IfcSphere; class IfcStackTerminal; class IfcStackTerminalType; class IfcStair; class IfcStairFlight; class IfcStairFlightType; class IfcStairType; class IfcStructuralAction; class IfcStructuralActivity; class IfcStructuralAnalysisModel; class IfcStructuralConnection; class IfcStructuralConnectionCondition; class IfcStructuralCurveAction; class IfcStructuralCurveConnection; class IfcStructuralCurveMember; class IfcStructuralCurveMemberVarying; class IfcStructuralCurveReaction; class IfcStructuralItem; class IfcStructuralLinearAction; class IfcStructuralLoad; class IfcStructuralLoadCase; class IfcStructuralLoadConfiguration; class IfcStructuralLoadGroup; class IfcStructuralLoadLinearForce; class IfcStructuralLoadOrResult; class IfcStructuralLoadPlanarForce; class IfcStructuralLoadSingleDisplacement; class IfcStructuralLoadSingleDisplacementDistortion; class IfcStructuralLoadSingleForce; class IfcStructuralLoadSingleForceWarping; class IfcStructuralLoadStatic; class IfcStructuralLoadTemperature; class IfcStructuralMember; class IfcStructuralPlanarAction; class IfcStructuralPointAction; class IfcStructuralPointConnection; class IfcStructuralPointReaction; class IfcStructuralReaction; class IfcStructuralResultGroup; class IfcStructuralSurfaceAction; class IfcStructuralSurfaceConnection; class IfcStructuralSurfaceMember; class IfcStructuralSurfaceMemberVarying; class IfcStructuralSurfaceReaction; class IfcStyleModel; class IfcStyledItem; class IfcStyledRepresentation; class IfcSubContractResource; class IfcSubContractResourceType; class IfcSubedge; class IfcSurface; class IfcSurfaceCurveSweptAreaSolid; class IfcSurfaceFeature; class IfcSurfaceOfLinearExtrusion; class IfcSurfaceOfRevolution; class IfcSurfaceReinforcementArea; class IfcSurfaceStyle; class IfcSurfaceStyleLighting; class IfcSurfaceStyleRefraction; class IfcSurfaceStyleRendering; class IfcSurfaceStyleShading; class IfcSurfaceStyleWithTextures; class IfcSurfaceTexture; class IfcSweptAreaSolid; class IfcSweptDiskSolid; class IfcSweptDiskSolidPolygonal; class IfcSweptSurface; class IfcSwitchingDevice; class IfcSwitchingDeviceType; class IfcSystem; class IfcSystemFurnitureElement; class IfcSystemFurnitureElementType; class IfcTShapeProfileDef; class IfcTable; class IfcTableColumn; class IfcTableRow; class IfcTank; class IfcTankType; class IfcTask; class IfcTaskTime; class IfcTaskTimeRecurring; class IfcTaskType; class IfcTelecomAddress; class IfcTendon; class IfcTendonAnchor; class IfcTendonAnchorType; class IfcTendonType; class IfcTessellatedFaceSet; class IfcTessellatedItem; class IfcTextLiteral; class IfcTextLiteralWithExtent; class IfcTextStyle; class IfcTextStyleFontModel; class IfcTextStyleForDefinedFont; class IfcTextStyleTextModel; class IfcTextureCoordinate; class IfcTextureCoordinateGenerator; class IfcTextureMap; class IfcTextureVertex; class IfcTextureVertexList; class IfcTimePeriod; class IfcTimeSeries; class IfcTimeSeriesValue; class IfcTopologicalRepresentationItem; class IfcTopologyRepresentation; class IfcTransformer; class IfcTransformerType; class IfcTransportElement; class IfcTransportElementType; class IfcTrapeziumProfileDef; class IfcTriangulatedFaceSet; class IfcTrimmedCurve; class IfcTubeBundle; class IfcTubeBundleType; class IfcTypeObject; class IfcTypeProcess; class IfcTypeProduct; class IfcTypeResource; class IfcUShapeProfileDef; class IfcUnitAssignment; class IfcUnitaryControlElement; class IfcUnitaryControlElementType; class IfcUnitaryEquipment; class IfcUnitaryEquipmentType; class IfcValve; class IfcValveType; class IfcVector; class IfcVertex; class IfcVertexLoop; class IfcVertexPoint; class IfcVibrationIsolator; class IfcVibrationIsolatorType; class IfcVirtualElement; class IfcVirtualGridIntersection; class IfcVoidingFeature; class IfcWall; class IfcWallElementedCase; class IfcWallStandardCase; class IfcWallType; class IfcWasteTerminal; class IfcWasteTerminalType; class IfcWindow; class IfcWindowLiningProperties; class IfcWindowPanelProperties; class IfcWindowStandardCase; class IfcWindowStyle; class IfcWindowType; class IfcWorkCalendar; class IfcWorkControl; class IfcWorkPlan; class IfcWorkSchedule; class IfcWorkTime; class IfcZShapeProfileDef; class IfcZone; class IfcAbsorbedDoseMeasure; class IfcAccelerationMeasure; class IfcAmountOfSubstanceMeasure; class IfcAngularVelocityMeasure; class IfcAreaDensityMeasure; class IfcAreaMeasure; class IfcBoolean; class IfcBoxAlignment; class IfcCardinalPointReference; class IfcComplexNumber; class IfcCompoundPlaneAngleMeasure; class IfcContextDependentMeasure; class IfcCountMeasure; class IfcCurvatureMeasure; class IfcDate; class IfcDateTime; class IfcDayInMonthNumber; class IfcDayInWeekNumber; class IfcDescriptiveMeasure; class IfcDimensionCount; class IfcDoseEquivalentMeasure; class IfcDuration; class IfcDynamicViscosityMeasure; class IfcElectricCapacitanceMeasure; class IfcElectricChargeMeasure; class IfcElectricConductanceMeasure; class IfcElectricCurrentMeasure; class IfcElectricResistanceMeasure; class IfcElectricVoltageMeasure; class IfcEnergyMeasure; class IfcFontStyle; class IfcFontVariant; class IfcFontWeight; class IfcForceMeasure; class IfcFrequencyMeasure; class IfcGloballyUniqueId; class IfcHeatFluxDensityMeasure; class IfcHeatingValueMeasure; class IfcIdentifier; class IfcIlluminanceMeasure; class IfcInductanceMeasure; class IfcInteger; class IfcIntegerCountRateMeasure; class IfcIonConcentrationMeasure; class IfcIsothermalMoistureCapacityMeasure; class IfcKinematicViscosityMeasure; class IfcLabel; class IfcLanguageId; class IfcLengthMeasure; class IfcLinearForceMeasure; class IfcLinearMomentMeasure; class IfcLinearStiffnessMeasure; class IfcLinearVelocityMeasure; class IfcLogical; class IfcLuminousFluxMeasure; class IfcLuminousIntensityDistributionMeasure; class IfcLuminousIntensityMeasure; class IfcMagneticFluxDensityMeasure; class IfcMagneticFluxMeasure; class IfcMassDensityMeasure; class IfcMassFlowRateMeasure; class IfcMassMeasure; class IfcMassPerLengthMeasure; class IfcModulusOfElasticityMeasure; class IfcModulusOfLinearSubgradeReactionMeasure; class IfcModulusOfRotationalSubgradeReactionMeasure; class IfcModulusOfSubgradeReactionMeasure; class IfcMoistureDiffusivityMeasure; class IfcMolecularWeightMeasure; class IfcMomentOfInertiaMeasure; class IfcMonetaryMeasure; class IfcMonthInYearNumber; class IfcNonNegativeLengthMeasure; class IfcNormalisedRatioMeasure; class IfcNumericMeasure; class IfcPHMeasure; class IfcParameterValue; class IfcPlanarForceMeasure; class IfcPlaneAngleMeasure; class IfcPositiveLengthMeasure; class IfcPositivePlaneAngleMeasure; class IfcPositiveRatioMeasure; class IfcPowerMeasure; class IfcPresentableText; class IfcPressureMeasure; class IfcPropertySetDefinitionSet; class IfcRadioActivityMeasure; class IfcRatioMeasure; class IfcReal; class IfcRotationalFrequencyMeasure; class IfcRotationalMassMeasure; class IfcRotationalStiffnessMeasure; class IfcSectionModulusMeasure; class IfcSectionalAreaIntegralMeasure; class IfcShearModulusMeasure; class IfcSolidAngleMeasure; class IfcSoundPowerLevelMeasure; class IfcSoundPowerMeasure; class IfcSoundPressureLevelMeasure; class IfcSoundPressureMeasure; class IfcSpecificHeatCapacityMeasure; class IfcSpecularExponent; class IfcSpecularRoughness; class IfcTemperatureGradientMeasure; class IfcTemperatureRateOfChangeMeasure; class IfcText; class IfcTextAlignment; class IfcTextDecoration; class IfcTextFontName; class IfcTextTransformation; class IfcThermalAdmittanceMeasure; class IfcThermalConductivityMeasure; class IfcThermalExpansionCoefficientMeasure; class IfcThermalResistanceMeasure; class IfcThermalTransmittanceMeasure; class IfcThermodynamicTemperatureMeasure; class IfcTime; class IfcTimeMeasure; class IfcTimeStamp; class IfcTorqueMeasure; class IfcURIReference; class IfcVaporPermeabilityMeasure; class IfcVolumeMeasure; class IfcVolumetricFlowRateMeasure; class IfcWarpingConstantMeasure; class IfcWarpingMomentMeasure; 
 
-/// IfcAbsorbedDoseMeasure is a measure of the absorbed radioactivity dose.
-/// Usually measured in Gray (Gy, J/kg).
-/// Type: REAL
+/// The actor select type allows a person, or an organization, or a person associated with an organization to be referenced.
 /// 
-/// HISTORY New type in IFC Release 2x.
-typedef double IfcAbsorbedDoseMeasure;
-/// IfcAccelerationMeasure is a measure of acceleration.
-/// Usually measured in m/s2.
-/// Type: REAL
+/// NOTE Corresponds to the following entity in ISO 10303-41: person_organization_select.
 /// 
-/// HISTORY New type in IFC Release 2x.
-typedef double IfcAccelerationMeasure;
-/// Definition from ISO/CD 10303-41:1992: An amount of substance measure is the value for the quantity  of a substance when compared with the number of atoms in 0.012kilogram of carbon 12.
+/// HISTORY New entity in IFC Release 1.5.1
 /// 
-/// Usually measure in mole (mol).
-/// Type: REAL
+/// SELECT 
 /// 
-/// NOTE Corresponding ISO 10303 name: amount_of_substance_measure, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
+/// IfcOrganization An organization. 
+/// IfcPerson A person. 
+/// IfcPersonAndOrganization A person related to an organization.
+typedef IfcUtil::IfcBaseClass IfcActorSelect;
+/// IfcAppliedValueSelect defines the selection of whether a value (expressed as a ratio) or an amount should be used as the value for an IfcAppliedValue. 
 /// 
-/// HISTORY New type in IFC Release 1.5.1.
-typedef double IfcAmountOfSubstanceMeasure;
-/// IfcAngularVelocityMeasure is a measure of the velocity of a body measured in terms of angle subtended per unit time.
-/// Usually measured in radians/s.
-/// Type: REAL
+/// Select from:  
 /// 
-/// HISTORY New type in IFC Release 2.0.
-typedef double IfcAngularVelocityMeasure;
-
-typedef double IfcAreaDensityMeasure;
-/// Definition from ISO/CD 10303-41:1992: An area measure is the value of the extent of a surface.
-/// Usually measured in square metre (m2).
-/// Type: REAL
+/// IfcMeasureWithUnit 
+///   IfcMonetaryMeasure 
+///   IfcRatioMeasure 
 /// 
-/// NOTE Corresponding ISO 10303 name: area_measure, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
+/// HISTORY: New SELECT type in IFC 2x2.
 /// 
-/// HISTORY New type in IFC Release 1.5.1.
-typedef double IfcAreaMeasure;
-/// IfcBoolean is a defined data type of simple data type Boolean. It is required since a select type (IfcSimpleValue) cannot directly include simple types in its select list.  A boolean type can have value TRUE or FALSE.
+/// Use definitions 
+/// Selecting IfcMeasureWithUnit allows the specification of both the actual figure for the value together with the currency in which the value is represented. 
+/// Selecting IfcMonetaryMeasure allows the specification only of the value, the currency being as set by the global context 
+/// Selecting IfcRatioMeasure assumes that the amount is a percentage or other REAL number. Note that if the amount is normally specified as -20%, then this figure will need to be converted to a multiplier of 0.8
+typedef IfcUtil::IfcBaseClass IfcAppliedValueSelect;
+/// Definition from ISO/CD 10303-42:1992: This select type collects together both versions of the placement as used in two dimensional or in three dimensional Cartesian space. This enables entities requiring this information to reference them without specifying the space dimensionality.  
 /// 
-/// Type: BOOLEAN
+/// NOTE: Corresponding STEP type: axis2_placement, please refer to ISO/IS 10303-42:1994, p. 19 for the final definition of the formal standard.
 /// 
-/// HISTORY New type in IFC Release 1.5.1.
-typedef bool IfcBoolean;
-/// An IfcCardinalPointReference is an index reference to
-/// significant points of a section profile. This index is used to
-/// describe the spatial relationship between the section of a member
-/// and a reference axis of the same member.
+/// HISTORY: New type in IFC Release 1.5
+typedef IfcUtil::IfcBaseClass IfcAxis2Placement;
+/// Definition from IAI: A select type for selecting between simple measure types for reinforcement bending parameters.
 /// 
-/// HISTORY  New Type in IFC2x4.
+/// HISTORY New type in IFC Release 2x4
+typedef IfcUtil::IfcBaseClass IfcBendingParameterSelect;
+/// Definition from ISO/CD 10303-42:1992: This select type identifies
+///   all those types of entities which may participate in a Boolean operation to
+///   form a CSG solid.  
+///   Definition from IAI: CSG primitives are out of scope for the
+///   current IFC Release. Only faceted B-reps, swept area solids and half space
+///   solids are available as Boolean operands. Boolean results themselves can be used
+///   as operands thus enabling nested Boolean operations. 
 /// 
-/// Indexes 1...9 refer to points at the bounding box of a
-/// profile. Indexes 10...19 refer to points defined by geometric
-/// centroid (usually centre of gravity) and shear centre, and their
-/// combinations with bounding box coordinates. In particular, the
-/// following index values are specified in this IFC Release:
+/// NOTE Corresponding STEP type:
+///   boolean_operand, please refer to ISO/IS 10303-42:1994, p.167 for the final
+///   definition of the formal standard. In IFC Release 1.5.1 & 2.0 only Boolean
+///   results (IfcBooleanResult), half space solids
+///   (IfcHalfSpaceSolid), faceted B-Rep, extruded solids and revolved solids
+///   (IfcSolidModel) are defined for being valid Boolean operands.
 /// 
-/// bottom left
-/// bottom centre
-/// bottom right
-/// mid-depth left
-/// mid-depth centre
-/// mid-depth right
-/// top left
-/// top centre
-/// top right
-/// geometric centroid
-/// bottom in line with the geometric centroid
-/// left in line with the geometric centroid
-/// right in line with the geometric centroid
-/// top in line with the geometric centroid
-/// shear centre
-/// bottom in line with the shear centre
-/// left in line with the shear centre
-/// right in line with the shear centre
-/// top in line with the shear centre
+/// HISTORY: New Type in IFC Release 1.5.1
+typedef IfcUtil::IfcBaseClass IfcBooleanOperand;
+/// IfcClassificationReferenceSelect enables selection of whether a classification reference is a subset of another classification reference or is a top level entry of a classification source. 
 /// 
-/// Other index values are possible but outside the scope of this
-/// specification.
+/// HISTORY: New Select Type in IFC2x
 /// 
-/// Figure 283 illustrates cardinal point values.
+/// Select From: 
 /// 
-/// Figure 283 — Cardinal point values
+/// IfcClassification (for classification information)  
+/// IfcClassificationReference (for reference into a classification source)
+typedef IfcUtil::IfcBaseClass IfcClassificationReferenceSelect;
+/// IfcClassificationSelect enables selection of whether a classification reference is to be referenced from an external source, or whether a classification is referenced as such.
 /// 
-/// Figure 284 illustrates an example extrusion shape with arbitrary profile (IfcArbitraryClosedProfileDef), aligned "mid-depth right" on the member axis. The line of sight follows the extrusion direction Z which points into the drawing plane of above illustration. Hence, "left" is in the positive X direction of the IfcProfileDef. "Top" is in the positive Y direction of the IfcProfileDef.
+/// NOTE  Generally, it is expected that selection will be by IfcClassificationReference to identify an individual classification notation that classifies an element in the building information model. For example an element, such as IfcTank, might be further classified by assigning an IfcClassificationReference with Identification = "L6814" and a ClassificationSource identifying the appropriate version of Uniclass.  IfcClassification should only be selected in
+/// circumstances where there could be a need to indicate the classification system that will be used without associating a notation or reference to an individual object. This may occur for higher level objects such as IfcProject, IfcSystem, or similar. For example an IfcStructuralAnalysisModel might be classified to be applicable to a particular version of EuroCode.
 /// 
-/// Figure 284 — Cardinal point extrusion
-typedef int IfcCardinalPointReference;
-/// IfcComplexNumber is a representation of a complex number expressed as an array with two elements.
-///   The first element (index 1) denotes the real component which is the numerical
-///   component of a complex number whose square roots can be calculated explicitly.
-///   The second element (index 2) denotes the imaginary component which is the numerical
-///   component of a complex number whose square roots cannot be determined other
-///   than through the provision of the square of the imaginary number j where j^2 = -1.
-///   Note that the imaginary component may be referred to as i in certain references.
+/// HISTORY  New select type in IFC2x
 /// 
-/// Type: ARRAY [1:2] OF REAL
+/// IFC2x4 CHANGE  Select renamed from IfcClassificationNotationSelect.
 /// 
-/// HISTORY New type in IFC Release 2x2.
-typedef std::vector< double > /*[1:2]*/ IfcComplexNumber;
-/// IfcCompoundPlaneAngleMeasure is a compound measure of plane angle in degrees, minutes, seconds, and optionally millionth-seconds of arc.
+/// Select from:
 /// 
-/// NOTE: IfcCompoundPlaneAngleMeasure is used where angles need to be described to an accuracy as fine as one millionth of a degree and expressed as parts of an arc. It may be used for angular measurement by surveyors or for other angular measurements where precision is required. Another usage is exact or approximate global positioning against a geographic coordinate systems using longitude and latitude.
+/// IfcClassification (for referencing a classification system)
+/// IfcClassificationReference (for referencing a classification item (or facet) inside a classification system)
+typedef IfcUtil::IfcBaseClass IfcClassificationSelect;
+/// Definition from ISO/CD 10303-46:1992: The colour entity defines a basic appearance of elements which shall be visualized in a picture.
 /// 
-/// NOTE: While the unit of measurement of the type IfcPlaneAngleMeasure depends on unit assignment (radian or degree or other derived units; globally at the IfcPoject or locally at an IfcMeasureWithUnit), the units of IfcCompoundPlaneAngleMeasure are always degrees, minutes, seconds, and millionth-seconds irrespective of unit assignments.
+/// NOTE  Corresponding STEP name: colour. It has been made into a SELECT type in IFC to avoid multiple inheritance for pre defined colour. Please refer to ISO/IS 10303-46:1994, p. 138 for the final definition of the formal standard.
 /// 
-/// HISTORY New type in IFC Release 1.5.1.
+/// HISTORY  New entity in IFC2x2.
+typedef IfcUtil::IfcBaseClass IfcColour;
+/// The IfcColourOrFactor enables the selection of either a RGB colour value or a scalar factor value for the use as values of the reflectance components.
 /// 
-/// Type: LIST [3:4] OF INTEGER
+/// HISTORY: New type in IFC2x2.
+typedef IfcUtil::IfcBaseClass IfcColourOrFactor;
+/// IfcCoordinateReferenceSystemSelect is a select between either the local engineering coordinate system, represented by the IfcGeometricRepresentationContext, or another coordinate reference system, represented by IfcCoordinateReferenceSystem, to be the source of a coordinate operation.
 /// 
-/// Value restrictions
+/// HISTORY  New select type in IFC2x4.
+typedef IfcUtil::IfcBaseClass IfcCoordinateReferenceSystemSelect;
+/// Definition from ISO/CD 10303-42:1992: This type identifies the types of entity which may be selected as the root of a CSG tree including a single CSG primitive as a special case.
+/// Definition from IAI: The IfcBooleanResult, and subtypes of IfcCsgPrimitive3D are defined as potential root tree expression (at IfcCsgSolid). A subtype of IfcCsgPrimitive3D marks the special case of a CSG solid solely expressed by a single primitive.
 /// 
-/// The first integer measure is the number of degrees and is generally not range-restricted.  However, when IfcCompoundPlaneAngleMeasure is used to express geographic coordinates, only latitudes of [-90, 90] and longitudes of [-180, 180] are used in practice.
-/// The second integer measure is the number of minutes and shall be in the range (-60, 60).
-/// The third integer measure is the number of seconds and shall be in the range (-60, 60).
-/// The optional fourth integer measure is the number of millionth-seconds and shall be in the range (-1 000 000, 1 000 000).
+/// NOTE Corresponding ISO 10303-42 type: csg_select, please refer to ISO/IS 10303-42:1994, p.168 for the final definition of the formal standard.
 /// 
-/// Signedness
+/// HISTORY New Type in IFC Release 1.5.1.
+typedef IfcUtil::IfcBaseClass IfcCsgSelect;
+/// Definition from ISO/CD 10303-46:1992: The curve font or scaled curve font select is a selection of either a curve font style select (being either a predefined curve font or an explicitly defined curve font) or a curve style font and scaling. 
 /// 
-/// All measure components have the same sign (positive or negative).  It is therefore trivial to convert between floating point representation (decimal degrees) and compound representation regardless whether the angle is greater or smaller than zero.  Example:
+/// NOTE Corresponding ISO 10303 name: curve_font_or_scaled_curve_font_select. Please refer to ISO/IS 10303-46:1994 for the final definition of the formal standard.
 /// 
-/// LOCAL
-///   a : IfcPlaneAngleMeasure := -50.975864;  (* decimal degrees, -50° 58' 33" 110400 *)
-///   b : IfcPlaneAngleMeasure;
-///   c : IfcCompoundPlaneAngleMeasure;
-///   s : IfcText;
-/// END_LOCAL;
+/// HISTORY New entity in IFC2x2.
+typedef IfcUtil::IfcBaseClass IfcCurveFontOrScaledCurveFontSelect;
+
+typedef IfcUtil::IfcBaseClass IfcCurveOnSurface;
+/// IfcCurveOrEdgeCurve provides the option to either select a geometric curve (IfcCurve
+/// and subtypes) within a geometric model, or a curve with associated geometry and coordinates (IfcEdgeCurve) within a topological model.
+/// SELECT 
 /// 
-/// (* convert from float to compound *)
-///   c[1] :=    a;                                           -- -50
-///   c[2] :=   (a - c[1]) * 60;                              -- -58
-///   c[3] :=  ((a - c[1]) * 60 - c[2]) * 60;                 -- -33
-///   c[4] := (((a - c[1]) * 60 - c[2]) * 60 - c[3]) * 1.e6;  -- -110400
+/// IfcCurve
+///   IfcEdgeCurve
 /// 
-/// (* convert from compound to float *)
-///   b := c[1] + c[2]/60. + c[3]/3600. + c[4]/3600.e6;       -- -50.975864
+/// HISTORY  New select type in IFC2x Edition 3.
+typedef IfcUtil::IfcBaseClass IfcCurveOrEdgeCurve;
+/// Definition from ISO/CD 10303-46:1992: The curve style font select is a selection of a curve style font or a predefined curve style font. 
 /// 
-/// Use in string representations
+/// NOTE Corresponding ISO 10303 name: curve_style_font_select. Please refer to ISO/IS 10303-46:1994 for the final definition of the formal standard.
 /// 
-/// When a compound plane angle measure is formatted for display or printout, the signs of the fractional components will usually be discarded because, to a human reader, the sign of the first component alone already indicates the sense of the angle:
+/// HISTORY New entity in IFC2x2.
+typedef IfcUtil::IfcBaseClass IfcCurveStyleFontSelect;
+/// IfcDefinitionSelect provides the option to either select an object or type object IfcObjectDefinition, or a property set template or property set, IfcPropertyDefinition.
+/// SELECT
 /// 
-/// (* convert from compound to human-readable string *)
-///   s := FORMAT(c[1], '+##')     + "000000B0"
-///      + FORMAT(ABS(c[2]), '##') + ''''
-///      + FORMAT(ABS(c[3]), '##') + '"'
-///      + FORMAT(ABS(c[4]), '##');  -- -50° 58' 33" 110400
+/// IfcObjectDefinition,
+/// IfcPropertyDefinition
 /// 
-/// Another often encountered display format of latitudes and longitudes is to omit the signs and print N, S, E, W indicators instead, for example, 50°58'33"S.  When stored as IfcCompoundPlaneAngleMeasure however, a compound plane angle measure is always signed, with same sign of all components.
-typedef std::vector< int > /*[3:4]*/ IfcCompoundPlaneAngleMeasure;
-/// Definition from ISO/CD 10303-41:1992: Is the value of a physical quantity as defined by an application context.
-/// Type: REAL
+/// HISTORY  New select type in IFC2x4.
+typedef IfcUtil::IfcBaseClass IfcDefinitionSelect;
+/// IfcDerivedMeasureValue is a select type for selecting between derived measure types.
 /// 
-/// NOTE Corresponding ISO 10303 name: context_dependent_measure, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
+/// SELECT 
 /// 
-/// HISTORY New type in IFC Release 1.5.1.
-typedef double IfcContextDependentMeasure;
-/// Definition from ISO/CD 10303-41:1992: A count measure is the value of a count.
-/// Type: NUMBER
+/// IfcAbsorbedDoseMeasure 
+///   IfcAccelerationMeasure 
+///   IfcAngularVelocityMeasure 
+///   IfcCompoundPlaneAngleMeasure 
+///   IfcDoseEquivalentMeasure 
+///   IfcDynamicViscosityMeasure 
+///   IfcElectricCapacitanceMeasure 
+///   IfcElectricChargeMeasure 
+///   IfcElectricConductanceMeasure 
+///   IfcElectricResistanceMeasure 
+///   IfcElectricVoltageMeasure 
+///   IfcEnergyMeasure 
+///   IfcForceMeasure 
+///   IfcFrequencyMeasure 
+///   IfcHeatFluxDensityMeasure 
+///   IfcIlluminanceMeasure 
+///   IfcInductanceMeasure 
+///   IfcIntegerCountRateMeasure 
+///   IfcIsothermalMoisturecapacityMeasure 
+///   IfcKinematicViscosityMeasure 
+///   IfcLinearForceMeasure 
+///   IfcLinearMomentMeasure  
+///   IfcLinearStiffnessMeasure 
+///   IfcLinearVelocityMeasure 
+///   IfcLuminousFluxMeasure 
+///   IfcMagneticFluxDensityMeasure 
+///   IfcMagneticFluxMeasure 
+///   IfcMassDensityMeasure 
+///   IfcMassFlowRateMeasure 
+///   IfcModulusOfElasticityMeasure 
+///   IfcModulusOfSubgradeReactionMeasure 
+///   IfcMoistureDiffusivityMeasure 
+///   IfcMolecularWeightMeasure 
+///   IfcMomentOfInertiaMeasure  
+///   IfcMonetaryMeasure 
+///   IfcPlanarForceMeasure 
+///   IfcPowerMeasure 
+///   IfcPressureMeasure 
+///   IfcRadioActivityMeasure 
+///   IfcRotationalFrequencyMeasure 
+///   IfcRotationalStiffnessMeasure 
+///   IfcShearModulusMeasure 
+///   IfcSpecificHeatCapacityMeasure 
+///   IfcThermalAdmittanceMeasure 
+///   IfcThermalConductivityMeasure 
+///   IfcThermalResistanceMeasure 
+///   IfcThermalTransmittanceMeasure 
+///   IfcTimeStamp 
+///   IfcTorqueMeasure 
+///   IfcVaporPermeabilityMeasure 
+///   IfcVolumetricFlowRateMeasure 
+///   IfcCurvatureMeasure 
+///   IfcMassPerLengthMeasure 
+///   IfcRotationalMassMeasure 
+///   IfcSectionalAreaIntegralMeasure 
+///   IfcSectionModulusMeasure 
+///   IfcTemperatureGradientMeasure 
+///   IfcTemperatureRateOfChangeMeasure 
+///   IfcWarpingConstantMeasure 
+///   IfcWarpingMomentMeasure 
+///   IfcThermalExpansionCoefficientMeasure 
+///   IfcModulusOfLinearSubgradeReactionMeasure 
+///   IfcModulusOfRotationalSubgradeReactionMeasure 
+///   IfcLuminousIntensityDistributionMeasure 
+///   IfcSoundPowerMeasure 
+///   IfcSoundPressureMeasure 
 /// 
-/// NOTE Corresponding ISO 10303 name: count_measure, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
+/// HISTORY New type in IFC Release 2x.
 /// 
-/// HISTORY New type in IFC Release 1.5.1.
-typedef double IfcCountMeasure;
-/// IfcCurvatureMeasure is a measure for curvature, which is defined as the change of slope per length.
-///   This is typically a computed value in structural analysis.
-///   It is usually measured in rad/m.
+/// IFC2x4 change: added IfcTemperatureRateOfChangeMeasure.
+typedef IfcUtil::IfcBaseClass IfcDerivedMeasureValue;
+/// IfcDocumentSelect enables selection of whether document information is to be contained within an IFC model or is to be referenced from an external source. 
 /// 
-/// Type: REAL
+/// HISTORY: New Select Type in IFC 2x
 /// 
-/// HISTORY New type in IFC2x2.
-typedef double IfcCurvatureMeasure;
-/// The lexical representation for date is the reduced (right truncated) lexical representation for dateTime: CCYY-MM-DD. No left truncation is allowed. An optional following time zone qualifier is allowed as for dateTime. To accommodate year values outside the range from 0001 to 9999, additional digits can be added to the left of this representation and a preceding "-" sign is allowed.
+/// Select From: 
 /// 
-/// HISTORY: New type in IFC2x4
+/// IfcDocumentInformation (for "metadata" of an external document)  
+/// IfcDocumentReference (for reference within a document)
+typedef IfcUtil::IfcBaseClass IfcDocumentSelect;
+/// Definition from ISO/CD 10303-46:1992: The fill style select is a selection between different fill area styles.
 /// 
-/// Use definitions
-/// All given values should be provided in context and converted into a Gregorian date context and be shall be processable by a receiving application.
-typedef std::string IfcDate;
-/// This lexical representation is the [ISO 8601] extended
-///   format CCYY-MM-DDThh:mm:ss where "CC" represents the
-///   century, "YY" the year, "MM" the month and "DD" the day,
-///   preceded by an optional leading "-" sign to indicate a
-///   negative number. If the sign is omitted, "+" is assumed.
-///   The letter "T" is the date/time separator and "hh", "mm",
-///   "ss" represent hour, minute and second respectively.
-///   Additional digits can be used to increase the precision of
-///   fractional seconds if desired i.e the format ss.ss... with
-///   any number of digits after the decimal point is supported.
-///   The fractional seconds part is optional; other parts of the
-///   lexical form are not optional. To accommodate year values
-///   greater than 9999 additional digits can be added to the
-///   left of this representation. Leading zeros are required if
-///   the year value would otherwise have fewer than four digits;
-///   otherwise they are forbidden. The year 0000 is prohibited.
+/// NOTE Corresponding ISO 10303 name: fill_style_select. Please refer to ISO/IS 10303-46:1994 for
+/// the final definition of the formal standard.
 /// 
-/// HISTORY: New type in IFC2x4
-typedef std::string IfcDateTime;
-/// Definition from IAI: The IfcDayInMonthNumber is
-/// an integer that defines the position of the specified day in a
-/// month.
-/// Type: INTEGER
-/// NOTE Corresponding STEP
-/// name: day_in_month_number, please refer to ISO/IS 10303-41:1994
-/// for the final definition of the formal
-/// standard.
-/// HISTORY New type in IFC
-/// Release 1.5.1.
-/// IFC2x4 CHANGE Where rule
-/// ValidRange added.
-typedef int IfcDayInMonthNumber;
-/// Definition from IAI: The IfcDayInWeekNumber is
-/// an integer that defines the position of the specified day in a
-/// week. The positions have the following meaning (according to
-/// ISO8601 "the calendar week") that assigns the ordinal day number
-/// in the week to the Calender day name.
+/// HISTORY New type in IFC2x2.
+typedef IfcUtil::IfcBaseClass IfcFillStyleSelect;
+/// Definition from ISO/CD 10303-42:1992: This select type identifies the types of entities which can occur in a geometric set. 
 /// 
-/// Ordinal day number
-/// Calendar day
-/// name
+/// NOTE: Corresponding ISO 10303 type: geometric_set_select. Please refer to ISO/IS 10303-42:1994, p. 169 for the final definition of the formal standard.
 /// 
-/// 01
-/// Monday
+/// HISTORY: New type in IFC Release 2x.
+typedef IfcUtil::IfcBaseClass IfcGeometricSetSelect;
+/// IfcGridPlacementDirectionSelect enables the choice of defining a grid placement be either an explicit direction, or by referencing a second grid intersection to provide the direction.
 /// 
-/// 02
-/// Tuesday
+/// SELECT
 /// 
-/// 03
-/// Wednesday
+/// IfcDirection,
+/// IfcVirtualGridIntersection
 /// 
-/// 04
-/// Thursday
+/// HISTORY  New select type in IFC2x4.
+typedef IfcUtil::IfcBaseClass IfcGridPlacementDirectionSelect;
+/// The IfcHatchLineDistanceSelect is a selection between different ways to determine the distance and potentially start point of hatch lines, either by an offset distance length measure or by a vector.
 /// 
-/// 05
-/// Friday
+/// HISTORY  New type in IFC2x3.
+typedef IfcUtil::IfcBaseClass IfcHatchLineDistanceSelect;
+/// Definition from ISO/CD 10303-46:1992: The layered things type selects those things, which can be grouped in layers. 
 /// 
-/// 06
-/// Saturday
+/// It is the collection of all those items, that are assigned to a single layer. These items are representation items or complete representations (IfcRepresentationItem, IfcRepresentation). If an IfcRepresentation is referenced, all IfcRepresentationItem within its set of Items are assigned to the same layer. 
 /// 
-/// 07
-/// Sunday
+/// NOTE: Corresponding ISO 10303 name: layered_item. It was called layered_things in the ISO/CD version and had been renamed to layered_item in the ISO/IS final version. Please refer to ISO/IS 10303-46:1994, p. 13 for the final definition of the formal standard.
 /// 
-/// Type: INTEGER
-/// HISTORY New type in
-/// IFC2x4.
-typedef int IfcDayInWeekNumber;
-/// Definition from ISO/CD 10303-41:1992: A descriptive measure is a human interpretable definition of a quantifiable value.
-/// Type: STRING
+/// HISTORY: New type in IFC2x2.
+typedef IfcUtil::IfcBaseClass IfcLayeredItem;
+/// IfcLibrarySelect enables selection of whether library information is to be contained within an IFC model or is to be referenced from an external source. 
 /// 
-/// NOTE Corresponding ISO 10303 name:descriptive_measure, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
+/// HISTORY: New Select Type in IFC2x
 /// 
-/// HISTORY New type in IFC Release 1.5.1.
-typedef std::string IfcDescriptiveMeasure;
-/// Definition from ISO/CD 10303-42:1992: A dimension count is a positive integer used to define the coordinate space dimensionality.  
+/// Select From: 
 /// 
-/// The IfcDimensionCount is restricted to have the dimensionality of either 1, 2, or 3 - the WR1 had been added as an addition to the ISO 10303:42 entity dimension_count. In contrary to the ISO 10303:42 constraint, that all geometric representation items within a geometric representation context are forced to have the same dimension count, the IFC geometry allows mixed dimensions, particularly when defining the boundary of planar surfaces.  
+/// IfcLibraryInformation (for library information)  
+/// IfcLibraryReference (for reference into a library of information by location)  
 /// 
-/// NOTE Corresponding ISO 10303 type: dimension_count, please refer to ISO/IS 10303-42:1994, p. 14 for the final definition of the formal standard.
+/// Generally, it is expected that selection will be IfcLibraryReference and only rarely IfcLibraryInformation. IfcLibraryInformation should only be selected in circumstances where there could be a need to indicate the libraries that will be used without making individual references. This may occur for higher level objects such as a project or building.
+typedef IfcUtil::IfcBaseClass IfcLibrarySelect;
+/// A goniometric light gets its intensity distribution function (how much light goes in any one direction) from one of two sources: (i) an industry-standard file, (ii) from distribution data passed directly via the IfcLightIntensityDistribution. 
 /// 
-/// HISTORY New Type in IFC Release 1.5
-typedef int IfcDimensionCount;
-/// IfcDoseEquivalentMeasure is a measure of the radioactive dose equivalent.
-/// Usually measured in Sievert (Sv, J/kg).
-/// Type: REAL
+/// The light distribution provides the luminous intensity distribution according to some standardized light distribution curves. 
 /// 
-/// HISTORY New type in IFC Release 2x.
-typedef double IfcDoseEquivalentMeasure;
-/// String representation of a time duration according to ISO8601:2000 "Data elements and interchange formats - Information interchange - Representation of dates and times" as defined in section 5.5.3 "Representation of duration".
-/// It is recommended to use the alternative format (section 5.5.4.2.2) in its extended version: PYYYY-MM-DDThh:mm:ss.
-/// EXAMPLE: P0002-10-15T10:30:20 (duration of two years, 10 months, 15 days, 10 hours, 30 minutes and 20 seconds).
+/// Select: 
 /// 
-/// HISTORY: New type in IFC2x4
-typedef std::string IfcDuration;
-/// IfcDynamicViscosityMeasure is a measure of the viscous resistance of a medium.
+/// Type 
+///   Definition 
 /// 
-/// Usually measured in Pascal second (Pa s).
-/// Type: REAL 
+/// IfcExternalReference 
+///   Light distribution is represented by a standard photometric data file such as Eulumdat, IES, CIBSE TM14.  
 /// 
-/// HISTORY New type in IFC Release 2.0.
-typedef double IfcDynamicViscosityMeasure;
-/// IfcElectricCapacitanceMeasure is a measure of the electric capacitance.
-/// Usually measured in Farad (F, C/V = A s/V).
-/// Type: REAL
+/// IfcLightIntensityDistribution 
+///   For representing a light distribution directly the
+///   following values needs to be given in a table like structure with column and
+///   row headings. These headings should contain the angles (C/&#947; or B/&#946; )
+///   and the table body contains the intensity values, (normally normalized to
+///   cd/Klm). The angles can be non- equidistant and the angle steps can be almost
+///   any value in the valid range, so a list of all available angles in both
+///   directions covers all cases.  
 /// 
-/// HISTORY New type in IFC Release 2x.
-typedef double IfcElectricCapacitanceMeasure;
-/// IfcElectricChargeMeasure is a measure of the electric charge.
-/// Usually measured in Coulomb (C, A s).
-/// Type: REAL
+/// HISTORY New type in IFC2x2.
+typedef IfcUtil::IfcBaseClass IfcLightDistributionDataSourceSelect;
+/// IfcMaterialSelect provides selection of either a material
+/// definition or a material usage definition that can be assigned to
+/// an element, a resource or another entity within IFC.
+/// SELECT
 /// 
-/// HISTORY New type in IFC Release 2x.
-typedef double IfcElectricChargeMeasure;
-/// IfcElectricConductanceMeasure is a measure of the electric conductance.
-/// Usually measured in Siemens (S, 1/Ohm = A/V).
-/// Type: REAL
+/// IfcMaterialDefinition
 /// 
-/// HISTORY New type in IFC Release 2x.
-typedef double IfcElectricConductanceMeasure;
-/// Definition from ISO/CD 10303-41:1992: The value for the movement of electrically charged particles.
-/// Usually measured in Ampere (A).
-/// Type: REAL
+/// IfcMaterial
+/// IfcMaterialLayer
+/// IfcMaterialLayerSet
+/// IfcMaterialProfile
+/// IfcMaterialProfileSet
+/// IfcMaterialConstituent
+/// IfcMaterialConstituentSet
 /// 
-/// NOTE Corresponding ISO 10303 name: electric_current_measure, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
+/// IfcMaterialUsageDefinition
 /// 
-/// HISTORY New type in IFC Release 1.5.1.
-typedef double IfcElectricCurrentMeasure;
-/// IfcElectricResistanceMeasure is a measure of the electric resistance.
-/// Usually measured in Ohm (V/A).
-/// Type: REAL
+/// IfcMaterialLayerSetUsage
+/// IfcMaterialProfileSetUsage
 /// 
-/// HISTORY New type in IFC Release 2x.
-typedef double IfcElectricResistanceMeasure;
-/// IfcElectricVoltageMeasure is a measure of electromotive force.
-/// Usually measured in Volts (V, W/A).
-/// Type: REAL
+/// IfcMaterialList
 /// 
-/// HISTORY New type in IFC Release 2.0.
-typedef double IfcElectricVoltageMeasure;
-/// IfcEnergyMeasure is a measure of energy required or used.
-/// Usually measured in Joules, (J, Nm).
-/// Type: REAL
+/// HISTORY New select in IFC 1.0
 /// 
-/// HISTORY New type in IFC Release 2.0.
-typedef double IfcEnergyMeasure;
-/// Definition from CSS1 (W3C Recommendation): The font-style property selects between normal (sometimes
-/// referred to as "roman" or "upright"), italic and oblique faces within a font family. Values are:
+/// IFC2x4 CHANGE The select now includes two new abstract entities IfcMaterialDefinition
+/// and IfcMaterialUsageDefinition with upward compatibility.  The use of IfcMaterialList is deprecated from IFC2x4 onwards.
+typedef IfcUtil::IfcBaseClass IfcMaterialSelect;
+/// Definition from ISO/CD 10303-41:1992: A measure value is a value as defined in ISO 31-0 (clause 2).
 /// 
-/// normal 
-///   italic 
-///   oblique
+/// NOTE IfcMeasureValue is a select data type for most basic measure types coming from ISO 10303-41.  Select item IfcNonNegativeLengthMeasure is in addition to ISO 10303-41.
 /// 
-/// A value of 'normal' selects a font that is classified as 'normal' in the user agents font database, while 'oblique' selects a font that is labeled 'oblique'. A value of 'italic' selects a font that is labeled 'italic', or, if that is not available, one labeled 'oblique'. The font that is labeled 'oblique' in the user agents font database may actually have been generated by electronically slanting a normal font.
+/// NOTE Corresponding ISO 10303 name: measure_value, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
 /// 
-/// Fonts with Oblique, Slanted or Incline in their names will typically be labeled 'oblique' in the user agents font database. Fonts with Italic, Cursive or Kursiv in their names will typically be labeled 'italic'.
+/// HISTORY New type in IFC Release 1.5.1.
 /// 
-/// NOTE  Corresponding CSS1 definitions is font-style.
+/// IFC 2x4 change: added IfcNonNegativeLengthMeasure
+typedef IfcUtil::IfcBaseClass IfcMeasureValue;
+/// IfcMetricValueSelect is a select type that enables selection of the data type for the value component of an IfcMetric. 
 /// 
-/// HISTORY  New type in IFC2x3.
-typedef std::string IfcFontStyle;
-/// Definition from CSS1 (W3C Recommendation): The font-style property selects between normal and small-caps within a font family. Values are:
+/// HISTORY: New type in IFC Release 2.0
 /// 
-/// normal 
-///   small-caps 
+/// Select 
 /// 
-/// Another type of variation within a font family is the small-caps. In a small-caps font the lower case letters look similar to the uppercase ones, but in a smaller size and with slightly different proportions. The 'font-variant' property selects that font.
+/// IfcCostValue
+///   IfcDateTime 
+///   IfcMeasureWithUnit 
+///   IfcTable 
+///   IfcText 
+///   IfcTimeSeries
+typedef IfcUtil::IfcBaseClass IfcMetricValueSelect;
+/// Definition from IAI: A measure for modulus of rotational subgrade reaction which expresses the rotational bedding of a structural curve item per length.  TRUE denotes infinite stiffness (rigidity).  FALSE denotes no stiffness (a release).  A numeric value denotes finite linear-elastic stiffness.
 /// 
-/// A value of 'normal' selects a font that is not a small-caps font, 'small-caps' selects a small-caps font. It is acceptable (but not required) in CSS1 if the small-caps font is a created by taking a normal font and replacing the lower case letters by scaled uppercase characters. As a last resort, uppercase letters will be used as replacement for a small-caps font.
+/// HISTORY: New type in IFC 2x4.
+typedef IfcUtil::IfcBaseClass IfcModulusOfRotationalSubgradeReactionSelect;
+/// Definition from IAI: Bedding measure which expresses the bedding of a structural face item per area.  TRUE denotes infinite stiffness (rigidity).  FALSE denotes no stiffness (a release).  A numeric value denotes finite linear-elastic stiffness.
 /// 
-/// NOTE  Corresponding CSS1 definitions is font-variant.
+/// HISTORY: New type in IFC 2x4.
+typedef IfcUtil::IfcBaseClass IfcModulusOfSubgradeReactionSelect;
+/// Definition from IAI: A measure for modulus of translational subgrade reaction which expresses the translational bedding of a structural curve item per length.  TRUE denotes infinite stiffness (rigidity).  FALSE denotes no stiffness (a release).  A numeric value denotes finite linear-elastic stiffness.
 /// 
-/// HISTORY  New type in IFC2x3.
-typedef std::string IfcFontVariant;
-/// Definition from CSS1 (W3C Recommendation): The 'font-weight' property selects the weight of the font. The values '100' to '900' form an ordered sequence, where each number indicates a weight that is at least as dark as its predecessor. The keyword 'normal' is synonymous with '400', and 'bold' is synonymous with '700'. Keywords other than 'normal' and 'bold' have been shown to be often confused with font names and a numerical scale was therefore chosen for the 9-value list. Values are:
+/// HISTORY: New type in IFC 2x4.
+typedef IfcUtil::IfcBaseClass IfcModulusOfTranslationalSubgradeReactionSelect;
+/// IfcObjectReferenceSelect is a select type, that holds a list of resource level entities that can be used as properties within a property set. 
 /// 
-/// normal 
-///   bold 
-///   100 | 200 | 300 | 400 | 500 | 600 | 700 | 800 | 900
+/// HISTORY  New select type in IFC Release 2.0.
+typedef IfcUtil::IfcBaseClass IfcObjectReferenceSelect;
+/// IfcPointOrVertexPoint provides the option to either select a geometric point (IfcPoint and subtypes) within a geometric model, or a vertex with associated point coordinates (IfcVertexPoint) within a topological model.
+/// SELECT 
 /// 
-/// Fonts (the font data) typically have one or more properties whose values are names that are descriptive of the "weight" of a font. There is no accepted, universal meaning to these weight names. Their primary role is to distinguish faces of differing darkness within a single font family. Usage across font families is quite variant; for example a font that you might think of as being bold might be described as being Regular, Roman, Book, Medium, Semi- or DemiBold, Bold, or Black, depending on how black the "normal" face of the font is within the design. Because there is no standard usage of names, the weight property values in CSS1 are given on a numerical scale in which the value '400' (or 'normal') corresponds to the "normal" text face for that family. The weight name associated with that face will typically be Book, Regular, Roman, Normal or sometimes Medium.
+/// IfcPoint, 
+///   IfcVertexPoint
 /// 
-/// The association of other weights within a family to the numerical weight values is intended only to preserve the ordering of darkness within that family. However, the following heuristics tell how the assignment is done in typical cases:
+/// HISTORY  New select type in IFC2x Edition 3.
+typedef IfcUtil::IfcBaseClass IfcPointOrVertexPoint;
+/// Definition from ISO/CD 10303-46:1992: The presentation style select is a selection of one of many kinds of styles, a different one for each kind of geometric representation item to be styled.
 /// 
-/// If the font family already uses a numerical scale with nine values (such as with OpenType), the font weights should be mapped directly. 
-///   If there is both a face labeled Medium and one labeled Book, Regular, Roman or Normal, then the Medium is normally assigned to the '500'. 
-///   The font labeled "Bold" will often correspond to the weight value '700'. 
-///   If there are fewer then 9 weights in the family, the default algorithm for filling the "holes" is as follows. If '500' is unassigned, it will be assigned the same font as '400'. If any of the values '600', '700', '800' or '900' remains unassigned, they are assigned to the same face as the next darker assigned keyword, if any, or the next lighter one otherwise. If any of '300', '200' or '100' remains unassigned, it is assigned to the next lighter assigned keyword, if any, or the next darker otherwise. 
+/// NOTE Corresponding ISO 10303 name: presentation_style_Select. Please refer to ISO/IS
+/// 10303-46:1994 for the final definition of the formal standard.
 /// 
-/// The following two examples illustrate the process. Assume four weights in the "Example1" family, from lightest to darkest: Regular, Medium, Bold, Heavy. And assume six weights in the "Example2" family: Book, Medium, Bold, Heavy, Black, ExtraBlack. Note how in the second example it has been decided not to assign "Example2 ExtraBlack" to anything.
+/// HISTORY New type in IFC2x2.
 /// 
-/// Available faces       | Assignments   | Filling the holes----------------------+---------------+-------------------"Example1 Regular"    | 400           | 100, 200, 300"Example1 Medium"     | 500           |"Example1 Bold"       | 700           | 600"Example1 Heavy"      | 800           | 900
-/// Available faces       | Assignments   | Filling the holes----------------------+---------------+-------------------"Example2 Book"       | 400           | 100, 200, 300"Example2 Medium"     | 500           |"Example2 Bold"       | 700           | 600 "Example2 Heavy"      | 800           |"Example2 Black"      | 900           |"Example2 ExtraBlack" | (none)        |
+/// IFC2x4 CHANGE The select type has been deprecated.
+typedef IfcUtil::IfcBaseClass IfcPresentationStyleSelect;
+/// IfcProcessSelect provides the option to either
+///   select a process or activity occurrence, IfcProcess,
+///   or a process or activity type, IfcTypeProcess.
+///   SELECT
 /// 
-/// NOTE  Corresponding CSS1 definitions is font-weight.
+/// IfcProcess,
 /// 
-/// HISTORY  New type in IFC2x2 Addendum 2.
-typedef std::string IfcFontWeight;
-/// IfcForceMeasure is a measure of the force.
-/// Usually measured in Newton (N, kg m/s2).
-/// Type: REAL
+/// IfcTypeProcess
 /// 
-/// HISTORY New type in IFC Release 2x.
-typedef double IfcForceMeasure;
-/// IfcFrequencyMeasure is a measure of the number of times that an item vibrates in unit time.
-/// Usually measured in cycles/s or Herz (Hz).
-/// Type: REAL
-/// 
-/// HISTORY New type in IFC Release 2.0.
-typedef double IfcFrequencyMeasure;
-/// An IfcGloballyUniqueId holds an encoded string identifier that is used to uniquely identify an IFC object. An IfcGloballyUniqueId is a Globally
-///   Unique Identifier (GUID) which is an auto-generated 128-bit number. Since this identifier is
-///   required for all IFC object instances, it is desirable to compress it to reduce overhead. The encoding of the base 64 character set is shown below:
-/// 
-///            1         2         3         4         5         6
-/// 
-///  0123456789012345678901234567890123456789012345678901234567890123
-/// 
-/// "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz_$";
+/// HISTORY  New select type in IFC2x4.
+typedef IfcUtil::IfcBaseClass IfcProcessSelect;
+
+typedef IfcUtil::IfcBaseClass IfcProductRepresentationSelect;
+/// IfcProductSelect provides the option to either select a
+/// product occurrence, IfcProduct, or a product type,
+/// IfcTypeProduct.
+/// SELECT
 /// 
-/// The resulting string is a fixed 22 character length string to be exchanged within the IFC exchange file structure.
+/// IfcProduct,
+/// IfcTypeProduct
 /// 
-/// Refer to the BuildingSMART website (www.buildingsmart-tech.org) for more information and sample encoding algorithms.
+/// HISTORY  New select type in IFC2x4.
+typedef IfcUtil::IfcBaseClass IfcProductSelect;
+
+typedef IfcUtil::IfcBaseClass IfcPropertySetDefinitionSelect;
+/// IfcResourceObjectSelect enables selection of resource level objects that are to be related to an resource level relationship object. The use of IfcResourceObjectSelect includes the ability to assign an external reference entity (library, classification, or documentation reference) to entities within the resource level.
 /// 
-/// HISTORY  New type in IFC R1.5.1.
-typedef std::string IfcGloballyUniqueId;
-/// IfcHeatFluxDensityMeasure is a measure of the density of heat flux within a body.
-/// Usually measured in W/m2 (J/s m2).
-/// Type: REAL
+/// HISTORY  New Select type in IFC2x4.
+typedef IfcUtil::IfcBaseClass IfcResourceObjectSelect;
+/// IfcResourceSelect provides the option to either select a
+/// resource occurrence, IfcResource, or a resource type,
+/// IfcTypeResource.
+/// SELECT
 /// 
-/// HISTORY New type in IFC Release 2.0.
-typedef double IfcHeatFluxDensityMeasure;
-/// IfcHeatingValueMeasure defines the amount of energy released (usually in MJ/kg) when a fuel is burned.
+/// IfcResource,
+/// IfcTypeResource
 /// 
-/// HISTORY: This is new type in IFC2x2.
-typedef double IfcHeatingValueMeasure;
-/// Definition from ISO/CD 10303-41:1992: An identifier is an alphanumeric string which allows an individual thing to be identified. It may not provide natural-language meaning.
+/// HISTORY  New select type in IFC2x4.
+typedef IfcUtil::IfcBaseClass IfcResourceSelect;
+/// Definition from IAI: A measure of rotational stiffness.  TRUE denotes infinite stiffness (rigidity).  FALSE denotes no stiffness (a release).  A numeric value denotes finite linear-elastic stiffness.
 /// 
-/// Type: STRING of up to 255 characters
+/// HISTORY: New type in IFC 2x4.
+typedef IfcUtil::IfcBaseClass IfcRotationalStiffnessSelect;
+/// Definition from ISO/CD 10303-42:1992 This type collects together, for reference when constructing more complex models, the subtypes which have the characteristics of a shell. A shell is a connected object of fixed dimensionality d = 0; 1; or 2, typically used to bound a region. The domain of a shell, if present, includes its bounds and 0 £ X < ¥.  
 /// 
-/// NOTE Corresponding STEP name: identifier, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
+/// A shell of dimensionality 0 is represented by a graph consisting of a single vertex. The vertex shall not have any associated edges. 
+/// A shell of dimensionality 1 is represented by a connected graph of dimensionality 1. 
+/// A shell of dimensionality 2 is a topological entity constructed by joining faces along edges. Its domain, if present, is a connected, orientable 2-manifold with boundary, that is, a connected, oriented, finite, non-self-intersecting surface, which may be closed or open. 
 /// 
-/// HISTORY New type in IFC Release 2x.
-/// IFC 2x4 CHANGE: Previously recommended size restriction of 255 characters is now mandatory.
+/// Shells of dimensionality 0 and 1 are not part of the current IFC release. 
 /// 
-/// As a merely machine-readable string for identification purposes, an identifier is usually machine-generated and locale-independent (in contrast to human-readable labels, IfcLabel).
+/// NOTE  Corresponding ISO 10303 type: shell. Please refer to ISO/IS 10303-42:1994, p. 127 for the final definition of the formal standard. Only the select items closed_shell (IfcClosedShell) and open_shell (IfcOpenShell) have been incorporated in the current IFC release. 
 /// 
-/// Per ISO 10303-11, the set of characters that may appear in STRINGs is defined in ISO 10646.  The encoding of characters in case of file-based exchange is defined in ISO 10303-21 (STEP physical files) and ISO 10303-28 (XML files).  Among else, these specifications define the encoding of 8-bit characters from ISO 8859-1...-16 and of 2-byte Unicode characters.
+/// HISTORY  New type in IFC2x.
+typedef IfcUtil::IfcBaseClass IfcShell;
+/// IfcSimpleValue is a select type for selecting between simple value types.
 /// 
-/// Note that while IfcIdentifier is restricted to 255 characters, the size in exchange files after encoding may be considerably larger than 255 octets, depending on the particular encoding and on the contents of the identifier.
-typedef std::string IfcIdentifier;
-/// IfcIlluminanceMeasure is a measure of the illuminance.
-/// Usually measured in Lux (lx, Lumen/m2 = Candela Steradian/m2).
-/// Type: REAL
+/// SELECT 
 /// 
-/// HISTORY New type in IFC Release 2x.
-typedef double IfcIlluminanceMeasure;
-/// IfcInductanceMeasure is a measure of the inductance.
-/// Usually measure in Henry (H, Weber/A = V s/A).
-/// Type: REAL
+/// IfcInteger: Defined type of simple type INTEGER. 
+///   IfcReal: Defined type of simple type REAL. 
+///   IfcBoolean: Defined type of simple type BOOLEAN. 
+///   IfcLogical: Defined type of simple type LOGICAL. 
+///   IfcIdentifier: Defined type of simple type STRING for identification purposes. 
+///   IfcLabel: Defined type of simple type STRING for naming purposes. 
+///   IfcText: Defined type of simple type STRING for descriptive purposes. 
+///   IfcDateTime: Defined type of simple type STRING to represent a date and time. 
+///   IfcDate: Defined type of simple type STRING to represent a date. 
+///   IfcTime: Defined type of simple type STRING to represent a time. 
+///   IfcDuration: Defined type of simple type STRING to represent a duration. 
 /// 
 /// HISTORY New type in IFC Release 2x.
-typedef double IfcInductanceMeasure;
-/// IfcInteger is a defined type of simple data type Integer. It is required since a select type (IfcSimpleValue) cannot include directly simple types in its select list.
-/// 
-/// In principle, the domain of IfcInteger (being an Integer) is all integer numbers. Here the number of bits used for the IfcInteger representation is unconstrained, but in practice it is implementation specific.
-/// 
-/// Type: INTEGER
-/// 
-/// HISTORY New type in IFC Release 1.5.1.
-typedef int IfcInteger;
-/// IfcIntegerCountRateMeasure is a measure of the integer number of units flowing per unit time.
 /// 
-/// EXAMPLE: This measure may be used for measuring integer units per second or per hour. For example, it may be used to measure the number of books per hour passing along a part of a mechanical book handling system, the number of people per hour travelling along a moving walkway or the number of vehicles per hour travelling along a section of road.
+/// IFC2x4 CHANGE Items IfcDateTime, IfcDate, IfcTime, IfcDuration added.
+typedef IfcUtil::IfcBaseClass IfcSimpleValue;
+/// Definition from ISO/CD 10303-46:1992: The size select is a selection of a specific positive length measure.
 /// 
-/// Type: INTEGER
+/// Definition from ISO: The size (or width) measure value is given in the global drawing length units.
 /// 
-/// HISTORY New type in IFC Release 2.0.
-typedef int IfcIntegerCountRateMeasure;
-/// IfcIonConcentrationMeasure is a measure of particular ion concentration in a liquid, given in mg/L.
+/// NOTE  global units are defined at the single IfcProject instance, given by UnitsInContext:IfcUnitAssignment, the same units are used for the geometric representation items and for the style definitions.
 /// 
-/// HISTORY: New type in IFC2x2.
-typedef double IfcIonConcentrationMeasure;
-/// IfcIsothermalMoistureCapacityMeasure is a measure of isothermal moisture capacity.
-/// Usually measured in m3/kg.
-/// Type: REAL
+/// NOTE  Corresponding ISO 10303 name: size_select. Please refer to ISO/IS 10303-46:1994 for the final
+/// definition of the formal standard.
 /// 
-/// HISTORY New type in IFC Release 2x.
-typedef double IfcIsothermalMoistureCapacityMeasure;
-/// IfcKinematicViscosityMeasure is a measure of the viscous resistance of a medium to a moving body.
-/// Usually measured in m2/s.
-/// Type: REAL
+/// HISTORY  New type in IFC2x2.
 /// 
-/// HISTORY New type in IFC Release 2.0.
-typedef double IfcKinematicViscosityMeasure;
-/// Definition from ISO/CD 10303-41:1992: A label is the term by which something may be referred to.  It is a string which represents the human-interpretable name of something and shall have a natural-language meaning.
+/// IFC2x3 CHANGE  The SELECT item IfcMeasureWithUnit has been removed from the IfcSizeSelect, the IfcRatioMeasure and IfcDescriptiveMeasure has been added.
+typedef IfcUtil::IfcBaseClass IfcSizeSelect;
+/// The IfcSolidOrShell provides the option to either select a geometric volume (IfcSolidModel and subtypes) within a geometric model, or a shell (IfcClosedShell) within a topological model.
+/// SELECT
 /// 
-/// Type: STRING of up to 255 characters
+/// IfcSolidModel
+/// IfcClosedShell
 /// 
-/// NOTE Corresponding STEP name: label, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
+/// HISTORY  New select type in IFC2x4.
+typedef IfcUtil::IfcBaseClass IfcSolidOrShell;
+/// Definition from IAI: The
+/// IfcSpaceBoundarySelect selects either an internal space
+/// for internal or external space boundaries, or an external spatial
+/// element for external space boundaries at the outer envelop of the
+/// building.
+/// SELECT
 /// 
-/// HISTORY New type in IFC Release 2x.
-/// IFC 2x4 CHANGE: Previously recommended size restriction of 255 characters is now mandatory.
+/// IfcSpace,
+/// IfcExternalSpatialElement
 /// 
-/// As a human-readable string for naming purposes, a label is usually human-specified and locale-dependent (in contrast to purely machine-readable identifiers, IfcIdentifier).
+/// HISTORY  New select type
+/// in IFC2x4.
+typedef IfcUtil::IfcBaseClass IfcSpaceBoundarySelect;
+/// The IfcSpecularHighlightSelect defines the selectable types of value for specular highlight sharpness. 
 /// 
-/// Per ISO 10303-11, the set of characters that may appear in STRINGs is defined in ISO 10646.  The encoding of characters in case of file-based exchange is defined in ISO 10303-21 (STEP physical files) and ISO 10303-28 (XML files).  Among else, these specifications define the encoding of 8-bit characters from ISO 8859-1...-16 and of 2-byte Unicode characters.
+/// NOTE: The two select types relate to the different ways to specifiy the sharpness (or shininess) of the specular part of the reflectance equation. It relates to the attributes: 
 /// 
-/// Note that while IfcLabel is restricted to 255 characters, the size in exchange files after encoding may be considerably larger than 255 octets, depending on the particular encoding and on the contents of the label.
-typedef std::string IfcLabel;
-/// IfcLanguageId identifies the language in which a natural language text is expressed. It uses a language tag to identify the language.
-/// The tag shall comply to the Internet Engineering Task Force (IETF) language tag as expressed in RFC 5646. A conforming program shall support the "simple language" subtag and the "language-region" tag format.
+/// in ISO10303-46 the attribute specular_exponent is given 
+///   in VRML97 the attribute shininess is given 
 /// 
-/// EXAMPLE  for simple language tags en (English), de (German), fr (France), or ja (Japanese), and for language-region tags en-US (English as used in United States), de-CH (German as used in German speaking part of Switzerland).
+/// For each surface side style only one of the two methods is needed for calculating the specular part of the equation.
 /// 
-/// Type: IfcIdentifier
+/// HISTORY: New type in IFC2x2.
+typedef IfcUtil::IfcBaseClass IfcSpecularHighlightSelect;
+/// Definition from IAI: This type definition shall be used to
+///   distinguish between a reference to an instance either of
+///   IfcStructuralItem or IfcBuildingElement. The
+///   IfcStructuralActivityAssignmentSelect type is referenced by the entity
+///   IfcRelConnectsStructuralActivity which defines the connection between
+///   activities (IfcStructuralActivity) and the loaded element.  
 /// 
-/// NOTE  The use of IfcLanguageId should conform to the use of language tags in HTML and XML as published by the W3C consortium.
+/// HISTORY: New type in Release IFC2x
+///   Edition 2.
+typedef IfcUtil::IfcBaseClass IfcStructuralActivityAssignmentSelect;
+/// The style assignment select is a selection of two wasy of assigning presentation styles to an IfcStyledItem.
 /// 
-/// HISTORY  New defined datatype in IFC2x4.
-typedef IfcIdentifier IfcLanguageId;
-/// Definition from ISO/CD 10303-41:1992: A length measure is the value of a distance.
-/// Usually measured in millimeters (mm).
-/// Type: REAL
+/// by directly assigning presentation styles as subtypes of IfcPresentationStyle
+/// by assigning presentation stypes via an intermediate collection entity IfcPresentationStyleAssignment
 /// 
-/// NOTE Corresponding ISO 10303 name: length_measure, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
+/// NOTE Using IfcPresentationStyleAssignment is deprecated in IFC2x4 onwards
 /// 
-/// HISTORY New type in IFC Release 1.5.1.
-typedef double IfcLengthMeasure;
-/// IfcLinearForceMeasure is a measure of linear force.
-/// Usually measured in N/m.
-/// Type: REAL
+/// NOTE The select type has been introduced to provide an upward compatible improvement for assigning styles to a styled items.
 /// 
-/// HISTORY New type in IFC Release 2x.
-typedef double IfcLinearForceMeasure;
-/// IfcLinearMomentMeasure is a measure of linear moment.
-/// Usually measured in Nm/m.
-/// Type: REAL
+/// HISTORY New select type in IFC2x4.
+typedef IfcUtil::IfcBaseClass IfcStyleAssignmentSelect;
+/// IfcSurfaceOrFaceSurface provides the option to either select a geometric surface (IfcSurface
+/// and subtypes) within a geometric model, or a face with associated surface geometry and coordinates (IfcFaceSurface) within a topological model.
+/// SELECT 
 /// 
-/// HISTORY New type in IFC Release 2x.
-typedef double IfcLinearMomentMeasure;
-/// IfcLinearStiffnessMeasureA measure of linear stiffness.
-/// Usually measured in N/m.
-/// Type: REAL
+/// IfcSurface 
+///   IfcFaceSurface
+///   IfcFaceBasedSurfaceModel (a connected face set, representing a faceted surface as an approximation of a non planar, non rectangular bounded surface)
 /// 
-/// HISTORY New type in IFC Release 2x.
-typedef double IfcLinearStiffnessMeasure;
-/// IfcLinearVelocityMeasure is a measure of the velocity of a body measured in terms of distance moved per unit time.
-/// Usually measured in m/s.
-/// Type: REAL
+/// HISTORY  New select type in IFC2x3.
+typedef IfcUtil::IfcBaseClass IfcSurfaceOrFaceSurface;
+/// Definition from ISO/CD 10303-46:1992: The surface style element select is a selection of the different surface styles to use in the presentation of the side of a surface. 
 /// 
-/// HISTORY New type in IFC Release 2.0.
-typedef double IfcLinearVelocityMeasure;
-/// IfcLogical</iL is a defined type of simple type Logical. It is required since a select type (IfcSimpleValue) cannot directly include simple types in its select list). Logical datatype can have values TRUE, FALSE or UNKNOWN.
+/// The select type only includes the IfcSurfaceStyleRendering (which is the equivalent to surface_style_rendering) from the select type surface_style_element_select. In addition it has the IfcSurfaceStyleLighting, which holds the exact physically based lighting properties for lighting based calculation algorithms (as the opposite to the rendering based calculation), the IfcSurfaceStyleRefraction (for more advanced refraction indices) and IfcSurfaceStyleWithTextures (to allow for image textures applied to surfaces). In addition an IfcExternallyDefinedSurfaceStyle can be selected that points into an external material library. 
 /// 
-/// Type: LOGICAL
+/// NOTE The IfcSurfaceLightingProperties are needed for exact lighting calculation, because physically based lighting calculation algorithms need exact physically based parameters. The factors in IfcSurfaceStyleRendering lack the physical base, they are intended for rendering calculations, but a lighting calculation based software cannot use these values.
 /// 
-/// HISTORY New type in IFC Release 2x.
-typedef bool IfcLogical;
-/// IfcLuminousFluxMeasure is a measure of the luminous flux.
-/// Usually measured in Lumen (lm, Candela Steradian).
-/// Type: REAL
+/// NOTE: Corresponding ISO 10303 type: surface_style_element_select. Please refer to ISO/IS 10303-46:1994, p. 85 for the final definition of the formal standard.
 /// 
-/// HISTORY New type in IFC Release 2x.
-typedef double IfcLuminousFluxMeasure;
-/// IfcLuminousIntensityDistributionMeasure is a measure of the luminous intensity of a light source that changes according to the direction of the ray. It is normally based on some standardized distribution light distribution curves. 
+/// HISTORY: New Select type in IFC2x2.
+typedef IfcUtil::IfcBaseClass IfcSurfaceStyleElementSelect;
+/// IfcTextFontSelect allows for either a predefined text font, a text font model or an externally defined text font to be used to describe the font of a text literal. The definition of the text font model is based on W3C TR Cascading Style Sheet Version 1, whereas the definition of predefined text font is based on ISO 10303.
 /// 
-/// Usually measured in Candela/Lumen (cd/lm) or (cd/klm).  
+/// NOTE  IfcTextFontSelect is an entity that had been adopted from ISO 10303, Industrial automation systems and integration—Product data representation and exchange, Part 46: Integrated generic resources: Visual presentation. Corresponding ISO 10303 name: font_select. Please refer to ISO/IS 10303-46:1994, p. 133 for the final definition of the formal standard.
 /// 
-/// Type: REAL  
+/// HISTORY  New type in IFC2x2.
 /// 
-/// HISTORY New type in IFC2x2.
-typedef double IfcLuminousIntensityDistributionMeasure;
-/// Definition from ISO/CD 10303-41:1992: A luminous intensity measure is the value for the brightness of a body.
-/// Usually measured in candela (cd).
-/// Type: REAL
+/// IFC2x3 CHANGE  The select type has been renamed from IfcFontSelect.
+typedef IfcUtil::IfcBaseClass IfcTextFontSelect;
+/// IfcTimeOrRatioSelect allows a value to be selected as being either a ratio or a time measure.
+/// HISTORY New SELECT in IFC2x4
+typedef IfcUtil::IfcBaseClass IfcTimeOrRatioSelect;
+/// Definition from IAI: A measure of linear stiffness.  TRUE denotes infinite stiffness (rigidity).  FALSE denotes no stiffness (a release).  A numeric value denotes finite linear-elastic stiffness.
 /// 
-/// NOTE Corresponding ISO 10303 name: luminous_intensity_measure, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
+/// HISTORY: New type in IFC 2x4.
+typedef IfcUtil::IfcBaseClass IfcTranslationalStiffnessSelect;
+/// Definition from ISO/CD 10303-42:1992: This select type identifies the two possible ways of trimming a parametric curve; by a Cartesian point on the curve, or by a REAL number defining a parameter value within the parametric range of the curve. 
 /// 
-/// HISTORY New type in IFC Release 1.5.1.
-typedef double IfcLuminousIntensityMeasure;
-/// IfcMagneticFluxDensityMeasure is a measure of the magnetic flux density.
-/// Usually measured in Tesla (T, Weber/m2 = V s/m2).
-/// Type: REAL
+/// NOTE Corresponding ISO 10303 type: trimming_select, please refer to ISO/IS 10303-42:1994, p. 20 for the final definition of the formal standard.
 /// 
-/// HISTORY New type in IFC Release 2x.
-typedef double IfcMagneticFluxDensityMeasure;
-/// IfcMagneticFluxMeasure is a measure of the magnetic flux.
-/// Usually measured in Weber (Wb, V s).
-/// Type: REAL
+/// HISTORY New Type in IFC Release 1.0
+typedef IfcUtil::IfcBaseClass IfcTrimmingSelect;
+/// Definition from ISO/CD 10303-41:1992: A unit is a physical quantity, with a value of one, which is used as a standard in terms of which other quantities are expressed.
 /// 
-/// HISTORY New type in IFC Release 2x.
-typedef double IfcMagneticFluxMeasure;
-/// IfcMassDensityMeasure is a measure of the density of a medium.
-/// Usually measured in kg/m3.
-/// Type: REAL
+/// NOTE: Select item IfcMonetaryUnit is an addition to ISO 10303-41.
 /// 
-/// HISTORY New type in IFC Release 2.0.
-typedef double IfcMassDensityMeasure;
-/// IfcMassFlowRateMeasure is a measure of the mass of a medium flowing per unit time.
-/// Usually measured in kg/s.
-/// Type: REAL
+/// NOTE: Corresponding ISO 10303 name: unit, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
 /// 
-/// HISTORY New type in IFC Release 2.0.
-typedef double IfcMassFlowRateMeasure;
-/// Definition from ISO/CD 10303-41:1992: A mass measure is the value of the amount of matter that a body contains.
-/// Usually measured in kilograms (kg) or grams (g).
-/// Type: REAL
+/// SELECT 
 /// 
-/// NOTE Corresponding ISO 10303 name: mass_measure, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
+/// IfcNamedUnit: A unit which is identified by a name.
+/// IfcDerivedUnit: A unit which is derived from an expression of units. 
+/// IfcMonetaryUnit: A unit for defining currencies. 
 /// 
-/// HISTORY New type in IFC Release 1.5.1.
-typedef double IfcMassMeasure;
-/// IfcMassPerLengthMeasure is a measure for mass per length. For example for rolled steel profiles the weight of
-///   an imaginary beam is usually expressed by kg/m length for cost calculation and
-///   structural analysis purposes.
+/// HISTORY: New type in IFC Release 1.5.1.
+typedef IfcUtil::IfcBaseClass IfcUnit;
+/// IfcValue is a select type for selecting between more specialised select types IfcSimpleValue,
+/// IfcMeasureValue and IfcDerivedMeasureValue.
 /// 
-/// Type: REAL
+/// SELECT 
 /// 
-/// HISTORY New type in IFC2x2.
-typedef double IfcMassPerLengthMeasure;
-/// IfcModulusOfElasticityMeasure is a measure of modulus of elasticity.
-/// Usually measured in N/m2.
-/// Type: REAL
+/// IfcSimpleValue A select type for basic defined types of simple data type. 
+///   IfcMeasureValue A select type for basic measure types of ISO 10303-41. 
+///   IfcDerivedMeasureValue A select type for derived measure types.
 /// 
 /// HISTORY New type in IFC Release 2x.
-typedef double IfcModulusOfElasticityMeasure;
-/// IfcModulusOfLinearSubgradeReactionMeasure is a measure for modulus of linear subgrade reaction, which expresses the elastic bedding of a linear structural element per length, such as for a beam. It is typically measured in N/m^2.
+typedef IfcUtil::IfcBaseClass IfcValue;
+/// Definition from ISO/CD 10303-42:1992: This type is used to
+///   identify the types of entity which can participate in vector computations. 
 /// 
-/// Type: REAL  
+/// NOTE Corresponding STEP type:
+///   vector_or_direction, please refer to ISO/IS 10303-42:1994, p. 20 for the final
+///   definition of the formal standard.  
+///   HISTORY New Type in IFC Release
+///   1.5
+typedef IfcUtil::IfcBaseClass IfcVectorOrDirection;
+/// Definition from IAI: A measure of warping stiffness.  TRUE denotes infinite stiffness (rigidity).  FALSE denotes no stiffness (a release).  A numeric value denotes finite linear-elastic stiffness.
 /// 
-/// HISTORY New type in IFC Release 2x2.
-typedef double IfcModulusOfLinearSubgradeReactionMeasure;
-/// IfcModulusOfRotationalSubgradeReactionMeasure is a measure for modulus of rotational subgrade reaction, which expresses the rotational elastic bedding of a linear structural element per length, such as for a beam. It is typically measured in Nm/(m*rad). 
+/// HISTORY: New type in IFC 2x4.
+typedef IfcUtil::IfcBaseClass IfcWarpingStiffnessSelect;
+namespace IfcActionRequestTypeEnum {
+/// IfcActionRequestTypeEnum defines the types of sources through which a request can be made. 
+///   HISTORY: New Enumeration in IFC2x4. 
+///   Enumeration: 
 /// 
-/// Type: REAL  
+/// EMAIL: Request was made through email. 
+/// FAX: Request was made through facsimile. 
+/// PHONE: Request was made verbally over a telephone. 
+/// POST: Request was made through postal mail. 
+/// VERBAL: Request was made verbally in person.  
+/// USERDEFINED: User-defined type. 
+/// NOTDEFINED: Undefined type.
+typedef enum {IfcActionRequestType_EMAIL, IfcActionRequestType_FAX, IfcActionRequestType_PHONE, IfcActionRequestType_POST, IfcActionRequestType_VERBAL, IfcActionRequestType_USERDEFINED, IfcActionRequestType_NOTDEFINED} IfcActionRequestTypeEnum;
+const char* ToString(IfcActionRequestTypeEnum v);
+IfcActionRequestTypeEnum FromString(const std::string& s);
+}
+namespace IfcActionSourceTypeEnum {
+/// Definition from IAI:This enumeration type contains possible
+///   action sources. 
 /// 
-/// HISTORY New type in IFC2x2.
-typedef double IfcModulusOfRotationalSubgradeReactionMeasure;
-/// IfcModulusOfSubgradeReactionMeasure is a geotechnical measure describing interaction between foundation structures and the soil. May also be known as bedding measure. 
-///   Usually measured in N/m3.  
-///   Type: REAL  
+/// HISTORY: New type in Release IFC2x
+///   Edition 2.
+typedef enum {IfcActionSourceType_DEAD_LOAD_G, IfcActionSourceType_COMPLETION_G1, IfcActionSourceType_LIVE_LOAD_Q, IfcActionSourceType_SNOW_S, IfcActionSourceType_WIND_W, IfcActionSourceType_PRESTRESSING_P, IfcActionSourceType_SETTLEMENT_U, IfcActionSourceType_TEMPERATURE_T, IfcActionSourceType_EARTHQUAKE_E, IfcActionSourceType_FIRE, IfcActionSourceType_IMPULSE, IfcActionSourceType_IMPACT, IfcActionSourceType_TRANSPORT, IfcActionSourceType_ERECTION, IfcActionSourceType_PROPPING, IfcActionSourceType_SYSTEM_IMPERFECTION, IfcActionSourceType_SHRINKAGE, IfcActionSourceType_CREEP, IfcActionSourceType_LACK_OF_FIT, IfcActionSourceType_BUOYANCY, IfcActionSourceType_ICE, IfcActionSourceType_CURRENT, IfcActionSourceType_WAVE, IfcActionSourceType_RAIN, IfcActionSourceType_BRAKES, IfcActionSourceType_USERDEFINED, IfcActionSourceType_NOTDEFINED} IfcActionSourceTypeEnum;
+const char* ToString(IfcActionSourceTypeEnum v);
+IfcActionSourceTypeEnum FromString(const std::string& s);
+}
+namespace IfcActionTypeEnum {
+/// Definition from IAI: This enumeration type is used to distinguish
+///   between possible action types at a high level. It can be used for an automated
+///   definition of load combinations and for dimensioning. The contained items and
+///   their acronyms are adopted from the Eurocode standard. 
 /// 
-/// HISTORY New type in IFC Release 2x.
+/// HISTORY: New type in Release IFC2x
+///   Edition 2.
+typedef enum {IfcActionType_PERMANENT_G, IfcActionType_VARIABLE_Q, IfcActionType_EXTRAORDINARY_A, IfcActionType_USERDEFINED, IfcActionType_NOTDEFINED} IfcActionTypeEnum;
+const char* ToString(IfcActionTypeEnum v);
+IfcActionTypeEnum FromString(const std::string& s);
+}
+namespace IfcActuatorTypeEnum {
+/// The IfcActuatorTypeEnum defines the range of different types of actuator that can be specified. 
 /// 
-/// Figure 290 illustrates elastic support of a planar member.
+/// HISTORY: New type in IFC
+///   R2.0  
+///   Enumeration 
 /// 
-/// Figure 290 — Modulus of subgrade reaction measure
-typedef double IfcModulusOfSubgradeReactionMeasure;
-/// IfcMoistureDiffusivityMeasure is a measure of moisture diffusivity.
-/// Usually measured in m3/s.
-/// Type: REAL
+/// ELECTRICACTUATOR: A device that electrically actuates a control element.  
+/// PNEUMATICACTUATOR<: A device that pneumatically actuates a control element  
+/// HYDRAULICACTUATOR: A device that electrically actuates a control element.  
+/// HANDOPERATEDACTUATOR: A device that manually actuates a control element. 
+/// THERMOSTATICACTUATOR: A device that thermostatically actuates a control element. 
+/// USERDEFINED: User-defined type. 
+/// NOTDEFINED: Undefined type. 
 /// 
-/// HISTORY New type in IFC Release 2x.
-typedef double IfcMoistureDiffusivityMeasure;
-/// IfcMolecularWeightMeasure is a measure of molecular weight of material (typically gas).
-/// Usually measured in g/mole.
-/// Type: REAL
+/// See property set of actuator common attributes for specification of
+///   properties for hand operated actuators.
+typedef enum {IfcActuatorType_ELECTRICACTUATOR, IfcActuatorType_HANDOPERATEDACTUATOR, IfcActuatorType_HYDRAULICACTUATOR, IfcActuatorType_PNEUMATICACTUATOR, IfcActuatorType_THERMOSTATICACTUATOR, IfcActuatorType_USERDEFINED, IfcActuatorType_NOTDEFINED} IfcActuatorTypeEnum;
+const char* ToString(IfcActuatorTypeEnum v);
+IfcActuatorTypeEnum FromString(const std::string& s);
+}
+namespace IfcAddressTypeEnum {
+/// Definition from IAI: Identifies the logical location of the address.
 /// 
 /// HISTORY New type in IFC Release 2x.
-typedef double IfcMolecularWeightMeasure;
-/// IfcMomentOfInertiaMeasure is a measure of moment of inertia.
-/// Usually measured in m4.
-/// Type: REAL
 /// 
-/// HISTORY New type in IFC Release 2x.
-typedef double IfcMomentOfInertiaMeasure;
-/// A monetary measure is the value of an amount of money without regard to its currency.
-/// Type: REAL
+/// ENUMERATION 
 /// 
-/// HISTORY New type in IFC Release 2.0.
-typedef double IfcMonetaryMeasure;
-/// Definition from IAI: The IfcDayInMonthNumber is
-/// an integer that defines the position of the specified month in a
-/// year. The positions have the following meaning (according to
-/// ISO8601 "calendar month") that assigns the Calendar month number
-/// to the Calender month name.
-/// NOTE Refer to ISO 8601 for the definitions for
-/// using the Gregorian calendar as the standard for the
-/// identification of calendar days.
+/// OFFICE An office address. 
+///   SITE A site address.
+///   HOME A home address.
+///   DISTRIBUTIONPOINT A postal distribution point address.
+///   USERDEFINED A user defined address type to be provided.
+typedef enum {IfcAddressType_OFFICE, IfcAddressType_SITE, IfcAddressType_HOME, IfcAddressType_DISTRIBUTIONPOINT, IfcAddressType_USERDEFINED} IfcAddressTypeEnum;
+const char* ToString(IfcAddressTypeEnum v);
+IfcAddressTypeEnum FromString(const std::string& s);
+}
+namespace IfcAirTerminalBoxTypeEnum {
+/// This enumeration identifies different types of air terminal boxes.   
 /// 
-/// Calendar month number
-/// Calendar month
-/// name
+/// Valid enumerations are:
 /// 
-/// 01
-/// January
+/// CONSTANTFLOW:  Terminal box does not include a means to reset the volume automatically to an outside signal such as thermostat.
+///   VARIABLEFLOWPRESSUREDEPENDANT:  terminal box includes a means to reset the volume automatically to a different control point in response to an outside signal such as thermostat: air-flow rate depends on supply pressure.
+///   VARIABLEFLOWPRESSUREINDEPENDANT:  terminal box includes a means to reset the volume automatically to a different control point in response to an outside signal such as thermostat: air-flow rate is independant of supply pressure.
+///   USERDEFINED:				  User-defined terminal box.
+///   NOTDEFINED:					  Undefined terminal box.
 /// 
-/// 02
-/// February
+/// HISTORY: New enumeration in IFC R2.0
+typedef enum {IfcAirTerminalBoxType_CONSTANTFLOW, IfcAirTerminalBoxType_VARIABLEFLOWPRESSUREDEPENDANT, IfcAirTerminalBoxType_VARIABLEFLOWPRESSUREINDEPENDANT, IfcAirTerminalBoxType_USERDEFINED, IfcAirTerminalBoxType_NOTDEFINED} IfcAirTerminalBoxTypeEnum;
+const char* ToString(IfcAirTerminalBoxTypeEnum v);
+IfcAirTerminalBoxTypeEnum FromString(const std::string& s);
+}
+namespace IfcAirTerminalTypeEnum {
+/// Enumeration defining the functional types of air terminals. 
+///   The IfcAirTerminalTypeEnum contains the following:
 /// 
-/// 03
-/// March
+/// GRILLE: A covering for any area through which air passes.
+///   REGISTER: A grille typically equipped with a damper or control valve.
+///   DIFFUSER: An outlet discharging supply air in various directions and planes.
+///   LOUVRE: A rectilinear louvre.
+///   USERDEFINED: User-defined air terminal type.
+///   NOTDEFINED:  Undefined air terminal type.
 /// 
-/// 04
-/// April
+/// NOTE: Architectural louvres within doors or windows are defined by IfcPermeableCoveringProperties.
 /// 
-/// 05
-/// May
+/// HISTORY: New enumeration in IFC R2x2.  Modified in IFC R2x4 to add LOUVRE and remove EYEBALL, IRIS, LINEARGRILLE, LINEARDIFFUSER
+typedef enum {IfcAirTerminalType_DIFFUSER, IfcAirTerminalType_GRILLE, IfcAirTerminalType_LOUVRE, IfcAirTerminalType_REGISTER, IfcAirTerminalType_USERDEFINED, IfcAirTerminalType_NOTDEFINED} IfcAirTerminalTypeEnum;
+const char* ToString(IfcAirTerminalTypeEnum v);
+IfcAirTerminalTypeEnum FromString(const std::string& s);
+}
+namespace IfcAirToAirHeatRecoveryTypeEnum {
+/// Defines general types of pumps.
+///   The IfcPumpTypeEnum contains the following:
 /// 
-/// 06
-/// June
+/// FIXEDPLATECOUNTERFLOWEXCHANGER: Heat exchanger with moving parts and alternate layers of plates, separated and sealed from the exhaust and supply air stream passages with primary air enters at secondary air outlet location and exits at secondary air inlet location.
+///   FIXEDPLATECROSSFLOWEXCHANGER: Heat exchanger with moving parts and alternate layers of plates, separated and sealed from the exhaust and supply air stream passages with secondary air flow in the direction perpendicular to primary air flow.
+///   FIXEDPLATEPARALLELFLOWEXCHANGER: Heat exchanger with moving parts and alternate layers of plates, separated and sealed from the exhaust and supply air stream passages with primary air enters at secondary air inlet location and exits at secondary air outlet location.
+///   ROTARYWHEEL: A heat wheel with a revolving cylinder filled with an air-permeable medium having a large internal surface area.
+///   RUNAROUNDCOILLOOP: A typical coil energy recovery loop places extended surface, finned tube water coils in the supply and exhaust airstreams of a building.
+///   HEATPIPE: A passive energy recovery device with a heat pipe divided into evaporator and condenser sections.
+///   TWINTOWERENTHALPYRECOVERYLOOPS: An air-to-liquid, liquid-to-air enthalpy recovery system with a sorbent liquid circulates continuously between supply and exhaust airstreams, alternately contacting both airstreams directly in contactor towers.
+///   THERMOSIPHONSEALEDTUBEHEATEXCHANGERS: Sealed systems that consist of an evaporator, a condenser, interconnecting piping, and an intermediate working fluid that is present in both liquid and vapor phases where the evaporator and the condenser are usually at opposite ends of a bundle of straight, individual thermosiphon tubes and the exhaust and supply ducts are adjacent to each other.
+///   THERMOSIPHONCOILTYPEHEATEXCHANGERS: Sealed systems that consist of an evaporator, a condenser, interconnecting piping, and an intermediate working fluid that is present in both liquid and vapor phases where the evaporator and condensor coils are installed independently in the ducts and are interconnected by the working fluid piping.
+///   USERDEFINED: User-defined air to air heat recovery type.
+///   NOTDEFINED:  Undefined air to air heat recovery type.
 /// 
-/// 07
-/// July
+/// HISTORY: New enumeration in IFC R2x.
+typedef enum {IfcAirToAirHeatRecoveryType_FIXEDPLATECOUNTERFLOWEXCHANGER, IfcAirToAirHeatRecoveryType_FIXEDPLATECROSSFLOWEXCHANGER, IfcAirToAirHeatRecoveryType_FIXEDPLATEPARALLELFLOWEXCHANGER, IfcAirToAirHeatRecoveryType_ROTARYWHEEL, IfcAirToAirHeatRecoveryType_RUNAROUNDCOILLOOP, IfcAirToAirHeatRecoveryType_HEATPIPE, IfcAirToAirHeatRecoveryType_TWINTOWERENTHALPYRECOVERYLOOPS, IfcAirToAirHeatRecoveryType_THERMOSIPHONSEALEDTUBEHEATEXCHANGERS, IfcAirToAirHeatRecoveryType_THERMOSIPHONCOILTYPEHEATEXCHANGERS, IfcAirToAirHeatRecoveryType_USERDEFINED, IfcAirToAirHeatRecoveryType_NOTDEFINED} IfcAirToAirHeatRecoveryTypeEnum;
+const char* ToString(IfcAirToAirHeatRecoveryTypeEnum v);
+IfcAirToAirHeatRecoveryTypeEnum FromString(const std::string& s);
+}
+namespace IfcAlarmTypeEnum {
+/// The IfcAlarmTypeEnum defines the range of different types of alarm that can be specified. 
 /// 
-/// 08
-/// August
+/// HISTORY: New type in IFC 2x2
 /// 
-/// 09
-/// September
+/// Enumeration 
 /// 
-/// 10
-/// October
+/// BELL: An audible alarm. 
+/// BREAKGLASSBUTTON: An alarm activation mechanism in which a protective glass has to be broken to enable a button to be pressed. 
+/// LIGHT: A visual alarm. 
+/// MANUALPULLBOX: An alarm activation mechanism in which activation is achieved by a pulling action. 
+/// SIREN: An audible alarm. 
+/// WHISTLE: An audible alarm.  
+/// USERDEFINED: User-defined type. 
+/// NOTDEFINED: Undefined type.
+typedef enum {IfcAlarmType_BELL, IfcAlarmType_BREAKGLASSBUTTON, IfcAlarmType_LIGHT, IfcAlarmType_MANUALPULLBOX, IfcAlarmType_SIREN, IfcAlarmType_WHISTLE, IfcAlarmType_USERDEFINED, IfcAlarmType_NOTDEFINED} IfcAlarmTypeEnum;
+const char* ToString(IfcAlarmTypeEnum v);
+IfcAlarmTypeEnum FromString(const std::string& s);
+}
+namespace IfcAnalysisModelTypeEnum {
+/// Definition from IAI: This type definition is used to distinguish
+///   between different types of structural analysis models. The analysis models are
+///   differentiated by their dimensionality. 
 /// 
-/// 11
-/// November
+/// HISTORY: New type in Release IFC2x
+///   Edition 2.
+typedef enum {IfcAnalysisModelType_IN_PLANE_LOADING_2D, IfcAnalysisModelType_OUT_PLANE_LOADING_2D, IfcAnalysisModelType_LOADING_3D, IfcAnalysisModelType_USERDEFINED, IfcAnalysisModelType_NOTDEFINED} IfcAnalysisModelTypeEnum;
+const char* ToString(IfcAnalysisModelTypeEnum v);
+IfcAnalysisModelTypeEnum FromString(const std::string& s);
+}
+namespace IfcAnalysisTheoryTypeEnum {
+/// Definition from IAI: This type definition is used to distinguish
+///   between different types of structural analysis methods, i.e. first order
+///   theory, second order theory (small deformations), third order theory (large
+///   deformations) and the full nonlinear theory (geometric nonlinearity together with other nonlinearities, e.g. plasticity). 
 /// 
-/// 12
-/// December
+/// HISTORY: New type in Release IFC2x
+///   Edition 2.
+typedef enum {IfcAnalysisTheoryType_FIRST_ORDER_THEORY, IfcAnalysisTheoryType_SECOND_ORDER_THEORY, IfcAnalysisTheoryType_THIRD_ORDER_THEORY, IfcAnalysisTheoryType_FULL_NONLINEAR_THEORY, IfcAnalysisTheoryType_USERDEFINED, IfcAnalysisTheoryType_NOTDEFINED} IfcAnalysisTheoryTypeEnum;
+const char* ToString(IfcAnalysisTheoryTypeEnum v);
+IfcAnalysisTheoryTypeEnum FromString(const std::string& s);
+}
+namespace IfcArithmeticOperatorEnum {
+/// IfcArithmeticOperatorEnum specifies the form of arithmetical operation implied by the relationship. 
+/// Enumeration 
 /// 
-/// Type: INTEGER
-/// NOTE Corresponding STEP
-/// name: month_in_year_number, please refer to ISO/IS 10303-41:1994
-/// for the final definition of the formal
-/// standard.
-/// HISTORY New type in IFC
-/// Release 1.5.1.
-typedef int IfcMonthInYearNumber;
-/// A non-negative length measure is a length measure that is greater than or equal to zero.
+/// ADD 
+///   DIVIDE 
+///   MULTIPLY 
+///   SUBTRACT 
 /// 
-/// Type: IfcLengthMeasure
+/// HISTORY: New enumeration in IFC2x2.
 /// 
-/// HISTORY New type in IFC Release 2x4.
-typedef IfcLengthMeasure IfcNonNegativeLengthMeasure;
-/// Definition from ISO/CD 10303-41:1992: A numeric measure is the numeric value of a physical quantity.
-/// Type: NUMBER
+/// Use definitions 
+/// There can be only one arithmetic operator for each applied value relationship. This is to enforce arithmetic consistency. Given this consistency, the cardinality of the IfcAppliedValueRelationship.Components attribute is a set of one to many applied values that are components of an applied value.
+typedef enum {IfcArithmeticOperator_ADD, IfcArithmeticOperator_DIVIDE, IfcArithmeticOperator_MULTIPLY, IfcArithmeticOperator_SUBTRACT} IfcArithmeticOperatorEnum;
+const char* ToString(IfcArithmeticOperatorEnum v);
+IfcArithmeticOperatorEnum FromString(const std::string& s);
+}
+namespace IfcAssemblyPlaceEnum {
+/// Definition from IAI: Enumeration defining where the
+///   assembly is intended to take place, either in a factory or
+///   on the building site.
 /// 
-/// NOTE Corresponding ISO 10303 name: numeric_measure, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
+/// HISTORY New enumeration in
+///   Release IFC2x Edition 2.
 /// 
-/// HISTORY New type in IFC Release 1.5.1.
-typedef double IfcNumericMeasure;
-/// IfcPHMeasure is a measure of the molar hydrogen ion concentration in a liquid (usually defined as the measure of acidity) in a range from 0 to 14.
+/// Enumeration
 /// 
-/// HISTORY: New type in IFC 2x2.
-typedef double IfcPHMeasure;
-/// Definition from ISO/CD 10303-41:1992: A parameter value is the value which specifies the amount of a 
-/// parameter in some parameter space.
-/// Type: REAL
-/// 
-/// NOTE Corresponding STEP name: parameter_value, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
-/// 
-/// HISTORY New type in IFC Release 1.5.1.
-typedef double IfcParameterValue;
-/// IfcPlanarForceMeasure is a measure of force on an area.
-/// Usually measured in N/m2.
-/// Type: REAL
-/// 
-/// HISTORY New type in IFC Release 2x.
-typedef double IfcPlanarForceMeasure;
-/// Definition from ISO/CD 10303-41:1992: A plane angle measure is the value of an angle in a plane.
-/// 
-/// Usually measured in radian (rad, m/m = 1), but also grads may be used. The grad unit may be declared as a conversion based unit based on radian unit.
+/// SITE - this assembly is assembled at site
 /// 
-/// NOTE IfcPlaneAngleMeasure is used where angles need to be described to an accuracy of less than one degree and expressed as decimal parts of an angle. It is widely used for angular measurement except for situations where accuracy needs to be defined using arc measurement; for which purpose the IfcCompoundPlaneAngleMeasure is provided.
+/// FACTORY - this assembly is assembled in a factory
+typedef enum {IfcAssemblyPlace_SITE, IfcAssemblyPlace_FACTORY, IfcAssemblyPlace_NOTDEFINED} IfcAssemblyPlaceEnum;
+const char* ToString(IfcAssemblyPlaceEnum v);
+IfcAssemblyPlaceEnum FromString(const std::string& s);
+}
+namespace IfcAudioVisualApplianceTypeEnum {
+/// Defines the range of different types of audio-video devices that can be specified. 
+/// HISTORY: New enumeration in IFC2x4 
 /// 
-/// Type: REAL
+/// AMPLIFIER: A device that receives an audio signal and amplifies it to play through speakers. 
+/// CAMERA: A device that records images, either as a still photograph or as moving images known as videos or movies.  Note that a camera may operate with light from the visible spectrum or from other parts of the electromagnetic spectrum such as infrared or ultraviolet. 
+/// DISPLAY: An electronic device that represents information in visual form such as a flat-panel display or television. 
+/// MICROPHONE: An acoustic-to-electric transducer or sensor that converts sound into an electrical signal.  Microphones types in use include electromagnetic induction (dynamic microphones), capacitance change (condenser microphones) or piezoelectric generation to produce the signal from mechanical vibration. 
+/// PLAYER: A device that plays audio and/or video content directly or to another device, having fixed or removable storage media. 
+/// PROJECTOR: An apparatus for projecting a picture on a screen. Whether the device is an overhead, slide projector, or a film projector, it is usually referred to as simply a projector. 
+/// RECEIVER: A device that receives audio and/or video signals, switches sources, and amplifies signals to play through speakers. 
+/// SPEAKER: A loudspeaker, speaker, or speaker system is an electroacoustical transducer that converts an electrical signal to sound. 
+/// SWITCHER: A device that receives audio and/or video signals, switches sources, and transmits signals to downstream devices. 
+/// TELEPHONE: A telecommunications device that is used to transmit and receive sound, and optionally video. 
+/// TUNER: An electronic receiver that detects, demodulates, and amplifies transmitted signals.
+typedef enum {IfcAudioVisualApplianceType_AMPLIFIER, IfcAudioVisualApplianceType_CAMERA, IfcAudioVisualApplianceType_DISPLAY, IfcAudioVisualApplianceType_MICROPHONE, IfcAudioVisualApplianceType_PLAYER, IfcAudioVisualApplianceType_PROJECTOR, IfcAudioVisualApplianceType_RECEIVER, IfcAudioVisualApplianceType_SPEAKER, IfcAudioVisualApplianceType_SWITCHER, IfcAudioVisualApplianceType_TELEPHONE, IfcAudioVisualApplianceType_TUNER, IfcAudioVisualApplianceType_USERDEFINED, IfcAudioVisualApplianceType_NOTDEFINED} IfcAudioVisualApplianceTypeEnum;
+const char* ToString(IfcAudioVisualApplianceTypeEnum v);
+IfcAudioVisualApplianceTypeEnum FromString(const std::string& s);
+}
+namespace IfcBSplineCurveForm {
+/// Definition from ISO/CD 10303-42:1992: This type is used to indicate that the B-spline curve represents a part of a curve of some specific form.
 /// 
-/// NOTE Corresponding ISO 10303 name: plane_angle_measure, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
+/// Enumeration
 /// 
-/// HISTORY New type in IFC Release 1.5.1.
-typedef double IfcPlaneAngleMeasure;
-/// Definition from ISO/CD 10303-41:1992: A positive length measure is a length measure that is greater than zero.
-/// Type: IfcLengthMeasure
+/// polyline form: A connected sequence of line segments represented by degree 1 B-spline basis functions.
+/// circular arc: An arc of a circle, or a complete circle represented by a B-spline curve.
+/// elliptic arc: An arc of an ellipse, or a complete ellipse, represented by a B-spline curve.
+/// parabolic arc: An arc of finite length of a parabola represented by a B-spline curve.
+/// hyperbolic arc: An arc of finite length of one branch of a hyperbola represented by a B-spline curve.
+/// unspecified: A B-spline curve for which no particular form is specified.
 /// 
-/// NOTE Corresponding ISO 10303 name: positive_length_measure, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
+/// NOTE  Corresponding ISO 10303 type: b_spline_curve_form. Please refer to ISO/IS 10303-42:1994, p. 15 for the final definition of the formal standard.
 /// 
-/// HISTORY New type in IFC Release 1.5.1.
-typedef IfcLengthMeasure IfcPositiveLengthMeasure;
-/// Definition from ISO/CD 10303-41:1992: Positive plane angle measure is a plane angle measure that is greater than zero.
-/// Type: IfcPlaneAngleMeasure 
+/// HISTORY  New type in Release IFC2x2.
+typedef enum {IfcBSplineCurveForm_POLYLINE_FORM, IfcBSplineCurveForm_CIRCULAR_ARC, IfcBSplineCurveForm_ELLIPTIC_ARC, IfcBSplineCurveForm_PARABOLIC_ARC, IfcBSplineCurveForm_HYPERBOLIC_ARC, IfcBSplineCurveForm_UNSPECIFIED} IfcBSplineCurveForm;
+const char* ToString(IfcBSplineCurveForm v);
+IfcBSplineCurveForm FromString(const std::string& s);
+}
+namespace IfcBSplineSurfaceForm {
+
+typedef enum {IfcBSplineSurfaceForm_PLANE_SURF, IfcBSplineSurfaceForm_CYLINDRICAL_SURF, IfcBSplineSurfaceForm_CONICAL_SURF, IfcBSplineSurfaceForm_SPHERICAL_SURF, IfcBSplineSurfaceForm_TOROIDAL_SURF, IfcBSplineSurfaceForm_SURF_OF_REVOLUTION, IfcBSplineSurfaceForm_RULED_SURF, IfcBSplineSurfaceForm_GENERALISED_CONE, IfcBSplineSurfaceForm_QUADRIC_SURF, IfcBSplineSurfaceForm_SURF_OF_LINEAR_EXTRUSION, IfcBSplineSurfaceForm_UNSPECIFIED} IfcBSplineSurfaceForm;
+const char* ToString(IfcBSplineSurfaceForm v);
+IfcBSplineSurfaceForm FromString(const std::string& s);
+}
+namespace IfcBeamTypeEnum {
+/// Definition from IAI: This enumeration defines the
+/// different types of linear elements an IfcBeamType object
+/// can fulfill:
 /// 
-/// NOTE Corresponding STEP name: positive_plane_angle_measure, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
+/// BEAM: A standard beam usually used horizontally.
+/// JOIST: A beam used to support a floor or ceiling.
+/// HOLLOWCORE: A wide often prestressed beam with a
+/// hollow-core profile that usually serves as a slab component.
+/// LINTEL: A beam or horizontal piece of material over an
+/// opening (e.g. door, window).
+/// SPANDREL: A tall beam placed on the facade of a
+/// building. One tall side is usually finished to provide the
+/// exterior of the building. Can be used to support joists or slab
+/// elements on its interior side.
 /// 
-/// HISTORY New type in IFC Release 1.5.1.
-typedef IfcPlaneAngleMeasure IfcPositivePlaneAngleMeasure;
-/// IfcPowerMeasure is a measure of power required or used.
-/// Usually measured in Watts (W, J/s).
-/// Type: REAL
+/// NOTE  They are also referred to as "spandrel
+/// panels", which are parts of a facade and sometimes have
+/// supporting consoles for floor slabs
+/// integrated.
 /// 
-/// HISTORY New type in IFC Release 2.0.
-typedef double IfcPowerMeasure;
-/// IfcPresentableText is a text string used to capture the content of a text literal for the purpose of presentation. The IfcPresentableText can include multiple lines of text, for which the line feed character LF, 0x0A, should be used to separate lines.
+/// T_BEAM: A beam that forms part of a slab construction
+/// and acts together with the slab which its carries. Such beams are
+/// often of T-shape (therefore the English name), but may have other
+/// shapes as well, e.g. an L-Shape or an Inverted-T-Shape.
 /// 
-/// NOTE  The non printable characters are converted within the standard exchange format ISO 10303-21 (STEP physical file format), commonly the \X\09 represents the TAB, and \X\0A the LF character.
+/// NOTE  In order to distinguish beams by shape,
+/// the assigned IfcProfileDef subtypes provide the shape type
+/// and, if using a subtype of
+/// IfcParameterizedProfileDef, also the shape
+/// parameterization.
 /// 
-/// NOTE  The IfcPresentableText is an entity that had been adopted from ISO 10303, Industrial automation systems and integration—Product data representation and exchange, Part 46: Integrated generic resources: Visual presentation.
+/// USERDEFINED: User-defined linear beam element.
+/// NOTDEFINED: Undefined linear beam element
 /// 
-/// NOTE  Corresponding ISO 10303 name: presentable_text. Please refer to ISO/IS 10303-46:1994, p. 133 for the final definition of the formal standard.
+/// HISTORY  New Enumeration
+/// in Release IFC2x Edition 2.
+/// IFC2x4 CHANGE  The enumerators
+/// HOLLOWCORE and SPANDREL have been
+/// added.
+typedef enum {IfcBeamType_BEAM, IfcBeamType_JOIST, IfcBeamType_HOLLOWCORE, IfcBeamType_LINTEL, IfcBeamType_SPANDREL, IfcBeamType_T_BEAM, IfcBeamType_USERDEFINED, IfcBeamType_NOTDEFINED} IfcBeamTypeEnum;
+const char* ToString(IfcBeamTypeEnum v);
+IfcBeamTypeEnum FromString(const std::string& s);
+}
+namespace IfcBenchmarkEnum {
+/// IfcBenchmarkEnum is an enumeration used to identify the logical comparators that can be applied in conjunction with constraint values. 
 /// 
-/// HISTORY  New type in IFC2x2.
-typedef std::string IfcPresentableText;
-/// IfcPressureMeasure is a measure of the quantity of a medium acting on a unit area.
-/// Usually measured in Pascals (Pa, N/m2).
-/// Type: REAL
+/// HISTORY: New type in IFC Release 2.0
 /// 
-/// HISTORY New type in IFC Release 2.0.
-typedef double IfcPressureMeasure;
-/// IfcRadioActivityMeasure is a measure of activity of radionuclide.
-/// Usually measured in Becquerel (Bq, 1/s).
-/// Type: REAL
+/// IFC2x4 CHANGE: Extended to include comparators for item-set and set-item comparisons: INCLUDES, NOTINCLUDES, INCLUDEDIN and NOTINCLUDEDIN, to test if an individual item is a member of a given aggregation, or if an aggregation has a given individual item as a member.
 /// 
-/// HISTORY New type in IFC Release 2x.
-typedef double IfcRadioActivityMeasure;
-/// Definition from ISO/CD 10303-41:1992: A ratio measure is the value of the relation between two 
-/// physical quantities that are of the same kind.
+/// Enumeration 
 /// 
-/// NOTE: Input given in percent is to be divided by 100% when stored as an IfcRatioMeasure. For example, 25% becomes 0.25.
+/// Value 
+///   Definition 
 /// 
-/// Type: REAL
+/// GREATERTHAN 
+///   Identifies that a value must be greater than that set by the constraint. 
 /// 
-/// NOTE Corresponding STEP name: ratio_measure, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
+/// GREATERTHANOREQUALTO 
+///   Identifies that a value must be either greater than or equal to that set by the constraint. 
 /// 
-/// HISTORY New type in IFC Release 1.5.1.
-typedef double IfcRatioMeasure;
-/// IfcReal is a defined type of simple data type REAL.  It is required since a select type (IfcSimpleValue), cannot directly include simple types in its select list.
+/// LESSTHAN 
+///   Identifies that a value must be less than that set by the constraint. 
 /// 
-/// In principle, the domain of IfcReal (being a Real) is all rational, irrational and scientific real numbers. Here the precision is unconstrained, but in practice it is implementation specific.
+/// LESSTHANOREQUALTO 
+///   Identifies that a value must be either less than or equal to that set by the constraint. 
 /// 
-/// Type: REAL
+/// EQUALTO 
+///   Identifies that a value must be equal to that set by the constraint. 
 /// 
-/// HISTORY: New type in IFC Release 1.5.1.
-typedef double IfcReal;
-/// IfcRotationalFrequencyMeasure is a measure of the number of cycles that an item revolves in unit time.
-/// Usually measured in cycles/s.
-/// Type: REAL
+/// NOTEQUALTO 
+///   Identifies that a value must be not equal to that set by the constraint. 
 /// 
-/// HISTORY New type in IFC Release 2x.
-typedef double IfcRotationalFrequencyMeasure;
-/// The rotational mass measure denotes the inertia of a body with respect to angular acceleration.
-/// It is usually measured in kg*m^2.
+/// INCLUDES 
+///   Identifies that an aggregation (set, list or table) must include the value (individual item) set by the constraint. 
 /// 
-/// Type: REAL  
+/// NOTINCLUDES 
+///   Identifies that an aggregation (set, list or table) must not include (i.e must exclude) the value (individual item) set by the constraint. 
 /// 
-/// HISTORY New type in IFC2x2.
-typedef double IfcRotationalMassMeasure;
-/// IfcRotationalStiffnessMeasure is a measure of rotational stiffness.
-/// Usually measured in Nm/rad.
-/// Type: REAL
+/// INCLUDEDIN 
+///   Identifies that a value (individual item) must be included in the aggregation (set, list or table) set by the constraint. 
 /// 
-/// HISTORY New type in IFC Release 2x.
-typedef double IfcRotationalStiffnessMeasure;
-/// IfcSectionModulusMeasure is a measure for the resistance of a cross section against bending or torsional moment.  It is usually measured in m^3.
+/// NOTINCLUDEDIN 
+///   Identifies that a value (individual item) must not be included (i.e. must be excluded) in the aggregation (set, list or table) set by the constraint.
+typedef enum {IfcBenchmark_GREATERTHAN, IfcBenchmark_GREATERTHANOREQUALTO, IfcBenchmark_LESSTHAN, IfcBenchmark_LESSTHANOREQUALTO, IfcBenchmark_EQUALTO, IfcBenchmark_NOTEQUALTO, IfcBenchmark_INCLUDES, IfcBenchmark_NOTINCLUDES, IfcBenchmark_INCLUDEDIN, IfcBenchmark_NOTINCLUDEDIN} IfcBenchmarkEnum;
+const char* ToString(IfcBenchmarkEnum v);
+IfcBenchmarkEnum FromString(const std::string& s);
+}
+namespace IfcBoilerTypeEnum {
+/// Enumeration defining the typical types of boilers.
+///   The IfcBoilerTypeEnum contains the following:
 /// 
-/// Type: REAL 
+/// WATER: Water boiler.
+///   STEAM: Steam boiler.
+///   USERDEFINED: User-defined Boiler type.
+///   NOTDEFINED:  Undefined Boiler type.
 /// 
-/// HISTORY New type in IFC Release 2x2.
-typedef double IfcSectionModulusMeasure;
-/// The sectional area integral measure is typically used in torsional analysis. It is usually measured in m^5.
+/// HISTORY: New enumeration in IFC R2x.
+typedef enum {IfcBoilerType_WATER, IfcBoilerType_STEAM, IfcBoilerType_USERDEFINED, IfcBoilerType_NOTDEFINED} IfcBoilerTypeEnum;
+const char* ToString(IfcBoilerTypeEnum v);
+IfcBoilerTypeEnum FromString(const std::string& s);
+}
+namespace IfcBooleanOperator {
+/// Definition from ISO/CD 10303-42:1992: This type defines the three Boolean operators used in the definition of CSG solids.
 /// 
-/// Type: REAL  
+/// UNION: The operation of constructing the regularized set theoretic union of the volumes defined by two solids.
+/// INTERSECTION: The operation of constructing the regularised set theoretic intersection of the volumes defined by two solids.
+/// DIFFERENCE: The operation of constructing the regularized set theoretic intersection of the volumes defined by two solids.
 /// 
-/// HISTORY New type in IFC2x2.
-typedef double IfcSectionalAreaIntegralMeasure;
-/// IfcShearModulusMeasure is a measure of shear modulus.
-/// Usually measured in N/m2.
-/// Type: REAL
+/// NOTE Corresponding STEP type: boolean_operator, please refer to ISO/IS 10303-42:1994, p.167 for the final definition of the formal standard.
 /// 
-/// HISTORY New type in IFC Release 2x.
-typedef double IfcShearModulusMeasure;
-/// Definition from ISO/CD 10303-41:1992: A solid angle measure is the value of an angle in a solid.
-/// Usually measured in Steradians, (sr, m2/m2).
-/// Type: REAL
+/// HISTORY New Type in IFC Release 1.5.1.
+typedef enum {IfcBooleanOperator_UNION, IfcBooleanOperator_INTERSECTION, IfcBooleanOperator_DIFFERENCE} IfcBooleanOperator;
+const char* ToString(IfcBooleanOperator v);
+IfcBooleanOperator FromString(const std::string& s);
+}
+namespace IfcBuildingElementPartTypeEnum {
+/// Definition from IAI: This enumeration defines the different types of building element parts:
 /// 
-/// NOTE Corresponding ISO 10303 name: solid_angle_measure, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
+/// INSULATION: The part provides thermal insulation, for example as insulation layer between wall panels in sandwich walls or as infill in stud walls.
+/// PRECASTPANEL: The part is a precast panel, usually as an internal or external layer in a sandwich wall panel.
+/// USERDEFINED: User-defined accessory
+/// NOTDEFINED: Undefined accessory
 /// 
-/// HISTORY New type in IFC Release 1.5.1.
-typedef double IfcSolidAngleMeasure;
-
-typedef double IfcSoundPowerLevelMeasure;
-/// A sound power measure is a measure of total radiated noise with units of decibels with a reference value of picowatts.
+/// HISTORY  New Enumeration in IFC 2x4.
+typedef enum {IfcBuildingElementPartType_INSULATION, IfcBuildingElementPartType_PRECASTPANEL, IfcBuildingElementPartType_USERDEFINED, IfcBuildingElementPartType_NOTDEFINED} IfcBuildingElementPartTypeEnum;
+const char* ToString(IfcBuildingElementPartTypeEnum v);
+IfcBuildingElementPartTypeEnum FromString(const std::string& s);
+}
+namespace IfcBuildingElementProxyTypeEnum {
+/// Definition from IAI: This enumeration defines the
+///   available generic types for IfcBuildingElementProxyType.
 /// 
-/// Type: REAL  
+/// HISTORY  New enumeration
+///   in Release IFC2x Edition 3.
 /// 
-/// HISTORY New type in IFC2x2.
-typedef double IfcSoundPowerMeasure;
-
-typedef double IfcSoundPressureLevelMeasure;
-/// A sound pressure measure is a measure of the pressure fluctuations superimposed over the ambient pressure level with units of decibels with a reference value of micropascals. 
+/// Enumeration
 /// 
-/// Type: REAL  
+/// USERDEFINED
 /// 
-/// HISTORY New type in IFC2x2.
-typedef double IfcSoundPressureMeasure;
-/// IfcSpecificHeatCapacityMeasure defines the specific heat of material: The heat energy absorbed per temperature unit.
-/// Usually measured in J / kg Kelvin.
-/// Type: REAL
+/// NOTDEFINED
+typedef enum {IfcBuildingElementProxyType_COMPLEX, IfcBuildingElementProxyType_ELEMENT, IfcBuildingElementProxyType_PARTIAL, IfcBuildingElementProxyType_PROVISIONFORVOID, IfcBuildingElementProxyType_USERDEFINED, IfcBuildingElementProxyType_NOTDEFINED} IfcBuildingElementProxyTypeEnum;
+const char* ToString(IfcBuildingElementProxyTypeEnum v);
+IfcBuildingElementProxyTypeEnum FromString(const std::string& s);
+}
+namespace IfcBuildingSystemTypeEnum {
+/// Definition from IAI: This enumeration identifies
+/// different types of distribution systems.
+/// HISTORY New enumeration
+/// in IFC2x4.
+/// Valid enumerations for building systems include:
 /// 
-/// HISTORY New type in IFC Release 2x.
-typedef double IfcSpecificHeatCapacityMeasure;
-/// The IfcSpecularExponent defines the datatype for exponent determining the sharpness of the 'reflection'. reflection is made sharper with large values of the exponent, such as 10.0. Small values, such as 1.0, decrease the specular fall-off. 
+/// FENESTRATION: System of doors, windows, and other
+/// fillings in opening in a building envelop that are designed to
+/// permit the passage of air or light,
+/// SHADING: System of shading elements (external or
+/// internal) that permits the limitation or control of impact of
+/// natural sun light,
+/// TRANSPORT: System of all transport elements in a
+/// building that enables the transport of people or goods.
+typedef enum {IfcBuildingSystemType_FENESTRATION, IfcBuildingSystemType_FOUNDATION, IfcBuildingSystemType_LOADBEARING, IfcBuildingSystemType_OUTERSHELL, IfcBuildingSystemType_SHADING, IfcBuildingSystemType_TRANSPORT, IfcBuildingSystemType_USERDEFINED, IfcBuildingSystemType_NOTDEFINED} IfcBuildingSystemTypeEnum;
+const char* ToString(IfcBuildingSystemTypeEnum v);
+IfcBuildingSystemTypeEnum FromString(const std::string& s);
+}
+namespace IfcBurnerTypeEnum {
+/// Enumeration defining the functional type of burner.
+///   The IfcBurnerTypeEnum contains the following:
 /// 
-/// IfcSpecularExponent is of type REAL.
+/// USERDEFINED: User-defined burner type.
+///   NOTDEFINED:  Undefined burner type.
 /// 
-/// NOTE: The datatype relates to the definition of specular_exponent in ISO 10303-46 entity surface_style_reflectance_ambient_diffuse_specular.
+/// HISTORY: New enumeration in IFC R2x4.
+typedef enum {IfcBurnerType_USERDEFINED, IfcBurnerType_NOTDEFINED} IfcBurnerTypeEnum;
+const char* ToString(IfcBurnerTypeEnum v);
+IfcBurnerTypeEnum FromString(const std::string& s);
+}
+namespace IfcCableCarrierFittingTypeEnum {
+/// The IfcCableCarrierFittingTypeEnum defines the range of different types of cable carrier fitting that can be specified. 
+///   HISTORY: New type in IFC 2x2  
+///   Enumeration 
 /// 
-/// HISTORY: New type in IFC2x2.
-typedef double IfcSpecularExponent;
-/// The IfcSpecularRoughness defines the datatype for the reflection resulting from the roughness of a surface through the height of surface impurities where the specular highlight is made sharper with small values for the roughness, such as 0.1.  
+/// BEND: A fitting that changes the route of the cable carrier. 
+/// CROSS: A fitting at which two branches are taken from the main route of the cable carrier simultaneously. 
+/// REDUCER: A fitting that changes the physical size of the main route of the cable carrier. 
+/// TEE: A fitting at which a branch is taken from the main route of the cable carrier. 
+/// USERDEFINED: User-defined type. 
+/// NOTDEFINED: Undefined type.
+typedef enum {IfcCableCarrierFittingType_BEND, IfcCableCarrierFittingType_CROSS, IfcCableCarrierFittingType_REDUCER, IfcCableCarrierFittingType_TEE, IfcCableCarrierFittingType_USERDEFINED, IfcCableCarrierFittingType_NOTDEFINED} IfcCableCarrierFittingTypeEnum;
+const char* ToString(IfcCableCarrierFittingTypeEnum v);
+IfcCableCarrierFittingTypeEnum FromString(const std::string& s);
+}
+namespace IfcCableCarrierSegmentTypeEnum {
+/// The IfcCableCarrierSegmentTypeEnum defines the range of different types of cable carrier segment that can be specified. 
+///   HISTORY: New type in IFC 2x2  
+///   Enumeration 
 /// 
-/// Applies to "glass", "metal", "mirror" and "plastic" reflection models. Larger values, close to 1.0 decrease the specular fall-off. 
+/// CABLELADDERSEGMENT: An open carrier segment on which cables are carried on a ladder structure.
+/// CABLETRAYSEGMENT: A (typically) open carrier segment onto which cables are laid.
+/// CABLETRUNKINGSEGMENT: An enclosed carrier segment with one or more compartments into which cables are placed.
+/// CONDUITSEGMENT: An enclosed tubular carrier segment through which cables are pulled.
+/// USERDEFINED: User-defined type.  
+/// NOTDEFINED: Undefined type.
+typedef enum {IfcCableCarrierSegmentType_CABLELADDERSEGMENT, IfcCableCarrierSegmentType_CABLETRAYSEGMENT, IfcCableCarrierSegmentType_CABLETRUNKINGSEGMENT, IfcCableCarrierSegmentType_CONDUITSEGMENT, IfcCableCarrierSegmentType_USERDEFINED, IfcCableCarrierSegmentType_NOTDEFINED} IfcCableCarrierSegmentTypeEnum;
+const char* ToString(IfcCableCarrierSegmentTypeEnum v);
+IfcCableCarrierSegmentTypeEnum FromString(const std::string& s);
+}
+namespace IfcCableFittingTypeEnum {
+/// The IfcCableFittingTypeEnum defines the range of different types of cable fitting that can be specified. 
+///   HISTORY: New type in IFC 2x4  
+///   Enumeration 
 /// 
-/// IfcSpecularRoughness is of type REAL. It is constraint to values between (and including) 0 and 1.
+/// CONNECTOR: A fitting that joins two cable segments of the same connector type (though potentially different gender). 
+/// ENTRY: A fitting that begins a cable segment at a non-electrical element such as a grounding clamp attached to a pipe. 
+/// EXIT: A fitting that ends a cable segment at a non-electrical element such as a grounding clamp attached to a pipe or to the ground.  
+/// JUNCTION: A fitting that joins three or more segments of arbitrary connector types for signal splitting or multiplexing.  
+/// TRANSITION: A fitting that joins two cable segments of different connector types.  
+/// USERDEFINED: User-defined type. 
+/// NOTDEFINED: Undefined type.
+typedef enum {IfcCableFittingType_CONNECTOR, IfcCableFittingType_ENTRY, IfcCableFittingType_EXIT, IfcCableFittingType_JUNCTION, IfcCableFittingType_TRANSITION, IfcCableFittingType_USERDEFINED, IfcCableFittingType_NOTDEFINED} IfcCableFittingTypeEnum;
+const char* ToString(IfcCableFittingTypeEnum v);
+IfcCableFittingTypeEnum FromString(const std::string& s);
+}
+namespace IfcCableSegmentTypeEnum {
+/// The IfcCableSegmentTypeEnum defines the range of different types of cable segment that can be specified. 
 /// 
-/// NOTE: The datatype relates to the definition of "shiness" in VRML97, which is the reciprocate value to the specular roughness.
+/// HISTORY: New type in IFC
+///   2x2. Core and busbar segment added in IFC 2x4.  
+///   Enumeration 
 /// 
-/// HISTORY: New type in Release IFC2x2.
-typedef double IfcSpecularRoughness;
-/// The temperature gradient measures the difference of a temperature per lenght, as for instance used in an external wall or its layers.  It is usually measured in K/m.
+/// BUSBARSEGMENT: Electrical conductor that makes a common connection between several electrical circuits. Properties of a busbar are the same as those of a cable segment and are captured by the cable segment property set. 
+/// CABLESEGMENT: Cable with a specific purpose to lead electric current within a circuit or any other electric construction. Includes all types of electric cables, mainly several core segments or conductor segments wrapped together. 
+/// CONDUCTORSEGMENT: A single linear element within a cable or an exposed wire (such as for grounding) with the specific purpose to lead electric current, data, or a telecommunications signal.  
+/// CORESEGMENT: A self contained element of a  cable that comprises one or more conductors and sheathing.The core of one lead is normally single wired or multiwired which are intertwined.  
+/// USERDEFINED: User-defined type.  
+/// NOTDEFINED: Undefined type.
+typedef enum {IfcCableSegmentType_BUSBARSEGMENT, IfcCableSegmentType_CABLESEGMENT, IfcCableSegmentType_CONDUCTORSEGMENT, IfcCableSegmentType_CORESEGMENT, IfcCableSegmentType_USERDEFINED, IfcCableSegmentType_NOTDEFINED} IfcCableSegmentTypeEnum;
+const char* ToString(IfcCableSegmentTypeEnum v);
+IfcCableSegmentTypeEnum FromString(const std::string& s);
+}
+namespace IfcChangeActionEnum {
+/// IfcChangeActionEnum identifies the type of change that might have occurred to the object during the last session (for example, added, modified, deleted). This information is required in a partial model exchange scenario so that an application or model server will know how an object might have been affected by the previous application. Valid enumerations are:
 /// 
-/// Type: REAL  
+/// NOCHANGE: Object has not been modified.
 /// 
-/// HISTORY New type in IFC2x2.
-typedef double IfcTemperatureGradientMeasure;
-/// The temperature rate of change measures the difference of a temperature per time (positive: rise, negative: fall), as for instance used with heat sensors. It is for example measured in K/s (Kelvin per second).
+/// MODIFIED: A modification to the object has been made by the user and application defined by the LastModifyingUser and LastModifyingApplication respectively.
 /// 
-/// Type: REAL 
+/// ADDED: The object has been created by the user and application defined by the OwningUser and OwningApplication respectively.
 /// 
-/// HISTORY  New type in IFC2x4.
-typedef double IfcTemperatureRateOfChangeMeasure;
-/// Definition from ISO/CD 10303-41:1992: A text is an alphanumeric string of characters which is intended to be read and understood by a human being. It is for information purposes only.
+/// DELETED: The object has been deleted by the user and application defined by the LastModifyingUser and LastModifyingApplication respectively.
 /// 
-/// Type: STRING
+/// NOTDEFINED: The change action is not known or has not been defined.
 /// 
-/// NOTE Corresponding STEP name: text, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
+/// Consider Application A will create an IFC dataset that it wants to publish to others for modification and have the ability to subsequently merge these changes back into the original model. Before publication, it may want to set the IfcChangeActionEnum to NOCHANGE to establish a baseline so that other application changes can be easily identified. Application B then receives this IFC dataset and adds a new object and sets IfcChangeActionEnum to ADDED with Application B defined as the OwningApplication. Application B then modifies an existing object and (re)defines the LastModifiedDate to the time of the modification, LastModifyingUser to the IfcPersonAndOrganization making the change, and sets the LastModifyingApplication to Application B. When Application A receives this modified dataset, it can determine which objects have been added and modified by Application B and either merge or reject these changes as necessary. Consequently, the intent is that an application only modifies the value of IfcChangeActionEnum when it does something to the object, with the further intent that a model server is responsible for clearing the IfcChangeActionEnum back to NOCHANGE when it is ready to be republished.
 /// 
-/// HISTORY New type in IFC Release 2x.
+/// HISTORY: New enumeration in IFC R2.0. Modified in IFC2x4.
+typedef enum {IfcChangeAction_NOCHANGE, IfcChangeAction_MODIFIED, IfcChangeAction_ADDED, IfcChangeAction_DELETED, IfcChangeAction_NOTDEFINED} IfcChangeActionEnum;
+const char* ToString(IfcChangeActionEnum v);
+IfcChangeActionEnum FromString(const std::string& s);
+}
+namespace IfcChillerTypeEnum {
+/// Enumeration defining the typical types of Chillers classified by their method of heat rejection. 
+///   The IfcChillerTypeEnum contains the following:
 /// 
-/// Per ISO 10303-11, the set of characters that may appear in STRINGs is defined in ISO 10646.  The encoding of characters in case of file-based exchange is defined in ISO 10303-21 (STEP physical files) and ISO 10303-28 (XML files).  Among else, these specifications define the encoding of 8-bit characters from ISO 8859-1...-16 and of 2-byte Unicode characters.
+/// AIRCOOLED: Air cooled chiller.
+///   WATERCOOLED: Water cooled chiller.
+///   HEATRECOVERY: Heat recovery chiller.
+///   USERDEFINED:	User-defined chiller type.
+///   NOTDEFINED: Undefined chiller type.
 /// 
-/// Note that while IfcText is not formally restricted in length, the size of a string in ISO 10303-21:2002 conforming exchange files must not exceed 32767 octets after encoding and escaping.
-typedef std::string IfcText;
-/// Definition from CSS1 (W3C Recommendation): This property describes how text is aligned within the element. The actual justification algorithm used is user agent and human language dependent. If 'justify' is not supported, the user agent will supply a replacement. Typically, this will be 'left' for western languages. Values are:
+/// HISTORY: New enumeration in IFC R2x.
+typedef enum {IfcChillerType_AIRCOOLED, IfcChillerType_WATERCOOLED, IfcChillerType_HEATRECOVERY, IfcChillerType_USERDEFINED, IfcChillerType_NOTDEFINED} IfcChillerTypeEnum;
+const char* ToString(IfcChillerTypeEnum v);
+IfcChillerTypeEnum FromString(const std::string& s);
+}
+namespace IfcChimneyTypeEnum {
+/// Definition from IAI: Enumeration defining the valid
+///   types of chimneys that can be predefined using the
+///   enumeration values.
 /// 
-/// left
-///   right
-///   center
-///   justify
+/// HISTORY  New Enumeration in
+///   Release IFC2x4
 /// 
-/// NOTE  Corresponding CSS1 definition is text-align.
+/// NOTE  Currently there are no specific enumerators
+///   defined, the IfcChimneyTypeEnum has been added
+///   for future extensions.
+typedef enum {IfcChimneyType_USERDEFINED, IfcChimneyType_NOTDEFINED} IfcChimneyTypeEnum;
+const char* ToString(IfcChimneyTypeEnum v);
+IfcChimneyTypeEnum FromString(const std::string& s);
+}
+namespace IfcCoilTypeEnum {
+/// Enumeration defining the typical types of coils.
 /// 
-/// HISTORY  New type in IFC2x3.
-typedef std::string IfcTextAlignment;
-/// Definition from CSS1 (W3C Recommendation): This property describes decorations that are added to the text of an element. A value of 'blink' causes the text to blink.. Values are:
+/// The IfcCoilTypeEnum contains the following:
 /// 
-/// none
-///   underline
-///   overline
-///   line-through
-///   blink
+/// DXCOOLINGCOIL: Cooling coil using a refrigerant to cool the air stream directly.
 /// 
-/// User agents must recognize the keyword 'blink', but are not required to support the blink effect.
+/// WATERCOOLINGCOIL: Cooling coil using chilled water. HYDRONICCOIL supercedes this enumerator.
 /// 
-/// NOTE  Corresponding CSS1 definition is text-decoration.
+/// STEAMHEATINGCOIL: Heating coil using steam as heating source.
 /// 
-/// HISTORY  New type in IFC2x3.
-typedef std::string IfcTextDecoration;
-/// Definition from CSS1 (W3C Recommendation): The value is a font family name and/or generic family name. Values are:
+/// WATERHEATINGCOIL: Heating coil using hot water as a heating source. HYDRONICCOIL supercedes this enumerator.
 /// 
-/// The name of a font family of choice. For example, "gill" and "helvetica" are font families.
+/// ELECTRICHEATINGCOIL: Heating coil using electricity as a heating source.
 /// 
-/// In the example above, the last value is a generic family name. The following generic families are defined:
+/// GASHEATINGCOIL: Heating coil using gas as a heating source.
 /// 
-/// 'serif' (Example: Times)
-///   'sans-serif' (Example: Helvetica)
-///   'cursive' (Example: Zapf-Chancery)
-///   'fantasy' (Example: Western)
-///   'monospace' (Example: Courier)
+/// HYDRONICCOIL: Cooling or Heating coil that uses a hydronic fluid as a cooling or heating source.
+///   USERDEFINED: User-defined coil type.
 /// 
-/// It is encouraged to offer a generic font family as a last alternative.
+/// NOTDEFINED:  Undefined coil type.
 /// 
-/// NOTE  Corresponding CSS1 definitions are font-family.
+/// HISTORY: New enumeration in IFC R2x.
+typedef enum {IfcCoilType_DXCOOLINGCOIL, IfcCoilType_ELECTRICHEATINGCOIL, IfcCoilType_GASHEATINGCOIL, IfcCoilType_HYDRONICCOIL, IfcCoilType_STEAMHEATINGCOIL, IfcCoilType_WATERCOOLINGCOIL, IfcCoilType_WATERHEATINGCOIL, IfcCoilType_USERDEFINED, IfcCoilType_NOTDEFINED} IfcCoilTypeEnum;
+const char* ToString(IfcCoilTypeEnum v);
+IfcCoilTypeEnum FromString(const std::string& s);
+}
+namespace IfcColumnTypeEnum {
+/// Definition from IAI: This enumeration defines the
+/// different types of linear elements an IfcColumnType object
+/// can fulfill:
 /// 
-/// HISTORY  New type in IFC2x2 Addendum 2.
+/// COLUMN: A standard column element usually used
+/// vertically.
+/// USERDEFINED: User-defined linear element.
+/// NOTDEFINED: Undefined linear element
 /// 
-/// IFC2x2 Addendum 2 CHANGE: The IfcFontFamily has been added.
-typedef std::string IfcTextFontName;
-/// Definition from CSS1 (W3C Recommendation): This property describes how the cases of characters are handled. Values are:
+/// NOTE: This enumeration has been mainly
+/// introduced to allow further detailing of the type information in
+/// future releases of IFC.
+/// HISTORY New Enumeration
+/// in Release IFC2x Edition 2.
+typedef enum {IfcColumnType_COLUMN, IfcColumnType_PILASTER, IfcColumnType_USERDEFINED, IfcColumnType_NOTDEFINED} IfcColumnTypeEnum;
+const char* ToString(IfcColumnTypeEnum v);
+IfcColumnTypeEnum FromString(const std::string& s);
+}
+namespace IfcCommunicationsApplianceTypeEnum {
+/// Defines the range of different types of communications appliance that can be specified. 
 /// 
-/// capitalize: uppercases the first character of each word
-///   uppercase: uppercases all letters of the element
-///   lowercase: lowercases all letters of the element
-///   none
+/// HISTORY: New enumeration in IFC2x4 
 /// 
-/// NOTE  Corresponding CSS1 definition is text-transform.
+/// ANTENNA: A transducer designed to transmit or receive electromagnetic waves. 
+/// COMPUTER: A desktop, laptop, PDA or other type of computer that can be moved from one place to another and connected to an electrical supply via a plugged outlet. 
+/// FAX: A machine that has the primary function of transmitting a facsimile copy of printed matter using a telephone line. 
+/// GATEWAY: A gateway connects multiple network segments with different protocols at all layers (layers 1-7) of the OSI model 
+/// MODEM: A modem (from modulator-demodulator) is a device that modulates an analog carrier signal to encode digital information, and also demodulates such a carrier signal to decode the transmitted information 
+/// NETWORKAPPLIANCE: A network appliance performs a dedicated function such as firewall protection, content filtering, load balancing, or equipment management. 
+/// NETWORKBRIDGE: A network bridge connects multiple network segments at the data link layer (layer 2) of the OSI model, and the term layer 2 switch is very often used interchangeably with bridge 
+/// NETWORKHUB: A network hub connects multiple network segments at the physical layer (layer 1) of the OSI model. 
+/// PRINTER: A machine that has the primary function of printing text and/or graphics onto paper or other media. 
+/// REPEATER: A repeater is an electronic device that receives a signal and retransmits it at a higher level and/or higher power, or onto the other side of an obstruction, so that the signal can cover longer distances without degradation. 
+/// ROUTER: A router is a networking device whose software and hardware are usually tailored to the tasks of routing and forwarding information. For example, on the Internet, information is directed to various paths by routers. 
+/// SCANNER: A machine that has the primary function of scanning the content of printed matter and converting it to digital format that can be stored in a computer.
+typedef enum {IfcCommunicationsApplianceType_ANTENNA, IfcCommunicationsApplianceType_COMPUTER, IfcCommunicationsApplianceType_FAX, IfcCommunicationsApplianceType_GATEWAY, IfcCommunicationsApplianceType_MODEM, IfcCommunicationsApplianceType_NETWORKAPPLIANCE, IfcCommunicationsApplianceType_NETWORKBRIDGE, IfcCommunicationsApplianceType_NETWORKHUB, IfcCommunicationsApplianceType_PRINTER, IfcCommunicationsApplianceType_REPEATER, IfcCommunicationsApplianceType_ROUTER, IfcCommunicationsApplianceType_SCANNER, IfcCommunicationsApplianceType_USERDEFINED, IfcCommunicationsApplianceType_NOTDEFINED} IfcCommunicationsApplianceTypeEnum;
+const char* ToString(IfcCommunicationsApplianceTypeEnum v);
+IfcCommunicationsApplianceTypeEnum FromString(const std::string& s);
+}
+namespace IfcComplexPropertyTemplateTypeEnum {
+/// This enumeration defines the subtype of instances of IfcComplexProperty or IfcPhysicalComplexQuantity that may be created and defined by an IfcComplexPropertyTemplate.
 /// 
-/// HISTORY  New type in IFC2x3.
-typedef std::string IfcTextTransformation;
-/// IfcThermalAdmittanceMeasure is the measure of the ability of a surface to smooth out temperature variations.
-/// Usually measured in Watt / m2 Kelvin.
-/// Type: REAL
+/// HISTORY New enumeration in IFC2x4.
 /// 
-/// HISTORY New type in IFC Release 2.0.
-typedef double IfcThermalAdmittanceMeasure;
-/// IfcThermalConductivityMeasure is a measure of thermal conductivity.
-/// Usually measured in Watt / m Kelvin.
-/// Type: REAL
+/// Enumeration
 /// 
-/// HISTORY New type in IFC Release 2x.
-typedef double IfcThermalConductivityMeasure;
-/// IfcThermalExpansionCoeffientMeasure is a measure of the thermal expansion coefficient of a material, which expresses its elongation (as a ratio) per temperature difference. It is usually measured in 1/K. A positive elongation per (positive) rise of temperature is expressed by a positive value.
-/// Type: REAL  
+/// P_COMPLEX: the properties defined by this IfcComplexPropertyTemplate are of type IfcComplexProperty.
+/// Q_COMPLEX: the properties defined by this IfcComplexPropertyTemplate are of type IfcPhysicalComplexQuantity.
+typedef enum {IfcComplexPropertyTemplateType_P_COMPLEX, IfcComplexPropertyTemplateType_Q_COMPLEX} IfcComplexPropertyTemplateTypeEnum;
+const char* ToString(IfcComplexPropertyTemplateTypeEnum v);
+IfcComplexPropertyTemplateTypeEnum FromString(const std::string& s);
+}
+namespace IfcCompressorTypeEnum {
+/// Types of compressors.
+///   The IfcCompressorTypeEnum contains the following:
 /// 
-/// HISTORY New type in IFC2x2.
-typedef double IfcThermalExpansionCoefficientMeasure;
-/// IfcThermalResistanceMeasure is a measure of the resistance offered by a body to the flow of energy.
-/// Usually measured in m2 Kelvin/Watt.
+/// DYNAMIC: The pressure of refrigerant vapor is increased by a continuous transfer of angular momentum from a rotating member to the vapor followed by conversion of this momentum into static pressure.
+///   RECIPROCATING: Positive-displacement compressor using a piston driven by a connecting rod from a crankshaft.
+///   ROTARY: Positive-displacement compressor using a roller or rotor device.
+///   SCROLL: Positive-displacement compressor using two inter-fitting, spiral-shaped scroll members.
+///   TROCHOIDAL: Positive-displacement compressor using a rolling motion of one circle outside or inside the circumference of a basic circle and produce either epitrochoids or hypotrochoids.
+///   SINGLESTAGE: Positive-displacement reciprocating compressor where vapor is compressed in a single stage.
+///   BOOSTER: Positive-displacement reciprocating compressor where pressure is increased by a booster.
+///   OPENTYPE: Positive-displacement reciprocating compressor where the shaft extends through a seal in the crankcase for an external drive.
+///   HERMETIC: Positive-displacement reciprocating compressor where the motor and compressor are contained within the same housing, with the motor shaft integral with the compressor crankshaft and the motor in contact with refrigerant.
+///   SEMIHERMETIC: Positive-displacement reciprocating compressor where the hermetic compressors use bolted construction amenable to field repair.
+///   WELDEDSHELLHERMETIC: Positive-displacement reciprocating compressor where the motor compressor is mounted inside a steel shell, which, in turn is sealed by welding.
+///   ROLLINGPISTON: Positive-displacement rotary compressor using a roller mounted on the eccentric of a shaft with a single vane in the nonrotating cylindrical housing.
+///   ROTARYVANE: Positive-displacement rotary compressor using a roller mounted on the eccentric of a shaft with multiple vanes in the nontotating cylindrical housing.
+///   SINGLESCREW: Positive-displacement rotary compressor using a single cylindrical main rotor that works with a pair of gate rotors.
+///   TWINSCREW: Positive-displacement rotary compressor using two mating helically grooved rotors, male (lobes) and female (flutes) in a stationary housing with inlet and outlet gas ports.
+///   USERDEFINED: User-defined compressor type.
+///   NOTDEFINED:  Undefined compressor type.
 /// 
-/// HISTORY New type in IFC Release 2.0.
-typedef double IfcThermalResistanceMeasure;
-/// IfcThermalTransmittanceMeasure is a measure of the rate at which energy is transmitted through a body.
-/// Usually measured in Watts/m2 Kelvin.
-/// Type: REAL
+/// HISTORY: New enumeration in IFC R2x.
+typedef enum {IfcCompressorType_DYNAMIC, IfcCompressorType_RECIPROCATING, IfcCompressorType_ROTARY, IfcCompressorType_SCROLL, IfcCompressorType_TROCHOIDAL, IfcCompressorType_SINGLESTAGE, IfcCompressorType_BOOSTER, IfcCompressorType_OPENTYPE, IfcCompressorType_HERMETIC, IfcCompressorType_SEMIHERMETIC, IfcCompressorType_WELDEDSHELLHERMETIC, IfcCompressorType_ROLLINGPISTON, IfcCompressorType_ROTARYVANE, IfcCompressorType_SINGLESCREW, IfcCompressorType_TWINSCREW, IfcCompressorType_USERDEFINED, IfcCompressorType_NOTDEFINED} IfcCompressorTypeEnum;
+const char* ToString(IfcCompressorTypeEnum v);
+IfcCompressorTypeEnum FromString(const std::string& s);
+}
+namespace IfcCondenserTypeEnum {
+/// Enumeration defining the typical types of condensers.  Air is used as the cooling medium for AIRCOOLED; water is used as the cooling medium for all other types.  The IfcCondenserTypeEnum contains the following:
 /// 
-/// HISTORY New type in IFC Release 2.0.
-typedef double IfcThermalTransmittanceMeasure;
-/// Definition from ISO/CD 10303-41:1992: A thermodynamic temperature measure is the value for the degree of heat of a body.
-/// Usually measured in degrees Kelvin (K).
-/// Type: REAL
+/// AIRCOOLED: A condenser in which heat is transferred to an air-stream.
+///   EVAPORATIVECOOLED: A condenser that is cooled evaporatively.
+///   WATERCOOLED: Water-cooled condenser with unspecified operation.
+///   WATERCOOLEDSHELLTUBE: Water-cooled condenser with cooling water circulated through one or more tubes contained within the shell.
+///   WATERCOOLEDSHELLCOIL: Water-cooled condenser with cooling water circulated through one or more continuous or assembled coils contained within the shell.
+///   WATERCOOLEDTUBEINTUBE: Water-cooled condenser consisting of one or more assemblies of two tubes, one within the other.
+///   WATERCOOLEDBRAZEDPLATE: Water-cooled condenser condenser with plates brazed together to form an assembly of separate channels.
+///   USERDEFINED: User-defined condenser type.
+///   NOTDEFINED:  Undefined condenser type.
 /// 
-/// NOTE Corresponding ISO 10303 name: thermodynamic_temperature_measure, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
+/// HISTORY: New enumeration in IFC 2x2.  WATERCOOLED added in IFC 2x4.
+typedef enum {IfcCondenserType_AIRCOOLED, IfcCondenserType_EVAPORATIVECOOLED, IfcCondenserType_WATERCOOLED, IfcCondenserType_WATERCOOLEDBRAZEDPLATE, IfcCondenserType_WATERCOOLEDSHELLCOIL, IfcCondenserType_WATERCOOLEDSHELLTUBE, IfcCondenserType_WATERCOOLEDTUBEINTUBE, IfcCondenserType_USERDEFINED, IfcCondenserType_NOTDEFINED} IfcCondenserTypeEnum;
+const char* ToString(IfcCondenserTypeEnum v);
+IfcCondenserTypeEnum FromString(const std::string& s);
+}
+namespace IfcConnectionTypeEnum {
+/// This enumeration defines the different ways how path based elements (such as IfcWallStandardCase) can connect, as shown in Figure 65. 
 /// 
-/// HISTORY New type in IFC Release 1.5.1.
-typedef double IfcThermodynamicTemperatureMeasure;
-/// The lexical representation for time is the left truncated
-///   lexical representation for dateTime: hh:mm:ss.sss with
-///   optional following time zone indicator. For example, to
-///   indicate 1:20 pm for Eastern Standard Time which is 5 hours
-///   behind Coordinated Universal Time (UTC), one would write:
-///   13:20:00-05:00.
+/// HISTORY New type in IFC Release 2.0 
 /// 
-/// HISTORY: New type in IFC2x4
-typedef std::string IfcTime;
-/// Definition from ISO/CD 10303-41:1992: A time measure is the value of the duration of periods.
-/// Measured in seconds (s) or days (d) or other units of time.
-/// Type: REAL
+/// L-Shape Connection 
 /// 
-/// NOTE Corresponding ISO 10303 name: time_measure, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
+/// RelatingConnectionType: AtStart 
+///   RelatedConnectionType: AtStart 
 /// 
-/// HISTORY New type in IFC Release 1.5.1.
-typedef double IfcTimeMeasure;
-/// IfcTimeStamp is an indication of date and time by measuring the number of seconds which have elapsed since the beginning of the year 1970.
-/// Type: INTEGER
+/// L-Shape Connection 
 /// 
-/// HISTORY New type in IFC Release 1.5.1.
-typedef int IfcTimeStamp;
-/// IfcTorqueMeasure is a measure of the torque or moment of a couple.
-/// Usually measured in N m.
-/// Type: REAL
+/// RelatingConnectionType: AtEnd 
+///   RelatedConnectionType: AtStart 
 /// 
-/// HISTORY New type in IFC Release 2x.
-typedef double IfcTorqueMeasure;
-/// IfcURIReference provides for identifying a Uniform Resource Identifier, URI, as defined by the RFC3986 of the Network Working Group. A URI can be classified as a locator or a name or both, that is it may comprise a Uniform Resource Locator (URL) and/or a Uniform Resource Name (URN).
+/// T-Shape Connection 
 /// 
-/// A Uniform Resource Locator, URL, is a string conforming to a standardized format, which refers to a resource on the internet (such as a document or an image) by its location.
-/// A Uniform Resource Name, URN, is intended to serve as persistent, location-independent resource identifier and is
-/// designed to make it easy to map other namespaces (that share the properties of URNs) into URN-space.
+/// RelatingConnectionType: AtPath 
+///   RelatedConnectionType: AtStart 
 /// 
-/// HISTORY New defined datatype in IFC 2x4.
-typedef std::string IfcURIReference;
-/// IfcVaporPermeabilityMeasure is a measure of vapor permeability.
-/// Usually measured in kg / s m Pascal.
-/// Type: REAL
+/// Figure 65 — Connection types</td
+typedef enum {IfcConnectionType_ATPATH, IfcConnectionType_ATSTART, IfcConnectionType_ATEND, IfcConnectionType_NOTDEFINED} IfcConnectionTypeEnum;
+const char* ToString(IfcConnectionTypeEnum v);
+IfcConnectionTypeEnum FromString(const std::string& s);
+}
+namespace IfcConstraintEnum {
+/// IfcConstraintEnum is an enumeration used to qualify a constraint. 
 /// 
-/// HISTORY New type in IFC Release 2x.
-typedef double IfcVaporPermeabilityMeasure;
-/// Definition from ISO/CD 10303-41:1992: A volume measure is the value of the solid content of a body.
-/// Usually measured in cubic metre (m3).
-/// Type: REAL
+/// HISTORY: New type in IFC Release 2.0
 /// 
-/// NOTE Corresponding ISO 10303 name: volume_measure, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
+/// Enumeration 
 /// 
-/// HISTORY New type in IFC Release 1.5.1.
-typedef double IfcVolumeMeasure;
-/// IfcVolumetricFlowRateMeasure is a measure of the volume of a medium flowing per unit time.
-/// Usually measured in m3/s.
-/// Type: REAL
+/// Value 
+///   Definition 
 /// 
-/// HISTORY New type in IFC Release 2.0.
-typedef double IfcVolumetricFlowRateMeasure;
-/// IfcWarpingConstantMeasure is a measure for the warping constant or warping resistance of a cross section under torsional loading. It is usually measured in m^6.
+/// HARD 
+///   Qualifies a constraint such that it must be followed rigidly within or at the values set. 
 /// 
-/// Type: REAL  
+/// SOFT 
+///   Qualifies a constraint such that it should be followed within or at the values set. 
 /// 
-/// HISTORY New type in IFC2x2.
-typedef double IfcWarpingConstantMeasure;
-/// The warping moment measure is a measure for the warping moment, which occurs in warping torsional analysis. It is usually measured in kN*m^2.
+/// ADVISORY 
+///   Qualifies a constraint such that it is advised that it is followed within or at the values set.
+typedef enum {IfcConstraint_HARD, IfcConstraint_SOFT, IfcConstraint_ADVISORY, IfcConstraint_USERDEFINED, IfcConstraint_NOTDEFINED} IfcConstraintEnum;
+const char* ToString(IfcConstraintEnum v);
+IfcConstraintEnum FromString(const std::string& s);
+}
+namespace IfcConstructionEquipmentResourceTypeEnum {
+/// This enumeration is used to identify the primary purpose of a construction equipment resource. It is limited to the most common equipment used in construction.  The IfcConstructionEquipmentResourceTypeEnum contains the following:
 /// 
-/// Type: REAL  
+/// DEMOLISHING: Removal or destruction of building elements.
+/// EARTHMOVING: Excavating, filling, or contouring earth.
+/// ERECTING: Lifting, positioning, and placing elements.
+/// HEATING: Temporary heat to support construction.
+/// LIGHTING: Temporary lighting to support construction.
+/// PAVING: Asphalt or concrete roads or walkways.
+/// PUMPING: Installing materials through pumps.
+/// TRANSPORTING: Transporting products or materials.
+/// USERDEFINED: User-defined resource.
+/// NOTDEFINED: Undefined resource.
 /// 
-/// HISTORY New type in IFC2x2.
-typedef double IfcWarpingMomentMeasure;
-/// The actor select type allows a person, or an organization, or a person associated with an organization to be referenced.
+/// HISTORY: New enumeration in IFC2x4
+typedef enum {IfcConstructionEquipmentResourceType_DEMOLISHING, IfcConstructionEquipmentResourceType_EARTHMOVING, IfcConstructionEquipmentResourceType_ERECTING, IfcConstructionEquipmentResourceType_HEATING, IfcConstructionEquipmentResourceType_LIGHTING, IfcConstructionEquipmentResourceType_PAVING, IfcConstructionEquipmentResourceType_PUMPING, IfcConstructionEquipmentResourceType_TRANSPORTING, IfcConstructionEquipmentResourceType_USERDEFINED, IfcConstructionEquipmentResourceType_NOTDEFINED} IfcConstructionEquipmentResourceTypeEnum;
+const char* ToString(IfcConstructionEquipmentResourceTypeEnum v);
+IfcConstructionEquipmentResourceTypeEnum FromString(const std::string& s);
+}
+namespace IfcConstructionMaterialResourceTypeEnum {
+/// This enumeration is used to identify the primary purpose of a construction material resource. It is limited to the most common raw materials used in construction and excludes materials commonly sold as finished products.  The IfcConstructionMaterialResourceTypeEnum contains the following:
 /// 
-/// NOTE Corresponds to the following entity in ISO 10303-41: person_organization_select.
+/// AGGREGATES: Construction aggregate including sand, gravel, and crushed stone.
+/// CONCRETE: Cast-in-place concrete.
+/// DRYWALL: Wall board, including gypsum board.
+/// FUEL: Fuel for running equipment.
+/// GYPSUM: Any gypsum material.
+/// MASONRY: Masonry including brick, stone, concrete block, glass block, and tile.
+/// METAL: Any metallic material.
+/// PLASTIC: Any plastic material.
+/// WOOD: Any wood material.
+/// USERDEFINED: User-defined resource.
+/// NOTDEFINED: Undefined resource.
 /// 
-/// HISTORY New entity in IFC Release 1.5.1
+/// HISTORY: New enumeration in IFC2x4
+typedef enum {IfcConstructionMaterialResourceType_AGGREGATES, IfcConstructionMaterialResourceType_CONCRETE, IfcConstructionMaterialResourceType_DRYWALL, IfcConstructionMaterialResourceType_FUEL, IfcConstructionMaterialResourceType_GYPSUM, IfcConstructionMaterialResourceType_MASONRY, IfcConstructionMaterialResourceType_METAL, IfcConstructionMaterialResourceType_PLASTIC, IfcConstructionMaterialResourceType_WOOD, IfcConstructionMaterialResourceType_NOTDEFINED, IfcConstructionMaterialResourceType_USERDEFINED} IfcConstructionMaterialResourceTypeEnum;
+const char* ToString(IfcConstructionMaterialResourceTypeEnum v);
+IfcConstructionMaterialResourceTypeEnum FromString(const std::string& s);
+}
+namespace IfcConstructionProductResourceTypeEnum {
+/// This enumeration is used to identify the primary purpose of a construction product resource. It describes use of products created for construction, and excludes products of the finished building model.  The IfcConstructionProductsResourceTypeEnum contains the following:
 /// 
-/// SELECT 
+/// ASSEMBLY: Construction of assemblies for use as input to the building model or other assemblies.
+/// FORMWORK: Construction or placement of forms for placing materials such as concrete.
+/// USERDEFINED: User-defined resource.
+/// NOTDEFINED: Undefined resource.
 /// 
-/// IfcOrganization An organization. 
-/// IfcPerson A person. 
-/// IfcPersonAndOrganization A person related to an organization.
-typedef IfcUtil::IfcSchemaEntity IfcActorSelect;
-/// IfcAppliedValueSelect defines the selection of whether a value (expressed as a ratio) or an amount should be used as the value for an IfcAppliedValue. 
+/// HISTORY: New enumeration in IFC2x4
+typedef enum {IfcConstructionProductResourceType_ASSEMBLY, IfcConstructionProductResourceType_FORMWORK, IfcConstructionProductResourceType_USERDEFINED, IfcConstructionProductResourceType_NOTDEFINED} IfcConstructionProductResourceTypeEnum;
+const char* ToString(IfcConstructionProductResourceTypeEnum v);
+IfcConstructionProductResourceTypeEnum FromString(const std::string& s);
+}
+namespace IfcControllerTypeEnum {
+/// The IfcControllerTypeEnum defines the range of different types of controller that can be specified.
 /// 
-/// Select from:  
+/// HISTORY: New type in IFC R2.0
+///   Documentation extended in IFC 2x4. PROPORTIONALINTEGRAL and PROPORTIONALINTEGRALDERIVATIVE values deleted (property set enumeration now used).  MULTIPOSITION added.
 /// 
-/// IfcMeasureWithUnit 
-///   IfcMonetaryMeasure 
-///   IfcRatioMeasure 
+/// Enumeration
 /// 
-/// HISTORY: New SELECT type in IFC 2x2.
+/// FLOATING: Output increases or decreases at a constant or accelerating rate.
+/// MULTIPOSITION: Output is discrete value, can be one of three or more values.
+/// PROGRAMMABLE: Output is programmable such as Discrete Digital Control (DDC).
+/// PROPORTIONAL: Output is proportional to the control error and optionally time integral and derivative.
+/// TWOPOSITION: Output can be either on or off
+/// USERDEFINED: User-defined type.
+/// NOTDEFINED: Undefined type.
+typedef enum {IfcControllerType_FLOATING, IfcControllerType_PROGRAMMABLE, IfcControllerType_PROPORTIONAL, IfcControllerType_MULTIPOSITION, IfcControllerType_TWOPOSITION, IfcControllerType_USERDEFINED, IfcControllerType_NOTDEFINED} IfcControllerTypeEnum;
+const char* ToString(IfcControllerTypeEnum v);
+IfcControllerTypeEnum FromString(const std::string& s);
+}
+namespace IfcCooledBeamTypeEnum {
+/// There are two general types of cooled or chilled beams: passive and active.
 /// 
-/// Use definitions 
-/// Selecting IfcMeasureWithUnit allows the specification of both the actual figure for the value together with the currency in which the value is represented. 
-/// Selecting IfcMonetaryMeasure allows the specification only of the value, the currency being as set by the global context 
-/// Selecting IfcRatioMeasure assumes that the amount is a percentage or other REAL number. Note that if the amount is normally specified as -20%, then this figure will need to be converted to a multiplier of 0.8
-typedef IfcUtil::IfcSchemaEntity IfcAppliedValueSelect;
-/// Definition from ISO/CD 10303-42:1992: This select type collects together both versions of the placement as used in two dimensional or in three dimensional Cartesian space. This enables entities requiring this information to reference them without specifying the space dimensionality.  
+/// An active Cooled Beam uses a fan or other auxilliary device to aid in air recirculation, while a passive
 /// 
-/// NOTE: Corresponding STEP type: axis2_placement, please refer to ISO/IS 10303-42:1994, p. 19 for the final definition of the formal standard.
+/// Cooled Beam relies solely on convection to cool the space.
 /// 
-/// HISTORY: New type in IFC Release 1.5
-typedef IfcUtil::IfcSchemaEntity IfcAxis2Placement;
-/// Definition from IAI: A select type for selecting between simple measure types for reinforcement bending parameters.
+/// Enumeration defining the typical types of cooled beams.
 /// 
-/// HISTORY New type in IFC Release 2x4
-typedef IfcUtil::IfcSchemaEntity IfcBendingParameterSelect;
-/// Definition from ISO/CD 10303-42:1992: This select type identifies
-///   all those types of entities which may participate in a Boolean operation to
-///   form a CSG solid.  
-///   Definition from IAI: CSG primitives are out of scope for the
-///   current IFC Release. Only faceted B-reps, swept area solids and half space
-///   solids are available as Boolean operands. Boolean results themselves can be used
-///   as operands thus enabling nested Boolean operations. 
+/// The IfcCooledBeamTypeEnum contains the following:
 /// 
-/// NOTE Corresponding STEP type:
-///   boolean_operand, please refer to ISO/IS 10303-42:1994, p.167 for the final
-///   definition of the formal standard. In IFC Release 1.5.1 & 2.0 only Boolean
-///   results (IfcBooleanResult), half space solids
-///   (IfcHalfSpaceSolid), faceted B-Rep, extruded solids and revolved solids
-///   (IfcSolidModel) are defined for being valid Boolean operands.
+/// ACTIVE: An active or ventilated cooled beam provides cooling (and heating) but can also function as an air terminal in a ventilation system.
 /// 
-/// HISTORY: New Type in IFC Release 1.5.1
-typedef IfcUtil::IfcSchemaEntity IfcBooleanOperand;
-/// IfcClassificationReferenceSelect enables selection of whether a classification reference is a subset of another classification reference or is a top level entry of a classification source. 
+/// PASSIVE: A passive or static cooled beam provides cooling (and heating) to a room or zone.
 /// 
-/// HISTORY: New Select Type in IFC2x
+/// USERDEFINED: User-defined cooled beam type.
 /// 
-/// Select From: 
+/// NOTDEFINED:  Undefined cooled beam type.
 /// 
-/// IfcClassification (for classification information)  
-/// IfcClassificationReference (for reference into a classification source)
-typedef IfcUtil::IfcSchemaEntity IfcClassificationReferenceSelect;
-/// IfcClassificationSelect enables selection of whether a classification reference is to be referenced from an external source, or whether a classification is referenced as such.
+/// HISTORY: New enumeration in IFC 2x2.
+typedef enum {IfcCooledBeamType_ACTIVE, IfcCooledBeamType_PASSIVE, IfcCooledBeamType_USERDEFINED, IfcCooledBeamType_NOTDEFINED} IfcCooledBeamTypeEnum;
+const char* ToString(IfcCooledBeamTypeEnum v);
+IfcCooledBeamTypeEnum FromString(const std::string& s);
+}
+namespace IfcCoolingTowerTypeEnum {
+/// Enumeration defining the typical types of cooling towers. 
+///   The IfcCoolingTowerTypeEnum contains the following:
 /// 
-/// NOTE  Generally, it is expected that selection will be by IfcClassificationReference to identify an individual classification notation that classifies an element in the building information model. For example an element, such as IfcTank, might be further classified by assigning an IfcClassificationReference with Identification = "L6814" and a ClassificationSource identifying the appropriate version of Uniclass.  IfcClassification should only be selected in
-/// circumstances where there could be a need to indicate the classification system that will be used without associating a notation or reference to an individual object. This may occur for higher level objects such as IfcProject, IfcSystem, or similar. For example an IfcStructuralAnalysisModel might be classified to be applicable to a particular version of EuroCode.
+/// NATURALDRAFT: Air flow is produced naturally.
+///   MECHANICALINDUCEDDRAFT: Air flow is produced by a mechanical device, typically one or more fans, located on 
 /// 
-/// HISTORY  New select type in IFC2x
+/// the air outlet side of the cooling tower.
+///   MECHANICALFORCEDDRAFT: Air flow is produced by a mechanical device, typically one or more fans, located on 
 /// 
-/// IFC2x4 CHANGE  Select renamed from IfcClassificationNotationSelect.
+/// the inlet air side of the cooling tower.
+///   USERDEFINED:  User-defined cooling tower type.
+///   NOTDEFINED:  Undefined cooling tower type.
 /// 
-/// Select from:
+/// HISTORY: New enumeration in IFC R2x.
+typedef enum {IfcCoolingTowerType_NATURALDRAFT, IfcCoolingTowerType_MECHANICALINDUCEDDRAFT, IfcCoolingTowerType_MECHANICALFORCEDDRAFT, IfcCoolingTowerType_USERDEFINED, IfcCoolingTowerType_NOTDEFINED} IfcCoolingTowerTypeEnum;
+const char* ToString(IfcCoolingTowerTypeEnum v);
+IfcCoolingTowerTypeEnum FromString(const std::string& s);
+}
+namespace IfcCostItemTypeEnum {
+/// An IfcCostItemTypeEnum is a list of the available types of cost items. 
+///   HISTORY: New type in IFC2x4  
+///   Enumeration 
 /// 
-/// IfcClassification (for referencing a classification system)
-/// IfcClassificationReference (for referencing a classification item (or facet) inside a classification system)
-typedef IfcUtil::IfcSchemaEntity IfcClassificationSelect;
-/// Definition from ISO/CD 10303-46:1992: The colour entity defines a basic appearance of elements which shall be visualized in a picture.
+/// USERDEFINED: User-defined type. 
+/// NOTDEFINED: Undefined type.
+typedef enum {IfcCostItemType_USERDEFINED, IfcCostItemType_NOTDEFINED} IfcCostItemTypeEnum;
+const char* ToString(IfcCostItemTypeEnum v);
+IfcCostItemTypeEnum FromString(const std::string& s);
+}
+namespace IfcCostScheduleTypeEnum {
+/// An IfcCostScheduleTypeEnum is a list of the available types of cost schedule from which that required may be selected. 
+///   HISTORY: New type in IFC 2x2  
+///   Enumeration 
 /// 
-/// NOTE  Corresponding STEP name: colour. It has been made into a SELECT type in IFC to avoid multiple inheritance for pre defined colour. Please refer to ISO/IS 10303-46:1994, p. 138 for the final definition of the formal standard.
+/// BUDGET: An allocation of money for a particular purpose. 
+/// COSTPLAN: An assessment of the amount of money needing to be expended for a defined purpose based on incomplete information about the goods and services required for a construction or installation.  
+/// ESTIMATE: An assessment of the amount of money needing to be expended for a defined purpose based on actual information about the goods and services required for a construction or installation. 
+/// TENDER: An offer to provide goods and services.  
+/// PRICEDBILLOFQUANTITIES: A complete listing of all work items forming construction or installation works in which costs have been allocated to work items.  
+/// UNPRICEDBILLOFQUANTITIES: A complete listing of all work items forming construction or installation works in which costs have not yet been allocated to work items. 
+/// SCHEDULEOFRATES: A listing of each type of goods forming construction or installation works with the cost of purchase, construction/installation, overheads and profit assigned so that additional items of that type can be costed.  
+/// USERDEFINED: User-defined type. 
+/// NOTDEFINED: Undefined type.
+typedef enum {IfcCostScheduleType_BUDGET, IfcCostScheduleType_COSTPLAN, IfcCostScheduleType_ESTIMATE, IfcCostScheduleType_TENDER, IfcCostScheduleType_PRICEDBILLOFQUANTITIES, IfcCostScheduleType_UNPRICEDBILLOFQUANTITIES, IfcCostScheduleType_SCHEDULEOFRATES, IfcCostScheduleType_USERDEFINED, IfcCostScheduleType_NOTDEFINED} IfcCostScheduleTypeEnum;
+const char* ToString(IfcCostScheduleTypeEnum v);
+IfcCostScheduleTypeEnum FromString(const std::string& s);
+}
+namespace IfcCoveringTypeEnum {
+/// Definition from IAI: This enumeration defines the range
+/// of different types of covering that can further specify an
+/// IfcCovering or an IfcCoveringType.
+/// HISTORY New enumeration
+/// in IFC Release 1.0
+/// IFC2x4 CHANGE The following
+/// enumerators of the IfcCoveringTypeEnum have been
+/// deprecated INSULATION, SLEEVING and
+/// WRAPPING.
+/// Enumeration
 /// 
-/// HISTORY  New entity in IFC2x2.
-typedef IfcUtil::IfcSchemaEntity IfcColour;
-/// The IfcColourOrFactor enables the selection of either a RGB colour value or a scalar factor value for the use as values of the reflectance components.
+/// CEILING: the covering is used to
+/// represent a ceiling
+/// FLOORING: the covering is used to
+/// represent a flooring
+/// CLADDING: the covering is used to
+/// represent a cladding
+/// ROOFING: the covering is used to
+/// represent a roof
 /// 
-/// HISTORY: New type in IFC2x2.
-typedef IfcUtil::IfcSchemaEntity IfcColourOrFactor;
-/// IfcCoordinateReferenceSystemSelect is a select between either the local engineering coordinate system, represented by the IfcGeometricRepresentationContext, or another coordinate reference system, represented by IfcCoordinateReferenceSystem, to be the source of a coordinate operation.
+/// INSULATION: the covering is used to
+/// insulate an element for thermal or acoustic purposes.
+/// IFC2x4 NOTE The use of this
+/// enumerator is deprecated.
+/// MEMBRANE: an impervious layer that
+/// could be used for e.g. roof covering (below tiling - that may be
+/// known as sarking etc.) or as a damp proof course membrane
+/// IFC2x4 NOTE The use of this
+/// enumerator is deprecated.
+/// SLEEVING: the covering is used to
+/// isolate a distribution element from a space in which it is
+/// contained.
+/// IFC2x4 NOTE The use of this
+/// enumerator is deprecated.
+/// WRAPPING: the covering is used for
+/// wrapping particularly of distribution elements using tape.
+/// IFC2x4 NOTE The use of this
+/// enumerator is deprecated.
 /// 
-/// HISTORY  New select type in IFC2x4.
-typedef IfcUtil::IfcSchemaEntity IfcCoordinateReferenceSystemSelect;
-/// Definition from ISO/CD 10303-42:1992: This type identifies the types of entity which may be selected as the root of a CSG tree including a single CSG primitive as a special case.
-/// Definition from IAI: The IfcBooleanResult, and subtypes of IfcCsgPrimitive3D are defined as potential root tree expression (at IfcCsgSolid). A subtype of IfcCsgPrimitive3D marks the special case of a CSG solid solely expressed by a single primitive.
+/// USERDEFINED: user defined type of
+/// covering
+/// NOTDEFINED: undefined type of
+/// covering
+typedef enum {IfcCoveringType_CEILING, IfcCoveringType_FLOORING, IfcCoveringType_CLADDING, IfcCoveringType_ROOFING, IfcCoveringType_MOLDING, IfcCoveringType_SKIRTINGBOARD, IfcCoveringType_INSULATION, IfcCoveringType_MEMBRANE, IfcCoveringType_SLEEVING, IfcCoveringType_WRAPPING, IfcCoveringType_USERDEFINED, IfcCoveringType_NOTDEFINED} IfcCoveringTypeEnum;
+const char* ToString(IfcCoveringTypeEnum v);
+IfcCoveringTypeEnum FromString(const std::string& s);
+}
+namespace IfcCrewResourceTypeEnum {
+/// This enumeration is used to identify the primary purpose of a crew resource.  The IfcCrewResourceTypeEnum contains the following:
 /// 
-/// NOTE Corresponding ISO 10303-42 type: csg_select, please refer to ISO/IS 10303-42:1994, p.168 for the final definition of the formal standard.
+/// OFFICE: A composition of resources performing administration work in an office.
+/// SITE: A composition of resources performing production work on a construction site.
+/// USERDEFINED: User-defined resource.
+/// NOTDEFINED: Undefined resource.
 /// 
-/// HISTORY New Type in IFC Release 1.5.1.
-typedef IfcUtil::IfcSchemaEntity IfcCsgSelect;
-/// Definition from ISO/CD 10303-46:1992: The curve font or scaled curve font select is a selection of either a curve font style select (being either a predefined curve font or an explicitly defined curve font) or a curve style font and scaling. 
+/// HISTORY: New enumeration in IFC2x4
+typedef enum {IfcCrewResourceType_OFFICE, IfcCrewResourceType_SITE, IfcCrewResourceType_USERDEFINED, IfcCrewResourceType_NOTDEFINED} IfcCrewResourceTypeEnum;
+const char* ToString(IfcCrewResourceTypeEnum v);
+IfcCrewResourceTypeEnum FromString(const std::string& s);
+}
+namespace IfcCurtainWallTypeEnum {
+/// Definition from IAI: Enumeration defining
+/// the valid types of curtain wall that can be predefined using the
+/// enumeration values. 
+/// HISTORY 
+/// New Enumeration in Release IFC2x Edition 3
+/// NOTE  Currently there
+/// are no specific enumerators defined, the IfcCurtainWallTypeEnum
+/// has
+/// been added for future extensions.
+typedef enum {IfcCurtainWallType_USERDEFINED, IfcCurtainWallType_NOTDEFINED} IfcCurtainWallTypeEnum;
+const char* ToString(IfcCurtainWallTypeEnum v);
+IfcCurtainWallTypeEnum FromString(const std::string& s);
+}
+namespace IfcCurveInterpolationEnum {
+/// IfcCurveInterpolationEnum specifies the possible methods
+/// for the interpolation of property values given as a curve.
 /// 
-/// NOTE Corresponding ISO 10303 name: curve_font_or_scaled_curve_font_select. Please refer to ISO/IS 10303-46:1994 for the final definition of the formal standard.
+/// HISTORY  New type in IFC2x4.
 /// 
-/// HISTORY New entity in IFC2x2.
-typedef IfcUtil::IfcSchemaEntity IfcCurveFontOrScaledCurveFontSelect;
-
-typedef IfcUtil::IfcSchemaEntity IfcCurveOnSurface;
-/// IfcCurveOrEdgeCurve provides the option to either select a geometric curve (IfcCurve
-/// and subtypes) within a geometric model, or a curve with associated geometry and coordinates (IfcEdgeCurve) within a topological model.
-/// SELECT 
+/// Enumeration
 /// 
-/// IfcCurve
-///   IfcEdgeCurve
+/// LINEAR: Indicates that values between the defined
+/// values are to be found by linear interpolation.
+/// LOG_LINEAR: Indicates that values between the defined
+/// values are to be found by linear interpolation of the natural
+/// logarithm (base e) of the values.
+/// LOG_LOG: Indicates that values between the defined
+/// values are to be found by linear interpolation of the Briggs'
+/// logarithm (base 10) of the values.
+/// NOTDEFINED: No interpolation information is
+/// provided
+typedef enum {IfcCurveInterpolation_LINEAR, IfcCurveInterpolation_LOG_LINEAR, IfcCurveInterpolation_LOG_LOG, IfcCurveInterpolation_NOTDEFINED} IfcCurveInterpolationEnum;
+const char* ToString(IfcCurveInterpolationEnum v);
+IfcCurveInterpolationEnum FromString(const std::string& s);
+}
+namespace IfcDamperTypeEnum {
+/// This enumeration defines the various types of damper:
 /// 
-/// HISTORY  New select type in IFC2x Edition 3.
-typedef IfcUtil::IfcSchemaEntity IfcCurveOrEdgeCurve;
-/// Definition from ISO/CD 10303-46:1992: The curve style font select is a selection of a curve style font or a predefined curve style font. 
+/// BALANCINGDAMPER: Damper used for purposes of manually balancing pressure differences.  Commonly operated by mechanical adjustment.
+/// BACKDRAFTDAMPER: Backdraft damper used to restrict the movement of air in one direction.  Commonly operated by mechanical spring.
+/// BLASTDAMPER: Blast damper use to prevent protect occupants and equipment against overpressures resultant of an explosion.  Commonly operated by mechanical spring.
+/// CONTROLDAMPER: Control damper used to modulate the flow of air by adjusting the position of the blades.  Commonly operated by an actuator of a building automation system.
+/// FIREDAMPER: Fire damper used to prevent the spread of fire for a specified duration.  Commonly operated by fusable link that melts above a certain temperature.
+/// FIRESMOKEDAMPER: Combination fire and smoke damper used to preven the spread of fire and smoke.  Commonly operated by a fusable link and a smoke detector
+/// FUMEHOODEXHAUST: Fume hood exhaust damper.  Commonly operated by actuator.
+/// GRAVITYDAMPER: Gravity damper closes from the force of gravity.  Commonly operated by gravitational weight.
+/// GRAVITYRELIEFDAMPER: Gravity-relief damper used to allow air to move upon a buildup of enough pressure to overcome the gravitational force exerted upon the damper blades.  Commonly operated by gravitational weight.
+/// RELIEFDAMPER: Relief damper used to allow air to move upon a buildup of a specified pressure differential.  Commonly operated by mechanical spring.
+/// SMOKEDAMPER: Smoke damper used to prevent the spread of smoke.  Commonly operated by a smoke detector of a building automation system.
+/// USERDEFINED: User-defined damper.
+/// NOTDEFINED: Undefined damper.
 /// 
-/// NOTE Corresponding ISO 10303 name: curve_style_font_select. Please refer to ISO/IS 10303-46:1994 for the final definition of the formal standard.
+/// HISTORY: New enumeration in IFC R2.0
+typedef enum {IfcDamperType_BACKDRAFTDAMPER, IfcDamperType_BALANCINGDAMPER, IfcDamperType_BLASTDAMPER, IfcDamperType_CONTROLDAMPER, IfcDamperType_FIREDAMPER, IfcDamperType_FIRESMOKEDAMPER, IfcDamperType_FUMEHOODEXHAUST, IfcDamperType_GRAVITYDAMPER, IfcDamperType_GRAVITYRELIEFDAMPER, IfcDamperType_RELIEFDAMPER, IfcDamperType_SMOKEDAMPER, IfcDamperType_USERDEFINED, IfcDamperType_NOTDEFINED} IfcDamperTypeEnum;
+const char* ToString(IfcDamperTypeEnum v);
+IfcDamperTypeEnum FromString(const std::string& s);
+}
+namespace IfcDataOriginEnum {
+/// IfcDataOriginEnum identifies the origin of time data:
 /// 
-/// HISTORY New entity in IFC2x2.
-typedef IfcUtil::IfcSchemaEntity IfcCurveStyleFontSelect;
-/// IfcDefinitionSelect provides the option to either select an object or type object IfcObjectDefinition, or a property set template or property set, IfcPropertyDefinition.
-/// SELECT
+/// MEASURED: The origin of the time data is a measurement device.
+///   PREDICTED: The time data are a prediction.
+///   SIMULATED: The origin of the time data is a simulation.
+///   NOTDEFINED: The origin of the time data is undefined.
 /// 
-/// IfcObjectDefinition,
-/// IfcPropertyDefinition
+/// HISTORY: New enumeration in IFC 2x2.
+typedef enum {IfcDataOrigin_MEASURED, IfcDataOrigin_PREDICTED, IfcDataOrigin_SIMULATED, IfcDataOrigin_USERDEFINED, IfcDataOrigin_NOTDEFINED} IfcDataOriginEnum;
+const char* ToString(IfcDataOriginEnum v);
+IfcDataOriginEnum FromString(const std::string& s);
+}
+namespace IfcDerivedUnitEnum {
+/// IfcDerivedUnitEnum is an enumeration type for allowed types of derived units.
+/// ENUMERATION 
 /// 
-/// HISTORY  New select type in IFC2x4.
-typedef IfcUtil::IfcSchemaEntity IfcDefinitionSelect;
-/// IfcDerivedMeasureValue is a select type for selecting between derived measure types.
+/// ACCELERATIONUNIT 
+///   ANGULARVELOCITYUNIT 
+///   COMPOUNDPLANEANGLEUNIT 
+///   DYNAMICVISCOSITYUNIT 
+///   HEATFLUXDENSITYUNIT 
+///   INTEGERCOUNTRATEUNIT 
+///   ISOTHERMALMOISTURECAPACITYUNIT 
+///   KINEMATICVISCOSITYUNIT 
+///   LINEARFORCEUNIT 
+///   LINEARMOMENTUNIT 
+///   LINEARSTIFFNESSUNIT 
+///   LINEARVELOCITYUNIT 
+///   MASSDENSITYUNIT 
+///   MASSFLOWRATEUNIT 
+///   MODULUSOFELASTICITYUNIT 
+///   MODULUSOFSUBGRADEREACTIONUNIT 
+///   MOISTUREDIFFUSIVITYUNIT 
+///   MOLECULARWEIGHTUNIT 
+///   MOMENTORINERTIAUNIT 
+///   PLANARFORCEUNIT 
+///   ROTATIONALFREQUENCYUNIT 
+///   ROTATIONALSTIFFNESSUNIT 
+///   SHEARMODULUSUNIT 
+///   SPECIFICHEATCAPACITYUNIT 
+///   THERMALADMITTANCEUNIT 
+///   THERMALCONDUCTANCEUNIT 
+///   THERMALRESISTANCEUNIT 
+///   THERMALTRANSMITTANCEUNIT 
+///   TORQUEUNIT 
+///   VAPORPERMEABILITYUNIT 
+///   VOLUMETRICFLOWRATEUNIT 
+///   CURVATUREUNIT 
+///   HEATINGVALUEUNIT 
+///   IONCONCENTRATIONUNIT 
+///   LUMINOUSINTENSITYDISTRIBUTIONUNIT 
+///   MASSPERLENGTHUNIT 
+///   MODULUSOFLINEARSUBGRADEREACTIONUNIT 
+///   MODULUSOFROTATIONALSUBGRADEREACTIONUNIT 
+///   PHUNIT 
+///   ROTATIONALMASSUNIT 
+///   SECTIONAREAINTEGRALUNIT 
+///   SECTIONMODULUSUNIT 
+///   SOUNDPOWERUNIT 
+///   SOUNDPRESSUREUNIT 
+///   TEMPERATUREGRADIENTUNIT 
+///   TEMPERATURERATEOFCHANGE 
+///   THERMALEXPANSIONCOEFFICIENTUNIT 
+///   WARPINGCONSTANTUNIT 
+///   WARPINGMOMENTUNIT 
+///   USERDEFINED: User defined derived unit. 
 /// 
-/// SELECT 
+/// HISTORY: New type in IFC Release 2.0.
 /// 
-/// IfcAbsorbedDoseMeasure 
-///   IfcAccelerationMeasure 
-///   IfcAngularVelocityMeasure 
-///   IfcCompoundPlaneAngleMeasure 
-///   IfcDoseEquivalentMeasure 
-///   IfcDynamicViscosityMeasure 
-///   IfcElectricCapacitanceMeasure 
-///   IfcElectricChargeMeasure 
-///   IfcElectricConductanceMeasure 
-///   IfcElectricResistanceMeasure 
-///   IfcElectricVoltageMeasure 
-///   IfcEnergyMeasure 
-///   IfcForceMeasure 
-///   IfcFrequencyMeasure 
-///   IfcHeatFluxDensityMeasure 
-///   IfcIlluminanceMeasure 
-///   IfcInductanceMeasure 
-///   IfcIntegerCountRateMeasure 
-///   IfcIsothermalMoisturecapacityMeasure 
-///   IfcKinematicViscosityMeasure 
-///   IfcLinearForceMeasure 
-///   IfcLinearMomentMeasure  
-///   IfcLinearStiffnessMeasure 
-///   IfcLinearVelocityMeasure 
-///   IfcLuminousFluxMeasure 
-///   IfcMagneticFluxDensityMeasure 
-///   IfcMagneticFluxMeasure 
-///   IfcMassDensityMeasure 
-///   IfcMassFlowRateMeasure 
-///   IfcModulusOfElasticityMeasure 
-///   IfcModulusOfSubgradeReactionMeasure 
-///   IfcMoistureDiffusivityMeasure 
-///   IfcMolecularWeightMeasure 
-///   IfcMomentOfInertiaMeasure  
-///   IfcMonetaryMeasure 
-///   IfcPlanarForceMeasure 
-///   IfcPowerMeasure 
-///   IfcPressureMeasure 
-///   IfcRadioActivityMeasure 
-///   IfcRotationalFrequencyMeasure 
-///   IfcRotationalStiffnessMeasure 
-///   IfcShearModulusMeasure 
-///   IfcSpecificHeatCapacityMeasure 
-///   IfcThermalAdmittanceMeasure 
-///   IfcThermalConductivityMeasure 
-///   IfcThermalResistanceMeasure 
-///   IfcThermalTransmittanceMeasure 
-///   IfcTimeStamp 
-///   IfcTorqueMeasure 
-///   IfcVaporPermeabilityMeasure 
-///   IfcVolumetricFlowRateMeasure 
-///   IfcCurvatureMeasure 
-///   IfcMassPerLengthMeasure 
-///   IfcRotationalMassMeasure 
-///   IfcSectionalAreaIntegralMeasure 
-///   IfcSectionModulusMeasure 
-///   IfcTemperatureGradientMeasure 
-///   IfcTemperatureRateOfChangeMeasure 
-///   IfcWarpingConstantMeasure 
-///   IfcWarpingMomentMeasure 
-///   IfcThermalExpansionCoefficientMeasure 
-///   IfcModulusOfLinearSubgradeReactionMeasure 
-///   IfcModulusOfRotationalSubgradeReactionMeasure 
-///   IfcLuminousIntensityDistributionMeasure 
-///   IfcSoundPowerMeasure 
-///   IfcSoundPressureMeasure 
-/// 
-/// HISTORY New type in IFC Release 2x.
-/// 
-/// IFC2x4 change: added IfcTemperatureRateOfChangeMeasure.
-typedef IfcUtil::IfcSchemaEntity IfcDerivedMeasureValue;
-/// IfcDocumentSelect enables selection of whether document information is to be contained within an IFC model or is to be referenced from an external source. 
-/// 
-/// HISTORY: New Select Type in IFC 2x
-/// 
-/// Select From: 
+/// IFC 2x4 change: added TEMPERATURERATEOFCHANGE.
+typedef enum {IfcDerivedUnit_ANGULARVELOCITYUNIT, IfcDerivedUnit_AREADENSITYUNIT, IfcDerivedUnit_COMPOUNDPLANEANGLEUNIT, IfcDerivedUnit_DYNAMICVISCOSITYUNIT, IfcDerivedUnit_HEATFLUXDENSITYUNIT, IfcDerivedUnit_INTEGERCOUNTRATEUNIT, IfcDerivedUnit_ISOTHERMALMOISTURECAPACITYUNIT, IfcDerivedUnit_KINEMATICVISCOSITYUNIT, IfcDerivedUnit_LINEARVELOCITYUNIT, IfcDerivedUnit_MASSDENSITYUNIT, IfcDerivedUnit_MASSFLOWRATEUNIT, IfcDerivedUnit_MOISTUREDIFFUSIVITYUNIT, IfcDerivedUnit_MOLECULARWEIGHTUNIT, IfcDerivedUnit_SPECIFICHEATCAPACITYUNIT, IfcDerivedUnit_THERMALADMITTANCEUNIT, IfcDerivedUnit_THERMALCONDUCTANCEUNIT, IfcDerivedUnit_THERMALRESISTANCEUNIT, IfcDerivedUnit_THERMALTRANSMITTANCEUNIT, IfcDerivedUnit_VAPORPERMEABILITYUNIT, IfcDerivedUnit_VOLUMETRICFLOWRATEUNIT, IfcDerivedUnit_ROTATIONALFREQUENCYUNIT, IfcDerivedUnit_TORQUEUNIT, IfcDerivedUnit_MOMENTOFINERTIAUNIT, IfcDerivedUnit_LINEARMOMENTUNIT, IfcDerivedUnit_LINEARFORCEUNIT, IfcDerivedUnit_PLANARFORCEUNIT, IfcDerivedUnit_MODULUSOFELASTICITYUNIT, IfcDerivedUnit_SHEARMODULUSUNIT, IfcDerivedUnit_LINEARSTIFFNESSUNIT, IfcDerivedUnit_ROTATIONALSTIFFNESSUNIT, IfcDerivedUnit_MODULUSOFSUBGRADEREACTIONUNIT, IfcDerivedUnit_ACCELERATIONUNIT, IfcDerivedUnit_CURVATUREUNIT, IfcDerivedUnit_HEATINGVALUEUNIT, IfcDerivedUnit_IONCONCENTRATIONUNIT, IfcDerivedUnit_LUMINOUSINTENSITYDISTRIBUTIONUNIT, IfcDerivedUnit_MASSPERLENGTHUNIT, IfcDerivedUnit_MODULUSOFLINEARSUBGRADEREACTIONUNIT, IfcDerivedUnit_MODULUSOFROTATIONALSUBGRADEREACTIONUNIT, IfcDerivedUnit_PHUNIT, IfcDerivedUnit_ROTATIONALMASSUNIT, IfcDerivedUnit_SECTIONAREAINTEGRALUNIT, IfcDerivedUnit_SECTIONMODULUSUNIT, IfcDerivedUnit_SOUNDPOWERLEVELUNIT, IfcDerivedUnit_SOUNDPOWERUNIT, IfcDerivedUnit_SOUNDPRESSURELEVELUNIT, IfcDerivedUnit_SOUNDPRESSUREUNIT, IfcDerivedUnit_TEMPERATUREGRADIENTUNIT, IfcDerivedUnit_TEMPERATURERATEOFCHANGEUNIT, IfcDerivedUnit_THERMALEXPANSIONCOEFFICIENTUNIT, IfcDerivedUnit_WARPINGCONSTANTUNIT, IfcDerivedUnit_WARPINGMOMENTUNIT, IfcDerivedUnit_USERDEFINED} IfcDerivedUnitEnum;
+const char* ToString(IfcDerivedUnitEnum v);
+IfcDerivedUnitEnum FromString(const std::string& s);
+}
+namespace IfcDirectionSenseEnum {
+/// IfcDirectionSenseEnum is an enumeration denoting whether sense of direction is positive or negative along the given axis.
 /// 
-/// IfcDocumentInformation (for "metadata" of an external document)  
-/// IfcDocumentReference (for reference within a document)
-typedef IfcUtil::IfcSchemaEntity IfcDocumentSelect;
-/// Definition from ISO/CD 10303-46:1992: The fill style select is a selection between different fill area styles.
+/// ENUMERATION
 /// 
-/// NOTE Corresponding ISO 10303 name: fill_style_select. Please refer to ISO/IS 10303-46:1994 for
-/// the final definition of the formal standard.
+/// POSITIVE: Direction defined to be positive.
+/// NEGATIVE: Direction defined to be negative.
 /// 
-/// HISTORY New type in IFC2x2.
-typedef IfcUtil::IfcSchemaEntity IfcFillStyleSelect;
-/// Definition from ISO/CD 10303-42:1992: This select type identifies the types of entities which can occur in a geometric set. 
+/// HISTORY New Type in IFC2x.
+typedef enum {IfcDirectionSense_POSITIVE, IfcDirectionSense_NEGATIVE} IfcDirectionSenseEnum;
+const char* ToString(IfcDirectionSenseEnum v);
+IfcDirectionSenseEnum FromString(const std::string& s);
+}
+namespace IfcDiscreteAccessoryTypeEnum {
+/// Definition from IAI: This enumeration defines the different types of discrete accessories:
 /// 
-/// NOTE: Corresponding ISO 10303 type: geometric_set_select. Please refer to ISO/IS 10303-42:1994, p. 169 for the final definition of the formal standard.
+/// ANCHORPLATE: An accessory consisting of a steel plate, shear stud connectors or welded-on rebar which is embedded into the surface of a concrete element so that other elements can be welded or bolted onto it later.
+/// BRACKET: An L-shaped or similarly shaped accessory attached in a corner between elements to hold them together or to carry a secondary element.
+/// SHOE: A column shoe or a beam shoe (beam hanger) used to support or secure an element.
+/// USERDEFINED: User-defined accessory
+/// NOTDEFINED: Undefined accessory
 /// 
-/// HISTORY: New type in IFC Release 2x.
-typedef IfcUtil::IfcSchemaEntity IfcGeometricSetSelect;
-/// IfcGridPlacementDirectionSelect enables the choice of defining a grid placement be either an explicit direction, or by referencing a second grid intersection to provide the direction.
+/// HISTORY  New Enumeration in IFC 2x4.
+typedef enum {IfcDiscreteAccessoryType_ANCHORPLATE, IfcDiscreteAccessoryType_BRACKET, IfcDiscreteAccessoryType_SHOE, IfcDiscreteAccessoryType_USERDEFINED, IfcDiscreteAccessoryType_NOTDEFINED} IfcDiscreteAccessoryTypeEnum;
+const char* ToString(IfcDiscreteAccessoryTypeEnum v);
+IfcDiscreteAccessoryTypeEnum FromString(const std::string& s);
+}
+namespace IfcDistributionChamberElementTypeEnum {
+/// This enumeration identifies different types of distribution chambers.
 /// 
-/// SELECT
+/// Valid enumerations are:
 /// 
-/// IfcDirection,
-/// IfcVirtualGridIntersection
+/// FORMEDDUCT: Space formed in the ground for the passage of pipes, cables, ducts.
+/// INSPECTIONCHAMBER: Chamber constructed on a drain, sewer or pipeline with a removable cover that permits visble inspection.
+/// INSPECTIONPIT:  Recess or chamber formed to permit access for inspection of substructure and services.
+/// MANHOLE: Chamber constructed on a drain, sewer or pipeline with a removable cover that permits the entry of a person.
+/// METERCHAMBER: Chamber that houses a meter(s).
+/// SUMP: Recessed or small chamber into which liquid is drained to facilitate its collection for removal.
+/// TRENCH: Excavated chamber, the length of which typically exceeds the width.
+/// VALVECHAMBER: Chamber that houses a valve(s).
+/// USERDEFINED: User-defined chamber type.
+/// NOTDEFINED: Undefined chamber type.
 /// 
-/// HISTORY  New select type in IFC2x4.
-typedef IfcUtil::IfcSchemaEntity IfcGridPlacementDirectionSelect;
-/// The IfcHatchLineDistanceSelect is a selection between different ways to determine the distance and potentially start point of hatch lines, either by an offset distance length measure or by a vector.
+/// HISTORY: New enumeration in IFC R2x2
+typedef enum {IfcDistributionChamberElementType_FORMEDDUCT, IfcDistributionChamberElementType_INSPECTIONCHAMBER, IfcDistributionChamberElementType_INSPECTIONPIT, IfcDistributionChamberElementType_MANHOLE, IfcDistributionChamberElementType_METERCHAMBER, IfcDistributionChamberElementType_SUMP, IfcDistributionChamberElementType_TRENCH, IfcDistributionChamberElementType_VALVECHAMBER, IfcDistributionChamberElementType_USERDEFINED, IfcDistributionChamberElementType_NOTDEFINED} IfcDistributionChamberElementTypeEnum;
+const char* ToString(IfcDistributionChamberElementTypeEnum v);
+IfcDistributionChamberElementTypeEnum FromString(const std::string& s);
+}
+namespace IfcDistributionPortTypeEnum {
+
+typedef enum {IfcDistributionPortType_CABLE, IfcDistributionPortType_CABLECARRIER, IfcDistributionPortType_DUCT, IfcDistributionPortType_PIPE, IfcDistributionPortType_USERDEFINED, IfcDistributionPortType_NOTDEFINED} IfcDistributionPortTypeEnum;
+const char* ToString(IfcDistributionPortTypeEnum v);
+IfcDistributionPortTypeEnum FromString(const std::string& s);
+}
+namespace IfcDistributionSystemEnum {
+/// This enumeration identifies different types of distribution systems.
 /// 
-/// HISTORY  New type in IFC2x3.
-typedef IfcUtil::IfcSchemaEntity IfcHatchLineDistanceSelect;
-/// Definition from ISO/CD 10303-46:1992: The layered things type selects those things, which can be grouped in layers. 
+/// HISTORY: New enumeration in IFC R2x4
 /// 
-/// It is the collection of all those items, that are assigned to a single layer. These items are representation items or complete representations (IfcRepresentationItem, IfcRepresentation). If an IfcRepresentation is referenced, all IfcRepresentationItem within its set of Items are assigned to the same layer. 
+/// Valid enumerations for pipes and related elements include:
 /// 
-/// NOTE: Corresponding ISO 10303 name: layered_item. It was called layered_things in the ISO/CD version and had been renamed to layered_item in the ISO/IS final version. Please refer to ISO/IS 10303-46:1994, p. 13 for the final definition of the formal standard.
+/// CHEMICAL: Arbitrary chemical further qualified by property set, such as for medical or industrial use.
+///   CHILLEDWATER: Nonpotable chilled water, such as circulated through an evaporator.
+///   COMPRESSEDAIR: Compressed air system.
+///   CONDENSERWATER: Nonpotable water, such as circulated through a condensor.
+///   DOMESTICCOLDWATER: Unheated potable water distribution system.
+///   DOMESTICHOTWATER: Heated potable water distribution system.
+///   DRAINAGE: Drainage collection system.
+///   FIREPROTECTION: Fire protection sprinkler system.
+///   GAS: Methane distribution system.
+///   HAZARDOUS: Hazardous material or fluid collection system.
+///   HEATING: Heated water distribution system.
+///   OIL: Oil distribution system.
+///   RAINWATER: Rainwater resulting from precipitation which directly falls on a parcel.
+///   REFRIGERATION: Refrigerant distribution system for purposes of fulfilling all or parts of a refrigeration cycle.
+///   SEWAGE: Sewage collection system.
+///   STORMWATER: Stormwater resulting from precipitation which runs off or travels over the ground surface.
+///   VACUUM: Vacuum distribution system.
+///   VENT: Vent system for wastewater piping systems.
+///   WASTE: Waste collection system.
 /// 
-/// HISTORY: New type in IFC2x2.
-typedef IfcUtil::IfcSchemaEntity IfcLayeredItem;
-/// IfcLibrarySelect enables selection of whether library information is to be contained within an IFC model or is to be referenced from an external source. 
+/// Valid enumerations for ducts and related elements include:
 /// 
-/// HISTORY: New Select Type in IFC2x
+/// AIRCONDITIONING:  Conditioned air distribution system for purposes of maintaining a temperature range within one or more spaces.
+///   EXHAUST:  Exhaust air collection system for removing stale or noxious air from one or more spaces.
+///   VENTILATION:  Ventilation air distribution system involved in either the exchange of air to the outside as well as circulation of air within a building.
 /// 
-/// Select From: 
+/// Valid enumerations for cables and related elements include:
 /// 
-/// IfcLibraryInformation (for library information)  
-/// IfcLibraryReference (for reference into a library of information by location)  
+/// AUDIOVISUAL:  A transport of a single media source, having audio and/or video streams.
+///   CONTROL:  A transport or network dedicated to control system usage.
+///   DATA: A network having general-purpose usage.
+///   EARTHING: A path for equipotential bonding, conducting current to the ground.
+///   ELECTRICAL: A circuit for delivering electrical power.
+///   ELECTROACCOUSTIC: An amplified audio signal such as for loudspeakers.
+///   LIGHTING: A circuit dedicated for lighting, such as a fixture having sockets for lamps.
+///   LIGHTNINGPROTECTION: A path for conducting lightning current to the ground.
+///   POWERGENERATION: A path for power generation.
+///   SECURITY: A transport or network dedicated to security system usage.
+///   SIGNAL: A raw analog signal, such as modulated data or measurements from sensors.
+///   TELEPHONE: A transport or network dedicated to telephone system usage.
+///   TV: A transport of multiple media sources (e.g. analog cable, satellite, over-the-air).
+typedef enum {IfcDistributionSystem_AIRCONDITIONING, IfcDistributionSystem_AUDIOVISUAL, IfcDistributionSystem_CHEMICAL, IfcDistributionSystem_CHILLEDWATER, IfcDistributionSystem_COMMUNICATION, IfcDistributionSystem_COMPRESSEDAIR, IfcDistributionSystem_CONDENSERWATER, IfcDistributionSystem_CONTROL, IfcDistributionSystem_CONVEYING, IfcDistributionSystem_DATA, IfcDistributionSystem_DISPOSAL, IfcDistributionSystem_DOMESTICCOLDWATER, IfcDistributionSystem_DOMESTICHOTWATER, IfcDistributionSystem_DRAINAGE, IfcDistributionSystem_EARTHING, IfcDistributionSystem_ELECTRICAL, IfcDistributionSystem_ELECTROACOUSTIC, IfcDistributionSystem_EXHAUST, IfcDistributionSystem_FIREPROTECTION, IfcDistributionSystem_FUEL, IfcDistributionSystem_GAS, IfcDistributionSystem_HAZARDOUS, IfcDistributionSystem_HEATING, IfcDistributionSystem_LIGHTING, IfcDistributionSystem_LIGHTNINGPROTECTION, IfcDistributionSystem_MUNICIPALSOLIDWASTE, IfcDistributionSystem_OIL, IfcDistributionSystem_OPERATIONAL, IfcDistributionSystem_POWERGENERATION, IfcDistributionSystem_RAINWATER, IfcDistributionSystem_REFRIGERATION, IfcDistributionSystem_SECURITY, IfcDistributionSystem_SEWAGE, IfcDistributionSystem_SIGNAL, IfcDistributionSystem_STORMWATER, IfcDistributionSystem_TELEPHONE, IfcDistributionSystem_TV, IfcDistributionSystem_VACUUM, IfcDistributionSystem_VENT, IfcDistributionSystem_VENTILATION, IfcDistributionSystem_WASTEWATER, IfcDistributionSystem_WATERSUPPLY, IfcDistributionSystem_USERDEFINED, IfcDistributionSystem_NOTDEFINED} IfcDistributionSystemEnum;
+const char* ToString(IfcDistributionSystemEnum v);
+IfcDistributionSystemEnum FromString(const std::string& s);
+}
+namespace IfcDocumentConfidentialityEnum {
+/// IfcDocumentConfidentialityEnum enables selection of the level of confidentiality of document information from a list of choices. 
 /// 
-/// Generally, it is expected that selection will be IfcLibraryReference and only rarely IfcLibraryInformation. IfcLibraryInformation should only be selected in circumstances where there could be a need to indicate the libraries that will be used without making individual references. This may occur for higher level objects such as a project or building.
-typedef IfcUtil::IfcSchemaEntity IfcLibrarySelect;
-/// A goniometric light gets its intensity distribution function (how much light goes in any one direction) from one of two sources: (i) an industry-standard file, (ii) from distribution data passed directly via the IfcLightIntensityDistribution. 
+/// HISTORY: New enumeration in IFC 2x
 /// 
-/// The light distribution provides the luminous intensity distribution according to some standardized light distribution curves. 
+/// Enumeration 
 /// 
-/// Select: 
+/// PUBLIC: Document is publicly available. 
+/// RESTRICTED: Document availability is restricted. 
+/// CONFIDENTIAL: Document is confidential and its contents should not be revealed without permission. 
+/// PERSONAL: Document is personal to the author. 
+/// USERDEFINED 
+/// NOTDEFINED
+typedef enum {IfcDocumentConfidentiality_PUBLIC, IfcDocumentConfidentiality_RESTRICTED, IfcDocumentConfidentiality_CONFIDENTIAL, IfcDocumentConfidentiality_PERSONAL, IfcDocumentConfidentiality_USERDEFINED, IfcDocumentConfidentiality_NOTDEFINED} IfcDocumentConfidentialityEnum;
+const char* ToString(IfcDocumentConfidentialityEnum v);
+IfcDocumentConfidentialityEnum FromString(const std::string& s);
+}
+namespace IfcDocumentStatusEnum {
+/// IfcDocumentStatusEnum enables selection of the status of document information from a list of choices.
 /// 
-/// Type 
-///   Definition 
+/// HISTORY: New enumeration in IFC Release 2x.
+typedef enum {IfcDocumentStatus_DRAFT, IfcDocumentStatus_FINALDRAFT, IfcDocumentStatus_FINAL, IfcDocumentStatus_REVISION, IfcDocumentStatus_NOTDEFINED} IfcDocumentStatusEnum;
+const char* ToString(IfcDocumentStatusEnum v);
+IfcDocumentStatusEnum FromString(const std::string& s);
+}
+namespace IfcDoorPanelOperationEnum {
+/// This enumeration defines the basic ways how individual door panels operate as shown in Figure 164.
+/// HISTORY New Enumeration in IFC Release 2.0.
+/// IFC2x4 CHANGE Enumerator FIXEDPANELadded.
 /// 
-/// IfcExternalReference 
-///   Light distribution is represented by a standard photometric data file such as Eulumdat, IES, CIBSE TM14.  
+/// Swinging
 /// 
-/// IfcLightIntensityDistribution 
-///   For representing a light distribution directly the
-///   following values needs to be given in a table like structure with column and
-///   row headings. These headings should contain the angles (C/&#947; or B/&#946; )
-///   and the table body contains the intensity values, (normally normalized to
-///   cd/Klm). The angles can be non- equidistant and the angle steps can be almost
-///   any value in the valid range, so a list of all available angles in both
-///   directions covers all cases.  
+/// DoubleActing
 /// 
-/// HISTORY New type in IFC2x2.
-typedef IfcUtil::IfcSchemaEntity IfcLightDistributionDataSourceSelect;
-/// IfcMaterialSelect provides selection of either a material
-/// definition or a material usage definition that can be assigned to
-/// an element, a resource or another entity within IFC.
-/// SELECT
+/// Sliding
 /// 
-/// IfcMaterialDefinition
+/// Folding
 /// 
-/// IfcMaterial
-/// IfcMaterialLayer
-/// IfcMaterialLayerSet
-/// IfcMaterialProfile
-/// IfcMaterialProfileSet
-/// IfcMaterialConstituent
-/// IfcMaterialConstituentSet
+/// Revolving
 /// 
-/// IfcMaterialUsageDefinition
+/// Rollingup
 /// 
-/// IfcMaterialLayerSetUsage
-/// IfcMaterialProfileSetUsage
+/// FixedPanel
 /// 
-/// IfcMaterialList
+/// NOTE Enumerator added in IFC2x4.
 /// 
-/// HISTORY New select in IFC 1.0
+/// UserDefined
+///  
 /// 
-/// IFC2x4 CHANGE The select now includes two new abstract entities IfcMaterialDefinition
-/// and IfcMaterialUsageDefinition with upward compatibility.  The use of IfcMaterialList is deprecated from IFC2x4 onwards.
-typedef IfcUtil::IfcSchemaEntity IfcMaterialSelect;
-/// Definition from ISO/CD 10303-41:1992: A measure value is a value as defined in ISO 31-0 (clause 2).
+/// NotDefined
+///  
 /// 
-/// NOTE IfcMeasureValue is a select data type for most basic measure types coming from ISO 10303-41.  Select item IfcNonNegativeLengthMeasure is in addition to ISO 10303-41.
+/// Figure 164 — Door operations
 /// 
-/// NOTE Corresponding ISO 10303 name: measure_value, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
+/// The opening direction of the door panels is given by the local
+/// placement of the IfcDoor. The positive y-axis determines
+/// the direction as shown in Figure 165.
 /// 
-/// HISTORY New type in IFC Release 1.5.1.
+/// Figure 165 — Door panel operations
 /// 
-/// IFC 2x4 change: added IfcNonNegativeLengthMeasure
-typedef IfcUtil::IfcSchemaEntity IfcMeasureValue;
-/// IfcMetricValueSelect is a select type that enables selection of the data type for the value component of an IfcMetric. 
+/// NOTE  Figures (symbolic representation) depend on the national building code.  These figures are only shown as illustrations
+typedef enum {IfcDoorPanelOperation_SWINGING, IfcDoorPanelOperation_DOUBLE_ACTING, IfcDoorPanelOperation_SLIDING, IfcDoorPanelOperation_FOLDING, IfcDoorPanelOperation_REVOLVING, IfcDoorPanelOperation_ROLLINGUP, IfcDoorPanelOperation_FIXEDPANEL, IfcDoorPanelOperation_USERDEFINED, IfcDoorPanelOperation_NOTDEFINED} IfcDoorPanelOperationEnum;
+const char* ToString(IfcDoorPanelOperationEnum v);
+IfcDoorPanelOperationEnum FromString(const std::string& s);
+}
+namespace IfcDoorPanelPositionEnum {
+/// Definition: This enumeration defines the basic ways to describe the location of a door panel within a door lining.
 /// 
-/// HISTORY: New type in IFC Release 2.0
+/// HISTORY New Enumeration in IFC Release 2.x
 /// 
-/// Select 
+/// Figure 166 shows the designation of a door panel with PanelPosition = LEFT and a door panel with PanelPosition = RIGHT within a door style with OperationType = DOUBLE_DOOR_SINGLE_SWING. The position is given as shown in the XZ plane of the local placement, looking into the direction of the positive Y axis. 
 /// 
-/// IfcCostValue
-///   IfcDateTime 
-///   IfcMeasureWithUnit 
-///   IfcTable 
-///   IfcText 
-///   IfcTimeSeries
-typedef IfcUtil::IfcSchemaEntity IfcMetricValueSelect;
-/// Definition from IAI: A measure for modulus of rotational subgrade reaction which expresses the rotational bedding of a structural curve item per length.  TRUE denotes infinite stiffness (rigidity).  FALSE denotes no stiffness (a release).  A numeric value denotes finite linear-elastic stiffness.
+/// Figure 166 — Door panel positions
+typedef enum {IfcDoorPanelPosition_LEFT, IfcDoorPanelPosition_MIDDLE, IfcDoorPanelPosition_RIGHT, IfcDoorPanelPosition_NOTDEFINED} IfcDoorPanelPositionEnum;
+const char* ToString(IfcDoorPanelPositionEnum v);
+IfcDoorPanelPositionEnum FromString(const std::string& s);
+}
+namespace IfcDoorStyleConstructionEnum {
+/// Definition from IAI: This enumeration defines the
+///   basic types of construction of doors. The construction type
+///   relates to the main material (or material combination) used
+///   for making the door.
 /// 
-/// HISTORY: New type in IFC 2x4.
-typedef IfcUtil::IfcSchemaEntity IfcModulusOfRotationalSubgradeReactionSelect;
-/// Definition from IAI: Bedding measure which expresses the bedding of a structural face item per area.  TRUE denotes infinite stiffness (rigidity).  FALSE denotes no stiffness (a release).  A numeric value denotes finite linear-elastic stiffness.
+/// HISTORY New Enumeration in
+///   IFC Release 2x .
+typedef enum {IfcDoorStyleConstruction_ALUMINIUM, IfcDoorStyleConstruction_HIGH_GRADE_STEEL, IfcDoorStyleConstruction_STEEL, IfcDoorStyleConstruction_WOOD, IfcDoorStyleConstruction_ALUMINIUM_WOOD, IfcDoorStyleConstruction_ALUMINIUM_PLASTIC, IfcDoorStyleConstruction_PLASTIC, IfcDoorStyleConstruction_USERDEFINED, IfcDoorStyleConstruction_NOTDEFINED} IfcDoorStyleConstructionEnum;
+const char* ToString(IfcDoorStyleConstructionEnum v);
+IfcDoorStyleConstructionEnum FromString(const std::string& s);
+}
+namespace IfcDoorStyleOperationEnum {
+/// This enumeration defines the basic ways to describe how doors operate as shown in Figure 167.
+/// HISTORY  New Enumeration in Release IFC2x.
 /// 
-/// HISTORY: New type in IFC 2x4.
-typedef IfcUtil::IfcSchemaEntity IfcModulusOfSubgradeReactionSelect;
-/// Definition from IAI: A measure for modulus of translational subgrade reaction which expresses the translational bedding of a structural curve item per length.  TRUE denotes infinite stiffness (rigidity).  FALSE denotes no stiffness (a release).  A numeric value denotes finite linear-elastic stiffness.
+/// Enumerator
+///   Description
+///   Figure
 /// 
-/// HISTORY: New type in IFC 2x4.
-typedef IfcUtil::IfcSchemaEntity IfcModulusOfTranslationalSubgradeReactionSelect;
-/// IfcObjectReferenceSelect is a select type, that holds a list of resource level entities that can be used as properties within a property set. 
+/// SINGLE_SWING_LEFT
 /// 
-/// HISTORY  New select type in IFC Release 2.0.
-typedef IfcUtil::IfcSchemaEntity IfcObjectReferenceSelect;
-/// IfcPointOrVertexPoint provides the option to either select a geometric point (IfcPoint and subtypes) within a geometric model, or a vertex with associated point coordinates (IfcVertexPoint) within a topological model.
-/// SELECT 
+/// Door with one
+/// panel that opens (swings) to the
+/// left. The hinges are on the left side as viewed in the direction of the
+/// positive y-axis.
+///   Note: Direction of swing (whether
+/// in or out)
+/// is determined at the IfcDoor.
 /// 
-/// IfcPoint, 
-///   IfcVertexPoint
+/// SINGLE_SWING_RIGHT
 /// 
-/// HISTORY  New select type in IFC2x Edition 3.
-typedef IfcUtil::IfcSchemaEntity IfcPointOrVertexPoint;
-/// Definition from ISO/CD 10303-46:1992: The presentation style select is a selection of one of many kinds of styles, a different one for each kind of geometric representation item to be styled.
+/// Door with one
+/// panel that opens (swings) to the
+/// right. The hinges are on the right side as viewed in the direction of
+/// the positive y-axis.
+///   Note: Direction of swing (whether
+/// in or out)
+/// is determined at the IfcDoor.
 /// 
-/// NOTE Corresponding ISO 10303 name: presentation_style_Select. Please refer to ISO/IS
-/// 10303-46:1994 for the final definition of the formal standard.
+/// DOUBLE_DOOR_
+/// SINGLE_SWING
 /// 
-/// HISTORY New type in IFC2x2.
+/// Door with two
+/// panels, one opens (swings) to the
+/// left the other opens (swings) to the right.
+///   Note: Direction of swing (whether
+/// in or out)
+/// is determined at the IfcDoor. 
 /// 
-/// IFC2x4 CHANGE The select type has been deprecated.
-typedef IfcUtil::IfcSchemaEntity IfcPresentationStyleSelect;
-/// IfcProcessSelect provides the option to either
-///   select a process or activity occurrence, IfcProcess,
-///   or a process or activity type, IfcTypeProcess.
-///   SELECT
+/// DOUBLE_SWING_LEFT
 /// 
-/// IfcProcess,
+/// Door with one
+/// panel that swings in both
+/// directions and to the left in the main trafic direction. Also called
+/// double acting door.
+///   Note: Direction of main swing
+/// (whether in or
+/// out) is determined at the IfcDoor. 
 /// 
-/// IfcTypeProcess
+/// DOUBLE_SWING_RIGHT
 /// 
-/// HISTORY  New select type in IFC2x4.
-typedef IfcUtil::IfcSchemaEntity IfcProcessSelect;
-
-typedef IfcUtil::IfcSchemaEntity IfcProductRepresentationSelect;
-/// IfcProductSelect provides the option to either select a
-/// product occurrence, IfcProduct, or a product type,
-/// IfcTypeProduct.
-/// SELECT
+/// Door with one
+/// panel that swings in both
+/// directions and to the right in the main trafic direction. Also called
+/// double acting door.
+///   Note: Direction of main swing
+/// (whether in or
+/// out) is determined at the IfcDoor.
 /// 
-/// IfcProduct,
-/// IfcTypeProduct
+/// DOUBLE_DOOR_
+/// DOUBLE_SWING
 /// 
-/// HISTORY  New select type in IFC2x4.
-typedef IfcUtil::IfcSchemaEntity IfcProductSelect;
-
-typedef IfcUtil::IfcSchemaEntity IfcPropertySetDefinitionSelect;
-/// IfcResourceObjectSelect enables selection of resource level objects that are to be related to an resource level relationship object. The use of IfcResourceObjectSelect includes the ability to assign an external reference entity (library, classification, or documentation reference) to entities within the resource level.
+/// Door with two
+/// panels, one swings in both
+/// directions and to the right in the main trafic direction the other
+/// swings also in both directions and to the left in the main trafic
+/// direction.
+///   Note: Direction of main swing
+/// (whether in or
+/// out) is determined at the IfcDoor.
 /// 
-/// HISTORY  New Select type in IFC2x4.
-typedef IfcUtil::IfcSchemaEntity IfcResourceObjectSelect;
-/// IfcResourceSelect provides the option to either select a
-/// resource occurrence, IfcResource, or a resource type,
-/// IfcTypeResource.
-/// SELECT
+/// DOUBLE_DOOR_
+/// SINGLE_SWING_
+/// OPPOSITE_LEFT
 /// 
-/// IfcResource,
-/// IfcTypeResource
+/// Door with two
+/// panels that both open to the left,
+/// one panel swings in one direction and the other panel swings in the
+/// opposite direction.
+///   Note: Direction of main swing
+/// (whether in or
+/// out) is determined at the IfcDoor.
 /// 
-/// HISTORY  New select type in IFC2x4.
-typedef IfcUtil::IfcSchemaEntity IfcResourceSelect;
-/// Definition from IAI: A measure of rotational stiffness.  TRUE denotes infinite stiffness (rigidity).  FALSE denotes no stiffness (a release).  A numeric value denotes finite linear-elastic stiffness.
+/// DOUBLE_DOOR_
+/// SINGLE_SWING_
+/// OPPOSITE_RIGHT
+///   Door with two
+/// panels that both open to the right,
+/// one panel swings in one direction and the other panel swings in the
+/// opposite direction.
+///   Note: Direction of main swing
+/// (whether in or
+/// out) is determined at the IfcDoor.
 /// 
-/// HISTORY: New type in IFC 2x4.
-typedef IfcUtil::IfcSchemaEntity IfcRotationalStiffnessSelect;
-/// Definition from ISO/CD 10303-42:1992 This type collects together, for reference when constructing more complex models, the subtypes which have the characteristics of a shell. A shell is a connected object of fixed dimensionality d = 0; 1; or 2, typically used to bound a region. The domain of a shell, if present, includes its bounds and 0 £ X < ¥.  
+/// SLIDING_TO_LEFT
 /// 
-/// A shell of dimensionality 0 is represented by a graph consisting of a single vertex. The vertex shall not have any associated edges. 
-/// A shell of dimensionality 1 is represented by a connected graph of dimensionality 1. 
-/// A shell of dimensionality 2 is a topological entity constructed by joining faces along edges. Its domain, if present, is a connected, orientable 2-manifold with boundary, that is, a connected, oriented, finite, non-self-intersecting surface, which may be closed or open. 
+/// Door with one
+/// panel that is sliding to the left. 
 /// 
-/// Shells of dimensionality 0 and 1 are not part of the current IFC release. 
+/// SLIDING_TO_RIGHT
 /// 
-/// NOTE  Corresponding ISO 10303 type: shell. Please refer to ISO/IS 10303-42:1994, p. 127 for the final definition of the formal standard. Only the select items closed_shell (IfcClosedShell) and open_shell (IfcOpenShell) have been incorporated in the current IFC release. 
+/// Door with one
+/// panel that is sliding to the right. 
 /// 
-/// HISTORY  New type in IFC2x.
-typedef IfcUtil::IfcSchemaEntity IfcShell;
-/// IfcSimpleValue is a select type for selecting between simple value types.
+/// DOUBLE_DOOR_SLIDING
 /// 
-/// SELECT 
+/// Door with two
+/// panels, one is sliding to the left
+/// the other is sliding to the right. 
 /// 
-/// IfcInteger: Defined type of simple type INTEGER. 
-///   IfcReal: Defined type of simple type REAL. 
-///   IfcBoolean: Defined type of simple type BOOLEAN. 
-///   IfcLogical: Defined type of simple type LOGICAL. 
-///   IfcIdentifier: Defined type of simple type STRING for identification purposes. 
-///   IfcLabel: Defined type of simple type STRING for naming purposes. 
-///   IfcText: Defined type of simple type STRING for descriptive purposes. 
-///   IfcDateTime: Defined type of simple type STRING to represent a date and time. 
-///   IfcDate: Defined type of simple type STRING to represent a date. 
-///   IfcTime: Defined type of simple type STRING to represent a time. 
-///   IfcDuration: Defined type of simple type STRING to represent a duration. 
+/// FOLDING_TO_LEFT
 /// 
-/// HISTORY New type in IFC Release 2x.
+/// Door with one
+/// panel that is folding to the left. 
 /// 
-/// IFC2x4 CHANGE Items IfcDateTime, IfcDate, IfcTime, IfcDuration added.
-typedef IfcUtil::IfcSchemaEntity IfcSimpleValue;
-/// Definition from ISO/CD 10303-46:1992: The size select is a selection of a specific positive length measure.
+/// FOLDING_TO_RIGHT
+///   Door with one
+/// panel that is folding to the right. 
 /// 
-/// Definition from ISO: The size (or width) measure value is given in the global drawing length units.
+/// DOUBLE_DOOR_FOLDING
 /// 
-/// NOTE  global units are defined at the single IfcProject instance, given by UnitsInContext:IfcUnitAssignment, the same units are used for the geometric representation items and for the style definitions.
+/// Door with two
+/// panels, one is folding to the left
+/// the other is folding to the right. 
 /// 
-/// NOTE  Corresponding ISO 10303 name: size_select. Please refer to ISO/IS 10303-46:1994 for the final
-/// definition of the formal standard.
+/// REVOLVING
 /// 
-/// HISTORY  New type in IFC2x2.
+/// An entrance door
+/// consisting of four leaves set in
+/// a form of a cross and revolving around a central vertical axis (the
+/// four panels are described by a single IfcDoor panel
+/// property). 
 /// 
-/// IFC2x3 CHANGE  The SELECT item IfcMeasureWithUnit has been removed from the IfcSizeSelect, the IfcRatioMeasure and IfcDescriptiveMeasure has been added.
-typedef IfcUtil::IfcSchemaEntity IfcSizeSelect;
-/// The IfcSolidOrShell provides the option to either select a geometric volume (IfcSolidModel and subtypes) within a geometric model, or a shell (IfcClosedShell) within a topological model.
-/// SELECT
+/// ROLLINGUP
 /// 
-/// IfcSolidModel
-/// IfcClosedShell
+/// Door that opens
+/// by rolling up.
+///   Note: Whether it rolls up to the
+/// inside or
+/// outside is determined at the IfcDoor.
 /// 
-/// HISTORY  New select type in IFC2x4.
-typedef IfcUtil::IfcSchemaEntity IfcSolidOrShell;
-/// Definition from IAI: The
-/// IfcSpaceBoundarySelect selects either an internal space
-/// for internal or external space boundaries, or an external spatial
-/// element for external space boundaries at the outer envelop of the
-/// building.
-/// SELECT
+/// USERDEFINED
+///   User defined
+/// operation type
+///    
 /// 
-/// IfcSpace,
-/// IfcExternalSpatialElement
+/// NOTDEFINED
+///   A door with a
+/// not defined operation type is
+/// considered as a door with a lining, but no panels. It is thereby always
+/// open.
+///    
 /// 
-/// HISTORY  New select type
-/// in IFC2x4.
-typedef IfcUtil::IfcSchemaEntity IfcSpaceBoundarySelect;
-/// The IfcSpecularHighlightSelect defines the selectable types of value for specular highlight sharpness. 
+/// Figure 167 — Door style operations
 /// 
-/// NOTE: The two select types relate to the different ways to specifiy the sharpness (or shininess) of the specular part of the reflectance equation. It relates to the attributes: 
+/// NOTE
 /// 
-/// in ISO10303-46 the attribute specular_exponent is given 
-///   in VRML97 the attribute shininess is given 
-/// 
-/// For each surface side style only one of the two methods is needed for calculating the specular part of the equation.
-/// 
-/// HISTORY: New type in IFC2x2.
-typedef IfcUtil::IfcSchemaEntity IfcSpecularHighlightSelect;
-/// Definition from IAI: This type definition shall be used to
-///   distinguish between a reference to an instance either of
-///   IfcStructuralItem or IfcBuildingElement. The
-///   IfcStructuralActivityAssignmentSelect type is referenced by the entity
-///   IfcRelConnectsStructuralActivity which defines the connection between
-///   activities (IfcStructuralActivity) and the loaded element.  
-/// 
-/// HISTORY: New type in Release IFC2x
-///   Edition 2.
-typedef IfcUtil::IfcSchemaEntity IfcStructuralActivityAssignmentSelect;
-/// The style assignment select is a selection of two wasy of assigning presentation styles to an IfcStyledItem.
+/// Figures are shown in the ground view.
+///   Figures (symbolic representation) depend on the national
+/// building
+/// code.
+///   These figures are only shown as illustrations, the actual
+/// representation in the ground view might differ. 
+///   Open to the outside is declared as open into the direction
+/// of the
+/// positive y-axis, determined by the ObjectPlacement
+/// at IfcDoor
+///   The location of the panel relative to the wall thickness is
+/// defined by the ObjectPlacement at IfcDoor,
+/// and the IfcDoorLiningProperties.LiningOffset
+/// parameter.
+typedef enum {IfcDoorStyleOperation_SINGLE_SWING_LEFT, IfcDoorStyleOperation_SINGLE_SWING_RIGHT, IfcDoorStyleOperation_DOUBLE_DOOR_SINGLE_SWING, IfcDoorStyleOperation_DOUBLE_DOOR_SINGLE_SWING_OPPOSITE_LEFT, IfcDoorStyleOperation_DOUBLE_DOOR_SINGLE_SWING_OPPOSITE_RIGHT, IfcDoorStyleOperation_DOUBLE_SWING_LEFT, IfcDoorStyleOperation_DOUBLE_SWING_RIGHT, IfcDoorStyleOperation_DOUBLE_DOOR_DOUBLE_SWING, IfcDoorStyleOperation_SLIDING_TO_LEFT, IfcDoorStyleOperation_SLIDING_TO_RIGHT, IfcDoorStyleOperation_DOUBLE_DOOR_SLIDING, IfcDoorStyleOperation_FOLDING_TO_LEFT, IfcDoorStyleOperation_FOLDING_TO_RIGHT, IfcDoorStyleOperation_DOUBLE_DOOR_FOLDING, IfcDoorStyleOperation_REVOLVING, IfcDoorStyleOperation_ROLLINGUP, IfcDoorStyleOperation_USERDEFINED, IfcDoorStyleOperation_NOTDEFINED} IfcDoorStyleOperationEnum;
+const char* ToString(IfcDoorStyleOperationEnum v);
+IfcDoorStyleOperationEnum FromString(const std::string& s);
+}
+namespace IfcDoorTypeEnum {
+/// Definition from IAI: This enumeration defines the
+/// different predefined types of an IfcDoorType object can
+/// fulfill:
 /// 
-/// by directly assigning presentation styles as subtypes of IfcPresentationStyle
-/// by assigning presentation stypes via an intermediate collection entity IfcPresentationStyleAssignment
+/// DOOR: A standard door usually within a wall opening,
+/// as a door panel in a curtain wall, or as a "free standing"
+/// door.
+/// GATE: A gate is a point of entry to a property usually
+/// within an opening in a fence. Or as a "free standing" gate.
+/// TRAPDOOR: A special door that lies horizonally in a
+/// slab opening. Often used for accessing cellar or attic.
+/// USERDEFINED: User-defined linear beam element.
+/// NOTDEFINED: Undefined linear beam element
 /// 
-/// NOTE Using IfcPresentationStyleAssignment is deprecated in IFC2x4 onwards
+/// HISTORY  New Enumeration
+/// in IFC2x4.
+typedef enum {IfcDoorType_DOOR, IfcDoorType_GATE, IfcDoorType_TRAPDOOR, IfcDoorType_USERDEFINED, IfcDoorType_NOTDEFINED} IfcDoorTypeEnum;
+const char* ToString(IfcDoorTypeEnum v);
+IfcDoorTypeEnum FromString(const std::string& s);
+}
+namespace IfcDoorTypeOperationEnum {
+/// This enumeration defines the basic ways to describe how doors operate, as shown in Figure 66. It combines the partitioning of the door into a single or multiple door panels and the operation types of that panels.
 /// 
-/// NOTE The select type has been introduced to provide an upward compatible improvement for assigning styles to a styled items.
+/// In the most common case of swinging doors the IfcDoorTypeOperationEnum defined the hinge side (left hing or right hung) and the opening direction (opening to the left, opening to the right). Whether the door opens inwards or outwards is determined by the local coordinate system of the IfcDoor, or IfcDoorStandardCase.
 /// 
-/// HISTORY New select type in IFC2x4.
-typedef IfcUtil::IfcSchemaEntity IfcStyleAssignmentSelect;
-/// IfcSurfaceOrFaceSurface provides the option to either select a geometric surface (IfcSurface
-/// and subtypes) within a geometric model, or a face with associated surface geometry and coordinates (IfcFaceSurface) within a topological model.
-/// SELECT 
+/// NOTE There are different definitions in various countries on what a left opening or left hung or left swing door is (same for right). Therefore the IFC definition terms may derivate from the local standard and may need to be mapped appropriately.
 /// 
-/// IfcSurface 
-///   IfcFaceSurface
-///   IfcFaceBasedSurfaceModel (a connected face set, representing a faceted surface as an approximation of a non planar, non rectangular bounded surface)
+/// HISTORY  New Enumeration in IFC2x4.
 /// 
-/// HISTORY  New select type in IFC2x3.
-typedef IfcUtil::IfcSchemaEntity IfcSurfaceOrFaceSurface;
-/// Definition from ISO/CD 10303-46:1992: The surface style element select is a selection of the different surface styles to use in the presentation of the side of a surface. 
+/// IFC2x4 CHANGE The new IfcDoorTypeOperationEnum replaces the use of IfcDoorStyleOperationEnum that is deprecated from IFC2x4 onwards.
 /// 
-/// The select type only includes the IfcSurfaceStyleRendering (which is the equivalent to surface_style_rendering) from the select type surface_style_element_select. In addition it has the IfcSurfaceStyleLighting, which holds the exact physically based lighting properties for lighting based calculation algorithms (as the opposite to the rendering based calculation), the IfcSurfaceStyleRefraction (for more advanced refraction indices) and IfcSurfaceStyleWithTextures (to allow for image textures applied to surfaces). In addition an IfcExternallyDefinedSurfaceStyle can be selected that points into an external material library. 
+/// Enumerator
+/// Description
+/// Figures
+///  
 /// 
-/// NOTE The IfcSurfaceLightingProperties are needed for exact lighting calculation, because physically based lighting calculation algorithms need exact physically based parameters. The factors in IfcSurfaceStyleRendering lack the physical base, they are intended for rendering calculations, but a lighting calculation based software cannot use these values.
+/// SINGLE_SWING_LEFT
 /// 
-/// NOTE: Corresponding ISO 10303 type: surface_style_element_select. Please refer to ISO/IS 10303-46:1994, p. 85 for the final definition of the formal standard.
+/// Door with one panel that opens
+/// (swings) to the left. The hinges are on the left side as viewed
+/// in the direction of the positive y-axis.
+/// Note: Direction of swing (whether in or out)
+/// is determined at the IfcDoor or
+/// IfcDoorStandardCase.
 /// 
-/// HISTORY: New Select type in IFC2x2.
-typedef IfcUtil::IfcSchemaEntity IfcSurfaceStyleElementSelect;
-/// IfcTextFontSelect allows for either a predefined text font, a text font model or an externally defined text font to be used to describe the font of a text literal. The definition of the text font model is based on W3C TR Cascading Style Sheet Version 1, whereas the definition of predefined text font is based on ISO 10303.
+/// SINGLE_SWING_RIGHT
 /// 
-/// NOTE  IfcTextFontSelect is an entity that had been adopted from ISO 10303, Industrial automation systems and integration—Product data representation and exchange, Part 46: Integrated generic resources: Visual presentation. Corresponding ISO 10303 name: font_select. Please refer to ISO/IS 10303-46:1994, p. 133 for the final definition of the formal standard.
+/// Door with one panel that opens
+/// (swings) to the right. The hinges are on the right side as viewed
+/// in the direction of the positive y-axis.
+/// Note: Direction of swing (whether in or out)
+/// is determined at the IfcDoor or
+/// IfcDoorStandardCase.
 /// 
-/// HISTORY  New type in IFC2x2.
+/// DOUBLE_DOOR_
+/// SINGLE_SWING
 /// 
-/// IFC2x3 CHANGE  The select type has been renamed from IfcFontSelect.
-typedef IfcUtil::IfcSchemaEntity IfcTextFontSelect;
-/// IfcTimeOrRatioSelect allows a value to be selected as being either a ratio or a time measure.
-/// HISTORY New SELECT in IFC2x4
-typedef IfcUtil::IfcSchemaEntity IfcTimeOrRatioSelect;
-/// Definition from IAI: A measure of linear stiffness.  TRUE denotes infinite stiffness (rigidity).  FALSE denotes no stiffness (a release).  A numeric value denotes finite linear-elastic stiffness.
+/// Door with two panels, one opens
+/// (swings) to the left the other opens (swings) to the right.
+/// Note: Direction of swing (whether in or out)
+/// is determined at the IfcDoor or
+/// IfcDoorStandardCase. 
 /// 
-/// HISTORY: New type in IFC 2x4.
-typedef IfcUtil::IfcSchemaEntity IfcTranslationalStiffnessSelect;
-/// Definition from ISO/CD 10303-42:1992: This select type identifies the two possible ways of trimming a parametric curve; by a Cartesian point on the curve, or by a REAL number defining a parameter value within the parametric range of the curve. 
+/// DOUBLE_SWING_LEFT
 /// 
-/// NOTE Corresponding ISO 10303 type: trimming_select, please refer to ISO/IS 10303-42:1994, p. 20 for the final definition of the formal standard.
+/// Door with one panel that swings in
+/// both directions and to the left in the main trafic direction.
+/// Also called double acting door.
+/// Note: Direction of main swing (whether in or
+/// out) is determined at the IfcDoor or
+/// IfcDoorStandardCase. 
 /// 
-/// HISTORY New Type in IFC Release 1.0
-typedef IfcUtil::IfcSchemaEntity IfcTrimmingSelect;
-/// Definition from ISO/CD 10303-41:1992: A unit is a physical quantity, with a value of one, which is used as a standard in terms of which other quantities are expressed.
+/// DOUBLE_SWING_RIGHT
 /// 
-/// NOTE: Select item IfcMonetaryUnit is an addition to ISO 10303-41.
+/// Door with one panel that swings in
+/// both directions and to the right in the main trafic direction.
+/// Also called double acting door.
+/// Note: Direction of main swing (whether in or
+/// out) is determined at the IfcDoor or
+/// IfcDoorStandardCase.
 /// 
-/// NOTE: Corresponding ISO 10303 name: unit, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
+/// DOUBLE_DOOR_
+/// DOUBLE_SWING
 /// 
-/// SELECT 
+/// Door with two panels, one swings in
+/// both directions and to the right in the main trafic direction the
+/// other swings also in both directions and to the left in the main
+/// trafic direction.
+/// Note: Direction of main swing (whether in or
+/// out) is determined at the IfcDoor or
+/// IfcDoorStandardCase.
 /// 
-/// IfcNamedUnit: A unit which is identified by a name.
-/// IfcDerivedUnit: A unit which is derived from an expression of units. 
-/// IfcMonetaryUnit: A unit for defining currencies. 
+/// DOUBLE_DOOR_
+/// SINGLE_SWING_
+/// OPPOSITE_LEFT
 /// 
-/// HISTORY: New type in IFC Release 1.5.1.
-typedef IfcUtil::IfcSchemaEntity IfcUnit;
-/// IfcValue is a select type for selecting between more specialised select types IfcSimpleValue,
-/// IfcMeasureValue and IfcDerivedMeasureValue.
+/// Door with two panels that both open
+/// to the left, one panel swings in one direction and the other
+/// panel swings in the opposite direction.
+/// Note: Direction of main swing (whether in or
+/// out) is determined at the IfcDoor or
+/// IfcDoorStandardCase.
 /// 
-/// SELECT 
+///  
+///  
 /// 
-/// IfcSimpleValue A select type for basic defined types of simple data type. 
-///   IfcMeasureValue A select type for basic measure types of ISO 10303-41. 
-///   IfcDerivedMeasureValue A select type for derived measure types.
+/// DOUBLE_DOOR_
+/// SINGLE_SWING_
+/// OPPOSITE_RIGHT
+/// Door with two panels that both open
+/// to the right, one panel swings in one direction and the other
+/// panel swings in the opposite direction.
+/// Note: Direction of main swing (whether in or
+/// out) is determined at the IfcDoor or
+/// IfcDoorStandardCase.
 /// 
-/// HISTORY New type in IFC Release 2x.
-typedef IfcUtil::IfcSchemaEntity IfcValue;
-/// Definition from ISO/CD 10303-42:1992: This type is used to
-///   identify the types of entity which can participate in vector computations. 
+///  
+///  
 /// 
-/// NOTE Corresponding STEP type:
-///   vector_or_direction, please refer to ISO/IS 10303-42:1994, p. 20 for the final
-///   definition of the formal standard.  
-///   HISTORY New Type in IFC Release
-///   1.5
-typedef IfcUtil::IfcSchemaEntity IfcVectorOrDirection;
-/// Definition from IAI: A measure of warping stiffness.  TRUE denotes infinite stiffness (rigidity).  FALSE denotes no stiffness (a release).  A numeric value denotes finite linear-elastic stiffness.
+/// SLIDING_TO_LEFT
 /// 
-/// HISTORY: New type in IFC 2x4.
-typedef IfcUtil::IfcSchemaEntity IfcWarpingStiffnessSelect;
-/// The box alignment specifies the alignment of the text box relative to its position. The following string values shall be used:
+/// Door with one panel that is sliding
+/// to the left.
 /// 
-/// top-left
-///   top-middle
-///   top-right
-///   middle-left
-///   center
-///   middle-right
-///   bottom-left
-///   bottom-middle
-///   bottom-right
+/// SLIDING_TO_RIGHT
 /// 
-/// NOTE  The top-left is the default value.
+/// Door with one panel that is sliding
+/// to the right.
 /// 
-/// Figure 298 illustrates alignment values.
+/// DOUBLE_DOOR_SLIDING
 /// 
-/// Figure 298 — Box alignment values
+/// Door with two panels, one is sliding
+/// to the left the other is sliding to the right.
 /// 
-/// Figure 299 illustrates use of alignment values together with the placement and planar extent.
+/// FOLDING_TO_LEFT
 /// 
-/// Figure 299 — Box alignment examples
+/// Door with one panel that is folding
+/// to the left.
 /// 
-/// HISTORY  New type in IFC2x2 Addendum2.
+/// FOLDING_TO_RIGHT
+/// Door with one panel that is folding
+/// to the right.
 /// 
-/// IFC2x3 CHANGE  The IfcBoxAlignment has been added.
-typedef IfcLabel IfcBoxAlignment;
-/// IfcNormalisedRatioMeasure is a dimensionless measure to express ratio values ranging from 0.0 to 1.0.
+/// DOUBLE_DOOR_FOLDING
 /// 
-/// Type: REAL
+/// Door with two panels, one is folding
+/// to the left the other is folding to the right.
 /// 
-/// HISTORY New type in IFC Release 2x.
-typedef IfcRatioMeasure IfcNormalisedRatioMeasure;
-/// Definition from ISO/CD 10303-41:1992: A positive ratio measure is a ratio measure that is greater than zero.
-/// Type: IfcRatioMeasure
+/// REVOLVING
 /// 
-/// NOTE Corresponding ISO 10303 name: positive_ratio_measure, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
+/// An entrance door consisting of four
+/// leaves set in a form of a cross and revolving around a central
+/// vertical axis (the four panels are described by a single
+/// IfcDoor panel property).
+///  
+///  
 /// 
-/// HISTORY New type in IFC Release 1.5.1.
-typedef IfcRatioMeasure IfcPositiveRatioMeasure;
-
-typedef SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > IfcPropertySetDefinitionSet;
-namespace IfcActionRequestTypeEnum {
-/// IfcActionRequestTypeEnum defines the types of sources through which a request can be made. 
-///   HISTORY: New Enumeration in IFC2x4. 
-///   Enumeration: 
+/// ROLLINGUP
 /// 
-/// EMAIL: Request was made through email. 
-/// FAX: Request was made through facsimile. 
-/// PHONE: Request was made verbally over a telephone. 
-/// POST: Request was made through postal mail. 
-/// VERBAL: Request was made verbally in person.  
-/// USERDEFINED: User-defined type. 
-/// NOTDEFINED: Undefined type.
-typedef enum {IfcActionRequestType_EMAIL, IfcActionRequestType_FAX, IfcActionRequestType_PHONE, IfcActionRequestType_POST, IfcActionRequestType_VERBAL, IfcActionRequestType_USERDEFINED, IfcActionRequestType_NOTDEFINED} IfcActionRequestTypeEnum;
-const char* ToString(IfcActionRequestTypeEnum v);
-IfcActionRequestTypeEnum FromString(const std::string& s);
-}
-namespace IfcActionSourceTypeEnum {
-/// Definition from IAI:This enumeration type contains possible
-///   action sources. 
+/// Door that opens by rolling up.
+/// Note: Whether it rolls up to the inside or
+/// outside is determined at the IfcDoor.
 /// 
-/// HISTORY: New type in Release IFC2x
-///   Edition 2.
-typedef enum {IfcActionSourceType_DEAD_LOAD_G, IfcActionSourceType_COMPLETION_G1, IfcActionSourceType_LIVE_LOAD_Q, IfcActionSourceType_SNOW_S, IfcActionSourceType_WIND_W, IfcActionSourceType_PRESTRESSING_P, IfcActionSourceType_SETTLEMENT_U, IfcActionSourceType_TEMPERATURE_T, IfcActionSourceType_EARTHQUAKE_E, IfcActionSourceType_FIRE, IfcActionSourceType_IMPULSE, IfcActionSourceType_IMPACT, IfcActionSourceType_TRANSPORT, IfcActionSourceType_ERECTION, IfcActionSourceType_PROPPING, IfcActionSourceType_SYSTEM_IMPERFECTION, IfcActionSourceType_SHRINKAGE, IfcActionSourceType_CREEP, IfcActionSourceType_LACK_OF_FIT, IfcActionSourceType_BUOYANCY, IfcActionSourceType_ICE, IfcActionSourceType_CURRENT, IfcActionSourceType_WAVE, IfcActionSourceType_RAIN, IfcActionSourceType_BRAKES, IfcActionSourceType_USERDEFINED, IfcActionSourceType_NOTDEFINED} IfcActionSourceTypeEnum;
-const char* ToString(IfcActionSourceTypeEnum v);
-IfcActionSourceTypeEnum FromString(const std::string& s);
-}
-namespace IfcActionTypeEnum {
-/// Definition from IAI: This enumeration type is used to distinguish
-///   between possible action types at a high level. It can be used for an automated
-///   definition of load combinations and for dimensioning. The contained items and
-///   their acronyms are adopted from the Eurocode standard. 
+/// SWING_FIXED_LEFT
+/// Door with one panel that opens
+/// (swings) to the left and one fixed panel. The hinges of the
+/// swinging panel are on the left side as viewed in the direction of
+/// the positive y-axis.
+/// Note: Direction of swing (whether in or out)
+/// is determined at the IfcDoor or or
+/// IfcDoorStandardCase.
+/// IFC2x4 CHANGE This is a new
+/// enumerator compared with previous
+/// IfcDoorStyleOperationEnum.
 /// 
-/// HISTORY: New type in Release IFC2x
-///   Edition 2.
-typedef enum {IfcActionType_PERMANENT_G, IfcActionType_VARIABLE_Q, IfcActionType_EXTRAORDINARY_A, IfcActionType_USERDEFINED, IfcActionType_NOTDEFINED} IfcActionTypeEnum;
-const char* ToString(IfcActionTypeEnum v);
-IfcActionTypeEnum FromString(const std::string& s);
-}
-namespace IfcActuatorTypeEnum {
-/// The IfcActuatorTypeEnum defines the range of different types of actuator that can be specified. 
+/// SWING_FIXED_RIGHT
+/// Door with one panel that opens
+/// (swings) to the right and one fixed panel. The hinges of the
+/// swinging panel are on the right side as viewed in the direction
+/// of the positive y-axis.
+/// Note: Direction of swing (whether in or out)
+/// is determined at the IfcDoor or or
+/// IfcDoorStandardCase.
+/// IFC2x4 CHANGE This is a new
+/// enumerator compared with previous
+/// IfcDoorStyleOperationEnum.
 /// 
-/// HISTORY: New type in IFC
-///   R2.0  
-///   Enumeration 
+/// USERDEFINED
+/// User defined operation type
+///  
+///  
 /// 
-/// ELECTRICACTUATOR: A device that electrically actuates a control element.  
-/// PNEUMATICACTUATOR<: A device that pneumatically actuates a control element  
-/// HYDRAULICACTUATOR: A device that electrically actuates a control element.  
-/// HANDOPERATEDACTUATOR: A device that manually actuates a control element. 
-/// THERMOSTATICACTUATOR: A device that thermostatically actuates a control element. 
-/// USERDEFINED: User-defined type. 
-/// NOTDEFINED: Undefined type. 
+/// NOTDEFINED
+/// A door with a not defined operation
+/// type is considered as a door with a lining, but no panels. It is
+/// thereby always open.
 /// 
-/// See property set of actuator common attributes for specification of
-///   properties for hand operated actuators.
-typedef enum {IfcActuatorType_ELECTRICACTUATOR, IfcActuatorType_HANDOPERATEDACTUATOR, IfcActuatorType_HYDRAULICACTUATOR, IfcActuatorType_PNEUMATICACTUATOR, IfcActuatorType_THERMOSTATICACTUATOR, IfcActuatorType_USERDEFINED, IfcActuatorType_NOTDEFINED} IfcActuatorTypeEnum;
-const char* ToString(IfcActuatorTypeEnum v);
-IfcActuatorTypeEnum FromString(const std::string& s);
-}
-namespace IfcAddressTypeEnum {
-/// Definition from IAI: Identifies the logical location of the address.
+///  
 /// 
-/// HISTORY New type in IFC Release 2x.
+/// Figure 66 — Door operations
 /// 
-/// ENUMERATION 
+/// NOTE
 /// 
-/// OFFICE An office address. 
-///   SITE A site address.
-///   HOME A home address.
-///   DISTRIBUTIONPOINT A postal distribution point address.
-///   USERDEFINED A user defined address type to be provided.
-typedef enum {IfcAddressType_OFFICE, IfcAddressType_SITE, IfcAddressType_HOME, IfcAddressType_DISTRIBUTIONPOINT, IfcAddressType_USERDEFINED} IfcAddressTypeEnum;
-const char* ToString(IfcAddressTypeEnum v);
-IfcAddressTypeEnum FromString(const std::string& s);
+/// Figures are shown in the ground view.
+/// Figures (symbolic representation) depend on the national
+/// building code.
+/// These figures are only shown as illustrations, the actual
+/// representation in the ground view might differ.
+/// Open to the outside is declared as open into the direction of
+/// the positive y-axis, determined by the ObjectPlacement at
+/// IfcDoor
+/// The location of the panel relative to the wall thickness is
+/// defined by the ObjectPlacement at IfcDoor, and the
+/// IfcDoorLiningProperties.LiningOffset parameter.
+typedef enum {IfcDoorTypeOperation_SINGLE_SWING_LEFT, IfcDoorTypeOperation_SINGLE_SWING_RIGHT, IfcDoorTypeOperation_DOUBLE_DOOR_SINGLE_SWING, IfcDoorTypeOperation_DOUBLE_DOOR_SINGLE_SWING_OPPOSITE_LEFT, IfcDoorTypeOperation_DOUBLE_DOOR_SINGLE_SWING_OPPOSITE_RIGHT, IfcDoorTypeOperation_DOUBLE_SWING_LEFT, IfcDoorTypeOperation_DOUBLE_SWING_RIGHT, IfcDoorTypeOperation_DOUBLE_DOOR_DOUBLE_SWING, IfcDoorTypeOperation_SLIDING_TO_LEFT, IfcDoorTypeOperation_SLIDING_TO_RIGHT, IfcDoorTypeOperation_DOUBLE_DOOR_SLIDING, IfcDoorTypeOperation_FOLDING_TO_LEFT, IfcDoorTypeOperation_FOLDING_TO_RIGHT, IfcDoorTypeOperation_DOUBLE_DOOR_FOLDING, IfcDoorTypeOperation_REVOLVING, IfcDoorTypeOperation_ROLLINGUP, IfcDoorTypeOperation_SWING_FIXED_LEFT, IfcDoorTypeOperation_SWING_FIXED_RIGHT, IfcDoorTypeOperation_USERDEFINED, IfcDoorTypeOperation_NOTDEFINED} IfcDoorTypeOperationEnum;
+const char* ToString(IfcDoorTypeOperationEnum v);
+IfcDoorTypeOperationEnum FromString(const std::string& s);
 }
-namespace IfcAirTerminalBoxTypeEnum {
-/// This enumeration identifies different types of air terminal boxes.   
-/// 
-/// Valid enumerations are:
+namespace IfcDuctFittingTypeEnum {
+/// This enumeration is used to identify the primary purpose of a duct fitting. This is a very basic categorization mechanism
+///   to generically identify the duct fitting type. Subcategories
+///   of duct fittings are not enumerated. 
+///   The IfcDuctFittingTypeEnum contains the following:
 /// 
-/// CONSTANTFLOW:  Terminal box does not include a means to reset the volume automatically to an outside signal such as thermostat.
-///   VARIABLEFLOWPRESSUREDEPENDANT:  terminal box includes a means to reset the volume automatically to a different control point in response to an outside signal such as thermostat: air-flow rate depends on supply pressure.
-///   VARIABLEFLOWPRESSUREINDEPENDANT:  terminal box includes a means to reset the volume automatically to a different control point in response to an outside signal such as thermostat: air-flow rate is independant of supply pressure.
-///   USERDEFINED:				  User-defined terminal box.
-///   NOTDEFINED:					  Undefined terminal box.
+/// BEND:		A fitting with typically two ports used to change 
+///   the direction of flow between connected elements.
+///   CONNECTOR:   Connector fitting, typically used to join two
+///   ports together within a flow distribution system 
+///   (e.g., a coupling used to join two duct segments).
+///   ENTRY:       Entry fitting, typically unconnected at one port
+///   and connected to a flow distribution system at 
+///   the other (e.g., an outside air duct system 
+///   intake opening).
+///   EXIT:        Exit fitting, typically unconnected at one port
+///   and connected to a flow distribution system at 
+///   the other (e.g., an exhaust air discharge 
+///   opening).
+///   JUNCTION:	A fitting with typically more than two ports used
+///   to redistribute flow among the ports and/or to
+///   change the direction of flow between connected
+///   elements (e.g, tee, cross, wye, etc.).
+///   OBSTRUCTION: A fitting with typically two ports used to 
+///   obstruct or restrict flow between the connected
+///   elements (e.g., screen, perforated plate, etc.).
+///   TRANSITION:	A fitting with typically two ports having
+///   different shapes or sizes. Can also be used to
+///   change the direction of flow between connected
+///   elements.
+///   USERDEFINED: User-defined fitting.
+///   NOTDEFINED:  Undefined fitting.
 /// 
-/// HISTORY: New enumeration in IFC R2.0
-typedef enum {IfcAirTerminalBoxType_CONSTANTFLOW, IfcAirTerminalBoxType_VARIABLEFLOWPRESSUREDEPENDANT, IfcAirTerminalBoxType_VARIABLEFLOWPRESSUREINDEPENDANT, IfcAirTerminalBoxType_USERDEFINED, IfcAirTerminalBoxType_NOTDEFINED} IfcAirTerminalBoxTypeEnum;
-const char* ToString(IfcAirTerminalBoxTypeEnum v);
-IfcAirTerminalBoxTypeEnum FromString(const std::string& s);
+/// HISTORY: New enumeration in IFC 2x2
+typedef enum {IfcDuctFittingType_BEND, IfcDuctFittingType_CONNECTOR, IfcDuctFittingType_ENTRY, IfcDuctFittingType_EXIT, IfcDuctFittingType_JUNCTION, IfcDuctFittingType_OBSTRUCTION, IfcDuctFittingType_TRANSITION, IfcDuctFittingType_USERDEFINED, IfcDuctFittingType_NOTDEFINED} IfcDuctFittingTypeEnum;
+const char* ToString(IfcDuctFittingTypeEnum v);
+IfcDuctFittingTypeEnum FromString(const std::string& s);
 }
-namespace IfcAirTerminalTypeEnum {
-/// Enumeration defining the functional types of air terminals. 
-///   The IfcAirTerminalTypeEnum contains the following:
-/// 
-/// GRILLE: A covering for any area through which air passes.
-///   REGISTER: A grille typically equipped with a damper or control valve.
-///   DIFFUSER: An outlet discharging supply air in various directions and planes.
-///   LOUVRE: A rectilinear louvre.
-///   USERDEFINED: User-defined air terminal type.
-///   NOTDEFINED:  Undefined air terminal type.
+namespace IfcDuctSegmentTypeEnum {
+/// This enumeration is used to identify the primary purpose of a
+///   duct segment. This is a very basic categorization mechanism
+///   to generically identify the duct segment type. Subcategories
+///   of duct segments are not enumerated. 
+///   The IfcDuctSegmentTypeEnum contains the following:
 /// 
-/// NOTE: Architectural louvres within doors or windows are defined by IfcPermeableCoveringProperties.
+/// RIGIDSEGMENT: A rigid segment is continuous linear segment of duct
+///   that cannot be deformed.
+///   FLEXIBLESEGMENT:  A flexible segment is a continuous non-linear segment
+///   of duct that can be deformed and change the direction 
+///   of flow.
+///   USERDEFINED: User-defined segment.
+///   NOTDEFINED:  Undefined segment.
 /// 
-/// HISTORY: New enumeration in IFC R2x2.  Modified in IFC R2x4 to add LOUVRE and remove EYEBALL, IRIS, LINEARGRILLE, LINEARDIFFUSER
-typedef enum {IfcAirTerminalType_DIFFUSER, IfcAirTerminalType_GRILLE, IfcAirTerminalType_LOUVRE, IfcAirTerminalType_REGISTER, IfcAirTerminalType_USERDEFINED, IfcAirTerminalType_NOTDEFINED} IfcAirTerminalTypeEnum;
-const char* ToString(IfcAirTerminalTypeEnum v);
-IfcAirTerminalTypeEnum FromString(const std::string& s);
+/// HISTORY: New enumeration in IFC 2x2
+typedef enum {IfcDuctSegmentType_RIGIDSEGMENT, IfcDuctSegmentType_FLEXIBLESEGMENT, IfcDuctSegmentType_USERDEFINED, IfcDuctSegmentType_NOTDEFINED} IfcDuctSegmentTypeEnum;
+const char* ToString(IfcDuctSegmentTypeEnum v);
+IfcDuctSegmentTypeEnum FromString(const std::string& s);
 }
-namespace IfcAirToAirHeatRecoveryTypeEnum {
-/// Defines general types of pumps.
-///   The IfcPumpTypeEnum contains the following:
+namespace IfcDuctSilencerTypeEnum {
+/// Enumeration defining the typical types of duct silencers. 
+///   The IfcDuctSilencerTypeEnum contains the following:
 /// 
-/// FIXEDPLATECOUNTERFLOWEXCHANGER: Heat exchanger with moving parts and alternate layers of plates, separated and sealed from the exhaust and supply air stream passages with primary air enters at secondary air outlet location and exits at secondary air inlet location.
-///   FIXEDPLATECROSSFLOWEXCHANGER: Heat exchanger with moving parts and alternate layers of plates, separated and sealed from the exhaust and supply air stream passages with secondary air flow in the direction perpendicular to primary air flow.
-///   FIXEDPLATEPARALLELFLOWEXCHANGER: Heat exchanger with moving parts and alternate layers of plates, separated and sealed from the exhaust and supply air stream passages with primary air enters at secondary air inlet location and exits at secondary air outlet location.
-///   ROTARYWHEEL: A heat wheel with a revolving cylinder filled with an air-permeable medium having a large internal surface area.
-///   RUNAROUNDCOILLOOP: A typical coil energy recovery loop places extended surface, finned tube water coils in the supply and exhaust airstreams of a building.
-///   HEATPIPE: A passive energy recovery device with a heat pipe divided into evaporator and condenser sections.
-///   TWINTOWERENTHALPYRECOVERYLOOPS: An air-to-liquid, liquid-to-air enthalpy recovery system with a sorbent liquid circulates continuously between supply and exhaust airstreams, alternately contacting both airstreams directly in contactor towers.
-///   THERMOSIPHONSEALEDTUBEHEATEXCHANGERS: Sealed systems that consist of an evaporator, a condenser, interconnecting piping, and an intermediate working fluid that is present in both liquid and vapor phases where the evaporator and the condenser are usually at opposite ends of a bundle of straight, individual thermosiphon tubes and the exhaust and supply ducts are adjacent to each other.
-///   THERMOSIPHONCOILTYPEHEATEXCHANGERS: Sealed systems that consist of an evaporator, a condenser, interconnecting piping, and an intermediate working fluid that is present in both liquid and vapor phases where the evaporator and condensor coils are installed independently in the ducts and are interconnected by the working fluid piping.
-///   USERDEFINED: User-defined air to air heat recovery type.
-///   NOTDEFINED:  Undefined air to air heat recovery type.
+/// FLATOVAL:  Flat-oval shaped duct silencer type.
+///   RECTANGULAR:  Rectangular shaped duct silencer type.
+///   ROUND:  Round duct silencer type.
+///   USERDEFINED:  User-defined duct silencer type.
+///   NOTDEFINED:  Undefined duct silencer type.
 /// 
-/// HISTORY: New enumeration in IFC R2x.
-typedef enum {IfcAirToAirHeatRecoveryType_FIXEDPLATECOUNTERFLOWEXCHANGER, IfcAirToAirHeatRecoveryType_FIXEDPLATECROSSFLOWEXCHANGER, IfcAirToAirHeatRecoveryType_FIXEDPLATEPARALLELFLOWEXCHANGER, IfcAirToAirHeatRecoveryType_ROTARYWHEEL, IfcAirToAirHeatRecoveryType_RUNAROUNDCOILLOOP, IfcAirToAirHeatRecoveryType_HEATPIPE, IfcAirToAirHeatRecoveryType_TWINTOWERENTHALPYRECOVERYLOOPS, IfcAirToAirHeatRecoveryType_THERMOSIPHONSEALEDTUBEHEATEXCHANGERS, IfcAirToAirHeatRecoveryType_THERMOSIPHONCOILTYPEHEATEXCHANGERS, IfcAirToAirHeatRecoveryType_USERDEFINED, IfcAirToAirHeatRecoveryType_NOTDEFINED} IfcAirToAirHeatRecoveryTypeEnum;
-const char* ToString(IfcAirToAirHeatRecoveryTypeEnum v);
-IfcAirToAirHeatRecoveryTypeEnum FromString(const std::string& s);
+/// HISTORY: New enumeration in IFC 2x2.
+typedef enum {IfcDuctSilencerType_FLATOVAL, IfcDuctSilencerType_RECTANGULAR, IfcDuctSilencerType_ROUND, IfcDuctSilencerType_USERDEFINED, IfcDuctSilencerType_NOTDEFINED} IfcDuctSilencerTypeEnum;
+const char* ToString(IfcDuctSilencerTypeEnum v);
+IfcDuctSilencerTypeEnum FromString(const std::string& s);
 }
-namespace IfcAlarmTypeEnum {
-/// The IfcAlarmTypeEnum defines the range of different types of alarm that can be specified. 
+namespace IfcElectricApplianceTypeEnum {
+/// The IfcElectricApplianceTypeEnum defines the range of different types of electrical appliance that can be specified. 
 /// 
-/// HISTORY: New type in IFC 2x2
+/// HISTORY: New type in IFC R2.0.
+///   Renamed from IfcElectricalApplianceTypeEnum if IFC 2x2.IFC 2x2 Addendum 1:
+///   Missing enumeration values added (ELECTRICHEATER, TUMBLEDRYER and
+///   WATERHEATER)
+///   IFC 2x4: ELECTRICHEATER changed to FREESTANDINGELECTRICHEATER and noted as being for occasional use. RADIANTHEATER removed as part of general 'heater consolidation'. WATERHEATER, DIRECTWATERHEATER and INDIRECTWATERHEATER rationalized to FREESTANDINGWATERHEATER. WATERCOOLER changed to FREESTANDINGWATERCOOLER.
+///   COMPUTER, FACSIMILE (FAX), PRINTER, SCANNER, TELEPHONE, TV (TELEVISION) moved to IfcAudioVisualApplianceTypeEnum and IfcCommunicationsApplianceTypeEnum. KITCHENMACHINE added.
 /// 
 /// Enumeration 
 /// 
-/// BELL: An audible alarm. 
-/// BREAKGLASSBUTTON: An alarm activation mechanism in which a protective glass has to be broken to enable a button to be pressed. 
-/// LIGHT: A visual alarm. 
-/// MANUALPULLBOX: An alarm activation mechanism in which activation is achieved by a pulling action. 
-/// SIREN: An audible alarm. 
-/// WHISTLE: An audible alarm.  
+/// DISHWASHER: An appliance that has the primary function of washing dishes. 
+/// ELECTRICCOOKER: An electrical appliance that has the primary function of cooking food (including oven, hob, grill). 
+/// FREESTANDINGELECTRICHEATER: An electrical appliance that is used occasionally to provide heat. A freestanding electric heater is a 'plugged' appliance whose load may be removed from an electric circuit. 
+/// FREESTANDINGFAN: An electrical appliance that is used occasionally to provide ventilation. A freestanding fan is a 'plugged' appliance whose load may be removed from an electric circuit. 
+/// FREESTANDINGWATERHEATER: A small, local electrical appliance for heating water. A freestanding water heater is a 'plugged' appliance whose load may be removed from an electric circuit. 
+/// FREESTANDINGWATERCOOLER: A small, local electrical appliance for cooling water. A freestanding water cooler is a 'plugged' appliance whose load may be removed from an electric circuit. 
+/// FREEZER: An electrical appliance that has the primary function of storing food at temperatures below the freezing point of water. 
+/// FRIDGE_FREEZER: An electrical appliance that combines the functions of a freezer and a refrigerator through the provision of separate compartments. 
+/// KITCHENMACHINE: A specialized appliance used in commercial kitchens such as a mixer. 
+/// HANDDRYER: An electrical appliance that has the primary function of drying hands. 
+/// MICROWAVE: An electrical appliance that has the primary function of cooking food using microwaves. 
+/// PHOTOCOPIER: A machine that has the primary function of reproduction of printed matter. 
+/// REFRIGERATOR: An electrical appliance that has the primary function of storing food at low temperature but above the freezing point of water. 
+/// TUMBLEDRYER: An electrical appliance that has the primary function of drying clothes. 
+/// VENDINGMACHINE: An appliance that stores and vends goods including food, drink and goods of various types. 
+/// WASHINGMACHINE: An appliance that has the primary function of washing clothes. 	  
 /// USERDEFINED: User-defined type. 
 /// NOTDEFINED: Undefined type.
-typedef enum {IfcAlarmType_BELL, IfcAlarmType_BREAKGLASSBUTTON, IfcAlarmType_LIGHT, IfcAlarmType_MANUALPULLBOX, IfcAlarmType_SIREN, IfcAlarmType_WHISTLE, IfcAlarmType_USERDEFINED, IfcAlarmType_NOTDEFINED} IfcAlarmTypeEnum;
-const char* ToString(IfcAlarmTypeEnum v);
-IfcAlarmTypeEnum FromString(const std::string& s);
+typedef enum {IfcElectricApplianceType_DISHWASHER, IfcElectricApplianceType_ELECTRICCOOKER, IfcElectricApplianceType_FREESTANDINGELECTRICHEATER, IfcElectricApplianceType_FREESTANDINGFAN, IfcElectricApplianceType_FREESTANDINGWATERHEATER, IfcElectricApplianceType_FREESTANDINGWATERCOOLER, IfcElectricApplianceType_FREEZER, IfcElectricApplianceType_FRIDGE_FREEZER, IfcElectricApplianceType_HANDDRYER, IfcElectricApplianceType_KITCHENMACHINE, IfcElectricApplianceType_MICROWAVE, IfcElectricApplianceType_PHOTOCOPIER, IfcElectricApplianceType_REFRIGERATOR, IfcElectricApplianceType_TUMBLEDRYER, IfcElectricApplianceType_VENDINGMACHINE, IfcElectricApplianceType_WASHINGMACHINE, IfcElectricApplianceType_USERDEFINED, IfcElectricApplianceType_NOTDEFINED} IfcElectricApplianceTypeEnum;
+const char* ToString(IfcElectricApplianceTypeEnum v);
+IfcElectricApplianceTypeEnum FromString(const std::string& s);
 }
-namespace IfcAnalysisModelTypeEnum {
-/// Definition from IAI: This type definition is used to distinguish
-///   between different types of structural analysis models. The analysis models are
-///   differentiated by their dimensionality. 
+namespace IfcElectricDistributionBoardTypeEnum {
+/// The IfcElectricDistributionBoardTypeEnum defines the range of different types and/or functions of electric distribution board possible. 
+///   HISTORY: New type in IFC 2x4. Replaces IfcElectricDistributionPointTypeEnum  
+///   Enumeration 
 /// 
-/// HISTORY: New type in Release IFC2x
-///   Edition 2.
-typedef enum {IfcAnalysisModelType_IN_PLANE_LOADING_2D, IfcAnalysisModelType_OUT_PLANE_LOADING_2D, IfcAnalysisModelType_LOADING_3D, IfcAnalysisModelType_USERDEFINED, IfcAnalysisModelType_NOTDEFINED} IfcAnalysisModelTypeEnum;
-const char* ToString(IfcAnalysisModelTypeEnum v);
-IfcAnalysisModelTypeEnum FromString(const std::string& s);
-}
-namespace IfcAnalysisTheoryTypeEnum {
-/// Definition from IAI: This type definition is used to distinguish
-///   between different types of structural analysis methods, i.e. first order
-///   theory, second order theory (small deformations), third order theory (large
-///   deformations) and the full nonlinear theory (geometric nonlinearity together with other nonlinearities, e.g. plasticity). 
-/// 
-/// HISTORY: New type in Release IFC2x
-///   Edition 2.
-typedef enum {IfcAnalysisTheoryType_FIRST_ORDER_THEORY, IfcAnalysisTheoryType_SECOND_ORDER_THEORY, IfcAnalysisTheoryType_THIRD_ORDER_THEORY, IfcAnalysisTheoryType_FULL_NONLINEAR_THEORY, IfcAnalysisTheoryType_USERDEFINED, IfcAnalysisTheoryType_NOTDEFINED} IfcAnalysisTheoryTypeEnum;
-const char* ToString(IfcAnalysisTheoryTypeEnum v);
-IfcAnalysisTheoryTypeEnum FromString(const std::string& s);
+/// CONSUMERUNIT: A distribution point on the incoming electrical supply, typically in domestic premises, at which protective devices are located. 
+/// DISTRIBUTIONBOARD: A distribution point at which connections are made for distribution of electrical circuits usually through protective devices. 
+/// MOTORCONTROLCENTRE: A distribution point at which starting and control devices for major plant items are located. 
+/// SWITCHBOARD: A distribution point at which switching devices are located. 
+/// USERDEFINED: User-defined type. 
+/// NOTDEFINED: Undefined type.
+typedef enum {IfcElectricDistributionBoardType_CONSUMERUNIT, IfcElectricDistributionBoardType_DISTRIBUTIONBOARD, IfcElectricDistributionBoardType_MOTORCONTROLCENTRE, IfcElectricDistributionBoardType_SWITCHBOARD, IfcElectricDistributionBoardType_USERDEFINED, IfcElectricDistributionBoardType_NOTDEFINED} IfcElectricDistributionBoardTypeEnum;
+const char* ToString(IfcElectricDistributionBoardTypeEnum v);
+IfcElectricDistributionBoardTypeEnum FromString(const std::string& s);
 }
-namespace IfcArithmeticOperatorEnum {
-/// IfcArithmeticOperatorEnum specifies the form of arithmetical operation implied by the relationship. 
-/// Enumeration 
-/// 
-/// ADD 
-///   DIVIDE 
-///   MULTIPLY 
-///   SUBTRACT 
-/// 
-/// HISTORY: New enumeration in IFC2x2.
+namespace IfcElectricFlowStorageDeviceTypeEnum {
+/// The IfcElectricFlowStorageDeviceTypeEnum defines the range of different types of electrical flow storage device available. 
+///   HISTORY: New type in IFC 2x2  
+///   Enumeration 
 /// 
-/// Use definitions 
-/// There can be only one arithmetic operator for each applied value relationship. This is to enforce arithmetic consistency. Given this consistency, the cardinality of the IfcAppliedValueRelationship.Components attribute is a set of one to many applied values that are components of an applied value.
-typedef enum {IfcArithmeticOperator_ADD, IfcArithmeticOperator_DIVIDE, IfcArithmeticOperator_MULTIPLY, IfcArithmeticOperator_SUBTRACT} IfcArithmeticOperatorEnum;
-const char* ToString(IfcArithmeticOperatorEnum v);
-IfcArithmeticOperatorEnum FromString(const std::string& s);
+/// BATTERY: A device for storing energy in chemical form so that it can be released as electrical energy. 
+/// CAPACITORBANK: A device that stores electrical energy when an external power supply is present using the electrical property of capacitance 
+/// HARMONICFILTER: A device that constantly injects currents that precisely correspond to the harmonic components drawn by the load. 
+/// UPS: A device that provides a time limited alternative source of power supply in the event of failure of the main supply.  
+/// USERDEFINED: User-defined type.  
+/// NOTDEFINED: Undefined type.
+typedef enum {IfcElectricFlowStorageDeviceType_BATTERY, IfcElectricFlowStorageDeviceType_CAPACITORBANK, IfcElectricFlowStorageDeviceType_HARMONICFILTER, IfcElectricFlowStorageDeviceType_INDUCTORBANK, IfcElectricFlowStorageDeviceType_UPS, IfcElectricFlowStorageDeviceType_USERDEFINED, IfcElectricFlowStorageDeviceType_NOTDEFINED} IfcElectricFlowStorageDeviceTypeEnum;
+const char* ToString(IfcElectricFlowStorageDeviceTypeEnum v);
+IfcElectricFlowStorageDeviceTypeEnum FromString(const std::string& s);
 }
-namespace IfcAssemblyPlaceEnum {
-/// Definition from IAI: Enumeration defining where the
-///   assembly is intended to take place, either in a factory or
-///   on the building site.
-/// 
-/// HISTORY New enumeration in
-///   Release IFC2x Edition 2.
-/// 
-/// Enumeration
+namespace IfcElectricGeneratorTypeEnum {
+/// The IfcElectricGeneratorTypeEnum defines the range of types of electric generators available.
+///   HISTORY: New type in IFC 2x2.  Values added in IFC 2x4. 
 /// 
-/// SITE - this assembly is assembled at site
+/// Enumeration 
 /// 
-/// FACTORY - this assembly is assembled in a factory
-typedef enum {IfcAssemblyPlace_SITE, IfcAssemblyPlace_FACTORY, IfcAssemblyPlace_NOTDEFINED} IfcAssemblyPlaceEnum;
-const char* ToString(IfcAssemblyPlaceEnum v);
-IfcAssemblyPlaceEnum FromString(const std::string& s);
+/// CHP: Combined heat and power supply, used not only as a source of electric energy but also as a heating source for the building. It may therefore be not only part of an electrical system but also of a heating system. 
+/// ENGINEGENERATOR: Electrical generator with a fuel-driven engine, for example a diesel-driven emergency power supply. 
+/// STANDALONE: Electrical generator which does not include its source of kinetic energy, that is, a motor, engine, or turbine is modeled by a separate object. 
+/// USERDEFINED: User-defined type. 
+/// NOTDEFINED: Undefined type.
+typedef enum {IfcElectricGeneratorType_CHP, IfcElectricGeneratorType_ENGINEGENERATOR, IfcElectricGeneratorType_STANDALONE, IfcElectricGeneratorType_USERDEFINED, IfcElectricGeneratorType_NOTDEFINED} IfcElectricGeneratorTypeEnum;
+const char* ToString(IfcElectricGeneratorTypeEnum v);
+IfcElectricGeneratorTypeEnum FromString(const std::string& s);
 }
-namespace IfcAudioVisualApplianceTypeEnum {
-/// Defines the range of different types of audio-video devices that can be specified. 
-/// HISTORY: New enumeration in IFC2x4 
+namespace IfcElectricMotorTypeEnum {
+/// The IfcElectricMotorTypeEnum defines the range of different types of electric motor that can be specified. 
+///   HISTORY: New type in IFC 2x2  
+///   Enumeration 
 /// 
-/// AMPLIFIER: A device that receives an audio signal and amplifies it to play through speakers. 
-/// CAMERA: A device that records images, either as a still photograph or as moving images known as videos or movies.  Note that a camera may operate with light from the visible spectrum or from other parts of the electromagnetic spectrum such as infrared or ultraviolet. 
-/// DISPLAY: An electronic device that represents information in visual form such as a flat-panel display or television. 
-/// MICROPHONE: An acoustic-to-electric transducer or sensor that converts sound into an electrical signal.  Microphones types in use include electromagnetic induction (dynamic microphones), capacitance change (condenser microphones) or piezoelectric generation to produce the signal from mechanical vibration. 
-/// PLAYER: A device that plays audio and/or video content directly or to another device, having fixed or removable storage media. 
-/// PROJECTOR: An apparatus for projecting a picture on a screen. Whether the device is an overhead, slide projector, or a film projector, it is usually referred to as simply a projector. 
-/// RECEIVER: A device that receives audio and/or video signals, switches sources, and amplifies signals to play through speakers. 
-/// SPEAKER: A loudspeaker, speaker, or speaker system is an electroacoustical transducer that converts an electrical signal to sound. 
-/// SWITCHER: A device that receives audio and/or video signals, switches sources, and transmits signals to downstream devices. 
-/// TELEPHONE: A telecommunications device that is used to transmit and receive sound, and optionally video. 
-/// TUNER: An electronic receiver that detects, demodulates, and amplifies transmitted signals.
-typedef enum {IfcAudioVisualApplianceType_AMPLIFIER, IfcAudioVisualApplianceType_CAMERA, IfcAudioVisualApplianceType_DISPLAY, IfcAudioVisualApplianceType_MICROPHONE, IfcAudioVisualApplianceType_PLAYER, IfcAudioVisualApplianceType_PROJECTOR, IfcAudioVisualApplianceType_RECEIVER, IfcAudioVisualApplianceType_SPEAKER, IfcAudioVisualApplianceType_SWITCHER, IfcAudioVisualApplianceType_TELEPHONE, IfcAudioVisualApplianceType_TUNER, IfcAudioVisualApplianceType_USERDEFINED, IfcAudioVisualApplianceType_NOTDEFINED} IfcAudioVisualApplianceTypeEnum;
-const char* ToString(IfcAudioVisualApplianceTypeEnum v);
-IfcAudioVisualApplianceTypeEnum FromString(const std::string& s);
+/// DC: A motor using either generated or rectified D.C. power. 
+/// INDUCTION: An alternating current motor in which the primary winding on one member (usually the stator) is connected to the power source and a secondary winding or a squirrel-cage secondary winding on the other member (usually the rotor) carries the induced current. There is no physical electrical connection to the secondary winding, its current is induced. 
+/// POLYPHASE: A two or three-phase induction motor in which the windings, one for each phase, are evenly divided by the same number of electrical degrees.  
+/// RELUCTANCESYNCHRONOUS: A synchronous motor with a special rotor design which directly lines the rotor up with the rotating magnetic field of the stator, allowing for no slip under load.  
+/// SYNCHRONOUS: A motor that operates at a constant speed up to full load. The rotor speed is equal to the speed of the rotating magnetic field of the stator; there is no slip. 
+/// USERDEFINED: User-defined type. 
+/// NOTDEFINED: Undefined type.
+typedef enum {IfcElectricMotorType_DC, IfcElectricMotorType_INDUCTION, IfcElectricMotorType_POLYPHASE, IfcElectricMotorType_RELUCTANCESYNCHRONOUS, IfcElectricMotorType_SYNCHRONOUS, IfcElectricMotorType_USERDEFINED, IfcElectricMotorType_NOTDEFINED} IfcElectricMotorTypeEnum;
+const char* ToString(IfcElectricMotorTypeEnum v);
+IfcElectricMotorTypeEnum FromString(const std::string& s);
 }
-namespace IfcBSplineCurveForm {
-/// Definition from ISO/CD 10303-42:1992: This type is used to indicate that the B-spline curve represents a part of a curve of some specific form.
+namespace IfcElectricTimeControlTypeEnum {
+/// The IfcElectricTimeControlTypeEnum defines the range of types of electrical time control available. 
+///   HISTORY: New type in IFC 2x2  
+///   Enumeration 
 /// 
-/// Enumeration
+/// TIMECLOCK: A control that causes action to occur at set times. 
+/// TIMEDELAY: A control that causes action to occur following a set duration. 
+/// RELAY: Electromagnetically operated contactor for making or breaking a control circuit. 
+/// USERDEFINED: User-defined type. 
+/// NOTDEFINED: Undefined type.
+typedef enum {IfcElectricTimeControlType_TIMECLOCK, IfcElectricTimeControlType_TIMEDELAY, IfcElectricTimeControlType_RELAY, IfcElectricTimeControlType_USERDEFINED, IfcElectricTimeControlType_NOTDEFINED} IfcElectricTimeControlTypeEnum;
+const char* ToString(IfcElectricTimeControlTypeEnum v);
+IfcElectricTimeControlTypeEnum FromString(const std::string& s);
+}
+namespace IfcElementAssemblyTypeEnum {
+/// Definition from IAI: An enumeration defining the
+///   basic configuration types for element assemblies.
 /// 
-/// polyline form: A connected sequence of line segments represented by degree 1 B-spline basis functions.
-/// circular arc: An arc of a circle, or a complete circle represented by a B-spline curve.
-/// elliptic arc: An arc of an ellipse, or a complete ellipse, represented by a B-spline curve.
-/// parabolic arc: An arc of finite length of a parabola represented by a B-spline curve.
-/// hyperbolic arc: An arc of finite length of one branch of a hyperbola represented by a B-spline curve.
-/// unspecified: A B-spline curve for which no particular form is specified.
+/// HISTORY New enumeration type
+///   in Release IFC2x Edition 2.
 /// 
-/// NOTE  Corresponding ISO 10303 type: b_spline_curve_form. Please refer to ISO/IS 10303-42:1994, p. 15 for the final definition of the formal standard.
+/// Enumeration
 /// 
-/// HISTORY  New type in Release IFC2x2.
-typedef enum {IfcBSplineCurveForm_POLYLINE_FORM, IfcBSplineCurveForm_CIRCULAR_ARC, IfcBSplineCurveForm_ELLIPTIC_ARC, IfcBSplineCurveForm_PARABOLIC_ARC, IfcBSplineCurveForm_HYPERBOLIC_ARC, IfcBSplineCurveForm_UNSPECIFIED} IfcBSplineCurveForm;
-const char* ToString(IfcBSplineCurveForm v);
-IfcBSplineCurveForm FromString(const std::string& s);
-}
-namespace IfcBSplineSurfaceForm {
-
-typedef enum {IfcBSplineSurfaceForm_PLANE_SURF, IfcBSplineSurfaceForm_CYLINDRICAL_SURF, IfcBSplineSurfaceForm_CONICAL_SURF, IfcBSplineSurfaceForm_SPHERICAL_SURF, IfcBSplineSurfaceForm_TOROIDAL_SURF, IfcBSplineSurfaceForm_SURF_OF_REVOLUTION, IfcBSplineSurfaceForm_RULED_SURF, IfcBSplineSurfaceForm_GENERALISED_CONE, IfcBSplineSurfaceForm_QUADRIC_SURF, IfcBSplineSurfaceForm_SURF_OF_LINEAR_EXTRUSION, IfcBSplineSurfaceForm_UNSPECIFIED} IfcBSplineSurfaceForm;
-const char* ToString(IfcBSplineSurfaceForm v);
-IfcBSplineSurfaceForm FromString(const std::string& s);
+/// ACCESSORY_ASSEMBLY: Assembled accessories or components
+///   ARCH: A curved structure
+///   BEAM_GRID: Interconnected beams, located in one (typically horizontal) plane
+///   BRACED_FRAME: A rigid frame with additional bracing members
+///   GIRDER: A beam-like superstructure
+///   REINFORCEMENT_UNIT: Assembled reinforcement elements
+///   RIGID_FRAME: A structure built up of beams, columns, etc. with moment-resisting joints
+///   SLAB_FIELD: Slabs, laid out in one plane
+///   TRUSS: A structure built up of members with (quasi) pinned joints
+///   USERDEFINED: User-defined element assembly
+///   NOTDEFINED: Undefined element assembly
+typedef enum {IfcElementAssemblyType_ACCESSORY_ASSEMBLY, IfcElementAssemblyType_ARCH, IfcElementAssemblyType_BEAM_GRID, IfcElementAssemblyType_BRACED_FRAME, IfcElementAssemblyType_GIRDER, IfcElementAssemblyType_REINFORCEMENT_UNIT, IfcElementAssemblyType_RIGID_FRAME, IfcElementAssemblyType_SLAB_FIELD, IfcElementAssemblyType_TRUSS, IfcElementAssemblyType_USERDEFINED, IfcElementAssemblyType_NOTDEFINED} IfcElementAssemblyTypeEnum;
+const char* ToString(IfcElementAssemblyTypeEnum v);
+IfcElementAssemblyTypeEnum FromString(const std::string& s);
 }
-namespace IfcBeamTypeEnum {
-/// Definition from IAI: This enumeration defines the
-/// different types of linear elements an IfcBeamType object
-/// can fulfill:
-/// 
-/// BEAM: A standard beam usually used horizontally.
-/// JOIST: A beam used to support a floor or ceiling.
-/// HOLLOWCORE: A wide often prestressed beam with a
-/// hollow-core profile that usually serves as a slab component.
-/// LINTEL: A beam or horizontal piece of material over an
-/// opening (e.g. door, window).
-/// SPANDREL: A tall beam placed on the facade of a
-/// building. One tall side is usually finished to provide the
-/// exterior of the building. Can be used to support joists or slab
-/// elements on its interior side.
-/// 
-/// NOTE  They are also referred to as "spandrel
-/// panels", which are parts of a facade and sometimes have
-/// supporting consoles for floor slabs
-/// integrated.
+namespace IfcElementCompositionEnum {
+/// Definition from IAI: Enumeration that provides an
+///   indication, whether the spatial structure element or proxy
+///   represents a:
 /// 
-/// T_BEAM: A beam that forms part of a slab construction
-/// and acts together with the slab which its carries. Such beams are
-/// often of T-shape (therefore the English name), but may have other
-/// shapes as well, e.g. an L-Shape or an Inverted-T-Shape.
+/// COMPLEX - a group or aggregation of similar elements
 /// 
-/// NOTE  In order to distinguish beams by shape,
-/// the assigned IfcProfileDef subtypes provide the shape type
-/// and, if using a subtype of
-/// IfcParameterizedProfileDef, also the shape
-/// parameterization.
+/// ELEMENT - a (undivided) element itself
 /// 
-/// USERDEFINED: User-defined linear beam element.
-/// NOTDEFINED: Undefined linear beam element
+/// PARTIAL - a subelement or part
 /// 
-/// HISTORY  New Enumeration
-/// in Release IFC2x Edition 2.
-/// IFC2x4 CHANGE  The enumerators
-/// HOLLOWCORE and SPANDREL have been
-/// added.
-typedef enum {IfcBeamType_BEAM, IfcBeamType_JOIST, IfcBeamType_HOLLOWCORE, IfcBeamType_LINTEL, IfcBeamType_SPANDREL, IfcBeamType_T_BEAM, IfcBeamType_USERDEFINED, IfcBeamType_NOTDEFINED} IfcBeamTypeEnum;
-const char* ToString(IfcBeamTypeEnum v);
-IfcBeamTypeEnum FromString(const std::string& s);
+/// HISTORY New enumeration in
+///   IFC Release 2.x
+typedef enum {IfcElementComposition_COMPLEX, IfcElementComposition_ELEMENT, IfcElementComposition_PARTIAL} IfcElementCompositionEnum;
+const char* ToString(IfcElementCompositionEnum v);
+IfcElementCompositionEnum FromString(const std::string& s);
 }
-namespace IfcBenchmarkEnum {
-/// IfcBenchmarkEnum is an enumeration used to identify the logical comparators that can be applied in conjunction with constraint values. 
-/// 
-/// HISTORY: New type in IFC Release 2.0
-/// 
-/// IFC2x4 CHANGE: Extended to include comparators for item-set and set-item comparisons: INCLUDES, NOTINCLUDES, INCLUDEDIN and NOTINCLUDEDIN, to test if an individual item is a member of a given aggregation, or if an aggregation has a given individual item as a member.
+namespace IfcEngineTypeEnum {
+/// Enumeration defining the typical types of engines.  The IfcEngineTypeEnum contains the following:
 /// 
-/// Enumeration 
+/// EXTERNALCOMBUSTION: Combustion is external.
+///   INTERNALCOMBUSTION: Combustion is internal.
+///   USERDEFINED: User-defined engine type.
+///   NOTDEFINED:  Undefined engine type.
 /// 
-/// Value 
-///   Definition 
+/// HISTORY: New enumeration in IFC 2x4.
+typedef enum {IfcEngineType_EXTERNALCOMBUSTION, IfcEngineType_INTERNALCOMBUSTION, IfcEngineType_USERDEFINED, IfcEngineType_NOTDEFINED} IfcEngineTypeEnum;
+const char* ToString(IfcEngineTypeEnum v);
+IfcEngineTypeEnum FromString(const std::string& s);
+}
+namespace IfcEvaporativeCoolerTypeEnum {
+/// Enumeration defining the typical types of evaporative coolers. 
+///   The IfcEvaporativeCoolerTypeEnum contains the following:
 /// 
-/// GREATERTHAN 
-///   Identifies that a value must be greater than that set by the constraint. 
+/// DIRECTEVAPORATIVERANDOMMEDIAAIRCOOLER: Direct evaporative random media air cooler: Cools the air stream by evaporating water dircectly into the air stream using coolers with evaporative pads, usually of aspen wood or plastic fiber/foam.
+///   DIRECTEVAPORATIVERIGIDMEDIAAIRCOOLER: Direct evaporative rigid media air cooler: Cools the air stream by evaporating water dircectly into the air stream using coolers with sheets of rigid, corrugated material as the wetted surface.
+///   DIRECTEVAPORATIVESLINGERSPACKAGEDAIRCOOLER: Direct evaporative slingers packaged air cooler: Cools the air stream by evaporating water dircectly into the air stream using coolers with a water slinger in an evaporative cooling section and a fan section.
+///   DIRECTEVAPORATIVEPACKAGEDROTARYAIRCOOLER: Direct evaporative packaged rotary air cooler: Cools the air stream by evaporating water dircectly into the air stream using coolers that wet and wash the evaporative pad by rotating it through a water bath.
+///   DIRECTEVAPORATIVEAIRWASHER: Direct evaporative air washer: Cools the air stream by evaporating water dircectly into the air stream using coolers with spray-type air washer consist of a chamber or casing containing spray nozzles, and tank for collecting spray water, and an eliminator section for removing entrained drops of water from the air.
+///   INDIRECTEVAPORATIVEPACKAGEAIRCOOLER: Indirect evaporative package air cooler: Cools the air stream by evaporating water indirectly and without adding moisture into the air stream. On one side of the heat exchanger, the secondary air stream is cooled by evaporation, while on the other side of heat exchanger, the primary air stream (conditioned air to be supplied to the room) is sensibly cooled by the heat exchanger surfaces.
+///   INDIRECTEVAPORATIVEWETCOIL: Indirect evaporative wet coil: Cools the air stream by evaporating water indirectly and without adding moisture into the air stream. Water is sprayed directly on the tubes of the heat exchanger where latent cooling takes place and the vaporization of the water on the outside of the heat exchanger tubes allows the simultaneous heat and mass transfer which removes heat from the supply air on the tube side.
+///   INDIRECTEVAPORATIVECOOLINGTOWERORCOILCOOLER: Indirect evaporative cooling tower or coil cooler: Cools the air stream by evaporating water indirectly and without adding moisture into the air stream using a combination of a cooling tower or other evaporative water cooler with a water-to-air heat exchanger coil and water circulating pump.
+///   INDIRECTDIRECTCOMBINATION: Indirect/Direct combination: Cools the air stream by evaporating water indirectly and without adding moisture into the air stream using a two-stage cooler with a first-stage indirect evaporative cooler and second-stage direct evaporative cooler.
+///   USERDEFINED:  User-defined evaporative cooler type.
+///   NOTDEFINED:  Undefined evaporative cooler type.
 /// 
-/// GREATERTHANOREQUALTO 
-///   Identifies that a value must be either greater than or equal to that set by the constraint. 
+/// HISTORY: New enumeration in IFC 2x2.
+typedef enum {IfcEvaporativeCoolerType_DIRECTEVAPORATIVERANDOMMEDIAAIRCOOLER, IfcEvaporativeCoolerType_DIRECTEVAPORATIVERIGIDMEDIAAIRCOOLER, IfcEvaporativeCoolerType_DIRECTEVAPORATIVESLINGERSPACKAGEDAIRCOOLER, IfcEvaporativeCoolerType_DIRECTEVAPORATIVEPACKAGEDROTARYAIRCOOLER, IfcEvaporativeCoolerType_DIRECTEVAPORATIVEAIRWASHER, IfcEvaporativeCoolerType_INDIRECTEVAPORATIVEPACKAGEAIRCOOLER, IfcEvaporativeCoolerType_INDIRECTEVAPORATIVEWETCOIL, IfcEvaporativeCoolerType_INDIRECTEVAPORATIVECOOLINGTOWERORCOILCOOLER, IfcEvaporativeCoolerType_INDIRECTDIRECTCOMBINATION, IfcEvaporativeCoolerType_USERDEFINED, IfcEvaporativeCoolerType_NOTDEFINED} IfcEvaporativeCoolerTypeEnum;
+const char* ToString(IfcEvaporativeCoolerTypeEnum v);
+IfcEvaporativeCoolerTypeEnum FromString(const std::string& s);
+}
+namespace IfcEvaporatorTypeEnum {
+/// Enumeration defining the typical types of evaporators. 
+///   The IfcEvaporatorTypeEnum contains the following:
 /// 
-/// LESSTHAN 
-///   Identifies that a value must be less than that set by the constraint. 
+/// DIRECTEXPANSION: Direct-expansion evaporator.
+///   DIRECTEXPANSIONSHELLANDTUBE: Direct-expansion evaporator where a refrigerant evaporates inside a series of baffles that channel the fluid throughout the shell side.
+///   DIRECTEXPANSIONTUBEINTUBE: Direct-expansion evaporator where a refrigerant evaporates inside one or more pairs of coaxial tubes.
+///   DIRECTEXPANSIONBRAZEDPLATE: Direct-expansion evaporator where a refrigerant evaporates inside plates brazed or welded together to make up an assembly of separate channels.
+///   FLOODEDSHELLANDTUBE: Evaporator in which refrigerant evaporates outside tubes.
+///   SHELLANDCOIL: Evaporator in which refrigerant evaporates inside a simple coiled tube immersed in the fluid to be cooled.
+///   USERDEFINED:  User-defined evaporator type.
+///   NOTDEFINED:  Undefined evaporator type.
 /// 
-/// LESSTHANOREQUALTO 
-///   Identifies that a value must be either less than or equal to that set by the constraint. 
+/// HISTORY: New enumeration in IFC 2x2.
+typedef enum {IfcEvaporatorType_DIRECTEXPANSION, IfcEvaporatorType_DIRECTEXPANSIONSHELLANDTUBE, IfcEvaporatorType_DIRECTEXPANSIONTUBEINTUBE, IfcEvaporatorType_DIRECTEXPANSIONBRAZEDPLATE, IfcEvaporatorType_FLOODEDSHELLANDTUBE, IfcEvaporatorType_SHELLANDCOIL, IfcEvaporatorType_USERDEFINED, IfcEvaporatorType_NOTDEFINED} IfcEvaporatorTypeEnum;
+const char* ToString(IfcEvaporatorTypeEnum v);
+IfcEvaporatorTypeEnum FromString(const std::string& s);
+}
+namespace IfcEventTriggerTypeEnum {
+/// The IfcEventTriggerTypeEnum defines the range of different types of event trigger that can be specified.
 /// 
-/// EQUALTO 
-///   Identifies that a value must be equal to that set by the constraint. 
+/// HISTORY: New type in IFC2x4
 /// 
-/// NOTEQUALTO 
-///   Identifies that a value must be not equal to that set by the constraint. 
+/// Enumeration: The definition of event trigger types has been adopted from the Business Process Modeling Notation (BPMN), which is also used in the Information Delivery Manual (IDM) for defining business processes. More detailed information about the use of event trigger types can be found in these specifications.
 /// 
-/// INCLUDES 
-///   Identifies that an aggregation (set, list or table) must include the value (individual item) set by the constraint. 
+/// EVENTRULE: An event trigger that is a rule or constraint
+/// EVENTMESSAGE: An event trigger that is a message or set of information
+/// EVENTTIME: An event trigger that is at, or occurs after, a particular point in or period of time
+/// EVENTCOMPLEX: An event trigger that is a complex combination of things
+/// USERDEFINED
+/// NOTDEFINED
+typedef enum {IfcEventTriggerType_EVENTRULE, IfcEventTriggerType_EVENTMESSAGE, IfcEventTriggerType_EVENTTIME, IfcEventTriggerType_EVENTCOMPLEX, IfcEventTriggerType_USERDEFINED, IfcEventTriggerType_NOTDEFINED} IfcEventTriggerTypeEnum;
+const char* ToString(IfcEventTriggerTypeEnum v);
+IfcEventTriggerTypeEnum FromString(const std::string& s);
+}
+namespace IfcEventTypeEnum {
+/// The IfcEventTypeEnum defines the range of different types of event that can be specified.
 /// 
-/// NOTINCLUDES 
-///   Identifies that an aggregation (set, list or table) must not include (i.e must exclude) the value (individual item) set by the constraint. 
+/// HISTORY  New type in IFC2x4
 /// 
-/// INCLUDEDIN 
-///   Identifies that a value (individual item) must be included in the aggregation (set, list or table) set by the constraint. 
+/// Enumeration:
 /// 
-/// NOTINCLUDEDIN 
-///   Identifies that a value (individual item) must not be included (i.e. must be excluded) in the aggregation (set, list or table) set by the constraint.
-typedef enum {IfcBenchmark_GREATERTHAN, IfcBenchmark_GREATERTHANOREQUALTO, IfcBenchmark_LESSTHAN, IfcBenchmark_LESSTHANOREQUALTO, IfcBenchmark_EQUALTO, IfcBenchmark_NOTEQUALTO, IfcBenchmark_INCLUDES, IfcBenchmark_NOTINCLUDES, IfcBenchmark_INCLUDEDIN, IfcBenchmark_NOTINCLUDEDIN} IfcBenchmarkEnum;
-const char* ToString(IfcBenchmarkEnum v);
-IfcBenchmarkEnum FromString(const std::string& s);
+/// STARTEVENT: An initiating event of a process
+/// ENDEVENT: A terminating event of a process
+/// INTERMEDIATEEVENT: An event that occurs at an intermediate stage of a process
+/// USERDEFINED
+/// NOTDEFINED
+typedef enum {IfcEventType_STARTEVENT, IfcEventType_ENDEVENT, IfcEventType_INTERMEDIATEEVENT, IfcEventType_USERDEFINED, IfcEventType_NOTDEFINED} IfcEventTypeEnum;
+const char* ToString(IfcEventTypeEnum v);
+IfcEventTypeEnum FromString(const std::string& s);
 }
-namespace IfcBoilerTypeEnum {
-/// Enumeration defining the typical types of boilers.
-///   The IfcBoilerTypeEnum contains the following:
+namespace IfcExternalSpatialElementTypeEnum {
+/// Definition from IAI: This enumeration defines the
+/// different types of external spatial elements.
+/// Enumeration:
 /// 
-/// WATER: Water boiler.
-///   STEAM: Steam boiler.
-///   USERDEFINED: User-defined Boiler type.
-///   NOTDEFINED:  Undefined Boiler type.
+/// EXTERNAL - External air space around the building.
+/// EXTERNAL_EARTH - External volume covered by earth around the
+/// building.
+/// EXTERNAL_WATER - External volume covered with water around
+/// the building.
+/// EXTERNAL_FIRE - Space occupied by a neightboring
+/// building.
+/// USERDEFINED
+/// NOTDEFINED
 /// 
-/// HISTORY: New enumeration in IFC R2x.
-typedef enum {IfcBoilerType_WATER, IfcBoilerType_STEAM, IfcBoilerType_USERDEFINED, IfcBoilerType_NOTDEFINED} IfcBoilerTypeEnum;
-const char* ToString(IfcBoilerTypeEnum v);
-IfcBoilerTypeEnum FromString(const std::string& s);
+/// HISTORY New enumeration
+/// in IFC2x4.
+typedef enum {IfcExternalSpatialElementType_EXTERNAL, IfcExternalSpatialElementType_EXTERNAL_EARTH, IfcExternalSpatialElementType_EXTERNAL_WATER, IfcExternalSpatialElementType_EXTERNAL_FIRE, IfcExternalSpatialElementType_USERDEFINED, IfcExternalSpatialElementType_NOTDEFIEND} IfcExternalSpatialElementTypeEnum;
+const char* ToString(IfcExternalSpatialElementTypeEnum v);
+IfcExternalSpatialElementTypeEnum FromString(const std::string& s);
 }
-namespace IfcBooleanOperator {
-/// Definition from ISO/CD 10303-42:1992: This type defines the three Boolean operators used in the definition of CSG solids.
-/// 
-/// UNION: The operation of constructing the regularized set theoretic union of the volumes defined by two solids.
-/// INTERSECTION: The operation of constructing the regularised set theoretic intersection of the volumes defined by two solids.
-/// DIFFERENCE: The operation of constructing the regularized set theoretic intersection of the volumes defined by two solids.
+namespace IfcFanTypeEnum {
+/// Enumeration defining the typical types of fans.
+///   The IfcFanTypeEnum contains the following:
 /// 
-/// NOTE Corresponding STEP type: boolean_operator, please refer to ISO/IS 10303-42:1994, p.167 for the final definition of the formal standard.
+/// CENTRIFUGALFORWARDCURVED: Air flows through the impeller radially using blades that are forward curved.
+///   CENTRIFUGALRADIAL: Air flows through the impeller radially using blades that are uncurved or slightl forward curved.
+///   CENTRIFUGALBACKWARDINCLINEDCURVED: Air flows through the impeller radially using blades that are backward curved.
+///   CENTRIFUGALAIRFOIL: Air flows through the impeller radially using blades are airfoil shaped.
+///   TUBEAXIAL: Air flows through the impeller axially with reduced tip clearance and operating at higher tip speeds.
+///   VANEAXIAL: Air flows through the impeller axially with guide vanes and reduced running blade tip clearance.
+///   PROPELLORAXIAL: Air flows through the impeller axially and small hub-to-tip ratio impeller mounted in an orifice plate or inlet ring.
+///   USERDEFINED:	User-defined fan type.
+///   NOTDEFINED: Undefined fan type.
 /// 
-/// HISTORY New Type in IFC Release 1.5.1.
-typedef enum {IfcBooleanOperator_UNION, IfcBooleanOperator_INTERSECTION, IfcBooleanOperator_DIFFERENCE} IfcBooleanOperator;
-const char* ToString(IfcBooleanOperator v);
-IfcBooleanOperator FromString(const std::string& s);
+/// HISTORY: New enumeration in IFC 2x2.
+typedef enum {IfcFanType_CENTRIFUGALFORWARDCURVED, IfcFanType_CENTRIFUGALRADIAL, IfcFanType_CENTRIFUGALBACKWARDINCLINEDCURVED, IfcFanType_CENTRIFUGALAIRFOIL, IfcFanType_TUBEAXIAL, IfcFanType_VANEAXIAL, IfcFanType_PROPELLORAXIAL, IfcFanType_USERDEFINED, IfcFanType_NOTDEFINED} IfcFanTypeEnum;
+const char* ToString(IfcFanTypeEnum v);
+IfcFanTypeEnum FromString(const std::string& s);
 }
-namespace IfcBuildingElementPartTypeEnum {
-/// Definition from IAI: This enumeration defines the different types of building element parts:
+namespace IfcFastenerTypeEnum {
+/// Definition from IAI: This enumeration defines the different types of fasteners, except for mechanical fasteners:
 /// 
-/// INSULATION: The part provides thermal insulation, for example as insulation layer between wall panels in sandwich walls or as infill in stud walls.
-/// PRECASTPANEL: The part is a precast panel, usually as an internal or external layer in a sandwich wall panel.
-/// USERDEFINED: User-defined accessory
-/// NOTDEFINED: Undefined accessory
+/// GLUE: A fastening connection where glue is used to join together elements.
+/// MORTAR: A composition of mineralic or other materials used to fill jointing gaps and possibly fulfilling a load carrying role.
+/// WELD: A weld seam between parts of metallic material or other suitable materials.
+/// USERDEFINED: User-defined fastener
+/// NOTDEFINED: Undefined fastener
 /// 
 /// HISTORY  New Enumeration in IFC 2x4.
-typedef enum {IfcBuildingElementPartType_INSULATION, IfcBuildingElementPartType_PRECASTPANEL, IfcBuildingElementPartType_USERDEFINED, IfcBuildingElementPartType_NOTDEFINED} IfcBuildingElementPartTypeEnum;
-const char* ToString(IfcBuildingElementPartTypeEnum v);
-IfcBuildingElementPartTypeEnum FromString(const std::string& s);
+typedef enum {IfcFastenerType_GLUE, IfcFastenerType_MORTAR, IfcFastenerType_WELD, IfcFastenerType_USERDEFINED, IfcFastenerType_NOTDEFINED} IfcFastenerTypeEnum;
+const char* ToString(IfcFastenerTypeEnum v);
+IfcFastenerTypeEnum FromString(const std::string& s);
 }
-namespace IfcBuildingElementProxyTypeEnum {
-/// Definition from IAI: This enumeration defines the
-///   available generic types for IfcBuildingElementProxyType.
+namespace IfcFilterTypeEnum {
+/// This enumeration defines the various types of filter typically used
+///   within building services distribution systems:
 /// 
-/// HISTORY  New enumeration
-///   in Release IFC2x Edition 3.
+/// AIRPARTICLEFILTER: A filter used to remove particulates from air.
+///   COMPRESSEDAIRFILTER: A filter used to remove particulates from compressed air.
+///   ODORFILTER: A filter used to remove odors from air.
+///   OILFILTER: A filter used to remove particulates from oil.
+///   STRAINER: A filter used to remove particulates from a fluid.
+///   WATERFILTER: A filter used to remove particulates from water.
+///   USERDEFINED:	User-defined filter type.
+///   NOTDEFINED:	Undefined filter type.
 /// 
-/// Enumeration
+/// HISTORY: New enumeration in IFC R2x.  COMPRESSEDAIRFILTER added in IFC2x4.
+typedef enum {IfcFilterType_AIRPARTICLEFILTER, IfcFilterType_COMPRESSEDAIRFILTER, IfcFilterType_ODORFILTER, IfcFilterType_OILFILTER, IfcFilterType_STRAINER, IfcFilterType_WATERFILTER, IfcFilterType_USERDEFINED, IfcFilterType_NOTDEFINED} IfcFilterTypeEnum;
+const char* ToString(IfcFilterTypeEnum v);
+IfcFilterTypeEnum FromString(const std::string& s);
+}
+namespace IfcFireSuppressionTerminalTypeEnum {
+/// The IfcFireSuppressionTerminalTypeEnum defines the range of different types of fire suppression terminal that can be specified. 
 /// 
-/// USERDEFINED
+/// HISTORY: New type in IFC 2x2
 /// 
-/// NOTDEFINED
-typedef enum {IfcBuildingElementProxyType_COMPLEX, IfcBuildingElementProxyType_ELEMENT, IfcBuildingElementProxyType_PARTIAL, IfcBuildingElementProxyType_PROVISIONFORVOID, IfcBuildingElementProxyType_USERDEFINED, IfcBuildingElementProxyType_NOTDEFINED} IfcBuildingElementProxyTypeEnum;
-const char* ToString(IfcBuildingElementProxyTypeEnum v);
-IfcBuildingElementProxyTypeEnum FromString(const std::string& s);
-}
-namespace IfcBuildingSystemTypeEnum {
-/// Definition from IAI: This enumeration identifies
-/// different types of distribution systems.
-/// HISTORY New enumeration
-/// in IFC2x4.
-/// Valid enumerations for building systems include:
+/// Enumeration
 /// 
-/// FENESTRATION: System of doors, windows, and other
-/// fillings in opening in a building envelop that are designed to
-/// permit the passage of air or light,
-/// SHADING: System of shading elements (external or
-/// internal) that permits the limitation or control of impact of
-/// natural sun light,
-/// TRANSPORT: System of all transport elements in a
-/// building that enables the transport of people or goods.
-typedef enum {IfcBuildingSystemType_FENESTRATION, IfcBuildingSystemType_FOUNDATION, IfcBuildingSystemType_LOADBEARING, IfcBuildingSystemType_OUTERSHELL, IfcBuildingSystemType_SHADING, IfcBuildingSystemType_TRANSPORT, IfcBuildingSystemType_USERDEFINED, IfcBuildingSystemType_NOTDEFINED} IfcBuildingSystemTypeEnum;
-const char* ToString(IfcBuildingSystemTypeEnum v);
-IfcBuildingSystemTypeEnum FromString(const std::string& s);
+/// BREECHINGINLET: Symmetrical pipe fitting that unites two or more inlets into a single pipe (BS6100 330 114 adapted). A breeching inlet may be used on either a wet or dry riser. Used by fire services personnel for fast connection of fire appliance hose reels. May also be used for foam. 
+/// FIREHYDRANT: Device, fitted to a pipe, through which a temporary supply of water may be provided (BS6100 330 6107).  May also be termed a stand pipe. 
+/// HOSEREEL: A supporting framework on which a hose may be wound (BS6100 155 8201). 
+/// SPRINKLER: Device for sprinkling water from a pipe under pressure over an area (BS6100 100 3432). 
+/// SPRINKLERDEFLECTOR: Device attached to a sprinkler to deflect the water flow into a spread pattern to cover the required area. 
+/// USERDEFINED: User-defined type. 
+/// NOTDEFINED: Underined type.
+typedef enum {IfcFireSuppressionTerminalType_BREECHINGINLET, IfcFireSuppressionTerminalType_FIREHYDRANT, IfcFireSuppressionTerminalType_HOSEREEL, IfcFireSuppressionTerminalType_SPRINKLER, IfcFireSuppressionTerminalType_SPRINKLERDEFLECTOR, IfcFireSuppressionTerminalType_USERDEFINED, IfcFireSuppressionTerminalType_NOTDEFINED} IfcFireSuppressionTerminalTypeEnum;
+const char* ToString(IfcFireSuppressionTerminalTypeEnum v);
+IfcFireSuppressionTerminalTypeEnum FromString(const std::string& s);
 }
-namespace IfcBurnerTypeEnum {
-/// Enumeration defining the functional type of burner.
-///   The IfcBurnerTypeEnum contains the following:
+namespace IfcFlowDirectionEnum {
+/// This enumeration defines the flow direction at a port as either a SOURCE, SINK, or SOURCEANDSINK.  For solids, liquids, or gas, the direction is the physical flow direction.  For electric power (circuits containing hot, neutral, ground), the direction is from the origination of power (from a distribution board to protective devices to switches to fixtures).  For communication signals, the direction originates from where the signal is shaped, such as a sensor.  For communicaton networks, the direction originates from the up-level network host, such as a router (having SOURCE ports) hosting multiple computers (having SINK ports).
 /// 
-/// USERDEFINED: User-defined burner type.
-///   NOTDEFINED:  Undefined burner type.
+/// SOURCE:        A flow source, where a substance flows out of the connection.
+///   SINK:          A flow sink, where a substance flows into the connection.
+///   SOURCEANDSINK: Both a source and sink, where a substance flows both into and out of the connection simultaneously.
+///   NOTDEFINED:    Undefined flow direction.
 /// 
-/// HISTORY: New enumeration in IFC R2x4.
-typedef enum {IfcBurnerType_USERDEFINED, IfcBurnerType_NOTDEFINED} IfcBurnerTypeEnum;
-const char* ToString(IfcBurnerTypeEnum v);
-IfcBurnerTypeEnum FromString(const std::string& s);
+/// HISTORY: New enumeration in IFC R2.0
+typedef enum {IfcFlowDirection_SOURCE, IfcFlowDirection_SINK, IfcFlowDirection_SOURCEANDSINK, IfcFlowDirection_NOTDEFINED} IfcFlowDirectionEnum;
+const char* ToString(IfcFlowDirectionEnum v);
+IfcFlowDirectionEnum FromString(const std::string& s);
 }
-namespace IfcCableCarrierFittingTypeEnum {
-/// The IfcCableCarrierFittingTypeEnum defines the range of different types of cable carrier fitting that can be specified. 
-///   HISTORY: New type in IFC 2x2  
+namespace IfcFlowInstrumentTypeEnum {
+/// The IfcFlowInstrumentTypeEnum defines the range of different types of flow instrument that can be specified. 
+/// 
+/// HISTORY: New type in IFC
+///   2x2  
 ///   Enumeration 
 /// 
-/// BEND: A fitting that changes the route of the cable carrier. 
-/// CROSS: A fitting at which two branches are taken from the main route of the cable carrier simultaneously. 
-/// REDUCER: A fitting that changes the physical size of the main route of the cable carrier. 
-/// TEE: A fitting at which a branch is taken from the main route of the cable carrier. 
+/// PRESSUREGAUGE: A device that reads and displays a pressure value at a point or the pressure difference between two points. 
+/// THERMOMETER: A device that reads and displays a temperature value at a point. 
+/// AMMETER: A device that reads and displays the current flow in a circuit. 
+/// FREQUENCYMETER: A device that reads and displays the electrical frequency of an alternating current circuit. 
+/// PHASEANGLEMETER: A device that reads and displays the phase angle of a phase in a polyphase electrical circuit. 
+/// POWERFACTORMETER: A device that reads and displays the power factor of an electrical circuit. 
+/// VOLTMETER_PEAK: A device that reads and displays the peak voltage in an electrical circuit. 
+/// VOLTMETER_RMS: A device that reads and displays the RMS (mean) voltage in an electrical circuit. 
 /// USERDEFINED: User-defined type. 
 /// NOTDEFINED: Undefined type.
-typedef enum {IfcCableCarrierFittingType_BEND, IfcCableCarrierFittingType_CROSS, IfcCableCarrierFittingType_REDUCER, IfcCableCarrierFittingType_TEE, IfcCableCarrierFittingType_USERDEFINED, IfcCableCarrierFittingType_NOTDEFINED} IfcCableCarrierFittingTypeEnum;
-const char* ToString(IfcCableCarrierFittingTypeEnum v);
-IfcCableCarrierFittingTypeEnum FromString(const std::string& s);
+typedef enum {IfcFlowInstrumentType_PRESSUREGAUGE, IfcFlowInstrumentType_THERMOMETER, IfcFlowInstrumentType_AMMETER, IfcFlowInstrumentType_FREQUENCYMETER, IfcFlowInstrumentType_POWERFACTORMETER, IfcFlowInstrumentType_PHASEANGLEMETER, IfcFlowInstrumentType_VOLTMETER_PEAK, IfcFlowInstrumentType_VOLTMETER_RMS, IfcFlowInstrumentType_USERDEFINED, IfcFlowInstrumentType_NOTDEFINED} IfcFlowInstrumentTypeEnum;
+const char* ToString(IfcFlowInstrumentTypeEnum v);
+IfcFlowInstrumentTypeEnum FromString(const std::string& s);
 }
-namespace IfcCableCarrierSegmentTypeEnum {
-/// The IfcCableCarrierSegmentTypeEnum defines the range of different types of cable carrier segment that can be specified. 
-///   HISTORY: New type in IFC 2x2  
-///   Enumeration 
+namespace IfcFlowMeterTypeEnum {
+/// This enumeration defines various types of flow meter:
 /// 
-/// CABLELADDERSEGMENT: An open carrier segment on which cables are carried on a ladder structure.
-/// CABLETRAYSEGMENT: A (typically) open carrier segment onto which cables are laid.
-/// CABLETRUNKINGSEGMENT: An enclosed carrier segment with one or more compartments into which cables are placed.
-/// CONDUITSEGMENT: An enclosed tubular carrier segment through which cables are pulled.
-/// USERDEFINED: User-defined type.  
-/// NOTDEFINED: Undefined type.
-typedef enum {IfcCableCarrierSegmentType_CABLELADDERSEGMENT, IfcCableCarrierSegmentType_CABLETRAYSEGMENT, IfcCableCarrierSegmentType_CABLETRUNKINGSEGMENT, IfcCableCarrierSegmentType_CONDUITSEGMENT, IfcCableCarrierSegmentType_USERDEFINED, IfcCableCarrierSegmentType_NOTDEFINED} IfcCableCarrierSegmentTypeEnum;
-const char* ToString(IfcCableCarrierSegmentTypeEnum v);
-IfcCableCarrierSegmentTypeEnum FromString(const std::string& s);
-}
-namespace IfcCableFittingTypeEnum {
-/// The IfcCableFittingTypeEnum defines the range of different types of cable fitting that can be specified. 
-///   HISTORY: New type in IFC 2x4  
-///   Enumeration 
+/// ENERGYMETER:   An electric meter or energy meter is a device that measures the amount of electrical energy supplied to or produced by a residence, business or machine.
 /// 
-/// CONNECTOR: A fitting that joins two cable segments of the same connector type (though potentially different gender). 
-/// ENTRY: A fitting that begins a cable segment at a non-electrical element such as a grounding clamp attached to a pipe. 
-/// EXIT: A fitting that ends a cable segment at a non-electrical element such as a grounding clamp attached to a pipe or to the ground.  
-/// JUNCTION: A fitting that joins three or more segments of arbitrary connector types for signal splitting or multiplexing.  
-/// TRANSITION: A fitting that joins two cable segments of different connector types.  
-/// USERDEFINED: User-defined type. 
-/// NOTDEFINED: Undefined type.
-typedef enum {IfcCableFittingType_CONNECTOR, IfcCableFittingType_ENTRY, IfcCableFittingType_EXIT, IfcCableFittingType_JUNCTION, IfcCableFittingType_TRANSITION, IfcCableFittingType_USERDEFINED, IfcCableFittingType_NOTDEFINED} IfcCableFittingTypeEnum;
-const char* ToString(IfcCableFittingTypeEnum v);
-IfcCableFittingTypeEnum FromString(const std::string& s);
-}
-namespace IfcCableSegmentTypeEnum {
-/// The IfcCableSegmentTypeEnum defines the range of different types of cable segment that can be specified. 
+/// GASMETER:   A device that measures the quantity of a gas or fuel.
 /// 
-/// HISTORY: New type in IFC
-///   2x2. Core and busbar segment added in IFC 2x4.  
-///   Enumeration 
+/// OILMETER:   A device that measures the quantity of oil.
 /// 
-/// BUSBARSEGMENT: Electrical conductor that makes a common connection between several electrical circuits. Properties of a busbar are the same as those of a cable segment and are captured by the cable segment property set. 
-/// CABLESEGMENT: Cable with a specific purpose to lead electric current within a circuit or any other electric construction. Includes all types of electric cables, mainly several core segments or conductor segments wrapped together. 
-/// CONDUCTORSEGMENT: A single linear element within a cable or an exposed wire (such as for grounding) with the specific purpose to lead electric current, data, or a telecommunications signal.  
-/// CORESEGMENT: A self contained element of a  cable that comprises one or more conductors and sheathing.The core of one lead is normally single wired or multiwired which are intertwined.  
-/// USERDEFINED: User-defined type.  
-/// NOTDEFINED: Undefined type.
-typedef enum {IfcCableSegmentType_BUSBARSEGMENT, IfcCableSegmentType_CABLESEGMENT, IfcCableSegmentType_CONDUCTORSEGMENT, IfcCableSegmentType_CORESEGMENT, IfcCableSegmentType_USERDEFINED, IfcCableSegmentType_NOTDEFINED} IfcCableSegmentTypeEnum;
-const char* ToString(IfcCableSegmentTypeEnum v);
-IfcCableSegmentTypeEnum FromString(const std::string& s);
+/// WATERMETER:   A device that measures the quantity of water.
+/// 
+/// USERDEFINED:   User-defined meter type
+/// 
+/// NOTDEFINED:    Undefined meter type
+/// 
+/// HISTORY: New enumeration in IFC 2x2
+typedef enum {IfcFlowMeterType_ENERGYMETER, IfcFlowMeterType_GASMETER, IfcFlowMeterType_OILMETER, IfcFlowMeterType_WATERMETER, IfcFlowMeterType_USERDEFINED, IfcFlowMeterType_NOTDEFINED} IfcFlowMeterTypeEnum;
+const char* ToString(IfcFlowMeterTypeEnum v);
+IfcFlowMeterTypeEnum FromString(const std::string& s);
 }
-namespace IfcChangeActionEnum {
-/// IfcChangeActionEnum identifies the type of change that might have occurred to the object during the last session (for example, added, modified, deleted). This information is required in a partial model exchange scenario so that an application or model server will know how an object might have been affected by the previous application. Valid enumerations are:
+namespace IfcFootingTypeEnum {
+/// Definition from IAI: Enumeration defining the generic footing type.
 /// 
-/// NOCHANGE: Object has not been modified.
+/// HISTORY New type in IFC Release 2x2
+/// IFC 2x4 change:  Item CAISSON_FOUNDATION added
 /// 
-/// MODIFIED: A modification to the object has been made by the user and application defined by the LastModifyingUser and LastModifyingApplication respectively.
+/// ENUMERATION 
 /// 
-/// ADDED: The object has been created by the user and application defined by the OwningUser and OwningApplication respectively.
+/// CAISSON_FOUNDATION A foundation construction type used in underwater construction.
+///   FOOTING_BEAM Footing elements that are in bending and are supported clear of the ground. They will normally span between piers, piles or pile caps. They are distinguished from beams in the building superstructure since they will normally require a lower grade of finish. They are distinguished from STRIP_FOOTING since they are clear of the ground surface and hence require support to the lower face while the concrete is curing.
+///   PAD_FOOTING An element that transfers the load of a single column (possibly two) to the ground.
+///   PILE_CAP An element that transfers the load from a column or group of columns to a pier or pile or group of piers or piles.
+///   STRIP_FOOTING A linear element that transfers loads into the ground from either a continuous element, such as a wall, or from a series of elements, such as columns.
+///   USERDEFINED Special types of footings which meet specific local requirements.
+///   NOTDEFINED The type of footing is not defined.
+typedef enum {IfcFootingType_CAISSON_FOUNDATION, IfcFootingType_FOOTING_BEAM, IfcFootingType_PAD_FOOTING, IfcFootingType_PILE_CAP, IfcFootingType_STRIP_FOOTING, IfcFootingType_USERDEFINED, IfcFootingType_NOTDEFINED} IfcFootingTypeEnum;
+const char* ToString(IfcFootingTypeEnum v);
+IfcFootingTypeEnum FromString(const std::string& s);
+}
+namespace IfcFurnitureTypeEnum {
+/// IfcFurnitureTypeEnum defines the types of furniture from which the type required can be selected. 
+///   HISTORY: New Enumeration in IFC 2x4. 
+///   Enumeration: 
 /// 
-/// DELETED: The object has been deleted by the user and application defined by the LastModifyingUser and LastModifyingApplication respectively.
+/// CHAIR: Furniture for seating a single person.  
+/// TABLE: Furniture with a countertop for multiple people.  
+/// DESK: Furniture with a countertop and optional drawers for a single person.  
+/// BED: Furniture for sleeping.  
+/// FILECABINET: Furniture with sliding drawers for storing files.  
+/// SHELF: Furniture for storing books or other items.  
+/// SOFA: Furniture for seating multiple people.  
+/// USERDEFINED: User-defined type.  
+/// NOTDEFINED: Undefined type.
+typedef enum {IfcFurnitureType_CHAIR, IfcFurnitureType_TABLE, IfcFurnitureType_DESK, IfcFurnitureType_BED, IfcFurnitureType_FILECABINET, IfcFurnitureType_SHELF, IfcFurnitureType_SOFA, IfcFurnitureType_USERDEFINED, IfcFurnitureType_NOTDEFINED} IfcFurnitureTypeEnum;
+const char* ToString(IfcFurnitureTypeEnum v);
+IfcFurnitureTypeEnum FromString(const std::string& s);
+}
+namespace IfcGeographicElementTypeEnum {
+
+typedef enum {IfcGeographicElementType_TERRAIN, IfcGeographicElementType_USERDEFINED, IfcGeographicElementType_NOTDEFINED} IfcGeographicElementTypeEnum;
+const char* ToString(IfcGeographicElementTypeEnum v);
+IfcGeographicElementTypeEnum FromString(const std::string& s);
+}
+namespace IfcGeometricProjectionEnum {
+/// IfcGeometricProjectionEnum defines the various representation types that can be semantically distinguished. Often different levels of detail of the shape representation are controlled by the representation type.
 /// 
-/// NOTDEFINED: The change action is not known or has not been defined.
+/// GRAPH_VIEW:
+/// Geometric display representation that shows an abstract, often 1D
+/// element representation, e.g. representing a wall by its axis line.
+///   SKETCH_VIEW:
+/// Geometric display representation that shows an abstract, often 2D
+/// element representation, e.g. representing a wall by its two foot print
+/// edges, surpressing any inner layer representation.
+///   MODEL_VIEW:
+/// Geometric display representation that shows a full 3D element
+/// representation, e.g. representing a wall by its volumetric body.
+///   PLAN_VIEW:
+/// Geometric display representation that shows a full 2D element
+/// representation, the level of detail often depends on the target scale,
+/// e.g. representing a wall by its two foot print edges and the edges of
+/// all inner layers. The projection is shown in ground view as seen from
+/// above.
+///   REFLECTED_PLAN_VIEW:
+/// Geometric display representation that shows a full 2D element
+/// representation, the level of detail often depends on the target scale,
+/// e.g. representing a wall by its two foot print edges and the edges of
+/// all inner layers. The projection is shown in ground view as seen from
+/// below.
+///   SECTION_VIEW:
+/// Geometric display representation that shows a full 2D element
+/// representation, the level of detail often depends on the target scale,
+/// e.g. representing a wall by its two inner/outer edges and the edges of
+/// all inner layers, if the element is cut by the section line.
+///   ELEVATION_VIEW:
+/// Geometric display representation that shows a full 2D element
+/// representation, the level of detail often depends on the target scale,
+/// e.g. representing a wall by its bounding edges if the element is within
+/// an elevation view.
+///   USERDEFINED:
+/// A user defined specification is given by the value of the UserDefinedTargetView
+/// attribute.
+///   NOTDEFINED:
+/// No specification given.
 /// 
-/// Consider Application A will create an IFC dataset that it wants to publish to others for modification and have the ability to subsequently merge these changes back into the original model. Before publication, it may want to set the IfcChangeActionEnum to NOCHANGE to establish a baseline so that other application changes can be easily identified. Application B then receives this IFC dataset and adds a new object and sets IfcChangeActionEnum to ADDED with Application B defined as the OwningApplication. Application B then modifies an existing object and (re)defines the LastModifiedDate to the time of the modification, LastModifyingUser to the IfcPersonAndOrganization making the change, and sets the LastModifyingApplication to Application B. When Application A receives this modified dataset, it can determine which objects have been added and modified by Application B and either merge or reject these changes as necessary. Consequently, the intent is that an application only modifies the value of IfcChangeActionEnum when it does something to the object, with the further intent that a model server is responsible for clearing the IfcChangeActionEnum back to NOCHANGE when it is ready to be republished.
+/// HISTORY: New Type in Release IFC2x2.
+typedef enum {IfcGeometricProjection_GRAPH_VIEW, IfcGeometricProjection_SKETCH_VIEW, IfcGeometricProjection_MODEL_VIEW, IfcGeometricProjection_PLAN_VIEW, IfcGeometricProjection_REFLECTED_PLAN_VIEW, IfcGeometricProjection_SECTION_VIEW, IfcGeometricProjection_ELEVATION_VIEW, IfcGeometricProjection_USERDEFINED, IfcGeometricProjection_NOTDEFINED} IfcGeometricProjectionEnum;
+const char* ToString(IfcGeometricProjectionEnum v);
+IfcGeometricProjectionEnum FromString(const std::string& s);
+}
+namespace IfcGlobalOrLocalEnum {
+/// This enumeration type defines if the local object coordinate system or the global world coordinate system for the project is used to describe the measure values of entities which have a reference to this type.
 /// 
-/// HISTORY: New enumeration in IFC R2.0. Modified in IFC2x4.
-typedef enum {IfcChangeAction_NOCHANGE, IfcChangeAction_MODIFIED, IfcChangeAction_ADDED, IfcChangeAction_DELETED, IfcChangeAction_NOTDEFINED} IfcChangeActionEnum;
-const char* ToString(IfcChangeActionEnum v);
-IfcChangeActionEnum FromString(const std::string& s);
+/// NOTE  The world coordinate system is given by the IfcGeometricRepresentationContext.WorldCoordinateSystem
+/// and is unique within the project. The local (or object) coordinate system is given by IfcProduct.ObjectPlacement and is used by all IfcRepresentation's within the IfcProduct.Representation.
+/// 
+/// HISTORY: New type in IFC2x2.
+typedef enum {IfcGlobalOrLocal_GLOBAL_COORDS, IfcGlobalOrLocal_LOCAL_COORDS} IfcGlobalOrLocalEnum;
+const char* ToString(IfcGlobalOrLocalEnum v);
+IfcGlobalOrLocalEnum FromString(const std::string& s);
 }
-namespace IfcChillerTypeEnum {
-/// Enumeration defining the typical types of Chillers classified by their method of heat rejection. 
-///   The IfcChillerTypeEnum contains the following:
+namespace IfcGridTypeEnum {
+
+typedef enum {IfcGridType_RECTANGULAR, IfcGridType_RADIAL, IfcGridType_TRIANGULAR, IfcGridType_IRREGULAR, IfcGridType_USERDEFINED, IfcGridType_NOTDEFINED} IfcGridTypeEnum;
+const char* ToString(IfcGridTypeEnum v);
+IfcGridTypeEnum FromString(const std::string& s);
+}
+namespace IfcHeatExchangerTypeEnum {
+/// Enumeration defining the typical types of heat exchangers. 
+///   The IfcHeatExchangerTypeEnum contains the following:
 /// 
-/// AIRCOOLED: Air cooled chiller.
-///   WATERCOOLED: Water cooled chiller.
-///   HEATRECOVERY: Heat recovery chiller.
-///   USERDEFINED:	User-defined chiller type.
-///   NOTDEFINED: Undefined chiller type.
+/// PLATE: Plate heat exchanger.
+///   SHELLANDTUBE: Shell and Tube heat exchanger.
+///   USERDEFINED:  User-defined heat exchanger type.
+///   NOTDEFINED:  Undefined heat exchanger type.
 /// 
 /// HISTORY: New enumeration in IFC R2x.
-typedef enum {IfcChillerType_AIRCOOLED, IfcChillerType_WATERCOOLED, IfcChillerType_HEATRECOVERY, IfcChillerType_USERDEFINED, IfcChillerType_NOTDEFINED} IfcChillerTypeEnum;
-const char* ToString(IfcChillerTypeEnum v);
-IfcChillerTypeEnum FromString(const std::string& s);
+typedef enum {IfcHeatExchangerType_PLATE, IfcHeatExchangerType_SHELLANDTUBE, IfcHeatExchangerType_USERDEFINED, IfcHeatExchangerType_NOTDEFINED} IfcHeatExchangerTypeEnum;
+const char* ToString(IfcHeatExchangerTypeEnum v);
+IfcHeatExchangerTypeEnum FromString(const std::string& s);
 }
-namespace IfcChimneyTypeEnum {
-/// Definition from IAI: Enumeration defining the valid
-///   types of chimneys that can be predefined using the
-///   enumeration values.
+namespace IfcHumidifierTypeEnum {
+/// Enumeration defining the typical types of humidifiers. 
+///   The IfcHumidifierTypeEnum contains the following:
 /// 
-/// HISTORY  New Enumeration in
-///   Release IFC2x4
+/// STEAMINJECTION: Water vapor is added into the airstream through direction steam injection.
+///   ADIABATICAIRWASHER: Water vapor is added into the airstream through adiabatic evaporation using an air washing element.
+///   ADIABATICPAN:  Water vapor is added into the airstream through adiabatic evaporation using a pan.
+///   ADIABATICWETTEDELEMENT: Water vapor is added into the airstream through adiabatic evaporation using a wetted element.
+///   ADIABATICATOMIZING: Water vapor is added into the airstream through adiabatic evaporation using an atomizing element.
+///   ADIABATICULTRASONIC: Water vapor is added into the airstream through adiabatic evaporation using an ultrasonic element.
+///   ADIABATICRIGIDMEDIA: Water vapor is added into the airstream through adiabatic evaporation using a rigid media.
+///   ADIABATICCOMPRESSEDAIRNOZZLE: Water vapor is added into the airstream through adiabatic evaporation using a compressed air nozzle.
+///   ASSISTEDELECTRIC: Water vapor is added into the airstream through water heated evaporation using an electric heater.
+///   ASSISTEDNATURALGAS: Water vapor is added into the airstream through water heated evaporation using a natural gas heater.
+///   ASSISTEDPROPANE: Water vapor is added into the airstream through water heated evaporation using a propane heater.
+///   ASSISTEDBUTANE: Water vapor is added into the airstream through water heated evaporation using a butane heater.
+///   ASSISTEDSTEAM: Water vapor is added into the airstream through water heated evaporation using a steam heater.
+///   USERDEFINED:  User-defined humidifier type.
+///   NOTDEFINED:  Undefined humidifier type.
 /// 
-/// NOTE  Currently there are no specific enumerators
-///   defined, the IfcChimneyTypeEnum has been added
-///   for future extensions.
-typedef enum {IfcChimneyType_USERDEFINED, IfcChimneyType_NOTDEFINED} IfcChimneyTypeEnum;
-const char* ToString(IfcChimneyTypeEnum v);
-IfcChimneyTypeEnum FromString(const std::string& s);
+/// HISTORY: New enumeration in IFC 2x2.
+typedef enum {IfcHumidifierType_STEAMINJECTION, IfcHumidifierType_ADIABATICAIRWASHER, IfcHumidifierType_ADIABATICPAN, IfcHumidifierType_ADIABATICWETTEDELEMENT, IfcHumidifierType_ADIABATICATOMIZING, IfcHumidifierType_ADIABATICULTRASONIC, IfcHumidifierType_ADIABATICRIGIDMEDIA, IfcHumidifierType_ADIABATICCOMPRESSEDAIRNOZZLE, IfcHumidifierType_ASSISTEDELECTRIC, IfcHumidifierType_ASSISTEDNATURALGAS, IfcHumidifierType_ASSISTEDPROPANE, IfcHumidifierType_ASSISTEDBUTANE, IfcHumidifierType_ASSISTEDSTEAM, IfcHumidifierType_USERDEFINED, IfcHumidifierType_NOTDEFINED} IfcHumidifierTypeEnum;
+const char* ToString(IfcHumidifierTypeEnum v);
+IfcHumidifierTypeEnum FromString(const std::string& s);
 }
-namespace IfcCoilTypeEnum {
-/// Enumeration defining the typical types of coils.
+namespace IfcInterceptorTypeEnum {
+/// The IfcInterceptorTypeEnum defines the range of different types of interceptor that can be specified. 
+///   HISTORY: New type in IFC 2x4 
+///   Enumeration 
 /// 
-/// The IfcCoilTypeEnum contains the following:
+/// CYCLONIC: Removes larger liquid drops or larger solid particles. 
+/// GREASE: Chamber, on the line of a drain or discharge pipe, that prevents grease passing into a drainage system (BS6100 330 6205). 
+/// OIL: One or more chambers arranged to prevent the ingress of oil to a drain or sewer, that retain the oil for later removal (BS6100 330 67316). 
+/// PETROL: Two or more chambers with inlet and outlet pipes arranged to allow petrol/gasoline collected on the surface of water drained into them to evaporate through ventilating pipes. 
+/// USERDEFINED: User-defined type. 
+/// NOTDEFINED: Undefined type.
+typedef enum {IfcInterceptorType_CYCLONIC, IfcInterceptorType_GREASE, IfcInterceptorType_OIL, IfcInterceptorType_PETROL, IfcInterceptorType_USERDEFINED, IfcInterceptorType_NOTDEFINED} IfcInterceptorTypeEnum;
+const char* ToString(IfcInterceptorTypeEnum v);
+IfcInterceptorTypeEnum FromString(const std::string& s);
+}
+namespace IfcInternalOrExternalEnum {
+/// Definition from IAI: This enumeration defines the
+/// different types of space boundaries in terms of either being
+/// inside the building or outside the building.
+/// Enumeration:
 /// 
-/// DXCOOLINGCOIL: Cooling coil using a refrigerant to cool the air stream directly.
+/// INTERNAL
 /// 
-/// WATERCOOLINGCOIL: Cooling coil using chilled water. HYDRONICCOIL supercedes this enumerator.
+/// IfcSpaceBoundary
+/// The space boundary faces a physical
+/// or virtual element where there is an internal space on the other
+/// side.
 /// 
-/// STEAMHEATINGCOIL: Heating coil using steam as heating source.
+/// EXTERNAL
 /// 
-/// WATERHEATINGCOIL: Heating coil using hot water as a heating source. HYDRONICCOIL supercedes this enumerator.
+/// IfcSpaceBoundary
+/// The space boundary faces a physical
+/// or virtual element where there is an external space on the other
+/// side (i.e. air). Or it is the space boundary of that external
+/// space against the building.
 /// 
-/// ELECTRICHEATINGCOIL: Heating coil using electricity as a heating source.
+/// EXTERNAL_EARTH
 /// 
-/// GASHEATINGCOIL: Heating coil using gas as a heating source.
+/// IfcSpaceBoundary
+/// The space boundary faces a physical
+/// or virtual element where there is earth (or terrain) on the other
+/// side. Or it is the space boundary of that earth (or terrain
+/// object) external space against the building.
 /// 
-/// HYDRONICCOIL: Cooling or Heating coil that uses a hydronic fluid as a cooling or heating source.
-///   USERDEFINED: User-defined coil type.
+/// EXTERNAL_WATER
 /// 
-/// NOTDEFINED:  Undefined coil type.
+/// IfcSpaceBoundary
+/// The space boundary faces a physical
+/// or virtual element where there is water (water component of
+/// terrain) on the other side. Or it is the space boundary of that
+/// object representing water external space against the
+/// building.
 /// 
-/// HISTORY: New enumeration in IFC R2x.
-typedef enum {IfcCoilType_DXCOOLINGCOIL, IfcCoilType_ELECTRICHEATINGCOIL, IfcCoilType_GASHEATINGCOIL, IfcCoilType_HYDRONICCOIL, IfcCoilType_STEAMHEATINGCOIL, IfcCoilType_WATERCOOLINGCOIL, IfcCoilType_WATERHEATINGCOIL, IfcCoilType_USERDEFINED, IfcCoilType_NOTDEFINED} IfcCoilTypeEnum;
-const char* ToString(IfcCoilTypeEnum v);
-IfcCoilTypeEnum FromString(const std::string& s);
-}
-namespace IfcColumnTypeEnum {
-/// Definition from IAI: This enumeration defines the
-/// different types of linear elements an IfcColumnType object
-/// can fulfill:
+/// EXTERNAL_FIRE
 /// 
-/// COLUMN: A standard column element usually used
-/// vertically.
-/// USERDEFINED: User-defined linear element.
-/// NOTDEFINED: Undefined linear element
+/// IfcSpaceBoundary
+/// The space boundary faces a physical
+/// or virtual element where there is another building on the other
+/// side. Or it is the space boundary of that other neighbor building
+/// against the building in question.
 /// 
-/// NOTE: This enumeration has been mainly
-/// introduced to allow further detailing of the type information in
-/// future releases of IFC.
-/// HISTORY New Enumeration
-/// in Release IFC2x Edition 2.
-typedef enum {IfcColumnType_COLUMN, IfcColumnType_PILASTER, IfcColumnType_USERDEFINED, IfcColumnType_NOTDEFINED} IfcColumnTypeEnum;
-const char* ToString(IfcColumnTypeEnum v);
-IfcColumnTypeEnum FromString(const std::string& s);
-}
-namespace IfcCommunicationsApplianceTypeEnum {
-/// Defines the range of different types of communications appliance that can be specified. 
+/// NOTDEFINED
 /// 
-/// HISTORY: New enumeration in IFC2x4 
+/// No information available.
 /// 
-/// ANTENNA: A transducer designed to transmit or receive electromagnetic waves. 
-/// COMPUTER: A desktop, laptop, PDA or other type of computer that can be moved from one place to another and connected to an electrical supply via a plugged outlet. 
-/// FAX: A machine that has the primary function of transmitting a facsimile copy of printed matter using a telephone line. 
-/// GATEWAY: A gateway connects multiple network segments with different protocols at all layers (layers 1-7) of the OSI model 
-/// MODEM: A modem (from modulator-demodulator) is a device that modulates an analog carrier signal to encode digital information, and also demodulates such a carrier signal to decode the transmitted information 
-/// NETWORKAPPLIANCE: A network appliance performs a dedicated function such as firewall protection, content filtering, load balancing, or equipment management. 
-/// NETWORKBRIDGE: A network bridge connects multiple network segments at the data link layer (layer 2) of the OSI model, and the term layer 2 switch is very often used interchangeably with bridge 
-/// NETWORKHUB: A network hub connects multiple network segments at the physical layer (layer 1) of the OSI model. 
-/// PRINTER: A machine that has the primary function of printing text and/or graphics onto paper or other media. 
-/// REPEATER: A repeater is an electronic device that receives a signal and retransmits it at a higher level and/or higher power, or onto the other side of an obstruction, so that the signal can cover longer distances without degradation. 
-/// ROUTER: A router is a networking device whose software and hardware are usually tailored to the tasks of routing and forwarding information. For example, on the Internet, information is directed to various paths by routers. 
-/// SCANNER: A machine that has the primary function of scanning the content of printed matter and converting it to digital format that can be stored in a computer.
-typedef enum {IfcCommunicationsApplianceType_ANTENNA, IfcCommunicationsApplianceType_COMPUTER, IfcCommunicationsApplianceType_FAX, IfcCommunicationsApplianceType_GATEWAY, IfcCommunicationsApplianceType_MODEM, IfcCommunicationsApplianceType_NETWORKAPPLIANCE, IfcCommunicationsApplianceType_NETWORKBRIDGE, IfcCommunicationsApplianceType_NETWORKHUB, IfcCommunicationsApplianceType_PRINTER, IfcCommunicationsApplianceType_REPEATER, IfcCommunicationsApplianceType_ROUTER, IfcCommunicationsApplianceType_SCANNER, IfcCommunicationsApplianceType_USERDEFINED, IfcCommunicationsApplianceType_NOTDEFINED} IfcCommunicationsApplianceTypeEnum;
-const char* ToString(IfcCommunicationsApplianceTypeEnum v);
-IfcCommunicationsApplianceTypeEnum FromString(const std::string& s);
+/// HISTORY: New enumeration
+/// in IFC Release 2.0
+/// IFC2x4 CHANGE: Enumeration no longer
+/// applicable to IfcSpace. The following enumerators are
+/// added: EXTERNAL_EARTH, EXTERNAL_WATER,
+/// EXTERNAL_FIRE.
+typedef enum {IfcInternalOrExternal_INTERNAL, IfcInternalOrExternal_EXTERNAL, IfcInternalOrExternal_EXTERNAL_EARTH, IfcInternalOrExternal_EXTERNAL_WATER, IfcInternalOrExternal_EXTERNAL_FIRE, IfcInternalOrExternal_NOTDEFINED} IfcInternalOrExternalEnum;
+const char* ToString(IfcInternalOrExternalEnum v);
+IfcInternalOrExternalEnum FromString(const std::string& s);
 }
-namespace IfcComplexPropertyTemplateTypeEnum {
-/// This enumeration defines the subtype of instances of IfcComplexProperty or IfcPhysicalComplexQuantity that may be created and defined by an IfcComplexPropertyTemplate.
-/// 
-/// HISTORY New enumeration in IFC2x4.
+namespace IfcInventoryTypeEnum {
+/// IfcInventoryTypeEnum defines the types of inventory that can be defined. 
+///   HISTORY: New Enumeration in IFC Release 2.0  
+///   Enumeration: 
 /// 
-/// Enumeration
+/// ASSETINVENTORY: A collection of asset instances of type IfcAsset 
+/// SPACEINVENTORY: A collection of space instances of type IfcSpace 
+/// FURNITUREINVENTORY: A collection of furniture instances of type IfcFurnishingElement 
+/// USERDEFINED: User-defined type. 
+/// NOTDEFINED: Undefined type.
+typedef enum {IfcInventoryType_ASSETINVENTORY, IfcInventoryType_SPACEINVENTORY, IfcInventoryType_FURNITUREINVENTORY, IfcInventoryType_USERDEFINED, IfcInventoryType_NOTDEFINED} IfcInventoryTypeEnum;
+const char* ToString(IfcInventoryTypeEnum v);
+IfcInventoryTypeEnum FromString(const std::string& s);
+}
+namespace IfcJunctionBoxTypeEnum {
+/// The IfcJunctionBoxTypeEnum defines the range of types of junction boxes available.
+///   HISTORY: New type in IFC 2x2.  Values added in IFC 2x4. 
 /// 
-/// P_COMPLEX: the properties defined by this IfcComplexPropertyTemplate are of type IfcComplexProperty.
-/// Q_COMPLEX: the properties defined by this IfcComplexPropertyTemplate are of type IfcPhysicalComplexQuantity.
-typedef enum {IfcComplexPropertyTemplateType_P_COMPLEX, IfcComplexPropertyTemplateType_Q_COMPLEX} IfcComplexPropertyTemplateTypeEnum;
-const char* ToString(IfcComplexPropertyTemplateTypeEnum v);
-IfcComplexPropertyTemplateTypeEnum FromString(const std::string& s);
+/// POWER: Contains cables, outlets, and/or switches for electrical power.
+/// DATA: Contains cables, outlets, and/or switches for communications use.
+/// USERDEFINED: User-defined type.
+/// NOTDEFINED: Undefined type.
+typedef enum {IfcJunctionBoxType_DATA, IfcJunctionBoxType_POWER, IfcJunctionBoxType_USERDEFINED, IfcJunctionBoxType_NOTDEFINED} IfcJunctionBoxTypeEnum;
+const char* ToString(IfcJunctionBoxTypeEnum v);
+IfcJunctionBoxTypeEnum FromString(const std::string& s);
 }
-namespace IfcCompressorTypeEnum {
-/// Types of compressors.
-///   The IfcCompressorTypeEnum contains the following:
+namespace IfcKnotType {
+
+typedef enum {IfcKnotType_UNIFORM_KNOTS, IfcKnotType_QUASI_UNIFORM_KNOTS, IfcKnotType_PIECEWISE_BEZIER_KNOTS, IfcKnotType_UNSPECIFIED} IfcKnotType;
+const char* ToString(IfcKnotType v);
+IfcKnotType FromString(const std::string& s);
+}
+namespace IfcLaborResourceTypeEnum {
+/// This enumeration is used to identify the primary purpose of a labor resource, and is limited to high-level categories based upon common skillsets.  The IfcLaborResourceTypeEnum contains the following:
 /// 
-/// DYNAMIC: The pressure of refrigerant vapor is increased by a continuous transfer of angular momentum from a rotating member to the vapor followed by conversion of this momentum into static pressure.
-///   RECIPROCATING: Positive-displacement compressor using a piston driven by a connecting rod from a crankshaft.
-///   ROTARY: Positive-displacement compressor using a roller or rotor device.
-///   SCROLL: Positive-displacement compressor using two inter-fitting, spiral-shaped scroll members.
-///   TROCHOIDAL: Positive-displacement compressor using a rolling motion of one circle outside or inside the circumference of a basic circle and produce either epitrochoids or hypotrochoids.
-///   SINGLESTAGE: Positive-displacement reciprocating compressor where vapor is compressed in a single stage.
-///   BOOSTER: Positive-displacement reciprocating compressor where pressure is increased by a booster.
-///   OPENTYPE: Positive-displacement reciprocating compressor where the shaft extends through a seal in the crankcase for an external drive.
-///   HERMETIC: Positive-displacement reciprocating compressor where the motor and compressor are contained within the same housing, with the motor shaft integral with the compressor crankshaft and the motor in contact with refrigerant.
-///   SEMIHERMETIC: Positive-displacement reciprocating compressor where the hermetic compressors use bolted construction amenable to field repair.
-///   WELDEDSHELLHERMETIC: Positive-displacement reciprocating compressor where the motor compressor is mounted inside a steel shell, which, in turn is sealed by welding.
-///   ROLLINGPISTON: Positive-displacement rotary compressor using a roller mounted on the eccentric of a shaft with a single vane in the nonrotating cylindrical housing.
-///   ROTARYVANE: Positive-displacement rotary compressor using a roller mounted on the eccentric of a shaft with multiple vanes in the nontotating cylindrical housing.
-///   SINGLESCREW: Positive-displacement rotary compressor using a single cylindrical main rotor that works with a pair of gate rotors.
-///   TWINSCREW: Positive-displacement rotary compressor using two mating helically grooved rotors, male (lobes) and female (flutes) in a stationary housing with inlet and outlet gas ports.
-///   USERDEFINED: User-defined compressor type.
-///   NOTDEFINED:  Undefined compressor type.
+/// ADMINISTRATION: Coordination of work.
+/// CARPENTRY: Rough carpentry including framing.
+/// CLEANING: Removal of dust and debris.
+/// DRYWALL: Gypsum wallboard placement and taping.
+/// ELECTRIC: Electrical fixtures, equipment, and cables.
+/// FINISHING: Finish carpentry including custom cabinetry.
+/// FLOORING: Carpet, tile, terazzo, wood, or other flooring.
+/// HVAC: Heating and ventilation fixtures, equipment, and ducts.
+/// GENERAL: General labor not requiring specific skill.
+/// LANDSCAPING: Grass, plants, trees, or irrigation.
+/// MASONRY: Laying bricks or blocks with mortar.
+/// PAINTING: Applying decorative coatings or coverings.
+/// PAVING: Asphalt or concrete roads and walkways.
+/// PLUMBING: Plumbing fixtures, equipment, and pipes.
+/// ROOFING: Membranes, shingles, tile, or other roofing.
+/// SITEGRADING: Excavating, filling, or contouring earth.
+/// STEELWORK: Erecting and attaching steel elements.
+/// SURVEYING: Determining positions, distances, and angles.
+/// USERDEFINED: User-defined resource.
+/// NOTDEFINED: Undefined resource.
 /// 
-/// HISTORY: New enumeration in IFC R2x.
-typedef enum {IfcCompressorType_DYNAMIC, IfcCompressorType_RECIPROCATING, IfcCompressorType_ROTARY, IfcCompressorType_SCROLL, IfcCompressorType_TROCHOIDAL, IfcCompressorType_SINGLESTAGE, IfcCompressorType_BOOSTER, IfcCompressorType_OPENTYPE, IfcCompressorType_HERMETIC, IfcCompressorType_SEMIHERMETIC, IfcCompressorType_WELDEDSHELLHERMETIC, IfcCompressorType_ROLLINGPISTON, IfcCompressorType_ROTARYVANE, IfcCompressorType_SINGLESCREW, IfcCompressorType_TWINSCREW, IfcCompressorType_USERDEFINED, IfcCompressorType_NOTDEFINED} IfcCompressorTypeEnum;
-const char* ToString(IfcCompressorTypeEnum v);
-IfcCompressorTypeEnum FromString(const std::string& s);
+/// HISTORY: New enumeration in IFC2x4
+typedef enum {IfcLaborResourceType_ADMINISTRATION, IfcLaborResourceType_CARPENTRY, IfcLaborResourceType_CLEANING, IfcLaborResourceType_CONCRETE, IfcLaborResourceType_DRYWALL, IfcLaborResourceType_ELECTRIC, IfcLaborResourceType_FINISHING, IfcLaborResourceType_FLOORING, IfcLaborResourceType_GENERAL, IfcLaborResourceType_HVAC, IfcLaborResourceType_LANDSCAPING, IfcLaborResourceType_MASONRY, IfcLaborResourceType_PAINTING, IfcLaborResourceType_PAVING, IfcLaborResourceType_PLUMBING, IfcLaborResourceType_ROOFING, IfcLaborResourceType_SITEGRADING, IfcLaborResourceType_STEELWORK, IfcLaborResourceType_SURVEYING, IfcLaborResourceType_USERDEFINED, IfcLaborResourceType_NOTDEFINED} IfcLaborResourceTypeEnum;
+const char* ToString(IfcLaborResourceTypeEnum v);
+IfcLaborResourceTypeEnum FromString(const std::string& s);
 }
-namespace IfcCondenserTypeEnum {
-/// Enumeration defining the typical types of condensers.  Air is used as the cooling medium for AIRCOOLED; water is used as the cooling medium for all other types.  The IfcCondenserTypeEnum contains the following:
+namespace IfcLampTypeEnum {
+/// The IfcLampTypeEnum defines the range of different types of lamp available. 
 /// 
-/// AIRCOOLED: A condenser in which heat is transferred to an air-stream.
-///   EVAPORATIVECOOLED: A condenser that is cooled evaporatively.
-///   WATERCOOLED: Water-cooled condenser with unspecified operation.
-///   WATERCOOLEDSHELLTUBE: Water-cooled condenser with cooling water circulated through one or more tubes contained within the shell.
-///   WATERCOOLEDSHELLCOIL: Water-cooled condenser with cooling water circulated through one or more continuous or assembled coils contained within the shell.
-///   WATERCOOLEDTUBEINTUBE: Water-cooled condenser consisting of one or more assemblies of two tubes, one within the other.
-///   WATERCOOLEDBRAZEDPLATE: Water-cooled condenser condenser with plates brazed together to form an assembly of separate channels.
-///   USERDEFINED: User-defined condenser type.
-///   NOTDEFINED:  Undefined condenser type.
+/// HISTORY: New type in IFC 2x2 Addendum
+///   1  
+///   Enumeration 
 /// 
-/// HISTORY: New enumeration in IFC 2x2.  WATERCOOLED added in IFC 2x4.
-typedef enum {IfcCondenserType_AIRCOOLED, IfcCondenserType_EVAPORATIVECOOLED, IfcCondenserType_WATERCOOLED, IfcCondenserType_WATERCOOLEDBRAZEDPLATE, IfcCondenserType_WATERCOOLEDSHELLCOIL, IfcCondenserType_WATERCOOLEDSHELLTUBE, IfcCondenserType_WATERCOOLEDTUBEINTUBE, IfcCondenserType_USERDEFINED, IfcCondenserType_NOTDEFINED} IfcCondenserTypeEnum;
-const char* ToString(IfcCondenserTypeEnum v);
-IfcCondenserTypeEnum FromString(const std::string& s);
+/// COMPACTFLUORESCENT: A fluorescent lamp having a compact form factor produced by shaping the tube. 
+/// FLUORESCENT: A typically tubular discharge lamp in which most of the light is emitted by one or several layers of phosphors excited by ultraviolet radiation from the discharge.
+/// HALOGEN: an incandescent lamp in which a tungsten filament is sealed into a compact transport envelope filled with an inert gas and a small amount of halogen such as iodine or bromine.
+/// HIGHPRESSUREMERCURY: A discharge lamp in which most of the light is emitted by exciting mercury at high pressure.
+/// HIGHPRESSURESODIUM: A discharge lamp in which most of the light is emitted by exciting sodium at high pressure.
+/// LED: a solid state lamp that uses light-emitting diodes as the source of light.
+/// METALHALIDE: A discharge lamp in which most of the light is emitted by exciting a metal halide.
+/// OLED: a solid state lamp that uses light-emitting diodes as the source of light whose emissive electroluminescent layer is composed of a film of organic compounds.
+/// TUNGSTENFILAMENT: A lamp that emits light by passing an electrical current through a tungsten wire filament in a near vacuum.
+/// USERDEFINED: User-defined type.
+/// NOTDEFINED: Undefined type.
+typedef enum {IfcLampType_COMPACTFLUORESCENT, IfcLampType_FLUORESCENT, IfcLampType_HALOGEN, IfcLampType_HIGHPRESSUREMERCURY, IfcLampType_HIGHPRESSURESODIUM, IfcLampType_LED, IfcLampType_METALHALIDE, IfcLampType_OLED, IfcLampType_TUNGSTENFILAMENT, IfcLampType_USERDEFINED, IfcLampType_NOTDEFINED} IfcLampTypeEnum;
+const char* ToString(IfcLampTypeEnum v);
+IfcLampTypeEnum FromString(const std::string& s);
 }
-namespace IfcConnectionTypeEnum {
-/// This enumeration defines the different ways how path based elements (such as IfcWallStandardCase) can connect, as shown in Figure 65. 
+namespace IfcLayerSetDirectionEnum {
+/// IfcLayerSetDirectionEnum provides identification of the axis of element geometry, denoting the layer set thickness direction, or direction of layer offsets.
 /// 
-/// HISTORY New type in IFC Release 2.0 
+/// ENUMERATION
 /// 
-/// L-Shape Connection 
+/// AXIS1: Usually x-axis.
+/// AXIS2: Usually y-axis.
+/// AXIS3: Usually z-axis.
 /// 
-/// RelatingConnectionType: AtStart 
-///   RelatedConnectionType: AtStart 
+/// HISTORY: New Type in IFC2x.
+typedef enum {IfcLayerSetDirection_AXIS1, IfcLayerSetDirection_AXIS2, IfcLayerSetDirection_AXIS3} IfcLayerSetDirectionEnum;
+const char* ToString(IfcLayerSetDirectionEnum v);
+IfcLayerSetDirectionEnum FromString(const std::string& s);
+}
+namespace IfcLightDistributionCurveEnum {
+/// There are three kinds of light distribution curves, according to Standard CEN TC 169, prEN 13032-1, CIE 121: 
 /// 
-/// L-Shape Connection 
+/// TYPE_A: Type A is basically not used. For completeness the Type A Photometry equals the Type B rotated 90° around the Z-Axis counter clockwise. 
+/// TYPE_B: Type B is sometimes used for floodlights. The B-Plane System has a horizontal axis. B-Angles are valid from -180° to +180° with B 0° at the bottom and B180°/B-180° at the top, &#946;-Angles are valid from -90° to +90°. (See Figure 302.)
+/// TYPE_C: Type C is the recommended standard system. The C-Plane system equals a globe with a vertical axis. C-Angles are valid from 0° to 360°, &#947;-Angles are valid from 0° (south pole) to 180° (north pole). (See Figure 302.) 
 /// 
-/// RelatingConnectionType: AtEnd 
-///   RelatedConnectionType: AtStart 
+/// <table
 /// 
-/// T-Shape Connection 
+/// B-Type System 
+///   C-Type System 
 /// 
-/// RelatingConnectionType: AtPath 
-///   RelatedConnectionType: AtStart 
+/// Figure 302 — Light distribution curves
 /// 
-/// Figure 65 — Connection types</td
-typedef enum {IfcConnectionType_ATPATH, IfcConnectionType_ATSTART, IfcConnectionType_ATEND, IfcConnectionType_NOTDEFINED} IfcConnectionTypeEnum;
-const char* ToString(IfcConnectionTypeEnum v);
-IfcConnectionTypeEnum FromString(const std::string& s);
+/// HISTORY  This is a new enumeration in IFC2x2.
+typedef enum {IfcLightDistributionCurve_TYPE_A, IfcLightDistributionCurve_TYPE_B, IfcLightDistributionCurve_TYPE_C, IfcLightDistributionCurve_NOTDEFINED} IfcLightDistributionCurveEnum;
+const char* ToString(IfcLightDistributionCurveEnum v);
+IfcLightDistributionCurveEnum FromString(const std::string& s);
 }
-namespace IfcConstraintEnum {
-/// IfcConstraintEnum is an enumeration used to qualify a constraint. 
+namespace IfcLightEmissionSourceEnum {
+/// IfcLightEmissionSourceEnum defines the range of different types of light emitter available. 
 /// 
-/// HISTORY: New type in IFC Release 2.0
+/// HISTORY: New type in IFC2x2.
 /// 
 /// Enumeration 
 /// 
-/// Value 
-///   Definition 
+/// COMPACTFLUORESCENT
+/// FLUORESCENT
+/// HIGHPRESSUREMERCURY
+/// HIGHPRESSURESODIUM
+/// LIGHTEMITTINGDIODE
+/// LOWPRESSURESODIUM
+/// LOWVOLTAGEHALOGEN
+/// MAINVOLTAGEHALOGEN
+/// METALHALIDE 
+/// TUNGSTENFILAMENT 
+/// NOTDEFINED
+typedef enum {IfcLightEmissionSource_COMPACTFLUORESCENT, IfcLightEmissionSource_FLUORESCENT, IfcLightEmissionSource_HIGHPRESSUREMERCURY, IfcLightEmissionSource_HIGHPRESSURESODIUM, IfcLightEmissionSource_LIGHTEMITTINGDIODE, IfcLightEmissionSource_LOWPRESSURESODIUM, IfcLightEmissionSource_LOWVOLTAGEHALOGEN, IfcLightEmissionSource_MAINVOLTAGEHALOGEN, IfcLightEmissionSource_METALHALIDE, IfcLightEmissionSource_TUNGSTENFILAMENT, IfcLightEmissionSource_NOTDEFINED} IfcLightEmissionSourceEnum;
+const char* ToString(IfcLightEmissionSourceEnum v);
+IfcLightEmissionSourceEnum FromString(const std::string& s);
+}
+namespace IfcLightFixtureTypeEnum {
+/// The IfcLightFixtureTypeEnum defines the range of different types of light fixture available.
 /// 
-/// HARD 
-///   Qualifies a constraint such that it must be followed rigidly within or at the values set. 
+/// HISTORY: New type in IFC 2x Edition 2IFC 2x4: SECURITYLIGHTING added
 /// 
-/// SOFT 
-///   Qualifies a constraint such that it should be followed within or at the values set. 
+/// Enumeration
 /// 
-/// ADVISORY 
-///   Qualifies a constraint such that it is advised that it is followed within or at the values set.
-typedef enum {IfcConstraint_HARD, IfcConstraint_SOFT, IfcConstraint_ADVISORY, IfcConstraint_USERDEFINED, IfcConstraint_NOTDEFINED} IfcConstraintEnum;
-const char* ToString(IfcConstraintEnum v);
-IfcConstraintEnum FromString(const std::string& s);
-}
-namespace IfcConstructionEquipmentResourceTypeEnum {
-/// This enumeration is used to identify the primary purpose of a construction equipment resource. It is limited to the most common equipment used in construction.  The IfcConstructionEquipmentResourceTypeEnum contains the following:
-/// 
-/// DEMOLISHING: Removal or destruction of building elements.
-/// EARTHMOVING: Excavating, filling, or contouring earth.
-/// ERECTING: Lifting, positioning, and placing elements.
-/// HEATING: Temporary heat to support construction.
-/// LIGHTING: Temporary lighting to support construction.
-/// PAVING: Asphalt or concrete roads or walkways.
-/// PUMPING: Installing materials through pumps.
-/// TRANSPORTING: Transporting products or materials.
-/// USERDEFINED: User-defined resource.
-/// NOTDEFINED: Undefined resource.
-/// 
-/// HISTORY: New enumeration in IFC2x4
-typedef enum {IfcConstructionEquipmentResourceType_DEMOLISHING, IfcConstructionEquipmentResourceType_EARTHMOVING, IfcConstructionEquipmentResourceType_ERECTING, IfcConstructionEquipmentResourceType_HEATING, IfcConstructionEquipmentResourceType_LIGHTING, IfcConstructionEquipmentResourceType_PAVING, IfcConstructionEquipmentResourceType_PUMPING, IfcConstructionEquipmentResourceType_TRANSPORTING, IfcConstructionEquipmentResourceType_USERDEFINED, IfcConstructionEquipmentResourceType_NOTDEFINED} IfcConstructionEquipmentResourceTypeEnum;
-const char* ToString(IfcConstructionEquipmentResourceTypeEnum v);
-IfcConstructionEquipmentResourceTypeEnum FromString(const std::string& s);
+/// POINTSOURCE: A light fixture that is considered to have negligible area and that emit light with approximately equal intensity in all directions.  A light fixture containing a tungsten, halogen or similar bulb is an example of a point source.
+/// DIRECTIONSOURCE: A light fixture that is considered to have a length or surface area from which it emits light in a direction. A light fixture containing one or more fluorescent lamps is an example of a direction source. 
+/// SECURITYLIGHTING: A light fixture having specific purpose of directing occupants in an emergency, such as an illuminated exit sign or emergency flood light. 
+/// USERDEFINED: User-defined type.
+/// NOTDEFINED: Undefined type.
+typedef enum {IfcLightFixtureType_POINTSOURCE, IfcLightFixtureType_DIRECTIONSOURCE, IfcLightFixtureType_SECURITYLIGHTING, IfcLightFixtureType_USERDEFINED, IfcLightFixtureType_NOTDEFINED} IfcLightFixtureTypeEnum;
+const char* ToString(IfcLightFixtureTypeEnum v);
+IfcLightFixtureTypeEnum FromString(const std::string& s);
 }
-namespace IfcConstructionMaterialResourceTypeEnum {
-/// This enumeration is used to identify the primary purpose of a construction material resource. It is limited to the most common raw materials used in construction and excludes materials commonly sold as finished products.  The IfcConstructionMaterialResourceTypeEnum contains the following:
+namespace IfcLoadGroupTypeEnum {
+/// Definition from IAI: This type definition is used to distinguish between different levels
+/// of load grouping.  It allows to differentiate between load groups, load cases, and load combinations.
+/// Normally, these enumeration types shall be used in the following context:
 /// 
-/// AGGREGATES: Construction aggregate including sand, gravel, and crushed stone.
-/// CONCRETE: Cast-in-place concrete.
-/// DRYWALL: Wall board, including gypsum board.
-/// FUEL: Fuel for running equipment.
-/// GYPSUM: Any gypsum material.
-/// MASONRY: Masonry including brick, stone, concrete block, glass block, and tile.
-/// METAL: Any metallic material.
-/// PLASTIC: Any plastic material.
-/// WOOD: Any wood material.
-/// USERDEFINED: User-defined resource.
-/// NOTDEFINED: Undefined resource.
+/// LOAD_GROUP groups instances of subtypes of IfcStructuralAction.  It shall be used as a
+///   container for loads grouped together for specific purposes, e.g. loads which are part of a
+///   special load pattern.
+///   LOAD_CASE groups LOAD_GROUPs and instances of subtypes of IfcStructuralAction.
+///   It should be used as a container for loads with the same origin.
+///   LOAD_COMBINATION_GROUP is an intermediate level between LOAD_CASE and LOAD_COMBINATION.
+///   The purpose of this level is to provide a factor with which one or more LOAD_CASEs occur in a
+///   LOAD_COMBINATION.  This factor cannot be specified directly at the load case if the load case
+///   is meant to occur in more than one combination with different factors.
+///   This intermediate level is obsolete.  Instead, 
+///   LOAD_COMBINATION is used to group load cases which act together into a load combination.
+///   USERDEFINED:  A grouping level which does not follow the standard hierarchy of load group types.
+///   NOTDEFINED:  The grouping level is not yet known.
 /// 
-/// HISTORY: New enumeration in IFC2x4
-typedef enum {IfcConstructionMaterialResourceType_AGGREGATES, IfcConstructionMaterialResourceType_CONCRETE, IfcConstructionMaterialResourceType_DRYWALL, IfcConstructionMaterialResourceType_FUEL, IfcConstructionMaterialResourceType_GYPSUM, IfcConstructionMaterialResourceType_MASONRY, IfcConstructionMaterialResourceType_METAL, IfcConstructionMaterialResourceType_PLASTIC, IfcConstructionMaterialResourceType_WOOD, IfcConstructionMaterialResourceType_NOTDEFINED, IfcConstructionMaterialResourceType_USERDEFINED} IfcConstructionMaterialResourceTypeEnum;
-const char* ToString(IfcConstructionMaterialResourceTypeEnum v);
-IfcConstructionMaterialResourceTypeEnum FromString(const std::string& s);
+/// HISTORY: New type in IFC 2x2.
+/// 
+/// IFC 2x4 change:  Obsolete item LOAD_COMBINATION_GROUP removed.  Load cases are directly assigned to load combinations with different factors for each load case—load combination pair by means of IfcRelAssignsToGroupByFactor.
+typedef enum {IfcLoadGroupType_LOAD_GROUP, IfcLoadGroupType_LOAD_CASE, IfcLoadGroupType_LOAD_COMBINATION, IfcLoadGroupType_USERDEFINED, IfcLoadGroupType_NOTDEFINED} IfcLoadGroupTypeEnum;
+const char* ToString(IfcLoadGroupTypeEnum v);
+IfcLoadGroupTypeEnum FromString(const std::string& s);
 }
-namespace IfcConstructionProductResourceTypeEnum {
-/// This enumeration is used to identify the primary purpose of a construction product resource. It describes use of products created for construction, and excludes products of the finished building model.  The IfcConstructionProductsResourceTypeEnum contains the following:
+namespace IfcLogicalOperatorEnum {
+/// Definition: IfcLogicalOperatorEnum is an enumeration that defines the logical operators that may be applied for the satisfaction of one or more operands (IfcConstraint) at a time. 
 /// 
-/// ASSEMBLY: Construction of assemblies for use as input to the building model or other assemblies.
-/// FORMWORK: Construction or placement of forms for placing materials such as concrete.
-/// USERDEFINED: User-defined resource.
-/// NOTDEFINED: Undefined resource.
+/// HISTORY  New type in IFC Release 2.0.  Renamed from IfcConstraintAggregatorEnum in IFC 2x2
 /// 
-/// HISTORY: New enumeration in IFC2x4
-typedef enum {IfcConstructionProductResourceType_ASSEMBLY, IfcConstructionProductResourceType_FORMWORK, IfcConstructionProductResourceType_USERDEFINED, IfcConstructionProductResourceType_NOTDEFINED} IfcConstructionProductResourceTypeEnum;
-const char* ToString(IfcConstructionProductResourceTypeEnum v);
-IfcConstructionProductResourceTypeEnum FromString(const std::string& s);
-}
-namespace IfcControllerTypeEnum {
-/// The IfcControllerTypeEnum defines the range of different types of controller that can be specified.
+/// IFC2x4 CHANGE: Extended to include LOGICALXOR, LOGICALNOTAND and LOGICALNOTOR.
 /// 
-/// HISTORY: New type in IFC R2.0
-///   Documentation extended in IFC 2x4. PROPORTIONALINTEGRAL and PROPORTIONALINTEGRALDERIVATIVE values deleted (property set enumeration now used).  MULTIPOSITION added.
+/// Enumeration 
 /// 
-/// Enumeration
+/// Value 
+///   Definition 
 /// 
-/// FLOATING: Output increases or decreases at a constant or accelerating rate.
-/// MULTIPOSITION: Output is discrete value, can be one of three or more values.
-/// PROGRAMMABLE: Output is programmable such as Discrete Digital Control (DDC).
-/// PROPORTIONAL: Output is proportional to the control error and optionally time integral and derivative.
-/// TWOPOSITION: Output can be either on or off
-/// USERDEFINED: User-defined type.
-/// NOTDEFINED: Undefined type.
-typedef enum {IfcControllerType_FLOATING, IfcControllerType_PROGRAMMABLE, IfcControllerType_PROPORTIONAL, IfcControllerType_MULTIPOSITION, IfcControllerType_TWOPOSITION, IfcControllerType_USERDEFINED, IfcControllerType_NOTDEFINED} IfcControllerTypeEnum;
-const char* ToString(IfcControllerTypeEnum v);
-IfcControllerTypeEnum FromString(const std::string& s);
-}
-namespace IfcCooledBeamTypeEnum {
-/// There are two general types of cooled or chilled beams: passive and active.
+/// LOGICALAND 
+///   Defines a relationship between operands whereby the result is true if all operands are true, i.e. false if at least 
 /// 
-/// An active Cooled Beam uses a fan or other auxilliary device to aid in air recirculation, while a passive
+/// one operand is false. 
 /// 
-/// Cooled Beam relies solely on convection to cool the space.
+/// LOGICALOR 
+///   Defines a relationship between operands whereby the result is true if at least one operand is true, i.e false if 
 /// 
-/// Enumeration defining the typical types of cooled beams.
+/// all operands are false. 
 /// 
-/// The IfcCooledBeamTypeEnum contains the following:
+/// LOGICALXOR 
+///   Defines a relationship between operands whereby the result is true if exactly one operand is true (exclusive or). 
 /// 
-/// ACTIVE: An active or ventilated cooled beam provides cooling (and heating) but can also function as an air terminal in a ventilation system.
+/// LOGICALNOTAND 
+///   Defines a relationship between operands whereby the result is true if at least one operand is false, i.e false if 
 /// 
-/// PASSIVE: A passive or static cooled beam provides cooling (and heating) to a room or zone.
+/// all operands are true. 
 /// 
-/// USERDEFINED: User-defined cooled beam type.
+/// LOGICALNOTOR 
+///   Defines a relationship between operands whereby the result is true if all operands are false, i.e false if at least 
 /// 
-/// NOTDEFINED:  Undefined cooled beam type.
+/// one operand is true. 
 /// 
-/// HISTORY: New enumeration in IFC 2x2.
-typedef enum {IfcCooledBeamType_ACTIVE, IfcCooledBeamType_PASSIVE, IfcCooledBeamType_USERDEFINED, IfcCooledBeamType_NOTDEFINED} IfcCooledBeamTypeEnum;
-const char* ToString(IfcCooledBeamTypeEnum v);
-IfcCooledBeamTypeEnum FromString(const std::string& s);
-}
-namespace IfcCoolingTowerTypeEnum {
-/// Enumeration defining the typical types of cooling towers. 
-///   The IfcCoolingTowerTypeEnum contains the following:
+/// Use Definition 
 /// 
-/// NATURALDRAFT: Air flow is produced naturally.
-///   MECHANICALINDUCEDDRAFT: Air flow is produced by a mechanical device, typically one or more fans, located on 
+/// The IfcLogicalOperatorEnum, when applied in a case of three operands, A, B and C, evaluates for each operator as 
 /// 
-/// the air outlet side of the cooling tower.
-///   MECHANICALFORCEDDRAFT: Air flow is produced by a mechanical device, typically one or more fans, located on 
+/// follows:
 /// 
-/// the inlet air side of the cooling tower.
-///   USERDEFINED:  User-defined cooling tower type.
-///   NOTDEFINED:  Undefined cooling tower type.
+/// TRUTH TABLE: LOGICALAND(A,B,C)
 /// 
-/// HISTORY: New enumeration in IFC R2x.
-typedef enum {IfcCoolingTowerType_NATURALDRAFT, IfcCoolingTowerType_MECHANICALINDUCEDDRAFT, IfcCoolingTowerType_MECHANICALFORCEDDRAFT, IfcCoolingTowerType_USERDEFINED, IfcCoolingTowerType_NOTDEFINED} IfcCoolingTowerTypeEnum;
-const char* ToString(IfcCoolingTowerTypeEnum v);
-IfcCoolingTowerTypeEnum FromString(const std::string& s);
-}
-namespace IfcCostItemTypeEnum {
-/// An IfcCostItemTypeEnum is a list of the available types of cost items. 
-///   HISTORY: New type in IFC2x4  
-///   Enumeration 
+/// A
+/// F
+/// F
+/// F
+/// T
+/// F
+/// T
+/// T
+/// T
 /// 
-/// USERDEFINED: User-defined type. 
-/// NOTDEFINED: Undefined type.
-typedef enum {IfcCostItemType_USERDEFINED, IfcCostItemType_NOTDEFINED} IfcCostItemTypeEnum;
-const char* ToString(IfcCostItemTypeEnum v);
-IfcCostItemTypeEnum FromString(const std::string& s);
-}
-namespace IfcCostScheduleTypeEnum {
-/// An IfcCostScheduleTypeEnum is a list of the available types of cost schedule from which that required may be selected. 
-///   HISTORY: New type in IFC 2x2  
-///   Enumeration 
+/// B
+/// F
+/// F
+/// T
+/// F
+/// T
+/// F
+/// T
+/// T
 /// 
-/// BUDGET: An allocation of money for a particular purpose. 
-/// COSTPLAN: An assessment of the amount of money needing to be expended for a defined purpose based on incomplete information about the goods and services required for a construction or installation.  
-/// ESTIMATE: An assessment of the amount of money needing to be expended for a defined purpose based on actual information about the goods and services required for a construction or installation. 
-/// TENDER: An offer to provide goods and services.  
-/// PRICEDBILLOFQUANTITIES: A complete listing of all work items forming construction or installation works in which costs have been allocated to work items.  
-/// UNPRICEDBILLOFQUANTITIES: A complete listing of all work items forming construction or installation works in which costs have not yet been allocated to work items. 
-/// SCHEDULEOFRATES: A listing of each type of goods forming construction or installation works with the cost of purchase, construction/installation, overheads and profit assigned so that additional items of that type can be costed.  
-/// USERDEFINED: User-defined type. 
-/// NOTDEFINED: Undefined type.
-typedef enum {IfcCostScheduleType_BUDGET, IfcCostScheduleType_COSTPLAN, IfcCostScheduleType_ESTIMATE, IfcCostScheduleType_TENDER, IfcCostScheduleType_PRICEDBILLOFQUANTITIES, IfcCostScheduleType_UNPRICEDBILLOFQUANTITIES, IfcCostScheduleType_SCHEDULEOFRATES, IfcCostScheduleType_USERDEFINED, IfcCostScheduleType_NOTDEFINED} IfcCostScheduleTypeEnum;
-const char* ToString(IfcCostScheduleTypeEnum v);
-IfcCostScheduleTypeEnum FromString(const std::string& s);
-}
-namespace IfcCoveringTypeEnum {
-/// Definition from IAI: This enumeration defines the range
-/// of different types of covering that can further specify an
-/// IfcCovering or an IfcCoveringType.
-/// HISTORY New enumeration
-/// in IFC Release 1.0
-/// IFC2x4 CHANGE The following
-/// enumerators of the IfcCoveringTypeEnum have been
-/// deprecated INSULATION, SLEEVING and
-/// WRAPPING.
-/// Enumeration
+/// C
+/// F
+/// T
+/// F
+/// F
+/// T
+/// T
+/// F
+/// T
 /// 
-/// CEILING: the covering is used to
-/// represent a ceiling
-/// FLOORING: the covering is used to
-/// represent a flooring
-/// CLADDING: the covering is used to
-/// represent a cladding
-/// ROOFING: the covering is used to
-/// represent a roof
+/// AND
+/// F
+/// F
+/// F
+/// F
+/// F
+/// F
+/// F
+/// T
 /// 
-/// INSULATION: the covering is used to
-/// insulate an element for thermal or acoustic purposes.
-/// IFC2x4 NOTE The use of this
-/// enumerator is deprecated.
-/// MEMBRANE: an impervious layer that
-/// could be used for e.g. roof covering (below tiling - that may be
-/// known as sarking etc.) or as a damp proof course membrane
-/// IFC2x4 NOTE The use of this
-/// enumerator is deprecated.
-/// SLEEVING: the covering is used to
-/// isolate a distribution element from a space in which it is
-/// contained.
-/// IFC2x4 NOTE The use of this
-/// enumerator is deprecated.
-/// WRAPPING: the covering is used for
-/// wrapping particularly of distribution elements using tape.
-/// IFC2x4 NOTE The use of this
-/// enumerator is deprecated.
+/// TRUTH TABLE: LOGICALOR(A,B,C)
 /// 
-/// USERDEFINED: user defined type of
-/// covering
-/// NOTDEFINED: undefined type of
-/// covering
-typedef enum {IfcCoveringType_CEILING, IfcCoveringType_FLOORING, IfcCoveringType_CLADDING, IfcCoveringType_ROOFING, IfcCoveringType_MOLDING, IfcCoveringType_SKIRTINGBOARD, IfcCoveringType_INSULATION, IfcCoveringType_MEMBRANE, IfcCoveringType_SLEEVING, IfcCoveringType_WRAPPING, IfcCoveringType_USERDEFINED, IfcCoveringType_NOTDEFINED} IfcCoveringTypeEnum;
-const char* ToString(IfcCoveringTypeEnum v);
-IfcCoveringTypeEnum FromString(const std::string& s);
-}
-namespace IfcCrewResourceTypeEnum {
-/// This enumeration is used to identify the primary purpose of a crew resource.  The IfcCrewResourceTypeEnum contains the following:
+/// A
+/// F
+/// F
+/// F
+/// T
+/// F
+/// T
+/// T
+/// T
 /// 
-/// OFFICE: A composition of resources performing administration work in an office.
-/// SITE: A composition of resources performing production work on a construction site.
-/// USERDEFINED: User-defined resource.
-/// NOTDEFINED: Undefined resource.
+/// B
+/// F
+/// F
+/// T
+/// F
+/// T
+/// F
+/// T
+/// T
 /// 
-/// HISTORY: New enumeration in IFC2x4
-typedef enum {IfcCrewResourceType_OFFICE, IfcCrewResourceType_SITE, IfcCrewResourceType_USERDEFINED, IfcCrewResourceType_NOTDEFINED} IfcCrewResourceTypeEnum;
-const char* ToString(IfcCrewResourceTypeEnum v);
-IfcCrewResourceTypeEnum FromString(const std::string& s);
-}
-namespace IfcCurtainWallTypeEnum {
-/// Definition from IAI: Enumeration defining
-/// the valid types of curtain wall that can be predefined using the
-/// enumeration values. 
-/// HISTORY 
-/// New Enumeration in Release IFC2x Edition 3
-/// NOTE  Currently there
-/// are no specific enumerators defined, the IfcCurtainWallTypeEnum
-/// has
-/// been added for future extensions.
-typedef enum {IfcCurtainWallType_USERDEFINED, IfcCurtainWallType_NOTDEFINED} IfcCurtainWallTypeEnum;
-const char* ToString(IfcCurtainWallTypeEnum v);
-IfcCurtainWallTypeEnum FromString(const std::string& s);
-}
-namespace IfcCurveInterpolationEnum {
-/// IfcCurveInterpolationEnum specifies the possible methods
-/// for the interpolation of property values given as a curve.
+/// C
+/// F
+/// T
+/// F
+/// F
+/// T
+/// T
+/// F
+/// T
 /// 
-/// HISTORY  New type in IFC2x4.
+/// OR
+/// F
+/// T
+/// T
+/// T
+/// T
+/// T
+/// T
+/// T
 /// 
-/// Enumeration
+/// TRUTH TABLE: LOGICALXOR(A,B,C)
 /// 
-/// LINEAR: Indicates that values between the defined
-/// values are to be found by linear interpolation.
-/// LOG_LINEAR: Indicates that values between the defined
-/// values are to be found by linear interpolation of the natural
-/// logarithm (base e) of the values.
-/// LOG_LOG: Indicates that values between the defined
-/// values are to be found by linear interpolation of the Briggs'
-/// logarithm (base 10) of the values.
-/// NOTDEFINED: No interpolation information is
-/// provided
-typedef enum {IfcCurveInterpolation_LINEAR, IfcCurveInterpolation_LOG_LINEAR, IfcCurveInterpolation_LOG_LOG, IfcCurveInterpolation_NOTDEFINED} IfcCurveInterpolationEnum;
-const char* ToString(IfcCurveInterpolationEnum v);
-IfcCurveInterpolationEnum FromString(const std::string& s);
-}
-namespace IfcDamperTypeEnum {
-/// This enumeration defines the various types of damper:
+/// A
+/// F
+/// F
+/// F
+/// T
+/// F
+/// T
+/// T
+/// T
 /// 
-/// BALANCINGDAMPER: Damper used for purposes of manually balancing pressure differences.  Commonly operated by mechanical adjustment.
-/// BACKDRAFTDAMPER: Backdraft damper used to restrict the movement of air in one direction.  Commonly operated by mechanical spring.
-/// BLASTDAMPER: Blast damper use to prevent protect occupants and equipment against overpressures resultant of an explosion.  Commonly operated by mechanical spring.
-/// CONTROLDAMPER: Control damper used to modulate the flow of air by adjusting the position of the blades.  Commonly operated by an actuator of a building automation system.
-/// FIREDAMPER: Fire damper used to prevent the spread of fire for a specified duration.  Commonly operated by fusable link that melts above a certain temperature.
-/// FIRESMOKEDAMPER: Combination fire and smoke damper used to preven the spread of fire and smoke.  Commonly operated by a fusable link and a smoke detector
-/// FUMEHOODEXHAUST: Fume hood exhaust damper.  Commonly operated by actuator.
-/// GRAVITYDAMPER: Gravity damper closes from the force of gravity.  Commonly operated by gravitational weight.
-/// GRAVITYRELIEFDAMPER: Gravity-relief damper used to allow air to move upon a buildup of enough pressure to overcome the gravitational force exerted upon the damper blades.  Commonly operated by gravitational weight.
-/// RELIEFDAMPER: Relief damper used to allow air to move upon a buildup of a specified pressure differential.  Commonly operated by mechanical spring.
-/// SMOKEDAMPER: Smoke damper used to prevent the spread of smoke.  Commonly operated by a smoke detector of a building automation system.
-/// USERDEFINED: User-defined damper.
-/// NOTDEFINED: Undefined damper.
+/// B
+/// F
+/// F
+/// T
+/// F
+/// T
+/// F
+/// T
+/// T
 /// 
-/// HISTORY: New enumeration in IFC R2.0
-typedef enum {IfcDamperType_BACKDRAFTDAMPER, IfcDamperType_BALANCINGDAMPER, IfcDamperType_BLASTDAMPER, IfcDamperType_CONTROLDAMPER, IfcDamperType_FIREDAMPER, IfcDamperType_FIRESMOKEDAMPER, IfcDamperType_FUMEHOODEXHAUST, IfcDamperType_GRAVITYDAMPER, IfcDamperType_GRAVITYRELIEFDAMPER, IfcDamperType_RELIEFDAMPER, IfcDamperType_SMOKEDAMPER, IfcDamperType_USERDEFINED, IfcDamperType_NOTDEFINED} IfcDamperTypeEnum;
-const char* ToString(IfcDamperTypeEnum v);
-IfcDamperTypeEnum FromString(const std::string& s);
-}
-namespace IfcDataOriginEnum {
-/// IfcDataOriginEnum identifies the origin of time data:
+/// C
+/// F
+/// T
+/// F
+/// F
+/// T
+/// T
+/// F
+/// T
 /// 
-/// MEASURED: The origin of the time data is a measurement device.
-///   PREDICTED: The time data are a prediction.
-///   SIMULATED: The origin of the time data is a simulation.
-///   NOTDEFINED: The origin of the time data is undefined.
+/// XOR
+/// F
+/// T
+/// T
+/// T
+/// F
+/// F
+/// F
+/// F
 /// 
-/// HISTORY: New enumeration in IFC 2x2.
-typedef enum {IfcDataOrigin_MEASURED, IfcDataOrigin_PREDICTED, IfcDataOrigin_SIMULATED, IfcDataOrigin_USERDEFINED, IfcDataOrigin_NOTDEFINED} IfcDataOriginEnum;
-const char* ToString(IfcDataOriginEnum v);
-IfcDataOriginEnum FromString(const std::string& s);
-}
-namespace IfcDerivedUnitEnum {
-/// IfcDerivedUnitEnum is an enumeration type for allowed types of derived units.
-/// ENUMERATION 
+/// TRUTH TABLE: LOGICALNOTAND(A,B,C)
 /// 
-/// ACCELERATIONUNIT 
-///   ANGULARVELOCITYUNIT 
-///   COMPOUNDPLANEANGLEUNIT 
-///   DYNAMICVISCOSITYUNIT 
-///   HEATFLUXDENSITYUNIT 
-///   INTEGERCOUNTRATEUNIT 
-///   ISOTHERMALMOISTURECAPACITYUNIT 
-///   KINEMATICVISCOSITYUNIT 
-///   LINEARFORCEUNIT 
-///   LINEARMOMENTUNIT 
-///   LINEARSTIFFNESSUNIT 
-///   LINEARVELOCITYUNIT 
-///   MASSDENSITYUNIT 
-///   MASSFLOWRATEUNIT 
-///   MODULUSOFELASTICITYUNIT 
-///   MODULUSOFSUBGRADEREACTIONUNIT 
-///   MOISTUREDIFFUSIVITYUNIT 
-///   MOLECULARWEIGHTUNIT 
-///   MOMENTORINERTIAUNIT 
-///   PLANARFORCEUNIT 
-///   ROTATIONALFREQUENCYUNIT 
-///   ROTATIONALSTIFFNESSUNIT 
-///   SHEARMODULUSUNIT 
-///   SPECIFICHEATCAPACITYUNIT 
-///   THERMALADMITTANCEUNIT 
-///   THERMALCONDUCTANCEUNIT 
-///   THERMALRESISTANCEUNIT 
-///   THERMALTRANSMITTANCEUNIT 
-///   TORQUEUNIT 
-///   VAPORPERMEABILITYUNIT 
-///   VOLUMETRICFLOWRATEUNIT 
-///   CURVATUREUNIT 
-///   HEATINGVALUEUNIT 
-///   IONCONCENTRATIONUNIT 
-///   LUMINOUSINTENSITYDISTRIBUTIONUNIT 
-///   MASSPERLENGTHUNIT 
-///   MODULUSOFLINEARSUBGRADEREACTIONUNIT 
-///   MODULUSOFROTATIONALSUBGRADEREACTIONUNIT 
-///   PHUNIT 
-///   ROTATIONALMASSUNIT 
-///   SECTIONAREAINTEGRALUNIT 
-///   SECTIONMODULUSUNIT 
-///   SOUNDPOWERUNIT 
-///   SOUNDPRESSUREUNIT 
-///   TEMPERATUREGRADIENTUNIT 
-///   TEMPERATURERATEOFCHANGE 
-///   THERMALEXPANSIONCOEFFICIENTUNIT 
-///   WARPINGCONSTANTUNIT 
-///   WARPINGMOMENTUNIT 
-///   USERDEFINED: User defined derived unit. 
+/// A
+/// F
+/// F
+/// F
+/// T
+/// F
+/// T
+/// T
+/// T
 /// 
-/// HISTORY: New type in IFC Release 2.0.
+/// B
+/// F
+/// F
+/// T
+/// F
+/// T
+/// F
+/// T
+/// T
 /// 
-/// IFC 2x4 change: added TEMPERATURERATEOFCHANGE.
-typedef enum {IfcDerivedUnit_ANGULARVELOCITYUNIT, IfcDerivedUnit_AREADENSITYUNIT, IfcDerivedUnit_COMPOUNDPLANEANGLEUNIT, IfcDerivedUnit_DYNAMICVISCOSITYUNIT, IfcDerivedUnit_HEATFLUXDENSITYUNIT, IfcDerivedUnit_INTEGERCOUNTRATEUNIT, IfcDerivedUnit_ISOTHERMALMOISTURECAPACITYUNIT, IfcDerivedUnit_KINEMATICVISCOSITYUNIT, IfcDerivedUnit_LINEARVELOCITYUNIT, IfcDerivedUnit_MASSDENSITYUNIT, IfcDerivedUnit_MASSFLOWRATEUNIT, IfcDerivedUnit_MOISTUREDIFFUSIVITYUNIT, IfcDerivedUnit_MOLECULARWEIGHTUNIT, IfcDerivedUnit_SPECIFICHEATCAPACITYUNIT, IfcDerivedUnit_THERMALADMITTANCEUNIT, IfcDerivedUnit_THERMALCONDUCTANCEUNIT, IfcDerivedUnit_THERMALRESISTANCEUNIT, IfcDerivedUnit_THERMALTRANSMITTANCEUNIT, IfcDerivedUnit_VAPORPERMEABILITYUNIT, IfcDerivedUnit_VOLUMETRICFLOWRATEUNIT, IfcDerivedUnit_ROTATIONALFREQUENCYUNIT, IfcDerivedUnit_TORQUEUNIT, IfcDerivedUnit_MOMENTOFINERTIAUNIT, IfcDerivedUnit_LINEARMOMENTUNIT, IfcDerivedUnit_LINEARFORCEUNIT, IfcDerivedUnit_PLANARFORCEUNIT, IfcDerivedUnit_MODULUSOFELASTICITYUNIT, IfcDerivedUnit_SHEARMODULUSUNIT, IfcDerivedUnit_LINEARSTIFFNESSUNIT, IfcDerivedUnit_ROTATIONALSTIFFNESSUNIT, IfcDerivedUnit_MODULUSOFSUBGRADEREACTIONUNIT, IfcDerivedUnit_ACCELERATIONUNIT, IfcDerivedUnit_CURVATUREUNIT, IfcDerivedUnit_HEATINGVALUEUNIT, IfcDerivedUnit_IONCONCENTRATIONUNIT, IfcDerivedUnit_LUMINOUSINTENSITYDISTRIBUTIONUNIT, IfcDerivedUnit_MASSPERLENGTHUNIT, IfcDerivedUnit_MODULUSOFLINEARSUBGRADEREACTIONUNIT, IfcDerivedUnit_MODULUSOFROTATIONALSUBGRADEREACTIONUNIT, IfcDerivedUnit_PHUNIT, IfcDerivedUnit_ROTATIONALMASSUNIT, IfcDerivedUnit_SECTIONAREAINTEGRALUNIT, IfcDerivedUnit_SECTIONMODULUSUNIT, IfcDerivedUnit_SOUNDPOWERLEVELUNIT, IfcDerivedUnit_SOUNDPOWERUNIT, IfcDerivedUnit_SOUNDPRESSURELEVELUNIT, IfcDerivedUnit_SOUNDPRESSUREUNIT, IfcDerivedUnit_TEMPERATUREGRADIENTUNIT, IfcDerivedUnit_TEMPERATURERATEOFCHANGEUNIT, IfcDerivedUnit_THERMALEXPANSIONCOEFFICIENTUNIT, IfcDerivedUnit_WARPINGCONSTANTUNIT, IfcDerivedUnit_WARPINGMOMENTUNIT, IfcDerivedUnit_USERDEFINED} IfcDerivedUnitEnum;
-const char* ToString(IfcDerivedUnitEnum v);
-IfcDerivedUnitEnum FromString(const std::string& s);
-}
-namespace IfcDirectionSenseEnum {
-/// IfcDirectionSenseEnum is an enumeration denoting whether sense of direction is positive or negative along the given axis.
+/// C
+/// F
+/// T
+/// F
+/// F
+/// T
+/// T
+/// F
+/// T
 /// 
-/// ENUMERATION
+/// NOTAND
+/// T
+/// T
+/// T
+/// T
+/// T
+/// T
+/// T
+/// F
 /// 
-/// POSITIVE: Direction defined to be positive.
-/// NEGATIVE: Direction defined to be negative.
+/// TRUTH TABLE: LOGICALNOTOR(A,B,C)
 /// 
-/// HISTORY New Type in IFC2x.
-typedef enum {IfcDirectionSense_POSITIVE, IfcDirectionSense_NEGATIVE} IfcDirectionSenseEnum;
-const char* ToString(IfcDirectionSenseEnum v);
-IfcDirectionSenseEnum FromString(const std::string& s);
-}
-namespace IfcDiscreteAccessoryTypeEnum {
-/// Definition from IAI: This enumeration defines the different types of discrete accessories:
+/// A
+/// F
+/// F
+/// F
+/// T
+/// F
+/// T
+/// T
+/// T
 /// 
-/// ANCHORPLATE: An accessory consisting of a steel plate, shear stud connectors or welded-on rebar which is embedded into the surface of a concrete element so that other elements can be welded or bolted onto it later.
-/// BRACKET: An L-shaped or similarly shaped accessory attached in a corner between elements to hold them together or to carry a secondary element.
-/// SHOE: A column shoe or a beam shoe (beam hanger) used to support or secure an element.
-/// USERDEFINED: User-defined accessory
-/// NOTDEFINED: Undefined accessory
+/// B
+/// F
+/// F
+/// T
+/// F
+/// T
+/// F
+/// T
+/// T
 /// 
-/// HISTORY  New Enumeration in IFC 2x4.
-typedef enum {IfcDiscreteAccessoryType_ANCHORPLATE, IfcDiscreteAccessoryType_BRACKET, IfcDiscreteAccessoryType_SHOE, IfcDiscreteAccessoryType_USERDEFINED, IfcDiscreteAccessoryType_NOTDEFINED} IfcDiscreteAccessoryTypeEnum;
-const char* ToString(IfcDiscreteAccessoryTypeEnum v);
-IfcDiscreteAccessoryTypeEnum FromString(const std::string& s);
-}
-namespace IfcDistributionChamberElementTypeEnum {
-/// This enumeration identifies different types of distribution chambers.
+/// C
+/// F
+/// T
+/// F
+/// F
+/// T
+/// T
+/// F
+/// T
 /// 
-/// Valid enumerations are:
+/// NOTOR
+/// T
+/// F
+/// F
+/// F
+/// F
+/// F
+/// F
+/// F
+typedef enum {IfcLogicalOperator_LOGICALAND, IfcLogicalOperator_LOGICALOR, IfcLogicalOperator_LOGICALXOR, IfcLogicalOperator_LOGICALNOTAND, IfcLogicalOperator_LOGICALNOTOR} IfcLogicalOperatorEnum;
+const char* ToString(IfcLogicalOperatorEnum v);
+IfcLogicalOperatorEnum FromString(const std::string& s);
+}
+namespace IfcMechanicalFastenerTypeEnum {
+/// Definition from IAI: This enumeration defines the
+/// different types of mechanical fasteners:
 /// 
-/// FORMEDDUCT: Space formed in the ground for the passage of pipes, cables, ducts.
-/// INSPECTIONCHAMBER: Chamber constructed on a drain, sewer or pipeline with a removable cover that permits visble inspection.
-/// INSPECTIONPIT:  Recess or chamber formed to permit access for inspection of substructure and services.
-/// MANHOLE: Chamber constructed on a drain, sewer or pipeline with a removable cover that permits the entry of a person.
-/// METERCHAMBER: Chamber that houses a meter(s).
-/// SUMP: Recessed or small chamber into which liquid is drained to facilitate its collection for removal.
-/// TRENCH: Excavated chamber, the length of which typically exceeds the width.
-/// VALVECHAMBER: Chamber that houses a valve(s).
-/// USERDEFINED: User-defined chamber type.
-/// NOTDEFINED: Undefined chamber type.
+/// ANCHORBOLT: A special bolt which is anchored into conrete, stone, or brickwork.
+/// BOLT: A threaded cylindrical rod that engages with a similarly threaded hole in a nut or any other part to form a fastener. The mechanical fastener often also includes one or more washers and one or more nuts.
+/// DOWEL: A cylindrical rod that is driven into holes of the connected pieces.
+/// NAIL: A thin pointed piece of metal that is hammered into materials as a fastener.
+/// NAILPLATE: A piece of sheet metal with punched points that overlaps the connected pieces and is pressed into their material.
+/// RIVET: A fastening part having a head at one end and the other end being hammered flat after being passed through holes in the pieces that are fastened together.
+/// SCREW: A fastener with a tapered threaded shank and a slotted head.
+/// SHEARCONNECTOR: A ring connector that is accepted by ring keyways in the connected pieces; or a toothed circular or square connector that is pressed into the connected pieces.
+/// STAPLE: A doubly pointed piece of metal that is hammered into materials as a fastener.
+/// STUDSHEARCONNECTOR: Stud shear connectors are cylindrical fastening parts with a head on one side. On the other side they are welded on steel members for the use in composite steel and concrete structures.
+/// USERDEFINED: User-defined mechanical fastener
+/// NOTDEFINED: Undefined mechanical fastener
 /// 
-/// HISTORY: New enumeration in IFC R2x2
-typedef enum {IfcDistributionChamberElementType_FORMEDDUCT, IfcDistributionChamberElementType_INSPECTIONCHAMBER, IfcDistributionChamberElementType_INSPECTIONPIT, IfcDistributionChamberElementType_MANHOLE, IfcDistributionChamberElementType_METERCHAMBER, IfcDistributionChamberElementType_SUMP, IfcDistributionChamberElementType_TRENCH, IfcDistributionChamberElementType_VALVECHAMBER, IfcDistributionChamberElementType_USERDEFINED, IfcDistributionChamberElementType_NOTDEFINED} IfcDistributionChamberElementTypeEnum;
-const char* ToString(IfcDistributionChamberElementTypeEnum v);
-IfcDistributionChamberElementTypeEnum FromString(const std::string& s);
-}
-namespace IfcDistributionPortTypeEnum {
-
-typedef enum {IfcDistributionPortType_CABLE, IfcDistributionPortType_CABLECARRIER, IfcDistributionPortType_DUCT, IfcDistributionPortType_PIPE, IfcDistributionPortType_USERDEFINED, IfcDistributionPortType_NOTDEFINED} IfcDistributionPortTypeEnum;
-const char* ToString(IfcDistributionPortTypeEnum v);
-IfcDistributionPortTypeEnum FromString(const std::string& s);
+/// HISTORY  New Enumeration in IFC 2x4.
+typedef enum {IfcMechanicalFastenerType_ANCHORBOLT, IfcMechanicalFastenerType_BOLT, IfcMechanicalFastenerType_DOWEL, IfcMechanicalFastenerType_NAIL, IfcMechanicalFastenerType_NAILPLATE, IfcMechanicalFastenerType_RIVET, IfcMechanicalFastenerType_SCREW, IfcMechanicalFastenerType_SHEARCONNECTOR, IfcMechanicalFastenerType_STAPLE, IfcMechanicalFastenerType_STUDSHEARCONNECTOR, IfcMechanicalFastenerType_USERDEFINED, IfcMechanicalFastenerType_NOTDEFINED} IfcMechanicalFastenerTypeEnum;
+const char* ToString(IfcMechanicalFastenerTypeEnum v);
+IfcMechanicalFastenerTypeEnum FromString(const std::string& s);
 }
-namespace IfcDistributionSystemEnum {
-/// This enumeration identifies different types of distribution systems.
+namespace IfcMedicalDeviceTypeEnum {
+/// Enumeration defining the functional type of medical device.
 /// 
-/// HISTORY: New enumeration in IFC R2x4
+/// The IfcMedicalDeviceTypeEnum contains the following:
 /// 
-/// Valid enumerations for pipes and related elements include:
+/// AIRSTATION: Device that provides purified medical air, composed of an air compressor and air treatment line.
+/// FEEDERUNIT: Device that feeds air to an oxygen generator, composed of an air compressor, air treatment line, and an air receiver.
+/// OXYGENGENERATOR: Device that generates oxygen from air.
+/// OXYGENPLANT: Device that combines a feed air unit, oxygen generator, and backup oxygen cylinders.
+/// VACUUMSTATION: Device that provides suction, composed of a vacuum pump and bacterial filtration line.
+/// USERDEFINED: User-defined medical device type.
+/// NOTDEFINED:  Undefined medical device type.
 /// 
-/// CHEMICAL: Arbitrary chemical further qualified by property set, such as for medical or industrial use.
-///   CHILLEDWATER: Nonpotable chilled water, such as circulated through an evaporator.
-///   COMPRESSEDAIR: Compressed air system.
-///   CONDENSERWATER: Nonpotable water, such as circulated through a condensor.
-///   DOMESTICCOLDWATER: Unheated potable water distribution system.
-///   DOMESTICHOTWATER: Heated potable water distribution system.
-///   DRAINAGE: Drainage collection system.
-///   FIREPROTECTION: Fire protection sprinkler system.
-///   GAS: Methane distribution system.
-///   HAZARDOUS: Hazardous material or fluid collection system.
-///   HEATING: Heated water distribution system.
-///   OIL: Oil distribution system.
-///   RAINWATER: Rainwater resulting from precipitation which directly falls on a parcel.
-///   REFRIGERATION: Refrigerant distribution system for purposes of fulfilling all or parts of a refrigeration cycle.
-///   SEWAGE: Sewage collection system.
-///   STORMWATER: Stormwater resulting from precipitation which runs off or travels over the ground surface.
-///   VACUUM: Vacuum distribution system.
-///   VENT: Vent system for wastewater piping systems.
-///   WASTE: Waste collection system.
+/// HISTORY: New enumeration in IFC 2x4.
+typedef enum {IfcMedicalDeviceType_AIRSTATION, IfcMedicalDeviceType_FEEDAIRUNIT, IfcMedicalDeviceType_OXYGENGENERATOR, IfcMedicalDeviceType_OXYGENPLANT, IfcMedicalDeviceType_VACUUMSTATION, IfcMedicalDeviceType_USERDEFINED, IfcMedicalDeviceType_NOTDEFINED} IfcMedicalDeviceTypeEnum;
+const char* ToString(IfcMedicalDeviceTypeEnum v);
+IfcMedicalDeviceTypeEnum FromString(const std::string& s);
+}
+namespace IfcMemberTypeEnum {
+/// Definition from IAI: This enumeration defines the
+/// different types of linear elements an IfcMemberType object
+/// can fulfill:
 /// 
-/// Valid enumerations for ducts and related elements include:
+/// BRACE: A linear element (usually sloped) often used
+/// for bracing of a girder or truss.
+/// CHORD: Upper or lower longitudinal member of a truss,
+/// used horizontally or sloped.
+/// COLLAR: A linear element (usually used horizontally)
+/// within a roof structure to connect rafters and posts.
+/// MEMBER: A linear element within a girder or truss with
+/// no further meaning.
+/// MULLION: A linear element within a curtain wall system
+/// to connect two (or more) panels.
+/// PLATE: A linear continuous horizontal element in wall
+/// framing, e.g. a head piece or a sole plate.
 /// 
-/// AIRCONDITIONING:  Conditioned air distribution system for purposes of maintaining a temperature range within one or more spaces.
-///   EXHAUST:  Exhaust air collection system for removing stale or noxious air from one or more spaces.
-///   VENTILATION:  Ventilation air distribution system involved in either the exchange of air to the outside as well as circulation of air within a building.
+/// NOTE  This head piece or sole plate shall not
+/// be mixed up with planar elements, such as sheets and panels, that
+/// are handled as IfcPlate (and
+/// IfcPlateType).
 /// 
-/// Valid enumerations for cables and related elements include:
+/// POST: A linear member (usually used vertically) within
+/// a roof structure to support purlins.
+/// PURLIN: A linear element (usually used horizontally)
+/// within a roof structure to support rafters
+/// RAFTER: A linear elements used to support roof slabs
+/// or roof covering, usually used with slope.
+/// STRINGER: A linear element used to support stair or
+/// ramp flights, usually used with slope.
+/// STRUT: A linear element often used within a girder or
+/// truss.
+/// STUD: Vertical element in wall framing.
+/// USERDEFINED: User-defined linear element.
+/// NOTDEFINED: Undefined linear element
 /// 
-/// AUDIOVISUAL:  A transport of a single media source, having audio and/or video streams.
-///   CONTROL:  A transport or network dedicated to control system usage.
-///   DATA: A network having general-purpose usage.
-///   EARTHING: A path for equipotential bonding, conducting current to the ground.
-///   ELECTRICAL: A circuit for delivering electrical power.
-///   ELECTROACCOUSTIC: An amplified audio signal such as for loudspeakers.
-///   LIGHTING: A circuit dedicated for lighting, such as a fixture having sockets for lamps.
-///   LIGHTNINGPROTECTION: A path for conducting lightning current to the ground.
-///   POWERGENERATION: A path for power generation.
-///   SECURITY: A transport or network dedicated to security system usage.
-///   SIGNAL: A raw analog signal, such as modulated data or measurements from sensors.
-///   TELEPHONE: A transport or network dedicated to telephone system usage.
-///   TV: A transport of multiple media sources (e.g. analog cable, satellite, over-the-air).
-typedef enum {IfcDistributionSystem_AIRCONDITIONING, IfcDistributionSystem_AUDIOVISUAL, IfcDistributionSystem_CHEMICAL, IfcDistributionSystem_CHILLEDWATER, IfcDistributionSystem_COMMUNICATION, IfcDistributionSystem_COMPRESSEDAIR, IfcDistributionSystem_CONDENSERWATER, IfcDistributionSystem_CONTROL, IfcDistributionSystem_CONVEYING, IfcDistributionSystem_DATA, IfcDistributionSystem_DISPOSAL, IfcDistributionSystem_DOMESTICCOLDWATER, IfcDistributionSystem_DOMESTICHOTWATER, IfcDistributionSystem_DRAINAGE, IfcDistributionSystem_EARTHING, IfcDistributionSystem_ELECTRICAL, IfcDistributionSystem_ELECTROACOUSTIC, IfcDistributionSystem_EXHAUST, IfcDistributionSystem_FIREPROTECTION, IfcDistributionSystem_FUEL, IfcDistributionSystem_GAS, IfcDistributionSystem_HAZARDOUS, IfcDistributionSystem_HEATING, IfcDistributionSystem_LIGHTING, IfcDistributionSystem_LIGHTNINGPROTECTION, IfcDistributionSystem_MUNICIPALSOLIDWASTE, IfcDistributionSystem_OIL, IfcDistributionSystem_OPERATIONAL, IfcDistributionSystem_POWERGENERATION, IfcDistributionSystem_RAINWATER, IfcDistributionSystem_REFRIGERATION, IfcDistributionSystem_SECURITY, IfcDistributionSystem_SEWAGE, IfcDistributionSystem_SIGNAL, IfcDistributionSystem_STORMWATER, IfcDistributionSystem_TELEPHONE, IfcDistributionSystem_TV, IfcDistributionSystem_VACUUM, IfcDistributionSystem_VENT, IfcDistributionSystem_VENTILATION, IfcDistributionSystem_WASTEWATER, IfcDistributionSystem_WATERSUPPLY, IfcDistributionSystem_USERDEFINED, IfcDistributionSystem_NOTDEFINED} IfcDistributionSystemEnum;
-const char* ToString(IfcDistributionSystemEnum v);
-IfcDistributionSystemEnum FromString(const std::string& s);
+/// HISTORY: New
+/// Enumeration in Release IFC2x Edition 2.
+/// IFC2x Edition 2
+/// Addendum 1 CHANGE  The additional identifiers CHORD, PLATE, STUD
+/// are added.
+/// IFC2x Edition 3 CHANGE  The additional identifier MULLION has
+/// been added.
+typedef enum {IfcMemberType_BRACE, IfcMemberType_CHORD, IfcMemberType_COLLAR, IfcMemberType_MEMBER, IfcMemberType_MULLION, IfcMemberType_PLATE, IfcMemberType_POST, IfcMemberType_PURLIN, IfcMemberType_RAFTER, IfcMemberType_STRINGER, IfcMemberType_STRUT, IfcMemberType_STUD, IfcMemberType_USERDEFINED, IfcMemberType_NOTDEFINED} IfcMemberTypeEnum;
+const char* ToString(IfcMemberTypeEnum v);
+IfcMemberTypeEnum FromString(const std::string& s);
 }
-namespace IfcDocumentConfidentialityEnum {
-/// IfcDocumentConfidentialityEnum enables selection of the level of confidentiality of document information from a list of choices. 
+namespace IfcMotorConnectionTypeEnum {
+/// The IfcMotorConnectionTypeEnum defines the range of different types of motor connection that can be specified. 
+///   HISTORY: New type in IFC 2x.  
+///   Enumeration 
 /// 
-/// HISTORY: New enumeration in IFC 2x
+/// BELTDRIVE: An indirect connection made through the medium of a shaped, flexible continuous loop. 
+/// COUPLING: An indirect connection made through the medium of the viscosity of a fluid. 
+/// DIRECTDRIVE: A direct, physical connection made between the motor and the driven device. 
+/// USERDEFINED: User-defined type. 
+/// NOTDEFINED: Undefined type.
+typedef enum {IfcMotorConnectionType_BELTDRIVE, IfcMotorConnectionType_COUPLING, IfcMotorConnectionType_DIRECTDRIVE, IfcMotorConnectionType_USERDEFINED, IfcMotorConnectionType_NOTDEFINED} IfcMotorConnectionTypeEnum;
+const char* ToString(IfcMotorConnectionTypeEnum v);
+IfcMotorConnectionTypeEnum FromString(const std::string& s);
+}
+namespace IfcNullStyle {
+/// Definition from ISO/CD 10303-46:1992: The null style type specifies, that a representation item is not styled.
 /// 
-/// Enumeration 
+/// NOTE  Corresponding ISO 10303 name: null_style. Please refer to ISO/IS 10303-46:1994 for the final
+/// definition of the formal standard.
 /// 
-/// PUBLIC: Document is publicly available. 
-/// RESTRICTED: Document availability is restricted. 
-/// CONFIDENTIAL: Document is confidential and its contents should not be revealed without permission. 
-/// PERSONAL: Document is personal to the author. 
-/// USERDEFINED 
-/// NOTDEFINED
-typedef enum {IfcDocumentConfidentiality_PUBLIC, IfcDocumentConfidentiality_RESTRICTED, IfcDocumentConfidentiality_CONFIDENTIAL, IfcDocumentConfidentiality_PERSONAL, IfcDocumentConfidentiality_USERDEFINED, IfcDocumentConfidentiality_NOTDEFINED} IfcDocumentConfidentialityEnum;
-const char* ToString(IfcDocumentConfidentialityEnum v);
-IfcDocumentConfidentialityEnum FromString(const std::string& s);
+/// HISTORY  New enumeration in IFC2x2.
+/// 
+/// IFC2x4 CHANGE  The enumeration is deprecated.
+typedef enum {IfcNullStyle_NULL} IfcNullStyle;
+const char* ToString(IfcNullStyle v);
+IfcNullStyle FromString(const std::string& s);
 }
-namespace IfcDocumentStatusEnum {
-/// IfcDocumentStatusEnum enables selection of the status of document information from a list of choices.
+namespace IfcObjectTypeEnum {
+/// This enumeration defines the applicable object categories, that is, the subtypes at the 2nd level of the IFC inheritance tree. Attached to an object, it indicates to which subtype of IfcObject the entity referencing it would otherwise comply with. 
 /// 
-/// HISTORY: New enumeration in IFC Release 2x.
-typedef enum {IfcDocumentStatus_DRAFT, IfcDocumentStatus_FINALDRAFT, IfcDocumentStatus_FINAL, IfcDocumentStatus_REVISION, IfcDocumentStatus_NOTDEFINED} IfcDocumentStatusEnum;
-const char* ToString(IfcDocumentStatusEnum v);
-IfcDocumentStatusEnum FromString(const std::string& s);
+/// HISTORY New entity in IFC Release 1.0, has been renamed from IfcProxyEnum in IFC 2x.
+typedef enum {IfcObjectType_PRODUCT, IfcObjectType_PROCESS, IfcObjectType_CONTROL, IfcObjectType_RESOURCE, IfcObjectType_ACTOR, IfcObjectType_GROUP, IfcObjectType_PROJECT, IfcObjectType_NOTDEFINED} IfcObjectTypeEnum;
+const char* ToString(IfcObjectTypeEnum v);
+IfcObjectTypeEnum FromString(const std::string& s);
 }
-namespace IfcDoorPanelOperationEnum {
-/// This enumeration defines the basic ways how individual door panels operate as shown in Figure 164.
-/// HISTORY New Enumeration in IFC Release 2.0.
-/// IFC2x4 CHANGE Enumerator FIXEDPANELadded.
+namespace IfcObjectiveEnum {
+/// IfcObjectiveEnum is an enumeration used to determine the objective for which purpose the constraint needs to be satisfied. 
 /// 
-/// Swinging
+/// HISTORY: IFC2x4 CHANGE: Extended to include CODEWAIVER.
 /// 
-/// DoubleActing
+/// Enumeration 
 /// 
-/// Sliding
+/// Value 
+///   Definition 
 /// 
-/// Folding
+/// CODECOMPLIANCE 
+///   A constraint whose objective is to ensure satisfaction of a code compliance provision. 
 /// 
-/// Revolving
+/// CODEWAIVER 
+///   A constraint whose objective is to identify an agreement that code compliance requirements (the waiver) will not be enforced. 
 /// 
-/// Rollingup
+/// DESIGNINTENT 
+///   A constraint whose objective is to ensure satisfaction of a design intent provision. 
 /// 
-/// FixedPanel
+/// HEALTHANDSAFETY 
+///   A constraint whose objective is to ensure satisfaction of a health and safety provision. 
 /// 
-/// NOTE Enumerator added in IFC2x4.
+/// REQUIREMENT 
+///   A constraint whose objective is to ensure satisfaction of a project requirement provision. 
 /// 
-/// UserDefined
-///  
+/// SPECIFICATION 
+///   A constraint whose objective is to ensure satisfaction of a specification provision. 
 /// 
-/// NotDefined
-///  
+/// TRIGGERCONDITION 
+///   A constraint whose objective is to indicate a limiting value beyond which the condition of an object requires a particular form of attention.
+typedef enum {IfcObjective_CODECOMPLIANCE, IfcObjective_CODEWAIVER, IfcObjective_DESIGNINTENT, IfcObjective_EXTERNAL, IfcObjective_HEALTHANDSAFETY, IfcObjective_MERGECONFLICT, IfcObjective_MODELVIEW, IfcObjective_PARAMETER, IfcObjective_REQUIREMENT, IfcObjective_SPECIFICATION, IfcObjective_TRIGGERCONDITION, IfcObjective_USERDEFINED, IfcObjective_NOTDEFINED} IfcObjectiveEnum;
+const char* ToString(IfcObjectiveEnum v);
+IfcObjectiveEnum FromString(const std::string& s);
+}
+namespace IfcOccupantTypeEnum {
+/// IfcOccupantTypeEnum defines the types of occupant from which the type required can be selected. 
+///   HISTORY: New Enumeration in IFC Release 2.0 Modified in IFC 2x2 
+///   Enumeration: 
 /// 
-/// Figure 164 — Door operations
+/// ASSIGNEE: Actor receiving the assignment of a property agreement from an assignor  
+/// ASSIGNOR: Actor assigning a property agreement to an assignor  
+/// LESSEE: Actor receiving the lease of a property from a lessor  
+/// LESSOR: Actor leasing a property to a lessee  
+/// LETTINGAGENT: Actor participating in a property agreement on behalf of an owner, lessor or assignor  
+/// OWNER: Actor that owns a property  
+/// TENANT: Actor renting the use of a property fro a period of time  
+/// USERDEFINED: User-defined type.  
+/// NOTDEFINED: Undefined type.
+typedef enum {IfcOccupantType_ASSIGNEE, IfcOccupantType_ASSIGNOR, IfcOccupantType_LESSEE, IfcOccupantType_LESSOR, IfcOccupantType_LETTINGAGENT, IfcOccupantType_OWNER, IfcOccupantType_TENANT, IfcOccupantType_USERDEFINED, IfcOccupantType_NOTDEFINED} IfcOccupantTypeEnum;
+const char* ToString(IfcOccupantTypeEnum v);
+IfcOccupantTypeEnum FromString(const std::string& s);
+}
+namespace IfcOpeningElementTypeEnum {
+/// Definition from IAI: An enumeration defining the basic
+/// types for opening elements.
 /// 
-/// The opening direction of the door panels is given by the local
-/// placement of the IfcDoor. The positive y-axis determines
-/// the direction as shown in Figure 165.
+/// HISTORY New enumeration type in
+/// IFC2x4.
 /// 
-/// Figure 165 — Door panel operations
+/// Enumeration
 /// 
-/// NOTE  Figures (symbolic representation) depend on the national building code.  These figures are only shown as illustrations
-typedef enum {IfcDoorPanelOperation_SWINGING, IfcDoorPanelOperation_DOUBLE_ACTING, IfcDoorPanelOperation_SLIDING, IfcDoorPanelOperation_FOLDING, IfcDoorPanelOperation_REVOLVING, IfcDoorPanelOperation_ROLLINGUP, IfcDoorPanelOperation_FIXEDPANEL, IfcDoorPanelOperation_USERDEFINED, IfcDoorPanelOperation_NOTDEFINED} IfcDoorPanelOperationEnum;
-const char* ToString(IfcDoorPanelOperationEnum v);
-IfcDoorPanelOperationEnum FromString(const std::string& s);
+/// OPENING: An opening as subtraction
+/// feature that cuts through the element it voids. It thereby
+/// creates a hole. An opening in addiion have a particular meaning
+/// for either providing a void for doors or windows, or an opening
+/// to permit flow of air and passing of light,
+/// RECESS: A opening as subtraction
+/// feature that does not cut through the element it voids. It
+/// creates a niche or similar voiding pattern.
+/// USERDEFINED: User-defined opening
+/// element
+/// NOTDEFINED: Undefined opening
+/// element
+typedef enum {IfcOpeningElementType_OPENING, IfcOpeningElementType_RECESS, IfcOpeningElementType_USERDEFINED, IfcOpeningElementType_NOTDEFINED} IfcOpeningElementTypeEnum;
+const char* ToString(IfcOpeningElementTypeEnum v);
+IfcOpeningElementTypeEnum FromString(const std::string& s);
 }
-namespace IfcDoorPanelPositionEnum {
-/// Definition: This enumeration defines the basic ways to describe the location of a door panel within a door lining.
+namespace IfcOutletTypeEnum {
+/// The IfcOutletTypeEnum defines the range of different types of outlet that can be specified. 
 /// 
-/// HISTORY New Enumeration in IFC Release 2.x
+/// HISTORY: New type in IFC 2x. Telephone and Data outlets added in IFC 2x4
 /// 
-/// Figure 166 shows the designation of a door panel with PanelPosition = LEFT and a door panel with PanelPosition = RIGHT within a door style with OperationType = DOUBLE_DOOR_SINGLE_SWING. The position is given as shown in the XZ plane of the local placement, looking into the direction of the positive Y axis. 
+/// Enumeration 
 /// 
-/// Figure 166 — Door panel positions
-typedef enum {IfcDoorPanelPosition_LEFT, IfcDoorPanelPosition_MIDDLE, IfcDoorPanelPosition_RIGHT, IfcDoorPanelPosition_NOTDEFINED} IfcDoorPanelPositionEnum;
-const char* ToString(IfcDoorPanelPositionEnum v);
-IfcDoorPanelPositionEnum FromString(const std::string& s);
+/// AUDIOVISUALOUTLET: An outlet used for an audio or visual device. 
+/// COMMUNICATIONSOUTLET: An outlet used for connecting communications equipment. 
+/// POWEROUTLET: An outlet used for connecting electrical devices requiring power.  
+/// DATAOUTLET: An outlet used for connecting data communications equipment. 
+/// TELEPHONEOUTLET: An outlet used for connecting telephone communications equipment.  
+/// USERDEFINED: User-defined type. 
+/// NOTDEFINED: Undefined type.
+typedef enum {IfcOutletType_AUDIOVISUALOUTLET, IfcOutletType_COMMUNICATIONSOUTLET, IfcOutletType_POWEROUTLET, IfcOutletType_DATAOUTLET, IfcOutletType_TELEPHONEOUTLET, IfcOutletType_USERDEFINED, IfcOutletType_NOTDEFINED} IfcOutletTypeEnum;
+const char* ToString(IfcOutletTypeEnum v);
+IfcOutletTypeEnum FromString(const std::string& s);
 }
-namespace IfcDoorStyleConstructionEnum {
-/// Definition from IAI: This enumeration defines the
-///   basic types of construction of doors. The construction type
-///   relates to the main material (or material combination) used
-///   for making the door.
+namespace IfcPerformanceHistoryTypeEnum {
+/// This enumeration is used to identify the primary purpose of performance history.  The IfcPerformanceHistoryTypeEnum contains the following:
 /// 
-/// HISTORY New Enumeration in
-///   IFC Release 2x .
-typedef enum {IfcDoorStyleConstruction_ALUMINIUM, IfcDoorStyleConstruction_HIGH_GRADE_STEEL, IfcDoorStyleConstruction_STEEL, IfcDoorStyleConstruction_WOOD, IfcDoorStyleConstruction_ALUMINIUM_WOOD, IfcDoorStyleConstruction_ALUMINIUM_PLASTIC, IfcDoorStyleConstruction_PLASTIC, IfcDoorStyleConstruction_USERDEFINED, IfcDoorStyleConstruction_NOTDEFINED} IfcDoorStyleConstructionEnum;
-const char* ToString(IfcDoorStyleConstructionEnum v);
-IfcDoorStyleConstructionEnum FromString(const std::string& s);
+/// USERDEFINED: User-defined.
+/// NOTDEFINED: Undefined.
+/// 
+/// HISTORY: New enumeration in IFC2x4
+typedef enum {IfcPerformanceHistoryType_USERDEFINED, IfcPerformanceHistoryType_NOTDEFINED} IfcPerformanceHistoryTypeEnum;
+const char* ToString(IfcPerformanceHistoryTypeEnum v);
+IfcPerformanceHistoryTypeEnum FromString(const std::string& s);
 }
-namespace IfcDoorStyleOperationEnum {
-/// This enumeration defines the basic ways to describe how doors operate as shown in Figure 167.
-/// HISTORY  New Enumeration in Release IFC2x.
+namespace IfcPermeableCoveringOperationEnum {
+/// Definition: Enumeration defining the valid types of permeable coverings. 
 /// 
-/// Enumerator
-///   Description
-///   Figure
+/// Enumeration:
 /// 
-/// SINGLE_SWING_LEFT
+/// GRILL 
+///   protective screen of metal bars or wires
 /// 
-/// Door with one
-/// panel that opens (swings) to the
-/// left. The hinges are on the left side as viewed in the direction of the
-/// positive y-axis.
-///   Note: Direction of swing (whether
-/// in or out)
-/// is determined at the IfcDoor.
+/// LOUVER 
+///   set of fixed or movable strips of wood, metal, etc. arranged to let
+///   air in while keeping light or rain out
 /// 
-/// SINGLE_SWING_RIGHT
+/// SCREEN 
+///   upright, fixed or movable, sometimes folding framework used for
+///   protection against heat, light, access or similar
 /// 
-/// Door with one
-/// panel that opens (swings) to the
-/// right. The hinges are on the right side as viewed in the direction of
-/// the positive y-axis.
-///   Note: Direction of swing (whether
-/// in or out)
-/// is determined at the IfcDoor.
+/// USERDEFINED 
+///   user defined permeable covering type
 /// 
-/// DOUBLE_DOOR_
-/// SINGLE_SWING
+/// NOTDEFINED 
+///   no information available
 /// 
-/// Door with two
-/// panels, one opens (swings) to the
-/// left the other opens (swings) to the right.
-///   Note: Direction of swing (whether
-/// in or out)
-/// is determined at the IfcDoor. 
+/// HISTORY: New Enumeration in IFC Release 2.0
+typedef enum {IfcPermeableCoveringOperation_GRILL, IfcPermeableCoveringOperation_LOUVER, IfcPermeableCoveringOperation_SCREEN, IfcPermeableCoveringOperation_USERDEFINED, IfcPermeableCoveringOperation_NOTDEFINED} IfcPermeableCoveringOperationEnum;
+const char* ToString(IfcPermeableCoveringOperationEnum v);
+IfcPermeableCoveringOperationEnum FromString(const std::string& s);
+}
+namespace IfcPermitTypeEnum {
+/// IfcPermitTypeEnum defines the types of permits that can be granted. 
+///   HISTORY: New Enumeration in IFC2x4. 
+///   Enumeration: 
 /// 
-/// DOUBLE_SWING_LEFT
+/// ACCESS: Enables access to an identified area. 
+/// BUILDING: Enables work to proceed by getting regulatory permissions. 
+/// WORK: Enables work to be carried out in an identified area. 
+/// USERDEFINED: User-defined type. 
+/// NOTDEFINED: Undefined type.
+typedef enum {IfcPermitType_ACCESS, IfcPermitType_BUILDING, IfcPermitType_WORK, IfcPermitType_USERDEFINED, IfcPermitType_NOTDEFINED} IfcPermitTypeEnum;
+const char* ToString(IfcPermitTypeEnum v);
+IfcPermitTypeEnum FromString(const std::string& s);
+}
+namespace IfcPhysicalOrVirtualEnum {
+/// Definition from IAI: This enumeration defines the
+///   different types of space boundaries in terms of its
+///   physical manifestation. A space boundary can either be
+///   physically dividing or can be a virtual divider.
 /// 
-/// Door with one
-/// panel that swings in both
-/// directions and to the left in the main trafic direction. Also called
-/// double acting door.
-///   Note: Direction of main swing
-/// (whether in or
-/// out) is determined at the IfcDoor. 
+/// Enumeration:
 /// 
-/// DOUBLE_SWING_RIGHT
+/// PHYSICAL
 /// 
-/// Door with one
-/// panel that swings in both
-/// directions and to the right in the main trafic direction. Also called
-/// double acting door.
-///   Note: Direction of main swing
-/// (whether in or
-/// out) is determined at the IfcDoor.
+/// The space boundary is provided physically, i.e. by an
+///   physical element.
 /// 
-/// DOUBLE_DOOR_
-/// DOUBLE_SWING
+/// VIRTUAL
 /// 
-/// Door with two
-/// panels, one swings in both
-/// directions and to the right in the main trafic direction the other
-/// swings also in both directions and to the left in the main trafic
-/// direction.
-///   Note: Direction of main swing
-/// (whether in or
-/// out) is determined at the IfcDoor.
+/// The space boundary is provided virtually, i.e. by a
+///   logical divider that has no physical manifestation.
 /// 
-/// DOUBLE_DOOR_
-/// SINGLE_SWING_
-/// OPPOSITE_LEFT
+/// NOTDEFINED
 /// 
-/// Door with two
-/// panels that both open to the left,
-/// one panel swings in one direction and the other panel swings in the
-/// opposite direction.
-///   Note: Direction of main swing
-/// (whether in or
-/// out) is determined at the IfcDoor.
+/// No information available.
 /// 
-/// DOUBLE_DOOR_
-/// SINGLE_SWING_
-/// OPPOSITE_RIGHT
-///   Door with two
-/// panels that both open to the right,
-/// one panel swings in one direction and the other panel swings in the
-/// opposite direction.
-///   Note: Direction of main swing
-/// (whether in or
-/// out) is determined at the IfcDoor.
+/// HISTORY: New enumeration in
+///   IFC Release 2.0
+typedef enum {IfcPhysicalOrVirtual_PHYSICAL, IfcPhysicalOrVirtual_VIRTUAL, IfcPhysicalOrVirtual_NOTDEFINED} IfcPhysicalOrVirtualEnum;
+const char* ToString(IfcPhysicalOrVirtualEnum v);
+IfcPhysicalOrVirtualEnum FromString(const std::string& s);
+}
+namespace IfcPileConstructionEnum {
+/// Definition from IAI: Enumeration defining the construction type
+///   for piles. The type is mainly based on how the piles are used and manufactured.
+///   Some material information is mixed in because this affects the way the piles
+///   are used.  
 /// 
-/// SLIDING_TO_LEFT
+/// HISTORY New type in IFC Release 2x2
 /// 
-/// Door with one
-/// panel that is sliding to the left. 
+/// ENUMERATION 
 /// 
-/// SLIDING_TO_RIGHT
-/// 
-/// Door with one
-/// panel that is sliding to the right. 
-/// 
-/// DOUBLE_DOOR_SLIDING
+/// CAST_IN_PLACE Piles and piers that are excavated and poured in
+///   place. 
+///   COMPOSITE Piles that are a mix of components, such as a steel
+///   outer casing which is driven into the ground with a cast-in-place concrete
+///   core. 
+///   PRECAST_CONCRETE Piles that are entirely of precast concrete
+///   (possibly with some steel or other fixtures). 
+///   PREFAB_STEEL Prefabricated piles made entirely out of steel.
+///   It will also include steel sheet piles where these are not part of another
+///   construction element. 
+///   USERDEFINED Special types of pile construction which meet
+///   specific local requirements. 
+///   NOTDEFINED The type of pile construction is not defined.
+typedef enum {IfcPileConstruction_CAST_IN_PLACE, IfcPileConstruction_COMPOSITE, IfcPileConstruction_PRECAST_CONCRETE, IfcPileConstruction_PREFAB_STEEL, IfcPileConstruction_USERDEFINED, IfcPileConstruction_NOTDEFINED} IfcPileConstructionEnum;
+const char* ToString(IfcPileConstructionEnum v);
+IfcPileConstructionEnum FromString(const std::string& s);
+}
+namespace IfcPileTypeEnum {
+/// Definition from IAI: Enumeration defining the pile type. 
 /// 
-/// Door with two
-/// panels, one is sliding to the left
-/// the other is sliding to the right. 
+/// HISTORY New type in IFC Release 2x2
+/// IFC 2x4 change:  Items BORED, DRIVEN, JETGROUTING added
 /// 
-/// FOLDING_TO_LEFT
+/// BORED A bore pile.
+///   DRIVEN A rammed, vibrated, or otherwise driven pile.
+///   JETGROUTING An injected pile-like construction.
+///   COHESION A cohesion pile.
+///   FRICTION A friction pile.
+///   SUPPORT A support pile.
+///   USERDEFINED The type of pile function is user defined.
+///   NOTDEFINED The type of pile function is not defined.
+typedef enum {IfcPileType_BORED, IfcPileType_DRIVEN, IfcPileType_JETGROUTING, IfcPileType_COHESION, IfcPileType_FRICTION, IfcPileType_SUPPORT, IfcPileType_USERDEFINED, IfcPileType_NOTDEFINED} IfcPileTypeEnum;
+const char* ToString(IfcPileTypeEnum v);
+IfcPileTypeEnum FromString(const std::string& s);
+}
+namespace IfcPipeFittingTypeEnum {
+/// This enumeration is used to identify the primary purpose of a pipe fitting. This is a very basic categorization mechanism
+///   to generically identify the pipe fitting type. Subcategories
+///   of pipe fittings are not enumerated. 
+///   The IfcpipeFittingTypeEnum contains the following:
 /// 
-/// Door with one
-/// panel that is folding to the left. 
+/// BEND:		A fitting with typically two ports used to change 
+///   the direction of flow between connected elements.
+///   CONNECTOR:   Connector fitting, typically used to join two
+///   ports together within a flow distribution system 
+///   (e.g., a coupling used to join two pipe segments).
+///   ENTRY:       Entry fitting, typically unconnected at one port
+///   and connected to a flow distribution system at 
+///   the other (e.g., a breeching inlet).
+///   EXIT:        Exit fitting, typically unconnected at one port
+///   and connected to a flow distribution system at 
+///   the other (e.g., a hose bibb).
+///   JUNCTION:	A fitting with typically more than two ports used
+///   to redistribute flow among the ports and/or to
+///   change the direction of flow between connected
+///   elements (e.g, tee, cross, wye, etc.).
+///   OBSTRUCTION: A fitting with typically two ports used to 
+///   obstruct or restrict flow between the connected
+///   elements (e.g., screen, perforated plate, etc.).
+///   TRANSITION:	A fitting with typically two ports having
+///   different shapes or sizes. Can also be used to
+///   change the direction of flow between connected
+///   elements.
+///   USERDEFINED: User-defined fitting.
+///   NOTDEFINED:  Undefined fitting.
 /// 
-/// FOLDING_TO_RIGHT
-///   Door with one
-/// panel that is folding to the right. 
+/// HISTORY: New enumeration in IFC 2x2
+typedef enum {IfcPipeFittingType_BEND, IfcPipeFittingType_CONNECTOR, IfcPipeFittingType_ENTRY, IfcPipeFittingType_EXIT, IfcPipeFittingType_JUNCTION, IfcPipeFittingType_OBSTRUCTION, IfcPipeFittingType_TRANSITION, IfcPipeFittingType_USERDEFINED, IfcPipeFittingType_NOTDEFINED} IfcPipeFittingTypeEnum;
+const char* ToString(IfcPipeFittingTypeEnum v);
+IfcPipeFittingTypeEnum FromString(const std::string& s);
+}
+namespace IfcPipeSegmentTypeEnum {
+/// This enumeration is used to identify the primary purpose of a
+///   pipe segment. This is a very basic categorization mechanism
+///   to generically identify the pipe segment type. Subcategories
+///   of pipe segments are not enumerated. 
+///   The IfcPipeSegmentTypeEnum contains the following:
 /// 
-/// DOUBLE_DOOR_FOLDING
+/// CULVERT: A covered channel or large pipe that forms a watercourse below ground level, usually under a road or railway.
+///   RIGIDSEGMENT: A rigid segment is continuous linear segment of pipe that cannot be deformed.
+///   FLEXIBLESEGMENT:  A flexible segment is a continuous non-linear segment of pipe that can be deformed and change the direction of flow.
+///   GUTTER: A gutter segment is a continuous open-channel segment of pipe.
+///   SPOOL: A type of rigid segment that is typically shorter and used for providing connectivity within a piping network.
+///   USERDEFINED: User-defined segment.
+///   NOTDEFINED:  Undefined segment.
 /// 
-/// Door with two
-/// panels, one is folding to the left
-/// the other is folding to the right. 
+/// HISTORY: New enumeration in IFC 2x2
+typedef enum {IfcPipeSegmentType_CULVERT, IfcPipeSegmentType_FLEXIBLESEGMENT, IfcPipeSegmentType_RIGIDSEGMENT, IfcPipeSegmentType_GUTTER, IfcPipeSegmentType_SPOOL, IfcPipeSegmentType_USERDEFINED, IfcPipeSegmentType_NOTDEFINED} IfcPipeSegmentTypeEnum;
+const char* ToString(IfcPipeSegmentTypeEnum v);
+IfcPipeSegmentTypeEnum FromString(const std::string& s);
+}
+namespace IfcPlateTypeEnum {
+/// Definition from IAI: This enumeration
+/// defines the different types of planar elements an IfcPlateType
+/// object can fulfill:
 /// 
-/// REVOLVING
+/// CURTAIN_PANEL: A planar element within a
+/// curtain wall, often consisting of a frame with fixed glazing.
+///   SHEET: A planar, flat and thin element,
+/// comes usually as metal sheet, and is often used as an additonal part
+/// within an assembly.
+///   USERDEFINED: User-defined linear element.
+///   NOTDEFINED: Undefined linear element
 /// 
-/// An entrance door
-/// consisting of four leaves set in
-/// a form of a cross and revolving around a central vertical axis (the
-/// four panels are described by a single IfcDoor panel
-/// property). 
+/// HISTORY  New Enumeration in Release IFC2x Edition 2. 
+/// IFC2x
+/// Edition 3
+/// CHANGE  The additional identifiers CURTAIN_PANEL, SHEET have
+/// been
+/// added.
+typedef enum {IfcPlateType_CURTAIN_PANEL, IfcPlateType_SHEET, IfcPlateType_USERDEFINED, IfcPlateType_NOTDEFINED} IfcPlateTypeEnum;
+const char* ToString(IfcPlateTypeEnum v);
+IfcPlateTypeEnum FromString(const std::string& s);
+}
+namespace IfcProcedureTypeEnum {
+/// The IfcProcedureTypeEnum defines the range of different types of procedure that can be specified.
 /// 
-/// ROLLINGUP
+/// HISTORY: New type in IFC2x2
 /// 
-/// Door that opens
-/// by rolling up.
-///   Note: Whether it rolls up to the
-/// inside or
-/// outside is determined at the IfcDoor.
+/// Enumeration:
 /// 
+/// ADVICE_CAUTION: A caution that should be taken note of as a procedure or when carrying out a procedure
+/// ADVICE_NOTE: Additional information or advice that should be taken note of as a procedure or when carrying out a procedure
+/// ADVICE_WARNING: A warning of potential danger that should be taken note of as a procedure or when carrying out a procedure
+/// CALIBRATION: A procedure undertaken to calibrate an artifact
+/// SHUTDOWN: A procedure undertaken to shutdown the operation an artifact
+/// STARTUP: A procedure undertaken to start up the operation an artifact
 /// USERDEFINED
-///   User defined
-/// operation type
-///    
-/// 
 /// NOTDEFINED
-///   A door with a
-/// not defined operation type is
-/// considered as a door with a lining, but no panels. It is thereby always
-/// open.
-///    
+typedef enum {IfcProcedureType_ADVICE_CAUTION, IfcProcedureType_ADVICE_NOTE, IfcProcedureType_ADVICE_WARNING, IfcProcedureType_CALIBRATION, IfcProcedureType_DIAGNOSTIC, IfcProcedureType_SHUTDOWN, IfcProcedureType_STARTUP, IfcProcedureType_USERDEFINED, IfcProcedureType_NOTDEFINED} IfcProcedureTypeEnum;
+const char* ToString(IfcProcedureTypeEnum v);
+IfcProcedureTypeEnum FromString(const std::string& s);
+}
+namespace IfcProfileTypeEnum {
+/// The enumeration defines whether the definition of a profile shape shall be geometrically resolved into a curve or into a surface.
 /// 
-/// Figure 167 — Door style operations
+/// HISTORY: New type in IFC 1.5.
 /// 
-/// NOTE
+/// Enumeration values:
 /// 
-/// Figures are shown in the ground view.
-///   Figures (symbolic representation) depend on the national
-/// building
-/// code.
-///   These figures are only shown as illustrations, the actual
-/// representation in the ground view might differ. 
-///   Open to the outside is declared as open into the direction
-/// of the
-/// positive y-axis, determined by the ObjectPlacement
-/// at IfcDoor
-///   The location of the panel relative to the wall thickness is
-/// defined by the ObjectPlacement at IfcDoor,
-/// and the IfcDoorLiningProperties.LiningOffset
-/// parameter.
-typedef enum {IfcDoorStyleOperation_SINGLE_SWING_LEFT, IfcDoorStyleOperation_SINGLE_SWING_RIGHT, IfcDoorStyleOperation_DOUBLE_DOOR_SINGLE_SWING, IfcDoorStyleOperation_DOUBLE_DOOR_SINGLE_SWING_OPPOSITE_LEFT, IfcDoorStyleOperation_DOUBLE_DOOR_SINGLE_SWING_OPPOSITE_RIGHT, IfcDoorStyleOperation_DOUBLE_SWING_LEFT, IfcDoorStyleOperation_DOUBLE_SWING_RIGHT, IfcDoorStyleOperation_DOUBLE_DOOR_DOUBLE_SWING, IfcDoorStyleOperation_SLIDING_TO_LEFT, IfcDoorStyleOperation_SLIDING_TO_RIGHT, IfcDoorStyleOperation_DOUBLE_DOOR_SLIDING, IfcDoorStyleOperation_FOLDING_TO_LEFT, IfcDoorStyleOperation_FOLDING_TO_RIGHT, IfcDoorStyleOperation_DOUBLE_DOOR_FOLDING, IfcDoorStyleOperation_REVOLVING, IfcDoorStyleOperation_ROLLINGUP, IfcDoorStyleOperation_USERDEFINED, IfcDoorStyleOperation_NOTDEFINED} IfcDoorStyleOperationEnum;
-const char* ToString(IfcDoorStyleOperationEnum v);
-IfcDoorStyleOperationEnum FromString(const std::string& s);
+/// CURVE: The resulting geometric item is of type curve and closed (with the only exception of the curve created by the IfcArbitraryOpenProfileDef which resolves into an open curve). The resulting geometry after applying a sweeping operation is a swept surface. This can be used to define shapes with thin sheets, such as ducts, where the thickness is not appropriate for geometric representation.
+/// AREA: The resulting geometric item is of type surface. The resulting geometry after applying a sweeping operation is a swept solid with defined volume.
+typedef enum {IfcProfileType_CURVE, IfcProfileType_AREA} IfcProfileTypeEnum;
+const char* ToString(IfcProfileTypeEnum v);
+IfcProfileTypeEnum FromString(const std::string& s);
 }
-namespace IfcDoorTypeEnum {
-/// Definition from IAI: This enumeration defines the
-/// different predefined types of an IfcDoorType object can
-/// fulfill:
-/// 
-/// DOOR: A standard door usually within a wall opening,
-/// as a door panel in a curtain wall, or as a "free standing"
-/// door.
-/// GATE: A gate is a point of entry to a property usually
-/// within an opening in a fence. Or as a "free standing" gate.
-/// TRAPDOOR: A special door that lies horizonally in a
-/// slab opening. Often used for accessing cellar or attic.
-/// USERDEFINED: User-defined linear beam element.
-/// NOTDEFINED: Undefined linear beam element
+namespace IfcProjectOrderTypeEnum {
+/// An IfcProjectOrderTypeEnum is a list of the types of project order that may be identified. 
+///   HISTORY: New type in IFC 2x2  
+///   Enumeration 
 /// 
-/// HISTORY  New Enumeration
-/// in IFC2x4.
-typedef enum {IfcDoorType_DOOR, IfcDoorType_GATE, IfcDoorType_TRAPDOOR, IfcDoorType_USERDEFINED, IfcDoorType_NOTDEFINED} IfcDoorTypeEnum;
-const char* ToString(IfcDoorTypeEnum v);
-IfcDoorTypeEnum FromString(const std::string& s);
+/// CHANGEORDER: An instruction to make a change to a product or work being undertaken and a description of the work that is to be performed. 
+/// MAINTENANCEWORKORDER: An instruction to carry out maintenance work and a description of the work that is to be performed. 
+/// MOVEORDER: An instruction to move persons and artefacts and a description of the move locations, objects to be moved, etc.  
+/// PURCHASEORDER: An instruction to purchase goods and/or services and a description of the goods and/or services to be purchased that is to be performed. 
+/// WORKORDER: A general instruction to carry out work and a description of the work to be done. Note the difference between a work order generally and a maintenance work order. 
+/// USERDEFINED: User-defined type. 
+/// NOTDEFINED: Undefined type.
+typedef enum {IfcProjectOrderType_CHANGEORDER, IfcProjectOrderType_MAINTENANCEWORKORDER, IfcProjectOrderType_MOVEORDER, IfcProjectOrderType_PURCHASEORDER, IfcProjectOrderType_WORKORDER, IfcProjectOrderType_USERDEFINED, IfcProjectOrderType_NOTDEFINED} IfcProjectOrderTypeEnum;
+const char* ToString(IfcProjectOrderTypeEnum v);
+IfcProjectOrderTypeEnum FromString(const std::string& s);
 }
-namespace IfcDoorTypeOperationEnum {
-/// This enumeration defines the basic ways to describe how doors operate, as shown in Figure 66. It combines the partitioning of the door into a single or multiple door panels and the operation types of that panels.
+namespace IfcProjectedOrTrueLengthEnum {
+/// This enumeration type is needed for load definition and is only considered if the load values are given as global actions and if they define linear or planar loads (that is, one- or two-dimensionally distributed loads).
+/// Figure 234 illustrates the interpretation of a load definition depending on the enumeration types IfcGlobalOrLocalEnum and IfcProjectedOrTrueLengthEnum.
 /// 
-/// In the most common case of swinging doors the IfcDoorTypeOperationEnum defined the hinge side (left hing or right hung) and the opening direction (opening to the left, opening to the right). Whether the door opens inwards or outwards is determined by the local coordinate system of the IfcDoor, or IfcDoorStandardCase.
+/// HISTORY  New type in IFC2x2. 
 /// 
-/// NOTE There are different definitions in various countries on what a left opening or left hung or left swing door is (same for right). Therefore the IFC definition terms may derivate from the local standard and may need to be mapped appropriately.
+/// Figure 234 — Projected or true length
+typedef enum {IfcProjectedOrTrueLength_PROJECTED_LENGTH, IfcProjectedOrTrueLength_TRUE_LENGTH} IfcProjectedOrTrueLengthEnum;
+const char* ToString(IfcProjectedOrTrueLengthEnum v);
+IfcProjectedOrTrueLengthEnum FromString(const std::string& s);
+}
+namespace IfcProjectionElementTypeEnum {
+/// Definition from IAI: An enumeration defining the basic
+/// types for projection elements.
 /// 
-/// HISTORY  New Enumeration in IFC2x4.
+/// HISTORY New enumeration type in
+/// IFC2x4.
 /// 
-/// IFC2x4 CHANGE The new IfcDoorTypeOperationEnum replaces the use of IfcDoorStyleOperationEnum that is deprecated from IFC2x4 onwards.
+/// Enumeration
 /// 
-/// Enumerator
-/// Description
-/// Figures
-///  
+/// USERDEFINED: User-defined projection
+/// element
+/// NOTDEFINED: Undefined projection
+/// element
+typedef enum {IfcProjectionElementType_USERDEFINED, IfcProjectionElementType_NOTDEFINED} IfcProjectionElementTypeEnum;
+const char* ToString(IfcProjectionElementTypeEnum v);
+IfcProjectionElementTypeEnum FromString(const std::string& s);
+}
+namespace IfcPropertySetTemplateTypeEnum {
+/// This enumeration defines the general
+/// applicability of instances of IfcPropertySet, or
+/// IfcElementQuantity defined by this
+/// IfcPropertySetTemplate, to subtypes of
+/// IfcObjectDefinition.
 /// 
-/// SINGLE_SWING_LEFT
+/// HISTORY New enumeration in IFC2x4.
 /// 
-/// Door with one panel that opens
-/// (swings) to the left. The hinges are on the left side as viewed
-/// in the direction of the positive y-axis.
-/// Note: Direction of swing (whether in or out)
-/// is determined at the IfcDoor or
-/// IfcDoorStandardCase.
+/// Enumeration
 /// 
-/// SINGLE_SWING_RIGHT
+/// PSET_TYPEDRIVENONLY: the property sets
+/// defined by this IfcPropertySetTemplate can only be assigned
+/// to subtypes of IfcTypeObject.
+/// PSET_TYPEDRIVENOVERRIDE: the property
+/// sets defined by this IfcPropertySetTemplate can be assigned
+/// to subtypes of IfcTypeObject and can be overridden by a
+/// property set with same name at subtypes of IfcObject.
+/// PSET_OCCURRENCEDRIVEN: the property sets
+/// defined by this IfcPropertySetTemplate can only be assigned
+/// to subtypes of IfcObject.
+/// PSET_PERFORMANCEDRIVEN: the property sets
+/// defined by this IfcPropertySetTemplate can only be assigned
+/// to IfcPerformanceHistory,
+/// QTO_TYPEDRIVENONLY: the element quantity
+/// defined by this IfcPropertySetTemplate can only be assigned
+/// to subtypes of IfcTypeObject.
+/// QTO_TYPEDRIVENOVERRIDE: the element
+/// quantity defined by this IfcPropertySetTemplate can be
+/// assigned to subtypes of IfcTypeObject and can be overridden
+/// by an element quantity with same name at subtypes of
+/// IfcObject.
+/// QTO_OCCURRENCEDRIVEN: the element
+/// quantity defined by this IfcPropertySetTemplate can only be
+/// assigned to subtypes of IfcObject.
+/// NOTDEFINED: No
+/// restriction provided, the property sets defined by this
+/// IfcPropertySetTemplate can be assigned to any entity, if not
+/// otherwise restricted by the ApplicableEntity attribute.
+typedef enum {IfcPropertySetTemplateType_PSET_TYPEDRIVENONLY, IfcPropertySetTemplateType_PSET_TYPEDRIVENOVERRIDE, IfcPropertySetTemplateType_PSET_OCCURRENCEDRIVEN, IfcPropertySetTemplateType_PSET_PERFORMANCEDRIVEN, IfcPropertySetTemplateType_QTO_TYPEDRIVENONLY, IfcPropertySetTemplateType_QTO_TYPEDRIVENOVERRIDE, IfcPropertySetTemplateType_QTO_OCCURRENCEDRIVEN, IfcPropertySetTemplateType_NOTDEFINED} IfcPropertySetTemplateTypeEnum;
+const char* ToString(IfcPropertySetTemplateTypeEnum v);
+IfcPropertySetTemplateTypeEnum FromString(const std::string& s);
+}
+namespace IfcProtectiveDeviceTrippingUnitTypeEnum {
+/// Defines the range of different tripping unit types that can be used in conjunction with a protective device. 
+/// HISTORY: New enumeration in IFC2x4 
 /// 
-/// Door with one panel that opens
-/// (swings) to the right. The hinges are on the right side as viewed
-/// in the direction of the positive y-axis.
-/// Note: Direction of swing (whether in or out)
-/// is determined at the IfcDoor or
-/// IfcDoorStandardCase.
+/// ELECTRONIC: A tripping unit activated by electronic action. 
+/// ELECTROMAGNETIC: A tripping unit activated by electromagnetic action. 
+/// RESIDUALCURRENT: A tripping unit activated by residual current detection. 
+/// THERMAL: A tripping unit activated by thermal action.
+typedef enum {IfcProtectiveDeviceTrippingUnitType_ELECTRONIC, IfcProtectiveDeviceTrippingUnitType_ELECTROMAGNETIC, IfcProtectiveDeviceTrippingUnitType_RESIDUALCURRENT, IfcProtectiveDeviceTrippingUnitType_THERMAL, IfcProtectiveDeviceTrippingUnitType_USERDEFINED, IfcProtectiveDeviceTrippingUnitType_NOTDEFINED} IfcProtectiveDeviceTrippingUnitTypeEnum;
+const char* ToString(IfcProtectiveDeviceTrippingUnitTypeEnum v);
+IfcProtectiveDeviceTrippingUnitTypeEnum FromString(const std::string& s);
+}
+namespace IfcProtectiveDeviceTypeEnum {
+/// The IfcProtectiveDeviceTypeEnum specifically defines the range of different breaker unit types that can be used in conjunction with protective device. Types may also be used as a reference to a complete protective device in circumstances where tripping units are not separately identified (typically expected to be the case during earlier stages of design). 
 /// 
-/// DOUBLE_DOOR_
-/// SINGLE_SWING
+/// HISTORY: New type in IFC 2x2. Modified definition and usage in IFC 2x4 
 /// 
-/// Door with two panels, one opens
-/// (swings) to the left the other opens (swings) to the right.
-/// Note: Direction of swing (whether in or out)
-/// is determined at the IfcDoor or
-/// IfcDoorStandardCase. 
+/// Enumeration
 /// 
-/// DOUBLE_SWING_LEFT
+/// FUSEDISCONNECTOR: A device that will electrically open the circuit after a period of prolonged, abnormal current flow.
+/// CIRCUITBREAKER: A mechanical switching device capable of making, carrying, and breaking currents under normal circuit conditions and also making, carrying for a specified time and breaking, current under specified abnormal circuit conditions such as those of short circuit.
+/// EARTHINGSWITCH: A safety device used to open or close a circuit when there is no current. Used to isolate a part of a circuit, a machine, a part of an overhead line or an underground line so that maintenance can be safely conducted.
+/// EARTHLEAKAGECIRCUITBREAKER: A device that opens, closes, or isolates a circuit and has short circuit protection but no overload protection.  It attempts to break the circuit when there is a leakage of current from phase to earth, by measuring voltage on the earth conductor.
+/// RESIDUALCURRENTCIRCUITBREAKER: A device that opens, closes, or isolates a circuit and has short circuit and overload protection.  It attempts to break the circuit when there is a difference in current between any two phases.  May also be referred to as 'Ground Fault Interupter (GFI)' or 'Ground Fault Circuit Interuptor (GFCI)'
+/// RESIDUALCURRENTSWITCH: A device that opens, closes or isolates a circuit and has no short circuit or overload protection.  May also be identified as a 'ground fault switch'.
+/// VARISTOR: A high voltage surge protection device.
+/// USERDEFINED: User-defined type.
+/// NOTDEFINED: Undefined type.
+typedef enum {IfcProtectiveDeviceType_CIRCUITBREAKER, IfcProtectiveDeviceType_EARTHLEAKAGECIRCUITBREAKER, IfcProtectiveDeviceType_EARTHINGSWITCH, IfcProtectiveDeviceType_FUSEDISCONNECTOR, IfcProtectiveDeviceType_RESIDUALCURRENTCIRCUITBREAKER, IfcProtectiveDeviceType_RESIDUALCURRENTSWITCH, IfcProtectiveDeviceType_VARISTOR, IfcProtectiveDeviceType_USERDEFINED, IfcProtectiveDeviceType_NOTDEFINED} IfcProtectiveDeviceTypeEnum;
+const char* ToString(IfcProtectiveDeviceTypeEnum v);
+IfcProtectiveDeviceTypeEnum FromString(const std::string& s);
+}
+namespace IfcPumpTypeEnum {
+/// Defines general types of pumps.
 /// 
-/// Door with one panel that swings in
-/// both directions and to the left in the main trafic direction.
-/// Also called double acting door.
-/// Note: Direction of main swing (whether in or
-/// out) is determined at the IfcDoor or
-/// IfcDoorStandardCase. 
+/// The IfcPumpTypeEnum contains the following:
 /// 
-/// DOUBLE_SWING_RIGHT
+/// CIRCULATOR: A Circulator pump is a generic low-pressure, low-capacity pump. It may have a wet rotor and
+///   may be driven by a flexible-coupled motor.
 /// 
-/// Door with one panel that swings in
-/// both directions and to the right in the main trafic direction.
-/// Also called double acting door.
-/// Note: Direction of main swing (whether in or
-/// out) is determined at the IfcDoor or
-/// IfcDoorStandardCase.
+/// ENDSUCTION: An End Suction pump, when mounted horizontally, has a single horizontal inlet on the impeller suction side
+///   and a vertical discharge. It may have a direct or close-coupled motor.
 /// 
-/// DOUBLE_DOOR_
-/// DOUBLE_SWING
+/// SPLITCASE: A Split Case pump, when mounted horizontally, has an inlet and outlet on each side of the impeller.
+///   The impeller can be easily accessed by removing the front of the impeller casing. It may have a direct or close-coupled motor.
 /// 
-/// Door with two panels, one swings in
-/// both directions and to the right in the main trafic direction the
-/// other swings also in both directions and to the left in the main
-/// trafic direction.
-/// Note: Direction of main swing (whether in or
-/// out) is determined at the IfcDoor or
-/// IfcDoorStandardCase.
+/// SUBMERSIBLEPUMP: A pump designed to be immersed in a fluid, typically a collection tank.
 /// 
-/// DOUBLE_DOOR_
-/// SINGLE_SWING_
-/// OPPOSITE_LEFT
+/// SUMPPUMP: A pump designed to sit above a collection tank with a suction inlet extending into the tank.
 /// 
-/// Door with two panels that both open
-/// to the left, one panel swings in one direction and the other
-/// panel swings in the opposite direction.
-/// Note: Direction of main swing (whether in or
-/// out) is determined at the IfcDoor or
-/// IfcDoorStandardCase.
+/// VERTICALINLINE: A Vertical Inline pump has the pump and motor close-coupled on the pump casing.
+///   The pump depends on the connected, horizontal piping for support, with the suction and discharge along the piping axis.
 /// 
-///  
-///  
+/// VERTICALTURBINE: A Vertical Turbine pump has a motor mounted vertically on the pump casing for either
+///   wet-pit sump mounting or dry-well mounting.
 /// 
-/// DOUBLE_DOOR_
-/// SINGLE_SWING_
-/// OPPOSITE_RIGHT
-/// Door with two panels that both open
-/// to the right, one panel swings in one direction and the other
-/// panel swings in the opposite direction.
-/// Note: Direction of main swing (whether in or
-/// out) is determined at the IfcDoor or
-/// IfcDoorStandardCase.
+/// USERDEFINED: User-defined pump type.
 /// 
-///  
-///  
+/// NOTDEFINED:  Pump type has not been defined.
 /// 
-/// SLIDING_TO_LEFT
+/// HISTORY: New enumeration in IFC R2x.  SUBMERSIBLEPUMP and SUMPPUMP added in IFC2x4.
+typedef enum {IfcPumpType_CIRCULATOR, IfcPumpType_ENDSUCTION, IfcPumpType_SPLITCASE, IfcPumpType_SUBMERSIBLEPUMP, IfcPumpType_SUMPPUMP, IfcPumpType_VERTICALINLINE, IfcPumpType_VERTICALTURBINE, IfcPumpType_USERDEFINED, IfcPumpType_NOTDEFINED} IfcPumpTypeEnum;
+const char* ToString(IfcPumpTypeEnum v);
+IfcPumpTypeEnum FromString(const std::string& s);
+}
+namespace IfcRailingTypeEnum {
+/// Definition from IAI: Enumeration defining the valid types of
+///   railings that can be predefined using the enumeration values.  
+///   HISTORY: New Enumeration in IFC
+///   Release 2.0  
+///   Enumeration 
 /// 
-/// Door with one panel that is sliding
-/// to the left.
+/// HANDRAIL: A type of railing designed to serve as an optional
+///   structural support for loads applied by human occupants (at hand height).
+///   Generally located adjacent to ramps and stairs. Generally floor or wall
+///   mounted. 
+///   GUARDRAIL: A type of railing designed to guard human occupants
+///   from falling off a stair, ramp or landing where there is a vertical drop at the
+///   edge of such floors/landings. 
+///   BALUSTRADE: Similar to the definitions of a guardrail except
+///   the location is at the edge of a floor, rather then a stair or ramp. Examples
+///   are balustrates at roof-tops or balconies. 
+///   USERDEFINED: User-defined railing element, a term to identify
+///   the user type is given by the attribute IfcRailing.ObjectType. 
+///   NOTDEFINED: Undefined railing element, no type information
+///   available.
+typedef enum {IfcRailingType_HANDRAIL, IfcRailingType_GUARDRAIL, IfcRailingType_BALUSTRADE, IfcRailingType_USERDEFINED, IfcRailingType_NOTDEFINED} IfcRailingTypeEnum;
+const char* ToString(IfcRailingTypeEnum v);
+IfcRailingTypeEnum FromString(const std::string& s);
+}
+namespace IfcRampFlightTypeEnum {
+/// Definition from IAI: This enumeration defines the different types
+///   of linear elements an IfcRampFlightType object can fulfill: 
 /// 
-/// SLIDING_TO_RIGHT
+/// STRAIGHT: A ramp flight with a straight walking line.  
+///   SPIRAL: A ramp flight with a circular or elliptic walking
+///   line. 
+///   USERDEFINED: User-defined ramp flight. 
+///   NOTDEFINED: Undefined ramp flight. 
 /// 
-/// Door with one panel that is sliding
-/// to the right.
+/// HISTORY: New Enumeration in
+///   Release IFC2x Edition 2.
+typedef enum {IfcRampFlightType_STRAIGHT, IfcRampFlightType_SPIRAL, IfcRampFlightType_USERDEFINED, IfcRampFlightType_NOTDEFINED} IfcRampFlightTypeEnum;
+const char* ToString(IfcRampFlightTypeEnum v);
+IfcRampFlightTypeEnum FromString(const std::string& s);
+}
+namespace IfcRampTypeEnum {
+/// This enumeration defines the basic configuration of the ramp type in terms of the number and shape of ramp flights, as shown in Figure 67. The type also distinguished turns by landings. In addition the subdivision of the straight and changing direction ramps is included. The ramp configurations are given for ramps without and with one and two landings. 
 /// 
-/// DOUBLE_DOOR_SLIDING
+/// Ramps which are subdivided into more than two landings have to be defined by the geometry only. Also ramps with non-regular shapes have to be defined by the geometry only. The type of such ramps is USERDEFINED. 
 /// 
-/// Door with two panels, one is sliding
-/// to the left the other is sliding to the right.
+/// HISTORY New Enumeration in IFC Release 2.0. 
 /// 
-/// FOLDING_TO_LEFT
+/// Enumerator 
+///   Description 
+///   Figure 
 /// 
-/// Door with one panel that is folding
-/// to the left.
+/// StraightRunRamp 
+///   A ramp - which is a sloping
+///   floor, walk, or roadway - connecting two levels. The straight ramp consists of
+///   one straight flight without turns or winders.  
 /// 
-/// FOLDING_TO_RIGHT
-/// Door with one panel that is folding
-/// to the right.
+/// TwoStraightRunRamp 
+///   A straight ramp consisting of
+///   two straight flights without turns but with one landing. 
 /// 
-/// DOUBLE_DOOR_FOLDING
+/// QuarterTurnRamp 
+///   A ramp making a 90° turn,
+///   consisting of two straight flights connected by a quarterspace landing. The
+///   direction of the turn is determined by the walking line. 
 /// 
-/// Door with two panels, one is folding
-/// to the left the other is folding to the right.
+/// TwoQuarterTurnRamp 
+///   A ramp making a 180°
+///   turn, consisting of three straight flights connected by two quarterspace
+///   landings. The direction of the turn is determined by the walking line. 
 /// 
-/// REVOLVING
+/// HalfTurnRamp 
+///   A ramp making a 180°
+///   turn, consisting of two straight flights connected by a halfspace landing. The
+///   orientation of the turn is determined by the walking line. 
 /// 
-/// An entrance door consisting of four
-/// leaves set in a form of a cross and revolving around a central
-/// vertical axis (the four panels are described by a single
-/// IfcDoor panel property).
-///  
-///  
+/// SpiralRamp 
+///   A ramp constructed around a
+///   circular or elliptical well without newels and landings. 
 /// 
-/// ROLLINGUP
+/// UserDefined 
+///   Free form ramp (user defined
+///   operation type) 
+///     
 /// 
-/// Door that opens by rolling up.
-/// Note: Whether it rolls up to the inside or
-/// outside is determined at the IfcDoor.
+/// NotDefined 
+///     
+///     
 /// 
-/// SWING_FIXED_LEFT
-/// Door with one panel that opens
-/// (swings) to the left and one fixed panel. The hinges of the
-/// swinging panel are on the left side as viewed in the direction of
-/// the positive y-axis.
-/// Note: Direction of swing (whether in or out)
-/// is determined at the IfcDoor or or
-/// IfcDoorStandardCase.
-/// IFC2x4 CHANGE This is a new
-/// enumerator compared with previous
-/// IfcDoorStyleOperationEnum.
+/// Figure 67 — Ramp types
+typedef enum {IfcRampType_STRAIGHT_RUN_RAMP, IfcRampType_TWO_STRAIGHT_RUN_RAMP, IfcRampType_QUARTER_TURN_RAMP, IfcRampType_TWO_QUARTER_TURN_RAMP, IfcRampType_HALF_TURN_RAMP, IfcRampType_SPIRAL_RAMP, IfcRampType_USERDEFINED, IfcRampType_NOTDEFINED} IfcRampTypeEnum;
+const char* ToString(IfcRampTypeEnum v);
+IfcRampTypeEnum FromString(const std::string& s);
+}
+namespace IfcRecurrenceTypeEnum {
+/// IfcRecurrenceTypeEnum enumerates the recurring pattern type. The following
+///   combinations are valid:
 /// 
-/// SWING_FIXED_RIGHT
-/// Door with one panel that opens
-/// (swings) to the right and one fixed panel. The hinges of the
-/// swinging panel are on the right side as viewed in the direction
-/// of the positive y-axis.
-/// Note: Direction of swing (whether in or out)
-/// is determined at the IfcDoor or or
-/// IfcDoorStandardCase.
-/// IFC2x4 CHANGE This is a new
-/// enumerator compared with previous
-/// IfcDoorStyleOperationEnum.
+/// DAILY: Interval, Occurrences
 /// 
-/// USERDEFINED
-/// User defined operation type
-///  
-///  
+/// WEEKLY: WeekdayComponent, Interval, Occurrences
 /// 
-/// NOTDEFINED
-/// A door with a not defined operation
-/// type is considered as a door with a lining, but no panels. It is
-/// thereby always open.
+/// MONTHLY_BY_DAY_OF_MONTH: DayComponent, Interval, Occurrences
 /// 
-///  
+/// MONTHLY_BY_POSITION: WeekdayComponent, Position, Interval, Occurrences
 /// 
-/// Figure 66 — Door operations
+/// BY_DAY_COUNT: Interval, Occurrences
 /// 
-/// NOTE
+/// BY_WEEKDAY_COUNT: WeekdayComponent, Interval, Occurrences
 /// 
-/// Figures are shown in the ground view.
-/// Figures (symbolic representation) depend on the national
-/// building code.
-/// These figures are only shown as illustrations, the actual
-/// representation in the ground view might differ.
-/// Open to the outside is declared as open into the direction of
-/// the positive y-axis, determined by the ObjectPlacement at
-/// IfcDoor
-/// The location of the panel relative to the wall thickness is
-/// defined by the ObjectPlacement at IfcDoor, and the
-/// IfcDoorLiningProperties.LiningOffset parameter.
-typedef enum {IfcDoorTypeOperation_SINGLE_SWING_LEFT, IfcDoorTypeOperation_SINGLE_SWING_RIGHT, IfcDoorTypeOperation_DOUBLE_DOOR_SINGLE_SWING, IfcDoorTypeOperation_DOUBLE_DOOR_SINGLE_SWING_OPPOSITE_LEFT, IfcDoorTypeOperation_DOUBLE_DOOR_SINGLE_SWING_OPPOSITE_RIGHT, IfcDoorTypeOperation_DOUBLE_SWING_LEFT, IfcDoorTypeOperation_DOUBLE_SWING_RIGHT, IfcDoorTypeOperation_DOUBLE_DOOR_DOUBLE_SWING, IfcDoorTypeOperation_SLIDING_TO_LEFT, IfcDoorTypeOperation_SLIDING_TO_RIGHT, IfcDoorTypeOperation_DOUBLE_DOOR_SLIDING, IfcDoorTypeOperation_FOLDING_TO_LEFT, IfcDoorTypeOperation_FOLDING_TO_RIGHT, IfcDoorTypeOperation_DOUBLE_DOOR_FOLDING, IfcDoorTypeOperation_REVOLVING, IfcDoorTypeOperation_ROLLINGUP, IfcDoorTypeOperation_SWING_FIXED_LEFT, IfcDoorTypeOperation_SWING_FIXED_RIGHT, IfcDoorTypeOperation_USERDEFINED, IfcDoorTypeOperation_NOTDEFINED} IfcDoorTypeOperationEnum;
-const char* ToString(IfcDoorTypeOperationEnum v);
-IfcDoorTypeOperationEnum FromString(const std::string& s);
-}
-namespace IfcDuctFittingTypeEnum {
-/// This enumeration is used to identify the primary purpose of a duct fitting. This is a very basic categorization mechanism
-///   to generically identify the duct fitting type. Subcategories
-///   of duct fittings are not enumerated. 
-///   The IfcDuctFittingTypeEnum contains the following:
+/// YEARLY_BY_DAY_OF_MONTH: DayComponent, MonthComponent, Interval, Occurrences
 /// 
-/// BEND:		A fitting with typically two ports used to change 
-///   the direction of flow between connected elements.
-///   CONNECTOR:   Connector fitting, typically used to join two
-///   ports together within a flow distribution system 
-///   (e.g., a coupling used to join two duct segments).
-///   ENTRY:       Entry fitting, typically unconnected at one port
-///   and connected to a flow distribution system at 
-///   the other (e.g., an outside air duct system 
-///   intake opening).
-///   EXIT:        Exit fitting, typically unconnected at one port
-///   and connected to a flow distribution system at 
-///   the other (e.g., an exhaust air discharge 
-///   opening).
-///   JUNCTION:	A fitting with typically more than two ports used
-///   to redistribute flow among the ports and/or to
-///   change the direction of flow between connected
-///   elements (e.g, tee, cross, wye, etc.).
-///   OBSTRUCTION: A fitting with typically two ports used to 
-///   obstruct or restrict flow between the connected
-///   elements (e.g., screen, perforated plate, etc.).
-///   TRANSITION:	A fitting with typically two ports having
-///   different shapes or sizes. Can also be used to
-///   change the direction of flow between connected
-///   elements.
-///   USERDEFINED: User-defined fitting.
-///   NOTDEFINED:  Undefined fitting.
+/// YEARLY_BY_POSITION: WeekdayComponent, MonthComponent, Position, Interval, Occurrences
 /// 
-/// HISTORY: New enumeration in IFC 2x2
-typedef enum {IfcDuctFittingType_BEND, IfcDuctFittingType_CONNECTOR, IfcDuctFittingType_ENTRY, IfcDuctFittingType_EXIT, IfcDuctFittingType_JUNCTION, IfcDuctFittingType_OBSTRUCTION, IfcDuctFittingType_TRANSITION, IfcDuctFittingType_USERDEFINED, IfcDuctFittingType_NOTDEFINED} IfcDuctFittingTypeEnum;
-const char* ToString(IfcDuctFittingTypeEnum v);
-IfcDuctFittingTypeEnum FromString(const std::string& s);
+/// HISTORY: New enumeration in IFC
+///   Release 2x4.
+typedef enum {IfcRecurrenceType_DAILY, IfcRecurrenceType_WEEKLY, IfcRecurrenceType_MONTHLY_BY_DAY_OF_MONTH, IfcRecurrenceType_MONTHLY_BY_POSITION, IfcRecurrenceType_BY_DAY_COUNT, IfcRecurrenceType_BY_WEEKDAY_COUNT, IfcRecurrenceType_YEARLY_BY_DAY_OF_MONTH, IfcRecurrenceType_YEARLY_BY_POSITION} IfcRecurrenceTypeEnum;
+const char* ToString(IfcRecurrenceTypeEnum v);
+IfcRecurrenceTypeEnum FromString(const std::string& s);
 }
-namespace IfcDuctSegmentTypeEnum {
-/// This enumeration is used to identify the primary purpose of a
-///   duct segment. This is a very basic categorization mechanism
-///   to generically identify the duct segment type. Subcategories
-///   of duct segments are not enumerated. 
-///   The IfcDuctSegmentTypeEnum contains the following:
-/// 
-/// RIGIDSEGMENT: A rigid segment is continuous linear segment of duct
-///   that cannot be deformed.
-///   FLEXIBLESEGMENT:  A flexible segment is a continuous non-linear segment
-///   of duct that can be deformed and change the direction 
-///   of flow.
-///   USERDEFINED: User-defined segment.
-///   NOTDEFINED:  Undefined segment.
+namespace IfcReflectanceMethodEnum {
+/// The IfcReflectanceMethodEnum defines the range of different reflectance methods available. 
 /// 
-/// HISTORY: New enumeration in IFC 2x2
-typedef enum {IfcDuctSegmentType_RIGIDSEGMENT, IfcDuctSegmentType_FLEXIBLESEGMENT, IfcDuctSegmentType_USERDEFINED, IfcDuctSegmentType_NOTDEFINED} IfcDuctSegmentTypeEnum;
-const char* ToString(IfcDuctSegmentTypeEnum v);
-IfcDuctSegmentTypeEnum FromString(const std::string& s);
-}
-namespace IfcDuctSilencerTypeEnum {
-/// Enumeration defining the typical types of duct silencers. 
-///   The IfcDuctSilencerTypeEnum contains the following:
+/// HISTORY: New type in IFC 2x2.
 /// 
-/// FLATOVAL:  Flat-oval shaped duct silencer type.
-///   RECTANGULAR:  Rectangular shaped duct silencer type.
-///   ROUND:  Round duct silencer type.
-///   USERDEFINED:  User-defined duct silencer type.
-///   NOTDEFINED:  Undefined duct silencer type.
+/// Enumeration 
 /// 
-/// HISTORY: New enumeration in IFC 2x2.
-typedef enum {IfcDuctSilencerType_FLATOVAL, IfcDuctSilencerType_RECTANGULAR, IfcDuctSilencerType_ROUND, IfcDuctSilencerType_USERDEFINED, IfcDuctSilencerType_NOTDEFINED} IfcDuctSilencerTypeEnum;
-const char* ToString(IfcDuctSilencerTypeEnum v);
-IfcDuctSilencerTypeEnum FromString(const std::string& s);
+/// BLINN: A reflectance model providing a smooth, slightly shiny appearance.
+/// FLAT: A reflectance model providing a constant colour. This model ignores the effect of all light sources. 
+/// GLASS: A reflectance model that supports an approximation of glass-like materials that have both reflective and transmissive properties. 
+/// MATT: A reflectance model providing a dull matte appearance. 
+/// METAL: A reflectance model providing a specular metallic appearance. 
+/// MIRROR: A reflectance model that supports secondary mirrored views through ray tracing. 
+/// PHONG: A reflectance model conforming with the Phong model in which reflections are greatest in the `mirror' direction of a surface opposite the viewing direction with respect to the surface normal. 
+/// PLASTIC: A reflectance model providing a specular effect which is similar to the Phong model. 
+/// STRAUSS: A reflectance model for metallic and non-metallic appearance based on a limited set of control parameter.
+/// NOTDEFINED
+typedef enum {IfcReflectanceMethod_BLINN, IfcReflectanceMethod_FLAT, IfcReflectanceMethod_GLASS, IfcReflectanceMethod_MATT, IfcReflectanceMethod_METAL, IfcReflectanceMethod_MIRROR, IfcReflectanceMethod_PHONG, IfcReflectanceMethod_PLASTIC, IfcReflectanceMethod_STRAUSS, IfcReflectanceMethod_NOTDEFINED} IfcReflectanceMethodEnum;
+const char* ToString(IfcReflectanceMethodEnum v);
+IfcReflectanceMethodEnum FromString(const std::string& s);
 }
-namespace IfcElectricApplianceTypeEnum {
-/// The IfcElectricApplianceTypeEnum defines the range of different types of electrical appliance that can be specified. 
-/// 
-/// HISTORY: New type in IFC R2.0.
-///   Renamed from IfcElectricalApplianceTypeEnum if IFC 2x2.IFC 2x2 Addendum 1:
-///   Missing enumeration values added (ELECTRICHEATER, TUMBLEDRYER and
-///   WATERHEATER)
-///   IFC 2x4: ELECTRICHEATER changed to FREESTANDINGELECTRICHEATER and noted as being for occasional use. RADIANTHEATER removed as part of general 'heater consolidation'. WATERHEATER, DIRECTWATERHEATER and INDIRECTWATERHEATER rationalized to FREESTANDINGWATERHEATER. WATERCOOLER changed to FREESTANDINGWATERCOOLER.
-///   COMPUTER, FACSIMILE (FAX), PRINTER, SCANNER, TELEPHONE, TV (TELEVISION) moved to IfcAudioVisualApplianceTypeEnum and IfcCommunicationsApplianceTypeEnum. KITCHENMACHINE added.
+namespace IfcReinforcingBarRoleEnum {
+/// Definition from IAI: Enumeration defining standard types for the
+///   role, purpose or usage of the bar, i.e. the kind of loads and stresses they are
+///   intended to carry.  
 /// 
-/// Enumeration 
+/// HISTORY New type in IFC Release 2x2.
+///   Item ANCHORING (documented since IFC 2x2) added to the EXPRESS definition in IFC 2x4.
 /// 
-/// DISHWASHER: An appliance that has the primary function of washing dishes. 
-/// ELECTRICCOOKER: An electrical appliance that has the primary function of cooking food (including oven, hob, grill). 
-/// FREESTANDINGELECTRICHEATER: An electrical appliance that is used occasionally to provide heat. A freestanding electric heater is a 'plugged' appliance whose load may be removed from an electric circuit. 
-/// FREESTANDINGFAN: An electrical appliance that is used occasionally to provide ventilation. A freestanding fan is a 'plugged' appliance whose load may be removed from an electric circuit. 
-/// FREESTANDINGWATERHEATER: A small, local electrical appliance for heating water. A freestanding water heater is a 'plugged' appliance whose load may be removed from an electric circuit. 
-/// FREESTANDINGWATERCOOLER: A small, local electrical appliance for cooling water. A freestanding water cooler is a 'plugged' appliance whose load may be removed from an electric circuit. 
-/// FREEZER: An electrical appliance that has the primary function of storing food at temperatures below the freezing point of water. 
-/// FRIDGE_FREEZER: An electrical appliance that combines the functions of a freezer and a refrigerator through the provision of separate compartments. 
-/// KITCHENMACHINE: A specialized appliance used in commercial kitchens such as a mixer. 
-/// HANDDRYER: An electrical appliance that has the primary function of drying hands. 
-/// MICROWAVE: An electrical appliance that has the primary function of cooking food using microwaves. 
-/// PHOTOCOPIER: A machine that has the primary function of reproduction of printed matter. 
-/// REFRIGERATOR: An electrical appliance that has the primary function of storing food at low temperature but above the freezing point of water. 
-/// TUMBLEDRYER: An electrical appliance that has the primary function of drying clothes. 
-/// VENDINGMACHINE: An appliance that stores and vends goods including food, drink and goods of various types. 
-/// WASHINGMACHINE: An appliance that has the primary function of washing clothes. 	  
-/// USERDEFINED: User-defined type. 
-/// NOTDEFINED: Undefined type.
-typedef enum {IfcElectricApplianceType_DISHWASHER, IfcElectricApplianceType_ELECTRICCOOKER, IfcElectricApplianceType_FREESTANDINGELECTRICHEATER, IfcElectricApplianceType_FREESTANDINGFAN, IfcElectricApplianceType_FREESTANDINGWATERHEATER, IfcElectricApplianceType_FREESTANDINGWATERCOOLER, IfcElectricApplianceType_FREEZER, IfcElectricApplianceType_FRIDGE_FREEZER, IfcElectricApplianceType_HANDDRYER, IfcElectricApplianceType_KITCHENMACHINE, IfcElectricApplianceType_MICROWAVE, IfcElectricApplianceType_PHOTOCOPIER, IfcElectricApplianceType_REFRIGERATOR, IfcElectricApplianceType_TUMBLEDRYER, IfcElectricApplianceType_VENDINGMACHINE, IfcElectricApplianceType_WASHINGMACHINE, IfcElectricApplianceType_USERDEFINED, IfcElectricApplianceType_NOTDEFINED} IfcElectricApplianceTypeEnum;
-const char* ToString(IfcElectricApplianceTypeEnum v);
-IfcElectricApplianceTypeEnum FromString(const std::string& s);
-}
-namespace IfcElectricDistributionBoardTypeEnum {
-/// The IfcElectricDistributionBoardTypeEnum defines the range of different types and/or functions of electric distribution board possible. 
-///   HISTORY: New type in IFC 2x4. Replaces IfcElectricDistributionPointTypeEnum  
-///   Enumeration 
+/// ENUMERATION 
 /// 
-/// CONSUMERUNIT: A distribution point on the incoming electrical supply, typically in domestic premises, at which protective devices are located. 
-/// DISTRIBUTIONBOARD: A distribution point at which connections are made for distribution of electrical circuits usually through protective devices. 
-/// MOTORCONTROLCENTRE: A distribution point at which starting and control devices for major plant items are located. 
-/// SWITCHBOARD: A distribution point at which switching devices are located. 
-/// USERDEFINED: User-defined type. 
-/// NOTDEFINED: Undefined type.
-typedef enum {IfcElectricDistributionBoardType_CONSUMERUNIT, IfcElectricDistributionBoardType_DISTRIBUTIONBOARD, IfcElectricDistributionBoardType_MOTORCONTROLCENTRE, IfcElectricDistributionBoardType_SWITCHBOARD, IfcElectricDistributionBoardType_USERDEFINED, IfcElectricDistributionBoardType_NOTDEFINED} IfcElectricDistributionBoardTypeEnum;
-const char* ToString(IfcElectricDistributionBoardTypeEnum v);
-IfcElectricDistributionBoardTypeEnum FromString(const std::string& s);
+/// MAIN The reinforcing bar is a main bar. 
+///   SHEAR The reinforcing bar is a shear bar. 
+///   LIGATURE The reinforcing bar is a ligature (link, stirrup). 
+///   STUD The reinforcing bar is a stud. 
+///   PUNCHING Punching reinforcement. 
+///   EDGE Edge reinforcement. 
+///   RING Ring reinforcement. 
+///   ANCHORING Anchoring reinforcement. 
+///   USERDEFINED The type of reinforcement is user defined. 
+///   NOTDEFINED The type of reinforcement is not defined.
+typedef enum {IfcReinforcingBarRole_MAIN, IfcReinforcingBarRole_SHEAR, IfcReinforcingBarRole_LIGATURE, IfcReinforcingBarRole_STUD, IfcReinforcingBarRole_PUNCHING, IfcReinforcingBarRole_EDGE, IfcReinforcingBarRole_RING, IfcReinforcingBarRole_ANCHORING, IfcReinforcingBarRole_USERDEFINED, IfcReinforcingBarRole_NOTDEFINED} IfcReinforcingBarRoleEnum;
+const char* ToString(IfcReinforcingBarRoleEnum v);
+IfcReinforcingBarRoleEnum FromString(const std::string& s);
 }
-namespace IfcElectricFlowStorageDeviceTypeEnum {
-/// The IfcElectricFlowStorageDeviceTypeEnum defines the range of different types of electrical flow storage device available. 
-///   HISTORY: New type in IFC 2x2  
-///   Enumeration 
+namespace IfcReinforcingBarSurfaceEnum {
+/// Definition from IAI: Enumeration indicating whether the bar has a
+///   plain or textured (ribbed) surface.  
 /// 
-/// BATTERY: A device for storing energy in chemical form so that it can be released as electrical energy. 
-/// CAPACITORBANK: A device that stores electrical energy when an external power supply is present using the electrical property of capacitance 
-/// HARMONICFILTER: A device that constantly injects currents that precisely correspond to the harmonic components drawn by the load. 
-/// UPS: A device that provides a time limited alternative source of power supply in the event of failure of the main supply.  
-/// USERDEFINED: User-defined type.  
-/// NOTDEFINED: Undefined type.
-typedef enum {IfcElectricFlowStorageDeviceType_BATTERY, IfcElectricFlowStorageDeviceType_CAPACITORBANK, IfcElectricFlowStorageDeviceType_HARMONICFILTER, IfcElectricFlowStorageDeviceType_INDUCTORBANK, IfcElectricFlowStorageDeviceType_UPS, IfcElectricFlowStorageDeviceType_USERDEFINED, IfcElectricFlowStorageDeviceType_NOTDEFINED} IfcElectricFlowStorageDeviceTypeEnum;
-const char* ToString(IfcElectricFlowStorageDeviceTypeEnum v);
-IfcElectricFlowStorageDeviceTypeEnum FromString(const std::string& s);
-}
-namespace IfcElectricGeneratorTypeEnum {
-/// The IfcElectricGeneratorTypeEnum defines the range of types of electric generators available.
-///   HISTORY: New type in IFC 2x2.  Values added in IFC 2x4. 
+/// HISTORY New type in IFC Release 2x2
 /// 
-/// Enumeration 
+/// ENUMERATION 
 /// 
-/// CHP: Combined heat and power supply, used not only as a source of electric energy but also as a heating source for the building. It may therefore be not only part of an electrical system but also of a heating system. 
-/// ENGINEGENERATOR: Electrical generator with a fuel-driven engine, for example a diesel-driven emergency power supply. 
-/// STANDALONE: Electrical generator which does not include its source of kinetic energy, that is, a motor, engine, or turbine is modeled by a separate object. 
-/// USERDEFINED: User-defined type. 
-/// NOTDEFINED: Undefined type.
-typedef enum {IfcElectricGeneratorType_CHP, IfcElectricGeneratorType_ENGINEGENERATOR, IfcElectricGeneratorType_STANDALONE, IfcElectricGeneratorType_USERDEFINED, IfcElectricGeneratorType_NOTDEFINED} IfcElectricGeneratorTypeEnum;
-const char* ToString(IfcElectricGeneratorTypeEnum v);
-IfcElectricGeneratorTypeEnum FromString(const std::string& s);
+/// PLAIN The reinforcing bar surface is plain. 
+///   TEXTURED The reinforcing bar surface is textured (ribbed).
+typedef enum {IfcReinforcingBarSurface_PLAIN, IfcReinforcingBarSurface_TEXTURED} IfcReinforcingBarSurfaceEnum;
+const char* ToString(IfcReinforcingBarSurfaceEnum v);
+IfcReinforcingBarSurfaceEnum FromString(const std::string& s);
 }
-namespace IfcElectricMotorTypeEnum {
-/// The IfcElectricMotorTypeEnum defines the range of different types of electric motor that can be specified. 
-///   HISTORY: New type in IFC 2x2  
-///   Enumeration 
-/// 
-/// DC: A motor using either generated or rectified D.C. power. 
-/// INDUCTION: An alternating current motor in which the primary winding on one member (usually the stator) is connected to the power source and a secondary winding or a squirrel-cage secondary winding on the other member (usually the rotor) carries the induced current. There is no physical electrical connection to the secondary winding, its current is induced. 
-/// POLYPHASE: A two or three-phase induction motor in which the windings, one for each phase, are evenly divided by the same number of electrical degrees.  
-/// RELUCTANCESYNCHRONOUS: A synchronous motor with a special rotor design which directly lines the rotor up with the rotating magnetic field of the stator, allowing for no slip under load.  
-/// SYNCHRONOUS: A motor that operates at a constant speed up to full load. The rotor speed is equal to the speed of the rotating magnetic field of the stator; there is no slip. 
-/// USERDEFINED: User-defined type. 
-/// NOTDEFINED: Undefined type.
-typedef enum {IfcElectricMotorType_DC, IfcElectricMotorType_INDUCTION, IfcElectricMotorType_POLYPHASE, IfcElectricMotorType_RELUCTANCESYNCHRONOUS, IfcElectricMotorType_SYNCHRONOUS, IfcElectricMotorType_USERDEFINED, IfcElectricMotorType_NOTDEFINED} IfcElectricMotorTypeEnum;
-const char* ToString(IfcElectricMotorTypeEnum v);
-IfcElectricMotorTypeEnum FromString(const std::string& s);
+namespace IfcReinforcingBarTypeEnum {
+
+typedef enum {IfcReinforcingBarType_ANCHORING, IfcReinforcingBarType_EDGE, IfcReinforcingBarType_LIGATURE, IfcReinforcingBarType_MAIN, IfcReinforcingBarType_PUNCHING, IfcReinforcingBarType_RING, IfcReinforcingBarType_SHEAR, IfcReinforcingBarType_STUD, IfcReinforcingBarType_USERDEFINED, IfcReinforcingBarType_NOTDEFINED} IfcReinforcingBarTypeEnum;
+const char* ToString(IfcReinforcingBarTypeEnum v);
+IfcReinforcingBarTypeEnum FromString(const std::string& s);
 }
-namespace IfcElectricTimeControlTypeEnum {
-/// The IfcElectricTimeControlTypeEnum defines the range of types of electrical time control available. 
-///   HISTORY: New type in IFC 2x2  
-///   Enumeration 
-/// 
-/// TIMECLOCK: A control that causes action to occur at set times. 
-/// TIMEDELAY: A control that causes action to occur following a set duration. 
-/// RELAY: Electromagnetically operated contactor for making or breaking a control circuit. 
-/// USERDEFINED: User-defined type. 
-/// NOTDEFINED: Undefined type.
-typedef enum {IfcElectricTimeControlType_TIMECLOCK, IfcElectricTimeControlType_TIMEDELAY, IfcElectricTimeControlType_RELAY, IfcElectricTimeControlType_USERDEFINED, IfcElectricTimeControlType_NOTDEFINED} IfcElectricTimeControlTypeEnum;
-const char* ToString(IfcElectricTimeControlTypeEnum v);
-IfcElectricTimeControlTypeEnum FromString(const std::string& s);
+namespace IfcReinforcingMeshTypeEnum {
+
+typedef enum {IfcReinforcingMeshType_USERDEFINED, IfcReinforcingMeshType_NOTDEFINED} IfcReinforcingMeshTypeEnum;
+const char* ToString(IfcReinforcingMeshTypeEnum v);
+IfcReinforcingMeshTypeEnum FromString(const std::string& s);
 }
-namespace IfcElementAssemblyTypeEnum {
-/// Definition from IAI: An enumeration defining the
-///   basic configuration types for element assemblies.
+namespace IfcRoleEnum {
+/// Definition: Roles which may be played by an actor.
 /// 
-/// HISTORY New enumeration type
-///   in Release IFC2x Edition 2.
+/// HISTORY This type has changes after IFC Release 2.0.  Spelling of COMMISSIONINGENGINEER fixed in IFC 2x4.
 /// 
-/// Enumeration
+/// ENUMERATION 
 /// 
-/// ACCESSORY_ASSEMBLY: Assembled accessories or components
-///   ARCH: A curved structure
-///   BEAM_GRID: Interconnected beams, located in one (typically horizontal) plane
-///   BRACED_FRAME: A rigid frame with additional bracing members
-///   GIRDER: A beam-like superstructure
-///   REINFORCEMENT_UNIT: Assembled reinforcement elements
-///   RIGID_FRAME: A structure built up of beams, columns, etc. with moment-resisting joints
-///   SLAB_FIELD: Slabs, laid out in one plane
-///   TRUSS: A structure built up of members with (quasi) pinned joints
-///   USERDEFINED: User-defined element assembly
-///   NOTDEFINED: Undefined element assembly
-typedef enum {IfcElementAssemblyType_ACCESSORY_ASSEMBLY, IfcElementAssemblyType_ARCH, IfcElementAssemblyType_BEAM_GRID, IfcElementAssemblyType_BRACED_FRAME, IfcElementAssemblyType_GIRDER, IfcElementAssemblyType_REINFORCEMENT_UNIT, IfcElementAssemblyType_RIGID_FRAME, IfcElementAssemblyType_SLAB_FIELD, IfcElementAssemblyType_TRUSS, IfcElementAssemblyType_USERDEFINED, IfcElementAssemblyType_NOTDEFINED} IfcElementAssemblyTypeEnum;
-const char* ToString(IfcElementAssemblyTypeEnum v);
-IfcElementAssemblyTypeEnum FromString(const std::string& s);
+/// SUPPLIER
+///   MANUFACTURER
+///   CONTRACTOR 
+///   SUBCONTRACTOR
+///   ARCHITECT
+///   STRUCTURALENGINEER
+///   COSTENGINEER 
+///   CLIENT
+///   BUILDINGOWNER
+///   BUILDINGOPERATOR
+///   MECHANICALENGINEER 
+///   ELECTRICALENGINEER
+///   PROJECTMANAGER
+///   FACILITIESMANAGER
+///   CIVILENGINEER
+///   COMMISSIONINGENGINEER 
+///   ENGINEER
+///   OWNER
+///   CONSULTANT
+///   CONSTRUCTIONMANAGER
+///   FIELDCONSTRUCTIONMANAGER 
+///   RESELLER
+///   USERDEFINED User defined value to be provided.
+typedef enum {IfcRole_SUPPLIER, IfcRole_MANUFACTURER, IfcRole_CONTRACTOR, IfcRole_SUBCONTRACTOR, IfcRole_ARCHITECT, IfcRole_STRUCTURALENGINEER, IfcRole_COSTENGINEER, IfcRole_CLIENT, IfcRole_BUILDINGOWNER, IfcRole_BUILDINGOPERATOR, IfcRole_MECHANICALENGINEER, IfcRole_ELECTRICALENGINEER, IfcRole_PROJECTMANAGER, IfcRole_FACILITIESMANAGER, IfcRole_CIVILENGINEER, IfcRole_COMMISSIONINGENGINEER, IfcRole_ENGINEER, IfcRole_OWNER, IfcRole_CONSULTANT, IfcRole_CONSTRUCTIONMANAGER, IfcRole_FIELDCONSTRUCTIONMANAGER, IfcRole_RESELLER, IfcRole_USERDEFINED} IfcRoleEnum;
+const char* ToString(IfcRoleEnum v);
+IfcRoleEnum FromString(const std::string& s);
 }
-namespace IfcElementCompositionEnum {
-/// Definition from IAI: Enumeration that provides an
-///   indication, whether the spatial structure element or proxy
-///   represents a:
+namespace IfcRoofTypeEnum {
+/// This enumeration defines the basic configuration of the roof in terms of the different roof shapes, as illustrated in Figure 68.
 /// 
-/// COMPLEX - a group or aggregation of similar elements
+/// Roofs which are subdivided into more than these basic shapes have to be defined by the geometry only. Also roofs with non-regular shapes (free form roof) have to be defined by the geometry only. The type of such roofs is FREEFORM. 
 /// 
-/// ELEMENT - a (undivided) element itself
+/// HISTORY New Enumeration in IFC Release 2x. 
 /// 
-/// PARTIAL - a subelement or part
+/// Enumerator 
+///   Description 
+///   Figure 
 /// 
-/// HISTORY New enumeration in
-///   IFC Release 2.x
-typedef enum {IfcElementComposition_COMPLEX, IfcElementComposition_ELEMENT, IfcElementComposition_PARTIAL} IfcElementCompositionEnum;
-const char* ToString(IfcElementCompositionEnum v);
-IfcElementCompositionEnum FromString(const std::string& s);
-}
-namespace IfcEngineTypeEnum {
-/// Enumeration defining the typical types of engines.  The IfcEngineTypeEnum contains the following:
+/// FLAT_ROOF 
+///   A roof having no slope, or
+///   one with only a slight pitch so as to drain rainwater. 
 /// 
-/// EXTERNALCOMBUSTION: Combustion is external.
-///   INTERNALCOMBUSTION: Combustion is internal.
-///   USERDEFINED: User-defined engine type.
-///   NOTDEFINED:  Undefined engine type.
+/// SHED_ROOF 
+///   A roof having a single
+///   slope. 
 /// 
-/// HISTORY: New enumeration in IFC 2x4.
-typedef enum {IfcEngineType_EXTERNALCOMBUSTION, IfcEngineType_INTERNALCOMBUSTION, IfcEngineType_USERDEFINED, IfcEngineType_NOTDEFINED} IfcEngineTypeEnum;
-const char* ToString(IfcEngineTypeEnum v);
-IfcEngineTypeEnum FromString(const std::string& s);
-}
-namespace IfcEvaporativeCoolerTypeEnum {
-/// Enumeration defining the typical types of evaporative coolers. 
-///   The IfcEvaporativeCoolerTypeEnum contains the following:
+/// GABLE_ROOF 
+///   A roof sloping downward in
+///   two parts from a central ridge, so as to form a gable at each end. 
 /// 
-/// DIRECTEVAPORATIVERANDOMMEDIAAIRCOOLER: Direct evaporative random media air cooler: Cools the air stream by evaporating water dircectly into the air stream using coolers with evaporative pads, usually of aspen wood or plastic fiber/foam.
-///   DIRECTEVAPORATIVERIGIDMEDIAAIRCOOLER: Direct evaporative rigid media air cooler: Cools the air stream by evaporating water dircectly into the air stream using coolers with sheets of rigid, corrugated material as the wetted surface.
-///   DIRECTEVAPORATIVESLINGERSPACKAGEDAIRCOOLER: Direct evaporative slingers packaged air cooler: Cools the air stream by evaporating water dircectly into the air stream using coolers with a water slinger in an evaporative cooling section and a fan section.
-///   DIRECTEVAPORATIVEPACKAGEDROTARYAIRCOOLER: Direct evaporative packaged rotary air cooler: Cools the air stream by evaporating water dircectly into the air stream using coolers that wet and wash the evaporative pad by rotating it through a water bath.
-///   DIRECTEVAPORATIVEAIRWASHER: Direct evaporative air washer: Cools the air stream by evaporating water dircectly into the air stream using coolers with spray-type air washer consist of a chamber or casing containing spray nozzles, and tank for collecting spray water, and an eliminator section for removing entrained drops of water from the air.
-///   INDIRECTEVAPORATIVEPACKAGEAIRCOOLER: Indirect evaporative package air cooler: Cools the air stream by evaporating water indirectly and without adding moisture into the air stream. On one side of the heat exchanger, the secondary air stream is cooled by evaporation, while on the other side of heat exchanger, the primary air stream (conditioned air to be supplied to the room) is sensibly cooled by the heat exchanger surfaces.
-///   INDIRECTEVAPORATIVEWETCOIL: Indirect evaporative wet coil: Cools the air stream by evaporating water indirectly and without adding moisture into the air stream. Water is sprayed directly on the tubes of the heat exchanger where latent cooling takes place and the vaporization of the water on the outside of the heat exchanger tubes allows the simultaneous heat and mass transfer which removes heat from the supply air on the tube side.
-///   INDIRECTEVAPORATIVECOOLINGTOWERORCOILCOOLER: Indirect evaporative cooling tower or coil cooler: Cools the air stream by evaporating water indirectly and without adding moisture into the air stream using a combination of a cooling tower or other evaporative water cooler with a water-to-air heat exchanger coil and water circulating pump.
-///   INDIRECTDIRECTCOMBINATION: Indirect/Direct combination: Cools the air stream by evaporating water indirectly and without adding moisture into the air stream using a two-stage cooler with a first-stage indirect evaporative cooler and second-stage direct evaporative cooler.
-///   USERDEFINED:  User-defined evaporative cooler type.
-///   NOTDEFINED:  Undefined evaporative cooler type.
+/// HIP_ROOF 
+///   A roof having sloping ends
+///   and sides meeting at an inclined projecting angle. 
 /// 
-/// HISTORY: New enumeration in IFC 2x2.
-typedef enum {IfcEvaporativeCoolerType_DIRECTEVAPORATIVERANDOMMEDIAAIRCOOLER, IfcEvaporativeCoolerType_DIRECTEVAPORATIVERIGIDMEDIAAIRCOOLER, IfcEvaporativeCoolerType_DIRECTEVAPORATIVESLINGERSPACKAGEDAIRCOOLER, IfcEvaporativeCoolerType_DIRECTEVAPORATIVEPACKAGEDROTARYAIRCOOLER, IfcEvaporativeCoolerType_DIRECTEVAPORATIVEAIRWASHER, IfcEvaporativeCoolerType_INDIRECTEVAPORATIVEPACKAGEAIRCOOLER, IfcEvaporativeCoolerType_INDIRECTEVAPORATIVEWETCOIL, IfcEvaporativeCoolerType_INDIRECTEVAPORATIVECOOLINGTOWERORCOILCOOLER, IfcEvaporativeCoolerType_INDIRECTDIRECTCOMBINATION, IfcEvaporativeCoolerType_USERDEFINED, IfcEvaporativeCoolerType_NOTDEFINED} IfcEvaporativeCoolerTypeEnum;
-const char* ToString(IfcEvaporativeCoolerTypeEnum v);
-IfcEvaporativeCoolerTypeEnum FromString(const std::string& s);
-}
-namespace IfcEvaporatorTypeEnum {
-/// Enumeration defining the typical types of evaporators. 
-///   The IfcEvaporatorTypeEnum contains the following:
+/// HIPPED_GABLE_ROOF 
+///   A roof having a hipped end
+///   truncating a gable. 
 /// 
-/// DIRECTEXPANSION: Direct-expansion evaporator.
-///   DIRECTEXPANSIONSHELLANDTUBE: Direct-expansion evaporator where a refrigerant evaporates inside a series of baffles that channel the fluid throughout the shell side.
-///   DIRECTEXPANSIONTUBEINTUBE: Direct-expansion evaporator where a refrigerant evaporates inside one or more pairs of coaxial tubes.
-///   DIRECTEXPANSIONBRAZEDPLATE: Direct-expansion evaporator where a refrigerant evaporates inside plates brazed or welded together to make up an assembly of separate channels.
-///   FLOODEDSHELLANDTUBE: Evaporator in which refrigerant evaporates outside tubes.
-///   SHELLANDCOIL: Evaporator in which refrigerant evaporates inside a simple coiled tube immersed in the fluid to be cooled.
-///   USERDEFINED:  User-defined evaporator type.
-///   NOTDEFINED:  Undefined evaporator type.
+/// GAMBREL_ROOF 
+///   A ridged roof divided on each
+///   side into a shallower slope above a steeper one. 
 /// 
-/// HISTORY: New enumeration in IFC 2x2.
-typedef enum {IfcEvaporatorType_DIRECTEXPANSION, IfcEvaporatorType_DIRECTEXPANSIONSHELLANDTUBE, IfcEvaporatorType_DIRECTEXPANSIONTUBEINTUBE, IfcEvaporatorType_DIRECTEXPANSIONBRAZEDPLATE, IfcEvaporatorType_FLOODEDSHELLANDTUBE, IfcEvaporatorType_SHELLANDCOIL, IfcEvaporatorType_USERDEFINED, IfcEvaporatorType_NOTDEFINED} IfcEvaporatorTypeEnum;
-const char* ToString(IfcEvaporatorTypeEnum v);
-IfcEvaporatorTypeEnum FromString(const std::string& s);
-}
-namespace IfcEventTriggerTypeEnum {
-/// The IfcEventTriggerTypeEnum defines the range of different types of event trigger that can be specified.
+/// MANSARD_ROOF 
+///   A roof having on each side a
+///   steeper lower part and a shallower upper part. 
 /// 
-/// HISTORY: New type in IFC2x4
+/// BARREL_ROOF 
+///   A roof or ceiling having a
+///   semicylindrical form. 
 /// 
-/// Enumeration: The definition of event trigger types has been adopted from the Business Process Modeling Notation (BPMN), which is also used in the Information Delivery Manual (IDM) for defining business processes. More detailed information about the use of event trigger types can be found in these specifications.
+/// RAINBOW_ROOF 
+///   A gable roof in the form of a
+///   broad Gothic arch, with gently sloping convex surfaces. 
 /// 
-/// EVENTRULE: An event trigger that is a rule or constraint
-/// EVENTMESSAGE: An event trigger that is a message or set of information
-/// EVENTTIME: An event trigger that is at, or occurs after, a particular point in or period of time
-/// EVENTCOMPLEX: An event trigger that is a complex combination of things
-/// USERDEFINED
-/// NOTDEFINED
-typedef enum {IfcEventTriggerType_EVENTRULE, IfcEventTriggerType_EVENTMESSAGE, IfcEventTriggerType_EVENTTIME, IfcEventTriggerType_EVENTCOMPLEX, IfcEventTriggerType_USERDEFINED, IfcEventTriggerType_NOTDEFINED} IfcEventTriggerTypeEnum;
-const char* ToString(IfcEventTriggerTypeEnum v);
-IfcEventTriggerTypeEnum FromString(const std::string& s);
-}
-namespace IfcEventTypeEnum {
-/// The IfcEventTypeEnum defines the range of different types of event that can be specified.
+/// BUTTERFLY_ROOF 
+///   A roof having two slopes,
+///   each descending inward from the eaves. 
 /// 
-/// HISTORY  New type in IFC2x4
+/// PAVILION_ROOF 
+///   A pyramidal hip roof. 
 /// 
-/// Enumeration:
+/// DOME_ROOF 
+///   A hemispherical hip
+///   roof. 
 /// 
-/// STARTEVENT: An initiating event of a process
-/// ENDEVENT: A terminating event of a process
-/// INTERMEDIATEEVENT: An event that occurs at an intermediate stage of a process
-/// USERDEFINED
-/// NOTDEFINED
-typedef enum {IfcEventType_STARTEVENT, IfcEventType_ENDEVENT, IfcEventType_INTERMEDIATEEVENT, IfcEventType_USERDEFINED, IfcEventType_NOTDEFINED} IfcEventTypeEnum;
-const char* ToString(IfcEventTypeEnum v);
-IfcEventTypeEnum FromString(const std::string& s);
-}
-namespace IfcExternalSpatialElementTypeEnum {
-/// Definition from IAI: This enumeration defines the
-/// different types of external spatial elements.
-/// Enumeration:
+/// FREEFORM 
+///   Free form roof  
+///     
 /// 
-/// EXTERNAL - External air space around the building.
-/// EXTERNAL_EARTH - External volume covered by earth around the
-/// building.
-/// EXTERNAL_WATER - External volume covered with water around
-/// the building.
-/// EXTERNAL_FIRE - Space occupied by a neightboring
-/// building.
-/// USERDEFINED
-/// NOTDEFINED
+/// NOTDEFINED 
+///   No specification given 
+///     
 /// 
-/// HISTORY New enumeration
-/// in IFC2x4.
-typedef enum {IfcExternalSpatialElementType_EXTERNAL, IfcExternalSpatialElementType_EXTERNAL_EARTH, IfcExternalSpatialElementType_EXTERNAL_WATER, IfcExternalSpatialElementType_EXTERNAL_FIRE, IfcExternalSpatialElementType_USERDEFINED, IfcExternalSpatialElementType_NOTDEFIEND} IfcExternalSpatialElementTypeEnum;
-const char* ToString(IfcExternalSpatialElementTypeEnum v);
-IfcExternalSpatialElementTypeEnum FromString(const std::string& s);
+/// Figure 68 — Roof types
+typedef enum {IfcRoofType_FLAT_ROOF, IfcRoofType_SHED_ROOF, IfcRoofType_GABLE_ROOF, IfcRoofType_HIP_ROOF, IfcRoofType_HIPPED_GABLE_ROOF, IfcRoofType_GAMBREL_ROOF, IfcRoofType_MANSARD_ROOF, IfcRoofType_BARREL_ROOF, IfcRoofType_RAINBOW_ROOF, IfcRoofType_BUTTERFLY_ROOF, IfcRoofType_PAVILION_ROOF, IfcRoofType_DOME_ROOF, IfcRoofType_FREEFORM, IfcRoofType_USERDEFINED, IfcRoofType_NOTDEFINED} IfcRoofTypeEnum;
+const char* ToString(IfcRoofTypeEnum v);
+IfcRoofTypeEnum FromString(const std::string& s);
 }
-namespace IfcFanTypeEnum {
-/// Enumeration defining the typical types of fans.
-///   The IfcFanTypeEnum contains the following:
+namespace IfcSIPrefix {
+/// Definition from ISO/CD 10303-41:1992: An SI prefix is the name of a prefix that may be associated 
+/// with an SI unit. The definitions of SI prefixes are specified in ISO 1000 (clause 3).
 /// 
-/// CENTRIFUGALFORWARDCURVED: Air flows through the impeller radially using blades that are forward curved.
-///   CENTRIFUGALRADIAL: Air flows through the impeller radially using blades that are uncurved or slightl forward curved.
-///   CENTRIFUGALBACKWARDINCLINEDCURVED: Air flows through the impeller radially using blades that are backward curved.
-///   CENTRIFUGALAIRFOIL: Air flows through the impeller radially using blades are airfoil shaped.
-///   TUBEAXIAL: Air flows through the impeller axially with reduced tip clearance and operating at higher tip speeds.
-///   VANEAXIAL: Air flows through the impeller axially with guide vanes and reduced running blade tip clearance.
-///   PROPELLORAXIAL: Air flows through the impeller axially and small hub-to-tip ratio impeller mounted in an orifice plate or inlet ring.
-///   USERDEFINED:	User-defined fan type.
-///   NOTDEFINED: Undefined fan type.
+/// NOTE The prefix defines multiples and submultiples of the SI units.
 /// 
-/// HISTORY: New enumeration in IFC 2x2.
-typedef enum {IfcFanType_CENTRIFUGALFORWARDCURVED, IfcFanType_CENTRIFUGALRADIAL, IfcFanType_CENTRIFUGALBACKWARDINCLINEDCURVED, IfcFanType_CENTRIFUGALAIRFOIL, IfcFanType_TUBEAXIAL, IfcFanType_VANEAXIAL, IfcFanType_PROPELLORAXIAL, IfcFanType_USERDEFINED, IfcFanType_NOTDEFINED} IfcFanTypeEnum;
-const char* ToString(IfcFanTypeEnum v);
-IfcFanTypeEnum FromString(const std::string& s);
-}
-namespace IfcFastenerTypeEnum {
-/// Definition from IAI: This enumeration defines the different types of fasteners, except for mechanical fasteners:
+/// NOTE Corresponding ISO 10303 name: SI_prefix, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
 /// 
-/// GLUE: A fastening connection where glue is used to join together elements.
-/// MORTAR: A composition of mineralic or other materials used to fill jointing gaps and possibly fulfilling a load carrying role.
-/// WELD: A weld seam between parts of metallic material or other suitable materials.
-/// USERDEFINED: User-defined fastener
-/// NOTDEFINED: Undefined fastener
+/// ENUMERATION 
 /// 
-/// HISTORY  New Enumeration in IFC 2x4.
-typedef enum {IfcFastenerType_GLUE, IfcFastenerType_MORTAR, IfcFastenerType_WELD, IfcFastenerType_USERDEFINED, IfcFastenerType_NOTDEFINED} IfcFastenerTypeEnum;
-const char* ToString(IfcFastenerTypeEnum v);
-IfcFastenerTypeEnum FromString(const std::string& s);
+/// EXA: 10^18. 
+///   PETA: 10^15. 
+///   TERA: 10^12. 
+///   GIGA: 10^9. 
+///   MEGA: 10^6. 
+///   KILO: 10^3. 
+///   HECTO: 10^2.  
+///   DECA: 10. 
+///   DECI: 10^-1. 
+///   CENTI: 10^-2. 
+///   MILLI: 10^-3. 
+///   MICRO: 10^-6. 
+///   NANO: 10^-9. 
+///   PICO: 10^-12. 
+///   FEMTO: 10^-15. 
+///   ATTO: 10^-18. 
+/// 
+/// HISTORY New entity in IFC Release 1.5.1.
+typedef enum {IfcSIPrefix_EXA, IfcSIPrefix_PETA, IfcSIPrefix_TERA, IfcSIPrefix_GIGA, IfcSIPrefix_MEGA, IfcSIPrefix_KILO, IfcSIPrefix_HECTO, IfcSIPrefix_DECA, IfcSIPrefix_DECI, IfcSIPrefix_CENTI, IfcSIPrefix_MILLI, IfcSIPrefix_MICRO, IfcSIPrefix_NANO, IfcSIPrefix_PICO, IfcSIPrefix_FEMTO, IfcSIPrefix_ATTO} IfcSIPrefix;
+const char* ToString(IfcSIPrefix v);
+IfcSIPrefix FromString(const std::string& s);
 }
-namespace IfcFilterTypeEnum {
-/// This enumeration defines the various types of filter typically used
-///   within building services distribution systems:
+namespace IfcSIUnitName {
+/// Definition from ISO/CD 10303-41:1992: An SI unit name is the name of an SI unit. The definitions of the 
+/// names of SI units are specified in ISO 1000 (clause 2).
 /// 
-/// AIRPARTICLEFILTER: A filter used to remove particulates from air.
-///   COMPRESSEDAIRFILTER: A filter used to remove particulates from compressed air.
-///   ODORFILTER: A filter used to remove odors from air.
-///   OILFILTER: A filter used to remove particulates from oil.
-///   STRAINER: A filter used to remove particulates from a fluid.
-///   WATERFILTER: A filter used to remove particulates from water.
-///   USERDEFINED:	User-defined filter type.
-///   NOTDEFINED:	Undefined filter type.
+/// NOTE Corresponding STEP name: SI_unit_name, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
 /// 
-/// HISTORY: New enumeration in IFC R2x.  COMPRESSEDAIRFILTER added in IFC2x4.
-typedef enum {IfcFilterType_AIRPARTICLEFILTER, IfcFilterType_COMPRESSEDAIRFILTER, IfcFilterType_ODORFILTER, IfcFilterType_OILFILTER, IfcFilterType_STRAINER, IfcFilterType_WATERFILTER, IfcFilterType_USERDEFINED, IfcFilterType_NOTDEFINED} IfcFilterTypeEnum;
-const char* ToString(IfcFilterTypeEnum v);
-IfcFilterTypeEnum FromString(const std::string& s);
+/// ENUMERATION 
+/// 
+/// AMPERE: Unit for electric current. 
+///   BECQUEREL: Unit for radioactivity. 
+///   CANDELA: Unit for luminousintensity. 
+///   COULOMB: Unit for electric charge. 
+///   CUBIC_METRE: Unit for volume. 
+///   DEGREE_CELSIUS: Unit for thermodynamic temperature. 
+///   FARAD: Unit for electric capacitance. 
+///   GRAM: Unit for mass. 
+///   GRAY: Unit for absorbed radioactive dose. 
+///   HENRY: Unit for inductance. 
+///   HERTZ: Unit for frequency. 
+///   JOULE: Unit for energy. 
+///   KELVIN: Unit for thermodynamic temperature. 
+///   LUMEN: Unit for luminous flux. 
+///   LUX: Unit for illuminance. 
+///   METRE: Unit for length. 
+///   MOLE: Unit for amount of substance. 
+///   NEWTON: Unit for force. 
+///   OHM: Unit for electric resistance. 
+///   PASCAL: Unit for pressure. 
+///   RADIAN: Unit for plane angle. 
+///   SECOND: Unit for time. 
+///   SIEMENS: Unit for electric conductance. 
+///   SIEVERT: Unit for radioactive dose equivalent. 
+///   SQUARE_METRE: Unit for area. 
+///   STERADIAN: Unit for solid angle. 
+///   TESLA: Unit for magnetic flux density. 
+///   VOLT: Unit for electric voltage. 
+///   WATT: Unit for power. 
+///   WEBER: Unit for magnetic flux. 
+/// 
+/// HISTORY New entity in IFC Release 1.5.1.
+typedef enum {IfcSIUnitName_AMPERE, IfcSIUnitName_BECQUEREL, IfcSIUnitName_CANDELA, IfcSIUnitName_COULOMB, IfcSIUnitName_CUBIC_METRE, IfcSIUnitName_DEGREE_CELSIUS, IfcSIUnitName_FARAD, IfcSIUnitName_GRAM, IfcSIUnitName_GRAY, IfcSIUnitName_HENRY, IfcSIUnitName_HERTZ, IfcSIUnitName_JOULE, IfcSIUnitName_KELVIN, IfcSIUnitName_LUMEN, IfcSIUnitName_LUX, IfcSIUnitName_METRE, IfcSIUnitName_MOLE, IfcSIUnitName_NEWTON, IfcSIUnitName_OHM, IfcSIUnitName_PASCAL, IfcSIUnitName_RADIAN, IfcSIUnitName_SECOND, IfcSIUnitName_SIEMENS, IfcSIUnitName_SIEVERT, IfcSIUnitName_SQUARE_METRE, IfcSIUnitName_STERADIAN, IfcSIUnitName_TESLA, IfcSIUnitName_VOLT, IfcSIUnitName_WATT, IfcSIUnitName_WEBER} IfcSIUnitName;
+const char* ToString(IfcSIUnitName v);
+IfcSIUnitName FromString(const std::string& s);
 }
-namespace IfcFireSuppressionTerminalTypeEnum {
-/// The IfcFireSuppressionTerminalTypeEnum defines the range of different types of fire suppression terminal that can be specified. 
+namespace IfcSanitaryTerminalTypeEnum {
+/// The IfcSanitaryTerminalTypeEnum defines the range of different types of sanitary terminal that can be specified. 
 /// 
-/// HISTORY: New type in IFC 2x2
+/// NOTE: The value WCSEAT has been deprecated and should no longer be used; toilet seats should be represented by IfcDiscreteAccessory with ObjectType 'WC Seat'. 
+///   HISTORY: New type in IFC 2x2 
 /// 
-/// Enumeration
+/// Enumeration 
 /// 
-/// BREECHINGINLET: Symmetrical pipe fitting that unites two or more inlets into a single pipe (BS6100 330 114 adapted). A breeching inlet may be used on either a wet or dry riser. Used by fire services personnel for fast connection of fire appliance hose reels. May also be used for foam. 
-/// FIREHYDRANT: Device, fitted to a pipe, through which a temporary supply of water may be provided (BS6100 330 6107).  May also be termed a stand pipe. 
-/// HOSEREEL: A supporting framework on which a hose may be wound (BS6100 155 8201). 
-/// SPRINKLER: Device for sprinkling water from a pipe under pressure over an area (BS6100 100 3432). 
-/// SPRINKLERDEFLECTOR: Device attached to a sprinkler to deflect the water flow into a spread pattern to cover the required area. 
+/// BATH: Sanitary appliance for immersion of the human body or parts of it. 
+/// BIDET: Waste water appliance for washing the excretory organs while sitting astride the bowl. 
+/// CISTERN: A water storage unit attached to a sanitary terminal that is fitted with a device, operated automatically or by the user, that discharges water to cleanse a water closet (toilet) pan, urinal or slop hopper. 
+/// SHOWER: Installation or waste water appliance that emits a spray of water to wash the human body. 
+/// SINK: Waste water appliance for receiving, retaining or disposing of domestic, culinary, laboratory or industrial process liquids. 
+/// SANITARYFOUNTAIN: A sanitary terminal that provides a low pressure jet of water for a specific purpose. 
+/// TOILETPAN: Soil appliance for the disposal of excrement. 
+/// URINAL: Soil appliance that receives urine and directs it to a waste outlet (BS6100). 
+/// WASHHANDBASIN: Waste water appliance for washing the upper parts of the body. 
+/// WCSEAT: [Deprecated] Hinged seat that fits on the top of a water closet (WC) pan. 
 /// USERDEFINED: User-defined type. 
-/// NOTDEFINED: Underined type.
-typedef enum {IfcFireSuppressionTerminalType_BREECHINGINLET, IfcFireSuppressionTerminalType_FIREHYDRANT, IfcFireSuppressionTerminalType_HOSEREEL, IfcFireSuppressionTerminalType_SPRINKLER, IfcFireSuppressionTerminalType_SPRINKLERDEFLECTOR, IfcFireSuppressionTerminalType_USERDEFINED, IfcFireSuppressionTerminalType_NOTDEFINED} IfcFireSuppressionTerminalTypeEnum;
-const char* ToString(IfcFireSuppressionTerminalTypeEnum v);
-IfcFireSuppressionTerminalTypeEnum FromString(const std::string& s);
+/// NOTDEFINED: Undefined type.
+typedef enum {IfcSanitaryTerminalType_BATH, IfcSanitaryTerminalType_BIDET, IfcSanitaryTerminalType_CISTERN, IfcSanitaryTerminalType_SHOWER, IfcSanitaryTerminalType_SINK, IfcSanitaryTerminalType_SANITARYFOUNTAIN, IfcSanitaryTerminalType_TOILETPAN, IfcSanitaryTerminalType_URINAL, IfcSanitaryTerminalType_WASHHANDBASIN, IfcSanitaryTerminalType_WCSEAT, IfcSanitaryTerminalType_USERDEFINED, IfcSanitaryTerminalType_NOTDEFINED} IfcSanitaryTerminalTypeEnum;
+const char* ToString(IfcSanitaryTerminalTypeEnum v);
+IfcSanitaryTerminalTypeEnum FromString(const std::string& s);
 }
-namespace IfcFlowDirectionEnum {
-/// This enumeration defines the flow direction at a port as either a SOURCE, SINK, or SOURCEANDSINK.  For solids, liquids, or gas, the direction is the physical flow direction.  For electric power (circuits containing hot, neutral, ground), the direction is from the origination of power (from a distribution board to protective devices to switches to fixtures).  For communication signals, the direction originates from where the signal is shaped, such as a sensor.  For communicaton networks, the direction originates from the up-level network host, such as a router (having SOURCE ports) hosting multiple computers (having SINK ports).
+namespace IfcSectionTypeEnum {
+/// Definition from IAI: An enumeration indicating whether a
+///   specific piece of a cross section is uniform or tapered in longitudinal
+///   direction.  
+///   HISTORY New type in IFC
+///   Release 2x2  
+///   ENUMERATION 
 /// 
-/// SOURCE:        A flow source, where a substance flows out of the connection.
-///   SINK:          A flow sink, where a substance flows into the connection.
-///   SOURCEANDSINK: Both a source and sink, where a substance flows both into and out of the connection simultaneously.
-///   NOTDEFINED:    Undefined flow direction.
+/// UNIFORM The section is uniform in longitudinal direction.
 /// 
-/// HISTORY: New enumeration in IFC R2.0
-typedef enum {IfcFlowDirection_SOURCE, IfcFlowDirection_SINK, IfcFlowDirection_SOURCEANDSINK, IfcFlowDirection_NOTDEFINED} IfcFlowDirectionEnum;
-const char* ToString(IfcFlowDirectionEnum v);
-IfcFlowDirectionEnum FromString(const std::string& s);
+/// TAPERED The section is tapered in longitudinal direction.
+typedef enum {IfcSectionType_UNIFORM, IfcSectionType_TAPERED} IfcSectionTypeEnum;
+const char* ToString(IfcSectionTypeEnum v);
+IfcSectionTypeEnum FromString(const std::string& s);
 }
-namespace IfcFlowInstrumentTypeEnum {
-/// The IfcFlowInstrumentTypeEnum defines the range of different types of flow instrument that can be specified. 
+namespace IfcSensorTypeEnum {
+/// The IfcSensorTypeEnum defines the range of different types of sensor that can be specified. 
 /// 
-/// HISTORY: New type in IFC
-///   2x2  
-///   Enumeration 
+/// HISTORY: New type in IFC R2.0.  Added missing enumerations in IFC2x4
 /// 
-/// PRESSUREGAUGE: A device that reads and displays a pressure value at a point or the pressure difference between two points. 
-/// THERMOMETER: A device that reads and displays a temperature value at a point. 
-/// AMMETER: A device that reads and displays the current flow in a circuit. 
-/// FREQUENCYMETER: A device that reads and displays the electrical frequency of an alternating current circuit. 
-/// PHASEANGLEMETER: A device that reads and displays the phase angle of a phase in a polyphase electrical circuit. 
-/// POWERFACTORMETER: A device that reads and displays the power factor of an electrical circuit. 
-/// VOLTMETER_PEAK: A device that reads and displays the peak voltage in an electrical circuit. 
-/// VOLTMETER_RMS: A device that reads and displays the RMS (mean) voltage in an electrical circuit. 
+/// Enumeration 
+/// 
+/// CONDUCTANCESENSOR: A device that senses or detects electrical conductance. 
+/// CONTACTSENSOR: A device that senses or detects contact, such as for detecting if a door is closed. 
+/// FIRESENSOR: A device that senses or detects fire. 
+/// FLOWSENSOR: A device that senses or detects flow in a fluid. 
+/// GASSENSOR: A device that senses or detects gas concentration. 
+/// HEATSENSOR: A device that senses or detects heat. 
+/// IONCONCENTRATIONSENSOR: A device that senses or detects ion concentration, such as for water hardness. 
+/// LEVELSENSOR: A device that senses or detects fill level, such as for a tank. 
+/// HUMIDITYSENSOR: A device that senses or detects humidity. 
+/// LIGHTSENSOR: A device that senses or detects light. 
+/// MOISTURESENSOR: A device that senses or detects moisture. 
+/// MOVEMENTSENSOR: A device that senses or detects movement.  
+/// PHSENSOR: A device that senses or detects acidity. 
+/// PRESSURESENSOR: A device that senses or detects pressure. 
+/// RADIATIONSENSOR: A device that senses or detects electromagnetic radiation. 
+/// RADIOACTIVITYSENSOR: A device that senses or detects atomic decay. 
+/// SMOKESENSOR: A device that senses or detects smoke. 
+/// SOUNDSENSOR: A device that senses or detects sound.  
+/// TEMPERATURESENSOR: A device that senses or detects temperature. 
+/// WINDSENSOR: A device that senses or detects airflow speed and direction. 
 /// USERDEFINED: User-defined type. 
 /// NOTDEFINED: Undefined type.
-typedef enum {IfcFlowInstrumentType_PRESSUREGAUGE, IfcFlowInstrumentType_THERMOMETER, IfcFlowInstrumentType_AMMETER, IfcFlowInstrumentType_FREQUENCYMETER, IfcFlowInstrumentType_POWERFACTORMETER, IfcFlowInstrumentType_PHASEANGLEMETER, IfcFlowInstrumentType_VOLTMETER_PEAK, IfcFlowInstrumentType_VOLTMETER_RMS, IfcFlowInstrumentType_USERDEFINED, IfcFlowInstrumentType_NOTDEFINED} IfcFlowInstrumentTypeEnum;
-const char* ToString(IfcFlowInstrumentTypeEnum v);
-IfcFlowInstrumentTypeEnum FromString(const std::string& s);
+typedef enum {IfcSensorType_CONDUCTANCESENSOR, IfcSensorType_CONTACTSENSOR, IfcSensorType_FIRESENSOR, IfcSensorType_FLOWSENSOR, IfcSensorType_GASSENSOR, IfcSensorType_HEATSENSOR, IfcSensorType_HUMIDITYSENSOR, IfcSensorType_IONCONCENTRATIONSENSOR, IfcSensorType_LEVELSENSOR, IfcSensorType_LIGHTSENSOR, IfcSensorType_MOISTURESENSOR, IfcSensorType_MOVEMENTSENSOR, IfcSensorType_PHSENSOR, IfcSensorType_PRESSURESENSOR, IfcSensorType_RADIATIONSENSOR, IfcSensorType_RADIOACTIVITYSENSOR, IfcSensorType_SMOKESENSOR, IfcSensorType_SOUNDSENSOR, IfcSensorType_TEMPERATURESENSOR, IfcSensorType_WINDSENSOR, IfcSensorType_USERDEFINED, IfcSensorType_NOTDEFINED} IfcSensorTypeEnum;
+const char* ToString(IfcSensorTypeEnum v);
+IfcSensorTypeEnum FromString(const std::string& s);
 }
-namespace IfcFlowMeterTypeEnum {
-/// This enumeration defines various types of flow meter:
-/// 
-/// ENERGYMETER:   An electric meter or energy meter is a device that measures the amount of electrical energy supplied to or produced by a residence, business or machine.
+namespace IfcSequenceEnum {
+/// IfcSequenceEnum is an
+///   enumeration that defines the different ways in which a
+///   time lag is applied to a sequence between two processes.
 /// 
-/// GASMETER:   A device that measures the quantity of a gas or fuel.
+/// HISTORY  New entity in IFC 1.0
+typedef enum {IfcSequence_START_START, IfcSequence_START_FINISH, IfcSequence_FINISH_START, IfcSequence_FINISH_FINISH, IfcSequence_USERDEFINED, IfcSequence_NOTDEFINED} IfcSequenceEnum;
+const char* ToString(IfcSequenceEnum v);
+IfcSequenceEnum FromString(const std::string& s);
+}
+namespace IfcShadingDeviceTypeEnum {
+/// Definition from IAI: Enumeration defining the valid
+/// types of shading devices that can be predefined using the
+/// enumeration values.
 /// 
-/// OILMETER:   A device that measures the quantity of oil.
+/// JALOUSIE
+/// SHUTTER
+/// AWNING
 /// 
-/// WATERMETER:   A device that measures the quantity of water.
+/// HISTORY  New Enumeration
+/// in Release IFC2x4
+typedef enum {IfcShadingDeviceType_JALOUSIE, IfcShadingDeviceType_SHUTTER, IfcShadingDeviceType_AWNING, IfcShadingDeviceType_USERDEFINED, IfcShadingDeviceType_NOTDEFINED} IfcShadingDeviceTypeEnum;
+const char* ToString(IfcShadingDeviceTypeEnum v);
+IfcShadingDeviceTypeEnum FromString(const std::string& s);
+}
+namespace IfcSimplePropertyTemplateTypeEnum {
+/// This enumeration defines the correct subtype of instances of IfcSimpleProperty or IfcPhysicalSimpleQuantity that are created and are assigned to this IfcSimplePropertyTemplate. It also determines how the attributes of IfcPropertyTemplate, PrimaryUnit, SecondaryUnit, PrimaryDataType, SecondaryDataType, should be used.
 /// 
-/// USERDEFINED:   User-defined meter type
+/// HISTORY New enumeration in IFC2x4.
 /// 
-/// NOTDEFINED:    Undefined meter type
+/// Enumeration
 /// 
-/// HISTORY: New enumeration in IFC 2x2
-typedef enum {IfcFlowMeterType_ENERGYMETER, IfcFlowMeterType_GASMETER, IfcFlowMeterType_OILMETER, IfcFlowMeterType_WATERMETER, IfcFlowMeterType_USERDEFINED, IfcFlowMeterType_NOTDEFINED} IfcFlowMeterTypeEnum;
-const char* ToString(IfcFlowMeterTypeEnum v);
-IfcFlowMeterTypeEnum FromString(const std::string& s);
+/// P_SINGLEVALUE: the properties defined by this IfcPropertyTemplate are of type IfcPropertySingleValue.
+/// P_ENUMERATEDVALUE: the properties defined by this IfcPropertyTemplate are of type IfcPropertyEnumeratedValue.
+/// P_BOUNDEDVALUE: the properties defined by this IfcPropertyTemplate are of type IfcPropertyBoundedValue.
+/// P_LISTVALUE: the properties defined by this IfcPropertyTemplate are of type IfcPropertyListValue.
+/// P_TABLEVALUE: the properties defined by this IfcPropertyTemplate are of type IfcPropertyTableValue.
+/// P_REFERENCEVALUE: the properties defined by this IfcPropertyTemplate are of type IfcPropertyReferenceValue.
+/// Q_LENGTH: the properties defined by this IfcPropertyTemplate are of type IfcQuantityLength.
+/// Q_AREA: the properties defined by this IfcPropertyTemplate are of type IfcQuantityArea.
+/// Q_VOLUME: the properties defined by this IfcPropertyTemplate are of type IfcQuantityVolume.
+/// Q_COUNT: the properties defined by this IfcPropertyTemplate are of type IfcQuantityCount.
+/// Q_WEIGHT: the properties defined by this IfcPropertyTemplate are of type IfcQuantityWeight.
+/// Q_TIME: the properties defined by this IfcPropertyTemplate are of type IfcQuantityTime.
+typedef enum {IfcSimplePropertyTemplateType_P_SINGLEVALUE, IfcSimplePropertyTemplateType_P_ENUMERATEDVALUE, IfcSimplePropertyTemplateType_P_BOUNDEDVALUE, IfcSimplePropertyTemplateType_P_LISTVALUE, IfcSimplePropertyTemplateType_P_TABLEVALUE, IfcSimplePropertyTemplateType_P_REFERENCEVALUE, IfcSimplePropertyTemplateType_Q_LENGTH, IfcSimplePropertyTemplateType_Q_AREA, IfcSimplePropertyTemplateType_Q_VOLUME, IfcSimplePropertyTemplateType_Q_COUNT, IfcSimplePropertyTemplateType_Q_WEIGHT, IfcSimplePropertyTemplateType_Q_TIME} IfcSimplePropertyTemplateTypeEnum;
+const char* ToString(IfcSimplePropertyTemplateTypeEnum v);
+IfcSimplePropertyTemplateTypeEnum FromString(const std::string& s);
 }
-namespace IfcFootingTypeEnum {
-/// Definition from IAI: Enumeration defining the generic footing type.
+namespace IfcSlabTypeEnum {
+/// Definition from IAI: This enumeration defines the
+///   available predefined types of a slab. The
+///   IfcSlabTypeEnum can be used for slab occurrences,
+///   IfcSlab, and slab types, IfcSlabType. A
+///   special property set definition may be provided for each
+///   predefined type.
 /// 
-/// HISTORY New type in IFC Release 2x2
-/// IFC 2x4 change:  Item CAISSON_FOUNDATION added
+/// HISTORY  New type in IFC
+///   Release 2.0
 /// 
-/// ENUMERATION 
+/// Floor
 /// 
-/// CAISSON_FOUNDATION A foundation construction type used in underwater construction.
-///   FOOTING_BEAM Footing elements that are in bending and are supported clear of the ground. They will normally span between piers, piles or pile caps. They are distinguished from beams in the building superstructure since they will normally require a lower grade of finish. They are distinguished from STRIP_FOOTING since they are clear of the ground surface and hence require support to the lower face while the concrete is curing.
-///   PAD_FOOTING An element that transfers the load of a single column (possibly two) to the ground.
-///   PILE_CAP An element that transfers the load from a column or group of columns to a pier or pile or group of piers or piles.
-///   STRIP_FOOTING A linear element that transfers loads into the ground from either a continuous element, such as a wall, or from a series of elements, such as columns.
-///   USERDEFINED Special types of footings which meet specific local requirements.
-///   NOTDEFINED The type of footing is not defined.
-typedef enum {IfcFootingType_CAISSON_FOUNDATION, IfcFootingType_FOOTING_BEAM, IfcFootingType_PAD_FOOTING, IfcFootingType_PILE_CAP, IfcFootingType_STRIP_FOOTING, IfcFootingType_USERDEFINED, IfcFootingType_NOTDEFINED} IfcFootingTypeEnum;
-const char* ToString(IfcFootingTypeEnum v);
-IfcFootingTypeEnum FromString(const std::string& s);
-}
-namespace IfcFurnitureTypeEnum {
-/// IfcFurnitureTypeEnum defines the types of furniture from which the type required can be selected. 
-///   HISTORY: New Enumeration in IFC 2x4. 
-///   Enumeration: 
+/// The slab is used to represent a floor slab.
 /// 
-/// CHAIR: Furniture for seating a single person.  
-/// TABLE: Furniture with a countertop for multiple people.  
-/// DESK: Furniture with a countertop and optional drawers for a single person.  
-/// BED: Furniture for sleeping.  
-/// FILECABINET: Furniture with sliding drawers for storing files.  
-/// SHELF: Furniture for storing books or other items.  
-/// SOFA: Furniture for seating multiple people.  
-/// USERDEFINED: User-defined type.  
-/// NOTDEFINED: Undefined type.
-typedef enum {IfcFurnitureType_CHAIR, IfcFurnitureType_TABLE, IfcFurnitureType_DESK, IfcFurnitureType_BED, IfcFurnitureType_FILECABINET, IfcFurnitureType_SHELF, IfcFurnitureType_SOFA, IfcFurnitureType_USERDEFINED, IfcFurnitureType_NOTDEFINED} IfcFurnitureTypeEnum;
-const char* ToString(IfcFurnitureTypeEnum v);
-IfcFurnitureTypeEnum FromString(const std::string& s);
-}
-namespace IfcGeographicElementTypeEnum {
-
-typedef enum {IfcGeographicElementType_TERRAIN, IfcGeographicElementType_USERDEFINED, IfcGeographicElementType_NOTDEFINED} IfcGeographicElementTypeEnum;
-const char* ToString(IfcGeographicElementTypeEnum v);
-IfcGeographicElementTypeEnum FromString(const std::string& s);
-}
-namespace IfcGeometricProjectionEnum {
-/// IfcGeometricProjectionEnum defines the various representation types that can be semantically distinguished. Often different levels of detail of the shape representation are controlled by the representation type.
+/// Roof
 /// 
-/// GRAPH_VIEW:
-/// Geometric display representation that shows an abstract, often 1D
-/// element representation, e.g. representing a wall by its axis line.
-///   SKETCH_VIEW:
-/// Geometric display representation that shows an abstract, often 2D
-/// element representation, e.g. representing a wall by its two foot print
-/// edges, surpressing any inner layer representation.
-///   MODEL_VIEW:
-/// Geometric display representation that shows a full 3D element
-/// representation, e.g. representing a wall by its volumetric body.
-///   PLAN_VIEW:
-/// Geometric display representation that shows a full 2D element
-/// representation, the level of detail often depends on the target scale,
-/// e.g. representing a wall by its two foot print edges and the edges of
-/// all inner layers. The projection is shown in ground view as seen from
-/// above.
-///   REFLECTED_PLAN_VIEW:
-/// Geometric display representation that shows a full 2D element
-/// representation, the level of detail often depends on the target scale,
-/// e.g. representing a wall by its two foot print edges and the edges of
-/// all inner layers. The projection is shown in ground view as seen from
-/// below.
-///   SECTION_VIEW:
-/// Geometric display representation that shows a full 2D element
-/// representation, the level of detail often depends on the target scale,
-/// e.g. representing a wall by its two inner/outer edges and the edges of
-/// all inner layers, if the element is cut by the section line.
-///   ELEVATION_VIEW:
-/// Geometric display representation that shows a full 2D element
-/// representation, the level of detail often depends on the target scale,
-/// e.g. representing a wall by its bounding edges if the element is within
-/// an elevation view.
-///   USERDEFINED:
-/// A user defined specification is given by the value of the UserDefinedTargetView
-/// attribute.
-///   NOTDEFINED:
-/// No specification given.
+/// The slab is used to represent a roof slab (either
+///   flat or sloped).
 /// 
-/// HISTORY: New Type in Release IFC2x2.
-typedef enum {IfcGeometricProjection_GRAPH_VIEW, IfcGeometricProjection_SKETCH_VIEW, IfcGeometricProjection_MODEL_VIEW, IfcGeometricProjection_PLAN_VIEW, IfcGeometricProjection_REFLECTED_PLAN_VIEW, IfcGeometricProjection_SECTION_VIEW, IfcGeometricProjection_ELEVATION_VIEW, IfcGeometricProjection_USERDEFINED, IfcGeometricProjection_NOTDEFINED} IfcGeometricProjectionEnum;
-const char* ToString(IfcGeometricProjectionEnum v);
-IfcGeometricProjectionEnum FromString(const std::string& s);
-}
-namespace IfcGlobalOrLocalEnum {
-/// This enumeration type defines if the local object coordinate system or the global world coordinate system for the project is used to describe the measure values of entities which have a reference to this type.
+/// Landing
 /// 
-/// NOTE  The world coordinate system is given by the IfcGeometricRepresentationContext.WorldCoordinateSystem
-/// and is unique within the project. The local (or object) coordinate system is given by IfcProduct.ObjectPlacement and is used by all IfcRepresentation's within the IfcProduct.Representation.
+/// The slab is used to represent a landing within a
+///   stair or ramp.
 /// 
-/// HISTORY: New type in IFC2x2.
-typedef enum {IfcGlobalOrLocal_GLOBAL_COORDS, IfcGlobalOrLocal_LOCAL_COORDS} IfcGlobalOrLocalEnum;
-const char* ToString(IfcGlobalOrLocalEnum v);
-IfcGlobalOrLocalEnum FromString(const std::string& s);
-}
-namespace IfcGridTypeEnum {
-
-typedef enum {IfcGridType_RECTANGULAR, IfcGridType_RADIAL, IfcGridType_TRIANGULAR, IfcGridType_IRREGULAR, IfcGridType_USERDEFINED, IfcGridType_NOTDEFINED} IfcGridTypeEnum;
-const char* ToString(IfcGridTypeEnum v);
-IfcGridTypeEnum FromString(const std::string& s);
-}
-namespace IfcHeatExchangerTypeEnum {
-/// Enumeration defining the typical types of heat exchangers. 
-///   The IfcHeatExchangerTypeEnum contains the following:
+/// BaseSlab
 /// 
-/// PLATE: Plate heat exchanger.
-///   SHELLANDTUBE: Shell and Tube heat exchanger.
-///   USERDEFINED:  User-defined heat exchanger type.
-///   NOTDEFINED:  Undefined heat exchanger type.
+/// The slab is used to represent a floor slab against
+///   the ground (and thereby being a part of the
+///   foundation). Another name is mat foundation.
 /// 
-/// HISTORY: New enumeration in IFC R2x.
-typedef enum {IfcHeatExchangerType_PLATE, IfcHeatExchangerType_SHELLANDTUBE, IfcHeatExchangerType_USERDEFINED, IfcHeatExchangerType_NOTDEFINED} IfcHeatExchangerTypeEnum;
-const char* ToString(IfcHeatExchangerTypeEnum v);
-IfcHeatExchangerTypeEnum FromString(const std::string& s);
+/// IFC2x3 CHANGE
+///    new enumerator added.
+typedef enum {IfcSlabType_FLOOR, IfcSlabType_ROOF, IfcSlabType_LANDING, IfcSlabType_BASESLAB, IfcSlabType_USERDEFINED, IfcSlabType_NOTDEFINED} IfcSlabTypeEnum;
+const char* ToString(IfcSlabTypeEnum v);
+IfcSlabTypeEnum FromString(const std::string& s);
 }
-namespace IfcHumidifierTypeEnum {
-/// Enumeration defining the typical types of humidifiers. 
-///   The IfcHumidifierTypeEnum contains the following:
-/// 
-/// STEAMINJECTION: Water vapor is added into the airstream through direction steam injection.
-///   ADIABATICAIRWASHER: Water vapor is added into the airstream through adiabatic evaporation using an air washing element.
-///   ADIABATICPAN:  Water vapor is added into the airstream through adiabatic evaporation using a pan.
-///   ADIABATICWETTEDELEMENT: Water vapor is added into the airstream through adiabatic evaporation using a wetted element.
-///   ADIABATICATOMIZING: Water vapor is added into the airstream through adiabatic evaporation using an atomizing element.
-///   ADIABATICULTRASONIC: Water vapor is added into the airstream through adiabatic evaporation using an ultrasonic element.
-///   ADIABATICRIGIDMEDIA: Water vapor is added into the airstream through adiabatic evaporation using a rigid media.
-///   ADIABATICCOMPRESSEDAIRNOZZLE: Water vapor is added into the airstream through adiabatic evaporation using a compressed air nozzle.
-///   ASSISTEDELECTRIC: Water vapor is added into the airstream through water heated evaporation using an electric heater.
-///   ASSISTEDNATURALGAS: Water vapor is added into the airstream through water heated evaporation using a natural gas heater.
-///   ASSISTEDPROPANE: Water vapor is added into the airstream through water heated evaporation using a propane heater.
-///   ASSISTEDBUTANE: Water vapor is added into the airstream through water heated evaporation using a butane heater.
-///   ASSISTEDSTEAM: Water vapor is added into the airstream through water heated evaporation using a steam heater.
-///   USERDEFINED:  User-defined humidifier type.
-///   NOTDEFINED:  Undefined humidifier type.
+namespace IfcSolarDeviceTypeEnum {
+/// The IfcSolarDeviceTypeEnum defines the range of types of solar devices available.
+///   HISTORY: New type in IFC 2x4. 
 /// 
-/// HISTORY: New enumeration in IFC 2x2.
-typedef enum {IfcHumidifierType_STEAMINJECTION, IfcHumidifierType_ADIABATICAIRWASHER, IfcHumidifierType_ADIABATICPAN, IfcHumidifierType_ADIABATICWETTEDELEMENT, IfcHumidifierType_ADIABATICATOMIZING, IfcHumidifierType_ADIABATICULTRASONIC, IfcHumidifierType_ADIABATICRIGIDMEDIA, IfcHumidifierType_ADIABATICCOMPRESSEDAIRNOZZLE, IfcHumidifierType_ASSISTEDELECTRIC, IfcHumidifierType_ASSISTEDNATURALGAS, IfcHumidifierType_ASSISTEDPROPANE, IfcHumidifierType_ASSISTEDBUTANE, IfcHumidifierType_ASSISTEDSTEAM, IfcHumidifierType_USERDEFINED, IfcHumidifierType_NOTDEFINED} IfcHumidifierTypeEnum;
-const char* ToString(IfcHumidifierTypeEnum v);
-IfcHumidifierTypeEnum FromString(const std::string& s);
-}
-namespace IfcInterceptorTypeEnum {
-/// The IfcInterceptorTypeEnum defines the range of different types of interceptor that can be specified. 
-///   HISTORY: New type in IFC 2x4 
-///   Enumeration 
+/// Enumeration 
 /// 
-/// CYCLONIC: Removes larger liquid drops or larger solid particles. 
-/// GREASE: Chamber, on the line of a drain or discharge pipe, that prevents grease passing into a drainage system (BS6100 330 6205). 
-/// OIL: One or more chambers arranged to prevent the ingress of oil to a drain or sewer, that retain the oil for later removal (BS6100 330 67316). 
-/// PETROL: Two or more chambers with inlet and outlet pipes arranged to allow petrol/gasoline collected on the surface of water drained into them to evaporate through ventilating pipes. 
-/// USERDEFINED: User-defined type. 
+/// SOLARCOLLECTOR: A device that converts solar radiation into thermal energy (heating water, etc.). 
+/// SOLARPANEL: A device that converts solar radiation into electric current. 
+/// USERDEFINED: User-defined type.  
 /// NOTDEFINED: Undefined type.
-typedef enum {IfcInterceptorType_CYCLONIC, IfcInterceptorType_GREASE, IfcInterceptorType_OIL, IfcInterceptorType_PETROL, IfcInterceptorType_USERDEFINED, IfcInterceptorType_NOTDEFINED} IfcInterceptorTypeEnum;
-const char* ToString(IfcInterceptorTypeEnum v);
-IfcInterceptorTypeEnum FromString(const std::string& s);
+typedef enum {IfcSolarDeviceType_SOLARCOLLECTOR, IfcSolarDeviceType_SOLARPANEL, IfcSolarDeviceType_USERDEFINED, IfcSolarDeviceType_NOTDEFINED} IfcSolarDeviceTypeEnum;
+const char* ToString(IfcSolarDeviceTypeEnum v);
+IfcSolarDeviceTypeEnum FromString(const std::string& s);
 }
-namespace IfcInternalOrExternalEnum {
-/// Definition from IAI: This enumeration defines the
-/// different types of space boundaries in terms of either being
-/// inside the building or outside the building.
-/// Enumeration:
-/// 
-/// INTERNAL
-/// 
-/// IfcSpaceBoundary
-/// The space boundary faces a physical
-/// or virtual element where there is an internal space on the other
-/// side.
-/// 
-/// EXTERNAL
+namespace IfcSpaceHeaterTypeEnum {
+/// Enumeration defining the functional type of space heater.
 /// 
-/// IfcSpaceBoundary
-/// The space boundary faces a physical
-/// or virtual element where there is an external space on the other
-/// side (i.e. air). Or it is the space boundary of that external
-/// space against the building.
+/// The IfcSpaceHeaterTypeEnum contains the following:
 /// 
-/// EXTERNAL_EARTH
+/// CONVECTOR: A heat-distributing unit that operates with gravity-circulated air.
+/// RADIATOR: A heat-distributing unit that operates with thermal radiation.
+/// USERDEFINED: User-defined space heater type.
+/// NOTDEFINED:  Undefined space heater type.
 /// 
-/// IfcSpaceBoundary
-/// The space boundary faces a physical
-/// or virtual element where there is earth (or terrain) on the other
-/// side. Or it is the space boundary of that earth (or terrain
-/// object) external space against the building.
+/// NOTE: This enumeration was revised in IFC 2x4 and was renamed from IfcHydronicHeaterTypeEnum in IFC R2x.
 /// 
-/// EXTERNAL_WATER
+/// HISTORY: New enumeration in IFC R2x.
+typedef enum {IfcSpaceHeaterType_CONVECTOR, IfcSpaceHeaterType_RADIATOR, IfcSpaceHeaterType_USERDEFINED, IfcSpaceHeaterType_NOTDEFINED} IfcSpaceHeaterTypeEnum;
+const char* ToString(IfcSpaceHeaterTypeEnum v);
+IfcSpaceHeaterTypeEnum FromString(const std::string& s);
+}
+namespace IfcSpaceTypeEnum {
+/// Definition from IAI: This enumeration defines the
+/// available generic types for IfcSpace and
+/// IfcSpaceType.
+/// HISTORY New enumeration
+/// in IFC2x3.
+/// IFC2x4 CHANGE The enumerators
+/// INTERNAL and EXTERNAL have been added for upward compatibility to
+/// replace InteriorOrExteriorSpace
+/// usage.
+/// Enumeration
 /// 
-/// IfcSpaceBoundary
-/// The space boundary faces a physical
-/// or virtual element where there is water (water component of
-/// terrain) on the other side. Or it is the space boundary of that
-/// object representing water external space against the
-/// building.
+/// SPACE Any space not falling into another category.
 /// 
-/// EXTERNAL_FIRE
+/// NOTE For classification of spaces according to its
+/// function that is often determined by national classification
+/// systems use IfcClassificationReference via the
+/// relationship IfcRelAssociatesClassification.
 /// 
-/// IfcSpaceBoundary
-/// The space boundary faces a physical
-/// or virtual element where there is another building on the other
-/// side. Or it is the space boundary of that other neighbor building
-/// against the building in question.
+/// PARKING A space dedication for use as a parking spot
+/// for vehicles, including access, such as a parking aisle
+/// GFA Gross Floor Area - a specific kind of space for
+/// each building story that includes all net area and construction
+/// area (also the external envelop). Provision of such a specific
+/// space is often required by regulations.
+/// INTERNAL
 /// 
-/// NOTDEFINED
+/// NOTE the use is deprecated and
+/// only provided for backward compatibility
+/// purposes.
 /// 
-/// No information available.
+/// EXTERNAL
 /// 
-/// HISTORY: New enumeration
-/// in IFC Release 2.0
-/// IFC2x4 CHANGE: Enumeration no longer
-/// applicable to IfcSpace. The following enumerators are
-/// added: EXTERNAL_EARTH, EXTERNAL_WATER,
-/// EXTERNAL_FIRE.
-typedef enum {IfcInternalOrExternal_INTERNAL, IfcInternalOrExternal_EXTERNAL, IfcInternalOrExternal_EXTERNAL_EARTH, IfcInternalOrExternal_EXTERNAL_WATER, IfcInternalOrExternal_EXTERNAL_FIRE, IfcInternalOrExternal_NOTDEFINED} IfcInternalOrExternalEnum;
-const char* ToString(IfcInternalOrExternalEnum v);
-IfcInternalOrExternalEnum FromString(const std::string& s);
+/// NOTE the use is deprecated and
+/// only provided for backward compatibility
+/// purposes.
+typedef enum {IfcSpaceType_SPACE, IfcSpaceType_PARKING, IfcSpaceType_GFA, IfcSpaceType_INTERNAL, IfcSpaceType_EXTERNAL, IfcSpaceType_USERDEFINED, IfcSpaceType_NOTDEFINED} IfcSpaceTypeEnum;
+const char* ToString(IfcSpaceTypeEnum v);
+IfcSpaceTypeEnum FromString(const std::string& s);
 }
-namespace IfcInventoryTypeEnum {
-/// IfcInventoryTypeEnum defines the types of inventory that can be defined. 
-///   HISTORY: New Enumeration in IFC Release 2.0  
-///   Enumeration: 
+namespace IfcSpatialZoneTypeEnum {
+/// Definition from IAI: This enumeration defines the range
+/// of different types of spatial zones that can further specify an
+/// IfcSpatialZoneTypeEnum.
+/// HISTORY New enumeration
+/// in IFC Release 2x Edition 4.
+/// Enumeration
 /// 
-/// ASSETINVENTORY: A collection of asset instances of type IfcAsset 
-/// SPACEINVENTORY: A collection of space instances of type IfcSpace 
-/// FURNITUREINVENTORY: A collection of furniture instances of type IfcFurnishingElement 
-/// USERDEFINED: User-defined type. 
-/// NOTDEFINED: Undefined type.
-typedef enum {IfcInventoryType_ASSETINVENTORY, IfcInventoryType_SPACEINVENTORY, IfcInventoryType_FURNITUREINVENTORY, IfcInventoryType_USERDEFINED, IfcInventoryType_NOTDEFINED} IfcInventoryTypeEnum;
-const char* ToString(IfcInventoryTypeEnum v);
-IfcInventoryTypeEnum FromString(const std::string& s);
+/// CONSTRUCTION: the spatial zone is used
+/// to represent a construction zone for the production process
+/// FIRESAFETY: the spatial zone is used to
+/// represent a fire safety zone, or fire compartment
+/// LIGHTING: the spatial zone is used to
+/// represent a lighting zone, e.g. a daylight zone, or a artificial
+/// lighting zone
+/// OCCUPANCY: the spatial zone is used to
+/// represent a zone of particular occupancy
+/// SECURITY: the spatial zone is used to
+/// represent a zone for security planning and maintainance
+/// work.
+/// THERMAL: the spatial zone is used to
+/// represent a thermal zone
+/// USERDEFINED: user defined type spatial
+/// zone
+/// NOTDEFINED: undefined type spatial
+/// zone
+typedef enum {IfcSpatialZoneType_CONSTRUCTION, IfcSpatialZoneType_FIRESAFETY, IfcSpatialZoneType_LIGHTING, IfcSpatialZoneType_OCCUPANCY, IfcSpatialZoneType_SECURITY, IfcSpatialZoneType_THERMAL, IfcSpatialZoneType_TRANSPORT, IfcSpatialZoneType_VENTILATION, IfcSpatialZoneType_USERDEFINED, IfcSpatialZoneType_NOTDEFINED} IfcSpatialZoneTypeEnum;
+const char* ToString(IfcSpatialZoneTypeEnum v);
+IfcSpatialZoneTypeEnum FromString(const std::string& s);
 }
-namespace IfcJunctionBoxTypeEnum {
-/// The IfcJunctionBoxTypeEnum defines the range of types of junction boxes available.
-///   HISTORY: New type in IFC 2x2.  Values added in IFC 2x4. 
+namespace IfcStackTerminalTypeEnum {
+/// An IfcStackTerminalTypeEnum defines the range of different types of stack terminal that can be specified for use at the top of a vertical stack subsystem. 
+///   HISTORY: New type in IFC 2x  
+///   Enumeration 
 /// 
-/// POWER: Contains cables, outlets, and/or switches for electrical power.
-/// DATA: Contains cables, outlets, and/or switches for communications use.
-/// USERDEFINED: User-defined type.
+/// BIRDCAGE: Guard cage, typically wire mesh, at the top of the stack preventing access by birds. 
+/// COWL: A cowling placed at the top of a stack to eliminate downdraft. 
+/// RAINWATERHOPPER: A box placed at the top of a rainwater downpipe to catch rainwater from guttering. 
+/// USERDEFINED: User-defined type. 
 /// NOTDEFINED: Undefined type.
-typedef enum {IfcJunctionBoxType_DATA, IfcJunctionBoxType_POWER, IfcJunctionBoxType_USERDEFINED, IfcJunctionBoxType_NOTDEFINED} IfcJunctionBoxTypeEnum;
-const char* ToString(IfcJunctionBoxTypeEnum v);
-IfcJunctionBoxTypeEnum FromString(const std::string& s);
-}
-namespace IfcKnotType {
-
-typedef enum {IfcKnotType_UNIFORM_KNOTS, IfcKnotType_QUASI_UNIFORM_KNOTS, IfcKnotType_PIECEWISE_BEZIER_KNOTS, IfcKnotType_UNSPECIFIED} IfcKnotType;
-const char* ToString(IfcKnotType v);
-IfcKnotType FromString(const std::string& s);
+typedef enum {IfcStackTerminalType_BIRDCAGE, IfcStackTerminalType_COWL, IfcStackTerminalType_RAINWATERHOPPER, IfcStackTerminalType_USERDEFINED, IfcStackTerminalType_NOTDEFINED} IfcStackTerminalTypeEnum;
+const char* ToString(IfcStackTerminalTypeEnum v);
+IfcStackTerminalTypeEnum FromString(const std::string& s);
 }
-namespace IfcLaborResourceTypeEnum {
-/// This enumeration is used to identify the primary purpose of a labor resource, and is limited to high-level categories based upon common skillsets.  The IfcLaborResourceTypeEnum contains the following:
+namespace IfcStairFlightTypeEnum {
+/// Definition from IAI: This enumeration defines the different types
+///   of stair flights an IfcStairFlightType object can fulfill: 
 /// 
-/// ADMINISTRATION: Coordination of work.
-/// CARPENTRY: Rough carpentry including framing.
-/// CLEANING: Removal of dust and debris.
-/// DRYWALL: Gypsum wallboard placement and taping.
-/// ELECTRIC: Electrical fixtures, equipment, and cables.
-/// FINISHING: Finish carpentry including custom cabinetry.
-/// FLOORING: Carpet, tile, terazzo, wood, or other flooring.
-/// HVAC: Heating and ventilation fixtures, equipment, and ducts.
-/// GENERAL: General labor not requiring specific skill.
-/// LANDSCAPING: Grass, plants, trees, or irrigation.
-/// MASONRY: Laying bricks or blocks with mortar.
-/// PAINTING: Applying decorative coatings or coverings.
-/// PAVING: Asphalt or concrete roads and walkways.
-/// PLUMBING: Plumbing fixtures, equipment, and pipes.
-/// ROOFING: Membranes, shingles, tile, or other roofing.
-/// SITEGRADING: Excavating, filling, or contouring earth.
-/// STEELWORK: Erecting and attaching steel elements.
-/// SURVEYING: Determining positions, distances, and angles.
-/// USERDEFINED: User-defined resource.
-/// NOTDEFINED: Undefined resource.
+/// STRAIGHT: A stair flight with a straight walking line.  
+///   WINDER: A stair flight with a straight walking line. 
+///   SPIRAL: A stair flight with a circular or elliptic walking
+///   line. 
+///   CURVED: A stair flight with a curved walking line. 
+///   FREEFORM: A stair flight with a free form walking line (and
+///   outer boundaries). 
+///   USERDEFINED: User-defined stair flight . 
+///   NOTDEFINED: Undefined stair flight . 
 /// 
-/// HISTORY: New enumeration in IFC2x4
-typedef enum {IfcLaborResourceType_ADMINISTRATION, IfcLaborResourceType_CARPENTRY, IfcLaborResourceType_CLEANING, IfcLaborResourceType_CONCRETE, IfcLaborResourceType_DRYWALL, IfcLaborResourceType_ELECTRIC, IfcLaborResourceType_FINISHING, IfcLaborResourceType_FLOORING, IfcLaborResourceType_GENERAL, IfcLaborResourceType_HVAC, IfcLaborResourceType_LANDSCAPING, IfcLaborResourceType_MASONRY, IfcLaborResourceType_PAINTING, IfcLaborResourceType_PAVING, IfcLaborResourceType_PLUMBING, IfcLaborResourceType_ROOFING, IfcLaborResourceType_SITEGRADING, IfcLaborResourceType_STEELWORK, IfcLaborResourceType_SURVEYING, IfcLaborResourceType_USERDEFINED, IfcLaborResourceType_NOTDEFINED} IfcLaborResourceTypeEnum;
-const char* ToString(IfcLaborResourceTypeEnum v);
-IfcLaborResourceTypeEnum FromString(const std::string& s);
+/// HISTORY: New Enumeration in
+///   Release IFC2x Edition 2.
+typedef enum {IfcStairFlightType_STRAIGHT, IfcStairFlightType_WINDER, IfcStairFlightType_SPIRAL, IfcStairFlightType_CURVED, IfcStairFlightType_FREEFORM, IfcStairFlightType_USERDEFINED, IfcStairFlightType_NOTDEFINED} IfcStairFlightTypeEnum;
+const char* ToString(IfcStairFlightTypeEnum v);
+IfcStairFlightTypeEnum FromString(const std::string& s);
 }
-namespace IfcLampTypeEnum {
-/// The IfcLampTypeEnum defines the range of different types of lamp available. 
+namespace IfcStairTypeEnum {
+/// This enumeration defines the basic configuration of the stair type in terms of the number of stair flights and the number of landings, as illustrated in Figure 69. The type also distinguished turns by windings or by landings. In addition the subdivision of the straight and changing direction stairs is included. The stair configurations are given for stairs without and with one, two or three landings. 
 /// 
-/// HISTORY: New type in IFC 2x2 Addendum
-///   1  
-///   Enumeration 
+/// Stairs which are subdivided into more than three landings have to be defined by the geometry only. Also stairs with non-regular shapes have to be defined by the geometry only. The type of such stairs is OTHEROPERATION. 
 /// 
-/// COMPACTFLUORESCENT: A fluorescent lamp having a compact form factor produced by shaping the tube. 
-/// FLUORESCENT: A typically tubular discharge lamp in which most of the light is emitted by one or several layers of phosphors excited by ultraviolet radiation from the discharge.
-/// HALOGEN: an incandescent lamp in which a tungsten filament is sealed into a compact transport envelope filled with an inert gas and a small amount of halogen such as iodine or bromine.
-/// HIGHPRESSUREMERCURY: A discharge lamp in which most of the light is emitted by exciting mercury at high pressure.
-/// HIGHPRESSURESODIUM: A discharge lamp in which most of the light is emitted by exciting sodium at high pressure.
-/// LED: a solid state lamp that uses light-emitting diodes as the source of light.
-/// METALHALIDE: A discharge lamp in which most of the light is emitted by exciting a metal halide.
-/// OLED: a solid state lamp that uses light-emitting diodes as the source of light whose emissive electroluminescent layer is composed of a film of organic compounds.
-/// TUNGSTENFILAMENT: A lamp that emits light by passing an electrical current through a tungsten wire filament in a near vacuum.
-/// USERDEFINED: User-defined type.
-/// NOTDEFINED: Undefined type.
-typedef enum {IfcLampType_COMPACTFLUORESCENT, IfcLampType_FLUORESCENT, IfcLampType_HALOGEN, IfcLampType_HIGHPRESSUREMERCURY, IfcLampType_HIGHPRESSURESODIUM, IfcLampType_LED, IfcLampType_METALHALIDE, IfcLampType_OLED, IfcLampType_TUNGSTENFILAMENT, IfcLampType_USERDEFINED, IfcLampType_NOTDEFINED} IfcLampTypeEnum;
-const char* ToString(IfcLampTypeEnum v);
-IfcLampTypeEnum FromString(const std::string& s);
-}
-namespace IfcLayerSetDirectionEnum {
-/// IfcLayerSetDirectionEnum provides identification of the axis of element geometry, denoting the layer set thickness direction, or direction of layer offsets.
+/// HISTORY New Enumeration in IFC Release 2.0. 
 /// 
-/// ENUMERATION
+/// Enumerator 
+///   Description 
+///   Figure 
 /// 
-/// AXIS1: Usually x-axis.
-/// AXIS2: Usually y-axis.
-/// AXIS3: Usually z-axis.
+/// StraightRunStair 
+///   A stair extending from
+///   one level to another without turns or winders. The stair consists of one
+///   straight flight. 
 /// 
-/// HISTORY: New Type in IFC2x.
-typedef enum {IfcLayerSetDirection_AXIS1, IfcLayerSetDirection_AXIS2, IfcLayerSetDirection_AXIS3} IfcLayerSetDirectionEnum;
-const char* ToString(IfcLayerSetDirectionEnum v);
-IfcLayerSetDirectionEnum FromString(const std::string& s);
-}
-namespace IfcLightDistributionCurveEnum {
-/// There are three kinds of light distribution curves, according to Standard CEN TC 169, prEN 13032-1, CIE 121: 
+/// TwoStraightRunStair 
+///   A straight stair
+///   consisting of two straight flights without turns but with one landing. 
 /// 
-/// TYPE_A: Type A is basically not used. For completeness the Type A Photometry equals the Type B rotated 90° around the Z-Axis counter clockwise. 
-/// TYPE_B: Type B is sometimes used for floodlights. The B-Plane System has a horizontal axis. B-Angles are valid from -180° to +180° with B 0° at the bottom and B180°/B-180° at the top, &#946;-Angles are valid from -90° to +90°. (See Figure 302.)
-/// TYPE_C: Type C is the recommended standard system. The C-Plane system equals a globe with a vertical axis. C-Angles are valid from 0° to 360°, &#947;-Angles are valid from 0° (south pole) to 180° (north pole). (See Figure 302.) 
+/// QuarterWindingStair 
+///   A stair consisting of one
+///   flight with a quarter winder, which is making a 90° turn. The direction of
+///   the turn is determined by the walking line. 
 /// 
-/// <table
+/// QuarterTurnStair 
+///   A stair making a 90°
+///   turn, consisting of two straight flights connected by a quarterspace landing.
+///   The direction of the turn is determined by the walking line. 
 /// 
-/// B-Type System 
-///   C-Type System 
+/// HalfWindingStair 
+///   A stair consisting of one
+///   flight with one half winder, which makes a 180° turn. The orientation of
+///   the turn is determined by the walking line. 
 /// 
-/// Figure 302 — Light distribution curves
+/// HalfTurnStair 
+///   A stair making a 180°
+///   turn, consisting of two straight flights connected by a halfspace landing. The
+///   orientation of the turn is determined by the walking line. 
 /// 
-/// HISTORY  This is a new enumeration in IFC2x2.
-typedef enum {IfcLightDistributionCurve_TYPE_A, IfcLightDistributionCurve_TYPE_B, IfcLightDistributionCurve_TYPE_C, IfcLightDistributionCurve_NOTDEFINED} IfcLightDistributionCurveEnum;
-const char* ToString(IfcLightDistributionCurveEnum v);
-IfcLightDistributionCurveEnum FromString(const std::string& s);
-}
-namespace IfcLightEmissionSourceEnum {
-/// IfcLightEmissionSourceEnum defines the range of different types of light emitter available. 
+/// TwoQuarterWindingStair 
+///   A stair consisting of one
+///   flight with two quarter winders, which make a 90° turn. The stair makes a
+///   180° turn. The direction of the turns is determined by the walking
+///   line. 
 /// 
-/// HISTORY: New type in IFC2x2.
+/// TwoQuarterTurnStair 
+///   A stair making a 180°
+///   turn, consisting of three straight flights connected by two quarterspace
+///   landings. The direction of the turns is determined by the walking line. 
 /// 
-/// Enumeration 
+/// ThreeQuarterWindingStair
 /// 
-/// COMPACTFLUORESCENT
-/// FLUORESCENT
-/// HIGHPRESSUREMERCURY
-/// HIGHPRESSURESODIUM
-/// LIGHTEMITTINGDIODE
-/// LOWPRESSURESODIUM
-/// LOWVOLTAGEHALOGEN
-/// MAINVOLTAGEHALOGEN
-/// METALHALIDE 
-/// TUNGSTENFILAMENT 
-/// NOTDEFINED
-typedef enum {IfcLightEmissionSource_COMPACTFLUORESCENT, IfcLightEmissionSource_FLUORESCENT, IfcLightEmissionSource_HIGHPRESSUREMERCURY, IfcLightEmissionSource_HIGHPRESSURESODIUM, IfcLightEmissionSource_LIGHTEMITTINGDIODE, IfcLightEmissionSource_LOWPRESSURESODIUM, IfcLightEmissionSource_LOWVOLTAGEHALOGEN, IfcLightEmissionSource_MAINVOLTAGEHALOGEN, IfcLightEmissionSource_METALHALIDE, IfcLightEmissionSource_TUNGSTENFILAMENT, IfcLightEmissionSource_NOTDEFINED} IfcLightEmissionSourceEnum;
-const char* ToString(IfcLightEmissionSourceEnum v);
-IfcLightEmissionSourceEnum FromString(const std::string& s);
-}
-namespace IfcLightFixtureTypeEnum {
-/// The IfcLightFixtureTypeEnum defines the range of different types of light fixture available.
+/// A stair consisting of one
+///   flight with three quarter winders, which make a 90° turn. The stair makes a
+///   270° turn. The direction of the turns is determined by the walking
+///   line. 
 /// 
-/// HISTORY: New type in IFC 2x Edition 2IFC 2x4: SECURITYLIGHTING added
+/// ThreeQuarterTurnStair 
+///   A stair making a 270°
+///   turn, consisting of four straight flights connected by three quarterspace
+///   landings. The direction of the turns is determined by the walking line. 
 /// 
-/// Enumeration
+/// SpiralStair 
+///   A stair constructed with
+///   winders around a circular newel often without landings. Depending on outer
+///   boundary it can be either a circular, elliptical or rectangular spiral stair.
+///   The orientation of the winding stairs is determined by the walking line. 
 /// 
-/// POINTSOURCE: A light fixture that is considered to have negligible area and that emit light with approximately equal intensity in all directions.  A light fixture containing a tungsten, halogen or similar bulb is an example of a point source.
-/// DIRECTIONSOURCE: A light fixture that is considered to have a length or surface area from which it emits light in a direction. A light fixture containing one or more fluorescent lamps is an example of a direction source. 
-/// SECURITYLIGHTING: A light fixture having specific purpose of directing occupants in an emergency, such as an illuminated exit sign or emergency flood light. 
-/// USERDEFINED: User-defined type.
-/// NOTDEFINED: Undefined type.
-typedef enum {IfcLightFixtureType_POINTSOURCE, IfcLightFixtureType_DIRECTIONSOURCE, IfcLightFixtureType_SECURITYLIGHTING, IfcLightFixtureType_USERDEFINED, IfcLightFixtureType_NOTDEFINED} IfcLightFixtureTypeEnum;
-const char* ToString(IfcLightFixtureTypeEnum v);
-IfcLightFixtureTypeEnum FromString(const std::string& s);
-}
-namespace IfcLoadGroupTypeEnum {
-/// Definition from IAI: This type definition is used to distinguish between different levels
-/// of load grouping.  It allows to differentiate between load groups, load cases, and load combinations.
-/// Normally, these enumeration types shall be used in the following context:
+/// DoubleReturnStair 
+///   A stair having one
+///   straight flight to a wide quarterspace landing, and two side flights from that
+///   landing into opposite directions. The stair is making a 90° turn. The
+///   direction of traffic is determined by the walking line. 
 /// 
-/// LOAD_GROUP groups instances of subtypes of IfcStructuralAction.  It shall be used as a
-///   container for loads grouped together for specific purposes, e.g. loads which are part of a
-///   special load pattern.
-///   LOAD_CASE groups LOAD_GROUPs and instances of subtypes of IfcStructuralAction.
-///   It should be used as a container for loads with the same origin.
-///   LOAD_COMBINATION_GROUP is an intermediate level between LOAD_CASE and LOAD_COMBINATION.
-///   The purpose of this level is to provide a factor with which one or more LOAD_CASEs occur in a
-///   LOAD_COMBINATION.  This factor cannot be specified directly at the load case if the load case
-///   is meant to occur in more than one combination with different factors.
-///   This intermediate level is obsolete.  Instead, 
-///   LOAD_COMBINATION is used to group load cases which act together into a load combination.
-///   USERDEFINED:  A grouping level which does not follow the standard hierarchy of load group types.
-///   NOTDEFINED:  The grouping level is not yet known.
+/// CurvedRunStair 
+///   A stair extending from one
+///   level to another without turns or winders. The stair is consisting of one
+///   curved flight. 
 /// 
-/// HISTORY: New type in IFC 2x2.
+/// TwoCurvedRunStair 
+///   A curved stair consisting of
+///   two curved flights without turns but with one landing. 
 /// 
-/// IFC 2x4 change:  Obsolete item LOAD_COMBINATION_GROUP removed.  Load cases are directly assigned to load combinations with different factors for each load case—load combination pair by means of IfcRelAssignsToGroupByFactor.
-typedef enum {IfcLoadGroupType_LOAD_GROUP, IfcLoadGroupType_LOAD_CASE, IfcLoadGroupType_LOAD_COMBINATION, IfcLoadGroupType_USERDEFINED, IfcLoadGroupType_NOTDEFINED} IfcLoadGroupTypeEnum;
-const char* ToString(IfcLoadGroupTypeEnum v);
-IfcLoadGroupTypeEnum FromString(const std::string& s);
+/// OtherOperation 
+///   Free form stair (user defined
+///   operation type) 
+///     
+/// 
+/// NotDefined 
+///     
+///     
+/// 
+/// Figure 69 — Stair types
+typedef enum {IfcStairType_STRAIGHT_RUN_STAIR, IfcStairType_TWO_STRAIGHT_RUN_STAIR, IfcStairType_QUARTER_WINDING_STAIR, IfcStairType_QUARTER_TURN_STAIR, IfcStairType_HALF_WINDING_STAIR, IfcStairType_HALF_TURN_STAIR, IfcStairType_TWO_QUARTER_WINDING_STAIR, IfcStairType_TWO_QUARTER_TURN_STAIR, IfcStairType_THREE_QUARTER_WINDING_STAIR, IfcStairType_THREE_QUARTER_TURN_STAIR, IfcStairType_SPIRAL_STAIR, IfcStairType_DOUBLE_RETURN_STAIR, IfcStairType_CURVED_RUN_STAIR, IfcStairType_TWO_CURVED_RUN_STAIR, IfcStairType_USERDEFINED, IfcStairType_NOTDEFINED} IfcStairTypeEnum;
+const char* ToString(IfcStairTypeEnum v);
+IfcStairTypeEnum FromString(const std::string& s);
 }
-namespace IfcLogicalOperatorEnum {
-/// Definition: IfcLogicalOperatorEnum is an enumeration that defines the logical operators that may be applied for the satisfaction of one or more operands (IfcConstraint) at a time. 
+namespace IfcStateEnum {
+/// The IfcStateEnum enumeration identifies the state or accessibility of the object (for example, read/write, locked).
 /// 
-/// HISTORY  New type in IFC Release 2.0.  Renamed from IfcConstraintAggregatorEnum in IFC 2x2
+/// Valid enumerations are:
 /// 
-/// IFC2x4 CHANGE: Extended to include LOGICALXOR, LOGICALNOTAND and LOGICALNOTOR.
+/// READWRITE: Object is in a Read-Write state. It may be modified by an application.
+/// READONLY: Object is in a Read-Only state. It may be viewed but not modified by an application.
+/// LOCKED: Object is in a Locked state. It may not be accessed by an application.
+/// READWRITELOCKED: Object is in a Read-Write-Locked state. It may not be accessed by an application.
+/// READONLYLOCKED: Object is in a Read-Only-Locked state. It may not be accessed by an application.
 /// 
-/// Enumeration 
+/// HISTORY  New enumeration in IFC R2.0.
 /// 
-/// Value 
-///   Definition 
+/// IFC2x3 CHANGE  This concept was initially introduced in IFC 2.0 as IfcModifiedFlag of type BINARY(3) FIXED and has been modified in R2x to an enumeration. It was initially introduced as a first step towards providing facilities for partial model exchange from a server as requested by the IFC implementers. It is intended for use primarily by a model server so that an application can identify the state of the object.
+typedef enum {IfcState_READWRITE, IfcState_READONLY, IfcState_LOCKED, IfcState_READWRITELOCKED, IfcState_READONLYLOCKED} IfcStateEnum;
+const char* ToString(IfcStateEnum v);
+IfcStateEnum FromString(const std::string& s);
+}
+namespace IfcStructuralCurveActivityTypeEnum {
+/// Definition from IAI: Enumeration defining the distribution of load values in a curve action or reaction.
 /// 
-/// LOGICALAND 
-///   Defines a relationship between operands whereby the result is true if all operands are true, i.e. false if at least 
+/// HISTORY New type in IFC 2x4
 /// 
-/// one operand is false. 
+/// ENUMERATION 
 /// 
-/// LOGICALOR 
-///   Defines a relationship between operands whereby the result is true if at least one operand is true, i.e false if 
+/// CONST The load has a constant value over its entire extent.
+///   LINEAR The load value is linearly distributed over the load's extent.
+///   POLYGONAL The load consists of several consecutive linear sections.
+///   EQUIDISTANT The load consists of n consecutive sections of same length and is specified by n+1 load samples.  The interpolation type over the segments is not defined by this distribution type but may be qualified in IfcObject.ObjectType based on additional agreements.
+///   SINUS The load value is distributed as a sinus half wave.
+///   PARABOLA The load value is distributed as a half wave described by a symmetric quadratic parabola.
+///   DISCRETE The load is specified as a series of discrete load points.
+///   USERDEFINED The load distribution is user-defined.
+///   NOTDEFINED The load distribution is undefined.
+typedef enum {IfcStructuralCurveActivityType_CONST, IfcStructuralCurveActivityType_LINEAR, IfcStructuralCurveActivityType_POLYGONAL, IfcStructuralCurveActivityType_EQUIDISTANT, IfcStructuralCurveActivityType_SINUS, IfcStructuralCurveActivityType_PARABOLA, IfcStructuralCurveActivityType_DISCRETE, IfcStructuralCurveActivityType_USERDEFINED, IfcStructuralCurveActivityType_NOTDEFINED} IfcStructuralCurveActivityTypeEnum;
+const char* ToString(IfcStructuralCurveActivityTypeEnum v);
+IfcStructuralCurveActivityTypeEnum FromString(const std::string& s);
+}
+namespace IfcStructuralCurveMemberTypeEnum {
+/// Definition from IAI: This type definition shall be used to
 /// 
-/// all operands are false. 
+/// distinguish between different types of structural 'curve' members, such as
 /// 
-/// LOGICALXOR 
-///   Defines a relationship between operands whereby the result is true if exactly one operand is true (exclusive or). 
+/// cables. The IfcStructuralCurveTypeEnum type is referenced by the entity
 /// 
-/// LOGICALNOTAND 
-///   Defines a relationship between operands whereby the result is true if at least one operand is false, i.e false if 
+/// IfcStructuralCurveMember. 
 /// 
-/// all operands are true. 
+/// RIGID_JOINED_MEMBER:  A member with capacity to carry transverse and axial loads, i.e. a beam. Its actual joints may be rigid or pinned. Typically used in rigid frames.
+/// PIN_JOINED_MEMBER:    A member with capacity to carry axial loads only, i.e. a link. Typically used in trusses.
+/// CABLE:                A tension member which is able to carry transverse loads only under large deflection.
+/// TENSION_MEMBER:       A member without compressional stiffness.
+/// COMPRESSION_MEMBER:   A member without tensional stiffness.
+/// USERDEFINED:          A specially defined member.
+/// NOTDEFINED:           A member without further categorization.
 /// 
-/// LOGICALNOTOR 
-///   Defines a relationship between operands whereby the result is true if all operands are false, i.e false if at least 
+/// HISTORY New type in IFC 2x2.
+/// IFC 2x4 change:  Renamed from IfcStructuralCurveTypeEnum.
+typedef enum {IfcStructuralCurveMemberType_RIGID_JOINED_MEMBER, IfcStructuralCurveMemberType_PIN_JOINED_MEMBER, IfcStructuralCurveMemberType_CABLE, IfcStructuralCurveMemberType_TENSION_MEMBER, IfcStructuralCurveMemberType_COMPRESSION_MEMBER, IfcStructuralCurveMemberType_USERDEFINED, IfcStructuralCurveMemberType_NOTDEFINED} IfcStructuralCurveMemberTypeEnum;
+const char* ToString(IfcStructuralCurveMemberTypeEnum v);
+IfcStructuralCurveMemberTypeEnum FromString(const std::string& s);
+}
+namespace IfcStructuralSurfaceActivityTypeEnum {
+/// Definition from IAI: Enumeration defining the distribution of load values in a surface action or reaction.
 /// 
-/// one operand is true. 
+/// HISTORY New type in IFC 2x4
 /// 
-/// Use Definition 
+/// ENUMERATION 
 /// 
-/// The IfcLogicalOperatorEnum, when applied in a case of three operands, A, B and C, evaluates for each operator as 
+/// CONST The load has a constant value over its entire extent.
+///   BILINEAR The load value is bilinearly distributed over the load's extent.
+///   DISCRETE The load is specified as a series of discrete load points.
+///   ISOCONTOUR The load is specified by a series of iso-curves (level sets), i.e. curves at which the load value is constant.  These curves run perpendicularly to the load gradient.
+///   USERDEFINED The load distribution is user-defined.
+///   NOTDEFINED The load distribution is undefined.
+typedef enum {IfcStructuralSurfaceActivityType_CONST, IfcStructuralSurfaceActivityType_BILINEAR, IfcStructuralSurfaceActivityType_DISCRETE, IfcStructuralSurfaceActivityType_ISOCONTOUR, IfcStructuralSurfaceActivityType_USERDEFINED, IfcStructuralSurfaceActivityType_NOTDEFINED} IfcStructuralSurfaceActivityTypeEnum;
+const char* ToString(IfcStructuralSurfaceActivityTypeEnum v);
+IfcStructuralSurfaceActivityTypeEnum FromString(const std::string& s);
+}
+namespace IfcStructuralSurfaceMemberTypeEnum {
+/// Definition from IAI: This type definition shall be used to
 /// 
-/// follows:
+/// distinguish between different types of structural surface members, such as the
 /// 
-/// TRUTH TABLE: LOGICALAND(A,B,C)
+/// typical mechanical function of walls, slabs and shells.
 /// 
-/// A
-/// F
-/// F
-/// F
-/// T
-/// F
-/// T
-/// T
-/// T
+/// BENDING_ELEMENT:   A member with capacity to carry out-of-plane loads, i.e. a plate.
+/// MEMBRANE_ELEMENT:  A member with capacity to carry in-plane loads, for example a shear wall.
+/// SHELL:             A member with capacity to carry in-plane and out-of-plane loads, i.e. a combination of bending element and membrane element.
+/// USERDEFINED:       A specially defined member.
+/// NOTDEFINED:        A member without further categorization.
 /// 
-/// B
-/// F
-/// F
-/// T
-/// F
-/// T
-/// F
-/// T
-/// T
+/// HISTORY New type in IFC 2x2.
+/// IFC 2x4 change:  Renamed from IfcStructuralSurfaceTypeEnum.
+typedef enum {IfcStructuralSurfaceMemberType_BENDING_ELEMENT, IfcStructuralSurfaceMemberType_MEMBRANE_ELEMENT, IfcStructuralSurfaceMemberType_SHELL, IfcStructuralSurfaceMemberType_USERDEFINED, IfcStructuralSurfaceMemberType_NOTDEFINED} IfcStructuralSurfaceMemberTypeEnum;
+const char* ToString(IfcStructuralSurfaceMemberTypeEnum v);
+IfcStructuralSurfaceMemberTypeEnum FromString(const std::string& s);
+}
+namespace IfcSubContractResourceTypeEnum {
+/// This enumeration is used to identify the primary purpose of a subcontract resource.  The IfcSubContractResourceTypeEnum contains the following:
 /// 
-/// C
-/// F
-/// T
-/// F
-/// F
-/// T
-/// T
-/// F
-/// T
+/// PURCHASE: Furnishing or supplying products.
+/// WORK: Performing work onsite.
+/// USERDEFINED: User-defined resource.
+/// NOTDEFINED: Undefined resource.
 /// 
-/// AND
-/// F
-/// F
-/// F
-/// F
-/// F
-/// F
-/// F
-/// T
+/// HISTORY: New enumeration in IFC2x4
+typedef enum {IfcSubContractResourceType_PURCHASE, IfcSubContractResourceType_WORK, IfcSubContractResourceType_USERDEFINED, IfcSubContractResourceType_NOTDEFINED} IfcSubContractResourceTypeEnum;
+const char* ToString(IfcSubContractResourceTypeEnum v);
+IfcSubContractResourceTypeEnum FromString(const std::string& s);
+}
+namespace IfcSurfaceFeatureTypeEnum {
+/// Definition from IAI: This enumeration indicates the type of a surface feature.
 /// 
-/// TRUTH TABLE: LOGICALOR(A,B,C)
+/// HISTORY New type in IFC 2x4.
 /// 
-/// A
-/// F
-/// F
-/// F
-/// T
-/// F
-/// T
-/// T
-/// T
+/// ENUMERATION
 /// 
-/// B
-/// F
-/// F
-/// T
-/// F
-/// T
-/// F
-/// T
-/// T
+/// MARK A point, line, cross, or other mark, applied for example for easier adjustment of elements during assembly.
+///   TAG A name tag, which allows to identify an element during production, delivery and assembly.  May be manufactured in different ways, e.g. by printing or punching the tracking code onto the element or by attaching an actual tag.
+///   TREATMENT A subtractive surface feature, e.g. grinding, or an additive surface feature, e.g. coating, or an impregnating treatment, or a series of any of these kinds of treatments.
+///   USERDEFINED A user-defined type of surface feature.
+///   NOTDEFINED An undefined type of surface feature.
+typedef enum {IfcSurfaceFeatureType_MARK, IfcSurfaceFeatureType_TAG, IfcSurfaceFeatureType_TREATMENT, IfcSurfaceFeatureType_USERDEFINED, IfcSurfaceFeatureType_NOTDEFINED} IfcSurfaceFeatureTypeEnum;
+const char* ToString(IfcSurfaceFeatureTypeEnum v);
+IfcSurfaceFeatureTypeEnum FromString(const std::string& s);
+}
+namespace IfcSurfaceSide {
+/// IfcSurfaceSide is a denotion of whether negative, positive or both sides of a surface are being referenced. 
 /// 
-/// C
-/// F
-/// T
-/// F
-/// F
-/// T
-/// T
-/// F
-/// T
+/// ENUMERATION Definition from ISO/CD 10303-46:1992: 
 /// 
-/// OR
-/// F
-/// T
-/// T
-/// T
-/// T
-/// T
-/// T
-/// T
+/// POSITIVE: The side of a surface which is in the same direction as the surface normal derived from the mathematical definition.  
+/// NEGATIVE: The side of a surface which is in the opposite direction than the surface normal derived from the mathematical definition. 
+/// BOTH: Both, positive and negative side. 
 /// 
-/// TRUTH TABLE: LOGICALXOR(A,B,C)
+/// NOTE Corresponding ISO 10303 type: surface_side. Please refer to ISO/IS 10303-46:1994 for the final definition of the formal standard.
 /// 
-/// A
-/// F
-/// F
-/// F
-/// T
-/// F
-/// T
-/// T
-/// T
+/// HISTORY: New Enumeration in IFC 2.0
+typedef enum {IfcSurfaceSide_POSITIVE, IfcSurfaceSide_NEGATIVE, IfcSurfaceSide_BOTH} IfcSurfaceSide;
+const char* ToString(IfcSurfaceSide v);
+IfcSurfaceSide FromString(const std::string& s);
+}
+namespace IfcSwitchingDeviceTypeEnum {
+/// The IfcSwitchingDeviceTypeEnum defines the range of different types of switch that can be specified. 
+///   HISTORY: New type in IFC 2x2 
+///   Enumeration 
 /// 
-/// B
-/// F
-/// F
-/// T
-/// F
-/// T
-/// F
-/// T
-/// T
+/// CONTACTOR: An electrical device used to control the flow of power in a circuit on or off. 
+/// DIMMERSWITCH: A dimmer switch has variable positions, and may adjust electrical power or other setting (according to the switched port type). 
+/// EMERGENCYSTOP: An emergency stop device acts to remove as quickly as possible any danger that may have arisen unexpectedly. 
+/// KEYPAD: A set of buttons or switches, each potentially applicable to a different device.  
+/// MOMENTARYSWITCH: A momentary switch has no position, and may trigger some action to occur.  
+/// SELECTORSWITCH: A selector switch has multiple positions, and may switch connectivity or other setting.  
+/// STARTER: A starter is a switch which in the closed position controls the application of power to an electrical device. 
+/// SWITCHDISCONNECTOR: A switch disconnector is a switch which in the open position satisfies the isolating requirements specified for a disconnector. 
+/// SELECTORSWITCH: A selector switch has multiple positions, and may change the source or level of power or other setting (according to the switched port type). 
+/// TOGGLESWITCH: A toggle switch has two positions, and may enable or isolate electrical power or other setting (according to the switched port type). 
+/// USERDEFINED: User-defined type. 
+/// NOTDEFINED: Undefined type.
+typedef enum {IfcSwitchingDeviceType_CONTACTOR, IfcSwitchingDeviceType_DIMMERSWITCH, IfcSwitchingDeviceType_EMERGENCYSTOP, IfcSwitchingDeviceType_KEYPAD, IfcSwitchingDeviceType_MOMENTARYSWITCH, IfcSwitchingDeviceType_SELECTORSWITCH, IfcSwitchingDeviceType_STARTER, IfcSwitchingDeviceType_SWITCHDISCONNECTOR, IfcSwitchingDeviceType_TOGGLESWITCH, IfcSwitchingDeviceType_USERDEFINED, IfcSwitchingDeviceType_NOTDEFINED} IfcSwitchingDeviceTypeEnum;
+const char* ToString(IfcSwitchingDeviceTypeEnum v);
+IfcSwitchingDeviceTypeEnum FromString(const std::string& s);
+}
+namespace IfcSystemFurnitureElementTypeEnum {
+/// IfcSystemFurnitureTypeEnum defines the types of system furniture from which the type required can be selected. 
+///   HISTORY: New Enumeration in IFC 2x4 
+///   Enumeration: 
 /// 
-/// C
-/// F
-/// T
-/// F
-/// F
-/// T
-/// T
-/// F
-/// T
+/// PANEL: Vertical panel used to divide work spaces.  
+/// WORKSURFACE: Workstation countertop.  
+/// USERDEFINED: User-defined type.  
+/// NOTDEFINED: Undefined type.
+typedef enum {IfcSystemFurnitureElementType_PANEL, IfcSystemFurnitureElementType_WORKSURFACE, IfcSystemFurnitureElementType_USERDEFINED, IfcSystemFurnitureElementType_NOTDEFINED} IfcSystemFurnitureElementTypeEnum;
+const char* ToString(IfcSystemFurnitureElementTypeEnum v);
+IfcSystemFurnitureElementTypeEnum FromString(const std::string& s);
+}
+namespace IfcTankTypeEnum {
+/// Enumeration defining the typical types of tanks.
 /// 
-/// XOR
-/// F
-/// T
-/// T
-/// T
-/// F
-/// F
-/// F
-/// F
+/// The IfcTankTypeEnum contains the following:
 /// 
-/// TRUTH TABLE: LOGICALNOTAND(A,B,C)
+/// BASIN:  An arbitrary open tank type.
 /// 
-/// A
-/// F
-/// F
-/// F
-/// T
-/// F
-/// T
-/// T
-/// T
+/// BREAKPRESSURE:  An open container that breaks the hydraulic pressure in a distribution system, typically located between the fluid reservoir and the fluid supply points. A typical break pressure tank allows the flow to discharge into the atmosphere, thereby reducing its hydrostatic pressure to zero.
 /// 
-/// B
-/// F
-/// F
-/// T
-/// F
-/// T
-/// F
-/// T
-/// T
+/// EXPANSION:  A closed container used in a closed fluid distribution system to mitigate the effects of thermal expansion or water hammer. The tank is typically constructed with a diaphragm dividing the tank into two sections, with fluid on one side of the diaphragm and air on the other. One example application is when connected to the primary circuit of a hot water system to accommodate the increase in volume of the water when it is heated.
 /// 
-/// C
-/// F
-/// T
-/// F
-/// F
-/// T
-/// T
-/// F
-/// T
+/// FEEDANDEXPANSION:  An open tank that is used for both storage and thermal expansion. A typical example is a tank used to store make-up water at ambient pressure for supply to a hot water system, simultaneously accommodating increases in volume of the water when heated.
 /// 
-/// NOTAND
-/// T
-/// T
-/// T
-/// T
-/// T
-/// T
-/// T
-/// F
+/// PRESSUREVESSEL:  A closed container used for storing fluids or gases at a pressure different from the ambient pressure. A pressure vessel is typically rated by an authority having jurisdiction for the operational pressure.
 /// 
-/// TRUTH TABLE: LOGICALNOTOR(A,B,C)
+/// STORAGE:  An open or closed containter used for storing a fluid at ambient pressure and from which it can be supplied to the fluid distribution system. There are many examples of storage tanks, such as potable water storage tanks, fuel storage tanks, etc.
 /// 
-/// A
-/// F
-/// F
-/// F
-/// T
-/// F
-/// T
-/// T
-/// T
+/// VESSEL:  An arbitrary closed tank type.
 /// 
-/// B
-/// F
-/// F
-/// T
-/// F
-/// T
-/// F
-/// T
-/// T
+/// USERDEFINED:  User-defined tank type.
 /// 
-/// C
-/// F
-/// T
-/// F
-/// F
-/// T
-/// T
-/// F
-/// T
+/// NOTDEFINED:  Undefined tank type.
 /// 
-/// NOTOR
-/// T
-/// F
-/// F
-/// F
-/// F
-/// F
-/// F
-/// F
-typedef enum {IfcLogicalOperator_LOGICALAND, IfcLogicalOperator_LOGICALOR, IfcLogicalOperator_LOGICALXOR, IfcLogicalOperator_LOGICALNOTAND, IfcLogicalOperator_LOGICALNOTOR} IfcLogicalOperatorEnum;
-const char* ToString(IfcLogicalOperatorEnum v);
-IfcLogicalOperatorEnum FromString(const std::string& s);
+/// HISTORY: New enumeration in IFC 2x2.  BASIN and VESSEL added in IFC2x4.
+typedef enum {IfcTankType_BASIN, IfcTankType_BREAKPRESSURE, IfcTankType_EXPANSION, IfcTankType_FEEDANDEXPANSION, IfcTankType_PRESSUREVESSEL, IfcTankType_STORAGE, IfcTankType_VESSEL, IfcTankType_USERDEFINED, IfcTankType_NOTDEFINED} IfcTankTypeEnum;
+const char* ToString(IfcTankTypeEnum v);
+IfcTankTypeEnum FromString(const std::string& s);
 }
-namespace IfcMechanicalFastenerTypeEnum {
-/// Definition from IAI: This enumeration defines the
-/// different types of mechanical fasteners:
+namespace IfcTaskDurationEnum {
+/// IfcTaskDurationEnum identifies how a time duration is measured:
 /// 
-/// ANCHORBOLT: A special bolt which is anchored into conrete, stone, or brickwork.
-/// BOLT: A threaded cylindrical rod that engages with a similarly threaded hole in a nut or any other part to form a fastener. The mechanical fastener often also includes one or more washers and one or more nuts.
-/// DOWEL: A cylindrical rod that is driven into holes of the connected pieces.
-/// NAIL: A thin pointed piece of metal that is hammered into materials as a fastener.
-/// NAILPLATE: A piece of sheet metal with punched points that overlaps the connected pieces and is pressed into their material.
-/// RIVET: A fastening part having a head at one end and the other end being hammered flat after being passed through holes in the pieces that are fastened together.
-/// SCREW: A fastener with a tapered threaded shank and a slotted head.
-/// SHEARCONNECTOR: A ring connector that is accepted by ring keyways in the connected pieces; or a toothed circular or square connector that is pressed into the connected pieces.
-/// STAPLE: A doubly pointed piece of metal that is hammered into materials as a fastener.
-/// STUDSHEARCONNECTOR: Stud shear connectors are cylindrical fastening parts with a head on one side. On the other side they are welded on steel members for the use in composite steel and concrete structures.
-/// USERDEFINED: User-defined mechanical fastener
-/// NOTDEFINED: Undefined mechanical fastener
+/// ELAPSEDTIME: The time duration is based on elapsed time (24 hours per day, independent of calendar).
+///   WORKTIME: The time duration is based on work time (calendar-dependent).
+///   NOTDEFINED: The time duration is undefined.
 /// 
-/// HISTORY  New Enumeration in IFC 2x4.
-typedef enum {IfcMechanicalFastenerType_ANCHORBOLT, IfcMechanicalFastenerType_BOLT, IfcMechanicalFastenerType_DOWEL, IfcMechanicalFastenerType_NAIL, IfcMechanicalFastenerType_NAILPLATE, IfcMechanicalFastenerType_RIVET, IfcMechanicalFastenerType_SCREW, IfcMechanicalFastenerType_SHEARCONNECTOR, IfcMechanicalFastenerType_STAPLE, IfcMechanicalFastenerType_STUDSHEARCONNECTOR, IfcMechanicalFastenerType_USERDEFINED, IfcMechanicalFastenerType_NOTDEFINED} IfcMechanicalFastenerTypeEnum;
-const char* ToString(IfcMechanicalFastenerTypeEnum v);
-IfcMechanicalFastenerTypeEnum FromString(const std::string& s);
+/// HISTORY: New enumeration in IFC2x4.
+typedef enum {IfcTaskDuration_ELAPSEDTIME, IfcTaskDuration_WORKTIME, IfcTaskDuration_NOTDEFINED} IfcTaskDurationEnum;
+const char* ToString(IfcTaskDurationEnum v);
+IfcTaskDurationEnum FromString(const std::string& s);
 }
-namespace IfcMedicalDeviceTypeEnum {
-/// Enumeration defining the functional type of medical device.
+namespace IfcTaskTypeEnum {
+/// The IfcTaskTypeEnum defines the range of different types of task that can be specified.
 /// 
-/// The IfcMedicalDeviceTypeEnum contains the following:
+/// HISTORY  New type in IFC2x4
 /// 
-/// AIRSTATION: Device that provides purified medical air, composed of an air compressor and air treatment line.
-/// FEEDERUNIT: Device that feeds air to an oxygen generator, composed of an air compressor, air treatment line, and an air receiver.
-/// OXYGENGENERATOR: Device that generates oxygen from air.
-/// OXYGENPLANT: Device that combines a feed air unit, oxygen generator, and backup oxygen cylinders.
-/// VACUUMSTATION: Device that provides suction, composed of a vacuum pump and bacterial filtration line.
-/// USERDEFINED: User-defined medical device type.
-/// NOTDEFINED:  Undefined medical device type.
+/// Enumeration:
 /// 
-/// HISTORY: New enumeration in IFC 2x4.
-typedef enum {IfcMedicalDeviceType_AIRSTATION, IfcMedicalDeviceType_FEEDAIRUNIT, IfcMedicalDeviceType_OXYGENGENERATOR, IfcMedicalDeviceType_OXYGENPLANT, IfcMedicalDeviceType_VACUUMSTATION, IfcMedicalDeviceType_USERDEFINED, IfcMedicalDeviceType_NOTDEFINED} IfcMedicalDeviceTypeEnum;
-const char* ToString(IfcMedicalDeviceTypeEnum v);
-IfcMedicalDeviceTypeEnum FromString(const std::string& s);
+/// ATTENDANCE: Attendance or waiting on other things happening
+/// CONSTRUCTION: Constructing or building something
+/// DEMOLITION: Demolishing or breaking down something
+/// DISMANTLE: Taking something apart carefully so that it can be recycled or reused
+/// DISPOSAL: Disposing or getting rid of something
+/// INSTALLATION: Installing something (equivalent to construction but more commonly used for engineering tasks)
+/// LOGISTIC: Transporation or delivery of something
+/// MAINTENANCE: Keeping something in good working order
+/// MOVE: Moving things from one place to another
+/// OPERATION: A procedure undertaken to start up the operation an artifact
+/// REMOVAL: Removal of an item from use and taking it from its place of use
+/// RENOVATION: Bringing something to an 'as-new' state
+typedef enum {IfcTaskType_ATTENDANCE, IfcTaskType_CONSTRUCTION, IfcTaskType_DEMOLITION, IfcTaskType_DISMANTLE, IfcTaskType_DISPOSAL, IfcTaskType_INSTALLATION, IfcTaskType_LOGISTIC, IfcTaskType_MAINTENANCE, IfcTaskType_MOVE, IfcTaskType_OPERATION, IfcTaskType_REMOVAL, IfcTaskType_RENOVATION, IfcTaskType_USERDEFINED, IfcTaskType_NOTDEFINED} IfcTaskTypeEnum;
+const char* ToString(IfcTaskTypeEnum v);
+IfcTaskTypeEnum FromString(const std::string& s);
 }
-namespace IfcMemberTypeEnum {
+namespace IfcTendonAnchorTypeEnum {
+
+typedef enum {IfcTendonAnchorType_COUPLER, IfcTendonAnchorType_FIXED_END, IfcTendonAnchorType_TENSIONING_END, IfcTendonAnchorType_USERDEFINED, IfcTendonAnchorType_NOTDEFINED} IfcTendonAnchorTypeEnum;
+const char* ToString(IfcTendonAnchorTypeEnum v);
+IfcTendonAnchorTypeEnum FromString(const std::string& s);
+}
+namespace IfcTendonTypeEnum {
+
+typedef enum {IfcTendonType_BAR, IfcTendonType_COATED, IfcTendonType_STRAND, IfcTendonType_WIRE, IfcTendonType_USERDEFINED, IfcTendonType_NOTDEFINED} IfcTendonTypeEnum;
+const char* ToString(IfcTendonTypeEnum v);
+IfcTendonTypeEnum FromString(const std::string& s);
+}
+namespace IfcTextPath {
+/// The text path determines the direction of the text characters in respect to each other.
+/// 
+/// NOTE: The IfcTextPath is an entity that had been adopted from ISO 10303, Industrial automation systems and integration&#151;Product data representation and exchange, Part 46: Integrated generic resources: Visual presentation.
+/// 
+/// NOTE Corresponding ISO 10303 name:text_path . Please refer to ISO/IS 10303-46:1994 for the final definition of the formal standard.
+/// 
+/// HISTORY New entity in IFC2x2.
+typedef enum {IfcTextPath_LEFT, IfcTextPath_RIGHT, IfcTextPath_UP, IfcTextPath_DOWN} IfcTextPath;
+const char* ToString(IfcTextPath v);
+IfcTextPath FromString(const std::string& s);
+}
+namespace IfcTimeSeriesDataTypeEnum {
+/// IfcTimeSeriesDataTypeEnum describes a type of time series data and is used to determine a value during the time series which is not explicitly specified: 
+/// 
+/// CONTINUOUS: The time series data is continuous. 
+///   DISCRETE: The time series data is discrete. 
+///   DISCRETEBINARY: The time series data is discrete binary. 
+///   PIECEWISEBINARY: The time series data is piecewise binary. 
+///   PIECEWISECONSTANT: The time series data is piecewise constant. 
+///   PIECEWISECONTINUOUS: The time series data is piecewise continuous. 
+///   NOTDEFINED: The time series data is not defined. 
+/// 
+/// HISTORY: New enumeration in IFC2x2.
+typedef enum {IfcTimeSeriesDataType_CONTINUOUS, IfcTimeSeriesDataType_DISCRETE, IfcTimeSeriesDataType_DISCRETEBINARY, IfcTimeSeriesDataType_PIECEWISEBINARY, IfcTimeSeriesDataType_PIECEWISECONSTANT, IfcTimeSeriesDataType_PIECEWISECONTINUOUS, IfcTimeSeriesDataType_NOTDEFINED} IfcTimeSeriesDataTypeEnum;
+const char* ToString(IfcTimeSeriesDataTypeEnum v);
+IfcTimeSeriesDataTypeEnum FromString(const std::string& s);
+}
+namespace IfcTransformerTypeEnum {
+/// The IfcTransformerTypeEnum defines the range of different types of transformer that can be specified. 
+///   HISTORY: New type in IFC 2x2 
+///   Enumeration 
+/// 
+/// CURRENT: A transformer that changes the current between circuits. 
+/// FREQUENCY: A transformer that changes the frequency between circuits. 
+/// INVERTER: A transformer that converts from direct current (DC) to alternating current (AC). 
+/// RECTIFIER: A transformer that converts from alternating current (AC) to direct current (DC).  
+/// VOLTAGE: A transformer that changes the voltage between circuits.  
+/// USERDEFINED: User-defined type. 
+/// NOTDEFINED: Undefined type.
+typedef enum {IfcTransformerType_CURRENT, IfcTransformerType_FREQUENCY, IfcTransformerType_INVERTER, IfcTransformerType_RECTIFIER, IfcTransformerType_VOLTAGE, IfcTransformerType_USERDEFINED, IfcTransformerType_NOTDEFINED} IfcTransformerTypeEnum;
+const char* ToString(IfcTransformerTypeEnum v);
+IfcTransformerTypeEnum FromString(const std::string& s);
+}
+namespace IfcTransitionCode {
+/// Definition from ISO/CD 10303-42:1992: This type conveys the continuity properties of a composite curve or surface. The continuity referred to is geometric, not parametric continuity. For example, in ContSameGradient the tangent vectors of successive segments will have the same direction, but may have different magnitude.  
+/// 
+/// NOTE  Corresponding ISO 10303 type: transition_code, please refer to ISO/IS 10303-42:1994, p. 14 for the final definition of the formal standard.
+/// 
+/// HISTORY  New Type in IFC Release 1.0
+/// 
+/// Figure 273 (quoted from ISO/CD 10303-42:1992, p.55) illustrates transition types.
+/// 
+/// Figure 273 — Transition code
+/// 
+/// ENUMERATION 
+/// 
+/// DISCONTINUOUS: The segments do not join. This is permitted only at the boundary of the curve or surface to indicate that it is not closed.
+/// CONTINUOUS: The segments join but no condition on their tangents is implied. 
+/// CONTSAMEGRADIENT: The segments join and their tangent vectors or tangent planes are parallel and have the same direction at the joint: equality of derivatives is not required. 
+/// CONTSAMEGRADIENTSAMECURVATURE: For a curve, the segments join, their tangent vectors are parallel and in the same direction and their curvatures are equal at the joint: equality of derivatives is not required. For a surface this implies that the principle curvatures are the same and the principle directions are coincident along the common boundary.
+typedef enum {IfcTransitionCode_DISCONTINUOUS, IfcTransitionCode_CONTINUOUS, IfcTransitionCode_CONTSAMEGRADIENT, IfcTransitionCode_CONTSAMEGRADIENTSAMECURVATURE} IfcTransitionCode;
+const char* ToString(IfcTransitionCode v);
+IfcTransitionCode FromString(const std::string& s);
+}
+namespace IfcTransportElementTypeEnum {
+/// Definition from IAI: This enumeration is used to
+/// identify primary transport element types. The
+/// IfcTransportElementTypeEnum contains the following:
+/// 
+/// ELEVATOR: Elevator or lift being a transport device to
+/// move people of good vertically.
+/// ESCALATOR: Escalator being a transport device to move
+/// people. It consists of individual linked steps that move up and
+/// down on tracks while keeping the threads horizontal.
+/// MOVINGWALKWAY: Moving walkway being a transport device
+/// to move people horizontally or on an incline. It is a slow
+/// conveyor belt that transports people.
+/// CRANEWAY: A crane way system, normally including the
+/// crane rails, fasteners and the crane. It is primarily used to
+/// move heavy goods in a factory or other industry buildings.
+/// LIFTINGGEAR: A device used for lifting or lowering
+/// heavy goods. It may be manually operated or electrically or
+/// pneumatically driven.
+/// 
+/// HISTORY  New enumeration
+/// in IFC Release 2x.
+/// IFC2x4 CHANGE  New enumerators
+/// CRANEWAY and LIFTINGGEAR added in
+/// IFC2x4.
+typedef enum {IfcTransportElementType_ELEVATOR, IfcTransportElementType_ESCALATOR, IfcTransportElementType_MOVINGWALKWAY, IfcTransportElementType_CRANEWAY, IfcTransportElementType_LIFTINGGEAR, IfcTransportElementType_USERDEFINED, IfcTransportElementType_NOTDEFINED} IfcTransportElementTypeEnum;
+const char* ToString(IfcTransportElementTypeEnum v);
+IfcTransportElementTypeEnum FromString(const std::string& s);
+}
+namespace IfcTrimmingPreference {
+/// Definition from ISO/CD 10303-42:1992: This type is used to describe the preferred way of trimming a parametric curve where the trimming is multiply defined. 
+/// 
+/// NOTE Corresponding ISO 10303 type: trimming_preference, please refer to ISO/IS 10303-42:1994, p. 18 for the final definition of the formal standard.
+/// 
+/// HISTORY New Type in IFC Release 1.0
+/// 
+/// ENUMERATION 
+/// 
+/// CARTESIAN: Indicates that trimming by Cartesian point is preferred. 
+/// PARAMETER: Indicates the preference for the parameter value. 
+/// UNSPECIFIED: Indicates that no preference is communicated.
+typedef enum {IfcTrimmingPreference_CARTESIAN, IfcTrimmingPreference_PARAMETER, IfcTrimmingPreference_UNSPECIFIED} IfcTrimmingPreference;
+const char* ToString(IfcTrimmingPreference v);
+IfcTrimmingPreference FromString(const std::string& s);
+}
+namespace IfcTubeBundleTypeEnum {
+/// Enumeration defining the typical types of tube bundles. 
+///   The IfcTubeBundleTypeEnum contains the following:
+/// 
+/// FINNED:  Finned tube bundle type.
+///   USERDEFINED:  User-defined tube bundle type.
+///   NOTDEFINED:  Undefined tube bundle type.
+/// 
+/// HISTORY: New enumeration in IFC 2x2.
+typedef enum {IfcTubeBundleType_FINNED, IfcTubeBundleType_USERDEFINED, IfcTubeBundleType_NOTDEFINED} IfcTubeBundleTypeEnum;
+const char* ToString(IfcTubeBundleTypeEnum v);
+IfcTubeBundleTypeEnum FromString(const std::string& s);
+}
+namespace IfcUnitEnum {
+/// IfcUnitEnum is an enumeration type for allowed unit types of IfcNamedUnit.
+/// 
+/// ENUMERATION 
+/// 
+/// ABSORBEDDOSEUNIT
+///   AMOUNTOFSUBSTANCEUNIT
+///   AREAUNIT
+///   DOSEEQUIVALENTUNIT
+///   ELECTRICCAPACITANCEUNIT
+///   ELECTRICCHARGEUNIT
+///   ELECTRICCONDUCTANCEUNIT
+///   ELECTRICCURRENTUNIT
+///   ELECTRICRESISTANCEUNIT
+///   ELECTRICVOLTAGEUNIT
+///   ENERGYUNIT
+///   FORCEUNIT
+///   FREQUENCYUNIT
+///   ILLUMINANCEUNIT
+///   INDUCTANCEUNIT
+///   LENGTHUNIT
+///   LUMINOUSFLUXUNIT
+///   LUMINOUSINTENSITYUNIT
+///   MAGNETICFLUXDENSITYUNIT
+///   MAGNETICFLUXUNIT
+///   MASSUNIT
+///   PLANEANGLEUNIT
+///   POWERUNIT
+///   PRESSUREUNIT
+///   RADIOACTIVITYUNIT
+///   SOLIDANGLEUNIT
+///   THERMODYNAMICTEMPERATUREUNIT
+///   TIMEUNIT
+///   VOLUMEUNIT
+///   USERDEFINED: User defined unit type. The type of unit is only implied by its name or the usage context.
+/// 
+/// HISTORY New type in IFC Release 1.5.1.
+typedef enum {IfcUnit_ABSORBEDDOSEUNIT, IfcUnit_AMOUNTOFSUBSTANCEUNIT, IfcUnit_AREAUNIT, IfcUnit_DOSEEQUIVALENTUNIT, IfcUnit_ELECTRICCAPACITANCEUNIT, IfcUnit_ELECTRICCHARGEUNIT, IfcUnit_ELECTRICCONDUCTANCEUNIT, IfcUnit_ELECTRICCURRENTUNIT, IfcUnit_ELECTRICRESISTANCEUNIT, IfcUnit_ELECTRICVOLTAGEUNIT, IfcUnit_ENERGYUNIT, IfcUnit_FORCEUNIT, IfcUnit_FREQUENCYUNIT, IfcUnit_ILLUMINANCEUNIT, IfcUnit_INDUCTANCEUNIT, IfcUnit_LENGTHUNIT, IfcUnit_LUMINOUSFLUXUNIT, IfcUnit_LUMINOUSINTENSITYUNIT, IfcUnit_MAGNETICFLUXDENSITYUNIT, IfcUnit_MAGNETICFLUXUNIT, IfcUnit_MASSUNIT, IfcUnit_PLANEANGLEUNIT, IfcUnit_POWERUNIT, IfcUnit_PRESSUREUNIT, IfcUnit_RADIOACTIVITYUNIT, IfcUnit_SOLIDANGLEUNIT, IfcUnit_THERMODYNAMICTEMPERATUREUNIT, IfcUnit_TIMEUNIT, IfcUnit_VOLUMEUNIT, IfcUnit_USERDEFINED} IfcUnitEnum;
+const char* ToString(IfcUnitEnum v);
+IfcUnitEnum FromString(const std::string& s);
+}
+namespace IfcUnitaryControlElementTypeEnum {
+/// The IfcUnitaryControlElementTypeEnum defines the range of different types and/or functions of unitary control elements possible. 
+/// 
+/// HISTORY: New type in IFC 2x4. 
+/// 
+/// Enumeration 
+/// 
+/// ALARMPANEL: A control element at which alarms are annunciated. 
+/// CONTROLPANEL: A control element at which devices that control or monitor the operation of a site, building or part of a building are located. 
+/// GASDETECTORPANEL: A control element at which the detection of gas is annunciated. 
+/// INDICATORPANEL: A control element at which equipment operational status, condition, safety state or other required parameters are indicated. 
+/// MIMICPANEL: A control element at which information that is available elsewhere is repeated or 'mimicked'. 
+/// HUMIDISTAT: A control element that senses and regulates the humidity of a system or space so that the humidity is maintained near a desired setpoint. 
+/// THERMOSTAT: A control element that senses and regulates the temperature of an element, system or space so that the temperature is maintained near a desired setpoint. 
+/// WEATHERSTATION: A control element that senses multiple climate properties such as temperature, humidity, pressure, wind, and rain. 
+/// USERDEFINED: User-defined type. 
+/// NOTDEFINED: Undefined type.
+typedef enum {IfcUnitaryControlElementType_ALARMPANEL, IfcUnitaryControlElementType_CONTROLPANEL, IfcUnitaryControlElementType_GASDETECTIONPANEL, IfcUnitaryControlElementType_INDICATORPANEL, IfcUnitaryControlElementType_MIMICPANEL, IfcUnitaryControlElementType_HUMIDISTAT, IfcUnitaryControlElementType_THERMOSTAT, IfcUnitaryControlElementType_WEATHERSTATION, IfcUnitaryControlElementType_USERDEFINED, IfcUnitaryControlElementType_NOTDEFINED} IfcUnitaryControlElementTypeEnum;
+const char* ToString(IfcUnitaryControlElementTypeEnum v);
+IfcUnitaryControlElementTypeEnum FromString(const std::string& s);
+}
+namespace IfcUnitaryEquipmentTypeEnum {
+/// Enumeration defining the functional type of unitary equipment. 
+///   The IfcUnitaryEquipmentTypeEnum contains the following:
+/// 
+/// AIRHANDLER: A unitary air handling unit typically containing a fan, economizer, and coils.
+///   AIRCONDITIONINGUNIT: A unitary packaged air-conditioning unit typically used in residential or light commercial applications.
+///   DEHUMIDIFIER: A unitary packaged dehumidification unit.  Note: units supporting multiple modes (dehumidification, cooling, and/or heating) should use AIRCONDITIONINGUNIT.
+///   SPLITSYSTEM: A system which separates the compressor from the evaporator, but acts as a unitary component typically within residential or light commercial applications.
+///   ROOFTOPUNIT: A packaged assembly that is either field-erected or manufactured atop the roof of a large residential or commercial building and acts as a unitary component.
+///   USERDEFINED: User-defined unitary equipment type.
+///   NOTDEFINED:  Undefined unitary equipment type.
+/// 
+/// HISTORY: New enumeration in IFC R2x.  DEHUMIDIFIER added in IFC 2x4
+typedef enum {IfcUnitaryEquipmentType_AIRHANDLER, IfcUnitaryEquipmentType_AIRCONDITIONINGUNIT, IfcUnitaryEquipmentType_DEHUMIDIFIER, IfcUnitaryEquipmentType_SPLITSYSTEM, IfcUnitaryEquipmentType_ROOFTOPUNIT, IfcUnitaryEquipmentType_USERDEFINED, IfcUnitaryEquipmentType_NOTDEFINED} IfcUnitaryEquipmentTypeEnum;
+const char* ToString(IfcUnitaryEquipmentTypeEnum v);
+IfcUnitaryEquipmentTypeEnum FromString(const std::string& s);
+}
+namespace IfcValveTypeEnum {
+/// The IfcValveTypeEnum defines the
+///   range of different types of valve that can be specified. These are typically
+///   used in conjunction with Pset_ValveTypeCommon, which contains common
+///   properties for all valve types. The IfcValveTypeEnum contains:
+/// 
+/// AIRRELEASE: Valve used to release air from a pipe or fitting.  
+///   ANTIVACUUM: Valve that opens to admit air if the pressure falls below
+///   atmospheric pressure (BS6100 330 4104) 
+///   CHANGEOVER: Valve that enables flow to be switched between pipelines (3 or 4
+///   port). 
+///   CHECK: Valve that permits water to flow in one direction only and is
+///   enclosed when there is no flow (2 port). 
+///   COMMISSIONING: Valve used to facilitate commissioning of a system (2 port). 
+///   DIVERTING: Valve that enables flow to be diverted from one branch of a
+///   pipeline to another (3 port). 
+///   DOUBLECHECK: An assembly that incorporates two valves used to prevent backflow
+///   (BS6100 330 4106). 
+///   DOUBLEREGULATING: Valve used to facilitate regulation of fluid flow in a system.
+///   DRAWOFFCOCK: A valve used to remove fluid from a piping system.
+///   FAUCET: Faucet valve typically used as a flow discharge.
+///   FLUSHING: Valve that flushes a predetermined quantity of water to cleanse a
+///   toilet, urinal, etc.
+///   GASCOCK: Valve that is used for controlling the flow of gas. 
+///   GASTAP: Gas tap typically used for venting or discharging gas from a system.
+///   ISOLATING: Valve that closes off flow in a pipeline. 
+///   MIXING: Valve that enables flow from two branches of a pipeline to be mixed
+///   together (3 port). 
+///   PRESSUREREDUCING: Valve that reduces the pressure of a fluid immediately downstream
+///   of its position in a pipeline to a preselected value or by a predetermined
+///   ratio. 
+///   PRESSURERELIEF: Spring or weight loaded valve that automatically discharges to a
+///   safe place fluid that has built up to excessive pressure in pipes or
+///   fittings 
+///   REGULATING: Valve used to facilitate regulation of fluid flow in a system.
+///   SAFETYCUTOFF: Valve that closes under the action of a safety mechanism such as a
+///   drop weight, solenoid etc. 
+///   STEAMTRAP: Valve that restricts flow of steam while allowing condensate to 
+///   pass through. 
+///   STOPCOCK: An isolating valve used on a domestic water service. 
+///   USERDEFINED: User-defined valve type. 
+///   NOTDEFINED: Undefined valve type. 
+/// 
+/// HISTORY: New type in IFC R2.0
+typedef enum {IfcValveType_AIRRELEASE, IfcValveType_ANTIVACUUM, IfcValveType_CHANGEOVER, IfcValveType_CHECK, IfcValveType_COMMISSIONING, IfcValveType_DIVERTING, IfcValveType_DRAWOFFCOCK, IfcValveType_DOUBLECHECK, IfcValveType_DOUBLEREGULATING, IfcValveType_FAUCET, IfcValveType_FLUSHING, IfcValveType_GASCOCK, IfcValveType_GASTAP, IfcValveType_ISOLATING, IfcValveType_MIXING, IfcValveType_PRESSUREREDUCING, IfcValveType_PRESSURERELIEF, IfcValveType_REGULATING, IfcValveType_SAFETYCUTOFF, IfcValveType_STEAMTRAP, IfcValveType_STOPCOCK, IfcValveType_USERDEFINED, IfcValveType_NOTDEFINED} IfcValveTypeEnum;
+const char* ToString(IfcValveTypeEnum v);
+IfcValveTypeEnum FromString(const std::string& s);
+}
+namespace IfcVibrationIsolatorTypeEnum {
+/// Enumeration defining the typical types of vibration isolators. 
+///   The IfcVibrationIsolatorTypeEnum contains the following:
+/// 
+/// COMPRESSION:  Compression type vibration isolator.
+///   SPRING:  Spring type vibration isolator.
+///   USERDEFINED:  User-defined vibration isolator type.
+///   NOTDEFINED:  Undefined vibration isolator type.
+/// 
+/// HISTORY: New enumeration in IFC 2x2.
+typedef enum {IfcVibrationIsolatorType_COMPRESSION, IfcVibrationIsolatorType_SPRING, IfcVibrationIsolatorType_USERDEFINED, IfcVibrationIsolatorType_NOTDEFINED} IfcVibrationIsolatorTypeEnum;
+const char* ToString(IfcVibrationIsolatorTypeEnum v);
+IfcVibrationIsolatorTypeEnum FromString(const std::string& s);
+}
+namespace IfcVoidingFeatureTypeEnum {
+/// Definition from IAI: This enumeration qualifies a voiding feature regarding its shape and configuration relative to the voided element.
+/// 
+/// HISTORY New type in IFC 2x4.
+/// 
+/// ENUMERATION
+/// 
+/// CUTOUT An internal cutout (creating an opening) or external cutout (creating a recess) of arbitrary shape.  The edges between cutting planes may be overcut or undercut, i.e. rounded.
+///   NOTCH An external cutout of with a mostly rectangular cutting profile.  The edges between cutting planes may be overcut or undercut, i.e. rounded.
+///   HOLE A circular or slotted or threaded hole, typically but not necessarily of smaller dimension than what would be considered a cutout.
+///   MITER A skewed plane end cut, removing material across the entire profile of the voided element.
+///   CHAMFER A skewed plane end cut, removing material only across a part of the profile of the voided element.
+///   EDGE A shape modification along an edge of the element with the edge length as the predominant dimension of the feature, and feature profile dimensions which are typically much smaller than the edge length.  Can for example be a chamfer edge (differentiated from a chamfer by its ratio of dimensions and thus usually manufactured differently), rounded edge (a convex edge feature), or fillet edge (a concave edge feature).
+///   USERDEFINED A user-defined type of voiding feature.
+///   NOTDEFINED An undefined type of voiding feature.
+typedef enum {IfcVoidingFeatureType_CUTOUT, IfcVoidingFeatureType_NOTCH, IfcVoidingFeatureType_HOLE, IfcVoidingFeatureType_MITER, IfcVoidingFeatureType_CHAMFER, IfcVoidingFeatureType_EDGE, IfcVoidingFeatureType_USERDEFINED, IfcVoidingFeatureType_NOTDEFINED} IfcVoidingFeatureTypeEnum;
+const char* ToString(IfcVoidingFeatureTypeEnum v);
+IfcVoidingFeatureTypeEnum FromString(const std::string& s);
+}
+namespace IfcWallTypeEnum {
 /// Definition from IAI: This enumeration defines the
-/// different types of linear elements an IfcMemberType object
-/// can fulfill:
+/// different types of walls an IfcWallType object can
+/// fulfill:
 /// 
-/// BRACE: A linear element (usually sloped) often used
-/// for bracing of a girder or truss.
-/// CHORD: Upper or lower longitudinal member of a truss,
-/// used horizontally or sloped.
-/// COLLAR: A linear element (usually used horizontally)
-/// within a roof structure to connect rafters and posts.
-/// MEMBER: A linear element within a girder or truss with
-/// no further meaning.
-/// MULLION: A linear element within a curtain wall system
-/// to connect two (or more) panels.
-/// PLATE: A linear continuous horizontal element in wall
-/// framing, e.g. a head piece or a sole plate.
+/// STANDARD: A standard wall, extruded vertically with a
+/// constant thickness along the wall path.
+/// POLYGONAL: A polygonal wall, extruded vertically,
+/// where the wall thickness varies along the wall path.
+/// SHEAR: A wall having a non-rectangular cross section
+/// along the wall path.
 /// 
-/// NOTE  This head piece or sole plate shall not
-/// be mixed up with planar elements, such as sheets and panels, that
-/// are handled as IfcPlate (and
-/// IfcPlateType).
+/// NOTE The potentially misleading term shall not impose
+/// a particular resistance against shear forces, but a particular
+/// shape.
 /// 
-/// POST: A linear member (usually used vertically) within
-/// a roof structure to support purlins.
-/// PURLIN: A linear element (usually used horizontally)
-/// within a roof structure to support rafters
-/// RAFTER: A linear elements used to support roof slabs
-/// or roof covering, usually used with slope.
-/// STRINGER: A linear element used to support stair or
-/// ramp flights, usually used with slope.
-/// STRUT: A linear element often used within a girder or
-/// truss.
-/// STUD: Vertical element in wall framing.
-/// USERDEFINED: User-defined linear element.
-/// NOTDEFINED: Undefined linear element
+/// ELEMENTEDWALL: A stud wall framed with studs and faced
+/// with sheatings, sidings, wallboard, or plasterwork.
+/// PLUMBINGWALL: A pier, or enclosure, or encasement,
+/// normally used to enclose plumbing in sanitary rooms.
+/// MOVABLE: A movable wall that is either movable, e.g. a
+/// folding wall, or a sliding wall, or can be easily removed as a
+/// removable partitioning or mounting wall. Movable walls do
+/// normally not define space boundaries and often belong to the
+/// furnishing system.
+/// USERDEFINED: User-defined wall element.
+/// NOTDEFINED: Undefined wall element
 /// 
-/// HISTORY: New
+/// HISTORY  New
 /// Enumeration in Release IFC2x Edition 2.
-/// IFC2x Edition 2
-/// Addendum 1 CHANGE  The additional identifiers CHORD, PLATE, STUD
-/// are added.
-/// IFC2x Edition 3 CHANGE  The additional identifier MULLION has
-/// been added.
-typedef enum {IfcMemberType_BRACE, IfcMemberType_CHORD, IfcMemberType_COLLAR, IfcMemberType_MEMBER, IfcMemberType_MULLION, IfcMemberType_PLATE, IfcMemberType_POST, IfcMemberType_PURLIN, IfcMemberType_RAFTER, IfcMemberType_STRINGER, IfcMemberType_STRUT, IfcMemberType_STUD, IfcMemberType_USERDEFINED, IfcMemberType_NOTDEFINED} IfcMemberTypeEnum;
-const char* ToString(IfcMemberTypeEnum v);
-IfcMemberTypeEnum FromString(const std::string& s);
+/// IFC2x2 ADDENDUM CHANGE 
+/// The enumerator POLYGON has been changed to
+/// POLYGONAL.
+/// IFC2x3 CHANGE  The enumerators
+/// ELEMENTEDWALL and PLUMBINGWALL have been
+/// added.
+/// IFC2x4 CHANGE  New enumerator
+/// MOVABLE has been added.
+typedef enum {IfcWallType_MOVABLE, IfcWallType_PARAPET, IfcWallType_PARTITIONING, IfcWallType_PLUMBINGWALL, IfcWallType_SHEAR, IfcWallType_SOLIDWALL, IfcWallType_STANDARD, IfcWallType_POLYGONAL, IfcWallType_ELEMENTEDWALL, IfcWallType_USERDEFINED, IfcWallType_NOTDEFINED} IfcWallTypeEnum;
+const char* ToString(IfcWallTypeEnum v);
+IfcWallTypeEnum FromString(const std::string& s);
 }
-namespace IfcMotorConnectionTypeEnum {
-/// The IfcMotorConnectionTypeEnum defines the range of different types of motor connection that can be specified. 
-///   HISTORY: New type in IFC 2x.  
-///   Enumeration 
+namespace IfcWasteTerminalTypeEnum {
+/// The IfcWasteTerminalTypeEnum defines the range of different types of waste terminal that can be specified. 
+///   HISTORY: New type in IFC 2x2.  GREASEINTERCEPTOR, OILINTERCEPTOR, PETROLINTERCEPTOR moved to IfcInterceptorTypeEnum in IFC2x4.
 /// 
-/// BELTDRIVE: An indirect connection made through the medium of a shaped, flexible continuous loop. 
-/// COUPLING: An indirect connection made through the medium of the viscosity of a fluid. 
-/// DIRECTDRIVE: A direct, physical connection made between the motor and the driven device. 
+/// Enumeration 	 
+/// 
+/// FLOORTRAP: Pipe fitting, set into the floor, that retains liquid to prevent the passage of foul air 
+/// FLOOORWASTE: Pipe fitting, set into the floor, that collects waste water and discharges it to a separate trap. 
+/// GULLYSUMP: Pipe fitting or assembly of fittings to receive surface water or waste water, fitted with a grating or sealed cover. 
+/// GULLYTRAP: Pipe fitting or assembly of fittings to receive surface water or waste water, fitted with a grating or sealed cover and discharging through a trap (BS6100 330 3504 modified). 
+/// ROOFDRAIN: Pipe fitting, set into the roof, that collects rainwater for discharge into the rainwater system.  
+/// WASTEDISPOSALUNIT: Electrically operated device that reduces kitchen or other waste into fragments small enough to be flushed into a drainage system. 
+/// WASTETRAP: Pipe fitting, set adjacent to a sanitary terminal, that retains liquid to prevent the passage of foul air. 
 /// USERDEFINED: User-defined type. 
 /// NOTDEFINED: Undefined type.
-typedef enum {IfcMotorConnectionType_BELTDRIVE, IfcMotorConnectionType_COUPLING, IfcMotorConnectionType_DIRECTDRIVE, IfcMotorConnectionType_USERDEFINED, IfcMotorConnectionType_NOTDEFINED} IfcMotorConnectionTypeEnum;
-const char* ToString(IfcMotorConnectionTypeEnum v);
-IfcMotorConnectionTypeEnum FromString(const std::string& s);
+typedef enum {IfcWasteTerminalType_FLOORTRAP, IfcWasteTerminalType_FLOORWASTE, IfcWasteTerminalType_GULLYSUMP, IfcWasteTerminalType_GULLYTRAP, IfcWasteTerminalType_ROOFDRAIN, IfcWasteTerminalType_WASTEDISPOSALUNIT, IfcWasteTerminalType_WASTETRAP, IfcWasteTerminalType_USERDEFINED, IfcWasteTerminalType_NOTDEFINED} IfcWasteTerminalTypeEnum;
+const char* ToString(IfcWasteTerminalTypeEnum v);
+IfcWasteTerminalTypeEnum FromString(const std::string& s);
 }
-namespace IfcNullStyle {
-/// Definition from ISO/CD 10303-46:1992: The null style type specifies, that a representation item is not styled.
-/// 
-/// NOTE  Corresponding ISO 10303 name: null_style. Please refer to ISO/IS 10303-46:1994 for the final
-/// definition of the formal standard.
-/// 
-/// HISTORY  New enumeration in IFC2x2.
+namespace IfcWindowPanelOperationEnum {
+/// This enumeration defines the basic ways to describe how window panels operate, as shown in Figure 168. 
 /// 
-/// IFC2x4 CHANGE  The enumeration is deprecated.
-typedef enum {IfcNullStyle_NULL} IfcNullStyle;
-const char* ToString(IfcNullStyle v);
-IfcNullStyle FromString(const std::string& s);
-}
-namespace IfcObjectTypeEnum {
-/// This enumeration defines the applicable object categories, that is, the subtypes at the 2nd level of the IFC inheritance tree. Attached to an object, it indicates to which subtype of IfcObject the entity referencing it would otherwise comply with. 
+/// HISTORY New Enumeration in IFC Release 2.0
 /// 
-/// HISTORY New entity in IFC Release 1.0, has been renamed from IfcProxyEnum in IFC 2x.
-typedef enum {IfcObjectType_PRODUCT, IfcObjectType_PROCESS, IfcObjectType_CONTROL, IfcObjectType_RESOURCE, IfcObjectType_ACTOR, IfcObjectType_GROUP, IfcObjectType_PROJECT, IfcObjectType_NOTDEFINED} IfcObjectTypeEnum;
-const char* ToString(IfcObjectTypeEnum v);
-IfcObjectTypeEnum FromString(const std::string& s);
-}
-namespace IfcObjectiveEnum {
-/// IfcObjectiveEnum is an enumeration used to determine the objective for which purpose the constraint needs to be satisfied. 
+/// Enumerator 
+///   Description 
+///   Figure 
 /// 
-/// HISTORY: IFC2x4 CHANGE: Extended to include CODEWAIVER.
+/// SideHungRightHand 
+///   panel that opens to the right
+///   when viewed from the outside 
+///     
 /// 
-/// Enumeration 
+/// SideHungLeftHand 
+///   panel that opens to the left
+///   when viewed from the outside 
+///     
 /// 
-/// Value 
-///   Definition 
+/// TiltAndTurnRightHand 
+///   panel that opens to the right
+///   and is bottom hung 
+///     
 /// 
-/// CODECOMPLIANCE 
-///   A constraint whose objective is to ensure satisfaction of a code compliance provision. 
+/// TiltAndTurnLeftHand 
+///   panel that opens to the left
+///   and is bottom hung 
+///     
 /// 
-/// CODEWAIVER 
-///   A constraint whose objective is to identify an agreement that code compliance requirements (the waiver) will not be enforced. 
+/// TopHung 
+///   panel is top hung 
+///     
 /// 
-/// DESIGNINTENT 
-///   A constraint whose objective is to ensure satisfaction of a design intent provision. 
+/// BottomHung 
+///   panel is bottom hung 
+///     
 /// 
-/// HEALTHANDSAFETY 
-///   A constraint whose objective is to ensure satisfaction of a health and safety provision. 
+/// PivotHorizontal 
+///   panel is swinging
+///   horizontally (hinges are in the middle) 
+///     
 /// 
-/// REQUIREMENT 
-///   A constraint whose objective is to ensure satisfaction of a project requirement provision. 
+/// PivotVertical 
+///   panel is swinging vertically
+///   (hinges are in the middle) 
+///     
 /// 
-/// SPECIFICATION 
-///   A constraint whose objective is to ensure satisfaction of a specification provision. 
+/// SlidingHorizontal 
+///   panel is sliding horizontally
 /// 
-/// TRIGGERCONDITION 
-///   A constraint whose objective is to indicate a limiting value beyond which the condition of an object requires a particular form of attention.
-typedef enum {IfcObjective_CODECOMPLIANCE, IfcObjective_CODEWAIVER, IfcObjective_DESIGNINTENT, IfcObjective_EXTERNAL, IfcObjective_HEALTHANDSAFETY, IfcObjective_MERGECONFLICT, IfcObjective_MODELVIEW, IfcObjective_PARAMETER, IfcObjective_REQUIREMENT, IfcObjective_SPECIFICATION, IfcObjective_TRIGGERCONDITION, IfcObjective_USERDEFINED, IfcObjective_NOTDEFINED} IfcObjectiveEnum;
-const char* ToString(IfcObjectiveEnum v);
-IfcObjectiveEnum FromString(const std::string& s);
-}
-namespace IfcOccupantTypeEnum {
-/// IfcOccupantTypeEnum defines the types of occupant from which the type required can be selected. 
-///   HISTORY: New Enumeration in IFC Release 2.0 Modified in IFC 2x2 
-///   Enumeration: 
+///   
 /// 
-/// ASSIGNEE: Actor receiving the assignment of a property agreement from an assignor  
-/// ASSIGNOR: Actor assigning a property agreement to an assignor  
-/// LESSEE: Actor receiving the lease of a property from a lessor  
-/// LESSOR: Actor leasing a property to a lessee  
-/// LETTINGAGENT: Actor participating in a property agreement on behalf of an owner, lessor or assignor  
-/// OWNER: Actor that owns a property  
-/// TENANT: Actor renting the use of a property fro a period of time  
-/// USERDEFINED: User-defined type.  
-/// NOTDEFINED: Undefined type.
-typedef enum {IfcOccupantType_ASSIGNEE, IfcOccupantType_ASSIGNOR, IfcOccupantType_LESSEE, IfcOccupantType_LESSOR, IfcOccupantType_LETTINGAGENT, IfcOccupantType_OWNER, IfcOccupantType_TENANT, IfcOccupantType_USERDEFINED, IfcOccupantType_NOTDEFINED} IfcOccupantTypeEnum;
-const char* ToString(IfcOccupantTypeEnum v);
-IfcOccupantTypeEnum FromString(const std::string& s);
-}
-namespace IfcOpeningElementTypeEnum {
-/// Definition from IAI: An enumeration defining the basic
-/// types for opening elements.
+/// SlidingVertical 
+///   panel is sliding
+///   vertically 
+///     
 /// 
-/// HISTORY New enumeration type in
-/// IFC2x4.
+/// RemovableCasement 
+///   panel is removable 
+///     
 /// 
-/// Enumeration
+/// FixedCasement 
+///   panel is fixed 
+///     
 /// 
-/// OPENING: An opening as subtraction
-/// feature that cuts through the element it voids. It thereby
-/// creates a hole. An opening in addiion have a particular meaning
-/// for either providing a void for doors or windows, or an opening
-/// to permit flow of air and passing of light,
-/// RECESS: A opening as subtraction
-/// feature that does not cut through the element it voids. It
-/// creates a niche or similar voiding pattern.
-/// USERDEFINED: User-defined opening
-/// element
-/// NOTDEFINED: Undefined opening
-/// element
-typedef enum {IfcOpeningElementType_OPENING, IfcOpeningElementType_RECESS, IfcOpeningElementType_USERDEFINED, IfcOpeningElementType_NOTDEFINED} IfcOpeningElementTypeEnum;
-const char* ToString(IfcOpeningElementTypeEnum v);
-IfcOpeningElementTypeEnum FromString(const std::string& s);
-}
-namespace IfcOutletTypeEnum {
-/// The IfcOutletTypeEnum defines the range of different types of outlet that can be specified. 
+/// OtherOperation 
+///   user defined operation type 
+///     
 /// 
-/// HISTORY: New type in IFC 2x. Telephone and Data outlets added in IFC 2x4
+/// NotDefined 
+///     
+///     
 /// 
-/// Enumeration 
+/// Figure 168 — Window panel operations
 /// 
-/// AUDIOVISUALOUTLET: An outlet used for an audio or visual device. 
-/// COMMUNICATIONSOUTLET: An outlet used for connecting communications equipment. 
-/// POWEROUTLET: An outlet used for connecting electrical devices requiring power.  
-/// DATAOUTLET: An outlet used for connecting data communications equipment. 
-/// TELEPHONEOUTLET: An outlet used for connecting telephone communications equipment.  
-/// USERDEFINED: User-defined type. 
-/// NOTDEFINED: Undefined type.
-typedef enum {IfcOutletType_AUDIOVISUALOUTLET, IfcOutletType_COMMUNICATIONSOUTLET, IfcOutletType_POWEROUTLET, IfcOutletType_DATAOUTLET, IfcOutletType_TELEPHONEOUTLET, IfcOutletType_USERDEFINED, IfcOutletType_NOTDEFINED} IfcOutletTypeEnum;
-const char* ToString(IfcOutletTypeEnum v);
-IfcOutletTypeEnum FromString(const std::string& s);
-}
-namespace IfcPerformanceHistoryTypeEnum {
-/// This enumeration is used to identify the primary purpose of performance history.  The IfcPerformanceHistoryTypeEnum contains the following:
+/// The opening direction of the window panels is given by the local placement of the IfcWindow. The positive y-axis determines the direction as shown in Figure 169.
+///   NOTE 
 /// 
-/// USERDEFINED: User-defined.
-/// NOTDEFINED: Undefined.
+/// Figures are shown as viewed from the outside (in direction of the
+///   positive y-axis). 
+///   Figures (symbolic representation) depend on the national building
+///   code 
+///   These figures are only shown as illustrations 
 /// 
-/// HISTORY: New enumeration in IFC2x4
-typedef enum {IfcPerformanceHistoryType_USERDEFINED, IfcPerformanceHistoryType_NOTDEFINED} IfcPerformanceHistoryTypeEnum;
-const char* ToString(IfcPerformanceHistoryTypeEnum v);
-IfcPerformanceHistoryTypeEnum FromString(const std::string& s);
+/// Figure 169 — Window panel directions
+typedef enum {IfcWindowPanelOperation_SIDEHUNGRIGHTHAND, IfcWindowPanelOperation_SIDEHUNGLEFTHAND, IfcWindowPanelOperation_TILTANDTURNRIGHTHAND, IfcWindowPanelOperation_TILTANDTURNLEFTHAND, IfcWindowPanelOperation_TOPHUNG, IfcWindowPanelOperation_BOTTOMHUNG, IfcWindowPanelOperation_PIVOTHORIZONTAL, IfcWindowPanelOperation_PIVOTVERTICAL, IfcWindowPanelOperation_SLIDINGHORIZONTAL, IfcWindowPanelOperation_SLIDINGVERTICAL, IfcWindowPanelOperation_REMOVABLECASEMENT, IfcWindowPanelOperation_FIXEDCASEMENT, IfcWindowPanelOperation_OTHEROPERATION, IfcWindowPanelOperation_NOTDEFINED} IfcWindowPanelOperationEnum;
+const char* ToString(IfcWindowPanelOperationEnum v);
+IfcWindowPanelOperationEnum FromString(const std::string& s);
 }
-namespace IfcPermeableCoveringOperationEnum {
-/// Definition: Enumeration defining the valid types of permeable coverings. 
-/// 
-/// Enumeration:
-/// 
-/// GRILL 
-///   protective screen of metal bars or wires
+namespace IfcWindowPanelPositionEnum {
+/// This enumeration defines the basic configuration of the window type in terms of the location of window panels. The window configurations are given for windows with one, two or three panels (including fixed panels) as shown in Figure 170. It corresponds to the OperationType of the IfcWindowStyle definition, which references the IfcWindowPanelProperties. 
 /// 
-/// LOUVER 
-///   set of fixed or movable strips of wood, metal, etc. arranged to let
-///   air in while keeping light or rain out
+/// Windows which are subdivided into more than three panels have to be defined by the geometry only. The type of such windows is given by an IfcWindowStyle.OperationType = USERDEFINED or NOTDEFINED (see IfcWindowStyleOperationEnum for details). 
 /// 
-/// SCREEN 
-///   upright, fixed or movable, sometimes folding framework used for
-///   protection against heat, light, access or similar
+/// HISTORY New Enumeration in IFC Release 2.0.
 /// 
-/// USERDEFINED 
-///   user defined permeable covering type
+/// Enumerator from IfcWindowStyleOperationEnum 
+///   Use of enumerators from IfcWindowPanelPositionEnum 
+///   Figure 
 /// 
-/// NOTDEFINED 
-///   no information available
+/// DoublePanelVertical 
+///   first
+///   IfcWindowPanelProperties with PanelPosition = LEFTsecond
+///   IfcWindowPanelProperties with PanelPosition = RIGHT 
 /// 
-/// HISTORY: New Enumeration in IFC Release 2.0
-typedef enum {IfcPermeableCoveringOperation_GRILL, IfcPermeableCoveringOperation_LOUVER, IfcPermeableCoveringOperation_SCREEN, IfcPermeableCoveringOperation_USERDEFINED, IfcPermeableCoveringOperation_NOTDEFINED} IfcPermeableCoveringOperationEnum;
-const char* ToString(IfcPermeableCoveringOperationEnum v);
-IfcPermeableCoveringOperationEnum FromString(const std::string& s);
-}
-namespace IfcPermitTypeEnum {
-/// IfcPermitTypeEnum defines the types of permits that can be granted. 
-///   HISTORY: New Enumeration in IFC2x4. 
-///   Enumeration: 
+/// DoublePanelHorizontal 
+///   first
+///   IfcWindowPanelProperties with PanelPosition = TOPsecond
+///   IfcWindowPanelProperties with PanelPosition = BOTTOM 
 /// 
-/// ACCESS: Enables access to an identified area. 
-/// BUILDING: Enables work to proceed by getting regulatory permissions. 
-/// WORK: Enables work to be carried out in an identified area. 
-/// USERDEFINED: User-defined type. 
-/// NOTDEFINED: Undefined type.
-typedef enum {IfcPermitType_ACCESS, IfcPermitType_BUILDING, IfcPermitType_WORK, IfcPermitType_USERDEFINED, IfcPermitType_NOTDEFINED} IfcPermitTypeEnum;
-const char* ToString(IfcPermitTypeEnum v);
-IfcPermitTypeEnum FromString(const std::string& s);
-}
-namespace IfcPhysicalOrVirtualEnum {
-/// Definition from IAI: This enumeration defines the
-///   different types of space boundaries in terms of its
-///   physical manifestation. A space boundary can either be
-///   physically dividing or can be a virtual divider.
+/// TriplePanelVertical 
+///   first
+///   IfcWindowPanelProperties with PanelPosition = LEFTsecond
+///   IfcWindowPanelProperties with PanelPosition = MIDDLEthird
+///   IfcWindowPanelProperties with PanelPosition = RIGHT 
 /// 
-/// Enumeration:
+/// TriplePanelHorizontal  
+///   first
+///   IfcWindowPanelProperties with PanelPosition = TOPsecond
+///   IfcWindowPanelProperties with PanelPosition = MIDDLEthird
+///   IfcWindowPanelProperties with PanelPosition = BOTTOM 
 /// 
-/// PHYSICAL
+/// TriplePanelBottom 
+///   first
+///   IfcWindowPanelProperties with PanelPosition = LEFTsecond
+///   IfcWindowPanelProperties with PanelPosition = RIGHTthird
+///   IfcWindowPanelProperties with PanelPosition = BOTTOM 
 /// 
-/// The space boundary is provided physically, i.e. by an
-///   physical element.
+/// TriplePanelTop 
+///   first
+///   IfcWindowPanelProperties with PanelPosition = TOPsecond
+///   IfcWindowPanelProperties with PanelPosition = LEFTthird
+///   IfcWindowPanelProperties with PanelPosition = RIGHT 
 /// 
-/// VIRTUAL
+/// TriplePanelLeft 
+///   first
+///   IfcWindowPanelProperties with PanelPosition = LEFTsecond
+///   IfcWindowPanelProperties with PanelPosition = TOPthird
+///   IfcWindowPanelProperties with PanelPosition = BOTTOM 
 /// 
-/// The space boundary is provided virtually, i.e. by a
-///   logical divider that has no physical manifestation.
+/// TriplePanelRight 
+///   first
+///   IfcWindowPanelProperties with PanelPosition = TOPsecond
+///   IfcWindowPanelProperties with PanelPosition = BOTTOMthird
+///   IfcWindowPanelProperties with PanelPosition = RIGHT 
 /// 
-/// NOTDEFINED
+/// Figure 170 — Window panel positions
 /// 
-/// No information available.
+/// NOTE 
 /// 
-/// HISTORY: New enumeration in
-///   IFC Release 2.0
-typedef enum {IfcPhysicalOrVirtual_PHYSICAL, IfcPhysicalOrVirtual_VIRTUAL, IfcPhysicalOrVirtual_NOTDEFINED} IfcPhysicalOrVirtualEnum;
-const char* ToString(IfcPhysicalOrVirtualEnum v);
-IfcPhysicalOrVirtualEnum FromString(const std::string& s);
+/// The figures are shown as elevations in the XZ plane of the local
+///   placement of the window, looking into the direction of the positive Y
+///   axis. 
+///   These figures are only shown as illustrations.
+typedef enum {IfcWindowPanelPosition_LEFT, IfcWindowPanelPosition_MIDDLE, IfcWindowPanelPosition_RIGHT, IfcWindowPanelPosition_BOTTOM, IfcWindowPanelPosition_TOP, IfcWindowPanelPosition_NOTDEFINED} IfcWindowPanelPositionEnum;
+const char* ToString(IfcWindowPanelPositionEnum v);
+IfcWindowPanelPositionEnum FromString(const std::string& s);
 }
-namespace IfcPileConstructionEnum {
-/// Definition from IAI: Enumeration defining the construction type
-///   for piles. The type is mainly based on how the piles are used and manufactured.
-///   Some material information is mixed in because this affects the way the piles
-///   are used.  
-/// 
-/// HISTORY New type in IFC Release 2x2
-/// 
-/// ENUMERATION 
+namespace IfcWindowStyleConstructionEnum {
+/// Definition from IAI: This enumeration defines the
+///   basic types of construction of windows. The construction
+///   type relates to the main material (or material combination)
+///   used for making the window.
 /// 
-/// CAST_IN_PLACE Piles and piers that are excavated and poured in
-///   place. 
-///   COMPOSITE Piles that are a mix of components, such as a steel
-///   outer casing which is driven into the ground with a cast-in-place concrete
-///   core. 
-///   PRECAST_CONCRETE Piles that are entirely of precast concrete
-///   (possibly with some steel or other fixtures). 
-///   PREFAB_STEEL Prefabricated piles made entirely out of steel.
-///   It will also include steel sheet piles where these are not part of another
-///   construction element. 
-///   USERDEFINED Special types of pile construction which meet
-///   specific local requirements. 
-///   NOTDEFINED The type of pile construction is not defined.
-typedef enum {IfcPileConstruction_CAST_IN_PLACE, IfcPileConstruction_COMPOSITE, IfcPileConstruction_PRECAST_CONCRETE, IfcPileConstruction_PREFAB_STEEL, IfcPileConstruction_USERDEFINED, IfcPileConstruction_NOTDEFINED} IfcPileConstructionEnum;
-const char* ToString(IfcPileConstructionEnum v);
-IfcPileConstructionEnum FromString(const std::string& s);
+/// HISTORY New Enumeration in
+///   IFC Release 2x .
+typedef enum {IfcWindowStyleConstruction_ALUMINIUM, IfcWindowStyleConstruction_HIGH_GRADE_STEEL, IfcWindowStyleConstruction_STEEL, IfcWindowStyleConstruction_WOOD, IfcWindowStyleConstruction_ALUMINIUM_WOOD, IfcWindowStyleConstruction_PLASTIC, IfcWindowStyleConstruction_OTHER_CONSTRUCTION, IfcWindowStyleConstruction_NOTDEFINED} IfcWindowStyleConstructionEnum;
+const char* ToString(IfcWindowStyleConstructionEnum v);
+IfcWindowStyleConstructionEnum FromString(const std::string& s);
 }
-namespace IfcPileTypeEnum {
-/// Definition from IAI: Enumeration defining the pile type. 
+namespace IfcWindowStyleOperationEnum {
+/// This enumeration defines the basic
+///   configuration of the window type in terms of the number of window panels and
+///   the subdivision of the total window. The window configurations are given for
+///   windows with one, two or three panels (including fixed panels) as shown in Figure 171. 
+///   Windows which are subdivided into more than three panels have to be
+///   defined by the geometry only. The type of such windows is USERDEFINED. 
+///   HISTORY New Enumeration in IFC Release 2.0. 
 /// 
-/// HISTORY New type in IFC Release 2x2
-/// IFC 2x4 change:  Items BORED, DRIVEN, JETGROUTING added
+/// Enumerator 
+///   Description 
+///   Figure 
 /// 
-/// BORED A bore pile.
-///   DRIVEN A rammed, vibrated, or otherwise driven pile.
-///   JETGROUTING An injected pile-like construction.
-///   COHESION A cohesion pile.
-///   FRICTION A friction pile.
-///   SUPPORT A support pile.
-///   USERDEFINED The type of pile function is user defined.
-///   NOTDEFINED The type of pile function is not defined.
-typedef enum {IfcPileType_BORED, IfcPileType_DRIVEN, IfcPileType_JETGROUTING, IfcPileType_COHESION, IfcPileType_FRICTION, IfcPileType_SUPPORT, IfcPileType_USERDEFINED, IfcPileType_NOTDEFINED} IfcPileTypeEnum;
-const char* ToString(IfcPileTypeEnum v);
-IfcPileTypeEnum FromString(const std::string& s);
-}
-namespace IfcPipeFittingTypeEnum {
-/// This enumeration is used to identify the primary purpose of a pipe fitting. This is a very basic categorization mechanism
-///   to generically identify the pipe fitting type. Subcategories
-///   of pipe fittings are not enumerated. 
-///   The IfcpipeFittingTypeEnum contains the following:
+/// SinglePanel 
+///   Window with one
+///   panel. 
 /// 
-/// BEND:		A fitting with typically two ports used to change 
-///   the direction of flow between connected elements.
-///   CONNECTOR:   Connector fitting, typically used to join two
-///   ports together within a flow distribution system 
-///   (e.g., a coupling used to join two pipe segments).
-///   ENTRY:       Entry fitting, typically unconnected at one port
-///   and connected to a flow distribution system at 
-///   the other (e.g., a breeching inlet).
-///   EXIT:        Exit fitting, typically unconnected at one port
-///   and connected to a flow distribution system at 
-///   the other (e.g., a hose bibb).
-///   JUNCTION:	A fitting with typically more than two ports used
-///   to redistribute flow among the ports and/or to
-///   change the direction of flow between connected
-///   elements (e.g, tee, cross, wye, etc.).
-///   OBSTRUCTION: A fitting with typically two ports used to 
-///   obstruct or restrict flow between the connected
-///   elements (e.g., screen, perforated plate, etc.).
-///   TRANSITION:	A fitting with typically two ports having
-///   different shapes or sizes. Can also be used to
-///   change the direction of flow between connected
-///   elements.
-///   USERDEFINED: User-defined fitting.
-///   NOTDEFINED:  Undefined fitting.
+/// DoublePanelVertical 
+///   Window with two panels. The
+///   configuration of the panels is vertically. 
 /// 
-/// HISTORY: New enumeration in IFC 2x2
-typedef enum {IfcPipeFittingType_BEND, IfcPipeFittingType_CONNECTOR, IfcPipeFittingType_ENTRY, IfcPipeFittingType_EXIT, IfcPipeFittingType_JUNCTION, IfcPipeFittingType_OBSTRUCTION, IfcPipeFittingType_TRANSITION, IfcPipeFittingType_USERDEFINED, IfcPipeFittingType_NOTDEFINED} IfcPipeFittingTypeEnum;
-const char* ToString(IfcPipeFittingTypeEnum v);
-IfcPipeFittingTypeEnum FromString(const std::string& s);
-}
-namespace IfcPipeSegmentTypeEnum {
-/// This enumeration is used to identify the primary purpose of a
-///   pipe segment. This is a very basic categorization mechanism
-///   to generically identify the pipe segment type. Subcategories
-///   of pipe segments are not enumerated. 
-///   The IfcPipeSegmentTypeEnum contains the following:
+/// DoublePanelHorizontal 
+///   Window with two panels. The
+///   configuration of the panels is horizontally. 
 /// 
-/// CULVERT: A covered channel or large pipe that forms a watercourse below ground level, usually under a road or railway.
-///   RIGIDSEGMENT: A rigid segment is continuous linear segment of pipe that cannot be deformed.
-///   FLEXIBLESEGMENT:  A flexible segment is a continuous non-linear segment of pipe that can be deformed and change the direction of flow.
-///   GUTTER: A gutter segment is a continuous open-channel segment of pipe.
-///   SPOOL: A type of rigid segment that is typically shorter and used for providing connectivity within a piping network.
-///   USERDEFINED: User-defined segment.
-///   NOTDEFINED:  Undefined segment.
+/// TriplePanelVertical 
+///   Window with three panels. The
+///   configuration of the panels is vertically. 
 /// 
-/// HISTORY: New enumeration in IFC 2x2
-typedef enum {IfcPipeSegmentType_CULVERT, IfcPipeSegmentType_FLEXIBLESEGMENT, IfcPipeSegmentType_RIGIDSEGMENT, IfcPipeSegmentType_GUTTER, IfcPipeSegmentType_SPOOL, IfcPipeSegmentType_USERDEFINED, IfcPipeSegmentType_NOTDEFINED} IfcPipeSegmentTypeEnum;
-const char* ToString(IfcPipeSegmentTypeEnum v);
-IfcPipeSegmentTypeEnum FromString(const std::string& s);
-}
-namespace IfcPlateTypeEnum {
-/// Definition from IAI: This enumeration
-/// defines the different types of planar elements an IfcPlateType
-/// object can fulfill:
+/// TriplePanelHorizontal  
+///   Window with three panels. The
+///   configuration of the panels is horizontally. 
 /// 
-/// CURTAIN_PANEL: A planar element within a
-/// curtain wall, often consisting of a frame with fixed glazing.
-///   SHEET: A planar, flat and thin element,
-/// comes usually as metal sheet, and is often used as an additonal part
-/// within an assembly.
-///   USERDEFINED: User-defined linear element.
-///   NOTDEFINED: Undefined linear element
+/// TriplePanelBottom 
+///   Window with three panels. The
+///   configuration of two panels is vertically and the third one is horizontally at
+///   the bottom. 
 /// 
-/// HISTORY  New Enumeration in Release IFC2x Edition 2. 
-/// IFC2x
-/// Edition 3
-/// CHANGE  The additional identifiers CURTAIN_PANEL, SHEET have
-/// been
-/// added.
-typedef enum {IfcPlateType_CURTAIN_PANEL, IfcPlateType_SHEET, IfcPlateType_USERDEFINED, IfcPlateType_NOTDEFINED} IfcPlateTypeEnum;
-const char* ToString(IfcPlateTypeEnum v);
-IfcPlateTypeEnum FromString(const std::string& s);
-}
-namespace IfcProcedureTypeEnum {
-/// The IfcProcedureTypeEnum defines the range of different types of procedure that can be specified.
+/// TriplePanelTop 
+///   Window with three panels. The
+///   configuration of two panels is vertically and the third one is horizontally at
+///   the top. 
 /// 
-/// HISTORY: New type in IFC2x2
+/// TriplePanelLeft 
+///   Window with three panels. The
+///   configuration of two panels is horizontally and the third one is vertically at
+///   the left hand side. 
 /// 
-/// Enumeration:
+/// TriplePanelRight 
+///   Window with three panels. The
+///   configuration of two panels is horizontally and the third one is vertically at
+///   the right hand side. 
 /// 
-/// ADVICE_CAUTION: A caution that should be taken note of as a procedure or when carrying out a procedure
-/// ADVICE_NOTE: Additional information or advice that should be taken note of as a procedure or when carrying out a procedure
-/// ADVICE_WARNING: A warning of potential danger that should be taken note of as a procedure or when carrying out a procedure
-/// CALIBRATION: A procedure undertaken to calibrate an artifact
-/// SHUTDOWN: A procedure undertaken to shutdown the operation an artifact
-/// STARTUP: A procedure undertaken to start up the operation an artifact
-/// USERDEFINED
-/// NOTDEFINED
-typedef enum {IfcProcedureType_ADVICE_CAUTION, IfcProcedureType_ADVICE_NOTE, IfcProcedureType_ADVICE_WARNING, IfcProcedureType_CALIBRATION, IfcProcedureType_DIAGNOSTIC, IfcProcedureType_SHUTDOWN, IfcProcedureType_STARTUP, IfcProcedureType_USERDEFINED, IfcProcedureType_NOTDEFINED} IfcProcedureTypeEnum;
-const char* ToString(IfcProcedureTypeEnum v);
-IfcProcedureTypeEnum FromString(const std::string& s);
-}
-namespace IfcProfileTypeEnum {
-/// The enumeration defines whether the definition of a profile shape shall be geometrically resolved into a curve or into a surface.
+/// UserDefined 
+///   user defined operation
+///   type 
+///     
 /// 
-/// HISTORY: New type in IFC 1.5.
+/// NotDefined 
+///     
+///     
 /// 
-/// Enumeration values:
+/// Figure 171 — Window style operations
 /// 
-/// CURVE: The resulting geometric item is of type curve and closed (with the only exception of the curve created by the IfcArbitraryOpenProfileDef which resolves into an open curve). The resulting geometry after applying a sweeping operation is a swept surface. This can be used to define shapes with thin sheets, such as ducts, where the thickness is not appropriate for geometric representation.
-/// AREA: The resulting geometric item is of type surface. The resulting geometry after applying a sweeping operation is a swept solid with defined volume.
-typedef enum {IfcProfileType_CURVE, IfcProfileType_AREA} IfcProfileTypeEnum;
-const char* ToString(IfcProfileTypeEnum v);
-IfcProfileTypeEnum FromString(const std::string& s);
-}
-namespace IfcProjectOrderTypeEnum {
-/// An IfcProjectOrderTypeEnum is a list of the types of project order that may be identified. 
-///   HISTORY: New type in IFC 2x2  
-///   Enumeration 
+/// NOTE 
 /// 
-/// CHANGEORDER: An instruction to make a change to a product or work being undertaken and a description of the work that is to be performed. 
-/// MAINTENANCEWORKORDER: An instruction to carry out maintenance work and a description of the work that is to be performed. 
-/// MOVEORDER: An instruction to move persons and artefacts and a description of the move locations, objects to be moved, etc.  
-/// PURCHASEORDER: An instruction to purchase goods and/or services and a description of the goods and/or services to be purchased that is to be performed. 
-/// WORKORDER: A general instruction to carry out work and a description of the work to be done. Note the difference between a work order generally and a maintenance work order. 
-/// USERDEFINED: User-defined type. 
-/// NOTDEFINED: Undefined type.
-typedef enum {IfcProjectOrderType_CHANGEORDER, IfcProjectOrderType_MAINTENANCEWORKORDER, IfcProjectOrderType_MOVEORDER, IfcProjectOrderType_PURCHASEORDER, IfcProjectOrderType_WORKORDER, IfcProjectOrderType_USERDEFINED, IfcProjectOrderType_NOTDEFINED} IfcProjectOrderTypeEnum;
-const char* ToString(IfcProjectOrderTypeEnum v);
-IfcProjectOrderTypeEnum FromString(const std::string& s);
+/// The way how each panel operates is defined at the
+///   IfcWindowPanelProperties.OperationType. 
+///   The reference from the window panel to the location of that panel in
+///   the window style configuration is handled by the
+///   IfcWindowPanelProperties.PanelPosition. 
+///   The figures are shown as elevations in the XZ plane of the local
+///   placement of the window, looking into the direction of the positive Y
+///   axis. 
+///   These figures are only shown as illustrations
+typedef enum {IfcWindowStyleOperation_SINGLE_PANEL, IfcWindowStyleOperation_DOUBLE_PANEL_VERTICAL, IfcWindowStyleOperation_DOUBLE_PANEL_HORIZONTAL, IfcWindowStyleOperation_TRIPLE_PANEL_VERTICAL, IfcWindowStyleOperation_TRIPLE_PANEL_BOTTOM, IfcWindowStyleOperation_TRIPLE_PANEL_TOP, IfcWindowStyleOperation_TRIPLE_PANEL_LEFT, IfcWindowStyleOperation_TRIPLE_PANEL_RIGHT, IfcWindowStyleOperation_TRIPLE_PANEL_HORIZONTAL, IfcWindowStyleOperation_USERDEFINED, IfcWindowStyleOperation_NOTDEFINED} IfcWindowStyleOperationEnum;
+const char* ToString(IfcWindowStyleOperationEnum v);
+IfcWindowStyleOperationEnum FromString(const std::string& s);
 }
-namespace IfcProjectedOrTrueLengthEnum {
-/// This enumeration type is needed for load definition and is only considered if the load values are given as global actions and if they define linear or planar loads (that is, one- or two-dimensionally distributed loads).
-/// Figure 234 illustrates the interpretation of a load definition depending on the enumeration types IfcGlobalOrLocalEnum and IfcProjectedOrTrueLengthEnum.
+namespace IfcWindowTypeEnum {
+/// Definition from IAI: This enumeration defines the
+/// different predefined types of an IfcWindowType object can
+/// fulfill:
 /// 
-/// HISTORY  New type in IFC2x2. 
+/// WINDOW: A standard window usually within a wall
+/// opening, as a window panel in a curtain wall, or as a "free
+/// standing" window.
+/// SKYLIGHT: A window within a sloped building element,
+/// usually a roof slab.
+/// LIGHTDOME: A special window that lies horizonally in a
+/// roof slab opening.
+/// USERDEFINED: User-defined window element.
+/// NOTDEFINED: Undefined window element
 /// 
-/// Figure 234 — Projected or true length
-typedef enum {IfcProjectedOrTrueLength_PROJECTED_LENGTH, IfcProjectedOrTrueLength_TRUE_LENGTH} IfcProjectedOrTrueLengthEnum;
-const char* ToString(IfcProjectedOrTrueLengthEnum v);
-IfcProjectedOrTrueLengthEnum FromString(const std::string& s);
+/// HISTORY  New Enumeration
+/// in IFC2x4.
+typedef enum {IfcWindowType_WINDOW, IfcWindowType_SKYLIGHT, IfcWindowType_LIGHTDOME, IfcWindowType_USERDEFINED, IfcWindowType_NOTDEFINED} IfcWindowTypeEnum;
+const char* ToString(IfcWindowTypeEnum v);
+IfcWindowTypeEnum FromString(const std::string& s);
 }
-namespace IfcProjectionElementTypeEnum {
-/// Definition from IAI: An enumeration defining the basic
-/// types for projection elements.
-/// 
-/// HISTORY New enumeration type in
-/// IFC2x4.
+namespace IfcWindowTypePartitioningEnum {
+/// This enumeration defines the basic configuration of the window type in terms of the number of window panels and the subdivision of the total window as shown in Figure 70. The window configurations are given for windows with one, two or three panels (including fixed panels).
 /// 
-/// Enumeration
+/// Windows which are subdivided into more than three panels have to be defined by the geometry only. The type of such windows is USERDEFINED.
 /// 
-/// USERDEFINED: User-defined projection
-/// element
-/// NOTDEFINED: Undefined projection
-/// element
-typedef enum {IfcProjectionElementType_USERDEFINED, IfcProjectionElementType_NOTDEFINED} IfcProjectionElementTypeEnum;
-const char* ToString(IfcProjectionElementTypeEnum v);
-IfcProjectionElementTypeEnum FromString(const std::string& s);
-}
-namespace IfcPropertySetTemplateTypeEnum {
-/// This enumeration defines the general
-/// applicability of instances of IfcPropertySet, or
-/// IfcElementQuantity defined by this
-/// IfcPropertySetTemplate, to subtypes of
-/// IfcObjectDefinition.
+/// HISTORY  New Enumeration in IFC2x4.
+/// NOTE The new IfcWindowTypePartitioningEnum replaces the use of
+/// IfcWindowStyleOperationEnum that is deprecated from IFC2x4 onwards.
 /// 
-/// HISTORY New enumeration in IFC2x4.
+/// Enumerator
+/// Description
+/// Figure
 /// 
-/// Enumeration
+/// SinglePanel
+/// Window with one
+/// panel.
 /// 
-/// PSET_TYPEDRIVENONLY: the property sets
-/// defined by this IfcPropertySetTemplate can only be assigned
-/// to subtypes of IfcTypeObject.
-/// PSET_TYPEDRIVENOVERRIDE: the property
-/// sets defined by this IfcPropertySetTemplate can be assigned
-/// to subtypes of IfcTypeObject and can be overridden by a
-/// property set with same name at subtypes of IfcObject.
-/// PSET_OCCURRENCEDRIVEN: the property sets
-/// defined by this IfcPropertySetTemplate can only be assigned
-/// to subtypes of IfcObject.
-/// PSET_PERFORMANCEDRIVEN: the property sets
-/// defined by this IfcPropertySetTemplate can only be assigned
-/// to IfcPerformanceHistory,
-/// QTO_TYPEDRIVENONLY: the element quantity
-/// defined by this IfcPropertySetTemplate can only be assigned
-/// to subtypes of IfcTypeObject.
-/// QTO_TYPEDRIVENOVERRIDE: the element
-/// quantity defined by this IfcPropertySetTemplate can be
-/// assigned to subtypes of IfcTypeObject and can be overridden
-/// by an element quantity with same name at subtypes of
-/// IfcObject.
-/// QTO_OCCURRENCEDRIVEN: the element
-/// quantity defined by this IfcPropertySetTemplate can only be
-/// assigned to subtypes of IfcObject.
-/// NOTDEFINED: No
-/// restriction provided, the property sets defined by this
-/// IfcPropertySetTemplate can be assigned to any entity, if not
-/// otherwise restricted by the ApplicableEntity attribute.
-typedef enum {IfcPropertySetTemplateType_PSET_TYPEDRIVENONLY, IfcPropertySetTemplateType_PSET_TYPEDRIVENOVERRIDE, IfcPropertySetTemplateType_PSET_OCCURRENCEDRIVEN, IfcPropertySetTemplateType_PSET_PERFORMANCEDRIVEN, IfcPropertySetTemplateType_QTO_TYPEDRIVENONLY, IfcPropertySetTemplateType_QTO_TYPEDRIVENOVERRIDE, IfcPropertySetTemplateType_QTO_OCCURRENCEDRIVEN, IfcPropertySetTemplateType_NOTDEFINED} IfcPropertySetTemplateTypeEnum;
-const char* ToString(IfcPropertySetTemplateTypeEnum v);
-IfcPropertySetTemplateTypeEnum FromString(const std::string& s);
-}
-namespace IfcProtectiveDeviceTrippingUnitTypeEnum {
-/// Defines the range of different tripping unit types that can be used in conjunction with a protective device. 
-/// HISTORY: New enumeration in IFC2x4 
+/// DoublePanelVertical
+/// Window with two panels.
+/// The configuration of the panels is vertically.
 /// 
-/// ELECTRONIC: A tripping unit activated by electronic action. 
-/// ELECTROMAGNETIC: A tripping unit activated by electromagnetic action. 
-/// RESIDUALCURRENT: A tripping unit activated by residual current detection. 
-/// THERMAL: A tripping unit activated by thermal action.
-typedef enum {IfcProtectiveDeviceTrippingUnitType_ELECTRONIC, IfcProtectiveDeviceTrippingUnitType_ELECTROMAGNETIC, IfcProtectiveDeviceTrippingUnitType_RESIDUALCURRENT, IfcProtectiveDeviceTrippingUnitType_THERMAL, IfcProtectiveDeviceTrippingUnitType_USERDEFINED, IfcProtectiveDeviceTrippingUnitType_NOTDEFINED} IfcProtectiveDeviceTrippingUnitTypeEnum;
-const char* ToString(IfcProtectiveDeviceTrippingUnitTypeEnum v);
-IfcProtectiveDeviceTrippingUnitTypeEnum FromString(const std::string& s);
-}
-namespace IfcProtectiveDeviceTypeEnum {
-/// The IfcProtectiveDeviceTypeEnum specifically defines the range of different breaker unit types that can be used in conjunction with protective device. Types may also be used as a reference to a complete protective device in circumstances where tripping units are not separately identified (typically expected to be the case during earlier stages of design). 
+/// DoublePanelHorizontal
+/// Window with two panels.
+/// The configuration of the panels is horizontally.
 /// 
-/// HISTORY: New type in IFC 2x2. Modified definition and usage in IFC 2x4 
+/// TriplePanelVertical
+/// Window with three
+/// panels. The configuration of the panels is vertically.
 /// 
-/// Enumeration
+/// TriplePanelHorizontal
+/// Window with three
+/// panels. The configuration of the panels is horizontally.
 /// 
-/// FUSEDISCONNECTOR: A device that will electrically open the circuit after a period of prolonged, abnormal current flow.
-/// CIRCUITBREAKER: A mechanical switching device capable of making, carrying, and breaking currents under normal circuit conditions and also making, carrying for a specified time and breaking, current under specified abnormal circuit conditions such as those of short circuit.
-/// EARTHINGSWITCH: A safety device used to open or close a circuit when there is no current. Used to isolate a part of a circuit, a machine, a part of an overhead line or an underground line so that maintenance can be safely conducted.
-/// EARTHLEAKAGECIRCUITBREAKER: A device that opens, closes, or isolates a circuit and has short circuit protection but no overload protection.  It attempts to break the circuit when there is a leakage of current from phase to earth, by measuring voltage on the earth conductor.
-/// RESIDUALCURRENTCIRCUITBREAKER: A device that opens, closes, or isolates a circuit and has short circuit and overload protection.  It attempts to break the circuit when there is a difference in current between any two phases.  May also be referred to as 'Ground Fault Interupter (GFI)' or 'Ground Fault Circuit Interuptor (GFCI)'
-/// RESIDUALCURRENTSWITCH: A device that opens, closes or isolates a circuit and has no short circuit or overload protection.  May also be identified as a 'ground fault switch'.
-/// VARISTOR: A high voltage surge protection device.
-/// USERDEFINED: User-defined type.
-/// NOTDEFINED: Undefined type.
-typedef enum {IfcProtectiveDeviceType_CIRCUITBREAKER, IfcProtectiveDeviceType_EARTHLEAKAGECIRCUITBREAKER, IfcProtectiveDeviceType_EARTHINGSWITCH, IfcProtectiveDeviceType_FUSEDISCONNECTOR, IfcProtectiveDeviceType_RESIDUALCURRENTCIRCUITBREAKER, IfcProtectiveDeviceType_RESIDUALCURRENTSWITCH, IfcProtectiveDeviceType_VARISTOR, IfcProtectiveDeviceType_USERDEFINED, IfcProtectiveDeviceType_NOTDEFINED} IfcProtectiveDeviceTypeEnum;
-const char* ToString(IfcProtectiveDeviceTypeEnum v);
-IfcProtectiveDeviceTypeEnum FromString(const std::string& s);
-}
-namespace IfcPumpTypeEnum {
-/// Defines general types of pumps.
+/// TriplePanelBottom
+/// Window with three
+/// panels. The configuration of two panels is vertically and the
+/// third one is horizontally at the bottom.
 /// 
-/// The IfcPumpTypeEnum contains the following:
+/// TriplePanelTop
+/// Window with three
+/// panels. The configuration of two panels is vertically and the
+/// third one is horizontally at the top.
 /// 
-/// CIRCULATOR: A Circulator pump is a generic low-pressure, low-capacity pump. It may have a wet rotor and
-///   may be driven by a flexible-coupled motor.
+/// TriplePanelLeft
+/// Window with three
+/// panels. The configuration of two panels is horizontally and the
+/// third one is vertically at the left hand side.
 /// 
-/// ENDSUCTION: An End Suction pump, when mounted horizontally, has a single horizontal inlet on the impeller suction side
-///   and a vertical discharge. It may have a direct or close-coupled motor.
+/// TriplePanelRight
+/// Window with three
+/// panels. The configuration of two panels is horizontally and the
+/// third one is vertically at the right hand side.
 /// 
-/// SPLITCASE: A Split Case pump, when mounted horizontally, has an inlet and outlet on each side of the impeller.
-///   The impeller can be easily accessed by removing the front of the impeller casing. It may have a direct or close-coupled motor.
+/// UserDefined
+/// user defined operation
+/// type
+///  
 /// 
-/// SUBMERSIBLEPUMP: A pump designed to be immersed in a fluid, typically a collection tank.
+/// NotDefined
+///  
+///  
 /// 
-/// SUMPPUMP: A pump designed to sit above a collection tank with a suction inlet extending into the tank.
+/// Figure 70 — Window partitioning
 /// 
-/// VERTICALINLINE: A Vertical Inline pump has the pump and motor close-coupled on the pump casing.
-///   The pump depends on the connected, horizontal piping for support, with the suction and discharge along the piping axis.
+/// NOTE
 /// 
-/// VERTICALTURBINE: A Vertical Turbine pump has a motor mounted vertically on the pump casing for either
-///   wet-pit sump mounting or dry-well mounting.
+/// The way how each panel operates is defined at the
+/// IfcWindowPanelProperties.OperationType.
+/// The reference from the window panel to the location of that
+/// panel in the window style configuration is handled by the
+/// IfcWindowPanelProperties.PanelPosition.
+/// The figures are shown as elevations in the XZ plane of the
+/// local placement of the window, looking into the direction of the
+/// positive Y axis.
+/// These figures are only shown as illustrations
+typedef enum {IfcWindowTypePartitioning_SINGLE_PANEL, IfcWindowTypePartitioning_DOUBLE_PANEL_VERTICAL, IfcWindowTypePartitioning_DOUBLE_PANEL_HORIZONTAL, IfcWindowTypePartitioning_TRIPLE_PANEL_VERTICAL, IfcWindowTypePartitioning_TRIPLE_PANEL_BOTTOM, IfcWindowTypePartitioning_TRIPLE_PANEL_TOP, IfcWindowTypePartitioning_TRIPLE_PANEL_LEFT, IfcWindowTypePartitioning_TRIPLE_PANEL_RIGHT, IfcWindowTypePartitioning_TRIPLE_PANEL_HORIZONTAL, IfcWindowTypePartitioning_USERDEFINED, IfcWindowTypePartitioning_NOTDEFINED} IfcWindowTypePartitioningEnum;
+const char* ToString(IfcWindowTypePartitioningEnum v);
+IfcWindowTypePartitioningEnum FromString(const std::string& s);
+}
+namespace IfcWorkCalendarTypeEnum {
+/// An IfcWorkCalendarTypeEnum is an enumeration data type that specifies the types of work calendar from which the relevant control can be selected. If given it should help to identify base calendars.
 /// 
-/// USERDEFINED: User-defined pump type.
+/// HISTORY: Introduced in IFC2x4.
 /// 
-/// NOTDEFINED:  Pump type has not been defined.
+/// Enumeration:
 /// 
-/// HISTORY: New enumeration in IFC R2x.  SUBMERSIBLEPUMP and SUMPPUMP added in IFC2x4.
-typedef enum {IfcPumpType_CIRCULATOR, IfcPumpType_ENDSUCTION, IfcPumpType_SPLITCASE, IfcPumpType_SUBMERSIBLEPUMP, IfcPumpType_SUMPPUMP, IfcPumpType_VERTICALINLINE, IfcPumpType_VERTICALTURBINE, IfcPumpType_USERDEFINED, IfcPumpType_NOTDEFINED} IfcPumpTypeEnum;
-const char* ToString(IfcPumpTypeEnum v);
-IfcPumpTypeEnum FromString(const std::string& s);
+/// FIRSTSHIFT: Belongs to the first shift
+/// SECONDSHIFT: Belongs to the second shift
+/// THIRDSHIFT: Belongs to the third shift
+/// USERDEFINED
+/// NOTDEFINED
+typedef enum {IfcWorkCalendarType_FIRSTSHIFT, IfcWorkCalendarType_SECONDSHIFT, IfcWorkCalendarType_THIRDSHIFT, IfcWorkCalendarType_USERDEFINED, IfcWorkCalendarType_NOTDEFINED} IfcWorkCalendarTypeEnum;
+const char* ToString(IfcWorkCalendarTypeEnum v);
+IfcWorkCalendarTypeEnum FromString(const std::string& s);
 }
-namespace IfcRailingTypeEnum {
-/// Definition from IAI: Enumeration defining the valid types of
-///   railings that can be predefined using the enumeration values.  
-///   HISTORY: New Enumeration in IFC
-///   Release 2.0  
-///   Enumeration 
+namespace IfcWorkPlanTypeEnum {
+/// An IfcWorkPlanTypeEnum is an enumeration data type that specifies the types of work plan from which the relevant control can be selected.
 /// 
-/// HANDRAIL: A type of railing designed to serve as an optional
-///   structural support for loads applied by human occupants (at hand height).
-///   Generally located adjacent to ramps and stairs. Generally floor or wall
-///   mounted. 
-///   GUARDRAIL: A type of railing designed to guard human occupants
-///   from falling off a stair, ramp or landing where there is a vertical drop at the
-///   edge of such floors/landings. 
-///   BALUSTRADE: Similar to the definitions of a guardrail except
-///   the location is at the edge of a floor, rather then a stair or ramp. Examples
-///   are balustrates at roof-tops or balconies. 
-///   USERDEFINED: User-defined railing element, a term to identify
-///   the user type is given by the attribute IfcRailing.ObjectType. 
-///   NOTDEFINED: Undefined railing element, no type information
-///   available.
-typedef enum {IfcRailingType_HANDRAIL, IfcRailingType_GUARDRAIL, IfcRailingType_BALUSTRADE, IfcRailingType_USERDEFINED, IfcRailingType_NOTDEFINED} IfcRailingTypeEnum;
-const char* ToString(IfcRailingTypeEnum v);
-IfcRailingTypeEnum FromString(const std::string& s);
+/// HISTORY  Introduced in IFC2x4. Derived from IfcWorkControlTypeEnum that was introduced in IFC Release 2.0.
+/// 
+/// Enumeration:
+/// 
+/// ACTUAL: A control in which actual items undertaken are indicated.
+/// BASELINE: A control that is a baseline from which changes that are made later can be recognized.
+/// PLANNED: A control showing planned items.
+/// USERDEFINED
+/// NOTDEFINED
+typedef enum {IfcWorkPlanType_ACTUAL, IfcWorkPlanType_BASELINE, IfcWorkPlanType_PLANNED, IfcWorkPlanType_USERDEFINED, IfcWorkPlanType_NOTDEFINED} IfcWorkPlanTypeEnum;
+const char* ToString(IfcWorkPlanTypeEnum v);
+IfcWorkPlanTypeEnum FromString(const std::string& s);
 }
-namespace IfcRampFlightTypeEnum {
-/// Definition from IAI: This enumeration defines the different types
-///   of linear elements an IfcRampFlightType object can fulfill: 
+namespace IfcWorkScheduleTypeEnum {
+/// An IfcWorkScheduleTypeEnum is an enumeration data type that specifies the types of work schedule from which the relevant control can be selected.
 /// 
-/// STRAIGHT: A ramp flight with a straight walking line.  
-///   SPIRAL: A ramp flight with a circular or elliptic walking
-///   line. 
-///   USERDEFINED: User-defined ramp flight. 
-///   NOTDEFINED: Undefined ramp flight. 
+/// HISTORY  Introduced in IFC2x4. Derived from IfcWorkControlTypeEnum that was introduced in IFC Release 2.0.
 /// 
-/// HISTORY: New Enumeration in
-///   Release IFC2x Edition 2.
-typedef enum {IfcRampFlightType_STRAIGHT, IfcRampFlightType_SPIRAL, IfcRampFlightType_USERDEFINED, IfcRampFlightType_NOTDEFINED} IfcRampFlightTypeEnum;
-const char* ToString(IfcRampFlightTypeEnum v);
-IfcRampFlightTypeEnum FromString(const std::string& s);
+/// Enumeration:
+/// 
+/// ACTUAL: A control in which actual items undertaken are indicated
+/// BASELINE: A control that is a baseline from which changes that are made later can be recognized
+/// PLANNED: A control showing planned items
+/// USERDEFINED
+/// NOTDEFINED
+typedef enum {IfcWorkScheduleType_ACTUAL, IfcWorkScheduleType_BASELINE, IfcWorkScheduleType_PLANNED, IfcWorkScheduleType_USERDEFINED, IfcWorkScheduleType_NOTDEFINED} IfcWorkScheduleTypeEnum;
+const char* ToString(IfcWorkScheduleTypeEnum v);
+IfcWorkScheduleTypeEnum FromString(const std::string& s);
 }
-namespace IfcRampTypeEnum {
-/// This enumeration defines the basic configuration of the ramp type in terms of the number and shape of ramp flights, as shown in Figure 67. The type also distinguished turns by landings. In addition the subdivision of the straight and changing direction ramps is included. The ramp configurations are given for ramps without and with one and two landings. 
+/// IfcAbsorbedDoseMeasure is a measure of the absorbed radioactivity dose.
+/// Usually measured in Gray (Gy, J/kg).
+/// Type: REAL
 /// 
-/// Ramps which are subdivided into more than two landings have to be defined by the geometry only. Also ramps with non-regular shapes have to be defined by the geometry only. The type of such ramps is USERDEFINED. 
+/// HISTORY New type in IFC Release 2x.
+class IfcAbsorbedDoseMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcAbsorbedDoseMeasure (IfcAbstractEntity* e);
+    IfcAbsorbedDoseMeasure (double v);
+    operator double() const;
+};
+/// IfcAccelerationMeasure is a measure of acceleration.
+/// Usually measured in m/s2.
+/// Type: REAL
 /// 
-/// HISTORY New Enumeration in IFC Release 2.0. 
+/// HISTORY New type in IFC Release 2x.
+class IfcAccelerationMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcAccelerationMeasure (IfcAbstractEntity* e);
+    IfcAccelerationMeasure (double v);
+    operator double() const;
+};
+/// Definition from ISO/CD 10303-41:1992: An amount of substance measure is the value for the quantity  of a substance when compared with the number of atoms in 0.012kilogram of carbon 12.
 /// 
-/// Enumerator 
-///   Description 
-///   Figure 
+/// Usually measure in mole (mol).
+/// Type: REAL
 /// 
-/// StraightRunRamp 
-///   A ramp - which is a sloping
-///   floor, walk, or roadway - connecting two levels. The straight ramp consists of
-///   one straight flight without turns or winders.  
+/// NOTE Corresponding ISO 10303 name: amount_of_substance_measure, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
 /// 
-/// TwoStraightRunRamp 
-///   A straight ramp consisting of
-///   two straight flights without turns but with one landing. 
+/// HISTORY New type in IFC Release 1.5.1.
+class IfcAmountOfSubstanceMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcAmountOfSubstanceMeasure (IfcAbstractEntity* e);
+    IfcAmountOfSubstanceMeasure (double v);
+    operator double() const;
+};
+/// IfcAngularVelocityMeasure is a measure of the velocity of a body measured in terms of angle subtended per unit time.
+/// Usually measured in radians/s.
+/// Type: REAL
 /// 
-/// QuarterTurnRamp 
-///   A ramp making a 90° turn,
-///   consisting of two straight flights connected by a quarterspace landing. The
-///   direction of the turn is determined by the walking line. 
+/// HISTORY New type in IFC Release 2.0.
+class IfcAngularVelocityMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcAngularVelocityMeasure (IfcAbstractEntity* e);
+    IfcAngularVelocityMeasure (double v);
+    operator double() const;
+};
+
+class IfcAreaDensityMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcAreaDensityMeasure (IfcAbstractEntity* e);
+    IfcAreaDensityMeasure (double v);
+    operator double() const;
+};
+/// Definition from ISO/CD 10303-41:1992: An area measure is the value of the extent of a surface.
+/// Usually measured in square metre (m2).
+/// Type: REAL
 /// 
-/// TwoQuarterTurnRamp 
-///   A ramp making a 180°
-///   turn, consisting of three straight flights connected by two quarterspace
-///   landings. The direction of the turn is determined by the walking line. 
+/// NOTE Corresponding ISO 10303 name: area_measure, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
 /// 
-/// HalfTurnRamp 
-///   A ramp making a 180°
-///   turn, consisting of two straight flights connected by a halfspace landing. The
-///   orientation of the turn is determined by the walking line. 
+/// HISTORY New type in IFC Release 1.5.1.
+class IfcAreaMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcAreaMeasure (IfcAbstractEntity* e);
+    IfcAreaMeasure (double v);
+    operator double() const;
+};
+/// IfcBoolean is a defined data type of simple data type Boolean. It is required since a select type (IfcSimpleValue) cannot directly include simple types in its select list.  A boolean type can have value TRUE or FALSE.
 /// 
-/// SpiralRamp 
-///   A ramp constructed around a
-///   circular or elliptical well without newels and landings. 
+/// Type: BOOLEAN
 /// 
-/// UserDefined 
-///   Free form ramp (user defined
-///   operation type) 
-///     
+/// HISTORY New type in IFC Release 1.5.1.
+class IfcBoolean : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcBoolean (IfcAbstractEntity* e);
+    IfcBoolean (bool v);
+    operator bool() const;
+};
+/// An IfcCardinalPointReference is an index reference to
+/// significant points of a section profile. This index is used to
+/// describe the spatial relationship between the section of a member
+/// and a reference axis of the same member.
 /// 
-/// NotDefined 
-///     
-///     
+/// HISTORY  New Type in IFC2x4.
 /// 
-/// Figure 67 — Ramp types
-typedef enum {IfcRampType_STRAIGHT_RUN_RAMP, IfcRampType_TWO_STRAIGHT_RUN_RAMP, IfcRampType_QUARTER_TURN_RAMP, IfcRampType_TWO_QUARTER_TURN_RAMP, IfcRampType_HALF_TURN_RAMP, IfcRampType_SPIRAL_RAMP, IfcRampType_USERDEFINED, IfcRampType_NOTDEFINED} IfcRampTypeEnum;
-const char* ToString(IfcRampTypeEnum v);
-IfcRampTypeEnum FromString(const std::string& s);
-}
-namespace IfcRecurrenceTypeEnum {
-/// IfcRecurrenceTypeEnum enumerates the recurring pattern type. The following
-///   combinations are valid:
+/// Indexes 1...9 refer to points at the bounding box of a
+/// profile. Indexes 10...19 refer to points defined by geometric
+/// centroid (usually centre of gravity) and shear centre, and their
+/// combinations with bounding box coordinates. In particular, the
+/// following index values are specified in this IFC Release:
 /// 
-/// DAILY: Interval, Occurrences
+/// bottom left
+/// bottom centre
+/// bottom right
+/// mid-depth left
+/// mid-depth centre
+/// mid-depth right
+/// top left
+/// top centre
+/// top right
+/// geometric centroid
+/// bottom in line with the geometric centroid
+/// left in line with the geometric centroid
+/// right in line with the geometric centroid
+/// top in line with the geometric centroid
+/// shear centre
+/// bottom in line with the shear centre
+/// left in line with the shear centre
+/// right in line with the shear centre
+/// top in line with the shear centre
 /// 
-/// WEEKLY: WeekdayComponent, Interval, Occurrences
+/// Other index values are possible but outside the scope of this
+/// specification.
 /// 
-/// MONTHLY_BY_DAY_OF_MONTH: DayComponent, Interval, Occurrences
+/// Figure 283 illustrates cardinal point values.
 /// 
-/// MONTHLY_BY_POSITION: WeekdayComponent, Position, Interval, Occurrences
+/// Figure 283 — Cardinal point values
 /// 
-/// BY_DAY_COUNT: Interval, Occurrences
+/// Figure 284 illustrates an example extrusion shape with arbitrary profile (IfcArbitraryClosedProfileDef), aligned "mid-depth right" on the member axis. The line of sight follows the extrusion direction Z which points into the drawing plane of above illustration. Hence, "left" is in the positive X direction of the IfcProfileDef. "Top" is in the positive Y direction of the IfcProfileDef.
 /// 
-/// BY_WEEKDAY_COUNT: WeekdayComponent, Interval, Occurrences
+/// Figure 284 — Cardinal point extrusion
+class IfcCardinalPointReference : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcCardinalPointReference (IfcAbstractEntity* e);
+    IfcCardinalPointReference (int v);
+    operator int() const;
+};
+/// IfcComplexNumber is a representation of a complex number expressed as an array with two elements.
+///   The first element (index 1) denotes the real component which is the numerical
+///   component of a complex number whose square roots can be calculated explicitly.
+///   The second element (index 2) denotes the imaginary component which is the numerical
+///   component of a complex number whose square roots cannot be determined other
+///   than through the provision of the square of the imaginary number j where j^2 = -1.
+///   Note that the imaginary component may be referred to as i in certain references.
 /// 
-/// YEARLY_BY_DAY_OF_MONTH: DayComponent, MonthComponent, Interval, Occurrences
+/// Type: ARRAY [1:2] OF REAL
 /// 
-/// YEARLY_BY_POSITION: WeekdayComponent, MonthComponent, Position, Interval, Occurrences
+/// HISTORY New type in IFC Release 2x2.
+class IfcComplexNumber : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcComplexNumber (IfcAbstractEntity* e);
+    IfcComplexNumber (std::vector< double > /*[1:2]*/ v);
+    operator std::vector< double > /*[1:2]*/() const;
+};
+/// IfcCompoundPlaneAngleMeasure is a compound measure of plane angle in degrees, minutes, seconds, and optionally millionth-seconds of arc.
 /// 
-/// HISTORY: New enumeration in IFC
-///   Release 2x4.
-typedef enum {IfcRecurrenceType_DAILY, IfcRecurrenceType_WEEKLY, IfcRecurrenceType_MONTHLY_BY_DAY_OF_MONTH, IfcRecurrenceType_MONTHLY_BY_POSITION, IfcRecurrenceType_BY_DAY_COUNT, IfcRecurrenceType_BY_WEEKDAY_COUNT, IfcRecurrenceType_YEARLY_BY_DAY_OF_MONTH, IfcRecurrenceType_YEARLY_BY_POSITION} IfcRecurrenceTypeEnum;
-const char* ToString(IfcRecurrenceTypeEnum v);
-IfcRecurrenceTypeEnum FromString(const std::string& s);
-}
-namespace IfcReflectanceMethodEnum {
-/// The IfcReflectanceMethodEnum defines the range of different reflectance methods available. 
+/// NOTE: IfcCompoundPlaneAngleMeasure is used where angles need to be described to an accuracy as fine as one millionth of a degree and expressed as parts of an arc. It may be used for angular measurement by surveyors or for other angular measurements where precision is required. Another usage is exact or approximate global positioning against a geographic coordinate systems using longitude and latitude.
 /// 
-/// HISTORY: New type in IFC 2x2.
+/// NOTE: While the unit of measurement of the type IfcPlaneAngleMeasure depends on unit assignment (radian or degree or other derived units; globally at the IfcPoject or locally at an IfcMeasureWithUnit), the units of IfcCompoundPlaneAngleMeasure are always degrees, minutes, seconds, and millionth-seconds irrespective of unit assignments.
 /// 
-/// Enumeration 
+/// HISTORY New type in IFC Release 1.5.1.
 /// 
-/// BLINN: A reflectance model providing a smooth, slightly shiny appearance.
-/// FLAT: A reflectance model providing a constant colour. This model ignores the effect of all light sources. 
-/// GLASS: A reflectance model that supports an approximation of glass-like materials that have both reflective and transmissive properties. 
-/// MATT: A reflectance model providing a dull matte appearance. 
-/// METAL: A reflectance model providing a specular metallic appearance. 
-/// MIRROR: A reflectance model that supports secondary mirrored views through ray tracing. 
-/// PHONG: A reflectance model conforming with the Phong model in which reflections are greatest in the `mirror' direction of a surface opposite the viewing direction with respect to the surface normal. 
-/// PLASTIC: A reflectance model providing a specular effect which is similar to the Phong model. 
-/// STRAUSS: A reflectance model for metallic and non-metallic appearance based on a limited set of control parameter.
-/// NOTDEFINED
-typedef enum {IfcReflectanceMethod_BLINN, IfcReflectanceMethod_FLAT, IfcReflectanceMethod_GLASS, IfcReflectanceMethod_MATT, IfcReflectanceMethod_METAL, IfcReflectanceMethod_MIRROR, IfcReflectanceMethod_PHONG, IfcReflectanceMethod_PLASTIC, IfcReflectanceMethod_STRAUSS, IfcReflectanceMethod_NOTDEFINED} IfcReflectanceMethodEnum;
-const char* ToString(IfcReflectanceMethodEnum v);
-IfcReflectanceMethodEnum FromString(const std::string& s);
-}
-namespace IfcReinforcingBarRoleEnum {
-/// Definition from IAI: Enumeration defining standard types for the
-///   role, purpose or usage of the bar, i.e. the kind of loads and stresses they are
-///   intended to carry.  
+/// Type: LIST [3:4] OF INTEGER
 /// 
-/// HISTORY New type in IFC Release 2x2.
-///   Item ANCHORING (documented since IFC 2x2) added to the EXPRESS definition in IFC 2x4.
+/// Value restrictions
 /// 
-/// ENUMERATION 
+/// The first integer measure is the number of degrees and is generally not range-restricted.  However, when IfcCompoundPlaneAngleMeasure is used to express geographic coordinates, only latitudes of [-90, 90] and longitudes of [-180, 180] are used in practice.
+/// The second integer measure is the number of minutes and shall be in the range (-60, 60).
+/// The third integer measure is the number of seconds and shall be in the range (-60, 60).
+/// The optional fourth integer measure is the number of millionth-seconds and shall be in the range (-1 000 000, 1 000 000).
 /// 
-/// MAIN The reinforcing bar is a main bar. 
-///   SHEAR The reinforcing bar is a shear bar. 
-///   LIGATURE The reinforcing bar is a ligature (link, stirrup). 
-///   STUD The reinforcing bar is a stud. 
-///   PUNCHING Punching reinforcement. 
-///   EDGE Edge reinforcement. 
-///   RING Ring reinforcement. 
-///   ANCHORING Anchoring reinforcement. 
-///   USERDEFINED The type of reinforcement is user defined. 
-///   NOTDEFINED The type of reinforcement is not defined.
-typedef enum {IfcReinforcingBarRole_MAIN, IfcReinforcingBarRole_SHEAR, IfcReinforcingBarRole_LIGATURE, IfcReinforcingBarRole_STUD, IfcReinforcingBarRole_PUNCHING, IfcReinforcingBarRole_EDGE, IfcReinforcingBarRole_RING, IfcReinforcingBarRole_ANCHORING, IfcReinforcingBarRole_USERDEFINED, IfcReinforcingBarRole_NOTDEFINED} IfcReinforcingBarRoleEnum;
-const char* ToString(IfcReinforcingBarRoleEnum v);
-IfcReinforcingBarRoleEnum FromString(const std::string& s);
-}
-namespace IfcReinforcingBarSurfaceEnum {
-/// Definition from IAI: Enumeration indicating whether the bar has a
-///   plain or textured (ribbed) surface.  
+/// Signedness
 /// 
-/// HISTORY New type in IFC Release 2x2
+/// All measure components have the same sign (positive or negative).  It is therefore trivial to convert between floating point representation (decimal degrees) and compound representation regardless whether the angle is greater or smaller than zero.  Example:
 /// 
-/// ENUMERATION 
+/// LOCAL
+///   a : IfcPlaneAngleMeasure := -50.975864;  (* decimal degrees, -50° 58' 33" 110400 *)
+///   b : IfcPlaneAngleMeasure;
+///   c : IfcCompoundPlaneAngleMeasure;
+///   s : IfcText;
+/// END_LOCAL;
 /// 
-/// PLAIN The reinforcing bar surface is plain. 
-///   TEXTURED The reinforcing bar surface is textured (ribbed).
-typedef enum {IfcReinforcingBarSurface_PLAIN, IfcReinforcingBarSurface_TEXTURED} IfcReinforcingBarSurfaceEnum;
-const char* ToString(IfcReinforcingBarSurfaceEnum v);
-IfcReinforcingBarSurfaceEnum FromString(const std::string& s);
-}
-namespace IfcReinforcingBarTypeEnum {
-
-typedef enum {IfcReinforcingBarType_ANCHORING, IfcReinforcingBarType_EDGE, IfcReinforcingBarType_LIGATURE, IfcReinforcingBarType_MAIN, IfcReinforcingBarType_PUNCHING, IfcReinforcingBarType_RING, IfcReinforcingBarType_SHEAR, IfcReinforcingBarType_STUD, IfcReinforcingBarType_USERDEFINED, IfcReinforcingBarType_NOTDEFINED} IfcReinforcingBarTypeEnum;
-const char* ToString(IfcReinforcingBarTypeEnum v);
-IfcReinforcingBarTypeEnum FromString(const std::string& s);
-}
-namespace IfcReinforcingMeshTypeEnum {
-
-typedef enum {IfcReinforcingMeshType_USERDEFINED, IfcReinforcingMeshType_NOTDEFINED} IfcReinforcingMeshTypeEnum;
-const char* ToString(IfcReinforcingMeshTypeEnum v);
-IfcReinforcingMeshTypeEnum FromString(const std::string& s);
-}
-namespace IfcRoleEnum {
-/// Definition: Roles which may be played by an actor.
+/// (* convert from float to compound *)
+///   c[1] :=    a;                                           -- -50
+///   c[2] :=   (a - c[1]) * 60;                              -- -58
+///   c[3] :=  ((a - c[1]) * 60 - c[2]) * 60;                 -- -33
+///   c[4] := (((a - c[1]) * 60 - c[2]) * 60 - c[3]) * 1.e6;  -- -110400
 /// 
-/// HISTORY This type has changes after IFC Release 2.0.  Spelling of COMMISSIONINGENGINEER fixed in IFC 2x4.
+/// (* convert from compound to float *)
+///   b := c[1] + c[2]/60. + c[3]/3600. + c[4]/3600.e6;       -- -50.975864
 /// 
-/// ENUMERATION 
+/// Use in string representations
 /// 
-/// SUPPLIER
-///   MANUFACTURER
-///   CONTRACTOR 
-///   SUBCONTRACTOR
-///   ARCHITECT
-///   STRUCTURALENGINEER
-///   COSTENGINEER 
-///   CLIENT
-///   BUILDINGOWNER
-///   BUILDINGOPERATOR
-///   MECHANICALENGINEER 
-///   ELECTRICALENGINEER
-///   PROJECTMANAGER
-///   FACILITIESMANAGER
-///   CIVILENGINEER
-///   COMMISSIONINGENGINEER 
-///   ENGINEER
-///   OWNER
-///   CONSULTANT
-///   CONSTRUCTIONMANAGER
-///   FIELDCONSTRUCTIONMANAGER 
-///   RESELLER
-///   USERDEFINED User defined value to be provided.
-typedef enum {IfcRole_SUPPLIER, IfcRole_MANUFACTURER, IfcRole_CONTRACTOR, IfcRole_SUBCONTRACTOR, IfcRole_ARCHITECT, IfcRole_STRUCTURALENGINEER, IfcRole_COSTENGINEER, IfcRole_CLIENT, IfcRole_BUILDINGOWNER, IfcRole_BUILDINGOPERATOR, IfcRole_MECHANICALENGINEER, IfcRole_ELECTRICALENGINEER, IfcRole_PROJECTMANAGER, IfcRole_FACILITIESMANAGER, IfcRole_CIVILENGINEER, IfcRole_COMMISSIONINGENGINEER, IfcRole_ENGINEER, IfcRole_OWNER, IfcRole_CONSULTANT, IfcRole_CONSTRUCTIONMANAGER, IfcRole_FIELDCONSTRUCTIONMANAGER, IfcRole_RESELLER, IfcRole_USERDEFINED} IfcRoleEnum;
-const char* ToString(IfcRoleEnum v);
-IfcRoleEnum FromString(const std::string& s);
-}
-namespace IfcRoofTypeEnum {
-/// This enumeration defines the basic configuration of the roof in terms of the different roof shapes, as illustrated in Figure 68.
+/// When a compound plane angle measure is formatted for display or printout, the signs of the fractional components will usually be discarded because, to a human reader, the sign of the first component alone already indicates the sense of the angle:
 /// 
-/// Roofs which are subdivided into more than these basic shapes have to be defined by the geometry only. Also roofs with non-regular shapes (free form roof) have to be defined by the geometry only. The type of such roofs is FREEFORM. 
+/// (* convert from compound to human-readable string *)
+///   s := FORMAT(c[1], '+##')     + "000000B0"
+///      + FORMAT(ABS(c[2]), '##') + ''''
+///      + FORMAT(ABS(c[3]), '##') + '"'
+///      + FORMAT(ABS(c[4]), '##');  -- -50° 58' 33" 110400
 /// 
-/// HISTORY New Enumeration in IFC Release 2x. 
+/// Another often encountered display format of latitudes and longitudes is to omit the signs and print N, S, E, W indicators instead, for example, 50°58'33"S.  When stored as IfcCompoundPlaneAngleMeasure however, a compound plane angle measure is always signed, with same sign of all components.
+class IfcCompoundPlaneAngleMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcCompoundPlaneAngleMeasure (IfcAbstractEntity* e);
+    IfcCompoundPlaneAngleMeasure (std::vector< int > /*[3:4]*/ v);
+    operator std::vector< int > /*[3:4]*/() const;
+};
+/// Definition from ISO/CD 10303-41:1992: Is the value of a physical quantity as defined by an application context.
+/// Type: REAL
 /// 
-/// Enumerator 
-///   Description 
-///   Figure 
+/// NOTE Corresponding ISO 10303 name: context_dependent_measure, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
 /// 
-/// FLAT_ROOF 
-///   A roof having no slope, or
-///   one with only a slight pitch so as to drain rainwater. 
+/// HISTORY New type in IFC Release 1.5.1.
+class IfcContextDependentMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcContextDependentMeasure (IfcAbstractEntity* e);
+    IfcContextDependentMeasure (double v);
+    operator double() const;
+};
+/// Definition from ISO/CD 10303-41:1992: A count measure is the value of a count.
+/// Type: NUMBER
 /// 
-/// SHED_ROOF 
-///   A roof having a single
-///   slope. 
+/// NOTE Corresponding ISO 10303 name: count_measure, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
 /// 
-/// GABLE_ROOF 
-///   A roof sloping downward in
-///   two parts from a central ridge, so as to form a gable at each end. 
+/// HISTORY New type in IFC Release 1.5.1.
+class IfcCountMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcCountMeasure (IfcAbstractEntity* e);
+    IfcCountMeasure (double v);
+    operator double() const;
+};
+/// IfcCurvatureMeasure is a measure for curvature, which is defined as the change of slope per length.
+///   This is typically a computed value in structural analysis.
+///   It is usually measured in rad/m.
 /// 
-/// HIP_ROOF 
-///   A roof having sloping ends
-///   and sides meeting at an inclined projecting angle. 
+/// Type: REAL
 /// 
-/// HIPPED_GABLE_ROOF 
-///   A roof having a hipped end
-///   truncating a gable. 
+/// HISTORY New type in IFC2x2.
+class IfcCurvatureMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcCurvatureMeasure (IfcAbstractEntity* e);
+    IfcCurvatureMeasure (double v);
+    operator double() const;
+};
+/// The lexical representation for date is the reduced (right truncated) lexical representation for dateTime: CCYY-MM-DD. No left truncation is allowed. An optional following time zone qualifier is allowed as for dateTime. To accommodate year values outside the range from 0001 to 9999, additional digits can be added to the left of this representation and a preceding "-" sign is allowed.
 /// 
-/// GAMBREL_ROOF 
-///   A ridged roof divided on each
-///   side into a shallower slope above a steeper one. 
+/// HISTORY: New type in IFC2x4
 /// 
-/// MANSARD_ROOF 
-///   A roof having on each side a
-///   steeper lower part and a shallower upper part. 
+/// Use definitions
+/// All given values should be provided in context and converted into a Gregorian date context and be shall be processable by a receiving application.
+class IfcDate : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcDate (IfcAbstractEntity* e);
+    IfcDate (std::string v);
+    operator std::string() const;
+};
+/// This lexical representation is the [ISO 8601] extended
+///   format CCYY-MM-DDThh:mm:ss where "CC" represents the
+///   century, "YY" the year, "MM" the month and "DD" the day,
+///   preceded by an optional leading "-" sign to indicate a
+///   negative number. If the sign is omitted, "+" is assumed.
+///   The letter "T" is the date/time separator and "hh", "mm",
+///   "ss" represent hour, minute and second respectively.
+///   Additional digits can be used to increase the precision of
+///   fractional seconds if desired i.e the format ss.ss... with
+///   any number of digits after the decimal point is supported.
+///   The fractional seconds part is optional; other parts of the
+///   lexical form are not optional. To accommodate year values
+///   greater than 9999 additional digits can be added to the
+///   left of this representation. Leading zeros are required if
+///   the year value would otherwise have fewer than four digits;
+///   otherwise they are forbidden. The year 0000 is prohibited.
 /// 
-/// BARREL_ROOF 
-///   A roof or ceiling having a
-///   semicylindrical form. 
+/// HISTORY: New type in IFC2x4
+class IfcDateTime : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcDateTime (IfcAbstractEntity* e);
+    IfcDateTime (std::string v);
+    operator std::string() const;
+};
+/// Definition from IAI: The IfcDayInMonthNumber is
+/// an integer that defines the position of the specified day in a
+/// month.
+/// Type: INTEGER
+/// NOTE Corresponding STEP
+/// name: day_in_month_number, please refer to ISO/IS 10303-41:1994
+/// for the final definition of the formal
+/// standard.
+/// HISTORY New type in IFC
+/// Release 1.5.1.
+/// IFC2x4 CHANGE Where rule
+/// ValidRange added.
+class IfcDayInMonthNumber : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcDayInMonthNumber (IfcAbstractEntity* e);
+    IfcDayInMonthNumber (int v);
+    operator int() const;
+};
+/// Definition from IAI: The IfcDayInWeekNumber is
+/// an integer that defines the position of the specified day in a
+/// week. The positions have the following meaning (according to
+/// ISO8601 "the calendar week") that assigns the ordinal day number
+/// in the week to the Calender day name.
 /// 
-/// RAINBOW_ROOF 
-///   A gable roof in the form of a
-///   broad Gothic arch, with gently sloping convex surfaces. 
+/// Ordinal day number
+/// Calendar day
+/// name
 /// 
-/// BUTTERFLY_ROOF 
-///   A roof having two slopes,
-///   each descending inward from the eaves. 
+/// 01
+/// Monday
 /// 
-/// PAVILION_ROOF 
-///   A pyramidal hip roof. 
+/// 02
+/// Tuesday
 /// 
-/// DOME_ROOF 
-///   A hemispherical hip
-///   roof. 
+/// 03
+/// Wednesday
 /// 
-/// FREEFORM 
-///   Free form roof  
-///     
+/// 04
+/// Thursday
 /// 
-/// NOTDEFINED 
-///   No specification given 
-///     
+/// 05
+/// Friday
 /// 
-/// Figure 68 — Roof types
-typedef enum {IfcRoofType_FLAT_ROOF, IfcRoofType_SHED_ROOF, IfcRoofType_GABLE_ROOF, IfcRoofType_HIP_ROOF, IfcRoofType_HIPPED_GABLE_ROOF, IfcRoofType_GAMBREL_ROOF, IfcRoofType_MANSARD_ROOF, IfcRoofType_BARREL_ROOF, IfcRoofType_RAINBOW_ROOF, IfcRoofType_BUTTERFLY_ROOF, IfcRoofType_PAVILION_ROOF, IfcRoofType_DOME_ROOF, IfcRoofType_FREEFORM, IfcRoofType_USERDEFINED, IfcRoofType_NOTDEFINED} IfcRoofTypeEnum;
-const char* ToString(IfcRoofTypeEnum v);
-IfcRoofTypeEnum FromString(const std::string& s);
-}
-namespace IfcSIPrefix {
-/// Definition from ISO/CD 10303-41:1992: An SI prefix is the name of a prefix that may be associated 
-/// with an SI unit. The definitions of SI prefixes are specified in ISO 1000 (clause 3).
+/// 06
+/// Saturday
 /// 
-/// NOTE The prefix defines multiples and submultiples of the SI units.
+/// 07
+/// Sunday
 /// 
-/// NOTE Corresponding ISO 10303 name: SI_prefix, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
+/// Type: INTEGER
+/// HISTORY New type in
+/// IFC2x4.
+class IfcDayInWeekNumber : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcDayInWeekNumber (IfcAbstractEntity* e);
+    IfcDayInWeekNumber (int v);
+    operator int() const;
+};
+/// Definition from ISO/CD 10303-41:1992: A descriptive measure is a human interpretable definition of a quantifiable value.
+/// Type: STRING
 /// 
-/// ENUMERATION 
+/// NOTE Corresponding ISO 10303 name:descriptive_measure, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
 /// 
-/// EXA: 10^18. 
-///   PETA: 10^15. 
-///   TERA: 10^12. 
-///   GIGA: 10^9. 
-///   MEGA: 10^6. 
-///   KILO: 10^3. 
-///   HECTO: 10^2.  
-///   DECA: 10. 
-///   DECI: 10^-1. 
-///   CENTI: 10^-2. 
-///   MILLI: 10^-3. 
-///   MICRO: 10^-6. 
-///   NANO: 10^-9. 
-///   PICO: 10^-12. 
-///   FEMTO: 10^-15. 
-///   ATTO: 10^-18. 
+/// HISTORY New type in IFC Release 1.5.1.
+class IfcDescriptiveMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcDescriptiveMeasure (IfcAbstractEntity* e);
+    IfcDescriptiveMeasure (std::string v);
+    operator std::string() const;
+};
+/// Definition from ISO/CD 10303-42:1992: A dimension count is a positive integer used to define the coordinate space dimensionality.  
 /// 
-/// HISTORY New entity in IFC Release 1.5.1.
-typedef enum {IfcSIPrefix_EXA, IfcSIPrefix_PETA, IfcSIPrefix_TERA, IfcSIPrefix_GIGA, IfcSIPrefix_MEGA, IfcSIPrefix_KILO, IfcSIPrefix_HECTO, IfcSIPrefix_DECA, IfcSIPrefix_DECI, IfcSIPrefix_CENTI, IfcSIPrefix_MILLI, IfcSIPrefix_MICRO, IfcSIPrefix_NANO, IfcSIPrefix_PICO, IfcSIPrefix_FEMTO, IfcSIPrefix_ATTO} IfcSIPrefix;
-const char* ToString(IfcSIPrefix v);
-IfcSIPrefix FromString(const std::string& s);
-}
-namespace IfcSIUnitName {
-/// Definition from ISO/CD 10303-41:1992: An SI unit name is the name of an SI unit. The definitions of the 
-/// names of SI units are specified in ISO 1000 (clause 2).
+/// The IfcDimensionCount is restricted to have the dimensionality of either 1, 2, or 3 - the WR1 had been added as an addition to the ISO 10303:42 entity dimension_count. In contrary to the ISO 10303:42 constraint, that all geometric representation items within a geometric representation context are forced to have the same dimension count, the IFC geometry allows mixed dimensions, particularly when defining the boundary of planar surfaces.  
 /// 
-/// NOTE Corresponding STEP name: SI_unit_name, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
+/// NOTE Corresponding ISO 10303 type: dimension_count, please refer to ISO/IS 10303-42:1994, p. 14 for the final definition of the formal standard.
 /// 
-/// ENUMERATION 
+/// HISTORY New Type in IFC Release 1.5
+class IfcDimensionCount : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcDimensionCount (IfcAbstractEntity* e);
+    IfcDimensionCount (int v);
+    operator int() const;
+};
+/// IfcDoseEquivalentMeasure is a measure of the radioactive dose equivalent.
+/// Usually measured in Sievert (Sv, J/kg).
+/// Type: REAL
 /// 
-/// AMPERE: Unit for electric current. 
-///   BECQUEREL: Unit for radioactivity. 
-///   CANDELA: Unit for luminousintensity. 
-///   COULOMB: Unit for electric charge. 
-///   CUBIC_METRE: Unit for volume. 
-///   DEGREE_CELSIUS: Unit for thermodynamic temperature. 
-///   FARAD: Unit for electric capacitance. 
-///   GRAM: Unit for mass. 
-///   GRAY: Unit for absorbed radioactive dose. 
-///   HENRY: Unit for inductance. 
-///   HERTZ: Unit for frequency. 
-///   JOULE: Unit for energy. 
-///   KELVIN: Unit for thermodynamic temperature. 
-///   LUMEN: Unit for luminous flux. 
-///   LUX: Unit for illuminance. 
-///   METRE: Unit for length. 
-///   MOLE: Unit for amount of substance. 
-///   NEWTON: Unit for force. 
-///   OHM: Unit for electric resistance. 
-///   PASCAL: Unit for pressure. 
-///   RADIAN: Unit for plane angle. 
-///   SECOND: Unit for time. 
-///   SIEMENS: Unit for electric conductance. 
-///   SIEVERT: Unit for radioactive dose equivalent. 
-///   SQUARE_METRE: Unit for area. 
-///   STERADIAN: Unit for solid angle. 
-///   TESLA: Unit for magnetic flux density. 
-///   VOLT: Unit for electric voltage. 
-///   WATT: Unit for power. 
-///   WEBER: Unit for magnetic flux. 
+/// HISTORY New type in IFC Release 2x.
+class IfcDoseEquivalentMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcDoseEquivalentMeasure (IfcAbstractEntity* e);
+    IfcDoseEquivalentMeasure (double v);
+    operator double() const;
+};
+/// String representation of a time duration according to ISO8601:2000 "Data elements and interchange formats - Information interchange - Representation of dates and times" as defined in section 5.5.3 "Representation of duration".
+/// It is recommended to use the alternative format (section 5.5.4.2.2) in its extended version: PYYYY-MM-DDThh:mm:ss.
+/// EXAMPLE: P0002-10-15T10:30:20 (duration of two years, 10 months, 15 days, 10 hours, 30 minutes and 20 seconds).
 /// 
-/// HISTORY New entity in IFC Release 1.5.1.
-typedef enum {IfcSIUnitName_AMPERE, IfcSIUnitName_BECQUEREL, IfcSIUnitName_CANDELA, IfcSIUnitName_COULOMB, IfcSIUnitName_CUBIC_METRE, IfcSIUnitName_DEGREE_CELSIUS, IfcSIUnitName_FARAD, IfcSIUnitName_GRAM, IfcSIUnitName_GRAY, IfcSIUnitName_HENRY, IfcSIUnitName_HERTZ, IfcSIUnitName_JOULE, IfcSIUnitName_KELVIN, IfcSIUnitName_LUMEN, IfcSIUnitName_LUX, IfcSIUnitName_METRE, IfcSIUnitName_MOLE, IfcSIUnitName_NEWTON, IfcSIUnitName_OHM, IfcSIUnitName_PASCAL, IfcSIUnitName_RADIAN, IfcSIUnitName_SECOND, IfcSIUnitName_SIEMENS, IfcSIUnitName_SIEVERT, IfcSIUnitName_SQUARE_METRE, IfcSIUnitName_STERADIAN, IfcSIUnitName_TESLA, IfcSIUnitName_VOLT, IfcSIUnitName_WATT, IfcSIUnitName_WEBER} IfcSIUnitName;
-const char* ToString(IfcSIUnitName v);
-IfcSIUnitName FromString(const std::string& s);
-}
-namespace IfcSanitaryTerminalTypeEnum {
-/// The IfcSanitaryTerminalTypeEnum defines the range of different types of sanitary terminal that can be specified. 
+/// HISTORY: New type in IFC2x4
+class IfcDuration : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcDuration (IfcAbstractEntity* e);
+    IfcDuration (std::string v);
+    operator std::string() const;
+};
+/// IfcDynamicViscosityMeasure is a measure of the viscous resistance of a medium.
 /// 
-/// NOTE: The value WCSEAT has been deprecated and should no longer be used; toilet seats should be represented by IfcDiscreteAccessory with ObjectType 'WC Seat'. 
-///   HISTORY: New type in IFC 2x2 
+/// Usually measured in Pascal second (Pa s).
+/// Type: REAL 
 /// 
-/// Enumeration 
+/// HISTORY New type in IFC Release 2.0.
+class IfcDynamicViscosityMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcDynamicViscosityMeasure (IfcAbstractEntity* e);
+    IfcDynamicViscosityMeasure (double v);
+    operator double() const;
+};
+/// IfcElectricCapacitanceMeasure is a measure of the electric capacitance.
+/// Usually measured in Farad (F, C/V = A s/V).
+/// Type: REAL
 /// 
-/// BATH: Sanitary appliance for immersion of the human body or parts of it. 
-/// BIDET: Waste water appliance for washing the excretory organs while sitting astride the bowl. 
-/// CISTERN: A water storage unit attached to a sanitary terminal that is fitted with a device, operated automatically or by the user, that discharges water to cleanse a water closet (toilet) pan, urinal or slop hopper. 
-/// SHOWER: Installation or waste water appliance that emits a spray of water to wash the human body. 
-/// SINK: Waste water appliance for receiving, retaining or disposing of domestic, culinary, laboratory or industrial process liquids. 
-/// SANITARYFOUNTAIN: A sanitary terminal that provides a low pressure jet of water for a specific purpose. 
-/// TOILETPAN: Soil appliance for the disposal of excrement. 
-/// URINAL: Soil appliance that receives urine and directs it to a waste outlet (BS6100). 
-/// WASHHANDBASIN: Waste water appliance for washing the upper parts of the body. 
-/// WCSEAT: [Deprecated] Hinged seat that fits on the top of a water closet (WC) pan. 
-/// USERDEFINED: User-defined type. 
-/// NOTDEFINED: Undefined type.
-typedef enum {IfcSanitaryTerminalType_BATH, IfcSanitaryTerminalType_BIDET, IfcSanitaryTerminalType_CISTERN, IfcSanitaryTerminalType_SHOWER, IfcSanitaryTerminalType_SINK, IfcSanitaryTerminalType_SANITARYFOUNTAIN, IfcSanitaryTerminalType_TOILETPAN, IfcSanitaryTerminalType_URINAL, IfcSanitaryTerminalType_WASHHANDBASIN, IfcSanitaryTerminalType_WCSEAT, IfcSanitaryTerminalType_USERDEFINED, IfcSanitaryTerminalType_NOTDEFINED} IfcSanitaryTerminalTypeEnum;
-const char* ToString(IfcSanitaryTerminalTypeEnum v);
-IfcSanitaryTerminalTypeEnum FromString(const std::string& s);
-}
-namespace IfcSectionTypeEnum {
-/// Definition from IAI: An enumeration indicating whether a
-///   specific piece of a cross section is uniform or tapered in longitudinal
-///   direction.  
-///   HISTORY New type in IFC
-///   Release 2x2  
-///   ENUMERATION 
+/// HISTORY New type in IFC Release 2x.
+class IfcElectricCapacitanceMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcElectricCapacitanceMeasure (IfcAbstractEntity* e);
+    IfcElectricCapacitanceMeasure (double v);
+    operator double() const;
+};
+/// IfcElectricChargeMeasure is a measure of the electric charge.
+/// Usually measured in Coulomb (C, A s).
+/// Type: REAL
 /// 
-/// UNIFORM The section is uniform in longitudinal direction.
+/// HISTORY New type in IFC Release 2x.
+class IfcElectricChargeMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcElectricChargeMeasure (IfcAbstractEntity* e);
+    IfcElectricChargeMeasure (double v);
+    operator double() const;
+};
+/// IfcElectricConductanceMeasure is a measure of the electric conductance.
+/// Usually measured in Siemens (S, 1/Ohm = A/V).
+/// Type: REAL
 /// 
-/// TAPERED The section is tapered in longitudinal direction.
-typedef enum {IfcSectionType_UNIFORM, IfcSectionType_TAPERED} IfcSectionTypeEnum;
-const char* ToString(IfcSectionTypeEnum v);
-IfcSectionTypeEnum FromString(const std::string& s);
-}
-namespace IfcSensorTypeEnum {
-/// The IfcSensorTypeEnum defines the range of different types of sensor that can be specified. 
+/// HISTORY New type in IFC Release 2x.
+class IfcElectricConductanceMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcElectricConductanceMeasure (IfcAbstractEntity* e);
+    IfcElectricConductanceMeasure (double v);
+    operator double() const;
+};
+/// Definition from ISO/CD 10303-41:1992: The value for the movement of electrically charged particles.
+/// Usually measured in Ampere (A).
+/// Type: REAL
 /// 
-/// HISTORY: New type in IFC R2.0.  Added missing enumerations in IFC2x4
+/// NOTE Corresponding ISO 10303 name: electric_current_measure, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
 /// 
-/// Enumeration 
+/// HISTORY New type in IFC Release 1.5.1.
+class IfcElectricCurrentMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcElectricCurrentMeasure (IfcAbstractEntity* e);
+    IfcElectricCurrentMeasure (double v);
+    operator double() const;
+};
+/// IfcElectricResistanceMeasure is a measure of the electric resistance.
+/// Usually measured in Ohm (V/A).
+/// Type: REAL
 /// 
-/// CONDUCTANCESENSOR: A device that senses or detects electrical conductance. 
-/// CONTACTSENSOR: A device that senses or detects contact, such as for detecting if a door is closed. 
-/// FIRESENSOR: A device that senses or detects fire. 
-/// FLOWSENSOR: A device that senses or detects flow in a fluid. 
-/// GASSENSOR: A device that senses or detects gas concentration. 
-/// HEATSENSOR: A device that senses or detects heat. 
-/// IONCONCENTRATIONSENSOR: A device that senses or detects ion concentration, such as for water hardness. 
-/// LEVELSENSOR: A device that senses or detects fill level, such as for a tank. 
-/// HUMIDITYSENSOR: A device that senses or detects humidity. 
-/// LIGHTSENSOR: A device that senses or detects light. 
-/// MOISTURESENSOR: A device that senses or detects moisture. 
-/// MOVEMENTSENSOR: A device that senses or detects movement.  
-/// PHSENSOR: A device that senses or detects acidity. 
-/// PRESSURESENSOR: A device that senses or detects pressure. 
-/// RADIATIONSENSOR: A device that senses or detects electromagnetic radiation. 
-/// RADIOACTIVITYSENSOR: A device that senses or detects atomic decay. 
-/// SMOKESENSOR: A device that senses or detects smoke. 
-/// SOUNDSENSOR: A device that senses or detects sound.  
-/// TEMPERATURESENSOR: A device that senses or detects temperature. 
-/// WINDSENSOR: A device that senses or detects airflow speed and direction. 
-/// USERDEFINED: User-defined type. 
-/// NOTDEFINED: Undefined type.
-typedef enum {IfcSensorType_CONDUCTANCESENSOR, IfcSensorType_CONTACTSENSOR, IfcSensorType_FIRESENSOR, IfcSensorType_FLOWSENSOR, IfcSensorType_GASSENSOR, IfcSensorType_HEATSENSOR, IfcSensorType_HUMIDITYSENSOR, IfcSensorType_IONCONCENTRATIONSENSOR, IfcSensorType_LEVELSENSOR, IfcSensorType_LIGHTSENSOR, IfcSensorType_MOISTURESENSOR, IfcSensorType_MOVEMENTSENSOR, IfcSensorType_PHSENSOR, IfcSensorType_PRESSURESENSOR, IfcSensorType_RADIATIONSENSOR, IfcSensorType_RADIOACTIVITYSENSOR, IfcSensorType_SMOKESENSOR, IfcSensorType_SOUNDSENSOR, IfcSensorType_TEMPERATURESENSOR, IfcSensorType_WINDSENSOR, IfcSensorType_USERDEFINED, IfcSensorType_NOTDEFINED} IfcSensorTypeEnum;
-const char* ToString(IfcSensorTypeEnum v);
-IfcSensorTypeEnum FromString(const std::string& s);
-}
-namespace IfcSequenceEnum {
-/// IfcSequenceEnum is an
-///   enumeration that defines the different ways in which a
-///   time lag is applied to a sequence between two processes.
+/// HISTORY New type in IFC Release 2x.
+class IfcElectricResistanceMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcElectricResistanceMeasure (IfcAbstractEntity* e);
+    IfcElectricResistanceMeasure (double v);
+    operator double() const;
+};
+/// IfcElectricVoltageMeasure is a measure of electromotive force.
+/// Usually measured in Volts (V, W/A).
+/// Type: REAL
 /// 
-/// HISTORY  New entity in IFC 1.0
-typedef enum {IfcSequence_START_START, IfcSequence_START_FINISH, IfcSequence_FINISH_START, IfcSequence_FINISH_FINISH, IfcSequence_USERDEFINED, IfcSequence_NOTDEFINED} IfcSequenceEnum;
-const char* ToString(IfcSequenceEnum v);
-IfcSequenceEnum FromString(const std::string& s);
-}
-namespace IfcShadingDeviceTypeEnum {
-/// Definition from IAI: Enumeration defining the valid
-/// types of shading devices that can be predefined using the
-/// enumeration values.
+/// HISTORY New type in IFC Release 2.0.
+class IfcElectricVoltageMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcElectricVoltageMeasure (IfcAbstractEntity* e);
+    IfcElectricVoltageMeasure (double v);
+    operator double() const;
+};
+/// IfcEnergyMeasure is a measure of energy required or used.
+/// Usually measured in Joules, (J, Nm).
+/// Type: REAL
 /// 
-/// JALOUSIE
-/// SHUTTER
-/// AWNING
+/// HISTORY New type in IFC Release 2.0.
+class IfcEnergyMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcEnergyMeasure (IfcAbstractEntity* e);
+    IfcEnergyMeasure (double v);
+    operator double() const;
+};
+/// Definition from CSS1 (W3C Recommendation): The font-style property selects between normal (sometimes
+/// referred to as "roman" or "upright"), italic and oblique faces within a font family. Values are:
 /// 
-/// HISTORY  New Enumeration
-/// in Release IFC2x4
-typedef enum {IfcShadingDeviceType_JALOUSIE, IfcShadingDeviceType_SHUTTER, IfcShadingDeviceType_AWNING, IfcShadingDeviceType_USERDEFINED, IfcShadingDeviceType_NOTDEFINED} IfcShadingDeviceTypeEnum;
-const char* ToString(IfcShadingDeviceTypeEnum v);
-IfcShadingDeviceTypeEnum FromString(const std::string& s);
-}
-namespace IfcSimplePropertyTemplateTypeEnum {
-/// This enumeration defines the correct subtype of instances of IfcSimpleProperty or IfcPhysicalSimpleQuantity that are created and are assigned to this IfcSimplePropertyTemplate. It also determines how the attributes of IfcPropertyTemplate, PrimaryUnit, SecondaryUnit, PrimaryDataType, SecondaryDataType, should be used.
+/// normal 
+///   italic 
+///   oblique
 /// 
-/// HISTORY New enumeration in IFC2x4.
+/// A value of 'normal' selects a font that is classified as 'normal' in the user agents font database, while 'oblique' selects a font that is labeled 'oblique'. A value of 'italic' selects a font that is labeled 'italic', or, if that is not available, one labeled 'oblique'. The font that is labeled 'oblique' in the user agents font database may actually have been generated by electronically slanting a normal font.
 /// 
-/// Enumeration
+/// Fonts with Oblique, Slanted or Incline in their names will typically be labeled 'oblique' in the user agents font database. Fonts with Italic, Cursive or Kursiv in their names will typically be labeled 'italic'.
 /// 
-/// P_SINGLEVALUE: the properties defined by this IfcPropertyTemplate are of type IfcPropertySingleValue.
-/// P_ENUMERATEDVALUE: the properties defined by this IfcPropertyTemplate are of type IfcPropertyEnumeratedValue.
-/// P_BOUNDEDVALUE: the properties defined by this IfcPropertyTemplate are of type IfcPropertyBoundedValue.
-/// P_LISTVALUE: the properties defined by this IfcPropertyTemplate are of type IfcPropertyListValue.
-/// P_TABLEVALUE: the properties defined by this IfcPropertyTemplate are of type IfcPropertyTableValue.
-/// P_REFERENCEVALUE: the properties defined by this IfcPropertyTemplate are of type IfcPropertyReferenceValue.
-/// Q_LENGTH: the properties defined by this IfcPropertyTemplate are of type IfcQuantityLength.
-/// Q_AREA: the properties defined by this IfcPropertyTemplate are of type IfcQuantityArea.
-/// Q_VOLUME: the properties defined by this IfcPropertyTemplate are of type IfcQuantityVolume.
-/// Q_COUNT: the properties defined by this IfcPropertyTemplate are of type IfcQuantityCount.
-/// Q_WEIGHT: the properties defined by this IfcPropertyTemplate are of type IfcQuantityWeight.
-/// Q_TIME: the properties defined by this IfcPropertyTemplate are of type IfcQuantityTime.
-typedef enum {IfcSimplePropertyTemplateType_P_SINGLEVALUE, IfcSimplePropertyTemplateType_P_ENUMERATEDVALUE, IfcSimplePropertyTemplateType_P_BOUNDEDVALUE, IfcSimplePropertyTemplateType_P_LISTVALUE, IfcSimplePropertyTemplateType_P_TABLEVALUE, IfcSimplePropertyTemplateType_P_REFERENCEVALUE, IfcSimplePropertyTemplateType_Q_LENGTH, IfcSimplePropertyTemplateType_Q_AREA, IfcSimplePropertyTemplateType_Q_VOLUME, IfcSimplePropertyTemplateType_Q_COUNT, IfcSimplePropertyTemplateType_Q_WEIGHT, IfcSimplePropertyTemplateType_Q_TIME} IfcSimplePropertyTemplateTypeEnum;
-const char* ToString(IfcSimplePropertyTemplateTypeEnum v);
-IfcSimplePropertyTemplateTypeEnum FromString(const std::string& s);
-}
-namespace IfcSlabTypeEnum {
-/// Definition from IAI: This enumeration defines the
-///   available predefined types of a slab. The
-///   IfcSlabTypeEnum can be used for slab occurrences,
-///   IfcSlab, and slab types, IfcSlabType. A
-///   special property set definition may be provided for each
-///   predefined type.
+/// NOTE  Corresponding CSS1 definitions is font-style.
 /// 
-/// HISTORY  New type in IFC
-///   Release 2.0
+/// HISTORY  New type in IFC2x3.
+class IfcFontStyle : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcFontStyle (IfcAbstractEntity* e);
+    IfcFontStyle (std::string v);
+    operator std::string() const;
+};
+/// Definition from CSS1 (W3C Recommendation): The font-style property selects between normal and small-caps within a font family. Values are:
 /// 
-/// Floor
+/// normal 
+///   small-caps 
 /// 
-/// The slab is used to represent a floor slab.
+/// Another type of variation within a font family is the small-caps. In a small-caps font the lower case letters look similar to the uppercase ones, but in a smaller size and with slightly different proportions. The 'font-variant' property selects that font.
 /// 
-/// Roof
+/// A value of 'normal' selects a font that is not a small-caps font, 'small-caps' selects a small-caps font. It is acceptable (but not required) in CSS1 if the small-caps font is a created by taking a normal font and replacing the lower case letters by scaled uppercase characters. As a last resort, uppercase letters will be used as replacement for a small-caps font.
 /// 
-/// The slab is used to represent a roof slab (either
-///   flat or sloped).
+/// NOTE  Corresponding CSS1 definitions is font-variant.
 /// 
-/// Landing
+/// HISTORY  New type in IFC2x3.
+class IfcFontVariant : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcFontVariant (IfcAbstractEntity* e);
+    IfcFontVariant (std::string v);
+    operator std::string() const;
+};
+/// Definition from CSS1 (W3C Recommendation): The 'font-weight' property selects the weight of the font. The values '100' to '900' form an ordered sequence, where each number indicates a weight that is at least as dark as its predecessor. The keyword 'normal' is synonymous with '400', and 'bold' is synonymous with '700'. Keywords other than 'normal' and 'bold' have been shown to be often confused with font names and a numerical scale was therefore chosen for the 9-value list. Values are:
 /// 
-/// The slab is used to represent a landing within a
-///   stair or ramp.
+/// normal 
+///   bold 
+///   100 | 200 | 300 | 400 | 500 | 600 | 700 | 800 | 900
 /// 
-/// BaseSlab
+/// Fonts (the font data) typically have one or more properties whose values are names that are descriptive of the "weight" of a font. There is no accepted, universal meaning to these weight names. Their primary role is to distinguish faces of differing darkness within a single font family. Usage across font families is quite variant; for example a font that you might think of as being bold might be described as being Regular, Roman, Book, Medium, Semi- or DemiBold, Bold, or Black, depending on how black the "normal" face of the font is within the design. Because there is no standard usage of names, the weight property values in CSS1 are given on a numerical scale in which the value '400' (or 'normal') corresponds to the "normal" text face for that family. The weight name associated with that face will typically be Book, Regular, Roman, Normal or sometimes Medium.
 /// 
-/// The slab is used to represent a floor slab against
-///   the ground (and thereby being a part of the
-///   foundation). Another name is mat foundation.
+/// The association of other weights within a family to the numerical weight values is intended only to preserve the ordering of darkness within that family. However, the following heuristics tell how the assignment is done in typical cases:
 /// 
-/// IFC2x3 CHANGE
-///    new enumerator added.
-typedef enum {IfcSlabType_FLOOR, IfcSlabType_ROOF, IfcSlabType_LANDING, IfcSlabType_BASESLAB, IfcSlabType_USERDEFINED, IfcSlabType_NOTDEFINED} IfcSlabTypeEnum;
-const char* ToString(IfcSlabTypeEnum v);
-IfcSlabTypeEnum FromString(const std::string& s);
-}
-namespace IfcSolarDeviceTypeEnum {
-/// The IfcSolarDeviceTypeEnum defines the range of types of solar devices available.
-///   HISTORY: New type in IFC 2x4. 
+/// If the font family already uses a numerical scale with nine values (such as with OpenType), the font weights should be mapped directly. 
+///   If there is both a face labeled Medium and one labeled Book, Regular, Roman or Normal, then the Medium is normally assigned to the '500'. 
+///   The font labeled "Bold" will often correspond to the weight value '700'. 
+///   If there are fewer then 9 weights in the family, the default algorithm for filling the "holes" is as follows. If '500' is unassigned, it will be assigned the same font as '400'. If any of the values '600', '700', '800' or '900' remains unassigned, they are assigned to the same face as the next darker assigned keyword, if any, or the next lighter one otherwise. If any of '300', '200' or '100' remains unassigned, it is assigned to the next lighter assigned keyword, if any, or the next darker otherwise. 
 /// 
-/// Enumeration 
+/// The following two examples illustrate the process. Assume four weights in the "Example1" family, from lightest to darkest: Regular, Medium, Bold, Heavy. And assume six weights in the "Example2" family: Book, Medium, Bold, Heavy, Black, ExtraBlack. Note how in the second example it has been decided not to assign "Example2 ExtraBlack" to anything.
 /// 
-/// SOLARCOLLECTOR: A device that converts solar radiation into thermal energy (heating water, etc.). 
-/// SOLARPANEL: A device that converts solar radiation into electric current. 
-/// USERDEFINED: User-defined type.  
-/// NOTDEFINED: Undefined type.
-typedef enum {IfcSolarDeviceType_SOLARCOLLECTOR, IfcSolarDeviceType_SOLARPANEL, IfcSolarDeviceType_USERDEFINED, IfcSolarDeviceType_NOTDEFINED} IfcSolarDeviceTypeEnum;
-const char* ToString(IfcSolarDeviceTypeEnum v);
-IfcSolarDeviceTypeEnum FromString(const std::string& s);
-}
-namespace IfcSpaceHeaterTypeEnum {
-/// Enumeration defining the functional type of space heater.
+/// Available faces       | Assignments   | Filling the holes----------------------+---------------+-------------------"Example1 Regular"    | 400           | 100, 200, 300"Example1 Medium"     | 500           |"Example1 Bold"       | 700           | 600"Example1 Heavy"      | 800           | 900
+/// Available faces       | Assignments   | Filling the holes----------------------+---------------+-------------------"Example2 Book"       | 400           | 100, 200, 300"Example2 Medium"     | 500           |"Example2 Bold"       | 700           | 600 "Example2 Heavy"      | 800           |"Example2 Black"      | 900           |"Example2 ExtraBlack" | (none)        |
 /// 
-/// The IfcSpaceHeaterTypeEnum contains the following:
+/// NOTE  Corresponding CSS1 definitions is font-weight.
 /// 
-/// CONVECTOR: A heat-distributing unit that operates with gravity-circulated air.
-/// RADIATOR: A heat-distributing unit that operates with thermal radiation.
-/// USERDEFINED: User-defined space heater type.
-/// NOTDEFINED:  Undefined space heater type.
+/// HISTORY  New type in IFC2x2 Addendum 2.
+class IfcFontWeight : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcFontWeight (IfcAbstractEntity* e);
+    IfcFontWeight (std::string v);
+    operator std::string() const;
+};
+/// IfcForceMeasure is a measure of the force.
+/// Usually measured in Newton (N, kg m/s2).
+/// Type: REAL
 /// 
-/// NOTE: This enumeration was revised in IFC 2x4 and was renamed from IfcHydronicHeaterTypeEnum in IFC R2x.
+/// HISTORY New type in IFC Release 2x.
+class IfcForceMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcForceMeasure (IfcAbstractEntity* e);
+    IfcForceMeasure (double v);
+    operator double() const;
+};
+/// IfcFrequencyMeasure is a measure of the number of times that an item vibrates in unit time.
+/// Usually measured in cycles/s or Herz (Hz).
+/// Type: REAL
 /// 
-/// HISTORY: New enumeration in IFC R2x.
-typedef enum {IfcSpaceHeaterType_CONVECTOR, IfcSpaceHeaterType_RADIATOR, IfcSpaceHeaterType_USERDEFINED, IfcSpaceHeaterType_NOTDEFINED} IfcSpaceHeaterTypeEnum;
-const char* ToString(IfcSpaceHeaterTypeEnum v);
-IfcSpaceHeaterTypeEnum FromString(const std::string& s);
-}
-namespace IfcSpaceTypeEnum {
-/// Definition from IAI: This enumeration defines the
-/// available generic types for IfcSpace and
-/// IfcSpaceType.
-/// HISTORY New enumeration
-/// in IFC2x3.
-/// IFC2x4 CHANGE The enumerators
-/// INTERNAL and EXTERNAL have been added for upward compatibility to
-/// replace InteriorOrExteriorSpace
-/// usage.
-/// Enumeration
+/// HISTORY New type in IFC Release 2.0.
+class IfcFrequencyMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcFrequencyMeasure (IfcAbstractEntity* e);
+    IfcFrequencyMeasure (double v);
+    operator double() const;
+};
+/// An IfcGloballyUniqueId holds an encoded string identifier that is used to uniquely identify an IFC object. An IfcGloballyUniqueId is a Globally
+///   Unique Identifier (GUID) which is an auto-generated 128-bit number. Since this identifier is
+///   required for all IFC object instances, it is desirable to compress it to reduce overhead. The encoding of the base 64 character set is shown below:
 /// 
-/// SPACE Any space not falling into another category.
+///            1         2         3         4         5         6
 /// 
-/// NOTE For classification of spaces according to its
-/// function that is often determined by national classification
-/// systems use IfcClassificationReference via the
-/// relationship IfcRelAssociatesClassification.
+///  0123456789012345678901234567890123456789012345678901234567890123
 /// 
-/// PARKING A space dedication for use as a parking spot
-/// for vehicles, including access, such as a parking aisle
-/// GFA Gross Floor Area - a specific kind of space for
-/// each building story that includes all net area and construction
-/// area (also the external envelop). Provision of such a specific
-/// space is often required by regulations.
-/// INTERNAL
+/// "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz_$";
 /// 
-/// NOTE the use is deprecated and
-/// only provided for backward compatibility
-/// purposes.
+/// The resulting string is a fixed 22 character length string to be exchanged within the IFC exchange file structure.
 /// 
-/// EXTERNAL
+/// Refer to the BuildingSMART website (www.buildingsmart-tech.org) for more information and sample encoding algorithms.
 /// 
-/// NOTE the use is deprecated and
-/// only provided for backward compatibility
-/// purposes.
-typedef enum {IfcSpaceType_SPACE, IfcSpaceType_PARKING, IfcSpaceType_GFA, IfcSpaceType_INTERNAL, IfcSpaceType_EXTERNAL, IfcSpaceType_USERDEFINED, IfcSpaceType_NOTDEFINED} IfcSpaceTypeEnum;
-const char* ToString(IfcSpaceTypeEnum v);
-IfcSpaceTypeEnum FromString(const std::string& s);
-}
-namespace IfcSpatialZoneTypeEnum {
-/// Definition from IAI: This enumeration defines the range
-/// of different types of spatial zones that can further specify an
-/// IfcSpatialZoneTypeEnum.
-/// HISTORY New enumeration
-/// in IFC Release 2x Edition 4.
-/// Enumeration
+/// HISTORY  New type in IFC R1.5.1.
+class IfcGloballyUniqueId : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcGloballyUniqueId (IfcAbstractEntity* e);
+    IfcGloballyUniqueId (std::string v);
+    operator std::string() const;
+};
+/// IfcHeatFluxDensityMeasure is a measure of the density of heat flux within a body.
+/// Usually measured in W/m2 (J/s m2).
+/// Type: REAL
 /// 
-/// CONSTRUCTION: the spatial zone is used
-/// to represent a construction zone for the production process
-/// FIRESAFETY: the spatial zone is used to
-/// represent a fire safety zone, or fire compartment
-/// LIGHTING: the spatial zone is used to
-/// represent a lighting zone, e.g. a daylight zone, or a artificial
-/// lighting zone
-/// OCCUPANCY: the spatial zone is used to
-/// represent a zone of particular occupancy
-/// SECURITY: the spatial zone is used to
-/// represent a zone for security planning and maintainance
-/// work.
-/// THERMAL: the spatial zone is used to
-/// represent a thermal zone
-/// USERDEFINED: user defined type spatial
-/// zone
-/// NOTDEFINED: undefined type spatial
-/// zone
-typedef enum {IfcSpatialZoneType_CONSTRUCTION, IfcSpatialZoneType_FIRESAFETY, IfcSpatialZoneType_LIGHTING, IfcSpatialZoneType_OCCUPANCY, IfcSpatialZoneType_SECURITY, IfcSpatialZoneType_THERMAL, IfcSpatialZoneType_TRANSPORT, IfcSpatialZoneType_VENTILATION, IfcSpatialZoneType_USERDEFINED, IfcSpatialZoneType_NOTDEFINED} IfcSpatialZoneTypeEnum;
-const char* ToString(IfcSpatialZoneTypeEnum v);
-IfcSpatialZoneTypeEnum FromString(const std::string& s);
-}
-namespace IfcStackTerminalTypeEnum {
-/// An IfcStackTerminalTypeEnum defines the range of different types of stack terminal that can be specified for use at the top of a vertical stack subsystem. 
-///   HISTORY: New type in IFC 2x  
-///   Enumeration 
+/// HISTORY New type in IFC Release 2.0.
+class IfcHeatFluxDensityMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcHeatFluxDensityMeasure (IfcAbstractEntity* e);
+    IfcHeatFluxDensityMeasure (double v);
+    operator double() const;
+};
+/// IfcHeatingValueMeasure defines the amount of energy released (usually in MJ/kg) when a fuel is burned.
 /// 
-/// BIRDCAGE: Guard cage, typically wire mesh, at the top of the stack preventing access by birds. 
-/// COWL: A cowling placed at the top of a stack to eliminate downdraft. 
-/// RAINWATERHOPPER: A box placed at the top of a rainwater downpipe to catch rainwater from guttering. 
-/// USERDEFINED: User-defined type. 
-/// NOTDEFINED: Undefined type.
-typedef enum {IfcStackTerminalType_BIRDCAGE, IfcStackTerminalType_COWL, IfcStackTerminalType_RAINWATERHOPPER, IfcStackTerminalType_USERDEFINED, IfcStackTerminalType_NOTDEFINED} IfcStackTerminalTypeEnum;
-const char* ToString(IfcStackTerminalTypeEnum v);
-IfcStackTerminalTypeEnum FromString(const std::string& s);
-}
-namespace IfcStairFlightTypeEnum {
-/// Definition from IAI: This enumeration defines the different types
-///   of stair flights an IfcStairFlightType object can fulfill: 
+/// HISTORY: This is new type in IFC2x2.
+class IfcHeatingValueMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcHeatingValueMeasure (IfcAbstractEntity* e);
+    IfcHeatingValueMeasure (double v);
+    operator double() const;
+};
+/// Definition from ISO/CD 10303-41:1992: An identifier is an alphanumeric string which allows an individual thing to be identified. It may not provide natural-language meaning.
 /// 
-/// STRAIGHT: A stair flight with a straight walking line.  
-///   WINDER: A stair flight with a straight walking line. 
-///   SPIRAL: A stair flight with a circular or elliptic walking
-///   line. 
-///   CURVED: A stair flight with a curved walking line. 
-///   FREEFORM: A stair flight with a free form walking line (and
-///   outer boundaries). 
-///   USERDEFINED: User-defined stair flight . 
-///   NOTDEFINED: Undefined stair flight . 
+/// Type: STRING of up to 255 characters
 /// 
-/// HISTORY: New Enumeration in
-///   Release IFC2x Edition 2.
-typedef enum {IfcStairFlightType_STRAIGHT, IfcStairFlightType_WINDER, IfcStairFlightType_SPIRAL, IfcStairFlightType_CURVED, IfcStairFlightType_FREEFORM, IfcStairFlightType_USERDEFINED, IfcStairFlightType_NOTDEFINED} IfcStairFlightTypeEnum;
-const char* ToString(IfcStairFlightTypeEnum v);
-IfcStairFlightTypeEnum FromString(const std::string& s);
-}
-namespace IfcStairTypeEnum {
-/// This enumeration defines the basic configuration of the stair type in terms of the number of stair flights and the number of landings, as illustrated in Figure 69. The type also distinguished turns by windings or by landings. In addition the subdivision of the straight and changing direction stairs is included. The stair configurations are given for stairs without and with one, two or three landings. 
+/// NOTE Corresponding STEP name: identifier, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
 /// 
-/// Stairs which are subdivided into more than three landings have to be defined by the geometry only. Also stairs with non-regular shapes have to be defined by the geometry only. The type of such stairs is OTHEROPERATION. 
+/// HISTORY New type in IFC Release 2x.
+/// IFC 2x4 CHANGE: Previously recommended size restriction of 255 characters is now mandatory.
 /// 
-/// HISTORY New Enumeration in IFC Release 2.0. 
+/// As a merely machine-readable string for identification purposes, an identifier is usually machine-generated and locale-independent (in contrast to human-readable labels, IfcLabel).
 /// 
-/// Enumerator 
-///   Description 
-///   Figure 
+/// Per ISO 10303-11, the set of characters that may appear in STRINGs is defined in ISO 10646.  The encoding of characters in case of file-based exchange is defined in ISO 10303-21 (STEP physical files) and ISO 10303-28 (XML files).  Among else, these specifications define the encoding of 8-bit characters from ISO 8859-1...-16 and of 2-byte Unicode characters.
 /// 
-/// StraightRunStair 
-///   A stair extending from
-///   one level to another without turns or winders. The stair consists of one
-///   straight flight. 
+/// Note that while IfcIdentifier is restricted to 255 characters, the size in exchange files after encoding may be considerably larger than 255 octets, depending on the particular encoding and on the contents of the identifier.
+class IfcIdentifier : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcIdentifier (IfcAbstractEntity* e);
+    IfcIdentifier (std::string v);
+    operator std::string() const;
+};
+/// IfcIlluminanceMeasure is a measure of the illuminance.
+/// Usually measured in Lux (lx, Lumen/m2 = Candela Steradian/m2).
+/// Type: REAL
 /// 
-/// TwoStraightRunStair 
-///   A straight stair
-///   consisting of two straight flights without turns but with one landing. 
+/// HISTORY New type in IFC Release 2x.
+class IfcIlluminanceMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcIlluminanceMeasure (IfcAbstractEntity* e);
+    IfcIlluminanceMeasure (double v);
+    operator double() const;
+};
+/// IfcInductanceMeasure is a measure of the inductance.
+/// Usually measure in Henry (H, Weber/A = V s/A).
+/// Type: REAL
 /// 
-/// QuarterWindingStair 
-///   A stair consisting of one
-///   flight with a quarter winder, which is making a 90° turn. The direction of
-///   the turn is determined by the walking line. 
+/// HISTORY New type in IFC Release 2x.
+class IfcInductanceMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcInductanceMeasure (IfcAbstractEntity* e);
+    IfcInductanceMeasure (double v);
+    operator double() const;
+};
+/// IfcInteger is a defined type of simple data type Integer. It is required since a select type (IfcSimpleValue) cannot include directly simple types in its select list.
 /// 
-/// QuarterTurnStair 
-///   A stair making a 90°
-///   turn, consisting of two straight flights connected by a quarterspace landing.
-///   The direction of the turn is determined by the walking line. 
+/// In principle, the domain of IfcInteger (being an Integer) is all integer numbers. Here the number of bits used for the IfcInteger representation is unconstrained, but in practice it is implementation specific.
 /// 
-/// HalfWindingStair 
-///   A stair consisting of one
-///   flight with one half winder, which makes a 180° turn. The orientation of
-///   the turn is determined by the walking line. 
+/// Type: INTEGER
 /// 
-/// HalfTurnStair 
-///   A stair making a 180°
-///   turn, consisting of two straight flights connected by a halfspace landing. The
-///   orientation of the turn is determined by the walking line. 
+/// HISTORY New type in IFC Release 1.5.1.
+class IfcInteger : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcInteger (IfcAbstractEntity* e);
+    IfcInteger (int v);
+    operator int() const;
+};
+/// IfcIntegerCountRateMeasure is a measure of the integer number of units flowing per unit time.
 /// 
-/// TwoQuarterWindingStair 
-///   A stair consisting of one
-///   flight with two quarter winders, which make a 90° turn. The stair makes a
-///   180° turn. The direction of the turns is determined by the walking
-///   line. 
+/// EXAMPLE: This measure may be used for measuring integer units per second or per hour. For example, it may be used to measure the number of books per hour passing along a part of a mechanical book handling system, the number of people per hour travelling along a moving walkway or the number of vehicles per hour travelling along a section of road.
 /// 
-/// TwoQuarterTurnStair 
-///   A stair making a 180°
-///   turn, consisting of three straight flights connected by two quarterspace
-///   landings. The direction of the turns is determined by the walking line. 
+/// Type: INTEGER
 /// 
-/// ThreeQuarterWindingStair
+/// HISTORY New type in IFC Release 2.0.
+class IfcIntegerCountRateMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcIntegerCountRateMeasure (IfcAbstractEntity* e);
+    IfcIntegerCountRateMeasure (int v);
+    operator int() const;
+};
+/// IfcIonConcentrationMeasure is a measure of particular ion concentration in a liquid, given in mg/L.
 /// 
-/// A stair consisting of one
-///   flight with three quarter winders, which make a 90° turn. The stair makes a
-///   270° turn. The direction of the turns is determined by the walking
-///   line. 
+/// HISTORY: New type in IFC2x2.
+class IfcIonConcentrationMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcIonConcentrationMeasure (IfcAbstractEntity* e);
+    IfcIonConcentrationMeasure (double v);
+    operator double() const;
+};
+/// IfcIsothermalMoistureCapacityMeasure is a measure of isothermal moisture capacity.
+/// Usually measured in m3/kg.
+/// Type: REAL
 /// 
-/// ThreeQuarterTurnStair 
-///   A stair making a 270°
-///   turn, consisting of four straight flights connected by three quarterspace
-///   landings. The direction of the turns is determined by the walking line. 
+/// HISTORY New type in IFC Release 2x.
+class IfcIsothermalMoistureCapacityMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcIsothermalMoistureCapacityMeasure (IfcAbstractEntity* e);
+    IfcIsothermalMoistureCapacityMeasure (double v);
+    operator double() const;
+};
+/// IfcKinematicViscosityMeasure is a measure of the viscous resistance of a medium to a moving body.
+/// Usually measured in m2/s.
+/// Type: REAL
 /// 
-/// SpiralStair 
-///   A stair constructed with
-///   winders around a circular newel often without landings. Depending on outer
-///   boundary it can be either a circular, elliptical or rectangular spiral stair.
-///   The orientation of the winding stairs is determined by the walking line. 
+/// HISTORY New type in IFC Release 2.0.
+class IfcKinematicViscosityMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcKinematicViscosityMeasure (IfcAbstractEntity* e);
+    IfcKinematicViscosityMeasure (double v);
+    operator double() const;
+};
+/// Definition from ISO/CD 10303-41:1992: A label is the term by which something may be referred to.  It is a string which represents the human-interpretable name of something and shall have a natural-language meaning.
 /// 
-/// DoubleReturnStair 
-///   A stair having one
-///   straight flight to a wide quarterspace landing, and two side flights from that
-///   landing into opposite directions. The stair is making a 90° turn. The
-///   direction of traffic is determined by the walking line. 
+/// Type: STRING of up to 255 characters
 /// 
-/// CurvedRunStair 
-///   A stair extending from one
-///   level to another without turns or winders. The stair is consisting of one
-///   curved flight. 
+/// NOTE Corresponding STEP name: label, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
 /// 
-/// TwoCurvedRunStair 
-///   A curved stair consisting of
-///   two curved flights without turns but with one landing. 
+/// HISTORY New type in IFC Release 2x.
+/// IFC 2x4 CHANGE: Previously recommended size restriction of 255 characters is now mandatory.
 /// 
-/// OtherOperation 
-///   Free form stair (user defined
-///   operation type) 
-///     
+/// As a human-readable string for naming purposes, a label is usually human-specified and locale-dependent (in contrast to purely machine-readable identifiers, IfcIdentifier).
 /// 
-/// NotDefined 
-///     
-///     
+/// Per ISO 10303-11, the set of characters that may appear in STRINGs is defined in ISO 10646.  The encoding of characters in case of file-based exchange is defined in ISO 10303-21 (STEP physical files) and ISO 10303-28 (XML files).  Among else, these specifications define the encoding of 8-bit characters from ISO 8859-1...-16 and of 2-byte Unicode characters.
 /// 
-/// Figure 69 — Stair types
-typedef enum {IfcStairType_STRAIGHT_RUN_STAIR, IfcStairType_TWO_STRAIGHT_RUN_STAIR, IfcStairType_QUARTER_WINDING_STAIR, IfcStairType_QUARTER_TURN_STAIR, IfcStairType_HALF_WINDING_STAIR, IfcStairType_HALF_TURN_STAIR, IfcStairType_TWO_QUARTER_WINDING_STAIR, IfcStairType_TWO_QUARTER_TURN_STAIR, IfcStairType_THREE_QUARTER_WINDING_STAIR, IfcStairType_THREE_QUARTER_TURN_STAIR, IfcStairType_SPIRAL_STAIR, IfcStairType_DOUBLE_RETURN_STAIR, IfcStairType_CURVED_RUN_STAIR, IfcStairType_TWO_CURVED_RUN_STAIR, IfcStairType_USERDEFINED, IfcStairType_NOTDEFINED} IfcStairTypeEnum;
-const char* ToString(IfcStairTypeEnum v);
-IfcStairTypeEnum FromString(const std::string& s);
-}
-namespace IfcStateEnum {
-/// The IfcStateEnum enumeration identifies the state or accessibility of the object (for example, read/write, locked).
+/// Note that while IfcLabel is restricted to 255 characters, the size in exchange files after encoding may be considerably larger than 255 octets, depending on the particular encoding and on the contents of the label.
+class IfcLabel : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcLabel (IfcAbstractEntity* e);
+    IfcLabel (std::string v);
+    operator std::string() const;
+};
+/// IfcLanguageId identifies the language in which a natural language text is expressed. It uses a language tag to identify the language.
+/// The tag shall comply to the Internet Engineering Task Force (IETF) language tag as expressed in RFC 5646. A conforming program shall support the "simple language" subtag and the "language-region" tag format.
 /// 
-/// Valid enumerations are:
+/// EXAMPLE  for simple language tags en (English), de (German), fr (France), or ja (Japanese), and for language-region tags en-US (English as used in United States), de-CH (German as used in German speaking part of Switzerland).
 /// 
-/// READWRITE: Object is in a Read-Write state. It may be modified by an application.
-/// READONLY: Object is in a Read-Only state. It may be viewed but not modified by an application.
-/// LOCKED: Object is in a Locked state. It may not be accessed by an application.
-/// READWRITELOCKED: Object is in a Read-Write-Locked state. It may not be accessed by an application.
-/// READONLYLOCKED: Object is in a Read-Only-Locked state. It may not be accessed by an application.
+/// Type: IfcIdentifier
 /// 
-/// HISTORY  New enumeration in IFC R2.0.
+/// NOTE  The use of IfcLanguageId should conform to the use of language tags in HTML and XML as published by the W3C consortium.
 /// 
-/// IFC2x3 CHANGE  This concept was initially introduced in IFC 2.0 as IfcModifiedFlag of type BINARY(3) FIXED and has been modified in R2x to an enumeration. It was initially introduced as a first step towards providing facilities for partial model exchange from a server as requested by the IFC implementers. It is intended for use primarily by a model server so that an application can identify the state of the object.
-typedef enum {IfcState_READWRITE, IfcState_READONLY, IfcState_LOCKED, IfcState_READWRITELOCKED, IfcState_READONLYLOCKED} IfcStateEnum;
-const char* ToString(IfcStateEnum v);
-IfcStateEnum FromString(const std::string& s);
-}
-namespace IfcStructuralCurveActivityTypeEnum {
-/// Definition from IAI: Enumeration defining the distribution of load values in a curve action or reaction.
+/// HISTORY  New defined datatype in IFC2x4.
+class IfcLanguageId : public IfcIdentifier {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcLanguageId (IfcAbstractEntity* e);
+    IfcLanguageId (std::string v);
+    operator std::string() const;
+};
+/// Definition from ISO/CD 10303-41:1992: A length measure is the value of a distance.
+/// Usually measured in millimeters (mm).
+/// Type: REAL
 /// 
-/// HISTORY New type in IFC 2x4
+/// NOTE Corresponding ISO 10303 name: length_measure, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
 /// 
-/// ENUMERATION 
+/// HISTORY New type in IFC Release 1.5.1.
+class IfcLengthMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcLengthMeasure (IfcAbstractEntity* e);
+    IfcLengthMeasure (double v);
+    operator double() const;
+};
+/// IfcLinearForceMeasure is a measure of linear force.
+/// Usually measured in N/m.
+/// Type: REAL
 /// 
-/// CONST The load has a constant value over its entire extent.
-///   LINEAR The load value is linearly distributed over the load's extent.
-///   POLYGONAL The load consists of several consecutive linear sections.
-///   EQUIDISTANT The load consists of n consecutive sections of same length and is specified by n+1 load samples.  The interpolation type over the segments is not defined by this distribution type but may be qualified in IfcObject.ObjectType based on additional agreements.
-///   SINUS The load value is distributed as a sinus half wave.
-///   PARABOLA The load value is distributed as a half wave described by a symmetric quadratic parabola.
-///   DISCRETE The load is specified as a series of discrete load points.
-///   USERDEFINED The load distribution is user-defined.
-///   NOTDEFINED The load distribution is undefined.
-typedef enum {IfcStructuralCurveActivityType_CONST, IfcStructuralCurveActivityType_LINEAR, IfcStructuralCurveActivityType_POLYGONAL, IfcStructuralCurveActivityType_EQUIDISTANT, IfcStructuralCurveActivityType_SINUS, IfcStructuralCurveActivityType_PARABOLA, IfcStructuralCurveActivityType_DISCRETE, IfcStructuralCurveActivityType_USERDEFINED, IfcStructuralCurveActivityType_NOTDEFINED} IfcStructuralCurveActivityTypeEnum;
-const char* ToString(IfcStructuralCurveActivityTypeEnum v);
-IfcStructuralCurveActivityTypeEnum FromString(const std::string& s);
-}
-namespace IfcStructuralCurveMemberTypeEnum {
-/// Definition from IAI: This type definition shall be used to
+/// HISTORY New type in IFC Release 2x.
+class IfcLinearForceMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcLinearForceMeasure (IfcAbstractEntity* e);
+    IfcLinearForceMeasure (double v);
+    operator double() const;
+};
+/// IfcLinearMomentMeasure is a measure of linear moment.
+/// Usually measured in Nm/m.
+/// Type: REAL
 /// 
-/// distinguish between different types of structural 'curve' members, such as
+/// HISTORY New type in IFC Release 2x.
+class IfcLinearMomentMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcLinearMomentMeasure (IfcAbstractEntity* e);
+    IfcLinearMomentMeasure (double v);
+    operator double() const;
+};
+/// IfcLinearStiffnessMeasureA measure of linear stiffness.
+/// Usually measured in N/m.
+/// Type: REAL
 /// 
-/// cables. The IfcStructuralCurveTypeEnum type is referenced by the entity
+/// HISTORY New type in IFC Release 2x.
+class IfcLinearStiffnessMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcLinearStiffnessMeasure (IfcAbstractEntity* e);
+    IfcLinearStiffnessMeasure (double v);
+    operator double() const;
+};
+/// IfcLinearVelocityMeasure is a measure of the velocity of a body measured in terms of distance moved per unit time.
+/// Usually measured in m/s.
+/// Type: REAL
 /// 
-/// IfcStructuralCurveMember. 
+/// HISTORY New type in IFC Release 2.0.
+class IfcLinearVelocityMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcLinearVelocityMeasure (IfcAbstractEntity* e);
+    IfcLinearVelocityMeasure (double v);
+    operator double() const;
+};
+/// IfcLogical</iL is a defined type of simple type Logical. It is required since a select type (IfcSimpleValue) cannot directly include simple types in its select list). Logical datatype can have values TRUE, FALSE or UNKNOWN.
 /// 
-/// RIGID_JOINED_MEMBER:  A member with capacity to carry transverse and axial loads, i.e. a beam. Its actual joints may be rigid or pinned. Typically used in rigid frames.
-/// PIN_JOINED_MEMBER:    A member with capacity to carry axial loads only, i.e. a link. Typically used in trusses.
-/// CABLE:                A tension member which is able to carry transverse loads only under large deflection.
-/// TENSION_MEMBER:       A member without compressional stiffness.
-/// COMPRESSION_MEMBER:   A member without tensional stiffness.
-/// USERDEFINED:          A specially defined member.
-/// NOTDEFINED:           A member without further categorization.
+/// Type: LOGICAL
 /// 
-/// HISTORY New type in IFC 2x2.
-/// IFC 2x4 change:  Renamed from IfcStructuralCurveTypeEnum.
-typedef enum {IfcStructuralCurveMemberType_RIGID_JOINED_MEMBER, IfcStructuralCurveMemberType_PIN_JOINED_MEMBER, IfcStructuralCurveMemberType_CABLE, IfcStructuralCurveMemberType_TENSION_MEMBER, IfcStructuralCurveMemberType_COMPRESSION_MEMBER, IfcStructuralCurveMemberType_USERDEFINED, IfcStructuralCurveMemberType_NOTDEFINED} IfcStructuralCurveMemberTypeEnum;
-const char* ToString(IfcStructuralCurveMemberTypeEnum v);
-IfcStructuralCurveMemberTypeEnum FromString(const std::string& s);
-}
-namespace IfcStructuralSurfaceActivityTypeEnum {
-/// Definition from IAI: Enumeration defining the distribution of load values in a surface action or reaction.
+/// HISTORY New type in IFC Release 2x.
+class IfcLogical : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcLogical (IfcAbstractEntity* e);
+    IfcLogical (bool v);
+    operator bool() const;
+};
+/// IfcLuminousFluxMeasure is a measure of the luminous flux.
+/// Usually measured in Lumen (lm, Candela Steradian).
+/// Type: REAL
 /// 
-/// HISTORY New type in IFC 2x4
+/// HISTORY New type in IFC Release 2x.
+class IfcLuminousFluxMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcLuminousFluxMeasure (IfcAbstractEntity* e);
+    IfcLuminousFluxMeasure (double v);
+    operator double() const;
+};
+/// IfcLuminousIntensityDistributionMeasure is a measure of the luminous intensity of a light source that changes according to the direction of the ray. It is normally based on some standardized distribution light distribution curves. 
 /// 
-/// ENUMERATION 
+/// Usually measured in Candela/Lumen (cd/lm) or (cd/klm).  
 /// 
-/// CONST The load has a constant value over its entire extent.
-///   BILINEAR The load value is bilinearly distributed over the load's extent.
-///   DISCRETE The load is specified as a series of discrete load points.
-///   ISOCONTOUR The load is specified by a series of iso-curves (level sets), i.e. curves at which the load value is constant.  These curves run perpendicularly to the load gradient.
-///   USERDEFINED The load distribution is user-defined.
-///   NOTDEFINED The load distribution is undefined.
-typedef enum {IfcStructuralSurfaceActivityType_CONST, IfcStructuralSurfaceActivityType_BILINEAR, IfcStructuralSurfaceActivityType_DISCRETE, IfcStructuralSurfaceActivityType_ISOCONTOUR, IfcStructuralSurfaceActivityType_USERDEFINED, IfcStructuralSurfaceActivityType_NOTDEFINED} IfcStructuralSurfaceActivityTypeEnum;
-const char* ToString(IfcStructuralSurfaceActivityTypeEnum v);
-IfcStructuralSurfaceActivityTypeEnum FromString(const std::string& s);
-}
-namespace IfcStructuralSurfaceMemberTypeEnum {
-/// Definition from IAI: This type definition shall be used to
+/// Type: REAL  
 /// 
-/// distinguish between different types of structural surface members, such as the
+/// HISTORY New type in IFC2x2.
+class IfcLuminousIntensityDistributionMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcLuminousIntensityDistributionMeasure (IfcAbstractEntity* e);
+    IfcLuminousIntensityDistributionMeasure (double v);
+    operator double() const;
+};
+/// Definition from ISO/CD 10303-41:1992: A luminous intensity measure is the value for the brightness of a body.
+/// Usually measured in candela (cd).
+/// Type: REAL
 /// 
-/// typical mechanical function of walls, slabs and shells.
+/// NOTE Corresponding ISO 10303 name: luminous_intensity_measure, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
 /// 
-/// BENDING_ELEMENT:   A member with capacity to carry out-of-plane loads, i.e. a plate.
-/// MEMBRANE_ELEMENT:  A member with capacity to carry in-plane loads, for example a shear wall.
-/// SHELL:             A member with capacity to carry in-plane and out-of-plane loads, i.e. a combination of bending element and membrane element.
-/// USERDEFINED:       A specially defined member.
-/// NOTDEFINED:        A member without further categorization.
+/// HISTORY New type in IFC Release 1.5.1.
+class IfcLuminousIntensityMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcLuminousIntensityMeasure (IfcAbstractEntity* e);
+    IfcLuminousIntensityMeasure (double v);
+    operator double() const;
+};
+/// IfcMagneticFluxDensityMeasure is a measure of the magnetic flux density.
+/// Usually measured in Tesla (T, Weber/m2 = V s/m2).
+/// Type: REAL
 /// 
-/// HISTORY New type in IFC 2x2.
-/// IFC 2x4 change:  Renamed from IfcStructuralSurfaceTypeEnum.
-typedef enum {IfcStructuralSurfaceMemberType_BENDING_ELEMENT, IfcStructuralSurfaceMemberType_MEMBRANE_ELEMENT, IfcStructuralSurfaceMemberType_SHELL, IfcStructuralSurfaceMemberType_USERDEFINED, IfcStructuralSurfaceMemberType_NOTDEFINED} IfcStructuralSurfaceMemberTypeEnum;
-const char* ToString(IfcStructuralSurfaceMemberTypeEnum v);
-IfcStructuralSurfaceMemberTypeEnum FromString(const std::string& s);
-}
-namespace IfcSubContractResourceTypeEnum {
-/// This enumeration is used to identify the primary purpose of a subcontract resource.  The IfcSubContractResourceTypeEnum contains the following:
+/// HISTORY New type in IFC Release 2x.
+class IfcMagneticFluxDensityMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcMagneticFluxDensityMeasure (IfcAbstractEntity* e);
+    IfcMagneticFluxDensityMeasure (double v);
+    operator double() const;
+};
+/// IfcMagneticFluxMeasure is a measure of the magnetic flux.
+/// Usually measured in Weber (Wb, V s).
+/// Type: REAL
 /// 
-/// PURCHASE: Furnishing or supplying products.
-/// WORK: Performing work onsite.
-/// USERDEFINED: User-defined resource.
-/// NOTDEFINED: Undefined resource.
+/// HISTORY New type in IFC Release 2x.
+class IfcMagneticFluxMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcMagneticFluxMeasure (IfcAbstractEntity* e);
+    IfcMagneticFluxMeasure (double v);
+    operator double() const;
+};
+/// IfcMassDensityMeasure is a measure of the density of a medium.
+/// Usually measured in kg/m3.
+/// Type: REAL
 /// 
-/// HISTORY: New enumeration in IFC2x4
-typedef enum {IfcSubContractResourceType_PURCHASE, IfcSubContractResourceType_WORK, IfcSubContractResourceType_USERDEFINED, IfcSubContractResourceType_NOTDEFINED} IfcSubContractResourceTypeEnum;
-const char* ToString(IfcSubContractResourceTypeEnum v);
-IfcSubContractResourceTypeEnum FromString(const std::string& s);
-}
-namespace IfcSurfaceFeatureTypeEnum {
-/// Definition from IAI: This enumeration indicates the type of a surface feature.
+/// HISTORY New type in IFC Release 2.0.
+class IfcMassDensityMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcMassDensityMeasure (IfcAbstractEntity* e);
+    IfcMassDensityMeasure (double v);
+    operator double() const;
+};
+/// IfcMassFlowRateMeasure is a measure of the mass of a medium flowing per unit time.
+/// Usually measured in kg/s.
+/// Type: REAL
 /// 
-/// HISTORY New type in IFC 2x4.
+/// HISTORY New type in IFC Release 2.0.
+class IfcMassFlowRateMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcMassFlowRateMeasure (IfcAbstractEntity* e);
+    IfcMassFlowRateMeasure (double v);
+    operator double() const;
+};
+/// Definition from ISO/CD 10303-41:1992: A mass measure is the value of the amount of matter that a body contains.
+/// Usually measured in kilograms (kg) or grams (g).
+/// Type: REAL
 /// 
-/// ENUMERATION
+/// NOTE Corresponding ISO 10303 name: mass_measure, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
 /// 
-/// MARK A point, line, cross, or other mark, applied for example for easier adjustment of elements during assembly.
-///   TAG A name tag, which allows to identify an element during production, delivery and assembly.  May be manufactured in different ways, e.g. by printing or punching the tracking code onto the element or by attaching an actual tag.
-///   TREATMENT A subtractive surface feature, e.g. grinding, or an additive surface feature, e.g. coating, or an impregnating treatment, or a series of any of these kinds of treatments.
-///   USERDEFINED A user-defined type of surface feature.
-///   NOTDEFINED An undefined type of surface feature.
-typedef enum {IfcSurfaceFeatureType_MARK, IfcSurfaceFeatureType_TAG, IfcSurfaceFeatureType_TREATMENT, IfcSurfaceFeatureType_USERDEFINED, IfcSurfaceFeatureType_NOTDEFINED} IfcSurfaceFeatureTypeEnum;
-const char* ToString(IfcSurfaceFeatureTypeEnum v);
-IfcSurfaceFeatureTypeEnum FromString(const std::string& s);
-}
-namespace IfcSurfaceSide {
-/// IfcSurfaceSide is a denotion of whether negative, positive or both sides of a surface are being referenced. 
+/// HISTORY New type in IFC Release 1.5.1.
+class IfcMassMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcMassMeasure (IfcAbstractEntity* e);
+    IfcMassMeasure (double v);
+    operator double() const;
+};
+/// IfcMassPerLengthMeasure is a measure for mass per length. For example for rolled steel profiles the weight of
+///   an imaginary beam is usually expressed by kg/m length for cost calculation and
+///   structural analysis purposes.
 /// 
-/// ENUMERATION Definition from ISO/CD 10303-46:1992: 
+/// Type: REAL
 /// 
-/// POSITIVE: The side of a surface which is in the same direction as the surface normal derived from the mathematical definition.  
-/// NEGATIVE: The side of a surface which is in the opposite direction than the surface normal derived from the mathematical definition. 
-/// BOTH: Both, positive and negative side. 
+/// HISTORY New type in IFC2x2.
+class IfcMassPerLengthMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcMassPerLengthMeasure (IfcAbstractEntity* e);
+    IfcMassPerLengthMeasure (double v);
+    operator double() const;
+};
+/// IfcModulusOfElasticityMeasure is a measure of modulus of elasticity.
+/// Usually measured in N/m2.
+/// Type: REAL
 /// 
-/// NOTE Corresponding ISO 10303 type: surface_side. Please refer to ISO/IS 10303-46:1994 for the final definition of the formal standard.
+/// HISTORY New type in IFC Release 2x.
+class IfcModulusOfElasticityMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcModulusOfElasticityMeasure (IfcAbstractEntity* e);
+    IfcModulusOfElasticityMeasure (double v);
+    operator double() const;
+};
+/// IfcModulusOfLinearSubgradeReactionMeasure is a measure for modulus of linear subgrade reaction, which expresses the elastic bedding of a linear structural element per length, such as for a beam. It is typically measured in N/m^2.
 /// 
-/// HISTORY: New Enumeration in IFC 2.0
-typedef enum {IfcSurfaceSide_POSITIVE, IfcSurfaceSide_NEGATIVE, IfcSurfaceSide_BOTH} IfcSurfaceSide;
-const char* ToString(IfcSurfaceSide v);
-IfcSurfaceSide FromString(const std::string& s);
-}
-namespace IfcSwitchingDeviceTypeEnum {
-/// The IfcSwitchingDeviceTypeEnum defines the range of different types of switch that can be specified. 
-///   HISTORY: New type in IFC 2x2 
-///   Enumeration 
+/// Type: REAL  
 /// 
-/// CONTACTOR: An electrical device used to control the flow of power in a circuit on or off. 
-/// DIMMERSWITCH: A dimmer switch has variable positions, and may adjust electrical power or other setting (according to the switched port type). 
-/// EMERGENCYSTOP: An emergency stop device acts to remove as quickly as possible any danger that may have arisen unexpectedly. 
-/// KEYPAD: A set of buttons or switches, each potentially applicable to a different device.  
-/// MOMENTARYSWITCH: A momentary switch has no position, and may trigger some action to occur.  
-/// SELECTORSWITCH: A selector switch has multiple positions, and may switch connectivity or other setting.  
-/// STARTER: A starter is a switch which in the closed position controls the application of power to an electrical device. 
-/// SWITCHDISCONNECTOR: A switch disconnector is a switch which in the open position satisfies the isolating requirements specified for a disconnector. 
-/// SELECTORSWITCH: A selector switch has multiple positions, and may change the source or level of power or other setting (according to the switched port type). 
-/// TOGGLESWITCH: A toggle switch has two positions, and may enable or isolate electrical power or other setting (according to the switched port type). 
-/// USERDEFINED: User-defined type. 
-/// NOTDEFINED: Undefined type.
-typedef enum {IfcSwitchingDeviceType_CONTACTOR, IfcSwitchingDeviceType_DIMMERSWITCH, IfcSwitchingDeviceType_EMERGENCYSTOP, IfcSwitchingDeviceType_KEYPAD, IfcSwitchingDeviceType_MOMENTARYSWITCH, IfcSwitchingDeviceType_SELECTORSWITCH, IfcSwitchingDeviceType_STARTER, IfcSwitchingDeviceType_SWITCHDISCONNECTOR, IfcSwitchingDeviceType_TOGGLESWITCH, IfcSwitchingDeviceType_USERDEFINED, IfcSwitchingDeviceType_NOTDEFINED} IfcSwitchingDeviceTypeEnum;
-const char* ToString(IfcSwitchingDeviceTypeEnum v);
-IfcSwitchingDeviceTypeEnum FromString(const std::string& s);
-}
-namespace IfcSystemFurnitureElementTypeEnum {
-/// IfcSystemFurnitureTypeEnum defines the types of system furniture from which the type required can be selected. 
-///   HISTORY: New Enumeration in IFC 2x4 
-///   Enumeration: 
+/// HISTORY New type in IFC Release 2x2.
+class IfcModulusOfLinearSubgradeReactionMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcModulusOfLinearSubgradeReactionMeasure (IfcAbstractEntity* e);
+    IfcModulusOfLinearSubgradeReactionMeasure (double v);
+    operator double() const;
+};
+/// IfcModulusOfRotationalSubgradeReactionMeasure is a measure for modulus of rotational subgrade reaction, which expresses the rotational elastic bedding of a linear structural element per length, such as for a beam. It is typically measured in Nm/(m*rad). 
 /// 
-/// PANEL: Vertical panel used to divide work spaces.  
-/// WORKSURFACE: Workstation countertop.  
-/// USERDEFINED: User-defined type.  
-/// NOTDEFINED: Undefined type.
-typedef enum {IfcSystemFurnitureElementType_PANEL, IfcSystemFurnitureElementType_WORKSURFACE, IfcSystemFurnitureElementType_USERDEFINED, IfcSystemFurnitureElementType_NOTDEFINED} IfcSystemFurnitureElementTypeEnum;
-const char* ToString(IfcSystemFurnitureElementTypeEnum v);
-IfcSystemFurnitureElementTypeEnum FromString(const std::string& s);
-}
-namespace IfcTankTypeEnum {
-/// Enumeration defining the typical types of tanks.
+/// Type: REAL  
 /// 
-/// The IfcTankTypeEnum contains the following:
+/// HISTORY New type in IFC2x2.
+class IfcModulusOfRotationalSubgradeReactionMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcModulusOfRotationalSubgradeReactionMeasure (IfcAbstractEntity* e);
+    IfcModulusOfRotationalSubgradeReactionMeasure (double v);
+    operator double() const;
+};
+/// IfcModulusOfSubgradeReactionMeasure is a geotechnical measure describing interaction between foundation structures and the soil. May also be known as bedding measure. 
+///   Usually measured in N/m3.  
+///   Type: REAL  
 /// 
-/// BASIN:  An arbitrary open tank type.
+/// HISTORY New type in IFC Release 2x.
 /// 
-/// BREAKPRESSURE:  An open container that breaks the hydraulic pressure in a distribution system, typically located between the fluid reservoir and the fluid supply points. A typical break pressure tank allows the flow to discharge into the atmosphere, thereby reducing its hydrostatic pressure to zero.
+/// Figure 290 illustrates elastic support of a planar member.
 /// 
-/// EXPANSION:  A closed container used in a closed fluid distribution system to mitigate the effects of thermal expansion or water hammer. The tank is typically constructed with a diaphragm dividing the tank into two sections, with fluid on one side of the diaphragm and air on the other. One example application is when connected to the primary circuit of a hot water system to accommodate the increase in volume of the water when it is heated.
+/// Figure 290 — Modulus of subgrade reaction measure
+class IfcModulusOfSubgradeReactionMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcModulusOfSubgradeReactionMeasure (IfcAbstractEntity* e);
+    IfcModulusOfSubgradeReactionMeasure (double v);
+    operator double() const;
+};
+/// IfcMoistureDiffusivityMeasure is a measure of moisture diffusivity.
+/// Usually measured in m3/s.
+/// Type: REAL
 /// 
-/// FEEDANDEXPANSION:  An open tank that is used for both storage and thermal expansion. A typical example is a tank used to store make-up water at ambient pressure for supply to a hot water system, simultaneously accommodating increases in volume of the water when heated.
+/// HISTORY New type in IFC Release 2x.
+class IfcMoistureDiffusivityMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcMoistureDiffusivityMeasure (IfcAbstractEntity* e);
+    IfcMoistureDiffusivityMeasure (double v);
+    operator double() const;
+};
+/// IfcMolecularWeightMeasure is a measure of molecular weight of material (typically gas).
+/// Usually measured in g/mole.
+/// Type: REAL
 /// 
-/// PRESSUREVESSEL:  A closed container used for storing fluids or gases at a pressure different from the ambient pressure. A pressure vessel is typically rated by an authority having jurisdiction for the operational pressure.
+/// HISTORY New type in IFC Release 2x.
+class IfcMolecularWeightMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcMolecularWeightMeasure (IfcAbstractEntity* e);
+    IfcMolecularWeightMeasure (double v);
+    operator double() const;
+};
+/// IfcMomentOfInertiaMeasure is a measure of moment of inertia.
+/// Usually measured in m4.
+/// Type: REAL
 /// 
-/// STORAGE:  An open or closed containter used for storing a fluid at ambient pressure and from which it can be supplied to the fluid distribution system. There are many examples of storage tanks, such as potable water storage tanks, fuel storage tanks, etc.
+/// HISTORY New type in IFC Release 2x.
+class IfcMomentOfInertiaMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcMomentOfInertiaMeasure (IfcAbstractEntity* e);
+    IfcMomentOfInertiaMeasure (double v);
+    operator double() const;
+};
+/// A monetary measure is the value of an amount of money without regard to its currency.
+/// Type: REAL
 /// 
-/// VESSEL:  An arbitrary closed tank type.
+/// HISTORY New type in IFC Release 2.0.
+class IfcMonetaryMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcMonetaryMeasure (IfcAbstractEntity* e);
+    IfcMonetaryMeasure (double v);
+    operator double() const;
+};
+/// Definition from IAI: The IfcDayInMonthNumber is
+/// an integer that defines the position of the specified month in a
+/// year. The positions have the following meaning (according to
+/// ISO8601 "calendar month") that assigns the Calendar month number
+/// to the Calender month name.
+/// NOTE Refer to ISO 8601 for the definitions for
+/// using the Gregorian calendar as the standard for the
+/// identification of calendar days.
 /// 
-/// USERDEFINED:  User-defined tank type.
+/// Calendar month number
+/// Calendar month
+/// name
 /// 
-/// NOTDEFINED:  Undefined tank type.
+/// 01
+/// January
 /// 
-/// HISTORY: New enumeration in IFC 2x2.  BASIN and VESSEL added in IFC2x4.
-typedef enum {IfcTankType_BASIN, IfcTankType_BREAKPRESSURE, IfcTankType_EXPANSION, IfcTankType_FEEDANDEXPANSION, IfcTankType_PRESSUREVESSEL, IfcTankType_STORAGE, IfcTankType_VESSEL, IfcTankType_USERDEFINED, IfcTankType_NOTDEFINED} IfcTankTypeEnum;
-const char* ToString(IfcTankTypeEnum v);
-IfcTankTypeEnum FromString(const std::string& s);
-}
-namespace IfcTaskDurationEnum {
-/// IfcTaskDurationEnum identifies how a time duration is measured:
+/// 02
+/// February
 /// 
-/// ELAPSEDTIME: The time duration is based on elapsed time (24 hours per day, independent of calendar).
-///   WORKTIME: The time duration is based on work time (calendar-dependent).
-///   NOTDEFINED: The time duration is undefined.
+/// 03
+/// March
 /// 
-/// HISTORY: New enumeration in IFC2x4.
-typedef enum {IfcTaskDuration_ELAPSEDTIME, IfcTaskDuration_WORKTIME, IfcTaskDuration_NOTDEFINED} IfcTaskDurationEnum;
-const char* ToString(IfcTaskDurationEnum v);
-IfcTaskDurationEnum FromString(const std::string& s);
-}
-namespace IfcTaskTypeEnum {
-/// The IfcTaskTypeEnum defines the range of different types of task that can be specified.
+/// 04
+/// April
 /// 
-/// HISTORY  New type in IFC2x4
+/// 05
+/// May
 /// 
-/// Enumeration:
+/// 06
+/// June
 /// 
-/// ATTENDANCE: Attendance or waiting on other things happening
-/// CONSTRUCTION: Constructing or building something
-/// DEMOLITION: Demolishing or breaking down something
-/// DISMANTLE: Taking something apart carefully so that it can be recycled or reused
-/// DISPOSAL: Disposing or getting rid of something
-/// INSTALLATION: Installing something (equivalent to construction but more commonly used for engineering tasks)
-/// LOGISTIC: Transporation or delivery of something
-/// MAINTENANCE: Keeping something in good working order
-/// MOVE: Moving things from one place to another
-/// OPERATION: A procedure undertaken to start up the operation an artifact
-/// REMOVAL: Removal of an item from use and taking it from its place of use
-/// RENOVATION: Bringing something to an 'as-new' state
-typedef enum {IfcTaskType_ATTENDANCE, IfcTaskType_CONSTRUCTION, IfcTaskType_DEMOLITION, IfcTaskType_DISMANTLE, IfcTaskType_DISPOSAL, IfcTaskType_INSTALLATION, IfcTaskType_LOGISTIC, IfcTaskType_MAINTENANCE, IfcTaskType_MOVE, IfcTaskType_OPERATION, IfcTaskType_REMOVAL, IfcTaskType_RENOVATION, IfcTaskType_USERDEFINED, IfcTaskType_NOTDEFINED} IfcTaskTypeEnum;
-const char* ToString(IfcTaskTypeEnum v);
-IfcTaskTypeEnum FromString(const std::string& s);
-}
-namespace IfcTendonAnchorTypeEnum {
-
-typedef enum {IfcTendonAnchorType_COUPLER, IfcTendonAnchorType_FIXED_END, IfcTendonAnchorType_TENSIONING_END, IfcTendonAnchorType_USERDEFINED, IfcTendonAnchorType_NOTDEFINED} IfcTendonAnchorTypeEnum;
-const char* ToString(IfcTendonAnchorTypeEnum v);
-IfcTendonAnchorTypeEnum FromString(const std::string& s);
-}
-namespace IfcTendonTypeEnum {
-
-typedef enum {IfcTendonType_BAR, IfcTendonType_COATED, IfcTendonType_STRAND, IfcTendonType_WIRE, IfcTendonType_USERDEFINED, IfcTendonType_NOTDEFINED} IfcTendonTypeEnum;
-const char* ToString(IfcTendonTypeEnum v);
-IfcTendonTypeEnum FromString(const std::string& s);
-}
-namespace IfcTextPath {
-/// The text path determines the direction of the text characters in respect to each other.
+/// 07
+/// July
 /// 
-/// NOTE: The IfcTextPath is an entity that had been adopted from ISO 10303, Industrial automation systems and integration&#151;Product data representation and exchange, Part 46: Integrated generic resources: Visual presentation.
+/// 08
+/// August
 /// 
-/// NOTE Corresponding ISO 10303 name:text_path . Please refer to ISO/IS 10303-46:1994 for the final definition of the formal standard.
+/// 09
+/// September
 /// 
-/// HISTORY New entity in IFC2x2.
-typedef enum {IfcTextPath_LEFT, IfcTextPath_RIGHT, IfcTextPath_UP, IfcTextPath_DOWN} IfcTextPath;
-const char* ToString(IfcTextPath v);
-IfcTextPath FromString(const std::string& s);
-}
-namespace IfcTimeSeriesDataTypeEnum {
-/// IfcTimeSeriesDataTypeEnum describes a type of time series data and is used to determine a value during the time series which is not explicitly specified: 
+/// 10
+/// October
 /// 
-/// CONTINUOUS: The time series data is continuous. 
-///   DISCRETE: The time series data is discrete. 
-///   DISCRETEBINARY: The time series data is discrete binary. 
-///   PIECEWISEBINARY: The time series data is piecewise binary. 
-///   PIECEWISECONSTANT: The time series data is piecewise constant. 
-///   PIECEWISECONTINUOUS: The time series data is piecewise continuous. 
-///   NOTDEFINED: The time series data is not defined. 
+/// 11
+/// November
 /// 
-/// HISTORY: New enumeration in IFC2x2.
-typedef enum {IfcTimeSeriesDataType_CONTINUOUS, IfcTimeSeriesDataType_DISCRETE, IfcTimeSeriesDataType_DISCRETEBINARY, IfcTimeSeriesDataType_PIECEWISEBINARY, IfcTimeSeriesDataType_PIECEWISECONSTANT, IfcTimeSeriesDataType_PIECEWISECONTINUOUS, IfcTimeSeriesDataType_NOTDEFINED} IfcTimeSeriesDataTypeEnum;
-const char* ToString(IfcTimeSeriesDataTypeEnum v);
-IfcTimeSeriesDataTypeEnum FromString(const std::string& s);
-}
-namespace IfcTransformerTypeEnum {
-/// The IfcTransformerTypeEnum defines the range of different types of transformer that can be specified. 
-///   HISTORY: New type in IFC 2x2 
-///   Enumeration 
+/// 12
+/// December
 /// 
-/// CURRENT: A transformer that changes the current between circuits. 
-/// FREQUENCY: A transformer that changes the frequency between circuits. 
-/// INVERTER: A transformer that converts from direct current (DC) to alternating current (AC). 
-/// RECTIFIER: A transformer that converts from alternating current (AC) to direct current (DC).  
-/// VOLTAGE: A transformer that changes the voltage between circuits.  
-/// USERDEFINED: User-defined type. 
-/// NOTDEFINED: Undefined type.
-typedef enum {IfcTransformerType_CURRENT, IfcTransformerType_FREQUENCY, IfcTransformerType_INVERTER, IfcTransformerType_RECTIFIER, IfcTransformerType_VOLTAGE, IfcTransformerType_USERDEFINED, IfcTransformerType_NOTDEFINED} IfcTransformerTypeEnum;
-const char* ToString(IfcTransformerTypeEnum v);
-IfcTransformerTypeEnum FromString(const std::string& s);
-}
-namespace IfcTransitionCode {
-/// Definition from ISO/CD 10303-42:1992: This type conveys the continuity properties of a composite curve or surface. The continuity referred to is geometric, not parametric continuity. For example, in ContSameGradient the tangent vectors of successive segments will have the same direction, but may have different magnitude.  
+/// Type: INTEGER
+/// NOTE Corresponding STEP
+/// name: month_in_year_number, please refer to ISO/IS 10303-41:1994
+/// for the final definition of the formal
+/// standard.
+/// HISTORY New type in IFC
+/// Release 1.5.1.
+class IfcMonthInYearNumber : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcMonthInYearNumber (IfcAbstractEntity* e);
+    IfcMonthInYearNumber (int v);
+    operator int() const;
+};
+/// A non-negative length measure is a length measure that is greater than or equal to zero.
 /// 
-/// NOTE  Corresponding ISO 10303 type: transition_code, please refer to ISO/IS 10303-42:1994, p. 14 for the final definition of the formal standard.
+/// Type: IfcLengthMeasure
 /// 
-/// HISTORY  New Type in IFC Release 1.0
+/// HISTORY New type in IFC Release 2x4.
+class IfcNonNegativeLengthMeasure : public IfcLengthMeasure {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcNonNegativeLengthMeasure (IfcAbstractEntity* e);
+    IfcNonNegativeLengthMeasure (double v);
+    operator double() const;
+};
+/// Definition from ISO/CD 10303-41:1992: A numeric measure is the numeric value of a physical quantity.
+/// Type: NUMBER
 /// 
-/// Figure 273 (quoted from ISO/CD 10303-42:1992, p.55) illustrates transition types.
+/// NOTE Corresponding ISO 10303 name: numeric_measure, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
 /// 
-/// Figure 273 — Transition code
+/// HISTORY New type in IFC Release 1.5.1.
+class IfcNumericMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcNumericMeasure (IfcAbstractEntity* e);
+    IfcNumericMeasure (double v);
+    operator double() const;
+};
+/// IfcPHMeasure is a measure of the molar hydrogen ion concentration in a liquid (usually defined as the measure of acidity) in a range from 0 to 14.
 /// 
-/// ENUMERATION 
+/// HISTORY: New type in IFC 2x2.
+class IfcPHMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcPHMeasure (IfcAbstractEntity* e);
+    IfcPHMeasure (double v);
+    operator double() const;
+};
+/// Definition from ISO/CD 10303-41:1992: A parameter value is the value which specifies the amount of a 
+/// parameter in some parameter space.
+/// Type: REAL
 /// 
-/// DISCONTINUOUS: The segments do not join. This is permitted only at the boundary of the curve or surface to indicate that it is not closed.
-/// CONTINUOUS: The segments join but no condition on their tangents is implied. 
-/// CONTSAMEGRADIENT: The segments join and their tangent vectors or tangent planes are parallel and have the same direction at the joint: equality of derivatives is not required. 
-/// CONTSAMEGRADIENTSAMECURVATURE: For a curve, the segments join, their tangent vectors are parallel and in the same direction and their curvatures are equal at the joint: equality of derivatives is not required. For a surface this implies that the principle curvatures are the same and the principle directions are coincident along the common boundary.
-typedef enum {IfcTransitionCode_DISCONTINUOUS, IfcTransitionCode_CONTINUOUS, IfcTransitionCode_CONTSAMEGRADIENT, IfcTransitionCode_CONTSAMEGRADIENTSAMECURVATURE} IfcTransitionCode;
-const char* ToString(IfcTransitionCode v);
-IfcTransitionCode FromString(const std::string& s);
-}
-namespace IfcTransportElementTypeEnum {
-/// Definition from IAI: This enumeration is used to
-/// identify primary transport element types. The
-/// IfcTransportElementTypeEnum contains the following:
+/// NOTE Corresponding STEP name: parameter_value, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
 /// 
-/// ELEVATOR: Elevator or lift being a transport device to
-/// move people of good vertically.
-/// ESCALATOR: Escalator being a transport device to move
-/// people. It consists of individual linked steps that move up and
-/// down on tracks while keeping the threads horizontal.
-/// MOVINGWALKWAY: Moving walkway being a transport device
-/// to move people horizontally or on an incline. It is a slow
-/// conveyor belt that transports people.
-/// CRANEWAY: A crane way system, normally including the
-/// crane rails, fasteners and the crane. It is primarily used to
-/// move heavy goods in a factory or other industry buildings.
-/// LIFTINGGEAR: A device used for lifting or lowering
-/// heavy goods. It may be manually operated or electrically or
-/// pneumatically driven.
+/// HISTORY New type in IFC Release 1.5.1.
+class IfcParameterValue : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcParameterValue (IfcAbstractEntity* e);
+    IfcParameterValue (double v);
+    operator double() const;
+};
+/// IfcPlanarForceMeasure is a measure of force on an area.
+/// Usually measured in N/m2.
+/// Type: REAL
 /// 
-/// HISTORY  New enumeration
-/// in IFC Release 2x.
-/// IFC2x4 CHANGE  New enumerators
-/// CRANEWAY and LIFTINGGEAR added in
-/// IFC2x4.
-typedef enum {IfcTransportElementType_ELEVATOR, IfcTransportElementType_ESCALATOR, IfcTransportElementType_MOVINGWALKWAY, IfcTransportElementType_CRANEWAY, IfcTransportElementType_LIFTINGGEAR, IfcTransportElementType_USERDEFINED, IfcTransportElementType_NOTDEFINED} IfcTransportElementTypeEnum;
-const char* ToString(IfcTransportElementTypeEnum v);
-IfcTransportElementTypeEnum FromString(const std::string& s);
-}
-namespace IfcTrimmingPreference {
-/// Definition from ISO/CD 10303-42:1992: This type is used to describe the preferred way of trimming a parametric curve where the trimming is multiply defined. 
+/// HISTORY New type in IFC Release 2x.
+class IfcPlanarForceMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcPlanarForceMeasure (IfcAbstractEntity* e);
+    IfcPlanarForceMeasure (double v);
+    operator double() const;
+};
+/// Definition from ISO/CD 10303-41:1992: A plane angle measure is the value of an angle in a plane.
 /// 
-/// NOTE Corresponding ISO 10303 type: trimming_preference, please refer to ISO/IS 10303-42:1994, p. 18 for the final definition of the formal standard.
+/// Usually measured in radian (rad, m/m = 1), but also grads may be used. The grad unit may be declared as a conversion based unit based on radian unit.
 /// 
-/// HISTORY New Type in IFC Release 1.0
+/// NOTE IfcPlaneAngleMeasure is used where angles need to be described to an accuracy of less than one degree and expressed as decimal parts of an angle. It is widely used for angular measurement except for situations where accuracy needs to be defined using arc measurement; for which purpose the IfcCompoundPlaneAngleMeasure is provided.
 /// 
-/// ENUMERATION 
+/// Type: REAL
 /// 
-/// CARTESIAN: Indicates that trimming by Cartesian point is preferred. 
-/// PARAMETER: Indicates the preference for the parameter value. 
-/// UNSPECIFIED: Indicates that no preference is communicated.
-typedef enum {IfcTrimmingPreference_CARTESIAN, IfcTrimmingPreference_PARAMETER, IfcTrimmingPreference_UNSPECIFIED} IfcTrimmingPreference;
-const char* ToString(IfcTrimmingPreference v);
-IfcTrimmingPreference FromString(const std::string& s);
-}
-namespace IfcTubeBundleTypeEnum {
-/// Enumeration defining the typical types of tube bundles. 
-///   The IfcTubeBundleTypeEnum contains the following:
+/// NOTE Corresponding ISO 10303 name: plane_angle_measure, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
 /// 
-/// FINNED:  Finned tube bundle type.
-///   USERDEFINED:  User-defined tube bundle type.
-///   NOTDEFINED:  Undefined tube bundle type.
+/// HISTORY New type in IFC Release 1.5.1.
+class IfcPlaneAngleMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcPlaneAngleMeasure (IfcAbstractEntity* e);
+    IfcPlaneAngleMeasure (double v);
+    operator double() const;
+};
+/// Definition from ISO/CD 10303-41:1992: A positive length measure is a length measure that is greater than zero.
+/// Type: IfcLengthMeasure
 /// 
-/// HISTORY: New enumeration in IFC 2x2.
-typedef enum {IfcTubeBundleType_FINNED, IfcTubeBundleType_USERDEFINED, IfcTubeBundleType_NOTDEFINED} IfcTubeBundleTypeEnum;
-const char* ToString(IfcTubeBundleTypeEnum v);
-IfcTubeBundleTypeEnum FromString(const std::string& s);
-}
-namespace IfcUnitEnum {
-/// IfcUnitEnum is an enumeration type for allowed unit types of IfcNamedUnit.
+/// NOTE Corresponding ISO 10303 name: positive_length_measure, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
 /// 
-/// ENUMERATION 
+/// HISTORY New type in IFC Release 1.5.1.
+class IfcPositiveLengthMeasure : public IfcLengthMeasure {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcPositiveLengthMeasure (IfcAbstractEntity* e);
+    IfcPositiveLengthMeasure (double v);
+    operator double() const;
+};
+/// Definition from ISO/CD 10303-41:1992: Positive plane angle measure is a plane angle measure that is greater than zero.
+/// Type: IfcPlaneAngleMeasure 
 /// 
-/// ABSORBEDDOSEUNIT
-///   AMOUNTOFSUBSTANCEUNIT
-///   AREAUNIT
-///   DOSEEQUIVALENTUNIT
-///   ELECTRICCAPACITANCEUNIT
-///   ELECTRICCHARGEUNIT
-///   ELECTRICCONDUCTANCEUNIT
-///   ELECTRICCURRENTUNIT
-///   ELECTRICRESISTANCEUNIT
-///   ELECTRICVOLTAGEUNIT
-///   ENERGYUNIT
-///   FORCEUNIT
-///   FREQUENCYUNIT
-///   ILLUMINANCEUNIT
-///   INDUCTANCEUNIT
-///   LENGTHUNIT
-///   LUMINOUSFLUXUNIT
-///   LUMINOUSINTENSITYUNIT
-///   MAGNETICFLUXDENSITYUNIT
-///   MAGNETICFLUXUNIT
-///   MASSUNIT
-///   PLANEANGLEUNIT
-///   POWERUNIT
-///   PRESSUREUNIT
-///   RADIOACTIVITYUNIT
-///   SOLIDANGLEUNIT
-///   THERMODYNAMICTEMPERATUREUNIT
-///   TIMEUNIT
-///   VOLUMEUNIT
-///   USERDEFINED: User defined unit type. The type of unit is only implied by its name or the usage context.
+/// NOTE Corresponding STEP name: positive_plane_angle_measure, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
 /// 
 /// HISTORY New type in IFC Release 1.5.1.
-typedef enum {IfcUnit_ABSORBEDDOSEUNIT, IfcUnit_AMOUNTOFSUBSTANCEUNIT, IfcUnit_AREAUNIT, IfcUnit_DOSEEQUIVALENTUNIT, IfcUnit_ELECTRICCAPACITANCEUNIT, IfcUnit_ELECTRICCHARGEUNIT, IfcUnit_ELECTRICCONDUCTANCEUNIT, IfcUnit_ELECTRICCURRENTUNIT, IfcUnit_ELECTRICRESISTANCEUNIT, IfcUnit_ELECTRICVOLTAGEUNIT, IfcUnit_ENERGYUNIT, IfcUnit_FORCEUNIT, IfcUnit_FREQUENCYUNIT, IfcUnit_ILLUMINANCEUNIT, IfcUnit_INDUCTANCEUNIT, IfcUnit_LENGTHUNIT, IfcUnit_LUMINOUSFLUXUNIT, IfcUnit_LUMINOUSINTENSITYUNIT, IfcUnit_MAGNETICFLUXDENSITYUNIT, IfcUnit_MAGNETICFLUXUNIT, IfcUnit_MASSUNIT, IfcUnit_PLANEANGLEUNIT, IfcUnit_POWERUNIT, IfcUnit_PRESSUREUNIT, IfcUnit_RADIOACTIVITYUNIT, IfcUnit_SOLIDANGLEUNIT, IfcUnit_THERMODYNAMICTEMPERATUREUNIT, IfcUnit_TIMEUNIT, IfcUnit_VOLUMEUNIT, IfcUnit_USERDEFINED} IfcUnitEnum;
-const char* ToString(IfcUnitEnum v);
-IfcUnitEnum FromString(const std::string& s);
-}
-namespace IfcUnitaryControlElementTypeEnum {
-/// The IfcUnitaryControlElementTypeEnum defines the range of different types and/or functions of unitary control elements possible. 
+class IfcPositivePlaneAngleMeasure : public IfcPlaneAngleMeasure {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcPositivePlaneAngleMeasure (IfcAbstractEntity* e);
+    IfcPositivePlaneAngleMeasure (double v);
+    operator double() const;
+};
+/// IfcPowerMeasure is a measure of power required or used.
+/// Usually measured in Watts (W, J/s).
+/// Type: REAL
 /// 
-/// HISTORY: New type in IFC 2x4. 
+/// HISTORY New type in IFC Release 2.0.
+class IfcPowerMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcPowerMeasure (IfcAbstractEntity* e);
+    IfcPowerMeasure (double v);
+    operator double() const;
+};
+/// IfcPresentableText is a text string used to capture the content of a text literal for the purpose of presentation. The IfcPresentableText can include multiple lines of text, for which the line feed character LF, 0x0A, should be used to separate lines.
 /// 
-/// Enumeration 
+/// NOTE  The non printable characters are converted within the standard exchange format ISO 10303-21 (STEP physical file format), commonly the \X\09 represents the TAB, and \X\0A the LF character.
 /// 
-/// ALARMPANEL: A control element at which alarms are annunciated. 
-/// CONTROLPANEL: A control element at which devices that control or monitor the operation of a site, building or part of a building are located. 
-/// GASDETECTORPANEL: A control element at which the detection of gas is annunciated. 
-/// INDICATORPANEL: A control element at which equipment operational status, condition, safety state or other required parameters are indicated. 
-/// MIMICPANEL: A control element at which information that is available elsewhere is repeated or 'mimicked'. 
-/// HUMIDISTAT: A control element that senses and regulates the humidity of a system or space so that the humidity is maintained near a desired setpoint. 
-/// THERMOSTAT: A control element that senses and regulates the temperature of an element, system or space so that the temperature is maintained near a desired setpoint. 
-/// WEATHERSTATION: A control element that senses multiple climate properties such as temperature, humidity, pressure, wind, and rain. 
-/// USERDEFINED: User-defined type. 
-/// NOTDEFINED: Undefined type.
-typedef enum {IfcUnitaryControlElementType_ALARMPANEL, IfcUnitaryControlElementType_CONTROLPANEL, IfcUnitaryControlElementType_GASDETECTIONPANEL, IfcUnitaryControlElementType_INDICATORPANEL, IfcUnitaryControlElementType_MIMICPANEL, IfcUnitaryControlElementType_HUMIDISTAT, IfcUnitaryControlElementType_THERMOSTAT, IfcUnitaryControlElementType_WEATHERSTATION, IfcUnitaryControlElementType_USERDEFINED, IfcUnitaryControlElementType_NOTDEFINED} IfcUnitaryControlElementTypeEnum;
-const char* ToString(IfcUnitaryControlElementTypeEnum v);
-IfcUnitaryControlElementTypeEnum FromString(const std::string& s);
-}
-namespace IfcUnitaryEquipmentTypeEnum {
-/// Enumeration defining the functional type of unitary equipment. 
-///   The IfcUnitaryEquipmentTypeEnum contains the following:
+/// NOTE  The IfcPresentableText is an entity that had been adopted from ISO 10303, Industrial automation systems and integration—Product data representation and exchange, Part 46: Integrated generic resources: Visual presentation.
 /// 
-/// AIRHANDLER: A unitary air handling unit typically containing a fan, economizer, and coils.
-///   AIRCONDITIONINGUNIT: A unitary packaged air-conditioning unit typically used in residential or light commercial applications.
-///   DEHUMIDIFIER: A unitary packaged dehumidification unit.  Note: units supporting multiple modes (dehumidification, cooling, and/or heating) should use AIRCONDITIONINGUNIT.
-///   SPLITSYSTEM: A system which separates the compressor from the evaporator, but acts as a unitary component typically within residential or light commercial applications.
-///   ROOFTOPUNIT: A packaged assembly that is either field-erected or manufactured atop the roof of a large residential or commercial building and acts as a unitary component.
-///   USERDEFINED: User-defined unitary equipment type.
-///   NOTDEFINED:  Undefined unitary equipment type.
+/// NOTE  Corresponding ISO 10303 name: presentable_text. Please refer to ISO/IS 10303-46:1994, p. 133 for the final definition of the formal standard.
 /// 
-/// HISTORY: New enumeration in IFC R2x.  DEHUMIDIFIER added in IFC 2x4
-typedef enum {IfcUnitaryEquipmentType_AIRHANDLER, IfcUnitaryEquipmentType_AIRCONDITIONINGUNIT, IfcUnitaryEquipmentType_DEHUMIDIFIER, IfcUnitaryEquipmentType_SPLITSYSTEM, IfcUnitaryEquipmentType_ROOFTOPUNIT, IfcUnitaryEquipmentType_USERDEFINED, IfcUnitaryEquipmentType_NOTDEFINED} IfcUnitaryEquipmentTypeEnum;
-const char* ToString(IfcUnitaryEquipmentTypeEnum v);
-IfcUnitaryEquipmentTypeEnum FromString(const std::string& s);
-}
-namespace IfcValveTypeEnum {
-/// The IfcValveTypeEnum defines the
-///   range of different types of valve that can be specified. These are typically
-///   used in conjunction with Pset_ValveTypeCommon, which contains common
-///   properties for all valve types. The IfcValveTypeEnum contains:
+/// HISTORY  New type in IFC2x2.
+class IfcPresentableText : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcPresentableText (IfcAbstractEntity* e);
+    IfcPresentableText (std::string v);
+    operator std::string() const;
+};
+/// IfcPressureMeasure is a measure of the quantity of a medium acting on a unit area.
+/// Usually measured in Pascals (Pa, N/m2).
+/// Type: REAL
 /// 
-/// AIRRELEASE: Valve used to release air from a pipe or fitting.  
-///   ANTIVACUUM: Valve that opens to admit air if the pressure falls below
-///   atmospheric pressure (BS6100 330 4104) 
-///   CHANGEOVER: Valve that enables flow to be switched between pipelines (3 or 4
-///   port). 
-///   CHECK: Valve that permits water to flow in one direction only and is
-///   enclosed when there is no flow (2 port). 
-///   COMMISSIONING: Valve used to facilitate commissioning of a system (2 port). 
-///   DIVERTING: Valve that enables flow to be diverted from one branch of a
-///   pipeline to another (3 port). 
-///   DOUBLECHECK: An assembly that incorporates two valves used to prevent backflow
-///   (BS6100 330 4106). 
-///   DOUBLEREGULATING: Valve used to facilitate regulation of fluid flow in a system.
-///   DRAWOFFCOCK: A valve used to remove fluid from a piping system.
-///   FAUCET: Faucet valve typically used as a flow discharge.
-///   FLUSHING: Valve that flushes a predetermined quantity of water to cleanse a
-///   toilet, urinal, etc.
-///   GASCOCK: Valve that is used for controlling the flow of gas. 
-///   GASTAP: Gas tap typically used for venting or discharging gas from a system.
-///   ISOLATING: Valve that closes off flow in a pipeline. 
-///   MIXING: Valve that enables flow from two branches of a pipeline to be mixed
-///   together (3 port). 
-///   PRESSUREREDUCING: Valve that reduces the pressure of a fluid immediately downstream
-///   of its position in a pipeline to a preselected value or by a predetermined
-///   ratio. 
-///   PRESSURERELIEF: Spring or weight loaded valve that automatically discharges to a
-///   safe place fluid that has built up to excessive pressure in pipes or
-///   fittings 
-///   REGULATING: Valve used to facilitate regulation of fluid flow in a system.
-///   SAFETYCUTOFF: Valve that closes under the action of a safety mechanism such as a
-///   drop weight, solenoid etc. 
-///   STEAMTRAP: Valve that restricts flow of steam while allowing condensate to 
-///   pass through. 
-///   STOPCOCK: An isolating valve used on a domestic water service. 
-///   USERDEFINED: User-defined valve type. 
-///   NOTDEFINED: Undefined valve type. 
+/// HISTORY New type in IFC Release 2.0.
+class IfcPressureMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcPressureMeasure (IfcAbstractEntity* e);
+    IfcPressureMeasure (double v);
+    operator double() const;
+};
+
+class IfcPropertySetDefinitionSet : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcPropertySetDefinitionSet (IfcAbstractEntity* e);
+    IfcPropertySetDefinitionSet (IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr v);
+    operator IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr() const;
+};
+/// IfcRadioActivityMeasure is a measure of activity of radionuclide.
+/// Usually measured in Becquerel (Bq, 1/s).
+/// Type: REAL
 /// 
-/// HISTORY: New type in IFC R2.0
-typedef enum {IfcValveType_AIRRELEASE, IfcValveType_ANTIVACUUM, IfcValveType_CHANGEOVER, IfcValveType_CHECK, IfcValveType_COMMISSIONING, IfcValveType_DIVERTING, IfcValveType_DRAWOFFCOCK, IfcValveType_DOUBLECHECK, IfcValveType_DOUBLEREGULATING, IfcValveType_FAUCET, IfcValveType_FLUSHING, IfcValveType_GASCOCK, IfcValveType_GASTAP, IfcValveType_ISOLATING, IfcValveType_MIXING, IfcValveType_PRESSUREREDUCING, IfcValveType_PRESSURERELIEF, IfcValveType_REGULATING, IfcValveType_SAFETYCUTOFF, IfcValveType_STEAMTRAP, IfcValveType_STOPCOCK, IfcValveType_USERDEFINED, IfcValveType_NOTDEFINED} IfcValveTypeEnum;
-const char* ToString(IfcValveTypeEnum v);
-IfcValveTypeEnum FromString(const std::string& s);
-}
-namespace IfcVibrationIsolatorTypeEnum {
-/// Enumeration defining the typical types of vibration isolators. 
-///   The IfcVibrationIsolatorTypeEnum contains the following:
+/// HISTORY New type in IFC Release 2x.
+class IfcRadioActivityMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcRadioActivityMeasure (IfcAbstractEntity* e);
+    IfcRadioActivityMeasure (double v);
+    operator double() const;
+};
+/// Definition from ISO/CD 10303-41:1992: A ratio measure is the value of the relation between two 
+/// physical quantities that are of the same kind.
 /// 
-/// COMPRESSION:  Compression type vibration isolator.
-///   SPRING:  Spring type vibration isolator.
-///   USERDEFINED:  User-defined vibration isolator type.
-///   NOTDEFINED:  Undefined vibration isolator type.
+/// NOTE: Input given in percent is to be divided by 100% when stored as an IfcRatioMeasure. For example, 25% becomes 0.25.
 /// 
-/// HISTORY: New enumeration in IFC 2x2.
-typedef enum {IfcVibrationIsolatorType_COMPRESSION, IfcVibrationIsolatorType_SPRING, IfcVibrationIsolatorType_USERDEFINED, IfcVibrationIsolatorType_NOTDEFINED} IfcVibrationIsolatorTypeEnum;
-const char* ToString(IfcVibrationIsolatorTypeEnum v);
-IfcVibrationIsolatorTypeEnum FromString(const std::string& s);
-}
-namespace IfcVoidingFeatureTypeEnum {
-/// Definition from IAI: This enumeration qualifies a voiding feature regarding its shape and configuration relative to the voided element.
+/// Type: REAL
 /// 
-/// HISTORY New type in IFC 2x4.
+/// NOTE Corresponding STEP name: ratio_measure, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
 /// 
-/// ENUMERATION
+/// HISTORY New type in IFC Release 1.5.1.
+class IfcRatioMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcRatioMeasure (IfcAbstractEntity* e);
+    IfcRatioMeasure (double v);
+    operator double() const;
+};
+/// IfcReal is a defined type of simple data type REAL.  It is required since a select type (IfcSimpleValue), cannot directly include simple types in its select list.
 /// 
-/// CUTOUT An internal cutout (creating an opening) or external cutout (creating a recess) of arbitrary shape.  The edges between cutting planes may be overcut or undercut, i.e. rounded.
-///   NOTCH An external cutout of with a mostly rectangular cutting profile.  The edges between cutting planes may be overcut or undercut, i.e. rounded.
-///   HOLE A circular or slotted or threaded hole, typically but not necessarily of smaller dimension than what would be considered a cutout.
-///   MITER A skewed plane end cut, removing material across the entire profile of the voided element.
-///   CHAMFER A skewed plane end cut, removing material only across a part of the profile of the voided element.
-///   EDGE A shape modification along an edge of the element with the edge length as the predominant dimension of the feature, and feature profile dimensions which are typically much smaller than the edge length.  Can for example be a chamfer edge (differentiated from a chamfer by its ratio of dimensions and thus usually manufactured differently), rounded edge (a convex edge feature), or fillet edge (a concave edge feature).
-///   USERDEFINED A user-defined type of voiding feature.
-///   NOTDEFINED An undefined type of voiding feature.
-typedef enum {IfcVoidingFeatureType_CUTOUT, IfcVoidingFeatureType_NOTCH, IfcVoidingFeatureType_HOLE, IfcVoidingFeatureType_MITER, IfcVoidingFeatureType_CHAMFER, IfcVoidingFeatureType_EDGE, IfcVoidingFeatureType_USERDEFINED, IfcVoidingFeatureType_NOTDEFINED} IfcVoidingFeatureTypeEnum;
-const char* ToString(IfcVoidingFeatureTypeEnum v);
-IfcVoidingFeatureTypeEnum FromString(const std::string& s);
-}
-namespace IfcWallTypeEnum {
-/// Definition from IAI: This enumeration defines the
-/// different types of walls an IfcWallType object can
-/// fulfill:
+/// In principle, the domain of IfcReal (being a Real) is all rational, irrational and scientific real numbers. Here the precision is unconstrained, but in practice it is implementation specific.
 /// 
-/// STANDARD: A standard wall, extruded vertically with a
-/// constant thickness along the wall path.
-/// POLYGONAL: A polygonal wall, extruded vertically,
-/// where the wall thickness varies along the wall path.
-/// SHEAR: A wall having a non-rectangular cross section
-/// along the wall path.
+/// Type: REAL
 /// 
-/// NOTE The potentially misleading term shall not impose
-/// a particular resistance against shear forces, but a particular
-/// shape.
+/// HISTORY: New type in IFC Release 1.5.1.
+class IfcReal : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcReal (IfcAbstractEntity* e);
+    IfcReal (double v);
+    operator double() const;
+};
+/// IfcRotationalFrequencyMeasure is a measure of the number of cycles that an item revolves in unit time.
+/// Usually measured in cycles/s.
+/// Type: REAL
 /// 
-/// ELEMENTEDWALL: A stud wall framed with studs and faced
-/// with sheatings, sidings, wallboard, or plasterwork.
-/// PLUMBINGWALL: A pier, or enclosure, or encasement,
-/// normally used to enclose plumbing in sanitary rooms.
-/// MOVABLE: A movable wall that is either movable, e.g. a
-/// folding wall, or a sliding wall, or can be easily removed as a
-/// removable partitioning or mounting wall. Movable walls do
-/// normally not define space boundaries and often belong to the
-/// furnishing system.
-/// USERDEFINED: User-defined wall element.
-/// NOTDEFINED: Undefined wall element
+/// HISTORY New type in IFC Release 2x.
+class IfcRotationalFrequencyMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcRotationalFrequencyMeasure (IfcAbstractEntity* e);
+    IfcRotationalFrequencyMeasure (double v);
+    operator double() const;
+};
+/// The rotational mass measure denotes the inertia of a body with respect to angular acceleration.
+/// It is usually measured in kg*m^2.
 /// 
-/// HISTORY  New
-/// Enumeration in Release IFC2x Edition 2.
-/// IFC2x2 ADDENDUM CHANGE 
-/// The enumerator POLYGON has been changed to
-/// POLYGONAL.
-/// IFC2x3 CHANGE  The enumerators
-/// ELEMENTEDWALL and PLUMBINGWALL have been
-/// added.
-/// IFC2x4 CHANGE  New enumerator
-/// MOVABLE has been added.
-typedef enum {IfcWallType_MOVABLE, IfcWallType_PARAPET, IfcWallType_PARTITIONING, IfcWallType_PLUMBINGWALL, IfcWallType_SHEAR, IfcWallType_SOLIDWALL, IfcWallType_STANDARD, IfcWallType_POLYGONAL, IfcWallType_ELEMENTEDWALL, IfcWallType_USERDEFINED, IfcWallType_NOTDEFINED} IfcWallTypeEnum;
-const char* ToString(IfcWallTypeEnum v);
-IfcWallTypeEnum FromString(const std::string& s);
-}
-namespace IfcWasteTerminalTypeEnum {
-/// The IfcWasteTerminalTypeEnum defines the range of different types of waste terminal that can be specified. 
-///   HISTORY: New type in IFC 2x2.  GREASEINTERCEPTOR, OILINTERCEPTOR, PETROLINTERCEPTOR moved to IfcInterceptorTypeEnum in IFC2x4.
+/// Type: REAL  
 /// 
-/// Enumeration 	 
+/// HISTORY New type in IFC2x2.
+class IfcRotationalMassMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcRotationalMassMeasure (IfcAbstractEntity* e);
+    IfcRotationalMassMeasure (double v);
+    operator double() const;
+};
+/// IfcRotationalStiffnessMeasure is a measure of rotational stiffness.
+/// Usually measured in Nm/rad.
+/// Type: REAL
 /// 
-/// FLOORTRAP: Pipe fitting, set into the floor, that retains liquid to prevent the passage of foul air 
-/// FLOOORWASTE: Pipe fitting, set into the floor, that collects waste water and discharges it to a separate trap. 
-/// GULLYSUMP: Pipe fitting or assembly of fittings to receive surface water or waste water, fitted with a grating or sealed cover. 
-/// GULLYTRAP: Pipe fitting or assembly of fittings to receive surface water or waste water, fitted with a grating or sealed cover and discharging through a trap (BS6100 330 3504 modified). 
-/// ROOFDRAIN: Pipe fitting, set into the roof, that collects rainwater for discharge into the rainwater system.  
-/// WASTEDISPOSALUNIT: Electrically operated device that reduces kitchen or other waste into fragments small enough to be flushed into a drainage system. 
-/// WASTETRAP: Pipe fitting, set adjacent to a sanitary terminal, that retains liquid to prevent the passage of foul air. 
-/// USERDEFINED: User-defined type. 
-/// NOTDEFINED: Undefined type.
-typedef enum {IfcWasteTerminalType_FLOORTRAP, IfcWasteTerminalType_FLOORWASTE, IfcWasteTerminalType_GULLYSUMP, IfcWasteTerminalType_GULLYTRAP, IfcWasteTerminalType_ROOFDRAIN, IfcWasteTerminalType_WASTEDISPOSALUNIT, IfcWasteTerminalType_WASTETRAP, IfcWasteTerminalType_USERDEFINED, IfcWasteTerminalType_NOTDEFINED} IfcWasteTerminalTypeEnum;
-const char* ToString(IfcWasteTerminalTypeEnum v);
-IfcWasteTerminalTypeEnum FromString(const std::string& s);
-}
-namespace IfcWindowPanelOperationEnum {
-/// This enumeration defines the basic ways to describe how window panels operate, as shown in Figure 168. 
+/// HISTORY New type in IFC Release 2x.
+class IfcRotationalStiffnessMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcRotationalStiffnessMeasure (IfcAbstractEntity* e);
+    IfcRotationalStiffnessMeasure (double v);
+    operator double() const;
+};
+/// IfcSectionModulusMeasure is a measure for the resistance of a cross section against bending or torsional moment.  It is usually measured in m^3.
 /// 
-/// HISTORY New Enumeration in IFC Release 2.0
+/// Type: REAL 
 /// 
-/// Enumerator 
-///   Description 
-///   Figure 
+/// HISTORY New type in IFC Release 2x2.
+class IfcSectionModulusMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcSectionModulusMeasure (IfcAbstractEntity* e);
+    IfcSectionModulusMeasure (double v);
+    operator double() const;
+};
+/// The sectional area integral measure is typically used in torsional analysis. It is usually measured in m^5.
 /// 
-/// SideHungRightHand 
-///   panel that opens to the right
-///   when viewed from the outside 
-///     
+/// Type: REAL  
 /// 
-/// SideHungLeftHand 
-///   panel that opens to the left
-///   when viewed from the outside 
-///     
+/// HISTORY New type in IFC2x2.
+class IfcSectionalAreaIntegralMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcSectionalAreaIntegralMeasure (IfcAbstractEntity* e);
+    IfcSectionalAreaIntegralMeasure (double v);
+    operator double() const;
+};
+/// IfcShearModulusMeasure is a measure of shear modulus.
+/// Usually measured in N/m2.
+/// Type: REAL
 /// 
-/// TiltAndTurnRightHand 
-///   panel that opens to the right
-///   and is bottom hung 
-///     
+/// HISTORY New type in IFC Release 2x.
+class IfcShearModulusMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcShearModulusMeasure (IfcAbstractEntity* e);
+    IfcShearModulusMeasure (double v);
+    operator double() const;
+};
+/// Definition from ISO/CD 10303-41:1992: A solid angle measure is the value of an angle in a solid.
+/// Usually measured in Steradians, (sr, m2/m2).
+/// Type: REAL
 /// 
-/// TiltAndTurnLeftHand 
-///   panel that opens to the left
-///   and is bottom hung 
-///     
+/// NOTE Corresponding ISO 10303 name: solid_angle_measure, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
 /// 
-/// TopHung 
-///   panel is top hung 
-///     
+/// HISTORY New type in IFC Release 1.5.1.
+class IfcSolidAngleMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcSolidAngleMeasure (IfcAbstractEntity* e);
+    IfcSolidAngleMeasure (double v);
+    operator double() const;
+};
+
+class IfcSoundPowerLevelMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcSoundPowerLevelMeasure (IfcAbstractEntity* e);
+    IfcSoundPowerLevelMeasure (double v);
+    operator double() const;
+};
+/// A sound power measure is a measure of total radiated noise with units of decibels with a reference value of picowatts.
 /// 
-/// BottomHung 
-///   panel is bottom hung 
-///     
+/// Type: REAL  
 /// 
-/// PivotHorizontal 
-///   panel is swinging
-///   horizontally (hinges are in the middle) 
-///     
+/// HISTORY New type in IFC2x2.
+class IfcSoundPowerMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcSoundPowerMeasure (IfcAbstractEntity* e);
+    IfcSoundPowerMeasure (double v);
+    operator double() const;
+};
+
+class IfcSoundPressureLevelMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcSoundPressureLevelMeasure (IfcAbstractEntity* e);
+    IfcSoundPressureLevelMeasure (double v);
+    operator double() const;
+};
+/// A sound pressure measure is a measure of the pressure fluctuations superimposed over the ambient pressure level with units of decibels with a reference value of micropascals. 
 /// 
-/// PivotVertical 
-///   panel is swinging vertically
-///   (hinges are in the middle) 
-///     
+/// Type: REAL  
 /// 
-/// SlidingHorizontal 
-///   panel is sliding horizontally
+/// HISTORY New type in IFC2x2.
+class IfcSoundPressureMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcSoundPressureMeasure (IfcAbstractEntity* e);
+    IfcSoundPressureMeasure (double v);
+    operator double() const;
+};
+/// IfcSpecificHeatCapacityMeasure defines the specific heat of material: The heat energy absorbed per temperature unit.
+/// Usually measured in J / kg Kelvin.
+/// Type: REAL
 /// 
-///   
+/// HISTORY New type in IFC Release 2x.
+class IfcSpecificHeatCapacityMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcSpecificHeatCapacityMeasure (IfcAbstractEntity* e);
+    IfcSpecificHeatCapacityMeasure (double v);
+    operator double() const;
+};
+/// The IfcSpecularExponent defines the datatype for exponent determining the sharpness of the 'reflection'. reflection is made sharper with large values of the exponent, such as 10.0. Small values, such as 1.0, decrease the specular fall-off. 
 /// 
-/// SlidingVertical 
-///   panel is sliding
-///   vertically 
-///     
+/// IfcSpecularExponent is of type REAL.
 /// 
-/// RemovableCasement 
-///   panel is removable 
-///     
+/// NOTE: The datatype relates to the definition of specular_exponent in ISO 10303-46 entity surface_style_reflectance_ambient_diffuse_specular.
 /// 
-/// FixedCasement 
-///   panel is fixed 
-///     
+/// HISTORY: New type in IFC2x2.
+class IfcSpecularExponent : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcSpecularExponent (IfcAbstractEntity* e);
+    IfcSpecularExponent (double v);
+    operator double() const;
+};
+/// The IfcSpecularRoughness defines the datatype for the reflection resulting from the roughness of a surface through the height of surface impurities where the specular highlight is made sharper with small values for the roughness, such as 0.1.  
 /// 
-/// OtherOperation 
-///   user defined operation type 
-///     
+/// Applies to "glass", "metal", "mirror" and "plastic" reflection models. Larger values, close to 1.0 decrease the specular fall-off. 
 /// 
-/// NotDefined 
-///     
-///     
+/// IfcSpecularRoughness is of type REAL. It is constraint to values between (and including) 0 and 1.
 /// 
-/// Figure 168 — Window panel operations
+/// NOTE: The datatype relates to the definition of "shiness" in VRML97, which is the reciprocate value to the specular roughness.
 /// 
-/// The opening direction of the window panels is given by the local placement of the IfcWindow. The positive y-axis determines the direction as shown in Figure 169.
-///   NOTE 
+/// HISTORY: New type in Release IFC2x2.
+class IfcSpecularRoughness : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcSpecularRoughness (IfcAbstractEntity* e);
+    IfcSpecularRoughness (double v);
+    operator double() const;
+};
+/// The temperature gradient measures the difference of a temperature per lenght, as for instance used in an external wall or its layers.  It is usually measured in K/m.
 /// 
-/// Figures are shown as viewed from the outside (in direction of the
-///   positive y-axis). 
-///   Figures (symbolic representation) depend on the national building
-///   code 
-///   These figures are only shown as illustrations 
+/// Type: REAL  
 /// 
-/// Figure 169 — Window panel directions
-typedef enum {IfcWindowPanelOperation_SIDEHUNGRIGHTHAND, IfcWindowPanelOperation_SIDEHUNGLEFTHAND, IfcWindowPanelOperation_TILTANDTURNRIGHTHAND, IfcWindowPanelOperation_TILTANDTURNLEFTHAND, IfcWindowPanelOperation_TOPHUNG, IfcWindowPanelOperation_BOTTOMHUNG, IfcWindowPanelOperation_PIVOTHORIZONTAL, IfcWindowPanelOperation_PIVOTVERTICAL, IfcWindowPanelOperation_SLIDINGHORIZONTAL, IfcWindowPanelOperation_SLIDINGVERTICAL, IfcWindowPanelOperation_REMOVABLECASEMENT, IfcWindowPanelOperation_FIXEDCASEMENT, IfcWindowPanelOperation_OTHEROPERATION, IfcWindowPanelOperation_NOTDEFINED} IfcWindowPanelOperationEnum;
-const char* ToString(IfcWindowPanelOperationEnum v);
-IfcWindowPanelOperationEnum FromString(const std::string& s);
-}
-namespace IfcWindowPanelPositionEnum {
-/// This enumeration defines the basic configuration of the window type in terms of the location of window panels. The window configurations are given for windows with one, two or three panels (including fixed panels) as shown in Figure 170. It corresponds to the OperationType of the IfcWindowStyle definition, which references the IfcWindowPanelProperties. 
+/// HISTORY New type in IFC2x2.
+class IfcTemperatureGradientMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcTemperatureGradientMeasure (IfcAbstractEntity* e);
+    IfcTemperatureGradientMeasure (double v);
+    operator double() const;
+};
+/// The temperature rate of change measures the difference of a temperature per time (positive: rise, negative: fall), as for instance used with heat sensors. It is for example measured in K/s (Kelvin per second).
 /// 
-/// Windows which are subdivided into more than three panels have to be defined by the geometry only. The type of such windows is given by an IfcWindowStyle.OperationType = USERDEFINED or NOTDEFINED (see IfcWindowStyleOperationEnum for details). 
+/// Type: REAL 
 /// 
-/// HISTORY New Enumeration in IFC Release 2.0.
+/// HISTORY  New type in IFC2x4.
+class IfcTemperatureRateOfChangeMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcTemperatureRateOfChangeMeasure (IfcAbstractEntity* e);
+    IfcTemperatureRateOfChangeMeasure (double v);
+    operator double() const;
+};
+/// Definition from ISO/CD 10303-41:1992: A text is an alphanumeric string of characters which is intended to be read and understood by a human being. It is for information purposes only.
 /// 
-/// Enumerator from IfcWindowStyleOperationEnum 
-///   Use of enumerators from IfcWindowPanelPositionEnum 
-///   Figure 
+/// Type: STRING
 /// 
-/// DoublePanelVertical 
-///   first
-///   IfcWindowPanelProperties with PanelPosition = LEFTsecond
-///   IfcWindowPanelProperties with PanelPosition = RIGHT 
+/// NOTE Corresponding STEP name: text, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
 /// 
-/// DoublePanelHorizontal 
-///   first
-///   IfcWindowPanelProperties with PanelPosition = TOPsecond
-///   IfcWindowPanelProperties with PanelPosition = BOTTOM 
+/// HISTORY New type in IFC Release 2x.
 /// 
-/// TriplePanelVertical 
-///   first
-///   IfcWindowPanelProperties with PanelPosition = LEFTsecond
-///   IfcWindowPanelProperties with PanelPosition = MIDDLEthird
-///   IfcWindowPanelProperties with PanelPosition = RIGHT 
+/// Per ISO 10303-11, the set of characters that may appear in STRINGs is defined in ISO 10646.  The encoding of characters in case of file-based exchange is defined in ISO 10303-21 (STEP physical files) and ISO 10303-28 (XML files).  Among else, these specifications define the encoding of 8-bit characters from ISO 8859-1...-16 and of 2-byte Unicode characters.
 /// 
-/// TriplePanelHorizontal  
-///   first
-///   IfcWindowPanelProperties with PanelPosition = TOPsecond
-///   IfcWindowPanelProperties with PanelPosition = MIDDLEthird
-///   IfcWindowPanelProperties with PanelPosition = BOTTOM 
+/// Note that while IfcText is not formally restricted in length, the size of a string in ISO 10303-21:2002 conforming exchange files must not exceed 32767 octets after encoding and escaping.
+class IfcText : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcText (IfcAbstractEntity* e);
+    IfcText (std::string v);
+    operator std::string() const;
+};
+/// Definition from CSS1 (W3C Recommendation): This property describes how text is aligned within the element. The actual justification algorithm used is user agent and human language dependent. If 'justify' is not supported, the user agent will supply a replacement. Typically, this will be 'left' for western languages. Values are:
 /// 
-/// TriplePanelBottom 
-///   first
-///   IfcWindowPanelProperties with PanelPosition = LEFTsecond
-///   IfcWindowPanelProperties with PanelPosition = RIGHTthird
-///   IfcWindowPanelProperties with PanelPosition = BOTTOM 
+/// left
+///   right
+///   center
+///   justify
 /// 
-/// TriplePanelTop 
-///   first
-///   IfcWindowPanelProperties with PanelPosition = TOPsecond
-///   IfcWindowPanelProperties with PanelPosition = LEFTthird
-///   IfcWindowPanelProperties with PanelPosition = RIGHT 
+/// NOTE  Corresponding CSS1 definition is text-align.
 /// 
-/// TriplePanelLeft 
-///   first
-///   IfcWindowPanelProperties with PanelPosition = LEFTsecond
-///   IfcWindowPanelProperties with PanelPosition = TOPthird
-///   IfcWindowPanelProperties with PanelPosition = BOTTOM 
+/// HISTORY  New type in IFC2x3.
+class IfcTextAlignment : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcTextAlignment (IfcAbstractEntity* e);
+    IfcTextAlignment (std::string v);
+    operator std::string() const;
+};
+/// Definition from CSS1 (W3C Recommendation): This property describes decorations that are added to the text of an element. A value of 'blink' causes the text to blink.. Values are:
 /// 
-/// TriplePanelRight 
-///   first
-///   IfcWindowPanelProperties with PanelPosition = TOPsecond
-///   IfcWindowPanelProperties with PanelPosition = BOTTOMthird
-///   IfcWindowPanelProperties with PanelPosition = RIGHT 
+/// none
+///   underline
+///   overline
+///   line-through
+///   blink
 /// 
-/// Figure 170 — Window panel positions
+/// User agents must recognize the keyword 'blink', but are not required to support the blink effect.
 /// 
-/// NOTE 
+/// NOTE  Corresponding CSS1 definition is text-decoration.
 /// 
-/// The figures are shown as elevations in the XZ plane of the local
-///   placement of the window, looking into the direction of the positive Y
-///   axis. 
-///   These figures are only shown as illustrations.
-typedef enum {IfcWindowPanelPosition_LEFT, IfcWindowPanelPosition_MIDDLE, IfcWindowPanelPosition_RIGHT, IfcWindowPanelPosition_BOTTOM, IfcWindowPanelPosition_TOP, IfcWindowPanelPosition_NOTDEFINED} IfcWindowPanelPositionEnum;
-const char* ToString(IfcWindowPanelPositionEnum v);
-IfcWindowPanelPositionEnum FromString(const std::string& s);
-}
-namespace IfcWindowStyleConstructionEnum {
-/// Definition from IAI: This enumeration defines the
-///   basic types of construction of windows. The construction
-///   type relates to the main material (or material combination)
-///   used for making the window.
+/// HISTORY  New type in IFC2x3.
+class IfcTextDecoration : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcTextDecoration (IfcAbstractEntity* e);
+    IfcTextDecoration (std::string v);
+    operator std::string() const;
+};
+/// Definition from CSS1 (W3C Recommendation): The value is a font family name and/or generic family name. Values are:
 /// 
-/// HISTORY New Enumeration in
-///   IFC Release 2x .
-typedef enum {IfcWindowStyleConstruction_ALUMINIUM, IfcWindowStyleConstruction_HIGH_GRADE_STEEL, IfcWindowStyleConstruction_STEEL, IfcWindowStyleConstruction_WOOD, IfcWindowStyleConstruction_ALUMINIUM_WOOD, IfcWindowStyleConstruction_PLASTIC, IfcWindowStyleConstruction_OTHER_CONSTRUCTION, IfcWindowStyleConstruction_NOTDEFINED} IfcWindowStyleConstructionEnum;
-const char* ToString(IfcWindowStyleConstructionEnum v);
-IfcWindowStyleConstructionEnum FromString(const std::string& s);
-}
-namespace IfcWindowStyleOperationEnum {
-/// This enumeration defines the basic
-///   configuration of the window type in terms of the number of window panels and
-///   the subdivision of the total window. The window configurations are given for
-///   windows with one, two or three panels (including fixed panels) as shown in Figure 171. 
-///   Windows which are subdivided into more than three panels have to be
-///   defined by the geometry only. The type of such windows is USERDEFINED. 
-///   HISTORY New Enumeration in IFC Release 2.0. 
+/// The name of a font family of choice. For example, "gill" and "helvetica" are font families.
 /// 
-/// Enumerator 
-///   Description 
-///   Figure 
+/// In the example above, the last value is a generic family name. The following generic families are defined:
 /// 
-/// SinglePanel 
-///   Window with one
-///   panel. 
+/// 'serif' (Example: Times)
+///   'sans-serif' (Example: Helvetica)
+///   'cursive' (Example: Zapf-Chancery)
+///   'fantasy' (Example: Western)
+///   'monospace' (Example: Courier)
 /// 
-/// DoublePanelVertical 
-///   Window with two panels. The
-///   configuration of the panels is vertically. 
+/// It is encouraged to offer a generic font family as a last alternative.
 /// 
-/// DoublePanelHorizontal 
-///   Window with two panels. The
-///   configuration of the panels is horizontally. 
+/// NOTE  Corresponding CSS1 definitions are font-family.
 /// 
-/// TriplePanelVertical 
-///   Window with three panels. The
-///   configuration of the panels is vertically. 
+/// HISTORY  New type in IFC2x2 Addendum 2.
 /// 
-/// TriplePanelHorizontal  
-///   Window with three panels. The
-///   configuration of the panels is horizontally. 
+/// IFC2x2 Addendum 2 CHANGE: The IfcFontFamily has been added.
+class IfcTextFontName : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcTextFontName (IfcAbstractEntity* e);
+    IfcTextFontName (std::string v);
+    operator std::string() const;
+};
+/// Definition from CSS1 (W3C Recommendation): This property describes how the cases of characters are handled. Values are:
 /// 
-/// TriplePanelBottom 
-///   Window with three panels. The
-///   configuration of two panels is vertically and the third one is horizontally at
-///   the bottom. 
+/// capitalize: uppercases the first character of each word
+///   uppercase: uppercases all letters of the element
+///   lowercase: lowercases all letters of the element
+///   none
 /// 
-/// TriplePanelTop 
-///   Window with three panels. The
-///   configuration of two panels is vertically and the third one is horizontally at
-///   the top. 
+/// NOTE  Corresponding CSS1 definition is text-transform.
 /// 
-/// TriplePanelLeft 
-///   Window with three panels. The
-///   configuration of two panels is horizontally and the third one is vertically at
-///   the left hand side. 
+/// HISTORY  New type in IFC2x3.
+class IfcTextTransformation : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcTextTransformation (IfcAbstractEntity* e);
+    IfcTextTransformation (std::string v);
+    operator std::string() const;
+};
+/// IfcThermalAdmittanceMeasure is the measure of the ability of a surface to smooth out temperature variations.
+/// Usually measured in Watt / m2 Kelvin.
+/// Type: REAL
 /// 
-/// TriplePanelRight 
-///   Window with three panels. The
-///   configuration of two panels is horizontally and the third one is vertically at
-///   the right hand side. 
+/// HISTORY New type in IFC Release 2.0.
+class IfcThermalAdmittanceMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcThermalAdmittanceMeasure (IfcAbstractEntity* e);
+    IfcThermalAdmittanceMeasure (double v);
+    operator double() const;
+};
+/// IfcThermalConductivityMeasure is a measure of thermal conductivity.
+/// Usually measured in Watt / m Kelvin.
+/// Type: REAL
 /// 
-/// UserDefined 
-///   user defined operation
-///   type 
-///     
+/// HISTORY New type in IFC Release 2x.
+class IfcThermalConductivityMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcThermalConductivityMeasure (IfcAbstractEntity* e);
+    IfcThermalConductivityMeasure (double v);
+    operator double() const;
+};
+/// IfcThermalExpansionCoeffientMeasure is a measure of the thermal expansion coefficient of a material, which expresses its elongation (as a ratio) per temperature difference. It is usually measured in 1/K. A positive elongation per (positive) rise of temperature is expressed by a positive value.
+/// Type: REAL  
 /// 
-/// NotDefined 
-///     
-///     
+/// HISTORY New type in IFC2x2.
+class IfcThermalExpansionCoefficientMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcThermalExpansionCoefficientMeasure (IfcAbstractEntity* e);
+    IfcThermalExpansionCoefficientMeasure (double v);
+    operator double() const;
+};
+/// IfcThermalResistanceMeasure is a measure of the resistance offered by a body to the flow of energy.
+/// Usually measured in m2 Kelvin/Watt.
 /// 
-/// Figure 171 — Window style operations
+/// HISTORY New type in IFC Release 2.0.
+class IfcThermalResistanceMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcThermalResistanceMeasure (IfcAbstractEntity* e);
+    IfcThermalResistanceMeasure (double v);
+    operator double() const;
+};
+/// IfcThermalTransmittanceMeasure is a measure of the rate at which energy is transmitted through a body.
+/// Usually measured in Watts/m2 Kelvin.
+/// Type: REAL
 /// 
-/// NOTE 
+/// HISTORY New type in IFC Release 2.0.
+class IfcThermalTransmittanceMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcThermalTransmittanceMeasure (IfcAbstractEntity* e);
+    IfcThermalTransmittanceMeasure (double v);
+    operator double() const;
+};
+/// Definition from ISO/CD 10303-41:1992: A thermodynamic temperature measure is the value for the degree of heat of a body.
+/// Usually measured in degrees Kelvin (K).
+/// Type: REAL
 /// 
-/// The way how each panel operates is defined at the
-///   IfcWindowPanelProperties.OperationType. 
-///   The reference from the window panel to the location of that panel in
-///   the window style configuration is handled by the
-///   IfcWindowPanelProperties.PanelPosition. 
-///   The figures are shown as elevations in the XZ plane of the local
-///   placement of the window, looking into the direction of the positive Y
-///   axis. 
-///   These figures are only shown as illustrations
-typedef enum {IfcWindowStyleOperation_SINGLE_PANEL, IfcWindowStyleOperation_DOUBLE_PANEL_VERTICAL, IfcWindowStyleOperation_DOUBLE_PANEL_HORIZONTAL, IfcWindowStyleOperation_TRIPLE_PANEL_VERTICAL, IfcWindowStyleOperation_TRIPLE_PANEL_BOTTOM, IfcWindowStyleOperation_TRIPLE_PANEL_TOP, IfcWindowStyleOperation_TRIPLE_PANEL_LEFT, IfcWindowStyleOperation_TRIPLE_PANEL_RIGHT, IfcWindowStyleOperation_TRIPLE_PANEL_HORIZONTAL, IfcWindowStyleOperation_USERDEFINED, IfcWindowStyleOperation_NOTDEFINED} IfcWindowStyleOperationEnum;
-const char* ToString(IfcWindowStyleOperationEnum v);
-IfcWindowStyleOperationEnum FromString(const std::string& s);
-}
-namespace IfcWindowTypeEnum {
-/// Definition from IAI: This enumeration defines the
-/// different predefined types of an IfcWindowType object can
-/// fulfill:
+/// NOTE Corresponding ISO 10303 name: thermodynamic_temperature_measure, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
 /// 
-/// WINDOW: A standard window usually within a wall
-/// opening, as a window panel in a curtain wall, or as a "free
-/// standing" window.
-/// SKYLIGHT: A window within a sloped building element,
-/// usually a roof slab.
-/// LIGHTDOME: A special window that lies horizonally in a
-/// roof slab opening.
-/// USERDEFINED: User-defined window element.
-/// NOTDEFINED: Undefined window element
+/// HISTORY New type in IFC Release 1.5.1.
+class IfcThermodynamicTemperatureMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcThermodynamicTemperatureMeasure (IfcAbstractEntity* e);
+    IfcThermodynamicTemperatureMeasure (double v);
+    operator double() const;
+};
+/// The lexical representation for time is the left truncated
+///   lexical representation for dateTime: hh:mm:ss.sss with
+///   optional following time zone indicator. For example, to
+///   indicate 1:20 pm for Eastern Standard Time which is 5 hours
+///   behind Coordinated Universal Time (UTC), one would write:
+///   13:20:00-05:00.
 /// 
-/// HISTORY  New Enumeration
-/// in IFC2x4.
-typedef enum {IfcWindowType_WINDOW, IfcWindowType_SKYLIGHT, IfcWindowType_LIGHTDOME, IfcWindowType_USERDEFINED, IfcWindowType_NOTDEFINED} IfcWindowTypeEnum;
-const char* ToString(IfcWindowTypeEnum v);
-IfcWindowTypeEnum FromString(const std::string& s);
-}
-namespace IfcWindowTypePartitioningEnum {
-/// This enumeration defines the basic configuration of the window type in terms of the number of window panels and the subdivision of the total window as shown in Figure 70. The window configurations are given for windows with one, two or three panels (including fixed panels).
+/// HISTORY: New type in IFC2x4
+class IfcTime : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcTime (IfcAbstractEntity* e);
+    IfcTime (std::string v);
+    operator std::string() const;
+};
+/// Definition from ISO/CD 10303-41:1992: A time measure is the value of the duration of periods.
+/// Measured in seconds (s) or days (d) or other units of time.
+/// Type: REAL
 /// 
-/// Windows which are subdivided into more than three panels have to be defined by the geometry only. The type of such windows is USERDEFINED.
+/// NOTE Corresponding ISO 10303 name: time_measure, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
 /// 
-/// HISTORY  New Enumeration in IFC2x4.
-/// NOTE The new IfcWindowTypePartitioningEnum replaces the use of
-/// IfcWindowStyleOperationEnum that is deprecated from IFC2x4 onwards.
+/// HISTORY New type in IFC Release 1.5.1.
+class IfcTimeMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcTimeMeasure (IfcAbstractEntity* e);
+    IfcTimeMeasure (double v);
+    operator double() const;
+};
+/// IfcTimeStamp is an indication of date and time by measuring the number of seconds which have elapsed since the beginning of the year 1970.
+/// Type: INTEGER
 /// 
-/// Enumerator
-/// Description
-/// Figure
+/// HISTORY New type in IFC Release 1.5.1.
+class IfcTimeStamp : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcTimeStamp (IfcAbstractEntity* e);
+    IfcTimeStamp (int v);
+    operator int() const;
+};
+/// IfcTorqueMeasure is a measure of the torque or moment of a couple.
+/// Usually measured in N m.
+/// Type: REAL
 /// 
-/// SinglePanel
-/// Window with one
-/// panel.
+/// HISTORY New type in IFC Release 2x.
+class IfcTorqueMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcTorqueMeasure (IfcAbstractEntity* e);
+    IfcTorqueMeasure (double v);
+    operator double() const;
+};
+/// IfcURIReference provides for identifying a Uniform Resource Identifier, URI, as defined by the RFC3986 of the Network Working Group. A URI can be classified as a locator or a name or both, that is it may comprise a Uniform Resource Locator (URL) and/or a Uniform Resource Name (URN).
 /// 
-/// DoublePanelVertical
-/// Window with two panels.
-/// The configuration of the panels is vertically.
+/// A Uniform Resource Locator, URL, is a string conforming to a standardized format, which refers to a resource on the internet (such as a document or an image) by its location.
+/// A Uniform Resource Name, URN, is intended to serve as persistent, location-independent resource identifier and is
+/// designed to make it easy to map other namespaces (that share the properties of URNs) into URN-space.
 /// 
-/// DoublePanelHorizontal
-/// Window with two panels.
-/// The configuration of the panels is horizontally.
+/// HISTORY New defined datatype in IFC 2x4.
+class IfcURIReference : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcURIReference (IfcAbstractEntity* e);
+    IfcURIReference (std::string v);
+    operator std::string() const;
+};
+/// IfcVaporPermeabilityMeasure is a measure of vapor permeability.
+/// Usually measured in kg / s m Pascal.
+/// Type: REAL
 /// 
-/// TriplePanelVertical
-/// Window with three
-/// panels. The configuration of the panels is vertically.
+/// HISTORY New type in IFC Release 2x.
+class IfcVaporPermeabilityMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcVaporPermeabilityMeasure (IfcAbstractEntity* e);
+    IfcVaporPermeabilityMeasure (double v);
+    operator double() const;
+};
+/// Definition from ISO/CD 10303-41:1992: A volume measure is the value of the solid content of a body.
+/// Usually measured in cubic metre (m3).
+/// Type: REAL
 /// 
-/// TriplePanelHorizontal
-/// Window with three
-/// panels. The configuration of the panels is horizontally.
+/// NOTE Corresponding ISO 10303 name: volume_measure, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
 /// 
-/// TriplePanelBottom
-/// Window with three
-/// panels. The configuration of two panels is vertically and the
-/// third one is horizontally at the bottom.
+/// HISTORY New type in IFC Release 1.5.1.
+class IfcVolumeMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcVolumeMeasure (IfcAbstractEntity* e);
+    IfcVolumeMeasure (double v);
+    operator double() const;
+};
+/// IfcVolumetricFlowRateMeasure is a measure of the volume of a medium flowing per unit time.
+/// Usually measured in m3/s.
+/// Type: REAL
 /// 
-/// TriplePanelTop
-/// Window with three
-/// panels. The configuration of two panels is vertically and the
-/// third one is horizontally at the top.
+/// HISTORY New type in IFC Release 2.0.
+class IfcVolumetricFlowRateMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcVolumetricFlowRateMeasure (IfcAbstractEntity* e);
+    IfcVolumetricFlowRateMeasure (double v);
+    operator double() const;
+};
+/// IfcWarpingConstantMeasure is a measure for the warping constant or warping resistance of a cross section under torsional loading. It is usually measured in m^6.
 /// 
-/// TriplePanelLeft
-/// Window with three
-/// panels. The configuration of two panels is horizontally and the
-/// third one is vertically at the left hand side.
+/// Type: REAL  
 /// 
-/// TriplePanelRight
-/// Window with three
-/// panels. The configuration of two panels is horizontally and the
-/// third one is vertically at the right hand side.
+/// HISTORY New type in IFC2x2.
+class IfcWarpingConstantMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcWarpingConstantMeasure (IfcAbstractEntity* e);
+    IfcWarpingConstantMeasure (double v);
+    operator double() const;
+};
+/// The warping moment measure is a measure for the warping moment, which occurs in warping torsional analysis. It is usually measured in kN*m^2.
 /// 
-/// UserDefined
-/// user defined operation
-/// type
-///  
+/// Type: REAL  
 /// 
-/// NotDefined
-///  
-///  
+/// HISTORY New type in IFC2x2.
+class IfcWarpingMomentMeasure : public IfcUtil::IfcBaseType {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcWarpingMomentMeasure (IfcAbstractEntity* e);
+    IfcWarpingMomentMeasure (double v);
+    operator double() const;
+};
+/// The box alignment specifies the alignment of the text box relative to its position. The following string values shall be used:
 /// 
-/// Figure 70 — Window partitioning
+/// top-left
+///   top-middle
+///   top-right
+///   middle-left
+///   center
+///   middle-right
+///   bottom-left
+///   bottom-middle
+///   bottom-right
 /// 
-/// NOTE
+/// NOTE  The top-left is the default value.
 /// 
-/// The way how each panel operates is defined at the
-/// IfcWindowPanelProperties.OperationType.
-/// The reference from the window panel to the location of that
-/// panel in the window style configuration is handled by the
-/// IfcWindowPanelProperties.PanelPosition.
-/// The figures are shown as elevations in the XZ plane of the
-/// local placement of the window, looking into the direction of the
-/// positive Y axis.
-/// These figures are only shown as illustrations
-typedef enum {IfcWindowTypePartitioning_SINGLE_PANEL, IfcWindowTypePartitioning_DOUBLE_PANEL_VERTICAL, IfcWindowTypePartitioning_DOUBLE_PANEL_HORIZONTAL, IfcWindowTypePartitioning_TRIPLE_PANEL_VERTICAL, IfcWindowTypePartitioning_TRIPLE_PANEL_BOTTOM, IfcWindowTypePartitioning_TRIPLE_PANEL_TOP, IfcWindowTypePartitioning_TRIPLE_PANEL_LEFT, IfcWindowTypePartitioning_TRIPLE_PANEL_RIGHT, IfcWindowTypePartitioning_TRIPLE_PANEL_HORIZONTAL, IfcWindowTypePartitioning_USERDEFINED, IfcWindowTypePartitioning_NOTDEFINED} IfcWindowTypePartitioningEnum;
-const char* ToString(IfcWindowTypePartitioningEnum v);
-IfcWindowTypePartitioningEnum FromString(const std::string& s);
-}
-namespace IfcWorkCalendarTypeEnum {
-/// An IfcWorkCalendarTypeEnum is an enumeration data type that specifies the types of work calendar from which the relevant control can be selected. If given it should help to identify base calendars.
+/// Figure 298 illustrates alignment values.
 /// 
-/// HISTORY: Introduced in IFC2x4.
+/// Figure 298 — Box alignment values
 /// 
-/// Enumeration:
+/// Figure 299 illustrates use of alignment values together with the placement and planar extent.
 /// 
-/// FIRSTSHIFT: Belongs to the first shift
-/// SECONDSHIFT: Belongs to the second shift
-/// THIRDSHIFT: Belongs to the third shift
-/// USERDEFINED
-/// NOTDEFINED
-typedef enum {IfcWorkCalendarType_FIRSTSHIFT, IfcWorkCalendarType_SECONDSHIFT, IfcWorkCalendarType_THIRDSHIFT, IfcWorkCalendarType_USERDEFINED, IfcWorkCalendarType_NOTDEFINED} IfcWorkCalendarTypeEnum;
-const char* ToString(IfcWorkCalendarTypeEnum v);
-IfcWorkCalendarTypeEnum FromString(const std::string& s);
-}
-namespace IfcWorkPlanTypeEnum {
-/// An IfcWorkPlanTypeEnum is an enumeration data type that specifies the types of work plan from which the relevant control can be selected.
+/// Figure 299 — Box alignment examples
 /// 
-/// HISTORY  Introduced in IFC2x4. Derived from IfcWorkControlTypeEnum that was introduced in IFC Release 2.0.
+/// HISTORY  New type in IFC2x2 Addendum2.
 /// 
-/// Enumeration:
+/// IFC2x3 CHANGE  The IfcBoxAlignment has been added.
+class IfcBoxAlignment : public IfcLabel {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcBoxAlignment (IfcAbstractEntity* e);
+    IfcBoxAlignment (std::string v);
+    operator std::string() const;
+};
+/// IfcNormalisedRatioMeasure is a dimensionless measure to express ratio values ranging from 0.0 to 1.0.
 /// 
-/// ACTUAL: A control in which actual items undertaken are indicated.
-/// BASELINE: A control that is a baseline from which changes that are made later can be recognized.
-/// PLANNED: A control showing planned items.
-/// USERDEFINED
-/// NOTDEFINED
-typedef enum {IfcWorkPlanType_ACTUAL, IfcWorkPlanType_BASELINE, IfcWorkPlanType_PLANNED, IfcWorkPlanType_USERDEFINED, IfcWorkPlanType_NOTDEFINED} IfcWorkPlanTypeEnum;
-const char* ToString(IfcWorkPlanTypeEnum v);
-IfcWorkPlanTypeEnum FromString(const std::string& s);
-}
-namespace IfcWorkScheduleTypeEnum {
-/// An IfcWorkScheduleTypeEnum is an enumeration data type that specifies the types of work schedule from which the relevant control can be selected.
+/// Type: REAL
 /// 
-/// HISTORY  Introduced in IFC2x4. Derived from IfcWorkControlTypeEnum that was introduced in IFC Release 2.0.
+/// HISTORY New type in IFC Release 2x.
+class IfcNormalisedRatioMeasure : public IfcRatioMeasure {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcNormalisedRatioMeasure (IfcAbstractEntity* e);
+    IfcNormalisedRatioMeasure (double v);
+    operator double() const;
+};
+/// Definition from ISO/CD 10303-41:1992: A positive ratio measure is a ratio measure that is greater than zero.
+/// Type: IfcRatioMeasure
 /// 
-/// Enumeration:
+/// NOTE Corresponding ISO 10303 name: positive_ratio_measure, please refer to ISO/IS 10303-41 for the final definition of the formal standard.
 /// 
-/// ACTUAL: A control in which actual items undertaken are indicated
-/// BASELINE: A control that is a baseline from which changes that are made later can be recognized
-/// PLANNED: A control showing planned items
-/// USERDEFINED
-/// NOTDEFINED
-typedef enum {IfcWorkScheduleType_ACTUAL, IfcWorkScheduleType_BASELINE, IfcWorkScheduleType_PLANNED, IfcWorkScheduleType_USERDEFINED, IfcWorkScheduleType_NOTDEFINED} IfcWorkScheduleTypeEnum;
-const char* ToString(IfcWorkScheduleTypeEnum v);
-IfcWorkScheduleTypeEnum FromString(const std::string& s);
-}
+/// HISTORY New type in IFC Release 1.5.1.
+class IfcPositiveRatioMeasure : public IfcRatioMeasure {
+public:
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+    virtual Argument* getArgument(unsigned int i) const;
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    explicit IfcPositiveRatioMeasure (IfcAbstractEntity* e);
+    IfcPositiveRatioMeasure (double v);
+    operator double() const;
+};
 
 
 /// Definition: A role which is performed by an actor, either a person, an organization or a 
@@ -6866,34 +8128,33 @@ class IfcActorRole : public IfcUtil::IfcBaseEntity {
 public:
     /// The name of the role played by an actor. If the Role has value USERDEFINED, then
     /// the user defined role shall be provided as a value of the attribute UserDefinedRole.
-    IfcRoleEnum::IfcRoleEnum Role();
+    IfcRoleEnum::IfcRoleEnum Role() const;
     void setRole(IfcRoleEnum::IfcRoleEnum v);
     /// Whether the optional attribute UserDefinedRole is defined for this IfcActorRole
-    bool hasUserDefinedRole();
+    bool hasUserDefinedRole() const;
     /// Allows for specification of user defined roles beyond the 
     /// enumeration values provided by Role attribute of type IfcRoleEnum. 
     /// When a value is provided for attribute UserDefinedRole in parallel 
     /// the attribute Role shall have enumeration value USERDEFINED.
-    IfcLabel UserDefinedRole();
-    void setUserDefinedRole(IfcLabel v);
+    std::string UserDefinedRole() const;
+    void setUserDefinedRole(std::string v);
     /// Whether the optional attribute Description is defined for this IfcActorRole
-    bool hasDescription();
+    bool hasDescription() const;
     /// A textual description relating the nature of the role played by an actor.
-    IfcText Description();
-    void setDescription(IfcText v);
+    std::string Description() const;
+    void setDescription(std::string v);
     virtual unsigned int getArgumentCount() const { return 3; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENUMERATION; case 1: return IfcUtil::Argument_STRING; case 2: return IfcUtil::Argument_STRING; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcRoleEnum; case 1: return Type::IfcLabel; case 2: return Type::IfcText; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Role"; case 1: return "UserDefinedRole"; case 2: return "Description"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcExternalReferenceRelationship > > HasExternalReference(); // INVERSE IfcExternalReferenceRelationship::RelatedResourceObjects
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcExternalReferenceRelationship >::ptr HasExternalReference() const; // INVERSE IfcExternalReferenceRelationship::RelatedResourceObjects
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcActorRole (IfcAbstractEntityPtr e);
-    IfcActorRole (IfcRoleEnum::IfcRoleEnum v1_Role, boost::optional< IfcLabel > v2_UserDefinedRole, boost::optional< IfcText > v3_Description);
-    typedef IfcActorRole* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcActorRole > > list;
-    typedef IfcTemplatedEntityList< IfcActorRole >::it it;
+    IfcActorRole (IfcAbstractEntity* e);
+    IfcActorRole (IfcRoleEnum::IfcRoleEnum v1_Role, boost::optional< std::string > v2_UserDefinedRole, boost::optional< std::string > v3_Description);
+    typedef IfcTemplatedEntityList< IfcActorRole > list;
 };
 /// Definition: An abstract entity type for various kinds of postal and telecom addresses.
 /// 
@@ -6903,37 +8164,36 @@ class IfcActorRole : public IfcUtil::IfcBaseEntity {
 class IfcAddress : public IfcUtil::IfcBaseEntity {
 public:
     /// Whether the optional attribute Purpose is defined for this IfcAddress
-    bool hasPurpose();
+    bool hasPurpose() const;
     /// Identifies the logical location of the address.
-    IfcAddressTypeEnum::IfcAddressTypeEnum Purpose();
+    IfcAddressTypeEnum::IfcAddressTypeEnum Purpose() const;
     void setPurpose(IfcAddressTypeEnum::IfcAddressTypeEnum v);
     /// Whether the optional attribute Description is defined for this IfcAddress
-    bool hasDescription();
+    bool hasDescription() const;
     /// Text that relates the nature of the address.
-    IfcText Description();
-    void setDescription(IfcText v);
+    std::string Description() const;
+    void setDescription(std::string v);
     /// Whether the optional attribute UserDefinedPurpose is defined for this IfcAddress
-    bool hasUserDefinedPurpose();
+    bool hasUserDefinedPurpose() const;
     /// Allows for specification of user specific purpose of the address beyond the 
     /// enumeration values provided by Purpose attribute of type IfcAddressTypeEnum. 
     /// When a value is provided for attribute UserDefinedPurpose, in parallel the 
     /// attribute Purpose shall have enumeration value USERDEFINED.
-    IfcLabel UserDefinedPurpose();
-    void setUserDefinedPurpose(IfcLabel v);
+    std::string UserDefinedPurpose() const;
+    void setUserDefinedPurpose(std::string v);
     virtual unsigned int getArgumentCount() const { return 3; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENUMERATION; case 1: return IfcUtil::Argument_STRING; case 2: return IfcUtil::Argument_STRING; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcAddressTypeEnum; case 1: return Type::IfcText; case 2: return Type::IfcLabel; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Purpose"; case 1: return "Description"; case 2: return "UserDefinedPurpose"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcPerson > > OfPerson(); // INVERSE IfcPerson::Addresses
-    SHARED_PTR< IfcTemplatedEntityList< IfcOrganization > > OfOrganization(); // INVERSE IfcOrganization::Addresses
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcPerson >::ptr OfPerson() const; // INVERSE IfcPerson::Addresses
+    IfcTemplatedEntityList< IfcOrganization >::ptr OfOrganization() const; // INVERSE IfcOrganization::Addresses
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcAddress (IfcAbstractEntityPtr e);
-    IfcAddress (boost::optional< IfcAddressTypeEnum::IfcAddressTypeEnum > v1_Purpose, boost::optional< IfcText > v2_Description, boost::optional< IfcLabel > v3_UserDefinedPurpose);
-    typedef IfcAddress* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcAddress > > list;
-    typedef IfcTemplatedEntityList< IfcAddress >::it it;
+    IfcAddress (IfcAbstractEntity* e);
+    IfcAddress (boost::optional< IfcAddressTypeEnum::IfcAddressTypeEnum > v1_Purpose, boost::optional< std::string > v2_Description, boost::optional< std::string > v3_UserDefinedPurpose);
+    typedef IfcTemplatedEntityList< IfcAddress > list;
 };
 /// IfcApplication holds the information about an IFC compliant application developed by an application developer. The IfcApplication utilizes a short identifying name as provided by the application developer.
 /// 
@@ -6941,29 +8201,28 @@ class IfcAddress : public IfcUtil::IfcBaseEntity {
 class IfcApplication : public IfcUtil::IfcBaseEntity {
 public:
     /// Name of the application developer, being requested to be member of the IAI.
-    IfcOrganization* ApplicationDeveloper();
+    IfcOrganization* ApplicationDeveloper() const;
     void setApplicationDeveloper(IfcOrganization* v);
     /// The version number of this software as specified by the developer of the application.
-    IfcLabel Version();
-    void setVersion(IfcLabel v);
+    std::string Version() const;
+    void setVersion(std::string v);
     /// The full name of the application as specified by the application developer.
-    IfcLabel ApplicationFullName();
-    void setApplicationFullName(IfcLabel v);
+    std::string ApplicationFullName() const;
+    void setApplicationFullName(std::string v);
     /// Short identifying name for the application.
-    IfcIdentifier ApplicationIdentifier();
-    void setApplicationIdentifier(IfcIdentifier v);
+    std::string ApplicationIdentifier() const;
+    void setApplicationIdentifier(std::string v);
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY; case 1: return IfcUtil::Argument_STRING; case 2: return IfcUtil::Argument_STRING; case 3: return IfcUtil::Argument_STRING; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcOrganization; case 1: return Type::IfcLabel; case 2: return Type::IfcLabel; case 3: return Type::IfcIdentifier; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "ApplicationDeveloper"; case 1: return "Version"; case 2: return "ApplicationFullName"; case 3: return "ApplicationIdentifier"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcApplication (IfcAbstractEntityPtr e);
-    IfcApplication (IfcOrganization* v1_ApplicationDeveloper, IfcLabel v2_Version, IfcLabel v3_ApplicationFullName, IfcIdentifier v4_ApplicationIdentifier);
-    typedef IfcApplication* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcApplication > > list;
-    typedef IfcTemplatedEntityList< IfcApplication >::it it;
+    IfcApplication (IfcAbstractEntity* e);
+    IfcApplication (IfcOrganization* v1_ApplicationDeveloper, std::string v2_Version, std::string v3_ApplicationFullName, std::string v4_ApplicationIdentifier);
+    typedef IfcTemplatedEntityList< IfcApplication > list;
 };
 /// IfcAppliedValue is an abstract supertype that specifies the common attributes for cost values. 
 /// 
@@ -6982,72 +8241,71 @@ class IfcApplication : public IfcUtil::IfcBaseEntity {
 class IfcAppliedValue : public IfcUtil::IfcBaseEntity {
 public:
     /// Whether the optional attribute Name is defined for this IfcAppliedValue
-    bool hasName();
+    bool hasName() const;
     /// A name or additional clarification given to a cost value.
-    IfcLabel Name();
-    void setName(IfcLabel v);
+    std::string Name() const;
+    void setName(std::string v);
     /// Whether the optional attribute Description is defined for this IfcAppliedValue
-    bool hasDescription();
+    bool hasDescription() const;
     /// The description that may apply additional information about a cost value.
-    IfcText Description();
-    void setDescription(IfcText v);
+    std::string Description() const;
+    void setDescription(std::string v);
     /// Whether the optional attribute AppliedValue is defined for this IfcAppliedValue
-    bool hasAppliedValue();
+    bool hasAppliedValue() const;
     /// The extent or quantity or amount of an applied value.
-    IfcAppliedValueSelect AppliedValue();
-    void setAppliedValue(IfcAppliedValueSelect v);
+    IfcAppliedValueSelect* AppliedValue() const;
+    void setAppliedValue(IfcAppliedValueSelect* v);
     /// Whether the optional attribute UnitBasis is defined for this IfcAppliedValue
-    bool hasUnitBasis();
+    bool hasUnitBasis() const;
     /// The number and unit of measure on which the unit cost is based.
     /// 
     /// Note: As well as the normally expected units of measure such as length, area, volume etc., costs may be based on units of measure which need to be defined e.g. sack, drum, pallet, item etc. Unit costs may be based on quantities greater (or lesser) than a unitary value of the basis measure. For instance, timber may have a unit cost rate per X meters where X > 1; similarly for cable, piping and many other items. The basis number may be either an integer or a real value.
     /// 
     /// Note: This attribute should be asserted for all circumstances where the cost to be applied is per unit quantity. It may be asserted even for circumstances where an item price is used, in which case the unit cost basis should be by item (or equivalent definition).
-    IfcMeasureWithUnit* UnitBasis();
+    IfcMeasureWithUnit* UnitBasis() const;
     void setUnitBasis(IfcMeasureWithUnit* v);
     /// Whether the optional attribute ApplicableDate is defined for this IfcAppliedValue
-    bool hasApplicableDate();
+    bool hasApplicableDate() const;
     /// The date on or from which an applied value is applicable.
     /// 
     /// IFC2x4 CHANGE Type changed from IfcDateTimeSelect.
-    IfcDate ApplicableDate();
-    void setApplicableDate(IfcDate v);
+    std::string ApplicableDate() const;
+    void setApplicableDate(std::string v);
     /// Whether the optional attribute FixedUntilDate is defined for this IfcAppliedValue
-    bool hasFixedUntilDate();
+    bool hasFixedUntilDate() const;
     /// The date until which applied value is applicable.
     /// 
     /// IFC2x4 CHANGE Type changed from IfcDateTimeSelect.
-    IfcDate FixedUntilDate();
-    void setFixedUntilDate(IfcDate v);
+    std::string FixedUntilDate() const;
+    void setFixedUntilDate(std::string v);
     /// Whether the optional attribute Category is defined for this IfcAppliedValue
-    bool hasCategory();
-    IfcLabel Category();
-    void setCategory(IfcLabel v);
+    bool hasCategory() const;
+    std::string Category() const;
+    void setCategory(std::string v);
     /// Whether the optional attribute Condition is defined for this IfcAppliedValue
-    bool hasCondition();
-    IfcLabel Condition();
-    void setCondition(IfcLabel v);
+    bool hasCondition() const;
+    std::string Condition() const;
+    void setCondition(std::string v);
     /// Whether the optional attribute ArithmeticOperator is defined for this IfcAppliedValue
-    bool hasArithmeticOperator();
-    IfcArithmeticOperatorEnum::IfcArithmeticOperatorEnum ArithmeticOperator();
+    bool hasArithmeticOperator() const;
+    IfcArithmeticOperatorEnum::IfcArithmeticOperatorEnum ArithmeticOperator() const;
     void setArithmeticOperator(IfcArithmeticOperatorEnum::IfcArithmeticOperatorEnum v);
     /// Whether the optional attribute Components is defined for this IfcAppliedValue
-    bool hasComponents();
-    SHARED_PTR< IfcTemplatedEntityList< IfcAppliedValue > > Components();
-    void setComponents(SHARED_PTR< IfcTemplatedEntityList< IfcAppliedValue > > v);
+    bool hasComponents() const;
+    IfcTemplatedEntityList< IfcAppliedValue >::ptr Components() const;
+    void setComponents(IfcTemplatedEntityList< IfcAppliedValue >::ptr v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_STRING; case 1: return IfcUtil::Argument_STRING; case 2: return IfcUtil::Argument_ENTITY; case 3: return IfcUtil::Argument_ENTITY; case 4: return IfcUtil::Argument_STRING; case 5: return IfcUtil::Argument_STRING; case 6: return IfcUtil::Argument_STRING; case 7: return IfcUtil::Argument_STRING; case 8: return IfcUtil::Argument_ENUMERATION; case 9: return IfcUtil::Argument_ENTITY_LIST; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcLabel; case 1: return Type::IfcText; case 2: return Type::IfcAppliedValueSelect; case 3: return Type::IfcMeasureWithUnit; case 4: return Type::IfcDate; case 5: return Type::IfcDate; case 6: return Type::IfcLabel; case 7: return Type::IfcLabel; case 8: return Type::IfcArithmeticOperatorEnum; case 9: return Type::IfcAppliedValue; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Name"; case 1: return "Description"; case 2: return "AppliedValue"; case 3: return "UnitBasis"; case 4: return "ApplicableDate"; case 5: return "FixedUntilDate"; case 6: return "Category"; case 7: return "Condition"; case 8: return "ArithmeticOperator"; case 9: return "Components"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcExternalReferenceRelationship > > HasExternalReference(); // INVERSE IfcExternalReferenceRelationship::RelatedResourceObjects
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcExternalReferenceRelationship >::ptr HasExternalReference() const; // INVERSE IfcExternalReferenceRelationship::RelatedResourceObjects
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcAppliedValue (IfcAbstractEntityPtr e);
-    IfcAppliedValue (boost::optional< IfcLabel > v1_Name, boost::optional< IfcText > v2_Description, boost::optional< IfcAppliedValueSelect > v3_AppliedValue, IfcMeasureWithUnit* v4_UnitBasis, boost::optional< IfcDate > v5_ApplicableDate, boost::optional< IfcDate > v6_FixedUntilDate, boost::optional< IfcLabel > v7_Category, boost::optional< IfcLabel > v8_Condition, boost::optional< IfcArithmeticOperatorEnum::IfcArithmeticOperatorEnum > v9_ArithmeticOperator, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcAppliedValue > > > v10_Components);
-    typedef IfcAppliedValue* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcAppliedValue > > list;
-    typedef IfcTemplatedEntityList< IfcAppliedValue >::it it;
+    IfcAppliedValue (IfcAbstractEntity* e);
+    IfcAppliedValue (boost::optional< std::string > v1_Name, boost::optional< std::string > v2_Description, IfcAppliedValueSelect* v3_AppliedValue, IfcMeasureWithUnit* v4_UnitBasis, boost::optional< std::string > v5_ApplicableDate, boost::optional< std::string > v6_FixedUntilDate, boost::optional< std::string > v7_Category, boost::optional< std::string > v8_Condition, boost::optional< IfcArithmeticOperatorEnum::IfcArithmeticOperatorEnum > v9_ArithmeticOperator, boost::optional< IfcTemplatedEntityList< IfcAppliedValue >::ptr > v10_Components);
+    typedef IfcTemplatedEntityList< IfcAppliedValue > list;
 };
 /// Definition: An IfcApproval represents information about approval processes such as for a plan, a design, a proposal, or a change order in a construction or facilities management project. IfcApproval is referenced by IfcRelAssociatesApproval in IfcControlExtension schema, and thereby can be related to all subtypes of IfcRoot. An approval may also be given to resource objects using IfcResourceApprovalRelationship
 /// 
@@ -7057,73 +8315,72 @@ class IfcAppliedValue : public IfcUtil::IfcBaseEntity {
 class IfcApproval : public IfcUtil::IfcBaseEntity {
 public:
     /// Whether the optional attribute Identifier is defined for this IfcApproval
-    bool hasIdentifier();
+    bool hasIdentifier() const;
     /// A computer interpretable identifier by which the approval is known.
-    IfcIdentifier Identifier();
-    void setIdentifier(IfcIdentifier v);
+    std::string Identifier() const;
+    void setIdentifier(std::string v);
     /// Whether the optional attribute Name is defined for this IfcApproval
-    bool hasName();
+    bool hasName() const;
     /// A human readable name given to an approval.
-    IfcLabel Name();
-    void setName(IfcLabel v);
+    std::string Name() const;
+    void setName(std::string v);
     /// Whether the optional attribute Description is defined for this IfcApproval
-    bool hasDescription();
+    bool hasDescription() const;
     /// A general textual description of a design, work task, plan, etc. that is being approved for.
-    IfcText Description();
-    void setDescription(IfcText v);
+    std::string Description() const;
+    void setDescription(std::string v);
     /// Whether the optional attribute TimeOfApproval is defined for this IfcApproval
-    bool hasTimeOfApproval();
+    bool hasTimeOfApproval() const;
     /// Date and time when the result of the approval process is produced.
     /// 
     /// IFC2x4 CHANGE  Attribute data type changed to IfcDateTime using ISO 8601 representation, renamed from ApprovalDateTime and made OPTIONAL.
-    IfcDateTime TimeOfApproval();
-    void setTimeOfApproval(IfcDateTime v);
+    std::string TimeOfApproval() const;
+    void setTimeOfApproval(std::string v);
     /// Whether the optional attribute Status is defined for this IfcApproval
-    bool hasStatus();
+    bool hasStatus() const;
     /// The result or current status of the approval, e.g. Requested, Processed, Approved, Not Approved.
-    IfcLabel Status();
-    void setStatus(IfcLabel v);
+    std::string Status() const;
+    void setStatus(std::string v);
     /// Whether the optional attribute Level is defined for this IfcApproval
-    bool hasLevel();
+    bool hasLevel() const;
     /// Level of the approval e.g. Draft v.s. Completed design.
-    IfcLabel Level();
-    void setLevel(IfcLabel v);
+    std::string Level() const;
+    void setLevel(std::string v);
     /// Whether the optional attribute Qualifier is defined for this IfcApproval
-    bool hasQualifier();
+    bool hasQualifier() const;
     /// Textual description of special constraints or conditions for the approval.
-    IfcText Qualifier();
-    void setQualifier(IfcText v);
+    std::string Qualifier() const;
+    void setQualifier(std::string v);
     /// Whether the optional attribute RequestingApproval is defined for this IfcApproval
-    bool hasRequestingApproval();
+    bool hasRequestingApproval() const;
     /// The actor that is acting in the role specified at IfcOrganization or individually at IfcPerson and requesting an approval.
     /// 
     /// IFC2x4 CHANGE  New attribute for approval request replacing IfcApprovalActorRelationship (being deleted).
-    IfcActorSelect RequestingApproval();
-    void setRequestingApproval(IfcActorSelect v);
+    IfcActorSelect* RequestingApproval() const;
+    void setRequestingApproval(IfcActorSelect* v);
     /// Whether the optional attribute GivingApproval is defined for this IfcApproval
-    bool hasGivingApproval();
+    bool hasGivingApproval() const;
     /// The actor that is acting in the role specified at IfcOrganization or individually at IfcPerson and giving an approval.
     /// 
     /// IFC2x4 CHANGE  New attribute for approval provision replacing IfcApprovalActorRelationship (being deleted).
-    IfcActorSelect GivingApproval();
-    void setGivingApproval(IfcActorSelect v);
+    IfcActorSelect* GivingApproval() const;
+    void setGivingApproval(IfcActorSelect* v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_STRING; case 1: return IfcUtil::Argument_STRING; case 2: return IfcUtil::Argument_STRING; case 3: return IfcUtil::Argument_STRING; case 4: return IfcUtil::Argument_STRING; case 5: return IfcUtil::Argument_STRING; case 6: return IfcUtil::Argument_STRING; case 7: return IfcUtil::Argument_ENTITY; case 8: return IfcUtil::Argument_ENTITY; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcIdentifier; case 1: return Type::IfcLabel; case 2: return Type::IfcText; case 3: return Type::IfcDateTime; case 4: return Type::IfcLabel; case 5: return Type::IfcLabel; case 6: return Type::IfcText; case 7: return Type::IfcActorSelect; case 8: return Type::IfcActorSelect; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Identifier"; case 1: return "Name"; case 2: return "Description"; case 3: return "TimeOfApproval"; case 4: return "Status"; case 5: return "Level"; case 6: return "Qualifier"; case 7: return "RequestingApproval"; case 8: return "GivingApproval"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcExternalReferenceRelationship > > HasExternalReferences(); // INVERSE IfcExternalReferenceRelationship::RelatedResourceObjects
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelAssociatesApproval > > ApprovedObjects(); // INVERSE IfcRelAssociatesApproval::RelatingApproval
-    SHARED_PTR< IfcTemplatedEntityList< IfcResourceApprovalRelationship > > ApprovedResources(); // INVERSE IfcResourceApprovalRelationship::RelatingApproval
-    SHARED_PTR< IfcTemplatedEntityList< IfcApprovalRelationship > > IsRelatedWith(); // INVERSE IfcApprovalRelationship::RelatedApprovals
-    SHARED_PTR< IfcTemplatedEntityList< IfcApprovalRelationship > > Relates(); // INVERSE IfcApprovalRelationship::RelatingApproval
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcExternalReferenceRelationship >::ptr HasExternalReferences() const; // INVERSE IfcExternalReferenceRelationship::RelatedResourceObjects
+    IfcTemplatedEntityList< IfcRelAssociatesApproval >::ptr ApprovedObjects() const; // INVERSE IfcRelAssociatesApproval::RelatingApproval
+    IfcTemplatedEntityList< IfcResourceApprovalRelationship >::ptr ApprovedResources() const; // INVERSE IfcResourceApprovalRelationship::RelatingApproval
+    IfcTemplatedEntityList< IfcApprovalRelationship >::ptr IsRelatedWith() const; // INVERSE IfcApprovalRelationship::RelatedApprovals
+    IfcTemplatedEntityList< IfcApprovalRelationship >::ptr Relates() const; // INVERSE IfcApprovalRelationship::RelatingApproval
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcApproval (IfcAbstractEntityPtr e);
-    IfcApproval (boost::optional< IfcIdentifier > v1_Identifier, boost::optional< IfcLabel > v2_Name, boost::optional< IfcText > v3_Description, boost::optional< IfcDateTime > v4_TimeOfApproval, boost::optional< IfcLabel > v5_Status, boost::optional< IfcLabel > v6_Level, boost::optional< IfcText > v7_Qualifier, boost::optional< IfcActorSelect > v8_RequestingApproval, boost::optional< IfcActorSelect > v9_GivingApproval);
-    typedef IfcApproval* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcApproval > > list;
-    typedef IfcTemplatedEntityList< IfcApproval >::it it;
+    IfcApproval (IfcAbstractEntity* e);
+    IfcApproval (boost::optional< std::string > v1_Identifier, boost::optional< std::string > v2_Name, boost::optional< std::string > v3_Description, boost::optional< std::string > v4_TimeOfApproval, boost::optional< std::string > v5_Status, boost::optional< std::string > v6_Level, boost::optional< std::string > v7_Qualifier, IfcActorSelect* v8_RequestingApproval, IfcActorSelect* v9_GivingApproval);
+    typedef IfcTemplatedEntityList< IfcApproval > list;
 };
 /// Definition
 /// from IAI: The abstract entity IfcBoundaryCondition
@@ -7143,22 +8400,21 @@ class IfcApproval : public IfcUtil::IfcBaseEntity {
 class IfcBoundaryCondition : public IfcUtil::IfcBaseEntity {
 public:
     /// Whether the optional attribute Name is defined for this IfcBoundaryCondition
-    bool hasName();
+    bool hasName() const;
     /// Optionally defines a name for this boundary condition.
-    IfcLabel Name();
-    void setName(IfcLabel v);
+    std::string Name() const;
+    void setName(std::string v);
     virtual unsigned int getArgumentCount() const { return 1; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_STRING; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcLabel; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Name"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcBoundaryCondition (IfcAbstractEntityPtr e);
-    IfcBoundaryCondition (boost::optional< IfcLabel > v1_Name);
-    typedef IfcBoundaryCondition* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcBoundaryCondition > > list;
-    typedef IfcTemplatedEntityList< IfcBoundaryCondition >::it it;
+    IfcBoundaryCondition (IfcAbstractEntity* e);
+    IfcBoundaryCondition (boost::optional< std::string > v1_Name);
+    typedef IfcTemplatedEntityList< IfcBoundaryCondition > list;
 };
 /// Definition from IAI: Describes linearly elastic support conditions or connection conditions.
 /// 
@@ -7173,47 +8429,46 @@ class IfcBoundaryCondition : public IfcUtil::IfcBaseEntity {
 class IfcBoundaryEdgeCondition : public IfcBoundaryCondition {
 public:
     /// Whether the optional attribute TranslationalStiffnessByLengthX is defined for this IfcBoundaryEdgeCondition
-    bool hasTranslationalStiffnessByLengthX();
+    bool hasTranslationalStiffnessByLengthX() const;
     /// Translational stiffness value in x-direction of the coordinate system defined by the instance which uses this resource object.
-    IfcModulusOfTranslationalSubgradeReactionSelect TranslationalStiffnessByLengthX();
-    void setTranslationalStiffnessByLengthX(IfcModulusOfTranslationalSubgradeReactionSelect v);
+    IfcModulusOfTranslationalSubgradeReactionSelect* TranslationalStiffnessByLengthX() const;
+    void setTranslationalStiffnessByLengthX(IfcModulusOfTranslationalSubgradeReactionSelect* v);
     /// Whether the optional attribute TranslationalStiffnessByLengthY is defined for this IfcBoundaryEdgeCondition
-    bool hasTranslationalStiffnessByLengthY();
+    bool hasTranslationalStiffnessByLengthY() const;
     /// Translational stiffness value in y-direction of the coordinate system defined by the instance which uses this resource object.
-    IfcModulusOfTranslationalSubgradeReactionSelect TranslationalStiffnessByLengthY();
-    void setTranslationalStiffnessByLengthY(IfcModulusOfTranslationalSubgradeReactionSelect v);
+    IfcModulusOfTranslationalSubgradeReactionSelect* TranslationalStiffnessByLengthY() const;
+    void setTranslationalStiffnessByLengthY(IfcModulusOfTranslationalSubgradeReactionSelect* v);
     /// Whether the optional attribute TranslationalStiffnessByLengthZ is defined for this IfcBoundaryEdgeCondition
-    bool hasTranslationalStiffnessByLengthZ();
+    bool hasTranslationalStiffnessByLengthZ() const;
     /// Translational stiffness value in z-direction of the coordinate system defined by the instance which uses this resource object.
-    IfcModulusOfTranslationalSubgradeReactionSelect TranslationalStiffnessByLengthZ();
-    void setTranslationalStiffnessByLengthZ(IfcModulusOfTranslationalSubgradeReactionSelect v);
+    IfcModulusOfTranslationalSubgradeReactionSelect* TranslationalStiffnessByLengthZ() const;
+    void setTranslationalStiffnessByLengthZ(IfcModulusOfTranslationalSubgradeReactionSelect* v);
     /// Whether the optional attribute RotationalStiffnessByLengthX is defined for this IfcBoundaryEdgeCondition
-    bool hasRotationalStiffnessByLengthX();
+    bool hasRotationalStiffnessByLengthX() const;
     /// Rotational stiffness value about the x-axis of the coordinate system defined by the instance which uses this resource object.
-    IfcModulusOfRotationalSubgradeReactionSelect RotationalStiffnessByLengthX();
-    void setRotationalStiffnessByLengthX(IfcModulusOfRotationalSubgradeReactionSelect v);
+    IfcModulusOfRotationalSubgradeReactionSelect* RotationalStiffnessByLengthX() const;
+    void setRotationalStiffnessByLengthX(IfcModulusOfRotationalSubgradeReactionSelect* v);
     /// Whether the optional attribute RotationalStiffnessByLengthY is defined for this IfcBoundaryEdgeCondition
-    bool hasRotationalStiffnessByLengthY();
+    bool hasRotationalStiffnessByLengthY() const;
     /// Rotational stiffness value about the y-axis of the coordinate system defined by the instance which uses this resource object.
-    IfcModulusOfRotationalSubgradeReactionSelect RotationalStiffnessByLengthY();
-    void setRotationalStiffnessByLengthY(IfcModulusOfRotationalSubgradeReactionSelect v);
+    IfcModulusOfRotationalSubgradeReactionSelect* RotationalStiffnessByLengthY() const;
+    void setRotationalStiffnessByLengthY(IfcModulusOfRotationalSubgradeReactionSelect* v);
     /// Whether the optional attribute RotationalStiffnessByLengthZ is defined for this IfcBoundaryEdgeCondition
-    bool hasRotationalStiffnessByLengthZ();
+    bool hasRotationalStiffnessByLengthZ() const;
     /// Rotational stiffness value about the z-axis of the coordinate system defined by the instance which uses this resource object.
-    IfcModulusOfRotationalSubgradeReactionSelect RotationalStiffnessByLengthZ();
-    void setRotationalStiffnessByLengthZ(IfcModulusOfRotationalSubgradeReactionSelect v);
+    IfcModulusOfRotationalSubgradeReactionSelect* RotationalStiffnessByLengthZ() const;
+    void setRotationalStiffnessByLengthZ(IfcModulusOfRotationalSubgradeReactionSelect* v);
     virtual unsigned int getArgumentCount() const { return 7; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 1: return IfcUtil::Argument_ENTITY; case 2: return IfcUtil::Argument_ENTITY; case 3: return IfcUtil::Argument_ENTITY; case 4: return IfcUtil::Argument_ENTITY; case 5: return IfcUtil::Argument_ENTITY; case 6: return IfcUtil::Argument_ENTITY; } return IfcBoundaryCondition::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 1: return Type::IfcModulusOfTranslationalSubgradeReactionSelect; case 2: return Type::IfcModulusOfTranslationalSubgradeReactionSelect; case 3: return Type::IfcModulusOfTranslationalSubgradeReactionSelect; case 4: return Type::IfcModulusOfRotationalSubgradeReactionSelect; case 5: return Type::IfcModulusOfRotationalSubgradeReactionSelect; case 6: return Type::IfcModulusOfRotationalSubgradeReactionSelect; } return IfcBoundaryCondition::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 1: return "TranslationalStiffnessByLengthX"; case 2: return "TranslationalStiffnessByLengthY"; case 3: return "TranslationalStiffnessByLengthZ"; case 4: return "RotationalStiffnessByLengthX"; case 5: return "RotationalStiffnessByLengthY"; case 6: return "RotationalStiffnessByLengthZ"; } return IfcBoundaryCondition::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcBoundaryEdgeCondition (IfcAbstractEntityPtr e);
-    IfcBoundaryEdgeCondition (boost::optional< IfcLabel > v1_Name, boost::optional< IfcModulusOfTranslationalSubgradeReactionSelect > v2_TranslationalStiffnessByLengthX, boost::optional< IfcModulusOfTranslationalSubgradeReactionSelect > v3_TranslationalStiffnessByLengthY, boost::optional< IfcModulusOfTranslationalSubgradeReactionSelect > v4_TranslationalStiffnessByLengthZ, boost::optional< IfcModulusOfRotationalSubgradeReactionSelect > v5_RotationalStiffnessByLengthX, boost::optional< IfcModulusOfRotationalSubgradeReactionSelect > v6_RotationalStiffnessByLengthY, boost::optional< IfcModulusOfRotationalSubgradeReactionSelect > v7_RotationalStiffnessByLengthZ);
-    typedef IfcBoundaryEdgeCondition* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcBoundaryEdgeCondition > > list;
-    typedef IfcTemplatedEntityList< IfcBoundaryEdgeCondition >::it it;
+    IfcBoundaryEdgeCondition (IfcAbstractEntity* e);
+    IfcBoundaryEdgeCondition (boost::optional< std::string > v1_Name, IfcModulusOfTranslationalSubgradeReactionSelect* v2_TranslationalStiffnessByLengthX, IfcModulusOfTranslationalSubgradeReactionSelect* v3_TranslationalStiffnessByLengthY, IfcModulusOfTranslationalSubgradeReactionSelect* v4_TranslationalStiffnessByLengthZ, IfcModulusOfRotationalSubgradeReactionSelect* v5_RotationalStiffnessByLengthX, IfcModulusOfRotationalSubgradeReactionSelect* v6_RotationalStiffnessByLengthY, IfcModulusOfRotationalSubgradeReactionSelect* v7_RotationalStiffnessByLengthZ);
+    typedef IfcTemplatedEntityList< IfcBoundaryEdgeCondition > list;
 };
 /// Definition from IAI: Describes linearly elastic support conditions or connection conditions.
 /// 
@@ -7228,32 +8483,31 @@ class IfcBoundaryEdgeCondition : public IfcBoundaryCondition {
 class IfcBoundaryFaceCondition : public IfcBoundaryCondition {
 public:
     /// Whether the optional attribute TranslationalStiffnessByAreaX is defined for this IfcBoundaryFaceCondition
-    bool hasTranslationalStiffnessByAreaX();
+    bool hasTranslationalStiffnessByAreaX() const;
     /// Translational stiffness value in x-direction of the coordinate system defined by the instance which uses this resource object.
-    IfcModulusOfSubgradeReactionSelect TranslationalStiffnessByAreaX();
-    void setTranslationalStiffnessByAreaX(IfcModulusOfSubgradeReactionSelect v);
+    IfcModulusOfSubgradeReactionSelect* TranslationalStiffnessByAreaX() const;
+    void setTranslationalStiffnessByAreaX(IfcModulusOfSubgradeReactionSelect* v);
     /// Whether the optional attribute TranslationalStiffnessByAreaY is defined for this IfcBoundaryFaceCondition
-    bool hasTranslationalStiffnessByAreaY();
+    bool hasTranslationalStiffnessByAreaY() const;
     /// Translational stiffness value in y-direction of the coordinate system defined by the instance which uses this resource object.
-    IfcModulusOfSubgradeReactionSelect TranslationalStiffnessByAreaY();
-    void setTranslationalStiffnessByAreaY(IfcModulusOfSubgradeReactionSelect v);
+    IfcModulusOfSubgradeReactionSelect* TranslationalStiffnessByAreaY() const;
+    void setTranslationalStiffnessByAreaY(IfcModulusOfSubgradeReactionSelect* v);
     /// Whether the optional attribute TranslationalStiffnessByAreaZ is defined for this IfcBoundaryFaceCondition
-    bool hasTranslationalStiffnessByAreaZ();
+    bool hasTranslationalStiffnessByAreaZ() const;
     /// Translational stiffness value in z-direction of the coordinate system defined by the instance which uses this resource object.
-    IfcModulusOfSubgradeReactionSelect TranslationalStiffnessByAreaZ();
-    void setTranslationalStiffnessByAreaZ(IfcModulusOfSubgradeReactionSelect v);
+    IfcModulusOfSubgradeReactionSelect* TranslationalStiffnessByAreaZ() const;
+    void setTranslationalStiffnessByAreaZ(IfcModulusOfSubgradeReactionSelect* v);
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 1: return IfcUtil::Argument_ENTITY; case 2: return IfcUtil::Argument_ENTITY; case 3: return IfcUtil::Argument_ENTITY; } return IfcBoundaryCondition::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 1: return Type::IfcModulusOfSubgradeReactionSelect; case 2: return Type::IfcModulusOfSubgradeReactionSelect; case 3: return Type::IfcModulusOfSubgradeReactionSelect; } return IfcBoundaryCondition::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 1: return "TranslationalStiffnessByAreaX"; case 2: return "TranslationalStiffnessByAreaY"; case 3: return "TranslationalStiffnessByAreaZ"; } return IfcBoundaryCondition::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcBoundaryFaceCondition (IfcAbstractEntityPtr e);
-    IfcBoundaryFaceCondition (boost::optional< IfcLabel > v1_Name, boost::optional< IfcModulusOfSubgradeReactionSelect > v2_TranslationalStiffnessByAreaX, boost::optional< IfcModulusOfSubgradeReactionSelect > v3_TranslationalStiffnessByAreaY, boost::optional< IfcModulusOfSubgradeReactionSelect > v4_TranslationalStiffnessByAreaZ);
-    typedef IfcBoundaryFaceCondition* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcBoundaryFaceCondition > > list;
-    typedef IfcTemplatedEntityList< IfcBoundaryFaceCondition >::it it;
+    IfcBoundaryFaceCondition (IfcAbstractEntity* e);
+    IfcBoundaryFaceCondition (boost::optional< std::string > v1_Name, IfcModulusOfSubgradeReactionSelect* v2_TranslationalStiffnessByAreaX, IfcModulusOfSubgradeReactionSelect* v3_TranslationalStiffnessByAreaY, IfcModulusOfSubgradeReactionSelect* v4_TranslationalStiffnessByAreaZ);
+    typedef IfcTemplatedEntityList< IfcBoundaryFaceCondition > list;
 };
 /// Definition from IAI: Describes linearly elastic support conditions or connection conditions.
 /// 
@@ -7268,47 +8522,46 @@ class IfcBoundaryFaceCondition : public IfcBoundaryCondition {
 class IfcBoundaryNodeCondition : public IfcBoundaryCondition {
 public:
     /// Whether the optional attribute TranslationalStiffnessX is defined for this IfcBoundaryNodeCondition
-    bool hasTranslationalStiffnessX();
+    bool hasTranslationalStiffnessX() const;
     /// Translational stiffness value in x-direction of the coordinate system defined by the instance which uses this resource object.
-    IfcTranslationalStiffnessSelect TranslationalStiffnessX();
-    void setTranslationalStiffnessX(IfcTranslationalStiffnessSelect v);
+    IfcTranslationalStiffnessSelect* TranslationalStiffnessX() const;
+    void setTranslationalStiffnessX(IfcTranslationalStiffnessSelect* v);
     /// Whether the optional attribute TranslationalStiffnessY is defined for this IfcBoundaryNodeCondition
-    bool hasTranslationalStiffnessY();
+    bool hasTranslationalStiffnessY() const;
     /// Translational stiffness value in y-direction of the coordinate system defined by the instance which uses this resource object.
-    IfcTranslationalStiffnessSelect TranslationalStiffnessY();
-    void setTranslationalStiffnessY(IfcTranslationalStiffnessSelect v);
+    IfcTranslationalStiffnessSelect* TranslationalStiffnessY() const;
+    void setTranslationalStiffnessY(IfcTranslationalStiffnessSelect* v);
     /// Whether the optional attribute TranslationalStiffnessZ is defined for this IfcBoundaryNodeCondition
-    bool hasTranslationalStiffnessZ();
+    bool hasTranslationalStiffnessZ() const;
     /// Translational stiffness value in z-direction of the coordinate system defined by the instance which uses this resource object.
-    IfcTranslationalStiffnessSelect TranslationalStiffnessZ();
-    void setTranslationalStiffnessZ(IfcTranslationalStiffnessSelect v);
+    IfcTranslationalStiffnessSelect* TranslationalStiffnessZ() const;
+    void setTranslationalStiffnessZ(IfcTranslationalStiffnessSelect* v);
     /// Whether the optional attribute RotationalStiffnessX is defined for this IfcBoundaryNodeCondition
-    bool hasRotationalStiffnessX();
+    bool hasRotationalStiffnessX() const;
     /// Rotational stiffness value about the x-axis of the coordinate system defined by the instance which uses this resource object.
-    IfcRotationalStiffnessSelect RotationalStiffnessX();
-    void setRotationalStiffnessX(IfcRotationalStiffnessSelect v);
+    IfcRotationalStiffnessSelect* RotationalStiffnessX() const;
+    void setRotationalStiffnessX(IfcRotationalStiffnessSelect* v);
     /// Whether the optional attribute RotationalStiffnessY is defined for this IfcBoundaryNodeCondition
-    bool hasRotationalStiffnessY();
+    bool hasRotationalStiffnessY() const;
     /// Rotational stiffness value about the y-axis of the coordinate system defined by the instance which uses this resource object.
-    IfcRotationalStiffnessSelect RotationalStiffnessY();
-    void setRotationalStiffnessY(IfcRotationalStiffnessSelect v);
+    IfcRotationalStiffnessSelect* RotationalStiffnessY() const;
+    void setRotationalStiffnessY(IfcRotationalStiffnessSelect* v);
     /// Whether the optional attribute RotationalStiffnessZ is defined for this IfcBoundaryNodeCondition
-    bool hasRotationalStiffnessZ();
+    bool hasRotationalStiffnessZ() const;
     /// Rotational stiffness value about the z-axis of the coordinate system defined by the instance which uses this resource object.
-    IfcRotationalStiffnessSelect RotationalStiffnessZ();
-    void setRotationalStiffnessZ(IfcRotationalStiffnessSelect v);
+    IfcRotationalStiffnessSelect* RotationalStiffnessZ() const;
+    void setRotationalStiffnessZ(IfcRotationalStiffnessSelect* v);
     virtual unsigned int getArgumentCount() const { return 7; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 1: return IfcUtil::Argument_ENTITY; case 2: return IfcUtil::Argument_ENTITY; case 3: return IfcUtil::Argument_ENTITY; case 4: return IfcUtil::Argument_ENTITY; case 5: return IfcUtil::Argument_ENTITY; case 6: return IfcUtil::Argument_ENTITY; } return IfcBoundaryCondition::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 1: return Type::IfcTranslationalStiffnessSelect; case 2: return Type::IfcTranslationalStiffnessSelect; case 3: return Type::IfcTranslationalStiffnessSelect; case 4: return Type::IfcRotationalStiffnessSelect; case 5: return Type::IfcRotationalStiffnessSelect; case 6: return Type::IfcRotationalStiffnessSelect; } return IfcBoundaryCondition::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 1: return "TranslationalStiffnessX"; case 2: return "TranslationalStiffnessY"; case 3: return "TranslationalStiffnessZ"; case 4: return "RotationalStiffnessX"; case 5: return "RotationalStiffnessY"; case 6: return "RotationalStiffnessZ"; } return IfcBoundaryCondition::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcBoundaryNodeCondition (IfcAbstractEntityPtr e);
-    IfcBoundaryNodeCondition (boost::optional< IfcLabel > v1_Name, boost::optional< IfcTranslationalStiffnessSelect > v2_TranslationalStiffnessX, boost::optional< IfcTranslationalStiffnessSelect > v3_TranslationalStiffnessY, boost::optional< IfcTranslationalStiffnessSelect > v4_TranslationalStiffnessZ, boost::optional< IfcRotationalStiffnessSelect > v5_RotationalStiffnessX, boost::optional< IfcRotationalStiffnessSelect > v6_RotationalStiffnessY, boost::optional< IfcRotationalStiffnessSelect > v7_RotationalStiffnessZ);
-    typedef IfcBoundaryNodeCondition* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcBoundaryNodeCondition > > list;
-    typedef IfcTemplatedEntityList< IfcBoundaryNodeCondition >::it it;
+    IfcBoundaryNodeCondition (IfcAbstractEntity* e);
+    IfcBoundaryNodeCondition (boost::optional< std::string > v1_Name, IfcTranslationalStiffnessSelect* v2_TranslationalStiffnessX, IfcTranslationalStiffnessSelect* v3_TranslationalStiffnessY, IfcTranslationalStiffnessSelect* v4_TranslationalStiffnessZ, IfcRotationalStiffnessSelect* v5_RotationalStiffnessX, IfcRotationalStiffnessSelect* v6_RotationalStiffnessY, IfcRotationalStiffnessSelect* v7_RotationalStiffnessZ);
+    typedef IfcTemplatedEntityList< IfcBoundaryNodeCondition > list;
 };
 /// Definition from IAI: Describes linearly elastic support conditions or connection conditions, including linearly elastic warping restraints.
 /// 
@@ -7322,22 +8575,21 @@ class IfcBoundaryNodeCondition : public IfcBoundaryCondition {
 class IfcBoundaryNodeConditionWarping : public IfcBoundaryNodeCondition {
 public:
     /// Whether the optional attribute WarpingStiffness is defined for this IfcBoundaryNodeConditionWarping
-    bool hasWarpingStiffness();
+    bool hasWarpingStiffness() const;
     /// Defines the warping stiffness value.
-    IfcWarpingStiffnessSelect WarpingStiffness();
-    void setWarpingStiffness(IfcWarpingStiffnessSelect v);
+    IfcWarpingStiffnessSelect* WarpingStiffness() const;
+    void setWarpingStiffness(IfcWarpingStiffnessSelect* v);
     virtual unsigned int getArgumentCount() const { return 8; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 7: return IfcUtil::Argument_ENTITY; } return IfcBoundaryNodeCondition::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 7: return Type::IfcWarpingStiffnessSelect; } return IfcBoundaryNodeCondition::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 7: return "WarpingStiffness"; } return IfcBoundaryNodeCondition::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcBoundaryNodeConditionWarping (IfcAbstractEntityPtr e);
-    IfcBoundaryNodeConditionWarping (boost::optional< IfcLabel > v1_Name, boost::optional< IfcTranslationalStiffnessSelect > v2_TranslationalStiffnessX, boost::optional< IfcTranslationalStiffnessSelect > v3_TranslationalStiffnessY, boost::optional< IfcTranslationalStiffnessSelect > v4_TranslationalStiffnessZ, boost::optional< IfcRotationalStiffnessSelect > v5_RotationalStiffnessX, boost::optional< IfcRotationalStiffnessSelect > v6_RotationalStiffnessY, boost::optional< IfcRotationalStiffnessSelect > v7_RotationalStiffnessZ, boost::optional< IfcWarpingStiffnessSelect > v8_WarpingStiffness);
-    typedef IfcBoundaryNodeConditionWarping* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcBoundaryNodeConditionWarping > > list;
-    typedef IfcTemplatedEntityList< IfcBoundaryNodeConditionWarping >::it it;
+    IfcBoundaryNodeConditionWarping (IfcAbstractEntity* e);
+    IfcBoundaryNodeConditionWarping (boost::optional< std::string > v1_Name, IfcTranslationalStiffnessSelect* v2_TranslationalStiffnessX, IfcTranslationalStiffnessSelect* v3_TranslationalStiffnessY, IfcTranslationalStiffnessSelect* v4_TranslationalStiffnessZ, IfcRotationalStiffnessSelect* v5_RotationalStiffnessX, IfcRotationalStiffnessSelect* v6_RotationalStiffnessY, IfcRotationalStiffnessSelect* v7_RotationalStiffnessZ, IfcWarpingStiffnessSelect* v8_WarpingStiffness);
+    typedef IfcTemplatedEntityList< IfcBoundaryNodeConditionWarping > list;
 };
 /// IfcConnectionGeometry is used to describe the geometric and topological constraints that facilitate the physical connection of two objects. It is envisioned as a control that applies to the element connection relationships.
 /// 
@@ -7357,16 +8609,15 @@ class IfcConnectionGeometry : public IfcUtil::IfcBaseEntity {
 public:
     virtual unsigned int getArgumentCount() const { return 0; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcConnectionGeometry (IfcAbstractEntityPtr e);
+    IfcConnectionGeometry (IfcAbstractEntity* e);
     IfcConnectionGeometry ();
-    typedef IfcConnectionGeometry* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcConnectionGeometry > > list;
-    typedef IfcTemplatedEntityList< IfcConnectionGeometry >::it it;
+    typedef IfcTemplatedEntityList< IfcConnectionGeometry > list;
 };
 /// IfcConnectionPointGeometry
 /// is used to describe the geometric constraints that facilitate the
@@ -7387,25 +8638,24 @@ class IfcConnectionGeometry : public IfcUtil::IfcBaseEntity {
 class IfcConnectionPointGeometry : public IfcConnectionGeometry {
 public:
     /// Point at which the connected object is aligned at the relating element, given in the LCS of the relating element.
-    IfcPointOrVertexPoint PointOnRelatingElement();
-    void setPointOnRelatingElement(IfcPointOrVertexPoint v);
+    IfcPointOrVertexPoint* PointOnRelatingElement() const;
+    void setPointOnRelatingElement(IfcPointOrVertexPoint* v);
     /// Whether the optional attribute PointOnRelatedElement is defined for this IfcConnectionPointGeometry
-    bool hasPointOnRelatedElement();
+    bool hasPointOnRelatedElement() const;
     /// Point at which connected objects are aligned at the related element, given in the LCS of the related element. If the information is omitted, then the origin of the related element is used.
-    IfcPointOrVertexPoint PointOnRelatedElement();
-    void setPointOnRelatedElement(IfcPointOrVertexPoint v);
+    IfcPointOrVertexPoint* PointOnRelatedElement() const;
+    void setPointOnRelatedElement(IfcPointOrVertexPoint* v);
     virtual unsigned int getArgumentCount() const { return 2; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY; case 1: return IfcUtil::Argument_ENTITY; } return IfcConnectionGeometry::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcPointOrVertexPoint; case 1: return Type::IfcPointOrVertexPoint; } return IfcConnectionGeometry::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "PointOnRelatingElement"; case 1: return "PointOnRelatedElement"; } return IfcConnectionGeometry::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcConnectionPointGeometry (IfcAbstractEntityPtr e);
-    IfcConnectionPointGeometry (IfcPointOrVertexPoint v1_PointOnRelatingElement, boost::optional< IfcPointOrVertexPoint > v2_PointOnRelatedElement);
-    typedef IfcConnectionPointGeometry* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcConnectionPointGeometry > > list;
-    typedef IfcTemplatedEntityList< IfcConnectionPointGeometry >::it it;
+    IfcConnectionPointGeometry (IfcAbstractEntity* e);
+    IfcConnectionPointGeometry (IfcPointOrVertexPoint* v1_PointOnRelatingElement, IfcPointOrVertexPoint* v2_PointOnRelatedElement);
+    typedef IfcTemplatedEntityList< IfcConnectionPointGeometry > list;
 };
 /// IfcConnectionSurfaceGeometry is used to describe the geometric constraints that facilitate the physical connection of two objects at a surface or at a face with surface geometry associated. It is envisioned as a control that applies to the element connection relationships. 
 /// 
@@ -7418,25 +8668,24 @@ class IfcConnectionPointGeometry : public IfcConnectionGeometry {
 class IfcConnectionSurfaceGeometry : public IfcConnectionGeometry {
 public:
     /// Surface at which related object is aligned at the relating element, given in the LCS of the relating element.
-    IfcSurfaceOrFaceSurface SurfaceOnRelatingElement();
-    void setSurfaceOnRelatingElement(IfcSurfaceOrFaceSurface v);
+    IfcSurfaceOrFaceSurface* SurfaceOnRelatingElement() const;
+    void setSurfaceOnRelatingElement(IfcSurfaceOrFaceSurface* v);
     /// Whether the optional attribute SurfaceOnRelatedElement is defined for this IfcConnectionSurfaceGeometry
-    bool hasSurfaceOnRelatedElement();
+    bool hasSurfaceOnRelatedElement() const;
     /// Surface at which the relating element is aligned at the related element, given in the LCS of the related element. If the information is omitted, then the origin of the related element is used.
-    IfcSurfaceOrFaceSurface SurfaceOnRelatedElement();
-    void setSurfaceOnRelatedElement(IfcSurfaceOrFaceSurface v);
+    IfcSurfaceOrFaceSurface* SurfaceOnRelatedElement() const;
+    void setSurfaceOnRelatedElement(IfcSurfaceOrFaceSurface* v);
     virtual unsigned int getArgumentCount() const { return 2; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY; case 1: return IfcUtil::Argument_ENTITY; } return IfcConnectionGeometry::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcSurfaceOrFaceSurface; case 1: return Type::IfcSurfaceOrFaceSurface; } return IfcConnectionGeometry::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "SurfaceOnRelatingElement"; case 1: return "SurfaceOnRelatedElement"; } return IfcConnectionGeometry::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcConnectionSurfaceGeometry (IfcAbstractEntityPtr e);
-    IfcConnectionSurfaceGeometry (IfcSurfaceOrFaceSurface v1_SurfaceOnRelatingElement, boost::optional< IfcSurfaceOrFaceSurface > v2_SurfaceOnRelatedElement);
-    typedef IfcConnectionSurfaceGeometry* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcConnectionSurfaceGeometry > > list;
-    typedef IfcTemplatedEntityList< IfcConnectionSurfaceGeometry >::it it;
+    IfcConnectionSurfaceGeometry (IfcAbstractEntity* e);
+    IfcConnectionSurfaceGeometry (IfcSurfaceOrFaceSurface* v1_SurfaceOnRelatingElement, IfcSurfaceOrFaceSurface* v2_SurfaceOnRelatedElement);
+    typedef IfcTemplatedEntityList< IfcConnectionSurfaceGeometry > list;
 };
 /// IfcConnectionVolumeGeometry is used to describe the geometric constraints that facilitate the physical connection (or overlap) of two objects at a volume defined by a solid or closed shell. It is envisioned as a control that applies to the element connection or interference relationships.
 /// 
@@ -7447,25 +8696,24 @@ class IfcConnectionSurfaceGeometry : public IfcConnectionGeometry {
 class IfcConnectionVolumeGeometry : public IfcConnectionGeometry {
 public:
     /// Volume at which related object overlaps with the relating element, given in the LCS of the relating element.
-    IfcSolidOrShell VolumeOnRelatingElement();
-    void setVolumeOnRelatingElement(IfcSolidOrShell v);
+    IfcSolidOrShell* VolumeOnRelatingElement() const;
+    void setVolumeOnRelatingElement(IfcSolidOrShell* v);
     /// Whether the optional attribute VolumeOnRelatedElement is defined for this IfcConnectionVolumeGeometry
-    bool hasVolumeOnRelatedElement();
+    bool hasVolumeOnRelatedElement() const;
     /// Volume at which related object overlaps with the relating element, given in the LCS of the related element.
-    IfcSolidOrShell VolumeOnRelatedElement();
-    void setVolumeOnRelatedElement(IfcSolidOrShell v);
+    IfcSolidOrShell* VolumeOnRelatedElement() const;
+    void setVolumeOnRelatedElement(IfcSolidOrShell* v);
     virtual unsigned int getArgumentCount() const { return 2; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY; case 1: return IfcUtil::Argument_ENTITY; } return IfcConnectionGeometry::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcSolidOrShell; case 1: return Type::IfcSolidOrShell; } return IfcConnectionGeometry::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "VolumeOnRelatingElement"; case 1: return "VolumeOnRelatedElement"; } return IfcConnectionGeometry::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcConnectionVolumeGeometry (IfcAbstractEntityPtr e);
-    IfcConnectionVolumeGeometry (IfcSolidOrShell v1_VolumeOnRelatingElement, boost::optional< IfcSolidOrShell > v2_VolumeOnRelatedElement);
-    typedef IfcConnectionVolumeGeometry* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcConnectionVolumeGeometry > > list;
-    typedef IfcTemplatedEntityList< IfcConnectionVolumeGeometry >::it it;
+    IfcConnectionVolumeGeometry (IfcAbstractEntity* e);
+    IfcConnectionVolumeGeometry (IfcSolidOrShell* v1_VolumeOnRelatingElement, IfcSolidOrShell* v2_VolumeOnRelatedElement);
+    typedef IfcTemplatedEntityList< IfcConnectionVolumeGeometry > list;
 };
 /// An IfcConstraint is used to define a constraint or limiting value or boundary condition that may be applied to an object or to the value of a property.  
 /// 
@@ -7482,53 +8730,52 @@ class IfcConnectionVolumeGeometry : public IfcConnectionGeometry {
 class IfcConstraint : public IfcUtil::IfcBaseEntity {
 public:
     /// A name to be used for the constraint (e.g., ChillerCoefficientOfPerformance).
-    IfcLabel Name();
-    void setName(IfcLabel v);
+    std::string Name() const;
+    void setName(std::string v);
     /// Whether the optional attribute Description is defined for this IfcConstraint
-    bool hasDescription();
+    bool hasDescription() const;
     /// A description that may apply additional information about a constraint.
-    IfcText Description();
-    void setDescription(IfcText v);
+    std::string Description() const;
+    void setDescription(std::string v);
     /// Enumeration that qualifies the type of constraint.
-    IfcConstraintEnum::IfcConstraintEnum ConstraintGrade();
+    IfcConstraintEnum::IfcConstraintEnum ConstraintGrade() const;
     void setConstraintGrade(IfcConstraintEnum::IfcConstraintEnum v);
     /// Whether the optional attribute ConstraintSource is defined for this IfcConstraint
-    bool hasConstraintSource();
+    bool hasConstraintSource() const;
     /// Any source material, such as a code or standard, from which the constraint originated.
-    IfcLabel ConstraintSource();
-    void setConstraintSource(IfcLabel v);
+    std::string ConstraintSource() const;
+    void setConstraintSource(std::string v);
     /// Whether the optional attribute CreatingActor is defined for this IfcConstraint
-    bool hasCreatingActor();
+    bool hasCreatingActor() const;
     /// Person and/or organization that has created the constraint.
-    IfcActorSelect CreatingActor();
-    void setCreatingActor(IfcActorSelect v);
+    IfcActorSelect* CreatingActor() const;
+    void setCreatingActor(IfcActorSelect* v);
     /// Whether the optional attribute CreationTime is defined for this IfcConstraint
-    bool hasCreationTime();
+    bool hasCreationTime() const;
     /// Time when information specifying the constraint instance was created.
     /// 
     /// Note IFC2x4 CHANGE: Attribute data type changed to IfcDateTime using ISO 8601 representation
-    IfcDateTime CreationTime();
-    void setCreationTime(IfcDateTime v);
+    std::string CreationTime() const;
+    void setCreationTime(std::string v);
     /// Whether the optional attribute UserDefinedGrade is defined for this IfcConstraint
-    bool hasUserDefinedGrade();
+    bool hasUserDefinedGrade() const;
     /// Allows for specification of user defined grade of the constraint  beyond the enumeration values (hard, soft, advisory) provided by ConstraintGrade attribute of type IfcConstraintEnum. 
     /// When a value is provided for attribute UserDefinedGrade in parallel the attribute ConstraintGrade shall have enumeration value USERDEFINED.
-    IfcLabel UserDefinedGrade();
-    void setUserDefinedGrade(IfcLabel v);
+    std::string UserDefinedGrade() const;
+    void setUserDefinedGrade(std::string v);
     virtual unsigned int getArgumentCount() const { return 7; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_STRING; case 1: return IfcUtil::Argument_STRING; case 2: return IfcUtil::Argument_ENUMERATION; case 3: return IfcUtil::Argument_STRING; case 4: return IfcUtil::Argument_ENTITY; case 5: return IfcUtil::Argument_STRING; case 6: return IfcUtil::Argument_STRING; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcLabel; case 1: return Type::IfcText; case 2: return Type::IfcConstraintEnum; case 3: return Type::IfcLabel; case 4: return Type::IfcActorSelect; case 5: return Type::IfcDateTime; case 6: return Type::IfcLabel; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Name"; case 1: return "Description"; case 2: return "ConstraintGrade"; case 3: return "ConstraintSource"; case 4: return "CreatingActor"; case 5: return "CreationTime"; case 6: return "UserDefinedGrade"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcExternalReferenceRelationship > > HasExternalReferences(); // INVERSE IfcExternalReferenceRelationship::RelatedResourceObjects
-    SHARED_PTR< IfcTemplatedEntityList< IfcResourceConstraintRelationship > > PropertiesForConstraint(); // INVERSE IfcResourceConstraintRelationship::RelatingConstraint
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcExternalReferenceRelationship >::ptr HasExternalReferences() const; // INVERSE IfcExternalReferenceRelationship::RelatedResourceObjects
+    IfcTemplatedEntityList< IfcResourceConstraintRelationship >::ptr PropertiesForConstraint() const; // INVERSE IfcResourceConstraintRelationship::RelatingConstraint
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcConstraint (IfcAbstractEntityPtr e);
-    IfcConstraint (IfcLabel v1_Name, boost::optional< IfcText > v2_Description, IfcConstraintEnum::IfcConstraintEnum v3_ConstraintGrade, boost::optional< IfcLabel > v4_ConstraintSource, boost::optional< IfcActorSelect > v5_CreatingActor, boost::optional< IfcDateTime > v6_CreationTime, boost::optional< IfcLabel > v7_UserDefinedGrade);
-    typedef IfcConstraint* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcConstraint > > list;
-    typedef IfcTemplatedEntityList< IfcConstraint >::it it;
+    IfcConstraint (IfcAbstractEntity* e);
+    IfcConstraint (std::string v1_Name, boost::optional< std::string > v2_Description, IfcConstraintEnum::IfcConstraintEnum v3_ConstraintGrade, boost::optional< std::string > v4_ConstraintSource, IfcActorSelect* v5_CreatingActor, boost::optional< std::string > v6_CreationTime, boost::optional< std::string > v7_UserDefinedGrade);
+    typedef IfcTemplatedEntityList< IfcConstraint > list;
 };
 /// Definition from OpenGIS® Abstract Specification,
 ///   Topic 2: If the relationship between any two coordinate
@@ -7579,23 +8826,22 @@ class IfcConstraint : public IfcUtil::IfcBaseEntity {
 class IfcCoordinateOperation : public IfcUtil::IfcBaseEntity {
 public:
     /// Source coordinate reference system for the operation.
-    IfcCoordinateReferenceSystemSelect SourceCRS();
-    void setSourceCRS(IfcCoordinateReferenceSystemSelect v);
+    IfcCoordinateReferenceSystemSelect* SourceCRS() const;
+    void setSourceCRS(IfcCoordinateReferenceSystemSelect* v);
     /// Target coordinate reference system for the operation.
-    IfcCoordinateReferenceSystem* TargetCRS();
+    IfcCoordinateReferenceSystem* TargetCRS() const;
     void setTargetCRS(IfcCoordinateReferenceSystem* v);
     virtual unsigned int getArgumentCount() const { return 2; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY; case 1: return IfcUtil::Argument_ENTITY; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcCoordinateReferenceSystemSelect; case 1: return Type::IfcCoordinateReferenceSystem; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "SourceCRS"; case 1: return "TargetCRS"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcCoordinateOperation (IfcAbstractEntityPtr e);
-    IfcCoordinateOperation (IfcCoordinateReferenceSystemSelect v1_SourceCRS, IfcCoordinateReferenceSystem* v2_TargetCRS);
-    typedef IfcCoordinateOperation* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcCoordinateOperation > > list;
-    typedef IfcTemplatedEntityList< IfcCoordinateOperation >::it it;
+    IfcCoordinateOperation (IfcAbstractEntity* e);
+    IfcCoordinateOperation (IfcCoordinateReferenceSystemSelect* v1_SourceCRS, IfcCoordinateReferenceSystem* v2_TargetCRS);
+    typedef IfcTemplatedEntityList< IfcCoordinateOperation > list;
 };
 /// Definition from OpenGIS® Abstract Specification, Topic
 /// 2: A coordinate reference system is a coordinate system which
@@ -7622,43 +8868,42 @@ class IfcCoordinateOperation : public IfcUtil::IfcBaseEntity {
 class IfcCoordinateReferenceSystem : public IfcUtil::IfcBaseEntity {
 public:
     /// Whether the optional attribute Name is defined for this IfcCoordinateReferenceSystem
-    bool hasName();
+    bool hasName() const;
     /// Name by which the coordinate reference system is identified.
     /// Note  The name shall be taken from the list recognized by the European Petroleum Survey Group EPSG.
-    IfcLabel Name();
-    void setName(IfcLabel v);
+    std::string Name() const;
+    void setName(std::string v);
     /// Whether the optional attribute Description is defined for this IfcCoordinateReferenceSystem
-    bool hasDescription();
+    bool hasDescription() const;
     /// Informal description of this coordinate reference system.
-    IfcText Description();
-    void setDescription(IfcText v);
+    std::string Description() const;
+    void setDescription(std::string v);
     /// Name by which this datum is identified. The geodetic datum is associated with the coordinate reference system and indicates the shape and size of the rotation ellipsoid and this ellipsoid's connection and orientation to the actual globe/earth. Examples for geodetic datums include:
     /// 
     /// ED50
     ///   EUREF89
     ///   WSG84
-    IfcIdentifier GeodeticDatum();
-    void setGeodeticDatum(IfcIdentifier v);
+    std::string GeodeticDatum() const;
+    void setGeodeticDatum(std::string v);
     /// Whether the optional attribute VerticalDatum is defined for this IfcCoordinateReferenceSystem
-    bool hasVerticalDatum();
+    bool hasVerticalDatum() const;
     /// Name by which the vertical datum is identified. The vertical datum is associated with the height axis of the coordinate reference system and indicates the reference plane and fundamental point defining the origin of a height system. Examples for vertical datums include:
     /// 
     /// height above mean sea level at Dover in 1952
     ///   other sea levels
-    IfcIdentifier VerticalDatum();
-    void setVerticalDatum(IfcIdentifier v);
+    std::string VerticalDatum() const;
+    void setVerticalDatum(std::string v);
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_STRING; case 1: return IfcUtil::Argument_STRING; case 2: return IfcUtil::Argument_STRING; case 3: return IfcUtil::Argument_STRING; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcLabel; case 1: return Type::IfcText; case 2: return Type::IfcIdentifier; case 3: return Type::IfcIdentifier; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Name"; case 1: return "Description"; case 2: return "GeodeticDatum"; case 3: return "VerticalDatum"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcCoordinateReferenceSystem (IfcAbstractEntityPtr e);
-    IfcCoordinateReferenceSystem (boost::optional< IfcLabel > v1_Name, boost::optional< IfcText > v2_Description, IfcIdentifier v3_GeodeticDatum, boost::optional< IfcIdentifier > v4_VerticalDatum);
-    typedef IfcCoordinateReferenceSystem* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcCoordinateReferenceSystem > > list;
-    typedef IfcTemplatedEntityList< IfcCoordinateReferenceSystem >::it it;
+    IfcCoordinateReferenceSystem (IfcAbstractEntity* e);
+    IfcCoordinateReferenceSystem (boost::optional< std::string > v1_Name, boost::optional< std::string > v2_Description, std::string v3_GeodeticDatum, boost::optional< std::string > v4_VerticalDatum);
+    typedef IfcTemplatedEntityList< IfcCoordinateReferenceSystem > list;
 };
 /// IfcCostValue is an amount of money or a value that affects an amount of money. 
 /// 
@@ -7706,16 +8951,15 @@ class IfcCostValue : public IfcAppliedValue {
 public:
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcAppliedValue::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcAppliedValue::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcAppliedValue::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcCostValue (IfcAbstractEntityPtr e);
-    IfcCostValue (boost::optional< IfcLabel > v1_Name, boost::optional< IfcText > v2_Description, boost::optional< IfcAppliedValueSelect > v3_AppliedValue, IfcMeasureWithUnit* v4_UnitBasis, boost::optional< IfcDate > v5_ApplicableDate, boost::optional< IfcDate > v6_FixedUntilDate, boost::optional< IfcLabel > v7_Category, boost::optional< IfcLabel > v8_Condition, boost::optional< IfcArithmeticOperatorEnum::IfcArithmeticOperatorEnum > v9_ArithmeticOperator, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcAppliedValue > > > v10_Components);
-    typedef IfcCostValue* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcCostValue > > list;
-    typedef IfcTemplatedEntityList< IfcCostValue >::it it;
+    IfcCostValue (IfcAbstractEntity* e);
+    IfcCostValue (boost::optional< std::string > v1_Name, boost::optional< std::string > v2_Description, IfcAppliedValueSelect* v3_AppliedValue, IfcMeasureWithUnit* v4_UnitBasis, boost::optional< std::string > v5_ApplicableDate, boost::optional< std::string > v6_FixedUntilDate, boost::optional< std::string > v7_Category, boost::optional< std::string > v8_Condition, boost::optional< IfcArithmeticOperatorEnum::IfcArithmeticOperatorEnum > v9_ArithmeticOperator, boost::optional< IfcTemplatedEntityList< IfcAppliedValue >::ptr > v10_Components);
+    typedef IfcTemplatedEntityList< IfcCostValue > list;
 };
 /// Definition from ISO/CD 10303-41:1992: A derived unit is an expression of units.
 /// 
@@ -7727,27 +8971,26 @@ class IfcCostValue : public IfcAppliedValue {
 class IfcDerivedUnit : public IfcUtil::IfcBaseEntity {
 public:
     /// The group of units and their exponents that define the derived unit.
-    SHARED_PTR< IfcTemplatedEntityList< IfcDerivedUnitElement > > Elements();
-    void setElements(SHARED_PTR< IfcTemplatedEntityList< IfcDerivedUnitElement > > v);
+    IfcTemplatedEntityList< IfcDerivedUnitElement >::ptr Elements() const;
+    void setElements(IfcTemplatedEntityList< IfcDerivedUnitElement >::ptr v);
     /// Name of the derived unit chosen from an enumeration of derived unit types for use in IFC models.
-    IfcDerivedUnitEnum::IfcDerivedUnitEnum UnitType();
+    IfcDerivedUnitEnum::IfcDerivedUnitEnum UnitType() const;
     void setUnitType(IfcDerivedUnitEnum::IfcDerivedUnitEnum v);
     /// Whether the optional attribute UserDefinedType is defined for this IfcDerivedUnit
-    bool hasUserDefinedType();
-    IfcLabel UserDefinedType();
-    void setUserDefinedType(IfcLabel v);
+    bool hasUserDefinedType() const;
+    std::string UserDefinedType() const;
+    void setUserDefinedType(std::string v);
     virtual unsigned int getArgumentCount() const { return 3; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY_LIST; case 1: return IfcUtil::Argument_ENUMERATION; case 2: return IfcUtil::Argument_STRING; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcDerivedUnitElement; case 1: return Type::IfcDerivedUnitEnum; case 2: return Type::IfcLabel; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Elements"; case 1: return "UnitType"; case 2: return "UserDefinedType"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcDerivedUnit (IfcAbstractEntityPtr e);
-    IfcDerivedUnit (SHARED_PTR< IfcTemplatedEntityList< IfcDerivedUnitElement > > v1_Elements, IfcDerivedUnitEnum::IfcDerivedUnitEnum v2_UnitType, boost::optional< IfcLabel > v3_UserDefinedType);
-    typedef IfcDerivedUnit* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcDerivedUnit > > list;
-    typedef IfcTemplatedEntityList< IfcDerivedUnit >::it it;
+    IfcDerivedUnit (IfcAbstractEntity* e);
+    IfcDerivedUnit (IfcTemplatedEntityList< IfcDerivedUnitElement >::ptr v1_Elements, IfcDerivedUnitEnum::IfcDerivedUnitEnum v2_UnitType, boost::optional< std::string > v3_UserDefinedType);
+    typedef IfcTemplatedEntityList< IfcDerivedUnit > list;
 };
 /// Definition from ISO/CD 10303-41:1992: A derived unit element is one of the unit quantities 
 /// which makes up a derived unit.
@@ -7761,23 +9004,22 @@ class IfcDerivedUnit : public IfcUtil::IfcBaseEntity {
 class IfcDerivedUnitElement : public IfcUtil::IfcBaseEntity {
 public:
     /// The fixed quantity which is used as the mathematical factor.
-    IfcNamedUnit* Unit();
+    IfcNamedUnit* Unit() const;
     void setUnit(IfcNamedUnit* v);
     /// The power that is applied to the unit attribute.
-    int Exponent();
+    int Exponent() const;
     void setExponent(int v);
     virtual unsigned int getArgumentCount() const { return 2; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY; case 1: return IfcUtil::Argument_INT; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcNamedUnit; case 1: return Type::UNDEFINED; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Unit"; case 1: return "Exponent"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcDerivedUnitElement (IfcAbstractEntityPtr e);
+    IfcDerivedUnitElement (IfcAbstractEntity* e);
     IfcDerivedUnitElement (IfcNamedUnit* v1_Unit, int v2_Exponent);
-    typedef IfcDerivedUnitElement* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcDerivedUnitElement > > list;
-    typedef IfcTemplatedEntityList< IfcDerivedUnitElement >::it it;
+    typedef IfcTemplatedEntityList< IfcDerivedUnitElement > list;
 };
 /// Definition from ISO/CD 10303-41:1992: The dimensionality of any quantity can be expressed as a product of powers of the dimensions of base quantities. 
 /// The dimensional exponents entity defines the powers of the dimensions of the base quantities. All the physical 
@@ -7799,38 +9041,37 @@ class IfcDerivedUnitElement : public IfcUtil::IfcBaseEntity {
 class IfcDimensionalExponents : public IfcUtil::IfcBaseEntity {
 public:
     /// The power of the length base quantity.
-    int LengthExponent();
+    int LengthExponent() const;
     void setLengthExponent(int v);
     /// The power of the mass base quantity.
-    int MassExponent();
+    int MassExponent() const;
     void setMassExponent(int v);
     /// The power of the time base quantity.
-    int TimeExponent();
+    int TimeExponent() const;
     void setTimeExponent(int v);
     /// The power of the electric current base quantity.
-    int ElectricCurrentExponent();
+    int ElectricCurrentExponent() const;
     void setElectricCurrentExponent(int v);
     /// The power of the thermodynamic temperature base quantity.
-    int ThermodynamicTemperatureExponent();
+    int ThermodynamicTemperatureExponent() const;
     void setThermodynamicTemperatureExponent(int v);
     /// The power of the amount of substance base quantity.
-    int AmountOfSubstanceExponent();
+    int AmountOfSubstanceExponent() const;
     void setAmountOfSubstanceExponent(int v);
     /// The power of the luminous intensity base quantity.
-    int LuminousIntensityExponent();
+    int LuminousIntensityExponent() const;
     void setLuminousIntensityExponent(int v);
     virtual unsigned int getArgumentCount() const { return 7; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_INT; case 1: return IfcUtil::Argument_INT; case 2: return IfcUtil::Argument_INT; case 3: return IfcUtil::Argument_INT; case 4: return IfcUtil::Argument_INT; case 5: return IfcUtil::Argument_INT; case 6: return IfcUtil::Argument_INT; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::UNDEFINED; case 1: return Type::UNDEFINED; case 2: return Type::UNDEFINED; case 3: return Type::UNDEFINED; case 4: return Type::UNDEFINED; case 5: return Type::UNDEFINED; case 6: return Type::UNDEFINED; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "LengthExponent"; case 1: return "MassExponent"; case 2: return "TimeExponent"; case 3: return "ElectricCurrentExponent"; case 4: return "ThermodynamicTemperatureExponent"; case 5: return "AmountOfSubstanceExponent"; case 6: return "LuminousIntensityExponent"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcDimensionalExponents (IfcAbstractEntityPtr e);
+    IfcDimensionalExponents (IfcAbstractEntity* e);
     IfcDimensionalExponents (int v1_LengthExponent, int v2_MassExponent, int v3_TimeExponent, int v4_ElectricCurrentExponent, int v5_ThermodynamicTemperatureExponent, int v6_AmountOfSubstanceExponent, int v7_LuminousIntensityExponent);
-    typedef IfcDimensionalExponents* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcDimensionalExponents > > list;
-    typedef IfcTemplatedEntityList< IfcDimensionalExponents >::it it;
+    typedef IfcTemplatedEntityList< IfcDimensionalExponents > list;
 };
 /// An IfcExternalInformation is the identification of an information source that is not explicitly represented in the current model or in the project database (as an implementation of the current model). The IfcExternalInformation identifies the external source (classification, document, or library), but not the particular items such as a dictionary entry, a classification notation, or a document reference within the external source
 /// 
@@ -7842,16 +9083,15 @@ class IfcExternalInformation : public IfcUtil::IfcBaseEntity {
 public:
     virtual unsigned int getArgumentCount() const { return 0; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcExternalInformation (IfcAbstractEntityPtr e);
+    IfcExternalInformation (IfcAbstractEntity* e);
     IfcExternalInformation ();
-    typedef IfcExternalInformation* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcExternalInformation > > list;
-    typedef IfcTemplatedEntityList< IfcExternalInformation >::it it;
+    typedef IfcTemplatedEntityList< IfcExternalInformation > list;
 };
 /// An IfcExternalReference is the identification of information that is not explicitly represented in the current model or in the project database (as an implementation of the current model). Such information may be contained in classifications, documents or libraries. The IfcExternalReference identifies a particular item, such as a
 /// dictionary entry, a classification notation, or a document reference within the external source.
@@ -7865,14 +9105,14 @@ class IfcExternalInformation : public IfcUtil::IfcBaseEntity {
 class IfcExternalReference : public IfcUtil::IfcBaseEntity {
 public:
     /// Whether the optional attribute Location is defined for this IfcExternalReference
-    bool hasLocation();
+    bool hasLocation() const;
     /// Location, where the external source (classification, document or library) can be accessed by electronic means. The electronic location is provided as an URI, and would normally be given as an URL location string.
     /// 
     /// IFC2x4 CHANGE  The data type has been changed from IfcLabel to IfcURIReference.
-    IfcURIReference Location();
-    void setLocation(IfcURIReference v);
+    std::string Location() const;
+    void setLocation(std::string v);
     /// Whether the optional attribute Identification is defined for this IfcExternalReference
-    bool hasIdentification();
+    bool hasIdentification() const;
     /// The Identification provides a unique identifier of the referenced item within the external source (classification, document or library). It may be provided as 
     /// 
     /// a key, e.g. a classification notation, like NF2.3
@@ -7882,26 +9122,25 @@ class IfcExternalReference : public IfcUtil::IfcBaseEntity {
     /// It may be human readable (such as a key) or not (such as a handle or uuid) depending on the context of its usage (which has to be determined by local agreement).
     /// 
     /// IFC2x4 CHANGE  Attribute renamed from ItemReference for consistency.
-    IfcIdentifier Identification();
-    void setIdentification(IfcIdentifier v);
+    std::string Identification() const;
+    void setIdentification(std::string v);
     /// Whether the optional attribute Name is defined for this IfcExternalReference
-    bool hasName();
+    bool hasName() const;
     /// Optional name to further specify the reference. It can provide a human readable identifier (which does not necessarily need to have a counterpart in the internal structure of the document).
-    IfcLabel Name();
-    void setName(IfcLabel v);
+    std::string Name() const;
+    void setName(std::string v);
     virtual unsigned int getArgumentCount() const { return 3; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_STRING; case 1: return IfcUtil::Argument_STRING; case 2: return IfcUtil::Argument_STRING; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcURIReference; case 1: return Type::IfcIdentifier; case 2: return Type::IfcLabel; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Location"; case 1: return "Identification"; case 2: return "Name"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcExternalReferenceRelationship > > ExternalReferenceForResources(); // INVERSE IfcExternalReferenceRelationship::RelatingReference
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcExternalReferenceRelationship >::ptr ExternalReferenceForResources() const; // INVERSE IfcExternalReferenceRelationship::RelatingReference
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcExternalReference (IfcAbstractEntityPtr e);
-    IfcExternalReference (boost::optional< IfcURIReference > v1_Location, boost::optional< IfcIdentifier > v2_Identification, boost::optional< IfcLabel > v3_Name);
-    typedef IfcExternalReference* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcExternalReference > > list;
-    typedef IfcTemplatedEntityList< IfcExternalReference >::it it;
+    IfcExternalReference (IfcAbstractEntity* e);
+    IfcExternalReference (boost::optional< std::string > v1_Location, boost::optional< std::string > v2_Identification, boost::optional< std::string > v3_Name);
+    typedef IfcTemplatedEntityList< IfcExternalReference > list;
 };
 /// Definition from ISO/CD 10303-46:1992: The externally defined hatch style is an entity which makes an external reference to a hatching style.
 /// 
@@ -7915,16 +9154,15 @@ class IfcExternallyDefinedHatchStyle : public IfcExternalReference {
 public:
     virtual unsigned int getArgumentCount() const { return 3; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcExternalReference::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcExternalReference::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcExternalReference::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcExternallyDefinedHatchStyle (IfcAbstractEntityPtr e);
-    IfcExternallyDefinedHatchStyle (boost::optional< IfcURIReference > v1_Location, boost::optional< IfcIdentifier > v2_Identification, boost::optional< IfcLabel > v3_Name);
-    typedef IfcExternallyDefinedHatchStyle* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcExternallyDefinedHatchStyle > > list;
-    typedef IfcTemplatedEntityList< IfcExternallyDefinedHatchStyle >::it it;
+    IfcExternallyDefinedHatchStyle (IfcAbstractEntity* e);
+    IfcExternallyDefinedHatchStyle (boost::optional< std::string > v1_Location, boost::optional< std::string > v2_Identification, boost::optional< std::string > v3_Name);
+    typedef IfcTemplatedEntityList< IfcExternallyDefinedHatchStyle > list;
 };
 /// IfcExternallyDefinedSurfaceStyle is a definition of a surface style through referencing an external source, such as a material library for rendering information.
 /// 
@@ -7937,16 +9175,15 @@ class IfcExternallyDefinedSurfaceStyle : public IfcExternalReference {
 public:
     virtual unsigned int getArgumentCount() const { return 3; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcExternalReference::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcExternalReference::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcExternalReference::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcExternallyDefinedSurfaceStyle (IfcAbstractEntityPtr e);
-    IfcExternallyDefinedSurfaceStyle (boost::optional< IfcURIReference > v1_Location, boost::optional< IfcIdentifier > v2_Identification, boost::optional< IfcLabel > v3_Name);
-    typedef IfcExternallyDefinedSurfaceStyle* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcExternallyDefinedSurfaceStyle > > list;
-    typedef IfcTemplatedEntityList< IfcExternallyDefinedSurfaceStyle >::it it;
+    IfcExternallyDefinedSurfaceStyle (IfcAbstractEntity* e);
+    IfcExternallyDefinedSurfaceStyle (boost::optional< std::string > v1_Location, boost::optional< std::string > v2_Identification, boost::optional< std::string > v3_Name);
+    typedef IfcTemplatedEntityList< IfcExternallyDefinedSurfaceStyle > list;
 };
 /// Definition from ISO/CD 10303-46:1992: The externally defined text font is an external reference to a text font 
 /// 
@@ -7959,16 +9196,15 @@ class IfcExternallyDefinedTextFont : public IfcExternalReference {
 public:
     virtual unsigned int getArgumentCount() const { return 3; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcExternalReference::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcExternalReference::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcExternalReference::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcExternallyDefinedTextFont (IfcAbstractEntityPtr e);
-    IfcExternallyDefinedTextFont (boost::optional< IfcURIReference > v1_Location, boost::optional< IfcIdentifier > v2_Identification, boost::optional< IfcLabel > v3_Name);
-    typedef IfcExternallyDefinedTextFont* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcExternallyDefinedTextFont > > list;
-    typedef IfcTemplatedEntityList< IfcExternallyDefinedTextFont >::it it;
+    IfcExternallyDefinedTextFont (IfcAbstractEntity* e);
+    IfcExternallyDefinedTextFont (boost::optional< std::string > v1_Location, boost::optional< std::string > v2_Identification, boost::optional< std::string > v3_Name);
+    typedef IfcTemplatedEntityList< IfcExternallyDefinedTextFont > list;
 };
 /// An individual axis, IfcGridAxis, is defined in the context of a design grid.  The axis definition is based on a curve of dimensionality 2. The grid axis is positioned within the XY plane of the position coordinate system defined by the IfcDesignGrid.
 /// 
@@ -7996,32 +9232,31 @@ class IfcExternallyDefinedTextFont : public IfcExternalReference {
 class IfcGridAxis : public IfcUtil::IfcBaseEntity {
 public:
     /// Whether the optional attribute AxisTag is defined for this IfcGridAxis
-    bool hasAxisTag();
+    bool hasAxisTag() const;
     /// The tag or name for this grid axis.
-    IfcLabel AxisTag();
-    void setAxisTag(IfcLabel v);
+    std::string AxisTag() const;
+    void setAxisTag(std::string v);
     /// Underlying curve which provides the geometry for this grid axis.
-    IfcCurve* AxisCurve();
+    IfcCurve* AxisCurve() const;
     void setAxisCurve(IfcCurve* v);
     /// Defines whether the original sense of curve is used or whether it is reversed in the context of the grid axis.
-    IfcBoolean SameSense();
-    void setSameSense(IfcBoolean v);
+    bool SameSense() const;
+    void setSameSense(bool v);
     virtual unsigned int getArgumentCount() const { return 3; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_STRING; case 1: return IfcUtil::Argument_ENTITY; case 2: return IfcUtil::Argument_BOOL; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcLabel; case 1: return Type::IfcCurve; case 2: return Type::IfcBoolean; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "AxisTag"; case 1: return "AxisCurve"; case 2: return "SameSense"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcGrid > > PartOfW(); // INVERSE IfcGrid::WAxes
-    SHARED_PTR< IfcTemplatedEntityList< IfcGrid > > PartOfV(); // INVERSE IfcGrid::VAxes
-    SHARED_PTR< IfcTemplatedEntityList< IfcGrid > > PartOfU(); // INVERSE IfcGrid::UAxes
-    SHARED_PTR< IfcTemplatedEntityList< IfcVirtualGridIntersection > > HasIntersections(); // INVERSE IfcVirtualGridIntersection::IntersectingAxes
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcGrid >::ptr PartOfW() const; // INVERSE IfcGrid::WAxes
+    IfcTemplatedEntityList< IfcGrid >::ptr PartOfV() const; // INVERSE IfcGrid::VAxes
+    IfcTemplatedEntityList< IfcGrid >::ptr PartOfU() const; // INVERSE IfcGrid::UAxes
+    IfcTemplatedEntityList< IfcVirtualGridIntersection >::ptr HasIntersections() const; // INVERSE IfcVirtualGridIntersection::IntersectingAxes
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcGridAxis (IfcAbstractEntityPtr e);
-    IfcGridAxis (boost::optional< IfcLabel > v1_AxisTag, IfcCurve* v2_AxisCurve, IfcBoolean v3_SameSense);
-    typedef IfcGridAxis* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcGridAxis > > list;
-    typedef IfcTemplatedEntityList< IfcGridAxis >::it it;
+    IfcGridAxis (IfcAbstractEntity* e);
+    IfcGridAxis (boost::optional< std::string > v1_AxisTag, IfcCurve* v2_AxisCurve, bool v3_SameSense);
+    typedef IfcTemplatedEntityList< IfcGridAxis > list;
 };
 /// The IfcIrregularTimeSeriesValue describes a value (or set of values) at a particular time point. 
 /// 
@@ -8029,23 +9264,22 @@ class IfcGridAxis : public IfcUtil::IfcBaseEntity {
 class IfcIrregularTimeSeriesValue : public IfcUtil::IfcBaseEntity {
 public:
     /// The specification of the time point.
-    IfcDateTime TimeStamp();
-    void setTimeStamp(IfcDateTime v);
+    std::string TimeStamp() const;
+    void setTimeStamp(std::string v);
     /// A list of time-series values. At least one value is required.
-    SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > ListValues();
-    void setListValues(SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > v);
+    IfcEntityList::ptr ListValues() const;
+    void setListValues(IfcEntityList::ptr v);
     virtual unsigned int getArgumentCount() const { return 2; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_STRING; case 1: return IfcUtil::Argument_ENTITY_LIST; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcDateTime; case 1: return Type::IfcValue; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "TimeStamp"; case 1: return "ListValues"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcIrregularTimeSeriesValue (IfcAbstractEntityPtr e);
-    IfcIrregularTimeSeriesValue (IfcDateTime v1_TimeStamp, IfcEntities v2_ListValues);
-    typedef IfcIrregularTimeSeriesValue* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcIrregularTimeSeriesValue > > list;
-    typedef IfcTemplatedEntityList< IfcIrregularTimeSeriesValue >::it it;
+    IfcIrregularTimeSeriesValue (IfcAbstractEntity* e);
+    IfcIrregularTimeSeriesValue (std::string v1_TimeStamp, IfcEntityList::ptr v2_ListValues);
+    typedef IfcTemplatedEntityList< IfcIrregularTimeSeriesValue > list;
 };
 /// An IfcLibraryInformation describes a library where a library is a structured store of information, normally organized in a manner which allows information lookup through an index or reference value. IfcLibraryInformation provides the library Name and optional Version, VersionDate and Publisher attributes. A Location may be added for electronic access to the library.
 /// 
@@ -8058,50 +9292,49 @@ class IfcIrregularTimeSeriesValue : public IfcUtil::IfcBaseEntity {
 class IfcLibraryInformation : public IfcExternalInformation {
 public:
     /// The name which is used to identify the library.
-    IfcLabel Name();
-    void setName(IfcLabel v);
+    std::string Name() const;
+    void setName(std::string v);
     /// Whether the optional attribute Version is defined for this IfcLibraryInformation
-    bool hasVersion();
+    bool hasVersion() const;
     /// Identifier for the library version used for reference.
-    IfcLabel Version();
-    void setVersion(IfcLabel v);
+    std::string Version() const;
+    void setVersion(std::string v);
     /// Whether the optional attribute Publisher is defined for this IfcLibraryInformation
-    bool hasPublisher();
+    bool hasPublisher() const;
     /// Information of the organization that acts as the library publisher.
-    IfcActorSelect Publisher();
-    void setPublisher(IfcActorSelect v);
+    IfcActorSelect* Publisher() const;
+    void setPublisher(IfcActorSelect* v);
     /// Whether the optional attribute VersionDate is defined for this IfcLibraryInformation
-    bool hasVersionDate();
+    bool hasVersionDate() const;
     /// Date of the referenced version of the library.
     /// 
     /// IFC2x4 CHANGE  The data type has been changed to IfcDate, the date string according to ISO8601.
-    IfcDateTime VersionDate();
-    void setVersionDate(IfcDateTime v);
+    std::string VersionDate() const;
+    void setVersionDate(std::string v);
     /// Whether the optional attribute Location is defined for this IfcLibraryInformation
-    bool hasLocation();
+    bool hasLocation() const;
     /// Resource identifier or locator, provided as URI, URN or URL, of the library information for online references.
     /// 
     /// IFC2x4 CHANGE  New attribute added at the end of the attribute list.
-    IfcURIReference Location();
-    void setLocation(IfcURIReference v);
+    std::string Location() const;
+    void setLocation(std::string v);
     /// Whether the optional attribute Description is defined for this IfcLibraryInformation
-    bool hasDescription();
-    IfcText Description();
-    void setDescription(IfcText v);
+    bool hasDescription() const;
+    std::string Description() const;
+    void setDescription(std::string v);
     virtual unsigned int getArgumentCount() const { return 6; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_STRING; case 1: return IfcUtil::Argument_STRING; case 2: return IfcUtil::Argument_ENTITY; case 3: return IfcUtil::Argument_STRING; case 4: return IfcUtil::Argument_STRING; case 5: return IfcUtil::Argument_STRING; } return IfcExternalInformation::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcLabel; case 1: return Type::IfcLabel; case 2: return Type::IfcActorSelect; case 3: return Type::IfcDateTime; case 4: return Type::IfcURIReference; case 5: return Type::IfcText; } return IfcExternalInformation::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Name"; case 1: return "Version"; case 2: return "Publisher"; case 3: return "VersionDate"; case 4: return "Location"; case 5: return "Description"; } return IfcExternalInformation::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelAssociatesLibrary > > LibraryInfoForObjects(); // INVERSE IfcRelAssociatesLibrary::RelatingLibrary
-    SHARED_PTR< IfcTemplatedEntityList< IfcLibraryReference > > HasLibraryReferences(); // INVERSE IfcLibraryReference::ReferencedLibrary
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcRelAssociatesLibrary >::ptr LibraryInfoForObjects() const; // INVERSE IfcRelAssociatesLibrary::RelatingLibrary
+    IfcTemplatedEntityList< IfcLibraryReference >::ptr HasLibraryReferences() const; // INVERSE IfcLibraryReference::ReferencedLibrary
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcLibraryInformation (IfcAbstractEntityPtr e);
-    IfcLibraryInformation (IfcLabel v1_Name, boost::optional< IfcLabel > v2_Version, boost::optional< IfcActorSelect > v3_Publisher, boost::optional< IfcDateTime > v4_VersionDate, boost::optional< IfcURIReference > v5_Location, boost::optional< IfcText > v6_Description);
-    typedef IfcLibraryInformation* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcLibraryInformation > > list;
-    typedef IfcTemplatedEntityList< IfcLibraryInformation >::it it;
+    IfcLibraryInformation (IfcAbstractEntity* e);
+    IfcLibraryInformation (std::string v1_Name, boost::optional< std::string > v2_Version, IfcActorSelect* v3_Publisher, boost::optional< std::string > v4_VersionDate, boost::optional< std::string > v5_Location, boost::optional< std::string > v6_Description);
+    typedef IfcTemplatedEntityList< IfcLibraryInformation > list;
 };
 /// An IfcLibraryReference is a reference into a library of information by Location (provided as a URI). It also provides an optional inherited Identification key to allow more specific references to library sections or tables. The inherited Name attribute allows for a human interpretable identification of the library item. Also, general information on the library from which the reference is taken, is given by the ReferencedLibrary relation which identifies the relevant occurrence of IfcLibraryInformation.
 /// 
@@ -8113,37 +9346,36 @@ class IfcLibraryInformation : public IfcExternalInformation {
 class IfcLibraryReference : public IfcExternalReference {
 public:
     /// Whether the optional attribute Description is defined for this IfcLibraryReference
-    bool hasDescription();
+    bool hasDescription() const;
     /// Additional description provided for the library reference.
     /// 
     /// IFC2x4 CHANGE  New attribute added at the end of the attribute list.
-    IfcText Description();
-    void setDescription(IfcText v);
+    std::string Description() const;
+    void setDescription(std::string v);
     /// Whether the optional attribute Language is defined for this IfcLibraryReference
-    bool hasLanguage();
+    bool hasLanguage() const;
     /// The language in which a library reference is expressed.
     /// 
     /// IFC2x4 CHANGE  New attribute added at the end of the attribute list.
-    IfcLanguageId Language();
-    void setLanguage(IfcLanguageId v);
+    std::string Language() const;
+    void setLanguage(std::string v);
     /// Whether the optional attribute ReferencedLibrary is defined for this IfcLibraryReference
-    bool hasReferencedLibrary();
+    bool hasReferencedLibrary() const;
     /// The library information that is being referenced.
-    IfcLibraryInformation* ReferencedLibrary();
+    IfcLibraryInformation* ReferencedLibrary() const;
     void setReferencedLibrary(IfcLibraryInformation* v);
     virtual unsigned int getArgumentCount() const { return 6; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 3: return IfcUtil::Argument_STRING; case 4: return IfcUtil::Argument_STRING; case 5: return IfcUtil::Argument_ENTITY; } return IfcExternalReference::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 3: return Type::IfcText; case 4: return Type::IfcLanguageId; case 5: return Type::IfcLibraryInformation; } return IfcExternalReference::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 3: return "Description"; case 4: return "Language"; case 5: return "ReferencedLibrary"; } return IfcExternalReference::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelAssociatesLibrary > > LibraryRefForObjects(); // INVERSE IfcRelAssociatesLibrary::RelatingLibrary
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcRelAssociatesLibrary >::ptr LibraryRefForObjects() const; // INVERSE IfcRelAssociatesLibrary::RelatingLibrary
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcLibraryReference (IfcAbstractEntityPtr e);
-    IfcLibraryReference (boost::optional< IfcURIReference > v1_Location, boost::optional< IfcIdentifier > v2_Identification, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLanguageId > v5_Language, IfcLibraryInformation* v6_ReferencedLibrary);
-    typedef IfcLibraryReference* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcLibraryReference > > list;
-    typedef IfcTemplatedEntityList< IfcLibraryReference >::it it;
+    IfcLibraryReference (IfcAbstractEntity* e);
+    IfcLibraryReference (boost::optional< std::string > v1_Location, boost::optional< std::string > v2_Identification, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_Language, IfcLibraryInformation* v6_ReferencedLibrary);
+    typedef IfcTemplatedEntityList< IfcLibraryReference > list;
 };
 /// IfcLightDistributionData defines the luminous intensity of a light source given at a particular main plane angle. It is based on some standardized light distribution curves; the MainPlaneAngle is either the 
 /// 
@@ -8163,28 +9395,27 @@ class IfcLibraryReference : public IfcExternalReference {
 class IfcLightDistributionData : public IfcUtil::IfcBaseEntity {
 public:
     /// The main plane angle (A, B or C angles, according to the light distribution curve chosen).
-    IfcPlaneAngleMeasure MainPlaneAngle();
-    void setMainPlaneAngle(IfcPlaneAngleMeasure v);
+    double MainPlaneAngle() const;
+    void setMainPlaneAngle(double v);
     /// The list of secondary plane angles (the &#945;, &#946; or &#947; angles) according to the light distribution curve chosen.
     /// 
     /// NOTE: The SecondaryPlaneAngle and LuminousIntensity lists are corresponding lists.
-    std::vector< IfcPlaneAngleMeasure > /*[1:?]*/ SecondaryPlaneAngle();
-    void setSecondaryPlaneAngle(std::vector< IfcPlaneAngleMeasure > /*[1:?]*/ v);
+    std::vector< double > /*[1:?]*/ SecondaryPlaneAngle() const;
+    void setSecondaryPlaneAngle(std::vector< double > /*[1:?]*/ v);
     /// The luminous intensity distribution measure for this pair of main and secondary plane angles according to the light distribution curve chosen.
-    std::vector< IfcLuminousIntensityDistributionMeasure > /*[1:?]*/ LuminousIntensity();
-    void setLuminousIntensity(std::vector< IfcLuminousIntensityDistributionMeasure > /*[1:?]*/ v);
+    std::vector< double > /*[1:?]*/ LuminousIntensity() const;
+    void setLuminousIntensity(std::vector< double > /*[1:?]*/ v);
     virtual unsigned int getArgumentCount() const { return 3; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_DOUBLE; case 1: return IfcUtil::Argument_VECTOR_DOUBLE; case 2: return IfcUtil::Argument_VECTOR_DOUBLE; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcPlaneAngleMeasure; case 1: return Type::IfcPlaneAngleMeasure; case 2: return Type::IfcLuminousIntensityDistributionMeasure; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "MainPlaneAngle"; case 1: return "SecondaryPlaneAngle"; case 2: return "LuminousIntensity"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcLightDistributionData (IfcAbstractEntityPtr e);
-    IfcLightDistributionData (IfcPlaneAngleMeasure v1_MainPlaneAngle, std::vector< IfcPlaneAngleMeasure > /*[1:?]*/ v2_SecondaryPlaneAngle, std::vector< IfcLuminousIntensityDistributionMeasure > /*[1:?]*/ v3_LuminousIntensity);
-    typedef IfcLightDistributionData* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcLightDistributionData > > list;
-    typedef IfcTemplatedEntityList< IfcLightDistributionData >::it it;
+    IfcLightDistributionData (IfcAbstractEntity* e);
+    IfcLightDistributionData (double v1_MainPlaneAngle, std::vector< double > /*[1:?]*/ v2_SecondaryPlaneAngle, std::vector< double > /*[1:?]*/ v3_LuminousIntensity);
+    typedef IfcTemplatedEntityList< IfcLightDistributionData > list;
 };
 /// IfcLightIntensityDistribution defines the the luminous intensity of a light source that changes according to the direction of the ray. It is based on some standardized light distribution curves, which are defined by the LightDistributionCurve attribute. 
 /// 
@@ -8192,23 +9423,22 @@ class IfcLightDistributionData : public IfcUtil::IfcBaseEntity {
 class IfcLightIntensityDistribution : public IfcUtil::IfcBaseEntity {
 public:
     /// Standardized  light distribution curve used to define the luminous intensity of the light in all directions.
-    IfcLightDistributionCurveEnum::IfcLightDistributionCurveEnum LightDistributionCurve();
+    IfcLightDistributionCurveEnum::IfcLightDistributionCurveEnum LightDistributionCurve() const;
     void setLightDistributionCurve(IfcLightDistributionCurveEnum::IfcLightDistributionCurveEnum v);
     /// Light distribution data applied to the light source. It is defined by a list of main plane angles (B or C according to the light distribution curve chosen) that includes (for each B or C angle) a second list of secondary plane angles (the &#946; or &#947; angles) and the according luminous intensity distribution measures.
-    SHARED_PTR< IfcTemplatedEntityList< IfcLightDistributionData > > DistributionData();
-    void setDistributionData(SHARED_PTR< IfcTemplatedEntityList< IfcLightDistributionData > > v);
+    IfcTemplatedEntityList< IfcLightDistributionData >::ptr DistributionData() const;
+    void setDistributionData(IfcTemplatedEntityList< IfcLightDistributionData >::ptr v);
     virtual unsigned int getArgumentCount() const { return 2; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENUMERATION; case 1: return IfcUtil::Argument_ENTITY_LIST; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcLightDistributionCurveEnum; case 1: return Type::IfcLightDistributionData; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "LightDistributionCurve"; case 1: return "DistributionData"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcLightIntensityDistribution (IfcAbstractEntityPtr e);
-    IfcLightIntensityDistribution (IfcLightDistributionCurveEnum::IfcLightDistributionCurveEnum v1_LightDistributionCurve, SHARED_PTR< IfcTemplatedEntityList< IfcLightDistributionData > > v2_DistributionData);
-    typedef IfcLightIntensityDistribution* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcLightIntensityDistribution > > list;
-    typedef IfcTemplatedEntityList< IfcLightIntensityDistribution >::it it;
+    IfcLightIntensityDistribution (IfcAbstractEntity* e);
+    IfcLightIntensityDistribution (IfcLightDistributionCurveEnum::IfcLightDistributionCurveEnum v1_LightDistributionCurve, IfcTemplatedEntityList< IfcLightDistributionData >::ptr v2_DistributionData);
+    typedef IfcTemplatedEntityList< IfcLightIntensityDistribution > list;
 };
 /// The map conversion deals with transforming the local engineering coordinate system, often called world coordinate system, into the coordinate reference system of the underlying map.
 /// 
@@ -8225,47 +9455,46 @@ class IfcMapConversion : public IfcCoordinateOperation {
 public:
     /// Specifies the location along the easting of the coordinate system of the target map coordinate reference system.
     /// NOTE  for right-handed Cartesian coordinate systems this would establish the location along the x axis
-    IfcLengthMeasure Eastings();
-    void setEastings(IfcLengthMeasure v);
+    double Eastings() const;
+    void setEastings(double v);
     /// Specifies the location along the northing of the coordinate system of the target map coordinate reference system.
     /// NOTE  for right-handed Cartesian coordinate systems this would establish the location along the y axis
-    IfcLengthMeasure Northings();
-    void setNorthings(IfcLengthMeasure v);
+    double Northings() const;
+    void setNorthings(double v);
     /// Orthogonal height relativ to the vertical datum specified.
     /// NOTE  for right-handed Cartesian coordinate systems this would establish the location along the z axis
-    IfcLengthMeasure OrthogonalHeight();
-    void setOrthogonalHeight(IfcLengthMeasure v);
+    double OrthogonalHeight() const;
+    void setOrthogonalHeight(double v);
     /// Whether the optional attribute XAxisAbscissa is defined for this IfcMapConversion
-    bool hasXAxisAbscissa();
+    bool hasXAxisAbscissa() const;
     /// Specifies the value along the easing axis of the end point of a vector indicating the position of the local x axis of the engineering coordinate reference system.
     /// NOTE  for right-handed Cartesian coordinate systems this would establish the location along the x axis
     /// NOTE  together with the XAxisOrdinate it provides the direction of the local x axis within the horizontal plane of the map coordinate system
-    IfcReal XAxisAbscissa();
-    void setXAxisAbscissa(IfcReal v);
+    double XAxisAbscissa() const;
+    void setXAxisAbscissa(double v);
     /// Whether the optional attribute XAxisOrdinate is defined for this IfcMapConversion
-    bool hasXAxisOrdinate();
+    bool hasXAxisOrdinate() const;
     /// Specifies the value along the northing axis of the end point of a vector indicating the position of the local x axis of the engineering coordinate reference system.
     /// NOTE  for right-handed Cartesian coordinate systems this would establish the location along the y axis
     /// NOTE  together with the XAxisAbscissa it provides the direction of the local x axis within the horizontal plane of the map coordinate system
-    IfcReal XAxisOrdinate();
-    void setXAxisOrdinate(IfcReal v);
+    double XAxisOrdinate() const;
+    void setXAxisOrdinate(double v);
     /// Whether the optional attribute Scale is defined for this IfcMapConversion
-    bool hasScale();
+    bool hasScale() const;
     /// Scale to be used, when the units of the CRS are not identical to the units of the engineering coordinate system. If omited, the value of 1.0 is assumed.
-    IfcReal Scale();
-    void setScale(IfcReal v);
+    double Scale() const;
+    void setScale(double v);
     virtual unsigned int getArgumentCount() const { return 8; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 2: return IfcUtil::Argument_DOUBLE; case 3: return IfcUtil::Argument_DOUBLE; case 4: return IfcUtil::Argument_DOUBLE; case 5: return IfcUtil::Argument_DOUBLE; case 6: return IfcUtil::Argument_DOUBLE; case 7: return IfcUtil::Argument_DOUBLE; } return IfcCoordinateOperation::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 2: return Type::IfcLengthMeasure; case 3: return Type::IfcLengthMeasure; case 4: return Type::IfcLengthMeasure; case 5: return Type::IfcReal; case 6: return Type::IfcReal; case 7: return Type::IfcReal; } return IfcCoordinateOperation::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 2: return "Eastings"; case 3: return "Northings"; case 4: return "OrthogonalHeight"; case 5: return "XAxisAbscissa"; case 6: return "XAxisOrdinate"; case 7: return "Scale"; } return IfcCoordinateOperation::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcMapConversion (IfcAbstractEntityPtr e);
-    IfcMapConversion (IfcCoordinateReferenceSystemSelect v1_SourceCRS, IfcCoordinateReferenceSystem* v2_TargetCRS, IfcLengthMeasure v3_Eastings, IfcLengthMeasure v4_Northings, IfcLengthMeasure v5_OrthogonalHeight, boost::optional< IfcReal > v6_XAxisAbscissa, boost::optional< IfcReal > v7_XAxisOrdinate, boost::optional< IfcReal > v8_Scale);
-    typedef IfcMapConversion* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcMapConversion > > list;
-    typedef IfcTemplatedEntityList< IfcMapConversion >::it it;
+    IfcMapConversion (IfcAbstractEntity* e);
+    IfcMapConversion (IfcCoordinateReferenceSystemSelect* v1_SourceCRS, IfcCoordinateReferenceSystem* v2_TargetCRS, double v3_Eastings, double v4_Northings, double v5_OrthogonalHeight, boost::optional< double > v6_XAxisAbscissa, boost::optional< double > v7_XAxisOrdinate, boost::optional< double > v8_Scale);
+    typedef IfcTemplatedEntityList< IfcMapConversion > list;
 };
 /// IfcMaterialClassificationRelationship is a relationship assigning classifications to materials.
 /// 
@@ -8275,23 +9504,22 @@ class IfcMapConversion : public IfcCoordinateOperation {
 class IfcMaterialClassificationRelationship : public IfcUtil::IfcBaseEntity {
 public:
     /// The material classifications identifying the type of material.
-    SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > MaterialClassifications();
-    void setMaterialClassifications(SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > v);
+    IfcEntityList::ptr MaterialClassifications() const;
+    void setMaterialClassifications(IfcEntityList::ptr v);
     /// Material being classified.
-    IfcMaterial* ClassifiedMaterial();
+    IfcMaterial* ClassifiedMaterial() const;
     void setClassifiedMaterial(IfcMaterial* v);
     virtual unsigned int getArgumentCount() const { return 2; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY_LIST; case 1: return IfcUtil::Argument_ENTITY; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcClassificationSelect; case 1: return Type::IfcMaterial; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "MaterialClassifications"; case 1: return "ClassifiedMaterial"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcMaterialClassificationRelationship (IfcAbstractEntityPtr e);
-    IfcMaterialClassificationRelationship (IfcEntities v1_MaterialClassifications, IfcMaterial* v2_ClassifiedMaterial);
-    typedef IfcMaterialClassificationRelationship* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcMaterialClassificationRelationship > > list;
-    typedef IfcTemplatedEntityList< IfcMaterialClassificationRelationship >::it it;
+    IfcMaterialClassificationRelationship (IfcAbstractEntity* e);
+    IfcMaterialClassificationRelationship (IfcEntityList::ptr v1_MaterialClassifications, IfcMaterial* v2_ClassifiedMaterial);
+    typedef IfcTemplatedEntityList< IfcMaterialClassificationRelationship > list;
 };
 /// IfcMaterialDefinition is a general supertype for all
 /// material related information items in IFC that have common
@@ -8321,19 +9549,18 @@ class IfcMaterialDefinition : public IfcUtil::IfcBaseEntity {
 public:
     virtual unsigned int getArgumentCount() const { return 0; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelAssociatesMaterial > > AssociatedTo(); // INVERSE IfcRelAssociatesMaterial::RelatingMaterial
-    SHARED_PTR< IfcTemplatedEntityList< IfcExternalReferenceRelationship > > HasExternalReferences(); // INVERSE IfcExternalReferenceRelationship::RelatedResourceObjects
-    SHARED_PTR< IfcTemplatedEntityList< IfcMaterialProperties > > HasProperties(); // INVERSE IfcMaterialProperties::Material
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcRelAssociatesMaterial >::ptr AssociatedTo() const; // INVERSE IfcRelAssociatesMaterial::RelatingMaterial
+    IfcTemplatedEntityList< IfcExternalReferenceRelationship >::ptr HasExternalReferences() const; // INVERSE IfcExternalReferenceRelationship::RelatedResourceObjects
+    IfcTemplatedEntityList< IfcMaterialProperties >::ptr HasProperties() const; // INVERSE IfcMaterialProperties::Material
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcMaterialDefinition (IfcAbstractEntityPtr e);
+    IfcMaterialDefinition (IfcAbstractEntity* e);
     IfcMaterialDefinition ();
-    typedef IfcMaterialDefinition* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcMaterialDefinition > > list;
-    typedef IfcTemplatedEntityList< IfcMaterialDefinition >::it it;
+    typedef IfcTemplatedEntityList< IfcMaterialDefinition > list;
 };
 /// IfcMaterialLayer is a single and identifiable part of an element which is constructed of a number of layers (one or more). Each IfcMaterialLayer has a constant thickness and is located relative to the referencing IfcMaterialLayerSet along the MlsBase.
 /// 
@@ -8361,59 +9588,58 @@ class IfcMaterialDefinition : public IfcUtil::IfcBaseEntity {
 class IfcMaterialLayer : public IfcMaterialDefinition {
 public:
     /// Whether the optional attribute Material is defined for this IfcMaterialLayer
-    bool hasMaterial();
+    bool hasMaterial() const;
     /// Optional reference to the material from which the layer is constructed. Note that if this value is not given, it does not denote a layer with no material (an air gap), it only means that the material is not specified at that point.
-    IfcMaterial* Material();
+    IfcMaterial* Material() const;
     void setMaterial(IfcMaterial* v);
     /// The thickness of the material layer. The dimension is measured along the positive MlsDirection as specified in IfcMaterialLayerSet (that is mapped to AXIS-2, as specified in IfcMaterialLayerSetUsage for element occurrences supporting IfcMaterialLayerSetUsage.
     /// 
     /// NOTE  The attribute value can be 0. for material thicknesses very close to zero, such as for a membrane. Material layers with thickess 0. shall not be rendered in the geometric representation.
     /// 
     /// IFC2x4 CHANGE  The attribute datatype has been changed to IfcNonNegativeLengthMeasure allowing for 0. as thickness.
-    IfcNonNegativeLengthMeasure LayerThickness();
-    void setLayerThickness(IfcNonNegativeLengthMeasure v);
+    double LayerThickness() const;
+    void setLayerThickness(double v);
     /// Whether the optional attribute IsVentilated is defined for this IfcMaterialLayer
-    bool hasIsVentilated();
+    bool hasIsVentilated() const;
     /// Indication of whether the material layer represents an air layer (or cavity). 
     /// 
     /// set to TRUE if the material layer is an air gap and provides air exchange from the layer to the outside air.
     ///   set to UNKNOWN if the material layer is an air gap and does not provide air exchange (or when this information about air exchange of the air gap is not available).
     ///   set to FALSE if the material layer is a solid material layer (the default).
-    IfcLogical IsVentilated();
-    void setIsVentilated(IfcLogical v);
+    bool IsVentilated() const;
+    void setIsVentilated(bool v);
     /// Whether the optional attribute Name is defined for this IfcMaterialLayer
-    bool hasName();
+    bool hasName() const;
     /// The name by which the material layer is known.
-    IfcLabel Name();
-    void setName(IfcLabel v);
+    std::string Name() const;
+    void setName(std::string v);
     /// Whether the optional attribute Description is defined for this IfcMaterialLayer
-    bool hasDescription();
+    bool hasDescription() const;
     /// Definition of the material layer in more descriptive terms than given by attributes Name or Category.
-    IfcText Description();
-    void setDescription(IfcText v);
+    std::string Description() const;
+    void setDescription(std::string v);
     /// Whether the optional attribute Category is defined for this IfcMaterialLayer
-    bool hasCategory();
+    bool hasCategory() const;
     /// Category of the material layer, e.g. the role it has in the layer set it belongs to (such as 'load bearing', 'thermal insulation' etc.).
-    IfcLabel Category();
-    void setCategory(IfcLabel v);
+    std::string Category() const;
+    void setCategory(std::string v);
     /// Whether the optional attribute Priority is defined for this IfcMaterialLayer
-    bool hasPriority();
+    bool hasPriority() const;
     /// The relative priority of the layer, expressed as ratio measure, normalised to 0..1. Controls how layers intersect in connections and corners of building elements: a layer from one element protrudes into (i.e. displaces) a layer from another element in a joint of these elements if the former element's layer has higher priority than the latter. The priorty value for a material layer in an element has to be set and maintained by software applications, in relation to the material layers in connected elements. The usage has to be further specified for each element, especially to avoid simultanious use with IfcLayerOffset.
-    IfcNormalisedRatioMeasure Priority();
-    void setPriority(IfcNormalisedRatioMeasure v);
+    double Priority() const;
+    void setPriority(double v);
     virtual unsigned int getArgumentCount() const { return 7; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY; case 1: return IfcUtil::Argument_DOUBLE; case 2: return IfcUtil::Argument_BOOL; case 3: return IfcUtil::Argument_STRING; case 4: return IfcUtil::Argument_STRING; case 5: return IfcUtil::Argument_STRING; case 6: return IfcUtil::Argument_DOUBLE; } return IfcMaterialDefinition::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcMaterial; case 1: return Type::IfcNonNegativeLengthMeasure; case 2: return Type::IfcLogical; case 3: return Type::IfcLabel; case 4: return Type::IfcText; case 5: return Type::IfcLabel; case 6: return Type::IfcNormalisedRatioMeasure; } return IfcMaterialDefinition::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Material"; case 1: return "LayerThickness"; case 2: return "IsVentilated"; case 3: return "Name"; case 4: return "Description"; case 5: return "Category"; case 6: return "Priority"; } return IfcMaterialDefinition::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcMaterialLayerSet > > ToMaterialLayerSet(); // INVERSE IfcMaterialLayerSet::MaterialLayers
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcMaterialLayerSet >::ptr ToMaterialLayerSet() const; // INVERSE IfcMaterialLayerSet::MaterialLayers
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcMaterialLayer (IfcAbstractEntityPtr e);
-    IfcMaterialLayer (IfcMaterial* v1_Material, IfcNonNegativeLengthMeasure v2_LayerThickness, boost::optional< IfcLogical > v3_IsVentilated, boost::optional< IfcLabel > v4_Name, boost::optional< IfcText > v5_Description, boost::optional< IfcLabel > v6_Category, boost::optional< IfcNormalisedRatioMeasure > v7_Priority);
-    typedef IfcMaterialLayer* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcMaterialLayer > > list;
-    typedef IfcTemplatedEntityList< IfcMaterialLayer >::it it;
+    IfcMaterialLayer (IfcAbstractEntity* e);
+    IfcMaterialLayer (IfcMaterial* v1_Material, double v2_LayerThickness, boost::optional< bool > v3_IsVentilated, boost::optional< std::string > v4_Name, boost::optional< std::string > v5_Description, boost::optional< std::string > v6_Category, boost::optional< double > v7_Priority);
+    typedef IfcTemplatedEntityList< IfcMaterialLayer > list;
 };
 /// IfcMaterialLayerSet is a designation by which materials of an element constructed of a number of material layers is known and through which the relative positioning of individual layers can be expressed.
 /// 
@@ -8451,32 +9677,31 @@ class IfcMaterialLayer : public IfcMaterialDefinition {
 class IfcMaterialLayerSet : public IfcMaterialDefinition {
 public:
     /// Identification of the layers from which the material layer set is composed.
-    SHARED_PTR< IfcTemplatedEntityList< IfcMaterialLayer > > MaterialLayers();
-    void setMaterialLayers(SHARED_PTR< IfcTemplatedEntityList< IfcMaterialLayer > > v);
+    IfcTemplatedEntityList< IfcMaterialLayer >::ptr MaterialLayers() const;
+    void setMaterialLayers(IfcTemplatedEntityList< IfcMaterialLayer >::ptr v);
     /// Whether the optional attribute LayerSetName is defined for this IfcMaterialLayerSet
-    bool hasLayerSetName();
+    bool hasLayerSetName() const;
     /// The name by which the material layer set is known.
-    IfcLabel LayerSetName();
-    void setLayerSetName(IfcLabel v);
+    std::string LayerSetName() const;
+    void setLayerSetName(std::string v);
     /// Whether the optional attribute Description is defined for this IfcMaterialLayerSet
-    bool hasDescription();
+    bool hasDescription() const;
     /// Definition of the material layer set in descriptive terms.
     /// 
     /// IFC2x4 CHANGE  The attribute has been added at the end of attribute list.
-    IfcText Description();
-    void setDescription(IfcText v);
+    std::string Description() const;
+    void setDescription(std::string v);
     virtual unsigned int getArgumentCount() const { return 3; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY_LIST; case 1: return IfcUtil::Argument_STRING; case 2: return IfcUtil::Argument_STRING; } return IfcMaterialDefinition::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcMaterialLayer; case 1: return Type::IfcLabel; case 2: return Type::IfcText; } return IfcMaterialDefinition::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "MaterialLayers"; case 1: return "LayerSetName"; case 2: return "Description"; } return IfcMaterialDefinition::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcMaterialLayerSet (IfcAbstractEntityPtr e);
-    IfcMaterialLayerSet (SHARED_PTR< IfcTemplatedEntityList< IfcMaterialLayer > > v1_MaterialLayers, boost::optional< IfcLabel > v2_LayerSetName, boost::optional< IfcText > v3_Description);
-    typedef IfcMaterialLayerSet* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcMaterialLayerSet > > list;
-    typedef IfcTemplatedEntityList< IfcMaterialLayerSet >::it it;
+    IfcMaterialLayerSet (IfcAbstractEntity* e);
+    IfcMaterialLayerSet (IfcTemplatedEntityList< IfcMaterialLayer >::ptr v1_MaterialLayers, boost::optional< std::string > v2_LayerSetName, boost::optional< std::string > v3_Description);
+    typedef IfcTemplatedEntityList< IfcMaterialLayerSet > list;
 };
 /// IfcMaterialLayerWithOffsets is a specialization of IfcMaterialLayer enabling definition
 /// of offset values along edges (within the material layer set usage in parent layer set).
@@ -8524,23 +9749,22 @@ class IfcMaterialLayerSet : public IfcMaterialDefinition {
 class IfcMaterialLayerWithOffsets : public IfcMaterialLayer {
 public:
     /// Orientation of the offset; shall be perpendicular to the parent layer set direction.
-    IfcLayerSetDirectionEnum::IfcLayerSetDirectionEnum OffsetDirection();
+    IfcLayerSetDirectionEnum::IfcLayerSetDirectionEnum OffsetDirection() const;
     void setOffsetDirection(IfcLayerSetDirectionEnum::IfcLayerSetDirectionEnum v);
     /// The numerical value of layer offset, in the direction of the axis assigned by the attribute OffsetDirection. The OffsetValues[1] identifies the offset from the lower position along the axis direction (normally the start of the standard extrusion), the OffsetValues[2] identifies the offset from the upper position along the axis direction (normally the end of the standard extrusion),
-    std::vector< IfcLengthMeasure > /*[1:2]*/ OffsetValues();
-    void setOffsetValues(std::vector< IfcLengthMeasure > /*[1:2]*/ v);
+    std::vector< double > /*[1:2]*/ OffsetValues() const;
+    void setOffsetValues(std::vector< double > /*[1:2]*/ v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 7: return IfcUtil::Argument_ENUMERATION; case 8: return IfcUtil::Argument_VECTOR_DOUBLE; } return IfcMaterialLayer::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 7: return Type::IfcLayerSetDirectionEnum; case 8: return Type::IfcLengthMeasure; } return IfcMaterialLayer::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 7: return "OffsetDirection"; case 8: return "OffsetValues"; } return IfcMaterialLayer::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcMaterialLayerWithOffsets (IfcAbstractEntityPtr e);
-    IfcMaterialLayerWithOffsets (IfcMaterial* v1_Material, IfcNonNegativeLengthMeasure v2_LayerThickness, boost::optional< IfcLogical > v3_IsVentilated, boost::optional< IfcLabel > v4_Name, boost::optional< IfcText > v5_Description, boost::optional< IfcLabel > v6_Category, boost::optional< IfcNormalisedRatioMeasure > v7_Priority, IfcLayerSetDirectionEnum::IfcLayerSetDirectionEnum v8_OffsetDirection, std::vector< IfcLengthMeasure > /*[1:2]*/ v9_OffsetValues);
-    typedef IfcMaterialLayerWithOffsets* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcMaterialLayerWithOffsets > > list;
-    typedef IfcTemplatedEntityList< IfcMaterialLayerWithOffsets >::it it;
+    IfcMaterialLayerWithOffsets (IfcAbstractEntity* e);
+    IfcMaterialLayerWithOffsets (IfcMaterial* v1_Material, double v2_LayerThickness, boost::optional< bool > v3_IsVentilated, boost::optional< std::string > v4_Name, boost::optional< std::string > v5_Description, boost::optional< std::string > v6_Category, boost::optional< double > v7_Priority, IfcLayerSetDirectionEnum::IfcLayerSetDirectionEnum v8_OffsetDirection, std::vector< double > /*[1:2]*/ v9_OffsetValues);
+    typedef IfcTemplatedEntityList< IfcMaterialLayerWithOffsets > list;
 };
 /// IfcMaterialList is a list of the different materials
 /// that are used in an element.
@@ -8562,20 +9786,19 @@ class IfcMaterialLayerWithOffsets : public IfcMaterialLayer {
 class IfcMaterialList : public IfcUtil::IfcBaseEntity {
 public:
     /// Materials used in a composition of substances.
-    SHARED_PTR< IfcTemplatedEntityList< IfcMaterial > > Materials();
-    void setMaterials(SHARED_PTR< IfcTemplatedEntityList< IfcMaterial > > v);
+    IfcTemplatedEntityList< IfcMaterial >::ptr Materials() const;
+    void setMaterials(IfcTemplatedEntityList< IfcMaterial >::ptr v);
     virtual unsigned int getArgumentCount() const { return 1; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY_LIST; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcMaterial; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Materials"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcMaterialList (IfcAbstractEntityPtr e);
-    IfcMaterialList (SHARED_PTR< IfcTemplatedEntityList< IfcMaterial > > v1_Materials);
-    typedef IfcMaterialList* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcMaterialList > > list;
-    typedef IfcTemplatedEntityList< IfcMaterialList >::it it;
+    IfcMaterialList (IfcAbstractEntity* e);
+    IfcMaterialList (IfcTemplatedEntityList< IfcMaterial >::ptr v1_Materials);
+    typedef IfcTemplatedEntityList< IfcMaterialList > list;
 };
 /// IfcMaterialProfile is a single and identifiable part of an element which is constructed of a number of profiles (one or more).
 /// 
@@ -8585,46 +9808,45 @@ class IfcMaterialList : public IfcUtil::IfcBaseEntity {
 class IfcMaterialProfile : public IfcMaterialDefinition {
 public:
     /// Whether the optional attribute Name is defined for this IfcMaterialProfile
-    bool hasName();
+    bool hasName() const;
     /// The name by which the material profile is known.
-    IfcLabel Name();
-    void setName(IfcLabel v);
+    std::string Name() const;
+    void setName(std::string v);
     /// Whether the optional attribute Description is defined for this IfcMaterialProfile
-    bool hasDescription();
+    bool hasDescription() const;
     /// Definition of the material profile in descriptive terms.
-    IfcText Description();
-    void setDescription(IfcText v);
+    std::string Description() const;
+    void setDescription(std::string v);
     /// Whether the optional attribute Material is defined for this IfcMaterialProfile
-    bool hasMaterial();
+    bool hasMaterial() const;
     /// Optional reference to the material from which the profile is constructed.
-    IfcMaterial* Material();
+    IfcMaterial* Material() const;
     void setMaterial(IfcMaterial* v);
     /// Identification of the profile for which this material profile is associating material.
-    IfcProfileDef* Profile();
+    IfcProfileDef* Profile() const;
     void setProfile(IfcProfileDef* v);
     /// Whether the optional attribute Priority is defined for this IfcMaterialProfile
-    bool hasPriority();
+    bool hasPriority() const;
     /// The relative priority of the profile, expressed as ratio measure, normalised to 0..1. Controls how profiles intersect in connections and corners of building elements: a profile from one element protrudes into (i.e. displaces) a profile from another element in a joint of these elements if the former element's profile has higher priority than the latter. The priorty value for a material profile in an element has to be set and maintained by software applications, in relation to the material profiles in connected elements.
-    IfcNormalisedRatioMeasure Priority();
-    void setPriority(IfcNormalisedRatioMeasure v);
+    double Priority() const;
+    void setPriority(double v);
     /// Whether the optional attribute Category is defined for this IfcMaterialProfile
-    bool hasCategory();
+    bool hasCategory() const;
     /// Category of the material profile, e.g. the role it has in the profile set it belongs to.
-    IfcLabel Category();
-    void setCategory(IfcLabel v);
+    std::string Category() const;
+    void setCategory(std::string v);
     virtual unsigned int getArgumentCount() const { return 6; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_STRING; case 1: return IfcUtil::Argument_STRING; case 2: return IfcUtil::Argument_ENTITY; case 3: return IfcUtil::Argument_ENTITY; case 4: return IfcUtil::Argument_DOUBLE; case 5: return IfcUtil::Argument_STRING; } return IfcMaterialDefinition::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcLabel; case 1: return Type::IfcText; case 2: return Type::IfcMaterial; case 3: return Type::IfcProfileDef; case 4: return Type::IfcNormalisedRatioMeasure; case 5: return Type::IfcLabel; } return IfcMaterialDefinition::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Name"; case 1: return "Description"; case 2: return "Material"; case 3: return "Profile"; case 4: return "Priority"; case 5: return "Category"; } return IfcMaterialDefinition::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcMaterialProfileSet > > ToMaterialProfileSet(); // INVERSE IfcMaterialProfileSet::MaterialProfiles
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcMaterialProfileSet >::ptr ToMaterialProfileSet() const; // INVERSE IfcMaterialProfileSet::MaterialProfiles
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcMaterialProfile (IfcAbstractEntityPtr e);
-    IfcMaterialProfile (boost::optional< IfcLabel > v1_Name, boost::optional< IfcText > v2_Description, IfcMaterial* v3_Material, IfcProfileDef* v4_Profile, boost::optional< IfcNormalisedRatioMeasure > v5_Priority, boost::optional< IfcLabel > v6_Category);
-    typedef IfcMaterialProfile* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcMaterialProfile > > list;
-    typedef IfcTemplatedEntityList< IfcMaterialProfile >::it it;
+    IfcMaterialProfile (IfcAbstractEntity* e);
+    IfcMaterialProfile (boost::optional< std::string > v1_Name, boost::optional< std::string > v2_Description, IfcMaterial* v3_Material, IfcProfileDef* v4_Profile, boost::optional< double > v5_Priority, boost::optional< std::string > v6_Category);
+    typedef IfcTemplatedEntityList< IfcMaterialProfile > list;
 };
 /// IfcMaterialProfileSet is a designation by which individual material(s) of a prismatic element (for example, beam or column) constructed of a single or multiple material profiles is known. If only a single material profile is used (the most typical case) then no CompositeProfile is asserted.
 /// 
@@ -8634,38 +9856,37 @@ class IfcMaterialProfile : public IfcMaterialDefinition {
 class IfcMaterialProfileSet : public IfcMaterialDefinition {
 public:
     /// Whether the optional attribute Name is defined for this IfcMaterialProfileSet
-    bool hasName();
+    bool hasName() const;
     /// The name by which the material profile set is known.
-    IfcLabel Name();
-    void setName(IfcLabel v);
+    std::string Name() const;
+    void setName(std::string v);
     /// Whether the optional attribute Description is defined for this IfcMaterialProfileSet
-    bool hasDescription();
+    bool hasDescription() const;
     /// Definition of the material profile set in descriptive terms.
-    IfcText Description();
-    void setDescription(IfcText v);
+    std::string Description() const;
+    void setDescription(std::string v);
     /// Identification of the profiles from which the material profile set is composed.
-    SHARED_PTR< IfcTemplatedEntityList< IfcMaterialProfile > > MaterialProfiles();
-    void setMaterialProfiles(SHARED_PTR< IfcTemplatedEntityList< IfcMaterialProfile > > v);
+    IfcTemplatedEntityList< IfcMaterialProfile >::ptr MaterialProfiles() const;
+    void setMaterialProfiles(IfcTemplatedEntityList< IfcMaterialProfile >::ptr v);
     /// Whether the optional attribute CompositeProfile is defined for this IfcMaterialProfileSet
-    bool hasCompositeProfile();
+    bool hasCompositeProfile() const;
     /// Reference to the composite profile definition for which this material profile set associates material to each of its individual profile. 
     /// 
     /// NOTE   
     /// The referenced IfcCompositeProfileDef instance shall be composed of all of the IfcProfileDef instances which are used via the MaterialProfiles list in the current IfcMaterialProfileSet .
-    IfcCompositeProfileDef* CompositeProfile();
+    IfcCompositeProfileDef* CompositeProfile() const;
     void setCompositeProfile(IfcCompositeProfileDef* v);
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_STRING; case 1: return IfcUtil::Argument_STRING; case 2: return IfcUtil::Argument_ENTITY_LIST; case 3: return IfcUtil::Argument_ENTITY; } return IfcMaterialDefinition::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcLabel; case 1: return Type::IfcText; case 2: return Type::IfcMaterialProfile; case 3: return Type::IfcCompositeProfileDef; } return IfcMaterialDefinition::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Name"; case 1: return "Description"; case 2: return "MaterialProfiles"; case 3: return "CompositeProfile"; } return IfcMaterialDefinition::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcMaterialProfileSet (IfcAbstractEntityPtr e);
-    IfcMaterialProfileSet (boost::optional< IfcLabel > v1_Name, boost::optional< IfcText > v2_Description, SHARED_PTR< IfcTemplatedEntityList< IfcMaterialProfile > > v3_MaterialProfiles, IfcCompositeProfileDef* v4_CompositeProfile);
-    typedef IfcMaterialProfileSet* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcMaterialProfileSet > > list;
-    typedef IfcTemplatedEntityList< IfcMaterialProfileSet >::it it;
+    IfcMaterialProfileSet (IfcAbstractEntity* e);
+    IfcMaterialProfileSet (boost::optional< std::string > v1_Name, boost::optional< std::string > v2_Description, IfcTemplatedEntityList< IfcMaterialProfile >::ptr v3_MaterialProfiles, IfcCompositeProfileDef* v4_CompositeProfile);
+    typedef IfcTemplatedEntityList< IfcMaterialProfileSet > list;
 };
 /// IfcMaterialProfileWithOffsets is a specialization of IfcMaterialProfile enabling definition offset values for profile start or end in its use in parent material profile set usage.
 /// 
@@ -8675,20 +9896,19 @@ class IfcMaterialProfileSet : public IfcMaterialDefinition {
 class IfcMaterialProfileWithOffsets : public IfcMaterialProfile {
 public:
     /// The numerical value of profile offset, in the direction of the axis direction - always AXIS1 i.e. the axis along the extrusion path. The OffsetValues[1] identifies the offset from the lower position along the axis direction (normally the start of the standard extrusion), the OffsetValues[2] identifies the offset from the upper position along the axis direction (normally the end of the standard extrusion),
-    std::vector< IfcLengthMeasure > /*[1:2]*/ OffsetValues();
-    void setOffsetValues(std::vector< IfcLengthMeasure > /*[1:2]*/ v);
+    std::vector< double > /*[1:2]*/ OffsetValues() const;
+    void setOffsetValues(std::vector< double > /*[1:2]*/ v);
     virtual unsigned int getArgumentCount() const { return 7; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 6: return IfcUtil::Argument_VECTOR_DOUBLE; } return IfcMaterialProfile::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 6: return Type::IfcLengthMeasure; } return IfcMaterialProfile::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 6: return "OffsetValues"; } return IfcMaterialProfile::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcMaterialProfileWithOffsets (IfcAbstractEntityPtr e);
-    IfcMaterialProfileWithOffsets (boost::optional< IfcLabel > v1_Name, boost::optional< IfcText > v2_Description, IfcMaterial* v3_Material, IfcProfileDef* v4_Profile, boost::optional< IfcNormalisedRatioMeasure > v5_Priority, boost::optional< IfcLabel > v6_Category, std::vector< IfcLengthMeasure > /*[1:2]*/ v7_OffsetValues);
-    typedef IfcMaterialProfileWithOffsets* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcMaterialProfileWithOffsets > > list;
-    typedef IfcTemplatedEntityList< IfcMaterialProfileWithOffsets >::it it;
+    IfcMaterialProfileWithOffsets (IfcAbstractEntity* e);
+    IfcMaterialProfileWithOffsets (boost::optional< std::string > v1_Name, boost::optional< std::string > v2_Description, IfcMaterial* v3_Material, IfcProfileDef* v4_Profile, boost::optional< double > v5_Priority, boost::optional< std::string > v6_Category, std::vector< double > /*[1:2]*/ v7_OffsetValues);
+    typedef IfcTemplatedEntityList< IfcMaterialProfileWithOffsets > list;
 };
 /// IfcMaterialUsageDefinition is a general supertype for all
 /// material related information items in IFC that have occurrence
@@ -8725,17 +9945,16 @@ class IfcMaterialUsageDefinition : public IfcUtil::IfcBaseEntity {
 public:
     virtual unsigned int getArgumentCount() const { return 0; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelAssociatesMaterial > > AssociatedTo(); // INVERSE IfcRelAssociatesMaterial::RelatingMaterial
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcRelAssociatesMaterial >::ptr AssociatedTo() const; // INVERSE IfcRelAssociatesMaterial::RelatingMaterial
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcMaterialUsageDefinition (IfcAbstractEntityPtr e);
+    IfcMaterialUsageDefinition (IfcAbstractEntity* e);
     IfcMaterialUsageDefinition ();
-    typedef IfcMaterialUsageDefinition* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcMaterialUsageDefinition > > list;
-    typedef IfcTemplatedEntityList< IfcMaterialUsageDefinition >::it it;
+    typedef IfcTemplatedEntityList< IfcMaterialUsageDefinition > list;
 };
 /// Definition from ISO/CD 10303-41:1992: A measure with unit is the specification of a physical quantity  as defined in ISO 31 (clause 2).
 /// 
@@ -8750,23 +9969,22 @@ class IfcMaterialUsageDefinition : public IfcUtil::IfcBaseEntity {
 class IfcMeasureWithUnit : public IfcUtil::IfcBaseEntity {
 public:
     /// The value of the physical quantity when expressed in the specified units.
-    IfcValue ValueComponent();
-    void setValueComponent(IfcValue v);
+    IfcValue* ValueComponent() const;
+    void setValueComponent(IfcValue* v);
     /// The unit in which the physical quantity is expressed.
-    IfcUnit UnitComponent();
-    void setUnitComponent(IfcUnit v);
+    IfcUnit* UnitComponent() const;
+    void setUnitComponent(IfcUnit* v);
     virtual unsigned int getArgumentCount() const { return 2; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY; case 1: return IfcUtil::Argument_ENTITY; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcValue; case 1: return Type::IfcUnit; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "ValueComponent"; case 1: return "UnitComponent"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcMeasureWithUnit (IfcAbstractEntityPtr e);
-    IfcMeasureWithUnit (IfcValue v1_ValueComponent, IfcUnit v2_UnitComponent);
-    typedef IfcMeasureWithUnit* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcMeasureWithUnit > > list;
-    typedef IfcTemplatedEntityList< IfcMeasureWithUnit >::it it;
+    IfcMeasureWithUnit (IfcAbstractEntity* e);
+    IfcMeasureWithUnit (IfcValue* v1_ValueComponent, IfcUnit* v2_UnitComponent);
+    typedef IfcTemplatedEntityList< IfcMeasureWithUnit > list;
 };
 /// An IfcMetric is used to capture quantitative resultant metrics that can be applied to objectives. 
 /// 
@@ -8823,32 +10041,31 @@ class IfcMeasureWithUnit : public IfcUtil::IfcBaseEntity {
 class IfcMetric : public IfcConstraint {
 public:
     /// Enumeration that identifies the type of benchmark data.
-    IfcBenchmarkEnum::IfcBenchmarkEnum Benchmark();
+    IfcBenchmarkEnum::IfcBenchmarkEnum Benchmark() const;
     void setBenchmark(IfcBenchmarkEnum::IfcBenchmarkEnum v);
     /// Whether the optional attribute ValueSource is defined for this IfcMetric
-    bool hasValueSource();
+    bool hasValueSource() const;
     /// Reference source for data values.
-    IfcLabel ValueSource();
-    void setValueSource(IfcLabel v);
+    std::string ValueSource() const;
+    void setValueSource(std::string v);
     /// The value with data type defined by the underlying type accesses via IfcMetricValueSelect.
-    IfcMetricValueSelect DataValue();
-    void setDataValue(IfcMetricValueSelect v);
+    IfcMetricValueSelect* DataValue() const;
+    void setDataValue(IfcMetricValueSelect* v);
     /// Whether the optional attribute ReferencePath is defined for this IfcMetric
-    bool hasReferencePath();
-    IfcReference* ReferencePath();
+    bool hasReferencePath() const;
+    IfcReference* ReferencePath() const;
     void setReferencePath(IfcReference* v);
     virtual unsigned int getArgumentCount() const { return 11; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 7: return IfcUtil::Argument_ENUMERATION; case 8: return IfcUtil::Argument_STRING; case 9: return IfcUtil::Argument_ENTITY; case 10: return IfcUtil::Argument_ENTITY; } return IfcConstraint::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 7: return Type::IfcBenchmarkEnum; case 8: return Type::IfcLabel; case 9: return Type::IfcMetricValueSelect; case 10: return Type::IfcReference; } return IfcConstraint::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 7: return "Benchmark"; case 8: return "ValueSource"; case 9: return "DataValue"; case 10: return "ReferencePath"; } return IfcConstraint::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcMetric (IfcAbstractEntityPtr e);
-    IfcMetric (IfcLabel v1_Name, boost::optional< IfcText > v2_Description, IfcConstraintEnum::IfcConstraintEnum v3_ConstraintGrade, boost::optional< IfcLabel > v4_ConstraintSource, boost::optional< IfcActorSelect > v5_CreatingActor, boost::optional< IfcDateTime > v6_CreationTime, boost::optional< IfcLabel > v7_UserDefinedGrade, IfcBenchmarkEnum::IfcBenchmarkEnum v8_Benchmark, boost::optional< IfcLabel > v9_ValueSource, IfcMetricValueSelect v10_DataValue, IfcReference* v11_ReferencePath);
-    typedef IfcMetric* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcMetric > > list;
-    typedef IfcTemplatedEntityList< IfcMetric >::it it;
+    IfcMetric (IfcAbstractEntity* e);
+    IfcMetric (std::string v1_Name, boost::optional< std::string > v2_Description, IfcConstraintEnum::IfcConstraintEnum v3_ConstraintGrade, boost::optional< std::string > v4_ConstraintSource, IfcActorSelect* v5_CreatingActor, boost::optional< std::string > v6_CreationTime, boost::optional< std::string > v7_UserDefinedGrade, IfcBenchmarkEnum::IfcBenchmarkEnum v8_Benchmark, boost::optional< std::string > v9_ValueSource, IfcMetricValueSelect* v10_DataValue, IfcReference* v11_ReferencePath);
+    typedef IfcTemplatedEntityList< IfcMetric > list;
 };
 /// IfcMonetaryUnit is a unit to define currency for money.
 /// 
@@ -8858,20 +10075,19 @@ class IfcMetric : public IfcConstraint {
 class IfcMonetaryUnit : public IfcUtil::IfcBaseEntity {
 public:
     /// Code or name of the currency.  Permissible values are the three-letter alphabetic currency codes as per ISO 4217, for example CNY, EUR, GBP, JPY, USD.
-    IfcLabel Currency();
-    void setCurrency(IfcLabel v);
+    std::string Currency() const;
+    void setCurrency(std::string v);
     virtual unsigned int getArgumentCount() const { return 1; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_STRING; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcLabel; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Currency"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcMonetaryUnit (IfcAbstractEntityPtr e);
-    IfcMonetaryUnit (IfcLabel v1_Currency);
-    typedef IfcMonetaryUnit* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcMonetaryUnit > > list;
-    typedef IfcTemplatedEntityList< IfcMonetaryUnit >::it it;
+    IfcMonetaryUnit (IfcAbstractEntity* e);
+    IfcMonetaryUnit (std::string v1_Currency);
+    typedef IfcTemplatedEntityList< IfcMonetaryUnit > list;
 };
 /// Definition from ISO/CD 10303-41:1992: A named unit is a unit quantity associated with the word, or group of words, by which the unit is identified.
 /// 
@@ -8881,23 +10097,22 @@ class IfcMonetaryUnit : public IfcUtil::IfcBaseEntity {
 class IfcNamedUnit : public IfcUtil::IfcBaseEntity {
 public:
     /// The dimensional exponents of the SI base units by which the named unit is defined.
-    IfcDimensionalExponents* Dimensions();
+    IfcDimensionalExponents* Dimensions() const;
     void setDimensions(IfcDimensionalExponents* v);
     /// The type of the unit.
-    IfcUnitEnum::IfcUnitEnum UnitType();
+    IfcUnitEnum::IfcUnitEnum UnitType() const;
     void setUnitType(IfcUnitEnum::IfcUnitEnum v);
     virtual unsigned int getArgumentCount() const { return 2; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY; case 1: return IfcUtil::Argument_ENUMERATION; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcDimensionalExponents; case 1: return Type::IfcUnitEnum; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Dimensions"; case 1: return "UnitType"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcNamedUnit (IfcAbstractEntityPtr e);
+    IfcNamedUnit (IfcAbstractEntity* e);
     IfcNamedUnit (IfcDimensionalExponents* v1_Dimensions, IfcUnitEnum::IfcUnitEnum v2_UnitType);
-    typedef IfcNamedUnit* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcNamedUnit > > list;
-    typedef IfcTemplatedEntityList< IfcNamedUnit >::it it;
+    typedef IfcTemplatedEntityList< IfcNamedUnit > list;
 };
 /// IfcObjectPlacement is an abstract supertype for the special types defining the object coordinate system. The
 /// IfcObjectPlacement has to be provided for each product that has a shape representation.
@@ -8914,18 +10129,17 @@ class IfcObjectPlacement : public IfcUtil::IfcBaseEntity {
 public:
     virtual unsigned int getArgumentCount() const { return 0; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcProduct > > PlacesObject(); // INVERSE IfcProduct::ObjectPlacement
-    SHARED_PTR< IfcTemplatedEntityList< IfcLocalPlacement > > ReferencedByPlacements(); // INVERSE IfcLocalPlacement::PlacementRelTo
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcProduct >::ptr PlacesObject() const; // INVERSE IfcProduct::ObjectPlacement
+    IfcTemplatedEntityList< IfcLocalPlacement >::ptr ReferencedByPlacements() const; // INVERSE IfcLocalPlacement::PlacementRelTo
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcObjectPlacement (IfcAbstractEntityPtr e);
+    IfcObjectPlacement (IfcAbstractEntity* e);
     IfcObjectPlacement ();
-    typedef IfcObjectPlacement* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcObjectPlacement > > list;
-    typedef IfcTemplatedEntityList< IfcObjectPlacement >::it it;
+    typedef IfcTemplatedEntityList< IfcObjectPlacement > list;
 };
 /// An IfcObjective captures qualitative information for an objective-based constraint. 
 /// 
@@ -8939,34 +10153,33 @@ class IfcObjectPlacement : public IfcUtil::IfcBaseEntity {
 class IfcObjective : public IfcConstraint {
 public:
     /// Whether the optional attribute BenchmarkValues is defined for this IfcObjective
-    bool hasBenchmarkValues();
+    bool hasBenchmarkValues() const;
     /// A list of any benchmark values used for comparison purposes.
-    SHARED_PTR< IfcTemplatedEntityList< IfcConstraint > > BenchmarkValues();
-    void setBenchmarkValues(SHARED_PTR< IfcTemplatedEntityList< IfcConstraint > > v);
+    IfcTemplatedEntityList< IfcConstraint >::ptr BenchmarkValues() const;
+    void setBenchmarkValues(IfcTemplatedEntityList< IfcConstraint >::ptr v);
     /// Whether the optional attribute LogicalAggregator is defined for this IfcObjective
-    bool hasLogicalAggregator();
-    IfcLogicalOperatorEnum::IfcLogicalOperatorEnum LogicalAggregator();
+    bool hasLogicalAggregator() const;
+    IfcLogicalOperatorEnum::IfcLogicalOperatorEnum LogicalAggregator() const;
     void setLogicalAggregator(IfcLogicalOperatorEnum::IfcLogicalOperatorEnum v);
     /// Enumeration that qualifies the type of objective constraint.
-    IfcObjectiveEnum::IfcObjectiveEnum ObjectiveQualifier();
+    IfcObjectiveEnum::IfcObjectiveEnum ObjectiveQualifier() const;
     void setObjectiveQualifier(IfcObjectiveEnum::IfcObjectiveEnum v);
     /// Whether the optional attribute UserDefinedQualifier is defined for this IfcObjective
-    bool hasUserDefinedQualifier();
+    bool hasUserDefinedQualifier() const;
     /// A user defined value that qualifies the type of objective constraint when ObjectiveQualifier attribute of type IfcObjectiveEnum has value USERDEFINED.
-    IfcLabel UserDefinedQualifier();
-    void setUserDefinedQualifier(IfcLabel v);
+    std::string UserDefinedQualifier() const;
+    void setUserDefinedQualifier(std::string v);
     virtual unsigned int getArgumentCount() const { return 11; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 7: return IfcUtil::Argument_ENTITY_LIST; case 8: return IfcUtil::Argument_ENUMERATION; case 9: return IfcUtil::Argument_ENUMERATION; case 10: return IfcUtil::Argument_STRING; } return IfcConstraint::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 7: return Type::IfcConstraint; case 8: return Type::IfcLogicalOperatorEnum; case 9: return Type::IfcObjectiveEnum; case 10: return Type::IfcLabel; } return IfcConstraint::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 7: return "BenchmarkValues"; case 8: return "LogicalAggregator"; case 9: return "ObjectiveQualifier"; case 10: return "UserDefinedQualifier"; } return IfcConstraint::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcObjective (IfcAbstractEntityPtr e);
-    IfcObjective (IfcLabel v1_Name, boost::optional< IfcText > v2_Description, IfcConstraintEnum::IfcConstraintEnum v3_ConstraintGrade, boost::optional< IfcLabel > v4_ConstraintSource, boost::optional< IfcActorSelect > v5_CreatingActor, boost::optional< IfcDateTime > v6_CreationTime, boost::optional< IfcLabel > v7_UserDefinedGrade, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcConstraint > > > v8_BenchmarkValues, boost::optional< IfcLogicalOperatorEnum::IfcLogicalOperatorEnum > v9_LogicalAggregator, IfcObjectiveEnum::IfcObjectiveEnum v10_ObjectiveQualifier, boost::optional< IfcLabel > v11_UserDefinedQualifier);
-    typedef IfcObjective* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcObjective > > list;
-    typedef IfcTemplatedEntityList< IfcObjective >::it it;
+    IfcObjective (IfcAbstractEntity* e);
+    IfcObjective (std::string v1_Name, boost::optional< std::string > v2_Description, IfcConstraintEnum::IfcConstraintEnum v3_ConstraintGrade, boost::optional< std::string > v4_ConstraintSource, IfcActorSelect* v5_CreatingActor, boost::optional< std::string > v6_CreationTime, boost::optional< std::string > v7_UserDefinedGrade, boost::optional< IfcTemplatedEntityList< IfcConstraint >::ptr > v8_BenchmarkValues, boost::optional< IfcLogicalOperatorEnum::IfcLogicalOperatorEnum > v9_LogicalAggregator, IfcObjectiveEnum::IfcObjectiveEnum v10_ObjectiveQualifier, boost::optional< std::string > v11_UserDefinedQualifier);
+    typedef IfcTemplatedEntityList< IfcObjective > list;
 };
 /// A named and structured grouping with a corporate identity.
 /// 
@@ -8979,44 +10192,43 @@ class IfcObjective : public IfcConstraint {
 class IfcOrganization : public IfcUtil::IfcBaseEntity {
 public:
     /// Whether the optional attribute Identification is defined for this IfcOrganization
-    bool hasIdentification();
+    bool hasIdentification() const;
     /// Identification of the organization.
-    IfcIdentifier Identification();
-    void setIdentification(IfcIdentifier v);
+    std::string Identification() const;
+    void setIdentification(std::string v);
     /// The word, or group of words, by which the organization is referred to.
-    IfcLabel Name();
-    void setName(IfcLabel v);
+    std::string Name() const;
+    void setName(std::string v);
     /// Whether the optional attribute Description is defined for this IfcOrganization
-    bool hasDescription();
+    bool hasDescription() const;
     /// Text that relates the nature of the organization.
-    IfcText Description();
-    void setDescription(IfcText v);
+    std::string Description() const;
+    void setDescription(std::string v);
     /// Whether the optional attribute Roles is defined for this IfcOrganization
-    bool hasRoles();
+    bool hasRoles() const;
     /// Roles played by the organization.
-    SHARED_PTR< IfcTemplatedEntityList< IfcActorRole > > Roles();
-    void setRoles(SHARED_PTR< IfcTemplatedEntityList< IfcActorRole > > v);
+    IfcTemplatedEntityList< IfcActorRole >::ptr Roles() const;
+    void setRoles(IfcTemplatedEntityList< IfcActorRole >::ptr v);
     /// Whether the optional attribute Addresses is defined for this IfcOrganization
-    bool hasAddresses();
+    bool hasAddresses() const;
     /// Postal and telecom addresses of an organization.
     /// NOTE: There may be several addresses related to an organization.
-    SHARED_PTR< IfcTemplatedEntityList< IfcAddress > > Addresses();
-    void setAddresses(SHARED_PTR< IfcTemplatedEntityList< IfcAddress > > v);
+    IfcTemplatedEntityList< IfcAddress >::ptr Addresses() const;
+    void setAddresses(IfcTemplatedEntityList< IfcAddress >::ptr v);
     virtual unsigned int getArgumentCount() const { return 5; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_STRING; case 1: return IfcUtil::Argument_STRING; case 2: return IfcUtil::Argument_STRING; case 3: return IfcUtil::Argument_ENTITY_LIST; case 4: return IfcUtil::Argument_ENTITY_LIST; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcIdentifier; case 1: return Type::IfcLabel; case 2: return Type::IfcText; case 3: return Type::IfcActorRole; case 4: return Type::IfcAddress; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Identification"; case 1: return "Name"; case 2: return "Description"; case 3: return "Roles"; case 4: return "Addresses"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcOrganizationRelationship > > IsRelatedBy(); // INVERSE IfcOrganizationRelationship::RelatedOrganizations
-    SHARED_PTR< IfcTemplatedEntityList< IfcOrganizationRelationship > > Relates(); // INVERSE IfcOrganizationRelationship::RelatingOrganization
-    SHARED_PTR< IfcTemplatedEntityList< IfcPersonAndOrganization > > Engages(); // INVERSE IfcPersonAndOrganization::TheOrganization
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcOrganizationRelationship >::ptr IsRelatedBy() const; // INVERSE IfcOrganizationRelationship::RelatedOrganizations
+    IfcTemplatedEntityList< IfcOrganizationRelationship >::ptr Relates() const; // INVERSE IfcOrganizationRelationship::RelatingOrganization
+    IfcTemplatedEntityList< IfcPersonAndOrganization >::ptr Engages() const; // INVERSE IfcPersonAndOrganization::TheOrganization
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcOrganization (IfcAbstractEntityPtr e);
-    IfcOrganization (boost::optional< IfcIdentifier > v1_Identification, IfcLabel v2_Name, boost::optional< IfcText > v3_Description, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcActorRole > > > v4_Roles, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcAddress > > > v5_Addresses);
-    typedef IfcOrganization* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcOrganization > > list;
-    typedef IfcTemplatedEntityList< IfcOrganization >::it it;
+    IfcOrganization (IfcAbstractEntity* e);
+    IfcOrganization (boost::optional< std::string > v1_Identification, std::string v2_Name, boost::optional< std::string > v3_Description, boost::optional< IfcTemplatedEntityList< IfcActorRole >::ptr > v4_Roles, boost::optional< IfcTemplatedEntityList< IfcAddress >::ptr > v5_Addresses);
+    typedef IfcTemplatedEntityList< IfcOrganization > list;
 };
 /// IfcOwnerHistory defines all history and identification related information. In order to provide fast access it is directly attached to all independent objects, relationships and properties.
 /// 
@@ -9031,51 +10243,50 @@ class IfcOrganization : public IfcUtil::IfcBaseEntity {
 class IfcOwnerHistory : public IfcUtil::IfcBaseEntity {
 public:
     /// Direct reference to the end user who currently "owns" this object. Note that IFC includes the concept of ownership transfer from one user to another and therefore distinguishes between the Owning User and Creating User.
-    IfcPersonAndOrganization* OwningUser();
+    IfcPersonAndOrganization* OwningUser() const;
     void setOwningUser(IfcPersonAndOrganization* v);
     /// Direct reference to the application which currently "Owns" this object on behalf of the owning user, who uses this application. Note that IFC includes the concept of ownership transfer from one application to another and therefore distinguishes between the Owning Application and Creating Application.
-    IfcApplication* OwningApplication();
+    IfcApplication* OwningApplication() const;
     void setOwningApplication(IfcApplication* v);
     /// Whether the optional attribute State is defined for this IfcOwnerHistory
-    bool hasState();
+    bool hasState() const;
     /// Enumeration that defines the current access state of the object.
-    IfcStateEnum::IfcStateEnum State();
+    IfcStateEnum::IfcStateEnum State() const;
     void setState(IfcStateEnum::IfcStateEnum v);
     /// Whether the optional attribute ChangeAction is defined for this IfcOwnerHistory
-    bool hasChangeAction();
+    bool hasChangeAction() const;
     /// Enumeration that defines the actions associated with changes made to the object.
-    IfcChangeActionEnum::IfcChangeActionEnum ChangeAction();
+    IfcChangeActionEnum::IfcChangeActionEnum ChangeAction() const;
     void setChangeAction(IfcChangeActionEnum::IfcChangeActionEnum v);
     /// Whether the optional attribute LastModifiedDate is defined for this IfcOwnerHistory
-    bool hasLastModifiedDate();
+    bool hasLastModifiedDate() const;
     /// Date and Time expressed in UTC (Universal Time Coordinated, formerly Greenwich Mean Time or GMT) at which the last modification was made by LastModifyingUser and LastModifyingApplication.
-    IfcTimeStamp LastModifiedDate();
-    void setLastModifiedDate(IfcTimeStamp v);
+    int LastModifiedDate() const;
+    void setLastModifiedDate(int v);
     /// Whether the optional attribute LastModifyingUser is defined for this IfcOwnerHistory
-    bool hasLastModifyingUser();
+    bool hasLastModifyingUser() const;
     /// User who carried out the last modification using LastModifyingApplication.
-    IfcPersonAndOrganization* LastModifyingUser();
+    IfcPersonAndOrganization* LastModifyingUser() const;
     void setLastModifyingUser(IfcPersonAndOrganization* v);
     /// Whether the optional attribute LastModifyingApplication is defined for this IfcOwnerHistory
-    bool hasLastModifyingApplication();
+    bool hasLastModifyingApplication() const;
     /// Application used to make the last modification.
-    IfcApplication* LastModifyingApplication();
+    IfcApplication* LastModifyingApplication() const;
     void setLastModifyingApplication(IfcApplication* v);
     /// The date and time expressed in UTC (Universal Time Coordinated, formerly Greenwich Mean Time or GMT) when first created by the original OwningApplication. Once defined this value remains unchanged through the lifetime of the entity.
-    IfcTimeStamp CreationDate();
-    void setCreationDate(IfcTimeStamp v);
+    int CreationDate() const;
+    void setCreationDate(int v);
     virtual unsigned int getArgumentCount() const { return 8; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY; case 1: return IfcUtil::Argument_ENTITY; case 2: return IfcUtil::Argument_ENUMERATION; case 3: return IfcUtil::Argument_ENUMERATION; case 4: return IfcUtil::Argument_INT; case 5: return IfcUtil::Argument_ENTITY; case 6: return IfcUtil::Argument_ENTITY; case 7: return IfcUtil::Argument_INT; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcPersonAndOrganization; case 1: return Type::IfcApplication; case 2: return Type::IfcStateEnum; case 3: return Type::IfcChangeActionEnum; case 4: return Type::IfcTimeStamp; case 5: return Type::IfcPersonAndOrganization; case 6: return Type::IfcApplication; case 7: return Type::IfcTimeStamp; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "OwningUser"; case 1: return "OwningApplication"; case 2: return "State"; case 3: return "ChangeAction"; case 4: return "LastModifiedDate"; case 5: return "LastModifyingUser"; case 6: return "LastModifyingApplication"; case 7: return "CreationDate"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcOwnerHistory (IfcAbstractEntityPtr e);
-    IfcOwnerHistory (IfcPersonAndOrganization* v1_OwningUser, IfcApplication* v2_OwningApplication, boost::optional< IfcStateEnum::IfcStateEnum > v3_State, boost::optional< IfcChangeActionEnum::IfcChangeActionEnum > v4_ChangeAction, boost::optional< IfcTimeStamp > v5_LastModifiedDate, IfcPersonAndOrganization* v6_LastModifyingUser, IfcApplication* v7_LastModifyingApplication, IfcTimeStamp v8_CreationDate);
-    typedef IfcOwnerHistory* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcOwnerHistory > > list;
-    typedef IfcTemplatedEntityList< IfcOwnerHistory >::it it;
+    IfcOwnerHistory (IfcAbstractEntity* e);
+    IfcOwnerHistory (IfcPersonAndOrganization* v1_OwningUser, IfcApplication* v2_OwningApplication, boost::optional< IfcStateEnum::IfcStateEnum > v3_State, boost::optional< IfcChangeActionEnum::IfcChangeActionEnum > v4_ChangeAction, boost::optional< int > v5_LastModifiedDate, IfcPersonAndOrganization* v6_LastModifyingUser, IfcApplication* v7_LastModifyingApplication, int v8_CreationDate);
+    typedef IfcTemplatedEntityList< IfcOwnerHistory > list;
 };
 /// Definition: an individual human being.
 /// 
@@ -9089,64 +10300,63 @@ class IfcOwnerHistory : public IfcUtil::IfcBaseEntity {
 class IfcPerson : public IfcUtil::IfcBaseEntity {
 public:
     /// Whether the optional attribute Identification is defined for this IfcPerson
-    bool hasIdentification();
+    bool hasIdentification() const;
     /// Identification of the person.
-    IfcIdentifier Identification();
-    void setIdentification(IfcIdentifier v);
+    std::string Identification() const;
+    void setIdentification(std::string v);
     /// Whether the optional attribute FamilyName is defined for this IfcPerson
-    bool hasFamilyName();
+    bool hasFamilyName() const;
     /// The name by which the family identity of the person may be recognized.
     /// NOTE: Depending on geographical location and culture, family name may appear either as the first or last component of a name.
-    IfcLabel FamilyName();
-    void setFamilyName(IfcLabel v);
+    std::string FamilyName() const;
+    void setFamilyName(std::string v);
     /// Whether the optional attribute GivenName is defined for this IfcPerson
-    bool hasGivenName();
+    bool hasGivenName() const;
     /// The name by which a person is known within a family and by which he or she may be familiarly recognized.
     /// NOTE: Depending on geographical location and culture, given name may appear either as the first or last component of a name.
-    IfcLabel GivenName();
-    void setGivenName(IfcLabel v);
+    std::string GivenName() const;
+    void setGivenName(std::string v);
     /// Whether the optional attribute MiddleNames is defined for this IfcPerson
-    bool hasMiddleNames();
+    bool hasMiddleNames() const;
     /// Additional names given to a person that enable their identification apart from others who may have the same or similar family and given names.
     /// NOTE: Middle names are not normally used in familiar communication but may be asserted to provide additional 
     /// identification of a particular person if necessary. They may be particularly useful in situations where the person concerned has a 
     /// family name that occurs commonly in the geographical region.
-    std::vector< IfcLabel > /*[1:?]*/ MiddleNames();
-    void setMiddleNames(std::vector< IfcLabel > /*[1:?]*/ v);
+    std::vector< std::string > /*[1:?]*/ MiddleNames() const;
+    void setMiddleNames(std::vector< std::string > /*[1:?]*/ v);
     /// Whether the optional attribute PrefixTitles is defined for this IfcPerson
-    bool hasPrefixTitles();
+    bool hasPrefixTitles() const;
     /// The word, or group of words, which specify the person's social and/or professional standing and appear before his/her names.
-    std::vector< IfcLabel > /*[1:?]*/ PrefixTitles();
-    void setPrefixTitles(std::vector< IfcLabel > /*[1:?]*/ v);
+    std::vector< std::string > /*[1:?]*/ PrefixTitles() const;
+    void setPrefixTitles(std::vector< std::string > /*[1:?]*/ v);
     /// Whether the optional attribute SuffixTitles is defined for this IfcPerson
-    bool hasSuffixTitles();
+    bool hasSuffixTitles() const;
     /// The word, or group of words, which specify the person's social and/or professional standing and appear after his/her names.
-    std::vector< IfcLabel > /*[1:?]*/ SuffixTitles();
-    void setSuffixTitles(std::vector< IfcLabel > /*[1:?]*/ v);
+    std::vector< std::string > /*[1:?]*/ SuffixTitles() const;
+    void setSuffixTitles(std::vector< std::string > /*[1:?]*/ v);
     /// Whether the optional attribute Roles is defined for this IfcPerson
-    bool hasRoles();
+    bool hasRoles() const;
     /// Roles played by the person.
-    SHARED_PTR< IfcTemplatedEntityList< IfcActorRole > > Roles();
-    void setRoles(SHARED_PTR< IfcTemplatedEntityList< IfcActorRole > > v);
+    IfcTemplatedEntityList< IfcActorRole >::ptr Roles() const;
+    void setRoles(IfcTemplatedEntityList< IfcActorRole >::ptr v);
     /// Whether the optional attribute Addresses is defined for this IfcPerson
-    bool hasAddresses();
+    bool hasAddresses() const;
     /// Postal and telecommunication addresses of a person.
     /// NOTE - A person may have several addresses.
-    SHARED_PTR< IfcTemplatedEntityList< IfcAddress > > Addresses();
-    void setAddresses(SHARED_PTR< IfcTemplatedEntityList< IfcAddress > > v);
+    IfcTemplatedEntityList< IfcAddress >::ptr Addresses() const;
+    void setAddresses(IfcTemplatedEntityList< IfcAddress >::ptr v);
     virtual unsigned int getArgumentCount() const { return 8; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_STRING; case 1: return IfcUtil::Argument_STRING; case 2: return IfcUtil::Argument_STRING; case 3: return IfcUtil::Argument_VECTOR_STRING; case 4: return IfcUtil::Argument_VECTOR_STRING; case 5: return IfcUtil::Argument_VECTOR_STRING; case 6: return IfcUtil::Argument_ENTITY_LIST; case 7: return IfcUtil::Argument_ENTITY_LIST; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcIdentifier; case 1: return Type::IfcLabel; case 2: return Type::IfcLabel; case 3: return Type::IfcLabel; case 4: return Type::IfcLabel; case 5: return Type::IfcLabel; case 6: return Type::IfcActorRole; case 7: return Type::IfcAddress; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Identification"; case 1: return "FamilyName"; case 2: return "GivenName"; case 3: return "MiddleNames"; case 4: return "PrefixTitles"; case 5: return "SuffixTitles"; case 6: return "Roles"; case 7: return "Addresses"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcPersonAndOrganization > > EngagedIn(); // INVERSE IfcPersonAndOrganization::ThePerson
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcPersonAndOrganization >::ptr EngagedIn() const; // INVERSE IfcPersonAndOrganization::ThePerson
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcPerson (IfcAbstractEntityPtr e);
-    IfcPerson (boost::optional< IfcIdentifier > v1_Identification, boost::optional< IfcLabel > v2_FamilyName, boost::optional< IfcLabel > v3_GivenName, boost::optional< std::vector< IfcLabel > /*[1:?]*/ > v4_MiddleNames, boost::optional< std::vector< IfcLabel > /*[1:?]*/ > v5_PrefixTitles, boost::optional< std::vector< IfcLabel > /*[1:?]*/ > v6_SuffixTitles, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcActorRole > > > v7_Roles, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcAddress > > > v8_Addresses);
-    typedef IfcPerson* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcPerson > > list;
-    typedef IfcTemplatedEntityList< IfcPerson >::it it;
+    IfcPerson (IfcAbstractEntity* e);
+    IfcPerson (boost::optional< std::string > v1_Identification, boost::optional< std::string > v2_FamilyName, boost::optional< std::string > v3_GivenName, boost::optional< std::vector< std::string > /*[1:?]*/ > v4_MiddleNames, boost::optional< std::vector< std::string > /*[1:?]*/ > v5_PrefixTitles, boost::optional< std::vector< std::string > /*[1:?]*/ > v6_SuffixTitles, boost::optional< IfcTemplatedEntityList< IfcActorRole >::ptr > v7_Roles, boost::optional< IfcTemplatedEntityList< IfcAddress >::ptr > v8_Addresses);
+    typedef IfcTemplatedEntityList< IfcPerson > list;
 };
 /// Definition: Identification of a person within an organization.
 /// 
@@ -9156,28 +10366,27 @@ class IfcPerson : public IfcUtil::IfcBaseEntity {
 class IfcPersonAndOrganization : public IfcUtil::IfcBaseEntity {
 public:
     /// The person who is related to the organization.
-    IfcPerson* ThePerson();
+    IfcPerson* ThePerson() const;
     void setThePerson(IfcPerson* v);
     /// The organization to which the person is related.
-    IfcOrganization* TheOrganization();
+    IfcOrganization* TheOrganization() const;
     void setTheOrganization(IfcOrganization* v);
     /// Whether the optional attribute Roles is defined for this IfcPersonAndOrganization
-    bool hasRoles();
+    bool hasRoles() const;
     /// Roles played by the person within the context of an organization.  These may differ from the roles in ThePerson.Roles which may be asserted without organizational context.
-    SHARED_PTR< IfcTemplatedEntityList< IfcActorRole > > Roles();
-    void setRoles(SHARED_PTR< IfcTemplatedEntityList< IfcActorRole > > v);
+    IfcTemplatedEntityList< IfcActorRole >::ptr Roles() const;
+    void setRoles(IfcTemplatedEntityList< IfcActorRole >::ptr v);
     virtual unsigned int getArgumentCount() const { return 3; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY; case 1: return IfcUtil::Argument_ENTITY; case 2: return IfcUtil::Argument_ENTITY_LIST; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcPerson; case 1: return Type::IfcOrganization; case 2: return Type::IfcActorRole; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "ThePerson"; case 1: return "TheOrganization"; case 2: return "Roles"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcPersonAndOrganization (IfcAbstractEntityPtr e);
-    IfcPersonAndOrganization (IfcPerson* v1_ThePerson, IfcOrganization* v2_TheOrganization, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcActorRole > > > v3_Roles);
-    typedef IfcPersonAndOrganization* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcPersonAndOrganization > > list;
-    typedef IfcTemplatedEntityList< IfcPersonAndOrganization >::it it;
+    IfcPersonAndOrganization (IfcAbstractEntity* e);
+    IfcPersonAndOrganization (IfcPerson* v1_ThePerson, IfcOrganization* v2_TheOrganization, boost::optional< IfcTemplatedEntityList< IfcActorRole >::ptr > v3_Roles);
+    typedef IfcTemplatedEntityList< IfcPersonAndOrganization > list;
 };
 /// The physical quantity, IfcPhysicalQuantity, is an abstract entity that holds a complex or simple quantity measure together with a semantic definition of the usage for the single or several measure value. 
 /// 
@@ -9187,27 +10396,26 @@ class IfcPersonAndOrganization : public IfcUtil::IfcBaseEntity {
 class IfcPhysicalQuantity : public IfcUtil::IfcBaseEntity {
 public:
     /// Name of the element quantity or measure. The name attribute has to be made recognizable by further agreements.
-    IfcLabel Name();
-    void setName(IfcLabel v);
+    std::string Name() const;
+    void setName(std::string v);
     /// Whether the optional attribute Description is defined for this IfcPhysicalQuantity
-    bool hasDescription();
+    bool hasDescription() const;
     /// Further explanation that might be given to the quantity.
-    IfcText Description();
-    void setDescription(IfcText v);
+    std::string Description() const;
+    void setDescription(std::string v);
     virtual unsigned int getArgumentCount() const { return 2; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_STRING; case 1: return IfcUtil::Argument_STRING; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcLabel; case 1: return Type::IfcText; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Name"; case 1: return "Description"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcExternalReferenceRelationship > > HasExternalReferences(); // INVERSE IfcExternalReferenceRelationship::RelatedResourceObjects
-    SHARED_PTR< IfcTemplatedEntityList< IfcPhysicalComplexQuantity > > PartOfComplex(); // INVERSE IfcPhysicalComplexQuantity::HasQuantities
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcExternalReferenceRelationship >::ptr HasExternalReferences() const; // INVERSE IfcExternalReferenceRelationship::RelatedResourceObjects
+    IfcTemplatedEntityList< IfcPhysicalComplexQuantity >::ptr PartOfComplex() const; // INVERSE IfcPhysicalComplexQuantity::HasQuantities
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcPhysicalQuantity (IfcAbstractEntityPtr e);
-    IfcPhysicalQuantity (IfcLabel v1_Name, boost::optional< IfcText > v2_Description);
-    typedef IfcPhysicalQuantity* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcPhysicalQuantity > > list;
-    typedef IfcTemplatedEntityList< IfcPhysicalQuantity >::it it;
+    IfcPhysicalQuantity (IfcAbstractEntity* e);
+    IfcPhysicalQuantity (std::string v1_Name, boost::optional< std::string > v2_Description);
+    typedef IfcTemplatedEntityList< IfcPhysicalQuantity > list;
 };
 /// The physical quantity, IfcPhysicalSimpleQuantity, is an entity that holds a single quantity measure value (as defined at the subtypes of IfcPhysicalSimpleQuantity) together with a semantic definition of the usage for the measure value. 
 /// 
@@ -9221,22 +10429,21 @@ class IfcPhysicalQuantity : public IfcUtil::IfcBaseEntity {
 class IfcPhysicalSimpleQuantity : public IfcPhysicalQuantity {
 public:
     /// Whether the optional attribute Unit is defined for this IfcPhysicalSimpleQuantity
-    bool hasUnit();
+    bool hasUnit() const;
     /// Optional assignment of a unit. If no unit is given, then the global unit assignment, as established at the IfcProject, applies to the quantity measures.
-    IfcNamedUnit* Unit();
+    IfcNamedUnit* Unit() const;
     void setUnit(IfcNamedUnit* v);
     virtual unsigned int getArgumentCount() const { return 3; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 2: return IfcUtil::Argument_ENTITY; } return IfcPhysicalQuantity::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 2: return Type::IfcNamedUnit; } return IfcPhysicalQuantity::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 2: return "Unit"; } return IfcPhysicalQuantity::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcPhysicalSimpleQuantity (IfcAbstractEntityPtr e);
-    IfcPhysicalSimpleQuantity (IfcLabel v1_Name, boost::optional< IfcText > v2_Description, IfcNamedUnit* v3_Unit);
-    typedef IfcPhysicalSimpleQuantity* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcPhysicalSimpleQuantity > > list;
-    typedef IfcTemplatedEntityList< IfcPhysicalSimpleQuantity >::it it;
+    IfcPhysicalSimpleQuantity (IfcAbstractEntity* e);
+    IfcPhysicalSimpleQuantity (std::string v1_Name, boost::optional< std::string > v2_Description, IfcNamedUnit* v3_Unit);
+    typedef IfcTemplatedEntityList< IfcPhysicalSimpleQuantity > list;
 };
 /// Definition: The address for delivery of paper based mail.
 /// 
@@ -9244,74 +10451,72 @@ class IfcPhysicalSimpleQuantity : public IfcPhysicalQuantity {
 class IfcPostalAddress : public IfcAddress {
 public:
     /// Whether the optional attribute InternalLocation is defined for this IfcPostalAddress
-    bool hasInternalLocation();
+    bool hasInternalLocation() const;
     /// An organization defined address for internal mail delivery.
-    IfcLabel InternalLocation();
-    void setInternalLocation(IfcLabel v);
+    std::string InternalLocation() const;
+    void setInternalLocation(std::string v);
     /// Whether the optional attribute AddressLines is defined for this IfcPostalAddress
-    bool hasAddressLines();
+    bool hasAddressLines() const;
     /// The postal address.
     /// NOTE: A postal address may occupy several lines (or elements) when recorded. 
     /// It is expected that normal usage will incorporate relevant elements of the following address concepts: 
     /// A location within a building (e.g. 3rd Floor) Building name (e.g. Interoperability House) Street number 
     /// (e.g. 6400) Street name (e.g. Alliance Boulevard). Typical content of address lines may vary in different 
     /// countries.
-    std::vector< IfcLabel > /*[1:?]*/ AddressLines();
-    void setAddressLines(std::vector< IfcLabel > /*[1:?]*/ v);
+    std::vector< std::string > /*[1:?]*/ AddressLines() const;
+    void setAddressLines(std::vector< std::string > /*[1:?]*/ v);
     /// Whether the optional attribute PostalBox is defined for this IfcPostalAddress
-    bool hasPostalBox();
+    bool hasPostalBox() const;
     /// An address that is implied by an identifiable mail drop.
-    IfcLabel PostalBox();
-    void setPostalBox(IfcLabel v);
+    std::string PostalBox() const;
+    void setPostalBox(std::string v);
     /// Whether the optional attribute Town is defined for this IfcPostalAddress
-    bool hasTown();
+    bool hasTown() const;
     /// The name of a town.
-    IfcLabel Town();
-    void setTown(IfcLabel v);
+    std::string Town() const;
+    void setTown(std::string v);
     /// Whether the optional attribute Region is defined for this IfcPostalAddress
-    bool hasRegion();
+    bool hasRegion() const;
     /// The name of a region.
     /// NOTE: The counties of the United Kingdom and the states of North America are examples of regions.
-    IfcLabel Region();
-    void setRegion(IfcLabel v);
+    std::string Region() const;
+    void setRegion(std::string v);
     /// Whether the optional attribute PostalCode is defined for this IfcPostalAddress
-    bool hasPostalCode();
+    bool hasPostalCode() const;
     /// The code that is used by the country's postal service.
-    IfcLabel PostalCode();
-    void setPostalCode(IfcLabel v);
+    std::string PostalCode() const;
+    void setPostalCode(std::string v);
     /// Whether the optional attribute Country is defined for this IfcPostalAddress
-    bool hasCountry();
+    bool hasCountry() const;
     /// The name of a country.
-    IfcLabel Country();
-    void setCountry(IfcLabel v);
+    std::string Country() const;
+    void setCountry(std::string v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 3: return IfcUtil::Argument_STRING; case 4: return IfcUtil::Argument_VECTOR_STRING; case 5: return IfcUtil::Argument_STRING; case 6: return IfcUtil::Argument_STRING; case 7: return IfcUtil::Argument_STRING; case 8: return IfcUtil::Argument_STRING; case 9: return IfcUtil::Argument_STRING; } return IfcAddress::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 3: return Type::IfcLabel; case 4: return Type::IfcLabel; case 5: return Type::IfcLabel; case 6: return Type::IfcLabel; case 7: return Type::IfcLabel; case 8: return Type::IfcLabel; case 9: return Type::IfcLabel; } return IfcAddress::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 3: return "InternalLocation"; case 4: return "AddressLines"; case 5: return "PostalBox"; case 6: return "Town"; case 7: return "Region"; case 8: return "PostalCode"; case 9: return "Country"; } return IfcAddress::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcPostalAddress (IfcAbstractEntityPtr e);
-    IfcPostalAddress (boost::optional< IfcAddressTypeEnum::IfcAddressTypeEnum > v1_Purpose, boost::optional< IfcText > v2_Description, boost::optional< IfcLabel > v3_UserDefinedPurpose, boost::optional< IfcLabel > v4_InternalLocation, boost::optional< std::vector< IfcLabel > /*[1:?]*/ > v5_AddressLines, boost::optional< IfcLabel > v6_PostalBox, boost::optional< IfcLabel > v7_Town, boost::optional< IfcLabel > v8_Region, boost::optional< IfcLabel > v9_PostalCode, boost::optional< IfcLabel > v10_Country);
-    typedef IfcPostalAddress* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcPostalAddress > > list;
-    typedef IfcTemplatedEntityList< IfcPostalAddress >::it it;
+    IfcPostalAddress (IfcAbstractEntity* e);
+    IfcPostalAddress (boost::optional< IfcAddressTypeEnum::IfcAddressTypeEnum > v1_Purpose, boost::optional< std::string > v2_Description, boost::optional< std::string > v3_UserDefinedPurpose, boost::optional< std::string > v4_InternalLocation, boost::optional< std::vector< std::string > /*[1:?]*/ > v5_AddressLines, boost::optional< std::string > v6_PostalBox, boost::optional< std::string > v7_Town, boost::optional< std::string > v8_Region, boost::optional< std::string > v9_PostalCode, boost::optional< std::string > v10_Country);
+    typedef IfcTemplatedEntityList< IfcPostalAddress > list;
 };
 
 class IfcPresentationItem : public IfcUtil::IfcBaseEntity {
 public:
     virtual unsigned int getArgumentCount() const { return 0; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcPresentationItem (IfcAbstractEntityPtr e);
+    IfcPresentationItem (IfcAbstractEntity* e);
     IfcPresentationItem ();
-    typedef IfcPresentationItem* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcPresentationItem > > list;
-    typedef IfcTemplatedEntityList< IfcPresentationItem >::it it;
+    typedef IfcTemplatedEntityList< IfcPresentationItem > list;
 };
 /// The presentation layer assignment provides the layer name (and optionally a description and an identifier) for a collection of geometric representation items. The IfcPresentationLayerAssignment corresponds to the term "CAD Layer" and is used mainly for grouping and visibility control.
 /// 
@@ -9331,33 +10536,32 @@ class IfcPresentationItem : public IfcUtil::IfcBaseEntity {
 class IfcPresentationLayerAssignment : public IfcUtil::IfcBaseEntity {
 public:
     /// Name of the layer.
-    IfcLabel Name();
-    void setName(IfcLabel v);
+    std::string Name() const;
+    void setName(std::string v);
     /// Whether the optional attribute Description is defined for this IfcPresentationLayerAssignment
-    bool hasDescription();
+    bool hasDescription() const;
     /// Additional description of the layer.
-    IfcText Description();
-    void setDescription(IfcText v);
+    std::string Description() const;
+    void setDescription(std::string v);
     /// The set of layered items, which are assigned to this layer.
-    SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > AssignedItems();
-    void setAssignedItems(SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > v);
+    IfcEntityList::ptr AssignedItems() const;
+    void setAssignedItems(IfcEntityList::ptr v);
     /// Whether the optional attribute Identifier is defined for this IfcPresentationLayerAssignment
-    bool hasIdentifier();
+    bool hasIdentifier() const;
     /// An (internal) identifier assigned to the layer.
-    IfcIdentifier Identifier();
-    void setIdentifier(IfcIdentifier v);
+    std::string Identifier() const;
+    void setIdentifier(std::string v);
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_STRING; case 1: return IfcUtil::Argument_STRING; case 2: return IfcUtil::Argument_ENTITY_LIST; case 3: return IfcUtil::Argument_STRING; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcLabel; case 1: return Type::IfcText; case 2: return Type::IfcLayeredItem; case 3: return Type::IfcIdentifier; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Name"; case 1: return "Description"; case 2: return "AssignedItems"; case 3: return "Identifier"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcPresentationLayerAssignment (IfcAbstractEntityPtr e);
-    IfcPresentationLayerAssignment (IfcLabel v1_Name, boost::optional< IfcText > v2_Description, IfcEntities v3_AssignedItems, boost::optional< IfcIdentifier > v4_Identifier);
-    typedef IfcPresentationLayerAssignment* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcPresentationLayerAssignment > > list;
-    typedef IfcTemplatedEntityList< IfcPresentationLayerAssignment >::it it;
+    IfcPresentationLayerAssignment (IfcAbstractEntity* e);
+    IfcPresentationLayerAssignment (std::string v1_Name, boost::optional< std::string > v2_Description, IfcEntityList::ptr v3_AssignedItems, boost::optional< std::string > v4_Identifier);
+    typedef IfcTemplatedEntityList< IfcPresentationLayerAssignment > list;
 };
 /// An IfcPresentationLayerAssignmentWithStyle extends the presentation layer assignment with capabilities to define visibility control, access control and common style information.
 /// 
@@ -9375,33 +10579,32 @@ class IfcPresentationLayerAssignment : public IfcUtil::IfcBaseEntity {
 class IfcPresentationLayerWithStyle : public IfcPresentationLayerAssignment {
 public:
     /// A logical setting, TRUE indicates that the layer is set to 'On', FALSE that the layer is set to 'Off', UNKNOWN that such information is not available.
-    bool LayerOn();
+    bool LayerOn() const;
     void setLayerOn(bool v);
     /// A logical setting, TRUE indicates that the layer is set to 'Frozen', FALSE that the layer is set to 'Not frozen', UNKNOWN that such information is not available.
-    bool LayerFrozen();
+    bool LayerFrozen() const;
     void setLayerFrozen(bool v);
     /// A logical setting, TRUE indicates that the layer is set to 'Blocked', FALSE that the layer is set to 'Not blocked', UNKNOWN that such information is not available.
-    bool LayerBlocked();
+    bool LayerBlocked() const;
     void setLayerBlocked(bool v);
     /// Assignment of presentation styles to the layer to provide a default style for representation items.
     /// 
     /// NOTE  In most cases the assignment of styles to a layer is restricted to an IfcCurveStyle representing the layer curve colour, layer curve thickness, and layer curve type.
     /// 
     /// IFC2x4 CHANGE  The data type has been changed from IfcPresentationStyleSelect (now deprecated) to IfcPresentationStyle.
-    SHARED_PTR< IfcTemplatedEntityList< IfcPresentationStyle > > LayerStyles();
-    void setLayerStyles(SHARED_PTR< IfcTemplatedEntityList< IfcPresentationStyle > > v);
+    IfcTemplatedEntityList< IfcPresentationStyle >::ptr LayerStyles() const;
+    void setLayerStyles(IfcTemplatedEntityList< IfcPresentationStyle >::ptr v);
     virtual unsigned int getArgumentCount() const { return 8; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 4: return IfcUtil::Argument_BOOL; case 5: return IfcUtil::Argument_BOOL; case 6: return IfcUtil::Argument_BOOL; case 7: return IfcUtil::Argument_ENTITY_LIST; } return IfcPresentationLayerAssignment::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 4: return Type::UNDEFINED; case 5: return Type::UNDEFINED; case 6: return Type::UNDEFINED; case 7: return Type::IfcPresentationStyle; } return IfcPresentationLayerAssignment::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 4: return "LayerOn"; case 5: return "LayerFrozen"; case 6: return "LayerBlocked"; case 7: return "LayerStyles"; } return IfcPresentationLayerAssignment::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcPresentationLayerWithStyle (IfcAbstractEntityPtr e);
-    IfcPresentationLayerWithStyle (IfcLabel v1_Name, boost::optional< IfcText > v2_Description, IfcEntities v3_AssignedItems, boost::optional< IfcIdentifier > v4_Identifier, bool v5_LayerOn, bool v6_LayerFrozen, bool v7_LayerBlocked, SHARED_PTR< IfcTemplatedEntityList< IfcPresentationStyle > > v8_LayerStyles);
-    typedef IfcPresentationLayerWithStyle* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcPresentationLayerWithStyle > > list;
-    typedef IfcTemplatedEntityList< IfcPresentationLayerWithStyle >::it it;
+    IfcPresentationLayerWithStyle (IfcAbstractEntity* e);
+    IfcPresentationLayerWithStyle (std::string v1_Name, boost::optional< std::string > v2_Description, IfcEntityList::ptr v3_AssignedItems, boost::optional< std::string > v4_Identifier, bool v5_LayerOn, bool v6_LayerFrozen, bool v7_LayerBlocked, IfcTemplatedEntityList< IfcPresentationStyle >::ptr v8_LayerStyles);
+    typedef IfcTemplatedEntityList< IfcPresentationLayerWithStyle > list;
 };
 /// IfcPresentationStyle is an abstract generalization of style table for presentation information assigned to geometric representation items. It includes styles for curves, areas, surfaces, text and symbols. Style information may include colour, hatching, rendering, and text fonts.
 /// 
@@ -9411,22 +10614,21 @@ class IfcPresentationLayerWithStyle : public IfcPresentationLayerAssignment {
 class IfcPresentationStyle : public IfcUtil::IfcBaseEntity {
 public:
     /// Whether the optional attribute Name is defined for this IfcPresentationStyle
-    bool hasName();
+    bool hasName() const;
     /// Name of the presentation style.
-    IfcLabel Name();
-    void setName(IfcLabel v);
+    std::string Name() const;
+    void setName(std::string v);
     virtual unsigned int getArgumentCount() const { return 1; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_STRING; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcLabel; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Name"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcPresentationStyle (IfcAbstractEntityPtr e);
-    IfcPresentationStyle (boost::optional< IfcLabel > v1_Name);
-    typedef IfcPresentationStyle* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcPresentationStyle > > list;
-    typedef IfcTemplatedEntityList< IfcPresentationStyle >::it it;
+    IfcPresentationStyle (IfcAbstractEntity* e);
+    IfcPresentationStyle (boost::optional< std::string > v1_Name);
+    typedef IfcTemplatedEntityList< IfcPresentationStyle > list;
 };
 /// Definition from ISO/CD 10303-46:1992: The presentation style assignment is a set of styles which are assigned to styled items for the purpose of presenting these styled items. 
 /// 
@@ -9436,20 +10638,19 @@ class IfcPresentationStyle : public IfcUtil::IfcBaseEntity {
 class IfcPresentationStyleAssignment : public IfcUtil::IfcBaseEntity {
 public:
     /// A set of presentation styles that are assigned to styled items.
-    SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > Styles();
-    void setStyles(SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > v);
+    IfcEntityList::ptr Styles() const;
+    void setStyles(IfcEntityList::ptr v);
     virtual unsigned int getArgumentCount() const { return 1; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY_LIST; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcPresentationStyleSelect; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Styles"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcPresentationStyleAssignment (IfcAbstractEntityPtr e);
-    IfcPresentationStyleAssignment (IfcEntities v1_Styles);
-    typedef IfcPresentationStyleAssignment* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcPresentationStyleAssignment > > list;
-    typedef IfcTemplatedEntityList< IfcPresentationStyleAssignment >::it it;
+    IfcPresentationStyleAssignment (IfcAbstractEntity* e);
+    IfcPresentationStyleAssignment (IfcEntityList::ptr v1_Styles);
+    typedef IfcTemplatedEntityList< IfcPresentationStyleAssignment > list;
 };
 /// IfcProductRepresentation defines a representation of a
 /// product, including its (geometric or topological) representation.
@@ -9471,30 +10672,29 @@ class IfcPresentationStyleAssignment : public IfcUtil::IfcBaseEntity {
 class IfcProductRepresentation : public IfcUtil::IfcBaseEntity {
 public:
     /// Whether the optional attribute Name is defined for this IfcProductRepresentation
-    bool hasName();
+    bool hasName() const;
     /// The word or group of words by which the product representation is known.
-    IfcLabel Name();
-    void setName(IfcLabel v);
+    std::string Name() const;
+    void setName(std::string v);
     /// Whether the optional attribute Description is defined for this IfcProductRepresentation
-    bool hasDescription();
+    bool hasDescription() const;
     /// The word or group of words that characterize the product representation. It can be used to add additional meaning to the name of the product representation.
-    IfcText Description();
-    void setDescription(IfcText v);
+    std::string Description() const;
+    void setDescription(std::string v);
     /// Contained list of representations (including shape representations). Each member defines a valid representation of a particular type within a particular representation context.
-    SHARED_PTR< IfcTemplatedEntityList< IfcRepresentation > > Representations();
-    void setRepresentations(SHARED_PTR< IfcTemplatedEntityList< IfcRepresentation > > v);
+    IfcTemplatedEntityList< IfcRepresentation >::ptr Representations() const;
+    void setRepresentations(IfcTemplatedEntityList< IfcRepresentation >::ptr v);
     virtual unsigned int getArgumentCount() const { return 3; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_STRING; case 1: return IfcUtil::Argument_STRING; case 2: return IfcUtil::Argument_ENTITY_LIST; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcLabel; case 1: return Type::IfcText; case 2: return Type::IfcRepresentation; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Name"; case 1: return "Description"; case 2: return "Representations"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcProductRepresentation (IfcAbstractEntityPtr e);
-    IfcProductRepresentation (boost::optional< IfcLabel > v1_Name, boost::optional< IfcText > v2_Description, SHARED_PTR< IfcTemplatedEntityList< IfcRepresentation > > v3_Representations);
-    typedef IfcProductRepresentation* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcProductRepresentation > > list;
-    typedef IfcTemplatedEntityList< IfcProductRepresentation >::it it;
+    IfcProductRepresentation (IfcAbstractEntity* e);
+    IfcProductRepresentation (boost::optional< std::string > v1_Name, boost::optional< std::string > v2_Description, IfcTemplatedEntityList< IfcRepresentation >::ptr v3_Representations);
+    typedef IfcTemplatedEntityList< IfcProductRepresentation > list;
 };
 /// IfcProfileDef
 /// is the supertype of all definitions of standard and arbitrary profiles
@@ -9669,27 +10869,26 @@ class IfcProductRepresentation : public IfcUtil::IfcBaseEntity {
 class IfcProfileDef : public IfcUtil::IfcBaseEntity {
 public:
     /// Defines the type of geometry into which this profile definition shall be resolved, either a curve or a surface area. In case of curve the profile should be referenced by a swept surface, in case of area the profile should be referenced by a swept area solid.
-    IfcProfileTypeEnum::IfcProfileTypeEnum ProfileType();
+    IfcProfileTypeEnum::IfcProfileTypeEnum ProfileType() const;
     void setProfileType(IfcProfileTypeEnum::IfcProfileTypeEnum v);
     /// Whether the optional attribute ProfileName is defined for this IfcProfileDef
-    bool hasProfileName();
+    bool hasProfileName() const;
     /// Human-readable name of the profile, for example according to a standard profile table. As noted above, machine-readable standardized profile designations should be provided in IfcExternalReference.ItemReference.
-    IfcLabel ProfileName();
-    void setProfileName(IfcLabel v);
+    std::string ProfileName() const;
+    void setProfileName(std::string v);
     virtual unsigned int getArgumentCount() const { return 2; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENUMERATION; case 1: return IfcUtil::Argument_STRING; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcProfileTypeEnum; case 1: return Type::IfcLabel; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "ProfileType"; case 1: return "ProfileName"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcExternalReferenceRelationship > > HasExternalReference(); // INVERSE IfcExternalReferenceRelationship::RelatedResourceObjects
-    SHARED_PTR< IfcTemplatedEntityList< IfcProfileProperties > > HasProperties(); // INVERSE IfcProfileProperties::ProfileDefinition
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcExternalReferenceRelationship >::ptr HasExternalReference() const; // INVERSE IfcExternalReferenceRelationship::RelatedResourceObjects
+    IfcTemplatedEntityList< IfcProfileProperties >::ptr HasProperties() const; // INVERSE IfcProfileProperties::ProfileDefinition
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcProfileDef (IfcAbstractEntityPtr e);
-    IfcProfileDef (IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< IfcLabel > v2_ProfileName);
-    typedef IfcProfileDef* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcProfileDef > > list;
-    typedef IfcTemplatedEntityList< IfcProfileDef >::it it;
+    IfcProfileDef (IfcAbstractEntity* e);
+    IfcProfileDef (IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< std::string > v2_ProfileName);
+    typedef IfcTemplatedEntityList< IfcProfileDef > list;
 };
 /// Definition from OpenGIS® Abstract Specification,
 ///   Topic 2: A 2D (or with vertical coordinate axis 3D)
@@ -9717,56 +10916,54 @@ class IfcProfileDef : public IfcUtil::IfcBaseEntity {
 class IfcProjectedCRS : public IfcCoordinateReferenceSystem {
 public:
     /// Whether the optional attribute MapProjection is defined for this IfcProjectedCRS
-    bool hasMapProjection();
+    bool hasMapProjection() const;
     /// Name by which the map projection is identified.
     /// 
     /// UTM
     ///   Gaus-Krueger
-    IfcIdentifier MapProjection();
-    void setMapProjection(IfcIdentifier v);
+    std::string MapProjection() const;
+    void setMapProjection(std::string v);
     /// Whether the optional attribute MapZone is defined for this IfcProjectedCRS
-    bool hasMapZone();
+    bool hasMapZone() const;
     /// Name by which the map zone, relating to the MapProjection, is identified. Examples are
     /// 
     /// for UTM, the zone number, like 32 for UTM32
     ///   for Gaus-Krueger, the zones of longitudinal width, like 3'
-    IfcIdentifier MapZone();
-    void setMapZone(IfcIdentifier v);
+    std::string MapZone() const;
+    void setMapZone(std::string v);
     /// Whether the optional attribute MapUnit is defined for this IfcProjectedCRS
-    bool hasMapUnit();
+    bool hasMapUnit() const;
     /// Unit of the coordinate axes composing the map coordinate system.
     /// NOTE  Only length measures are in scope and all two or three axes of the map coordinate system shall have the same length unit.
-    IfcNamedUnit* MapUnit();
+    IfcNamedUnit* MapUnit() const;
     void setMapUnit(IfcNamedUnit* v);
     virtual unsigned int getArgumentCount() const { return 7; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 4: return IfcUtil::Argument_STRING; case 5: return IfcUtil::Argument_STRING; case 6: return IfcUtil::Argument_ENTITY; } return IfcCoordinateReferenceSystem::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 4: return Type::IfcIdentifier; case 5: return Type::IfcIdentifier; case 6: return Type::IfcNamedUnit; } return IfcCoordinateReferenceSystem::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 4: return "MapProjection"; case 5: return "MapZone"; case 6: return "MapUnit"; } return IfcCoordinateReferenceSystem::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcProjectedCRS (IfcAbstractEntityPtr e);
-    IfcProjectedCRS (boost::optional< IfcLabel > v1_Name, boost::optional< IfcText > v2_Description, IfcIdentifier v3_GeodeticDatum, boost::optional< IfcIdentifier > v4_VerticalDatum, boost::optional< IfcIdentifier > v5_MapProjection, boost::optional< IfcIdentifier > v6_MapZone, IfcNamedUnit* v7_MapUnit);
-    typedef IfcProjectedCRS* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcProjectedCRS > > list;
-    typedef IfcTemplatedEntityList< IfcProjectedCRS >::it it;
+    IfcProjectedCRS (IfcAbstractEntity* e);
+    IfcProjectedCRS (boost::optional< std::string > v1_Name, boost::optional< std::string > v2_Description, std::string v3_GeodeticDatum, boost::optional< std::string > v4_VerticalDatum, boost::optional< std::string > v5_MapProjection, boost::optional< std::string > v6_MapZone, IfcNamedUnit* v7_MapUnit);
+    typedef IfcTemplatedEntityList< IfcProjectedCRS > list;
 };
 
 class IfcPropertyAbstraction : public IfcUtil::IfcBaseEntity {
 public:
     virtual unsigned int getArgumentCount() const { return 0; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcExternalReferenceRelationship > > HasExternalReferences(); // INVERSE IfcExternalReferenceRelationship::RelatedResourceObjects
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcExternalReferenceRelationship >::ptr HasExternalReferences() const; // INVERSE IfcExternalReferenceRelationship::RelatedResourceObjects
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcPropertyAbstraction (IfcAbstractEntityPtr e);
+    IfcPropertyAbstraction (IfcAbstractEntity* e);
     IfcPropertyAbstraction ();
-    typedef IfcPropertyAbstraction* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcPropertyAbstraction > > list;
-    typedef IfcTemplatedEntityList< IfcPropertyAbstraction >::it it;
+    typedef IfcTemplatedEntityList< IfcPropertyAbstraction > list;
 };
 /// IfcPropertyEnumeration is a collection of simple
 /// or measure values that define a prescribed set of alternatives from
@@ -9817,28 +11014,27 @@ class IfcPropertyAbstraction : public IfcUtil::IfcBaseEntity {
 class IfcPropertyEnumeration : public IfcPropertyAbstraction {
 public:
     /// Name of this enumeration.
-    IfcLabel Name();
-    void setName(IfcLabel v);
+    std::string Name() const;
+    void setName(std::string v);
     /// List of values that form the enumeration.
-    SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > EnumerationValues();
-    void setEnumerationValues(SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > v);
+    IfcEntityList::ptr EnumerationValues() const;
+    void setEnumerationValues(IfcEntityList::ptr v);
     /// Whether the optional attribute Unit is defined for this IfcPropertyEnumeration
-    bool hasUnit();
+    bool hasUnit() const;
     /// Unit for the enumerator values, if not given, the default value for the measure type (given by the TYPE of nominal value) is used as defined by the global unit assignment at IfcProject.
-    IfcUnit Unit();
-    void setUnit(IfcUnit v);
+    IfcUnit* Unit() const;
+    void setUnit(IfcUnit* v);
     virtual unsigned int getArgumentCount() const { return 3; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_STRING; case 1: return IfcUtil::Argument_ENTITY_LIST; case 2: return IfcUtil::Argument_ENTITY; } return IfcPropertyAbstraction::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcLabel; case 1: return Type::IfcValue; case 2: return Type::IfcUnit; } return IfcPropertyAbstraction::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Name"; case 1: return "EnumerationValues"; case 2: return "Unit"; } return IfcPropertyAbstraction::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcPropertyEnumeration (IfcAbstractEntityPtr e);
-    IfcPropertyEnumeration (IfcLabel v1_Name, IfcEntities v2_EnumerationValues, boost::optional< IfcUnit > v3_Unit);
-    typedef IfcPropertyEnumeration* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcPropertyEnumeration > > list;
-    typedef IfcTemplatedEntityList< IfcPropertyEnumeration >::it it;
+    IfcPropertyEnumeration (IfcAbstractEntity* e);
+    IfcPropertyEnumeration (std::string v1_Name, IfcEntityList::ptr v2_EnumerationValues, IfcUnit* v3_Unit);
+    typedef IfcTemplatedEntityList< IfcPropertyEnumeration > list;
 };
 /// IfcQuantityArea is a physical quantity that defines a derived area measure to provide an element's physical property. It is normally derived from the physical properties of the element under the specific measure rules given by a method of measurement. 
 /// 
@@ -9848,27 +11044,26 @@ class IfcPropertyEnumeration : public IfcPropertyAbstraction {
 class IfcQuantityArea : public IfcPhysicalSimpleQuantity {
 public:
     /// Area measure value of this quantity.
-    IfcAreaMeasure AreaValue();
-    void setAreaValue(IfcAreaMeasure v);
+    double AreaValue() const;
+    void setAreaValue(double v);
     /// Whether the optional attribute Formula is defined for this IfcQuantityArea
-    bool hasFormula();
+    bool hasFormula() const;
     /// A formula by which the quantity has been calculated. It can be assigned in addition to the actual value of the quantity. Formulas could be mathematic calculations (like width x height), database links, or a combination. The formula is for informational purposes only.
     /// 
     /// IFC2x4 CHANGE  Attribute added to the end of the attribute list.
-    IfcLabel Formula();
-    void setFormula(IfcLabel v);
+    std::string Formula() const;
+    void setFormula(std::string v);
     virtual unsigned int getArgumentCount() const { return 5; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 3: return IfcUtil::Argument_DOUBLE; case 4: return IfcUtil::Argument_STRING; } return IfcPhysicalSimpleQuantity::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 3: return Type::IfcAreaMeasure; case 4: return Type::IfcLabel; } return IfcPhysicalSimpleQuantity::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 3: return "AreaValue"; case 4: return "Formula"; } return IfcPhysicalSimpleQuantity::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcQuantityArea (IfcAbstractEntityPtr e);
-    IfcQuantityArea (IfcLabel v1_Name, boost::optional< IfcText > v2_Description, IfcNamedUnit* v3_Unit, IfcAreaMeasure v4_AreaValue, boost::optional< IfcLabel > v5_Formula);
-    typedef IfcQuantityArea* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcQuantityArea > > list;
-    typedef IfcTemplatedEntityList< IfcQuantityArea >::it it;
+    IfcQuantityArea (IfcAbstractEntity* e);
+    IfcQuantityArea (std::string v1_Name, boost::optional< std::string > v2_Description, IfcNamedUnit* v3_Unit, double v4_AreaValue, boost::optional< std::string > v5_Formula);
+    typedef IfcTemplatedEntityList< IfcQuantityArea > list;
 };
 /// IfcQuantityCount is a physical quantity that defines a derived count measure to provide an element's physical property. It is normally derived from the physical properties of the element under the specific measure rules given by a method of measurement.
 /// 
@@ -9878,27 +11073,26 @@ class IfcQuantityArea : public IfcPhysicalSimpleQuantity {
 class IfcQuantityCount : public IfcPhysicalSimpleQuantity {
 public:
     /// Count measure value of this quantity.
-    IfcCountMeasure CountValue();
-    void setCountValue(IfcCountMeasure v);
+    double CountValue() const;
+    void setCountValue(double v);
     /// Whether the optional attribute Formula is defined for this IfcQuantityCount
-    bool hasFormula();
+    bool hasFormula() const;
     /// A formula by which the quantity has been calculated. It can be assigned in addition to the actual value of the quantity. Formulas could be mathematic calculations (like width x height), database links, or a combination. The formula is for informational purposes only.
     /// 
     /// IFC2x4 CHANGE  Attribute added to the end of the attribute list.
-    IfcLabel Formula();
-    void setFormula(IfcLabel v);
+    std::string Formula() const;
+    void setFormula(std::string v);
     virtual unsigned int getArgumentCount() const { return 5; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 3: return IfcUtil::Argument_DOUBLE; case 4: return IfcUtil::Argument_STRING; } return IfcPhysicalSimpleQuantity::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 3: return Type::IfcCountMeasure; case 4: return Type::IfcLabel; } return IfcPhysicalSimpleQuantity::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 3: return "CountValue"; case 4: return "Formula"; } return IfcPhysicalSimpleQuantity::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcQuantityCount (IfcAbstractEntityPtr e);
-    IfcQuantityCount (IfcLabel v1_Name, boost::optional< IfcText > v2_Description, IfcNamedUnit* v3_Unit, IfcCountMeasure v4_CountValue, boost::optional< IfcLabel > v5_Formula);
-    typedef IfcQuantityCount* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcQuantityCount > > list;
-    typedef IfcTemplatedEntityList< IfcQuantityCount >::it it;
+    IfcQuantityCount (IfcAbstractEntity* e);
+    IfcQuantityCount (std::string v1_Name, boost::optional< std::string > v2_Description, IfcNamedUnit* v3_Unit, double v4_CountValue, boost::optional< std::string > v5_Formula);
+    typedef IfcTemplatedEntityList< IfcQuantityCount > list;
 };
 /// IfcQuantityLength is a physical quantity that defines a derived length measure to provide an element's physical property. It is normally derived from the physical properties of the element under the specific measure rules given by a method of measurement.
 /// 
@@ -9908,27 +11102,26 @@ class IfcQuantityCount : public IfcPhysicalSimpleQuantity {
 class IfcQuantityLength : public IfcPhysicalSimpleQuantity {
 public:
     /// Length measure value of this quantity.
-    IfcLengthMeasure LengthValue();
-    void setLengthValue(IfcLengthMeasure v);
+    double LengthValue() const;
+    void setLengthValue(double v);
     /// Whether the optional attribute Formula is defined for this IfcQuantityLength
-    bool hasFormula();
+    bool hasFormula() const;
     /// A formula by which the quantity has been calculated. It can be assigned in addition to the actual value of the quantity. Formulas could be mathematic calculations (like width x height), database links, or a combination. The formula is for informational purposes only.
     /// 
     /// IFC2x4 CHANGE  Attribute added to the end of the attribute list.
-    IfcLabel Formula();
-    void setFormula(IfcLabel v);
+    std::string Formula() const;
+    void setFormula(std::string v);
     virtual unsigned int getArgumentCount() const { return 5; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 3: return IfcUtil::Argument_DOUBLE; case 4: return IfcUtil::Argument_STRING; } return IfcPhysicalSimpleQuantity::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 3: return Type::IfcLengthMeasure; case 4: return Type::IfcLabel; } return IfcPhysicalSimpleQuantity::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 3: return "LengthValue"; case 4: return "Formula"; } return IfcPhysicalSimpleQuantity::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcQuantityLength (IfcAbstractEntityPtr e);
-    IfcQuantityLength (IfcLabel v1_Name, boost::optional< IfcText > v2_Description, IfcNamedUnit* v3_Unit, IfcLengthMeasure v4_LengthValue, boost::optional< IfcLabel > v5_Formula);
-    typedef IfcQuantityLength* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcQuantityLength > > list;
-    typedef IfcTemplatedEntityList< IfcQuantityLength >::it it;
+    IfcQuantityLength (IfcAbstractEntity* e);
+    IfcQuantityLength (std::string v1_Name, boost::optional< std::string > v2_Description, IfcNamedUnit* v3_Unit, double v4_LengthValue, boost::optional< std::string > v5_Formula);
+    typedef IfcTemplatedEntityList< IfcQuantityLength > list;
 };
 /// IfcQuantityTime is an element quantity that defines a time measure to provide an property of time related to an element. It is normally given by the recipe information of the element under the specific measure rules given by a method of measurement.
 /// 
@@ -9938,27 +11131,26 @@ class IfcQuantityLength : public IfcPhysicalSimpleQuantity {
 class IfcQuantityTime : public IfcPhysicalSimpleQuantity {
 public:
     /// Time measure value of this quantity.
-    IfcTimeMeasure TimeValue();
-    void setTimeValue(IfcTimeMeasure v);
+    double TimeValue() const;
+    void setTimeValue(double v);
     /// Whether the optional attribute Formula is defined for this IfcQuantityTime
-    bool hasFormula();
+    bool hasFormula() const;
     /// A formula by which the quantity has been calculated. It can be assigned in addition to the actual value of the quantity. Formulas could be mathematic calculations (like width x height), database links, or a combination. The formula is for informational purposes only.
     /// 
     /// IFC2x4 CHANGE  Attribute added to the end of the attribute list.
-    IfcLabel Formula();
-    void setFormula(IfcLabel v);
+    std::string Formula() const;
+    void setFormula(std::string v);
     virtual unsigned int getArgumentCount() const { return 5; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 3: return IfcUtil::Argument_DOUBLE; case 4: return IfcUtil::Argument_STRING; } return IfcPhysicalSimpleQuantity::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 3: return Type::IfcTimeMeasure; case 4: return Type::IfcLabel; } return IfcPhysicalSimpleQuantity::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 3: return "TimeValue"; case 4: return "Formula"; } return IfcPhysicalSimpleQuantity::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcQuantityTime (IfcAbstractEntityPtr e);
-    IfcQuantityTime (IfcLabel v1_Name, boost::optional< IfcText > v2_Description, IfcNamedUnit* v3_Unit, IfcTimeMeasure v4_TimeValue, boost::optional< IfcLabel > v5_Formula);
-    typedef IfcQuantityTime* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcQuantityTime > > list;
-    typedef IfcTemplatedEntityList< IfcQuantityTime >::it it;
+    IfcQuantityTime (IfcAbstractEntity* e);
+    IfcQuantityTime (std::string v1_Name, boost::optional< std::string > v2_Description, IfcNamedUnit* v3_Unit, double v4_TimeValue, boost::optional< std::string > v5_Formula);
+    typedef IfcTemplatedEntityList< IfcQuantityTime > list;
 };
 /// IfcQuantityVolume is a physical quantity that defines a derived volume measure to provide an element's physical property. It is normally derived from the physical properties of the element under the specific measure rules given by a method of measurement. 
 /// 
@@ -9968,27 +11160,26 @@ class IfcQuantityTime : public IfcPhysicalSimpleQuantity {
 class IfcQuantityVolume : public IfcPhysicalSimpleQuantity {
 public:
     /// Volume measure value of this quantity.
-    IfcVolumeMeasure VolumeValue();
-    void setVolumeValue(IfcVolumeMeasure v);
+    double VolumeValue() const;
+    void setVolumeValue(double v);
     /// Whether the optional attribute Formula is defined for this IfcQuantityVolume
-    bool hasFormula();
+    bool hasFormula() const;
     /// A formula by which the quantity has been calculated. It can be assigned in addition to the actual value of the quantity. Formulas could be mathematic calculations (like width x height), database links, or a combination. The formula is for informational purposes only.
     /// 
     /// IFC2x4 CHANGE  Attribute added to the end of the attribute list.
-    IfcLabel Formula();
-    void setFormula(IfcLabel v);
+    std::string Formula() const;
+    void setFormula(std::string v);
     virtual unsigned int getArgumentCount() const { return 5; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 3: return IfcUtil::Argument_DOUBLE; case 4: return IfcUtil::Argument_STRING; } return IfcPhysicalSimpleQuantity::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 3: return Type::IfcVolumeMeasure; case 4: return Type::IfcLabel; } return IfcPhysicalSimpleQuantity::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 3: return "VolumeValue"; case 4: return "Formula"; } return IfcPhysicalSimpleQuantity::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcQuantityVolume (IfcAbstractEntityPtr e);
-    IfcQuantityVolume (IfcLabel v1_Name, boost::optional< IfcText > v2_Description, IfcNamedUnit* v3_Unit, IfcVolumeMeasure v4_VolumeValue, boost::optional< IfcLabel > v5_Formula);
-    typedef IfcQuantityVolume* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcQuantityVolume > > list;
-    typedef IfcTemplatedEntityList< IfcQuantityVolume >::it it;
+    IfcQuantityVolume (IfcAbstractEntity* e);
+    IfcQuantityVolume (std::string v1_Name, boost::optional< std::string > v2_Description, IfcNamedUnit* v3_Unit, double v4_VolumeValue, boost::optional< std::string > v5_Formula);
+    typedef IfcTemplatedEntityList< IfcQuantityVolume > list;
 };
 /// IfcQuantityWeight is a physical element quantity that defines a derived weight measure to provide an element's physical property. It is normally derived from the physical properties of the element under the specific measure rules given by a method of measurement. 
 /// 
@@ -9998,27 +11189,26 @@ class IfcQuantityVolume : public IfcPhysicalSimpleQuantity {
 class IfcQuantityWeight : public IfcPhysicalSimpleQuantity {
 public:
     /// Mass measure value of this quantity.
-    IfcMassMeasure WeightValue();
-    void setWeightValue(IfcMassMeasure v);
+    double WeightValue() const;
+    void setWeightValue(double v);
     /// Whether the optional attribute Formula is defined for this IfcQuantityWeight
-    bool hasFormula();
+    bool hasFormula() const;
     /// A formula by which the quantity has been calculated. It can be assigned in addition to the actual value of the quantity. Formulas could be mathematic calculations (like width x height), database links, or a combination. The formula is for informational purposes only.
     /// 
     /// IFC2x4 CHANGE  Attribute added to the end of the attribute list.
-    IfcLabel Formula();
-    void setFormula(IfcLabel v);
+    std::string Formula() const;
+    void setFormula(std::string v);
     virtual unsigned int getArgumentCount() const { return 5; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 3: return IfcUtil::Argument_DOUBLE; case 4: return IfcUtil::Argument_STRING; } return IfcPhysicalSimpleQuantity::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 3: return Type::IfcMassMeasure; case 4: return Type::IfcLabel; } return IfcPhysicalSimpleQuantity::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 3: return "WeightValue"; case 4: return "Formula"; } return IfcPhysicalSimpleQuantity::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcQuantityWeight (IfcAbstractEntityPtr e);
-    IfcQuantityWeight (IfcLabel v1_Name, boost::optional< IfcText > v2_Description, IfcNamedUnit* v3_Unit, IfcMassMeasure v4_WeightValue, boost::optional< IfcLabel > v5_Formula);
-    typedef IfcQuantityWeight* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcQuantityWeight > > list;
-    typedef IfcTemplatedEntityList< IfcQuantityWeight >::it it;
+    IfcQuantityWeight (IfcAbstractEntity* e);
+    IfcQuantityWeight (std::string v1_Name, boost::optional< std::string > v2_Description, IfcNamedUnit* v3_Unit, double v4_WeightValue, boost::optional< std::string > v5_Formula);
+    typedef IfcTemplatedEntityList< IfcQuantityWeight > list;
 };
 /// IfcRecurrencePattern defines repetitive time periods on the basis of regular recurrences such as each Monday in a week, or every third Tuesday in a month.  The population of the remaining attributes such as DayComponent, Position, and Interval depend on the specified recurrence type.
 /// 
@@ -10032,101 +11222,99 @@ class IfcRecurrencePattern : public IfcUtil::IfcBaseEntity {
     ///   attributes and decides about possible attribute
     ///   combinations, i.e. what attributes are needed to fully
     ///   describe the pattern type.
-    IfcRecurrenceTypeEnum::IfcRecurrenceTypeEnum RecurrenceType();
+    IfcRecurrenceTypeEnum::IfcRecurrenceTypeEnum RecurrenceType() const;
     void setRecurrenceType(IfcRecurrenceTypeEnum::IfcRecurrenceTypeEnum v);
     /// Whether the optional attribute DayComponent is defined for this IfcRecurrencePattern
-    bool hasDayComponent();
+    bool hasDayComponent() const;
     /// The position of the specified day in a month.
-    std::vector< IfcDayInMonthNumber > /*[1:?]*/ DayComponent();
-    void setDayComponent(std::vector< IfcDayInMonthNumber > /*[1:?]*/ v);
+    std::vector< int > /*[1:?]*/ DayComponent() const;
+    void setDayComponent(std::vector< int > /*[1:?]*/ v);
     /// Whether the optional attribute WeekdayComponent is defined for this IfcRecurrencePattern
-    bool hasWeekdayComponent();
+    bool hasWeekdayComponent() const;
     /// The weekday name of the specified day in a week.
-    std::vector< IfcDayInWeekNumber > /*[1:?]*/ WeekdayComponent();
-    void setWeekdayComponent(std::vector< IfcDayInWeekNumber > /*[1:?]*/ v);
+    std::vector< int > /*[1:?]*/ WeekdayComponent() const;
+    void setWeekdayComponent(std::vector< int > /*[1:?]*/ v);
     /// Whether the optional attribute MonthComponent is defined for this IfcRecurrencePattern
-    bool hasMonthComponent();
+    bool hasMonthComponent() const;
     /// The position of the specified month in a year.
-    std::vector< IfcMonthInYearNumber > /*[1:?]*/ MonthComponent();
-    void setMonthComponent(std::vector< IfcMonthInYearNumber > /*[1:?]*/ v);
+    std::vector< int > /*[1:?]*/ MonthComponent() const;
+    void setMonthComponent(std::vector< int > /*[1:?]*/ v);
     /// Whether the optional attribute Position is defined for this IfcRecurrencePattern
-    bool hasPosition();
+    bool hasPosition() const;
     /// The position of the specified component, e.g. the 3rd
     ///   (position=3) Tuesday (weekday component) in a month. A
     ///   negative position value is used to define the last position 
     ///   of the component (-1), the next to last position (-2) etc.
-    IfcInteger Position();
-    void setPosition(IfcInteger v);
+    int Position() const;
+    void setPosition(int v);
     /// Whether the optional attribute Interval is defined for this IfcRecurrencePattern
-    bool hasInterval();
+    bool hasInterval() const;
     /// An interval can be given according to the pattern type. An
     ///   interval value of 2 can for instance every two days, weeks,
     ///   months, years. An empty interval value is regarded as 1. The
     ///   used interval values should be in a reasonable range, e.g.
     ///   not 0 or <0.
-    IfcInteger Interval();
-    void setInterval(IfcInteger v);
+    int Interval() const;
+    void setInterval(int v);
     /// Whether the optional attribute Occurrences is defined for this IfcRecurrencePattern
-    bool hasOccurrences();
+    bool hasOccurrences() const;
     /// Defines the number of occurrences of this pattern, e.g. a weekly 
     ///   event might be defined to occur 5 times before it stops.
-    IfcInteger Occurrences();
-    void setOccurrences(IfcInteger v);
+    int Occurrences() const;
+    void setOccurrences(int v);
     /// Whether the optional attribute TimePeriods is defined for this IfcRecurrencePattern
-    bool hasTimePeriods();
+    bool hasTimePeriods() const;
     /// List of time periods that are defined by a start and end time
     ///   of the recurring element (day). The order of the list should
     ///   reflect the sequence of the time periods.
-    SHARED_PTR< IfcTemplatedEntityList< IfcTimePeriod > > TimePeriods();
-    void setTimePeriods(SHARED_PTR< IfcTemplatedEntityList< IfcTimePeriod > > v);
+    IfcTemplatedEntityList< IfcTimePeriod >::ptr TimePeriods() const;
+    void setTimePeriods(IfcTemplatedEntityList< IfcTimePeriod >::ptr v);
     virtual unsigned int getArgumentCount() const { return 8; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENUMERATION; case 1: return IfcUtil::Argument_VECTOR_INT; case 2: return IfcUtil::Argument_VECTOR_INT; case 3: return IfcUtil::Argument_VECTOR_INT; case 4: return IfcUtil::Argument_INT; case 5: return IfcUtil::Argument_INT; case 6: return IfcUtil::Argument_INT; case 7: return IfcUtil::Argument_ENTITY_LIST; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcRecurrenceTypeEnum; case 1: return Type::IfcDayInMonthNumber; case 2: return Type::IfcDayInWeekNumber; case 3: return Type::IfcMonthInYearNumber; case 4: return Type::IfcInteger; case 5: return Type::IfcInteger; case 6: return Type::IfcInteger; case 7: return Type::IfcTimePeriod; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "RecurrenceType"; case 1: return "DayComponent"; case 2: return "WeekdayComponent"; case 3: return "MonthComponent"; case 4: return "Position"; case 5: return "Interval"; case 6: return "Occurrences"; case 7: return "TimePeriods"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRecurrencePattern (IfcAbstractEntityPtr e);
-    IfcRecurrencePattern (IfcRecurrenceTypeEnum::IfcRecurrenceTypeEnum v1_RecurrenceType, boost::optional< std::vector< IfcDayInMonthNumber > /*[1:?]*/ > v2_DayComponent, boost::optional< std::vector< IfcDayInWeekNumber > /*[1:?]*/ > v3_WeekdayComponent, boost::optional< std::vector< IfcMonthInYearNumber > /*[1:?]*/ > v4_MonthComponent, boost::optional< IfcInteger > v5_Position, boost::optional< IfcInteger > v6_Interval, boost::optional< IfcInteger > v7_Occurrences, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcTimePeriod > > > v8_TimePeriods);
-    typedef IfcRecurrencePattern* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRecurrencePattern > > list;
-    typedef IfcTemplatedEntityList< IfcRecurrencePattern >::it it;
+    IfcRecurrencePattern (IfcAbstractEntity* e);
+    IfcRecurrencePattern (IfcRecurrenceTypeEnum::IfcRecurrenceTypeEnum v1_RecurrenceType, boost::optional< std::vector< int > /*[1:?]*/ > v2_DayComponent, boost::optional< std::vector< int > /*[1:?]*/ > v3_WeekdayComponent, boost::optional< std::vector< int > /*[1:?]*/ > v4_MonthComponent, boost::optional< int > v5_Position, boost::optional< int > v6_Interval, boost::optional< int > v7_Occurrences, boost::optional< IfcTemplatedEntityList< IfcTimePeriod >::ptr > v8_TimePeriods);
+    typedef IfcTemplatedEntityList< IfcRecurrencePattern > list;
 };
 
 class IfcReference : public IfcUtil::IfcBaseEntity {
 public:
     /// Whether the optional attribute TypeIdentifier is defined for this IfcReference
-    bool hasTypeIdentifier();
-    IfcIdentifier TypeIdentifier();
-    void setTypeIdentifier(IfcIdentifier v);
+    bool hasTypeIdentifier() const;
+    std::string TypeIdentifier() const;
+    void setTypeIdentifier(std::string v);
     /// Whether the optional attribute AttributeIdentifier is defined for this IfcReference
-    bool hasAttributeIdentifier();
-    IfcIdentifier AttributeIdentifier();
-    void setAttributeIdentifier(IfcIdentifier v);
+    bool hasAttributeIdentifier() const;
+    std::string AttributeIdentifier() const;
+    void setAttributeIdentifier(std::string v);
     /// Whether the optional attribute InstanceName is defined for this IfcReference
-    bool hasInstanceName();
-    IfcLabel InstanceName();
-    void setInstanceName(IfcLabel v);
+    bool hasInstanceName() const;
+    std::string InstanceName() const;
+    void setInstanceName(std::string v);
     /// Whether the optional attribute ListPositions is defined for this IfcReference
-    bool hasListPositions();
-    std::vector< int > /*[1:?]*/ ListPositions();
+    bool hasListPositions() const;
+    std::vector< int > /*[1:?]*/ ListPositions() const;
     void setListPositions(std::vector< int > /*[1:?]*/ v);
     /// Whether the optional attribute InnerReference is defined for this IfcReference
-    bool hasInnerReference();
-    IfcReference* InnerReference();
+    bool hasInnerReference() const;
+    IfcReference* InnerReference() const;
     void setInnerReference(IfcReference* v);
     virtual unsigned int getArgumentCount() const { return 5; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_STRING; case 1: return IfcUtil::Argument_STRING; case 2: return IfcUtil::Argument_STRING; case 3: return IfcUtil::Argument_VECTOR_INT; case 4: return IfcUtil::Argument_ENTITY; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcIdentifier; case 1: return Type::IfcIdentifier; case 2: return Type::IfcLabel; case 3: return Type::UNDEFINED; case 4: return Type::IfcReference; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "TypeIdentifier"; case 1: return "AttributeIdentifier"; case 2: return "InstanceName"; case 3: return "ListPositions"; case 4: return "InnerReference"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcReference (IfcAbstractEntityPtr e);
-    IfcReference (boost::optional< IfcIdentifier > v1_TypeIdentifier, boost::optional< IfcIdentifier > v2_AttributeIdentifier, boost::optional< IfcLabel > v3_InstanceName, boost::optional< std::vector< int > /*[1:?]*/ > v4_ListPositions, IfcReference* v5_InnerReference);
-    typedef IfcReference* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcReference > > list;
-    typedef IfcTemplatedEntityList< IfcReference >::it it;
+    IfcReference (IfcAbstractEntity* e);
+    IfcReference (boost::optional< std::string > v1_TypeIdentifier, boost::optional< std::string > v2_AttributeIdentifier, boost::optional< std::string > v3_InstanceName, boost::optional< std::vector< int > /*[1:?]*/ > v4_ListPositions, IfcReference* v5_InnerReference);
+    typedef IfcTemplatedEntityList< IfcReference > list;
 };
 /// Definition from ISO/CD 10303-43:1992: A
 ///   representation is one or more representation items that are
@@ -10177,37 +11365,36 @@ class IfcReference : public IfcUtil::IfcBaseEntity {
 class IfcRepresentation : public IfcUtil::IfcBaseEntity {
 public:
     /// Definition of the representation context for which the different subtypes of representation are valid.
-    IfcRepresentationContext* ContextOfItems();
+    IfcRepresentationContext* ContextOfItems() const;
     void setContextOfItems(IfcRepresentationContext* v);
     /// Whether the optional attribute RepresentationIdentifier is defined for this IfcRepresentation
-    bool hasRepresentationIdentifier();
+    bool hasRepresentationIdentifier() const;
     /// The optional identifier of the representation as used within a project.
-    IfcLabel RepresentationIdentifier();
-    void setRepresentationIdentifier(IfcLabel v);
+    std::string RepresentationIdentifier() const;
+    void setRepresentationIdentifier(std::string v);
     /// Whether the optional attribute RepresentationType is defined for this IfcRepresentation
-    bool hasRepresentationType();
+    bool hasRepresentationType() const;
     /// The description of the type of a representation context. The representation type defines the type of geometry or topology used for representing the product representation. More information is given at the subtypes IfcShapeRepresentation and IfcTopologyRepresentation.
     /// The supported values for context type are to be specified by implementers agreements.
-    IfcLabel RepresentationType();
-    void setRepresentationType(IfcLabel v);
+    std::string RepresentationType() const;
+    void setRepresentationType(std::string v);
     /// Set of geometric representation items that are defined for this representation.
-    SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationItem > > Items();
-    void setItems(SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationItem > > v);
+    IfcTemplatedEntityList< IfcRepresentationItem >::ptr Items() const;
+    void setItems(IfcTemplatedEntityList< IfcRepresentationItem >::ptr v);
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY; case 1: return IfcUtil::Argument_STRING; case 2: return IfcUtil::Argument_STRING; case 3: return IfcUtil::Argument_ENTITY_LIST; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcRepresentationContext; case 1: return Type::IfcLabel; case 2: return Type::IfcLabel; case 3: return Type::IfcRepresentationItem; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "ContextOfItems"; case 1: return "RepresentationIdentifier"; case 2: return "RepresentationType"; case 3: return "Items"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > RepresentationMap(); // INVERSE IfcRepresentationMap::MappedRepresentation
-    SHARED_PTR< IfcTemplatedEntityList< IfcPresentationLayerAssignment > > LayerAssignments(); // INVERSE IfcPresentationLayerAssignment::AssignedItems
-    SHARED_PTR< IfcTemplatedEntityList< IfcProductRepresentation > > OfProductRepresentation(); // INVERSE IfcProductRepresentation::Representations
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcRepresentationMap >::ptr RepresentationMap() const; // INVERSE IfcRepresentationMap::MappedRepresentation
+    IfcTemplatedEntityList< IfcPresentationLayerAssignment >::ptr LayerAssignments() const; // INVERSE IfcPresentationLayerAssignment::AssignedItems
+    IfcTemplatedEntityList< IfcProductRepresentation >::ptr OfProductRepresentation() const; // INVERSE IfcProductRepresentation::Representations
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRepresentation (IfcAbstractEntityPtr e);
-    IfcRepresentation (IfcRepresentationContext* v1_ContextOfItems, boost::optional< IfcLabel > v2_RepresentationIdentifier, boost::optional< IfcLabel > v3_RepresentationType, SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationItem > > v4_Items);
-    typedef IfcRepresentation* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRepresentation > > list;
-    typedef IfcTemplatedEntityList< IfcRepresentation >::it it;
+    IfcRepresentation (IfcAbstractEntity* e);
+    IfcRepresentation (IfcRepresentationContext* v1_ContextOfItems, boost::optional< std::string > v2_RepresentationIdentifier, boost::optional< std::string > v3_RepresentationType, IfcTemplatedEntityList< IfcRepresentationItem >::ptr v4_Items);
+    typedef IfcTemplatedEntityList< IfcRepresentation > list;
 };
 /// Definition from ISO/CD 10303-42:1992: A representation context is a context in which a set of representation items are related.
 /// 
@@ -10222,28 +11409,27 @@ class IfcRepresentation : public IfcUtil::IfcBaseEntity {
 class IfcRepresentationContext : public IfcUtil::IfcBaseEntity {
 public:
     /// Whether the optional attribute ContextIdentifier is defined for this IfcRepresentationContext
-    bool hasContextIdentifier();
+    bool hasContextIdentifier() const;
     /// The optional identifier of the representation context as used within a project.
-    IfcLabel ContextIdentifier();
-    void setContextIdentifier(IfcLabel v);
+    std::string ContextIdentifier() const;
+    void setContextIdentifier(std::string v);
     /// Whether the optional attribute ContextType is defined for this IfcRepresentationContext
-    bool hasContextType();
+    bool hasContextType() const;
     /// The description of the type of a representation context. The supported values for context type are to be specified by implementers agreements.
-    IfcLabel ContextType();
-    void setContextType(IfcLabel v);
+    std::string ContextType() const;
+    void setContextType(std::string v);
     virtual unsigned int getArgumentCount() const { return 2; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_STRING; case 1: return IfcUtil::Argument_STRING; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcLabel; case 1: return Type::IfcLabel; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "ContextIdentifier"; case 1: return "ContextType"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcRepresentation > > RepresentationsInContext(); // INVERSE IfcRepresentation::ContextOfItems
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcRepresentation >::ptr RepresentationsInContext() const; // INVERSE IfcRepresentation::ContextOfItems
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRepresentationContext (IfcAbstractEntityPtr e);
-    IfcRepresentationContext (boost::optional< IfcLabel > v1_ContextIdentifier, boost::optional< IfcLabel > v2_ContextType);
-    typedef IfcRepresentationContext* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationContext > > list;
-    typedef IfcTemplatedEntityList< IfcRepresentationContext >::it it;
+    IfcRepresentationContext (IfcAbstractEntity* e);
+    IfcRepresentationContext (boost::optional< std::string > v1_ContextIdentifier, boost::optional< std::string > v2_ContextType);
+    typedef IfcTemplatedEntityList< IfcRepresentationContext > list;
 };
 /// Definition from ISO/CD
 /// 10303-43:1992: A representation item is an element of
@@ -10281,18 +11467,17 @@ class IfcRepresentationItem : public IfcUtil::IfcBaseEntity {
 public:
     virtual unsigned int getArgumentCount() const { return 0; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcPresentationLayerAssignment > > LayerAssignment(); // INVERSE IfcPresentationLayerAssignment::AssignedItems
-    SHARED_PTR< IfcTemplatedEntityList< IfcStyledItem > > StyledByItem(); // INVERSE IfcStyledItem::Item
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcPresentationLayerAssignment >::ptr LayerAssignment() const; // INVERSE IfcPresentationLayerAssignment::AssignedItems
+    IfcTemplatedEntityList< IfcStyledItem >::ptr StyledByItem() const; // INVERSE IfcStyledItem::Item
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRepresentationItem (IfcAbstractEntityPtr e);
+    IfcRepresentationItem (IfcAbstractEntity* e);
     IfcRepresentationItem ();
-    typedef IfcRepresentationItem* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationItem > > list;
-    typedef IfcTemplatedEntityList< IfcRepresentationItem >::it it;
+    typedef IfcTemplatedEntityList< IfcRepresentationItem > list;
 };
 /// Definition from ISO/CD 10303-43:1992: A representation map is the identification of a representation and a representation item in that representation for the purpose of mapping. The representation item defines the origin of the mapping. The representation map is used as the source of a mapping by a mapped item.
 /// 
@@ -10309,25 +11494,24 @@ class IfcRepresentationMap : public IfcUtil::IfcBaseEntity {
 public:
     /// An axis2 placement that defines the position about which the mapped
     /// representation is mapped.
-    IfcAxis2Placement MappingOrigin();
-    void setMappingOrigin(IfcAxis2Placement v);
+    IfcAxis2Placement* MappingOrigin() const;
+    void setMappingOrigin(IfcAxis2Placement* v);
     /// A representation that is mapped to at least one mapped item.
-    IfcRepresentation* MappedRepresentation();
+    IfcRepresentation* MappedRepresentation() const;
     void setMappedRepresentation(IfcRepresentation* v);
     virtual unsigned int getArgumentCount() const { return 2; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY; case 1: return IfcUtil::Argument_ENTITY; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcAxis2Placement; case 1: return Type::IfcRepresentation; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "MappingOrigin"; case 1: return "MappedRepresentation"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcShapeAspect > > HasShapeAspects(); // INVERSE IfcShapeAspect::PartOfProductDefinitionShape
-    SHARED_PTR< IfcTemplatedEntityList< IfcMappedItem > > MapUsage(); // INVERSE IfcMappedItem::MappingSource
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcShapeAspect >::ptr HasShapeAspects() const; // INVERSE IfcShapeAspect::PartOfProductDefinitionShape
+    IfcTemplatedEntityList< IfcMappedItem >::ptr MapUsage() const; // INVERSE IfcMappedItem::MappingSource
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRepresentationMap (IfcAbstractEntityPtr e);
-    IfcRepresentationMap (IfcAxis2Placement v1_MappingOrigin, IfcRepresentation* v2_MappedRepresentation);
-    typedef IfcRepresentationMap* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > list;
-    typedef IfcTemplatedEntityList< IfcRepresentationMap >::it it;
+    IfcRepresentationMap (IfcAbstractEntity* e);
+    IfcRepresentationMap (IfcAxis2Placement* v1_MappingOrigin, IfcRepresentation* v2_MappedRepresentation);
+    typedef IfcTemplatedEntityList< IfcRepresentationMap > list;
 };
 /// IfcResourceLevelRelationship is an abstract base class for relationships between resource-level entities.
 /// 
@@ -10335,27 +11519,26 @@ class IfcRepresentationMap : public IfcUtil::IfcBaseEntity {
 class IfcResourceLevelRelationship : public IfcUtil::IfcBaseEntity {
 public:
     /// Whether the optional attribute Name is defined for this IfcResourceLevelRelationship
-    bool hasName();
+    bool hasName() const;
     /// A name used to identify or qualify the relationship.
-    IfcLabel Name();
-    void setName(IfcLabel v);
+    std::string Name() const;
+    void setName(std::string v);
     /// Whether the optional attribute Description is defined for this IfcResourceLevelRelationship
-    bool hasDescription();
+    bool hasDescription() const;
     /// A description that may apply additional information about the relationship.
-    IfcText Description();
-    void setDescription(IfcText v);
+    std::string Description() const;
+    void setDescription(std::string v);
     virtual unsigned int getArgumentCount() const { return 2; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_STRING; case 1: return IfcUtil::Argument_STRING; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcLabel; case 1: return Type::IfcText; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Name"; case 1: return "Description"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcResourceLevelRelationship (IfcAbstractEntityPtr e);
-    IfcResourceLevelRelationship (boost::optional< IfcLabel > v1_Name, boost::optional< IfcText > v2_Description);
-    typedef IfcResourceLevelRelationship* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcResourceLevelRelationship > > list;
-    typedef IfcTemplatedEntityList< IfcResourceLevelRelationship >::it it;
+    IfcResourceLevelRelationship (IfcAbstractEntity* e);
+    IfcResourceLevelRelationship (boost::optional< std::string > v1_Name, boost::optional< std::string > v2_Description);
+    typedef IfcTemplatedEntityList< IfcResourceLevelRelationship > list;
 };
 /// IfcRoot is the most abstract and root class for all IFC entity definitions that roots in the kernel or in subsequent layers of the IFC object model. It is therefore the common supertype of all IFC entities, beside those defined in an IFC resource schema. All entities that are subtypes of IfcRoot can be used independently, whereas resource schema entities, that are not subtypes of IfcRoot, are not supposed to be independent entities.
 /// 
@@ -10369,39 +11552,38 @@ class IfcResourceLevelRelationship : public IfcUtil::IfcBaseEntity {
 class IfcRoot : public IfcUtil::IfcBaseEntity {
 public:
     /// Assignment of a globally unique identifier within the entire software world.
-    IfcGloballyUniqueId GlobalId();
-    void setGlobalId(IfcGloballyUniqueId v);
+    std::string GlobalId() const;
+    void setGlobalId(std::string v);
     /// Whether the optional attribute OwnerHistory is defined for this IfcRoot
-    bool hasOwnerHistory();
+    bool hasOwnerHistory() const;
     /// Assignment of the information about the current ownership of that object, including owning actor, application, local identification and information captured about the recent changes of the object, 
     /// 
     /// NOTE only the last modification in stored - either as addition, deletion or modification.
     /// 
     /// IFC2x4 CHANGE  The attribute has been changed to be OPTIONAL.
-    IfcOwnerHistory* OwnerHistory();
+    IfcOwnerHistory* OwnerHistory() const;
     void setOwnerHistory(IfcOwnerHistory* v);
     /// Whether the optional attribute Name is defined for this IfcRoot
-    bool hasName();
+    bool hasName() const;
     /// Optional name for use by the participating software systems or users. For some subtypes of IfcRoot the insertion of the Name attribute may be required. This would be enforced by a where rule.
-    IfcLabel Name();
-    void setName(IfcLabel v);
+    std::string Name() const;
+    void setName(std::string v);
     /// Whether the optional attribute Description is defined for this IfcRoot
-    bool hasDescription();
+    bool hasDescription() const;
     /// Optional description, provided for exchanging informative comments.
-    IfcText Description();
-    void setDescription(IfcText v);
+    std::string Description() const;
+    void setDescription(std::string v);
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_STRING; case 1: return IfcUtil::Argument_ENTITY; case 2: return IfcUtil::Argument_STRING; case 3: return IfcUtil::Argument_STRING; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcGloballyUniqueId; case 1: return Type::IfcOwnerHistory; case 2: return Type::IfcLabel; case 3: return Type::IfcText; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "GlobalId"; case 1: return "OwnerHistory"; case 2: return "Name"; case 3: return "Description"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRoot (IfcAbstractEntityPtr e);
-    IfcRoot (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description);
-    typedef IfcRoot* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRoot > > list;
-    typedef IfcTemplatedEntityList< IfcRoot >::it it;
+    IfcRoot (IfcAbstractEntity* e);
+    IfcRoot (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description);
+    typedef IfcTemplatedEntityList< IfcRoot > list;
 };
 /// Definition from ISO/CD 10303-41:1992: An SI unit is the fixed quantity used as a standard in terms of which items are measured as defined by ISO 1000 (clause 2).
 /// 
@@ -10413,27 +11595,26 @@ class IfcRoot : public IfcUtil::IfcBaseEntity {
 class IfcSIUnit : public IfcNamedUnit {
 public:
     /// Whether the optional attribute Prefix is defined for this IfcSIUnit
-    bool hasPrefix();
+    bool hasPrefix() const;
     /// The SI Prefix for defining decimal multiples and submultiples of the unit.
-    IfcSIPrefix::IfcSIPrefix Prefix();
+    IfcSIPrefix::IfcSIPrefix Prefix() const;
     void setPrefix(IfcSIPrefix::IfcSIPrefix v);
     /// The word, or group of words, by which the SI unit is referred to.
     /// 
     /// NOTE  Even though the SI system's base unit for mass is kilogram, the IfcSIUnit for mass is gram if no Prefix is asserted.
-    IfcSIUnitName::IfcSIUnitName Name();
+    IfcSIUnitName::IfcSIUnitName Name() const;
     void setName(IfcSIUnitName::IfcSIUnitName v);
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 2: return IfcUtil::Argument_ENUMERATION; case 3: return IfcUtil::Argument_ENUMERATION; } return IfcNamedUnit::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 2: return Type::IfcSIPrefix; case 3: return Type::IfcSIUnitName; } return IfcNamedUnit::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 2: return "Prefix"; case 3: return "Name"; } return IfcNamedUnit::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcSIUnit (IfcAbstractEntityPtr e);
+    IfcSIUnit (IfcAbstractEntity* e);
     IfcSIUnit (IfcUnitEnum::IfcUnitEnum v2_UnitType, boost::optional< IfcSIPrefix::IfcSIPrefix > v3_Prefix, IfcSIUnitName::IfcSIUnitName v4_Name);
-    typedef IfcSIUnit* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcSIUnit > > list;
-    typedef IfcTemplatedEntityList< IfcSIUnit >::it it;
+    typedef IfcTemplatedEntityList< IfcSIUnit > list;
 };
 /// IfcSchedulingTime is the abstract supertype of entities that capture time-related information of processes.
 /// 
@@ -10441,33 +11622,32 @@ class IfcSIUnit : public IfcNamedUnit {
 class IfcSchedulingTime : public IfcUtil::IfcBaseEntity {
 public:
     /// Whether the optional attribute Name is defined for this IfcSchedulingTime
-    bool hasName();
+    bool hasName() const;
     /// Optional name for the time definition.
-    IfcLabel Name();
-    void setName(IfcLabel v);
+    std::string Name() const;
+    void setName(std::string v);
     /// Whether the optional attribute DataOrigin is defined for this IfcSchedulingTime
-    bool hasDataOrigin();
+    bool hasDataOrigin() const;
     /// Specifies the origin of the scheduling time entity. It currently
     ///   differentiates between predicted, simulated, measured, and user defined values.
-    IfcDataOriginEnum::IfcDataOriginEnum DataOrigin();
+    IfcDataOriginEnum::IfcDataOriginEnum DataOrigin() const;
     void setDataOrigin(IfcDataOriginEnum::IfcDataOriginEnum v);
     /// Whether the optional attribute UserDefinedDataOrigin is defined for this IfcSchedulingTime
-    bool hasUserDefinedDataOrigin();
+    bool hasUserDefinedDataOrigin() const;
     /// Value of the data origin if DataOrigin attribute is USERDEFINED.
-    IfcLabel UserDefinedDataOrigin();
-    void setUserDefinedDataOrigin(IfcLabel v);
+    std::string UserDefinedDataOrigin() const;
+    void setUserDefinedDataOrigin(std::string v);
     virtual unsigned int getArgumentCount() const { return 3; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_STRING; case 1: return IfcUtil::Argument_ENUMERATION; case 2: return IfcUtil::Argument_STRING; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcLabel; case 1: return Type::IfcDataOriginEnum; case 2: return Type::IfcLabel; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Name"; case 1: return "DataOrigin"; case 2: return "UserDefinedDataOrigin"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcSchedulingTime (IfcAbstractEntityPtr e);
-    IfcSchedulingTime (boost::optional< IfcLabel > v1_Name, boost::optional< IfcDataOriginEnum::IfcDataOriginEnum > v2_DataOrigin, boost::optional< IfcLabel > v3_UserDefinedDataOrigin);
-    typedef IfcSchedulingTime* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcSchedulingTime > > list;
-    typedef IfcTemplatedEntityList< IfcSchedulingTime >::it it;
+    IfcSchedulingTime (IfcAbstractEntity* e);
+    IfcSchedulingTime (boost::optional< std::string > v1_Name, boost::optional< IfcDataOriginEnum::IfcDataOriginEnum > v2_DataOrigin, boost::optional< std::string > v3_UserDefinedDataOrigin);
+    typedef IfcTemplatedEntityList< IfcSchedulingTime > list;
 };
 /// Definition from ISO/CD 10303-41:1992: The shape
 ///   aspect is an identifiable element of the shape of a
@@ -10510,41 +11690,40 @@ class IfcShapeAspect : public IfcUtil::IfcBaseEntity {
 public:
     /// List of shape representations. Each member defines a valid representation of a particular type within a particular representation context as being an aspect (or part) of a product definition.
     /// IFC2x Edition 3 CHANGE  The data type has been changed from IfcShapeRepresentation to IfcShapeModel with upward compatibility
-    SHARED_PTR< IfcTemplatedEntityList< IfcShapeModel > > ShapeRepresentations();
-    void setShapeRepresentations(SHARED_PTR< IfcTemplatedEntityList< IfcShapeModel > > v);
+    IfcTemplatedEntityList< IfcShapeModel >::ptr ShapeRepresentations() const;
+    void setShapeRepresentations(IfcTemplatedEntityList< IfcShapeModel >::ptr v);
     /// Whether the optional attribute Name is defined for this IfcShapeAspect
-    bool hasName();
+    bool hasName() const;
     /// The word or group of words by which the shape aspect is known. It is a tag to indicate the particular semantic of a component within the product definition shape, used to provide meaning. Example: use the tag "Glazing" to define which component of a window shape defines the glazing area.
-    IfcLabel Name();
-    void setName(IfcLabel v);
+    std::string Name() const;
+    void setName(std::string v);
     /// Whether the optional attribute Description is defined for this IfcShapeAspect
-    bool hasDescription();
+    bool hasDescription() const;
     /// The word or group of words that characterize the shape aspect. It can be used to add additional meaning to the name of the aspect.
-    IfcText Description();
-    void setDescription(IfcText v);
+    std::string Description() const;
+    void setDescription(std::string v);
     /// An indication that the shape aspect is on the physical boundary of the product definition shape. If the value of this attribute is TRUE, it shall be asserted that the shape aspect being identified is on such a boundary. If the value is FALSE, it shall be asserted that the shape aspect being identified is not on such a boundary. If the value is UNKNOWN, it shall be asserted that it is not known whether or not the shape aspect being identified is on such a boundary. 
     /// ---
     /// EXAMPLE: Would be FALSE for a center line, identified as shape aspect; would be TRUE for a cantilever.
     /// ---
-    bool ProductDefinitional();
+    bool ProductDefinitional() const;
     void setProductDefinitional(bool v);
     /// Whether the optional attribute PartOfProductDefinitionShape is defined for this IfcShapeAspect
-    bool hasPartOfProductDefinitionShape();
+    bool hasPartOfProductDefinitionShape() const;
     /// Reference to the product definition shape of which this class is an aspect.
-    IfcProductRepresentationSelect PartOfProductDefinitionShape();
-    void setPartOfProductDefinitionShape(IfcProductRepresentationSelect v);
+    IfcProductRepresentationSelect* PartOfProductDefinitionShape() const;
+    void setPartOfProductDefinitionShape(IfcProductRepresentationSelect* v);
     virtual unsigned int getArgumentCount() const { return 5; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY_LIST; case 1: return IfcUtil::Argument_STRING; case 2: return IfcUtil::Argument_STRING; case 3: return IfcUtil::Argument_BOOL; case 4: return IfcUtil::Argument_ENTITY; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcShapeModel; case 1: return Type::IfcLabel; case 2: return Type::IfcText; case 3: return Type::UNDEFINED; case 4: return Type::IfcProductRepresentationSelect; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "ShapeRepresentations"; case 1: return "Name"; case 2: return "Description"; case 3: return "ProductDefinitional"; case 4: return "PartOfProductDefinitionShape"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcShapeAspect (IfcAbstractEntityPtr e);
-    IfcShapeAspect (SHARED_PTR< IfcTemplatedEntityList< IfcShapeModel > > v1_ShapeRepresentations, boost::optional< IfcLabel > v2_Name, boost::optional< IfcText > v3_Description, bool v4_ProductDefinitional, boost::optional< IfcProductRepresentationSelect > v5_PartOfProductDefinitionShape);
-    typedef IfcShapeAspect* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcShapeAspect > > list;
-    typedef IfcTemplatedEntityList< IfcShapeAspect >::it it;
+    IfcShapeAspect (IfcAbstractEntity* e);
+    IfcShapeAspect (IfcTemplatedEntityList< IfcShapeModel >::ptr v1_ShapeRepresentations, boost::optional< std::string > v2_Name, boost::optional< std::string > v3_Description, bool v4_ProductDefinitional, IfcProductRepresentationSelect* v5_PartOfProductDefinitionShape);
+    typedef IfcTemplatedEntityList< IfcShapeAspect > list;
 };
 /// IfcShapeModel represents
 /// the concept of a particular geometric and/or topological
@@ -10568,17 +11747,16 @@ class IfcShapeModel : public IfcRepresentation {
 public:
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcRepresentation::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcRepresentation::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcRepresentation::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcShapeAspect > > OfShapeAspect(); // INVERSE IfcShapeAspect::ShapeRepresentations
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcShapeAspect >::ptr OfShapeAspect() const; // INVERSE IfcShapeAspect::ShapeRepresentations
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcShapeModel (IfcAbstractEntityPtr e);
-    IfcShapeModel (IfcRepresentationContext* v1_ContextOfItems, boost::optional< IfcLabel > v2_RepresentationIdentifier, boost::optional< IfcLabel > v3_RepresentationType, SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationItem > > v4_Items);
-    typedef IfcShapeModel* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcShapeModel > > list;
-    typedef IfcTemplatedEntityList< IfcShapeModel >::it it;
+    IfcShapeModel (IfcAbstractEntity* e);
+    IfcShapeModel (IfcRepresentationContext* v1_ContextOfItems, boost::optional< std::string > v2_RepresentationIdentifier, boost::optional< std::string > v3_RepresentationType, IfcTemplatedEntityList< IfcRepresentationItem >::ptr v4_Items);
+    typedef IfcTemplatedEntityList< IfcShapeModel > list;
 };
 /// The IfcShapeRepresentation represents the concept of a
 /// particular geometric representation of a product or a product
@@ -10719,16 +11897,15 @@ class IfcShapeRepresentation : public IfcShapeModel {
 public:
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcShapeModel::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcShapeModel::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcShapeModel::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcShapeRepresentation (IfcAbstractEntityPtr e);
-    IfcShapeRepresentation (IfcRepresentationContext* v1_ContextOfItems, boost::optional< IfcLabel > v2_RepresentationIdentifier, boost::optional< IfcLabel > v3_RepresentationType, SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationItem > > v4_Items);
-    typedef IfcShapeRepresentation* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcShapeRepresentation > > list;
-    typedef IfcTemplatedEntityList< IfcShapeRepresentation >::it it;
+    IfcShapeRepresentation (IfcAbstractEntity* e);
+    IfcShapeRepresentation (IfcRepresentationContext* v1_ContextOfItems, boost::optional< std::string > v2_RepresentationIdentifier, boost::optional< std::string > v3_RepresentationType, IfcTemplatedEntityList< IfcRepresentationItem >::ptr v4_Items);
+    typedef IfcTemplatedEntityList< IfcShapeRepresentation > list;
 };
 /// Definition from IAI: Describe more rarely needed connection properties.
 /// 
@@ -10736,22 +11913,21 @@ class IfcShapeRepresentation : public IfcShapeModel {
 class IfcStructuralConnectionCondition : public IfcUtil::IfcBaseEntity {
 public:
     /// Whether the optional attribute Name is defined for this IfcStructuralConnectionCondition
-    bool hasName();
+    bool hasName() const;
     /// Optionally defines a name for this connection condition.
-    IfcLabel Name();
-    void setName(IfcLabel v);
+    std::string Name() const;
+    void setName(std::string v);
     virtual unsigned int getArgumentCount() const { return 1; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_STRING; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcLabel; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Name"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcStructuralConnectionCondition (IfcAbstractEntityPtr e);
-    IfcStructuralConnectionCondition (boost::optional< IfcLabel > v1_Name);
-    typedef IfcStructuralConnectionCondition* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcStructuralConnectionCondition > > list;
-    typedef IfcTemplatedEntityList< IfcStructuralConnectionCondition >::it it;
+    IfcStructuralConnectionCondition (IfcAbstractEntity* e);
+    IfcStructuralConnectionCondition (boost::optional< std::string > v1_Name);
+    typedef IfcTemplatedEntityList< IfcStructuralConnectionCondition > list;
 };
 /// Definition from IAI: The abstract entity IfcStructuralLoadOrResult is the supertype of all loads (actions or reactions) or of certain requirements resulting from structural analysis, or certain provisions which influence structural analysis.
 /// 
@@ -10759,22 +11935,21 @@ class IfcStructuralConnectionCondition : public IfcUtil::IfcBaseEntity {
 class IfcStructuralLoad : public IfcUtil::IfcBaseEntity {
 public:
     /// Whether the optional attribute Name is defined for this IfcStructuralLoad
-    bool hasName();
+    bool hasName() const;
     /// Optionally defines a name for this load.
-    IfcLabel Name();
-    void setName(IfcLabel v);
+    std::string Name() const;
+    void setName(std::string v);
     virtual unsigned int getArgumentCount() const { return 1; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_STRING; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcLabel; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Name"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcStructuralLoad (IfcAbstractEntityPtr e);
-    IfcStructuralLoad (boost::optional< IfcLabel > v1_Name);
-    typedef IfcStructuralLoad* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcStructuralLoad > > list;
-    typedef IfcTemplatedEntityList< IfcStructuralLoad >::it it;
+    IfcStructuralLoad (IfcAbstractEntity* e);
+    IfcStructuralLoad (boost::optional< std::string > v1_Name);
+    typedef IfcTemplatedEntityList< IfcStructuralLoad > list;
 };
 /// Definition from IAI: This class combines one or more load or result values in a 1- or 2-dimensional configuration.
 /// 
@@ -10790,23 +11965,22 @@ class IfcStructuralLoad : public IfcUtil::IfcBaseEntity {
 class IfcStructuralLoadConfiguration : public IfcStructuralLoad {
 public:
     /// List of load or result values.
-    SHARED_PTR< IfcTemplatedEntityList< IfcStructuralLoadOrResult > > Values();
-    void setValues(SHARED_PTR< IfcTemplatedEntityList< IfcStructuralLoadOrResult > > v);
+    IfcTemplatedEntityList< IfcStructuralLoadOrResult >::ptr Values() const;
+    void setValues(IfcTemplatedEntityList< IfcStructuralLoadOrResult >::ptr v);
     /// Whether the optional attribute Locations is defined for this IfcStructuralLoadConfiguration
-    bool hasLocations();
+    bool hasLocations() const;
     /// Locations of the load samples or result samples, given within the local coordinate system defined by the instance which uses this resource object.  Each item in the list of locations pertains to the values list item at the same list index.  This attribute is optional for configurations in which the locations are implicitly known from higher-level definitions.
     virtual unsigned int getArgumentCount() const { return 3; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 1: return IfcUtil::Argument_ENTITY_LIST; case 2: return IfcUtil::Argument_UNKNOWN; } return IfcStructuralLoad::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 1: return Type::IfcStructuralLoadOrResult; case 2: return Type::IfcLengthMeasure; } return IfcStructuralLoad::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 1: return "Values"; case 2: return "Locations"; } return IfcStructuralLoad::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcStructuralLoadConfiguration (IfcAbstractEntityPtr e);
-    IfcStructuralLoadConfiguration (boost::optional< IfcLabel > v1_Name, SHARED_PTR< IfcTemplatedEntityList< IfcStructuralLoadOrResult > > v2_Values);
-    typedef IfcStructuralLoadConfiguration* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcStructuralLoadConfiguration > > list;
-    typedef IfcTemplatedEntityList< IfcStructuralLoadConfiguration >::it it;
+    IfcStructuralLoadConfiguration (IfcAbstractEntity* e);
+    IfcStructuralLoadConfiguration (boost::optional< std::string > v1_Name, IfcTemplatedEntityList< IfcStructuralLoadOrResult >::ptr v2_Values);
+    typedef IfcTemplatedEntityList< IfcStructuralLoadConfiguration > list;
 };
 /// Definition from IAI: Abstract superclass of simple load or result classes.
 /// 
@@ -10815,16 +11989,15 @@ class IfcStructuralLoadOrResult : public IfcStructuralLoad {
 public:
     virtual unsigned int getArgumentCount() const { return 1; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcStructuralLoad::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcStructuralLoad::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcStructuralLoad::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcStructuralLoadOrResult (IfcAbstractEntityPtr e);
-    IfcStructuralLoadOrResult (boost::optional< IfcLabel > v1_Name);
-    typedef IfcStructuralLoadOrResult* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcStructuralLoadOrResult > > list;
-    typedef IfcTemplatedEntityList< IfcStructuralLoadOrResult >::it it;
+    IfcStructuralLoadOrResult (IfcAbstractEntity* e);
+    IfcStructuralLoadOrResult (boost::optional< std::string > v1_Name);
+    typedef IfcTemplatedEntityList< IfcStructuralLoadOrResult > list;
 };
 /// Definition from IAI: The abstract entity IfcStructuralLoadStatic is the supertype of all static loads (actions or reactions) which can be defined.  Within scope are single i.e. concentrated forces and moments, linear i.e. one-dimensionally distributed forces and moments, planar i.e. two-dimensionally distributed forces, furthermore displacements and temperature loads.
 /// 
@@ -10833,16 +12006,15 @@ class IfcStructuralLoadStatic : public IfcStructuralLoadOrResult {
 public:
     virtual unsigned int getArgumentCount() const { return 1; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcStructuralLoadOrResult::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcStructuralLoadOrResult::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcStructuralLoadOrResult::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcStructuralLoadStatic (IfcAbstractEntityPtr e);
-    IfcStructuralLoadStatic (boost::optional< IfcLabel > v1_Name);
-    typedef IfcStructuralLoadStatic* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcStructuralLoadStatic > > list;
-    typedef IfcTemplatedEntityList< IfcStructuralLoadStatic >::it it;
+    IfcStructuralLoadStatic (IfcAbstractEntity* e);
+    IfcStructuralLoadStatic (boost::optional< std::string > v1_Name);
+    typedef IfcTemplatedEntityList< IfcStructuralLoadStatic > list;
 };
 /// An instance of the entity IfcStructuralLoadTemperature shall be used to define actions which are caused by a temperature change. As shown in Figure 332, the change of temperature is given with a constant value which is applied to the complete section and values for temperature differences between outer fibres of the section.
 /// 
@@ -10852,38 +12024,37 @@ class IfcStructuralLoadStatic : public IfcStructuralLoadOrResult {
 class IfcStructuralLoadTemperature : public IfcStructuralLoadStatic {
 public:
     /// Whether the optional attribute DeltaTConstant is defined for this IfcStructuralLoadTemperature
-    bool hasDeltaTConstant();
+    bool hasDeltaTConstant() const;
     /// Temperature change which affects the complete section of the structural member, or the uniform portion of a non-uniform temperature change.
     /// 
     /// A positive value describes an increase in temperature.  I.e. a positive constant temperature change causes elongation of a member, or compression in the member if there are respective restraints.
-    IfcThermodynamicTemperatureMeasure DeltaTConstant();
-    void setDeltaTConstant(IfcThermodynamicTemperatureMeasure v);
+    double DeltaTConstant() const;
+    void setDeltaTConstant(double v);
     /// Whether the optional attribute DeltaTY is defined for this IfcStructuralLoadTemperature
-    bool hasDeltaTY();
+    bool hasDeltaTY() const;
     /// Non-uniform temperature change, specified as the difference of the temperature change at the outer fibre of the positive y direction minus the temperature change at the outer fibre of the negative y direction of the analysis member.
     /// 
     /// I.e. a positive non-uniform temperature change in y induces a negative curvature of the member about z, or a positive bending moment about z if there are respective restraints.  y and z are local member axes.
-    IfcThermodynamicTemperatureMeasure DeltaTY();
-    void setDeltaTY(IfcThermodynamicTemperatureMeasure v);
+    double DeltaTY() const;
+    void setDeltaTY(double v);
     /// Whether the optional attribute DeltaTZ is defined for this IfcStructuralLoadTemperature
-    bool hasDeltaTZ();
+    bool hasDeltaTZ() const;
     /// Non-uniform temperature change, specified as the difference of the temperature change at the outer fibre of the positive z direction minus the temperature change at the outer fibre of the negative z direction of the analysis member.
     /// 
     /// I.e. a positive non-uniform temperature change in z induces a positive curvature of the member about y, or a negative bending moment about y if there are respective restraints.  y and z are local member axes.
-    IfcThermodynamicTemperatureMeasure DeltaTZ();
-    void setDeltaTZ(IfcThermodynamicTemperatureMeasure v);
+    double DeltaTZ() const;
+    void setDeltaTZ(double v);
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 1: return IfcUtil::Argument_DOUBLE; case 2: return IfcUtil::Argument_DOUBLE; case 3: return IfcUtil::Argument_DOUBLE; } return IfcStructuralLoadStatic::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 1: return Type::IfcThermodynamicTemperatureMeasure; case 2: return Type::IfcThermodynamicTemperatureMeasure; case 3: return Type::IfcThermodynamicTemperatureMeasure; } return IfcStructuralLoadStatic::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 1: return "DeltaTConstant"; case 2: return "DeltaTY"; case 3: return "DeltaTZ"; } return IfcStructuralLoadStatic::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcStructuralLoadTemperature (IfcAbstractEntityPtr e);
-    IfcStructuralLoadTemperature (boost::optional< IfcLabel > v1_Name, boost::optional< IfcThermodynamicTemperatureMeasure > v2_DeltaTConstant, boost::optional< IfcThermodynamicTemperatureMeasure > v3_DeltaTY, boost::optional< IfcThermodynamicTemperatureMeasure > v4_DeltaTZ);
-    typedef IfcStructuralLoadTemperature* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcStructuralLoadTemperature > > list;
-    typedef IfcTemplatedEntityList< IfcStructuralLoadTemperature >::it it;
+    IfcStructuralLoadTemperature (IfcAbstractEntity* e);
+    IfcStructuralLoadTemperature (boost::optional< std::string > v1_Name, boost::optional< double > v2_DeltaTConstant, boost::optional< double > v3_DeltaTY, boost::optional< double > v4_DeltaTZ);
+    typedef IfcTemplatedEntityList< IfcStructuralLoadTemperature > list;
 };
 /// IfcStyleModel represents the concept of a particular presentation style defined for a material (or other characteristic) of a product or a product component within a representation context. This representation context may (but has not to be) a geometric representation context.
 /// 
@@ -10894,16 +12065,15 @@ class IfcStyleModel : public IfcRepresentation {
 public:
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcRepresentation::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcRepresentation::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcRepresentation::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcStyleModel (IfcAbstractEntityPtr e);
-    IfcStyleModel (IfcRepresentationContext* v1_ContextOfItems, boost::optional< IfcLabel > v2_RepresentationIdentifier, boost::optional< IfcLabel > v3_RepresentationType, SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationItem > > v4_Items);
-    typedef IfcStyleModel* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcStyleModel > > list;
-    typedef IfcTemplatedEntityList< IfcStyleModel >::it it;
+    IfcStyleModel (IfcAbstractEntity* e);
+    IfcStyleModel (IfcRepresentationContext* v1_ContextOfItems, boost::optional< std::string > v2_RepresentationIdentifier, boost::optional< std::string > v3_RepresentationType, IfcTemplatedEntityList< IfcRepresentationItem >::ptr v4_Items);
+    typedef IfcTemplatedEntityList< IfcStyleModel > list;
 };
 /// Definition from ISO/CD 10303-46:1992: The styled item is an assignment of style for presentation to a geometric representation item as it is used in a representation.
 /// 
@@ -10936,11 +12106,11 @@ class IfcStyleModel : public IfcRepresentation {
 class IfcStyledItem : public IfcRepresentationItem {
 public:
     /// Whether the optional attribute Item is defined for this IfcStyledItem
-    bool hasItem();
+    bool hasItem() const;
     /// A geometric representation item to which the style is assigned.
     /// 
     /// IFC2x Edition 2 Addendum 2 CHANGE The attribute Item has been made optional. Upward compatibility for file based exchange is guaranteed.
-    IfcRepresentationItem* Item();
+    IfcRepresentationItem* Item() const;
     void setItem(IfcRepresentationItem* v);
     /// Representation styles which are assigned, either to an geometric representation item, or to a material definition.
     /// 
@@ -10948,25 +12118,24 @@ class IfcStyledItem : public IfcRepresentationItem {
     /// for file based exchange.
     /// 
     /// NOTE  Only the select item IfcPresentationStyle shall be used from IFC2x4 onwards, the IfcPresentationStyleAssignment has been deprecated.
-    SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > Styles();
-    void setStyles(SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > v);
+    IfcEntityList::ptr Styles() const;
+    void setStyles(IfcEntityList::ptr v);
     /// Whether the optional attribute Name is defined for this IfcStyledItem
-    bool hasName();
+    bool hasName() const;
     /// The word, or group of words, by which the styled item is referred to.
-    IfcLabel Name();
-    void setName(IfcLabel v);
+    std::string Name() const;
+    void setName(std::string v);
     virtual unsigned int getArgumentCount() const { return 3; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY; case 1: return IfcUtil::Argument_ENTITY_LIST; case 2: return IfcUtil::Argument_STRING; } return IfcRepresentationItem::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcRepresentationItem; case 1: return Type::IfcStyleAssignmentSelect; case 2: return Type::IfcLabel; } return IfcRepresentationItem::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Item"; case 1: return "Styles"; case 2: return "Name"; } return IfcRepresentationItem::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcStyledItem (IfcAbstractEntityPtr e);
-    IfcStyledItem (IfcRepresentationItem* v1_Item, IfcEntities v2_Styles, boost::optional< IfcLabel > v3_Name);
-    typedef IfcStyledItem* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcStyledItem > > list;
-    typedef IfcTemplatedEntityList< IfcStyledItem >::it it;
+    IfcStyledItem (IfcAbstractEntity* e);
+    IfcStyledItem (IfcRepresentationItem* v1_Item, IfcEntityList::ptr v2_Styles, boost::optional< std::string > v3_Name);
+    typedef IfcTemplatedEntityList< IfcStyledItem > list;
 };
 /// The IfcStyledRepresentation represents the concept of a styled presentation being a representation of a product or a product component, like material. within a representation context. This representation context does not need to be (but may be) a geometric representation context.
 /// 
@@ -10979,16 +12148,15 @@ class IfcStyledRepresentation : public IfcStyleModel {
 public:
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcStyleModel::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcStyleModel::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcStyleModel::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcStyledRepresentation (IfcAbstractEntityPtr e);
-    IfcStyledRepresentation (IfcRepresentationContext* v1_ContextOfItems, boost::optional< IfcLabel > v2_RepresentationIdentifier, boost::optional< IfcLabel > v3_RepresentationType, SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationItem > > v4_Items);
-    typedef IfcStyledRepresentation* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcStyledRepresentation > > list;
-    typedef IfcTemplatedEntityList< IfcStyledRepresentation >::it it;
+    IfcStyledRepresentation (IfcAbstractEntity* e);
+    IfcStyledRepresentation (IfcRepresentationContext* v1_ContextOfItems, boost::optional< std::string > v2_RepresentationIdentifier, boost::optional< std::string > v3_RepresentationType, IfcTemplatedEntityList< IfcRepresentationItem >::ptr v4_Items);
+    typedef IfcTemplatedEntityList< IfcStyledRepresentation > list;
 };
 /// Definition from IAI: Describes required or provided reinforcement area of surface members.
 /// 
@@ -10998,32 +12166,31 @@ class IfcStyledRepresentation : public IfcStyleModel {
 class IfcSurfaceReinforcementArea : public IfcStructuralLoadOrResult {
 public:
     /// Whether the optional attribute SurfaceReinforcement1 is defined for this IfcSurfaceReinforcementArea
-    bool hasSurfaceReinforcement1();
+    bool hasSurfaceReinforcement1() const;
     /// Reinforcement at the face of the member which is located at the side of the positive local z direction of the surface member.  Specified as area per length, e.g. square metre per metre (hence length measure, e.g. metre).  The reinforcement area may be specified for two or three directions of reinforcement bars.
-    std::vector< IfcLengthMeasure > /*[2:3]*/ SurfaceReinforcement1();
-    void setSurfaceReinforcement1(std::vector< IfcLengthMeasure > /*[2:3]*/ v);
+    std::vector< double > /*[2:3]*/ SurfaceReinforcement1() const;
+    void setSurfaceReinforcement1(std::vector< double > /*[2:3]*/ v);
     /// Whether the optional attribute SurfaceReinforcement2 is defined for this IfcSurfaceReinforcementArea
-    bool hasSurfaceReinforcement2();
+    bool hasSurfaceReinforcement2() const;
     /// Reinforcement at the face of the member which is located at the side of the negative local z direction of the surface member.  Specified as area per length, e.g. square metre per metre (hence length measure, e.g. metre).  The reinforcement area may be specified for two or three directions of reinforcement bars.
-    std::vector< IfcLengthMeasure > /*[2:3]*/ SurfaceReinforcement2();
-    void setSurfaceReinforcement2(std::vector< IfcLengthMeasure > /*[2:3]*/ v);
+    std::vector< double > /*[2:3]*/ SurfaceReinforcement2() const;
+    void setSurfaceReinforcement2(std::vector< double > /*[2:3]*/ v);
     /// Whether the optional attribute ShearReinforcement is defined for this IfcSurfaceReinforcementArea
-    bool hasShearReinforcement();
+    bool hasShearReinforcement() const;
     /// Shear reinforcement.  Specified as area per area, e.g. square metre per square metre (hence ratio measure, i.e. unitless).
-    IfcRatioMeasure ShearReinforcement();
-    void setShearReinforcement(IfcRatioMeasure v);
+    double ShearReinforcement() const;
+    void setShearReinforcement(double v);
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 1: return IfcUtil::Argument_VECTOR_DOUBLE; case 2: return IfcUtil::Argument_VECTOR_DOUBLE; case 3: return IfcUtil::Argument_DOUBLE; } return IfcStructuralLoadOrResult::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 1: return Type::IfcLengthMeasure; case 2: return Type::IfcLengthMeasure; case 3: return Type::IfcRatioMeasure; } return IfcStructuralLoadOrResult::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 1: return "SurfaceReinforcement1"; case 2: return "SurfaceReinforcement2"; case 3: return "ShearReinforcement"; } return IfcStructuralLoadOrResult::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcSurfaceReinforcementArea (IfcAbstractEntityPtr e);
-    IfcSurfaceReinforcementArea (boost::optional< IfcLabel > v1_Name, boost::optional< std::vector< IfcLengthMeasure > /*[2:3]*/ > v2_SurfaceReinforcement1, boost::optional< std::vector< IfcLengthMeasure > /*[2:3]*/ > v3_SurfaceReinforcement2, boost::optional< IfcRatioMeasure > v4_ShearReinforcement);
-    typedef IfcSurfaceReinforcementArea* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcSurfaceReinforcementArea > > list;
-    typedef IfcTemplatedEntityList< IfcSurfaceReinforcementArea >::it it;
+    IfcSurfaceReinforcementArea (IfcAbstractEntity* e);
+    IfcSurfaceReinforcementArea (boost::optional< std::string > v1_Name, boost::optional< std::vector< double > /*[2:3]*/ > v2_SurfaceReinforcement1, boost::optional< std::vector< double > /*[2:3]*/ > v3_SurfaceReinforcement2, boost::optional< double > v4_ShearReinforcement);
+    typedef IfcTemplatedEntityList< IfcSurfaceReinforcementArea > list;
 };
 /// IfcSurfaceStyle is an assignment of one or many surface style elements to a surface, defined by subtypes of IfcSurface, IfcFaceBasedSurfaceModel, IfcShellBasedSurfaceModel, or by subtypes of IfcSolidModel. The positive direction of the surface normal relates to the positive side. In case of solids the outside of the solid is to be taken as positive side. 
 /// 
@@ -11035,23 +12202,22 @@ class IfcSurfaceReinforcementArea : public IfcStructuralLoadOrResult {
 class IfcSurfaceStyle : public IfcPresentationStyle {
 public:
     /// An indication of which side of the surface to apply the style.
-    IfcSurfaceSide::IfcSurfaceSide Side();
+    IfcSurfaceSide::IfcSurfaceSide Side() const;
     void setSide(IfcSurfaceSide::IfcSurfaceSide v);
     /// A collection of different surface styles.
-    SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > Styles();
-    void setStyles(SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > v);
+    IfcEntityList::ptr Styles() const;
+    void setStyles(IfcEntityList::ptr v);
     virtual unsigned int getArgumentCount() const { return 3; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 1: return IfcUtil::Argument_ENUMERATION; case 2: return IfcUtil::Argument_ENTITY_LIST; } return IfcPresentationStyle::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 1: return Type::IfcSurfaceSide; case 2: return Type::IfcSurfaceStyleElementSelect; } return IfcPresentationStyle::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 1: return "Side"; case 2: return "Styles"; } return IfcPresentationStyle::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcSurfaceStyle (IfcAbstractEntityPtr e);
-    IfcSurfaceStyle (boost::optional< IfcLabel > v1_Name, IfcSurfaceSide::IfcSurfaceSide v2_Side, IfcEntities v3_Styles);
-    typedef IfcSurfaceStyle* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcSurfaceStyle > > list;
-    typedef IfcTemplatedEntityList< IfcSurfaceStyle >::it it;
+    IfcSurfaceStyle (IfcAbstractEntity* e);
+    IfcSurfaceStyle (boost::optional< std::string > v1_Name, IfcSurfaceSide::IfcSurfaceSide v2_Side, IfcEntityList::ptr v3_Styles);
+    typedef IfcTemplatedEntityList< IfcSurfaceStyle > list;
 };
 /// IfcSurfaceStyleLighting is a container class for properties for calculation of physically exact illuminance related to a particular surface style.
 /// 
@@ -11068,32 +12234,31 @@ class IfcSurfaceStyleLighting : public IfcPresentationItem {
 public:
     /// The degree of diffusion of the transmitted light. In the case of completely transparent materials there is no diffusion. The greater the diffusing power, the smaller the direct component of the transmitted light, up to the point where only diffuse light is produced.A value of 1 means totally diffuse for that colour part of the light.
     /// The factor can be measured physically and has three ratios for the red, green and blue part of the light.
-    IfcColourRgb* DiffuseTransmissionColour();
+    IfcColourRgb* DiffuseTransmissionColour() const;
     void setDiffuseTransmissionColour(IfcColourRgb* v);
     /// The degree of diffusion of the reflected light. In the case of specular surfaces there is no diffusion. The greater the diffusing power of the reflecting surface, the smaller the specular component of the reflected light, up to the point where only diffuse light is produced. A value of 1 means totally diffuse for that colour part of the light. 
     /// The factor can be measured physically and has three ratios for the red, green and blue part of the light.
-    IfcColourRgb* DiffuseReflectionColour();
+    IfcColourRgb* DiffuseReflectionColour() const;
     void setDiffuseReflectionColour(IfcColourRgb* v);
     /// Describes how the light falling on a body is totally or partially transmitted. 
     /// The factor can be measured physically and has three ratios for the red, green and blue part of the light.
-    IfcColourRgb* TransmissionColour();
+    IfcColourRgb* TransmissionColour() const;
     void setTransmissionColour(IfcColourRgb* v);
     /// A coefficient that determines the extent that the light falling onto a surface is fully or partially reflected. 
     /// The factor can be measured physically and has three ratios for the red, green and blue part of the light.
-    IfcColourRgb* ReflectanceColour();
+    IfcColourRgb* ReflectanceColour() const;
     void setReflectanceColour(IfcColourRgb* v);
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY; case 1: return IfcUtil::Argument_ENTITY; case 2: return IfcUtil::Argument_ENTITY; case 3: return IfcUtil::Argument_ENTITY; } return IfcPresentationItem::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcColourRgb; case 1: return Type::IfcColourRgb; case 2: return Type::IfcColourRgb; case 3: return Type::IfcColourRgb; } return IfcPresentationItem::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "DiffuseTransmissionColour"; case 1: return "DiffuseReflectionColour"; case 2: return "TransmissionColour"; case 3: return "ReflectanceColour"; } return IfcPresentationItem::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcSurfaceStyleLighting (IfcAbstractEntityPtr e);
+    IfcSurfaceStyleLighting (IfcAbstractEntity* e);
     IfcSurfaceStyleLighting (IfcColourRgb* v1_DiffuseTransmissionColour, IfcColourRgb* v2_DiffuseReflectionColour, IfcColourRgb* v3_TransmissionColour, IfcColourRgb* v4_ReflectanceColour);
-    typedef IfcSurfaceStyleLighting* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcSurfaceStyleLighting > > list;
-    typedef IfcTemplatedEntityList< IfcSurfaceStyleLighting >::it it;
+    typedef IfcTemplatedEntityList< IfcSurfaceStyleLighting > list;
 };
 /// IfcSurfaceStyleRefraction extends the surface style lighting, or the surface style rendering definition for properties for calculation of physically exact illuminance by adding seldomly used properties. Currently this includes the refraction index (by which the light ray refracts when passing through a prism) and the dispersion factor (or Abbe constant) which takes into account the wavelength dependency of the refraction.
 /// 
@@ -11103,27 +12268,26 @@ class IfcSurfaceStyleLighting : public IfcPresentationItem {
 class IfcSurfaceStyleRefraction : public IfcPresentationItem {
 public:
     /// Whether the optional attribute RefractionIndex is defined for this IfcSurfaceStyleRefraction
-    bool hasRefractionIndex();
+    bool hasRefractionIndex() const;
     /// The index of refraction for all wave lengths of light. The refraction index is the ratio between the speed of light in a vacuum and the speed of light in the medium. E.g. glass has a refraction index of 1.5, whereas water has an index of 1.33
-    IfcReal RefractionIndex();
-    void setRefractionIndex(IfcReal v);
+    double RefractionIndex() const;
+    void setRefractionIndex(double v);
     /// Whether the optional attribute DispersionFactor is defined for this IfcSurfaceStyleRefraction
-    bool hasDispersionFactor();
+    bool hasDispersionFactor() const;
     /// The Abbe constant given as a fixed ratio between the refractive indices of the material at different wavelengths. A low Abbe number means a high dispersive power. In general this translates to a greater angular spread of the emergent spectrum.
-    IfcReal DispersionFactor();
-    void setDispersionFactor(IfcReal v);
+    double DispersionFactor() const;
+    void setDispersionFactor(double v);
     virtual unsigned int getArgumentCount() const { return 2; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_DOUBLE; case 1: return IfcUtil::Argument_DOUBLE; } return IfcPresentationItem::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcReal; case 1: return Type::IfcReal; } return IfcPresentationItem::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "RefractionIndex"; case 1: return "DispersionFactor"; } return IfcPresentationItem::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcSurfaceStyleRefraction (IfcAbstractEntityPtr e);
-    IfcSurfaceStyleRefraction (boost::optional< IfcReal > v1_RefractionIndex, boost::optional< IfcReal > v2_DispersionFactor);
-    typedef IfcSurfaceStyleRefraction* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcSurfaceStyleRefraction > > list;
-    typedef IfcTemplatedEntityList< IfcSurfaceStyleRefraction >::it it;
+    IfcSurfaceStyleRefraction (IfcAbstractEntity* e);
+    IfcSurfaceStyleRefraction (boost::optional< double > v1_RefractionIndex, boost::optional< double > v2_DispersionFactor);
+    typedef IfcTemplatedEntityList< IfcSurfaceStyleRefraction > list;
 };
 /// Definition from ISO/CD 10303-46:1992: The surface style rendering allows the realistic visualization of surfaces referring to rendering techniques based on the laws of physics and mathematics. 
 /// 
@@ -11135,20 +12299,19 @@ class IfcSurfaceStyleRefraction : public IfcPresentationItem {
 class IfcSurfaceStyleShading : public IfcPresentationItem {
 public:
     /// The colour used to render the surface. The surface colour for visualisation is defined by specifying the intensity of red, green and blue.
-    IfcColourRgb* SurfaceColour();
+    IfcColourRgb* SurfaceColour() const;
     void setSurfaceColour(IfcColourRgb* v);
     virtual unsigned int getArgumentCount() const { return 1; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY; } return IfcPresentationItem::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcColourRgb; } return IfcPresentationItem::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "SurfaceColour"; } return IfcPresentationItem::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcSurfaceStyleShading (IfcAbstractEntityPtr e);
+    IfcSurfaceStyleShading (IfcAbstractEntity* e);
     IfcSurfaceStyleShading (IfcColourRgb* v1_SurfaceColour);
-    typedef IfcSurfaceStyleShading* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcSurfaceStyleShading > > list;
-    typedef IfcTemplatedEntityList< IfcSurfaceStyleShading >::it it;
+    typedef IfcTemplatedEntityList< IfcSurfaceStyleShading > list;
 };
 /// The entity IfcSurfaceStyleWithTextures allows to include image textures in surface styles. These image textures can be applied repeating across the surface or mapped with a particular scale upon the surface.
 /// 
@@ -11171,20 +12334,19 @@ class IfcSurfaceStyleShading : public IfcPresentationItem {
 class IfcSurfaceStyleWithTextures : public IfcPresentationItem {
 public:
     /// The textures applied to the surface. In case of more than one surface texture is included, the IfcSurfaceStyleWithTexture defines a multi texture.
-    SHARED_PTR< IfcTemplatedEntityList< IfcSurfaceTexture > > Textures();
-    void setTextures(SHARED_PTR< IfcTemplatedEntityList< IfcSurfaceTexture > > v);
+    IfcTemplatedEntityList< IfcSurfaceTexture >::ptr Textures() const;
+    void setTextures(IfcTemplatedEntityList< IfcSurfaceTexture >::ptr v);
     virtual unsigned int getArgumentCount() const { return 1; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY_LIST; } return IfcPresentationItem::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcSurfaceTexture; } return IfcPresentationItem::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Textures"; } return IfcPresentationItem::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcSurfaceStyleWithTextures (IfcAbstractEntityPtr e);
-    IfcSurfaceStyleWithTextures (SHARED_PTR< IfcTemplatedEntityList< IfcSurfaceTexture > > v1_Textures);
-    typedef IfcSurfaceStyleWithTextures* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcSurfaceStyleWithTextures > > list;
-    typedef IfcTemplatedEntityList< IfcSurfaceStyleWithTextures >::it it;
+    IfcSurfaceStyleWithTextures (IfcAbstractEntity* e);
+    IfcSurfaceStyleWithTextures (IfcTemplatedEntityList< IfcSurfaceTexture >::ptr v1_Textures);
+    typedef IfcTemplatedEntityList< IfcSurfaceStyleWithTextures > list;
 };
 /// An IfcSurfaceTexture provides a 2-dimensional
 /// image-based texture map. It can either be given by referencing an
@@ -11281,51 +12443,50 @@ class IfcSurfaceStyleWithTextures : public IfcPresentationItem {
 class IfcSurfaceTexture : public IfcPresentationItem {
 public:
     /// The RepeatS field specifies how the texture wraps in the S direction. If RepeatS is TRUE (the default), the texture map is repeated outside the [0.0, 1.0] texture coordinate range in the S direction so that it fills the shape. If RepeatS is FALSE, the texture coordinates are clamped in the S direction to lie within the [0.0, 1.0] range.
-    bool RepeatS();
+    bool RepeatS() const;
     void setRepeatS(bool v);
     /// The RepeatT field specifies how the texture wraps in the T direction. If RepeatT is TRUE (the default), the texture map is repeated outside the [0.0, 1.0] texture coordinate range in the T direction so that it fills the shape. If RepeatT is FALSE, the texture coordinates are clamped in the T direction to lie within the [0.0, 1.0] range.
-    bool RepeatT();
+    bool RepeatT() const;
     void setRepeatT(bool v);
     /// Whether the optional attribute Mode is defined for this IfcSurfaceTexture
-    bool hasMode();
+    bool hasMode() const;
     /// The Mode attribute is provided to control the appearance of a multi textures. The mode then controls the type of blending operation. The mode includes a MODULATE for a lit appearance, a REPLACE for a unlit appearance, and variations of the two.
     /// 
     /// NOTE  The applicable values for the Mode attribute are determined by view definitions or implementer agreements. It is recommended to use the modes described in ISO/IES 19775-1.2:2008 X3D Architecture and base components Edition 2, Part 1. See 18.4.3 MultiTexture for recommended values.
     /// 
     /// IFC2x4 CHANGE  New attribute replacing previous TextureType.
-    IfcIdentifier Mode();
-    void setMode(IfcIdentifier v);
+    std::string Mode() const;
+    void setMode(std::string v);
     /// Whether the optional attribute TextureTransform is defined for this IfcSurfaceTexture
-    bool hasTextureTransform();
+    bool hasTextureTransform() const;
     /// The TextureTransform defines a 2D transformation that is applied to the texture coordinates. It affects the way texture coordinates are applied to the surfaces of geometric representation itesm. The 2D transformation supports changes to the size, orientation, and position of textures on shapes. 
     /// 
     /// Mirroring is not allowed to be used in the IfcCarteesianTransformationOperator
-    IfcCartesianTransformationOperator2D* TextureTransform();
+    IfcCartesianTransformationOperator2D* TextureTransform() const;
     void setTextureTransform(IfcCartesianTransformationOperator2D* v);
     /// Whether the optional attribute Parameter is defined for this IfcSurfaceTexture
-    bool hasParameter();
+    bool hasParameter() const;
     /// The Parameter attribute is provided to control the appearance of a multi textures. The applicable parameters depend on the value of the Mode attribute.
     /// 
     /// NOTE  The applicable values for the list of Parameter attributes are determined by view definitions or implementer agreements. It is recommended to use the source and the function fields described in ISO/IES 19775-1.2:2008 X3D Architecture and base components Edition 2, Part 1. See 18.4.3 MultiTexture for recommended values.
     /// By convention, Parameter[1] shall then hold the source value, Parameter[2] the function value, Parameter[3] the base RGB color for select operations, and Parameter[4] the alpha value for select operations.
     /// 
     /// IFC2x4 CHANGE  New attribute added at the end of the attribute list.
-    std::vector< IfcIdentifier > /*[1:?]*/ Parameter();
-    void setParameter(std::vector< IfcIdentifier > /*[1:?]*/ v);
+    std::vector< std::string > /*[1:?]*/ Parameter() const;
+    void setParameter(std::vector< std::string > /*[1:?]*/ v);
     virtual unsigned int getArgumentCount() const { return 5; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_BOOL; case 1: return IfcUtil::Argument_BOOL; case 2: return IfcUtil::Argument_STRING; case 3: return IfcUtil::Argument_ENTITY; case 4: return IfcUtil::Argument_VECTOR_STRING; } return IfcPresentationItem::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::UNDEFINED; case 1: return Type::UNDEFINED; case 2: return Type::IfcIdentifier; case 3: return Type::IfcCartesianTransformationOperator2D; case 4: return Type::IfcIdentifier; } return IfcPresentationItem::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "RepeatS"; case 1: return "RepeatT"; case 2: return "Mode"; case 3: return "TextureTransform"; case 4: return "Parameter"; } return IfcPresentationItem::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcTextureCoordinate > > IsMappedBy(); // INVERSE IfcTextureCoordinate::Maps
-    SHARED_PTR< IfcTemplatedEntityList< IfcSurfaceStyleWithTextures > > UsedInStyles(); // INVERSE IfcSurfaceStyleWithTextures::Textures
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcTextureCoordinate >::ptr IsMappedBy() const; // INVERSE IfcTextureCoordinate::Maps
+    IfcTemplatedEntityList< IfcSurfaceStyleWithTextures >::ptr UsedInStyles() const; // INVERSE IfcSurfaceStyleWithTextures::Textures
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcSurfaceTexture (IfcAbstractEntityPtr e);
-    IfcSurfaceTexture (bool v1_RepeatS, bool v2_RepeatT, boost::optional< IfcIdentifier > v3_Mode, IfcCartesianTransformationOperator2D* v4_TextureTransform, boost::optional< std::vector< IfcIdentifier > /*[1:?]*/ > v5_Parameter);
-    typedef IfcSurfaceTexture* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcSurfaceTexture > > list;
-    typedef IfcTemplatedEntityList< IfcSurfaceTexture >::it it;
+    IfcSurfaceTexture (IfcAbstractEntity* e);
+    IfcSurfaceTexture (bool v1_RepeatS, bool v2_RepeatT, boost::optional< std::string > v3_Mode, IfcCartesianTransformationOperator2D* v4_TextureTransform, boost::optional< std::vector< std::string > /*[1:?]*/ > v5_Parameter);
+    typedef IfcTemplatedEntityList< IfcSurfaceTexture > list;
 };
 /// An IfcTable is a data structure for the provision of information in the form of rows and columns. Each instance may have IfcTableColumn instances that define the name, description and units for each column. The rows of information are stored as a list of IfcTableRow objects. 
 /// 
@@ -11345,32 +12506,31 @@ class IfcSurfaceTexture : public IfcPresentationItem {
 class IfcTable : public IfcUtil::IfcBaseEntity {
 public:
     /// Whether the optional attribute Name is defined for this IfcTable
-    bool hasName();
+    bool hasName() const;
     /// A unique name which is intended to describe the usage of the Table.
-    IfcLabel Name();
-    void setName(IfcLabel v);
+    std::string Name() const;
+    void setName(std::string v);
     /// Whether the optional attribute Rows is defined for this IfcTable
-    bool hasRows();
+    bool hasRows() const;
     /// Reference to information content of rows.
-    SHARED_PTR< IfcTemplatedEntityList< IfcTableRow > > Rows();
-    void setRows(SHARED_PTR< IfcTemplatedEntityList< IfcTableRow > > v);
+    IfcTemplatedEntityList< IfcTableRow >::ptr Rows() const;
+    void setRows(IfcTemplatedEntityList< IfcTableRow >::ptr v);
     /// Whether the optional attribute Columns is defined for this IfcTable
-    bool hasColumns();
+    bool hasColumns() const;
     /// The column information associated with this table.
-    SHARED_PTR< IfcTemplatedEntityList< IfcTableColumn > > Columns();
-    void setColumns(SHARED_PTR< IfcTemplatedEntityList< IfcTableColumn > > v);
+    IfcTemplatedEntityList< IfcTableColumn >::ptr Columns() const;
+    void setColumns(IfcTemplatedEntityList< IfcTableColumn >::ptr v);
     virtual unsigned int getArgumentCount() const { return 3; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_STRING; case 1: return IfcUtil::Argument_ENTITY_LIST; case 2: return IfcUtil::Argument_ENTITY_LIST; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcLabel; case 1: return Type::IfcTableRow; case 2: return Type::IfcTableColumn; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Name"; case 1: return "Rows"; case 2: return "Columns"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcTable (IfcAbstractEntityPtr e);
-    IfcTable (boost::optional< IfcLabel > v1_Name, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcTableRow > > > v2_Rows, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcTableColumn > > > v3_Columns);
-    typedef IfcTable* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcTable > > list;
-    typedef IfcTemplatedEntityList< IfcTable >::it it;
+    IfcTable (IfcAbstractEntity* e);
+    IfcTable (boost::optional< std::string > v1_Name, boost::optional< IfcTemplatedEntityList< IfcTableRow >::ptr > v2_Rows, boost::optional< IfcTemplatedEntityList< IfcTableColumn >::ptr > v3_Columns);
+    typedef IfcTemplatedEntityList< IfcTable > list;
 };
 /// An IfcTableColumn is a data structure that captures column information for use in an IfcTable. Each instance defines the name, description, identifier, and units of measure that are applicable to the columnar data associated with the IfcTableRow objects. 
 /// 
@@ -11380,41 +12540,40 @@ class IfcTable : public IfcUtil::IfcBaseEntity {
 class IfcTableColumn : public IfcUtil::IfcBaseEntity {
 public:
     /// Whether the optional attribute Identifier is defined for this IfcTableColumn
-    bool hasIdentifier();
+    bool hasIdentifier() const;
     /// Table column identifier.
-    IfcIdentifier Identifier();
-    void setIdentifier(IfcIdentifier v);
+    std::string Identifier() const;
+    void setIdentifier(std::string v);
     /// Whether the optional attribute Name is defined for this IfcTableColumn
-    bool hasName();
+    bool hasName() const;
     /// The table column display name.
-    IfcLabel Name();
-    void setName(IfcLabel v);
+    std::string Name() const;
+    void setName(std::string v);
     /// Whether the optional attribute Description is defined for this IfcTableColumn
-    bool hasDescription();
+    bool hasDescription() const;
     /// Descriptive text for the table column.
-    IfcText Description();
-    void setDescription(IfcText v);
+    std::string Description() const;
+    void setDescription(std::string v);
     /// Whether the optional attribute Unit is defined for this IfcTableColumn
-    bool hasUnit();
+    bool hasUnit() const;
     /// The unit of measure to be used for this column's data.
-    IfcUnit Unit();
-    void setUnit(IfcUnit v);
+    IfcUnit* Unit() const;
+    void setUnit(IfcUnit* v);
     /// Whether the optional attribute ReferencePath is defined for this IfcTableColumn
-    bool hasReferencePath();
-    IfcReference* ReferencePath();
+    bool hasReferencePath() const;
+    IfcReference* ReferencePath() const;
     void setReferencePath(IfcReference* v);
     virtual unsigned int getArgumentCount() const { return 5; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_STRING; case 1: return IfcUtil::Argument_STRING; case 2: return IfcUtil::Argument_STRING; case 3: return IfcUtil::Argument_ENTITY; case 4: return IfcUtil::Argument_ENTITY; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcIdentifier; case 1: return Type::IfcLabel; case 2: return Type::IfcText; case 3: return Type::IfcUnit; case 4: return Type::IfcReference; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Identifier"; case 1: return "Name"; case 2: return "Description"; case 3: return "Unit"; case 4: return "ReferencePath"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcTableColumn (IfcAbstractEntityPtr e);
-    IfcTableColumn (boost::optional< IfcIdentifier > v1_Identifier, boost::optional< IfcLabel > v2_Name, boost::optional< IfcText > v3_Description, boost::optional< IfcUnit > v4_Unit, IfcReference* v5_ReferencePath);
-    typedef IfcTableColumn* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcTableColumn > > list;
-    typedef IfcTemplatedEntityList< IfcTableColumn >::it it;
+    IfcTableColumn (IfcAbstractEntity* e);
+    IfcTableColumn (boost::optional< std::string > v1_Identifier, boost::optional< std::string > v2_Name, boost::optional< std::string > v3_Description, IfcUnit* v4_Unit, IfcReference* v5_ReferencePath);
+    typedef IfcTemplatedEntityList< IfcTableColumn > list;
 };
 /// IfcTableRow contains data for a single row within an IfcTable. 
 /// 
@@ -11432,28 +12591,27 @@ class IfcTableColumn : public IfcUtil::IfcBaseEntity {
 class IfcTableRow : public IfcUtil::IfcBaseEntity {
 public:
     /// Whether the optional attribute RowCells is defined for this IfcTableRow
-    bool hasRowCells();
+    bool hasRowCells() const;
     /// The data value of the table cell..
-    SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > RowCells();
-    void setRowCells(SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > v);
+    IfcEntityList::ptr RowCells() const;
+    void setRowCells(IfcEntityList::ptr v);
     /// Whether the optional attribute IsHeading is defined for this IfcTableRow
-    bool hasIsHeading();
+    bool hasIsHeading() const;
     /// Flag which identifies if the row is a heading row or a row which contains row values. NOTE - If the row is a heading, the flag takes the value = TRUE.
-    bool IsHeading();
+    bool IsHeading() const;
     void setIsHeading(bool v);
     virtual unsigned int getArgumentCount() const { return 2; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY_LIST; case 1: return IfcUtil::Argument_BOOL; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcValue; case 1: return Type::UNDEFINED; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "RowCells"; case 1: return "IsHeading"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcTable > > OfTable(); // INVERSE IfcTable::Rows
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcTable >::ptr OfTable() const; // INVERSE IfcTable::Rows
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcTableRow (IfcAbstractEntityPtr e);
-    IfcTableRow (boost::optional< IfcEntities > v1_RowCells, boost::optional< bool > v2_IsHeading);
-    typedef IfcTableRow* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcTableRow > > list;
-    typedef IfcTemplatedEntityList< IfcTableRow >::it it;
+    IfcTableRow (IfcAbstractEntity* e);
+    IfcTableRow (boost::optional< IfcEntityList::ptr > v1_RowCells, boost::optional< bool > v2_IsHeading);
+    typedef IfcTemplatedEntityList< IfcTableRow > list;
 };
 /// IfcTaskTime captures the time-related information about a task including the different types (actual or scheduled) of starting and ending times.
 /// 
@@ -11466,13 +12624,13 @@ class IfcTableRow : public IfcUtil::IfcBaseEntity {
 class IfcTaskTime : public IfcSchedulingTime {
 public:
     /// Whether the optional attribute DurationType is defined for this IfcTaskTime
-    bool hasDurationType();
+    bool hasDurationType() const;
     /// Enables to specify the type of duration values for ScheduleDuration,        ActualDuration and RemainingTime. The duration type is either
     ///   work time or elapsed time.
-    IfcTaskDurationEnum::IfcTaskDurationEnum DurationType();
+    IfcTaskDurationEnum::IfcTaskDurationEnum DurationType() const;
     void setDurationType(IfcTaskDurationEnum::IfcTaskDurationEnum v);
     /// Whether the optional attribute ScheduleDuration is defined for this IfcTaskTime
-    bool hasScheduleDuration();
+    bool hasScheduleDuration() const;
     /// The amount of time which is scheduled for completion of a
     ///   task.
     ///   The value might be measured or somehow calculated, which is defined by
@@ -11482,57 +12640,57 @@ class IfcTaskTime : public IfcSchedulingTime {
     /// 
     /// NOTE: Scheduled Duration may be calculated as the
     ///   time from scheduled start date to scheduled finish date.
-    IfcDuration ScheduleDuration();
-    void setScheduleDuration(IfcDuration v);
+    std::string ScheduleDuration() const;
+    void setScheduleDuration(std::string v);
     /// Whether the optional attribute ScheduleStart is defined for this IfcTaskTime
-    bool hasScheduleStart();
+    bool hasScheduleStart() const;
     /// The date on which a task is scheduled to be started. 
     ///   The value might be measured or somehow calculated, which is defined by
     ///   ScheduleDataOrigin.
     /// 
     /// NOTE: The scheduled start date must be greater than
     ///   or equal to the earliest start date.
-    IfcDateTime ScheduleStart();
-    void setScheduleStart(IfcDateTime v);
+    std::string ScheduleStart() const;
+    void setScheduleStart(std::string v);
     /// Whether the optional attribute ScheduleFinish is defined for this IfcTaskTime
-    bool hasScheduleFinish();
+    bool hasScheduleFinish() const;
     /// The date on which a task is scheduled to be finished.
     ///   The value might be measured or somehow calculated, which is defined by
     ///   ScheduleDataOrigin.
     /// 
     /// NOTE: The scheduled finish date must be greater than
     ///   or equal to the earliest finish date.
-    IfcDateTime ScheduleFinish();
-    void setScheduleFinish(IfcDateTime v);
+    std::string ScheduleFinish() const;
+    void setScheduleFinish(std::string v);
     /// Whether the optional attribute EarlyStart is defined for this IfcTaskTime
-    bool hasEarlyStart();
+    bool hasEarlyStart() const;
     /// The earliest date on which a task can be started. It is a calculated value.
-    IfcDateTime EarlyStart();
-    void setEarlyStart(IfcDateTime v);
+    std::string EarlyStart() const;
+    void setEarlyStart(std::string v);
     /// Whether the optional attribute EarlyFinish is defined for this IfcTaskTime
-    bool hasEarlyFinish();
+    bool hasEarlyFinish() const;
     /// The earliest date on which a task can be finished. It is a calculated value.
-    IfcDateTime EarlyFinish();
-    void setEarlyFinish(IfcDateTime v);
+    std::string EarlyFinish() const;
+    void setEarlyFinish(std::string v);
     /// Whether the optional attribute LateStart is defined for this IfcTaskTime
-    bool hasLateStart();
+    bool hasLateStart() const;
     /// The latest date on which a task can be started. It is a calculated value.
-    IfcDateTime LateStart();
-    void setLateStart(IfcDateTime v);
+    std::string LateStart() const;
+    void setLateStart(std::string v);
     /// Whether the optional attribute LateFinish is defined for this IfcTaskTime
-    bool hasLateFinish();
+    bool hasLateFinish() const;
     /// The latest date on which a task can be finished. It is a calculated value.
-    IfcDateTime LateFinish();
-    void setLateFinish(IfcDateTime v);
+    std::string LateFinish() const;
+    void setLateFinish(std::string v);
     /// Whether the optional attribute FreeFloat is defined for this IfcTaskTime
-    bool hasFreeFloat();
+    bool hasFreeFloat() const;
     /// The amount of time during which the start or finish of a
     ///   task may be varied without any effect on the overall
     ///   programme of work. It is a calculated elapsed time value.
-    IfcDuration FreeFloat();
-    void setFreeFloat(IfcDuration v);
+    std::string FreeFloat() const;
+    void setFreeFloat(std::string v);
     /// Whether the optional attribute TotalFloat is defined for this IfcTaskTime
-    bool hasTotalFloat();
+    bool hasTotalFloat() const;
     /// The difference between the duration available to carry out
     ///   a task and the scheduled duration of the task. It is a calculated 
     ///   elapsed time value.
@@ -11543,32 +12701,32 @@ class IfcTaskTime : public IfcSchedulingTime {
     ///   finish. Float time may be either positive, zero or
     ///   negative. Where it is zero or negative, the task becomes
     ///   critical.
-    IfcDuration TotalFloat();
-    void setTotalFloat(IfcDuration v);
+    std::string TotalFloat() const;
+    void setTotalFloat(std::string v);
     /// Whether the optional attribute IsCritical is defined for this IfcTaskTime
-    bool hasIsCritical();
+    bool hasIsCritical() const;
     /// A flag which identifies whether a scheduled task is a
     ///   critical item within the programme.
     /// 
     /// NOTE: A task becomes critical when the float time
     ///   becomes zero or negative.
-    bool IsCritical();
+    bool IsCritical() const;
     void setIsCritical(bool v);
     /// Whether the optional attribute StatusTime is defined for this IfcTaskTime
-    bool hasStatusTime();
+    bool hasStatusTime() const;
     /// The date or time at which the status of the tasks within
     ///   the schedule is analyzed.
-    IfcDateTime StatusTime();
-    void setStatusTime(IfcDateTime v);
+    std::string StatusTime() const;
+    void setStatusTime(std::string v);
     /// Whether the optional attribute ActualDuration is defined for this IfcTaskTime
-    bool hasActualDuration();
+    bool hasActualDuration() const;
     /// The actual duration of the task. It is a measured value.
     ///   The value is either given as elapsed time or work time, which is defined by
     ///   DurationType.
-    IfcDuration ActualDuration();
-    void setActualDuration(IfcDuration v);
+    std::string ActualDuration() const;
+    void setActualDuration(std::string v);
     /// Whether the optional attribute ActualStart is defined for this IfcTaskTime
-    bool hasActualStart();
+    bool hasActualStart() const;
     /// The date on which a task is actually started. It is a measured value.
     /// 
     /// NOTE: The scheduled start date must be greater than
@@ -11576,15 +12734,15 @@ class IfcTaskTime : public IfcSchedulingTime {
     ///   applied to the actual start date with respect to the
     ///   scheduled start date since a task may be started earlier
     ///   than had originally been scheduled if circumstances allow.
-    IfcDateTime ActualStart();
-    void setActualStart(IfcDateTime v);
+    std::string ActualStart() const;
+    void setActualStart(std::string v);
     /// Whether the optional attribute ActualFinish is defined for this IfcTaskTime
-    bool hasActualFinish();
+    bool hasActualFinish() const;
     /// The date on which a task is actually finished.
-    IfcDateTime ActualFinish();
-    void setActualFinish(IfcDateTime v);
+    std::string ActualFinish() const;
+    void setActualFinish(std::string v);
     /// Whether the optional attribute RemainingTime is defined for this IfcTaskTime
-    bool hasRemainingTime();
+    bool hasRemainingTime() const;
     /// The amount of time remaining to complete a task. It is a predicted value.
     ///   The value is either given as elapsed time or work time, which is defined by
     ///   DurationType.
@@ -11596,46 +12754,44 @@ class IfcTaskTime : public IfcSchedulingTime {
     ///   task already started, remaining time is calculated as the
     ///   difference between the scheduled finish and the point of
     ///   analysis.
-    IfcDuration RemainingTime();
-    void setRemainingTime(IfcDuration v);
+    std::string RemainingTime() const;
+    void setRemainingTime(std::string v);
     /// Whether the optional attribute Completion is defined for this IfcTaskTime
-    bool hasCompletion();
+    bool hasCompletion() const;
     /// The extent of completion expressed as a ratio or percentage.
     ///   It is a measured value.
-    IfcPositiveRatioMeasure Completion();
-    void setCompletion(IfcPositiveRatioMeasure v);
+    double Completion() const;
+    void setCompletion(double v);
     virtual unsigned int getArgumentCount() const { return 20; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 3: return IfcUtil::Argument_ENUMERATION; case 4: return IfcUtil::Argument_STRING; case 5: return IfcUtil::Argument_STRING; case 6: return IfcUtil::Argument_STRING; case 7: return IfcUtil::Argument_STRING; case 8: return IfcUtil::Argument_STRING; case 9: return IfcUtil::Argument_STRING; case 10: return IfcUtil::Argument_STRING; case 11: return IfcUtil::Argument_STRING; case 12: return IfcUtil::Argument_STRING; case 13: return IfcUtil::Argument_BOOL; case 14: return IfcUtil::Argument_STRING; case 15: return IfcUtil::Argument_STRING; case 16: return IfcUtil::Argument_STRING; case 17: return IfcUtil::Argument_STRING; case 18: return IfcUtil::Argument_STRING; case 19: return IfcUtil::Argument_DOUBLE; } return IfcSchedulingTime::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 3: return Type::IfcTaskDurationEnum; case 4: return Type::IfcDuration; case 5: return Type::IfcDateTime; case 6: return Type::IfcDateTime; case 7: return Type::IfcDateTime; case 8: return Type::IfcDateTime; case 9: return Type::IfcDateTime; case 10: return Type::IfcDateTime; case 11: return Type::IfcDuration; case 12: return Type::IfcDuration; case 13: return Type::UNDEFINED; case 14: return Type::IfcDateTime; case 15: return Type::IfcDuration; case 16: return Type::IfcDateTime; case 17: return Type::IfcDateTime; case 18: return Type::IfcDuration; case 19: return Type::IfcPositiveRatioMeasure; } return IfcSchedulingTime::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 3: return "DurationType"; case 4: return "ScheduleDuration"; case 5: return "ScheduleStart"; case 6: return "ScheduleFinish"; case 7: return "EarlyStart"; case 8: return "EarlyFinish"; case 9: return "LateStart"; case 10: return "LateFinish"; case 11: return "FreeFloat"; case 12: return "TotalFloat"; case 13: return "IsCritical"; case 14: return "StatusTime"; case 15: return "ActualDuration"; case 16: return "ActualStart"; case 17: return "ActualFinish"; case 18: return "RemainingTime"; case 19: return "Completion"; } return IfcSchedulingTime::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcTaskTime (IfcAbstractEntityPtr e);
-    IfcTaskTime (boost::optional< IfcLabel > v1_Name, boost::optional< IfcDataOriginEnum::IfcDataOriginEnum > v2_DataOrigin, boost::optional< IfcLabel > v3_UserDefinedDataOrigin, boost::optional< IfcTaskDurationEnum::IfcTaskDurationEnum > v4_DurationType, boost::optional< IfcDuration > v5_ScheduleDuration, boost::optional< IfcDateTime > v6_ScheduleStart, boost::optional< IfcDateTime > v7_ScheduleFinish, boost::optional< IfcDateTime > v8_EarlyStart, boost::optional< IfcDateTime > v9_EarlyFinish, boost::optional< IfcDateTime > v10_LateStart, boost::optional< IfcDateTime > v11_LateFinish, boost::optional< IfcDuration > v12_FreeFloat, boost::optional< IfcDuration > v13_TotalFloat, boost::optional< bool > v14_IsCritical, boost::optional< IfcDateTime > v15_StatusTime, boost::optional< IfcDuration > v16_ActualDuration, boost::optional< IfcDateTime > v17_ActualStart, boost::optional< IfcDateTime > v18_ActualFinish, boost::optional< IfcDuration > v19_RemainingTime, boost::optional< IfcPositiveRatioMeasure > v20_Completion);
-    typedef IfcTaskTime* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcTaskTime > > list;
-    typedef IfcTemplatedEntityList< IfcTaskTime >::it it;
+    IfcTaskTime (IfcAbstractEntity* e);
+    IfcTaskTime (boost::optional< std::string > v1_Name, boost::optional< IfcDataOriginEnum::IfcDataOriginEnum > v2_DataOrigin, boost::optional< std::string > v3_UserDefinedDataOrigin, boost::optional< IfcTaskDurationEnum::IfcTaskDurationEnum > v4_DurationType, boost::optional< std::string > v5_ScheduleDuration, boost::optional< std::string > v6_ScheduleStart, boost::optional< std::string > v7_ScheduleFinish, boost::optional< std::string > v8_EarlyStart, boost::optional< std::string > v9_EarlyFinish, boost::optional< std::string > v10_LateStart, boost::optional< std::string > v11_LateFinish, boost::optional< std::string > v12_FreeFloat, boost::optional< std::string > v13_TotalFloat, boost::optional< bool > v14_IsCritical, boost::optional< std::string > v15_StatusTime, boost::optional< std::string > v16_ActualDuration, boost::optional< std::string > v17_ActualStart, boost::optional< std::string > v18_ActualFinish, boost::optional< std::string > v19_RemainingTime, boost::optional< double > v20_Completion);
+    typedef IfcTemplatedEntityList< IfcTaskTime > list;
 };
 /// IfcTaskTimeRecurring is a recurring instance of IfcTaskTime for handling regularly scheduled or repetitive tasks.
 /// 
 /// HISTORY: New entity in IFC2x4.
 class IfcTaskTimeRecurring : public IfcTaskTime {
 public:
-    IfcRecurrencePattern* Recurrance();
+    IfcRecurrencePattern* Recurrance() const;
     void setRecurrance(IfcRecurrencePattern* v);
     virtual unsigned int getArgumentCount() const { return 21; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 20: return IfcUtil::Argument_ENTITY; } return IfcTaskTime::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 20: return Type::IfcRecurrencePattern; } return IfcTaskTime::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 20: return "Recurrance"; } return IfcTaskTime::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcTaskTimeRecurring (IfcAbstractEntityPtr e);
-    IfcTaskTimeRecurring (boost::optional< IfcLabel > v1_Name, boost::optional< IfcDataOriginEnum::IfcDataOriginEnum > v2_DataOrigin, boost::optional< IfcLabel > v3_UserDefinedDataOrigin, boost::optional< IfcTaskDurationEnum::IfcTaskDurationEnum > v4_DurationType, boost::optional< IfcDuration > v5_ScheduleDuration, boost::optional< IfcDateTime > v6_ScheduleStart, boost::optional< IfcDateTime > v7_ScheduleFinish, boost::optional< IfcDateTime > v8_EarlyStart, boost::optional< IfcDateTime > v9_EarlyFinish, boost::optional< IfcDateTime > v10_LateStart, boost::optional< IfcDateTime > v11_LateFinish, boost::optional< IfcDuration > v12_FreeFloat, boost::optional< IfcDuration > v13_TotalFloat, boost::optional< bool > v14_IsCritical, boost::optional< IfcDateTime > v15_StatusTime, boost::optional< IfcDuration > v16_ActualDuration, boost::optional< IfcDateTime > v17_ActualStart, boost::optional< IfcDateTime > v18_ActualFinish, boost::optional< IfcDuration > v19_RemainingTime, boost::optional< IfcPositiveRatioMeasure > v20_Completion, IfcRecurrencePattern* v21_Recurrance);
-    typedef IfcTaskTimeRecurring* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcTaskTimeRecurring > > list;
-    typedef IfcTemplatedEntityList< IfcTaskTimeRecurring >::it it;
+    IfcTaskTimeRecurring (IfcAbstractEntity* e);
+    IfcTaskTimeRecurring (boost::optional< std::string > v1_Name, boost::optional< IfcDataOriginEnum::IfcDataOriginEnum > v2_DataOrigin, boost::optional< std::string > v3_UserDefinedDataOrigin, boost::optional< IfcTaskDurationEnum::IfcTaskDurationEnum > v4_DurationType, boost::optional< std::string > v5_ScheduleDuration, boost::optional< std::string > v6_ScheduleStart, boost::optional< std::string > v7_ScheduleFinish, boost::optional< std::string > v8_EarlyStart, boost::optional< std::string > v9_EarlyFinish, boost::optional< std::string > v10_LateStart, boost::optional< std::string > v11_LateFinish, boost::optional< std::string > v12_FreeFloat, boost::optional< std::string > v13_TotalFloat, boost::optional< bool > v14_IsCritical, boost::optional< std::string > v15_StatusTime, boost::optional< std::string > v16_ActualDuration, boost::optional< std::string > v17_ActualStart, boost::optional< std::string > v18_ActualFinish, boost::optional< std::string > v19_RemainingTime, boost::optional< double > v20_Completion, IfcRecurrencePattern* v21_Recurrance);
+    typedef IfcTemplatedEntityList< IfcTaskTimeRecurring > list;
 };
 /// Definition: Address to which telephone, electronic mail and other forms of telecommunications should be addressed.
 /// 
@@ -11646,50 +12802,49 @@ class IfcTaskTimeRecurring : public IfcTaskTime {
 class IfcTelecomAddress : public IfcAddress {
 public:
     /// Whether the optional attribute TelephoneNumbers is defined for this IfcTelecomAddress
-    bool hasTelephoneNumbers();
+    bool hasTelephoneNumbers() const;
     /// The list of telephone numbers at which telephone messages may be received.
-    std::vector< IfcLabel > /*[1:?]*/ TelephoneNumbers();
-    void setTelephoneNumbers(std::vector< IfcLabel > /*[1:?]*/ v);
+    std::vector< std::string > /*[1:?]*/ TelephoneNumbers() const;
+    void setTelephoneNumbers(std::vector< std::string > /*[1:?]*/ v);
     /// Whether the optional attribute FacsimileNumbers is defined for this IfcTelecomAddress
-    bool hasFacsimileNumbers();
+    bool hasFacsimileNumbers() const;
     /// The list of fax numbers at which fax messages may be received.
-    std::vector< IfcLabel > /*[1:?]*/ FacsimileNumbers();
-    void setFacsimileNumbers(std::vector< IfcLabel > /*[1:?]*/ v);
+    std::vector< std::string > /*[1:?]*/ FacsimileNumbers() const;
+    void setFacsimileNumbers(std::vector< std::string > /*[1:?]*/ v);
     /// Whether the optional attribute PagerNumber is defined for this IfcTelecomAddress
-    bool hasPagerNumber();
+    bool hasPagerNumber() const;
     /// The pager number at which paging messages may be received.
-    IfcLabel PagerNumber();
-    void setPagerNumber(IfcLabel v);
+    std::string PagerNumber() const;
+    void setPagerNumber(std::string v);
     /// Whether the optional attribute ElectronicMailAddresses is defined for this IfcTelecomAddress
-    bool hasElectronicMailAddresses();
+    bool hasElectronicMailAddresses() const;
     /// The list of Email addresses at which Email messages may be received.
-    std::vector< IfcLabel > /*[1:?]*/ ElectronicMailAddresses();
-    void setElectronicMailAddresses(std::vector< IfcLabel > /*[1:?]*/ v);
+    std::vector< std::string > /*[1:?]*/ ElectronicMailAddresses() const;
+    void setElectronicMailAddresses(std::vector< std::string > /*[1:?]*/ v);
     /// Whether the optional attribute WWWHomePageURL is defined for this IfcTelecomAddress
-    bool hasWWWHomePageURL();
+    bool hasWWWHomePageURL() const;
     /// The world wide web address at which the preliminary page of information for the person or organization can be located.
     /// NOTE: Information on the world wide web for a person or organization may be separated 
     /// into a number of pages and across a number of host sites, all of which may be linked together. It is assumed that 
     /// all such information may be referenced from a single page that is termed the home page for that person or organization.
-    IfcURIReference WWWHomePageURL();
-    void setWWWHomePageURL(IfcURIReference v);
+    std::string WWWHomePageURL() const;
+    void setWWWHomePageURL(std::string v);
     /// Whether the optional attribute MessagingIDs is defined for this IfcTelecomAddress
-    bool hasMessagingIDs();
+    bool hasMessagingIDs() const;
     /// IDs or addresses for any other means of telecommunication, for example instant messaging, voice-over-IP, or file transfer protocols. The communication protocol is indicated by the URI value with scheme designations such as irc:, sip:, or ftp:.
-    std::vector< IfcURIReference > /*[1:?]*/ MessagingIDs();
-    void setMessagingIDs(std::vector< IfcURIReference > /*[1:?]*/ v);
+    std::vector< std::string > /*[1:?]*/ MessagingIDs() const;
+    void setMessagingIDs(std::vector< std::string > /*[1:?]*/ v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 3: return IfcUtil::Argument_VECTOR_STRING; case 4: return IfcUtil::Argument_VECTOR_STRING; case 5: return IfcUtil::Argument_STRING; case 6: return IfcUtil::Argument_VECTOR_STRING; case 7: return IfcUtil::Argument_STRING; case 8: return IfcUtil::Argument_VECTOR_STRING; } return IfcAddress::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 3: return Type::IfcLabel; case 4: return Type::IfcLabel; case 5: return Type::IfcLabel; case 6: return Type::IfcLabel; case 7: return Type::IfcURIReference; case 8: return Type::IfcURIReference; } return IfcAddress::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 3: return "TelephoneNumbers"; case 4: return "FacsimileNumbers"; case 5: return "PagerNumber"; case 6: return "ElectronicMailAddresses"; case 7: return "WWWHomePageURL"; case 8: return "MessagingIDs"; } return IfcAddress::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcTelecomAddress (IfcAbstractEntityPtr e);
-    IfcTelecomAddress (boost::optional< IfcAddressTypeEnum::IfcAddressTypeEnum > v1_Purpose, boost::optional< IfcText > v2_Description, boost::optional< IfcLabel > v3_UserDefinedPurpose, boost::optional< std::vector< IfcLabel > /*[1:?]*/ > v4_TelephoneNumbers, boost::optional< std::vector< IfcLabel > /*[1:?]*/ > v5_FacsimileNumbers, boost::optional< IfcLabel > v6_PagerNumber, boost::optional< std::vector< IfcLabel > /*[1:?]*/ > v7_ElectronicMailAddresses, boost::optional< IfcURIReference > v8_WWWHomePageURL, boost::optional< std::vector< IfcURIReference > /*[1:?]*/ > v9_MessagingIDs);
-    typedef IfcTelecomAddress* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcTelecomAddress > > list;
-    typedef IfcTemplatedEntityList< IfcTelecomAddress >::it it;
+    IfcTelecomAddress (IfcAbstractEntity* e);
+    IfcTelecomAddress (boost::optional< IfcAddressTypeEnum::IfcAddressTypeEnum > v1_Purpose, boost::optional< std::string > v2_Description, boost::optional< std::string > v3_UserDefinedPurpose, boost::optional< std::vector< std::string > /*[1:?]*/ > v4_TelephoneNumbers, boost::optional< std::vector< std::string > /*[1:?]*/ > v5_FacsimileNumbers, boost::optional< std::string > v6_PagerNumber, boost::optional< std::vector< std::string > /*[1:?]*/ > v7_ElectronicMailAddresses, boost::optional< std::string > v8_WWWHomePageURL, boost::optional< std::vector< std::string > /*[1:?]*/ > v9_MessagingIDs);
+    typedef IfcTemplatedEntityList< IfcTelecomAddress > list;
 };
 /// Definition from ISO/CD 10303-46:1992: The text style is a presentation style for annotation text.
 /// 
@@ -11722,40 +12877,39 @@ class IfcTelecomAddress : public IfcAddress {
 class IfcTextStyle : public IfcPresentationStyle {
 public:
     /// Whether the optional attribute TextCharacterAppearance is defined for this IfcTextStyle
-    bool hasTextCharacterAppearance();
+    bool hasTextCharacterAppearance() const;
     /// A character style to be used for presented text.
-    IfcTextStyleForDefinedFont* TextCharacterAppearance();
+    IfcTextStyleForDefinedFont* TextCharacterAppearance() const;
     void setTextCharacterAppearance(IfcTextStyleForDefinedFont* v);
     /// Whether the optional attribute TextStyle is defined for this IfcTextStyle
-    bool hasTextStyle();
+    bool hasTextStyle() const;
     /// The style applied to the text block for its visual appearance.
     /// It defines the text block characteristics, either for vector based or monospace text fonts (see select item IfcTextStyleWithBoxCharacteristics), or for true type text fonts (see select item IfcTextStyleTextModel.
     /// 
     /// IFC2x Edition 3 CHANGE  The attribute TextBlockStyle has been changed from SET[1:?] to a non-aggregated optional, it has been renamed from TextStyles.
-    IfcTextStyleTextModel* TextStyle();
+    IfcTextStyleTextModel* TextStyle() const;
     void setTextStyle(IfcTextStyleTextModel* v);
     /// The style applied to the text font for its visual appearance.
     /// It defines the font family, font style, weight and size.
     /// 
     /// IFC2x Edition 2 Addendum 2 CHANGE The attribute TextFontStyle is a new attribute attached to IfcTextStyle.
-    IfcTextFontSelect TextFontStyle();
-    void setTextFontStyle(IfcTextFontSelect v);
+    IfcTextFontSelect* TextFontStyle() const;
+    void setTextFontStyle(IfcTextFontSelect* v);
     /// Whether the optional attribute ModelOrDraughting is defined for this IfcTextStyle
-    bool hasModelOrDraughting();
-    bool ModelOrDraughting();
+    bool hasModelOrDraughting() const;
+    bool ModelOrDraughting() const;
     void setModelOrDraughting(bool v);
     virtual unsigned int getArgumentCount() const { return 5; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 1: return IfcUtil::Argument_ENTITY; case 2: return IfcUtil::Argument_ENTITY; case 3: return IfcUtil::Argument_ENTITY; case 4: return IfcUtil::Argument_BOOL; } return IfcPresentationStyle::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 1: return Type::IfcTextStyleForDefinedFont; case 2: return Type::IfcTextStyleTextModel; case 3: return Type::IfcTextFontSelect; case 4: return Type::UNDEFINED; } return IfcPresentationStyle::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 1: return "TextCharacterAppearance"; case 2: return "TextStyle"; case 3: return "TextFontStyle"; case 4: return "ModelOrDraughting"; } return IfcPresentationStyle::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcTextStyle (IfcAbstractEntityPtr e);
-    IfcTextStyle (boost::optional< IfcLabel > v1_Name, IfcTextStyleForDefinedFont* v2_TextCharacterAppearance, IfcTextStyleTextModel* v3_TextStyle, IfcTextFontSelect v4_TextFontStyle, boost::optional< bool > v5_ModelOrDraughting);
-    typedef IfcTextStyle* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcTextStyle > > list;
-    typedef IfcTemplatedEntityList< IfcTextStyle >::it it;
+    IfcTextStyle (IfcAbstractEntity* e);
+    IfcTextStyle (boost::optional< std::string > v1_Name, IfcTextStyleForDefinedFont* v2_TextCharacterAppearance, IfcTextStyleTextModel* v3_TextStyle, IfcTextFontSelect* v4_TextFontStyle, boost::optional< bool > v5_ModelOrDraughting);
+    typedef IfcTemplatedEntityList< IfcTextStyle > list;
 };
 /// Definition from ISO/CD 10303-46:1992: A text style for defined font is a character glyph style for pre-defined or externally defined text fonts.
 /// 
@@ -11777,25 +12931,24 @@ class IfcTextStyle : public IfcPresentationStyle {
 class IfcTextStyleForDefinedFont : public IfcPresentationItem {
 public:
     /// This property describes the text color of an element (often referred to as the foreground color).
-    IfcColour Colour();
-    void setColour(IfcColour v);
+    IfcColour* Colour() const;
+    void setColour(IfcColour* v);
     /// Whether the optional attribute BackgroundColour is defined for this IfcTextStyleForDefinedFont
-    bool hasBackgroundColour();
+    bool hasBackgroundColour() const;
     /// This property sets the background color of an element.
-    IfcColour BackgroundColour();
-    void setBackgroundColour(IfcColour v);
+    IfcColour* BackgroundColour() const;
+    void setBackgroundColour(IfcColour* v);
     virtual unsigned int getArgumentCount() const { return 2; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY; case 1: return IfcUtil::Argument_ENTITY; } return IfcPresentationItem::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcColour; case 1: return Type::IfcColour; } return IfcPresentationItem::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Colour"; case 1: return "BackgroundColour"; } return IfcPresentationItem::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcTextStyleForDefinedFont (IfcAbstractEntityPtr e);
-    IfcTextStyleForDefinedFont (IfcColour v1_Colour, boost::optional< IfcColour > v2_BackgroundColour);
-    typedef IfcTextStyleForDefinedFont* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcTextStyleForDefinedFont > > list;
-    typedef IfcTemplatedEntityList< IfcTextStyleForDefinedFont >::it it;
+    IfcTextStyleForDefinedFont (IfcAbstractEntity* e);
+    IfcTextStyleForDefinedFont (IfcColour* v1_Colour, IfcColour* v2_BackgroundColour);
+    typedef IfcTemplatedEntityList< IfcTextStyleForDefinedFont > list;
 };
 /// Definition from CSS1 (W3C Recommendation): The properties defined in the text model affect the visual presentation of characters, spaces, words, and paragraphs.
 /// 
@@ -11807,59 +12960,58 @@ class IfcTextStyleForDefinedFont : public IfcPresentationItem {
 class IfcTextStyleTextModel : public IfcPresentationItem {
 public:
     /// Whether the optional attribute TextIndent is defined for this IfcTextStyleTextModel
-    bool hasTextIndent();
+    bool hasTextIndent() const;
     /// The property specifies the indentation that appears before the first formatted line.
     ///   NOTE  It has been introduced for later compliance to full CSS1 support.
-    IfcSizeSelect TextIndent();
-    void setTextIndent(IfcSizeSelect v);
+    IfcSizeSelect* TextIndent() const;
+    void setTextIndent(IfcSizeSelect* v);
     /// Whether the optional attribute TextAlign is defined for this IfcTextStyleTextModel
-    bool hasTextAlign();
+    bool hasTextAlign() const;
     /// This property describes how text is aligned horizontally within the element. The actual justification algorithm used is dependent on the rendering algorithm.
-    IfcTextAlignment TextAlign();
-    void setTextAlign(IfcTextAlignment v);
+    std::string TextAlign() const;
+    void setTextAlign(std::string v);
     /// Whether the optional attribute TextDecoration is defined for this IfcTextStyleTextModel
-    bool hasTextDecoration();
+    bool hasTextDecoration() const;
     /// This property describes decorations that are added to the text of an element.
-    IfcTextDecoration TextDecoration();
-    void setTextDecoration(IfcTextDecoration v);
+    std::string TextDecoration() const;
+    void setTextDecoration(std::string v);
     /// Whether the optional attribute LetterSpacing is defined for this IfcTextStyleTextModel
-    bool hasLetterSpacing();
+    bool hasLetterSpacing() const;
     /// The length unit indicates an addition to the default space between characters. Values can be negative, but there may be implementation-specific limits. The user agent is free to select the exact spacing algorithm. The letter spacing may also be influenced by justification (which is a value of the 'align' property).
     ///   NOTE  The following values are allowed, IfcDescriptiveMeasure with value='normal', or IfcLengthMeasure, the length unit is globally defined at IfcUnitAssignment.
-    IfcSizeSelect LetterSpacing();
-    void setLetterSpacing(IfcSizeSelect v);
+    IfcSizeSelect* LetterSpacing() const;
+    void setLetterSpacing(IfcSizeSelect* v);
     /// Whether the optional attribute WordSpacing is defined for this IfcTextStyleTextModel
-    bool hasWordSpacing();
+    bool hasWordSpacing() const;
     /// The length unit indicates an addition to the default space between words. Values can be negative, but there may be implementation-specific limits. The user agent is free to select the exact spacing algorithm. The word spacing may also be influenced by justification (which is a value of the 'text-align' property).
     ///   NOTE  It has been introduced for later compliance to full CSS1 support.
-    IfcSizeSelect WordSpacing();
-    void setWordSpacing(IfcSizeSelect v);
+    IfcSizeSelect* WordSpacing() const;
+    void setWordSpacing(IfcSizeSelect* v);
     /// Whether the optional attribute TextTransform is defined for this IfcTextStyleTextModel
-    bool hasTextTransform();
+    bool hasTextTransform() const;
     /// This property describes how text characters may transform to upper case, lower case, or capitalized case, independent of the character case used in the text literal.
     ///   NOTE  It has been introduced for later compliance to full CSS1 support.
-    IfcTextTransformation TextTransform();
-    void setTextTransform(IfcTextTransformation v);
+    std::string TextTransform() const;
+    void setTextTransform(std::string v);
     /// Whether the optional attribute LineHeight is defined for this IfcTextStyleTextModel
-    bool hasLineHeight();
+    bool hasLineHeight() const;
     /// The property sets the distance between two adjacent lines' baselines.
     /// When a ratio value is specified, the line height is given by the font size of the current element multiplied with the numerical value. A value of 'normal' sets the line height to a reasonable value for the element's font. It is suggested that user agents set the 'normal' value to be a ratio number in the range of 1.0 to 1.2.
     ///   NOTE  The following values are allowed: IfcDescriptiveMeasure with value='normal', or 
     /// IfcLengthMeasure, with non-negative values, the length unit is globally defined at IfcUnitAssignment, or IfcRatioMeasure.
-    IfcSizeSelect LineHeight();
-    void setLineHeight(IfcSizeSelect v);
+    IfcSizeSelect* LineHeight() const;
+    void setLineHeight(IfcSizeSelect* v);
     virtual unsigned int getArgumentCount() const { return 7; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY; case 1: return IfcUtil::Argument_STRING; case 2: return IfcUtil::Argument_STRING; case 3: return IfcUtil::Argument_ENTITY; case 4: return IfcUtil::Argument_ENTITY; case 5: return IfcUtil::Argument_STRING; case 6: return IfcUtil::Argument_ENTITY; } return IfcPresentationItem::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcSizeSelect; case 1: return Type::IfcTextAlignment; case 2: return Type::IfcTextDecoration; case 3: return Type::IfcSizeSelect; case 4: return Type::IfcSizeSelect; case 5: return Type::IfcTextTransformation; case 6: return Type::IfcSizeSelect; } return IfcPresentationItem::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "TextIndent"; case 1: return "TextAlign"; case 2: return "TextDecoration"; case 3: return "LetterSpacing"; case 4: return "WordSpacing"; case 5: return "TextTransform"; case 6: return "LineHeight"; } return IfcPresentationItem::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcTextStyleTextModel (IfcAbstractEntityPtr e);
-    IfcTextStyleTextModel (boost::optional< IfcSizeSelect > v1_TextIndent, boost::optional< IfcTextAlignment > v2_TextAlign, boost::optional< IfcTextDecoration > v3_TextDecoration, boost::optional< IfcSizeSelect > v4_LetterSpacing, boost::optional< IfcSizeSelect > v5_WordSpacing, boost::optional< IfcTextTransformation > v6_TextTransform, boost::optional< IfcSizeSelect > v7_LineHeight);
-    typedef IfcTextStyleTextModel* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcTextStyleTextModel > > list;
-    typedef IfcTemplatedEntityList< IfcTextStyleTextModel >::it it;
+    IfcTextStyleTextModel (IfcAbstractEntity* e);
+    IfcTextStyleTextModel (IfcSizeSelect* v1_TextIndent, boost::optional< std::string > v2_TextAlign, boost::optional< std::string > v3_TextDecoration, IfcSizeSelect* v4_LetterSpacing, IfcSizeSelect* v5_WordSpacing, boost::optional< std::string > v6_TextTransform, IfcSizeSelect* v7_LineHeight);
+    typedef IfcTemplatedEntityList< IfcTextStyleTextModel > list;
 };
 /// The IfcTextureCoordinate a an abstract supertype of the different kinds to apply texture coordinates to geometries. For vertex based geometries an explicit assignment of 2D texture vertices to the 3D geometry points is supported by the subtype IfcTextureMap, in addition there can be a procedural description of how texture coordinates shall be applied to geometric items. If no IfcTextureCoordinate is provided for the IfcSurfaceTexture, the default mapping shall be used.
 /// 
@@ -11874,20 +13026,19 @@ class IfcTextStyleTextModel : public IfcPresentationItem {
 /// IFC2x4 CHANGE  The inverse attribute AnnotatedSurface is deleted, and the inverse AppliesTextures is added.
 class IfcTextureCoordinate : public IfcPresentationItem {
 public:
-    SHARED_PTR< IfcTemplatedEntityList< IfcSurfaceTexture > > Maps();
-    void setMaps(SHARED_PTR< IfcTemplatedEntityList< IfcSurfaceTexture > > v);
+    IfcTemplatedEntityList< IfcSurfaceTexture >::ptr Maps() const;
+    void setMaps(IfcTemplatedEntityList< IfcSurfaceTexture >::ptr v);
     virtual unsigned int getArgumentCount() const { return 1; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY_LIST; } return IfcPresentationItem::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcSurfaceTexture; } return IfcPresentationItem::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Maps"; } return IfcPresentationItem::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcTextureCoordinate (IfcAbstractEntityPtr e);
-    IfcTextureCoordinate (SHARED_PTR< IfcTemplatedEntityList< IfcSurfaceTexture > > v1_Maps);
-    typedef IfcTextureCoordinate* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcTextureCoordinate > > list;
-    typedef IfcTemplatedEntityList< IfcTextureCoordinate >::it it;
+    IfcTextureCoordinate (IfcAbstractEntity* e);
+    IfcTextureCoordinate (IfcTemplatedEntityList< IfcSurfaceTexture >::ptr v1_Maps);
+    typedef IfcTemplatedEntityList< IfcTextureCoordinate > list;
 };
 /// The IfcTextureCoordinateGenerator describes a procedurally defined mapping function with input parameter to map 2D texture coordinates to 3D geometry vertices. The allowable Mode values and input Parameter need to be agreed upon in view definitions and implementer agreements.
 /// 
@@ -11920,27 +13071,26 @@ class IfcTextureCoordinateGenerator : public IfcTextureCoordinate {
     /// The Mode attribute describes the algorithm used to compute texture coordinates.
     /// 
     /// NOTE  The applicable values for the Mode attribute are determined by view definitions or implementer agreements. It is recommended to use the modes described in ISO/IES 19775-1.2:2008 X3D Architecture and base components Edition 2, Part 1. See 18.4.8 TextureCoordinateGenerator for recommended values.
-    IfcLabel Mode();
-    void setMode(IfcLabel v);
+    std::string Mode() const;
+    void setMode(std::string v);
     /// Whether the optional attribute Parameter is defined for this IfcTextureCoordinateGenerator
-    bool hasParameter();
+    bool hasParameter() const;
     /// The parameters used as arguments by the function as specified by Mode.
     /// 
     /// IFC2x4 CHANGE  Made optional data type restricted to REAL.
-    std::vector< IfcReal > /*[1:?]*/ Parameter();
-    void setParameter(std::vector< IfcReal > /*[1:?]*/ v);
+    std::vector< double > /*[1:?]*/ Parameter() const;
+    void setParameter(std::vector< double > /*[1:?]*/ v);
     virtual unsigned int getArgumentCount() const { return 3; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 1: return IfcUtil::Argument_STRING; case 2: return IfcUtil::Argument_VECTOR_DOUBLE; } return IfcTextureCoordinate::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 1: return Type::IfcLabel; case 2: return Type::IfcReal; } return IfcTextureCoordinate::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 1: return "Mode"; case 2: return "Parameter"; } return IfcTextureCoordinate::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcTextureCoordinateGenerator (IfcAbstractEntityPtr e);
-    IfcTextureCoordinateGenerator (SHARED_PTR< IfcTemplatedEntityList< IfcSurfaceTexture > > v1_Maps, IfcLabel v2_Mode, boost::optional< std::vector< IfcReal > /*[1:?]*/ > v3_Parameter);
-    typedef IfcTextureCoordinateGenerator* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcTextureCoordinateGenerator > > list;
-    typedef IfcTemplatedEntityList< IfcTextureCoordinateGenerator >::it it;
+    IfcTextureCoordinateGenerator (IfcAbstractEntity* e);
+    IfcTextureCoordinateGenerator (IfcTemplatedEntityList< IfcSurfaceTexture >::ptr v1_Maps, std::string v2_Mode, boost::optional< std::vector< double > /*[1:?]*/ > v3_Parameter);
+    typedef IfcTemplatedEntityList< IfcTextureCoordinateGenerator > list;
 };
 /// An IfcTextureMap provides the mapping of the
 /// 2-dimensional texture coordinates to the surface onto which it is
@@ -11998,22 +13148,21 @@ class IfcTextureMap : public IfcTextureCoordinate {
     /// List of texture coordinate vertices that are applied to the corresponding points of the polyloop defining a face bound.
     /// 
     /// NOTE  The corresponding face bound may be an inner loop.
-    SHARED_PTR< IfcTemplatedEntityList< IfcTextureVertex > > Vertices();
-    void setVertices(SHARED_PTR< IfcTemplatedEntityList< IfcTextureVertex > > v);
-    IfcFace* MappedTo();
+    IfcTemplatedEntityList< IfcTextureVertex >::ptr Vertices() const;
+    void setVertices(IfcTemplatedEntityList< IfcTextureVertex >::ptr v);
+    IfcFace* MappedTo() const;
     void setMappedTo(IfcFace* v);
     virtual unsigned int getArgumentCount() const { return 3; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 1: return IfcUtil::Argument_ENTITY_LIST; case 2: return IfcUtil::Argument_ENTITY; } return IfcTextureCoordinate::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 1: return Type::IfcTextureVertex; case 2: return Type::IfcFace; } return IfcTextureCoordinate::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 1: return "Vertices"; case 2: return "MappedTo"; } return IfcTextureCoordinate::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcTextureMap (IfcAbstractEntityPtr e);
-    IfcTextureMap (SHARED_PTR< IfcTemplatedEntityList< IfcSurfaceTexture > > v1_Maps, SHARED_PTR< IfcTemplatedEntityList< IfcTextureVertex > > v2_Vertices, IfcFace* v3_MappedTo);
-    typedef IfcTextureMap* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcTextureMap > > list;
-    typedef IfcTemplatedEntityList< IfcTextureMap >::it it;
+    IfcTextureMap (IfcAbstractEntity* e);
+    IfcTextureMap (IfcTemplatedEntityList< IfcSurfaceTexture >::ptr v1_Maps, IfcTemplatedEntityList< IfcTextureVertex >::ptr v2_Vertices, IfcFace* v3_MappedTo);
+    typedef IfcTemplatedEntityList< IfcTextureMap > list;
 };
 /// An IfcTextureVertex is a list of 2 (S, T) texture coordinates. 
 /// 
@@ -12045,36 +13194,34 @@ class IfcTextureMap : public IfcTextureCoordinate {
 class IfcTextureVertex : public IfcPresentationItem {
 public:
     /// The first coordinate[1] is the S, the second coordinate[2] is the T parameter value.
-    std::vector< IfcParameterValue > /*[2:2]*/ Coordinates();
-    void setCoordinates(std::vector< IfcParameterValue > /*[2:2]*/ v);
+    std::vector< double > /*[2:2]*/ Coordinates() const;
+    void setCoordinates(std::vector< double > /*[2:2]*/ v);
     virtual unsigned int getArgumentCount() const { return 1; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_VECTOR_DOUBLE; } return IfcPresentationItem::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcParameterValue; } return IfcPresentationItem::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Coordinates"; } return IfcPresentationItem::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcTextureVertex (IfcAbstractEntityPtr e);
-    IfcTextureVertex (std::vector< IfcParameterValue > /*[2:2]*/ v1_Coordinates);
-    typedef IfcTextureVertex* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcTextureVertex > > list;
-    typedef IfcTemplatedEntityList< IfcTextureVertex >::it it;
+    IfcTextureVertex (IfcAbstractEntity* e);
+    IfcTextureVertex (std::vector< double > /*[2:2]*/ v1_Coordinates);
+    typedef IfcTemplatedEntityList< IfcTextureVertex > list;
 };
 
 class IfcTextureVertexList : public IfcPresentationItem {
 public:
     virtual unsigned int getArgumentCount() const { return 1; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_UNKNOWN; } return IfcPresentationItem::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcParameterValue; } return IfcPresentationItem::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "TexCoordsList"; } return IfcPresentationItem::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcTextureVertexList (IfcAbstractEntityPtr e);
+    IfcTextureVertexList (IfcAbstractEntity* e);
     IfcTextureVertexList ();
-    typedef IfcTextureVertexList* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcTextureVertexList > > list;
-    typedef IfcTemplatedEntityList< IfcTextureVertexList >::it it;
+    typedef IfcTemplatedEntityList< IfcTextureVertexList > list;
 };
 /// IfcTimePeriod defines a time period given by a start and end time. Both time definitions consider the time zone and allow for the daylight savings offset.
 /// 
@@ -12085,23 +13232,22 @@ class IfcTextureVertexList : public IfcPresentationItem {
 class IfcTimePeriod : public IfcUtil::IfcBaseEntity {
 public:
     /// Start time of the time period.
-    IfcTime StartTime();
-    void setStartTime(IfcTime v);
+    std::string StartTime() const;
+    void setStartTime(std::string v);
     /// End time of the time period.
-    IfcTime EndTime();
-    void setEndTime(IfcTime v);
+    std::string EndTime() const;
+    void setEndTime(std::string v);
     virtual unsigned int getArgumentCount() const { return 2; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_STRING; case 1: return IfcUtil::Argument_STRING; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcTime; case 1: return Type::IfcTime; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "StartTime"; case 1: return "EndTime"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcTimePeriod (IfcAbstractEntityPtr e);
-    IfcTimePeriod (IfcTime v1_StartTime, IfcTime v2_EndTime);
-    typedef IfcTimePeriod* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcTimePeriod > > list;
-    typedef IfcTemplatedEntityList< IfcTimePeriod >::it it;
+    IfcTimePeriod (IfcAbstractEntity* e);
+    IfcTimePeriod (std::string v1_StartTime, std::string v2_EndTime);
+    typedef IfcTemplatedEntityList< IfcTimePeriod > list;
 };
 /// A time series is a set of a time-stamped data entries. It allows a natural association of data collected over intervals of time. Time series can be regular or irregular. In regular time series data arrive predictably at predefined intervals.  In irregular time series  some or all time stamps do not follow a repetitive pattern and unpredictable bursts of data may arrive at unspecified points in time.
 /// 
@@ -12111,48 +13257,47 @@ class IfcTimePeriod : public IfcUtil::IfcBaseEntity {
 class IfcTimeSeries : public IfcUtil::IfcBaseEntity {
 public:
     /// An unique name for the time series.
-    IfcLabel Name();
-    void setName(IfcLabel v);
+    std::string Name() const;
+    void setName(std::string v);
     /// Whether the optional attribute Description is defined for this IfcTimeSeries
-    bool hasDescription();
+    bool hasDescription() const;
     /// A text description of the data that the series represents.
-    IfcText Description();
-    void setDescription(IfcText v);
+    std::string Description() const;
+    void setDescription(std::string v);
     /// The start time of a time series.
-    IfcDateTime StartTime();
-    void setStartTime(IfcDateTime v);
+    std::string StartTime() const;
+    void setStartTime(std::string v);
     /// The end time of a time series.
-    IfcDateTime EndTime();
-    void setEndTime(IfcDateTime v);
+    std::string EndTime() const;
+    void setEndTime(std::string v);
     /// The time series data type.
-    IfcTimeSeriesDataTypeEnum::IfcTimeSeriesDataTypeEnum TimeSeriesDataType();
+    IfcTimeSeriesDataTypeEnum::IfcTimeSeriesDataTypeEnum TimeSeriesDataType() const;
     void setTimeSeriesDataType(IfcTimeSeriesDataTypeEnum::IfcTimeSeriesDataTypeEnum v);
     /// The orgin of a time series data.
-    IfcDataOriginEnum::IfcDataOriginEnum DataOrigin();
+    IfcDataOriginEnum::IfcDataOriginEnum DataOrigin() const;
     void setDataOrigin(IfcDataOriginEnum::IfcDataOriginEnum v);
     /// Whether the optional attribute UserDefinedDataOrigin is defined for this IfcTimeSeries
-    bool hasUserDefinedDataOrigin();
+    bool hasUserDefinedDataOrigin() const;
     /// Value of the data origin if DataOrigin attribute is USERDEFINED.
-    IfcLabel UserDefinedDataOrigin();
-    void setUserDefinedDataOrigin(IfcLabel v);
+    std::string UserDefinedDataOrigin() const;
+    void setUserDefinedDataOrigin(std::string v);
     /// Whether the optional attribute Unit is defined for this IfcTimeSeries
-    bool hasUnit();
+    bool hasUnit() const;
     /// The unit to be assigned to all values within the time series. Note that mixing units is not allowed. If the value is not given, the global unit for the type of IfcValue, as defined at IfcProject.UnitsInContext is used.
-    IfcUnit Unit();
-    void setUnit(IfcUnit v);
+    IfcUnit* Unit() const;
+    void setUnit(IfcUnit* v);
     virtual unsigned int getArgumentCount() const { return 8; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_STRING; case 1: return IfcUtil::Argument_STRING; case 2: return IfcUtil::Argument_STRING; case 3: return IfcUtil::Argument_STRING; case 4: return IfcUtil::Argument_ENUMERATION; case 5: return IfcUtil::Argument_ENUMERATION; case 6: return IfcUtil::Argument_STRING; case 7: return IfcUtil::Argument_ENTITY; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcLabel; case 1: return Type::IfcText; case 2: return Type::IfcDateTime; case 3: return Type::IfcDateTime; case 4: return Type::IfcTimeSeriesDataTypeEnum; case 5: return Type::IfcDataOriginEnum; case 6: return Type::IfcLabel; case 7: return Type::IfcUnit; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Name"; case 1: return "Description"; case 2: return "StartTime"; case 3: return "EndTime"; case 4: return "TimeSeriesDataType"; case 5: return "DataOrigin"; case 6: return "UserDefinedDataOrigin"; case 7: return "Unit"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcExternalReferenceRelationship > > HasExternalReference(); // INVERSE IfcExternalReferenceRelationship::RelatedResourceObjects
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcExternalReferenceRelationship >::ptr HasExternalReference() const; // INVERSE IfcExternalReferenceRelationship::RelatedResourceObjects
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcTimeSeries (IfcAbstractEntityPtr e);
-    IfcTimeSeries (IfcLabel v1_Name, boost::optional< IfcText > v2_Description, IfcDateTime v3_StartTime, IfcDateTime v4_EndTime, IfcTimeSeriesDataTypeEnum::IfcTimeSeriesDataTypeEnum v5_TimeSeriesDataType, IfcDataOriginEnum::IfcDataOriginEnum v6_DataOrigin, boost::optional< IfcLabel > v7_UserDefinedDataOrigin, boost::optional< IfcUnit > v8_Unit);
-    typedef IfcTimeSeries* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcTimeSeries > > list;
-    typedef IfcTemplatedEntityList< IfcTimeSeries >::it it;
+    IfcTimeSeries (IfcAbstractEntity* e);
+    IfcTimeSeries (std::string v1_Name, boost::optional< std::string > v2_Description, std::string v3_StartTime, std::string v4_EndTime, IfcTimeSeriesDataTypeEnum::IfcTimeSeriesDataTypeEnum v5_TimeSeriesDataType, IfcDataOriginEnum::IfcDataOriginEnum v6_DataOrigin, boost::optional< std::string > v7_UserDefinedDataOrigin, IfcUnit* v8_Unit);
+    typedef IfcTemplatedEntityList< IfcTimeSeries > list;
 };
 /// A time series value is a list of values that comprise the time series. At least one value must be supplied. Applications are expected to normalize values by applying the following three rules:
 /// 
@@ -12166,20 +13311,19 @@ class IfcTimeSeries : public IfcUtil::IfcBaseEntity {
 class IfcTimeSeriesValue : public IfcUtil::IfcBaseEntity {
 public:
     /// A list of time-series values. At least one value is required.
-    SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > ListValues();
-    void setListValues(SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > v);
+    IfcEntityList::ptr ListValues() const;
+    void setListValues(IfcEntityList::ptr v);
     virtual unsigned int getArgumentCount() const { return 1; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY_LIST; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcValue; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "ListValues"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcTimeSeriesValue (IfcAbstractEntityPtr e);
-    IfcTimeSeriesValue (IfcEntities v1_ListValues);
-    typedef IfcTimeSeriesValue* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcTimeSeriesValue > > list;
-    typedef IfcTemplatedEntityList< IfcTimeSeriesValue >::it it;
+    IfcTimeSeriesValue (IfcAbstractEntity* e);
+    IfcTimeSeriesValue (IfcEntityList::ptr v1_ListValues);
+    typedef IfcTemplatedEntityList< IfcTimeSeriesValue > list;
 };
 /// Definition from ISO/CD 10303-42:1992: The topological representation item is the supertype for all the topological representation items in the geometry resource. 
 /// 
@@ -12190,16 +13334,15 @@ class IfcTopologicalRepresentationItem : public IfcRepresentationItem {
 public:
     virtual unsigned int getArgumentCount() const { return 0; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcRepresentationItem::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcRepresentationItem::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcRepresentationItem::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcTopologicalRepresentationItem (IfcAbstractEntityPtr e);
+    IfcTopologicalRepresentationItem (IfcAbstractEntity* e);
     IfcTopologicalRepresentationItem ();
-    typedef IfcTopologicalRepresentationItem* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcTopologicalRepresentationItem > > list;
-    typedef IfcTemplatedEntityList< IfcTopologicalRepresentationItem >::it it;
+    typedef IfcTemplatedEntityList< IfcTopologicalRepresentationItem > list;
 };
 /// IfcTopologyRepresentation
 /// represents the concept of a particular topological representation of a
@@ -12239,16 +13382,15 @@ class IfcTopologyRepresentation : public IfcShapeModel {
 public:
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcShapeModel::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcShapeModel::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcShapeModel::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcTopologyRepresentation (IfcAbstractEntityPtr e);
-    IfcTopologyRepresentation (IfcRepresentationContext* v1_ContextOfItems, boost::optional< IfcLabel > v2_RepresentationIdentifier, boost::optional< IfcLabel > v3_RepresentationType, SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationItem > > v4_Items);
-    typedef IfcTopologyRepresentation* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcTopologyRepresentation > > list;
-    typedef IfcTemplatedEntityList< IfcTopologyRepresentation >::it it;
+    IfcTopologyRepresentation (IfcAbstractEntity* e);
+    IfcTopologyRepresentation (IfcRepresentationContext* v1_ContextOfItems, boost::optional< std::string > v2_RepresentationIdentifier, boost::optional< std::string > v3_RepresentationType, IfcTemplatedEntityList< IfcRepresentationItem >::ptr v4_Items);
+    typedef IfcTemplatedEntityList< IfcTopologyRepresentation > list;
 };
 /// IfcUnitAssignment indicates a set of units which may be assigned. Within an IfcUnitAssigment each unit definition shall be unique; that is, there shall be no redundant unit definitions for the same unit type such as length unit or area unit. For currencies, there shall be only a single IfcMonetaryUnit within an IfcUnitAssignment.
 /// 
@@ -12258,20 +13400,19 @@ class IfcTopologyRepresentation : public IfcShapeModel {
 class IfcUnitAssignment : public IfcUtil::IfcBaseEntity {
 public:
     /// Units to be included within a unit assignment.
-    SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > Units();
-    void setUnits(SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > v);
+    IfcEntityList::ptr Units() const;
+    void setUnits(IfcEntityList::ptr v);
     virtual unsigned int getArgumentCount() const { return 1; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY_LIST; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcUnit; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Units"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcUnitAssignment (IfcAbstractEntityPtr e);
-    IfcUnitAssignment (IfcEntities v1_Units);
-    typedef IfcUnitAssignment* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcUnitAssignment > > list;
-    typedef IfcTemplatedEntityList< IfcUnitAssignment >::it it;
+    IfcUnitAssignment (IfcAbstractEntity* e);
+    IfcUnitAssignment (IfcEntityList::ptr v1_Units);
+    typedef IfcTemplatedEntityList< IfcUnitAssignment > list;
 };
 /// Definition from ISO/CD 10303-42:1992: A vertex is the topological construct corresponding to a point. It has dimensionality 0 and extent 0. The domain of a vertex, if present, is a point in m dimensional real space RM; this is represented by the vertex point subtype. 
 /// 
@@ -12287,16 +13428,15 @@ class IfcVertex : public IfcTopologicalRepresentationItem {
 public:
     virtual unsigned int getArgumentCount() const { return 0; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcTopologicalRepresentationItem::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcTopologicalRepresentationItem::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcTopologicalRepresentationItem::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcVertex (IfcAbstractEntityPtr e);
+    IfcVertex (IfcAbstractEntity* e);
     IfcVertex ();
-    typedef IfcVertex* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcVertex > > list;
-    typedef IfcTemplatedEntityList< IfcVertex >::it it;
+    typedef IfcTemplatedEntityList< IfcVertex > list;
 };
 /// Definition from ISO/CD 10303-42:1992: A vertex point is a vertex which has its geometry defined as a point.  
 /// 
@@ -12310,20 +13450,19 @@ class IfcVertex : public IfcTopologicalRepresentationItem {
 class IfcVertexPoint : public IfcVertex {
 public:
     /// The geometric point, which defines the position in geometric space of the vertex.
-    IfcPoint* VertexGeometry();
+    IfcPoint* VertexGeometry() const;
     void setVertexGeometry(IfcPoint* v);
     virtual unsigned int getArgumentCount() const { return 1; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY; } return IfcVertex::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcPoint; } return IfcVertex::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "VertexGeometry"; } return IfcVertex::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcVertexPoint (IfcAbstractEntityPtr e);
+    IfcVertexPoint (IfcAbstractEntity* e);
     IfcVertexPoint (IfcPoint* v1_VertexGeometry);
-    typedef IfcVertexPoint* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcVertexPoint > > list;
-    typedef IfcTemplatedEntityList< IfcVertexPoint >::it it;
+    typedef IfcTemplatedEntityList< IfcVertexPoint > list;
 };
 /// IfcVirtualGridIntersection defines the derived location of the intersection between two grid axes. Offset values may be given to set an offset distance to the grid axis for the calculation of the virtual grid intersection.
 /// 
@@ -12387,23 +13526,22 @@ class IfcVertexPoint : public IfcVertex {
 class IfcVirtualGridIntersection : public IfcUtil::IfcBaseEntity {
 public:
     /// Two grid axes which intersects at exactly one intersection (see also informal proposition at IfcGrid). If attribute OffsetDistances is omitted, the intersection defines the placement or ref direction of a grid placement directly. If OffsetDistances are given, the intersection is defined by the offset curves to the grid axes.
-    SHARED_PTR< IfcTemplatedEntityList< IfcGridAxis > > IntersectingAxes();
-    void setIntersectingAxes(SHARED_PTR< IfcTemplatedEntityList< IfcGridAxis > > v);
+    IfcTemplatedEntityList< IfcGridAxis >::ptr IntersectingAxes() const;
+    void setIntersectingAxes(IfcTemplatedEntityList< IfcGridAxis >::ptr v);
     /// Offset distances to the grid axes. If given, it defines virtual offset curves to the grid axes. The intersection of the offset curves specify the virtual grid intersection.
-    std::vector< IfcLengthMeasure > /*[2:3]*/ OffsetDistances();
-    void setOffsetDistances(std::vector< IfcLengthMeasure > /*[2:3]*/ v);
+    std::vector< double > /*[2:3]*/ OffsetDistances() const;
+    void setOffsetDistances(std::vector< double > /*[2:3]*/ v);
     virtual unsigned int getArgumentCount() const { return 2; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY_LIST; case 1: return IfcUtil::Argument_VECTOR_DOUBLE; } throw IfcParse::IfcException("argument out of range"); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcGridAxis; case 1: return Type::IfcLengthMeasure; } throw IfcParse::IfcException("argument out of range"); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "IntersectingAxes"; case 1: return "OffsetDistances"; } throw IfcParse::IfcException("argument out of range"); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcVirtualGridIntersection (IfcAbstractEntityPtr e);
-    IfcVirtualGridIntersection (SHARED_PTR< IfcTemplatedEntityList< IfcGridAxis > > v1_IntersectingAxes, std::vector< IfcLengthMeasure > /*[2:3]*/ v2_OffsetDistances);
-    typedef IfcVirtualGridIntersection* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcVirtualGridIntersection > > list;
-    typedef IfcTemplatedEntityList< IfcVirtualGridIntersection >::it it;
+    IfcVirtualGridIntersection (IfcAbstractEntity* e);
+    IfcVirtualGridIntersection (IfcTemplatedEntityList< IfcGridAxis >::ptr v1_IntersectingAxes, std::vector< double > /*[2:3]*/ v2_OffsetDistances);
+    typedef IfcTemplatedEntityList< IfcVirtualGridIntersection > list;
 };
 /// IfcWorkTime defines time periods that are used by IfcWorkCalendar for either describing working times or non-working exception times. Besides start and finish dates, a set of time periods can be given by various types of recurrence patterns.
 /// 
@@ -12416,36 +13554,35 @@ class IfcVirtualGridIntersection : public IfcUtil::IfcBaseEntity {
 class IfcWorkTime : public IfcSchedulingTime {
 public:
     /// Whether the optional attribute RecurrencePattern is defined for this IfcWorkTime
-    bool hasRecurrencePattern();
+    bool hasRecurrencePattern() const;
     /// Recurrence pattern that defines a time period, which, if given, is
     ///   valid within the time period defined by
     ///   IfcWorkTime.Start and IfcWorkTime.Finish.
-    IfcRecurrencePattern* RecurrencePattern();
+    IfcRecurrencePattern* RecurrencePattern() const;
     void setRecurrencePattern(IfcRecurrencePattern* v);
     /// Whether the optional attribute Start is defined for this IfcWorkTime
-    bool hasStart();
+    bool hasStart() const;
     /// Start date of the work time (0:00), that might be further
     ///   restricted by a recurrence pattern.
-    IfcDate Start();
-    void setStart(IfcDate v);
+    std::string Start() const;
+    void setStart(std::string v);
     /// Whether the optional attribute Finish is defined for this IfcWorkTime
-    bool hasFinish();
+    bool hasFinish() const;
     /// End date of the work time (24:00), that might be further
     ///   restricted by a recurrence pattern.
-    IfcDate Finish();
-    void setFinish(IfcDate v);
+    std::string Finish() const;
+    void setFinish(std::string v);
     virtual unsigned int getArgumentCount() const { return 6; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 3: return IfcUtil::Argument_ENTITY; case 4: return IfcUtil::Argument_STRING; case 5: return IfcUtil::Argument_STRING; } return IfcSchedulingTime::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 3: return Type::IfcRecurrencePattern; case 4: return Type::IfcDate; case 5: return Type::IfcDate; } return IfcSchedulingTime::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 3: return "RecurrencePattern"; case 4: return "Start"; case 5: return "Finish"; } return IfcSchedulingTime::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcWorkTime (IfcAbstractEntityPtr e);
-    IfcWorkTime (boost::optional< IfcLabel > v1_Name, boost::optional< IfcDataOriginEnum::IfcDataOriginEnum > v2_DataOrigin, boost::optional< IfcLabel > v3_UserDefinedDataOrigin, IfcRecurrencePattern* v4_RecurrencePattern, boost::optional< IfcDate > v5_Start, boost::optional< IfcDate > v6_Finish);
-    typedef IfcWorkTime* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcWorkTime > > list;
-    typedef IfcTemplatedEntityList< IfcWorkTime >::it it;
+    IfcWorkTime (IfcAbstractEntity* e);
+    IfcWorkTime (boost::optional< std::string > v1_Name, boost::optional< IfcDataOriginEnum::IfcDataOriginEnum > v2_DataOrigin, boost::optional< std::string > v3_UserDefinedDataOrigin, IfcRecurrencePattern* v4_RecurrencePattern, boost::optional< std::string > v5_Start, boost::optional< std::string > v6_Finish);
+    typedef IfcTemplatedEntityList< IfcWorkTime > list;
 };
 /// An IfcApprovalRelationship associates approvals (one
 /// relating approval and one or more related approvals), each having different status or level as the approval process or the approved
@@ -12457,23 +13594,22 @@ class IfcWorkTime : public IfcSchedulingTime {
 class IfcApprovalRelationship : public IfcResourceLevelRelationship {
 public:
     /// The approval that other approval is related to.
-    IfcApproval* RelatingApproval();
+    IfcApproval* RelatingApproval() const;
     void setRelatingApproval(IfcApproval* v);
     /// The approvals that are related to another (relating) approval.IFC2x Edition 4 CHANGE The cardinality of this attribute has been changed to SET.
-    SHARED_PTR< IfcTemplatedEntityList< IfcApproval > > RelatedApprovals();
-    void setRelatedApprovals(SHARED_PTR< IfcTemplatedEntityList< IfcApproval > > v);
+    IfcTemplatedEntityList< IfcApproval >::ptr RelatedApprovals() const;
+    void setRelatedApprovals(IfcTemplatedEntityList< IfcApproval >::ptr v);
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 2: return IfcUtil::Argument_ENTITY; case 3: return IfcUtil::Argument_ENTITY_LIST; } return IfcResourceLevelRelationship::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 2: return Type::IfcApproval; case 3: return Type::IfcApproval; } return IfcResourceLevelRelationship::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 2: return "RelatingApproval"; case 3: return "RelatedApprovals"; } return IfcResourceLevelRelationship::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcApprovalRelationship (IfcAbstractEntityPtr e);
-    IfcApprovalRelationship (boost::optional< IfcLabel > v1_Name, boost::optional< IfcText > v2_Description, IfcApproval* v3_RelatingApproval, SHARED_PTR< IfcTemplatedEntityList< IfcApproval > > v4_RelatedApprovals);
-    typedef IfcApprovalRelationship* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcApprovalRelationship > > list;
-    typedef IfcTemplatedEntityList< IfcApprovalRelationship >::it it;
+    IfcApprovalRelationship (IfcAbstractEntity* e);
+    IfcApprovalRelationship (boost::optional< std::string > v1_Name, boost::optional< std::string > v2_Description, IfcApproval* v3_RelatingApproval, IfcTemplatedEntityList< IfcApproval >::ptr v4_RelatedApprovals);
+    typedef IfcTemplatedEntityList< IfcApprovalRelationship > list;
 };
 /// The closed profile IfcArbitraryClosedProfileDef defines an arbitrary two-dimensional profile for the use within the swept surface geometry, the swept area solid or a sectioned spine. It is given by an outer boundary from which the surface or solid can be constructed. 
 /// 
@@ -12496,20 +13632,19 @@ class IfcApprovalRelationship : public IfcResourceLevelRelationship {
 class IfcArbitraryClosedProfileDef : public IfcProfileDef {
 public:
     /// Bounded curve, defining the outer boundaries of the arbitrary profile.
-    IfcCurve* OuterCurve();
+    IfcCurve* OuterCurve() const;
     void setOuterCurve(IfcCurve* v);
     virtual unsigned int getArgumentCount() const { return 3; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 2: return IfcUtil::Argument_ENTITY; } return IfcProfileDef::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 2: return Type::IfcCurve; } return IfcProfileDef::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 2: return "OuterCurve"; } return IfcProfileDef::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcArbitraryClosedProfileDef (IfcAbstractEntityPtr e);
-    IfcArbitraryClosedProfileDef (IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< IfcLabel > v2_ProfileName, IfcCurve* v3_OuterCurve);
-    typedef IfcArbitraryClosedProfileDef* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcArbitraryClosedProfileDef > > list;
-    typedef IfcTemplatedEntityList< IfcArbitraryClosedProfileDef >::it it;
+    IfcArbitraryClosedProfileDef (IfcAbstractEntity* e);
+    IfcArbitraryClosedProfileDef (IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< std::string > v2_ProfileName, IfcCurve* v3_OuterCurve);
+    typedef IfcTemplatedEntityList< IfcArbitraryClosedProfileDef > list;
 };
 /// The open profile IfcArbitraryOpenProfileDef defines an arbitrary two-dimensional open profile for the use within the swept surface geometry. It is given by an open boundary from with the surface can be constructed. 
 /// 
@@ -12529,20 +13664,19 @@ class IfcArbitraryClosedProfileDef : public IfcProfileDef {
 class IfcArbitraryOpenProfileDef : public IfcProfileDef {
 public:
     /// Open bounded curve defining the profile.
-    IfcBoundedCurve* Curve();
+    IfcBoundedCurve* Curve() const;
     void setCurve(IfcBoundedCurve* v);
     virtual unsigned int getArgumentCount() const { return 3; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 2: return IfcUtil::Argument_ENTITY; } return IfcProfileDef::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 2: return Type::IfcBoundedCurve; } return IfcProfileDef::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 2: return "Curve"; } return IfcProfileDef::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcArbitraryOpenProfileDef (IfcAbstractEntityPtr e);
-    IfcArbitraryOpenProfileDef (IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< IfcLabel > v2_ProfileName, IfcBoundedCurve* v3_Curve);
-    typedef IfcArbitraryOpenProfileDef* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcArbitraryOpenProfileDef > > list;
-    typedef IfcTemplatedEntityList< IfcArbitraryOpenProfileDef >::it it;
+    IfcArbitraryOpenProfileDef (IfcAbstractEntity* e);
+    IfcArbitraryOpenProfileDef (IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< std::string > v2_ProfileName, IfcBoundedCurve* v3_Curve);
+    typedef IfcTemplatedEntityList< IfcArbitraryOpenProfileDef > list;
 };
 /// The IfcArbitraryProfileDefWithVoids defines an arbitrary closed two-dimensional profile with holes defined for the use for the swept area solid or a sectioned spine. It is given by an outer boundary and inner boundaries from with the solid the can be constructed.
 /// 
@@ -12566,20 +13700,19 @@ class IfcArbitraryOpenProfileDef : public IfcProfileDef {
 class IfcArbitraryProfileDefWithVoids : public IfcArbitraryClosedProfileDef {
 public:
     /// Set of bounded curves, defining the inner boundaries of the arbitrary profile.
-    SHARED_PTR< IfcTemplatedEntityList< IfcCurve > > InnerCurves();
-    void setInnerCurves(SHARED_PTR< IfcTemplatedEntityList< IfcCurve > > v);
+    IfcTemplatedEntityList< IfcCurve >::ptr InnerCurves() const;
+    void setInnerCurves(IfcTemplatedEntityList< IfcCurve >::ptr v);
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 3: return IfcUtil::Argument_ENTITY_LIST; } return IfcArbitraryClosedProfileDef::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 3: return Type::IfcCurve; } return IfcArbitraryClosedProfileDef::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 3: return "InnerCurves"; } return IfcArbitraryClosedProfileDef::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcArbitraryProfileDefWithVoids (IfcAbstractEntityPtr e);
-    IfcArbitraryProfileDefWithVoids (IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< IfcLabel > v2_ProfileName, IfcCurve* v3_OuterCurve, SHARED_PTR< IfcTemplatedEntityList< IfcCurve > > v4_InnerCurves);
-    typedef IfcArbitraryProfileDefWithVoids* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcArbitraryProfileDefWithVoids > > list;
-    typedef IfcTemplatedEntityList< IfcArbitraryProfileDefWithVoids >::it it;
+    IfcArbitraryProfileDefWithVoids (IfcAbstractEntity* e);
+    IfcArbitraryProfileDefWithVoids (IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< std::string > v2_ProfileName, IfcCurve* v3_OuterCurve, IfcTemplatedEntityList< IfcCurve >::ptr v4_InnerCurves);
+    typedef IfcTemplatedEntityList< IfcArbitraryProfileDefWithVoids > list;
 };
 /// An IfcBlobTexture provides a 2-dimensional distribution of the lighting parameters of a surface onto which it is mapped. The texture itself is given as a single binary blob, representing the content of a pixel format file. The file format of the pixel file is given by the RasterFormat attribute and allowable formats are guided by where rule SupportedRasterFormat.
 /// 
@@ -12593,21 +13726,20 @@ class IfcArbitraryProfileDefWithVoids : public IfcArbitraryClosedProfileDef {
 class IfcBlobTexture : public IfcSurfaceTexture {
 public:
     /// The format of the RasterCode often using a compression.
-    IfcIdentifier RasterFormat();
-    void setRasterFormat(IfcIdentifier v);
+    std::string RasterFormat() const;
+    void setRasterFormat(std::string v);
     /// Blob, given as a single binary, to capture the texture within one popular file (compression) format. The file format is provided by the RasterFormat attribute.
     virtual unsigned int getArgumentCount() const { return 7; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 5: return IfcUtil::Argument_STRING; case 6: return IfcUtil::Argument_UNKNOWN; } return IfcSurfaceTexture::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 5: return Type::IfcIdentifier; case 6: return Type::UNDEFINED; } return IfcSurfaceTexture::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 5: return "RasterFormat"; case 6: return "RasterCode"; } return IfcSurfaceTexture::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcBlobTexture (IfcAbstractEntityPtr e);
-    IfcBlobTexture (bool v1_RepeatS, bool v2_RepeatT, boost::optional< IfcIdentifier > v3_Mode, IfcCartesianTransformationOperator2D* v4_TextureTransform, boost::optional< std::vector< IfcIdentifier > /*[1:?]*/ > v5_Parameter, IfcIdentifier v6_RasterFormat);
-    typedef IfcBlobTexture* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcBlobTexture > > list;
-    typedef IfcTemplatedEntityList< IfcBlobTexture >::it it;
+    IfcBlobTexture (IfcAbstractEntity* e);
+    IfcBlobTexture (bool v1_RepeatS, bool v2_RepeatT, boost::optional< std::string > v3_Mode, IfcCartesianTransformationOperator2D* v4_TextureTransform, boost::optional< std::vector< std::string > /*[1:?]*/ > v5_Parameter, std::string v6_RasterFormat);
+    typedef IfcTemplatedEntityList< IfcBlobTexture > list;
 };
 /// The profile IfcCenterLineProfileDef defines an arbitrary two-dimensional open, not self intersecting profile for the use within the swept solid geometry. It is given by an area defined by applying a constant thickness to a centerline, generating an area from which the solid can be constructed.
 /// 
@@ -12641,20 +13773,19 @@ class IfcBlobTexture : public IfcSurfaceTexture {
 class IfcCenterLineProfileDef : public IfcArbitraryOpenProfileDef {
 public:
     /// Constant thickness applied along the center line.
-    IfcPositiveLengthMeasure Thickness();
-    void setThickness(IfcPositiveLengthMeasure v);
+    double Thickness() const;
+    void setThickness(double v);
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 3: return IfcUtil::Argument_DOUBLE; } return IfcArbitraryOpenProfileDef::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 3: return Type::IfcPositiveLengthMeasure; } return IfcArbitraryOpenProfileDef::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 3: return "Thickness"; } return IfcArbitraryOpenProfileDef::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcCenterLineProfileDef (IfcAbstractEntityPtr e);
-    IfcCenterLineProfileDef (IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< IfcLabel > v2_ProfileName, IfcBoundedCurve* v3_Curve, IfcPositiveLengthMeasure v4_Thickness);
-    typedef IfcCenterLineProfileDef* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcCenterLineProfileDef > > list;
-    typedef IfcTemplatedEntityList< IfcCenterLineProfileDef >::it it;
+    IfcCenterLineProfileDef (IfcAbstractEntity* e);
+    IfcCenterLineProfileDef (IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< std::string > v2_ProfileName, IfcBoundedCurve* v3_Curve, double v4_Thickness);
+    typedef IfcTemplatedEntityList< IfcCenterLineProfileDef > list;
 };
 /// An IfcClassification is used for the arrangement of objects into a class or category according to a common purpose or their possession of common
 /// characteristics. A classification in the sense of IfcClassification is taxonomy, or taxonomic scheme, arranged in a hierarchical structure. A category of objects relates to other categories in a generalization-specialization relationship. Therefore the classification items in an
@@ -12674,51 +13805,51 @@ class IfcCenterLineProfileDef : public IfcArbitraryOpenProfileDef {
 class IfcClassification : public IfcExternalInformation {
 public:
     /// Whether the optional attribute Source is defined for this IfcClassification
-    bool hasSource();
+    bool hasSource() const;
     /// Source (or publisher) for this classification.
     /// 
     /// NOTE that the source of the classification means the person or organization that was the original author or the person or organization currently acting as the publisher.
-    IfcLabel Source();
-    void setSource(IfcLabel v);
+    std::string Source() const;
+    void setSource(std::string v);
     /// Whether the optional attribute Edition is defined for this IfcClassification
-    bool hasEdition();
+    bool hasEdition() const;
     /// The edition or version of the classification system from which the classification notation is derived.
     /// 
     /// NOTE the version labeling system is specific to the classification system. 
     /// 
     /// IFC2x4 CHANGE The attribute has been changed to be optional.
-    IfcLabel Edition();
-    void setEdition(IfcLabel v);
+    std::string Edition() const;
+    void setEdition(std::string v);
     /// Whether the optional attribute EditionDate is defined for this IfcClassification
-    bool hasEditionDate();
+    bool hasEditionDate() const;
     /// The date on which the edition of the classification used became valid.
     /// 
     /// NOTE The indication of edition may be sufficient to identify the classification source uniquely but the edition date is provided as an optional attribute to enable more precise identification where required.
     /// 
     /// IFC2x4 CHANGE The data type has been changed to IfcDate, the date string according to ISO8601.
-    IfcDate EditionDate();
-    void setEditionDate(IfcDate v);
+    std::string EditionDate() const;
+    void setEditionDate(std::string v);
     /// The name or label by which the classification used is normally known.
     /// 
     /// NOTE Examples of names include CI/SfB, Masterformat, BSAB, Uniclass, STABU, DIN276, DIN277 etc.
-    IfcLabel Name();
-    void setName(IfcLabel v);
+    std::string Name() const;
+    void setName(std::string v);
     /// Whether the optional attribute Description is defined for this IfcClassification
-    bool hasDescription();
+    bool hasDescription() const;
     /// Additional description provided for the classification.
     /// 
     /// IFC2x4 CHANGE  New attribute added at the end of the attribute list.
-    IfcText Description();
-    void setDescription(IfcText v);
+    std::string Description() const;
+    void setDescription(std::string v);
     /// Whether the optional attribute Location is defined for this IfcClassification
-    bool hasLocation();
+    bool hasLocation() const;
     /// Resource identifier or locator, provided as URI, URN or URL, of the classification.  
     /// 
     /// IFC2x4 CHANGE  New attribute added at the end of the attribute list.
-    IfcURIReference Location();
-    void setLocation(IfcURIReference v);
+    std::string Location() const;
+    void setLocation(std::string v);
     /// Whether the optional attribute ReferenceTokens is defined for this IfcClassification
-    bool hasReferenceTokens();
+    bool hasReferenceTokens() const;
     /// The delimiter tokens that are used to mark the boundaries of individual facets (substrings) in a classification reference.
     /// 
     /// This typically applies then the IfcClassification is used in
@@ -12731,22 +13862,21 @@ class IfcClassification : public IfcExternalInformation {
     /// EXAMPLE 2  The use of ReferenceTokens can also be extended to include masks. The use need to be agreed in view definitions or implementer agreements that stipulates a "mask syntax" that should be used.  
     /// 
     /// IFC2x4 CHANGE  New attribute added at the end of the attribute list.
-    std::vector< IfcIdentifier > /*[1:?]*/ ReferenceTokens();
-    void setReferenceTokens(std::vector< IfcIdentifier > /*[1:?]*/ v);
+    std::vector< std::string > /*[1:?]*/ ReferenceTokens() const;
+    void setReferenceTokens(std::vector< std::string > /*[1:?]*/ v);
     virtual unsigned int getArgumentCount() const { return 7; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_STRING; case 1: return IfcUtil::Argument_STRING; case 2: return IfcUtil::Argument_STRING; case 3: return IfcUtil::Argument_STRING; case 4: return IfcUtil::Argument_STRING; case 5: return IfcUtil::Argument_STRING; case 6: return IfcUtil::Argument_VECTOR_STRING; } return IfcExternalInformation::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcLabel; case 1: return Type::IfcLabel; case 2: return Type::IfcDate; case 3: return Type::IfcLabel; case 4: return Type::IfcText; case 5: return Type::IfcURIReference; case 6: return Type::IfcIdentifier; } return IfcExternalInformation::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Source"; case 1: return "Edition"; case 2: return "EditionDate"; case 3: return "Name"; case 4: return "Description"; case 5: return "Location"; case 6: return "ReferenceTokens"; } return IfcExternalInformation::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelAssociatesClassification > > ClassificationForObjects(); // INVERSE IfcRelAssociatesClassification::RelatingClassification
-    SHARED_PTR< IfcTemplatedEntityList< IfcClassificationReference > > HasReferences(); // INVERSE IfcClassificationReference::ReferencedSource
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcRelAssociatesClassification >::ptr ClassificationForObjects() const; // INVERSE IfcRelAssociatesClassification::RelatingClassification
+    IfcTemplatedEntityList< IfcClassificationReference >::ptr HasReferences() const; // INVERSE IfcClassificationReference::ReferencedSource
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcClassification (IfcAbstractEntityPtr e);
-    IfcClassification (boost::optional< IfcLabel > v1_Source, boost::optional< IfcLabel > v2_Edition, boost::optional< IfcDate > v3_EditionDate, IfcLabel v4_Name, boost::optional< IfcText > v5_Description, boost::optional< IfcURIReference > v6_Location, boost::optional< std::vector< IfcIdentifier > /*[1:?]*/ > v7_ReferenceTokens);
-    typedef IfcClassification* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcClassification > > list;
-    typedef IfcTemplatedEntityList< IfcClassification >::it it;
+    IfcClassification (IfcAbstractEntity* e);
+    IfcClassification (boost::optional< std::string > v1_Source, boost::optional< std::string > v2_Edition, boost::optional< std::string > v3_EditionDate, std::string v4_Name, boost::optional< std::string > v5_Description, boost::optional< std::string > v6_Location, boost::optional< std::vector< std::string > /*[1:?]*/ > v7_ReferenceTokens);
+    typedef IfcTemplatedEntityList< IfcClassification > list;
 };
 /// An IfcClassificationReference is a reference into a classification system or source (see IfcClassification) for a specific classification key (or notation).
 /// 
@@ -12772,51 +13902,49 @@ class IfcClassification : public IfcExternalInformation {
 class IfcClassificationReference : public IfcExternalReference {
 public:
     /// Whether the optional attribute ReferencedSource is defined for this IfcClassificationReference
-    bool hasReferencedSource();
+    bool hasReferencedSource() const;
     /// The classification system or source that is referenced.
-    IfcClassificationReferenceSelect ReferencedSource();
-    void setReferencedSource(IfcClassificationReferenceSelect v);
+    IfcClassificationReferenceSelect* ReferencedSource() const;
+    void setReferencedSource(IfcClassificationReferenceSelect* v);
     /// Whether the optional attribute Description is defined for this IfcClassificationReference
-    bool hasDescription();
+    bool hasDescription() const;
     /// Description of the classification reference for informational purposes.
     /// 
     /// IFC2x4 CHANGE  New attribute added at the end of the attribute list.
-    IfcText Description();
-    void setDescription(IfcText v);
+    std::string Description() const;
+    void setDescription(std::string v);
     /// Whether the optional attribute Sort is defined for this IfcClassificationReference
-    bool hasSort();
-    IfcIdentifier Sort();
-    void setSort(IfcIdentifier v);
+    bool hasSort() const;
+    std::string Sort() const;
+    void setSort(std::string v);
     virtual unsigned int getArgumentCount() const { return 6; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 3: return IfcUtil::Argument_ENTITY; case 4: return IfcUtil::Argument_STRING; case 5: return IfcUtil::Argument_STRING; } return IfcExternalReference::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 3: return Type::IfcClassificationReferenceSelect; case 4: return Type::IfcText; case 5: return Type::IfcIdentifier; } return IfcExternalReference::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 3: return "ReferencedSource"; case 4: return "Description"; case 5: return "Sort"; } return IfcExternalReference::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelAssociatesClassification > > ClassificationRefForObjects(); // INVERSE IfcRelAssociatesClassification::RelatingClassification
-    SHARED_PTR< IfcTemplatedEntityList< IfcClassificationReference > > HasReferences(); // INVERSE IfcClassificationReference::ReferencedSource
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcRelAssociatesClassification >::ptr ClassificationRefForObjects() const; // INVERSE IfcRelAssociatesClassification::RelatingClassification
+    IfcTemplatedEntityList< IfcClassificationReference >::ptr HasReferences() const; // INVERSE IfcClassificationReference::ReferencedSource
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcClassificationReference (IfcAbstractEntityPtr e);
-    IfcClassificationReference (boost::optional< IfcURIReference > v1_Location, boost::optional< IfcIdentifier > v2_Identification, boost::optional< IfcLabel > v3_Name, boost::optional< IfcClassificationReferenceSelect > v4_ReferencedSource, boost::optional< IfcText > v5_Description, boost::optional< IfcIdentifier > v6_Sort);
-    typedef IfcClassificationReference* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcClassificationReference > > list;
-    typedef IfcTemplatedEntityList< IfcClassificationReference >::it it;
+    IfcClassificationReference (IfcAbstractEntity* e);
+    IfcClassificationReference (boost::optional< std::string > v1_Location, boost::optional< std::string > v2_Identification, boost::optional< std::string > v3_Name, IfcClassificationReferenceSelect* v4_ReferencedSource, boost::optional< std::string > v5_Description, boost::optional< std::string > v6_Sort);
+    typedef IfcTemplatedEntityList< IfcClassificationReference > list;
 };
 
 class IfcColourRgbList : public IfcPresentationItem {
 public:
     virtual unsigned int getArgumentCount() const { return 1; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_UNKNOWN; } return IfcPresentationItem::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcNormalisedRatioMeasure; } return IfcPresentationItem::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "ColourList"; } return IfcPresentationItem::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcColourRgbList (IfcAbstractEntityPtr e);
+    IfcColourRgbList (IfcAbstractEntity* e);
     IfcColourRgbList ();
-    typedef IfcColourRgbList* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcColourRgbList > > list;
-    typedef IfcTemplatedEntityList< IfcColourRgbList >::it it;
+    typedef IfcTemplatedEntityList< IfcColourRgbList > list;
 };
 /// Definition from ISO/CD 10303-46:1992: The colour specification entity contains a direct colour definition. Colour component values refer directly to a specific colour space.
 /// 
@@ -12826,25 +13954,24 @@ class IfcColourRgbList : public IfcPresentationItem {
 class IfcColourSpecification : public IfcPresentationItem {
 public:
     /// Whether the optional attribute Name is defined for this IfcColourSpecification
-    bool hasName();
+    bool hasName() const;
     /// Optional name given to a particular colour specification in addition to the colour components (like the RGB values).
     /// 
     /// NOTE  Examples are the names of a industry colour classification, such as RAL.
     /// IFC2x Edition 3 CHANGE  Attribute added.
-    IfcLabel Name();
-    void setName(IfcLabel v);
+    std::string Name() const;
+    void setName(std::string v);
     virtual unsigned int getArgumentCount() const { return 1; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_STRING; } return IfcPresentationItem::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcLabel; } return IfcPresentationItem::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Name"; } return IfcPresentationItem::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcColourSpecification (IfcAbstractEntityPtr e);
-    IfcColourSpecification (boost::optional< IfcLabel > v1_Name);
-    typedef IfcColourSpecification* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcColourSpecification > > list;
-    typedef IfcTemplatedEntityList< IfcColourSpecification >::it it;
+    IfcColourSpecification (IfcAbstractEntity* e);
+    IfcColourSpecification (boost::optional< std::string > v1_Name);
+    typedef IfcTemplatedEntityList< IfcColourSpecification > list;
 };
 /// The IfcCompositeProfileDef
 /// defines the profile by composition of other profiles. The composition
@@ -12885,25 +14012,24 @@ class IfcColourSpecification : public IfcPresentationItem {
 class IfcCompositeProfileDef : public IfcProfileDef {
 public:
     /// The profiles which are used to define the composite profile.
-    SHARED_PTR< IfcTemplatedEntityList< IfcProfileDef > > Profiles();
-    void setProfiles(SHARED_PTR< IfcTemplatedEntityList< IfcProfileDef > > v);
+    IfcTemplatedEntityList< IfcProfileDef >::ptr Profiles() const;
+    void setProfiles(IfcTemplatedEntityList< IfcProfileDef >::ptr v);
     /// Whether the optional attribute Label is defined for this IfcCompositeProfileDef
-    bool hasLabel();
+    bool hasLabel() const;
     /// The name by which the composition may be referred to. The actual meaning of the name has to be defined in the context of applications.
-    IfcLabel Label();
-    void setLabel(IfcLabel v);
+    std::string Label() const;
+    void setLabel(std::string v);
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 2: return IfcUtil::Argument_ENTITY_LIST; case 3: return IfcUtil::Argument_STRING; } return IfcProfileDef::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 2: return Type::IfcProfileDef; case 3: return Type::IfcLabel; } return IfcProfileDef::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 2: return "Profiles"; case 3: return "Label"; } return IfcProfileDef::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcCompositeProfileDef (IfcAbstractEntityPtr e);
-    IfcCompositeProfileDef (IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< IfcLabel > v2_ProfileName, SHARED_PTR< IfcTemplatedEntityList< IfcProfileDef > > v3_Profiles, boost::optional< IfcLabel > v4_Label);
-    typedef IfcCompositeProfileDef* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcCompositeProfileDef > > list;
-    typedef IfcTemplatedEntityList< IfcCompositeProfileDef >::it it;
+    IfcCompositeProfileDef (IfcAbstractEntity* e);
+    IfcCompositeProfileDef (IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< std::string > v2_ProfileName, IfcTemplatedEntityList< IfcProfileDef >::ptr v3_Profiles, boost::optional< std::string > v4_Label);
+    typedef IfcTemplatedEntityList< IfcCompositeProfileDef > list;
 };
 /// Definition from ISO/CD 10303-42:1992: A connected_face_set is a set of faces such that the domain of faces together with their bounding edges and vertices is connected.  
 /// 
@@ -12917,20 +14043,19 @@ class IfcCompositeProfileDef : public IfcProfileDef {
 class IfcConnectedFaceSet : public IfcTopologicalRepresentationItem {
 public:
     /// The set of faces arcwise connected along common edges or vertices.
-    SHARED_PTR< IfcTemplatedEntityList< IfcFace > > CfsFaces();
-    void setCfsFaces(SHARED_PTR< IfcTemplatedEntityList< IfcFace > > v);
+    IfcTemplatedEntityList< IfcFace >::ptr CfsFaces() const;
+    void setCfsFaces(IfcTemplatedEntityList< IfcFace >::ptr v);
     virtual unsigned int getArgumentCount() const { return 1; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY_LIST; } return IfcTopologicalRepresentationItem::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcFace; } return IfcTopologicalRepresentationItem::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "CfsFaces"; } return IfcTopologicalRepresentationItem::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcConnectedFaceSet (IfcAbstractEntityPtr e);
-    IfcConnectedFaceSet (SHARED_PTR< IfcTemplatedEntityList< IfcFace > > v1_CfsFaces);
-    typedef IfcConnectedFaceSet* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcConnectedFaceSet > > list;
-    typedef IfcTemplatedEntityList< IfcConnectedFaceSet >::it it;
+    IfcConnectedFaceSet (IfcAbstractEntity* e);
+    IfcConnectedFaceSet (IfcTemplatedEntityList< IfcFace >::ptr v1_CfsFaces);
+    typedef IfcTemplatedEntityList< IfcConnectedFaceSet > list;
 };
 /// IfcConnectionCurveGeometry is used to describe the geometric constraints that facilitate the physical connection of two objects at a curve or at an edge with curve geometry associated. It is envisioned as a control that applies to the element connection relationships. 
 /// 
@@ -12948,25 +14073,24 @@ class IfcConnectedFaceSet : public IfcTopologicalRepresentationItem {
 class IfcConnectionCurveGeometry : public IfcConnectionGeometry {
 public:
     /// The bounded curve at which the connected objects are aligned at the relating element, given in the LCS of the relating element.
-    IfcCurveOrEdgeCurve CurveOnRelatingElement();
-    void setCurveOnRelatingElement(IfcCurveOrEdgeCurve v);
+    IfcCurveOrEdgeCurve* CurveOnRelatingElement() const;
+    void setCurveOnRelatingElement(IfcCurveOrEdgeCurve* v);
     /// Whether the optional attribute CurveOnRelatedElement is defined for this IfcConnectionCurveGeometry
-    bool hasCurveOnRelatedElement();
+    bool hasCurveOnRelatedElement() const;
     /// The bounded curve at which the connected objects are aligned at the related element, given in the LCS of the related element. If the information is omitted, then the origin of the related element is used.
-    IfcCurveOrEdgeCurve CurveOnRelatedElement();
-    void setCurveOnRelatedElement(IfcCurveOrEdgeCurve v);
+    IfcCurveOrEdgeCurve* CurveOnRelatedElement() const;
+    void setCurveOnRelatedElement(IfcCurveOrEdgeCurve* v);
     virtual unsigned int getArgumentCount() const { return 2; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY; case 1: return IfcUtil::Argument_ENTITY; } return IfcConnectionGeometry::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcCurveOrEdgeCurve; case 1: return Type::IfcCurveOrEdgeCurve; } return IfcConnectionGeometry::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "CurveOnRelatingElement"; case 1: return "CurveOnRelatedElement"; } return IfcConnectionGeometry::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcConnectionCurveGeometry (IfcAbstractEntityPtr e);
-    IfcConnectionCurveGeometry (IfcCurveOrEdgeCurve v1_CurveOnRelatingElement, boost::optional< IfcCurveOrEdgeCurve > v2_CurveOnRelatedElement);
-    typedef IfcConnectionCurveGeometry* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcConnectionCurveGeometry > > list;
-    typedef IfcTemplatedEntityList< IfcConnectionCurveGeometry >::it it;
+    IfcConnectionCurveGeometry (IfcAbstractEntity* e);
+    IfcConnectionCurveGeometry (IfcCurveOrEdgeCurve* v1_CurveOnRelatingElement, IfcCurveOrEdgeCurve* v2_CurveOnRelatedElement);
+    typedef IfcTemplatedEntityList< IfcConnectionCurveGeometry > list;
 };
 /// IfcConnectionPointEccentricity is used to describe the geometric constraints that facilitate the physical connection of two objects at a point or vertex point with associated point coordinates. There is a physical distance, or eccentricity, etween the connection points of both object. The eccentricity can be either given by:
 /// 
@@ -12990,32 +14114,31 @@ class IfcConnectionCurveGeometry : public IfcConnectionGeometry {
 class IfcConnectionPointEccentricity : public IfcConnectionPointGeometry {
 public:
     /// Whether the optional attribute EccentricityInX is defined for this IfcConnectionPointEccentricity
-    bool hasEccentricityInX();
+    bool hasEccentricityInX() const;
     /// Distance in x direction between the two points (or vertex points) engaged in the point connection.
-    IfcLengthMeasure EccentricityInX();
-    void setEccentricityInX(IfcLengthMeasure v);
+    double EccentricityInX() const;
+    void setEccentricityInX(double v);
     /// Whether the optional attribute EccentricityInY is defined for this IfcConnectionPointEccentricity
-    bool hasEccentricityInY();
+    bool hasEccentricityInY() const;
     /// Distance in y direction between the two points (or vertex points) engaged in the point connection.
-    IfcLengthMeasure EccentricityInY();
-    void setEccentricityInY(IfcLengthMeasure v);
+    double EccentricityInY() const;
+    void setEccentricityInY(double v);
     /// Whether the optional attribute EccentricityInZ is defined for this IfcConnectionPointEccentricity
-    bool hasEccentricityInZ();
+    bool hasEccentricityInZ() const;
     /// Distance in z direction between the two points (or vertex points) engaged in the point connection.
-    IfcLengthMeasure EccentricityInZ();
-    void setEccentricityInZ(IfcLengthMeasure v);
+    double EccentricityInZ() const;
+    void setEccentricityInZ(double v);
     virtual unsigned int getArgumentCount() const { return 5; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 2: return IfcUtil::Argument_DOUBLE; case 3: return IfcUtil::Argument_DOUBLE; case 4: return IfcUtil::Argument_DOUBLE; } return IfcConnectionPointGeometry::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 2: return Type::IfcLengthMeasure; case 3: return Type::IfcLengthMeasure; case 4: return Type::IfcLengthMeasure; } return IfcConnectionPointGeometry::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 2: return "EccentricityInX"; case 3: return "EccentricityInY"; case 4: return "EccentricityInZ"; } return IfcConnectionPointGeometry::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcConnectionPointEccentricity (IfcAbstractEntityPtr e);
-    IfcConnectionPointEccentricity (IfcPointOrVertexPoint v1_PointOnRelatingElement, boost::optional< IfcPointOrVertexPoint > v2_PointOnRelatedElement, boost::optional< IfcLengthMeasure > v3_EccentricityInX, boost::optional< IfcLengthMeasure > v4_EccentricityInY, boost::optional< IfcLengthMeasure > v5_EccentricityInZ);
-    typedef IfcConnectionPointEccentricity* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcConnectionPointEccentricity > > list;
-    typedef IfcTemplatedEntityList< IfcConnectionPointEccentricity >::it it;
+    IfcConnectionPointEccentricity (IfcAbstractEntity* e);
+    IfcConnectionPointEccentricity (IfcPointOrVertexPoint* v1_PointOnRelatingElement, IfcPointOrVertexPoint* v2_PointOnRelatedElement, boost::optional< double > v3_EccentricityInX, boost::optional< double > v4_EccentricityInY, boost::optional< double > v5_EccentricityInZ);
+    typedef IfcTemplatedEntityList< IfcConnectionPointEccentricity > list;
 };
 /// Definition from ISO/CD 10303-41:1992: A context dependent unit is a unit which is not related to the SI system.
 /// 
@@ -13027,21 +14150,20 @@ class IfcConnectionPointEccentricity : public IfcConnectionPointGeometry {
 class IfcContextDependentUnit : public IfcNamedUnit {
 public:
     /// The word, or group of words, by which the context dependent unit is referred to.
-    IfcLabel Name();
-    void setName(IfcLabel v);
+    std::string Name() const;
+    void setName(std::string v);
     virtual unsigned int getArgumentCount() const { return 3; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 2: return IfcUtil::Argument_STRING; } return IfcNamedUnit::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 2: return Type::IfcLabel; } return IfcNamedUnit::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 2: return "Name"; } return IfcNamedUnit::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcExternalReferenceRelationship > > HasExternalReference(); // INVERSE IfcExternalReferenceRelationship::RelatedResourceObjects
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcExternalReferenceRelationship >::ptr HasExternalReference() const; // INVERSE IfcExternalReferenceRelationship::RelatedResourceObjects
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcContextDependentUnit (IfcAbstractEntityPtr e);
-    IfcContextDependentUnit (IfcDimensionalExponents* v1_Dimensions, IfcUnitEnum::IfcUnitEnum v2_UnitType, IfcLabel v3_Name);
-    typedef IfcContextDependentUnit* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcContextDependentUnit > > list;
-    typedef IfcTemplatedEntityList< IfcContextDependentUnit >::it it;
+    IfcContextDependentUnit (IfcAbstractEntity* e);
+    IfcContextDependentUnit (IfcDimensionalExponents* v1_Dimensions, IfcUnitEnum::IfcUnitEnum v2_UnitType, std::string v3_Name);
+    typedef IfcTemplatedEntityList< IfcContextDependentUnit > list;
 };
 /// Definition from ISO/CD 10303-41:1992: A conversion based unit is a unit that is defined based on a measure with unit.
 /// 
@@ -13093,24 +14215,23 @@ class IfcContextDependentUnit : public IfcNamedUnit {
 class IfcConversionBasedUnit : public IfcNamedUnit {
 public:
     /// The word, or group of words, by which the conversion based unit is referred to.
-    IfcLabel Name();
-    void setName(IfcLabel v);
+    std::string Name() const;
+    void setName(std::string v);
     /// The physical quantity from which the converted unit is derived.
-    IfcMeasureWithUnit* ConversionFactor();
+    IfcMeasureWithUnit* ConversionFactor() const;
     void setConversionFactor(IfcMeasureWithUnit* v);
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 2: return IfcUtil::Argument_STRING; case 3: return IfcUtil::Argument_ENTITY; } return IfcNamedUnit::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 2: return Type::IfcLabel; case 3: return Type::IfcMeasureWithUnit; } return IfcNamedUnit::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 2: return "Name"; case 3: return "ConversionFactor"; } return IfcNamedUnit::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcExternalReferenceRelationship > > HasExternalReference(); // INVERSE IfcExternalReferenceRelationship::RelatedResourceObjects
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcExternalReferenceRelationship >::ptr HasExternalReference() const; // INVERSE IfcExternalReferenceRelationship::RelatedResourceObjects
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcConversionBasedUnit (IfcAbstractEntityPtr e);
-    IfcConversionBasedUnit (IfcDimensionalExponents* v1_Dimensions, IfcUnitEnum::IfcUnitEnum v2_UnitType, IfcLabel v3_Name, IfcMeasureWithUnit* v4_ConversionFactor);
-    typedef IfcConversionBasedUnit* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcConversionBasedUnit > > list;
-    typedef IfcTemplatedEntityList< IfcConversionBasedUnit >::it it;
+    IfcConversionBasedUnit (IfcAbstractEntity* e);
+    IfcConversionBasedUnit (IfcDimensionalExponents* v1_Dimensions, IfcUnitEnum::IfcUnitEnum v2_UnitType, std::string v3_Name, IfcMeasureWithUnit* v4_ConversionFactor);
+    typedef IfcTemplatedEntityList< IfcConversionBasedUnit > list;
 };
 /// IfcConversionBasedUnitWithOffset is a unit which is converted from another unit by applying a conversion factor and an offset.
 /// 
@@ -13133,20 +14254,19 @@ class IfcConversionBasedUnit : public IfcNamedUnit {
 class IfcConversionBasedUnitWithOffset : public IfcConversionBasedUnit {
 public:
     /// A positive or negative offset to add after the inherited ConversionFactor was applied.
-    IfcReal ConversionOffset();
-    void setConversionOffset(IfcReal v);
+    double ConversionOffset() const;
+    void setConversionOffset(double v);
     virtual unsigned int getArgumentCount() const { return 5; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 4: return IfcUtil::Argument_DOUBLE; } return IfcConversionBasedUnit::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 4: return Type::IfcReal; } return IfcConversionBasedUnit::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 4: return "ConversionOffset"; } return IfcConversionBasedUnit::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcConversionBasedUnitWithOffset (IfcAbstractEntityPtr e);
-    IfcConversionBasedUnitWithOffset (IfcDimensionalExponents* v1_Dimensions, IfcUnitEnum::IfcUnitEnum v2_UnitType, IfcLabel v3_Name, IfcMeasureWithUnit* v4_ConversionFactor, IfcReal v5_ConversionOffset);
-    typedef IfcConversionBasedUnitWithOffset* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcConversionBasedUnitWithOffset > > list;
-    typedef IfcTemplatedEntityList< IfcConversionBasedUnitWithOffset >::it it;
+    IfcConversionBasedUnitWithOffset (IfcAbstractEntity* e);
+    IfcConversionBasedUnitWithOffset (IfcDimensionalExponents* v1_Dimensions, IfcUnitEnum::IfcUnitEnum v2_UnitType, std::string v3_Name, IfcMeasureWithUnit* v4_ConversionFactor, double v5_ConversionOffset);
+    typedef IfcTemplatedEntityList< IfcConversionBasedUnitWithOffset > list;
 };
 /// IfcCurrencyRelationship defines the rate of exchange
 /// that applies between two designated currencies at a particular time
@@ -13162,38 +14282,37 @@ class IfcConversionBasedUnitWithOffset : public IfcConversionBasedUnit {
 class IfcCurrencyRelationship : public IfcResourceLevelRelationship {
 public:
     /// The monetary unit from which an exchange is derived. For instance, in the case of a conversion from GBP to USD, the relating monetary unit is GBP.
-    IfcMonetaryUnit* RelatingMonetaryUnit();
+    IfcMonetaryUnit* RelatingMonetaryUnit() const;
     void setRelatingMonetaryUnit(IfcMonetaryUnit* v);
     /// The monetary unit to which an exchange results. For instance, in the case of a conversion from GBP to USD, the related monetary unit is USD.
-    IfcMonetaryUnit* RelatedMonetaryUnit();
+    IfcMonetaryUnit* RelatedMonetaryUnit() const;
     void setRelatedMonetaryUnit(IfcMonetaryUnit* v);
     /// The currently agreed ratio of the amount of a related monetary unit that is equivalent to a unit amount of the relating monetary unit in a currency relationship. For instance, in the case of a conversion from GBP to USD, the value of the exchange rate may be 1.486 (USD) : 1 (GBP).
-    IfcPositiveRatioMeasure ExchangeRate();
-    void setExchangeRate(IfcPositiveRatioMeasure v);
+    double ExchangeRate() const;
+    void setExchangeRate(double v);
     /// Whether the optional attribute RateDateTime is defined for this IfcCurrencyRelationship
-    bool hasRateDateTime();
+    bool hasRateDateTime() const;
     /// The date and time at which an exchange rate applies.
     /// 
     /// IFC2x4 CHANGE Type changed from IfcDateTimeSelect. Attribute made optional.
-    IfcDateTime RateDateTime();
-    void setRateDateTime(IfcDateTime v);
+    std::string RateDateTime() const;
+    void setRateDateTime(std::string v);
     /// Whether the optional attribute RateSource is defined for this IfcCurrencyRelationship
-    bool hasRateSource();
+    bool hasRateSource() const;
     /// The source from which an exchange rate is obtained.
-    IfcLibraryInformation* RateSource();
+    IfcLibraryInformation* RateSource() const;
     void setRateSource(IfcLibraryInformation* v);
     virtual unsigned int getArgumentCount() const { return 7; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 2: return IfcUtil::Argument_ENTITY; case 3: return IfcUtil::Argument_ENTITY; case 4: return IfcUtil::Argument_DOUBLE; case 5: return IfcUtil::Argument_STRING; case 6: return IfcUtil::Argument_ENTITY; } return IfcResourceLevelRelationship::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 2: return Type::IfcMonetaryUnit; case 3: return Type::IfcMonetaryUnit; case 4: return Type::IfcPositiveRatioMeasure; case 5: return Type::IfcDateTime; case 6: return Type::IfcLibraryInformation; } return IfcResourceLevelRelationship::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 2: return "RelatingMonetaryUnit"; case 3: return "RelatedMonetaryUnit"; case 4: return "ExchangeRate"; case 5: return "RateDateTime"; case 6: return "RateSource"; } return IfcResourceLevelRelationship::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcCurrencyRelationship (IfcAbstractEntityPtr e);
-    IfcCurrencyRelationship (boost::optional< IfcLabel > v1_Name, boost::optional< IfcText > v2_Description, IfcMonetaryUnit* v3_RelatingMonetaryUnit, IfcMonetaryUnit* v4_RelatedMonetaryUnit, IfcPositiveRatioMeasure v5_ExchangeRate, boost::optional< IfcDateTime > v6_RateDateTime, IfcLibraryInformation* v7_RateSource);
-    typedef IfcCurrencyRelationship* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcCurrencyRelationship > > list;
-    typedef IfcTemplatedEntityList< IfcCurrencyRelationship >::it it;
+    IfcCurrencyRelationship (IfcAbstractEntity* e);
+    IfcCurrencyRelationship (boost::optional< std::string > v1_Name, boost::optional< std::string > v2_Description, IfcMonetaryUnit* v3_RelatingMonetaryUnit, IfcMonetaryUnit* v4_RelatedMonetaryUnit, double v5_ExchangeRate, boost::optional< std::string > v6_RateDateTime, IfcLibraryInformation* v7_RateSource);
+    typedef IfcTemplatedEntityList< IfcCurrencyRelationship > list;
 };
 /// Definition from ISO/CD 10303-46:1992: A curve style specifies the visual appearance of curves.
 /// 
@@ -13215,36 +14334,35 @@ class IfcCurrencyRelationship : public IfcResourceLevelRelationship {
 class IfcCurveStyle : public IfcPresentationStyle {
 public:
     /// Whether the optional attribute CurveFont is defined for this IfcCurveStyle
-    bool hasCurveFont();
+    bool hasCurveFont() const;
     /// A curve style font which is used to present a curve. It can either be a predefined curve font, or an explicitly defined curve font. Both may be scaled. If not given, then the curve font should be taken from the layer assignment with style, if that is not given either, then the default curve font applies.
-    IfcCurveFontOrScaledCurveFontSelect CurveFont();
-    void setCurveFont(IfcCurveFontOrScaledCurveFontSelect v);
+    IfcCurveFontOrScaledCurveFontSelect* CurveFont() const;
+    void setCurveFont(IfcCurveFontOrScaledCurveFontSelect* v);
     /// Whether the optional attribute CurveWidth is defined for this IfcCurveStyle
-    bool hasCurveWidth();
+    bool hasCurveWidth() const;
     /// A positive length measure in units of the presentation area for the width of a presented curve. If not given, then the style should be taken from the layer assignment with style, if that is not given either, then the default style applies.
-    IfcSizeSelect CurveWidth();
-    void setCurveWidth(IfcSizeSelect v);
+    IfcSizeSelect* CurveWidth() const;
+    void setCurveWidth(IfcSizeSelect* v);
     /// Whether the optional attribute CurveColour is defined for this IfcCurveStyle
-    bool hasCurveColour();
+    bool hasCurveColour() const;
     /// The colour of the visible part of the curve. If not given, then the colour should be taken from the layer assignment with style, if that is not given either, then the default colour applies.
-    IfcColour CurveColour();
-    void setCurveColour(IfcColour v);
+    IfcColour* CurveColour() const;
+    void setCurveColour(IfcColour* v);
     /// Whether the optional attribute ModelOrDraughting is defined for this IfcCurveStyle
-    bool hasModelOrDraughting();
-    bool ModelOrDraughting();
+    bool hasModelOrDraughting() const;
+    bool ModelOrDraughting() const;
     void setModelOrDraughting(bool v);
     virtual unsigned int getArgumentCount() const { return 5; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 1: return IfcUtil::Argument_ENTITY; case 2: return IfcUtil::Argument_ENTITY; case 3: return IfcUtil::Argument_ENTITY; case 4: return IfcUtil::Argument_BOOL; } return IfcPresentationStyle::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 1: return Type::IfcCurveFontOrScaledCurveFontSelect; case 2: return Type::IfcSizeSelect; case 3: return Type::IfcColour; case 4: return Type::UNDEFINED; } return IfcPresentationStyle::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 1: return "CurveFont"; case 2: return "CurveWidth"; case 3: return "CurveColour"; case 4: return "ModelOrDraughting"; } return IfcPresentationStyle::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcCurveStyle (IfcAbstractEntityPtr e);
-    IfcCurveStyle (boost::optional< IfcLabel > v1_Name, boost::optional< IfcCurveFontOrScaledCurveFontSelect > v2_CurveFont, boost::optional< IfcSizeSelect > v3_CurveWidth, boost::optional< IfcColour > v4_CurveColour, boost::optional< bool > v5_ModelOrDraughting);
-    typedef IfcCurveStyle* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcCurveStyle > > list;
-    typedef IfcTemplatedEntityList< IfcCurveStyle >::it it;
+    IfcCurveStyle (IfcAbstractEntity* e);
+    IfcCurveStyle (boost::optional< std::string > v1_Name, IfcCurveFontOrScaledCurveFontSelect* v2_CurveFont, IfcSizeSelect* v3_CurveWidth, IfcColour* v4_CurveColour, boost::optional< bool > v5_ModelOrDraughting);
+    typedef IfcTemplatedEntityList< IfcCurveStyle > list;
 };
 /// Definition from ISO/CD 10303-46:1992: A curve style font combines several curve style font pattern entities into a more complex pattern. The resulting pattern is repeated along the curve. 
 /// 
@@ -13254,25 +14372,24 @@ class IfcCurveStyle : public IfcPresentationStyle {
 class IfcCurveStyleFont : public IfcPresentationItem {
 public:
     /// Whether the optional attribute Name is defined for this IfcCurveStyleFont
-    bool hasName();
+    bool hasName() const;
     /// Name that may be assigned with the curve font.
-    IfcLabel Name();
-    void setName(IfcLabel v);
+    std::string Name() const;
+    void setName(std::string v);
     /// A list of curve font pattern entities, that contains the simple patterns used for drawing curves. The patterns are applied in the order they occur in the list.
-    SHARED_PTR< IfcTemplatedEntityList< IfcCurveStyleFontPattern > > PatternList();
-    void setPatternList(SHARED_PTR< IfcTemplatedEntityList< IfcCurveStyleFontPattern > > v);
+    IfcTemplatedEntityList< IfcCurveStyleFontPattern >::ptr PatternList() const;
+    void setPatternList(IfcTemplatedEntityList< IfcCurveStyleFontPattern >::ptr v);
     virtual unsigned int getArgumentCount() const { return 2; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_STRING; case 1: return IfcUtil::Argument_ENTITY_LIST; } return IfcPresentationItem::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcLabel; case 1: return Type::IfcCurveStyleFontPattern; } return IfcPresentationItem::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Name"; case 1: return "PatternList"; } return IfcPresentationItem::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcCurveStyleFont (IfcAbstractEntityPtr e);
-    IfcCurveStyleFont (boost::optional< IfcLabel > v1_Name, SHARED_PTR< IfcTemplatedEntityList< IfcCurveStyleFontPattern > > v2_PatternList);
-    typedef IfcCurveStyleFont* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcCurveStyleFont > > list;
-    typedef IfcTemplatedEntityList< IfcCurveStyleFont >::it it;
+    IfcCurveStyleFont (IfcAbstractEntity* e);
+    IfcCurveStyleFont (boost::optional< std::string > v1_Name, IfcTemplatedEntityList< IfcCurveStyleFontPattern >::ptr v2_PatternList);
+    typedef IfcTemplatedEntityList< IfcCurveStyleFont > list;
 };
 /// Definition from ISO/CD 10303-46:1992: A curve style font and scaling is a curve style font and a scalar factor for that font, so that a given curve style font may be applied at various scales.
 /// 
@@ -13288,28 +14405,27 @@ class IfcCurveStyleFont : public IfcPresentationItem {
 class IfcCurveStyleFontAndScaling : public IfcPresentationItem {
 public:
     /// Whether the optional attribute Name is defined for this IfcCurveStyleFontAndScaling
-    bool hasName();
+    bool hasName() const;
     /// Name that may be assigned with the scaling of a curve font.
-    IfcLabel Name();
-    void setName(IfcLabel v);
+    std::string Name() const;
+    void setName(std::string v);
     /// The curve font to be scaled.
-    IfcCurveStyleFontSelect CurveFont();
-    void setCurveFont(IfcCurveStyleFontSelect v);
+    IfcCurveStyleFontSelect* CurveFont() const;
+    void setCurveFont(IfcCurveStyleFontSelect* v);
     /// The scale factor.
-    IfcPositiveRatioMeasure CurveFontScaling();
-    void setCurveFontScaling(IfcPositiveRatioMeasure v);
+    double CurveFontScaling() const;
+    void setCurveFontScaling(double v);
     virtual unsigned int getArgumentCount() const { return 3; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_STRING; case 1: return IfcUtil::Argument_ENTITY; case 2: return IfcUtil::Argument_DOUBLE; } return IfcPresentationItem::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcLabel; case 1: return Type::IfcCurveStyleFontSelect; case 2: return Type::IfcPositiveRatioMeasure; } return IfcPresentationItem::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Name"; case 1: return "CurveFont"; case 2: return "CurveFontScaling"; } return IfcPresentationItem::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcCurveStyleFontAndScaling (IfcAbstractEntityPtr e);
-    IfcCurveStyleFontAndScaling (boost::optional< IfcLabel > v1_Name, IfcCurveStyleFontSelect v2_CurveFont, IfcPositiveRatioMeasure v3_CurveFontScaling);
-    typedef IfcCurveStyleFontAndScaling* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcCurveStyleFontAndScaling > > list;
-    typedef IfcTemplatedEntityList< IfcCurveStyleFontAndScaling >::it it;
+    IfcCurveStyleFontAndScaling (IfcAbstractEntity* e);
+    IfcCurveStyleFontAndScaling (boost::optional< std::string > v1_Name, IfcCurveStyleFontSelect* v2_CurveFont, double v3_CurveFontScaling);
+    typedef IfcTemplatedEntityList< IfcCurveStyleFontAndScaling > list;
 };
 /// Definition from ISO/CD 10303-46:1992: A curve style font pattern is a pair of visible and invisible curve segment length measures in presentation area units. 
 /// 
@@ -13323,23 +14439,22 @@ class IfcCurveStyleFontPattern : public IfcPresentationItem {
     /// NOTE  For a visible segment representing a point, the value 0. should be assigned.
     /// 
     /// IFC2x Edition 3 CHANGE  The datatype has been changed to IfcLengthMeasure with upward compatibility for file-based exchange.
-    IfcLengthMeasure VisibleSegmentLength();
-    void setVisibleSegmentLength(IfcLengthMeasure v);
+    double VisibleSegmentLength() const;
+    void setVisibleSegmentLength(double v);
     /// The length of the invisible segment in the pattern definition.
-    IfcPositiveLengthMeasure InvisibleSegmentLength();
-    void setInvisibleSegmentLength(IfcPositiveLengthMeasure v);
+    double InvisibleSegmentLength() const;
+    void setInvisibleSegmentLength(double v);
     virtual unsigned int getArgumentCount() const { return 2; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_DOUBLE; case 1: return IfcUtil::Argument_DOUBLE; } return IfcPresentationItem::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcLengthMeasure; case 1: return Type::IfcPositiveLengthMeasure; } return IfcPresentationItem::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "VisibleSegmentLength"; case 1: return "InvisibleSegmentLength"; } return IfcPresentationItem::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcCurveStyleFontPattern (IfcAbstractEntityPtr e);
-    IfcCurveStyleFontPattern (IfcLengthMeasure v1_VisibleSegmentLength, IfcPositiveLengthMeasure v2_InvisibleSegmentLength);
-    typedef IfcCurveStyleFontPattern* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcCurveStyleFontPattern > > list;
-    typedef IfcTemplatedEntityList< IfcCurveStyleFontPattern >::it it;
+    IfcCurveStyleFontPattern (IfcAbstractEntity* e);
+    IfcCurveStyleFontPattern (double v1_VisibleSegmentLength, double v2_InvisibleSegmentLength);
+    typedef IfcTemplatedEntityList< IfcCurveStyleFontPattern > list;
 };
 /// IfcDerivedProfileDef defines the profile by transformation from the parent profile. The transformation is given by a two dimensional transformation operator. Transformation includes translation, rotation, mirror and scaling. The latter can be uniform or non uniform. The derived profiles may be used to define swept surfaces, swept area solids or sectioned spines.
 /// 
@@ -13428,144 +14543,142 @@ class IfcCurveStyleFontPattern : public IfcPresentationItem {
 class IfcDerivedProfileDef : public IfcProfileDef {
 public:
     /// The parent profile provides the origin of the transformation.
-    IfcProfileDef* ParentProfile();
+    IfcProfileDef* ParentProfile() const;
     void setParentProfile(IfcProfileDef* v);
     /// Transformation operator applied to the parent profile.
-    IfcCartesianTransformationOperator2D* Operator();
+    IfcCartesianTransformationOperator2D* Operator() const;
     void setOperator(IfcCartesianTransformationOperator2D* v);
     /// Whether the optional attribute Label is defined for this IfcDerivedProfileDef
-    bool hasLabel();
+    bool hasLabel() const;
     /// The name by which the transformation may be referred to. The actual meaning of the name has to be defined in the context of applications.
-    IfcLabel Label();
-    void setLabel(IfcLabel v);
+    std::string Label() const;
+    void setLabel(std::string v);
     virtual unsigned int getArgumentCount() const { return 5; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 2: return IfcUtil::Argument_ENTITY; case 3: return IfcUtil::Argument_ENTITY; case 4: return IfcUtil::Argument_STRING; } return IfcProfileDef::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 2: return Type::IfcProfileDef; case 3: return Type::IfcCartesianTransformationOperator2D; case 4: return Type::IfcLabel; } return IfcProfileDef::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 2: return "ParentProfile"; case 3: return "Operator"; case 4: return "Label"; } return IfcProfileDef::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcDerivedProfileDef (IfcAbstractEntityPtr e);
-    IfcDerivedProfileDef (IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< IfcLabel > v2_ProfileName, IfcProfileDef* v3_ParentProfile, IfcCartesianTransformationOperator2D* v4_Operator, boost::optional< IfcLabel > v5_Label);
-    typedef IfcDerivedProfileDef* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcDerivedProfileDef > > list;
-    typedef IfcTemplatedEntityList< IfcDerivedProfileDef >::it it;
+    IfcDerivedProfileDef (IfcAbstractEntity* e);
+    IfcDerivedProfileDef (IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< std::string > v2_ProfileName, IfcProfileDef* v3_ParentProfile, IfcCartesianTransformationOperator2D* v4_Operator, boost::optional< std::string > v5_Label);
+    typedef IfcTemplatedEntityList< IfcDerivedProfileDef > list;
 };
 /// IfcDocumentInformation captures "metadata" of an external document. The actual content of the document is not defined in IFC; instead, it can be found following the reference given to IfcDocumentReference. 
 /// 
 /// HISTORY: New entity in IFC 2x.
 class IfcDocumentInformation : public IfcExternalInformation {
 public:
-    IfcIdentifier Identification();
-    void setIdentification(IfcIdentifier v);
+    std::string Identification() const;
+    void setIdentification(std::string v);
     /// File name or document name assigned by owner.
-    IfcLabel Name();
-    void setName(IfcLabel v);
+    std::string Name() const;
+    void setName(std::string v);
     /// Whether the optional attribute Description is defined for this IfcDocumentInformation
-    bool hasDescription();
+    bool hasDescription() const;
     /// Description of document and its content.
-    IfcText Description();
-    void setDescription(IfcText v);
+    std::string Description() const;
+    void setDescription(std::string v);
     /// Whether the optional attribute Location is defined for this IfcDocumentInformation
-    bool hasLocation();
+    bool hasLocation() const;
     /// Resource identifier or locator, provided as URI, URN or URL, of the document information for online references.
     /// 
     /// IFC2x4 CHANGE  New attribute added at end of attribute list.
-    IfcURIReference Location();
-    void setLocation(IfcURIReference v);
+    std::string Location() const;
+    void setLocation(std::string v);
     /// Whether the optional attribute Purpose is defined for this IfcDocumentInformation
-    bool hasPurpose();
+    bool hasPurpose() const;
     /// Purpose for this document.
-    IfcText Purpose();
-    void setPurpose(IfcText v);
+    std::string Purpose() const;
+    void setPurpose(std::string v);
     /// Whether the optional attribute IntendedUse is defined for this IfcDocumentInformation
-    bool hasIntendedUse();
+    bool hasIntendedUse() const;
     /// Intended use for this document.
-    IfcText IntendedUse();
-    void setIntendedUse(IfcText v);
+    std::string IntendedUse() const;
+    void setIntendedUse(std::string v);
     /// Whether the optional attribute Scope is defined for this IfcDocumentInformation
-    bool hasScope();
+    bool hasScope() const;
     /// Scope for this document.
-    IfcText Scope();
-    void setScope(IfcText v);
+    std::string Scope() const;
+    void setScope(std::string v);
     /// Whether the optional attribute Revision is defined for this IfcDocumentInformation
-    bool hasRevision();
+    bool hasRevision() const;
     /// Document revision designation.
-    IfcLabel Revision();
-    void setRevision(IfcLabel v);
+    std::string Revision() const;
+    void setRevision(std::string v);
     /// Whether the optional attribute DocumentOwner is defined for this IfcDocumentInformation
-    bool hasDocumentOwner();
+    bool hasDocumentOwner() const;
     /// Information about the person and/or organization acknowledged as the 'owner' of this document. In some contexts, the document owner determines who has access to or editing right to the document.
-    IfcActorSelect DocumentOwner();
-    void setDocumentOwner(IfcActorSelect v);
+    IfcActorSelect* DocumentOwner() const;
+    void setDocumentOwner(IfcActorSelect* v);
     /// Whether the optional attribute Editors is defined for this IfcDocumentInformation
-    bool hasEditors();
+    bool hasEditors() const;
     /// The persons and/or organizations who have created this document or contributed to it.
-    SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > Editors();
-    void setEditors(SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > v);
+    IfcEntityList::ptr Editors() const;
+    void setEditors(IfcEntityList::ptr v);
     /// Whether the optional attribute CreationTime is defined for this IfcDocumentInformation
-    bool hasCreationTime();
+    bool hasCreationTime() const;
     /// Date and time stamp when the document was originally created.
     /// 
     /// IFC2x4 CHANGE The data type has been changed to IfcDateTime, the date time string according to ISO8601.
-    IfcDateTime CreationTime();
-    void setCreationTime(IfcDateTime v);
+    std::string CreationTime() const;
+    void setCreationTime(std::string v);
     /// Whether the optional attribute LastRevisionTime is defined for this IfcDocumentInformation
-    bool hasLastRevisionTime();
+    bool hasLastRevisionTime() const;
     /// Date and time stamp when this document version was created.
     /// 
     /// IFC2x4 CHANGE The data type has been changed to IfcDateTime, the date time string according to ISO8601.
-    IfcDateTime LastRevisionTime();
-    void setLastRevisionTime(IfcDateTime v);
+    std::string LastRevisionTime() const;
+    void setLastRevisionTime(std::string v);
     /// Whether the optional attribute ElectronicFormat is defined for this IfcDocumentInformation
-    bool hasElectronicFormat();
+    bool hasElectronicFormat() const;
     /// Describes the electronic format of the document being referenced, providing the file extension and the manner in which the content is provided.
-    IfcIdentifier ElectronicFormat();
-    void setElectronicFormat(IfcIdentifier v);
+    std::string ElectronicFormat() const;
+    void setElectronicFormat(std::string v);
     /// Whether the optional attribute ValidFrom is defined for this IfcDocumentInformation
-    bool hasValidFrom();
+    bool hasValidFrom() const;
     /// Date when the document becomes valid.
     /// 
     /// IFC2x4 CHANGE The data type has been changed to IfcDate, the date string according to ISO8601.
-    IfcDate ValidFrom();
-    void setValidFrom(IfcDate v);
+    std::string ValidFrom() const;
+    void setValidFrom(std::string v);
     /// Whether the optional attribute ValidUntil is defined for this IfcDocumentInformation
-    bool hasValidUntil();
+    bool hasValidUntil() const;
     /// Date until which the document remains valid.
     /// 
     /// IFC2x4 CHANGE The data type has been changed to IfcDate, the date string according to ISO8601.
-    IfcDate ValidUntil();
-    void setValidUntil(IfcDate v);
+    std::string ValidUntil() const;
+    void setValidUntil(std::string v);
     /// Whether the optional attribute Confidentiality is defined for this IfcDocumentInformation
-    bool hasConfidentiality();
+    bool hasConfidentiality() const;
     /// The level of confidentiality of the document.
-    IfcDocumentConfidentialityEnum::IfcDocumentConfidentialityEnum Confidentiality();
+    IfcDocumentConfidentialityEnum::IfcDocumentConfidentialityEnum Confidentiality() const;
     void setConfidentiality(IfcDocumentConfidentialityEnum::IfcDocumentConfidentialityEnum v);
     /// Whether the optional attribute Status is defined for this IfcDocumentInformation
-    bool hasStatus();
+    bool hasStatus() const;
     /// The current status of the document. Examples of status values that might be used for a document information status include:
     /// - DRAFT
     /// - FINAL DRAFT
     /// - FINAL
     /// - REVISION
-    IfcDocumentStatusEnum::IfcDocumentStatusEnum Status();
+    IfcDocumentStatusEnum::IfcDocumentStatusEnum Status() const;
     void setStatus(IfcDocumentStatusEnum::IfcDocumentStatusEnum v);
     virtual unsigned int getArgumentCount() const { return 17; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_STRING; case 1: return IfcUtil::Argument_STRING; case 2: return IfcUtil::Argument_STRING; case 3: return IfcUtil::Argument_STRING; case 4: return IfcUtil::Argument_STRING; case 5: return IfcUtil::Argument_STRING; case 6: return IfcUtil::Argument_STRING; case 7: return IfcUtil::Argument_STRING; case 8: return IfcUtil::Argument_ENTITY; case 9: return IfcUtil::Argument_ENTITY_LIST; case 10: return IfcUtil::Argument_STRING; case 11: return IfcUtil::Argument_STRING; case 12: return IfcUtil::Argument_STRING; case 13: return IfcUtil::Argument_STRING; case 14: return IfcUtil::Argument_STRING; case 15: return IfcUtil::Argument_ENUMERATION; case 16: return IfcUtil::Argument_ENUMERATION; } return IfcExternalInformation::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcIdentifier; case 1: return Type::IfcLabel; case 2: return Type::IfcText; case 3: return Type::IfcURIReference; case 4: return Type::IfcText; case 5: return Type::IfcText; case 6: return Type::IfcText; case 7: return Type::IfcLabel; case 8: return Type::IfcActorSelect; case 9: return Type::IfcActorSelect; case 10: return Type::IfcDateTime; case 11: return Type::IfcDateTime; case 12: return Type::IfcIdentifier; case 13: return Type::IfcDate; case 14: return Type::IfcDate; case 15: return Type::IfcDocumentConfidentialityEnum; case 16: return Type::IfcDocumentStatusEnum; } return IfcExternalInformation::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Identification"; case 1: return "Name"; case 2: return "Description"; case 3: return "Location"; case 4: return "Purpose"; case 5: return "IntendedUse"; case 6: return "Scope"; case 7: return "Revision"; case 8: return "DocumentOwner"; case 9: return "Editors"; case 10: return "CreationTime"; case 11: return "LastRevisionTime"; case 12: return "ElectronicFormat"; case 13: return "ValidFrom"; case 14: return "ValidUntil"; case 15: return "Confidentiality"; case 16: return "Status"; } return IfcExternalInformation::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelAssociatesDocument > > DocumentInfoForObjects(); // INVERSE IfcRelAssociatesDocument::RelatingDocument
-    SHARED_PTR< IfcTemplatedEntityList< IfcDocumentReference > > HasDocumentReferences(); // INVERSE IfcDocumentReference::ReferencedDocument
-    SHARED_PTR< IfcTemplatedEntityList< IfcDocumentInformationRelationship > > IsPointedTo(); // INVERSE IfcDocumentInformationRelationship::RelatedDocuments
-    SHARED_PTR< IfcTemplatedEntityList< IfcDocumentInformationRelationship > > IsPointer(); // INVERSE IfcDocumentInformationRelationship::RelatingDocument
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcRelAssociatesDocument >::ptr DocumentInfoForObjects() const; // INVERSE IfcRelAssociatesDocument::RelatingDocument
+    IfcTemplatedEntityList< IfcDocumentReference >::ptr HasDocumentReferences() const; // INVERSE IfcDocumentReference::ReferencedDocument
+    IfcTemplatedEntityList< IfcDocumentInformationRelationship >::ptr IsPointedTo() const; // INVERSE IfcDocumentInformationRelationship::RelatedDocuments
+    IfcTemplatedEntityList< IfcDocumentInformationRelationship >::ptr IsPointer() const; // INVERSE IfcDocumentInformationRelationship::RelatingDocument
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcDocumentInformation (IfcAbstractEntityPtr e);
-    IfcDocumentInformation (IfcIdentifier v1_Identification, IfcLabel v2_Name, boost::optional< IfcText > v3_Description, boost::optional< IfcURIReference > v4_Location, boost::optional< IfcText > v5_Purpose, boost::optional< IfcText > v6_IntendedUse, boost::optional< IfcText > v7_Scope, boost::optional< IfcLabel > v8_Revision, boost::optional< IfcActorSelect > v9_DocumentOwner, boost::optional< IfcEntities > v10_Editors, boost::optional< IfcDateTime > v11_CreationTime, boost::optional< IfcDateTime > v12_LastRevisionTime, boost::optional< IfcIdentifier > v13_ElectronicFormat, boost::optional< IfcDate > v14_ValidFrom, boost::optional< IfcDate > v15_ValidUntil, boost::optional< IfcDocumentConfidentialityEnum::IfcDocumentConfidentialityEnum > v16_Confidentiality, boost::optional< IfcDocumentStatusEnum::IfcDocumentStatusEnum > v17_Status);
-    typedef IfcDocumentInformation* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcDocumentInformation > > list;
-    typedef IfcTemplatedEntityList< IfcDocumentInformation >::it it;
+    IfcDocumentInformation (IfcAbstractEntity* e);
+    IfcDocumentInformation (std::string v1_Identification, std::string v2_Name, boost::optional< std::string > v3_Description, boost::optional< std::string > v4_Location, boost::optional< std::string > v5_Purpose, boost::optional< std::string > v6_IntendedUse, boost::optional< std::string > v7_Scope, boost::optional< std::string > v8_Revision, IfcActorSelect* v9_DocumentOwner, boost::optional< IfcEntityList::ptr > v10_Editors, boost::optional< std::string > v11_CreationTime, boost::optional< std::string > v12_LastRevisionTime, boost::optional< std::string > v13_ElectronicFormat, boost::optional< std::string > v14_ValidFrom, boost::optional< std::string > v15_ValidUntil, boost::optional< IfcDocumentConfidentialityEnum::IfcDocumentConfidentialityEnum > v16_Confidentiality, boost::optional< IfcDocumentStatusEnum::IfcDocumentStatusEnum > v17_Status);
+    typedef IfcTemplatedEntityList< IfcDocumentInformation > list;
 };
 /// An IfcDocumentInformationRelationship is a relationship class that enables a document to have the ability to reference other documents.
 /// 
@@ -13578,28 +14691,27 @@ class IfcDocumentInformation : public IfcExternalInformation {
 class IfcDocumentInformationRelationship : public IfcResourceLevelRelationship {
 public:
     /// The document that acts as the parent, referencing or original document in a relationship.
-    IfcDocumentInformation* RelatingDocument();
+    IfcDocumentInformation* RelatingDocument() const;
     void setRelatingDocument(IfcDocumentInformation* v);
     /// The document that acts as the child, referenced or replacing document in a relationship.
-    SHARED_PTR< IfcTemplatedEntityList< IfcDocumentInformation > > RelatedDocuments();
-    void setRelatedDocuments(SHARED_PTR< IfcTemplatedEntityList< IfcDocumentInformation > > v);
+    IfcTemplatedEntityList< IfcDocumentInformation >::ptr RelatedDocuments() const;
+    void setRelatedDocuments(IfcTemplatedEntityList< IfcDocumentInformation >::ptr v);
     /// Whether the optional attribute RelationshipType is defined for this IfcDocumentInformationRelationship
-    bool hasRelationshipType();
+    bool hasRelationshipType() const;
     /// Describes the type of relationship between documents. This could be sub-document, replacement etc. The interpretation has to be established in an application context.
-    IfcLabel RelationshipType();
-    void setRelationshipType(IfcLabel v);
+    std::string RelationshipType() const;
+    void setRelationshipType(std::string v);
     virtual unsigned int getArgumentCount() const { return 5; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 2: return IfcUtil::Argument_ENTITY; case 3: return IfcUtil::Argument_ENTITY_LIST; case 4: return IfcUtil::Argument_STRING; } return IfcResourceLevelRelationship::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 2: return Type::IfcDocumentInformation; case 3: return Type::IfcDocumentInformation; case 4: return Type::IfcLabel; } return IfcResourceLevelRelationship::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 2: return "RelatingDocument"; case 3: return "RelatedDocuments"; case 4: return "RelationshipType"; } return IfcResourceLevelRelationship::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcDocumentInformationRelationship (IfcAbstractEntityPtr e);
-    IfcDocumentInformationRelationship (boost::optional< IfcLabel > v1_Name, boost::optional< IfcText > v2_Description, IfcDocumentInformation* v3_RelatingDocument, SHARED_PTR< IfcTemplatedEntityList< IfcDocumentInformation > > v4_RelatedDocuments, boost::optional< IfcLabel > v5_RelationshipType);
-    typedef IfcDocumentInformationRelationship* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcDocumentInformationRelationship > > list;
-    typedef IfcTemplatedEntityList< IfcDocumentInformationRelationship >::it it;
+    IfcDocumentInformationRelationship (IfcAbstractEntity* e);
+    IfcDocumentInformationRelationship (boost::optional< std::string > v1_Name, boost::optional< std::string > v2_Description, IfcDocumentInformation* v3_RelatingDocument, IfcTemplatedEntityList< IfcDocumentInformation >::ptr v4_RelatedDocuments, boost::optional< std::string > v5_RelationshipType);
+    typedef IfcTemplatedEntityList< IfcDocumentInformationRelationship > list;
 };
 /// An IfcDocumentReference is a reference 
 /// to the location of a document. The reference is given by a system 
@@ -13615,30 +14727,29 @@ class IfcDocumentInformationRelationship : public IfcResourceLevelRelationship {
 class IfcDocumentReference : public IfcExternalReference {
 public:
     /// Whether the optional attribute Description is defined for this IfcDocumentReference
-    bool hasDescription();
+    bool hasDescription() const;
     /// Description of the document reference for informational purposes.
     /// 
     /// IFC2x4 CHANGE  New attribute added at the end of the attribute list.
-    IfcText Description();
-    void setDescription(IfcText v);
+    std::string Description() const;
+    void setDescription(std::string v);
     /// Whether the optional attribute ReferencedDocument is defined for this IfcDocumentReference
-    bool hasReferencedDocument();
+    bool hasReferencedDocument() const;
     /// The document that is referenced.
-    IfcDocumentInformation* ReferencedDocument();
+    IfcDocumentInformation* ReferencedDocument() const;
     void setReferencedDocument(IfcDocumentInformation* v);
     virtual unsigned int getArgumentCount() const { return 5; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 3: return IfcUtil::Argument_STRING; case 4: return IfcUtil::Argument_ENTITY; } return IfcExternalReference::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 3: return Type::IfcText; case 4: return Type::IfcDocumentInformation; } return IfcExternalReference::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 3: return "Description"; case 4: return "ReferencedDocument"; } return IfcExternalReference::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelAssociatesDocument > > DocumentRefForObjects(); // INVERSE IfcRelAssociatesDocument::RelatingDocument
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcRelAssociatesDocument >::ptr DocumentRefForObjects() const; // INVERSE IfcRelAssociatesDocument::RelatingDocument
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcDocumentReference (IfcAbstractEntityPtr e);
-    IfcDocumentReference (boost::optional< IfcURIReference > v1_Location, boost::optional< IfcIdentifier > v2_Identification, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, IfcDocumentInformation* v5_ReferencedDocument);
-    typedef IfcDocumentReference* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcDocumentReference > > list;
-    typedef IfcTemplatedEntityList< IfcDocumentReference >::it it;
+    IfcDocumentReference (IfcAbstractEntity* e);
+    IfcDocumentReference (boost::optional< std::string > v1_Location, boost::optional< std::string > v2_Identification, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcDocumentInformation* v5_ReferencedDocument);
+    typedef IfcTemplatedEntityList< IfcDocumentReference > list;
 };
 /// Definition from ISO/CD 10303-42:1992: An edge is the
 /// topological construct corresponding to the connection of two
@@ -13692,23 +14803,22 @@ class IfcDocumentReference : public IfcExternalReference {
 class IfcEdge : public IfcTopologicalRepresentationItem {
 public:
     /// Start point (vertex) of the edge.
-    IfcVertex* EdgeStart();
+    IfcVertex* EdgeStart() const;
     void setEdgeStart(IfcVertex* v);
     /// End point (vertex) of the edge. The same vertex can be used for both EdgeStart and EdgeEnd.
-    IfcVertex* EdgeEnd();
+    IfcVertex* EdgeEnd() const;
     void setEdgeEnd(IfcVertex* v);
     virtual unsigned int getArgumentCount() const { return 2; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY; case 1: return IfcUtil::Argument_ENTITY; } return IfcTopologicalRepresentationItem::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcVertex; case 1: return Type::IfcVertex; } return IfcTopologicalRepresentationItem::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "EdgeStart"; case 1: return "EdgeEnd"; } return IfcTopologicalRepresentationItem::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcEdge (IfcAbstractEntityPtr e);
+    IfcEdge (IfcAbstractEntity* e);
     IfcEdge (IfcVertex* v1_EdgeStart, IfcVertex* v2_EdgeEnd);
-    typedef IfcEdge* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcEdge > > list;
-    typedef IfcTemplatedEntityList< IfcEdge >::it it;
+    typedef IfcTemplatedEntityList< IfcEdge > list;
 };
 /// Definition from ISO/CD 10303-42:1992: An edge curve is
 /// a special subtype of edge which has its geometry fully defined.
@@ -13746,23 +14856,22 @@ class IfcEdge : public IfcTopologicalRepresentationItem {
 class IfcEdgeCurve : public IfcEdge {
 public:
     /// The curve which defines the shape and spatial location of the edge. This curve may be unbounded and is implicitly trimmed by the vertices of the edge; this defines the edge domain. Multiple edges can reference the same curve.
-    IfcCurve* EdgeGeometry();
+    IfcCurve* EdgeGeometry() const;
     void setEdgeGeometry(IfcCurve* v);
     /// This logical flag indicates whether (TRUE), or not (FALSE) the senses of the edge and the curve defining the edge geometry are the same. The sense of an edge is from the edge start vertex to the edge end vertex; the sense of a curve is in the direction of increasing parameter.
-    bool SameSense();
+    bool SameSense() const;
     void setSameSense(bool v);
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 2: return IfcUtil::Argument_ENTITY; case 3: return IfcUtil::Argument_BOOL; } return IfcEdge::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 2: return Type::IfcCurve; case 3: return Type::UNDEFINED; } return IfcEdge::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 2: return "EdgeGeometry"; case 3: return "SameSense"; } return IfcEdge::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcEdgeCurve (IfcAbstractEntityPtr e);
+    IfcEdgeCurve (IfcAbstractEntity* e);
     IfcEdgeCurve (IfcVertex* v1_EdgeStart, IfcVertex* v2_EdgeEnd, IfcCurve* v3_EdgeGeometry, bool v4_SameSense);
-    typedef IfcEdgeCurve* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcEdgeCurve > > list;
-    typedef IfcTemplatedEntityList< IfcEdgeCurve >::it it;
+    typedef IfcTemplatedEntityList< IfcEdgeCurve > list;
 };
 /// IfcEventTime captures the time-related information about an event
 ///   including the different types of event dates (i.e. actual,
@@ -13790,65 +14899,63 @@ class IfcEdgeCurve : public IfcEdge {
 class IfcEventTime : public IfcSchedulingTime {
 public:
     /// Whether the optional attribute ActualDate is defined for this IfcEventTime
-    bool hasActualDate();
+    bool hasActualDate() const;
     /// The date on which an event actually occurs. It is a measured value.
-    IfcDateTime ActualDate();
-    void setActualDate(IfcDateTime v);
+    std::string ActualDate() const;
+    void setActualDate(std::string v);
     /// Whether the optional attribute EarlyDate is defined for this IfcEventTime
-    bool hasEarlyDate();
+    bool hasEarlyDate() const;
     /// The earliest date on which an event can occur. It is a calculated value.
-    IfcDateTime EarlyDate();
-    void setEarlyDate(IfcDateTime v);
+    std::string EarlyDate() const;
+    void setEarlyDate(std::string v);
     /// Whether the optional attribute LateDate is defined for this IfcEventTime
-    bool hasLateDate();
+    bool hasLateDate() const;
     /// The latest date on which an event can occur. It is a calculated value.
-    IfcDateTime LateDate();
-    void setLateDate(IfcDateTime v);
+    std::string LateDate() const;
+    void setLateDate(std::string v);
     /// Whether the optional attribute ScheduleDate is defined for this IfcEventTime
-    bool hasScheduleDate();
+    bool hasScheduleDate() const;
     /// The date on which an event is scheduled to occur. 
     ///   The value might be measured or somehow calculated, which is defined by
     ///   ScheduleDataOrigin.
-    IfcDateTime ScheduleDate();
-    void setScheduleDate(IfcDateTime v);
+    std::string ScheduleDate() const;
+    void setScheduleDate(std::string v);
     virtual unsigned int getArgumentCount() const { return 7; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 3: return IfcUtil::Argument_STRING; case 4: return IfcUtil::Argument_STRING; case 5: return IfcUtil::Argument_STRING; case 6: return IfcUtil::Argument_STRING; } return IfcSchedulingTime::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 3: return Type::IfcDateTime; case 4: return Type::IfcDateTime; case 5: return Type::IfcDateTime; case 6: return Type::IfcDateTime; } return IfcSchedulingTime::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 3: return "ActualDate"; case 4: return "EarlyDate"; case 5: return "LateDate"; case 6: return "ScheduleDate"; } return IfcSchedulingTime::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcEventTime (IfcAbstractEntityPtr e);
-    IfcEventTime (boost::optional< IfcLabel > v1_Name, boost::optional< IfcDataOriginEnum::IfcDataOriginEnum > v2_DataOrigin, boost::optional< IfcLabel > v3_UserDefinedDataOrigin, boost::optional< IfcDateTime > v4_ActualDate, boost::optional< IfcDateTime > v5_EarlyDate, boost::optional< IfcDateTime > v6_LateDate, boost::optional< IfcDateTime > v7_ScheduleDate);
-    typedef IfcEventTime* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcEventTime > > list;
-    typedef IfcTemplatedEntityList< IfcEventTime >::it it;
+    IfcEventTime (IfcAbstractEntity* e);
+    IfcEventTime (boost::optional< std::string > v1_Name, boost::optional< IfcDataOriginEnum::IfcDataOriginEnum > v2_DataOrigin, boost::optional< std::string > v3_UserDefinedDataOrigin, boost::optional< std::string > v4_ActualDate, boost::optional< std::string > v5_EarlyDate, boost::optional< std::string > v6_LateDate, boost::optional< std::string > v7_ScheduleDate);
+    typedef IfcTemplatedEntityList< IfcEventTime > list;
 };
 
 class IfcExtendedProperties : public IfcPropertyAbstraction {
 public:
     /// Whether the optional attribute Name is defined for this IfcExtendedProperties
-    bool hasName();
-    IfcIdentifier Name();
-    void setName(IfcIdentifier v);
+    bool hasName() const;
+    std::string Name() const;
+    void setName(std::string v);
     /// Whether the optional attribute Description is defined for this IfcExtendedProperties
-    bool hasDescription();
-    IfcText Description();
-    void setDescription(IfcText v);
-    SHARED_PTR< IfcTemplatedEntityList< IfcProperty > > Properties();
-    void setProperties(SHARED_PTR< IfcTemplatedEntityList< IfcProperty > > v);
+    bool hasDescription() const;
+    std::string Description() const;
+    void setDescription(std::string v);
+    IfcTemplatedEntityList< IfcProperty >::ptr Properties() const;
+    void setProperties(IfcTemplatedEntityList< IfcProperty >::ptr v);
     virtual unsigned int getArgumentCount() const { return 3; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_STRING; case 1: return IfcUtil::Argument_STRING; case 2: return IfcUtil::Argument_ENTITY_LIST; } return IfcPropertyAbstraction::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcIdentifier; case 1: return Type::IfcText; case 2: return Type::IfcProperty; } return IfcPropertyAbstraction::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Name"; case 1: return "Description"; case 2: return "Properties"; } return IfcPropertyAbstraction::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcExtendedProperties (IfcAbstractEntityPtr e);
-    IfcExtendedProperties (boost::optional< IfcIdentifier > v1_Name, boost::optional< IfcText > v2_Description, SHARED_PTR< IfcTemplatedEntityList< IfcProperty > > v3_Properties);
-    typedef IfcExtendedProperties* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcExtendedProperties > > list;
-    typedef IfcTemplatedEntityList< IfcExtendedProperties >::it it;
+    IfcExtendedProperties (IfcAbstractEntity* e);
+    IfcExtendedProperties (boost::optional< std::string > v1_Name, boost::optional< std::string > v2_Description, IfcTemplatedEntityList< IfcProperty >::ptr v3_Properties);
+    typedef IfcTemplatedEntityList< IfcExtendedProperties > list;
 };
 /// IfcExternalReferenceRelationship is a relationship entity that enables objects from the
 /// IfcResourceObjectSelect to have the ability to be tagged by external references.
@@ -13862,23 +14969,22 @@ class IfcExternalReferenceRelationship : public IfcResourceLevelRelationship {
     /// An external reference that can be used to tag an object within the range of IfcResourceObjectSelect.
     /// 
     /// NOTE  External references can be a library reference (for example a dictionary or a catalogue reference), a classification reference, or a documentation reference.
-    IfcExternalReference* RelatingReference();
+    IfcExternalReference* RelatingReference() const;
     void setRelatingReference(IfcExternalReference* v);
     /// Objects within the list of IfcResourceObjectSelect that can be tagged by an external reference to a dictionary, library, catalogue, classification or documentation.
-    SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > RelatedResourceObjects();
-    void setRelatedResourceObjects(SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > v);
+    IfcEntityList::ptr RelatedResourceObjects() const;
+    void setRelatedResourceObjects(IfcEntityList::ptr v);
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 2: return IfcUtil::Argument_ENTITY; case 3: return IfcUtil::Argument_ENTITY_LIST; } return IfcResourceLevelRelationship::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 2: return Type::IfcExternalReference; case 3: return Type::IfcResourceObjectSelect; } return IfcResourceLevelRelationship::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 2: return "RelatingReference"; case 3: return "RelatedResourceObjects"; } return IfcResourceLevelRelationship::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcExternalReferenceRelationship (IfcAbstractEntityPtr e);
-    IfcExternalReferenceRelationship (boost::optional< IfcLabel > v1_Name, boost::optional< IfcText > v2_Description, IfcExternalReference* v3_RelatingReference, IfcEntities v4_RelatedResourceObjects);
-    typedef IfcExternalReferenceRelationship* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcExternalReferenceRelationship > > list;
-    typedef IfcTemplatedEntityList< IfcExternalReferenceRelationship >::it it;
+    IfcExternalReferenceRelationship (IfcAbstractEntity* e);
+    IfcExternalReferenceRelationship (boost::optional< std::string > v1_Name, boost::optional< std::string > v2_Description, IfcExternalReference* v3_RelatingReference, IfcEntityList::ptr v4_RelatedResourceObjects);
+    typedef IfcTemplatedEntityList< IfcExternalReferenceRelationship > list;
 };
 /// Definition from ISO/CD 10303-42:1992: A face is a topological
 ///   entity of dimensionality 2 corresponding to the intuitive notion of a piece of
@@ -13927,21 +15033,20 @@ class IfcExternalReferenceRelationship : public IfcResourceLevelRelationship {
 class IfcFace : public IfcTopologicalRepresentationItem {
 public:
     /// Boundaries of the face.
-    SHARED_PTR< IfcTemplatedEntityList< IfcFaceBound > > Bounds();
-    void setBounds(SHARED_PTR< IfcTemplatedEntityList< IfcFaceBound > > v);
+    IfcTemplatedEntityList< IfcFaceBound >::ptr Bounds() const;
+    void setBounds(IfcTemplatedEntityList< IfcFaceBound >::ptr v);
     virtual unsigned int getArgumentCount() const { return 1; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY_LIST; } return IfcTopologicalRepresentationItem::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcFaceBound; } return IfcTopologicalRepresentationItem::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Bounds"; } return IfcTopologicalRepresentationItem::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcTextureMap > > HasTextureMaps(); // INVERSE IfcTextureMap::MappedTo
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcTextureMap >::ptr HasTextureMaps() const; // INVERSE IfcTextureMap::MappedTo
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcFace (IfcAbstractEntityPtr e);
-    IfcFace (SHARED_PTR< IfcTemplatedEntityList< IfcFaceBound > > v1_Bounds);
-    typedef IfcFace* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcFace > > list;
-    typedef IfcTemplatedEntityList< IfcFace >::it it;
+    IfcFace (IfcAbstractEntity* e);
+    IfcFace (IfcTemplatedEntityList< IfcFaceBound >::ptr v1_Bounds);
+    typedef IfcTemplatedEntityList< IfcFace > list;
 };
 /// Definition from ISO/CD 10303-42:1992: A face bound is a loop which is intended to be used for bounding a face.  
 /// 
@@ -13951,23 +15056,22 @@ class IfcFace : public IfcTopologicalRepresentationItem {
 class IfcFaceBound : public IfcTopologicalRepresentationItem {
 public:
     /// The loop which will be used as a face boundary.
-    IfcLoop* Bound();
+    IfcLoop* Bound() const;
     void setBound(IfcLoop* v);
     /// This indicated whether (TRUE) or not (FALSE) the loop has the same sense when used to bound the face as when first defined. If sense is FALSE the senses of all its component oriented edges are implicitly reversed when used in the face.
-    bool Orientation();
+    bool Orientation() const;
     void setOrientation(bool v);
     virtual unsigned int getArgumentCount() const { return 2; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY; case 1: return IfcUtil::Argument_BOOL; } return IfcTopologicalRepresentationItem::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcLoop; case 1: return Type::UNDEFINED; } return IfcTopologicalRepresentationItem::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Bound"; case 1: return "Orientation"; } return IfcTopologicalRepresentationItem::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcFaceBound (IfcAbstractEntityPtr e);
+    IfcFaceBound (IfcAbstractEntity* e);
     IfcFaceBound (IfcLoop* v1_Bound, bool v2_Orientation);
-    typedef IfcFaceBound* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcFaceBound > > list;
-    typedef IfcTemplatedEntityList< IfcFaceBound >::it it;
+    typedef IfcTemplatedEntityList< IfcFaceBound > list;
 };
 /// Definition from ISO/CD 10303-42:1992: A face outer bound is a special subtype of face bound which carries the additional semantics of defining an outer boundary on the face. No more than one boundary of a face shall be of this type.  
 /// 
@@ -13978,16 +15082,15 @@ class IfcFaceOuterBound : public IfcFaceBound {
 public:
     virtual unsigned int getArgumentCount() const { return 2; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcFaceBound::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcFaceBound::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcFaceBound::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcFaceOuterBound (IfcAbstractEntityPtr e);
+    IfcFaceOuterBound (IfcAbstractEntity* e);
     IfcFaceOuterBound (IfcLoop* v1_Bound, bool v2_Orientation);
-    typedef IfcFaceOuterBound* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcFaceOuterBound > > list;
-    typedef IfcTemplatedEntityList< IfcFaceOuterBound >::it it;
+    typedef IfcTemplatedEntityList< IfcFaceOuterBound > list;
 };
 /// Definition from ISO/CD 10303-42:1992: A face surface
 ///   (IfcFaceSurface) is a subtype of face in which the geometry is defined by an
@@ -14028,23 +15131,22 @@ class IfcFaceOuterBound : public IfcFaceBound {
 class IfcFaceSurface : public IfcFace {
 public:
     /// The surface which defines the internal shape of the face. This surface may be unbounded. The domain of the face is defined by this surface and the bounding loops in the inherited attribute SELF\FaceBounds.
-    IfcSurface* FaceSurface();
+    IfcSurface* FaceSurface() const;
     void setFaceSurface(IfcSurface* v);
     /// This flag indicates whether the sense of the surface normal agrees with (TRUE), or opposes (FALSE), the sense of the topological normal to the face.
-    bool SameSense();
+    bool SameSense() const;
     void setSameSense(bool v);
     virtual unsigned int getArgumentCount() const { return 3; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 1: return IfcUtil::Argument_ENTITY; case 2: return IfcUtil::Argument_BOOL; } return IfcFace::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 1: return Type::IfcSurface; case 2: return Type::UNDEFINED; } return IfcFace::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 1: return "FaceSurface"; case 2: return "SameSense"; } return IfcFace::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcFaceSurface (IfcAbstractEntityPtr e);
-    IfcFaceSurface (SHARED_PTR< IfcTemplatedEntityList< IfcFaceBound > > v1_Bounds, IfcSurface* v2_FaceSurface, bool v3_SameSense);
-    typedef IfcFaceSurface* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcFaceSurface > > list;
-    typedef IfcTemplatedEntityList< IfcFaceSurface >::it it;
+    IfcFaceSurface (IfcAbstractEntity* e);
+    IfcFaceSurface (IfcTemplatedEntityList< IfcFaceBound >::ptr v1_Bounds, IfcSurface* v2_FaceSurface, bool v3_SameSense);
+    typedef IfcTemplatedEntityList< IfcFaceSurface > list;
 };
 /// Definition from IAI: Defines forces at which a support or connection fails.
 /// 
@@ -14056,47 +15158,46 @@ class IfcFaceSurface : public IfcFace {
 class IfcFailureConnectionCondition : public IfcStructuralConnectionCondition {
 public:
     /// Whether the optional attribute TensionFailureX is defined for this IfcFailureConnectionCondition
-    bool hasTensionFailureX();
+    bool hasTensionFailureX() const;
     /// Tension force in x-direction leading to failure of the connection.
-    IfcForceMeasure TensionFailureX();
-    void setTensionFailureX(IfcForceMeasure v);
+    double TensionFailureX() const;
+    void setTensionFailureX(double v);
     /// Whether the optional attribute TensionFailureY is defined for this IfcFailureConnectionCondition
-    bool hasTensionFailureY();
+    bool hasTensionFailureY() const;
     /// Tension force in y-direction leading to failure of the connection.
-    IfcForceMeasure TensionFailureY();
-    void setTensionFailureY(IfcForceMeasure v);
+    double TensionFailureY() const;
+    void setTensionFailureY(double v);
     /// Whether the optional attribute TensionFailureZ is defined for this IfcFailureConnectionCondition
-    bool hasTensionFailureZ();
+    bool hasTensionFailureZ() const;
     /// Tension force in z-direction leading to failure of the connection.
-    IfcForceMeasure TensionFailureZ();
-    void setTensionFailureZ(IfcForceMeasure v);
+    double TensionFailureZ() const;
+    void setTensionFailureZ(double v);
     /// Whether the optional attribute CompressionFailureX is defined for this IfcFailureConnectionCondition
-    bool hasCompressionFailureX();
+    bool hasCompressionFailureX() const;
     /// Compression force in x-direction leading to failure of the connection.
-    IfcForceMeasure CompressionFailureX();
-    void setCompressionFailureX(IfcForceMeasure v);
+    double CompressionFailureX() const;
+    void setCompressionFailureX(double v);
     /// Whether the optional attribute CompressionFailureY is defined for this IfcFailureConnectionCondition
-    bool hasCompressionFailureY();
+    bool hasCompressionFailureY() const;
     /// Compression force in y-direction leading to failure of the connection.
-    IfcForceMeasure CompressionFailureY();
-    void setCompressionFailureY(IfcForceMeasure v);
+    double CompressionFailureY() const;
+    void setCompressionFailureY(double v);
     /// Whether the optional attribute CompressionFailureZ is defined for this IfcFailureConnectionCondition
-    bool hasCompressionFailureZ();
+    bool hasCompressionFailureZ() const;
     /// Compression force in z-direction leading to failure of the connection.
-    IfcForceMeasure CompressionFailureZ();
-    void setCompressionFailureZ(IfcForceMeasure v);
+    double CompressionFailureZ() const;
+    void setCompressionFailureZ(double v);
     virtual unsigned int getArgumentCount() const { return 7; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 1: return IfcUtil::Argument_DOUBLE; case 2: return IfcUtil::Argument_DOUBLE; case 3: return IfcUtil::Argument_DOUBLE; case 4: return IfcUtil::Argument_DOUBLE; case 5: return IfcUtil::Argument_DOUBLE; case 6: return IfcUtil::Argument_DOUBLE; } return IfcStructuralConnectionCondition::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 1: return Type::IfcForceMeasure; case 2: return Type::IfcForceMeasure; case 3: return Type::IfcForceMeasure; case 4: return Type::IfcForceMeasure; case 5: return Type::IfcForceMeasure; case 6: return Type::IfcForceMeasure; } return IfcStructuralConnectionCondition::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 1: return "TensionFailureX"; case 2: return "TensionFailureY"; case 3: return "TensionFailureZ"; case 4: return "CompressionFailureX"; case 5: return "CompressionFailureY"; case 6: return "CompressionFailureZ"; } return IfcStructuralConnectionCondition::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcFailureConnectionCondition (IfcAbstractEntityPtr e);
-    IfcFailureConnectionCondition (boost::optional< IfcLabel > v1_Name, boost::optional< IfcForceMeasure > v2_TensionFailureX, boost::optional< IfcForceMeasure > v3_TensionFailureY, boost::optional< IfcForceMeasure > v4_TensionFailureZ, boost::optional< IfcForceMeasure > v5_CompressionFailureX, boost::optional< IfcForceMeasure > v6_CompressionFailureY, boost::optional< IfcForceMeasure > v7_CompressionFailureZ);
-    typedef IfcFailureConnectionCondition* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcFailureConnectionCondition > > list;
-    typedef IfcTemplatedEntityList< IfcFailureConnectionCondition >::it it;
+    IfcFailureConnectionCondition (IfcAbstractEntity* e);
+    IfcFailureConnectionCondition (boost::optional< std::string > v1_Name, boost::optional< double > v2_TensionFailureX, boost::optional< double > v3_TensionFailureY, boost::optional< double > v4_TensionFailureZ, boost::optional< double > v5_CompressionFailureX, boost::optional< double > v6_CompressionFailureY, boost::optional< double > v7_CompressionFailureZ);
+    typedef IfcTemplatedEntityList< IfcFailureConnectionCondition > list;
 };
 /// Definition from ISO/CD 10303-46:1992: The style for filling visible curve segments, annotation fill areas or surfaces with tiles or hatches.
 /// 
@@ -14135,24 +15236,23 @@ class IfcFailureConnectionCondition : public IfcStructuralConnectionCondition {
 class IfcFillAreaStyle : public IfcPresentationStyle {
 public:
     /// The set of fill area styles to use in presenting visible curve segments, annotation fill areas or surfaces.
-    SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > FillStyles();
-    void setFillStyles(SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > v);
+    IfcEntityList::ptr FillStyles() const;
+    void setFillStyles(IfcEntityList::ptr v);
     /// Whether the optional attribute ModelorDraughting is defined for this IfcFillAreaStyle
-    bool hasModelorDraughting();
-    bool ModelorDraughting();
+    bool hasModelorDraughting() const;
+    bool ModelorDraughting() const;
     void setModelorDraughting(bool v);
     virtual unsigned int getArgumentCount() const { return 3; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 1: return IfcUtil::Argument_ENTITY_LIST; case 2: return IfcUtil::Argument_BOOL; } return IfcPresentationStyle::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 1: return Type::IfcFillStyleSelect; case 2: return Type::UNDEFINED; } return IfcPresentationStyle::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 1: return "FillStyles"; case 2: return "ModelorDraughting"; } return IfcPresentationStyle::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcFillAreaStyle (IfcAbstractEntityPtr e);
-    IfcFillAreaStyle (boost::optional< IfcLabel > v1_Name, IfcEntities v2_FillStyles, boost::optional< bool > v3_ModelorDraughting);
-    typedef IfcFillAreaStyle* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcFillAreaStyle > > list;
-    typedef IfcTemplatedEntityList< IfcFillAreaStyle >::it it;
+    IfcFillAreaStyle (IfcAbstractEntity* e);
+    IfcFillAreaStyle (boost::optional< std::string > v1_Name, IfcEntityList::ptr v2_FillStyles, boost::optional< bool > v3_ModelorDraughting);
+    typedef IfcTemplatedEntityList< IfcFillAreaStyle > list;
 };
 /// Definition from ISO/CD 10303-42:1992: A geometric
 /// representation context is a representation context in which the
@@ -14204,36 +15304,35 @@ class IfcFillAreaStyle : public IfcPresentationStyle {
 class IfcGeometricRepresentationContext : public IfcRepresentationContext {
 public:
     /// The integer dimension count of the coordinate space modeled in a geometric representation context.
-    IfcDimensionCount CoordinateSpaceDimension();
-    void setCoordinateSpaceDimension(IfcDimensionCount v);
+    int CoordinateSpaceDimension() const;
+    void setCoordinateSpaceDimension(int v);
     /// Whether the optional attribute Precision is defined for this IfcGeometricRepresentationContext
-    bool hasPrecision();
+    bool hasPrecision() const;
     /// Value of the model precision for geometric models. It is a double value (REAL), typically in 1E-5 to 1E-8 range, that indicates the tolerance under which two given points are still assumed to be identical. The value can be used e.g. to sets the maximum distance from an edge curve to the underlying face surface in brep models.
-    double Precision();
+    double Precision() const;
     void setPrecision(double v);
     /// Establishment of the engineering coordinate system (often referred to as the world coordinate system in CAD) for all representation contexts used by the project. 
     /// 
     /// Note  it can be used to provide better numeric stability if the placement of the building(s) is far away from the origin. In most cases however it would be set to origin: (0.,0.,0.) and directions x(1.,0.,0.), y(0.,1.,0.), z(0.,0.,1.).
-    IfcAxis2Placement WorldCoordinateSystem();
-    void setWorldCoordinateSystem(IfcAxis2Placement v);
+    IfcAxis2Placement* WorldCoordinateSystem() const;
+    void setWorldCoordinateSystem(IfcAxis2Placement* v);
     /// Whether the optional attribute TrueNorth is defined for this IfcGeometricRepresentationContext
-    bool hasTrueNorth();
+    bool hasTrueNorth() const;
     /// Direction of the true north, or geographic northing direction, relative to the underlying project coordinate system. It is given by a 2 dimensional direction within the xy-plane of the project coordinate system. If not resent, it defaults to 0. 1. - i.e. the positive Y axis of the project coordinate system equals the geographic northing direction.
-    IfcDirection* TrueNorth();
+    IfcDirection* TrueNorth() const;
     void setTrueNorth(IfcDirection* v);
     virtual unsigned int getArgumentCount() const { return 6; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 2: return IfcUtil::Argument_INT; case 3: return IfcUtil::Argument_DOUBLE; case 4: return IfcUtil::Argument_ENTITY; case 5: return IfcUtil::Argument_ENTITY; } return IfcRepresentationContext::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 2: return Type::IfcDimensionCount; case 3: return Type::UNDEFINED; case 4: return Type::IfcAxis2Placement; case 5: return Type::IfcDirection; } return IfcRepresentationContext::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 2: return "CoordinateSpaceDimension"; case 3: return "Precision"; case 4: return "WorldCoordinateSystem"; case 5: return "TrueNorth"; } return IfcRepresentationContext::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcGeometricRepresentationSubContext > > HasSubContexts(); // INVERSE IfcGeometricRepresentationSubContext::ParentContext
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcGeometricRepresentationSubContext >::ptr HasSubContexts() const; // INVERSE IfcGeometricRepresentationSubContext::ParentContext
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcGeometricRepresentationContext (IfcAbstractEntityPtr e);
-    IfcGeometricRepresentationContext (boost::optional< IfcLabel > v1_ContextIdentifier, boost::optional< IfcLabel > v2_ContextType, IfcDimensionCount v3_CoordinateSpaceDimension, boost::optional< double > v4_Precision, IfcAxis2Placement v5_WorldCoordinateSystem, IfcDirection* v6_TrueNorth);
-    typedef IfcGeometricRepresentationContext* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcGeometricRepresentationContext > > list;
-    typedef IfcTemplatedEntityList< IfcGeometricRepresentationContext >::it it;
+    IfcGeometricRepresentationContext (IfcAbstractEntity* e);
+    IfcGeometricRepresentationContext (boost::optional< std::string > v1_ContextIdentifier, boost::optional< std::string > v2_ContextType, int v3_CoordinateSpaceDimension, boost::optional< double > v4_Precision, IfcAxis2Placement* v5_WorldCoordinateSystem, IfcDirection* v6_TrueNorth);
+    typedef IfcTemplatedEntityList< IfcGeometricRepresentationContext > list;
 };
 /// Definition from ISO/CD 10303-43:1992: An geometric representation item is a representation item that has the additional meaning of having geometric position or orientation or both. This meaning is present by virtue of:  
 /// 
@@ -14258,16 +15357,15 @@ class IfcGeometricRepresentationItem : public IfcRepresentationItem {
 public:
     virtual unsigned int getArgumentCount() const { return 0; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcRepresentationItem::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcRepresentationItem::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcRepresentationItem::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcGeometricRepresentationItem (IfcAbstractEntityPtr e);
+    IfcGeometricRepresentationItem (IfcAbstractEntity* e);
     IfcGeometricRepresentationItem ();
-    typedef IfcGeometricRepresentationItem* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcGeometricRepresentationItem > > list;
-    typedef IfcTemplatedEntityList< IfcGeometricRepresentationItem >::it it;
+    typedef IfcTemplatedEntityList< IfcGeometricRepresentationItem > list;
 };
 /// IfcGeometricRepresentationSubContext defines the context that applies to several shape representations of a product being a sub context, sharing the WorldCoordinateSystem, CoordinateSpaceDimension, Precision and TrueNorth attributes with the parent IfcGeometricRepresentationContext.
 /// 
@@ -14285,10 +15383,10 @@ class IfcGeometricRepresentationItem : public IfcRepresentationItem {
 class IfcGeometricRepresentationSubContext : public IfcGeometricRepresentationContext {
 public:
     /// Parent context from which the sub context derives its world coordinate system, precision, space coordinate dimension and true north.
-    IfcGeometricRepresentationContext* ParentContext();
+    IfcGeometricRepresentationContext* ParentContext() const;
     void setParentContext(IfcGeometricRepresentationContext* v);
     /// Whether the optional attribute TargetScale is defined for this IfcGeometricRepresentationSubContext
-    bool hasTargetScale();
+    bool hasTargetScale() const;
     /// The target plot scale of the representation 
     /// to which this representation context applies.
     ///   Scale indicates the target plot scale for
@@ -14300,28 +15398,27 @@ class IfcGeometricRepresentationSubContext : public IfcGeometricRepresentationCo
     /// 
     /// Note: Scale 1:100 (given as 0.01 within TargetScale)
     /// is bigger then 1:200 (given as 0.005 within TargetScale).
-    IfcPositiveRatioMeasure TargetScale();
-    void setTargetScale(IfcPositiveRatioMeasure v);
+    double TargetScale() const;
+    void setTargetScale(double v);
     /// Target view of the representation to which this representation context applies.
-    IfcGeometricProjectionEnum::IfcGeometricProjectionEnum TargetView();
+    IfcGeometricProjectionEnum::IfcGeometricProjectionEnum TargetView() const;
     void setTargetView(IfcGeometricProjectionEnum::IfcGeometricProjectionEnum v);
     /// Whether the optional attribute UserDefinedTargetView is defined for this IfcGeometricRepresentationSubContext
-    bool hasUserDefinedTargetView();
+    bool hasUserDefinedTargetView() const;
     /// User defined target view, this attribute value shall be given, if the TargetView attribute is set to USERDEFINED.
-    IfcLabel UserDefinedTargetView();
-    void setUserDefinedTargetView(IfcLabel v);
+    std::string UserDefinedTargetView() const;
+    void setUserDefinedTargetView(std::string v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 6: return IfcUtil::Argument_ENTITY; case 7: return IfcUtil::Argument_DOUBLE; case 8: return IfcUtil::Argument_ENUMERATION; case 9: return IfcUtil::Argument_STRING; } return IfcGeometricRepresentationContext::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 6: return Type::IfcGeometricRepresentationContext; case 7: return Type::IfcPositiveRatioMeasure; case 8: return Type::IfcGeometricProjectionEnum; case 9: return Type::IfcLabel; } return IfcGeometricRepresentationContext::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 6: return "ParentContext"; case 7: return "TargetScale"; case 8: return "TargetView"; case 9: return "UserDefinedTargetView"; } return IfcGeometricRepresentationContext::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcGeometricRepresentationSubContext (IfcAbstractEntityPtr e);
-    IfcGeometricRepresentationSubContext (boost::optional< IfcLabel > v1_ContextIdentifier, boost::optional< IfcLabel > v2_ContextType, IfcGeometricRepresentationContext* v7_ParentContext, boost::optional< IfcPositiveRatioMeasure > v8_TargetScale, IfcGeometricProjectionEnum::IfcGeometricProjectionEnum v9_TargetView, boost::optional< IfcLabel > v10_UserDefinedTargetView);
-    typedef IfcGeometricRepresentationSubContext* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcGeometricRepresentationSubContext > > list;
-    typedef IfcTemplatedEntityList< IfcGeometricRepresentationSubContext >::it it;
+    IfcGeometricRepresentationSubContext (IfcAbstractEntity* e);
+    IfcGeometricRepresentationSubContext (boost::optional< std::string > v1_ContextIdentifier, boost::optional< std::string > v2_ContextType, IfcGeometricRepresentationContext* v7_ParentContext, boost::optional< double > v8_TargetScale, IfcGeometricProjectionEnum::IfcGeometricProjectionEnum v9_TargetView, boost::optional< std::string > v10_UserDefinedTargetView);
+    typedef IfcTemplatedEntityList< IfcGeometricRepresentationSubContext > list;
 };
 /// Definition from ISO/CD 10303-42:1992: This entity is intended for the transfer of models when a topological structure is not available. 
 /// 
@@ -14333,20 +15430,19 @@ class IfcGeometricRepresentationSubContext : public IfcGeometricRepresentationCo
 class IfcGeometricSet : public IfcGeometricRepresentationItem {
 public:
     /// The geometric elements which make up the geometric set, these may be points, curves or surfaces; but are required to be of the same coordinate space dimensionality.
-    SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > Elements();
-    void setElements(SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > v);
+    IfcEntityList::ptr Elements() const;
+    void setElements(IfcEntityList::ptr v);
     virtual unsigned int getArgumentCount() const { return 1; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY_LIST; } return IfcGeometricRepresentationItem::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcGeometricSetSelect; } return IfcGeometricRepresentationItem::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Elements"; } return IfcGeometricRepresentationItem::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcGeometricSet (IfcAbstractEntityPtr e);
-    IfcGeometricSet (IfcEntities v1_Elements);
-    typedef IfcGeometricSet* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcGeometricSet > > list;
-    typedef IfcTemplatedEntityList< IfcGeometricSet >::it it;
+    IfcGeometricSet (IfcAbstractEntity* e);
+    IfcGeometricSet (IfcEntityList::ptr v1_Elements);
+    typedef IfcTemplatedEntityList< IfcGeometricSet > list;
 };
 /// IfcGridPlacement provides a specialization of IfcObjectPlacement in which
 /// the placement and axis direction of the object coordinate system is defined by a reference to the design grid as defined in IfcGrid.
@@ -14396,27 +15492,26 @@ class IfcGeometricSet : public IfcGeometricRepresentationItem {
 class IfcGridPlacement : public IfcObjectPlacement {
 public:
     /// Placement of the object coordinate system defined by the intersection of two grid axes.
-    IfcVirtualGridIntersection* PlacementLocation();
+    IfcVirtualGridIntersection* PlacementLocation() const;
     void setPlacementLocation(IfcVirtualGridIntersection* v);
     /// Whether the optional attribute PlacementRefDirection is defined for this IfcGridPlacement
-    bool hasPlacementRefDirection();
+    bool hasPlacementRefDirection() const;
     /// Reference to either an explicit direction, or a second grid axis intersection, which defines the orientation of the grid placement.
     /// 
     /// IFC2x4 CHANGE  The select of an explict direction has been added.
-    IfcGridPlacementDirectionSelect PlacementRefDirection();
-    void setPlacementRefDirection(IfcGridPlacementDirectionSelect v);
+    IfcGridPlacementDirectionSelect* PlacementRefDirection() const;
+    void setPlacementRefDirection(IfcGridPlacementDirectionSelect* v);
     virtual unsigned int getArgumentCount() const { return 2; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY; case 1: return IfcUtil::Argument_ENTITY; } return IfcObjectPlacement::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcVirtualGridIntersection; case 1: return Type::IfcGridPlacementDirectionSelect; } return IfcObjectPlacement::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "PlacementLocation"; case 1: return "PlacementRefDirection"; } return IfcObjectPlacement::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcGridPlacement (IfcAbstractEntityPtr e);
-    IfcGridPlacement (IfcVirtualGridIntersection* v1_PlacementLocation, boost::optional< IfcGridPlacementDirectionSelect > v2_PlacementRefDirection);
-    typedef IfcGridPlacement* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcGridPlacement > > list;
-    typedef IfcTemplatedEntityList< IfcGridPlacement >::it it;
+    IfcGridPlacement (IfcAbstractEntity* e);
+    IfcGridPlacement (IfcVirtualGridIntersection* v1_PlacementLocation, IfcGridPlacementDirectionSelect* v2_PlacementRefDirection);
+    typedef IfcTemplatedEntityList< IfcGridPlacement > list;
 };
 /// Definition from ISO/CD 10303-42:1992: A half space solid is defined by the half space which is the regular subset of the domain which lies on one side of an unbounded surface. The side of the surface which is in the half space is determined by the surface normal and the agreement flag. If the agreement flag is TRUE, then the subset is the one the normal points away from. If the agreement flag is FALSE, then the subset is the one the normal points into. For a valid half space solid the surface shall divide the domain into exactly two subsets. Also, within the domain the surface shall be manifold and all surface normals shall point into the same subset.  
 /// 
@@ -14436,23 +15531,22 @@ class IfcGridPlacement : public IfcObjectPlacement {
 class IfcHalfSpaceSolid : public IfcGeometricRepresentationItem {
 public:
     /// Surface defining side of half space.
-    IfcSurface* BaseSurface();
+    IfcSurface* BaseSurface() const;
     void setBaseSurface(IfcSurface* v);
     /// The agreement flag is TRUE if the normal to the BaseSurface points away from the material of the IfcHalfSpaceSolid. Otherwise it is FALSE.
-    bool AgreementFlag();
+    bool AgreementFlag() const;
     void setAgreementFlag(bool v);
     virtual unsigned int getArgumentCount() const { return 2; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY; case 1: return IfcUtil::Argument_BOOL; } return IfcGeometricRepresentationItem::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcSurface; case 1: return Type::UNDEFINED; } return IfcGeometricRepresentationItem::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "BaseSurface"; case 1: return "AgreementFlag"; } return IfcGeometricRepresentationItem::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcHalfSpaceSolid (IfcAbstractEntityPtr e);
+    IfcHalfSpaceSolid (IfcAbstractEntity* e);
     IfcHalfSpaceSolid (IfcSurface* v1_BaseSurface, bool v2_AgreementFlag);
-    typedef IfcHalfSpaceSolid* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcHalfSpaceSolid > > list;
-    typedef IfcTemplatedEntityList< IfcHalfSpaceSolid >::it it;
+    typedef IfcTemplatedEntityList< IfcHalfSpaceSolid > list;
 };
 /// An IfcImageTexture provides a 2-dimensional texture that can be applied to a surface of an geometric item and that provides lighting parameters of a surface onto which it is mapped. The texture is provided as an image file at an external location for which an URL is provided.
 /// 
@@ -14492,84 +15586,80 @@ class IfcHalfSpaceSolid : public IfcGeometricRepresentationItem {
 class IfcImageTexture : public IfcSurfaceTexture {
 public:
     /// Location, provided as an URI, at which the image texture is electronically published.
-    IfcURIReference URLReference();
-    void setURLReference(IfcURIReference v);
+    std::string URLReference() const;
+    void setURLReference(std::string v);
     virtual unsigned int getArgumentCount() const { return 6; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 5: return IfcUtil::Argument_STRING; } return IfcSurfaceTexture::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 5: return Type::IfcURIReference; } return IfcSurfaceTexture::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 5: return "URLReference"; } return IfcSurfaceTexture::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcImageTexture (IfcAbstractEntityPtr e);
-    IfcImageTexture (bool v1_RepeatS, bool v2_RepeatT, boost::optional< IfcIdentifier > v3_Mode, IfcCartesianTransformationOperator2D* v4_TextureTransform, boost::optional< std::vector< IfcIdentifier > /*[1:?]*/ > v5_Parameter, IfcURIReference v6_URLReference);
-    typedef IfcImageTexture* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcImageTexture > > list;
-    typedef IfcTemplatedEntityList< IfcImageTexture >::it it;
+    IfcImageTexture (IfcAbstractEntity* e);
+    IfcImageTexture (bool v1_RepeatS, bool v2_RepeatT, boost::optional< std::string > v3_Mode, IfcCartesianTransformationOperator2D* v4_TextureTransform, boost::optional< std::vector< std::string > /*[1:?]*/ > v5_Parameter, std::string v6_URLReference);
+    typedef IfcTemplatedEntityList< IfcImageTexture > list;
 };
 
 class IfcIndexedColourMap : public IfcPresentationItem {
 public:
-    IfcTessellatedFaceSet* MappedTo();
+    IfcTessellatedFaceSet* MappedTo() const;
     void setMappedTo(IfcTessellatedFaceSet* v);
     /// Whether the optional attribute Overrides is defined for this IfcIndexedColourMap
-    bool hasOverrides();
-    IfcSurfaceStyleShading* Overrides();
+    bool hasOverrides() const;
+    IfcSurfaceStyleShading* Overrides() const;
     void setOverrides(IfcSurfaceStyleShading* v);
-    IfcColourRgbList* Colours();
+    IfcColourRgbList* Colours() const;
     void setColours(IfcColourRgbList* v);
-    std::vector< int > /*[1:?]*/ ColourIndex();
+    std::vector< int > /*[1:?]*/ ColourIndex() const;
     void setColourIndex(std::vector< int > /*[1:?]*/ v);
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY; case 1: return IfcUtil::Argument_ENTITY; case 2: return IfcUtil::Argument_ENTITY; case 3: return IfcUtil::Argument_VECTOR_INT; } return IfcPresentationItem::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcTessellatedFaceSet; case 1: return Type::IfcSurfaceStyleShading; case 2: return Type::IfcColourRgbList; case 3: return Type::UNDEFINED; } return IfcPresentationItem::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "MappedTo"; case 1: return "Overrides"; case 2: return "Colours"; case 3: return "ColourIndex"; } return IfcPresentationItem::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcIndexedColourMap (IfcAbstractEntityPtr e);
+    IfcIndexedColourMap (IfcAbstractEntity* e);
     IfcIndexedColourMap (IfcTessellatedFaceSet* v1_MappedTo, IfcSurfaceStyleShading* v2_Overrides, IfcColourRgbList* v3_Colours, std::vector< int > /*[1:?]*/ v4_ColourIndex);
-    typedef IfcIndexedColourMap* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcIndexedColourMap > > list;
-    typedef IfcTemplatedEntityList< IfcIndexedColourMap >::it it;
+    typedef IfcTemplatedEntityList< IfcIndexedColourMap > list;
 };
 
 class IfcIndexedTextureMap : public IfcTextureCoordinate {
 public:
-    IfcTessellatedFaceSet* MappedTo();
+    IfcTessellatedFaceSet* MappedTo() const;
     void setMappedTo(IfcTessellatedFaceSet* v);
-    IfcTextureVertexList* TexCoords();
+    IfcTextureVertexList* TexCoords() const;
     void setTexCoords(IfcTextureVertexList* v);
     virtual unsigned int getArgumentCount() const { return 3; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 1: return IfcUtil::Argument_ENTITY; case 2: return IfcUtil::Argument_ENTITY; } return IfcTextureCoordinate::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 1: return Type::IfcTessellatedFaceSet; case 2: return Type::IfcTextureVertexList; } return IfcTextureCoordinate::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 1: return "MappedTo"; case 2: return "TexCoords"; } return IfcTextureCoordinate::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcIndexedTextureMap (IfcAbstractEntityPtr e);
-    IfcIndexedTextureMap (SHARED_PTR< IfcTemplatedEntityList< IfcSurfaceTexture > > v1_Maps, IfcTessellatedFaceSet* v2_MappedTo, IfcTextureVertexList* v3_TexCoords);
-    typedef IfcIndexedTextureMap* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcIndexedTextureMap > > list;
-    typedef IfcTemplatedEntityList< IfcIndexedTextureMap >::it it;
+    IfcIndexedTextureMap (IfcAbstractEntity* e);
+    IfcIndexedTextureMap (IfcTemplatedEntityList< IfcSurfaceTexture >::ptr v1_Maps, IfcTessellatedFaceSet* v2_MappedTo, IfcTextureVertexList* v3_TexCoords);
+    typedef IfcTemplatedEntityList< IfcIndexedTextureMap > list;
 };
 
 class IfcIndexedTriangleTextureMap : public IfcIndexedTextureMap {
 public:
     /// Whether the optional attribute TexCoordIndex is defined for this IfcIndexedTriangleTextureMap
-    bool hasTexCoordIndex();
+    bool hasTexCoordIndex() const;
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 3: return IfcUtil::Argument_UNKNOWN; } return IfcIndexedTextureMap::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 3: return Type::UNDEFINED; } return IfcIndexedTextureMap::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 3: return "TexCoordIndex"; } return IfcIndexedTextureMap::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcIndexedTriangleTextureMap (IfcAbstractEntityPtr e);
-    IfcIndexedTriangleTextureMap (SHARED_PTR< IfcTemplatedEntityList< IfcSurfaceTexture > > v1_Maps, IfcTessellatedFaceSet* v2_MappedTo, IfcTextureVertexList* v3_TexCoords);
-    typedef IfcIndexedTriangleTextureMap* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcIndexedTriangleTextureMap > > list;
-    typedef IfcTemplatedEntityList< IfcIndexedTriangleTextureMap >::it it;
+    IfcIndexedTriangleTextureMap (IfcAbstractEntity* e);
+    IfcIndexedTriangleTextureMap (IfcTemplatedEntityList< IfcSurfaceTexture >::ptr v1_Maps, IfcTessellatedFaceSet* v2_MappedTo, IfcTextureVertexList* v3_TexCoords);
+    typedef IfcTemplatedEntityList< IfcIndexedTriangleTextureMap > list;
 };
 /// In an irregular time series, unpredictable bursts of data arrive at unspecified points in time, or most time stamps cannot be characterized by a repeating pattern.
 /// 
@@ -14579,20 +15669,19 @@ class IfcIndexedTriangleTextureMap : public IfcIndexedTextureMap {
 class IfcIrregularTimeSeries : public IfcTimeSeries {
 public:
     /// The collection of time series values.
-    SHARED_PTR< IfcTemplatedEntityList< IfcIrregularTimeSeriesValue > > Values();
-    void setValues(SHARED_PTR< IfcTemplatedEntityList< IfcIrregularTimeSeriesValue > > v);
+    IfcTemplatedEntityList< IfcIrregularTimeSeriesValue >::ptr Values() const;
+    void setValues(IfcTemplatedEntityList< IfcIrregularTimeSeriesValue >::ptr v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_ENTITY_LIST; } return IfcTimeSeries::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcIrregularTimeSeriesValue; } return IfcTimeSeries::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "Values"; } return IfcTimeSeries::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcIrregularTimeSeries (IfcAbstractEntityPtr e);
-    IfcIrregularTimeSeries (IfcLabel v1_Name, boost::optional< IfcText > v2_Description, IfcDateTime v3_StartTime, IfcDateTime v4_EndTime, IfcTimeSeriesDataTypeEnum::IfcTimeSeriesDataTypeEnum v5_TimeSeriesDataType, IfcDataOriginEnum::IfcDataOriginEnum v6_DataOrigin, boost::optional< IfcLabel > v7_UserDefinedDataOrigin, boost::optional< IfcUnit > v8_Unit, SHARED_PTR< IfcTemplatedEntityList< IfcIrregularTimeSeriesValue > > v9_Values);
-    typedef IfcIrregularTimeSeries* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcIrregularTimeSeries > > list;
-    typedef IfcTemplatedEntityList< IfcIrregularTimeSeries >::it it;
+    IfcIrregularTimeSeries (IfcAbstractEntity* e);
+    IfcIrregularTimeSeries (std::string v1_Name, boost::optional< std::string > v2_Description, std::string v3_StartTime, std::string v4_EndTime, IfcTimeSeriesDataTypeEnum::IfcTimeSeriesDataTypeEnum v5_TimeSeriesDataType, IfcDataOriginEnum::IfcDataOriginEnum v6_DataOrigin, boost::optional< std::string > v7_UserDefinedDataOrigin, IfcUnit* v8_Unit, IfcTemplatedEntityList< IfcIrregularTimeSeriesValue >::ptr v9_Values);
+    typedef IfcTemplatedEntityList< IfcIrregularTimeSeries > list;
 };
 /// IfcLagTime describes the time parameters that may exist within a sequence relationship between two processes.
 /// 
@@ -14635,24 +15724,23 @@ class IfcLagTime : public IfcSchedulingTime {
 public:
     /// Value of the time lag selected as being either a ratio or a
     ///   time measure.
-    IfcTimeOrRatioSelect LagValue();
-    void setLagValue(IfcTimeOrRatioSelect v);
+    IfcTimeOrRatioSelect* LagValue() const;
+    void setLagValue(IfcTimeOrRatioSelect* v);
     /// The allowed types of task duration that specify the lag time
     ///   measurement (work time or elapsed time).
-    IfcTaskDurationEnum::IfcTaskDurationEnum DurationType();
+    IfcTaskDurationEnum::IfcTaskDurationEnum DurationType() const;
     void setDurationType(IfcTaskDurationEnum::IfcTaskDurationEnum v);
     virtual unsigned int getArgumentCount() const { return 5; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 3: return IfcUtil::Argument_ENTITY; case 4: return IfcUtil::Argument_ENUMERATION; } return IfcSchedulingTime::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 3: return Type::IfcTimeOrRatioSelect; case 4: return Type::IfcTaskDurationEnum; } return IfcSchedulingTime::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 3: return "LagValue"; case 4: return "DurationType"; } return IfcSchedulingTime::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcLagTime (IfcAbstractEntityPtr e);
-    IfcLagTime (boost::optional< IfcLabel > v1_Name, boost::optional< IfcDataOriginEnum::IfcDataOriginEnum > v2_DataOrigin, boost::optional< IfcLabel > v3_UserDefinedDataOrigin, IfcTimeOrRatioSelect v4_LagValue, IfcTaskDurationEnum::IfcTaskDurationEnum v5_DurationType);
-    typedef IfcLagTime* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcLagTime > > list;
-    typedef IfcTemplatedEntityList< IfcLagTime >::it it;
+    IfcLagTime (IfcAbstractEntity* e);
+    IfcLagTime (boost::optional< std::string > v1_Name, boost::optional< IfcDataOriginEnum::IfcDataOriginEnum > v2_DataOrigin, boost::optional< std::string > v3_UserDefinedDataOrigin, IfcTimeOrRatioSelect* v4_LagValue, IfcTaskDurationEnum::IfcTaskDurationEnum v5_DurationType);
+    typedef IfcTemplatedEntityList< IfcLagTime > list;
 };
 /// Definition from ISO/CD 10303-46:1992: The light source entity is determined by the reflectance specified in the surface style rendering. Lighting is applied on a surface by surface basis: no interactions between surfaces such as shadows or reflections are defined. 
 /// 
@@ -14664,36 +15752,35 @@ class IfcLagTime : public IfcSchedulingTime {
 class IfcLightSource : public IfcGeometricRepresentationItem {
 public:
     /// Whether the optional attribute Name is defined for this IfcLightSource
-    bool hasName();
+    bool hasName() const;
     /// The name given to the light source in presentation.
-    IfcLabel Name();
-    void setName(IfcLabel v);
+    std::string Name() const;
+    void setName(std::string v);
     /// Definition from ISO/CD 10303-46:1992: Based on the current lighting model, the colour of the light to be used for shading.
     /// Definition from VRML97 - ISO/IEC 14772-1:1997: The color field specifies the spectral color properties of both the direct and ambient light emission as an RGB value.
-    IfcColourRgb* LightColour();
+    IfcColourRgb* LightColour() const;
     void setLightColour(IfcColourRgb* v);
     /// Whether the optional attribute AmbientIntensity is defined for this IfcLightSource
-    bool hasAmbientIntensity();
+    bool hasAmbientIntensity() const;
     /// Definition from VRML97 - ISO/IEC 14772-1:1997: The ambientIntensity specifies the intensity of the ambient emission from the light. Light intensity may range from 0.0 (no light emission) to 1.0 (full intensity).
-    IfcNormalisedRatioMeasure AmbientIntensity();
-    void setAmbientIntensity(IfcNormalisedRatioMeasure v);
+    double AmbientIntensity() const;
+    void setAmbientIntensity(double v);
     /// Whether the optional attribute Intensity is defined for this IfcLightSource
-    bool hasIntensity();
+    bool hasIntensity() const;
     /// Definition from VRML97 - ISO/IEC 14772-1:1997: The intensity field specifies the brightness of the direct emission from the ligth. Light intensity may range from 0.0 (no light emission) to 1.0 (full intensity).
-    IfcNormalisedRatioMeasure Intensity();
-    void setIntensity(IfcNormalisedRatioMeasure v);
+    double Intensity() const;
+    void setIntensity(double v);
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_STRING; case 1: return IfcUtil::Argument_ENTITY; case 2: return IfcUtil::Argument_DOUBLE; case 3: return IfcUtil::Argument_DOUBLE; } return IfcGeometricRepresentationItem::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcLabel; case 1: return Type::IfcColourRgb; case 2: return Type::IfcNormalisedRatioMeasure; case 3: return Type::IfcNormalisedRatioMeasure; } return IfcGeometricRepresentationItem::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Name"; case 1: return "LightColour"; case 2: return "AmbientIntensity"; case 3: return "Intensity"; } return IfcGeometricRepresentationItem::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcLightSource (IfcAbstractEntityPtr e);
-    IfcLightSource (boost::optional< IfcLabel > v1_Name, IfcColourRgb* v2_LightColour, boost::optional< IfcNormalisedRatioMeasure > v3_AmbientIntensity, boost::optional< IfcNormalisedRatioMeasure > v4_Intensity);
-    typedef IfcLightSource* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcLightSource > > list;
-    typedef IfcTemplatedEntityList< IfcLightSource >::it it;
+    IfcLightSource (IfcAbstractEntity* e);
+    IfcLightSource (boost::optional< std::string > v1_Name, IfcColourRgb* v2_LightColour, boost::optional< double > v3_AmbientIntensity, boost::optional< double > v4_Intensity);
+    typedef IfcTemplatedEntityList< IfcLightSource > list;
 };
 /// Definition from ISO/CD 10303-46:1992: The light source ambient entity is a subtype of light source. It lights a surface independent of the surface's orientation and position. 
 /// 
@@ -14706,16 +15793,15 @@ class IfcLightSourceAmbient : public IfcLightSource {
 public:
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcLightSource::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcLightSource::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcLightSource::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcLightSourceAmbient (IfcAbstractEntityPtr e);
-    IfcLightSourceAmbient (boost::optional< IfcLabel > v1_Name, IfcColourRgb* v2_LightColour, boost::optional< IfcNormalisedRatioMeasure > v3_AmbientIntensity, boost::optional< IfcNormalisedRatioMeasure > v4_Intensity);
-    typedef IfcLightSourceAmbient* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcLightSourceAmbient > > list;
-    typedef IfcTemplatedEntityList< IfcLightSourceAmbient >::it it;
+    IfcLightSourceAmbient (IfcAbstractEntity* e);
+    IfcLightSourceAmbient (boost::optional< std::string > v1_Name, IfcColourRgb* v2_LightColour, boost::optional< double > v3_AmbientIntensity, boost::optional< double > v4_Intensity);
+    typedef IfcTemplatedEntityList< IfcLightSourceAmbient > list;
 };
 /// Definition from ISO/CD 10303-46:1992: The light source directional is a subtype of light source. This entity has a light source direction. With a conceptual origin at infinity, all the rays of the light are parallel to this direction. This kind of light source lights a surface based on the surface's orientation, but not position. 
 /// 
@@ -14730,20 +15816,19 @@ class IfcLightSourceDirectional : public IfcLightSource {
 public:
     /// Definition from ISO/CD 10303-46:1992: This direction is the direction of the light source.
     /// Definition from VRML97 - ISO/IEC 14772-1:1997: The direction field specifies the direction vector of the illumination emanating from the light source in the local coordinate system. Light is emitted along parallel rays from an infinite distance away.
-    IfcDirection* Orientation();
+    IfcDirection* Orientation() const;
     void setOrientation(IfcDirection* v);
     virtual unsigned int getArgumentCount() const { return 5; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 4: return IfcUtil::Argument_ENTITY; } return IfcLightSource::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 4: return Type::IfcDirection; } return IfcLightSource::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 4: return "Orientation"; } return IfcLightSource::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcLightSourceDirectional (IfcAbstractEntityPtr e);
-    IfcLightSourceDirectional (boost::optional< IfcLabel > v1_Name, IfcColourRgb* v2_LightColour, boost::optional< IfcNormalisedRatioMeasure > v3_AmbientIntensity, boost::optional< IfcNormalisedRatioMeasure > v4_Intensity, IfcDirection* v5_Orientation);
-    typedef IfcLightSourceDirectional* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcLightSourceDirectional > > list;
-    typedef IfcTemplatedEntityList< IfcLightSourceDirectional >::it it;
+    IfcLightSourceDirectional (IfcAbstractEntity* e);
+    IfcLightSourceDirectional (boost::optional< std::string > v1_Name, IfcColourRgb* v2_LightColour, boost::optional< double > v3_AmbientIntensity, boost::optional< double > v4_Intensity, IfcDirection* v5_Orientation);
+    typedef IfcTemplatedEntityList< IfcLightSourceDirectional > list;
 };
 /// IfcLightSourceGoniometric defines a light source for which exact lighting data is available. It specifies the type of a light emitter, defines the position and orientation of a light distribution curve and the data concerning lamp and photometric information. 
 /// 
@@ -14755,37 +15840,36 @@ class IfcLightSourceDirectional : public IfcLightSource {
 class IfcLightSourceGoniometric : public IfcLightSource {
 public:
     /// The position of the light source. It is used to orientate the light distribution curves.
-    IfcAxis2Placement3D* Position();
+    IfcAxis2Placement3D* Position() const;
     void setPosition(IfcAxis2Placement3D* v);
     /// Whether the optional attribute ColourAppearance is defined for this IfcLightSourceGoniometric
-    bool hasColourAppearance();
+    bool hasColourAppearance() const;
     /// Artificial light sources are classified in terms of their color appearance. To the human eye they all appear to be white; the difference can only be detected by direct comparison. Visual performance is not directly affected by differences in color appearance.
-    IfcColourRgb* ColourAppearance();
+    IfcColourRgb* ColourAppearance() const;
     void setColourAppearance(IfcColourRgb* v);
     /// The color temperature of any source of radiation is defined as the temperature (in Kelvin) of a black-body or Planckian radiator whose radiation has the same chromaticity as the source of radiation. Often the values are only approximate color temperatures as the black-body radiator cannot emit radiation of every chromaticity value. The color temperatures of the commonest artificial light sources range from less than 3000K (warm white) to 4000K (intermediate) and over 5000K (daylight).
-    IfcThermodynamicTemperatureMeasure ColourTemperature();
-    void setColourTemperature(IfcThermodynamicTemperatureMeasure v);
+    double ColourTemperature() const;
+    void setColourTemperature(double v);
     /// Luminous flux is a photometric measure of radiant flux, i.e. the volume of light emitted from a light source. Luminous flux is measured either for the interior as a whole or for a part of the interior (partial luminous flux for a solid angle). All other photometric parameters are derivatives of luminous flux. Luminous flux is measured in lumens (lm). The luminous flux is given as a nominal value for each lamp.
-    IfcLuminousFluxMeasure LuminousFlux();
-    void setLuminousFlux(IfcLuminousFluxMeasure v);
+    double LuminousFlux() const;
+    void setLuminousFlux(double v);
     /// Identifies the types of light emitter from which the type required may be set.
-    IfcLightEmissionSourceEnum::IfcLightEmissionSourceEnum LightEmissionSource();
+    IfcLightEmissionSourceEnum::IfcLightEmissionSourceEnum LightEmissionSource() const;
     void setLightEmissionSource(IfcLightEmissionSourceEnum::IfcLightEmissionSourceEnum v);
     /// The data source from which light distribution data is obtained.
-    IfcLightDistributionDataSourceSelect LightDistributionDataSource();
-    void setLightDistributionDataSource(IfcLightDistributionDataSourceSelect v);
+    IfcLightDistributionDataSourceSelect* LightDistributionDataSource() const;
+    void setLightDistributionDataSource(IfcLightDistributionDataSourceSelect* v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 4: return IfcUtil::Argument_ENTITY; case 5: return IfcUtil::Argument_ENTITY; case 6: return IfcUtil::Argument_DOUBLE; case 7: return IfcUtil::Argument_DOUBLE; case 8: return IfcUtil::Argument_ENUMERATION; case 9: return IfcUtil::Argument_ENTITY; } return IfcLightSource::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 4: return Type::IfcAxis2Placement3D; case 5: return Type::IfcColourRgb; case 6: return Type::IfcThermodynamicTemperatureMeasure; case 7: return Type::IfcLuminousFluxMeasure; case 8: return Type::IfcLightEmissionSourceEnum; case 9: return Type::IfcLightDistributionDataSourceSelect; } return IfcLightSource::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 4: return "Position"; case 5: return "ColourAppearance"; case 6: return "ColourTemperature"; case 7: return "LuminousFlux"; case 8: return "LightEmissionSource"; case 9: return "LightDistributionDataSource"; } return IfcLightSource::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcLightSourceGoniometric (IfcAbstractEntityPtr e);
-    IfcLightSourceGoniometric (boost::optional< IfcLabel > v1_Name, IfcColourRgb* v2_LightColour, boost::optional< IfcNormalisedRatioMeasure > v3_AmbientIntensity, boost::optional< IfcNormalisedRatioMeasure > v4_Intensity, IfcAxis2Placement3D* v5_Position, IfcColourRgb* v6_ColourAppearance, IfcThermodynamicTemperatureMeasure v7_ColourTemperature, IfcLuminousFluxMeasure v8_LuminousFlux, IfcLightEmissionSourceEnum::IfcLightEmissionSourceEnum v9_LightEmissionSource, IfcLightDistributionDataSourceSelect v10_LightDistributionDataSource);
-    typedef IfcLightSourceGoniometric* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcLightSourceGoniometric > > list;
-    typedef IfcTemplatedEntityList< IfcLightSourceGoniometric >::it it;
+    IfcLightSourceGoniometric (IfcAbstractEntity* e);
+    IfcLightSourceGoniometric (boost::optional< std::string > v1_Name, IfcColourRgb* v2_LightColour, boost::optional< double > v3_AmbientIntensity, boost::optional< double > v4_Intensity, IfcAxis2Placement3D* v5_Position, IfcColourRgb* v6_ColourAppearance, double v7_ColourTemperature, double v8_LuminousFlux, IfcLightEmissionSourceEnum::IfcLightEmissionSourceEnum v9_LightEmissionSource, IfcLightDistributionDataSourceSelect* v10_LightDistributionDataSource);
+    typedef IfcTemplatedEntityList< IfcLightSourceGoniometric > list;
 };
 /// Definition from ISO/CD 10303-46:1992: The light source positional entity is a subtype of light source. This entity has a light source position and attenuation coefficients. A positional light source affects a surface based on the surface's orientation and position. 
 /// 
@@ -14806,33 +15890,32 @@ class IfcLightSourcePositional : public IfcLightSource {
 public:
     /// Definition from ISO/CD 10303-46:1992: The Cartesian point indicates the position of the light source.
     /// Definition from VRML97 - ISO/IEC 14772-1:1997: A Point light node illuminates geometry within radius of its location.
-    IfcCartesianPoint* Position();
+    IfcCartesianPoint* Position() const;
     void setPosition(IfcCartesianPoint* v);
     /// Definition from IAI: The maximum distance from the light source for a surface still to be illuminated.
     /// Definition from VRML97 - ISO/IEC 14772-1:1997: A Point light node illuminates geometry within radius of its location.
-    IfcPositiveLengthMeasure Radius();
-    void setRadius(IfcPositiveLengthMeasure v);
+    double Radius() const;
+    void setRadius(double v);
     /// Definition from ISO/CD 10303-46:1992: This real indicates the value of the attenuation in the lighting equation that is constant.
-    IfcReal ConstantAttenuation();
-    void setConstantAttenuation(IfcReal v);
+    double ConstantAttenuation() const;
+    void setConstantAttenuation(double v);
     /// Definition from ISO/CD 10303-46:1992: This real indicates the value of the attenuation in the lighting equation that proportional to the distance from the light source.
-    IfcReal DistanceAttenuation();
-    void setDistanceAttenuation(IfcReal v);
+    double DistanceAttenuation() const;
+    void setDistanceAttenuation(double v);
     /// Definition from the IAI: This real indicates the value of the attenuation in the lighting equation that proportional to the square value of the distance from the light source.
-    IfcReal QuadricAttenuation();
-    void setQuadricAttenuation(IfcReal v);
+    double QuadricAttenuation() const;
+    void setQuadricAttenuation(double v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 4: return IfcUtil::Argument_ENTITY; case 5: return IfcUtil::Argument_DOUBLE; case 6: return IfcUtil::Argument_DOUBLE; case 7: return IfcUtil::Argument_DOUBLE; case 8: return IfcUtil::Argument_DOUBLE; } return IfcLightSource::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 4: return Type::IfcCartesianPoint; case 5: return Type::IfcPositiveLengthMeasure; case 6: return Type::IfcReal; case 7: return Type::IfcReal; case 8: return Type::IfcReal; } return IfcLightSource::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 4: return "Position"; case 5: return "Radius"; case 6: return "ConstantAttenuation"; case 7: return "DistanceAttenuation"; case 8: return "QuadricAttenuation"; } return IfcLightSource::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcLightSourcePositional (IfcAbstractEntityPtr e);
-    IfcLightSourcePositional (boost::optional< IfcLabel > v1_Name, IfcColourRgb* v2_LightColour, boost::optional< IfcNormalisedRatioMeasure > v3_AmbientIntensity, boost::optional< IfcNormalisedRatioMeasure > v4_Intensity, IfcCartesianPoint* v5_Position, IfcPositiveLengthMeasure v6_Radius, IfcReal v7_ConstantAttenuation, IfcReal v8_DistanceAttenuation, IfcReal v9_QuadricAttenuation);
-    typedef IfcLightSourcePositional* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcLightSourcePositional > > list;
-    typedef IfcTemplatedEntityList< IfcLightSourcePositional >::it it;
+    IfcLightSourcePositional (IfcAbstractEntity* e);
+    IfcLightSourcePositional (boost::optional< std::string > v1_Name, IfcColourRgb* v2_LightColour, boost::optional< double > v3_AmbientIntensity, boost::optional< double > v4_Intensity, IfcCartesianPoint* v5_Position, double v6_Radius, double v7_ConstantAttenuation, double v8_DistanceAttenuation, double v9_QuadricAttenuation);
+    typedef IfcTemplatedEntityList< IfcLightSourcePositional > list;
 };
 /// Definition from ISO/CD 10303-46:1992: The light source spot entity is a subtype of light source. Spot light source entities have a light source colour, position, direction, attenuation coefficients, concentration exponent, and spread angle. If a point lies outside the cone of influence of a light source of this type as determined by the light source position, direction and spread angle its colour is not affected by that light source. 
 /// 
@@ -14853,33 +15936,32 @@ class IfcLightSourceSpot : public IfcLightSourcePositional {
 public:
     /// Definition from ISO/CD 10303-46:1992: This is the direction of the axis of the cone of the light source specified in the coordinate space of the representation being projected..
     /// Definition from VRML97 - ISO/IEC 14772-1:1997: The direction field specifies the direction vector of the light's central axis defined in the local coordinate system.
-    IfcDirection* Orientation();
+    IfcDirection* Orientation() const;
     void setOrientation(IfcDirection* v);
     /// Whether the optional attribute ConcentrationExponent is defined for this IfcLightSourceSpot
-    bool hasConcentrationExponent();
+    bool hasConcentrationExponent() const;
     /// Definition from ISO/CD 10303-46:1992: This real is the exponent on the cosine of the angle between the line that starts at the position of the spot light source and is in the direction of the orientation of the spot light source and a line that starts at the position of the spot light source and goes through a point on the surface being shaded.
     /// NOTE: This attribute does not exists in ISO/IEC 14772-1:1997.
-    IfcReal ConcentrationExponent();
-    void setConcentrationExponent(IfcReal v);
+    double ConcentrationExponent() const;
+    void setConcentrationExponent(double v);
     /// Definition from ISO/CD 10303-46:1992: This planar angle measure is the angle between the line that starts at the position of the spot light source and is in the direction of the spot light source and any line on the boundary of the cone of influence.
     /// Definition from VRML97 - ISO/IEC 14772-1:1997: The cutOffAngle (name of spread angle in VRML) field specifies the outer bound of the solid angle. The light source does not emit light outside of this solid angle.
-    IfcPositivePlaneAngleMeasure SpreadAngle();
-    void setSpreadAngle(IfcPositivePlaneAngleMeasure v);
+    double SpreadAngle() const;
+    void setSpreadAngle(double v);
     /// Definition from VRML97 - ISO/IEC 14772-1:1997: The beamWidth field specifies an inner solid angle in which the light source emits light at uniform full intensity. The light source's emission intensity drops off from the inner solid angle (beamWidthAngle) to the outer solid angle (spreadAngle).
-    IfcPositivePlaneAngleMeasure BeamWidthAngle();
-    void setBeamWidthAngle(IfcPositivePlaneAngleMeasure v);
+    double BeamWidthAngle() const;
+    void setBeamWidthAngle(double v);
     virtual unsigned int getArgumentCount() const { return 13; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENTITY; case 10: return IfcUtil::Argument_DOUBLE; case 11: return IfcUtil::Argument_DOUBLE; case 12: return IfcUtil::Argument_DOUBLE; } return IfcLightSourcePositional::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcDirection; case 10: return Type::IfcReal; case 11: return Type::IfcPositivePlaneAngleMeasure; case 12: return Type::IfcPositivePlaneAngleMeasure; } return IfcLightSourcePositional::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "Orientation"; case 10: return "ConcentrationExponent"; case 11: return "SpreadAngle"; case 12: return "BeamWidthAngle"; } return IfcLightSourcePositional::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcLightSourceSpot (IfcAbstractEntityPtr e);
-    IfcLightSourceSpot (boost::optional< IfcLabel > v1_Name, IfcColourRgb* v2_LightColour, boost::optional< IfcNormalisedRatioMeasure > v3_AmbientIntensity, boost::optional< IfcNormalisedRatioMeasure > v4_Intensity, IfcCartesianPoint* v5_Position, IfcPositiveLengthMeasure v6_Radius, IfcReal v7_ConstantAttenuation, IfcReal v8_DistanceAttenuation, IfcReal v9_QuadricAttenuation, IfcDirection* v10_Orientation, boost::optional< IfcReal > v11_ConcentrationExponent, IfcPositivePlaneAngleMeasure v12_SpreadAngle, IfcPositivePlaneAngleMeasure v13_BeamWidthAngle);
-    typedef IfcLightSourceSpot* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcLightSourceSpot > > list;
-    typedef IfcTemplatedEntityList< IfcLightSourceSpot >::it it;
+    IfcLightSourceSpot (IfcAbstractEntity* e);
+    IfcLightSourceSpot (boost::optional< std::string > v1_Name, IfcColourRgb* v2_LightColour, boost::optional< double > v3_AmbientIntensity, boost::optional< double > v4_Intensity, IfcCartesianPoint* v5_Position, double v6_Radius, double v7_ConstantAttenuation, double v8_DistanceAttenuation, double v9_QuadricAttenuation, IfcDirection* v10_Orientation, boost::optional< double > v11_ConcentrationExponent, double v12_SpreadAngle, double v13_BeamWidthAngle);
+    typedef IfcTemplatedEntityList< IfcLightSourceSpot > list;
 };
 /// IfcLocalPlacement defines the relative placement of a product in relation to the
 /// placement of another product or the absolute placement of a product within the geometric representation context of the project. 
@@ -14936,25 +16018,24 @@ class IfcLightSourceSpot : public IfcLightSourcePositional {
 class IfcLocalPlacement : public IfcObjectPlacement {
 public:
     /// Whether the optional attribute PlacementRelTo is defined for this IfcLocalPlacement
-    bool hasPlacementRelTo();
+    bool hasPlacementRelTo() const;
     /// Reference to Object that provides the relative placement by its local coordinate system. If it is omitted, then the local placement is given to the WCS, established by the geometric representation context.
-    IfcObjectPlacement* PlacementRelTo();
+    IfcObjectPlacement* PlacementRelTo() const;
     void setPlacementRelTo(IfcObjectPlacement* v);
     /// Geometric placement that defines the transformation from the related coordinate system into the relating. The placement can be either 2D or 3D, depending on the dimension count of the coordinate system.
-    IfcAxis2Placement RelativePlacement();
-    void setRelativePlacement(IfcAxis2Placement v);
+    IfcAxis2Placement* RelativePlacement() const;
+    void setRelativePlacement(IfcAxis2Placement* v);
     virtual unsigned int getArgumentCount() const { return 2; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY; case 1: return IfcUtil::Argument_ENTITY; } return IfcObjectPlacement::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcObjectPlacement; case 1: return Type::IfcAxis2Placement; } return IfcObjectPlacement::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "PlacementRelTo"; case 1: return "RelativePlacement"; } return IfcObjectPlacement::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcLocalPlacement (IfcAbstractEntityPtr e);
-    IfcLocalPlacement (IfcObjectPlacement* v1_PlacementRelTo, IfcAxis2Placement v2_RelativePlacement);
-    typedef IfcLocalPlacement* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcLocalPlacement > > list;
-    typedef IfcTemplatedEntityList< IfcLocalPlacement >::it it;
+    IfcLocalPlacement (IfcAbstractEntity* e);
+    IfcLocalPlacement (IfcObjectPlacement* v1_PlacementRelTo, IfcAxis2Placement* v2_RelativePlacement);
+    typedef IfcTemplatedEntityList< IfcLocalPlacement > list;
 };
 /// Definition from ISO/CD 10303-42:1992: A loop is a topological
 ///   entity constructed from a single vertex, or by stringing together connected
@@ -14986,16 +16067,15 @@ class IfcLoop : public IfcTopologicalRepresentationItem {
 public:
     virtual unsigned int getArgumentCount() const { return 0; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcTopologicalRepresentationItem::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcTopologicalRepresentationItem::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcTopologicalRepresentationItem::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcLoop (IfcAbstractEntityPtr e);
+    IfcLoop (IfcAbstractEntity* e);
     IfcLoop ();
-    typedef IfcLoop* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcLoop > > list;
-    typedef IfcTemplatedEntityList< IfcLoop >::it it;
+    typedef IfcTemplatedEntityList< IfcLoop > list;
 };
 /// Definition from ISO/CD 10303-43:1992: A mapped item is the use of an existing representation (the mapping source - mapped representation) as a representation item in a second representation. 
 /// 
@@ -15019,23 +16099,22 @@ class IfcLoop : public IfcTopologicalRepresentationItem {
 class IfcMappedItem : public IfcRepresentationItem {
 public:
     /// A representation map that is the source of the mapped item. It can be seen as a block (or cell or marco) definition.
-    IfcRepresentationMap* MappingSource();
+    IfcRepresentationMap* MappingSource() const;
     void setMappingSource(IfcRepresentationMap* v);
     /// A representation item that is the target onto which the mapping source is mapped. It is constraint to be a Cartesian transformation operator.
-    IfcCartesianTransformationOperator* MappingTarget();
+    IfcCartesianTransformationOperator* MappingTarget() const;
     void setMappingTarget(IfcCartesianTransformationOperator* v);
     virtual unsigned int getArgumentCount() const { return 2; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY; case 1: return IfcUtil::Argument_ENTITY; } return IfcRepresentationItem::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcRepresentationMap; case 1: return Type::IfcCartesianTransformationOperator; } return IfcRepresentationItem::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "MappingSource"; case 1: return "MappingTarget"; } return IfcRepresentationItem::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcMappedItem (IfcAbstractEntityPtr e);
+    IfcMappedItem (IfcAbstractEntity* e);
     IfcMappedItem (IfcRepresentationMap* v1_MappingSource, IfcCartesianTransformationOperator* v2_MappingTarget);
-    typedef IfcMappedItem* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcMappedItem > > list;
-    typedef IfcTemplatedEntityList< IfcMappedItem >::it it;
+    typedef IfcTemplatedEntityList< IfcMappedItem > list;
 };
 /// IfcMaterial is a homogeneous or inhomogeneous
 /// substance that can be used to form elements (physical products or
@@ -15071,39 +16150,38 @@ class IfcMaterial : public IfcMaterialDefinition {
     /// EXAMPLE A view definition may require Material.Name to uniquely specify e.g. concrete or steel grade, in which case the attribute Material.Category could take the value 'Concrete' or 'Steel'. 
     /// 
     /// NOTE Material grade may have diffenrent meaning in different view definitions, e.g. strength grade for structural design and analysis, or visible appearance grade in architectural application. Also, more elaborate material grade definition may be associated as classification via inverse attribute HasExternalReferences.
-    IfcLabel Name();
-    void setName(IfcLabel v);
+    std::string Name() const;
+    void setName(std::string v);
     /// Whether the optional attribute Description is defined for this IfcMaterial
-    bool hasDescription();
+    bool hasDescription() const;
     /// Definition of the material in more descriptive terms than given by attributes Name or Category.
     /// 
     /// IFC2x4 CHANGE  The attribute has been added at the end of attribute list.
-    IfcText Description();
-    void setDescription(IfcText v);
+    std::string Description() const;
+    void setDescription(std::string v);
     /// Whether the optional attribute Category is defined for this IfcMaterial
-    bool hasCategory();
+    bool hasCategory() const;
     /// Definition of the category (group or type) of material, in more general terms than given by attribute Name.  
     /// 
     /// EXAMPLE A view definition may require each Material.Name to be unique, e.g. for each concrete or steel grade used in a project, in which case Material.Category could take the values 'Concrete' or 'Steel'.
     /// 
     /// IFC2x4 CHANGE  The attribute has been added at the end of attribute list.
-    IfcLabel Category();
-    void setCategory(IfcLabel v);
+    std::string Category() const;
+    void setCategory(std::string v);
     virtual unsigned int getArgumentCount() const { return 3; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_STRING; case 1: return IfcUtil::Argument_STRING; case 2: return IfcUtil::Argument_STRING; } return IfcMaterialDefinition::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcLabel; case 1: return Type::IfcText; case 2: return Type::IfcLabel; } return IfcMaterialDefinition::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Name"; case 1: return "Description"; case 2: return "Category"; } return IfcMaterialDefinition::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcMaterialDefinitionRepresentation > > HasRepresentation(); // INVERSE IfcMaterialDefinitionRepresentation::RepresentedMaterial
-    SHARED_PTR< IfcTemplatedEntityList< IfcMaterialRelationship > > IsRelatedWith(); // INVERSE IfcMaterialRelationship::RelatedMaterials
-    SHARED_PTR< IfcTemplatedEntityList< IfcMaterialRelationship > > RelatesTo(); // INVERSE IfcMaterialRelationship::RelatingMaterial
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcMaterialDefinitionRepresentation >::ptr HasRepresentation() const; // INVERSE IfcMaterialDefinitionRepresentation::RepresentedMaterial
+    IfcTemplatedEntityList< IfcMaterialRelationship >::ptr IsRelatedWith() const; // INVERSE IfcMaterialRelationship::RelatedMaterials
+    IfcTemplatedEntityList< IfcMaterialRelationship >::ptr RelatesTo() const; // INVERSE IfcMaterialRelationship::RelatingMaterial
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcMaterial (IfcAbstractEntityPtr e);
-    IfcMaterial (IfcLabel v1_Name, boost::optional< IfcText > v2_Description, boost::optional< IfcLabel > v3_Category);
-    typedef IfcMaterial* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcMaterial > > list;
-    typedef IfcTemplatedEntityList< IfcMaterial >::it it;
+    IfcMaterial (IfcAbstractEntity* e);
+    IfcMaterial (std::string v1_Name, boost::optional< std::string > v2_Description, boost::optional< std::string > v3_Category);
+    typedef IfcTemplatedEntityList< IfcMaterial > list;
 };
 /// IfcMaterialConstituent is a single and identifiable part of an element which is constructed of a number of part (one or more) each having an individual material. The association of the material constituent to the part is provided by a keyword as value of the Name attribute.
 /// 
@@ -15113,41 +16191,40 @@ class IfcMaterial : public IfcMaterialDefinition {
 class IfcMaterialConstituent : public IfcMaterialDefinition {
 public:
     /// Whether the optional attribute Name is defined for this IfcMaterialConstituent
-    bool hasName();
+    bool hasName() const;
     /// The name by which the material constituent is known.
-    IfcLabel Name();
-    void setName(IfcLabel v);
+    std::string Name() const;
+    void setName(std::string v);
     /// Whether the optional attribute Description is defined for this IfcMaterialConstituent
-    bool hasDescription();
+    bool hasDescription() const;
     /// Definition of the material constituent in descriptive terms.
-    IfcText Description();
-    void setDescription(IfcText v);
+    std::string Description() const;
+    void setDescription(std::string v);
     /// Reference to the material from which the constituent is constructed.
-    IfcMaterial* Material();
+    IfcMaterial* Material() const;
     void setMaterial(IfcMaterial* v);
     /// Whether the optional attribute Fraction is defined for this IfcMaterialConstituent
-    bool hasFraction();
+    bool hasFraction() const;
     /// Optional provision of a fraction of the total amount (volume or weight) that applies to the IfcMaterialConstituentSet that is contributed by this IfcMaterialConstituent.
-    IfcNormalisedRatioMeasure Fraction();
-    void setFraction(IfcNormalisedRatioMeasure v);
+    double Fraction() const;
+    void setFraction(double v);
     /// Whether the optional attribute Category is defined for this IfcMaterialConstituent
-    bool hasCategory();
+    bool hasCategory() const;
     /// Category of the material constituent, e.g. the role it has in the constituent set it belongs to.
-    IfcLabel Category();
-    void setCategory(IfcLabel v);
+    std::string Category() const;
+    void setCategory(std::string v);
     virtual unsigned int getArgumentCount() const { return 5; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_STRING; case 1: return IfcUtil::Argument_STRING; case 2: return IfcUtil::Argument_ENTITY; case 3: return IfcUtil::Argument_DOUBLE; case 4: return IfcUtil::Argument_STRING; } return IfcMaterialDefinition::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcLabel; case 1: return Type::IfcText; case 2: return Type::IfcMaterial; case 3: return Type::IfcNormalisedRatioMeasure; case 4: return Type::IfcLabel; } return IfcMaterialDefinition::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Name"; case 1: return "Description"; case 2: return "Material"; case 3: return "Fraction"; case 4: return "Category"; } return IfcMaterialDefinition::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcMaterialConstituentSet > > ToMaterialConstituentSet(); // INVERSE IfcMaterialConstituentSet::MaterialConstituents
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcMaterialConstituentSet >::ptr ToMaterialConstituentSet() const; // INVERSE IfcMaterialConstituentSet::MaterialConstituents
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcMaterialConstituent (IfcAbstractEntityPtr e);
-    IfcMaterialConstituent (boost::optional< IfcLabel > v1_Name, boost::optional< IfcText > v2_Description, IfcMaterial* v3_Material, boost::optional< IfcNormalisedRatioMeasure > v4_Fraction, boost::optional< IfcLabel > v5_Category);
-    typedef IfcMaterialConstituent* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcMaterialConstituent > > list;
-    typedef IfcTemplatedEntityList< IfcMaterialConstituent >::it it;
+    IfcMaterialConstituent (IfcAbstractEntity* e);
+    IfcMaterialConstituent (boost::optional< std::string > v1_Name, boost::optional< std::string > v2_Description, IfcMaterial* v3_Material, boost::optional< double > v4_Fraction, boost::optional< std::string > v5_Category);
+    typedef IfcTemplatedEntityList< IfcMaterialConstituent > list;
 };
 /// IfcMaterialConstituentSet is a collection of individual material constituents, each assigning a material to a part of an element. The parts are only identified by a keyword (as opposed to an IfcMaterialLayerSet or IfcMaterialProfileSet where each part has an individual shape parameter (layer thickness or layer profile).
 /// 
@@ -15166,32 +16243,31 @@ class IfcMaterialConstituent : public IfcMaterialDefinition {
 class IfcMaterialConstituentSet : public IfcMaterialDefinition {
 public:
     /// Whether the optional attribute Name is defined for this IfcMaterialConstituentSet
-    bool hasName();
+    bool hasName() const;
     /// The name by which the constituent set is known.
-    IfcLabel Name();
-    void setName(IfcLabel v);
+    std::string Name() const;
+    void setName(std::string v);
     /// Whether the optional attribute Description is defined for this IfcMaterialConstituentSet
-    bool hasDescription();
+    bool hasDescription() const;
     /// Definition of the material constituent set in descriptive terms.
-    IfcText Description();
-    void setDescription(IfcText v);
+    std::string Description() const;
+    void setDescription(std::string v);
     /// Whether the optional attribute MaterialConstituents is defined for this IfcMaterialConstituentSet
-    bool hasMaterialConstituents();
+    bool hasMaterialConstituents() const;
     /// Identification of the constituents from which the material constituent set is composed.
-    SHARED_PTR< IfcTemplatedEntityList< IfcMaterialConstituent > > MaterialConstituents();
-    void setMaterialConstituents(SHARED_PTR< IfcTemplatedEntityList< IfcMaterialConstituent > > v);
+    IfcTemplatedEntityList< IfcMaterialConstituent >::ptr MaterialConstituents() const;
+    void setMaterialConstituents(IfcTemplatedEntityList< IfcMaterialConstituent >::ptr v);
     virtual unsigned int getArgumentCount() const { return 3; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_STRING; case 1: return IfcUtil::Argument_STRING; case 2: return IfcUtil::Argument_ENTITY_LIST; } return IfcMaterialDefinition::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcLabel; case 1: return Type::IfcText; case 2: return Type::IfcMaterialConstituent; } return IfcMaterialDefinition::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Name"; case 1: return "Description"; case 2: return "MaterialConstituents"; } return IfcMaterialDefinition::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcMaterialConstituentSet (IfcAbstractEntityPtr e);
-    IfcMaterialConstituentSet (boost::optional< IfcLabel > v1_Name, boost::optional< IfcText > v2_Description, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcMaterialConstituent > > > v3_MaterialConstituents);
-    typedef IfcMaterialConstituentSet* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcMaterialConstituentSet > > list;
-    typedef IfcTemplatedEntityList< IfcMaterialConstituentSet >::it it;
+    IfcMaterialConstituentSet (IfcAbstractEntity* e);
+    IfcMaterialConstituentSet (boost::optional< std::string > v1_Name, boost::optional< std::string > v2_Description, boost::optional< IfcTemplatedEntityList< IfcMaterialConstituent >::ptr > v3_MaterialConstituents);
+    typedef IfcTemplatedEntityList< IfcMaterialConstituentSet > list;
 };
 /// IfcMaterialDefinitionRepresentation defines presentation information relating to IfcMaterial. It allows for multiple presentations of the same material for different geometric representation contexts.
 /// 
@@ -15226,20 +16302,19 @@ class IfcMaterialConstituentSet : public IfcMaterialDefinition {
 class IfcMaterialDefinitionRepresentation : public IfcProductRepresentation {
 public:
     /// Reference to the material to which the representation applies.
-    IfcMaterial* RepresentedMaterial();
+    IfcMaterial* RepresentedMaterial() const;
     void setRepresentedMaterial(IfcMaterial* v);
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 3: return IfcUtil::Argument_ENTITY; } return IfcProductRepresentation::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 3: return Type::IfcMaterial; } return IfcProductRepresentation::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 3: return "RepresentedMaterial"; } return IfcProductRepresentation::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcMaterialDefinitionRepresentation (IfcAbstractEntityPtr e);
-    IfcMaterialDefinitionRepresentation (boost::optional< IfcLabel > v1_Name, boost::optional< IfcText > v2_Description, SHARED_PTR< IfcTemplatedEntityList< IfcRepresentation > > v3_Representations, IfcMaterial* v4_RepresentedMaterial);
-    typedef IfcMaterialDefinitionRepresentation* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcMaterialDefinitionRepresentation > > list;
-    typedef IfcTemplatedEntityList< IfcMaterialDefinitionRepresentation >::it it;
+    IfcMaterialDefinitionRepresentation (IfcAbstractEntity* e);
+    IfcMaterialDefinitionRepresentation (boost::optional< std::string > v1_Name, boost::optional< std::string > v2_Description, IfcTemplatedEntityList< IfcRepresentation >::ptr v3_Representations, IfcMaterial* v4_RepresentedMaterial);
+    typedef IfcTemplatedEntityList< IfcMaterialDefinitionRepresentation > list;
 };
 /// IfcMaterialLayerSetUsage determines the usage of
 /// IfcMaterialLayerSet in terms of its location and
@@ -15344,24 +16419,24 @@ class IfcMaterialDefinitionRepresentation : public IfcProductRepresentation {
 class IfcMaterialLayerSetUsage : public IfcMaterialUsageDefinition {
 public:
     /// The IfcMaterialLayerSet set to which the usage is applied.
-    IfcMaterialLayerSet* ForLayerSet();
+    IfcMaterialLayerSet* ForLayerSet() const;
     void setForLayerSet(IfcMaterialLayerSet* v);
     /// Orientation of the material layer set relative to element reference geometry. The meaning of the value of this attribute shall be specified in the geometry use section for each element. For extruded shape representation, direction can be given along the extrusion path (e.g. for slabs) or perpendicular to it (e.g. for walls).
     /// 
     /// NOTE  the LayerSetDirection for IfcWallStandardCase shall be AXIS2 (i.e. the y-axis) and for IfcSlabStandardCase and IfcPlateStandardCase it shall be AXIS3 (i.e. the z-axis).
     /// 
     /// Whether the material layers of the set being used shall 'grow' into the positive or negative direction of the given axis, shall be deifned by DirectionSense attribute.
-    IfcLayerSetDirectionEnum::IfcLayerSetDirectionEnum LayerSetDirection();
+    IfcLayerSetDirectionEnum::IfcLayerSetDirectionEnum LayerSetDirection() const;
     void setLayerSetDirection(IfcLayerSetDirectionEnum::IfcLayerSetDirectionEnum v);
     /// Denotion whether the material layer set is oriented in positive or negative sense along the specified axis (defined by LayerSetDirection). "Positive" means that the consecutive layers (the IfcMaterialLayer instances in the list of  IfcMaterialLayerSet.MaterialLayers) are placed face-by-face in the direction of the positive axis as established by LayerSetDirection: for AXIS2 it would be in +y, for AXIS3 it would be +z. "Negative" means that the layers are placed face-by-face in the direction of the negative LayerSetDirection. In both cases,  starting at the material layer set base line.
     /// NOTE  the material layer set base line (MlsBase) is located by OffsetFromReferenceLine, and may be on the positive or negative side of the element reference line (or plane); positive or negative for MlsBase placement does not depend on the DirectionSense attribute, but on the relevant element axis.
-    IfcDirectionSenseEnum::IfcDirectionSenseEnum DirectionSense();
+    IfcDirectionSenseEnum::IfcDirectionSenseEnum DirectionSense() const;
     void setDirectionSense(IfcDirectionSenseEnum::IfcDirectionSenseEnum v);
     /// Offset of the material layer set base line (MlsBase) from reference geometry (line or plane) of element. The offset can be positive or negative, unless restricted for a particular building element type in its use definition or by implementer agreement. A positive value means, that the MlsBase is placed on the positive side of the reference line or plane, on the axis established by LayerSetDirection (in case of AXIS2 into the direction of +y, or in case of AXIS2 into the direction of +z). A negative value means that the MlsBase is placed on the negative side, as established by LayerSetDirection (in case of AXIS2 into the direction of -y). NOTE  the positive or negative sign in the offset only affects the MlsBase placement, it does not have any effect on the application of DirectionSense for orientation of the material layers; also DirectionSense does not change the MlsBase placement.
-    IfcLengthMeasure OffsetFromReferenceLine();
-    void setOffsetFromReferenceLine(IfcLengthMeasure v);
+    double OffsetFromReferenceLine() const;
+    void setOffsetFromReferenceLine(double v);
     /// Whether the optional attribute ReferenceExtent is defined for this IfcMaterialLayerSetUsage
-    bool hasReferenceExtent();
+    bool hasReferenceExtent() const;
     /// EPM-HTML>
     /// Extent of the extrusion of the elements body shape representation to which the IfcMaterialLayerSetUsage applies. It is used as the reference value for the upper OffsetValues[2] provided by the IfcMaterialLayerSetWithOffsets subtype for included material layers.
     /// 
@@ -15370,20 +16445,19 @@ class IfcMaterialLayerSetUsage : public IfcMaterialUsageDefinition {
     /// NOTE 1  The attribute ReferenceExtent shall be asserted, if an IfcMaterialLayerSetWithOffsets is included in the ForLayerSet.MaterialLayers list of maerial layers.
     /// 
     /// NOTE 2  The ReferenceExtent for IfcWallStandardCase is the reference height starting at z=0 being the XY plane of the object coordinate system.
-    IfcPositiveLengthMeasure ReferenceExtent();
-    void setReferenceExtent(IfcPositiveLengthMeasure v);
+    double ReferenceExtent() const;
+    void setReferenceExtent(double v);
     virtual unsigned int getArgumentCount() const { return 5; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY; case 1: return IfcUtil::Argument_ENUMERATION; case 2: return IfcUtil::Argument_ENUMERATION; case 3: return IfcUtil::Argument_DOUBLE; case 4: return IfcUtil::Argument_DOUBLE; } return IfcMaterialUsageDefinition::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcMaterialLayerSet; case 1: return Type::IfcLayerSetDirectionEnum; case 2: return Type::IfcDirectionSenseEnum; case 3: return Type::IfcLengthMeasure; case 4: return Type::IfcPositiveLengthMeasure; } return IfcMaterialUsageDefinition::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "ForLayerSet"; case 1: return "LayerSetDirection"; case 2: return "DirectionSense"; case 3: return "OffsetFromReferenceLine"; case 4: return "ReferenceExtent"; } return IfcMaterialUsageDefinition::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcMaterialLayerSetUsage (IfcAbstractEntityPtr e);
-    IfcMaterialLayerSetUsage (IfcMaterialLayerSet* v1_ForLayerSet, IfcLayerSetDirectionEnum::IfcLayerSetDirectionEnum v2_LayerSetDirection, IfcDirectionSenseEnum::IfcDirectionSenseEnum v3_DirectionSense, IfcLengthMeasure v4_OffsetFromReferenceLine, boost::optional< IfcPositiveLengthMeasure > v5_ReferenceExtent);
-    typedef IfcMaterialLayerSetUsage* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcMaterialLayerSetUsage > > list;
-    typedef IfcTemplatedEntityList< IfcMaterialLayerSetUsage >::it it;
+    IfcMaterialLayerSetUsage (IfcAbstractEntity* e);
+    IfcMaterialLayerSetUsage (IfcMaterialLayerSet* v1_ForLayerSet, IfcLayerSetDirectionEnum::IfcLayerSetDirectionEnum v2_LayerSetDirection, IfcDirectionSenseEnum::IfcDirectionSenseEnum v3_DirectionSense, double v4_OffsetFromReferenceLine, boost::optional< double > v5_ReferenceExtent);
+    typedef IfcTemplatedEntityList< IfcMaterialLayerSetUsage > list;
 };
 /// IfcMaterialProfileSetUsage determines the usage of IfcMaterialProfileSet in terms of its location relative to the associated element geometry. The location of a material profile set shall be compatible with the building element geometry (that is, material profiles shall fit inside the element geometry). The rules to ensure the compatibility depend on the type of the building element. For building elements with shape representations which are based on extruded solids, this is accomplished by referring to the identical profile definition in the shape model as in the material profile set.
 /// 
@@ -15395,35 +16469,34 @@ class IfcMaterialLayerSetUsage : public IfcMaterialUsageDefinition {
 class IfcMaterialProfileSetUsage : public IfcMaterialUsageDefinition {
 public:
     /// The IfcMaterialProfileSet set to which the usage is applied.
-    IfcMaterialProfileSet* ForProfileSet();
+    IfcMaterialProfileSet* ForProfileSet() const;
     void setForProfileSet(IfcMaterialProfileSet* v);
     /// Whether the optional attribute CardinalPoint is defined for this IfcMaterialProfileSetUsage
-    bool hasCardinalPoint();
+    bool hasCardinalPoint() const;
     /// Index reference to a significant point in the section profile. Describes how the section is aligned relative to the (longitudinal) axis of the member it is associated with. This parametric specification of profile alignment can be provided redundantly to the explicit alignment defined by ForProfileSet.MaterialProfiles[*].Profile.
-    IfcCardinalPointReference CardinalPoint();
-    void setCardinalPoint(IfcCardinalPointReference v);
+    int CardinalPoint() const;
+    void setCardinalPoint(int v);
     /// Whether the optional attribute ReferenceExtent is defined for this IfcMaterialProfileSetUsage
-    bool hasReferenceExtent();
+    bool hasReferenceExtent() const;
     /// EPM-HTML>
     /// Extent of the extrusion of the elements body shape representation to which the IfcMaterialProfileSetUsage applies. It is used as the reference value for the upper OffsetValues[2] provided by the IfcMaterialProfileSetWithOffsets subtype for included material profiles.
     /// 
     /// NOTE 1  The attribute ReferenceExtent shall be asserted, if an IfcMaterialProfileSetWithOffsets is included in the ForProfileSet.MaterialProfiles list of maerial layers.
     /// 
     /// NOTE 2  The ReferenceExtent for IfcBeamStandardCase, IfcColumnStandardCase, and IfcMemberStandardCase is the reference length starting at z=0 being the XY plane of the object coordinate system.
-    IfcPositiveLengthMeasure ReferenceExtent();
-    void setReferenceExtent(IfcPositiveLengthMeasure v);
+    double ReferenceExtent() const;
+    void setReferenceExtent(double v);
     virtual unsigned int getArgumentCount() const { return 3; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY; case 1: return IfcUtil::Argument_INT; case 2: return IfcUtil::Argument_DOUBLE; } return IfcMaterialUsageDefinition::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcMaterialProfileSet; case 1: return Type::IfcCardinalPointReference; case 2: return Type::IfcPositiveLengthMeasure; } return IfcMaterialUsageDefinition::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "ForProfileSet"; case 1: return "CardinalPoint"; case 2: return "ReferenceExtent"; } return IfcMaterialUsageDefinition::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcMaterialProfileSetUsage (IfcAbstractEntityPtr e);
-    IfcMaterialProfileSetUsage (IfcMaterialProfileSet* v1_ForProfileSet, boost::optional< IfcCardinalPointReference > v2_CardinalPoint, boost::optional< IfcPositiveLengthMeasure > v3_ReferenceExtent);
-    typedef IfcMaterialProfileSetUsage* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcMaterialProfileSetUsage > > list;
-    typedef IfcTemplatedEntityList< IfcMaterialProfileSetUsage >::it it;
+    IfcMaterialProfileSetUsage (IfcAbstractEntity* e);
+    IfcMaterialProfileSetUsage (IfcMaterialProfileSet* v1_ForProfileSet, boost::optional< int > v2_CardinalPoint, boost::optional< double > v3_ReferenceExtent);
+    typedef IfcTemplatedEntityList< IfcMaterialProfileSetUsage > list;
 };
 /// IfcMaterialProfileSetUsageTapering specifies dual material profile sets in association with tapered prismatic (beam- or column-like) elements.
 /// 
@@ -15453,25 +16526,24 @@ class IfcMaterialProfileSetUsage : public IfcMaterialUsageDefinition {
 class IfcMaterialProfileSetUsageTapering : public IfcMaterialProfileSetUsage {
 public:
     /// The second IfcMaterialProfileSet set to which the usage is applied.
-    IfcMaterialProfileSet* ForProfileEndSet();
+    IfcMaterialProfileSet* ForProfileEndSet() const;
     void setForProfileEndSet(IfcMaterialProfileSet* v);
     /// Whether the optional attribute CardinalEndPoint is defined for this IfcMaterialProfileSetUsageTapering
-    bool hasCardinalEndPoint();
+    bool hasCardinalEndPoint() const;
     /// Index reference to a significant point in the second section profile. Describes how this section is aligned relative to the axis of the member it is associated with. This parametric specification of profile alignment can be provided redundantly to the explicit alignment defined by ForProfileSet.MaterialProfiles[*].Profile.
-    IfcCardinalPointReference CardinalEndPoint();
-    void setCardinalEndPoint(IfcCardinalPointReference v);
+    int CardinalEndPoint() const;
+    void setCardinalEndPoint(int v);
     virtual unsigned int getArgumentCount() const { return 5; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 3: return IfcUtil::Argument_ENTITY; case 4: return IfcUtil::Argument_INT; } return IfcMaterialProfileSetUsage::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 3: return Type::IfcMaterialProfileSet; case 4: return Type::IfcCardinalPointReference; } return IfcMaterialProfileSetUsage::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 3: return "ForProfileEndSet"; case 4: return "CardinalEndPoint"; } return IfcMaterialProfileSetUsage::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcMaterialProfileSetUsageTapering (IfcAbstractEntityPtr e);
-    IfcMaterialProfileSetUsageTapering (IfcMaterialProfileSet* v1_ForProfileSet, boost::optional< IfcCardinalPointReference > v2_CardinalPoint, boost::optional< IfcPositiveLengthMeasure > v3_ReferenceExtent, IfcMaterialProfileSet* v4_ForProfileEndSet, boost::optional< IfcCardinalPointReference > v5_CardinalEndPoint);
-    typedef IfcMaterialProfileSetUsageTapering* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcMaterialProfileSetUsageTapering > > list;
-    typedef IfcTemplatedEntityList< IfcMaterialProfileSetUsageTapering >::it it;
+    IfcMaterialProfileSetUsageTapering (IfcAbstractEntity* e);
+    IfcMaterialProfileSetUsageTapering (IfcMaterialProfileSet* v1_ForProfileSet, boost::optional< int > v2_CardinalPoint, boost::optional< double > v3_ReferenceExtent, IfcMaterialProfileSet* v4_ForProfileEndSet, boost::optional< int > v5_CardinalEndPoint);
+    typedef IfcTemplatedEntityList< IfcMaterialProfileSetUsageTapering > list;
 };
 /// IfcMaterialProperties is defined as an abstract
 /// supertype for entities that apply material properties to material
@@ -15500,20 +16572,19 @@ class IfcMaterialProperties : public IfcExtendedProperties {
     /// Reference to the material definition to which the set of properties is assigned.
     /// 
     /// IFC2x4 CHANGE  The datatype has been changed to supertype IfcMaterialDefinition.
-    IfcMaterialDefinition* Material();
+    IfcMaterialDefinition* Material() const;
     void setMaterial(IfcMaterialDefinition* v);
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 3: return IfcUtil::Argument_ENTITY; } return IfcExtendedProperties::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 3: return Type::IfcMaterialDefinition; } return IfcExtendedProperties::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 3: return "Material"; } return IfcExtendedProperties::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcMaterialProperties (IfcAbstractEntityPtr e);
-    IfcMaterialProperties (boost::optional< IfcIdentifier > v1_Name, boost::optional< IfcText > v2_Description, SHARED_PTR< IfcTemplatedEntityList< IfcProperty > > v3_Properties, IfcMaterialDefinition* v4_Material);
-    typedef IfcMaterialProperties* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcMaterialProperties > > list;
-    typedef IfcTemplatedEntityList< IfcMaterialProperties >::it it;
+    IfcMaterialProperties (IfcAbstractEntity* e);
+    IfcMaterialProperties (boost::optional< std::string > v1_Name, boost::optional< std::string > v2_Description, IfcTemplatedEntityList< IfcProperty >::ptr v3_Properties, IfcMaterialDefinition* v4_Material);
+    typedef IfcTemplatedEntityList< IfcMaterialProperties > list;
 };
 /// IfcMaterialRelationship  defines a relationship between part and whole in material definitions (as in composite materials). The parts, expressed by the set of RelatedMaterials, are material constituents of which a single material aggregate is composed.
 /// 
@@ -15521,28 +16592,27 @@ class IfcMaterialProperties : public IfcExtendedProperties {
 class IfcMaterialRelationship : public IfcResourceLevelRelationship {
 public:
     /// Reference to the relating material (the composite).
-    IfcMaterial* RelatingMaterial();
+    IfcMaterial* RelatingMaterial() const;
     void setRelatingMaterial(IfcMaterial* v);
     /// Reference to related materials (as constituents of composite material).
-    SHARED_PTR< IfcTemplatedEntityList< IfcMaterial > > RelatedMaterials();
-    void setRelatedMaterials(SHARED_PTR< IfcTemplatedEntityList< IfcMaterial > > v);
+    IfcTemplatedEntityList< IfcMaterial >::ptr RelatedMaterials() const;
+    void setRelatedMaterials(IfcTemplatedEntityList< IfcMaterial >::ptr v);
     /// Whether the optional attribute Expression is defined for this IfcMaterialRelationship
-    bool hasExpression();
+    bool hasExpression() const;
     /// The amount of related material in the whole (composite material or material set). Expressed as proportion (percentage) of weight or volume, or as any other appropriate value.
-    IfcLabel Expression();
-    void setExpression(IfcLabel v);
+    std::string Expression() const;
+    void setExpression(std::string v);
     virtual unsigned int getArgumentCount() const { return 5; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 2: return IfcUtil::Argument_ENTITY; case 3: return IfcUtil::Argument_ENTITY_LIST; case 4: return IfcUtil::Argument_STRING; } return IfcResourceLevelRelationship::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 2: return Type::IfcMaterial; case 3: return Type::IfcMaterial; case 4: return Type::IfcLabel; } return IfcResourceLevelRelationship::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 2: return "RelatingMaterial"; case 3: return "RelatedMaterials"; case 4: return "Expression"; } return IfcResourceLevelRelationship::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcMaterialRelationship (IfcAbstractEntityPtr e);
-    IfcMaterialRelationship (boost::optional< IfcLabel > v1_Name, boost::optional< IfcText > v2_Description, IfcMaterial* v3_RelatingMaterial, SHARED_PTR< IfcTemplatedEntityList< IfcMaterial > > v4_RelatedMaterials, boost::optional< IfcLabel > v5_Expression);
-    typedef IfcMaterialRelationship* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcMaterialRelationship > > list;
-    typedef IfcTemplatedEntityList< IfcMaterialRelationship >::it it;
+    IfcMaterialRelationship (IfcAbstractEntity* e);
+    IfcMaterialRelationship (boost::optional< std::string > v1_Name, boost::optional< std::string > v2_Description, IfcMaterial* v3_RelatingMaterial, IfcTemplatedEntityList< IfcMaterial >::ptr v4_RelatedMaterials, boost::optional< std::string > v5_Expression);
+    typedef IfcTemplatedEntityList< IfcMaterialRelationship > list;
 };
 /// The IfcMirroredProfileDef defines the profile by mirroring the parent profile about the y axis of the parent profile coordinate system. That is, left and right of the parent profile are swapped.
 /// 
@@ -15575,16 +16645,15 @@ class IfcMirroredProfileDef : public IfcDerivedProfileDef {
 public:
     virtual unsigned int getArgumentCount() const { return 5; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcDerivedProfileDef::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcDerivedProfileDef::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcDerivedProfileDef::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcMirroredProfileDef (IfcAbstractEntityPtr e);
-    IfcMirroredProfileDef (IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< IfcLabel > v2_ProfileName, IfcProfileDef* v3_ParentProfile, boost::optional< IfcLabel > v5_Label);
-    typedef IfcMirroredProfileDef* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcMirroredProfileDef > > list;
-    typedef IfcTemplatedEntityList< IfcMirroredProfileDef >::it it;
+    IfcMirroredProfileDef (IfcAbstractEntity* e);
+    IfcMirroredProfileDef (IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< std::string > v2_ProfileName, IfcProfileDef* v3_ParentProfile, boost::optional< std::string > v5_Label);
+    typedef IfcTemplatedEntityList< IfcMirroredProfileDef > list;
 };
 /// An IfcObjectDefinition is the generalization of any
 /// semantically treated thing or process, either being a type or an
@@ -15640,23 +16709,22 @@ class IfcObjectDefinition : public IfcRoot {
 public:
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcRoot::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcRoot::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcRoot::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelAssigns > > HasAssignments(); // INVERSE IfcRelAssigns::RelatedObjects
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelNests > > Nests(); // INVERSE IfcRelNests::RelatedObjects
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelNests > > IsNestedBy(); // INVERSE IfcRelNests::RelatingObject
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelDeclares > > HasContext(); // INVERSE IfcRelDeclares::RelatedDefinitions
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelAggregates > > IsDecomposedBy(); // INVERSE IfcRelAggregates::RelatingObject
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelAggregates > > Decomposes(); // INVERSE IfcRelAggregates::RelatedObjects
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelAssociates > > HasAssociations(); // INVERSE IfcRelAssociates::RelatedObjects
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcRelAssigns >::ptr HasAssignments() const; // INVERSE IfcRelAssigns::RelatedObjects
+    IfcTemplatedEntityList< IfcRelNests >::ptr Nests() const; // INVERSE IfcRelNests::RelatedObjects
+    IfcTemplatedEntityList< IfcRelNests >::ptr IsNestedBy() const; // INVERSE IfcRelNests::RelatingObject
+    IfcTemplatedEntityList< IfcRelDeclares >::ptr HasContext() const; // INVERSE IfcRelDeclares::RelatedDefinitions
+    IfcTemplatedEntityList< IfcRelAggregates >::ptr IsDecomposedBy() const; // INVERSE IfcRelAggregates::RelatingObject
+    IfcTemplatedEntityList< IfcRelAggregates >::ptr Decomposes() const; // INVERSE IfcRelAggregates::RelatedObjects
+    IfcTemplatedEntityList< IfcRelAssociates >::ptr HasAssociations() const; // INVERSE IfcRelAssociates::RelatedObjects
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcObjectDefinition (IfcAbstractEntityPtr e);
-    IfcObjectDefinition (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description);
-    typedef IfcObjectDefinition* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcObjectDefinition > > list;
-    typedef IfcTemplatedEntityList< IfcObjectDefinition >::it it;
+    IfcObjectDefinition (IfcAbstractEntity* e);
+    IfcObjectDefinition (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description);
+    typedef IfcTemplatedEntityList< IfcObjectDefinition > list;
 };
 /// Definition from ISO/CD 10303-42:1992: An open shell is a shell of
 ///   the dimensionality 2. Its domain, if present, is a finite, connected, oriented,
@@ -15721,16 +16789,15 @@ class IfcOpenShell : public IfcConnectedFaceSet {
 public:
     virtual unsigned int getArgumentCount() const { return 1; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcConnectedFaceSet::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcConnectedFaceSet::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcConnectedFaceSet::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcOpenShell (IfcAbstractEntityPtr e);
-    IfcOpenShell (SHARED_PTR< IfcTemplatedEntityList< IfcFace > > v1_CfsFaces);
-    typedef IfcOpenShell* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcOpenShell > > list;
-    typedef IfcTemplatedEntityList< IfcOpenShell >::it it;
+    IfcOpenShell (IfcAbstractEntity* e);
+    IfcOpenShell (IfcTemplatedEntityList< IfcFace >::ptr v1_CfsFaces);
+    typedef IfcTemplatedEntityList< IfcOpenShell > list;
 };
 /// Definition: establishes an association between one relating organization and one or more related organizations.
 /// 
@@ -15741,23 +16808,22 @@ class IfcOpenShell : public IfcConnectedFaceSet {
 class IfcOrganizationRelationship : public IfcResourceLevelRelationship {
 public:
     /// Organization which is the relating part of the relationship between organizations.
-    IfcOrganization* RelatingOrganization();
+    IfcOrganization* RelatingOrganization() const;
     void setRelatingOrganization(IfcOrganization* v);
     /// The other, possibly dependent, organizations which are the related parts of the relationship between organizations.
-    SHARED_PTR< IfcTemplatedEntityList< IfcOrganization > > RelatedOrganizations();
-    void setRelatedOrganizations(SHARED_PTR< IfcTemplatedEntityList< IfcOrganization > > v);
+    IfcTemplatedEntityList< IfcOrganization >::ptr RelatedOrganizations() const;
+    void setRelatedOrganizations(IfcTemplatedEntityList< IfcOrganization >::ptr v);
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 2: return IfcUtil::Argument_ENTITY; case 3: return IfcUtil::Argument_ENTITY_LIST; } return IfcResourceLevelRelationship::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 2: return Type::IfcOrganization; case 3: return Type::IfcOrganization; } return IfcResourceLevelRelationship::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 2: return "RelatingOrganization"; case 3: return "RelatedOrganizations"; } return IfcResourceLevelRelationship::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcOrganizationRelationship (IfcAbstractEntityPtr e);
-    IfcOrganizationRelationship (boost::optional< IfcLabel > v1_Name, boost::optional< IfcText > v2_Description, IfcOrganization* v3_RelatingOrganization, SHARED_PTR< IfcTemplatedEntityList< IfcOrganization > > v4_RelatedOrganizations);
-    typedef IfcOrganizationRelationship* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcOrganizationRelationship > > list;
-    typedef IfcTemplatedEntityList< IfcOrganizationRelationship >::it it;
+    IfcOrganizationRelationship (IfcAbstractEntity* e);
+    IfcOrganizationRelationship (boost::optional< std::string > v1_Name, boost::optional< std::string > v2_Description, IfcOrganization* v3_RelatingOrganization, IfcTemplatedEntityList< IfcOrganization >::ptr v4_RelatedOrganizations);
+    typedef IfcTemplatedEntityList< IfcOrganizationRelationship > list;
 };
 /// Definition from ISO/CD 10303-42:1992: An oriented edge is an edge constructed from another edge and contains a BOOLEAN direction flag to indicate whether or not the orientation of the constructed edge agrees with the orientation of the original edge. Except for perhaps orientation, the oriented edge is equivalent to the original edge.  
 /// 
@@ -15769,23 +16835,22 @@ class IfcOrganizationRelationship : public IfcResourceLevelRelationship {
 class IfcOrientedEdge : public IfcEdge {
 public:
     /// Edge entity used to construct this oriented edge.
-    IfcEdge* EdgeElement();
+    IfcEdge* EdgeElement() const;
     void setEdgeElement(IfcEdge* v);
     /// BOOLEAN, If TRUE the topological orientation as used coincides with the orientation from start vertex to end vertex of the edge element. If FALSE otherwise.
-    bool Orientation();
+    bool Orientation() const;
     void setOrientation(bool v);
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 2: return IfcUtil::Argument_ENTITY; case 3: return IfcUtil::Argument_BOOL; } return IfcEdge::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 2: return Type::IfcEdge; case 3: return Type::UNDEFINED; } return IfcEdge::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 2: return "EdgeElement"; case 3: return "Orientation"; } return IfcEdge::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcOrientedEdge (IfcAbstractEntityPtr e);
+    IfcOrientedEdge (IfcAbstractEntity* e);
     IfcOrientedEdge (IfcEdge* v3_EdgeElement, bool v4_Orientation);
-    typedef IfcOrientedEdge* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcOrientedEdge > > list;
-    typedef IfcTemplatedEntityList< IfcOrientedEdge >::it it;
+    typedef IfcTemplatedEntityList< IfcOrientedEdge > list;
 };
 /// The parameterized profile definition
 /// defines a 2D position coordinate system to which the parameters of the
@@ -15832,22 +16897,21 @@ class IfcOrientedEdge : public IfcEdge {
 class IfcParameterizedProfileDef : public IfcProfileDef {
 public:
     /// Whether the optional attribute Position is defined for this IfcParameterizedProfileDef
-    bool hasPosition();
+    bool hasPosition() const;
     /// Position coordinate system of the parameterized profile definition. If unspecified, no translation and no rotation is applied.
-    IfcAxis2Placement2D* Position();
+    IfcAxis2Placement2D* Position() const;
     void setPosition(IfcAxis2Placement2D* v);
     virtual unsigned int getArgumentCount() const { return 3; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 2: return IfcUtil::Argument_ENTITY; } return IfcProfileDef::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 2: return Type::IfcAxis2Placement2D; } return IfcProfileDef::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 2: return "Position"; } return IfcProfileDef::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcParameterizedProfileDef (IfcAbstractEntityPtr e);
-    IfcParameterizedProfileDef (IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< IfcLabel > v2_ProfileName, IfcAxis2Placement2D* v3_Position);
-    typedef IfcParameterizedProfileDef* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcParameterizedProfileDef > > list;
-    typedef IfcTemplatedEntityList< IfcParameterizedProfileDef >::it it;
+    IfcParameterizedProfileDef (IfcAbstractEntity* e);
+    IfcParameterizedProfileDef (IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< std::string > v2_ProfileName, IfcAxis2Placement2D* v3_Position);
+    typedef IfcTemplatedEntityList< IfcParameterizedProfileDef > list;
 };
 /// Definition from ISO/CD 10303-42:1992: A path is a topological entity consisting of an ordered collection of oriented edges, such that the edge start vertex of each edge coincides with the edge end of its predecessor. The path is ordered from the edge start of the first oriented edge to the edge end of the last edge. The BOOLEAN value sense in the oriented edge indicates whether the edge direction agrees with the direction of the path (TRUE) or is the opposite direction (FALSE).  
 /// 
@@ -15866,20 +16930,19 @@ class IfcParameterizedProfileDef : public IfcProfileDef {
 class IfcPath : public IfcTopologicalRepresentationItem {
 public:
     /// The list of oriented edges which are concatenated together to form this path.
-    SHARED_PTR< IfcTemplatedEntityList< IfcOrientedEdge > > EdgeList();
-    void setEdgeList(SHARED_PTR< IfcTemplatedEntityList< IfcOrientedEdge > > v);
+    IfcTemplatedEntityList< IfcOrientedEdge >::ptr EdgeList() const;
+    void setEdgeList(IfcTemplatedEntityList< IfcOrientedEdge >::ptr v);
     virtual unsigned int getArgumentCount() const { return 1; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY_LIST; } return IfcTopologicalRepresentationItem::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcOrientedEdge; } return IfcTopologicalRepresentationItem::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "EdgeList"; } return IfcTopologicalRepresentationItem::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcPath (IfcAbstractEntityPtr e);
-    IfcPath (SHARED_PTR< IfcTemplatedEntityList< IfcOrientedEdge > > v1_EdgeList);
-    typedef IfcPath* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcPath > > list;
-    typedef IfcTemplatedEntityList< IfcPath >::it it;
+    IfcPath (IfcAbstractEntity* e);
+    IfcPath (IfcTemplatedEntityList< IfcOrientedEdge >::ptr v1_EdgeList);
+    typedef IfcTemplatedEntityList< IfcPath > list;
 };
 /// The complex physical quantity, IfcPhysicalComplexQuantity, is an entity that holds a set of single quantity measure value (as defined at the subtypes of IfcPhysicalSimpleQuantity), that all apply to a given component or aspect of the element. 
 /// 
@@ -15893,33 +16956,32 @@ class IfcPath : public IfcTopologicalRepresentationItem {
 class IfcPhysicalComplexQuantity : public IfcPhysicalQuantity {
 public:
     /// Set of physical quantities that are grouped by this complex physical quantity according to a given discrimination.
-    SHARED_PTR< IfcTemplatedEntityList< IfcPhysicalQuantity > > HasQuantities();
-    void setHasQuantities(SHARED_PTR< IfcTemplatedEntityList< IfcPhysicalQuantity > > v);
+    IfcTemplatedEntityList< IfcPhysicalQuantity >::ptr HasQuantities() const;
+    void setHasQuantities(IfcTemplatedEntityList< IfcPhysicalQuantity >::ptr v);
     /// Identification of the discrimination by which this physical complex property is distinguished. Examples of discriminations are 'layer', 'steel bar diameter', etc.
-    IfcLabel Discrimination();
-    void setDiscrimination(IfcLabel v);
+    std::string Discrimination() const;
+    void setDiscrimination(std::string v);
     /// Whether the optional attribute Quality is defined for this IfcPhysicalComplexQuantity
-    bool hasQuality();
+    bool hasQuality() const;
     /// Additional indication of a quality of the quantities that are grouped under this physical complex quantity.
-    IfcLabel Quality();
-    void setQuality(IfcLabel v);
+    std::string Quality() const;
+    void setQuality(std::string v);
     /// Whether the optional attribute Usage is defined for this IfcPhysicalComplexQuantity
-    bool hasUsage();
+    bool hasUsage() const;
     /// Additional indication of a usage type of the quantities that are grouped under this physical complex quantity.
-    IfcLabel Usage();
-    void setUsage(IfcLabel v);
+    std::string Usage() const;
+    void setUsage(std::string v);
     virtual unsigned int getArgumentCount() const { return 6; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 2: return IfcUtil::Argument_ENTITY_LIST; case 3: return IfcUtil::Argument_STRING; case 4: return IfcUtil::Argument_STRING; case 5: return IfcUtil::Argument_STRING; } return IfcPhysicalQuantity::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 2: return Type::IfcPhysicalQuantity; case 3: return Type::IfcLabel; case 4: return Type::IfcLabel; case 5: return Type::IfcLabel; } return IfcPhysicalQuantity::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 2: return "HasQuantities"; case 3: return "Discrimination"; case 4: return "Quality"; case 5: return "Usage"; } return IfcPhysicalQuantity::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcPhysicalComplexQuantity (IfcAbstractEntityPtr e);
-    IfcPhysicalComplexQuantity (IfcLabel v1_Name, boost::optional< IfcText > v2_Description, SHARED_PTR< IfcTemplatedEntityList< IfcPhysicalQuantity > > v3_HasQuantities, IfcLabel v4_Discrimination, boost::optional< IfcLabel > v5_Quality, boost::optional< IfcLabel > v6_Usage);
-    typedef IfcPhysicalComplexQuantity* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcPhysicalComplexQuantity > > list;
-    typedef IfcTemplatedEntityList< IfcPhysicalComplexQuantity >::it it;
+    IfcPhysicalComplexQuantity (IfcAbstractEntity* e);
+    IfcPhysicalComplexQuantity (std::string v1_Name, boost::optional< std::string > v2_Description, IfcTemplatedEntityList< IfcPhysicalQuantity >::ptr v3_HasQuantities, std::string v4_Discrimination, boost::optional< std::string > v5_Quality, boost::optional< std::string > v6_Usage);
+    typedef IfcTemplatedEntityList< IfcPhysicalComplexQuantity > list;
 };
 /// An IfcPixelTexture provides a 2D image-based texture map as an explicit array of pixel values (list of Pixel binary attributes). In contrary to the IfcImageTexture the IfcPixelTexture holds a 2 dimensional list of pixel color
 /// (and opacity) directly, instead of referencing to an URL.
@@ -15942,29 +17004,28 @@ class IfcPhysicalComplexQuantity : public IfcPhysicalQuantity {
 class IfcPixelTexture : public IfcSurfaceTexture {
 public:
     /// The number of pixels in width (S) direction.
-    IfcInteger Width();
-    void setWidth(IfcInteger v);
+    int Width() const;
+    void setWidth(int v);
     /// The number of pixels in height (T) direction.
-    IfcInteger Height();
-    void setHeight(IfcInteger v);
+    int Height() const;
+    void setHeight(int v);
     /// Indication whether the pixel values contain a 1, 2, 3, or 4 colour component.
-    IfcInteger ColourComponents();
-    void setColourComponents(IfcInteger v);
+    int ColourComponents() const;
+    void setColourComponents(int v);
     /// Flat list of hexadecimal values, each describing one pixel by 1, 2, 3, or 4 components.
     /// 
     /// IFC2x Edition 3 CHANGE  The data type has been changed from STRING to BINARY.
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 5: return IfcUtil::Argument_INT; case 6: return IfcUtil::Argument_INT; case 7: return IfcUtil::Argument_INT; case 8: return IfcUtil::Argument_UNKNOWN; } return IfcSurfaceTexture::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 5: return Type::IfcInteger; case 6: return Type::IfcInteger; case 7: return Type::IfcInteger; case 8: return Type::UNDEFINED; } return IfcSurfaceTexture::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 5: return "Width"; case 6: return "Height"; case 7: return "ColourComponents"; case 8: return "Pixel"; } return IfcSurfaceTexture::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcPixelTexture (IfcAbstractEntityPtr e);
-    IfcPixelTexture (bool v1_RepeatS, bool v2_RepeatT, boost::optional< IfcIdentifier > v3_Mode, IfcCartesianTransformationOperator2D* v4_TextureTransform, boost::optional< std::vector< IfcIdentifier > /*[1:?]*/ > v5_Parameter, IfcInteger v6_Width, IfcInteger v7_Height, IfcInteger v8_ColourComponents);
-    typedef IfcPixelTexture* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcPixelTexture > > list;
-    typedef IfcTemplatedEntityList< IfcPixelTexture >::it it;
+    IfcPixelTexture (IfcAbstractEntity* e);
+    IfcPixelTexture (bool v1_RepeatS, bool v2_RepeatT, boost::optional< std::string > v3_Mode, IfcCartesianTransformationOperator2D* v4_TextureTransform, boost::optional< std::vector< std::string > /*[1:?]*/ > v5_Parameter, int v6_Width, int v7_Height, int v8_ColourComponents);
+    typedef IfcTemplatedEntityList< IfcPixelTexture > list;
 };
 /// Definition from ISO/CD 10303-42:1992: A placement entity defines the local environment for the definition of a geometry item. It locates the item to be defined and, in the case of the axis placement subtypes, gives its orientation. 
 /// 
@@ -15978,20 +17039,19 @@ class IfcPixelTexture : public IfcSurfaceTexture {
 class IfcPlacement : public IfcGeometricRepresentationItem {
 public:
     /// The geometric position of a reference point, such as the center of a circle, of the item to be located.
-    IfcCartesianPoint* Location();
+    IfcCartesianPoint* Location() const;
     void setLocation(IfcCartesianPoint* v);
     virtual unsigned int getArgumentCount() const { return 1; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY; } return IfcGeometricRepresentationItem::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcCartesianPoint; } return IfcGeometricRepresentationItem::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Location"; } return IfcGeometricRepresentationItem::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcPlacement (IfcAbstractEntityPtr e);
+    IfcPlacement (IfcAbstractEntity* e);
     IfcPlacement (IfcCartesianPoint* v1_Location);
-    typedef IfcPlacement* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcPlacement > > list;
-    typedef IfcTemplatedEntityList< IfcPlacement >::it it;
+    typedef IfcTemplatedEntityList< IfcPlacement > list;
 };
 /// The planar extent defines the extent along the two axes of the two-dimensional coordinate system, independently of its position.
 /// 
@@ -16001,23 +17061,22 @@ class IfcPlacement : public IfcGeometricRepresentationItem {
 class IfcPlanarExtent : public IfcGeometricRepresentationItem {
 public:
     /// The extent in the direction of the x-axis.
-    IfcLengthMeasure SizeInX();
-    void setSizeInX(IfcLengthMeasure v);
+    double SizeInX() const;
+    void setSizeInX(double v);
     /// The extent in the direction of the y-axis.
-    IfcLengthMeasure SizeInY();
-    void setSizeInY(IfcLengthMeasure v);
+    double SizeInY() const;
+    void setSizeInY(double v);
     virtual unsigned int getArgumentCount() const { return 2; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_DOUBLE; case 1: return IfcUtil::Argument_DOUBLE; } return IfcGeometricRepresentationItem::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcLengthMeasure; case 1: return Type::IfcLengthMeasure; } return IfcGeometricRepresentationItem::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "SizeInX"; case 1: return "SizeInY"; } return IfcGeometricRepresentationItem::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcPlanarExtent (IfcAbstractEntityPtr e);
-    IfcPlanarExtent (IfcLengthMeasure v1_SizeInX, IfcLengthMeasure v2_SizeInY);
-    typedef IfcPlanarExtent* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcPlanarExtent > > list;
-    typedef IfcTemplatedEntityList< IfcPlanarExtent >::it it;
+    IfcPlanarExtent (IfcAbstractEntity* e);
+    IfcPlanarExtent (double v1_SizeInX, double v2_SizeInY);
+    typedef IfcTemplatedEntityList< IfcPlanarExtent > list;
 };
 /// Definition from ISO/CD 10303-42:1992: A point is a location in some real Cartesian coordinate space Rm, for m = 1, 2 or 3.  
 /// 
@@ -16028,16 +17087,15 @@ class IfcPoint : public IfcGeometricRepresentationItem {
 public:
     virtual unsigned int getArgumentCount() const { return 0; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcGeometricRepresentationItem::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcGeometricRepresentationItem::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcGeometricRepresentationItem::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcPoint (IfcAbstractEntityPtr e);
+    IfcPoint (IfcAbstractEntity* e);
     IfcPoint ();
-    typedef IfcPoint* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcPoint > > list;
-    typedef IfcTemplatedEntityList< IfcPoint >::it it;
+    typedef IfcTemplatedEntityList< IfcPoint > list;
 };
 /// Definition from ISO/CD 10303-42:1992: A point on curve is a point which lies on a curve. The point is determined by evaluating the curve at a specific parameter value. The coordinate space dimensionality of the point is that of the basis curve. 
 /// 
@@ -16051,23 +17109,22 @@ class IfcPoint : public IfcGeometricRepresentationItem {
 class IfcPointOnCurve : public IfcPoint {
 public:
     /// The curve to which point parameter relates.
-    IfcCurve* BasisCurve();
+    IfcCurve* BasisCurve() const;
     void setBasisCurve(IfcCurve* v);
     /// The parameter value of the point location.
-    IfcParameterValue PointParameter();
-    void setPointParameter(IfcParameterValue v);
+    double PointParameter() const;
+    void setPointParameter(double v);
     virtual unsigned int getArgumentCount() const { return 2; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY; case 1: return IfcUtil::Argument_DOUBLE; } return IfcPoint::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcCurve; case 1: return Type::IfcParameterValue; } return IfcPoint::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "BasisCurve"; case 1: return "PointParameter"; } return IfcPoint::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcPointOnCurve (IfcAbstractEntityPtr e);
-    IfcPointOnCurve (IfcCurve* v1_BasisCurve, IfcParameterValue v2_PointParameter);
-    typedef IfcPointOnCurve* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcPointOnCurve > > list;
-    typedef IfcTemplatedEntityList< IfcPointOnCurve >::it it;
+    IfcPointOnCurve (IfcAbstractEntity* e);
+    IfcPointOnCurve (IfcCurve* v1_BasisCurve, double v2_PointParameter);
+    typedef IfcTemplatedEntityList< IfcPointOnCurve > list;
 };
 /// Definition from ISO/CD 10303-42:1992: A point on surface is a point which lies on a parametric surface. The point is determined by evaluating the surface at a particular pair of parameter values. 
 /// 
@@ -16081,26 +17138,25 @@ class IfcPointOnCurve : public IfcPoint {
 class IfcPointOnSurface : public IfcPoint {
 public:
     /// The surface to which the parameter values relate.
-    IfcSurface* BasisSurface();
+    IfcSurface* BasisSurface() const;
     void setBasisSurface(IfcSurface* v);
     /// The first parameter value of the point location.
-    IfcParameterValue PointParameterU();
-    void setPointParameterU(IfcParameterValue v);
+    double PointParameterU() const;
+    void setPointParameterU(double v);
     /// The second parameter value of the point location.
-    IfcParameterValue PointParameterV();
-    void setPointParameterV(IfcParameterValue v);
+    double PointParameterV() const;
+    void setPointParameterV(double v);
     virtual unsigned int getArgumentCount() const { return 3; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY; case 1: return IfcUtil::Argument_DOUBLE; case 2: return IfcUtil::Argument_DOUBLE; } return IfcPoint::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcSurface; case 1: return Type::IfcParameterValue; case 2: return Type::IfcParameterValue; } return IfcPoint::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "BasisSurface"; case 1: return "PointParameterU"; case 2: return "PointParameterV"; } return IfcPoint::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcPointOnSurface (IfcAbstractEntityPtr e);
-    IfcPointOnSurface (IfcSurface* v1_BasisSurface, IfcParameterValue v2_PointParameterU, IfcParameterValue v3_PointParameterV);
-    typedef IfcPointOnSurface* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcPointOnSurface > > list;
-    typedef IfcTemplatedEntityList< IfcPointOnSurface >::it it;
+    IfcPointOnSurface (IfcAbstractEntity* e);
+    IfcPointOnSurface (IfcSurface* v1_BasisSurface, double v2_PointParameterU, double v3_PointParameterV);
+    typedef IfcTemplatedEntityList< IfcPointOnSurface > list;
 };
 /// Definition from ISO/CD 10303-42:1992: A
 /// poly loop is a loop with straight edges bounding a planar region in
@@ -16144,20 +17200,19 @@ class IfcPointOnSurface : public IfcPoint {
 class IfcPolyLoop : public IfcLoop {
 public:
     /// List of points defining the loop. There are no repeated points in the list.
-    SHARED_PTR< IfcTemplatedEntityList< IfcCartesianPoint > > Polygon();
-    void setPolygon(SHARED_PTR< IfcTemplatedEntityList< IfcCartesianPoint > > v);
+    IfcTemplatedEntityList< IfcCartesianPoint >::ptr Polygon() const;
+    void setPolygon(IfcTemplatedEntityList< IfcCartesianPoint >::ptr v);
     virtual unsigned int getArgumentCount() const { return 1; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY_LIST; } return IfcLoop::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcCartesianPoint; } return IfcLoop::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Polygon"; } return IfcLoop::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcPolyLoop (IfcAbstractEntityPtr e);
-    IfcPolyLoop (SHARED_PTR< IfcTemplatedEntityList< IfcCartesianPoint > > v1_Polygon);
-    typedef IfcPolyLoop* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcPolyLoop > > list;
-    typedef IfcTemplatedEntityList< IfcPolyLoop >::it it;
+    IfcPolyLoop (IfcAbstractEntity* e);
+    IfcPolyLoop (IfcTemplatedEntityList< IfcCartesianPoint >::ptr v1_Polygon);
+    typedef IfcTemplatedEntityList< IfcPolyLoop > list;
 };
 /// The polygonal bounded
 /// half space is a special subtype of a half space solid, where the
@@ -16218,25 +17273,24 @@ class IfcPolyLoop : public IfcLoop {
 class IfcPolygonalBoundedHalfSpace : public IfcHalfSpaceSolid {
 public:
     /// Definition of the position coordinate system for the bounding polyline and the base surface.
-    IfcAxis2Placement3D* Position();
+    IfcAxis2Placement3D* Position() const;
     void setPosition(IfcAxis2Placement3D* v);
     /// Two-dimensional polyline bounded curve, defined in the xy plane of the position coordinate system.
     /// 
     /// IFC2x Edition 3 CHANGE  The attribute type has been changed from IfcPolyline to its supertype IfcBoundedCurve with upward compatibility for file based exchange.
-    IfcBoundedCurve* PolygonalBoundary();
+    IfcBoundedCurve* PolygonalBoundary() const;
     void setPolygonalBoundary(IfcBoundedCurve* v);
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 2: return IfcUtil::Argument_ENTITY; case 3: return IfcUtil::Argument_ENTITY; } return IfcHalfSpaceSolid::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 2: return Type::IfcAxis2Placement3D; case 3: return Type::IfcBoundedCurve; } return IfcHalfSpaceSolid::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 2: return "Position"; case 3: return "PolygonalBoundary"; } return IfcHalfSpaceSolid::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcPolygonalBoundedHalfSpace (IfcAbstractEntityPtr e);
+    IfcPolygonalBoundedHalfSpace (IfcAbstractEntity* e);
     IfcPolygonalBoundedHalfSpace (IfcSurface* v1_BaseSurface, bool v2_AgreementFlag, IfcAxis2Placement3D* v3_Position, IfcBoundedCurve* v4_PolygonalBoundary);
-    typedef IfcPolygonalBoundedHalfSpace* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcPolygonalBoundedHalfSpace > > list;
-    typedef IfcTemplatedEntityList< IfcPolygonalBoundedHalfSpace >::it it;
+    typedef IfcTemplatedEntityList< IfcPolygonalBoundedHalfSpace > list;
 };
 /// A pre defined item is a qualified name given to a style or font which is determined within the data exchange specification by convention on using the Name attribute value (in contrary to externally defined items, which are agreed by an external source).
 /// 
@@ -16248,36 +17302,34 @@ class IfcPolygonalBoundedHalfSpace : public IfcHalfSpaceSolid {
 class IfcPreDefinedItem : public IfcPresentationItem {
 public:
     /// The string by which the pre defined item is identified. Allowable values for the string are declared at the level of subtypes.
-    IfcLabel Name();
-    void setName(IfcLabel v);
+    std::string Name() const;
+    void setName(std::string v);
     virtual unsigned int getArgumentCount() const { return 1; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_STRING; } return IfcPresentationItem::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcLabel; } return IfcPresentationItem::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Name"; } return IfcPresentationItem::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcPreDefinedItem (IfcAbstractEntityPtr e);
-    IfcPreDefinedItem (IfcLabel v1_Name);
-    typedef IfcPreDefinedItem* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcPreDefinedItem > > list;
-    typedef IfcTemplatedEntityList< IfcPreDefinedItem >::it it;
+    IfcPreDefinedItem (IfcAbstractEntity* e);
+    IfcPreDefinedItem (std::string v1_Name);
+    typedef IfcTemplatedEntityList< IfcPreDefinedItem > list;
 };
 
 class IfcPreDefinedProperties : public IfcPropertyAbstraction {
 public:
     virtual unsigned int getArgumentCount() const { return 0; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcPropertyAbstraction::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcPropertyAbstraction::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcPropertyAbstraction::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcPreDefinedProperties (IfcAbstractEntityPtr e);
+    IfcPreDefinedProperties (IfcAbstractEntity* e);
     IfcPreDefinedProperties ();
-    typedef IfcPreDefinedProperties* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcPreDefinedProperties > > list;
-    typedef IfcTemplatedEntityList< IfcPreDefinedProperties >::it it;
+    typedef IfcTemplatedEntityList< IfcPreDefinedProperties > list;
 };
 /// The pre defined text font determines those qualified names which can be used for fonts that are in scope of the current data exchange specification (in contrary to externally defined text fonts). There are two choices:
 /// 
@@ -16294,16 +17346,15 @@ class IfcPreDefinedTextFont : public IfcPreDefinedItem {
 public:
     virtual unsigned int getArgumentCount() const { return 1; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcPreDefinedItem::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcPreDefinedItem::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcPreDefinedItem::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcPreDefinedTextFont (IfcAbstractEntityPtr e);
-    IfcPreDefinedTextFont (IfcLabel v1_Name);
-    typedef IfcPreDefinedTextFont* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcPreDefinedTextFont > > list;
-    typedef IfcTemplatedEntityList< IfcPreDefinedTextFont >::it it;
+    IfcPreDefinedTextFont (IfcAbstractEntity* e);
+    IfcPreDefinedTextFont (std::string v1_Name);
+    typedef IfcTemplatedEntityList< IfcPreDefinedTextFont > list;
 };
 /// The IfcProductDefinitionShape defines all shape relevant information about an IfcProduct. It allows for multiple geometric shape representations of the same product. The shape relevant information includes:
 /// 
@@ -16321,18 +17372,17 @@ class IfcProductDefinitionShape : public IfcProductRepresentation {
 public:
     virtual unsigned int getArgumentCount() const { return 3; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcProductRepresentation::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcProductRepresentation::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcProductRepresentation::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcProduct > > ShapeOfProduct(); // INVERSE IfcProduct::Representation
-    SHARED_PTR< IfcTemplatedEntityList< IfcShapeAspect > > HasShapeAspects(); // INVERSE IfcShapeAspect::PartOfProductDefinitionShape
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcProduct >::ptr ShapeOfProduct() const; // INVERSE IfcProduct::Representation
+    IfcTemplatedEntityList< IfcShapeAspect >::ptr HasShapeAspects() const; // INVERSE IfcShapeAspect::PartOfProductDefinitionShape
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcProductDefinitionShape (IfcAbstractEntityPtr e);
-    IfcProductDefinitionShape (boost::optional< IfcLabel > v1_Name, boost::optional< IfcText > v2_Description, SHARED_PTR< IfcTemplatedEntityList< IfcRepresentation > > v3_Representations);
-    typedef IfcProductDefinitionShape* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcProductDefinitionShape > > list;
-    typedef IfcTemplatedEntityList< IfcProductDefinitionShape >::it it;
+    IfcProductDefinitionShape (IfcAbstractEntity* e);
+    IfcProductDefinitionShape (boost::optional< std::string > v1_Name, boost::optional< std::string > v2_Description, IfcTemplatedEntityList< IfcRepresentation >::ptr v3_Representations);
+    typedef IfcTemplatedEntityList< IfcProductDefinitionShape > list;
 };
 /// This is a collection of properties applicable to section profile definitions.
 /// 
@@ -16348,20 +17398,19 @@ class IfcProductDefinitionShape : public IfcProductRepresentation {
 class IfcProfileProperties : public IfcExtendedProperties {
 public:
     /// Profile definition which is qualified by these properties.
-    IfcProfileDef* ProfileDefinition();
+    IfcProfileDef* ProfileDefinition() const;
     void setProfileDefinition(IfcProfileDef* v);
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 3: return IfcUtil::Argument_ENTITY; } return IfcExtendedProperties::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 3: return Type::IfcProfileDef; } return IfcExtendedProperties::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 3: return "ProfileDefinition"; } return IfcExtendedProperties::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcProfileProperties (IfcAbstractEntityPtr e);
-    IfcProfileProperties (boost::optional< IfcIdentifier > v1_Name, boost::optional< IfcText > v2_Description, SHARED_PTR< IfcTemplatedEntityList< IfcProperty > > v3_Properties, IfcProfileDef* v4_ProfileDefinition);
-    typedef IfcProfileProperties* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcProfileProperties > > list;
-    typedef IfcTemplatedEntityList< IfcProfileProperties >::it it;
+    IfcProfileProperties (IfcAbstractEntity* e);
+    IfcProfileProperties (boost::optional< std::string > v1_Name, boost::optional< std::string > v2_Description, IfcTemplatedEntityList< IfcProperty >::ptr v3_Properties, IfcProfileDef* v4_ProfileDefinition);
+    typedef IfcTemplatedEntityList< IfcProfileProperties > list;
 };
 /// IfcProperty is an abstract generalization for all types of properties that can be associated with IFC objects through the property set mechanism. 
 /// 
@@ -16369,29 +17418,28 @@ class IfcProfileProperties : public IfcExtendedProperties {
 class IfcProperty : public IfcPropertyAbstraction {
 public:
     /// Name for this property. This label is the significant name string that defines the semantic meaning for the property.
-    IfcIdentifier Name();
-    void setName(IfcIdentifier v);
+    std::string Name() const;
+    void setName(std::string v);
     /// Whether the optional attribute Description is defined for this IfcProperty
-    bool hasDescription();
+    bool hasDescription() const;
     /// Informative text to explain the property.
-    IfcText Description();
-    void setDescription(IfcText v);
+    std::string Description() const;
+    void setDescription(std::string v);
     virtual unsigned int getArgumentCount() const { return 2; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_STRING; case 1: return IfcUtil::Argument_STRING; } return IfcPropertyAbstraction::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcIdentifier; case 1: return Type::IfcText; } return IfcPropertyAbstraction::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Name"; case 1: return "Description"; } return IfcPropertyAbstraction::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcPropertySet > > PartOfPset(); // INVERSE IfcPropertySet::HasProperties
-    SHARED_PTR< IfcTemplatedEntityList< IfcPropertyDependencyRelationship > > PropertyForDependance(); // INVERSE IfcPropertyDependencyRelationship::DependingProperty
-    SHARED_PTR< IfcTemplatedEntityList< IfcPropertyDependencyRelationship > > PropertyDependsOn(); // INVERSE IfcPropertyDependencyRelationship::DependantProperty
-    SHARED_PTR< IfcTemplatedEntityList< IfcComplexProperty > > PartOfComplex(); // INVERSE IfcComplexProperty::HasProperties
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcPropertySet >::ptr PartOfPset() const; // INVERSE IfcPropertySet::HasProperties
+    IfcTemplatedEntityList< IfcPropertyDependencyRelationship >::ptr PropertyForDependance() const; // INVERSE IfcPropertyDependencyRelationship::DependingProperty
+    IfcTemplatedEntityList< IfcPropertyDependencyRelationship >::ptr PropertyDependsOn() const; // INVERSE IfcPropertyDependencyRelationship::DependantProperty
+    IfcTemplatedEntityList< IfcComplexProperty >::ptr PartOfComplex() const; // INVERSE IfcComplexProperty::HasProperties
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcProperty (IfcAbstractEntityPtr e);
-    IfcProperty (IfcIdentifier v1_Name, boost::optional< IfcText > v2_Description);
-    typedef IfcProperty* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcProperty > > list;
-    typedef IfcTemplatedEntityList< IfcProperty >::it it;
+    IfcProperty (IfcAbstractEntity* e);
+    IfcProperty (std::string v1_Name, boost::optional< std::string > v2_Description);
+    typedef IfcTemplatedEntityList< IfcProperty > list;
 };
 /// IfcPropertyDefinition defines the generalization of
 /// all characteristics (i.e. a grouping of individual properties),
@@ -16447,18 +17495,17 @@ class IfcPropertyDefinition : public IfcRoot {
 public:
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcRoot::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcRoot::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcRoot::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelDeclares > > HasContext(); // INVERSE IfcRelDeclares::RelatedDefinitions
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelAssociates > > HasAssociations(); // INVERSE IfcRelAssociates::RelatedObjects
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcRelDeclares >::ptr HasContext() const; // INVERSE IfcRelDeclares::RelatedDefinitions
+    IfcTemplatedEntityList< IfcRelAssociates >::ptr HasAssociations() const; // INVERSE IfcRelAssociates::RelatedObjects
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcPropertyDefinition (IfcAbstractEntityPtr e);
-    IfcPropertyDefinition (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description);
-    typedef IfcPropertyDefinition* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcPropertyDefinition > > list;
-    typedef IfcTemplatedEntityList< IfcPropertyDefinition >::it it;
+    IfcPropertyDefinition (IfcAbstractEntity* e);
+    IfcPropertyDefinition (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description);
+    typedef IfcTemplatedEntityList< IfcPropertyDefinition > list;
 };
 /// An IfcPropertyDependencyRelationship describes an identified dependency between the value of one property and that of another.
 /// 
@@ -16471,28 +17518,27 @@ class IfcPropertyDefinition : public IfcRoot {
 class IfcPropertyDependencyRelationship : public IfcResourceLevelRelationship {
 public:
     /// The property on which the relationship depends.
-    IfcProperty* DependingProperty();
+    IfcProperty* DependingProperty() const;
     void setDependingProperty(IfcProperty* v);
     /// The dependant property.
-    IfcProperty* DependantProperty();
+    IfcProperty* DependantProperty() const;
     void setDependantProperty(IfcProperty* v);
     /// Whether the optional attribute Expression is defined for this IfcPropertyDependencyRelationship
-    bool hasExpression();
+    bool hasExpression() const;
     /// Expression that further describes the nature of the dependency relation.
-    IfcText Expression();
-    void setExpression(IfcText v);
+    std::string Expression() const;
+    void setExpression(std::string v);
     virtual unsigned int getArgumentCount() const { return 5; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 2: return IfcUtil::Argument_ENTITY; case 3: return IfcUtil::Argument_ENTITY; case 4: return IfcUtil::Argument_STRING; } return IfcResourceLevelRelationship::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 2: return Type::IfcProperty; case 3: return Type::IfcProperty; case 4: return Type::IfcText; } return IfcResourceLevelRelationship::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 2: return "DependingProperty"; case 3: return "DependantProperty"; case 4: return "Expression"; } return IfcResourceLevelRelationship::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcPropertyDependencyRelationship (IfcAbstractEntityPtr e);
-    IfcPropertyDependencyRelationship (boost::optional< IfcLabel > v1_Name, boost::optional< IfcText > v2_Description, IfcProperty* v3_DependingProperty, IfcProperty* v4_DependantProperty, boost::optional< IfcText > v5_Expression);
-    typedef IfcPropertyDependencyRelationship* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcPropertyDependencyRelationship > > list;
-    typedef IfcTemplatedEntityList< IfcPropertyDependencyRelationship >::it it;
+    IfcPropertyDependencyRelationship (IfcAbstractEntity* e);
+    IfcPropertyDependencyRelationship (boost::optional< std::string > v1_Name, boost::optional< std::string > v2_Description, IfcProperty* v3_DependingProperty, IfcProperty* v4_DependantProperty, boost::optional< std::string > v5_Expression);
+    typedef IfcTemplatedEntityList< IfcPropertyDependencyRelationship > list;
 };
 /// IfcPropertySetDefinition is a generalization of all
 /// individual property sets that can be assigned to an object or type
@@ -16540,19 +17586,18 @@ class IfcPropertySetDefinition : public IfcPropertyDefinition {
 public:
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcPropertyDefinition::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcPropertyDefinition::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcPropertyDefinition::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcTypeObject > > DefinesType(); // INVERSE IfcTypeObject::HasPropertySets
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelDefinesByTemplate > > IsDefinedBy(); // INVERSE IfcRelDefinesByTemplate::RelatedPropertySets
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelDefinesByProperties > > DefinesOccurrence(); // INVERSE IfcRelDefinesByProperties::RelatingPropertyDefinition
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcTypeObject >::ptr DefinesType() const; // INVERSE IfcTypeObject::HasPropertySets
+    IfcTemplatedEntityList< IfcRelDefinesByTemplate >::ptr IsDefinedBy() const; // INVERSE IfcRelDefinesByTemplate::RelatedPropertySets
+    IfcTemplatedEntityList< IfcRelDefinesByProperties >::ptr DefinesOccurrence() const; // INVERSE IfcRelDefinesByProperties::RelatingPropertyDefinition
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcPropertySetDefinition (IfcAbstractEntityPtr e);
-    IfcPropertySetDefinition (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description);
-    typedef IfcPropertySetDefinition* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > list;
-    typedef IfcTemplatedEntityList< IfcPropertySetDefinition >::it it;
+    IfcPropertySetDefinition (IfcAbstractEntity* e);
+    IfcPropertySetDefinition (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description);
+    typedef IfcTemplatedEntityList< IfcPropertySetDefinition > list;
 };
 /// IfcPropertyTemplateDefinition is a generalization of
 /// all property and property set templates. Templates define the
@@ -16583,32 +17628,30 @@ class IfcPropertyTemplateDefinition : public IfcPropertyDefinition {
 public:
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcPropertyDefinition::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcPropertyDefinition::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcPropertyDefinition::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcPropertyTemplateDefinition (IfcAbstractEntityPtr e);
-    IfcPropertyTemplateDefinition (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description);
-    typedef IfcPropertyTemplateDefinition* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcPropertyTemplateDefinition > > list;
-    typedef IfcTemplatedEntityList< IfcPropertyTemplateDefinition >::it it;
+    IfcPropertyTemplateDefinition (IfcAbstractEntity* e);
+    IfcPropertyTemplateDefinition (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description);
+    typedef IfcTemplatedEntityList< IfcPropertyTemplateDefinition > list;
 };
 
 class IfcQuantitySet : public IfcPropertySetDefinition {
 public:
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcPropertySetDefinition::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcPropertySetDefinition::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcPropertySetDefinition::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcQuantitySet (IfcAbstractEntityPtr e);
-    IfcQuantitySet (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description);
-    typedef IfcQuantitySet* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcQuantitySet > > list;
-    typedef IfcTemplatedEntityList< IfcQuantitySet >::it it;
+    IfcQuantitySet (IfcAbstractEntity* e);
+    IfcQuantitySet (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description);
+    typedef IfcTemplatedEntityList< IfcQuantitySet > list;
 };
 /// IfcRectangleProfileDef defines a rectangle as the profile definition used by the swept surface geometry or the swept area solid. It is given by its X extent and its Y extent, and placed within the 2D position coordinate system, established by the Position attribute. It is placed centric within the position coordinate system. 
 /// 
@@ -16647,23 +17690,22 @@ class IfcQuantitySet : public IfcPropertySetDefinition {
 class IfcRectangleProfileDef : public IfcParameterizedProfileDef {
 public:
     /// The extent of the rectangle in the direction of the x-axis.
-    IfcPositiveLengthMeasure XDim();
-    void setXDim(IfcPositiveLengthMeasure v);
+    double XDim() const;
+    void setXDim(double v);
     /// The extent of the rectangle in the direction of the y-axis.
-    IfcPositiveLengthMeasure YDim();
-    void setYDim(IfcPositiveLengthMeasure v);
+    double YDim() const;
+    void setYDim(double v);
     virtual unsigned int getArgumentCount() const { return 5; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 3: return IfcUtil::Argument_DOUBLE; case 4: return IfcUtil::Argument_DOUBLE; } return IfcParameterizedProfileDef::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 3: return Type::IfcPositiveLengthMeasure; case 4: return Type::IfcPositiveLengthMeasure; } return IfcParameterizedProfileDef::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 3: return "XDim"; case 4: return "YDim"; } return IfcParameterizedProfileDef::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRectangleProfileDef (IfcAbstractEntityPtr e);
-    IfcRectangleProfileDef (IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< IfcLabel > v2_ProfileName, IfcAxis2Placement2D* v3_Position, IfcPositiveLengthMeasure v4_XDim, IfcPositiveLengthMeasure v5_YDim);
-    typedef IfcRectangleProfileDef* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRectangleProfileDef > > list;
-    typedef IfcTemplatedEntityList< IfcRectangleProfileDef >::it it;
+    IfcRectangleProfileDef (IfcAbstractEntity* e);
+    IfcRectangleProfileDef (IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< std::string > v2_ProfileName, IfcAxis2Placement2D* v3_Position, double v4_XDim, double v5_YDim);
+    typedef IfcTemplatedEntityList< IfcRectangleProfileDef > list;
 };
 /// In a regular time series, the data arrives predictably at predefined intervals. In a regular time series there is no need to store multiple time stamps and the algorithms for analyzing the time series are therefore significantly simpler.  Using the start time provided in the supertype, the time step is used to identify the frequency of the occurrences of the list of values.
 /// 
@@ -16673,23 +17715,22 @@ class IfcRectangleProfileDef : public IfcParameterizedProfileDef {
 class IfcRegularTimeSeries : public IfcTimeSeries {
 public:
     /// A duration of time intervals between values.
-    IfcTimeMeasure TimeStep();
-    void setTimeStep(IfcTimeMeasure v);
+    double TimeStep() const;
+    void setTimeStep(double v);
     /// The collection of time series values.
-    SHARED_PTR< IfcTemplatedEntityList< IfcTimeSeriesValue > > Values();
-    void setValues(SHARED_PTR< IfcTemplatedEntityList< IfcTimeSeriesValue > > v);
+    IfcTemplatedEntityList< IfcTimeSeriesValue >::ptr Values() const;
+    void setValues(IfcTemplatedEntityList< IfcTimeSeriesValue >::ptr v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_DOUBLE; case 9: return IfcUtil::Argument_ENTITY_LIST; } return IfcTimeSeries::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcTimeMeasure; case 9: return Type::IfcTimeSeriesValue; } return IfcTimeSeries::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "TimeStep"; case 9: return "Values"; } return IfcTimeSeries::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRegularTimeSeries (IfcAbstractEntityPtr e);
-    IfcRegularTimeSeries (IfcLabel v1_Name, boost::optional< IfcText > v2_Description, IfcDateTime v3_StartTime, IfcDateTime v4_EndTime, IfcTimeSeriesDataTypeEnum::IfcTimeSeriesDataTypeEnum v5_TimeSeriesDataType, IfcDataOriginEnum::IfcDataOriginEnum v6_DataOrigin, boost::optional< IfcLabel > v7_UserDefinedDataOrigin, boost::optional< IfcUnit > v8_Unit, IfcTimeMeasure v9_TimeStep, SHARED_PTR< IfcTemplatedEntityList< IfcTimeSeriesValue > > v10_Values);
-    typedef IfcRegularTimeSeries* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRegularTimeSeries > > list;
-    typedef IfcTemplatedEntityList< IfcRegularTimeSeries >::it it;
+    IfcRegularTimeSeries (IfcAbstractEntity* e);
+    IfcRegularTimeSeries (std::string v1_Name, boost::optional< std::string > v2_Description, std::string v3_StartTime, std::string v4_EndTime, IfcTimeSeriesDataTypeEnum::IfcTimeSeriesDataTypeEnum v5_TimeSeriesDataType, IfcDataOriginEnum::IfcDataOriginEnum v6_DataOrigin, boost::optional< std::string > v7_UserDefinedDataOrigin, IfcUnit* v8_Unit, double v9_TimeStep, IfcTemplatedEntityList< IfcTimeSeriesValue >::ptr v10_Values);
+    typedef IfcTemplatedEntityList< IfcRegularTimeSeries > list;
 };
 /// IfcReinforcementProperties defines the set of properties for a specific combination of reinforcement bar steel grade, bar type and effective depth. 
 /// 
@@ -16699,43 +17740,42 @@ class IfcRegularTimeSeries : public IfcTimeSeries {
 class IfcReinforcementBarProperties : public IfcPreDefinedProperties {
 public:
     /// The total effective cross-section area of the reinforcement of a specific steel grade.
-    IfcAreaMeasure TotalCrossSectionArea();
-    void setTotalCrossSectionArea(IfcAreaMeasure v);
+    double TotalCrossSectionArea() const;
+    void setTotalCrossSectionArea(double v);
     /// The nominal steel grade defined according to local standards.
-    IfcLabel SteelGrade();
-    void setSteelGrade(IfcLabel v);
+    std::string SteelGrade() const;
+    void setSteelGrade(std::string v);
     /// Whether the optional attribute BarSurface is defined for this IfcReinforcementBarProperties
-    bool hasBarSurface();
+    bool hasBarSurface() const;
     /// Indicator for whether the bar surface is plain or textured.
-    IfcReinforcingBarSurfaceEnum::IfcReinforcingBarSurfaceEnum BarSurface();
+    IfcReinforcingBarSurfaceEnum::IfcReinforcingBarSurfaceEnum BarSurface() const;
     void setBarSurface(IfcReinforcingBarSurfaceEnum::IfcReinforcingBarSurfaceEnum v);
     /// Whether the optional attribute EffectiveDepth is defined for this IfcReinforcementBarProperties
-    bool hasEffectiveDepth();
+    bool hasEffectiveDepth() const;
     /// The effective depth, i.e. the distance of the specific reinforcement cross section area or reinforcement configuration in a row, counted from a common specific reference point. Usually the reference point is the upper surface (for beams and slabs) or a similar projection in a plane (for columns).
-    IfcLengthMeasure EffectiveDepth();
-    void setEffectiveDepth(IfcLengthMeasure v);
+    double EffectiveDepth() const;
+    void setEffectiveDepth(double v);
     /// Whether the optional attribute NominalBarDiameter is defined for this IfcReinforcementBarProperties
-    bool hasNominalBarDiameter();
+    bool hasNominalBarDiameter() const;
     /// The nominal diameter defining the cross-section size of the reinforcing bar. The bar diameter should be identical for all bars included in the specific reinforcement configuration.
-    IfcPositiveLengthMeasure NominalBarDiameter();
-    void setNominalBarDiameter(IfcPositiveLengthMeasure v);
+    double NominalBarDiameter() const;
+    void setNominalBarDiameter(double v);
     /// Whether the optional attribute BarCount is defined for this IfcReinforcementBarProperties
-    bool hasBarCount();
+    bool hasBarCount() const;
     /// The number of bars with identical nominal diameter and steel grade included in the specific reinforcement configuration.
-    IfcCountMeasure BarCount();
-    void setBarCount(IfcCountMeasure v);
+    double BarCount() const;
+    void setBarCount(double v);
     virtual unsigned int getArgumentCount() const { return 6; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_DOUBLE; case 1: return IfcUtil::Argument_STRING; case 2: return IfcUtil::Argument_ENUMERATION; case 3: return IfcUtil::Argument_DOUBLE; case 4: return IfcUtil::Argument_DOUBLE; case 5: return IfcUtil::Argument_DOUBLE; } return IfcPreDefinedProperties::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcAreaMeasure; case 1: return Type::IfcLabel; case 2: return Type::IfcReinforcingBarSurfaceEnum; case 3: return Type::IfcLengthMeasure; case 4: return Type::IfcPositiveLengthMeasure; case 5: return Type::IfcCountMeasure; } return IfcPreDefinedProperties::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "TotalCrossSectionArea"; case 1: return "SteelGrade"; case 2: return "BarSurface"; case 3: return "EffectiveDepth"; case 4: return "NominalBarDiameter"; case 5: return "BarCount"; } return IfcPreDefinedProperties::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcReinforcementBarProperties (IfcAbstractEntityPtr e);
-    IfcReinforcementBarProperties (IfcAreaMeasure v1_TotalCrossSectionArea, IfcLabel v2_SteelGrade, boost::optional< IfcReinforcingBarSurfaceEnum::IfcReinforcingBarSurfaceEnum > v3_BarSurface, boost::optional< IfcLengthMeasure > v4_EffectiveDepth, boost::optional< IfcPositiveLengthMeasure > v5_NominalBarDiameter, boost::optional< IfcCountMeasure > v6_BarCount);
-    typedef IfcReinforcementBarProperties* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcReinforcementBarProperties > > list;
-    typedef IfcTemplatedEntityList< IfcReinforcementBarProperties >::it it;
+    IfcReinforcementBarProperties (IfcAbstractEntity* e);
+    IfcReinforcementBarProperties (double v1_TotalCrossSectionArea, std::string v2_SteelGrade, boost::optional< IfcReinforcingBarSurfaceEnum::IfcReinforcingBarSurfaceEnum > v3_BarSurface, boost::optional< double > v4_EffectiveDepth, boost::optional< double > v5_NominalBarDiameter, boost::optional< double > v6_BarCount);
+    typedef IfcTemplatedEntityList< IfcReinforcementBarProperties > list;
 };
 /// IfcRelationship is the abstract generalization of all objectified relationships in IFC. Objectified relationships are the preferred way to handle relationships among objects. This allows to keep relationship specific properties directly at the relationship and opens the possibility to later handle relationship specific behavior.  
 /// 
@@ -16749,16 +17789,15 @@ class IfcRelationship : public IfcRoot {
 public:
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcRoot::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcRoot::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcRoot::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRelationship (IfcAbstractEntityPtr e);
-    IfcRelationship (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description);
-    typedef IfcRelationship* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRelationship > > list;
-    typedef IfcTemplatedEntityList< IfcRelationship >::it it;
+    IfcRelationship (IfcAbstractEntity* e);
+    IfcRelationship (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description);
+    typedef IfcTemplatedEntityList< IfcRelationship > list;
 };
 /// An IfcResourceApprovalRelationship is used for
 /// associating an approval to resource objects. A single approval
@@ -16769,23 +17808,22 @@ class IfcRelationship : public IfcRoot {
 class IfcResourceApprovalRelationship : public IfcResourceLevelRelationship {
 public:
     /// Resource objects that are approved.
-    SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > RelatedResourceObjects();
-    void setRelatedResourceObjects(SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > v);
+    IfcEntityList::ptr RelatedResourceObjects() const;
+    void setRelatedResourceObjects(IfcEntityList::ptr v);
     /// The approval for the resource objects selected.
-    IfcApproval* RelatingApproval();
+    IfcApproval* RelatingApproval() const;
     void setRelatingApproval(IfcApproval* v);
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 2: return IfcUtil::Argument_ENTITY_LIST; case 3: return IfcUtil::Argument_ENTITY; } return IfcResourceLevelRelationship::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 2: return Type::IfcResourceObjectSelect; case 3: return Type::IfcApproval; } return IfcResourceLevelRelationship::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 2: return "RelatedResourceObjects"; case 3: return "RelatingApproval"; } return IfcResourceLevelRelationship::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcResourceApprovalRelationship (IfcAbstractEntityPtr e);
-    IfcResourceApprovalRelationship (boost::optional< IfcLabel > v1_Name, boost::optional< IfcText > v2_Description, IfcEntities v3_RelatedResourceObjects, IfcApproval* v4_RelatingApproval);
-    typedef IfcResourceApprovalRelationship* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcResourceApprovalRelationship > > list;
-    typedef IfcTemplatedEntityList< IfcResourceApprovalRelationship >::it it;
+    IfcResourceApprovalRelationship (IfcAbstractEntity* e);
+    IfcResourceApprovalRelationship (boost::optional< std::string > v1_Name, boost::optional< std::string > v2_Description, IfcEntityList::ptr v3_RelatedResourceObjects, IfcApproval* v4_RelatingApproval);
+    typedef IfcTemplatedEntityList< IfcResourceApprovalRelationship > list;
 };
 /// An IfcResourceConstraintRelationship is a relationship
 /// entity that enables a constraint to be related to one or more
@@ -16810,115 +17848,113 @@ class IfcResourceApprovalRelationship : public IfcResourceLevelRelationship {
 class IfcResourceConstraintRelationship : public IfcResourceLevelRelationship {
 public:
     /// The constraint that is to be related.
-    IfcConstraint* RelatingConstraint();
+    IfcConstraint* RelatingConstraint() const;
     void setRelatingConstraint(IfcConstraint* v);
     /// The properties to which a constraint is to be related.
-    SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > RelatedResourceObjects();
-    void setRelatedResourceObjects(SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > v);
+    IfcEntityList::ptr RelatedResourceObjects() const;
+    void setRelatedResourceObjects(IfcEntityList::ptr v);
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 2: return IfcUtil::Argument_ENTITY; case 3: return IfcUtil::Argument_ENTITY_LIST; } return IfcResourceLevelRelationship::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 2: return Type::IfcConstraint; case 3: return Type::IfcResourceObjectSelect; } return IfcResourceLevelRelationship::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 2: return "RelatingConstraint"; case 3: return "RelatedResourceObjects"; } return IfcResourceLevelRelationship::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcResourceConstraintRelationship (IfcAbstractEntityPtr e);
-    IfcResourceConstraintRelationship (boost::optional< IfcLabel > v1_Name, boost::optional< IfcText > v2_Description, IfcConstraint* v3_RelatingConstraint, IfcEntities v4_RelatedResourceObjects);
-    typedef IfcResourceConstraintRelationship* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcResourceConstraintRelationship > > list;
-    typedef IfcTemplatedEntityList< IfcResourceConstraintRelationship >::it it;
+    IfcResourceConstraintRelationship (IfcAbstractEntity* e);
+    IfcResourceConstraintRelationship (boost::optional< std::string > v1_Name, boost::optional< std::string > v2_Description, IfcConstraint* v3_RelatingConstraint, IfcEntityList::ptr v4_RelatedResourceObjects);
+    typedef IfcTemplatedEntityList< IfcResourceConstraintRelationship > list;
 };
 /// IfcResourceTime captures the time-related information about a construction resource.
 ///   HISTORY: New entity in IFC2x4.
 class IfcResourceTime : public IfcSchedulingTime {
 public:
     /// Whether the optional attribute ScheduleWork is defined for this IfcResourceTime
-    bool hasScheduleWork();
+    bool hasScheduleWork() const;
     /// Indicates the total work (e.g. person-hours) allocated to the task on behalf of the resource. 
     /// Note: this is not necessarily the same as the task duration (IfcTaskTime.ScheduleDuration); it may vary according to the resource usage ratio and other resources assigned to the task.
-    IfcDuration ScheduleWork();
-    void setScheduleWork(IfcDuration v);
+    std::string ScheduleWork() const;
+    void setScheduleWork(std::string v);
     /// Whether the optional attribute ScheduleUsage is defined for this IfcResourceTime
-    bool hasScheduleUsage();
+    bool hasScheduleUsage() const;
     /// Indicates the amount of the resource used concurrently. For example, 100% means 1 worker, 300% means 3 workers, 50% means half of 1 worker's time for scenarios where multitasking is feasible. If not provided, then the usage ratio is considered to be 100%.
-    IfcPositiveRatioMeasure ScheduleUsage();
-    void setScheduleUsage(IfcPositiveRatioMeasure v);
+    double ScheduleUsage() const;
+    void setScheduleUsage(double v);
     /// Whether the optional attribute ScheduleStart is defined for this IfcResourceTime
-    bool hasScheduleStart();
+    bool hasScheduleStart() const;
     /// Indicates the time when the resource is scheduled to start working.
-    IfcDateTime ScheduleStart();
-    void setScheduleStart(IfcDateTime v);
+    std::string ScheduleStart() const;
+    void setScheduleStart(std::string v);
     /// Whether the optional attribute ScheduleFinish is defined for this IfcResourceTime
-    bool hasScheduleFinish();
+    bool hasScheduleFinish() const;
     /// Indicates the time when the resource is scheduled to finish working.
-    IfcDateTime ScheduleFinish();
-    void setScheduleFinish(IfcDateTime v);
+    std::string ScheduleFinish() const;
+    void setScheduleFinish(std::string v);
     /// Whether the optional attribute ScheduleContour is defined for this IfcResourceTime
-    bool hasScheduleContour();
+    bool hasScheduleContour() const;
     /// Indicates how a resource should be leveled over time by adjusting the resource usage according to a specified curve.  Standard values include: 'Flat', 'BackLoaded', 'FrontLoaded', 'DoublePeak', 'EarlyPeak', 'LatePeak', 'Bell', and 'Turtle'.  Custom values may specify a custom name or formula.
-    IfcLabel ScheduleContour();
-    void setScheduleContour(IfcLabel v);
+    std::string ScheduleContour() const;
+    void setScheduleContour(std::string v);
     /// Whether the optional attribute LevelingDelay is defined for this IfcResourceTime
-    bool hasLevelingDelay();
+    bool hasLevelingDelay() const;
     /// Indicates a delay in the ScheduleStart caused by leveling.
-    IfcDuration LevelingDelay();
-    void setLevelingDelay(IfcDuration v);
+    std::string LevelingDelay() const;
+    void setLevelingDelay(std::string v);
     /// Whether the optional attribute IsOverAllocated is defined for this IfcResourceTime
-    bool hasIsOverAllocated();
+    bool hasIsOverAllocated() const;
     /// Indicates that the resource is scheduled in excess of its capacity.
-    bool IsOverAllocated();
+    bool IsOverAllocated() const;
     void setIsOverAllocated(bool v);
     /// Whether the optional attribute StatusTime is defined for this IfcResourceTime
-    bool hasStatusTime();
+    bool hasStatusTime() const;
     /// Indicates the date and time for which status values are applicable; particularly completion, actual, and remaining values.  If values are time-phased (the referencing IfcConstructionResource has associated time series values for attributes), then the status values may be determined from such time-phased data as of the StatusTime.
-    IfcDateTime StatusTime();
-    void setStatusTime(IfcDateTime v);
+    std::string StatusTime() const;
+    void setStatusTime(std::string v);
     /// Whether the optional attribute ActualWork is defined for this IfcResourceTime
-    bool hasActualWork();
+    bool hasActualWork() const;
     /// Indicates the actual work performed by the resource as of the StatusTime.
-    IfcDuration ActualWork();
-    void setActualWork(IfcDuration v);
+    std::string ActualWork() const;
+    void setActualWork(std::string v);
     /// Whether the optional attribute ActualUsage is defined for this IfcResourceTime
-    bool hasActualUsage();
+    bool hasActualUsage() const;
     /// Indicates the actual amount of the resource used concurrently.
-    IfcPositiveRatioMeasure ActualUsage();
-    void setActualUsage(IfcPositiveRatioMeasure v);
+    double ActualUsage() const;
+    void setActualUsage(double v);
     /// Whether the optional attribute ActualStart is defined for this IfcResourceTime
-    bool hasActualStart();
+    bool hasActualStart() const;
     /// Indicates the time when the resource actually started working.
-    IfcDateTime ActualStart();
-    void setActualStart(IfcDateTime v);
+    std::string ActualStart() const;
+    void setActualStart(std::string v);
     /// Whether the optional attribute ActualFinish is defined for this IfcResourceTime
-    bool hasActualFinish();
+    bool hasActualFinish() const;
     /// Indicates the time when the resource actually finished working.
-    IfcDateTime ActualFinish();
-    void setActualFinish(IfcDateTime v);
+    std::string ActualFinish() const;
+    void setActualFinish(std::string v);
     /// Whether the optional attribute RemainingWork is defined for this IfcResourceTime
-    bool hasRemainingWork();
+    bool hasRemainingWork() const;
     /// Indicates the work remaining to be completed by the resource.
-    IfcDuration RemainingWork();
-    void setRemainingWork(IfcDuration v);
+    std::string RemainingWork() const;
+    void setRemainingWork(std::string v);
     /// Whether the optional attribute RemainingUsage is defined for this IfcResourceTime
-    bool hasRemainingUsage();
-    IfcPositiveRatioMeasure RemainingUsage();
-    void setRemainingUsage(IfcPositiveRatioMeasure v);
+    bool hasRemainingUsage() const;
+    double RemainingUsage() const;
+    void setRemainingUsage(double v);
     /// Whether the optional attribute Completion is defined for this IfcResourceTime
-    bool hasCompletion();
+    bool hasCompletion() const;
     /// Indicates the percent completion of this resource.  If the resource is assigned to a task, then indicates completion of the task on behalf of the resource; if the resource is partitioned into sub-allocations, then indicates overall completion of sub-allocations.
-    IfcPositiveRatioMeasure Completion();
-    void setCompletion(IfcPositiveRatioMeasure v);
+    double Completion() const;
+    void setCompletion(double v);
     virtual unsigned int getArgumentCount() const { return 18; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 3: return IfcUtil::Argument_STRING; case 4: return IfcUtil::Argument_DOUBLE; case 5: return IfcUtil::Argument_STRING; case 6: return IfcUtil::Argument_STRING; case 7: return IfcUtil::Argument_STRING; case 8: return IfcUtil::Argument_STRING; case 9: return IfcUtil::Argument_BOOL; case 10: return IfcUtil::Argument_STRING; case 11: return IfcUtil::Argument_STRING; case 12: return IfcUtil::Argument_DOUBLE; case 13: return IfcUtil::Argument_STRING; case 14: return IfcUtil::Argument_STRING; case 15: return IfcUtil::Argument_STRING; case 16: return IfcUtil::Argument_DOUBLE; case 17: return IfcUtil::Argument_DOUBLE; } return IfcSchedulingTime::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 3: return Type::IfcDuration; case 4: return Type::IfcPositiveRatioMeasure; case 5: return Type::IfcDateTime; case 6: return Type::IfcDateTime; case 7: return Type::IfcLabel; case 8: return Type::IfcDuration; case 9: return Type::UNDEFINED; case 10: return Type::IfcDateTime; case 11: return Type::IfcDuration; case 12: return Type::IfcPositiveRatioMeasure; case 13: return Type::IfcDateTime; case 14: return Type::IfcDateTime; case 15: return Type::IfcDuration; case 16: return Type::IfcPositiveRatioMeasure; case 17: return Type::IfcPositiveRatioMeasure; } return IfcSchedulingTime::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 3: return "ScheduleWork"; case 4: return "ScheduleUsage"; case 5: return "ScheduleStart"; case 6: return "ScheduleFinish"; case 7: return "ScheduleContour"; case 8: return "LevelingDelay"; case 9: return "IsOverAllocated"; case 10: return "StatusTime"; case 11: return "ActualWork"; case 12: return "ActualUsage"; case 13: return "ActualStart"; case 14: return "ActualFinish"; case 15: return "RemainingWork"; case 16: return "RemainingUsage"; case 17: return "Completion"; } return IfcSchedulingTime::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcResourceTime (IfcAbstractEntityPtr e);
-    IfcResourceTime (boost::optional< IfcLabel > v1_Name, boost::optional< IfcDataOriginEnum::IfcDataOriginEnum > v2_DataOrigin, boost::optional< IfcLabel > v3_UserDefinedDataOrigin, boost::optional< IfcDuration > v4_ScheduleWork, boost::optional< IfcPositiveRatioMeasure > v5_ScheduleUsage, boost::optional< IfcDateTime > v6_ScheduleStart, boost::optional< IfcDateTime > v7_ScheduleFinish, boost::optional< IfcLabel > v8_ScheduleContour, boost::optional< IfcDuration > v9_LevelingDelay, boost::optional< bool > v10_IsOverAllocated, boost::optional< IfcDateTime > v11_StatusTime, boost::optional< IfcDuration > v12_ActualWork, boost::optional< IfcPositiveRatioMeasure > v13_ActualUsage, boost::optional< IfcDateTime > v14_ActualStart, boost::optional< IfcDateTime > v15_ActualFinish, boost::optional< IfcDuration > v16_RemainingWork, boost::optional< IfcPositiveRatioMeasure > v17_RemainingUsage, boost::optional< IfcPositiveRatioMeasure > v18_Completion);
-    typedef IfcResourceTime* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcResourceTime > > list;
-    typedef IfcTemplatedEntityList< IfcResourceTime >::it it;
+    IfcResourceTime (IfcAbstractEntity* e);
+    IfcResourceTime (boost::optional< std::string > v1_Name, boost::optional< IfcDataOriginEnum::IfcDataOriginEnum > v2_DataOrigin, boost::optional< std::string > v3_UserDefinedDataOrigin, boost::optional< std::string > v4_ScheduleWork, boost::optional< double > v5_ScheduleUsage, boost::optional< std::string > v6_ScheduleStart, boost::optional< std::string > v7_ScheduleFinish, boost::optional< std::string > v8_ScheduleContour, boost::optional< std::string > v9_LevelingDelay, boost::optional< bool > v10_IsOverAllocated, boost::optional< std::string > v11_StatusTime, boost::optional< std::string > v12_ActualWork, boost::optional< double > v13_ActualUsage, boost::optional< std::string > v14_ActualStart, boost::optional< std::string > v15_ActualFinish, boost::optional< std::string > v16_RemainingWork, boost::optional< double > v17_RemainingUsage, boost::optional< double > v18_Completion);
+    typedef IfcTemplatedEntityList< IfcResourceTime > list;
 };
 /// IfcRoundedRectangleProfileDef defines a rectangle with equally rounded corners as the profile definition used by the swept surface geometry or the swept area solid. It is given by the X extent, the Y extent, and the radius for the rounded corners, and placed within the 2D position coordinate system, established by the Position attribute. It is placed centric within the position coordinate system, that is, in the center of the bounding box.
 /// 
@@ -16960,20 +17996,19 @@ class IfcResourceTime : public IfcSchedulingTime {
 class IfcRoundedRectangleProfileDef : public IfcRectangleProfileDef {
 public:
     /// Radius of the circular arcs by which all four corners of the rectangle are equally rounded.
-    IfcPositiveLengthMeasure RoundingRadius();
-    void setRoundingRadius(IfcPositiveLengthMeasure v);
+    double RoundingRadius() const;
+    void setRoundingRadius(double v);
     virtual unsigned int getArgumentCount() const { return 6; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 5: return IfcUtil::Argument_DOUBLE; } return IfcRectangleProfileDef::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 5: return Type::IfcPositiveLengthMeasure; } return IfcRectangleProfileDef::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 5: return "RoundingRadius"; } return IfcRectangleProfileDef::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRoundedRectangleProfileDef (IfcAbstractEntityPtr e);
-    IfcRoundedRectangleProfileDef (IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< IfcLabel > v2_ProfileName, IfcAxis2Placement2D* v3_Position, IfcPositiveLengthMeasure v4_XDim, IfcPositiveLengthMeasure v5_YDim, IfcPositiveLengthMeasure v6_RoundingRadius);
-    typedef IfcRoundedRectangleProfileDef* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRoundedRectangleProfileDef > > list;
-    typedef IfcTemplatedEntityList< IfcRoundedRectangleProfileDef >::it it;
+    IfcRoundedRectangleProfileDef (IfcAbstractEntity* e);
+    IfcRoundedRectangleProfileDef (IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< std::string > v2_ProfileName, IfcAxis2Placement2D* v3_Position, double v4_XDim, double v5_YDim, double v6_RoundingRadius);
+    typedef IfcTemplatedEntityList< IfcRoundedRectangleProfileDef > list;
 };
 /// IfcSectionProperties defines the cross section properties for a single longitudinal piece of a cross section.  It is a special-purpose helper class for IfcSectionReinforcementProperties.
 /// 
@@ -16983,28 +18018,27 @@ class IfcRoundedRectangleProfileDef : public IfcRectangleProfileDef {
 class IfcSectionProperties : public IfcPreDefinedProperties {
 public:
     /// An indicator whether a specific piece of a cross section is uniform or tapered in longitudinal direction.
-    IfcSectionTypeEnum::IfcSectionTypeEnum SectionType();
+    IfcSectionTypeEnum::IfcSectionTypeEnum SectionType() const;
     void setSectionType(IfcSectionTypeEnum::IfcSectionTypeEnum v);
     /// The cross section profile at the start point of the longitudinal section.
-    IfcProfileDef* StartProfile();
+    IfcProfileDef* StartProfile() const;
     void setStartProfile(IfcProfileDef* v);
     /// Whether the optional attribute EndProfile is defined for this IfcSectionProperties
-    bool hasEndProfile();
+    bool hasEndProfile() const;
     /// The cross section profile at the end point of the longitudinal section.
-    IfcProfileDef* EndProfile();
+    IfcProfileDef* EndProfile() const;
     void setEndProfile(IfcProfileDef* v);
     virtual unsigned int getArgumentCount() const { return 3; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENUMERATION; case 1: return IfcUtil::Argument_ENTITY; case 2: return IfcUtil::Argument_ENTITY; } return IfcPreDefinedProperties::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcSectionTypeEnum; case 1: return Type::IfcProfileDef; case 2: return Type::IfcProfileDef; } return IfcPreDefinedProperties::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "SectionType"; case 1: return "StartProfile"; case 2: return "EndProfile"; } return IfcPreDefinedProperties::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcSectionProperties (IfcAbstractEntityPtr e);
+    IfcSectionProperties (IfcAbstractEntity* e);
     IfcSectionProperties (IfcSectionTypeEnum::IfcSectionTypeEnum v1_SectionType, IfcProfileDef* v2_StartProfile, IfcProfileDef* v3_EndProfile);
-    typedef IfcSectionProperties* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcSectionProperties > > list;
-    typedef IfcTemplatedEntityList< IfcSectionProperties >::it it;
+    typedef IfcTemplatedEntityList< IfcSectionProperties > list;
 };
 /// IfcSectionReinforcementProperties defines the cross section properties of reinforcement for a single longitudinal piece of a cross section with a specific reinforcement usage type.  
 /// 
@@ -17016,37 +18050,36 @@ class IfcSectionProperties : public IfcPreDefinedProperties {
 class IfcSectionReinforcementProperties : public IfcPreDefinedProperties {
 public:
     /// The start position in longitudinal direction for the section reinforcement properties.
-    IfcLengthMeasure LongitudinalStartPosition();
-    void setLongitudinalStartPosition(IfcLengthMeasure v);
+    double LongitudinalStartPosition() const;
+    void setLongitudinalStartPosition(double v);
     /// The end position in longitudinal direction for the section reinforcement properties.
-    IfcLengthMeasure LongitudinalEndPosition();
-    void setLongitudinalEndPosition(IfcLengthMeasure v);
+    double LongitudinalEndPosition() const;
+    void setLongitudinalEndPosition(double v);
     /// Whether the optional attribute TransversePosition is defined for this IfcSectionReinforcementProperties
-    bool hasTransversePosition();
+    bool hasTransversePosition() const;
     /// The position for the section reinforcement properties in transverse direction.
-    IfcLengthMeasure TransversePosition();
-    void setTransversePosition(IfcLengthMeasure v);
+    double TransversePosition() const;
+    void setTransversePosition(double v);
     /// The role, purpose or usage of the reinforcement, i.e. the kind of loads and stresses it is intended to carry, defined for the section reinforcement properties.
-    IfcReinforcingBarRoleEnum::IfcReinforcingBarRoleEnum ReinforcementRole();
+    IfcReinforcingBarRoleEnum::IfcReinforcingBarRoleEnum ReinforcementRole() const;
     void setReinforcementRole(IfcReinforcingBarRoleEnum::IfcReinforcingBarRoleEnum v);
     /// Definition of the cross section profile and longitudinal section type.
-    IfcSectionProperties* SectionDefinition();
+    IfcSectionProperties* SectionDefinition() const;
     void setSectionDefinition(IfcSectionProperties* v);
     /// The set of reinforcment properties attached to a section reinforcement properties definition.
-    SHARED_PTR< IfcTemplatedEntityList< IfcReinforcementBarProperties > > CrossSectionReinforcementDefinitions();
-    void setCrossSectionReinforcementDefinitions(SHARED_PTR< IfcTemplatedEntityList< IfcReinforcementBarProperties > > v);
+    IfcTemplatedEntityList< IfcReinforcementBarProperties >::ptr CrossSectionReinforcementDefinitions() const;
+    void setCrossSectionReinforcementDefinitions(IfcTemplatedEntityList< IfcReinforcementBarProperties >::ptr v);
     virtual unsigned int getArgumentCount() const { return 6; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_DOUBLE; case 1: return IfcUtil::Argument_DOUBLE; case 2: return IfcUtil::Argument_DOUBLE; case 3: return IfcUtil::Argument_ENUMERATION; case 4: return IfcUtil::Argument_ENTITY; case 5: return IfcUtil::Argument_ENTITY_LIST; } return IfcPreDefinedProperties::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcLengthMeasure; case 1: return Type::IfcLengthMeasure; case 2: return Type::IfcLengthMeasure; case 3: return Type::IfcReinforcingBarRoleEnum; case 4: return Type::IfcSectionProperties; case 5: return Type::IfcReinforcementBarProperties; } return IfcPreDefinedProperties::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "LongitudinalStartPosition"; case 1: return "LongitudinalEndPosition"; case 2: return "TransversePosition"; case 3: return "ReinforcementRole"; case 4: return "SectionDefinition"; case 5: return "CrossSectionReinforcementDefinitions"; } return IfcPreDefinedProperties::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcSectionReinforcementProperties (IfcAbstractEntityPtr e);
-    IfcSectionReinforcementProperties (IfcLengthMeasure v1_LongitudinalStartPosition, IfcLengthMeasure v2_LongitudinalEndPosition, boost::optional< IfcLengthMeasure > v3_TransversePosition, IfcReinforcingBarRoleEnum::IfcReinforcingBarRoleEnum v4_ReinforcementRole, IfcSectionProperties* v5_SectionDefinition, SHARED_PTR< IfcTemplatedEntityList< IfcReinforcementBarProperties > > v6_CrossSectionReinforcementDefinitions);
-    typedef IfcSectionReinforcementProperties* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcSectionReinforcementProperties > > list;
-    typedef IfcTemplatedEntityList< IfcSectionReinforcementProperties >::it it;
+    IfcSectionReinforcementProperties (IfcAbstractEntity* e);
+    IfcSectionReinforcementProperties (double v1_LongitudinalStartPosition, double v2_LongitudinalEndPosition, boost::optional< double > v3_TransversePosition, IfcReinforcingBarRoleEnum::IfcReinforcingBarRoleEnum v4_ReinforcementRole, IfcSectionProperties* v5_SectionDefinition, IfcTemplatedEntityList< IfcReinforcementBarProperties >::ptr v6_CrossSectionReinforcementDefinitions);
+    typedef IfcTemplatedEntityList< IfcSectionReinforcementProperties > list;
 };
 /// Definition from ISO 10303-42:1999: A sectioned
 /// spine is a representation of the shape of a three dimensional
@@ -17104,26 +18137,25 @@ class IfcSectionReinforcementProperties : public IfcPreDefinedProperties {
 class IfcSectionedSpine : public IfcGeometricRepresentationItem {
 public:
     /// A single composite curve, that defines the spine curve. Each of the composite curve segments correspond to the part between two cross-sections.
-    IfcCompositeCurve* SpineCurve();
+    IfcCompositeCurve* SpineCurve() const;
     void setSpineCurve(IfcCompositeCurve* v);
     /// A list of at least two cross sections, each defined within the xy plane of the position coordinate system of the cross section. The position coordinate system is given by the corresponding list CrossSectionPositions.
-    SHARED_PTR< IfcTemplatedEntityList< IfcProfileDef > > CrossSections();
-    void setCrossSections(SHARED_PTR< IfcTemplatedEntityList< IfcProfileDef > > v);
+    IfcTemplatedEntityList< IfcProfileDef >::ptr CrossSections() const;
+    void setCrossSections(IfcTemplatedEntityList< IfcProfileDef >::ptr v);
     /// Position coordinate systems for the cross sections that form the sectioned spine. The profiles defining the cross sections are positioned within the xy plane of the corresponding position coordinate system.
-    SHARED_PTR< IfcTemplatedEntityList< IfcAxis2Placement3D > > CrossSectionPositions();
-    void setCrossSectionPositions(SHARED_PTR< IfcTemplatedEntityList< IfcAxis2Placement3D > > v);
+    IfcTemplatedEntityList< IfcAxis2Placement3D >::ptr CrossSectionPositions() const;
+    void setCrossSectionPositions(IfcTemplatedEntityList< IfcAxis2Placement3D >::ptr v);
     virtual unsigned int getArgumentCount() const { return 3; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY; case 1: return IfcUtil::Argument_ENTITY_LIST; case 2: return IfcUtil::Argument_ENTITY_LIST; } return IfcGeometricRepresentationItem::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcCompositeCurve; case 1: return Type::IfcProfileDef; case 2: return Type::IfcAxis2Placement3D; } return IfcGeometricRepresentationItem::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "SpineCurve"; case 1: return "CrossSections"; case 2: return "CrossSectionPositions"; } return IfcGeometricRepresentationItem::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcSectionedSpine (IfcAbstractEntityPtr e);
-    IfcSectionedSpine (IfcCompositeCurve* v1_SpineCurve, SHARED_PTR< IfcTemplatedEntityList< IfcProfileDef > > v2_CrossSections, SHARED_PTR< IfcTemplatedEntityList< IfcAxis2Placement3D > > v3_CrossSectionPositions);
-    typedef IfcSectionedSpine* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcSectionedSpine > > list;
-    typedef IfcTemplatedEntityList< IfcSectionedSpine >::it it;
+    IfcSectionedSpine (IfcAbstractEntity* e);
+    IfcSectionedSpine (IfcCompositeCurve* v1_SpineCurve, IfcTemplatedEntityList< IfcProfileDef >::ptr v2_CrossSections, IfcTemplatedEntityList< IfcAxis2Placement3D >::ptr v3_CrossSectionPositions);
+    typedef IfcTemplatedEntityList< IfcSectionedSpine > list;
 };
 /// Definition from ISO/CD 10303-42:1992: A shell based surface model is described by a set of open or closed shells of dimensionality 2. The shells shall not intersect except at edges and vertices. In particular, distinct faces may not intersect. A complete face of one shell may be shared with another shell. Coincident portions of shells shall both reference the same faces, edges and vertices defining the coincident region. There shall be at least one shell. 
 /// 
@@ -17139,20 +18171,19 @@ class IfcSectionedSpine : public IfcGeometricRepresentationItem {
 /// The shells shall not overlap or intersect except at common faces, edges or vertices.
 class IfcShellBasedSurfaceModel : public IfcGeometricRepresentationItem {
 public:
-    SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > SbsmBoundary();
-    void setSbsmBoundary(SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > v);
+    IfcEntityList::ptr SbsmBoundary() const;
+    void setSbsmBoundary(IfcEntityList::ptr v);
     virtual unsigned int getArgumentCount() const { return 1; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY_LIST; } return IfcGeometricRepresentationItem::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcShell; } return IfcGeometricRepresentationItem::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "SbsmBoundary"; } return IfcGeometricRepresentationItem::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcShellBasedSurfaceModel (IfcAbstractEntityPtr e);
-    IfcShellBasedSurfaceModel (IfcEntities v1_SbsmBoundary);
-    typedef IfcShellBasedSurfaceModel* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcShellBasedSurfaceModel > > list;
-    typedef IfcTemplatedEntityList< IfcShellBasedSurfaceModel >::it it;
+    IfcShellBasedSurfaceModel (IfcAbstractEntity* e);
+    IfcShellBasedSurfaceModel (IfcEntityList::ptr v1_SbsmBoundary);
+    typedef IfcTemplatedEntityList< IfcShellBasedSurfaceModel > list;
 };
 /// IfcSimpleProperty is a generalization of a single property object. The various subtypes of IfcSimpleProperty establish different ways in which a property value can be set. 
 /// 
@@ -17161,16 +18192,15 @@ class IfcSimpleProperty : public IfcProperty {
 public:
     virtual unsigned int getArgumentCount() const { return 2; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcProperty::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcProperty::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcProperty::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcSimpleProperty (IfcAbstractEntityPtr e);
-    IfcSimpleProperty (IfcIdentifier v1_Name, boost::optional< IfcText > v2_Description);
-    typedef IfcSimpleProperty* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcSimpleProperty > > list;
-    typedef IfcTemplatedEntityList< IfcSimpleProperty >::it it;
+    IfcSimpleProperty (IfcAbstractEntity* e);
+    IfcSimpleProperty (std::string v1_Name, boost::optional< std::string > v2_Description);
+    typedef IfcTemplatedEntityList< IfcSimpleProperty > list;
 };
 /// Definition from IAI: Describes slippage in support conditions or connection conditions.  Slippage means that a relative displacement may occur in a support or connection before support or connection reactions are awoken.
 /// 
@@ -17184,32 +18214,31 @@ class IfcSimpleProperty : public IfcProperty {
 class IfcSlippageConnectionCondition : public IfcStructuralConnectionCondition {
 public:
     /// Whether the optional attribute SlippageX is defined for this IfcSlippageConnectionCondition
-    bool hasSlippageX();
+    bool hasSlippageX() const;
     /// Slippage in x-direction of the coordinate system defined by the instance which uses this resource object.
-    IfcLengthMeasure SlippageX();
-    void setSlippageX(IfcLengthMeasure v);
+    double SlippageX() const;
+    void setSlippageX(double v);
     /// Whether the optional attribute SlippageY is defined for this IfcSlippageConnectionCondition
-    bool hasSlippageY();
+    bool hasSlippageY() const;
     /// Slippage in y-direction of the coordinate system defined by the instance which uses this resource object.
-    IfcLengthMeasure SlippageY();
-    void setSlippageY(IfcLengthMeasure v);
+    double SlippageY() const;
+    void setSlippageY(double v);
     /// Whether the optional attribute SlippageZ is defined for this IfcSlippageConnectionCondition
-    bool hasSlippageZ();
+    bool hasSlippageZ() const;
     /// Slippage in z-direction of the coordinate system defined by the instance which uses this resource object.
-    IfcLengthMeasure SlippageZ();
-    void setSlippageZ(IfcLengthMeasure v);
+    double SlippageZ() const;
+    void setSlippageZ(double v);
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 1: return IfcUtil::Argument_DOUBLE; case 2: return IfcUtil::Argument_DOUBLE; case 3: return IfcUtil::Argument_DOUBLE; } return IfcStructuralConnectionCondition::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 1: return Type::IfcLengthMeasure; case 2: return Type::IfcLengthMeasure; case 3: return Type::IfcLengthMeasure; } return IfcStructuralConnectionCondition::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 1: return "SlippageX"; case 2: return "SlippageY"; case 3: return "SlippageZ"; } return IfcStructuralConnectionCondition::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcSlippageConnectionCondition (IfcAbstractEntityPtr e);
-    IfcSlippageConnectionCondition (boost::optional< IfcLabel > v1_Name, boost::optional< IfcLengthMeasure > v2_SlippageX, boost::optional< IfcLengthMeasure > v3_SlippageY, boost::optional< IfcLengthMeasure > v4_SlippageZ);
-    typedef IfcSlippageConnectionCondition* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcSlippageConnectionCondition > > list;
-    typedef IfcTemplatedEntityList< IfcSlippageConnectionCondition >::it it;
+    IfcSlippageConnectionCondition (IfcAbstractEntity* e);
+    IfcSlippageConnectionCondition (boost::optional< std::string > v1_Name, boost::optional< double > v2_SlippageX, boost::optional< double > v3_SlippageY, boost::optional< double > v4_SlippageZ);
+    typedef IfcTemplatedEntityList< IfcSlippageConnectionCondition > list;
 };
 /// Definition from ISO/CD 10303-42:1992: A solid model is a complete representation of the nominal shape of a product such that all points in the interior are connected. Any point can be classified as being inside, outside, or on the boundary of a solid. There are several different types of solid model representations. 
 /// 
@@ -17220,16 +18249,15 @@ class IfcSolidModel : public IfcGeometricRepresentationItem {
 public:
     virtual unsigned int getArgumentCount() const { return 0; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcGeometricRepresentationItem::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcGeometricRepresentationItem::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcGeometricRepresentationItem::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcSolidModel (IfcAbstractEntityPtr e);
+    IfcSolidModel (IfcAbstractEntity* e);
     IfcSolidModel ();
-    typedef IfcSolidModel* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcSolidModel > > list;
-    typedef IfcTemplatedEntityList< IfcSolidModel >::it it;
+    typedef IfcTemplatedEntityList< IfcSolidModel > list;
 };
 /// Definition from IAI: An instance of the entity
 ///   IfcStructuralLoadLinearForce shall be used to define actions on curves.
@@ -17239,47 +18267,46 @@ class IfcSolidModel : public IfcGeometricRepresentationItem {
 class IfcStructuralLoadLinearForce : public IfcStructuralLoadStatic {
 public:
     /// Whether the optional attribute LinearForceX is defined for this IfcStructuralLoadLinearForce
-    bool hasLinearForceX();
+    bool hasLinearForceX() const;
     /// Linear force value in x-direction.
-    IfcLinearForceMeasure LinearForceX();
-    void setLinearForceX(IfcLinearForceMeasure v);
+    double LinearForceX() const;
+    void setLinearForceX(double v);
     /// Whether the optional attribute LinearForceY is defined for this IfcStructuralLoadLinearForce
-    bool hasLinearForceY();
+    bool hasLinearForceY() const;
     /// Linear force value in y-direction.
-    IfcLinearForceMeasure LinearForceY();
-    void setLinearForceY(IfcLinearForceMeasure v);
+    double LinearForceY() const;
+    void setLinearForceY(double v);
     /// Whether the optional attribute LinearForceZ is defined for this IfcStructuralLoadLinearForce
-    bool hasLinearForceZ();
+    bool hasLinearForceZ() const;
     /// Linear force value in z-direction.
-    IfcLinearForceMeasure LinearForceZ();
-    void setLinearForceZ(IfcLinearForceMeasure v);
+    double LinearForceZ() const;
+    void setLinearForceZ(double v);
     /// Whether the optional attribute LinearMomentX is defined for this IfcStructuralLoadLinearForce
-    bool hasLinearMomentX();
+    bool hasLinearMomentX() const;
     /// Linear moment about the x-axis.
-    IfcLinearMomentMeasure LinearMomentX();
-    void setLinearMomentX(IfcLinearMomentMeasure v);
+    double LinearMomentX() const;
+    void setLinearMomentX(double v);
     /// Whether the optional attribute LinearMomentY is defined for this IfcStructuralLoadLinearForce
-    bool hasLinearMomentY();
+    bool hasLinearMomentY() const;
     /// Linear moment about the y-axis.
-    IfcLinearMomentMeasure LinearMomentY();
-    void setLinearMomentY(IfcLinearMomentMeasure v);
+    double LinearMomentY() const;
+    void setLinearMomentY(double v);
     /// Whether the optional attribute LinearMomentZ is defined for this IfcStructuralLoadLinearForce
-    bool hasLinearMomentZ();
+    bool hasLinearMomentZ() const;
     /// Linear moment about the z-axis.
-    IfcLinearMomentMeasure LinearMomentZ();
-    void setLinearMomentZ(IfcLinearMomentMeasure v);
+    double LinearMomentZ() const;
+    void setLinearMomentZ(double v);
     virtual unsigned int getArgumentCount() const { return 7; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 1: return IfcUtil::Argument_DOUBLE; case 2: return IfcUtil::Argument_DOUBLE; case 3: return IfcUtil::Argument_DOUBLE; case 4: return IfcUtil::Argument_DOUBLE; case 5: return IfcUtil::Argument_DOUBLE; case 6: return IfcUtil::Argument_DOUBLE; } return IfcStructuralLoadStatic::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 1: return Type::IfcLinearForceMeasure; case 2: return Type::IfcLinearForceMeasure; case 3: return Type::IfcLinearForceMeasure; case 4: return Type::IfcLinearMomentMeasure; case 5: return Type::IfcLinearMomentMeasure; case 6: return Type::IfcLinearMomentMeasure; } return IfcStructuralLoadStatic::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 1: return "LinearForceX"; case 2: return "LinearForceY"; case 3: return "LinearForceZ"; case 4: return "LinearMomentX"; case 5: return "LinearMomentY"; case 6: return "LinearMomentZ"; } return IfcStructuralLoadStatic::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcStructuralLoadLinearForce (IfcAbstractEntityPtr e);
-    IfcStructuralLoadLinearForce (boost::optional< IfcLabel > v1_Name, boost::optional< IfcLinearForceMeasure > v2_LinearForceX, boost::optional< IfcLinearForceMeasure > v3_LinearForceY, boost::optional< IfcLinearForceMeasure > v4_LinearForceZ, boost::optional< IfcLinearMomentMeasure > v5_LinearMomentX, boost::optional< IfcLinearMomentMeasure > v6_LinearMomentY, boost::optional< IfcLinearMomentMeasure > v7_LinearMomentZ);
-    typedef IfcStructuralLoadLinearForce* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcStructuralLoadLinearForce > > list;
-    typedef IfcTemplatedEntityList< IfcStructuralLoadLinearForce >::it it;
+    IfcStructuralLoadLinearForce (IfcAbstractEntity* e);
+    IfcStructuralLoadLinearForce (boost::optional< std::string > v1_Name, boost::optional< double > v2_LinearForceX, boost::optional< double > v3_LinearForceY, boost::optional< double > v4_LinearForceZ, boost::optional< double > v5_LinearMomentX, boost::optional< double > v6_LinearMomentY, boost::optional< double > v7_LinearMomentZ);
+    typedef IfcTemplatedEntityList< IfcStructuralLoadLinearForce > list;
 };
 /// Definition from IAI: An instance of the entity
 ///   IfcStructuralLoadPlanarForce shall be used to define actions on faces.
@@ -17289,32 +18316,31 @@ class IfcStructuralLoadLinearForce : public IfcStructuralLoadStatic {
 class IfcStructuralLoadPlanarForce : public IfcStructuralLoadStatic {
 public:
     /// Whether the optional attribute PlanarForceX is defined for this IfcStructuralLoadPlanarForce
-    bool hasPlanarForceX();
+    bool hasPlanarForceX() const;
     /// Planar force value in x-direction.
-    IfcPlanarForceMeasure PlanarForceX();
-    void setPlanarForceX(IfcPlanarForceMeasure v);
+    double PlanarForceX() const;
+    void setPlanarForceX(double v);
     /// Whether the optional attribute PlanarForceY is defined for this IfcStructuralLoadPlanarForce
-    bool hasPlanarForceY();
+    bool hasPlanarForceY() const;
     /// Planar force value in y-direction.
-    IfcPlanarForceMeasure PlanarForceY();
-    void setPlanarForceY(IfcPlanarForceMeasure v);
+    double PlanarForceY() const;
+    void setPlanarForceY(double v);
     /// Whether the optional attribute PlanarForceZ is defined for this IfcStructuralLoadPlanarForce
-    bool hasPlanarForceZ();
+    bool hasPlanarForceZ() const;
     /// Planar force value in z-direction.
-    IfcPlanarForceMeasure PlanarForceZ();
-    void setPlanarForceZ(IfcPlanarForceMeasure v);
+    double PlanarForceZ() const;
+    void setPlanarForceZ(double v);
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 1: return IfcUtil::Argument_DOUBLE; case 2: return IfcUtil::Argument_DOUBLE; case 3: return IfcUtil::Argument_DOUBLE; } return IfcStructuralLoadStatic::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 1: return Type::IfcPlanarForceMeasure; case 2: return Type::IfcPlanarForceMeasure; case 3: return Type::IfcPlanarForceMeasure; } return IfcStructuralLoadStatic::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 1: return "PlanarForceX"; case 2: return "PlanarForceY"; case 3: return "PlanarForceZ"; } return IfcStructuralLoadStatic::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcStructuralLoadPlanarForce (IfcAbstractEntityPtr e);
-    IfcStructuralLoadPlanarForce (boost::optional< IfcLabel > v1_Name, boost::optional< IfcPlanarForceMeasure > v2_PlanarForceX, boost::optional< IfcPlanarForceMeasure > v3_PlanarForceY, boost::optional< IfcPlanarForceMeasure > v4_PlanarForceZ);
-    typedef IfcStructuralLoadPlanarForce* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcStructuralLoadPlanarForce > > list;
-    typedef IfcTemplatedEntityList< IfcStructuralLoadPlanarForce >::it it;
+    IfcStructuralLoadPlanarForce (IfcAbstractEntity* e);
+    IfcStructuralLoadPlanarForce (boost::optional< std::string > v1_Name, boost::optional< double > v2_PlanarForceX, boost::optional< double > v3_PlanarForceY, boost::optional< double > v4_PlanarForceZ);
+    typedef IfcTemplatedEntityList< IfcStructuralLoadPlanarForce > list;
 };
 /// Definition from IAI: Instances of the entity
 ///   IfcStructuralLoadSingleDisplacement shall be used to define displacements.
@@ -17324,47 +18350,46 @@ class IfcStructuralLoadPlanarForce : public IfcStructuralLoadStatic {
 class IfcStructuralLoadSingleDisplacement : public IfcStructuralLoadStatic {
 public:
     /// Whether the optional attribute DisplacementX is defined for this IfcStructuralLoadSingleDisplacement
-    bool hasDisplacementX();
+    bool hasDisplacementX() const;
     /// Displacement in x-direction.
-    IfcLengthMeasure DisplacementX();
-    void setDisplacementX(IfcLengthMeasure v);
+    double DisplacementX() const;
+    void setDisplacementX(double v);
     /// Whether the optional attribute DisplacementY is defined for this IfcStructuralLoadSingleDisplacement
-    bool hasDisplacementY();
+    bool hasDisplacementY() const;
     /// Displacement in y-direction.
-    IfcLengthMeasure DisplacementY();
-    void setDisplacementY(IfcLengthMeasure v);
+    double DisplacementY() const;
+    void setDisplacementY(double v);
     /// Whether the optional attribute DisplacementZ is defined for this IfcStructuralLoadSingleDisplacement
-    bool hasDisplacementZ();
+    bool hasDisplacementZ() const;
     /// Displacement in z-direction.
-    IfcLengthMeasure DisplacementZ();
-    void setDisplacementZ(IfcLengthMeasure v);
+    double DisplacementZ() const;
+    void setDisplacementZ(double v);
     /// Whether the optional attribute RotationalDisplacementRX is defined for this IfcStructuralLoadSingleDisplacement
-    bool hasRotationalDisplacementRX();
+    bool hasRotationalDisplacementRX() const;
     /// Rotation about the x-axis.
-    IfcPlaneAngleMeasure RotationalDisplacementRX();
-    void setRotationalDisplacementRX(IfcPlaneAngleMeasure v);
+    double RotationalDisplacementRX() const;
+    void setRotationalDisplacementRX(double v);
     /// Whether the optional attribute RotationalDisplacementRY is defined for this IfcStructuralLoadSingleDisplacement
-    bool hasRotationalDisplacementRY();
+    bool hasRotationalDisplacementRY() const;
     /// Rotation about the y-axis.
-    IfcPlaneAngleMeasure RotationalDisplacementRY();
-    void setRotationalDisplacementRY(IfcPlaneAngleMeasure v);
+    double RotationalDisplacementRY() const;
+    void setRotationalDisplacementRY(double v);
     /// Whether the optional attribute RotationalDisplacementRZ is defined for this IfcStructuralLoadSingleDisplacement
-    bool hasRotationalDisplacementRZ();
+    bool hasRotationalDisplacementRZ() const;
     /// Rotation about the z-axis.
-    IfcPlaneAngleMeasure RotationalDisplacementRZ();
-    void setRotationalDisplacementRZ(IfcPlaneAngleMeasure v);
+    double RotationalDisplacementRZ() const;
+    void setRotationalDisplacementRZ(double v);
     virtual unsigned int getArgumentCount() const { return 7; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 1: return IfcUtil::Argument_DOUBLE; case 2: return IfcUtil::Argument_DOUBLE; case 3: return IfcUtil::Argument_DOUBLE; case 4: return IfcUtil::Argument_DOUBLE; case 5: return IfcUtil::Argument_DOUBLE; case 6: return IfcUtil::Argument_DOUBLE; } return IfcStructuralLoadStatic::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 1: return Type::IfcLengthMeasure; case 2: return Type::IfcLengthMeasure; case 3: return Type::IfcLengthMeasure; case 4: return Type::IfcPlaneAngleMeasure; case 5: return Type::IfcPlaneAngleMeasure; case 6: return Type::IfcPlaneAngleMeasure; } return IfcStructuralLoadStatic::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 1: return "DisplacementX"; case 2: return "DisplacementY"; case 3: return "DisplacementZ"; case 4: return "RotationalDisplacementRX"; case 5: return "RotationalDisplacementRY"; case 6: return "RotationalDisplacementRZ"; } return IfcStructuralLoadStatic::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcStructuralLoadSingleDisplacement (IfcAbstractEntityPtr e);
-    IfcStructuralLoadSingleDisplacement (boost::optional< IfcLabel > v1_Name, boost::optional< IfcLengthMeasure > v2_DisplacementX, boost::optional< IfcLengthMeasure > v3_DisplacementY, boost::optional< IfcLengthMeasure > v4_DisplacementZ, boost::optional< IfcPlaneAngleMeasure > v5_RotationalDisplacementRX, boost::optional< IfcPlaneAngleMeasure > v6_RotationalDisplacementRY, boost::optional< IfcPlaneAngleMeasure > v7_RotationalDisplacementRZ);
-    typedef IfcStructuralLoadSingleDisplacement* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcStructuralLoadSingleDisplacement > > list;
-    typedef IfcTemplatedEntityList< IfcStructuralLoadSingleDisplacement >::it it;
+    IfcStructuralLoadSingleDisplacement (IfcAbstractEntity* e);
+    IfcStructuralLoadSingleDisplacement (boost::optional< std::string > v1_Name, boost::optional< double > v2_DisplacementX, boost::optional< double > v3_DisplacementY, boost::optional< double > v4_DisplacementZ, boost::optional< double > v5_RotationalDisplacementRX, boost::optional< double > v6_RotationalDisplacementRY, boost::optional< double > v7_RotationalDisplacementRZ);
+    typedef IfcTemplatedEntityList< IfcStructuralLoadSingleDisplacement > list;
 };
 /// Definition from IAI: Defines a displacement with warping.
 /// 
@@ -17372,22 +18397,21 @@ class IfcStructuralLoadSingleDisplacement : public IfcStructuralLoadStatic {
 class IfcStructuralLoadSingleDisplacementDistortion : public IfcStructuralLoadSingleDisplacement {
 public:
     /// Whether the optional attribute Distortion is defined for this IfcStructuralLoadSingleDisplacementDistortion
-    bool hasDistortion();
+    bool hasDistortion() const;
     /// The distortion curvature (warping, i.e. a cross-sectional deplanation) given to the displacement load.
-    IfcCurvatureMeasure Distortion();
-    void setDistortion(IfcCurvatureMeasure v);
+    double Distortion() const;
+    void setDistortion(double v);
     virtual unsigned int getArgumentCount() const { return 8; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 7: return IfcUtil::Argument_DOUBLE; } return IfcStructuralLoadSingleDisplacement::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 7: return Type::IfcCurvatureMeasure; } return IfcStructuralLoadSingleDisplacement::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 7: return "Distortion"; } return IfcStructuralLoadSingleDisplacement::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcStructuralLoadSingleDisplacementDistortion (IfcAbstractEntityPtr e);
-    IfcStructuralLoadSingleDisplacementDistortion (boost::optional< IfcLabel > v1_Name, boost::optional< IfcLengthMeasure > v2_DisplacementX, boost::optional< IfcLengthMeasure > v3_DisplacementY, boost::optional< IfcLengthMeasure > v4_DisplacementZ, boost::optional< IfcPlaneAngleMeasure > v5_RotationalDisplacementRX, boost::optional< IfcPlaneAngleMeasure > v6_RotationalDisplacementRY, boost::optional< IfcPlaneAngleMeasure > v7_RotationalDisplacementRZ, boost::optional< IfcCurvatureMeasure > v8_Distortion);
-    typedef IfcStructuralLoadSingleDisplacementDistortion* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcStructuralLoadSingleDisplacementDistortion > > list;
-    typedef IfcTemplatedEntityList< IfcStructuralLoadSingleDisplacementDistortion >::it it;
+    IfcStructuralLoadSingleDisplacementDistortion (IfcAbstractEntity* e);
+    IfcStructuralLoadSingleDisplacementDistortion (boost::optional< std::string > v1_Name, boost::optional< double > v2_DisplacementX, boost::optional< double > v3_DisplacementY, boost::optional< double > v4_DisplacementZ, boost::optional< double > v5_RotationalDisplacementRX, boost::optional< double > v6_RotationalDisplacementRY, boost::optional< double > v7_RotationalDisplacementRZ, boost::optional< double > v8_Distortion);
+    typedef IfcTemplatedEntityList< IfcStructuralLoadSingleDisplacementDistortion > list;
 };
 /// Definition from IAI: Instances of the entity
 ///   IfcStructuralLoadSingleForce shall be used to define the forces and
@@ -17398,47 +18422,46 @@ class IfcStructuralLoadSingleDisplacementDistortion : public IfcStructuralLoadSi
 class IfcStructuralLoadSingleForce : public IfcStructuralLoadStatic {
 public:
     /// Whether the optional attribute ForceX is defined for this IfcStructuralLoadSingleForce
-    bool hasForceX();
+    bool hasForceX() const;
     /// Force value in x-direction.
-    IfcForceMeasure ForceX();
-    void setForceX(IfcForceMeasure v);
+    double ForceX() const;
+    void setForceX(double v);
     /// Whether the optional attribute ForceY is defined for this IfcStructuralLoadSingleForce
-    bool hasForceY();
+    bool hasForceY() const;
     /// Force value in y-direction.
-    IfcForceMeasure ForceY();
-    void setForceY(IfcForceMeasure v);
+    double ForceY() const;
+    void setForceY(double v);
     /// Whether the optional attribute ForceZ is defined for this IfcStructuralLoadSingleForce
-    bool hasForceZ();
+    bool hasForceZ() const;
     /// Force value in z-direction.
-    IfcForceMeasure ForceZ();
-    void setForceZ(IfcForceMeasure v);
+    double ForceZ() const;
+    void setForceZ(double v);
     /// Whether the optional attribute MomentX is defined for this IfcStructuralLoadSingleForce
-    bool hasMomentX();
+    bool hasMomentX() const;
     /// Moment about the x-axis.
-    IfcTorqueMeasure MomentX();
-    void setMomentX(IfcTorqueMeasure v);
+    double MomentX() const;
+    void setMomentX(double v);
     /// Whether the optional attribute MomentY is defined for this IfcStructuralLoadSingleForce
-    bool hasMomentY();
+    bool hasMomentY() const;
     /// Moment about the y-axis.
-    IfcTorqueMeasure MomentY();
-    void setMomentY(IfcTorqueMeasure v);
+    double MomentY() const;
+    void setMomentY(double v);
     /// Whether the optional attribute MomentZ is defined for this IfcStructuralLoadSingleForce
-    bool hasMomentZ();
+    bool hasMomentZ() const;
     /// Moment about the z-axis.
-    IfcTorqueMeasure MomentZ();
-    void setMomentZ(IfcTorqueMeasure v);
+    double MomentZ() const;
+    void setMomentZ(double v);
     virtual unsigned int getArgumentCount() const { return 7; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 1: return IfcUtil::Argument_DOUBLE; case 2: return IfcUtil::Argument_DOUBLE; case 3: return IfcUtil::Argument_DOUBLE; case 4: return IfcUtil::Argument_DOUBLE; case 5: return IfcUtil::Argument_DOUBLE; case 6: return IfcUtil::Argument_DOUBLE; } return IfcStructuralLoadStatic::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 1: return Type::IfcForceMeasure; case 2: return Type::IfcForceMeasure; case 3: return Type::IfcForceMeasure; case 4: return Type::IfcTorqueMeasure; case 5: return Type::IfcTorqueMeasure; case 6: return Type::IfcTorqueMeasure; } return IfcStructuralLoadStatic::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 1: return "ForceX"; case 2: return "ForceY"; case 3: return "ForceZ"; case 4: return "MomentX"; case 5: return "MomentY"; case 6: return "MomentZ"; } return IfcStructuralLoadStatic::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcStructuralLoadSingleForce (IfcAbstractEntityPtr e);
-    IfcStructuralLoadSingleForce (boost::optional< IfcLabel > v1_Name, boost::optional< IfcForceMeasure > v2_ForceX, boost::optional< IfcForceMeasure > v3_ForceY, boost::optional< IfcForceMeasure > v4_ForceZ, boost::optional< IfcTorqueMeasure > v5_MomentX, boost::optional< IfcTorqueMeasure > v6_MomentY, boost::optional< IfcTorqueMeasure > v7_MomentZ);
-    typedef IfcStructuralLoadSingleForce* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcStructuralLoadSingleForce > > list;
-    typedef IfcTemplatedEntityList< IfcStructuralLoadSingleForce >::it it;
+    IfcStructuralLoadSingleForce (IfcAbstractEntity* e);
+    IfcStructuralLoadSingleForce (boost::optional< std::string > v1_Name, boost::optional< double > v2_ForceX, boost::optional< double > v3_ForceY, boost::optional< double > v4_ForceZ, boost::optional< double > v5_MomentX, boost::optional< double > v6_MomentY, boost::optional< double > v7_MomentZ);
+    typedef IfcTemplatedEntityList< IfcStructuralLoadSingleForce > list;
 };
 /// Definition from IAI: Instances of the entity
 ///   IfcStructuralLoadSingleForceWarping, as a subtype of
@@ -17451,22 +18474,21 @@ class IfcStructuralLoadSingleForce : public IfcStructuralLoadStatic {
 class IfcStructuralLoadSingleForceWarping : public IfcStructuralLoadSingleForce {
 public:
     /// Whether the optional attribute WarpingMoment is defined for this IfcStructuralLoadSingleForceWarping
-    bool hasWarpingMoment();
+    bool hasWarpingMoment() const;
     /// The warping moment at the point load.
-    IfcWarpingMomentMeasure WarpingMoment();
-    void setWarpingMoment(IfcWarpingMomentMeasure v);
+    double WarpingMoment() const;
+    void setWarpingMoment(double v);
     virtual unsigned int getArgumentCount() const { return 8; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 7: return IfcUtil::Argument_DOUBLE; } return IfcStructuralLoadSingleForce::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 7: return Type::IfcWarpingMomentMeasure; } return IfcStructuralLoadSingleForce::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 7: return "WarpingMoment"; } return IfcStructuralLoadSingleForce::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcStructuralLoadSingleForceWarping (IfcAbstractEntityPtr e);
-    IfcStructuralLoadSingleForceWarping (boost::optional< IfcLabel > v1_Name, boost::optional< IfcForceMeasure > v2_ForceX, boost::optional< IfcForceMeasure > v3_ForceY, boost::optional< IfcForceMeasure > v4_ForceZ, boost::optional< IfcTorqueMeasure > v5_MomentX, boost::optional< IfcTorqueMeasure > v6_MomentY, boost::optional< IfcTorqueMeasure > v7_MomentZ, boost::optional< IfcWarpingMomentMeasure > v8_WarpingMoment);
-    typedef IfcStructuralLoadSingleForceWarping* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcStructuralLoadSingleForceWarping > > list;
-    typedef IfcTemplatedEntityList< IfcStructuralLoadSingleForceWarping >::it it;
+    IfcStructuralLoadSingleForceWarping (IfcAbstractEntity* e);
+    IfcStructuralLoadSingleForceWarping (boost::optional< std::string > v1_Name, boost::optional< double > v2_ForceX, boost::optional< double > v3_ForceY, boost::optional< double > v4_ForceZ, boost::optional< double > v5_MomentX, boost::optional< double > v6_MomentY, boost::optional< double > v7_MomentZ, boost::optional< double > v8_WarpingMoment);
+    typedef IfcTemplatedEntityList< IfcStructuralLoadSingleForceWarping > list;
 };
 /// Definition from ISO/DIS 10303-42:1999(E): A subedge is an edge whose domain is a connected portion of the domain of an existing edge. The topological constraints on a subedge are the same as those on an edge. 
 /// 
@@ -17481,20 +18503,19 @@ class IfcStructuralLoadSingleForceWarping : public IfcStructuralLoadSingleForce
 class IfcSubedge : public IfcEdge {
 public:
     /// The Edge, or Subedge, which contains the Subedge.
-    IfcEdge* ParentEdge();
+    IfcEdge* ParentEdge() const;
     void setParentEdge(IfcEdge* v);
     virtual unsigned int getArgumentCount() const { return 3; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 2: return IfcUtil::Argument_ENTITY; } return IfcEdge::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 2: return Type::IfcEdge; } return IfcEdge::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 2: return "ParentEdge"; } return IfcEdge::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcSubedge (IfcAbstractEntityPtr e);
+    IfcSubedge (IfcAbstractEntity* e);
     IfcSubedge (IfcVertex* v1_EdgeStart, IfcVertex* v2_EdgeEnd, IfcEdge* v3_ParentEdge);
-    typedef IfcSubedge* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcSubedge > > list;
-    typedef IfcTemplatedEntityList< IfcSubedge >::it it;
+    typedef IfcTemplatedEntityList< IfcSubedge > list;
 };
 /// Definition from ISO/CD 10303-42:1992: A surface can be envisioned as a set of connected points in 3-dimensional space which is always locally 2-dimensional, but need not be a manifold.  
 /// 
@@ -17510,16 +18531,15 @@ class IfcSurface : public IfcGeometricRepresentationItem {
 public:
     virtual unsigned int getArgumentCount() const { return 0; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcGeometricRepresentationItem::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcGeometricRepresentationItem::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcGeometricRepresentationItem::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcSurface (IfcAbstractEntityPtr e);
+    IfcSurface (IfcAbstractEntity* e);
     IfcSurface ();
-    typedef IfcSurface* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcSurface > > list;
-    typedef IfcTemplatedEntityList< IfcSurface >::it it;
+    typedef IfcTemplatedEntityList< IfcSurface > list;
 };
 /// IfcSurfaceStyleRendering holds the properties for visualization related to a particular surface side style.  
 /// 
@@ -17569,66 +18589,65 @@ class IfcSurface : public IfcGeometricRepresentationItem {
 class IfcSurfaceStyleRendering : public IfcSurfaceStyleShading {
 public:
     /// Whether the optional attribute Transparency is defined for this IfcSurfaceStyleRendering
-    bool hasTransparency();
+    bool hasTransparency() const;
     /// Definition from ISO/CD 10303-46: The degree of transparency is indicated by the percentage of light traversing the surface.
     /// Definition from VRML97 - ISO/IEC 14772-1:1997: The transparency field specifies how "clear" an object is, with 1.0 being completely transparent, and 0.0 completely opaque. If not given, the value 0.0 (opaque) is assumed.
-    IfcNormalisedRatioMeasure Transparency();
-    void setTransparency(IfcNormalisedRatioMeasure v);
+    double Transparency() const;
+    void setTransparency(double v);
     /// Whether the optional attribute DiffuseColour is defined for this IfcSurfaceStyleRendering
-    bool hasDiffuseColour();
+    bool hasDiffuseColour() const;
     /// The diffuse part of the reflectance equation can be given as either a colour or a scalar factor.
     /// The diffuse colour field reflects all light sources depending on the angle of the surface with respect to the light source. The more directly the surface faces the light, the more diffuse light reflects.
     /// The diffuse factor field specifies how much diffuse light from light sources this surface shall reflect. Diffuse light depends on the angle of the surface with respect to the light source. The more directly the surface faces the light, the more diffuse light reflects. The diffuse colour is then defined by surface colour * diffuse factor.
-    IfcColourOrFactor DiffuseColour();
-    void setDiffuseColour(IfcColourOrFactor v);
+    IfcColourOrFactor* DiffuseColour() const;
+    void setDiffuseColour(IfcColourOrFactor* v);
     /// Whether the optional attribute TransmissionColour is defined for this IfcSurfaceStyleRendering
-    bool hasTransmissionColour();
+    bool hasTransmissionColour() const;
     /// The transmissive part of the reflectance equation can be given as either a colour or a scalar factor. It only applies to materials which Transparency field is greater than zero.
     /// The transmissive colour field specifies the colour that passes through a transparant material (like the colour that shines through a glass).
     /// The transmissive factor defines the transmissive part, the transmissive colour is then defined by surface colour * transmissive factor.
-    IfcColourOrFactor TransmissionColour();
-    void setTransmissionColour(IfcColourOrFactor v);
+    IfcColourOrFactor* TransmissionColour() const;
+    void setTransmissionColour(IfcColourOrFactor* v);
     /// Whether the optional attribute DiffuseTransmissionColour is defined for this IfcSurfaceStyleRendering
-    bool hasDiffuseTransmissionColour();
+    bool hasDiffuseTransmissionColour() const;
     /// The diffuse transmission part of the reflectance equation can be given as either a colour or a scalar factor. It only applies to materials whose Transparency field is greater than zero.
     /// The diffuse transmission colour specifies how much diffuse light is reflected at the opposite side of the material surface.
     /// The diffuse transmission factor field specifies how much diffuse light from light sources this surface shall reflect on the opposite side of the material surface. The diffuse transmissive colour is then defined by surface colour * diffuse transmissive factor.
-    IfcColourOrFactor DiffuseTransmissionColour();
-    void setDiffuseTransmissionColour(IfcColourOrFactor v);
+    IfcColourOrFactor* DiffuseTransmissionColour() const;
+    void setDiffuseTransmissionColour(IfcColourOrFactor* v);
     /// Whether the optional attribute ReflectionColour is defined for this IfcSurfaceStyleRendering
-    bool hasReflectionColour();
+    bool hasReflectionColour() const;
     /// The reflection (or mirror) part of the reflectance equation can be given as either a colour or a scalar factor. Applies to "glass" and "mirror" reflection models.
     /// The reflection colour specifies the contribution made by light from the mirror direction, i.e. light being reflected from the surface.
     /// The reflection factor specifies the amount of contribution made by light from the mirror direction. The reflection colour is then defined by surface colour * reflection factor.
-    IfcColourOrFactor ReflectionColour();
-    void setReflectionColour(IfcColourOrFactor v);
+    IfcColourOrFactor* ReflectionColour() const;
+    void setReflectionColour(IfcColourOrFactor* v);
     /// Whether the optional attribute SpecularColour is defined for this IfcSurfaceStyleRendering
-    bool hasSpecularColour();
+    bool hasSpecularColour() const;
     /// The specular part of the reflectance equation can be given as either a colour or a scalar factor.
     /// The specular colour determine the specular highlights (e.g., the shiny spots on an apple). When the angle from the light to the surface is close to the angle from the surface to the viewer, the specular colour is added to the diffuse and ambient colour calculations.
     /// The specular factor defines the specular part, the specular colour is then defined by surface colour * specular factor.
-    IfcColourOrFactor SpecularColour();
-    void setSpecularColour(IfcColourOrFactor v);
+    IfcColourOrFactor* SpecularColour() const;
+    void setSpecularColour(IfcColourOrFactor* v);
     /// Whether the optional attribute SpecularHighlight is defined for this IfcSurfaceStyleRendering
-    bool hasSpecularHighlight();
+    bool hasSpecularHighlight() const;
     /// The exponent or roughness part of the specular reflectance.
-    IfcSpecularHighlightSelect SpecularHighlight();
-    void setSpecularHighlight(IfcSpecularHighlightSelect v);
+    IfcSpecularHighlightSelect* SpecularHighlight() const;
+    void setSpecularHighlight(IfcSpecularHighlightSelect* v);
     /// Identifies the predefined types of reflectance method from which the method required may be set.
-    IfcReflectanceMethodEnum::IfcReflectanceMethodEnum ReflectanceMethod();
+    IfcReflectanceMethodEnum::IfcReflectanceMethodEnum ReflectanceMethod() const;
     void setReflectanceMethod(IfcReflectanceMethodEnum::IfcReflectanceMethodEnum v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 1: return IfcUtil::Argument_DOUBLE; case 2: return IfcUtil::Argument_ENTITY; case 3: return IfcUtil::Argument_ENTITY; case 4: return IfcUtil::Argument_ENTITY; case 5: return IfcUtil::Argument_ENTITY; case 6: return IfcUtil::Argument_ENTITY; case 7: return IfcUtil::Argument_ENTITY; case 8: return IfcUtil::Argument_ENUMERATION; } return IfcSurfaceStyleShading::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 1: return Type::IfcNormalisedRatioMeasure; case 2: return Type::IfcColourOrFactor; case 3: return Type::IfcColourOrFactor; case 4: return Type::IfcColourOrFactor; case 5: return Type::IfcColourOrFactor; case 6: return Type::IfcColourOrFactor; case 7: return Type::IfcSpecularHighlightSelect; case 8: return Type::IfcReflectanceMethodEnum; } return IfcSurfaceStyleShading::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 1: return "Transparency"; case 2: return "DiffuseColour"; case 3: return "TransmissionColour"; case 4: return "DiffuseTransmissionColour"; case 5: return "ReflectionColour"; case 6: return "SpecularColour"; case 7: return "SpecularHighlight"; case 8: return "ReflectanceMethod"; } return IfcSurfaceStyleShading::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcSurfaceStyleRendering (IfcAbstractEntityPtr e);
-    IfcSurfaceStyleRendering (IfcColourRgb* v1_SurfaceColour, boost::optional< IfcNormalisedRatioMeasure > v2_Transparency, boost::optional< IfcColourOrFactor > v3_DiffuseColour, boost::optional< IfcColourOrFactor > v4_TransmissionColour, boost::optional< IfcColourOrFactor > v5_DiffuseTransmissionColour, boost::optional< IfcColourOrFactor > v6_ReflectionColour, boost::optional< IfcColourOrFactor > v7_SpecularColour, boost::optional< IfcSpecularHighlightSelect > v8_SpecularHighlight, IfcReflectanceMethodEnum::IfcReflectanceMethodEnum v9_ReflectanceMethod);
-    typedef IfcSurfaceStyleRendering* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcSurfaceStyleRendering > > list;
-    typedef IfcTemplatedEntityList< IfcSurfaceStyleRendering >::it it;
+    IfcSurfaceStyleRendering (IfcAbstractEntity* e);
+    IfcSurfaceStyleRendering (IfcColourRgb* v1_SurfaceColour, boost::optional< double > v2_Transparency, IfcColourOrFactor* v3_DiffuseColour, IfcColourOrFactor* v4_TransmissionColour, IfcColourOrFactor* v5_DiffuseTransmissionColour, IfcColourOrFactor* v6_ReflectionColour, IfcColourOrFactor* v7_SpecularColour, IfcSpecularHighlightSelect* v8_SpecularHighlight, IfcReflectanceMethodEnum::IfcReflectanceMethodEnum v9_ReflectanceMethod);
+    typedef IfcTemplatedEntityList< IfcSurfaceStyleRendering > list;
 };
 /// Definition from ISO/CD 10303-42:1992: The swept area
 ///   solid entity collects the entities which are defined
@@ -17651,25 +18670,24 @@ class IfcSurfaceStyleRendering : public IfcSurfaceStyleShading {
 class IfcSweptAreaSolid : public IfcSolidModel {
 public:
     /// The surface defining the area to be swept. It is given as a profile definition within the xy plane of the position coordinate system.
-    IfcProfileDef* SweptArea();
+    IfcProfileDef* SweptArea() const;
     void setSweptArea(IfcProfileDef* v);
     /// Whether the optional attribute Position is defined for this IfcSweptAreaSolid
-    bool hasPosition();
+    bool hasPosition() const;
     /// Position coordinate system for the swept area, provided by a profile definition within the XY plane of the Position.
-    IfcAxis2Placement3D* Position();
+    IfcAxis2Placement3D* Position() const;
     void setPosition(IfcAxis2Placement3D* v);
     virtual unsigned int getArgumentCount() const { return 2; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY; case 1: return IfcUtil::Argument_ENTITY; } return IfcSolidModel::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcProfileDef; case 1: return Type::IfcAxis2Placement3D; } return IfcSolidModel::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "SweptArea"; case 1: return "Position"; } return IfcSolidModel::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcSweptAreaSolid (IfcAbstractEntityPtr e);
+    IfcSweptAreaSolid (IfcAbstractEntity* e);
     IfcSweptAreaSolid (IfcProfileDef* v1_SweptArea, IfcAxis2Placement3D* v2_Position);
-    typedef IfcSweptAreaSolid* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcSweptAreaSolid > > list;
-    typedef IfcTemplatedEntityList< IfcSweptAreaSolid >::it it;
+    typedef IfcTemplatedEntityList< IfcSweptAreaSolid > list;
 };
 /// Definition from ISO 10303-42:2002: A swept
 /// disk solid is the solid produced by sweeping a circular disk
@@ -17727,42 +18745,41 @@ class IfcSweptAreaSolid : public IfcSolidModel {
 class IfcSweptDiskSolid : public IfcSolidModel {
 public:
     /// The curve used to define the sweeping operation. The solid is generated by sweeping a circular disk along the Directrix.
-    IfcCurve* Directrix();
+    IfcCurve* Directrix() const;
     void setDirectrix(IfcCurve* v);
     /// The Radius of the circular disk to be swept along the directrix. Denotes the outer radius, if an InnerRadius is applied.
-    IfcPositiveLengthMeasure Radius();
-    void setRadius(IfcPositiveLengthMeasure v);
+    double Radius() const;
+    void setRadius(double v);
     /// Whether the optional attribute InnerRadius is defined for this IfcSweptDiskSolid
-    bool hasInnerRadius();
+    bool hasInnerRadius() const;
     /// This attribute is optional, if present it defines the radius of a circular hole in the centre of the disk.
-    IfcPositiveLengthMeasure InnerRadius();
-    void setInnerRadius(IfcPositiveLengthMeasure v);
+    double InnerRadius() const;
+    void setInnerRadius(double v);
     /// Whether the optional attribute StartParam is defined for this IfcSweptDiskSolid
-    bool hasStartParam();
+    bool hasStartParam() const;
     /// The parameter value on the Directrix at which the sweeping operation commences. If no value is provided the start of the sweeping operation is at the start of the Directrix..
     /// 
     /// IFC2x4 CHANGE  The attribute has been changed to OPTIONAL with upward compatibility for file-based exchange.
-    IfcParameterValue StartParam();
-    void setStartParam(IfcParameterValue v);
+    double StartParam() const;
+    void setStartParam(double v);
     /// Whether the optional attribute EndParam is defined for this IfcSweptDiskSolid
-    bool hasEndParam();
+    bool hasEndParam() const;
     /// The parameter value on the Directrix at which the sweeping operation ends. If no value is provided the end of the sweeping operation is at the end of the Directrix..
     /// 
     /// IFC2x4 CHANGE  The attribute has been changed to OPTIONAL with upward compatibility for file-based exchange.
-    IfcParameterValue EndParam();
-    void setEndParam(IfcParameterValue v);
+    double EndParam() const;
+    void setEndParam(double v);
     virtual unsigned int getArgumentCount() const { return 5; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY; case 1: return IfcUtil::Argument_DOUBLE; case 2: return IfcUtil::Argument_DOUBLE; case 3: return IfcUtil::Argument_DOUBLE; case 4: return IfcUtil::Argument_DOUBLE; } return IfcSolidModel::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcCurve; case 1: return Type::IfcPositiveLengthMeasure; case 2: return Type::IfcPositiveLengthMeasure; case 3: return Type::IfcParameterValue; case 4: return Type::IfcParameterValue; } return IfcSolidModel::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Directrix"; case 1: return "Radius"; case 2: return "InnerRadius"; case 3: return "StartParam"; case 4: return "EndParam"; } return IfcSolidModel::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcSweptDiskSolid (IfcAbstractEntityPtr e);
-    IfcSweptDiskSolid (IfcCurve* v1_Directrix, IfcPositiveLengthMeasure v2_Radius, boost::optional< IfcPositiveLengthMeasure > v3_InnerRadius, boost::optional< IfcParameterValue > v4_StartParam, boost::optional< IfcParameterValue > v5_EndParam);
-    typedef IfcSweptDiskSolid* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcSweptDiskSolid > > list;
-    typedef IfcTemplatedEntityList< IfcSweptDiskSolid >::it it;
+    IfcSweptDiskSolid (IfcAbstractEntity* e);
+    IfcSweptDiskSolid (IfcCurve* v1_Directrix, double v2_Radius, boost::optional< double > v3_InnerRadius, boost::optional< double > v4_StartParam, boost::optional< double > v5_EndParam);
+    typedef IfcTemplatedEntityList< IfcSweptDiskSolid > list;
 };
 /// The IfcSweptDiskSolidPolygonal is a IfcSweptDiskSolid where the Directrix is restricted to be provided by an IfcPolyline only. An optional FilletRadius attribute can be asserted, it is then applied as a fillet to all transitions between the segments of the IfcPolyline.
 /// 
@@ -17777,22 +18794,21 @@ class IfcSweptDiskSolid : public IfcSolidModel {
 class IfcSweptDiskSolidPolygonal : public IfcSweptDiskSolid {
 public:
     /// Whether the optional attribute FilletRadius is defined for this IfcSweptDiskSolidPolygonal
-    bool hasFilletRadius();
+    bool hasFilletRadius() const;
     /// The fillet that is equally applied to all transitions between the segments of the IfcPolyline, providing the geometric representation for the Directrix. If omited, no fillet is applied to the segments.
-    IfcPositiveLengthMeasure FilletRadius();
-    void setFilletRadius(IfcPositiveLengthMeasure v);
+    double FilletRadius() const;
+    void setFilletRadius(double v);
     virtual unsigned int getArgumentCount() const { return 6; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 5: return IfcUtil::Argument_DOUBLE; } return IfcSweptDiskSolid::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 5: return Type::IfcPositiveLengthMeasure; } return IfcSweptDiskSolid::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 5: return "FilletRadius"; } return IfcSweptDiskSolid::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcSweptDiskSolidPolygonal (IfcAbstractEntityPtr e);
-    IfcSweptDiskSolidPolygonal (IfcCurve* v1_Directrix, IfcPositiveLengthMeasure v2_Radius, boost::optional< IfcPositiveLengthMeasure > v3_InnerRadius, boost::optional< IfcParameterValue > v4_StartParam, boost::optional< IfcParameterValue > v5_EndParam, boost::optional< IfcPositiveLengthMeasure > v6_FilletRadius);
-    typedef IfcSweptDiskSolidPolygonal* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcSweptDiskSolidPolygonal > > list;
-    typedef IfcTemplatedEntityList< IfcSweptDiskSolidPolygonal >::it it;
+    IfcSweptDiskSolidPolygonal (IfcAbstractEntity* e);
+    IfcSweptDiskSolidPolygonal (IfcCurve* v1_Directrix, double v2_Radius, boost::optional< double > v3_InnerRadius, boost::optional< double > v4_StartParam, boost::optional< double > v5_EndParam, boost::optional< double > v6_FilletRadius);
+    typedef IfcTemplatedEntityList< IfcSweptDiskSolidPolygonal > list;
 };
 /// Definition from ISO/CD 10303-42:1992: A swept surface is one that is constructed by sweeping a curve along another curve.  
 /// 
@@ -17802,25 +18818,24 @@ class IfcSweptDiskSolidPolygonal : public IfcSweptDiskSolid {
 class IfcSweptSurface : public IfcSurface {
 public:
     /// The curve to be swept in defining the surface. The curve is defined as a profile within the position coordinate system.
-    IfcProfileDef* SweptCurve();
+    IfcProfileDef* SweptCurve() const;
     void setSweptCurve(IfcProfileDef* v);
     /// Whether the optional attribute Position is defined for this IfcSweptSurface
-    bool hasPosition();
+    bool hasPosition() const;
     /// Position coordinate system for the placement of the profile within the xy plane of the axis placement.
-    IfcAxis2Placement3D* Position();
+    IfcAxis2Placement3D* Position() const;
     void setPosition(IfcAxis2Placement3D* v);
     virtual unsigned int getArgumentCount() const { return 2; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY; case 1: return IfcUtil::Argument_ENTITY; } return IfcSurface::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcProfileDef; case 1: return Type::IfcAxis2Placement3D; } return IfcSurface::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "SweptCurve"; case 1: return "Position"; } return IfcSurface::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcSweptSurface (IfcAbstractEntityPtr e);
+    IfcSweptSurface (IfcAbstractEntity* e);
     IfcSweptSurface (IfcProfileDef* v1_SweptCurve, IfcAxis2Placement3D* v2_Position);
-    typedef IfcSweptSurface* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcSweptSurface > > list;
-    typedef IfcTemplatedEntityList< IfcSweptSurface >::it it;
+    typedef IfcTemplatedEntityList< IfcSweptSurface > list;
 };
 /// IfcTShapeProfileDef defines
 /// a section profile that provides the defining parameters of a T-shaped
@@ -17853,70 +18868,68 @@ class IfcSweptSurface : public IfcSurface {
 class IfcTShapeProfileDef : public IfcParameterizedProfileDef {
 public:
     /// Web lengths, see illustration above (= h).
-    IfcPositiveLengthMeasure Depth();
-    void setDepth(IfcPositiveLengthMeasure v);
+    double Depth() const;
+    void setDepth(double v);
     /// Flange lengths, see illustration above (= b).
-    IfcPositiveLengthMeasure FlangeWidth();
-    void setFlangeWidth(IfcPositiveLengthMeasure v);
+    double FlangeWidth() const;
+    void setFlangeWidth(double v);
     /// Constant wall thickness of web (= ts).
-    IfcPositiveLengthMeasure WebThickness();
-    void setWebThickness(IfcPositiveLengthMeasure v);
+    double WebThickness() const;
+    void setWebThickness(double v);
     /// Constant wall thickness of flange (= tg).
-    IfcPositiveLengthMeasure FlangeThickness();
-    void setFlangeThickness(IfcPositiveLengthMeasure v);
+    double FlangeThickness() const;
+    void setFlangeThickness(double v);
     /// Whether the optional attribute FilletRadius is defined for this IfcTShapeProfileDef
-    bool hasFilletRadius();
+    bool hasFilletRadius() const;
     /// Fillet radius according the above illustration (= r1).
-    IfcNonNegativeLengthMeasure FilletRadius();
-    void setFilletRadius(IfcNonNegativeLengthMeasure v);
+    double FilletRadius() const;
+    void setFilletRadius(double v);
     /// Whether the optional attribute FlangeEdgeRadius is defined for this IfcTShapeProfileDef
-    bool hasFlangeEdgeRadius();
+    bool hasFlangeEdgeRadius() const;
     /// Edge radius according the above illustration (= r2).
-    IfcNonNegativeLengthMeasure FlangeEdgeRadius();
-    void setFlangeEdgeRadius(IfcNonNegativeLengthMeasure v);
+    double FlangeEdgeRadius() const;
+    void setFlangeEdgeRadius(double v);
     /// Whether the optional attribute WebEdgeRadius is defined for this IfcTShapeProfileDef
-    bool hasWebEdgeRadius();
+    bool hasWebEdgeRadius() const;
     /// Edge radius according the above illustration (= r3).
-    IfcNonNegativeLengthMeasure WebEdgeRadius();
-    void setWebEdgeRadius(IfcNonNegativeLengthMeasure v);
+    double WebEdgeRadius() const;
+    void setWebEdgeRadius(double v);
     /// Whether the optional attribute WebSlope is defined for this IfcTShapeProfileDef
-    bool hasWebSlope();
+    bool hasWebSlope() const;
     /// Slope of flange of the profile.
-    IfcPlaneAngleMeasure WebSlope();
-    void setWebSlope(IfcPlaneAngleMeasure v);
+    double WebSlope() const;
+    void setWebSlope(double v);
     /// Whether the optional attribute FlangeSlope is defined for this IfcTShapeProfileDef
-    bool hasFlangeSlope();
+    bool hasFlangeSlope() const;
     /// Slope of web of the profile.
-    IfcPlaneAngleMeasure FlangeSlope();
-    void setFlangeSlope(IfcPlaneAngleMeasure v);
+    double FlangeSlope() const;
+    void setFlangeSlope(double v);
     virtual unsigned int getArgumentCount() const { return 12; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 3: return IfcUtil::Argument_DOUBLE; case 4: return IfcUtil::Argument_DOUBLE; case 5: return IfcUtil::Argument_DOUBLE; case 6: return IfcUtil::Argument_DOUBLE; case 7: return IfcUtil::Argument_DOUBLE; case 8: return IfcUtil::Argument_DOUBLE; case 9: return IfcUtil::Argument_DOUBLE; case 10: return IfcUtil::Argument_DOUBLE; case 11: return IfcUtil::Argument_DOUBLE; } return IfcParameterizedProfileDef::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 3: return Type::IfcPositiveLengthMeasure; case 4: return Type::IfcPositiveLengthMeasure; case 5: return Type::IfcPositiveLengthMeasure; case 6: return Type::IfcPositiveLengthMeasure; case 7: return Type::IfcNonNegativeLengthMeasure; case 8: return Type::IfcNonNegativeLengthMeasure; case 9: return Type::IfcNonNegativeLengthMeasure; case 10: return Type::IfcPlaneAngleMeasure; case 11: return Type::IfcPlaneAngleMeasure; } return IfcParameterizedProfileDef::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 3: return "Depth"; case 4: return "FlangeWidth"; case 5: return "WebThickness"; case 6: return "FlangeThickness"; case 7: return "FilletRadius"; case 8: return "FlangeEdgeRadius"; case 9: return "WebEdgeRadius"; case 10: return "WebSlope"; case 11: return "FlangeSlope"; } return IfcParameterizedProfileDef::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcTShapeProfileDef (IfcAbstractEntityPtr e);
-    IfcTShapeProfileDef (IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< IfcLabel > v2_ProfileName, IfcAxis2Placement2D* v3_Position, IfcPositiveLengthMeasure v4_Depth, IfcPositiveLengthMeasure v5_FlangeWidth, IfcPositiveLengthMeasure v6_WebThickness, IfcPositiveLengthMeasure v7_FlangeThickness, boost::optional< IfcNonNegativeLengthMeasure > v8_FilletRadius, boost::optional< IfcNonNegativeLengthMeasure > v9_FlangeEdgeRadius, boost::optional< IfcNonNegativeLengthMeasure > v10_WebEdgeRadius, boost::optional< IfcPlaneAngleMeasure > v11_WebSlope, boost::optional< IfcPlaneAngleMeasure > v12_FlangeSlope);
-    typedef IfcTShapeProfileDef* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcTShapeProfileDef > > list;
-    typedef IfcTemplatedEntityList< IfcTShapeProfileDef >::it it;
+    IfcTShapeProfileDef (IfcAbstractEntity* e);
+    IfcTShapeProfileDef (IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< std::string > v2_ProfileName, IfcAxis2Placement2D* v3_Position, double v4_Depth, double v5_FlangeWidth, double v6_WebThickness, double v7_FlangeThickness, boost::optional< double > v8_FilletRadius, boost::optional< double > v9_FlangeEdgeRadius, boost::optional< double > v10_WebEdgeRadius, boost::optional< double > v11_WebSlope, boost::optional< double > v12_FlangeSlope);
+    typedef IfcTemplatedEntityList< IfcTShapeProfileDef > list;
 };
 
 class IfcTessellatedItem : public IfcGeometricRepresentationItem {
 public:
     virtual unsigned int getArgumentCount() const { return 0; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcGeometricRepresentationItem::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcGeometricRepresentationItem::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcGeometricRepresentationItem::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcTessellatedItem (IfcAbstractEntityPtr e);
+    IfcTessellatedItem (IfcAbstractEntity* e);
     IfcTessellatedItem ();
-    typedef IfcTessellatedItem* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcTessellatedItem > > list;
-    typedef IfcTemplatedEntityList< IfcTessellatedItem >::it it;
+    typedef IfcTemplatedEntityList< IfcTessellatedItem > list;
 };
 /// The text literal is a geometric representation item which describes a text string using a string literal and additional position and path information.
 /// 
@@ -17931,27 +18944,26 @@ class IfcTessellatedItem : public IfcGeometricRepresentationItem {
 class IfcTextLiteral : public IfcGeometricRepresentationItem {
 public:
     /// The text literal to be presented.
-    IfcPresentableText Literal();
-    void setLiteral(IfcPresentableText v);
+    std::string Literal() const;
+    void setLiteral(std::string v);
     /// An IfcAxis2Placement that determines the placement and orientation of the presented string.
     /// When used with a text style based on IfcTextStyleWithBoxCharacteristics then the y-axis is taken as the reference direction for the box rotation angle and the box slant angle.
-    IfcAxis2Placement Placement();
-    void setPlacement(IfcAxis2Placement v);
+    IfcAxis2Placement* Placement() const;
+    void setPlacement(IfcAxis2Placement* v);
     /// The writing direction of the text literal.
-    IfcTextPath::IfcTextPath Path();
+    IfcTextPath::IfcTextPath Path() const;
     void setPath(IfcTextPath::IfcTextPath v);
     virtual unsigned int getArgumentCount() const { return 3; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_STRING; case 1: return IfcUtil::Argument_ENTITY; case 2: return IfcUtil::Argument_ENUMERATION; } return IfcGeometricRepresentationItem::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcPresentableText; case 1: return Type::IfcAxis2Placement; case 2: return Type::IfcTextPath; } return IfcGeometricRepresentationItem::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Literal"; case 1: return "Placement"; case 2: return "Path"; } return IfcGeometricRepresentationItem::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcTextLiteral (IfcAbstractEntityPtr e);
-    IfcTextLiteral (IfcPresentableText v1_Literal, IfcAxis2Placement v2_Placement, IfcTextPath::IfcTextPath v3_Path);
-    typedef IfcTextLiteral* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcTextLiteral > > list;
-    typedef IfcTemplatedEntityList< IfcTextLiteral >::it it;
+    IfcTextLiteral (IfcAbstractEntity* e);
+    IfcTextLiteral (std::string v1_Literal, IfcAxis2Placement* v2_Placement, IfcTextPath::IfcTextPath v3_Path);
+    typedef IfcTemplatedEntityList< IfcTextLiteral > list;
 };
 /// The text literal with extent is a text literal with the additional explicit information of the planar extent (or surrounding text box). An alignment attribute defines, how the text box is aligned to the placement and how it may expand.
 /// 
@@ -17965,23 +18977,22 @@ class IfcTextLiteral : public IfcGeometricRepresentationItem {
 class IfcTextLiteralWithExtent : public IfcTextLiteral {
 public:
     /// The extent in the x and y direction of the text literal.
-    IfcPlanarExtent* Extent();
+    IfcPlanarExtent* Extent() const;
     void setExtent(IfcPlanarExtent* v);
     /// The alignment of the text literal relative to its position.
-    IfcBoxAlignment BoxAlignment();
-    void setBoxAlignment(IfcBoxAlignment v);
+    std::string BoxAlignment() const;
+    void setBoxAlignment(std::string v);
     virtual unsigned int getArgumentCount() const { return 5; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 3: return IfcUtil::Argument_ENTITY; case 4: return IfcUtil::Argument_STRING; } return IfcTextLiteral::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 3: return Type::IfcPlanarExtent; case 4: return Type::IfcBoxAlignment; } return IfcTextLiteral::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 3: return "Extent"; case 4: return "BoxAlignment"; } return IfcTextLiteral::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcTextLiteralWithExtent (IfcAbstractEntityPtr e);
-    IfcTextLiteralWithExtent (IfcPresentableText v1_Literal, IfcAxis2Placement v2_Placement, IfcTextPath::IfcTextPath v3_Path, IfcPlanarExtent* v4_Extent, IfcBoxAlignment v5_BoxAlignment);
-    typedef IfcTextLiteralWithExtent* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcTextLiteralWithExtent > > list;
-    typedef IfcTemplatedEntityList< IfcTextLiteralWithExtent >::it it;
+    IfcTextLiteralWithExtent (IfcAbstractEntity* e);
+    IfcTextLiteralWithExtent (std::string v1_Literal, IfcAxis2Placement* v2_Placement, IfcTextPath::IfcTextPath v3_Path, IfcPlanarExtent* v4_Extent, std::string v5_BoxAlignment);
+    typedef IfcTemplatedEntityList< IfcTextLiteralWithExtent > list;
 };
 /// Definition from CSS1 (W3C Recommendation): Setting font properties will be among the most common uses of style sheets. Unfortunately, there exists no well-defined and universally accepted taxonomy for classifying fonts, and terms that apply to one font family may not be appropriate for others. For example, 'italic' is commonly used to label slanted text, but slanted text may also be labeled as being Oblique, Slanted, Incline, Cursive or Kursiv. Therefore it is not a simple problem to map typical font selection properties to a specific font.
 /// 
@@ -18051,41 +19062,40 @@ class IfcTextLiteralWithExtent : public IfcTextLiteral {
 class IfcTextStyleFontModel : public IfcPreDefinedTextFont {
 public:
     /// The value is a prioritized list of font family names and/or generic family names. The first list entry has the highest priority, if this font fails, the next list item shall be used. The last list item should (if possible) be a generic family.
-    std::vector< IfcTextFontName > /*[1:?]*/ FontFamily();
-    void setFontFamily(std::vector< IfcTextFontName > /*[1:?]*/ v);
+    std::vector< std::string > /*[1:?]*/ FontFamily() const;
+    void setFontFamily(std::vector< std::string > /*[1:?]*/ v);
     /// Whether the optional attribute FontStyle is defined for this IfcTextStyleFontModel
-    bool hasFontStyle();
+    bool hasFontStyle() const;
     /// The font style property selects between normal (sometimes referred to as "roman" or "upright"), italic and oblique faces within a font family.
-    IfcFontStyle FontStyle();
-    void setFontStyle(IfcFontStyle v);
+    std::string FontStyle() const;
+    void setFontStyle(std::string v);
     /// Whether the optional attribute FontVariant is defined for this IfcTextStyleFontModel
-    bool hasFontVariant();
+    bool hasFontVariant() const;
     /// The font variant property selects between normal and small-caps.
     ///   NOTE  It has been introduced for later compliance to full CSS1 support.
-    IfcFontVariant FontVariant();
-    void setFontVariant(IfcFontVariant v);
+    std::string FontVariant() const;
+    void setFontVariant(std::string v);
     /// Whether the optional attribute FontWeight is defined for this IfcTextStyleFontModel
-    bool hasFontWeight();
+    bool hasFontWeight() const;
     /// The font weight property selects the weight of the font.
     ///   NOTE  Values other then 'normal' and 'bold' have been introduced for later compliance to full CSS1 support.
-    IfcFontWeight FontWeight();
-    void setFontWeight(IfcFontWeight v);
+    std::string FontWeight() const;
+    void setFontWeight(std::string v);
     /// The font size provides the size or height of the text font.
     ///   NOTE  The following values are allowed, <IfcLengthMeasure, with positive values, the length unit is globally defined at IfcUnitAssignment.
-    IfcSizeSelect FontSize();
-    void setFontSize(IfcSizeSelect v);
+    IfcSizeSelect* FontSize() const;
+    void setFontSize(IfcSizeSelect* v);
     virtual unsigned int getArgumentCount() const { return 6; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 1: return IfcUtil::Argument_VECTOR_STRING; case 2: return IfcUtil::Argument_STRING; case 3: return IfcUtil::Argument_STRING; case 4: return IfcUtil::Argument_STRING; case 5: return IfcUtil::Argument_ENTITY; } return IfcPreDefinedTextFont::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 1: return Type::IfcTextFontName; case 2: return Type::IfcFontStyle; case 3: return Type::IfcFontVariant; case 4: return Type::IfcFontWeight; case 5: return Type::IfcSizeSelect; } return IfcPreDefinedTextFont::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 1: return "FontFamily"; case 2: return "FontStyle"; case 3: return "FontVariant"; case 4: return "FontWeight"; case 5: return "FontSize"; } return IfcPreDefinedTextFont::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcTextStyleFontModel (IfcAbstractEntityPtr e);
-    IfcTextStyleFontModel (IfcLabel v1_Name, std::vector< IfcTextFontName > /*[1:?]*/ v2_FontFamily, boost::optional< IfcFontStyle > v3_FontStyle, boost::optional< IfcFontVariant > v4_FontVariant, boost::optional< IfcFontWeight > v5_FontWeight, IfcSizeSelect v6_FontSize);
-    typedef IfcTextStyleFontModel* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcTextStyleFontModel > > list;
-    typedef IfcTemplatedEntityList< IfcTextStyleFontModel >::it it;
+    IfcTextStyleFontModel (IfcAbstractEntity* e);
+    IfcTextStyleFontModel (std::string v1_Name, std::vector< std::string > /*[1:?]*/ v2_FontFamily, boost::optional< std::string > v3_FontStyle, boost::optional< std::string > v4_FontVariant, boost::optional< std::string > v5_FontWeight, IfcSizeSelect* v6_FontSize);
+    typedef IfcTemplatedEntityList< IfcTextStyleFontModel > list;
 };
 /// IfcTrapeziumProfileDef defines a trapezium as the profile definition used by the swept surface geometry or the swept area solid. It is given by its Top X and Bottom X extent and its Y extent as well as by the offset of the Top X extend, and placed within the 2D position coordinate system, established by the Position attribute. It is placed centric within the position coordinate system, that is, in the center of the bounding box. 
 /// 
@@ -18128,29 +19138,28 @@ class IfcTextStyleFontModel : public IfcPreDefinedTextFont {
 class IfcTrapeziumProfileDef : public IfcParameterizedProfileDef {
 public:
     /// The extent of the bottom line measured along the implicit x-axis.
-    IfcPositiveLengthMeasure BottomXDim();
-    void setBottomXDim(IfcPositiveLengthMeasure v);
+    double BottomXDim() const;
+    void setBottomXDim(double v);
     /// The extent of the top line measured along the implicit x-axis.
-    IfcPositiveLengthMeasure TopXDim();
-    void setTopXDim(IfcPositiveLengthMeasure v);
+    double TopXDim() const;
+    void setTopXDim(double v);
     /// The extent of the distance between the parallel bottom and top lines measured along the implicit y-axis.
-    IfcPositiveLengthMeasure YDim();
-    void setYDim(IfcPositiveLengthMeasure v);
+    double YDim() const;
+    void setYDim(double v);
     /// Offset from the beginning of the top line to the bottom line, measured along the implicit x-axis.
-    IfcLengthMeasure TopXOffset();
-    void setTopXOffset(IfcLengthMeasure v);
+    double TopXOffset() const;
+    void setTopXOffset(double v);
     virtual unsigned int getArgumentCount() const { return 7; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 3: return IfcUtil::Argument_DOUBLE; case 4: return IfcUtil::Argument_DOUBLE; case 5: return IfcUtil::Argument_DOUBLE; case 6: return IfcUtil::Argument_DOUBLE; } return IfcParameterizedProfileDef::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 3: return Type::IfcPositiveLengthMeasure; case 4: return Type::IfcPositiveLengthMeasure; case 5: return Type::IfcPositiveLengthMeasure; case 6: return Type::IfcLengthMeasure; } return IfcParameterizedProfileDef::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 3: return "BottomXDim"; case 4: return "TopXDim"; case 5: return "YDim"; case 6: return "TopXOffset"; } return IfcParameterizedProfileDef::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcTrapeziumProfileDef (IfcAbstractEntityPtr e);
-    IfcTrapeziumProfileDef (IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< IfcLabel > v2_ProfileName, IfcAxis2Placement2D* v3_Position, IfcPositiveLengthMeasure v4_BottomXDim, IfcPositiveLengthMeasure v5_TopXDim, IfcPositiveLengthMeasure v6_YDim, IfcLengthMeasure v7_TopXOffset);
-    typedef IfcTrapeziumProfileDef* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcTrapeziumProfileDef > > list;
-    typedef IfcTemplatedEntityList< IfcTrapeziumProfileDef >::it it;
+    IfcTrapeziumProfileDef (IfcAbstractEntity* e);
+    IfcTrapeziumProfileDef (IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< std::string > v2_ProfileName, IfcAxis2Placement2D* v3_Position, double v4_BottomXDim, double v5_TopXDim, double v6_YDim, double v7_TopXOffset);
+    typedef IfcTemplatedEntityList< IfcTrapeziumProfileDef > list;
 };
 /// The object type defines the
 /// specific information about a type, being common to all
@@ -18186,7 +19195,7 @@ class IfcTrapeziumProfileDef : public IfcParameterizedProfileDef {
 class IfcTypeObject : public IfcObjectDefinition {
 public:
     /// Whether the optional attribute ApplicableOccurrence is defined for this IfcTypeObject
-    bool hasApplicableOccurrence();
+    bool hasApplicableOccurrence() const;
     /// The attribute optionally defines the data type of the occurrence object, to which the assigned type object can relate. If not present, no instruction is given to which occurrence object the type object is applicable. The following conventions are used:
     /// 
     /// The IFC entity name of the applicable occurrence using the IFC naming convention, CamelCase with IFC prefix
@@ -18194,28 +19203,27 @@ class IfcTypeObject : public IfcObjectDefinition {
     ///   If one type object is applicable to many occurrence objects, then those occurrence object names should be separate by comma "," forming a comma separated string.
     /// 
     /// EXAMPLE  Refering to a furniture as applicable occurrence entity would be expressed as 'IfcFurnishingElement', refering to a brace as applicable entity would be expressed as 'IfcMember/BRACE', refering to a wall and wall standard case would be expressed as 'IfcWall, IfcWallStandardCase'.
-    IfcIdentifier ApplicableOccurrence();
-    void setApplicableOccurrence(IfcIdentifier v);
+    std::string ApplicableOccurrence() const;
+    void setApplicableOccurrence(std::string v);
     /// Whether the optional attribute HasPropertySets is defined for this IfcTypeObject
-    bool hasHasPropertySets();
+    bool hasHasPropertySets() const;
     /// Set list of unique property sets, that are associated with the object type and are common to all object occurrences referring to this object type.
     /// 
     /// IFC2x3 CHANGE  The attribute aggregate type has been changed from LIST to SET.
-    SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > HasPropertySets();
-    void setHasPropertySets(SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > v);
+    IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr HasPropertySets() const;
+    void setHasPropertySets(IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr v);
     virtual unsigned int getArgumentCount() const { return 6; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 4: return IfcUtil::Argument_STRING; case 5: return IfcUtil::Argument_ENTITY_LIST; } return IfcObjectDefinition::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 4: return Type::IfcIdentifier; case 5: return Type::IfcPropertySetDefinition; } return IfcObjectDefinition::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 4: return "ApplicableOccurrence"; case 5: return "HasPropertySets"; } return IfcObjectDefinition::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelDefinesByType > > Types(); // INVERSE IfcRelDefinesByType::RelatingType
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcRelDefinesByType >::ptr Types() const; // INVERSE IfcRelDefinesByType::RelatingType
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcTypeObject (IfcAbstractEntityPtr e);
-    IfcTypeObject (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets);
-    typedef IfcTypeObject* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcTypeObject > > list;
-    typedef IfcTemplatedEntityList< IfcTypeObject >::it it;
+    IfcTypeObject (IfcAbstractEntity* e);
+    IfcTypeObject (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets);
+    typedef IfcTemplatedEntityList< IfcTypeObject > list;
 };
 /// IfcTypeProcess defines a
 /// specific (or type) definition of a process or activity without
@@ -18248,35 +19256,34 @@ class IfcTypeObject : public IfcObjectDefinition {
 class IfcTypeProcess : public IfcTypeObject {
 public:
     /// Whether the optional attribute Identification is defined for this IfcTypeProcess
-    bool hasIdentification();
+    bool hasIdentification() const;
     /// An identifying designation given to a process type.
-    IfcIdentifier Identification();
-    void setIdentification(IfcIdentifier v);
+    std::string Identification() const;
+    void setIdentification(std::string v);
     /// Whether the optional attribute LongDescription is defined for this IfcTypeProcess
-    bool hasLongDescription();
+    bool hasLongDescription() const;
     /// An long description, or text, describing the activity in detail.
     /// 
     /// NOTE The inherited SELF\IfcRoot.Description attribute is used as the short description.
-    IfcText LongDescription();
-    void setLongDescription(IfcText v);
+    std::string LongDescription() const;
+    void setLongDescription(std::string v);
     /// Whether the optional attribute ProcessType is defined for this IfcTypeProcess
-    bool hasProcessType();
+    bool hasProcessType() const;
     /// The type denotes a particular type that indicates the process further. The use has to be established at the level of instantiable subtypes. In particular it holds the user defined type, if the enumeration of the attribute 'PredefinedType' is set to USERDEFINED.
-    IfcLabel ProcessType();
-    void setProcessType(IfcLabel v);
+    std::string ProcessType() const;
+    void setProcessType(std::string v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 6: return IfcUtil::Argument_STRING; case 7: return IfcUtil::Argument_STRING; case 8: return IfcUtil::Argument_STRING; } return IfcTypeObject::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 6: return Type::IfcIdentifier; case 7: return Type::IfcText; case 8: return Type::IfcLabel; } return IfcTypeObject::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 6: return "Identification"; case 7: return "LongDescription"; case 8: return "ProcessType"; } return IfcTypeObject::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelAssignsToProcess > > OperatesOn(); // INVERSE IfcRelAssignsToProcess::RelatingProcess
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcRelAssignsToProcess >::ptr OperatesOn() const; // INVERSE IfcRelAssignsToProcess::RelatingProcess
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcTypeProcess (IfcAbstractEntityPtr e);
-    IfcTypeProcess (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< IfcIdentifier > v7_Identification, boost::optional< IfcText > v8_LongDescription, boost::optional< IfcLabel > v9_ProcessType);
-    typedef IfcTypeProcess* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcTypeProcess > > list;
-    typedef IfcTemplatedEntityList< IfcTypeProcess >::it it;
+    IfcTypeProcess (IfcAbstractEntity* e);
+    IfcTypeProcess (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< std::string > v7_Identification, boost::optional< std::string > v8_LongDescription, boost::optional< std::string > v9_ProcessType);
+    typedef IfcTemplatedEntityList< IfcTypeProcess > list;
 };
 /// IfcTypeProduct defines a type
 /// definition of a product without being already inserted into a
@@ -18347,28 +19354,27 @@ class IfcTypeProcess : public IfcTypeObject {
 class IfcTypeProduct : public IfcTypeObject {
 public:
     /// Whether the optional attribute RepresentationMaps is defined for this IfcTypeProduct
-    bool hasRepresentationMaps();
+    bool hasRepresentationMaps() const;
     /// List of unique representation maps. Each representation map describes a block definition of the shape of the product style. By providing more than one representation map, a multi-view block definition can be given.
-    SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > RepresentationMaps();
-    void setRepresentationMaps(SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > v);
+    IfcTemplatedEntityList< IfcRepresentationMap >::ptr RepresentationMaps() const;
+    void setRepresentationMaps(IfcTemplatedEntityList< IfcRepresentationMap >::ptr v);
     /// Whether the optional attribute Tag is defined for this IfcTypeProduct
-    bool hasTag();
+    bool hasTag() const;
     /// The tag (or label) identifier at the particular type of a product, e.g. the article number (like the EAN). It is the identifier at the specific level.
-    IfcLabel Tag();
-    void setTag(IfcLabel v);
+    std::string Tag() const;
+    void setTag(std::string v);
     virtual unsigned int getArgumentCount() const { return 8; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 6: return IfcUtil::Argument_ENTITY_LIST; case 7: return IfcUtil::Argument_STRING; } return IfcTypeObject::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 6: return Type::IfcRepresentationMap; case 7: return Type::IfcLabel; } return IfcTypeObject::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 6: return "RepresentationMaps"; case 7: return "Tag"; } return IfcTypeObject::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelAssignsToProduct > > ReferencedBy(); // INVERSE IfcRelAssignsToProduct::RelatingProduct
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcRelAssignsToProduct >::ptr ReferencedBy() const; // INVERSE IfcRelAssignsToProduct::RelatingProduct
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcTypeProduct (IfcAbstractEntityPtr e);
-    IfcTypeProduct (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag);
-    typedef IfcTypeProduct* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcTypeProduct > > list;
-    typedef IfcTemplatedEntityList< IfcTypeProduct >::it it;
+    IfcTypeProduct (IfcAbstractEntity* e);
+    IfcTypeProduct (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag);
+    typedef IfcTemplatedEntityList< IfcTypeProduct > list;
 };
 /// IfcTypeResource defines a specific (or type) definition of a resource.ÿIt is used to define a resource specification (the specific resource, that is common to all occurrences that are defined for that resource) and could act as a resource template.
 /// 
@@ -18385,35 +19391,34 @@ class IfcTypeProduct : public IfcTypeObject {
 class IfcTypeResource : public IfcTypeObject {
 public:
     /// Whether the optional attribute Identification is defined for this IfcTypeResource
-    bool hasIdentification();
+    bool hasIdentification() const;
     /// An identifying designation given to a resource type.
-    IfcIdentifier Identification();
-    void setIdentification(IfcIdentifier v);
+    std::string Identification() const;
+    void setIdentification(std::string v);
     /// Whether the optional attribute LongDescription is defined for this IfcTypeResource
-    bool hasLongDescription();
+    bool hasLongDescription() const;
     /// An long description, or text, describing the resource in detail.
     /// 
     /// NOTE The inherited SELF\IfcRoot.Description attribute is used as the short description.
-    IfcText LongDescription();
-    void setLongDescription(IfcText v);
+    std::string LongDescription() const;
+    void setLongDescription(std::string v);
     /// Whether the optional attribute ResourceType is defined for this IfcTypeResource
-    bool hasResourceType();
+    bool hasResourceType() const;
     /// The type denotes a particular type that indicates the resource further. The use has to be established at the level of instantiable subtypes. In particular it holds the user defined type, if the enumeration of the attribute 'PredefinedType' is set to USERDEFINED.
-    IfcLabel ResourceType();
-    void setResourceType(IfcLabel v);
+    std::string ResourceType() const;
+    void setResourceType(std::string v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 6: return IfcUtil::Argument_STRING; case 7: return IfcUtil::Argument_STRING; case 8: return IfcUtil::Argument_STRING; } return IfcTypeObject::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 6: return Type::IfcIdentifier; case 7: return Type::IfcText; case 8: return Type::IfcLabel; } return IfcTypeObject::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 6: return "Identification"; case 7: return "LongDescription"; case 8: return "ResourceType"; } return IfcTypeObject::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelAssignsToResource > > ResourceOf(); // INVERSE IfcRelAssignsToResource::RelatingResource
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcRelAssignsToResource >::ptr ResourceOf() const; // INVERSE IfcRelAssignsToResource::RelatingResource
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcTypeResource (IfcAbstractEntityPtr e);
-    IfcTypeResource (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< IfcIdentifier > v7_Identification, boost::optional< IfcText > v8_LongDescription, boost::optional< IfcLabel > v9_ResourceType);
-    typedef IfcTypeResource* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcTypeResource > > list;
-    typedef IfcTemplatedEntityList< IfcTypeResource >::it it;
+    IfcTypeResource (IfcAbstractEntity* e);
+    IfcTypeResource (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< std::string > v7_Identification, boost::optional< std::string > v8_LongDescription, boost::optional< std::string > v9_ResourceType);
+    typedef IfcTemplatedEntityList< IfcTypeResource > list;
 };
 /// IfcUShapeProfileDef defines
 /// a section profile that provides the defining parameters of a U-shape
@@ -18446,44 +19451,43 @@ class IfcTypeResource : public IfcTypeObject {
 class IfcUShapeProfileDef : public IfcParameterizedProfileDef {
 public:
     /// Web lengths, see illustration above (= h).
-    IfcPositiveLengthMeasure Depth();
-    void setDepth(IfcPositiveLengthMeasure v);
+    double Depth() const;
+    void setDepth(double v);
     /// Flange lengths, see illustration above (= b).
-    IfcPositiveLengthMeasure FlangeWidth();
-    void setFlangeWidth(IfcPositiveLengthMeasure v);
+    double FlangeWidth() const;
+    void setFlangeWidth(double v);
     /// Constant wall thickness of web (= ts).
-    IfcPositiveLengthMeasure WebThickness();
-    void setWebThickness(IfcPositiveLengthMeasure v);
+    double WebThickness() const;
+    void setWebThickness(double v);
     /// Constant wall thickness of flange (= tg).
-    IfcPositiveLengthMeasure FlangeThickness();
-    void setFlangeThickness(IfcPositiveLengthMeasure v);
+    double FlangeThickness() const;
+    void setFlangeThickness(double v);
     /// Whether the optional attribute FilletRadius is defined for this IfcUShapeProfileDef
-    bool hasFilletRadius();
+    bool hasFilletRadius() const;
     /// Fillet radius according the above illustration (= r1).
-    IfcNonNegativeLengthMeasure FilletRadius();
-    void setFilletRadius(IfcNonNegativeLengthMeasure v);
+    double FilletRadius() const;
+    void setFilletRadius(double v);
     /// Whether the optional attribute EdgeRadius is defined for this IfcUShapeProfileDef
-    bool hasEdgeRadius();
+    bool hasEdgeRadius() const;
     /// Edge radius according the above illustration (= r2).
-    IfcNonNegativeLengthMeasure EdgeRadius();
-    void setEdgeRadius(IfcNonNegativeLengthMeasure v);
+    double EdgeRadius() const;
+    void setEdgeRadius(double v);
     /// Whether the optional attribute FlangeSlope is defined for this IfcUShapeProfileDef
-    bool hasFlangeSlope();
+    bool hasFlangeSlope() const;
     /// Slope of flange of the profile.
-    IfcPlaneAngleMeasure FlangeSlope();
-    void setFlangeSlope(IfcPlaneAngleMeasure v);
+    double FlangeSlope() const;
+    void setFlangeSlope(double v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 3: return IfcUtil::Argument_DOUBLE; case 4: return IfcUtil::Argument_DOUBLE; case 5: return IfcUtil::Argument_DOUBLE; case 6: return IfcUtil::Argument_DOUBLE; case 7: return IfcUtil::Argument_DOUBLE; case 8: return IfcUtil::Argument_DOUBLE; case 9: return IfcUtil::Argument_DOUBLE; } return IfcParameterizedProfileDef::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 3: return Type::IfcPositiveLengthMeasure; case 4: return Type::IfcPositiveLengthMeasure; case 5: return Type::IfcPositiveLengthMeasure; case 6: return Type::IfcPositiveLengthMeasure; case 7: return Type::IfcNonNegativeLengthMeasure; case 8: return Type::IfcNonNegativeLengthMeasure; case 9: return Type::IfcPlaneAngleMeasure; } return IfcParameterizedProfileDef::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 3: return "Depth"; case 4: return "FlangeWidth"; case 5: return "WebThickness"; case 6: return "FlangeThickness"; case 7: return "FilletRadius"; case 8: return "EdgeRadius"; case 9: return "FlangeSlope"; } return IfcParameterizedProfileDef::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcUShapeProfileDef (IfcAbstractEntityPtr e);
-    IfcUShapeProfileDef (IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< IfcLabel > v2_ProfileName, IfcAxis2Placement2D* v3_Position, IfcPositiveLengthMeasure v4_Depth, IfcPositiveLengthMeasure v5_FlangeWidth, IfcPositiveLengthMeasure v6_WebThickness, IfcPositiveLengthMeasure v7_FlangeThickness, boost::optional< IfcNonNegativeLengthMeasure > v8_FilletRadius, boost::optional< IfcNonNegativeLengthMeasure > v9_EdgeRadius, boost::optional< IfcPlaneAngleMeasure > v10_FlangeSlope);
-    typedef IfcUShapeProfileDef* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcUShapeProfileDef > > list;
-    typedef IfcTemplatedEntityList< IfcUShapeProfileDef >::it it;
+    IfcUShapeProfileDef (IfcAbstractEntity* e);
+    IfcUShapeProfileDef (IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< std::string > v2_ProfileName, IfcAxis2Placement2D* v3_Position, double v4_Depth, double v5_FlangeWidth, double v6_WebThickness, double v7_FlangeThickness, boost::optional< double > v8_FilletRadius, boost::optional< double > v9_EdgeRadius, boost::optional< double > v10_FlangeSlope);
+    typedef IfcTemplatedEntityList< IfcUShapeProfileDef > list;
 };
 /// Definition from ISO/CD 10303-42:1992: The vector is defined in terms of the direction and magnitude of the vector. The value of the magnitude attribute defines the magnitude of the vector. 
 /// 
@@ -18495,23 +19499,22 @@ class IfcUShapeProfileDef : public IfcParameterizedProfileDef {
 class IfcVector : public IfcGeometricRepresentationItem {
 public:
     /// The direction of the vector.
-    IfcDirection* Orientation();
+    IfcDirection* Orientation() const;
     void setOrientation(IfcDirection* v);
     /// The magnitude of the vector. All vectors of Magnitude 0.0 are regarded as equal in value regardless of the orientation attribute.
-    IfcLengthMeasure Magnitude();
-    void setMagnitude(IfcLengthMeasure v);
+    double Magnitude() const;
+    void setMagnitude(double v);
     virtual unsigned int getArgumentCount() const { return 2; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY; case 1: return IfcUtil::Argument_DOUBLE; } return IfcGeometricRepresentationItem::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcDirection; case 1: return Type::IfcLengthMeasure; } return IfcGeometricRepresentationItem::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Orientation"; case 1: return "Magnitude"; } return IfcGeometricRepresentationItem::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcVector (IfcAbstractEntityPtr e);
-    IfcVector (IfcDirection* v1_Orientation, IfcLengthMeasure v2_Magnitude);
-    typedef IfcVector* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcVector > > list;
-    typedef IfcTemplatedEntityList< IfcVector >::it it;
+    IfcVector (IfcAbstractEntity* e);
+    IfcVector (IfcDirection* v1_Orientation, double v2_Magnitude);
+    typedef IfcTemplatedEntityList< IfcVector > list;
 };
 /// Definition from ISO/CD 10303-42:1992: A vertex_loop is a loop of
 ///   zero genus consisting of a single vertex. A vertex can exist independently of a
@@ -18528,20 +19531,19 @@ class IfcVector : public IfcGeometricRepresentationItem {
 class IfcVertexLoop : public IfcLoop {
 public:
     /// The vertex which defines the entire loop.
-    IfcVertex* LoopVertex();
+    IfcVertex* LoopVertex() const;
     void setLoopVertex(IfcVertex* v);
     virtual unsigned int getArgumentCount() const { return 1; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY; } return IfcLoop::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcVertex; } return IfcLoop::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "LoopVertex"; } return IfcLoop::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcVertexLoop (IfcAbstractEntityPtr e);
+    IfcVertexLoop (IfcAbstractEntity* e);
     IfcVertexLoop (IfcVertex* v1_LoopVertex);
-    typedef IfcVertexLoop* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcVertexLoop > > list;
-    typedef IfcTemplatedEntityList< IfcVertexLoop >::it it;
+    typedef IfcTemplatedEntityList< IfcVertexLoop > list;
 };
 /// Definition: The window style defines a particular style of windows, which may be included into the spatial context of the building model through instances of IfcWindow. A window style defines the overall parameter of the window style and refers to the particular parameter of the lining and one (or several) panels through IfcWindowLiningProperties and IfcWindowPanelProperties.
 /// 
@@ -18564,29 +19566,28 @@ class IfcVertexLoop : public IfcLoop {
 class IfcWindowStyle : public IfcTypeProduct {
 public:
     /// Type defining the basic construction and material type of the window.
-    IfcWindowStyleConstructionEnum::IfcWindowStyleConstructionEnum ConstructionType();
+    IfcWindowStyleConstructionEnum::IfcWindowStyleConstructionEnum ConstructionType() const;
     void setConstructionType(IfcWindowStyleConstructionEnum::IfcWindowStyleConstructionEnum v);
     /// Type defining the general layout and operation of the window style.
-    IfcWindowStyleOperationEnum::IfcWindowStyleOperationEnum OperationType();
+    IfcWindowStyleOperationEnum::IfcWindowStyleOperationEnum OperationType() const;
     void setOperationType(IfcWindowStyleOperationEnum::IfcWindowStyleOperationEnum v);
     /// The Boolean value reflects, whether the parameter given in the attached lining and panel properties exactly define the geometry (TRUE), or whether the attached style shape take precedence (FALSE). In the last case the parameter have only informative value.
-    bool ParameterTakesPrecedence();
+    bool ParameterTakesPrecedence() const;
     void setParameterTakesPrecedence(bool v);
     /// The Boolean indicates, whether the attached ShapeStyle can be sized (using scale factor of transformation), or not (FALSE). If not, the ShapeStyle should be inserted by the IfcWindow (using IfcMappedItem) with the scale factor = 1.
-    bool Sizeable();
+    bool Sizeable() const;
     void setSizeable(bool v);
     virtual unsigned int getArgumentCount() const { return 12; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_ENUMERATION; case 9: return IfcUtil::Argument_ENUMERATION; case 10: return IfcUtil::Argument_BOOL; case 11: return IfcUtil::Argument_BOOL; } return IfcTypeProduct::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcWindowStyleConstructionEnum; case 9: return Type::IfcWindowStyleOperationEnum; case 10: return Type::UNDEFINED; case 11: return Type::UNDEFINED; } return IfcTypeProduct::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "ConstructionType"; case 9: return "OperationType"; case 10: return "ParameterTakesPrecedence"; case 11: return "Sizeable"; } return IfcTypeProduct::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcWindowStyle (IfcAbstractEntityPtr e);
-    IfcWindowStyle (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, IfcWindowStyleConstructionEnum::IfcWindowStyleConstructionEnum v9_ConstructionType, IfcWindowStyleOperationEnum::IfcWindowStyleOperationEnum v10_OperationType, bool v11_ParameterTakesPrecedence, bool v12_Sizeable);
-    typedef IfcWindowStyle* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcWindowStyle > > list;
-    typedef IfcTemplatedEntityList< IfcWindowStyle >::it it;
+    IfcWindowStyle (IfcAbstractEntity* e);
+    IfcWindowStyle (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, IfcWindowStyleConstructionEnum::IfcWindowStyleConstructionEnum v9_ConstructionType, IfcWindowStyleOperationEnum::IfcWindowStyleOperationEnum v10_OperationType, bool v11_ParameterTakesPrecedence, bool v12_Sizeable);
+    typedef IfcTemplatedEntityList< IfcWindowStyle > list;
 };
 /// IfcZShapeProfileDef defines
 /// a section profile that provides the defining parameters of a Z-shape
@@ -18616,39 +19617,38 @@ class IfcWindowStyle : public IfcTypeProduct {
 class IfcZShapeProfileDef : public IfcParameterizedProfileDef {
 public:
     /// Web length, see illustration above (= h).
-    IfcPositiveLengthMeasure Depth();
-    void setDepth(IfcPositiveLengthMeasure v);
+    double Depth() const;
+    void setDepth(double v);
     /// Flange length, see illustration above (= b).
-    IfcPositiveLengthMeasure FlangeWidth();
-    void setFlangeWidth(IfcPositiveLengthMeasure v);
+    double FlangeWidth() const;
+    void setFlangeWidth(double v);
     /// Constant wall thickness of web, see illustration above (= ts).
-    IfcPositiveLengthMeasure WebThickness();
-    void setWebThickness(IfcPositiveLengthMeasure v);
+    double WebThickness() const;
+    void setWebThickness(double v);
     /// Constant wall thickness of flange, see illustration above (= tg).
-    IfcPositiveLengthMeasure FlangeThickness();
-    void setFlangeThickness(IfcPositiveLengthMeasure v);
+    double FlangeThickness() const;
+    void setFlangeThickness(double v);
     /// Whether the optional attribute FilletRadius is defined for this IfcZShapeProfileDef
-    bool hasFilletRadius();
+    bool hasFilletRadius() const;
     /// Fillet radius according the above illustration (= r1).
-    IfcNonNegativeLengthMeasure FilletRadius();
-    void setFilletRadius(IfcNonNegativeLengthMeasure v);
+    double FilletRadius() const;
+    void setFilletRadius(double v);
     /// Whether the optional attribute EdgeRadius is defined for this IfcZShapeProfileDef
-    bool hasEdgeRadius();
+    bool hasEdgeRadius() const;
     /// Edge radius according the above illustration (= r2).
-    IfcNonNegativeLengthMeasure EdgeRadius();
-    void setEdgeRadius(IfcNonNegativeLengthMeasure v);
+    double EdgeRadius() const;
+    void setEdgeRadius(double v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 3: return IfcUtil::Argument_DOUBLE; case 4: return IfcUtil::Argument_DOUBLE; case 5: return IfcUtil::Argument_DOUBLE; case 6: return IfcUtil::Argument_DOUBLE; case 7: return IfcUtil::Argument_DOUBLE; case 8: return IfcUtil::Argument_DOUBLE; } return IfcParameterizedProfileDef::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 3: return Type::IfcPositiveLengthMeasure; case 4: return Type::IfcPositiveLengthMeasure; case 5: return Type::IfcPositiveLengthMeasure; case 6: return Type::IfcPositiveLengthMeasure; case 7: return Type::IfcNonNegativeLengthMeasure; case 8: return Type::IfcNonNegativeLengthMeasure; } return IfcParameterizedProfileDef::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 3: return "Depth"; case 4: return "FlangeWidth"; case 5: return "WebThickness"; case 6: return "FlangeThickness"; case 7: return "FilletRadius"; case 8: return "EdgeRadius"; } return IfcParameterizedProfileDef::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcZShapeProfileDef (IfcAbstractEntityPtr e);
-    IfcZShapeProfileDef (IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< IfcLabel > v2_ProfileName, IfcAxis2Placement2D* v3_Position, IfcPositiveLengthMeasure v4_Depth, IfcPositiveLengthMeasure v5_FlangeWidth, IfcPositiveLengthMeasure v6_WebThickness, IfcPositiveLengthMeasure v7_FlangeThickness, boost::optional< IfcNonNegativeLengthMeasure > v8_FilletRadius, boost::optional< IfcNonNegativeLengthMeasure > v9_EdgeRadius);
-    typedef IfcZShapeProfileDef* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcZShapeProfileDef > > list;
-    typedef IfcTemplatedEntityList< IfcZShapeProfileDef >::it it;
+    IfcZShapeProfileDef (IfcAbstractEntity* e);
+    IfcZShapeProfileDef (IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< std::string > v2_ProfileName, IfcAxis2Placement2D* v3_Position, double v4_Depth, double v5_FlangeWidth, double v6_WebThickness, double v7_FlangeThickness, boost::optional< double > v8_FilletRadius, boost::optional< double > v9_EdgeRadius);
+    typedef IfcTemplatedEntityList< IfcZShapeProfileDef > list;
 };
 /// An advanced face is a specialization of a face surface that has to meet requirements on using particular topological and geometric representation items for the definition of the faces, edges and vertices.
 /// 
@@ -18667,16 +19667,15 @@ class IfcAdvancedFace : public IfcFaceSurface {
 public:
     virtual unsigned int getArgumentCount() const { return 3; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcFaceSurface::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcFaceSurface::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcFaceSurface::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcAdvancedFace (IfcAbstractEntityPtr e);
-    IfcAdvancedFace (SHARED_PTR< IfcTemplatedEntityList< IfcFaceBound > > v1_Bounds, IfcSurface* v2_FaceSurface, bool v3_SameSense);
-    typedef IfcAdvancedFace* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcAdvancedFace > > list;
-    typedef IfcTemplatedEntityList< IfcAdvancedFace >::it it;
+    IfcAdvancedFace (IfcAbstractEntity* e);
+    IfcAdvancedFace (IfcTemplatedEntityList< IfcFaceBound >::ptr v1_Bounds, IfcSurface* v2_FaceSurface, bool v3_SameSense);
+    typedef IfcTemplatedEntityList< IfcAdvancedFace > list;
 };
 /// Definition from ISO/CD 10303-46:1992: An annotation fill area is a set of curves that may be filled with hatching, colour or tiling. The annotation fill are is described by boundaries which consist of non-intersecting, non-self-intersecting closed curves. These curves form the boundary of planar areas to be filled according to the style for the annotation fill area.
 /// 
@@ -18703,27 +19702,26 @@ class IfcAnnotationFillArea : public IfcGeometricRepresentationItem {
     /// A closed curve that defines the outer boundary of the fill area. The areas defined by the outer boundary (minus potentially defined inner boundaries) is filled by the fill area style.
     /// 
     /// IFC2x Edition 3 CHANGE  The two new attributes OuterBoundary and InnerBoundaries replace the old single attribute Boundaries.
-    IfcCurve* OuterBoundary();
+    IfcCurve* OuterBoundary() const;
     void setOuterBoundary(IfcCurve* v);
     /// Whether the optional attribute InnerBoundaries is defined for this IfcAnnotationFillArea
-    bool hasInnerBoundaries();
+    bool hasInnerBoundaries() const;
     /// A set of inner curves that define the inner boundaries of the fill area. The areas defined by the inner boundaries are excluded from applying the fill area style.
     /// 
     /// IFC2x Edition 3 CHANGE  The two new attributes OuterBoundary and InnerBoundaries replace the old single attribute Boundaries.
-    SHARED_PTR< IfcTemplatedEntityList< IfcCurve > > InnerBoundaries();
-    void setInnerBoundaries(SHARED_PTR< IfcTemplatedEntityList< IfcCurve > > v);
+    IfcTemplatedEntityList< IfcCurve >::ptr InnerBoundaries() const;
+    void setInnerBoundaries(IfcTemplatedEntityList< IfcCurve >::ptr v);
     virtual unsigned int getArgumentCount() const { return 2; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY; case 1: return IfcUtil::Argument_ENTITY_LIST; } return IfcGeometricRepresentationItem::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcCurve; case 1: return Type::IfcCurve; } return IfcGeometricRepresentationItem::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "OuterBoundary"; case 1: return "InnerBoundaries"; } return IfcGeometricRepresentationItem::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcAnnotationFillArea (IfcAbstractEntityPtr e);
-    IfcAnnotationFillArea (IfcCurve* v1_OuterBoundary, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcCurve > > > v2_InnerBoundaries);
-    typedef IfcAnnotationFillArea* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcAnnotationFillArea > > list;
-    typedef IfcTemplatedEntityList< IfcAnnotationFillArea >::it it;
+    IfcAnnotationFillArea (IfcAbstractEntity* e);
+    IfcAnnotationFillArea (IfcCurve* v1_OuterBoundary, boost::optional< IfcTemplatedEntityList< IfcCurve >::ptr > v2_InnerBoundaries);
+    typedef IfcTemplatedEntityList< IfcAnnotationFillArea > list;
 };
 /// IfcAsymmetricIShapeProfileDef
 /// defines a section profile that provides the defining parameters of a
@@ -18764,59 +19762,58 @@ class IfcAnnotationFillArea : public IfcGeometricRepresentationItem {
 /// Figure 310 — Assymetric I-shape profile
 class IfcAsymmetricIShapeProfileDef : public IfcParameterizedProfileDef {
 public:
-    IfcPositiveLengthMeasure BottomFlangeWidth();
-    void setBottomFlangeWidth(IfcPositiveLengthMeasure v);
-    IfcPositiveLengthMeasure OverallDepth();
-    void setOverallDepth(IfcPositiveLengthMeasure v);
-    IfcPositiveLengthMeasure WebThickness();
-    void setWebThickness(IfcPositiveLengthMeasure v);
-    IfcPositiveLengthMeasure BottomFlangeThickness();
-    void setBottomFlangeThickness(IfcPositiveLengthMeasure v);
+    double BottomFlangeWidth() const;
+    void setBottomFlangeWidth(double v);
+    double OverallDepth() const;
+    void setOverallDepth(double v);
+    double WebThickness() const;
+    void setWebThickness(double v);
+    double BottomFlangeThickness() const;
+    void setBottomFlangeThickness(double v);
     /// Whether the optional attribute BottomFlangeFilletRadius is defined for this IfcAsymmetricIShapeProfileDef
-    bool hasBottomFlangeFilletRadius();
-    IfcNonNegativeLengthMeasure BottomFlangeFilletRadius();
-    void setBottomFlangeFilletRadius(IfcNonNegativeLengthMeasure v);
+    bool hasBottomFlangeFilletRadius() const;
+    double BottomFlangeFilletRadius() const;
+    void setBottomFlangeFilletRadius(double v);
     /// Extent of the top flange, defined parallel to the x axis of the position coordinate system.
-    IfcPositiveLengthMeasure TopFlangeWidth();
-    void setTopFlangeWidth(IfcPositiveLengthMeasure v);
+    double TopFlangeWidth() const;
+    void setTopFlangeWidth(double v);
     /// Whether the optional attribute TopFlangeThickness is defined for this IfcAsymmetricIShapeProfileDef
-    bool hasTopFlangeThickness();
+    bool hasTopFlangeThickness() const;
     /// Flange thickness of the top flange of the I-shape.
-    IfcPositiveLengthMeasure TopFlangeThickness();
-    void setTopFlangeThickness(IfcPositiveLengthMeasure v);
+    double TopFlangeThickness() const;
+    void setTopFlangeThickness(double v);
     /// Whether the optional attribute TopFlangeFilletRadius is defined for this IfcAsymmetricIShapeProfileDef
-    bool hasTopFlangeFilletRadius();
+    bool hasTopFlangeFilletRadius() const;
     /// The fillet between the web and the top flange of the I-shape.
-    IfcNonNegativeLengthMeasure TopFlangeFilletRadius();
-    void setTopFlangeFilletRadius(IfcNonNegativeLengthMeasure v);
+    double TopFlangeFilletRadius() const;
+    void setTopFlangeFilletRadius(double v);
     /// Whether the optional attribute BottomFlangeEdgeRadius is defined for this IfcAsymmetricIShapeProfileDef
-    bool hasBottomFlangeEdgeRadius();
-    IfcNonNegativeLengthMeasure BottomFlangeEdgeRadius();
-    void setBottomFlangeEdgeRadius(IfcNonNegativeLengthMeasure v);
+    bool hasBottomFlangeEdgeRadius() const;
+    double BottomFlangeEdgeRadius() const;
+    void setBottomFlangeEdgeRadius(double v);
     /// Whether the optional attribute BottomFlangeSlope is defined for this IfcAsymmetricIShapeProfileDef
-    bool hasBottomFlangeSlope();
-    IfcPlaneAngleMeasure BottomFlangeSlope();
-    void setBottomFlangeSlope(IfcPlaneAngleMeasure v);
+    bool hasBottomFlangeSlope() const;
+    double BottomFlangeSlope() const;
+    void setBottomFlangeSlope(double v);
     /// Whether the optional attribute TopFlangeEdgeRadius is defined for this IfcAsymmetricIShapeProfileDef
-    bool hasTopFlangeEdgeRadius();
-    IfcNonNegativeLengthMeasure TopFlangeEdgeRadius();
-    void setTopFlangeEdgeRadius(IfcNonNegativeLengthMeasure v);
+    bool hasTopFlangeEdgeRadius() const;
+    double TopFlangeEdgeRadius() const;
+    void setTopFlangeEdgeRadius(double v);
     /// Whether the optional attribute TopFlangeSlope is defined for this IfcAsymmetricIShapeProfileDef
-    bool hasTopFlangeSlope();
-    IfcPlaneAngleMeasure TopFlangeSlope();
-    void setTopFlangeSlope(IfcPlaneAngleMeasure v);
+    bool hasTopFlangeSlope() const;
+    double TopFlangeSlope() const;
+    void setTopFlangeSlope(double v);
     virtual unsigned int getArgumentCount() const { return 15; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 3: return IfcUtil::Argument_DOUBLE; case 4: return IfcUtil::Argument_DOUBLE; case 5: return IfcUtil::Argument_DOUBLE; case 6: return IfcUtil::Argument_DOUBLE; case 7: return IfcUtil::Argument_DOUBLE; case 8: return IfcUtil::Argument_DOUBLE; case 9: return IfcUtil::Argument_DOUBLE; case 10: return IfcUtil::Argument_DOUBLE; case 11: return IfcUtil::Argument_DOUBLE; case 12: return IfcUtil::Argument_DOUBLE; case 13: return IfcUtil::Argument_DOUBLE; case 14: return IfcUtil::Argument_DOUBLE; } return IfcParameterizedProfileDef::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 3: return Type::IfcPositiveLengthMeasure; case 4: return Type::IfcPositiveLengthMeasure; case 5: return Type::IfcPositiveLengthMeasure; case 6: return Type::IfcPositiveLengthMeasure; case 7: return Type::IfcNonNegativeLengthMeasure; case 8: return Type::IfcPositiveLengthMeasure; case 9: return Type::IfcPositiveLengthMeasure; case 10: return Type::IfcNonNegativeLengthMeasure; case 11: return Type::IfcNonNegativeLengthMeasure; case 12: return Type::IfcPlaneAngleMeasure; case 13: return Type::IfcNonNegativeLengthMeasure; case 14: return Type::IfcPlaneAngleMeasure; } return IfcParameterizedProfileDef::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 3: return "BottomFlangeWidth"; case 4: return "OverallDepth"; case 5: return "WebThickness"; case 6: return "BottomFlangeThickness"; case 7: return "BottomFlangeFilletRadius"; case 8: return "TopFlangeWidth"; case 9: return "TopFlangeThickness"; case 10: return "TopFlangeFilletRadius"; case 11: return "BottomFlangeEdgeRadius"; case 12: return "BottomFlangeSlope"; case 13: return "TopFlangeEdgeRadius"; case 14: return "TopFlangeSlope"; } return IfcParameterizedProfileDef::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcAsymmetricIShapeProfileDef (IfcAbstractEntityPtr e);
-    IfcAsymmetricIShapeProfileDef (IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< IfcLabel > v2_ProfileName, IfcAxis2Placement2D* v3_Position, IfcPositiveLengthMeasure v4_BottomFlangeWidth, IfcPositiveLengthMeasure v5_OverallDepth, IfcPositiveLengthMeasure v6_WebThickness, IfcPositiveLengthMeasure v7_BottomFlangeThickness, boost::optional< IfcNonNegativeLengthMeasure > v8_BottomFlangeFilletRadius, IfcPositiveLengthMeasure v9_TopFlangeWidth, boost::optional< IfcPositiveLengthMeasure > v10_TopFlangeThickness, boost::optional< IfcNonNegativeLengthMeasure > v11_TopFlangeFilletRadius, boost::optional< IfcNonNegativeLengthMeasure > v12_BottomFlangeEdgeRadius, boost::optional< IfcPlaneAngleMeasure > v13_BottomFlangeSlope, boost::optional< IfcNonNegativeLengthMeasure > v14_TopFlangeEdgeRadius, boost::optional< IfcPlaneAngleMeasure > v15_TopFlangeSlope);
-    typedef IfcAsymmetricIShapeProfileDef* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcAsymmetricIShapeProfileDef > > list;
-    typedef IfcTemplatedEntityList< IfcAsymmetricIShapeProfileDef >::it it;
+    IfcAsymmetricIShapeProfileDef (IfcAbstractEntity* e);
+    IfcAsymmetricIShapeProfileDef (IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< std::string > v2_ProfileName, IfcAxis2Placement2D* v3_Position, double v4_BottomFlangeWidth, double v5_OverallDepth, double v6_WebThickness, double v7_BottomFlangeThickness, boost::optional< double > v8_BottomFlangeFilletRadius, double v9_TopFlangeWidth, boost::optional< double > v10_TopFlangeThickness, boost::optional< double > v11_TopFlangeFilletRadius, boost::optional< double > v12_BottomFlangeEdgeRadius, boost::optional< double > v13_BottomFlangeSlope, boost::optional< double > v14_TopFlangeEdgeRadius, boost::optional< double > v15_TopFlangeSlope);
+    typedef IfcTemplatedEntityList< IfcAsymmetricIShapeProfileDef > list;
 };
 /// Definition from ISO/CD 10303-42:1992: The direction and location in three dimensional space of a single axis. An axis1_placement is defined in terms of a locating point (inherited from placement supertype) and an axis direction: this is either the direction of axis or defaults to (0.0,0.0,1.0). The actual direction for the axis placement is given by the derived attribute z (Z).  
 /// 
@@ -18830,22 +19827,21 @@ class IfcAsymmetricIShapeProfileDef : public IfcParameterizedProfileDef {
 class IfcAxis1Placement : public IfcPlacement {
 public:
     /// Whether the optional attribute Axis is defined for this IfcAxis1Placement
-    bool hasAxis();
+    bool hasAxis() const;
     /// The direction of the local Z axis.
-    IfcDirection* Axis();
+    IfcDirection* Axis() const;
     void setAxis(IfcDirection* v);
     virtual unsigned int getArgumentCount() const { return 2; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 1: return IfcUtil::Argument_ENTITY; } return IfcPlacement::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 1: return Type::IfcDirection; } return IfcPlacement::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 1: return "Axis"; } return IfcPlacement::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcAxis1Placement (IfcAbstractEntityPtr e);
+    IfcAxis1Placement (IfcAbstractEntity* e);
     IfcAxis1Placement (IfcCartesianPoint* v1_Location, IfcDirection* v2_Axis);
-    typedef IfcAxis1Placement* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcAxis1Placement > > list;
-    typedef IfcTemplatedEntityList< IfcAxis1Placement >::it it;
+    typedef IfcTemplatedEntityList< IfcAxis1Placement > list;
 };
 /// Definition from ISO/CD 10303-42:1992: The location and orientation in two dimensional space of two mutually perpendicular axes. An axis2_placement_2d is defined in terms of a point, (inherited from the placement supertype), and an axis. It can be used to locate and originate an object in two dimensional space and to define a placement coordinate system. The class includes a point which forms the origin of the placement coordinate system. A direction vector is required to complete the definition of the placement coordinate system. The reference direction defines the placement X axis direction, the placement Y axis is derived from this.  
 /// 
@@ -18861,22 +19857,21 @@ class IfcAxis1Placement : public IfcPlacement {
 class IfcAxis2Placement2D : public IfcPlacement {
 public:
     /// Whether the optional attribute RefDirection is defined for this IfcAxis2Placement2D
-    bool hasRefDirection();
+    bool hasRefDirection() const;
     /// The direction used to determine the direction of the local X axis. If a value is omited that it defaults to [1.0, 0.0.].
-    IfcDirection* RefDirection();
+    IfcDirection* RefDirection() const;
     void setRefDirection(IfcDirection* v);
     virtual unsigned int getArgumentCount() const { return 2; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 1: return IfcUtil::Argument_ENTITY; } return IfcPlacement::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 1: return Type::IfcDirection; } return IfcPlacement::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 1: return "RefDirection"; } return IfcPlacement::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcAxis2Placement2D (IfcAbstractEntityPtr e);
+    IfcAxis2Placement2D (IfcAbstractEntity* e);
     IfcAxis2Placement2D (IfcCartesianPoint* v1_Location, IfcDirection* v2_RefDirection);
-    typedef IfcAxis2Placement2D* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcAxis2Placement2D > > list;
-    typedef IfcTemplatedEntityList< IfcAxis2Placement2D >::it it;
+    typedef IfcTemplatedEntityList< IfcAxis2Placement2D > list;
 };
 /// Definition from ISO/CD 10303-42:1992: The location and orientation in three dimensional space of three mutually perpendicular axes. An axis2_placement_3D is defined in terms of a point (inherited from placement supertype) and two (ideally orthogonal) axes. It can be used to locate and originate an object in three dimensional space and to define a placement coordinate system. The entity includes a point which forms the origin of the placement coordinate system. Two direction vectors are required to complete the definition of the placement coordinate system. The axis is the placement Z axis direction and the ref_direction is an approximation to the placement X axis direction.
 /// 
@@ -18894,27 +19889,26 @@ class IfcAxis2Placement2D : public IfcPlacement {
 class IfcAxis2Placement3D : public IfcPlacement {
 public:
     /// Whether the optional attribute Axis is defined for this IfcAxis2Placement3D
-    bool hasAxis();
+    bool hasAxis() const;
     /// The exact direction of the local Z Axis.
-    IfcDirection* Axis();
+    IfcDirection* Axis() const;
     void setAxis(IfcDirection* v);
     /// Whether the optional attribute RefDirection is defined for this IfcAxis2Placement3D
-    bool hasRefDirection();
+    bool hasRefDirection() const;
     /// The direction used to determine the direction of the local X Axis. If necessary an adjustment is made to maintain orthogonality to the Axis direction. If Axis and/or RefDirection is omitted, these directions are taken from the geometric coordinate system.
-    IfcDirection* RefDirection();
+    IfcDirection* RefDirection() const;
     void setRefDirection(IfcDirection* v);
     virtual unsigned int getArgumentCount() const { return 3; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 1: return IfcUtil::Argument_ENTITY; case 2: return IfcUtil::Argument_ENTITY; } return IfcPlacement::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 1: return Type::IfcDirection; case 2: return Type::IfcDirection; } return IfcPlacement::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 1: return "Axis"; case 2: return "RefDirection"; } return IfcPlacement::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcAxis2Placement3D (IfcAbstractEntityPtr e);
+    IfcAxis2Placement3D (IfcAbstractEntity* e);
     IfcAxis2Placement3D (IfcCartesianPoint* v1_Location, IfcDirection* v2_Axis, IfcDirection* v3_RefDirection);
-    typedef IfcAxis2Placement3D* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcAxis2Placement3D > > list;
-    typedef IfcTemplatedEntityList< IfcAxis2Placement3D >::it it;
+    typedef IfcTemplatedEntityList< IfcAxis2Placement3D > list;
 };
 /// Definition from ISO/CD 10303-42:1992: A Boolean result
 /// is the result of a regularized operation on two solids to create
@@ -18945,26 +19939,25 @@ class IfcAxis2Placement3D : public IfcPlacement {
 class IfcBooleanResult : public IfcGeometricRepresentationItem {
 public:
     /// The Boolean operator used in the operation to create the result.
-    IfcBooleanOperator::IfcBooleanOperator Operator();
+    IfcBooleanOperator::IfcBooleanOperator Operator() const;
     void setOperator(IfcBooleanOperator::IfcBooleanOperator v);
     /// The first operand to be operated upon by the Boolean operation.
-    IfcBooleanOperand FirstOperand();
-    void setFirstOperand(IfcBooleanOperand v);
+    IfcBooleanOperand* FirstOperand() const;
+    void setFirstOperand(IfcBooleanOperand* v);
     /// The second operand specified for the operation.
-    IfcBooleanOperand SecondOperand();
-    void setSecondOperand(IfcBooleanOperand v);
+    IfcBooleanOperand* SecondOperand() const;
+    void setSecondOperand(IfcBooleanOperand* v);
     virtual unsigned int getArgumentCount() const { return 3; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENUMERATION; case 1: return IfcUtil::Argument_ENTITY; case 2: return IfcUtil::Argument_ENTITY; } return IfcGeometricRepresentationItem::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcBooleanOperator; case 1: return Type::IfcBooleanOperand; case 2: return Type::IfcBooleanOperand; } return IfcGeometricRepresentationItem::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Operator"; case 1: return "FirstOperand"; case 2: return "SecondOperand"; } return IfcGeometricRepresentationItem::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcBooleanResult (IfcAbstractEntityPtr e);
-    IfcBooleanResult (IfcBooleanOperator::IfcBooleanOperator v1_Operator, IfcBooleanOperand v2_FirstOperand, IfcBooleanOperand v3_SecondOperand);
-    typedef IfcBooleanResult* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcBooleanResult > > list;
-    typedef IfcTemplatedEntityList< IfcBooleanResult >::it it;
+    IfcBooleanResult (IfcAbstractEntity* e);
+    IfcBooleanResult (IfcBooleanOperator::IfcBooleanOperator v1_Operator, IfcBooleanOperand* v2_FirstOperand, IfcBooleanOperand* v3_SecondOperand);
+    typedef IfcTemplatedEntityList< IfcBooleanResult > list;
 };
 /// Definition from ISO/CD 10303-42:1992: A bounded surface is a surface of finite area with identifiable boundaries.
 /// 
@@ -18982,16 +19975,15 @@ class IfcBoundedSurface : public IfcSurface {
 public:
     virtual unsigned int getArgumentCount() const { return 0; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcSurface::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcSurface::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcSurface::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcBoundedSurface (IfcAbstractEntityPtr e);
+    IfcBoundedSurface (IfcAbstractEntity* e);
     IfcBoundedSurface ();
-    typedef IfcBoundedSurface* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcBoundedSurface > > list;
-    typedef IfcTemplatedEntityList< IfcBoundedSurface >::it it;
+    typedef IfcTemplatedEntityList< IfcBoundedSurface > list;
 };
 /// Definition from ISO/CD 10303-42:1992: A box domain
 ///   is an orthogonal box parallel to the axes of the geometric
@@ -19018,29 +20010,28 @@ class IfcBoundedSurface : public IfcSurface {
 class IfcBoundingBox : public IfcGeometricRepresentationItem {
 public:
     /// Location of the bottom left corner (having the minimum values).
-    IfcCartesianPoint* Corner();
+    IfcCartesianPoint* Corner() const;
     void setCorner(IfcCartesianPoint* v);
     /// Length attribute (measured along the edge parallel to the X Axis)
-    IfcPositiveLengthMeasure XDim();
-    void setXDim(IfcPositiveLengthMeasure v);
+    double XDim() const;
+    void setXDim(double v);
     /// Width attribute (measured along the edge parallel to the Y Axis)
-    IfcPositiveLengthMeasure YDim();
-    void setYDim(IfcPositiveLengthMeasure v);
+    double YDim() const;
+    void setYDim(double v);
     /// Height attribute (measured along the edge parallel to the Z Axis).
-    IfcPositiveLengthMeasure ZDim();
-    void setZDim(IfcPositiveLengthMeasure v);
+    double ZDim() const;
+    void setZDim(double v);
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY; case 1: return IfcUtil::Argument_DOUBLE; case 2: return IfcUtil::Argument_DOUBLE; case 3: return IfcUtil::Argument_DOUBLE; } return IfcGeometricRepresentationItem::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcCartesianPoint; case 1: return Type::IfcPositiveLengthMeasure; case 2: return Type::IfcPositiveLengthMeasure; case 3: return Type::IfcPositiveLengthMeasure; } return IfcGeometricRepresentationItem::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Corner"; case 1: return "XDim"; case 2: return "YDim"; case 3: return "ZDim"; } return IfcGeometricRepresentationItem::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcBoundingBox (IfcAbstractEntityPtr e);
-    IfcBoundingBox (IfcCartesianPoint* v1_Corner, IfcPositiveLengthMeasure v2_XDim, IfcPositiveLengthMeasure v3_YDim, IfcPositiveLengthMeasure v4_ZDim);
-    typedef IfcBoundingBox* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcBoundingBox > > list;
-    typedef IfcTemplatedEntityList< IfcBoundingBox >::it it;
+    IfcBoundingBox (IfcAbstractEntity* e);
+    IfcBoundingBox (IfcCartesianPoint* v1_Corner, double v2_XDim, double v3_YDim, double v4_ZDim);
+    typedef IfcTemplatedEntityList< IfcBoundingBox > list;
 };
 /// Definition from ISO/CD 10303-42:1992: This entity is a subtype of the half space solid which is trimmed by a surrounding rectangular box. The box has its edges parallel to the coordinate axes of the geometric coordinate system.
 /// 
@@ -19075,20 +20066,19 @@ class IfcBoundingBox : public IfcGeometricRepresentationItem {
 class IfcBoxedHalfSpace : public IfcHalfSpaceSolid {
 public:
     /// The box which bounds the resulting solid of the Boolean operation involving the half space solid for computational purposes only.
-    IfcBoundingBox* Enclosure();
+    IfcBoundingBox* Enclosure() const;
     void setEnclosure(IfcBoundingBox* v);
     virtual unsigned int getArgumentCount() const { return 3; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 2: return IfcUtil::Argument_ENTITY; } return IfcHalfSpaceSolid::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 2: return Type::IfcBoundingBox; } return IfcHalfSpaceSolid::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 2: return "Enclosure"; } return IfcHalfSpaceSolid::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcBoxedHalfSpace (IfcAbstractEntityPtr e);
+    IfcBoxedHalfSpace (IfcAbstractEntity* e);
     IfcBoxedHalfSpace (IfcSurface* v1_BaseSurface, bool v2_AgreementFlag, IfcBoundingBox* v3_Enclosure);
-    typedef IfcBoxedHalfSpace* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcBoxedHalfSpace > > list;
-    typedef IfcTemplatedEntityList< IfcBoxedHalfSpace >::it it;
+    typedef IfcTemplatedEntityList< IfcBoxedHalfSpace > list;
 };
 /// IfcCShapeProfileDef defines
 /// a section profile that provides the defining parameters of a C-shaped
@@ -19115,34 +20105,33 @@ class IfcBoxedHalfSpace : public IfcHalfSpaceSolid {
 class IfcCShapeProfileDef : public IfcParameterizedProfileDef {
 public:
     /// Profile depth, see illustration above (= h).
-    IfcPositiveLengthMeasure Depth();
-    void setDepth(IfcPositiveLengthMeasure v);
+    double Depth() const;
+    void setDepth(double v);
     /// Profile width, see illustration above (= b).
-    IfcPositiveLengthMeasure Width();
-    void setWidth(IfcPositiveLengthMeasure v);
+    double Width() const;
+    void setWidth(double v);
     /// Constant wall thickness of profile (= ts).
-    IfcPositiveLengthMeasure WallThickness();
-    void setWallThickness(IfcPositiveLengthMeasure v);
+    double WallThickness() const;
+    void setWallThickness(double v);
     /// Lengths of girth, see illustration above (= c).
-    IfcPositiveLengthMeasure Girth();
-    void setGirth(IfcPositiveLengthMeasure v);
+    double Girth() const;
+    void setGirth(double v);
     /// Whether the optional attribute InternalFilletRadius is defined for this IfcCShapeProfileDef
-    bool hasInternalFilletRadius();
+    bool hasInternalFilletRadius() const;
     /// Internal fillet radius according the above illustration (= r1).
-    IfcNonNegativeLengthMeasure InternalFilletRadius();
-    void setInternalFilletRadius(IfcNonNegativeLengthMeasure v);
+    double InternalFilletRadius() const;
+    void setInternalFilletRadius(double v);
     virtual unsigned int getArgumentCount() const { return 8; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 3: return IfcUtil::Argument_DOUBLE; case 4: return IfcUtil::Argument_DOUBLE; case 5: return IfcUtil::Argument_DOUBLE; case 6: return IfcUtil::Argument_DOUBLE; case 7: return IfcUtil::Argument_DOUBLE; } return IfcParameterizedProfileDef::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 3: return Type::IfcPositiveLengthMeasure; case 4: return Type::IfcPositiveLengthMeasure; case 5: return Type::IfcPositiveLengthMeasure; case 6: return Type::IfcPositiveLengthMeasure; case 7: return Type::IfcNonNegativeLengthMeasure; } return IfcParameterizedProfileDef::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 3: return "Depth"; case 4: return "Width"; case 5: return "WallThickness"; case 6: return "Girth"; case 7: return "InternalFilletRadius"; } return IfcParameterizedProfileDef::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcCShapeProfileDef (IfcAbstractEntityPtr e);
-    IfcCShapeProfileDef (IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< IfcLabel > v2_ProfileName, IfcAxis2Placement2D* v3_Position, IfcPositiveLengthMeasure v4_Depth, IfcPositiveLengthMeasure v5_Width, IfcPositiveLengthMeasure v6_WallThickness, IfcPositiveLengthMeasure v7_Girth, boost::optional< IfcNonNegativeLengthMeasure > v8_InternalFilletRadius);
-    typedef IfcCShapeProfileDef* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcCShapeProfileDef > > list;
-    typedef IfcTemplatedEntityList< IfcCShapeProfileDef >::it it;
+    IfcCShapeProfileDef (IfcAbstractEntity* e);
+    IfcCShapeProfileDef (IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< std::string > v2_ProfileName, IfcAxis2Placement2D* v3_Position, double v4_Depth, double v5_Width, double v6_WallThickness, double v7_Girth, boost::optional< double > v8_InternalFilletRadius);
+    typedef IfcTemplatedEntityList< IfcCShapeProfileDef > list;
 };
 /// Definition from ISO/CD 10303-42:1992: A point defined by its coordinates in a two or three dimensional rectangular Cartesian coordinate system, or in a two dimensional parameter space. The entity is defined in a two or three dimensional space.  
 /// 
@@ -19154,52 +20143,49 @@ class IfcCShapeProfileDef : public IfcParameterizedProfileDef {
 class IfcCartesianPoint : public IfcPoint {
 public:
     /// The first, second, and third coordinate of the point location. If placed in a two or three dimensional rectangular Cartesian coordinate system, Coordinates[1] is the X coordinate, Coordinates[2] is the Y coordinate, and Coordinates[3] is the Z coordinate.
-    std::vector< IfcLengthMeasure > /*[1:3]*/ Coordinates();
-    void setCoordinates(std::vector< IfcLengthMeasure > /*[1:3]*/ v);
+    std::vector< double > /*[1:3]*/ Coordinates() const;
+    void setCoordinates(std::vector< double > /*[1:3]*/ v);
     virtual unsigned int getArgumentCount() const { return 1; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_VECTOR_DOUBLE; } return IfcPoint::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcLengthMeasure; } return IfcPoint::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Coordinates"; } return IfcPoint::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcCartesianPoint (IfcAbstractEntityPtr e);
-    IfcCartesianPoint (std::vector< IfcLengthMeasure > /*[1:3]*/ v1_Coordinates);
-    typedef IfcCartesianPoint* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcCartesianPoint > > list;
-    typedef IfcTemplatedEntityList< IfcCartesianPoint >::it it;
+    IfcCartesianPoint (IfcAbstractEntity* e);
+    IfcCartesianPoint (std::vector< double > /*[1:3]*/ v1_Coordinates);
+    typedef IfcTemplatedEntityList< IfcCartesianPoint > list;
 };
 
 class IfcCartesianPointList : public IfcGeometricRepresentationItem {
 public:
     virtual unsigned int getArgumentCount() const { return 0; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcGeometricRepresentationItem::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcGeometricRepresentationItem::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcGeometricRepresentationItem::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcCartesianPointList (IfcAbstractEntityPtr e);
+    IfcCartesianPointList (IfcAbstractEntity* e);
     IfcCartesianPointList ();
-    typedef IfcCartesianPointList* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcCartesianPointList > > list;
-    typedef IfcTemplatedEntityList< IfcCartesianPointList >::it it;
+    typedef IfcTemplatedEntityList< IfcCartesianPointList > list;
 };
 
 class IfcCartesianPointList3D : public IfcCartesianPointList {
 public:
     virtual unsigned int getArgumentCount() const { return 1; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_UNKNOWN; } return IfcCartesianPointList::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcLengthMeasure; } return IfcCartesianPointList::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "CoordList"; } return IfcCartesianPointList::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcCartesianPointList3D (IfcAbstractEntityPtr e);
+    IfcCartesianPointList3D (IfcAbstractEntity* e);
     IfcCartesianPointList3D ();
-    typedef IfcCartesianPointList3D* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcCartesianPointList3D > > list;
-    typedef IfcTemplatedEntityList< IfcCartesianPointList3D >::it it;
+    typedef IfcTemplatedEntityList< IfcCartesianPointList3D > list;
 };
 /// Definition from ISO/CD 10303-42:1992: A Cartesian transformation operator defines a geometric transformation composed of translation, rotation, mirroring and uniform scaling. The list of normalized vectors u defines the columns of an orthogonal matrix T. These vectors are computed, by the base axis function, from the direction attributes axis1, axis2 and, in Cartesian transformation operator 3d, axis3. If |T|= -1, the transformation includes mirroring. The local origin point A, the scale value S and the matrix T together define a transformation.  
 /// 
@@ -19234,35 +20220,34 @@ class IfcCartesianPointList3D : public IfcCartesianPointList {
 class IfcCartesianTransformationOperator : public IfcGeometricRepresentationItem {
 public:
     /// Whether the optional attribute Axis1 is defined for this IfcCartesianTransformationOperator
-    bool hasAxis1();
+    bool hasAxis1() const;
     /// The direction used to determine U[1], the derived X axis direction.
-    IfcDirection* Axis1();
+    IfcDirection* Axis1() const;
     void setAxis1(IfcDirection* v);
     /// Whether the optional attribute Axis2 is defined for this IfcCartesianTransformationOperator
-    bool hasAxis2();
+    bool hasAxis2() const;
     /// The direction used to determine U[2], the derived Y axis direction.
-    IfcDirection* Axis2();
+    IfcDirection* Axis2() const;
     void setAxis2(IfcDirection* v);
     /// The required translation, specified as a cartesian point. The actual translation included in the transformation is from the geometric origin to the local origin.
-    IfcCartesianPoint* LocalOrigin();
+    IfcCartesianPoint* LocalOrigin() const;
     void setLocalOrigin(IfcCartesianPoint* v);
     /// Whether the optional attribute Scale is defined for this IfcCartesianTransformationOperator
-    bool hasScale();
+    bool hasScale() const;
     /// The scaling value specified for the transformation.
-    double Scale();
+    double Scale() const;
     void setScale(double v);
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY; case 1: return IfcUtil::Argument_ENTITY; case 2: return IfcUtil::Argument_ENTITY; case 3: return IfcUtil::Argument_DOUBLE; } return IfcGeometricRepresentationItem::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcDirection; case 1: return Type::IfcDirection; case 2: return Type::IfcCartesianPoint; case 3: return Type::UNDEFINED; } return IfcGeometricRepresentationItem::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Axis1"; case 1: return "Axis2"; case 2: return "LocalOrigin"; case 3: return "Scale"; } return IfcGeometricRepresentationItem::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcCartesianTransformationOperator (IfcAbstractEntityPtr e);
+    IfcCartesianTransformationOperator (IfcAbstractEntity* e);
     IfcCartesianTransformationOperator (IfcDirection* v1_Axis1, IfcDirection* v2_Axis2, IfcCartesianPoint* v3_LocalOrigin, boost::optional< double > v4_Scale);
-    typedef IfcCartesianTransformationOperator* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcCartesianTransformationOperator > > list;
-    typedef IfcTemplatedEntityList< IfcCartesianTransformationOperator >::it it;
+    typedef IfcTemplatedEntityList< IfcCartesianTransformationOperator > list;
 };
 /// Definition from ISO/CD 10303-42:1992: A Cartesian transformation operator 2d defines a geometric transformation in two-dimensional space composed of translation, rotation, mirroring and uniform scaling. The list of normalized vectors u defines the columns of an orthogonal matrix T. These vectors are computed from the direction attributes axis1 and axis2 by the base axis function. If |T|= -1, the transformation includes mirroring.  
 /// 
@@ -19273,16 +20258,15 @@ class IfcCartesianTransformationOperator2D : public IfcCartesianTransformationOp
 public:
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcCartesianTransformationOperator::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcCartesianTransformationOperator::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcCartesianTransformationOperator::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcCartesianTransformationOperator2D (IfcAbstractEntityPtr e);
+    IfcCartesianTransformationOperator2D (IfcAbstractEntity* e);
     IfcCartesianTransformationOperator2D (IfcDirection* v1_Axis1, IfcDirection* v2_Axis2, IfcCartesianPoint* v3_LocalOrigin, boost::optional< double > v4_Scale);
-    typedef IfcCartesianTransformationOperator2D* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcCartesianTransformationOperator2D > > list;
-    typedef IfcTemplatedEntityList< IfcCartesianTransformationOperator2D >::it it;
+    typedef IfcTemplatedEntityList< IfcCartesianTransformationOperator2D > list;
 };
 /// A Cartesian transformation operator 2d non uniform defines a geometric transformation in two-dimensional space composed of translation, rotation, mirroring and non uniform scaling. Non uniform scaling is given by two different scaling factors: 
 /// 
@@ -19297,22 +20281,21 @@ class IfcCartesianTransformationOperator2D : public IfcCartesianTransformationOp
 class IfcCartesianTransformationOperator2DnonUniform : public IfcCartesianTransformationOperator2D {
 public:
     /// Whether the optional attribute Scale2 is defined for this IfcCartesianTransformationOperator2DnonUniform
-    bool hasScale2();
+    bool hasScale2() const;
     /// The scaling value specified for the transformation along the axis 2. This is normally the y scale factor.
-    double Scale2();
+    double Scale2() const;
     void setScale2(double v);
     virtual unsigned int getArgumentCount() const { return 5; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 4: return IfcUtil::Argument_DOUBLE; } return IfcCartesianTransformationOperator2D::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 4: return Type::UNDEFINED; } return IfcCartesianTransformationOperator2D::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 4: return "Scale2"; } return IfcCartesianTransformationOperator2D::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcCartesianTransformationOperator2DnonUniform (IfcAbstractEntityPtr e);
+    IfcCartesianTransformationOperator2DnonUniform (IfcAbstractEntity* e);
     IfcCartesianTransformationOperator2DnonUniform (IfcDirection* v1_Axis1, IfcDirection* v2_Axis2, IfcCartesianPoint* v3_LocalOrigin, boost::optional< double > v4_Scale, boost::optional< double > v5_Scale2);
-    typedef IfcCartesianTransformationOperator2DnonUniform* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcCartesianTransformationOperator2DnonUniform > > list;
-    typedef IfcTemplatedEntityList< IfcCartesianTransformationOperator2DnonUniform >::it it;
+    typedef IfcTemplatedEntityList< IfcCartesianTransformationOperator2DnonUniform > list;
 };
 /// Definition from ISO/CD 10303-42:1992: A Cartesian transformation operator 3d defines a geometric transformation in three-dimensional space composed of translation, rotation, mirroring and uniform scaling. The list of normalized vectors u defines the columns of an orthogonal matrix T. These vectors are computed from the direction attributes axis1, axis2 and axis3 by the base axis function. If |T|= -1, the transformation includes mirroring.  
 /// 
@@ -19322,22 +20305,21 @@ class IfcCartesianTransformationOperator2DnonUniform : public IfcCartesianTransf
 class IfcCartesianTransformationOperator3D : public IfcCartesianTransformationOperator {
 public:
     /// Whether the optional attribute Axis3 is defined for this IfcCartesianTransformationOperator3D
-    bool hasAxis3();
+    bool hasAxis3() const;
     /// The exact direction of U[3], the derived Z axis direction.
-    IfcDirection* Axis3();
+    IfcDirection* Axis3() const;
     void setAxis3(IfcDirection* v);
     virtual unsigned int getArgumentCount() const { return 5; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 4: return IfcUtil::Argument_ENTITY; } return IfcCartesianTransformationOperator::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 4: return Type::IfcDirection; } return IfcCartesianTransformationOperator::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 4: return "Axis3"; } return IfcCartesianTransformationOperator::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcCartesianTransformationOperator3D (IfcAbstractEntityPtr e);
+    IfcCartesianTransformationOperator3D (IfcAbstractEntity* e);
     IfcCartesianTransformationOperator3D (IfcDirection* v1_Axis1, IfcDirection* v2_Axis2, IfcCartesianPoint* v3_LocalOrigin, boost::optional< double > v4_Scale, IfcDirection* v5_Axis3);
-    typedef IfcCartesianTransformationOperator3D* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcCartesianTransformationOperator3D > > list;
-    typedef IfcTemplatedEntityList< IfcCartesianTransformationOperator3D >::it it;
+    typedef IfcTemplatedEntityList< IfcCartesianTransformationOperator3D > list;
 };
 /// A Cartesian transformation operator 3d non uniform defines a geometric transformation in three-dimensional space composed of translation, rotation, mirroring and non uniform scaling. Non uniform scaling is given by three different scaling factors:
 /// 
@@ -19353,27 +20335,26 @@ class IfcCartesianTransformationOperator3D : public IfcCartesianTransformationOp
 class IfcCartesianTransformationOperator3DnonUniform : public IfcCartesianTransformationOperator3D {
 public:
     /// Whether the optional attribute Scale2 is defined for this IfcCartesianTransformationOperator3DnonUniform
-    bool hasScale2();
+    bool hasScale2() const;
     /// The scaling value specified for the transformation along the axis 2. This is normally the y scale factor.
-    double Scale2();
+    double Scale2() const;
     void setScale2(double v);
     /// Whether the optional attribute Scale3 is defined for this IfcCartesianTransformationOperator3DnonUniform
-    bool hasScale3();
+    bool hasScale3() const;
     /// The scaling value specified for the transformation along the axis 3. This is normally the z scale factor.
-    double Scale3();
+    double Scale3() const;
     void setScale3(double v);
     virtual unsigned int getArgumentCount() const { return 7; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 5: return IfcUtil::Argument_DOUBLE; case 6: return IfcUtil::Argument_DOUBLE; } return IfcCartesianTransformationOperator3D::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 5: return Type::UNDEFINED; case 6: return Type::UNDEFINED; } return IfcCartesianTransformationOperator3D::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 5: return "Scale2"; case 6: return "Scale3"; } return IfcCartesianTransformationOperator3D::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcCartesianTransformationOperator3DnonUniform (IfcAbstractEntityPtr e);
+    IfcCartesianTransformationOperator3DnonUniform (IfcAbstractEntity* e);
     IfcCartesianTransformationOperator3DnonUniform (IfcDirection* v1_Axis1, IfcDirection* v2_Axis2, IfcCartesianPoint* v3_LocalOrigin, boost::optional< double > v4_Scale, IfcDirection* v5_Axis3, boost::optional< double > v6_Scale2, boost::optional< double > v7_Scale3);
-    typedef IfcCartesianTransformationOperator3DnonUniform* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcCartesianTransformationOperator3DnonUniform > > list;
-    typedef IfcTemplatedEntityList< IfcCartesianTransformationOperator3DnonUniform >::it it;
+    typedef IfcTemplatedEntityList< IfcCartesianTransformationOperator3DnonUniform > list;
 };
 /// IfcCircleProfileDef defines a circle as the profile definition used by the swept surface geometry or by the swept area solid. It is given by its Radius attribute and placed within the 2D position coordinate system, established by the Position attribute. 
 /// 
@@ -19390,20 +20371,19 @@ class IfcCartesianTransformationOperator3DnonUniform : public IfcCartesianTransf
 class IfcCircleProfileDef : public IfcParameterizedProfileDef {
 public:
     /// The radius of the circle.
-    IfcPositiveLengthMeasure Radius();
-    void setRadius(IfcPositiveLengthMeasure v);
+    double Radius() const;
+    void setRadius(double v);
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 3: return IfcUtil::Argument_DOUBLE; } return IfcParameterizedProfileDef::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 3: return Type::IfcPositiveLengthMeasure; } return IfcParameterizedProfileDef::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 3: return "Radius"; } return IfcParameterizedProfileDef::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcCircleProfileDef (IfcAbstractEntityPtr e);
-    IfcCircleProfileDef (IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< IfcLabel > v2_ProfileName, IfcAxis2Placement2D* v3_Position, IfcPositiveLengthMeasure v4_Radius);
-    typedef IfcCircleProfileDef* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcCircleProfileDef > > list;
-    typedef IfcTemplatedEntityList< IfcCircleProfileDef >::it it;
+    IfcCircleProfileDef (IfcAbstractEntity* e);
+    IfcCircleProfileDef (IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< std::string > v2_ProfileName, IfcAxis2Placement2D* v3_Position, double v4_Radius);
+    typedef IfcTemplatedEntityList< IfcCircleProfileDef > list;
 };
 /// Definition from ISO/CD 10303-42:1992: A closed shell is a shell
 ///   of the dimensionality 2 which typically serves as a bound for a region in R3. A
@@ -19458,16 +20438,15 @@ class IfcClosedShell : public IfcConnectedFaceSet {
 public:
     virtual unsigned int getArgumentCount() const { return 1; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcConnectedFaceSet::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcConnectedFaceSet::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcConnectedFaceSet::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcClosedShell (IfcAbstractEntityPtr e);
-    IfcClosedShell (SHARED_PTR< IfcTemplatedEntityList< IfcFace > > v1_CfsFaces);
-    typedef IfcClosedShell* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcClosedShell > > list;
-    typedef IfcTemplatedEntityList< IfcClosedShell >::it it;
+    IfcClosedShell (IfcAbstractEntity* e);
+    IfcClosedShell (IfcTemplatedEntityList< IfcFace >::ptr v1_CfsFaces);
+    typedef IfcTemplatedEntityList< IfcClosedShell > list;
 };
 /// Definition from ISO/CD 10303-46:1992: A colour rgb as a subtype of colour specifications is defined by three colour component values for red, green, and blue in the RGB colour model.
 /// 
@@ -19482,30 +20461,29 @@ class IfcColourRgb : public IfcColourSpecification {
     /// The intensity of the red colour component.
     /// 
     /// NOTE  The colour component value is given within the range of 0..1, and not within the range of 0..255 as otherwise usual.
-    IfcNormalisedRatioMeasure Red();
-    void setRed(IfcNormalisedRatioMeasure v);
+    double Red() const;
+    void setRed(double v);
     /// The intensity of the green colour component.
     /// 
     /// NOTE  The colour component value is given within the range of 0..1, and not within the range of 0..255 as otherwise usual.
-    IfcNormalisedRatioMeasure Green();
-    void setGreen(IfcNormalisedRatioMeasure v);
+    double Green() const;
+    void setGreen(double v);
     /// The intensity of the blue colour component.
     /// 
     /// NOTE  The colour component value is given within the range of 0..1, and not within the range of 0..255 as otherwise usual.
-    IfcNormalisedRatioMeasure Blue();
-    void setBlue(IfcNormalisedRatioMeasure v);
+    double Blue() const;
+    void setBlue(double v);
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 1: return IfcUtil::Argument_DOUBLE; case 2: return IfcUtil::Argument_DOUBLE; case 3: return IfcUtil::Argument_DOUBLE; } return IfcColourSpecification::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 1: return Type::IfcNormalisedRatioMeasure; case 2: return Type::IfcNormalisedRatioMeasure; case 3: return Type::IfcNormalisedRatioMeasure; } return IfcColourSpecification::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 1: return "Red"; case 2: return "Green"; case 3: return "Blue"; } return IfcColourSpecification::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcColourRgb (IfcAbstractEntityPtr e);
-    IfcColourRgb (boost::optional< IfcLabel > v1_Name, IfcNormalisedRatioMeasure v2_Red, IfcNormalisedRatioMeasure v3_Green, IfcNormalisedRatioMeasure v4_Blue);
-    typedef IfcColourRgb* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcColourRgb > > list;
-    typedef IfcTemplatedEntityList< IfcColourRgb >::it it;
+    IfcColourRgb (IfcAbstractEntity* e);
+    IfcColourRgb (boost::optional< std::string > v1_Name, double v2_Red, double v3_Green, double v4_Blue);
+    typedef IfcTemplatedEntityList< IfcColourRgb > list;
 };
 /// IfcComplexProperty is used to define complex properties to be handled completely within a property set. The included set of properties may be a mixed or consistent collection of IfcProperty subtypes. This enables the definition of a set of properties to be included as a single 'property' entry in an IfcPropertySet. The definition of such an IfcComplexProperty can be reused in many different IfcPropertySet's.
 /// 
@@ -19516,23 +20494,22 @@ class IfcComplexProperty : public IfcProperty {
 public:
     /// Usage description of the IfcComplexProperty within the property set which references the IfcComplexProperty.
     ///   NOTE: Consider a complex property for glazing properties. The Name attribute of the IfcComplexProperty could be Pset_GlazingProperties, and the UsageName attribute could be OuterGlazingPane.
-    IfcIdentifier UsageName();
-    void setUsageName(IfcIdentifier v);
+    std::string UsageName() const;
+    void setUsageName(std::string v);
     /// Set of properties that can be used within this complex property (may include other complex properties).
-    SHARED_PTR< IfcTemplatedEntityList< IfcProperty > > HasProperties();
-    void setHasProperties(SHARED_PTR< IfcTemplatedEntityList< IfcProperty > > v);
+    IfcTemplatedEntityList< IfcProperty >::ptr HasProperties() const;
+    void setHasProperties(IfcTemplatedEntityList< IfcProperty >::ptr v);
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 2: return IfcUtil::Argument_STRING; case 3: return IfcUtil::Argument_ENTITY_LIST; } return IfcProperty::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 2: return Type::IfcIdentifier; case 3: return Type::IfcProperty; } return IfcProperty::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 2: return "UsageName"; case 3: return "HasProperties"; } return IfcProperty::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcComplexProperty (IfcAbstractEntityPtr e);
-    IfcComplexProperty (IfcIdentifier v1_Name, boost::optional< IfcText > v2_Description, IfcIdentifier v3_UsageName, SHARED_PTR< IfcTemplatedEntityList< IfcProperty > > v4_HasProperties);
-    typedef IfcComplexProperty* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcComplexProperty > > list;
-    typedef IfcTemplatedEntityList< IfcComplexProperty >::it it;
+    IfcComplexProperty (IfcAbstractEntity* e);
+    IfcComplexProperty (std::string v1_Name, boost::optional< std::string > v2_Description, std::string v3_UsageName, IfcTemplatedEntityList< IfcProperty >::ptr v4_HasProperties);
+    typedef IfcTemplatedEntityList< IfcComplexProperty > list;
 };
 /// Definition from ISO/CD 10303-42:1992: A composite curve segment is a bounded curve together with transition information which is used to construct a composite curve (IfcCompositeCurve).
 /// 
@@ -19544,29 +20521,28 @@ class IfcComplexProperty : public IfcProperty {
 class IfcCompositeCurveSegment : public IfcGeometricRepresentationItem {
 public:
     /// The state of transition (i.e., geometric continuity from the last point of this segment to the first point of the next segment) in a composite curve.
-    IfcTransitionCode::IfcTransitionCode Transition();
+    IfcTransitionCode::IfcTransitionCode Transition() const;
     void setTransition(IfcTransitionCode::IfcTransitionCode v);
     /// An indicator of whether or not the sense of the segment agrees with, or opposes, that of the parent curve. If SameSense is false, the point with highest parameter value is taken as the first point of the segment.
     /// 
     /// NOTE  If the datatype of ParentCurve is IfcTrimmedCurve, the value of SameSense overrides the value of IfcTrimmedCurve.SenseAgreement
-    bool SameSense();
+    bool SameSense() const;
     void setSameSense(bool v);
     /// The bounded curve which defines the geometry of the segment.
-    IfcCurve* ParentCurve();
+    IfcCurve* ParentCurve() const;
     void setParentCurve(IfcCurve* v);
     virtual unsigned int getArgumentCount() const { return 3; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENUMERATION; case 1: return IfcUtil::Argument_BOOL; case 2: return IfcUtil::Argument_ENTITY; } return IfcGeometricRepresentationItem::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcTransitionCode; case 1: return Type::UNDEFINED; case 2: return Type::IfcCurve; } return IfcGeometricRepresentationItem::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Transition"; case 1: return "SameSense"; case 2: return "ParentCurve"; } return IfcGeometricRepresentationItem::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcCompositeCurve > > UsingCurves(); // INVERSE IfcCompositeCurve::Segments
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcCompositeCurve >::ptr UsingCurves() const; // INVERSE IfcCompositeCurve::Segments
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcCompositeCurveSegment (IfcAbstractEntityPtr e);
+    IfcCompositeCurveSegment (IfcAbstractEntity* e);
     IfcCompositeCurveSegment (IfcTransitionCode::IfcTransitionCode v1_Transition, bool v2_SameSense, IfcCurve* v3_ParentCurve);
-    typedef IfcCompositeCurveSegment* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcCompositeCurveSegment > > list;
-    typedef IfcTemplatedEntityList< IfcCompositeCurveSegment >::it it;
+    typedef IfcTemplatedEntityList< IfcCompositeCurveSegment > list;
 };
 /// IfcConstructionResourceType is an abstract generalization of the different resource types used in construction projects, mainly labor, material, equipment and product resource types, plus subcontracted resource types and aggregations such as a crew resource type. 
 /// 
@@ -19586,25 +20562,24 @@ class IfcCompositeCurveSegment : public IfcGeometricRepresentationItem {
 class IfcConstructionResourceType : public IfcTypeResource {
 public:
     /// Whether the optional attribute BaseCosts is defined for this IfcConstructionResourceType
-    bool hasBaseCosts();
-    SHARED_PTR< IfcTemplatedEntityList< IfcAppliedValue > > BaseCosts();
-    void setBaseCosts(SHARED_PTR< IfcTemplatedEntityList< IfcAppliedValue > > v);
+    bool hasBaseCosts() const;
+    IfcTemplatedEntityList< IfcAppliedValue >::ptr BaseCosts() const;
+    void setBaseCosts(IfcTemplatedEntityList< IfcAppliedValue >::ptr v);
     /// Whether the optional attribute BaseQuantity is defined for this IfcConstructionResourceType
-    bool hasBaseQuantity();
-    IfcPhysicalQuantity* BaseQuantity();
+    bool hasBaseQuantity() const;
+    IfcPhysicalQuantity* BaseQuantity() const;
     void setBaseQuantity(IfcPhysicalQuantity* v);
     virtual unsigned int getArgumentCount() const { return 11; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENTITY_LIST; case 10: return IfcUtil::Argument_ENTITY; } return IfcTypeResource::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcAppliedValue; case 10: return Type::IfcPhysicalQuantity; } return IfcTypeResource::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "BaseCosts"; case 10: return "BaseQuantity"; } return IfcTypeResource::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcConstructionResourceType (IfcAbstractEntityPtr e);
-    IfcConstructionResourceType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< IfcIdentifier > v7_Identification, boost::optional< IfcText > v8_LongDescription, boost::optional< IfcLabel > v9_ResourceType, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcAppliedValue > > > v10_BaseCosts, IfcPhysicalQuantity* v11_BaseQuantity);
-    typedef IfcConstructionResourceType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcConstructionResourceType > > list;
-    typedef IfcTemplatedEntityList< IfcConstructionResourceType >::it it;
+    IfcConstructionResourceType (IfcAbstractEntity* e);
+    IfcConstructionResourceType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< std::string > v7_Identification, boost::optional< std::string > v8_LongDescription, boost::optional< std::string > v9_ResourceType, boost::optional< IfcTemplatedEntityList< IfcAppliedValue >::ptr > v10_BaseCosts, IfcPhysicalQuantity* v11_BaseQuantity);
+    typedef IfcTemplatedEntityList< IfcConstructionResourceType > list;
 };
 /// IfcContext is the generalization of a project context in which objects, type objects, property sets, and properties are defined. The IfcProject as subtype of IfcContext provides the context for all information on a construction project, it may include one or several IfcProjectLibrary as subtype of IfcContext to register the included libraries for the project.
 /// 
@@ -19622,48 +20597,47 @@ class IfcConstructionResourceType : public IfcTypeResource {
 class IfcContext : public IfcObjectDefinition {
 public:
     /// Whether the optional attribute ObjectType is defined for this IfcContext
-    bool hasObjectType();
+    bool hasObjectType() const;
     /// The type denotes a particular type that indicates the object further. The use has to be established at the level of instantiable subtypes.
-    IfcLabel ObjectType();
-    void setObjectType(IfcLabel v);
+    std::string ObjectType() const;
+    void setObjectType(std::string v);
     /// Whether the optional attribute LongName is defined for this IfcContext
-    bool hasLongName();
+    bool hasLongName() const;
     /// Long name for the context as used for reference purposes.
-    IfcLabel LongName();
-    void setLongName(IfcLabel v);
+    std::string LongName() const;
+    void setLongName(std::string v);
     /// Whether the optional attribute Phase is defined for this IfcContext
-    bool hasPhase();
+    bool hasPhase() const;
     /// Current project phase, or life-cycle phase of this project. Applicable values have to be agreed upon by view definitions or implementer agreements.
-    IfcLabel Phase();
-    void setPhase(IfcLabel v);
+    std::string Phase() const;
+    void setPhase(std::string v);
     /// Whether the optional attribute RepresentationContexts is defined for this IfcContext
-    bool hasRepresentationContexts();
+    bool hasRepresentationContexts() const;
     /// Context of the representations used within the context. When the context is a project and it includes shape representations for its components, one or several geometric representation contexts need to be included that define e.g. the world coordinate system, the coordinate space dimensions, and/or the precision factor.
     /// 
     /// IFC2x4 CHANGE  The attribute has been changed to be optional. Change made with upward compatibility for file based exchange.
-    SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationContext > > RepresentationContexts();
-    void setRepresentationContexts(SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationContext > > v);
+    IfcTemplatedEntityList< IfcRepresentationContext >::ptr RepresentationContexts() const;
+    void setRepresentationContexts(IfcTemplatedEntityList< IfcRepresentationContext >::ptr v);
     /// Whether the optional attribute UnitsInContext is defined for this IfcContext
-    bool hasUnitsInContext();
+    bool hasUnitsInContext() const;
     /// Units globally assigned to measure types used within the context.
     /// 
     /// IFC2x4 CHANGE  The attribute has been changed to be optional. Change made with upward compatibility for file based exchange.
-    IfcUnitAssignment* UnitsInContext();
+    IfcUnitAssignment* UnitsInContext() const;
     void setUnitsInContext(IfcUnitAssignment* v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 4: return IfcUtil::Argument_STRING; case 5: return IfcUtil::Argument_STRING; case 6: return IfcUtil::Argument_STRING; case 7: return IfcUtil::Argument_ENTITY_LIST; case 8: return IfcUtil::Argument_ENTITY; } return IfcObjectDefinition::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 4: return Type::IfcLabel; case 5: return Type::IfcLabel; case 6: return Type::IfcLabel; case 7: return Type::IfcRepresentationContext; case 8: return Type::IfcUnitAssignment; } return IfcObjectDefinition::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 4: return "ObjectType"; case 5: return "LongName"; case 6: return "Phase"; case 7: return "RepresentationContexts"; case 8: return "UnitsInContext"; } return IfcObjectDefinition::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelDefinesByProperties > > IsDefinedBy(); // INVERSE IfcRelDefinesByProperties::RelatedObjects
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelDeclares > > Declares(); // INVERSE IfcRelDeclares::RelatingContext
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcRelDefinesByProperties >::ptr IsDefinedBy() const; // INVERSE IfcRelDefinesByProperties::RelatedObjects
+    IfcTemplatedEntityList< IfcRelDeclares >::ptr Declares() const; // INVERSE IfcRelDeclares::RelatingContext
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcContext (IfcAbstractEntityPtr e);
-    IfcContext (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, boost::optional< IfcLabel > v6_LongName, boost::optional< IfcLabel > v7_Phase, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationContext > > > v8_RepresentationContexts, IfcUnitAssignment* v9_UnitsInContext);
-    typedef IfcContext* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcContext > > list;
-    typedef IfcTemplatedEntityList< IfcContext >::it it;
+    IfcContext (IfcAbstractEntity* e);
+    IfcContext (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, boost::optional< std::string > v6_LongName, boost::optional< std::string > v7_Phase, boost::optional< IfcTemplatedEntityList< IfcRepresentationContext >::ptr > v8_RepresentationContexts, IfcUnitAssignment* v9_UnitsInContext);
+    typedef IfcTemplatedEntityList< IfcContext > list;
 };
 /// The resource type IfcCrewResourceType defines commonly shared information for occurrences of crew resources. The set of shared information may include:
 /// 
@@ -19678,20 +20652,19 @@ class IfcContext : public IfcObjectDefinition {
 class IfcCrewResourceType : public IfcConstructionResourceType {
 public:
     /// Defines types of crew resources.
-    IfcCrewResourceTypeEnum::IfcCrewResourceTypeEnum PredefinedType();
+    IfcCrewResourceTypeEnum::IfcCrewResourceTypeEnum PredefinedType() const;
     void setPredefinedType(IfcCrewResourceTypeEnum::IfcCrewResourceTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 12; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 11: return IfcUtil::Argument_ENUMERATION; } return IfcConstructionResourceType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 11: return Type::IfcCrewResourceTypeEnum; } return IfcConstructionResourceType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 11: return "PredefinedType"; } return IfcConstructionResourceType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcCrewResourceType (IfcAbstractEntityPtr e);
-    IfcCrewResourceType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< IfcIdentifier > v7_Identification, boost::optional< IfcText > v8_LongDescription, boost::optional< IfcLabel > v9_ResourceType, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcAppliedValue > > > v10_BaseCosts, IfcPhysicalQuantity* v11_BaseQuantity, IfcCrewResourceTypeEnum::IfcCrewResourceTypeEnum v12_PredefinedType);
-    typedef IfcCrewResourceType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcCrewResourceType > > list;
-    typedef IfcTemplatedEntityList< IfcCrewResourceType >::it it;
+    IfcCrewResourceType (IfcAbstractEntity* e);
+    IfcCrewResourceType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< std::string > v7_Identification, boost::optional< std::string > v8_LongDescription, boost::optional< std::string > v9_ResourceType, boost::optional< IfcTemplatedEntityList< IfcAppliedValue >::ptr > v10_BaseCosts, IfcPhysicalQuantity* v11_BaseQuantity, IfcCrewResourceTypeEnum::IfcCrewResourceTypeEnum v12_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcCrewResourceType > list;
 };
 /// IfcCsgPrimitive3D is an abstract supertype of all three dimensional primitives used as either tree root item, or as Boolean results within a CSG solid model. All 3D CSG primitives are defined within a three-dimensional placement coordinate system.
 /// 
@@ -19701,20 +20674,19 @@ class IfcCrewResourceType : public IfcConstructionResourceType {
 class IfcCsgPrimitive3D : public IfcGeometricRepresentationItem {
 public:
     /// The placement coordinate system to which the parameters of each individual CSG primitive apply.
-    IfcAxis2Placement3D* Position();
+    IfcAxis2Placement3D* Position() const;
     void setPosition(IfcAxis2Placement3D* v);
     virtual unsigned int getArgumentCount() const { return 1; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY; } return IfcGeometricRepresentationItem::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcAxis2Placement3D; } return IfcGeometricRepresentationItem::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Position"; } return IfcGeometricRepresentationItem::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcCsgPrimitive3D (IfcAbstractEntityPtr e);
+    IfcCsgPrimitive3D (IfcAbstractEntity* e);
     IfcCsgPrimitive3D (IfcAxis2Placement3D* v1_Position);
-    typedef IfcCsgPrimitive3D* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcCsgPrimitive3D > > list;
-    typedef IfcTemplatedEntityList< IfcCsgPrimitive3D >::it it;
+    typedef IfcTemplatedEntityList< IfcCsgPrimitive3D > list;
 };
 /// Definition from ISO/CD 10303-42:1992: A solid
 ///   represented as a CSG model is defined by a collection of
@@ -19760,20 +20732,19 @@ class IfcCsgPrimitive3D : public IfcGeometricRepresentationItem {
 class IfcCsgSolid : public IfcSolidModel {
 public:
     /// Boolean expression of primitives and regularized operators describing the solid. The root of the tree of Boolean expressions is given explicitly as an IfcBooleanResult entitiy or as a primitive (subtypes of IfcCsgPrimitive3D).
-    IfcCsgSelect TreeRootExpression();
-    void setTreeRootExpression(IfcCsgSelect v);
+    IfcCsgSelect* TreeRootExpression() const;
+    void setTreeRootExpression(IfcCsgSelect* v);
     virtual unsigned int getArgumentCount() const { return 1; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY; } return IfcSolidModel::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcCsgSelect; } return IfcSolidModel::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "TreeRootExpression"; } return IfcSolidModel::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcCsgSolid (IfcAbstractEntityPtr e);
-    IfcCsgSolid (IfcCsgSelect v1_TreeRootExpression);
-    typedef IfcCsgSolid* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcCsgSolid > > list;
-    typedef IfcTemplatedEntityList< IfcCsgSolid >::it it;
+    IfcCsgSolid (IfcAbstractEntity* e);
+    IfcCsgSolid (IfcCsgSelect* v1_TreeRootExpression);
+    typedef IfcTemplatedEntityList< IfcCsgSolid > list;
 };
 /// Definition from ISO/CD 10303-42:1992: A curve can be envisioned as the path of a point moving in its coordinate space.  
 /// 
@@ -19789,16 +20760,15 @@ class IfcCurve : public IfcGeometricRepresentationItem {
 public:
     virtual unsigned int getArgumentCount() const { return 0; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcGeometricRepresentationItem::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcGeometricRepresentationItem::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcGeometricRepresentationItem::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcCurve (IfcAbstractEntityPtr e);
+    IfcCurve (IfcAbstractEntity* e);
     IfcCurve ();
-    typedef IfcCurve* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcCurve > > list;
-    typedef IfcTemplatedEntityList< IfcCurve >::it it;
+    typedef IfcTemplatedEntityList< IfcCurve > list;
 };
 /// Definition from ISO/CD 10303-42:1992: The curve bounded surface is a parametric surface with curved boundaries defined by one or more boundary curves. The bounded surface is defined to be the portion of the basis surface in the direction of N x T from any point on the boundary, where N is the surface normal and T the boundary curve tangent vector at this point. The region so defined shall be arcwise connected. 
 /// 
@@ -19816,26 +20786,25 @@ class IfcCurve : public IfcGeometricRepresentationItem {
 class IfcCurveBoundedPlane : public IfcBoundedSurface {
 public:
     /// The surface to be bound.
-    IfcPlane* BasisSurface();
+    IfcPlane* BasisSurface() const;
     void setBasisSurface(IfcPlane* v);
     /// The outer boundary of the surface.
-    IfcCurve* OuterBoundary();
+    IfcCurve* OuterBoundary() const;
     void setOuterBoundary(IfcCurve* v);
     /// An optional set of inner boundaries. They shall not intersect each other or the outer boundary.
-    SHARED_PTR< IfcTemplatedEntityList< IfcCurve > > InnerBoundaries();
-    void setInnerBoundaries(SHARED_PTR< IfcTemplatedEntityList< IfcCurve > > v);
+    IfcTemplatedEntityList< IfcCurve >::ptr InnerBoundaries() const;
+    void setInnerBoundaries(IfcTemplatedEntityList< IfcCurve >::ptr v);
     virtual unsigned int getArgumentCount() const { return 3; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY; case 1: return IfcUtil::Argument_ENTITY; case 2: return IfcUtil::Argument_ENTITY_LIST; } return IfcBoundedSurface::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcPlane; case 1: return Type::IfcCurve; case 2: return Type::IfcCurve; } return IfcBoundedSurface::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "BasisSurface"; case 1: return "OuterBoundary"; case 2: return "InnerBoundaries"; } return IfcBoundedSurface::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcCurveBoundedPlane (IfcAbstractEntityPtr e);
-    IfcCurveBoundedPlane (IfcPlane* v1_BasisSurface, IfcCurve* v2_OuterBoundary, SHARED_PTR< IfcTemplatedEntityList< IfcCurve > > v3_InnerBoundaries);
-    typedef IfcCurveBoundedPlane* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcCurveBoundedPlane > > list;
-    typedef IfcTemplatedEntityList< IfcCurveBoundedPlane >::it it;
+    IfcCurveBoundedPlane (IfcAbstractEntity* e);
+    IfcCurveBoundedPlane (IfcPlane* v1_BasisSurface, IfcCurve* v2_OuterBoundary, IfcTemplatedEntityList< IfcCurve >::ptr v3_InnerBoundaries);
+    typedef IfcTemplatedEntityList< IfcCurveBoundedPlane > list;
 };
 /// Definition from ISO/CD 10303-42:1992 The curve bounded surface is a parametric surface with curved boundaries defined by one or more boundary curves. One of the boundary curves may be the outer boundary; any number of inner boundaries is permissible. The region of the curve bounded surface in the basis surface is defined to be the portion of the basis surface in the direction of N x T from any point on the boundary, where N is the surface normal and T the boundary curve tangent vector at this point. The region so defined shall be arcwise connected.
 /// 
@@ -19861,25 +20830,24 @@ class IfcCurveBoundedPlane : public IfcBoundedSurface {
 class IfcCurveBoundedSurface : public IfcBoundedSurface {
 public:
     /// The surface to be bounded.
-    IfcSurface* BasisSurface();
+    IfcSurface* BasisSurface() const;
     void setBasisSurface(IfcSurface* v);
     /// The outer boundary of the surface.
-    SHARED_PTR< IfcTemplatedEntityList< IfcBoundaryCurve > > Boundaries();
-    void setBoundaries(SHARED_PTR< IfcTemplatedEntityList< IfcBoundaryCurve > > v);
-    bool ImplicitOuter();
+    IfcTemplatedEntityList< IfcBoundaryCurve >::ptr Boundaries() const;
+    void setBoundaries(IfcTemplatedEntityList< IfcBoundaryCurve >::ptr v);
+    bool ImplicitOuter() const;
     void setImplicitOuter(bool v);
     virtual unsigned int getArgumentCount() const { return 3; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY; case 1: return IfcUtil::Argument_ENTITY_LIST; case 2: return IfcUtil::Argument_BOOL; } return IfcBoundedSurface::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcSurface; case 1: return Type::IfcBoundaryCurve; case 2: return Type::UNDEFINED; } return IfcBoundedSurface::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "BasisSurface"; case 1: return "Boundaries"; case 2: return "ImplicitOuter"; } return IfcBoundedSurface::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcCurveBoundedSurface (IfcAbstractEntityPtr e);
-    IfcCurveBoundedSurface (IfcSurface* v1_BasisSurface, SHARED_PTR< IfcTemplatedEntityList< IfcBoundaryCurve > > v2_Boundaries, bool v3_ImplicitOuter);
-    typedef IfcCurveBoundedSurface* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcCurveBoundedSurface > > list;
-    typedef IfcTemplatedEntityList< IfcCurveBoundedSurface >::it it;
+    IfcCurveBoundedSurface (IfcAbstractEntity* e);
+    IfcCurveBoundedSurface (IfcSurface* v1_BasisSurface, IfcTemplatedEntityList< IfcBoundaryCurve >::ptr v2_Boundaries, bool v3_ImplicitOuter);
+    typedef IfcTemplatedEntityList< IfcCurveBoundedSurface > list;
 };
 /// Definition from ISO/CD 10303-42:1992: This entity defines a general direction vector in two or three dimensional space. The actual magnitudes of the components have no effect upon the direction being defined, only the ratios X:Y:Z or X:Y are significant.  
 /// 
@@ -19891,20 +20859,19 @@ class IfcCurveBoundedSurface : public IfcBoundedSurface {
 class IfcDirection : public IfcGeometricRepresentationItem {
 public:
     /// The components in the direction of X axis (DirectionRatios[1]), of Y axis (DirectionRatios[2]), and of Z axis (DirectionRatios[3])
-    std::vector< double > /*[2:3]*/ DirectionRatios();
+    std::vector< double > /*[2:3]*/ DirectionRatios() const;
     void setDirectionRatios(std::vector< double > /*[2:3]*/ v);
     virtual unsigned int getArgumentCount() const { return 1; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_VECTOR_DOUBLE; } return IfcGeometricRepresentationItem::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::UNDEFINED; } return IfcGeometricRepresentationItem::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "DirectionRatios"; } return IfcGeometricRepresentationItem::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcDirection (IfcAbstractEntityPtr e);
+    IfcDirection (IfcAbstractEntity* e);
     IfcDirection (std::vector< double > /*[2:3]*/ v1_DirectionRatios);
-    typedef IfcDirection* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcDirection > > list;
-    typedef IfcTemplatedEntityList< IfcDirection >::it it;
+    typedef IfcTemplatedEntityList< IfcDirection > list;
 };
 /// Definition: The door style, IfcDoorStyle, defines a particular style of doors, which may be included into the spatial context of the building model through instances of IfcDoor. A door style defines the overall parameter of the door style and refers to the particular parameter of the lining and one (or several) panels through the IfcDoorLiningProperties and the IfcDoorPanelProperties.
 /// 
@@ -19935,29 +20902,28 @@ class IfcDirection : public IfcGeometricRepresentationItem {
 class IfcDoorStyle : public IfcTypeProduct {
 public:
     /// Type defining the general layout and operation of the door style.
-    IfcDoorStyleOperationEnum::IfcDoorStyleOperationEnum OperationType();
+    IfcDoorStyleOperationEnum::IfcDoorStyleOperationEnum OperationType() const;
     void setOperationType(IfcDoorStyleOperationEnum::IfcDoorStyleOperationEnum v);
     /// Type defining the basic construction and material type of the door.
-    IfcDoorStyleConstructionEnum::IfcDoorStyleConstructionEnum ConstructionType();
+    IfcDoorStyleConstructionEnum::IfcDoorStyleConstructionEnum ConstructionType() const;
     void setConstructionType(IfcDoorStyleConstructionEnum::IfcDoorStyleConstructionEnum v);
     /// The Boolean value reflects, whether the parameter given in the attached lining and panel properties exactly define the geometry (TRUE), or whether the attached style shape take precedence (FALSE). In the last case the parameter have only informative value.
-    bool ParameterTakesPrecedence();
+    bool ParameterTakesPrecedence() const;
     void setParameterTakesPrecedence(bool v);
     /// The Boolean indicates, whether the attached IfcMappedRepresentation (if given) can be sized (using scale factor of transformation), or not (FALSE). If not, the IfcMappedRepresentation should be IfcShapeRepresentation of the IfcDoor (using IfcMappedItem as the Item) with the scale factor = 1.
-    bool Sizeable();
+    bool Sizeable() const;
     void setSizeable(bool v);
     virtual unsigned int getArgumentCount() const { return 12; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_ENUMERATION; case 9: return IfcUtil::Argument_ENUMERATION; case 10: return IfcUtil::Argument_BOOL; case 11: return IfcUtil::Argument_BOOL; } return IfcTypeProduct::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcDoorStyleOperationEnum; case 9: return Type::IfcDoorStyleConstructionEnum; case 10: return Type::UNDEFINED; case 11: return Type::UNDEFINED; } return IfcTypeProduct::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "OperationType"; case 9: return "ConstructionType"; case 10: return "ParameterTakesPrecedence"; case 11: return "Sizeable"; } return IfcTypeProduct::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcDoorStyle (IfcAbstractEntityPtr e);
-    IfcDoorStyle (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, IfcDoorStyleOperationEnum::IfcDoorStyleOperationEnum v9_OperationType, IfcDoorStyleConstructionEnum::IfcDoorStyleConstructionEnum v10_ConstructionType, bool v11_ParameterTakesPrecedence, bool v12_Sizeable);
-    typedef IfcDoorStyle* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcDoorStyle > > list;
-    typedef IfcTemplatedEntityList< IfcDoorStyle >::it it;
+    IfcDoorStyle (IfcAbstractEntity* e);
+    IfcDoorStyle (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, IfcDoorStyleOperationEnum::IfcDoorStyleOperationEnum v9_OperationType, IfcDoorStyleConstructionEnum::IfcDoorStyleConstructionEnum v10_ConstructionType, bool v11_ParameterTakesPrecedence, bool v12_Sizeable);
+    typedef IfcTemplatedEntityList< IfcDoorStyle > list;
 };
 /// Definition from ISO/CD 10303-42:1992: An edge_loop is a loop with nonzero extent. It is a path in which the start and end vertices are the same. Its domain, if present, is a closed curve. An edge_loop may overlap itself.
 /// 
@@ -19973,20 +20939,19 @@ class IfcDoorStyle : public IfcTypeProduct {
 class IfcEdgeLoop : public IfcLoop {
 public:
     /// A list of oriented edge entities which are concatenated together to form this path.
-    SHARED_PTR< IfcTemplatedEntityList< IfcOrientedEdge > > EdgeList();
-    void setEdgeList(SHARED_PTR< IfcTemplatedEntityList< IfcOrientedEdge > > v);
+    IfcTemplatedEntityList< IfcOrientedEdge >::ptr EdgeList() const;
+    void setEdgeList(IfcTemplatedEntityList< IfcOrientedEdge >::ptr v);
     virtual unsigned int getArgumentCount() const { return 1; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY_LIST; } return IfcLoop::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcOrientedEdge; } return IfcLoop::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "EdgeList"; } return IfcLoop::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcEdgeLoop (IfcAbstractEntityPtr e);
-    IfcEdgeLoop (SHARED_PTR< IfcTemplatedEntityList< IfcOrientedEdge > > v1_EdgeList);
-    typedef IfcEdgeLoop* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcEdgeLoop > > list;
-    typedef IfcTemplatedEntityList< IfcEdgeLoop >::it it;
+    IfcEdgeLoop (IfcAbstractEntity* e);
+    IfcEdgeLoop (IfcTemplatedEntityList< IfcOrientedEdge >::ptr v1_EdgeList);
+    typedef IfcTemplatedEntityList< IfcEdgeLoop > list;
 };
 /// Definition from IAI: An IfcElementQuantity
 /// defines a set of derived measures of an element's physical
@@ -20068,27 +21033,26 @@ class IfcEdgeLoop : public IfcLoop {
 class IfcElementQuantity : public IfcQuantitySet {
 public:
     /// Whether the optional attribute MethodOfMeasurement is defined for this IfcElementQuantity
-    bool hasMethodOfMeasurement();
+    bool hasMethodOfMeasurement() const;
     /// Name of the method of measurement used to calculate the element quantity. The method of measurement attribute has to be made recognizable by further agreements.
     /// 
     /// IFC2x2 Addendum 1 change: The attribute has been changed to be optional
-    IfcLabel MethodOfMeasurement();
-    void setMethodOfMeasurement(IfcLabel v);
+    std::string MethodOfMeasurement() const;
+    void setMethodOfMeasurement(std::string v);
     /// The individual quantities for the element, can be a set of length, area, volume, weight or count based quantities.
-    SHARED_PTR< IfcTemplatedEntityList< IfcPhysicalQuantity > > Quantities();
-    void setQuantities(SHARED_PTR< IfcTemplatedEntityList< IfcPhysicalQuantity > > v);
+    IfcTemplatedEntityList< IfcPhysicalQuantity >::ptr Quantities() const;
+    void setQuantities(IfcTemplatedEntityList< IfcPhysicalQuantity >::ptr v);
     virtual unsigned int getArgumentCount() const { return 6; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 4: return IfcUtil::Argument_STRING; case 5: return IfcUtil::Argument_ENTITY_LIST; } return IfcQuantitySet::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 4: return Type::IfcLabel; case 5: return Type::IfcPhysicalQuantity; } return IfcQuantitySet::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 4: return "MethodOfMeasurement"; case 5: return "Quantities"; } return IfcQuantitySet::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcElementQuantity (IfcAbstractEntityPtr e);
-    IfcElementQuantity (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_MethodOfMeasurement, SHARED_PTR< IfcTemplatedEntityList< IfcPhysicalQuantity > > v6_Quantities);
-    typedef IfcElementQuantity* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcElementQuantity > > list;
-    typedef IfcTemplatedEntityList< IfcElementQuantity >::it it;
+    IfcElementQuantity (IfcAbstractEntity* e);
+    IfcElementQuantity (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_MethodOfMeasurement, IfcTemplatedEntityList< IfcPhysicalQuantity >::ptr v6_Quantities);
+    typedef IfcTemplatedEntityList< IfcElementQuantity > list;
 };
 /// Definition from IAI: The IfcElementType
 ///   defines a list of commonly shared property set definitions
@@ -20115,22 +21079,21 @@ class IfcElementQuantity : public IfcQuantitySet {
 class IfcElementType : public IfcTypeProduct {
 public:
     /// Whether the optional attribute ElementType is defined for this IfcElementType
-    bool hasElementType();
+    bool hasElementType() const;
     /// The type denotes a particular type that indicates the object further. The use has to be established at the level of instantiable subtypes. In particular it holds the user defined type, if the enumeration of the attribute 'PredefinedType' is set to USERDEFINED.
-    IfcLabel ElementType();
-    void setElementType(IfcLabel v);
+    std::string ElementType() const;
+    void setElementType(std::string v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_STRING; } return IfcTypeProduct::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcLabel; } return IfcTypeProduct::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "ElementType"; } return IfcTypeProduct::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcElementType (IfcAbstractEntityPtr e);
-    IfcElementType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType);
-    typedef IfcElementType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcElementType > > list;
-    typedef IfcTemplatedEntityList< IfcElementType >::it it;
+    IfcElementType (IfcAbstractEntity* e);
+    IfcElementType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType);
+    typedef IfcTemplatedEntityList< IfcElementType > list;
 };
 /// Definition from ISO/CD 10303-42:1992: An elementary surface (IfcElementarySurface) is a simple analytic surface with defined parametric representation. 
 /// 
@@ -20140,20 +21103,19 @@ class IfcElementType : public IfcTypeProduct {
 class IfcElementarySurface : public IfcSurface {
 public:
     /// The position and orientation of the surface. This attribute is used in the definition of the parameterization of the surface.
-    IfcAxis2Placement3D* Position();
+    IfcAxis2Placement3D* Position() const;
     void setPosition(IfcAxis2Placement3D* v);
     virtual unsigned int getArgumentCount() const { return 1; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY; } return IfcSurface::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcAxis2Placement3D; } return IfcSurface::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Position"; } return IfcSurface::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcElementarySurface (IfcAbstractEntityPtr e);
+    IfcElementarySurface (IfcAbstractEntity* e);
     IfcElementarySurface (IfcAxis2Placement3D* v1_Position);
-    typedef IfcElementarySurface* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcElementarySurface > > list;
-    typedef IfcTemplatedEntityList< IfcElementarySurface >::it it;
+    typedef IfcTemplatedEntityList< IfcElementarySurface > list;
 };
 /// IfcEllipseProfileDef defines an ellipse as the profile definition used by the swept surface geometry
 /// or the swept area solid. It is given by its semi axis attributes and placed within the 2D position coordinate system, established by the Position attribute. 
@@ -20174,23 +21136,22 @@ class IfcElementarySurface : public IfcSurface {
 class IfcEllipseProfileDef : public IfcParameterizedProfileDef {
 public:
     /// The first radius of the ellipse. It is measured along the direction of Position.P[1].
-    IfcPositiveLengthMeasure SemiAxis1();
-    void setSemiAxis1(IfcPositiveLengthMeasure v);
+    double SemiAxis1() const;
+    void setSemiAxis1(double v);
     /// The second radius of the ellipse. It is measured along the direction of Position.P[2].
-    IfcPositiveLengthMeasure SemiAxis2();
-    void setSemiAxis2(IfcPositiveLengthMeasure v);
+    double SemiAxis2() const;
+    void setSemiAxis2(double v);
     virtual unsigned int getArgumentCount() const { return 5; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 3: return IfcUtil::Argument_DOUBLE; case 4: return IfcUtil::Argument_DOUBLE; } return IfcParameterizedProfileDef::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 3: return Type::IfcPositiveLengthMeasure; case 4: return Type::IfcPositiveLengthMeasure; } return IfcParameterizedProfileDef::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 3: return "SemiAxis1"; case 4: return "SemiAxis2"; } return IfcParameterizedProfileDef::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcEllipseProfileDef (IfcAbstractEntityPtr e);
-    IfcEllipseProfileDef (IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< IfcLabel > v2_ProfileName, IfcAxis2Placement2D* v3_Position, IfcPositiveLengthMeasure v4_SemiAxis1, IfcPositiveLengthMeasure v5_SemiAxis2);
-    typedef IfcEllipseProfileDef* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcEllipseProfileDef > > list;
-    typedef IfcTemplatedEntityList< IfcEllipseProfileDef >::it it;
+    IfcEllipseProfileDef (IfcAbstractEntity* e);
+    IfcEllipseProfileDef (IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< std::string > v2_ProfileName, IfcAxis2Placement2D* v3_Position, double v4_SemiAxis1, double v5_SemiAxis2);
+    typedef IfcTemplatedEntityList< IfcEllipseProfileDef > list;
 };
 /// An IfcEventType defines a particular type of event that may be specified.
 /// 
@@ -20202,31 +21163,30 @@ class IfcEventType : public IfcTypeProcess {
 public:
     /// Identifies the predefined types of an event from which 
     ///   the type required may be set.
-    IfcEventTypeEnum::IfcEventTypeEnum PredefinedType();
+    IfcEventTypeEnum::IfcEventTypeEnum PredefinedType() const;
     void setPredefinedType(IfcEventTypeEnum::IfcEventTypeEnum v);
     /// Identifies the predefined types of event trigger from which 
     ///   the type required may be set.
-    IfcEventTriggerTypeEnum::IfcEventTriggerTypeEnum EventTriggerType();
+    IfcEventTriggerTypeEnum::IfcEventTriggerTypeEnum EventTriggerType() const;
     void setEventTriggerType(IfcEventTriggerTypeEnum::IfcEventTriggerTypeEnum v);
     /// Whether the optional attribute UserDefinedEventTriggerType is defined for this IfcEventType
-    bool hasUserDefinedEventTriggerType();
+    bool hasUserDefinedEventTriggerType() const;
     /// A user defined event trigger type, the value of which 
     ///   is asserted when the value of an event trigger type is 
     ///   declared as USERDEFINED.
-    IfcLabel UserDefinedEventTriggerType();
-    void setUserDefinedEventTriggerType(IfcLabel v);
+    std::string UserDefinedEventTriggerType() const;
+    void setUserDefinedEventTriggerType(std::string v);
     virtual unsigned int getArgumentCount() const { return 12; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; case 10: return IfcUtil::Argument_ENUMERATION; case 11: return IfcUtil::Argument_STRING; } return IfcTypeProcess::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcEventTypeEnum; case 10: return Type::IfcEventTriggerTypeEnum; case 11: return Type::IfcLabel; } return IfcTypeProcess::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; case 10: return "EventTriggerType"; case 11: return "UserDefinedEventTriggerType"; } return IfcTypeProcess::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcEventType (IfcAbstractEntityPtr e);
-    IfcEventType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< IfcIdentifier > v7_Identification, boost::optional< IfcText > v8_LongDescription, boost::optional< IfcLabel > v9_ProcessType, IfcEventTypeEnum::IfcEventTypeEnum v10_PredefinedType, IfcEventTriggerTypeEnum::IfcEventTriggerTypeEnum v11_EventTriggerType, boost::optional< IfcLabel > v12_UserDefinedEventTriggerType);
-    typedef IfcEventType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcEventType > > list;
-    typedef IfcTemplatedEntityList< IfcEventType >::it it;
+    IfcEventType (IfcAbstractEntity* e);
+    IfcEventType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< std::string > v7_Identification, boost::optional< std::string > v8_LongDescription, boost::optional< std::string > v9_ProcessType, IfcEventTypeEnum::IfcEventTypeEnum v10_PredefinedType, IfcEventTriggerTypeEnum::IfcEventTriggerTypeEnum v11_EventTriggerType, boost::optional< std::string > v12_UserDefinedEventTriggerType);
+    typedef IfcTemplatedEntityList< IfcEventType > list;
 };
 /// The IfcExtrudedAreaSolid is defined by sweeping a cross
 /// section provided by a profile definition. The direction of the
@@ -20299,24 +21259,23 @@ class IfcEventType : public IfcTypeProcess {
 class IfcExtrudedAreaSolid : public IfcSweptAreaSolid {
 public:
     /// The direction in which the surface, provided by SweptArea is to be swept.
-    IfcDirection* ExtrudedDirection();
+    IfcDirection* ExtrudedDirection() const;
     void setExtrudedDirection(IfcDirection* v);
     /// The distance the surface is to be swept along the ExtrudedDirection
     /// .
-    IfcPositiveLengthMeasure Depth();
-    void setDepth(IfcPositiveLengthMeasure v);
+    double Depth() const;
+    void setDepth(double v);
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 2: return IfcUtil::Argument_ENTITY; case 3: return IfcUtil::Argument_DOUBLE; } return IfcSweptAreaSolid::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 2: return Type::IfcDirection; case 3: return Type::IfcPositiveLengthMeasure; } return IfcSweptAreaSolid::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 2: return "ExtrudedDirection"; case 3: return "Depth"; } return IfcSweptAreaSolid::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcExtrudedAreaSolid (IfcAbstractEntityPtr e);
-    IfcExtrudedAreaSolid (IfcProfileDef* v1_SweptArea, IfcAxis2Placement3D* v2_Position, IfcDirection* v3_ExtrudedDirection, IfcPositiveLengthMeasure v4_Depth);
-    typedef IfcExtrudedAreaSolid* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcExtrudedAreaSolid > > list;
-    typedef IfcTemplatedEntityList< IfcExtrudedAreaSolid >::it it;
+    IfcExtrudedAreaSolid (IfcAbstractEntity* e);
+    IfcExtrudedAreaSolid (IfcProfileDef* v1_SweptArea, IfcAxis2Placement3D* v2_Position, IfcDirection* v3_ExtrudedDirection, double v4_Depth);
+    typedef IfcTemplatedEntityList< IfcExtrudedAreaSolid > list;
 };
 /// IfcExtrudedAreaSolidTapered is defined by sweeping a cross
 /// section along a linear spine. The cross section may change along
@@ -20419,20 +21378,19 @@ class IfcExtrudedAreaSolid : public IfcSweptAreaSolid {
 class IfcExtrudedAreaSolidTapered : public IfcExtrudedAreaSolid {
 public:
     /// The surface defining the end of the swept area. It is given as a profile definition. The position coordinate system of the EndSwptArea is generated by translating the SELF\IfcSweptAreaSolid.Position along the SELF\IfcExtrudedAreaSolid.ExtrudedDirection by the distance of SELF\IfcExtrudedAreaSolid.Depth.
-    IfcProfileDef* EndSweptArea();
+    IfcProfileDef* EndSweptArea() const;
     void setEndSweptArea(IfcProfileDef* v);
     virtual unsigned int getArgumentCount() const { return 5; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 4: return IfcUtil::Argument_ENTITY; } return IfcExtrudedAreaSolid::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 4: return Type::IfcProfileDef; } return IfcExtrudedAreaSolid::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 4: return "EndSweptArea"; } return IfcExtrudedAreaSolid::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcExtrudedAreaSolidTapered (IfcAbstractEntityPtr e);
-    IfcExtrudedAreaSolidTapered (IfcProfileDef* v1_SweptArea, IfcAxis2Placement3D* v2_Position, IfcDirection* v3_ExtrudedDirection, IfcPositiveLengthMeasure v4_Depth, IfcProfileDef* v5_EndSweptArea);
-    typedef IfcExtrudedAreaSolidTapered* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcExtrudedAreaSolidTapered > > list;
-    typedef IfcTemplatedEntityList< IfcExtrudedAreaSolidTapered >::it it;
+    IfcExtrudedAreaSolidTapered (IfcAbstractEntity* e);
+    IfcExtrudedAreaSolidTapered (IfcProfileDef* v1_SweptArea, IfcAxis2Placement3D* v2_Position, IfcDirection* v3_ExtrudedDirection, double v4_Depth, IfcProfileDef* v5_EndSweptArea);
+    typedef IfcTemplatedEntityList< IfcExtrudedAreaSolidTapered > list;
 };
 /// Definition from ISO/CD 10303-42:1992: A face based surface model is described by a set of connected face sets of dimensionality 2. The connected face sets shall not intersect except at edges and vertices, except that a face in one connected face set may overlap a face in another connected face set, provided the face boundaries are identical. There shall be at least one connected face set.  
 /// 
@@ -20449,20 +21407,19 @@ class IfcExtrudedAreaSolidTapered : public IfcExtrudedAreaSolid {
 class IfcFaceBasedSurfaceModel : public IfcGeometricRepresentationItem {
 public:
     /// The set of connected face sets comprising the face based surface model.
-    SHARED_PTR< IfcTemplatedEntityList< IfcConnectedFaceSet > > FbsmFaces();
-    void setFbsmFaces(SHARED_PTR< IfcTemplatedEntityList< IfcConnectedFaceSet > > v);
+    IfcTemplatedEntityList< IfcConnectedFaceSet >::ptr FbsmFaces() const;
+    void setFbsmFaces(IfcTemplatedEntityList< IfcConnectedFaceSet >::ptr v);
     virtual unsigned int getArgumentCount() const { return 1; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY_LIST; } return IfcGeometricRepresentationItem::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcConnectedFaceSet; } return IfcGeometricRepresentationItem::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "FbsmFaces"; } return IfcGeometricRepresentationItem::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcFaceBasedSurfaceModel (IfcAbstractEntityPtr e);
-    IfcFaceBasedSurfaceModel (SHARED_PTR< IfcTemplatedEntityList< IfcConnectedFaceSet > > v1_FbsmFaces);
-    typedef IfcFaceBasedSurfaceModel* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcFaceBasedSurfaceModel > > list;
-    typedef IfcTemplatedEntityList< IfcFaceBasedSurfaceModel >::it it;
+    IfcFaceBasedSurfaceModel (IfcAbstractEntity* e);
+    IfcFaceBasedSurfaceModel (IfcTemplatedEntityList< IfcConnectedFaceSet >::ptr v1_FbsmFaces);
+    typedef IfcTemplatedEntityList< IfcFaceBasedSurfaceModel > list;
 };
 /// Definition from ISO/CD 10303-46:1992: The fill area style hatching defines a styled pattern of curves for hatching an annotation fill area or a surface.
 /// 
@@ -20514,44 +21471,43 @@ class IfcFaceBasedSurfaceModel : public IfcGeometricRepresentationItem {
 class IfcFillAreaStyleHatching : public IfcGeometricRepresentationItem {
 public:
     /// The curve style of the hatching lines. Any curve style pattern shall start at the origin of each hatch line.
-    IfcCurveStyle* HatchLineAppearance();
+    IfcCurveStyle* HatchLineAppearance() const;
     void setHatchLineAppearance(IfcCurveStyle* v);
     /// A repetition factor that determines the distance between adjacent hatch lines.
     /// 
     /// IFC2x Edition 3 CHANGE  The attribute type of StartOfNextHatchLine has changed to a SELECT of IfcPositiveLengthMeasure (new) and IfcOneDirectionRepeatFactor.
-    IfcHatchLineDistanceSelect StartOfNextHatchLine();
-    void setStartOfNextHatchLine(IfcHatchLineDistanceSelect v);
+    IfcHatchLineDistanceSelect* StartOfNextHatchLine() const;
+    void setStartOfNextHatchLine(IfcHatchLineDistanceSelect* v);
     /// Whether the optional attribute PointOfReferenceHatchLine is defined for this IfcFillAreaStyleHatching
-    bool hasPointOfReferenceHatchLine();
+    bool hasPointOfReferenceHatchLine() const;
     /// A Cartesian point which defines the offset of the reference hatch line from the origin of the (virtual) hatching coordinate system. The origin is used for mapping the fill area style hatching onto an annotation fill area or surface. The reference hatch line would then appear with this offset from the fill style target point.
     /// If not given the reference hatch lines goes through the origin of the (virtual) hatching coordinate system.
     /// 
     /// IFC2x Edition 3 CHANGE  The usage of the attribute PointOfReferenceHatchLine has changed to not provide the Cartesian point which is the origin for mapping, but to provide an offset to the origin for the mapping. The attribute has been made OPTIONAL.
-    IfcCartesianPoint* PointOfReferenceHatchLine();
+    IfcCartesianPoint* PointOfReferenceHatchLine() const;
     void setPointOfReferenceHatchLine(IfcCartesianPoint* v);
     /// Whether the optional attribute PatternStart is defined for this IfcFillAreaStyleHatching
-    bool hasPatternStart();
+    bool hasPatternStart() const;
     /// A distance along the reference hatch line which is the start point for the curve style font pattern of the reference hatch line.
     /// If not given, the start point of the curve style font pattern is at the (virtual) hatching coordinate system.
     /// 
     /// IFC2x Edition 2 Addendum 2 CHANGE The attribute PatternStart has been made OPTIONAL.
-    IfcCartesianPoint* PatternStart();
+    IfcCartesianPoint* PatternStart() const;
     void setPatternStart(IfcCartesianPoint* v);
     /// A plane angle measure determining the direction of the parallel hatching lines.
-    IfcPlaneAngleMeasure HatchLineAngle();
-    void setHatchLineAngle(IfcPlaneAngleMeasure v);
+    double HatchLineAngle() const;
+    void setHatchLineAngle(double v);
     virtual unsigned int getArgumentCount() const { return 5; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY; case 1: return IfcUtil::Argument_ENTITY; case 2: return IfcUtil::Argument_ENTITY; case 3: return IfcUtil::Argument_ENTITY; case 4: return IfcUtil::Argument_DOUBLE; } return IfcGeometricRepresentationItem::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcCurveStyle; case 1: return Type::IfcHatchLineDistanceSelect; case 2: return Type::IfcCartesianPoint; case 3: return Type::IfcCartesianPoint; case 4: return Type::IfcPlaneAngleMeasure; } return IfcGeometricRepresentationItem::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "HatchLineAppearance"; case 1: return "StartOfNextHatchLine"; case 2: return "PointOfReferenceHatchLine"; case 3: return "PatternStart"; case 4: return "HatchLineAngle"; } return IfcGeometricRepresentationItem::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcFillAreaStyleHatching (IfcAbstractEntityPtr e);
-    IfcFillAreaStyleHatching (IfcCurveStyle* v1_HatchLineAppearance, IfcHatchLineDistanceSelect v2_StartOfNextHatchLine, IfcCartesianPoint* v3_PointOfReferenceHatchLine, IfcCartesianPoint* v4_PatternStart, IfcPlaneAngleMeasure v5_HatchLineAngle);
-    typedef IfcFillAreaStyleHatching* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcFillAreaStyleHatching > > list;
-    typedef IfcTemplatedEntityList< IfcFillAreaStyleHatching >::it it;
+    IfcFillAreaStyleHatching (IfcAbstractEntity* e);
+    IfcFillAreaStyleHatching (IfcCurveStyle* v1_HatchLineAppearance, IfcHatchLineDistanceSelect* v2_StartOfNextHatchLine, IfcCartesianPoint* v3_PointOfReferenceHatchLine, IfcCartesianPoint* v4_PatternStart, double v5_HatchLineAngle);
+    typedef IfcTemplatedEntityList< IfcFillAreaStyleHatching > list;
 };
 /// Definition from ISO/CD 10303-46:1992: The fill area style tiles defines a two dimensional tile to be used for the filling of annotation fill areas or other closed regions. The content of a tile is defined by the tile set, and the placement of each tile determined by the filling pattern which indicates how to place tiles next to each other. Tiles or parts of tiles outside of the annotation fill area or closed region shall be clipped at the of the area or region. 
 /// 
@@ -20561,26 +21517,25 @@ class IfcFillAreaStyleHatching : public IfcGeometricRepresentationItem {
 class IfcFillAreaStyleTiles : public IfcGeometricRepresentationItem {
 public:
     /// A two direction repeat factor defining the shape and relative positioning of the tiles.
-    SHARED_PTR< IfcTemplatedEntityList< IfcVector > > TilingPattern();
-    void setTilingPattern(SHARED_PTR< IfcTemplatedEntityList< IfcVector > > v);
+    IfcTemplatedEntityList< IfcVector >::ptr TilingPattern() const;
+    void setTilingPattern(IfcTemplatedEntityList< IfcVector >::ptr v);
     /// A set of constituents of the tile.
-    SHARED_PTR< IfcTemplatedEntityList< IfcStyledItem > > Tiles();
-    void setTiles(SHARED_PTR< IfcTemplatedEntityList< IfcStyledItem > > v);
+    IfcTemplatedEntityList< IfcStyledItem >::ptr Tiles() const;
+    void setTiles(IfcTemplatedEntityList< IfcStyledItem >::ptr v);
     /// The scale factor applied to each tile as it is placed in the annotation fill area.
-    IfcPositiveRatioMeasure TilingScale();
-    void setTilingScale(IfcPositiveRatioMeasure v);
+    double TilingScale() const;
+    void setTilingScale(double v);
     virtual unsigned int getArgumentCount() const { return 3; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY_LIST; case 1: return IfcUtil::Argument_ENTITY_LIST; case 2: return IfcUtil::Argument_DOUBLE; } return IfcGeometricRepresentationItem::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcVector; case 1: return Type::IfcStyledItem; case 2: return Type::IfcPositiveRatioMeasure; } return IfcGeometricRepresentationItem::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "TilingPattern"; case 1: return "Tiles"; case 2: return "TilingScale"; } return IfcGeometricRepresentationItem::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcFillAreaStyleTiles (IfcAbstractEntityPtr e);
-    IfcFillAreaStyleTiles (SHARED_PTR< IfcTemplatedEntityList< IfcVector > > v1_TilingPattern, SHARED_PTR< IfcTemplatedEntityList< IfcStyledItem > > v2_Tiles, IfcPositiveRatioMeasure v3_TilingScale);
-    typedef IfcFillAreaStyleTiles* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcFillAreaStyleTiles > > list;
-    typedef IfcTemplatedEntityList< IfcFillAreaStyleTiles >::it it;
+    IfcFillAreaStyleTiles (IfcAbstractEntity* e);
+    IfcFillAreaStyleTiles (IfcTemplatedEntityList< IfcVector >::ptr v1_TilingPattern, IfcTemplatedEntityList< IfcStyledItem >::ptr v2_Tiles, double v3_TilingScale);
+    typedef IfcTemplatedEntityList< IfcFillAreaStyleTiles > list;
 };
 /// A fixed reference swept area solid is a type of swept area solid
 /// which is the result of sweeping a surface along a
@@ -20643,33 +21598,32 @@ class IfcFillAreaStyleTiles : public IfcGeometricRepresentationItem {
 class IfcFixedReferenceSweptAreaSolid : public IfcSweptAreaSolid {
 public:
     /// The curve used to define the sweeping operation. The solid is generated by sweeping the SELF\IfcSweptAreaSolid.SweptArea along the Directrix.
-    IfcCurve* Directrix();
+    IfcCurve* Directrix() const;
     void setDirectrix(IfcCurve* v);
     /// Whether the optional attribute StartParam is defined for this IfcFixedReferenceSweptAreaSolid
-    bool hasStartParam();
+    bool hasStartParam() const;
     /// The parameter value on the Directrix at which the sweeping operation commences. If no value is provided the start of the sweeping operation is at the start of the Directrix.
-    IfcParameterValue StartParam();
-    void setStartParam(IfcParameterValue v);
+    double StartParam() const;
+    void setStartParam(double v);
     /// Whether the optional attribute EndParam is defined for this IfcFixedReferenceSweptAreaSolid
-    bool hasEndParam();
+    bool hasEndParam() const;
     /// The parameter value on the Directrix at which the sweeping operation ends. If no value is provided the end of the sweeping operation is at the end of the Directrix.
-    IfcParameterValue EndParam();
-    void setEndParam(IfcParameterValue v);
+    double EndParam() const;
+    void setEndParam(double v);
     /// The direction providing the fixed axis1 (x-axis) direction for orienting the swept area during the sweeping operation along the Directrix.
-    IfcDirection* FixedReference();
+    IfcDirection* FixedReference() const;
     void setFixedReference(IfcDirection* v);
     virtual unsigned int getArgumentCount() const { return 6; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 2: return IfcUtil::Argument_ENTITY; case 3: return IfcUtil::Argument_DOUBLE; case 4: return IfcUtil::Argument_DOUBLE; case 5: return IfcUtil::Argument_ENTITY; } return IfcSweptAreaSolid::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 2: return Type::IfcCurve; case 3: return Type::IfcParameterValue; case 4: return Type::IfcParameterValue; case 5: return Type::IfcDirection; } return IfcSweptAreaSolid::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 2: return "Directrix"; case 3: return "StartParam"; case 4: return "EndParam"; case 5: return "FixedReference"; } return IfcSweptAreaSolid::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcFixedReferenceSweptAreaSolid (IfcAbstractEntityPtr e);
-    IfcFixedReferenceSweptAreaSolid (IfcProfileDef* v1_SweptArea, IfcAxis2Placement3D* v2_Position, IfcCurve* v3_Directrix, boost::optional< IfcParameterValue > v4_StartParam, boost::optional< IfcParameterValue > v5_EndParam, IfcDirection* v6_FixedReference);
-    typedef IfcFixedReferenceSweptAreaSolid* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcFixedReferenceSweptAreaSolid > > list;
-    typedef IfcTemplatedEntityList< IfcFixedReferenceSweptAreaSolid >::it it;
+    IfcFixedReferenceSweptAreaSolid (IfcAbstractEntity* e);
+    IfcFixedReferenceSweptAreaSolid (IfcProfileDef* v1_SweptArea, IfcAxis2Placement3D* v2_Position, IfcCurve* v3_Directrix, boost::optional< double > v4_StartParam, boost::optional< double > v5_EndParam, IfcDirection* v6_FixedReference);
+    typedef IfcTemplatedEntityList< IfcFixedReferenceSweptAreaSolid > list;
 };
 /// Definition from IAI: The
 /// IfcFurnishingElementType defines a list of commonly shared
@@ -20703,16 +21657,15 @@ class IfcFurnishingElementType : public IfcElementType {
 public:
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcElementType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcElementType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcElementType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcFurnishingElementType (IfcAbstractEntityPtr e);
-    IfcFurnishingElementType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType);
-    typedef IfcFurnishingElementType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcFurnishingElementType > > list;
-    typedef IfcTemplatedEntityList< IfcFurnishingElementType >::it it;
+    IfcFurnishingElementType (IfcAbstractEntity* e);
+    IfcFurnishingElementType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType);
+    typedef IfcTemplatedEntityList< IfcFurnishingElementType > list;
 };
 /// The furnishing element type IfcFurnitureType defines commonly shared information for occurrences of furnitures.  The set of shared information may include: 
 /// 
@@ -20754,24 +21707,23 @@ class IfcFurnishingElementType : public IfcElementType {
 class IfcFurnitureType : public IfcFurnishingElementType {
 public:
     /// A designation of where the assembly is intended to take place. A selection of alternatives s provided in an enumerated list.
-    IfcAssemblyPlaceEnum::IfcAssemblyPlaceEnum AssemblyPlace();
+    IfcAssemblyPlaceEnum::IfcAssemblyPlaceEnum AssemblyPlace() const;
     void setAssemblyPlace(IfcAssemblyPlaceEnum::IfcAssemblyPlaceEnum v);
     /// Whether the optional attribute PredefinedType is defined for this IfcFurnitureType
-    bool hasPredefinedType();
-    IfcFurnitureTypeEnum::IfcFurnitureTypeEnum PredefinedType();
+    bool hasPredefinedType() const;
+    IfcFurnitureTypeEnum::IfcFurnitureTypeEnum PredefinedType() const;
     void setPredefinedType(IfcFurnitureTypeEnum::IfcFurnitureTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 11; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; case 10: return IfcUtil::Argument_ENUMERATION; } return IfcFurnishingElementType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcAssemblyPlaceEnum; case 10: return Type::IfcFurnitureTypeEnum; } return IfcFurnishingElementType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "AssemblyPlace"; case 10: return "PredefinedType"; } return IfcFurnishingElementType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcFurnitureType (IfcAbstractEntityPtr e);
-    IfcFurnitureType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcAssemblyPlaceEnum::IfcAssemblyPlaceEnum v10_AssemblyPlace, boost::optional< IfcFurnitureTypeEnum::IfcFurnitureTypeEnum > v11_PredefinedType);
-    typedef IfcFurnitureType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcFurnitureType > > list;
-    typedef IfcTemplatedEntityList< IfcFurnitureType >::it it;
+    IfcFurnitureType (IfcAbstractEntity* e);
+    IfcFurnitureType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcAssemblyPlaceEnum::IfcAssemblyPlaceEnum v10_AssemblyPlace, boost::optional< IfcFurnitureTypeEnum::IfcFurnitureTypeEnum > v11_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcFurnitureType > list;
 };
 /// Definition from IAI: An
 ///   IfcGeographicElementType is used to define an
@@ -20837,20 +21789,19 @@ class IfcFurnitureType : public IfcFurnishingElementType {
 class IfcGeographicElementType : public IfcElementType {
 public:
     /// Predefined types to define the particular type of the geographic element. There may be property set definitions available for each predefined type.
-    IfcGeographicElementTypeEnum::IfcGeographicElementTypeEnum PredefinedType();
+    IfcGeographicElementTypeEnum::IfcGeographicElementTypeEnum PredefinedType() const;
     void setPredefinedType(IfcGeographicElementTypeEnum::IfcGeographicElementTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcElementType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcGeographicElementTypeEnum; } return IfcElementType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcElementType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcGeographicElementType (IfcAbstractEntityPtr e);
-    IfcGeographicElementType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcGeographicElementTypeEnum::IfcGeographicElementTypeEnum v10_PredefinedType);
-    typedef IfcGeographicElementType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcGeographicElementType > > list;
-    typedef IfcTemplatedEntityList< IfcGeographicElementType >::it it;
+    IfcGeographicElementType (IfcAbstractEntity* e);
+    IfcGeographicElementType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcGeographicElementTypeEnum::IfcGeographicElementTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcGeographicElementType > list;
 };
 /// Definition from ISO/CD 10303-42:1992: A geometric curve set is a collection of two or three dimensional points and curves.
 /// 
@@ -20863,16 +21814,15 @@ class IfcGeometricCurveSet : public IfcGeometricSet {
 public:
     virtual unsigned int getArgumentCount() const { return 1; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcGeometricSet::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcGeometricSet::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcGeometricSet::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcGeometricCurveSet (IfcAbstractEntityPtr e);
-    IfcGeometricCurveSet (IfcEntities v1_Elements);
-    typedef IfcGeometricCurveSet* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcGeometricCurveSet > > list;
-    typedef IfcTemplatedEntityList< IfcGeometricCurveSet >::it it;
+    IfcGeometricCurveSet (IfcAbstractEntity* e);
+    IfcGeometricCurveSet (IfcEntityList::ptr v1_Elements);
+    typedef IfcTemplatedEntityList< IfcGeometricCurveSet > list;
 };
 /// IfcIShapeProfileDef
 /// defines a section profile that provides the defining parameters of a
@@ -20940,42 +21890,41 @@ class IfcGeometricCurveSet : public IfcGeometricSet {
 class IfcIShapeProfileDef : public IfcParameterizedProfileDef {
 public:
     /// Total extent of the width, defined parallel to the x axis of the position coordinate system.
-    IfcPositiveLengthMeasure OverallWidth();
-    void setOverallWidth(IfcPositiveLengthMeasure v);
+    double OverallWidth() const;
+    void setOverallWidth(double v);
     /// Total extent of the depth, defined parallel to the y axis of the position coordinate system.
-    IfcPositiveLengthMeasure OverallDepth();
-    void setOverallDepth(IfcPositiveLengthMeasure v);
+    double OverallDepth() const;
+    void setOverallDepth(double v);
     /// Thickness of the web of the I-shape. The web is centred on the x-axis and the y-axis of the position coordinate system.
-    IfcPositiveLengthMeasure WebThickness();
-    void setWebThickness(IfcPositiveLengthMeasure v);
+    double WebThickness() const;
+    void setWebThickness(double v);
     /// Flange thickness of the I-shape. Both, the upper and the lower flanges have the same thickness and they are centred on the y-axis of the position coordinate system.
-    IfcPositiveLengthMeasure FlangeThickness();
-    void setFlangeThickness(IfcPositiveLengthMeasure v);
+    double FlangeThickness() const;
+    void setFlangeThickness(double v);
     /// Whether the optional attribute FilletRadius is defined for this IfcIShapeProfileDef
-    bool hasFilletRadius();
+    bool hasFilletRadius() const;
     /// The fillet between the web and the flange.
-    IfcNonNegativeLengthMeasure FilletRadius();
-    void setFilletRadius(IfcNonNegativeLengthMeasure v);
+    double FilletRadius() const;
+    void setFilletRadius(double v);
     /// Whether the optional attribute FlangeEdgeRadius is defined for this IfcIShapeProfileDef
-    bool hasFlangeEdgeRadius();
-    IfcNonNegativeLengthMeasure FlangeEdgeRadius();
-    void setFlangeEdgeRadius(IfcNonNegativeLengthMeasure v);
+    bool hasFlangeEdgeRadius() const;
+    double FlangeEdgeRadius() const;
+    void setFlangeEdgeRadius(double v);
     /// Whether the optional attribute FlangeSlope is defined for this IfcIShapeProfileDef
-    bool hasFlangeSlope();
-    IfcPlaneAngleMeasure FlangeSlope();
-    void setFlangeSlope(IfcPlaneAngleMeasure v);
+    bool hasFlangeSlope() const;
+    double FlangeSlope() const;
+    void setFlangeSlope(double v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 3: return IfcUtil::Argument_DOUBLE; case 4: return IfcUtil::Argument_DOUBLE; case 5: return IfcUtil::Argument_DOUBLE; case 6: return IfcUtil::Argument_DOUBLE; case 7: return IfcUtil::Argument_DOUBLE; case 8: return IfcUtil::Argument_DOUBLE; case 9: return IfcUtil::Argument_DOUBLE; } return IfcParameterizedProfileDef::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 3: return Type::IfcPositiveLengthMeasure; case 4: return Type::IfcPositiveLengthMeasure; case 5: return Type::IfcPositiveLengthMeasure; case 6: return Type::IfcPositiveLengthMeasure; case 7: return Type::IfcNonNegativeLengthMeasure; case 8: return Type::IfcNonNegativeLengthMeasure; case 9: return Type::IfcPlaneAngleMeasure; } return IfcParameterizedProfileDef::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 3: return "OverallWidth"; case 4: return "OverallDepth"; case 5: return "WebThickness"; case 6: return "FlangeThickness"; case 7: return "FilletRadius"; case 8: return "FlangeEdgeRadius"; case 9: return "FlangeSlope"; } return IfcParameterizedProfileDef::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcIShapeProfileDef (IfcAbstractEntityPtr e);
-    IfcIShapeProfileDef (IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< IfcLabel > v2_ProfileName, IfcAxis2Placement2D* v3_Position, IfcPositiveLengthMeasure v4_OverallWidth, IfcPositiveLengthMeasure v5_OverallDepth, IfcPositiveLengthMeasure v6_WebThickness, IfcPositiveLengthMeasure v7_FlangeThickness, boost::optional< IfcNonNegativeLengthMeasure > v8_FilletRadius, boost::optional< IfcNonNegativeLengthMeasure > v9_FlangeEdgeRadius, boost::optional< IfcPlaneAngleMeasure > v10_FlangeSlope);
-    typedef IfcIShapeProfileDef* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcIShapeProfileDef > > list;
-    typedef IfcTemplatedEntityList< IfcIShapeProfileDef >::it it;
+    IfcIShapeProfileDef (IfcAbstractEntity* e);
+    IfcIShapeProfileDef (IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< std::string > v2_ProfileName, IfcAxis2Placement2D* v3_Position, double v4_OverallWidth, double v5_OverallDepth, double v6_WebThickness, double v7_FlangeThickness, boost::optional< double > v8_FilletRadius, boost::optional< double > v9_FlangeEdgeRadius, boost::optional< double > v10_FlangeSlope);
+    typedef IfcTemplatedEntityList< IfcIShapeProfileDef > list;
 };
 /// IfcLShapeProfileDef
 /// defines a section profile that provides the defining parameters of an
@@ -21031,43 +21980,42 @@ class IfcIShapeProfileDef : public IfcParameterizedProfileDef {
 class IfcLShapeProfileDef : public IfcParameterizedProfileDef {
 public:
     /// Leg length, see illustration above (= h). Same as the overall depth.
-    IfcPositiveLengthMeasure Depth();
-    void setDepth(IfcPositiveLengthMeasure v);
+    double Depth() const;
+    void setDepth(double v);
     /// Whether the optional attribute Width is defined for this IfcLShapeProfileDef
-    bool hasWidth();
+    bool hasWidth() const;
     /// Leg length, see illustration above (= b). Same as the overall width.
-    IfcPositiveLengthMeasure Width();
-    void setWidth(IfcPositiveLengthMeasure v);
+    double Width() const;
+    void setWidth(double v);
     /// Constant wall thickness of profile, see illustration above (= ts).
-    IfcPositiveLengthMeasure Thickness();
-    void setThickness(IfcPositiveLengthMeasure v);
+    double Thickness() const;
+    void setThickness(double v);
     /// Whether the optional attribute FilletRadius is defined for this IfcLShapeProfileDef
-    bool hasFilletRadius();
+    bool hasFilletRadius() const;
     /// Fillet radius according the above illustration (= r1).
-    IfcNonNegativeLengthMeasure FilletRadius();
-    void setFilletRadius(IfcNonNegativeLengthMeasure v);
+    double FilletRadius() const;
+    void setFilletRadius(double v);
     /// Whether the optional attribute EdgeRadius is defined for this IfcLShapeProfileDef
-    bool hasEdgeRadius();
+    bool hasEdgeRadius() const;
     /// Edge radius according the above illustration (= r2).
-    IfcNonNegativeLengthMeasure EdgeRadius();
-    void setEdgeRadius(IfcNonNegativeLengthMeasure v);
+    double EdgeRadius() const;
+    void setEdgeRadius(double v);
     /// Whether the optional attribute LegSlope is defined for this IfcLShapeProfileDef
-    bool hasLegSlope();
+    bool hasLegSlope() const;
     /// Slope of the inner face of each leg of the profile.
-    IfcPlaneAngleMeasure LegSlope();
-    void setLegSlope(IfcPlaneAngleMeasure v);
+    double LegSlope() const;
+    void setLegSlope(double v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 3: return IfcUtil::Argument_DOUBLE; case 4: return IfcUtil::Argument_DOUBLE; case 5: return IfcUtil::Argument_DOUBLE; case 6: return IfcUtil::Argument_DOUBLE; case 7: return IfcUtil::Argument_DOUBLE; case 8: return IfcUtil::Argument_DOUBLE; } return IfcParameterizedProfileDef::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 3: return Type::IfcPositiveLengthMeasure; case 4: return Type::IfcPositiveLengthMeasure; case 5: return Type::IfcPositiveLengthMeasure; case 6: return Type::IfcNonNegativeLengthMeasure; case 7: return Type::IfcNonNegativeLengthMeasure; case 8: return Type::IfcPlaneAngleMeasure; } return IfcParameterizedProfileDef::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 3: return "Depth"; case 4: return "Width"; case 5: return "Thickness"; case 6: return "FilletRadius"; case 7: return "EdgeRadius"; case 8: return "LegSlope"; } return IfcParameterizedProfileDef::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcLShapeProfileDef (IfcAbstractEntityPtr e);
-    IfcLShapeProfileDef (IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< IfcLabel > v2_ProfileName, IfcAxis2Placement2D* v3_Position, IfcPositiveLengthMeasure v4_Depth, boost::optional< IfcPositiveLengthMeasure > v5_Width, IfcPositiveLengthMeasure v6_Thickness, boost::optional< IfcNonNegativeLengthMeasure > v7_FilletRadius, boost::optional< IfcNonNegativeLengthMeasure > v8_EdgeRadius, boost::optional< IfcPlaneAngleMeasure > v9_LegSlope);
-    typedef IfcLShapeProfileDef* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcLShapeProfileDef > > list;
-    typedef IfcTemplatedEntityList< IfcLShapeProfileDef >::it it;
+    IfcLShapeProfileDef (IfcAbstractEntity* e);
+    IfcLShapeProfileDef (IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< std::string > v2_ProfileName, IfcAxis2Placement2D* v3_Position, double v4_Depth, boost::optional< double > v5_Width, double v6_Thickness, boost::optional< double > v7_FilletRadius, boost::optional< double > v8_EdgeRadius, boost::optional< double > v9_LegSlope);
+    typedef IfcTemplatedEntityList< IfcLShapeProfileDef > list;
 };
 /// The resource type IfcLaborResourceType defines commonly shared information for occurrences of labor resources. The set of shared information may include:
 /// 
@@ -21083,20 +22031,19 @@ class IfcLShapeProfileDef : public IfcParameterizedProfileDef {
 class IfcLaborResourceType : public IfcConstructionResourceType {
 public:
     /// Defines types of labor resources.
-    IfcLaborResourceTypeEnum::IfcLaborResourceTypeEnum PredefinedType();
+    IfcLaborResourceTypeEnum::IfcLaborResourceTypeEnum PredefinedType() const;
     void setPredefinedType(IfcLaborResourceTypeEnum::IfcLaborResourceTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 12; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 11: return IfcUtil::Argument_ENUMERATION; } return IfcConstructionResourceType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 11: return Type::IfcLaborResourceTypeEnum; } return IfcConstructionResourceType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 11: return "PredefinedType"; } return IfcConstructionResourceType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcLaborResourceType (IfcAbstractEntityPtr e);
-    IfcLaborResourceType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< IfcIdentifier > v7_Identification, boost::optional< IfcText > v8_LongDescription, boost::optional< IfcLabel > v9_ResourceType, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcAppliedValue > > > v10_BaseCosts, IfcPhysicalQuantity* v11_BaseQuantity, IfcLaborResourceTypeEnum::IfcLaborResourceTypeEnum v12_PredefinedType);
-    typedef IfcLaborResourceType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcLaborResourceType > > list;
-    typedef IfcTemplatedEntityList< IfcLaborResourceType >::it it;
+    IfcLaborResourceType (IfcAbstractEntity* e);
+    IfcLaborResourceType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< std::string > v7_Identification, boost::optional< std::string > v8_LongDescription, boost::optional< std::string > v9_ResourceType, boost::optional< IfcTemplatedEntityList< IfcAppliedValue >::ptr > v10_BaseCosts, IfcPhysicalQuantity* v11_BaseQuantity, IfcLaborResourceTypeEnum::IfcLaborResourceTypeEnum v12_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcLaborResourceType > list;
 };
 /// Definition from ISO/CD 10303-42:1992: A line is an unbounded curve with constant tangent direction. A line is defined by a point and a direction. The positive direction of the line is in the direction of the Dir vector. The line is parameterized as follows:
 /// 
@@ -21114,23 +22061,22 @@ class IfcLaborResourceType : public IfcConstructionResourceType {
 class IfcLine : public IfcCurve {
 public:
     /// The location of the line.
-    IfcCartesianPoint* Pnt();
+    IfcCartesianPoint* Pnt() const;
     void setPnt(IfcCartesianPoint* v);
     /// The direction of the line, the magnitude and units of Dir affect the parameterization of the line.
-    IfcVector* Dir();
+    IfcVector* Dir() const;
     void setDir(IfcVector* v);
     virtual unsigned int getArgumentCount() const { return 2; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY; case 1: return IfcUtil::Argument_ENTITY; } return IfcCurve::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcCartesianPoint; case 1: return Type::IfcVector; } return IfcCurve::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Pnt"; case 1: return "Dir"; } return IfcCurve::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcLine (IfcAbstractEntityPtr e);
+    IfcLine (IfcAbstractEntity* e);
     IfcLine (IfcCartesianPoint* v1_Pnt, IfcVector* v2_Dir);
-    typedef IfcLine* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcLine > > list;
-    typedef IfcTemplatedEntityList< IfcLine >::it it;
+    typedef IfcTemplatedEntityList< IfcLine > list;
 };
 /// Definition from ISO/CD 10303-42:1992: A manifold solid
 /// B-rep is a finite, arcwise connected volume bounded by one or
@@ -21198,20 +22144,19 @@ class IfcLine : public IfcCurve {
 class IfcManifoldSolidBrep : public IfcSolidModel {
 public:
     /// A closed shell defining the exterior boundary of the solid. The shell normal shall point away from the interior of the solid.
-    IfcClosedShell* Outer();
+    IfcClosedShell* Outer() const;
     void setOuter(IfcClosedShell* v);
     virtual unsigned int getArgumentCount() const { return 1; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY; } return IfcSolidModel::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcClosedShell; } return IfcSolidModel::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Outer"; } return IfcSolidModel::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcManifoldSolidBrep (IfcAbstractEntityPtr e);
+    IfcManifoldSolidBrep (IfcAbstractEntity* e);
     IfcManifoldSolidBrep (IfcClosedShell* v1_Outer);
-    typedef IfcManifoldSolidBrep* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcManifoldSolidBrep > > list;
-    typedef IfcTemplatedEntityList< IfcManifoldSolidBrep >::it it;
+    typedef IfcTemplatedEntityList< IfcManifoldSolidBrep > list;
 };
 /// An IfcObject is the
 /// generalization of any semantically treated thing or process.
@@ -21298,26 +22243,25 @@ class IfcManifoldSolidBrep : public IfcSolidModel {
 class IfcObject : public IfcObjectDefinition {
 public:
     /// Whether the optional attribute ObjectType is defined for this IfcObject
-    bool hasObjectType();
+    bool hasObjectType() const;
     /// The type denotes a particular type that indicates the object further. The use has to be established at the level of instantiable subtypes. In particular it holds the user defined type, if the enumeration of the attribute PredefinedType is set to USERDEFINED.
-    IfcLabel ObjectType();
-    void setObjectType(IfcLabel v);
+    std::string ObjectType() const;
+    void setObjectType(std::string v);
     virtual unsigned int getArgumentCount() const { return 5; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 4: return IfcUtil::Argument_STRING; } return IfcObjectDefinition::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 4: return Type::IfcLabel; } return IfcObjectDefinition::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 4: return "ObjectType"; } return IfcObjectDefinition::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelDefinesByObject > > IsDeclaredBy(); // INVERSE IfcRelDefinesByObject::RelatedObjects
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelDefinesByObject > > Declares(); // INVERSE IfcRelDefinesByObject::RelatingObject
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelDefinesByType > > IsTypedBy(); // INVERSE IfcRelDefinesByType::RelatedObjects
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelDefinesByProperties > > IsDefinedBy(); // INVERSE IfcRelDefinesByProperties::RelatedObjects
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcRelDefinesByObject >::ptr IsDeclaredBy() const; // INVERSE IfcRelDefinesByObject::RelatedObjects
+    IfcTemplatedEntityList< IfcRelDefinesByObject >::ptr Declares() const; // INVERSE IfcRelDefinesByObject::RelatingObject
+    IfcTemplatedEntityList< IfcRelDefinesByType >::ptr IsTypedBy() const; // INVERSE IfcRelDefinesByType::RelatedObjects
+    IfcTemplatedEntityList< IfcRelDefinesByProperties >::ptr IsDefinedBy() const; // INVERSE IfcRelDefinesByProperties::RelatedObjects
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcObject (IfcAbstractEntityPtr e);
-    IfcObject (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType);
-    typedef IfcObject* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcObject > > list;
-    typedef IfcTemplatedEntityList< IfcObject >::it it;
+    IfcObject (IfcAbstractEntity* e);
+    IfcObject (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType);
+    typedef IfcTemplatedEntityList< IfcObject > list;
 };
 /// Definition from ISO/CD 10303-42:1992: An offset curve 2d (IfcOffsetCurve2d) is a curve at a constant distance from a basis curve in two-dimensional space. This entity defines a simple plane-offset curve by offsetting by distance along the normal to basis curve in the plane of basis curve. The underlying curve shall have a well-defined tangent direction at every point. In the case of a composite curve, the transition code between each segment shall be cont same gradient or cont same gradient same curvature. 
 /// 
@@ -21333,26 +22277,25 @@ class IfcObject : public IfcObjectDefinition {
 class IfcOffsetCurve2D : public IfcCurve {
 public:
     /// The curve that is being offset.
-    IfcCurve* BasisCurve();
+    IfcCurve* BasisCurve() const;
     void setBasisCurve(IfcCurve* v);
     /// The distance of the offset curve from the basis curve. distance may be positive, negative or zero. A positive value of distance defines an offset in the direction which is normal to the curve in the sense of an anti-clockwise rotation through 90 degrees from the tangent vector T at the given point. (This is in the direction of orthogonal complement(T).)
-    IfcLengthMeasure Distance();
-    void setDistance(IfcLengthMeasure v);
+    double Distance() const;
+    void setDistance(double v);
     /// An indication of whether the offset curve self-intersects; this is for information only.
-    bool SelfIntersect();
+    bool SelfIntersect() const;
     void setSelfIntersect(bool v);
     virtual unsigned int getArgumentCount() const { return 3; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY; case 1: return IfcUtil::Argument_DOUBLE; case 2: return IfcUtil::Argument_BOOL; } return IfcCurve::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcCurve; case 1: return Type::IfcLengthMeasure; case 2: return Type::UNDEFINED; } return IfcCurve::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "BasisCurve"; case 1: return "Distance"; case 2: return "SelfIntersect"; } return IfcCurve::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcOffsetCurve2D (IfcAbstractEntityPtr e);
-    IfcOffsetCurve2D (IfcCurve* v1_BasisCurve, IfcLengthMeasure v2_Distance, bool v3_SelfIntersect);
-    typedef IfcOffsetCurve2D* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcOffsetCurve2D > > list;
-    typedef IfcTemplatedEntityList< IfcOffsetCurve2D >::it it;
+    IfcOffsetCurve2D (IfcAbstractEntity* e);
+    IfcOffsetCurve2D (IfcCurve* v1_BasisCurve, double v2_Distance, bool v3_SelfIntersect);
+    typedef IfcTemplatedEntityList< IfcOffsetCurve2D > list;
 };
 /// Definition from ISO/CD 10303-42:1992: An offset curve 3d is a curve at a constant distance from a basis curve in three-dimensional space. The underlying curve shall have a well-defined tangent direction at every point. In the case of a composite curve the transition code between each segment shall be cont same gradient or cont same gradient same curvature. The offset curve at any point (parameter) on the basis curve is in the direction V x T where V is the fixed reference direction and T is the unit tangent to the basis curve. For the offset direction to be well defined, T shall not at any point of the curve be in the same, or opposite, direction as V. 
 /// 
@@ -21372,49 +22315,47 @@ class IfcOffsetCurve2D : public IfcCurve {
 class IfcOffsetCurve3D : public IfcCurve {
 public:
     /// The curve that is being offset.
-    IfcCurve* BasisCurve();
+    IfcCurve* BasisCurve() const;
     void setBasisCurve(IfcCurve* v);
     /// The distance of the offset curve from the basis curve. The distance may be positive, negative or zero.
-    IfcLengthMeasure Distance();
-    void setDistance(IfcLengthMeasure v);
+    double Distance() const;
+    void setDistance(double v);
     /// An indication of whether the offset curve self-intersects, this is for information only.
-    bool SelfIntersect();
+    bool SelfIntersect() const;
     void setSelfIntersect(bool v);
     /// The direction used to define the direction of the offset curve 3d from the basis curve.
-    IfcDirection* RefDirection();
+    IfcDirection* RefDirection() const;
     void setRefDirection(IfcDirection* v);
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY; case 1: return IfcUtil::Argument_DOUBLE; case 2: return IfcUtil::Argument_BOOL; case 3: return IfcUtil::Argument_ENTITY; } return IfcCurve::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcCurve; case 1: return Type::IfcLengthMeasure; case 2: return Type::UNDEFINED; case 3: return Type::IfcDirection; } return IfcCurve::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "BasisCurve"; case 1: return "Distance"; case 2: return "SelfIntersect"; case 3: return "RefDirection"; } return IfcCurve::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcOffsetCurve3D (IfcAbstractEntityPtr e);
-    IfcOffsetCurve3D (IfcCurve* v1_BasisCurve, IfcLengthMeasure v2_Distance, bool v3_SelfIntersect, IfcDirection* v4_RefDirection);
-    typedef IfcOffsetCurve3D* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcOffsetCurve3D > > list;
-    typedef IfcTemplatedEntityList< IfcOffsetCurve3D >::it it;
+    IfcOffsetCurve3D (IfcAbstractEntity* e);
+    IfcOffsetCurve3D (IfcCurve* v1_BasisCurve, double v2_Distance, bool v3_SelfIntersect, IfcDirection* v4_RefDirection);
+    typedef IfcTemplatedEntityList< IfcOffsetCurve3D > list;
 };
 
 class IfcPcurve : public IfcCurve {
 public:
-    IfcSurface* BasisSurface();
+    IfcSurface* BasisSurface() const;
     void setBasisSurface(IfcSurface* v);
-    IfcCurve* ReferenceCurve();
+    IfcCurve* ReferenceCurve() const;
     void setReferenceCurve(IfcCurve* v);
     virtual unsigned int getArgumentCount() const { return 2; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY; case 1: return IfcUtil::Argument_ENTITY; } return IfcCurve::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcSurface; case 1: return Type::IfcCurve; } return IfcCurve::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "BasisSurface"; case 1: return "ReferenceCurve"; } return IfcCurve::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcPcurve (IfcAbstractEntityPtr e);
+    IfcPcurve (IfcAbstractEntity* e);
     IfcPcurve (IfcSurface* v1_BasisSurface, IfcCurve* v2_ReferenceCurve);
-    typedef IfcPcurve* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcPcurve > > list;
-    typedef IfcTemplatedEntityList< IfcPcurve >::it it;
+    typedef IfcTemplatedEntityList< IfcPcurve > list;
 };
 /// Definition from ISO/CD 10303-46:1992: A planar box specifies an arbitrary rectangular box and its location in a two dimensional Cartesian coordinate system.
 /// 
@@ -21426,20 +22367,19 @@ class IfcPlanarBox : public IfcPlanarExtent {
 public:
     /// The IfcAxis2Placement positions a local coordinate system for the definition of the rectangle. The origin of this local coordinate system serves as the lower left corner of the rectangular box.
     ///   NOTE  In case of a 3D placement by IfcAxisPlacement3D the IfcPlanarBox is defined within the xy plane of the definition coordinate system.
-    IfcAxis2Placement Placement();
-    void setPlacement(IfcAxis2Placement v);
+    IfcAxis2Placement* Placement() const;
+    void setPlacement(IfcAxis2Placement* v);
     virtual unsigned int getArgumentCount() const { return 3; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 2: return IfcUtil::Argument_ENTITY; } return IfcPlanarExtent::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 2: return Type::IfcAxis2Placement; } return IfcPlanarExtent::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 2: return "Placement"; } return IfcPlanarExtent::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcPlanarBox (IfcAbstractEntityPtr e);
-    IfcPlanarBox (IfcLengthMeasure v1_SizeInX, IfcLengthMeasure v2_SizeInY, IfcAxis2Placement v3_Placement);
-    typedef IfcPlanarBox* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcPlanarBox > > list;
-    typedef IfcTemplatedEntityList< IfcPlanarBox >::it it;
+    IfcPlanarBox (IfcAbstractEntity* e);
+    IfcPlanarBox (double v1_SizeInX, double v2_SizeInY, IfcAxis2Placement* v3_Placement);
+    typedef IfcTemplatedEntityList< IfcPlanarBox > list;
 };
 /// Definition from ISO/CD 10303-42:1992: A plane is an unbounded surface with a constant normal. A plane is defined by a point on the plane and the normal direction to the plane. The data is to be interpreted as follows:
 /// 
@@ -21481,16 +22421,15 @@ class IfcPlane : public IfcElementarySurface {
 public:
     virtual unsigned int getArgumentCount() const { return 1; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcElementarySurface::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcElementarySurface::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcElementarySurface::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcPlane (IfcAbstractEntityPtr e);
+    IfcPlane (IfcAbstractEntity* e);
     IfcPlane (IfcAxis2Placement3D* v1_Position);
-    typedef IfcPlane* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcPlane > > list;
-    typedef IfcTemplatedEntityList< IfcPlane >::it it;
+    typedef IfcTemplatedEntityList< IfcPlane > list;
 };
 /// The pre defined colour determines those qualified names which can be used to identify a colour that is in scope of the current data exchange specification (in contrary to colour specification which defines the colour directly by its colour components).
 /// 
@@ -21501,16 +22440,15 @@ class IfcPreDefinedColour : public IfcPreDefinedItem {
 public:
     virtual unsigned int getArgumentCount() const { return 1; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcPreDefinedItem::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcPreDefinedItem::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcPreDefinedItem::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcPreDefinedColour (IfcAbstractEntityPtr e);
-    IfcPreDefinedColour (IfcLabel v1_Name);
-    typedef IfcPreDefinedColour* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcPreDefinedColour > > list;
-    typedef IfcTemplatedEntityList< IfcPreDefinedColour >::it it;
+    IfcPreDefinedColour (IfcAbstractEntity* e);
+    IfcPreDefinedColour (std::string v1_Name);
+    typedef IfcTemplatedEntityList< IfcPreDefinedColour > list;
 };
 /// Definition from ISO/CD 10303-46:1992: The predefined curve font type is an abstract supertype provided to define an application specific curve font. The name label shall be constrained in the application protocol to values that are given specific meaning for curve fonts in that application protocol.
 /// 
@@ -21523,16 +22461,15 @@ class IfcPreDefinedCurveFont : public IfcPreDefinedItem {
 public:
     virtual unsigned int getArgumentCount() const { return 1; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcPreDefinedItem::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcPreDefinedItem::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcPreDefinedItem::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcPreDefinedCurveFont (IfcAbstractEntityPtr e);
-    IfcPreDefinedCurveFont (IfcLabel v1_Name);
-    typedef IfcPreDefinedCurveFont* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcPreDefinedCurveFont > > list;
-    typedef IfcTemplatedEntityList< IfcPreDefinedCurveFont >::it it;
+    IfcPreDefinedCurveFont (IfcAbstractEntity* e);
+    IfcPreDefinedCurveFont (std::string v1_Name);
+    typedef IfcTemplatedEntityList< IfcPreDefinedCurveFont > list;
 };
 /// IfcPreDefinedPropertySet
 /// is a generalization of all statically defined property sets that
@@ -21558,16 +22495,15 @@ class IfcPreDefinedPropertySet : public IfcPropertySetDefinition {
 public:
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcPropertySetDefinition::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcPropertySetDefinition::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcPropertySetDefinition::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcPreDefinedPropertySet (IfcAbstractEntityPtr e);
-    IfcPreDefinedPropertySet (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description);
-    typedef IfcPreDefinedPropertySet* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcPreDefinedPropertySet > > list;
-    typedef IfcTemplatedEntityList< IfcPreDefinedPropertySet >::it it;
+    IfcPreDefinedPropertySet (IfcAbstractEntity* e);
+    IfcPreDefinedPropertySet (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description);
+    typedef IfcTemplatedEntityList< IfcPreDefinedPropertySet > list;
 };
 /// An IfcProcedureType defines a particular type of procedure that may be specified.
 /// 
@@ -21586,20 +22522,19 @@ class IfcProcedureType : public IfcTypeProcess {
 public:
     /// Identifies the predefined types of a procedure from which 
     ///   the type required may be set.
-    IfcProcedureTypeEnum::IfcProcedureTypeEnum PredefinedType();
+    IfcProcedureTypeEnum::IfcProcedureTypeEnum PredefinedType() const;
     void setPredefinedType(IfcProcedureTypeEnum::IfcProcedureTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcTypeProcess::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcProcedureTypeEnum; } return IfcTypeProcess::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcTypeProcess::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcProcedureType (IfcAbstractEntityPtr e);
-    IfcProcedureType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< IfcIdentifier > v7_Identification, boost::optional< IfcText > v8_LongDescription, boost::optional< IfcLabel > v9_ProcessType, IfcProcedureTypeEnum::IfcProcedureTypeEnum v10_PredefinedType);
-    typedef IfcProcedureType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcProcedureType > > list;
-    typedef IfcTemplatedEntityList< IfcProcedureType >::it it;
+    IfcProcedureType (IfcAbstractEntity* e);
+    IfcProcedureType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< std::string > v7_Identification, boost::optional< std::string > v8_LongDescription, boost::optional< std::string > v9_ProcessType, IfcProcedureTypeEnum::IfcProcedureTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcProcedureType > list;
 };
 /// Definition from ISO9000: A process is a set of
 /// activities that are interrelated or that interact with one
@@ -21644,35 +22579,34 @@ class IfcProcedureType : public IfcTypeProcess {
 class IfcProcess : public IfcObject {
 public:
     /// Whether the optional attribute Identification is defined for this IfcProcess
-    bool hasIdentification();
+    bool hasIdentification() const;
     /// An identifying designation given to a process or activity.
     ///   It is the identifier at the occurrence level. 
     /// 
     /// IFC2x4 CHANGE  Attribute promoted from subtypes.
-    IfcIdentifier Identification();
-    void setIdentification(IfcIdentifier v);
+    std::string Identification() const;
+    void setIdentification(std::string v);
     /// Whether the optional attribute LongDescription is defined for this IfcProcess
-    bool hasLongDescription();
+    bool hasLongDescription() const;
     /// An extended description or narrative that may be provided.
     /// 
     /// IFC2x4 CHANGE  New attribute.
-    IfcText LongDescription();
-    void setLongDescription(IfcText v);
+    std::string LongDescription() const;
+    void setLongDescription(std::string v);
     virtual unsigned int getArgumentCount() const { return 7; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 5: return IfcUtil::Argument_STRING; case 6: return IfcUtil::Argument_STRING; } return IfcObject::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 5: return Type::IfcIdentifier; case 6: return Type::IfcText; } return IfcObject::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 5: return "Identification"; case 6: return "LongDescription"; } return IfcObject::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelSequence > > IsPredecessorTo(); // INVERSE IfcRelSequence::RelatingProcess
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelSequence > > IsSuccessorFrom(); // INVERSE IfcRelSequence::RelatedProcess
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelAssignsToProcess > > OperatesOn(); // INVERSE IfcRelAssignsToProcess::RelatingProcess
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcRelSequence >::ptr IsPredecessorTo() const; // INVERSE IfcRelSequence::RelatingProcess
+    IfcTemplatedEntityList< IfcRelSequence >::ptr IsSuccessorFrom() const; // INVERSE IfcRelSequence::RelatedProcess
+    IfcTemplatedEntityList< IfcRelAssignsToProcess >::ptr OperatesOn() const; // INVERSE IfcRelAssignsToProcess::RelatingProcess
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcProcess (IfcAbstractEntityPtr e);
-    IfcProcess (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, boost::optional< IfcIdentifier > v6_Identification, boost::optional< IfcText > v7_LongDescription);
-    typedef IfcProcess* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcProcess > > list;
-    typedef IfcTemplatedEntityList< IfcProcess >::it it;
+    IfcProcess (IfcAbstractEntity* e);
+    IfcProcess (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, boost::optional< std::string > v6_Identification, boost::optional< std::string > v7_LongDescription);
+    typedef IfcTemplatedEntityList< IfcProcess > list;
 };
 /// Any object that relates to a
 /// geometric or spatial context. Subtypes of IfcProduct
@@ -21768,28 +22702,27 @@ class IfcProcess : public IfcObject {
 class IfcProduct : public IfcObject {
 public:
     /// Whether the optional attribute ObjectPlacement is defined for this IfcProduct
-    bool hasObjectPlacement();
+    bool hasObjectPlacement() const;
     /// Placement of the product in space, the placement can either be absolute (relative to the world coordinate system), relative (relative to the object placement of another product), or constraint (e.g. relative to grid axes). It is determined by the various subtypes of IfcObjectPlacement, which includes the axis placement information to determine the  transformation for the object coordinate system.
-    IfcObjectPlacement* ObjectPlacement();
+    IfcObjectPlacement* ObjectPlacement() const;
     void setObjectPlacement(IfcObjectPlacement* v);
     /// Whether the optional attribute Representation is defined for this IfcProduct
-    bool hasRepresentation();
+    bool hasRepresentation() const;
     /// Reference to the representations of the product, being either a representation (IfcProductRepresentation) or as a special case a shape representations (IfcProductDefinitionShape). The product definition shape provides for multiple geometric representations of the shape property of the object within the same object coordinate system, defined by the object placement.
-    IfcProductRepresentation* Representation();
+    IfcProductRepresentation* Representation() const;
     void setRepresentation(IfcProductRepresentation* v);
     virtual unsigned int getArgumentCount() const { return 7; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 5: return IfcUtil::Argument_ENTITY; case 6: return IfcUtil::Argument_ENTITY; } return IfcObject::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 5: return Type::IfcObjectPlacement; case 6: return Type::IfcProductRepresentation; } return IfcObject::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 5: return "ObjectPlacement"; case 6: return "Representation"; } return IfcObject::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelAssignsToProduct > > ReferencedBy(); // INVERSE IfcRelAssignsToProduct::RelatingProduct
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcRelAssignsToProduct >::ptr ReferencedBy() const; // INVERSE IfcRelAssignsToProduct::RelatingProduct
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcProduct (IfcAbstractEntityPtr e);
-    IfcProduct (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation);
-    typedef IfcProduct* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcProduct > > list;
-    typedef IfcTemplatedEntityList< IfcProduct >::it it;
+    IfcProduct (IfcAbstractEntity* e);
+    IfcProduct (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation);
+    typedef IfcTemplatedEntityList< IfcProduct > list;
 };
 /// IfcProject indicates the undertaking of some design, engineering, construction, or
 /// maintenance activities leading towards a product. The project establishes the context for information to be exchanged or shared, and it may represent a construction project but does not have to.  The IfcProject's main purpose in an exchange structure is to provide the root instance and the context for all other information items included.
@@ -21839,16 +22772,15 @@ class IfcProject : public IfcContext {
 public:
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcContext::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcContext::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcContext::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcProject (IfcAbstractEntityPtr e);
-    IfcProject (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, boost::optional< IfcLabel > v6_LongName, boost::optional< IfcLabel > v7_Phase, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationContext > > > v8_RepresentationContexts, IfcUnitAssignment* v9_UnitsInContext);
-    typedef IfcProject* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcProject > > list;
-    typedef IfcTemplatedEntityList< IfcProject >::it it;
+    IfcProject (IfcAbstractEntity* e);
+    IfcProject (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, boost::optional< std::string > v6_LongName, boost::optional< std::string > v7_Phase, boost::optional< IfcTemplatedEntityList< IfcRepresentationContext >::ptr > v8_RepresentationContexts, IfcUnitAssignment* v9_UnitsInContext);
+    typedef IfcTemplatedEntityList< IfcProject > list;
 };
 /// IfcProjectLibrary collects all library elements that are included within a referenced project data set.
 /// 
@@ -21878,16 +22810,15 @@ class IfcProjectLibrary : public IfcContext {
 public:
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcContext::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcContext::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcContext::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcProjectLibrary (IfcAbstractEntityPtr e);
-    IfcProjectLibrary (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, boost::optional< IfcLabel > v6_LongName, boost::optional< IfcLabel > v7_Phase, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationContext > > > v8_RepresentationContexts, IfcUnitAssignment* v9_UnitsInContext);
-    typedef IfcProjectLibrary* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcProjectLibrary > > list;
-    typedef IfcTemplatedEntityList< IfcProjectLibrary >::it it;
+    IfcProjectLibrary (IfcAbstractEntity* e);
+    IfcProjectLibrary (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, boost::optional< std::string > v6_LongName, boost::optional< std::string > v7_Phase, boost::optional< IfcTemplatedEntityList< IfcRepresentationContext >::ptr > v8_RepresentationContexts, IfcUnitAssignment* v9_UnitsInContext);
+    typedef IfcTemplatedEntityList< IfcProjectLibrary > list;
 };
 /// A property with a bounded
 ///   value, IfcPropertyBoundedValue, defines a property
@@ -21996,39 +22927,38 @@ class IfcProjectLibrary : public IfcContext {
 class IfcPropertyBoundedValue : public IfcSimpleProperty {
 public:
     /// Whether the optional attribute UpperBoundValue is defined for this IfcPropertyBoundedValue
-    bool hasUpperBoundValue();
+    bool hasUpperBoundValue() const;
     /// Upper bound value for the interval defining the property value. If the value is not given, it indicates an open bound (all values to be greater than or equal to LowerBoundValue).
-    IfcValue UpperBoundValue();
-    void setUpperBoundValue(IfcValue v);
+    IfcValue* UpperBoundValue() const;
+    void setUpperBoundValue(IfcValue* v);
     /// Whether the optional attribute LowerBoundValue is defined for this IfcPropertyBoundedValue
-    bool hasLowerBoundValue();
+    bool hasLowerBoundValue() const;
     /// Lower bound value for the interval defining the property value. If the value is not given, it indicates an open bound (all values to be lower than or equal to UpperBoundValue).
-    IfcValue LowerBoundValue();
-    void setLowerBoundValue(IfcValue v);
+    IfcValue* LowerBoundValue() const;
+    void setLowerBoundValue(IfcValue* v);
     /// Whether the optional attribute Unit is defined for this IfcPropertyBoundedValue
-    bool hasUnit();
+    bool hasUnit() const;
     /// Unit for the upper and lower bound values, if not given, the default value for the measure type is used as defined by the global unit assignment at IfcProject.UnitInContext. The applicable unit is then selected by the underlying TYPE of the UpperBoundValue, LowerBoundValue, and SetPointValue)
-    IfcUnit Unit();
-    void setUnit(IfcUnit v);
+    IfcUnit* Unit() const;
+    void setUnit(IfcUnit* v);
     /// Whether the optional attribute SetPointValue is defined for this IfcPropertyBoundedValue
-    bool hasSetPointValue();
+    bool hasSetPointValue() const;
     /// Set point value as typically used for operational value setting.
     /// 
     /// IFC2x4 CHANGE  The attribute has been added at the end of the attribute list.
-    IfcValue SetPointValue();
-    void setSetPointValue(IfcValue v);
+    IfcValue* SetPointValue() const;
+    void setSetPointValue(IfcValue* v);
     virtual unsigned int getArgumentCount() const { return 6; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 2: return IfcUtil::Argument_ENTITY; case 3: return IfcUtil::Argument_ENTITY; case 4: return IfcUtil::Argument_ENTITY; case 5: return IfcUtil::Argument_ENTITY; } return IfcSimpleProperty::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 2: return Type::IfcValue; case 3: return Type::IfcValue; case 4: return Type::IfcUnit; case 5: return Type::IfcValue; } return IfcSimpleProperty::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 2: return "UpperBoundValue"; case 3: return "LowerBoundValue"; case 4: return "Unit"; case 5: return "SetPointValue"; } return IfcSimpleProperty::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcPropertyBoundedValue (IfcAbstractEntityPtr e);
-    IfcPropertyBoundedValue (IfcIdentifier v1_Name, boost::optional< IfcText > v2_Description, boost::optional< IfcValue > v3_UpperBoundValue, boost::optional< IfcValue > v4_LowerBoundValue, boost::optional< IfcUnit > v5_Unit, boost::optional< IfcValue > v6_SetPointValue);
-    typedef IfcPropertyBoundedValue* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcPropertyBoundedValue > > list;
-    typedef IfcTemplatedEntityList< IfcPropertyBoundedValue >::it it;
+    IfcPropertyBoundedValue (IfcAbstractEntity* e);
+    IfcPropertyBoundedValue (std::string v1_Name, boost::optional< std::string > v2_Description, IfcValue* v3_UpperBoundValue, IfcValue* v4_LowerBoundValue, IfcUnit* v5_Unit, IfcValue* v6_SetPointValue);
+    typedef IfcTemplatedEntityList< IfcPropertyBoundedValue > list;
 };
 /// A property with an enumerated
 /// value, IfcPropertyEnumeratedValue, defines a property
@@ -22110,29 +23040,28 @@ class IfcPropertyBoundedValue : public IfcSimpleProperty {
 class IfcPropertyEnumeratedValue : public IfcSimpleProperty {
 public:
     /// Whether the optional attribute EnumerationValues is defined for this IfcPropertyEnumeratedValue
-    bool hasEnumerationValues();
+    bool hasEnumerationValues() const;
     /// Enumeration values, which shall be listed in the referenced IfcPropertyEnumeration, if such a reference is provided.
     /// 
     /// IFC2x4 CHANGE  The attribute has been made optional with upward compatibility for file based exchange.
-    SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > EnumerationValues();
-    void setEnumerationValues(SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > v);
+    IfcEntityList::ptr EnumerationValues() const;
+    void setEnumerationValues(IfcEntityList::ptr v);
     /// Whether the optional attribute EnumerationReference is defined for this IfcPropertyEnumeratedValue
-    bool hasEnumerationReference();
+    bool hasEnumerationReference() const;
     /// Enumeration from which a enumeration value has been selected. The referenced enumeration also establishes the unit of the enumeration value.
-    IfcPropertyEnumeration* EnumerationReference();
+    IfcPropertyEnumeration* EnumerationReference() const;
     void setEnumerationReference(IfcPropertyEnumeration* v);
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 2: return IfcUtil::Argument_ENTITY_LIST; case 3: return IfcUtil::Argument_ENTITY; } return IfcSimpleProperty::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 2: return Type::IfcValue; case 3: return Type::IfcPropertyEnumeration; } return IfcSimpleProperty::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 2: return "EnumerationValues"; case 3: return "EnumerationReference"; } return IfcSimpleProperty::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcPropertyEnumeratedValue (IfcAbstractEntityPtr e);
-    IfcPropertyEnumeratedValue (IfcIdentifier v1_Name, boost::optional< IfcText > v2_Description, boost::optional< IfcEntities > v3_EnumerationValues, IfcPropertyEnumeration* v4_EnumerationReference);
-    typedef IfcPropertyEnumeratedValue* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcPropertyEnumeratedValue > > list;
-    typedef IfcTemplatedEntityList< IfcPropertyEnumeratedValue >::it it;
+    IfcPropertyEnumeratedValue (IfcAbstractEntity* e);
+    IfcPropertyEnumeratedValue (std::string v1_Name, boost::optional< std::string > v2_Description, boost::optional< IfcEntityList::ptr > v3_EnumerationValues, IfcPropertyEnumeration* v4_EnumerationReference);
+    typedef IfcTemplatedEntityList< IfcPropertyEnumeratedValue > list;
 };
 /// An IfcPropertyListValue
 ///   defines a property that has several (numeric or
@@ -22202,29 +23131,28 @@ class IfcPropertyEnumeratedValue : public IfcSimpleProperty {
 class IfcPropertyListValue : public IfcSimpleProperty {
 public:
     /// Whether the optional attribute ListValues is defined for this IfcPropertyListValue
-    bool hasListValues();
+    bool hasListValues() const;
     /// List of property values.
     /// 
     /// IFC2x4 CHANGE  The attribute has been made optional with upward compatibility for file based exchange.
-    SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > ListValues();
-    void setListValues(SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > v);
+    IfcEntityList::ptr ListValues() const;
+    void setListValues(IfcEntityList::ptr v);
     /// Whether the optional attribute Unit is defined for this IfcPropertyListValue
-    bool hasUnit();
+    bool hasUnit() const;
     /// Unit for the list values, if not given, the default value for the measure type (given by the TYPE of nominal value) is used as defined by the global unit assignment at IfcProject.
-    IfcUnit Unit();
-    void setUnit(IfcUnit v);
+    IfcUnit* Unit() const;
+    void setUnit(IfcUnit* v);
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 2: return IfcUtil::Argument_ENTITY_LIST; case 3: return IfcUtil::Argument_ENTITY; } return IfcSimpleProperty::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 2: return Type::IfcValue; case 3: return Type::IfcUnit; } return IfcSimpleProperty::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 2: return "ListValues"; case 3: return "Unit"; } return IfcSimpleProperty::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcPropertyListValue (IfcAbstractEntityPtr e);
-    IfcPropertyListValue (IfcIdentifier v1_Name, boost::optional< IfcText > v2_Description, boost::optional< IfcEntities > v3_ListValues, boost::optional< IfcUnit > v4_Unit);
-    typedef IfcPropertyListValue* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcPropertyListValue > > list;
-    typedef IfcTemplatedEntityList< IfcPropertyListValue >::it it;
+    IfcPropertyListValue (IfcAbstractEntity* e);
+    IfcPropertyListValue (std::string v1_Name, boost::optional< std::string > v2_Description, boost::optional< IfcEntityList::ptr > v3_ListValues, IfcUnit* v4_Unit);
+    typedef IfcTemplatedEntityList< IfcPropertyListValue > list;
 };
 /// IfcPropertyReferenceValue allows a property value to
 ///   be given by referencing other entities within the resource
@@ -22244,29 +23172,28 @@ class IfcPropertyListValue : public IfcSimpleProperty {
 class IfcPropertyReferenceValue : public IfcSimpleProperty {
 public:
     /// Whether the optional attribute UsageName is defined for this IfcPropertyReferenceValue
-    bool hasUsageName();
+    bool hasUsageName() const;
     /// Description of the use of the referenced value within the property.
-    IfcText UsageName();
-    void setUsageName(IfcText v);
+    std::string UsageName() const;
+    void setUsageName(std::string v);
     /// Whether the optional attribute PropertyReference is defined for this IfcPropertyReferenceValue
-    bool hasPropertyReference();
+    bool hasPropertyReference() const;
     /// Reference to another property entity through one of the select types in the IfcObjectReferenceSelect.
     /// 
     /// IFC2x4 CHANGE  The attribute has been made optional with upward compatibility for file based exchange.
-    IfcObjectReferenceSelect PropertyReference();
-    void setPropertyReference(IfcObjectReferenceSelect v);
+    IfcObjectReferenceSelect* PropertyReference() const;
+    void setPropertyReference(IfcObjectReferenceSelect* v);
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 2: return IfcUtil::Argument_STRING; case 3: return IfcUtil::Argument_ENTITY; } return IfcSimpleProperty::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 2: return Type::IfcText; case 3: return Type::IfcObjectReferenceSelect; } return IfcSimpleProperty::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 2: return "UsageName"; case 3: return "PropertyReference"; } return IfcSimpleProperty::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcPropertyReferenceValue (IfcAbstractEntityPtr e);
-    IfcPropertyReferenceValue (IfcIdentifier v1_Name, boost::optional< IfcText > v2_Description, boost::optional< IfcText > v3_UsageName, boost::optional< IfcObjectReferenceSelect > v4_PropertyReference);
-    typedef IfcPropertyReferenceValue* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcPropertyReferenceValue > > list;
-    typedef IfcTemplatedEntityList< IfcPropertyReferenceValue >::it it;
+    IfcPropertyReferenceValue (IfcAbstractEntity* e);
+    IfcPropertyReferenceValue (std::string v1_Name, boost::optional< std::string > v2_Description, boost::optional< std::string > v3_UsageName, IfcObjectReferenceSelect* v4_PropertyReference);
+    typedef IfcTemplatedEntityList< IfcPropertyReferenceValue > list;
 };
 /// IfcPropertySet defines all dynamically extensible
 /// properties. The property set is a container class that holds
@@ -22324,20 +23251,19 @@ class IfcPropertyReferenceValue : public IfcSimpleProperty {
 class IfcPropertySet : public IfcPropertySetDefinition {
 public:
     /// Contained set of properties. For property sets defined as part of the IFC Object model, the property objects within a property set are defined as part of the standard. If a property is not contained within the set of predefined properties, its value has not been set at this time.
-    SHARED_PTR< IfcTemplatedEntityList< IfcProperty > > HasProperties();
-    void setHasProperties(SHARED_PTR< IfcTemplatedEntityList< IfcProperty > > v);
+    IfcTemplatedEntityList< IfcProperty >::ptr HasProperties() const;
+    void setHasProperties(IfcTemplatedEntityList< IfcProperty >::ptr v);
     virtual unsigned int getArgumentCount() const { return 5; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 4: return IfcUtil::Argument_ENTITY_LIST; } return IfcPropertySetDefinition::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 4: return Type::IfcProperty; } return IfcPropertySetDefinition::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 4: return "HasProperties"; } return IfcPropertySetDefinition::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcPropertySet (IfcAbstractEntityPtr e);
-    IfcPropertySet (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, SHARED_PTR< IfcTemplatedEntityList< IfcProperty > > v5_HasProperties);
-    typedef IfcPropertySet* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcPropertySet > > list;
-    typedef IfcTemplatedEntityList< IfcPropertySet >::it it;
+    IfcPropertySet (IfcAbstractEntity* e);
+    IfcPropertySet (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcTemplatedEntityList< IfcProperty >::ptr v5_HasProperties);
+    typedef IfcTemplatedEntityList< IfcPropertySet > list;
 };
 /// IfcPropertySetTemplate defines the template for all
 /// dynamically extensible property sets represented by
@@ -22373,13 +23299,13 @@ class IfcPropertySet : public IfcPropertySetDefinition {
 class IfcPropertySetTemplate : public IfcPropertyTemplateDefinition {
 public:
     /// Whether the optional attribute TemplateType is defined for this IfcPropertySetTemplate
-    bool hasTemplateType();
+    bool hasTemplateType() const;
     /// Property set type defining whether the property set is applicable to a type (subtypes of IfcTypeObject), to an occurrence (subtypes of IfcObject), or as a special case to a performance history.
     /// The attribute ApplicableEntity may further refine the applicability to a single or multiple entity type(s).
-    IfcPropertySetTemplateTypeEnum::IfcPropertySetTemplateTypeEnum TemplateType();
+    IfcPropertySetTemplateTypeEnum::IfcPropertySetTemplateTypeEnum TemplateType() const;
     void setTemplateType(IfcPropertySetTemplateTypeEnum::IfcPropertySetTemplateTypeEnum v);
     /// Whether the optional attribute ApplicableEntity is defined for this IfcPropertySetTemplate
-    bool hasApplicableEntity();
+    bool hasApplicableEntity() const;
     /// The attribute optionally defines the data type of the applicable type or occurrence object, to which the assigned property set template can relate. If not present, no instruction is given to which type or occurrence object the property set template is applicable. The following conventions are used:
     /// 
     /// The IFC entity name of the applicable entity using the IFC naming convention, CamelCase with IFC prefix
@@ -22390,24 +23316,23 @@ class IfcPropertySetTemplate : public IfcPropertyTemplateDefinition {
     /// EXAMPLE  Refering to a boiler type as applicable entity would be expressed as 'IfcBoilerType', refering to a steam boiler type as applicable entity would be expressed as 'IfcBoilerType/STEAM', refering to a wall and wall standard case and a wall type would be expressed as 'IfcWall, IfcWallStandardCase, IfcWallType'.
     /// 
     /// An applicable IfcPerformanceHistory assigned to an occurrence or type object would be indicated by IfcBoilerType[PerformanceHistory], or respectively IfcBoilerType/STEAM[PerformanceHistory].
-    IfcIdentifier ApplicableEntity();
-    void setApplicableEntity(IfcIdentifier v);
+    std::string ApplicableEntity() const;
+    void setApplicableEntity(std::string v);
     /// Set of IfcPropertyTemplate's that are defined within the scope of the IfcPropertySetTemplate.
-    SHARED_PTR< IfcTemplatedEntityList< IfcPropertyTemplate > > HasPropertyTemplates();
-    void setHasPropertyTemplates(SHARED_PTR< IfcTemplatedEntityList< IfcPropertyTemplate > > v);
+    IfcTemplatedEntityList< IfcPropertyTemplate >::ptr HasPropertyTemplates() const;
+    void setHasPropertyTemplates(IfcTemplatedEntityList< IfcPropertyTemplate >::ptr v);
     virtual unsigned int getArgumentCount() const { return 7; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 4: return IfcUtil::Argument_ENUMERATION; case 5: return IfcUtil::Argument_STRING; case 6: return IfcUtil::Argument_ENTITY_LIST; } return IfcPropertyTemplateDefinition::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 4: return Type::IfcPropertySetTemplateTypeEnum; case 5: return Type::IfcIdentifier; case 6: return Type::IfcPropertyTemplate; } return IfcPropertyTemplateDefinition::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 4: return "TemplateType"; case 5: return "ApplicableEntity"; case 6: return "HasPropertyTemplates"; } return IfcPropertyTemplateDefinition::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelDefinesByTemplate > > Defines(); // INVERSE IfcRelDefinesByTemplate::RelatingTemplate
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcRelDefinesByTemplate >::ptr Defines() const; // INVERSE IfcRelDefinesByTemplate::RelatingTemplate
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcPropertySetTemplate (IfcAbstractEntityPtr e);
-    IfcPropertySetTemplate (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcPropertySetTemplateTypeEnum::IfcPropertySetTemplateTypeEnum > v5_TemplateType, boost::optional< IfcIdentifier > v6_ApplicableEntity, SHARED_PTR< IfcTemplatedEntityList< IfcPropertyTemplate > > v7_HasPropertyTemplates);
-    typedef IfcPropertySetTemplate* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetTemplate > > list;
-    typedef IfcTemplatedEntityList< IfcPropertySetTemplate >::it it;
+    IfcPropertySetTemplate (IfcAbstractEntity* e);
+    IfcPropertySetTemplate (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< IfcPropertySetTemplateTypeEnum::IfcPropertySetTemplateTypeEnum > v5_TemplateType, boost::optional< std::string > v6_ApplicableEntity, IfcTemplatedEntityList< IfcPropertyTemplate >::ptr v7_HasPropertyTemplates);
+    typedef IfcTemplatedEntityList< IfcPropertySetTemplate > list;
 };
 /// The property with a single value
 /// IfcPropertySingleValue defines a property object which has
@@ -22456,31 +23381,30 @@ class IfcPropertySetTemplate : public IfcPropertyTemplateDefinition {
 class IfcPropertySingleValue : public IfcSimpleProperty {
 public:
     /// Whether the optional attribute NominalValue is defined for this IfcPropertySingleValue
-    bool hasNominalValue();
+    bool hasNominalValue() const;
     /// Value and measure type of this property. 
     /// 
     /// NOTE  By virtue of the defined data type, that is selected from the SELECT IfcValue, the appropriate unit can be found within the IfcUnitAssignment, defined for the project if no value for the unit attribute is given.
     /// 
     /// IFC2x3 CHANGE  The attribute has been made optional with upward compatibility for file based exchange.
-    IfcValue NominalValue();
-    void setNominalValue(IfcValue v);
+    IfcValue* NominalValue() const;
+    void setNominalValue(IfcValue* v);
     /// Whether the optional attribute Unit is defined for this IfcPropertySingleValue
-    bool hasUnit();
+    bool hasUnit() const;
     /// Unit for the nominal value, if not given, the default value for the measure type (given by the TYPE of nominal value) is used as defined by the global unit assignment at IfcProject.
-    IfcUnit Unit();
-    void setUnit(IfcUnit v);
+    IfcUnit* Unit() const;
+    void setUnit(IfcUnit* v);
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 2: return IfcUtil::Argument_ENTITY; case 3: return IfcUtil::Argument_ENTITY; } return IfcSimpleProperty::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 2: return Type::IfcValue; case 3: return Type::IfcUnit; } return IfcSimpleProperty::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 2: return "NominalValue"; case 3: return "Unit"; } return IfcSimpleProperty::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcPropertySingleValue (IfcAbstractEntityPtr e);
-    IfcPropertySingleValue (IfcIdentifier v1_Name, boost::optional< IfcText > v2_Description, boost::optional< IfcValue > v3_NominalValue, boost::optional< IfcUnit > v4_Unit);
-    typedef IfcPropertySingleValue* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcPropertySingleValue > > list;
-    typedef IfcTemplatedEntityList< IfcPropertySingleValue >::it it;
+    IfcPropertySingleValue (IfcAbstractEntity* e);
+    IfcPropertySingleValue (std::string v1_Name, boost::optional< std::string > v2_Description, IfcValue* v3_NominalValue, IfcUnit* v4_Unit);
+    typedef IfcTemplatedEntityList< IfcPropertySingleValue > list;
 };
 /// A property with a range value
 ///   (IfcPropertyTableValue) defines a property object
@@ -22631,53 +23555,52 @@ class IfcPropertySingleValue : public IfcSimpleProperty {
 class IfcPropertyTableValue : public IfcSimpleProperty {
 public:
     /// Whether the optional attribute DefiningValues is defined for this IfcPropertyTableValue
-    bool hasDefiningValues();
+    bool hasDefiningValues() const;
     /// List of defining values, which determine the defined values. This list shall have unique values only.
     /// 
     /// IFC2x4 CHANGE  The attribute has been made optional with upward compatibility for file based exchange.
-    SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > DefiningValues();
-    void setDefiningValues(SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > v);
+    IfcEntityList::ptr DefiningValues() const;
+    void setDefiningValues(IfcEntityList::ptr v);
     /// Whether the optional attribute DefinedValues is defined for this IfcPropertyTableValue
-    bool hasDefinedValues();
+    bool hasDefinedValues() const;
     /// Defined values which are applicable for the scope as defined by the defining values.
     /// 
     /// IFC2x4 CHANGE  The attribute has been made optional with upward compatibility for file based exchange.
-    SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > DefinedValues();
-    void setDefinedValues(SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > v);
+    IfcEntityList::ptr DefinedValues() const;
+    void setDefinedValues(IfcEntityList::ptr v);
     /// Whether the optional attribute Expression is defined for this IfcPropertyTableValue
-    bool hasExpression();
+    bool hasExpression() const;
     /// Expression for the derivation of defined values from the defining values, the expression is given for information only, i.e. no automatic processing can be expected from the expression.
-    IfcText Expression();
-    void setExpression(IfcText v);
+    std::string Expression() const;
+    void setExpression(std::string v);
     /// Whether the optional attribute DefiningUnit is defined for this IfcPropertyTableValue
-    bool hasDefiningUnit();
+    bool hasDefiningUnit() const;
     /// Unit for the defining values, if not given, the default value for the measure type (given by the TYPE of the defining values) is used as defined by the global unit assignment at IfcProject.
-    IfcUnit DefiningUnit();
-    void setDefiningUnit(IfcUnit v);
+    IfcUnit* DefiningUnit() const;
+    void setDefiningUnit(IfcUnit* v);
     /// Whether the optional attribute DefinedUnit is defined for this IfcPropertyTableValue
-    bool hasDefinedUnit();
+    bool hasDefinedUnit() const;
     /// Unit for the defined values, if not given, the default value for the measure type (given by the TYPE of the defined values) is used as defined by the global unit assignment at IfcProject.
-    IfcUnit DefinedUnit();
-    void setDefinedUnit(IfcUnit v);
+    IfcUnit* DefinedUnit() const;
+    void setDefinedUnit(IfcUnit* v);
     /// Whether the optional attribute CurveInterpolation is defined for this IfcPropertyTableValue
-    bool hasCurveInterpolation();
+    bool hasCurveInterpolation() const;
     /// Interpolation of the curve between two defining and defined values that are provided. if not provided a linear interpolation is assumed.
     /// 
     /// IFC2x4 CHANGE  The attribute has been added at the end of the attribute list.
-    IfcCurveInterpolationEnum::IfcCurveInterpolationEnum CurveInterpolation();
+    IfcCurveInterpolationEnum::IfcCurveInterpolationEnum CurveInterpolation() const;
     void setCurveInterpolation(IfcCurveInterpolationEnum::IfcCurveInterpolationEnum v);
     virtual unsigned int getArgumentCount() const { return 8; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 2: return IfcUtil::Argument_ENTITY_LIST; case 3: return IfcUtil::Argument_ENTITY_LIST; case 4: return IfcUtil::Argument_STRING; case 5: return IfcUtil::Argument_ENTITY; case 6: return IfcUtil::Argument_ENTITY; case 7: return IfcUtil::Argument_ENUMERATION; } return IfcSimpleProperty::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 2: return Type::IfcValue; case 3: return Type::IfcValue; case 4: return Type::IfcText; case 5: return Type::IfcUnit; case 6: return Type::IfcUnit; case 7: return Type::IfcCurveInterpolationEnum; } return IfcSimpleProperty::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 2: return "DefiningValues"; case 3: return "DefinedValues"; case 4: return "Expression"; case 5: return "DefiningUnit"; case 6: return "DefinedUnit"; case 7: return "CurveInterpolation"; } return IfcSimpleProperty::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcPropertyTableValue (IfcAbstractEntityPtr e);
-    IfcPropertyTableValue (IfcIdentifier v1_Name, boost::optional< IfcText > v2_Description, boost::optional< IfcEntities > v3_DefiningValues, boost::optional< IfcEntities > v4_DefinedValues, boost::optional< IfcText > v5_Expression, boost::optional< IfcUnit > v6_DefiningUnit, boost::optional< IfcUnit > v7_DefinedUnit, boost::optional< IfcCurveInterpolationEnum::IfcCurveInterpolationEnum > v8_CurveInterpolation);
-    typedef IfcPropertyTableValue* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcPropertyTableValue > > list;
-    typedef IfcTemplatedEntityList< IfcPropertyTableValue >::it it;
+    IfcPropertyTableValue (IfcAbstractEntity* e);
+    IfcPropertyTableValue (std::string v1_Name, boost::optional< std::string > v2_Description, boost::optional< IfcEntityList::ptr > v3_DefiningValues, boost::optional< IfcEntityList::ptr > v4_DefinedValues, boost::optional< std::string > v5_Expression, IfcUnit* v6_DefiningUnit, IfcUnit* v7_DefinedUnit, boost::optional< IfcCurveInterpolationEnum::IfcCurveInterpolationEnum > v8_CurveInterpolation);
+    typedef IfcTemplatedEntityList< IfcPropertyTableValue > list;
 };
 /// The IfcPropertyTemplate is an abstract supertype
 /// comprising the templates for all dynamically extensible properties,
@@ -22707,18 +23630,17 @@ class IfcPropertyTemplate : public IfcPropertyTemplateDefinition {
 public:
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcPropertyTemplateDefinition::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcPropertyTemplateDefinition::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcPropertyTemplateDefinition::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcComplexPropertyTemplate > > PartOfComplexTemplate(); // INVERSE IfcComplexPropertyTemplate::HasPropertyTemplates
-    SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetTemplate > > PartOfPsetTemplate(); // INVERSE IfcPropertySetTemplate::HasPropertyTemplates
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcComplexPropertyTemplate >::ptr PartOfComplexTemplate() const; // INVERSE IfcComplexPropertyTemplate::HasPropertyTemplates
+    IfcTemplatedEntityList< IfcPropertySetTemplate >::ptr PartOfPsetTemplate() const; // INVERSE IfcPropertySetTemplate::HasPropertyTemplates
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcPropertyTemplate (IfcAbstractEntityPtr e);
-    IfcPropertyTemplate (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description);
-    typedef IfcPropertyTemplate* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcPropertyTemplate > > list;
-    typedef IfcTemplatedEntityList< IfcPropertyTemplate >::it it;
+    IfcPropertyTemplate (IfcAbstractEntity* e);
+    IfcPropertyTemplate (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description);
+    typedef IfcTemplatedEntityList< IfcPropertyTemplate > list;
 };
 /// IfcProxy is intended to be a kind of a container for wrapping objects which are defined by associated properties, which may or may not have a geometric representation and placement in space. A proxy may have a semantic meaning, defined by the Name attribute, and property definitions, attached through the property assignment relationship, which definition may be outside of the definitions given by the current release of IFC.
 /// 
@@ -22739,25 +23661,24 @@ class IfcPropertyTemplate : public IfcPropertyTemplateDefinition {
 class IfcProxy : public IfcProduct {
 public:
     /// High level (and only) semantic meaning attached to the IfcProxy, defining the basic construct type behind the Proxy, e.g. Product or Process.
-    IfcObjectTypeEnum::IfcObjectTypeEnum ProxyType();
+    IfcObjectTypeEnum::IfcObjectTypeEnum ProxyType() const;
     void setProxyType(IfcObjectTypeEnum::IfcObjectTypeEnum v);
     /// Whether the optional attribute Tag is defined for this IfcProxy
-    bool hasTag();
+    bool hasTag() const;
     /// The tag (or label) identifier at the particular instance of a product, e.g. the serial number, or the position number. It is the identifier at the occurrence level.
-    IfcLabel Tag();
-    void setTag(IfcLabel v);
+    std::string Tag() const;
+    void setTag(std::string v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 7: return IfcUtil::Argument_ENUMERATION; case 8: return IfcUtil::Argument_STRING; } return IfcProduct::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 7: return Type::IfcObjectTypeEnum; case 8: return Type::IfcLabel; } return IfcProduct::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 7: return "ProxyType"; case 8: return "Tag"; } return IfcProduct::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcProxy (IfcAbstractEntityPtr e);
-    IfcProxy (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcObjectTypeEnum::IfcObjectTypeEnum v8_ProxyType, boost::optional< IfcLabel > v9_Tag);
-    typedef IfcProxy* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcProxy > > list;
-    typedef IfcTemplatedEntityList< IfcProxy >::it it;
+    IfcProxy (IfcAbstractEntity* e);
+    IfcProxy (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcObjectTypeEnum::IfcObjectTypeEnum v8_ProxyType, boost::optional< std::string > v9_Tag);
+    typedef IfcTemplatedEntityList< IfcProxy > list;
 };
 /// IfcRectangleHollowProfileDef defines a section profile that provides the defining parameters of a rectangular (or square) hollow section to be used by the swept surface geometry or the swept area solid. Its parameters and orientation relative to the position coordinate system are according to the following illustration. A square hollow section can be defined by equal values for h and b. The centre of the position coordinate system is in the profiles centre of the bounding box (for symmetric profiles identical with the centre of gravity). Normally, the longer sides are parallel to the y-axis, the shorter sides parallel to the x-axis.
 /// 
@@ -22782,30 +23703,29 @@ class IfcProxy : public IfcProduct {
 class IfcRectangleHollowProfileDef : public IfcRectangleProfileDef {
 public:
     /// Thickness of the material.
-    IfcPositiveLengthMeasure WallThickness();
-    void setWallThickness(IfcPositiveLengthMeasure v);
+    double WallThickness() const;
+    void setWallThickness(double v);
     /// Whether the optional attribute InnerFilletRadius is defined for this IfcRectangleHollowProfileDef
-    bool hasInnerFilletRadius();
+    bool hasInnerFilletRadius() const;
     /// Inner corner radius.
-    IfcNonNegativeLengthMeasure InnerFilletRadius();
-    void setInnerFilletRadius(IfcNonNegativeLengthMeasure v);
+    double InnerFilletRadius() const;
+    void setInnerFilletRadius(double v);
     /// Whether the optional attribute OuterFilletRadius is defined for this IfcRectangleHollowProfileDef
-    bool hasOuterFilletRadius();
+    bool hasOuterFilletRadius() const;
     /// Outer corner radius.
-    IfcNonNegativeLengthMeasure OuterFilletRadius();
-    void setOuterFilletRadius(IfcNonNegativeLengthMeasure v);
+    double OuterFilletRadius() const;
+    void setOuterFilletRadius(double v);
     virtual unsigned int getArgumentCount() const { return 8; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 5: return IfcUtil::Argument_DOUBLE; case 6: return IfcUtil::Argument_DOUBLE; case 7: return IfcUtil::Argument_DOUBLE; } return IfcRectangleProfileDef::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 5: return Type::IfcPositiveLengthMeasure; case 6: return Type::IfcNonNegativeLengthMeasure; case 7: return Type::IfcNonNegativeLengthMeasure; } return IfcRectangleProfileDef::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 5: return "WallThickness"; case 6: return "InnerFilletRadius"; case 7: return "OuterFilletRadius"; } return IfcRectangleProfileDef::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRectangleHollowProfileDef (IfcAbstractEntityPtr e);
-    IfcRectangleHollowProfileDef (IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< IfcLabel > v2_ProfileName, IfcAxis2Placement2D* v3_Position, IfcPositiveLengthMeasure v4_XDim, IfcPositiveLengthMeasure v5_YDim, IfcPositiveLengthMeasure v6_WallThickness, boost::optional< IfcNonNegativeLengthMeasure > v7_InnerFilletRadius, boost::optional< IfcNonNegativeLengthMeasure > v8_OuterFilletRadius);
-    typedef IfcRectangleHollowProfileDef* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRectangleHollowProfileDef > > list;
-    typedef IfcTemplatedEntityList< IfcRectangleHollowProfileDef >::it it;
+    IfcRectangleHollowProfileDef (IfcAbstractEntity* e);
+    IfcRectangleHollowProfileDef (IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< std::string > v2_ProfileName, IfcAxis2Placement2D* v3_Position, double v4_XDim, double v5_YDim, double v6_WallThickness, boost::optional< double > v7_InnerFilletRadius, boost::optional< double > v8_OuterFilletRadius);
+    typedef IfcTemplatedEntityList< IfcRectangleHollowProfileDef > list;
 };
 /// The IfcRectangularPyramid is a Construction Solid
 /// Geometry (CSG) 3D primitive. It is a solid with a rectangular base and
@@ -22898,26 +23818,25 @@ class IfcRectangleHollowProfileDef : public IfcRectangleProfileDef {
 class IfcRectangularPyramid : public IfcCsgPrimitive3D {
 public:
     /// The length of the base measured along the placement X axis. It is provided by the inherited axis placement through SELF\IfcCsgPrimitive3D.Position.P[1].
-    IfcPositiveLengthMeasure XLength();
-    void setXLength(IfcPositiveLengthMeasure v);
+    double XLength() const;
+    void setXLength(double v);
     /// The length of the base measured along the placement Y axis. It is provided by the inherited axis placement through SELF\IfcCsgPrimitive3D.Position.P[2].
-    IfcPositiveLengthMeasure YLength();
-    void setYLength(IfcPositiveLengthMeasure v);
+    double YLength() const;
+    void setYLength(double v);
     /// The height of the apex above the plane of the base, measured in the direction of the placement Z axis, the SELF\IfcCsgPrimitive3D.Position.P[2].
-    IfcPositiveLengthMeasure Height();
-    void setHeight(IfcPositiveLengthMeasure v);
+    double Height() const;
+    void setHeight(double v);
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 1: return IfcUtil::Argument_DOUBLE; case 2: return IfcUtil::Argument_DOUBLE; case 3: return IfcUtil::Argument_DOUBLE; } return IfcCsgPrimitive3D::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 1: return Type::IfcPositiveLengthMeasure; case 2: return Type::IfcPositiveLengthMeasure; case 3: return Type::IfcPositiveLengthMeasure; } return IfcCsgPrimitive3D::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 1: return "XLength"; case 2: return "YLength"; case 3: return "Height"; } return IfcCsgPrimitive3D::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRectangularPyramid (IfcAbstractEntityPtr e);
-    IfcRectangularPyramid (IfcAxis2Placement3D* v1_Position, IfcPositiveLengthMeasure v2_XLength, IfcPositiveLengthMeasure v3_YLength, IfcPositiveLengthMeasure v4_Height);
-    typedef IfcRectangularPyramid* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRectangularPyramid > > list;
-    typedef IfcTemplatedEntityList< IfcRectangularPyramid >::it it;
+    IfcRectangularPyramid (IfcAbstractEntity* e);
+    IfcRectangularPyramid (IfcAxis2Placement3D* v1_Position, double v2_XLength, double v3_YLength, double v4_Height);
+    typedef IfcTemplatedEntityList< IfcRectangularPyramid > list;
 };
 /// Definition from ISO/CD 10303-42:1992: The trimmed surface is a simple bounded surface in which the boundaries are the constant parametric lines u1 = u1, u2 = u2, v1 = v1 and v2 = v2. All these values shall be within the parametric range of the referenced surface. Cyclic properties of the parameter range are assumed.
 /// 
@@ -22937,38 +23856,37 @@ class IfcRectangularPyramid : public IfcCsgPrimitive3D {
 class IfcRectangularTrimmedSurface : public IfcBoundedSurface {
 public:
     /// Surface being trimmed.
-    IfcSurface* BasisSurface();
+    IfcSurface* BasisSurface() const;
     void setBasisSurface(IfcSurface* v);
     /// First u parametric value.
-    IfcParameterValue U1();
-    void setU1(IfcParameterValue v);
+    double U1() const;
+    void setU1(double v);
     /// First v parametric value.
-    IfcParameterValue V1();
-    void setV1(IfcParameterValue v);
+    double V1() const;
+    void setV1(double v);
     /// Second u parametric value.
-    IfcParameterValue U2();
-    void setU2(IfcParameterValue v);
+    double U2() const;
+    void setU2(double v);
     /// Second v parametric value.
-    IfcParameterValue V2();
-    void setV2(IfcParameterValue v);
+    double V2() const;
+    void setV2(double v);
     /// Flag to indicate whether the direction of the first parameter of the trimmed surface agrees with or opposes the sense of u in the basis surface.
-    bool Usense();
+    bool Usense() const;
     void setUsense(bool v);
     /// Flag to indicate whether the direction of the second parameter of the trimmed surface agrees with or opposes the sense of v in the basis surface.
-    bool Vsense();
+    bool Vsense() const;
     void setVsense(bool v);
     virtual unsigned int getArgumentCount() const { return 7; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY; case 1: return IfcUtil::Argument_DOUBLE; case 2: return IfcUtil::Argument_DOUBLE; case 3: return IfcUtil::Argument_DOUBLE; case 4: return IfcUtil::Argument_DOUBLE; case 5: return IfcUtil::Argument_BOOL; case 6: return IfcUtil::Argument_BOOL; } return IfcBoundedSurface::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcSurface; case 1: return Type::IfcParameterValue; case 2: return Type::IfcParameterValue; case 3: return Type::IfcParameterValue; case 4: return Type::IfcParameterValue; case 5: return Type::UNDEFINED; case 6: return Type::UNDEFINED; } return IfcBoundedSurface::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "BasisSurface"; case 1: return "U1"; case 2: return "V1"; case 3: return "U2"; case 4: return "V2"; case 5: return "Usense"; case 6: return "Vsense"; } return IfcBoundedSurface::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRectangularTrimmedSurface (IfcAbstractEntityPtr e);
-    IfcRectangularTrimmedSurface (IfcSurface* v1_BasisSurface, IfcParameterValue v2_U1, IfcParameterValue v3_V1, IfcParameterValue v4_U2, IfcParameterValue v5_V2, bool v6_Usense, bool v7_Vsense);
-    typedef IfcRectangularTrimmedSurface* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRectangularTrimmedSurface > > list;
-    typedef IfcTemplatedEntityList< IfcRectangularTrimmedSurface >::it it;
+    IfcRectangularTrimmedSurface (IfcAbstractEntity* e);
+    IfcRectangularTrimmedSurface (IfcSurface* v1_BasisSurface, double v2_U1, double v3_V1, double v4_U2, double v5_V2, bool v6_Usense, bool v7_Vsense);
+    typedef IfcTemplatedEntityList< IfcRectangularTrimmedSurface > list;
 };
 /// Definition from IAI: An
 ///   IfcReinforcementDefinitionProperties defines the cross section
@@ -22999,25 +23917,24 @@ class IfcRectangularTrimmedSurface : public IfcBoundedSurface {
 class IfcReinforcementDefinitionProperties : public IfcPreDefinedPropertySet {
 public:
     /// Whether the optional attribute DefinitionType is defined for this IfcReinforcementDefinitionProperties
-    bool hasDefinitionType();
+    bool hasDefinitionType() const;
     /// Descriptive type name applied to reinforcement definition properties.
-    IfcLabel DefinitionType();
-    void setDefinitionType(IfcLabel v);
+    std::string DefinitionType() const;
+    void setDefinitionType(std::string v);
     /// The list of section reinforcement properties attached to the reinforcement definition properties.
-    SHARED_PTR< IfcTemplatedEntityList< IfcSectionReinforcementProperties > > ReinforcementSectionDefinitions();
-    void setReinforcementSectionDefinitions(SHARED_PTR< IfcTemplatedEntityList< IfcSectionReinforcementProperties > > v);
+    IfcTemplatedEntityList< IfcSectionReinforcementProperties >::ptr ReinforcementSectionDefinitions() const;
+    void setReinforcementSectionDefinitions(IfcTemplatedEntityList< IfcSectionReinforcementProperties >::ptr v);
     virtual unsigned int getArgumentCount() const { return 6; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 4: return IfcUtil::Argument_STRING; case 5: return IfcUtil::Argument_ENTITY_LIST; } return IfcPreDefinedPropertySet::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 4: return Type::IfcLabel; case 5: return Type::IfcSectionReinforcementProperties; } return IfcPreDefinedPropertySet::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 4: return "DefinitionType"; case 5: return "ReinforcementSectionDefinitions"; } return IfcPreDefinedPropertySet::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcReinforcementDefinitionProperties (IfcAbstractEntityPtr e);
-    IfcReinforcementDefinitionProperties (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_DefinitionType, SHARED_PTR< IfcTemplatedEntityList< IfcSectionReinforcementProperties > > v6_ReinforcementSectionDefinitions);
-    typedef IfcReinforcementDefinitionProperties* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcReinforcementDefinitionProperties > > list;
-    typedef IfcTemplatedEntityList< IfcReinforcementDefinitionProperties >::it it;
+    IfcReinforcementDefinitionProperties (IfcAbstractEntity* e);
+    IfcReinforcementDefinitionProperties (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_DefinitionType, IfcTemplatedEntityList< IfcSectionReinforcementProperties >::ptr v6_ReinforcementSectionDefinitions);
+    typedef IfcTemplatedEntityList< IfcReinforcementDefinitionProperties > list;
 };
 /// The assignment relationship, IfcRelAssigns, is a generalization of "link" relationships among instances of IfcObject and its various 1st level subtypes. A link denotes the specific association through which one object (the client) applies the services of other objects (the suppliers), or through which one object may navigate to other objects.
 /// 
@@ -23033,26 +23950,25 @@ class IfcReinforcementDefinitionProperties : public IfcPreDefinedPropertySet {
 class IfcRelAssigns : public IfcRelationship {
 public:
     /// Related objects, which are assigned to a single object. The type of the single (or relating) object is defined in the subtypes of IfcRelAssigns.
-    SHARED_PTR< IfcTemplatedEntityList< IfcObjectDefinition > > RelatedObjects();
-    void setRelatedObjects(SHARED_PTR< IfcTemplatedEntityList< IfcObjectDefinition > > v);
+    IfcTemplatedEntityList< IfcObjectDefinition >::ptr RelatedObjects() const;
+    void setRelatedObjects(IfcTemplatedEntityList< IfcObjectDefinition >::ptr v);
     /// Whether the optional attribute RelatedObjectsType is defined for this IfcRelAssigns
-    bool hasRelatedObjectsType();
+    bool hasRelatedObjectsType() const;
     /// Particular type of the assignment relationship. It can constrain the applicable object types, used within the role of RelatedObjects.
     /// IFC2x4 CHANGE  The attribute is deprecated and shall no longer be used. A NIL value should always be assigned.
-    IfcObjectTypeEnum::IfcObjectTypeEnum RelatedObjectsType();
+    IfcObjectTypeEnum::IfcObjectTypeEnum RelatedObjectsType() const;
     void setRelatedObjectsType(IfcObjectTypeEnum::IfcObjectTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 6; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 4: return IfcUtil::Argument_ENTITY_LIST; case 5: return IfcUtil::Argument_ENUMERATION; } return IfcRelationship::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 4: return Type::IfcObjectDefinition; case 5: return Type::IfcObjectTypeEnum; } return IfcRelationship::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 4: return "RelatedObjects"; case 5: return "RelatedObjectsType"; } return IfcRelationship::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRelAssigns (IfcAbstractEntityPtr e);
-    IfcRelAssigns (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, SHARED_PTR< IfcTemplatedEntityList< IfcObjectDefinition > > v5_RelatedObjects, boost::optional< IfcObjectTypeEnum::IfcObjectTypeEnum > v6_RelatedObjectsType);
-    typedef IfcRelAssigns* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRelAssigns > > list;
-    typedef IfcTemplatedEntityList< IfcRelAssigns >::it it;
+    IfcRelAssigns (IfcAbstractEntity* e);
+    IfcRelAssigns (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcTemplatedEntityList< IfcObjectDefinition >::ptr v5_RelatedObjects, boost::optional< IfcObjectTypeEnum::IfcObjectTypeEnum > v6_RelatedObjectsType);
+    typedef IfcTemplatedEntityList< IfcRelAssigns > list;
 };
 /// The objectified relationship IfcRelAssignsToActor handles the assignment of objects (subtypes of IfcObject) to an actor (subtypes of IfcActor).
 /// 
@@ -23066,25 +23982,24 @@ class IfcRelAssigns : public IfcRelationship {
 class IfcRelAssignsToActor : public IfcRelAssigns {
 public:
     /// Reference to the information about the actor. It comprises the information about the person or organization and its addresses.
-    IfcActor* RelatingActor();
+    IfcActor* RelatingActor() const;
     void setRelatingActor(IfcActor* v);
     /// Whether the optional attribute ActingRole is defined for this IfcRelAssignsToActor
-    bool hasActingRole();
+    bool hasActingRole() const;
     /// Role of the actor played within the context of the assignment to the object(s).
-    IfcActorRole* ActingRole();
+    IfcActorRole* ActingRole() const;
     void setActingRole(IfcActorRole* v);
     virtual unsigned int getArgumentCount() const { return 8; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 6: return IfcUtil::Argument_ENTITY; case 7: return IfcUtil::Argument_ENTITY; } return IfcRelAssigns::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 6: return Type::IfcActor; case 7: return Type::IfcActorRole; } return IfcRelAssigns::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 6: return "RelatingActor"; case 7: return "ActingRole"; } return IfcRelAssigns::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRelAssignsToActor (IfcAbstractEntityPtr e);
-    IfcRelAssignsToActor (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, SHARED_PTR< IfcTemplatedEntityList< IfcObjectDefinition > > v5_RelatedObjects, boost::optional< IfcObjectTypeEnum::IfcObjectTypeEnum > v6_RelatedObjectsType, IfcActor* v7_RelatingActor, IfcActorRole* v8_ActingRole);
-    typedef IfcRelAssignsToActor* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRelAssignsToActor > > list;
-    typedef IfcTemplatedEntityList< IfcRelAssignsToActor >::it it;
+    IfcRelAssignsToActor (IfcAbstractEntity* e);
+    IfcRelAssignsToActor (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcTemplatedEntityList< IfcObjectDefinition >::ptr v5_RelatedObjects, boost::optional< IfcObjectTypeEnum::IfcObjectTypeEnum > v6_RelatedObjectsType, IfcActor* v7_RelatingActor, IfcActorRole* v8_ActingRole);
+    typedef IfcTemplatedEntityList< IfcRelAssignsToActor > list;
 };
 /// The objectified relationship IfcRelAssignsToControl handles the assignment of a control (represented by subtypes of IfcControl) to other objects (represented by subtypes of IfcObject, with the exception of controls).
 /// 
@@ -23094,20 +24009,19 @@ class IfcRelAssignsToActor : public IfcRelAssigns {
 class IfcRelAssignsToControl : public IfcRelAssigns {
 public:
     /// Reference to the IfcControl that applies a control upon objects.
-    IfcControl* RelatingControl();
+    IfcControl* RelatingControl() const;
     void setRelatingControl(IfcControl* v);
     virtual unsigned int getArgumentCount() const { return 7; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 6: return IfcUtil::Argument_ENTITY; } return IfcRelAssigns::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 6: return Type::IfcControl; } return IfcRelAssigns::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 6: return "RelatingControl"; } return IfcRelAssigns::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRelAssignsToControl (IfcAbstractEntityPtr e);
-    IfcRelAssignsToControl (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, SHARED_PTR< IfcTemplatedEntityList< IfcObjectDefinition > > v5_RelatedObjects, boost::optional< IfcObjectTypeEnum::IfcObjectTypeEnum > v6_RelatedObjectsType, IfcControl* v7_RelatingControl);
-    typedef IfcRelAssignsToControl* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRelAssignsToControl > > list;
-    typedef IfcTemplatedEntityList< IfcRelAssignsToControl >::it it;
+    IfcRelAssignsToControl (IfcAbstractEntity* e);
+    IfcRelAssignsToControl (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcTemplatedEntityList< IfcObjectDefinition >::ptr v5_RelatedObjects, boost::optional< IfcObjectTypeEnum::IfcObjectTypeEnum > v6_RelatedObjectsType, IfcControl* v7_RelatingControl);
+    typedef IfcTemplatedEntityList< IfcRelAssignsToControl > list;
 };
 /// The objectified relationship IfcRelAssignsToGroup handles the assignment of object definitions (individual object occurrences as subtypes of IfcObject, and object types as subtypes of IfcTypeObject) to a group (subtypes of IfcGroup).
 /// 
@@ -23125,20 +24039,19 @@ class IfcRelAssignsToControl : public IfcRelAssigns {
 class IfcRelAssignsToGroup : public IfcRelAssigns {
 public:
     /// Reference to group that contains all assigned group members.
-    IfcGroup* RelatingGroup();
+    IfcGroup* RelatingGroup() const;
     void setRelatingGroup(IfcGroup* v);
     virtual unsigned int getArgumentCount() const { return 7; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 6: return IfcUtil::Argument_ENTITY; } return IfcRelAssigns::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 6: return Type::IfcGroup; } return IfcRelAssigns::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 6: return "RelatingGroup"; } return IfcRelAssigns::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRelAssignsToGroup (IfcAbstractEntityPtr e);
-    IfcRelAssignsToGroup (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, SHARED_PTR< IfcTemplatedEntityList< IfcObjectDefinition > > v5_RelatedObjects, boost::optional< IfcObjectTypeEnum::IfcObjectTypeEnum > v6_RelatedObjectsType, IfcGroup* v7_RelatingGroup);
-    typedef IfcRelAssignsToGroup* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRelAssignsToGroup > > list;
-    typedef IfcTemplatedEntityList< IfcRelAssignsToGroup >::it it;
+    IfcRelAssignsToGroup (IfcAbstractEntity* e);
+    IfcRelAssignsToGroup (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcTemplatedEntityList< IfcObjectDefinition >::ptr v5_RelatedObjects, boost::optional< IfcObjectTypeEnum::IfcObjectTypeEnum > v6_RelatedObjectsType, IfcGroup* v7_RelatingGroup);
+    typedef IfcTemplatedEntityList< IfcRelAssignsToGroup > list;
 };
 /// The objectified relationship IfcRelAssignsToGroupByFactor is a specialization of the general grouping mechanism. It allows to add a factor to define the ratio that applies to the assignment of object definitions (individual object occurrences as subtypes of IfcObject and object types as subtypes of IfcTypeObject) to a group (subtypes of IfcGroup).
 /// 
@@ -23152,20 +24065,19 @@ class IfcRelAssignsToGroup : public IfcRelAssigns {
 class IfcRelAssignsToGroupByFactor : public IfcRelAssignsToGroup {
 public:
     /// Factor provided as a ratio measure that identifies the fraction or weighted factor that applies to the group assignment.
-    IfcRatioMeasure Factor();
-    void setFactor(IfcRatioMeasure v);
+    double Factor() const;
+    void setFactor(double v);
     virtual unsigned int getArgumentCount() const { return 8; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 7: return IfcUtil::Argument_DOUBLE; } return IfcRelAssignsToGroup::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 7: return Type::IfcRatioMeasure; } return IfcRelAssignsToGroup::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 7: return "Factor"; } return IfcRelAssignsToGroup::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRelAssignsToGroupByFactor (IfcAbstractEntityPtr e);
-    IfcRelAssignsToGroupByFactor (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, SHARED_PTR< IfcTemplatedEntityList< IfcObjectDefinition > > v5_RelatedObjects, boost::optional< IfcObjectTypeEnum::IfcObjectTypeEnum > v6_RelatedObjectsType, IfcGroup* v7_RelatingGroup, IfcRatioMeasure v8_Factor);
-    typedef IfcRelAssignsToGroupByFactor* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRelAssignsToGroupByFactor > > list;
-    typedef IfcTemplatedEntityList< IfcRelAssignsToGroupByFactor >::it it;
+    IfcRelAssignsToGroupByFactor (IfcAbstractEntity* e);
+    IfcRelAssignsToGroupByFactor (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcTemplatedEntityList< IfcObjectDefinition >::ptr v5_RelatedObjects, boost::optional< IfcObjectTypeEnum::IfcObjectTypeEnum > v6_RelatedObjectsType, IfcGroup* v7_RelatingGroup, double v8_Factor);
+    typedef IfcTemplatedEntityList< IfcRelAssignsToGroupByFactor > list;
 };
 /// The objectified relationship IfcRelAssignsToProcess handles the assignment of one or many objects to a process or activity. An object can be a product that is the item the process operates on. Processes and activities can operate on things other than products, and can operate in ways other than input and output.
 /// 
@@ -23194,25 +24106,24 @@ class IfcRelAssignsToProcess : public IfcRelAssigns {
     /// Reference to the process to which the objects are assigned to.
     /// 
     /// IFC2x4 CHANGE Datatype expanded to include IfcProcess and IfcTypeProcess.
-    IfcProcessSelect RelatingProcess();
-    void setRelatingProcess(IfcProcessSelect v);
+    IfcProcessSelect* RelatingProcess() const;
+    void setRelatingProcess(IfcProcessSelect* v);
     /// Whether the optional attribute QuantityInProcess is defined for this IfcRelAssignsToProcess
-    bool hasQuantityInProcess();
+    bool hasQuantityInProcess() const;
     /// Quantity of the object specific for the operation by this process.
-    IfcMeasureWithUnit* QuantityInProcess();
+    IfcMeasureWithUnit* QuantityInProcess() const;
     void setQuantityInProcess(IfcMeasureWithUnit* v);
     virtual unsigned int getArgumentCount() const { return 8; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 6: return IfcUtil::Argument_ENTITY; case 7: return IfcUtil::Argument_ENTITY; } return IfcRelAssigns::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 6: return Type::IfcProcessSelect; case 7: return Type::IfcMeasureWithUnit; } return IfcRelAssigns::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 6: return "RelatingProcess"; case 7: return "QuantityInProcess"; } return IfcRelAssigns::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRelAssignsToProcess (IfcAbstractEntityPtr e);
-    IfcRelAssignsToProcess (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, SHARED_PTR< IfcTemplatedEntityList< IfcObjectDefinition > > v5_RelatedObjects, boost::optional< IfcObjectTypeEnum::IfcObjectTypeEnum > v6_RelatedObjectsType, IfcProcessSelect v7_RelatingProcess, IfcMeasureWithUnit* v8_QuantityInProcess);
-    typedef IfcRelAssignsToProcess* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRelAssignsToProcess > > list;
-    typedef IfcTemplatedEntityList< IfcRelAssignsToProcess >::it it;
+    IfcRelAssignsToProcess (IfcAbstractEntity* e);
+    IfcRelAssignsToProcess (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcTemplatedEntityList< IfcObjectDefinition >::ptr v5_RelatedObjects, boost::optional< IfcObjectTypeEnum::IfcObjectTypeEnum > v6_RelatedObjectsType, IfcProcessSelect* v7_RelatingProcess, IfcMeasureWithUnit* v8_QuantityInProcess);
+    typedef IfcTemplatedEntityList< IfcRelAssignsToProcess > list;
 };
 /// The objectified relationshipÿIfcRelAssignsToProduct handles the assignment of objects (subtypes of IfcObject) to a product (subtypes of IfcProduct). The Name attribute should be used to classify the usage of the IfcRelAssignsToProduct objectified relationship. The following Name values are proposed:
 /// 
@@ -23227,20 +24138,19 @@ class IfcRelAssignsToProduct : public IfcRelAssigns {
     /// Reference to the product or product type to which the objects are assigned to.
     /// 
     /// IFC2x4 CHANGE Datatype expanded to include IfcProduct and IfcTypeProduct.
-    IfcProductSelect RelatingProduct();
-    void setRelatingProduct(IfcProductSelect v);
+    IfcProductSelect* RelatingProduct() const;
+    void setRelatingProduct(IfcProductSelect* v);
     virtual unsigned int getArgumentCount() const { return 7; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 6: return IfcUtil::Argument_ENTITY; } return IfcRelAssigns::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 6: return Type::IfcProductSelect; } return IfcRelAssigns::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 6: return "RelatingProduct"; } return IfcRelAssigns::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRelAssignsToProduct (IfcAbstractEntityPtr e);
-    IfcRelAssignsToProduct (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, SHARED_PTR< IfcTemplatedEntityList< IfcObjectDefinition > > v5_RelatedObjects, boost::optional< IfcObjectTypeEnum::IfcObjectTypeEnum > v6_RelatedObjectsType, IfcProductSelect v7_RelatingProduct);
-    typedef IfcRelAssignsToProduct* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRelAssignsToProduct > > list;
-    typedef IfcTemplatedEntityList< IfcRelAssignsToProduct >::it it;
+    IfcRelAssignsToProduct (IfcAbstractEntity* e);
+    IfcRelAssignsToProduct (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcTemplatedEntityList< IfcObjectDefinition >::ptr v5_RelatedObjects, boost::optional< IfcObjectTypeEnum::IfcObjectTypeEnum > v6_RelatedObjectsType, IfcProductSelect* v7_RelatingProduct);
+    typedef IfcTemplatedEntityList< IfcRelAssignsToProduct > list;
 };
 /// The objectified relationship IfcRelAssignsToResource handles the assignment of objects
 /// (as subtypes of IfcObject), acting as a resource usage or consumption, to a resource (as subtypes of IfcResource).
@@ -23253,20 +24163,19 @@ class IfcRelAssignsToResource : public IfcRelAssigns {
     /// Reference to the resource to which the objects are assigned to.
     /// 
     /// IFC2x4 CHANGE Datatype expanded to include IfcResource and IfcTypeResource.
-    IfcResourceSelect RelatingResource();
-    void setRelatingResource(IfcResourceSelect v);
+    IfcResourceSelect* RelatingResource() const;
+    void setRelatingResource(IfcResourceSelect* v);
     virtual unsigned int getArgumentCount() const { return 7; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 6: return IfcUtil::Argument_ENTITY; } return IfcRelAssigns::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 6: return Type::IfcResourceSelect; } return IfcRelAssigns::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 6: return "RelatingResource"; } return IfcRelAssigns::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRelAssignsToResource (IfcAbstractEntityPtr e);
-    IfcRelAssignsToResource (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, SHARED_PTR< IfcTemplatedEntityList< IfcObjectDefinition > > v5_RelatedObjects, boost::optional< IfcObjectTypeEnum::IfcObjectTypeEnum > v6_RelatedObjectsType, IfcResourceSelect v7_RelatingResource);
-    typedef IfcRelAssignsToResource* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRelAssignsToResource > > list;
-    typedef IfcTemplatedEntityList< IfcRelAssignsToResource >::it it;
+    IfcRelAssignsToResource (IfcAbstractEntity* e);
+    IfcRelAssignsToResource (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcTemplatedEntityList< IfcObjectDefinition >::ptr v5_RelatedObjects, boost::optional< IfcObjectTypeEnum::IfcObjectTypeEnum > v6_RelatedObjectsType, IfcResourceSelect* v7_RelatingResource);
+    typedef IfcTemplatedEntityList< IfcRelAssignsToResource > list;
 };
 /// The association relationship
 ///   IfcRelAssociates refers to external sources of
@@ -23314,20 +24223,19 @@ class IfcRelAssociates : public IfcRelationship {
     /// Set of object or property definitions to which the external references or information is associated. It includes object and type objects, property set templates, property templates and property sets and contexts.
     /// 
     /// IFC2x4 CHANGE  The attribute datatype has been changed from IfcRoot to IfcDefinitionSelect.
-    SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > RelatedObjects();
-    void setRelatedObjects(SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > v);
+    IfcEntityList::ptr RelatedObjects() const;
+    void setRelatedObjects(IfcEntityList::ptr v);
     virtual unsigned int getArgumentCount() const { return 5; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 4: return IfcUtil::Argument_ENTITY_LIST; } return IfcRelationship::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 4: return Type::IfcDefinitionSelect; } return IfcRelationship::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 4: return "RelatedObjects"; } return IfcRelationship::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRelAssociates (IfcAbstractEntityPtr e);
-    IfcRelAssociates (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, IfcEntities v5_RelatedObjects);
-    typedef IfcRelAssociates* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRelAssociates > > list;
-    typedef IfcTemplatedEntityList< IfcRelAssociates >::it it;
+    IfcRelAssociates (IfcAbstractEntity* e);
+    IfcRelAssociates (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcEntityList::ptr v5_RelatedObjects);
+    typedef IfcTemplatedEntityList< IfcRelAssociates > list;
 };
 /// The entity IfcRelAssociatesApproval is used to apply approval information defined by IfcApproval, in IfcApprovalResource schema, to subtypes of IfcRoot.
 /// 
@@ -23335,20 +24243,19 @@ class IfcRelAssociates : public IfcRelationship {
 class IfcRelAssociatesApproval : public IfcRelAssociates {
 public:
     /// Reference to approval that is being applied using this relationship.
-    IfcApproval* RelatingApproval();
+    IfcApproval* RelatingApproval() const;
     void setRelatingApproval(IfcApproval* v);
     virtual unsigned int getArgumentCount() const { return 6; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 5: return IfcUtil::Argument_ENTITY; } return IfcRelAssociates::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 5: return Type::IfcApproval; } return IfcRelAssociates::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 5: return "RelatingApproval"; } return IfcRelAssociates::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRelAssociatesApproval (IfcAbstractEntityPtr e);
-    IfcRelAssociatesApproval (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, IfcEntities v5_RelatedObjects, IfcApproval* v6_RelatingApproval);
-    typedef IfcRelAssociatesApproval* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRelAssociatesApproval > > list;
-    typedef IfcTemplatedEntityList< IfcRelAssociatesApproval >::it it;
+    IfcRelAssociatesApproval (IfcAbstractEntity* e);
+    IfcRelAssociatesApproval (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcEntityList::ptr v5_RelatedObjects, IfcApproval* v6_RelatingApproval);
+    typedef IfcTemplatedEntityList< IfcRelAssociatesApproval > list;
 };
 /// The objectified relationship
 /// IfcRelAssociatesClassification handles the assignment of a
@@ -23383,20 +24290,19 @@ class IfcRelAssociatesApproval : public IfcRelAssociates {
 class IfcRelAssociatesClassification : public IfcRelAssociates {
 public:
     /// Classification applied to the objects.
-    IfcClassificationSelect RelatingClassification();
-    void setRelatingClassification(IfcClassificationSelect v);
+    IfcClassificationSelect* RelatingClassification() const;
+    void setRelatingClassification(IfcClassificationSelect* v);
     virtual unsigned int getArgumentCount() const { return 6; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 5: return IfcUtil::Argument_ENTITY; } return IfcRelAssociates::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 5: return Type::IfcClassificationSelect; } return IfcRelAssociates::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 5: return "RelatingClassification"; } return IfcRelAssociates::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRelAssociatesClassification (IfcAbstractEntityPtr e);
-    IfcRelAssociatesClassification (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, IfcEntities v5_RelatedObjects, IfcClassificationSelect v6_RelatingClassification);
-    typedef IfcRelAssociatesClassification* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRelAssociatesClassification > > list;
-    typedef IfcTemplatedEntityList< IfcRelAssociatesClassification >::it it;
+    IfcRelAssociatesClassification (IfcAbstractEntity* e);
+    IfcRelAssociatesClassification (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcEntityList::ptr v5_RelatedObjects, IfcClassificationSelect* v6_RelatingClassification);
+    typedef IfcTemplatedEntityList< IfcRelAssociatesClassification > list;
 };
 /// The entity IfcRelAssociatesConstraint is used to apply constraint information defined by IfcConstraint, in the IfcConstraintResource schema, to subtypes of IfcRoot.
 /// 
@@ -23404,25 +24310,24 @@ class IfcRelAssociatesClassification : public IfcRelAssociates {
 class IfcRelAssociatesConstraint : public IfcRelAssociates {
 public:
     /// Whether the optional attribute Intent is defined for this IfcRelAssociatesConstraint
-    bool hasIntent();
+    bool hasIntent() const;
     /// The intent of the constraint usage with regard to its related IfcConstraint and IfcObjects, IfcPropertyDefinitions or IfcRelationships. Typical values can be e.g. RATIONALE or EXPECTED PERFORMANCE.
-    IfcLabel Intent();
-    void setIntent(IfcLabel v);
+    std::string Intent() const;
+    void setIntent(std::string v);
     /// Reference to constraint that is being applied using this relationship.
-    IfcConstraint* RelatingConstraint();
+    IfcConstraint* RelatingConstraint() const;
     void setRelatingConstraint(IfcConstraint* v);
     virtual unsigned int getArgumentCount() const { return 7; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 5: return IfcUtil::Argument_STRING; case 6: return IfcUtil::Argument_ENTITY; } return IfcRelAssociates::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 5: return Type::IfcLabel; case 6: return Type::IfcConstraint; } return IfcRelAssociates::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 5: return "Intent"; case 6: return "RelatingConstraint"; } return IfcRelAssociates::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRelAssociatesConstraint (IfcAbstractEntityPtr e);
-    IfcRelAssociatesConstraint (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, IfcEntities v5_RelatedObjects, boost::optional< IfcLabel > v6_Intent, IfcConstraint* v7_RelatingConstraint);
-    typedef IfcRelAssociatesConstraint* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRelAssociatesConstraint > > list;
-    typedef IfcTemplatedEntityList< IfcRelAssociatesConstraint >::it it;
+    IfcRelAssociatesConstraint (IfcAbstractEntity* e);
+    IfcRelAssociatesConstraint (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcEntityList::ptr v5_RelatedObjects, boost::optional< std::string > v6_Intent, IfcConstraint* v7_RelatingConstraint);
+    typedef IfcTemplatedEntityList< IfcRelAssociatesConstraint > list;
 };
 /// The objectified relationship (IfcRelAssociatesDocument) handles the assignment of a document information (items of the select IfcDocumentSelect) to objects occurrences (subtypes of IfcObject) or object types (subtypes of IfcTypeObject).
 /// 
@@ -23434,20 +24339,19 @@ class IfcRelAssociatesConstraint : public IfcRelAssociates {
 class IfcRelAssociatesDocument : public IfcRelAssociates {
 public:
     /// Document information or reference which is applied to the objects.
-    IfcDocumentSelect RelatingDocument();
-    void setRelatingDocument(IfcDocumentSelect v);
+    IfcDocumentSelect* RelatingDocument() const;
+    void setRelatingDocument(IfcDocumentSelect* v);
     virtual unsigned int getArgumentCount() const { return 6; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 5: return IfcUtil::Argument_ENTITY; } return IfcRelAssociates::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 5: return Type::IfcDocumentSelect; } return IfcRelAssociates::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 5: return "RelatingDocument"; } return IfcRelAssociates::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRelAssociatesDocument (IfcAbstractEntityPtr e);
-    IfcRelAssociatesDocument (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, IfcEntities v5_RelatedObjects, IfcDocumentSelect v6_RelatingDocument);
-    typedef IfcRelAssociatesDocument* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRelAssociatesDocument > > list;
-    typedef IfcTemplatedEntityList< IfcRelAssociatesDocument >::it it;
+    IfcRelAssociatesDocument (IfcAbstractEntity* e);
+    IfcRelAssociatesDocument (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcEntityList::ptr v5_RelatedObjects, IfcDocumentSelect* v6_RelatingDocument);
+    typedef IfcTemplatedEntityList< IfcRelAssociatesDocument > list;
 };
 /// The objectified relationship (IfcRelAssociatesLibrary) handles the assignment of a library item (items of the select IfcLibrarySelect) to subtypes of IfcObjectDefinition or IfcPropertyDefinition. 
 /// 
@@ -23459,20 +24363,19 @@ class IfcRelAssociatesDocument : public IfcRelAssociates {
 class IfcRelAssociatesLibrary : public IfcRelAssociates {
 public:
     /// Reference to a library, from which the definition of the property set is taken.
-    IfcLibrarySelect RelatingLibrary();
-    void setRelatingLibrary(IfcLibrarySelect v);
+    IfcLibrarySelect* RelatingLibrary() const;
+    void setRelatingLibrary(IfcLibrarySelect* v);
     virtual unsigned int getArgumentCount() const { return 6; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 5: return IfcUtil::Argument_ENTITY; } return IfcRelAssociates::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 5: return Type::IfcLibrarySelect; } return IfcRelAssociates::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 5: return "RelatingLibrary"; } return IfcRelAssociates::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRelAssociatesLibrary (IfcAbstractEntityPtr e);
-    IfcRelAssociatesLibrary (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, IfcEntities v5_RelatedObjects, IfcLibrarySelect v6_RelatingLibrary);
-    typedef IfcRelAssociatesLibrary* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRelAssociatesLibrary > > list;
-    typedef IfcTemplatedEntityList< IfcRelAssociatesLibrary >::it it;
+    IfcRelAssociatesLibrary (IfcAbstractEntity* e);
+    IfcRelAssociatesLibrary (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcEntityList::ptr v5_RelatedObjects, IfcLibrarySelect* v6_RelatingLibrary);
+    typedef IfcTemplatedEntityList< IfcRelAssociatesLibrary > list;
 };
 /// Definition from IAI: Objectified relationship between a
 /// material definition and elements or element types to which this
@@ -23571,20 +24474,19 @@ class IfcRelAssociatesLibrary : public IfcRelAssociates {
 class IfcRelAssociatesMaterial : public IfcRelAssociates {
 public:
     /// Material definition assigned to the elements or element types.
-    IfcMaterialSelect RelatingMaterial();
-    void setRelatingMaterial(IfcMaterialSelect v);
+    IfcMaterialSelect* RelatingMaterial() const;
+    void setRelatingMaterial(IfcMaterialSelect* v);
     virtual unsigned int getArgumentCount() const { return 6; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 5: return IfcUtil::Argument_ENTITY; } return IfcRelAssociates::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 5: return Type::IfcMaterialSelect; } return IfcRelAssociates::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 5: return "RelatingMaterial"; } return IfcRelAssociates::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRelAssociatesMaterial (IfcAbstractEntityPtr e);
-    IfcRelAssociatesMaterial (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, IfcEntities v5_RelatedObjects, IfcMaterialSelect v6_RelatingMaterial);
-    typedef IfcRelAssociatesMaterial* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRelAssociatesMaterial > > list;
-    typedef IfcTemplatedEntityList< IfcRelAssociatesMaterial >::it it;
+    IfcRelAssociatesMaterial (IfcAbstractEntity* e);
+    IfcRelAssociatesMaterial (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcEntityList::ptr v5_RelatedObjects, IfcMaterialSelect* v6_RelatingMaterial);
+    typedef IfcTemplatedEntityList< IfcRelAssociatesMaterial > list;
 };
 /// IfcRelConnects is a connectivity relationship that connects objects under some criteria. As a general connectivity it does not imply constraints, however subtypes of the relationship define the applicable object types for the connectivity relationship and the semantics of the particular connectivity. 
 /// 
@@ -23593,16 +24495,15 @@ class IfcRelConnects : public IfcRelationship {
 public:
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcRelationship::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcRelationship::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcRelationship::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRelConnects (IfcAbstractEntityPtr e);
-    IfcRelConnects (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description);
-    typedef IfcRelConnects* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRelConnects > > list;
-    typedef IfcTemplatedEntityList< IfcRelConnects >::it it;
+    IfcRelConnects (IfcAbstractEntity* e);
+    IfcRelConnects (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description);
+    typedef IfcTemplatedEntityList< IfcRelConnects > list;
 };
 /// Definition from IAI: The
 ///   IfcRelConnectsElements objectified relationship
@@ -23629,28 +24530,27 @@ class IfcRelConnects : public IfcRelationship {
 class IfcRelConnectsElements : public IfcRelConnects {
 public:
     /// Whether the optional attribute ConnectionGeometry is defined for this IfcRelConnectsElements
-    bool hasConnectionGeometry();
+    bool hasConnectionGeometry() const;
     /// The geometric shape representation of the connection geometry that is provided in the object coordinate system of the RelatingElement (mandatory) and in the object coordinate system of the RelatedElement (optionally).
-    IfcConnectionGeometry* ConnectionGeometry();
+    IfcConnectionGeometry* ConnectionGeometry() const;
     void setConnectionGeometry(IfcConnectionGeometry* v);
     /// Reference to a subtype of IfcElement that is connected by the connection relationship in the role of RelatingElement.
-    IfcElement* RelatingElement();
+    IfcElement* RelatingElement() const;
     void setRelatingElement(IfcElement* v);
     /// Reference to a subtype of IfcElement that is connected by the connection relationship in the role of RelatedElement.
-    IfcElement* RelatedElement();
+    IfcElement* RelatedElement() const;
     void setRelatedElement(IfcElement* v);
     virtual unsigned int getArgumentCount() const { return 7; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 4: return IfcUtil::Argument_ENTITY; case 5: return IfcUtil::Argument_ENTITY; case 6: return IfcUtil::Argument_ENTITY; } return IfcRelConnects::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 4: return Type::IfcConnectionGeometry; case 5: return Type::IfcElement; case 6: return Type::IfcElement; } return IfcRelConnects::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 4: return "ConnectionGeometry"; case 5: return "RelatingElement"; case 6: return "RelatedElement"; } return IfcRelConnects::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRelConnectsElements (IfcAbstractEntityPtr e);
-    IfcRelConnectsElements (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, IfcConnectionGeometry* v5_ConnectionGeometry, IfcElement* v6_RelatingElement, IfcElement* v7_RelatedElement);
-    typedef IfcRelConnectsElements* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRelConnectsElements > > list;
-    typedef IfcTemplatedEntityList< IfcRelConnectsElements >::it it;
+    IfcRelConnectsElements (IfcAbstractEntity* e);
+    IfcRelConnectsElements (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcConnectionGeometry* v5_ConnectionGeometry, IfcElement* v6_RelatingElement, IfcElement* v7_RelatedElement);
+    typedef IfcTemplatedEntityList< IfcRelConnectsElements > list;
 };
 /// The
 /// IfcRelConnectsPathElements relationship provides the connectivity information between two elements, which have path information.
@@ -23687,29 +24587,28 @@ class IfcRelConnectsElements : public IfcRelConnects {
 class IfcRelConnectsPathElements : public IfcRelConnectsElements {
 public:
     /// Priorities for connection. It refers to the layers of the RelatingObject.
-    std::vector< double > /*[0:?]*/ RelatingPriorities();
+    std::vector< double > /*[0:?]*/ RelatingPriorities() const;
     void setRelatingPriorities(std::vector< double > /*[0:?]*/ v);
     /// Priorities for connection. It refers to the layers of the RelatedObject.
-    std::vector< double > /*[0:?]*/ RelatedPriorities();
+    std::vector< double > /*[0:?]*/ RelatedPriorities() const;
     void setRelatedPriorities(std::vector< double > /*[0:?]*/ v);
     /// Indication of the connection type in relation to the path of the RelatingObject.
-    IfcConnectionTypeEnum::IfcConnectionTypeEnum RelatedConnectionType();
+    IfcConnectionTypeEnum::IfcConnectionTypeEnum RelatedConnectionType() const;
     void setRelatedConnectionType(IfcConnectionTypeEnum::IfcConnectionTypeEnum v);
     /// Indication of the connection type in relation to the path of the RelatingObject.
-    IfcConnectionTypeEnum::IfcConnectionTypeEnum RelatingConnectionType();
+    IfcConnectionTypeEnum::IfcConnectionTypeEnum RelatingConnectionType() const;
     void setRelatingConnectionType(IfcConnectionTypeEnum::IfcConnectionTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 11; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 7: return IfcUtil::Argument_VECTOR_DOUBLE; case 8: return IfcUtil::Argument_VECTOR_DOUBLE; case 9: return IfcUtil::Argument_ENUMERATION; case 10: return IfcUtil::Argument_ENUMERATION; } return IfcRelConnectsElements::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 7: return Type::UNDEFINED; case 8: return Type::UNDEFINED; case 9: return Type::IfcConnectionTypeEnum; case 10: return Type::IfcConnectionTypeEnum; } return IfcRelConnectsElements::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 7: return "RelatingPriorities"; case 8: return "RelatedPriorities"; case 9: return "RelatedConnectionType"; case 10: return "RelatingConnectionType"; } return IfcRelConnectsElements::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRelConnectsPathElements (IfcAbstractEntityPtr e);
-    IfcRelConnectsPathElements (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, IfcConnectionGeometry* v5_ConnectionGeometry, IfcElement* v6_RelatingElement, IfcElement* v7_RelatedElement, std::vector< double > /*[0:?]*/ v8_RelatingPriorities, std::vector< double > /*[0:?]*/ v9_RelatedPriorities, IfcConnectionTypeEnum::IfcConnectionTypeEnum v10_RelatedConnectionType, IfcConnectionTypeEnum::IfcConnectionTypeEnum v11_RelatingConnectionType);
-    typedef IfcRelConnectsPathElements* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRelConnectsPathElements > > list;
-    typedef IfcTemplatedEntityList< IfcRelConnectsPathElements >::it it;
+    IfcRelConnectsPathElements (IfcAbstractEntity* e);
+    IfcRelConnectsPathElements (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcConnectionGeometry* v5_ConnectionGeometry, IfcElement* v6_RelatingElement, IfcElement* v7_RelatedElement, std::vector< double > /*[0:?]*/ v8_RelatingPriorities, std::vector< double > /*[0:?]*/ v9_RelatedPriorities, IfcConnectionTypeEnum::IfcConnectionTypeEnum v10_RelatedConnectionType, IfcConnectionTypeEnum::IfcConnectionTypeEnum v11_RelatingConnectionType);
+    typedef IfcTemplatedEntityList< IfcRelConnectsPathElements > list;
 };
 /// The objectified relationship
 /// IfcRelConnectsPortToElement defines the relationship that
@@ -23739,25 +24638,24 @@ class IfcRelConnectsPathElements : public IfcRelConnectsElements {
 class IfcRelConnectsPortToElement : public IfcRelConnects {
 public:
     /// Reference to an Port that is connected by the objectified relationship.
-    IfcPort* RelatingPort();
+    IfcPort* RelatingPort() const;
     void setRelatingPort(IfcPort* v);
     /// Reference to an IfcElement, or IfcElementType that has ports assigned.
     /// 
     /// IFC2x4 CHANGE  Data type extended to IfcObjectDefinition to enable elements and element types for the port relationship.
-    IfcDistributionElement* RelatedElement();
+    IfcDistributionElement* RelatedElement() const;
     void setRelatedElement(IfcDistributionElement* v);
     virtual unsigned int getArgumentCount() const { return 6; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 4: return IfcUtil::Argument_ENTITY; case 5: return IfcUtil::Argument_ENTITY; } return IfcRelConnects::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 4: return Type::IfcPort; case 5: return Type::IfcDistributionElement; } return IfcRelConnects::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 4: return "RelatingPort"; case 5: return "RelatedElement"; } return IfcRelConnects::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRelConnectsPortToElement (IfcAbstractEntityPtr e);
-    IfcRelConnectsPortToElement (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, IfcPort* v5_RelatingPort, IfcDistributionElement* v6_RelatedElement);
-    typedef IfcRelConnectsPortToElement* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRelConnectsPortToElement > > list;
-    typedef IfcTemplatedEntityList< IfcRelConnectsPortToElement >::it it;
+    IfcRelConnectsPortToElement (IfcAbstractEntity* e);
+    IfcRelConnectsPortToElement (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcPort* v5_RelatingPort, IfcDistributionElement* v6_RelatedElement);
+    typedef IfcTemplatedEntityList< IfcRelConnectsPortToElement > list;
 };
 /// Definition from IAI: An IfcRelConnectsPorts
 ///   defines the relationship that is made between two ports at
@@ -23775,28 +24673,27 @@ class IfcRelConnectsPortToElement : public IfcRelConnects {
 class IfcRelConnectsPorts : public IfcRelConnects {
 public:
     /// Reference to the first port that is connected by the objectified relationship.
-    IfcPort* RelatingPort();
+    IfcPort* RelatingPort() const;
     void setRelatingPort(IfcPort* v);
     /// Reference to the second port that is connected by the objectified relationship.
-    IfcPort* RelatedPort();
+    IfcPort* RelatedPort() const;
     void setRelatedPort(IfcPort* v);
     /// Whether the optional attribute RealizingElement is defined for this IfcRelConnectsPorts
-    bool hasRealizingElement();
+    bool hasRealizingElement() const;
     /// Defines the element that realizes a port connection relationship.
-    IfcElement* RealizingElement();
+    IfcElement* RealizingElement() const;
     void setRealizingElement(IfcElement* v);
     virtual unsigned int getArgumentCount() const { return 7; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 4: return IfcUtil::Argument_ENTITY; case 5: return IfcUtil::Argument_ENTITY; case 6: return IfcUtil::Argument_ENTITY; } return IfcRelConnects::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 4: return Type::IfcPort; case 5: return Type::IfcPort; case 6: return Type::IfcElement; } return IfcRelConnects::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 4: return "RelatingPort"; case 5: return "RelatedPort"; case 6: return "RealizingElement"; } return IfcRelConnects::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRelConnectsPorts (IfcAbstractEntityPtr e);
-    IfcRelConnectsPorts (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, IfcPort* v5_RelatingPort, IfcPort* v6_RelatedPort, IfcElement* v7_RealizingElement);
-    typedef IfcRelConnectsPorts* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRelConnectsPorts > > list;
-    typedef IfcTemplatedEntityList< IfcRelConnectsPorts >::it it;
+    IfcRelConnectsPorts (IfcAbstractEntity* e);
+    IfcRelConnectsPorts (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcPort* v5_RelatingPort, IfcPort* v6_RelatedPort, IfcElement* v7_RealizingElement);
+    typedef IfcTemplatedEntityList< IfcRelConnectsPorts > list;
 };
 /// Definition from IAI: The IfcRelConnectsStructuralActivity relationship connects a structural activity (either an action or reaction) to a structural member, structural connection, or element.
 /// 
@@ -23804,23 +24701,22 @@ class IfcRelConnectsPorts : public IfcRelConnects {
 class IfcRelConnectsStructuralActivity : public IfcRelConnects {
 public:
     /// Reference to a structural item or element to which the specified activity is applied.
-    IfcStructuralActivityAssignmentSelect RelatingElement();
-    void setRelatingElement(IfcStructuralActivityAssignmentSelect v);
+    IfcStructuralActivityAssignmentSelect* RelatingElement() const;
+    void setRelatingElement(IfcStructuralActivityAssignmentSelect* v);
     /// Reference to a structural activity which is acting upon the specified structural item or element.
-    IfcStructuralActivity* RelatedStructuralActivity();
+    IfcStructuralActivity* RelatedStructuralActivity() const;
     void setRelatedStructuralActivity(IfcStructuralActivity* v);
     virtual unsigned int getArgumentCount() const { return 6; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 4: return IfcUtil::Argument_ENTITY; case 5: return IfcUtil::Argument_ENTITY; } return IfcRelConnects::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 4: return Type::IfcStructuralActivityAssignmentSelect; case 5: return Type::IfcStructuralActivity; } return IfcRelConnects::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 4: return "RelatingElement"; case 5: return "RelatedStructuralActivity"; } return IfcRelConnects::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRelConnectsStructuralActivity (IfcAbstractEntityPtr e);
-    IfcRelConnectsStructuralActivity (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, IfcStructuralActivityAssignmentSelect v5_RelatingElement, IfcStructuralActivity* v6_RelatedStructuralActivity);
-    typedef IfcRelConnectsStructuralActivity* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRelConnectsStructuralActivity > > list;
-    typedef IfcTemplatedEntityList< IfcRelConnectsStructuralActivity >::it it;
+    IfcRelConnectsStructuralActivity (IfcAbstractEntity* e);
+    IfcRelConnectsStructuralActivity (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcStructuralActivityAssignmentSelect* v5_RelatingElement, IfcStructuralActivity* v6_RelatedStructuralActivity);
+    typedef IfcTemplatedEntityList< IfcRelConnectsStructuralActivity > list;
 };
 /// The entity IfcRelConnectsStructuralMember defines all needed properties describing the connection between structural members and structural connection objects (nodes or supports).
 /// 
@@ -23849,43 +24745,42 @@ class IfcRelConnectsStructuralActivity : public IfcRelConnects {
 class IfcRelConnectsStructuralMember : public IfcRelConnects {
 public:
     /// Reference to an instance of IfcStructuralMember (or its subclasses) which is connected to the specified structural connection.
-    IfcStructuralMember* RelatingStructuralMember();
+    IfcStructuralMember* RelatingStructuralMember() const;
     void setRelatingStructuralMember(IfcStructuralMember* v);
     /// Reference to an instance of IfcStructuralConnection (or its subclasses) which is connected to the specified structural member.
-    IfcStructuralConnection* RelatedStructuralConnection();
+    IfcStructuralConnection* RelatedStructuralConnection() const;
     void setRelatedStructuralConnection(IfcStructuralConnection* v);
     /// Whether the optional attribute AppliedCondition is defined for this IfcRelConnectsStructuralMember
-    bool hasAppliedCondition();
+    bool hasAppliedCondition() const;
     /// Conditions which define the connections properties.  Connection conditions are often called "release" but are not only used to define mechanisms like hinges but also rigid, elastic, and other conditions.
-    IfcBoundaryCondition* AppliedCondition();
+    IfcBoundaryCondition* AppliedCondition() const;
     void setAppliedCondition(IfcBoundaryCondition* v);
     /// Whether the optional attribute AdditionalConditions is defined for this IfcRelConnectsStructuralMember
-    bool hasAdditionalConditions();
+    bool hasAdditionalConditions() const;
     /// Describes additional connection properties.
-    IfcStructuralConnectionCondition* AdditionalConditions();
+    IfcStructuralConnectionCondition* AdditionalConditions() const;
     void setAdditionalConditions(IfcStructuralConnectionCondition* v);
     /// Whether the optional attribute SupportedLength is defined for this IfcRelConnectsStructuralMember
-    bool hasSupportedLength();
+    bool hasSupportedLength() const;
     /// Defines the 'supported length' of this structural connection. See Fig. for more detail.
-    IfcLengthMeasure SupportedLength();
-    void setSupportedLength(IfcLengthMeasure v);
+    double SupportedLength() const;
+    void setSupportedLength(double v);
     /// Whether the optional attribute ConditionCoordinateSystem is defined for this IfcRelConnectsStructuralMember
-    bool hasConditionCoordinateSystem();
+    bool hasConditionCoordinateSystem() const;
     /// Defines a coordinate system used for the description of the connection properties in ConnectionCondition relative to the local coordinate system of RelatingStructuralMember.  If left unspecified, the placement IfcAxis2Placement3D((x,y,z), ?, ?) is implied with x,y,z being the local member coordinates where the connection is made and the default axes directions being in parallel with the local axes of RelatingStructuralMember.
-    IfcAxis2Placement3D* ConditionCoordinateSystem();
+    IfcAxis2Placement3D* ConditionCoordinateSystem() const;
     void setConditionCoordinateSystem(IfcAxis2Placement3D* v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 4: return IfcUtil::Argument_ENTITY; case 5: return IfcUtil::Argument_ENTITY; case 6: return IfcUtil::Argument_ENTITY; case 7: return IfcUtil::Argument_ENTITY; case 8: return IfcUtil::Argument_DOUBLE; case 9: return IfcUtil::Argument_ENTITY; } return IfcRelConnects::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 4: return Type::IfcStructuralMember; case 5: return Type::IfcStructuralConnection; case 6: return Type::IfcBoundaryCondition; case 7: return Type::IfcStructuralConnectionCondition; case 8: return Type::IfcLengthMeasure; case 9: return Type::IfcAxis2Placement3D; } return IfcRelConnects::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 4: return "RelatingStructuralMember"; case 5: return "RelatedStructuralConnection"; case 6: return "AppliedCondition"; case 7: return "AdditionalConditions"; case 8: return "SupportedLength"; case 9: return "ConditionCoordinateSystem"; } return IfcRelConnects::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRelConnectsStructuralMember (IfcAbstractEntityPtr e);
-    IfcRelConnectsStructuralMember (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, IfcStructuralMember* v5_RelatingStructuralMember, IfcStructuralConnection* v6_RelatedStructuralConnection, IfcBoundaryCondition* v7_AppliedCondition, IfcStructuralConnectionCondition* v8_AdditionalConditions, boost::optional< IfcLengthMeasure > v9_SupportedLength, IfcAxis2Placement3D* v10_ConditionCoordinateSystem);
-    typedef IfcRelConnectsStructuralMember* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRelConnectsStructuralMember > > list;
-    typedef IfcTemplatedEntityList< IfcRelConnectsStructuralMember >::it it;
+    IfcRelConnectsStructuralMember (IfcAbstractEntity* e);
+    IfcRelConnectsStructuralMember (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcStructuralMember* v5_RelatingStructuralMember, IfcStructuralConnection* v6_RelatedStructuralConnection, IfcBoundaryCondition* v7_AppliedCondition, IfcStructuralConnectionCondition* v8_AdditionalConditions, boost::optional< double > v9_SupportedLength, IfcAxis2Placement3D* v10_ConditionCoordinateSystem);
+    typedef IfcTemplatedEntityList< IfcRelConnectsStructuralMember > list;
 };
 /// Definition from IAI: The entity IfcRelConnectsWithEccentricity adds the definition of eccentricity to the connection between a structural member and a structural connection (representing either a node or support).
 /// 
@@ -23907,20 +24802,19 @@ class IfcRelConnectsStructuralMember : public IfcRelConnects {
 class IfcRelConnectsWithEccentricity : public IfcRelConnectsStructuralMember {
 public:
     /// The connection constraint explicitly states the eccentricity between a structural member and a structural connection by means of two topological objects (vertex and vertex, or edge and edge, or face and face).
-    IfcConnectionGeometry* ConnectionConstraint();
+    IfcConnectionGeometry* ConnectionConstraint() const;
     void setConnectionConstraint(IfcConnectionGeometry* v);
     virtual unsigned int getArgumentCount() const { return 11; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 10: return IfcUtil::Argument_ENTITY; } return IfcRelConnectsStructuralMember::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 10: return Type::IfcConnectionGeometry; } return IfcRelConnectsStructuralMember::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 10: return "ConnectionConstraint"; } return IfcRelConnectsStructuralMember::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRelConnectsWithEccentricity (IfcAbstractEntityPtr e);
-    IfcRelConnectsWithEccentricity (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, IfcStructuralMember* v5_RelatingStructuralMember, IfcStructuralConnection* v6_RelatedStructuralConnection, IfcBoundaryCondition* v7_AppliedCondition, IfcStructuralConnectionCondition* v8_AdditionalConditions, boost::optional< IfcLengthMeasure > v9_SupportedLength, IfcAxis2Placement3D* v10_ConditionCoordinateSystem, IfcConnectionGeometry* v11_ConnectionConstraint);
-    typedef IfcRelConnectsWithEccentricity* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRelConnectsWithEccentricity > > list;
-    typedef IfcTemplatedEntityList< IfcRelConnectsWithEccentricity >::it it;
+    IfcRelConnectsWithEccentricity (IfcAbstractEntity* e);
+    IfcRelConnectsWithEccentricity (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcStructuralMember* v5_RelatingStructuralMember, IfcStructuralConnection* v6_RelatedStructuralConnection, IfcBoundaryCondition* v7_AppliedCondition, IfcStructuralConnectionCondition* v8_AdditionalConditions, boost::optional< double > v9_SupportedLength, IfcAxis2Placement3D* v10_ConditionCoordinateSystem, IfcConnectionGeometry* v11_ConnectionConstraint);
+    typedef IfcTemplatedEntityList< IfcRelConnectsWithEccentricity > list;
 };
 /// Definition from IAI:
 ///   IfcRelConnectsWithRealizingElements defines a
@@ -23948,25 +24842,24 @@ class IfcRelConnectsWithEccentricity : public IfcRelConnectsStructuralMember {
 class IfcRelConnectsWithRealizingElements : public IfcRelConnectsElements {
 public:
     /// Defines the elements that realize a connection relationship.
-    SHARED_PTR< IfcTemplatedEntityList< IfcElement > > RealizingElements();
-    void setRealizingElements(SHARED_PTR< IfcTemplatedEntityList< IfcElement > > v);
+    IfcTemplatedEntityList< IfcElement >::ptr RealizingElements() const;
+    void setRealizingElements(IfcTemplatedEntityList< IfcElement >::ptr v);
     /// Whether the optional attribute ConnectionType is defined for this IfcRelConnectsWithRealizingElements
-    bool hasConnectionType();
+    bool hasConnectionType() const;
     /// The type of the connection given for informal purposes, it may include labels, like 'joint', 'rigid joint', 'flexible joint', etc.
-    IfcLabel ConnectionType();
-    void setConnectionType(IfcLabel v);
+    std::string ConnectionType() const;
+    void setConnectionType(std::string v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 7: return IfcUtil::Argument_ENTITY_LIST; case 8: return IfcUtil::Argument_STRING; } return IfcRelConnectsElements::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 7: return Type::IfcElement; case 8: return Type::IfcLabel; } return IfcRelConnectsElements::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 7: return "RealizingElements"; case 8: return "ConnectionType"; } return IfcRelConnectsElements::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRelConnectsWithRealizingElements (IfcAbstractEntityPtr e);
-    IfcRelConnectsWithRealizingElements (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, IfcConnectionGeometry* v5_ConnectionGeometry, IfcElement* v6_RelatingElement, IfcElement* v7_RelatedElement, SHARED_PTR< IfcTemplatedEntityList< IfcElement > > v8_RealizingElements, boost::optional< IfcLabel > v9_ConnectionType);
-    typedef IfcRelConnectsWithRealizingElements* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRelConnectsWithRealizingElements > > list;
-    typedef IfcTemplatedEntityList< IfcRelConnectsWithRealizingElements >::it it;
+    IfcRelConnectsWithRealizingElements (IfcAbstractEntity* e);
+    IfcRelConnectsWithRealizingElements (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcConnectionGeometry* v5_ConnectionGeometry, IfcElement* v6_RelatingElement, IfcElement* v7_RelatedElement, IfcTemplatedEntityList< IfcElement >::ptr v8_RealizingElements, boost::optional< std::string > v9_ConnectionType);
+    typedef IfcTemplatedEntityList< IfcRelConnectsWithRealizingElements > list;
 };
 /// This objectified relationship,
 ///   IfcRelContainedInSpatialStructure, is used to assign
@@ -24035,23 +24928,22 @@ class IfcRelContainedInSpatialStructure : public IfcRelConnects {
     /// Set of elements products, which are contained within this level of the spatial structure hierarchy.
     /// 
     /// IFC2x PLATFORM CHANGE  The data type has been changed from IfcElement to IfcProduct with upward compatibility
-    SHARED_PTR< IfcTemplatedEntityList< IfcProduct > > RelatedElements();
-    void setRelatedElements(SHARED_PTR< IfcTemplatedEntityList< IfcProduct > > v);
+    IfcTemplatedEntityList< IfcProduct >::ptr RelatedElements() const;
+    void setRelatedElements(IfcTemplatedEntityList< IfcProduct >::ptr v);
     /// Spatial structure element, within which the element is contained. Any element can only be contained within one element of the project spatial structure.
-    IfcSpatialElement* RelatingStructure();
+    IfcSpatialElement* RelatingStructure() const;
     void setRelatingStructure(IfcSpatialElement* v);
     virtual unsigned int getArgumentCount() const { return 6; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 4: return IfcUtil::Argument_ENTITY_LIST; case 5: return IfcUtil::Argument_ENTITY; } return IfcRelConnects::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 4: return Type::IfcProduct; case 5: return Type::IfcSpatialElement; } return IfcRelConnects::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 4: return "RelatedElements"; case 5: return "RelatingStructure"; } return IfcRelConnects::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRelContainedInSpatialStructure (IfcAbstractEntityPtr e);
-    IfcRelContainedInSpatialStructure (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, SHARED_PTR< IfcTemplatedEntityList< IfcProduct > > v5_RelatedElements, IfcSpatialElement* v6_RelatingStructure);
-    typedef IfcRelContainedInSpatialStructure* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRelContainedInSpatialStructure > > list;
-    typedef IfcTemplatedEntityList< IfcRelContainedInSpatialStructure >::it it;
+    IfcRelContainedInSpatialStructure (IfcAbstractEntity* e);
+    IfcRelContainedInSpatialStructure (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcTemplatedEntityList< IfcProduct >::ptr v5_RelatedElements, IfcSpatialElement* v6_RelatingStructure);
+    typedef IfcTemplatedEntityList< IfcRelContainedInSpatialStructure > list;
 };
 /// Definition from IAI: The
 /// IfcRelCoversBldgElements is an objectified relationship
@@ -24074,23 +24966,22 @@ class IfcRelCoversBldgElements : public IfcRelConnects {
     /// Relationship to the building element that is covered. 
     /// 
     /// IFC2x4 CHANGE: The attribute type has been changed from IfcElement to IfcBuildingElement.
-    IfcElement* RelatingBuildingElement();
+    IfcElement* RelatingBuildingElement() const;
     void setRelatingBuildingElement(IfcElement* v);
     /// Relationship to the set of coverings at this element.
-    SHARED_PTR< IfcTemplatedEntityList< IfcCovering > > RelatedCoverings();
-    void setRelatedCoverings(SHARED_PTR< IfcTemplatedEntityList< IfcCovering > > v);
+    IfcTemplatedEntityList< IfcCovering >::ptr RelatedCoverings() const;
+    void setRelatedCoverings(IfcTemplatedEntityList< IfcCovering >::ptr v);
     virtual unsigned int getArgumentCount() const { return 6; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 4: return IfcUtil::Argument_ENTITY; case 5: return IfcUtil::Argument_ENTITY_LIST; } return IfcRelConnects::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 4: return Type::IfcElement; case 5: return Type::IfcCovering; } return IfcRelConnects::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 4: return "RelatingBuildingElement"; case 5: return "RelatedCoverings"; } return IfcRelConnects::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRelCoversBldgElements (IfcAbstractEntityPtr e);
-    IfcRelCoversBldgElements (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, IfcElement* v5_RelatingBuildingElement, SHARED_PTR< IfcTemplatedEntityList< IfcCovering > > v6_RelatedCoverings);
-    typedef IfcRelCoversBldgElements* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRelCoversBldgElements > > list;
-    typedef IfcTemplatedEntityList< IfcRelCoversBldgElements >::it it;
+    IfcRelCoversBldgElements (IfcAbstractEntity* e);
+    IfcRelCoversBldgElements (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcElement* v5_RelatingBuildingElement, IfcTemplatedEntityList< IfcCovering >::ptr v6_RelatedCoverings);
+    typedef IfcTemplatedEntityList< IfcRelCoversBldgElements > list;
 };
 /// Definition from IAI: The objectified relationship,
 ///   IfcRelCoversSpace, relatesÿa space object to one or
@@ -24123,23 +25014,22 @@ class IfcRelCoversSpaces : public IfcRelConnects {
     /// Relationship to the space object that is covered.
     /// 
     /// IFC2x4 CHANGE: The attribute name has been changed from RelatedSpace to RelatingSpace with upward compatibility for file based exchange.
-    IfcSpace* RelatingSpace();
+    IfcSpace* RelatingSpace() const;
     void setRelatingSpace(IfcSpace* v);
     /// Relationship to the set of coverings covering this space.
-    SHARED_PTR< IfcTemplatedEntityList< IfcCovering > > RelatedCoverings();
-    void setRelatedCoverings(SHARED_PTR< IfcTemplatedEntityList< IfcCovering > > v);
+    IfcTemplatedEntityList< IfcCovering >::ptr RelatedCoverings() const;
+    void setRelatedCoverings(IfcTemplatedEntityList< IfcCovering >::ptr v);
     virtual unsigned int getArgumentCount() const { return 6; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 4: return IfcUtil::Argument_ENTITY; case 5: return IfcUtil::Argument_ENTITY_LIST; } return IfcRelConnects::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 4: return Type::IfcSpace; case 5: return Type::IfcCovering; } return IfcRelConnects::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 4: return "RelatingSpace"; case 5: return "RelatedCoverings"; } return IfcRelConnects::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRelCoversSpaces (IfcAbstractEntityPtr e);
-    IfcRelCoversSpaces (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, IfcSpace* v5_RelatingSpace, SHARED_PTR< IfcTemplatedEntityList< IfcCovering > > v6_RelatedCoverings);
-    typedef IfcRelCoversSpaces* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRelCoversSpaces > > list;
-    typedef IfcTemplatedEntityList< IfcRelCoversSpaces >::it it;
+    IfcRelCoversSpaces (IfcAbstractEntity* e);
+    IfcRelCoversSpaces (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcSpace* v5_RelatingSpace, IfcTemplatedEntityList< IfcCovering >::ptr v6_RelatedCoverings);
+    typedef IfcTemplatedEntityList< IfcRelCoversSpaces > list;
 };
 /// The objectified relationship IfcRelDeclares handles the declaration of objects (subtypes of IfcObject) or properties (subtypes of IfcPropertyDefinition) to a project or project library (represented by IfcProject, or IfcProjectLibrary).
 /// 
@@ -24155,23 +25045,22 @@ class IfcRelCoversSpaces : public IfcRelConnects {
 class IfcRelDeclares : public IfcRelationship {
 public:
     /// Reference to the IfcProject to which additional information is assigned.
-    IfcContext* RelatingContext();
+    IfcContext* RelatingContext() const;
     void setRelatingContext(IfcContext* v);
     /// Set of object or property definitions that are assigned to a context and to which the unit and representation context definitions of that context apply.
-    SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > RelatedDefinitions();
-    void setRelatedDefinitions(SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > v);
+    IfcEntityList::ptr RelatedDefinitions() const;
+    void setRelatedDefinitions(IfcEntityList::ptr v);
     virtual unsigned int getArgumentCount() const { return 6; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 4: return IfcUtil::Argument_ENTITY; case 5: return IfcUtil::Argument_ENTITY_LIST; } return IfcRelationship::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 4: return Type::IfcContext; case 5: return Type::IfcDefinitionSelect; } return IfcRelationship::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 4: return "RelatingContext"; case 5: return "RelatedDefinitions"; } return IfcRelationship::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRelDeclares (IfcAbstractEntityPtr e);
-    IfcRelDeclares (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, IfcContext* v5_RelatingContext, IfcEntities v6_RelatedDefinitions);
-    typedef IfcRelDeclares* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRelDeclares > > list;
-    typedef IfcTemplatedEntityList< IfcRelDeclares >::it it;
+    IfcRelDeclares (IfcAbstractEntity* e);
+    IfcRelDeclares (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcContext* v5_RelatingContext, IfcEntityList::ptr v6_RelatedDefinitions);
+    typedef IfcTemplatedEntityList< IfcRelDeclares > list;
 };
 /// The decomposition relationship,
 /// IfcRelDecomposes, defines the general concept of elements
@@ -24207,16 +25096,15 @@ class IfcRelDecomposes : public IfcRelationship {
 public:
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcRelationship::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcRelationship::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcRelationship::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRelDecomposes (IfcAbstractEntityPtr e);
-    IfcRelDecomposes (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description);
-    typedef IfcRelDecomposes* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRelDecomposes > > list;
-    typedef IfcTemplatedEntityList< IfcRelDecomposes >::it it;
+    IfcRelDecomposes (IfcAbstractEntity* e);
+    IfcRelDecomposes (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description);
+    typedef IfcTemplatedEntityList< IfcRelDecomposes > list;
 };
 /// A generic and abstract relationship which subtypes are used to:
 /// 
@@ -24249,16 +25137,15 @@ class IfcRelDefines : public IfcRelationship {
 public:
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcRelationship::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcRelationship::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcRelationship::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRelDefines (IfcAbstractEntityPtr e);
-    IfcRelDefines (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description);
-    typedef IfcRelDefines* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRelDefines > > list;
-    typedef IfcTemplatedEntityList< IfcRelDefines >::it it;
+    IfcRelDefines (IfcAbstractEntity* e);
+    IfcRelDefines (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description);
+    typedef IfcTemplatedEntityList< IfcRelDefines > list;
 };
 /// The objectified relationship IfcRelDefinesByObject defines the relationship between an object taking part in an object type decomposition and an object occurrences taking part in an occurrence decomposition of that type.
 /// The IfcRelDefinesByObject is a 1-to-N relationship, as it allows for the assignment of one declaring object information to a single or to many reflected objects. Those objects then share the same object property sets and, for subtypes of IfcProduct, the eventually assigned representation maps.
@@ -24278,23 +25165,22 @@ class IfcRelDefines : public IfcRelationship {
 class IfcRelDefinesByObject : public IfcRelDefines {
 public:
     /// Objects being part of an object occurrence decomposition, acting as the "reflecting parts" in the relationship.
-    SHARED_PTR< IfcTemplatedEntityList< IfcObject > > RelatedObjects();
-    void setRelatedObjects(SHARED_PTR< IfcTemplatedEntityList< IfcObject > > v);
+    IfcTemplatedEntityList< IfcObject >::ptr RelatedObjects() const;
+    void setRelatedObjects(IfcTemplatedEntityList< IfcObject >::ptr v);
     /// Object being part of an object type decomposition, acting as the "declaring part" in the relationship.
-    IfcObject* RelatingObject();
+    IfcObject* RelatingObject() const;
     void setRelatingObject(IfcObject* v);
     virtual unsigned int getArgumentCount() const { return 6; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 4: return IfcUtil::Argument_ENTITY_LIST; case 5: return IfcUtil::Argument_ENTITY; } return IfcRelDefines::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 4: return Type::IfcObject; case 5: return Type::IfcObject; } return IfcRelDefines::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 4: return "RelatedObjects"; case 5: return "RelatingObject"; } return IfcRelDefines::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRelDefinesByObject (IfcAbstractEntityPtr e);
-    IfcRelDefinesByObject (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, SHARED_PTR< IfcTemplatedEntityList< IfcObject > > v5_RelatedObjects, IfcObject* v6_RelatingObject);
-    typedef IfcRelDefinesByObject* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRelDefinesByObject > > list;
-    typedef IfcTemplatedEntityList< IfcRelDefinesByObject >::it it;
+    IfcRelDefinesByObject (IfcAbstractEntity* e);
+    IfcRelDefinesByObject (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcTemplatedEntityList< IfcObject >::ptr v5_RelatedObjects, IfcObject* v6_RelatingObject);
+    typedef IfcTemplatedEntityList< IfcRelDefinesByObject > list;
 };
 /// The objectified relationship
 /// IfcRelDefinesByProperties defines the relationships
@@ -24314,23 +25200,22 @@ class IfcRelDefinesByObject : public IfcRelDefines {
 class IfcRelDefinesByProperties : public IfcRelDefines {
 public:
     /// Reference to the objects (or single object) to which the property definition applies.
-    SHARED_PTR< IfcTemplatedEntityList< IfcObjectDefinition > > RelatedObjects();
-    void setRelatedObjects(SHARED_PTR< IfcTemplatedEntityList< IfcObjectDefinition > > v);
+    IfcTemplatedEntityList< IfcObjectDefinition >::ptr RelatedObjects() const;
+    void setRelatedObjects(IfcTemplatedEntityList< IfcObjectDefinition >::ptr v);
     /// Reference to the property set definition for that object or set of objects.
-    IfcPropertySetDefinitionSelect RelatingPropertyDefinition();
-    void setRelatingPropertyDefinition(IfcPropertySetDefinitionSelect v);
+    IfcPropertySetDefinitionSelect* RelatingPropertyDefinition() const;
+    void setRelatingPropertyDefinition(IfcPropertySetDefinitionSelect* v);
     virtual unsigned int getArgumentCount() const { return 6; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 4: return IfcUtil::Argument_ENTITY_LIST; case 5: return IfcUtil::Argument_ENTITY; } return IfcRelDefines::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 4: return Type::IfcObjectDefinition; case 5: return Type::IfcPropertySetDefinitionSelect; } return IfcRelDefines::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 4: return "RelatedObjects"; case 5: return "RelatingPropertyDefinition"; } return IfcRelDefines::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRelDefinesByProperties (IfcAbstractEntityPtr e);
-    IfcRelDefinesByProperties (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, SHARED_PTR< IfcTemplatedEntityList< IfcObjectDefinition > > v5_RelatedObjects, IfcPropertySetDefinitionSelect v6_RelatingPropertyDefinition);
-    typedef IfcRelDefinesByProperties* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRelDefinesByProperties > > list;
-    typedef IfcTemplatedEntityList< IfcRelDefinesByProperties >::it it;
+    IfcRelDefinesByProperties (IfcAbstractEntity* e);
+    IfcRelDefinesByProperties (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcTemplatedEntityList< IfcObjectDefinition >::ptr v5_RelatedObjects, IfcPropertySetDefinitionSelect* v6_RelatingPropertyDefinition);
+    typedef IfcTemplatedEntityList< IfcRelDefinesByProperties > list;
 };
 /// The objectified relationship
 /// IfcRelDefinesByTemplate defines the relationships between
@@ -24347,23 +25232,22 @@ class IfcRelDefinesByProperties : public IfcRelDefines {
 class IfcRelDefinesByTemplate : public IfcRelDefines {
 public:
     /// One or many property sets defined by a single property set template.
-    SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > RelatedPropertySets();
-    void setRelatedPropertySets(SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > v);
+    IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr RelatedPropertySets() const;
+    void setRelatedPropertySets(IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr v);
     /// Property set template that provides the common definition of related property sets.
-    IfcPropertySetTemplate* RelatingTemplate();
+    IfcPropertySetTemplate* RelatingTemplate() const;
     void setRelatingTemplate(IfcPropertySetTemplate* v);
     virtual unsigned int getArgumentCount() const { return 6; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 4: return IfcUtil::Argument_ENTITY_LIST; case 5: return IfcUtil::Argument_ENTITY; } return IfcRelDefines::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 4: return Type::IfcPropertySetDefinition; case 5: return Type::IfcPropertySetTemplate; } return IfcRelDefines::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 4: return "RelatedPropertySets"; case 5: return "RelatingTemplate"; } return IfcRelDefines::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRelDefinesByTemplate (IfcAbstractEntityPtr e);
-    IfcRelDefinesByTemplate (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > v5_RelatedPropertySets, IfcPropertySetTemplate* v6_RelatingTemplate);
-    typedef IfcRelDefinesByTemplate* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRelDefinesByTemplate > > list;
-    typedef IfcTemplatedEntityList< IfcRelDefinesByTemplate >::it it;
+    IfcRelDefinesByTemplate (IfcAbstractEntity* e);
+    IfcRelDefinesByTemplate (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr v5_RelatedPropertySets, IfcPropertySetTemplate* v6_RelatingTemplate);
+    typedef IfcTemplatedEntityList< IfcRelDefinesByTemplate > list;
 };
 /// The objectified relationship
 /// IfcRelDefinesByType defines the relationship between an
@@ -24438,23 +25322,22 @@ class IfcRelDefinesByTemplate : public IfcRelDefines {
 /// FALSE
 class IfcRelDefinesByType : public IfcRelDefines {
 public:
-    SHARED_PTR< IfcTemplatedEntityList< IfcObject > > RelatedObjects();
-    void setRelatedObjects(SHARED_PTR< IfcTemplatedEntityList< IfcObject > > v);
+    IfcTemplatedEntityList< IfcObject >::ptr RelatedObjects() const;
+    void setRelatedObjects(IfcTemplatedEntityList< IfcObject >::ptr v);
     /// Reference to the type (or style) information for that object or set of objects.
-    IfcTypeObject* RelatingType();
+    IfcTypeObject* RelatingType() const;
     void setRelatingType(IfcTypeObject* v);
     virtual unsigned int getArgumentCount() const { return 6; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 4: return IfcUtil::Argument_ENTITY_LIST; case 5: return IfcUtil::Argument_ENTITY; } return IfcRelDefines::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 4: return Type::IfcObject; case 5: return Type::IfcTypeObject; } return IfcRelDefines::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 4: return "RelatedObjects"; case 5: return "RelatingType"; } return IfcRelDefines::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRelDefinesByType (IfcAbstractEntityPtr e);
-    IfcRelDefinesByType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, SHARED_PTR< IfcTemplatedEntityList< IfcObject > > v5_RelatedObjects, IfcTypeObject* v6_RelatingType);
-    typedef IfcRelDefinesByType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRelDefinesByType > > list;
-    typedef IfcTemplatedEntityList< IfcRelDefinesByType >::it it;
+    IfcRelDefinesByType (IfcAbstractEntity* e);
+    IfcRelDefinesByType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcTemplatedEntityList< IfcObject >::ptr v5_RelatedObjects, IfcTypeObject* v6_RelatingType);
+    typedef IfcTemplatedEntityList< IfcRelDefinesByType > list;
 };
 /// IfcRelFillsElement is an objectified relationship between an opening element and an element that fills (or partially fills) the opening element. It is an one-to-one relationship.
 /// 
@@ -24468,25 +25351,24 @@ class IfcRelDefinesByType : public IfcRelDefines {
 class IfcRelFillsElement : public IfcRelConnects {
 public:
     /// Opening Element being filled by virtue of this relationship.
-    IfcOpeningElement* RelatingOpeningElement();
+    IfcOpeningElement* RelatingOpeningElement() const;
     void setRelatingOpeningElement(IfcOpeningElement* v);
     /// Reference to building element that occupies fully or partially the associated opening.
     /// 
     /// IFC2x PLATFORM CHANGE: The data type has been changed from IfcBuildingElement to IfcElement with upward compatibility for file based exchange.
-    IfcElement* RelatedBuildingElement();
+    IfcElement* RelatedBuildingElement() const;
     void setRelatedBuildingElement(IfcElement* v);
     virtual unsigned int getArgumentCount() const { return 6; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 4: return IfcUtil::Argument_ENTITY; case 5: return IfcUtil::Argument_ENTITY; } return IfcRelConnects::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 4: return Type::IfcOpeningElement; case 5: return Type::IfcElement; } return IfcRelConnects::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 4: return "RelatingOpeningElement"; case 5: return "RelatedBuildingElement"; } return IfcRelConnects::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRelFillsElement (IfcAbstractEntityPtr e);
-    IfcRelFillsElement (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, IfcOpeningElement* v5_RelatingOpeningElement, IfcElement* v6_RelatedBuildingElement);
-    typedef IfcRelFillsElement* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRelFillsElement > > list;
-    typedef IfcTemplatedEntityList< IfcRelFillsElement >::it it;
+    IfcRelFillsElement (IfcAbstractEntity* e);
+    IfcRelFillsElement (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcOpeningElement* v5_RelatingOpeningElement, IfcElement* v6_RelatedBuildingElement);
+    typedef IfcTemplatedEntityList< IfcRelFillsElement > list;
 };
 /// Objectified relationship between a distribution flow element occurrence instance and one-to-many control element occurrence instances indicating that the control element(s) sense or control some aspect of the flow element. It is applied to IfcDistributionFlowElement and IfcDistributionControlElement.
 /// 
@@ -24498,23 +25380,22 @@ class IfcRelFillsElement : public IfcRelConnects {
 class IfcRelFlowControlElements : public IfcRelConnects {
 public:
     /// References control elements which may be used to impart control on the Distribution Element.
-    SHARED_PTR< IfcTemplatedEntityList< IfcDistributionControlElement > > RelatedControlElements();
-    void setRelatedControlElements(SHARED_PTR< IfcTemplatedEntityList< IfcDistributionControlElement > > v);
+    IfcTemplatedEntityList< IfcDistributionControlElement >::ptr RelatedControlElements() const;
+    void setRelatedControlElements(IfcTemplatedEntityList< IfcDistributionControlElement >::ptr v);
     /// Relationship to a distribution flow element
-    IfcDistributionFlowElement* RelatingFlowElement();
+    IfcDistributionFlowElement* RelatingFlowElement() const;
     void setRelatingFlowElement(IfcDistributionFlowElement* v);
     virtual unsigned int getArgumentCount() const { return 6; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 4: return IfcUtil::Argument_ENTITY_LIST; case 5: return IfcUtil::Argument_ENTITY; } return IfcRelConnects::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 4: return Type::IfcDistributionControlElement; case 5: return Type::IfcDistributionFlowElement; } return IfcRelConnects::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 4: return "RelatedControlElements"; case 5: return "RelatingFlowElement"; } return IfcRelConnects::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRelFlowControlElements (IfcAbstractEntityPtr e);
-    IfcRelFlowControlElements (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, SHARED_PTR< IfcTemplatedEntityList< IfcDistributionControlElement > > v5_RelatedControlElements, IfcDistributionFlowElement* v6_RelatingFlowElement);
-    typedef IfcRelFlowControlElements* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRelFlowControlElements > > list;
-    typedef IfcTemplatedEntityList< IfcRelFlowControlElements >::it it;
+    IfcRelFlowControlElements (IfcAbstractEntity* e);
+    IfcRelFlowControlElements (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcTemplatedEntityList< IfcDistributionControlElement >::ptr v5_RelatedControlElements, IfcDistributionFlowElement* v6_RelatingFlowElement);
+    typedef IfcTemplatedEntityList< IfcRelFlowControlElements > list;
 };
 /// Definition from IAI: The
 /// IfcRelInterferesElements objectified relationship
@@ -24566,36 +25447,35 @@ class IfcRelFlowControlElements : public IfcRelConnects {
 class IfcRelInterferesElements : public IfcRelConnects {
 public:
     /// Reference to a subtype of IfcElement that is the RelatingElement in the interference relationship. Depending on the value of ImpliedOrder the RelatingElement may carry the notion to be the element from which the interference geometry should be subtracted.
-    IfcElement* RelatingElement();
+    IfcElement* RelatingElement() const;
     void setRelatingElement(IfcElement* v);
     /// Reference to a subtype of IfcElement that is the RelatedElement in the interference relationship. Depending on the value of ImpliedOrder the RelatedElement may carry the notion to be the element from which the interference geometry should not be subtracted.
-    IfcElement* RelatedElement();
+    IfcElement* RelatedElement() const;
     void setRelatedElement(IfcElement* v);
     /// Whether the optional attribute InterferenceGeometry is defined for this IfcRelInterferesElements
-    bool hasInterferenceGeometry();
+    bool hasInterferenceGeometry() const;
     /// The geometric shape representation of the interference geometry that is provided in the object coordinate system of the RelatingElement (mandatory) and in the object coordinate system of the RelatedElement (optionally).
-    IfcConnectionGeometry* InterferenceGeometry();
+    IfcConnectionGeometry* InterferenceGeometry() const;
     void setInterferenceGeometry(IfcConnectionGeometry* v);
     /// Whether the optional attribute InterferenceType is defined for this IfcRelInterferesElements
-    bool hasInterferenceType();
+    bool hasInterferenceType() const;
     /// Optional identifier that describes the nature of the interference. Examples could include 'Clash', 'ProvisionForVoid', etc.
-    IfcIdentifier InterferenceType();
-    void setInterferenceType(IfcIdentifier v);
+    std::string InterferenceType() const;
+    void setInterferenceType(std::string v);
     /// Logical value indicating whether the interference geometry should be subtracted from the RelatingElement (if TRUE), or whether it should be either subtracted from the RelatingElement or the RelatedElement (if FALSE), or whether no indication can be provided (if UNKNOWN).
-    bool ImpliedOrder();
+    bool ImpliedOrder() const;
     void setImpliedOrder(bool v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 4: return IfcUtil::Argument_ENTITY; case 5: return IfcUtil::Argument_ENTITY; case 6: return IfcUtil::Argument_ENTITY; case 7: return IfcUtil::Argument_STRING; case 8: return IfcUtil::Argument_BOOL; } return IfcRelConnects::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 4: return Type::IfcElement; case 5: return Type::IfcElement; case 6: return Type::IfcConnectionGeometry; case 7: return Type::IfcIdentifier; case 8: return Type::UNDEFINED; } return IfcRelConnects::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 4: return "RelatingElement"; case 5: return "RelatedElement"; case 6: return "InterferenceGeometry"; case 7: return "InterferenceType"; case 8: return "ImpliedOrder"; } return IfcRelConnects::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRelInterferesElements (IfcAbstractEntityPtr e);
-    IfcRelInterferesElements (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, IfcElement* v5_RelatingElement, IfcElement* v6_RelatedElement, IfcConnectionGeometry* v7_InterferenceGeometry, boost::optional< IfcIdentifier > v8_InterferenceType, bool v9_ImpliedOrder);
-    typedef IfcRelInterferesElements* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRelInterferesElements > > list;
-    typedef IfcTemplatedEntityList< IfcRelInterferesElements >::it it;
+    IfcRelInterferesElements (IfcAbstractEntity* e);
+    IfcRelInterferesElements (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcElement* v5_RelatingElement, IfcElement* v6_RelatedElement, IfcConnectionGeometry* v7_InterferenceGeometry, boost::optional< std::string > v8_InterferenceType, bool v9_ImpliedOrder);
+    typedef IfcTemplatedEntityList< IfcRelInterferesElements > list;
 };
 /// The nesting relationship
 /// IfcRelNests is a special type of the general
@@ -24627,25 +25507,24 @@ class IfcRelNests : public IfcRelDecomposes {
     /// The object definition, either an non-product object type or a non-product object occurrence, that represents the nest. It is the whole within the whole/part relationship.
     /// 
     /// IFC2x4 CHANGE  The attribute has been demoted from the supertype IfcRelDecomposes and defines the ordered nesting relationship.
-    IfcObjectDefinition* RelatingObject();
+    IfcObjectDefinition* RelatingObject() const;
     void setRelatingObject(IfcObjectDefinition* v);
     /// The object definitions, either non-product object occurrences or non-product object types, that are being nestes. They are defined as the parts in the ordered whole/part relationship -  i.e. there is an implied order among the parts expressed by the position within the list of RelatedObjects.
     /// 
     /// IFC2x4 CHANGE  The attribute has been demoted from the supertype IfcRelDecomposes and defines the ordered set of parts within the nest.
-    SHARED_PTR< IfcTemplatedEntityList< IfcObjectDefinition > > RelatedObjects();
-    void setRelatedObjects(SHARED_PTR< IfcTemplatedEntityList< IfcObjectDefinition > > v);
+    IfcTemplatedEntityList< IfcObjectDefinition >::ptr RelatedObjects() const;
+    void setRelatedObjects(IfcTemplatedEntityList< IfcObjectDefinition >::ptr v);
     virtual unsigned int getArgumentCount() const { return 6; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 4: return IfcUtil::Argument_ENTITY; case 5: return IfcUtil::Argument_ENTITY_LIST; } return IfcRelDecomposes::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 4: return Type::IfcObjectDefinition; case 5: return Type::IfcObjectDefinition; } return IfcRelDecomposes::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 4: return "RelatingObject"; case 5: return "RelatedObjects"; } return IfcRelDecomposes::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRelNests (IfcAbstractEntityPtr e);
-    IfcRelNests (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, IfcObjectDefinition* v5_RelatingObject, SHARED_PTR< IfcTemplatedEntityList< IfcObjectDefinition > > v6_RelatedObjects);
-    typedef IfcRelNests* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRelNests > > list;
-    typedef IfcTemplatedEntityList< IfcRelNests >::it it;
+    IfcRelNests (IfcAbstractEntity* e);
+    IfcRelNests (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcObjectDefinition* v5_RelatingObject, IfcTemplatedEntityList< IfcObjectDefinition >::ptr v6_RelatedObjects);
+    typedef IfcTemplatedEntityList< IfcRelNests > list;
 };
 /// The IfcRelProjectsElement is an objectified relationship
 /// between an element and one projection element that creates a
@@ -24682,23 +25561,22 @@ class IfcRelNests : public IfcRelDecomposes {
 class IfcRelProjectsElement : public IfcRelDecomposes {
 public:
     /// Element at which a projection is created by the associated IfcProjectionElement.
-    IfcElement* RelatingElement();
+    IfcElement* RelatingElement() const;
     void setRelatingElement(IfcElement* v);
     /// Reference to the IfcFeatureElementAddition that defines an addition to the volume of the element, by using a Boolean addition operation. An example is a projection at the associated element.
-    IfcFeatureElementAddition* RelatedFeatureElement();
+    IfcFeatureElementAddition* RelatedFeatureElement() const;
     void setRelatedFeatureElement(IfcFeatureElementAddition* v);
     virtual unsigned int getArgumentCount() const { return 6; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 4: return IfcUtil::Argument_ENTITY; case 5: return IfcUtil::Argument_ENTITY; } return IfcRelDecomposes::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 4: return Type::IfcElement; case 5: return Type::IfcFeatureElementAddition; } return IfcRelDecomposes::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 4: return "RelatingElement"; case 5: return "RelatedFeatureElement"; } return IfcRelDecomposes::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRelProjectsElement (IfcAbstractEntityPtr e);
-    IfcRelProjectsElement (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, IfcElement* v5_RelatingElement, IfcFeatureElementAddition* v6_RelatedFeatureElement);
-    typedef IfcRelProjectsElement* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRelProjectsElement > > list;
-    typedef IfcTemplatedEntityList< IfcRelProjectsElement >::it it;
+    IfcRelProjectsElement (IfcAbstractEntity* e);
+    IfcRelProjectsElement (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcElement* v5_RelatingElement, IfcFeatureElementAddition* v6_RelatedFeatureElement);
+    typedef IfcTemplatedEntityList< IfcRelProjectsElement > list;
 };
 /// The objectified relationship,
 ///   IfcRelReferencedInSpatialStructure is used to
@@ -24753,25 +25631,24 @@ class IfcRelReferencedInSpatialStructure : public IfcRelConnects {
 public:
     /// Set of products, which are referenced within this level of the spatial structure hierarchy.
     /// NOTE  Referenced elements are contained elsewhere within the spatial structure, they are referenced additionally by this spatial structure element, e.g., because they span several stories.
-    SHARED_PTR< IfcTemplatedEntityList< IfcProduct > > RelatedElements();
-    void setRelatedElements(SHARED_PTR< IfcTemplatedEntityList< IfcProduct > > v);
+    IfcTemplatedEntityList< IfcProduct >::ptr RelatedElements() const;
+    void setRelatedElements(IfcTemplatedEntityList< IfcProduct >::ptr v);
     /// Spatial structure element, within which the element is referenced. Any element can be contained within zero, one or many elements of the project spatial and zoning structure.
     /// 
     /// IFC2x Edition 4 CHANGE  The attribute relatingStructure as been promoted to the new supertype IfcSpatialElement with upward compatibility for file based exchange.
-    IfcSpatialElement* RelatingStructure();
+    IfcSpatialElement* RelatingStructure() const;
     void setRelatingStructure(IfcSpatialElement* v);
     virtual unsigned int getArgumentCount() const { return 6; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 4: return IfcUtil::Argument_ENTITY_LIST; case 5: return IfcUtil::Argument_ENTITY; } return IfcRelConnects::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 4: return Type::IfcProduct; case 5: return Type::IfcSpatialElement; } return IfcRelConnects::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 4: return "RelatedElements"; case 5: return "RelatingStructure"; } return IfcRelConnects::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRelReferencedInSpatialStructure (IfcAbstractEntityPtr e);
-    IfcRelReferencedInSpatialStructure (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, SHARED_PTR< IfcTemplatedEntityList< IfcProduct > > v5_RelatedElements, IfcSpatialElement* v6_RelatingStructure);
-    typedef IfcRelReferencedInSpatialStructure* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRelReferencedInSpatialStructure > > list;
-    typedef IfcTemplatedEntityList< IfcRelReferencedInSpatialStructure >::it it;
+    IfcRelReferencedInSpatialStructure (IfcAbstractEntity* e);
+    IfcRelReferencedInSpatialStructure (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcTemplatedEntityList< IfcProduct >::ptr v5_RelatedElements, IfcSpatialElement* v6_RelatingStructure);
+    typedef IfcTemplatedEntityList< IfcRelReferencedInSpatialStructure > list;
 };
 /// IfcRelSequence is a
 ///   sequential relationship between processes where one process
@@ -24830,25 +25707,25 @@ class IfcRelReferencedInSpatialStructure : public IfcRelConnects {
 class IfcRelSequence : public IfcRelConnects {
 public:
     /// Reference to the process, that is the predecessor.
-    IfcProcess* RelatingProcess();
+    IfcProcess* RelatingProcess() const;
     void setRelatingProcess(IfcProcess* v);
     /// Reference to the process, that is the successor.
-    IfcProcess* RelatedProcess();
+    IfcProcess* RelatedProcess() const;
     void setRelatedProcess(IfcProcess* v);
     /// Whether the optional attribute TimeLag is defined for this IfcRelSequence
-    bool hasTimeLag();
+    bool hasTimeLag() const;
     /// Time duration of the sequence, it is the time lag between the
     ///   predecessor and the successor as specified by the
     ///   SequenceType.
-    IfcLagTime* TimeLag();
+    IfcLagTime* TimeLag() const;
     void setTimeLag(IfcLagTime* v);
     /// Whether the optional attribute SequenceType is defined for this IfcRelSequence
-    bool hasSequenceType();
+    bool hasSequenceType() const;
     /// The way in which the time lag applies to the sequence.
-    IfcSequenceEnum::IfcSequenceEnum SequenceType();
+    IfcSequenceEnum::IfcSequenceEnum SequenceType() const;
     void setSequenceType(IfcSequenceEnum::IfcSequenceEnum v);
     /// Whether the optional attribute UserDefinedSequenceType is defined for this IfcRelSequence
-    bool hasUserDefinedSequenceType();
+    bool hasUserDefinedSequenceType() const;
     /// Allows for specification of user defined type of the sequence
     ///   beyond the enumeration values (START_START, START_FINISH,
     ///   FINISH_START, FINISH_FINISH) provided by SequenceType
@@ -24858,20 +25735,19 @@ class IfcRelSequence : public IfcRelConnects {
     ///   enumeration value USERDEFINED.
     /// 
     /// Added in IFC 2x4
-    IfcLabel UserDefinedSequenceType();
-    void setUserDefinedSequenceType(IfcLabel v);
+    std::string UserDefinedSequenceType() const;
+    void setUserDefinedSequenceType(std::string v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 4: return IfcUtil::Argument_ENTITY; case 5: return IfcUtil::Argument_ENTITY; case 6: return IfcUtil::Argument_ENTITY; case 7: return IfcUtil::Argument_ENUMERATION; case 8: return IfcUtil::Argument_STRING; } return IfcRelConnects::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 4: return Type::IfcProcess; case 5: return Type::IfcProcess; case 6: return Type::IfcLagTime; case 7: return Type::IfcSequenceEnum; case 8: return Type::IfcLabel; } return IfcRelConnects::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 4: return "RelatingProcess"; case 5: return "RelatedProcess"; case 6: return "TimeLag"; case 7: return "SequenceType"; case 8: return "UserDefinedSequenceType"; } return IfcRelConnects::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRelSequence (IfcAbstractEntityPtr e);
-    IfcRelSequence (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, IfcProcess* v5_RelatingProcess, IfcProcess* v6_RelatedProcess, IfcLagTime* v7_TimeLag, boost::optional< IfcSequenceEnum::IfcSequenceEnum > v8_SequenceType, boost::optional< IfcLabel > v9_UserDefinedSequenceType);
-    typedef IfcRelSequence* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRelSequence > > list;
-    typedef IfcTemplatedEntityList< IfcRelSequence >::it it;
+    IfcRelSequence (IfcAbstractEntity* e);
+    IfcRelSequence (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcProcess* v5_RelatingProcess, IfcProcess* v6_RelatedProcess, IfcLagTime* v7_TimeLag, boost::optional< IfcSequenceEnum::IfcSequenceEnum > v8_SequenceType, boost::optional< std::string > v9_UserDefinedSequenceType);
+    typedef IfcTemplatedEntityList< IfcRelSequence > list;
 };
 /// Definition from IAI: An objectified relationship
 ///   that defines the relationship between a system and the
@@ -24897,27 +25773,26 @@ class IfcRelSequence : public IfcRelConnects {
 class IfcRelServicesBuildings : public IfcRelConnects {
 public:
     /// System that services the Buildings.
-    IfcSystem* RelatingSystem();
+    IfcSystem* RelatingSystem() const;
     void setRelatingSystem(IfcSystem* v);
     /// Spatial structure elements (including site, building, storeys) that are serviced by the system.
     /// 
     /// IFC2x PLATFORM CHANGE  The data type has been changed from IfcBuilding to IfcSpatialStructureElement with upward compatibility for file based exchange.
     /// 
     /// IFC2x Edition 4 CHANGE  The data type has been changed from IfcSpatialStructureElement to IfcSpatialElement with upward compatibility for file based exchange.
-    SHARED_PTR< IfcTemplatedEntityList< IfcSpatialElement > > RelatedBuildings();
-    void setRelatedBuildings(SHARED_PTR< IfcTemplatedEntityList< IfcSpatialElement > > v);
+    IfcTemplatedEntityList< IfcSpatialElement >::ptr RelatedBuildings() const;
+    void setRelatedBuildings(IfcTemplatedEntityList< IfcSpatialElement >::ptr v);
     virtual unsigned int getArgumentCount() const { return 6; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 4: return IfcUtil::Argument_ENTITY; case 5: return IfcUtil::Argument_ENTITY_LIST; } return IfcRelConnects::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 4: return Type::IfcSystem; case 5: return Type::IfcSpatialElement; } return IfcRelConnects::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 4: return "RelatingSystem"; case 5: return "RelatedBuildings"; } return IfcRelConnects::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRelServicesBuildings (IfcAbstractEntityPtr e);
-    IfcRelServicesBuildings (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, IfcSystem* v5_RelatingSystem, SHARED_PTR< IfcTemplatedEntityList< IfcSpatialElement > > v6_RelatedBuildings);
-    typedef IfcRelServicesBuildings* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRelServicesBuildings > > list;
-    typedef IfcTemplatedEntityList< IfcRelServicesBuildings >::it it;
+    IfcRelServicesBuildings (IfcAbstractEntity* e);
+    IfcRelServicesBuildings (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcSystem* v5_RelatingSystem, IfcTemplatedEntityList< IfcSpatialElement >::ptr v6_RelatedBuildings);
+    typedef IfcTemplatedEntityList< IfcRelServicesBuildings > list;
 };
 /// The space boundary defines the
 /// physical or virtual delimiter of a space by the relationship
@@ -25084,40 +25959,39 @@ class IfcRelServicesBuildings : public IfcRelConnects {
 class IfcRelSpaceBoundary : public IfcRelConnects {
 public:
     /// Reference to one spaces that is delimited by this boundary.
-    IfcSpaceBoundarySelect RelatingSpace();
-    void setRelatingSpace(IfcSpaceBoundarySelect v);
+    IfcSpaceBoundarySelect* RelatingSpace() const;
+    void setRelatingSpace(IfcSpaceBoundarySelect* v);
     /// Reference to Building Element, that defines the Space Boundaries.
     /// 
     /// IFC2x PLATFORM CHANGE  The data type has been changed from IfcBuildingElement to IfcElement with upward compatibility for file based exchange.
     /// 
     /// IFC2x4 CHANGE  The attribute has been changed to be mandatory.
-    IfcElement* RelatedBuildingElement();
+    IfcElement* RelatedBuildingElement() const;
     void setRelatedBuildingElement(IfcElement* v);
     /// Whether the optional attribute ConnectionGeometry is defined for this IfcRelSpaceBoundary
-    bool hasConnectionGeometry();
+    bool hasConnectionGeometry() const;
     /// Physical representation of the space boundary. Provided as a curve or surface given within the LCS of the space.
     /// 
     /// IFC2x PLATFORM CHANGE  The data type has been changed from IfcConnectionSurfaceGeometry to IfcConnectionGeometry with upward compatibility for file based exchange.
-    IfcConnectionGeometry* ConnectionGeometry();
+    IfcConnectionGeometry* ConnectionGeometry() const;
     void setConnectionGeometry(IfcConnectionGeometry* v);
     /// Defines, whether the Space Boundary is physical (Physical) or virtual (Virtual).
-    IfcPhysicalOrVirtualEnum::IfcPhysicalOrVirtualEnum PhysicalOrVirtualBoundary();
+    IfcPhysicalOrVirtualEnum::IfcPhysicalOrVirtualEnum PhysicalOrVirtualBoundary() const;
     void setPhysicalOrVirtualBoundary(IfcPhysicalOrVirtualEnum::IfcPhysicalOrVirtualEnum v);
     /// Defines, whether the Space Boundary is internal (Internal), or external, i.e. adjacent to open space (that can be an partially enclosed space, such as terrace (External).
-    IfcInternalOrExternalEnum::IfcInternalOrExternalEnum InternalOrExternalBoundary();
+    IfcInternalOrExternalEnum::IfcInternalOrExternalEnum InternalOrExternalBoundary() const;
     void setInternalOrExternalBoundary(IfcInternalOrExternalEnum::IfcInternalOrExternalEnum v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 4: return IfcUtil::Argument_ENTITY; case 5: return IfcUtil::Argument_ENTITY; case 6: return IfcUtil::Argument_ENTITY; case 7: return IfcUtil::Argument_ENUMERATION; case 8: return IfcUtil::Argument_ENUMERATION; } return IfcRelConnects::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 4: return Type::IfcSpaceBoundarySelect; case 5: return Type::IfcElement; case 6: return Type::IfcConnectionGeometry; case 7: return Type::IfcPhysicalOrVirtualEnum; case 8: return Type::IfcInternalOrExternalEnum; } return IfcRelConnects::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 4: return "RelatingSpace"; case 5: return "RelatedBuildingElement"; case 6: return "ConnectionGeometry"; case 7: return "PhysicalOrVirtualBoundary"; case 8: return "InternalOrExternalBoundary"; } return IfcRelConnects::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRelSpaceBoundary (IfcAbstractEntityPtr e);
-    IfcRelSpaceBoundary (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, IfcSpaceBoundarySelect v5_RelatingSpace, IfcElement* v6_RelatedBuildingElement, IfcConnectionGeometry* v7_ConnectionGeometry, IfcPhysicalOrVirtualEnum::IfcPhysicalOrVirtualEnum v8_PhysicalOrVirtualBoundary, IfcInternalOrExternalEnum::IfcInternalOrExternalEnum v9_InternalOrExternalBoundary);
-    typedef IfcRelSpaceBoundary* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRelSpaceBoundary > > list;
-    typedef IfcTemplatedEntityList< IfcRelSpaceBoundary >::it it;
+    IfcRelSpaceBoundary (IfcAbstractEntity* e);
+    IfcRelSpaceBoundary (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcSpaceBoundarySelect* v5_RelatingSpace, IfcElement* v6_RelatedBuildingElement, IfcConnectionGeometry* v7_ConnectionGeometry, IfcPhysicalOrVirtualEnum::IfcPhysicalOrVirtualEnum v8_PhysicalOrVirtualBoundary, IfcInternalOrExternalEnum::IfcInternalOrExternalEnum v9_InternalOrExternalBoundary);
+    typedef IfcTemplatedEntityList< IfcRelSpaceBoundary > list;
 };
 /// The 1st level space boundary
 /// defines the physical or virtual delimiter of a space by the
@@ -25169,23 +26043,22 @@ class IfcRelSpaceBoundary : public IfcRelConnects {
 class IfcRelSpaceBoundary1stLevel : public IfcRelSpaceBoundary {
 public:
     /// Whether the optional attribute ParentBoundary is defined for this IfcRelSpaceBoundary1stLevel
-    bool hasParentBoundary();
+    bool hasParentBoundary() const;
     /// Reference to the host, or parent, space boundary within which this inner boundary is defined.
-    IfcRelSpaceBoundary1stLevel* ParentBoundary();
+    IfcRelSpaceBoundary1stLevel* ParentBoundary() const;
     void setParentBoundary(IfcRelSpaceBoundary1stLevel* v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENTITY; } return IfcRelSpaceBoundary::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcRelSpaceBoundary1stLevel; } return IfcRelSpaceBoundary::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "ParentBoundary"; } return IfcRelSpaceBoundary::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelSpaceBoundary1stLevel > > InnerBoundaries(); // INVERSE IfcRelSpaceBoundary1stLevel::ParentBoundary
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcRelSpaceBoundary1stLevel >::ptr InnerBoundaries() const; // INVERSE IfcRelSpaceBoundary1stLevel::ParentBoundary
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRelSpaceBoundary1stLevel (IfcAbstractEntityPtr e);
-    IfcRelSpaceBoundary1stLevel (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, IfcSpaceBoundarySelect v5_RelatingSpace, IfcElement* v6_RelatedBuildingElement, IfcConnectionGeometry* v7_ConnectionGeometry, IfcPhysicalOrVirtualEnum::IfcPhysicalOrVirtualEnum v8_PhysicalOrVirtualBoundary, IfcInternalOrExternalEnum::IfcInternalOrExternalEnum v9_InternalOrExternalBoundary, IfcRelSpaceBoundary1stLevel* v10_ParentBoundary);
-    typedef IfcRelSpaceBoundary1stLevel* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRelSpaceBoundary1stLevel > > list;
-    typedef IfcTemplatedEntityList< IfcRelSpaceBoundary1stLevel >::it it;
+    IfcRelSpaceBoundary1stLevel (IfcAbstractEntity* e);
+    IfcRelSpaceBoundary1stLevel (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcSpaceBoundarySelect* v5_RelatingSpace, IfcElement* v6_RelatedBuildingElement, IfcConnectionGeometry* v7_ConnectionGeometry, IfcPhysicalOrVirtualEnum::IfcPhysicalOrVirtualEnum v8_PhysicalOrVirtualBoundary, IfcInternalOrExternalEnum::IfcInternalOrExternalEnum v9_InternalOrExternalBoundary, IfcRelSpaceBoundary1stLevel* v10_ParentBoundary);
+    typedef IfcTemplatedEntityList< IfcRelSpaceBoundary1stLevel > list;
 };
 /// The 2nd level space boundary defines the physical or virtual delimiter of a space by the relationship IfcRelSpaceBoundary2ndLevel to the surrounding elements. 2nd level space boundaries are characterized by:
 /// 
@@ -25222,23 +26095,22 @@ class IfcRelSpaceBoundary1stLevel : public IfcRelSpaceBoundary {
 class IfcRelSpaceBoundary2ndLevel : public IfcRelSpaceBoundary1stLevel {
 public:
     /// Whether the optional attribute CorrespondingBoundary is defined for this IfcRelSpaceBoundary2ndLevel
-    bool hasCorrespondingBoundary();
+    bool hasCorrespondingBoundary() const;
     /// Reference to the other space boundary of the pair of two space boundaries on either side of a space separating thermal boundary element.
-    IfcRelSpaceBoundary2ndLevel* CorrespondingBoundary();
+    IfcRelSpaceBoundary2ndLevel* CorrespondingBoundary() const;
     void setCorrespondingBoundary(IfcRelSpaceBoundary2ndLevel* v);
     virtual unsigned int getArgumentCount() const { return 11; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 10: return IfcUtil::Argument_ENTITY; } return IfcRelSpaceBoundary1stLevel::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 10: return Type::IfcRelSpaceBoundary2ndLevel; } return IfcRelSpaceBoundary1stLevel::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 10: return "CorrespondingBoundary"; } return IfcRelSpaceBoundary1stLevel::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelSpaceBoundary2ndLevel > > Corresponds(); // INVERSE IfcRelSpaceBoundary2ndLevel::CorrespondingBoundary
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcRelSpaceBoundary2ndLevel >::ptr Corresponds() const; // INVERSE IfcRelSpaceBoundary2ndLevel::CorrespondingBoundary
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRelSpaceBoundary2ndLevel (IfcAbstractEntityPtr e);
-    IfcRelSpaceBoundary2ndLevel (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, IfcSpaceBoundarySelect v5_RelatingSpace, IfcElement* v6_RelatedBuildingElement, IfcConnectionGeometry* v7_ConnectionGeometry, IfcPhysicalOrVirtualEnum::IfcPhysicalOrVirtualEnum v8_PhysicalOrVirtualBoundary, IfcInternalOrExternalEnum::IfcInternalOrExternalEnum v9_InternalOrExternalBoundary, IfcRelSpaceBoundary1stLevel* v10_ParentBoundary, IfcRelSpaceBoundary2ndLevel* v11_CorrespondingBoundary);
-    typedef IfcRelSpaceBoundary2ndLevel* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRelSpaceBoundary2ndLevel > > list;
-    typedef IfcTemplatedEntityList< IfcRelSpaceBoundary2ndLevel >::it it;
+    IfcRelSpaceBoundary2ndLevel (IfcAbstractEntity* e);
+    IfcRelSpaceBoundary2ndLevel (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcSpaceBoundarySelect* v5_RelatingSpace, IfcElement* v6_RelatedBuildingElement, IfcConnectionGeometry* v7_ConnectionGeometry, IfcPhysicalOrVirtualEnum::IfcPhysicalOrVirtualEnum v8_PhysicalOrVirtualBoundary, IfcInternalOrExternalEnum::IfcInternalOrExternalEnum v9_InternalOrExternalBoundary, IfcRelSpaceBoundary1stLevel* v10_ParentBoundary, IfcRelSpaceBoundary2ndLevel* v11_CorrespondingBoundary);
+    typedef IfcTemplatedEntityList< IfcRelSpaceBoundary2ndLevel > list;
 };
 /// IfcRelVoidsElement is an objectified relationship between a building element and one opening element that creates a void in the element. It is a one-to-one relationship. This relationship implies a Boolean operation of subtraction between the geometric bodies of the element and the opening.
 /// 
@@ -25249,22 +26121,21 @@ class IfcRelSpaceBoundary2ndLevel : public IfcRelSpaceBoundary1stLevel {
 /// HISTORY New entity in IFC Release 1.0
 class IfcRelVoidsElement : public IfcRelDecomposes {
 public:
-    IfcElement* RelatingBuildingElement();
+    IfcElement* RelatingBuildingElement() const;
     void setRelatingBuildingElement(IfcElement* v);
-    IfcFeatureElementSubtraction* RelatedOpeningElement();
+    IfcFeatureElementSubtraction* RelatedOpeningElement() const;
     void setRelatedOpeningElement(IfcFeatureElementSubtraction* v);
     virtual unsigned int getArgumentCount() const { return 6; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 4: return IfcUtil::Argument_ENTITY; case 5: return IfcUtil::Argument_ENTITY; } return IfcRelDecomposes::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 4: return Type::IfcElement; case 5: return Type::IfcFeatureElementSubtraction; } return IfcRelDecomposes::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 4: return "RelatingBuildingElement"; case 5: return "RelatedOpeningElement"; } return IfcRelDecomposes::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRelVoidsElement (IfcAbstractEntityPtr e);
-    IfcRelVoidsElement (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, IfcElement* v5_RelatingBuildingElement, IfcFeatureElementSubtraction* v6_RelatedOpeningElement);
-    typedef IfcRelVoidsElement* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRelVoidsElement > > list;
-    typedef IfcTemplatedEntityList< IfcRelVoidsElement >::it it;
+    IfcRelVoidsElement (IfcAbstractEntity* e);
+    IfcRelVoidsElement (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcElement* v5_RelatingBuildingElement, IfcFeatureElementSubtraction* v6_RelatedOpeningElement);
+    typedef IfcTemplatedEntityList< IfcRelVoidsElement > list;
 };
 /// Definition from ISO/CD 10303-42:1992: The
 ///   reparametrised composite curve segment is a special type of
@@ -25291,20 +26162,19 @@ class IfcRelVoidsElement : public IfcRelDecomposes {
 /// HISTORY New class in IFC2x4
 class IfcReparametrisedCompositeCurveSegment : public IfcCompositeCurveSegment {
 public:
-    IfcParameterValue ParamLength();
-    void setParamLength(IfcParameterValue v);
+    double ParamLength() const;
+    void setParamLength(double v);
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 3: return IfcUtil::Argument_DOUBLE; } return IfcCompositeCurveSegment::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 3: return Type::IfcParameterValue; } return IfcCompositeCurveSegment::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 3: return "ParamLength"; } return IfcCompositeCurveSegment::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcReparametrisedCompositeCurveSegment (IfcAbstractEntityPtr e);
-    IfcReparametrisedCompositeCurveSegment (IfcTransitionCode::IfcTransitionCode v1_Transition, bool v2_SameSense, IfcCurve* v3_ParentCurve, IfcParameterValue v4_ParamLength);
-    typedef IfcReparametrisedCompositeCurveSegment* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcReparametrisedCompositeCurveSegment > > list;
-    typedef IfcTemplatedEntityList< IfcReparametrisedCompositeCurveSegment >::it it;
+    IfcReparametrisedCompositeCurveSegment (IfcAbstractEntity* e);
+    IfcReparametrisedCompositeCurveSegment (IfcTransitionCode::IfcTransitionCode v1_Transition, bool v2_SameSense, IfcCurve* v3_ParentCurve, double v4_ParamLength);
+    typedef IfcTemplatedEntityList< IfcReparametrisedCompositeCurveSegment > list;
 };
 /// IfcResource contains the information needed to represent the costs, schedule, and other impacts from the use of a thing in a process. It is not intended to use IfcResource to model the general properties of the things themselves, while an optional linkage from IfcResource to the things to be used can be specified (specifically, the relationship from subtypes of IfcResource to IfcProduct through the IfcRelAssignsToResource relationship).  
 /// 
@@ -25322,33 +26192,32 @@ class IfcReparametrisedCompositeCurveSegment : public IfcCompositeCurveSegment {
 class IfcResource : public IfcObject {
 public:
     /// Whether the optional attribute Identification is defined for this IfcResource
-    bool hasIdentification();
+    bool hasIdentification() const;
     /// An identifying designation given to a resource.
     ///   It is the identifier at the occurrence level. 
     /// 
     /// IFC2x4 CHANGE  Attribute promoted from subtype IfcConstructionResource.
-    IfcIdentifier Identification();
-    void setIdentification(IfcIdentifier v);
+    std::string Identification() const;
+    void setIdentification(std::string v);
     /// Whether the optional attribute LongDescription is defined for this IfcResource
-    bool hasLongDescription();
+    bool hasLongDescription() const;
     /// A detailed description of the resource (e.g. the skillset for a labor resource).  
     /// 
     /// IFC2x4 NOTE:  The attribute LongDescription is added replacing the ResourceGroup attribute at subtype IfcConstructionResource.
-    IfcText LongDescription();
-    void setLongDescription(IfcText v);
+    std::string LongDescription() const;
+    void setLongDescription(std::string v);
     virtual unsigned int getArgumentCount() const { return 7; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 5: return IfcUtil::Argument_STRING; case 6: return IfcUtil::Argument_STRING; } return IfcObject::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 5: return Type::IfcIdentifier; case 6: return Type::IfcText; } return IfcObject::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 5: return "Identification"; case 6: return "LongDescription"; } return IfcObject::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelAssignsToResource > > ResourceOf(); // INVERSE IfcRelAssignsToResource::RelatingResource
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcRelAssignsToResource >::ptr ResourceOf() const; // INVERSE IfcRelAssignsToResource::RelatingResource
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcResource (IfcAbstractEntityPtr e);
-    IfcResource (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, boost::optional< IfcIdentifier > v6_Identification, boost::optional< IfcText > v7_LongDescription);
-    typedef IfcResource* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcResource > > list;
-    typedef IfcTemplatedEntityList< IfcResource >::it it;
+    IfcResource (IfcAbstractEntity* e);
+    IfcResource (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, boost::optional< std::string > v6_Identification, boost::optional< std::string > v7_LongDescription);
+    typedef IfcTemplatedEntityList< IfcResource > list;
 };
 /// An IfcRevolvedAreaSolid is a solid created by revolving
 /// a cross section provided by a profile definition about an axis. The
@@ -25429,23 +26298,22 @@ class IfcResource : public IfcObject {
 class IfcRevolvedAreaSolid : public IfcSweptAreaSolid {
 public:
     /// Axis about which revolution will take place.
-    IfcAxis1Placement* Axis();
+    IfcAxis1Placement* Axis() const;
     void setAxis(IfcAxis1Placement* v);
     /// The angle through which the sweep will be made. This angle is measured from the plane of the swept area provided by the XY plane of the position coordinate system.
-    IfcPlaneAngleMeasure Angle();
-    void setAngle(IfcPlaneAngleMeasure v);
+    double Angle() const;
+    void setAngle(double v);
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 2: return IfcUtil::Argument_ENTITY; case 3: return IfcUtil::Argument_DOUBLE; } return IfcSweptAreaSolid::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 2: return Type::IfcAxis1Placement; case 3: return Type::IfcPlaneAngleMeasure; } return IfcSweptAreaSolid::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 2: return "Axis"; case 3: return "Angle"; } return IfcSweptAreaSolid::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRevolvedAreaSolid (IfcAbstractEntityPtr e);
-    IfcRevolvedAreaSolid (IfcProfileDef* v1_SweptArea, IfcAxis2Placement3D* v2_Position, IfcAxis1Placement* v3_Axis, IfcPlaneAngleMeasure v4_Angle);
-    typedef IfcRevolvedAreaSolid* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRevolvedAreaSolid > > list;
-    typedef IfcTemplatedEntityList< IfcRevolvedAreaSolid >::it it;
+    IfcRevolvedAreaSolid (IfcAbstractEntity* e);
+    IfcRevolvedAreaSolid (IfcProfileDef* v1_SweptArea, IfcAxis2Placement3D* v2_Position, IfcAxis1Placement* v3_Axis, double v4_Angle);
+    typedef IfcTemplatedEntityList< IfcRevolvedAreaSolid > list;
 };
 /// IfcRevolvedAreaSolidTapered is defined by revolving a
 /// cross section along a circular arc. The cross section may change
@@ -25507,20 +26375,19 @@ class IfcRevolvedAreaSolid : public IfcSweptAreaSolid {
 /// not be used
 class IfcRevolvedAreaSolidTapered : public IfcRevolvedAreaSolid {
 public:
-    IfcProfileDef* EndSweptArea();
+    IfcProfileDef* EndSweptArea() const;
     void setEndSweptArea(IfcProfileDef* v);
     virtual unsigned int getArgumentCount() const { return 5; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 4: return IfcUtil::Argument_ENTITY; } return IfcRevolvedAreaSolid::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 4: return Type::IfcProfileDef; } return IfcRevolvedAreaSolid::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 4: return "EndSweptArea"; } return IfcRevolvedAreaSolid::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRevolvedAreaSolidTapered (IfcAbstractEntityPtr e);
-    IfcRevolvedAreaSolidTapered (IfcProfileDef* v1_SweptArea, IfcAxis2Placement3D* v2_Position, IfcAxis1Placement* v3_Axis, IfcPlaneAngleMeasure v4_Angle, IfcProfileDef* v5_EndSweptArea);
-    typedef IfcRevolvedAreaSolidTapered* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRevolvedAreaSolidTapered > > list;
-    typedef IfcTemplatedEntityList< IfcRevolvedAreaSolidTapered >::it it;
+    IfcRevolvedAreaSolidTapered (IfcAbstractEntity* e);
+    IfcRevolvedAreaSolidTapered (IfcProfileDef* v1_SweptArea, IfcAxis2Placement3D* v2_Position, IfcAxis1Placement* v3_Axis, double v4_Angle, IfcProfileDef* v5_EndSweptArea);
+    typedef IfcTemplatedEntityList< IfcRevolvedAreaSolidTapered > list;
 };
 /// The IfcRightCircularCone is a Construction Solid
 /// Geometry (CSG) 3D primitive. It is a solid with a circular base and
@@ -25590,23 +26457,22 @@ class IfcRevolvedAreaSolidTapered : public IfcRevolvedAreaSolid {
 class IfcRightCircularCone : public IfcCsgPrimitive3D {
 public:
     /// The distance between the base of the cone and the apex.
-    IfcPositiveLengthMeasure Height();
-    void setHeight(IfcPositiveLengthMeasure v);
+    double Height() const;
+    void setHeight(double v);
     /// The radius of the cone at the base.
-    IfcPositiveLengthMeasure BottomRadius();
-    void setBottomRadius(IfcPositiveLengthMeasure v);
+    double BottomRadius() const;
+    void setBottomRadius(double v);
     virtual unsigned int getArgumentCount() const { return 3; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 1: return IfcUtil::Argument_DOUBLE; case 2: return IfcUtil::Argument_DOUBLE; } return IfcCsgPrimitive3D::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 1: return Type::IfcPositiveLengthMeasure; case 2: return Type::IfcPositiveLengthMeasure; } return IfcCsgPrimitive3D::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 1: return "Height"; case 2: return "BottomRadius"; } return IfcCsgPrimitive3D::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRightCircularCone (IfcAbstractEntityPtr e);
-    IfcRightCircularCone (IfcAxis2Placement3D* v1_Position, IfcPositiveLengthMeasure v2_Height, IfcPositiveLengthMeasure v3_BottomRadius);
-    typedef IfcRightCircularCone* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRightCircularCone > > list;
-    typedef IfcTemplatedEntityList< IfcRightCircularCone >::it it;
+    IfcRightCircularCone (IfcAbstractEntity* e);
+    IfcRightCircularCone (IfcAxis2Placement3D* v1_Position, double v2_Height, double v3_BottomRadius);
+    typedef IfcTemplatedEntityList< IfcRightCircularCone > list;
 };
 /// The IfcRightCircularCylinder is a Construction Solid
 /// Geometry (CSG) 3D primitive. It is a solid with a circular base and
@@ -25692,23 +26558,22 @@ class IfcRightCircularCone : public IfcCsgPrimitive3D {
 class IfcRightCircularCylinder : public IfcCsgPrimitive3D {
 public:
     /// The distance between the planar circular faces of the cylinder.
-    IfcPositiveLengthMeasure Height();
-    void setHeight(IfcPositiveLengthMeasure v);
+    double Height() const;
+    void setHeight(double v);
     /// The radius of the cylinder.
-    IfcPositiveLengthMeasure Radius();
-    void setRadius(IfcPositiveLengthMeasure v);
+    double Radius() const;
+    void setRadius(double v);
     virtual unsigned int getArgumentCount() const { return 3; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 1: return IfcUtil::Argument_DOUBLE; case 2: return IfcUtil::Argument_DOUBLE; } return IfcCsgPrimitive3D::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 1: return Type::IfcPositiveLengthMeasure; case 2: return Type::IfcPositiveLengthMeasure; } return IfcCsgPrimitive3D::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 1: return "Height"; case 2: return "Radius"; } return IfcCsgPrimitive3D::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRightCircularCylinder (IfcAbstractEntityPtr e);
-    IfcRightCircularCylinder (IfcAxis2Placement3D* v1_Position, IfcPositiveLengthMeasure v2_Height, IfcPositiveLengthMeasure v3_Radius);
-    typedef IfcRightCircularCylinder* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRightCircularCylinder > > list;
-    typedef IfcTemplatedEntityList< IfcRightCircularCylinder >::it it;
+    IfcRightCircularCylinder (IfcAbstractEntity* e);
+    IfcRightCircularCylinder (IfcAxis2Placement3D* v1_Position, double v2_Height, double v3_Radius);
+    typedef IfcTemplatedEntityList< IfcRightCircularCylinder > list;
 };
 /// The IfcSimplePropertyTemplate defines the template for
 /// all dynamically extensible properties, either the subtypes of
@@ -25758,26 +26623,26 @@ class IfcRightCircularCylinder : public IfcCsgPrimitive3D {
 class IfcSimplePropertyTemplate : public IfcPropertyTemplate {
 public:
     /// Whether the optional attribute TemplateType is defined for this IfcSimplePropertyTemplate
-    bool hasTemplateType();
+    bool hasTemplateType() const;
     /// Property type defining whether the property template defines a property with a single value, a bounded value, a list value, a table value, an enumerated value, or a reference value. Or the quantity type defining whether the template defines a quantity with a length, area, volume, weight or time value.
     /// 
     /// NOTE the value of this property determines the correct use of the PrimaryUnit, SecondaryUnit, PrimaryDataType, SecondaryDataType, and Expression attributes.
-    IfcSimplePropertyTemplateTypeEnum::IfcSimplePropertyTemplateTypeEnum TemplateType();
+    IfcSimplePropertyTemplateTypeEnum::IfcSimplePropertyTemplateTypeEnum TemplateType() const;
     void setTemplateType(IfcSimplePropertyTemplateTypeEnum::IfcSimplePropertyTemplateTypeEnum v);
     /// Whether the optional attribute PrimaryMeasureType is defined for this IfcSimplePropertyTemplate
-    bool hasPrimaryMeasureType();
-    IfcLabel PrimaryMeasureType();
-    void setPrimaryMeasureType(IfcLabel v);
+    bool hasPrimaryMeasureType() const;
+    std::string PrimaryMeasureType() const;
+    void setPrimaryMeasureType(std::string v);
     /// Whether the optional attribute SecondaryMeasureType is defined for this IfcSimplePropertyTemplate
-    bool hasSecondaryMeasureType();
-    IfcLabel SecondaryMeasureType();
-    void setSecondaryMeasureType(IfcLabel v);
+    bool hasSecondaryMeasureType() const;
+    std::string SecondaryMeasureType() const;
+    void setSecondaryMeasureType(std::string v);
     /// Whether the optional attribute Enumerators is defined for this IfcSimplePropertyTemplate
-    bool hasEnumerators();
-    IfcPropertyEnumeration* Enumerators();
+    bool hasEnumerators() const;
+    IfcPropertyEnumeration* Enumerators() const;
     void setEnumerators(IfcPropertyEnumeration* v);
     /// Whether the optional attribute PrimaryUnit is defined for this IfcSimplePropertyTemplate
-    bool hasPrimaryUnit();
+    bool hasPrimaryUnit() const;
     /// Primary unit assigned to the definition of the property. It should be provided, if the PropertyType is set to:
     /// 
     /// P_SINGLEVALUE: determining the IfcPropertySingleValue.Unit
@@ -25785,27 +26650,27 @@ class IfcSimplePropertyTemplate : public IfcPropertyTemplate {
     /// P_BOUNDEDVALUE: determining the IfcPropertyBoundedValue.Unit
     /// P_LISTVALUE: determining the IfcPropertyListValue.Unit
     /// P_TABLEVALUE: determining the IfcPropertyTableValue.DefiningUnit
-    IfcUnit PrimaryUnit();
-    void setPrimaryUnit(IfcUnit v);
+    IfcUnit* PrimaryUnit() const;
+    void setPrimaryUnit(IfcUnit* v);
     /// Whether the optional attribute SecondaryUnit is defined for this IfcSimplePropertyTemplate
-    bool hasSecondaryUnit();
+    bool hasSecondaryUnit() const;
     /// Secondary unit assigned to the definition of the property. It should be provided, if the PropertyType is set to:
     /// 
     /// P_TABLEVALUE: determining the IfcPropertyTableValue.DefinedUnit
-    IfcUnit SecondaryUnit();
-    void setSecondaryUnit(IfcUnit v);
+    IfcUnit* SecondaryUnit() const;
+    void setSecondaryUnit(IfcUnit* v);
     /// Whether the optional attribute Expression is defined for this IfcSimplePropertyTemplate
-    bool hasExpression();
+    bool hasExpression() const;
     /// The expression used to store additional information for the property template depending on the PropertyType. It should the following definitions, if the PropertyType is set to:
     /// 
     /// P_TABLEVALUE: the expression that could be evaluated to define the correlation between the defining values and the defined values.
     /// Q_LENGTH, Q_AREA, Q_VOLUME, Q_COUNT, Q_WEIGTH, Q_TIME: the formula to be used to calculate the quantity
     /// 
     /// NOTE No value shall be asserted if the PropertyType is not listed above.
-    IfcLabel Expression();
-    void setExpression(IfcLabel v);
+    std::string Expression() const;
+    void setExpression(std::string v);
     /// Whether the optional attribute AccessState is defined for this IfcSimplePropertyTemplate
-    bool hasAccessState();
+    bool hasAccessState() const;
     /// Information about the access state of the property. It determines whether a property be viewed and/or modified by any receiving application without specific knowledge of it. 
     /// Attribute use definition for IfcStateEnum
     /// 
@@ -25818,20 +26683,19 @@ class IfcSimplePropertyTemplate : public IfcPropertyTemplate {
     /// READWRITELOCKED: Properties of this template are locked, readable, and writable. They may only be accessed by the owning application.
     /// 
     /// READONLYLOCKED: Properties of this template are locked and read-only. They may only be accessed by the owning application.
-    IfcStateEnum::IfcStateEnum AccessState();
+    IfcStateEnum::IfcStateEnum AccessState() const;
     void setAccessState(IfcStateEnum::IfcStateEnum v);
     virtual unsigned int getArgumentCount() const { return 12; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 4: return IfcUtil::Argument_ENUMERATION; case 5: return IfcUtil::Argument_STRING; case 6: return IfcUtil::Argument_STRING; case 7: return IfcUtil::Argument_ENTITY; case 8: return IfcUtil::Argument_ENTITY; case 9: return IfcUtil::Argument_ENTITY; case 10: return IfcUtil::Argument_STRING; case 11: return IfcUtil::Argument_ENUMERATION; } return IfcPropertyTemplate::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 4: return Type::IfcSimplePropertyTemplateTypeEnum; case 5: return Type::IfcLabel; case 6: return Type::IfcLabel; case 7: return Type::IfcPropertyEnumeration; case 8: return Type::IfcUnit; case 9: return Type::IfcUnit; case 10: return Type::IfcLabel; case 11: return Type::IfcStateEnum; } return IfcPropertyTemplate::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 4: return "TemplateType"; case 5: return "PrimaryMeasureType"; case 6: return "SecondaryMeasureType"; case 7: return "Enumerators"; case 8: return "PrimaryUnit"; case 9: return "SecondaryUnit"; case 10: return "Expression"; case 11: return "AccessState"; } return IfcPropertyTemplate::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcSimplePropertyTemplate (IfcAbstractEntityPtr e);
-    IfcSimplePropertyTemplate (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcSimplePropertyTemplateTypeEnum::IfcSimplePropertyTemplateTypeEnum > v5_TemplateType, boost::optional< IfcLabel > v6_PrimaryMeasureType, boost::optional< IfcLabel > v7_SecondaryMeasureType, IfcPropertyEnumeration* v8_Enumerators, boost::optional< IfcUnit > v9_PrimaryUnit, boost::optional< IfcUnit > v10_SecondaryUnit, boost::optional< IfcLabel > v11_Expression, boost::optional< IfcStateEnum::IfcStateEnum > v12_AccessState);
-    typedef IfcSimplePropertyTemplate* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcSimplePropertyTemplate > > list;
-    typedef IfcTemplatedEntityList< IfcSimplePropertyTemplate >::it it;
+    IfcSimplePropertyTemplate (IfcAbstractEntity* e);
+    IfcSimplePropertyTemplate (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< IfcSimplePropertyTemplateTypeEnum::IfcSimplePropertyTemplateTypeEnum > v5_TemplateType, boost::optional< std::string > v6_PrimaryMeasureType, boost::optional< std::string > v7_SecondaryMeasureType, IfcPropertyEnumeration* v8_Enumerators, IfcUnit* v9_PrimaryUnit, IfcUnit* v10_SecondaryUnit, boost::optional< std::string > v11_Expression, boost::optional< IfcStateEnum::IfcStateEnum > v12_AccessState);
+    typedef IfcTemplatedEntityList< IfcSimplePropertyTemplate > list;
 };
 /// Definition from IAI: A spatial element is the
 ///   generalization of all spatial elements that might be used
@@ -25867,27 +26731,26 @@ class IfcSimplePropertyTemplate : public IfcPropertyTemplate {
 class IfcSpatialElement : public IfcProduct {
 public:
     /// Whether the optional attribute LongName is defined for this IfcSpatialElement
-    bool hasLongName();
+    bool hasLongName() const;
     /// Long name for a spatial structure element, used for informal purposes. It should be used, if available, in conjunction with the inherited Name attribute.
     /// 
     /// NOTE  In many scenarios the Name attribute refers to the short name or number of a spacial element, and the LongName refers to the full name.
-    IfcLabel LongName();
-    void setLongName(IfcLabel v);
+    std::string LongName() const;
+    void setLongName(std::string v);
     virtual unsigned int getArgumentCount() const { return 8; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 7: return IfcUtil::Argument_STRING; } return IfcProduct::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 7: return Type::IfcLabel; } return IfcProduct::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 7: return "LongName"; } return IfcProduct::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelContainedInSpatialStructure > > ContainsElements(); // INVERSE IfcRelContainedInSpatialStructure::RelatingStructure
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelServicesBuildings > > ServicedBySystems(); // INVERSE IfcRelServicesBuildings::RelatedBuildings
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelReferencedInSpatialStructure > > ReferencesElements(); // INVERSE IfcRelReferencedInSpatialStructure::RelatingStructure
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcRelContainedInSpatialStructure >::ptr ContainsElements() const; // INVERSE IfcRelContainedInSpatialStructure::RelatingStructure
+    IfcTemplatedEntityList< IfcRelServicesBuildings >::ptr ServicedBySystems() const; // INVERSE IfcRelServicesBuildings::RelatedBuildings
+    IfcTemplatedEntityList< IfcRelReferencedInSpatialStructure >::ptr ReferencesElements() const; // INVERSE IfcRelReferencedInSpatialStructure::RelatingStructure
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcSpatialElement (IfcAbstractEntityPtr e);
-    IfcSpatialElement (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcLabel > v8_LongName);
-    typedef IfcSpatialElement* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcSpatialElement > > list;
-    typedef IfcTemplatedEntityList< IfcSpatialElement >::it it;
+    IfcSpatialElement (IfcAbstractEntity* e);
+    IfcSpatialElement (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_LongName);
+    typedef IfcTemplatedEntityList< IfcSpatialElement > list;
 };
 /// Definition from IAI: The IfcSpatialElementType
 /// defines a list of commonly shared property set definitions of a
@@ -25923,22 +26786,21 @@ class IfcSpatialElement : public IfcProduct {
 class IfcSpatialElementType : public IfcTypeProduct {
 public:
     /// Whether the optional attribute ElementType is defined for this IfcSpatialElementType
-    bool hasElementType();
+    bool hasElementType() const;
     /// The type denotes a particular type that indicates the object further. The use has to be established at the level of instantiable subtypes. In particular it holds the user defined type, if the enumeration of the attribute 'PredefinedType' is set to USERDEFINED.
-    IfcLabel ElementType();
-    void setElementType(IfcLabel v);
+    std::string ElementType() const;
+    void setElementType(std::string v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_STRING; } return IfcTypeProduct::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcLabel; } return IfcTypeProduct::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "ElementType"; } return IfcTypeProduct::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcSpatialElementType (IfcAbstractEntityPtr e);
-    IfcSpatialElementType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType);
-    typedef IfcSpatialElementType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcSpatialElementType > > list;
-    typedef IfcTemplatedEntityList< IfcSpatialElementType >::it it;
+    IfcSpatialElementType (IfcAbstractEntity* e);
+    IfcSpatialElementType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType);
+    typedef IfcTemplatedEntityList< IfcSpatialElementType > list;
 };
 /// A spatial structure element
 /// (IfcSpatialStructureElement) is the generalization of all
@@ -26017,25 +26879,24 @@ class IfcSpatialElementType : public IfcTypeProduct {
 class IfcSpatialStructureElement : public IfcSpatialElement {
 public:
     /// Whether the optional attribute CompositionType is defined for this IfcSpatialStructureElement
-    bool hasCompositionType();
+    bool hasCompositionType() const;
     /// Denotes, whether the predefined spatial structure element represents itself, or an aggregate (complex) or a part (part). The interpretation is given separately for each subtype of spatial structure element. If no CompositionType is asserted, the dafault value 'ELEMENT' applies.
     /// 
     /// IFC2x4 CHANGE&nbsp
     ///   Attribute made optional.
-    IfcElementCompositionEnum::IfcElementCompositionEnum CompositionType();
+    IfcElementCompositionEnum::IfcElementCompositionEnum CompositionType() const;
     void setCompositionType(IfcElementCompositionEnum::IfcElementCompositionEnum v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_ENUMERATION; } return IfcSpatialElement::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcElementCompositionEnum; } return IfcSpatialElement::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "CompositionType"; } return IfcSpatialElement::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcSpatialStructureElement (IfcAbstractEntityPtr e);
-    IfcSpatialStructureElement (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcLabel > v8_LongName, boost::optional< IfcElementCompositionEnum::IfcElementCompositionEnum > v9_CompositionType);
-    typedef IfcSpatialStructureElement* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcSpatialStructureElement > > list;
-    typedef IfcTemplatedEntityList< IfcSpatialStructureElement >::it it;
+    IfcSpatialStructureElement (IfcAbstractEntity* e);
+    IfcSpatialStructureElement (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_LongName, boost::optional< IfcElementCompositionEnum::IfcElementCompositionEnum > v9_CompositionType);
+    typedef IfcTemplatedEntityList< IfcSpatialStructureElement > list;
 };
 /// Definition from IAI: The element type
 ///   (IfcSpatialStructureElementType) defines a list of
@@ -26075,16 +26936,15 @@ class IfcSpatialStructureElementType : public IfcSpatialElementType {
 public:
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcSpatialElementType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcSpatialElementType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcSpatialElementType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcSpatialStructureElementType (IfcAbstractEntityPtr e);
-    IfcSpatialStructureElementType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType);
-    typedef IfcSpatialStructureElementType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcSpatialStructureElementType > > list;
-    typedef IfcTemplatedEntityList< IfcSpatialStructureElementType >::it it;
+    IfcSpatialStructureElementType (IfcAbstractEntity* e);
+    IfcSpatialStructureElementType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType);
+    typedef IfcTemplatedEntityList< IfcSpatialStructureElementType > list;
 };
 /// Definition from IAI: A spatial element is the
 /// generalization of all spatial elements that might be used to
@@ -26138,22 +26998,21 @@ class IfcSpatialStructureElementType : public IfcSpatialElementType {
 class IfcSpatialZone : public IfcSpatialElement {
 public:
     /// Whether the optional attribute PredefinedType is defined for this IfcSpatialZone
-    bool hasPredefinedType();
+    bool hasPredefinedType() const;
     /// Predefined types to define the particular type of the spatial zone. There may be property set definitions available for each predefined type.
-    IfcSpatialZoneTypeEnum::IfcSpatialZoneTypeEnum PredefinedType();
+    IfcSpatialZoneTypeEnum::IfcSpatialZoneTypeEnum PredefinedType() const;
     void setPredefinedType(IfcSpatialZoneTypeEnum::IfcSpatialZoneTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_ENUMERATION; } return IfcSpatialElement::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcSpatialZoneTypeEnum; } return IfcSpatialElement::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "PredefinedType"; } return IfcSpatialElement::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcSpatialZone (IfcAbstractEntityPtr e);
-    IfcSpatialZone (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcLabel > v8_LongName, boost::optional< IfcSpatialZoneTypeEnum::IfcSpatialZoneTypeEnum > v9_PredefinedType);
-    typedef IfcSpatialZone* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcSpatialZone > > list;
-    typedef IfcTemplatedEntityList< IfcSpatialZone >::it it;
+    IfcSpatialZone (IfcAbstractEntity* e);
+    IfcSpatialZone (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_LongName, boost::optional< IfcSpatialZoneTypeEnum::IfcSpatialZoneTypeEnum > v9_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcSpatialZone > list;
 };
 /// Definition from IAI: The IfcSpatialZoneType
 /// defines a list of commonly shared property set definitions of a
@@ -26188,24 +27047,23 @@ class IfcSpatialZone : public IfcSpatialElement {
 class IfcSpatialZoneType : public IfcSpatialElementType {
 public:
     /// Predefined types to define the particular type of the spatial zone. There may be property set definitions available for each predefined type.
-    IfcSpatialZoneTypeEnum::IfcSpatialZoneTypeEnum PredefinedType();
+    IfcSpatialZoneTypeEnum::IfcSpatialZoneTypeEnum PredefinedType() const;
     void setPredefinedType(IfcSpatialZoneTypeEnum::IfcSpatialZoneTypeEnum v);
     /// Whether the optional attribute LongName is defined for this IfcSpatialZoneType
-    bool hasLongName();
-    IfcLabel LongName();
-    void setLongName(IfcLabel v);
+    bool hasLongName() const;
+    std::string LongName() const;
+    void setLongName(std::string v);
     virtual unsigned int getArgumentCount() const { return 11; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; case 10: return IfcUtil::Argument_STRING; } return IfcSpatialElementType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcSpatialZoneTypeEnum; case 10: return Type::IfcLabel; } return IfcSpatialElementType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; case 10: return "LongName"; } return IfcSpatialElementType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcSpatialZoneType (IfcAbstractEntityPtr e);
-    IfcSpatialZoneType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcSpatialZoneTypeEnum::IfcSpatialZoneTypeEnum v10_PredefinedType, boost::optional< IfcLabel > v11_LongName);
-    typedef IfcSpatialZoneType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcSpatialZoneType > > list;
-    typedef IfcTemplatedEntityList< IfcSpatialZoneType >::it it;
+    IfcSpatialZoneType (IfcAbstractEntity* e);
+    IfcSpatialZoneType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcSpatialZoneTypeEnum::IfcSpatialZoneTypeEnum v10_PredefinedType, boost::optional< std::string > v11_LongName);
+    typedef IfcTemplatedEntityList< IfcSpatialZoneType > list;
 };
 /// The IfcSphere is a Construction Solid Geometry (CSG) 3D
 /// primitive. It is a solid where all points at the surface have the
@@ -26260,20 +27118,19 @@ class IfcSpatialZoneType : public IfcSpatialElementType {
 class IfcSphere : public IfcCsgPrimitive3D {
 public:
     /// The radius of the sphere.
-    IfcPositiveLengthMeasure Radius();
-    void setRadius(IfcPositiveLengthMeasure v);
+    double Radius() const;
+    void setRadius(double v);
     virtual unsigned int getArgumentCount() const { return 2; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 1: return IfcUtil::Argument_DOUBLE; } return IfcCsgPrimitive3D::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 1: return Type::IfcPositiveLengthMeasure; } return IfcCsgPrimitive3D::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 1: return "Radius"; } return IfcCsgPrimitive3D::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcSphere (IfcAbstractEntityPtr e);
-    IfcSphere (IfcAxis2Placement3D* v1_Position, IfcPositiveLengthMeasure v2_Radius);
-    typedef IfcSphere* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcSphere > > list;
-    typedef IfcTemplatedEntityList< IfcSphere >::it it;
+    IfcSphere (IfcAbstractEntity* e);
+    IfcSphere (IfcAxis2Placement3D* v1_Position, double v2_Radius);
+    typedef IfcTemplatedEntityList< IfcSphere > list;
 };
 /// Definition from IAI: The abstract entity IfcStructuralActivity combines the definition of actions (such as forces, displacements, etc.) and reactions (support reactions, internal forces, deflections, etc.) which are specified by using the basic load definitions from the IfcStructuralLoadResource.
 /// 
@@ -26373,7 +27230,7 @@ class IfcStructuralActivity : public IfcProduct {
     /// Load or result resource object which defines the load type, direction, and load values.
     /// 
     /// In case of activities which are variably distributed over curves or surfaces, IfcStructuralLoadConfiguration is used which provides a list of load samples and their locations within the load distribution, measured in local coordinates of the curve or surface on which this activity acts.  The contents of this load or result distribution may be further restricted by definitions at subtypes of IfcStructuralActivity.
-    IfcStructuralLoad* AppliedLoad();
+    IfcStructuralLoad* AppliedLoad() const;
     void setAppliedLoad(IfcStructuralLoad* v);
     /// Indicates whether the load directions refer to the global coordinate system (global to
     /// the analysis model, i.e. as established by IfcStructuralAnalysisModel.SharedPlacement)
@@ -26392,21 +27249,20 @@ class IfcStructuralActivity : public IfcProduct {
     /// but as the analysis model specific shared coordinate system.  In contrast, LOCAL_COORDS
     /// is to be taken as coordinates which are local to individual structural items and activities,
     /// as established by subclass-specific geometry use definitions.
-    IfcGlobalOrLocalEnum::IfcGlobalOrLocalEnum GlobalOrLocal();
+    IfcGlobalOrLocalEnum::IfcGlobalOrLocalEnum GlobalOrLocal() const;
     void setGlobalOrLocal(IfcGlobalOrLocalEnum::IfcGlobalOrLocalEnum v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 7: return IfcUtil::Argument_ENTITY; case 8: return IfcUtil::Argument_ENUMERATION; } return IfcProduct::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 7: return Type::IfcStructuralLoad; case 8: return Type::IfcGlobalOrLocalEnum; } return IfcProduct::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 7: return "AppliedLoad"; case 8: return "GlobalOrLocal"; } return IfcProduct::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelConnectsStructuralActivity > > AssignedToStructuralItem(); // INVERSE IfcRelConnectsStructuralActivity::RelatedStructuralActivity
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcRelConnectsStructuralActivity >::ptr AssignedToStructuralItem() const; // INVERSE IfcRelConnectsStructuralActivity::RelatedStructuralActivity
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcStructuralActivity (IfcAbstractEntityPtr e);
-    IfcStructuralActivity (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcStructuralLoad* v8_AppliedLoad, IfcGlobalOrLocalEnum::IfcGlobalOrLocalEnum v9_GlobalOrLocal);
-    typedef IfcStructuralActivity* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcStructuralActivity > > list;
-    typedef IfcTemplatedEntityList< IfcStructuralActivity >::it it;
+    IfcStructuralActivity (IfcAbstractEntity* e);
+    IfcStructuralActivity (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcStructuralLoad* v8_AppliedLoad, IfcGlobalOrLocalEnum::IfcGlobalOrLocalEnum v9_GlobalOrLocal);
+    typedef IfcTemplatedEntityList< IfcStructuralActivity > list;
 };
 /// Definition from IAI: The abstract entity IfcStructuralItem is the generalization of structural members and structural connections, i.e. analysis idealizations of elements in the building model.  It defines the relation between structural members and connections with structural activities (actions and reactions).
 /// 
@@ -26499,17 +27355,16 @@ class IfcStructuralItem : public IfcProduct {
 public:
     virtual unsigned int getArgumentCount() const { return 7; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcProduct::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcProduct::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcProduct::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelConnectsStructuralActivity > > AssignedStructuralActivity(); // INVERSE IfcRelConnectsStructuralActivity::RelatingElement
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcRelConnectsStructuralActivity >::ptr AssignedStructuralActivity() const; // INVERSE IfcRelConnectsStructuralActivity::RelatingElement
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcStructuralItem (IfcAbstractEntityPtr e);
-    IfcStructuralItem (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation);
-    typedef IfcStructuralItem* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcStructuralItem > > list;
-    typedef IfcTemplatedEntityList< IfcStructuralItem >::it it;
+    IfcStructuralItem (IfcAbstractEntity* e);
+    IfcStructuralItem (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation);
+    typedef IfcTemplatedEntityList< IfcStructuralItem > list;
 };
 /// Definition from IAI: The abstract entity IfcStructuralMember is the superclass of all structural items which represent the idealized structural behavior of building elements.
 /// 
@@ -26519,17 +27374,16 @@ class IfcStructuralMember : public IfcStructuralItem {
 public:
     virtual unsigned int getArgumentCount() const { return 7; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcStructuralItem::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcStructuralItem::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcStructuralItem::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelConnectsStructuralMember > > ConnectedBy(); // INVERSE IfcRelConnectsStructuralMember::RelatingStructuralMember
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcRelConnectsStructuralMember >::ptr ConnectedBy() const; // INVERSE IfcRelConnectsStructuralMember::RelatingStructuralMember
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcStructuralMember (IfcAbstractEntityPtr e);
-    IfcStructuralMember (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation);
-    typedef IfcStructuralMember* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcStructuralMember > > list;
-    typedef IfcTemplatedEntityList< IfcStructuralMember >::it it;
+    IfcStructuralMember (IfcAbstractEntity* e);
+    IfcStructuralMember (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation);
+    typedef IfcTemplatedEntityList< IfcStructuralMember > list;
 };
 /// Definition from IAI: A structural reaction is a structural activity that results from a
 /// structural action imposed to a structural item or building element.  Examples are support reactions,
@@ -26555,16 +27409,15 @@ class IfcStructuralReaction : public IfcStructuralActivity {
 public:
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcStructuralActivity::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcStructuralActivity::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcStructuralActivity::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcStructuralReaction (IfcAbstractEntityPtr e);
-    IfcStructuralReaction (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcStructuralLoad* v8_AppliedLoad, IfcGlobalOrLocalEnum::IfcGlobalOrLocalEnum v9_GlobalOrLocal);
-    typedef IfcStructuralReaction* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcStructuralReaction > > list;
-    typedef IfcTemplatedEntityList< IfcStructuralReaction >::it it;
+    IfcStructuralReaction (IfcAbstractEntity* e);
+    IfcStructuralReaction (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcStructuralLoad* v8_AppliedLoad, IfcGlobalOrLocalEnum::IfcGlobalOrLocalEnum v9_GlobalOrLocal);
+    typedef IfcTemplatedEntityList< IfcStructuralReaction > list;
 };
 /// Definition from IAI: Instances of IfcStructuralSurfaceMember describe face members, i.e. structural analysis idealizations of slabs, walls, shells, etc..  Surface members may be planar or curved.
 /// 
@@ -26589,25 +27442,24 @@ class IfcStructuralReaction : public IfcStructuralActivity {
 class IfcStructuralSurfaceMember : public IfcStructuralMember {
 public:
     /// Type of member with respect to its load carrying behavior in this analysis idealization.
-    IfcStructuralSurfaceMemberTypeEnum::IfcStructuralSurfaceMemberTypeEnum PredefinedType();
+    IfcStructuralSurfaceMemberTypeEnum::IfcStructuralSurfaceMemberTypeEnum PredefinedType() const;
     void setPredefinedType(IfcStructuralSurfaceMemberTypeEnum::IfcStructuralSurfaceMemberTypeEnum v);
     /// Whether the optional attribute Thickness is defined for this IfcStructuralSurfaceMember
-    bool hasThickness();
+    bool hasThickness() const;
     /// Defines the typically understood thickness of the structural surface member, measured normal to its reference surface.
-    IfcPositiveLengthMeasure Thickness();
-    void setThickness(IfcPositiveLengthMeasure v);
+    double Thickness() const;
+    void setThickness(double v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 7: return IfcUtil::Argument_ENUMERATION; case 8: return IfcUtil::Argument_DOUBLE; } return IfcStructuralMember::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 7: return Type::IfcStructuralSurfaceMemberTypeEnum; case 8: return Type::IfcPositiveLengthMeasure; } return IfcStructuralMember::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 7: return "PredefinedType"; case 8: return "Thickness"; } return IfcStructuralMember::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcStructuralSurfaceMember (IfcAbstractEntityPtr e);
-    IfcStructuralSurfaceMember (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcStructuralSurfaceMemberTypeEnum::IfcStructuralSurfaceMemberTypeEnum v8_PredefinedType, boost::optional< IfcPositiveLengthMeasure > v9_Thickness);
-    typedef IfcStructuralSurfaceMember* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcStructuralSurfaceMember > > list;
-    typedef IfcTemplatedEntityList< IfcStructuralSurfaceMember >::it it;
+    IfcStructuralSurfaceMember (IfcAbstractEntity* e);
+    IfcStructuralSurfaceMember (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcStructuralSurfaceMemberTypeEnum::IfcStructuralSurfaceMemberTypeEnum v8_PredefinedType, boost::optional< double > v9_Thickness);
+    typedef IfcTemplatedEntityList< IfcStructuralSurfaceMember > list;
 };
 /// Definition from IAI: Describes surface members with varying section properties.  The properties are provided by means of a property set and IfcRelDefinesByProperties or by means of aggregation:  An instance of IfcStructuralSurfaceMemberVarying may be composed of two or more instances of IfcStructuralSurfaceMember with differing section properties.  These subordinate members relate to the instance of IfcStructuralSurfaceMemberVarying by IfcRelAggregates.
 /// 
@@ -26631,16 +27483,15 @@ class IfcStructuralSurfaceMemberVarying : public IfcStructuralSurfaceMember {
 public:
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcStructuralSurfaceMember::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcStructuralSurfaceMember::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcStructuralSurfaceMember::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcStructuralSurfaceMemberVarying (IfcAbstractEntityPtr e);
-    IfcStructuralSurfaceMemberVarying (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcStructuralSurfaceMemberTypeEnum::IfcStructuralSurfaceMemberTypeEnum v8_PredefinedType, boost::optional< IfcPositiveLengthMeasure > v9_Thickness);
-    typedef IfcStructuralSurfaceMemberVarying* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcStructuralSurfaceMemberVarying > > list;
-    typedef IfcTemplatedEntityList< IfcStructuralSurfaceMemberVarying >::it it;
+    IfcStructuralSurfaceMemberVarying (IfcAbstractEntity* e);
+    IfcStructuralSurfaceMemberVarying (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcStructuralSurfaceMemberTypeEnum::IfcStructuralSurfaceMemberTypeEnum v8_PredefinedType, boost::optional< double > v9_Thickness);
+    typedef IfcTemplatedEntityList< IfcStructuralSurfaceMemberVarying > list;
 };
 /// Definition from IAI: Defines a reaction which occurs distributed over a surface.  A surface reaction may be connected with a surface member or surface connection.
 /// 
@@ -26667,20 +27518,19 @@ class IfcStructuralSurfaceMemberVarying : public IfcStructuralSurfaceMember {
 class IfcStructuralSurfaceReaction : public IfcStructuralReaction {
 public:
     /// Type of reaction according to its distribution of load values.
-    IfcStructuralSurfaceActivityTypeEnum::IfcStructuralSurfaceActivityTypeEnum PredefinedType();
+    IfcStructuralSurfaceActivityTypeEnum::IfcStructuralSurfaceActivityTypeEnum PredefinedType() const;
     void setPredefinedType(IfcStructuralSurfaceActivityTypeEnum::IfcStructuralSurfaceActivityTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcStructuralReaction::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcStructuralSurfaceActivityTypeEnum; } return IfcStructuralReaction::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcStructuralReaction::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcStructuralSurfaceReaction (IfcAbstractEntityPtr e);
-    IfcStructuralSurfaceReaction (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcStructuralLoad* v8_AppliedLoad, IfcGlobalOrLocalEnum::IfcGlobalOrLocalEnum v9_GlobalOrLocal, IfcStructuralSurfaceActivityTypeEnum::IfcStructuralSurfaceActivityTypeEnum v10_PredefinedType);
-    typedef IfcStructuralSurfaceReaction* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcStructuralSurfaceReaction > > list;
-    typedef IfcTemplatedEntityList< IfcStructuralSurfaceReaction >::it it;
+    IfcStructuralSurfaceReaction (IfcAbstractEntity* e);
+    IfcStructuralSurfaceReaction (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcStructuralLoad* v8_AppliedLoad, IfcGlobalOrLocalEnum::IfcGlobalOrLocalEnum v9_GlobalOrLocal, IfcStructuralSurfaceActivityTypeEnum::IfcStructuralSurfaceActivityTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcStructuralSurfaceReaction > list;
 };
 /// The resource type IfcSubContractResourceType defines commonly shared information for occurrences of subcontract resources. The set of shared information may include:
 /// 
@@ -26696,20 +27546,19 @@ class IfcStructuralSurfaceReaction : public IfcStructuralReaction {
 class IfcSubContractResourceType : public IfcConstructionResourceType {
 public:
     /// Defines types of subcontract resources.
-    IfcSubContractResourceTypeEnum::IfcSubContractResourceTypeEnum PredefinedType();
+    IfcSubContractResourceTypeEnum::IfcSubContractResourceTypeEnum PredefinedType() const;
     void setPredefinedType(IfcSubContractResourceTypeEnum::IfcSubContractResourceTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 12; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 11: return IfcUtil::Argument_ENUMERATION; } return IfcConstructionResourceType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 11: return Type::IfcSubContractResourceTypeEnum; } return IfcConstructionResourceType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 11: return "PredefinedType"; } return IfcConstructionResourceType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcSubContractResourceType (IfcAbstractEntityPtr e);
-    IfcSubContractResourceType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< IfcIdentifier > v7_Identification, boost::optional< IfcText > v8_LongDescription, boost::optional< IfcLabel > v9_ResourceType, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcAppliedValue > > > v10_BaseCosts, IfcPhysicalQuantity* v11_BaseQuantity, IfcSubContractResourceTypeEnum::IfcSubContractResourceTypeEnum v12_PredefinedType);
-    typedef IfcSubContractResourceType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcSubContractResourceType > > list;
-    typedef IfcTemplatedEntityList< IfcSubContractResourceType >::it it;
+    IfcSubContractResourceType (IfcAbstractEntity* e);
+    IfcSubContractResourceType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< std::string > v7_Identification, boost::optional< std::string > v8_LongDescription, boost::optional< std::string > v9_ResourceType, boost::optional< IfcTemplatedEntityList< IfcAppliedValue >::ptr > v10_BaseCosts, IfcPhysicalQuantity* v11_BaseQuantity, IfcSubContractResourceTypeEnum::IfcSubContractResourceTypeEnum v12_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcSubContractResourceType > list;
 };
 /// The IfcSurfaceCurveSweptAreaSolid is the result of
 /// sweeping an area along a directrix that lies on a reference
@@ -26776,37 +27625,36 @@ class IfcSubContractResourceType : public IfcConstructionResourceType {
 class IfcSurfaceCurveSweptAreaSolid : public IfcSweptAreaSolid {
 public:
     /// The curve used to define the sweeping operation. The solid is generated by sweeping the SELF\IfcSweptAreaSolid.SweptArea along the Directrix.
-    IfcCurve* Directrix();
+    IfcCurve* Directrix() const;
     void setDirectrix(IfcCurve* v);
     /// Whether the optional attribute StartParam is defined for this IfcSurfaceCurveSweptAreaSolid
-    bool hasStartParam();
+    bool hasStartParam() const;
     /// The parameter value on the Directrix at which the sweeping operation commences. If no value is provided the start of the sweeping operation is at the start of the Directrix..
     /// 
     /// IFC2x4 CHANGE  The attribute has been changed to OPTIONAL with upward compatibility for file-based exchange.
-    IfcParameterValue StartParam();
-    void setStartParam(IfcParameterValue v);
+    double StartParam() const;
+    void setStartParam(double v);
     /// Whether the optional attribute EndParam is defined for this IfcSurfaceCurveSweptAreaSolid
-    bool hasEndParam();
+    bool hasEndParam() const;
     /// The parameter value on the Directrix at which the sweeping operation ends. If no value is provided the end of the sweeping operation is at the end of the Directrix..
     /// 
     /// IFC2x4 CHANGE  The attribute has been changed to OPTIONAL with upward compatibility for file-based exchange.
-    IfcParameterValue EndParam();
-    void setEndParam(IfcParameterValue v);
+    double EndParam() const;
+    void setEndParam(double v);
     /// The surface containing the Directrix.
-    IfcSurface* ReferenceSurface();
+    IfcSurface* ReferenceSurface() const;
     void setReferenceSurface(IfcSurface* v);
     virtual unsigned int getArgumentCount() const { return 6; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 2: return IfcUtil::Argument_ENTITY; case 3: return IfcUtil::Argument_DOUBLE; case 4: return IfcUtil::Argument_DOUBLE; case 5: return IfcUtil::Argument_ENTITY; } return IfcSweptAreaSolid::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 2: return Type::IfcCurve; case 3: return Type::IfcParameterValue; case 4: return Type::IfcParameterValue; case 5: return Type::IfcSurface; } return IfcSweptAreaSolid::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 2: return "Directrix"; case 3: return "StartParam"; case 4: return "EndParam"; case 5: return "ReferenceSurface"; } return IfcSweptAreaSolid::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcSurfaceCurveSweptAreaSolid (IfcAbstractEntityPtr e);
-    IfcSurfaceCurveSweptAreaSolid (IfcProfileDef* v1_SweptArea, IfcAxis2Placement3D* v2_Position, IfcCurve* v3_Directrix, boost::optional< IfcParameterValue > v4_StartParam, boost::optional< IfcParameterValue > v5_EndParam, IfcSurface* v6_ReferenceSurface);
-    typedef IfcSurfaceCurveSweptAreaSolid* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcSurfaceCurveSweptAreaSolid > > list;
-    typedef IfcTemplatedEntityList< IfcSurfaceCurveSweptAreaSolid >::it it;
+    IfcSurfaceCurveSweptAreaSolid (IfcAbstractEntity* e);
+    IfcSurfaceCurveSweptAreaSolid (IfcProfileDef* v1_SweptArea, IfcAxis2Placement3D* v2_Position, IfcCurve* v3_Directrix, boost::optional< double > v4_StartParam, boost::optional< double > v5_EndParam, IfcSurface* v6_ReferenceSurface);
+    typedef IfcTemplatedEntityList< IfcSurfaceCurveSweptAreaSolid > list;
 };
 /// Definition from ISO/CD 10303-42:1992: This surface is a simple swept surface or a generalized cylinder obtained by sweeping a curve in a given direction. The parameterization is as follows where the curve has a parameterization l(u): 
 /// 
@@ -26824,23 +27672,22 @@ class IfcSurfaceCurveSweptAreaSolid : public IfcSweptAreaSolid {
 class IfcSurfaceOfLinearExtrusion : public IfcSweptSurface {
 public:
     /// The direction of the extrusion.
-    IfcDirection* ExtrudedDirection();
+    IfcDirection* ExtrudedDirection() const;
     void setExtrudedDirection(IfcDirection* v);
     /// The depth of the extrusion, it determines the parameterization.
-    IfcLengthMeasure Depth();
-    void setDepth(IfcLengthMeasure v);
+    double Depth() const;
+    void setDepth(double v);
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 2: return IfcUtil::Argument_ENTITY; case 3: return IfcUtil::Argument_DOUBLE; } return IfcSweptSurface::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 2: return Type::IfcDirection; case 3: return Type::IfcLengthMeasure; } return IfcSweptSurface::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 2: return "ExtrudedDirection"; case 3: return "Depth"; } return IfcSweptSurface::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcSurfaceOfLinearExtrusion (IfcAbstractEntityPtr e);
-    IfcSurfaceOfLinearExtrusion (IfcProfileDef* v1_SweptCurve, IfcAxis2Placement3D* v2_Position, IfcDirection* v3_ExtrudedDirection, IfcLengthMeasure v4_Depth);
-    typedef IfcSurfaceOfLinearExtrusion* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcSurfaceOfLinearExtrusion > > list;
-    typedef IfcTemplatedEntityList< IfcSurfaceOfLinearExtrusion >::it it;
+    IfcSurfaceOfLinearExtrusion (IfcAbstractEntity* e);
+    IfcSurfaceOfLinearExtrusion (IfcProfileDef* v1_SweptCurve, IfcAxis2Placement3D* v2_Position, IfcDirection* v3_ExtrudedDirection, double v4_Depth);
+    typedef IfcTemplatedEntityList< IfcSurfaceOfLinearExtrusion > list;
 };
 /// Definition from ISO/CD 10303-42:1992: A surface of revolution (IfcSurfaceOfRevolution) is the surface obtained by rotating a curve one complete revolution about an axis. The data shall be interpreted as below. 
 /// 
@@ -26862,20 +27709,19 @@ class IfcSurfaceOfLinearExtrusion : public IfcSweptSurface {
 class IfcSurfaceOfRevolution : public IfcSweptSurface {
 public:
     /// A point on the axis of revolution and the direction of the axis of revolution.
-    IfcAxis1Placement* AxisPosition();
+    IfcAxis1Placement* AxisPosition() const;
     void setAxisPosition(IfcAxis1Placement* v);
     virtual unsigned int getArgumentCount() const { return 3; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 2: return IfcUtil::Argument_ENTITY; } return IfcSweptSurface::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 2: return Type::IfcAxis1Placement; } return IfcSweptSurface::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 2: return "AxisPosition"; } return IfcSweptSurface::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcSurfaceOfRevolution (IfcAbstractEntityPtr e);
+    IfcSurfaceOfRevolution (IfcAbstractEntity* e);
     IfcSurfaceOfRevolution (IfcProfileDef* v1_SweptCurve, IfcAxis2Placement3D* v2_Position, IfcAxis1Placement* v3_AxisPosition);
-    typedef IfcSurfaceOfRevolution* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcSurfaceOfRevolution > > list;
-    typedef IfcTemplatedEntityList< IfcSurfaceOfRevolution >::it it;
+    typedef IfcTemplatedEntityList< IfcSurfaceOfRevolution > list;
 };
 /// The furnishing element type IfcSystemFurnitureElementType defines commonly shared information for occurrences of furniture elements.  The set of shared information may include: 
 /// 
@@ -26910,21 +27756,20 @@ class IfcSurfaceOfRevolution : public IfcSweptSurface {
 class IfcSystemFurnitureElementType : public IfcFurnishingElementType {
 public:
     /// Whether the optional attribute PredefinedType is defined for this IfcSystemFurnitureElementType
-    bool hasPredefinedType();
-    IfcSystemFurnitureElementTypeEnum::IfcSystemFurnitureElementTypeEnum PredefinedType();
+    bool hasPredefinedType() const;
+    IfcSystemFurnitureElementTypeEnum::IfcSystemFurnitureElementTypeEnum PredefinedType() const;
     void setPredefinedType(IfcSystemFurnitureElementTypeEnum::IfcSystemFurnitureElementTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcFurnishingElementType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcSystemFurnitureElementTypeEnum; } return IfcFurnishingElementType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcFurnishingElementType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcSystemFurnitureElementType (IfcAbstractEntityPtr e);
-    IfcSystemFurnitureElementType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, boost::optional< IfcSystemFurnitureElementTypeEnum::IfcSystemFurnitureElementTypeEnum > v10_PredefinedType);
-    typedef IfcSystemFurnitureElementType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcSystemFurnitureElementType > > list;
-    typedef IfcTemplatedEntityList< IfcSystemFurnitureElementType >::it it;
+    IfcSystemFurnitureElementType (IfcAbstractEntity* e);
+    IfcSystemFurnitureElementType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, boost::optional< IfcSystemFurnitureElementTypeEnum::IfcSystemFurnitureElementTypeEnum > v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcSystemFurnitureElementType > list;
 };
 /// An IfcTask is an identifiable unit of work to be
 ///   carried out in a construction project.
@@ -27174,24 +28019,24 @@ class IfcSystemFurnitureElementType : public IfcFurnishingElementType {
 class IfcTask : public IfcProcess {
 public:
     /// Whether the optional attribute Status is defined for this IfcTask
-    bool hasStatus();
+    bool hasStatus() const;
     /// Current status of the task.
     /// 
     /// NOTE: Particular values for status are not
     ///   specified, these should be determined and agreed by local
     ///   usage. Examples of possible status values include 'Not Yet
     ///   Started', 'Started', 'Completed'.
-    IfcLabel Status();
-    void setStatus(IfcLabel v);
+    std::string Status() const;
+    void setStatus(std::string v);
     /// Whether the optional attribute WorkMethod is defined for this IfcTask
-    bool hasWorkMethod();
+    bool hasWorkMethod() const;
     /// The method of work used in carrying out a task.
     /// 
     /// NOTE: This attribute should
     ///   not be used if the work method is specified for the
     ///   IfcTaskType
-    IfcLabel WorkMethod();
-    void setWorkMethod(IfcLabel v);
+    std::string WorkMethod() const;
+    void setWorkMethod(std::string v);
     /// Identifies whether a task is a milestone task (=TRUE) or not
     ///   (= FALSE).
     /// 
@@ -27199,41 +28044,40 @@ class IfcTask : public IfcProcess {
     ///   a milestone task may be understood to be a task having no
     ///   duration. As such, it represents a singular point in
     ///   time.
-    bool IsMilestone();
+    bool IsMilestone() const;
     void setIsMilestone(bool v);
     /// Whether the optional attribute Priority is defined for this IfcTask
-    bool hasPriority();
+    bool hasPriority() const;
     /// A value that indicates the relative priority of the task (in
     ///   comparison to the priorities of other tasks).
-    int Priority();
+    int Priority() const;
     void setPriority(int v);
     /// Whether the optional attribute TaskTime is defined for this IfcTask
-    bool hasTaskTime();
+    bool hasTaskTime() const;
     /// Time related information for the task.
     /// 
     /// Added in IFC 2x4
-    IfcTaskTime* TaskTime();
+    IfcTaskTime* TaskTime() const;
     void setTaskTime(IfcTaskTime* v);
     /// Whether the optional attribute PredefinedType is defined for this IfcTask
-    bool hasPredefinedType();
+    bool hasPredefinedType() const;
     /// Identifies the predefined types of a task from which 
     ///   the type required may be set.
     /// 
     /// Added in IFC 2x4
-    IfcTaskTypeEnum::IfcTaskTypeEnum PredefinedType();
+    IfcTaskTypeEnum::IfcTaskTypeEnum PredefinedType() const;
     void setPredefinedType(IfcTaskTypeEnum::IfcTaskTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 13; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 7: return IfcUtil::Argument_STRING; case 8: return IfcUtil::Argument_STRING; case 9: return IfcUtil::Argument_BOOL; case 10: return IfcUtil::Argument_INT; case 11: return IfcUtil::Argument_ENTITY; case 12: return IfcUtil::Argument_ENUMERATION; } return IfcProcess::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 7: return Type::IfcLabel; case 8: return Type::IfcLabel; case 9: return Type::UNDEFINED; case 10: return Type::UNDEFINED; case 11: return Type::IfcTaskTime; case 12: return Type::IfcTaskTypeEnum; } return IfcProcess::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 7: return "Status"; case 8: return "WorkMethod"; case 9: return "IsMilestone"; case 10: return "Priority"; case 11: return "TaskTime"; case 12: return "PredefinedType"; } return IfcProcess::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcTask (IfcAbstractEntityPtr e);
-    IfcTask (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, boost::optional< IfcIdentifier > v6_Identification, boost::optional< IfcText > v7_LongDescription, boost::optional< IfcLabel > v8_Status, boost::optional< IfcLabel > v9_WorkMethod, bool v10_IsMilestone, boost::optional< int > v11_Priority, IfcTaskTime* v12_TaskTime, boost::optional< IfcTaskTypeEnum::IfcTaskTypeEnum > v13_PredefinedType);
-    typedef IfcTask* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcTask > > list;
-    typedef IfcTemplatedEntityList< IfcTask >::it it;
+    IfcTask (IfcAbstractEntity* e);
+    IfcTask (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, boost::optional< std::string > v6_Identification, boost::optional< std::string > v7_LongDescription, boost::optional< std::string > v8_Status, boost::optional< std::string > v9_WorkMethod, bool v10_IsMilestone, boost::optional< int > v11_Priority, IfcTaskTime* v12_TaskTime, boost::optional< IfcTaskTypeEnum::IfcTaskTypeEnum > v13_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcTask > list;
 };
 /// An IfcTaskType defines a
 ///   particular type of task that may be specified for use
@@ -27279,51 +28123,49 @@ class IfcTaskType : public IfcTypeProcess {
 public:
     /// Identifies the predefined types of a task type from which 
     ///   the type required may be set.
-    IfcTaskTypeEnum::IfcTaskTypeEnum PredefinedType();
+    IfcTaskTypeEnum::IfcTaskTypeEnum PredefinedType() const;
     void setPredefinedType(IfcTaskTypeEnum::IfcTaskTypeEnum v);
     /// Whether the optional attribute WorkMethod is defined for this IfcTaskType
-    bool hasWorkMethod();
+    bool hasWorkMethod() const;
     /// The method of work used in carrying out a task.
-    IfcLabel WorkMethod();
-    void setWorkMethod(IfcLabel v);
+    std::string WorkMethod() const;
+    void setWorkMethod(std::string v);
     virtual unsigned int getArgumentCount() const { return 11; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; case 10: return IfcUtil::Argument_STRING; } return IfcTypeProcess::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcTaskTypeEnum; case 10: return Type::IfcLabel; } return IfcTypeProcess::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; case 10: return "WorkMethod"; } return IfcTypeProcess::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcTaskType (IfcAbstractEntityPtr e);
-    IfcTaskType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< IfcIdentifier > v7_Identification, boost::optional< IfcText > v8_LongDescription, boost::optional< IfcLabel > v9_ProcessType, IfcTaskTypeEnum::IfcTaskTypeEnum v10_PredefinedType, boost::optional< IfcLabel > v11_WorkMethod);
-    typedef IfcTaskType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcTaskType > > list;
-    typedef IfcTemplatedEntityList< IfcTaskType >::it it;
+    IfcTaskType (IfcAbstractEntity* e);
+    IfcTaskType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< std::string > v7_Identification, boost::optional< std::string > v8_LongDescription, boost::optional< std::string > v9_ProcessType, IfcTaskTypeEnum::IfcTaskTypeEnum v10_PredefinedType, boost::optional< std::string > v11_WorkMethod);
+    typedef IfcTemplatedEntityList< IfcTaskType > list;
 };
 
 class IfcTessellatedFaceSet : public IfcTessellatedItem {
 public:
-    IfcCartesianPointList3D* Coordinates();
+    IfcCartesianPointList3D* Coordinates() const;
     void setCoordinates(IfcCartesianPointList3D* v);
     /// Whether the optional attribute Normals is defined for this IfcTessellatedFaceSet
-    bool hasNormals();
+    bool hasNormals() const;
     /// Whether the optional attribute Closed is defined for this IfcTessellatedFaceSet
-    bool hasClosed();
-    bool Closed();
+    bool hasClosed() const;
+    bool Closed() const;
     void setClosed(bool v);
     virtual unsigned int getArgumentCount() const { return 3; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY; case 1: return IfcUtil::Argument_UNKNOWN; case 2: return IfcUtil::Argument_BOOL; } return IfcTessellatedItem::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcCartesianPointList3D; case 1: return Type::IfcParameterValue; case 2: return Type::UNDEFINED; } return IfcTessellatedItem::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Coordinates"; case 1: return "Normals"; case 2: return "Closed"; } return IfcTessellatedItem::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcIndexedColourMap > > HasColours(); // INVERSE IfcIndexedColourMap::MappedTo
-    SHARED_PTR< IfcTemplatedEntityList< IfcIndexedTextureMap > > HasTextures(); // INVERSE IfcIndexedTextureMap::MappedTo
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcIndexedColourMap >::ptr HasColours() const; // INVERSE IfcIndexedColourMap::MappedTo
+    IfcTemplatedEntityList< IfcIndexedTextureMap >::ptr HasTextures() const; // INVERSE IfcIndexedTextureMap::MappedTo
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcTessellatedFaceSet (IfcAbstractEntityPtr e);
+    IfcTessellatedFaceSet (IfcAbstractEntity* e);
     IfcTessellatedFaceSet (IfcCartesianPointList3D* v1_Coordinates, boost::optional< bool > v3_Closed);
-    typedef IfcTessellatedFaceSet* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcTessellatedFaceSet > > list;
-    typedef IfcTemplatedEntityList< IfcTessellatedFaceSet >::it it;
+    typedef IfcTemplatedEntityList< IfcTessellatedFaceSet > list;
 };
 /// Definition from IAI: The element type
 /// IfcTransportElementType defines commonly shared
@@ -27391,38 +28233,36 @@ class IfcTessellatedFaceSet : public IfcTessellatedItem {
 class IfcTransportElementType : public IfcElementType {
 public:
     /// Predefined types to define the particular type of the transport element. There may be property set definitions available for each predefined type.
-    IfcTransportElementTypeEnum::IfcTransportElementTypeEnum PredefinedType();
+    IfcTransportElementTypeEnum::IfcTransportElementTypeEnum PredefinedType() const;
     void setPredefinedType(IfcTransportElementTypeEnum::IfcTransportElementTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcElementType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcTransportElementTypeEnum; } return IfcElementType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcElementType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcTransportElementType (IfcAbstractEntityPtr e);
-    IfcTransportElementType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcTransportElementTypeEnum::IfcTransportElementTypeEnum v10_PredefinedType);
-    typedef IfcTransportElementType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcTransportElementType > > list;
-    typedef IfcTemplatedEntityList< IfcTransportElementType >::it it;
+    IfcTransportElementType (IfcAbstractEntity* e);
+    IfcTransportElementType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcTransportElementTypeEnum::IfcTransportElementTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcTransportElementType > list;
 };
 
 class IfcTriangulatedFaceSet : public IfcTessellatedFaceSet {
 public:
     /// Whether the optional attribute NormalIndex is defined for this IfcTriangulatedFaceSet
-    bool hasNormalIndex();
+    bool hasNormalIndex() const;
     virtual unsigned int getArgumentCount() const { return 5; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 3: return IfcUtil::Argument_UNKNOWN; case 4: return IfcUtil::Argument_UNKNOWN; } return IfcTessellatedFaceSet::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 3: return Type::UNDEFINED; case 4: return Type::UNDEFINED; } return IfcTessellatedFaceSet::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 3: return "CoordIndex"; case 4: return "NormalIndex"; } return IfcTessellatedFaceSet::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcTriangulatedFaceSet (IfcAbstractEntityPtr e);
+    IfcTriangulatedFaceSet (IfcAbstractEntity* e);
     IfcTriangulatedFaceSet (IfcCartesianPointList3D* v1_Coordinates, boost::optional< bool > v3_Closed);
-    typedef IfcTriangulatedFaceSet* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcTriangulatedFaceSet > > list;
-    typedef IfcTemplatedEntityList< IfcTriangulatedFaceSet >::it it;
+    typedef IfcTemplatedEntityList< IfcTriangulatedFaceSet > list;
 };
 /// The window lining is the outer
 /// frame which enables the window to be fixed in position. The
@@ -27525,85 +28365,84 @@ class IfcTriangulatedFaceSet : public IfcTessellatedFaceSet {
 class IfcWindowLiningProperties : public IfcPreDefinedPropertySet {
 public:
     /// Whether the optional attribute LiningDepth is defined for this IfcWindowLiningProperties
-    bool hasLiningDepth();
+    bool hasLiningDepth() const;
     /// Depth of the window lining (dimension measured perpendicular to window elevation plane).
-    IfcPositiveLengthMeasure LiningDepth();
-    void setLiningDepth(IfcPositiveLengthMeasure v);
+    double LiningDepth() const;
+    void setLiningDepth(double v);
     /// Whether the optional attribute LiningThickness is defined for this IfcWindowLiningProperties
-    bool hasLiningThickness();
+    bool hasLiningThickness() const;
     /// Thickness of the window lining (measured parallel to the window elevation plane).
-    IfcNonNegativeLengthMeasure LiningThickness();
-    void setLiningThickness(IfcNonNegativeLengthMeasure v);
+    double LiningThickness() const;
+    void setLiningThickness(double v);
     /// Whether the optional attribute TransomThickness is defined for this IfcWindowLiningProperties
-    bool hasTransomThickness();
+    bool hasTransomThickness() const;
     /// Thickness of the transom (horizontal separator of window panels within a window), measured parallel to the window elevation plane. The transom is part of the lining and the transom depth is assumed to be identical to the lining depth.
-    IfcNonNegativeLengthMeasure TransomThickness();
-    void setTransomThickness(IfcNonNegativeLengthMeasure v);
+    double TransomThickness() const;
+    void setTransomThickness(double v);
     /// Whether the optional attribute MullionThickness is defined for this IfcWindowLiningProperties
-    bool hasMullionThickness();
+    bool hasMullionThickness() const;
     /// Thickness of the mullion (vertical separator of window panels within a window), measured parallel to the window elevation plane. The mullion is part of the lining and the mullion depth is assumed to be identical to the lining depth.
-    IfcNonNegativeLengthMeasure MullionThickness();
-    void setMullionThickness(IfcNonNegativeLengthMeasure v);
+    double MullionThickness() const;
+    void setMullionThickness(double v);
     /// Whether the optional attribute FirstTransomOffset is defined for this IfcWindowLiningProperties
-    bool hasFirstTransomOffset();
+    bool hasFirstTransomOffset() const;
     /// Offset of the transom centerline, measured along the z-axis of the window placement co-ordinate system. An offset value = 0.5 indicates that the transom is positioned in the middle of the window.
-    IfcNormalisedRatioMeasure FirstTransomOffset();
-    void setFirstTransomOffset(IfcNormalisedRatioMeasure v);
+    double FirstTransomOffset() const;
+    void setFirstTransomOffset(double v);
     /// Whether the optional attribute SecondTransomOffset is defined for this IfcWindowLiningProperties
-    bool hasSecondTransomOffset();
+    bool hasSecondTransomOffset() const;
     /// Offset of the transom centerline for the second transom, measured along the x-axis of the window placement co-ordinate system. An offset value = 0.666 indicates that the second transom is positioned at two/third of the window.
-    IfcNormalisedRatioMeasure SecondTransomOffset();
-    void setSecondTransomOffset(IfcNormalisedRatioMeasure v);
+    double SecondTransomOffset() const;
+    void setSecondTransomOffset(double v);
     /// Whether the optional attribute FirstMullionOffset is defined for this IfcWindowLiningProperties
-    bool hasFirstMullionOffset();
+    bool hasFirstMullionOffset() const;
     /// Offset of the mullion centerline, measured along the x-axis of the window placement co-ordinate system. An offset value = 0.5 indicates that the mullion is positioned in the middle of the window.
-    IfcNormalisedRatioMeasure FirstMullionOffset();
-    void setFirstMullionOffset(IfcNormalisedRatioMeasure v);
+    double FirstMullionOffset() const;
+    void setFirstMullionOffset(double v);
     /// Whether the optional attribute SecondMullionOffset is defined for this IfcWindowLiningProperties
-    bool hasSecondMullionOffset();
+    bool hasSecondMullionOffset() const;
     /// Offset of the mullion centerline for the second mullion, measured along the x-axis of the window placement co-ordinate system. An offset value = 0.666 indicates that the second mullion is positioned at two/third of the window.
-    IfcNormalisedRatioMeasure SecondMullionOffset();
-    void setSecondMullionOffset(IfcNormalisedRatioMeasure v);
+    double SecondMullionOffset() const;
+    void setSecondMullionOffset(double v);
     /// Whether the optional attribute ShapeAspectStyle is defined for this IfcWindowLiningProperties
-    bool hasShapeAspectStyle();
+    bool hasShapeAspectStyle() const;
     /// Optional link to a shape aspect definition, which points to the part of the geometric representation of the window style, which is used to represent the lining.
     /// 
     /// IFC2x4 CHANGE The attribute is deprecated and shall no longer be used, i.e. the value shall be NIL ($).
-    IfcShapeAspect* ShapeAspectStyle();
+    IfcShapeAspect* ShapeAspectStyle() const;
     void setShapeAspectStyle(IfcShapeAspect* v);
     /// Whether the optional attribute LiningOffset is defined for this IfcWindowLiningProperties
-    bool hasLiningOffset();
+    bool hasLiningOffset() const;
     /// Offset of the window lining. The offset is given as distance along the y axis of the local placement (perpendicular to the window plane).
     /// 
     /// IFC2x4 CHANGE: New attribute added at the end of the entity definition.
-    IfcLengthMeasure LiningOffset();
-    void setLiningOffset(IfcLengthMeasure v);
+    double LiningOffset() const;
+    void setLiningOffset(double v);
     /// Whether the optional attribute LiningToPanelOffsetX is defined for this IfcWindowLiningProperties
-    bool hasLiningToPanelOffsetX();
+    bool hasLiningToPanelOffsetX() const;
     /// Offset between the lining and the window panel measured along the x-axis of the local placement. Should be smaller or equal to the LiningThickness.
     /// 
     /// IFC2x4 CHANGE: New attribute added at the end of the entity definition.
-    IfcLengthMeasure LiningToPanelOffsetX();
-    void setLiningToPanelOffsetX(IfcLengthMeasure v);
+    double LiningToPanelOffsetX() const;
+    void setLiningToPanelOffsetX(double v);
     /// Whether the optional attribute LiningToPanelOffsetY is defined for this IfcWindowLiningProperties
-    bool hasLiningToPanelOffsetY();
+    bool hasLiningToPanelOffsetY() const;
     /// Offset between the lining and the window panel measured along the y-axis of the local placement. Should be smaller or equal to the IfcWindowPanelProperties.PanelThickness.
     /// 
     /// IFC2x4 CHANGE: New attribute added at the end of the entity definition.
-    IfcLengthMeasure LiningToPanelOffsetY();
-    void setLiningToPanelOffsetY(IfcLengthMeasure v);
+    double LiningToPanelOffsetY() const;
+    void setLiningToPanelOffsetY(double v);
     virtual unsigned int getArgumentCount() const { return 16; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 4: return IfcUtil::Argument_DOUBLE; case 5: return IfcUtil::Argument_DOUBLE; case 6: return IfcUtil::Argument_DOUBLE; case 7: return IfcUtil::Argument_DOUBLE; case 8: return IfcUtil::Argument_DOUBLE; case 9: return IfcUtil::Argument_DOUBLE; case 10: return IfcUtil::Argument_DOUBLE; case 11: return IfcUtil::Argument_DOUBLE; case 12: return IfcUtil::Argument_ENTITY; case 13: return IfcUtil::Argument_DOUBLE; case 14: return IfcUtil::Argument_DOUBLE; case 15: return IfcUtil::Argument_DOUBLE; } return IfcPreDefinedPropertySet::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 4: return Type::IfcPositiveLengthMeasure; case 5: return Type::IfcNonNegativeLengthMeasure; case 6: return Type::IfcNonNegativeLengthMeasure; case 7: return Type::IfcNonNegativeLengthMeasure; case 8: return Type::IfcNormalisedRatioMeasure; case 9: return Type::IfcNormalisedRatioMeasure; case 10: return Type::IfcNormalisedRatioMeasure; case 11: return Type::IfcNormalisedRatioMeasure; case 12: return Type::IfcShapeAspect; case 13: return Type::IfcLengthMeasure; case 14: return Type::IfcLengthMeasure; case 15: return Type::IfcLengthMeasure; } return IfcPreDefinedPropertySet::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 4: return "LiningDepth"; case 5: return "LiningThickness"; case 6: return "TransomThickness"; case 7: return "MullionThickness"; case 8: return "FirstTransomOffset"; case 9: return "SecondTransomOffset"; case 10: return "FirstMullionOffset"; case 11: return "SecondMullionOffset"; case 12: return "ShapeAspectStyle"; case 13: return "LiningOffset"; case 14: return "LiningToPanelOffsetX"; case 15: return "LiningToPanelOffsetY"; } return IfcPreDefinedPropertySet::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcWindowLiningProperties (IfcAbstractEntityPtr e);
-    IfcWindowLiningProperties (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcPositiveLengthMeasure > v5_LiningDepth, boost::optional< IfcNonNegativeLengthMeasure > v6_LiningThickness, boost::optional< IfcNonNegativeLengthMeasure > v7_TransomThickness, boost::optional< IfcNonNegativeLengthMeasure > v8_MullionThickness, boost::optional< IfcNormalisedRatioMeasure > v9_FirstTransomOffset, boost::optional< IfcNormalisedRatioMeasure > v10_SecondTransomOffset, boost::optional< IfcNormalisedRatioMeasure > v11_FirstMullionOffset, boost::optional< IfcNormalisedRatioMeasure > v12_SecondMullionOffset, IfcShapeAspect* v13_ShapeAspectStyle, boost::optional< IfcLengthMeasure > v14_LiningOffset, boost::optional< IfcLengthMeasure > v15_LiningToPanelOffsetX, boost::optional< IfcLengthMeasure > v16_LiningToPanelOffsetY);
-    typedef IfcWindowLiningProperties* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcWindowLiningProperties > > list;
-    typedef IfcTemplatedEntityList< IfcWindowLiningProperties >::it it;
+    IfcWindowLiningProperties (IfcAbstractEntity* e);
+    IfcWindowLiningProperties (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< double > v5_LiningDepth, boost::optional< double > v6_LiningThickness, boost::optional< double > v7_TransomThickness, boost::optional< double > v8_MullionThickness, boost::optional< double > v9_FirstTransomOffset, boost::optional< double > v10_SecondTransomOffset, boost::optional< double > v11_FirstMullionOffset, boost::optional< double > v12_SecondMullionOffset, IfcShapeAspect* v13_ShapeAspectStyle, boost::optional< double > v14_LiningOffset, boost::optional< double > v15_LiningToPanelOffsetX, boost::optional< double > v16_LiningToPanelOffsetY);
+    typedef IfcTemplatedEntityList< IfcWindowLiningProperties > list;
 };
 /// A window panel is a casement, that is, a component, fixed or opening,
 /// consisting essentially of a frame and the infilling. The
@@ -27653,40 +28492,39 @@ class IfcWindowLiningProperties : public IfcPreDefinedPropertySet {
 class IfcWindowPanelProperties : public IfcPreDefinedPropertySet {
 public:
     /// Types of window panel operations. Also used to assign standard symbolic presentations according to national building standards.
-    IfcWindowPanelOperationEnum::IfcWindowPanelOperationEnum OperationType();
+    IfcWindowPanelOperationEnum::IfcWindowPanelOperationEnum OperationType() const;
     void setOperationType(IfcWindowPanelOperationEnum::IfcWindowPanelOperationEnum v);
     /// Position of this panel within the overall window style.
-    IfcWindowPanelPositionEnum::IfcWindowPanelPositionEnum PanelPosition();
+    IfcWindowPanelPositionEnum::IfcWindowPanelPositionEnum PanelPosition() const;
     void setPanelPosition(IfcWindowPanelPositionEnum::IfcWindowPanelPositionEnum v);
     /// Whether the optional attribute FrameDepth is defined for this IfcWindowPanelProperties
-    bool hasFrameDepth();
+    bool hasFrameDepth() const;
     /// Depth of panel frame, measured from front face to back face horizontally (i.e. perpendicular to the window (elevation) plane.
-    IfcPositiveLengthMeasure FrameDepth();
-    void setFrameDepth(IfcPositiveLengthMeasure v);
+    double FrameDepth() const;
+    void setFrameDepth(double v);
     /// Whether the optional attribute FrameThickness is defined for this IfcWindowPanelProperties
-    bool hasFrameThickness();
+    bool hasFrameThickness() const;
     /// Width of panel frame, measured from inside of panel (at glazing) to outside of panel (at lining), i.e. parallel to the window (elevation) plane.
-    IfcPositiveLengthMeasure FrameThickness();
-    void setFrameThickness(IfcPositiveLengthMeasure v);
+    double FrameThickness() const;
+    void setFrameThickness(double v);
     /// Whether the optional attribute ShapeAspectStyle is defined for this IfcWindowPanelProperties
-    bool hasShapeAspectStyle();
+    bool hasShapeAspectStyle() const;
     /// Optional link to a shape aspect definition, which points to the part of the geometric representation of the window style, which is used to represent the panel.
     /// 
     /// IFC2x4 CHANGE The attribute is deprecated and shall no longer be used, i.e. the value shall be NIL ($).
-    IfcShapeAspect* ShapeAspectStyle();
+    IfcShapeAspect* ShapeAspectStyle() const;
     void setShapeAspectStyle(IfcShapeAspect* v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 4: return IfcUtil::Argument_ENUMERATION; case 5: return IfcUtil::Argument_ENUMERATION; case 6: return IfcUtil::Argument_DOUBLE; case 7: return IfcUtil::Argument_DOUBLE; case 8: return IfcUtil::Argument_ENTITY; } return IfcPreDefinedPropertySet::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 4: return Type::IfcWindowPanelOperationEnum; case 5: return Type::IfcWindowPanelPositionEnum; case 6: return Type::IfcPositiveLengthMeasure; case 7: return Type::IfcPositiveLengthMeasure; case 8: return Type::IfcShapeAspect; } return IfcPreDefinedPropertySet::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 4: return "OperationType"; case 5: return "PanelPosition"; case 6: return "FrameDepth"; case 7: return "FrameThickness"; case 8: return "ShapeAspectStyle"; } return IfcPreDefinedPropertySet::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcWindowPanelProperties (IfcAbstractEntityPtr e);
-    IfcWindowPanelProperties (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, IfcWindowPanelOperationEnum::IfcWindowPanelOperationEnum v5_OperationType, IfcWindowPanelPositionEnum::IfcWindowPanelPositionEnum v6_PanelPosition, boost::optional< IfcPositiveLengthMeasure > v7_FrameDepth, boost::optional< IfcPositiveLengthMeasure > v8_FrameThickness, IfcShapeAspect* v9_ShapeAspectStyle);
-    typedef IfcWindowPanelProperties* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcWindowPanelProperties > > list;
-    typedef IfcTemplatedEntityList< IfcWindowPanelProperties >::it it;
+    IfcWindowPanelProperties (IfcAbstractEntity* e);
+    IfcWindowPanelProperties (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcWindowPanelOperationEnum::IfcWindowPanelOperationEnum v5_OperationType, IfcWindowPanelPositionEnum::IfcWindowPanelPositionEnum v6_PanelPosition, boost::optional< double > v7_FrameDepth, boost::optional< double > v8_FrameThickness, IfcShapeAspect* v9_ShapeAspectStyle);
+    typedef IfcTemplatedEntityList< IfcWindowPanelProperties > list;
 };
 /// The IfcActor defines all actors or human agents involved in a project during its full life cycle. It facilitates the use of person and organization definitions in the resource part of the IFC object model. This includes name, address, telecommunication addresses, and roles.
 /// 
@@ -27706,21 +28544,20 @@ class IfcWindowPanelProperties : public IfcPreDefinedPropertySet {
 class IfcActor : public IfcObject {
 public:
     /// Information about the actor.
-    IfcActorSelect TheActor();
-    void setTheActor(IfcActorSelect v);
+    IfcActorSelect* TheActor() const;
+    void setTheActor(IfcActorSelect* v);
     virtual unsigned int getArgumentCount() const { return 6; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 5: return IfcUtil::Argument_ENTITY; } return IfcObject::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 5: return Type::IfcActorSelect; } return IfcObject::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 5: return "TheActor"; } return IfcObject::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelAssignsToActor > > IsActingUpon(); // INVERSE IfcRelAssignsToActor::RelatingActor
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcRelAssignsToActor >::ptr IsActingUpon() const; // INVERSE IfcRelAssignsToActor::RelatingActor
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcActor (IfcAbstractEntityPtr e);
-    IfcActor (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcActorSelect v6_TheActor);
-    typedef IfcActor* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcActor > > list;
-    typedef IfcTemplatedEntityList< IfcActor >::it it;
+    IfcActor (IfcAbstractEntity* e);
+    IfcActor (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcActorSelect* v6_TheActor);
+    typedef IfcTemplatedEntityList< IfcActor > list;
 };
 /// An advanced B-rep is a boundary
 /// representation model in which all faces, edges and vertices are
@@ -27759,16 +28596,15 @@ class IfcAdvancedBrep : public IfcManifoldSolidBrep {
 public:
     virtual unsigned int getArgumentCount() const { return 1; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcManifoldSolidBrep::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcManifoldSolidBrep::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcManifoldSolidBrep::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcAdvancedBrep (IfcAbstractEntityPtr e);
+    IfcAdvancedBrep (IfcAbstractEntity* e);
     IfcAdvancedBrep (IfcClosedShell* v1_Outer);
-    typedef IfcAdvancedBrep* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcAdvancedBrep > > list;
-    typedef IfcTemplatedEntityList< IfcAdvancedBrep >::it it;
+    typedef IfcTemplatedEntityList< IfcAdvancedBrep > list;
 };
 /// The IfcAdvancedBrepWithVoids is a specialization of an
 /// advanced B-rep which contains one or more voids in its interior.
@@ -27793,20 +28629,19 @@ class IfcAdvancedBrep : public IfcManifoldSolidBrep {
 /// IfcAdvancedFace.
 class IfcAdvancedBrepWithVoids : public IfcAdvancedBrep {
 public:
-    SHARED_PTR< IfcTemplatedEntityList< IfcClosedShell > > Voids();
-    void setVoids(SHARED_PTR< IfcTemplatedEntityList< IfcClosedShell > > v);
+    IfcTemplatedEntityList< IfcClosedShell >::ptr Voids() const;
+    void setVoids(IfcTemplatedEntityList< IfcClosedShell >::ptr v);
     virtual unsigned int getArgumentCount() const { return 2; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 1: return IfcUtil::Argument_ENTITY_LIST; } return IfcAdvancedBrep::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 1: return Type::IfcClosedShell; } return IfcAdvancedBrep::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 1: return "Voids"; } return IfcAdvancedBrep::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcAdvancedBrepWithVoids (IfcAbstractEntityPtr e);
-    IfcAdvancedBrepWithVoids (IfcClosedShell* v1_Outer, SHARED_PTR< IfcTemplatedEntityList< IfcClosedShell > > v2_Voids);
-    typedef IfcAdvancedBrepWithVoids* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcAdvancedBrepWithVoids > > list;
-    typedef IfcTemplatedEntityList< IfcAdvancedBrepWithVoids >::it it;
+    IfcAdvancedBrepWithVoids (IfcAbstractEntity* e);
+    IfcAdvancedBrepWithVoids (IfcClosedShell* v1_Outer, IfcTemplatedEntityList< IfcClosedShell >::ptr v2_Voids);
+    typedef IfcTemplatedEntityList< IfcAdvancedBrepWithVoids > list;
 };
 /// Definition from IAI: An annotation is a graphical
 ///   representation within the geometric (and spatial) context
@@ -27985,17 +28820,16 @@ class IfcAnnotation : public IfcProduct {
 public:
     virtual unsigned int getArgumentCount() const { return 7; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcProduct::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcProduct::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcProduct::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelContainedInSpatialStructure > > ContainedInStructure(); // INVERSE IfcRelContainedInSpatialStructure::RelatedElements
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcRelContainedInSpatialStructure >::ptr ContainedInStructure() const; // INVERSE IfcRelContainedInSpatialStructure::RelatedElements
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcAnnotation (IfcAbstractEntityPtr e);
-    IfcAnnotation (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation);
-    typedef IfcAnnotation* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcAnnotation > > list;
-    typedef IfcTemplatedEntityList< IfcAnnotation >::it it;
+    IfcAnnotation (IfcAbstractEntity* e);
+    IfcAnnotation (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation);
+    typedef IfcTemplatedEntityList< IfcAnnotation > list;
 };
 /// Definition from ISO/CD 10303-42:1992: A b_spline_surface is a general form of rational or polynomial parametric surface which is represented by control points, basis functions, and possibly, weights. As with the corresponding curve entity it has some special subtypes where some of the data can be derived.
 /// 
@@ -28069,36 +28903,37 @@ class IfcAnnotation : public IfcProduct {
 class IfcBSplineSurface : public IfcBoundedSurface {
 public:
     /// Algebraic degree of basis functions in u.
-    int UDegree();
+    int UDegree() const;
     void setUDegree(int v);
     /// Algebraic degree of basis functions in v.
-    int VDegree();
+    int VDegree() const;
     void setVDegree(int v);
     /// This is a list of lists of control points.
+    IfcTemplatedEntityListList< IfcCartesianPoint >::ptr ControlPointsList() const;
+    void setControlPointsList(IfcTemplatedEntityListList< IfcCartesianPoint >::ptr v);
     /// Indicator of special surface types.
-    IfcBSplineSurfaceForm::IfcBSplineSurfaceForm SurfaceForm();
+    IfcBSplineSurfaceForm::IfcBSplineSurfaceForm SurfaceForm() const;
     void setSurfaceForm(IfcBSplineSurfaceForm::IfcBSplineSurfaceForm v);
     /// Indication of whether the surface is closed in the u direction; this is for information only.
-    bool UClosed();
+    bool UClosed() const;
     void setUClosed(bool v);
     /// Indication of whether the surface is closed in the v direction; this is for information only.
-    bool VClosed();
+    bool VClosed() const;
     void setVClosed(bool v);
     /// Flag to indicate whether, or not, surface is self-intersecting; this is for information only.
-    bool SelfIntersect();
+    bool SelfIntersect() const;
     void setSelfIntersect(bool v);
     virtual unsigned int getArgumentCount() const { return 7; }
-    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_INT; case 1: return IfcUtil::Argument_INT; case 2: return IfcUtil::Argument_UNKNOWN; case 3: return IfcUtil::Argument_ENUMERATION; case 4: return IfcUtil::Argument_BOOL; case 5: return IfcUtil::Argument_BOOL; case 6: return IfcUtil::Argument_BOOL; } return IfcBoundedSurface::getArgumentType(i); }
+    virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_INT; case 1: return IfcUtil::Argument_INT; case 2: return IfcUtil::Argument_ENTITY_LIST_LIST; case 3: return IfcUtil::Argument_ENUMERATION; case 4: return IfcUtil::Argument_BOOL; case 5: return IfcUtil::Argument_BOOL; case 6: return IfcUtil::Argument_BOOL; } return IfcBoundedSurface::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::UNDEFINED; case 1: return Type::UNDEFINED; case 2: return Type::IfcCartesianPoint; case 3: return Type::IfcBSplineSurfaceForm; case 4: return Type::UNDEFINED; case 5: return Type::UNDEFINED; case 6: return Type::UNDEFINED; } return IfcBoundedSurface::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "UDegree"; case 1: return "VDegree"; case 2: return "ControlPointsList"; case 3: return "SurfaceForm"; case 4: return "UClosed"; case 5: return "VClosed"; case 6: return "SelfIntersect"; } return IfcBoundedSurface::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcBSplineSurface (IfcAbstractEntityPtr e);
-    IfcBSplineSurface (int v1_UDegree, int v2_VDegree, IfcBSplineSurfaceForm::IfcBSplineSurfaceForm v4_SurfaceForm, bool v5_UClosed, bool v6_VClosed, bool v7_SelfIntersect);
-    typedef IfcBSplineSurface* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcBSplineSurface > > list;
-    typedef IfcTemplatedEntityList< IfcBSplineSurface >::it it;
+    IfcBSplineSurface (IfcAbstractEntity* e);
+    IfcBSplineSurface (int v1_UDegree, int v2_VDegree, IfcTemplatedEntityListList< IfcCartesianPoint >::ptr v3_ControlPointsList, IfcBSplineSurfaceForm::IfcBSplineSurfaceForm v4_SurfaceForm, bool v5_UClosed, bool v6_VClosed, bool v7_SelfIntersect);
+    typedef IfcTemplatedEntityList< IfcBSplineSurface > list;
 };
 /// Definition from ISO 10303:42:1994: This is a B-spline surface in which the knot values are explicitly given. This subtype shall be used to represent non-uniform B-spline surfaces, and may also be used for other knot types.
 /// 
@@ -28110,32 +28945,31 @@ class IfcBSplineSurface : public IfcBoundedSurface {
 class IfcBSplineSurfaceWithKnots : public IfcBSplineSurface {
 public:
     /// The multiplicities of the knots in the u parameter direction.
-    std::vector< int > /*[2:?]*/ UMultiplicities();
+    std::vector< int > /*[2:?]*/ UMultiplicities() const;
     void setUMultiplicities(std::vector< int > /*[2:?]*/ v);
     /// The multiplicities of the knots in the v parameter direction.
-    std::vector< int > /*[2:?]*/ VMultiplicities();
+    std::vector< int > /*[2:?]*/ VMultiplicities() const;
     void setVMultiplicities(std::vector< int > /*[2:?]*/ v);
     /// The list of the distinct knots in the u parameter direction.
-    std::vector< IfcParameterValue > /*[2:?]*/ UKnots();
-    void setUKnots(std::vector< IfcParameterValue > /*[2:?]*/ v);
+    std::vector< double > /*[2:?]*/ UKnots() const;
+    void setUKnots(std::vector< double > /*[2:?]*/ v);
     /// The list of the distinct knots in the v parameter direction.
-    std::vector< IfcParameterValue > /*[2:?]*/ VKnots();
-    void setVKnots(std::vector< IfcParameterValue > /*[2:?]*/ v);
+    std::vector< double > /*[2:?]*/ VKnots() const;
+    void setVKnots(std::vector< double > /*[2:?]*/ v);
     /// The description of the knot type.
-    IfcKnotType::IfcKnotType KnotSpec();
+    IfcKnotType::IfcKnotType KnotSpec() const;
     void setKnotSpec(IfcKnotType::IfcKnotType v);
     virtual unsigned int getArgumentCount() const { return 12; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 7: return IfcUtil::Argument_VECTOR_INT; case 8: return IfcUtil::Argument_VECTOR_INT; case 9: return IfcUtil::Argument_VECTOR_DOUBLE; case 10: return IfcUtil::Argument_VECTOR_DOUBLE; case 11: return IfcUtil::Argument_ENUMERATION; } return IfcBSplineSurface::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 7: return Type::UNDEFINED; case 8: return Type::UNDEFINED; case 9: return Type::IfcParameterValue; case 10: return Type::IfcParameterValue; case 11: return Type::IfcKnotType; } return IfcBSplineSurface::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 7: return "UMultiplicities"; case 8: return "VMultiplicities"; case 9: return "UKnots"; case 10: return "VKnots"; case 11: return "KnotSpec"; } return IfcBSplineSurface::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcBSplineSurfaceWithKnots (IfcAbstractEntityPtr e);
-    IfcBSplineSurfaceWithKnots (int v1_UDegree, int v2_VDegree, IfcBSplineSurfaceForm::IfcBSplineSurfaceForm v4_SurfaceForm, bool v5_UClosed, bool v6_VClosed, bool v7_SelfIntersect, std::vector< int > /*[2:?]*/ v8_UMultiplicities, std::vector< int > /*[2:?]*/ v9_VMultiplicities, std::vector< IfcParameterValue > /*[2:?]*/ v10_UKnots, std::vector< IfcParameterValue > /*[2:?]*/ v11_VKnots, IfcKnotType::IfcKnotType v12_KnotSpec);
-    typedef IfcBSplineSurfaceWithKnots* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcBSplineSurfaceWithKnots > > list;
-    typedef IfcTemplatedEntityList< IfcBSplineSurfaceWithKnots >::it it;
+    IfcBSplineSurfaceWithKnots (IfcAbstractEntity* e);
+    IfcBSplineSurfaceWithKnots (int v1_UDegree, int v2_VDegree, IfcTemplatedEntityListList< IfcCartesianPoint >::ptr v3_ControlPointsList, IfcBSplineSurfaceForm::IfcBSplineSurfaceForm v4_SurfaceForm, bool v5_UClosed, bool v6_VClosed, bool v7_SelfIntersect, std::vector< int > /*[2:?]*/ v8_UMultiplicities, std::vector< int > /*[2:?]*/ v9_VMultiplicities, std::vector< double > /*[2:?]*/ v10_UKnots, std::vector< double > /*[2:?]*/ v11_VKnots, IfcKnotType::IfcKnotType v12_KnotSpec);
+    typedef IfcTemplatedEntityList< IfcBSplineSurfaceWithKnots > list;
 };
 /// The IfcBlock is a Construction Solid Geometry (CSG) 3D
 /// primitive. It is defined by a position and a positve distance along
@@ -28237,26 +29071,25 @@ class IfcBSplineSurfaceWithKnots : public IfcBSplineSurface {
 class IfcBlock : public IfcCsgPrimitive3D {
 public:
     /// The size of the block along the placement X axis. It is provided by the inherited axis placement through SELF\IfcCsgPrimitive3D.Position.P[1].
-    IfcPositiveLengthMeasure XLength();
-    void setXLength(IfcPositiveLengthMeasure v);
+    double XLength() const;
+    void setXLength(double v);
     /// The size of the block along the placement Y axis. It is provided by the inherited axis placement through SELF\IfcCsgPrimitive3D.Position.P[2].
-    IfcPositiveLengthMeasure YLength();
-    void setYLength(IfcPositiveLengthMeasure v);
+    double YLength() const;
+    void setYLength(double v);
     /// The size of the block along the placement Z axis. It is provided by the inherited axis placement through SELF\IfcCsgPrimitive3D.Position.P[3].
-    IfcPositiveLengthMeasure ZLength();
-    void setZLength(IfcPositiveLengthMeasure v);
+    double ZLength() const;
+    void setZLength(double v);
     virtual unsigned int getArgumentCount() const { return 4; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 1: return IfcUtil::Argument_DOUBLE; case 2: return IfcUtil::Argument_DOUBLE; case 3: return IfcUtil::Argument_DOUBLE; } return IfcCsgPrimitive3D::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 1: return Type::IfcPositiveLengthMeasure; case 2: return Type::IfcPositiveLengthMeasure; case 3: return Type::IfcPositiveLengthMeasure; } return IfcCsgPrimitive3D::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 1: return "XLength"; case 2: return "YLength"; case 3: return "ZLength"; } return IfcCsgPrimitive3D::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcBlock (IfcAbstractEntityPtr e);
-    IfcBlock (IfcAxis2Placement3D* v1_Position, IfcPositiveLengthMeasure v2_XLength, IfcPositiveLengthMeasure v3_YLength, IfcPositiveLengthMeasure v4_ZLength);
-    typedef IfcBlock* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcBlock > > list;
-    typedef IfcTemplatedEntityList< IfcBlock >::it it;
+    IfcBlock (IfcAbstractEntity* e);
+    IfcBlock (IfcAxis2Placement3D* v1_Position, double v2_XLength, double v3_YLength, double v4_ZLength);
+    typedef IfcTemplatedEntityList< IfcBlock > list;
 };
 /// A clipping result is defined as a special subtype of the general Boolean result (IfcBooleanResult). It constrains the operands and the operator of the Boolean result. 
 /// 
@@ -28269,16 +29102,15 @@ class IfcBooleanClippingResult : public IfcBooleanResult {
 public:
     virtual unsigned int getArgumentCount() const { return 3; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcBooleanResult::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcBooleanResult::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcBooleanResult::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcBooleanClippingResult (IfcAbstractEntityPtr e);
-    IfcBooleanClippingResult (IfcBooleanOperator::IfcBooleanOperator v1_Operator, IfcBooleanOperand v2_FirstOperand, IfcBooleanOperand v3_SecondOperand);
-    typedef IfcBooleanClippingResult* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcBooleanClippingResult > > list;
-    typedef IfcTemplatedEntityList< IfcBooleanClippingResult >::it it;
+    IfcBooleanClippingResult (IfcAbstractEntity* e);
+    IfcBooleanClippingResult (IfcBooleanOperator::IfcBooleanOperator v1_Operator, IfcBooleanOperand* v2_FirstOperand, IfcBooleanOperand* v3_SecondOperand);
+    typedef IfcTemplatedEntityList< IfcBooleanClippingResult > list;
 };
 /// Definition from ISO/CD 10303-42:1992: A bounded curve is a curve of finite arc length with identifiable end points. 
 /// 
@@ -28294,16 +29126,15 @@ class IfcBoundedCurve : public IfcCurve {
 public:
     virtual unsigned int getArgumentCount() const { return 0; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcCurve::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcCurve::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcCurve::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcBoundedCurve (IfcAbstractEntityPtr e);
+    IfcBoundedCurve (IfcAbstractEntity* e);
     IfcBoundedCurve ();
-    typedef IfcBoundedCurve* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcBoundedCurve > > list;
-    typedef IfcTemplatedEntityList< IfcBoundedCurve >::it it;
+    typedef IfcTemplatedEntityList< IfcBoundedCurve > list;
 };
 /// Definition from ISO 6707-1:1989: Construction work that
 /// has the provision of shelter for its occupants or contents as one
@@ -28483,32 +29314,31 @@ class IfcBoundedCurve : public IfcCurve {
 class IfcBuilding : public IfcSpatialStructureElement {
 public:
     /// Whether the optional attribute ElevationOfRefHeight is defined for this IfcBuilding
-    bool hasElevationOfRefHeight();
+    bool hasElevationOfRefHeight() const;
     /// Elevation above sea level of the reference height used for all storey elevation measures, equals to height 0.0. It is usually the ground floor level.
-    IfcLengthMeasure ElevationOfRefHeight();
-    void setElevationOfRefHeight(IfcLengthMeasure v);
+    double ElevationOfRefHeight() const;
+    void setElevationOfRefHeight(double v);
     /// Whether the optional attribute ElevationOfTerrain is defined for this IfcBuilding
-    bool hasElevationOfTerrain();
+    bool hasElevationOfTerrain() const;
     /// Elevation above the minimal terrain level around the foot print of the building, given in elevation above sea level.
-    IfcLengthMeasure ElevationOfTerrain();
-    void setElevationOfTerrain(IfcLengthMeasure v);
+    double ElevationOfTerrain() const;
+    void setElevationOfTerrain(double v);
     /// Whether the optional attribute BuildingAddress is defined for this IfcBuilding
-    bool hasBuildingAddress();
+    bool hasBuildingAddress() const;
     /// Address given to the building for postal purposes.
-    IfcPostalAddress* BuildingAddress();
+    IfcPostalAddress* BuildingAddress() const;
     void setBuildingAddress(IfcPostalAddress* v);
     virtual unsigned int getArgumentCount() const { return 12; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_DOUBLE; case 10: return IfcUtil::Argument_DOUBLE; case 11: return IfcUtil::Argument_ENTITY; } return IfcSpatialStructureElement::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcLengthMeasure; case 10: return Type::IfcLengthMeasure; case 11: return Type::IfcPostalAddress; } return IfcSpatialStructureElement::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "ElevationOfRefHeight"; case 10: return "ElevationOfTerrain"; case 11: return "BuildingAddress"; } return IfcSpatialStructureElement::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcBuilding (IfcAbstractEntityPtr e);
-    IfcBuilding (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcLabel > v8_LongName, boost::optional< IfcElementCompositionEnum::IfcElementCompositionEnum > v9_CompositionType, boost::optional< IfcLengthMeasure > v10_ElevationOfRefHeight, boost::optional< IfcLengthMeasure > v11_ElevationOfTerrain, IfcPostalAddress* v12_BuildingAddress);
-    typedef IfcBuilding* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcBuilding > > list;
-    typedef IfcTemplatedEntityList< IfcBuilding >::it it;
+    IfcBuilding (IfcAbstractEntity* e);
+    IfcBuilding (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_LongName, boost::optional< IfcElementCompositionEnum::IfcElementCompositionEnum > v9_CompositionType, boost::optional< double > v10_ElevationOfRefHeight, boost::optional< double > v11_ElevationOfTerrain, IfcPostalAddress* v12_BuildingAddress);
+    typedef IfcTemplatedEntityList< IfcBuilding > list;
 };
 /// Definition from IAI: The element type
 ///   (IfcBuildingElementType) defines a list of commonly
@@ -28543,16 +29373,15 @@ class IfcBuildingElementType : public IfcElementType {
 public:
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcElementType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcElementType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcElementType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcBuildingElementType (IfcAbstractEntityPtr e);
-    IfcBuildingElementType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType);
-    typedef IfcBuildingElementType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcBuildingElementType > > list;
-    typedef IfcTemplatedEntityList< IfcBuildingElementType >::it it;
+    IfcBuildingElementType (IfcAbstractEntity* e);
+    IfcBuildingElementType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType);
+    typedef IfcTemplatedEntityList< IfcBuildingElementType > list;
 };
 /// The building storey has an
 /// elevation and typically represents a (nearly) horizontal
@@ -28734,22 +29563,21 @@ class IfcBuildingElementType : public IfcElementType {
 class IfcBuildingStorey : public IfcSpatialStructureElement {
 public:
     /// Whether the optional attribute Elevation is defined for this IfcBuildingStorey
-    bool hasElevation();
+    bool hasElevation() const;
     /// Elevation of the base of this storey, relative to the 0,00 internal reference height of the building. The 0.00 level is given by the absolute above sea level height by the ElevationOfRefHeight attribute given at IfcBuilding.
-    IfcLengthMeasure Elevation();
-    void setElevation(IfcLengthMeasure v);
+    double Elevation() const;
+    void setElevation(double v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_DOUBLE; } return IfcSpatialStructureElement::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcLengthMeasure; } return IfcSpatialStructureElement::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "Elevation"; } return IfcSpatialStructureElement::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcBuildingStorey (IfcAbstractEntityPtr e);
-    IfcBuildingStorey (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcLabel > v8_LongName, boost::optional< IfcElementCompositionEnum::IfcElementCompositionEnum > v9_CompositionType, boost::optional< IfcLengthMeasure > v10_Elevation);
-    typedef IfcBuildingStorey* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcBuildingStorey > > list;
-    typedef IfcTemplatedEntityList< IfcBuildingStorey >::it it;
+    IfcBuildingStorey (IfcAbstractEntity* e);
+    IfcBuildingStorey (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_LongName, boost::optional< IfcElementCompositionEnum::IfcElementCompositionEnum > v9_CompositionType, boost::optional< double > v10_Elevation);
+    typedef IfcTemplatedEntityList< IfcBuildingStorey > list;
 };
 /// Definition from IAI: The IfcChimneyType
 ///   defines a list of commonly shared property set definitions
@@ -28779,20 +29607,19 @@ class IfcBuildingStorey : public IfcSpatialStructureElement {
 class IfcChimneyType : public IfcBuildingElementType {
 public:
     /// Identifies the predefined types of a chimney element from which the type required may be set.
-    IfcChimneyTypeEnum::IfcChimneyTypeEnum PredefinedType();
+    IfcChimneyTypeEnum::IfcChimneyTypeEnum PredefinedType() const;
     void setPredefinedType(IfcChimneyTypeEnum::IfcChimneyTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcBuildingElementType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcChimneyTypeEnum; } return IfcBuildingElementType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcBuildingElementType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcChimneyType (IfcAbstractEntityPtr e);
-    IfcChimneyType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcChimneyTypeEnum::IfcChimneyTypeEnum v10_PredefinedType);
-    typedef IfcChimneyType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcChimneyType > > list;
-    typedef IfcTemplatedEntityList< IfcChimneyType >::it it;
+    IfcChimneyType (IfcAbstractEntity* e);
+    IfcChimneyType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcChimneyTypeEnum::IfcChimneyTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcChimneyType > list;
 };
 /// IfcCircleHollowProfileDef
 /// defines a section profile that provides the defining parameters of a
@@ -28815,36 +29642,34 @@ class IfcChimneyType : public IfcBuildingElementType {
 class IfcCircleHollowProfileDef : public IfcCircleProfileDef {
 public:
     /// Thickness of the material, it is the difference between the outer and inner radius.
-    IfcPositiveLengthMeasure WallThickness();
-    void setWallThickness(IfcPositiveLengthMeasure v);
+    double WallThickness() const;
+    void setWallThickness(double v);
     virtual unsigned int getArgumentCount() const { return 5; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 4: return IfcUtil::Argument_DOUBLE; } return IfcCircleProfileDef::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 4: return Type::IfcPositiveLengthMeasure; } return IfcCircleProfileDef::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 4: return "WallThickness"; } return IfcCircleProfileDef::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcCircleHollowProfileDef (IfcAbstractEntityPtr e);
-    IfcCircleHollowProfileDef (IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< IfcLabel > v2_ProfileName, IfcAxis2Placement2D* v3_Position, IfcPositiveLengthMeasure v4_Radius, IfcPositiveLengthMeasure v5_WallThickness);
-    typedef IfcCircleHollowProfileDef* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcCircleHollowProfileDef > > list;
-    typedef IfcTemplatedEntityList< IfcCircleHollowProfileDef >::it it;
+    IfcCircleHollowProfileDef (IfcAbstractEntity* e);
+    IfcCircleHollowProfileDef (IfcProfileTypeEnum::IfcProfileTypeEnum v1_ProfileType, boost::optional< std::string > v2_ProfileName, IfcAxis2Placement2D* v3_Position, double v4_Radius, double v5_WallThickness);
+    typedef IfcTemplatedEntityList< IfcCircleHollowProfileDef > list;
 };
 
 class IfcCivilElementType : public IfcElementType {
 public:
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcElementType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcElementType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcElementType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcCivilElementType (IfcAbstractEntityPtr e);
-    IfcCivilElementType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType);
-    typedef IfcCivilElementType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcCivilElementType > > list;
-    typedef IfcTemplatedEntityList< IfcCivilElementType >::it it;
+    IfcCivilElementType (IfcAbstractEntity* e);
+    IfcCivilElementType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType);
+    typedef IfcTemplatedEntityList< IfcCivilElementType > list;
 };
 /// Definition from IAI: The element type
 /// IfcColumnType defines commonly shared information for
@@ -28947,20 +29772,19 @@ class IfcCivilElementType : public IfcElementType {
 class IfcColumnType : public IfcBuildingElementType {
 public:
     /// Identifies the predefined types of a column element from which the type required may be set.
-    IfcColumnTypeEnum::IfcColumnTypeEnum PredefinedType();
+    IfcColumnTypeEnum::IfcColumnTypeEnum PredefinedType() const;
     void setPredefinedType(IfcColumnTypeEnum::IfcColumnTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcBuildingElementType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcColumnTypeEnum; } return IfcBuildingElementType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcBuildingElementType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcColumnType (IfcAbstractEntityPtr e);
-    IfcColumnType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcColumnTypeEnum::IfcColumnTypeEnum v10_PredefinedType);
-    typedef IfcColumnType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcColumnType > > list;
-    typedef IfcTemplatedEntityList< IfcColumnType >::it it;
+    IfcColumnType (IfcAbstractEntity* e);
+    IfcColumnType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcColumnTypeEnum::IfcColumnTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcColumnType > list;
 };
 /// The IfcComplexPropertyTemplate defines the template for
 /// all complex properties, either the IfcComplexProperty's,
@@ -28973,30 +29797,29 @@ class IfcColumnType : public IfcBuildingElementType {
 class IfcComplexPropertyTemplate : public IfcPropertyTemplate {
 public:
     /// Whether the optional attribute UsageName is defined for this IfcComplexPropertyTemplate
-    bool hasUsageName();
-    IfcLabel UsageName();
-    void setUsageName(IfcLabel v);
+    bool hasUsageName() const;
+    std::string UsageName() const;
+    void setUsageName(std::string v);
     /// Whether the optional attribute TemplateType is defined for this IfcComplexPropertyTemplate
-    bool hasTemplateType();
-    IfcComplexPropertyTemplateTypeEnum::IfcComplexPropertyTemplateTypeEnum TemplateType();
+    bool hasTemplateType() const;
+    IfcComplexPropertyTemplateTypeEnum::IfcComplexPropertyTemplateTypeEnum TemplateType() const;
     void setTemplateType(IfcComplexPropertyTemplateTypeEnum::IfcComplexPropertyTemplateTypeEnum v);
     /// Whether the optional attribute HasPropertyTemplates is defined for this IfcComplexPropertyTemplate
-    bool hasHasPropertyTemplates();
+    bool hasHasPropertyTemplates() const;
     /// Reference to a set of property templates. It should only be provided, if the PropertyType is set to COMPLEX.
-    SHARED_PTR< IfcTemplatedEntityList< IfcPropertyTemplate > > HasPropertyTemplates();
-    void setHasPropertyTemplates(SHARED_PTR< IfcTemplatedEntityList< IfcPropertyTemplate > > v);
+    IfcTemplatedEntityList< IfcPropertyTemplate >::ptr HasPropertyTemplates() const;
+    void setHasPropertyTemplates(IfcTemplatedEntityList< IfcPropertyTemplate >::ptr v);
     virtual unsigned int getArgumentCount() const { return 7; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 4: return IfcUtil::Argument_STRING; case 5: return IfcUtil::Argument_ENUMERATION; case 6: return IfcUtil::Argument_ENTITY_LIST; } return IfcPropertyTemplate::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 4: return Type::IfcLabel; case 5: return Type::IfcComplexPropertyTemplateTypeEnum; case 6: return Type::IfcPropertyTemplate; } return IfcPropertyTemplate::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 4: return "UsageName"; case 5: return "TemplateType"; case 6: return "HasPropertyTemplates"; } return IfcPropertyTemplate::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcComplexPropertyTemplate (IfcAbstractEntityPtr e);
-    IfcComplexPropertyTemplate (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_UsageName, boost::optional< IfcComplexPropertyTemplateTypeEnum::IfcComplexPropertyTemplateTypeEnum > v6_TemplateType, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertyTemplate > > > v7_HasPropertyTemplates);
-    typedef IfcComplexPropertyTemplate* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcComplexPropertyTemplate > > list;
-    typedef IfcTemplatedEntityList< IfcComplexPropertyTemplate >::it it;
+    IfcComplexPropertyTemplate (IfcAbstractEntity* e);
+    IfcComplexPropertyTemplate (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_UsageName, boost::optional< IfcComplexPropertyTemplateTypeEnum::IfcComplexPropertyTemplateTypeEnum > v6_TemplateType, boost::optional< IfcTemplatedEntityList< IfcPropertyTemplate >::ptr > v7_HasPropertyTemplates);
+    typedef IfcTemplatedEntityList< IfcComplexPropertyTemplate > list;
 };
 /// Definition from ISO/CD 10303-42:1992: A composite
 ///   curve is a collection of curves joined end-to-end. The
@@ -29067,23 +29890,22 @@ class IfcComplexPropertyTemplate : public IfcPropertyTemplate {
 class IfcCompositeCurve : public IfcBoundedCurve {
 public:
     /// The component bounded curves, their transitions and senses. The transition attribute for the last segment defines the transition between the end of the last segment and the start of the first; this transition attribute may take the value discontinuous, which indicates an open curve.
-    SHARED_PTR< IfcTemplatedEntityList< IfcCompositeCurveSegment > > Segments();
-    void setSegments(SHARED_PTR< IfcTemplatedEntityList< IfcCompositeCurveSegment > > v);
+    IfcTemplatedEntityList< IfcCompositeCurveSegment >::ptr Segments() const;
+    void setSegments(IfcTemplatedEntityList< IfcCompositeCurveSegment >::ptr v);
     /// Indication of whether the curve intersects itself or not; this is for information only.
-    bool SelfIntersect();
+    bool SelfIntersect() const;
     void setSelfIntersect(bool v);
     virtual unsigned int getArgumentCount() const { return 2; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY_LIST; case 1: return IfcUtil::Argument_BOOL; } return IfcBoundedCurve::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcCompositeCurveSegment; case 1: return Type::UNDEFINED; } return IfcBoundedCurve::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Segments"; case 1: return "SelfIntersect"; } return IfcBoundedCurve::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcCompositeCurve (IfcAbstractEntityPtr e);
-    IfcCompositeCurve (SHARED_PTR< IfcTemplatedEntityList< IfcCompositeCurveSegment > > v1_Segments, bool v2_SelfIntersect);
-    typedef IfcCompositeCurve* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcCompositeCurve > > list;
-    typedef IfcTemplatedEntityList< IfcCompositeCurve >::it it;
+    IfcCompositeCurve (IfcAbstractEntity* e);
+    IfcCompositeCurve (IfcTemplatedEntityList< IfcCompositeCurveSegment >::ptr v1_Segments, bool v2_SelfIntersect);
+    typedef IfcTemplatedEntityList< IfcCompositeCurve > list;
 };
 /// Definition from ISO/CD 10303-42:1992 A composite curve on surface is a collection of segments which are curves on a surface. Each segment shall lie on the basis surface.
 /// 
@@ -29100,16 +29922,15 @@ class IfcCompositeCurveOnSurface : public IfcCompositeCurve {
 public:
     virtual unsigned int getArgumentCount() const { return 2; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcCompositeCurve::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcCompositeCurve::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcCompositeCurve::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcCompositeCurveOnSurface (IfcAbstractEntityPtr e);
-    IfcCompositeCurveOnSurface (SHARED_PTR< IfcTemplatedEntityList< IfcCompositeCurveSegment > > v1_Segments, bool v2_SelfIntersect);
-    typedef IfcCompositeCurveOnSurface* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcCompositeCurveOnSurface > > list;
-    typedef IfcTemplatedEntityList< IfcCompositeCurveOnSurface >::it it;
+    IfcCompositeCurveOnSurface (IfcAbstractEntity* e);
+    IfcCompositeCurveOnSurface (IfcTemplatedEntityList< IfcCompositeCurveSegment >::ptr v1_Segments, bool v2_SelfIntersect);
+    typedef IfcTemplatedEntityList< IfcCompositeCurveOnSurface > list;
 };
 /// Definition from ISO/CD 10303-42:1992: A conic (IfcConic) is a planar curve which could be produced by intersecting a plane with a cone. A conic is defined in terms of its intrinsic geometric properties rather than being described in terms of other geometry. A conic class always has a placement coordinate system defined by a two or three dimensional placement. The parametric representation is defined in terms of this placement coordinate system.
 /// 
@@ -29119,20 +29940,19 @@ class IfcCompositeCurveOnSurface : public IfcCompositeCurve {
 class IfcConic : public IfcCurve {
 public:
     /// The location and orientation of the conic. Further details of the interpretation of this attribute are given for the individual subtypes."
-    IfcAxis2Placement Position();
-    void setPosition(IfcAxis2Placement v);
+    IfcAxis2Placement* Position() const;
+    void setPosition(IfcAxis2Placement* v);
     virtual unsigned int getArgumentCount() const { return 1; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY; } return IfcCurve::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcAxis2Placement; } return IfcCurve::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Position"; } return IfcCurve::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcConic (IfcAbstractEntityPtr e);
-    IfcConic (IfcAxis2Placement v1_Position);
-    typedef IfcConic* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcConic > > list;
-    typedef IfcTemplatedEntityList< IfcConic >::it it;
+    IfcConic (IfcAbstractEntity* e);
+    IfcConic (IfcAxis2Placement* v1_Position);
+    typedef IfcTemplatedEntityList< IfcConic > list;
 };
 /// The resource type IfcConstructionEquipmentType defines commonly shared information for occurrences of construction equipment resources. The set of shared information may include:
 /// 
@@ -29150,20 +29970,19 @@ class IfcConic : public IfcCurve {
 class IfcConstructionEquipmentResourceType : public IfcConstructionResourceType {
 public:
     /// Defines types of construction equipment resources.
-    IfcConstructionEquipmentResourceTypeEnum::IfcConstructionEquipmentResourceTypeEnum PredefinedType();
+    IfcConstructionEquipmentResourceTypeEnum::IfcConstructionEquipmentResourceTypeEnum PredefinedType() const;
     void setPredefinedType(IfcConstructionEquipmentResourceTypeEnum::IfcConstructionEquipmentResourceTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 12; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 11: return IfcUtil::Argument_ENUMERATION; } return IfcConstructionResourceType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 11: return Type::IfcConstructionEquipmentResourceTypeEnum; } return IfcConstructionResourceType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 11: return "PredefinedType"; } return IfcConstructionResourceType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcConstructionEquipmentResourceType (IfcAbstractEntityPtr e);
-    IfcConstructionEquipmentResourceType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< IfcIdentifier > v7_Identification, boost::optional< IfcText > v8_LongDescription, boost::optional< IfcLabel > v9_ResourceType, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcAppliedValue > > > v10_BaseCosts, IfcPhysicalQuantity* v11_BaseQuantity, IfcConstructionEquipmentResourceTypeEnum::IfcConstructionEquipmentResourceTypeEnum v12_PredefinedType);
-    typedef IfcConstructionEquipmentResourceType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcConstructionEquipmentResourceType > > list;
-    typedef IfcTemplatedEntityList< IfcConstructionEquipmentResourceType >::it it;
+    IfcConstructionEquipmentResourceType (IfcAbstractEntity* e);
+    IfcConstructionEquipmentResourceType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< std::string > v7_Identification, boost::optional< std::string > v8_LongDescription, boost::optional< std::string > v9_ResourceType, boost::optional< IfcTemplatedEntityList< IfcAppliedValue >::ptr > v10_BaseCosts, IfcPhysicalQuantity* v11_BaseQuantity, IfcConstructionEquipmentResourceTypeEnum::IfcConstructionEquipmentResourceTypeEnum v12_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcConstructionEquipmentResourceType > list;
 };
 /// The resource type IfcConstructionMaterialType defines commonly shared information for occurrences of construction material resources. The set of shared information may include:
 /// 
@@ -29181,20 +30000,19 @@ class IfcConstructionEquipmentResourceType : public IfcConstructionResourceType
 class IfcConstructionMaterialResourceType : public IfcConstructionResourceType {
 public:
     /// Defines types of construction material resources.
-    IfcConstructionMaterialResourceTypeEnum::IfcConstructionMaterialResourceTypeEnum PredefinedType();
+    IfcConstructionMaterialResourceTypeEnum::IfcConstructionMaterialResourceTypeEnum PredefinedType() const;
     void setPredefinedType(IfcConstructionMaterialResourceTypeEnum::IfcConstructionMaterialResourceTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 12; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 11: return IfcUtil::Argument_ENUMERATION; } return IfcConstructionResourceType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 11: return Type::IfcConstructionMaterialResourceTypeEnum; } return IfcConstructionResourceType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 11: return "PredefinedType"; } return IfcConstructionResourceType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcConstructionMaterialResourceType (IfcAbstractEntityPtr e);
-    IfcConstructionMaterialResourceType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< IfcIdentifier > v7_Identification, boost::optional< IfcText > v8_LongDescription, boost::optional< IfcLabel > v9_ResourceType, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcAppliedValue > > > v10_BaseCosts, IfcPhysicalQuantity* v11_BaseQuantity, IfcConstructionMaterialResourceTypeEnum::IfcConstructionMaterialResourceTypeEnum v12_PredefinedType);
-    typedef IfcConstructionMaterialResourceType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcConstructionMaterialResourceType > > list;
-    typedef IfcTemplatedEntityList< IfcConstructionMaterialResourceType >::it it;
+    IfcConstructionMaterialResourceType (IfcAbstractEntity* e);
+    IfcConstructionMaterialResourceType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< std::string > v7_Identification, boost::optional< std::string > v8_LongDescription, boost::optional< std::string > v9_ResourceType, boost::optional< IfcTemplatedEntityList< IfcAppliedValue >::ptr > v10_BaseCosts, IfcPhysicalQuantity* v11_BaseQuantity, IfcConstructionMaterialResourceTypeEnum::IfcConstructionMaterialResourceTypeEnum v12_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcConstructionMaterialResourceType > list;
 };
 /// The resource type IfcConstructionProductType defines commonly shared information for occurrences of construction product resources. The set of shared information may include:
 /// 
@@ -29212,20 +30030,19 @@ class IfcConstructionMaterialResourceType : public IfcConstructionResourceType {
 class IfcConstructionProductResourceType : public IfcConstructionResourceType {
 public:
     /// Defines types of construction product resources.
-    IfcConstructionProductResourceTypeEnum::IfcConstructionProductResourceTypeEnum PredefinedType();
+    IfcConstructionProductResourceTypeEnum::IfcConstructionProductResourceTypeEnum PredefinedType() const;
     void setPredefinedType(IfcConstructionProductResourceTypeEnum::IfcConstructionProductResourceTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 12; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 11: return IfcUtil::Argument_ENUMERATION; } return IfcConstructionResourceType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 11: return Type::IfcConstructionProductResourceTypeEnum; } return IfcConstructionResourceType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 11: return "PredefinedType"; } return IfcConstructionResourceType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcConstructionProductResourceType (IfcAbstractEntityPtr e);
-    IfcConstructionProductResourceType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< IfcIdentifier > v7_Identification, boost::optional< IfcText > v8_LongDescription, boost::optional< IfcLabel > v9_ResourceType, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcAppliedValue > > > v10_BaseCosts, IfcPhysicalQuantity* v11_BaseQuantity, IfcConstructionProductResourceTypeEnum::IfcConstructionProductResourceTypeEnum v12_PredefinedType);
-    typedef IfcConstructionProductResourceType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcConstructionProductResourceType > > list;
-    typedef IfcTemplatedEntityList< IfcConstructionProductResourceType >::it it;
+    IfcConstructionProductResourceType (IfcAbstractEntity* e);
+    IfcConstructionProductResourceType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< std::string > v7_Identification, boost::optional< std::string > v8_LongDescription, boost::optional< std::string > v9_ResourceType, boost::optional< IfcTemplatedEntityList< IfcAppliedValue >::ptr > v10_BaseCosts, IfcPhysicalQuantity* v11_BaseQuantity, IfcConstructionProductResourceTypeEnum::IfcConstructionProductResourceTypeEnum v12_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcConstructionProductResourceType > list;
 };
 /// IfcConstructionResource is an abstract generalization of the different resources used in
 /// construction projects, mainly labor, material, equipment and product resources, plus subcontracted resources and aggregations such as a crew resource.
@@ -29302,29 +30119,28 @@ class IfcConstructionProductResourceType : public IfcConstructionResourceType {
 class IfcConstructionResource : public IfcResource {
 public:
     /// Whether the optional attribute Usage is defined for this IfcConstructionResource
-    bool hasUsage();
-    IfcResourceTime* Usage();
+    bool hasUsage() const;
+    IfcResourceTime* Usage() const;
     void setUsage(IfcResourceTime* v);
     /// Whether the optional attribute BaseCosts is defined for this IfcConstructionResource
-    bool hasBaseCosts();
-    SHARED_PTR< IfcTemplatedEntityList< IfcAppliedValue > > BaseCosts();
-    void setBaseCosts(SHARED_PTR< IfcTemplatedEntityList< IfcAppliedValue > > v);
+    bool hasBaseCosts() const;
+    IfcTemplatedEntityList< IfcAppliedValue >::ptr BaseCosts() const;
+    void setBaseCosts(IfcTemplatedEntityList< IfcAppliedValue >::ptr v);
     /// Whether the optional attribute BaseQuantity is defined for this IfcConstructionResource
-    bool hasBaseQuantity();
-    IfcPhysicalQuantity* BaseQuantity();
+    bool hasBaseQuantity() const;
+    IfcPhysicalQuantity* BaseQuantity() const;
     void setBaseQuantity(IfcPhysicalQuantity* v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 7: return IfcUtil::Argument_ENTITY; case 8: return IfcUtil::Argument_ENTITY_LIST; case 9: return IfcUtil::Argument_ENTITY; } return IfcResource::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 7: return Type::IfcResourceTime; case 8: return Type::IfcAppliedValue; case 9: return Type::IfcPhysicalQuantity; } return IfcResource::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 7: return "Usage"; case 8: return "BaseCosts"; case 9: return "BaseQuantity"; } return IfcResource::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcConstructionResource (IfcAbstractEntityPtr e);
-    IfcConstructionResource (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, boost::optional< IfcIdentifier > v6_Identification, boost::optional< IfcText > v7_LongDescription, IfcResourceTime* v8_Usage, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcAppliedValue > > > v9_BaseCosts, IfcPhysicalQuantity* v10_BaseQuantity);
-    typedef IfcConstructionResource* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcConstructionResource > > list;
-    typedef IfcTemplatedEntityList< IfcConstructionResource >::it it;
+    IfcConstructionResource (IfcAbstractEntity* e);
+    IfcConstructionResource (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, boost::optional< std::string > v6_Identification, boost::optional< std::string > v7_LongDescription, IfcResourceTime* v8_Usage, boost::optional< IfcTemplatedEntityList< IfcAppliedValue >::ptr > v9_BaseCosts, IfcPhysicalQuantity* v10_BaseQuantity);
+    typedef IfcTemplatedEntityList< IfcConstructionResource > list;
 };
 /// IfcControl is the abstract generalization of all concepts that control or constrain the utilization of products, processes, or resources in general. It can be seen as a regulation, cost schedule, request or order, or other requirements applied to a product, process or resource whose requirements and provisions must be fulfilled.
 /// 
@@ -29339,26 +30155,25 @@ class IfcConstructionResource : public IfcResource {
 class IfcControl : public IfcObject {
 public:
     /// Whether the optional attribute Identification is defined for this IfcControl
-    bool hasIdentification();
+    bool hasIdentification() const;
     /// An identifying designation given to a control
     ///   It is the identifier at the occurrence level. 
     /// 
     /// IFC2x4 CHANGE  Attribute unified by promoting from various subtypes of IfcControl.
-    IfcIdentifier Identification();
-    void setIdentification(IfcIdentifier v);
+    std::string Identification() const;
+    void setIdentification(std::string v);
     virtual unsigned int getArgumentCount() const { return 6; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 5: return IfcUtil::Argument_STRING; } return IfcObject::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 5: return Type::IfcIdentifier; } return IfcObject::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 5: return "Identification"; } return IfcObject::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelAssignsToControl > > Controls(); // INVERSE IfcRelAssignsToControl::RelatingControl
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcRelAssignsToControl >::ptr Controls() const; // INVERSE IfcRelAssignsToControl::RelatingControl
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcControl (IfcAbstractEntityPtr e);
-    IfcControl (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, boost::optional< IfcIdentifier > v6_Identification);
-    typedef IfcControl* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcControl > > list;
-    typedef IfcTemplatedEntityList< IfcControl >::it it;
+    IfcControl (IfcAbstractEntity* e);
+    IfcControl (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, boost::optional< std::string > v6_Identification);
+    typedef IfcTemplatedEntityList< IfcControl > list;
 };
 /// An IfcCostItem describes a cost or financial value together with descriptive information that describes its context in a form that enables it to be used within a cost schedule. An IfcCostItem can be used to represent the cost of goods and services, the execution of works by a process, lifecycle cost and more.
 /// 
@@ -29399,14 +30214,14 @@ class IfcControl : public IfcObject {
 class IfcCostItem : public IfcControl {
 public:
     /// Whether the optional attribute PredefinedType is defined for this IfcCostItem
-    bool hasPredefinedType();
+    bool hasPredefinedType() const;
     /// Predefined generic type for a cost item that is specified in an enumeration. There may be a property set given specificly for the predefined types.
     /// 
     /// IFC2x4 CHANGE  The attribute has been added.
-    IfcCostItemTypeEnum::IfcCostItemTypeEnum PredefinedType();
+    IfcCostItemTypeEnum::IfcCostItemTypeEnum PredefinedType() const;
     void setPredefinedType(IfcCostItemTypeEnum::IfcCostItemTypeEnum v);
     /// Whether the optional attribute CostValues is defined for this IfcCostItem
-    bool hasCostValues();
+    bool hasCostValues() const;
     /// Component costs for which the total cost for the cost item is calculated, and then multiplied by the total CostQuantities if provided.  
     /// 
     /// If CostQuantities is provided then values indicate unit costs, otherwise values indicate total costs.
@@ -29414,27 +30229,26 @@ class IfcCostItem : public IfcControl {
     /// For calculation purposes, the cost values may be directly added unless they have qualifications.  Cost values with qualifications (e.g. IfcCostValue.ApplicableDate, IfcCostValue.FixedUntilDate) should be excluded from such calculation if they do not apply.
     /// 
     /// IFC2x4 CHANGE  The attribute has been added.
-    SHARED_PTR< IfcTemplatedEntityList< IfcCostValue > > CostValues();
-    void setCostValues(SHARED_PTR< IfcTemplatedEntityList< IfcCostValue > > v);
+    IfcTemplatedEntityList< IfcCostValue >::ptr CostValues() const;
+    void setCostValues(IfcTemplatedEntityList< IfcCostValue >::ptr v);
     /// Whether the optional attribute CostQuantities is defined for this IfcCostItem
-    bool hasCostQuantities();
+    bool hasCostQuantities() const;
     /// Component quantities of the same type for which the total quantity for the cost item is calculated as the sum.
     /// 
     /// IFC2x4 CHANGE  The attribute has been added.
-    SHARED_PTR< IfcTemplatedEntityList< IfcPhysicalQuantity > > CostQuantities();
-    void setCostQuantities(SHARED_PTR< IfcTemplatedEntityList< IfcPhysicalQuantity > > v);
+    IfcTemplatedEntityList< IfcPhysicalQuantity >::ptr CostQuantities() const;
+    void setCostQuantities(IfcTemplatedEntityList< IfcPhysicalQuantity >::ptr v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 6: return IfcUtil::Argument_ENUMERATION; case 7: return IfcUtil::Argument_ENTITY_LIST; case 8: return IfcUtil::Argument_ENTITY_LIST; } return IfcControl::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 6: return Type::IfcCostItemTypeEnum; case 7: return Type::IfcCostValue; case 8: return Type::IfcPhysicalQuantity; } return IfcControl::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 6: return "PredefinedType"; case 7: return "CostValues"; case 8: return "CostQuantities"; } return IfcControl::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcCostItem (IfcAbstractEntityPtr e);
-    IfcCostItem (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, boost::optional< IfcIdentifier > v6_Identification, boost::optional< IfcCostItemTypeEnum::IfcCostItemTypeEnum > v7_PredefinedType, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcCostValue > > > v8_CostValues, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPhysicalQuantity > > > v9_CostQuantities);
-    typedef IfcCostItem* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcCostItem > > list;
-    typedef IfcTemplatedEntityList< IfcCostItem >::it it;
+    IfcCostItem (IfcAbstractEntity* e);
+    IfcCostItem (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, boost::optional< std::string > v6_Identification, boost::optional< IfcCostItemTypeEnum::IfcCostItemTypeEnum > v7_PredefinedType, boost::optional< IfcTemplatedEntityList< IfcCostValue >::ptr > v8_CostValues, boost::optional< IfcTemplatedEntityList< IfcPhysicalQuantity >::ptr > v9_CostQuantities);
+    typedef IfcTemplatedEntityList< IfcCostItem > list;
 };
 /// An IfcCostSchedule brings together instances of IfcCostItem either for the purpose of identifying purely cost information as in an estimate for constructions costs or for including cost information within another presentation form such as a work order.
 /// 
@@ -29462,14 +30276,14 @@ class IfcCostItem : public IfcControl {
 class IfcCostSchedule : public IfcControl {
 public:
     /// Whether the optional attribute PredefinedType is defined for this IfcCostSchedule
-    bool hasPredefinedType();
+    bool hasPredefinedType() const;
     /// Predefined generic type for a cost schedule that is specified in an enumeration. There may be a property set given specifically for the predefined types.
     /// 
     /// IFC2x4 CHANGE  The attribute has been made optional.
-    IfcCostScheduleTypeEnum::IfcCostScheduleTypeEnum PredefinedType();
+    IfcCostScheduleTypeEnum::IfcCostScheduleTypeEnum PredefinedType() const;
     void setPredefinedType(IfcCostScheduleTypeEnum::IfcCostScheduleTypeEnum v);
     /// Whether the optional attribute Status is defined for this IfcCostSchedule
-    bool hasStatus();
+    bool hasStatus() const;
     /// The current status of a cost schedule. Examples of status values that might be used for a cost schedule status include:
     /// 
     /// PLANNED 
@@ -29477,34 +30291,33 @@ class IfcCostSchedule : public IfcControl {
     ///   AGREED 
     ///   ISSUED 
     ///   STARTED
-    IfcLabel Status();
-    void setStatus(IfcLabel v);
+    std::string Status() const;
+    void setStatus(std::string v);
     /// Whether the optional attribute SubmittedOn is defined for this IfcCostSchedule
-    bool hasSubmittedOn();
+    bool hasSubmittedOn() const;
     /// The date and time on which the cost schedule was submitted.
     /// 
     /// IFC2x4 CHANGE Type changed from IfcDateTimeSelect.
-    IfcDateTime SubmittedOn();
-    void setSubmittedOn(IfcDateTime v);
+    std::string SubmittedOn() const;
+    void setSubmittedOn(std::string v);
     /// Whether the optional attribute UpdateDate is defined for this IfcCostSchedule
-    bool hasUpdateDate();
+    bool hasUpdateDate() const;
     /// The date and time that this cost schedule is updated; this allows tracking the schedule history.
     /// 
     /// IFC2x4 CHANGE Type changed from IfcDateTimeSelect.
-    IfcDateTime UpdateDate();
-    void setUpdateDate(IfcDateTime v);
+    std::string UpdateDate() const;
+    void setUpdateDate(std::string v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 6: return IfcUtil::Argument_ENUMERATION; case 7: return IfcUtil::Argument_STRING; case 8: return IfcUtil::Argument_STRING; case 9: return IfcUtil::Argument_STRING; } return IfcControl::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 6: return Type::IfcCostScheduleTypeEnum; case 7: return Type::IfcLabel; case 8: return Type::IfcDateTime; case 9: return Type::IfcDateTime; } return IfcControl::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 6: return "PredefinedType"; case 7: return "Status"; case 8: return "SubmittedOn"; case 9: return "UpdateDate"; } return IfcControl::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcCostSchedule (IfcAbstractEntityPtr e);
-    IfcCostSchedule (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, boost::optional< IfcIdentifier > v6_Identification, boost::optional< IfcCostScheduleTypeEnum::IfcCostScheduleTypeEnum > v7_PredefinedType, boost::optional< IfcLabel > v8_Status, boost::optional< IfcDateTime > v9_SubmittedOn, boost::optional< IfcDateTime > v10_UpdateDate);
-    typedef IfcCostSchedule* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcCostSchedule > > list;
-    typedef IfcTemplatedEntityList< IfcCostSchedule >::it it;
+    IfcCostSchedule (IfcAbstractEntity* e);
+    IfcCostSchedule (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, boost::optional< std::string > v6_Identification, boost::optional< IfcCostScheduleTypeEnum::IfcCostScheduleTypeEnum > v7_PredefinedType, boost::optional< std::string > v8_Status, boost::optional< std::string > v9_SubmittedOn, boost::optional< std::string > v10_UpdateDate);
+    typedef IfcTemplatedEntityList< IfcCostSchedule > list;
 };
 /// Definition from IAI: The element type
 /// IfcCoveringType defines commonly shared information for
@@ -29588,20 +30401,19 @@ class IfcCostSchedule : public IfcControl {
 class IfcCoveringType : public IfcBuildingElementType {
 public:
     /// Predefined types to define the particular type of the covering. There may be property set definitions available for each predefined type.
-    IfcCoveringTypeEnum::IfcCoveringTypeEnum PredefinedType();
+    IfcCoveringTypeEnum::IfcCoveringTypeEnum PredefinedType() const;
     void setPredefinedType(IfcCoveringTypeEnum::IfcCoveringTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcBuildingElementType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcCoveringTypeEnum; } return IfcBuildingElementType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcBuildingElementType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcCoveringType (IfcAbstractEntityPtr e);
-    IfcCoveringType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcCoveringTypeEnum::IfcCoveringTypeEnum v10_PredefinedType);
-    typedef IfcCoveringType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcCoveringType > > list;
-    typedef IfcTemplatedEntityList< IfcCoveringType >::it it;
+    IfcCoveringType (IfcAbstractEntity* e);
+    IfcCoveringType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcCoveringTypeEnum::IfcCoveringTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcCoveringType > list;
 };
 /// IfcCrewResource represents a collection of internal resources used in construction processes. 
 /// 
@@ -29616,23 +30428,22 @@ class IfcCoveringType : public IfcBuildingElementType {
 class IfcCrewResource : public IfcConstructionResource {
 public:
     /// Whether the optional attribute PredefinedType is defined for this IfcCrewResource
-    bool hasPredefinedType();
+    bool hasPredefinedType() const;
     /// Defines types of crew resources.
     /// IFC2x4 New attribute
-    IfcCrewResourceTypeEnum::IfcCrewResourceTypeEnum PredefinedType();
+    IfcCrewResourceTypeEnum::IfcCrewResourceTypeEnum PredefinedType() const;
     void setPredefinedType(IfcCrewResourceTypeEnum::IfcCrewResourceTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 11; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 10: return IfcUtil::Argument_ENUMERATION; } return IfcConstructionResource::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 10: return Type::IfcCrewResourceTypeEnum; } return IfcConstructionResource::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 10: return "PredefinedType"; } return IfcConstructionResource::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcCrewResource (IfcAbstractEntityPtr e);
-    IfcCrewResource (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, boost::optional< IfcIdentifier > v6_Identification, boost::optional< IfcText > v7_LongDescription, IfcResourceTime* v8_Usage, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcAppliedValue > > > v9_BaseCosts, IfcPhysicalQuantity* v10_BaseQuantity, boost::optional< IfcCrewResourceTypeEnum::IfcCrewResourceTypeEnum > v11_PredefinedType);
-    typedef IfcCrewResource* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcCrewResource > > list;
-    typedef IfcTemplatedEntityList< IfcCrewResource >::it it;
+    IfcCrewResource (IfcAbstractEntity* e);
+    IfcCrewResource (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, boost::optional< std::string > v6_Identification, boost::optional< std::string > v7_LongDescription, IfcResourceTime* v8_Usage, boost::optional< IfcTemplatedEntityList< IfcAppliedValue >::ptr > v9_BaseCosts, IfcPhysicalQuantity* v10_BaseQuantity, boost::optional< IfcCrewResourceTypeEnum::IfcCrewResourceTypeEnum > v11_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcCrewResource > list;
 };
 /// Definition from IAI: The element type (IfcCurtainWallType)
 /// defines a list of commonly shared property set definitions of a curtain
@@ -29658,20 +30469,19 @@ class IfcCrewResource : public IfcConstructionResource {
 class IfcCurtainWallType : public IfcBuildingElementType {
 public:
     /// Identifies the predefined types of a curtain wall element from which the type required may be set.
-    IfcCurtainWallTypeEnum::IfcCurtainWallTypeEnum PredefinedType();
+    IfcCurtainWallTypeEnum::IfcCurtainWallTypeEnum PredefinedType() const;
     void setPredefinedType(IfcCurtainWallTypeEnum::IfcCurtainWallTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcBuildingElementType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcCurtainWallTypeEnum; } return IfcBuildingElementType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcBuildingElementType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcCurtainWallType (IfcAbstractEntityPtr e);
-    IfcCurtainWallType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcCurtainWallTypeEnum::IfcCurtainWallTypeEnum v10_PredefinedType);
-    typedef IfcCurtainWallType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcCurtainWallType > > list;
-    typedef IfcTemplatedEntityList< IfcCurtainWallType >::it it;
+    IfcCurtainWallType (IfcAbstractEntity* e);
+    IfcCurtainWallType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcCurtainWallTypeEnum::IfcCurtainWallTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcCurtainWallType > list;
 };
 /// Definition from ISO/CD 10303-42:1992: A cylindrical surface is a surface at a constant distance (the radius) from a straight line. A cylindrical surface is defined by its radius and its orientation and location. The data is to be interpreted as follows:
 /// 
@@ -29730,20 +30540,19 @@ class IfcCurtainWallType : public IfcBuildingElementType {
 class IfcCylindricalSurface : public IfcElementarySurface {
 public:
     /// The radius of the cylindrical surface.
-    IfcPositiveLengthMeasure Radius();
-    void setRadius(IfcPositiveLengthMeasure v);
+    double Radius() const;
+    void setRadius(double v);
     virtual unsigned int getArgumentCount() const { return 2; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 1: return IfcUtil::Argument_DOUBLE; } return IfcElementarySurface::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 1: return Type::IfcPositiveLengthMeasure; } return IfcElementarySurface::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 1: return "Radius"; } return IfcElementarySurface::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcCylindricalSurface (IfcAbstractEntityPtr e);
-    IfcCylindricalSurface (IfcAxis2Placement3D* v1_Position, IfcPositiveLengthMeasure v2_Radius);
-    typedef IfcCylindricalSurface* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcCylindricalSurface > > list;
-    typedef IfcTemplatedEntityList< IfcCylindricalSurface >::it it;
+    IfcCylindricalSurface (IfcAbstractEntity* e);
+    IfcCylindricalSurface (IfcAxis2Placement3D* v1_Position, double v2_Radius);
+    typedef IfcTemplatedEntityList< IfcCylindricalSurface > list;
 };
 /// Definition from IAI: The
 /// IfcDistributionElementType defines a list of commonly
@@ -29777,16 +30586,15 @@ class IfcDistributionElementType : public IfcElementType {
 public:
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcElementType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcElementType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcElementType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcDistributionElementType (IfcAbstractEntityPtr e);
-    IfcDistributionElementType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType);
-    typedef IfcDistributionElementType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcDistributionElementType > > list;
-    typedef IfcTemplatedEntityList< IfcDistributionElementType >::it it;
+    IfcDistributionElementType (IfcAbstractEntity* e);
+    IfcDistributionElementType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType);
+    typedef IfcTemplatedEntityList< IfcDistributionElementType > list;
 };
 /// The element type IfcDistributionFlowElementType defines a list of commonly shared property set definitions of an element and an optional set of product representations.  It is used to define an element specification (the specific product information that is common to all occurrences of that product type). 
 /// 
@@ -29857,16 +30665,15 @@ class IfcDistributionFlowElementType : public IfcDistributionElementType {
 public:
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcDistributionElementType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcDistributionElementType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcDistributionElementType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcDistributionFlowElementType (IfcAbstractEntityPtr e);
-    IfcDistributionFlowElementType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType);
-    typedef IfcDistributionFlowElementType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcDistributionFlowElementType > > list;
-    typedef IfcTemplatedEntityList< IfcDistributionFlowElementType >::it it;
+    IfcDistributionFlowElementType (IfcAbstractEntity* e);
+    IfcDistributionFlowElementType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType);
+    typedef IfcTemplatedEntityList< IfcDistributionFlowElementType > list;
 };
 /// The door lining is the frame which
 /// enables the door leaf to be fixed in position. The door lining is
@@ -29966,88 +30773,87 @@ class IfcDistributionFlowElementType : public IfcDistributionElementType {
 class IfcDoorLiningProperties : public IfcPreDefinedPropertySet {
 public:
     /// Whether the optional attribute LiningDepth is defined for this IfcDoorLiningProperties
-    bool hasLiningDepth();
+    bool hasLiningDepth() const;
     /// Depth of the door lining, measured perpendicular to the plane of the door lining. If omitted (and with a given value to lining thickness) it indicates an adjustable depth (i.e. a depth that adjusts to the thickness of the wall into which the occurrence of this door style is inserted).
-    IfcPositiveLengthMeasure LiningDepth();
-    void setLiningDepth(IfcPositiveLengthMeasure v);
+    double LiningDepth() const;
+    void setLiningDepth(double v);
     /// Whether the optional attribute LiningThickness is defined for this IfcDoorLiningProperties
-    bool hasLiningThickness();
+    bool hasLiningThickness() const;
     /// Thickness (width in plane parallel to door leaf) of the door lining.
-    IfcNonNegativeLengthMeasure LiningThickness();
-    void setLiningThickness(IfcNonNegativeLengthMeasure v);
+    double LiningThickness() const;
+    void setLiningThickness(double v);
     /// Whether the optional attribute ThresholdDepth is defined for this IfcDoorLiningProperties
-    bool hasThresholdDepth();
+    bool hasThresholdDepth() const;
     /// Depth (dimension in plane perpendicular to door leaf) of the door threshold. Only given if the door lining includes a threshold. If omitted (and with a given value to threshold thickness) it indicates an adjustable depth (i.e. a depth that adjusts to the thickness of the wall into which the occurrence of this door style is inserted).
-    IfcPositiveLengthMeasure ThresholdDepth();
-    void setThresholdDepth(IfcPositiveLengthMeasure v);
+    double ThresholdDepth() const;
+    void setThresholdDepth(double v);
     /// Whether the optional attribute ThresholdThickness is defined for this IfcDoorLiningProperties
-    bool hasThresholdThickness();
+    bool hasThresholdThickness() const;
     /// Thickness (width in plane parallel to door leaf) of the door threshold. Only given if the door lining includes a threshold and the parameter is known.
-    IfcNonNegativeLengthMeasure ThresholdThickness();
-    void setThresholdThickness(IfcNonNegativeLengthMeasure v);
+    double ThresholdThickness() const;
+    void setThresholdThickness(double v);
     /// Whether the optional attribute TransomThickness is defined for this IfcDoorLiningProperties
-    bool hasTransomThickness();
+    bool hasTransomThickness() const;
     /// Thickness (width in plane parallel to door leaf) of the transom (if given) which divides the door leaf from a glazing (or window) above.
-    IfcNonNegativeLengthMeasure TransomThickness();
-    void setTransomThickness(IfcNonNegativeLengthMeasure v);
+    double TransomThickness() const;
+    void setTransomThickness(double v);
     /// Whether the optional attribute TransomOffset is defined for this IfcDoorLiningProperties
-    bool hasTransomOffset();
+    bool hasTransomOffset() const;
     /// Offset of the transom (if given) which divides the door leaf from a glazing (or window) above. The offset is given from the bottom of the door opening.
-    IfcLengthMeasure TransomOffset();
-    void setTransomOffset(IfcLengthMeasure v);
+    double TransomOffset() const;
+    void setTransomOffset(double v);
     /// Whether the optional attribute LiningOffset is defined for this IfcDoorLiningProperties
-    bool hasLiningOffset();
+    bool hasLiningOffset() const;
     /// Offset (dimension in plane perpendicular to door leaf) of the door lining. The offset is given as distance to the x axis of the local placement.
-    IfcLengthMeasure LiningOffset();
-    void setLiningOffset(IfcLengthMeasure v);
+    double LiningOffset() const;
+    void setLiningOffset(double v);
     /// Whether the optional attribute ThresholdOffset is defined for this IfcDoorLiningProperties
-    bool hasThresholdOffset();
+    bool hasThresholdOffset() const;
     /// Offset (dimension in plane perpendicular to door leaf) of the door threshold. The offset is given as distance to the x axis of the local placement. Only given if the door lining includes a threshold and the parameter is known.
-    IfcLengthMeasure ThresholdOffset();
-    void setThresholdOffset(IfcLengthMeasure v);
+    double ThresholdOffset() const;
+    void setThresholdOffset(double v);
     /// Whether the optional attribute CasingThickness is defined for this IfcDoorLiningProperties
-    bool hasCasingThickness();
+    bool hasCasingThickness() const;
     /// Thickness of the casing (dimension in plane of the door leaf). If given it is applied equally to all four sides of the adjacent wall.
-    IfcPositiveLengthMeasure CasingThickness();
-    void setCasingThickness(IfcPositiveLengthMeasure v);
+    double CasingThickness() const;
+    void setCasingThickness(double v);
     /// Whether the optional attribute CasingDepth is defined for this IfcDoorLiningProperties
-    bool hasCasingDepth();
+    bool hasCasingDepth() const;
     /// Depth of the casing (dimension in plane perpendicular to door leaf). If given it is applied equally to all four sides of the adjacent wall.
-    IfcPositiveLengthMeasure CasingDepth();
-    void setCasingDepth(IfcPositiveLengthMeasure v);
+    double CasingDepth() const;
+    void setCasingDepth(double v);
     /// Whether the optional attribute ShapeAspectStyle is defined for this IfcDoorLiningProperties
-    bool hasShapeAspectStyle();
+    bool hasShapeAspectStyle() const;
     /// Pointer to the shape aspect, if given. The shape aspect reflects the part of the door shape, which represents the door lining.
     /// 
     /// IFC2x4 CHANGE The attribute is deprecated and shall no longer be used, i.e. the value shall be NIL ($).
-    IfcShapeAspect* ShapeAspectStyle();
+    IfcShapeAspect* ShapeAspectStyle() const;
     void setShapeAspectStyle(IfcShapeAspect* v);
     /// Whether the optional attribute LiningToPanelOffsetX is defined for this IfcDoorLiningProperties
-    bool hasLiningToPanelOffsetX();
+    bool hasLiningToPanelOffsetX() const;
     /// Offset between the lining and the window panel measured along the x-axis of the local placement.
     /// 
     /// IFC2x4 CHANGE: New attribute added at the end of the entity definition.
-    IfcLengthMeasure LiningToPanelOffsetX();
-    void setLiningToPanelOffsetX(IfcLengthMeasure v);
+    double LiningToPanelOffsetX() const;
+    void setLiningToPanelOffsetX(double v);
     /// Whether the optional attribute LiningToPanelOffsetY is defined for this IfcDoorLiningProperties
-    bool hasLiningToPanelOffsetY();
+    bool hasLiningToPanelOffsetY() const;
     /// Offset between the lining and the door panel measured along the y-axis of the local placement.
     /// 
     /// IFC2x4 CHANGE: New attribute added at the end of the entity definition.
-    IfcLengthMeasure LiningToPanelOffsetY();
-    void setLiningToPanelOffsetY(IfcLengthMeasure v);
+    double LiningToPanelOffsetY() const;
+    void setLiningToPanelOffsetY(double v);
     virtual unsigned int getArgumentCount() const { return 17; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 4: return IfcUtil::Argument_DOUBLE; case 5: return IfcUtil::Argument_DOUBLE; case 6: return IfcUtil::Argument_DOUBLE; case 7: return IfcUtil::Argument_DOUBLE; case 8: return IfcUtil::Argument_DOUBLE; case 9: return IfcUtil::Argument_DOUBLE; case 10: return IfcUtil::Argument_DOUBLE; case 11: return IfcUtil::Argument_DOUBLE; case 12: return IfcUtil::Argument_DOUBLE; case 13: return IfcUtil::Argument_DOUBLE; case 14: return IfcUtil::Argument_ENTITY; case 15: return IfcUtil::Argument_DOUBLE; case 16: return IfcUtil::Argument_DOUBLE; } return IfcPreDefinedPropertySet::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 4: return Type::IfcPositiveLengthMeasure; case 5: return Type::IfcNonNegativeLengthMeasure; case 6: return Type::IfcPositiveLengthMeasure; case 7: return Type::IfcNonNegativeLengthMeasure; case 8: return Type::IfcNonNegativeLengthMeasure; case 9: return Type::IfcLengthMeasure; case 10: return Type::IfcLengthMeasure; case 11: return Type::IfcLengthMeasure; case 12: return Type::IfcPositiveLengthMeasure; case 13: return Type::IfcPositiveLengthMeasure; case 14: return Type::IfcShapeAspect; case 15: return Type::IfcLengthMeasure; case 16: return Type::IfcLengthMeasure; } return IfcPreDefinedPropertySet::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 4: return "LiningDepth"; case 5: return "LiningThickness"; case 6: return "ThresholdDepth"; case 7: return "ThresholdThickness"; case 8: return "TransomThickness"; case 9: return "TransomOffset"; case 10: return "LiningOffset"; case 11: return "ThresholdOffset"; case 12: return "CasingThickness"; case 13: return "CasingDepth"; case 14: return "ShapeAspectStyle"; case 15: return "LiningToPanelOffsetX"; case 16: return "LiningToPanelOffsetY"; } return IfcPreDefinedPropertySet::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcDoorLiningProperties (IfcAbstractEntityPtr e);
-    IfcDoorLiningProperties (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcPositiveLengthMeasure > v5_LiningDepth, boost::optional< IfcNonNegativeLengthMeasure > v6_LiningThickness, boost::optional< IfcPositiveLengthMeasure > v7_ThresholdDepth, boost::optional< IfcNonNegativeLengthMeasure > v8_ThresholdThickness, boost::optional< IfcNonNegativeLengthMeasure > v9_TransomThickness, boost::optional< IfcLengthMeasure > v10_TransomOffset, boost::optional< IfcLengthMeasure > v11_LiningOffset, boost::optional< IfcLengthMeasure > v12_ThresholdOffset, boost::optional< IfcPositiveLengthMeasure > v13_CasingThickness, boost::optional< IfcPositiveLengthMeasure > v14_CasingDepth, IfcShapeAspect* v15_ShapeAspectStyle, boost::optional< IfcLengthMeasure > v16_LiningToPanelOffsetX, boost::optional< IfcLengthMeasure > v17_LiningToPanelOffsetY);
-    typedef IfcDoorLiningProperties* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcDoorLiningProperties > > list;
-    typedef IfcTemplatedEntityList< IfcDoorLiningProperties >::it it;
+    IfcDoorLiningProperties (IfcAbstractEntity* e);
+    IfcDoorLiningProperties (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< double > v5_LiningDepth, boost::optional< double > v6_LiningThickness, boost::optional< double > v7_ThresholdDepth, boost::optional< double > v8_ThresholdThickness, boost::optional< double > v9_TransomThickness, boost::optional< double > v10_TransomOffset, boost::optional< double > v11_LiningOffset, boost::optional< double > v12_ThresholdOffset, boost::optional< double > v13_CasingThickness, boost::optional< double > v14_CasingDepth, IfcShapeAspect* v15_ShapeAspectStyle, boost::optional< double > v16_LiningToPanelOffsetX, boost::optional< double > v17_LiningToPanelOffsetY);
+    typedef IfcTemplatedEntityList< IfcDoorLiningProperties > list;
 };
 /// A door panel is normally a door leaf that opens to allow people or
 /// goods to pass. The parameters of the door panel define the
@@ -30097,40 +30903,39 @@ class IfcDoorLiningProperties : public IfcPreDefinedPropertySet {
 class IfcDoorPanelProperties : public IfcPreDefinedPropertySet {
 public:
     /// Whether the optional attribute PanelDepth is defined for this IfcDoorPanelProperties
-    bool hasPanelDepth();
+    bool hasPanelDepth() const;
     /// Depth of the door panel, measured perpendicular to the plane of the door leaf.
-    IfcPositiveLengthMeasure PanelDepth();
-    void setPanelDepth(IfcPositiveLengthMeasure v);
+    double PanelDepth() const;
+    void setPanelDepth(double v);
     /// The PanelOperation defines the way of operation of that panel. The PanelOperation of the door panel has to correspond with the OperationType of the IfcDoorStyle by which it is referenced.
-    IfcDoorPanelOperationEnum::IfcDoorPanelOperationEnum PanelOperation();
+    IfcDoorPanelOperationEnum::IfcDoorPanelOperationEnum PanelOperation() const;
     void setPanelOperation(IfcDoorPanelOperationEnum::IfcDoorPanelOperationEnum v);
     /// Whether the optional attribute PanelWidth is defined for this IfcDoorPanelProperties
-    bool hasPanelWidth();
+    bool hasPanelWidth() const;
     /// Width of this panel, given as ratio relative to the total clear opening width of the door. If omited, it defaults to 1. A value has to be provided for all doors with OperationType's at IfcDoorStyle defining a door with more then one panel.
-    IfcNormalisedRatioMeasure PanelWidth();
-    void setPanelWidth(IfcNormalisedRatioMeasure v);
+    double PanelWidth() const;
+    void setPanelWidth(double v);
     /// Position of this panel within the door. The PanelPosition of the door panel has to correspond with the OperationType of the IfcDoorStyle by which it is referenced.
-    IfcDoorPanelPositionEnum::IfcDoorPanelPositionEnum PanelPosition();
+    IfcDoorPanelPositionEnum::IfcDoorPanelPositionEnum PanelPosition() const;
     void setPanelPosition(IfcDoorPanelPositionEnum::IfcDoorPanelPositionEnum v);
     /// Whether the optional attribute ShapeAspectStyle is defined for this IfcDoorPanelProperties
-    bool hasShapeAspectStyle();
+    bool hasShapeAspectStyle() const;
     /// Pointer to the shape aspect, if given. The shape aspect reflects the part of the door shape, which represents the door panel.
     /// 
     /// IFC2x4 CHANGE The attribute is deprecated and shall no longer be used, i.e. the value shall be NIL ($).
-    IfcShapeAspect* ShapeAspectStyle();
+    IfcShapeAspect* ShapeAspectStyle() const;
     void setShapeAspectStyle(IfcShapeAspect* v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 4: return IfcUtil::Argument_DOUBLE; case 5: return IfcUtil::Argument_ENUMERATION; case 6: return IfcUtil::Argument_DOUBLE; case 7: return IfcUtil::Argument_ENUMERATION; case 8: return IfcUtil::Argument_ENTITY; } return IfcPreDefinedPropertySet::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 4: return Type::IfcPositiveLengthMeasure; case 5: return Type::IfcDoorPanelOperationEnum; case 6: return Type::IfcNormalisedRatioMeasure; case 7: return Type::IfcDoorPanelPositionEnum; case 8: return Type::IfcShapeAspect; } return IfcPreDefinedPropertySet::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 4: return "PanelDepth"; case 5: return "PanelOperation"; case 6: return "PanelWidth"; case 7: return "PanelPosition"; case 8: return "ShapeAspectStyle"; } return IfcPreDefinedPropertySet::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcDoorPanelProperties (IfcAbstractEntityPtr e);
-    IfcDoorPanelProperties (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcPositiveLengthMeasure > v5_PanelDepth, IfcDoorPanelOperationEnum::IfcDoorPanelOperationEnum v6_PanelOperation, boost::optional< IfcNormalisedRatioMeasure > v7_PanelWidth, IfcDoorPanelPositionEnum::IfcDoorPanelPositionEnum v8_PanelPosition, IfcShapeAspect* v9_ShapeAspectStyle);
-    typedef IfcDoorPanelProperties* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcDoorPanelProperties > > list;
-    typedef IfcTemplatedEntityList< IfcDoorPanelProperties >::it it;
+    IfcDoorPanelProperties (IfcAbstractEntity* e);
+    IfcDoorPanelProperties (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< double > v5_PanelDepth, IfcDoorPanelOperationEnum::IfcDoorPanelOperationEnum v6_PanelOperation, boost::optional< double > v7_PanelWidth, IfcDoorPanelPositionEnum::IfcDoorPanelPositionEnum v8_PanelPosition, IfcShapeAspect* v9_ShapeAspectStyle);
+    typedef IfcTemplatedEntityList< IfcDoorPanelProperties > list;
 };
 /// Definition from IAI: The element type
 /// IfcDoorType defines commonly shared information
@@ -30263,31 +31068,30 @@ class IfcDoorPanelProperties : public IfcPreDefinedPropertySet {
 class IfcDoorType : public IfcBuildingElementType {
 public:
     /// Identifies the predefined types of a door element from which the type required may be set.
-    IfcDoorTypeEnum::IfcDoorTypeEnum PredefinedType();
+    IfcDoorTypeEnum::IfcDoorTypeEnum PredefinedType() const;
     void setPredefinedType(IfcDoorTypeEnum::IfcDoorTypeEnum v);
     /// Type defining the general layout and operation of the door type in terms of the partitioning of panels and panel operations.
-    IfcDoorTypeOperationEnum::IfcDoorTypeOperationEnum OperationType();
+    IfcDoorTypeOperationEnum::IfcDoorTypeOperationEnum OperationType() const;
     void setOperationType(IfcDoorTypeOperationEnum::IfcDoorTypeOperationEnum v);
     /// Whether the optional attribute ParameterTakesPrecedence is defined for this IfcDoorType
-    bool hasParameterTakesPrecedence();
-    bool ParameterTakesPrecedence();
+    bool hasParameterTakesPrecedence() const;
+    bool ParameterTakesPrecedence() const;
     void setParameterTakesPrecedence(bool v);
     /// Whether the optional attribute UserDefinedOperationType is defined for this IfcDoorType
-    bool hasUserDefinedOperationType();
-    IfcLabel UserDefinedOperationType();
-    void setUserDefinedOperationType(IfcLabel v);
+    bool hasUserDefinedOperationType() const;
+    std::string UserDefinedOperationType() const;
+    void setUserDefinedOperationType(std::string v);
     virtual unsigned int getArgumentCount() const { return 13; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; case 10: return IfcUtil::Argument_ENUMERATION; case 11: return IfcUtil::Argument_BOOL; case 12: return IfcUtil::Argument_STRING; } return IfcBuildingElementType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcDoorTypeEnum; case 10: return Type::IfcDoorTypeOperationEnum; case 11: return Type::UNDEFINED; case 12: return Type::IfcLabel; } return IfcBuildingElementType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; case 10: return "OperationType"; case 11: return "ParameterTakesPrecedence"; case 12: return "UserDefinedOperationType"; } return IfcBuildingElementType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcDoorType (IfcAbstractEntityPtr e);
-    IfcDoorType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcDoorTypeEnum::IfcDoorTypeEnum v10_PredefinedType, IfcDoorTypeOperationEnum::IfcDoorTypeOperationEnum v11_OperationType, boost::optional< bool > v12_ParameterTakesPrecedence, boost::optional< IfcLabel > v13_UserDefinedOperationType);
-    typedef IfcDoorType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcDoorType > > list;
-    typedef IfcTemplatedEntityList< IfcDoorType >::it it;
+    IfcDoorType (IfcAbstractEntity* e);
+    IfcDoorType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcDoorTypeEnum::IfcDoorTypeEnum v10_PredefinedType, IfcDoorTypeOperationEnum::IfcDoorTypeOperationEnum v11_OperationType, boost::optional< bool > v12_ParameterTakesPrecedence, boost::optional< std::string > v13_UserDefinedOperationType);
+    typedef IfcTemplatedEntityList< IfcDoorType > list;
 };
 /// The draughting pre defined colour is a pre defined colour for the purpose to identify a colour by name. Allowable names are:
 /// 
@@ -30365,16 +31169,15 @@ class IfcDraughtingPreDefinedColour : public IfcPreDefinedColour {
 public:
     virtual unsigned int getArgumentCount() const { return 1; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcPreDefinedColour::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcPreDefinedColour::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcPreDefinedColour::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcDraughtingPreDefinedColour (IfcAbstractEntityPtr e);
-    IfcDraughtingPreDefinedColour (IfcLabel v1_Name);
-    typedef IfcDraughtingPreDefinedColour* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcDraughtingPreDefinedColour > > list;
-    typedef IfcTemplatedEntityList< IfcDraughtingPreDefinedColour >::it it;
+    IfcDraughtingPreDefinedColour (IfcAbstractEntity* e);
+    IfcDraughtingPreDefinedColour (std::string v1_Name);
+    typedef IfcTemplatedEntityList< IfcDraughtingPreDefinedColour > list;
 };
 /// The draughting predefined curve font type defines a selection of widely used curve fonts for draughting purposes by name. 
 /// 
@@ -30393,16 +31196,15 @@ class IfcDraughtingPreDefinedCurveFont : public IfcPreDefinedCurveFont {
 public:
     virtual unsigned int getArgumentCount() const { return 1; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcPreDefinedCurveFont::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcPreDefinedCurveFont::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcPreDefinedCurveFont::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcDraughtingPreDefinedCurveFont (IfcAbstractEntityPtr e);
-    IfcDraughtingPreDefinedCurveFont (IfcLabel v1_Name);
-    typedef IfcDraughtingPreDefinedCurveFont* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcDraughtingPreDefinedCurveFont > > list;
-    typedef IfcTemplatedEntityList< IfcDraughtingPreDefinedCurveFont >::it it;
+    IfcDraughtingPreDefinedCurveFont (IfcAbstractEntity* e);
+    IfcDraughtingPreDefinedCurveFont (std::string v1_Name);
+    typedef IfcTemplatedEntityList< IfcDraughtingPreDefinedCurveFont > list;
 };
 /// Definition from IAI: Generalization of all components
 /// that make up an AEC product. Those elements can be logically
@@ -30460,33 +31262,32 @@ class IfcDraughtingPreDefinedCurveFont : public IfcPreDefinedCurveFont {
 class IfcElement : public IfcProduct {
 public:
     /// Whether the optional attribute Tag is defined for this IfcElement
-    bool hasTag();
+    bool hasTag() const;
     /// The tag (or label) identifier at the particular instance of a product, e.g. the serial number, or the position number. It is the identifier at the occurrence level.
-    IfcIdentifier Tag();
-    void setTag(IfcIdentifier v);
+    std::string Tag() const;
+    void setTag(std::string v);
     virtual unsigned int getArgumentCount() const { return 8; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 7: return IfcUtil::Argument_STRING; } return IfcProduct::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 7: return Type::IfcIdentifier; } return IfcProduct::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 7: return "Tag"; } return IfcProduct::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelFillsElement > > FillsVoids(); // INVERSE IfcRelFillsElement::RelatedBuildingElement
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelConnectsElements > > ConnectedTo(); // INVERSE IfcRelConnectsElements::RelatingElement
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelInterferesElements > > IsInterferedByElements(); // INVERSE IfcRelInterferesElements::RelatedElement
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelInterferesElements > > InterferesElements(); // INVERSE IfcRelInterferesElements::RelatingElement
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelProjectsElement > > HasProjections(); // INVERSE IfcRelProjectsElement::RelatingElement
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelReferencedInSpatialStructure > > ReferencedInStructures(); // INVERSE IfcRelReferencedInSpatialStructure::RelatedElements
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelVoidsElement > > HasOpenings(); // INVERSE IfcRelVoidsElement::RelatingBuildingElement
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelConnectsWithRealizingElements > > IsConnectionRealization(); // INVERSE IfcRelConnectsWithRealizingElements::RealizingElements
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelSpaceBoundary > > ProvidesBoundaries(); // INVERSE IfcRelSpaceBoundary::RelatedBuildingElement
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelConnectsElements > > ConnectedFrom(); // INVERSE IfcRelConnectsElements::RelatedElement
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelContainedInSpatialStructure > > ContainedInStructure(); // INVERSE IfcRelContainedInSpatialStructure::RelatedElements
-    bool is(Type::Enum v) const;
-    Type::Enum type() const;
-    static Type::Enum Class();
-    IfcElement (IfcAbstractEntityPtr e);
-    IfcElement (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag);
-    typedef IfcElement* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcElement > > list;
-    typedef IfcTemplatedEntityList< IfcElement >::it it;
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcRelFillsElement >::ptr FillsVoids() const; // INVERSE IfcRelFillsElement::RelatedBuildingElement
+    IfcTemplatedEntityList< IfcRelConnectsElements >::ptr ConnectedTo() const; // INVERSE IfcRelConnectsElements::RelatingElement
+    IfcTemplatedEntityList< IfcRelInterferesElements >::ptr IsInterferedByElements() const; // INVERSE IfcRelInterferesElements::RelatedElement
+    IfcTemplatedEntityList< IfcRelInterferesElements >::ptr InterferesElements() const; // INVERSE IfcRelInterferesElements::RelatingElement
+    IfcTemplatedEntityList< IfcRelProjectsElement >::ptr HasProjections() const; // INVERSE IfcRelProjectsElement::RelatingElement
+    IfcTemplatedEntityList< IfcRelReferencedInSpatialStructure >::ptr ReferencedInStructures() const; // INVERSE IfcRelReferencedInSpatialStructure::RelatedElements
+    IfcTemplatedEntityList< IfcRelVoidsElement >::ptr HasOpenings() const; // INVERSE IfcRelVoidsElement::RelatingBuildingElement
+    IfcTemplatedEntityList< IfcRelConnectsWithRealizingElements >::ptr IsConnectionRealization() const; // INVERSE IfcRelConnectsWithRealizingElements::RealizingElements
+    IfcTemplatedEntityList< IfcRelSpaceBoundary >::ptr ProvidesBoundaries() const; // INVERSE IfcRelSpaceBoundary::RelatedBuildingElement
+    IfcTemplatedEntityList< IfcRelConnectsElements >::ptr ConnectedFrom() const; // INVERSE IfcRelConnectsElements::RelatedElement
+    IfcTemplatedEntityList< IfcRelContainedInSpatialStructure >::ptr ContainedInStructure() const; // INVERSE IfcRelContainedInSpatialStructure::RelatedElements
+    bool is(Type::Enum v) const;
+    Type::Enum type() const;
+    static Type::Enum Class();
+    IfcElement (IfcAbstractEntity* e);
+    IfcElement (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag);
+    typedef IfcTemplatedEntityList< IfcElement > list;
 };
 /// The IfcElementAssembly
 /// represents complex element assemblies aggregated from several
@@ -30585,29 +31386,28 @@ class IfcElement : public IfcProduct {
 class IfcElementAssembly : public IfcElement {
 public:
     /// Whether the optional attribute AssemblyPlace is defined for this IfcElementAssembly
-    bool hasAssemblyPlace();
+    bool hasAssemblyPlace() const;
     /// A designation of where the assembly is intended to take place defined by an Enum.
-    IfcAssemblyPlaceEnum::IfcAssemblyPlaceEnum AssemblyPlace();
+    IfcAssemblyPlaceEnum::IfcAssemblyPlaceEnum AssemblyPlace() const;
     void setAssemblyPlace(IfcAssemblyPlaceEnum::IfcAssemblyPlaceEnum v);
     /// Whether the optional attribute PredefinedType is defined for this IfcElementAssembly
-    bool hasPredefinedType();
+    bool hasPredefinedType() const;
     /// Predefined generic types for a element assembly that are specified in an enumeration. There might be property sets defined specifically for each predefined type.
     /// 
     /// IFC2x4 CHANGE  The attribute has been changed to be optional.
-    IfcElementAssemblyTypeEnum::IfcElementAssemblyTypeEnum PredefinedType();
+    IfcElementAssemblyTypeEnum::IfcElementAssemblyTypeEnum PredefinedType() const;
     void setPredefinedType(IfcElementAssemblyTypeEnum::IfcElementAssemblyTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_ENUMERATION; case 9: return IfcUtil::Argument_ENUMERATION; } return IfcElement::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcAssemblyPlaceEnum; case 9: return Type::IfcElementAssemblyTypeEnum; } return IfcElement::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "AssemblyPlace"; case 9: return "PredefinedType"; } return IfcElement::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcElementAssembly (IfcAbstractEntityPtr e);
-    IfcElementAssembly (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcAssemblyPlaceEnum::IfcAssemblyPlaceEnum > v9_AssemblyPlace, boost::optional< IfcElementAssemblyTypeEnum::IfcElementAssemblyTypeEnum > v10_PredefinedType);
-    typedef IfcElementAssembly* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcElementAssembly > > list;
-    typedef IfcTemplatedEntityList< IfcElementAssembly >::it it;
+    IfcElementAssembly (IfcAbstractEntity* e);
+    IfcElementAssembly (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcAssemblyPlaceEnum::IfcAssemblyPlaceEnum > v9_AssemblyPlace, boost::optional< IfcElementAssemblyTypeEnum::IfcElementAssemblyTypeEnum > v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcElementAssembly > list;
 };
 /// Definition from IAI: The IfcElementAssemblyType
 /// defines a list of commonly shared property set definitions of an
@@ -30634,20 +31434,19 @@ class IfcElementAssembly : public IfcElement {
 class IfcElementAssemblyType : public IfcElementType {
 public:
     /// Predefined types to define the particular type of the transport element. There may be property set definitions available for each predefined type.
-    IfcElementAssemblyTypeEnum::IfcElementAssemblyTypeEnum PredefinedType();
+    IfcElementAssemblyTypeEnum::IfcElementAssemblyTypeEnum PredefinedType() const;
     void setPredefinedType(IfcElementAssemblyTypeEnum::IfcElementAssemblyTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcElementType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcElementAssemblyTypeEnum; } return IfcElementType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcElementType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcElementAssemblyType (IfcAbstractEntityPtr e);
-    IfcElementAssemblyType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcElementAssemblyTypeEnum::IfcElementAssemblyTypeEnum v10_PredefinedType);
-    typedef IfcElementAssemblyType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcElementAssemblyType > > list;
-    typedef IfcTemplatedEntityList< IfcElementAssemblyType >::it it;
+    IfcElementAssemblyType (IfcAbstractEntity* e);
+    IfcElementAssemblyType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcElementAssemblyTypeEnum::IfcElementAssemblyTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcElementAssemblyType > list;
 };
 /// An element component is a representation for minor items included in, added to or connecting to or between
 ///   elements, which usually are not of interest from the overall building structure viewpoint.
@@ -30730,16 +31529,15 @@ class IfcElementComponent : public IfcElement {
 public:
     virtual unsigned int getArgumentCount() const { return 8; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcElement::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcElement::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcElement::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcElementComponent (IfcAbstractEntityPtr e);
-    IfcElementComponent (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag);
-    typedef IfcElementComponent* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcElementComponent > > list;
-    typedef IfcTemplatedEntityList< IfcElementComponent >::it it;
+    IfcElementComponent (IfcAbstractEntity* e);
+    IfcElementComponent (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag);
+    typedef IfcTemplatedEntityList< IfcElementComponent > list;
 };
 /// Definition from IAI:
 ///   The element type (IfcElementComponentType) represents the supertype for element 
@@ -30754,16 +31552,15 @@ class IfcElementComponentType : public IfcElementType {
 public:
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcElementType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcElementType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcElementType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcElementComponentType (IfcAbstractEntityPtr e);
-    IfcElementComponentType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType);
-    typedef IfcElementComponentType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcElementComponentType > > list;
-    typedef IfcTemplatedEntityList< IfcElementComponentType >::it it;
+    IfcElementComponentType (IfcAbstractEntity* e);
+    IfcElementComponentType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType);
+    typedef IfcTemplatedEntityList< IfcElementComponentType > list;
 };
 /// Definition from ISO/CD 10303-42:1992: An ellipse (IfcEllipse) is a conic section defined by the lengths of the semi-major and semi-minor diameters and the position (center or mid point of the line joining the foci) and orientation of the curve. Interpretation of the data shall be as follows:
 /// 
@@ -30795,23 +31592,22 @@ class IfcElementComponentType : public IfcElementType {
 class IfcEllipse : public IfcConic {
 public:
     /// The first radius of the ellipse which shall be positive. Placement.Axes[1] gives the direction of the SemiAxis1.
-    IfcPositiveLengthMeasure SemiAxis1();
-    void setSemiAxis1(IfcPositiveLengthMeasure v);
+    double SemiAxis1() const;
+    void setSemiAxis1(double v);
     /// The second radius of the ellipse which shall be positive.
-    IfcPositiveLengthMeasure SemiAxis2();
-    void setSemiAxis2(IfcPositiveLengthMeasure v);
+    double SemiAxis2() const;
+    void setSemiAxis2(double v);
     virtual unsigned int getArgumentCount() const { return 3; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 1: return IfcUtil::Argument_DOUBLE; case 2: return IfcUtil::Argument_DOUBLE; } return IfcConic::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 1: return Type::IfcPositiveLengthMeasure; case 2: return Type::IfcPositiveLengthMeasure; } return IfcConic::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 1: return "SemiAxis1"; case 2: return "SemiAxis2"; } return IfcConic::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcEllipse (IfcAbstractEntityPtr e);
-    IfcEllipse (IfcAxis2Placement v1_Position, IfcPositiveLengthMeasure v2_SemiAxis1, IfcPositiveLengthMeasure v3_SemiAxis2);
-    typedef IfcEllipse* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcEllipse > > list;
-    typedef IfcTemplatedEntityList< IfcEllipse >::it it;
+    IfcEllipse (IfcAbstractEntity* e);
+    IfcEllipse (IfcAxis2Placement* v1_Position, double v2_SemiAxis1, double v3_SemiAxis2);
+    typedef IfcTemplatedEntityList< IfcEllipse > list;
 };
 /// The element type IfcEnergyConversionType defines a list of commonly shared property
 ///   set definitions of an energy conversion device and an optional set of product representations.
@@ -30842,16 +31638,15 @@ class IfcEnergyConversionDeviceType : public IfcDistributionFlowElementType {
 public:
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcDistributionFlowElementType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcDistributionFlowElementType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcDistributionFlowElementType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcEnergyConversionDeviceType (IfcAbstractEntityPtr e);
-    IfcEnergyConversionDeviceType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType);
-    typedef IfcEnergyConversionDeviceType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcEnergyConversionDeviceType > > list;
-    typedef IfcTemplatedEntityList< IfcEnergyConversionDeviceType >::it it;
+    IfcEnergyConversionDeviceType (IfcAbstractEntity* e);
+    IfcEnergyConversionDeviceType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType);
+    typedef IfcTemplatedEntityList< IfcEnergyConversionDeviceType > list;
 };
 /// The energy conversion device type IfcEngineType defines commonly shared information for occurrences of engines.  The set of shared information may include: 
 /// 
@@ -30881,20 +31676,19 @@ class IfcEnergyConversionDeviceType : public IfcDistributionFlowElementType {
 /// The distribution ports relating to the IfcEngineType type are defined by IfcDistributionPort and attached by the IfcRelConnectsPortToElement relationship.  Ports are reflected at occurrences of this type using the IfcRelDefinesByObject relationship.  Refer to the documentation at IfcEngine for standard port definitions.
 class IfcEngineType : public IfcEnergyConversionDeviceType {
 public:
-    IfcEngineTypeEnum::IfcEngineTypeEnum PredefinedType();
+    IfcEngineTypeEnum::IfcEngineTypeEnum PredefinedType() const;
     void setPredefinedType(IfcEngineTypeEnum::IfcEngineTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcEnergyConversionDeviceType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcEngineTypeEnum; } return IfcEnergyConversionDeviceType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcEnergyConversionDeviceType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcEngineType (IfcAbstractEntityPtr e);
-    IfcEngineType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcEngineTypeEnum::IfcEngineTypeEnum v10_PredefinedType);
-    typedef IfcEngineType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcEngineType > > list;
-    typedef IfcTemplatedEntityList< IfcEngineType >::it it;
+    IfcEngineType (IfcAbstractEntity* e);
+    IfcEngineType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcEngineTypeEnum::IfcEngineTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcEngineType > list;
 };
 /// The energy conversion device type IfcEvaporativeCoolerType defines commonly shared information for occurrences of evaporative coolers.  The set of shared information may include: 
 /// 
@@ -30925,20 +31719,19 @@ class IfcEngineType : public IfcEnergyConversionDeviceType {
 class IfcEvaporativeCoolerType : public IfcEnergyConversionDeviceType {
 public:
     /// Defines the type of evaporative cooler.
-    IfcEvaporativeCoolerTypeEnum::IfcEvaporativeCoolerTypeEnum PredefinedType();
+    IfcEvaporativeCoolerTypeEnum::IfcEvaporativeCoolerTypeEnum PredefinedType() const;
     void setPredefinedType(IfcEvaporativeCoolerTypeEnum::IfcEvaporativeCoolerTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcEnergyConversionDeviceType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcEvaporativeCoolerTypeEnum; } return IfcEnergyConversionDeviceType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcEnergyConversionDeviceType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcEvaporativeCoolerType (IfcAbstractEntityPtr e);
-    IfcEvaporativeCoolerType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcEvaporativeCoolerTypeEnum::IfcEvaporativeCoolerTypeEnum v10_PredefinedType);
-    typedef IfcEvaporativeCoolerType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcEvaporativeCoolerType > > list;
-    typedef IfcTemplatedEntityList< IfcEvaporativeCoolerType >::it it;
+    IfcEvaporativeCoolerType (IfcAbstractEntity* e);
+    IfcEvaporativeCoolerType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcEvaporativeCoolerTypeEnum::IfcEvaporativeCoolerTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcEvaporativeCoolerType > list;
 };
 /// The energy conversion device type IfcEvaporatorType defines commonly shared information for occurrences of evaporators.  The set of shared information may include: 
 /// 
@@ -30969,20 +31762,19 @@ class IfcEvaporativeCoolerType : public IfcEnergyConversionDeviceType {
 class IfcEvaporatorType : public IfcEnergyConversionDeviceType {
 public:
     /// Defines the type of evaporator.
-    IfcEvaporatorTypeEnum::IfcEvaporatorTypeEnum PredefinedType();
+    IfcEvaporatorTypeEnum::IfcEvaporatorTypeEnum PredefinedType() const;
     void setPredefinedType(IfcEvaporatorTypeEnum::IfcEvaporatorTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcEnergyConversionDeviceType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcEvaporatorTypeEnum; } return IfcEnergyConversionDeviceType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcEnergyConversionDeviceType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcEvaporatorType (IfcAbstractEntityPtr e);
-    IfcEvaporatorType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcEvaporatorTypeEnum::IfcEvaporatorTypeEnum v10_PredefinedType);
-    typedef IfcEvaporatorType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcEvaporatorType > > list;
-    typedef IfcTemplatedEntityList< IfcEvaporatorType >::it it;
+    IfcEvaporatorType (IfcAbstractEntity* e);
+    IfcEvaporatorType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcEvaporatorTypeEnum::IfcEvaporatorTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcEvaporatorType > list;
 };
 /// An IfcEvent is something
 ///   that happens that triggers an action or response.
@@ -31064,41 +31856,40 @@ class IfcEvaporatorType : public IfcEnergyConversionDeviceType {
 class IfcEvent : public IfcProcess {
 public:
     /// Whether the optional attribute PredefinedType is defined for this IfcEvent
-    bool hasPredefinedType();
+    bool hasPredefinedType() const;
     /// Identifies the predefined types of an event from which 
     ///   the type required may be set.
-    IfcEventTypeEnum::IfcEventTypeEnum PredefinedType();
+    IfcEventTypeEnum::IfcEventTypeEnum PredefinedType() const;
     void setPredefinedType(IfcEventTypeEnum::IfcEventTypeEnum v);
     /// Whether the optional attribute EventTriggerType is defined for this IfcEvent
-    bool hasEventTriggerType();
+    bool hasEventTriggerType() const;
     /// Identifies the predefined types of event trigger from which 
     ///   the type required may be set.
-    IfcEventTriggerTypeEnum::IfcEventTriggerTypeEnum EventTriggerType();
+    IfcEventTriggerTypeEnum::IfcEventTriggerTypeEnum EventTriggerType() const;
     void setEventTriggerType(IfcEventTriggerTypeEnum::IfcEventTriggerTypeEnum v);
     /// Whether the optional attribute UserDefinedEventTriggerType is defined for this IfcEvent
-    bool hasUserDefinedEventTriggerType();
+    bool hasUserDefinedEventTriggerType() const;
     /// A user defined event trigger type, the value of which is 
     ///   asserted when the value of an event trigger type is declared 
     ///   as USERDEFINED.
-    IfcLabel UserDefinedEventTriggerType();
-    void setUserDefinedEventTriggerType(IfcLabel v);
+    std::string UserDefinedEventTriggerType() const;
+    void setUserDefinedEventTriggerType(std::string v);
     /// Whether the optional attribute EventOccurenceTime is defined for this IfcEvent
-    bool hasEventOccurenceTime();
+    bool hasEventOccurenceTime() const;
     /// The date and/or time at which an event occurs.
-    IfcEventTime* EventOccurenceTime();
+    IfcEventTime* EventOccurenceTime() const;
     void setEventOccurenceTime(IfcEventTime* v);
     virtual unsigned int getArgumentCount() const { return 11; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 7: return IfcUtil::Argument_ENUMERATION; case 8: return IfcUtil::Argument_ENUMERATION; case 9: return IfcUtil::Argument_STRING; case 10: return IfcUtil::Argument_ENTITY; } return IfcProcess::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 7: return Type::IfcEventTypeEnum; case 8: return Type::IfcEventTriggerTypeEnum; case 9: return Type::IfcLabel; case 10: return Type::IfcEventTime; } return IfcProcess::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 7: return "PredefinedType"; case 8: return "EventTriggerType"; case 9: return "UserDefinedEventTriggerType"; case 10: return "EventOccurenceTime"; } return IfcProcess::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcEvent (IfcAbstractEntityPtr e);
-    IfcEvent (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, boost::optional< IfcIdentifier > v6_Identification, boost::optional< IfcText > v7_LongDescription, boost::optional< IfcEventTypeEnum::IfcEventTypeEnum > v8_PredefinedType, boost::optional< IfcEventTriggerTypeEnum::IfcEventTriggerTypeEnum > v9_EventTriggerType, boost::optional< IfcLabel > v10_UserDefinedEventTriggerType, IfcEventTime* v11_EventOccurenceTime);
-    typedef IfcEvent* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcEvent > > list;
-    typedef IfcTemplatedEntityList< IfcEvent >::it it;
+    IfcEvent (IfcAbstractEntity* e);
+    IfcEvent (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, boost::optional< std::string > v6_Identification, boost::optional< std::string > v7_LongDescription, boost::optional< IfcEventTypeEnum::IfcEventTypeEnum > v8_PredefinedType, boost::optional< IfcEventTriggerTypeEnum::IfcEventTriggerTypeEnum > v9_EventTriggerType, boost::optional< std::string > v10_UserDefinedEventTriggerType, IfcEventTime* v11_EventOccurenceTime);
+    typedef IfcTemplatedEntityList< IfcEvent > list;
 };
 /// Definition from IAI: The external spatial structure
 /// element is an abstract entity provided for different kind of
@@ -31109,16 +31900,15 @@ class IfcExternalSpatialStructureElement : public IfcSpatialElement {
 public:
     virtual unsigned int getArgumentCount() const { return 8; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcSpatialElement::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcSpatialElement::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcSpatialElement::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcExternalSpatialStructureElement (IfcAbstractEntityPtr e);
-    IfcExternalSpatialStructureElement (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcLabel > v8_LongName);
-    typedef IfcExternalSpatialStructureElement* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcExternalSpatialStructureElement > > list;
-    typedef IfcTemplatedEntityList< IfcExternalSpatialStructureElement >::it it;
+    IfcExternalSpatialStructureElement (IfcAbstractEntity* e);
+    IfcExternalSpatialStructureElement (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_LongName);
+    typedef IfcTemplatedEntityList< IfcExternalSpatialStructureElement > list;
 };
 /// Definition from ISO/CD 10303-42:1992: A faceted B-rep
 /// is a simple form of boundary representation model in which all
@@ -31148,16 +31938,15 @@ class IfcFacetedBrep : public IfcManifoldSolidBrep {
 public:
     virtual unsigned int getArgumentCount() const { return 1; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcManifoldSolidBrep::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcManifoldSolidBrep::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcManifoldSolidBrep::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcFacetedBrep (IfcAbstractEntityPtr e);
+    IfcFacetedBrep (IfcAbstractEntity* e);
     IfcFacetedBrep (IfcClosedShell* v1_Outer);
-    typedef IfcFacetedBrep* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcFacetedBrep > > list;
-    typedef IfcTemplatedEntityList< IfcFacetedBrep >::it it;
+    typedef IfcTemplatedEntityList< IfcFacetedBrep > list;
 };
 /// The IfcFacetedBrepWithVoids
 /// is a specialization of a faceted B-rep which contains one or more
@@ -31186,20 +31975,19 @@ class IfcFacetedBrep : public IfcManifoldSolidBrep {
 class IfcFacetedBrepWithVoids : public IfcFacetedBrep {
 public:
     /// Set of closed shells defining voids within the solid.
-    SHARED_PTR< IfcTemplatedEntityList< IfcClosedShell > > Voids();
-    void setVoids(SHARED_PTR< IfcTemplatedEntityList< IfcClosedShell > > v);
+    IfcTemplatedEntityList< IfcClosedShell >::ptr Voids() const;
+    void setVoids(IfcTemplatedEntityList< IfcClosedShell >::ptr v);
     virtual unsigned int getArgumentCount() const { return 2; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 1: return IfcUtil::Argument_ENTITY_LIST; } return IfcFacetedBrep::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 1: return Type::IfcClosedShell; } return IfcFacetedBrep::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 1: return "Voids"; } return IfcFacetedBrep::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcFacetedBrepWithVoids (IfcAbstractEntityPtr e);
-    IfcFacetedBrepWithVoids (IfcClosedShell* v1_Outer, SHARED_PTR< IfcTemplatedEntityList< IfcClosedShell > > v2_Voids);
-    typedef IfcFacetedBrepWithVoids* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcFacetedBrepWithVoids > > list;
-    typedef IfcTemplatedEntityList< IfcFacetedBrepWithVoids >::it it;
+    IfcFacetedBrepWithVoids (IfcAbstractEntity* e);
+    IfcFacetedBrepWithVoids (IfcClosedShell* v1_Outer, IfcTemplatedEntityList< IfcClosedShell >::ptr v2_Voids);
+    typedef IfcTemplatedEntityList< IfcFacetedBrepWithVoids > list;
 };
 /// Definition from IAI:
 ///   Representations of fixing parts which are used as fasteners to connect or join elements with 
@@ -31212,22 +32000,21 @@ class IfcFacetedBrepWithVoids : public IfcFacetedBrep {
 class IfcFastener : public IfcElementComponent {
 public:
     /// Whether the optional attribute PredefinedType is defined for this IfcFastener
-    bool hasPredefinedType();
+    bool hasPredefinedType() const;
     /// Subtype of fastener
-    IfcFastenerTypeEnum::IfcFastenerTypeEnum PredefinedType();
+    IfcFastenerTypeEnum::IfcFastenerTypeEnum PredefinedType() const;
     void setPredefinedType(IfcFastenerTypeEnum::IfcFastenerTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_ENUMERATION; } return IfcElementComponent::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcFastenerTypeEnum; } return IfcElementComponent::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "PredefinedType"; } return IfcElementComponent::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcFastener (IfcAbstractEntityPtr e);
-    IfcFastener (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcFastenerTypeEnum::IfcFastenerTypeEnum > v9_PredefinedType);
-    typedef IfcFastener* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcFastener > > list;
-    typedef IfcTemplatedEntityList< IfcFastener >::it it;
+    IfcFastener (IfcAbstractEntity* e);
+    IfcFastener (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcFastenerTypeEnum::IfcFastenerTypeEnum > v9_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcFastener > list;
 };
 /// Definition from IAI:
 ///   The element type (IfcFastenerType) defines a list of commonly shared
@@ -31255,20 +32042,19 @@ class IfcFastener : public IfcElementComponent {
 class IfcFastenerType : public IfcElementComponentType {
 public:
     /// Subtype of fastener
-    IfcFastenerTypeEnum::IfcFastenerTypeEnum PredefinedType();
+    IfcFastenerTypeEnum::IfcFastenerTypeEnum PredefinedType() const;
     void setPredefinedType(IfcFastenerTypeEnum::IfcFastenerTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcElementComponentType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcFastenerTypeEnum; } return IfcElementComponentType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcElementComponentType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcFastenerType (IfcAbstractEntityPtr e);
-    IfcFastenerType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcFastenerTypeEnum::IfcFastenerTypeEnum v10_PredefinedType);
-    typedef IfcFastenerType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcFastenerType > > list;
-    typedef IfcTemplatedEntityList< IfcFastenerType >::it it;
+    IfcFastenerType (IfcAbstractEntity* e);
+    IfcFastenerType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcFastenerTypeEnum::IfcFastenerTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcFastenerType > list;
 };
 /// Definition from IAI: Generalization of all existence
 /// dependent elements which modify the shape and appearance of the
@@ -31368,16 +32154,15 @@ class IfcFeatureElement : public IfcElement {
 public:
     virtual unsigned int getArgumentCount() const { return 8; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcElement::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcElement::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcElement::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcFeatureElement (IfcAbstractEntityPtr e);
-    IfcFeatureElement (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag);
-    typedef IfcFeatureElement* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcFeatureElement > > list;
-    typedef IfcTemplatedEntityList< IfcFeatureElement >::it it;
+    IfcFeatureElement (IfcAbstractEntity* e);
+    IfcFeatureElement (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag);
+    typedef IfcTemplatedEntityList< IfcFeatureElement > list;
 };
 /// Definition from IAI: A specialization of the general
 ///   feature element, that represents an existence dependent
@@ -31438,17 +32223,16 @@ class IfcFeatureElementAddition : public IfcFeatureElement {
 public:
     virtual unsigned int getArgumentCount() const { return 8; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcFeatureElement::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcFeatureElement::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcFeatureElement::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelProjectsElement > > ProjectsElements(); // INVERSE IfcRelProjectsElement::RelatedFeatureElement
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcRelProjectsElement >::ptr ProjectsElements() const; // INVERSE IfcRelProjectsElement::RelatedFeatureElement
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcFeatureElementAddition (IfcAbstractEntityPtr e);
-    IfcFeatureElementAddition (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag);
-    typedef IfcFeatureElementAddition* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcFeatureElementAddition > > list;
-    typedef IfcTemplatedEntityList< IfcFeatureElementAddition >::it it;
+    IfcFeatureElementAddition (IfcAbstractEntity* e);
+    IfcFeatureElementAddition (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag);
+    typedef IfcTemplatedEntityList< IfcFeatureElementAddition > list;
 };
 /// The IfcFeatureElementSubtraction is specialization of
 /// the general feature element, that represents an existence dependent
@@ -31504,17 +32288,16 @@ class IfcFeatureElementSubtraction : public IfcFeatureElement {
 public:
     virtual unsigned int getArgumentCount() const { return 8; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcFeatureElement::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcFeatureElement::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcFeatureElement::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelVoidsElement > > VoidsElements(); // INVERSE IfcRelVoidsElement::RelatedOpeningElement
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcRelVoidsElement >::ptr VoidsElements() const; // INVERSE IfcRelVoidsElement::RelatedOpeningElement
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcFeatureElementSubtraction (IfcAbstractEntityPtr e);
-    IfcFeatureElementSubtraction (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag);
-    typedef IfcFeatureElementSubtraction* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcFeatureElementSubtraction > > list;
-    typedef IfcTemplatedEntityList< IfcFeatureElementSubtraction >::it it;
+    IfcFeatureElementSubtraction (IfcAbstractEntity* e);
+    IfcFeatureElementSubtraction (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag);
+    typedef IfcTemplatedEntityList< IfcFeatureElementSubtraction > list;
 };
 /// The element type IfcFlowControllerType defines a list of commonly shared property
 ///   set definitions of a flow controller and an optional set of product representations.
@@ -31544,16 +32327,15 @@ class IfcFlowControllerType : public IfcDistributionFlowElementType {
 public:
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcDistributionFlowElementType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcDistributionFlowElementType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcDistributionFlowElementType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcFlowControllerType (IfcAbstractEntityPtr e);
-    IfcFlowControllerType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType);
-    typedef IfcFlowControllerType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcFlowControllerType > > list;
-    typedef IfcTemplatedEntityList< IfcFlowControllerType >::it it;
+    IfcFlowControllerType (IfcAbstractEntity* e);
+    IfcFlowControllerType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType);
+    typedef IfcTemplatedEntityList< IfcFlowControllerType > list;
 };
 /// The element type IfcFlowFittingType defines a list of commonly shared property
 ///   set definitions of a flow fitting and an optional set of product representations.
@@ -31584,16 +32366,15 @@ class IfcFlowFittingType : public IfcDistributionFlowElementType {
 public:
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcDistributionFlowElementType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcDistributionFlowElementType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcDistributionFlowElementType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcFlowFittingType (IfcAbstractEntityPtr e);
-    IfcFlowFittingType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType);
-    typedef IfcFlowFittingType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcFlowFittingType > > list;
-    typedef IfcTemplatedEntityList< IfcFlowFittingType >::it it;
+    IfcFlowFittingType (IfcAbstractEntity* e);
+    IfcFlowFittingType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType);
+    typedef IfcTemplatedEntityList< IfcFlowFittingType > list;
 };
 /// The flow controller type IfcFlowMeterType defines commonly shared information for occurrences of flow meters.  The set of shared information may include: 
 /// 
@@ -31630,20 +32411,19 @@ class IfcFlowFittingType : public IfcDistributionFlowElementType {
 class IfcFlowMeterType : public IfcFlowControllerType {
 public:
     /// Defines the type of flow meter.
-    IfcFlowMeterTypeEnum::IfcFlowMeterTypeEnum PredefinedType();
+    IfcFlowMeterTypeEnum::IfcFlowMeterTypeEnum PredefinedType() const;
     void setPredefinedType(IfcFlowMeterTypeEnum::IfcFlowMeterTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcFlowControllerType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcFlowMeterTypeEnum; } return IfcFlowControllerType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcFlowControllerType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcFlowMeterType (IfcAbstractEntityPtr e);
-    IfcFlowMeterType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcFlowMeterTypeEnum::IfcFlowMeterTypeEnum v10_PredefinedType);
-    typedef IfcFlowMeterType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcFlowMeterType > > list;
-    typedef IfcTemplatedEntityList< IfcFlowMeterType >::it it;
+    IfcFlowMeterType (IfcAbstractEntity* e);
+    IfcFlowMeterType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcFlowMeterTypeEnum::IfcFlowMeterTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcFlowMeterType > list;
 };
 /// The element type IfcFlowMovingDeviceType defines a list of commonly shared property
 ///   set definitions of a flow moving device and an optional set of product representations.
@@ -31672,16 +32452,15 @@ class IfcFlowMovingDeviceType : public IfcDistributionFlowElementType {
 public:
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcDistributionFlowElementType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcDistributionFlowElementType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcDistributionFlowElementType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcFlowMovingDeviceType (IfcAbstractEntityPtr e);
-    IfcFlowMovingDeviceType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType);
-    typedef IfcFlowMovingDeviceType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcFlowMovingDeviceType > > list;
-    typedef IfcTemplatedEntityList< IfcFlowMovingDeviceType >::it it;
+    IfcFlowMovingDeviceType (IfcAbstractEntity* e);
+    IfcFlowMovingDeviceType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType);
+    typedef IfcTemplatedEntityList< IfcFlowMovingDeviceType > list;
 };
 /// The element type IfcFlowSegmentType defines a list of commonly shared property
 ///   set definitions of a flow segment and an optional set of product representations.
@@ -31719,16 +32498,15 @@ class IfcFlowSegmentType : public IfcDistributionFlowElementType {
 public:
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcDistributionFlowElementType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcDistributionFlowElementType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcDistributionFlowElementType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcFlowSegmentType (IfcAbstractEntityPtr e);
-    IfcFlowSegmentType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType);
-    typedef IfcFlowSegmentType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcFlowSegmentType > > list;
-    typedef IfcTemplatedEntityList< IfcFlowSegmentType >::it it;
+    IfcFlowSegmentType (IfcAbstractEntity* e);
+    IfcFlowSegmentType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType);
+    typedef IfcTemplatedEntityList< IfcFlowSegmentType > list;
 };
 /// The element type IfcFlowStorageDeviceType defines a list of commonly shared property set definitions of a flow storage device and an optional set of product representations.  It is used to define a flow storage device specification (the specific product information that is common to all occurrences of that product type). 
 /// 
@@ -31741,16 +32519,15 @@ class IfcFlowStorageDeviceType : public IfcDistributionFlowElementType {
 public:
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcDistributionFlowElementType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcDistributionFlowElementType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcDistributionFlowElementType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcFlowStorageDeviceType (IfcAbstractEntityPtr e);
-    IfcFlowStorageDeviceType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType);
-    typedef IfcFlowStorageDeviceType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcFlowStorageDeviceType > > list;
-    typedef IfcTemplatedEntityList< IfcFlowStorageDeviceType >::it it;
+    IfcFlowStorageDeviceType (IfcAbstractEntity* e);
+    IfcFlowStorageDeviceType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType);
+    typedef IfcTemplatedEntityList< IfcFlowStorageDeviceType > list;
 };
 /// The element type IfcFlowTerminalType defines a list of commonly shared property set definitions of a flow terminal and an optional set of product representations.  It is used to define a flow terminal specification (the specific product information that is common to all occurrences of that product type). 
 /// 
@@ -31763,16 +32540,15 @@ class IfcFlowTerminalType : public IfcDistributionFlowElementType {
 public:
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcDistributionFlowElementType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcDistributionFlowElementType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcDistributionFlowElementType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcFlowTerminalType (IfcAbstractEntityPtr e);
-    IfcFlowTerminalType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType);
-    typedef IfcFlowTerminalType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcFlowTerminalType > > list;
-    typedef IfcTemplatedEntityList< IfcFlowTerminalType >::it it;
+    IfcFlowTerminalType (IfcAbstractEntity* e);
+    IfcFlowTerminalType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType);
+    typedef IfcTemplatedEntityList< IfcFlowTerminalType > list;
 };
 /// The element type IfcFlowTreatmentDeviceType defines a list of commonly shared property set definitions of a flow treatment device and an optional set of product representations. It is used to define a flow treatment device specification (the specific product information that is common to all occurrences of that product type). 
 /// 
@@ -31787,16 +32563,15 @@ class IfcFlowTreatmentDeviceType : public IfcDistributionFlowElementType {
 public:
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcDistributionFlowElementType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcDistributionFlowElementType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcDistributionFlowElementType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcFlowTreatmentDeviceType (IfcAbstractEntityPtr e);
-    IfcFlowTreatmentDeviceType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType);
-    typedef IfcFlowTreatmentDeviceType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcFlowTreatmentDeviceType > > list;
-    typedef IfcTemplatedEntityList< IfcFlowTreatmentDeviceType >::it it;
+    IfcFlowTreatmentDeviceType (IfcAbstractEntity* e);
+    IfcFlowTreatmentDeviceType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType);
+    typedef IfcTemplatedEntityList< IfcFlowTreatmentDeviceType > list;
 };
 /// Definition from IAI: Provides shared material, decomposition, representation maps, and property sets for instances of IfcFooting.
 /// 
@@ -31810,20 +32585,19 @@ class IfcFlowTreatmentDeviceType : public IfcDistributionFlowElementType {
 class IfcFootingType : public IfcBuildingElementType {
 public:
     /// Subtype of footing.
-    IfcFootingTypeEnum::IfcFootingTypeEnum PredefinedType();
+    IfcFootingTypeEnum::IfcFootingTypeEnum PredefinedType() const;
     void setPredefinedType(IfcFootingTypeEnum::IfcFootingTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcBuildingElementType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcFootingTypeEnum; } return IfcBuildingElementType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcBuildingElementType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcFootingType (IfcAbstractEntityPtr e);
-    IfcFootingType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcFootingTypeEnum::IfcFootingTypeEnum v10_PredefinedType);
-    typedef IfcFootingType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcFootingType > > list;
-    typedef IfcTemplatedEntityList< IfcFootingType >::it it;
+    IfcFootingType (IfcAbstractEntity* e);
+    IfcFootingType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcFootingTypeEnum::IfcFootingTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcFootingType > list;
 };
 /// Definition from IAI: Generalization of all furniture
 /// related objects. Furnishing objects are characterized as
@@ -31933,16 +32707,15 @@ class IfcFurnishingElement : public IfcElement {
 public:
     virtual unsigned int getArgumentCount() const { return 8; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcElement::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcElement::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcElement::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcFurnishingElement (IfcAbstractEntityPtr e);
-    IfcFurnishingElement (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag);
-    typedef IfcFurnishingElement* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcFurnishingElement > > list;
-    typedef IfcTemplatedEntityList< IfcFurnishingElement >::it it;
+    IfcFurnishingElement (IfcAbstractEntity* e);
+    IfcFurnishingElement (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag);
+    typedef IfcTemplatedEntityList< IfcFurnishingElement > list;
 };
 /// Furniture defines complete furnishings such as a table, desk, chair, or cabinet, which may or may not be permanently attached to a building structure. 
 /// 
@@ -31978,21 +32751,20 @@ class IfcFurnishingElement : public IfcElement {
 class IfcFurniture : public IfcFurnishingElement {
 public:
     /// Whether the optional attribute PredefinedType is defined for this IfcFurniture
-    bool hasPredefinedType();
-    IfcFurnitureTypeEnum::IfcFurnitureTypeEnum PredefinedType();
+    bool hasPredefinedType() const;
+    IfcFurnitureTypeEnum::IfcFurnitureTypeEnum PredefinedType() const;
     void setPredefinedType(IfcFurnitureTypeEnum::IfcFurnitureTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_ENUMERATION; } return IfcFurnishingElement::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcFurnitureTypeEnum; } return IfcFurnishingElement::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "PredefinedType"; } return IfcFurnishingElement::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcFurniture (IfcAbstractEntityPtr e);
-    IfcFurniture (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcFurnitureTypeEnum::IfcFurnitureTypeEnum > v9_PredefinedType);
-    typedef IfcFurniture* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcFurniture > > list;
-    typedef IfcTemplatedEntityList< IfcFurniture >::it it;
+    IfcFurniture (IfcAbstractEntity* e);
+    IfcFurniture (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcFurnitureTypeEnum::IfcFurnitureTypeEnum > v9_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcFurniture > list;
 };
 /// Definition from IAI: An IfcGeographicElement is
 /// a generalization of all elements within a geographical landscape.
@@ -32137,22 +32909,21 @@ class IfcFurniture : public IfcFurnishingElement {
 class IfcGeographicElement : public IfcElement {
 public:
     /// Whether the optional attribute PredefinedType is defined for this IfcGeographicElement
-    bool hasPredefinedType();
+    bool hasPredefinedType() const;
     /// Predefined generic types for a geographic element that are specified in an enumeration. There might be property sets defined specifically for each predefined type.
-    IfcGeographicElementTypeEnum::IfcGeographicElementTypeEnum PredefinedType();
+    IfcGeographicElementTypeEnum::IfcGeographicElementTypeEnum PredefinedType() const;
     void setPredefinedType(IfcGeographicElementTypeEnum::IfcGeographicElementTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_ENUMERATION; } return IfcElement::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcGeographicElementTypeEnum; } return IfcElement::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "PredefinedType"; } return IfcElement::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcGeographicElement (IfcAbstractEntityPtr e);
-    IfcGeographicElement (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcGeographicElementTypeEnum::IfcGeographicElementTypeEnum > v9_PredefinedType);
-    typedef IfcGeographicElement* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcGeographicElement > > list;
-    typedef IfcTemplatedEntityList< IfcGeographicElement >::it it;
+    IfcGeographicElement (IfcAbstractEntity* e);
+    IfcGeographicElement (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcGeographicElementTypeEnum::IfcGeographicElementTypeEnum > v9_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcGeographicElement > list;
 };
 /// IfcGrid ia a planar design
 /// grid defined in 3D space used as an aid in locating structural and
@@ -32253,33 +33024,32 @@ class IfcGeographicElement : public IfcElement {
 class IfcGrid : public IfcProduct {
 public:
     /// List of grid axes defining the first row of grid lines.
-    SHARED_PTR< IfcTemplatedEntityList< IfcGridAxis > > UAxes();
-    void setUAxes(SHARED_PTR< IfcTemplatedEntityList< IfcGridAxis > > v);
+    IfcTemplatedEntityList< IfcGridAxis >::ptr UAxes() const;
+    void setUAxes(IfcTemplatedEntityList< IfcGridAxis >::ptr v);
     /// List of grid axes defining the second row of grid lines.
-    SHARED_PTR< IfcTemplatedEntityList< IfcGridAxis > > VAxes();
-    void setVAxes(SHARED_PTR< IfcTemplatedEntityList< IfcGridAxis > > v);
+    IfcTemplatedEntityList< IfcGridAxis >::ptr VAxes() const;
+    void setVAxes(IfcTemplatedEntityList< IfcGridAxis >::ptr v);
     /// Whether the optional attribute WAxes is defined for this IfcGrid
-    bool hasWAxes();
+    bool hasWAxes() const;
     /// List of grid axes defining the third row of grid lines. It may be given in the case of a triangular grid.
-    SHARED_PTR< IfcTemplatedEntityList< IfcGridAxis > > WAxes();
-    void setWAxes(SHARED_PTR< IfcTemplatedEntityList< IfcGridAxis > > v);
+    IfcTemplatedEntityList< IfcGridAxis >::ptr WAxes() const;
+    void setWAxes(IfcTemplatedEntityList< IfcGridAxis >::ptr v);
     /// Whether the optional attribute PredefinedType is defined for this IfcGrid
-    bool hasPredefinedType();
-    IfcGridTypeEnum::IfcGridTypeEnum PredefinedType();
+    bool hasPredefinedType() const;
+    IfcGridTypeEnum::IfcGridTypeEnum PredefinedType() const;
     void setPredefinedType(IfcGridTypeEnum::IfcGridTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 11; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 7: return IfcUtil::Argument_ENTITY_LIST; case 8: return IfcUtil::Argument_ENTITY_LIST; case 9: return IfcUtil::Argument_ENTITY_LIST; case 10: return IfcUtil::Argument_ENUMERATION; } return IfcProduct::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 7: return Type::IfcGridAxis; case 8: return Type::IfcGridAxis; case 9: return Type::IfcGridAxis; case 10: return Type::IfcGridTypeEnum; } return IfcProduct::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 7: return "UAxes"; case 8: return "VAxes"; case 9: return "WAxes"; case 10: return "PredefinedType"; } return IfcProduct::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelContainedInSpatialStructure > > ContainedInStructure(); // INVERSE IfcRelContainedInSpatialStructure::RelatedElements
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcRelContainedInSpatialStructure >::ptr ContainedInStructure() const; // INVERSE IfcRelContainedInSpatialStructure::RelatedElements
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcGrid (IfcAbstractEntityPtr e);
-    IfcGrid (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, SHARED_PTR< IfcTemplatedEntityList< IfcGridAxis > > v8_UAxes, SHARED_PTR< IfcTemplatedEntityList< IfcGridAxis > > v9_VAxes, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcGridAxis > > > v10_WAxes, boost::optional< IfcGridTypeEnum::IfcGridTypeEnum > v11_PredefinedType);
-    typedef IfcGrid* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcGrid > > list;
-    typedef IfcTemplatedEntityList< IfcGrid >::it it;
+    IfcGrid (IfcAbstractEntity* e);
+    IfcGrid (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcTemplatedEntityList< IfcGridAxis >::ptr v8_UAxes, IfcTemplatedEntityList< IfcGridAxis >::ptr v9_VAxes, boost::optional< IfcTemplatedEntityList< IfcGridAxis >::ptr > v10_WAxes, boost::optional< IfcGridTypeEnum::IfcGridTypeEnum > v11_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcGrid > list;
 };
 /// IfcGroup is an generalization of any arbitrary group. A group is a logical collection of objects. It does not have its own position, nor can it hold its own shape representation. Therefore a group is an aggregation under some non-geometrical / topological grouping aspects.
 /// 
@@ -32315,17 +33085,16 @@ class IfcGroup : public IfcObject {
 public:
     virtual unsigned int getArgumentCount() const { return 5; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcObject::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcObject::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcObject::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelAssignsToGroup > > IsGroupedBy(); // INVERSE IfcRelAssignsToGroup::RelatingGroup
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcRelAssignsToGroup >::ptr IsGroupedBy() const; // INVERSE IfcRelAssignsToGroup::RelatingGroup
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcGroup (IfcAbstractEntityPtr e);
-    IfcGroup (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType);
-    typedef IfcGroup* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcGroup > > list;
-    typedef IfcTemplatedEntityList< IfcGroup >::it it;
+    IfcGroup (IfcAbstractEntity* e);
+    IfcGroup (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType);
+    typedef IfcTemplatedEntityList< IfcGroup > list;
 };
 /// The energy conversion device type IfcHeatExchangerType defines commonly shared information for occurrences of heat exchangers.  The set of shared information may include: 
 /// 
@@ -32359,20 +33128,19 @@ class IfcGroup : public IfcObject {
 class IfcHeatExchangerType : public IfcEnergyConversionDeviceType {
 public:
     /// Defines the basic types of heat exchanger (e.g., plate, shell and tube, etc.).
-    IfcHeatExchangerTypeEnum::IfcHeatExchangerTypeEnum PredefinedType();
+    IfcHeatExchangerTypeEnum::IfcHeatExchangerTypeEnum PredefinedType() const;
     void setPredefinedType(IfcHeatExchangerTypeEnum::IfcHeatExchangerTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcEnergyConversionDeviceType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcHeatExchangerTypeEnum; } return IfcEnergyConversionDeviceType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcEnergyConversionDeviceType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcHeatExchangerType (IfcAbstractEntityPtr e);
-    IfcHeatExchangerType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcHeatExchangerTypeEnum::IfcHeatExchangerTypeEnum v10_PredefinedType);
-    typedef IfcHeatExchangerType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcHeatExchangerType > > list;
-    typedef IfcTemplatedEntityList< IfcHeatExchangerType >::it it;
+    IfcHeatExchangerType (IfcAbstractEntity* e);
+    IfcHeatExchangerType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcHeatExchangerTypeEnum::IfcHeatExchangerTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcHeatExchangerType > list;
 };
 /// The energy conversion device type IfcHumidifierType defines commonly shared information for occurrences of humidifiers.  The set of shared information may include: 
 /// 
@@ -32403,20 +33171,19 @@ class IfcHeatExchangerType : public IfcEnergyConversionDeviceType {
 class IfcHumidifierType : public IfcEnergyConversionDeviceType {
 public:
     /// Defines the type of humidifier.
-    IfcHumidifierTypeEnum::IfcHumidifierTypeEnum PredefinedType();
+    IfcHumidifierTypeEnum::IfcHumidifierTypeEnum PredefinedType() const;
     void setPredefinedType(IfcHumidifierTypeEnum::IfcHumidifierTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcEnergyConversionDeviceType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcHumidifierTypeEnum; } return IfcEnergyConversionDeviceType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcEnergyConversionDeviceType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcHumidifierType (IfcAbstractEntityPtr e);
-    IfcHumidifierType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcHumidifierTypeEnum::IfcHumidifierTypeEnum v10_PredefinedType);
-    typedef IfcHumidifierType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcHumidifierType > > list;
-    typedef IfcTemplatedEntityList< IfcHumidifierType >::it it;
+    IfcHumidifierType (IfcAbstractEntity* e);
+    IfcHumidifierType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcHumidifierTypeEnum::IfcHumidifierTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcHumidifierType > list;
 };
 /// The flow treatment device type IfcInterceptorType defines commonly shared information for occurrences of interceptors.  The set of shared information may include: 
 /// 
@@ -32453,20 +33220,19 @@ class IfcHumidifierType : public IfcEnergyConversionDeviceType {
 /// The distribution ports relating to the IfcInterceptorType type are defined by IfcDistributionPort and attached by the IfcRelConnectsPortToElement relationship.  Ports are reflected at occurrences of this type using the IfcRelDefinesByObject relationship.  Refer to the documentation at IfcInterceptor for standard port definitions.
 class IfcInterceptorType : public IfcFlowTreatmentDeviceType {
 public:
-    IfcInterceptorTypeEnum::IfcInterceptorTypeEnum PredefinedType();
+    IfcInterceptorTypeEnum::IfcInterceptorTypeEnum PredefinedType() const;
     void setPredefinedType(IfcInterceptorTypeEnum::IfcInterceptorTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcFlowTreatmentDeviceType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcInterceptorTypeEnum; } return IfcFlowTreatmentDeviceType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcFlowTreatmentDeviceType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcInterceptorType (IfcAbstractEntityPtr e);
-    IfcInterceptorType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcInterceptorTypeEnum::IfcInterceptorTypeEnum v10_PredefinedType);
-    typedef IfcInterceptorType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcInterceptorType > > list;
-    typedef IfcTemplatedEntityList< IfcInterceptorType >::it it;
+    IfcInterceptorType (IfcAbstractEntity* e);
+    IfcInterceptorType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcInterceptorTypeEnum::IfcInterceptorTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcInterceptorType > list;
 };
 /// An inventory is a list of items within an enterprise. 
 /// 
@@ -32482,51 +33248,50 @@ class IfcInterceptorType : public IfcFlowTreatmentDeviceType {
 class IfcInventory : public IfcGroup {
 public:
     /// Whether the optional attribute PredefinedType is defined for this IfcInventory
-    bool hasPredefinedType();
+    bool hasPredefinedType() const;
     /// A list of the types of inventories from which that required may be selected.
     /// 
     /// IFC2x4 CHANGE Attribute made optional.
-    IfcInventoryTypeEnum::IfcInventoryTypeEnum PredefinedType();
+    IfcInventoryTypeEnum::IfcInventoryTypeEnum PredefinedType() const;
     void setPredefinedType(IfcInventoryTypeEnum::IfcInventoryTypeEnum v);
     /// Whether the optional attribute Jurisdiction is defined for this IfcInventory
-    bool hasJurisdiction();
+    bool hasJurisdiction() const;
     /// The organizational unit to which the inventory is applicable.
-    IfcActorSelect Jurisdiction();
-    void setJurisdiction(IfcActorSelect v);
+    IfcActorSelect* Jurisdiction() const;
+    void setJurisdiction(IfcActorSelect* v);
     /// Whether the optional attribute ResponsiblePersons is defined for this IfcInventory
-    bool hasResponsiblePersons();
+    bool hasResponsiblePersons() const;
     /// Persons who are responsible for the inventory.
-    SHARED_PTR< IfcTemplatedEntityList< IfcPerson > > ResponsiblePersons();
-    void setResponsiblePersons(SHARED_PTR< IfcTemplatedEntityList< IfcPerson > > v);
+    IfcTemplatedEntityList< IfcPerson >::ptr ResponsiblePersons() const;
+    void setResponsiblePersons(IfcTemplatedEntityList< IfcPerson >::ptr v);
     /// Whether the optional attribute LastUpdateDate is defined for this IfcInventory
-    bool hasLastUpdateDate();
+    bool hasLastUpdateDate() const;
     /// The date on which the last update of the inventory was carried out.
     /// 
     /// IFC2x4 CHANGE Type changed from IfcDateTimeSelect.
-    IfcDate LastUpdateDate();
-    void setLastUpdateDate(IfcDate v);
+    std::string LastUpdateDate() const;
+    void setLastUpdateDate(std::string v);
     /// Whether the optional attribute CurrentValue is defined for this IfcInventory
-    bool hasCurrentValue();
+    bool hasCurrentValue() const;
     /// An estimate of the current cost value of the inventory.
-    IfcCostValue* CurrentValue();
+    IfcCostValue* CurrentValue() const;
     void setCurrentValue(IfcCostValue* v);
     /// Whether the optional attribute OriginalValue is defined for this IfcInventory
-    bool hasOriginalValue();
+    bool hasOriginalValue() const;
     /// An estimate of the original cost value of the inventory.
-    IfcCostValue* OriginalValue();
+    IfcCostValue* OriginalValue() const;
     void setOriginalValue(IfcCostValue* v);
     virtual unsigned int getArgumentCount() const { return 11; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 5: return IfcUtil::Argument_ENUMERATION; case 6: return IfcUtil::Argument_ENTITY; case 7: return IfcUtil::Argument_ENTITY_LIST; case 8: return IfcUtil::Argument_STRING; case 9: return IfcUtil::Argument_ENTITY; case 10: return IfcUtil::Argument_ENTITY; } return IfcGroup::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 5: return Type::IfcInventoryTypeEnum; case 6: return Type::IfcActorSelect; case 7: return Type::IfcPerson; case 8: return Type::IfcDate; case 9: return Type::IfcCostValue; case 10: return Type::IfcCostValue; } return IfcGroup::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 5: return "PredefinedType"; case 6: return "Jurisdiction"; case 7: return "ResponsiblePersons"; case 8: return "LastUpdateDate"; case 9: return "CurrentValue"; case 10: return "OriginalValue"; } return IfcGroup::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcInventory (IfcAbstractEntityPtr e);
-    IfcInventory (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, boost::optional< IfcInventoryTypeEnum::IfcInventoryTypeEnum > v6_PredefinedType, boost::optional< IfcActorSelect > v7_Jurisdiction, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPerson > > > v8_ResponsiblePersons, boost::optional< IfcDate > v9_LastUpdateDate, IfcCostValue* v10_CurrentValue, IfcCostValue* v11_OriginalValue);
-    typedef IfcInventory* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcInventory > > list;
-    typedef IfcTemplatedEntityList< IfcInventory >::it it;
+    IfcInventory (IfcAbstractEntity* e);
+    IfcInventory (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, boost::optional< IfcInventoryTypeEnum::IfcInventoryTypeEnum > v6_PredefinedType, IfcActorSelect* v7_Jurisdiction, boost::optional< IfcTemplatedEntityList< IfcPerson >::ptr > v8_ResponsiblePersons, boost::optional< std::string > v9_LastUpdateDate, IfcCostValue* v10_CurrentValue, IfcCostValue* v11_OriginalValue);
+    typedef IfcTemplatedEntityList< IfcInventory > list;
 };
 /// The flow fitting type IfcJunctionBoxType defines commonly shared information for occurrences of junction boxs.  The set of shared information may include: 
 /// 
@@ -32558,20 +33323,19 @@ class IfcInventory : public IfcGroup {
 class IfcJunctionBoxType : public IfcFlowFittingType {
 public:
     /// Identifies the predefined types of junction boxes from which the type required may be set.
-    IfcJunctionBoxTypeEnum::IfcJunctionBoxTypeEnum PredefinedType();
+    IfcJunctionBoxTypeEnum::IfcJunctionBoxTypeEnum PredefinedType() const;
     void setPredefinedType(IfcJunctionBoxTypeEnum::IfcJunctionBoxTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcFlowFittingType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcJunctionBoxTypeEnum; } return IfcFlowFittingType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcFlowFittingType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcJunctionBoxType (IfcAbstractEntityPtr e);
-    IfcJunctionBoxType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcJunctionBoxTypeEnum::IfcJunctionBoxTypeEnum v10_PredefinedType);
-    typedef IfcJunctionBoxType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcJunctionBoxType > > list;
-    typedef IfcTemplatedEntityList< IfcJunctionBoxType >::it it;
+    IfcJunctionBoxType (IfcAbstractEntity* e);
+    IfcJunctionBoxType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcJunctionBoxTypeEnum::IfcJunctionBoxTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcJunctionBoxType > list;
 };
 /// An IfcLaborResource is used in construction with particular skills or crafts required to perform certain types of construction or management related work.  
 /// 
@@ -32600,23 +33364,22 @@ class IfcJunctionBoxType : public IfcFlowFittingType {
 class IfcLaborResource : public IfcConstructionResource {
 public:
     /// Whether the optional attribute PredefinedType is defined for this IfcLaborResource
-    bool hasPredefinedType();
+    bool hasPredefinedType() const;
     /// Defines types of labor resources.
     /// IFC2x4 New attribute
-    IfcLaborResourceTypeEnum::IfcLaborResourceTypeEnum PredefinedType();
+    IfcLaborResourceTypeEnum::IfcLaborResourceTypeEnum PredefinedType() const;
     void setPredefinedType(IfcLaborResourceTypeEnum::IfcLaborResourceTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 11; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 10: return IfcUtil::Argument_ENUMERATION; } return IfcConstructionResource::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 10: return Type::IfcLaborResourceTypeEnum; } return IfcConstructionResource::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 10: return "PredefinedType"; } return IfcConstructionResource::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcLaborResource (IfcAbstractEntityPtr e);
-    IfcLaborResource (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, boost::optional< IfcIdentifier > v6_Identification, boost::optional< IfcText > v7_LongDescription, IfcResourceTime* v8_Usage, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcAppliedValue > > > v9_BaseCosts, IfcPhysicalQuantity* v10_BaseQuantity, boost::optional< IfcLaborResourceTypeEnum::IfcLaborResourceTypeEnum > v11_PredefinedType);
-    typedef IfcLaborResource* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcLaborResource > > list;
-    typedef IfcTemplatedEntityList< IfcLaborResource >::it it;
+    IfcLaborResource (IfcAbstractEntity* e);
+    IfcLaborResource (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, boost::optional< std::string > v6_Identification, boost::optional< std::string > v7_LongDescription, IfcResourceTime* v8_Usage, boost::optional< IfcTemplatedEntityList< IfcAppliedValue >::ptr > v9_BaseCosts, IfcPhysicalQuantity* v10_BaseQuantity, boost::optional< IfcLaborResourceTypeEnum::IfcLaborResourceTypeEnum > v11_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcLaborResource > list;
 };
 /// The flow terminal type IfcLampType defines commonly shared information for occurrences of lamps.  The set of shared information may include: 
 /// 
@@ -32650,20 +33413,19 @@ class IfcLaborResource : public IfcConstructionResource {
 class IfcLampType : public IfcFlowTerminalType {
 public:
     /// Identifies the predefined types of lamp from which the type required may be set.
-    IfcLampTypeEnum::IfcLampTypeEnum PredefinedType();
+    IfcLampTypeEnum::IfcLampTypeEnum PredefinedType() const;
     void setPredefinedType(IfcLampTypeEnum::IfcLampTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcFlowTerminalType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcLampTypeEnum; } return IfcFlowTerminalType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcFlowTerminalType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcLampType (IfcAbstractEntityPtr e);
-    IfcLampType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcLampTypeEnum::IfcLampTypeEnum v10_PredefinedType);
-    typedef IfcLampType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcLampType > > list;
-    typedef IfcTemplatedEntityList< IfcLampType >::it it;
+    IfcLampType (IfcAbstractEntity* e);
+    IfcLampType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcLampTypeEnum::IfcLampTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcLampType > list;
 };
 /// The flow terminal type IfcLightFixtureType defines commonly shared information for occurrences of light fixtures.  The set of shared information may include: 
 /// 
@@ -32699,20 +33461,19 @@ class IfcLampType : public IfcFlowTerminalType {
 class IfcLightFixtureType : public IfcFlowTerminalType {
 public:
     /// Identifies the predefined types of light fixture from which the type required may be set.
-    IfcLightFixtureTypeEnum::IfcLightFixtureTypeEnum PredefinedType();
+    IfcLightFixtureTypeEnum::IfcLightFixtureTypeEnum PredefinedType() const;
     void setPredefinedType(IfcLightFixtureTypeEnum::IfcLightFixtureTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcFlowTerminalType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcLightFixtureTypeEnum; } return IfcFlowTerminalType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcFlowTerminalType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcLightFixtureType (IfcAbstractEntityPtr e);
-    IfcLightFixtureType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcLightFixtureTypeEnum::IfcLightFixtureTypeEnum v10_PredefinedType);
-    typedef IfcLightFixtureType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcLightFixtureType > > list;
-    typedef IfcTemplatedEntityList< IfcLightFixtureType >::it it;
+    IfcLightFixtureType (IfcAbstractEntity* e);
+    IfcLightFixtureType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcLightFixtureTypeEnum::IfcLightFixtureTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcLightFixtureType > list;
 };
 /// Definition from IAI: Fasteners connecting building elements mechanically.  A single instance of this class may represent one or many of actual mechanical fasteners, for example an array of bolts or a row of nails.
 /// 
@@ -32746,30 +33507,29 @@ class IfcLightFixtureType : public IfcFlowTerminalType {
 class IfcMechanicalFastener : public IfcElementComponent {
 public:
     /// Whether the optional attribute NominalDiameter is defined for this IfcMechanicalFastener
-    bool hasNominalDiameter();
-    IfcPositiveLengthMeasure NominalDiameter();
-    void setNominalDiameter(IfcPositiveLengthMeasure v);
+    bool hasNominalDiameter() const;
+    double NominalDiameter() const;
+    void setNominalDiameter(double v);
     /// Whether the optional attribute NominalLength is defined for this IfcMechanicalFastener
-    bool hasNominalLength();
-    IfcPositiveLengthMeasure NominalLength();
-    void setNominalLength(IfcPositiveLengthMeasure v);
+    bool hasNominalLength() const;
+    double NominalLength() const;
+    void setNominalLength(double v);
     /// Whether the optional attribute PredefinedType is defined for this IfcMechanicalFastener
-    bool hasPredefinedType();
+    bool hasPredefinedType() const;
     /// Subtype of mechanical fastener
-    IfcMechanicalFastenerTypeEnum::IfcMechanicalFastenerTypeEnum PredefinedType();
+    IfcMechanicalFastenerTypeEnum::IfcMechanicalFastenerTypeEnum PredefinedType() const;
     void setPredefinedType(IfcMechanicalFastenerTypeEnum::IfcMechanicalFastenerTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 11; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_DOUBLE; case 9: return IfcUtil::Argument_DOUBLE; case 10: return IfcUtil::Argument_ENUMERATION; } return IfcElementComponent::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcPositiveLengthMeasure; case 9: return Type::IfcPositiveLengthMeasure; case 10: return Type::IfcMechanicalFastenerTypeEnum; } return IfcElementComponent::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "NominalDiameter"; case 9: return "NominalLength"; case 10: return "PredefinedType"; } return IfcElementComponent::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcMechanicalFastener (IfcAbstractEntityPtr e);
-    IfcMechanicalFastener (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcPositiveLengthMeasure > v9_NominalDiameter, boost::optional< IfcPositiveLengthMeasure > v10_NominalLength, boost::optional< IfcMechanicalFastenerTypeEnum::IfcMechanicalFastenerTypeEnum > v11_PredefinedType);
-    typedef IfcMechanicalFastener* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcMechanicalFastener > > list;
-    typedef IfcTemplatedEntityList< IfcMechanicalFastener >::it it;
+    IfcMechanicalFastener (IfcAbstractEntity* e);
+    IfcMechanicalFastener (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< double > v9_NominalDiameter, boost::optional< double > v10_NominalLength, boost::optional< IfcMechanicalFastenerTypeEnum::IfcMechanicalFastenerTypeEnum > v11_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcMechanicalFastener > list;
 };
 /// Definition from IAI: The element type (IfcMechanicalFastenerType) defines a list of commonly shared property set definitions of a fastener and an optional set of product representations. It is used to define mechanical fasteners mainly within structural and building services domains (i.e. the specific type information common to all occurrences of that type). 
 /// 
@@ -32809,30 +33569,29 @@ class IfcMechanicalFastener : public IfcElementComponent {
 class IfcMechanicalFastenerType : public IfcElementComponentType {
 public:
     /// Subtype of mechanical fastener
-    IfcMechanicalFastenerTypeEnum::IfcMechanicalFastenerTypeEnum PredefinedType();
+    IfcMechanicalFastenerTypeEnum::IfcMechanicalFastenerTypeEnum PredefinedType() const;
     void setPredefinedType(IfcMechanicalFastenerTypeEnum::IfcMechanicalFastenerTypeEnum v);
     /// Whether the optional attribute NominalDiameter is defined for this IfcMechanicalFastenerType
-    bool hasNominalDiameter();
+    bool hasNominalDiameter() const;
     /// The nominal diameter describing the cross-section size of the fastener type.
-    IfcPositiveLengthMeasure NominalDiameter();
-    void setNominalDiameter(IfcPositiveLengthMeasure v);
+    double NominalDiameter() const;
+    void setNominalDiameter(double v);
     /// Whether the optional attribute NominalLength is defined for this IfcMechanicalFastenerType
-    bool hasNominalLength();
+    bool hasNominalLength() const;
     /// The nominal length describing the longitudinal dimensions of the fastener type.
-    IfcPositiveLengthMeasure NominalLength();
-    void setNominalLength(IfcPositiveLengthMeasure v);
+    double NominalLength() const;
+    void setNominalLength(double v);
     virtual unsigned int getArgumentCount() const { return 12; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; case 10: return IfcUtil::Argument_DOUBLE; case 11: return IfcUtil::Argument_DOUBLE; } return IfcElementComponentType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcMechanicalFastenerTypeEnum; case 10: return Type::IfcPositiveLengthMeasure; case 11: return Type::IfcPositiveLengthMeasure; } return IfcElementComponentType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; case 10: return "NominalDiameter"; case 11: return "NominalLength"; } return IfcElementComponentType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcMechanicalFastenerType (IfcAbstractEntityPtr e);
-    IfcMechanicalFastenerType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcMechanicalFastenerTypeEnum::IfcMechanicalFastenerTypeEnum v10_PredefinedType, boost::optional< IfcPositiveLengthMeasure > v11_NominalDiameter, boost::optional< IfcPositiveLengthMeasure > v12_NominalLength);
-    typedef IfcMechanicalFastenerType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcMechanicalFastenerType > > list;
-    typedef IfcTemplatedEntityList< IfcMechanicalFastenerType >::it it;
+    IfcMechanicalFastenerType (IfcAbstractEntity* e);
+    IfcMechanicalFastenerType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcMechanicalFastenerTypeEnum::IfcMechanicalFastenerTypeEnum v10_PredefinedType, boost::optional< double > v11_NominalDiameter, boost::optional< double > v12_NominalLength);
+    typedef IfcTemplatedEntityList< IfcMechanicalFastenerType > list;
 };
 /// The flow terminal type IfcMedicalDeviceType defines commonly shared information for occurrences of medical devices.  The set of shared information may include: 
 /// 
@@ -32862,20 +33621,19 @@ class IfcMechanicalFastenerType : public IfcElementComponentType {
 /// The distribution ports relating to the IfcMedicalDeviceType type are defined by IfcDistributionPort and attached by the IfcRelConnectsPortToElement relationship.  Ports are reflected at occurrences of this type using the IfcRelDefinesByObject relationship.  Refer to the documentation at IfcMedicalDevice for standard port definitions.
 class IfcMedicalDeviceType : public IfcFlowTerminalType {
 public:
-    IfcMedicalDeviceTypeEnum::IfcMedicalDeviceTypeEnum PredefinedType();
+    IfcMedicalDeviceTypeEnum::IfcMedicalDeviceTypeEnum PredefinedType() const;
     void setPredefinedType(IfcMedicalDeviceTypeEnum::IfcMedicalDeviceTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcFlowTerminalType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcMedicalDeviceTypeEnum; } return IfcFlowTerminalType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcFlowTerminalType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcMedicalDeviceType (IfcAbstractEntityPtr e);
-    IfcMedicalDeviceType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcMedicalDeviceTypeEnum::IfcMedicalDeviceTypeEnum v10_PredefinedType);
-    typedef IfcMedicalDeviceType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcMedicalDeviceType > > list;
-    typedef IfcTemplatedEntityList< IfcMedicalDeviceType >::it it;
+    IfcMedicalDeviceType (IfcAbstractEntity* e);
+    IfcMedicalDeviceType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcMedicalDeviceTypeEnum::IfcMedicalDeviceTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcMedicalDeviceType > list;
 };
 /// Definition from IAI: The element type
 /// IfcMemberType defines commonly shared information for
@@ -32981,20 +33739,19 @@ class IfcMedicalDeviceType : public IfcFlowTerminalType {
 class IfcMemberType : public IfcBuildingElementType {
 public:
     /// Identifies the predefined types of a linear structural member element from which the type required may be set.
-    IfcMemberTypeEnum::IfcMemberTypeEnum PredefinedType();
+    IfcMemberTypeEnum::IfcMemberTypeEnum PredefinedType() const;
     void setPredefinedType(IfcMemberTypeEnum::IfcMemberTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcBuildingElementType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcMemberTypeEnum; } return IfcBuildingElementType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcBuildingElementType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcMemberType (IfcAbstractEntityPtr e);
-    IfcMemberType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcMemberTypeEnum::IfcMemberTypeEnum v10_PredefinedType);
-    typedef IfcMemberType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcMemberType > > list;
-    typedef IfcTemplatedEntityList< IfcMemberType >::it it;
+    IfcMemberType (IfcAbstractEntity* e);
+    IfcMemberType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcMemberTypeEnum::IfcMemberTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcMemberType > list;
 };
 /// The energy conversion device type IfcMotorConnectionType defines commonly shared information for occurrences of motor connections.  The set of shared information may include: 
 /// 
@@ -33026,20 +33783,19 @@ class IfcMemberType : public IfcBuildingElementType {
 class IfcMotorConnectionType : public IfcEnergyConversionDeviceType {
 public:
     /// Identifies the predefined types of motor connection from which the type required may be set.
-    IfcMotorConnectionTypeEnum::IfcMotorConnectionTypeEnum PredefinedType();
+    IfcMotorConnectionTypeEnum::IfcMotorConnectionTypeEnum PredefinedType() const;
     void setPredefinedType(IfcMotorConnectionTypeEnum::IfcMotorConnectionTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcEnergyConversionDeviceType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcMotorConnectionTypeEnum; } return IfcEnergyConversionDeviceType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcEnergyConversionDeviceType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcMotorConnectionType (IfcAbstractEntityPtr e);
-    IfcMotorConnectionType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcMotorConnectionTypeEnum::IfcMotorConnectionTypeEnum v10_PredefinedType);
-    typedef IfcMotorConnectionType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcMotorConnectionType > > list;
-    typedef IfcTemplatedEntityList< IfcMotorConnectionType >::it it;
+    IfcMotorConnectionType (IfcAbstractEntity* e);
+    IfcMotorConnectionType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcMotorConnectionTypeEnum::IfcMotorConnectionTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcMotorConnectionType > list;
 };
 /// An occupant is a type of actor that defines the form of occupancy of a property. 
 /// 
@@ -33051,24 +33807,23 @@ class IfcMotorConnectionType : public IfcEnergyConversionDeviceType {
 class IfcOccupant : public IfcActor {
 public:
     /// Whether the optional attribute PredefinedType is defined for this IfcOccupant
-    bool hasPredefinedType();
+    bool hasPredefinedType() const;
     /// Predefined occupant types from which that required may be set.
     /// 
     /// IFC2x4 CHANGE Attribute made optional.
-    IfcOccupantTypeEnum::IfcOccupantTypeEnum PredefinedType();
+    IfcOccupantTypeEnum::IfcOccupantTypeEnum PredefinedType() const;
     void setPredefinedType(IfcOccupantTypeEnum::IfcOccupantTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 7; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 6: return IfcUtil::Argument_ENUMERATION; } return IfcActor::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 6: return Type::IfcOccupantTypeEnum; } return IfcActor::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 6: return "PredefinedType"; } return IfcActor::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcOccupant (IfcAbstractEntityPtr e);
-    IfcOccupant (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcActorSelect v6_TheActor, boost::optional< IfcOccupantTypeEnum::IfcOccupantTypeEnum > v7_PredefinedType);
-    typedef IfcOccupant* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcOccupant > > list;
-    typedef IfcTemplatedEntityList< IfcOccupant >::it it;
+    IfcOccupant (IfcAbstractEntity* e);
+    IfcOccupant (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcActorSelect* v6_TheActor, boost::optional< IfcOccupantTypeEnum::IfcOccupantTypeEnum > v7_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcOccupant > list;
 };
 /// The opening element stands for
 /// opening, recess or chase, all reflecting voids. It represents a
@@ -33275,25 +34030,24 @@ class IfcOccupant : public IfcActor {
 class IfcOpeningElement : public IfcFeatureElementSubtraction {
 public:
     /// Whether the optional attribute PredefinedType is defined for this IfcOpeningElement
-    bool hasPredefinedType();
+    bool hasPredefinedType() const;
     /// Predefined generic type for an opening that is specified in an enumeration. There may be a property set given specificly for the predefined types.
     /// 
     /// IFC2x4 CHANGE  The attribute has been added at the end of the entity definition.
-    IfcOpeningElementTypeEnum::IfcOpeningElementTypeEnum PredefinedType();
+    IfcOpeningElementTypeEnum::IfcOpeningElementTypeEnum PredefinedType() const;
     void setPredefinedType(IfcOpeningElementTypeEnum::IfcOpeningElementTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_ENUMERATION; } return IfcFeatureElementSubtraction::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcOpeningElementTypeEnum; } return IfcFeatureElementSubtraction::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "PredefinedType"; } return IfcFeatureElementSubtraction::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelFillsElement > > HasFillings(); // INVERSE IfcRelFillsElement::RelatingOpeningElement
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcRelFillsElement >::ptr HasFillings() const; // INVERSE IfcRelFillsElement::RelatingOpeningElement
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcOpeningElement (IfcAbstractEntityPtr e);
-    IfcOpeningElement (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcOpeningElementTypeEnum::IfcOpeningElementTypeEnum > v9_PredefinedType);
-    typedef IfcOpeningElement* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcOpeningElement > > list;
-    typedef IfcTemplatedEntityList< IfcOpeningElement >::it it;
+    IfcOpeningElement (IfcAbstractEntity* e);
+    IfcOpeningElement (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcOpeningElementTypeEnum::IfcOpeningElementTypeEnum > v9_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcOpeningElement > list;
 };
 /// The standard opening,
 /// IfcOpeningStandardCase, defines an opening with certain
@@ -33392,16 +34146,15 @@ class IfcOpeningStandardCase : public IfcOpeningElement {
 public:
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcOpeningElement::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcOpeningElement::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcOpeningElement::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcOpeningStandardCase (IfcAbstractEntityPtr e);
-    IfcOpeningStandardCase (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcOpeningElementTypeEnum::IfcOpeningElementTypeEnum > v9_PredefinedType);
-    typedef IfcOpeningStandardCase* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcOpeningStandardCase > > list;
-    typedef IfcTemplatedEntityList< IfcOpeningStandardCase >::it it;
+    IfcOpeningStandardCase (IfcAbstractEntity* e);
+    IfcOpeningStandardCase (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcOpeningElementTypeEnum::IfcOpeningElementTypeEnum > v9_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcOpeningStandardCase > list;
 };
 /// The flow terminal type IfcOutletType defines commonly shared information for occurrences of outlets.  The set of shared information may include: 
 /// 
@@ -33435,20 +34188,19 @@ class IfcOpeningStandardCase : public IfcOpeningElement {
 class IfcOutletType : public IfcFlowTerminalType {
 public:
     /// Identifies the predefined types of outlet from which the type required may be set.
-    IfcOutletTypeEnum::IfcOutletTypeEnum PredefinedType();
+    IfcOutletTypeEnum::IfcOutletTypeEnum PredefinedType() const;
     void setPredefinedType(IfcOutletTypeEnum::IfcOutletTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcFlowTerminalType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcOutletTypeEnum; } return IfcFlowTerminalType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcFlowTerminalType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcOutletType (IfcAbstractEntityPtr e);
-    IfcOutletType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcOutletTypeEnum::IfcOutletTypeEnum v10_PredefinedType);
-    typedef IfcOutletType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcOutletType > > list;
-    typedef IfcTemplatedEntityList< IfcOutletType >::it it;
+    IfcOutletType (IfcAbstractEntity* e);
+    IfcOutletType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcOutletTypeEnum::IfcOutletTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcOutletType > list;
 };
 /// IfcPerformanceHistory is used to document the actual performance of an occurrence instance over time. In practice, performance-related data are generally not easy to obtain as they can originate from different sources (predicted, simulated, or measured) and occur during different stages of the building life-cycle. Such time-related data cover a large spectrum, including meteorological data, schedules, operational status measurements, trend reports, etc.
 /// 
@@ -33458,27 +34210,26 @@ class IfcOutletType : public IfcFlowTerminalType {
 class IfcPerformanceHistory : public IfcControl {
 public:
     /// Describes the applicable building life-cycle phase. Typical values should be DESIGNDEVELOPMENT, SCHEMATICDEVELOPMENT, CONSTRUCTIONDOCUMENT, CONSTRUCTION, ASBUILT, COMMISSIONING, OPERATION, etc.
-    IfcLabel LifeCyclePhase();
-    void setLifeCyclePhase(IfcLabel v);
+    std::string LifeCyclePhase() const;
+    void setLifeCyclePhase(std::string v);
     /// Whether the optional attribute PredefinedType is defined for this IfcPerformanceHistory
-    bool hasPredefinedType();
+    bool hasPredefinedType() const;
     /// Predefined generic type for a performace history that is specified in an enumeration.
     /// 
     /// IFC2x4 CHANGE  The attribute has been added at the end of the entity definition.
-    IfcPerformanceHistoryTypeEnum::IfcPerformanceHistoryTypeEnum PredefinedType();
+    IfcPerformanceHistoryTypeEnum::IfcPerformanceHistoryTypeEnum PredefinedType() const;
     void setPredefinedType(IfcPerformanceHistoryTypeEnum::IfcPerformanceHistoryTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 8; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 6: return IfcUtil::Argument_STRING; case 7: return IfcUtil::Argument_ENUMERATION; } return IfcControl::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 6: return Type::IfcLabel; case 7: return Type::IfcPerformanceHistoryTypeEnum; } return IfcControl::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 6: return "LifeCyclePhase"; case 7: return "PredefinedType"; } return IfcControl::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcPerformanceHistory (IfcAbstractEntityPtr e);
-    IfcPerformanceHistory (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, boost::optional< IfcIdentifier > v6_Identification, IfcLabel v7_LifeCyclePhase, boost::optional< IfcPerformanceHistoryTypeEnum::IfcPerformanceHistoryTypeEnum > v8_PredefinedType);
-    typedef IfcPerformanceHistory* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcPerformanceHistory > > list;
-    typedef IfcTemplatedEntityList< IfcPerformanceHistory >::it it;
+    IfcPerformanceHistory (IfcAbstractEntity* e);
+    IfcPerformanceHistory (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, boost::optional< std::string > v6_Identification, std::string v7_LifeCyclePhase, boost::optional< IfcPerformanceHistoryTypeEnum::IfcPerformanceHistoryTypeEnum > v8_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcPerformanceHistory > list;
 };
 /// This entity is a description of a panel within a
 /// door or window (as fillers for opening) which allows for air
@@ -33514,38 +34265,37 @@ class IfcPerformanceHistory : public IfcControl {
 class IfcPermeableCoveringProperties : public IfcPreDefinedPropertySet {
 public:
     /// Types of permeable covering operations. Also used to assign standard symbolic presentations according to national building standards.
-    IfcPermeableCoveringOperationEnum::IfcPermeableCoveringOperationEnum OperationType();
+    IfcPermeableCoveringOperationEnum::IfcPermeableCoveringOperationEnum OperationType() const;
     void setOperationType(IfcPermeableCoveringOperationEnum::IfcPermeableCoveringOperationEnum v);
     /// Position of this permeable covering panel within the overall window or door type.
-    IfcWindowPanelPositionEnum::IfcWindowPanelPositionEnum PanelPosition();
+    IfcWindowPanelPositionEnum::IfcWindowPanelPositionEnum PanelPosition() const;
     void setPanelPosition(IfcWindowPanelPositionEnum::IfcWindowPanelPositionEnum v);
     /// Whether the optional attribute FrameDepth is defined for this IfcPermeableCoveringProperties
-    bool hasFrameDepth();
+    bool hasFrameDepth() const;
     /// Depth of panel frame (used to include the permeable covering), measured from front face to back face horizontally (i.e. perpendicular to the window or door (elevation) plane.
-    IfcPositiveLengthMeasure FrameDepth();
-    void setFrameDepth(IfcPositiveLengthMeasure v);
+    double FrameDepth() const;
+    void setFrameDepth(double v);
     /// Whether the optional attribute FrameThickness is defined for this IfcPermeableCoveringProperties
-    bool hasFrameThickness();
+    bool hasFrameThickness() const;
     /// Width of panel frame (used to include the permeable covering), measured from inside of panel (at permeable covering) to outside of panel (at lining), i.e. parallel to the window or door (elevation) plane.
-    IfcPositiveLengthMeasure FrameThickness();
-    void setFrameThickness(IfcPositiveLengthMeasure v);
+    double FrameThickness() const;
+    void setFrameThickness(double v);
     /// Whether the optional attribute ShapeAspectStyle is defined for this IfcPermeableCoveringProperties
-    bool hasShapeAspectStyle();
+    bool hasShapeAspectStyle() const;
     /// Optional link to a shape aspect definition, which points to the part of the geometric representation of the window style, which is used to represent the permeable covering.
-    IfcShapeAspect* ShapeAspectStyle();
+    IfcShapeAspect* ShapeAspectStyle() const;
     void setShapeAspectStyle(IfcShapeAspect* v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 4: return IfcUtil::Argument_ENUMERATION; case 5: return IfcUtil::Argument_ENUMERATION; case 6: return IfcUtil::Argument_DOUBLE; case 7: return IfcUtil::Argument_DOUBLE; case 8: return IfcUtil::Argument_ENTITY; } return IfcPreDefinedPropertySet::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 4: return Type::IfcPermeableCoveringOperationEnum; case 5: return Type::IfcWindowPanelPositionEnum; case 6: return Type::IfcPositiveLengthMeasure; case 7: return Type::IfcPositiveLengthMeasure; case 8: return Type::IfcShapeAspect; } return IfcPreDefinedPropertySet::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 4: return "OperationType"; case 5: return "PanelPosition"; case 6: return "FrameDepth"; case 7: return "FrameThickness"; case 8: return "ShapeAspectStyle"; } return IfcPreDefinedPropertySet::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcPermeableCoveringProperties (IfcAbstractEntityPtr e);
-    IfcPermeableCoveringProperties (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, IfcPermeableCoveringOperationEnum::IfcPermeableCoveringOperationEnum v5_OperationType, IfcWindowPanelPositionEnum::IfcWindowPanelPositionEnum v6_PanelPosition, boost::optional< IfcPositiveLengthMeasure > v7_FrameDepth, boost::optional< IfcPositiveLengthMeasure > v8_FrameThickness, IfcShapeAspect* v9_ShapeAspectStyle);
-    typedef IfcPermeableCoveringProperties* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcPermeableCoveringProperties > > list;
-    typedef IfcTemplatedEntityList< IfcPermeableCoveringProperties >::it it;
+    IfcPermeableCoveringProperties (IfcAbstractEntity* e);
+    IfcPermeableCoveringProperties (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcPermeableCoveringOperationEnum::IfcPermeableCoveringOperationEnum v5_OperationType, IfcWindowPanelPositionEnum::IfcWindowPanelPositionEnum v6_PanelPosition, boost::optional< double > v7_FrameDepth, boost::optional< double > v8_FrameThickness, IfcShapeAspect* v9_ShapeAspectStyle);
+    typedef IfcTemplatedEntityList< IfcPermeableCoveringProperties > list;
 };
 /// A permit is a permission to perform work in places and on artifacts where regulatory, security or other access restrictions apply. 
 /// 
@@ -33587,38 +34337,37 @@ class IfcPermeableCoveringProperties : public IfcPreDefinedPropertySet {
 class IfcPermit : public IfcControl {
 public:
     /// Whether the optional attribute PredefinedType is defined for this IfcPermit
-    bool hasPredefinedType();
+    bool hasPredefinedType() const;
     /// Identifies the predefined types of permit that can be granted.
     /// 
     /// IFC2x4 CHANGE  The attribute has been added.
-    IfcPermitTypeEnum::IfcPermitTypeEnum PredefinedType();
+    IfcPermitTypeEnum::IfcPermitTypeEnum PredefinedType() const;
     void setPredefinedType(IfcPermitTypeEnum::IfcPermitTypeEnum v);
     /// Whether the optional attribute Status is defined for this IfcPermit
-    bool hasStatus();
+    bool hasStatus() const;
     /// The status currently assigned to the permit.
     /// 
     /// IFC2x4 CHANGE  The attribute has been added.
-    IfcLabel Status();
-    void setStatus(IfcLabel v);
+    std::string Status() const;
+    void setStatus(std::string v);
     /// Whether the optional attribute LongDescription is defined for this IfcPermit
-    bool hasLongDescription();
+    bool hasLongDescription() const;
     /// Detailed description of the request.
     /// 
     /// IFC2x4 CHANGE  The attribute has been added.
-    IfcText LongDescription();
-    void setLongDescription(IfcText v);
+    std::string LongDescription() const;
+    void setLongDescription(std::string v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 6: return IfcUtil::Argument_ENUMERATION; case 7: return IfcUtil::Argument_STRING; case 8: return IfcUtil::Argument_STRING; } return IfcControl::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 6: return Type::IfcPermitTypeEnum; case 7: return Type::IfcLabel; case 8: return Type::IfcText; } return IfcControl::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 6: return "PredefinedType"; case 7: return "Status"; case 8: return "LongDescription"; } return IfcControl::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcPermit (IfcAbstractEntityPtr e);
-    IfcPermit (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, boost::optional< IfcIdentifier > v6_Identification, boost::optional< IfcPermitTypeEnum::IfcPermitTypeEnum > v7_PredefinedType, boost::optional< IfcLabel > v8_Status, boost::optional< IfcText > v9_LongDescription);
-    typedef IfcPermit* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcPermit > > list;
-    typedef IfcTemplatedEntityList< IfcPermit >::it it;
+    IfcPermit (IfcAbstractEntity* e);
+    IfcPermit (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, boost::optional< std::string > v6_Identification, boost::optional< IfcPermitTypeEnum::IfcPermitTypeEnum > v7_PredefinedType, boost::optional< std::string > v8_Status, boost::optional< std::string > v9_LongDescription);
+    typedef IfcTemplatedEntityList< IfcPermit > list;
 };
 /// Definition from IAI: Provides shared material, decomposition, representation maps, and property sets for instances of IfcPile.
 /// 
@@ -33630,20 +34379,19 @@ class IfcPermit : public IfcControl {
 class IfcPileType : public IfcBuildingElementType {
 public:
     /// Subtype of pile.
-    IfcPileTypeEnum::IfcPileTypeEnum PredefinedType();
+    IfcPileTypeEnum::IfcPileTypeEnum PredefinedType() const;
     void setPredefinedType(IfcPileTypeEnum::IfcPileTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcBuildingElementType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcPileTypeEnum; } return IfcBuildingElementType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcBuildingElementType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcPileType (IfcAbstractEntityPtr e);
-    IfcPileType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcPileTypeEnum::IfcPileTypeEnum v10_PredefinedType);
-    typedef IfcPileType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcPileType > > list;
-    typedef IfcTemplatedEntityList< IfcPileType >::it it;
+    IfcPileType (IfcAbstractEntity* e);
+    IfcPileType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcPileTypeEnum::IfcPileTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcPileType > list;
 };
 /// The flow fitting type IfcPipeFittingType defines commonly shared information for occurrences of pipe fittings.  The set of shared information may include: 
 /// 
@@ -33677,20 +34425,19 @@ class IfcPileType : public IfcBuildingElementType {
 class IfcPipeFittingType : public IfcFlowFittingType {
 public:
     /// The type of pipe fitting.
-    IfcPipeFittingTypeEnum::IfcPipeFittingTypeEnum PredefinedType();
+    IfcPipeFittingTypeEnum::IfcPipeFittingTypeEnum PredefinedType() const;
     void setPredefinedType(IfcPipeFittingTypeEnum::IfcPipeFittingTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcFlowFittingType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcPipeFittingTypeEnum; } return IfcFlowFittingType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcFlowFittingType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcPipeFittingType (IfcAbstractEntityPtr e);
-    IfcPipeFittingType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcPipeFittingTypeEnum::IfcPipeFittingTypeEnum v10_PredefinedType);
-    typedef IfcPipeFittingType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcPipeFittingType > > list;
-    typedef IfcTemplatedEntityList< IfcPipeFittingType >::it it;
+    IfcPipeFittingType (IfcAbstractEntity* e);
+    IfcPipeFittingType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcPipeFittingTypeEnum::IfcPipeFittingTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcPipeFittingType > list;
 };
 /// The flow segment type IfcPipeSegmentType defines commonly shared information for occurrences of pipe segments.  The set of shared information may include: 
 /// 
@@ -33728,20 +34475,19 @@ class IfcPipeFittingType : public IfcFlowFittingType {
 class IfcPipeSegmentType : public IfcFlowSegmentType {
 public:
     /// The type of pipe segment.
-    IfcPipeSegmentTypeEnum::IfcPipeSegmentTypeEnum PredefinedType();
+    IfcPipeSegmentTypeEnum::IfcPipeSegmentTypeEnum PredefinedType() const;
     void setPredefinedType(IfcPipeSegmentTypeEnum::IfcPipeSegmentTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcFlowSegmentType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcPipeSegmentTypeEnum; } return IfcFlowSegmentType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcFlowSegmentType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcPipeSegmentType (IfcAbstractEntityPtr e);
-    IfcPipeSegmentType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcPipeSegmentTypeEnum::IfcPipeSegmentTypeEnum v10_PredefinedType);
-    typedef IfcPipeSegmentType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcPipeSegmentType > > list;
-    typedef IfcTemplatedEntityList< IfcPipeSegmentType >::it it;
+    IfcPipeSegmentType (IfcAbstractEntity* e);
+    IfcPipeSegmentType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcPipeSegmentTypeEnum::IfcPipeSegmentTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcPipeSegmentType > list;
 };
 /// The element type IfcPlateType defines commonly shared
 /// information for occurrences of plates. The set of shared
@@ -33823,20 +34569,19 @@ class IfcPipeSegmentType : public IfcFlowSegmentType {
 class IfcPlateType : public IfcBuildingElementType {
 public:
     /// Identifies the predefined types of a planar member element from which the type required may be set.
-    IfcPlateTypeEnum::IfcPlateTypeEnum PredefinedType();
+    IfcPlateTypeEnum::IfcPlateTypeEnum PredefinedType() const;
     void setPredefinedType(IfcPlateTypeEnum::IfcPlateTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcBuildingElementType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcPlateTypeEnum; } return IfcBuildingElementType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcBuildingElementType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcPlateType (IfcAbstractEntityPtr e);
-    IfcPlateType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcPlateTypeEnum::IfcPlateTypeEnum v10_PredefinedType);
-    typedef IfcPlateType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcPlateType > > list;
-    typedef IfcTemplatedEntityList< IfcPlateType >::it it;
+    IfcPlateType (IfcAbstractEntity* e);
+    IfcPlateType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcPlateTypeEnum::IfcPlateTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcPlateType > list;
 };
 /// Definition from ISO/CD 10303-42:1992: A polyline
 ///   is a bounded curve of n - 1 linear segments, defined by a
@@ -33855,20 +34600,19 @@ class IfcPlateType : public IfcBuildingElementType {
 class IfcPolyline : public IfcBoundedCurve {
 public:
     /// The points defining the polyline.
-    SHARED_PTR< IfcTemplatedEntityList< IfcCartesianPoint > > Points();
-    void setPoints(SHARED_PTR< IfcTemplatedEntityList< IfcCartesianPoint > > v);
+    IfcTemplatedEntityList< IfcCartesianPoint >::ptr Points() const;
+    void setPoints(IfcTemplatedEntityList< IfcCartesianPoint >::ptr v);
     virtual unsigned int getArgumentCount() const { return 1; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY_LIST; } return IfcBoundedCurve::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcCartesianPoint; } return IfcBoundedCurve::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Points"; } return IfcBoundedCurve::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcPolyline (IfcAbstractEntityPtr e);
-    IfcPolyline (SHARED_PTR< IfcTemplatedEntityList< IfcCartesianPoint > > v1_Points);
-    typedef IfcPolyline* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcPolyline > > list;
-    typedef IfcTemplatedEntityList< IfcPolyline >::it it;
+    IfcPolyline (IfcAbstractEntity* e);
+    IfcPolyline (IfcTemplatedEntityList< IfcCartesianPoint >::ptr v1_Points);
+    typedef IfcTemplatedEntityList< IfcPolyline > list;
 };
 /// Definition from IAI: An IfcPort provides the
 ///   means for an element to connect to other elements.
@@ -33927,19 +34671,18 @@ class IfcPort : public IfcProduct {
 public:
     virtual unsigned int getArgumentCount() const { return 7; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcProduct::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcProduct::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcProduct::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelConnectsPortToElement > > ContainedIn(); // INVERSE IfcRelConnectsPortToElement::RelatingPort
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelConnectsPorts > > ConnectedFrom(); // INVERSE IfcRelConnectsPorts::RelatedPort
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelConnectsPorts > > ConnectedTo(); // INVERSE IfcRelConnectsPorts::RelatingPort
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcRelConnectsPortToElement >::ptr ContainedIn() const; // INVERSE IfcRelConnectsPortToElement::RelatingPort
+    IfcTemplatedEntityList< IfcRelConnectsPorts >::ptr ConnectedFrom() const; // INVERSE IfcRelConnectsPorts::RelatedPort
+    IfcTemplatedEntityList< IfcRelConnectsPorts >::ptr ConnectedTo() const; // INVERSE IfcRelConnectsPorts::RelatingPort
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcPort (IfcAbstractEntityPtr e);
-    IfcPort (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation);
-    typedef IfcPort* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcPort > > list;
-    typedef IfcTemplatedEntityList< IfcPort >::it it;
+    IfcPort (IfcAbstractEntity* e);
+    IfcPort (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation);
+    typedef IfcTemplatedEntityList< IfcPort > list;
 };
 /// An IfcProcedure is a
 ///   logical set of actions to be taken in response to an event
@@ -34048,23 +34791,22 @@ class IfcPort : public IfcProduct {
 class IfcProcedure : public IfcProcess {
 public:
     /// Whether the optional attribute PredefinedType is defined for this IfcProcedure
-    bool hasPredefinedType();
+    bool hasPredefinedType() const;
     /// Identifies the predefined types of a procedure from which 
     ///   the type required may be set.
-    IfcProcedureTypeEnum::IfcProcedureTypeEnum PredefinedType();
+    IfcProcedureTypeEnum::IfcProcedureTypeEnum PredefinedType() const;
     void setPredefinedType(IfcProcedureTypeEnum::IfcProcedureTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 8; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 7: return IfcUtil::Argument_ENUMERATION; } return IfcProcess::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 7: return Type::IfcProcedureTypeEnum; } return IfcProcess::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 7: return "PredefinedType"; } return IfcProcess::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcProcedure (IfcAbstractEntityPtr e);
-    IfcProcedure (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, boost::optional< IfcIdentifier > v6_Identification, boost::optional< IfcText > v7_LongDescription, boost::optional< IfcProcedureTypeEnum::IfcProcedureTypeEnum > v8_PredefinedType);
-    typedef IfcProcedure* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcProcedure > > list;
-    typedef IfcTemplatedEntityList< IfcProcedure >::it it;
+    IfcProcedure (IfcAbstractEntity* e);
+    IfcProcedure (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, boost::optional< std::string > v6_Identification, boost::optional< std::string > v7_LongDescription, boost::optional< IfcProcedureTypeEnum::IfcProcedureTypeEnum > v8_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcProcedure > list;
 };
 /// A project order is a directive to purchase products and/or perform work, such as for construction or facilities management. 
 /// 
@@ -34112,14 +34854,14 @@ class IfcProcedure : public IfcProcess {
 class IfcProjectOrder : public IfcControl {
 public:
     /// Whether the optional attribute PredefinedType is defined for this IfcProjectOrder
-    bool hasPredefinedType();
+    bool hasPredefinedType() const;
     /// Predefined generic type for a project order that is specified in an enumeration. There may be a property set given specificly for the predefined types.
     /// 
     /// IFC2x4 CHANGE  The attribute has been made optional.
-    IfcProjectOrderTypeEnum::IfcProjectOrderTypeEnum PredefinedType();
+    IfcProjectOrderTypeEnum::IfcProjectOrderTypeEnum PredefinedType() const;
     void setPredefinedType(IfcProjectOrderTypeEnum::IfcProjectOrderTypeEnum v);
     /// Whether the optional attribute Status is defined for this IfcProjectOrder
-    bool hasStatus();
+    bool hasStatus() const;
     /// The current status of a project order.Examples of status values that might be used for a project order status include:
     /// 
     /// PLANNED
@@ -34129,25 +34871,24 @@ class IfcProjectOrder : public IfcControl {
     /// STARTED
     /// DELAYED
     /// DONE
-    IfcLabel Status();
-    void setStatus(IfcLabel v);
+    std::string Status() const;
+    void setStatus(std::string v);
     /// Whether the optional attribute LongDescription is defined for this IfcProjectOrder
-    bool hasLongDescription();
+    bool hasLongDescription() const;
     /// A detailed description of the project order describing the work to be completed.
-    IfcText LongDescription();
-    void setLongDescription(IfcText v);
+    std::string LongDescription() const;
+    void setLongDescription(std::string v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 6: return IfcUtil::Argument_ENUMERATION; case 7: return IfcUtil::Argument_STRING; case 8: return IfcUtil::Argument_STRING; } return IfcControl::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 6: return Type::IfcProjectOrderTypeEnum; case 7: return Type::IfcLabel; case 8: return Type::IfcText; } return IfcControl::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 6: return "PredefinedType"; case 7: return "Status"; case 8: return "LongDescription"; } return IfcControl::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcProjectOrder (IfcAbstractEntityPtr e);
-    IfcProjectOrder (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, boost::optional< IfcIdentifier > v6_Identification, boost::optional< IfcProjectOrderTypeEnum::IfcProjectOrderTypeEnum > v7_PredefinedType, boost::optional< IfcLabel > v8_Status, boost::optional< IfcText > v9_LongDescription);
-    typedef IfcProjectOrder* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcProjectOrder > > list;
-    typedef IfcTemplatedEntityList< IfcProjectOrder >::it it;
+    IfcProjectOrder (IfcAbstractEntity* e);
+    IfcProjectOrder (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, boost::optional< std::string > v6_Identification, boost::optional< IfcProjectOrderTypeEnum::IfcProjectOrderTypeEnum > v7_PredefinedType, boost::optional< std::string > v8_Status, boost::optional< std::string > v9_LongDescription);
+    typedef IfcTemplatedEntityList< IfcProjectOrder > list;
 };
 /// The projection element is a
 /// specialization of the general feature element to represent
@@ -34259,24 +35000,23 @@ class IfcProjectOrder : public IfcControl {
 class IfcProjectionElement : public IfcFeatureElementAddition {
 public:
     /// Whether the optional attribute PredefinedType is defined for this IfcProjectionElement
-    bool hasPredefinedType();
+    bool hasPredefinedType() const;
     /// Predefined generic type for a projection element that is specified in an enumeration. There may be a property set given specificly for the predefined types.
     /// 
     /// IFC2x4 CHANGE  The attribute has been added at the end of the entity definition.
-    IfcProjectionElementTypeEnum::IfcProjectionElementTypeEnum PredefinedType();
+    IfcProjectionElementTypeEnum::IfcProjectionElementTypeEnum PredefinedType() const;
     void setPredefinedType(IfcProjectionElementTypeEnum::IfcProjectionElementTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_ENUMERATION; } return IfcFeatureElementAddition::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcProjectionElementTypeEnum; } return IfcFeatureElementAddition::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "PredefinedType"; } return IfcFeatureElementAddition::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcProjectionElement (IfcAbstractEntityPtr e);
-    IfcProjectionElement (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcProjectionElementTypeEnum::IfcProjectionElementTypeEnum > v9_PredefinedType);
-    typedef IfcProjectionElement* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcProjectionElement > > list;
-    typedef IfcTemplatedEntityList< IfcProjectionElement >::it it;
+    IfcProjectionElement (IfcAbstractEntity* e);
+    IfcProjectionElement (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcProjectionElementTypeEnum::IfcProjectionElementTypeEnum > v9_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcProjectionElement > list;
 };
 /// The flow controller type IfcProtectiveDeviceType defines commonly shared information for occurrences of protective devices.  The set of shared information may include: 
 /// 
@@ -34316,20 +35056,19 @@ class IfcProjectionElement : public IfcFeatureElementAddition {
 class IfcProtectiveDeviceType : public IfcFlowControllerType {
 public:
     /// Identifies the predefined types of protective device from which the type required may be set.
-    IfcProtectiveDeviceTypeEnum::IfcProtectiveDeviceTypeEnum PredefinedType();
+    IfcProtectiveDeviceTypeEnum::IfcProtectiveDeviceTypeEnum PredefinedType() const;
     void setPredefinedType(IfcProtectiveDeviceTypeEnum::IfcProtectiveDeviceTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcFlowControllerType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcProtectiveDeviceTypeEnum; } return IfcFlowControllerType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcFlowControllerType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcProtectiveDeviceType (IfcAbstractEntityPtr e);
-    IfcProtectiveDeviceType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcProtectiveDeviceTypeEnum::IfcProtectiveDeviceTypeEnum v10_PredefinedType);
-    typedef IfcProtectiveDeviceType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcProtectiveDeviceType > > list;
-    typedef IfcTemplatedEntityList< IfcProtectiveDeviceType >::it it;
+    IfcProtectiveDeviceType (IfcAbstractEntity* e);
+    IfcProtectiveDeviceType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcProtectiveDeviceTypeEnum::IfcProtectiveDeviceTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcProtectiveDeviceType > list;
 };
 /// The flow moving device type IfcPumpType defines commonly shared information for occurrences of pumps.  The set of shared information may include: 
 /// 
@@ -34362,20 +35101,19 @@ class IfcProtectiveDeviceType : public IfcFlowControllerType {
 class IfcPumpType : public IfcFlowMovingDeviceType {
 public:
     /// Defines the type of pump typically used in building services.
-    IfcPumpTypeEnum::IfcPumpTypeEnum PredefinedType();
+    IfcPumpTypeEnum::IfcPumpTypeEnum PredefinedType() const;
     void setPredefinedType(IfcPumpTypeEnum::IfcPumpTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcFlowMovingDeviceType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcPumpTypeEnum; } return IfcFlowMovingDeviceType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcFlowMovingDeviceType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcPumpType (IfcAbstractEntityPtr e);
-    IfcPumpType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcPumpTypeEnum::IfcPumpTypeEnum v10_PredefinedType);
-    typedef IfcPumpType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcPumpType > > list;
-    typedef IfcTemplatedEntityList< IfcPumpType >::it it;
+    IfcPumpType (IfcAbstractEntity* e);
+    IfcPumpType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcPumpTypeEnum::IfcPumpTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcPumpType > list;
 };
 /// Definition from IAI: The element type (IfcRailingType)
 ///   defines a list of commonly shared property set definitions of a railing element
@@ -34400,20 +35138,19 @@ class IfcPumpType : public IfcFlowMovingDeviceType {
 class IfcRailingType : public IfcBuildingElementType {
 public:
     /// Identifies the predefined types of a railing element from which the type required may be set.
-    IfcRailingTypeEnum::IfcRailingTypeEnum PredefinedType();
+    IfcRailingTypeEnum::IfcRailingTypeEnum PredefinedType() const;
     void setPredefinedType(IfcRailingTypeEnum::IfcRailingTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcBuildingElementType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcRailingTypeEnum; } return IfcBuildingElementType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcBuildingElementType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRailingType (IfcAbstractEntityPtr e);
-    IfcRailingType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcRailingTypeEnum::IfcRailingTypeEnum v10_PredefinedType);
-    typedef IfcRailingType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRailingType > > list;
-    typedef IfcTemplatedEntityList< IfcRailingType >::it it;
+    IfcRailingType (IfcAbstractEntity* e);
+    IfcRailingType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcRailingTypeEnum::IfcRailingTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcRailingType > list;
 };
 /// Definition from IAI: The element type (IfcRampFlightType)
 ///   defines a list of commonly shared property set definitions of a ramp flight and
@@ -34438,20 +35175,19 @@ class IfcRailingType : public IfcBuildingElementType {
 class IfcRampFlightType : public IfcBuildingElementType {
 public:
     /// Identifies the predefined types of a ramp flight element from which the type required may be set.
-    IfcRampFlightTypeEnum::IfcRampFlightTypeEnum PredefinedType();
+    IfcRampFlightTypeEnum::IfcRampFlightTypeEnum PredefinedType() const;
     void setPredefinedType(IfcRampFlightTypeEnum::IfcRampFlightTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcBuildingElementType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcRampFlightTypeEnum; } return IfcBuildingElementType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcBuildingElementType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRampFlightType (IfcAbstractEntityPtr e);
-    IfcRampFlightType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcRampFlightTypeEnum::IfcRampFlightTypeEnum v10_PredefinedType);
-    typedef IfcRampFlightType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRampFlightType > > list;
-    typedef IfcTemplatedEntityList< IfcRampFlightType >::it it;
+    IfcRampFlightType (IfcAbstractEntity* e);
+    IfcRampFlightType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcRampFlightTypeEnum::IfcRampFlightTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcRampFlightType > list;
 };
 /// Definition from IAI: The element type
 ///   IfcRampType defines a list of commonly shared
@@ -34489,20 +35225,19 @@ class IfcRampFlightType : public IfcBuildingElementType {
 class IfcRampType : public IfcBuildingElementType {
 public:
     /// Identifies the predefined types of a ramp element from which the type required may be set.
-    IfcRampTypeEnum::IfcRampTypeEnum PredefinedType();
+    IfcRampTypeEnum::IfcRampTypeEnum PredefinedType() const;
     void setPredefinedType(IfcRampTypeEnum::IfcRampTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcBuildingElementType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcRampTypeEnum; } return IfcBuildingElementType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcBuildingElementType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRampType (IfcAbstractEntityPtr e);
-    IfcRampType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcRampTypeEnum::IfcRampTypeEnum v10_PredefinedType);
-    typedef IfcRampType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRampType > > list;
-    typedef IfcTemplatedEntityList< IfcRampType >::it it;
+    IfcRampType (IfcAbstractEntity* e);
+    IfcRampType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcRampTypeEnum::IfcRampTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcRampType > list;
 };
 /// A rational B-spline surface with knots is a piecewise parametric rational surface described in terms of control points, and associated weight values.
 /// 
@@ -34522,16 +35257,15 @@ class IfcRationalBSplineSurfaceWithKnots : public IfcBSplineSurfaceWithKnots {
     /// The weights associated with the control points in the rational case.
     virtual unsigned int getArgumentCount() const { return 13; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 12: return IfcUtil::Argument_UNKNOWN; } return IfcBSplineSurfaceWithKnots::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 12: return Type::UNDEFINED; } return IfcBSplineSurfaceWithKnots::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 12: return "WeightsData"; } return IfcBSplineSurfaceWithKnots::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRationalBSplineSurfaceWithKnots (IfcAbstractEntityPtr e);
-    IfcRationalBSplineSurfaceWithKnots (int v1_UDegree, int v2_VDegree, IfcBSplineSurfaceForm::IfcBSplineSurfaceForm v4_SurfaceForm, bool v5_UClosed, bool v6_VClosed, bool v7_SelfIntersect, std::vector< int > /*[2:?]*/ v8_UMultiplicities, std::vector< int > /*[2:?]*/ v9_VMultiplicities, std::vector< IfcParameterValue > /*[2:?]*/ v10_UKnots, std::vector< IfcParameterValue > /*[2:?]*/ v11_VKnots, IfcKnotType::IfcKnotType v12_KnotSpec);
-    typedef IfcRationalBSplineSurfaceWithKnots* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRationalBSplineSurfaceWithKnots > > list;
-    typedef IfcTemplatedEntityList< IfcRationalBSplineSurfaceWithKnots >::it it;
+    IfcRationalBSplineSurfaceWithKnots (IfcAbstractEntity* e);
+    IfcRationalBSplineSurfaceWithKnots (int v1_UDegree, int v2_VDegree, IfcTemplatedEntityListList< IfcCartesianPoint >::ptr v3_ControlPointsList, IfcBSplineSurfaceForm::IfcBSplineSurfaceForm v4_SurfaceForm, bool v5_UClosed, bool v6_VClosed, bool v7_SelfIntersect, std::vector< int > /*[2:?]*/ v8_UMultiplicities, std::vector< int > /*[2:?]*/ v9_VMultiplicities, std::vector< double > /*[2:?]*/ v10_UKnots, std::vector< double > /*[2:?]*/ v11_VKnots, IfcKnotType::IfcKnotType v12_KnotSpec);
+    typedef IfcTemplatedEntityList< IfcRationalBSplineSurfaceWithKnots > list;
 };
 /// Definition from IAI: Bars, wires, strands, meshes, tendons, and other components embedded in concrete in such a manner that the reinforcement and the concrete act together in resisting forces.
 /// 
@@ -34544,21 +35278,20 @@ class IfcRationalBSplineSurfaceWithKnots : public IfcBSplineSurfaceWithKnots {
 class IfcReinforcingElement : public IfcElementComponent {
 public:
     /// Whether the optional attribute SteelGrade is defined for this IfcReinforcingElement
-    bool hasSteelGrade();
-    IfcLabel SteelGrade();
-    void setSteelGrade(IfcLabel v);
+    bool hasSteelGrade() const;
+    std::string SteelGrade() const;
+    void setSteelGrade(std::string v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_STRING; } return IfcElementComponent::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcLabel; } return IfcElementComponent::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "SteelGrade"; } return IfcElementComponent::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcReinforcingElement (IfcAbstractEntityPtr e);
-    IfcReinforcingElement (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcLabel > v9_SteelGrade);
-    typedef IfcReinforcingElement* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcReinforcingElement > > list;
-    typedef IfcTemplatedEntityList< IfcReinforcingElement >::it it;
+    IfcReinforcingElement (IfcAbstractEntity* e);
+    IfcReinforcingElement (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_SteelGrade);
+    typedef IfcTemplatedEntityList< IfcReinforcingElement > list;
 };
 /// Definition from IAI: Types of bars, wires, strands, meshes, tendons, and other components embedded in concrete in such a manner that the reinforcement and the concrete act together in resisting forces.
 /// 
@@ -34567,16 +35300,15 @@ class IfcReinforcingElementType : public IfcElementComponentType {
 public:
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcElementComponentType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcElementComponentType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcElementComponentType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcReinforcingElementType (IfcAbstractEntityPtr e);
-    IfcReinforcingElementType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType);
-    typedef IfcReinforcingElementType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcReinforcingElementType > > list;
-    typedef IfcTemplatedEntityList< IfcReinforcingElementType >::it it;
+    IfcReinforcingElementType (IfcAbstractEntity* e);
+    IfcReinforcingElementType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType);
+    typedef IfcTemplatedEntityList< IfcReinforcingElementType > list;
 };
 /// Definition from IAI: A series of longitudinal and transverse wires or bars of various gauges, arranged at right angles to each other and welded at all points of intersection; usually used for concrete slab reinforcement. Also known as welded wire fabric.
 /// 
@@ -34605,54 +35337,53 @@ class IfcReinforcingElementType : public IfcElementComponentType {
 class IfcReinforcingMesh : public IfcReinforcingElement {
 public:
     /// Whether the optional attribute MeshLength is defined for this IfcReinforcingMesh
-    bool hasMeshLength();
-    IfcPositiveLengthMeasure MeshLength();
-    void setMeshLength(IfcPositiveLengthMeasure v);
+    bool hasMeshLength() const;
+    double MeshLength() const;
+    void setMeshLength(double v);
     /// Whether the optional attribute MeshWidth is defined for this IfcReinforcingMesh
-    bool hasMeshWidth();
-    IfcPositiveLengthMeasure MeshWidth();
-    void setMeshWidth(IfcPositiveLengthMeasure v);
+    bool hasMeshWidth() const;
+    double MeshWidth() const;
+    void setMeshWidth(double v);
     /// Whether the optional attribute LongitudinalBarNominalDiameter is defined for this IfcReinforcingMesh
-    bool hasLongitudinalBarNominalDiameter();
-    IfcPositiveLengthMeasure LongitudinalBarNominalDiameter();
-    void setLongitudinalBarNominalDiameter(IfcPositiveLengthMeasure v);
+    bool hasLongitudinalBarNominalDiameter() const;
+    double LongitudinalBarNominalDiameter() const;
+    void setLongitudinalBarNominalDiameter(double v);
     /// Whether the optional attribute TransverseBarNominalDiameter is defined for this IfcReinforcingMesh
-    bool hasTransverseBarNominalDiameter();
-    IfcPositiveLengthMeasure TransverseBarNominalDiameter();
-    void setTransverseBarNominalDiameter(IfcPositiveLengthMeasure v);
+    bool hasTransverseBarNominalDiameter() const;
+    double TransverseBarNominalDiameter() const;
+    void setTransverseBarNominalDiameter(double v);
     /// Whether the optional attribute LongitudinalBarCrossSectionArea is defined for this IfcReinforcingMesh
-    bool hasLongitudinalBarCrossSectionArea();
-    IfcAreaMeasure LongitudinalBarCrossSectionArea();
-    void setLongitudinalBarCrossSectionArea(IfcAreaMeasure v);
+    bool hasLongitudinalBarCrossSectionArea() const;
+    double LongitudinalBarCrossSectionArea() const;
+    void setLongitudinalBarCrossSectionArea(double v);
     /// Whether the optional attribute TransverseBarCrossSectionArea is defined for this IfcReinforcingMesh
-    bool hasTransverseBarCrossSectionArea();
-    IfcAreaMeasure TransverseBarCrossSectionArea();
-    void setTransverseBarCrossSectionArea(IfcAreaMeasure v);
+    bool hasTransverseBarCrossSectionArea() const;
+    double TransverseBarCrossSectionArea() const;
+    void setTransverseBarCrossSectionArea(double v);
     /// Whether the optional attribute LongitudinalBarSpacing is defined for this IfcReinforcingMesh
-    bool hasLongitudinalBarSpacing();
-    IfcPositiveLengthMeasure LongitudinalBarSpacing();
-    void setLongitudinalBarSpacing(IfcPositiveLengthMeasure v);
+    bool hasLongitudinalBarSpacing() const;
+    double LongitudinalBarSpacing() const;
+    void setLongitudinalBarSpacing(double v);
     /// Whether the optional attribute TransverseBarSpacing is defined for this IfcReinforcingMesh
-    bool hasTransverseBarSpacing();
-    IfcPositiveLengthMeasure TransverseBarSpacing();
-    void setTransverseBarSpacing(IfcPositiveLengthMeasure v);
+    bool hasTransverseBarSpacing() const;
+    double TransverseBarSpacing() const;
+    void setTransverseBarSpacing(double v);
     /// Whether the optional attribute PredefinedType is defined for this IfcReinforcingMesh
-    bool hasPredefinedType();
+    bool hasPredefinedType() const;
     /// The predefined type is always MESH.
-    IfcReinforcingMeshTypeEnum::IfcReinforcingMeshTypeEnum PredefinedType();
+    IfcReinforcingMeshTypeEnum::IfcReinforcingMeshTypeEnum PredefinedType() const;
     void setPredefinedType(IfcReinforcingMeshTypeEnum::IfcReinforcingMeshTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 18; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_DOUBLE; case 10: return IfcUtil::Argument_DOUBLE; case 11: return IfcUtil::Argument_DOUBLE; case 12: return IfcUtil::Argument_DOUBLE; case 13: return IfcUtil::Argument_DOUBLE; case 14: return IfcUtil::Argument_DOUBLE; case 15: return IfcUtil::Argument_DOUBLE; case 16: return IfcUtil::Argument_DOUBLE; case 17: return IfcUtil::Argument_ENUMERATION; } return IfcReinforcingElement::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcPositiveLengthMeasure; case 10: return Type::IfcPositiveLengthMeasure; case 11: return Type::IfcPositiveLengthMeasure; case 12: return Type::IfcPositiveLengthMeasure; case 13: return Type::IfcAreaMeasure; case 14: return Type::IfcAreaMeasure; case 15: return Type::IfcPositiveLengthMeasure; case 16: return Type::IfcPositiveLengthMeasure; case 17: return Type::IfcReinforcingMeshTypeEnum; } return IfcReinforcingElement::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "MeshLength"; case 10: return "MeshWidth"; case 11: return "LongitudinalBarNominalDiameter"; case 12: return "TransverseBarNominalDiameter"; case 13: return "LongitudinalBarCrossSectionArea"; case 14: return "TransverseBarCrossSectionArea"; case 15: return "LongitudinalBarSpacing"; case 16: return "TransverseBarSpacing"; case 17: return "PredefinedType"; } return IfcReinforcingElement::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcReinforcingMesh (IfcAbstractEntityPtr e);
-    IfcReinforcingMesh (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcLabel > v9_SteelGrade, boost::optional< IfcPositiveLengthMeasure > v10_MeshLength, boost::optional< IfcPositiveLengthMeasure > v11_MeshWidth, boost::optional< IfcPositiveLengthMeasure > v12_LongitudinalBarNominalDiameter, boost::optional< IfcPositiveLengthMeasure > v13_TransverseBarNominalDiameter, boost::optional< IfcAreaMeasure > v14_LongitudinalBarCrossSectionArea, boost::optional< IfcAreaMeasure > v15_TransverseBarCrossSectionArea, boost::optional< IfcPositiveLengthMeasure > v16_LongitudinalBarSpacing, boost::optional< IfcPositiveLengthMeasure > v17_TransverseBarSpacing, boost::optional< IfcReinforcingMeshTypeEnum::IfcReinforcingMeshTypeEnum > v18_PredefinedType);
-    typedef IfcReinforcingMesh* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcReinforcingMesh > > list;
-    typedef IfcTemplatedEntityList< IfcReinforcingMesh >::it it;
+    IfcReinforcingMesh (IfcAbstractEntity* e);
+    IfcReinforcingMesh (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_SteelGrade, boost::optional< double > v10_MeshLength, boost::optional< double > v11_MeshWidth, boost::optional< double > v12_LongitudinalBarNominalDiameter, boost::optional< double > v13_TransverseBarNominalDiameter, boost::optional< double > v14_LongitudinalBarCrossSectionArea, boost::optional< double > v15_TransverseBarCrossSectionArea, boost::optional< double > v16_LongitudinalBarSpacing, boost::optional< double > v17_TransverseBarSpacing, boost::optional< IfcReinforcingMeshTypeEnum::IfcReinforcingMeshTypeEnum > v18_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcReinforcingMesh > list;
 };
 /// Definition from IAI: A series of longitudinal and transverse wires or bars of various gauges, arranged at right angles to each other and welded at all points of intersection; usually used for concrete slab reinforcement. Also known as welded wire fabric.
 /// 
@@ -34668,68 +35399,67 @@ class IfcReinforcingMesh : public IfcReinforcingElement {
 class IfcReinforcingMeshType : public IfcReinforcingElementType {
 public:
     /// The predefined type is always MESH.
-    IfcReinforcingMeshTypeEnum::IfcReinforcingMeshTypeEnum PredefinedType();
+    IfcReinforcingMeshTypeEnum::IfcReinforcingMeshTypeEnum PredefinedType() const;
     void setPredefinedType(IfcReinforcingMeshTypeEnum::IfcReinforcingMeshTypeEnum v);
     /// Whether the optional attribute MeshLength is defined for this IfcReinforcingMeshType
-    bool hasMeshLength();
+    bool hasMeshLength() const;
     /// The overall length of the mesh measured in its longitudinal direction.
-    IfcPositiveLengthMeasure MeshLength();
-    void setMeshLength(IfcPositiveLengthMeasure v);
+    double MeshLength() const;
+    void setMeshLength(double v);
     /// Whether the optional attribute MeshWidth is defined for this IfcReinforcingMeshType
-    bool hasMeshWidth();
+    bool hasMeshWidth() const;
     /// The overall width of the mesh measured in its transversal direction.
-    IfcPositiveLengthMeasure MeshWidth();
-    void setMeshWidth(IfcPositiveLengthMeasure v);
+    double MeshWidth() const;
+    void setMeshWidth(double v);
     /// Whether the optional attribute LongitudinalBarNominalDiameter is defined for this IfcReinforcingMeshType
-    bool hasLongitudinalBarNominalDiameter();
+    bool hasLongitudinalBarNominalDiameter() const;
     /// The nominal diameter denoting the cross-section size of the longitudinal bars.
-    IfcPositiveLengthMeasure LongitudinalBarNominalDiameter();
-    void setLongitudinalBarNominalDiameter(IfcPositiveLengthMeasure v);
+    double LongitudinalBarNominalDiameter() const;
+    void setLongitudinalBarNominalDiameter(double v);
     /// Whether the optional attribute TransverseBarNominalDiameter is defined for this IfcReinforcingMeshType
-    bool hasTransverseBarNominalDiameter();
+    bool hasTransverseBarNominalDiameter() const;
     /// The nominal diameter denoting the cross-section size of the transverse bars.
-    IfcPositiveLengthMeasure TransverseBarNominalDiameter();
-    void setTransverseBarNominalDiameter(IfcPositiveLengthMeasure v);
+    double TransverseBarNominalDiameter() const;
+    void setTransverseBarNominalDiameter(double v);
     /// Whether the optional attribute LongitudinalBarCrossSectionArea is defined for this IfcReinforcingMeshType
-    bool hasLongitudinalBarCrossSectionArea();
+    bool hasLongitudinalBarCrossSectionArea() const;
     /// The effective cross-section area of the longitudinal bars of the mesh.
-    IfcAreaMeasure LongitudinalBarCrossSectionArea();
-    void setLongitudinalBarCrossSectionArea(IfcAreaMeasure v);
+    double LongitudinalBarCrossSectionArea() const;
+    void setLongitudinalBarCrossSectionArea(double v);
     /// Whether the optional attribute TransverseBarCrossSectionArea is defined for this IfcReinforcingMeshType
-    bool hasTransverseBarCrossSectionArea();
+    bool hasTransverseBarCrossSectionArea() const;
     /// The effective cross-section area of the transverse bars of the mesh.
-    IfcAreaMeasure TransverseBarCrossSectionArea();
-    void setTransverseBarCrossSectionArea(IfcAreaMeasure v);
+    double TransverseBarCrossSectionArea() const;
+    void setTransverseBarCrossSectionArea(double v);
     /// Whether the optional attribute LongitudinalBarSpacing is defined for this IfcReinforcingMeshType
-    bool hasLongitudinalBarSpacing();
+    bool hasLongitudinalBarSpacing() const;
     /// The spacing between the longitudinal bars.  Note: an even distribution of bars is presumed; other cases are handled by classification or property sets.
-    IfcPositiveLengthMeasure LongitudinalBarSpacing();
-    void setLongitudinalBarSpacing(IfcPositiveLengthMeasure v);
+    double LongitudinalBarSpacing() const;
+    void setLongitudinalBarSpacing(double v);
     /// Whether the optional attribute TransverseBarSpacing is defined for this IfcReinforcingMeshType
-    bool hasTransverseBarSpacing();
+    bool hasTransverseBarSpacing() const;
     /// The spacing between the transverse bars.  Note: an even distribution of bars is presumed; other cases are handled by classification or property sets.
-    IfcPositiveLengthMeasure TransverseBarSpacing();
-    void setTransverseBarSpacing(IfcPositiveLengthMeasure v);
+    double TransverseBarSpacing() const;
+    void setTransverseBarSpacing(double v);
     /// Whether the optional attribute BendingShapeCode is defined for this IfcReinforcingMeshType
-    bool hasBendingShapeCode();
-    IfcLabel BendingShapeCode();
-    void setBendingShapeCode(IfcLabel v);
+    bool hasBendingShapeCode() const;
+    std::string BendingShapeCode() const;
+    void setBendingShapeCode(std::string v);
     /// Whether the optional attribute BendingParameters is defined for this IfcReinforcingMeshType
-    bool hasBendingParameters();
-    SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > BendingParameters();
-    void setBendingParameters(SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > v);
+    bool hasBendingParameters() const;
+    IfcEntityList::ptr BendingParameters() const;
+    void setBendingParameters(IfcEntityList::ptr v);
     virtual unsigned int getArgumentCount() const { return 20; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; case 10: return IfcUtil::Argument_DOUBLE; case 11: return IfcUtil::Argument_DOUBLE; case 12: return IfcUtil::Argument_DOUBLE; case 13: return IfcUtil::Argument_DOUBLE; case 14: return IfcUtil::Argument_DOUBLE; case 15: return IfcUtil::Argument_DOUBLE; case 16: return IfcUtil::Argument_DOUBLE; case 17: return IfcUtil::Argument_DOUBLE; case 18: return IfcUtil::Argument_STRING; case 19: return IfcUtil::Argument_ENTITY_LIST; } return IfcReinforcingElementType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcReinforcingMeshTypeEnum; case 10: return Type::IfcPositiveLengthMeasure; case 11: return Type::IfcPositiveLengthMeasure; case 12: return Type::IfcPositiveLengthMeasure; case 13: return Type::IfcPositiveLengthMeasure; case 14: return Type::IfcAreaMeasure; case 15: return Type::IfcAreaMeasure; case 16: return Type::IfcPositiveLengthMeasure; case 17: return Type::IfcPositiveLengthMeasure; case 18: return Type::IfcLabel; case 19: return Type::IfcBendingParameterSelect; } return IfcReinforcingElementType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; case 10: return "MeshLength"; case 11: return "MeshWidth"; case 12: return "LongitudinalBarNominalDiameter"; case 13: return "TransverseBarNominalDiameter"; case 14: return "LongitudinalBarCrossSectionArea"; case 15: return "TransverseBarCrossSectionArea"; case 16: return "LongitudinalBarSpacing"; case 17: return "TransverseBarSpacing"; case 18: return "BendingShapeCode"; case 19: return "BendingParameters"; } return IfcReinforcingElementType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcReinforcingMeshType (IfcAbstractEntityPtr e);
-    IfcReinforcingMeshType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcReinforcingMeshTypeEnum::IfcReinforcingMeshTypeEnum v10_PredefinedType, boost::optional< IfcPositiveLengthMeasure > v11_MeshLength, boost::optional< IfcPositiveLengthMeasure > v12_MeshWidth, boost::optional< IfcPositiveLengthMeasure > v13_LongitudinalBarNominalDiameter, boost::optional< IfcPositiveLengthMeasure > v14_TransverseBarNominalDiameter, boost::optional< IfcAreaMeasure > v15_LongitudinalBarCrossSectionArea, boost::optional< IfcAreaMeasure > v16_TransverseBarCrossSectionArea, boost::optional< IfcPositiveLengthMeasure > v17_LongitudinalBarSpacing, boost::optional< IfcPositiveLengthMeasure > v18_TransverseBarSpacing, boost::optional< IfcLabel > v19_BendingShapeCode, boost::optional< IfcEntities > v20_BendingParameters);
-    typedef IfcReinforcingMeshType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcReinforcingMeshType > > list;
-    typedef IfcTemplatedEntityList< IfcReinforcingMeshType >::it it;
+    IfcReinforcingMeshType (IfcAbstractEntity* e);
+    IfcReinforcingMeshType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcReinforcingMeshTypeEnum::IfcReinforcingMeshTypeEnum v10_PredefinedType, boost::optional< double > v11_MeshLength, boost::optional< double > v12_MeshWidth, boost::optional< double > v13_LongitudinalBarNominalDiameter, boost::optional< double > v14_TransverseBarNominalDiameter, boost::optional< double > v15_LongitudinalBarCrossSectionArea, boost::optional< double > v16_TransverseBarCrossSectionArea, boost::optional< double > v17_LongitudinalBarSpacing, boost::optional< double > v18_TransverseBarSpacing, boost::optional< std::string > v19_BendingShapeCode, boost::optional< IfcEntityList::ptr > v20_BendingParameters);
+    typedef IfcTemplatedEntityList< IfcReinforcingMeshType > list;
 };
 /// The aggregation relationship
 /// IfcRelAggregates is a special type of the general
@@ -34758,25 +35488,24 @@ class IfcRelAggregates : public IfcRelDecomposes {
     /// The object definition, either an object type or an object occurrence, that represents the aggregation. It is the whole within the whole/part relationship.
     /// 
     /// IFC2x4 CHANGE  The attribute has been demoted from the supertype IfcRelDecomposes and defines the non-ordered aggregation relationship.
-    IfcObjectDefinition* RelatingObject();
+    IfcObjectDefinition* RelatingObject() const;
     void setRelatingObject(IfcObjectDefinition* v);
     /// The object definitions, either object occurrences or object types, that are being aggregated. They are defined as the parts in the whole/part relationship. No order is implied between the parts.
     /// 
     /// IFC2x4 CHANGE  The attribute has been demoted from the supertype IfcRelDecomposes and defines the non-ordered set of parts within the aggregation.
-    SHARED_PTR< IfcTemplatedEntityList< IfcObjectDefinition > > RelatedObjects();
-    void setRelatedObjects(SHARED_PTR< IfcTemplatedEntityList< IfcObjectDefinition > > v);
+    IfcTemplatedEntityList< IfcObjectDefinition >::ptr RelatedObjects() const;
+    void setRelatedObjects(IfcTemplatedEntityList< IfcObjectDefinition >::ptr v);
     virtual unsigned int getArgumentCount() const { return 6; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 4: return IfcUtil::Argument_ENTITY; case 5: return IfcUtil::Argument_ENTITY_LIST; } return IfcRelDecomposes::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 4: return Type::IfcObjectDefinition; case 5: return Type::IfcObjectDefinition; } return IfcRelDecomposes::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 4: return "RelatingObject"; case 5: return "RelatedObjects"; } return IfcRelDecomposes::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRelAggregates (IfcAbstractEntityPtr e);
-    IfcRelAggregates (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, IfcObjectDefinition* v5_RelatingObject, SHARED_PTR< IfcTemplatedEntityList< IfcObjectDefinition > > v6_RelatedObjects);
-    typedef IfcRelAggregates* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRelAggregates > > list;
-    typedef IfcTemplatedEntityList< IfcRelAggregates >::it it;
+    IfcRelAggregates (IfcAbstractEntity* e);
+    IfcRelAggregates (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, IfcObjectDefinition* v5_RelatingObject, IfcTemplatedEntityList< IfcObjectDefinition >::ptr v6_RelatedObjects);
+    typedef IfcTemplatedEntityList< IfcRelAggregates > list;
 };
 /// Definition from IAI: The element type
 ///   IfcRoofType defines a list of commonly shared
@@ -34813,20 +35542,19 @@ class IfcRelAggregates : public IfcRelDecomposes {
 class IfcRoofType : public IfcBuildingElementType {
 public:
     /// Identifies the predefined types of a roof element from which the type required may be set.
-    IfcRoofTypeEnum::IfcRoofTypeEnum PredefinedType();
+    IfcRoofTypeEnum::IfcRoofTypeEnum PredefinedType() const;
     void setPredefinedType(IfcRoofTypeEnum::IfcRoofTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcBuildingElementType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcRoofTypeEnum; } return IfcBuildingElementType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcBuildingElementType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRoofType (IfcAbstractEntityPtr e);
-    IfcRoofType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcRoofTypeEnum::IfcRoofTypeEnum v10_PredefinedType);
-    typedef IfcRoofType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRoofType > > list;
-    typedef IfcTemplatedEntityList< IfcRoofType >::it it;
+    IfcRoofType (IfcAbstractEntity* e);
+    IfcRoofType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcRoofTypeEnum::IfcRoofTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcRoofType > list;
 };
 /// The flow terminal type IfcSanitaryTerminalType defines commonly shared information for occurrences of sanitary terminals.  The set of shared information may include: 
 /// 
@@ -34868,20 +35596,19 @@ class IfcRoofType : public IfcBuildingElementType {
 class IfcSanitaryTerminalType : public IfcFlowTerminalType {
 public:
     /// Identifies the predefined types of sanitary terminal from which the type required may be set.
-    IfcSanitaryTerminalTypeEnum::IfcSanitaryTerminalTypeEnum PredefinedType();
+    IfcSanitaryTerminalTypeEnum::IfcSanitaryTerminalTypeEnum PredefinedType() const;
     void setPredefinedType(IfcSanitaryTerminalTypeEnum::IfcSanitaryTerminalTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcFlowTerminalType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcSanitaryTerminalTypeEnum; } return IfcFlowTerminalType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcFlowTerminalType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcSanitaryTerminalType (IfcAbstractEntityPtr e);
-    IfcSanitaryTerminalType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcSanitaryTerminalTypeEnum::IfcSanitaryTerminalTypeEnum v10_PredefinedType);
-    typedef IfcSanitaryTerminalType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcSanitaryTerminalType > > list;
-    typedef IfcTemplatedEntityList< IfcSanitaryTerminalType >::it it;
+    IfcSanitaryTerminalType (IfcAbstractEntity* e);
+    IfcSanitaryTerminalType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcSanitaryTerminalTypeEnum::IfcSanitaryTerminalTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcSanitaryTerminalType > list;
 };
 /// Definition from IAI: The IfcShadingDeviceType
 /// defines a list of commonly shared property set definitions of a
@@ -34907,20 +35634,19 @@ class IfcSanitaryTerminalType : public IfcFlowTerminalType {
 class IfcShadingDeviceType : public IfcBuildingElementType {
 public:
     /// Identifies the predefined types of a shading device element from which the type required may be set.
-    IfcShadingDeviceTypeEnum::IfcShadingDeviceTypeEnum PredefinedType();
+    IfcShadingDeviceTypeEnum::IfcShadingDeviceTypeEnum PredefinedType() const;
     void setPredefinedType(IfcShadingDeviceTypeEnum::IfcShadingDeviceTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcBuildingElementType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcShadingDeviceTypeEnum; } return IfcBuildingElementType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcBuildingElementType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcShadingDeviceType (IfcAbstractEntityPtr e);
-    IfcShadingDeviceType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcShadingDeviceTypeEnum::IfcShadingDeviceTypeEnum v10_PredefinedType);
-    typedef IfcShadingDeviceType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcShadingDeviceType > > list;
-    typedef IfcTemplatedEntityList< IfcShadingDeviceType >::it it;
+    IfcShadingDeviceType (IfcAbstractEntity* e);
+    IfcShadingDeviceType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcShadingDeviceTypeEnum::IfcShadingDeviceTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcShadingDeviceType > list;
 };
 /// Definition from ISO 6707-1:1989: Area where construction
 /// works are undertaken.
@@ -35114,45 +35840,44 @@ class IfcShadingDeviceType : public IfcBuildingElementType {
 class IfcSite : public IfcSpatialStructureElement {
 public:
     /// Whether the optional attribute RefLatitude is defined for this IfcSite
-    bool hasRefLatitude();
+    bool hasRefLatitude() const;
     /// World Latitude at reference point (most likely defined in legal description). Defined as integer values for degrees, minutes, seconds, and, optionally, millionths of seconds with respect to the world geodetic system WGS84.
     ///   Latitudes are measured relative to the geodetic equator, north of the equator by positive values - from 0 till +90,   south of the equator by negative values - from 0 till  -90.
-    IfcCompoundPlaneAngleMeasure RefLatitude();
-    void setRefLatitude(IfcCompoundPlaneAngleMeasure v);
+    std::vector< int > /*[3:4]*/ RefLatitude() const;
+    void setRefLatitude(std::vector< int > /*[3:4]*/ v);
     /// Whether the optional attribute RefLongitude is defined for this IfcSite
-    bool hasRefLongitude();
+    bool hasRefLongitude() const;
     /// World Longitude at reference point (most likely defined in legal description). Defined as integer values for degrees, minutes, seconds, and, optionally, millionths of seconds with respect to the world geodetic system WGS84.
     ///   Longitudes are measured relative to the geodetic zero meridian, nominally the same as the Greenwich prime meridian: longitudes west of the zero meridian have negative values - from 0 till -180, longitudes east of the zero meridian have positive values - from 0 till -180.
     /// Example: Chicago Harbor Light has according to WGS84 a longitude -87.35.40 (or 87.35.40W) and a latitude 41.53.30 (or 41.53.30N).
-    IfcCompoundPlaneAngleMeasure RefLongitude();
-    void setRefLongitude(IfcCompoundPlaneAngleMeasure v);
+    std::vector< int > /*[3:4]*/ RefLongitude() const;
+    void setRefLongitude(std::vector< int > /*[3:4]*/ v);
     /// Whether the optional attribute RefElevation is defined for this IfcSite
-    bool hasRefElevation();
+    bool hasRefElevation() const;
     /// Datum elevation relative to sea level.
-    IfcLengthMeasure RefElevation();
-    void setRefElevation(IfcLengthMeasure v);
+    double RefElevation() const;
+    void setRefElevation(double v);
     /// Whether the optional attribute LandTitleNumber is defined for this IfcSite
-    bool hasLandTitleNumber();
+    bool hasLandTitleNumber() const;
     /// The land title number (designation of the site within a regional system).
-    IfcLabel LandTitleNumber();
-    void setLandTitleNumber(IfcLabel v);
+    std::string LandTitleNumber() const;
+    void setLandTitleNumber(std::string v);
     /// Whether the optional attribute SiteAddress is defined for this IfcSite
-    bool hasSiteAddress();
+    bool hasSiteAddress() const;
     /// Address given to the site for postal purposes.
-    IfcPostalAddress* SiteAddress();
+    IfcPostalAddress* SiteAddress() const;
     void setSiteAddress(IfcPostalAddress* v);
     virtual unsigned int getArgumentCount() const { return 14; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_VECTOR_INT; case 10: return IfcUtil::Argument_VECTOR_INT; case 11: return IfcUtil::Argument_DOUBLE; case 12: return IfcUtil::Argument_STRING; case 13: return IfcUtil::Argument_ENTITY; } return IfcSpatialStructureElement::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcCompoundPlaneAngleMeasure; case 10: return Type::IfcCompoundPlaneAngleMeasure; case 11: return Type::IfcLengthMeasure; case 12: return Type::IfcLabel; case 13: return Type::IfcPostalAddress; } return IfcSpatialStructureElement::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "RefLatitude"; case 10: return "RefLongitude"; case 11: return "RefElevation"; case 12: return "LandTitleNumber"; case 13: return "SiteAddress"; } return IfcSpatialStructureElement::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcSite (IfcAbstractEntityPtr e);
-    IfcSite (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcLabel > v8_LongName, boost::optional< IfcElementCompositionEnum::IfcElementCompositionEnum > v9_CompositionType, boost::optional< IfcCompoundPlaneAngleMeasure > v10_RefLatitude, boost::optional< IfcCompoundPlaneAngleMeasure > v11_RefLongitude, boost::optional< IfcLengthMeasure > v12_RefElevation, boost::optional< IfcLabel > v13_LandTitleNumber, IfcPostalAddress* v14_SiteAddress);
-    typedef IfcSite* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcSite > > list;
-    typedef IfcTemplatedEntityList< IfcSite >::it it;
+    IfcSite (IfcAbstractEntity* e);
+    IfcSite (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_LongName, boost::optional< IfcElementCompositionEnum::IfcElementCompositionEnum > v9_CompositionType, boost::optional< std::vector< int > /*[3:4]*/ > v10_RefLatitude, boost::optional< std::vector< int > /*[3:4]*/ > v11_RefLongitude, boost::optional< double > v12_RefElevation, boost::optional< std::string > v13_LandTitleNumber, IfcPostalAddress* v14_SiteAddress);
+    typedef IfcTemplatedEntityList< IfcSite > list;
 };
 /// The element type IfcSlabType defines commonly shared
 /// information for occurrences of slabs. The set of shared information
@@ -35234,20 +35959,19 @@ class IfcSite : public IfcSpatialStructureElement {
 class IfcSlabType : public IfcBuildingElementType {
 public:
     /// Identifies the predefined types of a slab element from which the type required may be set.
-    IfcSlabTypeEnum::IfcSlabTypeEnum PredefinedType();
+    IfcSlabTypeEnum::IfcSlabTypeEnum PredefinedType() const;
     void setPredefinedType(IfcSlabTypeEnum::IfcSlabTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcBuildingElementType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcSlabTypeEnum; } return IfcBuildingElementType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcBuildingElementType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcSlabType (IfcAbstractEntityPtr e);
-    IfcSlabType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcSlabTypeEnum::IfcSlabTypeEnum v10_PredefinedType);
-    typedef IfcSlabType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcSlabType > > list;
-    typedef IfcTemplatedEntityList< IfcSlabType >::it it;
+    IfcSlabType (IfcAbstractEntity* e);
+    IfcSlabType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcSlabTypeEnum::IfcSlabTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcSlabType > list;
 };
 /// The energy conversion device type IfcSolarDeviceType defines commonly shared information for occurrences of solar devices.  The set of shared information may include: 
 /// 
@@ -35277,20 +36001,19 @@ class IfcSlabType : public IfcBuildingElementType {
 /// The distribution ports relating to the IfcSolarDeviceType type are defined by IfcDistributionPort and attached by the IfcRelConnectsPortToElement relationship.  Ports are reflected at occurrences of this type using the IfcRelDefinesByObject relationship.  Refer to the documentation at IfcSolarDevice for standard port definitions.
 class IfcSolarDeviceType : public IfcEnergyConversionDeviceType {
 public:
-    IfcSolarDeviceTypeEnum::IfcSolarDeviceTypeEnum PredefinedType();
+    IfcSolarDeviceTypeEnum::IfcSolarDeviceTypeEnum PredefinedType() const;
     void setPredefinedType(IfcSolarDeviceTypeEnum::IfcSolarDeviceTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcEnergyConversionDeviceType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcSolarDeviceTypeEnum; } return IfcEnergyConversionDeviceType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcEnergyConversionDeviceType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcSolarDeviceType (IfcAbstractEntityPtr e);
-    IfcSolarDeviceType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcSolarDeviceTypeEnum::IfcSolarDeviceTypeEnum v10_PredefinedType);
-    typedef IfcSolarDeviceType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcSolarDeviceType > > list;
-    typedef IfcTemplatedEntityList< IfcSolarDeviceType >::it it;
+    IfcSolarDeviceType (IfcAbstractEntity* e);
+    IfcSolarDeviceType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcSolarDeviceTypeEnum::IfcSolarDeviceTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcSolarDeviceType > list;
 };
 /// A space represents an area or volume
 /// bounded actually or theoretically. Spaces are areas or volumes that
@@ -35545,33 +36268,32 @@ class IfcSolarDeviceType : public IfcEnergyConversionDeviceType {
 class IfcSpace : public IfcSpatialStructureElement {
 public:
     /// Whether the optional attribute PredefinedType is defined for this IfcSpace
-    bool hasPredefinedType();
+    bool hasPredefinedType() const;
     /// Predefined generic types for a space that are specified in an enumeration. There might be property sets defined specifically for each predefined type.
     /// 
     /// Previous use, prior to IFC2x4, had been to indicates whether the IfcSpace is an interior space by value INTERNAL, or an exterior space by value EXTERNAL. This use is now deprecated, the property 'IsExternal' at 'Pset_SpaceCommon' should be used instead. 
     /// 
     /// IFC2x4 CHANGE  The attribute has been renamed from ExteriorOrInteriorSpace with upward compatibility for file based exchange.
-    IfcSpaceTypeEnum::IfcSpaceTypeEnum PredefinedType();
+    IfcSpaceTypeEnum::IfcSpaceTypeEnum PredefinedType() const;
     void setPredefinedType(IfcSpaceTypeEnum::IfcSpaceTypeEnum v);
     /// Whether the optional attribute ElevationWithFlooring is defined for this IfcSpace
-    bool hasElevationWithFlooring();
+    bool hasElevationWithFlooring() const;
     /// Level of flooring of this space; the average shall be taken, if the space ground surface is sloping or if there are level differences within this space.
-    IfcLengthMeasure ElevationWithFlooring();
-    void setElevationWithFlooring(IfcLengthMeasure v);
+    double ElevationWithFlooring() const;
+    void setElevationWithFlooring(double v);
     virtual unsigned int getArgumentCount() const { return 11; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; case 10: return IfcUtil::Argument_DOUBLE; } return IfcSpatialStructureElement::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcSpaceTypeEnum; case 10: return Type::IfcLengthMeasure; } return IfcSpatialStructureElement::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; case 10: return "ElevationWithFlooring"; } return IfcSpatialStructureElement::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelCoversSpaces > > HasCoverings(); // INVERSE IfcRelCoversSpaces::RelatingSpace
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelSpaceBoundary > > BoundedBy(); // INVERSE IfcRelSpaceBoundary::RelatingSpace
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcRelCoversSpaces >::ptr HasCoverings() const; // INVERSE IfcRelCoversSpaces::RelatingSpace
+    IfcTemplatedEntityList< IfcRelSpaceBoundary >::ptr BoundedBy() const; // INVERSE IfcRelSpaceBoundary::RelatingSpace
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcSpace (IfcAbstractEntityPtr e);
-    IfcSpace (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcLabel > v8_LongName, boost::optional< IfcElementCompositionEnum::IfcElementCompositionEnum > v9_CompositionType, boost::optional< IfcSpaceTypeEnum::IfcSpaceTypeEnum > v10_PredefinedType, boost::optional< IfcLengthMeasure > v11_ElevationWithFlooring);
-    typedef IfcSpace* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcSpace > > list;
-    typedef IfcTemplatedEntityList< IfcSpace >::it it;
+    IfcSpace (IfcAbstractEntity* e);
+    IfcSpace (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_LongName, boost::optional< IfcElementCompositionEnum::IfcElementCompositionEnum > v9_CompositionType, boost::optional< IfcSpaceTypeEnum::IfcSpaceTypeEnum > v10_PredefinedType, boost::optional< double > v11_ElevationWithFlooring);
+    typedef IfcTemplatedEntityList< IfcSpace > list;
 };
 /// The energy conversion device type IfcSpaceHeaterType defines commonly shared information for occurrences of space heaters.  The set of shared information may include: 
 /// 
@@ -35606,20 +36328,19 @@ class IfcSpace : public IfcSpatialStructureElement {
 class IfcSpaceHeaterType : public IfcFlowTerminalType {
 public:
     /// Enumeration of possible types of space heater (e.g., baseboard heater, convector, radiator, etc.).
-    IfcSpaceHeaterTypeEnum::IfcSpaceHeaterTypeEnum PredefinedType();
+    IfcSpaceHeaterTypeEnum::IfcSpaceHeaterTypeEnum PredefinedType() const;
     void setPredefinedType(IfcSpaceHeaterTypeEnum::IfcSpaceHeaterTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcFlowTerminalType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcSpaceHeaterTypeEnum; } return IfcFlowTerminalType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcFlowTerminalType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcSpaceHeaterType (IfcAbstractEntityPtr e);
-    IfcSpaceHeaterType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcSpaceHeaterTypeEnum::IfcSpaceHeaterTypeEnum v10_PredefinedType);
-    typedef IfcSpaceHeaterType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcSpaceHeaterType > > list;
-    typedef IfcTemplatedEntityList< IfcSpaceHeaterType >::it it;
+    IfcSpaceHeaterType (IfcAbstractEntity* e);
+    IfcSpaceHeaterType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcSpaceHeaterTypeEnum::IfcSpaceHeaterTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcSpaceHeaterType > list;
 };
 /// Definition from IAI: A space represents an area or
 /// volume bounded actually or theoretically. Spaces are areas or
@@ -35705,24 +36426,23 @@ class IfcSpaceHeaterType : public IfcFlowTerminalType {
 class IfcSpaceType : public IfcSpatialStructureElementType {
 public:
     /// Predefined types to define the particular type of space. There may be property set definitions available for each predefined type.
-    IfcSpaceTypeEnum::IfcSpaceTypeEnum PredefinedType();
+    IfcSpaceTypeEnum::IfcSpaceTypeEnum PredefinedType() const;
     void setPredefinedType(IfcSpaceTypeEnum::IfcSpaceTypeEnum v);
     /// Whether the optional attribute LongName is defined for this IfcSpaceType
-    bool hasLongName();
-    IfcLabel LongName();
-    void setLongName(IfcLabel v);
+    bool hasLongName() const;
+    std::string LongName() const;
+    void setLongName(std::string v);
     virtual unsigned int getArgumentCount() const { return 11; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; case 10: return IfcUtil::Argument_STRING; } return IfcSpatialStructureElementType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcSpaceTypeEnum; case 10: return Type::IfcLabel; } return IfcSpatialStructureElementType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; case 10: return "LongName"; } return IfcSpatialStructureElementType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcSpaceType (IfcAbstractEntityPtr e);
-    IfcSpaceType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcSpaceTypeEnum::IfcSpaceTypeEnum v10_PredefinedType, boost::optional< IfcLabel > v11_LongName);
-    typedef IfcSpaceType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcSpaceType > > list;
-    typedef IfcTemplatedEntityList< IfcSpaceType >::it it;
+    IfcSpaceType (IfcAbstractEntity* e);
+    IfcSpaceType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcSpaceTypeEnum::IfcSpaceTypeEnum v10_PredefinedType, boost::optional< std::string > v11_LongName);
+    typedef IfcTemplatedEntityList< IfcSpaceType > list;
 };
 /// The flow terminal type IfcStackTerminalType defines commonly shared information for occurrences of stack terminals.  The set of shared information may include: 
 /// 
@@ -35753,20 +36473,19 @@ class IfcSpaceType : public IfcSpatialStructureElementType {
 class IfcStackTerminalType : public IfcFlowTerminalType {
 public:
     /// Identifies the predefined types of stack terminal from which the type required may be set.
-    IfcStackTerminalTypeEnum::IfcStackTerminalTypeEnum PredefinedType();
+    IfcStackTerminalTypeEnum::IfcStackTerminalTypeEnum PredefinedType() const;
     void setPredefinedType(IfcStackTerminalTypeEnum::IfcStackTerminalTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcFlowTerminalType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcStackTerminalTypeEnum; } return IfcFlowTerminalType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcFlowTerminalType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcStackTerminalType (IfcAbstractEntityPtr e);
-    IfcStackTerminalType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcStackTerminalTypeEnum::IfcStackTerminalTypeEnum v10_PredefinedType);
-    typedef IfcStackTerminalType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcStackTerminalType > > list;
-    typedef IfcTemplatedEntityList< IfcStackTerminalType >::it it;
+    IfcStackTerminalType (IfcAbstractEntity* e);
+    IfcStackTerminalType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcStackTerminalTypeEnum::IfcStackTerminalTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcStackTerminalType > list;
 };
 /// Definition from IAI: The element type (IfcStairFlightType)
 ///   defines a list of commonly shared property set definitions of a stair flight
@@ -35791,20 +36510,19 @@ class IfcStackTerminalType : public IfcFlowTerminalType {
 class IfcStairFlightType : public IfcBuildingElementType {
 public:
     /// Identifies the predefined types of a stair flight element from which the type required may be set.
-    IfcStairFlightTypeEnum::IfcStairFlightTypeEnum PredefinedType();
+    IfcStairFlightTypeEnum::IfcStairFlightTypeEnum PredefinedType() const;
     void setPredefinedType(IfcStairFlightTypeEnum::IfcStairFlightTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcBuildingElementType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcStairFlightTypeEnum; } return IfcBuildingElementType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcBuildingElementType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcStairFlightType (IfcAbstractEntityPtr e);
-    IfcStairFlightType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcStairFlightTypeEnum::IfcStairFlightTypeEnum v10_PredefinedType);
-    typedef IfcStairFlightType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcStairFlightType > > list;
-    typedef IfcTemplatedEntityList< IfcStairFlightType >::it it;
+    IfcStairFlightType (IfcAbstractEntity* e);
+    IfcStairFlightType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcStairFlightTypeEnum::IfcStairFlightTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcStairFlightType > list;
 };
 /// Definition from IAI: The element type
 ///   IfcStairType defines a list of commonly shared
@@ -35842,20 +36560,19 @@ class IfcStairFlightType : public IfcBuildingElementType {
 class IfcStairType : public IfcBuildingElementType {
 public:
     /// Identifies the predefined types of a stair element from which the type required may be set.
-    IfcStairTypeEnum::IfcStairTypeEnum PredefinedType();
+    IfcStairTypeEnum::IfcStairTypeEnum PredefinedType() const;
     void setPredefinedType(IfcStairTypeEnum::IfcStairTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcBuildingElementType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcStairTypeEnum; } return IfcBuildingElementType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcBuildingElementType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcStairType (IfcAbstractEntityPtr e);
-    IfcStairType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcStairTypeEnum::IfcStairTypeEnum v10_PredefinedType);
-    typedef IfcStairType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcStairType > > list;
-    typedef IfcTemplatedEntityList< IfcStairType >::it it;
+    IfcStairType (IfcAbstractEntity* e);
+    IfcStairType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcStairTypeEnum::IfcStairTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcStairType > list;
 };
 /// Definition from IAI: A structural action is a structural activity that acts upon
 /// a structural item or building element.
@@ -35879,22 +36596,21 @@ class IfcStairType : public IfcBuildingElementType {
 class IfcStructuralAction : public IfcStructuralActivity {
 public:
     /// Whether the optional attribute DestabilizingLoad is defined for this IfcStructuralAction
-    bool hasDestabilizingLoad();
+    bool hasDestabilizingLoad() const;
     /// Indicates if this action may cause a stability problem. If it is 'FALSE', no further investigations regarding stability problems are necessary.
-    bool DestabilizingLoad();
+    bool DestabilizingLoad() const;
     void setDestabilizingLoad(bool v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_BOOL; } return IfcStructuralActivity::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::UNDEFINED; } return IfcStructuralActivity::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "DestabilizingLoad"; } return IfcStructuralActivity::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcStructuralAction (IfcAbstractEntityPtr e);
-    IfcStructuralAction (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcStructuralLoad* v8_AppliedLoad, IfcGlobalOrLocalEnum::IfcGlobalOrLocalEnum v9_GlobalOrLocal, boost::optional< bool > v10_DestabilizingLoad);
-    typedef IfcStructuralAction* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcStructuralAction > > list;
-    typedef IfcTemplatedEntityList< IfcStructuralAction >::it it;
+    IfcStructuralAction (IfcAbstractEntity* e);
+    IfcStructuralAction (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcStructuralLoad* v8_AppliedLoad, IfcGlobalOrLocalEnum::IfcGlobalOrLocalEnum v9_GlobalOrLocal, boost::optional< bool > v10_DestabilizingLoad);
+    typedef IfcTemplatedEntityList< IfcStructuralAction > list;
 };
 /// Definition from IAI: An IfcStructuralConnection represents a structural connection object (node i.e. vertex connection, or edge connection, or surface connection) or supports.
 /// 
@@ -35902,23 +36618,22 @@ class IfcStructuralAction : public IfcStructuralActivity {
 class IfcStructuralConnection : public IfcStructuralItem {
 public:
     /// Whether the optional attribute AppliedCondition is defined for this IfcStructuralConnection
-    bool hasAppliedCondition();
+    bool hasAppliedCondition() const;
     /// Optional boundary conditions which define support conditions of this connection object, given in local coordinate directions of the connection object.  If left unspecified, the connection object is assumed to have no supports besides being connected with members.
-    IfcBoundaryCondition* AppliedCondition();
+    IfcBoundaryCondition* AppliedCondition() const;
     void setAppliedCondition(IfcBoundaryCondition* v);
     virtual unsigned int getArgumentCount() const { return 8; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 7: return IfcUtil::Argument_ENTITY; } return IfcStructuralItem::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 7: return Type::IfcBoundaryCondition; } return IfcStructuralItem::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 7: return "AppliedCondition"; } return IfcStructuralItem::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelConnectsStructuralMember > > ConnectsStructuralMembers(); // INVERSE IfcRelConnectsStructuralMember::RelatedStructuralConnection
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcRelConnectsStructuralMember >::ptr ConnectsStructuralMembers() const; // INVERSE IfcRelConnectsStructuralMember::RelatedStructuralConnection
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcStructuralConnection (IfcAbstractEntityPtr e);
-    IfcStructuralConnection (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcBoundaryCondition* v8_AppliedCondition);
-    typedef IfcStructuralConnection* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcStructuralConnection > > list;
-    typedef IfcTemplatedEntityList< IfcStructuralConnection >::it it;
+    IfcStructuralConnection (IfcAbstractEntity* e);
+    IfcStructuralConnection (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcBoundaryCondition* v8_AppliedCondition);
+    typedef IfcTemplatedEntityList< IfcStructuralConnection > list;
 };
 /// Definition from IAI: Defines an action which is distributed over a curve.
 /// A curve action may be connected with a curve member or curve connection, or
@@ -35979,25 +36694,24 @@ class IfcStructuralConnection : public IfcStructuralItem {
 class IfcStructuralCurveAction : public IfcStructuralAction {
 public:
     /// Whether the optional attribute ProjectedOrTrue is defined for this IfcStructuralCurveAction
-    bool hasProjectedOrTrue();
+    bool hasProjectedOrTrue() const;
     /// Defines whether load values are given per true length of the curve on which they act, or per length of the projection of the curve in load direction.  The latter is only applicable to loads which act in global coordinate directions.
-    IfcProjectedOrTrueLengthEnum::IfcProjectedOrTrueLengthEnum ProjectedOrTrue();
+    IfcProjectedOrTrueLengthEnum::IfcProjectedOrTrueLengthEnum ProjectedOrTrue() const;
     void setProjectedOrTrue(IfcProjectedOrTrueLengthEnum::IfcProjectedOrTrueLengthEnum v);
     /// Type of action according to its distribution of load values.
-    IfcStructuralCurveActivityTypeEnum::IfcStructuralCurveActivityTypeEnum PredefinedType();
+    IfcStructuralCurveActivityTypeEnum::IfcStructuralCurveActivityTypeEnum PredefinedType() const;
     void setPredefinedType(IfcStructuralCurveActivityTypeEnum::IfcStructuralCurveActivityTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 12; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 10: return IfcUtil::Argument_ENUMERATION; case 11: return IfcUtil::Argument_ENUMERATION; } return IfcStructuralAction::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 10: return Type::IfcProjectedOrTrueLengthEnum; case 11: return Type::IfcStructuralCurveActivityTypeEnum; } return IfcStructuralAction::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 10: return "ProjectedOrTrue"; case 11: return "PredefinedType"; } return IfcStructuralAction::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcStructuralCurveAction (IfcAbstractEntityPtr e);
-    IfcStructuralCurveAction (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcStructuralLoad* v8_AppliedLoad, IfcGlobalOrLocalEnum::IfcGlobalOrLocalEnum v9_GlobalOrLocal, boost::optional< bool > v10_DestabilizingLoad, boost::optional< IfcProjectedOrTrueLengthEnum::IfcProjectedOrTrueLengthEnum > v11_ProjectedOrTrue, IfcStructuralCurveActivityTypeEnum::IfcStructuralCurveActivityTypeEnum v12_PredefinedType);
-    typedef IfcStructuralCurveAction* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcStructuralCurveAction > > list;
-    typedef IfcTemplatedEntityList< IfcStructuralCurveAction >::it it;
+    IfcStructuralCurveAction (IfcAbstractEntity* e);
+    IfcStructuralCurveAction (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcStructuralLoad* v8_AppliedLoad, IfcGlobalOrLocalEnum::IfcGlobalOrLocalEnum v9_GlobalOrLocal, boost::optional< bool > v10_DestabilizingLoad, boost::optional< IfcProjectedOrTrueLengthEnum::IfcProjectedOrTrueLengthEnum > v11_ProjectedOrTrue, IfcStructuralCurveActivityTypeEnum::IfcStructuralCurveActivityTypeEnum v12_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcStructuralCurveAction > list;
 };
 /// Definition from IAI: Instances of IfcStructuralCurveConnection describe edge 'nodes', i.e. edges where two or more surface members are joined, or edge supports.  Edge curves may be straight or curved.
 /// 
@@ -36021,20 +36735,19 @@ class IfcStructuralCurveConnection : public IfcStructuralConnection {
     /// Direction which is used in the definition of the local z axis.  Axis is specified relative to the so-called global coordinate system, i.e. the SELF\IfcProduct.ObjectPlacement.
     /// 
     /// NOTE  It is desirable and usually possible that many instances of IfcStructuralCurveConnection and IfcStructuralCurveMember share a common instance of IfcDirection as their Axis attribute.
-    IfcDirection* Axis();
+    IfcDirection* Axis() const;
     void setAxis(IfcDirection* v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_ENTITY; } return IfcStructuralConnection::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcDirection; } return IfcStructuralConnection::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "Axis"; } return IfcStructuralConnection::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcStructuralCurveConnection (IfcAbstractEntityPtr e);
-    IfcStructuralCurveConnection (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcBoundaryCondition* v8_AppliedCondition, IfcDirection* v9_Axis);
-    typedef IfcStructuralCurveConnection* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcStructuralCurveConnection > > list;
-    typedef IfcTemplatedEntityList< IfcStructuralCurveConnection >::it it;
+    IfcStructuralCurveConnection (IfcAbstractEntity* e);
+    IfcStructuralCurveConnection (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcBoundaryCondition* v8_AppliedCondition, IfcDirection* v9_Axis);
+    typedef IfcTemplatedEntityList< IfcStructuralCurveConnection > list;
 };
 /// Definition from IAI: Instances of IfcStructuralCurveMember describe edge members, i.e. structural analysis idealizations of beams, columns, rods etc..  Curve members may be straight or curved.
 /// 
@@ -36076,25 +36789,24 @@ class IfcStructuralCurveConnection : public IfcStructuralConnection {
 class IfcStructuralCurveMember : public IfcStructuralMember {
 public:
     /// Type of member with respect to its load carrying behavior in this analysis idealization.
-    IfcStructuralCurveMemberTypeEnum::IfcStructuralCurveMemberTypeEnum PredefinedType();
+    IfcStructuralCurveMemberTypeEnum::IfcStructuralCurveMemberTypeEnum PredefinedType() const;
     void setPredefinedType(IfcStructuralCurveMemberTypeEnum::IfcStructuralCurveMemberTypeEnum v);
     /// Direction which is used in the definition of the local z axis.  Axis is specified relative to the so-called global coordinate system, i.e. the SELF\IfcProduct.ObjectPlacement.
     /// 
     /// NOTE  It is desirable and usually possible that many instances of IfcStructuralCurveConnection and IfcStructuralCurveMember share a common instance of IfcDirection as their Axis attribute.
-    IfcDirection* Axis();
+    IfcDirection* Axis() const;
     void setAxis(IfcDirection* v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 7: return IfcUtil::Argument_ENUMERATION; case 8: return IfcUtil::Argument_ENTITY; } return IfcStructuralMember::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 7: return Type::IfcStructuralCurveMemberTypeEnum; case 8: return Type::IfcDirection; } return IfcStructuralMember::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 7: return "PredefinedType"; case 8: return "Axis"; } return IfcStructuralMember::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcStructuralCurveMember (IfcAbstractEntityPtr e);
-    IfcStructuralCurveMember (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcStructuralCurveMemberTypeEnum::IfcStructuralCurveMemberTypeEnum v8_PredefinedType, IfcDirection* v9_Axis);
-    typedef IfcStructuralCurveMember* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcStructuralCurveMember > > list;
-    typedef IfcTemplatedEntityList< IfcStructuralCurveMember >::it it;
+    IfcStructuralCurveMember (IfcAbstractEntity* e);
+    IfcStructuralCurveMember (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcStructuralCurveMemberTypeEnum::IfcStructuralCurveMemberTypeEnum v8_PredefinedType, IfcDirection* v9_Axis);
+    typedef IfcTemplatedEntityList< IfcStructuralCurveMember > list;
 };
 /// Definition from IAI: Describes edge members with varying profile properties.  Each instance of IfcStructuralCurveMemberVarying is composed of two or more instances of IfcStructuralCurveMember with differing profile properties.  These subordinate members relate to the instance of IfcStructuralCurveMemberVarying by IfcRelAggregates.
 /// 
@@ -36120,16 +36832,15 @@ class IfcStructuralCurveMemberVarying : public IfcStructuralCurveMember {
 public:
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcStructuralCurveMember::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcStructuralCurveMember::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcStructuralCurveMember::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcStructuralCurveMemberVarying (IfcAbstractEntityPtr e);
-    IfcStructuralCurveMemberVarying (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcStructuralCurveMemberTypeEnum::IfcStructuralCurveMemberTypeEnum v8_PredefinedType, IfcDirection* v9_Axis);
-    typedef IfcStructuralCurveMemberVarying* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcStructuralCurveMemberVarying > > list;
-    typedef IfcTemplatedEntityList< IfcStructuralCurveMemberVarying >::it it;
+    IfcStructuralCurveMemberVarying (IfcAbstractEntity* e);
+    IfcStructuralCurveMemberVarying (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcStructuralCurveMemberTypeEnum::IfcStructuralCurveMemberTypeEnum v8_PredefinedType, IfcDirection* v9_Axis);
+    typedef IfcTemplatedEntityList< IfcStructuralCurveMemberVarying > list;
 };
 /// Definition from IAI: Defines a reaction which occurs distributed over a curve.
 /// A curve reaction may be connected with a curve member or curve connection,
@@ -36184,20 +36895,19 @@ class IfcStructuralCurveMemberVarying : public IfcStructuralCurveMember {
 class IfcStructuralCurveReaction : public IfcStructuralReaction {
 public:
     /// Type of reaction according to its distribution of load values.
-    IfcStructuralCurveActivityTypeEnum::IfcStructuralCurveActivityTypeEnum PredefinedType();
+    IfcStructuralCurveActivityTypeEnum::IfcStructuralCurveActivityTypeEnum PredefinedType() const;
     void setPredefinedType(IfcStructuralCurveActivityTypeEnum::IfcStructuralCurveActivityTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcStructuralReaction::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcStructuralCurveActivityTypeEnum; } return IfcStructuralReaction::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcStructuralReaction::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcStructuralCurveReaction (IfcAbstractEntityPtr e);
-    IfcStructuralCurveReaction (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcStructuralLoad* v8_AppliedLoad, IfcGlobalOrLocalEnum::IfcGlobalOrLocalEnum v9_GlobalOrLocal, IfcStructuralCurveActivityTypeEnum::IfcStructuralCurveActivityTypeEnum v10_PredefinedType);
-    typedef IfcStructuralCurveReaction* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcStructuralCurveReaction > > list;
-    typedef IfcTemplatedEntityList< IfcStructuralCurveReaction >::it it;
+    IfcStructuralCurveReaction (IfcAbstractEntity* e);
+    IfcStructuralCurveReaction (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcStructuralLoad* v8_AppliedLoad, IfcGlobalOrLocalEnum::IfcGlobalOrLocalEnum v9_GlobalOrLocal, IfcStructuralCurveActivityTypeEnum::IfcStructuralCurveActivityTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcStructuralCurveReaction > list;
 };
 /// Definition from IAI: Defines an action with constant value which is distributed over a curve.
 /// 
@@ -36210,16 +36920,15 @@ class IfcStructuralLinearAction : public IfcStructuralCurveAction {
 public:
     virtual unsigned int getArgumentCount() const { return 12; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcStructuralCurveAction::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcStructuralCurveAction::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcStructuralCurveAction::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcStructuralLinearAction (IfcAbstractEntityPtr e);
-    IfcStructuralLinearAction (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcStructuralLoad* v8_AppliedLoad, IfcGlobalOrLocalEnum::IfcGlobalOrLocalEnum v9_GlobalOrLocal, boost::optional< bool > v10_DestabilizingLoad, boost::optional< IfcProjectedOrTrueLengthEnum::IfcProjectedOrTrueLengthEnum > v11_ProjectedOrTrue, IfcStructuralCurveActivityTypeEnum::IfcStructuralCurveActivityTypeEnum v12_PredefinedType);
-    typedef IfcStructuralLinearAction* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcStructuralLinearAction > > list;
-    typedef IfcTemplatedEntityList< IfcStructuralLinearAction >::it it;
+    IfcStructuralLinearAction (IfcAbstractEntity* e);
+    IfcStructuralLinearAction (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcStructuralLoad* v8_AppliedLoad, IfcGlobalOrLocalEnum::IfcGlobalOrLocalEnum v9_GlobalOrLocal, boost::optional< bool > v10_DestabilizingLoad, boost::optional< IfcProjectedOrTrueLengthEnum::IfcProjectedOrTrueLengthEnum > v11_ProjectedOrTrue, IfcStructuralCurveActivityTypeEnum::IfcStructuralCurveActivityTypeEnum v12_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcStructuralLinearAction > list;
 };
 /// Definition from IAI: The entity IfcStructuralLoadGroup is used to structure the
 /// physical impacts.  By using the grouping features inherited from IfcGroup, instances of
@@ -36257,38 +36966,37 @@ class IfcStructuralLinearAction : public IfcStructuralCurveAction {
 class IfcStructuralLoadGroup : public IfcGroup {
 public:
     /// Selects a predefined type for the load group.  It can be differentiated between load groups, load cases, load combinations, or userdefined grouping levels.
-    IfcLoadGroupTypeEnum::IfcLoadGroupTypeEnum PredefinedType();
+    IfcLoadGroupTypeEnum::IfcLoadGroupTypeEnum PredefinedType() const;
     void setPredefinedType(IfcLoadGroupTypeEnum::IfcLoadGroupTypeEnum v);
     /// Type of actions in the group. Normally needed if 'PredefinedType' specifies a LOAD_CASE.
-    IfcActionTypeEnum::IfcActionTypeEnum ActionType();
+    IfcActionTypeEnum::IfcActionTypeEnum ActionType() const;
     void setActionType(IfcActionTypeEnum::IfcActionTypeEnum v);
     /// Source of actions in the group. Normally needed if 'PredefinedType' specifies a LOAD_CASE.
-    IfcActionSourceTypeEnum::IfcActionSourceTypeEnum ActionSource();
+    IfcActionSourceTypeEnum::IfcActionSourceTypeEnum ActionSource() const;
     void setActionSource(IfcActionSourceTypeEnum::IfcActionSourceTypeEnum v);
     /// Whether the optional attribute Coefficient is defined for this IfcStructuralLoadGroup
-    bool hasCoefficient();
+    bool hasCoefficient() const;
     /// Load factor. If omitted, a factor is not yet known or not specified. A load factor of 1.0 shall be explicitly exported as Coefficient = 1.0.
-    IfcRatioMeasure Coefficient();
-    void setCoefficient(IfcRatioMeasure v);
+    double Coefficient() const;
+    void setCoefficient(double v);
     /// Whether the optional attribute Purpose is defined for this IfcStructuralLoadGroup
-    bool hasPurpose();
+    bool hasPurpose() const;
     /// Description of the purpose of this instance. Among else, possible values of the Purpose of load combinations are 'SLS', 'ULS', 'ALS' to indicate serviceability, ultimate, or accidental limit state.
-    IfcLabel Purpose();
-    void setPurpose(IfcLabel v);
+    std::string Purpose() const;
+    void setPurpose(std::string v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 5: return IfcUtil::Argument_ENUMERATION; case 6: return IfcUtil::Argument_ENUMERATION; case 7: return IfcUtil::Argument_ENUMERATION; case 8: return IfcUtil::Argument_DOUBLE; case 9: return IfcUtil::Argument_STRING; } return IfcGroup::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 5: return Type::IfcLoadGroupTypeEnum; case 6: return Type::IfcActionTypeEnum; case 7: return Type::IfcActionSourceTypeEnum; case 8: return Type::IfcRatioMeasure; case 9: return Type::IfcLabel; } return IfcGroup::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 5: return "PredefinedType"; case 6: return "ActionType"; case 7: return "ActionSource"; case 8: return "Coefficient"; case 9: return "Purpose"; } return IfcGroup::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcStructuralResultGroup > > SourceOfResultGroup(); // INVERSE IfcStructuralResultGroup::ResultForLoadGroup
-    SHARED_PTR< IfcTemplatedEntityList< IfcStructuralAnalysisModel > > LoadGroupFor(); // INVERSE IfcStructuralAnalysisModel::LoadedBy
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcStructuralResultGroup >::ptr SourceOfResultGroup() const; // INVERSE IfcStructuralResultGroup::ResultForLoadGroup
+    IfcTemplatedEntityList< IfcStructuralAnalysisModel >::ptr LoadGroupFor() const; // INVERSE IfcStructuralAnalysisModel::LoadedBy
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcStructuralLoadGroup (IfcAbstractEntityPtr e);
-    IfcStructuralLoadGroup (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcLoadGroupTypeEnum::IfcLoadGroupTypeEnum v6_PredefinedType, IfcActionTypeEnum::IfcActionTypeEnum v7_ActionType, IfcActionSourceTypeEnum::IfcActionSourceTypeEnum v8_ActionSource, boost::optional< IfcRatioMeasure > v9_Coefficient, boost::optional< IfcLabel > v10_Purpose);
-    typedef IfcStructuralLoadGroup* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcStructuralLoadGroup > > list;
-    typedef IfcTemplatedEntityList< IfcStructuralLoadGroup >::it it;
+    IfcStructuralLoadGroup (IfcAbstractEntity* e);
+    IfcStructuralLoadGroup (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcLoadGroupTypeEnum::IfcLoadGroupTypeEnum v6_PredefinedType, IfcActionTypeEnum::IfcActionTypeEnum v7_ActionType, IfcActionSourceTypeEnum::IfcActionSourceTypeEnum v8_ActionSource, boost::optional< double > v9_Coefficient, boost::optional< std::string > v10_Purpose);
+    typedef IfcTemplatedEntityList< IfcStructuralLoadGroup > list;
 };
 /// Definition from IAI: Defines an action which acts on a point.
 /// A point action is typically connected with a point connection.
@@ -36339,16 +37047,15 @@ class IfcStructuralPointAction : public IfcStructuralAction {
 public:
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcStructuralAction::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcStructuralAction::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcStructuralAction::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcStructuralPointAction (IfcAbstractEntityPtr e);
-    IfcStructuralPointAction (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcStructuralLoad* v8_AppliedLoad, IfcGlobalOrLocalEnum::IfcGlobalOrLocalEnum v9_GlobalOrLocal, boost::optional< bool > v10_DestabilizingLoad);
-    typedef IfcStructuralPointAction* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcStructuralPointAction > > list;
-    typedef IfcTemplatedEntityList< IfcStructuralPointAction >::it it;
+    IfcStructuralPointAction (IfcAbstractEntity* e);
+    IfcStructuralPointAction (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcStructuralLoad* v8_AppliedLoad, IfcGlobalOrLocalEnum::IfcGlobalOrLocalEnum v9_GlobalOrLocal, boost::optional< bool > v10_DestabilizingLoad);
+    typedef IfcTemplatedEntityList< IfcStructuralPointAction > list;
 };
 /// Definition from IAI: Instances of IfcStructuralPointConnection describe structural nodes or point supports.
 /// 
@@ -36366,22 +37073,21 @@ class IfcStructuralPointAction : public IfcStructuralAction {
 class IfcStructuralPointConnection : public IfcStructuralConnection {
 public:
     /// Whether the optional attribute ConditionCoordinateSystem is defined for this IfcStructuralPointConnection
-    bool hasConditionCoordinateSystem();
+    bool hasConditionCoordinateSystem() const;
     /// Defines a coordinate system used for the description of the support condition properties in SELF\IfcStructuralConnection.SupportCondition, specified relative to the global coordinate system (global to the structural analysis model) established by SELF.\IfcProduct.ObjectPlacement.  If left unspecified, the placement IfcAxis2Placement3D((x,y,z), ?, ?) is implied with x,y,z being the coordinates of the reference point of this IfcStructuralPointConnection and the default axes directions being in parallel with the global axes.
-    IfcAxis2Placement3D* ConditionCoordinateSystem();
+    IfcAxis2Placement3D* ConditionCoordinateSystem() const;
     void setConditionCoordinateSystem(IfcAxis2Placement3D* v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_ENTITY; } return IfcStructuralConnection::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcAxis2Placement3D; } return IfcStructuralConnection::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "ConditionCoordinateSystem"; } return IfcStructuralConnection::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcStructuralPointConnection (IfcAbstractEntityPtr e);
-    IfcStructuralPointConnection (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcBoundaryCondition* v8_AppliedCondition, IfcAxis2Placement3D* v9_ConditionCoordinateSystem);
-    typedef IfcStructuralPointConnection* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcStructuralPointConnection > > list;
-    typedef IfcTemplatedEntityList< IfcStructuralPointConnection >::it it;
+    IfcStructuralPointConnection (IfcAbstractEntity* e);
+    IfcStructuralPointConnection (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcBoundaryCondition* v8_AppliedCondition, IfcAxis2Placement3D* v9_ConditionCoordinateSystem);
+    typedef IfcTemplatedEntityList< IfcStructuralPointConnection > list;
 };
 /// Definition from IAI: Defines a reaction which occurs at a point.
 /// A point reaction is typically connected with a point connection.
@@ -36430,16 +37136,15 @@ class IfcStructuralPointReaction : public IfcStructuralReaction {
 public:
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcStructuralReaction::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcStructuralReaction::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcStructuralReaction::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcStructuralPointReaction (IfcAbstractEntityPtr e);
-    IfcStructuralPointReaction (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcStructuralLoad* v8_AppliedLoad, IfcGlobalOrLocalEnum::IfcGlobalOrLocalEnum v9_GlobalOrLocal);
-    typedef IfcStructuralPointReaction* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcStructuralPointReaction > > list;
-    typedef IfcTemplatedEntityList< IfcStructuralPointReaction >::it it;
+    IfcStructuralPointReaction (IfcAbstractEntity* e);
+    IfcStructuralPointReaction (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcStructuralLoad* v8_AppliedLoad, IfcGlobalOrLocalEnum::IfcGlobalOrLocalEnum v9_GlobalOrLocal);
+    typedef IfcTemplatedEntityList< IfcStructuralPointReaction > list;
 };
 /// Definition from IAI: Instances of the entity IfcStructuralResultGroup are used to group results of structural analysis calculations and to capture the connection to the underlying basic load group.  The basic functionality for grouping inherited from IfcGroup is used to collect instances from IfcStructuralReaction or its respective subclasses.
 /// 
@@ -36448,29 +37153,28 @@ class IfcStructuralPointReaction : public IfcStructuralReaction {
 class IfcStructuralResultGroup : public IfcGroup {
 public:
     /// Specifies the analysis theory used to obtain the respective results.
-    IfcAnalysisTheoryTypeEnum::IfcAnalysisTheoryTypeEnum TheoryType();
+    IfcAnalysisTheoryTypeEnum::IfcAnalysisTheoryTypeEnum TheoryType() const;
     void setTheoryType(IfcAnalysisTheoryTypeEnum::IfcAnalysisTheoryTypeEnum v);
     /// Whether the optional attribute ResultForLoadGroup is defined for this IfcStructuralResultGroup
-    bool hasResultForLoadGroup();
+    bool hasResultForLoadGroup() const;
     /// Reference to an instance of IfcStructuralLoadGroup for which this instance represents the result.
-    IfcStructuralLoadGroup* ResultForLoadGroup();
+    IfcStructuralLoadGroup* ResultForLoadGroup() const;
     void setResultForLoadGroup(IfcStructuralLoadGroup* v);
     /// This value allows to easily recognize whether a linear analysis has been applied (allowing the superposition of analysis results).
-    bool IsLinear();
+    bool IsLinear() const;
     void setIsLinear(bool v);
     virtual unsigned int getArgumentCount() const { return 8; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 5: return IfcUtil::Argument_ENUMERATION; case 6: return IfcUtil::Argument_ENTITY; case 7: return IfcUtil::Argument_BOOL; } return IfcGroup::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 5: return Type::IfcAnalysisTheoryTypeEnum; case 6: return Type::IfcStructuralLoadGroup; case 7: return Type::UNDEFINED; } return IfcGroup::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 5: return "TheoryType"; case 6: return "ResultForLoadGroup"; case 7: return "IsLinear"; } return IfcGroup::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcStructuralAnalysisModel > > ResultGroupFor(); // INVERSE IfcStructuralAnalysisModel::HasResults
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcStructuralAnalysisModel >::ptr ResultGroupFor() const; // INVERSE IfcStructuralAnalysisModel::HasResults
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcStructuralResultGroup (IfcAbstractEntityPtr e);
-    IfcStructuralResultGroup (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcAnalysisTheoryTypeEnum::IfcAnalysisTheoryTypeEnum v6_TheoryType, IfcStructuralLoadGroup* v7_ResultForLoadGroup, bool v8_IsLinear);
-    typedef IfcStructuralResultGroup* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcStructuralResultGroup > > list;
-    typedef IfcTemplatedEntityList< IfcStructuralResultGroup >::it it;
+    IfcStructuralResultGroup (IfcAbstractEntity* e);
+    IfcStructuralResultGroup (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcAnalysisTheoryTypeEnum::IfcAnalysisTheoryTypeEnum v6_TheoryType, IfcStructuralLoadGroup* v7_ResultForLoadGroup, bool v8_IsLinear);
+    typedef IfcTemplatedEntityList< IfcStructuralResultGroup > list;
 };
 /// Definition from IAI: Defines an action which is distributed over a surface.
 /// A surface action may be connected with a surface member or surface connection.
@@ -36527,25 +37231,24 @@ class IfcStructuralResultGroup : public IfcGroup {
 class IfcStructuralSurfaceAction : public IfcStructuralAction {
 public:
     /// Whether the optional attribute ProjectedOrTrue is defined for this IfcStructuralSurfaceAction
-    bool hasProjectedOrTrue();
+    bool hasProjectedOrTrue() const;
     /// Defines whether load values are given per true lengths of the surface on which they act, or per lengths of the projection of the surface in load direction.  The latter is only applicable to loads which act in global coordinate directions.
-    IfcProjectedOrTrueLengthEnum::IfcProjectedOrTrueLengthEnum ProjectedOrTrue();
+    IfcProjectedOrTrueLengthEnum::IfcProjectedOrTrueLengthEnum ProjectedOrTrue() const;
     void setProjectedOrTrue(IfcProjectedOrTrueLengthEnum::IfcProjectedOrTrueLengthEnum v);
     /// Type of action according to its distribution of load values.
-    IfcStructuralSurfaceActivityTypeEnum::IfcStructuralSurfaceActivityTypeEnum PredefinedType();
+    IfcStructuralSurfaceActivityTypeEnum::IfcStructuralSurfaceActivityTypeEnum PredefinedType() const;
     void setPredefinedType(IfcStructuralSurfaceActivityTypeEnum::IfcStructuralSurfaceActivityTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 12; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 10: return IfcUtil::Argument_ENUMERATION; case 11: return IfcUtil::Argument_ENUMERATION; } return IfcStructuralAction::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 10: return Type::IfcProjectedOrTrueLengthEnum; case 11: return Type::IfcStructuralSurfaceActivityTypeEnum; } return IfcStructuralAction::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 10: return "ProjectedOrTrue"; case 11: return "PredefinedType"; } return IfcStructuralAction::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcStructuralSurfaceAction (IfcAbstractEntityPtr e);
-    IfcStructuralSurfaceAction (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcStructuralLoad* v8_AppliedLoad, IfcGlobalOrLocalEnum::IfcGlobalOrLocalEnum v9_GlobalOrLocal, boost::optional< bool > v10_DestabilizingLoad, boost::optional< IfcProjectedOrTrueLengthEnum::IfcProjectedOrTrueLengthEnum > v11_ProjectedOrTrue, IfcStructuralSurfaceActivityTypeEnum::IfcStructuralSurfaceActivityTypeEnum v12_PredefinedType);
-    typedef IfcStructuralSurfaceAction* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcStructuralSurfaceAction > > list;
-    typedef IfcTemplatedEntityList< IfcStructuralSurfaceAction >::it it;
+    IfcStructuralSurfaceAction (IfcAbstractEntity* e);
+    IfcStructuralSurfaceAction (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcStructuralLoad* v8_AppliedLoad, IfcGlobalOrLocalEnum::IfcGlobalOrLocalEnum v9_GlobalOrLocal, boost::optional< bool > v10_DestabilizingLoad, boost::optional< IfcProjectedOrTrueLengthEnum::IfcProjectedOrTrueLengthEnum > v11_ProjectedOrTrue, IfcStructuralSurfaceActivityTypeEnum::IfcStructuralSurfaceActivityTypeEnum v12_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcStructuralSurfaceAction > list;
 };
 /// Definition from IAI: Instances of IfcStructuralSurfaceConnection describe face 'nodes', i.e. faces where two or more surface members are joined, or face supports.  Face surfaces may be planar or curved.
 /// 
@@ -36563,16 +37266,15 @@ class IfcStructuralSurfaceConnection : public IfcStructuralConnection {
 public:
     virtual unsigned int getArgumentCount() const { return 8; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcStructuralConnection::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcStructuralConnection::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcStructuralConnection::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcStructuralSurfaceConnection (IfcAbstractEntityPtr e);
-    IfcStructuralSurfaceConnection (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcBoundaryCondition* v8_AppliedCondition);
-    typedef IfcStructuralSurfaceConnection* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcStructuralSurfaceConnection > > list;
-    typedef IfcTemplatedEntityList< IfcStructuralSurfaceConnection >::it it;
+    IfcStructuralSurfaceConnection (IfcAbstractEntity* e);
+    IfcStructuralSurfaceConnection (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcBoundaryCondition* v8_AppliedCondition);
+    typedef IfcTemplatedEntityList< IfcStructuralSurfaceConnection > list;
 };
 /// IfcSubContractResource is a construction resource needed in a construction process that represents a sub-contractor.  
 /// 
@@ -36601,23 +37303,22 @@ class IfcStructuralSurfaceConnection : public IfcStructuralConnection {
 class IfcSubContractResource : public IfcConstructionResource {
 public:
     /// Whether the optional attribute PredefinedType is defined for this IfcSubContractResource
-    bool hasPredefinedType();
+    bool hasPredefinedType() const;
     /// Defines types of subcontract resources.
     /// IFC2x4 New attribute
-    IfcSubContractResourceTypeEnum::IfcSubContractResourceTypeEnum PredefinedType();
+    IfcSubContractResourceTypeEnum::IfcSubContractResourceTypeEnum PredefinedType() const;
     void setPredefinedType(IfcSubContractResourceTypeEnum::IfcSubContractResourceTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 11; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 10: return IfcUtil::Argument_ENUMERATION; } return IfcConstructionResource::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 10: return Type::IfcSubContractResourceTypeEnum; } return IfcConstructionResource::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 10: return "PredefinedType"; } return IfcConstructionResource::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcSubContractResource (IfcAbstractEntityPtr e);
-    IfcSubContractResource (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, boost::optional< IfcIdentifier > v6_Identification, boost::optional< IfcText > v7_LongDescription, IfcResourceTime* v8_Usage, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcAppliedValue > > > v9_BaseCosts, IfcPhysicalQuantity* v10_BaseQuantity, boost::optional< IfcSubContractResourceTypeEnum::IfcSubContractResourceTypeEnum > v11_PredefinedType);
-    typedef IfcSubContractResource* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcSubContractResource > > list;
-    typedef IfcTemplatedEntityList< IfcSubContractResource >::it it;
+    IfcSubContractResource (IfcAbstractEntity* e);
+    IfcSubContractResource (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, boost::optional< std::string > v6_Identification, boost::optional< std::string > v7_LongDescription, IfcResourceTime* v8_Usage, boost::optional< IfcTemplatedEntityList< IfcAppliedValue >::ptr > v9_BaseCosts, IfcPhysicalQuantity* v10_BaseQuantity, boost::optional< IfcSubContractResourceTypeEnum::IfcSubContractResourceTypeEnum > v11_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcSubContractResource > list;
 };
 /// Definition from IAI: A surface feature is a modification at (onto, or into) of the surface of an element.  Parts of the surface of the entire surface may be affected.  The volume and mass of the element may be increased, remain unchanged, or be decreased by the surface feature, depending on manufacturing technology.
 /// 
@@ -36654,22 +37355,21 @@ class IfcSubContractResource : public IfcConstructionResource {
 class IfcSurfaceFeature : public IfcFeatureElement {
 public:
     /// Whether the optional attribute PredefinedType is defined for this IfcSurfaceFeature
-    bool hasPredefinedType();
+    bool hasPredefinedType() const;
     /// Indicates the kind of surface feature.
-    IfcSurfaceFeatureTypeEnum::IfcSurfaceFeatureTypeEnum PredefinedType();
+    IfcSurfaceFeatureTypeEnum::IfcSurfaceFeatureTypeEnum PredefinedType() const;
     void setPredefinedType(IfcSurfaceFeatureTypeEnum::IfcSurfaceFeatureTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_ENUMERATION; } return IfcFeatureElement::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcSurfaceFeatureTypeEnum; } return IfcFeatureElement::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "PredefinedType"; } return IfcFeatureElement::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcSurfaceFeature (IfcAbstractEntityPtr e);
-    IfcSurfaceFeature (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcSurfaceFeatureTypeEnum::IfcSurfaceFeatureTypeEnum > v9_PredefinedType);
-    typedef IfcSurfaceFeature* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcSurfaceFeature > > list;
-    typedef IfcTemplatedEntityList< IfcSurfaceFeature >::it it;
+    IfcSurfaceFeature (IfcAbstractEntity* e);
+    IfcSurfaceFeature (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcSurfaceFeatureTypeEnum::IfcSurfaceFeatureTypeEnum > v9_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcSurfaceFeature > list;
 };
 /// The flow controller type IfcSwitchingDeviceType defines commonly shared information for occurrences of switching devices.  The set of shared information may include: 
 /// 
@@ -36714,20 +37414,19 @@ class IfcSurfaceFeature : public IfcFeatureElement {
 class IfcSwitchingDeviceType : public IfcFlowControllerType {
 public:
     /// Identifies the predefined types of switch from which the type required may be set.
-    IfcSwitchingDeviceTypeEnum::IfcSwitchingDeviceTypeEnum PredefinedType();
+    IfcSwitchingDeviceTypeEnum::IfcSwitchingDeviceTypeEnum PredefinedType() const;
     void setPredefinedType(IfcSwitchingDeviceTypeEnum::IfcSwitchingDeviceTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcFlowControllerType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcSwitchingDeviceTypeEnum; } return IfcFlowControllerType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcFlowControllerType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcSwitchingDeviceType (IfcAbstractEntityPtr e);
-    IfcSwitchingDeviceType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcSwitchingDeviceTypeEnum::IfcSwitchingDeviceTypeEnum v10_PredefinedType);
-    typedef IfcSwitchingDeviceType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcSwitchingDeviceType > > list;
-    typedef IfcTemplatedEntityList< IfcSwitchingDeviceType >::it it;
+    IfcSwitchingDeviceType (IfcAbstractEntity* e);
+    IfcSwitchingDeviceType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcSwitchingDeviceTypeEnum::IfcSwitchingDeviceTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcSwitchingDeviceType > list;
 };
 /// Definition from IAI: Organized combination of
 ///   related parts within an AEC product, composed for a common
@@ -36750,17 +37449,16 @@ class IfcSystem : public IfcGroup {
 public:
     virtual unsigned int getArgumentCount() const { return 5; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcGroup::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcGroup::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcGroup::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelServicesBuildings > > ServicesBuildings(); // INVERSE IfcRelServicesBuildings::RelatingSystem
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcRelServicesBuildings >::ptr ServicesBuildings() const; // INVERSE IfcRelServicesBuildings::RelatingSystem
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcSystem (IfcAbstractEntityPtr e);
-    IfcSystem (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType);
-    typedef IfcSystem* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcSystem > > list;
-    typedef IfcTemplatedEntityList< IfcSystem >::it it;
+    IfcSystem (IfcAbstractEntity* e);
+    IfcSystem (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType);
+    typedef IfcTemplatedEntityList< IfcSystem > list;
 };
 /// A system furniture element defines components of modular furniture which are not directly placed in a building structure but aggregated inside furniture. 
 /// 
@@ -36789,21 +37487,20 @@ class IfcSystem : public IfcGroup {
 class IfcSystemFurnitureElement : public IfcFurnishingElement {
 public:
     /// Whether the optional attribute PredefinedType is defined for this IfcSystemFurnitureElement
-    bool hasPredefinedType();
-    IfcSystemFurnitureElementTypeEnum::IfcSystemFurnitureElementTypeEnum PredefinedType();
+    bool hasPredefinedType() const;
+    IfcSystemFurnitureElementTypeEnum::IfcSystemFurnitureElementTypeEnum PredefinedType() const;
     void setPredefinedType(IfcSystemFurnitureElementTypeEnum::IfcSystemFurnitureElementTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_ENUMERATION; } return IfcFurnishingElement::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcSystemFurnitureElementTypeEnum; } return IfcFurnishingElement::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "PredefinedType"; } return IfcFurnishingElement::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcSystemFurnitureElement (IfcAbstractEntityPtr e);
-    IfcSystemFurnitureElement (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcSystemFurnitureElementTypeEnum::IfcSystemFurnitureElementTypeEnum > v9_PredefinedType);
-    typedef IfcSystemFurnitureElement* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcSystemFurnitureElement > > list;
-    typedef IfcTemplatedEntityList< IfcSystemFurnitureElement >::it it;
+    IfcSystemFurnitureElement (IfcAbstractEntity* e);
+    IfcSystemFurnitureElement (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcSystemFurnitureElementTypeEnum::IfcSystemFurnitureElementTypeEnum > v9_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcSystemFurnitureElement > list;
 };
 /// The flow storage device type IfcTankType defines commonly shared information for occurrences of tanks.  The set of shared information may include: 
 /// 
@@ -36840,136 +37537,131 @@ class IfcSystemFurnitureElement : public IfcFurnishingElement {
 class IfcTankType : public IfcFlowStorageDeviceType {
 public:
     /// Defines the type of tank.
-    IfcTankTypeEnum::IfcTankTypeEnum PredefinedType();
+    IfcTankTypeEnum::IfcTankTypeEnum PredefinedType() const;
     void setPredefinedType(IfcTankTypeEnum::IfcTankTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcFlowStorageDeviceType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcTankTypeEnum; } return IfcFlowStorageDeviceType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcFlowStorageDeviceType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcTankType (IfcAbstractEntityPtr e);
-    IfcTankType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcTankTypeEnum::IfcTankTypeEnum v10_PredefinedType);
-    typedef IfcTankType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcTankType > > list;
-    typedef IfcTemplatedEntityList< IfcTankType >::it it;
+    IfcTankType (IfcAbstractEntity* e);
+    IfcTankType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcTankTypeEnum::IfcTankTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcTankType > list;
 };
 
 class IfcTendon : public IfcReinforcingElement {
 public:
     /// Whether the optional attribute PredefinedType is defined for this IfcTendon
-    bool hasPredefinedType();
-    IfcTendonTypeEnum::IfcTendonTypeEnum PredefinedType();
+    bool hasPredefinedType() const;
+    IfcTendonTypeEnum::IfcTendonTypeEnum PredefinedType() const;
     void setPredefinedType(IfcTendonTypeEnum::IfcTendonTypeEnum v);
     /// Whether the optional attribute NominalDiameter is defined for this IfcTendon
-    bool hasNominalDiameter();
-    IfcPositiveLengthMeasure NominalDiameter();
-    void setNominalDiameter(IfcPositiveLengthMeasure v);
+    bool hasNominalDiameter() const;
+    double NominalDiameter() const;
+    void setNominalDiameter(double v);
     /// Whether the optional attribute CrossSectionArea is defined for this IfcTendon
-    bool hasCrossSectionArea();
-    IfcAreaMeasure CrossSectionArea();
-    void setCrossSectionArea(IfcAreaMeasure v);
+    bool hasCrossSectionArea() const;
+    double CrossSectionArea() const;
+    void setCrossSectionArea(double v);
     /// Whether the optional attribute TensionForce is defined for this IfcTendon
-    bool hasTensionForce();
-    IfcForceMeasure TensionForce();
-    void setTensionForce(IfcForceMeasure v);
+    bool hasTensionForce() const;
+    double TensionForce() const;
+    void setTensionForce(double v);
     /// Whether the optional attribute PreStress is defined for this IfcTendon
-    bool hasPreStress();
-    IfcPressureMeasure PreStress();
-    void setPreStress(IfcPressureMeasure v);
+    bool hasPreStress() const;
+    double PreStress() const;
+    void setPreStress(double v);
     /// Whether the optional attribute FrictionCoefficient is defined for this IfcTendon
-    bool hasFrictionCoefficient();
-    IfcNormalisedRatioMeasure FrictionCoefficient();
-    void setFrictionCoefficient(IfcNormalisedRatioMeasure v);
+    bool hasFrictionCoefficient() const;
+    double FrictionCoefficient() const;
+    void setFrictionCoefficient(double v);
     /// Whether the optional attribute AnchorageSlip is defined for this IfcTendon
-    bool hasAnchorageSlip();
-    IfcPositiveLengthMeasure AnchorageSlip();
-    void setAnchorageSlip(IfcPositiveLengthMeasure v);
+    bool hasAnchorageSlip() const;
+    double AnchorageSlip() const;
+    void setAnchorageSlip(double v);
     /// Whether the optional attribute MinCurvatureRadius is defined for this IfcTendon
-    bool hasMinCurvatureRadius();
-    IfcPositiveLengthMeasure MinCurvatureRadius();
-    void setMinCurvatureRadius(IfcPositiveLengthMeasure v);
+    bool hasMinCurvatureRadius() const;
+    double MinCurvatureRadius() const;
+    void setMinCurvatureRadius(double v);
     virtual unsigned int getArgumentCount() const { return 17; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; case 10: return IfcUtil::Argument_DOUBLE; case 11: return IfcUtil::Argument_DOUBLE; case 12: return IfcUtil::Argument_DOUBLE; case 13: return IfcUtil::Argument_DOUBLE; case 14: return IfcUtil::Argument_DOUBLE; case 15: return IfcUtil::Argument_DOUBLE; case 16: return IfcUtil::Argument_DOUBLE; } return IfcReinforcingElement::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcTendonTypeEnum; case 10: return Type::IfcPositiveLengthMeasure; case 11: return Type::IfcAreaMeasure; case 12: return Type::IfcForceMeasure; case 13: return Type::IfcPressureMeasure; case 14: return Type::IfcNormalisedRatioMeasure; case 15: return Type::IfcPositiveLengthMeasure; case 16: return Type::IfcPositiveLengthMeasure; } return IfcReinforcingElement::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; case 10: return "NominalDiameter"; case 11: return "CrossSectionArea"; case 12: return "TensionForce"; case 13: return "PreStress"; case 14: return "FrictionCoefficient"; case 15: return "AnchorageSlip"; case 16: return "MinCurvatureRadius"; } return IfcReinforcingElement::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcTendon (IfcAbstractEntityPtr e);
-    IfcTendon (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcLabel > v9_SteelGrade, boost::optional< IfcTendonTypeEnum::IfcTendonTypeEnum > v10_PredefinedType, boost::optional< IfcPositiveLengthMeasure > v11_NominalDiameter, boost::optional< IfcAreaMeasure > v12_CrossSectionArea, boost::optional< IfcForceMeasure > v13_TensionForce, boost::optional< IfcPressureMeasure > v14_PreStress, boost::optional< IfcNormalisedRatioMeasure > v15_FrictionCoefficient, boost::optional< IfcPositiveLengthMeasure > v16_AnchorageSlip, boost::optional< IfcPositiveLengthMeasure > v17_MinCurvatureRadius);
-    typedef IfcTendon* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcTendon > > list;
-    typedef IfcTemplatedEntityList< IfcTendon >::it it;
+    IfcTendon (IfcAbstractEntity* e);
+    IfcTendon (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_SteelGrade, boost::optional< IfcTendonTypeEnum::IfcTendonTypeEnum > v10_PredefinedType, boost::optional< double > v11_NominalDiameter, boost::optional< double > v12_CrossSectionArea, boost::optional< double > v13_TensionForce, boost::optional< double > v14_PreStress, boost::optional< double > v15_FrictionCoefficient, boost::optional< double > v16_AnchorageSlip, boost::optional< double > v17_MinCurvatureRadius);
+    typedef IfcTemplatedEntityList< IfcTendon > list;
 };
 
 class IfcTendonAnchor : public IfcReinforcingElement {
 public:
     /// Whether the optional attribute PredefinedType is defined for this IfcTendonAnchor
-    bool hasPredefinedType();
-    IfcTendonAnchorTypeEnum::IfcTendonAnchorTypeEnum PredefinedType();
+    bool hasPredefinedType() const;
+    IfcTendonAnchorTypeEnum::IfcTendonAnchorTypeEnum PredefinedType() const;
     void setPredefinedType(IfcTendonAnchorTypeEnum::IfcTendonAnchorTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcReinforcingElement::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcTendonAnchorTypeEnum; } return IfcReinforcingElement::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcReinforcingElement::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcTendonAnchor (IfcAbstractEntityPtr e);
-    IfcTendonAnchor (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcLabel > v9_SteelGrade, boost::optional< IfcTendonAnchorTypeEnum::IfcTendonAnchorTypeEnum > v10_PredefinedType);
-    typedef IfcTendonAnchor* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcTendonAnchor > > list;
-    typedef IfcTemplatedEntityList< IfcTendonAnchor >::it it;
+    IfcTendonAnchor (IfcAbstractEntity* e);
+    IfcTendonAnchor (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_SteelGrade, boost::optional< IfcTendonAnchorTypeEnum::IfcTendonAnchorTypeEnum > v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcTendonAnchor > list;
 };
 
 class IfcTendonAnchorType : public IfcReinforcingElementType {
 public:
-    IfcTendonAnchorTypeEnum::IfcTendonAnchorTypeEnum PredefinedType();
+    IfcTendonAnchorTypeEnum::IfcTendonAnchorTypeEnum PredefinedType() const;
     void setPredefinedType(IfcTendonAnchorTypeEnum::IfcTendonAnchorTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcReinforcingElementType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcTendonAnchorTypeEnum; } return IfcReinforcingElementType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcReinforcingElementType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcTendonAnchorType (IfcAbstractEntityPtr e);
-    IfcTendonAnchorType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcTendonAnchorTypeEnum::IfcTendonAnchorTypeEnum v10_PredefinedType);
-    typedef IfcTendonAnchorType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcTendonAnchorType > > list;
-    typedef IfcTemplatedEntityList< IfcTendonAnchorType >::it it;
+    IfcTendonAnchorType (IfcAbstractEntity* e);
+    IfcTendonAnchorType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcTendonAnchorTypeEnum::IfcTendonAnchorTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcTendonAnchorType > list;
 };
 
 class IfcTendonType : public IfcReinforcingElementType {
 public:
-    IfcTendonTypeEnum::IfcTendonTypeEnum PredefinedType();
+    IfcTendonTypeEnum::IfcTendonTypeEnum PredefinedType() const;
     void setPredefinedType(IfcTendonTypeEnum::IfcTendonTypeEnum v);
     /// Whether the optional attribute NominalDiameter is defined for this IfcTendonType
-    bool hasNominalDiameter();
-    IfcPositiveLengthMeasure NominalDiameter();
-    void setNominalDiameter(IfcPositiveLengthMeasure v);
+    bool hasNominalDiameter() const;
+    double NominalDiameter() const;
+    void setNominalDiameter(double v);
     /// Whether the optional attribute CrossSectionArea is defined for this IfcTendonType
-    bool hasCrossSectionArea();
-    IfcAreaMeasure CrossSectionArea();
-    void setCrossSectionArea(IfcAreaMeasure v);
+    bool hasCrossSectionArea() const;
+    double CrossSectionArea() const;
+    void setCrossSectionArea(double v);
     /// Whether the optional attribute SheethDiameter is defined for this IfcTendonType
-    bool hasSheethDiameter();
-    IfcPositiveLengthMeasure SheethDiameter();
-    void setSheethDiameter(IfcPositiveLengthMeasure v);
+    bool hasSheethDiameter() const;
+    double SheethDiameter() const;
+    void setSheethDiameter(double v);
     virtual unsigned int getArgumentCount() const { return 13; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; case 10: return IfcUtil::Argument_DOUBLE; case 11: return IfcUtil::Argument_DOUBLE; case 12: return IfcUtil::Argument_DOUBLE; } return IfcReinforcingElementType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcTendonTypeEnum; case 10: return Type::IfcPositiveLengthMeasure; case 11: return Type::IfcAreaMeasure; case 12: return Type::IfcPositiveLengthMeasure; } return IfcReinforcingElementType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; case 10: return "NominalDiameter"; case 11: return "CrossSectionArea"; case 12: return "SheethDiameter"; } return IfcReinforcingElementType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcTendonType (IfcAbstractEntityPtr e);
-    IfcTendonType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcTendonTypeEnum::IfcTendonTypeEnum v10_PredefinedType, boost::optional< IfcPositiveLengthMeasure > v11_NominalDiameter, boost::optional< IfcAreaMeasure > v12_CrossSectionArea, boost::optional< IfcPositiveLengthMeasure > v13_SheethDiameter);
-    typedef IfcTendonType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcTendonType > > list;
-    typedef IfcTemplatedEntityList< IfcTendonType >::it it;
+    IfcTendonType (IfcAbstractEntity* e);
+    IfcTendonType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcTendonTypeEnum::IfcTendonTypeEnum v10_PredefinedType, boost::optional< double > v11_NominalDiameter, boost::optional< double > v12_CrossSectionArea, boost::optional< double > v13_SheethDiameter);
+    typedef IfcTemplatedEntityList< IfcTendonType > list;
 };
 /// The energy conversion device type IfcTransformerType defines commonly shared information for occurrences of transformers.  The set of shared information may include: 
 /// 
@@ -37001,20 +37693,19 @@ class IfcTendonType : public IfcReinforcingElementType {
 class IfcTransformerType : public IfcEnergyConversionDeviceType {
 public:
     /// Identifies the predefined types of transformer from which the type required may be set.
-    IfcTransformerTypeEnum::IfcTransformerTypeEnum PredefinedType();
+    IfcTransformerTypeEnum::IfcTransformerTypeEnum PredefinedType() const;
     void setPredefinedType(IfcTransformerTypeEnum::IfcTransformerTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcEnergyConversionDeviceType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcTransformerTypeEnum; } return IfcEnergyConversionDeviceType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcEnergyConversionDeviceType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcTransformerType (IfcAbstractEntityPtr e);
-    IfcTransformerType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcTransformerTypeEnum::IfcTransformerTypeEnum v10_PredefinedType);
-    typedef IfcTransformerType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcTransformerType > > list;
-    typedef IfcTemplatedEntityList< IfcTransformerType >::it it;
+    IfcTransformerType (IfcAbstractEntity* e);
+    IfcTransformerType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcTransformerTypeEnum::IfcTransformerTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcTransformerType > list;
 };
 /// Definition from IAI: Generalization of all transport
 /// related objects that move people, animals or goods within a
@@ -37135,24 +37826,23 @@ class IfcTransformerType : public IfcEnergyConversionDeviceType {
 class IfcTransportElement : public IfcElement {
 public:
     /// Whether the optional attribute PredefinedType is defined for this IfcTransportElement
-    bool hasPredefinedType();
+    bool hasPredefinedType() const;
     /// Predefined generic types for a transportation element that are specified in an enumeration. There might be property sets defined specifically for each predefined type.
     /// 
     /// IFC2x4 CHANGE  The attribute has been changed to be optional.
-    IfcTransportElementTypeEnum::IfcTransportElementTypeEnum PredefinedType();
+    IfcTransportElementTypeEnum::IfcTransportElementTypeEnum PredefinedType() const;
     void setPredefinedType(IfcTransportElementTypeEnum::IfcTransportElementTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_ENUMERATION; } return IfcElement::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcTransportElementTypeEnum; } return IfcElement::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "PredefinedType"; } return IfcElement::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcTransportElement (IfcAbstractEntityPtr e);
-    IfcTransportElement (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcTransportElementTypeEnum::IfcTransportElementTypeEnum > v9_PredefinedType);
-    typedef IfcTransportElement* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcTransportElement > > list;
-    typedef IfcTemplatedEntityList< IfcTransportElement >::it it;
+    IfcTransportElement (IfcAbstractEntity* e);
+    IfcTransportElement (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcTransportElementTypeEnum::IfcTransportElementTypeEnum > v9_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcTransportElement > list;
 };
 /// Definition from ISO/CD 10303-42:1992:
 /// A trimmed curve is a bounded curve which is created by taking a selected
@@ -37235,32 +37925,31 @@ class IfcTransportElement : public IfcElement {
 class IfcTrimmedCurve : public IfcBoundedCurve {
 public:
     /// The curve to be trimmed. For curves with multiple representations any parameter values given as Trim1 or Trim2 refer to the master representation of the BasisCurve only.
-    IfcCurve* BasisCurve();
+    IfcCurve* BasisCurve() const;
     void setBasisCurve(IfcCurve* v);
     /// The first trimming point which may be specified as a Cartesian point, as a real parameter or both.
-    SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > Trim1();
-    void setTrim1(SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > v);
+    IfcEntityList::ptr Trim1() const;
+    void setTrim1(IfcEntityList::ptr v);
     /// The second trimming point which may be specified as a Cartesian point, as a real parameter or both.
-    SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > Trim2();
-    void setTrim2(SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > v);
+    IfcEntityList::ptr Trim2() const;
+    void setTrim2(IfcEntityList::ptr v);
     /// Flag to indicate whether the direction of the trimmed curve agrees with or is opposed to the direction of the basis curve.
-    bool SenseAgreement();
+    bool SenseAgreement() const;
     void setSenseAgreement(bool v);
     /// Where both parameter and point are present at either end of the curve this indicates the preferred form.
-    IfcTrimmingPreference::IfcTrimmingPreference MasterRepresentation();
+    IfcTrimmingPreference::IfcTrimmingPreference MasterRepresentation() const;
     void setMasterRepresentation(IfcTrimmingPreference::IfcTrimmingPreference v);
     virtual unsigned int getArgumentCount() const { return 5; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_ENTITY; case 1: return IfcUtil::Argument_ENTITY_LIST; case 2: return IfcUtil::Argument_ENTITY_LIST; case 3: return IfcUtil::Argument_BOOL; case 4: return IfcUtil::Argument_ENUMERATION; } return IfcBoundedCurve::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::IfcCurve; case 1: return Type::IfcTrimmingSelect; case 2: return Type::IfcTrimmingSelect; case 3: return Type::UNDEFINED; case 4: return Type::IfcTrimmingPreference; } return IfcBoundedCurve::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "BasisCurve"; case 1: return "Trim1"; case 2: return "Trim2"; case 3: return "SenseAgreement"; case 4: return "MasterRepresentation"; } return IfcBoundedCurve::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcTrimmedCurve (IfcAbstractEntityPtr e);
-    IfcTrimmedCurve (IfcCurve* v1_BasisCurve, IfcEntities v2_Trim1, IfcEntities v3_Trim2, bool v4_SenseAgreement, IfcTrimmingPreference::IfcTrimmingPreference v5_MasterRepresentation);
-    typedef IfcTrimmedCurve* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcTrimmedCurve > > list;
-    typedef IfcTemplatedEntityList< IfcTrimmedCurve >::it it;
+    IfcTrimmedCurve (IfcAbstractEntity* e);
+    IfcTrimmedCurve (IfcCurve* v1_BasisCurve, IfcEntityList::ptr v2_Trim1, IfcEntityList::ptr v3_Trim2, bool v4_SenseAgreement, IfcTrimmingPreference::IfcTrimmingPreference v5_MasterRepresentation);
+    typedef IfcTemplatedEntityList< IfcTrimmedCurve > list;
 };
 /// The energy conversion device type IfcTubeBundleType defines commonly shared information for occurrences of tube bundles.  The set of shared information may include: 
 /// 
@@ -37294,20 +37983,19 @@ class IfcTrimmedCurve : public IfcBoundedCurve {
 class IfcTubeBundleType : public IfcEnergyConversionDeviceType {
 public:
     /// Defines the type of tube bundle.
-    IfcTubeBundleTypeEnum::IfcTubeBundleTypeEnum PredefinedType();
+    IfcTubeBundleTypeEnum::IfcTubeBundleTypeEnum PredefinedType() const;
     void setPredefinedType(IfcTubeBundleTypeEnum::IfcTubeBundleTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcEnergyConversionDeviceType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcTubeBundleTypeEnum; } return IfcEnergyConversionDeviceType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcEnergyConversionDeviceType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcTubeBundleType (IfcAbstractEntityPtr e);
-    IfcTubeBundleType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcTubeBundleTypeEnum::IfcTubeBundleTypeEnum v10_PredefinedType);
-    typedef IfcTubeBundleType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcTubeBundleType > > list;
-    typedef IfcTemplatedEntityList< IfcTubeBundleType >::it it;
+    IfcTubeBundleType (IfcAbstractEntity* e);
+    IfcTubeBundleType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcTubeBundleTypeEnum::IfcTubeBundleTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcTubeBundleType > list;
 };
 /// The energy conversion device type IfcUnitaryEquipmentType defines commonly shared information for occurrences of unitary equipments.  The set of shared information may include: 
 /// 
@@ -37340,20 +38028,19 @@ class IfcTubeBundleType : public IfcEnergyConversionDeviceType {
 class IfcUnitaryEquipmentType : public IfcEnergyConversionDeviceType {
 public:
     /// The type of unitary equipment.
-    IfcUnitaryEquipmentTypeEnum::IfcUnitaryEquipmentTypeEnum PredefinedType();
+    IfcUnitaryEquipmentTypeEnum::IfcUnitaryEquipmentTypeEnum PredefinedType() const;
     void setPredefinedType(IfcUnitaryEquipmentTypeEnum::IfcUnitaryEquipmentTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcEnergyConversionDeviceType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcUnitaryEquipmentTypeEnum; } return IfcEnergyConversionDeviceType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcEnergyConversionDeviceType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcUnitaryEquipmentType (IfcAbstractEntityPtr e);
-    IfcUnitaryEquipmentType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcUnitaryEquipmentTypeEnum::IfcUnitaryEquipmentTypeEnum v10_PredefinedType);
-    typedef IfcUnitaryEquipmentType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcUnitaryEquipmentType > > list;
-    typedef IfcTemplatedEntityList< IfcUnitaryEquipmentType >::it it;
+    IfcUnitaryEquipmentType (IfcAbstractEntity* e);
+    IfcUnitaryEquipmentType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcUnitaryEquipmentTypeEnum::IfcUnitaryEquipmentTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcUnitaryEquipmentType > list;
 };
 /// The flow controller type IfcValveType defines commonly shared information for occurrences of valves.  The set of shared information may include: 
 /// 
@@ -37396,20 +38083,19 @@ class IfcUnitaryEquipmentType : public IfcEnergyConversionDeviceType {
 class IfcValveType : public IfcFlowControllerType {
 public:
     /// The type of valve.
-    IfcValveTypeEnum::IfcValveTypeEnum PredefinedType();
+    IfcValveTypeEnum::IfcValveTypeEnum PredefinedType() const;
     void setPredefinedType(IfcValveTypeEnum::IfcValveTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcFlowControllerType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcValveTypeEnum; } return IfcFlowControllerType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcFlowControllerType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcValveType (IfcAbstractEntityPtr e);
-    IfcValveType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcValveTypeEnum::IfcValveTypeEnum v10_PredefinedType);
-    typedef IfcValveType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcValveType > > list;
-    typedef IfcTemplatedEntityList< IfcValveType >::it it;
+    IfcValveType (IfcAbstractEntity* e);
+    IfcValveType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcValveTypeEnum::IfcValveTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcValveType > list;
 };
 /// A vibration isolator is a device used to minimize the effects of vibration transmissibility in a building. 
 /// 
@@ -37448,21 +38134,20 @@ class IfcValveType : public IfcFlowControllerType {
 class IfcVibrationIsolator : public IfcElementComponent {
 public:
     /// Whether the optional attribute PredefinedType is defined for this IfcVibrationIsolator
-    bool hasPredefinedType();
-    IfcVibrationIsolatorTypeEnum::IfcVibrationIsolatorTypeEnum PredefinedType();
+    bool hasPredefinedType() const;
+    IfcVibrationIsolatorTypeEnum::IfcVibrationIsolatorTypeEnum PredefinedType() const;
     void setPredefinedType(IfcVibrationIsolatorTypeEnum::IfcVibrationIsolatorTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_ENUMERATION; } return IfcElementComponent::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcVibrationIsolatorTypeEnum; } return IfcElementComponent::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "PredefinedType"; } return IfcElementComponent::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcVibrationIsolator (IfcAbstractEntityPtr e);
-    IfcVibrationIsolator (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcVibrationIsolatorTypeEnum::IfcVibrationIsolatorTypeEnum > v9_PredefinedType);
-    typedef IfcVibrationIsolator* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcVibrationIsolator > > list;
-    typedef IfcTemplatedEntityList< IfcVibrationIsolator >::it it;
+    IfcVibrationIsolator (IfcAbstractEntity* e);
+    IfcVibrationIsolator (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcVibrationIsolatorTypeEnum::IfcVibrationIsolatorTypeEnum > v9_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcVibrationIsolator > list;
 };
 /// The element component type IfcVibrationIsolatorType defines commonly shared information for occurrences of vibration isolators.  The set of shared information may include: 
 /// 
@@ -37489,20 +38174,19 @@ class IfcVibrationIsolator : public IfcElementComponent {
 class IfcVibrationIsolatorType : public IfcElementComponentType {
 public:
     /// Defines the type of vibration isolator.
-    IfcVibrationIsolatorTypeEnum::IfcVibrationIsolatorTypeEnum PredefinedType();
+    IfcVibrationIsolatorTypeEnum::IfcVibrationIsolatorTypeEnum PredefinedType() const;
     void setPredefinedType(IfcVibrationIsolatorTypeEnum::IfcVibrationIsolatorTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcElementComponentType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcVibrationIsolatorTypeEnum; } return IfcElementComponentType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcElementComponentType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcVibrationIsolatorType (IfcAbstractEntityPtr e);
-    IfcVibrationIsolatorType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcVibrationIsolatorTypeEnum::IfcVibrationIsolatorTypeEnum v10_PredefinedType);
-    typedef IfcVibrationIsolatorType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcVibrationIsolatorType > > list;
-    typedef IfcTemplatedEntityList< IfcVibrationIsolatorType >::it it;
+    IfcVibrationIsolatorType (IfcAbstractEntity* e);
+    IfcVibrationIsolatorType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcVibrationIsolatorTypeEnum::IfcVibrationIsolatorTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcVibrationIsolatorType > list;
 };
 /// A virtual element is a special element used to provide imaginary boundaries, such as between two adjacent, but not separated, spaces. Virtual elements are usually not displayed and does not have quantities and other measures. Therefore IfcVirtualElement does not have material information and quantities attached.
 /// 
@@ -37594,16 +38278,15 @@ class IfcVirtualElement : public IfcElement {
 public:
     virtual unsigned int getArgumentCount() const { return 8; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcElement::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcElement::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcElement::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcVirtualElement (IfcAbstractEntityPtr e);
-    IfcVirtualElement (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag);
-    typedef IfcVirtualElement* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcVirtualElement > > list;
-    typedef IfcTemplatedEntityList< IfcVirtualElement >::it it;
+    IfcVirtualElement (IfcAbstractEntity* e);
+    IfcVirtualElement (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag);
+    typedef IfcTemplatedEntityList< IfcVirtualElement > list;
 };
 /// Definition from IAI: A voiding feature is a modification of an element which reduces its volume.  Such a feature may be manufactured in different ways, for example by cutting, drilling, or milling of members made of various materials, or by inlays into the formwork of cast members made of materials such as concrete.
 /// 
@@ -37640,22 +38323,21 @@ class IfcVirtualElement : public IfcElement {
 class IfcVoidingFeature : public IfcFeatureElementSubtraction {
 public:
     /// Whether the optional attribute PredefinedType is defined for this IfcVoidingFeature
-    bool hasPredefinedType();
+    bool hasPredefinedType() const;
     /// Qualifies the feature regarding its shape and configuration relative to the voided element.
-    IfcVoidingFeatureTypeEnum::IfcVoidingFeatureTypeEnum PredefinedType();
+    IfcVoidingFeatureTypeEnum::IfcVoidingFeatureTypeEnum PredefinedType() const;
     void setPredefinedType(IfcVoidingFeatureTypeEnum::IfcVoidingFeatureTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_ENUMERATION; } return IfcFeatureElementSubtraction::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcVoidingFeatureTypeEnum; } return IfcFeatureElementSubtraction::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "PredefinedType"; } return IfcFeatureElementSubtraction::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcVoidingFeature (IfcAbstractEntityPtr e);
-    IfcVoidingFeature (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcVoidingFeatureTypeEnum::IfcVoidingFeatureTypeEnum > v9_PredefinedType);
-    typedef IfcVoidingFeature* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcVoidingFeature > > list;
-    typedef IfcTemplatedEntityList< IfcVoidingFeature >::it it;
+    IfcVoidingFeature (IfcAbstractEntity* e);
+    IfcVoidingFeature (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcVoidingFeatureTypeEnum::IfcVoidingFeatureTypeEnum > v9_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcVoidingFeature > list;
 };
 /// Definition from IAI: The element type
 /// IfcWallType defines commonly shared information for
@@ -37744,20 +38426,19 @@ class IfcVoidingFeature : public IfcFeatureElementSubtraction {
 class IfcWallType : public IfcBuildingElementType {
 public:
     /// Identifies the predefined types of a wall element from which the type required may be set.
-    IfcWallTypeEnum::IfcWallTypeEnum PredefinedType();
+    IfcWallTypeEnum::IfcWallTypeEnum PredefinedType() const;
     void setPredefinedType(IfcWallTypeEnum::IfcWallTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcBuildingElementType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcWallTypeEnum; } return IfcBuildingElementType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcBuildingElementType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcWallType (IfcAbstractEntityPtr e);
-    IfcWallType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcWallTypeEnum::IfcWallTypeEnum v10_PredefinedType);
-    typedef IfcWallType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcWallType > > list;
-    typedef IfcTemplatedEntityList< IfcWallType >::it it;
+    IfcWallType (IfcAbstractEntity* e);
+    IfcWallType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcWallTypeEnum::IfcWallTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcWallType > list;
 };
 /// The flow terminal type IfcWasteTerminalType defines commonly shared information for occurrences of waste terminals.  The set of shared information may include: 
 /// 
@@ -37798,20 +38479,19 @@ class IfcWallType : public IfcBuildingElementType {
 class IfcWasteTerminalType : public IfcFlowTerminalType {
 public:
     /// Identifies the predefined types of waste terminal from which the type required may be set.
-    IfcWasteTerminalTypeEnum::IfcWasteTerminalTypeEnum PredefinedType();
+    IfcWasteTerminalTypeEnum::IfcWasteTerminalTypeEnum PredefinedType() const;
     void setPredefinedType(IfcWasteTerminalTypeEnum::IfcWasteTerminalTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcFlowTerminalType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcWasteTerminalTypeEnum; } return IfcFlowTerminalType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcFlowTerminalType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcWasteTerminalType (IfcAbstractEntityPtr e);
-    IfcWasteTerminalType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcWasteTerminalTypeEnum::IfcWasteTerminalTypeEnum v10_PredefinedType);
-    typedef IfcWasteTerminalType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcWasteTerminalType > > list;
-    typedef IfcTemplatedEntityList< IfcWasteTerminalType >::it it;
+    IfcWasteTerminalType (IfcAbstractEntity* e);
+    IfcWasteTerminalType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcWasteTerminalTypeEnum::IfcWasteTerminalTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcWasteTerminalType > list;
 };
 /// Definition from IAI: The element type
 /// IfcWindowType defines commonly shared information for
@@ -37937,31 +38617,30 @@ class IfcWasteTerminalType : public IfcFlowTerminalType {
 class IfcWindowType : public IfcBuildingElementType {
 public:
     /// Identifies the predefined types of a window element from which the type required may be set.
-    IfcWindowTypeEnum::IfcWindowTypeEnum PredefinedType();
+    IfcWindowTypeEnum::IfcWindowTypeEnum PredefinedType() const;
     void setPredefinedType(IfcWindowTypeEnum::IfcWindowTypeEnum v);
     /// Type defining the general layout of the window type in terms of the partitioning of panels.
-    IfcWindowTypePartitioningEnum::IfcWindowTypePartitioningEnum PartitioningType();
+    IfcWindowTypePartitioningEnum::IfcWindowTypePartitioningEnum PartitioningType() const;
     void setPartitioningType(IfcWindowTypePartitioningEnum::IfcWindowTypePartitioningEnum v);
     /// Whether the optional attribute ParameterTakesPrecedence is defined for this IfcWindowType
-    bool hasParameterTakesPrecedence();
-    bool ParameterTakesPrecedence();
+    bool hasParameterTakesPrecedence() const;
+    bool ParameterTakesPrecedence() const;
     void setParameterTakesPrecedence(bool v);
     /// Whether the optional attribute UserDefinedPartitioningType is defined for this IfcWindowType
-    bool hasUserDefinedPartitioningType();
-    IfcLabel UserDefinedPartitioningType();
-    void setUserDefinedPartitioningType(IfcLabel v);
+    bool hasUserDefinedPartitioningType() const;
+    std::string UserDefinedPartitioningType() const;
+    void setUserDefinedPartitioningType(std::string v);
     virtual unsigned int getArgumentCount() const { return 13; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; case 10: return IfcUtil::Argument_ENUMERATION; case 11: return IfcUtil::Argument_BOOL; case 12: return IfcUtil::Argument_STRING; } return IfcBuildingElementType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcWindowTypeEnum; case 10: return Type::IfcWindowTypePartitioningEnum; case 11: return Type::UNDEFINED; case 12: return Type::IfcLabel; } return IfcBuildingElementType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; case 10: return "PartitioningType"; case 11: return "ParameterTakesPrecedence"; case 12: return "UserDefinedPartitioningType"; } return IfcBuildingElementType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcWindowType (IfcAbstractEntityPtr e);
-    IfcWindowType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcWindowTypeEnum::IfcWindowTypeEnum v10_PredefinedType, IfcWindowTypePartitioningEnum::IfcWindowTypePartitioningEnum v11_PartitioningType, boost::optional< bool > v12_ParameterTakesPrecedence, boost::optional< IfcLabel > v13_UserDefinedPartitioningType);
-    typedef IfcWindowType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcWindowType > > list;
-    typedef IfcTemplatedEntityList< IfcWindowType >::it it;
+    IfcWindowType (IfcAbstractEntity* e);
+    IfcWindowType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcWindowTypeEnum::IfcWindowTypeEnum v10_PredefinedType, IfcWindowTypePartitioningEnum::IfcWindowTypePartitioningEnum v11_PartitioningType, boost::optional< bool > v12_ParameterTakesPrecedence, boost::optional< std::string > v13_UserDefinedPartitioningType);
+    typedef IfcTemplatedEntityList< IfcWindowType > list;
 };
 /// An IfcWorkCalendar defines working and non-working time periods for tasks and resources. It enables to define both specific time periods, such as from 7:00 till 12:00 on 25th August 2009, as well as repetitive time periods based on frequently used recurrence patterns, such as each Monday from 7:00 till 12:00 between 1st March 2009 and 31st December 2009.
 /// 
@@ -37979,39 +38658,38 @@ class IfcWindowType : public IfcBuildingElementType {
 class IfcWorkCalendar : public IfcControl {
 public:
     /// Whether the optional attribute WorkingTimes is defined for this IfcWorkCalendar
-    bool hasWorkingTimes();
+    bool hasWorkingTimes() const;
     /// Set of times periods that are regarded as an initial set-up
     ///   of working times. Exception times can then further restrict
     ///   these working times.
-    SHARED_PTR< IfcTemplatedEntityList< IfcWorkTime > > WorkingTimes();
-    void setWorkingTimes(SHARED_PTR< IfcTemplatedEntityList< IfcWorkTime > > v);
+    IfcTemplatedEntityList< IfcWorkTime >::ptr WorkingTimes() const;
+    void setWorkingTimes(IfcTemplatedEntityList< IfcWorkTime >::ptr v);
     /// Whether the optional attribute ExceptionTimes is defined for this IfcWorkCalendar
-    bool hasExceptionTimes();
+    bool hasExceptionTimes() const;
     /// Set of times periods that define exceptions (non-working
     ///   times) for the given working times including the base
     ///   calendar, if provided.
-    SHARED_PTR< IfcTemplatedEntityList< IfcWorkTime > > ExceptionTimes();
-    void setExceptionTimes(SHARED_PTR< IfcTemplatedEntityList< IfcWorkTime > > v);
+    IfcTemplatedEntityList< IfcWorkTime >::ptr ExceptionTimes() const;
+    void setExceptionTimes(IfcTemplatedEntityList< IfcWorkTime >::ptr v);
     /// Whether the optional attribute PredefinedType is defined for this IfcWorkCalendar
-    bool hasPredefinedType();
+    bool hasPredefinedType() const;
     /// Identifies the predefined types of a work calendar from which 
     ///   the type required may be set.
     /// 
     /// Added in IFC 2x4
-    IfcWorkCalendarTypeEnum::IfcWorkCalendarTypeEnum PredefinedType();
+    IfcWorkCalendarTypeEnum::IfcWorkCalendarTypeEnum PredefinedType() const;
     void setPredefinedType(IfcWorkCalendarTypeEnum::IfcWorkCalendarTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 6: return IfcUtil::Argument_ENTITY_LIST; case 7: return IfcUtil::Argument_ENTITY_LIST; case 8: return IfcUtil::Argument_ENUMERATION; } return IfcControl::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 6: return Type::IfcWorkTime; case 7: return Type::IfcWorkTime; case 8: return Type::IfcWorkCalendarTypeEnum; } return IfcControl::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 6: return "WorkingTimes"; case 7: return "ExceptionTimes"; case 8: return "PredefinedType"; } return IfcControl::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcWorkCalendar (IfcAbstractEntityPtr e);
-    IfcWorkCalendar (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, boost::optional< IfcIdentifier > v6_Identification, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcWorkTime > > > v7_WorkingTimes, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcWorkTime > > > v8_ExceptionTimes, boost::optional< IfcWorkCalendarTypeEnum::IfcWorkCalendarTypeEnum > v9_PredefinedType);
-    typedef IfcWorkCalendar* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcWorkCalendar > > list;
-    typedef IfcTemplatedEntityList< IfcWorkCalendar >::it it;
+    IfcWorkCalendar (IfcAbstractEntity* e);
+    IfcWorkCalendar (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, boost::optional< std::string > v6_Identification, boost::optional< IfcTemplatedEntityList< IfcWorkTime >::ptr > v7_WorkingTimes, boost::optional< IfcTemplatedEntityList< IfcWorkTime >::ptr > v8_ExceptionTimes, boost::optional< IfcWorkCalendarTypeEnum::IfcWorkCalendarTypeEnum > v9_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcWorkCalendar > list;
 };
 /// An IfcWorkControl is an abstract supertype which captures information that is common to both IfcWorkPlan and IfcWorkSchedule.
 /// 
@@ -38060,48 +38738,47 @@ class IfcWorkCalendar : public IfcControl {
 class IfcWorkControl : public IfcControl {
 public:
     /// The date that the plan is created.
-    IfcDateTime CreationDate();
-    void setCreationDate(IfcDateTime v);
+    std::string CreationDate() const;
+    void setCreationDate(std::string v);
     /// Whether the optional attribute Creators is defined for this IfcWorkControl
-    bool hasCreators();
+    bool hasCreators() const;
     /// The authors of the work plan.
-    SHARED_PTR< IfcTemplatedEntityList< IfcPerson > > Creators();
-    void setCreators(SHARED_PTR< IfcTemplatedEntityList< IfcPerson > > v);
+    IfcTemplatedEntityList< IfcPerson >::ptr Creators() const;
+    void setCreators(IfcTemplatedEntityList< IfcPerson >::ptr v);
     /// Whether the optional attribute Purpose is defined for this IfcWorkControl
-    bool hasPurpose();
+    bool hasPurpose() const;
     /// A description of the purpose of the work schedule.
-    IfcLabel Purpose();
-    void setPurpose(IfcLabel v);
+    std::string Purpose() const;
+    void setPurpose(std::string v);
     /// Whether the optional attribute Duration is defined for this IfcWorkControl
-    bool hasDuration();
+    bool hasDuration() const;
     /// The total duration of the entire work schedule.
-    IfcDuration Duration();
-    void setDuration(IfcDuration v);
+    std::string Duration() const;
+    void setDuration(std::string v);
     /// Whether the optional attribute TotalFloat is defined for this IfcWorkControl
-    bool hasTotalFloat();
+    bool hasTotalFloat() const;
     /// The total time float of the entire work schedule.
-    IfcDuration TotalFloat();
-    void setTotalFloat(IfcDuration v);
+    std::string TotalFloat() const;
+    void setTotalFloat(std::string v);
     /// The start time of the schedule.
-    IfcDateTime StartTime();
-    void setStartTime(IfcDateTime v);
+    std::string StartTime() const;
+    void setStartTime(std::string v);
     /// Whether the optional attribute FinishTime is defined for this IfcWorkControl
-    bool hasFinishTime();
+    bool hasFinishTime() const;
     /// The finish time of the schedule.
-    IfcDateTime FinishTime();
-    void setFinishTime(IfcDateTime v);
+    std::string FinishTime() const;
+    void setFinishTime(std::string v);
     virtual unsigned int getArgumentCount() const { return 13; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 6: return IfcUtil::Argument_STRING; case 7: return IfcUtil::Argument_ENTITY_LIST; case 8: return IfcUtil::Argument_STRING; case 9: return IfcUtil::Argument_STRING; case 10: return IfcUtil::Argument_STRING; case 11: return IfcUtil::Argument_STRING; case 12: return IfcUtil::Argument_STRING; } return IfcControl::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 6: return Type::IfcDateTime; case 7: return Type::IfcPerson; case 8: return Type::IfcLabel; case 9: return Type::IfcDuration; case 10: return Type::IfcDuration; case 11: return Type::IfcDateTime; case 12: return Type::IfcDateTime; } return IfcControl::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 6: return "CreationDate"; case 7: return "Creators"; case 8: return "Purpose"; case 9: return "Duration"; case 10: return "TotalFloat"; case 11: return "StartTime"; case 12: return "FinishTime"; } return IfcControl::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcWorkControl (IfcAbstractEntityPtr e);
-    IfcWorkControl (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, boost::optional< IfcIdentifier > v6_Identification, IfcDateTime v7_CreationDate, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPerson > > > v8_Creators, boost::optional< IfcLabel > v9_Purpose, boost::optional< IfcDuration > v10_Duration, boost::optional< IfcDuration > v11_TotalFloat, IfcDateTime v12_StartTime, boost::optional< IfcDateTime > v13_FinishTime);
-    typedef IfcWorkControl* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcWorkControl > > list;
-    typedef IfcTemplatedEntityList< IfcWorkControl >::it it;
+    IfcWorkControl (IfcAbstractEntity* e);
+    IfcWorkControl (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, boost::optional< std::string > v6_Identification, std::string v7_CreationDate, boost::optional< IfcTemplatedEntityList< IfcPerson >::ptr > v8_Creators, boost::optional< std::string > v9_Purpose, boost::optional< std::string > v10_Duration, boost::optional< std::string > v11_TotalFloat, std::string v12_StartTime, boost::optional< std::string > v13_FinishTime);
+    typedef IfcTemplatedEntityList< IfcWorkControl > list;
 };
 /// An IfcWorkPlan represents work plans in a construction or a facilities management project.
 /// 
@@ -38131,23 +38808,22 @@ class IfcWorkControl : public IfcControl {
 class IfcWorkPlan : public IfcWorkControl {
 public:
     /// Whether the optional attribute PredefinedType is defined for this IfcWorkPlan
-    bool hasPredefinedType();
+    bool hasPredefinedType() const;
     /// Identifies the predefined types of a work plan from which 
     ///   the type required may be set.
-    IfcWorkPlanTypeEnum::IfcWorkPlanTypeEnum PredefinedType();
+    IfcWorkPlanTypeEnum::IfcWorkPlanTypeEnum PredefinedType() const;
     void setPredefinedType(IfcWorkPlanTypeEnum::IfcWorkPlanTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 14; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 13: return IfcUtil::Argument_ENUMERATION; } return IfcWorkControl::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 13: return Type::IfcWorkPlanTypeEnum; } return IfcWorkControl::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 13: return "PredefinedType"; } return IfcWorkControl::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcWorkPlan (IfcAbstractEntityPtr e);
-    IfcWorkPlan (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, boost::optional< IfcIdentifier > v6_Identification, IfcDateTime v7_CreationDate, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPerson > > > v8_Creators, boost::optional< IfcLabel > v9_Purpose, boost::optional< IfcDuration > v10_Duration, boost::optional< IfcDuration > v11_TotalFloat, IfcDateTime v12_StartTime, boost::optional< IfcDateTime > v13_FinishTime, boost::optional< IfcWorkPlanTypeEnum::IfcWorkPlanTypeEnum > v14_PredefinedType);
-    typedef IfcWorkPlan* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcWorkPlan > > list;
-    typedef IfcTemplatedEntityList< IfcWorkPlan >::it it;
+    IfcWorkPlan (IfcAbstractEntity* e);
+    IfcWorkPlan (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, boost::optional< std::string > v6_Identification, std::string v7_CreationDate, boost::optional< IfcTemplatedEntityList< IfcPerson >::ptr > v8_Creators, boost::optional< std::string > v9_Purpose, boost::optional< std::string > v10_Duration, boost::optional< std::string > v11_TotalFloat, std::string v12_StartTime, boost::optional< std::string > v13_FinishTime, boost::optional< IfcWorkPlanTypeEnum::IfcWorkPlanTypeEnum > v14_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcWorkPlan > list;
 };
 /// An IfcWorkSchedule
 ///   represents a task schedule of a work plan, which in turn
@@ -38192,23 +38868,22 @@ class IfcWorkPlan : public IfcWorkControl {
 class IfcWorkSchedule : public IfcWorkControl {
 public:
     /// Whether the optional attribute PredefinedType is defined for this IfcWorkSchedule
-    bool hasPredefinedType();
+    bool hasPredefinedType() const;
     /// Identifies the predefined types of a work schedule from which 
     ///   the type required may be set.
-    IfcWorkScheduleTypeEnum::IfcWorkScheduleTypeEnum PredefinedType();
+    IfcWorkScheduleTypeEnum::IfcWorkScheduleTypeEnum PredefinedType() const;
     void setPredefinedType(IfcWorkScheduleTypeEnum::IfcWorkScheduleTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 14; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 13: return IfcUtil::Argument_ENUMERATION; } return IfcWorkControl::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 13: return Type::IfcWorkScheduleTypeEnum; } return IfcWorkControl::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 13: return "PredefinedType"; } return IfcWorkControl::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcWorkSchedule (IfcAbstractEntityPtr e);
-    IfcWorkSchedule (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, boost::optional< IfcIdentifier > v6_Identification, IfcDateTime v7_CreationDate, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPerson > > > v8_Creators, boost::optional< IfcLabel > v9_Purpose, boost::optional< IfcDuration > v10_Duration, boost::optional< IfcDuration > v11_TotalFloat, IfcDateTime v12_StartTime, boost::optional< IfcDateTime > v13_FinishTime, boost::optional< IfcWorkScheduleTypeEnum::IfcWorkScheduleTypeEnum > v14_PredefinedType);
-    typedef IfcWorkSchedule* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcWorkSchedule > > list;
-    typedef IfcTemplatedEntityList< IfcWorkSchedule >::it it;
+    IfcWorkSchedule (IfcAbstractEntity* e);
+    IfcWorkSchedule (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, boost::optional< std::string > v6_Identification, std::string v7_CreationDate, boost::optional< IfcTemplatedEntityList< IfcPerson >::ptr > v8_Creators, boost::optional< std::string > v9_Purpose, boost::optional< std::string > v10_Duration, boost::optional< std::string > v11_TotalFloat, std::string v12_StartTime, boost::optional< std::string > v13_FinishTime, boost::optional< IfcWorkScheduleTypeEnum::IfcWorkScheduleTypeEnum > v14_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcWorkSchedule > list;
 };
 /// Definition from IAI: A zone isÿa group of spaces,
 /// partial spaces or other zones. Zone structures may not be
@@ -38298,26 +38973,25 @@ class IfcWorkSchedule : public IfcWorkControl {
 class IfcZone : public IfcSystem {
 public:
     /// Whether the optional attribute LongName is defined for this IfcZone
-    bool hasLongName();
+    bool hasLongName() const;
     /// Long name for a zone, used for informal purposes. It should be used, if available, in conjunction with the inherited Name attribute.
     /// 
     /// NOTE  In many scenarios the Name attribute refers to the short name or number of a zone, and the LongName refers to the full name.
     /// 
     /// IFC2x4 CHANGE The attribute has been added at the end of the entity definition.
-    IfcLabel LongName();
-    void setLongName(IfcLabel v);
+    std::string LongName() const;
+    void setLongName(std::string v);
     virtual unsigned int getArgumentCount() const { return 6; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 5: return IfcUtil::Argument_STRING; } return IfcSystem::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 5: return Type::IfcLabel; } return IfcSystem::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 5: return "LongName"; } return IfcSystem::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcZone (IfcAbstractEntityPtr e);
-    IfcZone (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, boost::optional< IfcLabel > v6_LongName);
-    typedef IfcZone* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcZone > > list;
-    typedef IfcTemplatedEntityList< IfcZone >::it it;
+    IfcZone (IfcAbstractEntity* e);
+    IfcZone (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, boost::optional< std::string > v6_LongName);
+    typedef IfcTemplatedEntityList< IfcZone > list;
 };
 /// A request is the act or instance of asking for something, such as a request for information, bid submission, or performance of work. 
 /// 
@@ -38360,14 +39034,14 @@ class IfcZone : public IfcSystem {
 class IfcActionRequest : public IfcControl {
 public:
     /// Whether the optional attribute PredefinedType is defined for this IfcActionRequest
-    bool hasPredefinedType();
+    bool hasPredefinedType() const;
     /// Identifies the predefined type of sources through which a request can be made.
     /// 
     /// IFC2x4 CHANGE  The attribute has been added.
-    IfcActionRequestTypeEnum::IfcActionRequestTypeEnum PredefinedType();
+    IfcActionRequestTypeEnum::IfcActionRequestTypeEnum PredefinedType() const;
     void setPredefinedType(IfcActionRequestTypeEnum::IfcActionRequestTypeEnum v);
     /// Whether the optional attribute Status is defined for this IfcActionRequest
-    bool hasStatus();
+    bool hasStatus() const;
     /// The status currently assigned to the request.  Possible values include:
     /// Hold: wait to see if further requests are received before deciding on action
     /// NoAction: no action is required on this request
@@ -38375,27 +39049,26 @@ class IfcActionRequest : public IfcControl {
     /// Urgent: take action immediately
     /// 
     /// IFC2x4 CHANGE  The attribute has been added.
-    IfcLabel Status();
-    void setStatus(IfcLabel v);
+    std::string Status() const;
+    void setStatus(std::string v);
     /// Whether the optional attribute LongDescription is defined for this IfcActionRequest
-    bool hasLongDescription();
+    bool hasLongDescription() const;
     /// Detailed description of the permit.
     /// 
     /// IFC2x4 CHANGE  The attribute has been added.
-    IfcText LongDescription();
-    void setLongDescription(IfcText v);
+    std::string LongDescription() const;
+    void setLongDescription(std::string v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 6: return IfcUtil::Argument_ENUMERATION; case 7: return IfcUtil::Argument_STRING; case 8: return IfcUtil::Argument_STRING; } return IfcControl::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 6: return Type::IfcActionRequestTypeEnum; case 7: return Type::IfcLabel; case 8: return Type::IfcText; } return IfcControl::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 6: return "PredefinedType"; case 7: return "Status"; case 8: return "LongDescription"; } return IfcControl::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcActionRequest (IfcAbstractEntityPtr e);
-    IfcActionRequest (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, boost::optional< IfcIdentifier > v6_Identification, boost::optional< IfcActionRequestTypeEnum::IfcActionRequestTypeEnum > v7_PredefinedType, boost::optional< IfcLabel > v8_Status, boost::optional< IfcText > v9_LongDescription);
-    typedef IfcActionRequest* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcActionRequest > > list;
-    typedef IfcTemplatedEntityList< IfcActionRequest >::it it;
+    IfcActionRequest (IfcAbstractEntity* e);
+    IfcActionRequest (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, boost::optional< std::string > v6_Identification, boost::optional< IfcActionRequestTypeEnum::IfcActionRequestTypeEnum > v7_PredefinedType, boost::optional< std::string > v8_Status, boost::optional< std::string > v9_LongDescription);
+    typedef IfcTemplatedEntityList< IfcActionRequest > list;
 };
 /// The flow controller type IfcAirTerminalBoxType defines commonly shared information for occurrences of air boxes.  The set of shared information may include: 
 /// 
@@ -38426,20 +39099,19 @@ class IfcActionRequest : public IfcControl {
 class IfcAirTerminalBoxType : public IfcFlowControllerType {
 public:
     /// The air terminal box type.
-    IfcAirTerminalBoxTypeEnum::IfcAirTerminalBoxTypeEnum PredefinedType();
+    IfcAirTerminalBoxTypeEnum::IfcAirTerminalBoxTypeEnum PredefinedType() const;
     void setPredefinedType(IfcAirTerminalBoxTypeEnum::IfcAirTerminalBoxTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcFlowControllerType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcAirTerminalBoxTypeEnum; } return IfcFlowControllerType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcFlowControllerType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcAirTerminalBoxType (IfcAbstractEntityPtr e);
-    IfcAirTerminalBoxType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcAirTerminalBoxTypeEnum::IfcAirTerminalBoxTypeEnum v10_PredefinedType);
-    typedef IfcAirTerminalBoxType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcAirTerminalBoxType > > list;
-    typedef IfcTemplatedEntityList< IfcAirTerminalBoxType >::it it;
+    IfcAirTerminalBoxType (IfcAbstractEntity* e);
+    IfcAirTerminalBoxType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcAirTerminalBoxTypeEnum::IfcAirTerminalBoxTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcAirTerminalBoxType > list;
 };
 /// The flow terminal type IfcAirTerminalType defines commonly shared information for occurrences of air terminals.  The set of shared information may include: 
 /// 
@@ -38469,20 +39141,19 @@ class IfcAirTerminalBoxType : public IfcFlowControllerType {
 /// The distribution ports relating to the IfcAirTerminalType type are defined by IfcDistributionPort and attached by the IfcRelConnectsPortToElement relationship.  Ports are reflected at occurrences of this type using the IfcRelDefinesByObject relationship.  Refer to the documentation at IfcAirTerminal for standard port definitions.
 class IfcAirTerminalType : public IfcFlowTerminalType {
 public:
-    IfcAirTerminalTypeEnum::IfcAirTerminalTypeEnum PredefinedType();
+    IfcAirTerminalTypeEnum::IfcAirTerminalTypeEnum PredefinedType() const;
     void setPredefinedType(IfcAirTerminalTypeEnum::IfcAirTerminalTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcFlowTerminalType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcAirTerminalTypeEnum; } return IfcFlowTerminalType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcFlowTerminalType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcAirTerminalType (IfcAbstractEntityPtr e);
-    IfcAirTerminalType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcAirTerminalTypeEnum::IfcAirTerminalTypeEnum v10_PredefinedType);
-    typedef IfcAirTerminalType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcAirTerminalType > > list;
-    typedef IfcTemplatedEntityList< IfcAirTerminalType >::it it;
+    IfcAirTerminalType (IfcAbstractEntity* e);
+    IfcAirTerminalType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcAirTerminalTypeEnum::IfcAirTerminalTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcAirTerminalType > list;
 };
 /// The energy conversion device type IfcAirToAirHeatRecoveryType defines commonly shared information for occurrences of air-to-air heat recovery devices.  The set of shared information may include: 
 /// 
@@ -38513,20 +39184,19 @@ class IfcAirTerminalType : public IfcFlowTerminalType {
 class IfcAirToAirHeatRecoveryType : public IfcEnergyConversionDeviceType {
 public:
     /// Defines the type of air to air heat recovery device.
-    IfcAirToAirHeatRecoveryTypeEnum::IfcAirToAirHeatRecoveryTypeEnum PredefinedType();
+    IfcAirToAirHeatRecoveryTypeEnum::IfcAirToAirHeatRecoveryTypeEnum PredefinedType() const;
     void setPredefinedType(IfcAirToAirHeatRecoveryTypeEnum::IfcAirToAirHeatRecoveryTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcEnergyConversionDeviceType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcAirToAirHeatRecoveryTypeEnum; } return IfcEnergyConversionDeviceType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcEnergyConversionDeviceType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcAirToAirHeatRecoveryType (IfcAbstractEntityPtr e);
-    IfcAirToAirHeatRecoveryType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcAirToAirHeatRecoveryTypeEnum::IfcAirToAirHeatRecoveryTypeEnum v10_PredefinedType);
-    typedef IfcAirToAirHeatRecoveryType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcAirToAirHeatRecoveryType > > list;
-    typedef IfcTemplatedEntityList< IfcAirToAirHeatRecoveryType >::it it;
+    IfcAirToAirHeatRecoveryType (IfcAbstractEntity* e);
+    IfcAirToAirHeatRecoveryType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcAirToAirHeatRecoveryTypeEnum::IfcAirToAirHeatRecoveryTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcAirToAirHeatRecoveryType > list;
 };
 /// An asset is a uniquely identifiable grouping of elements acting as a single entity that has a financial value or that can be operated on as a single unit. 
 /// 
@@ -38555,67 +39225,66 @@ class IfcAirToAirHeatRecoveryType : public IfcEnergyConversionDeviceType {
 class IfcAsset : public IfcGroup {
 public:
     /// Whether the optional attribute Identification is defined for this IfcAsset
-    bool hasIdentification();
+    bool hasIdentification() const;
     /// A unique identification assigned to an asset that enables its differentiation from other assets.
     /// NOTE: The asset identifier is unique within the asset register. It differs from the globally unique id assigned to the instance of an entity populating a database.
-    IfcIdentifier Identification();
-    void setIdentification(IfcIdentifier v);
+    std::string Identification() const;
+    void setIdentification(std::string v);
     /// Whether the optional attribute OriginalValue is defined for this IfcAsset
-    bool hasOriginalValue();
+    bool hasOriginalValue() const;
     /// The cost value of the asset at the time of purchase.
-    IfcCostValue* OriginalValue();
+    IfcCostValue* OriginalValue() const;
     void setOriginalValue(IfcCostValue* v);
     /// Whether the optional attribute CurrentValue is defined for this IfcAsset
-    bool hasCurrentValue();
+    bool hasCurrentValue() const;
     /// The current cost value of the asset.
-    IfcCostValue* CurrentValue();
+    IfcCostValue* CurrentValue() const;
     void setCurrentValue(IfcCostValue* v);
     /// Whether the optional attribute TotalReplacementCost is defined for this IfcAsset
-    bool hasTotalReplacementCost();
+    bool hasTotalReplacementCost() const;
     /// The total cost of replacement of the asset.
-    IfcCostValue* TotalReplacementCost();
+    IfcCostValue* TotalReplacementCost() const;
     void setTotalReplacementCost(IfcCostValue* v);
     /// Whether the optional attribute Owner is defined for this IfcAsset
-    bool hasOwner();
+    bool hasOwner() const;
     /// The name of the person or organization that 'owns' the asset.
-    IfcActorSelect Owner();
-    void setOwner(IfcActorSelect v);
+    IfcActorSelect* Owner() const;
+    void setOwner(IfcActorSelect* v);
     /// Whether the optional attribute User is defined for this IfcAsset
-    bool hasUser();
+    bool hasUser() const;
     /// The name of the person or organization that 'uses' the asset.
-    IfcActorSelect User();
-    void setUser(IfcActorSelect v);
+    IfcActorSelect* User() const;
+    void setUser(IfcActorSelect* v);
     /// Whether the optional attribute ResponsiblePerson is defined for this IfcAsset
-    bool hasResponsiblePerson();
+    bool hasResponsiblePerson() const;
     /// The person designated to be responsible for the asset.
     /// NOTE: In some regulations (for example, UK Health and Safety at Work Act, Electricity at Work Regulations), management of assets must have a person identified as being responsible and to whom regulatory, insurance and other organizations communicate. In places where there is not a legal requirement, the responsible person would be the asset manager but would not have a legal status.
-    IfcPerson* ResponsiblePerson();
+    IfcPerson* ResponsiblePerson() const;
     void setResponsiblePerson(IfcPerson* v);
     /// Whether the optional attribute IncorporationDate is defined for this IfcAsset
-    bool hasIncorporationDate();
+    bool hasIncorporationDate() const;
     /// The date on which an asset was incorporated into the works, installed, constructed, erected or completed.
     /// NOTE: This is the date on which an asset is considered to start depreciating.
     /// 
     /// IFC2x4 CHANGE Type changed from IfcDateTimeSelect.
-    IfcDate IncorporationDate();
-    void setIncorporationDate(IfcDate v);
+    std::string IncorporationDate() const;
+    void setIncorporationDate(std::string v);
     /// Whether the optional attribute DepreciatedValue is defined for this IfcAsset
-    bool hasDepreciatedValue();
+    bool hasDepreciatedValue() const;
     /// The current value of an asset within the accounting rules and procedures of an organization.
-    IfcCostValue* DepreciatedValue();
+    IfcCostValue* DepreciatedValue() const;
     void setDepreciatedValue(IfcCostValue* v);
     virtual unsigned int getArgumentCount() const { return 14; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 5: return IfcUtil::Argument_STRING; case 6: return IfcUtil::Argument_ENTITY; case 7: return IfcUtil::Argument_ENTITY; case 8: return IfcUtil::Argument_ENTITY; case 9: return IfcUtil::Argument_ENTITY; case 10: return IfcUtil::Argument_ENTITY; case 11: return IfcUtil::Argument_ENTITY; case 12: return IfcUtil::Argument_STRING; case 13: return IfcUtil::Argument_ENTITY; } return IfcGroup::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 5: return Type::IfcIdentifier; case 6: return Type::IfcCostValue; case 7: return Type::IfcCostValue; case 8: return Type::IfcCostValue; case 9: return Type::IfcActorSelect; case 10: return Type::IfcActorSelect; case 11: return Type::IfcPerson; case 12: return Type::IfcDate; case 13: return Type::IfcCostValue; } return IfcGroup::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 5: return "Identification"; case 6: return "OriginalValue"; case 7: return "CurrentValue"; case 8: return "TotalReplacementCost"; case 9: return "Owner"; case 10: return "User"; case 11: return "ResponsiblePerson"; case 12: return "IncorporationDate"; case 13: return "DepreciatedValue"; } return IfcGroup::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcAsset (IfcAbstractEntityPtr e);
-    IfcAsset (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, boost::optional< IfcIdentifier > v6_Identification, IfcCostValue* v7_OriginalValue, IfcCostValue* v8_CurrentValue, IfcCostValue* v9_TotalReplacementCost, boost::optional< IfcActorSelect > v10_Owner, boost::optional< IfcActorSelect > v11_User, IfcPerson* v12_ResponsiblePerson, boost::optional< IfcDate > v13_IncorporationDate, IfcCostValue* v14_DepreciatedValue);
-    typedef IfcAsset* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcAsset > > list;
-    typedef IfcTemplatedEntityList< IfcAsset >::it it;
+    IfcAsset (IfcAbstractEntity* e);
+    IfcAsset (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, boost::optional< std::string > v6_Identification, IfcCostValue* v7_OriginalValue, IfcCostValue* v8_CurrentValue, IfcCostValue* v9_TotalReplacementCost, IfcActorSelect* v10_Owner, IfcActorSelect* v11_User, IfcPerson* v12_ResponsiblePerson, boost::optional< std::string > v13_IncorporationDate, IfcCostValue* v14_DepreciatedValue);
+    typedef IfcTemplatedEntityList< IfcAsset > list;
 };
 /// The flow terminal type IfcAudioVisualApplianceType defines commonly shared information for occurrences of audio-visual appliances.  The set of shared information may include: 
 /// 
@@ -38662,20 +39331,19 @@ class IfcAsset : public IfcGroup {
 class IfcAudioVisualApplianceType : public IfcFlowTerminalType {
 public:
     /// Identifies the predefined types of audio-visual appliance from which the type required may be set.
-    IfcAudioVisualApplianceTypeEnum::IfcAudioVisualApplianceTypeEnum PredefinedType();
+    IfcAudioVisualApplianceTypeEnum::IfcAudioVisualApplianceTypeEnum PredefinedType() const;
     void setPredefinedType(IfcAudioVisualApplianceTypeEnum::IfcAudioVisualApplianceTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcFlowTerminalType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcAudioVisualApplianceTypeEnum; } return IfcFlowTerminalType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcFlowTerminalType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcAudioVisualApplianceType (IfcAbstractEntityPtr e);
-    IfcAudioVisualApplianceType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcAudioVisualApplianceTypeEnum::IfcAudioVisualApplianceTypeEnum v10_PredefinedType);
-    typedef IfcAudioVisualApplianceType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcAudioVisualApplianceType > > list;
-    typedef IfcTemplatedEntityList< IfcAudioVisualApplianceType >::it it;
+    IfcAudioVisualApplianceType (IfcAbstractEntity* e);
+    IfcAudioVisualApplianceType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcAudioVisualApplianceTypeEnum::IfcAudioVisualApplianceTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcAudioVisualApplianceType > list;
 };
 /// Definition from ISO/CD 10303-42:1992: A B-spline curve is a piecewise parametric polynomial or rational curve described in terms of control points and basis functions. The B-spline curve has been selected as the most stable format to represent all types of polynomial or rational parametric curves. With appropriate attribute values it is capable of representing single span or spline curves of explicit polynomial, rational, Bezier or B-spline type. 
 /// 
@@ -38729,32 +39397,31 @@ class IfcAudioVisualApplianceType : public IfcFlowTerminalType {
 class IfcBSplineCurve : public IfcBoundedCurve {
 public:
     /// The algebraic degree of the basis functions.
-    int Degree();
+    int Degree() const;
     void setDegree(int v);
     /// The list of control points for the curve.
-    SHARED_PTR< IfcTemplatedEntityList< IfcCartesianPoint > > ControlPointsList();
-    void setControlPointsList(SHARED_PTR< IfcTemplatedEntityList< IfcCartesianPoint > > v);
+    IfcTemplatedEntityList< IfcCartesianPoint >::ptr ControlPointsList() const;
+    void setControlPointsList(IfcTemplatedEntityList< IfcCartesianPoint >::ptr v);
     /// Used to identify particular types of curve; it is for information only.
-    IfcBSplineCurveForm::IfcBSplineCurveForm CurveForm();
+    IfcBSplineCurveForm::IfcBSplineCurveForm CurveForm() const;
     void setCurveForm(IfcBSplineCurveForm::IfcBSplineCurveForm v);
     /// Indication of whether the curve is closed; it is for information only.
-    bool ClosedCurve();
+    bool ClosedCurve() const;
     void setClosedCurve(bool v);
     /// Indication whether the curve self-intersects or not; it is for information only.
-    bool SelfIntersect();
+    bool SelfIntersect() const;
     void setSelfIntersect(bool v);
     virtual unsigned int getArgumentCount() const { return 5; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 0: return IfcUtil::Argument_INT; case 1: return IfcUtil::Argument_ENTITY_LIST; case 2: return IfcUtil::Argument_ENUMERATION; case 3: return IfcUtil::Argument_BOOL; case 4: return IfcUtil::Argument_BOOL; } return IfcBoundedCurve::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 0: return Type::UNDEFINED; case 1: return Type::IfcCartesianPoint; case 2: return Type::IfcBSplineCurveForm; case 3: return Type::UNDEFINED; case 4: return Type::UNDEFINED; } return IfcBoundedCurve::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 0: return "Degree"; case 1: return "ControlPointsList"; case 2: return "CurveForm"; case 3: return "ClosedCurve"; case 4: return "SelfIntersect"; } return IfcBoundedCurve::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcBSplineCurve (IfcAbstractEntityPtr e);
-    IfcBSplineCurve (int v1_Degree, SHARED_PTR< IfcTemplatedEntityList< IfcCartesianPoint > > v2_ControlPointsList, IfcBSplineCurveForm::IfcBSplineCurveForm v3_CurveForm, bool v4_ClosedCurve, bool v5_SelfIntersect);
-    typedef IfcBSplineCurve* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcBSplineCurve > > list;
-    typedef IfcTemplatedEntityList< IfcBSplineCurve >::it it;
+    IfcBSplineCurve (IfcAbstractEntity* e);
+    IfcBSplineCurve (int v1_Degree, IfcTemplatedEntityList< IfcCartesianPoint >::ptr v2_ControlPointsList, IfcBSplineCurveForm::IfcBSplineCurveForm v3_CurveForm, bool v4_ClosedCurve, bool v5_SelfIntersect);
+    typedef IfcTemplatedEntityList< IfcBSplineCurve > list;
 };
 /// Definition from ISO 10303:42:1994: This is the type of b-spline curve for which the knot values are explicitly given. This subtype shall be used to represent non-uniform B-spline curves and may be used for other knot types.
 /// 
@@ -38776,26 +39443,25 @@ class IfcBSplineCurve : public IfcBoundedCurve {
 class IfcBSplineCurveWithKnots : public IfcBSplineCurve {
 public:
     /// The multiplicities of the knots. This list defines the number of times each knot in the knots list is to be repeated in constructing the knot array.
-    std::vector< int > /*[2:?]*/ KnotMultiplicities();
+    std::vector< int > /*[2:?]*/ KnotMultiplicities() const;
     void setKnotMultiplicities(std::vector< int > /*[2:?]*/ v);
     /// The list of distinct knots used to define the B-spline basis functions.
-    std::vector< IfcParameterValue > /*[2:?]*/ Knots();
-    void setKnots(std::vector< IfcParameterValue > /*[2:?]*/ v);
+    std::vector< double > /*[2:?]*/ Knots() const;
+    void setKnots(std::vector< double > /*[2:?]*/ v);
     /// The description of the knot type. This is for information only.
-    IfcKnotType::IfcKnotType KnotSpec();
+    IfcKnotType::IfcKnotType KnotSpec() const;
     void setKnotSpec(IfcKnotType::IfcKnotType v);
     virtual unsigned int getArgumentCount() const { return 8; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 5: return IfcUtil::Argument_VECTOR_INT; case 6: return IfcUtil::Argument_VECTOR_DOUBLE; case 7: return IfcUtil::Argument_ENUMERATION; } return IfcBSplineCurve::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 5: return Type::UNDEFINED; case 6: return Type::IfcParameterValue; case 7: return Type::IfcKnotType; } return IfcBSplineCurve::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 5: return "KnotMultiplicities"; case 6: return "Knots"; case 7: return "KnotSpec"; } return IfcBSplineCurve::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcBSplineCurveWithKnots (IfcAbstractEntityPtr e);
-    IfcBSplineCurveWithKnots (int v1_Degree, SHARED_PTR< IfcTemplatedEntityList< IfcCartesianPoint > > v2_ControlPointsList, IfcBSplineCurveForm::IfcBSplineCurveForm v3_CurveForm, bool v4_ClosedCurve, bool v5_SelfIntersect, std::vector< int > /*[2:?]*/ v6_KnotMultiplicities, std::vector< IfcParameterValue > /*[2:?]*/ v7_Knots, IfcKnotType::IfcKnotType v8_KnotSpec);
-    typedef IfcBSplineCurveWithKnots* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcBSplineCurveWithKnots > > list;
-    typedef IfcTemplatedEntityList< IfcBSplineCurveWithKnots >::it it;
+    IfcBSplineCurveWithKnots (IfcAbstractEntity* e);
+    IfcBSplineCurveWithKnots (int v1_Degree, IfcTemplatedEntityList< IfcCartesianPoint >::ptr v2_ControlPointsList, IfcBSplineCurveForm::IfcBSplineCurveForm v3_CurveForm, bool v4_ClosedCurve, bool v5_SelfIntersect, std::vector< int > /*[2:?]*/ v6_KnotMultiplicities, std::vector< double > /*[2:?]*/ v7_Knots, IfcKnotType::IfcKnotType v8_KnotSpec);
+    typedef IfcTemplatedEntityList< IfcBSplineCurveWithKnots > list;
 };
 /// Definition from IAI: The element type
 /// IfcBeamType defines commonly shared information for
@@ -38898,20 +39564,19 @@ class IfcBSplineCurveWithKnots : public IfcBSplineCurve {
 class IfcBeamType : public IfcBuildingElementType {
 public:
     /// Identifies the predefined types of a beam element from which the type required may be set.
-    IfcBeamTypeEnum::IfcBeamTypeEnum PredefinedType();
+    IfcBeamTypeEnum::IfcBeamTypeEnum PredefinedType() const;
     void setPredefinedType(IfcBeamTypeEnum::IfcBeamTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcBuildingElementType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcBeamTypeEnum; } return IfcBuildingElementType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcBuildingElementType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcBeamType (IfcAbstractEntityPtr e);
-    IfcBeamType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcBeamTypeEnum::IfcBeamTypeEnum v10_PredefinedType);
-    typedef IfcBeamType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcBeamType > > list;
-    typedef IfcTemplatedEntityList< IfcBeamType >::it it;
+    IfcBeamType (IfcAbstractEntity* e);
+    IfcBeamType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcBeamTypeEnum::IfcBeamTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcBeamType > list;
 };
 /// The energy conversion device type IfcBoilerType defines commonly shared information for occurrences of boilers.  The set of shared information may include: 
 /// 
@@ -38945,20 +39610,19 @@ class IfcBeamType : public IfcBuildingElementType {
 class IfcBoilerType : public IfcEnergyConversionDeviceType {
 public:
     /// Defines types of boilers.
-    IfcBoilerTypeEnum::IfcBoilerTypeEnum PredefinedType();
+    IfcBoilerTypeEnum::IfcBoilerTypeEnum PredefinedType() const;
     void setPredefinedType(IfcBoilerTypeEnum::IfcBoilerTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcEnergyConversionDeviceType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcBoilerTypeEnum; } return IfcEnergyConversionDeviceType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcEnergyConversionDeviceType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcBoilerType (IfcAbstractEntityPtr e);
-    IfcBoilerType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcBoilerTypeEnum::IfcBoilerTypeEnum v10_PredefinedType);
-    typedef IfcBoilerType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcBoilerType > > list;
-    typedef IfcTemplatedEntityList< IfcBoilerType >::it it;
+    IfcBoilerType (IfcAbstractEntity* e);
+    IfcBoilerType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcBoilerTypeEnum::IfcBoilerTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcBoilerType > list;
 };
 /// Definition from ISO/CD 10303-42:1992ÿ A boundary curve
 /// is a type of bounded curve suitable for the definition of a
@@ -38971,16 +39635,15 @@ class IfcBoundaryCurve : public IfcCompositeCurveOnSurface {
 public:
     virtual unsigned int getArgumentCount() const { return 2; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcCompositeCurveOnSurface::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcCompositeCurveOnSurface::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcCompositeCurveOnSurface::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcBoundaryCurve (IfcAbstractEntityPtr e);
-    IfcBoundaryCurve (SHARED_PTR< IfcTemplatedEntityList< IfcCompositeCurveSegment > > v1_Segments, bool v2_SelfIntersect);
-    typedef IfcBoundaryCurve* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcBoundaryCurve > > list;
-    typedef IfcTemplatedEntityList< IfcBoundaryCurve >::it it;
+    IfcBoundaryCurve (IfcAbstractEntity* e);
+    IfcBoundaryCurve (IfcTemplatedEntityList< IfcCompositeCurveSegment >::ptr v1_Segments, bool v2_SelfIntersect);
+    typedef IfcTemplatedEntityList< IfcBoundaryCurve > list;
 };
 /// Definition from ISO 6707-1:1989: Major functional part
 /// of a building, examples are foundation, floor, roof, wall.
@@ -39349,17 +40012,16 @@ class IfcBuildingElement : public IfcElement {
 public:
     virtual unsigned int getArgumentCount() const { return 8; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcElement::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcElement::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcElement::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelCoversBldgElements > > HasCoverings(); // INVERSE IfcRelCoversBldgElements::RelatingBuildingElement
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcRelCoversBldgElements >::ptr HasCoverings() const; // INVERSE IfcRelCoversBldgElements::RelatingBuildingElement
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcBuildingElement (IfcAbstractEntityPtr e);
-    IfcBuildingElement (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag);
-    typedef IfcBuildingElement* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcBuildingElement > > list;
-    typedef IfcTemplatedEntityList< IfcBuildingElement >::it it;
+    IfcBuildingElement (IfcAbstractEntity* e);
+    IfcBuildingElement (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag);
+    typedef IfcTemplatedEntityList< IfcBuildingElement > list;
 };
 /// Definition from IAI: Layers or major components as subordinate
 /// parts of a building element. Typical usage examples include precast concrete
@@ -39381,22 +40043,21 @@ class IfcBuildingElement : public IfcElement {
 class IfcBuildingElementPart : public IfcElementComponent {
 public:
     /// Whether the optional attribute PredefinedType is defined for this IfcBuildingElementPart
-    bool hasPredefinedType();
+    bool hasPredefinedType() const;
     /// Subtype of building element part
-    IfcBuildingElementPartTypeEnum::IfcBuildingElementPartTypeEnum PredefinedType();
+    IfcBuildingElementPartTypeEnum::IfcBuildingElementPartTypeEnum PredefinedType() const;
     void setPredefinedType(IfcBuildingElementPartTypeEnum::IfcBuildingElementPartTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_ENUMERATION; } return IfcElementComponent::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcBuildingElementPartTypeEnum; } return IfcElementComponent::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "PredefinedType"; } return IfcElementComponent::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcBuildingElementPart (IfcAbstractEntityPtr e);
-    IfcBuildingElementPart (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcBuildingElementPartTypeEnum::IfcBuildingElementPartTypeEnum > v9_PredefinedType);
-    typedef IfcBuildingElementPart* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcBuildingElementPart > > list;
-    typedef IfcTemplatedEntityList< IfcBuildingElementPart >::it it;
+    IfcBuildingElementPart (IfcAbstractEntity* e);
+    IfcBuildingElementPart (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcBuildingElementPartTypeEnum::IfcBuildingElementPartTypeEnum > v9_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcBuildingElementPart > list;
 };
 /// Definition from IAI: The building element part type defines
 /// lists of commonly shared property set definitions and representation maps of parts of a building element.
@@ -39405,20 +40066,19 @@ class IfcBuildingElementPart : public IfcElementComponent {
 class IfcBuildingElementPartType : public IfcElementComponentType {
 public:
     /// Subtype of building element part
-    IfcBuildingElementPartTypeEnum::IfcBuildingElementPartTypeEnum PredefinedType();
+    IfcBuildingElementPartTypeEnum::IfcBuildingElementPartTypeEnum PredefinedType() const;
     void setPredefinedType(IfcBuildingElementPartTypeEnum::IfcBuildingElementPartTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcElementComponentType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcBuildingElementPartTypeEnum; } return IfcElementComponentType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcElementComponentType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcBuildingElementPartType (IfcAbstractEntityPtr e);
-    IfcBuildingElementPartType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcBuildingElementPartTypeEnum::IfcBuildingElementPartTypeEnum v10_PredefinedType);
-    typedef IfcBuildingElementPartType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcBuildingElementPartType > > list;
-    typedef IfcTemplatedEntityList< IfcBuildingElementPartType >::it it;
+    IfcBuildingElementPartType (IfcAbstractEntity* e);
+    IfcBuildingElementPartType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcBuildingElementPartTypeEnum::IfcBuildingElementPartTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcBuildingElementPartType > list;
 };
 /// Definition from IAI: The IfcBuildingElementProxy
 /// is a proxy definition that provides the same functionality as an
@@ -39613,21 +40273,20 @@ class IfcBuildingElementPartType : public IfcElementComponentType {
 class IfcBuildingElementProxy : public IfcBuildingElement {
 public:
     /// Whether the optional attribute PredefinedType is defined for this IfcBuildingElementProxy
-    bool hasPredefinedType();
-    IfcBuildingElementProxyTypeEnum::IfcBuildingElementProxyTypeEnum PredefinedType();
+    bool hasPredefinedType() const;
+    IfcBuildingElementProxyTypeEnum::IfcBuildingElementProxyTypeEnum PredefinedType() const;
     void setPredefinedType(IfcBuildingElementProxyTypeEnum::IfcBuildingElementProxyTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_ENUMERATION; } return IfcBuildingElement::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcBuildingElementProxyTypeEnum; } return IfcBuildingElement::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "PredefinedType"; } return IfcBuildingElement::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcBuildingElementProxy (IfcAbstractEntityPtr e);
-    IfcBuildingElementProxy (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcBuildingElementProxyTypeEnum::IfcBuildingElementProxyTypeEnum > v9_PredefinedType);
-    typedef IfcBuildingElementProxy* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcBuildingElementProxy > > list;
-    typedef IfcTemplatedEntityList< IfcBuildingElementProxy >::it it;
+    IfcBuildingElementProxy (IfcAbstractEntity* e);
+    IfcBuildingElementProxy (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcBuildingElementProxyTypeEnum::IfcBuildingElementProxyTypeEnum > v9_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcBuildingElementProxy > list;
 };
 /// Definition from IAI:
 ///   TheÿIfcBuildingElementProxyType defines a list of
@@ -39666,20 +40325,19 @@ class IfcBuildingElementProxy : public IfcBuildingElement {
 class IfcBuildingElementProxyType : public IfcBuildingElementType {
 public:
     /// Predefined types to define the particular type of an building element proxy. There may be property set definitions available for each predefined or user defined type.
-    IfcBuildingElementProxyTypeEnum::IfcBuildingElementProxyTypeEnum PredefinedType();
+    IfcBuildingElementProxyTypeEnum::IfcBuildingElementProxyTypeEnum PredefinedType() const;
     void setPredefinedType(IfcBuildingElementProxyTypeEnum::IfcBuildingElementProxyTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcBuildingElementType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcBuildingElementProxyTypeEnum; } return IfcBuildingElementType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcBuildingElementType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcBuildingElementProxyType (IfcAbstractEntityPtr e);
-    IfcBuildingElementProxyType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcBuildingElementProxyTypeEnum::IfcBuildingElementProxyTypeEnum v10_PredefinedType);
-    typedef IfcBuildingElementProxyType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcBuildingElementProxyType > > list;
-    typedef IfcTemplatedEntityList< IfcBuildingElementProxyType >::it it;
+    IfcBuildingElementProxyType (IfcAbstractEntity* e);
+    IfcBuildingElementProxyType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcBuildingElementProxyTypeEnum::IfcBuildingElementProxyTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcBuildingElementProxyType > list;
 };
 /// Definition from IAI: A building system is a
 /// group by which building elements are group according to a common
@@ -39720,22 +40378,21 @@ class IfcBuildingElementProxyType : public IfcBuildingElementType {
 class IfcBuildingSystem : public IfcSystem {
 public:
     /// Whether the optional attribute PredefinedType is defined for this IfcBuildingSystem
-    bool hasPredefinedType();
+    bool hasPredefinedType() const;
     /// Predefined types of distribution systems.
-    IfcBuildingSystemTypeEnum::IfcBuildingSystemTypeEnum PredefinedType();
+    IfcBuildingSystemTypeEnum::IfcBuildingSystemTypeEnum PredefinedType() const;
     void setPredefinedType(IfcBuildingSystemTypeEnum::IfcBuildingSystemTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 6; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 5: return IfcUtil::Argument_ENUMERATION; } return IfcSystem::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 5: return Type::IfcBuildingSystemTypeEnum; } return IfcSystem::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 5: return "PredefinedType"; } return IfcSystem::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcBuildingSystem (IfcAbstractEntityPtr e);
-    IfcBuildingSystem (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, boost::optional< IfcBuildingSystemTypeEnum::IfcBuildingSystemTypeEnum > v6_PredefinedType);
-    typedef IfcBuildingSystem* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcBuildingSystem > > list;
-    typedef IfcTemplatedEntityList< IfcBuildingSystem >::it it;
+    IfcBuildingSystem (IfcAbstractEntity* e);
+    IfcBuildingSystem (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, boost::optional< IfcBuildingSystemTypeEnum::IfcBuildingSystemTypeEnum > v6_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcBuildingSystem > list;
 };
 /// The energy conversion device type IfcBurnerType defines commonly shared information for occurrences of burners.  The set of shared information may include: 
 /// 
@@ -39766,20 +40423,19 @@ class IfcBuildingSystem : public IfcSystem {
 /// The distribution ports relating to the IfcBurnerType type are defined by IfcDistributionPort and attached by the IfcRelConnectsPortToElement relationship.  Ports are reflected at occurrences of this type using the IfcRelDefinesByObject relationship.  Refer to the documentation at IfcBurner for standard port definitions.
 class IfcBurnerType : public IfcEnergyConversionDeviceType {
 public:
-    IfcBurnerTypeEnum::IfcBurnerTypeEnum PredefinedType();
+    IfcBurnerTypeEnum::IfcBurnerTypeEnum PredefinedType() const;
     void setPredefinedType(IfcBurnerTypeEnum::IfcBurnerTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcEnergyConversionDeviceType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcBurnerTypeEnum; } return IfcEnergyConversionDeviceType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcEnergyConversionDeviceType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcBurnerType (IfcAbstractEntityPtr e);
-    IfcBurnerType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcBurnerTypeEnum::IfcBurnerTypeEnum v10_PredefinedType);
-    typedef IfcBurnerType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcBurnerType > > list;
-    typedef IfcTemplatedEntityList< IfcBurnerType >::it it;
+    IfcBurnerType (IfcAbstractEntity* e);
+    IfcBurnerType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcBurnerTypeEnum::IfcBurnerTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcBurnerType > list;
 };
 /// The flow fitting type IfcCableCarrierFittingType defines commonly shared information for occurrences of cable carrier fittings.  The set of shared information may include: 
 /// 
@@ -39810,20 +40466,19 @@ class IfcBurnerType : public IfcEnergyConversionDeviceType {
 class IfcCableCarrierFittingType : public IfcFlowFittingType {
 public:
     /// Identifies the predefined types of cable carrier fitting from which the type required may be set.
-    IfcCableCarrierFittingTypeEnum::IfcCableCarrierFittingTypeEnum PredefinedType();
+    IfcCableCarrierFittingTypeEnum::IfcCableCarrierFittingTypeEnum PredefinedType() const;
     void setPredefinedType(IfcCableCarrierFittingTypeEnum::IfcCableCarrierFittingTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcFlowFittingType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcCableCarrierFittingTypeEnum; } return IfcFlowFittingType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcFlowFittingType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcCableCarrierFittingType (IfcAbstractEntityPtr e);
-    IfcCableCarrierFittingType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcCableCarrierFittingTypeEnum::IfcCableCarrierFittingTypeEnum v10_PredefinedType);
-    typedef IfcCableCarrierFittingType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcCableCarrierFittingType > > list;
-    typedef IfcTemplatedEntityList< IfcCableCarrierFittingType >::it it;
+    IfcCableCarrierFittingType (IfcAbstractEntity* e);
+    IfcCableCarrierFittingType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcCableCarrierFittingTypeEnum::IfcCableCarrierFittingTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcCableCarrierFittingType > list;
 };
 /// The flow segment type IfcCableCarrierSegmentType defines commonly shared information for occurrences of cable carrier segments.  The set of shared information may include: 
 /// 
@@ -39860,20 +40515,19 @@ class IfcCableCarrierFittingType : public IfcFlowFittingType {
 class IfcCableCarrierSegmentType : public IfcFlowSegmentType {
 public:
     /// Identifies the predefined types of cable carrier segment from which the type required may be set.
-    IfcCableCarrierSegmentTypeEnum::IfcCableCarrierSegmentTypeEnum PredefinedType();
+    IfcCableCarrierSegmentTypeEnum::IfcCableCarrierSegmentTypeEnum PredefinedType() const;
     void setPredefinedType(IfcCableCarrierSegmentTypeEnum::IfcCableCarrierSegmentTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcFlowSegmentType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcCableCarrierSegmentTypeEnum; } return IfcFlowSegmentType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcFlowSegmentType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcCableCarrierSegmentType (IfcAbstractEntityPtr e);
-    IfcCableCarrierSegmentType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcCableCarrierSegmentTypeEnum::IfcCableCarrierSegmentTypeEnum v10_PredefinedType);
-    typedef IfcCableCarrierSegmentType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcCableCarrierSegmentType > > list;
-    typedef IfcTemplatedEntityList< IfcCableCarrierSegmentType >::it it;
+    IfcCableCarrierSegmentType (IfcAbstractEntity* e);
+    IfcCableCarrierSegmentType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcCableCarrierSegmentTypeEnum::IfcCableCarrierSegmentTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcCableCarrierSegmentType > list;
 };
 /// The flow fitting type IfcCableFittingType defines commonly shared information for occurrences of cable fittings.  The set of shared information may include: 
 /// 
@@ -39906,20 +40560,19 @@ class IfcCableCarrierSegmentType : public IfcFlowSegmentType {
 class IfcCableFittingType : public IfcFlowFittingType {
 public:
     /// Identifies the predefined types of cable fitting from which the type required may be set.
-    IfcCableFittingTypeEnum::IfcCableFittingTypeEnum PredefinedType();
+    IfcCableFittingTypeEnum::IfcCableFittingTypeEnum PredefinedType() const;
     void setPredefinedType(IfcCableFittingTypeEnum::IfcCableFittingTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcFlowFittingType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcCableFittingTypeEnum; } return IfcFlowFittingType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcFlowFittingType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcCableFittingType (IfcAbstractEntityPtr e);
-    IfcCableFittingType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcCableFittingTypeEnum::IfcCableFittingTypeEnum v10_PredefinedType);
-    typedef IfcCableFittingType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcCableFittingType > > list;
-    typedef IfcTemplatedEntityList< IfcCableFittingType >::it it;
+    IfcCableFittingType (IfcAbstractEntity* e);
+    IfcCableFittingType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcCableFittingTypeEnum::IfcCableFittingTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcCableFittingType > list;
 };
 /// The flow segment type IfcCableSegmentType defines commonly shared information for occurrences of cable segments.  The set of shared information may include: 
 /// 
@@ -39965,20 +40618,19 @@ class IfcCableFittingType : public IfcFlowFittingType {
 class IfcCableSegmentType : public IfcFlowSegmentType {
 public:
     /// Identifies the predefined types of cable segment from which the type required may be set.
-    IfcCableSegmentTypeEnum::IfcCableSegmentTypeEnum PredefinedType();
+    IfcCableSegmentTypeEnum::IfcCableSegmentTypeEnum PredefinedType() const;
     void setPredefinedType(IfcCableSegmentTypeEnum::IfcCableSegmentTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcFlowSegmentType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcCableSegmentTypeEnum; } return IfcFlowSegmentType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcFlowSegmentType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcCableSegmentType (IfcAbstractEntityPtr e);
-    IfcCableSegmentType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcCableSegmentTypeEnum::IfcCableSegmentTypeEnum v10_PredefinedType);
-    typedef IfcCableSegmentType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcCableSegmentType > > list;
-    typedef IfcTemplatedEntityList< IfcCableSegmentType >::it it;
+    IfcCableSegmentType (IfcAbstractEntity* e);
+    IfcCableSegmentType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcCableSegmentTypeEnum::IfcCableSegmentTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcCableSegmentType > list;
 };
 /// The energy conversion device type IfcChillerType defines commonly shared information for occurrences of chillers.  The set of shared information may include: 
 /// 
@@ -40015,20 +40667,19 @@ class IfcCableSegmentType : public IfcFlowSegmentType {
 class IfcChillerType : public IfcEnergyConversionDeviceType {
 public:
     /// Defines the typical types of chillers (e.g., air-cooled, water-cooled, etc.).
-    IfcChillerTypeEnum::IfcChillerTypeEnum PredefinedType();
+    IfcChillerTypeEnum::IfcChillerTypeEnum PredefinedType() const;
     void setPredefinedType(IfcChillerTypeEnum::IfcChillerTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcEnergyConversionDeviceType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcChillerTypeEnum; } return IfcEnergyConversionDeviceType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcEnergyConversionDeviceType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcChillerType (IfcAbstractEntityPtr e);
-    IfcChillerType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcChillerTypeEnum::IfcChillerTypeEnum v10_PredefinedType);
-    typedef IfcChillerType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcChillerType > > list;
-    typedef IfcTemplatedEntityList< IfcChillerType >::it it;
+    IfcChillerType (IfcAbstractEntity* e);
+    IfcChillerType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcChillerTypeEnum::IfcChillerTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcChillerType > list;
 };
 /// Definition from ISO 6707-1:1989: Construction
 /// containing one or more flues. Flue: Duct designed to convey the
@@ -40074,23 +40725,22 @@ class IfcChillerType : public IfcEnergyConversionDeviceType {
 class IfcChimney : public IfcBuildingElement {
 public:
     /// Whether the optional attribute PredefinedType is defined for this IfcChimney
-    bool hasPredefinedType();
+    bool hasPredefinedType() const;
     /// Predefined generic type for a chimney that is specified in an enumeration. There may be a property set given specificly for the predefined types.
     ///   NOTE The PredefinedType shall only be used, if no type object IfcChimneyType is assigned, providing its own IfcChimneyType.PredefinedType.
-    IfcChimneyTypeEnum::IfcChimneyTypeEnum PredefinedType();
+    IfcChimneyTypeEnum::IfcChimneyTypeEnum PredefinedType() const;
     void setPredefinedType(IfcChimneyTypeEnum::IfcChimneyTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_ENUMERATION; } return IfcBuildingElement::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcChimneyTypeEnum; } return IfcBuildingElement::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "PredefinedType"; } return IfcBuildingElement::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcChimney (IfcAbstractEntityPtr e);
-    IfcChimney (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcChimneyTypeEnum::IfcChimneyTypeEnum > v9_PredefinedType);
-    typedef IfcChimney* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcChimney > > list;
-    typedef IfcTemplatedEntityList< IfcChimney >::it it;
+    IfcChimney (IfcAbstractEntity* e);
+    IfcChimney (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcChimneyTypeEnum::IfcChimneyTypeEnum > v9_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcChimney > list;
 };
 /// Definition from ISO/CD 10303-42:1992: An IfcCircle is defined by a radius and the location and orientation of the circle. Interpretation of data should be as follows: 
 /// 
@@ -40122,36 +40772,34 @@ class IfcChimney : public IfcBuildingElement {
 class IfcCircle : public IfcConic {
 public:
     /// The radius of the circle, which shall be greater than zero.
-    IfcPositiveLengthMeasure Radius();
-    void setRadius(IfcPositiveLengthMeasure v);
+    double Radius() const;
+    void setRadius(double v);
     virtual unsigned int getArgumentCount() const { return 2; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 1: return IfcUtil::Argument_DOUBLE; } return IfcConic::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 1: return Type::IfcPositiveLengthMeasure; } return IfcConic::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 1: return "Radius"; } return IfcConic::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcCircle (IfcAbstractEntityPtr e);
-    IfcCircle (IfcAxis2Placement v1_Position, IfcPositiveLengthMeasure v2_Radius);
-    typedef IfcCircle* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcCircle > > list;
-    typedef IfcTemplatedEntityList< IfcCircle >::it it;
+    IfcCircle (IfcAbstractEntity* e);
+    IfcCircle (IfcAxis2Placement* v1_Position, double v2_Radius);
+    typedef IfcTemplatedEntityList< IfcCircle > list;
 };
 
 class IfcCivilElement : public IfcElement {
 public:
     virtual unsigned int getArgumentCount() const { return 8; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcElement::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcElement::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcElement::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcCivilElement (IfcAbstractEntityPtr e);
-    IfcCivilElement (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag);
-    typedef IfcCivilElement* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcCivilElement > > list;
-    typedef IfcTemplatedEntityList< IfcCivilElement >::it it;
+    IfcCivilElement (IfcAbstractEntity* e);
+    IfcCivilElement (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag);
+    typedef IfcTemplatedEntityList< IfcCivilElement > list;
 };
 /// The energy conversion device type IfcCoilType defines commonly shared information for occurrences of coils.  The set of shared information may include: 
 /// 
@@ -40183,20 +40831,19 @@ class IfcCivilElement : public IfcElement {
 class IfcCoilType : public IfcEnergyConversionDeviceType {
 public:
     /// Defines typical types of coils (e.g., Cooling, Heating, etc.)
-    IfcCoilTypeEnum::IfcCoilTypeEnum PredefinedType();
+    IfcCoilTypeEnum::IfcCoilTypeEnum PredefinedType() const;
     void setPredefinedType(IfcCoilTypeEnum::IfcCoilTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcEnergyConversionDeviceType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcCoilTypeEnum; } return IfcEnergyConversionDeviceType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcEnergyConversionDeviceType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcCoilType (IfcAbstractEntityPtr e);
-    IfcCoilType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcCoilTypeEnum::IfcCoilTypeEnum v10_PredefinedType);
-    typedef IfcCoilType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcCoilType > > list;
-    typedef IfcTemplatedEntityList< IfcCoilType >::it it;
+    IfcCoilType (IfcAbstractEntity* e);
+    IfcCoilType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcCoilTypeEnum::IfcCoilTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcCoilType > list;
 };
 /// Definition from ISO 6707-1:1989: Structural member of
 /// slender form, usually vertical, that transmits to its base the
@@ -40472,25 +41119,24 @@ class IfcCoilType : public IfcEnergyConversionDeviceType {
 class IfcColumn : public IfcBuildingElement {
 public:
     /// Whether the optional attribute PredefinedType is defined for this IfcColumn
-    bool hasPredefinedType();
+    bool hasPredefinedType() const;
     /// Predefined generic type for a column that is specified in an enumeration. There may be a property set given specificly for the predefined types.
     ///   NOTE The PredefinedType shall only be used, if no type object IfcColumnType is assigned, providing its own IfcColumnType.PredefinedType.
     /// 
     /// IFC2x4 CHANGE  The attribute has been added at the end of the entity definition.
-    IfcColumnTypeEnum::IfcColumnTypeEnum PredefinedType();
+    IfcColumnTypeEnum::IfcColumnTypeEnum PredefinedType() const;
     void setPredefinedType(IfcColumnTypeEnum::IfcColumnTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_ENUMERATION; } return IfcBuildingElement::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcColumnTypeEnum; } return IfcBuildingElement::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "PredefinedType"; } return IfcBuildingElement::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcColumn (IfcAbstractEntityPtr e);
-    IfcColumn (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcColumnTypeEnum::IfcColumnTypeEnum > v9_PredefinedType);
-    typedef IfcColumn* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcColumn > > list;
-    typedef IfcTemplatedEntityList< IfcColumn >::it it;
+    IfcColumn (IfcAbstractEntity* e);
+    IfcColumn (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcColumnTypeEnum::IfcColumnTypeEnum > v9_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcColumn > list;
 };
 /// The standard column,
 /// IfcColumnStandardCase, defines a column with certain
@@ -40741,16 +41387,15 @@ class IfcColumnStandardCase : public IfcColumn {
 public:
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcColumn::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcColumn::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcColumn::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcColumnStandardCase (IfcAbstractEntityPtr e);
-    IfcColumnStandardCase (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcColumnTypeEnum::IfcColumnTypeEnum > v9_PredefinedType);
-    typedef IfcColumnStandardCase* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcColumnStandardCase > > list;
-    typedef IfcTemplatedEntityList< IfcColumnStandardCase >::it it;
+    IfcColumnStandardCase (IfcAbstractEntity* e);
+    IfcColumnStandardCase (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcColumnTypeEnum::IfcColumnTypeEnum > v9_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcColumnStandardCase > list;
 };
 /// The flow terminal type IfcCommunicationsApplianceType defines commonly shared information for occurrences of communications appliances.  The set of shared information may include: 
 /// 
@@ -40787,20 +41432,19 @@ class IfcColumnStandardCase : public IfcColumn {
 class IfcCommunicationsApplianceType : public IfcFlowTerminalType {
 public:
     /// Identifies the predefined types of communications  appliance from which the type required may be set.
-    IfcCommunicationsApplianceTypeEnum::IfcCommunicationsApplianceTypeEnum PredefinedType();
+    IfcCommunicationsApplianceTypeEnum::IfcCommunicationsApplianceTypeEnum PredefinedType() const;
     void setPredefinedType(IfcCommunicationsApplianceTypeEnum::IfcCommunicationsApplianceTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcFlowTerminalType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcCommunicationsApplianceTypeEnum; } return IfcFlowTerminalType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcFlowTerminalType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcCommunicationsApplianceType (IfcAbstractEntityPtr e);
-    IfcCommunicationsApplianceType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcCommunicationsApplianceTypeEnum::IfcCommunicationsApplianceTypeEnum v10_PredefinedType);
-    typedef IfcCommunicationsApplianceType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcCommunicationsApplianceType > > list;
-    typedef IfcTemplatedEntityList< IfcCommunicationsApplianceType >::it it;
+    IfcCommunicationsApplianceType (IfcAbstractEntity* e);
+    IfcCommunicationsApplianceType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcCommunicationsApplianceTypeEnum::IfcCommunicationsApplianceTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcCommunicationsApplianceType > list;
 };
 /// The flow moving device type IfcCompressorType defines commonly shared information for occurrences of compressors.  The set of shared information may include: 
 /// 
@@ -40832,20 +41476,19 @@ class IfcCommunicationsApplianceType : public IfcFlowTerminalType {
 class IfcCompressorType : public IfcFlowMovingDeviceType {
 public:
     /// Defines the type of compressor (e.g., hermetic, reciprocating, etc.).
-    IfcCompressorTypeEnum::IfcCompressorTypeEnum PredefinedType();
+    IfcCompressorTypeEnum::IfcCompressorTypeEnum PredefinedType() const;
     void setPredefinedType(IfcCompressorTypeEnum::IfcCompressorTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcFlowMovingDeviceType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcCompressorTypeEnum; } return IfcFlowMovingDeviceType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcFlowMovingDeviceType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcCompressorType (IfcAbstractEntityPtr e);
-    IfcCompressorType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcCompressorTypeEnum::IfcCompressorTypeEnum v10_PredefinedType);
-    typedef IfcCompressorType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcCompressorType > > list;
-    typedef IfcTemplatedEntityList< IfcCompressorType >::it it;
+    IfcCompressorType (IfcAbstractEntity* e);
+    IfcCompressorType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcCompressorTypeEnum::IfcCompressorTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcCompressorType > list;
 };
 /// The energy conversion device type IfcCondenserType defines commonly shared information for occurrences of condensers.  The set of shared information may include: 
 /// 
@@ -40877,20 +41520,19 @@ class IfcCompressorType : public IfcFlowMovingDeviceType {
 class IfcCondenserType : public IfcEnergyConversionDeviceType {
 public:
     /// Defines the type of condenser.
-    IfcCondenserTypeEnum::IfcCondenserTypeEnum PredefinedType();
+    IfcCondenserTypeEnum::IfcCondenserTypeEnum PredefinedType() const;
     void setPredefinedType(IfcCondenserTypeEnum::IfcCondenserTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcEnergyConversionDeviceType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcCondenserTypeEnum; } return IfcEnergyConversionDeviceType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcEnergyConversionDeviceType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcCondenserType (IfcAbstractEntityPtr e);
-    IfcCondenserType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcCondenserTypeEnum::IfcCondenserTypeEnum v10_PredefinedType);
-    typedef IfcCondenserType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcCondenserType > > list;
-    typedef IfcTemplatedEntityList< IfcCondenserType >::it it;
+    IfcCondenserType (IfcAbstractEntity* e);
+    IfcCondenserType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcCondenserTypeEnum::IfcCondenserTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcCondenserType > list;
 };
 /// IfcConstructionEquipmentResource is usage of construction equipment to assist in the performance of construction. Construction Equipment resources are wholly or partially consumed or occupied in the performance of construction.
 /// 
@@ -40917,23 +41559,22 @@ class IfcCondenserType : public IfcEnergyConversionDeviceType {
 class IfcConstructionEquipmentResource : public IfcConstructionResource {
 public:
     /// Whether the optional attribute PredefinedType is defined for this IfcConstructionEquipmentResource
-    bool hasPredefinedType();
+    bool hasPredefinedType() const;
     /// Defines types of construction equipment resources.
     /// IFC2x4 New attribute
-    IfcConstructionEquipmentResourceTypeEnum::IfcConstructionEquipmentResourceTypeEnum PredefinedType();
+    IfcConstructionEquipmentResourceTypeEnum::IfcConstructionEquipmentResourceTypeEnum PredefinedType() const;
     void setPredefinedType(IfcConstructionEquipmentResourceTypeEnum::IfcConstructionEquipmentResourceTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 11; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 10: return IfcUtil::Argument_ENUMERATION; } return IfcConstructionResource::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 10: return Type::IfcConstructionEquipmentResourceTypeEnum; } return IfcConstructionResource::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 10: return "PredefinedType"; } return IfcConstructionResource::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcConstructionEquipmentResource (IfcAbstractEntityPtr e);
-    IfcConstructionEquipmentResource (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, boost::optional< IfcIdentifier > v6_Identification, boost::optional< IfcText > v7_LongDescription, IfcResourceTime* v8_Usage, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcAppliedValue > > > v9_BaseCosts, IfcPhysicalQuantity* v10_BaseQuantity, boost::optional< IfcConstructionEquipmentResourceTypeEnum::IfcConstructionEquipmentResourceTypeEnum > v11_PredefinedType);
-    typedef IfcConstructionEquipmentResource* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcConstructionEquipmentResource > > list;
-    typedef IfcTemplatedEntityList< IfcConstructionEquipmentResource >::it it;
+    IfcConstructionEquipmentResource (IfcAbstractEntity* e);
+    IfcConstructionEquipmentResource (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, boost::optional< std::string > v6_Identification, boost::optional< std::string > v7_LongDescription, IfcResourceTime* v8_Usage, boost::optional< IfcTemplatedEntityList< IfcAppliedValue >::ptr > v9_BaseCosts, IfcPhysicalQuantity* v10_BaseQuantity, boost::optional< IfcConstructionEquipmentResourceTypeEnum::IfcConstructionEquipmentResourceTypeEnum > v11_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcConstructionEquipmentResource > list;
 };
 /// IfcConstructionMaterialResource identifies a material resource type in a construction project. 
 /// 
@@ -40964,23 +41605,22 @@ class IfcConstructionEquipmentResource : public IfcConstructionResource {
 class IfcConstructionMaterialResource : public IfcConstructionResource {
 public:
     /// Whether the optional attribute PredefinedType is defined for this IfcConstructionMaterialResource
-    bool hasPredefinedType();
+    bool hasPredefinedType() const;
     /// Defines types of construction material resources.
     /// IFC2x4 New attribute
-    IfcConstructionMaterialResourceTypeEnum::IfcConstructionMaterialResourceTypeEnum PredefinedType();
+    IfcConstructionMaterialResourceTypeEnum::IfcConstructionMaterialResourceTypeEnum PredefinedType() const;
     void setPredefinedType(IfcConstructionMaterialResourceTypeEnum::IfcConstructionMaterialResourceTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 11; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 10: return IfcUtil::Argument_ENUMERATION; } return IfcConstructionResource::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 10: return Type::IfcConstructionMaterialResourceTypeEnum; } return IfcConstructionResource::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 10: return "PredefinedType"; } return IfcConstructionResource::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcConstructionMaterialResource (IfcAbstractEntityPtr e);
-    IfcConstructionMaterialResource (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, boost::optional< IfcIdentifier > v6_Identification, boost::optional< IfcText > v7_LongDescription, IfcResourceTime* v8_Usage, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcAppliedValue > > > v9_BaseCosts, IfcPhysicalQuantity* v10_BaseQuantity, boost::optional< IfcConstructionMaterialResourceTypeEnum::IfcConstructionMaterialResourceTypeEnum > v11_PredefinedType);
-    typedef IfcConstructionMaterialResource* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcConstructionMaterialResource > > list;
-    typedef IfcTemplatedEntityList< IfcConstructionMaterialResource >::it it;
+    IfcConstructionMaterialResource (IfcAbstractEntity* e);
+    IfcConstructionMaterialResource (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, boost::optional< std::string > v6_Identification, boost::optional< std::string > v7_LongDescription, IfcResourceTime* v8_Usage, boost::optional< IfcTemplatedEntityList< IfcAppliedValue >::ptr > v9_BaseCosts, IfcPhysicalQuantity* v10_BaseQuantity, boost::optional< IfcConstructionMaterialResourceTypeEnum::IfcConstructionMaterialResourceTypeEnum > v11_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcConstructionMaterialResource > list;
 };
 /// IfcConstructionProductResource defines the role of a product that is consumed (wholly or partially), or occupied in the performance of construction. 
 /// 
@@ -41000,23 +41640,22 @@ class IfcConstructionMaterialResource : public IfcConstructionResource {
 class IfcConstructionProductResource : public IfcConstructionResource {
 public:
     /// Whether the optional attribute PredefinedType is defined for this IfcConstructionProductResource
-    bool hasPredefinedType();
+    bool hasPredefinedType() const;
     /// Defines types of construction product resources.
     /// IFC2x4 New attribute
-    IfcConstructionProductResourceTypeEnum::IfcConstructionProductResourceTypeEnum PredefinedType();
+    IfcConstructionProductResourceTypeEnum::IfcConstructionProductResourceTypeEnum PredefinedType() const;
     void setPredefinedType(IfcConstructionProductResourceTypeEnum::IfcConstructionProductResourceTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 11; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 10: return IfcUtil::Argument_ENUMERATION; } return IfcConstructionResource::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 10: return Type::IfcConstructionProductResourceTypeEnum; } return IfcConstructionResource::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 10: return "PredefinedType"; } return IfcConstructionResource::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcConstructionProductResource (IfcAbstractEntityPtr e);
-    IfcConstructionProductResource (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, boost::optional< IfcIdentifier > v6_Identification, boost::optional< IfcText > v7_LongDescription, IfcResourceTime* v8_Usage, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcAppliedValue > > > v9_BaseCosts, IfcPhysicalQuantity* v10_BaseQuantity, boost::optional< IfcConstructionProductResourceTypeEnum::IfcConstructionProductResourceTypeEnum > v11_PredefinedType);
-    typedef IfcConstructionProductResource* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcConstructionProductResource > > list;
-    typedef IfcTemplatedEntityList< IfcConstructionProductResource >::it it;
+    IfcConstructionProductResource (IfcAbstractEntity* e);
+    IfcConstructionProductResource (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, boost::optional< std::string > v6_Identification, boost::optional< std::string > v7_LongDescription, IfcResourceTime* v8_Usage, boost::optional< IfcTemplatedEntityList< IfcAppliedValue >::ptr > v9_BaseCosts, IfcPhysicalQuantity* v10_BaseQuantity, boost::optional< IfcConstructionProductResourceTypeEnum::IfcConstructionProductResourceTypeEnum > v11_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcConstructionProductResource > list;
 };
 /// The energy conversion device type IfcCooledBeamType defines commonly shared information for occurrences of cooled beams.  The set of shared information may include: 
 /// 
@@ -41050,20 +41689,19 @@ class IfcConstructionProductResource : public IfcConstructionResource {
 class IfcCooledBeamType : public IfcEnergyConversionDeviceType {
 public:
     /// Defines the type of cooled beam.
-    IfcCooledBeamTypeEnum::IfcCooledBeamTypeEnum PredefinedType();
+    IfcCooledBeamTypeEnum::IfcCooledBeamTypeEnum PredefinedType() const;
     void setPredefinedType(IfcCooledBeamTypeEnum::IfcCooledBeamTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcEnergyConversionDeviceType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcCooledBeamTypeEnum; } return IfcEnergyConversionDeviceType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcEnergyConversionDeviceType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcCooledBeamType (IfcAbstractEntityPtr e);
-    IfcCooledBeamType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcCooledBeamTypeEnum::IfcCooledBeamTypeEnum v10_PredefinedType);
-    typedef IfcCooledBeamType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcCooledBeamType > > list;
-    typedef IfcTemplatedEntityList< IfcCooledBeamType >::it it;
+    IfcCooledBeamType (IfcAbstractEntity* e);
+    IfcCooledBeamType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcCooledBeamTypeEnum::IfcCooledBeamTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcCooledBeamType > list;
 };
 /// The energy conversion device type IfcCoolingTowerType defines commonly shared information for occurrences of cooling towers.  The set of shared information may include: 
 /// 
@@ -41101,20 +41739,19 @@ class IfcCooledBeamType : public IfcEnergyConversionDeviceType {
 class IfcCoolingTowerType : public IfcEnergyConversionDeviceType {
 public:
     /// Defines the typical types of cooling towers (e.g., OpenTower, ClosedTower, CrossFlow, etc.).
-    IfcCoolingTowerTypeEnum::IfcCoolingTowerTypeEnum PredefinedType();
+    IfcCoolingTowerTypeEnum::IfcCoolingTowerTypeEnum PredefinedType() const;
     void setPredefinedType(IfcCoolingTowerTypeEnum::IfcCoolingTowerTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcEnergyConversionDeviceType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcCoolingTowerTypeEnum; } return IfcEnergyConversionDeviceType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcEnergyConversionDeviceType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcCoolingTowerType (IfcAbstractEntityPtr e);
-    IfcCoolingTowerType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcCoolingTowerTypeEnum::IfcCoolingTowerTypeEnum v10_PredefinedType);
-    typedef IfcCoolingTowerType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcCoolingTowerType > > list;
-    typedef IfcTemplatedEntityList< IfcCoolingTowerType >::it it;
+    IfcCoolingTowerType (IfcAbstractEntity* e);
+    IfcCoolingTowerType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcCoolingTowerTypeEnum::IfcCoolingTowerTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcCoolingTowerType > list;
 };
 /// Definition from ISO 6707-1:1989: term used: Finishing -
 /// final coverings and treatments of surfaces and their
@@ -41343,24 +41980,23 @@ class IfcCoolingTowerType : public IfcEnergyConversionDeviceType {
 class IfcCovering : public IfcBuildingElement {
 public:
     /// Whether the optional attribute PredefinedType is defined for this IfcCovering
-    bool hasPredefinedType();
+    bool hasPredefinedType() const;
     /// Predefined types to define the particular type of the covering. There may be property set definitions available for each predefined type.
-    IfcCoveringTypeEnum::IfcCoveringTypeEnum PredefinedType();
+    IfcCoveringTypeEnum::IfcCoveringTypeEnum PredefinedType() const;
     void setPredefinedType(IfcCoveringTypeEnum::IfcCoveringTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_ENUMERATION; } return IfcBuildingElement::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcCoveringTypeEnum; } return IfcBuildingElement::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "PredefinedType"; } return IfcBuildingElement::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelCoversSpaces > > CoversSpaces(); // INVERSE IfcRelCoversSpaces::RelatedCoverings
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelCoversBldgElements > > CoversElements(); // INVERSE IfcRelCoversBldgElements::RelatedCoverings
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcRelCoversSpaces >::ptr CoversSpaces() const; // INVERSE IfcRelCoversSpaces::RelatedCoverings
+    IfcTemplatedEntityList< IfcRelCoversBldgElements >::ptr CoversElements() const; // INVERSE IfcRelCoversBldgElements::RelatedCoverings
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcCovering (IfcAbstractEntityPtr e);
-    IfcCovering (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcCoveringTypeEnum::IfcCoveringTypeEnum > v9_PredefinedType);
-    typedef IfcCovering* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcCovering > > list;
-    typedef IfcTemplatedEntityList< IfcCovering >::it it;
+    IfcCovering (IfcAbstractEntity* e);
+    IfcCovering (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcCoveringTypeEnum::IfcCoveringTypeEnum > v9_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcCovering > list;
 };
 /// Definition from ISO 6707-1:1989: Non load bearing wall
 /// positioned on the outside of a building and enclosing it.
@@ -41503,25 +42139,24 @@ class IfcCovering : public IfcBuildingElement {
 class IfcCurtainWall : public IfcBuildingElement {
 public:
     /// Whether the optional attribute PredefinedType is defined for this IfcCurtainWall
-    bool hasPredefinedType();
+    bool hasPredefinedType() const;
     /// Predefined generic type for a curtain wall that is specified in an enumeration. There may be a property set given specificly for the predefined types.
     ///   NOTE The PredefinedType shall only be used, if no type object IfcCurtainWallType is assigned, providing its own IfcCurtainWallType.PredefinedType.
     /// 
     /// IFC2x4 CHANGE  The attribute has been added at the end of the entity definition.
-    IfcCurtainWallTypeEnum::IfcCurtainWallTypeEnum PredefinedType();
+    IfcCurtainWallTypeEnum::IfcCurtainWallTypeEnum PredefinedType() const;
     void setPredefinedType(IfcCurtainWallTypeEnum::IfcCurtainWallTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_ENUMERATION; } return IfcBuildingElement::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcCurtainWallTypeEnum; } return IfcBuildingElement::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "PredefinedType"; } return IfcBuildingElement::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcCurtainWall (IfcAbstractEntityPtr e);
-    IfcCurtainWall (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcCurtainWallTypeEnum::IfcCurtainWallTypeEnum > v9_PredefinedType);
-    typedef IfcCurtainWall* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcCurtainWall > > list;
-    typedef IfcTemplatedEntityList< IfcCurtainWall >::it it;
+    IfcCurtainWall (IfcAbstractEntity* e);
+    IfcCurtainWall (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcCurtainWallTypeEnum::IfcCurtainWallTypeEnum > v9_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcCurtainWall > list;
 };
 /// The flow controller type IfcDamperType defines commonly shared information for occurrences of dampers.  The set of shared information may include: 
 /// 
@@ -41560,20 +42195,19 @@ class IfcCurtainWall : public IfcBuildingElement {
 class IfcDamperType : public IfcFlowControllerType {
 public:
     /// Type of damper.
-    IfcDamperTypeEnum::IfcDamperTypeEnum PredefinedType();
+    IfcDamperTypeEnum::IfcDamperTypeEnum PredefinedType() const;
     void setPredefinedType(IfcDamperTypeEnum::IfcDamperTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcFlowControllerType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcDamperTypeEnum; } return IfcFlowControllerType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcFlowControllerType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcDamperType (IfcAbstractEntityPtr e);
-    IfcDamperType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcDamperTypeEnum::IfcDamperTypeEnum v10_PredefinedType);
-    typedef IfcDamperType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcDamperType > > list;
-    typedef IfcTemplatedEntityList< IfcDamperType >::it it;
+    IfcDamperType (IfcAbstractEntity* e);
+    IfcDamperType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcDamperTypeEnum::IfcDamperTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcDamperType > list;
 };
 /// Definition from IAI: Representation of different kinds of
 ///   accessories included in or added to elements.  
@@ -41751,22 +42385,21 @@ class IfcDamperType : public IfcFlowControllerType {
 class IfcDiscreteAccessory : public IfcElementComponent {
 public:
     /// Whether the optional attribute PredefinedType is defined for this IfcDiscreteAccessory
-    bool hasPredefinedType();
+    bool hasPredefinedType() const;
     /// Subtype of discrete accessory
-    IfcDiscreteAccessoryTypeEnum::IfcDiscreteAccessoryTypeEnum PredefinedType();
+    IfcDiscreteAccessoryTypeEnum::IfcDiscreteAccessoryTypeEnum PredefinedType() const;
     void setPredefinedType(IfcDiscreteAccessoryTypeEnum::IfcDiscreteAccessoryTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_ENUMERATION; } return IfcElementComponent::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcDiscreteAccessoryTypeEnum; } return IfcElementComponent::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "PredefinedType"; } return IfcElementComponent::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcDiscreteAccessory (IfcAbstractEntityPtr e);
-    IfcDiscreteAccessory (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcDiscreteAccessoryTypeEnum::IfcDiscreteAccessoryTypeEnum > v9_PredefinedType);
-    typedef IfcDiscreteAccessory* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcDiscreteAccessory > > list;
-    typedef IfcTemplatedEntityList< IfcDiscreteAccessory >::it it;
+    IfcDiscreteAccessory (IfcAbstractEntity* e);
+    IfcDiscreteAccessory (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcDiscreteAccessoryTypeEnum::IfcDiscreteAccessoryTypeEnum > v9_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcDiscreteAccessory > list;
 };
 /// Definition from IAI: The element type
 ///   (IfcDiscreteAccessoryType) defines a list of commonly shared property
@@ -41959,20 +42592,19 @@ class IfcDiscreteAccessory : public IfcElementComponent {
 class IfcDiscreteAccessoryType : public IfcElementComponentType {
 public:
     /// Subtype of discrete accessory
-    IfcDiscreteAccessoryTypeEnum::IfcDiscreteAccessoryTypeEnum PredefinedType();
+    IfcDiscreteAccessoryTypeEnum::IfcDiscreteAccessoryTypeEnum PredefinedType() const;
     void setPredefinedType(IfcDiscreteAccessoryTypeEnum::IfcDiscreteAccessoryTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcElementComponentType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcDiscreteAccessoryTypeEnum; } return IfcElementComponentType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcElementComponentType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcDiscreteAccessoryType (IfcAbstractEntityPtr e);
-    IfcDiscreteAccessoryType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcDiscreteAccessoryTypeEnum::IfcDiscreteAccessoryTypeEnum v10_PredefinedType);
-    typedef IfcDiscreteAccessoryType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcDiscreteAccessoryType > > list;
-    typedef IfcTemplatedEntityList< IfcDiscreteAccessoryType >::it it;
+    IfcDiscreteAccessoryType (IfcAbstractEntity* e);
+    IfcDiscreteAccessoryType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcDiscreteAccessoryTypeEnum::IfcDiscreteAccessoryTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcDiscreteAccessoryType > list;
 };
 /// The distribution flow element type IfcDistributionChamberElementType defines commonly shared information for occurrences of distribution chamber elements.  The set of shared information may include:
 /// 
@@ -42014,20 +42646,19 @@ class IfcDiscreteAccessoryType : public IfcElementComponentType {
 class IfcDistributionChamberElementType : public IfcDistributionFlowElementType {
 public:
     /// Predefined types of distribution chambers.
-    IfcDistributionChamberElementTypeEnum::IfcDistributionChamberElementTypeEnum PredefinedType();
+    IfcDistributionChamberElementTypeEnum::IfcDistributionChamberElementTypeEnum PredefinedType() const;
     void setPredefinedType(IfcDistributionChamberElementTypeEnum::IfcDistributionChamberElementTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcDistributionFlowElementType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcDistributionChamberElementTypeEnum; } return IfcDistributionFlowElementType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcDistributionFlowElementType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcDistributionChamberElementType (IfcAbstractEntityPtr e);
-    IfcDistributionChamberElementType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcDistributionChamberElementTypeEnum::IfcDistributionChamberElementTypeEnum v10_PredefinedType);
-    typedef IfcDistributionChamberElementType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcDistributionChamberElementType > > list;
-    typedef IfcTemplatedEntityList< IfcDistributionChamberElementType >::it it;
+    IfcDistributionChamberElementType (IfcAbstractEntity* e);
+    IfcDistributionChamberElementType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcDistributionChamberElementTypeEnum::IfcDistributionChamberElementTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcDistributionChamberElementType > list;
 };
 /// The element type IfcDistributionControlElementType defines a list of commonly shared property set definitions of an element and an optional set of product representations.  It is used to define an element specification (the specific product information that is common to all occurrences of that product type). 
 /// 
@@ -42087,16 +42718,15 @@ class IfcDistributionControlElementType : public IfcDistributionElementType {
 public:
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcDistributionElementType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcDistributionElementType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcDistributionElementType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcDistributionControlElementType (IfcAbstractEntityPtr e);
-    IfcDistributionControlElementType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType);
-    typedef IfcDistributionControlElementType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcDistributionControlElementType > > list;
-    typedef IfcTemplatedEntityList< IfcDistributionControlElementType >::it it;
+    IfcDistributionControlElementType (IfcAbstractEntity* e);
+    IfcDistributionControlElementType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType);
+    typedef IfcTemplatedEntityList< IfcDistributionControlElementType > list;
 };
 /// Definition from IAI: Generalization of all elements
 /// that participate in a distribution system. Typical examples of
@@ -42264,17 +42894,16 @@ class IfcDistributionElement : public IfcElement {
 public:
     virtual unsigned int getArgumentCount() const { return 8; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcElement::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcElement::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcElement::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelConnectsPortToElement > > HasPorts(); // INVERSE IfcRelConnectsPortToElement::RelatedElement
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcRelConnectsPortToElement >::ptr HasPorts() const; // INVERSE IfcRelConnectsPortToElement::RelatedElement
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcDistributionElement (IfcAbstractEntityPtr e);
-    IfcDistributionElement (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag);
-    typedef IfcDistributionElement* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcDistributionElement > > list;
-    typedef IfcTemplatedEntityList< IfcDistributionElement >::it it;
+    IfcDistributionElement (IfcAbstractEntity* e);
+    IfcDistributionElement (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag);
+    typedef IfcTemplatedEntityList< IfcDistributionElement > list;
 };
 /// The distribution element IfcDistributionFlowElement defines occurrence elements of a distribution system that facilitate the distribution of energy or matter, such as air, water or power.
 /// 
@@ -42348,17 +42977,16 @@ class IfcDistributionFlowElement : public IfcDistributionElement {
 public:
     virtual unsigned int getArgumentCount() const { return 8; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcDistributionElement::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcDistributionElement::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcDistributionElement::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelFlowControlElements > > HasControlElements(); // INVERSE IfcRelFlowControlElements::RelatingFlowElement
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcRelFlowControlElements >::ptr HasControlElements() const; // INVERSE IfcRelFlowControlElements::RelatingFlowElement
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcDistributionFlowElement (IfcAbstractEntityPtr e);
-    IfcDistributionFlowElement (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag);
-    typedef IfcDistributionFlowElement* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcDistributionFlowElement > > list;
-    typedef IfcTemplatedEntityList< IfcDistributionFlowElement >::it it;
+    IfcDistributionFlowElement (IfcAbstractEntity* e);
+    IfcDistributionFlowElement (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag);
+    typedef IfcTemplatedEntityList< IfcDistributionFlowElement > list;
 };
 /// A distribution port is an inlet or outlet of a product through which a particular substance may flow.
 /// 
@@ -42445,31 +43073,30 @@ class IfcDistributionFlowElement : public IfcDistributionElement {
 class IfcDistributionPort : public IfcPort {
 public:
     /// Whether the optional attribute FlowDirection is defined for this IfcDistributionPort
-    bool hasFlowDirection();
+    bool hasFlowDirection() const;
     /// Enumeration that identifies if this port is a Sink (inlet), a Source (outlet) or both a SinkAndSource.
-    IfcFlowDirectionEnum::IfcFlowDirectionEnum FlowDirection();
+    IfcFlowDirectionEnum::IfcFlowDirectionEnum FlowDirection() const;
     void setFlowDirection(IfcFlowDirectionEnum::IfcFlowDirectionEnum v);
     /// Whether the optional attribute PredefinedType is defined for this IfcDistributionPort
-    bool hasPredefinedType();
+    bool hasPredefinedType() const;
     /// Enumeration that identifies the system type.  If a system type is defined, the port may only be connected to other ports having the same system type.
-    IfcDistributionPortTypeEnum::IfcDistributionPortTypeEnum PredefinedType();
+    IfcDistributionPortTypeEnum::IfcDistributionPortTypeEnum PredefinedType() const;
     void setPredefinedType(IfcDistributionPortTypeEnum::IfcDistributionPortTypeEnum v);
     /// Whether the optional attribute SystemType is defined for this IfcDistributionPort
-    bool hasSystemType();
-    IfcDistributionSystemEnum::IfcDistributionSystemEnum SystemType();
+    bool hasSystemType() const;
+    IfcDistributionSystemEnum::IfcDistributionSystemEnum SystemType() const;
     void setSystemType(IfcDistributionSystemEnum::IfcDistributionSystemEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 7: return IfcUtil::Argument_ENUMERATION; case 8: return IfcUtil::Argument_ENUMERATION; case 9: return IfcUtil::Argument_ENUMERATION; } return IfcPort::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 7: return Type::IfcFlowDirectionEnum; case 8: return Type::IfcDistributionPortTypeEnum; case 9: return Type::IfcDistributionSystemEnum; } return IfcPort::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 7: return "FlowDirection"; case 8: return "PredefinedType"; case 9: return "SystemType"; } return IfcPort::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcDistributionPort (IfcAbstractEntityPtr e);
-    IfcDistributionPort (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcFlowDirectionEnum::IfcFlowDirectionEnum > v8_FlowDirection, boost::optional< IfcDistributionPortTypeEnum::IfcDistributionPortTypeEnum > v9_PredefinedType, boost::optional< IfcDistributionSystemEnum::IfcDistributionSystemEnum > v10_SystemType);
-    typedef IfcDistributionPort* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcDistributionPort > > list;
-    typedef IfcTemplatedEntityList< IfcDistributionPort >::it it;
+    IfcDistributionPort (IfcAbstractEntity* e);
+    IfcDistributionPort (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcFlowDirectionEnum::IfcFlowDirectionEnum > v8_FlowDirection, boost::optional< IfcDistributionPortTypeEnum::IfcDistributionPortTypeEnum > v9_PredefinedType, boost::optional< IfcDistributionSystemEnum::IfcDistributionSystemEnum > v10_SystemType);
+    typedef IfcTemplatedEntityList< IfcDistributionPort > list;
 };
 /// A distribution system is a network designed to receive, store, maintain, distribute, or control the flow of a distribution media. A common example is a heating hot water system that consists of a pump, a tank, and an interconnected piping system for distributing hot water to terminals.
 /// 
@@ -42514,29 +43141,28 @@ class IfcDistributionPort : public IfcPort {
 class IfcDistributionSystem : public IfcSystem {
 public:
     /// Whether the optional attribute LongName is defined for this IfcDistributionSystem
-    bool hasLongName();
+    bool hasLongName() const;
     /// Long name for a system, used for informal purposes. It should be used, if available, in conjunction with the inherited Name attribute.
     /// 
     /// NOTE  In many scenarios the Name attribute refers to the short name or number of a distribution system or branch circuit, and the LongName refers to a descriptive name.
-    IfcLabel LongName();
-    void setLongName(IfcLabel v);
+    std::string LongName() const;
+    void setLongName(std::string v);
     /// Whether the optional attribute PredefinedType is defined for this IfcDistributionSystem
-    bool hasPredefinedType();
+    bool hasPredefinedType() const;
     /// Predefined types of distribution systems.
-    IfcDistributionSystemEnum::IfcDistributionSystemEnum PredefinedType();
+    IfcDistributionSystemEnum::IfcDistributionSystemEnum PredefinedType() const;
     void setPredefinedType(IfcDistributionSystemEnum::IfcDistributionSystemEnum v);
     virtual unsigned int getArgumentCount() const { return 7; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 5: return IfcUtil::Argument_STRING; case 6: return IfcUtil::Argument_ENUMERATION; } return IfcSystem::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 5: return Type::IfcLabel; case 6: return Type::IfcDistributionSystemEnum; } return IfcSystem::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 5: return "LongName"; case 6: return "PredefinedType"; } return IfcSystem::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcDistributionSystem (IfcAbstractEntityPtr e);
-    IfcDistributionSystem (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, boost::optional< IfcLabel > v6_LongName, boost::optional< IfcDistributionSystemEnum::IfcDistributionSystemEnum > v7_PredefinedType);
-    typedef IfcDistributionSystem* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcDistributionSystem > > list;
-    typedef IfcTemplatedEntityList< IfcDistributionSystem >::it it;
+    IfcDistributionSystem (IfcAbstractEntity* e);
+    IfcDistributionSystem (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, boost::optional< std::string > v6_LongName, boost::optional< IfcDistributionSystemEnum::IfcDistributionSystemEnum > v7_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcDistributionSystem > list;
 };
 /// Definition from ISO 6707-1:1989: Construction for
 /// closing an opening, intended primarily for access with hinged,
@@ -42897,52 +43523,51 @@ class IfcDistributionSystem : public IfcSystem {
 class IfcDoor : public IfcBuildingElement {
 public:
     /// Whether the optional attribute OverallHeight is defined for this IfcDoor
-    bool hasOverallHeight();
+    bool hasOverallHeight() const;
     /// Overall measure of the height, it reflects the Z Dimension of a bounding box, enclosing the body of the door opening. If omitted, the OverallHeight should be taken from the geometric representation of the IfcOpening in which the door is inserted. 
     /// 
     /// NOTE  The body of the door might be taller then the door opening (e.g. in cases where the door lining includes a casing). In these cases the OverallHeight shall still be given as the door opening height, and not as the total height of the door lining.
-    IfcPositiveLengthMeasure OverallHeight();
-    void setOverallHeight(IfcPositiveLengthMeasure v);
+    double OverallHeight() const;
+    void setOverallHeight(double v);
     /// Whether the optional attribute OverallWidth is defined for this IfcDoor
-    bool hasOverallWidth();
+    bool hasOverallWidth() const;
     /// Overall measure of the width, it reflects the X Dimension of a bounding box, enclosing the body of the door opening. If omitted, the OverallWidth should be taken from the geometric representation of the IfcOpening in which the door is inserted. 
     /// 
     /// NOTE  The body of the door might be wider then the door opening (e.g. in cases where the door lining includes a casing). In these cases the OverallWidth shall still be given as the door opening width, and not as the total width of the door lining.
-    IfcPositiveLengthMeasure OverallWidth();
-    void setOverallWidth(IfcPositiveLengthMeasure v);
+    double OverallWidth() const;
+    void setOverallWidth(double v);
     /// Whether the optional attribute PredefinedType is defined for this IfcDoor
-    bool hasPredefinedType();
+    bool hasPredefinedType() const;
     /// Predefined generic type for a door that is specified in an enumeration. There may be a property set given specificly for the predefined types.
     ///   NOTE The PredefinedType shall only be used, if no type object IfcDoorType is assigned, providing its own IfcDoorType.PredefinedType.
     /// 
     /// IFC2x4 CHANGE  The attribute has been added at the end of the entity definition.
-    IfcDoorTypeEnum::IfcDoorTypeEnum PredefinedType();
+    IfcDoorTypeEnum::IfcDoorTypeEnum PredefinedType() const;
     void setPredefinedType(IfcDoorTypeEnum::IfcDoorTypeEnum v);
     /// Whether the optional attribute OperationType is defined for this IfcDoor
-    bool hasOperationType();
+    bool hasOperationType() const;
     /// Type defining the general layout and operation of the door type in terms of the partitioning of panels and panel operations. 
     /// 
     /// NOTE The OperationType shall only be used, if no type object IfcDoorType is assigned, providing its own IfcDoorType.OperationType.
     /// 
     /// IFC2x4 CHANGE  The attribute has been added at the end of the entity definition.
-    IfcDoorTypeOperationEnum::IfcDoorTypeOperationEnum OperationType();
+    IfcDoorTypeOperationEnum::IfcDoorTypeOperationEnum OperationType() const;
     void setOperationType(IfcDoorTypeOperationEnum::IfcDoorTypeOperationEnum v);
     /// Whether the optional attribute UserDefinedOperationType is defined for this IfcDoor
-    bool hasUserDefinedOperationType();
-    IfcLabel UserDefinedOperationType();
-    void setUserDefinedOperationType(IfcLabel v);
+    bool hasUserDefinedOperationType() const;
+    std::string UserDefinedOperationType() const;
+    void setUserDefinedOperationType(std::string v);
     virtual unsigned int getArgumentCount() const { return 13; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_DOUBLE; case 9: return IfcUtil::Argument_DOUBLE; case 10: return IfcUtil::Argument_ENUMERATION; case 11: return IfcUtil::Argument_ENUMERATION; case 12: return IfcUtil::Argument_STRING; } return IfcBuildingElement::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcPositiveLengthMeasure; case 9: return Type::IfcPositiveLengthMeasure; case 10: return Type::IfcDoorTypeEnum; case 11: return Type::IfcDoorTypeOperationEnum; case 12: return Type::IfcLabel; } return IfcBuildingElement::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "OverallHeight"; case 9: return "OverallWidth"; case 10: return "PredefinedType"; case 11: return "OperationType"; case 12: return "UserDefinedOperationType"; } return IfcBuildingElement::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcDoor (IfcAbstractEntityPtr e);
-    IfcDoor (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcPositiveLengthMeasure > v9_OverallHeight, boost::optional< IfcPositiveLengthMeasure > v10_OverallWidth, boost::optional< IfcDoorTypeEnum::IfcDoorTypeEnum > v11_PredefinedType, boost::optional< IfcDoorTypeOperationEnum::IfcDoorTypeOperationEnum > v12_OperationType, boost::optional< IfcLabel > v13_UserDefinedOperationType);
-    typedef IfcDoor* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcDoor > > list;
-    typedef IfcTemplatedEntityList< IfcDoor >::it it;
+    IfcDoor (IfcAbstractEntity* e);
+    IfcDoor (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< double > v9_OverallHeight, boost::optional< double > v10_OverallWidth, boost::optional< IfcDoorTypeEnum::IfcDoorTypeEnum > v11_PredefinedType, boost::optional< IfcDoorTypeOperationEnum::IfcDoorTypeOperationEnum > v12_OperationType, boost::optional< std::string > v13_UserDefinedOperationType);
+    typedef IfcTemplatedEntityList< IfcDoor > list;
 };
 /// The standard door,
 /// IfcDoorStandardCase, defines a door with certain constraints
@@ -43052,16 +43677,15 @@ class IfcDoorStandardCase : public IfcDoor {
 public:
     virtual unsigned int getArgumentCount() const { return 13; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcDoor::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcDoor::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcDoor::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcDoorStandardCase (IfcAbstractEntityPtr e);
-    IfcDoorStandardCase (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcPositiveLengthMeasure > v9_OverallHeight, boost::optional< IfcPositiveLengthMeasure > v10_OverallWidth, boost::optional< IfcDoorTypeEnum::IfcDoorTypeEnum > v11_PredefinedType, boost::optional< IfcDoorTypeOperationEnum::IfcDoorTypeOperationEnum > v12_OperationType, boost::optional< IfcLabel > v13_UserDefinedOperationType);
-    typedef IfcDoorStandardCase* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcDoorStandardCase > > list;
-    typedef IfcTemplatedEntityList< IfcDoorStandardCase >::it it;
+    IfcDoorStandardCase (IfcAbstractEntity* e);
+    IfcDoorStandardCase (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< double > v9_OverallHeight, boost::optional< double > v10_OverallWidth, boost::optional< IfcDoorTypeEnum::IfcDoorTypeEnum > v11_PredefinedType, boost::optional< IfcDoorTypeOperationEnum::IfcDoorTypeOperationEnum > v12_OperationType, boost::optional< std::string > v13_UserDefinedOperationType);
+    typedef IfcTemplatedEntityList< IfcDoorStandardCase > list;
 };
 /// The flow fitting type IfcDuctFittingType defines commonly shared information for occurrences of duct fittings.  The set of shared information may include: 
 /// 
@@ -43095,20 +43719,19 @@ class IfcDoorStandardCase : public IfcDoor {
 class IfcDuctFittingType : public IfcFlowFittingType {
 public:
     /// The type of duct fitting.
-    IfcDuctFittingTypeEnum::IfcDuctFittingTypeEnum PredefinedType();
+    IfcDuctFittingTypeEnum::IfcDuctFittingTypeEnum PredefinedType() const;
     void setPredefinedType(IfcDuctFittingTypeEnum::IfcDuctFittingTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcFlowFittingType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcDuctFittingTypeEnum; } return IfcFlowFittingType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcFlowFittingType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcDuctFittingType (IfcAbstractEntityPtr e);
-    IfcDuctFittingType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcDuctFittingTypeEnum::IfcDuctFittingTypeEnum v10_PredefinedType);
-    typedef IfcDuctFittingType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcDuctFittingType > > list;
-    typedef IfcTemplatedEntityList< IfcDuctFittingType >::it it;
+    IfcDuctFittingType (IfcAbstractEntity* e);
+    IfcDuctFittingType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcDuctFittingTypeEnum::IfcDuctFittingTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcDuctFittingType > list;
 };
 /// The flow segment type IfcDuctSegmentType defines commonly shared information for occurrences of duct segments.  The set of shared information may include: 
 /// 
@@ -43142,20 +43765,19 @@ class IfcDuctFittingType : public IfcFlowFittingType {
 class IfcDuctSegmentType : public IfcFlowSegmentType {
 public:
     /// The type of duct segment.
-    IfcDuctSegmentTypeEnum::IfcDuctSegmentTypeEnum PredefinedType();
+    IfcDuctSegmentTypeEnum::IfcDuctSegmentTypeEnum PredefinedType() const;
     void setPredefinedType(IfcDuctSegmentTypeEnum::IfcDuctSegmentTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcFlowSegmentType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcDuctSegmentTypeEnum; } return IfcFlowSegmentType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcFlowSegmentType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcDuctSegmentType (IfcAbstractEntityPtr e);
-    IfcDuctSegmentType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcDuctSegmentTypeEnum::IfcDuctSegmentTypeEnum v10_PredefinedType);
-    typedef IfcDuctSegmentType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcDuctSegmentType > > list;
-    typedef IfcTemplatedEntityList< IfcDuctSegmentType >::it it;
+    IfcDuctSegmentType (IfcAbstractEntity* e);
+    IfcDuctSegmentType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcDuctSegmentTypeEnum::IfcDuctSegmentTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcDuctSegmentType > list;
 };
 /// The flow treatment device type IfcDuctSilencerType defines commonly shared information for occurrences of duct silencers.  The set of shared information may include: 
 /// 
@@ -43186,20 +43808,19 @@ class IfcDuctSegmentType : public IfcFlowSegmentType {
 class IfcDuctSilencerType : public IfcFlowTreatmentDeviceType {
 public:
     /// The type of duct silencer.
-    IfcDuctSilencerTypeEnum::IfcDuctSilencerTypeEnum PredefinedType();
+    IfcDuctSilencerTypeEnum::IfcDuctSilencerTypeEnum PredefinedType() const;
     void setPredefinedType(IfcDuctSilencerTypeEnum::IfcDuctSilencerTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcFlowTreatmentDeviceType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcDuctSilencerTypeEnum; } return IfcFlowTreatmentDeviceType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcFlowTreatmentDeviceType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcDuctSilencerType (IfcAbstractEntityPtr e);
-    IfcDuctSilencerType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcDuctSilencerTypeEnum::IfcDuctSilencerTypeEnum v10_PredefinedType);
-    typedef IfcDuctSilencerType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcDuctSilencerType > > list;
-    typedef IfcTemplatedEntityList< IfcDuctSilencerType >::it it;
+    IfcDuctSilencerType (IfcAbstractEntity* e);
+    IfcDuctSilencerType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcDuctSilencerTypeEnum::IfcDuctSilencerTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcDuctSilencerType > list;
 };
 /// The flow terminal type IfcElectricApplianceType defines commonly shared information for occurrences of electric appliances.  The set of shared information may include: 
 /// 
@@ -43233,20 +43854,19 @@ class IfcDuctSilencerType : public IfcFlowTreatmentDeviceType {
 class IfcElectricApplianceType : public IfcFlowTerminalType {
 public:
     /// Identifies the predefined types of electrical appliance from which the type required may be set.
-    IfcElectricApplianceTypeEnum::IfcElectricApplianceTypeEnum PredefinedType();
+    IfcElectricApplianceTypeEnum::IfcElectricApplianceTypeEnum PredefinedType() const;
     void setPredefinedType(IfcElectricApplianceTypeEnum::IfcElectricApplianceTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcFlowTerminalType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcElectricApplianceTypeEnum; } return IfcFlowTerminalType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcFlowTerminalType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcElectricApplianceType (IfcAbstractEntityPtr e);
-    IfcElectricApplianceType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcElectricApplianceTypeEnum::IfcElectricApplianceTypeEnum v10_PredefinedType);
-    typedef IfcElectricApplianceType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcElectricApplianceType > > list;
-    typedef IfcTemplatedEntityList< IfcElectricApplianceType >::it it;
+    IfcElectricApplianceType (IfcAbstractEntity* e);
+    IfcElectricApplianceType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcElectricApplianceTypeEnum::IfcElectricApplianceTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcElectricApplianceType > list;
 };
 /// The flow controller type IfcElectricDistributionBoardType defines commonly shared information for occurrences of distribution boards.  The set of shared information may include: 
 /// 
@@ -43278,20 +43898,19 @@ class IfcElectricApplianceType : public IfcFlowTerminalType {
 class IfcElectricDistributionBoardType : public IfcFlowControllerType {
 public:
     /// Identifies the predefined types of electric distribution type from which the type required may be set.
-    IfcElectricDistributionBoardTypeEnum::IfcElectricDistributionBoardTypeEnum PredefinedType();
+    IfcElectricDistributionBoardTypeEnum::IfcElectricDistributionBoardTypeEnum PredefinedType() const;
     void setPredefinedType(IfcElectricDistributionBoardTypeEnum::IfcElectricDistributionBoardTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcFlowControllerType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcElectricDistributionBoardTypeEnum; } return IfcFlowControllerType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcFlowControllerType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcElectricDistributionBoardType (IfcAbstractEntityPtr e);
-    IfcElectricDistributionBoardType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcElectricDistributionBoardTypeEnum::IfcElectricDistributionBoardTypeEnum v10_PredefinedType);
-    typedef IfcElectricDistributionBoardType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcElectricDistributionBoardType > > list;
-    typedef IfcTemplatedEntityList< IfcElectricDistributionBoardType >::it it;
+    IfcElectricDistributionBoardType (IfcAbstractEntity* e);
+    IfcElectricDistributionBoardType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcElectricDistributionBoardTypeEnum::IfcElectricDistributionBoardTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcElectricDistributionBoardType > list;
 };
 /// The flow storage device type IfcElectricFlowStorageDeviceType defines commonly shared information for occurrences of electric flow storage devices.  The set of shared information may include: 
 /// 
@@ -43323,20 +43942,19 @@ class IfcElectricDistributionBoardType : public IfcFlowControllerType {
 class IfcElectricFlowStorageDeviceType : public IfcFlowStorageDeviceType {
 public:
     /// Identifies the predefined types of electric flow storage devices from which the type required may be set.
-    IfcElectricFlowStorageDeviceTypeEnum::IfcElectricFlowStorageDeviceTypeEnum PredefinedType();
+    IfcElectricFlowStorageDeviceTypeEnum::IfcElectricFlowStorageDeviceTypeEnum PredefinedType() const;
     void setPredefinedType(IfcElectricFlowStorageDeviceTypeEnum::IfcElectricFlowStorageDeviceTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcFlowStorageDeviceType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcElectricFlowStorageDeviceTypeEnum; } return IfcFlowStorageDeviceType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcFlowStorageDeviceType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcElectricFlowStorageDeviceType (IfcAbstractEntityPtr e);
-    IfcElectricFlowStorageDeviceType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcElectricFlowStorageDeviceTypeEnum::IfcElectricFlowStorageDeviceTypeEnum v10_PredefinedType);
-    typedef IfcElectricFlowStorageDeviceType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcElectricFlowStorageDeviceType > > list;
-    typedef IfcTemplatedEntityList< IfcElectricFlowStorageDeviceType >::it it;
+    IfcElectricFlowStorageDeviceType (IfcAbstractEntity* e);
+    IfcElectricFlowStorageDeviceType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcElectricFlowStorageDeviceTypeEnum::IfcElectricFlowStorageDeviceTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcElectricFlowStorageDeviceType > list;
 };
 /// The energy conversion device type IfcElectricGeneratorType defines commonly shared information for occurrences of electric generators.  The set of shared information may include: 
 /// 
@@ -43373,20 +43991,19 @@ class IfcElectricFlowStorageDeviceType : public IfcFlowStorageDeviceType {
 class IfcElectricGeneratorType : public IfcEnergyConversionDeviceType {
 public:
     /// Identifies the predefined types of electric generators from which the type required may be set.
-    IfcElectricGeneratorTypeEnum::IfcElectricGeneratorTypeEnum PredefinedType();
+    IfcElectricGeneratorTypeEnum::IfcElectricGeneratorTypeEnum PredefinedType() const;
     void setPredefinedType(IfcElectricGeneratorTypeEnum::IfcElectricGeneratorTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcEnergyConversionDeviceType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcElectricGeneratorTypeEnum; } return IfcEnergyConversionDeviceType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcEnergyConversionDeviceType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcElectricGeneratorType (IfcAbstractEntityPtr e);
-    IfcElectricGeneratorType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcElectricGeneratorTypeEnum::IfcElectricGeneratorTypeEnum v10_PredefinedType);
-    typedef IfcElectricGeneratorType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcElectricGeneratorType > > list;
-    typedef IfcTemplatedEntityList< IfcElectricGeneratorType >::it it;
+    IfcElectricGeneratorType (IfcAbstractEntity* e);
+    IfcElectricGeneratorType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcElectricGeneratorTypeEnum::IfcElectricGeneratorTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcElectricGeneratorType > list;
 };
 /// The energy conversion device type IfcElectricMotorType defines commonly shared information for occurrences of electric motors.  The set of shared information may include: 
 /// 
@@ -43418,20 +44035,19 @@ class IfcElectricGeneratorType : public IfcEnergyConversionDeviceType {
 class IfcElectricMotorType : public IfcEnergyConversionDeviceType {
 public:
     /// Identifies the predefined types of electric motor from which the type required may be set.
-    IfcElectricMotorTypeEnum::IfcElectricMotorTypeEnum PredefinedType();
+    IfcElectricMotorTypeEnum::IfcElectricMotorTypeEnum PredefinedType() const;
     void setPredefinedType(IfcElectricMotorTypeEnum::IfcElectricMotorTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcEnergyConversionDeviceType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcElectricMotorTypeEnum; } return IfcEnergyConversionDeviceType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcEnergyConversionDeviceType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcElectricMotorType (IfcAbstractEntityPtr e);
-    IfcElectricMotorType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcElectricMotorTypeEnum::IfcElectricMotorTypeEnum v10_PredefinedType);
-    typedef IfcElectricMotorType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcElectricMotorType > > list;
-    typedef IfcTemplatedEntityList< IfcElectricMotorType >::it it;
+    IfcElectricMotorType (IfcAbstractEntity* e);
+    IfcElectricMotorType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcElectricMotorTypeEnum::IfcElectricMotorTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcElectricMotorType > list;
 };
 /// The flow controller type IfcElectricTimeControlType defines commonly shared information for occurrences of electric time controls.  The set of shared information may include: 
 /// 
@@ -43463,20 +44079,19 @@ class IfcElectricMotorType : public IfcEnergyConversionDeviceType {
 class IfcElectricTimeControlType : public IfcFlowControllerType {
 public:
     /// Identifies the predefined types of electrical time control from which the type required may be set.
-    IfcElectricTimeControlTypeEnum::IfcElectricTimeControlTypeEnum PredefinedType();
+    IfcElectricTimeControlTypeEnum::IfcElectricTimeControlTypeEnum PredefinedType() const;
     void setPredefinedType(IfcElectricTimeControlTypeEnum::IfcElectricTimeControlTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcFlowControllerType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcElectricTimeControlTypeEnum; } return IfcFlowControllerType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcFlowControllerType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcElectricTimeControlType (IfcAbstractEntityPtr e);
-    IfcElectricTimeControlType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcElectricTimeControlTypeEnum::IfcElectricTimeControlTypeEnum v10_PredefinedType);
-    typedef IfcElectricTimeControlType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcElectricTimeControlType > > list;
-    typedef IfcTemplatedEntityList< IfcElectricTimeControlType >::it it;
+    IfcElectricTimeControlType (IfcAbstractEntity* e);
+    IfcElectricTimeControlType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcElectricTimeControlTypeEnum::IfcElectricTimeControlTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcElectricTimeControlType > list;
 };
 /// The distribution flow element IfcEnergyConversionDevice defines 
 ///   the occurrence of a device used to perform
@@ -43491,16 +44106,15 @@ class IfcEnergyConversionDevice : public IfcDistributionFlowElement {
 public:
     virtual unsigned int getArgumentCount() const { return 8; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcDistributionFlowElement::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcDistributionFlowElement::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcDistributionFlowElement::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcEnergyConversionDevice (IfcAbstractEntityPtr e);
-    IfcEnergyConversionDevice (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag);
-    typedef IfcEnergyConversionDevice* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcEnergyConversionDevice > > list;
-    typedef IfcTemplatedEntityList< IfcEnergyConversionDevice >::it it;
+    IfcEnergyConversionDevice (IfcAbstractEntity* e);
+    IfcEnergyConversionDevice (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag);
+    typedef IfcTemplatedEntityList< IfcEnergyConversionDevice > list;
 };
 /// An engine is a device that converts fuel into mechanical energy through combustion. 
 /// 
@@ -43546,21 +44160,20 @@ class IfcEnergyConversionDevice : public IfcDistributionFlowElement {
 class IfcEngine : public IfcEnergyConversionDevice {
 public:
     /// Whether the optional attribute PredefinedType is defined for this IfcEngine
-    bool hasPredefinedType();
-    IfcEngineTypeEnum::IfcEngineTypeEnum PredefinedType();
+    bool hasPredefinedType() const;
+    IfcEngineTypeEnum::IfcEngineTypeEnum PredefinedType() const;
     void setPredefinedType(IfcEngineTypeEnum::IfcEngineTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_ENUMERATION; } return IfcEnergyConversionDevice::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcEngineTypeEnum; } return IfcEnergyConversionDevice::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "PredefinedType"; } return IfcEnergyConversionDevice::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcEngine (IfcAbstractEntityPtr e);
-    IfcEngine (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcEngineTypeEnum::IfcEngineTypeEnum > v9_PredefinedType);
-    typedef IfcEngine* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcEngine > > list;
-    typedef IfcTemplatedEntityList< IfcEngine >::it it;
+    IfcEngine (IfcAbstractEntity* e);
+    IfcEngine (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcEngineTypeEnum::IfcEngineTypeEnum > v9_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcEngine > list;
 };
 /// An evaporative cooler is a device that cools air by saturating it with water vapor. 
 /// 
@@ -43609,21 +44222,20 @@ class IfcEngine : public IfcEnergyConversionDevice {
 class IfcEvaporativeCooler : public IfcEnergyConversionDevice {
 public:
     /// Whether the optional attribute PredefinedType is defined for this IfcEvaporativeCooler
-    bool hasPredefinedType();
-    IfcEvaporativeCoolerTypeEnum::IfcEvaporativeCoolerTypeEnum PredefinedType();
+    bool hasPredefinedType() const;
+    IfcEvaporativeCoolerTypeEnum::IfcEvaporativeCoolerTypeEnum PredefinedType() const;
     void setPredefinedType(IfcEvaporativeCoolerTypeEnum::IfcEvaporativeCoolerTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_ENUMERATION; } return IfcEnergyConversionDevice::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcEvaporativeCoolerTypeEnum; } return IfcEnergyConversionDevice::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "PredefinedType"; } return IfcEnergyConversionDevice::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcEvaporativeCooler (IfcAbstractEntityPtr e);
-    IfcEvaporativeCooler (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcEvaporativeCoolerTypeEnum::IfcEvaporativeCoolerTypeEnum > v9_PredefinedType);
-    typedef IfcEvaporativeCooler* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcEvaporativeCooler > > list;
-    typedef IfcTemplatedEntityList< IfcEvaporativeCooler >::it it;
+    IfcEvaporativeCooler (IfcAbstractEntity* e);
+    IfcEvaporativeCooler (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcEvaporativeCoolerTypeEnum::IfcEvaporativeCoolerTypeEnum > v9_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcEvaporativeCooler > list;
 };
 /// An evaporator is a device in which a liquid refrigerent is vaporized and absorbs heat from the surrounding fluid. 
 /// 
@@ -43692,21 +44304,20 @@ class IfcEvaporativeCooler : public IfcEnergyConversionDevice {
 class IfcEvaporator : public IfcEnergyConversionDevice {
 public:
     /// Whether the optional attribute PredefinedType is defined for this IfcEvaporator
-    bool hasPredefinedType();
-    IfcEvaporatorTypeEnum::IfcEvaporatorTypeEnum PredefinedType();
+    bool hasPredefinedType() const;
+    IfcEvaporatorTypeEnum::IfcEvaporatorTypeEnum PredefinedType() const;
     void setPredefinedType(IfcEvaporatorTypeEnum::IfcEvaporatorTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_ENUMERATION; } return IfcEnergyConversionDevice::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcEvaporatorTypeEnum; } return IfcEnergyConversionDevice::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "PredefinedType"; } return IfcEnergyConversionDevice::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcEvaporator (IfcAbstractEntityPtr e);
-    IfcEvaporator (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcEvaporatorTypeEnum::IfcEvaporatorTypeEnum > v9_PredefinedType);
-    typedef IfcEvaporator* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcEvaporator > > list;
-    typedef IfcTemplatedEntityList< IfcEvaporator >::it it;
+    IfcEvaporator (IfcAbstractEntity* e);
+    IfcEvaporator (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcEvaporatorTypeEnum::IfcEvaporatorTypeEnum > v9_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcEvaporator > list;
 };
 /// Definition from IAI: The external spatial element
 /// defines external regions at the building site. Those regions can
@@ -43726,23 +44337,22 @@ class IfcEvaporator : public IfcEnergyConversionDevice {
 class IfcExternalSpatialElement : public IfcExternalSpatialStructureElement {
 public:
     /// Whether the optional attribute PredefinedType is defined for this IfcExternalSpatialElement
-    bool hasPredefinedType();
+    bool hasPredefinedType() const;
     /// Predefined generic types for an external spatial element that are specified in an enumeration. There might be property sets defined specifically for each predefined type.
-    IfcExternalSpatialElementTypeEnum::IfcExternalSpatialElementTypeEnum PredefinedType();
+    IfcExternalSpatialElementTypeEnum::IfcExternalSpatialElementTypeEnum PredefinedType() const;
     void setPredefinedType(IfcExternalSpatialElementTypeEnum::IfcExternalSpatialElementTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_ENUMERATION; } return IfcExternalSpatialStructureElement::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcExternalSpatialElementTypeEnum; } return IfcExternalSpatialStructureElement::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "PredefinedType"; } return IfcExternalSpatialStructureElement::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelSpaceBoundary > > BoundedBy(); // INVERSE IfcRelSpaceBoundary::RelatingSpace
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcRelSpaceBoundary >::ptr BoundedBy() const; // INVERSE IfcRelSpaceBoundary::RelatingSpace
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcExternalSpatialElement (IfcAbstractEntityPtr e);
-    IfcExternalSpatialElement (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcLabel > v8_LongName, boost::optional< IfcExternalSpatialElementTypeEnum::IfcExternalSpatialElementTypeEnum > v9_PredefinedType);
-    typedef IfcExternalSpatialElement* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcExternalSpatialElement > > list;
-    typedef IfcTemplatedEntityList< IfcExternalSpatialElement >::it it;
+    IfcExternalSpatialElement (IfcAbstractEntity* e);
+    IfcExternalSpatialElement (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_LongName, boost::optional< IfcExternalSpatialElementTypeEnum::IfcExternalSpatialElementTypeEnum > v9_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcExternalSpatialElement > list;
 };
 /// The flow moving device type IfcFanType defines commonly shared information for occurrences of fans.  The set of shared information may include: 
 /// 
@@ -43775,20 +44385,19 @@ class IfcExternalSpatialElement : public IfcExternalSpatialStructureElement {
 class IfcFanType : public IfcFlowMovingDeviceType {
 public:
     /// Defines the type of fan typically used in building services.
-    IfcFanTypeEnum::IfcFanTypeEnum PredefinedType();
+    IfcFanTypeEnum::IfcFanTypeEnum PredefinedType() const;
     void setPredefinedType(IfcFanTypeEnum::IfcFanTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcFlowMovingDeviceType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcFanTypeEnum; } return IfcFlowMovingDeviceType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcFlowMovingDeviceType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcFanType (IfcAbstractEntityPtr e);
-    IfcFanType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcFanTypeEnum::IfcFanTypeEnum v10_PredefinedType);
-    typedef IfcFanType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcFanType > > list;
-    typedef IfcTemplatedEntityList< IfcFanType >::it it;
+    IfcFanType (IfcAbstractEntity* e);
+    IfcFanType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcFanTypeEnum::IfcFanTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcFanType > list;
 };
 /// The flow treatment device type IfcFilterType defines commonly shared information for occurrences of filters.  The set of shared information may include: 
 /// 
@@ -43822,20 +44431,19 @@ class IfcFanType : public IfcFlowMovingDeviceType {
 class IfcFilterType : public IfcFlowTreatmentDeviceType {
 public:
     /// The type of air filter.
-    IfcFilterTypeEnum::IfcFilterTypeEnum PredefinedType();
+    IfcFilterTypeEnum::IfcFilterTypeEnum PredefinedType() const;
     void setPredefinedType(IfcFilterTypeEnum::IfcFilterTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcFlowTreatmentDeviceType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcFilterTypeEnum; } return IfcFlowTreatmentDeviceType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcFlowTreatmentDeviceType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcFilterType (IfcAbstractEntityPtr e);
-    IfcFilterType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcFilterTypeEnum::IfcFilterTypeEnum v10_PredefinedType);
-    typedef IfcFilterType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcFilterType > > list;
-    typedef IfcTemplatedEntityList< IfcFilterType >::it it;
+    IfcFilterType (IfcAbstractEntity* e);
+    IfcFilterType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcFilterTypeEnum::IfcFilterTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcFilterType > list;
 };
 /// The flow terminal type IfcFireSuppressionTerminalType defines commonly shared information for occurrences of fire suppression terminals.  The set of shared information may include: 
 /// 
@@ -43873,20 +44481,19 @@ class IfcFilterType : public IfcFlowTreatmentDeviceType {
 class IfcFireSuppressionTerminalType : public IfcFlowTerminalType {
 public:
     /// Identifies the predefined types of fire suppression terminal from which the type required may be set.
-    IfcFireSuppressionTerminalTypeEnum::IfcFireSuppressionTerminalTypeEnum PredefinedType();
+    IfcFireSuppressionTerminalTypeEnum::IfcFireSuppressionTerminalTypeEnum PredefinedType() const;
     void setPredefinedType(IfcFireSuppressionTerminalTypeEnum::IfcFireSuppressionTerminalTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcFlowTerminalType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcFireSuppressionTerminalTypeEnum; } return IfcFlowTerminalType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcFlowTerminalType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcFireSuppressionTerminalType (IfcAbstractEntityPtr e);
-    IfcFireSuppressionTerminalType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcFireSuppressionTerminalTypeEnum::IfcFireSuppressionTerminalTypeEnum v10_PredefinedType);
-    typedef IfcFireSuppressionTerminalType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcFireSuppressionTerminalType > > list;
-    typedef IfcTemplatedEntityList< IfcFireSuppressionTerminalType >::it it;
+    IfcFireSuppressionTerminalType (IfcAbstractEntity* e);
+    IfcFireSuppressionTerminalType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcFireSuppressionTerminalTypeEnum::IfcFireSuppressionTerminalTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcFireSuppressionTerminalType > list;
 };
 /// The distribution flow element IfcFlowController defines
 ///   the occurrence of elements of a distribution system that 
@@ -43901,16 +44508,15 @@ class IfcFlowController : public IfcDistributionFlowElement {
 public:
     virtual unsigned int getArgumentCount() const { return 8; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcDistributionFlowElement::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcDistributionFlowElement::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcDistributionFlowElement::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcFlowController (IfcAbstractEntityPtr e);
-    IfcFlowController (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag);
-    typedef IfcFlowController* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcFlowController > > list;
-    typedef IfcTemplatedEntityList< IfcFlowController >::it it;
+    IfcFlowController (IfcAbstractEntity* e);
+    IfcFlowController (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag);
+    typedef IfcTemplatedEntityList< IfcFlowController > list;
 };
 /// The distribution flow element IfcFlowFitting defines the occurrence of a junction or transition in a flow distribution system, such as an elbow or tee. Its type is defined by IfcFlowFittingType or its subtypes.
 /// 
@@ -43921,16 +44527,15 @@ class IfcFlowFitting : public IfcDistributionFlowElement {
 public:
     virtual unsigned int getArgumentCount() const { return 8; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcDistributionFlowElement::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcDistributionFlowElement::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcDistributionFlowElement::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcFlowFitting (IfcAbstractEntityPtr e);
-    IfcFlowFitting (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag);
-    typedef IfcFlowFitting* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcFlowFitting > > list;
-    typedef IfcTemplatedEntityList< IfcFlowFitting >::it it;
+    IfcFlowFitting (IfcAbstractEntity* e);
+    IfcFlowFitting (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag);
+    typedef IfcTemplatedEntityList< IfcFlowFitting > list;
 };
 /// The distribution control element type IfcFlowInstrumentType defines commonly shared information for occurrences of flow instruments.  The set of shared information may include: 
 /// 
@@ -43965,20 +44570,19 @@ class IfcFlowFitting : public IfcDistributionFlowElement {
 class IfcFlowInstrumentType : public IfcDistributionControlElementType {
 public:
     /// Identifies the predefined types of flow instrument from which the type required may be set.
-    IfcFlowInstrumentTypeEnum::IfcFlowInstrumentTypeEnum PredefinedType();
+    IfcFlowInstrumentTypeEnum::IfcFlowInstrumentTypeEnum PredefinedType() const;
     void setPredefinedType(IfcFlowInstrumentTypeEnum::IfcFlowInstrumentTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcDistributionControlElementType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcFlowInstrumentTypeEnum; } return IfcDistributionControlElementType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcDistributionControlElementType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcFlowInstrumentType (IfcAbstractEntityPtr e);
-    IfcFlowInstrumentType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcFlowInstrumentTypeEnum::IfcFlowInstrumentTypeEnum v10_PredefinedType);
-    typedef IfcFlowInstrumentType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcFlowInstrumentType > > list;
-    typedef IfcTemplatedEntityList< IfcFlowInstrumentType >::it it;
+    IfcFlowInstrumentType (IfcAbstractEntity* e);
+    IfcFlowInstrumentType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcFlowInstrumentTypeEnum::IfcFlowInstrumentTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcFlowInstrumentType > list;
 };
 /// A flow meter is a device that is used to measure the flow rate in a system. 
 /// 
@@ -44063,21 +44667,20 @@ class IfcFlowInstrumentType : public IfcDistributionControlElementType {
 class IfcFlowMeter : public IfcFlowController {
 public:
     /// Whether the optional attribute PredefinedType is defined for this IfcFlowMeter
-    bool hasPredefinedType();
-    IfcFlowMeterTypeEnum::IfcFlowMeterTypeEnum PredefinedType();
+    bool hasPredefinedType() const;
+    IfcFlowMeterTypeEnum::IfcFlowMeterTypeEnum PredefinedType() const;
     void setPredefinedType(IfcFlowMeterTypeEnum::IfcFlowMeterTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_ENUMERATION; } return IfcFlowController::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcFlowMeterTypeEnum; } return IfcFlowController::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "PredefinedType"; } return IfcFlowController::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcFlowMeter (IfcAbstractEntityPtr e);
-    IfcFlowMeter (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcFlowMeterTypeEnum::IfcFlowMeterTypeEnum > v9_PredefinedType);
-    typedef IfcFlowMeter* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcFlowMeter > > list;
-    typedef IfcTemplatedEntityList< IfcFlowMeter >::it it;
+    IfcFlowMeter (IfcAbstractEntity* e);
+    IfcFlowMeter (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcFlowMeterTypeEnum::IfcFlowMeterTypeEnum > v9_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcFlowMeter > list;
 };
 /// The distribution flow element IfcFlowMovingDevice defines the occurrence of an apparatus used to distribute, circulate or perform conveyance of fluids, including liquids and gases (such as a pump or fan), and typically participates in a flow distribution system. Its type is defined by IfcFlowMovingDeviceType or its subtypes.
 /// 
@@ -44088,16 +44691,15 @@ class IfcFlowMovingDevice : public IfcDistributionFlowElement {
 public:
     virtual unsigned int getArgumentCount() const { return 8; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcDistributionFlowElement::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcDistributionFlowElement::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcDistributionFlowElement::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcFlowMovingDevice (IfcAbstractEntityPtr e);
-    IfcFlowMovingDevice (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag);
-    typedef IfcFlowMovingDevice* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcFlowMovingDevice > > list;
-    typedef IfcTemplatedEntityList< IfcFlowMovingDevice >::it it;
+    IfcFlowMovingDevice (IfcAbstractEntity* e);
+    IfcFlowMovingDevice (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag);
+    typedef IfcTemplatedEntityList< IfcFlowMovingDevice > list;
 };
 /// The distribution flow element IfcFlowSegment defines the occurrence of a segment of a flow distribution system.
 /// 
@@ -44126,16 +44728,15 @@ class IfcFlowSegment : public IfcDistributionFlowElement {
 public:
     virtual unsigned int getArgumentCount() const { return 8; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcDistributionFlowElement::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcDistributionFlowElement::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcDistributionFlowElement::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcFlowSegment (IfcAbstractEntityPtr e);
-    IfcFlowSegment (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag);
-    typedef IfcFlowSegment* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcFlowSegment > > list;
-    typedef IfcTemplatedEntityList< IfcFlowSegment >::it it;
+    IfcFlowSegment (IfcAbstractEntity* e);
+    IfcFlowSegment (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag);
+    typedef IfcTemplatedEntityList< IfcFlowSegment > list;
 };
 /// The distribution flow element IfcFlowStorageDevice defines
 ///   the occurrence of a device that participates in a distribution
@@ -44151,16 +44752,15 @@ class IfcFlowStorageDevice : public IfcDistributionFlowElement {
 public:
     virtual unsigned int getArgumentCount() const { return 8; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcDistributionFlowElement::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcDistributionFlowElement::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcDistributionFlowElement::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcFlowStorageDevice (IfcAbstractEntityPtr e);
-    IfcFlowStorageDevice (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag);
-    typedef IfcFlowStorageDevice* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcFlowStorageDevice > > list;
-    typedef IfcTemplatedEntityList< IfcFlowStorageDevice >::it it;
+    IfcFlowStorageDevice (IfcAbstractEntity* e);
+    IfcFlowStorageDevice (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag);
+    typedef IfcTemplatedEntityList< IfcFlowStorageDevice > list;
 };
 /// The distribution flow element IfcFlowTerminal defines the
 ///   occurrence of a permanently attached element that acts as a terminus or 
@@ -44177,16 +44777,15 @@ class IfcFlowTerminal : public IfcDistributionFlowElement {
 public:
     virtual unsigned int getArgumentCount() const { return 8; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcDistributionFlowElement::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcDistributionFlowElement::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcDistributionFlowElement::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcFlowTerminal (IfcAbstractEntityPtr e);
-    IfcFlowTerminal (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag);
-    typedef IfcFlowTerminal* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcFlowTerminal > > list;
-    typedef IfcTemplatedEntityList< IfcFlowTerminal >::it it;
+    IfcFlowTerminal (IfcAbstractEntity* e);
+    IfcFlowTerminal (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag);
+    typedef IfcTemplatedEntityList< IfcFlowTerminal > list;
 };
 /// The distribution flow element IfcFlowTreatmentDevice defines the occurrence of a device typically used to remove unwanted matter from a fluid, either liquid or gas, and typically participates in a flow distribution system.  Its type is defined by IfcFlowTreatmentDeviceType or its subtypes.
 /// 
@@ -44197,16 +44796,15 @@ class IfcFlowTreatmentDevice : public IfcDistributionFlowElement {
 public:
     virtual unsigned int getArgumentCount() const { return 8; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcDistributionFlowElement::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcDistributionFlowElement::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcDistributionFlowElement::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcFlowTreatmentDevice (IfcAbstractEntityPtr e);
-    IfcFlowTreatmentDevice (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag);
-    typedef IfcFlowTreatmentDevice* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcFlowTreatmentDevice > > list;
-    typedef IfcTemplatedEntityList< IfcFlowTreatmentDevice >::it it;
+    IfcFlowTreatmentDevice (IfcAbstractEntity* e);
+    IfcFlowTreatmentDevice (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag);
+    typedef IfcTemplatedEntityList< IfcFlowTreatmentDevice > list;
 };
 /// A footing is a part of the foundation of a structure that spreads and transmits the load to the soil, either directly or via piles.
 /// 
@@ -44233,24 +44831,23 @@ class IfcFlowTreatmentDevice : public IfcDistributionFlowElement {
 class IfcFooting : public IfcBuildingElement {
 public:
     /// Whether the optional attribute PredefinedType is defined for this IfcFooting
-    bool hasPredefinedType();
+    bool hasPredefinedType() const;
     /// The generic type of the footing.
     /// 
     /// IFC 2x4 change:  Attribute made optional.  Type information can be provided by IfcRelDefinesByType and IfcFootingType.
-    IfcFootingTypeEnum::IfcFootingTypeEnum PredefinedType();
+    IfcFootingTypeEnum::IfcFootingTypeEnum PredefinedType() const;
     void setPredefinedType(IfcFootingTypeEnum::IfcFootingTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_ENUMERATION; } return IfcBuildingElement::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcFootingTypeEnum; } return IfcBuildingElement::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "PredefinedType"; } return IfcBuildingElement::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcFooting (IfcAbstractEntityPtr e);
-    IfcFooting (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcFootingTypeEnum::IfcFootingTypeEnum > v9_PredefinedType);
-    typedef IfcFooting* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcFooting > > list;
-    typedef IfcTemplatedEntityList< IfcFooting >::it it;
+    IfcFooting (IfcAbstractEntity* e);
+    IfcFooting (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcFootingTypeEnum::IfcFootingTypeEnum > v9_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcFooting > list;
 };
 /// A heat exchanger is a device used to provide heat transfer between non-mixing media such as plate and shell and tube heat exchangers.
 /// IfcHeatExchanger is commonly used on water-side distribution systems to recover energy from a liquid to another liquid (typically water-based), whereas IfcAirToAirHeatRecovery is commonly used on air-side distribution systems to recover energy from a gas to a gas (usually air). 
@@ -44305,21 +44902,20 @@ class IfcFooting : public IfcBuildingElement {
 class IfcHeatExchanger : public IfcEnergyConversionDevice {
 public:
     /// Whether the optional attribute PredefinedType is defined for this IfcHeatExchanger
-    bool hasPredefinedType();
-    IfcHeatExchangerTypeEnum::IfcHeatExchangerTypeEnum PredefinedType();
+    bool hasPredefinedType() const;
+    IfcHeatExchangerTypeEnum::IfcHeatExchangerTypeEnum PredefinedType() const;
     void setPredefinedType(IfcHeatExchangerTypeEnum::IfcHeatExchangerTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_ENUMERATION; } return IfcEnergyConversionDevice::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcHeatExchangerTypeEnum; } return IfcEnergyConversionDevice::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "PredefinedType"; } return IfcEnergyConversionDevice::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcHeatExchanger (IfcAbstractEntityPtr e);
-    IfcHeatExchanger (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcHeatExchangerTypeEnum::IfcHeatExchangerTypeEnum > v9_PredefinedType);
-    typedef IfcHeatExchanger* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcHeatExchanger > > list;
-    typedef IfcTemplatedEntityList< IfcHeatExchanger >::it it;
+    IfcHeatExchanger (IfcAbstractEntity* e);
+    IfcHeatExchanger (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcHeatExchangerTypeEnum::IfcHeatExchangerTypeEnum > v9_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcHeatExchanger > list;
 };
 /// A humidifier is a device that adds moisture into the air. 
 /// 
@@ -44367,21 +44963,20 @@ class IfcHeatExchanger : public IfcEnergyConversionDevice {
 class IfcHumidifier : public IfcEnergyConversionDevice {
 public:
     /// Whether the optional attribute PredefinedType is defined for this IfcHumidifier
-    bool hasPredefinedType();
-    IfcHumidifierTypeEnum::IfcHumidifierTypeEnum PredefinedType();
+    bool hasPredefinedType() const;
+    IfcHumidifierTypeEnum::IfcHumidifierTypeEnum PredefinedType() const;
     void setPredefinedType(IfcHumidifierTypeEnum::IfcHumidifierTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_ENUMERATION; } return IfcEnergyConversionDevice::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcHumidifierTypeEnum; } return IfcEnergyConversionDevice::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "PredefinedType"; } return IfcEnergyConversionDevice::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcHumidifier (IfcAbstractEntityPtr e);
-    IfcHumidifier (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcHumidifierTypeEnum::IfcHumidifierTypeEnum > v9_PredefinedType);
-    typedef IfcHumidifier* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcHumidifier > > list;
-    typedef IfcTemplatedEntityList< IfcHumidifier >::it it;
+    IfcHumidifier (IfcAbstractEntity* e);
+    IfcHumidifier (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcHumidifierTypeEnum::IfcHumidifierTypeEnum > v9_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcHumidifier > list;
 };
 /// An interceptor is a device designed and installed in order to separate and retain deleterious, hazardous or undesirable matter while permitting normal sewage or liquids to discharge into a collection system by gravity. 
 /// 
@@ -44443,21 +45038,20 @@ class IfcHumidifier : public IfcEnergyConversionDevice {
 class IfcInterceptor : public IfcFlowTreatmentDevice {
 public:
     /// Whether the optional attribute PredefinedType is defined for this IfcInterceptor
-    bool hasPredefinedType();
-    IfcInterceptorTypeEnum::IfcInterceptorTypeEnum PredefinedType();
+    bool hasPredefinedType() const;
+    IfcInterceptorTypeEnum::IfcInterceptorTypeEnum PredefinedType() const;
     void setPredefinedType(IfcInterceptorTypeEnum::IfcInterceptorTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_ENUMERATION; } return IfcFlowTreatmentDevice::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcInterceptorTypeEnum; } return IfcFlowTreatmentDevice::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "PredefinedType"; } return IfcFlowTreatmentDevice::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcInterceptor (IfcAbstractEntityPtr e);
-    IfcInterceptor (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcInterceptorTypeEnum::IfcInterceptorTypeEnum > v9_PredefinedType);
-    typedef IfcInterceptor* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcInterceptor > > list;
-    typedef IfcTemplatedEntityList< IfcInterceptor >::it it;
+    IfcInterceptor (IfcAbstractEntity* e);
+    IfcInterceptor (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcInterceptorTypeEnum::IfcInterceptorTypeEnum > v9_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcInterceptor > list;
 };
 /// A junction box is an enclosure within which cables are connected.
 /// Cables may be members of an electrical circuit (for electrical power systems) or be information carriers (in a telecommunications system). A junction box is typically intended to conceal a cable junction from sight, eliminate tampering or provide a safe place for electrical connection. 
@@ -44528,21 +45122,20 @@ class IfcInterceptor : public IfcFlowTreatmentDevice {
 class IfcJunctionBox : public IfcFlowFitting {
 public:
     /// Whether the optional attribute PredefinedType is defined for this IfcJunctionBox
-    bool hasPredefinedType();
-    IfcJunctionBoxTypeEnum::IfcJunctionBoxTypeEnum PredefinedType();
+    bool hasPredefinedType() const;
+    IfcJunctionBoxTypeEnum::IfcJunctionBoxTypeEnum PredefinedType() const;
     void setPredefinedType(IfcJunctionBoxTypeEnum::IfcJunctionBoxTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_ENUMERATION; } return IfcFlowFitting::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcJunctionBoxTypeEnum; } return IfcFlowFitting::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "PredefinedType"; } return IfcFlowFitting::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcJunctionBox (IfcAbstractEntityPtr e);
-    IfcJunctionBox (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcJunctionBoxTypeEnum::IfcJunctionBoxTypeEnum > v9_PredefinedType);
-    typedef IfcJunctionBox* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcJunctionBox > > list;
-    typedef IfcTemplatedEntityList< IfcJunctionBox >::it it;
+    IfcJunctionBox (IfcAbstractEntity* e);
+    IfcJunctionBox (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcJunctionBoxTypeEnum::IfcJunctionBoxTypeEnum > v9_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcJunctionBox > list;
 };
 /// A lamp is an artificial light source such as a light bulb or tube. 
 /// 
@@ -44594,21 +45187,20 @@ class IfcJunctionBox : public IfcFlowFitting {
 class IfcLamp : public IfcFlowTerminal {
 public:
     /// Whether the optional attribute PredefinedType is defined for this IfcLamp
-    bool hasPredefinedType();
-    IfcLampTypeEnum::IfcLampTypeEnum PredefinedType();
+    bool hasPredefinedType() const;
+    IfcLampTypeEnum::IfcLampTypeEnum PredefinedType() const;
     void setPredefinedType(IfcLampTypeEnum::IfcLampTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_ENUMERATION; } return IfcFlowTerminal::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcLampTypeEnum; } return IfcFlowTerminal::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "PredefinedType"; } return IfcFlowTerminal::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcLamp (IfcAbstractEntityPtr e);
-    IfcLamp (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcLampTypeEnum::IfcLampTypeEnum > v9_PredefinedType);
-    typedef IfcLamp* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcLamp > > list;
-    typedef IfcTemplatedEntityList< IfcLamp >::it it;
+    IfcLamp (IfcAbstractEntity* e);
+    IfcLamp (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcLampTypeEnum::IfcLampTypeEnum > v9_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcLamp > list;
 };
 /// A light fixture is a container that is designed for the purpose of housing one or more lamps and optionally devices that control, restrict or vary their emission. 
 /// 
@@ -44679,21 +45271,20 @@ class IfcLamp : public IfcFlowTerminal {
 class IfcLightFixture : public IfcFlowTerminal {
 public:
     /// Whether the optional attribute PredefinedType is defined for this IfcLightFixture
-    bool hasPredefinedType();
-    IfcLightFixtureTypeEnum::IfcLightFixtureTypeEnum PredefinedType();
+    bool hasPredefinedType() const;
+    IfcLightFixtureTypeEnum::IfcLightFixtureTypeEnum PredefinedType() const;
     void setPredefinedType(IfcLightFixtureTypeEnum::IfcLightFixtureTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_ENUMERATION; } return IfcFlowTerminal::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcLightFixtureTypeEnum; } return IfcFlowTerminal::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "PredefinedType"; } return IfcFlowTerminal::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcLightFixture (IfcAbstractEntityPtr e);
-    IfcLightFixture (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcLightFixtureTypeEnum::IfcLightFixtureTypeEnum > v9_PredefinedType);
-    typedef IfcLightFixture* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcLightFixture > > list;
-    typedef IfcTemplatedEntityList< IfcLightFixture >::it it;
+    IfcLightFixture (IfcAbstractEntity* e);
+    IfcLightFixture (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcLightFixtureTypeEnum::IfcLightFixtureTypeEnum > v9_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcLightFixture > list;
 };
 /// A medical device is attached to a medical piping system and operates upon medical gases to perform a specific function. Medical gases include medical air, medical vacuum, oxygen, carbon dioxide, nitrogen, and nitrous oxide.
 /// Outlets for medical gasses should use IfcValve with PredefinedType equal to GASTAP, containing an IfcDistributionPort with FlowDirection=SINK and PredefinedType equal to COMPRESSEDAIR, VACUUM, or CHEMICAL, and having property sets on the port further indicating the gas type and pressure. Tanks for medical gasses should use IfcTank with PredefinedType equal to PRESSUREVESSEL, containing an IfcDistributionPort with FlowDirection=SOURCE and PredefinedType=CHEMICAL, and having property sets on the port further indicating the gas type and pressure range. 
@@ -44742,21 +45333,20 @@ class IfcLightFixture : public IfcFlowTerminal {
 class IfcMedicalDevice : public IfcFlowTerminal {
 public:
     /// Whether the optional attribute PredefinedType is defined for this IfcMedicalDevice
-    bool hasPredefinedType();
-    IfcMedicalDeviceTypeEnum::IfcMedicalDeviceTypeEnum PredefinedType();
+    bool hasPredefinedType() const;
+    IfcMedicalDeviceTypeEnum::IfcMedicalDeviceTypeEnum PredefinedType() const;
     void setPredefinedType(IfcMedicalDeviceTypeEnum::IfcMedicalDeviceTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_ENUMERATION; } return IfcFlowTerminal::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcMedicalDeviceTypeEnum; } return IfcFlowTerminal::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "PredefinedType"; } return IfcFlowTerminal::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcMedicalDevice (IfcAbstractEntityPtr e);
-    IfcMedicalDevice (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcMedicalDeviceTypeEnum::IfcMedicalDeviceTypeEnum > v9_PredefinedType);
-    typedef IfcMedicalDevice* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcMedicalDevice > > list;
-    typedef IfcTemplatedEntityList< IfcMedicalDevice >::it it;
+    IfcMedicalDevice (IfcAbstractEntity* e);
+    IfcMedicalDevice (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcMedicalDeviceTypeEnum::IfcMedicalDeviceTypeEnum > v9_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcMedicalDevice > list;
 };
 /// An IfcMember is a
 /// structural member designed to carry loads between or beyond
@@ -45011,25 +45601,24 @@ class IfcMedicalDevice : public IfcFlowTerminal {
 class IfcMember : public IfcBuildingElement {
 public:
     /// Whether the optional attribute PredefinedType is defined for this IfcMember
-    bool hasPredefinedType();
+    bool hasPredefinedType() const;
     /// Predefined generic type for a member that is specified in an enumeration. There may be a property set given for the predefined types.
     ///   NOTE The PredefinedType shall only be used, if no type object IfcMemberType is assigned, providing its own IfcMemberType.PredefinedType.
     /// 
     /// IFC2x4 CHANGE  The attribute has been added at the end of the entity definition.
-    IfcMemberTypeEnum::IfcMemberTypeEnum PredefinedType();
+    IfcMemberTypeEnum::IfcMemberTypeEnum PredefinedType() const;
     void setPredefinedType(IfcMemberTypeEnum::IfcMemberTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_ENUMERATION; } return IfcBuildingElement::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcMemberTypeEnum; } return IfcBuildingElement::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "PredefinedType"; } return IfcBuildingElement::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcMember (IfcAbstractEntityPtr e);
-    IfcMember (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcMemberTypeEnum::IfcMemberTypeEnum > v9_PredefinedType);
-    typedef IfcMember* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcMember > > list;
-    typedef IfcTemplatedEntityList< IfcMember >::it it;
+    IfcMember (IfcAbstractEntity* e);
+    IfcMember (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcMemberTypeEnum::IfcMemberTypeEnum > v9_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcMember > list;
 };
 /// The standard member,
 /// IfcMemberStandardCase, defines a member with certain
@@ -45274,16 +45863,15 @@ class IfcMemberStandardCase : public IfcMember {
 public:
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcMember::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcMember::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcMember::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcMemberStandardCase (IfcAbstractEntityPtr e);
-    IfcMemberStandardCase (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcMemberTypeEnum::IfcMemberTypeEnum > v9_PredefinedType);
-    typedef IfcMemberStandardCase* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcMemberStandardCase > > list;
-    typedef IfcTemplatedEntityList< IfcMemberStandardCase >::it it;
+    IfcMemberStandardCase (IfcAbstractEntity* e);
+    IfcMemberStandardCase (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcMemberTypeEnum::IfcMemberTypeEnum > v9_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcMemberStandardCase > list;
 };
 /// A motor connection provides the means for connecting a motor as the driving device to the driven device. 
 /// 
@@ -45329,21 +45917,20 @@ class IfcMemberStandardCase : public IfcMember {
 class IfcMotorConnection : public IfcEnergyConversionDevice {
 public:
     /// Whether the optional attribute PredefinedType is defined for this IfcMotorConnection
-    bool hasPredefinedType();
-    IfcMotorConnectionTypeEnum::IfcMotorConnectionTypeEnum PredefinedType();
+    bool hasPredefinedType() const;
+    IfcMotorConnectionTypeEnum::IfcMotorConnectionTypeEnum PredefinedType() const;
     void setPredefinedType(IfcMotorConnectionTypeEnum::IfcMotorConnectionTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_ENUMERATION; } return IfcEnergyConversionDevice::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcMotorConnectionTypeEnum; } return IfcEnergyConversionDevice::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "PredefinedType"; } return IfcEnergyConversionDevice::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcMotorConnection (IfcAbstractEntityPtr e);
-    IfcMotorConnection (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcMotorConnectionTypeEnum::IfcMotorConnectionTypeEnum > v9_PredefinedType);
-    typedef IfcMotorConnection* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcMotorConnection > > list;
-    typedef IfcTemplatedEntityList< IfcMotorConnection >::it it;
+    IfcMotorConnection (IfcAbstractEntity* e);
+    IfcMotorConnection (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcMotorConnectionTypeEnum::IfcMotorConnectionTypeEnum > v9_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcMotorConnection > list;
 };
 /// Definition from ISO/CD 10303-42:1992ÿ This is a special subtype of boundary curve which has the additional semantics of defining an outer boundary of a surface. No more than one such curve shall be included in the set of boundaries of a curve bounded surface.
 /// 
@@ -45354,16 +45941,15 @@ class IfcOuterBoundaryCurve : public IfcBoundaryCurve {
 public:
     virtual unsigned int getArgumentCount() const { return 2; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcBoundaryCurve::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcBoundaryCurve::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcBoundaryCurve::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcOuterBoundaryCurve (IfcAbstractEntityPtr e);
-    IfcOuterBoundaryCurve (SHARED_PTR< IfcTemplatedEntityList< IfcCompositeCurveSegment > > v1_Segments, bool v2_SelfIntersect);
-    typedef IfcOuterBoundaryCurve* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcOuterBoundaryCurve > > list;
-    typedef IfcTemplatedEntityList< IfcOuterBoundaryCurve >::it it;
+    IfcOuterBoundaryCurve (IfcAbstractEntity* e);
+    IfcOuterBoundaryCurve (IfcTemplatedEntityList< IfcCompositeCurveSegment >::ptr v1_Segments, bool v2_SelfIntersect);
+    typedef IfcTemplatedEntityList< IfcOuterBoundaryCurve > list;
 };
 /// An outlet is a device installed at a point to receive one or more inserted plugs for electrical power or communications.
 /// Power outlets are commonly connected within a junction box; data outlets may be directly connected to a wall. For power outlets sharing the same circuit within a junction box, the ports should indicate the logical wiring relationship to the enclosing junction box, even though they may be physically connected to a cable going to another outlet, switch, or fixture. 
@@ -45434,21 +46020,20 @@ class IfcOuterBoundaryCurve : public IfcBoundaryCurve {
 class IfcOutlet : public IfcFlowTerminal {
 public:
     /// Whether the optional attribute PredefinedType is defined for this IfcOutlet
-    bool hasPredefinedType();
-    IfcOutletTypeEnum::IfcOutletTypeEnum PredefinedType();
+    bool hasPredefinedType() const;
+    IfcOutletTypeEnum::IfcOutletTypeEnum PredefinedType() const;
     void setPredefinedType(IfcOutletTypeEnum::IfcOutletTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_ENUMERATION; } return IfcFlowTerminal::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcOutletTypeEnum; } return IfcFlowTerminal::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "PredefinedType"; } return IfcFlowTerminal::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcOutlet (IfcAbstractEntityPtr e);
-    IfcOutlet (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcOutletTypeEnum::IfcOutletTypeEnum > v9_PredefinedType);
-    typedef IfcOutlet* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcOutlet > > list;
-    typedef IfcTemplatedEntityList< IfcOutlet >::it it;
+    IfcOutlet (IfcAbstractEntity* e);
+    IfcOutlet (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcOutletTypeEnum::IfcOutletTypeEnum > v9_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcOutlet > list;
 };
 /// A pile is a slender timber, concrete, or steel structural element, driven, jetted, or otherwise embedded on end in the ground for the purpose of supporting a load.
 /// 
@@ -45471,31 +46056,30 @@ class IfcOutlet : public IfcFlowTerminal {
 class IfcPile : public IfcBuildingElement {
 public:
     /// Whether the optional attribute PredefinedType is defined for this IfcPile
-    bool hasPredefinedType();
+    bool hasPredefinedType() const;
     /// The predefined generic type of the pile according to function.
     /// 
     /// IFC 2x4 change:  Attribute made optional.  Type information can be provided by IfcRelDefinesByType and IfcPileType.
-    IfcPileTypeEnum::IfcPileTypeEnum PredefinedType();
+    IfcPileTypeEnum::IfcPileTypeEnum PredefinedType() const;
     void setPredefinedType(IfcPileTypeEnum::IfcPileTypeEnum v);
     /// Whether the optional attribute ConstructionType is defined for this IfcPile
-    bool hasConstructionType();
+    bool hasConstructionType() const;
     /// General designator for how the pile is constructed.
     /// 
     /// IFC 2x4 change:  Material profile association capability by means of IfcRelAssociatesMaterial has been added.  The attribute ConstructionType should not be used whenever its information can be provided by a material profile set, either associated with the IfcPile object or, if present, with a corresponding instance of IfcPileType.
-    IfcPileConstructionEnum::IfcPileConstructionEnum ConstructionType();
+    IfcPileConstructionEnum::IfcPileConstructionEnum ConstructionType() const;
     void setConstructionType(IfcPileConstructionEnum::IfcPileConstructionEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_ENUMERATION; case 9: return IfcUtil::Argument_ENUMERATION; } return IfcBuildingElement::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcPileTypeEnum; case 9: return Type::IfcPileConstructionEnum; } return IfcBuildingElement::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "PredefinedType"; case 9: return "ConstructionType"; } return IfcBuildingElement::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcPile (IfcAbstractEntityPtr e);
-    IfcPile (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcPileTypeEnum::IfcPileTypeEnum > v9_PredefinedType, boost::optional< IfcPileConstructionEnum::IfcPileConstructionEnum > v10_ConstructionType);
-    typedef IfcPile* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcPile > > list;
-    typedef IfcTemplatedEntityList< IfcPile >::it it;
+    IfcPile (IfcAbstractEntity* e);
+    IfcPile (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcPileTypeEnum::IfcPileTypeEnum > v9_PredefinedType, boost::optional< IfcPileConstructionEnum::IfcPileConstructionEnum > v10_ConstructionType);
+    typedef IfcTemplatedEntityList< IfcPile > list;
 };
 /// A pipe fitting is a junction or transition in a piping flow distribution system or used to connect pipe segments, resulting changes in flow characteristics to the fluid such as direction or flow rate. 
 /// 
@@ -45585,21 +46169,20 @@ class IfcPile : public IfcBuildingElement {
 class IfcPipeFitting : public IfcFlowFitting {
 public:
     /// Whether the optional attribute PredefinedType is defined for this IfcPipeFitting
-    bool hasPredefinedType();
-    IfcPipeFittingTypeEnum::IfcPipeFittingTypeEnum PredefinedType();
+    bool hasPredefinedType() const;
+    IfcPipeFittingTypeEnum::IfcPipeFittingTypeEnum PredefinedType() const;
     void setPredefinedType(IfcPipeFittingTypeEnum::IfcPipeFittingTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_ENUMERATION; } return IfcFlowFitting::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcPipeFittingTypeEnum; } return IfcFlowFitting::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "PredefinedType"; } return IfcFlowFitting::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcPipeFitting (IfcAbstractEntityPtr e);
-    IfcPipeFitting (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcPipeFittingTypeEnum::IfcPipeFittingTypeEnum > v9_PredefinedType);
-    typedef IfcPipeFitting* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcPipeFitting > > list;
-    typedef IfcTemplatedEntityList< IfcPipeFitting >::it it;
+    IfcPipeFitting (IfcAbstractEntity* e);
+    IfcPipeFitting (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcPipeFittingTypeEnum::IfcPipeFittingTypeEnum > v9_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcPipeFitting > list;
 };
 /// A pipe segment is used to typically join two sections of a piping network. 
 /// 
@@ -45664,21 +46247,20 @@ class IfcPipeFitting : public IfcFlowFitting {
 class IfcPipeSegment : public IfcFlowSegment {
 public:
     /// Whether the optional attribute PredefinedType is defined for this IfcPipeSegment
-    bool hasPredefinedType();
-    IfcPipeSegmentTypeEnum::IfcPipeSegmentTypeEnum PredefinedType();
+    bool hasPredefinedType() const;
+    IfcPipeSegmentTypeEnum::IfcPipeSegmentTypeEnum PredefinedType() const;
     void setPredefinedType(IfcPipeSegmentTypeEnum::IfcPipeSegmentTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_ENUMERATION; } return IfcFlowSegment::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcPipeSegmentTypeEnum; } return IfcFlowSegment::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "PredefinedType"; } return IfcFlowSegment::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcPipeSegment (IfcAbstractEntityPtr e);
-    IfcPipeSegment (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcPipeSegmentTypeEnum::IfcPipeSegmentTypeEnum > v9_PredefinedType);
-    typedef IfcPipeSegment* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcPipeSegment > > list;
-    typedef IfcTemplatedEntityList< IfcPipeSegment >::it it;
+    IfcPipeSegment (IfcAbstractEntity* e);
+    IfcPipeSegment (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcPipeSegmentTypeEnum::IfcPipeSegmentTypeEnum > v9_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcPipeSegment > list;
 };
 /// Definition from IAI: An IfcPlate is a planar and
 /// often flat part with constant thickness. A plate can be a
@@ -45911,25 +46493,24 @@ class IfcPipeSegment : public IfcFlowSegment {
 class IfcPlate : public IfcBuildingElement {
 public:
     /// Whether the optional attribute PredefinedType is defined for this IfcPlate
-    bool hasPredefinedType();
+    bool hasPredefinedType() const;
     /// Predefined generic type for a plate that is specified in an enumeration. There may be a property set given specificly for the predefined types.
     ///   NOTE The PredefinedType shall only be used, if no type object IfcPlateType is assigned, providing its own IfcPlateType.PredefinedType.
     /// 
     /// IFC2x4 CHANGE  The attribute has been added at the end of the entity definition.
-    IfcPlateTypeEnum::IfcPlateTypeEnum PredefinedType();
+    IfcPlateTypeEnum::IfcPlateTypeEnum PredefinedType() const;
     void setPredefinedType(IfcPlateTypeEnum::IfcPlateTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_ENUMERATION; } return IfcBuildingElement::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcPlateTypeEnum; } return IfcBuildingElement::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "PredefinedType"; } return IfcBuildingElement::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcPlate (IfcAbstractEntityPtr e);
-    IfcPlate (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcPlateTypeEnum::IfcPlateTypeEnum > v9_PredefinedType);
-    typedef IfcPlate* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcPlate > > list;
-    typedef IfcTemplatedEntityList< IfcPlate >::it it;
+    IfcPlate (IfcAbstractEntity* e);
+    IfcPlate (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcPlateTypeEnum::IfcPlateTypeEnum > v9_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcPlate > list;
 };
 /// The standard plate,
 /// IfcPlateStandardCase, defines a plate with certain
@@ -46088,16 +46669,15 @@ class IfcPlateStandardCase : public IfcPlate {
 public:
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcPlate::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcPlate::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcPlate::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcPlateStandardCase (IfcAbstractEntityPtr e);
-    IfcPlateStandardCase (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcPlateTypeEnum::IfcPlateTypeEnum > v9_PredefinedType);
-    typedef IfcPlateStandardCase* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcPlateStandardCase > > list;
-    typedef IfcTemplatedEntityList< IfcPlateStandardCase >::it it;
+    IfcPlateStandardCase (IfcAbstractEntity* e);
+    IfcPlateStandardCase (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcPlateTypeEnum::IfcPlateTypeEnum > v9_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcPlateStandardCase > list;
 };
 /// A protective device breaks an electrical circuit when a stated electric current that passes through it is exceeded.
 /// A protective device provides protection against electrical current only (not as a general protective device). It may be used to represent the complete set of elements including both the tripping unit and the breaking unit that provide the protection. This may be particularly useful at earlier stages of design where the approach to breaking the electrical supply may be determined but the method of tripping may not. Alternatively, this entity may be used to specifically represent the breaking unit alone (in which case the tripping unit will also be specifically identified). This entity is specific to dedicated protective devices and excludes electrical outlets that may have circuit protection. 
@@ -46178,21 +46758,20 @@ class IfcPlateStandardCase : public IfcPlate {
 class IfcProtectiveDevice : public IfcFlowController {
 public:
     /// Whether the optional attribute PredefinedType is defined for this IfcProtectiveDevice
-    bool hasPredefinedType();
-    IfcProtectiveDeviceTypeEnum::IfcProtectiveDeviceTypeEnum PredefinedType();
+    bool hasPredefinedType() const;
+    IfcProtectiveDeviceTypeEnum::IfcProtectiveDeviceTypeEnum PredefinedType() const;
     void setPredefinedType(IfcProtectiveDeviceTypeEnum::IfcProtectiveDeviceTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_ENUMERATION; } return IfcFlowController::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcProtectiveDeviceTypeEnum; } return IfcFlowController::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "PredefinedType"; } return IfcFlowController::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcProtectiveDevice (IfcAbstractEntityPtr e);
-    IfcProtectiveDevice (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcProtectiveDeviceTypeEnum::IfcProtectiveDeviceTypeEnum > v9_PredefinedType);
-    typedef IfcProtectiveDevice* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcProtectiveDevice > > list;
-    typedef IfcTemplatedEntityList< IfcProtectiveDevice >::it it;
+    IfcProtectiveDevice (IfcAbstractEntity* e);
+    IfcProtectiveDevice (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcProtectiveDeviceTypeEnum::IfcProtectiveDeviceTypeEnum > v9_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcProtectiveDevice > list;
 };
 /// The distribution control element type IfcProtectiveDeviceTrippingUnitType defines commonly shared information for occurrences of protective device tripping units.  The set of shared information may include: 
 /// 
@@ -46237,20 +46816,19 @@ class IfcProtectiveDevice : public IfcFlowController {
 class IfcProtectiveDeviceTrippingUnitType : public IfcDistributionControlElementType {
 public:
     /// Identifies the predefined types of protective device tripping unit types from which the type required may be set.
-    IfcProtectiveDeviceTrippingUnitTypeEnum::IfcProtectiveDeviceTrippingUnitTypeEnum PredefinedType();
+    IfcProtectiveDeviceTrippingUnitTypeEnum::IfcProtectiveDeviceTrippingUnitTypeEnum PredefinedType() const;
     void setPredefinedType(IfcProtectiveDeviceTrippingUnitTypeEnum::IfcProtectiveDeviceTrippingUnitTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcDistributionControlElementType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcProtectiveDeviceTrippingUnitTypeEnum; } return IfcDistributionControlElementType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcDistributionControlElementType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcProtectiveDeviceTrippingUnitType (IfcAbstractEntityPtr e);
-    IfcProtectiveDeviceTrippingUnitType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcProtectiveDeviceTrippingUnitTypeEnum::IfcProtectiveDeviceTrippingUnitTypeEnum v10_PredefinedType);
-    typedef IfcProtectiveDeviceTrippingUnitType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcProtectiveDeviceTrippingUnitType > > list;
-    typedef IfcTemplatedEntityList< IfcProtectiveDeviceTrippingUnitType >::it it;
+    IfcProtectiveDeviceTrippingUnitType (IfcAbstractEntity* e);
+    IfcProtectiveDeviceTrippingUnitType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcProtectiveDeviceTrippingUnitTypeEnum::IfcProtectiveDeviceTrippingUnitTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcProtectiveDeviceTrippingUnitType > list;
 };
 /// A pump is a device which imparts mechanical work on fluids or slurries to move them through a channel or pipeline. A typical use of a pump is to circulate chilled water or heating hot water in a building services distribution system. 
 /// 
@@ -46304,21 +46882,20 @@ class IfcProtectiveDeviceTrippingUnitType : public IfcDistributionControlElement
 class IfcPump : public IfcFlowMovingDevice {
 public:
     /// Whether the optional attribute PredefinedType is defined for this IfcPump
-    bool hasPredefinedType();
-    IfcPumpTypeEnum::IfcPumpTypeEnum PredefinedType();
+    bool hasPredefinedType() const;
+    IfcPumpTypeEnum::IfcPumpTypeEnum PredefinedType() const;
     void setPredefinedType(IfcPumpTypeEnum::IfcPumpTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_ENUMERATION; } return IfcFlowMovingDevice::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcPumpTypeEnum; } return IfcFlowMovingDevice::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "PredefinedType"; } return IfcFlowMovingDevice::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcPump (IfcAbstractEntityPtr e);
-    IfcPump (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcPumpTypeEnum::IfcPumpTypeEnum > v9_PredefinedType);
-    typedef IfcPump* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcPump > > list;
-    typedef IfcTemplatedEntityList< IfcPump >::it it;
+    IfcPump (IfcAbstractEntity* e);
+    IfcPump (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcPumpTypeEnum::IfcPumpTypeEnum > v9_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcPump > list;
 };
 /// Definition of IAI: The railing is a frame assembly
 /// adjacent to human circulation spaces and at some space boundaries
@@ -46455,24 +47032,23 @@ class IfcPump : public IfcFlowMovingDevice {
 class IfcRailing : public IfcBuildingElement {
 public:
     /// Whether the optional attribute PredefinedType is defined for this IfcRailing
-    bool hasPredefinedType();
+    bool hasPredefinedType() const;
     /// Predefined generic types for a railing that are specified in an enumeration. There may be a property set given for the predefined types.
     ///   NOTE: The use of the predefined type directly at the occurrence object level of IfcRailing is only permitted, if no type object IfcRailingType is assigned.
     ///   IFC2x PLATFORM CHANGE: The attribute has been changed into an OPTIONAL attribute.
-    IfcRailingTypeEnum::IfcRailingTypeEnum PredefinedType();
+    IfcRailingTypeEnum::IfcRailingTypeEnum PredefinedType() const;
     void setPredefinedType(IfcRailingTypeEnum::IfcRailingTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_ENUMERATION; } return IfcBuildingElement::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcRailingTypeEnum; } return IfcBuildingElement::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "PredefinedType"; } return IfcBuildingElement::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRailing (IfcAbstractEntityPtr e);
-    IfcRailing (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcRailingTypeEnum::IfcRailingTypeEnum > v9_PredefinedType);
-    typedef IfcRailing* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRailing > > list;
-    typedef IfcTemplatedEntityList< IfcRailing >::it it;
+    IfcRailing (IfcAbstractEntity* e);
+    IfcRailing (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcRailingTypeEnum::IfcRailingTypeEnum > v9_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcRailing > list;
 };
 /// Definition from ISO 6707-1:1989: Inclined way or floor
 /// joining two surfaces at different levels.
@@ -46610,26 +47186,25 @@ class IfcRailing : public IfcBuildingElement {
 class IfcRamp : public IfcBuildingElement {
 public:
     /// Whether the optional attribute PredefinedType is defined for this IfcRamp
-    bool hasPredefinedType();
+    bool hasPredefinedType() const;
     /// Predefined shape types for a ramp that are specified in an enumeration.
     /// 
     /// NOTE The PredefinedType shall only be used, if no type object IfcRampType is assigned, providing its own IfcRampType.PredefinedType.
     /// 
     /// IFC2x4 CHANGE  The attribute has been renamed from ShapeType and changed to be OPTIONAL with upward compatibility for file based exchange.
-    IfcRampTypeEnum::IfcRampTypeEnum PredefinedType();
+    IfcRampTypeEnum::IfcRampTypeEnum PredefinedType() const;
     void setPredefinedType(IfcRampTypeEnum::IfcRampTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_ENUMERATION; } return IfcBuildingElement::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcRampTypeEnum; } return IfcBuildingElement::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "PredefinedType"; } return IfcBuildingElement::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRamp (IfcAbstractEntityPtr e);
-    IfcRamp (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcRampTypeEnum::IfcRampTypeEnum > v9_PredefinedType);
-    typedef IfcRamp* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRamp > > list;
-    typedef IfcTemplatedEntityList< IfcRamp >::it it;
+    IfcRamp (IfcAbstractEntity* e);
+    IfcRamp (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcRampTypeEnum::IfcRampTypeEnum > v9_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcRamp > list;
 };
 /// A ramp is an inclined slab segment, normally
 /// providing a human circulation link between two landings, floors or
@@ -46822,25 +47397,24 @@ class IfcRamp : public IfcBuildingElement {
 class IfcRampFlight : public IfcBuildingElement {
 public:
     /// Whether the optional attribute PredefinedType is defined for this IfcRampFlight
-    bool hasPredefinedType();
+    bool hasPredefinedType() const;
     /// Predefined generic type for a ramp flight that is specified in an enumeration. There may be a property set given specificly for the predefined types.
     ///   NOTE The PredefinedType shall only be used, if no type object IfcRampFlightType is assigned, providing its own IfcRampFlightType.PredefinedType.
     /// 
     /// IFC2x4 CHANGE  The attribute has been added at the end of the entity definition.
-    IfcRampFlightTypeEnum::IfcRampFlightTypeEnum PredefinedType();
+    IfcRampFlightTypeEnum::IfcRampFlightTypeEnum PredefinedType() const;
     void setPredefinedType(IfcRampFlightTypeEnum::IfcRampFlightTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_ENUMERATION; } return IfcBuildingElement::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcRampFlightTypeEnum; } return IfcBuildingElement::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "PredefinedType"; } return IfcBuildingElement::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRampFlight (IfcAbstractEntityPtr e);
-    IfcRampFlight (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcRampFlightTypeEnum::IfcRampFlightTypeEnum > v9_PredefinedType);
-    typedef IfcRampFlight* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRampFlight > > list;
-    typedef IfcTemplatedEntityList< IfcRampFlight >::it it;
+    IfcRampFlight (IfcAbstractEntity* e);
+    IfcRampFlight (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcRampFlightTypeEnum::IfcRampFlightTypeEnum > v9_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcRampFlight > list;
 };
 /// A rational B-spline curve with knots is a B-spline curve
 /// described in terms of control points and basic functions. It
@@ -46881,20 +47455,19 @@ class IfcRampFlight : public IfcBuildingElement {
 class IfcRationalBSplineCurveWithKnots : public IfcBSplineCurveWithKnots {
 public:
     /// The supplied values of the weights.
-    std::vector< double > /*[2:?]*/ WeightsData();
+    std::vector< double > /*[2:?]*/ WeightsData() const;
     void setWeightsData(std::vector< double > /*[2:?]*/ v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_VECTOR_DOUBLE; } return IfcBSplineCurveWithKnots::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::UNDEFINED; } return IfcBSplineCurveWithKnots::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "WeightsData"; } return IfcBSplineCurveWithKnots::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRationalBSplineCurveWithKnots (IfcAbstractEntityPtr e);
-    IfcRationalBSplineCurveWithKnots (int v1_Degree, SHARED_PTR< IfcTemplatedEntityList< IfcCartesianPoint > > v2_ControlPointsList, IfcBSplineCurveForm::IfcBSplineCurveForm v3_CurveForm, bool v4_ClosedCurve, bool v5_SelfIntersect, std::vector< int > /*[2:?]*/ v6_KnotMultiplicities, std::vector< IfcParameterValue > /*[2:?]*/ v7_Knots, IfcKnotType::IfcKnotType v8_KnotSpec, std::vector< double > /*[2:?]*/ v9_WeightsData);
-    typedef IfcRationalBSplineCurveWithKnots* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRationalBSplineCurveWithKnots > > list;
-    typedef IfcTemplatedEntityList< IfcRationalBSplineCurveWithKnots >::it it;
+    IfcRationalBSplineCurveWithKnots (IfcAbstractEntity* e);
+    IfcRationalBSplineCurveWithKnots (int v1_Degree, IfcTemplatedEntityList< IfcCartesianPoint >::ptr v2_ControlPointsList, IfcBSplineCurveForm::IfcBSplineCurveForm v3_CurveForm, bool v4_ClosedCurve, bool v5_SelfIntersect, std::vector< int > /*[2:?]*/ v6_KnotMultiplicities, std::vector< double > /*[2:?]*/ v7_Knots, IfcKnotType::IfcKnotType v8_KnotSpec, std::vector< double > /*[2:?]*/ v9_WeightsData);
+    typedef IfcTemplatedEntityList< IfcRationalBSplineCurveWithKnots > list;
 };
 /// Definition from IAI: A steel bar, usually with manufactured deformations in the surface,
 /// used in concrete and masonry construction to provide additional strength.  A single instance
@@ -46927,38 +47500,37 @@ class IfcRationalBSplineCurveWithKnots : public IfcBSplineCurveWithKnots {
 class IfcReinforcingBar : public IfcReinforcingElement {
 public:
     /// Whether the optional attribute NominalDiameter is defined for this IfcReinforcingBar
-    bool hasNominalDiameter();
-    IfcPositiveLengthMeasure NominalDiameter();
-    void setNominalDiameter(IfcPositiveLengthMeasure v);
+    bool hasNominalDiameter() const;
+    double NominalDiameter() const;
+    void setNominalDiameter(double v);
     /// Whether the optional attribute CrossSectionArea is defined for this IfcReinforcingBar
-    bool hasCrossSectionArea();
-    IfcAreaMeasure CrossSectionArea();
-    void setCrossSectionArea(IfcAreaMeasure v);
+    bool hasCrossSectionArea() const;
+    double CrossSectionArea() const;
+    void setCrossSectionArea(double v);
     /// Whether the optional attribute BarLength is defined for this IfcReinforcingBar
-    bool hasBarLength();
-    IfcPositiveLengthMeasure BarLength();
-    void setBarLength(IfcPositiveLengthMeasure v);
+    bool hasBarLength() const;
+    double BarLength() const;
+    void setBarLength(double v);
     /// Whether the optional attribute PredefinedType is defined for this IfcReinforcingBar
-    bool hasPredefinedType();
+    bool hasPredefinedType() const;
     /// The predefined type is always BAR.
-    IfcReinforcingBarTypeEnum::IfcReinforcingBarTypeEnum PredefinedType();
+    IfcReinforcingBarTypeEnum::IfcReinforcingBarTypeEnum PredefinedType() const;
     void setPredefinedType(IfcReinforcingBarTypeEnum::IfcReinforcingBarTypeEnum v);
     /// Whether the optional attribute BarSurface is defined for this IfcReinforcingBar
-    bool hasBarSurface();
-    IfcReinforcingBarSurfaceEnum::IfcReinforcingBarSurfaceEnum BarSurface();
+    bool hasBarSurface() const;
+    IfcReinforcingBarSurfaceEnum::IfcReinforcingBarSurfaceEnum BarSurface() const;
     void setBarSurface(IfcReinforcingBarSurfaceEnum::IfcReinforcingBarSurfaceEnum v);
     virtual unsigned int getArgumentCount() const { return 14; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_DOUBLE; case 10: return IfcUtil::Argument_DOUBLE; case 11: return IfcUtil::Argument_DOUBLE; case 12: return IfcUtil::Argument_ENUMERATION; case 13: return IfcUtil::Argument_ENUMERATION; } return IfcReinforcingElement::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcPositiveLengthMeasure; case 10: return Type::IfcAreaMeasure; case 11: return Type::IfcPositiveLengthMeasure; case 12: return Type::IfcReinforcingBarTypeEnum; case 13: return Type::IfcReinforcingBarSurfaceEnum; } return IfcReinforcingElement::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "NominalDiameter"; case 10: return "CrossSectionArea"; case 11: return "BarLength"; case 12: return "PredefinedType"; case 13: return "BarSurface"; } return IfcReinforcingElement::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcReinforcingBar (IfcAbstractEntityPtr e);
-    IfcReinforcingBar (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcLabel > v9_SteelGrade, boost::optional< IfcPositiveLengthMeasure > v10_NominalDiameter, boost::optional< IfcAreaMeasure > v11_CrossSectionArea, boost::optional< IfcPositiveLengthMeasure > v12_BarLength, boost::optional< IfcReinforcingBarTypeEnum::IfcReinforcingBarTypeEnum > v13_PredefinedType, boost::optional< IfcReinforcingBarSurfaceEnum::IfcReinforcingBarSurfaceEnum > v14_BarSurface);
-    typedef IfcReinforcingBar* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcReinforcingBar > > list;
-    typedef IfcTemplatedEntityList< IfcReinforcingBar >::it it;
+    IfcReinforcingBar (IfcAbstractEntity* e);
+    IfcReinforcingBar (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_SteelGrade, boost::optional< double > v10_NominalDiameter, boost::optional< double > v11_CrossSectionArea, boost::optional< double > v12_BarLength, boost::optional< IfcReinforcingBarTypeEnum::IfcReinforcingBarTypeEnum > v13_PredefinedType, boost::optional< IfcReinforcingBarSurfaceEnum::IfcReinforcingBarSurfaceEnum > v14_BarSurface);
+    typedef IfcTemplatedEntityList< IfcReinforcingBar > list;
 };
 /// Definition from IAI: A steel bar, usually with manufactured deformations in the surface,
 /// used in concrete and masonry construction to provide additional strength.
@@ -46979,48 +47551,47 @@ class IfcReinforcingBar : public IfcReinforcingElement {
 class IfcReinforcingBarType : public IfcReinforcingElementType {
 public:
     /// The predefined type is always BAR.
-    IfcReinforcingBarTypeEnum::IfcReinforcingBarTypeEnum PredefinedType();
+    IfcReinforcingBarTypeEnum::IfcReinforcingBarTypeEnum PredefinedType() const;
     void setPredefinedType(IfcReinforcingBarTypeEnum::IfcReinforcingBarTypeEnum v);
     /// Whether the optional attribute NominalDiameter is defined for this IfcReinforcingBarType
-    bool hasNominalDiameter();
+    bool hasNominalDiameter() const;
     /// The nominal diameter defining the cross-section size of the reinforcing bar.
-    IfcPositiveLengthMeasure NominalDiameter();
-    void setNominalDiameter(IfcPositiveLengthMeasure v);
+    double NominalDiameter() const;
+    void setNominalDiameter(double v);
     /// Whether the optional attribute CrossSectionArea is defined for this IfcReinforcingBarType
-    bool hasCrossSectionArea();
+    bool hasCrossSectionArea() const;
     /// The effective cross-section area of the reinforcing bar.
-    IfcAreaMeasure CrossSectionArea();
-    void setCrossSectionArea(IfcAreaMeasure v);
+    double CrossSectionArea() const;
+    void setCrossSectionArea(double v);
     /// Whether the optional attribute BarLength is defined for this IfcReinforcingBarType
-    bool hasBarLength();
+    bool hasBarLength() const;
     /// The total length of the reinforcing bar. The total length of bended bars are calculated according to local standards with corrections for the bends.
-    IfcPositiveLengthMeasure BarLength();
-    void setBarLength(IfcPositiveLengthMeasure v);
+    double BarLength() const;
+    void setBarLength(double v);
     /// Whether the optional attribute BarSurface is defined for this IfcReinforcingBarType
-    bool hasBarSurface();
+    bool hasBarSurface() const;
     /// Indicator for whether the bar surface is plain or textured.
-    IfcReinforcingBarSurfaceEnum::IfcReinforcingBarSurfaceEnum BarSurface();
+    IfcReinforcingBarSurfaceEnum::IfcReinforcingBarSurfaceEnum BarSurface() const;
     void setBarSurface(IfcReinforcingBarSurfaceEnum::IfcReinforcingBarSurfaceEnum v);
     /// Whether the optional attribute BendingShapeCode is defined for this IfcReinforcingBarType
-    bool hasBendingShapeCode();
-    IfcLabel BendingShapeCode();
-    void setBendingShapeCode(IfcLabel v);
+    bool hasBendingShapeCode() const;
+    std::string BendingShapeCode() const;
+    void setBendingShapeCode(std::string v);
     /// Whether the optional attribute BendingParameters is defined for this IfcReinforcingBarType
-    bool hasBendingParameters();
-    SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > BendingParameters();
-    void setBendingParameters(SHARED_PTR< IfcTemplatedEntityList< IfcUtil::IfcAbstractSelect > > v);
+    bool hasBendingParameters() const;
+    IfcEntityList::ptr BendingParameters() const;
+    void setBendingParameters(IfcEntityList::ptr v);
     virtual unsigned int getArgumentCount() const { return 16; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; case 10: return IfcUtil::Argument_DOUBLE; case 11: return IfcUtil::Argument_DOUBLE; case 12: return IfcUtil::Argument_DOUBLE; case 13: return IfcUtil::Argument_ENUMERATION; case 14: return IfcUtil::Argument_STRING; case 15: return IfcUtil::Argument_ENTITY_LIST; } return IfcReinforcingElementType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcReinforcingBarTypeEnum; case 10: return Type::IfcPositiveLengthMeasure; case 11: return Type::IfcAreaMeasure; case 12: return Type::IfcPositiveLengthMeasure; case 13: return Type::IfcReinforcingBarSurfaceEnum; case 14: return Type::IfcLabel; case 15: return Type::IfcBendingParameterSelect; } return IfcReinforcingElementType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; case 10: return "NominalDiameter"; case 11: return "CrossSectionArea"; case 12: return "BarLength"; case 13: return "BarSurface"; case 14: return "BendingShapeCode"; case 15: return "BendingParameters"; } return IfcReinforcingElementType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcReinforcingBarType (IfcAbstractEntityPtr e);
-    IfcReinforcingBarType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcReinforcingBarTypeEnum::IfcReinforcingBarTypeEnum v10_PredefinedType, boost::optional< IfcPositiveLengthMeasure > v11_NominalDiameter, boost::optional< IfcAreaMeasure > v12_CrossSectionArea, boost::optional< IfcPositiveLengthMeasure > v13_BarLength, boost::optional< IfcReinforcingBarSurfaceEnum::IfcReinforcingBarSurfaceEnum > v14_BarSurface, boost::optional< IfcLabel > v15_BendingShapeCode, boost::optional< IfcEntities > v16_BendingParameters);
-    typedef IfcReinforcingBarType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcReinforcingBarType > > list;
-    typedef IfcTemplatedEntityList< IfcReinforcingBarType >::it it;
+    IfcReinforcingBarType (IfcAbstractEntity* e);
+    IfcReinforcingBarType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcReinforcingBarTypeEnum::IfcReinforcingBarTypeEnum v10_PredefinedType, boost::optional< double > v11_NominalDiameter, boost::optional< double > v12_CrossSectionArea, boost::optional< double > v13_BarLength, boost::optional< IfcReinforcingBarSurfaceEnum::IfcReinforcingBarSurfaceEnum > v14_BarSurface, boost::optional< std::string > v15_BendingShapeCode, boost::optional< IfcEntityList::ptr > v16_BendingParameters);
+    typedef IfcTemplatedEntityList< IfcReinforcingBarType > list;
 };
 /// Definition from ISO 6707-1:1989: Construction enclosing the building from above.
 /// The IfcRoof is a description of the total roof. It acts as a container entity, that aggregates all components of the roof, it represents. The aggregation is handled via the IfcRelAggregates relationship, relating an IfcRoof with the related roof elements, like slabs (represented by IfcSlab), rafters and purlins (represented by IfcBeam), or other included roofs, such as dormers (represented by IfcRoof).
@@ -47170,24 +47741,23 @@ class IfcReinforcingBarType : public IfcReinforcingElementType {
 class IfcRoof : public IfcBuildingElement {
 public:
     /// Whether the optional attribute PredefinedType is defined for this IfcRoof
-    bool hasPredefinedType();
+    bool hasPredefinedType() const;
     /// Predefined shape types for a roof that are specified in an enumeration.
     /// 
     /// IFC2x4 CHANGE  The attribute has been renamed from ShapeType and changed to be OPTIONAL with upward compatibility for file based exchange.
-    IfcRoofTypeEnum::IfcRoofTypeEnum PredefinedType();
+    IfcRoofTypeEnum::IfcRoofTypeEnum PredefinedType() const;
     void setPredefinedType(IfcRoofTypeEnum::IfcRoofTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_ENUMERATION; } return IfcBuildingElement::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcRoofTypeEnum; } return IfcBuildingElement::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "PredefinedType"; } return IfcBuildingElement::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcRoof (IfcAbstractEntityPtr e);
-    IfcRoof (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcRoofTypeEnum::IfcRoofTypeEnum > v9_PredefinedType);
-    typedef IfcRoof* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcRoof > > list;
-    typedef IfcTemplatedEntityList< IfcRoof >::it it;
+    IfcRoof (IfcAbstractEntity* e);
+    IfcRoof (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcRoofTypeEnum::IfcRoofTypeEnum > v9_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcRoof > list;
 };
 /// A sanitary terminal is a fixed appliance or terminal usually supplied with water and used for drinking, cleaning or foul water disposal or that is an item of equipment directly used with such an appliance or terminal. 
 /// 
@@ -47318,21 +47888,20 @@ class IfcRoof : public IfcBuildingElement {
 class IfcSanitaryTerminal : public IfcFlowTerminal {
 public:
     /// Whether the optional attribute PredefinedType is defined for this IfcSanitaryTerminal
-    bool hasPredefinedType();
-    IfcSanitaryTerminalTypeEnum::IfcSanitaryTerminalTypeEnum PredefinedType();
+    bool hasPredefinedType() const;
+    IfcSanitaryTerminalTypeEnum::IfcSanitaryTerminalTypeEnum PredefinedType() const;
     void setPredefinedType(IfcSanitaryTerminalTypeEnum::IfcSanitaryTerminalTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_ENUMERATION; } return IfcFlowTerminal::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcSanitaryTerminalTypeEnum; } return IfcFlowTerminal::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "PredefinedType"; } return IfcFlowTerminal::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcSanitaryTerminal (IfcAbstractEntityPtr e);
-    IfcSanitaryTerminal (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcSanitaryTerminalTypeEnum::IfcSanitaryTerminalTypeEnum > v9_PredefinedType);
-    typedef IfcSanitaryTerminal* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcSanitaryTerminal > > list;
-    typedef IfcTemplatedEntityList< IfcSanitaryTerminal >::it it;
+    IfcSanitaryTerminal (IfcAbstractEntity* e);
+    IfcSanitaryTerminal (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcSanitaryTerminalTypeEnum::IfcSanitaryTerminalTypeEnum > v9_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcSanitaryTerminal > list;
 };
 /// The distribution control element type IfcSensorType defines commonly shared information for occurrences of sensors.  The set of shared information may include: 
 /// 
@@ -47385,20 +47954,19 @@ class IfcSanitaryTerminal : public IfcFlowTerminal {
 class IfcSensorType : public IfcDistributionControlElementType {
 public:
     /// Identifies the predefined types of sensor from which the type required may be set.
-    IfcSensorTypeEnum::IfcSensorTypeEnum PredefinedType();
+    IfcSensorTypeEnum::IfcSensorTypeEnum PredefinedType() const;
     void setPredefinedType(IfcSensorTypeEnum::IfcSensorTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcDistributionControlElementType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcSensorTypeEnum; } return IfcDistributionControlElementType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcDistributionControlElementType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcSensorType (IfcAbstractEntityPtr e);
-    IfcSensorType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcSensorTypeEnum::IfcSensorTypeEnum v10_PredefinedType);
-    typedef IfcSensorType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcSensorType > > list;
-    typedef IfcTemplatedEntityList< IfcSensorType >::it it;
+    IfcSensorType (IfcAbstractEntity* e);
+    IfcSensorType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcSensorTypeEnum::IfcSensorTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcSensorType > list;
 };
 /// Definition from IAI: Shading devices are purpose built
 /// devices to protect from the sunlight, from natural light, or
@@ -47417,23 +47985,22 @@ class IfcSensorType : public IfcDistributionControlElementType {
 class IfcShadingDevice : public IfcBuildingElement {
 public:
     /// Whether the optional attribute PredefinedType is defined for this IfcShadingDevice
-    bool hasPredefinedType();
+    bool hasPredefinedType() const;
     /// Predefined generic type for a shading device that is specified in an enumeration. There may be a property set given specificly for the predefined types.
     ///   NOTE The PredefinedType shall only be used, if no type object IfcShadingDeviceType is assigned, providing its own IfcShadingDeviceType.PredefinedType.
-    IfcShadingDeviceTypeEnum::IfcShadingDeviceTypeEnum PredefinedType();
+    IfcShadingDeviceTypeEnum::IfcShadingDeviceTypeEnum PredefinedType() const;
     void setPredefinedType(IfcShadingDeviceTypeEnum::IfcShadingDeviceTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_ENUMERATION; } return IfcBuildingElement::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcShadingDeviceTypeEnum; } return IfcBuildingElement::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "PredefinedType"; } return IfcBuildingElement::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcShadingDevice (IfcAbstractEntityPtr e);
-    IfcShadingDevice (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcShadingDeviceTypeEnum::IfcShadingDeviceTypeEnum > v9_PredefinedType);
-    typedef IfcShadingDevice* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcShadingDevice > > list;
-    typedef IfcTemplatedEntityList< IfcShadingDevice >::it it;
+    IfcShadingDevice (IfcAbstractEntity* e);
+    IfcShadingDevice (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcShadingDeviceTypeEnum::IfcShadingDeviceTypeEnum > v9_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcShadingDevice > list;
 };
 /// A slab is a component of the
 /// construction that normally encloses a space vertically. The slab
@@ -47698,25 +48265,24 @@ class IfcShadingDevice : public IfcBuildingElement {
 class IfcSlab : public IfcBuildingElement {
 public:
     /// Whether the optional attribute PredefinedType is defined for this IfcSlab
-    bool hasPredefinedType();
+    bool hasPredefinedType() const;
     /// Predefined generic type for a slab that is specified in an enumeration. There may be a property set given specifically for the predefined types.
     ///   NOTE The PredefinedType shall only be used, if no type object IfcSlabType is assigned, providing its own IfcSlabType.PredefinedType.
     /// 
     /// FC2x PLATFORM CHANGE: The attribute has been changed into an OPTIONAL attribute.
-    IfcSlabTypeEnum::IfcSlabTypeEnum PredefinedType();
+    IfcSlabTypeEnum::IfcSlabTypeEnum PredefinedType() const;
     void setPredefinedType(IfcSlabTypeEnum::IfcSlabTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_ENUMERATION; } return IfcBuildingElement::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcSlabTypeEnum; } return IfcBuildingElement::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "PredefinedType"; } return IfcBuildingElement::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcSlab (IfcAbstractEntityPtr e);
-    IfcSlab (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcSlabTypeEnum::IfcSlabTypeEnum > v9_PredefinedType);
-    typedef IfcSlab* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcSlab > > list;
-    typedef IfcTemplatedEntityList< IfcSlab >::it it;
+    IfcSlab (IfcAbstractEntity* e);
+    IfcSlab (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcSlabTypeEnum::IfcSlabTypeEnum > v9_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcSlab > list;
 };
 /// The IfcSlabElementedCase
 /// defines a slab with certain constraints for the provision of its
@@ -47805,16 +48371,15 @@ class IfcSlabElementedCase : public IfcSlab {
 public:
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcSlab::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcSlab::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcSlab::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcSlabElementedCase (IfcAbstractEntityPtr e);
-    IfcSlabElementedCase (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcSlabTypeEnum::IfcSlabTypeEnum > v9_PredefinedType);
-    typedef IfcSlabElementedCase* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcSlabElementedCase > > list;
-    typedef IfcTemplatedEntityList< IfcSlabElementedCase >::it it;
+    IfcSlabElementedCase (IfcAbstractEntity* e);
+    IfcSlabElementedCase (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcSlabTypeEnum::IfcSlabTypeEnum > v9_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcSlabElementedCase > list;
 };
 /// The standard slab,
 /// IfcSlabStandardCase, defines a slab with certain constraints
@@ -47979,16 +48544,15 @@ class IfcSlabStandardCase : public IfcSlab {
 public:
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcSlab::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcSlab::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcSlab::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcSlabStandardCase (IfcAbstractEntityPtr e);
-    IfcSlabStandardCase (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcSlabTypeEnum::IfcSlabTypeEnum > v9_PredefinedType);
-    typedef IfcSlabStandardCase* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcSlabStandardCase > > list;
-    typedef IfcTemplatedEntityList< IfcSlabStandardCase >::it it;
+    IfcSlabStandardCase (IfcAbstractEntity* e);
+    IfcSlabStandardCase (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcSlabTypeEnum::IfcSlabTypeEnum > v9_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcSlabStandardCase > list;
 };
 /// A solar device converts solar radiation into other energy such as electric current or thermal energy. 
 /// 
@@ -48040,21 +48604,20 @@ class IfcSlabStandardCase : public IfcSlab {
 class IfcSolarDevice : public IfcEnergyConversionDevice {
 public:
     /// Whether the optional attribute PredefinedType is defined for this IfcSolarDevice
-    bool hasPredefinedType();
-    IfcSolarDeviceTypeEnum::IfcSolarDeviceTypeEnum PredefinedType();
+    bool hasPredefinedType() const;
+    IfcSolarDeviceTypeEnum::IfcSolarDeviceTypeEnum PredefinedType() const;
     void setPredefinedType(IfcSolarDeviceTypeEnum::IfcSolarDeviceTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_ENUMERATION; } return IfcEnergyConversionDevice::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcSolarDeviceTypeEnum; } return IfcEnergyConversionDevice::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "PredefinedType"; } return IfcEnergyConversionDevice::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcSolarDevice (IfcAbstractEntityPtr e);
-    IfcSolarDevice (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcSolarDeviceTypeEnum::IfcSolarDeviceTypeEnum > v9_PredefinedType);
-    typedef IfcSolarDevice* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcSolarDevice > > list;
-    typedef IfcTemplatedEntityList< IfcSolarDevice >::it it;
+    IfcSolarDevice (IfcAbstractEntity* e);
+    IfcSolarDevice (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcSolarDeviceTypeEnum::IfcSolarDeviceTypeEnum > v9_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcSolarDevice > list;
 };
 /// Space heaters utilize a combination of radiation and/or natural convection using a heating source such as electricity, steam or hot water to heat a limited space or area. Examples of space heaters include radiators, convectors, baseboard and finned-tube heaters.
 /// IfcUnitaryEquipment should be used for packaged units supporting a combination of heating, cooling, and/or dehumidification; IfcCoil should be used for coil-based floor heating. 
@@ -48121,21 +48684,20 @@ class IfcSolarDevice : public IfcEnergyConversionDevice {
 class IfcSpaceHeater : public IfcFlowTerminal {
 public:
     /// Whether the optional attribute PredefinedType is defined for this IfcSpaceHeater
-    bool hasPredefinedType();
-    IfcSpaceHeaterTypeEnum::IfcSpaceHeaterTypeEnum PredefinedType();
+    bool hasPredefinedType() const;
+    IfcSpaceHeaterTypeEnum::IfcSpaceHeaterTypeEnum PredefinedType() const;
     void setPredefinedType(IfcSpaceHeaterTypeEnum::IfcSpaceHeaterTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_ENUMERATION; } return IfcFlowTerminal::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcSpaceHeaterTypeEnum; } return IfcFlowTerminal::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "PredefinedType"; } return IfcFlowTerminal::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcSpaceHeater (IfcAbstractEntityPtr e);
-    IfcSpaceHeater (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcSpaceHeaterTypeEnum::IfcSpaceHeaterTypeEnum > v9_PredefinedType);
-    typedef IfcSpaceHeater* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcSpaceHeater > > list;
-    typedef IfcTemplatedEntityList< IfcSpaceHeater >::it it;
+    IfcSpaceHeater (IfcAbstractEntity* e);
+    IfcSpaceHeater (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcSpaceHeaterTypeEnum::IfcSpaceHeaterTypeEnum > v9_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcSpaceHeater > list;
 };
 /// A stack terminal is placed at the top of a ventilating stack (such as to prevent ingress by birds or rainwater) or rainwater pipe (to act as a collector or hopper for discharge from guttering). 
 /// 
@@ -48190,21 +48752,20 @@ class IfcSpaceHeater : public IfcFlowTerminal {
 class IfcStackTerminal : public IfcFlowTerminal {
 public:
     /// Whether the optional attribute PredefinedType is defined for this IfcStackTerminal
-    bool hasPredefinedType();
-    IfcStackTerminalTypeEnum::IfcStackTerminalTypeEnum PredefinedType();
+    bool hasPredefinedType() const;
+    IfcStackTerminalTypeEnum::IfcStackTerminalTypeEnum PredefinedType() const;
     void setPredefinedType(IfcStackTerminalTypeEnum::IfcStackTerminalTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_ENUMERATION; } return IfcFlowTerminal::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcStackTerminalTypeEnum; } return IfcFlowTerminal::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "PredefinedType"; } return IfcFlowTerminal::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcStackTerminal (IfcAbstractEntityPtr e);
-    IfcStackTerminal (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcStackTerminalTypeEnum::IfcStackTerminalTypeEnum > v9_PredefinedType);
-    typedef IfcStackTerminal* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcStackTerminal > > list;
-    typedef IfcTemplatedEntityList< IfcStackTerminal >::it it;
+    IfcStackTerminal (IfcAbstractEntity* e);
+    IfcStackTerminal (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcStackTerminalTypeEnum::IfcStackTerminalTypeEnum > v9_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcStackTerminal > list;
 };
 /// Definition from ISO 6707-1:1989: Construction comprising
 /// a succession of horizontal stages (steps or landings) that make it
@@ -48374,24 +48935,23 @@ class IfcStackTerminal : public IfcFlowTerminal {
 class IfcStair : public IfcBuildingElement {
 public:
     /// Whether the optional attribute PredefinedType is defined for this IfcStair
-    bool hasPredefinedType();
+    bool hasPredefinedType() const;
     /// Predefined shape types for a stair that are specified in an enumeration.
     /// 
     /// IFC2x4 CHANGE  The attribute has been renamed from ShapeType and changed to be OPTIONAL with upward compatibility for file based exchange.
-    IfcStairTypeEnum::IfcStairTypeEnum PredefinedType();
+    IfcStairTypeEnum::IfcStairTypeEnum PredefinedType() const;
     void setPredefinedType(IfcStairTypeEnum::IfcStairTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_ENUMERATION; } return IfcBuildingElement::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcStairTypeEnum; } return IfcBuildingElement::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "PredefinedType"; } return IfcBuildingElement::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcStair (IfcAbstractEntityPtr e);
-    IfcStair (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcStairTypeEnum::IfcStairTypeEnum > v9_PredefinedType);
-    typedef IfcStair* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcStair > > list;
-    typedef IfcTemplatedEntityList< IfcStair >::it it;
+    IfcStair (IfcAbstractEntity* e);
+    IfcStair (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcStairTypeEnum::IfcStairTypeEnum > v9_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcStair > list;
 };
 /// A stair flight is an assembly of
 /// building components in a single "run" of stair steps (not
@@ -48563,53 +49123,52 @@ class IfcStair : public IfcBuildingElement {
 class IfcStairFlight : public IfcBuildingElement {
 public:
     /// Whether the optional attribute NumberOfRiser is defined for this IfcStairFlight
-    bool hasNumberOfRiser();
+    bool hasNumberOfRiser() const;
     /// Number of the risers included in the stair flight
     /// 
     /// IFC2x4 CHANGE  The attribute has been deprecated it shall only be exposed with a NIL value. Use Pset_StairFlightCommon.NumberOfRisers instead.
-    int NumberOfRiser();
+    int NumberOfRiser() const;
     void setNumberOfRiser(int v);
     /// Whether the optional attribute NumberOfTreads is defined for this IfcStairFlight
-    bool hasNumberOfTreads();
+    bool hasNumberOfTreads() const;
     /// Number of treads included in the stair flight.
     /// 
     /// IFC2x4 CHANGE  The attribute has been deprecated it shall only be exposed with a NIL value. Use Pset_StairFlightCommon.NumberOfTreads instead.
-    int NumberOfTreads();
+    int NumberOfTreads() const;
     void setNumberOfTreads(int v);
     /// Whether the optional attribute RiserHeight is defined for this IfcStairFlight
-    bool hasRiserHeight();
+    bool hasRiserHeight() const;
     /// Vertical distance from tread to tread. The riser height is supposed to be equal for all stairs in a stair flight.
     /// 
     /// IFC2x4 CHANGE  The attribute has been deprecated it shall only be exposed with a NIL value. Use Pset_StairFlightCommon.RiserHeight instead.
-    IfcPositiveLengthMeasure RiserHeight();
-    void setRiserHeight(IfcPositiveLengthMeasure v);
+    double RiserHeight() const;
+    void setRiserHeight(double v);
     /// Whether the optional attribute TreadLength is defined for this IfcStairFlight
-    bool hasTreadLength();
+    bool hasTreadLength() const;
     /// Horizontal distance from the front to the back of the tread. The tread length is supposed to be equal for all steps of the stair flight.
     /// 
     /// IFC2x4 CHANGE  The attribute has been deprecated it shall only be exposed with a NIL value. Use Pset_StairFlightCommon.TreadLength instead.
-    IfcPositiveLengthMeasure TreadLength();
-    void setTreadLength(IfcPositiveLengthMeasure v);
+    double TreadLength() const;
+    void setTreadLength(double v);
     /// Whether the optional attribute PredefinedType is defined for this IfcStairFlight
-    bool hasPredefinedType();
+    bool hasPredefinedType() const;
     /// Predefined generic type for a stair flight that is specified in an enumeration. There may be a property set given specificly for the predefined types.
     ///   NOTE The PredefinedType shall only be used, if no type object IfcStairFlightType is assigned, providing its own IfcStairFlightType.PredefinedType.
     /// 
     /// IFC2x4 CHANGE  The attribute has been added at the end of the entity definition.
-    IfcStairFlightTypeEnum::IfcStairFlightTypeEnum PredefinedType();
+    IfcStairFlightTypeEnum::IfcStairFlightTypeEnum PredefinedType() const;
     void setPredefinedType(IfcStairFlightTypeEnum::IfcStairFlightTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 13; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_INT; case 9: return IfcUtil::Argument_INT; case 10: return IfcUtil::Argument_DOUBLE; case 11: return IfcUtil::Argument_DOUBLE; case 12: return IfcUtil::Argument_ENUMERATION; } return IfcBuildingElement::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::UNDEFINED; case 9: return Type::UNDEFINED; case 10: return Type::IfcPositiveLengthMeasure; case 11: return Type::IfcPositiveLengthMeasure; case 12: return Type::IfcStairFlightTypeEnum; } return IfcBuildingElement::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "NumberOfRiser"; case 9: return "NumberOfTreads"; case 10: return "RiserHeight"; case 11: return "TreadLength"; case 12: return "PredefinedType"; } return IfcBuildingElement::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcStairFlight (IfcAbstractEntityPtr e);
-    IfcStairFlight (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< int > v9_NumberOfRiser, boost::optional< int > v10_NumberOfTreads, boost::optional< IfcPositiveLengthMeasure > v11_RiserHeight, boost::optional< IfcPositiveLengthMeasure > v12_TreadLength, boost::optional< IfcStairFlightTypeEnum::IfcStairFlightTypeEnum > v13_PredefinedType);
-    typedef IfcStairFlight* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcStairFlight > > list;
-    typedef IfcTemplatedEntityList< IfcStairFlight >::it it;
+    IfcStairFlight (IfcAbstractEntity* e);
+    IfcStairFlight (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< int > v9_NumberOfRiser, boost::optional< int > v10_NumberOfTreads, boost::optional< double > v11_RiserHeight, boost::optional< double > v12_TreadLength, boost::optional< IfcStairFlightTypeEnum::IfcStairFlightTypeEnum > v13_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcStairFlight > list;
 };
 /// Definition from IAI: The IfcStructuralAnalysisModel is used to assemble all information needed to represent a structural analysis model.  It encompasses certain general properties (such as analysis type), references to all contained structural members, structural supports or connections, as well as loads and the respective load results.
 /// 
@@ -48637,10 +49196,10 @@ class IfcStairFlight : public IfcBuildingElement {
 class IfcStructuralAnalysisModel : public IfcSystem {
 public:
     /// Defines the type of the structural analysis model.
-    IfcAnalysisModelTypeEnum::IfcAnalysisModelTypeEnum PredefinedType();
+    IfcAnalysisModelTypeEnum::IfcAnalysisModelTypeEnum PredefinedType() const;
     void setPredefinedType(IfcAnalysisModelTypeEnum::IfcAnalysisModelTypeEnum v);
     /// Whether the optional attribute OrientationOf2DPlane is defined for this IfcStructuralAnalysisModel
-    bool hasOrientationOf2DPlane();
+    bool hasOrientationOf2DPlane() const;
     /// If the selected model type (PredefinedType) describes a 2D system, the orientation defines
     /// the analysis plane (P[1], P[2]) and the normal to the analysis plane (P[3]).  This is needed because
     /// structural items and activities are always defined in three-dimensional space even if they are
@@ -48651,39 +49210,38 @@ class IfcStructuralAnalysisModel : public IfcSystem {
     /// In case of predefined type OUT_PLANE_LOADING_2D, only the P[3] component of loads and their
     /// effects is meant to be analyzed.  This is used for beam grids and for typical slab analyses.
     /// In case of predefined type LOADING_3D, OrientationOf2DPlane shall be omitted.
-    IfcAxis2Placement3D* OrientationOf2DPlane();
+    IfcAxis2Placement3D* OrientationOf2DPlane() const;
     void setOrientationOf2DPlane(IfcAxis2Placement3D* v);
     /// Whether the optional attribute LoadedBy is defined for this IfcStructuralAnalysisModel
-    bool hasLoadedBy();
+    bool hasLoadedBy() const;
     /// References to all load groups to be analyzed.
-    SHARED_PTR< IfcTemplatedEntityList< IfcStructuralLoadGroup > > LoadedBy();
-    void setLoadedBy(SHARED_PTR< IfcTemplatedEntityList< IfcStructuralLoadGroup > > v);
+    IfcTemplatedEntityList< IfcStructuralLoadGroup >::ptr LoadedBy() const;
+    void setLoadedBy(IfcTemplatedEntityList< IfcStructuralLoadGroup >::ptr v);
     /// Whether the optional attribute HasResults is defined for this IfcStructuralAnalysisModel
-    bool hasHasResults();
+    bool hasHasResults() const;
     /// References to all result groups available for this structural analysis model.
-    SHARED_PTR< IfcTemplatedEntityList< IfcStructuralResultGroup > > HasResults();
-    void setHasResults(SHARED_PTR< IfcTemplatedEntityList< IfcStructuralResultGroup > > v);
+    IfcTemplatedEntityList< IfcStructuralResultGroup >::ptr HasResults() const;
+    void setHasResults(IfcTemplatedEntityList< IfcStructuralResultGroup >::ptr v);
     /// Whether the optional attribute SharedPlacement is defined for this IfcStructuralAnalysisModel
-    bool hasSharedPlacement();
+    bool hasSharedPlacement() const;
     /// Object placement which shall be common to all items and activities which are grouped into this instance of IfcStructuralAnalysisModel.  This placement establishes a coordinate system which is referred to as 'global coordinate system' in use definitions of various classes of structural items and activities.
     /// 
     /// NOTE  Most commonly, but not necessarily, the SharedPlacement is an IfcLocalPlacement whose z axis is parallel with the z axis of the IfcProject's world coordinate system and directed like the WCS z axis (i.e. pointing "upwards") or directed against the WCS z axis (i.e. points "downwards").
     /// 
     /// NOTE  Per informal proposition, this attribute is not optional as soon as at least one IfcStructuralItem is grouped into the instance of IfcStructuralAnalysisModel.
-    IfcObjectPlacement* SharedPlacement();
+    IfcObjectPlacement* SharedPlacement() const;
     void setSharedPlacement(IfcObjectPlacement* v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 5: return IfcUtil::Argument_ENUMERATION; case 6: return IfcUtil::Argument_ENTITY; case 7: return IfcUtil::Argument_ENTITY_LIST; case 8: return IfcUtil::Argument_ENTITY_LIST; case 9: return IfcUtil::Argument_ENTITY; } return IfcSystem::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 5: return Type::IfcAnalysisModelTypeEnum; case 6: return Type::IfcAxis2Placement3D; case 7: return Type::IfcStructuralLoadGroup; case 8: return Type::IfcStructuralResultGroup; case 9: return Type::IfcObjectPlacement; } return IfcSystem::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 5: return "PredefinedType"; case 6: return "OrientationOf2DPlane"; case 7: return "LoadedBy"; case 8: return "HasResults"; case 9: return "SharedPlacement"; } return IfcSystem::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcStructuralAnalysisModel (IfcAbstractEntityPtr e);
-    IfcStructuralAnalysisModel (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcAnalysisModelTypeEnum::IfcAnalysisModelTypeEnum v6_PredefinedType, IfcAxis2Placement3D* v7_OrientationOf2DPlane, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcStructuralLoadGroup > > > v8_LoadedBy, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcStructuralResultGroup > > > v9_HasResults, IfcObjectPlacement* v10_SharedPlacement);
-    typedef IfcStructuralAnalysisModel* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcStructuralAnalysisModel > > list;
-    typedef IfcTemplatedEntityList< IfcStructuralAnalysisModel >::it it;
+    IfcStructuralAnalysisModel (IfcAbstractEntity* e);
+    IfcStructuralAnalysisModel (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcAnalysisModelTypeEnum::IfcAnalysisModelTypeEnum v6_PredefinedType, IfcAxis2Placement3D* v7_OrientationOf2DPlane, boost::optional< IfcTemplatedEntityList< IfcStructuralLoadGroup >::ptr > v8_LoadedBy, boost::optional< IfcTemplatedEntityList< IfcStructuralResultGroup >::ptr > v9_HasResults, IfcObjectPlacement* v10_SharedPlacement);
+    typedef IfcTemplatedEntityList< IfcStructuralAnalysisModel > list;
 };
 /// Definition from IAI: A load case is a load group, commonly used to group loads from the same action source.
 /// 
@@ -48691,26 +49249,25 @@ class IfcStructuralAnalysisModel : public IfcSystem {
 class IfcStructuralLoadCase : public IfcStructuralLoadGroup {
 public:
     /// Whether the optional attribute SelfWeightCoefficients is defined for this IfcStructuralLoadCase
-    bool hasSelfWeightCoefficients();
+    bool hasSelfWeightCoefficients() const;
     /// The self weight coefficients specify ratios at which loads due to weight of members shall be included in the load case.  These loads are not explicitly modeled as instances of IfcStructuralAction.  Instead they shall be calculated according to geometry, section, and material of each member.
     /// 
     /// The three components of the self weight vector correspond with the x,y,z directions of the so-called global coordinates, i.e. the directions of the shared ObjectPlacement of all items in an IfcStructuralAnalysisModel.  For example, if the object placement defines a z axis which is upright like the IfcProject's world coordinate system, then the self weight coefficients would typically be [0.,0.,-1.] in a load case of dead loads with self weight.
     /// 
     /// The overall coefficient in the inherited attribute Coefficient shall not be applied to SelfWeightCoefficients of the same instance of IfcStructuralLoadCase.  It only applies to actions and load groups which are grouped below the load case, not to the load case's computed self weight.
-    std::vector< IfcRatioMeasure > /*[3:3]*/ SelfWeightCoefficients();
-    void setSelfWeightCoefficients(std::vector< IfcRatioMeasure > /*[3:3]*/ v);
+    std::vector< double > /*[3:3]*/ SelfWeightCoefficients() const;
+    void setSelfWeightCoefficients(std::vector< double > /*[3:3]*/ v);
     virtual unsigned int getArgumentCount() const { return 11; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 10: return IfcUtil::Argument_VECTOR_DOUBLE; } return IfcStructuralLoadGroup::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 10: return Type::IfcRatioMeasure; } return IfcStructuralLoadGroup::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 10: return "SelfWeightCoefficients"; } return IfcStructuralLoadGroup::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcStructuralLoadCase (IfcAbstractEntityPtr e);
-    IfcStructuralLoadCase (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcLoadGroupTypeEnum::IfcLoadGroupTypeEnum v6_PredefinedType, IfcActionTypeEnum::IfcActionTypeEnum v7_ActionType, IfcActionSourceTypeEnum::IfcActionSourceTypeEnum v8_ActionSource, boost::optional< IfcRatioMeasure > v9_Coefficient, boost::optional< IfcLabel > v10_Purpose, boost::optional< std::vector< IfcRatioMeasure > /*[3:3]*/ > v11_SelfWeightCoefficients);
-    typedef IfcStructuralLoadCase* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcStructuralLoadCase > > list;
-    typedef IfcTemplatedEntityList< IfcStructuralLoadCase >::it it;
+    IfcStructuralLoadCase (IfcAbstractEntity* e);
+    IfcStructuralLoadCase (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcLoadGroupTypeEnum::IfcLoadGroupTypeEnum v6_PredefinedType, IfcActionTypeEnum::IfcActionTypeEnum v7_ActionType, IfcActionSourceTypeEnum::IfcActionSourceTypeEnum v8_ActionSource, boost::optional< double > v9_Coefficient, boost::optional< std::string > v10_Purpose, boost::optional< std::vector< double > /*[3:3]*/ > v11_SelfWeightCoefficients);
+    typedef IfcTemplatedEntityList< IfcStructuralLoadCase > list;
 };
 /// Definition from IAI: Defines an action with constant value which is distributed over a surface.
 /// 
@@ -48723,16 +49280,15 @@ class IfcStructuralPlanarAction : public IfcStructuralSurfaceAction {
 public:
     virtual unsigned int getArgumentCount() const { return 12; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcStructuralSurfaceAction::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcStructuralSurfaceAction::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcStructuralSurfaceAction::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcStructuralPlanarAction (IfcAbstractEntityPtr e);
-    IfcStructuralPlanarAction (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcStructuralLoad* v8_AppliedLoad, IfcGlobalOrLocalEnum::IfcGlobalOrLocalEnum v9_GlobalOrLocal, boost::optional< bool > v10_DestabilizingLoad, boost::optional< IfcProjectedOrTrueLengthEnum::IfcProjectedOrTrueLengthEnum > v11_ProjectedOrTrue, IfcStructuralSurfaceActivityTypeEnum::IfcStructuralSurfaceActivityTypeEnum v12_PredefinedType);
-    typedef IfcStructuralPlanarAction* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcStructuralPlanarAction > > list;
-    typedef IfcTemplatedEntityList< IfcStructuralPlanarAction >::it it;
+    IfcStructuralPlanarAction (IfcAbstractEntity* e);
+    IfcStructuralPlanarAction (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, IfcStructuralLoad* v8_AppliedLoad, IfcGlobalOrLocalEnum::IfcGlobalOrLocalEnum v9_GlobalOrLocal, boost::optional< bool > v10_DestabilizingLoad, boost::optional< IfcProjectedOrTrueLengthEnum::IfcProjectedOrTrueLengthEnum > v11_ProjectedOrTrue, IfcStructuralSurfaceActivityTypeEnum::IfcStructuralSurfaceActivityTypeEnum v12_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcStructuralPlanarAction > list;
 };
 /// A switch is used in a cable distribution system (electrical circuit) to control or modulate the flow of electricity.
 /// Switches include those used for electrical power, communications, audio-visual, or other distribution system types as determined by the available ports. 
@@ -48825,21 +49381,20 @@ class IfcStructuralPlanarAction : public IfcStructuralSurfaceAction {
 class IfcSwitchingDevice : public IfcFlowController {
 public:
     /// Whether the optional attribute PredefinedType is defined for this IfcSwitchingDevice
-    bool hasPredefinedType();
-    IfcSwitchingDeviceTypeEnum::IfcSwitchingDeviceTypeEnum PredefinedType();
+    bool hasPredefinedType() const;
+    IfcSwitchingDeviceTypeEnum::IfcSwitchingDeviceTypeEnum PredefinedType() const;
     void setPredefinedType(IfcSwitchingDeviceTypeEnum::IfcSwitchingDeviceTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_ENUMERATION; } return IfcFlowController::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcSwitchingDeviceTypeEnum; } return IfcFlowController::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "PredefinedType"; } return IfcFlowController::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcSwitchingDevice (IfcAbstractEntityPtr e);
-    IfcSwitchingDevice (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcSwitchingDeviceTypeEnum::IfcSwitchingDeviceTypeEnum > v9_PredefinedType);
-    typedef IfcSwitchingDevice* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcSwitchingDevice > > list;
-    typedef IfcTemplatedEntityList< IfcSwitchingDevice >::it it;
+    IfcSwitchingDevice (IfcAbstractEntity* e);
+    IfcSwitchingDevice (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcSwitchingDeviceTypeEnum::IfcSwitchingDeviceTypeEnum > v9_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcSwitchingDevice > list;
 };
 /// A tank is a vessel or container in which a fluid or gas is stored for later use. 
 /// 
@@ -48904,21 +49459,20 @@ class IfcSwitchingDevice : public IfcFlowController {
 class IfcTank : public IfcFlowStorageDevice {
 public:
     /// Whether the optional attribute PredefinedType is defined for this IfcTank
-    bool hasPredefinedType();
-    IfcTankTypeEnum::IfcTankTypeEnum PredefinedType();
+    bool hasPredefinedType() const;
+    IfcTankTypeEnum::IfcTankTypeEnum PredefinedType() const;
     void setPredefinedType(IfcTankTypeEnum::IfcTankTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_ENUMERATION; } return IfcFlowStorageDevice::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcTankTypeEnum; } return IfcFlowStorageDevice::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "PredefinedType"; } return IfcFlowStorageDevice::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcTank (IfcAbstractEntityPtr e);
-    IfcTank (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcTankTypeEnum::IfcTankTypeEnum > v9_PredefinedType);
-    typedef IfcTank* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcTank > > list;
-    typedef IfcTemplatedEntityList< IfcTank >::it it;
+    IfcTank (IfcAbstractEntity* e);
+    IfcTank (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcTankTypeEnum::IfcTankTypeEnum > v9_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcTank > list;
 };
 /// A transformer is an inductive stationary device that transfers electrical energy from one circuit to another.
 /// IfcTransformer is used to transform electric power; conversion of electric signals for other purposes is handled at other entities: IfcController converts arbitrary signals, IfcAudioVisualAppliance converts signals for audio or video streams, and IfcCommunicationsAppliance converts signals for data or other communications usage. 
@@ -48965,21 +49519,20 @@ class IfcTank : public IfcFlowStorageDevice {
 class IfcTransformer : public IfcEnergyConversionDevice {
 public:
     /// Whether the optional attribute PredefinedType is defined for this IfcTransformer
-    bool hasPredefinedType();
-    IfcTransformerTypeEnum::IfcTransformerTypeEnum PredefinedType();
+    bool hasPredefinedType() const;
+    IfcTransformerTypeEnum::IfcTransformerTypeEnum PredefinedType() const;
     void setPredefinedType(IfcTransformerTypeEnum::IfcTransformerTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_ENUMERATION; } return IfcEnergyConversionDevice::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcTransformerTypeEnum; } return IfcEnergyConversionDevice::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "PredefinedType"; } return IfcEnergyConversionDevice::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcTransformer (IfcAbstractEntityPtr e);
-    IfcTransformer (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcTransformerTypeEnum::IfcTransformerTypeEnum > v9_PredefinedType);
-    typedef IfcTransformer* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcTransformer > > list;
-    typedef IfcTemplatedEntityList< IfcTransformer >::it it;
+    IfcTransformer (IfcAbstractEntity* e);
+    IfcTransformer (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcTransformerTypeEnum::IfcTransformerTypeEnum > v9_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcTransformer > list;
 };
 /// A tube bundle is a device consisting of tubes and bundles of tubes used for heat transfer and contained typically within other energy conversion devices, such as a chiller or coil. 
 /// 
@@ -49031,21 +49584,20 @@ class IfcTransformer : public IfcEnergyConversionDevice {
 class IfcTubeBundle : public IfcEnergyConversionDevice {
 public:
     /// Whether the optional attribute PredefinedType is defined for this IfcTubeBundle
-    bool hasPredefinedType();
-    IfcTubeBundleTypeEnum::IfcTubeBundleTypeEnum PredefinedType();
+    bool hasPredefinedType() const;
+    IfcTubeBundleTypeEnum::IfcTubeBundleTypeEnum PredefinedType() const;
     void setPredefinedType(IfcTubeBundleTypeEnum::IfcTubeBundleTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_ENUMERATION; } return IfcEnergyConversionDevice::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcTubeBundleTypeEnum; } return IfcEnergyConversionDevice::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "PredefinedType"; } return IfcEnergyConversionDevice::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcTubeBundle (IfcAbstractEntityPtr e);
-    IfcTubeBundle (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcTubeBundleTypeEnum::IfcTubeBundleTypeEnum > v9_PredefinedType);
-    typedef IfcTubeBundle* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcTubeBundle > > list;
-    typedef IfcTemplatedEntityList< IfcTubeBundle >::it it;
+    IfcTubeBundle (IfcAbstractEntity* e);
+    IfcTubeBundle (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcTubeBundleTypeEnum::IfcTubeBundleTypeEnum > v9_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcTubeBundle > list;
 };
 /// The distribution control element type IfcUnitaryControlElementType defines commonly shared information for occurrences of unitary control elements.  The set of shared information may include: 
 /// 
@@ -49076,20 +49628,19 @@ class IfcTubeBundle : public IfcEnergyConversionDevice {
 class IfcUnitaryControlElementType : public IfcDistributionControlElementType {
 public:
     /// Identifies the predefined types of unitary control element from which the type required may be set.
-    IfcUnitaryControlElementTypeEnum::IfcUnitaryControlElementTypeEnum PredefinedType();
+    IfcUnitaryControlElementTypeEnum::IfcUnitaryControlElementTypeEnum PredefinedType() const;
     void setPredefinedType(IfcUnitaryControlElementTypeEnum::IfcUnitaryControlElementTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcDistributionControlElementType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcUnitaryControlElementTypeEnum; } return IfcDistributionControlElementType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcDistributionControlElementType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcUnitaryControlElementType (IfcAbstractEntityPtr e);
-    IfcUnitaryControlElementType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcUnitaryControlElementTypeEnum::IfcUnitaryControlElementTypeEnum v10_PredefinedType);
-    typedef IfcUnitaryControlElementType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcUnitaryControlElementType > > list;
-    typedef IfcTemplatedEntityList< IfcUnitaryControlElementType >::it it;
+    IfcUnitaryControlElementType (IfcAbstractEntity* e);
+    IfcUnitaryControlElementType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcUnitaryControlElementTypeEnum::IfcUnitaryControlElementTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcUnitaryControlElementType > list;
 };
 /// Unitary equipment typically combine a number of components into a single product, such as air handlers, pre-packaged rooftop air-conditioning units, and split systems. 
 /// 
@@ -49166,21 +49717,20 @@ class IfcUnitaryControlElementType : public IfcDistributionControlElementType {
 class IfcUnitaryEquipment : public IfcEnergyConversionDevice {
 public:
     /// Whether the optional attribute PredefinedType is defined for this IfcUnitaryEquipment
-    bool hasPredefinedType();
-    IfcUnitaryEquipmentTypeEnum::IfcUnitaryEquipmentTypeEnum PredefinedType();
+    bool hasPredefinedType() const;
+    IfcUnitaryEquipmentTypeEnum::IfcUnitaryEquipmentTypeEnum PredefinedType() const;
     void setPredefinedType(IfcUnitaryEquipmentTypeEnum::IfcUnitaryEquipmentTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_ENUMERATION; } return IfcEnergyConversionDevice::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcUnitaryEquipmentTypeEnum; } return IfcEnergyConversionDevice::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "PredefinedType"; } return IfcEnergyConversionDevice::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcUnitaryEquipment (IfcAbstractEntityPtr e);
-    IfcUnitaryEquipment (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcUnitaryEquipmentTypeEnum::IfcUnitaryEquipmentTypeEnum > v9_PredefinedType);
-    typedef IfcUnitaryEquipment* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcUnitaryEquipment > > list;
-    typedef IfcTemplatedEntityList< IfcUnitaryEquipment >::it it;
+    IfcUnitaryEquipment (IfcAbstractEntity* e);
+    IfcUnitaryEquipment (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcUnitaryEquipmentTypeEnum::IfcUnitaryEquipmentTypeEnum > v9_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcUnitaryEquipment > list;
 };
 /// A valve is used in a building services piping distribution system to control or modulate the flow of the fluid. 
 /// 
@@ -49371,21 +49921,20 @@ class IfcUnitaryEquipment : public IfcEnergyConversionDevice {
 class IfcValve : public IfcFlowController {
 public:
     /// Whether the optional attribute PredefinedType is defined for this IfcValve
-    bool hasPredefinedType();
-    IfcValveTypeEnum::IfcValveTypeEnum PredefinedType();
+    bool hasPredefinedType() const;
+    IfcValveTypeEnum::IfcValveTypeEnum PredefinedType() const;
     void setPredefinedType(IfcValveTypeEnum::IfcValveTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_ENUMERATION; } return IfcFlowController::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcValveTypeEnum; } return IfcFlowController::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "PredefinedType"; } return IfcFlowController::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcValve (IfcAbstractEntityPtr e);
-    IfcValve (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcValveTypeEnum::IfcValveTypeEnum > v9_PredefinedType);
-    typedef IfcValve* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcValve > > list;
-    typedef IfcTemplatedEntityList< IfcValve >::it it;
+    IfcValve (IfcAbstractEntity* e);
+    IfcValve (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcValveTypeEnum::IfcValveTypeEnum > v9_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcValve > list;
 };
 /// Definition from ISO 6707-1:1989: Vertical construction
 /// usually in masonry or in concrete which bounds or subdivides a
@@ -49632,25 +50181,24 @@ class IfcValve : public IfcFlowController {
 class IfcWall : public IfcBuildingElement {
 public:
     /// Whether the optional attribute PredefinedType is defined for this IfcWall
-    bool hasPredefinedType();
+    bool hasPredefinedType() const;
     /// Predefined generic type for a wall that is specified in an enumeration. There may be a property set given specifically for the predefined types.
     ///   NOTE The PredefinedType shall only be used, if no type object IfcWallType is assigned, providing its own IfcWallType.PredefinedType.
     /// 
     /// IFC2x4 CHANGE  The attribute has been added at the end of the entity definition.
-    IfcWallTypeEnum::IfcWallTypeEnum PredefinedType();
+    IfcWallTypeEnum::IfcWallTypeEnum PredefinedType() const;
     void setPredefinedType(IfcWallTypeEnum::IfcWallTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_ENUMERATION; } return IfcBuildingElement::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcWallTypeEnum; } return IfcBuildingElement::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "PredefinedType"; } return IfcBuildingElement::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcWall (IfcAbstractEntityPtr e);
-    IfcWall (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcWallTypeEnum::IfcWallTypeEnum > v9_PredefinedType);
-    typedef IfcWall* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcWall > > list;
-    typedef IfcTemplatedEntityList< IfcWall >::it it;
+    IfcWall (IfcAbstractEntity* e);
+    IfcWall (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcWallTypeEnum::IfcWallTypeEnum > v9_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcWall > list;
 };
 /// The IfcWallElementedCase
 /// defines a wall with certain constraints for the provision of its
@@ -49754,16 +50302,15 @@ class IfcWallElementedCase : public IfcWall {
 public:
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcWall::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcWall::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcWall::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcWallElementedCase (IfcAbstractEntityPtr e);
-    IfcWallElementedCase (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcWallTypeEnum::IfcWallTypeEnum > v9_PredefinedType);
-    typedef IfcWallElementedCase* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcWallElementedCase > > list;
-    typedef IfcTemplatedEntityList< IfcWallElementedCase >::it it;
+    IfcWallElementedCase (IfcAbstractEntity* e);
+    IfcWallElementedCase (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcWallTypeEnum::IfcWallTypeEnum > v9_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcWallElementedCase > list;
 };
 /// The IfcWallStandardCase defines a wall with certain
 /// constraints for the provision of parameters and with certain
@@ -49971,16 +50518,15 @@ class IfcWallStandardCase : public IfcWall {
 public:
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcWall::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcWall::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcWall::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcWallStandardCase (IfcAbstractEntityPtr e);
-    IfcWallStandardCase (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcWallTypeEnum::IfcWallTypeEnum > v9_PredefinedType);
-    typedef IfcWallStandardCase* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcWallStandardCase > > list;
-    typedef IfcTemplatedEntityList< IfcWallStandardCase >::it it;
+    IfcWallStandardCase (IfcAbstractEntity* e);
+    IfcWallStandardCase (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcWallTypeEnum::IfcWallTypeEnum > v9_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcWallStandardCase > list;
 };
 /// A waste terminal has the purpose of collecting or intercepting waste from one or more sanitary terminals or other fluid waste generating equipment and discharging it into a single waste/drainage system.
 /// A waste terminal provides for all forms of trap and waste point that collects discharge from a sanitary terminal and discharges it into a waste/drainage subsystem or that collects waste from several terminals and passes it into a single waste/drainage subsystem. This includes the P and S traps from soil sanitary terminals, sinks, and basins as well as floor wastes and gully traps that provide collection points. 
@@ -50089,21 +50635,20 @@ class IfcWallStandardCase : public IfcWall {
 class IfcWasteTerminal : public IfcFlowTerminal {
 public:
     /// Whether the optional attribute PredefinedType is defined for this IfcWasteTerminal
-    bool hasPredefinedType();
-    IfcWasteTerminalTypeEnum::IfcWasteTerminalTypeEnum PredefinedType();
+    bool hasPredefinedType() const;
+    IfcWasteTerminalTypeEnum::IfcWasteTerminalTypeEnum PredefinedType() const;
     void setPredefinedType(IfcWasteTerminalTypeEnum::IfcWasteTerminalTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_ENUMERATION; } return IfcFlowTerminal::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcWasteTerminalTypeEnum; } return IfcFlowTerminal::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "PredefinedType"; } return IfcFlowTerminal::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcWasteTerminal (IfcAbstractEntityPtr e);
-    IfcWasteTerminal (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcWasteTerminalTypeEnum::IfcWasteTerminalTypeEnum > v9_PredefinedType);
-    typedef IfcWasteTerminal* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcWasteTerminal > > list;
-    typedef IfcTemplatedEntityList< IfcWasteTerminal >::it it;
+    IfcWasteTerminal (IfcAbstractEntity* e);
+    IfcWasteTerminal (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcWasteTerminalTypeEnum::IfcWasteTerminalTypeEnum > v9_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcWasteTerminal > list;
 };
 /// Definition form ISO 6707-1:1989: Construction for
 /// closing a vertical or near vertical opening in a wall or pitched
@@ -50466,52 +51011,51 @@ class IfcWasteTerminal : public IfcFlowTerminal {
 class IfcWindow : public IfcBuildingElement {
 public:
     /// Whether the optional attribute OverallHeight is defined for this IfcWindow
-    bool hasOverallHeight();
+    bool hasOverallHeight() const;
     /// Overall measure of the height, it reflects the Z Dimension of a bounding box, enclosing the body of the window opening. If omitted, the OverallHeight should be taken from the geometric representation of the IfcOpening in which the window is inserted. 
     /// 
     /// NOTE  The body of the window might be taller then the window opening (e.g. in cases where the window lining includes a casing). In these cases the OverallHeight shall still be given as the window opening height, and not as the total height of the window lining.
-    IfcPositiveLengthMeasure OverallHeight();
-    void setOverallHeight(IfcPositiveLengthMeasure v);
+    double OverallHeight() const;
+    void setOverallHeight(double v);
     /// Whether the optional attribute OverallWidth is defined for this IfcWindow
-    bool hasOverallWidth();
+    bool hasOverallWidth() const;
     /// Overall measure of the width, it reflects the X Dimension of a bounding box, enclosing the body of the window opening. If omitted, the OverallWidth should be taken from the geometric representation of the IfcOpening in which the window is inserted. 
     /// 
     /// NOTE  The body of the window might be wider then the window opening (e.g. in cases where the window lining includes a casing). In these cases the OverallWidth shall still be given as the window opening width, and not as the total width of the window lining.
-    IfcPositiveLengthMeasure OverallWidth();
-    void setOverallWidth(IfcPositiveLengthMeasure v);
+    double OverallWidth() const;
+    void setOverallWidth(double v);
     /// Whether the optional attribute PredefinedType is defined for this IfcWindow
-    bool hasPredefinedType();
+    bool hasPredefinedType() const;
     /// Predefined generic type for a window that is specified in an enumeration. There may be a property set given specificly for the predefined types.
     ///   NOTE The PredefinedType shall only be used, if no type object IfcWindowType is assigned, providing its own IfcWindowType.PredefinedType.
     /// 
     /// IFC2x4 CHANGE  The attribute has been added at the end of the entity definition.
-    IfcWindowTypeEnum::IfcWindowTypeEnum PredefinedType();
+    IfcWindowTypeEnum::IfcWindowTypeEnum PredefinedType() const;
     void setPredefinedType(IfcWindowTypeEnum::IfcWindowTypeEnum v);
     /// Whether the optional attribute PartitioningType is defined for this IfcWindow
-    bool hasPartitioningType();
+    bool hasPartitioningType() const;
     /// Type defining the general layout of the window in terms of the partitioning of panels. 
     /// 
     /// NOTE The PartitioningType shall only be used, if no type object IfcWindowType is assigned, providing its own IfcWindowType.PartitioningType.
     /// 
     /// IFC2x4 CHANGE  The attribute has been added at the end of the entity definition.
-    IfcWindowTypePartitioningEnum::IfcWindowTypePartitioningEnum PartitioningType();
+    IfcWindowTypePartitioningEnum::IfcWindowTypePartitioningEnum PartitioningType() const;
     void setPartitioningType(IfcWindowTypePartitioningEnum::IfcWindowTypePartitioningEnum v);
     /// Whether the optional attribute UserDefinedPartitioningType is defined for this IfcWindow
-    bool hasUserDefinedPartitioningType();
-    IfcLabel UserDefinedPartitioningType();
-    void setUserDefinedPartitioningType(IfcLabel v);
+    bool hasUserDefinedPartitioningType() const;
+    std::string UserDefinedPartitioningType() const;
+    void setUserDefinedPartitioningType(std::string v);
     virtual unsigned int getArgumentCount() const { return 13; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_DOUBLE; case 9: return IfcUtil::Argument_DOUBLE; case 10: return IfcUtil::Argument_ENUMERATION; case 11: return IfcUtil::Argument_ENUMERATION; case 12: return IfcUtil::Argument_STRING; } return IfcBuildingElement::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcPositiveLengthMeasure; case 9: return Type::IfcPositiveLengthMeasure; case 10: return Type::IfcWindowTypeEnum; case 11: return Type::IfcWindowTypePartitioningEnum; case 12: return Type::IfcLabel; } return IfcBuildingElement::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "OverallHeight"; case 9: return "OverallWidth"; case 10: return "PredefinedType"; case 11: return "PartitioningType"; case 12: return "UserDefinedPartitioningType"; } return IfcBuildingElement::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcWindow (IfcAbstractEntityPtr e);
-    IfcWindow (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcPositiveLengthMeasure > v9_OverallHeight, boost::optional< IfcPositiveLengthMeasure > v10_OverallWidth, boost::optional< IfcWindowTypeEnum::IfcWindowTypeEnum > v11_PredefinedType, boost::optional< IfcWindowTypePartitioningEnum::IfcWindowTypePartitioningEnum > v12_PartitioningType, boost::optional< IfcLabel > v13_UserDefinedPartitioningType);
-    typedef IfcWindow* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcWindow > > list;
-    typedef IfcTemplatedEntityList< IfcWindow >::it it;
+    IfcWindow (IfcAbstractEntity* e);
+    IfcWindow (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< double > v9_OverallHeight, boost::optional< double > v10_OverallWidth, boost::optional< IfcWindowTypeEnum::IfcWindowTypeEnum > v11_PredefinedType, boost::optional< IfcWindowTypePartitioningEnum::IfcWindowTypePartitioningEnum > v12_PartitioningType, boost::optional< std::string > v13_UserDefinedPartitioningType);
+    typedef IfcTemplatedEntityList< IfcWindow > list;
 };
 /// The standard window,
 /// IfcWindowStandardCase, defines a window with certain
@@ -50631,16 +51175,15 @@ class IfcWindowStandardCase : public IfcWindow {
 public:
     virtual unsigned int getArgumentCount() const { return 13; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcWindow::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcWindow::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcWindow::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcWindowStandardCase (IfcAbstractEntityPtr e);
-    IfcWindowStandardCase (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcPositiveLengthMeasure > v9_OverallHeight, boost::optional< IfcPositiveLengthMeasure > v10_OverallWidth, boost::optional< IfcWindowTypeEnum::IfcWindowTypeEnum > v11_PredefinedType, boost::optional< IfcWindowTypePartitioningEnum::IfcWindowTypePartitioningEnum > v12_PartitioningType, boost::optional< IfcLabel > v13_UserDefinedPartitioningType);
-    typedef IfcWindowStandardCase* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcWindowStandardCase > > list;
-    typedef IfcTemplatedEntityList< IfcWindowStandardCase >::it it;
+    IfcWindowStandardCase (IfcAbstractEntity* e);
+    IfcWindowStandardCase (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< double > v9_OverallHeight, boost::optional< double > v10_OverallWidth, boost::optional< IfcWindowTypeEnum::IfcWindowTypeEnum > v11_PredefinedType, boost::optional< IfcWindowTypePartitioningEnum::IfcWindowTypePartitioningEnum > v12_PartitioningType, boost::optional< std::string > v13_UserDefinedPartitioningType);
+    typedef IfcTemplatedEntityList< IfcWindowStandardCase > list;
 };
 /// The distribution control element type IfcActuatorType defines commonly shared information for occurrences of actuators.  The set of shared information may include: 
 /// 
@@ -50676,20 +51219,19 @@ class IfcWindowStandardCase : public IfcWindow {
 class IfcActuatorType : public IfcDistributionControlElementType {
 public:
     /// Identifies the predefined types of actuator from which the type required may be set.
-    IfcActuatorTypeEnum::IfcActuatorTypeEnum PredefinedType();
+    IfcActuatorTypeEnum::IfcActuatorTypeEnum PredefinedType() const;
     void setPredefinedType(IfcActuatorTypeEnum::IfcActuatorTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcDistributionControlElementType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcActuatorTypeEnum; } return IfcDistributionControlElementType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcDistributionControlElementType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcActuatorType (IfcAbstractEntityPtr e);
-    IfcActuatorType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcActuatorTypeEnum::IfcActuatorTypeEnum v10_PredefinedType);
-    typedef IfcActuatorType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcActuatorType > > list;
-    typedef IfcTemplatedEntityList< IfcActuatorType >::it it;
+    IfcActuatorType (IfcAbstractEntity* e);
+    IfcActuatorType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcActuatorTypeEnum::IfcActuatorTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcActuatorType > list;
 };
 /// An air terminal is a terminating or origination point for the transfer of air between distribution system(s) and one or more spaces. It can also be used for the transfer of air between adjacent spaces. 
 /// 
@@ -50751,21 +51293,20 @@ class IfcActuatorType : public IfcDistributionControlElementType {
 class IfcAirTerminal : public IfcFlowTerminal {
 public:
     /// Whether the optional attribute PredefinedType is defined for this IfcAirTerminal
-    bool hasPredefinedType();
-    IfcAirTerminalTypeEnum::IfcAirTerminalTypeEnum PredefinedType();
+    bool hasPredefinedType() const;
+    IfcAirTerminalTypeEnum::IfcAirTerminalTypeEnum PredefinedType() const;
     void setPredefinedType(IfcAirTerminalTypeEnum::IfcAirTerminalTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_ENUMERATION; } return IfcFlowTerminal::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcAirTerminalTypeEnum; } return IfcFlowTerminal::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "PredefinedType"; } return IfcFlowTerminal::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcAirTerminal (IfcAbstractEntityPtr e);
-    IfcAirTerminal (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcAirTerminalTypeEnum::IfcAirTerminalTypeEnum > v9_PredefinedType);
-    typedef IfcAirTerminal* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcAirTerminal > > list;
-    typedef IfcTemplatedEntityList< IfcAirTerminal >::it it;
+    IfcAirTerminal (IfcAbstractEntity* e);
+    IfcAirTerminal (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcAirTerminalTypeEnum::IfcAirTerminalTypeEnum > v9_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcAirTerminal > list;
 };
 /// An air terminal box typically participates in an HVAC duct distribution system and is used to control or modulate the amount of air delivered to its downstream ductwork. An air terminal box type is often referred to as an "air flow regulator". 
 /// 
@@ -50812,21 +51353,20 @@ class IfcAirTerminal : public IfcFlowTerminal {
 class IfcAirTerminalBox : public IfcFlowController {
 public:
     /// Whether the optional attribute PredefinedType is defined for this IfcAirTerminalBox
-    bool hasPredefinedType();
-    IfcAirTerminalBoxTypeEnum::IfcAirTerminalBoxTypeEnum PredefinedType();
+    bool hasPredefinedType() const;
+    IfcAirTerminalBoxTypeEnum::IfcAirTerminalBoxTypeEnum PredefinedType() const;
     void setPredefinedType(IfcAirTerminalBoxTypeEnum::IfcAirTerminalBoxTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_ENUMERATION; } return IfcFlowController::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcAirTerminalBoxTypeEnum; } return IfcFlowController::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "PredefinedType"; } return IfcFlowController::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcAirTerminalBox (IfcAbstractEntityPtr e);
-    IfcAirTerminalBox (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcAirTerminalBoxTypeEnum::IfcAirTerminalBoxTypeEnum > v9_PredefinedType);
-    typedef IfcAirTerminalBox* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcAirTerminalBox > > list;
-    typedef IfcTemplatedEntityList< IfcAirTerminalBox >::it it;
+    IfcAirTerminalBox (IfcAbstractEntity* e);
+    IfcAirTerminalBox (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcAirTerminalBoxTypeEnum::IfcAirTerminalBoxTypeEnum > v9_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcAirTerminalBox > list;
 };
 /// An air-to-air heat recovery device employs a counter-flow heat exchanger between inbound and outbound air flow. It is typically used to transfer heat from warmer air in one chamber to cooler air in the second chamber (i.e., typically used to recover heat from the conditioned air being exhausted and the outside air being supplied to a building), resulting in energy savings from reduced heating (or cooling) requirements. 
 /// 
@@ -50876,21 +51416,20 @@ class IfcAirTerminalBox : public IfcFlowController {
 class IfcAirToAirHeatRecovery : public IfcEnergyConversionDevice {
 public:
     /// Whether the optional attribute PredefinedType is defined for this IfcAirToAirHeatRecovery
-    bool hasPredefinedType();
-    IfcAirToAirHeatRecoveryTypeEnum::IfcAirToAirHeatRecoveryTypeEnum PredefinedType();
+    bool hasPredefinedType() const;
+    IfcAirToAirHeatRecoveryTypeEnum::IfcAirToAirHeatRecoveryTypeEnum PredefinedType() const;
     void setPredefinedType(IfcAirToAirHeatRecoveryTypeEnum::IfcAirToAirHeatRecoveryTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_ENUMERATION; } return IfcEnergyConversionDevice::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcAirToAirHeatRecoveryTypeEnum; } return IfcEnergyConversionDevice::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "PredefinedType"; } return IfcEnergyConversionDevice::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcAirToAirHeatRecovery (IfcAbstractEntityPtr e);
-    IfcAirToAirHeatRecovery (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcAirToAirHeatRecoveryTypeEnum::IfcAirToAirHeatRecoveryTypeEnum > v9_PredefinedType);
-    typedef IfcAirToAirHeatRecovery* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcAirToAirHeatRecovery > > list;
-    typedef IfcTemplatedEntityList< IfcAirToAirHeatRecovery >::it it;
+    IfcAirToAirHeatRecovery (IfcAbstractEntity* e);
+    IfcAirToAirHeatRecovery (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcAirToAirHeatRecoveryTypeEnum::IfcAirToAirHeatRecoveryTypeEnum > v9_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcAirToAirHeatRecovery > list;
 };
 /// The distribution control element type IfcAlarmType defines commonly shared information for occurrences of alarms.  The set of shared information may include: 
 /// 
@@ -50921,20 +51460,19 @@ class IfcAirToAirHeatRecovery : public IfcEnergyConversionDevice {
 class IfcAlarmType : public IfcDistributionControlElementType {
 public:
     /// Identifies the predefined types of alarm from which the type required may be set.
-    IfcAlarmTypeEnum::IfcAlarmTypeEnum PredefinedType();
+    IfcAlarmTypeEnum::IfcAlarmTypeEnum PredefinedType() const;
     void setPredefinedType(IfcAlarmTypeEnum::IfcAlarmTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcDistributionControlElementType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcAlarmTypeEnum; } return IfcDistributionControlElementType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcDistributionControlElementType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcAlarmType (IfcAbstractEntityPtr e);
-    IfcAlarmType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcAlarmTypeEnum::IfcAlarmTypeEnum v10_PredefinedType);
-    typedef IfcAlarmType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcAlarmType > > list;
-    typedef IfcTemplatedEntityList< IfcAlarmType >::it it;
+    IfcAlarmType (IfcAbstractEntity* e);
+    IfcAlarmType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcAlarmTypeEnum::IfcAlarmTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcAlarmType > list;
 };
 /// An audio-visual appliance is a device that displays, captures, transmits, or receives audio or video.
 /// Audio-visual appliances may be fixed in place or may be able to be moved from one space to another. They may require an electrical supply that may be supplied either by an electrical circuit or provided from a local battery source. Audio-visual appliances may be connected to data circuits including specialist circuits for audio visual purposes only. 
@@ -51117,21 +51655,20 @@ class IfcAlarmType : public IfcDistributionControlElementType {
 class IfcAudioVisualAppliance : public IfcFlowTerminal {
 public:
     /// Whether the optional attribute PredefinedType is defined for this IfcAudioVisualAppliance
-    bool hasPredefinedType();
-    IfcAudioVisualApplianceTypeEnum::IfcAudioVisualApplianceTypeEnum PredefinedType();
+    bool hasPredefinedType() const;
+    IfcAudioVisualApplianceTypeEnum::IfcAudioVisualApplianceTypeEnum PredefinedType() const;
     void setPredefinedType(IfcAudioVisualApplianceTypeEnum::IfcAudioVisualApplianceTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_ENUMERATION; } return IfcFlowTerminal::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcAudioVisualApplianceTypeEnum; } return IfcFlowTerminal::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "PredefinedType"; } return IfcFlowTerminal::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcAudioVisualAppliance (IfcAbstractEntityPtr e);
-    IfcAudioVisualAppliance (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcAudioVisualApplianceTypeEnum::IfcAudioVisualApplianceTypeEnum > v9_PredefinedType);
-    typedef IfcAudioVisualAppliance* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcAudioVisualAppliance > > list;
-    typedef IfcTemplatedEntityList< IfcAudioVisualAppliance >::it it;
+    IfcAudioVisualAppliance (IfcAbstractEntity* e);
+    IfcAudioVisualAppliance (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcAudioVisualApplianceTypeEnum::IfcAudioVisualApplianceTypeEnum > v9_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcAudioVisualAppliance > list;
 };
 /// Definition from ISO 6707-1:1989: Structural member designed to carry loads between or beyond points of support, usually narrow in relation to its length and horizontal or nearly so.
 /// 
@@ -51373,25 +51910,24 @@ class IfcAudioVisualAppliance : public IfcFlowTerminal {
 class IfcBeam : public IfcBuildingElement {
 public:
     /// Whether the optional attribute PredefinedType is defined for this IfcBeam
-    bool hasPredefinedType();
+    bool hasPredefinedType() const;
     /// Predefined generic type for a beam that is specified in an enumeration. There may be a property set given specificly for the predefined types.
     ///   NOTE The PredefinedType shall only be used, if no type object IfcBeamType is assigned, providing its own IfcBeamType.PredefinedType.
     /// 
     /// IFC2x4 CHANGE  The attribute has been added at the end of the entity definition.
-    IfcBeamTypeEnum::IfcBeamTypeEnum PredefinedType();
+    IfcBeamTypeEnum::IfcBeamTypeEnum PredefinedType() const;
     void setPredefinedType(IfcBeamTypeEnum::IfcBeamTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_ENUMERATION; } return IfcBuildingElement::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcBeamTypeEnum; } return IfcBuildingElement::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "PredefinedType"; } return IfcBuildingElement::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcBeam (IfcAbstractEntityPtr e);
-    IfcBeam (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcBeamTypeEnum::IfcBeamTypeEnum > v9_PredefinedType);
-    typedef IfcBeam* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcBeam > > list;
-    typedef IfcTemplatedEntityList< IfcBeam >::it it;
+    IfcBeam (IfcAbstractEntity* e);
+    IfcBeam (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcBeamTypeEnum::IfcBeamTypeEnum > v9_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcBeam > list;
 };
 /// The standard beam,
 /// IfcBeamStandardCase, defines a beam with certain constraints
@@ -51648,16 +52184,15 @@ class IfcBeamStandardCase : public IfcBeam {
 public:
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcBeam::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcBeam::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcBeam::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcBeamStandardCase (IfcAbstractEntityPtr e);
-    IfcBeamStandardCase (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcBeamTypeEnum::IfcBeamTypeEnum > v9_PredefinedType);
-    typedef IfcBeamStandardCase* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcBeamStandardCase > > list;
-    typedef IfcTemplatedEntityList< IfcBeamStandardCase >::it it;
+    IfcBeamStandardCase (IfcAbstractEntity* e);
+    IfcBeamStandardCase (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcBeamTypeEnum::IfcBeamTypeEnum > v9_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcBeamStandardCase > list;
 };
 /// A boiler is a closed, pressure-rated vessel in which water or other fluid is heated using an energy source such as natural gas, heating oil, or electricity. The fluid in the vessel is then circulated out of the boiler for use in various processes or heating applications.
 /// IfcBoiler is a vessel solely used for heating of water or other fluids. Storage vessels, such as for drinking water storage are considered as tanks and use the IfcTank entity. 
@@ -51731,21 +52266,20 @@ class IfcBeamStandardCase : public IfcBeam {
 class IfcBoiler : public IfcEnergyConversionDevice {
 public:
     /// Whether the optional attribute PredefinedType is defined for this IfcBoiler
-    bool hasPredefinedType();
-    IfcBoilerTypeEnum::IfcBoilerTypeEnum PredefinedType();
+    bool hasPredefinedType() const;
+    IfcBoilerTypeEnum::IfcBoilerTypeEnum PredefinedType() const;
     void setPredefinedType(IfcBoilerTypeEnum::IfcBoilerTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_ENUMERATION; } return IfcEnergyConversionDevice::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcBoilerTypeEnum; } return IfcEnergyConversionDevice::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "PredefinedType"; } return IfcEnergyConversionDevice::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcBoiler (IfcAbstractEntityPtr e);
-    IfcBoiler (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcBoilerTypeEnum::IfcBoilerTypeEnum > v9_PredefinedType);
-    typedef IfcBoiler* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcBoiler > > list;
-    typedef IfcTemplatedEntityList< IfcBoiler >::it it;
+    IfcBoiler (IfcAbstractEntity* e);
+    IfcBoiler (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcBoilerTypeEnum::IfcBoilerTypeEnum > v9_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcBoiler > list;
 };
 /// A burner is a device that converts fuel into heat through combustion. It includes gas, oil, and wood burners. 
 /// 
@@ -51791,21 +52325,20 @@ class IfcBoiler : public IfcEnergyConversionDevice {
 class IfcBurner : public IfcEnergyConversionDevice {
 public:
     /// Whether the optional attribute PredefinedType is defined for this IfcBurner
-    bool hasPredefinedType();
-    IfcBurnerTypeEnum::IfcBurnerTypeEnum PredefinedType();
+    bool hasPredefinedType() const;
+    IfcBurnerTypeEnum::IfcBurnerTypeEnum PredefinedType() const;
     void setPredefinedType(IfcBurnerTypeEnum::IfcBurnerTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_ENUMERATION; } return IfcEnergyConversionDevice::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcBurnerTypeEnum; } return IfcEnergyConversionDevice::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "PredefinedType"; } return IfcEnergyConversionDevice::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcBurner (IfcAbstractEntityPtr e);
-    IfcBurner (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcBurnerTypeEnum::IfcBurnerTypeEnum > v9_PredefinedType);
-    typedef IfcBurner* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcBurner > > list;
-    typedef IfcTemplatedEntityList< IfcBurner >::it it;
+    IfcBurner (IfcAbstractEntity* e);
+    IfcBurner (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcBurnerTypeEnum::IfcBurnerTypeEnum > v9_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcBurner > list;
 };
 /// A cable carrier fitting is a fitting that is placed at junction or transition in a cable carrier system. 
 /// 
@@ -51871,22 +52404,21 @@ class IfcBurner : public IfcEnergyConversionDevice {
 class IfcCableCarrierFitting : public IfcFlowFitting {
 public:
     /// Whether the optional attribute PredefinedType is defined for this IfcCableCarrierFitting
-    bool hasPredefinedType();
+    bool hasPredefinedType() const;
     /// Identifies the predefined types of cable carrier fitting from which the type required may be set.
-    IfcCableCarrierFittingTypeEnum::IfcCableCarrierFittingTypeEnum PredefinedType();
+    IfcCableCarrierFittingTypeEnum::IfcCableCarrierFittingTypeEnum PredefinedType() const;
     void setPredefinedType(IfcCableCarrierFittingTypeEnum::IfcCableCarrierFittingTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_ENUMERATION; } return IfcFlowFitting::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcCableCarrierFittingTypeEnum; } return IfcFlowFitting::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "PredefinedType"; } return IfcFlowFitting::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcCableCarrierFitting (IfcAbstractEntityPtr e);
-    IfcCableCarrierFitting (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcCableCarrierFittingTypeEnum::IfcCableCarrierFittingTypeEnum > v9_PredefinedType);
-    typedef IfcCableCarrierFitting* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcCableCarrierFitting > > list;
-    typedef IfcTemplatedEntityList< IfcCableCarrierFitting >::it it;
+    IfcCableCarrierFitting (IfcAbstractEntity* e);
+    IfcCableCarrierFitting (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcCableCarrierFittingTypeEnum::IfcCableCarrierFittingTypeEnum > v9_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcCableCarrierFitting > list;
 };
 /// A cable carrier segment is a flow segment that is specifically used to carry and support cabling. 
 /// 
@@ -51950,22 +52482,21 @@ class IfcCableCarrierFitting : public IfcFlowFitting {
 class IfcCableCarrierSegment : public IfcFlowSegment {
 public:
     /// Whether the optional attribute PredefinedType is defined for this IfcCableCarrierSegment
-    bool hasPredefinedType();
+    bool hasPredefinedType() const;
     /// Identifies the predefined types of cable carrier segment from which the type required may be set.
-    IfcCableCarrierSegmentTypeEnum::IfcCableCarrierSegmentTypeEnum PredefinedType();
+    IfcCableCarrierSegmentTypeEnum::IfcCableCarrierSegmentTypeEnum PredefinedType() const;
     void setPredefinedType(IfcCableCarrierSegmentTypeEnum::IfcCableCarrierSegmentTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_ENUMERATION; } return IfcFlowSegment::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcCableCarrierSegmentTypeEnum; } return IfcFlowSegment::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "PredefinedType"; } return IfcFlowSegment::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcCableCarrierSegment (IfcAbstractEntityPtr e);
-    IfcCableCarrierSegment (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcCableCarrierSegmentTypeEnum::IfcCableCarrierSegmentTypeEnum > v9_PredefinedType);
-    typedef IfcCableCarrierSegment* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcCableCarrierSegment > > list;
-    typedef IfcTemplatedEntityList< IfcCableCarrierSegment >::it it;
+    IfcCableCarrierSegment (IfcAbstractEntity* e);
+    IfcCableCarrierSegment (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcCableCarrierSegmentTypeEnum::IfcCableCarrierSegmentTypeEnum > v9_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcCableCarrierSegment > list;
 };
 /// A cable fitting is a fitting that is placed at a junction, transition or termination in a cable system. 
 /// 
@@ -52044,22 +52575,21 @@ class IfcCableCarrierSegment : public IfcFlowSegment {
 class IfcCableFitting : public IfcFlowFitting {
 public:
     /// Whether the optional attribute PredefinedType is defined for this IfcCableFitting
-    bool hasPredefinedType();
+    bool hasPredefinedType() const;
     /// Identifies the predefined types of cable fitting from which the type required may be set.
-    IfcCableFittingTypeEnum::IfcCableFittingTypeEnum PredefinedType();
+    IfcCableFittingTypeEnum::IfcCableFittingTypeEnum PredefinedType() const;
     void setPredefinedType(IfcCableFittingTypeEnum::IfcCableFittingTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_ENUMERATION; } return IfcFlowFitting::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcCableFittingTypeEnum; } return IfcFlowFitting::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "PredefinedType"; } return IfcFlowFitting::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcCableFitting (IfcAbstractEntityPtr e);
-    IfcCableFitting (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcCableFittingTypeEnum::IfcCableFittingTypeEnum > v9_PredefinedType);
-    typedef IfcCableFitting* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcCableFitting > > list;
-    typedef IfcTemplatedEntityList< IfcCableFitting >::it it;
+    IfcCableFitting (IfcAbstractEntity* e);
+    IfcCableFitting (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcCableFittingTypeEnum::IfcCableFittingTypeEnum > v9_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcCableFitting > list;
 };
 /// A cable segment is a flow segment used to carry electrical power, data, or telecommunications signals.
 /// A cable segment is used to typically join two sections of an electrical network or a network of components carrying the electrical service. 
@@ -52151,22 +52681,21 @@ class IfcCableFitting : public IfcFlowFitting {
 class IfcCableSegment : public IfcFlowSegment {
 public:
     /// Whether the optional attribute PredefinedType is defined for this IfcCableSegment
-    bool hasPredefinedType();
+    bool hasPredefinedType() const;
     /// Identifies the predefined types of cable segment from which the type required may be set.
-    IfcCableSegmentTypeEnum::IfcCableSegmentTypeEnum PredefinedType();
+    IfcCableSegmentTypeEnum::IfcCableSegmentTypeEnum PredefinedType() const;
     void setPredefinedType(IfcCableSegmentTypeEnum::IfcCableSegmentTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_ENUMERATION; } return IfcFlowSegment::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcCableSegmentTypeEnum; } return IfcFlowSegment::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "PredefinedType"; } return IfcFlowSegment::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcCableSegment (IfcAbstractEntityPtr e);
-    IfcCableSegment (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcCableSegmentTypeEnum::IfcCableSegmentTypeEnum > v9_PredefinedType);
-    typedef IfcCableSegment* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcCableSegment > > list;
-    typedef IfcTemplatedEntityList< IfcCableSegment >::it it;
+    IfcCableSegment (IfcAbstractEntity* e);
+    IfcCableSegment (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcCableSegmentTypeEnum::IfcCableSegmentTypeEnum > v9_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcCableSegment > list;
 };
 /// A chiller is a device used to remove heat from a liquid via a vapor-compression or absorption refrigeration cycle to cool a fluid, typically water or a mixture of water and glycol. The chilled fluid is then used to cool and dehumidify air in a building. 
 /// 
@@ -52240,21 +52769,20 @@ class IfcCableSegment : public IfcFlowSegment {
 class IfcChiller : public IfcEnergyConversionDevice {
 public:
     /// Whether the optional attribute PredefinedType is defined for this IfcChiller
-    bool hasPredefinedType();
-    IfcChillerTypeEnum::IfcChillerTypeEnum PredefinedType();
+    bool hasPredefinedType() const;
+    IfcChillerTypeEnum::IfcChillerTypeEnum PredefinedType() const;
     void setPredefinedType(IfcChillerTypeEnum::IfcChillerTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_ENUMERATION; } return IfcEnergyConversionDevice::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcChillerTypeEnum; } return IfcEnergyConversionDevice::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "PredefinedType"; } return IfcEnergyConversionDevice::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcChiller (IfcAbstractEntityPtr e);
-    IfcChiller (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcChillerTypeEnum::IfcChillerTypeEnum > v9_PredefinedType);
-    typedef IfcChiller* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcChiller > > list;
-    typedef IfcTemplatedEntityList< IfcChiller >::it it;
+    IfcChiller (IfcAbstractEntity* e);
+    IfcChiller (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcChillerTypeEnum::IfcChillerTypeEnum > v9_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcChiller > list;
 };
 /// A coil is a device used to provide heat transfer between non-mixing media. A common example is a cooling coil, which utilizes a finned coil in which circulates chilled water, antifreeze, or refrigerant that is used to remove heat from air moving across the surface of the coil. A coil may be used either for heating or cooling purposes by placing a series of tubes (the coil) carrying a heating or cooling fluid into an airstream. The coil may be constructed from tubes bundled in a serpentine form or from finned tubes that give a extended heat transfer surface.
 /// Coils may also be used for non-airflow cases such as embedded in a floor slab. 
@@ -52325,21 +52853,20 @@ class IfcChiller : public IfcEnergyConversionDevice {
 class IfcCoil : public IfcEnergyConversionDevice {
 public:
     /// Whether the optional attribute PredefinedType is defined for this IfcCoil
-    bool hasPredefinedType();
-    IfcCoilTypeEnum::IfcCoilTypeEnum PredefinedType();
+    bool hasPredefinedType() const;
+    IfcCoilTypeEnum::IfcCoilTypeEnum PredefinedType() const;
     void setPredefinedType(IfcCoilTypeEnum::IfcCoilTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_ENUMERATION; } return IfcEnergyConversionDevice::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcCoilTypeEnum; } return IfcEnergyConversionDevice::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "PredefinedType"; } return IfcEnergyConversionDevice::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcCoil (IfcAbstractEntityPtr e);
-    IfcCoil (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcCoilTypeEnum::IfcCoilTypeEnum > v9_PredefinedType);
-    typedef IfcCoil* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcCoil > > list;
-    typedef IfcTemplatedEntityList< IfcCoil >::it it;
+    IfcCoil (IfcAbstractEntity* e);
+    IfcCoil (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcCoilTypeEnum::IfcCoilTypeEnum > v9_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcCoil > list;
 };
 /// A communications appliance transmits and receives electronic or digital information as data or sound.
 /// Communication appliances may be fixed in place or may be able to be moved from one space to another. Communication appliances require an electrical supply that may be supplied either by an electrical circuit or provided from a local battery source. 
@@ -52446,21 +52973,20 @@ class IfcCoil : public IfcEnergyConversionDevice {
 class IfcCommunicationsAppliance : public IfcFlowTerminal {
 public:
     /// Whether the optional attribute PredefinedType is defined for this IfcCommunicationsAppliance
-    bool hasPredefinedType();
-    IfcCommunicationsApplianceTypeEnum::IfcCommunicationsApplianceTypeEnum PredefinedType();
+    bool hasPredefinedType() const;
+    IfcCommunicationsApplianceTypeEnum::IfcCommunicationsApplianceTypeEnum PredefinedType() const;
     void setPredefinedType(IfcCommunicationsApplianceTypeEnum::IfcCommunicationsApplianceTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_ENUMERATION; } return IfcFlowTerminal::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcCommunicationsApplianceTypeEnum; } return IfcFlowTerminal::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "PredefinedType"; } return IfcFlowTerminal::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcCommunicationsAppliance (IfcAbstractEntityPtr e);
-    IfcCommunicationsAppliance (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcCommunicationsApplianceTypeEnum::IfcCommunicationsApplianceTypeEnum > v9_PredefinedType);
-    typedef IfcCommunicationsAppliance* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcCommunicationsAppliance > > list;
-    typedef IfcTemplatedEntityList< IfcCommunicationsAppliance >::it it;
+    IfcCommunicationsAppliance (IfcAbstractEntity* e);
+    IfcCommunicationsAppliance (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcCommunicationsApplianceTypeEnum::IfcCommunicationsApplianceTypeEnum > v9_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcCommunicationsAppliance > list;
 };
 /// A compressor is a device that compresses a fluid typically used in a refrigeration circuit. 
 /// 
@@ -52511,21 +53037,20 @@ class IfcCommunicationsAppliance : public IfcFlowTerminal {
 class IfcCompressor : public IfcFlowMovingDevice {
 public:
     /// Whether the optional attribute PredefinedType is defined for this IfcCompressor
-    bool hasPredefinedType();
-    IfcCompressorTypeEnum::IfcCompressorTypeEnum PredefinedType();
+    bool hasPredefinedType() const;
+    IfcCompressorTypeEnum::IfcCompressorTypeEnum PredefinedType() const;
     void setPredefinedType(IfcCompressorTypeEnum::IfcCompressorTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_ENUMERATION; } return IfcFlowMovingDevice::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcCompressorTypeEnum; } return IfcFlowMovingDevice::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "PredefinedType"; } return IfcFlowMovingDevice::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcCompressor (IfcAbstractEntityPtr e);
-    IfcCompressor (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcCompressorTypeEnum::IfcCompressorTypeEnum > v9_PredefinedType);
-    typedef IfcCompressor* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcCompressor > > list;
-    typedef IfcTemplatedEntityList< IfcCompressor >::it it;
+    IfcCompressor (IfcAbstractEntity* e);
+    IfcCompressor (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcCompressorTypeEnum::IfcCompressorTypeEnum > v9_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcCompressor > list;
 };
 /// A condenser is a device that is used to dissipate heat, typically by condensing a substance such as a refrigerant from its gaseous to its liquid state. 
 /// 
@@ -52596,21 +53121,20 @@ class IfcCompressor : public IfcFlowMovingDevice {
 class IfcCondenser : public IfcEnergyConversionDevice {
 public:
     /// Whether the optional attribute PredefinedType is defined for this IfcCondenser
-    bool hasPredefinedType();
-    IfcCondenserTypeEnum::IfcCondenserTypeEnum PredefinedType();
+    bool hasPredefinedType() const;
+    IfcCondenserTypeEnum::IfcCondenserTypeEnum PredefinedType() const;
     void setPredefinedType(IfcCondenserTypeEnum::IfcCondenserTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_ENUMERATION; } return IfcEnergyConversionDevice::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcCondenserTypeEnum; } return IfcEnergyConversionDevice::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "PredefinedType"; } return IfcEnergyConversionDevice::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcCondenser (IfcAbstractEntityPtr e);
-    IfcCondenser (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcCondenserTypeEnum::IfcCondenserTypeEnum > v9_PredefinedType);
-    typedef IfcCondenser* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcCondenser > > list;
-    typedef IfcTemplatedEntityList< IfcCondenser >::it it;
+    IfcCondenser (IfcAbstractEntity* e);
+    IfcCondenser (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcCondenserTypeEnum::IfcCondenserTypeEnum > v9_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcCondenser > list;
 };
 /// The distribution control element type IfcControllerType defines commonly shared information for occurrences of controllers.  The set of shared information may include: 
 /// 
@@ -52651,20 +53175,19 @@ class IfcCondenser : public IfcEnergyConversionDevice {
 class IfcControllerType : public IfcDistributionControlElementType {
 public:
     /// Identifies the predefined types of controller from which the type required may be set.
-    IfcControllerTypeEnum::IfcControllerTypeEnum PredefinedType();
+    IfcControllerTypeEnum::IfcControllerTypeEnum PredefinedType() const;
     void setPredefinedType(IfcControllerTypeEnum::IfcControllerTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 10; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 9: return IfcUtil::Argument_ENUMERATION; } return IfcDistributionControlElementType::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 9: return Type::IfcControllerTypeEnum; } return IfcDistributionControlElementType::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 9: return "PredefinedType"; } return IfcDistributionControlElementType::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcControllerType (IfcAbstractEntityPtr e);
-    IfcControllerType (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcIdentifier > v5_ApplicableOccurrence, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcPropertySetDefinition > > > v6_HasPropertySets, boost::optional< SHARED_PTR< IfcTemplatedEntityList< IfcRepresentationMap > > > v7_RepresentationMaps, boost::optional< IfcLabel > v8_Tag, boost::optional< IfcLabel > v9_ElementType, IfcControllerTypeEnum::IfcControllerTypeEnum v10_PredefinedType);
-    typedef IfcControllerType* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcControllerType > > list;
-    typedef IfcTemplatedEntityList< IfcControllerType >::it it;
+    IfcControllerType (IfcAbstractEntity* e);
+    IfcControllerType (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< IfcTemplatedEntityList< IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< IfcTemplatedEntityList< IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, IfcControllerTypeEnum::IfcControllerTypeEnum v10_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcControllerType > list;
 };
 /// A cooled beam (or chilled beam) is a device typically used to cool air by circulating a fluid such as chilled water through exposed finned tubes above a space. Typically mounted overhead near or within a ceiling, the cooled beam uses convection to cool the space below it by acting as a heat sink for the naturally rising warm air of the space. Once cooled, the air naturally drops back to the floor where the cycle begins again. 
 /// 
@@ -52718,21 +53241,20 @@ class IfcControllerType : public IfcDistributionControlElementType {
 class IfcCooledBeam : public IfcEnergyConversionDevice {
 public:
     /// Whether the optional attribute PredefinedType is defined for this IfcCooledBeam
-    bool hasPredefinedType();
-    IfcCooledBeamTypeEnum::IfcCooledBeamTypeEnum PredefinedType();
+    bool hasPredefinedType() const;
+    IfcCooledBeamTypeEnum::IfcCooledBeamTypeEnum PredefinedType() const;
     void setPredefinedType(IfcCooledBeamTypeEnum::IfcCooledBeamTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_ENUMERATION; } return IfcEnergyConversionDevice::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcCooledBeamTypeEnum; } return IfcEnergyConversionDevice::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "PredefinedType"; } return IfcEnergyConversionDevice::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcCooledBeam (IfcAbstractEntityPtr e);
-    IfcCooledBeam (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcCooledBeamTypeEnum::IfcCooledBeamTypeEnum > v9_PredefinedType);
-    typedef IfcCooledBeam* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcCooledBeam > > list;
-    typedef IfcTemplatedEntityList< IfcCooledBeam >::it it;
+    IfcCooledBeam (IfcAbstractEntity* e);
+    IfcCooledBeam (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcCooledBeamTypeEnum::IfcCooledBeamTypeEnum > v9_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcCooledBeam > list;
 };
 /// A cooling tower is a device which rejects heat to ambient air by circulating a fluid such as water through it to reduce its temperature by partial evaporation. 
 /// 
@@ -52794,21 +53316,20 @@ class IfcCooledBeam : public IfcEnergyConversionDevice {
 class IfcCoolingTower : public IfcEnergyConversionDevice {
 public:
     /// Whether the optional attribute PredefinedType is defined for this IfcCoolingTower
-    bool hasPredefinedType();
-    IfcCoolingTowerTypeEnum::IfcCoolingTowerTypeEnum PredefinedType();
+    bool hasPredefinedType() const;
+    IfcCoolingTowerTypeEnum::IfcCoolingTowerTypeEnum PredefinedType() const;
     void setPredefinedType(IfcCoolingTowerTypeEnum::IfcCoolingTowerTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_ENUMERATION; } return IfcEnergyConversionDevice::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcCoolingTowerTypeEnum; } return IfcEnergyConversionDevice::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "PredefinedType"; } return IfcEnergyConversionDevice::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcCoolingTower (IfcAbstractEntityPtr e);
-    IfcCoolingTower (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcCoolingTowerTypeEnum::IfcCoolingTowerTypeEnum > v9_PredefinedType);
-    typedef IfcCoolingTower* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcCoolingTower > > list;
-    typedef IfcTemplatedEntityList< IfcCoolingTower >::it it;
+    IfcCoolingTower (IfcAbstractEntity* e);
+    IfcCoolingTower (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcCoolingTowerTypeEnum::IfcCoolingTowerTypeEnum > v9_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcCoolingTower > list;
 };
 /// A damper typically participates in an HVAC duct distribution system and is used to control or modulate the flow of air. 
 /// 
@@ -52884,21 +53405,20 @@ class IfcCoolingTower : public IfcEnergyConversionDevice {
 class IfcDamper : public IfcFlowController {
 public:
     /// Whether the optional attribute PredefinedType is defined for this IfcDamper
-    bool hasPredefinedType();
-    IfcDamperTypeEnum::IfcDamperTypeEnum PredefinedType();
+    bool hasPredefinedType() const;
+    IfcDamperTypeEnum::IfcDamperTypeEnum PredefinedType() const;
     void setPredefinedType(IfcDamperTypeEnum::IfcDamperTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_ENUMERATION; } return IfcFlowController::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcDamperTypeEnum; } return IfcFlowController::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "PredefinedType"; } return IfcFlowController::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcDamper (IfcAbstractEntityPtr e);
-    IfcDamper (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcDamperTypeEnum::IfcDamperTypeEnum > v9_PredefinedType);
-    typedef IfcDamper* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcDamper > > list;
-    typedef IfcTemplatedEntityList< IfcDamper >::it it;
+    IfcDamper (IfcAbstractEntity* e);
+    IfcDamper (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcDamperTypeEnum::IfcDamperTypeEnum > v9_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcDamper > list;
 };
 /// A distribution chamber element defines a place at which distribution systems and their constituent elements may be inspected or through which they may travel.
 /// 
@@ -52934,37 +53454,35 @@ class IfcDamper : public IfcFlowController {
 class IfcDistributionChamberElement : public IfcDistributionFlowElement {
 public:
     /// Whether the optional attribute PredefinedType is defined for this IfcDistributionChamberElement
-    bool hasPredefinedType();
-    IfcDistributionChamberElementTypeEnum::IfcDistributionChamberElementTypeEnum PredefinedType();
+    bool hasPredefinedType() const;
+    IfcDistributionChamberElementTypeEnum::IfcDistributionChamberElementTypeEnum PredefinedType() const;
     void setPredefinedType(IfcDistributionChamberElementTypeEnum::IfcDistributionChamberElementTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_ENUMERATION; } return IfcDistributionFlowElement::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcDistributionChamberElementTypeEnum; } return IfcDistributionFlowElement::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "PredefinedType"; } return IfcDistributionFlowElement::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcDistributionChamberElement (IfcAbstractEntityPtr e);
-    IfcDistributionChamberElement (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcDistributionChamberElementTypeEnum::IfcDistributionChamberElementTypeEnum > v9_PredefinedType);
-    typedef IfcDistributionChamberElement* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcDistributionChamberElement > > list;
-    typedef IfcTemplatedEntityList< IfcDistributionChamberElement >::it it;
+    IfcDistributionChamberElement (IfcAbstractEntity* e);
+    IfcDistributionChamberElement (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcDistributionChamberElementTypeEnum::IfcDistributionChamberElementTypeEnum > v9_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcDistributionChamberElement > list;
 };
 
 class IfcDistributionCircuit : public IfcDistributionSystem {
 public:
     virtual unsigned int getArgumentCount() const { return 7; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcDistributionSystem::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcDistributionSystem::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcDistributionSystem::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcDistributionCircuit (IfcAbstractEntityPtr e);
-    IfcDistributionCircuit (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, boost::optional< IfcLabel > v6_LongName, boost::optional< IfcDistributionSystemEnum::IfcDistributionSystemEnum > v7_PredefinedType);
-    typedef IfcDistributionCircuit* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcDistributionCircuit > > list;
-    typedef IfcTemplatedEntityList< IfcDistributionCircuit >::it it;
+    IfcDistributionCircuit (IfcAbstractEntity* e);
+    IfcDistributionCircuit (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, boost::optional< std::string > v6_LongName, boost::optional< IfcDistributionSystemEnum::IfcDistributionSystemEnum > v7_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcDistributionCircuit > list;
 };
 /// The distribution element IfcDistributionControlElement defines occurrence elements of a building automation control system that are used to impart control over elements of a distribution system.
 /// 
@@ -53048,17 +53566,16 @@ class IfcDistributionControlElement : public IfcDistributionElement {
 public:
     virtual unsigned int getArgumentCount() const { return 8; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { return IfcDistributionElement::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { return IfcDistributionElement::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { return IfcDistributionElement::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
-    SHARED_PTR< IfcTemplatedEntityList< IfcRelFlowControlElements > > AssignedToFlowElement(); // INVERSE IfcRelFlowControlElements::RelatedControlElements
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
+    IfcTemplatedEntityList< IfcRelFlowControlElements >::ptr AssignedToFlowElement() const; // INVERSE IfcRelFlowControlElements::RelatedControlElements
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcDistributionControlElement (IfcAbstractEntityPtr e);
-    IfcDistributionControlElement (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag);
-    typedef IfcDistributionControlElement* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcDistributionControlElement > > list;
-    typedef IfcTemplatedEntityList< IfcDistributionControlElement >::it it;
+    IfcDistributionControlElement (IfcAbstractEntity* e);
+    IfcDistributionControlElement (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag);
+    typedef IfcTemplatedEntityList< IfcDistributionControlElement > list;
 };
 /// A duct fitting is a junction or transition in a ducted flow distribution system or used to connect duct segments, resulting changes in flow characteristics to the fluid such as direction and flow rate. 
 /// 
@@ -53138,21 +53655,20 @@ class IfcDistributionControlElement : public IfcDistributionElement {
 class IfcDuctFitting : public IfcFlowFitting {
 public:
     /// Whether the optional attribute PredefinedType is defined for this IfcDuctFitting
-    bool hasPredefinedType();
-    IfcDuctFittingTypeEnum::IfcDuctFittingTypeEnum PredefinedType();
+    bool hasPredefinedType() const;
+    IfcDuctFittingTypeEnum::IfcDuctFittingTypeEnum PredefinedType() const;
     void setPredefinedType(IfcDuctFittingTypeEnum::IfcDuctFittingTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_ENUMERATION; } return IfcFlowFitting::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcDuctFittingTypeEnum; } return IfcFlowFitting::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "PredefinedType"; } return IfcFlowFitting::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcDuctFitting (IfcAbstractEntityPtr e);
-    IfcDuctFitting (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcDuctFittingTypeEnum::IfcDuctFittingTypeEnum > v9_PredefinedType);
-    typedef IfcDuctFitting* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcDuctFitting > > list;
-    typedef IfcTemplatedEntityList< IfcDuctFitting >::it it;
+    IfcDuctFitting (IfcAbstractEntity* e);
+    IfcDuctFitting (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcDuctFittingTypeEnum::IfcDuctFittingTypeEnum > v9_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcDuctFitting > list;
 };
 /// A duct segment is used to typically join two sections of duct network. 
 /// 
@@ -53206,21 +53722,20 @@ class IfcDuctFitting : public IfcFlowFitting {
 class IfcDuctSegment : public IfcFlowSegment {
 public:
     /// Whether the optional attribute PredefinedType is defined for this IfcDuctSegment
-    bool hasPredefinedType();
-    IfcDuctSegmentTypeEnum::IfcDuctSegmentTypeEnum PredefinedType();
+    bool hasPredefinedType() const;
+    IfcDuctSegmentTypeEnum::IfcDuctSegmentTypeEnum PredefinedType() const;
     void setPredefinedType(IfcDuctSegmentTypeEnum::IfcDuctSegmentTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_ENUMERATION; } return IfcFlowSegment::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcDuctSegmentTypeEnum; } return IfcFlowSegment::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "PredefinedType"; } return IfcFlowSegment::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcDuctSegment (IfcAbstractEntityPtr e);
-    IfcDuctSegment (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcDuctSegmentTypeEnum::IfcDuctSegmentTypeEnum > v9_PredefinedType);
-    typedef IfcDuctSegment* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcDuctSegment > > list;
-    typedef IfcTemplatedEntityList< IfcDuctSegment >::it it;
+    IfcDuctSegment (IfcAbstractEntity* e);
+    IfcDuctSegment (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcDuctSegmentTypeEnum::IfcDuctSegmentTypeEnum > v9_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcDuctSegment > list;
 };
 /// A duct silencer is a device that is typically installed inside a duct distribution system for the purpose of reducing the noise levels from air movement, fan noise, etc. in the adjacent space or downstream of the duct silencer device. 
 /// 
@@ -53267,21 +53782,20 @@ class IfcDuctSegment : public IfcFlowSegment {
 class IfcDuctSilencer : public IfcFlowTreatmentDevice {
 public:
     /// Whether the optional attribute PredefinedType is defined for this IfcDuctSilencer
-    bool hasPredefinedType();
-    IfcDuctSilencerTypeEnum::IfcDuctSilencerTypeEnum PredefinedType();
+    bool hasPredefinedType() const;
+    IfcDuctSilencerTypeEnum::IfcDuctSilencerTypeEnum PredefinedType() const;
     void setPredefinedType(IfcDuctSilencerTypeEnum::IfcDuctSilencerTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_ENUMERATION; } return IfcFlowTreatmentDevice::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcDuctSilencerTypeEnum; } return IfcFlowTreatmentDevice::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "PredefinedType"; } return IfcFlowTreatmentDevice::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcDuctSilencer (IfcAbstractEntityPtr e);
-    IfcDuctSilencer (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcDuctSilencerTypeEnum::IfcDuctSilencerTypeEnum > v9_PredefinedType);
-    typedef IfcDuctSilencer* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcDuctSilencer > > list;
-    typedef IfcTemplatedEntityList< IfcDuctSilencer >::it it;
+    IfcDuctSilencer (IfcAbstractEntity* e);
+    IfcDuctSilencer (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcDuctSilencerTypeEnum::IfcDuctSilencerTypeEnum > v9_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcDuctSilencer > list;
 };
 /// A communications appliance transmits and receives electronic or digital information as data or sound.
 /// Communication appliances may be fixed in place or may be able to be moved from one space to another. Communication appliances require an electrical supply that may be supplied either by an electrical circuit or provided from a local battery source. 
@@ -53384,21 +53898,20 @@ class IfcDuctSilencer : public IfcFlowTreatmentDevice {
 class IfcElectricAppliance : public IfcFlowTerminal {
 public:
     /// Whether the optional attribute PredefinedType is defined for this IfcElectricAppliance
-    bool hasPredefinedType();
-    IfcElectricApplianceTypeEnum::IfcElectricApplianceTypeEnum PredefinedType();
+    bool hasPredefinedType() const;
+    IfcElectricApplianceTypeEnum::IfcElectricApplianceTypeEnum PredefinedType() const;
     void setPredefinedType(IfcElectricApplianceTypeEnum::IfcElectricApplianceTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_ENUMERATION; } return IfcFlowTerminal::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcElectricApplianceTypeEnum; } return IfcFlowTerminal::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "PredefinedType"; } return IfcFlowTerminal::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcElectricAppliance (IfcAbstractEntityPtr e);
-    IfcElectricAppliance (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcElectricApplianceTypeEnum::IfcElectricApplianceTypeEnum > v9_PredefinedType);
-    typedef IfcElectricAppliance* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcElectricAppliance > > list;
-    typedef IfcTemplatedEntityList< IfcElectricAppliance >::it it;
+    IfcElectricAppliance (IfcAbstractEntity* e);
+    IfcElectricAppliance (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcElectricApplianceTypeEnum::IfcElectricApplianceTypeEnum > v9_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcElectricAppliance > list;
 };
 /// A distribution board is a flow controller in which instances of electrical devices are brought together at a single place for a particular purpose.
 /// A distribution provides a housing for connected electrical distribution elements so that they can be viewed, operated or acted upon from a single place. Each connected item may have its own geometric representation and location. 
@@ -53460,21 +53973,20 @@ class IfcElectricAppliance : public IfcFlowTerminal {
 class IfcElectricDistributionBoard : public IfcFlowController {
 public:
     /// Whether the optional attribute PredefinedType is defined for this IfcElectricDistributionBoard
-    bool hasPredefinedType();
-    IfcElectricDistributionBoardTypeEnum::IfcElectricDistributionBoardTypeEnum PredefinedType();
+    bool hasPredefinedType() const;
+    IfcElectricDistributionBoardTypeEnum::IfcElectricDistributionBoardTypeEnum PredefinedType() const;
     void setPredefinedType(IfcElectricDistributionBoardTypeEnum::IfcElectricDistributionBoardTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_ENUMERATION; } return IfcFlowController::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcElectricDistributionBoardTypeEnum; } return IfcFlowController::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "PredefinedType"; } return IfcFlowController::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcElectricDistributionBoard (IfcAbstractEntityPtr e);
-    IfcElectricDistributionBoard (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcElectricDistributionBoardTypeEnum::IfcElectricDistributionBoardTypeEnum > v9_PredefinedType);
-    typedef IfcElectricDistributionBoard* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcElectricDistributionBoard > > list;
-    typedef IfcTemplatedEntityList< IfcElectricDistributionBoard >::it it;
+    IfcElectricDistributionBoard (IfcAbstractEntity* e);
+    IfcElectricDistributionBoard (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcElectricDistributionBoardTypeEnum::IfcElectricDistributionBoardTypeEnum > v9_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcElectricDistributionBoard > list;
 };
 /// An electric flow storage device is a device in which electrical energy is stored and from which energy may be progressively released. 
 /// 
@@ -53520,21 +54032,20 @@ class IfcElectricDistributionBoard : public IfcFlowController {
 class IfcElectricFlowStorageDevice : public IfcFlowStorageDevice {
 public:
     /// Whether the optional attribute PredefinedType is defined for this IfcElectricFlowStorageDevice
-    bool hasPredefinedType();
-    IfcElectricFlowStorageDeviceTypeEnum::IfcElectricFlowStorageDeviceTypeEnum PredefinedType();
+    bool hasPredefinedType() const;
+    IfcElectricFlowStorageDeviceTypeEnum::IfcElectricFlowStorageDeviceTypeEnum PredefinedType() const;
     void setPredefinedType(IfcElectricFlowStorageDeviceTypeEnum::IfcElectricFlowStorageDeviceTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_ENUMERATION; } return IfcFlowStorageDevice::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcElectricFlowStorageDeviceTypeEnum; } return IfcFlowStorageDevice::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "PredefinedType"; } return IfcFlowStorageDevice::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcElectricFlowStorageDevice (IfcAbstractEntityPtr e);
-    IfcElectricFlowStorageDevice (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcElectricFlowStorageDeviceTypeEnum::IfcElectricFlowStorageDeviceTypeEnum > v9_PredefinedType);
-    typedef IfcElectricFlowStorageDevice* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcElectricFlowStorageDevice > > list;
-    typedef IfcTemplatedEntityList< IfcElectricFlowStorageDevice >::it it;
+    IfcElectricFlowStorageDevice (IfcAbstractEntity* e);
+    IfcElectricFlowStorageDevice (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcElectricFlowStorageDeviceTypeEnum::IfcElectricFlowStorageDeviceTypeEnum > v9_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcElectricFlowStorageDevice > list;
 };
 /// An electric generator is an engine that is a machine for converting mechanical energy into electrical energy. 
 /// 
@@ -53586,21 +54097,20 @@ class IfcElectricFlowStorageDevice : public IfcFlowStorageDevice {
 class IfcElectricGenerator : public IfcEnergyConversionDevice {
 public:
     /// Whether the optional attribute PredefinedType is defined for this IfcElectricGenerator
-    bool hasPredefinedType();
-    IfcElectricGeneratorTypeEnum::IfcElectricGeneratorTypeEnum PredefinedType();
+    bool hasPredefinedType() const;
+    IfcElectricGeneratorTypeEnum::IfcElectricGeneratorTypeEnum PredefinedType() const;
     void setPredefinedType(IfcElectricGeneratorTypeEnum::IfcElectricGeneratorTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_ENUMERATION; } return IfcEnergyConversionDevice::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcElectricGeneratorTypeEnum; } return IfcEnergyConversionDevice::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "PredefinedType"; } return IfcEnergyConversionDevice::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcElectricGenerator (IfcAbstractEntityPtr e);
-    IfcElectricGenerator (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcElectricGeneratorTypeEnum::IfcElectricGeneratorTypeEnum > v9_PredefinedType);
-    typedef IfcElectricGenerator* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcElectricGenerator > > list;
-    typedef IfcTemplatedEntityList< IfcElectricGenerator >::it it;
+    IfcElectricGenerator (IfcAbstractEntity* e);
+    IfcElectricGenerator (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcElectricGeneratorTypeEnum::IfcElectricGeneratorTypeEnum > v9_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcElectricGenerator > list;
 };
 /// An electric motor is an engine that is a machine for converting electrical energy into mechanical energy. 
 /// 
@@ -53646,21 +54156,20 @@ class IfcElectricGenerator : public IfcEnergyConversionDevice {
 class IfcElectricMotor : public IfcEnergyConversionDevice {
 public:
     /// Whether the optional attribute PredefinedType is defined for this IfcElectricMotor
-    bool hasPredefinedType();
-    IfcElectricMotorTypeEnum::IfcElectricMotorTypeEnum PredefinedType();
+    bool hasPredefinedType() const;
+    IfcElectricMotorTypeEnum::IfcElectricMotorTypeEnum PredefinedType() const;
     void setPredefinedType(IfcElectricMotorTypeEnum::IfcElectricMotorTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_ENUMERATION; } return IfcEnergyConversionDevice::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcElectricMotorTypeEnum; } return IfcEnergyConversionDevice::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "PredefinedType"; } return IfcEnergyConversionDevice::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcElectricMotor (IfcAbstractEntityPtr e);
-    IfcElectricMotor (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcElectricMotorTypeEnum::IfcElectricMotorTypeEnum > v9_PredefinedType);
-    typedef IfcElectricMotor* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcElectricMotor > > list;
-    typedef IfcTemplatedEntityList< IfcElectricMotor >::it it;
+    IfcElectricMotor (IfcAbstractEntity* e);
+    IfcElectricMotor (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcElectricMotorTypeEnum::IfcElectricMotorTypeEnum > v9_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcElectricMotor > list;
 };
 /// An electric time control is a device that applies control to the provision or flow of electrical energy over time. 
 /// 
@@ -53706,21 +54215,20 @@ class IfcElectricMotor : public IfcEnergyConversionDevice {
 class IfcElectricTimeControl : public IfcFlowController {
 public:
     /// Whether the optional attribute PredefinedType is defined for this IfcElectricTimeControl
-    bool hasPredefinedType();
-    IfcElectricTimeControlTypeEnum::IfcElectricTimeControlTypeEnum PredefinedType();
+    bool hasPredefinedType() const;
+    IfcElectricTimeControlTypeEnum::IfcElectricTimeControlTypeEnum PredefinedType() const;
     void setPredefinedType(IfcElectricTimeControlTypeEnum::IfcElectricTimeControlTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_ENUMERATION; } return IfcFlowController::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcElectricTimeControlTypeEnum; } return IfcFlowController::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "PredefinedType"; } return IfcFlowController::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcElectricTimeControl (IfcAbstractEntityPtr e);
-    IfcElectricTimeControl (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcElectricTimeControlTypeEnum::IfcElectricTimeControlTypeEnum > v9_PredefinedType);
-    typedef IfcElectricTimeControl* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcElectricTimeControl > > list;
-    typedef IfcTemplatedEntityList< IfcElectricTimeControl >::it it;
+    IfcElectricTimeControl (IfcAbstractEntity* e);
+    IfcElectricTimeControl (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcElectricTimeControlTypeEnum::IfcElectricTimeControlTypeEnum > v9_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcElectricTimeControl > list;
 };
 /// A fan is a device which imparts mechanical work on a gas. A typical usage of a fan is to induce airflow in a building services air distribution system. 
 /// 
@@ -53779,21 +54287,20 @@ class IfcElectricTimeControl : public IfcFlowController {
 class IfcFan : public IfcFlowMovingDevice {
 public:
     /// Whether the optional attribute PredefinedType is defined for this IfcFan
-    bool hasPredefinedType();
-    IfcFanTypeEnum::IfcFanTypeEnum PredefinedType();
+    bool hasPredefinedType() const;
+    IfcFanTypeEnum::IfcFanTypeEnum PredefinedType() const;
     void setPredefinedType(IfcFanTypeEnum::IfcFanTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_ENUMERATION; } return IfcFlowMovingDevice::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcFanTypeEnum; } return IfcFlowMovingDevice::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "PredefinedType"; } return IfcFlowMovingDevice::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcFan (IfcAbstractEntityPtr e);
-    IfcFan (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcFanTypeEnum::IfcFanTypeEnum > v9_PredefinedType);
-    typedef IfcFan* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcFan > > list;
-    typedef IfcTemplatedEntityList< IfcFan >::it it;
+    IfcFan (IfcAbstractEntity* e);
+    IfcFan (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcFanTypeEnum::IfcFanTypeEnum > v9_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcFan > list;
 };
 /// A filter is an apparatus used to remove particulate or gaseous matter from fluids and gases. 
 /// 
@@ -53885,21 +54392,20 @@ class IfcFan : public IfcFlowMovingDevice {
 class IfcFilter : public IfcFlowTreatmentDevice {
 public:
     /// Whether the optional attribute PredefinedType is defined for this IfcFilter
-    bool hasPredefinedType();
-    IfcFilterTypeEnum::IfcFilterTypeEnum PredefinedType();
+    bool hasPredefinedType() const;
+    IfcFilterTypeEnum::IfcFilterTypeEnum PredefinedType() const;
     void setPredefinedType(IfcFilterTypeEnum::IfcFilterTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_ENUMERATION; } return IfcFlowTreatmentDevice::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcFilterTypeEnum; } return IfcFlowTreatmentDevice::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "PredefinedType"; } return IfcFlowTreatmentDevice::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcFilter (IfcAbstractEntityPtr e);
-    IfcFilter (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcFilterTypeEnum::IfcFilterTypeEnum > v9_PredefinedType);
-    typedef IfcFilter* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcFilter > > list;
-    typedef IfcTemplatedEntityList< IfcFilter >::it it;
+    IfcFilter (IfcAbstractEntity* e);
+    IfcFilter (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcFilterTypeEnum::IfcFilterTypeEnum > v9_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcFilter > list;
 };
 /// A fire suppression terminal has the purpose of delivering a fluid (gas or liquid) that will suppress a fire.
 /// A fire suppression terminal provides for all forms of sprinkler, spreader and other form of terminal that is connected to a pipework system and intended to act in the role of suppressing a fire. 
@@ -53970,21 +54476,20 @@ class IfcFilter : public IfcFlowTreatmentDevice {
 class IfcFireSuppressionTerminal : public IfcFlowTerminal {
 public:
     /// Whether the optional attribute PredefinedType is defined for this IfcFireSuppressionTerminal
-    bool hasPredefinedType();
-    IfcFireSuppressionTerminalTypeEnum::IfcFireSuppressionTerminalTypeEnum PredefinedType();
+    bool hasPredefinedType() const;
+    IfcFireSuppressionTerminalTypeEnum::IfcFireSuppressionTerminalTypeEnum PredefinedType() const;
     void setPredefinedType(IfcFireSuppressionTerminalTypeEnum::IfcFireSuppressionTerminalTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_ENUMERATION; } return IfcFlowTerminal::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcFireSuppressionTerminalTypeEnum; } return IfcFlowTerminal::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "PredefinedType"; } return IfcFlowTerminal::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcFireSuppressionTerminal (IfcAbstractEntityPtr e);
-    IfcFireSuppressionTerminal (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcFireSuppressionTerminalTypeEnum::IfcFireSuppressionTerminalTypeEnum > v9_PredefinedType);
-    typedef IfcFireSuppressionTerminal* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcFireSuppressionTerminal > > list;
-    typedef IfcTemplatedEntityList< IfcFireSuppressionTerminal >::it it;
+    IfcFireSuppressionTerminal (IfcAbstractEntity* e);
+    IfcFireSuppressionTerminal (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcFireSuppressionTerminalTypeEnum::IfcFireSuppressionTerminalTypeEnum > v9_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcFireSuppressionTerminal > list;
 };
 /// A flow instrument reads and displays the value of a particular property of a system at a point, or displays the difference in the value of a property between two points.
 ///   Instrumentation is typically for the purpose of determining the value of the property at a point in time. It is not the purpose of an instrument to record or integrate the values over time (although they may be connected to recording devices that do perform such a function). This entity provides for all forms of mechanical flow instrument (thermometers, pressure gauges etc.) and electrical flow instruments (ammeters, voltmeters etc.) 
@@ -54041,21 +54546,20 @@ class IfcFireSuppressionTerminal : public IfcFlowTerminal {
 class IfcFlowInstrument : public IfcDistributionControlElement {
 public:
     /// Whether the optional attribute PredefinedType is defined for this IfcFlowInstrument
-    bool hasPredefinedType();
-    IfcFlowInstrumentTypeEnum::IfcFlowInstrumentTypeEnum PredefinedType();
+    bool hasPredefinedType() const;
+    IfcFlowInstrumentTypeEnum::IfcFlowInstrumentTypeEnum PredefinedType() const;
     void setPredefinedType(IfcFlowInstrumentTypeEnum::IfcFlowInstrumentTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_ENUMERATION; } return IfcDistributionControlElement::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcFlowInstrumentTypeEnum; } return IfcDistributionControlElement::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "PredefinedType"; } return IfcDistributionControlElement::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcFlowInstrument (IfcAbstractEntityPtr e);
-    IfcFlowInstrument (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcFlowInstrumentTypeEnum::IfcFlowInstrumentTypeEnum > v9_PredefinedType);
-    typedef IfcFlowInstrument* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcFlowInstrument > > list;
-    typedef IfcTemplatedEntityList< IfcFlowInstrument >::it it;
+    IfcFlowInstrument (IfcAbstractEntity* e);
+    IfcFlowInstrument (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcFlowInstrumentTypeEnum::IfcFlowInstrumentTypeEnum > v9_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcFlowInstrument > list;
 };
 /// Entity Definition 
 /// 
@@ -54112,21 +54616,20 @@ class IfcFlowInstrument : public IfcDistributionControlElement {
 class IfcProtectiveDeviceTrippingUnit : public IfcDistributionControlElement {
 public:
     /// Whether the optional attribute PredefinedType is defined for this IfcProtectiveDeviceTrippingUnit
-    bool hasPredefinedType();
-    IfcProtectiveDeviceTrippingUnitTypeEnum::IfcProtectiveDeviceTrippingUnitTypeEnum PredefinedType();
+    bool hasPredefinedType() const;
+    IfcProtectiveDeviceTrippingUnitTypeEnum::IfcProtectiveDeviceTrippingUnitTypeEnum PredefinedType() const;
     void setPredefinedType(IfcProtectiveDeviceTrippingUnitTypeEnum::IfcProtectiveDeviceTrippingUnitTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_ENUMERATION; } return IfcDistributionControlElement::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcProtectiveDeviceTrippingUnitTypeEnum; } return IfcDistributionControlElement::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "PredefinedType"; } return IfcDistributionControlElement::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcProtectiveDeviceTrippingUnit (IfcAbstractEntityPtr e);
-    IfcProtectiveDeviceTrippingUnit (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcProtectiveDeviceTrippingUnitTypeEnum::IfcProtectiveDeviceTrippingUnitTypeEnum > v9_PredefinedType);
-    typedef IfcProtectiveDeviceTrippingUnit* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcProtectiveDeviceTrippingUnit > > list;
-    typedef IfcTemplatedEntityList< IfcProtectiveDeviceTrippingUnit >::it it;
+    IfcProtectiveDeviceTrippingUnit (IfcAbstractEntity* e);
+    IfcProtectiveDeviceTrippingUnit (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcProtectiveDeviceTrippingUnitTypeEnum::IfcProtectiveDeviceTrippingUnitTypeEnum > v9_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcProtectiveDeviceTrippingUnit > list;
 };
 /// A sensor is a device that measures a physical quantity and converts it into a signal which can be read by an observer or by an instrument. 
 /// 
@@ -54265,21 +54768,20 @@ class IfcProtectiveDeviceTrippingUnit : public IfcDistributionControlElement {
 class IfcSensor : public IfcDistributionControlElement {
 public:
     /// Whether the optional attribute PredefinedType is defined for this IfcSensor
-    bool hasPredefinedType();
-    IfcSensorTypeEnum::IfcSensorTypeEnum PredefinedType();
+    bool hasPredefinedType() const;
+    IfcSensorTypeEnum::IfcSensorTypeEnum PredefinedType() const;
     void setPredefinedType(IfcSensorTypeEnum::IfcSensorTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_ENUMERATION; } return IfcDistributionControlElement::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcSensorTypeEnum; } return IfcDistributionControlElement::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "PredefinedType"; } return IfcDistributionControlElement::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcSensor (IfcAbstractEntityPtr e);
-    IfcSensor (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcSensorTypeEnum::IfcSensorTypeEnum > v9_PredefinedType);
-    typedef IfcSensor* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcSensor > > list;
-    typedef IfcTemplatedEntityList< IfcSensor >::it it;
+    IfcSensor (IfcAbstractEntity* e);
+    IfcSensor (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcSensorTypeEnum::IfcSensorTypeEnum > v9_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcSensor > list;
 };
 /// A unitary control element combines a number of control components into a single product, such as a thermostat or humidistat.
 /// A unitary control element provides a housing for an aggregation of control or electrical distribution elements that, in combination, perform a singular (unitary) purpose. Each item in the aggregation may have its own geometric representation and location. 
@@ -54339,21 +54841,20 @@ class IfcSensor : public IfcDistributionControlElement {
 class IfcUnitaryControlElement : public IfcDistributionControlElement {
 public:
     /// Whether the optional attribute PredefinedType is defined for this IfcUnitaryControlElement
-    bool hasPredefinedType();
-    IfcUnitaryControlElementTypeEnum::IfcUnitaryControlElementTypeEnum PredefinedType();
+    bool hasPredefinedType() const;
+    IfcUnitaryControlElementTypeEnum::IfcUnitaryControlElementTypeEnum PredefinedType() const;
     void setPredefinedType(IfcUnitaryControlElementTypeEnum::IfcUnitaryControlElementTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_ENUMERATION; } return IfcDistributionControlElement::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcUnitaryControlElementTypeEnum; } return IfcDistributionControlElement::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "PredefinedType"; } return IfcDistributionControlElement::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcUnitaryControlElement (IfcAbstractEntityPtr e);
-    IfcUnitaryControlElement (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcUnitaryControlElementTypeEnum::IfcUnitaryControlElementTypeEnum > v9_PredefinedType);
-    typedef IfcUnitaryControlElement* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcUnitaryControlElement > > list;
-    typedef IfcTemplatedEntityList< IfcUnitaryControlElement >::it it;
+    IfcUnitaryControlElement (IfcAbstractEntity* e);
+    IfcUnitaryControlElement (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcUnitaryControlElementTypeEnum::IfcUnitaryControlElementTypeEnum > v9_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcUnitaryControlElement > list;
 };
 /// An actuator is a mechanical device for moving or controlling a mechanism or system. An actuator takes energy, usually created by air, electricity, or liquid, and converts that into some kind of motion. 
 /// 
@@ -54420,21 +54921,20 @@ class IfcUnitaryControlElement : public IfcDistributionControlElement {
 class IfcActuator : public IfcDistributionControlElement {
 public:
     /// Whether the optional attribute PredefinedType is defined for this IfcActuator
-    bool hasPredefinedType();
-    IfcActuatorTypeEnum::IfcActuatorTypeEnum PredefinedType();
+    bool hasPredefinedType() const;
+    IfcActuatorTypeEnum::IfcActuatorTypeEnum PredefinedType() const;
     void setPredefinedType(IfcActuatorTypeEnum::IfcActuatorTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_ENUMERATION; } return IfcDistributionControlElement::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcActuatorTypeEnum; } return IfcDistributionControlElement::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "PredefinedType"; } return IfcDistributionControlElement::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcActuator (IfcAbstractEntityPtr e);
-    IfcActuator (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcActuatorTypeEnum::IfcActuatorTypeEnum > v9_PredefinedType);
-    typedef IfcActuator* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcActuator > > list;
-    typedef IfcTemplatedEntityList< IfcActuator >::it it;
+    IfcActuator (IfcAbstractEntity* e);
+    IfcActuator (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcActuatorTypeEnum::IfcActuatorTypeEnum > v9_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcActuator > list;
 };
 /// An alarm is a device that signals the existence of a condition or situation that is outside the boundaries of normal expectation or that activates such a device.
 ///   Alarms include the provision of break glass buttons and manual pull boxes that are used to activate alarms. 
@@ -54481,21 +54981,20 @@ class IfcActuator : public IfcDistributionControlElement {
 class IfcAlarm : public IfcDistributionControlElement {
 public:
     /// Whether the optional attribute PredefinedType is defined for this IfcAlarm
-    bool hasPredefinedType();
-    IfcAlarmTypeEnum::IfcAlarmTypeEnum PredefinedType();
+    bool hasPredefinedType() const;
+    IfcAlarmTypeEnum::IfcAlarmTypeEnum PredefinedType() const;
     void setPredefinedType(IfcAlarmTypeEnum::IfcAlarmTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_ENUMERATION; } return IfcDistributionControlElement::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcAlarmTypeEnum; } return IfcDistributionControlElement::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "PredefinedType"; } return IfcDistributionControlElement::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcAlarm (IfcAbstractEntityPtr e);
-    IfcAlarm (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcAlarmTypeEnum::IfcAlarmTypeEnum > v9_PredefinedType);
-    typedef IfcAlarm* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcAlarm > > list;
-    typedef IfcTemplatedEntityList< IfcAlarm >::it it;
+    IfcAlarm (IfcAbstractEntity* e);
+    IfcAlarm (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcAlarmTypeEnum::IfcAlarmTypeEnum > v9_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcAlarm > list;
 };
 /// A controller is a device that monitors inputs and controls outputs within a building automation system.
 ///   A controller may be physical (having placement within a spatial structure) or logical (a software interface or aggregated within a programmable physical controller). 
@@ -54606,25 +55105,24 @@ class IfcAlarm : public IfcDistributionControlElement {
 class IfcController : public IfcDistributionControlElement {
 public:
     /// Whether the optional attribute PredefinedType is defined for this IfcController
-    bool hasPredefinedType();
-    IfcControllerTypeEnum::IfcControllerTypeEnum PredefinedType();
+    bool hasPredefinedType() const;
+    IfcControllerTypeEnum::IfcControllerTypeEnum PredefinedType() const;
     void setPredefinedType(IfcControllerTypeEnum::IfcControllerTypeEnum v);
     virtual unsigned int getArgumentCount() const { return 9; }
     virtual IfcUtil::ArgumentType getArgumentType(unsigned int i) const { switch (i) {case 8: return IfcUtil::Argument_ENUMERATION; } return IfcDistributionControlElement::getArgumentType(i); }
+    virtual Type::Enum getArgumentEntity(unsigned int i) const { switch (i) {case 8: return Type::IfcControllerTypeEnum; } return IfcDistributionControlElement::getArgumentEntity(i); }
     virtual const char* getArgumentName(unsigned int i) const { switch (i) {case 8: return "PredefinedType"; } return IfcDistributionControlElement::getArgumentName(i); }
-    virtual ArgumentPtr getArgument(unsigned int i) const { return entity->getArgument(i); }
+    virtual Argument* getArgument(unsigned int i) const { return entity->getArgument(i); }
     bool is(Type::Enum v) const;
     Type::Enum type() const;
     static Type::Enum Class();
-    IfcController (IfcAbstractEntityPtr e);
-    IfcController (IfcGloballyUniqueId v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< IfcLabel > v3_Name, boost::optional< IfcText > v4_Description, boost::optional< IfcLabel > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< IfcIdentifier > v8_Tag, boost::optional< IfcControllerTypeEnum::IfcControllerTypeEnum > v9_PredefinedType);
-    typedef IfcController* ptr;
-    typedef SHARED_PTR< IfcTemplatedEntityList< IfcController > > list;
-    typedef IfcTemplatedEntityList< IfcController >::it it;
+    IfcController (IfcAbstractEntity* e);
+    IfcController (std::string v1_GlobalId, IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, IfcObjectPlacement* v6_ObjectPlacement, IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag, boost::optional< IfcControllerTypeEnum::IfcControllerTypeEnum > v9_PredefinedType);
+    typedef IfcTemplatedEntityList< IfcController > list;
 };
 
 void InitStringMap();
-IfcUtil::IfcSchemaEntity SchemaEntity(IfcAbstractEntityPtr e = 0);
+IfcUtil::IfcBaseClass* SchemaEntity(IfcAbstractEntity* e = 0);
 }
 
 #endif
diff --git a/src/ifcparse/Ifc4enum.h b/src/ifcparse/Ifc4enum.h
index bde232b..d932ebd 100644
--- a/src/ifcparse/Ifc4enum.h
+++ b/src/ifcparse/Ifc4enum.h
@@ -33,7 +33,7 @@ namespace Ifc4 {
 
 namespace Type {
     typedef enum {
-        IfcAbsorbedDoseMeasure, IfcAccelerationMeasure, IfcActionRequest, IfcActionRequestTypeEnum, IfcActionSourceTypeEnum, IfcActionTypeEnum, IfcActor, IfcActorRole, IfcActorSelect, IfcActuator, IfcActuatorType, IfcActuatorTypeEnum, IfcAddress, IfcAddressTypeEnum, IfcAdvancedBrep, IfcAdvancedBrepWithVoids, IfcAdvancedFace, IfcAirTerminal, IfcAirTerminalBox, IfcAirTerminalBoxType, IfcAirTerminalBoxTypeEnum, IfcAirTerminalType, IfcAirTerminalTypeEnum, IfcAirToAirHeatRecovery, IfcAirToAirHeatRecoveryType, IfcAirToAirHeatRecoveryTypeEnum, IfcAlarm, IfcAlarmType, IfcAlarmTypeEnum, IfcAmountOfSubstanceMeasure, IfcAnalysisModelTypeEnum, IfcAnalysisTheoryTypeEnum, IfcAngularVelocityMeasure, IfcAnnotation, IfcAnnotationFillArea, IfcApplication, IfcAppliedValue, IfcAppliedValueSelect, IfcApproval, IfcApprovalRelationship, IfcArbitraryClosedProfileDef, IfcArbitraryOpenProfileDef, IfcArbitraryProfileDefWithVoids, IfcAreaDensityMeasure, IfcAreaMeasure, IfcArithmeticOperatorEnum, IfcAssemblyPlaceEnum, IfcAsset, IfcAsymmetricIShapeProfileDef, IfcAudioVisualAppliance, IfcAudioVisualApplianceType, IfcAudioVisualApplianceTypeEnum, IfcAxis1Placement, IfcAxis2Placement, IfcAxis2Placement2D, IfcAxis2Placement3D, IfcBSplineCurve, IfcBSplineCurveForm, IfcBSplineCurveWithKnots, IfcBSplineSurface, IfcBSplineSurfaceForm, IfcBSplineSurfaceWithKnots, IfcBeam, IfcBeamStandardCase, IfcBeamType, IfcBeamTypeEnum, IfcBenchmarkEnum, IfcBendingParameterSelect, IfcBlobTexture, IfcBlock, IfcBoiler, IfcBoilerType, IfcBoilerTypeEnum, IfcBoolean, IfcBooleanClippingResult, IfcBooleanOperand, IfcBooleanOperator, IfcBooleanResult, IfcBoundaryCondition, IfcBoundaryCurve, IfcBoundaryEdgeCondition, IfcBoundaryFaceCondition, IfcBoundaryNodeCondition, IfcBoundaryNodeConditionWarping, IfcBoundedCurve, IfcBoundedSurface, IfcBoundingBox, IfcBoxAlignment, IfcBoxedHalfSpace, IfcBuilding, IfcBuildingElement, IfcBuildingElementPart, IfcBuildingElementPartType, IfcBuildingElementPartTypeEnum, IfcBuildingElementProxy, IfcBuildingElementProxyType, IfcBuildingElementProxyTypeEnum, IfcBuildingElementType, IfcBuildingStorey, IfcBuildingSystem, IfcBuildingSystemTypeEnum, IfcBurner, IfcBurnerType, IfcBurnerTypeEnum, IfcCShapeProfileDef, IfcCableCarrierFitting, IfcCableCarrierFittingType, IfcCableCarrierFittingTypeEnum, IfcCableCarrierSegment, IfcCableCarrierSegmentType, IfcCableCarrierSegmentTypeEnum, IfcCableFitting, IfcCableFittingType, IfcCableFittingTypeEnum, IfcCableSegment, IfcCableSegmentType, IfcCableSegmentTypeEnum, IfcCardinalPointReference, IfcCartesianPoint, IfcCartesianPointList, IfcCartesianPointList3D, IfcCartesianTransformationOperator, IfcCartesianTransformationOperator2D, IfcCartesianTransformationOperator2DnonUniform, IfcCartesianTransformationOperator3D, IfcCartesianTransformationOperator3DnonUniform, IfcCenterLineProfileDef, IfcChangeActionEnum, IfcChiller, IfcChillerType, IfcChillerTypeEnum, IfcChimney, IfcChimneyType, IfcChimneyTypeEnum, IfcCircle, IfcCircleHollowProfileDef, IfcCircleProfileDef, IfcCivilElement, IfcCivilElementType, IfcClassification, IfcClassificationReference, IfcClassificationReferenceSelect, IfcClassificationSelect, IfcClosedShell, IfcCoil, IfcCoilType, IfcCoilTypeEnum, IfcColour, IfcColourOrFactor, IfcColourRgb, IfcColourRgbList, IfcColourSpecification, IfcColumn, IfcColumnStandardCase, IfcColumnType, IfcColumnTypeEnum, IfcCommunicationsAppliance, IfcCommunicationsApplianceType, IfcCommunicationsApplianceTypeEnum, IfcComplexNumber, IfcComplexProperty, IfcComplexPropertyTemplate, IfcComplexPropertyTemplateTypeEnum, IfcCompositeCurve, IfcCompositeCurveOnSurface, IfcCompositeCurveSegment, IfcCompositeProfileDef, IfcCompoundPlaneAngleMeasure, IfcCompressor, IfcCompressorType, IfcCompressorTypeEnum, IfcCondenser, IfcCondenserType, IfcCondenserTypeEnum, IfcConic, IfcConnectedFaceSet, IfcConnectionCurveGeometry, IfcConnectionGeometry, IfcConnectionPointEccentricity, IfcConnectionPointGeometry, IfcConnectionSurfaceGeometry, IfcConnectionTypeEnum, IfcConnectionVolumeGeometry, IfcConstraint, IfcConstraintEnum, IfcConstructionEquipmentResource, IfcConstructionEquipmentResourceType, IfcConstructionEquipmentResourceTypeEnum, IfcConstructionMaterialResource, IfcConstructionMaterialResourceType, IfcConstructionMaterialResourceTypeEnum, IfcConstructionProductResource, IfcConstructionProductResourceType, IfcConstructionProductResourceTypeEnum, IfcConstructionResource, IfcConstructionResourceType, IfcContext, IfcContextDependentMeasure, IfcContextDependentUnit, IfcControl, IfcController, IfcControllerType, IfcControllerTypeEnum, IfcConversionBasedUnit, IfcConversionBasedUnitWithOffset, IfcCooledBeam, IfcCooledBeamType, IfcCooledBeamTypeEnum, IfcCoolingTower, IfcCoolingTowerType, IfcCoolingTowerTypeEnum, IfcCoordinateOperation, IfcCoordinateReferenceSystem, IfcCoordinateReferenceSystemSelect, IfcCostItem, IfcCostItemTypeEnum, IfcCostSchedule, IfcCostScheduleTypeEnum, IfcCostValue, IfcCountMeasure, IfcCovering, IfcCoveringType, IfcCoveringTypeEnum, IfcCrewResource, IfcCrewResourceType, IfcCrewResourceTypeEnum, IfcCsgPrimitive3D, IfcCsgSelect, IfcCsgSolid, IfcCurrencyRelationship, IfcCurtainWall, IfcCurtainWallType, IfcCurtainWallTypeEnum, IfcCurvatureMeasure, IfcCurve, IfcCurveBoundedPlane, IfcCurveBoundedSurface, IfcCurveFontOrScaledCurveFontSelect, IfcCurveInterpolationEnum, IfcCurveOnSurface, IfcCurveOrEdgeCurve, IfcCurveStyle, IfcCurveStyleFont, IfcCurveStyleFontAndScaling, IfcCurveStyleFontPattern, IfcCurveStyleFontSelect, IfcCylindricalSurface, IfcDamper, IfcDamperType, IfcDamperTypeEnum, IfcDataOriginEnum, IfcDate, IfcDateTime, IfcDayInMonthNumber, IfcDayInWeekNumber, IfcDefinitionSelect, IfcDerivedMeasureValue, IfcDerivedProfileDef, IfcDerivedUnit, IfcDerivedUnitElement, IfcDerivedUnitEnum, IfcDescriptiveMeasure, IfcDimensionCount, IfcDimensionalExponents, IfcDirection, IfcDirectionSenseEnum, IfcDiscreteAccessory, IfcDiscreteAccessoryType, IfcDiscreteAccessoryTypeEnum, IfcDistributionChamberElement, IfcDistributionChamberElementType, IfcDistributionChamberElementTypeEnum, IfcDistributionCircuit, IfcDistributionControlElement, IfcDistributionControlElementType, IfcDistributionElement, IfcDistributionElementType, IfcDistributionFlowElement, IfcDistributionFlowElementType, IfcDistributionPort, IfcDistributionPortTypeEnum, IfcDistributionSystem, IfcDistributionSystemEnum, IfcDocumentConfidentialityEnum, IfcDocumentInformation, IfcDocumentInformationRelationship, IfcDocumentReference, IfcDocumentSelect, IfcDocumentStatusEnum, IfcDoor, IfcDoorLiningProperties, IfcDoorPanelOperationEnum, IfcDoorPanelPositionEnum, IfcDoorPanelProperties, IfcDoorStandardCase, IfcDoorStyle, IfcDoorStyleConstructionEnum, IfcDoorStyleOperationEnum, IfcDoorType, IfcDoorTypeEnum, IfcDoorTypeOperationEnum, IfcDoseEquivalentMeasure, IfcDraughtingPreDefinedColour, IfcDraughtingPreDefinedCurveFont, IfcDuctFitting, IfcDuctFittingType, IfcDuctFittingTypeEnum, IfcDuctSegment, IfcDuctSegmentType, IfcDuctSegmentTypeEnum, IfcDuctSilencer, IfcDuctSilencerType, IfcDuctSilencerTypeEnum, IfcDuration, IfcDynamicViscosityMeasure, IfcEdge, IfcEdgeCurve, IfcEdgeLoop, IfcElectricAppliance, IfcElectricApplianceType, IfcElectricApplianceTypeEnum, IfcElectricCapacitanceMeasure, IfcElectricChargeMeasure, IfcElectricConductanceMeasure, IfcElectricCurrentMeasure, IfcElectricDistributionBoard, IfcElectricDistributionBoardType, IfcElectricDistributionBoardTypeEnum, IfcElectricFlowStorageDevice, IfcElectricFlowStorageDeviceType, IfcElectricFlowStorageDeviceTypeEnum, IfcElectricGenerator, IfcElectricGeneratorType, IfcElectricGeneratorTypeEnum, IfcElectricMotor, IfcElectricMotorType, IfcElectricMotorTypeEnum, IfcElectricResistanceMeasure, IfcElectricTimeControl, IfcElectricTimeControlType, IfcElectricTimeControlTypeEnum, IfcElectricVoltageMeasure, IfcElement, IfcElementAssembly, IfcElementAssemblyType, IfcElementAssemblyTypeEnum, IfcElementComponent, IfcElementComponentType, IfcElementCompositionEnum, IfcElementQuantity, IfcElementType, IfcElementarySurface, IfcEllipse, IfcEllipseProfileDef, IfcEnergyConversionDevice, IfcEnergyConversionDeviceType, IfcEnergyMeasure, IfcEngine, IfcEngineType, IfcEngineTypeEnum, IfcEvaporativeCooler, IfcEvaporativeCoolerType, IfcEvaporativeCoolerTypeEnum, IfcEvaporator, IfcEvaporatorType, IfcEvaporatorTypeEnum, IfcEvent, IfcEventTime, IfcEventTriggerTypeEnum, IfcEventType, IfcEventTypeEnum, IfcExtendedProperties, IfcExternalInformation, IfcExternalReference, IfcExternalReferenceRelationship, IfcExternalSpatialElement, IfcExternalSpatialElementTypeEnum, IfcExternalSpatialStructureElement, IfcExternallyDefinedHatchStyle, IfcExternallyDefinedSurfaceStyle, IfcExternallyDefinedTextFont, IfcExtrudedAreaSolid, IfcExtrudedAreaSolidTapered, IfcFace, IfcFaceBasedSurfaceModel, IfcFaceBound, IfcFaceOuterBound, IfcFaceSurface, IfcFacetedBrep, IfcFacetedBrepWithVoids, IfcFailureConnectionCondition, IfcFan, IfcFanType, IfcFanTypeEnum, IfcFastener, IfcFastenerType, IfcFastenerTypeEnum, IfcFeatureElement, IfcFeatureElementAddition, IfcFeatureElementSubtraction, IfcFillAreaStyle, IfcFillAreaStyleHatching, IfcFillAreaStyleTiles, IfcFillStyleSelect, IfcFilter, IfcFilterType, IfcFilterTypeEnum, IfcFireSuppressionTerminal, IfcFireSuppressionTerminalType, IfcFireSuppressionTerminalTypeEnum, IfcFixedReferenceSweptAreaSolid, IfcFlowController, IfcFlowControllerType, IfcFlowDirectionEnum, IfcFlowFitting, IfcFlowFittingType, IfcFlowInstrument, IfcFlowInstrumentType, IfcFlowInstrumentTypeEnum, IfcFlowMeter, IfcFlowMeterType, IfcFlowMeterTypeEnum, IfcFlowMovingDevice, IfcFlowMovingDeviceType, IfcFlowSegment, IfcFlowSegmentType, IfcFlowStorageDevice, IfcFlowStorageDeviceType, IfcFlowTerminal, IfcFlowTerminalType, IfcFlowTreatmentDevice, IfcFlowTreatmentDeviceType, IfcFontStyle, IfcFontVariant, IfcFontWeight, IfcFooting, IfcFootingType, IfcFootingTypeEnum, IfcForceMeasure, IfcFrequencyMeasure, IfcFurnishingElement, IfcFurnishingElementType, IfcFurniture, IfcFurnitureType, IfcFurnitureTypeEnum, IfcGeographicElement, IfcGeographicElementType, IfcGeographicElementTypeEnum, IfcGeometricCurveSet, IfcGeometricProjectionEnum, IfcGeometricRepresentationContext, IfcGeometricRepresentationItem, IfcGeometricRepresentationSubContext, IfcGeometricSet, IfcGeometricSetSelect, IfcGlobalOrLocalEnum, IfcGloballyUniqueId, IfcGrid, IfcGridAxis, IfcGridPlacement, IfcGridPlacementDirectionSelect, IfcGridTypeEnum, IfcGroup, IfcHalfSpaceSolid, IfcHatchLineDistanceSelect, IfcHeatExchanger, IfcHeatExchangerType, IfcHeatExchangerTypeEnum, IfcHeatFluxDensityMeasure, IfcHeatingValueMeasure, IfcHumidifier, IfcHumidifierType, IfcHumidifierTypeEnum, IfcIShapeProfileDef, IfcIdentifier, IfcIlluminanceMeasure, IfcImageTexture, IfcIndexedColourMap, IfcIndexedTextureMap, IfcIndexedTriangleTextureMap, IfcInductanceMeasure, IfcInteger, IfcIntegerCountRateMeasure, IfcInterceptor, IfcInterceptorType, IfcInterceptorTypeEnum, IfcInternalOrExternalEnum, IfcInventory, IfcInventoryTypeEnum, IfcIonConcentrationMeasure, IfcIrregularTimeSeries, IfcIrregularTimeSeriesValue, IfcIsothermalMoistureCapacityMeasure, IfcJunctionBox, IfcJunctionBoxType, IfcJunctionBoxTypeEnum, IfcKinematicViscosityMeasure, IfcKnotType, IfcLShapeProfileDef, IfcLabel, IfcLaborResource, IfcLaborResourceType, IfcLaborResourceTypeEnum, IfcLagTime, IfcLamp, IfcLampType, IfcLampTypeEnum, IfcLanguageId, IfcLayerSetDirectionEnum, IfcLayeredItem, IfcLengthMeasure, IfcLibraryInformation, IfcLibraryReference, IfcLibrarySelect, IfcLightDistributionCurveEnum, IfcLightDistributionData, IfcLightDistributionDataSourceSelect, IfcLightEmissionSourceEnum, IfcLightFixture, IfcLightFixtureType, IfcLightFixtureTypeEnum, IfcLightIntensityDistribution, IfcLightSource, IfcLightSourceAmbient, IfcLightSourceDirectional, IfcLightSourceGoniometric, IfcLightSourcePositional, IfcLightSourceSpot, IfcLine, IfcLinearForceMeasure, IfcLinearMomentMeasure, IfcLinearStiffnessMeasure, IfcLinearVelocityMeasure, IfcLoadGroupTypeEnum, IfcLocalPlacement, IfcLogical, IfcLogicalOperatorEnum, IfcLoop, IfcLuminousFluxMeasure, IfcLuminousIntensityDistributionMeasure, IfcLuminousIntensityMeasure, IfcMagneticFluxDensityMeasure, IfcMagneticFluxMeasure, IfcManifoldSolidBrep, IfcMapConversion, IfcMappedItem, IfcMassDensityMeasure, IfcMassFlowRateMeasure, IfcMassMeasure, IfcMassPerLengthMeasure, IfcMaterial, IfcMaterialClassificationRelationship, IfcMaterialConstituent, IfcMaterialConstituentSet, IfcMaterialDefinition, IfcMaterialDefinitionRepresentation, IfcMaterialLayer, IfcMaterialLayerSet, IfcMaterialLayerSetUsage, IfcMaterialLayerWithOffsets, IfcMaterialList, IfcMaterialProfile, IfcMaterialProfileSet, IfcMaterialProfileSetUsage, IfcMaterialProfileSetUsageTapering, IfcMaterialProfileWithOffsets, IfcMaterialProperties, IfcMaterialRelationship, IfcMaterialSelect, IfcMaterialUsageDefinition, IfcMeasureValue, IfcMeasureWithUnit, IfcMechanicalFastener, IfcMechanicalFastenerType, IfcMechanicalFastenerTypeEnum, IfcMedicalDevice, IfcMedicalDeviceType, IfcMedicalDeviceTypeEnum, IfcMember, IfcMemberStandardCase, IfcMemberType, IfcMemberTypeEnum, IfcMetric, IfcMetricValueSelect, IfcMirroredProfileDef, IfcModulusOfElasticityMeasure, IfcModulusOfLinearSubgradeReactionMeasure, IfcModulusOfRotationalSubgradeReactionMeasure, IfcModulusOfRotationalSubgradeReactionSelect, IfcModulusOfSubgradeReactionMeasure, IfcModulusOfSubgradeReactionSelect, IfcModulusOfTranslationalSubgradeReactionSelect, IfcMoistureDiffusivityMeasure, IfcMolecularWeightMeasure, IfcMomentOfInertiaMeasure, IfcMonetaryMeasure, IfcMonetaryUnit, IfcMonthInYearNumber, IfcMotorConnection, IfcMotorConnectionType, IfcMotorConnectionTypeEnum, IfcNamedUnit, IfcNonNegativeLengthMeasure, IfcNormalisedRatioMeasure, IfcNullStyle, IfcNumericMeasure, IfcObject, IfcObjectDefinition, IfcObjectPlacement, IfcObjectReferenceSelect, IfcObjectTypeEnum, IfcObjective, IfcObjectiveEnum, IfcOccupant, IfcOccupantTypeEnum, IfcOffsetCurve2D, IfcOffsetCurve3D, IfcOpenShell, IfcOpeningElement, IfcOpeningElementTypeEnum, IfcOpeningStandardCase, IfcOrganization, IfcOrganizationRelationship, IfcOrientedEdge, IfcOuterBoundaryCurve, IfcOutlet, IfcOutletType, IfcOutletTypeEnum, IfcOwnerHistory, IfcPHMeasure, IfcParameterValue, IfcParameterizedProfileDef, IfcPath, IfcPcurve, IfcPerformanceHistory, IfcPerformanceHistoryTypeEnum, IfcPermeableCoveringOperationEnum, IfcPermeableCoveringProperties, IfcPermit, IfcPermitTypeEnum, IfcPerson, IfcPersonAndOrganization, IfcPhysicalComplexQuantity, IfcPhysicalOrVirtualEnum, IfcPhysicalQuantity, IfcPhysicalSimpleQuantity, IfcPile, IfcPileConstructionEnum, IfcPileType, IfcPileTypeEnum, IfcPipeFitting, IfcPipeFittingType, IfcPipeFittingTypeEnum, IfcPipeSegment, IfcPipeSegmentType, IfcPipeSegmentTypeEnum, IfcPixelTexture, IfcPlacement, IfcPlanarBox, IfcPlanarExtent, IfcPlanarForceMeasure, IfcPlane, IfcPlaneAngleMeasure, IfcPlate, IfcPlateStandardCase, IfcPlateType, IfcPlateTypeEnum, IfcPoint, IfcPointOnCurve, IfcPointOnSurface, IfcPointOrVertexPoint, IfcPolyLoop, IfcPolygonalBoundedHalfSpace, IfcPolyline, IfcPort, IfcPositiveLengthMeasure, IfcPositivePlaneAngleMeasure, IfcPositiveRatioMeasure, IfcPostalAddress, IfcPowerMeasure, IfcPreDefinedColour, IfcPreDefinedCurveFont, IfcPreDefinedItem, IfcPreDefinedProperties, IfcPreDefinedPropertySet, IfcPreDefinedTextFont, IfcPresentableText, IfcPresentationItem, IfcPresentationLayerAssignment, IfcPresentationLayerWithStyle, IfcPresentationStyle, IfcPresentationStyleAssignment, IfcPresentationStyleSelect, IfcPressureMeasure, IfcProcedure, IfcProcedureType, IfcProcedureTypeEnum, IfcProcess, IfcProcessSelect, IfcProduct, IfcProductDefinitionShape, IfcProductRepresentation, IfcProductRepresentationSelect, IfcProductSelect, IfcProfileDef, IfcProfileProperties, IfcProfileTypeEnum, IfcProject, IfcProjectLibrary, IfcProjectOrder, IfcProjectOrderTypeEnum, IfcProjectedCRS, IfcProjectedOrTrueLengthEnum, IfcProjectionElement, IfcProjectionElementTypeEnum, IfcProperty, IfcPropertyAbstraction, IfcPropertyBoundedValue, IfcPropertyDefinition, IfcPropertyDependencyRelationship, IfcPropertyEnumeratedValue, IfcPropertyEnumeration, IfcPropertyListValue, IfcPropertyReferenceValue, IfcPropertySet, IfcPropertySetDefinition, IfcPropertySetDefinitionSelect, IfcPropertySetDefinitionSet, IfcPropertySetTemplate, IfcPropertySetTemplateTypeEnum, IfcPropertySingleValue, IfcPropertyTableValue, IfcPropertyTemplate, IfcPropertyTemplateDefinition, IfcProtectiveDevice, IfcProtectiveDeviceTrippingUnit, IfcProtectiveDeviceTrippingUnitType, IfcProtectiveDeviceTrippingUnitTypeEnum, IfcProtectiveDeviceType, IfcProtectiveDeviceTypeEnum, IfcProxy, IfcPump, IfcPumpType, IfcPumpTypeEnum, IfcQuantityArea, IfcQuantityCount, IfcQuantityLength, IfcQuantitySet, IfcQuantityTime, IfcQuantityVolume, IfcQuantityWeight, IfcRadioActivityMeasure, IfcRailing, IfcRailingType, IfcRailingTypeEnum, IfcRamp, IfcRampFlight, IfcRampFlightType, IfcRampFlightTypeEnum, IfcRampType, IfcRampTypeEnum, IfcRatioMeasure, IfcRationalBSplineCurveWithKnots, IfcRationalBSplineSurfaceWithKnots, IfcReal, IfcRectangleHollowProfileDef, IfcRectangleProfileDef, IfcRectangularPyramid, IfcRectangularTrimmedSurface, IfcRecurrencePattern, IfcRecurrenceTypeEnum, IfcReference, IfcReflectanceMethodEnum, IfcRegularTimeSeries, IfcReinforcementBarProperties, IfcReinforcementDefinitionProperties, IfcReinforcingBar, IfcReinforcingBarRoleEnum, IfcReinforcingBarSurfaceEnum, IfcReinforcingBarType, IfcReinforcingBarTypeEnum, IfcReinforcingElement, IfcReinforcingElementType, IfcReinforcingMesh, IfcReinforcingMeshType, IfcReinforcingMeshTypeEnum, IfcRelAggregates, IfcRelAssigns, IfcRelAssignsToActor, IfcRelAssignsToControl, IfcRelAssignsToGroup, IfcRelAssignsToGroupByFactor, IfcRelAssignsToProcess, IfcRelAssignsToProduct, IfcRelAssignsToResource, IfcRelAssociates, IfcRelAssociatesApproval, IfcRelAssociatesClassification, IfcRelAssociatesConstraint, IfcRelAssociatesDocument, IfcRelAssociatesLibrary, IfcRelAssociatesMaterial, IfcRelConnects, IfcRelConnectsElements, IfcRelConnectsPathElements, IfcRelConnectsPortToElement, IfcRelConnectsPorts, IfcRelConnectsStructuralActivity, IfcRelConnectsStructuralMember, IfcRelConnectsWithEccentricity, IfcRelConnectsWithRealizingElements, IfcRelContainedInSpatialStructure, IfcRelCoversBldgElements, IfcRelCoversSpaces, IfcRelDeclares, IfcRelDecomposes, IfcRelDefines, IfcRelDefinesByObject, IfcRelDefinesByProperties, IfcRelDefinesByTemplate, IfcRelDefinesByType, IfcRelFillsElement, IfcRelFlowControlElements, IfcRelInterferesElements, IfcRelNests, IfcRelProjectsElement, IfcRelReferencedInSpatialStructure, IfcRelSequence, IfcRelServicesBuildings, IfcRelSpaceBoundary, IfcRelSpaceBoundary1stLevel, IfcRelSpaceBoundary2ndLevel, IfcRelVoidsElement, IfcRelationship, IfcReparametrisedCompositeCurveSegment, IfcRepresentation, IfcRepresentationContext, IfcRepresentationItem, IfcRepresentationMap, IfcResource, IfcResourceApprovalRelationship, IfcResourceConstraintRelationship, IfcResourceLevelRelationship, IfcResourceObjectSelect, IfcResourceSelect, IfcResourceTime, IfcRevolvedAreaSolid, IfcRevolvedAreaSolidTapered, IfcRightCircularCone, IfcRightCircularCylinder, IfcRoleEnum, IfcRoof, IfcRoofType, IfcRoofTypeEnum, IfcRoot, IfcRotationalFrequencyMeasure, IfcRotationalMassMeasure, IfcRotationalStiffnessMeasure, IfcRotationalStiffnessSelect, IfcRoundedRectangleProfileDef, IfcSIPrefix, IfcSIUnit, IfcSIUnitName, IfcSanitaryTerminal, IfcSanitaryTerminalType, IfcSanitaryTerminalTypeEnum, IfcSchedulingTime, IfcSectionModulusMeasure, IfcSectionProperties, IfcSectionReinforcementProperties, IfcSectionTypeEnum, IfcSectionalAreaIntegralMeasure, IfcSectionedSpine, IfcSensor, IfcSensorType, IfcSensorTypeEnum, IfcSequenceEnum, IfcShadingDevice, IfcShadingDeviceType, IfcShadingDeviceTypeEnum, IfcShapeAspect, IfcShapeModel, IfcShapeRepresentation, IfcShearModulusMeasure, IfcShell, IfcShellBasedSurfaceModel, IfcSimpleProperty, IfcSimplePropertyTemplate, IfcSimplePropertyTemplateTypeEnum, IfcSimpleValue, IfcSite, IfcSizeSelect, IfcSlab, IfcSlabElementedCase, IfcSlabStandardCase, IfcSlabType, IfcSlabTypeEnum, IfcSlippageConnectionCondition, IfcSolarDevice, IfcSolarDeviceType, IfcSolarDeviceTypeEnum, IfcSolidAngleMeasure, IfcSolidModel, IfcSolidOrShell, IfcSoundPowerLevelMeasure, IfcSoundPowerMeasure, IfcSoundPressureLevelMeasure, IfcSoundPressureMeasure, IfcSpace, IfcSpaceBoundarySelect, IfcSpaceHeater, IfcSpaceHeaterType, IfcSpaceHeaterTypeEnum, IfcSpaceType, IfcSpaceTypeEnum, IfcSpatialElement, IfcSpatialElementType, IfcSpatialStructureElement, IfcSpatialStructureElementType, IfcSpatialZone, IfcSpatialZoneType, IfcSpatialZoneTypeEnum, IfcSpecificHeatCapacityMeasure, IfcSpecularExponent, IfcSpecularHighlightSelect, IfcSpecularRoughness, IfcSphere, IfcStackTerminal, IfcStackTerminalType, IfcStackTerminalTypeEnum, IfcStair, IfcStairFlight, IfcStairFlightType, IfcStairFlightTypeEnum, IfcStairType, IfcStairTypeEnum, IfcStateEnum, IfcStructuralAction, IfcStructuralActivity, IfcStructuralActivityAssignmentSelect, IfcStructuralAnalysisModel, IfcStructuralConnection, IfcStructuralConnectionCondition, IfcStructuralCurveAction, IfcStructuralCurveActivityTypeEnum, IfcStructuralCurveConnection, IfcStructuralCurveMember, IfcStructuralCurveMemberTypeEnum, IfcStructuralCurveMemberVarying, IfcStructuralCurveReaction, IfcStructuralItem, IfcStructuralLinearAction, IfcStructuralLoad, IfcStructuralLoadCase, IfcStructuralLoadConfiguration, IfcStructuralLoadGroup, IfcStructuralLoadLinearForce, IfcStructuralLoadOrResult, IfcStructuralLoadPlanarForce, IfcStructuralLoadSingleDisplacement, IfcStructuralLoadSingleDisplacementDistortion, IfcStructuralLoadSingleForce, IfcStructuralLoadSingleForceWarping, IfcStructuralLoadStatic, IfcStructuralLoadTemperature, IfcStructuralMember, IfcStructuralPlanarAction, IfcStructuralPointAction, IfcStructuralPointConnection, IfcStructuralPointReaction, IfcStructuralReaction, IfcStructuralResultGroup, IfcStructuralSurfaceAction, IfcStructuralSurfaceActivityTypeEnum, IfcStructuralSurfaceConnection, IfcStructuralSurfaceMember, IfcStructuralSurfaceMemberTypeEnum, IfcStructuralSurfaceMemberVarying, IfcStructuralSurfaceReaction, IfcStyleAssignmentSelect, IfcStyleModel, IfcStyledItem, IfcStyledRepresentation, IfcSubContractResource, IfcSubContractResourceType, IfcSubContractResourceTypeEnum, IfcSubedge, IfcSurface, IfcSurfaceCurveSweptAreaSolid, IfcSurfaceFeature, IfcSurfaceFeatureTypeEnum, IfcSurfaceOfLinearExtrusion, IfcSurfaceOfRevolution, IfcSurfaceOrFaceSurface, IfcSurfaceReinforcementArea, IfcSurfaceSide, IfcSurfaceStyle, IfcSurfaceStyleElementSelect, IfcSurfaceStyleLighting, IfcSurfaceStyleRefraction, IfcSurfaceStyleRendering, IfcSurfaceStyleShading, IfcSurfaceStyleWithTextures, IfcSurfaceTexture, IfcSweptAreaSolid, IfcSweptDiskSolid, IfcSweptDiskSolidPolygonal, IfcSweptSurface, IfcSwitchingDevice, IfcSwitchingDeviceType, IfcSwitchingDeviceTypeEnum, IfcSystem, IfcSystemFurnitureElement, IfcSystemFurnitureElementType, IfcSystemFurnitureElementTypeEnum, IfcTShapeProfileDef, IfcTable, IfcTableColumn, IfcTableRow, IfcTank, IfcTankType, IfcTankTypeEnum, IfcTask, IfcTaskDurationEnum, IfcTaskTime, IfcTaskTimeRecurring, IfcTaskType, IfcTaskTypeEnum, IfcTelecomAddress, IfcTemperatureGradientMeasure, IfcTemperatureRateOfChangeMeasure, IfcTendon, IfcTendonAnchor, IfcTendonAnchorType, IfcTendonAnchorTypeEnum, IfcTendonType, IfcTendonTypeEnum, IfcTessellatedFaceSet, IfcTessellatedItem, IfcText, IfcTextAlignment, IfcTextDecoration, IfcTextFontName, IfcTextFontSelect, IfcTextLiteral, IfcTextLiteralWithExtent, IfcTextPath, IfcTextStyle, IfcTextStyleFontModel, IfcTextStyleForDefinedFont, IfcTextStyleTextModel, IfcTextTransformation, IfcTextureCoordinate, IfcTextureCoordinateGenerator, IfcTextureMap, IfcTextureVertex, IfcTextureVertexList, IfcThermalAdmittanceMeasure, IfcThermalConductivityMeasure, IfcThermalExpansionCoefficientMeasure, IfcThermalResistanceMeasure, IfcThermalTransmittanceMeasure, IfcThermodynamicTemperatureMeasure, IfcTime, IfcTimeMeasure, IfcTimeOrRatioSelect, IfcTimePeriod, IfcTimeSeries, IfcTimeSeriesDataTypeEnum, IfcTimeSeriesValue, IfcTimeStamp, IfcTopologicalRepresentationItem, IfcTopologyRepresentation, IfcTorqueMeasure, IfcTransformer, IfcTransformerType, IfcTransformerTypeEnum, IfcTransitionCode, IfcTranslationalStiffnessSelect, IfcTransportElement, IfcTransportElementType, IfcTransportElementTypeEnum, IfcTrapeziumProfileDef, IfcTriangulatedFaceSet, IfcTrimmedCurve, IfcTrimmingPreference, IfcTrimmingSelect, IfcTubeBundle, IfcTubeBundleType, IfcTubeBundleTypeEnum, IfcTypeObject, IfcTypeProcess, IfcTypeProduct, IfcTypeResource, IfcURIReference, IfcUShapeProfileDef, IfcUnit, IfcUnitAssignment, IfcUnitEnum, IfcUnitaryControlElement, IfcUnitaryControlElementType, IfcUnitaryControlElementTypeEnum, IfcUnitaryEquipment, IfcUnitaryEquipmentType, IfcUnitaryEquipmentTypeEnum, IfcValue, IfcValve, IfcValveType, IfcValveTypeEnum, IfcVaporPermeabilityMeasure, IfcVector, IfcVectorOrDirection, IfcVertex, IfcVertexLoop, IfcVertexPoint, IfcVibrationIsolator, IfcVibrationIsolatorType, IfcVibrationIsolatorTypeEnum, IfcVirtualElement, IfcVirtualGridIntersection, IfcVoidingFeature, IfcVoidingFeatureTypeEnum, IfcVolumeMeasure, IfcVolumetricFlowRateMeasure, IfcWall, IfcWallElementedCase, IfcWallStandardCase, IfcWallType, IfcWallTypeEnum, IfcWarpingConstantMeasure, IfcWarpingMomentMeasure, IfcWarpingStiffnessSelect, IfcWasteTerminal, IfcWasteTerminalType, IfcWasteTerminalTypeEnum, IfcWindow, IfcWindowLiningProperties, IfcWindowPanelOperationEnum, IfcWindowPanelPositionEnum, IfcWindowPanelProperties, IfcWindowStandardCase, IfcWindowStyle, IfcWindowStyleConstructionEnum, IfcWindowStyleOperationEnum, IfcWindowType, IfcWindowTypeEnum, IfcWindowTypePartitioningEnum, IfcWorkCalendar, IfcWorkCalendarTypeEnum, IfcWorkControl, IfcWorkPlan, IfcWorkPlanTypeEnum, IfcWorkSchedule, IfcWorkScheduleTypeEnum, IfcWorkTime, IfcZShapeProfileDef, IfcZone, ALL
+        IfcAbsorbedDoseMeasure, IfcAccelerationMeasure, IfcActionRequest, IfcActionRequestTypeEnum, IfcActionSourceTypeEnum, IfcActionTypeEnum, IfcActor, IfcActorRole, IfcActorSelect, IfcActuator, IfcActuatorType, IfcActuatorTypeEnum, IfcAddress, IfcAddressTypeEnum, IfcAdvancedBrep, IfcAdvancedBrepWithVoids, IfcAdvancedFace, IfcAirTerminal, IfcAirTerminalBox, IfcAirTerminalBoxType, IfcAirTerminalBoxTypeEnum, IfcAirTerminalType, IfcAirTerminalTypeEnum, IfcAirToAirHeatRecovery, IfcAirToAirHeatRecoveryType, IfcAirToAirHeatRecoveryTypeEnum, IfcAlarm, IfcAlarmType, IfcAlarmTypeEnum, IfcAmountOfSubstanceMeasure, IfcAnalysisModelTypeEnum, IfcAnalysisTheoryTypeEnum, IfcAngularVelocityMeasure, IfcAnnotation, IfcAnnotationFillArea, IfcApplication, IfcAppliedValue, IfcAppliedValueSelect, IfcApproval, IfcApprovalRelationship, IfcArbitraryClosedProfileDef, IfcArbitraryOpenProfileDef, IfcArbitraryProfileDefWithVoids, IfcAreaDensityMeasure, IfcAreaMeasure, IfcArithmeticOperatorEnum, IfcAssemblyPlaceEnum, IfcAsset, IfcAsymmetricIShapeProfileDef, IfcAudioVisualAppliance, IfcAudioVisualApplianceType, IfcAudioVisualApplianceTypeEnum, IfcAxis1Placement, IfcAxis2Placement, IfcAxis2Placement2D, IfcAxis2Placement3D, IfcBSplineCurve, IfcBSplineCurveForm, IfcBSplineCurveWithKnots, IfcBSplineSurface, IfcBSplineSurfaceForm, IfcBSplineSurfaceWithKnots, IfcBeam, IfcBeamStandardCase, IfcBeamType, IfcBeamTypeEnum, IfcBenchmarkEnum, IfcBendingParameterSelect, IfcBlobTexture, IfcBlock, IfcBoiler, IfcBoilerType, IfcBoilerTypeEnum, IfcBoolean, IfcBooleanClippingResult, IfcBooleanOperand, IfcBooleanOperator, IfcBooleanResult, IfcBoundaryCondition, IfcBoundaryCurve, IfcBoundaryEdgeCondition, IfcBoundaryFaceCondition, IfcBoundaryNodeCondition, IfcBoundaryNodeConditionWarping, IfcBoundedCurve, IfcBoundedSurface, IfcBoundingBox, IfcBoxAlignment, IfcBoxedHalfSpace, IfcBuilding, IfcBuildingElement, IfcBuildingElementPart, IfcBuildingElementPartType, IfcBuildingElementPartTypeEnum, IfcBuildingElementProxy, IfcBuildingElementProxyType, IfcBuildingElementProxyTypeEnum, IfcBuildingElementType, IfcBuildingStorey, IfcBuildingSystem, IfcBuildingSystemTypeEnum, IfcBurner, IfcBurnerType, IfcBurnerTypeEnum, IfcCShapeProfileDef, IfcCableCarrierFitting, IfcCableCarrierFittingType, IfcCableCarrierFittingTypeEnum, IfcCableCarrierSegment, IfcCableCarrierSegmentType, IfcCableCarrierSegmentTypeEnum, IfcCableFitting, IfcCableFittingType, IfcCableFittingTypeEnum, IfcCableSegment, IfcCableSegmentType, IfcCableSegmentTypeEnum, IfcCardinalPointReference, IfcCartesianPoint, IfcCartesianPointList, IfcCartesianPointList3D, IfcCartesianTransformationOperator, IfcCartesianTransformationOperator2D, IfcCartesianTransformationOperator2DnonUniform, IfcCartesianTransformationOperator3D, IfcCartesianTransformationOperator3DnonUniform, IfcCenterLineProfileDef, IfcChangeActionEnum, IfcChiller, IfcChillerType, IfcChillerTypeEnum, IfcChimney, IfcChimneyType, IfcChimneyTypeEnum, IfcCircle, IfcCircleHollowProfileDef, IfcCircleProfileDef, IfcCivilElement, IfcCivilElementType, IfcClassification, IfcClassificationReference, IfcClassificationReferenceSelect, IfcClassificationSelect, IfcClosedShell, IfcCoil, IfcCoilType, IfcCoilTypeEnum, IfcColour, IfcColourOrFactor, IfcColourRgb, IfcColourRgbList, IfcColourSpecification, IfcColumn, IfcColumnStandardCase, IfcColumnType, IfcColumnTypeEnum, IfcCommunicationsAppliance, IfcCommunicationsApplianceType, IfcCommunicationsApplianceTypeEnum, IfcComplexNumber, IfcComplexProperty, IfcComplexPropertyTemplate, IfcComplexPropertyTemplateTypeEnum, IfcCompositeCurve, IfcCompositeCurveOnSurface, IfcCompositeCurveSegment, IfcCompositeProfileDef, IfcCompoundPlaneAngleMeasure, IfcCompressor, IfcCompressorType, IfcCompressorTypeEnum, IfcCondenser, IfcCondenserType, IfcCondenserTypeEnum, IfcConic, IfcConnectedFaceSet, IfcConnectionCurveGeometry, IfcConnectionGeometry, IfcConnectionPointEccentricity, IfcConnectionPointGeometry, IfcConnectionSurfaceGeometry, IfcConnectionTypeEnum, IfcConnectionVolumeGeometry, IfcConstraint, IfcConstraintEnum, IfcConstructionEquipmentResource, IfcConstructionEquipmentResourceType, IfcConstructionEquipmentResourceTypeEnum, IfcConstructionMaterialResource, IfcConstructionMaterialResourceType, IfcConstructionMaterialResourceTypeEnum, IfcConstructionProductResource, IfcConstructionProductResourceType, IfcConstructionProductResourceTypeEnum, IfcConstructionResource, IfcConstructionResourceType, IfcContext, IfcContextDependentMeasure, IfcContextDependentUnit, IfcControl, IfcController, IfcControllerType, IfcControllerTypeEnum, IfcConversionBasedUnit, IfcConversionBasedUnitWithOffset, IfcCooledBeam, IfcCooledBeamType, IfcCooledBeamTypeEnum, IfcCoolingTower, IfcCoolingTowerType, IfcCoolingTowerTypeEnum, IfcCoordinateOperation, IfcCoordinateReferenceSystem, IfcCoordinateReferenceSystemSelect, IfcCostItem, IfcCostItemTypeEnum, IfcCostSchedule, IfcCostScheduleTypeEnum, IfcCostValue, IfcCountMeasure, IfcCovering, IfcCoveringType, IfcCoveringTypeEnum, IfcCrewResource, IfcCrewResourceType, IfcCrewResourceTypeEnum, IfcCsgPrimitive3D, IfcCsgSelect, IfcCsgSolid, IfcCurrencyRelationship, IfcCurtainWall, IfcCurtainWallType, IfcCurtainWallTypeEnum, IfcCurvatureMeasure, IfcCurve, IfcCurveBoundedPlane, IfcCurveBoundedSurface, IfcCurveFontOrScaledCurveFontSelect, IfcCurveInterpolationEnum, IfcCurveOnSurface, IfcCurveOrEdgeCurve, IfcCurveStyle, IfcCurveStyleFont, IfcCurveStyleFontAndScaling, IfcCurveStyleFontPattern, IfcCurveStyleFontSelect, IfcCylindricalSurface, IfcDamper, IfcDamperType, IfcDamperTypeEnum, IfcDataOriginEnum, IfcDate, IfcDateTime, IfcDayInMonthNumber, IfcDayInWeekNumber, IfcDefinitionSelect, IfcDerivedMeasureValue, IfcDerivedProfileDef, IfcDerivedUnit, IfcDerivedUnitElement, IfcDerivedUnitEnum, IfcDescriptiveMeasure, IfcDimensionCount, IfcDimensionalExponents, IfcDirection, IfcDirectionSenseEnum, IfcDiscreteAccessory, IfcDiscreteAccessoryType, IfcDiscreteAccessoryTypeEnum, IfcDistributionChamberElement, IfcDistributionChamberElementType, IfcDistributionChamberElementTypeEnum, IfcDistributionCircuit, IfcDistributionControlElement, IfcDistributionControlElementType, IfcDistributionElement, IfcDistributionElementType, IfcDistributionFlowElement, IfcDistributionFlowElementType, IfcDistributionPort, IfcDistributionPortTypeEnum, IfcDistributionSystem, IfcDistributionSystemEnum, IfcDocumentConfidentialityEnum, IfcDocumentInformation, IfcDocumentInformationRelationship, IfcDocumentReference, IfcDocumentSelect, IfcDocumentStatusEnum, IfcDoor, IfcDoorLiningProperties, IfcDoorPanelOperationEnum, IfcDoorPanelPositionEnum, IfcDoorPanelProperties, IfcDoorStandardCase, IfcDoorStyle, IfcDoorStyleConstructionEnum, IfcDoorStyleOperationEnum, IfcDoorType, IfcDoorTypeEnum, IfcDoorTypeOperationEnum, IfcDoseEquivalentMeasure, IfcDraughtingPreDefinedColour, IfcDraughtingPreDefinedCurveFont, IfcDuctFitting, IfcDuctFittingType, IfcDuctFittingTypeEnum, IfcDuctSegment, IfcDuctSegmentType, IfcDuctSegmentTypeEnum, IfcDuctSilencer, IfcDuctSilencerType, IfcDuctSilencerTypeEnum, IfcDuration, IfcDynamicViscosityMeasure, IfcEdge, IfcEdgeCurve, IfcEdgeLoop, IfcElectricAppliance, IfcElectricApplianceType, IfcElectricApplianceTypeEnum, IfcElectricCapacitanceMeasure, IfcElectricChargeMeasure, IfcElectricConductanceMeasure, IfcElectricCurrentMeasure, IfcElectricDistributionBoard, IfcElectricDistributionBoardType, IfcElectricDistributionBoardTypeEnum, IfcElectricFlowStorageDevice, IfcElectricFlowStorageDeviceType, IfcElectricFlowStorageDeviceTypeEnum, IfcElectricGenerator, IfcElectricGeneratorType, IfcElectricGeneratorTypeEnum, IfcElectricMotor, IfcElectricMotorType, IfcElectricMotorTypeEnum, IfcElectricResistanceMeasure, IfcElectricTimeControl, IfcElectricTimeControlType, IfcElectricTimeControlTypeEnum, IfcElectricVoltageMeasure, IfcElement, IfcElementAssembly, IfcElementAssemblyType, IfcElementAssemblyTypeEnum, IfcElementComponent, IfcElementComponentType, IfcElementCompositionEnum, IfcElementQuantity, IfcElementType, IfcElementarySurface, IfcEllipse, IfcEllipseProfileDef, IfcEnergyConversionDevice, IfcEnergyConversionDeviceType, IfcEnergyMeasure, IfcEngine, IfcEngineType, IfcEngineTypeEnum, IfcEvaporativeCooler, IfcEvaporativeCoolerType, IfcEvaporativeCoolerTypeEnum, IfcEvaporator, IfcEvaporatorType, IfcEvaporatorTypeEnum, IfcEvent, IfcEventTime, IfcEventTriggerTypeEnum, IfcEventType, IfcEventTypeEnum, IfcExtendedProperties, IfcExternalInformation, IfcExternalReference, IfcExternalReferenceRelationship, IfcExternalSpatialElement, IfcExternalSpatialElementTypeEnum, IfcExternalSpatialStructureElement, IfcExternallyDefinedHatchStyle, IfcExternallyDefinedSurfaceStyle, IfcExternallyDefinedTextFont, IfcExtrudedAreaSolid, IfcExtrudedAreaSolidTapered, IfcFace, IfcFaceBasedSurfaceModel, IfcFaceBound, IfcFaceOuterBound, IfcFaceSurface, IfcFacetedBrep, IfcFacetedBrepWithVoids, IfcFailureConnectionCondition, IfcFan, IfcFanType, IfcFanTypeEnum, IfcFastener, IfcFastenerType, IfcFastenerTypeEnum, IfcFeatureElement, IfcFeatureElementAddition, IfcFeatureElementSubtraction, IfcFillAreaStyle, IfcFillAreaStyleHatching, IfcFillAreaStyleTiles, IfcFillStyleSelect, IfcFilter, IfcFilterType, IfcFilterTypeEnum, IfcFireSuppressionTerminal, IfcFireSuppressionTerminalType, IfcFireSuppressionTerminalTypeEnum, IfcFixedReferenceSweptAreaSolid, IfcFlowController, IfcFlowControllerType, IfcFlowDirectionEnum, IfcFlowFitting, IfcFlowFittingType, IfcFlowInstrument, IfcFlowInstrumentType, IfcFlowInstrumentTypeEnum, IfcFlowMeter, IfcFlowMeterType, IfcFlowMeterTypeEnum, IfcFlowMovingDevice, IfcFlowMovingDeviceType, IfcFlowSegment, IfcFlowSegmentType, IfcFlowStorageDevice, IfcFlowStorageDeviceType, IfcFlowTerminal, IfcFlowTerminalType, IfcFlowTreatmentDevice, IfcFlowTreatmentDeviceType, IfcFontStyle, IfcFontVariant, IfcFontWeight, IfcFooting, IfcFootingType, IfcFootingTypeEnum, IfcForceMeasure, IfcFrequencyMeasure, IfcFurnishingElement, IfcFurnishingElementType, IfcFurniture, IfcFurnitureType, IfcFurnitureTypeEnum, IfcGeographicElement, IfcGeographicElementType, IfcGeographicElementTypeEnum, IfcGeometricCurveSet, IfcGeometricProjectionEnum, IfcGeometricRepresentationContext, IfcGeometricRepresentationItem, IfcGeometricRepresentationSubContext, IfcGeometricSet, IfcGeometricSetSelect, IfcGlobalOrLocalEnum, IfcGloballyUniqueId, IfcGrid, IfcGridAxis, IfcGridPlacement, IfcGridPlacementDirectionSelect, IfcGridTypeEnum, IfcGroup, IfcHalfSpaceSolid, IfcHatchLineDistanceSelect, IfcHeatExchanger, IfcHeatExchangerType, IfcHeatExchangerTypeEnum, IfcHeatFluxDensityMeasure, IfcHeatingValueMeasure, IfcHumidifier, IfcHumidifierType, IfcHumidifierTypeEnum, IfcIShapeProfileDef, IfcIdentifier, IfcIlluminanceMeasure, IfcImageTexture, IfcIndexedColourMap, IfcIndexedTextureMap, IfcIndexedTriangleTextureMap, IfcInductanceMeasure, IfcInteger, IfcIntegerCountRateMeasure, IfcInterceptor, IfcInterceptorType, IfcInterceptorTypeEnum, IfcInternalOrExternalEnum, IfcInventory, IfcInventoryTypeEnum, IfcIonConcentrationMeasure, IfcIrregularTimeSeries, IfcIrregularTimeSeriesValue, IfcIsothermalMoistureCapacityMeasure, IfcJunctionBox, IfcJunctionBoxType, IfcJunctionBoxTypeEnum, IfcKinematicViscosityMeasure, IfcKnotType, IfcLShapeProfileDef, IfcLabel, IfcLaborResource, IfcLaborResourceType, IfcLaborResourceTypeEnum, IfcLagTime, IfcLamp, IfcLampType, IfcLampTypeEnum, IfcLanguageId, IfcLayerSetDirectionEnum, IfcLayeredItem, IfcLengthMeasure, IfcLibraryInformation, IfcLibraryReference, IfcLibrarySelect, IfcLightDistributionCurveEnum, IfcLightDistributionData, IfcLightDistributionDataSourceSelect, IfcLightEmissionSourceEnum, IfcLightFixture, IfcLightFixtureType, IfcLightFixtureTypeEnum, IfcLightIntensityDistribution, IfcLightSource, IfcLightSourceAmbient, IfcLightSourceDirectional, IfcLightSourceGoniometric, IfcLightSourcePositional, IfcLightSourceSpot, IfcLine, IfcLinearForceMeasure, IfcLinearMomentMeasure, IfcLinearStiffnessMeasure, IfcLinearVelocityMeasure, IfcLoadGroupTypeEnum, IfcLocalPlacement, IfcLogical, IfcLogicalOperatorEnum, IfcLoop, IfcLuminousFluxMeasure, IfcLuminousIntensityDistributionMeasure, IfcLuminousIntensityMeasure, IfcMagneticFluxDensityMeasure, IfcMagneticFluxMeasure, IfcManifoldSolidBrep, IfcMapConversion, IfcMappedItem, IfcMassDensityMeasure, IfcMassFlowRateMeasure, IfcMassMeasure, IfcMassPerLengthMeasure, IfcMaterial, IfcMaterialClassificationRelationship, IfcMaterialConstituent, IfcMaterialConstituentSet, IfcMaterialDefinition, IfcMaterialDefinitionRepresentation, IfcMaterialLayer, IfcMaterialLayerSet, IfcMaterialLayerSetUsage, IfcMaterialLayerWithOffsets, IfcMaterialList, IfcMaterialProfile, IfcMaterialProfileSet, IfcMaterialProfileSetUsage, IfcMaterialProfileSetUsageTapering, IfcMaterialProfileWithOffsets, IfcMaterialProperties, IfcMaterialRelationship, IfcMaterialSelect, IfcMaterialUsageDefinition, IfcMeasureValue, IfcMeasureWithUnit, IfcMechanicalFastener, IfcMechanicalFastenerType, IfcMechanicalFastenerTypeEnum, IfcMedicalDevice, IfcMedicalDeviceType, IfcMedicalDeviceTypeEnum, IfcMember, IfcMemberStandardCase, IfcMemberType, IfcMemberTypeEnum, IfcMetric, IfcMetricValueSelect, IfcMirroredProfileDef, IfcModulusOfElasticityMeasure, IfcModulusOfLinearSubgradeReactionMeasure, IfcModulusOfRotationalSubgradeReactionMeasure, IfcModulusOfRotationalSubgradeReactionSelect, IfcModulusOfSubgradeReactionMeasure, IfcModulusOfSubgradeReactionSelect, IfcModulusOfTranslationalSubgradeReactionSelect, IfcMoistureDiffusivityMeasure, IfcMolecularWeightMeasure, IfcMomentOfInertiaMeasure, IfcMonetaryMeasure, IfcMonetaryUnit, IfcMonthInYearNumber, IfcMotorConnection, IfcMotorConnectionType, IfcMotorConnectionTypeEnum, IfcNamedUnit, IfcNonNegativeLengthMeasure, IfcNormalisedRatioMeasure, IfcNullStyle, IfcNumericMeasure, IfcObject, IfcObjectDefinition, IfcObjectPlacement, IfcObjectReferenceSelect, IfcObjectTypeEnum, IfcObjective, IfcObjectiveEnum, IfcOccupant, IfcOccupantTypeEnum, IfcOffsetCurve2D, IfcOffsetCurve3D, IfcOpenShell, IfcOpeningElement, IfcOpeningElementTypeEnum, IfcOpeningStandardCase, IfcOrganization, IfcOrganizationRelationship, IfcOrientedEdge, IfcOuterBoundaryCurve, IfcOutlet, IfcOutletType, IfcOutletTypeEnum, IfcOwnerHistory, IfcPHMeasure, IfcParameterValue, IfcParameterizedProfileDef, IfcPath, IfcPcurve, IfcPerformanceHistory, IfcPerformanceHistoryTypeEnum, IfcPermeableCoveringOperationEnum, IfcPermeableCoveringProperties, IfcPermit, IfcPermitTypeEnum, IfcPerson, IfcPersonAndOrganization, IfcPhysicalComplexQuantity, IfcPhysicalOrVirtualEnum, IfcPhysicalQuantity, IfcPhysicalSimpleQuantity, IfcPile, IfcPileConstructionEnum, IfcPileType, IfcPileTypeEnum, IfcPipeFitting, IfcPipeFittingType, IfcPipeFittingTypeEnum, IfcPipeSegment, IfcPipeSegmentType, IfcPipeSegmentTypeEnum, IfcPixelTexture, IfcPlacement, IfcPlanarBox, IfcPlanarExtent, IfcPlanarForceMeasure, IfcPlane, IfcPlaneAngleMeasure, IfcPlate, IfcPlateStandardCase, IfcPlateType, IfcPlateTypeEnum, IfcPoint, IfcPointOnCurve, IfcPointOnSurface, IfcPointOrVertexPoint, IfcPolyLoop, IfcPolygonalBoundedHalfSpace, IfcPolyline, IfcPort, IfcPositiveLengthMeasure, IfcPositivePlaneAngleMeasure, IfcPositiveRatioMeasure, IfcPostalAddress, IfcPowerMeasure, IfcPreDefinedColour, IfcPreDefinedCurveFont, IfcPreDefinedItem, IfcPreDefinedProperties, IfcPreDefinedPropertySet, IfcPreDefinedTextFont, IfcPresentableText, IfcPresentationItem, IfcPresentationLayerAssignment, IfcPresentationLayerWithStyle, IfcPresentationStyle, IfcPresentationStyleAssignment, IfcPresentationStyleSelect, IfcPressureMeasure, IfcProcedure, IfcProcedureType, IfcProcedureTypeEnum, IfcProcess, IfcProcessSelect, IfcProduct, IfcProductDefinitionShape, IfcProductRepresentation, IfcProductRepresentationSelect, IfcProductSelect, IfcProfileDef, IfcProfileProperties, IfcProfileTypeEnum, IfcProject, IfcProjectLibrary, IfcProjectOrder, IfcProjectOrderTypeEnum, IfcProjectedCRS, IfcProjectedOrTrueLengthEnum, IfcProjectionElement, IfcProjectionElementTypeEnum, IfcProperty, IfcPropertyAbstraction, IfcPropertyBoundedValue, IfcPropertyDefinition, IfcPropertyDependencyRelationship, IfcPropertyEnumeratedValue, IfcPropertyEnumeration, IfcPropertyListValue, IfcPropertyReferenceValue, IfcPropertySet, IfcPropertySetDefinition, IfcPropertySetDefinitionSelect, IfcPropertySetDefinitionSet, IfcPropertySetTemplate, IfcPropertySetTemplateTypeEnum, IfcPropertySingleValue, IfcPropertyTableValue, IfcPropertyTemplate, IfcPropertyTemplateDefinition, IfcProtectiveDevice, IfcProtectiveDeviceTrippingUnit, IfcProtectiveDeviceTrippingUnitType, IfcProtectiveDeviceTrippingUnitTypeEnum, IfcProtectiveDeviceType, IfcProtectiveDeviceTypeEnum, IfcProxy, IfcPump, IfcPumpType, IfcPumpTypeEnum, IfcQuantityArea, IfcQuantityCount, IfcQuantityLength, IfcQuantitySet, IfcQuantityTime, IfcQuantityVolume, IfcQuantityWeight, IfcRadioActivityMeasure, IfcRailing, IfcRailingType, IfcRailingTypeEnum, IfcRamp, IfcRampFlight, IfcRampFlightType, IfcRampFlightTypeEnum, IfcRampType, IfcRampTypeEnum, IfcRatioMeasure, IfcRationalBSplineCurveWithKnots, IfcRationalBSplineSurfaceWithKnots, IfcReal, IfcRectangleHollowProfileDef, IfcRectangleProfileDef, IfcRectangularPyramid, IfcRectangularTrimmedSurface, IfcRecurrencePattern, IfcRecurrenceTypeEnum, IfcReference, IfcReflectanceMethodEnum, IfcRegularTimeSeries, IfcReinforcementBarProperties, IfcReinforcementDefinitionProperties, IfcReinforcingBar, IfcReinforcingBarRoleEnum, IfcReinforcingBarSurfaceEnum, IfcReinforcingBarType, IfcReinforcingBarTypeEnum, IfcReinforcingElement, IfcReinforcingElementType, IfcReinforcingMesh, IfcReinforcingMeshType, IfcReinforcingMeshTypeEnum, IfcRelAggregates, IfcRelAssigns, IfcRelAssignsToActor, IfcRelAssignsToControl, IfcRelAssignsToGroup, IfcRelAssignsToGroupByFactor, IfcRelAssignsToProcess, IfcRelAssignsToProduct, IfcRelAssignsToResource, IfcRelAssociates, IfcRelAssociatesApproval, IfcRelAssociatesClassification, IfcRelAssociatesConstraint, IfcRelAssociatesDocument, IfcRelAssociatesLibrary, IfcRelAssociatesMaterial, IfcRelConnects, IfcRelConnectsElements, IfcRelConnectsPathElements, IfcRelConnectsPortToElement, IfcRelConnectsPorts, IfcRelConnectsStructuralActivity, IfcRelConnectsStructuralMember, IfcRelConnectsWithEccentricity, IfcRelConnectsWithRealizingElements, IfcRelContainedInSpatialStructure, IfcRelCoversBldgElements, IfcRelCoversSpaces, IfcRelDeclares, IfcRelDecomposes, IfcRelDefines, IfcRelDefinesByObject, IfcRelDefinesByProperties, IfcRelDefinesByTemplate, IfcRelDefinesByType, IfcRelFillsElement, IfcRelFlowControlElements, IfcRelInterferesElements, IfcRelNests, IfcRelProjectsElement, IfcRelReferencedInSpatialStructure, IfcRelSequence, IfcRelServicesBuildings, IfcRelSpaceBoundary, IfcRelSpaceBoundary1stLevel, IfcRelSpaceBoundary2ndLevel, IfcRelVoidsElement, IfcRelationship, IfcReparametrisedCompositeCurveSegment, IfcRepresentation, IfcRepresentationContext, IfcRepresentationItem, IfcRepresentationMap, IfcResource, IfcResourceApprovalRelationship, IfcResourceConstraintRelationship, IfcResourceLevelRelationship, IfcResourceObjectSelect, IfcResourceSelect, IfcResourceTime, IfcRevolvedAreaSolid, IfcRevolvedAreaSolidTapered, IfcRightCircularCone, IfcRightCircularCylinder, IfcRoleEnum, IfcRoof, IfcRoofType, IfcRoofTypeEnum, IfcRoot, IfcRotationalFrequencyMeasure, IfcRotationalMassMeasure, IfcRotationalStiffnessMeasure, IfcRotationalStiffnessSelect, IfcRoundedRectangleProfileDef, IfcSIPrefix, IfcSIUnit, IfcSIUnitName, IfcSanitaryTerminal, IfcSanitaryTerminalType, IfcSanitaryTerminalTypeEnum, IfcSchedulingTime, IfcSectionModulusMeasure, IfcSectionProperties, IfcSectionReinforcementProperties, IfcSectionTypeEnum, IfcSectionalAreaIntegralMeasure, IfcSectionedSpine, IfcSensor, IfcSensorType, IfcSensorTypeEnum, IfcSequenceEnum, IfcShadingDevice, IfcShadingDeviceType, IfcShadingDeviceTypeEnum, IfcShapeAspect, IfcShapeModel, IfcShapeRepresentation, IfcShearModulusMeasure, IfcShell, IfcShellBasedSurfaceModel, IfcSimpleProperty, IfcSimplePropertyTemplate, IfcSimplePropertyTemplateTypeEnum, IfcSimpleValue, IfcSite, IfcSizeSelect, IfcSlab, IfcSlabElementedCase, IfcSlabStandardCase, IfcSlabType, IfcSlabTypeEnum, IfcSlippageConnectionCondition, IfcSolarDevice, IfcSolarDeviceType, IfcSolarDeviceTypeEnum, IfcSolidAngleMeasure, IfcSolidModel, IfcSolidOrShell, IfcSoundPowerLevelMeasure, IfcSoundPowerMeasure, IfcSoundPressureLevelMeasure, IfcSoundPressureMeasure, IfcSpace, IfcSpaceBoundarySelect, IfcSpaceHeater, IfcSpaceHeaterType, IfcSpaceHeaterTypeEnum, IfcSpaceType, IfcSpaceTypeEnum, IfcSpatialElement, IfcSpatialElementType, IfcSpatialStructureElement, IfcSpatialStructureElementType, IfcSpatialZone, IfcSpatialZoneType, IfcSpatialZoneTypeEnum, IfcSpecificHeatCapacityMeasure, IfcSpecularExponent, IfcSpecularHighlightSelect, IfcSpecularRoughness, IfcSphere, IfcStackTerminal, IfcStackTerminalType, IfcStackTerminalTypeEnum, IfcStair, IfcStairFlight, IfcStairFlightType, IfcStairFlightTypeEnum, IfcStairType, IfcStairTypeEnum, IfcStateEnum, IfcStructuralAction, IfcStructuralActivity, IfcStructuralActivityAssignmentSelect, IfcStructuralAnalysisModel, IfcStructuralConnection, IfcStructuralConnectionCondition, IfcStructuralCurveAction, IfcStructuralCurveActivityTypeEnum, IfcStructuralCurveConnection, IfcStructuralCurveMember, IfcStructuralCurveMemberTypeEnum, IfcStructuralCurveMemberVarying, IfcStructuralCurveReaction, IfcStructuralItem, IfcStructuralLinearAction, IfcStructuralLoad, IfcStructuralLoadCase, IfcStructuralLoadConfiguration, IfcStructuralLoadGroup, IfcStructuralLoadLinearForce, IfcStructuralLoadOrResult, IfcStructuralLoadPlanarForce, IfcStructuralLoadSingleDisplacement, IfcStructuralLoadSingleDisplacementDistortion, IfcStructuralLoadSingleForce, IfcStructuralLoadSingleForceWarping, IfcStructuralLoadStatic, IfcStructuralLoadTemperature, IfcStructuralMember, IfcStructuralPlanarAction, IfcStructuralPointAction, IfcStructuralPointConnection, IfcStructuralPointReaction, IfcStructuralReaction, IfcStructuralResultGroup, IfcStructuralSurfaceAction, IfcStructuralSurfaceActivityTypeEnum, IfcStructuralSurfaceConnection, IfcStructuralSurfaceMember, IfcStructuralSurfaceMemberTypeEnum, IfcStructuralSurfaceMemberVarying, IfcStructuralSurfaceReaction, IfcStyleAssignmentSelect, IfcStyleModel, IfcStyledItem, IfcStyledRepresentation, IfcSubContractResource, IfcSubContractResourceType, IfcSubContractResourceTypeEnum, IfcSubedge, IfcSurface, IfcSurfaceCurveSweptAreaSolid, IfcSurfaceFeature, IfcSurfaceFeatureTypeEnum, IfcSurfaceOfLinearExtrusion, IfcSurfaceOfRevolution, IfcSurfaceOrFaceSurface, IfcSurfaceReinforcementArea, IfcSurfaceSide, IfcSurfaceStyle, IfcSurfaceStyleElementSelect, IfcSurfaceStyleLighting, IfcSurfaceStyleRefraction, IfcSurfaceStyleRendering, IfcSurfaceStyleShading, IfcSurfaceStyleWithTextures, IfcSurfaceTexture, IfcSweptAreaSolid, IfcSweptDiskSolid, IfcSweptDiskSolidPolygonal, IfcSweptSurface, IfcSwitchingDevice, IfcSwitchingDeviceType, IfcSwitchingDeviceTypeEnum, IfcSystem, IfcSystemFurnitureElement, IfcSystemFurnitureElementType, IfcSystemFurnitureElementTypeEnum, IfcTShapeProfileDef, IfcTable, IfcTableColumn, IfcTableRow, IfcTank, IfcTankType, IfcTankTypeEnum, IfcTask, IfcTaskDurationEnum, IfcTaskTime, IfcTaskTimeRecurring, IfcTaskType, IfcTaskTypeEnum, IfcTelecomAddress, IfcTemperatureGradientMeasure, IfcTemperatureRateOfChangeMeasure, IfcTendon, IfcTendonAnchor, IfcTendonAnchorType, IfcTendonAnchorTypeEnum, IfcTendonType, IfcTendonTypeEnum, IfcTessellatedFaceSet, IfcTessellatedItem, IfcText, IfcTextAlignment, IfcTextDecoration, IfcTextFontName, IfcTextFontSelect, IfcTextLiteral, IfcTextLiteralWithExtent, IfcTextPath, IfcTextStyle, IfcTextStyleFontModel, IfcTextStyleForDefinedFont, IfcTextStyleTextModel, IfcTextTransformation, IfcTextureCoordinate, IfcTextureCoordinateGenerator, IfcTextureMap, IfcTextureVertex, IfcTextureVertexList, IfcThermalAdmittanceMeasure, IfcThermalConductivityMeasure, IfcThermalExpansionCoefficientMeasure, IfcThermalResistanceMeasure, IfcThermalTransmittanceMeasure, IfcThermodynamicTemperatureMeasure, IfcTime, IfcTimeMeasure, IfcTimeOrRatioSelect, IfcTimePeriod, IfcTimeSeries, IfcTimeSeriesDataTypeEnum, IfcTimeSeriesValue, IfcTimeStamp, IfcTopologicalRepresentationItem, IfcTopologyRepresentation, IfcTorqueMeasure, IfcTransformer, IfcTransformerType, IfcTransformerTypeEnum, IfcTransitionCode, IfcTranslationalStiffnessSelect, IfcTransportElement, IfcTransportElementType, IfcTransportElementTypeEnum, IfcTrapeziumProfileDef, IfcTriangulatedFaceSet, IfcTrimmedCurve, IfcTrimmingPreference, IfcTrimmingSelect, IfcTubeBundle, IfcTubeBundleType, IfcTubeBundleTypeEnum, IfcTypeObject, IfcTypeProcess, IfcTypeProduct, IfcTypeResource, IfcURIReference, IfcUShapeProfileDef, IfcUnit, IfcUnitAssignment, IfcUnitEnum, IfcUnitaryControlElement, IfcUnitaryControlElementType, IfcUnitaryControlElementTypeEnum, IfcUnitaryEquipment, IfcUnitaryEquipmentType, IfcUnitaryEquipmentTypeEnum, IfcValue, IfcValve, IfcValveType, IfcValveTypeEnum, IfcVaporPermeabilityMeasure, IfcVector, IfcVectorOrDirection, IfcVertex, IfcVertexLoop, IfcVertexPoint, IfcVibrationIsolator, IfcVibrationIsolatorType, IfcVibrationIsolatorTypeEnum, IfcVirtualElement, IfcVirtualGridIntersection, IfcVoidingFeature, IfcVoidingFeatureTypeEnum, IfcVolumeMeasure, IfcVolumetricFlowRateMeasure, IfcWall, IfcWallElementedCase, IfcWallStandardCase, IfcWallType, IfcWallTypeEnum, IfcWarpingConstantMeasure, IfcWarpingMomentMeasure, IfcWarpingStiffnessSelect, IfcWasteTerminal, IfcWasteTerminalType, IfcWasteTerminalTypeEnum, IfcWindow, IfcWindowLiningProperties, IfcWindowPanelOperationEnum, IfcWindowPanelPositionEnum, IfcWindowPanelProperties, IfcWindowStandardCase, IfcWindowStyle, IfcWindowStyleConstructionEnum, IfcWindowStyleOperationEnum, IfcWindowType, IfcWindowTypeEnum, IfcWindowTypePartitioningEnum, IfcWorkCalendar, IfcWorkCalendarTypeEnum, IfcWorkControl, IfcWorkPlan, IfcWorkPlanTypeEnum, IfcWorkSchedule, IfcWorkScheduleTypeEnum, IfcWorkTime, IfcZShapeProfileDef, IfcZone, UNDEFINED
     } Enum;
     Enum Parent(Enum v);
     Enum FromString(const std::string& s);
diff --git a/src/ifcparse/IfcEntityDescriptor.h b/src/ifcparse/IfcEntityDescriptor.h
index 4425520..e90e5b5 100644
--- a/src/ifcparse/IfcEntityDescriptor.h
+++ b/src/ifcparse/IfcEntityDescriptor.h
@@ -27,10 +27,15 @@
 #include <algorithm>
 
 #include "../ifcparse/SharedPointer.h"
-#include "../ifcparse/Ifc2x3enum.h"
 #include "../ifcparse/IfcUtil.h"
 #include "../ifcparse/IfcException.h"
 
+#ifdef USE_IFC4
+#include "../ifcparse/Ifc4enum.h"
+#else
+#include "../ifcparse/Ifc2x3enum.h"
+#endif
+
 namespace IfcUtil {
 
 	class IfcEnumerationDescriptor {
@@ -82,7 +87,7 @@ namespace IfcUtil {
 	public:
 		IfcEntityDescriptor(IfcSchema::Type::Enum type, IfcEntityDescriptor* parent)
 			: type(type), parent(parent) {}
-		void add(const std::string& name, bool optional, ArgumentType argument_type, IfcSchema::Type::Enum data_type = IfcSchema::Type::ALL) {
+		void add(const std::string& name, bool optional, ArgumentType argument_type, IfcSchema::Type::Enum data_type = IfcSchema::Type::UNDEFINED) {
 			arguments.push_back(IfcArgumentDescriptor(name, optional, argument_type, data_type));
 		}
 		unsigned getArgumentCount() const {
@@ -106,10 +111,10 @@ namespace IfcUtil {
 				? parent->getArgumentOptional(i)
 				: get_argument(i-a).optional;
 		}
-		IfcSchema::Type::Enum getArgumentEnumerationClass(unsigned i) const {
+		IfcSchema::Type::Enum getArgumentEntity(unsigned i) const {
 			const unsigned a = argument_start();
 			return i < a
-				? parent->getArgumentEnumerationClass(i)
+				? parent->getArgumentEntity(i)
 				: get_argument(i-a).data_type;
 		}
 		unsigned getArgumentIndex(const std::string& s) const {
diff --git a/src/ifcparse/IfcFile.h b/src/ifcparse/IfcFile.h
index 3835d10..f946b86 100644
--- a/src/ifcparse/IfcFile.h
+++ b/src/ifcparse/IfcFile.h
@@ -1,110 +1,138 @@
 /********************************************************************************
-*                                                                              *
-* This file is part of IfcOpenShell.                                           *
-*                                                                              *
-* IfcOpenShell is free software: you can redistribute it and/or modify         *
-* it under the terms of the Lesser GNU General Public License as published by  *
-* the Free Software Foundation, either version 3.0 of the License, or          *
-* (at your option) any later version.                                          *
-*                                                                              *
-* IfcOpenShell 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                 *
-* Lesser GNU General Public License for more details.                          *
-*                                                                              *
-* You should have received a copy of the Lesser GNU General Public License     *
-* along with this program. If not, see <http://www.gnu.org/licenses/>.         *
-*                                                                              *
-********************************************************************************/
-
-/********************************************************************************
  *                                                                              *
- * This file provides functions for loading an IFC file into memory and access  *
- * its entities either by ID, by an IfcSchema::Type or by reference             * 
+ * This file is part of IfcOpenShell.                                           *
+ *                                                                              *
+ * IfcOpenShell is free software: you can redistribute it and/or modify         *
+ * it under the terms of the Lesser GNU General Public License as published by  *
+ * the Free Software Foundation, either version 3.0 of the License, or          *
+ * (at your option) any later version.                                          *
+ *                                                                              *
+ * IfcOpenShell 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                 *
+ * Lesser GNU General Public License for more details.                          *
+ *                                                                              *
+ * You should have received a copy of the Lesser GNU General Public License     *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.         *
  *                                                                              *
  ********************************************************************************/
 
 #ifndef IFCFILE_H
 #define IFCFILE_H
 
+#include <map>
+#include <set>
+
 #include "../ifcparse/IfcParse.h"
+#include "../ifcparse/IfcSpfHeader.h"
 
 namespace IfcParse {
 
 /// This class provides several static convenience functions and variables
 /// and provide access to the entities in an IFC file
 class IfcFile {
+public:
+	typedef std::map<IfcSchema::Type::Enum, IfcEntityList::ptr> entities_by_type_t;
+	typedef std::map<unsigned int, IfcUtil::IfcBaseClass*> entity_by_id_t;
+	typedef std::map<std::string, IfcSchema::IfcRoot*> entity_by_guid_t;
+	typedef std::map<unsigned int, IfcEntityList::ptr> entities_by_ref_t;
+	typedef std::map<unsigned int, unsigned int> offset_by_id_t;
+	typedef entity_by_id_t::const_iterator const_iterator;
 private:
-	MapEntityById byid;
-	MapEntitiesByType bytype;
-	MapEntitiesByRef byref;
-	MapEntityByGuid byguid;
-	MapOffsetById offsets;
+	typedef std::map<IfcUtil::IfcBaseClass*, IfcUtil::IfcBaseClass*> entity_entity_map_t;
+
+	bool _create_latebound_entities;
+
+	entity_by_id_t byid;
+	entities_by_type_t bytype;
+	entities_by_ref_t byref;
+	entity_by_guid_t byguid;
+	offset_by_id_t offsets;
+
+	entity_entity_map_t entity_file_map;
+
 	unsigned int lastId;
 	unsigned int MaxId;
-	std::string _filename;
-	std::string _timestamp;
-	std::string _author;
-	std::string _author_email;
-	std::string _author_organisation;
-	void initTimestamp();
+
+	IfcSpfHeader _header;
+
+	void setDefaultHeaderValues();
+	void traverse(IfcUtil::IfcBaseClass*, std::set<IfcUtil::IfcBaseClass*>& visited, IfcEntityList::ptr list, int level, int max_level);
 public:
-	typedef MapEntityById::const_iterator const_iterator;
-	IfcFile();
+	IfcParse::IfcSpfLexer* tokens;
+	IfcParse::IfcSpfStream* stream;
+	
+	IfcFile(bool create_latebound_entities = false);
 	~IfcFile();
-	/// Returns the first entity in the file, this probably is the entity with the lowest id (EXPRESS ENTITY_INSTANCE_NAME)
+	
+	/// Returns the first entity in the file, this probably is the entity
+	/// with the lowest id (EXPRESS ENTITY_INSTANCE_NAME)
 	const_iterator begin() const;
-	/// Returns the last entity in the file, this probably is the entity with the highes id (EXPRESS ENTITY_INSTANCE_NAME)
+	/// Returns the last entity in the file, this probably is the entity
+	/// with the highest id (EXPRESS ENTITY_INSTANCE_NAME)
 	const_iterator end() const;
-	IfcParse::IfcSpfStream* file;
-	IfcParse::Tokens* tokens;
+	
 	/// Returns all entities in the file that match the template argument.
 	/// NOTE: This also returns subtypes of the requested type, for example:
 	/// IfcWall will also return IfcWallStandardCase entities
 	template <class T>
-	typename T::list EntitiesByType() {
-		IfcEntities e = EntitiesByType(T::Class());
-		typename T::list l ( new IfcTemplatedEntityList<T>() );
-		if ( e && e->Size() )
-			for ( IfcEntityList::it it = e->begin(); it != e->end(); ++ it ) {
-				l->push(reinterpret_pointer_cast<IfcUtil::IfcBaseClass,T>(*it));
-			}
-			return l;
+	typename T::list::ptr entitiesByType() {
+		IfcEntityList::ptr untyped_list = entitiesByType(T::Class());
+		if (untyped_list) {
+			return untyped_list->as<T>();
+		} else {
+			return typename T::list::ptr(new typename T::list);
+		}
 	}
+
 	/// Returns all entities in the file that match the positional argument.
 	/// NOTE: This also returns subtypes of the requested type, for example:
 	/// IfcWall will also return IfcWallStandardCase entities
-	IfcEntities EntitiesByType(IfcSchema::Type::Enum t);
+	IfcEntityList::ptr entitiesByType(IfcSchema::Type::Enum t);
+
 	/// Returns all entities in the file that match the positional argument.
 	/// NOTE: This also returns subtypes of the requested type, for example:
 	/// IfcWall will also return IfcWallStandardCase entities
-	IfcEntities EntitiesByType(const std::string& t);
+	IfcEntityList::ptr entitiesByType(const std::string& t);
+
 	/// Returns all entities in the file that reference the id
-	IfcEntities EntitiesByReference(int id);
+	IfcEntityList::ptr entitiesByReference(int id);
+
 	/// Returns the entity with the specified id
-	IfcEntity EntityById(int id);
+	IfcUtil::IfcBaseClass* entityById(int id);
+
 	/// Returns the entity with the specified GlobalId
-	IfcSchema::IfcRoot::ptr EntityByGuid(const std::string& guid);
+	IfcSchema::IfcRoot* entityByGuid(const std::string& guid);
+
+	/// Performs a depth-first traversal, returning all entity instance
+	/// attributes as a flat list. NB: includes the root instance specified
+	/// in the first function argument.
+	IfcEntityList::ptr traverse(IfcUtil::IfcBaseClass* instance, int max_level=-1);
+
 	bool Init(const std::string& fn);
 	bool Init(std::istream& fn, int len);
 	bool Init(void* data, int len);
 	bool Init(IfcParse::IfcSpfStream* f);
-	unsigned int FreshId() { MaxId ++; return MaxId; }
-	void AddEntity(IfcUtil::IfcSchemaEntity e);
-	void AddEntities(IfcEntities es);
-
-	void filename(const std::string& s);
-	std::string filename() const;
-	void timestamp(const std::string& s);
-	std::string timestamp() const;
-	void author(const std::string& name, const std::string& email, const std::string& organisation);
-	std::string authorName() const;
-	std::string authorEmail() const;
-	std::string authorOrganisation() const;
+
+	IfcEntityList::ptr getInverse(int instance_id, IfcSchema::Type::Enum type, int attribute_index);
+
+	unsigned int FreshId() { return ++MaxId; }
+
+	IfcUtil::IfcBaseClass* addEntity(IfcUtil::IfcBaseClass* entity);
+	void addEntities(IfcEntityList::ptr es);
+
+	void removeEntity(IfcUtil::IfcBaseClass* entity);
+
+	const IfcSpfHeader& header() const { return _header; }
+	IfcSpfHeader& header() { return _header; }
+
+	std::string createTimestamp() const;
+
+	bool create_latebound_entities() const { return _create_latebound_entities; }
+
+	std::pair<IfcSchema::IfcNamedUnit*, double> getUnit(IfcSchema::IfcUnitEnum::IfcUnitEnum);
 };
 
 }
 
-std::ostream& operator<< (std::ostream& os, const IfcParse::IfcFile& f);
-
-#endif
+#endif
\ No newline at end of file
diff --git a/src/ifcparse/IfcHierarchyHelper.cpp b/src/ifcparse/IfcHierarchyHelper.cpp
index 5dbc5d6..3354b71 100644
--- a/src/ifcparse/IfcHierarchyHelper.cpp
+++ b/src/ifcparse/IfcHierarchyHelper.cpp
@@ -38,7 +38,7 @@ IfcSchema::IfcAxis2Placement3D* IfcHierarchyHelper::addPlacement3d(
 		IfcSchema::IfcDirection* z = addTriplet<IfcSchema::IfcDirection>(zx, zy, zz);
 		IfcSchema::IfcCartesianPoint* o = addTriplet<IfcSchema::IfcCartesianPoint>(ox, oy, oz);
 		IfcSchema::IfcAxis2Placement3D* p3d = new IfcSchema::IfcAxis2Placement3D(o, z, x);
-		AddEntity(p3d);
+		addEntity(p3d);
 		return p3d;
 }
 
@@ -49,19 +49,19 @@ IfcSchema::IfcAxis2Placement2D* IfcHierarchyHelper::addPlacement2d(
 		IfcSchema::IfcDirection* x = addDoublet<IfcSchema::IfcDirection>(xx, xy);
 		IfcSchema::IfcCartesianPoint* o = addDoublet<IfcSchema::IfcCartesianPoint>(ox, oy);
 		IfcSchema::IfcAxis2Placement2D* p2d = new IfcSchema::IfcAxis2Placement2D(o, x);
-		AddEntity(p2d);
+		addEntity(p2d);
 		return p2d;
 }
 
-IfcSchema::IfcLocalPlacement* IfcHierarchyHelper::addLocalPlacement(
+IfcSchema::IfcLocalPlacement* IfcHierarchyHelper::addLocalPlacement(IfcSchema::IfcObjectPlacement* parent,
 	double ox, double oy, double oz,
 	double zx, double zy, double zz,
 	double xx, double xy, double xz) 
 {
-		IfcSchema::IfcLocalPlacement* lp = new IfcSchema::IfcLocalPlacement(0, 
+		IfcSchema::IfcLocalPlacement* lp = new IfcSchema::IfcLocalPlacement(parent, 
 			addPlacement3d(ox, oy, oz, zx, zy, zz, xx, xy, xz));
 
-		AddEntity(lp);
+		addEntity(lp);
 		return lp;
 }
 
@@ -78,32 +78,28 @@ IfcSchema::IfcOwnerHistory* IfcHierarchyHelper::addOwnerHistory() {
 
 	int timestamp = (int) time(0);
 	IfcSchema::IfcOwnerHistory* owner_hist = new IfcSchema::IfcOwnerHistory(person_and_org, application, 
-		boost::none, IfcSchema::IfcChangeActionEnum::IfcChangeAction_ADDED, boost::none, person_and_org, application, timestamp);
+		boost::none, IfcSchema::IfcChangeActionEnum::IfcChangeAction_ADDED, timestamp, person_and_org, application, timestamp);
 
-	AddEntity(person);
-	AddEntity(organization);
-	AddEntity(person_and_org);
-	AddEntity(application);
-	AddEntity(owner_hist);
+	addEntity(person);
+	addEntity(organization);
+	addEntity(person_and_org);
+	addEntity(application);
+	addEntity(owner_hist);
 
 	return owner_hist;
 }
 	
 IfcSchema::IfcProject* IfcHierarchyHelper::addProject(IfcSchema::IfcOwnerHistory* owner_hist) {
-	IfcSchema::IfcRepresentationContext::list rep_contexts (new IfcTemplatedEntityList<IfcSchema::IfcRepresentationContext>());
-	IfcSchema::IfcGeometricRepresentationContext* rep_context = new IfcSchema::IfcGeometricRepresentationContext(
-		std::string("Plan"), std::string("Model"), 3, 1e-5, addPlacement3d(), addTriplet<IfcSchema::IfcDirection>(0, 1, 0));
+	IfcSchema::IfcRepresentationContext::list::ptr rep_contexts (new IfcSchema::IfcRepresentationContext::list);
 
-	rep_contexts->push(rep_context);
-
-	IfcEntities units (new IfcEntityList());
+	IfcEntityList::ptr units (new IfcEntityList);
 	IfcSchema::IfcDimensionalExponents* dimexp = new IfcSchema::IfcDimensionalExponents(0, 0, 0, 0, 0, 0, 0);
 	IfcSchema::IfcSIUnit* unit1 = new IfcSchema::IfcSIUnit(IfcSchema::IfcUnitEnum::IfcUnit_LENGTHUNIT, 
 		IfcSchema::IfcSIPrefix::IfcSIPrefix_MILLI, IfcSchema::IfcSIUnitName::IfcSIUnitName_METRE);
 	IfcSchema::IfcSIUnit* unit2a = new IfcSchema::IfcSIUnit(IfcSchema::IfcUnitEnum::IfcUnit_PLANEANGLEUNIT, 
 		boost::none, IfcSchema::IfcSIUnitName::IfcSIUnitName_RADIAN);
 	IfcSchema::IfcMeasureWithUnit* unit2b = new IfcSchema::IfcMeasureWithUnit(
-		new IfcWrite::IfcSelectHelper(0.017453293, IfcSchema::Type::IfcPlaneAngleMeasure), unit2a);
+		new IfcSchema::IfcPlaneAngleMeasure(0.017453293), unit2a);
 	IfcSchema::IfcConversionBasedUnit* unit2 = new IfcSchema::IfcConversionBasedUnit(dimexp, 
 		IfcSchema::IfcUnitEnum::IfcUnit_PLANEANGLEUNIT, "Degrees", unit2b);
 
@@ -115,14 +111,13 @@ IfcSchema::IfcProject* IfcHierarchyHelper::addProject(IfcSchema::IfcOwnerHistory
 	IfcSchema::IfcProject* project = new IfcSchema::IfcProject(IfcWrite::IfcGuidHelper(), owner_hist, boost::none, boost::none, 
 		boost::none, boost::none, boost::none, rep_contexts, unit_assignment);
 
-	AddEntity(rep_context);
-	AddEntity(dimexp);
-	AddEntity(unit1);
-	AddEntity(unit2a);
-	AddEntity(unit2b);
-	AddEntity(unit2);
-	AddEntity(unit_assignment);
-	AddEntity(project);
+	addEntity(dimexp);
+	addEntity(unit1);
+	addEntity(unit2a);
+	addEntity(unit2b);
+	addEntity(unit2);
+	addEntity(unit_assignment);
+	addEntity(project);
 
 	return project;
 }
@@ -156,7 +151,7 @@ IfcSchema::IfcSite* IfcHierarchyHelper::addSite(IfcSchema::IfcProject* proj, Ifc
 		IfcSchema::IfcElementCompositionEnum::IfcElementComposition_ELEMENT, 
 		boost::none, boost::none, boost::none, boost::none, 0);
 
-	AddEntity(site);
+	addEntity(site);
 	addRelatedObject<IfcSchema::IfcRelAggregates>(proj, site);
 	return site;
 }
@@ -178,7 +173,7 @@ IfcSchema::IfcBuilding* IfcHierarchyHelper::addBuilding(IfcSchema::IfcSite* site
 		addLocalPlacement(), 0, boost::none, IfcSchema::IfcElementCompositionEnum::IfcElementComposition_ELEMENT, 
 		boost::none, boost::none, 0);
 
-	AddEntity(building);
+	addEntity(building);
 	addRelatedObject<IfcSchema::IfcRelAggregates>(site, building);
 	relatePlacements(site, building);
 
@@ -204,7 +199,7 @@ IfcSchema::IfcBuildingStorey* IfcHierarchyHelper::addBuildingStorey(IfcSchema::I
 		owner_hist, boost::none, boost::none, boost::none, addLocalPlacement(), 0, boost::none, 
 		IfcSchema::IfcElementCompositionEnum::IfcElementComposition_ELEMENT, boost::none);
 
-	AddEntity(storey);
+	addEntity(storey);
 	addRelatedObject<IfcSchema::IfcRelAggregates>(building, storey);
 	relatePlacements(building, storey);
 
@@ -226,9 +221,25 @@ IfcSchema::IfcBuildingStorey* IfcHierarchyHelper::addBuildingProduct(IfcSchema::
 	if (! storey) {
 		storey = addBuildingStorey(0, owner_hist);
 	}
-	AddEntity(product);
-	addRelatedObject<IfcSchema::IfcRelContainedInSpatialStructure>(storey, product);
-	relatePlacements(storey, product);
+	addEntity(product);
+	// CV-2x3-158: Don't add decompositions directly to a building storey
+	bool is_decomposition = false;
+#ifdef USE_IFC4
+	IfcSchema::IfcRelAggregates::list::ptr decomposes = product->Decomposes();
+	for (IfcSchema::IfcRelAggregates::list::it it = decomposes->begin(); it != decomposes->end(); ++it) {
+#else
+	IfcSchema::IfcRelDecomposes::list::ptr decomposes = product->Decomposes();
+	for (IfcSchema::IfcRelDecomposes::list::it it = decomposes->begin(); it != decomposes->end(); ++it) {
+#endif
+		if ((*it)->RelatingObject() != product) {
+			is_decomposition = true;
+			break;
+		}
+	}
+	if (!is_decomposition) {
+		addRelatedObject<IfcSchema::IfcRelContainedInSpatialStructure>(storey, product);
+		relatePlacements(storey, product);
+	}
 	return storey;
 }
 
@@ -236,11 +247,11 @@ void IfcHierarchyHelper::addExtrudedPolyline(IfcSchema::IfcShapeRepresentation*
 	IfcSchema::IfcAxis2Placement2D* place, IfcSchema::IfcAxis2Placement3D* place2, 
 	IfcSchema::IfcDirection* dir, IfcSchema::IfcRepresentationContext* context) 
 {
-	IfcSchema::IfcCartesianPoint::list cartesian_points (new IfcTemplatedEntityList<IfcSchema::IfcCartesianPoint>());
+	IfcSchema::IfcCartesianPoint::list::ptr cartesian_points (new IfcSchema::IfcCartesianPoint::list);
 	for (std::vector<std::pair<double, double> >::const_iterator i = points.begin(); i != points.end(); ++i) {
 		cartesian_points->push(addDoublet<IfcSchema::IfcCartesianPoint>(i->first, i->second));
 	}
-	if (cartesian_points->Size()) cartesian_points->push(*cartesian_points->begin());
+	if (cartesian_points->size()) cartesian_points->push(*cartesian_points->begin());
 	IfcSchema::IfcPolyline* line = new IfcSchema::IfcPolyline(cartesian_points);
 	IfcSchema::IfcArbitraryClosedProfileDef* profile = new IfcSchema::IfcArbitraryClosedProfileDef(
 		IfcSchema::IfcProfileTypeEnum::IfcProfileType_AREA, boost::none, line);
@@ -248,28 +259,28 @@ void IfcHierarchyHelper::addExtrudedPolyline(IfcSchema::IfcShapeRepresentation*
 	IfcSchema::IfcExtrudedAreaSolid* solid = new IfcSchema::IfcExtrudedAreaSolid(
 		profile, place2 ? place2 : addPlacement3d(), dir ? dir : addTriplet<IfcSchema::IfcDirection>(0, 0, 1), h);
 
-	IfcSchema::IfcRepresentationItem::list items = rep->Items();
+	IfcSchema::IfcRepresentationItem::list::ptr items = rep->Items();
 	items->push(solid);
 	rep->setItems(items);
 
-	AddEntity(line);
-	AddEntity(profile);
-	AddEntity(solid);
+	addEntity(line);
+	addEntity(profile);
+	addEntity(solid);
 }
 
 IfcSchema::IfcProductDefinitionShape* IfcHierarchyHelper::addExtrudedPolyline(const std::vector<std::pair<double, double> >& points, double h, 
 	IfcSchema::IfcAxis2Placement2D* place, IfcSchema::IfcAxis2Placement3D* place2, IfcSchema::IfcDirection* dir, 
 	IfcSchema::IfcRepresentationContext* context) 
 {
-	IfcSchema::IfcRepresentation::list reps (new IfcTemplatedEntityList<IfcSchema::IfcRepresentation>());
-	IfcSchema::IfcRepresentationItem::list items (new IfcTemplatedEntityList<IfcSchema::IfcRepresentationItem>());
+	IfcSchema::IfcRepresentation::list::ptr reps (new IfcSchema::IfcRepresentation::list);
+	IfcSchema::IfcRepresentationItem::list::ptr items (new IfcSchema::IfcRepresentationItem::list);
 	IfcSchema::IfcShapeRepresentation* rep = new IfcSchema::IfcShapeRepresentation(context 
 		? context 
-		: getSingle<IfcSchema::IfcRepresentationContext>(), std::string("Body"), std::string("SweptSolid"), items);
+		: getRepresentationContext("Model"), std::string("Body"), std::string("SweptSolid"), items);
 	reps->push(rep);
 	IfcSchema::IfcProductDefinitionShape* shape = new IfcSchema::IfcProductDefinitionShape(0, 0, reps);		
-	AddEntity(rep);
-	AddEntity(shape);
+	addEntity(rep);
+	addEntity(shape);
 	addExtrudedPolyline(rep, points, h, place, place2, dir, context);
 
 	return shape;
@@ -285,9 +296,9 @@ void IfcHierarchyHelper::addBox(IfcSchema::IfcShapeRepresentation* rep, double w
 		IfcSchema::IfcExtrudedAreaSolid* solid = new IfcSchema::IfcExtrudedAreaSolid(profile, 
 			place2 ? place2 : addPlacement3d(), dir ? dir : addTriplet<IfcSchema::IfcDirection>(0, 0, 1), h);
 
-		AddEntity(profile);
-		AddEntity(solid);
-		IfcSchema::IfcRepresentationItem::list items = rep->Items();
+		addEntity(profile);
+		addEntity(solid);
+		IfcSchema::IfcRepresentationItem::list::ptr items = rep->Items();
 		items->push(solid);
 		rep->setItems(items);
 	} else {
@@ -296,95 +307,227 @@ void IfcHierarchyHelper::addBox(IfcSchema::IfcShapeRepresentation* rep, double w
 		points.push_back(std::pair<double, double>(w/2, -d/2));
 		points.push_back(std::pair<double, double>(w/2, d/2));
 		points.push_back(std::pair<double, double>(-w/2, d/2));
-		points.push_back(*points.begin());
+		// The call to addExtrudedPolyline() closes the polyline
 		addExtrudedPolyline(rep, points, h, place, place2, dir, context);
 	}
 }
 
+void IfcHierarchyHelper::addAxis(IfcSchema::IfcShapeRepresentation* rep, double l, IfcSchema::IfcRepresentationContext* context) {
+	IfcSchema::IfcCartesianPoint* p1 = addDoublet<IfcSchema::IfcCartesianPoint>(-l / 2., 0.);
+	IfcSchema::IfcCartesianPoint* p2 = addDoublet<IfcSchema::IfcCartesianPoint>(+l / 2., 0.);
+	IfcSchema::IfcCartesianPoint::list::ptr pts(new IfcSchema::IfcCartesianPoint::list);
+	pts->push(p1); pts->push(p2);
+	IfcSchema::IfcPolyline* poly = new IfcSchema::IfcPolyline(pts);
+	addEntity(poly);
+	
+	IfcSchema::IfcRepresentationItem::list::ptr items = rep->Items();
+	items->push(poly);
+	rep->setItems(items);
+}
+
 IfcSchema::IfcProductDefinitionShape* IfcHierarchyHelper::addBox(double w, double d, double h, IfcSchema::IfcAxis2Placement2D* place, 
 	IfcSchema::IfcAxis2Placement3D* place2, IfcSchema::IfcDirection* dir, IfcSchema::IfcRepresentationContext* context) 
 {
-	IfcSchema::IfcRepresentation::list reps (new IfcTemplatedEntityList<IfcSchema::IfcRepresentation>());
-	IfcSchema::IfcRepresentationItem::list items (new IfcTemplatedEntityList<IfcSchema::IfcRepresentationItem>());		
+	IfcSchema::IfcRepresentation::list::ptr reps (new IfcSchema::IfcRepresentation::list);
+	IfcSchema::IfcRepresentationItem::list::ptr items (new IfcSchema::IfcRepresentationItem::list);		
 	IfcSchema::IfcShapeRepresentation* rep = new IfcSchema::IfcShapeRepresentation(
-		context ? context : getSingle<IfcSchema::IfcRepresentationContext>(), std::string("Body"), std::string("SweptSolid"), items);
+		context ? context : getRepresentationContext("Model"), std::string("Body"), std::string("SweptSolid"), items);
 	reps->push(rep);
 	IfcSchema::IfcProductDefinitionShape* shape = new IfcSchema::IfcProductDefinitionShape(0, 0, reps);		
-	AddEntity(rep);
-	AddEntity(shape);
+	addEntity(rep);
+	addEntity(shape);
 	addBox(rep, w, d, h, place, place2, dir, context);
 	return shape;
 }
 
+IfcSchema::IfcProductDefinitionShape* IfcHierarchyHelper::addAxisBox(double w, double d, double h, IfcSchema::IfcRepresentationContext* context) 
+{
+	IfcSchema::IfcRepresentation::list::ptr reps(new IfcSchema::IfcRepresentation::list);
+	IfcSchema::IfcRepresentationItem::list::ptr body_items(new IfcSchema::IfcRepresentationItem::list);
+	IfcSchema::IfcRepresentationItem::list::ptr axis_items(new IfcSchema::IfcRepresentationItem::list);
+	IfcSchema::IfcShapeRepresentation* body_rep = new IfcSchema::IfcShapeRepresentation(
+		context ? context : getRepresentationContext("Model"), std::string("Body"), std::string("SweptSolid"), body_items);
+
+	IfcSchema::IfcShapeRepresentation* axis_rep = new IfcSchema::IfcShapeRepresentation(
+		context ? context : getRepresentationContext("Plan"), std::string("Axis"), std::string("Curve2D"), axis_items);
+
+	reps->push(axis_rep);
+	reps->push(body_rep);
+
+	IfcSchema::IfcProductDefinitionShape* shape = new IfcSchema::IfcProductDefinitionShape(0, 0, reps);		
+	addEntity(shape);
+	addEntity(body_rep);
+	addBox(body_rep, w, d, h, 0, 0, 0, context);
+	addEntity(axis_rep);
+	addAxis(axis_rep, w);
+	
+	return shape;
+}
+
 void IfcHierarchyHelper::clipRepresentation(IfcSchema::IfcProductRepresentation* shape, 
 	IfcSchema::IfcAxis2Placement3D* place, bool agree) 
 {
+	IfcSchema::IfcRepresentation::list::ptr reps = shape->Representations();
+	for (IfcSchema::IfcRepresentation::list::it j = reps->begin(); j != reps->end(); ++j) {
+		clipRepresentation(*j, place, agree);
+	}
+}
+
+void IfcHierarchyHelper::clipRepresentation(IfcSchema::IfcRepresentation* rep, 
+	IfcSchema::IfcAxis2Placement3D* place, bool agree) 
+{
+	if (rep->RepresentationIdentifier() != "Body") return;
 	IfcSchema::IfcPlane* plane = new IfcSchema::IfcPlane(place);
 	IfcSchema::IfcHalfSpaceSolid* half_space = new IfcSchema::IfcHalfSpaceSolid(plane, agree);
-	IfcSchema::IfcRepresentation::list reps = shape->Representations();
-	for (IfcSchema::IfcRepresentation::it j = reps->begin(); j != reps->end(); ++j) {
-		IfcSchema::IfcRepresentation* rep = *j;
-		if (rep->RepresentationIdentifier() != "Body") continue;
-		rep->setRepresentationType("Clipping");		
-		IfcSchema::IfcRepresentationItem::list items = rep->Items();
-		IfcSchema::IfcRepresentationItem::list new_items (new IfcTemplatedEntityList<IfcSchema::IfcRepresentationItem>());
-		AddEntity(plane);
-		AddEntity(half_space);
-		for (IfcSchema::IfcRepresentationItem::it i = items->begin(); i != items->end(); ++i) {
-			IfcSchema::IfcRepresentationItem* item = *i;
-			IfcSchema::IfcBooleanClippingResult* clip = new IfcSchema::IfcBooleanClippingResult(
-				IfcSchema::IfcBooleanOperator::IfcBooleanOperator_DIFFERENCE, item, half_space);
-			AddEntity(clip);
-			new_items->push(clip);
-		}
-		rep->setItems(new_items);
+	addEntity(plane);
+	addEntity(half_space);
+	rep->setRepresentationType("Clipping");		
+	IfcSchema::IfcRepresentationItem::list::ptr items = rep->Items();
+	IfcSchema::IfcRepresentationItem::list::ptr new_items (new IfcSchema::IfcRepresentationItem::list);
+	for (IfcSchema::IfcRepresentationItem::list::it i = items->begin(); i != items->end(); ++i) {
+		IfcSchema::IfcRepresentationItem* item = *i;
+		IfcSchema::IfcBooleanClippingResult* clip = new IfcSchema::IfcBooleanClippingResult(
+			IfcSchema::IfcBooleanOperator::IfcBooleanOperator_DIFFERENCE, item, half_space);
+		addEntity(clip);
+		new_items->push(clip);
 	}
+	rep->setItems(new_items);
 }
 
-IfcSchema::IfcPresentationStyleAssignment* IfcHierarchyHelper::setSurfaceColour(
-	IfcSchema::IfcProductRepresentation* shape, double r, double g, double b, double a) 
-{
+IfcSchema::IfcPresentationStyleAssignment* IfcHierarchyHelper::addStyleAssignment(double r, double g, double b, double a) {
 	IfcSchema::IfcColourRgb* colour = new IfcSchema::IfcColourRgb(boost::none, r, g, b);
 	IfcSchema::IfcSurfaceStyleRendering* rendering = a == 1.0
-		? new IfcSchema::IfcSurfaceStyleRendering(colour, boost::none, boost::none, boost::none, boost::none, boost::none, 
-			boost::none, boost::none, IfcSchema::IfcReflectanceMethodEnum::IfcReflectanceMethod_FLAT)
-		: new IfcSchema::IfcSurfaceStyleRendering(colour, 1.0-a, boost::none, boost::none, boost::none, boost::none, 
-			boost::none, boost::none, IfcSchema::IfcReflectanceMethodEnum::IfcReflectanceMethod_FLAT);
+		? new IfcSchema::IfcSurfaceStyleRendering(colour, boost::none, 0, 0, 0, 0, 
+			0, 0, IfcSchema::IfcReflectanceMethodEnum::IfcReflectanceMethod_FLAT)
+		: new IfcSchema::IfcSurfaceStyleRendering(colour, 1.0-a, 0, 0, 0, 0, 
+			0, 0, IfcSchema::IfcReflectanceMethodEnum::IfcReflectanceMethod_FLAT);
 
-	IfcEntities styles(new IfcEntityList());
+	IfcEntityList::ptr styles(new IfcEntityList());
 	styles->push(rendering);
 	IfcSchema::IfcSurfaceStyle* surface_style = new IfcSchema::IfcSurfaceStyle(
 		boost::none, IfcSchema::IfcSurfaceSide::IfcSurfaceSide_BOTH, styles);
-	IfcEntities surface_styles(new IfcEntityList());
+	IfcEntityList::ptr surface_styles(new IfcEntityList());
 	surface_styles->push(surface_style);
 	IfcSchema::IfcPresentationStyleAssignment* style_assignment = 
 		new IfcSchema::IfcPresentationStyleAssignment(surface_styles);
-	AddEntity(colour);
-	AddEntity(rendering);
-	AddEntity(surface_style);
-	AddEntity(style_assignment);
+	addEntity(colour);
+	addEntity(rendering);
+	addEntity(surface_style);
+	addEntity(style_assignment);
+	return style_assignment;
+}
+
+IfcSchema::IfcPresentationStyleAssignment* IfcHierarchyHelper::setSurfaceColour(
+	IfcSchema::IfcProductRepresentation* shape, double r, double g, double b, double a) 
+{
+	IfcSchema::IfcPresentationStyleAssignment* style_assignment = addStyleAssignment(r, g, b, a);
+	setSurfaceColour(shape, style_assignment);
+	return style_assignment;
+}
+
+IfcSchema::IfcPresentationStyleAssignment* IfcHierarchyHelper::setSurfaceColour(
+	IfcSchema::IfcRepresentation* shape, double r, double g, double b, double a) 
+{
+	IfcSchema::IfcPresentationStyleAssignment* style_assignment = addStyleAssignment(r, g, b, a);
 	setSurfaceColour(shape, style_assignment);
 	return style_assignment;
 }
 
 void IfcHierarchyHelper::setSurfaceColour(IfcSchema::IfcProductRepresentation* shape, 
 	IfcSchema::IfcPresentationStyleAssignment* style_assignment) 
+{
+	IfcSchema::IfcRepresentation::list::ptr reps = shape->Representations();
+	for (IfcSchema::IfcRepresentation::list::it j = reps->begin(); j != reps->end(); ++j) {
+		setSurfaceColour(*j, style_assignment);
+	}
+}
+
+void IfcHierarchyHelper::setSurfaceColour(IfcSchema::IfcRepresentation* rep, 
+	IfcSchema::IfcPresentationStyleAssignment* style_assignment) 
 {
 #ifdef USE_IFC4 
-	IfcEntities style_assignments (new IfcEntityList());
+	IfcEntityList::ptr style_assignments (new IfcEntityList);
 #else
-	IfcSchema::IfcPresentationStyleAssignment::list style_assignments (new IfcTemplatedEntityList<IfcSchema::IfcPresentationStyleAssignment>());
+	IfcSchema::IfcPresentationStyleAssignment::list::ptr style_assignments (new IfcSchema::IfcPresentationStyleAssignment::list);
 #endif
 	style_assignments->push(style_assignment);
-	IfcSchema::IfcRepresentation::list reps = shape->Representations();
-	for (IfcSchema::IfcRepresentation::it j = reps->begin(); j != reps->end(); ++j) {
-		IfcSchema::IfcRepresentation* rep = *j;
-		if (rep->RepresentationIdentifier() != "Body" && rep->RepresentationIdentifier() != "Facetation") continue;
-		IfcSchema::IfcRepresentationItem::list items = rep->Items();
-		for (IfcSchema::IfcRepresentationItem::it i = items->begin(); i != items->end(); ++i) {
-			IfcSchema::IfcRepresentationItem* item = *i;
-			IfcSchema::IfcStyledItem* styled_item = new IfcSchema::IfcStyledItem(item, style_assignments, boost::none);
-			AddEntity(styled_item);
-		}
+	IfcSchema::IfcRepresentationItem::list::ptr items = rep->Items();
+	for (IfcSchema::IfcRepresentationItem::list::it i = items->begin(); i != items->end(); ++i) {
+		IfcSchema::IfcRepresentationItem* item = *i;
+		IfcSchema::IfcStyledItem* styled_item = new IfcSchema::IfcStyledItem(item, style_assignments, boost::none);
+		addEntity(styled_item);
+	}
+}
+
+IfcSchema::IfcProductDefinitionShape* IfcHierarchyHelper::addMappedItem(
+	IfcSchema::IfcShapeRepresentation* rep, 
+	IfcSchema::IfcCartesianTransformationOperator3D* transform,
+	IfcSchema::IfcProductDefinitionShape* def)
+{
+	IfcSchema::IfcRepresentationMap::list::ptr maps = rep->RepresentationMap();
+	IfcSchema::IfcRepresentationMap* map;
+	if (maps->size() == 1) {
+		map = *maps->begin();
+	} else {
+		map = new IfcSchema::IfcRepresentationMap(addPlacement3d(), rep);
+		addEntity(map);
+	}
+
+	IfcSchema::IfcRepresentation::list::ptr representations(new IfcSchema::IfcRepresentation::list);
+	if (def) representations = def->Representations();
+
+	if (!transform) {
+		transform = new IfcSchema::IfcCartesianTransformationOperator3D(0, 0, addTriplet<IfcSchema::IfcCartesianPoint>(0,0,0), boost::none, 0);
+		addEntity(transform);
+	}
+	IfcSchema::IfcMappedItem* item = new IfcSchema::IfcMappedItem(map, transform);
+	IfcSchema::IfcRepresentationItem::list::ptr items(new IfcSchema::IfcRepresentationItem::list);
+	items->push(item);
+	IfcSchema::IfcRepresentation* new_rep = new IfcSchema::IfcShapeRepresentation(rep->ContextOfItems(), boost::none, std::string("MappedRepresentation"), items);
+	if (rep->hasRepresentationIdentifier()) {
+		new_rep->setRepresentationIdentifier(rep->RepresentationIdentifier());
+	}	
+	addEntity(item);
+	addEntity(new_rep);
+	representations->push(new_rep);
+	if (!def) {
+		def = new IfcSchema::IfcProductDefinitionShape(boost::none, boost::none, representations);
+		addEntity(def);
+	} else {
+		def->setRepresentations(representations);
 	}
+	return def;
 }
+
+IfcSchema::IfcProductDefinitionShape* IfcHierarchyHelper::addMappedItem(
+	IfcSchema::IfcShapeRepresentation::list::ptr reps, 
+	IfcSchema::IfcCartesianTransformationOperator3D* transform)
+{
+	IfcSchema::IfcProductDefinitionShape* def = 0;
+	for (IfcSchema::IfcShapeRepresentation::list::it it = reps->begin(); it != reps->end(); ++it) {
+		def = addMappedItem(*it, transform, def);
+	}
+	return def;
+}
+
+IfcSchema::IfcShapeRepresentation* IfcHierarchyHelper::addEmptyRepresentation(const std::string& repid, const std::string& reptype) {
+	IfcSchema::IfcRepresentationItem::list::ptr items(new IfcSchema::IfcRepresentationItem::list);
+	IfcSchema::IfcShapeRepresentation* shape_rep = new IfcSchema::IfcShapeRepresentation(getRepresentationContext(reptype == "Curve2D" ? "Plan" : "Model"), repid, reptype, items);
+	addEntity(shape_rep);
+	return shape_rep;
+}
+
+IfcSchema::IfcGeometricRepresentationContext* IfcHierarchyHelper::getRepresentationContext(const std::string& s) {
+	std::map<std::string, IfcSchema::IfcGeometricRepresentationContext*>::const_iterator it = contexts.find(s);
+	if (it != contexts.end()) return it->second;
+	else {
+		IfcSchema::IfcProject* project = getSingle<IfcSchema::IfcProject>();
+		IfcSchema::IfcRepresentationContext::list::ptr project_contexts = project->RepresentationContexts();
+		IfcSchema::IfcGeometricRepresentationContext* context = new IfcSchema::IfcGeometricRepresentationContext(
+			boost::none, s, 3, 1e-5, addPlacement3d(), addDoublet<IfcSchema::IfcDirection>(0, 1));
+		addEntity(context);
+		project_contexts->push(context);
+		project->setRepresentationContexts(project_contexts);
+		return contexts[s] = context;
+	}
+}
\ No newline at end of file
diff --git a/src/ifcparse/IfcHierarchyHelper.h b/src/ifcparse/IfcHierarchyHelper.h
index ca4e16f..efa9fdd 100644
--- a/src/ifcparse/IfcHierarchyHelper.h
+++ b/src/ifcparse/IfcHierarchyHelper.h
@@ -28,13 +28,14 @@
 #ifndef IFCHIERARCHYHELPER_H
 #define IFCHIERARCHYHELPER_H
 
+#include <map>
+
 #ifdef USE_IFC4
 #include "../ifcparse/Ifc4.h"
 #else
 #include "../ifcparse/Ifc2x3.h"
 #endif
 #include "../ifcparse/IfcFile.h"
-#include "../ifcparse/IfcSpfStream.h"
 #include "../ifcparse/IfcWrite.h"
 
 class IfcHierarchyHelper : public IfcParse::IfcFile {
@@ -43,7 +44,7 @@ class IfcHierarchyHelper : public IfcParse::IfcFile {
 	T* addTriplet(double x, double y, double z) {
 		std::vector<double> a; a.push_back(x); a.push_back(y); a.push_back(z);
 		T* t = new T(a);
-		AddEntity(t);
+		addEntity(t);
 		return t;
 	}
 
@@ -51,14 +52,14 @@ class IfcHierarchyHelper : public IfcParse::IfcFile {
 	T* addDoublet(double x, double y) {
 		std::vector<double> a; a.push_back(x); a.push_back(y);
 		T* t = new T(a);
-		AddEntity(t);
+		addEntity(t);
 		return t;
 	}
 
 	template <class T>
 	T* getSingle() {
-		typename T::list ts = EntitiesByType<T>();
-		if (ts->Size() != 1) return 0;
+		typename T::list::ptr ts = entitiesByType<T>();
+		if (ts->size() != 1) return 0;
 		return *ts->begin();
 	}
 	
@@ -69,7 +70,8 @@ class IfcHierarchyHelper : public IfcParse::IfcFile {
 	IfcSchema::IfcAxis2Placement2D* addPlacement2d(double ox=0.0, double oy=0.0,
 		double xx=1.0, double xy=0.0);
 
-	IfcSchema::IfcLocalPlacement* addLocalPlacement(double ox=0.0, double oy=0.0, double oz=0.0,
+	IfcSchema::IfcLocalPlacement* addLocalPlacement(IfcSchema::IfcObjectPlacement* parent = 0,
+		double ox=0.0, double oy=0.0, double oz=0.0,
 		double zx=0.0, double zy=0.0, double zz=1.0,
 		double xx=1.0, double xy=0.0, double xz=0.0);
 
@@ -77,12 +79,12 @@ class IfcHierarchyHelper : public IfcParse::IfcFile {
 	void addRelatedObject(IfcSchema::IfcObjectDefinition* related_object, 
 		IfcSchema::IfcObjectDefinition* relating_object, IfcSchema::IfcOwnerHistory* owner_hist = 0)
 	{
-		typename T::list li = EntitiesByType<T>();
+		typename T::list::ptr li = entitiesByType<T>();
 		bool found = false;
-		for (typename T::it i = li->begin(); i != li->end(); ++i) {
+		for (typename T::list::it i = li->begin(); i != li->end(); ++i) {
 			T* rel = *i;
 			if (rel->RelatingObject() == relating_object) {
-				IfcSchema::IfcObjectDefinition::list products = rel->RelatedObjects();
+				IfcSchema::IfcObjectDefinition::list::ptr products = rel->RelatedObjects();
 				products->push(related_object);
 				rel->setRelatedObjects(products);
 				found = true;
@@ -96,10 +98,10 @@ class IfcHierarchyHelper : public IfcParse::IfcFile {
 			if (! owner_hist) {
 				owner_hist = addOwnerHistory();
 			}
-			IfcSchema::IfcObjectDefinition::list relating_objects (new IfcTemplatedEntityList<IfcSchema::IfcObjectDefinition>());
+			IfcSchema::IfcObjectDefinition::list::ptr relating_objects (new IfcTemplatedEntityList<IfcSchema::IfcObjectDefinition>());
 			relating_objects->push(relating_object);
 			T* t = new T(IfcWrite::IfcGuidHelper(), owner_hist, boost::none, boost::none, related_object, relating_objects);
-			AddEntity(t);
+			addEntity(t);
 		}
 	}
 
@@ -130,27 +132,55 @@ class IfcHierarchyHelper : public IfcParse::IfcFile {
 	IfcSchema::IfcProductDefinitionShape* addBox(double w, double d, double h, IfcSchema::IfcAxis2Placement2D* place=0, 
 		IfcSchema::IfcAxis2Placement3D* place2=0, IfcSchema::IfcDirection* dir=0, IfcSchema::IfcRepresentationContext* context=0);
 
+	void addAxis(IfcSchema::IfcShapeRepresentation* rep, double l, IfcSchema::IfcRepresentationContext* context=0);
+
+	IfcSchema::IfcProductDefinitionShape* addAxisBox(double w, double d, double h, IfcSchema::IfcRepresentationContext* context=0);
+
 	void clipRepresentation(IfcSchema::IfcProductRepresentation* shape, 
 		IfcSchema::IfcAxis2Placement3D* place, bool agree);
 
+	void clipRepresentation(IfcSchema::IfcRepresentation* shape, 
+		IfcSchema::IfcAxis2Placement3D* place, bool agree);
+
+	IfcSchema::IfcPresentationStyleAssignment* addStyleAssignment(double r, double g, double b, double a=1.0);
+
 	IfcSchema::IfcPresentationStyleAssignment* setSurfaceColour(IfcSchema::IfcProductRepresentation* shape, 
 		double r, double g, double b, double a=1.0);
 
+	IfcSchema::IfcPresentationStyleAssignment* setSurfaceColour(IfcSchema::IfcRepresentation* shape, 
+		double r, double g, double b, double a=1.0);
+
 	void setSurfaceColour(IfcSchema::IfcProductRepresentation* shape, 
 		IfcSchema::IfcPresentationStyleAssignment* style_assignment);
 
+	void setSurfaceColour(IfcSchema::IfcRepresentation* shape, 
+		IfcSchema::IfcPresentationStyleAssignment* style_assignment);
+
+	IfcSchema::IfcProductDefinitionShape* addMappedItem(IfcSchema::IfcShapeRepresentation*, 
+		IfcSchema::IfcCartesianTransformationOperator3D* transform = 0,
+		IfcSchema::IfcProductDefinitionShape* def = 0);
+
+	IfcSchema::IfcProductDefinitionShape* addMappedItem(IfcSchema::IfcShapeRepresentation::list::ptr, 
+		IfcSchema::IfcCartesianTransformationOperator3D* transform = 0);
+	
+	IfcSchema::IfcShapeRepresentation* addEmptyRepresentation(const std::string& repid = "Body", const std::string& reptype = "SweptSolid");
+
+	IfcSchema::IfcGeometricRepresentationContext* getRepresentationContext(const std::string&);
+
+private:
+	std::map<std::string, IfcSchema::IfcGeometricRepresentationContext*> contexts;
 };
 
 template <>
 inline void IfcHierarchyHelper::addRelatedObject <IfcSchema::IfcRelContainedInSpatialStructure> (IfcSchema::IfcObjectDefinition* related_object, 
 	IfcSchema::IfcObjectDefinition* relating_object, IfcSchema::IfcOwnerHistory* owner_hist)
 {
-	IfcSchema::IfcRelContainedInSpatialStructure::list li = EntitiesByType<IfcSchema::IfcRelContainedInSpatialStructure>();
+	IfcSchema::IfcRelContainedInSpatialStructure::list::ptr li = entitiesByType<IfcSchema::IfcRelContainedInSpatialStructure>();
 	bool found = false;
-	for (IfcSchema::IfcRelContainedInSpatialStructure::it i = li->begin(); i != li->end(); ++i) {
+	for (IfcSchema::IfcRelContainedInSpatialStructure::list::it i = li->begin(); i != li->end(); ++i) {
 		IfcSchema::IfcRelContainedInSpatialStructure* rel = *i;
 		if (rel->RelatingStructure() == relating_object) {
-			IfcSchema::IfcProduct::list products = rel->RelatedElements();
+			IfcSchema::IfcProduct::list::ptr products = rel->RelatedElements();
 			products->push((IfcSchema::IfcProduct*)related_object);
 			rel->setRelatedElements(products);
 			found = true;
@@ -164,12 +194,12 @@ inline void IfcHierarchyHelper::addRelatedObject <IfcSchema::IfcRelContainedInSp
 		if (! owner_hist) {
 			owner_hist = addOwnerHistory();
 		}
-		IfcSchema::IfcProduct::list relating_objects (new IfcTemplatedEntityList<IfcSchema::IfcProduct>());
+		IfcSchema::IfcProduct::list::ptr relating_objects (new IfcTemplatedEntityList<IfcSchema::IfcProduct>());
 		relating_objects->push((IfcSchema::IfcProduct*)relating_object);
 		IfcSchema::IfcRelContainedInSpatialStructure* t = new IfcSchema::IfcRelContainedInSpatialStructure(IfcWrite::IfcGuidHelper(), owner_hist, 
 			boost::none, boost::none, relating_objects, (IfcSchema::IfcSpatialStructureElement*)related_object);
 
-		AddEntity(t);
+		addEntity(t);
 	}
 }
 
diff --git a/src/ifcparse/IfcLateBoundEntity.cpp b/src/ifcparse/IfcLateBoundEntity.cpp
new file mode 100644
index 0000000..b21798c
--- /dev/null
+++ b/src/ifcparse/IfcLateBoundEntity.cpp
@@ -0,0 +1,234 @@
+/********************************************************************************
+ *                                                                              *
+ * This file is part of IfcOpenShell.                                           *
+ *                                                                              *
+ * IfcOpenShell is free software: you can redistribute it and/or modify         *
+ * it under the terms of the Lesser GNU General Public License as published by  *
+ * the Free Software Foundation, either version 3.0 of the License, or          *
+ * (at your option) any later version.                                          *
+ *                                                                              *
+ * IfcOpenShell 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                 *
+ * Lesser GNU General Public License for more details.                          *
+ *                                                                              *
+ * You should have received a copy of the Lesser GNU General Public License     *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.         *
+ *                                                                              *
+ ********************************************************************************/
+
+#include <sstream>
+
+#include "../ifcparse/IfcWritableEntity.h"
+
+#include "../ifcparse/IfcUtil.h"
+#include "../ifcparse/IfcWrite.h"
+
+#ifdef USE_IFC4
+#include "../ifcparse/Ifc4-latebound.h"
+#else
+#include "../ifcparse/Ifc2x3-latebound.h"
+#endif
+
+#include "IfcLateBoundEntity.h"
+
+using namespace IfcUtil;
+
+IfcWrite::IfcWritableEntity* IfcParse::IfcLateBoundEntity::writable_entity() {
+	IfcWrite::IfcWritableEntity* e;
+	if (entity->isWritable()) {
+		e = (IfcWrite::IfcWritableEntity*) entity;
+	} else {
+		entity = e = new IfcWrite::IfcWritableEntity(entity);
+	}
+	return e;
+}
+IfcParse::IfcLateBoundEntity::IfcLateBoundEntity(const std::string& s) {
+	std::string S = s;
+	for (std::string::iterator i = S.begin(); i != S.end(); ++i ) *i = toupper(*i);
+	_type = IfcSchema::Type::FromString(S);
+	entity = new IfcWrite::IfcWritableEntity(_type);
+	for (unsigned i = 0; i < getArgumentCount(); ++i) {
+		// Side effect of this is that a NULL attribute is created.
+		entity->getArgument(i);
+	}
+	IfcSchema::Type::PopulateDerivedFields(writable_entity());
+}
+IfcParse::IfcLateBoundEntity::IfcLateBoundEntity(IfcAbstractEntity* e) {
+	entity = e;
+	_type = e->type();
+}
+unsigned int IfcParse::IfcLateBoundEntity::id() const {
+	if (entity->file) {
+		return static_cast<unsigned int>(entity->id());
+	} else {
+		throw IfcException("Entity not bound to a file");
+	}
+}
+bool IfcParse::IfcLateBoundEntity::is(IfcSchema::Type::Enum v) const {
+	IfcSchema::Type::Enum _ty = _type;
+	if (v == _ty) return true;
+	while (_ty != -1) {
+		_ty = IfcSchema::Type::Parent(_ty);
+		if (v == _ty) return true;
+	}
+	return false;	
+}
+std::string IfcParse::IfcLateBoundEntity::is_a() const {
+	return IfcSchema::Type::ToString(_type);
+}
+bool IfcParse::IfcLateBoundEntity::is_a(const std::string& s) const {
+	std::string S = s;
+	for (std::string::iterator i = S.begin(); i != S.end(); ++i ) *i = toupper(*i);
+	return is(IfcSchema::Type::FromString(S));
+}
+IfcSchema::Type::Enum IfcParse::IfcLateBoundEntity::type() const {
+	return _type;
+}
+unsigned int IfcParse::IfcLateBoundEntity::getArgumentCount() const {
+	return IfcSchema::Type::GetAttributeCount(_type);
+}
+IfcUtil::ArgumentType IfcParse::IfcLateBoundEntity::getArgumentType(unsigned int i) const {
+	return IfcSchema::Type::GetAttributeDerived(_type, i)
+		? IfcUtil::Argument_DERIVED
+		: IfcSchema::Type::GetAttributeType(_type,i);
+}
+IfcSchema::Type::Enum IfcParse::IfcLateBoundEntity::getArgumentEntity(unsigned int i) const {
+	return IfcSchema::Type::GetAttributeEntity(_type, i);
+}
+Argument* IfcParse::IfcLateBoundEntity::getArgument(unsigned int i) const {
+	return entity->getArgument(i);
+}
+const char* IfcParse::IfcLateBoundEntity::getArgumentName(unsigned int i) const {
+	return IfcSchema::Type::GetAttributeName(_type,i).c_str();
+}
+bool IfcParse::IfcLateBoundEntity::getArgumentOptionality(unsigned int i) const {
+	return IfcSchema::Type::GetAttributeOptional(_type, i);
+}
+
+void IfcParse::IfcLateBoundEntity::invalid_argument(unsigned int i, const std::string& t) {
+	const std::string arg_name = IfcSchema::Type::GetAttributeName(_type,i);
+	throw IfcException(t + " is not a valid type for '" + arg_name + "'");
+}
+void IfcParse::IfcLateBoundEntity::setArgument(unsigned int i) {
+	bool is_optional = IfcSchema::Type::GetAttributeOptional(_type, i);
+	if (is_optional) {
+		writable_entity()->setArgument(i);
+	} else invalid_argument(i,"NULL");
+}
+void IfcParse::IfcLateBoundEntity::setArgument(unsigned int i, int v) {
+	IfcUtil::ArgumentType arg_type = IfcSchema::Type::GetAttributeType(_type,i);
+	if (arg_type == Argument_INT) {
+		writable_entity()->setArgument(i,v);	
+	} else if ( (arg_type == Argument_BOOL) && ( (v == 0) || (v == 1) ) ) {
+		writable_entity()->setArgument(i, v == 1);
+	} else invalid_argument(i,"INT");
+}
+void IfcParse::IfcLateBoundEntity::setArgument(unsigned int i, bool v) {
+	IfcUtil::ArgumentType arg_type = IfcSchema::Type::GetAttributeType(_type,i);
+	if (arg_type == Argument_BOOL) {
+		writable_entity()->setArgument(i,v);	
+	} else invalid_argument(i,"BOOL");
+}
+void IfcParse::IfcLateBoundEntity::setArgument(unsigned int i, double v) {
+	IfcUtil::ArgumentType arg_type = IfcSchema::Type::GetAttributeType(_type,i);
+	if (arg_type == Argument_DOUBLE) {
+		writable_entity()->setArgument(i,v);	
+	} else invalid_argument(i,"DOUBLE");
+}
+void IfcParse::IfcLateBoundEntity::setArgument(unsigned int i, const std::string& a) {
+	IfcUtil::ArgumentType arg_type = IfcSchema::Type::GetAttributeType(_type,i);
+	if (arg_type == Argument_STRING) {
+		writable_entity()->setArgument(i,a);	
+	} else if (arg_type == Argument_ENUMERATION) {
+		std::pair<const char*, int> enum_data = IfcSchema::Type::GetEnumerationIndex(IfcSchema::Type::GetAttributeEntity(_type, i), a);
+		writable_entity()->setArgument(i, enum_data.second, enum_data.first);
+	} else invalid_argument(i,"STRING");
+}
+void IfcParse::IfcLateBoundEntity::setArgument(unsigned int i, const std::vector<int>& v) {
+	IfcUtil::ArgumentType arg_type = IfcSchema::Type::GetAttributeType(_type,i);
+	if (arg_type == Argument_VECTOR_INT) {
+		writable_entity()->setArgument(i,v);	
+	} else invalid_argument(i,"LIST of INT");
+}
+void IfcParse::IfcLateBoundEntity::setArgument(unsigned int i, const std::vector<double>& v) {
+	IfcUtil::ArgumentType arg_type = IfcSchema::Type::GetAttributeType(_type,i);
+	if (arg_type == Argument_VECTOR_DOUBLE) {
+		writable_entity()->setArgument(i,v);	
+	} else invalid_argument(i,"LIST of DOUBLE");
+}
+void IfcParse::IfcLateBoundEntity::setArgument(unsigned int i, const std::vector<std::string>& v) {
+	IfcUtil::ArgumentType arg_type = IfcSchema::Type::GetAttributeType(_type,i);
+	if (arg_type == Argument_VECTOR_STRING) {
+		writable_entity()->setArgument(i,v);	
+	} else invalid_argument(i,"LIST of STRING");
+}
+void IfcParse::IfcLateBoundEntity::setArgument(unsigned int i, IfcParse::IfcLateBoundEntity* v) {
+	IfcUtil::ArgumentType arg_type = IfcSchema::Type::GetAttributeType(_type,i);
+	if (arg_type == Argument_ENTITY) {
+		writable_entity()->setArgument(i,v);	
+	} else invalid_argument(i,"ENTITY");
+}
+void IfcParse::IfcLateBoundEntity::setArgument(unsigned int i, IfcEntityList::ptr v) {
+	IfcUtil::ArgumentType arg_type = IfcSchema::Type::GetAttributeType(_type,i);
+	if (arg_type == Argument_ENTITY_LIST) {
+		writable_entity()->setArgument(i,v);	
+	} else invalid_argument(i,"LIST of ENTITY");
+}
+std::pair<IfcUtil::ArgumentType,Argument*> IfcParse::IfcLateBoundEntity::get_argument(unsigned i) {
+	return std::pair<IfcUtil::ArgumentType,Argument*>(getArgumentType(i),getArgument(i));
+}
+std::pair<IfcUtil::ArgumentType,Argument*> IfcParse::IfcLateBoundEntity::get_argument(const std::string& a) {
+	return get_argument(IfcSchema::Type::GetAttributeIndex(_type,a));
+}
+unsigned IfcParse::IfcLateBoundEntity::getArgumentIndex(const std::string& a) const {
+	return IfcSchema::Type::GetAttributeIndex(_type,a);
+}
+std::string IfcParse::IfcLateBoundEntity::toString() {
+	return entity->toString(false);
+}
+IfcEntityList::ptr IfcParse::IfcLateBoundEntity::get_inverse(const std::string& a) {
+	std::pair<IfcSchema::Type::Enum, unsigned> inv = IfcSchema::Type::GetInverseAttribute(_type, a);
+	return entity->getInverse(inv.first, inv.second);
+}		
+bool IfcParse::IfcLateBoundEntity::is_valid() {
+	const unsigned arg_count = getArgumentCount();
+	bool valid = true;
+	std::ostringstream oss;
+	oss << "Argument ";
+	for (unsigned i = 0; i < arg_count; ++i) {
+		bool is_null = true;
+		try {
+			const Argument& arg = *getArgument(i);
+			is_null = arg.isNull();
+		} catch(IfcException) {}
+		if (!IfcSchema::Type::GetAttributeOptional(_type,i) && is_null) {
+			if (!valid) {
+				oss << ", ";
+			}
+			oss << "\"" << getArgumentName(i) << "\"";
+			valid = false;
+		}
+	}
+	oss << " not optional";
+	if (!valid) {
+		throw IfcException(oss.str());
+	}
+	return valid;
+}
+
+std::vector<std::string> IfcParse::IfcLateBoundEntity::getAttributeNames() const {
+	std::vector<std::string> return_value;
+	return_value.reserve(getArgumentCount());
+	for (unsigned i = 0; i < getArgumentCount(); ++i) {
+		return_value.push_back(getArgumentName(i));
+	}
+	return return_value;
+}
+
+std::vector<std::string> IfcParse::IfcLateBoundEntity::getInverseAttributeNames() const {
+	std::vector<std::string> return_value;
+	std::set<std::string> values = IfcSchema::Type::GetInverseAttributeNames(_type);
+	std::copy(values.begin(), values.end(), std::back_inserter(return_value));
+	return return_value;
+}
diff --git a/src/ifcparse/IfcLateBoundEntity.h b/src/ifcparse/IfcLateBoundEntity.h
new file mode 100644
index 0000000..8642cd6
--- /dev/null
+++ b/src/ifcparse/IfcLateBoundEntity.h
@@ -0,0 +1,85 @@
+/********************************************************************************
+ *                                                                              *
+ * This file is part of IfcOpenShell.                                           *
+ *                                                                              *
+ * IfcOpenShell is free software: you can redistribute it and/or modify         *
+ * it under the terms of the Lesser GNU General Public License as published by  *
+ * the Free Software Foundation, either version 3.0 of the License, or          *
+ * (at your option) any later version.                                          *
+ *                                                                              *
+ * IfcOpenShell 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                 *
+ * Lesser GNU General Public License for more details.                          *
+ *                                                                              *
+ * You should have received a copy of the Lesser GNU General Public License     *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.         *
+ *                                                                              *
+ ********************************************************************************/
+
+#ifndef IFCLATEBOUNDENTITY_H
+#define IFCLATEBOUNDENTITY_H
+
+#include <string>
+
+#include "../ifcparse/IfcUtil.h"
+#include "../ifcparse/IfcWrite.h"
+#include "../ifcparse/IfcWritableEntity.h"
+
+namespace IfcParse {
+	
+	// TODO: Somehow these methods should become part of IfcBaseEntity directly so
+	// that in the IfcFile class the distinction what entity type to be created is 
+	// no longer necessary and weird diagonal casts when creating geometry from
+	// IfcLateBoundEntities are eliminated.
+	class IfcLateBoundEntity : public IfcUtil::IfcBaseEntity {
+	private:
+		IfcSchema::Type::Enum _type;
+		IfcWrite::IfcWritableEntity* writable_entity();
+		void invalid_argument(unsigned int i, const std::string& t);
+	public:
+		IfcLateBoundEntity(const std::string& s);
+		IfcLateBoundEntity(IfcAbstractEntity* e);
+		
+		bool is(IfcSchema::Type::Enum v) const;
+		IfcSchema::Type::Enum type() const;	
+		bool is_a(const std::string& s) const;
+		std::string is_a() const;
+
+		unsigned int id() const;
+		unsigned int getArgumentCount() const;
+		IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
+		IfcSchema::Type::Enum getArgumentEntity(unsigned int i) const;
+		Argument* getArgument(unsigned int i) const;
+		const char* getArgumentName(unsigned int i) const;
+		unsigned getArgumentIndex(const std::string& a) const;
+		bool getArgumentOptionality(unsigned int i) const;
+
+		IfcEntityList::ptr get_inverse(const std::string& a);
+
+		std::vector<std::string> getAttributeNames() const;
+		std::vector<std::string> getInverseAttributeNames() const;
+
+		void setArgument(unsigned int i);
+		void setArgument(unsigned int i, int v);
+		void setArgument(unsigned int i, bool v);
+		void setArgument(unsigned int i, double v);
+		void setArgument(unsigned int i, const std::string& v);
+		void setArgument(unsigned int i, const std::vector<int>& v);
+		void setArgument(unsigned int i, const std::vector<double>& v);
+		void setArgument(unsigned int i, const std::vector<std::string>& v);
+		void setArgument(unsigned int i, IfcLateBoundEntity* v);
+		void setArgument(unsigned int i, IfcEntityList::ptr v);
+
+		std::string toString();
+		
+		// TODO: Write as SWIG extension methods?
+		std::pair<IfcUtil::ArgumentType,Argument*> get_argument(unsigned i);
+		std::pair<IfcUtil::ArgumentType,Argument*> get_argument(const std::string& a);
+
+		bool is_valid();
+	};
+
+}
+
+#endif
\ No newline at end of file
diff --git a/src/ifcparse/IfcParse.cpp b/src/ifcparse/IfcParse.cpp
index e79e8e9..4347e52 100644
--- a/src/ifcparse/IfcParse.cpp
+++ b/src/ifcparse/IfcParse.cpp
@@ -17,6 +17,7 @@
 *                                                                              *
 ********************************************************************************/
 
+#include <set>
 #include <algorithm>
 #include <string>
 #include <stdio.h>
@@ -32,19 +33,43 @@
 #include "../ifcparse/IfcException.h"
 #include "../ifcparse/IfcUtil.h"
 #include "../ifcparse/IfcSpfStream.h"
-#include "../ifcparse/IfcFile.h"
 #include "../ifcparse/IfcWritableEntity.h"
-
-#include "../ifcparse/IfcUntypedEntity.h"
+#include "../ifcparse/IfcLateBoundEntity.h"
+#include "../ifcparse/IfcFile.h"
+#include "../ifcparse/IfcSIPrefix.h"
 
 using namespace IfcParse;
 
+// A static locale for the real number parser. strtod() is locale-dependent, causing issues 
+// in locales that have ',' as a decimal separator. Therefore the non standard _strtod_l() / 
+// strtod_l() is used and a reference to the "C" locale is obtained here. The alternative is 
+// to use std::istringstream::imbue(std::locale::classic()), but there are subtleties in 
+// parsing in MSVC2010 and it appears to be much slower. 
+#ifdef _MSC_VER
+static _locale_t locale = (_locale_t) 0;
+void init_locale() {
+	if (locale == (_locale_t) 0) {
+		locale = _create_locale(LC_NUMERIC, "C");
+	}
+}
+#else
+#ifdef __APPLE__
+#include <xlocale.h>
+#endif
+static locale_t locale = (locale_t) 0;
+void init_locale() {
+	if (locale == (locale_t) 0) {
+		locale = newlocale(LC_NUMERIC_MASK, "C", (locale_t) 0);
+	}
+}
+#endif
+
 // 
 // Opens the file, gets the filesize and reads a chunk in memory
 //
 IfcSpfStream::IfcSpfStream(const std::string& fn) {
 	eof = false;
-#ifdef _MSC_VER_NO
+#ifdef _MSC_VER
 	int fn_buffer_size = MultiByteToWideChar(CP_UTF8, 0, fn.c_str(), -1, 0, 0);
 	wchar_t* fn_wide = new wchar_t[fn_buffer_size];
 	MultiByteToWideChar(CP_UTF8, 0, fn.c_str(), -1, fn_wide, fn_buffer_size);
@@ -211,17 +236,17 @@ void IfcSpfStream::Inc() {
 	if ( current == '\n' || current == '\r' ) IfcSpfStream::Inc();
 }
 
-Tokens::Tokens(IfcParse::IfcSpfStream *s, IfcParse::IfcFile* f) {
+IfcSpfLexer::IfcSpfLexer(IfcParse::IfcSpfStream *s, IfcParse::IfcFile* f) {
 	file = f;
 	stream = s;
 	decoder = new IfcCharacterDecoder(s);
 }
 
-Tokens::~Tokens() {
+IfcSpfLexer::~IfcSpfLexer() {
 	delete decoder;
 }
 
-unsigned int Tokens::skipWhitespace() {
+unsigned int IfcSpfLexer::skipWhitespace() {
 	unsigned int n = 0;
 	while ( !stream->eof ) {
 		char c = stream->Peek();
@@ -234,7 +259,7 @@ unsigned int Tokens::skipWhitespace() {
 	return n;
 }
 
-unsigned int Tokens::skipComment() {
+unsigned int IfcSpfLexer::skipComment() {
 	char c = stream->Peek();
 	if (c != '/') return 0;
 	stream->Inc();
@@ -258,7 +283,7 @@ unsigned int Tokens::skipComment() {
 //
 // Returns the offset of the current Token and moves cursor to next
 //
-Token Tokens::Next() {
+Token IfcSpfLexer::Next() {
 
 	if ( stream->eof ) return TokenPtr();
 
@@ -299,7 +324,7 @@ Token Tokens::Next() {
 // Reads a std::string from the file at specified offset
 // Omits whitespace and comments
 //
-std::string Tokens::TokenString(unsigned int offset) {
+std::string IfcSpfLexer::TokenString(unsigned int offset) {
 	const bool was_eof = stream->eof;
 	unsigned int old_offset = stream->Tell();
 	stream->Seek(offset);
@@ -324,9 +349,9 @@ std::string Tokens::TokenString(unsigned int offset) {
 // Functions for creating Tokens from an arbitary file offset.
 // The first 4 bits are reserved for Tokens of type ()=,;$*
 //
-Token IfcParse::TokenPtr(Tokens* tokens, unsigned int offset) { return Token(tokens,offset); }
-Token IfcParse::TokenPtr(char c) { return Token((Tokens*)0,(unsigned) c); }
-Token IfcParse::TokenPtr() { return Token((Tokens*)0,0); }
+Token IfcParse::TokenPtr(IfcSpfLexer* tokens, unsigned int offset) { return Token(tokens,offset); }
+Token IfcParse::TokenPtr(char c) { return Token((IfcSpfLexer*)0,(unsigned) c); }
+Token IfcParse::TokenPtr() { return Token((IfcSpfLexer*)0,0); }
 
 //
 // Functions to convert Tokens to binary data
@@ -334,21 +359,60 @@ Token IfcParse::TokenPtr() { return Token((Tokens*)0,0); }
 bool TokenFunc::startsWith(const Token& t, char c) {
 	return t.first->stream->Read(t.second) == c;
 }
+
 bool TokenFunc::isOperator(const Token& t, char op) {
 	return (!t.first) && (!op || op == t.second);
 }
+
 bool TokenFunc::isIdentifier(const Token& t) {
 	return ! isOperator(t) && startsWith(t, '#');
 }
+
 bool TokenFunc::isString(const Token& t) {
 	return ! isOperator(t) && startsWith(t, '\'');
 }
+
 bool TokenFunc::isEnumeration(const Token& t) {
 	return ! isOperator(t) && startsWith(t, '.');
 }
-bool TokenFunc::isDatatype(const Token& t) {
-	return ! isOperator(t) && startsWith(t, 'I');
+
+bool TokenFunc::isKeyword(const Token& t) {
+	// bool is a subtype of enumeration, no need to test for that
+	return !isOperator(t) && !isIdentifier(t) && !isString(t) && !isEnumeration(t) && !isInt(t) && !isFloat(t);
+}
+
+bool TokenFunc::isInt(const Token& t) {
+	if (isOperator(t) || isString(t) || isEnumeration(t)) {
+		return false;
+	}
+	const std::string str = asString(t);
+	const char* start = str.c_str();
+	char* end;
+	long result = strtol(start,&end,10);
+	return ((end - start) == str.length());
+}
+
+bool TokenFunc::isBool(const Token& t) {
+	if (!isEnumeration(t)) return false;
+	const std::string str = asString(t);
+	return str == "T" || str == "F";
+}
+
+bool TokenFunc::isFloat(const Token& t) {
+	if (isOperator(t) || isString(t) || isEnumeration(t)) {
+		return false;
+	}
+	const std::string str = asString(t);
+	const char* start = str.c_str();
+	char* end;
+#ifdef _MSC_VER
+	double result = _strtod_l(start,&end,locale);
+#else
+	double result = strtod_l(start,&end,locale);
+#endif
+	return ((end - start) == str.length());
 }
+
 int TokenFunc::asInt(const Token& t) {
 	const std::string str = asString(t);
 	// In case of an ENTITY_INSTANCE_NAME skip the leading #
@@ -358,24 +422,32 @@ int TokenFunc::asInt(const Token& t) {
 	if ( start == end ) throw IfcException("Token is not an integer or identifier");
 	return (int) result;
 }
+
 bool TokenFunc::asBool(const Token& t) {
 	const std::string str = asString(t);
 	return str == "T";
 }
+
 double TokenFunc::asFloat(const Token& t) {
 	const std::string str = asString(t);
 	const char* start = str.c_str();
 	char* end;
-	double result = strtod(start,&end);
+#ifdef _MSC_VER
+	double result = _strtod_l(start,&end,locale);
+#else
+	double result = strtod_l(start,&end,locale);
+#endif
 	if ( start == end ) throw IfcException("Token is not a real");
 	return result;
 }
+
 std::string TokenFunc::asString(const Token& t) {
 	if ( isOperator(t,'$') ) return "";
 	else if ( isOperator(t) ) throw IfcException("Token is not a string");
 	std::string str = t.first->TokenString(t.second);
 	return isString(t) || isEnumeration(t) ? str.substr(1,str.size()-2) : str;
 }
+
 std::string TokenFunc::toString(const Token& t) {
 	if ( isOperator(t) ) return std::string ( (char*) &t.second	, 1 );
 	else return t.first->TokenString(t.second);
@@ -386,38 +458,67 @@ TokenArgument::TokenArgument(const Token& t) {
 	token = t;
 }
 
-EntityArgument::EntityArgument(IfcSchema::Type::Enum ty, const Token& t) {
-	entity = new IfcUntypedEntity(new Entity(0,t.first->file,t.second));
+EntityArgument::EntityArgument(const Token& t) {
+	IfcParse::IfcFile* file = t.first->file;
+	if (file->create_latebound_entities()) {
+		entity = new IfcLateBoundEntity(new Entity(0, file, t.second));
+	} else {
+		entity = IfcSchema::SchemaEntity(new Entity(0, file, t.second));
+	}
 }
 
 // 
 // Reads the arguments from a list of token
 // Aditionally, stores the ids (i.e. #[\d]+) in a vector
 //
-ArgumentList::ArgumentList(Tokens* t, std::vector<unsigned int>& ids) {
+void ArgumentList::read(IfcSpfLexer* t, std::vector<unsigned int>& ids) {
+	IfcParse::IfcFile* file = t->file;
+	
 	Token next = t->Next();
 	while( next.second || next.first ) {
-		if ( TokenFunc::isOperator(next,',') ) {}
-		else if ( TokenFunc::isOperator(next,')') ) break;
-		else if ( TokenFunc::isOperator(next,'(') ) Push( new ArgumentList(t,ids) );
-		else {
-			if ( TokenFunc::isIdentifier(next) ) ids.push_back(TokenFunc::asInt(next));
-			if ( TokenFunc::isDatatype(next) ) {
+		if ( TokenFunc::isOperator(next,',') ) {
+			// do nothing
+		} else if ( TokenFunc::isOperator(next,')') ) {
+			break;
+		} else if ( TokenFunc::isOperator(next,'(') ) {
+			ArgumentList* list = new ArgumentList();
+			list->read(t, ids);
+			push(list);
+		} else {
+			if ( TokenFunc::isIdentifier(next) ) {
+				ids.push_back(TokenFunc::asInt(next));
+			} if ( TokenFunc::isKeyword(next) ) {
 				t->Next();
 				try {
-					Push ( new EntityArgument(Ifc2x3::Type::ALL,next) ); //Ifc2x3::Type::FromString(TokenFunc::asString(next)),t->Next()) );
+					push ( new EntityArgument(next) );
 				} catch ( IfcException& e ) {
 					Logger::Message(Logger::LOG_ERROR,e.what());
 				}
 			} else {
-				Push ( new TokenArgument(next) );
+				push ( new TokenArgument(next) );
 			}
 		}
 		next = t->Next();
 	}
 }
 
-void ArgumentList::Push(ArgumentPtr l) {
+IfcUtil::ArgumentType ArgumentList::type() const {
+	if (list.empty()) return IfcUtil::Argument_UNKNOWN;
+	const IfcUtil::ArgumentType elem_type = list[0]->type();
+	if (elem_type == IfcUtil::Argument_INT) {
+		return IfcUtil::Argument_VECTOR_INT;
+	} else if (elem_type == IfcUtil::Argument_DOUBLE) {
+		return IfcUtil::Argument_VECTOR_DOUBLE;
+	} else if (elem_type == IfcUtil::Argument_STRING) {
+		return IfcUtil::Argument_VECTOR_STRING;
+	} else if (elem_type == IfcUtil::Argument_ENTITY) {
+		return IfcUtil::Argument_ENTITY_LIST;
+	} else {
+		return IfcUtil::Argument_UNKNOWN;
+	}
+}
+
+void ArgumentList::push(Argument* l) {
 	list.push_back(l);
 }
 
@@ -430,7 +531,7 @@ ArgumentList::operator double() const { throw IfcException("Argument is not a nu
 ArgumentList::operator std::string() const { throw IfcException("Argument is not a string"); }
 ArgumentList::operator std::vector<double>() const {
 	std::vector<double> r;
-	std::vector<ArgumentPtr>::const_iterator it;
+	std::vector<Argument*>::const_iterator it;
 	for ( it = list.begin(); it != list.end(); ++ it ) {
 		r.push_back(**it);
 	}
@@ -438,7 +539,7 @@ ArgumentList::operator std::vector<double>() const {
 }
 ArgumentList::operator std::vector<int>() const {
 	std::vector<int> r;
-	std::vector<ArgumentPtr>::const_iterator it;
+	std::vector<Argument*>::const_iterator it;
 	for ( it = list.begin(); it != list.end(); ++ it ) {
 		r.push_back(**it);
 	}
@@ -446,34 +547,59 @@ ArgumentList::operator std::vector<int>() const {
 }
 ArgumentList::operator std::vector<std::string>() const {
 	std::vector<std::string> r;
-	std::vector<ArgumentPtr>::const_iterator it;
+	std::vector<Argument*>::const_iterator it;
 	for ( it = list.begin(); it != list.end(); ++ it ) {
 		r.push_back(**it);
 	}
 	return r;
 }
-ArgumentList::operator IfcUtil::IfcSchemaEntity() const { throw IfcException("Argument is not an IFC type"); }
+ArgumentList::operator IfcUtil::IfcBaseClass*() const { throw IfcException("Argument is not an IFC type"); }
 //ArgumentList::operator IfcUtil::IfcAbstractSelect::ptr() const { throw IfcException("Argument is not an IFC type"); }
-ArgumentList::operator IfcEntities() const {
-	IfcEntities l ( new IfcEntityList() );
-	std::vector<ArgumentPtr>::const_iterator it;
+ArgumentList::operator IfcEntityList::ptr() const {
+	IfcEntityList::ptr l ( new IfcEntityList() );
+	std::vector<Argument*>::const_iterator it;
 	for ( it = list.begin(); it != list.end(); ++ it ) {
 		// FIXME: account for $
-		const IfcUtil::IfcSchemaEntity entity = **it;
+		IfcUtil::IfcBaseClass* entity = **it;
 		l->push(entity);
 	}
 	return l;
 }
-unsigned int ArgumentList::Size() const { return (unsigned int) list.size(); }
-ArgumentPtr ArgumentList::operator [] (unsigned int i) const {
-	if ( i >= list.size() ) 
+ArgumentList::operator IfcEntityListList::ptr() const {
+	IfcEntityListList::ptr l ( new IfcEntityListList() );
+	std::vector<Argument*>::const_iterator it;
+	for ( it = list.begin(); it != list.end(); ++ it ) {
+		const Argument* arg = *it;
+		const ArgumentList* arg_list;
+		if ((arg_list = dynamic_cast<const ArgumentList*>(arg))) {
+			IfcEntityList::ptr e = *arg_list;
+			l->push(e);
+		}
+	}
+	return l;
+}
+unsigned int ArgumentList::size() const { return (unsigned int) list.size(); }
+Argument* ArgumentList::operator [] (unsigned int i) const {
+	if ( i >= list.size() ) {
 		throw IfcException("Argument index out of range");
+	}
 	return list[i];
 }
+void ArgumentList::set(unsigned int i, Argument* argument) {
+	while (size() < i) {
+		push(new TokenArgument(Token(static_cast<IfcSpfLexer*>(0), '$')));
+	}
+	if (i < size()) {
+		delete list[i];
+		list[i] = argument;
+	} else {
+		list.push_back(argument);
+	}	
+}
 std::string ArgumentList::toString(bool upper) const {
 	std::stringstream ss;
 	ss << "(";
-	for( std::vector<ArgumentPtr>::const_iterator it = list.begin(); it != list.end(); it ++ ) {
+	for( std::vector<Argument*>::const_iterator it = list.begin(); it != list.end(); it ++ ) {
 		if ( it != list.begin() ) ss << ",";
 		ss << (*it)->toString(upper);
 	}
@@ -482,12 +608,34 @@ std::string ArgumentList::toString(bool upper) const {
 }
 bool ArgumentList::isNull() const { return false; }
 ArgumentList::~ArgumentList() {
-	for( std::vector<ArgumentPtr>::iterator it = list.begin(); it != list.end(); it ++ ) {
+	for( std::vector<Argument*>::iterator it = list.begin(); it != list.end(); it ++ ) {
 		delete (*it);
 	}
 	list.clear();
 }
 
+IfcUtil::ArgumentType TokenArgument::type() const {
+	if (TokenFunc::isInt(token)) {
+		return IfcUtil::Argument_INT;
+	} else if (TokenFunc::isBool(token)) {
+		return IfcUtil::Argument_BOOL;
+	} else if (TokenFunc::isFloat(token)) {
+		return IfcUtil::Argument_DOUBLE;
+	} else if (TokenFunc::isString(token)) {
+		return IfcUtil::Argument_STRING;
+	} else if (TokenFunc::isEnumeration(token)) {
+		return IfcUtil::Argument_ENUMERATION;
+	} else if (TokenFunc::isIdentifier(token)) {
+		return IfcUtil::Argument_ENTITY;
+	} else if (TokenFunc::isOperator(token, '$')) {
+		return IfcUtil::Argument_NULL;
+	} else if (TokenFunc::isOperator(token, '*')) {
+		return IfcUtil::Argument_DERIVED;
+	} else {
+		return IfcUtil::Argument_UNKNOWN;
+	}
+}
+
 //
 // Functions for casting the TokenArgument to other types
 //
@@ -498,10 +646,11 @@ TokenArgument::operator std::string() const { return TokenFunc::asString(token);
 TokenArgument::operator std::vector<double>() const { throw IfcException("Argument is not a list of floats"); }
 TokenArgument::operator std::vector<int>() const { throw IfcException("Argument is not a list of ints"); }
 TokenArgument::operator std::vector<std::string>() const { throw IfcException("Argument is not a list of strings"); }
-TokenArgument::operator IfcUtil::IfcSchemaEntity() const { return token.first->file->EntityById(TokenFunc::asInt(token)); }
-TokenArgument::operator IfcEntities() const { throw IfcException("Argument is not a list of entities"); }
-unsigned int TokenArgument::Size() const { return 1; }
-ArgumentPtr TokenArgument::operator [] (unsigned int i) const { throw IfcException("Argument is not a list of arguments"); }
+TokenArgument::operator IfcUtil::IfcBaseClass*() const { return token.first->file->entityById(TokenFunc::asInt(token)); }
+TokenArgument::operator IfcEntityList::ptr() const { throw IfcException("Argument is not a list of entities"); }
+TokenArgument::operator IfcEntityListList::ptr() const { throw IfcException("Argument is not a list of entity lists"); }
+unsigned int TokenArgument::size() const { return 1; }
+Argument* TokenArgument::operator [] (unsigned int i) const { throw IfcException("Argument is not a list of arguments"); }
 std::string TokenArgument::toString(bool upper) const { 
 	if ( upper && TokenFunc::isString(token) ) {
 		return IfcWrite::IfcCharacterEncoder(TokenFunc::asString(token)); 
@@ -510,6 +659,11 @@ std::string TokenArgument::toString(bool upper) const {
 	}
 }
 bool TokenArgument::isNull() const { return TokenFunc::isOperator(token,'$'); }
+
+IfcUtil::ArgumentType EntityArgument::type() const {
+	return IfcUtil::Argument_ENTITY;
+}
+
 //
 // Functions for casting the EntityArgument to other types
 //
@@ -520,11 +674,12 @@ EntityArgument::operator std::string() const { throw IfcException("Argument is n
 EntityArgument::operator std::vector<double>() const { throw IfcException("Argument is not a list of floats"); }
 EntityArgument::operator std::vector<int>() const { throw IfcException("Argument is not a list of ints"); }
 EntityArgument::operator std::vector<std::string>() const { throw IfcException("Argument is not a list of strings"); }
-EntityArgument::operator IfcUtil::IfcSchemaEntity() const {	return entity; }
+EntityArgument::operator IfcUtil::IfcBaseClass*() const { return entity; }
 //EntityArgument::operator IfcUtil::IfcAbstractSelect::ptr() const { return entity; }
-EntityArgument::operator IfcEntities() const { throw IfcException("Argument is not a list of entities"); }
-unsigned int EntityArgument::Size() const { return 1; }
-ArgumentPtr EntityArgument::operator [] (unsigned int i) const { throw IfcException("Argument is not a list of arguments"); }
+EntityArgument::operator IfcEntityList::ptr() const { throw IfcException("Argument is not a list of entities"); }
+EntityArgument::operator IfcEntityListList::ptr() const { throw IfcException("Argument is not a list of entity lists"); }
+unsigned int EntityArgument::size() const { return 1; }
+Argument* EntityArgument::operator [] (unsigned int i) const { throw IfcException("Argument is not a list of arguments"); }
 std::string EntityArgument::toString(bool upper) const { 
 	return entity->entity->toString(upper);
 }
@@ -535,13 +690,11 @@ EntityArgument::~EntityArgument() { delete entity; }
 //
 // Reads an Entity from the list of Tokens
 //
-Entity::Entity(unsigned int i, IfcFile* f) { //: file(f) {
+Entity::Entity(unsigned int i, IfcFile* f) : _id(i), args(0) {
 	file = f;
 	Token datatype = f->tokens->Next();
-	if ( ! TokenFunc::isDatatype(datatype)) throw IfcException("Unexpected token while parsing entity");
+	if ( ! TokenFunc::isKeyword(datatype)) throw IfcException("Unexpected token while parsing entity");
 	_type = IfcSchema::Type::FromString(TokenFunc::asString(datatype));
-	_id = i;
-	args = ArgumentPtr();
 	offset = datatype.second;
 }
 
@@ -559,7 +712,7 @@ Entity::Entity(unsigned int i, IfcFile* f, unsigned int o) { // : file(f) {
 //
 // Access the Nth argument from the ArgumentList
 //
-ArgumentPtr Entity::getArgument(unsigned int i) {
+Argument* Entity::getArgument(unsigned int i) {
 	if ( ! args ) {
 		std::vector<unsigned int> ids;
 		Load(ids, true);
@@ -567,26 +720,27 @@ ArgumentPtr Entity::getArgument(unsigned int i) {
 	return (*args)[i];
 }
 
-unsigned int Entity::getArgumentCount() {
+unsigned int Entity::getArgumentCount() const {
 	if ( ! args ) {
 		std::vector<unsigned int> ids;
 		Load(ids, true);
 	}
-	return args->Size();
+	return args->size();
 }
 
 //
 // Load the ArgumentList
 //
-void Entity::Load(std::vector<unsigned int>& ids, bool seek) {
+void Entity::Load(std::vector<unsigned int>& ids, bool seek) const {
 	if ( seek ) {
 		file->tokens->stream->Seek(offset);
 		Token datatype = file->tokens->Next();
-		if ( ! TokenFunc::isDatatype(datatype)) throw IfcException("Unexpected token while parsing entity");
+		if ( ! TokenFunc::isKeyword(datatype)) throw IfcException("Unexpected token while parsing entity");
 		_type = IfcSchema::Type::FromString(TokenFunc::asString(datatype));
 	}
 	Token open = file->tokens->Next();
-	args = new ArgumentList(file->tokens, ids);
+	args = new ArgumentList();
+	args->read(file->tokens, ids);
 	unsigned int old_offset = file->tokens->stream->Tell();
 	Token semilocon = file->tokens->Next();
 	if ( ! TokenFunc::isOperator(semilocon,';') ) file->tokens->stream->Seek(old_offset);
@@ -599,7 +753,7 @@ IfcSchema::Type::Enum Entity::type() const {
 //
 // Returns the CamelCase string representation of the datatype as it is defined in the schema
 //
-std::string Entity::datatype() {
+std::string Entity::datatype() const {
 	return IfcSchema::Type::ToString(_type);
 }
 
@@ -607,20 +761,26 @@ std::string Entity::datatype() {
 // Returns a string representation of the entity
 // Note that this initializes the entity if it is not initialized
 //
-std::string Entity::toString(bool upper) {
-	if ( ! args ) {
+std::string Entity::toString(bool upper) const {
+	if (!args) {
 		std::vector<unsigned int> ids;
 		Load(ids, true);
 	}
+
 	std::stringstream ss;
+	ss.imbue(std::locale::classic());
+	
 	std::string dt = datatype();
-	if ( upper ) {
+	if (upper) {
 		for (std::string::iterator p = dt.begin(); p != dt.end(); ++p ) *p = toupper(*p);
 	}
-	if (_id) {
+
+	if (!IfcSchema::Type::IsSimple(type()) || _id != 0) {
 		ss << "#" << _id << "=";
 	}
+
 	ss << dt << args->toString(upper);
+
 	return ss.str();
 }
 
@@ -629,77 +789,85 @@ Entity::~Entity() {
 }
 
 //
-// Returns the entities of type c that have this entity in their ArgumentList
+// Returns the entities of Entity type that have this entity in their ArgumentList
 //
-IfcEntities Entity::getInverse(IfcSchema::Type::Enum c) {
-	IfcEntities l = IfcEntities(new IfcEntityList());
-	IfcEntities all = file->EntitiesByReference(_id);
-	if ( ! all ) return l;
-	for( IfcEntityList::it it = all->begin(); it != all->end();++  it  ) {
-		if ( c == IfcSchema::Type::ALL || (*it)->is(c) ) {
-			l->push(*it);
-		}
-	}
-	return l;
-}
-IfcEntities Entity::getInverse(IfcSchema::Type::Enum c, int i, const std::string& a) {
-	IfcEntities l = IfcEntities(new IfcEntityList());
-	IfcEntities all = getInverse(c);
-	for( IfcEntityList::it it = all->begin(); it != all->end();++ it  ) {
-		const std::string s = *(*it)->entity->getArgument(i);
-		if ( s == a ) {
-			l->push(*it);
-		}
-	}
-	return l;
+IfcEntityList::ptr Entity::getInverse(IfcSchema::Type::Enum type, int attribute_index) {
+	return file->getInverse(_id, type, attribute_index);
 }
-bool Entity::is(IfcSchema::Type::Enum v) const {	return _type == v; }
+
+bool Entity::is(IfcSchema::Type::Enum v) const { return _type == v; }
 unsigned int Entity::id() { return _id; }
 
-bool Entity::isWritable() {
-	return false;
+IfcWrite::IfcWritableEntity* Entity::isWritable() {
+	return 0;
 }
 
-IfcFile::IfcFile() {
-	file = 0;
-	lastId = 0;
-	tokens = 0;
-	MaxId = 0;
-	initTimestamp();
+IfcFile::IfcFile(bool create_latebound_entities)
+	: _create_latebound_entities(create_latebound_entities)
+	, stream(0)
+	, lastId(0)
+	, tokens(0)
+	, MaxId(0)
+{
+	setDefaultHeaderValues();
 }
 
 //
 // Parses the IFC file in fn
 // Creates the maps
-// Gets the unit definitins from the file
 //
 bool IfcFile::Init(const std::string& fn) {
 	return IfcFile::Init(new IfcSpfStream(fn));
 }
+
 bool IfcFile::Init(std::istream& f, int len) {
 	return IfcFile::Init(new IfcSpfStream(f,len));
 }
+
 bool IfcFile::Init(void* data, int len) {
 	return IfcFile::Init(new IfcSpfStream(data,len));
 }
-bool IfcFile::Init(IfcParse::IfcSpfStream* f) {
-	IfcSchema::InitStringMap();
-	file = f;
-	if ( ! file->valid ) return false;
-	tokens = new Tokens (file,this);
+
+bool IfcFile::Init(IfcParse::IfcSpfStream* s) {
+	// Initialize a "C" locale for locale-independent
+	// number parsing. See comment above on line 41.
+	init_locale();
+
+	stream = s;
+	if (!stream->valid) {
+		return false;
+	}
+
+	tokens = new IfcSpfLexer(stream, this);
+	_header.lexer(tokens);
+	_header.tryRead();
+
+	std::vector<std::string> schemas;
+	try {
+		schemas = _header.file_schema().schema_identifiers();
+	} catch (...) {}
+	if (schemas.size() != 1 || schemas[0] != IfcSchema::Identifier) {
+		Logger::Message(Logger::LOG_ERROR, std::string("File schema encountered different from expected '") + IfcSchema::Identifier + "'");
+	}
+
 	Token token = TokenPtr();
 	Token previous = TokenPtr();
+
 	unsigned int currentId = 0;
 	lastId = 0;
 	int x = 0;
-	EntityPtr e;
-	IfcUtil::IfcSchemaEntity entity = 0; 
+	Entity* e;
+	IfcUtil::IfcBaseClass* entity = 0; 
 	Logger::Status("Scanning file...");
-	while ( ! file->eof ) {
+	while ( ! stream->eof ) {
 		if ( currentId ) {
 			try {
 				e = new Entity(currentId,this);
-				entity = new IfcUntypedEntity(e);
+				if (this->create_latebound_entities()) {
+					entity = new IfcLateBoundEntity(e);
+				} else {
+					entity = IfcSchema::SchemaEntity(e);
+				}
 			} catch (IfcException ex) {
 				currentId = 0;
 				Logger::Message(Logger::LOG_ERROR,ex.what());
@@ -711,7 +879,7 @@ bool IfcFile::Init(IfcParse::IfcSpfStream* f) {
 				Logger::Status(ss.str(), false);
 			}
 			if ( entity->is(IfcSchema::Type::IfcRoot) ) {
-				IfcSchema::IfcRoot::ptr ifc_root = (IfcSchema::IfcRoot::ptr) entity;
+				IfcSchema::IfcRoot* ifc_root = (IfcSchema::IfcRoot*) entity;
 				try {
 					const std::string guid = ifc_root->GlobalId();
 					if ( byguid.find(guid) != byguid.end() ) {
@@ -724,40 +892,45 @@ bool IfcFile::Init(IfcParse::IfcSpfStream* f) {
 					Logger::Message(Logger::LOG_ERROR,ex.what());
 				}
 			}
+
 			IfcSchema::Type::Enum ty = entity->type();
 			do {
-				IfcEntities L = EntitiesByType(ty);
-				if ( L == 0 ) {
-					L = IfcEntities(new IfcEntityList());
-					bytype[ty] = L;
+				IfcEntityList::ptr instances_by_type = entitiesByType(ty);
+				if (!instances_by_type) {
+					instances_by_type = IfcEntityList::ptr(new IfcEntityList());
+					bytype[ty] = instances_by_type;
 				}
-				L->push(entity);
+				instances_by_type->push(entity);
 				ty = IfcSchema::Type::Parent(ty);
 			} while ( ty > -1 );
+			
 			if ( byid.find(currentId) != byid.end() ) {
 				std::stringstream ss;
 				ss << "Overwriting entity with id " << currentId;
 				Logger::Message(Logger::LOG_WARNING,ss.str());
 			}
 			byid[currentId] = entity;
+			
 			MaxId = (std::max)(MaxId,currentId);
 			currentId = 0;
 		} else {
 			try { token = tokens->Next(); }
 			catch (... ) { token = TokenPtr(); }
 		}
+
 		if ( ! (token.second || token.first) ) break;
+		
 		if ( (previous.second || previous.first) && TokenFunc::isIdentifier(previous) ) {
 			int id = TokenFunc::asInt(previous);
 			if ( TokenFunc::isOperator(token,'=') ) {
 				currentId = id;
 			} else if (entity) {
-				IfcEntities L = EntitiesByReference(id);
-				if ( L == 0 ) {
-					L = IfcEntities(new IfcEntityList());
-					byref[id] = L;
+				IfcEntityList::ptr instances_by_ref = entitiesByReference(id);
+				if (!instances_by_ref) {
+					instances_by_ref = IfcEntityList::ptr(new IfcEntityList());
+					byref[id] = instances_by_ref;
 				}
-				L->push(entity);
+				instances_by_ref->push(entity);
 			}
 		}
 		previous = token;
@@ -765,14 +938,153 @@ bool IfcFile::Init(IfcParse::IfcSpfStream* f) {
 	Logger::Status("\rDone scanning file   ");
 	return true;
 }
-void IfcFile::AddEntities(IfcEntities es) {
+
+void IfcFile::traverse(IfcUtil::IfcBaseClass* instance, std::set<IfcUtil::IfcBaseClass*>& visited, IfcEntityList::ptr list, int level, int max_level) {
+	if (visited.find(instance) != visited.end()) {
+		return;
+	}
+	visited.insert(instance);
+	list->push(instance);
+
+	if (level >= max_level && max_level > 0) return;
+
+	for (unsigned i = 0; i < instance->getArgumentCount(); ++i) {
+		Argument* arg = instance->getArgument(i);
+
+		if (arg->type() == IfcUtil::Argument_ENTITY) {
+			traverse(*arg, visited, list, level + 1, max_level);
+		} else if (arg->type() == IfcUtil::Argument_ENTITY_LIST) {
+			IfcEntityList::ptr entity_list_attribute = *arg;
+			for (IfcEntityList::it it = entity_list_attribute->begin(); it != entity_list_attribute->end(); ++it) {
+				traverse(*it, visited, list, level + 1, max_level);
+			}
+		} else if (arg->type() == IfcUtil::Argument_ENTITY_LIST_LIST) {
+			IfcEntityListList::ptr entity_list_attribute = *arg;
+			for (IfcEntityListList::outer_it it = entity_list_attribute->begin(); it != entity_list_attribute->end(); ++it) {
+				for (IfcEntityListList::inner_it jt = it->begin(); jt != it->end(); ++jt) {
+					traverse(*jt, visited, list, level + 1, max_level);
+				}
+			}
+		}
+	}
+}
+
+IfcEntityList::ptr IfcFile::traverse(IfcUtil::IfcBaseClass* instance, int max_level) {
+	std::set<IfcUtil::IfcBaseClass*> visited;
+	IfcEntityList::ptr return_value(new IfcEntityList);
+	traverse(instance, visited, return_value, 0, max_level);
+	return return_value;
+}
+
+void IfcFile::addEntities(IfcEntityList::ptr es) {
 	for( IfcEntityList::it i = es->begin(); i != es->end(); ++ i ) {
-		AddEntity(*i);
+		addEntity(*i);
 	}
 }
-void IfcFile::AddEntity(IfcUtil::IfcSchemaEntity entity) {
-	if ( entity->is(IfcSchema::Type::IfcRoot) ) {
-		IfcSchema::IfcRoot::ptr ifc_root = (IfcSchema::IfcRoot::ptr) entity;
+
+IfcUtil::IfcBaseClass* IfcFile::addEntity(IfcUtil::IfcBaseClass* entity) {
+	// If this instance has been inserted before, return
+	// a reference to the copy that was created from it.
+	entity_entity_map_t::iterator it = entity_file_map.find(entity);
+	if (it != entity_file_map.end()) {
+		return it->second;
+	}
+
+	// Obtain all forward references by a depth-first 
+	// traversal and add them to the file.
+	try {
+		IfcEntityList::ptr entity_attributes = traverse(entity, 1);
+		for (IfcEntityList::it it = entity_attributes->begin(); it != entity_attributes->end(); ++it) {
+			if (*it != entity) {
+				entity_file_map.insert(entity_entity_map_t::value_type(*it, addEntity(*it)));
+			}
+		}
+	} catch (...) {
+		Logger::Message(Logger::LOG_ERROR, "Failed to visit forward references of", entity->entity);
+	}
+
+	// See whether the instance is already part of a file
+	if (entity->entity->file != 0) {
+		if (entity->entity->file == this) {
+			// If it is part of this file
+			// nothing needs to be done.
+			return entity;
+		}
+
+		// An instance is being added from another file. A copy of the
+		// container and entity is created. The attribute references 
+		// need to be updated to point to instances in this file.
+		IfcFile* other_file = entity->entity->file;
+		IfcWrite::IfcWritableEntity* we = new IfcWrite::IfcWritableEntity(entity->entity);
+		if (this->create_latebound_entities()) {
+			entity = new IfcLateBoundEntity(we);
+		} else {
+			entity = IfcSchema::SchemaEntity(we);
+		}
+		
+		// In case an entity is added that contains geometry, the unit
+		// information needs to be accounted for for IfcLengthMeasures.
+		boost::optional<double> conversion_factor;
+
+		for (unsigned i = 0; i < we->getArgumentCount(); ++i) {
+			Argument* attr = we->getArgument(i);
+			IfcUtil::ArgumentType attr_type = attr->type();
+			if (attr_type == IfcUtil::Argument_ENTITY) {
+				entity_entity_map_t::const_iterator eit = entity_file_map.find(*attr);
+				if (eit == entity_file_map.end()) throw IfcParse::IfcException("Unable to map instance to file");
+				we->setArgument(i, eit->second);
+			} else if (attr_type == IfcUtil::Argument_ENTITY_LIST) {
+				IfcEntityList::ptr instances = *attr;
+				IfcEntityList::ptr new_instances(new IfcEntityList);
+				for (IfcEntityList::it it = instances->begin(); it != instances->end(); ++it) {
+					entity_entity_map_t::const_iterator eit = entity_file_map.find(*it);
+					if (eit == entity_file_map.end()) throw IfcParse::IfcException("Unable to map instance to file");
+					new_instances->push(eit->second);
+				}
+				we->setArgument(i, new_instances);
+			} else if (attr_type == IfcUtil::Argument_ENTITY_LIST_LIST) {
+				IfcEntityListList::ptr instances = *attr;
+				IfcEntityListList::ptr new_instances(new IfcEntityListList);
+				for (IfcEntityListList::outer_it it = instances->begin(); it != instances->end(); ++it) {
+					std::vector<IfcUtil::IfcBaseClass*> list;
+					for (IfcEntityListList::inner_it jt = it->begin(); jt != it->end(); ++jt) {
+						entity_entity_map_t::const_iterator eit = entity_file_map.find(*jt);
+						if (eit == entity_file_map.end()) throw IfcParse::IfcException("Unable to map instance to file");
+						list.push_back(eit->second);
+					}
+					new_instances->push(list);
+				}
+				we->setArgument(i, new_instances);
+			} else if (entity->getArgumentEntity(i) == IfcSchema::Type::IfcLengthMeasure ||
+				entity->getArgumentEntity(i) == IfcSchema::Type::IfcPositiveLengthMeasure) 
+			{
+				if (!conversion_factor) {
+					conversion_factor = other_file->getUnit(IfcSchema::IfcUnitEnum::IfcUnit_LENGTHUNIT).second / 
+						getUnit(IfcSchema::IfcUnitEnum::IfcUnit_LENGTHUNIT).second;
+				}
+				if (attr_type == IfcUtil::Argument_DOUBLE) {
+					double v = *attr;
+					v *= *conversion_factor;
+					we->setArgument(i, v);
+				} else if (attr_type == IfcUtil::Argument_VECTOR_DOUBLE) {
+					std::vector<double> v = *attr;
+					for (std::vector<double>::iterator it = v.begin(); it != v.end(); ++it) {
+						(*it) *= *conversion_factor;
+					}
+					we->setArgument(i, v);
+				}
+			}
+		}
+
+		// A new entity instance name is generated and
+		// the instance is pointed to this file.
+		we->file = this;
+		we->setId(FreshId());
+	}
+
+	// For subtypes of IfcRoot, the GUID mapping needs to be updated.
+	if (entity->is(IfcSchema::Type::IfcRoot)) {
+		IfcSchema::IfcRoot* ifc_root = (IfcSchema::IfcRoot*) entity;
 		try {
 			const std::string guid = ifc_root->GlobalId();
 			if ( byguid.find(guid) != byguid.end() ) {
@@ -785,61 +1097,201 @@ void IfcFile::AddEntity(IfcUtil::IfcSchemaEntity entity) {
 			Logger::Message(Logger::LOG_ERROR,ex.what());
 		}
 	}
+
+	// The mapping by entity type is updated.
 	IfcSchema::Type::Enum ty = entity->type();
 	do {
-		IfcEntities L = EntitiesByType(ty);
-		if ( L == 0 ) {
-			L = IfcEntities(new IfcEntityList());
-			bytype[ty] = L;
+		IfcEntityList::ptr instances_by_type = entitiesByType(ty);
+		if (!instances_by_type) {
+			instances_by_type = IfcEntityList::ptr(new IfcEntityList());
+			bytype[ty] = instances_by_type;
 		}
-		L->push(entity);
+		instances_by_type->push(entity);
 		ty = IfcSchema::Type::Parent(ty);
 	} while ( ty > -1 );
+	
 	int new_id = -1;
-	// For newly created entities ensure a valid ENTITY_INSTANCE_NAME is set
-	if ( entity->entity->isWritable() ) {
-		if ( ! entity->entity->file ) entity->entity->file = this;
-		new_id = ((IfcWrite::IfcWritableEntity*)(entity->entity))->setId();
+	if (entity->entity->isWritable() && !entity->entity->file) {
+		// For newly created entities ensure a valid ENTITY_INSTANCE_NAME is set
+		entity->entity->file = this;
+		new_id = entity->entity->isWritable()->setId();
 	} else {
-		// TODO: Detect and fix ENTITY_INSTANCE_NAME collisions
 		new_id = entity->entity->id();
 	}
-	if ( byid.find(new_id) != byid.end() ) {
+
+	if (byid.find(new_id) != byid.end()) {
+		// This should not happen
 		std::stringstream ss;
 		ss << "Overwriting entity with id " << new_id;
-		Logger::Message(Logger::LOG_WARNING,ss.str());
+		Logger::Message(Logger::LOG_WARNING, ss.str());
 	}
+
+	// The mapping by entity instance name is updated.
 	byid[new_id] = entity;
 
+	// The mapping by reference is updated.
+	IfcEntityList::ptr entity_attributes(new IfcEntityList);
+	try {
+		entity_attributes = traverse(entity, 1);
+	} catch (...) {}
+	for (IfcEntityList::it it = entity_attributes->begin(); it != entity_attributes->end(); ++it) {
+		IfcUtil::IfcBaseClass* entity_attribute = *it;
+		if (*it == entity) continue;
+		try {
+			if (!IfcSchema::Type::IsSimple(entity_attribute->type())) {
+				unsigned entity_attribute_id = entity_attribute->entity->id();
+				IfcEntityList::ptr refs = entitiesByReference(entity_attribute_id);
+				if (!refs) {
+					refs = IfcEntityList::ptr(new IfcEntityList);
+					byref[entity_attribute_id] = refs;
+				}
+				refs->push(entity);
+			}
+		} catch (IfcParse::IfcException&) {}
+	}
+
+	return entity;
 }
-IfcEntities IfcFile::EntitiesByType(IfcSchema::Type::Enum t) {
-	MapEntitiesByType::const_iterator it = bytype.find(t);
-	return (it == bytype.end()) ? IfcEntities() : it->second;
+
+IfcWrite::IfcWritableEntity* make_writable(IfcUtil::IfcBaseClass* instance) {
+	if (instance->entity->isWritable()) {
+		return instance->entity->isWritable();
+	}
+
+	IfcWrite::IfcWritableEntity* return_value;
+	instance->entity = return_value = new IfcWrite::IfcWritableEntity(instance->entity);
+	return return_value;
 }
-IfcEntities IfcFile::EntitiesByType(const std::string& t) {
+
+void IfcFile::removeEntity(IfcUtil::IfcBaseClass* entity) {
+	const unsigned id = entity->entity->id();
+	IfcUtil::IfcBaseClass* file_entity = entityById(id);
+
+	// TODO: Create a set of weak relations. Inverse relations that do not dictate an 
+	// instance to be retained. For example: when deleting an IfcRepresentation, the 
+	// individual IfcRepresentationItems can not be deleted if an IfcStyledItem is 
+	// related. Hence, the IfcRepresentationItem::StyledByItem relation could be 
+	// characterized as weak. 
+	std::set<IfcSchema::Type::Enum> weak_roots;
+
+	if (entity != file_entity) {
+		throw IfcParse::IfcException("Instance not part of this file");
+	}
+
+	std::set<IfcUtil::IfcBaseClass*> deletion_queue;
+	IfcEntityList::ptr references = entitiesByReference(id);
+
+	// Alter entity instances with INVERSE relations to the entity being 
+	// deleted. This is necessary to maintain a valid IFC file, because 
+	// dangling references to it's entities name should be removed. At this
+	// moment, inversely related instances affected by the removal of the
+	// entity being deleted are not deleted themselves.
+	if (references) {
+		for (IfcEntityList::it it = references->begin(); it != references->end(); ++it) {
+			IfcUtil::IfcBaseEntity* related_instance = (IfcUtil::IfcBaseEntity*) *it;
+			for (unsigned i = 0; i < related_instance->getArgumentCount(); ++i) {
+				Argument* attr = related_instance->getArgument(i);
+				if (attr->isNull()) continue;
+
+				IfcUtil::ArgumentType attr_type = related_instance->getArgumentType(i);
+				switch(attr_type) {
+				case IfcUtil::Argument_ENTITY: {
+					IfcUtil::IfcBaseClass* instance_attribute = *attr;
+					if (instance_attribute == entity) {
+						make_writable(related_instance)->setArgument(i);
+						// deletion_queue.insert(related_instance);
+					} }
+					break;
+				case IfcUtil::Argument_ENTITY_LIST: {
+					IfcEntityList::ptr instance_list = *attr;
+					if (instance_list->contains(entity)) {
+						instance_list->remove(entity);
+						make_writable(related_instance)->setArgument(i, instance_list);
+						/* if (instance_list->size() == 0) {
+							deletion_queue.insert(related_instance);
+						} */
+					} }
+					break;
+				case IfcUtil::Argument_ENTITY_LIST_LIST: {
+					IfcEntityListList::ptr instance_list_list = *attr;
+					if (instance_list_list->contains(entity)) {
+						IfcEntityListList::ptr new_list(new IfcEntityListList);
+						for (IfcEntityListList::outer_it it = instance_list_list->begin(); it != instance_list_list->end(); ++it) {
+							std::vector<IfcUtil::IfcBaseClass*> instances = *it;
+							std::vector<IfcUtil::IfcBaseClass*>::iterator jt;
+							while ((jt = std::find(instances.begin(), instances.end(), entity)) != instances.end()) {
+								instances.erase(jt);
+							}
+							new_list->push(instances);
+						}
+						make_writable(related_instance)->setArgument(i, new_list);
+						/* if (new_list->totalSize() == 0) {
+							deletion_queue.insert(related_instance);
+						} */
+					} }
+					break;
+				default: break;
+				}
+			}
+		}
+		byref.erase(byref.find(id));
+	}
+
+	IfcEntityList::ptr entity_attributes = traverse(entity, 1);
+	for (IfcEntityList::it it = entity_attributes->begin(); it != entity_attributes->end(); ++it) {
+		IfcUtil::IfcBaseClass* entity_attribute = *it;
+		if (entity_attribute == entity) continue;
+		entitiesByReference(entity_attribute->entity->id())->remove(entity);
+		if (entitiesByReference(entity_attribute->entity->id())->filtered(weak_roots)->size() == 0) {
+			deletion_queue.insert(entity_attribute);
+		}
+	}
+
+	if (entity->is(IfcSchema::Type::IfcRoot)) {
+		const std::string global_id = ((IfcSchema::IfcRoot*) entity)->GlobalId();
+		byguid.erase(byguid.find(global_id));
+	}
+	
+	byid.erase(byid.find(id));
+	
+	IfcEntityList::ptr instances_of_same_type = entitiesByType(entity->type());
+	instances_of_same_type->remove(entity);
+
+	while (!deletion_queue.empty()) {
+		removeEntity(*deletion_queue.begin());
+		deletion_queue.erase(deletion_queue.begin());
+	}
+
+	delete entity->entity;
+	delete entity;
+}
+
+IfcEntityList::ptr IfcFile::entitiesByType(IfcSchema::Type::Enum t) {
+	entities_by_type_t::const_iterator it = bytype.find(t);
+	return (it == bytype.end()) ? IfcEntityList::ptr() : it->second;
+}
+
+IfcEntityList::ptr IfcFile::entitiesByType(const std::string& t) {
 	std::string ty = t;
 	for (std::string::iterator p = ty.begin(); p != ty.end(); ++p ) *p = toupper(*p);
-	return EntitiesByType(IfcSchema::Type::FromString(ty));
-}
-IfcEntities IfcFile::EntitiesByReference(int t) {
-	MapEntitiesByRef::const_iterator it = byref.find(t);
-	return (it == byref.end()) ? IfcEntities() : it->second;
-}
-IfcUtil::IfcSchemaEntity IfcFile::EntityById(int id) {
-	MapEntityById::const_iterator it = byid.find(id);
-	if ( it == byid.end() ) {
-		MapOffsetById::const_iterator it2 = offsets.find(id);
-		if ( it2 == offsets.end() ) throw IfcException("Entity not found");
-		const unsigned int offset = (*it2).second;
-		EntityPtr e = EntityPtr(new Entity(id,this,offset));
-		IfcUtil::IfcSchemaEntity entity = IfcSchema::SchemaEntity(e);
-		byid[id] = entity;
-		return entity;
+	return entitiesByType(IfcSchema::Type::FromString(ty));
+}
+
+IfcEntityList::ptr IfcFile::entitiesByReference(int t) {
+	entities_by_ref_t::const_iterator it = byref.find(t);
+	return (it == byref.end()) ? IfcEntityList::ptr() : it->second;
+}
+
+IfcUtil::IfcBaseClass* IfcFile::entityById(int id) {
+	entity_by_id_t::const_iterator it = byid.find(id);
+	if (it == byid.end()) {
+		throw IfcException("Entity not found");
 	}
 	return it->second;
 }
-IfcSchema::IfcRoot::ptr IfcFile::EntityByGuid(const std::string& guid) {
-	MapEntityByGuid::const_iterator it = byguid.find(guid);
+
+IfcSchema::IfcRoot* IfcFile::entityByGuid(const std::string& guid) {
+	entity_by_guid_t::const_iterator it = byguid.find(guid);
 	if ( it == byguid.end() ) {
 		throw IfcException("Entity not found");
 	} else {
@@ -853,44 +1305,27 @@ const char* IfcException::what() const throw() { return error.c_str(); }
 
 // FIXME: Test destructor to delete entity and arg allocations
 IfcFile::~IfcFile() {
-	for( MapEntityById::const_iterator it = byid.begin(); it != byid.end(); ++ it ) {
+	for( entity_by_id_t::const_iterator it = byid.begin(); it != byid.end(); ++ it ) {
 		delete it->second->entity;
 		delete it->second;
 	}
-	delete file;
+	delete stream;
 	delete tokens;
 }
 
-MapEntityById::const_iterator IfcFile::begin() const {
+IfcFile::entity_by_id_t::const_iterator IfcFile::begin() const {
 	return byid.begin();
 }
-MapEntityById::const_iterator IfcFile::end() const {
+
+IfcFile::entity_by_id_t::const_iterator IfcFile::end() const {
 	return byid.end();
 }
 
 std::ostream& operator<< (std::ostream& os, const IfcParse::IfcFile& f) {
-	os << "ISO-10303-21;" << std::endl;
-	os << "HEADER;" << std::endl;
-	os << "FILE_DESCRIPTION(('ViewDefinition [CoordinationView]'),'2;1');" << std::endl;
-	os << "FILE_NAME(" 
-		<< static_cast<std::string>(IfcWrite::IfcCharacterEncoder(f.filename())) << "," 
-		<< static_cast<std::string>(IfcWrite::IfcCharacterEncoder(f.timestamp())) << ",(" 
-		<< static_cast<std::string>(IfcWrite::IfcCharacterEncoder(f.authorOrganisation())) << "),(" 
-		<< static_cast<std::string>(IfcWrite::IfcCharacterEncoder(f.authorName())) << "," 
-		<< static_cast<std::string>(IfcWrite::IfcCharacterEncoder(f.authorEmail())) 
-		<< "),'IfcOpenShell " << IFCOPENSHELL_VERSION 
-		<< "','IfcOpenShell " << IFCOPENSHELL_VERSION 
-		<< "','');" << std::endl;
-#ifdef USE_IFC4
-	os << "FILE_SCHEMA(('IFC4'));" << std::endl;
-#else
-	os << "FILE_SCHEMA(('IFC2X3'));" << std::endl;
-#endif
-	os << "ENDSEC;" << std::endl;
-	os << "DATA;" << std::endl;
+	f.header().write(os);
 
-	for ( MapEntityById::const_iterator it = f.begin(); it != f.end(); ++ it ) {
-		const IfcEntity e = it->second;
+	for ( IfcFile::entity_by_id_t::const_iterator it = f.begin(); it != f.end(); ++ it ) {
+		const IfcUtil::IfcBaseClass* e = it->second;
 		if (!IfcSchema::Type::IsSimple(e->type())) {
 			os << e->entity->toString(true) << ";" << std::endl;
 		}
@@ -902,24 +1337,104 @@ std::ostream& operator<< (std::ostream& os, const IfcParse::IfcFile& f) {
 	return os;
 }
 
-void IfcFile::filename(const std::string& s) { _filename = s; }
-std::string IfcFile::filename() const { return _filename; }
-void IfcFile::timestamp(const std::string& s) { _timestamp = s; }
-std::string IfcFile::timestamp() const { return _timestamp; }
-void IfcFile::author(const std::string& name, const std::string& email, const std::string& organisation) {
-	_author = name;
-	_author_email = email;
-	_author_organisation = organisation;
-}
-std::string IfcFile::authorName() const { return _author; }
-std::string IfcFile::authorEmail() const { return _author_email; }
-std::string IfcFile::authorOrganisation() const { return _author_organisation; }
-void IfcFile::initTimestamp() {
+std::string IfcFile::createTimestamp() const {
 	char buf[255];
+	
 	time_t t;
 	time(&t);
-	struct tm * ti = localtime (&t);
+	
+	struct tm* ti = localtime (&t);
+
+	std::string result = "";
 	if (strftime(buf,255,"%Y-%m-%dT%H:%M:%S",ti)) {
-		_timestamp = std::string(buf);
+		result = std::string(buf);
+	}
+
+	return result;
+}
+
+IfcEntityList::ptr IfcFile::getInverse(int instance_id, IfcSchema::Type::Enum type, int attribute_index) {
+	IfcUtil::IfcBaseClass* instance = entityById(instance_id);
+
+	IfcEntityList::ptr l = IfcEntityList::ptr(new IfcEntityList);
+	IfcEntityList::ptr all = entitiesByReference(instance_id);
+	if (!all) return l;
+
+	for(IfcEntityList::it it = all->begin(); it != all->end(); ++it) {
+		bool valid = type == IfcSchema::Type::UNDEFINED || (*it)->is(type);
+		if (valid && attribute_index >= 0) {
+			Argument* arg = (*it)->entity->getArgument(attribute_index);
+			if (arg->type() == IfcUtil::Argument_ENTITY) {
+				valid = instance == *arg;
+			} else if (arg->type() == IfcUtil::Argument_ENTITY_LIST) {
+				IfcEntityList::ptr li = *arg;
+				valid = li->contains(instance);
+			} else if (arg->type() == IfcUtil::Argument_ENTITY_LIST_LIST) {
+				IfcEntityListList::ptr li = *arg;
+				valid = li->contains(instance);
+			}
+		}
+		if (valid) {
+			l->push(*it);
+		}
+	}
+
+	return l;
+}
+
+void IfcFile::setDefaultHeaderValues() {
+	const std::string empty_string = "";
+	std::vector<std::string> file_description, schema_identifiers, empty_vector;
+
+	file_description.push_back("ViewDefinition [CoordinationView]");
+	schema_identifiers.push_back(IfcSchema::Identifier);
+
+	header().file_description().description(file_description);
+	header().file_description().implementation_level("2;1");
+
+	header().file_name().name(empty_string);
+	header().file_name().time_stamp(createTimestamp());
+	header().file_name().author(empty_vector);
+	header().file_name().organization(empty_vector);
+	header().file_name().preprocessor_version("IfcOpenShell " IFCOPENSHELL_VERSION);
+	header().file_name().originating_system("IfcOpenShell " IFCOPENSHELL_VERSION);
+	header().file_name().authorization(empty_string);
+
+	header().file_schema().schema_identifiers(schema_identifiers);
+}
+
+std::pair<IfcSchema::IfcNamedUnit*, double> IfcFile::getUnit(IfcSchema::IfcUnitEnum::IfcUnitEnum type) {
+	std::pair<IfcSchema::IfcNamedUnit*, double> return_value((IfcSchema::IfcNamedUnit*)0, 1.);
+	IfcSchema::IfcProject::list::ptr projects = entitiesByType<IfcSchema::IfcProject>();
+	if (projects->size() == 1) {
+		IfcSchema::IfcProject* project = *projects->begin();
+		IfcEntityList::ptr units = project->UnitsInContext()->Units();
+		for (IfcEntityList::it it = units->begin(); it != units->end(); ++it) {
+			IfcSchema::IfcUnit* unit = *it;
+			if (unit->is(IfcSchema::Type::IfcNamedUnit)) {
+				IfcSchema::IfcNamedUnit* named_unit = (IfcSchema::IfcNamedUnit*) unit;
+				if (named_unit->UnitType() != type) {
+					continue;
+				}
+				IfcSchema::IfcSIUnit* unit = 0;
+				if (named_unit->is(IfcSchema::Type::IfcConversionBasedUnit)) {
+					IfcSchema::IfcConversionBasedUnit* u = (IfcSchema::IfcConversionBasedUnit*)named_unit;
+					IfcSchema::IfcMeasureWithUnit* mu = u->ConversionFactor();
+					return_value.second *= static_cast<double>(*mu->ValueComponent()->entity->getArgument(0));
+					return_value.first = named_unit;
+					if (mu->UnitComponent()->is(IfcSchema::Type::IfcSIUnit)) {
+						unit = (IfcSchema::IfcSIUnit*) mu->UnitComponent();
+					}
+				} else if (named_unit->is(IfcSchema::Type::IfcSIUnit)) {
+					return_value.first = unit = (IfcSchema::IfcSIUnit*) named_unit;
+				}
+				if (unit) {
+					if (unit->hasPrefix()) {
+						return_value.second *= IfcSIPrefixToValue(unit->Prefix());
+					}
+				}
+			}
+		}
 	}
+	return return_value;
 }
\ No newline at end of file
diff --git a/src/ifcparse/IfcParse.h b/src/ifcparse/IfcParse.h
index ffaa2c2..57783f3 100644
--- a/src/ifcparse/IfcParse.h
+++ b/src/ifcparse/IfcParse.h
@@ -40,7 +40,6 @@
 #include "../ifcparse/SharedPointer.h"
 #include "../ifcparse/IfcCharacterDecoder.h"
 #include "../ifcparse/IfcUtil.h"
-#include "../ifcparse/IfcUntypedEntity.h"
 
 #ifdef USE_IFC4
 #include "../ifcparse/Ifc4.h"
@@ -53,13 +52,10 @@
 namespace IfcParse {
 
 	class Entity;
-	class Entities;
 	class IfcFile;
-	typedef Entity* EntityPtr;
-	typedef SHARED_PTR<Entities> EntitiesPtr;
+	class IfcSpfLexer;
 
-	class Tokens;
-	typedef std::pair<Tokens*,unsigned> Token;
+	typedef std::pair<IfcSpfLexer*, unsigned> Token;
 
 	/// Provides functions to convert Tokens to binary data
 	/// Tokens are merely offsets to where they can be read in the file
@@ -73,12 +69,18 @@ namespace IfcParse {
 		static bool isString(const Token& t);
 		/// Returns whether the token can be interpreted as an identifier
 		static bool isIdentifier(const Token& t);
-		/// Returns whether the token can be interpreted as an syntactical operator
+		/// Returns whether the token can be interpreted as a syntactical operator
 		static bool isOperator(const Token& t, char op = 0);
 		/// Returns whether the token can be interpreted as an enumerated value
 		static bool isEnumeration(const Token& t);
-		/// Returns whether the token can be interpreted as an datatype name
-		static bool isDatatype(const Token& t);
+		/// Returns whether the token can be interpreted as a datatype name
+		static bool isKeyword(const Token& t);
+		/// Returns whether the token can be interpreted as an integer
+		static bool isInt(const Token& t);
+		/// Returns whether the token can be interpreted as a boolean
+		static bool isBool(const Token& t);
+		/// Returns whether the token can be interpreted as a floating point number
+		static bool isFloat(const Token& t);
 		/// Returns the token interpreted as an integer
 		static int asInt(const Token& t);
 		/// Returns the token interpreted as an boolean (.T. or .F.)
@@ -95,12 +97,12 @@ namespace IfcParse {
 	// Functions for creating Tokens from an arbitary file offset
 	// The first 4 bits are reserved for Tokens of type ()=,;$*
 	//
-	Token TokenPtr(Tokens* tokens, unsigned int offset);
+	Token TokenPtr(IfcSpfLexer* tokens, unsigned int offset);
 	Token TokenPtr(char c);	
 	Token TokenPtr();
 
 	/// A stream of tokens to be read from a IfcSpfStream.
-	class Tokens {
+	class IfcSpfLexer {
 	private:
 		IfcCharacterDecoder* decoder;
 		unsigned int skipWhitespace();
@@ -108,9 +110,9 @@ namespace IfcParse {
 	public:
 		IfcSpfStream* stream;
 		IfcFile* file;
-		Tokens(IfcSpfStream* s, IfcFile* f);
+		IfcSpfLexer(IfcSpfStream* s, IfcFile* f);
 		Token Next();
-		~Tokens();
+		~IfcSpfLexer();
 		std::string TokenString(unsigned int offset);
 	};
 
@@ -119,11 +121,15 @@ namespace IfcParse {
 	///                 ==========
 	class ArgumentList: public Argument {
 	private:
-		std::vector<ArgumentPtr> list;
-		void Push(ArgumentPtr l);
+		std::vector<Argument*> list;
+		void push(Argument* l);
 	public:
-		ArgumentList(Tokens* t, std::vector<unsigned int>& ids);
 		~ArgumentList();
+
+		void read(IfcSpfLexer* t, std::vector<unsigned int>& ids);
+
+		IfcUtil::ArgumentType type() const;
+		
 		operator int() const;
 		operator bool() const;
 		operator double() const;
@@ -131,11 +137,14 @@ namespace IfcParse {
 		operator std::vector<double>() const;
 		operator std::vector<int>() const;
 		operator std::vector<std::string>() const;
-		operator IfcUtil::IfcSchemaEntity() const;
-		//operator IfcUtil::IfcAbstractSelect::ptr() const;
-		operator IfcEntities() const;
-		unsigned int Size() const;
-		ArgumentPtr operator [] (unsigned int i) const;
+		operator IfcUtil::IfcBaseClass*() const;
+		operator IfcEntityList::ptr() const;
+        operator IfcEntityListList::ptr() const;
+		unsigned int size() const;
+
+		Argument* operator [] (unsigned int i) const;
+		void set(unsigned int i, Argument*);
+
 		std::string toString(bool upper=false) const;
 		bool isNull() const;
 	};
@@ -149,6 +158,9 @@ namespace IfcParse {
 	public: 
 		Token token;
 		TokenArgument(const Token& t);
+
+		IfcUtil::ArgumentType type() const;
+
 		operator int() const;
 		operator bool() const;
 		operator double() const;
@@ -156,11 +168,11 @@ namespace IfcParse {
 		operator std::vector<double>() const;
 		operator std::vector<int>() const;
 		operator std::vector<std::string>() const;
-		operator IfcUtil::IfcSchemaEntity() const;
-		//operator IfcUtil::IfcAbstractSelect::ptr() const;
-		operator IfcEntities() const;
-		unsigned int Size() const;
-		ArgumentPtr operator [] (unsigned int i) const;
+		operator IfcUtil::IfcBaseClass*() const;
+		operator IfcEntityList::ptr() const;
+        operator IfcEntityListList::ptr() const;
+		unsigned int size() const;
+		Argument* operator [] (unsigned int i) const;
 		std::string toString(bool upper=false) const;
 		bool isNull() const;
 	};
@@ -170,10 +182,13 @@ namespace IfcParse {
 	///                        =====================   =====================
 	class EntityArgument : public Argument {
 	private:		
-		IfcUntypedEntity* entity;		
+		IfcUtil::IfcBaseClass* entity;		
 	public:
-		EntityArgument(IfcSchema::Type::Enum ty, const Token& t);
+		EntityArgument(const Token& t);
 		~EntityArgument();
+
+		IfcUtil::ArgumentType type() const;
+
 		operator int() const;
 		operator bool() const;
 		operator double() const;
@@ -181,11 +196,11 @@ namespace IfcParse {
 		operator std::vector<double>() const;
 		operator std::vector<int>() const;
 		operator std::vector<std::string>() const;
-		operator IfcUtil::IfcSchemaEntity() const;
-		//operator IfcUtil::IfcAbstractSelect::ptr() const;
-		operator IfcEntities() const;
-		unsigned int Size() const;
-		ArgumentPtr operator [] (unsigned int i) const;
+		operator IfcUtil::IfcBaseClass*() const;
+		operator IfcEntityList::ptr() const;
+        operator IfcEntityListList::ptr() const;
+		unsigned int size() const;
+		Argument* operator [] (unsigned int i) const;
 		std::string toString(bool upper=false) const;
 		bool isNull() const;
 	};
@@ -195,9 +210,8 @@ namespace IfcParse {
 	/// ============================
 	class Entity : public IfcAbstractEntity {
 	private:
-		//IfcFile* file;
-		ArgumentPtr args;
-		IfcSchema::Type::Enum _type;
+		mutable ArgumentList* args;
+		mutable IfcSchema::Type::Enum _type;
 	public:
 		/// The EXPRESS ENTITY_INSTANCE_NAME
 		unsigned int _id;
@@ -206,29 +220,18 @@ namespace IfcParse {
 		Entity(unsigned int i, IfcFile* t);
 		Entity(unsigned int i, IfcFile* t, unsigned int o);
 		~Entity();
-		IfcEntities getInverse(IfcSchema::Type::Enum c = IfcSchema::Type::ALL);
-		IfcEntities getInverse(IfcSchema::Type::Enum c, int i, const std::string& a);
-		void Load(std::vector<unsigned int>& ids, bool seek=false);
-		ArgumentPtr getArgument (unsigned int i);
-		unsigned int getArgumentCount();
-		std::string toString(bool upper=false);
-		std::string datatype();
+		IfcEntityList::ptr getInverse(IfcSchema::Type::Enum type, int attribute_index);
+		void Load(std::vector<unsigned int>& ids, bool seek=false) const;
+		Argument* getArgument (unsigned int i);
+		unsigned int getArgumentCount() const;
+		std::string toString(bool upper=false) const;
+		std::string datatype() const;
 		IfcSchema::Type::Enum type() const;
 		bool is(IfcSchema::Type::Enum v) const;
 		unsigned int id();
-		bool isWritable();
+		IfcWrite::IfcWritableEntity* isWritable();
 	};
 
-typedef IfcUtil::IfcSchemaEntity IfcEntity;
-//typedef IfcEntities IfcEntities;
-typedef std::map<IfcSchema::Type::Enum,IfcEntities> MapEntitiesByType;
-typedef std::map<unsigned int,IfcEntity> MapEntityById;
-typedef std::map<std::string,IfcSchema::IfcRoot::ptr> MapEntityByGuid;
-typedef std::map<unsigned int,IfcEntities> MapEntitiesByRef;
-typedef std::map<unsigned int,unsigned int> MapOffsetById;
-
-double UnitPrefixToValue( IfcSchema::IfcSIPrefix::IfcSIPrefix v );
-
 }
 
 std::ostream& operator<< (std::ostream& os, const IfcParse::IfcFile& f);
diff --git a/src/ifcparse/IfcSIPrefix.cpp b/src/ifcparse/IfcSIPrefix.cpp
new file mode 100644
index 0000000..e3edd16
--- /dev/null
+++ b/src/ifcparse/IfcSIPrefix.cpp
@@ -0,0 +1,39 @@
+/********************************************************************************
+ *                                                                              *
+ * This file is part of IfcOpenShell.                                           *
+ *                                                                              *
+ * IfcOpenShell is free software: you can redistribute it and/or modify         *
+ * it under the terms of the Lesser GNU General Public License as published by  *
+ * the Free Software Foundation, either version 3.0 of the License, or          *
+ * (at your option) any later version.                                          *
+ *                                                                              *
+ * IfcOpenShell 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                 *
+ * Lesser GNU General Public License for more details.                          *
+ *                                                                              *
+ * You should have received a copy of the Lesser GNU General Public License     *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.         *
+ *                                                                              *
+ ********************************************************************************/
+#include "IfcSIPrefix.h"
+
+double IfcParse::IfcSIPrefixToValue(IfcSchema::IfcSIPrefix::IfcSIPrefix v) {
+	if      ( v == IfcSchema::IfcSIPrefix::IfcSIPrefix_EXA   ) return 1.e18;
+	else if ( v == IfcSchema::IfcSIPrefix::IfcSIPrefix_PETA  ) return 1.e15;
+	else if ( v == IfcSchema::IfcSIPrefix::IfcSIPrefix_TERA  ) return 1.e12;
+	else if ( v == IfcSchema::IfcSIPrefix::IfcSIPrefix_GIGA  ) return 1.e9;
+	else if ( v == IfcSchema::IfcSIPrefix::IfcSIPrefix_MEGA  ) return 1.e6;
+	else if ( v == IfcSchema::IfcSIPrefix::IfcSIPrefix_KILO  ) return 1.e3;
+	else if ( v == IfcSchema::IfcSIPrefix::IfcSIPrefix_HECTO ) return 1.e2;
+	else if ( v == IfcSchema::IfcSIPrefix::IfcSIPrefix_DECA  ) return 1.;
+	else if ( v == IfcSchema::IfcSIPrefix::IfcSIPrefix_DECI  ) return 1.e-1;
+	else if ( v == IfcSchema::IfcSIPrefix::IfcSIPrefix_CENTI ) return 1.e-2;
+	else if ( v == IfcSchema::IfcSIPrefix::IfcSIPrefix_MILLI ) return 1.e-3;
+	else if ( v == IfcSchema::IfcSIPrefix::IfcSIPrefix_MICRO ) return 1.e-6;
+	else if ( v == IfcSchema::IfcSIPrefix::IfcSIPrefix_NANO  ) return 1.e-9;
+	else if ( v == IfcSchema::IfcSIPrefix::IfcSIPrefix_PICO  ) return 1.e-12;
+	else if ( v == IfcSchema::IfcSIPrefix::IfcSIPrefix_FEMTO ) return 1.e-15;
+	else if ( v == IfcSchema::IfcSIPrefix::IfcSIPrefix_ATTO  ) return 1.e-18;
+	else return 1.;
+}
\ No newline at end of file
diff --git a/src/ifcgeom/IfcShapeList.h b/src/ifcparse/IfcSIPrefix.h
similarity index 79%
rename from src/ifcgeom/IfcShapeList.h
rename to src/ifcparse/IfcSIPrefix.h
index de19cee..1c62b31 100644
--- a/src/ifcgeom/IfcShapeList.h
+++ b/src/ifcparse/IfcSIPrefix.h
@@ -1,30 +1,29 @@
-/********************************************************************************
- *                                                                              *
- * This file is part of IfcOpenShell.                                           *
- *                                                                              *
- * IfcOpenShell is free software: you can redistribute it and/or modify         *
- * it under the terms of the Lesser GNU General Public License as published by  *
- * the Free Software Foundation, either version 3.0 of the License, or          *
- * (at your option) any later version.                                          *
- *                                                                              *
- * IfcOpenShell 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                 *
- * Lesser GNU General Public License for more details.                          *
- *                                                                              *
- * You should have received a copy of the Lesser GNU General Public License     *
- * along with this program. If not, see <http://www.gnu.org/licenses/>.         *
- *                                                                              *
- ********************************************************************************/
-
-#ifndef IFCSHAPELIST_H
-#define IFCSHAPELIST_H
-
-#include <gp_GTrsf.hxx>
-#include <TopoDS_Shape.hxx>
-
-namespace IfcGeom {
-	typedef std::pair<gp_GTrsf*,const TopoDS_Shape*> LocationShape;
-	typedef std::vector<LocationShape> ShapeList;
-}
-#endif
+/********************************************************************************
+ *                                                                              *
+ * This file is part of IfcOpenShell.                                           *
+ *                                                                              *
+ * IfcOpenShell is free software: you can redistribute it and/or modify         *
+ * it under the terms of the Lesser GNU General Public License as published by  *
+ * the Free Software Foundation, either version 3.0 of the License, or          *
+ * (at your option) any later version.                                          *
+ *                                                                              *
+ * IfcOpenShell 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                 *
+ * Lesser GNU General Public License for more details.                          *
+ *                                                                              *
+ * You should have received a copy of the Lesser GNU General Public License     *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.         *
+ *                                                                              *
+ ********************************************************************************/
+
+#ifndef IFCSIPREFIX
+#define IFCSIPREFIX
+
+#include "../ifcparse/IfcParse.h"
+
+namespace IfcParse {
+	double IfcSIPrefixToValue(IfcSchema::IfcSIPrefix::IfcSIPrefix v);
+}
+
+#endif
\ No newline at end of file
diff --git a/src/ifcparse/IfcSpfHeader.cpp b/src/ifcparse/IfcSpfHeader.cpp
new file mode 100644
index 0000000..d2445c5
--- /dev/null
+++ b/src/ifcparse/IfcSpfHeader.cpp
@@ -0,0 +1,150 @@
+/********************************************************************************
+ *                                                                              *
+ * This file is part of IfcOpenShell.                                           *
+ *                                                                              *
+ * IfcOpenShell is free software: you can redistribute it and/or modify         *
+ * it under the terms of the Lesser GNU General Public License as published by  *
+ * the Free Software Foundation, either version 3.0 of the License, or          *
+ * (at your option) any later version.                                          *
+ *                                                                              *
+ * IfcOpenShell 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                 *
+ * Lesser GNU General Public License for more details.                          *
+ *                                                                              *
+ * You should have received a copy of the Lesser GNU General Public License     *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.         *
+ *                                                                              *
+ ********************************************************************************/
+
+#include "../ifcparse/IfcParse.h"
+
+#include "IfcSpfHeader.h"
+
+static const char * const ISO_10303_21		= "ISO-10303-21";
+static const char * const HEADER			= "HEADER";
+static const char * const FILE_DESCRIPTION	= "FILE_DESCRIPTION";
+static const char * const FILE_NAME			= "FILE_NAME";
+static const char * const FILE_SCHEMA		= "FILE_SCHEMA";
+static const char * const FILE_POPULATION	= "FILE_POPULATION";
+static const char * const SECTION_LANGUAGE	= "SECTION_LANGUAGE";
+static const char * const SECTION_CONTEXT	= "SECTION_CONTEXT";
+static const char * const ENDSEC			= "ENDSEC";
+static const char * const DATA				= "DATA";
+
+using namespace IfcParse;
+
+void IfcSpfHeader::readSemicolon() {
+	if (!TokenFunc::isOperator(_lexer->Next(), ';')) {
+		throw IfcException(std::string("Expected ;"));
+	}
+}
+
+void IfcSpfHeader::readParen() {
+	if (!TokenFunc::isOperator(_lexer->Next(), '(')) {
+		throw IfcException(std::string("Expected ("));
+	}
+}
+
+void IfcSpfHeader::readTerminal(const std::string& term, Trail trail) {
+	if (TokenFunc::asString(_lexer->Next()) != term) {
+		throw IfcException(std::string("Expected " + term));
+	}
+	if (trail == TRAILING_SEMICOLON) {
+		readSemicolon();
+	} else if (trail == TRAILING_PAREN) {
+		readParen();
+	}
+}
+
+void IfcSpfHeader::read() {
+	readTerminal(ISO_10303_21, TRAILING_SEMICOLON);
+	readTerminal(HEADER, TRAILING_SEMICOLON);
+
+	readTerminal(FILE_DESCRIPTION, TRAILING_PAREN);
+	delete _file_description;
+	_file_description = new FileDescription(_lexer);
+	readSemicolon();
+
+	readTerminal(FILE_NAME, TRAILING_PAREN);
+	delete _file_name;
+	_file_name = new FileName(_lexer);
+	readSemicolon();
+
+	readTerminal(FILE_SCHEMA, TRAILING_PAREN);
+	delete _file_schema;
+	_file_schema = new FileSchema(_lexer);
+	readSemicolon();
+}
+
+bool IfcSpfHeader::tryRead() {
+	try {
+		read();
+		return true;
+	} catch(const IfcException&) { 
+		return false;
+	}		
+}
+
+void IfcSpfHeader::write(std::ostream& os) const {
+	os << ISO_10303_21 << ";" << "\n";
+	os << HEADER << ";" << "\n";
+	os << file_description().toString(true) << "\n";
+	os << file_name().toString(true) << "\n";
+	os << file_schema().toString(true) << "\n";
+	os << ENDSEC << ";" << "\n";
+	os << DATA << ";" << "\n";
+}
+
+
+const FileDescription& IfcSpfHeader::file_description() const {
+	if (_file_description) {
+		return *_file_description; 
+	} else {
+		throw IfcException("File description not set");
+	}
+}
+
+const FileName& IfcSpfHeader::file_name() const {
+	if (_file_name) {
+		return *_file_name; 
+	} else {
+		throw IfcException("File name not set");
+	}
+}
+
+const FileSchema& IfcSpfHeader::file_schema() const {
+	if (_file_schema) {
+		return *_file_schema; 
+	} else {
+		throw IfcException("File schema not set");
+	}
+}
+
+FileDescription& IfcSpfHeader::file_description() {
+	if (_file_description) {
+		return *_file_description; 
+	} else {
+		throw IfcException("File description not set");
+	}
+}
+
+FileName& IfcSpfHeader::file_name() {
+	if (_file_name) {
+		return *_file_name; 
+	} else {
+		throw IfcException("File name not set");
+	}
+}
+
+FileSchema& IfcSpfHeader::file_schema() {
+	if (_file_schema) {
+		return *_file_schema; 
+	} else {
+		throw IfcException("File schema not set");
+	}
+}
+
+FileDescription::FileDescription(IfcSpfLexer* lexer) : HeaderEntity(FILE_DESCRIPTION, lexer) {}
+FileName::FileName(IfcSpfLexer* lexer) : HeaderEntity(FILE_NAME, lexer) {}
+FileSchema::FileSchema(IfcSpfLexer* lexer) : HeaderEntity(FILE_SCHEMA, lexer) {}
\ No newline at end of file
diff --git a/src/ifcparse/IfcSpfHeader.h b/src/ifcparse/IfcSpfHeader.h
new file mode 100644
index 0000000..9edce30
--- /dev/null
+++ b/src/ifcparse/IfcSpfHeader.h
@@ -0,0 +1,186 @@
+/********************************************************************************
+ *                                                                              *
+ * This file is part of IfcOpenShell.                                           *
+ *                                                                              *
+ * IfcOpenShell is free software: you can redistribute it and/or modify         *
+ * it under the terms of the Lesser GNU General Public License as published by  *
+ * the Free Software Foundation, either version 3.0 of the License, or          *
+ * (at your option) any later version.                                          *
+ *                                                                              *
+ * IfcOpenShell 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                 *
+ * Lesser GNU General Public License for more details.                          *
+ *                                                                              *
+ * You should have received a copy of the Lesser GNU General Public License     *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.         *
+ *                                                                              *
+ ********************************************************************************/
+ 
+#ifndef IFCSPFHEADER_H
+#define IFCSPFHEADER_H
+
+#include "../ifcparse/IfcSpfStream.h"
+#include "../ifcparse/IfcWrite.h"
+
+namespace IfcParse {
+
+class HeaderEntity : public IfcAbstractEntity {
+private:	
+	ArgumentList* _list;
+	const char * const _datatype;
+protected:
+	HeaderEntity(const char * const datatype, IfcSpfLexer* lexer) 
+		: _datatype(datatype), _list(0)
+	{
+		std::vector<unsigned int> ids;
+		_list = new ArgumentList();
+		if (lexer) {
+			_list->read(lexer, ids);
+		}
+	}
+
+	~HeaderEntity() {
+		delete _list;
+	}
+
+	void setArgument(unsigned int i, const std::string& s) {
+		IfcWrite::IfcWriteArgument* argument = new IfcWrite::IfcWriteArgument(this);
+		argument->set(s);
+		_list->set(i, argument);
+	}
+
+	void setArgument(unsigned int i, const std::vector<std::string>& s) {
+		IfcWrite::IfcWriteArgument* argument = new IfcWrite::IfcWriteArgument(this);
+		argument->set(s);
+		_list->set(i, argument);
+	}
+
+public:
+	Argument* getArgument(unsigned int i) const {
+		return (*_list)[i];
+	}
+
+	Argument* getArgument(unsigned int i) {
+		return (*_list)[i];
+	}
+
+	IfcEntityList::ptr getInverse(IfcSchema::Type::Enum type, int attribute_index) {
+		return IfcEntityList::ptr(new IfcEntityList);
+	}
+
+	std::string datatype() const {
+		return _datatype;
+	}
+	
+	unsigned int getArgumentCount() const {
+		return _list->size();
+	}
+
+	IfcSchema::Type::Enum type() const {
+		return (IfcSchema::Type::Enum) -1;
+	}
+
+	bool is(IfcSchema::Type::Enum v) const {
+		return false;
+	}
+
+	std::string toString(bool upper=false) const {
+		std::stringstream ss;
+		ss << _datatype << _list->toString(upper) << ";";
+		return ss.str();
+	}
+	
+	unsigned int id() {
+		return 0;
+	}
+
+	IfcWrite::IfcWritableEntity* isWritable() {
+		return 0;
+	}
+};
+
+class FileDescription : public HeaderEntity {
+public:
+	explicit FileDescription(IfcSpfLexer* = 0);
+
+	std::vector<std::string> description() const { return *getArgument(0); }
+	std::string implementation_level() const { return *getArgument(1); }
+
+	void description(const std::vector<std::string>& value) { setArgument(0, value); }
+	void implementation_level(const std::string& value) { setArgument(1, value); }
+};
+
+class FileName : public HeaderEntity  {
+public:
+	explicit FileName(IfcSpfLexer* = 0);
+
+	std::string name() const { return *getArgument(0); }
+	std::string time_stamp() const { return *getArgument(1); }
+	std::vector<std::string> author() const { return *getArgument(2); }
+	std::vector<std::string> organization() const { return *getArgument(3); }
+	std::string preprocessor_version() const { return *getArgument(4); }
+	std::string originating_system() const { return *getArgument(5); }
+	std::string authorization() const { return *getArgument(6); }
+
+	void name(const std::string& value) { setArgument(0, value); }
+	void time_stamp(const std::string& value) { setArgument(1, value); }
+	void author(const std::vector<std::string>& value) { setArgument(2, value); }
+	void organization(const std::vector<std::string>& value) { setArgument(3, value); }
+	void preprocessor_version(const std::string& value) { setArgument(4, value); }
+	void originating_system(const std::string& value) { setArgument(5, value); }
+	void authorization(const std::string& value) { setArgument(6, value); }
+};
+
+class FileSchema : public HeaderEntity  {
+public:
+	explicit FileSchema(IfcSpfLexer* = 0);
+
+	std::vector<std::string> schema_identifiers() const { return *getArgument(0); }
+
+	void schema_identifiers(const std::vector<std::string>& value) { setArgument(0, value); }
+};
+
+class IfcSpfHeader {
+private:
+	IfcSpfLexer* _lexer;
+	FileDescription* _file_description;
+	FileName* _file_name;
+	FileSchema* _file_schema;
+	void readParen();
+	void readSemicolon();
+	enum Trail {
+		TRAILING_SEMICOLON,
+		TRAILING_PAREN,
+		NONE
+	};
+	void readTerminal(const std::string& term, Trail trail);
+public:
+	explicit IfcSpfHeader(IfcSpfLexer* lexer = 0)
+		: _lexer(lexer), _file_description(0), _file_name(0), _file_schema(0) 
+	{
+		_file_description = new FileDescription();
+		_file_name = new FileName();
+		_file_schema = new FileSchema();
+	}
+	
+	IfcSpfLexer* lexer() { return _lexer; }
+	void lexer(IfcSpfLexer* l) { _lexer = l; }
+
+	void read();	
+	bool tryRead();
+	
+	void write(std::ostream& os) const;
+
+	const FileDescription& file_description() const;
+	const FileName& file_name() const;
+	const FileSchema& file_schema() const;
+
+	FileDescription& file_description();
+	FileName& file_name();
+	FileSchema& file_schema();
+};
+
+}
+
+#endif
\ No newline at end of file
diff --git a/src/ifcparse/IfcSpfStream.h b/src/ifcparse/IfcSpfStream.h
index 5438cb3..9f5799f 100644
--- a/src/ifcparse/IfcSpfStream.h
+++ b/src/ifcparse/IfcSpfStream.h
@@ -17,7 +17,7 @@
  *                                                                              *
  ********************************************************************************/
  
- /********************************************************************************
+/*********************************************************************************
  *                                                                               *
  * Reads a file in chunks of BUF_SIZE and provides functions to access its       *
  * contents randomly and character by character                                  *
diff --git a/src/ifcparse/IfcUntypedEntity.cpp b/src/ifcparse/IfcUntypedEntity.cpp
deleted file mode 100644
index 2c8b5d6..0000000
--- a/src/ifcparse/IfcUntypedEntity.cpp
+++ /dev/null
@@ -1,182 +0,0 @@
-#include <sstream>
-
-#include "../ifcparse/IfcWritableEntity.h"
-
-#include "../ifcparse/IfcUtil.h"
-#include "../ifcparse/IfcWrite.h"
-#include "../ifcparse/Ifc2x3-rt.h"
-
-#include "IfcUntypedEntity.h"
-
-using namespace IfcUtil;
-
-IfcWrite::IfcWritableEntity* IfcParse::IfcUntypedEntity::writable_entity() {
-	IfcWrite::IfcWritableEntity* e;
-	if (entity->isWritable()) {
-		e = (IfcWrite::IfcWritableEntity*) entity;
-	} else {
-		entity = e = new IfcWrite::IfcWritableEntity(entity);
-	}
-	return e;
-}
-IfcParse::IfcUntypedEntity::IfcUntypedEntity(const std::string& s) {
-	std::string S = s;
-	for (std::string::iterator i = S.begin(); i != S.end(); ++i ) *i = toupper(*i);
-	_type = IfcSchema::Type::FromString(S);
-	entity = new IfcWrite::IfcWritableEntity(_type);
-	IfcSchema::Type::PopulateDerivedFields(writable_entity());
-}
-IfcParse::IfcUntypedEntity::IfcUntypedEntity(IfcAbstractEntity* e) {
-	entity = e;
-	_type = e->type();
-}
-bool IfcParse::IfcUntypedEntity::is(IfcSchema::Type::Enum v) const {
-	IfcSchema::Type::Enum _ty = _type;
-	if (v == _ty) return true;
-	while (_ty != -1) {
-		_ty = IfcSchema::Type::Parent(_ty);
-		if (v == _ty) return true;
-	}
-	return false;	
-}
-std::string IfcParse::IfcUntypedEntity::is_a() const {
-	return IfcSchema::Type::ToString(_type);
-}
-bool IfcParse::IfcUntypedEntity::is_a(const std::string& s) const {
-	std::string S = s;
-	for (std::string::iterator i = S.begin(); i != S.end(); ++i ) *i = toupper(*i);
-	return is(IfcSchema::Type::FromString(S));
-}
-IfcSchema::Type::Enum IfcParse::IfcUntypedEntity::type() const {
-	return _type;
-}
-unsigned int IfcParse::IfcUntypedEntity::getArgumentCount() const {
-	return IfcSchema::Type::GetAttributeCount(_type);
-}
-IfcUtil::ArgumentType IfcParse::IfcUntypedEntity::getArgumentType(unsigned int i) const {
-	return IfcSchema::Type::GetAttributeType(_type,i);
-}
-ArgumentPtr IfcParse::IfcUntypedEntity::getArgument(unsigned int i) const {
-	return entity->getArgument(i);
-}
-const char* IfcParse::IfcUntypedEntity::getArgumentName(unsigned int i) const {
-	return IfcSchema::Type::GetAttributeName(_type,i).c_str();
-}
-void IfcParse::IfcUntypedEntity::invalid_argument(unsigned int i, const std::string& t) {
-	const std::string arg_name = IfcSchema::Type::GetAttributeName(_type,i);
-	throw IfcException(t + " is not a valid type for '" + arg_name + "'");
-}
-void IfcParse::IfcUntypedEntity::setArgument(unsigned int i) {
-	bool is_optional = IfcSchema::Type::GetAttributeOptional(_type, i);
-	if (is_optional) {
-		writable_entity()->setArgument(i);
-	} else invalid_argument(i,"NULL");
-}
-void IfcParse::IfcUntypedEntity::setArgument(unsigned int i, int v) {
-	IfcUtil::ArgumentType arg_type = IfcSchema::Type::GetAttributeType(_type,i);
-	if (arg_type == Argument_INT) {
-		writable_entity()->setArgument(i,v);	
-	} else if ( (arg_type == Argument_BOOL) && ( (v == 0) || (v == 1) ) ) {
-		writable_entity()->setArgument(i, v == 1);
-	} else invalid_argument(i,"INT");
-}
-void IfcParse::IfcUntypedEntity::setArgument(unsigned int i, bool v) {
-	IfcUtil::ArgumentType arg_type = IfcSchema::Type::GetAttributeType(_type,i);
-	if (arg_type == Argument_BOOL) {
-		writable_entity()->setArgument(i,v);	
-	} else invalid_argument(i,"BOOL");
-}
-void IfcParse::IfcUntypedEntity::setArgument(unsigned int i, double v) {
-	IfcUtil::ArgumentType arg_type = IfcSchema::Type::GetAttributeType(_type,i);
-	if (arg_type == Argument_DOUBLE) {
-		writable_entity()->setArgument(i,v);	
-	} else invalid_argument(i,"DOUBLE");
-}
-void IfcParse::IfcUntypedEntity::setArgument(unsigned int i, const std::string& a) {
-	IfcUtil::ArgumentType arg_type = IfcSchema::Type::GetAttributeType(_type,i);
-	if (arg_type == Argument_STRING) {
-		writable_entity()->setArgument(i,a);	
-	} else if (arg_type == Argument_ENUMERATION) {
-		std::pair<const char*, int> enum_data = IfcSchema::Type::GetEnumerationIndex(IfcSchema::Type::GetAttributeEnumerationClass(_type, i), a);
-		writable_entity()->setArgument(i, enum_data.second, enum_data.first);
-	} else invalid_argument(i,"STRING");
-}
-void IfcParse::IfcUntypedEntity::setArgument(unsigned int i, const std::vector<int>& v) {
-	IfcUtil::ArgumentType arg_type = IfcSchema::Type::GetAttributeType(_type,i);
-	if (arg_type == Argument_VECTOR_INT) {
-		writable_entity()->setArgument(i,v);	
-	} else invalid_argument(i,"LIST of INT");
-}
-void IfcParse::IfcUntypedEntity::setArgument(unsigned int i, const std::vector<double>& v) {
-	IfcUtil::ArgumentType arg_type = IfcSchema::Type::GetAttributeType(_type,i);
-	if (arg_type == Argument_VECTOR_DOUBLE) {
-		writable_entity()->setArgument(i,v);	
-	} else invalid_argument(i,"LIST of DOUBLE");
-}
-void IfcParse::IfcUntypedEntity::setArgument(unsigned int i, const std::vector<std::string>& v) {
-	IfcUtil::ArgumentType arg_type = IfcSchema::Type::GetAttributeType(_type,i);
-	if (arg_type == Argument_VECTOR_STRING) {
-		writable_entity()->setArgument(i,v);	
-	} else invalid_argument(i,"LIST of STRING");
-}
-void IfcParse::IfcUntypedEntity::setArgument(unsigned int i, IfcParse::IfcUntypedEntity* v) {
-	IfcUtil::ArgumentType arg_type = IfcSchema::Type::GetAttributeType(_type,i);
-	if (arg_type == Argument_ENTITY) {
-		writable_entity()->setArgument(i,v);	
-	} else invalid_argument(i,"ENTITY");
-}
-void IfcParse::IfcUntypedEntity::setArgument(unsigned int i, IfcEntities v) {
-	IfcUtil::ArgumentType arg_type = IfcSchema::Type::GetAttributeType(_type,i);
-	if (arg_type == Argument_ENTITY_LIST) {
-		writable_entity()->setArgument(i,v);	
-	} else invalid_argument(i,"LIST of ENTITY");
-}
-std::pair<IfcUtil::ArgumentType,ArgumentPtr> IfcParse::IfcUntypedEntity::get_argument(unsigned i) {
-	return std::pair<IfcUtil::ArgumentType,ArgumentPtr>(getArgumentType(i),getArgument(i));
-}
-std::pair<IfcUtil::ArgumentType,ArgumentPtr> IfcParse::IfcUntypedEntity::get_argument(const std::string& a) {
-	return get_argument(IfcSchema::Type::GetAttributeIndex(_type,a));
-}
-unsigned IfcParse::IfcUntypedEntity::getArgumentIndex(const std::string& a) const {
-	return IfcSchema::Type::GetAttributeIndex(_type,a);
-}
-std::string IfcParse::IfcUntypedEntity::toString() {
-	return entity->toString(false);
-}
-IfcEntities IfcParse::IfcUntypedEntity::get_inverse(const std::string& a) {
-	std::pair<IfcSchema::Type::Enum, unsigned> inv = IfcSchema::Type::GetInverseAttribute(_type, a);
-	IfcEntities invs = entity->getInverse(inv.first);
-	IfcEntities filtered(new IfcEntityList());
-	for (auto it = invs->begin(); it != invs->end(); ++it) {
-		try {
-			const int id = *(*it)->entity->getArgument(inv.second);
-			if (id == this->entity->id()) { filtered->push(*it); }
-		} catch (...) {}
-	}
-	return filtered;
-}		
-bool IfcParse::IfcUntypedEntity::is_valid() {
-	const unsigned arg_count = getArgumentCount();
-	bool valid = true;
-	std::ostringstream oss;
-	oss << "Argument ";
-	for (unsigned i = 0; i < arg_count; ++i) {
-		bool is_null = true;
-		try {
-			const Argument& arg = *getArgument(i);
-			is_null = arg.isNull();
-		} catch(IfcException) {}
-		if (!IfcSchema::Type::GetAttributeOptional(_type,i) && is_null) {
-			if (!valid) {
-				oss << ", ";
-			}
-			oss << "\"" << getArgumentName(i) << "\"";
-			valid = false;
-		}
-	}
-	oss << " not optional";
-	if (!valid) {
-		throw IfcException(oss.str());
-	}
-	return valid;
-}
diff --git a/src/ifcparse/IfcUntypedEntity.h b/src/ifcparse/IfcUntypedEntity.h
deleted file mode 100644
index 0d1bc28..0000000
--- a/src/ifcparse/IfcUntypedEntity.h
+++ /dev/null
@@ -1,54 +0,0 @@
-#ifndef IFCUNTYPEDENTITY_H
-#define IFCUNTYPEDENTITY_H
-
-#include <string>
-
-#include "../ifcparse/IfcUtil.h"
-#include "../ifcparse/IfcWrite.h"
-#include "../ifcparse/IfcWritableEntity.h"
-
-namespace IfcParse {
-	
-	class IfcUntypedEntity : public IfcUtil::IfcBaseEntity {
-	private:
-		IfcSchema::Type::Enum _type;
-		IfcWrite::IfcWritableEntity* writable_entity();
-		void invalid_argument(unsigned int i, const std::string& t);
-	public:
-		IfcUntypedEntity(const std::string& s);
-		IfcUntypedEntity(IfcAbstractEntity* e);
-		bool is(IfcSchema::Type::Enum v) const;
-		IfcSchema::Type::Enum type() const;	
-		bool is_a(const std::string& s) const;
-		std::string is_a() const;
-		unsigned int getArgumentCount() const;
-		IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
-		ArgumentPtr getArgument(unsigned int i) const;
-		const char* getArgumentName(unsigned int i) const;
-		unsigned getArgumentIndex(const std::string& a) const;
-
-		IfcEntities get_inverse(const std::string& a);
-
-		void setArgument(unsigned int iz);
-		void setArgument(unsigned int i, int v);
-		void setArgument(unsigned int i, bool v);
-		void setArgument(unsigned int i, double v);
-		void setArgument(unsigned int i, const std::string& v);
-		void setArgument(unsigned int i, const std::vector<int>& v);
-		void setArgument(unsigned int i, const std::vector<double>& v);
-		void setArgument(unsigned int i, const std::vector<std::string>& v);
-		void setArgument(unsigned int i, IfcUntypedEntity* v);
-		void setArgument(unsigned int i, IfcEntities v);
-
-		std::string toString();
-		
-		// TODO: Write as SWIG extension methods
-		std::pair<IfcUtil::ArgumentType,ArgumentPtr> get_argument(unsigned i);
-		std::pair<IfcUtil::ArgumentType,ArgumentPtr> get_argument(const std::string& a);
-
-		bool is_valid();
-	};
-
-}
-
-#endif
\ No newline at end of file
diff --git a/src/ifcparse/IfcUtil.cpp b/src/ifcparse/IfcUtil.cpp
index 23fcb76..71eb994 100644
--- a/src/ifcparse/IfcUtil.cpp
+++ b/src/ifcparse/IfcUtil.cpp
@@ -17,51 +17,57 @@
  *                                                                              *
  ********************************************************************************/
 
-#include "IfcUtil.h"
 #include <iostream>
+#include <algorithm>
+
+#include "../ifcparse/IfcException.h"
 
-void IfcEntityList::push(IfcUtil::IfcSchemaEntity l) {
+#include "IfcUtil.h"
+
+void IfcEntityList::push(IfcUtil::IfcBaseClass* l) {
 	if ( l ) ls.push_back(l);
 }
-void IfcEntityList::push(IfcEntities l) {
+void IfcEntityList::push(const IfcEntityList::ptr& l) {
 	for( it i = l->begin(); i != l->end(); ++i  ) {
 		if ( *i ) ls.push_back(*i);
 	}
 }
-int IfcEntityList::Size() const { return (unsigned int) ls.size(); }
+unsigned int IfcEntityList::size() const { return (unsigned int) ls.size(); }
 IfcEntityList::it IfcEntityList::begin() { return ls.begin(); }
 IfcEntityList::it IfcEntityList::end() { return ls.end(); }
-IfcUtil::IfcSchemaEntity IfcEntityList::operator[] (int i) {
+IfcUtil::IfcBaseClass* IfcEntityList::operator[] (int i) {
 	return ls[i];
 }
-IfcEntities IfcEntityList::getInverse(IfcSchema::Type::Enum c) {
-	IfcEntities l = IfcEntities(new IfcEntityList());
-	for( it i = begin(); i != end(); ++i  ) {
-		l->push((*i)->entity->getInverse(c));
-	}
-	return l;
+bool IfcEntityList::contains(IfcUtil::IfcBaseClass* instance) const {
+	return std::find(ls.begin(), ls.end(), instance) != ls.end();
 }
-IfcEntities IfcEntityList::getInverse(IfcSchema::Type::Enum c, int ar, const std::string& a) {
-	IfcEntities l = IfcEntities(new IfcEntityList());
-	for( it i = begin(); i != end(); ++i  ) {
-		l->push((*i)->entity->getInverse(c,ar,a));
+void IfcEntityList::remove(IfcUtil::IfcBaseClass* instance) {
+	std::vector<IfcUtil::IfcBaseClass*>::iterator it;
+	while ((it = std::find(ls.begin(), ls.end(), instance)) != ls.end()) {
+		ls.erase(it);
 	}
-	return l;
 }
- 
-bool IfcUtil::IfcEntitySelect::is(IfcSchema::Type::Enum v) const { return entity->is(v); }
-IfcSchema::Type::Enum IfcUtil::IfcEntitySelect::type() const { return entity->type(); }
-IfcUtil::IfcEntitySelect::IfcEntitySelect(IfcSchemaEntity b) { entity = b->entity; }
-IfcUtil::IfcEntitySelect::IfcEntitySelect(IfcAbstractEntityPtr e) { entity = e; }
-bool IfcUtil::IfcEntitySelect::isSimpleType() { return false; }
-IfcUtil::IfcEntitySelect::~IfcEntitySelect() { delete entity; }
+IfcEntityList::ptr IfcEntityList::filtered(const std::set<IfcSchema::Type::Enum>& entities) {
+	IfcEntityList::ptr return_value(new IfcEntityList);
+	for (it it = begin(); it != end(); ++it) {
+		bool contained = false;
+		for (std::set<IfcSchema::Type::Enum>::const_iterator jt = entities.begin(); jt != entities.end(); ++jt) {
+			if ((*it)->is(*jt)) {
+				contained = true;
+				break;
+			}
+		}
+		if (!contained) {
+			return_value->push(*it);
+		}
+	}	
+	return return_value;
+}
+
 
-bool IfcUtil::IfcArgumentSelect::is(IfcSchema::Type::Enum v) const { return _type == v; }
-IfcSchema::Type::Enum IfcUtil::IfcArgumentSelect::type() const { return _type; }
-IfcUtil::IfcArgumentSelect::IfcArgumentSelect(IfcSchema::Type::Enum t, ArgumentPtr a) { _type = t; arg = a; }
-ArgumentPtr IfcUtil::IfcArgumentSelect::wrappedValue() { return arg; }
-bool IfcUtil::IfcArgumentSelect::isSimpleType() { return true; }
-IfcUtil::IfcArgumentSelect::~IfcArgumentSelect() { delete arg; }
+unsigned int IfcUtil::IfcBaseType::getArgumentCount() const { return 1; }
+Argument* IfcUtil::IfcBaseType::getArgument(unsigned int i) const { return entity->getArgument(i); }
+const char* IfcUtil::IfcBaseType::getArgumentName(unsigned int i) const { if (i == 0) { return "wrappedValue"; } else { throw IfcParse::IfcException("argument out of range"); } }
 
 void Logger::SetOutput(std::ostream* l1, std::ostream* l2) { 
 	log1 = l1; 
@@ -70,7 +76,7 @@ void Logger::SetOutput(std::ostream* l1, std::ostream* l2) {
 		log2 = &log_stream;
 	}
 }
-void Logger::Message(Logger::Severity type, const std::string& message, const IfcAbstractEntityPtr entity) {
+void Logger::Message(Logger::Severity type, const std::string& message, IfcAbstractEntity* entity) {
 	if ( log2 && type >= verbosity ) {
 		(*log2) << "[" << severity_strings[type] << "] " << message << std::endl;
 		if ( entity ) (*log2) << entity->toString() << std::endl;
@@ -98,4 +104,25 @@ std::ostream* Logger::log1 = 0;
 std::ostream* Logger::log2 = 0;
 std::stringstream Logger::log_stream;
 Logger::Severity Logger::verbosity = Logger::LOG_NOTICE;
-const char* Logger::severity_strings[] = { "Notice","Warning","Error" };
\ No newline at end of file
+const char* Logger::severity_strings[] = { "Notice","Warning","Error" };
+
+static const char* const argument_type_string[] = {
+	"NULL",
+	"DERIVED",
+	"INT",
+	"BOOL",
+	"DOUBLE",
+	"STRING", 
+	"VECTOR_INT", 
+	"VECTOR_DOUBLE", 
+	"VECTOR_STRING", 
+	"ENUMERATION", 
+	"ENTITY", 
+	"ENTITY_LIST", 
+	"ENTITY_LIST_LIST", 
+	"UNKNOWN"
+};
+
+const char* IfcUtil::ArgumentTypeToString(ArgumentType argument_type) {
+	return argument_type_string[static_cast<int>(argument_type)];
+}
diff --git a/src/ifcparse/IfcUtil.h b/src/ifcparse/IfcUtil.h
index 9297375..3e0af64 100644
--- a/src/ifcparse/IfcUtil.h
+++ b/src/ifcparse/IfcUtil.h
@@ -20,9 +20,11 @@
 #ifndef IFCUTIL_H
 #define IFCUTIL_H
 
+#include <set>
 #include <string>
 #include <vector>
 #include <sstream>
+#include <algorithm>
 
 #include "../ifcparse/SharedPointer.h"
 
@@ -32,130 +34,212 @@
 #include "../ifcparse/Ifc2x3enum.h"
 #endif
 
-class IfcAbstractEntity;
-//typedef SHARED_PTR<IfcAbstractEntity> IfcAbstractEntityPtr;
-typedef IfcAbstractEntity* IfcAbstractEntityPtr;
-
-class IfcEntityList;
-typedef SHARED_PTR<IfcEntityList> IfcEntities;
-
 class Argument;
-//typedef SHARED_PTR<Argument> ArgumentPtr;
-typedef Argument* ArgumentPtr;
-
-
-template <class F, class T>
-inline T* reinterpret_pointer_cast(F* from) {
-	return (T*)from;
-	//SHARED_PTR<void> v = std::tr1::static_pointer_cast<void,F>(from);
-	//return std::tr1::static_pointer_cast<T,void>(v);
+class IfcEntityList;
+class IfcEntityListList;
+class IfcAbstractEntity;
+namespace IfcWrite {
+	class IfcWritableEntity;
 }
 
 namespace IfcUtil {
     enum ArgumentType {
-        Argument_INT, Argument_BOOL, Argument_DOUBLE, Argument_STRING, Argument_VECTOR_INT, Argument_VECTOR_DOUBLE, Argument_VECTOR_STRING, Argument_ENTITY, Argument_ENTITY_LIST, Argument_ENTITY_LIST_LIST, Argument_ENUMERATION, Argument_UNKNOWN
+        Argument_NULL,
+		Argument_DERIVED,
+		Argument_INT,
+		Argument_BOOL,
+		Argument_DOUBLE,
+		Argument_STRING, 
+		Argument_VECTOR_INT, 
+		Argument_VECTOR_DOUBLE, 
+		Argument_VECTOR_STRING, 
+		Argument_ENUMERATION, 
+		Argument_ENTITY, 
+		Argument_ENTITY_LIST, 
+		Argument_ENTITY_LIST_LIST, 
+		Argument_UNKNOWN
     };
-}
 
-namespace IfcUtil {
+	const char* ArgumentTypeToString(ArgumentType argument_type);
 
-class IfcBaseClass {
-public:
-    IfcAbstractEntityPtr entity;
-    virtual bool is(IfcSchema::Type::Enum v) const = 0;
-    virtual IfcSchema::Type::Enum type() const = 0;
-};
+	class IfcBaseClass {
+	public:
+		IfcAbstractEntity* entity;
+		virtual bool is(IfcSchema::Type::Enum v) const = 0;
+		virtual IfcSchema::Type::Enum type() const = 0;
 
-class IfcBaseEntity : public IfcBaseClass {
-public:
-    virtual unsigned int getArgumentCount() const = 0;
-    virtual ArgumentType getArgumentType(unsigned int i) const = 0;
-    virtual ArgumentPtr getArgument(unsigned int i) const = 0;
-    virtual const char* getArgumentName(unsigned int i) const = 0;
-};
+		virtual unsigned int getArgumentCount() const = 0;
+		virtual ArgumentType getArgumentType(unsigned int i) const = 0;
+		virtual IfcSchema::Type::Enum getArgumentEntity(unsigned int i) const = 0;
+		virtual Argument* getArgument(unsigned int i) const = 0;
+		virtual const char* getArgumentName(unsigned int i) const = 0;
+	};
 
-//typedef SHARED_PTR<IfcBaseClass> IfcSchemaEntity;
-typedef IfcBaseClass* IfcSchemaEntity;
+	class IfcBaseEntity : public IfcBaseClass {
+	};
 
+	// TODO: Investigate whether these should be template classes instead
+	class IfcBaseType : public IfcBaseEntity {
+	public:
+		unsigned int getArgumentCount() const;
+		Argument* getArgument(unsigned int i) const;
+		const char* getArgumentName(unsigned int i) const;
+		IfcSchema::Type::Enum getArgumentEntity(unsigned int i) const { return IfcSchema::Type::UNDEFINED; }
+	};
 }
 
 template <class T>
 class IfcTemplatedEntityList;
 
 class IfcEntityList {
-	std::vector<IfcUtil::IfcSchemaEntity> ls;
+	std::vector<IfcUtil::IfcBaseClass*> ls;
 public:
-	typedef std::vector<IfcUtil::IfcSchemaEntity>::const_iterator it;
-	IfcEntities getInverse(IfcSchema::Type::Enum c = IfcSchema::Type::ALL);
-	IfcEntities getInverse(IfcSchema::Type::Enum c, int i, const std::string& a);
-	void push(IfcUtil::IfcSchemaEntity l);
-	void push(IfcEntities l);
+	typedef SHARED_PTR<IfcEntityList> ptr;
+	typedef std::vector<IfcUtil::IfcBaseClass*>::const_iterator it;
+	void push(IfcUtil::IfcBaseClass* l);
+	void push(const ptr& l);
 	it begin();
 	it end();
-	IfcUtil::IfcSchemaEntity operator[] (int i);
-	int Size() const;
+	IfcUtil::IfcBaseClass* operator[] (int i);
+	unsigned int size() const;
+	bool contains(IfcUtil::IfcBaseClass*) const;
 	template <class U>
-	typename U::list as() {
-		typename U::list r(new IfcTemplatedEntityList<U>());
-		for ( it i = begin(); i != end(); ++ i ) if ((*i)->is(U::Class())) r->push((U*)*i);
+	typename U::list::ptr as() {
+		typename U::list::ptr r(new typename U::list);
+		const bool all = U::Class() == IfcSchema::Type::UNDEFINED;
+		for ( it i = begin(); i != end(); ++ i ) if (all || (*i)->is(U::Class())) r->push((U*)*i);
 		return r;
 	}
+	void remove(IfcUtil::IfcBaseClass*);
+	IfcEntityList::ptr filtered(const std::set<IfcSchema::Type::Enum>& entities);
 };
 
 template <class T>
 class IfcTemplatedEntityList {
 	std::vector<T*> ls;
 public:
+	typedef SHARED_PTR< IfcTemplatedEntityList<T> > ptr;
 	typedef typename std::vector<T*>::const_iterator it;
-	inline void push(T* t) {if (t) ls.push_back(t);}
-	inline void push(SHARED_PTR< IfcTemplatedEntityList<T> > t) { for ( typename T::it it = t->begin(); it != t->end(); ++it ) push(*it); }
-	inline it begin() { return ls.begin(); }
-	inline it end() { return ls.end(); }
-	inline unsigned int Size() const { return (unsigned int) ls.size(); }
-	IfcEntities generalize() {
-		IfcEntities r (new IfcEntityList());
+	void push(T* t) {if (t) ls.push_back(t);}
+	void push(ptr t) { for ( typename T::list::it it = t->begin(); it != t->end(); ++it ) push(*it); }
+	it begin() { return ls.begin(); }
+	it end() { return ls.end(); }
+	unsigned int size() const { return (unsigned int) ls.size(); }
+	IfcEntityList::ptr generalize() {
+		IfcEntityList::ptr r (new IfcEntityList());
 		for ( it i = begin(); i != end(); ++ i ) r->push(*i);
 		return r;
 	}
+	bool contains(T* t) const { return std::find(ls.begin(), ls.end(), t) != ls.end(); }
 	template <class U> 
-	typename U::list as() {
-		typename U::list r(new IfcTemplatedEntityList<U>());
-		for ( it i = begin(); i != end(); ++ i ) if ((*i)->is(U::Class())) r->push(*i);
+	typename U::list::ptr as() {
+		typename U::list::ptr r(new typename U::list);
+		const bool all = U::Class() == IfcSchema::Type::UNDEFINED;
+		for ( it i = begin(); i != end(); ++ i ) if (all || (*i)->is(U::Class())) r->push((U*)*i);
 		return r;
 	}
+	void remove(T* t) {
+		typename std::vector<T*>::iterator it;
+		while ((it = std::find(ls.begin(), ls.end(), t)) != ls.end()) {
+			ls.erase(it);
+		}
+	}
 };
 
-namespace IfcUtil {
-	class IfcAbstractSelect : public IfcBaseClass {
-	public:
-		typedef SHARED_PTR< IfcTemplatedEntityList<IfcAbstractSelect> > list;
-		typedef IfcTemplatedEntityList<IfcAbstractSelect>::it it;
-		typedef IfcAbstractSelect* ptr;
-		virtual bool isSimpleType() = 0;
-	};
-	class IfcEntitySelect : public IfcAbstractSelect {
-	public:
-		typedef IfcEntitySelect* ptr;
-		IfcEntitySelect(IfcSchemaEntity b);
-		IfcEntitySelect(IfcAbstractEntityPtr e);
-		~IfcEntitySelect();
-		bool is(IfcSchema::Type::Enum v) const;
-		IfcSchema::Type::Enum type() const;
-		bool isSimpleType();
-	};
-	class IfcArgumentSelect : public IfcAbstractSelect {
-		IfcSchema::Type::Enum _type;
-		ArgumentPtr arg;
-	public:
-		typedef IfcArgumentSelect* ptr;
-		IfcArgumentSelect(IfcSchema::Type::Enum t, ArgumentPtr a);
-		~IfcArgumentSelect();
-		ArgumentPtr wrappedValue();
-		bool is(IfcSchema::Type::Enum v) const;
-		IfcSchema::Type::Enum type() const;
-		bool isSimpleType();
-	};
-}
+template <class T>
+class IfcTemplatedEntityListList;
+
+class IfcEntityListList {
+	std::vector< std::vector<IfcUtil::IfcBaseClass*> > ls;
+public:
+	typedef SHARED_PTR< IfcEntityListList > ptr;
+	typedef std::vector< std::vector<IfcUtil::IfcBaseClass*> >::const_iterator outer_it;
+	typedef std::vector<IfcUtil::IfcBaseClass*>::const_iterator inner_it;
+	void push(const std::vector<IfcUtil::IfcBaseClass*>& l) { 
+		ls.push_back(l); 
+	}
+	void push(const IfcEntityList::ptr& l) { 
+		std::vector<IfcUtil::IfcBaseClass*> li;
+		for (std::vector<IfcUtil::IfcBaseClass*>::const_iterator jt = l->begin(); jt != l->end(); ++jt) {
+			li.push_back(*jt); 
+		} 
+		push(li); 
+	}
+	outer_it begin() const { return ls.begin(); }
+	outer_it end() const { return ls.end(); }
+	int size() const { return ls.size(); }
+	int totalSize() const { 
+		int accum = 0; 
+		for (outer_it it = begin(); it != end(); ++it) { 
+			accum += it->size(); 
+		} 
+		return accum; 
+	}
+	bool contains(IfcUtil::IfcBaseClass* instance) const {
+		for (outer_it it = begin(); it != end(); ++it) {
+			const std::vector<IfcUtil::IfcBaseClass*>& inner = *it;
+			if (std::find(inner.begin(), inner.end(), instance) != inner.end()) {
+				return true;
+			}
+		}
+		return false;
+	}
+	template <class U> 
+	typename IfcTemplatedEntityListList<U>::ptr as() {
+		typename IfcTemplatedEntityListList<U>::ptr r(new IfcTemplatedEntityListList<U>);
+		const bool all = U::Class() == IfcSchema::Type::UNDEFINED;
+		for (outer_it outer = begin(); outer != end(); ++ outer) {
+			const std::vector<IfcUtil::IfcBaseClass*>& from = *outer;
+			typename std::vector<U*> to;
+			for (inner_it inner = from.begin(); inner != from.end(); ++ inner) {
+				if (all || (*inner)->is(U::Class())) to.push_back((U*)*inner);
+			}
+			r->push(to);
+		}
+		return r;
+	}
+};
+
+template <class T>
+class IfcTemplatedEntityListList {
+	std::vector< std::vector<T*> > ls;
+public:
+	typedef typename SHARED_PTR< IfcTemplatedEntityListList<T> > ptr;
+	typedef typename std::vector< std::vector<T*> >::const_iterator outer_it;
+	typedef typename std::vector<T*>::const_iterator inner_it;
+	void push(const std::vector<T*>& t) {ls.push_back(t);}
+	outer_it begin() { return ls.begin(); }
+	outer_it end() { return ls.end(); }
+	int size() const { return ls.size(); }
+	int totalSize() const { 
+		int accum = 0; 
+		for (outer_it it = begin(); it != end(); ++it) { 
+			accum += it->size(); 
+		} 
+		return accum; 
+	}
+	bool contains(T* t) const {
+		for (outer_it it = begin(); it != end(); ++it) {
+			const std::vector<T*>& inner = *it;
+			if (std::find(inner.begin(), inner.end(), t) != inner.end()) {
+				return true;
+			}
+		}
+		return false;
+	}
+	IfcEntityListList::ptr generalize() {
+		IfcEntityListList::ptr r (new IfcEntityListList());
+		for (outer_it outer = begin(); outer != end(); ++ outer) {
+			const std::vector<T*>& from = *outer;
+			std::vector<IfcUtil::IfcBaseClass*> to;
+			for (inner_it inner = from.begin(); inner != from.end(); ++ inner) {
+				to.push_back(*inner);
+			}
+			r->push(to);
+		}
+		return r;
+	}
+};
 
 namespace IfcParse {
 	class IfcFile;
@@ -163,8 +247,7 @@ namespace IfcParse {
 
 class Argument {
 public:
-	//void* file;
-//public:
+	virtual IfcUtil::ArgumentType type() const = 0;
 	virtual operator int() const = 0;
 	virtual operator bool() const = 0;
 	virtual operator double() const = 0;
@@ -172,11 +255,11 @@ class Argument {
 	virtual operator std::vector<double>() const = 0;
 	virtual operator std::vector<int>() const = 0;
 	virtual operator std::vector<std::string>() const = 0;
-	virtual operator IfcUtil::IfcSchemaEntity() const = 0;
-	//virtual operator IfcUtil::IfcAbstractSelect::ptr() const = 0;
-	virtual operator IfcEntities() const = 0;
-	virtual unsigned int Size() const = 0;
-	virtual ArgumentPtr operator [] (unsigned int i) const = 0;
+	virtual operator IfcUtil::IfcBaseClass*() const = 0;
+	virtual operator IfcEntityList::ptr() const = 0;
+    virtual operator IfcEntityListList::ptr() const = 0;
+	virtual unsigned int size() const = 0;
+	virtual Argument* operator [] (unsigned int i) const = 0;
 	virtual std::string toString(bool upper=false) const = 0;
 	virtual bool isNull() const = 0;
 	virtual ~Argument() {};
@@ -185,17 +268,16 @@ class Argument {
 class IfcAbstractEntity {
 public:
 	IfcParse::IfcFile* file;
-	virtual IfcEntities getInverse(IfcSchema::Type::Enum c = IfcSchema::Type::ALL) = 0;
-	virtual IfcEntities getInverse(IfcSchema::Type::Enum c, int i, const std::string& a) = 0;
-	virtual std::string datatype() = 0;
-	virtual ArgumentPtr getArgument (unsigned int i) = 0;
-	virtual unsigned int getArgumentCount() = 0;
+	virtual IfcEntityList::ptr getInverse(IfcSchema::Type::Enum type, int attribute_index) = 0;
+	virtual std::string datatype() const = 0;
+	virtual Argument* getArgument (unsigned int i) = 0;
+	virtual unsigned int getArgumentCount() const = 0;
 	virtual ~IfcAbstractEntity() {};
 	virtual IfcSchema::Type::Enum type() const = 0;
 	virtual bool is(IfcSchema::Type::Enum v) const = 0;
-	virtual std::string toString(bool upper=false) = 0;
+	virtual std::string toString(bool upper=false) const = 0;
 	virtual unsigned int id() = 0;
-	virtual bool isWritable() = 0;
+	virtual IfcWrite::IfcWritableEntity* isWritable() = 0;
 };
 
 class Logger {
@@ -214,7 +296,7 @@ class Logger {
 	static void Verbosity(Severity v);
 	static Severity Verbosity();
 	/// Log a message to the output stream
-	static void Message(Severity type, const std::string& message, const IfcAbstractEntityPtr entity=0);
+	static void Message(Severity type, const std::string& message, IfcAbstractEntity* entity=0);
 	static void Status(const std::string& message, bool new_line=true);
 	static void ProgressBar(int progress);
 	static std::string GetLog();
diff --git a/src/ifcparse/IfcWritableEntity.h b/src/ifcparse/IfcWritableEntity.h
index 5720c1a..9ff0567 100644
--- a/src/ifcparse/IfcWritableEntity.h
+++ b/src/ifcparse/IfcWritableEntity.h
@@ -39,7 +39,7 @@ namespace IfcWrite {
 	class IfcWritableEntity : public IfcAbstractEntity {
 	private:
 		std::map<int,bool> writemask;
-		std::map<int,ArgumentPtr> args;
+		std::map<int,Argument*> args;
 		IfcSchema::Type::Enum _type;
 		int* _id;
 		bool arg_writable(int i);
@@ -48,27 +48,30 @@ namespace IfcWrite {
 	public:
 		IfcWritableEntity(IfcSchema::Type::Enum t);
 		~IfcWritableEntity();
+
 		int setId(int i=-1);
 		IfcWritableEntity(IfcAbstractEntity* e);
-		IfcEntities getInverse(IfcSchema::Type::Enum c = IfcSchema::Type::ALL);
-		IfcEntities getInverse(IfcSchema::Type::Enum c, int i, const std::string& a);
-		std::string datatype();
-		ArgumentPtr getArgument (unsigned int i);
-		unsigned int getArgumentCount();
+		IfcEntityList::ptr getInverse(IfcSchema::Type::Enum type, int attribute_index);
+		std::string datatype() const;
+		Argument* getArgument (unsigned int i);
+		unsigned int getArgumentCount() const;
 		IfcSchema::Type::Enum type() const;
 		bool is(IfcSchema::Type::Enum v) const;
-		std::string toString(bool upper=false);
+		std::string toString(bool upper=false) const;
 		unsigned int id();
-		bool isWritable();
-        void setArgument(int i);
+		IfcWritableEntity* isWritable();
+
+		void setArgument(int i);
+		void setArgument(int i, Argument* a);
 		void setArgumentDerived(int i);
 		void setArgument(int i,bool v);
 		void setArgument(int i,int v);
 		void setArgument(int i,int v, const char* c);
 		void setArgument(int i,const std::string& v);
 		void setArgument(int i,double v);
-		void setArgument(int i,IfcUtil::IfcSchemaEntity v);
-		void setArgument(int i,IfcEntities v);
+		void setArgument(int i,IfcUtil::IfcBaseClass* v);
+		void setArgument(int i,IfcEntityList::ptr v);
+		void setArgument(int i,IfcEntityListList::ptr v);
 		void setArgument(int i,const std::vector<double>& v);
 		void setArgument(int i,const std::vector<std::string>& v);
 		void setArgument(int i,const std::vector<int>& v);
diff --git a/src/ifcparse/IfcWrite.cpp b/src/ifcparse/IfcWrite.cpp
index 3998d4a..17dd9be 100644
--- a/src/ifcparse/IfcWrite.cpp
+++ b/src/ifcparse/IfcWrite.cpp
@@ -18,12 +18,19 @@
  ********************************************************************************/
 
 #include <iomanip>
+#include <locale>
 
 #include "../ifcparse/IfcParse.h" 
-#include "../ifcparse/IfcFile.h"
 #include "../ifcparse/IfcWrite.h"
 #include "../ifcparse/IfcWritableEntity.h"
 #include "../ifcparse/IfcCharacterDecoder.h"
+#include "../ifcparse/IfcFile.h"
+
+#ifdef USE_IFC4
+#include "../ifcparse/Ifc4-latebound.h"
+#else
+#include "../ifcparse/Ifc2x3-latebound.h"
+#endif
 
 using namespace IfcWrite;
 
@@ -36,7 +43,16 @@ IfcWritableEntity::~IfcWritableEntity() {
 	delete _id;
 }
 int IfcWritableEntity::setId(int i) {
-	return *(_id = new int(i > 0 ? i : file->FreshId()));
+	if (i > 0) {
+		delete _id;
+		return *(_id = new int(i));
+	} else {
+		if (_id) { return *_id; }
+		else { 
+			delete _id; 
+			return *(_id = new int(file->FreshId())); 
+		}
+	}
 }
 IfcWritableEntity::IfcWritableEntity(IfcAbstractEntity* e) 
 {
@@ -46,56 +62,51 @@ IfcWritableEntity::IfcWritableEntity(IfcAbstractEntity* e)
 
 	const unsigned int count = e->getArgumentCount();
 	for ( unsigned int i = 0; i < count; ++ i ) {
-		args[i] = e->getArgument(i);
-		writemask[i] = false;
+		this->setArgument(i, e->getArgument(i));
 	}
 }
-// TODO: Reove redundancy with IfcParse::Entity
-IfcEntities IfcWritableEntity::getInverse(IfcSchema::Type::Enum c) {
-	IfcEntities l = IfcEntities(new IfcEntityList());
-	int id = _id ? *_id : setId();
-	IfcEntities all = file->EntitiesByReference(id);
-	if ( ! all ) return l;
-	for( IfcEntityList::it it = all->begin(); it != all->end();++  it  ) {
-		if ( c == IfcSchema::Type::ALL || (*it)->is(c) ) {
-			l->push(*it);
-		}
-	}
-	return l;
-}
-IfcEntities IfcWritableEntity::getInverse(IfcSchema::Type::Enum c, int i, const std::string& a) {
-	IfcEntities l = IfcEntities(new IfcEntityList());
-	IfcEntities all = getInverse(c);
-	for( IfcEntityList::it it = all->begin(); it != all->end();++ it  ) {
-		const std::string s = *(*it)->entity->getArgument(i);
-		if ( s == a ) {
-			l->push(*it);
-		}
+
+IfcEntityList::ptr IfcWritableEntity::getInverse(IfcSchema::Type::Enum type, int attribute_index) {
+	if (file) {
+		int id = _id ? *_id : setId();
+		return file->getInverse(id, type, attribute_index);
+	} else {
+		throw IfcParse::IfcException("Instance not part of a file");
 	}
-	return l;
 }
 
-std::string IfcWritableEntity::datatype() { return IfcSchema::Type::ToString(_type); }
-ArgumentPtr IfcWritableEntity::getArgument (unsigned int i) { if ( i >= getArgumentCount() ) throw IfcParse::IfcException("Argument not set"); return args[i]; }
-unsigned int IfcWritableEntity::getArgumentCount() {return args.size(); }
+std::string IfcWritableEntity::datatype() const { return IfcSchema::Type::ToString(_type); }
+Argument* IfcWritableEntity::getArgument (unsigned int i) {
+	if (args[i] == 0) {
+		_setArgument(i, boost::none);
+	}
+	return args[i];
+}
+unsigned int IfcWritableEntity::getArgumentCount() const {return args.size(); }
 IfcSchema::Type::Enum IfcWritableEntity::type() const { return _type; }
 bool IfcWritableEntity::is(IfcSchema::Type::Enum v) const { return _type == v; }
-std::string IfcWritableEntity::toString(bool upper) {
+std::string IfcWritableEntity::toString(bool upper) const {
 	std::stringstream ss;
+	ss.imbue(std::locale::classic());
+	
 	std::string dt = datatype();
-	if ( upper ) {
+	if (upper) {
 		for (std::string::iterator p = dt.begin(); p != dt.end(); ++p ) *p = toupper(*p);
 	}
-	if ( _id && !IfcSchema::Type::IsSimple(_type) ) {
-		ss << "#" << *_id << "=";
+
+	if (_id && !IfcSchema::Type::IsSimple(type())) {
+		ss << "#" << *_id;
+		ss << "=";
 	}
+
 	ss << dt << "(";
-	for ( std::map<int,ArgumentPtr>::const_iterator it = args.begin(); it != args.end(); ++ it ) {
+	for (std::map<int,Argument*>::const_iterator it = args.begin(); it != args.end(); ++ it) {
 		if ( it != args.begin() ) ss << ",";
-		const ArgumentPtr a = it->second;
+		const Argument* a = it->second;
 		ss << it->second->toString(upper);
 	}
 	ss << ")";
+
 	return ss.str();
 }
 unsigned int IfcWritableEntity::id() { 
@@ -104,7 +115,7 @@ unsigned int IfcWritableEntity::id() {
 	}
 	return *_id; 
 }
-bool IfcWritableEntity::isWritable() { return true; }
+IfcWritableEntity* IfcWritableEntity::isWritable() { return this; }
 bool IfcWritableEntity::arg_writable(int i) {
 	std::map<int,bool>::const_iterator it = writemask.find(i);
 	if ( it == writemask.end() ) return false;
@@ -125,6 +136,79 @@ template <typename T> void IfcWritableEntity::_setArgument(int i, const T& t) {
 void IfcWritableEntity::setArgument(int i) {
 	_setArgument(i, boost::none);
 }
+
+void IfcWritableEntity::setArgument(int i, Argument* a) {
+	IfcWrite::IfcWriteArgument* wa = new IfcWrite::IfcWriteArgument(this);
+	IfcUtil::ArgumentType attr_type = a->type();
+	switch(attr_type) {
+	case IfcUtil::Argument_NULL:
+		this->setArgument(i);
+		break;
+	case IfcUtil::Argument_DERIVED:
+		this->setArgumentDerived(i);
+		break;
+	case IfcUtil::Argument_INT:
+		this->setArgument(i, static_cast<int>(*a));
+		break;
+	case IfcUtil::Argument_BOOL:
+		this->setArgument(i, static_cast<bool>(*a));
+		break;
+	case IfcUtil::Argument_DOUBLE:
+		this->setArgument(i, static_cast<double>(*a));
+		break;
+	case IfcUtil::Argument_STRING:
+		this->setArgument(i, static_cast<std::string>(*a));
+		break; 
+	case IfcUtil::Argument_VECTOR_INT: {
+		std::vector<int> attr_value = *a;
+		this->setArgument(i, attr_value); }
+		break;
+	case IfcUtil::Argument_VECTOR_DOUBLE: {
+		std::vector<double> attr_value = *a;
+		this->setArgument(i, attr_value); }
+		break;
+	case IfcUtil::Argument_VECTOR_STRING: {
+		std::vector<std::string> attr_value = *a;
+		this->setArgument(i, attr_value); }
+		break;
+	case IfcUtil::Argument_ENUMERATION: {
+		IfcSchema::Type::Enum ty = IfcSchema::Type::GetAttributeEntity(_type, i);
+		std::string enum_literal = a->toString();
+		// Remove leading and trailing '.'
+		enum_literal = enum_literal.substr(1, enum_literal.size() - 2);
+		std::pair<const char*, int> enum_ref = IfcSchema::Type::GetEnumerationIndex(ty, enum_literal);
+		this->setArgument(i, enum_ref.second, enum_ref.first); }
+		break; 
+	case IfcUtil::Argument_ENTITY: {
+		this->setArgument(i, static_cast<IfcUtil::IfcBaseClass*>(*a)); }
+		break; 
+	case IfcUtil::Argument_ENTITY_LIST: {
+		IfcEntityList::ptr instances = *a;
+		IfcEntityList::ptr mapped_instances(new IfcEntityList);
+		for (IfcEntityList::it it = instances->begin(); it != instances->end(); ++it) {
+			mapped_instances->push(*it);
+		}
+		this->setArgument(i, mapped_instances); }
+		break; 
+	case IfcUtil::Argument_ENTITY_LIST_LIST: {
+		IfcEntityListList::ptr instances = *a;
+		IfcEntityListList::ptr mapped_instances(new IfcEntityListList);
+		for (IfcEntityListList::outer_it it = instances->begin(); it != instances->end(); ++it) {
+			std::vector<IfcUtil::IfcBaseClass*> inner;
+			for (IfcEntityListList::inner_it jt = it->begin(); jt != it->end(); ++jt) {
+				inner.push_back(*jt);
+			}
+			mapped_instances->push(inner);
+		}		
+		this->setArgument(i, mapped_instances); }
+		break; 
+	case IfcUtil::Argument_UNKNOWN:
+		throw IfcParse::IfcException("Unknown argument encountered");
+		break;
+	}
+}
+
+
 void IfcWritableEntity::setArgumentDerived(int i) {
 	_setArgument(i, IfcWriteArgument::Derived());
 }
@@ -143,14 +227,21 @@ void IfcWritableEntity::setArgument(int i,const std::string& v){
 void IfcWritableEntity::setArgument(int i,double v){
 	_setArgument(i, v);
 }
-void IfcWritableEntity::setArgument(int i,IfcUtil::IfcSchemaEntity v){
+void IfcWritableEntity::setArgument(int i,IfcUtil::IfcBaseClass* v){
 	if ( v ) {
 		_setArgument(i, v);
 	} else {
 		_setArgument(i, boost::none);
 	}
 }
-void IfcWritableEntity::setArgument(int i,IfcEntities v){
+void IfcWritableEntity::setArgument(int i,IfcEntityList::ptr v){
+	if ( v.get() ) {
+		_setArgument(i, v);
+	} else {
+		_setArgument(i, boost::none);
+	}
+}
+void IfcWritableEntity::setArgument(int i,IfcEntityListList::ptr v){
 	if ( v.get() ) {
 		_setArgument(i, v);
 	} else {
@@ -179,8 +270,9 @@ class SizeVisitor : public boost::static_visitor<int> {
 	int operator()(const std::vector<double>& i) const { return i.size(); }
 	int operator()(const std::vector<std::string>& i) const { return i.size(); }
 	int operator()(const IfcWriteArgument::EnumerationReference& i) const { return -1; }
-	int operator()(const IfcUtil::IfcSchemaEntity& i) const { return -1; }
-	int operator()(const IfcEntities& i) const { return i->Size(); }
+	int operator()(const IfcUtil::IfcBaseClass* const& i) const { return -1; }
+	int operator()(const IfcEntityList::ptr& i) const { return i->size(); }
+	int operator()(const IfcEntityListList::ptr& i) const { return i->size(); }
 };
 
 class StringBuilderVisitor : public boost::static_visitor<void> {
@@ -199,7 +291,8 @@ class StringBuilderVisitor : public boost::static_visitor<void> {
 	// REAL = [ SIGN ] DIGIT { DIGIT } "." { DIGIT } [ "E" [ SIGN ] DIGIT { DIGIT } ] .
 	std::string format_double(const double& d) {
 		std::ostringstream oss;
-		oss << std::setprecision(16) << d;
+		oss.imbue(std::locale::classic());
+		oss << std::setprecision(15) << d;
 		const std::string str = oss.str();
 		oss.str("");
 		std::string::size_type e = str.find('e');
@@ -217,14 +310,6 @@ class StringBuilderVisitor : public boost::static_visitor<void> {
 		}
 		return oss.str();
 	}
-	void serialize_double(const std::vector<double>& i) {
-		data << "(";
-		for (std::vector<double>::const_iterator it = i.begin(); it != i.end(); ++it) {
-			if (it != i.begin()) data << ",";
-			data << format_double(*it);
-		}
-		data << ")";
-	}
 	bool upper;
 public:
 	StringBuilderVisitor(std::ostringstream& stream, bool upper = false) 
@@ -236,28 +321,27 @@ class StringBuilderVisitor : public boost::static_visitor<void> {
 	void operator()(const double& i) { data << format_double(i); }
 	void operator()(const std::string& i) { 
 		std::string s = i;
-		if (upper) s = IfcCharacterEncoder(s);
-		data << s; 
+		if (upper) {
+			data << static_cast<std::string>(IfcCharacterEncoder(s));
+		} else {
+			data << '\'' << s << '\'';
+		}
 	}
-	void operator()(const std::vector<int>& i) { serialize(i); }
-	void operator()(const std::vector<double>& i) { serialize_double(i); }
-	void operator()(const std::vector<std::string>& i) { serialize(i); }
+	void operator()(const std::vector<int>& i);
+	void operator()(const std::vector<double>& i);
+	void operator()(const std::vector<std::string>& i);
 	void operator()(const IfcWriteArgument::EnumerationReference& i) {
 		data << "." << i.enumeration_value << ".";
 	}
-	void operator()(const IfcUtil::IfcSchemaEntity& i) { 
+	void operator()(const IfcUtil::IfcBaseClass* const& i) { 
 		IfcAbstractEntity* e = i->entity;
 		if ( IfcSchema::Type::IsSimple(e->type()) ) {
 			data << e->toString(upper);
 		} else {
-			if (e->file) {
-				data << "#" << e->id();
-			} else {
-				data << "#?";
-			}
+			data << "#" << e->id();
 		}
 	}
-	void operator()(const IfcEntities& i) { 
+	void operator()(const IfcEntityList::ptr& i) { 
 		data << "(";
 		for (IfcEntityList::it it = i->begin(); it != i->end(); ++it) {
 			if (it != i->begin()) data << ",";
@@ -265,27 +349,77 @@ class StringBuilderVisitor : public boost::static_visitor<void> {
 		}
 		data << ")";
 	}
+	void operator()(const IfcEntityListList::ptr& i) { 
+		data << "(";
+		for (IfcEntityListList::outer_it outer_it = i->begin(); outer_it != i->end(); ++outer_it) {
+			data << "(";
+			if (outer_it != i->begin()) data << ",";
+			for (IfcEntityListList::inner_it inner_it = outer_it->begin(); inner_it != outer_it->end(); ++inner_it) {
+				if (inner_it != outer_it->begin()) data << ",";
+				(*this)(*inner_it);
+			}
+			data << ")";
+		}
+		data << ")";
+	}
 	operator std::string() { return data.str(); }
 };
 
+template <>
+void StringBuilderVisitor::serialize(const std::vector<std::string>& i) {
+	data << "(";
+	for (std::vector<std::string>::const_iterator it = i.begin(); it != i.end(); ++it) {
+		if (it != i.begin()) data << ",";
+		if (upper) {
+			std::string s = IfcCharacterEncoder(*it);
+			data << s;
+		} else {
+			data << *it;
+		}
+	}
+	data << ")";
+}
+
+template <>
+void StringBuilderVisitor::serialize(const std::vector<double>& i) {
+	data << "(";
+	for (std::vector<double>::const_iterator it = i.begin(); it != i.end(); ++it) {
+		if (it != i.begin()) data << ",";
+		data << format_double(*it);
+	}
+	data << ")";
+}
+
+void StringBuilderVisitor::operator()(const std::vector<int>& i) { serialize(i); }
+void StringBuilderVisitor::operator()(const std::vector<double>& i) { serialize(i); }
+void StringBuilderVisitor::operator()(const std::vector<std::string>& i) { serialize(i); }
+	
+
 IfcWriteArgument::operator int() const { return as<int>(); }
 IfcWriteArgument::operator bool() const { return as<bool>(); }
 IfcWriteArgument::operator double() const { return as<double>(); }
-IfcWriteArgument::operator std::string() const { return as<std::string>(); }
+IfcWriteArgument::operator std::string() const { 
+	if (type() == IfcUtil::Argument_ENUMERATION) {
+		return as<EnumerationReference>().enumeration_value;
+	}
+	return as<std::string>(); 
+}
 IfcWriteArgument::operator std::vector<double>() const { return as<std::vector<double> >(); }
 IfcWriteArgument::operator std::vector<int>() const { return as<std::vector<int> >(); }
 IfcWriteArgument::operator std::vector<std::string>() const { return as<std::vector<std::string > >(); }
-IfcWriteArgument::operator IfcUtil::IfcSchemaEntity() const { return as<IfcUtil::IfcSchemaEntity>(); }
-IfcWriteArgument::operator IfcEntities() const { return as<IfcEntities>(); }
-bool IfcWriteArgument::isNull() const { return argumentType() == argument_type_null; }
-ArgumentPtr IfcWriteArgument::operator [] (unsigned int i) const { throw IfcParse::IfcException("Invalid cast"); }
+IfcWriteArgument::operator IfcUtil::IfcBaseClass*() const { return as<IfcUtil::IfcBaseClass*>(); }
+IfcWriteArgument::operator IfcEntityList::ptr() const { return as<IfcEntityList::ptr>(); }
+IfcWriteArgument::operator IfcEntityListList::ptr() const { throw; }
+bool IfcWriteArgument::isNull() const { return type() == IfcUtil::Argument_NULL; }
+Argument* IfcWriteArgument::operator [] (unsigned int i) const { throw IfcParse::IfcException("Invalid cast"); }
 std::string IfcWriteArgument::toString(bool upper) const {
 	std::ostringstream str;
+	str.imbue(std::locale::classic());
 	StringBuilderVisitor v(str, upper);
 	container.apply_visitor(v);
 	return v;
 }
-unsigned int IfcWriteArgument::Size() const {
+unsigned int IfcWriteArgument::size() const {
 	SizeVisitor v;
 	const int size = container.apply_visitor(v);
 	if (size == -1) {
@@ -294,74 +428,25 @@ unsigned int IfcWriteArgument::Size() const {
 		return size;
 	}
 }
-IfcWriteArgument::argument_type IfcWriteArgument::argumentType() const {
-	return static_cast<argument_type>(container.which());
-}
 
-IfcEntities IfcSelectHelperEntity::getInverse(IfcSchema::Type::Enum,int,const std::string &) {throw IfcParse::IfcException("Invalid cast");}
-IfcEntities IfcSelectHelperEntity::getInverse(IfcSchema::Type::Enum) {throw IfcParse::IfcException("Invalid cast");}
-std::string IfcSelectHelperEntity::datatype() { return IfcSchema::Type::ToString(_type); }
-ArgumentPtr IfcSelectHelperEntity::getArgument(unsigned int i) {
-	if ( i != 0 ) throw IfcParse::IfcException("Invalid cast");
-	return arg;
-}
-unsigned int IfcSelectHelperEntity::getArgumentCount() { return 1; }
-IfcSchema::Type::Enum IfcSelectHelperEntity::type() const { return _type; }
-bool IfcSelectHelperEntity::is(IfcSchema::Type::Enum t) const { return _type == t; }
-std::string IfcSelectHelperEntity::toString(bool upper) {
-	std::stringstream ss;
-	std::string dt = datatype();
-	if ( upper ) {
-		for (std::string::iterator p = dt.begin(); p != dt.end(); ++p ) *p = toupper(*p);
-	}
-	ss << dt << "(" << arg->toString(upper) << ")";
-	return ss.str();
+IfcUtil::ArgumentType IfcWriteArgument::type() const {
+	return static_cast<IfcUtil::ArgumentType>(container.which());
 }
-unsigned int IfcSelectHelperEntity::id() { throw IfcParse::IfcException("Invalid cast"); }
-bool IfcSelectHelperEntity::isWritable() { throw IfcParse::IfcException("Invalid cast"); }
-
-IfcSelectHelper::IfcSelectHelper(const std::string& v, IfcSchema::Type::Enum t) {
-	IfcWriteArgument* a = new IfcWriteArgument(0);
-	a->set(v);
-	this->entity = new IfcSelectHelperEntity(t,a);
-}
-IfcSelectHelper::IfcSelectHelper(const char* const v, IfcSchema::Type::Enum t) {
-	IfcWriteArgument* a = new IfcWriteArgument(0);
-	a->set<std::string>(v);
-	this->entity = new IfcSelectHelperEntity(t,a);
-}
-IfcSelectHelper::IfcSelectHelper(int v, IfcSchema::Type::Enum t) {
-	IfcWriteArgument* a = new IfcWriteArgument(0);
-	a->set(v);
-	this->entity = new IfcSelectHelperEntity(t,a);
-}
-IfcSelectHelper::IfcSelectHelper(double v, IfcSchema::Type::Enum t) {
-	IfcWriteArgument* a = new IfcWriteArgument(0);
-	a->set(v);
-	this->entity = new IfcSelectHelperEntity(t,a);
-}
-IfcSelectHelper::IfcSelectHelper(bool v, IfcSchema::Type::Enum t) {
-	IfcWriteArgument* a = new IfcWriteArgument(0);
-	a->set(v);
-	this->entity = new IfcSelectHelperEntity(t,a);
-}
-bool IfcSelectHelper::is(IfcSchema::Type::Enum t) const { return entity->is(t); }
-IfcSchema::Type::Enum IfcSelectHelper::type() const { return entity->type(); } 
 
 EntityBuffer* EntityBuffer::i = 0;
 EntityBuffer* EntityBuffer::instance() {
 	if ( ! i ) {
 		i = new EntityBuffer();
-		i->buffer = IfcEntities(new IfcEntityList());
+		i->buffer = IfcEntityList::ptr(new IfcEntityList);
 	}
 	return i;
 }
-IfcEntities EntityBuffer::Get() {
+IfcEntityList::ptr EntityBuffer::Get() {
 	return instance()->buffer;
 }
 void EntityBuffer::Clear() {
-	instance()->buffer = IfcEntities(new IfcEntityList());
+	instance()->buffer = IfcEntityList::ptr(new IfcEntityList);
 }
-void EntityBuffer::Add(IfcUtil::IfcSchemaEntity e) {
+void EntityBuffer::Add(IfcUtil::IfcBaseClass* e) {
 	instance()->buffer->push(e);
 }
diff --git a/src/ifcparse/IfcWrite.h b/src/ifcparse/IfcWrite.h
index 31fd6d8..52d22e5 100644
--- a/src/ifcparse/IfcWrite.h
+++ b/src/ifcparse/IfcWrite.h
@@ -33,7 +33,6 @@
 
 #include "../ifcparse/IfcUtil.h"
 #include "../ifcparse/IfcParse.h"
-#include "../ifcparse/IfcException.h"
 
 namespace IfcWrite {
 
@@ -83,27 +82,15 @@ namespace IfcWrite {
 			// An entity instance argument. It will either serialize to
 			// e.g. #123 or datatype identifier for simple types, e.g. 
 			// IFCREAL(12.3)
-			IfcUtil::IfcSchemaEntity,
+			IfcUtil::IfcBaseClass*,
 			// An entity list argument. It will either serialize to
 			// e.g. (#1,#2,#3) or datatype identifier for simple types,
 			// e.g. (IFCREAL(1.2),IFCINTEGER(3.))
-			IfcEntities
+			IfcEntityList::ptr,
+			// A list of list of entities. E.g. ((#1, #2), (#3))
+			IfcEntityListList::ptr
 		> container;
 	public:
-		enum argument_type {
-			argument_type_null,
-			argument_type_derived,
-			argument_type_int, 
-			argument_type_bool, 
-			argument_type_double, 
-			argument_type_string, 
-			argument_type_vector_int,
-			argument_type_vector_double,
-			argument_type_vector_string,
-			argument_type_enumeration,
-			argument_type_schema_entity,
-			argument_type_entities
-		};
 		IfcWriteArgument(IfcAbstractEntity* e) : entity(e) {}
 		template <typename T> const T& as() const {
 			if (const T* val = boost::get<T>(&container)) {
@@ -122,53 +109,16 @@ namespace IfcWrite {
 		operator std::vector<double>() const;
 		operator std::vector<int>() const;
 		operator std::vector<std::string>() const;
-		operator IfcUtil::IfcSchemaEntity() const;
-		operator IfcEntities() const;
+		operator IfcUtil::IfcBaseClass*() const;
+		operator IfcEntityList::ptr() const;
+        operator IfcEntityListList::ptr() const;
 		bool isNull() const;
-		ArgumentPtr operator [] (unsigned int i) const;
+		Argument* operator [] (unsigned int i) const;
 		std::string toString(bool upper=false) const;
-		unsigned int Size() const;
-		argument_type argumentType() const;
+		unsigned int size() const;
+		IfcUtil::ArgumentType type() const;
 	};
 
-	/// An entity to help with passing of SELECT arguments that
-	/// consist of simple types, for example useful to initialize
-	/// a new IfcProperty.
-	/// Proper memory management is difficult for now, so beware.
-	class IfcSelectHelperEntity : public IfcAbstractEntity {
-	private:
-		IfcSchema::Type::Enum _type;
-		IfcWriteArgument* arg;
-	public:
-		// FIXME: Make this a non-pointer argument and implement a copy constructor
-		IfcSelectHelperEntity(IfcSchema::Type::Enum t, IfcWriteArgument* a) : _type(t), arg(a) {}
-		IfcEntities getInverse(IfcSchema::Type::Enum,int,const std::string &);
-		IfcEntities getInverse(IfcSchema::Type::Enum);
-		std::string datatype();
-		ArgumentPtr getArgument(unsigned int i);
-		unsigned int getArgumentCount();
-		IfcSchema::Type::Enum type() const;
-		bool is(IfcSchema::Type::Enum t) const;
-		std::string toString(bool upper = false);
-		unsigned int id();
-		bool isWritable();
-	};
-
-	/// A helper class for passing of SELECT arguments that
-	/// consist of simple types, for example useful to initialize
-	/// a new IfcProperty.
-	/// Proper memory management is difficult for now, so beware.
-	class IfcSelectHelper : public IfcUtil::IfcBaseClass {
-	public:
-		IfcSelectHelper(const std::string& v, IfcSchema::Type::Enum t=IfcSchema::Type::IfcText);
-		IfcSelectHelper(const char* const v, IfcSchema::Type::Enum t=IfcSchema::Type::IfcText);
-		IfcSelectHelper(int v, IfcSchema::Type::Enum t=IfcSchema::Type::IfcInteger);
-		IfcSelectHelper(double v, IfcSchema::Type::Enum t=IfcSchema::Type::IfcReal);
-		IfcSelectHelper(bool v, IfcSchema::Type::Enum t=IfcSchema::Type::IfcBoolean);
-		bool is(IfcSchema::Type::Enum t) const;
-		IfcSchema::Type::Enum type() const;
-	};
-	
 	/// A helper class for the creation of IFC GlobalIds.
 	class IfcGuidHelper {
 	private:
@@ -184,13 +134,13 @@ namespace IfcWrite {
 	// This way they can be added in a single batch to the IfcFile
 	class EntityBuffer {
 	private:
-		IfcEntities buffer;
+		IfcEntityList::ptr buffer;
 		static EntityBuffer* i;
 		static EntityBuffer* instance();
 	public:
-		static IfcEntities Get();
+		static IfcEntityList::ptr Get();
 		static void Clear();
-		static void Add(IfcUtil::IfcSchemaEntity e);
+		static void Add(IfcUtil::IfcBaseClass* e);
 	};
 
 }
diff --git a/src/ifcwrap/CMakeLists.txt b/src/ifcwrap/CMakeLists.txt
index e414c9e..ba87b65 100644
--- a/src/ifcwrap/CMakeLists.txt
+++ b/src/ifcwrap/CMakeLists.txt
@@ -15,21 +15,22 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
 SET(CMAKE_SWIG_FLAGS "")
 
 SET_SOURCE_FILES_PROPERTIES(IfcPython.i PROPERTIES CPLUSPLUS ON)
-SWIG_ADD_MODULE(IfcImport python IfcPython.i)
-SWIG_LINK_LIBRARIES(IfcImport ${PYTHON_LIBRARIES} IfcParse IfcGeom TKernel TKMath TKBRep TKGeomBase TKGeomAlgo TKG3d TKG2d TKShHealing TKTopAlgo TKMesh TKPrim TKBool TKBO TKFillet TKOffset)
+SWIG_ADD_MODULE(ifcopenshell_wrapper python IfcPython.i)
+SWIG_LINK_LIBRARIES(ifcopenshell_wrapper ${PYTHON_LIBRARIES} IfcParse IfcGeom TKernel TKMath TKBRep TKGeomBase TKGeomAlgo TKG3d TKG2d TKShHealing TKTopAlgo TKMesh TKPrim TKBool TKBO TKFillet TKOffset)
 
-# To install IfcPython let's get the site-packackes dir from python
-EXECUTE_PROCESS(COMMAND python -c "from distutils.sysconfig import get_python_lib as x; print (x())"
+# To install IfcPython let's get the site-packages dir from python
+EXECUTE_PROCESS(COMMAND python -c "import sys; from distutils.sysconfig import get_python_lib; sys.stdout.write(get_python_lib())"
 	OUTPUT_VARIABLE python_package_dir)
 
-# Strip trailing whitespace from python print
-STRING(REPLACE "\r" "" python_package_dir "${python_package_dir}")
-STRING(REPLACE "\n" "" python_package_dir "${python_package_dir}")
-
 INSTALL(FILES 
-		"${CMAKE_BINARY_DIR}/ifcwrap/IfcImport.py" 
-		"${CMAKE_BINARY_DIR}/ifcwrap/_IfcImport.so" 
-	DESTINATION "${python_package_dir}")
+		"${CMAKE_BINARY_DIR}/ifcwrap/ifcopenshell_wrapper.py"
+        "${CMAKE_CURRENT_SOURCE_DIR}/../ifcopenshell-python/ifcopenshell/__init__.py"
+        "${CMAKE_CURRENT_SOURCE_DIR}/../ifcopenshell-python/ifcopenshell/guid.py"
+	DESTINATION "${python_package_dir}/ifcopenshell")
+INSTALL(FILES
+        "${CMAKE_CURRENT_SOURCE_DIR}/../ifcopenshell-python/ifcopenshell/geom/__init__.py"
+	DESTINATION "${python_package_dir}/ifcopenshell/geom")
+INSTALL(TARGETS _ifcopenshell_wrapper DESTINATION "${python_package_dir}/ifcopenshell")
 
 ENDIF(PYTHONLIBS_FOUND)
 
diff --git a/src/ifcwrap/IfcGeomWrapper.i b/src/ifcwrap/IfcGeomWrapper.i
new file mode 100644
index 0000000..2b705a1
--- /dev/null
+++ b/src/ifcwrap/IfcGeomWrapper.i
@@ -0,0 +1,328 @@
+/********************************************************************************
+ *                                                                              *
+ * This file is part of IfcOpenShell.                                           *
+ *                                                                              *
+ * IfcOpenShell is free software: you can redistribute it and/or modify         *
+ * it under the terms of the Lesser GNU General Public License as published by  *
+ * the Free Software Foundation, either version 3.0 of the License, or          *
+ * (at your option) any later version.                                          *
+ *                                                                              *
+ * IfcOpenShell 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                 *
+ * Lesser GNU General Public License for more details.                          *
+ *                                                                              *
+ * You should have received a copy of the Lesser GNU General Public License     *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.         *
+ *                                                                              *
+ ********************************************************************************/
+
+%rename("settings") IteratorSettings;
+
+// This is only used for RGB colours, hence the size of 3
+%typemap(out) const double* {
+	$result = PyTuple_New(3);
+	for (int i = 0; i < 3; ++i) {
+		PyTuple_SetItem($result, i, PyFloat_FromDouble($1[i]));
+	}
+}
+
+// SWIG does not support bool references in a meaningful way, so the
+// IfcGeom::IteratorSettings functions degrade to return a read only value
+%typemap(out) double& {
+	$result = SWIG_From_double(*$1);
+}
+%typemap(out) bool& {
+	$result = PyBool_FromLong(static_cast<long>(*$1));
+}
+
+%include "../ifcgeom/IfcGeomIteratorSettings.h"
+%include "../ifcgeom/IfcGeomElement.h"
+%include "../ifcgeom/IfcGeomMaterial.h"
+%include "../ifcgeom/IfcGeomRepresentation.h"
+%include "../ifcgeom/IfcGeomIterator.h"
+
+// Using RTTI return a more specialized type of Element
+// Note that these elements are not to be owned by SWIG/Python as they will be freed automatically upon the next iteration
+// except for the IfcGeom::Element instances which are returned by Iterator::getObject() calls
+%typemap(out) IfcGeom::Element<float>* {
+	IfcGeom::SerializedElement<float>* serialized_elem = dynamic_cast<IfcGeom::SerializedElement<float>*>($1);
+	IfcGeom::TriangulationElement<float>* triangulation_elem = dynamic_cast<IfcGeom::TriangulationElement<float>*>($1);
+	if (triangulation_elem) {
+		$result = SWIG_NewPointerObj(SWIG_as_voidptr(triangulation_elem), SWIGTYPE_p_IfcGeom__TriangulationElementT_float_t, 0);
+	} else if (serialized_elem) {
+		$result = SWIG_NewPointerObj(SWIG_as_voidptr(serialized_elem), SWIGTYPE_p_IfcGeom__SerializedElementT_float_t, 0);
+	} else {
+		$result = SWIG_NewPointerObj(SWIG_as_voidptr($1), SWIGTYPE_p_IfcGeom__ElementT_float_t, SWIG_POINTER_OWN);
+	}
+}
+
+// Using RTTI return a more specialized type of Element
+// Note that these elements are not to be owned by SWIG/Python as they will be freed automatically upon the next iteration
+// except for the IfcGeom::Element instances which are returned by Iterator::getObject() calls
+%typemap(out) IfcGeom::Element<double>* {
+	IfcGeom::SerializedElement<double>* serialized_elem = dynamic_cast<IfcGeom::SerializedElement<double>*>($1);
+	IfcGeom::TriangulationElement<double>* triangulation_elem = dynamic_cast<IfcGeom::TriangulationElement<double>*>($1);
+	if (triangulation_elem) {
+		$result = SWIG_NewPointerObj(SWIG_as_voidptr(triangulation_elem), SWIGTYPE_p_IfcGeom__TriangulationElementT_double_t, 0);
+	} else if (serialized_elem) {
+		$result = SWIG_NewPointerObj(SWIG_as_voidptr(serialized_elem), SWIGTYPE_p_IfcGeom__SerializedElementT_double_t, 0);
+	} else {
+		$result = SWIG_NewPointerObj(SWIG_as_voidptr($1), SWIGTYPE_p_IfcGeom__ElementT_double_t, SWIG_POINTER_OWN);
+	}
+}
+
+// Note that these elements ARE to be owned by SWIG/Python
+%typemap(out) boost::variant<IfcGeom::Element<double>*, IfcGeom::Representation::Representation*> {
+	// See which type is set and return appropriate
+	IfcGeom::Element<double>* elem = boost::get<IfcGeom::Element<double>*>($1);
+	IfcGeom::SerializedElement<double>* serialized_elem = dynamic_cast<IfcGeom::SerializedElement<double>*>(elem);
+	IfcGeom::TriangulationElement<double>* triangulation_elem = dynamic_cast<IfcGeom::TriangulationElement<double>*>(elem);
+	if (triangulation_elem) {
+		$result = SWIG_NewPointerObj(SWIG_as_voidptr(triangulation_elem), SWIGTYPE_p_IfcGeom__TriangulationElementT_double_t, SWIG_POINTER_OWN);
+	} else if (serialized_elem) {
+		$result = SWIG_NewPointerObj(SWIG_as_voidptr(serialized_elem), SWIGTYPE_p_IfcGeom__SerializedElementT_double_t, SWIG_POINTER_OWN);
+	}
+}
+
+// This does not seem to work:
+%ignore IfcGeom::Iterator<float>::Iterator(const IfcGeom::IteratorSettings&, IfcParse::IfcFile*);
+%ignore IfcGeom::Iterator<float>::Iterator(const IfcGeom::IteratorSettings&, void*, int);
+%ignore IfcGeom::Iterator<float>::Iterator(const IfcGeom::IteratorSettings&, std::istream&, int);
+%ignore IfcGeom::Iterator<double>::Iterator(const IfcGeom::IteratorSettings&, IfcParse::IfcFile*);
+%ignore IfcGeom::Iterator<double>::Iterator(const IfcGeom::IteratorSettings&, void*, int);
+%ignore IfcGeom::Iterator<double>::Iterator(const IfcGeom::IteratorSettings&, std::istream&, int);
+
+%extend IfcGeom::IteratorSettings {
+	%pythoncode %{
+		attrs = ("convert_back_units", "deflection_tolerance", "disable_opening_subtractions", "disable_triangulation", "faster_booleans", "force_ccw_face_orientation", "sew_shells", "use_brep_data", "use_world_coords", "weld_vertices")
+		def __repr__(self):
+			return "%s(%s)"%(self.__class__.__name__, ",".join(tuple("%s=%r"%(a, getattr(self, a)()) for a in self.attrs)))
+	%}
+}
+
+%extend IfcGeom::Iterator<float> {
+	static int mantissa_size() {
+		return std::numeric_limits<float>::digits;
+	}
+};
+
+%extend IfcGeom::Iterator<double> {
+	static int mantissa_size() {
+		return std::numeric_limits<double>::digits;
+	}
+};
+
+%extend IfcGeom::Representation::Triangulation {
+    %pythoncode %{
+		if _newclass:
+			# Hide the getters with read-only property implementations
+			id = property(id)
+			verts = property(verts)
+			faces = property(faces)
+			edges = property(edges)
+			normals = property(normals)
+			material_ids = property(material_ids)
+			materials = property(materials)
+    %}
+};
+
+%extend IfcGeom::Representation::Serialization {
+	%pythoncode %{
+		if _newclass:
+			# Hide the getters with read-only property implementations
+			id = property(id)
+			brep_data = property(brep_data)
+    %}
+};
+
+%extend IfcGeom::Element {
+	%pythoncode %{
+		if _newclass:
+			# Hide the getters with read-only property implementations
+			id = property(id)
+			parent_id = property(parent_id)
+			name = property(name)
+			type = property(type)
+			guid = property(guid)
+			transformation = property(transformation)
+    %}
+};
+
+%extend IfcGeom::TriangulationElement {
+	%pythoncode %{
+		if _newclass:
+			# Hide the getters with read-only property implementations
+			geometry = property(geometry)
+    %}
+};
+
+%extend IfcGeom::SerializedElement {
+	%pythoncode %{
+		if _newclass:
+			# Hide the getters with read-only property implementations
+			geometry = property(geometry)
+    %}
+};
+
+%extend IfcGeom::Material {
+	%pythoncode %{
+		if _newclass:
+			# Hide the getters with read-only property implementations
+			has_diffuse = property(hasDiffuse)
+			has_specular = property(hasSpecular)
+			has_transparency = property(hasTransparency)
+			has_specularity = property(hasSpecularity)
+			diffuse = property(diffuse)
+			specular = property(specular)
+			transparency = property(transparency)
+			specularity = property(specularity)
+			name = property(name)
+    %}
+};
+
+%extend IfcGeom::Transformation {
+	%pythoncode %{
+		if _newclass:
+			# Hide the getters with read-only property implementations
+			matrix = property(matrix)
+    %}
+};
+
+%extend IfcGeom::Matrix {
+	%pythoncode %{
+		if _newclass:
+			# Hide the getters with read-only property implementations
+			data = property(data)
+    %}
+};
+
+%inline %{
+	boost::variant<IfcGeom::Element<double>*, IfcGeom::Representation::Representation*> create_shape(IfcGeom::IteratorSettings& settings, IfcParse::IfcLateBoundEntity* instance) {
+		if (instance->is(IfcSchema::Type::IfcProduct)) {
+			IfcParse::IfcFile* file = instance->entity->file;
+			
+			IfcSchema::IfcProject::list::ptr projects = file->entitiesByType<IfcSchema::IfcProject>();
+			if (projects->size() != 1) {
+				throw IfcParse::IfcException("Not a single IfcProject instance");
+			}
+			IfcSchema::IfcProject* project = *projects->begin();
+			
+			IfcGeom::Kernel kernel;
+			kernel.setValue(IfcGeom::Kernel::GV_MAX_FACES_TO_SEW, settings.sew_shells() ? 1000 : -1);
+			kernel.setValue(IfcGeom::Kernel::GV_FORCE_CCW_FACE_ORIENTATION, settings.force_ccw_face_orientation() ? 1 : -1);
+
+			IfcSchema::IfcProduct* product = (IfcSchema::IfcProduct*) instance;
+
+			if (!product->hasRepresentation()) {
+				throw IfcParse::IfcException("Representation is NULL");
+			}
+			
+			IfcSchema::IfcProductRepresentation* prodrep = product->Representation();
+			IfcSchema::IfcRepresentation::list::ptr reps = prodrep->Representations();
+			IfcSchema::IfcRepresentation* representation = 0;
+			
+			// First, try to find a representation with a 'Body' identifier
+			for (IfcSchema::IfcRepresentation::list::it it = reps->begin(); it != reps->end(); ++it) {
+				IfcSchema::IfcRepresentation* rep = *it;
+				if (rep->RepresentationIdentifier() == "Body") {
+					representation = rep;
+					break;
+				}
+			}
+
+			// Otherwise, find a representation within the 'Model' context
+			if (!representation) {
+				for (IfcSchema::IfcRepresentation::list::it it = reps->begin(); it != reps->end(); ++it) {
+					IfcSchema::IfcRepresentation* rep = *it;
+					IfcSchema::IfcRepresentationContext* context = rep->ContextOfItems();
+					
+					// TODO: Remove redundancy with IfcGeomIterator.h
+					if (context->hasContextType()) {
+						std::set<std::string> context_types;
+						context_types.insert("model");
+						context_types.insert("design");
+						context_types.insert("model view");
+
+						std::string context_type_lc = context->ContextType();
+						for (std::string::iterator c = context_type_lc.begin(); c != context_type_lc.end(); ++c) {
+							*c = tolower(*c);
+						}
+						if (context_types.find(context_type_lc) != context_types.end()) {
+							representation = rep;
+						}
+					}
+				}
+			}
+
+			if (!representation) {
+				throw IfcParse::IfcException("No IfcRepresentations with a 'Body' RepresentationIdentifier found");
+			}
+
+			IfcSchema::IfcRepresentationContext* ctx = representation->ContextOfItems();
+			if (!ctx->is(IfcSchema::Type::IfcGeometricRepresentationContext)) {
+				throw IfcParse::IfcException("Context not of type IfcGeometricRepresentationContext");
+			}
+			IfcSchema::IfcGeometricRepresentationContext* context = (IfcSchema::IfcGeometricRepresentationContext*) ctx;
+			if (context->is(IfcSchema::Type::IfcGeometricRepresentationSubContext)) {
+				IfcSchema::IfcGeometricRepresentationSubContext* subcontext = (IfcSchema::IfcGeometricRepresentationSubContext*) context;
+				context = subcontext->ParentContext();
+			}
+
+			double precision = 1.e-6;
+			if (context->hasPrecision()) {
+				precision = context->Precision();
+			}
+			std::pair<std::string, double> length_unit = kernel.initializeUnits(project->UnitsInContext());
+			precision *= length_unit.second;
+
+			// Some arbitrary factor that has proven to work better for the models in the set of test files.
+			precision *= 10.;
+
+			kernel.setValue(IfcGeom::Kernel::GV_PRECISION, precision);
+			
+			IfcGeom::BRepElement<double>* brep = kernel.create_brep_for_representation_and_product<double>(settings, representation, product);
+			if (!brep) {
+				throw IfcParse::IfcException("Failed to process shape");
+			}
+			if (settings.use_brep_data()) {
+				IfcGeom::SerializedElement<double>* serialization = new IfcGeom::SerializedElement<double>(*brep);
+				delete brep;
+				return serialization;
+			} else if (!settings.disable_triangulation()) {
+				IfcGeom::TriangulationElement<double>* triangulation = new IfcGeom::TriangulationElement<double>(*brep);
+				delete brep;
+				return triangulation;
+			} else {
+				throw IfcParse::IfcException("No element to return based on provided settings");
+			}
+		} else {
+			throw IfcParse::IfcException("Only obtaining representations for IfcProduct instances is currently supported");
+		}
+	}
+%}
+
+namespace IfcGeom {
+	%template(iterator_single_precision) Iterator<float>;
+	%template(iterator_double_precision) Iterator<double>;
+
+	%template(element_single_precision) Element<float>;
+	%template(element_double_precision) Element<double>;
+
+	%template(triangulation_element_single_precision) TriangulationElement<float>;
+	%template(triangulation_element_double_precision) TriangulationElement<double>;
+
+	%template(serialized_element_single_precision) SerializedElement<float>;
+	%template(serialized_element_double_precision) SerializedElement<double>;
+
+	%template(transformation_single_precision) Transformation<float>;
+	%template(transformation_double_precision) Transformation<double>;
+
+	%template(matrix_single_precision) Matrix<float>;
+	%template(matrix_double_precision) Matrix<double>;
+
+	namespace Representation {
+		%template(triangulation_single_precision) Triangulation<float>;
+		%template(triangulation_double_precision) Triangulation<double>;
+	};
+};
diff --git a/src/ifcwrap/IfcParseWrapper.i b/src/ifcwrap/IfcParseWrapper.i
new file mode 100644
index 0000000..7fc382b
--- /dev/null
+++ b/src/ifcwrap/IfcParseWrapper.i
@@ -0,0 +1,298 @@
+/********************************************************************************
+ *                                                                              *
+ * This file is part of IfcOpenShell.                                           *
+ *                                                                              *
+ * IfcOpenShell is free software: you can redistribute it and/or modify         *
+ * it under the terms of the Lesser GNU General Public License as published by  *
+ * the Free Software Foundation, either version 3.0 of the License, or          *
+ * (at your option) any later version.                                          *
+ *                                                                              *
+ * IfcOpenShell 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                 *
+ * Lesser GNU General Public License for more details.                          *
+ *                                                                              *
+ * You should have received a copy of the Lesser GNU General Public License     *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.         *
+ *                                                                              *
+ ********************************************************************************/
+
+// Two class declarations to silence SWIG warning about base classes being
+// undefined, the constructors are private so that SWIG does not wrap them
+class IfcAbstractEntity {
+private:
+	IfcAbstractEntity();
+};
+namespace IfcUtil {
+	class IfcBaseEntity {
+	private:
+		IfcBaseEntity();
+	};
+}
+
+%ignore IfcParse::IfcLateBoundEntity::is;
+%ignore IfcParse::IfcLateBoundEntity::type;
+%ignore IfcParse::IfcLateBoundEntity::getArgument;
+%ignore IfcParse::IfcLateBoundEntity::IfcLateBoundEntity(IfcAbstractEntity*);
+
+%ignore IfcParse::IfcFile::Init;
+%ignore IfcParse::IfcFile::entityById;
+%ignore IfcParse::IfcFile::entityByGuid;
+%ignore IfcParse::IfcFile::addEntity;
+%ignore IfcParse::IfcFile::removeEntity;
+%ignore IfcParse::IfcFile::traverse(IfcUtil::IfcBaseClass*, int);
+%ignore IfcParse::IfcFile::traverse(IfcUtil::IfcBaseClass*);
+%ignore operator<<;
+
+%ignore IfcParse::FileDescription::FileDescription;
+%ignore IfcParse::FileName::FileName;
+%ignore IfcParse::FileSchema::FileSchema;
+%ignore IfcParse::IfcFile::tokens;
+
+%ignore IfcParse::IfcSpfHeader::IfcSpfHeader(IfcSpfLexer*);
+%ignore IfcParse::IfcSpfHeader::lexer;
+%ignore IfcParse::IfcSpfHeader::stream;
+%ignore IfcParse::HeaderEntity::is;
+
+%rename("by_type") entitiesByType;
+%rename("__len__") getArgumentCount;
+%rename("get_argument_type") getArgumentType;
+%rename("get_argument_name") getArgumentName;
+%rename("get_argument_index") getArgumentIndex;
+%rename("get_argument_optionality") getArgumentOptionality;
+%rename("get_attribute_names") getAttributeNames;
+%rename("get_inverse_attribute_names") getInverseAttributeNames;
+%rename("_set_argument") setArgument;
+%rename("__repr__") toString;
+%rename("entity_instance") IfcLateBoundEntity;
+%rename("file") IfcFile;
+
+%typemap(typecheck,precedence=SWIG_TYPECHECK_INTEGER) IfcEntityList::ptr {
+   $1 = (PySequence_Check($input) && !PyUnicode_Check($input) && !PyString_Check($input)) ? 1 : 0;
+}
+
+%typemap(in) IfcEntityList::ptr {
+	if (PySequence_Check($input)) {
+		$1 = IfcEntityList::ptr(new IfcEntityList());
+		for(Py_ssize_t i = 0; i < PySequence_Size($input); ++i) {
+			PyObject* obj = PySequence_GetItem($input, i);
+			if (obj) {
+				void *arg = 0;
+				int res = SWIG_ConvertPtr(obj, &arg, SWIGTYPE_p_IfcParse__IfcLateBoundEntity, 0);
+				if (!SWIG_IsOK(res)) {
+					SWIG_exception_fail(SWIG_ArgError(res), "Sequence element not of type IfcParse::IfcLateBoundEntity*"); 
+				} else {
+					$1->push(reinterpret_cast<IfcParse::IfcLateBoundEntity*>(arg));
+				}
+			}
+		}
+	} else {
+		SWIG_exception(SWIG_RuntimeError,"Unknown argument type");
+	}
+}
+
+%typemap(out) IfcEntityList::ptr {
+	const unsigned size = $1 ? $1->size() : 0;
+	$result = PyList_New(size);
+	for (unsigned i = 0; i < size; ++i) {
+		PyObject *o = SWIG_NewPointerObj(SWIG_as_voidptr((*$1)[i]), SWIGTYPE_p_IfcParse__IfcLateBoundEntity, 0);
+		PyList_SetItem($result,i,o);
+	}
+}
+
+%typemap(out) IfcUtil::ArgumentType {
+	$result = SWIG_Python_str_FromChar(IfcUtil::ArgumentTypeToString($1));
+}
+
+%typemap(out) std::pair<IfcUtil::ArgumentType, Argument*> {
+	// The SWIG %exception directive does not take care
+	// of our typemap. So the argument conversion block
+	// is wrapped in a try-catch block manually.
+	try {
+	const Argument& arg = *($1.second);
+	const IfcUtil::ArgumentType type = $1.first;
+	if (arg.isNull() || type == IfcUtil::Argument_DERIVED) {
+		Py_INCREF(Py_None);
+		$result = Py_None;
+	} else {
+	switch(type) {
+		case IfcUtil::Argument_INT:
+			$result = PyInt_FromLong((int)arg);
+		break;
+		case IfcUtil::Argument_BOOL:
+			$result = PyBool_FromLong((bool)arg);
+		break; 
+		case IfcUtil::Argument_DOUBLE:
+			$result = PyFloat_FromDouble(arg);
+		break;
+		case IfcUtil::Argument_ENUMERATION:
+		case IfcUtil::Argument_STRING: {
+			const std::string s = arg;
+			$result = PyString_FromString(s.c_str());
+		break; }
+		case IfcUtil::Argument_VECTOR_INT: {
+			const std::vector<int> v = arg;
+			const unsigned size = v.size();
+			$result = PyList_New(size);
+			for (unsigned int i = 0; i < size; ++i) {
+				PyList_SetItem($result,i,PyInt_FromLong(v[i]));
+			}
+		break; }
+		case IfcUtil::Argument_VECTOR_DOUBLE: {
+			const std::vector<double> v = arg;
+			const unsigned size = v.size();
+			$result = PyList_New(size);
+			for (unsigned int i = 0; i < size; ++i) {
+				PyList_SetItem($result,i,PyFloat_FromDouble(v[i]));
+			}
+		break; }
+		case IfcUtil::Argument_VECTOR_STRING: {
+			const std::vector<std::string> v = arg;
+			const unsigned size = v.size();
+			$result = PyList_New(size);
+			for (unsigned int i = 0; i < size; ++i) {
+				PyList_SetItem($result,i,PyString_FromString(v[i].c_str()));
+			}
+		break; }
+		case IfcUtil::Argument_ENTITY: {
+			IfcUtil::IfcBaseClass* e = arg;
+			$result = SWIG_NewPointerObj(SWIG_as_voidptr(e), SWIGTYPE_p_IfcParse__IfcLateBoundEntity, 0);
+		break; }
+		case IfcUtil::Argument_ENTITY_LIST: {
+			IfcEntityList::ptr es = arg;
+			const unsigned size = es->size();
+			$result = PyList_New(size);
+			for (unsigned i = 0; i < size; ++i) {
+				PyObject *o = SWIG_NewPointerObj(SWIG_as_voidptr((*es)[i]), SWIGTYPE_p_IfcParse__IfcLateBoundEntity, 0);
+				PyList_SetItem($result,i,o);
+			}
+		break; }
+		case IfcUtil::Argument_UNKNOWN:
+		default:
+			SWIG_exception(SWIG_RuntimeError,"Unknown argument type");
+		break;
+	}
+	}
+	} catch(IfcParse::IfcException& e) {
+		SWIG_exception(SWIG_RuntimeError, e.what());
+	} catch(...) {
+		SWIG_exception(SWIG_RuntimeError, "An unknown error occurred");
+	}
+}
+
+%extend IfcParse::IfcFile {
+	IfcParse::IfcLateBoundEntity* by_id(unsigned id) {
+		return (IfcParse::IfcLateBoundEntity*) $self->entityById(id);
+	}
+	IfcParse::IfcLateBoundEntity* by_guid(const std::string& guid) {
+		return (IfcParse::IfcLateBoundEntity*) $self->entityByGuid(guid);
+	}
+	IfcParse::IfcLateBoundEntity* add(IfcParse::IfcLateBoundEntity* e) {
+		return (IfcParse::IfcLateBoundEntity*) $self->addEntity(e);
+	}
+	void remove(IfcParse::IfcLateBoundEntity* e) {
+		$self->removeEntity(e);
+	}
+	IfcEntityList::ptr traverse(IfcParse::IfcLateBoundEntity* e, int max_level=-1) {
+		return $self->traverse(e, max_level);
+	}
+	void write(const std::string& fn) {
+		std::ofstream f(fn.c_str());
+		f << (*$self);
+	}
+	std::vector<int> entity_names() const {
+		std::vector<int> keys;
+		keys.reserve(std::distance($self->begin(), $self->end()));
+		for (IfcParse::IfcFile::entity_by_id_t::const_iterator it = $self->begin(); it != $self->end(); ++ it) {
+			keys.push_back(it->first);
+		}
+		return keys;
+	}
+	%pythoncode %{
+		if _newclass:
+			# Hide the getters with read-only property implementations
+			header = property(header)
+    %}
+}
+
+%extend IfcParse::IfcLateBoundEntity {
+	%pythoncode %{
+	set_argument = lambda self,x,y: self._set_argument(x) if y is None else self._set_argument(x,y)
+	%}
+}
+
+%extend IfcParse::IfcSpfHeader {
+	%pythoncode %{
+		if _newclass:
+			# Hide the getters with read-only property implementations
+			file_description = property(file_description)
+			file_name = property(file_name)
+			file_schema = property(file_schema)
+    %}
+};
+
+%extend IfcParse::FileDescription {
+	%pythoncode %{
+		if _newclass:
+			# Hide the getters with read-write property implementations
+			__swig_getmethods__["description"] = description
+			__swig_setmethods__["description"] = description
+			description = property(description, description)
+			__swig_getmethods__["implementation_level"] = implementation_level
+			__swig_setmethods__["implementation_level"] = implementation_level
+			implementation_level = property(implementation_level, implementation_level)
+    %}
+};
+
+%extend IfcParse::FileName {
+	%pythoncode %{
+		if _newclass:
+			# Hide the getters with read-write property implementations
+			__swig_getmethods__["name"] = name
+			__swig_setmethods__["name"] = name
+			name = property(name, name)
+			__swig_getmethods__["time_stamp"] = time_stamp
+			__swig_setmethods__["time_stamp"] = time_stamp
+			time_stamp = property(time_stamp, time_stamp)
+			__swig_getmethods__["author"] = author
+			__swig_setmethods__["author"] = author
+			author = property(author, author)
+			__swig_getmethods__["organization"] = organization
+			__swig_setmethods__["organization"] = organization
+			organization = property(organization, organization)
+			__swig_getmethods__["preprocessor_version"] = preprocessor_version
+			__swig_setmethods__["preprocessor_version"] = preprocessor_version
+			preprocessor_version = property(preprocessor_version, preprocessor_version)
+			__swig_getmethods__["originating_system"] = originating_system
+			__swig_setmethods__["originating_system"] = originating_system
+			originating_system = property(originating_system, originating_system)
+			__swig_getmethods__["authorization"] = authorization
+			__swig_setmethods__["authorization"] = authorization
+			authorization = property(authorization, authorization)
+    %}
+};
+
+%extend IfcParse::FileSchema {
+	%pythoncode %{
+		if _newclass:
+			# Hide the getters with read-write property implementations
+			__swig_getmethods__["schema_identifiers"] = schema_identifiers
+			__swig_setmethods__["schema_identifiers"] = schema_identifiers
+			schema_identifiers = property(schema_identifiers, schema_identifiers)
+    %}
+};
+
+%include "../ifcparse/IfcSpfHeader.h"
+%include "../ifcparse/IfcFile.h"
+%include "../ifcparse/IfcLateBoundEntity.h"
+
+// The IfcFile* returned by open() is to be freed by SWIG/Python
+%newobject open;
+
+%inline %{
+	IfcParse::IfcFile* open(const std::string& s) {
+		IfcParse::IfcFile* f = new IfcParse::IfcFile(true);
+		f->Init(s);
+		return f;
+	}
+%}
\ No newline at end of file
diff --git a/src/ifcwrap/IfcPython.i b/src/ifcwrap/IfcPython.i
index 32a76f9..2aba487 100644
--- a/src/ifcwrap/IfcPython.i
+++ b/src/ifcwrap/IfcPython.i
@@ -21,168 +21,33 @@
 %include "std_string.i"
 %include "exception.i"
 
-%ignore IfcParse::IfcUntypedEntity::is;
-%ignore IfcParse::IfcUntypedEntity::type;
-%ignore IfcParse::IfcUntypedEntity::getArgument;
-%ignore IfcParse::IfcUntypedEntity::IfcUntypedEntity(IfcAbstractEntity);
-
-%ignore IfcParse::IfcFile::Init;
-%ignore IfcParse::IfcFile::EntityById;
-%ignore IfcParse::IfcFile::EntityByGuid;
-%ignore IfcParse::IfcFile::AddEntity;
-%ignore operator<<;
-
-%rename("by_type") EntitiesByType;
-%rename("__len__") getArgumentCount;
-%rename("get_argument_type") getArgumentType;
-%rename("get_argument_name") getArgumentName;
-%rename("get_argument_index") getArgumentIndex;
-%rename("_set_argument") setArgument;
-%rename("__repr__") toString;
-%rename("entity_instance") IfcUntypedEntity;
-%rename("file") IfcFile;
-
-%typemap(typecheck,precedence=SWIG_TYPECHECK_INTEGER) IfcEntities {
-   $1 = (PySequence_Check($input) && !PyUnicode_Check($input) && !PyString_Check($input)) ? 1 : 0;
-}
-
-%typemap(in) IfcEntities {
-	if (PySequence_Check($input)) {
-		// $1 = std::make_shared<IfcEntityList>();
-		$1 = SHARED_PTR<IfcEntityList>(new IfcEntityList());
-		for(Py_ssize_t i = 0; i < PySequence_Size($input); ++i) {
-			PyObject* obj = PySequence_GetItem($input, i);
-			if (obj) {
-				void *arg = 0;
-				int res = SWIG_ConvertPtr(obj, &arg, SWIGTYPE_p_IfcParse__IfcUntypedEntity, 0);
-				if (!SWIG_IsOK(res)) {
-					SWIG_exception_fail(SWIG_ArgError(res), "in method '" "Entity__set_argument" "', argument " "3"" of type '" "IfcParse::IfcUntypedEntity *""'"); 
-				} else {
-					$1->push(reinterpret_cast<IfcParse::IfcUntypedEntity*>(arg));
-				}
-			}
-		}
-	} else {
-		SWIG_exception(SWIG_RuntimeError,"Unknown argument type");
-	}
-}
-
-%typemap(out) IfcEntities {
-	const unsigned size = $1 ? $1->Size() : 0;
-	$result = PyList_New(size);
-	for (unsigned i = 0; i < size; ++i) {
-		PyObject *o = SWIG_NewPointerObj(SWIG_as_voidptr((*$1)[i]), SWIGTYPE_p_IfcParse__IfcUntypedEntity, 0);
-		PyList_SetItem($result,i,o);
-	}
-}
-
-%typemap(out) std::pair<IfcUtil::ArgumentType,ArgumentPtr> {
-	const Argument& arg = *($1.second);
-	const IfcUtil::ArgumentType type = $1.first;
-	if (arg.isNull()) {
-		Py_INCREF(Py_None);
-		$result = Py_None;
-	} else {
-	switch(type) {
-		case IfcUtil::Argument_INT:
-			$result = PyInt_FromLong((int)arg);
-		break;
-		case IfcUtil::Argument_BOOL:
-			$result = PyBool_FromLong((bool)arg);
-		break; 
-		case IfcUtil::Argument_DOUBLE:
-			$result = PyFloat_FromDouble(arg);
-		break;
-		case IfcUtil::Argument_ENUMERATION:
-		case IfcUtil::Argument_STRING: {
-			const std::string s = arg;
-			$result = PyString_FromString(s.c_str());
-		break; }
-		case IfcUtil::Argument_VECTOR_INT: {
-			const std::vector<int> v = arg;
-			const unsigned size = v.size();
-			$result = PyList_New(size);
-			for (unsigned int i = 0; i < size; ++i) {
-				PyList_SetItem($result,i,PyInt_FromLong(v[i]));
-			}
-		break; }
-		case IfcUtil::Argument_VECTOR_DOUBLE: {
-			const std::vector<double> v = arg;
-			const unsigned size = v.size();
-			$result = PyList_New(size);
-			for (unsigned int i = 0; i < size; ++i) {
-				PyList_SetItem($result,i,PyFloat_FromDouble(v[i]));
-			}
-		break; }
-		case IfcUtil::Argument_VECTOR_STRING: {
-			const std::vector<std::string> v = arg;
-			const unsigned size = v.size();
-			$result = PyList_New(size);
-			for (unsigned int i = 0; i < size; ++i) {
-				PyList_SetItem($result,i,PyString_FromString(v[i].c_str()));
-			}
-		break; }
-		case IfcUtil::Argument_ENTITY: {
-			IfcUtil::IfcSchemaEntity e = arg;
-			$result = SWIG_NewPointerObj(SWIG_as_voidptr(e), SWIGTYPE_p_IfcParse__IfcUntypedEntity, 0);
-		break; }
-		case IfcUtil::Argument_ENTITY_LIST: {
-			IfcEntities es = arg;
-			const unsigned size = es->Size();
-			$result = PyList_New(size);
-			for (unsigned i = 0; i < size; ++i) {
-				PyObject *o = SWIG_NewPointerObj(SWIG_as_voidptr((*es)[i]), SWIGTYPE_p_IfcParse__IfcUntypedEntity, 0);
-				PyList_SetItem($result,i,o);
-			}
-		break; }
-		case IfcUtil::Argument_UNKNOWN:
-		default:
-			SWIG_exception(SWIG_RuntimeError,"Unknown argument type");
-		break;
-	}
-	}
-}
-
 %exception {
 	try {
 		$action
-	} catch(::IfcParse::IfcException& e) {
-		SWIG_exception(SWIG_RuntimeError,e.what());
+	} catch(IfcParse::IfcException& e) {
+		SWIG_exception(SWIG_RuntimeError, e.what());
+	} catch(std::runtime_error& e) {
+		SWIG_exception(SWIG_RuntimeError, e.what());
+	} catch(...) {
+		SWIG_exception(SWIG_RuntimeError, "An unknown error occurred");
 	}
 }
 
-%module ifc_wrapper %{
-	#include "../ifcparse/IfcException.h"
-	#include "Interface.h"	
-	using namespace IfcParse;
-%}
-
-%include "Interface.h"
+%module ifcopenshell_wrapper %{
+	#include "../ifcgeom/IfcGeom.h"
+	#include "../ifcgeom/IfcGeomIterator.h"
 
-%extend IfcParse::IfcFile {
-	IfcParse::IfcUntypedEntity* by_id(unsigned id) {
-		return (IfcUntypedEntity*) $self->EntityById(id);
-	}
-	IfcParse::IfcUntypedEntity* by_guid(const std::string& guid) {
-		return (IfcUntypedEntity*) $self->EntityByGuid(guid);
-	}
-	void add(IfcParse::IfcUntypedEntity* e) {
-		$self->AddEntity(e);
-	}
-	void write(const std::string& fn) {
-		std::ofstream f(fn.c_str());
-		f << (*$self);
-	}
-}
+	#include "../ifcparse/IfcFile.h"
+	#include "../ifcparse/IfcLateBoundEntity.h"
+%}
 
-%extend IfcParse::IfcUntypedEntity {
-	%pythoncode %{
-	set_argument = lambda self,x,y: self._set_argument(x) if y is None else self._set_argument(x,y)
-	%}
-}
+%include "IfcGeomWrapper.i"
+%include "IfcParseWrapper.i"
 
 namespace std {
-   %template(ints) vector<int>;
-   %template(doubles) vector<double>;
-   %template(strings) vector<string>;
-};
+	%template(int_vector) vector<int>;
+	%template(float_vector) vector<float>;
+	%template(double_vector) vector<double>;
+	%template(string_vector) vector<std::string>;
+	%template(material_vector) vector<IfcGeom::Material>;
+};
\ No newline at end of file
diff --git a/src/ifcwrap/Interface.h b/src/ifcwrap/Interface.h
deleted file mode 100644
index e3474b3..0000000
--- a/src/ifcwrap/Interface.h
+++ /dev/null
@@ -1,111 +0,0 @@
-#define IFCUNTYPEDENTITY_H
-
-#include <map>
-#include <fstream>
-
-namespace IfcParse { class IfcUntypedEntity; }
-
-#include "../ifcparse/IfcUtil.h"
-#include "../ifcparse/Ifc2x3.h"
-
-#include "../ifcgeom/IfcGeom.h"
-
-
-namespace IfcParse {
-	class IfcUntypedEntity : public IfcUtil::IfcBaseEntity {
-	private:
-		IfcSchema::Type::Enum _type;
-	public:
-		IfcUntypedEntity(const std::string& s);
-		bool is(IfcSchema::Type::Enum v) const;
-		IfcSchema::Type::Enum type() const;	
-		bool is_a(const std::string& s) const;
-		std::string is_a() const;
-		unsigned int getArgumentCount() const;
-		IfcUtil::ArgumentType getArgumentType(unsigned int i) const;
-		ArgumentPtr getArgument(unsigned int i) const;
-		ArgumentPtr getArgument(const std::string& a) const;
-		const char* getArgumentName(unsigned int i) const;
-		unsigned getArgumentIndex(const std::string& a) const;
-		
-		IfcEntities get_inverse(const std::string& a);
-
-		void setArgument(unsigned int i);
-		void setArgument(unsigned int i, int v);
-		void setArgument(unsigned int i, bool v);
-		void setArgument(unsigned int i, double v);
-		void setArgument(unsigned int i, const std::string& v);
-		void setArgument(unsigned int i, const std::vector<int>& v);
-		void setArgument(unsigned int i, const std::vector<double>& v);
-		void setArgument(unsigned int i, const std::vector<std::string>& v);
-		void setArgument(unsigned int i, IfcUntypedEntity* v);
-		void setArgument(unsigned int i, IfcEntities v);
-
-		std::string toString();
-		
-		std::pair<IfcUtil::ArgumentType,ArgumentPtr> get_argument(unsigned i);
-		std::pair<IfcUtil::ArgumentType,ArgumentPtr> get_argument(const std::string& a);
-
-		bool is_valid();
-	};
-}
-
-typedef IfcUtil::IfcSchemaEntity IfcEntity;
-typedef std::map<IfcSchema::Type::Enum,IfcEntities> MapEntitiesByType;
-typedef std::map<unsigned int,IfcEntity> MapEntityById;
-typedef std::map<std::string,IfcSchema::IfcRoot::ptr> MapEntityByGuid;
-typedef std::map<unsigned int,IfcEntities> MapEntitiesByRef;
-typedef std::map<unsigned int,unsigned int> MapOffsetById;
-
-namespace IfcParse {
-	class IfcSpfStream;
-	class Tokens;
-
-	class IfcFile {
-	private:
-		MapEntityById byid;
-		MapEntitiesByType bytype;
-		MapEntitiesByRef byref;
-		MapEntityByGuid byguid;
-		MapOffsetById offsets;
-		unsigned int lastId;
-		unsigned int MaxId;
-		std::string _filename;
-		std::string _timestamp;
-		std::string _author;
-		std::string _author_email;
-		std::string _author_organisation;
-	public:
-		IfcParse::IfcSpfStream* stream;
-		IfcParse::Tokens* tokens;
-		bool Init(const std::string& fn);
-		IfcEntities EntitiesByType(const std::string& t);
-		IfcEntity EntityById(int id);
-		IfcSchema::IfcRoot::ptr EntityByGuid(const std::string& guid);
-		void AddEntity(IfcUtil::IfcSchemaEntity e);
-		IfcFile();
-		~IfcFile();
-	};
-
-	IfcParse::IfcFile* open(const std::string& s) {
-		IfcParse::IfcFile* f = new IfcParse::IfcFile();
-		f->Init(s);
-		return f;
-	}
-
-	std::string create_shape(IfcParse::IfcUntypedEntity* e, unsigned int settings = 0) {
-		if (!e->is(IfcSchema::Type::IfcProduct)) throw IfcException("Entity is not an IfcProduct");
-		IfcSchema::IfcProduct* ifc_product = (IfcSchema::IfcProduct*) e;
-		return IfcGeom::create_brep_data(ifc_product, settings);
-	}
-
-	void clean() { 
-		IfcGeom::Cache::Purge(); 
-	}
-
-	const int DISABLE_OPENING_SUBTRACTIONS = 1 << 0;
-	const int DISABLE_OBJECT_PLACEMENT     = 1 << 1;
-	const int SEW_SHELLS                   = 1 << 2;
-}
-
-std::ostream& operator<< (std::ostream& os, const IfcParse::IfcFile& f);
\ No newline at end of file
diff --git a/src/ifcwrap/ifc.py b/src/ifcwrap/ifc.py
deleted file mode 100644
index 7735f18..0000000
--- a/src/ifcwrap/ifc.py
+++ /dev/null
@@ -1,99 +0,0 @@
-import string
-import functools
-import ifc_wrapper
-
-if hasattr(functools, 'reduce'): reduce = functools.reduce
-
-class entity_instance:
-	def __init__(self, e):
-		super().__setattr__('wrapped_data', e)
-	def __getattr__(self, name):
-		try: return entity_instance.wrap_value(self.wrapped_data.get_argument(self.wrapped_data.get_argument_index(name)))
-		except:
-			try: return entity_instance.wrap_value(self.wrapped_data.get_inverse(name))
-			except: raise AttributeError("entity instance of type '%s' has no attribute '%s'"%(self.wrapped_data.is_a(), name))
-	@staticmethod
-	def map_value(v):
-		if isinstance(v, entity_instance): return v.wrapped_data
-		elif isinstance(v, (tuple, list)) and len(v):
-			classes = list(map(type, v))
-			if float in classes: return ifc_wrapper.doubles(v)
-			elif int in classes: return ifc_wrapper.ints(v)
-			elif str in classes: return ifc_wrapper.strings(v)
-			elif entity_instance in classes: return list(map(lambda e: e.wrapped_data, v))
-		return v
-	@staticmethod
-	def wrap_value(v):
-		wrap = lambda e: entity_instance(e)
-		if isinstance(v, ifc_wrapper.entity_instance): return wrap(v)
-		elif isinstance(v, (tuple, list)) and len(v):
-			classes = list(map(type, v))
-			if ifc_wrapper.entity_instance in classes: return list(map(wrap, v))
-		return v
-	def __setattr__(self, key, value):
-		self[self.wrapped_data.get_argument_index(key)] = value
-	def __getitem__(self, key):
-		return entity_instance.wrap_value(self.wrapped_data.get_argument(self.wrapped_data.get_argument_index(name)))
-	def __setitem__(self, idx, value):
-		self.wrapped_data.set_argument(idx, entity_instance.map_value(value))
-	def __len__(self): return len(self.wrapped_data)
-	def __repr__(self): return repr(self.wrapped_data)
-
-
-class file:
-	instances = []
-	def __init__(self, f):
-		self.wrapped_data = f
-	def create_entity(self,type,*args,**kwargs):
-		e = entity_instance(ifc_wrapper.entity_instance(type))
-		attrs = list(enumerate(args)) + \
-			[(e.wrapped_data.get_argument_index(name), arg) for name, arg in kwargs.items()]
-		for idx, arg in attrs: e[idx] = arg
-		self.wrapped_data.add(e.wrapped_data)
-		self.instances.append(e)
-		return e
-	def __getattr__(self,attr):
-		if attr[0:6] == 'create': return functools.partial(self.create_entity,attr[6:])
-	def __getitem__(self, key):
-		if isinstance(key, int):
-			return entity_instance(self.wrapped_data.by_id(key))
-		elif isinstance(key, str):
-			return entity_instance(self.wrapped_data.by_guid(key))
-	def by_type(self, type):
-		return [entity_instance(e) for e in self.wrapped_data.by_type(type)]
-	def write(self, fn):
-		self.wrapped_data.write(fn)
-
-
-class guid:
-	chars = string.digits + string.ascii_uppercase + string.ascii_lowercase + '_$'
-	@staticmethod
-	def compress(g):
-		bs = [int(g[i:i+2], 16) for i in range(0, len(g), 2)]
-		def b64(v, l=4):
-			return ''.join([guid.chars[(v // (64**i))%64] for i in range(l)][::-1])
-		return ''.join([b64(bs[0], 2)] + [b64((bs[i] << 16) + (bs[i+1] << 8) + bs[i+2]) for i in range(1,16,3)])
-	@staticmethod
-	def expand(g):
-		def b64(v):
-			return reduce(lambda a, b: a * 64 + b, map(lambda c: guid.chars.index(c), v))
-		bs = [b64(g[0:2])]
-		for i in range(5):
-			d = b64(g[2+4*i:6+4*i])
-			bs += [(d >> (8*(2-j)))%256 for j in range(3)]
-		return ''.join(['%02x'%b for b in bs])
-	@staticmethod
-	def split(g):
-		return '{%s-%s-%s-%s-%s}'%(g[:8], g[8:12], g[12:16], g[16:20], g[20:])
-
-
-def open(fn):
-	return file(ifc_wrapper.open(fn))
-
-def create_shape(inst, settings): return ifc_wrapper.create_shape(inst.wrapped_data, settings)
-
-def clean(): return ifc_wrapper.clean()
-
-DISABLE_OPENING_SUBTRACTIONS = ifc_wrapper.DISABLE_OPENING_SUBTRACTIONS
-DISABLE_OBJECT_PLACEMENT = ifc_wrapper.DISABLE_OBJECT_PLACEMENT
-SEW_SHELLS = ifc_wrapper.SEW_SHELLS
diff --git a/test/bpy.py b/test/bpy.py
index 5ffc3ca..62a5872 100644
--- a/test/bpy.py
+++ b/test/bpy.py
@@ -63,7 +63,8 @@
 scn.render.resolution_y = 2048
 scn.world.horizon_color = (1,1,1)
 scn.world.ambient_color = (0.05,0.05,0.05)
-scn.render.color_mode = 'RGBA'
+try: scn.render.color_mode = 'RGBA'
+except: scn.render.image_settings.color_mode = 'RGBA'
 
 for m in bpy.data.materials: m.specular_intensity = 0
 def material(name,settings):
diff --git a/test/input/IfcArbitraryOpenProfileDef.ifc b/test/input/IfcArbitraryOpenProfileDef.ifc
new file mode 100644
index 0000000..525a389
--- /dev/null
+++ b/test/input/IfcArbitraryOpenProfileDef.ifc
@@ -0,0 +1,220 @@
+ISO-10303-21;
+HEADER;
+FILE_DESCRIPTION(('ViewDefinition [CoordinationView]'),'2;1');
+FILE_NAME('IfcArbitraryOpenProfileDef.ifc','2014-03-15T12:31:19',(''),('',''),'IfcOpenShell 0.5.0-dev','IfcOpenShell 0.5.0-dev','');
+FILE_SCHEMA(('IFC2X3'));
+ENDSEC;
+DATA;
+#1=IFCCARTESIANPOINT((-50.,0.));
+#2=IFCCARTESIANPOINT((50.,0.));
+#3=IFCPOLYLINE((#1,#2));
+#4=IFCARBITRARYOPENPROFILEDEF(.CURVE.,$,#3);
+#5=IFCCENTERLINEPROFILEDEF(.AREA.,$,#3,10.);
+#6=IFCDIRECTION((0.,0.,1.));
+#7=IFCDIRECTION((1.,0.,0.));
+#8=IFCDIRECTION((0.,0.,1.));
+#9=IFCCARTESIANPOINT((0.,0.,0.));
+#10=IFCAXIS2PLACEMENT3D(#9,#8,#7);
+#11=IFCSURFACEOFLINEAREXTRUSION(#4,#10,#6,100.);
+#12=IFCDIRECTION((1.,0.,0.));
+#13=IFCCARTESIANPOINT((0.,100.,0.));
+#14=IFCDIRECTION((1.,0.,0.));
+#15=IFCDIRECTION((0.,0.,1.));
+#16=IFCCARTESIANPOINT((0.,0.,0.));
+#17=IFCAXIS2PLACEMENT3D(#16,#15,#14);
+#18=IFCAXIS1PLACEMENT(#13,#12);
+#19=IFCSURFACEOFREVOLUTION(#4,#17,#18);
+#20=IFCPERSON($,$,'',$,$,$,$,$);
+#21=IFCORGANIZATION($,'IfcOpenShell',$,$,$);
+#22=IFCPERSONANDORGANIZATION(#20,#21,$);
+#23=IFCAPPLICATION(#21,'0.5.0-dev','IfcOpenShell','IfcOpenShell');
+#24=IFCOWNERHISTORY(#22,#23,$,.ADDED.,$,#22,#23,1394883079);
+#25=IFCDIRECTION((0.,1.,0.));
+#26=IFCDIRECTION((1.,0.,0.));
+#27=IFCDIRECTION((0.,0.,1.));
+#28=IFCCARTESIANPOINT((0.,0.,0.));
+#29=IFCAXIS2PLACEMENT3D(#28,#27,#26);
+#30=IFCGEOMETRICREPRESENTATIONCONTEXT('Plan','Model',3,1.E-005,#29,#25);
+#31=IFCDIMENSIONALEXPONENTS(0,0,0,0,0,0,0);
+#32=IFCSIUNIT(*,.LENGTHUNIT.,.MILLI.,.METRE.);
+#33=IFCSIUNIT(*,.PLANEANGLEUNIT.,$,.RADIAN.);
+#34=IFCMEASUREWITHUNIT(IFCPLANEANGLEMEASURE(0.0174533),#33);
+#35=IFCCONVERSIONBASEDUNIT(#31,.PLANEANGLEUNIT.,'Degrees',#34);
+#36=IFCUNITASSIGNMENT((#32,#35));
+#37=IFCPROJECT('2S4bzmbK91DR1an5QDPsKz',#24,'IfcArbitraryOpenProfileDef',$,$,$,$,(#30),#36);
+#38=IFCDIRECTION((1.,0.,0.));
+#39=IFCDIRECTION((0.,0.,1.));
+#40=IFCCARTESIANPOINT((0.,0.,0.));
+#41=IFCAXIS2PLACEMENT3D(#40,#39,#38);
+#42=IFCLOCALPLACEMENT($,#41);
+#43=IFCSITE('0LsGW0$09828Obr9n1sdqQ',#24,$,$,$,#42,$,$,.ELEMENT.,$,$,$,$,$);
+#44=IFCRELAGGREGATES('1ua3xM$HD5oeLmZD4PO0la',#24,$,$,#37,(#43));
+#45=IFCDIRECTION((1.,0.,0.));
+#46=IFCDIRECTION((0.,0.,1.));
+#47=IFCCARTESIANPOINT((0.,0.,0.));
+#48=IFCAXIS2PLACEMENT3D(#47,#46,#45);
+#49=IFCLOCALPLACEMENT(#42,#48);
+#50=IFCBUILDING('2FTe$mmkjBL9YIRvDzQybm',#24,$,$,$,#49,$,$,.ELEMENT.,$,$,$);
+#51=IFCRELAGGREGATES('2nsb67rBX2cQrMOQ1Rcoe3',#24,$,$,#43,(#50));
+#52=IFCDIRECTION((1.,0.,0.));
+#53=IFCDIRECTION((0.,0.,1.));
+#54=IFCCARTESIANPOINT((0.,0.,0.));
+#55=IFCAXIS2PLACEMENT3D(#54,#53,#52);
+#56=IFCLOCALPLACEMENT(#49,#55);
+#57=IFCBUILDINGSTOREY('15SWWcmqX74wt$Utj2XBzx',#24,$,$,$,#56,$,$,.ELEMENT.,$);
+#58=IFCRELAGGREGATES('2QAO7ZaO55og2a5Jf9pWBp',#24,$,$,#50,(#57));
+#59=IFCBUILDINGELEMENTPROXY('1WkvPE4_D3_Av75vQlcPxv',#24,'product',$,$,#65,#68,$,$);
+#60=IFCRELCONTAINEDINSPATIALSTRUCTURE('0JL5z5w719JRvE5qa3uvUV',#24,$,$,(#59),#57);
+#61=IFCDIRECTION((1.,0.,0.));
+#62=IFCDIRECTION((0.,0.,1.));
+#63=IFCCARTESIANPOINT((0.,0.,0.));
+#64=IFCAXIS2PLACEMENT3D(#63,#62,#61);
+#65=IFCLOCALPLACEMENT($,#64);
+#66=IFCGEOMETRICSET((#11));
+#67=IFCSHAPEREPRESENTATION(#30,'Body','GeometricSet',(#66));
+#68=IFCPRODUCTDEFINITIONSHAPE($,$,(#67));
+#69=IFCBUILDINGELEMENTPROXY('1BDQqB$Tf03ut2ILxpxxYu',#24,'product',$,$,#75,#78,$,$);
+#70=IFCRELCONTAINEDINSPATIALSTRUCTURE('2lNRex5ej7WQB5AHHk19ix',#24,$,$,(#69),#57);
+#71=IFCDIRECTION((1.,0.,0.));
+#72=IFCDIRECTION((0.,0.,1.));
+#73=IFCCARTESIANPOINT((120.,0.,0.));
+#74=IFCAXIS2PLACEMENT3D(#73,#72,#71);
+#75=IFCLOCALPLACEMENT($,#74);
+#76=IFCGEOMETRICSET((#19));
+#77=IFCSHAPEREPRESENTATION(#30,'Body','GeometricSet',(#76));
+#78=IFCPRODUCTDEFINITIONSHAPE($,$,(#77));
+#79=IFCDIRECTION((0.,0.,1.));
+#80=IFCDIRECTION((1.,0.,0.));
+#81=IFCDIRECTION((0.,0.,1.));
+#82=IFCCARTESIANPOINT((0.,0.,0.));
+#83=IFCAXIS2PLACEMENT3D(#82,#81,#80);
+#84=IFCEXTRUDEDAREASOLID(#5,#83,#79,100.);
+#85=IFCDIRECTION((1.,0.,0.));
+#86=IFCCARTESIANPOINT((0.,100.,0.));
+#87=IFCDIRECTION((1.,0.,0.));
+#88=IFCDIRECTION((0.,0.,1.));
+#89=IFCCARTESIANPOINT((0.,0.,0.));
+#90=IFCAXIS2PLACEMENT3D(#89,#88,#87);
+#91=IFCDIRECTION((1.,0.,0.));
+#92=IFCDIRECTION((0.,0.,1.));
+#93=IFCCARTESIANPOINT((0.,0.,0.));
+#94=IFCAXIS2PLACEMENT3D(#93,#92,#91);
+#95=IFCAXIS1PLACEMENT(#86,#85);
+#96=IFCREVOLVEDAREASOLID(#5,#90,#95,360.);
+#97=IFCREVOLVEDAREASOLID(#5,#94,#95,90.);
+#98=IFCBUILDINGELEMENTPROXY('0QUwQLZlvCgwROXvNrmlKV',#24,'product',$,$,#104,#106,$,$);
+#99=IFCRELCONTAINEDINSPATIALSTRUCTURE('0Pohu5qJnCCR$L8K397yuP',#24,$,$,(#98),#57);
+#100=IFCDIRECTION((1.,0.,0.));
+#101=IFCDIRECTION((0.,0.,1.));
+#102=IFCCARTESIANPOINT((240.,0.,0.));
+#103=IFCAXIS2PLACEMENT3D(#102,#101,#100);
+#104=IFCLOCALPLACEMENT($,#103);
+#105=IFCSHAPEREPRESENTATION(#30,'Body','SweptSolid',(#84));
+#106=IFCPRODUCTDEFINITIONSHAPE($,$,(#105));
+#107=IFCBUILDINGELEMENTPROXY('23Uf10h$TEsutHBHaPlbxg',#24,'product',$,$,#113,#115,$,$);
+#108=IFCRELCONTAINEDINSPATIALSTRUCTURE('0HmHA_v4L3ggDlv$Usk9bl',#24,$,$,(#107),#57);
+#109=IFCDIRECTION((1.,0.,0.));
+#110=IFCDIRECTION((0.,0.,1.));
+#111=IFCCARTESIANPOINT((360.,0.,0.));
+#112=IFCAXIS2PLACEMENT3D(#111,#110,#109);
+#113=IFCLOCALPLACEMENT($,#112);
+#114=IFCSHAPEREPRESENTATION(#30,'Body','SweptSolid',(#96));
+#115=IFCPRODUCTDEFINITIONSHAPE($,$,(#114));
+#116=IFCBUILDINGELEMENTPROXY('0TTXA_XkD9Ogi0nWrTsmR_',#24,'product',$,$,#122,#124,$,$);
+#117=IFCRELCONTAINEDINSPATIALSTRUCTURE('1loI6OoPb6qxrsYY_8v6rp',#24,$,$,(#116),#57);
+#118=IFCDIRECTION((1.,0.,0.));
+#119=IFCDIRECTION((0.,0.,1.));
+#120=IFCCARTESIANPOINT((480.,0.,0.));
+#121=IFCAXIS2PLACEMENT3D(#120,#119,#118);
+#122=IFCLOCALPLACEMENT($,#121);
+#123=IFCSHAPEREPRESENTATION(#30,'Body','SweptSolid',(#97));
+#124=IFCPRODUCTDEFINITIONSHAPE($,$,(#123));
+#125=IFCDIRECTION((1.,0.));
+#126=IFCCARTESIANPOINT((0.,0.));
+#127=IFCAXIS2PLACEMENT2D(#126,#125);
+#128=IFCELLIPSE(#127,50.,25.);
+#129=IFCTRIMMEDCURVE(#128,(IFCPARAMETERVALUE(0.)),(IFCPARAMETERVALUE(180.)),.T.,.PARAMETER.);
+#130=IFCARBITRARYOPENPROFILEDEF(.CURVE.,$,#129);
+#131=IFCCENTERLINEPROFILEDEF(.AREA.,$,#129,10.);
+#132=IFCDIRECTION((0.,0.,1.));
+#133=IFCDIRECTION((1.,0.,0.));
+#134=IFCDIRECTION((0.,0.,1.));
+#135=IFCCARTESIANPOINT((0.,0.,0.));
+#136=IFCAXIS2PLACEMENT3D(#135,#134,#133);
+#137=IFCSURFACEOFLINEAREXTRUSION(#130,#136,#132,100.);
+#138=IFCDIRECTION((1.,0.,0.));
+#139=IFCCARTESIANPOINT((0.,100.,0.));
+#140=IFCDIRECTION((1.,0.,0.));
+#141=IFCDIRECTION((0.,0.,1.));
+#142=IFCCARTESIANPOINT((0.,0.,0.));
+#143=IFCAXIS2PLACEMENT3D(#142,#141,#140);
+#144=IFCAXIS1PLACEMENT(#139,#138);
+#145=IFCSURFACEOFREVOLUTION(#130,#143,#144);
+#146=IFCBUILDINGELEMENTPROXY('31jeMby89BwP182EYByoxC',#24,'product',$,$,#152,#155,$,$);
+#147=IFCRELCONTAINEDINSPATIALSTRUCTURE('3XCyftPiXBAgAK2bm9yNjB',#24,$,$,(#146),#57);
+#148=IFCDIRECTION((1.,0.,0.));
+#149=IFCDIRECTION((0.,0.,1.));
+#150=IFCCARTESIANPOINT((600.,0.,0.));
+#151=IFCAXIS2PLACEMENT3D(#150,#149,#148);
+#152=IFCLOCALPLACEMENT($,#151);
+#153=IFCGEOMETRICSET((#137));
+#154=IFCSHAPEREPRESENTATION(#30,'Body','GeometricSet',(#153));
+#155=IFCPRODUCTDEFINITIONSHAPE($,$,(#154));
+#156=IFCBUILDINGELEMENTPROXY('1gDJ0SyrDAifE7DJI_7xIU',#24,'product',$,$,#162,#165,$,$);
+#157=IFCRELCONTAINEDINSPATIALSTRUCTURE('0lV7yWPZz6MPHB7_j$PjNX',#24,$,$,(#156),#57);
+#158=IFCDIRECTION((1.,0.,0.));
+#159=IFCDIRECTION((0.,0.,1.));
+#160=IFCCARTESIANPOINT((720.,0.,0.));
+#161=IFCAXIS2PLACEMENT3D(#160,#159,#158);
+#162=IFCLOCALPLACEMENT($,#161);
+#163=IFCGEOMETRICSET((#145));
+#164=IFCSHAPEREPRESENTATION(#30,'Body','GeometricSet',(#163));
+#165=IFCPRODUCTDEFINITIONSHAPE($,$,(#164));
+#166=IFCDIRECTION((0.,0.,1.));
+#167=IFCDIRECTION((1.,0.,0.));
+#168=IFCDIRECTION((0.,0.,1.));
+#169=IFCCARTESIANPOINT((0.,0.,0.));
+#170=IFCAXIS2PLACEMENT3D(#169,#168,#167);
+#171=IFCEXTRUDEDAREASOLID(#131,#170,#166,100.);
+#172=IFCDIRECTION((1.,0.,0.));
+#173=IFCCARTESIANPOINT((0.,100.,0.));
+#174=IFCDIRECTION((1.,0.,0.));
+#175=IFCDIRECTION((0.,0.,1.));
+#176=IFCCARTESIANPOINT((0.,0.,0.));
+#177=IFCAXIS2PLACEMENT3D(#176,#175,#174);
+#178=IFCDIRECTION((1.,0.,0.));
+#179=IFCDIRECTION((0.,0.,1.));
+#180=IFCCARTESIANPOINT((0.,0.,0.));
+#181=IFCAXIS2PLACEMENT3D(#180,#179,#178);
+#182=IFCAXIS1PLACEMENT(#173,#172);
+#183=IFCREVOLVEDAREASOLID(#131,#177,#182,360.);
+#184=IFCREVOLVEDAREASOLID(#131,#181,#182,90.);
+#185=IFCBUILDINGELEMENTPROXY('3U5iCypsr15eERteN5DB2w',#24,'product',$,$,#191,#193,$,$);
+#186=IFCRELCONTAINEDINSPATIALSTRUCTURE('3HwrltQPTEUOdVcfwIgL_f',#24,$,$,(#185),#57);
+#187=IFCDIRECTION((1.,0.,0.));
+#188=IFCDIRECTION((0.,0.,1.));
+#189=IFCCARTESIANPOINT((840.,0.,0.));
+#190=IFCAXIS2PLACEMENT3D(#189,#188,#187);
+#191=IFCLOCALPLACEMENT($,#190);
+#192=IFCSHAPEREPRESENTATION(#30,'Body','SweptSolid',(#171));
+#193=IFCPRODUCTDEFINITIONSHAPE($,$,(#192));
+#194=IFCBUILDINGELEMENTPROXY('2Kg_xmrQP1TBWOYu7KzOWq',#24,'product',$,$,#200,#202,$,$);
+#195=IFCRELCONTAINEDINSPATIALSTRUCTURE('3Ifv7WLhn7T9IngmlJ9HXR',#24,$,$,(#194),#57);
+#196=IFCDIRECTION((1.,0.,0.));
+#197=IFCDIRECTION((0.,0.,1.));
+#198=IFCCARTESIANPOINT((960.,0.,0.));
+#199=IFCAXIS2PLACEMENT3D(#198,#197,#196);
+#200=IFCLOCALPLACEMENT($,#199);
+#201=IFCSHAPEREPRESENTATION(#30,'Body','SweptSolid',(#183));
+#202=IFCPRODUCTDEFINITIONSHAPE($,$,(#201));
+#203=IFCBUILDINGELEMENTPROXY('03Hf4Xqfv9agCAkle6P1Je',#24,'product',$,$,#209,#211,$,$);
+#204=IFCRELCONTAINEDINSPATIALSTRUCTURE('0HiOkaEir2wQY8MZsCgAh8',#24,$,$,(#203),#57);
+#205=IFCDIRECTION((1.,0.,0.));
+#206=IFCDIRECTION((0.,0.,1.));
+#207=IFCCARTESIANPOINT((1080.,0.,0.));
+#208=IFCAXIS2PLACEMENT3D(#207,#206,#205);
+#209=IFCLOCALPLACEMENT($,#208);
+#210=IFCSHAPEREPRESENTATION(#30,'Body','SweptSolid',(#184));
+#211=IFCPRODUCTDEFINITIONSHAPE($,$,(#210));
+ENDSEC;
+END-ISO-10303-21;
diff --git a/test/input/IfcCShapeProfileDef.ifc b/test/input/IfcCShapeProfileDef.ifc
new file mode 100644
index 0000000..98265bc
--- /dev/null
+++ b/test/input/IfcCShapeProfileDef.ifc
@@ -0,0 +1,86 @@
+ISO-10303-21;
+HEADER;
+FILE_DESCRIPTION(('ViewDefinition [CoordinationView]'),'2;1');
+FILE_NAME('IfcCShapeProfileDef.ifc','2014-02-23T12:17:27',(''),('',''),'IfcOpenShell 0.5.0-dev','IfcOpenShell 0.5.0-dev','');
+FILE_SCHEMA(('IFC2X3'));
+ENDSEC;
+DATA;
+#1=IFCPERSON($,$,'',$,$,$,$,$);
+#2=IFCORGANIZATION($,'IfcOpenShell',$,$,$);
+#3=IFCPERSONANDORGANIZATION(#1,#2,$);
+#4=IFCAPPLICATION(#2,'0.5.0-dev','IfcOpenShell','IfcOpenShell');
+#5=IFCOWNERHISTORY(#3,#4,$,.ADDED.,$,#3,#4,1393154247);
+#6=IFCDIRECTION((0.,1.,0.));
+#7=IFCDIRECTION((1.,0.,0.));
+#8=IFCDIRECTION((0.,0.,1.));
+#9=IFCCARTESIANPOINT((0.,0.,0.));
+#10=IFCAXIS2PLACEMENT3D(#9,#8,#7);
+#11=IFCGEOMETRICREPRESENTATIONCONTEXT('Plan','Model',3,1.E-005,#10,#6);
+#12=IFCDIMENSIONALEXPONENTS(0,0,0,0,0,0,0);
+#13=IFCSIUNIT(*,.LENGTHUNIT.,.MILLI.,.METRE.);
+#14=IFCSIUNIT(*,.PLANEANGLEUNIT.,$,.RADIAN.);
+#15=IFCMEASUREWITHUNIT(IFCPLANEANGLEMEASURE(0.0174533),#14);
+#16=IFCCONVERSIONBASEDUNIT(#12,.PLANEANGLEUNIT.,'Degrees',#15);
+#17=IFCUNITASSIGNMENT((#13,#16));
+#18=IFCPROJECT('0dWVy0Y8vE$B13m7$YY1VX',#5,'IfcCShapeProfileDef',$,$,$,$,(#11),#17);
+#19=IFCDIRECTION((1.,0.,0.));
+#20=IFCDIRECTION((0.,0.,1.));
+#21=IFCCARTESIANPOINT((0.,0.,0.));
+#22=IFCAXIS2PLACEMENT3D(#21,#20,#19);
+#23=IFCLOCALPLACEMENT($,#22);
+#24=IFCSITE('18EIqdfBHCG8dtQdgrEE7G',#5,$,$,$,#23,$,$,.ELEMENT.,$,$,$,$,$);
+#25=IFCRELAGGREGATES('1PZDvu6jTBnOWX25s7CRQR',#5,$,$,#18,(#24));
+#26=IFCDIRECTION((1.,0.,0.));
+#27=IFCDIRECTION((0.,0.,1.));
+#28=IFCCARTESIANPOINT((0.,0.,0.));
+#29=IFCAXIS2PLACEMENT3D(#28,#27,#26);
+#30=IFCLOCALPLACEMENT(#23,#29);
+#31=IFCBUILDING('2nNmzjoEPEPA0eDThSZlum',#5,$,$,$,#30,$,$,.ELEMENT.,$,$,$);
+#32=IFCRELAGGREGATES('2ByfxPqAz5iRLvgscS_Zcz',#5,$,$,#24,(#31));
+#33=IFCDIRECTION((1.,0.,0.));
+#34=IFCDIRECTION((0.,0.,1.));
+#35=IFCCARTESIANPOINT((0.,0.,0.));
+#36=IFCAXIS2PLACEMENT3D(#35,#34,#33);
+#37=IFCLOCALPLACEMENT(#30,#36);
+#38=IFCBUILDINGSTOREY('2Q8wqY1S164A1vNUz3LEIE',#5,$,$,$,#37,$,$,.ELEMENT.,$);
+#39=IFCRELAGGREGATES('3rgDF6pw56Ov5SW7WfqsMe',#5,$,$,#31,(#38));
+#40=IFCBUILDINGELEMENTPROXY('2Wz6WQMgr51xgotG$Q9XmJ',#5,'profile',$,$,#46,#58,$,$);
+#41=IFCRELCONTAINEDINSPATIALSTRUCTURE('37T52A1uzFS867214SlMqu',#5,$,$,(#40),#38);
+#42=IFCDIRECTION((1.,0.,0.));
+#43=IFCDIRECTION((0.,0.,1.));
+#44=IFCCARTESIANPOINT((0.,0.,0.));
+#45=IFCAXIS2PLACEMENT3D(#44,#43,#42);
+#46=IFCLOCALPLACEMENT($,#45);
+#47=IFCDIRECTION((1.,0.));
+#48=IFCCARTESIANPOINT((0.,0.));
+#49=IFCAXIS2PLACEMENT2D(#48,#47);
+#50=IFCDIRECTION((0.,0.,1.));
+#51=IFCDIRECTION((1.,0.,0.));
+#52=IFCDIRECTION((0.,0.,1.));
+#53=IFCCARTESIANPOINT((0.,0.,0.));
+#54=IFCAXIS2PLACEMENT3D(#53,#52,#51);
+#55=IFCCSHAPEPROFILEDEF(.AREA.,$,#49,50.,25.,5.,10.,$,$);
+#56=IFCEXTRUDEDAREASOLID(#55,#54,#50,20.);
+#57=IFCSHAPEREPRESENTATION(#11,'Body','SweptSolid',(#56));
+#58=IFCPRODUCTDEFINITIONSHAPE($,$,(#57));
+#59=IFCBUILDINGELEMENTPROXY('0qB16KHWrEAu_H_Yi9_gN5',#5,'profile',$,$,#65,#77,$,$);
+#60=IFCRELCONTAINEDINSPATIALSTRUCTURE('2WW5G3oZz9uwEaQn2MHxaa',#5,$,$,(#59),#38);
+#61=IFCDIRECTION((1.,0.,0.));
+#62=IFCDIRECTION((0.,0.,1.));
+#63=IFCCARTESIANPOINT((100.,0.,0.));
+#64=IFCAXIS2PLACEMENT3D(#63,#62,#61);
+#65=IFCLOCALPLACEMENT($,#64);
+#66=IFCDIRECTION((1.,0.));
+#67=IFCCARTESIANPOINT((0.,0.));
+#68=IFCAXIS2PLACEMENT2D(#67,#66);
+#69=IFCDIRECTION((0.,0.,1.));
+#70=IFCDIRECTION((1.,0.,0.));
+#71=IFCDIRECTION((0.,0.,1.));
+#72=IFCCARTESIANPOINT((0.,0.,0.));
+#73=IFCAXIS2PLACEMENT3D(#72,#71,#70);
+#74=IFCCSHAPEPROFILEDEF(.AREA.,$,#68,50.,25.,5.,10.,2.,$);
+#75=IFCEXTRUDEDAREASOLID(#74,#73,#69,20.);
+#76=IFCSHAPEREPRESENTATION(#11,'Body','SweptSolid',(#75));
+#77=IFCPRODUCTDEFINITIONSHAPE($,$,(#76));
+ENDSEC;
+END-ISO-10303-21;
diff --git a/test/input/IfcCircleProfileDef.ifc b/test/input/IfcCircleProfileDef.ifc
new file mode 100644
index 0000000..3be9461
--- /dev/null
+++ b/test/input/IfcCircleProfileDef.ifc
@@ -0,0 +1,86 @@
+ISO-10303-21;
+HEADER;
+FILE_DESCRIPTION(('ViewDefinition [CoordinationView]'),'2;1');
+FILE_NAME('IfcCircleProfileDef.ifc','2014-02-23T12:17:27',(''),('',''),'IfcOpenShell 0.5.0-dev','IfcOpenShell 0.5.0-dev','');
+FILE_SCHEMA(('IFC2X3'));
+ENDSEC;
+DATA;
+#1=IFCPERSON($,$,'',$,$,$,$,$);
+#2=IFCORGANIZATION($,'IfcOpenShell',$,$,$);
+#3=IFCPERSONANDORGANIZATION(#1,#2,$);
+#4=IFCAPPLICATION(#2,'0.5.0-dev','IfcOpenShell','IfcOpenShell');
+#5=IFCOWNERHISTORY(#3,#4,$,.ADDED.,$,#3,#4,1393154247);
+#6=IFCDIRECTION((0.,1.,0.));
+#7=IFCDIRECTION((1.,0.,0.));
+#8=IFCDIRECTION((0.,0.,1.));
+#9=IFCCARTESIANPOINT((0.,0.,0.));
+#10=IFCAXIS2PLACEMENT3D(#9,#8,#7);
+#11=IFCGEOMETRICREPRESENTATIONCONTEXT('Plan','Model',3,1.E-005,#10,#6);
+#12=IFCDIMENSIONALEXPONENTS(0,0,0,0,0,0,0);
+#13=IFCSIUNIT(*,.LENGTHUNIT.,.MILLI.,.METRE.);
+#14=IFCSIUNIT(*,.PLANEANGLEUNIT.,$,.RADIAN.);
+#15=IFCMEASUREWITHUNIT(IFCPLANEANGLEMEASURE(0.0174533),#14);
+#16=IFCCONVERSIONBASEDUNIT(#12,.PLANEANGLEUNIT.,'Degrees',#15);
+#17=IFCUNITASSIGNMENT((#13,#16));
+#18=IFCPROJECT('2QehVu89r7sBGVc65BnqIx',#5,'IfcCircleProfileDef',$,$,$,$,(#11),#17);
+#19=IFCDIRECTION((1.,0.,0.));
+#20=IFCDIRECTION((0.,0.,1.));
+#21=IFCCARTESIANPOINT((0.,0.,0.));
+#22=IFCAXIS2PLACEMENT3D(#21,#20,#19);
+#23=IFCLOCALPLACEMENT($,#22);
+#24=IFCSITE('1OlSQImpTDewLEbzb$U3_x',#5,$,$,$,#23,$,$,.ELEMENT.,$,$,$,$,$);
+#25=IFCRELAGGREGATES('3DL40LKfrDkQku7IV8swA6',#5,$,$,#18,(#24));
+#26=IFCDIRECTION((1.,0.,0.));
+#27=IFCDIRECTION((0.,0.,1.));
+#28=IFCCARTESIANPOINT((0.,0.,0.));
+#29=IFCAXIS2PLACEMENT3D(#28,#27,#26);
+#30=IFCLOCALPLACEMENT(#23,#29);
+#31=IFCBUILDING('1q6K1nCsr5TQ8XggyI937I',#5,$,$,$,#30,$,$,.ELEMENT.,$,$,$);
+#32=IFCRELAGGREGATES('1s3B1qUeH0uACbj7HVUEWS',#5,$,$,#24,(#31));
+#33=IFCDIRECTION((1.,0.,0.));
+#34=IFCDIRECTION((0.,0.,1.));
+#35=IFCCARTESIANPOINT((0.,0.,0.));
+#36=IFCAXIS2PLACEMENT3D(#35,#34,#33);
+#37=IFCLOCALPLACEMENT(#30,#36);
+#38=IFCBUILDINGSTOREY('2NXm3KklDB8P0_ghcPjrHX',#5,$,$,$,#37,$,$,.ELEMENT.,$);
+#39=IFCRELAGGREGATES('0RWVfnFD1FYxLKs80Elmfb',#5,$,$,#31,(#38));
+#40=IFCBUILDINGELEMENTPROXY('0VvlqPNMHFXvNiinWkSe6x',#5,'profile',$,$,#46,#58,$,$);
+#41=IFCRELCONTAINEDINSPATIALSTRUCTURE('3vv32q5cT27AbLbpFs79$6',#5,$,$,(#40),#38);
+#42=IFCDIRECTION((1.,0.,0.));
+#43=IFCDIRECTION((0.,0.,1.));
+#44=IFCCARTESIANPOINT((0.,0.,0.));
+#45=IFCAXIS2PLACEMENT3D(#44,#43,#42);
+#46=IFCLOCALPLACEMENT($,#45);
+#47=IFCDIRECTION((1.,0.));
+#48=IFCCARTESIANPOINT((0.,0.));
+#49=IFCAXIS2PLACEMENT2D(#48,#47);
+#50=IFCDIRECTION((0.,0.,1.));
+#51=IFCDIRECTION((1.,0.,0.));
+#52=IFCDIRECTION((0.,0.,1.));
+#53=IFCCARTESIANPOINT((0.,0.,0.));
+#54=IFCAXIS2PLACEMENT3D(#53,#52,#51);
+#55=IFCCIRCLEPROFILEDEF(.AREA.,$,#49,25.);
+#56=IFCEXTRUDEDAREASOLID(#55,#54,#50,20.);
+#57=IFCSHAPEREPRESENTATION(#11,'Body','SweptSolid',(#56));
+#58=IFCPRODUCTDEFINITIONSHAPE($,$,(#57));
+#59=IFCBUILDINGELEMENTPROXY('3kvG86uhj1YuaKDAy6ngZO',#5,'profile',$,$,#65,#77,$,$);
+#60=IFCRELCONTAINEDINSPATIALSTRUCTURE('3pqeZ0fbP1k9FNyVEg$Ie2',#5,$,$,(#59),#38);
+#61=IFCDIRECTION((1.,0.,0.));
+#62=IFCDIRECTION((0.,0.,1.));
+#63=IFCCARTESIANPOINT((100.,0.,0.));
+#64=IFCAXIS2PLACEMENT3D(#63,#62,#61);
+#65=IFCLOCALPLACEMENT($,#64);
+#66=IFCDIRECTION((1.,0.));
+#67=IFCCARTESIANPOINT((0.,0.));
+#68=IFCAXIS2PLACEMENT2D(#67,#66);
+#69=IFCDIRECTION((0.,0.,1.));
+#70=IFCDIRECTION((1.,0.,0.));
+#71=IFCDIRECTION((0.,0.,1.));
+#72=IFCCARTESIANPOINT((0.,0.,0.));
+#73=IFCAXIS2PLACEMENT3D(#72,#71,#70);
+#74=IFCCIRCLEHOLLOWPROFILEDEF(.AREA.,$,#68,25.,5.);
+#75=IFCEXTRUDEDAREASOLID(#74,#73,#69,20.);
+#76=IFCSHAPEREPRESENTATION(#11,'Body','SweptSolid',(#75));
+#77=IFCPRODUCTDEFINITIONSHAPE($,$,(#76));
+ENDSEC;
+END-ISO-10303-21;
diff --git a/test/input/IfcCompositeProfileDef.ifc b/test/input/IfcCompositeProfileDef.ifc
new file mode 100644
index 0000000..fb4aa34
--- /dev/null
+++ b/test/input/IfcCompositeProfileDef.ifc
@@ -0,0 +1,90 @@
+ISO-10303-21;
+HEADER;
+FILE_DESCRIPTION(('ViewDefinition [CoordinationView]'),'2;1');
+FILE_NAME('IfcCompositeProfileDef.ifc','2014-03-16T10:22:14',(''),('',''),'IfcOpenShell 0.5.0-dev','IfcOpenShell 0.5.0-dev','');
+FILE_SCHEMA(('IFC2X3'));
+ENDSEC;
+DATA;
+#1=IFCCARTESIANPOINT((40.,0.));
+#2=IFCDIRECTION((0.,-1.));
+#3=IFCDIRECTION((1.,0.));
+#4=IFCCARTESIANPOINT((40.,0.));
+#5=IFCDIRECTION((1.,0.));
+#6=IFCDIRECTION((0.,-1.));
+#7=IFCDIRECTION((1.,0.));
+#8=IFCCARTESIANPOINT((0.,0.));
+#9=IFCAXIS2PLACEMENT2D(#8,#7);
+#10=IFCDIRECTION((1.,0.));
+#11=IFCCARTESIANPOINT((0.,0.));
+#12=IFCAXIS2PLACEMENT2D(#11,#10);
+#13=IFCDIRECTION((1.,0.));
+#14=IFCCARTESIANPOINT((0.,0.));
+#15=IFCAXIS2PLACEMENT2D(#14,#13);
+#16=IFCDIRECTION((1.,0.));
+#17=IFCCARTESIANPOINT((80.,0.));
+#18=IFCAXIS2PLACEMENT2D(#17,#16);
+#19=IFCLSHAPEPROFILEDEF(.AREA.,$,#12,50.,25.,5.,1.,2.,2.,$,$);
+#20=IFCTSHAPEPROFILEDEF(.AREA.,$,#15,50.,40.,10.,10.,3.,2.,1.,2.,2.,$);
+#21=IFCCARTESIANTRANSFORMATIONOPERATOR2D(#3,#2,#1,$);
+#22=IFCCARTESIANTRANSFORMATIONOPERATOR2D(#6,#5,#4,0.3);
+#23=IFCISHAPEPROFILEDEF(.AREA.,$,#9,25.,50.,5.,5.,2.);
+#24=IFCDERIVEDPROFILEDEF(.AREA.,$,#19,#21,$);
+#25=IFCDERIVEDPROFILEDEF(.AREA.,$,#20,#22,$);
+#26=IFCCSHAPEPROFILEDEF(.AREA.,$,#18,50.,25.,5.,10.,2.,$);
+#27=IFCPERSON($,$,'',$,$,$,$,$);
+#28=IFCORGANIZATION($,'IfcOpenShell',$,$,$);
+#29=IFCPERSONANDORGANIZATION(#27,#28,$);
+#30=IFCAPPLICATION(#28,'0.5.0-dev','IfcOpenShell','IfcOpenShell');
+#31=IFCOWNERHISTORY(#29,#30,$,.ADDED.,$,#29,#30,1394961734);
+#32=IFCDIRECTION((0.,1.,0.));
+#33=IFCDIRECTION((1.,0.,0.));
+#34=IFCDIRECTION((0.,0.,1.));
+#35=IFCCARTESIANPOINT((0.,0.,0.));
+#36=IFCAXIS2PLACEMENT3D(#35,#34,#33);
+#37=IFCGEOMETRICREPRESENTATIONCONTEXT('Plan','Model',3,1.E-005,#36,#32);
+#38=IFCDIMENSIONALEXPONENTS(0,0,0,0,0,0,0);
+#39=IFCSIUNIT(*,.LENGTHUNIT.,.MILLI.,.METRE.);
+#40=IFCSIUNIT(*,.PLANEANGLEUNIT.,$,.RADIAN.);
+#41=IFCMEASUREWITHUNIT(IFCPLANEANGLEMEASURE(0.0174533),#40);
+#42=IFCCONVERSIONBASEDUNIT(#38,.PLANEANGLEUNIT.,'Degrees',#41);
+#43=IFCUNITASSIGNMENT((#39,#42));
+#44=IFCPROJECT('2ksZObKFD9HusrYk4uMUU9',#31,'IfcCompositeProfileDef',$,$,$,$,(#37),#43);
+#45=IFCDIRECTION((1.,0.,0.));
+#46=IFCDIRECTION((0.,0.,1.));
+#47=IFCCARTESIANPOINT((0.,0.,0.));
+#48=IFCAXIS2PLACEMENT3D(#47,#46,#45);
+#49=IFCLOCALPLACEMENT($,#48);
+#50=IFCSITE('3UH8_fRJ14bO11RLWcfDaG',#31,$,$,$,#49,$,$,.ELEMENT.,$,$,$,$,$);
+#51=IFCRELAGGREGATES('0d_e2pRBz5EwbcE2Jlxmor',#31,$,$,#44,(#50));
+#52=IFCDIRECTION((1.,0.,0.));
+#53=IFCDIRECTION((0.,0.,1.));
+#54=IFCCARTESIANPOINT((0.,0.,0.));
+#55=IFCAXIS2PLACEMENT3D(#54,#53,#52);
+#56=IFCLOCALPLACEMENT(#49,#55);
+#57=IFCBUILDING('0_d_HoUTX9CRwB2hQNCKfF',#31,$,$,$,#56,$,$,.ELEMENT.,$,$,$);
+#58=IFCRELAGGREGATES('3YNTjz3UTAreL7rtMwgZja',#31,$,$,#50,(#57));
+#59=IFCDIRECTION((1.,0.,0.));
+#60=IFCDIRECTION((0.,0.,1.));
+#61=IFCCARTESIANPOINT((0.,0.,0.));
+#62=IFCAXIS2PLACEMENT3D(#61,#60,#59);
+#63=IFCLOCALPLACEMENT(#56,#62);
+#64=IFCBUILDINGSTOREY('2r7DzLsTvBOvBpy8KFQofF',#31,$,$,$,#63,$,$,.ELEMENT.,$);
+#65=IFCRELAGGREGATES('1NiveFQ1n2N9_KPmICXHc8',#31,$,$,#57,(#64));
+#66=IFCBUILDINGELEMENTPROXY('0Xroij9BHE2BHPOGPuqa$d',#31,'profile',$,$,#72,#81,$,$);
+#67=IFCRELCONTAINEDINSPATIALSTRUCTURE('0duzsVh356ivGmTWCOFWGF',#31,$,$,(#66),#64);
+#68=IFCDIRECTION((1.,0.,0.));
+#69=IFCDIRECTION((0.,0.,1.));
+#70=IFCCARTESIANPOINT((0.,0.,0.));
+#71=IFCAXIS2PLACEMENT3D(#70,#69,#68);
+#72=IFCLOCALPLACEMENT($,#71);
+#73=IFCDIRECTION((0.,0.,1.));
+#74=IFCDIRECTION((1.,0.,0.));
+#75=IFCDIRECTION((0.,0.,1.));
+#76=IFCCARTESIANPOINT((0.,0.,0.));
+#77=IFCAXIS2PLACEMENT3D(#76,#75,#74);
+#78=IFCCOMPOSITEPROFILEDEF(.AREA.,'IFC',(#23,#24,#25,#26),$);
+#79=IFCEXTRUDEDAREASOLID(#78,#77,#73,20.);
+#80=IFCSHAPEREPRESENTATION(#37,'Body','SweptSolid',(#79));
+#81=IFCPRODUCTDEFINITIONSHAPE($,$,(#80));
+ENDSEC;
+END-ISO-10303-21;
diff --git a/test/input/IfcCsgPrimitive.ifc b/test/input/IfcCsgPrimitive.ifc
new file mode 100644
index 0000000..acf5e3a
--- /dev/null
+++ b/test/input/IfcCsgPrimitive.ifc
@@ -0,0 +1,133 @@
+ISO-10303-21;
+HEADER;
+FILE_DESCRIPTION(('ViewDefinition [CoordinationView]'),'2;1');
+FILE_NAME('IfcCsgPrimitive.ifc','2014-03-17T18:28:00',(''),('',''),'IfcOpenShell 0.5.0-dev','IfcOpenShell 0.5.0-dev','');
+FILE_SCHEMA(('IFC2X3'));
+ENDSEC;
+DATA;
+#1=IFCDIRECTION((1.,0.,0.));
+#2=IFCDIRECTION((0.,0.,1.));
+#3=IFCCARTESIANPOINT((3000.,1000.,4000.));
+#4=IFCAXIS2PLACEMENT3D(#3,#2,#1);
+#5=IFCBLOCK(#4,2000.,4000.,1000.);
+#6=IFCDIRECTION((1.,0.,0.));
+#7=IFCDIRECTION((0.,1.,0.));
+#8=IFCCARTESIANPOINT((4000.,1000.,4000.));
+#9=IFCAXIS2PLACEMENT3D(#8,#7,#6);
+#10=IFCRIGHTCIRCULARCYLINDER(#9,4000.,900.);
+#11=IFCBOOLEANRESULT(.INTERSECTION.,#10,#5);
+#12=IFCDIRECTION((1.,0.,0.));
+#13=IFCDIRECTION((0.,0.,1.));
+#14=IFCCARTESIANPOINT((200.,200.,3000.));
+#15=IFCAXIS2PLACEMENT3D(#14,#13,#12);
+#16=IFCRECTANGULARPYRAMID(#15,7600.,5600.,2800.);
+#17=IFCDIRECTION((1.,0.,0.));
+#18=IFCDIRECTION((0.,1.,0.));
+#19=IFCCARTESIANPOINT((4000.,1000.,4000.));
+#20=IFCAXIS2PLACEMENT3D(#19,#18,#17);
+#21=IFCRIGHTCIRCULARCYLINDER(#20,4000.,1000.);
+#22=IFCDIRECTION((1.,0.,0.));
+#23=IFCDIRECTION((0.,0.,1.));
+#24=IFCCARTESIANPOINT((0.,0.,3000.));
+#25=IFCAXIS2PLACEMENT3D(#24,#23,#22);
+#26=IFCRECTANGULARPYRAMID(#25,8000.,6000.,3000.);
+#27=IFCBOOLEANRESULT(.UNION.,#26,#21);
+#28=IFCBOOLEANRESULT(.DIFFERENCE.,#27,#16);
+#29=IFCBOOLEANRESULT(.DIFFERENCE.,#28,#11);
+#30=IFCDIRECTION((1.,0.,0.));
+#31=IFCDIRECTION((0.,0.,1.));
+#32=IFCCARTESIANPOINT((200.,200.,200.));
+#33=IFCAXIS2PLACEMENT3D(#32,#31,#30);
+#34=IFCBLOCK(#33,7600.,5600.,2800.);
+#35=IFCDIRECTION((1.,0.,0.));
+#36=IFCDIRECTION((0.,0.,1.));
+#37=IFCCARTESIANPOINT((0.,0.,0.));
+#38=IFCAXIS2PLACEMENT3D(#37,#36,#35);
+#39=IFCBLOCK(#38,8000.,6000.,3000.);
+#40=IFCBOOLEANRESULT(.DIFFERENCE.,#39,#34);
+#41=IFCBOOLEANRESULT(.UNION.,#40,#29);
+#42=IFCDIRECTION((1.,0.,0.));
+#43=IFCDIRECTION((0.,0.,1.));
+#44=IFCCARTESIANPOINT((1000.,-4000.,2700.));
+#45=IFCAXIS2PLACEMENT3D(#44,#43,#42);
+#46=IFCRIGHTCIRCULARCONE(#45,600.,750.);
+#47=IFCDIRECTION((1.,0.,0.));
+#48=IFCDIRECTION((0.,0.,1.));
+#49=IFCCARTESIANPOINT((1000.,-4000.,1800.));
+#50=IFCAXIS2PLACEMENT3D(#49,#48,#47);
+#51=IFCRIGHTCIRCULARCONE(#50,1000.,1100.);
+#52=IFCBOOLEANRESULT(.UNION.,#51,#46);
+#53=IFCDIRECTION((1.,0.,0.));
+#54=IFCDIRECTION((0.,0.,1.));
+#55=IFCCARTESIANPOINT((1000.,-4000.,900.));
+#56=IFCAXIS2PLACEMENT3D(#55,#54,#53);
+#57=IFCRIGHTCIRCULARCONE(#56,1000.,1500.);
+#58=IFCBOOLEANRESULT(.UNION.,#57,#52);
+#59=IFCDIRECTION((1.,0.,0.));
+#60=IFCDIRECTION((0.,0.,1.));
+#61=IFCCARTESIANPOINT((1000.,-4000.,0.));
+#62=IFCAXIS2PLACEMENT3D(#61,#60,#59);
+#63=IFCRIGHTCIRCULARCONE(#62,3000.,500.);
+#64=IFCBOOLEANRESULT(.UNION.,#63,#58);
+#65=IFCDIRECTION((1.,0.,0.));
+#66=IFCDIRECTION((0.,0.,1.));
+#67=IFCCARTESIANPOINT((-2000.,-7000.,0.));
+#68=IFCAXIS2PLACEMENT3D(#67,#66,#65);
+#69=IFCBLOCK(#68,6000.,6000.,6000.);
+#70=IFCDIRECTION((1.,0.,0.));
+#71=IFCDIRECTION((0.,0.,1.));
+#72=IFCCARTESIANPOINT((1000.,-4000.,-4500.));
+#73=IFCAXIS2PLACEMENT3D(#72,#71,#70);
+#74=IFCSPHERE(#73,5000.);
+#75=IFCBOOLEANRESULT(.INTERSECTION.,#74,#69);
+#76=IFCBOOLEANRESULT(.UNION.,#75,#64);
+#77=IFCPERSON($,$,'',$,$,$,$,$);
+#78=IFCORGANIZATION($,'IfcOpenShell',$,$,$);
+#79=IFCPERSONANDORGANIZATION(#77,#78,$);
+#80=IFCAPPLICATION(#78,'0.5.0-dev','IfcOpenShell','IfcOpenShell');
+#81=IFCOWNERHISTORY(#79,#80,$,.ADDED.,$,#79,#80,1395077280);
+#82=IFCDIRECTION((0.,1.,0.));
+#83=IFCDIRECTION((1.,0.,0.));
+#84=IFCDIRECTION((0.,0.,1.));
+#85=IFCCARTESIANPOINT((0.,0.,0.));
+#86=IFCAXIS2PLACEMENT3D(#85,#84,#83);
+#87=IFCGEOMETRICREPRESENTATIONCONTEXT('Plan','Model',3,1.E-005,#86,#82);
+#88=IFCDIMENSIONALEXPONENTS(0,0,0,0,0,0,0);
+#89=IFCSIUNIT(*,.LENGTHUNIT.,.MILLI.,.METRE.);
+#90=IFCSIUNIT(*,.PLANEANGLEUNIT.,$,.RADIAN.);
+#91=IFCMEASUREWITHUNIT(IFCPLANEANGLEMEASURE(0.0174533),#90);
+#92=IFCCONVERSIONBASEDUNIT(#88,.PLANEANGLEUNIT.,'Degrees',#91);
+#93=IFCUNITASSIGNMENT((#89,#92));
+#94=IFCPROJECT('0DMnBGAAP0egv6AtzWaDtb',#81,'IfcCompositeProfileDef',$,$,$,$,(#87),#93);
+#95=IFCDIRECTION((1.,0.,0.));
+#96=IFCDIRECTION((0.,0.,1.));
+#97=IFCCARTESIANPOINT((0.,0.,0.));
+#98=IFCAXIS2PLACEMENT3D(#97,#96,#95);
+#99=IFCLOCALPLACEMENT($,#98);
+#100=IFCSITE('1zP1fQSXb4cxuwjjpQU6bU',#81,$,$,$,#99,$,$,.ELEMENT.,$,$,$,$,$);
+#101=IFCRELAGGREGATES('0ZzcG2ut9F2BG7u28TPexy',#81,$,$,#94,(#100));
+#102=IFCDIRECTION((1.,0.,0.));
+#103=IFCDIRECTION((0.,0.,1.));
+#104=IFCCARTESIANPOINT((0.,0.,0.));
+#105=IFCAXIS2PLACEMENT3D(#104,#103,#102);
+#106=IFCLOCALPLACEMENT(#99,#105);
+#107=IFCBUILDING('0cM$4pWjvEFe6tscjMbee8',#81,$,$,$,#106,$,$,.ELEMENT.,$,$,$);
+#108=IFCRELAGGREGATES('0zaDy4$156SBV4NFDY$SC5',#81,$,$,#100,(#107));
+#109=IFCDIRECTION((1.,0.,0.));
+#110=IFCDIRECTION((0.,0.,1.));
+#111=IFCCARTESIANPOINT((0.,0.,0.));
+#112=IFCAXIS2PLACEMENT3D(#111,#110,#109);
+#113=IFCLOCALPLACEMENT(#106,#112);
+#114=IFCBUILDINGSTOREY('0WbxDykS94XukFPy9QwxyX',#81,$,$,$,#113,$,$,.ELEMENT.,$);
+#115=IFCRELAGGREGATES('2LJSUZqR53NhOup_TIPm5y',#81,$,$,#107,(#114));
+#116=IFCBUILDINGELEMENTPROXY('1qAWhlc9bBc9v_UZeT6Xd3',#81,'IfcCsgPrimitive',$,$,#122,#124,$,$);
+#117=IFCRELCONTAINEDINSPATIALSTRUCTURE('1SveiYYOXAmPiFhsZbsl1q',#81,$,$,(#116),#114);
+#118=IFCDIRECTION((1.,0.,0.));
+#119=IFCDIRECTION((0.,0.,1.));
+#120=IFCCARTESIANPOINT((0.,0.,0.));
+#121=IFCAXIS2PLACEMENT3D(#120,#119,#118);
+#122=IFCLOCALPLACEMENT($,#121);
+#123=IFCSHAPEREPRESENTATION(#87,'Body','CSG',(#41,#76));
+#124=IFCPRODUCTDEFINITIONSHAPE($,$,(#123));
+ENDSEC;
+END-ISO-10303-21;
diff --git a/test/input/IfcEllipseProfileDef.ifc b/test/input/IfcEllipseProfileDef.ifc
new file mode 100644
index 0000000..cd4cb24
--- /dev/null
+++ b/test/input/IfcEllipseProfileDef.ifc
@@ -0,0 +1,86 @@
+ISO-10303-21;
+HEADER;
+FILE_DESCRIPTION(('ViewDefinition [CoordinationView]'),'2;1');
+FILE_NAME('IfcEllipseProfileDef.ifc','2014-03-08T17:03:55',(''),('',''),'IfcOpenShell 0.5.0-dev','IfcOpenShell 0.5.0-dev','');
+FILE_SCHEMA(('IFC2X3'));
+ENDSEC;
+DATA;
+#1=IFCPERSON($,$,'',$,$,$,$,$);
+#2=IFCORGANIZATION($,'IfcOpenShell',$,$,$);
+#3=IFCPERSONANDORGANIZATION(#1,#2,$);
+#4=IFCAPPLICATION(#2,'0.5.0-dev','IfcOpenShell','IfcOpenShell');
+#5=IFCOWNERHISTORY(#3,#4,$,.ADDED.,$,#3,#4,1394294635);
+#6=IFCDIRECTION((0.,1.,0.));
+#7=IFCDIRECTION((1.,0.,0.));
+#8=IFCDIRECTION((0.,0.,1.));
+#9=IFCCARTESIANPOINT((0.,0.,0.));
+#10=IFCAXIS2PLACEMENT3D(#9,#8,#7);
+#11=IFCGEOMETRICREPRESENTATIONCONTEXT('Plan','Model',3,1.E-005,#10,#6);
+#12=IFCDIMENSIONALEXPONENTS(0,0,0,0,0,0,0);
+#13=IFCSIUNIT(*,.LENGTHUNIT.,.MILLI.,.METRE.);
+#14=IFCSIUNIT(*,.PLANEANGLEUNIT.,$,.RADIAN.);
+#15=IFCMEASUREWITHUNIT(IFCPLANEANGLEMEASURE(0.0174533),#14);
+#16=IFCCONVERSIONBASEDUNIT(#12,.PLANEANGLEUNIT.,'Degrees',#15);
+#17=IFCUNITASSIGNMENT((#13,#16));
+#18=IFCPROJECT('3zPj9qt6b9uuqkZQigbIUL',#5,'IfcEllipseProfileDef',$,$,$,$,(#11),#17);
+#19=IFCDIRECTION((1.,0.,0.));
+#20=IFCDIRECTION((0.,0.,1.));
+#21=IFCCARTESIANPOINT((0.,0.,0.));
+#22=IFCAXIS2PLACEMENT3D(#21,#20,#19);
+#23=IFCLOCALPLACEMENT($,#22);
+#24=IFCSITE('0fzyNsjdH8vOcUjt8$PuFb',#5,$,$,$,#23,$,$,.ELEMENT.,$,$,$,$,$);
+#25=IFCRELAGGREGATES('3b6NTLFl90y9B9mkk3Apl7',#5,$,$,#18,(#24));
+#26=IFCDIRECTION((1.,0.,0.));
+#27=IFCDIRECTION((0.,0.,1.));
+#28=IFCCARTESIANPOINT((0.,0.,0.));
+#29=IFCAXIS2PLACEMENT3D(#28,#27,#26);
+#30=IFCLOCALPLACEMENT(#23,#29);
+#31=IFCBUILDING('2sB5jIogHAcufB_vBdB8z$',#5,$,$,$,#30,$,$,.ELEMENT.,$,$,$);
+#32=IFCRELAGGREGATES('3r5mQcTMjAWPCUBO3584B8',#5,$,$,#24,(#31));
+#33=IFCDIRECTION((1.,0.,0.));
+#34=IFCDIRECTION((0.,0.,1.));
+#35=IFCCARTESIANPOINT((0.,0.,0.));
+#36=IFCAXIS2PLACEMENT3D(#35,#34,#33);
+#37=IFCLOCALPLACEMENT(#30,#36);
+#38=IFCBUILDINGSTOREY('21OPnmQjPC7fB2hCmAGxl2',#5,$,$,$,#37,$,$,.ELEMENT.,$);
+#39=IFCRELAGGREGATES('0FyTJUr$b0Vx0H9qUG_MEf',#5,$,$,#31,(#38));
+#40=IFCBUILDINGELEMENTPROXY('2Obawd97P7S8UAzLkXlrkZ',#5,'profile',$,$,#46,#58,$,$);
+#41=IFCRELCONTAINEDINSPATIALSTRUCTURE('0TJZk7Mo95f8zg0_jQmfrn',#5,$,$,(#40),#38);
+#42=IFCDIRECTION((1.,0.,0.));
+#43=IFCDIRECTION((0.,0.,1.));
+#44=IFCCARTESIANPOINT((0.,0.,0.));
+#45=IFCAXIS2PLACEMENT3D(#44,#43,#42);
+#46=IFCLOCALPLACEMENT($,#45);
+#47=IFCDIRECTION((1.,0.));
+#48=IFCCARTESIANPOINT((0.,0.));
+#49=IFCAXIS2PLACEMENT2D(#48,#47);
+#50=IFCDIRECTION((0.,0.,1.));
+#51=IFCDIRECTION((1.,0.,0.));
+#52=IFCDIRECTION((0.,0.,1.));
+#53=IFCCARTESIANPOINT((0.,0.,0.));
+#54=IFCAXIS2PLACEMENT3D(#53,#52,#51);
+#55=IFCELLIPSEPROFILEDEF(.AREA.,$,#49,25.,15.);
+#56=IFCEXTRUDEDAREASOLID(#55,#54,#50,20.);
+#57=IFCSHAPEREPRESENTATION(#11,'Body','SweptSolid',(#56));
+#58=IFCPRODUCTDEFINITIONSHAPE($,$,(#57));
+#59=IFCBUILDINGELEMENTPROXY('0NBhbTBuH8WhOr_fE1ET$R',#5,'profile',$,$,#65,#77,$,$);
+#60=IFCRELCONTAINEDINSPATIALSTRUCTURE('0_wTPh_ELEcAwL3MN1Xjzj',#5,$,$,(#59),#38);
+#61=IFCDIRECTION((1.,0.,0.));
+#62=IFCDIRECTION((0.,0.,1.));
+#63=IFCCARTESIANPOINT((100.,0.,0.));
+#64=IFCAXIS2PLACEMENT3D(#63,#62,#61);
+#65=IFCLOCALPLACEMENT($,#64);
+#66=IFCDIRECTION((1.,0.));
+#67=IFCCARTESIANPOINT((0.,0.));
+#68=IFCAXIS2PLACEMENT2D(#67,#66);
+#69=IFCDIRECTION((0.,0.,1.));
+#70=IFCDIRECTION((1.,0.,0.));
+#71=IFCDIRECTION((0.,0.,1.));
+#72=IFCCARTESIANPOINT((0.,0.,0.));
+#73=IFCAXIS2PLACEMENT3D(#72,#71,#70);
+#74=IFCELLIPSEPROFILEDEF(.AREA.,$,#68,15.,25.);
+#75=IFCEXTRUDEDAREASOLID(#74,#73,#69,20.);
+#76=IFCSHAPEREPRESENTATION(#11,'Body','SweptSolid',(#75));
+#77=IFCPRODUCTDEFINITIONSHAPE($,$,(#76));
+ENDSEC;
+END-ISO-10303-21;
diff --git a/test/input/IfcIShapeProfileDef.ifc b/test/input/IfcIShapeProfileDef.ifc
new file mode 100644
index 0000000..30369e5
--- /dev/null
+++ b/test/input/IfcIShapeProfileDef.ifc
@@ -0,0 +1,99 @@
+ISO-10303-21;
+HEADER;
+FILE_DESCRIPTION(('ViewDefinition [CoordinationView]'),'2;1');
+FILE_NAME('IfcIShapeProfileDef.ifc','2014-11-26T14:27:17',(''),('',''),'IfcOpenShell 0.5.0-dev','IfcOpenShell 0.5.0-dev','');
+FILE_SCHEMA(('IFC2X3'));
+ENDSEC;
+DATA;
+#1=IFCPERSON($,$,'',$,$,$,$,$);
+#2=IFCORGANIZATION($,'IfcOpenShell',$,$,$);
+#3=IFCPERSONANDORGANIZATION(#1,#2,$);
+#4=IFCAPPLICATION(#2,'0.5.0-dev','IfcOpenShell','IfcOpenShell');
+#5=IFCOWNERHISTORY(#3,#4,$,.ADDED.,1417008437,#3,#4,1417008437);
+#6=IFCDIMENSIONALEXPONENTS(0,0,0,0,0,0,0);
+#7=IFCSIUNIT(*,.LENGTHUNIT.,.MILLI.,.METRE.);
+#8=IFCSIUNIT(*,.PLANEANGLEUNIT.,$,.RADIAN.);
+#9=IFCMEASUREWITHUNIT(IFCPLANEANGLEMEASURE(0.017453293),#8);
+#10=IFCCONVERSIONBASEDUNIT(#6,.PLANEANGLEUNIT.,'Degrees',#9);
+#11=IFCUNITASSIGNMENT((#7,#10));
+#12=IFCPROJECT('3m4yn5_O962PjTcijfzks3',#5,'IfcIShapeProfileDef',$,$,$,$,(),#11);
+#13=IFCDIRECTION((1.,0.,0.));
+#14=IFCDIRECTION((0.,0.,1.));
+#15=IFCCARTESIANPOINT((0.,0.,0.));
+#16=IFCAXIS2PLACEMENT3D(#15,#14,#13);
+#17=IFCLOCALPLACEMENT($,#16);
+#18=IFCSITE('24$986K_926AmY4iydFtGH',#5,$,$,$,#17,$,$,.ELEMENT.,$,$,$,$,$);
+#19=IFCRELAGGREGATES('1yoPiTUUb9xfZLREFmq4Z$',#5,$,$,#12,(#18));
+#20=IFCDIRECTION((1.,0.,0.));
+#21=IFCDIRECTION((0.,0.,1.));
+#22=IFCCARTESIANPOINT((0.,0.,0.));
+#23=IFCAXIS2PLACEMENT3D(#22,#21,#20);
+#24=IFCLOCALPLACEMENT(#17,#23);
+#25=IFCBUILDING('0ea_c1tET2ahOErGgHglqm',#5,$,$,$,#24,$,$,.ELEMENT.,$,$,$);
+#26=IFCRELAGGREGATES('3V7Akfyjr30heVaFOS8XR5',#5,$,$,#18,(#25));
+#27=IFCDIRECTION((1.,0.,0.));
+#28=IFCDIRECTION((0.,0.,1.));
+#29=IFCCARTESIANPOINT((0.,0.,0.));
+#30=IFCAXIS2PLACEMENT3D(#29,#28,#27);
+#31=IFCLOCALPLACEMENT(#24,#30);
+#32=IFCBUILDINGSTOREY('2MQ$o6sLD6hQTkVd4N5O$N',#5,$,$,$,#31,$,$,.ELEMENT.,$);
+#33=IFCRELAGGREGATES('28wPobaAHEn9E70QY2qB8Z',#5,$,$,#25,(#32));
+#34=IFCBUILDINGELEMENTPROXY('25O9yPEmn6yRVqMHMWnLzO',#5,'profile',$,$,#40,#52,$,$);
+#35=IFCRELCONTAINEDINSPATIALSTRUCTURE('20MhO8tBn67RjJNbxaBp0O',#5,$,$,(#34),#32);
+#36=IFCDIRECTION((1.,0.,0.));
+#37=IFCDIRECTION((0.,0.,1.));
+#38=IFCCARTESIANPOINT((0.,0.,0.));
+#39=IFCAXIS2PLACEMENT3D(#38,#37,#36);
+#40=IFCLOCALPLACEMENT($,#39);
+#41=IFCDIRECTION((1.,0.));
+#42=IFCCARTESIANPOINT((0.,0.));
+#43=IFCAXIS2PLACEMENT2D(#42,#41);
+#44=IFCDIRECTION((0.,0.,1.));
+#45=IFCDIRECTION((1.,0.,0.));
+#46=IFCDIRECTION((0.,0.,1.));
+#47=IFCCARTESIANPOINT((0.,0.,0.));
+#48=IFCAXIS2PLACEMENT3D(#47,#46,#45);
+#49=IFCISHAPEPROFILEDEF(.AREA.,$,#43,25.,50.,5.,5.,$);
+#50=IFCEXTRUDEDAREASOLID(#49,#48,#44,20.);
+#51=IFCSHAPEREPRESENTATION($,'Body','SweptSolid',(#50));
+#52=IFCPRODUCTDEFINITIONSHAPE($,$,(#51));
+#53=IFCBUILDINGELEMENTPROXY('2loPfmiir3EQ4GkWdTZtUT',#5,'profile',$,$,#59,#71,$,$);
+#54=IFCRELCONTAINEDINSPATIALSTRUCTURE('00o_PIW_fCYBRtHNmvHPuC',#5,$,$,(#53),#32);
+#55=IFCDIRECTION((1.,0.,0.));
+#56=IFCDIRECTION((0.,0.,1.));
+#57=IFCCARTESIANPOINT((100.,0.,0.));
+#58=IFCAXIS2PLACEMENT3D(#57,#56,#55);
+#59=IFCLOCALPLACEMENT($,#58);
+#60=IFCDIRECTION((1.,0.));
+#61=IFCCARTESIANPOINT((0.,0.));
+#62=IFCAXIS2PLACEMENT2D(#61,#60);
+#63=IFCDIRECTION((0.,0.,1.));
+#64=IFCDIRECTION((1.,0.,0.));
+#65=IFCDIRECTION((0.,0.,1.));
+#66=IFCCARTESIANPOINT((0.,0.,0.));
+#67=IFCAXIS2PLACEMENT3D(#66,#65,#64);
+#68=IFCISHAPEPROFILEDEF(.AREA.,$,#62,25.,50.,5.,5.,2.);
+#69=IFCEXTRUDEDAREASOLID(#68,#67,#63,20.);
+#70=IFCSHAPEREPRESENTATION($,'Body','SweptSolid',(#69));
+#71=IFCPRODUCTDEFINITIONSHAPE($,$,(#70));
+#72=IFCBUILDINGELEMENTPROXY('2UNbwWn6HDU9y9qy2HK0BH',#5,'profile',$,$,#78,#90,$,$);
+#73=IFCRELCONTAINEDINSPATIALSTRUCTURE('0epcVcwyXCFelG9nIXNUA0',#5,$,$,(#72),#32);
+#74=IFCDIRECTION((1.,0.,0.));
+#75=IFCDIRECTION((0.,0.,1.));
+#76=IFCCARTESIANPOINT((200.,0.,0.));
+#77=IFCAXIS2PLACEMENT3D(#76,#75,#74);
+#78=IFCLOCALPLACEMENT($,#77);
+#79=IFCDIRECTION((1.,0.));
+#80=IFCCARTESIANPOINT((0.,0.));
+#81=IFCAXIS2PLACEMENT2D(#80,#79);
+#82=IFCDIRECTION((0.,0.,1.));
+#83=IFCDIRECTION((1.,0.,0.));
+#84=IFCDIRECTION((0.,0.,1.));
+#85=IFCCARTESIANPOINT((0.,0.,0.));
+#86=IFCAXIS2PLACEMENT3D(#85,#84,#83);
+#87=IFCASYMMETRICISHAPEPROFILEDEF(.AREA.,$,#81,25.,50.,5.,5.,2.,20.,10.,5.,$);
+#88=IFCEXTRUDEDAREASOLID(#87,#86,#82,20.);
+#89=IFCSHAPEREPRESENTATION($,'Body','SweptSolid',(#88));
+#90=IFCPRODUCTDEFINITIONSHAPE($,$,(#89));
+ENDSEC;
+END-ISO-10303-21;
diff --git a/test/input/IfcLShapeProfileDef.ifc b/test/input/IfcLShapeProfileDef.ifc
new file mode 100644
index 0000000..4c786bd
--- /dev/null
+++ b/test/input/IfcLShapeProfileDef.ifc
@@ -0,0 +1,124 @@
+ISO-10303-21;
+HEADER;
+FILE_DESCRIPTION(('ViewDefinition [CoordinationView]'),'2;1');
+FILE_NAME('IfcLShapeProfileDef.ifc','2014-03-08T16:02:03',(''),('',''),'IfcOpenShell 0.5.0-dev','IfcOpenShell 0.5.0-dev','');
+FILE_SCHEMA(('IFC2X3'));
+ENDSEC;
+DATA;
+#1=IFCPERSON($,$,'',$,$,$,$,$);
+#2=IFCORGANIZATION($,'IfcOpenShell',$,$,$);
+#3=IFCPERSONANDORGANIZATION(#1,#2,$);
+#4=IFCAPPLICATION(#2,'0.5.0-dev','IfcOpenShell','IfcOpenShell');
+#5=IFCOWNERHISTORY(#3,#4,$,.ADDED.,$,#3,#4,1394290923);
+#6=IFCDIRECTION((0.,1.,0.));
+#7=IFCDIRECTION((1.,0.,0.));
+#8=IFCDIRECTION((0.,0.,1.));
+#9=IFCCARTESIANPOINT((0.,0.,0.));
+#10=IFCAXIS2PLACEMENT3D(#9,#8,#7);
+#11=IFCGEOMETRICREPRESENTATIONCONTEXT('Plan','Model',3,1.E-005,#10,#6);
+#12=IFCDIMENSIONALEXPONENTS(0,0,0,0,0,0,0);
+#13=IFCSIUNIT(*,.LENGTHUNIT.,.MILLI.,.METRE.);
+#14=IFCSIUNIT(*,.PLANEANGLEUNIT.,$,.RADIAN.);
+#15=IFCMEASUREWITHUNIT(IFCPLANEANGLEMEASURE(0.0174533),#14);
+#16=IFCCONVERSIONBASEDUNIT(#12,.PLANEANGLEUNIT.,'Degrees',#15);
+#17=IFCUNITASSIGNMENT((#13,#16));
+#18=IFCPROJECT('2F6o6chXDCGf8IWtqYLcn3',#5,'IfcLShapeProfileDef',$,$,$,$,(#11),#17);
+#19=IFCDIRECTION((1.,0.,0.));
+#20=IFCDIRECTION((0.,0.,1.));
+#21=IFCCARTESIANPOINT((0.,0.,0.));
+#22=IFCAXIS2PLACEMENT3D(#21,#20,#19);
+#23=IFCLOCALPLACEMENT($,#22);
+#24=IFCSITE('1r$PNIWHTDfgdFJV2EfVjI',#5,$,$,$,#23,$,$,.ELEMENT.,$,$,$,$,$);
+#25=IFCRELAGGREGATES('3Do_7Shg9CJeA4QWOXR4Ph',#5,$,$,#18,(#24));
+#26=IFCDIRECTION((1.,0.,0.));
+#27=IFCDIRECTION((0.,0.,1.));
+#28=IFCCARTESIANPOINT((0.,0.,0.));
+#29=IFCAXIS2PLACEMENT3D(#28,#27,#26);
+#30=IFCLOCALPLACEMENT(#23,#29);
+#31=IFCBUILDING('2ovX2wxcDF68PBVoIFchfo',#5,$,$,$,#30,$,$,.ELEMENT.,$,$,$);
+#32=IFCRELAGGREGATES('2LC9sDH0vCcxGJvN0U3yzz',#5,$,$,#24,(#31));
+#33=IFCDIRECTION((1.,0.,0.));
+#34=IFCDIRECTION((0.,0.,1.));
+#35=IFCCARTESIANPOINT((0.,0.,0.));
+#36=IFCAXIS2PLACEMENT3D(#35,#34,#33);
+#37=IFCLOCALPLACEMENT(#30,#36);
+#38=IFCBUILDINGSTOREY('0qGsHVrvL798oCPruY7pW1',#5,$,$,$,#37,$,$,.ELEMENT.,$);
+#39=IFCRELAGGREGATES('1bd1NxdaT4DxiyalO0UMYQ',#5,$,$,#31,(#38));
+#40=IFCBUILDINGELEMENTPROXY('3bwg5itXT1GxeIpCTEe09k',#5,'profile',$,$,#46,#58,$,$);
+#41=IFCRELCONTAINEDINSPATIALSTRUCTURE('1UlUmdMDv7sPYSCUlFhaaD',#5,$,$,(#40),#38);
+#42=IFCDIRECTION((1.,0.,0.));
+#43=IFCDIRECTION((0.,0.,1.));
+#44=IFCCARTESIANPOINT((0.,0.,0.));
+#45=IFCAXIS2PLACEMENT3D(#44,#43,#42);
+#46=IFCLOCALPLACEMENT($,#45);
+#47=IFCDIRECTION((1.,0.));
+#48=IFCCARTESIANPOINT((0.,0.));
+#49=IFCAXIS2PLACEMENT2D(#48,#47);
+#50=IFCDIRECTION((0.,0.,1.));
+#51=IFCDIRECTION((1.,0.,0.));
+#52=IFCDIRECTION((0.,0.,1.));
+#53=IFCCARTESIANPOINT((0.,0.,0.));
+#54=IFCAXIS2PLACEMENT3D(#53,#52,#51);
+#55=IFCLSHAPEPROFILEDEF(.AREA.,$,#49,50.,25.,5.,$,$,$,$,$);
+#56=IFCEXTRUDEDAREASOLID(#55,#54,#50,20.);
+#57=IFCSHAPEREPRESENTATION(#11,'Body','SweptSolid',(#56));
+#58=IFCPRODUCTDEFINITIONSHAPE($,$,(#57));
+#59=IFCBUILDINGELEMENTPROXY('3mXvFxL85FoOVKx$hsxICc',#5,'profile',$,$,#65,#77,$,$);
+#60=IFCRELCONTAINEDINSPATIALSTRUCTURE('2dAQ2Fu9P8pv53e7CgigoT',#5,$,$,(#59),#38);
+#61=IFCDIRECTION((1.,0.,0.));
+#62=IFCDIRECTION((0.,0.,1.));
+#63=IFCCARTESIANPOINT((100.,0.,0.));
+#64=IFCAXIS2PLACEMENT3D(#63,#62,#61);
+#65=IFCLOCALPLACEMENT($,#64);
+#66=IFCDIRECTION((1.,0.));
+#67=IFCCARTESIANPOINT((0.,0.));
+#68=IFCAXIS2PLACEMENT2D(#67,#66);
+#69=IFCDIRECTION((0.,0.,1.));
+#70=IFCDIRECTION((1.,0.,0.));
+#71=IFCDIRECTION((0.,0.,1.));
+#72=IFCCARTESIANPOINT((0.,0.,0.));
+#73=IFCAXIS2PLACEMENT3D(#72,#71,#70);
+#74=IFCLSHAPEPROFILEDEF(.AREA.,$,#68,50.,25.,5.,2.,2.,$,$,$);
+#75=IFCEXTRUDEDAREASOLID(#74,#73,#69,20.);
+#76=IFCSHAPEREPRESENTATION(#11,'Body','SweptSolid',(#75));
+#77=IFCPRODUCTDEFINITIONSHAPE($,$,(#76));
+#78=IFCBUILDINGELEMENTPROXY('2S9sXjK_n7mQYd8yd$UL$9',#5,'profile',$,$,#84,#96,$,$);
+#79=IFCRELCONTAINEDINSPATIALSTRUCTURE('0xWxza9zr5Ch$OeoRWg23b',#5,$,$,(#78),#38);
+#80=IFCDIRECTION((1.,0.,0.));
+#81=IFCDIRECTION((0.,0.,1.));
+#82=IFCCARTESIANPOINT((200.,0.,0.));
+#83=IFCAXIS2PLACEMENT3D(#82,#81,#80);
+#84=IFCLOCALPLACEMENT($,#83);
+#85=IFCDIRECTION((1.,0.));
+#86=IFCCARTESIANPOINT((0.,0.));
+#87=IFCAXIS2PLACEMENT2D(#86,#85);
+#88=IFCDIRECTION((0.,0.,1.));
+#89=IFCDIRECTION((1.,0.,0.));
+#90=IFCDIRECTION((0.,0.,1.));
+#91=IFCCARTESIANPOINT((0.,0.,0.));
+#92=IFCAXIS2PLACEMENT3D(#91,#90,#89);
+#93=IFCLSHAPEPROFILEDEF(.AREA.,$,#87,50.,25.,5.,$,$,2.,$,$);
+#94=IFCEXTRUDEDAREASOLID(#93,#92,#88,20.);
+#95=IFCSHAPEREPRESENTATION(#11,'Body','SweptSolid',(#94));
+#96=IFCPRODUCTDEFINITIONSHAPE($,$,(#95));
+#97=IFCBUILDINGELEMENTPROXY('0OGT8RR7b68wQXNF2jeePW',#5,'profile',$,$,#103,#115,$,$);
+#98=IFCRELCONTAINEDINSPATIALSTRUCTURE('3kQYgJFkv06wIcavG1q8vT',#5,$,$,(#97),#38);
+#99=IFCDIRECTION((1.,0.,0.));
+#100=IFCDIRECTION((0.,0.,1.));
+#101=IFCCARTESIANPOINT((300.,0.,0.));
+#102=IFCAXIS2PLACEMENT3D(#101,#100,#99);
+#103=IFCLOCALPLACEMENT($,#102);
+#104=IFCDIRECTION((1.,0.));
+#105=IFCCARTESIANPOINT((0.,0.));
+#106=IFCAXIS2PLACEMENT2D(#105,#104);
+#107=IFCDIRECTION((0.,0.,1.));
+#108=IFCDIRECTION((1.,0.,0.));
+#109=IFCDIRECTION((0.,0.,1.));
+#110=IFCCARTESIANPOINT((0.,0.,0.));
+#111=IFCAXIS2PLACEMENT3D(#110,#109,#108);
+#112=IFCLSHAPEPROFILEDEF(.AREA.,$,#106,50.,25.,5.,1.,2.,2.,$,$);
+#113=IFCEXTRUDEDAREASOLID(#112,#111,#107,20.);
+#114=IFCSHAPEREPRESENTATION(#11,'Body','SweptSolid',(#113));
+#115=IFCPRODUCTDEFINITIONSHAPE($,$,(#114));
+ENDSEC;
+END-ISO-10303-21;
diff --git a/test/input/IfcRectangleProfileDef.ifc b/test/input/IfcRectangleProfileDef.ifc
new file mode 100644
index 0000000..e8d2d95
--- /dev/null
+++ b/test/input/IfcRectangleProfileDef.ifc
@@ -0,0 +1,124 @@
+ISO-10303-21;
+HEADER;
+FILE_DESCRIPTION(('ViewDefinition [CoordinationView]'),'2;1');
+FILE_NAME('IfcRectangleProfileDef.ifc','2014-02-23T12:17:27',(''),('',''),'IfcOpenShell 0.5.0-dev','IfcOpenShell 0.5.0-dev','');
+FILE_SCHEMA(('IFC2X3'));
+ENDSEC;
+DATA;
+#1=IFCPERSON($,$,'',$,$,$,$,$);
+#2=IFCORGANIZATION($,'IfcOpenShell',$,$,$);
+#3=IFCPERSONANDORGANIZATION(#1,#2,$);
+#4=IFCAPPLICATION(#2,'0.5.0-dev','IfcOpenShell','IfcOpenShell');
+#5=IFCOWNERHISTORY(#3,#4,$,.ADDED.,$,#3,#4,1393154247);
+#6=IFCDIRECTION((0.,1.,0.));
+#7=IFCDIRECTION((1.,0.,0.));
+#8=IFCDIRECTION((0.,0.,1.));
+#9=IFCCARTESIANPOINT((0.,0.,0.));
+#10=IFCAXIS2PLACEMENT3D(#9,#8,#7);
+#11=IFCGEOMETRICREPRESENTATIONCONTEXT('Plan','Model',3,1.E-005,#10,#6);
+#12=IFCDIMENSIONALEXPONENTS(0,0,0,0,0,0,0);
+#13=IFCSIUNIT(*,.LENGTHUNIT.,.MILLI.,.METRE.);
+#14=IFCSIUNIT(*,.PLANEANGLEUNIT.,$,.RADIAN.);
+#15=IFCMEASUREWITHUNIT(IFCPLANEANGLEMEASURE(0.0174533),#14);
+#16=IFCCONVERSIONBASEDUNIT(#12,.PLANEANGLEUNIT.,'Degrees',#15);
+#17=IFCUNITASSIGNMENT((#13,#16));
+#18=IFCPROJECT('34NFZdlw18tQg7qe_UpWD3',#5,'IfcRectangleProfileDef',$,$,$,$,(#11),#17);
+#19=IFCDIRECTION((1.,0.,0.));
+#20=IFCDIRECTION((0.,0.,1.));
+#21=IFCCARTESIANPOINT((0.,0.,0.));
+#22=IFCAXIS2PLACEMENT3D(#21,#20,#19);
+#23=IFCLOCALPLACEMENT($,#22);
+#24=IFCSITE('0HQnEwtaT8og7FPJVsBNOP',#5,$,$,$,#23,$,$,.ELEMENT.,$,$,$,$,$);
+#25=IFCRELAGGREGATES('2sIBlgRXT4y9ht_9tPEBC7',#5,$,$,#18,(#24));
+#26=IFCDIRECTION((1.,0.,0.));
+#27=IFCDIRECTION((0.,0.,1.));
+#28=IFCCARTESIANPOINT((0.,0.,0.));
+#29=IFCAXIS2PLACEMENT3D(#28,#27,#26);
+#30=IFCLOCALPLACEMENT(#23,#29);
+#31=IFCBUILDING('1z$jgYZ8jELeiBgtsj1Ywb',#5,$,$,$,#30,$,$,.ELEMENT.,$,$,$);
+#32=IFCRELAGGREGATES('2bxfQZFzjFaBAA9rkA3BmU',#5,$,$,#24,(#31));
+#33=IFCDIRECTION((1.,0.,0.));
+#34=IFCDIRECTION((0.,0.,1.));
+#35=IFCCARTESIANPOINT((0.,0.,0.));
+#36=IFCAXIS2PLACEMENT3D(#35,#34,#33);
+#37=IFCLOCALPLACEMENT(#30,#36);
+#38=IFCBUILDINGSTOREY('1hExFdke124PGUUaHP477g',#5,$,$,$,#37,$,$,.ELEMENT.,$);
+#39=IFCRELAGGREGATES('0ITGmTN3j01ACXyloo9xu1',#5,$,$,#31,(#38));
+#40=IFCBUILDINGELEMENTPROXY('0l5Ho3m451kf2dKCVrqoaH',#5,'profile',$,$,#46,#58,$,$);
+#41=IFCRELCONTAINEDINSPATIALSTRUCTURE('06NzIRXwX1vwKlImhmg9fS',#5,$,$,(#40),#38);
+#42=IFCDIRECTION((1.,0.,0.));
+#43=IFCDIRECTION((0.,0.,1.));
+#44=IFCCARTESIANPOINT((0.,0.,0.));
+#45=IFCAXIS2PLACEMENT3D(#44,#43,#42);
+#46=IFCLOCALPLACEMENT($,#45);
+#47=IFCDIRECTION((1.,0.));
+#48=IFCCARTESIANPOINT((0.,0.));
+#49=IFCAXIS2PLACEMENT2D(#48,#47);
+#50=IFCDIRECTION((0.,0.,1.));
+#51=IFCDIRECTION((1.,0.,0.));
+#52=IFCDIRECTION((0.,0.,1.));
+#53=IFCCARTESIANPOINT((0.,0.,0.));
+#54=IFCAXIS2PLACEMENT3D(#53,#52,#51);
+#55=IFCRECTANGLEPROFILEDEF(.AREA.,$,#49,50.,25.);
+#56=IFCEXTRUDEDAREASOLID(#55,#54,#50,20.);
+#57=IFCSHAPEREPRESENTATION(#11,'Body','SweptSolid',(#56));
+#58=IFCPRODUCTDEFINITIONSHAPE($,$,(#57));
+#59=IFCBUILDINGELEMENTPROXY('3BYiTRrsX9Kh4sUOHRMFg9',#5,'profile',$,$,#65,#77,$,$);
+#60=IFCRELCONTAINEDINSPATIALSTRUCTURE('3AL3LxjpT1j9pXgWkoyGKa',#5,$,$,(#59),#38);
+#61=IFCDIRECTION((1.,0.,0.));
+#62=IFCDIRECTION((0.,0.,1.));
+#63=IFCCARTESIANPOINT((100.,0.,0.));
+#64=IFCAXIS2PLACEMENT3D(#63,#62,#61);
+#65=IFCLOCALPLACEMENT($,#64);
+#66=IFCDIRECTION((1.,0.));
+#67=IFCCARTESIANPOINT((0.,0.));
+#68=IFCAXIS2PLACEMENT2D(#67,#66);
+#69=IFCDIRECTION((0.,0.,1.));
+#70=IFCDIRECTION((1.,0.,0.));
+#71=IFCDIRECTION((0.,0.,1.));
+#72=IFCCARTESIANPOINT((0.,0.,0.));
+#73=IFCAXIS2PLACEMENT3D(#72,#71,#70);
+#74=IFCROUNDEDRECTANGLEPROFILEDEF(.AREA.,$,#68,50.,25.,5.);
+#75=IFCEXTRUDEDAREASOLID(#74,#73,#69,20.);
+#76=IFCSHAPEREPRESENTATION(#11,'Body','SweptSolid',(#75));
+#77=IFCPRODUCTDEFINITIONSHAPE($,$,(#76));
+#78=IFCBUILDINGELEMENTPROXY('1JwSHn6uL10QulUWSwgv70',#5,'profile',$,$,#84,#96,$,$);
+#79=IFCRELCONTAINEDINSPATIALSTRUCTURE('1padVE20fDEQOS7FQjgywj',#5,$,$,(#78),#38);
+#80=IFCDIRECTION((1.,0.,0.));
+#81=IFCDIRECTION((0.,0.,1.));
+#82=IFCCARTESIANPOINT((200.,0.,0.));
+#83=IFCAXIS2PLACEMENT3D(#82,#81,#80);
+#84=IFCLOCALPLACEMENT($,#83);
+#85=IFCDIRECTION((1.,0.));
+#86=IFCCARTESIANPOINT((0.,0.));
+#87=IFCAXIS2PLACEMENT2D(#86,#85);
+#88=IFCDIRECTION((0.,0.,1.));
+#89=IFCDIRECTION((1.,0.,0.));
+#90=IFCDIRECTION((0.,0.,1.));
+#91=IFCCARTESIANPOINT((0.,0.,0.));
+#92=IFCAXIS2PLACEMENT3D(#91,#90,#89);
+#93=IFCRECTANGLEHOLLOWPROFILEDEF(.AREA.,$,#87,50.,25.,5.,$,$);
+#94=IFCEXTRUDEDAREASOLID(#93,#92,#88,20.);
+#95=IFCSHAPEREPRESENTATION(#11,'Body','SweptSolid',(#94));
+#96=IFCPRODUCTDEFINITIONSHAPE($,$,(#95));
+#97=IFCBUILDINGELEMENTPROXY('0CyzhXtfH2zgiiCjDdsUmI',#5,'profile',$,$,#103,#115,$,$);
+#98=IFCRELCONTAINEDINSPATIALSTRUCTURE('0ltMn_dELFieiCmUExBlW5',#5,$,$,(#97),#38);
+#99=IFCDIRECTION((1.,0.,0.));
+#100=IFCDIRECTION((0.,0.,1.));
+#101=IFCCARTESIANPOINT((300.,0.,0.));
+#102=IFCAXIS2PLACEMENT3D(#101,#100,#99);
+#103=IFCLOCALPLACEMENT($,#102);
+#104=IFCDIRECTION((1.,0.));
+#105=IFCCARTESIANPOINT((0.,0.));
+#106=IFCAXIS2PLACEMENT2D(#105,#104);
+#107=IFCDIRECTION((0.,0.,1.));
+#108=IFCDIRECTION((1.,0.,0.));
+#109=IFCDIRECTION((0.,0.,1.));
+#110=IFCCARTESIANPOINT((0.,0.,0.));
+#111=IFCAXIS2PLACEMENT3D(#110,#109,#108);
+#112=IFCRECTANGLEHOLLOWPROFILEDEF(.AREA.,$,#106,50.,25.,5.,2.,4.);
+#113=IFCEXTRUDEDAREASOLID(#112,#111,#107,20.);
+#114=IFCSHAPEREPRESENTATION(#11,'Body','SweptSolid',(#113));
+#115=IFCPRODUCTDEFINITIONSHAPE($,$,(#114));
+ENDSEC;
+END-ISO-10303-21;
diff --git a/test/input/IfcReinforcingBar.ifc b/test/input/IfcReinforcingBar.ifc
new file mode 100644
index 0000000..4e015a3
--- /dev/null
+++ b/test/input/IfcReinforcingBar.ifc
@@ -0,0 +1,15127 @@
+ISO-10303-21;
+HEADER;FILE_DESCRIPTION(('IFC2x3 Coordination View'),'2;1');
+FILE_NAME('export.ifc',
+'2014-04-14T14:30:50',('Hahnebach Bernd'),(''),
+'The EXPRESS Data Manager Version 5.02.0100.02 : 29 May 2013',
+'Allplan 2014.0 23.01.2014 - 15:01:43','');
+FILE_SCHEMA(('IFC2X3'));
+ENDSEC;
+
+DATA;
+#1= IFCAXIS2PLACEMENT3D(#32,$,$);
+#4= IFCOWNERHISTORY(#20,#23,$,.ADDED.,$,$,$,1397478648);
+#5= IFCPROJECT('1KvpqAbxiHuu6qT4QWihlb',#4,
+'',$,$,$,$,(#11,
+#38),#42);
+#11= IFCGEOMETRICREPRESENTATIONCONTEXT($,'Model',3,1.000000000000000E-5,
+#1,$);
+#14= IFCPERSON($,'Bernd','Hahnebach',$,$,$,$,$);
+#16= IFCORGANIZATION($,'Nemetschek Allplan GmbH',$,$,$);
+#20= IFCPERSONANDORGANIZATION(#14,#16,$);
+#23= IFCAPPLICATION(#16,'2014.0','Allplan','Allplan');
+#24= IFCSIUNIT(*,.LENGTHUNIT.,$,.METRE.);
+#25= IFCSIUNIT(*,.LENGTHUNIT.,.MILLI.,.METRE.);
+#26= IFCSIUNIT(*,.PLANEANGLEUNIT.,$,.RADIAN.);
+#27= IFCMEASUREWITHUNIT(IFCPLANEANGLEMEASURE(0.0174532925199433),#26);
+#28= IFCDIMENSIONALEXPONENTS(0,0,0,0,0,0,0);
+#29= IFCCONVERSIONBASEDUNIT(#28,.PLANEANGLEUNIT.,'DEGREE',#27);
+#30= IFCSIUNIT(*,.AREAUNIT.,$,.SQUARE_METRE.);
+#31= IFCSIUNIT(*,.VOLUMEUNIT.,$,.CUBIC_METRE.);
+#32= IFCCARTESIANPOINT((0.,0.,0.));
+#34= IFCGEOMETRICREPRESENTATIONSUBCONTEXT('Body','Model',*,*,*,*,#11,$,
+.MODEL_VIEW.,$);
+#36= IFCGEOMETRICREPRESENTATIONSUBCONTEXT('Axis','Model',*,*,*,*,#11,$,
+.MODEL_VIEW.,$);
+#37= IFCGEOMETRICREPRESENTATIONSUBCONTEXT('Profile','Model',*,*,*,*,#11,
+$,.MODEL_VIEW.,$);
+#38= IFCGEOMETRICREPRESENTATIONCONTEXT($,'Plan',3,1.000000000000000E-5,
+#1,$);
+#39= IFCGEOMETRICREPRESENTATIONSUBCONTEXT('Annotation','Plan',*,*,*,*,
+#38,0.01,.PLAN_VIEW.,$);
+#42= IFCUNITASSIGNMENT((#25,#29,#30,#31));
+#44= IFCSITE('0RoB5k6LDCfv5zauaLAO2B',#4,
+'\X2\00DC\X0\berbauung, 1000-1999, 100 pro Geb\X2\00E4\X0\ude',$,$,#49,$
+,$,.ELEMENT.,$,$,$,$,$);
+#49= IFCLOCALPLACEMENT($,#1);
+#53= IFCBUILDING('0gHQeTsGvCFexGEB4rdf_K',#4,'Geb\X2\00E4\X0\ude A',$,$,
+#61,$,$,.ELEMENT.,$,$,$);
+#54= IFCAXIS2PLACEMENT3D(#55,#57,#59);
+#55= IFCCARTESIANPOINT((0.,0.,0.));
+#57= IFCDIRECTION((0.,0.,1.));
+#59= IFCDIRECTION((1.,0.,0.));
+#61= IFCLOCALPLACEMENT(#49,#54);
+#64= IFCAXIS2PLACEMENT3D(#65,#67,#69);
+#65= IFCCARTESIANPOINT((0.,0.,-1130.));
+#67= IFCDIRECTION((0.,0.,1.));
+#69= IFCDIRECTION((1.,0.,0.));
+#71= IFCLOCALPLACEMENT(#61,#64);
+#73= IFCBUILDINGSTOREY('2wFtfi1V12nAnpWdM26RDC',#4,'Liftschacht',$,$,#71
+,$,$,.ELEMENT.,-1130.);
+#75= IFCTEXTSTYLEFORDEFINEDFONT(#76,$);
+#76= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#77= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#78= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(350.));
+#80= IFCTEXTSTYLE($,#75,#77,#78);
+#81= IFCTEXTLITERAL('d = 25cm',#84,.LEFT.);
+#82= IFCDIRECTION((0.7310552682428758,0.6823182503600038));
+#84= IFCAXIS2PLACEMENT2D(#85,#82);
+#85= IFCCARTESIANPOINT((87738.90713147861,22755.42414823773));
+#87= IFCLOCALPLACEMENT($,#1);
+#88= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#81));
+#95= IFCPRODUCTDEFINITIONSHAPE($,$,(#88));
+#100= IFCANNOTATION('2kWHAieVHAFgYz8wF9wgR0',#4,$,$,$,#87,#95);
+#104= IFCCURVESTYLE($,#108,IFCPOSITIVELENGTHMEASURE(25.),#109);
+#105= IFCCURVESTYLEFONT($,(#107));
+#107= IFCCURVESTYLEFONTPATTERN(0.2,1.);
+#108= IFCCURVESTYLEFONTANDSCALING($,#105,100.);
+#109= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#110= IFCPRESENTATIONLAYERWITHSTYLE('Text Waende',$,(#88,#81,#146,#139,
+#181,#174,#216,#209,#251,#244,#286,#279,#321,#314,#356,#349,#391,#384,
+#426,#419,#462,#455,#498,#491,#534,#527,#570,#563,#606,#599,#721,#714,
+#826,#819,#861,#854,#896,#889,#931,#924,#966,#959,#1981,#1974,#2017,
+#2010,#2052,#2045,#2122,#2115,#2157,#2150,#2193,#2186,#2229,#2222,#2264,
+#2257,#2300,#2293,#2336,#2329,#2372,#2365,#2408,#2401,#2444,#2437,#2480,
+#2473,#2516,#2509,#2551,#2544,#2586,#2579,#2656,#2649,#2691,#2684,#2761,
+#2754,#2796,#2789,#2831,#2824,#2866,#2859,#2901,#2894,#2936,#2929,#2971,
+#2964,#3006,#2999,#3041,#3034,#3076,#3069,#3112,#3105,#3148,#3141,#3184,
+#3177,#3220,#3213,#3256,#3249,#3292,#3285,#3397,#3390,#3888,#3881,#3923,
+#3916,#3958,#3951,#3993,#3986,#4029,#4022,#4065,#4058,#4100,#4093,#4136,
+#4129,#4172,#4165,#4208,#4201,#4244,#4237,#4280,#4273,#4316,#4309,#4352,
+#4345,#4492,#4485,#4527,#4520,#4562,#4555,#4597,#4590,#4632,#4625,#4667,
+#4660,#4702,#4695,#5157,#5150,#5192,#5185,#5227,#5220,#5332,#5325,#5367,
+#5360,#5402,#5395,#5438,#5431,#5473,#5466,#5509,#5502,#5544,#5537,#5615,
+#5608,#5821,#5814,#5856,#5849,#5891,#5884,#5926,#5919,#5961,#5954,#5996,
+#5989,#6031,#6024,#6066,#6059,#6101,#6094,#6136,#6129,#6172,#6165,#6208,
+#6201,#6244,#6237,#6280,#6273,#6316,#6309,#6422,#6415,#6527,#6520,#6562,
+#6555,#6597,#6590,#6632,#6625,#6667,#6660,#7682,#7675,#7718,#7711,#7753,
+#7746,#7823,#7816,#7858,#7851,#7894,#7887,#7930,#7923,#7965,#7958,#8001,
+#7994,#8037,#8030,#8073,#8066,#8109,#8102,#8145,#8138,#8181,#8174,#8217,
+#8210,#8252,#8245,#8287,#8280,#8357,#8350,#8392,#8385,#8462,#8455,#8497,
+#8490,#8532,#8525,#8567,#8560,#8602,#8595,#8637,#8630,#8672,#8665,#8707,
+#8700,#8742,#8735,#8777,#8770,#8813,#8806,#8849,#8842,#8885,#8878,#8921,
+#8914,#8957,#8950,#8993,#8986,#9098,#9091,#9589,#9582,#9624,#9617,#9659,
+#9652,#9694,#9687,#9730,#9723,#9766,#9759,#9801,#9794,#9837,#9830,#9873,
+#9866,#9909,#9902,#9945,#9938,#9981,#9974,#10017,#10010,#10053,#10046,
+#10193,#10186,#10228,#10221,#10263,#10256,#10298,#10291,#10333,#10326,
+#10368,#10361,#10403,#10396,#10858,#10851,#10893,#10886,#10928,#10921,
+#11033,#11026,#11068,#11061,#11103,#11096,#11139,#11132,#11174,#11167,
+#11210,#11203,#11245,#11238,#11316,#11309,#11762,#11755,#11797,#11790,
+#11832,#11825,#11867,#11860,#11902,#11895,#11937,#11930,#11972,#11965,
+#12007,#12000,#12042,#12035,#12077,#12070,#12113,#12106,#12149,#12142,
+#12185,#12178,#12221,#12214,#12257,#12250,#12363,#12356,#12468,#12461,
+#12503,#12496,#12538,#12531,#12573,#12566,#12608,#12601,#13623,#13616,
+#13659,#13652,#13694,#13687,#13764,#13757,#13799,#13792,#13835,#13828,
+#13871,#13864,#13906,#13899,#13942,#13935,#13978,#13971,#14014,#14007,
+#14050,#14043,#14086,#14079,#14122,#14115,#14158,#14151,#14193,#14186,
+#14228,#14221,#14298,#14291,#14333,#14326,#14403,#14396,#14438,#14431,
+#14473,#14466,#14508,#14501,#14543,#14536,#14578,#14571,#14613,#14606,
+#14648,#14641,#14683,#14676,#14718,#14711,#14754,#14747,#14790,#14783,
+#14826,#14819,#14862,#14855,#14898,#14891,#14934,#14927,#15039,#15032,
+#15530,#15523,#15565,#15558,#15600,#15593,#15635,#15628,#15671,#15664,
+#15707,#15700,#15742,#15735,#15778,#15771,#15814,#15807,#15850,#15843,
+#15886,#15879,#15922,#15915,#15958,#15951,#15994,#15987,#16134,#16127,
+#16169,#16162,#16204,#16197,#16239,#16232,#16274,#16267,#16309,#16302,
+#16344,#16337,#16799,#16792,#16834,#16827,#16869,#16862,#16974,#16967,
+#17009,#17002,#17044,#17037,#17080,#17073,#17115,#17108,#17151,#17144,
+#17186,#17179,#17257,#17250,#17397,#17390,#17432,#17425,#17467,#17460,
+#17502,#17495,#17537,#17530,#17572,#17565,#17607,#17600,#17642,#17635,
+#17677,#17670,#17712,#17705,#17748,#17741,#17784,#17777,#17820,#17813,
+#17856,#17849,#17892,#17885,#17928,#17921,#18033,#18026,#18524,#18517,
+#18559,#18552,#18594,#18587,#18629,#18622,#18665,#18658,#18701,#18694,
+#18736,#18729,#18772,#18765,#18808,#18801,#18844,#18837,#18880,#18873,
+#18916,#18909,#18952,#18945,#18988,#18981),'TX_WAND',.T.,.U.,.F.,(#104)
+);
+#114= IFCPRESENTATIONSTYLEASSIGNMENT((#80));
+#116= IFCSTYLEDITEM(#81,(#114),$);
+#120= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--8'),$);
+#124= IFCPROPERTYSET('0Duo_8vNLCDB7j2FWKASQR',#4,'Allplan Attributes',$,
+(#120));
+#129= IFCRELDEFINESBYPROPERTIES('0THRWNviT99hUjWRrcRFR3',#4,$,$,(#100),
+#124);
+#133= IFCTEXTSTYLEFORDEFINEDFONT(#134,$);
+#134= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#135= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#136= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#138= IFCTEXTSTYLE($,#133,#135,#136);
+#139= IFCTEXTLITERAL('Absatz OK Boden 7cm',#142,.LEFT.);
+#140= IFCDIRECTION((1.,0.));
+#142= IFCAXIS2PLACEMENT2D(#143,#140);
+#143= IFCCARTESIANPOINT((75981.541562714,23740.00483059611));
+#145= IFCLOCALPLACEMENT($,#1);
+#146= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#139));
+#148= IFCPRODUCTDEFINITIONSHAPE($,$,(#146));
+#151= IFCANNOTATION('2c6kOxjzT6GOZHQUVna3aK',#4,$,$,$,#145,#148);
+#155= IFCPRESENTATIONSTYLEASSIGNMENT((#138));
+#157= IFCSTYLEDITEM(#139,(#155),$);
+#161= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--9'),$);
+#162= IFCPROPERTYSET('0Qr3rE36n5lQl2hU33WrV$',#4,'Allplan Attributes',$,
+(#161));
+#164= IFCRELDEFINESBYPROPERTIES('2eSmZI6159rgCA5_73rjer',#4,$,$,(#151),
+#162);
+#168= IFCTEXTSTYLEFORDEFINEDFONT(#169,$);
+#169= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#170= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#171= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#173= IFCTEXTSTYLE($,#168,#170,#171);
+#174= IFCTEXTLITERAL('Absatz UK Boden 7cm',#177,.LEFT.);
+#175= IFCDIRECTION((1.,0.));
+#177= IFCAXIS2PLACEMENT2D(#178,#175);
+#178= IFCCARTESIANPOINT((75977.80217074958,24656.67149726277));
+#180= IFCLOCALPLACEMENT($,#1);
+#181= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#174));
+#183= IFCPRODUCTDEFINITIONSHAPE($,$,(#181));
+#186= IFCANNOTATION('1v_wsIRP52qQ1hThW5jz1B',#4,$,$,$,#180,#183);
+#190= IFCPRESENTATIONSTYLEASSIGNMENT((#173));
+#192= IFCSTYLEDITEM(#174,(#190),$);
+#196= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--10'),$);
+#197= IFCPROPERTYSET('2KFoCePbr6POLw37OMwfR4',#4,'Allplan Attributes',$,
+(#196));
+#199= IFCRELDEFINESBYPROPERTIES('3$KX3pKc14uhhbTA03Wqyo',#4,$,$,(#186),
+#197);
+#203= IFCTEXTSTYLEFORDEFINEDFONT(#204,$);
+#204= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#205= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#206= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#208= IFCTEXTSTYLE($,#203,#205,#206);
+#209= IFCTEXTLITERAL('Absatz OK Boden 7cm',#212,.LEFT.);
+#210= IFCDIRECTION((6.123233995736766E-17,1.));
+#212= IFCAXIS2PLACEMENT2D(#213,#210);
+#213= IFCCARTESIANPOINT((79188.33333333333,22338.59690241592));
+#215= IFCLOCALPLACEMENT($,#1);
+#216= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#209));
+#218= IFCPRODUCTDEFINITIONSHAPE($,$,(#216));
+#221= IFCANNOTATION('1Cf8v2LdP0bfwf6bNougyB',#4,$,$,$,#215,#218);
+#225= IFCPRESENTATIONSTYLEASSIGNMENT((#208));
+#227= IFCSTYLEDITEM(#209,(#225),$);
+#231= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--11'),$);
+#232= IFCPROPERTYSET('1yOirtH0f8rATYEVsvuktq',#4,'Allplan Attributes',$,
+(#231));
+#234= IFCRELDEFINESBYPROPERTIES('1UViDjR4b9rgXq0bK1F2Z6',#4,$,$,(#221),
+#232);
+#238= IFCTEXTSTYLEFORDEFINEDFONT(#239,$);
+#239= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#240= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#241= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#243= IFCTEXTSTYLE($,#238,#240,#241);
+#244= IFCTEXTLITERAL('Absatz OK Boden 7cm',#247,.LEFT.);
+#245= IFCDIRECTION((1.,0.));
+#247= IFCAXIS2PLACEMENT2D(#248,#245);
+#248= IFCCARTESIANPOINT((79777.02674372181,22095.0048305961));
+#250= IFCLOCALPLACEMENT($,#1);
+#251= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#244));
+#253= IFCPRODUCTDEFINITIONSHAPE($,$,(#251));
+#256= IFCANNOTATION('12pHNdbgv1YgnGWVE6ZBbw',#4,$,$,$,#250,#253);
+#260= IFCPRESENTATIONSTYLEASSIGNMENT((#243));
+#262= IFCSTYLEDITEM(#244,(#260),$);
+#266= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--12'),$);
+#267= IFCPROPERTYSET('1PrT7KfEz5SfuW7g3KVoEJ',#4,'Allplan Attributes',$,
+(#266));
+#269= IFCRELDEFINESBYPROPERTIES('2WZ_4eF_z6_hYNFTKqjIqk',#4,$,$,(#256),
+#267);
+#273= IFCTEXTSTYLEFORDEFINEDFONT(#274,$);
+#274= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#275= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#276= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#278= IFCTEXTSTYLE($,#273,#275,#276);
+#279= IFCTEXTLITERAL('Absatz OK Boden 7cm',#282,.LEFT.);
+#280= IFCDIRECTION((6.123233995736766E-17,1.));
+#282= IFCAXIS2PLACEMENT2D(#283,#280);
+#283= IFCCARTESIANPOINT((82025.,22520.04762552151));
+#285= IFCLOCALPLACEMENT($,#1);
+#286= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#279));
+#288= IFCPRODUCTDEFINITIONSHAPE($,$,(#286));
+#291= IFCANNOTATION('2x2Q1WrN19PA7I$onYE1h3',#4,$,$,$,#285,#288);
+#295= IFCPRESENTATIONSTYLEASSIGNMENT((#278));
+#297= IFCSTYLEDITEM(#279,(#295),$);
+#301= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--13'),$);
+#302= IFCPROPERTYSET('13p0Ivmr1EQhL0R55uTqqs',#4,'Allplan Attributes',$,
+(#301));
+#304= IFCRELDEFINESBYPROPERTIES('08dDthHAL1Ff8PUOsA$ifP',#4,$,$,(#291),
+#302);
+#308= IFCTEXTSTYLEFORDEFINEDFONT(#309,$);
+#309= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#310= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#311= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#313= IFCTEXTSTYLE($,#308,#310,#311);
+#314= IFCTEXTLITERAL('Absatz OK Boden 7cm',#317,.LEFT.);
+#315= IFCDIRECTION((1.,0.));
+#317= IFCAXIS2PLACEMENT2D(#318,#315);
+#318= IFCCARTESIANPOINT((82528.94870789858,23990.0048305961));
+#320= IFCLOCALPLACEMENT($,#1);
+#321= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#314));
+#323= IFCPRODUCTDEFINITIONSHAPE($,$,(#321));
+#326= IFCANNOTATION('2I2Xo9Z_52kuo4DS6ZY5Zv',#4,$,$,$,#320,#323);
+#330= IFCPRESENTATIONSTYLEASSIGNMENT((#313));
+#332= IFCSTYLEDITEM(#314,(#330),$);
+#336= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--14'),$);
+#337= IFCPROPERTYSET('1Ygq7zI6rFLxrFG2D7GN3Z',#4,'Allplan Attributes',$,
+(#336));
+#339= IFCRELDEFINESBYPROPERTIES('11Tg8CJ5L1QAMxOkpDb4vN',#4,$,$,(#326),
+#337);
+#343= IFCTEXTSTYLEFORDEFINEDFONT(#344,$);
+#344= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#345= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#346= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#348= IFCTEXTSTYLE($,#343,#345,#346);
+#349= IFCTEXTLITERAL('Absatz OK Boden 7cm',#352,.LEFT.);
+#350= IFCDIRECTION((1.,0.));
+#352= IFCAXIS2PLACEMENT2D(#353,#350);
+#353= IFCCARTESIANPOINT((85062.27633487518,23740.0048305961));
+#355= IFCLOCALPLACEMENT($,#1);
+#356= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#349));
+#358= IFCPRODUCTDEFINITIONSHAPE($,$,(#356));
+#361= IFCANNOTATION('2JtKOWYFb769lUhk8w649O',#4,$,$,$,#355,#358);
+#365= IFCPRESENTATIONSTYLEASSIGNMENT((#348));
+#367= IFCSTYLEDITEM(#349,(#365),$);
+#371= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--15'),$);
+#372= IFCPROPERTYSET('0gX2EdK7H8yxpLXtgzW9JZ',#4,'Allplan Attributes',$,
+(#371));
+#374= IFCRELDEFINESBYPROPERTIES('2zRbWfUIXCsvqKKinfzS9D',#4,$,$,(#361),
+#372);
+#378= IFCTEXTSTYLEFORDEFINEDFONT(#379,$);
+#379= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#380= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#381= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#383= IFCTEXTSTYLE($,#378,#380,#381);
+#384= IFCTEXTLITERAL('Absatz UK Boden 7cm',#387,.LEFT.);
+#385= IFCDIRECTION((1.,0.));
+#387= IFCAXIS2PLACEMENT2D(#388,#385);
+#388= IFCCARTESIANPOINT((87412.56598371331,24656.67149726277));
+#390= IFCLOCALPLACEMENT($,#1);
+#391= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#384));
+#393= IFCPRODUCTDEFINITIONSHAPE($,$,(#391));
+#396= IFCANNOTATION('0iqUTLv5DB5gbgBCB6XHjP',#4,$,$,$,#390,#393);
+#400= IFCPRESENTATIONSTYLEASSIGNMENT((#383));
+#402= IFCSTYLEDITEM(#384,(#400),$);
+#406= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--16'),$);
+#407= IFCPROPERTYSET('388IcyDIT5UeHZ3Vd8IxVj',#4,'Allplan Attributes',$,
+(#406));
+#409= IFCRELDEFINESBYPROPERTIES('3RjzX3Nvf9vQXyINurwRPP',#4,$,$,(#396),
+#407);
+#413= IFCTEXTSTYLEFORDEFINEDFONT(#414,$);
+#414= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#415= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#416= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#418= IFCTEXTSTYLE($,#413,#415,#416);
+#419= IFCTEXTLITERAL('Absatz OK Boden 7cm',#422,.LEFT.);
+#420= IFCDIRECTION((1.,0.));
+#422= IFCAXIS2PLACEMENT2D(#423,#420);
+#423= IFCCARTESIANPOINT((90006.89477922957,23740.0048305961));
+#425= IFCLOCALPLACEMENT($,#1);
+#426= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#419));
+#428= IFCPRODUCTDEFINITIONSHAPE($,$,(#426));
+#431= IFCANNOTATION('3uOJ93wG55_QFWjDDxIrvf',#4,$,$,$,#425,#428);
+#435= IFCPRESENTATIONSTYLEASSIGNMENT((#418));
+#437= IFCSTYLEDITEM(#419,(#435),$);
+#441= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--17'),$);
+#442= IFCPROPERTYSET('2Wla$f6a10Hw9Xd5$5F9Xa',#4,'Allplan Attributes',$,
+(#441));
+#444= IFCRELDEFINESBYPROPERTIES('1LQDHi96P77OzSFDcTo$OZ',#4,$,$,(#431),
+#442);
+#448= IFCTEXTSTYLEFORDEFINEDFONT(#449,$);
+#449= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#450= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.4));
+#451= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#453= IFCTEXTSTYLE($,#448,#450,#451);
+#454= IFCPLANAREXTENT(1940.,240.);
+#455= IFCTEXTLITERALWITHEXTENT(
+'Fund. d=30cm, UK= -0.90\X\0A+ 5cm Magerbeton (UK= -0.95)',#458,.LEFT.,
+#454,'top-left');
+#456= IFCDIRECTION((1.,0.));
+#458= IFCAXIS2PLACEMENT2D(#459,#456);
+#459= IFCCARTESIANPOINT((69475.,8050.004830596101));
+#461= IFCLOCALPLACEMENT($,#1);
+#462= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#455));
+#464= IFCPRODUCTDEFINITIONSHAPE($,$,(#462));
+#467= IFCANNOTATION('1Snj_Td3f2xuRqpFtvuOrB',#4,$,$,$,#461,#464);
+#471= IFCPRESENTATIONSTYLEASSIGNMENT((#453));
+#473= IFCSTYLEDITEM(#455,(#471),$);
+#477= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--18'),$);
+#478= IFCPROPERTYSET('0pkWU3uU53puNc5G5piHIU',#4,'Allplan Attributes',$,
+(#477));
+#480= IFCRELDEFINESBYPROPERTIES('3v8GvrPNP72hn7dPmrJUuN',#4,$,$,(#467),
+#478);
+#484= IFCTEXTSTYLEFORDEFINEDFONT(#485,$);
+#485= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#486= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.4));
+#487= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#489= IFCTEXTSTYLE($,#484,#486,#487);
+#490= IFCPLANAREXTENT(1940.,240.);
+#491= IFCTEXTLITERALWITHEXTENT(
+'Fund. d=30cm, UK= -0.90\X\0A+ 5cm Magerbeton (UK= -0.95)',#494,.LEFT.,
+#490,'top-left');
+#492= IFCDIRECTION((1.,0.));
+#494= IFCAXIS2PLACEMENT2D(#495,#492);
+#495= IFCCARTESIANPOINT((95155.00000000002,8050.004830596099));
+#497= IFCLOCALPLACEMENT($,#1);
+#498= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#491));
+#500= IFCPRODUCTDEFINITIONSHAPE($,$,(#498));
+#503= IFCANNOTATION('02SQ3CBNb7gfr4KbBnZZdq',#4,$,$,$,#497,#500);
+#507= IFCPRESENTATIONSTYLEASSIGNMENT((#489));
+#509= IFCSTYLEDITEM(#491,(#507),$);
+#513= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--19'),$);
+#514= IFCPROPERTYSET('2X70QvNMvAb8aWixthczne',#4,'Allplan Attributes',$,
+(#513));
+#516= IFCRELDEFINESBYPROPERTIES('2aa46hBv59BgcNNNoUBzWj',#4,$,$,(#503),
+#514);
+#520= IFCTEXTSTYLEFORDEFINEDFONT(#521,$);
+#521= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#522= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.4));
+#523= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#525= IFCTEXTSTYLE($,#520,#522,#523);
+#526= IFCPLANAREXTENT(1940.,240.);
+#527= IFCTEXTLITERALWITHEXTENT(
+'Fund. d=30cm, UK= -0.90\X\0A+ 5cm Magerbeton (UK= -0.95)',#530,.LEFT.,
+#526,'top-left');
+#528= IFCDIRECTION((6.123233995736766E-17,1.));
+#530= IFCAXIS2PLACEMENT2D(#531,#528);
+#531= IFCCARTESIANPOINT((102125.,10580.0048305961));
+#533= IFCLOCALPLACEMENT($,#1);
+#534= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#527));
+#536= IFCPRODUCTDEFINITIONSHAPE($,$,(#534));
+#539= IFCANNOTATION('3lY44_kqLCe8clUPigWJGq',#4,$,$,$,#533,#536);
+#543= IFCPRESENTATIONSTYLEASSIGNMENT((#525));
+#545= IFCSTYLEDITEM(#527,(#543),$);
+#549= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--20'),$);
+#550= IFCPROPERTYSET('3sEcLsxhbBxvdeNjd$pL_G',#4,'Allplan Attributes',$,
+(#549));
+#552= IFCRELDEFINESBYPROPERTIES('3C3rVp6OD9KR1GpTt9tktT',#4,$,$,(#539),
+#550);
+#556= IFCTEXTSTYLEFORDEFINEDFONT(#557,$);
+#557= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#558= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.4));
+#559= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#561= IFCTEXTSTYLE($,#556,#558,#559);
+#562= IFCPLANAREXTENT(1940.,240.);
+#563= IFCTEXTLITERALWITHEXTENT(
+'Fund. d=30cm, UK= -0.90\X\0A+ 5cm Magerbeton (UK= -0.95)',#566,.LEFT.,
+#562,'top-left');
+#564= IFCDIRECTION((6.123233995736766E-17,1.));
+#566= IFCAXIS2PLACEMENT2D(#567,#564);
+#567= IFCCARTESIANPOINT((64198.33333333334,21420.0048305961));
+#569= IFCLOCALPLACEMENT($,#1);
+#570= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#563));
+#572= IFCPRODUCTDEFINITIONSHAPE($,$,(#570));
+#575= IFCANNOTATION('0d7LpTrQjA4fC2mKdyjYrh',#4,$,$,$,#569,#572);
+#579= IFCPRESENTATIONSTYLEASSIGNMENT((#561));
+#581= IFCSTYLEDITEM(#563,(#579),$);
+#585= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--21'),$);
+#586= IFCPROPERTYSET('19OXv0s6v1MO3t0P9gl8bE',#4,'Allplan Attributes',$,
+(#585));
+#588= IFCRELDEFINESBYPROPERTIES('0ede$3YV11u8lGfzDfRdXx',#4,$,$,(#575),
+#586);
+#592= IFCTEXTSTYLEFORDEFINEDFONT(#593,$);
+#593= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#594= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.4));
+#595= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#597= IFCTEXTSTYLE($,#592,#594,#595);
+#598= IFCPLANAREXTENT(1940.,240.);
+#599= IFCTEXTLITERALWITHEXTENT(
+'Fund. d=30cm, UK= -0.90\X\0A+ 5cm Magerbeton (UK= -0.95)',#602,.LEFT.,
+#598,'top-left');
+#600= IFCDIRECTION((6.123233995736766E-17,1.));
+#602= IFCAXIS2PLACEMENT2D(#603,#600);
+#603= IFCCARTESIANPOINT((64198.33333333333,10580.0048305961));
+#605= IFCLOCALPLACEMENT($,#1);
+#606= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#599));
+#608= IFCPRODUCTDEFINITIONSHAPE($,$,(#606));
+#611= IFCANNOTATION('2xP$CiJ$50kQpKK14ghAQh',#4,$,$,$,#605,#608);
+#615= IFCPRESENTATIONSTYLEASSIGNMENT((#597));
+#617= IFCSTYLEDITEM(#599,(#615),$);
+#621= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--22'),$);
+#622= IFCPROPERTYSET('1ATCT3RJv799hufvAg3T$8',#4,'Allplan Attributes',$,
+(#621));
+#624= IFCRELDEFINESBYPROPERTIES('2iQfJxhxz5Xv2VSU8lMiv6',#4,$,$,(#611),
+#622);
+#628= IFCTEXTSTYLEFORDEFINEDFONT(#629,$);
+#629= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#630= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#631= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#633= IFCTEXTSTYLE($,#628,#630,#631);
+#634= IFCTEXTLITERAL('W1',#637,.LEFT.);
+#635= IFCDIRECTION((1.,0.));
+#637= IFCAXIS2PLACEMENT2D(#638,#635);
+#638= IFCCARTESIANPOINT((69220.30189202847,24391.04263252323));
+#640= IFCLOCALPLACEMENT($,#1);
+#641= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#634));
+#643= IFCPRODUCTDEFINITIONSHAPE($,$,(#641));
+#646= IFCANNOTATION('2e79dZF7D2cfmQipbe7Pcp',#4,$,$,$,#640,#643);
+#649= IFCCURVESTYLE($,#653,IFCPOSITIVELENGTHMEASURE(100.),#654);
+#650= IFCCURVESTYLEFONT($,(#652));
+#652= IFCCURVESTYLEFONTPATTERN(0.2,1.);
+#653= IFCCURVESTYLEFONTANDSCALING($,#650,100.);
+#654= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#655= IFCPRESENTATIONLAYERWITHSTYLE('Schnittbeschriftung',$,(#641,#634,
+#685,#678,#756,#749,#791,#784,#1001,#994,#1036,#1029,#1071,#1064,#1106,
+#1099,#1141,#1134,#1176,#1169,#1211,#1204,#1246,#1239,#1281,#1274,#1316,
+#1309,#1351,#1344,#1386,#1379,#1421,#1414,#1456,#1449,#1491,#1484,#1526,
+#1519,#1561,#1554,#1596,#1589,#1631,#1624,#1666,#1659,#1701,#1694,#1736,
+#1729,#1771,#1764,#1806,#1799,#1841,#1834,#1876,#1869,#1911,#1904,#1946,
+#1939,#2087,#2080,#2621,#2614,#2726,#2719,#3327,#3320,#3362,#3355,#3432,
+#3425,#3467,#3460,#3502,#3495,#3537,#3530,#3572,#3565,#3607,#3600,#3642,
+#3635,#3677,#3670,#3712,#3705,#3747,#3740,#3782,#3775,#3817,#3810,#3852,
+#3845,#4387,#4380,#4422,#4415,#4457,#4450,#4737,#4730,#4772,#4765,#4807,
+#4800,#4842,#4835,#4877,#4870,#4912,#4905,#4947,#4940,#4982,#4975,#5017,
+#5010,#5052,#5045,#5087,#5080,#5122,#5115,#5262,#5255,#5297,#5290,#5579,
+#5572,#6351,#6344,#6386,#6379,#6457,#6450,#6492,#6485,#6702,#6695,#6737,
+#6730,#6772,#6765,#6807,#6800,#6842,#6835,#6877,#6870,#6912,#6905,#6947,
+#6940,#6982,#6975,#7017,#7010,#7052,#7045,#7087,#7080,#7122,#7115,#7157,
+#7150,#7192,#7185,#7227,#7220,#7262,#7255,#7297,#7290,#7332,#7325,#7367,
+#7360,#7402,#7395,#7437,#7430,#7472,#7465,#7507,#7500,#7542,#7535,#7577,
+#7570,#7612,#7605,#7647,#7640,#7788,#7781,#8322,#8315,#8427,#8420,#9028,
+#9021,#9063,#9056,#9133,#9126,#9168,#9161,#9203,#9196,#9238,#9231,#9273,
+#9266,#9308,#9301,#9343,#9336,#9378,#9371,#9413,#9406,#9448,#9441,#9483,
+#9476,#9518,#9511,#9553,#9546,#10088,#10081,#10123,#10116,#10158,#10151,
+#10438,#10431,#10473,#10466,#10508,#10501,#10543,#10536,#10578,#10571,
+#10613,#10606,#10648,#10641,#10683,#10676,#10718,#10711,#10753,#10746,
+#10788,#10781,#10823,#10816,#10963,#10956,#10998,#10991,#11280,#11273,
+#12292,#12285,#12327,#12320,#12398,#12391,#12433,#12426,#12643,#12636,
+#12678,#12671,#12713,#12706,#12748,#12741,#12783,#12776,#12818,#12811,
+#12853,#12846,#12888,#12881,#12923,#12916,#12958,#12951,#12993,#12986,
+#13028,#13021,#13063,#13056,#13098,#13091,#13133,#13126,#13168,#13161,
+#13203,#13196,#13238,#13231,#13273,#13266,#13308,#13301,#13343,#13336,
+#13378,#13371,#13413,#13406,#13448,#13441,#13483,#13476,#13518,#13511,
+#13553,#13546,#13588,#13581,#13729,#13722,#14263,#14256,#14368,#14361,
+#14969,#14962,#15004,#14997,#15074,#15067,#15109,#15102,#15144,#15137,
+#15179,#15172,#15214,#15207,#15249,#15242,#15284,#15277,#15319,#15312,
+#15354,#15347,#15389,#15382,#15424,#15417,#15459,#15452,#15494,#15487,
+#16029,#16022,#16064,#16057,#16099,#16092,#16379,#16372,#16414,#16407,
+#16449,#16442,#16484,#16477,#16519,#16512,#16554,#16547,#16589,#16582,
+#16624,#16617,#16659,#16652,#16694,#16687,#16729,#16722,#16764,#16757,
+#16904,#16897,#16939,#16932,#17221,#17214,#17362,#17355,#17963,#17956,
+#17998,#17991,#18068,#18061,#18103,#18096,#18138,#18131,#18173,#18166,
+#18208,#18201,#18243,#18236,#18278,#18271,#18313,#18306,#18348,#18341,
+#18383,#18376,#18418,#18411,#18453,#18446,#18488,#18481,#19023,#19016,
+#19058,#19051),'TX_SCHNITT',.T.,.U.,.F.,(#649));
+#659= IFCPRESENTATIONSTYLEASSIGNMENT((#633));
+#661= IFCSTYLEDITEM(#634,(#659),$);
+#665= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--41'),$);
+#666= IFCPROPERTYSET('2ua7v1SeD029vxa61WYViA',#4,'Allplan Attributes',$,
+(#665));
+#668= IFCRELDEFINESBYPROPERTIES('2jUjQsHFv6cOGmL3DZv$hx',#4,$,$,(#646),
+#666);
+#672= IFCTEXTSTYLEFORDEFINEDFONT(#673,$);
+#673= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#674= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#675= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#677= IFCTEXTSTYLE($,#672,#674,#675);
+#678= IFCTEXTLITERAL('W1',#681,.LEFT.);
+#679= IFCDIRECTION((1.,0.));
+#681= IFCAXIS2PLACEMENT2D(#682,#679);
+#682= IFCCARTESIANPOINT((96673.30189202845,24391.04263252323));
+#684= IFCLOCALPLACEMENT($,#1);
+#685= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#678));
+#687= IFCPRODUCTDEFINITIONSHAPE($,$,(#685));
+#690= IFCANNOTATION('2PX_0OnCr72AGPQddzzemm',#4,$,$,$,#684,#687);
+#694= IFCPRESENTATIONSTYLEASSIGNMENT((#677));
+#696= IFCSTYLEDITEM(#678,(#694),$);
+#700= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--84'),$);
+#701= IFCPROPERTYSET('1EvSnhyFH9chztfoRfbati',#4,'Allplan Attributes',$,
+(#700));
+#703= IFCRELDEFINESBYPROPERTIES('0szqepZwLFWOLN3yfaFwFZ',#4,$,$,(#690),
+#701);
+#707= IFCTEXTSTYLEFORDEFINEDFONT(#708,$);
+#708= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#709= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.4));
+#710= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#712= IFCTEXTSTYLE($,#707,#709,#710);
+#713= IFCPLANAREXTENT(1940.,240.);
+#714= IFCTEXTLITERALWITHEXTENT(
+'Fund. d=30cm, UK= -0.90\X\0A+ 5cm Magerbeton (UK= -0.95)',#717,.LEFT.,
+#713,'top-left');
+#715= IFCDIRECTION((6.123233995736766E-17,1.));
+#717= IFCAXIS2PLACEMENT2D(#718,#715);
+#718= IFCCARTESIANPOINT((102125.,20920.0048305961));
+#720= IFCLOCALPLACEMENT($,#1);
+#721= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#714));
+#723= IFCPRODUCTDEFINITIONSHAPE($,$,(#721));
+#726= IFCANNOTATION('0kFHLnoTD9mg6B3hF1ufym',#4,$,$,$,#720,#723);
+#730= IFCPRESENTATIONSTYLEASSIGNMENT((#712));
+#732= IFCSTYLEDITEM(#714,(#730),$);
+#736= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--91'),$);
+#737= IFCPROPERTYSET('0BEjFhZBn1XQw91btH8JrA',#4,'Allplan Attributes',$,
+(#736));
+#739= IFCRELDEFINESBYPROPERTIES('3wh2LV8AfB5fcfdLOUht20',#4,$,$,(#726),
+#737);
+#743= IFCTEXTSTYLEFORDEFINEDFONT(#744,$);
+#744= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#745= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#746= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#748= IFCTEXTSTYLE($,#743,#745,#746);
+#749= IFCTEXTLITERAL('A',#752,.LEFT.);
+#750= IFCDIRECTION((1.,0.));
+#752= IFCAXIS2PLACEMENT2D(#753,#750);
+#753= IFCCARTESIANPOINT((85952.9040210247,23151.85649857375));
+#755= IFCLOCALPLACEMENT($,#1);
+#756= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#749));
+#758= IFCPRODUCTDEFINITIONSHAPE($,$,(#756));
+#761= IFCANNOTATION('2nBYpwREnEs9Ct9yyRs95d',#4,$,$,$,#755,#758);
+#765= IFCPRESENTATIONSTYLEASSIGNMENT((#748));
+#767= IFCSTYLEDITEM(#749,(#765),$);
+#771= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--309'),$);
+#772= IFCPROPERTYSET('18uigHmbP3guDIitI4c0s1',#4,'Allplan Attributes',$,
+(#771));
+#774= IFCRELDEFINESBYPROPERTIES('3XOnq99e58APH6V282HMNP',#4,$,$,(#761),
+#772);
+#778= IFCTEXTSTYLEFORDEFINEDFONT(#779,$);
+#779= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#780= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#781= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#783= IFCTEXTSTYLE($,#778,#780,#781);
+#784= IFCTEXTLITERAL('A',#787,.LEFT.);
+#785= IFCDIRECTION((1.,0.));
+#787= IFCAXIS2PLACEMENT2D(#788,#785);
+#788= IFCCARTESIANPOINT((90153.76264563203,23151.85649857376));
+#790= IFCLOCALPLACEMENT($,#1);
+#791= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#784));
+#793= IFCPRODUCTDEFINITIONSHAPE($,$,(#791));
+#796= IFCANNOTATION('3nOyO5TFX7dPb1XA9TS548',#4,$,$,$,#790,#793);
+#800= IFCPRESENTATIONSTYLEASSIGNMENT((#783));
+#802= IFCSTYLEDITEM(#784,(#800),$);
+#806= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--321'),$);
+#807= IFCPROPERTYSET('06Xer$oZT4qgCxoJhQtw$F',#4,'Allplan Attributes',$,
+(#806));
+#809= IFCRELDEFINESBYPROPERTIES('28jqisJu5AbuNQgp1rgpOQ',#4,$,$,(#796),
+#807);
+#813= IFCTEXTSTYLEFORDEFINEDFONT(#814,$);
+#814= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#815= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#816= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(350.));
+#818= IFCTEXTSTYLE($,#813,#815,#816);
+#819= IFCTEXTLITERAL('d = 25cm',#822,.LEFT.);
+#820= IFCDIRECTION((0.9808262151348187,0.1948844162684801));
+#822= IFCAXIS2PLACEMENT2D(#823,#820);
+#823= IFCCARTESIANPOINT((83632.23966450329,25811.54350744394));
+#825= IFCLOCALPLACEMENT($,#1);
+#826= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#819));
+#828= IFCPRODUCTDEFINITIONSHAPE($,$,(#826));
+#831= IFCANNOTATION('3FGo_NJZ5B3OC$SP1Sf8ol',#4,$,$,$,#825,#828);
+#835= IFCPRESENTATIONSTYLEASSIGNMENT((#818));
+#837= IFCSTYLEDITEM(#819,(#835),$);
+#841= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--346'),$);
+#842= IFCPROPERTYSET('0OlYEpOufDoBBiTRi0hWCO',#4,'Allplan Attributes',$,
+(#841));
+#844= IFCRELDEFINESBYPROPERTIES('0kwoknZlb9KvxiBNyWCf8R',#4,$,$,(#831),
+#842);
+#848= IFCTEXTSTYLEFORDEFINEDFONT(#849,$);
+#849= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#850= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.6));
+#851= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(400.));
+#853= IFCTEXTSTYLE($,#848,#850,#851);
+#854= IFCTEXTLITERAL('%RAInnenwand%RE',#857,.LEFT.);
+#855= IFCDIRECTION((1.,0.));
+#857= IFCAXIS2PLACEMENT2D(#858,#855);
+#858= IFCCARTESIANPOINT((81476.47748645773,19978.59922698939));
+#860= IFCLOCALPLACEMENT($,#1);
+#861= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#854));
+#863= IFCPRODUCTDEFINITIONSHAPE($,$,(#861));
+#866= IFCANNOTATION('370nJdcWj3JRrVCe_Gcyjr',#4,$,$,$,#860,#863);
+#870= IFCPRESENTATIONSTYLEASSIGNMENT((#853));
+#872= IFCSTYLEDITEM(#854,(#870),$);
+#876= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--359'),$);
+#877= IFCPROPERTYSET('11Svpj1OfFRhex$rQdS09D',#4,'Allplan Attributes',$,
+(#876));
+#879= IFCRELDEFINESBYPROPERTIES('0eMGbKzvDCeuwGk8$o3WqU',#4,$,$,(#866),
+#877);
+#883= IFCTEXTSTYLEFORDEFINEDFONT(#884,$);
+#884= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#885= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.6));
+#886= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(400.));
+#888= IFCTEXTSTYLE($,#883,#885,#886);
+#889= IFCTEXTLITERAL('%RAInnenwand%RE',#892,.LEFT.);
+#890= IFCDIRECTION((1.,0.));
+#892= IFCAXIS2PLACEMENT2D(#893,#890);
+#893= IFCCARTESIANPOINT((88786.08045759043,19978.59922698939));
+#895= IFCLOCALPLACEMENT($,#1);
+#896= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#889));
+#898= IFCPRODUCTDEFINITIONSHAPE($,$,(#896));
+#901= IFCANNOTATION('1jZeZUusX53AqJf32$q_Zh',#4,$,$,$,#895,#898);
+#905= IFCPRESENTATIONSTYLEASSIGNMENT((#888));
+#907= IFCSTYLEDITEM(#889,(#905),$);
+#911= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--360'),$);
+#912= IFCPROPERTYSET('1IVEaB$tPEFetCqrnzYxi6',#4,'Allplan Attributes',$,
+(#911));
+#914= IFCRELDEFINESBYPROPERTIES('3NRyrZZnD0O8yERpWWzmdU',#4,$,$,(#901),
+#912);
+#918= IFCTEXTSTYLEFORDEFINEDFONT(#919,$);
+#919= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#920= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.6));
+#921= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(400.));
+#923= IFCTEXTSTYLE($,#918,#920,#921);
+#924= IFCTEXTLITERAL('%RAInnenwand%RE',#927,.LEFT.);
+#925= IFCDIRECTION((1.,0.));
+#927= IFCAXIS2PLACEMENT2D(#928,#925);
+#928= IFCCARTESIANPOINT((82643.04532805008,22606.98593803507));
+#930= IFCLOCALPLACEMENT($,#1);
+#931= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#924));
+#933= IFCPRODUCTDEFINITIONSHAPE($,$,(#931));
+#936= IFCANNOTATION('3KLSKkurj3AAZhlAXmVAOO',#4,$,$,$,#930,#933);
+#940= IFCPRESENTATIONSTYLEASSIGNMENT((#923));
+#942= IFCSTYLEDITEM(#924,(#940),$);
+#946= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--361'),$);
+#947= IFCPROPERTYSET('0wJ6p9Gwj1SROrdfxBTOy1',#4,'Allplan Attributes',$,
+(#946));
+#949= IFCRELDEFINESBYPROPERTIES('3mAyqfY_L91fw_xXfOn2$8',#4,$,$,(#936),
+#947);
+#953= IFCTEXTSTYLEFORDEFINEDFONT(#954,$);
+#954= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#955= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.6));
+#956= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(400.));
+#958= IFCTEXTSTYLE($,#953,#955,#956);
+#959= IFCTEXTLITERAL('%RAInnenwand%RE',#962,.LEFT.);
+#960= IFCDIRECTION((6.123233995736766E-17,1.));
+#962= IFCAXIS2PLACEMENT2D(#963,#960);
+#963= IFCCARTESIANPOINT((78974.34906165909,20578.3982692631));
+#965= IFCLOCALPLACEMENT($,#1);
+#966= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#959));
+#968= IFCPRODUCTDEFINITIONSHAPE($,$,(#966));
+#971= IFCANNOTATION('3rpXkGpVDF9xw5LMeNX1rh',#4,$,$,$,#965,#968);
+#975= IFCPRESENTATIONSTYLEASSIGNMENT((#958));
+#977= IFCSTYLEDITEM(#959,(#975),$);
+#981= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--362'),$);
+#982= IFCPROPERTYSET('3ATZz6DHHC5wV28e0h2Snp',#4,'Allplan Attributes',$,
+(#981));
+#984= IFCRELDEFINESBYPROPERTIES('1zc6dIb3X2v9bKS6bI6Gga',#4,$,$,(#971),
+#982);
+#988= IFCTEXTSTYLEFORDEFINEDFONT(#989,$);
+#989= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#990= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#991= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#993= IFCTEXTSTYLE($,#988,#990,#991);
+#994= IFCTEXTLITERAL('C',#997,.LEFT.);
+#995= IFCDIRECTION((6.123233995736766E-17,1.));
+#997= IFCAXIS2PLACEMENT2D(#998,#995);
+#998= IFCCARTESIANPOINT((90860.31738068213,22977.90885162081));
+#1000= IFCLOCALPLACEMENT($,#1);
+#1001= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#994));
+#1003= IFCPRODUCTDEFINITIONSHAPE($,$,(#1001));
+#1006= IFCANNOTATION('1wyVUrIE532vlIeIuUOScK',#4,$,$,$,#1000,#1003);
+#1010= IFCPRESENTATIONSTYLEASSIGNMENT((#993));
+#1012= IFCSTYLEDITEM(#994,(#1010),$);
+#1016= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--363'),$);
+#1017= IFCPROPERTYSET('1laImM4ujBruHhrecYV$A$',#4,'Allplan Attributes',$
+,(#1016));
+#1019= IFCRELDEFINESBYPROPERTIES('0R9eEV83T1ffXWSb47dY4N',#4,$,$,(#1006)
+,#1017);
+#1023= IFCTEXTSTYLEFORDEFINEDFONT(#1024,$);
+#1024= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#1025= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#1026= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#1028= IFCTEXTSTYLE($,#1023,#1025,#1026);
+#1029= IFCTEXTLITERAL('C',#1032,.LEFT.);
+#1030= IFCDIRECTION((6.123233995736766E-17,1.));
+#1032= IFCAXIS2PLACEMENT2D(#1033,#1030);
+#1033= IFCCARTESIANPOINT((90860.31738068222,25478.76747622812));
+#1035= IFCLOCALPLACEMENT($,#1);
+#1036= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#1029));
+#1038= IFCPRODUCTDEFINITIONSHAPE($,$,(#1036));
+#1041= IFCANNOTATION('2XpmBwN9LFeem7SaLmlG6S',#4,$,$,$,#1035,#1038);
+#1045= IFCPRESENTATIONSTYLEASSIGNMENT((#1028));
+#1047= IFCSTYLEDITEM(#1029,(#1045),$);
+#1051= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--364'),$);
+#1052= IFCPROPERTYSET('24OorrzZX29OxFrPCAFjqm',#4,'Allplan Attributes',$
+,(#1051));
+#1054= IFCRELDEFINESBYPROPERTIES('3XErzwB79AR9GQpWqTwzlX',#4,$,$,(#1041)
+,#1052);
+#1058= IFCTEXTSTYLEFORDEFINEDFONT(#1059,$);
+#1059= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#1060= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#1061= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#1063= IFCTEXTSTYLE($,#1058,#1060,#1061);
+#1064= IFCTEXTLITERAL('C',#1067,.LEFT.);
+#1065= IFCDIRECTION((6.123233995736766E-17,1.));
+#1067= IFCAXIS2PLACEMENT2D(#1068,#1065);
+#1068= IFCCARTESIANPOINT((76753.57873560388,22977.90885162081));
+#1070= IFCLOCALPLACEMENT($,#1);
+#1071= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#1064));
+#1073= IFCPRODUCTDEFINITIONSHAPE($,$,(#1071));
+#1076= IFCANNOTATION('3KCVKEuVT7$Al7OavoBEmJ',#4,$,$,$,#1070,#1073);
+#1080= IFCPRESENTATIONSTYLEASSIGNMENT((#1063));
+#1082= IFCSTYLEDITEM(#1064,(#1080),$);
+#1086= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--365'),$);
+#1087= IFCPROPERTYSET('0G_nRf2l99DgeggJUXev1l',#4,'Allplan Attributes',$
+,(#1086));
+#1089= IFCRELDEFINESBYPROPERTIES('2IAnjWQFP3j8RPJpvvSLdf',#4,$,$,(#1076)
+,#1087);
+#1093= IFCTEXTSTYLEFORDEFINEDFONT(#1094,$);
+#1094= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#1095= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#1096= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#1098= IFCTEXTSTYLE($,#1093,#1095,#1096);
+#1099= IFCTEXTLITERAL('C',#1102,.LEFT.);
+#1100= IFCDIRECTION((6.123233995736766E-17,1.));
+#1102= IFCAXIS2PLACEMENT2D(#1103,#1100);
+#1103= IFCCARTESIANPOINT((76753.57873560388,25478.76747622813));
+#1105= IFCLOCALPLACEMENT($,#1);
+#1106= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#1099));
+#1108= IFCPRODUCTDEFINITIONSHAPE($,$,(#1106));
+#1111= IFCANNOTATION('1CSWfhVyf35eX9bNVsRJNb',#4,$,$,$,#1105,#1108);
+#1115= IFCPRESENTATIONSTYLEASSIGNMENT((#1098));
+#1117= IFCSTYLEDITEM(#1099,(#1115),$);
+#1121= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--366'),$);
+#1122= IFCPROPERTYSET('2qTRRjGDXBagtfqORXdCOu',#4,'Allplan Attributes',$
+,(#1121));
+#1124= IFCRELDEFINESBYPROPERTIES('2zxLIhkJjFyuQnniA4WY8x',#4,$,$,(#1111)
+,#1122);
+#1128= IFCTEXTSTYLEFORDEFINEDFONT(#1129,$);
+#1129= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#1130= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#1131= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#1133= IFCTEXTSTYLE($,#1128,#1130,#1131);
+#1134= IFCTEXTLITERAL('D',#1137,.LEFT.);
+#1135= IFCDIRECTION((6.123233995736766E-17,1.));
+#1137= IFCAXIS2PLACEMENT2D(#1138,#1135);
+#1138= IFCCARTESIANPOINT((83296.74014217944,23227.9088516208));
+#1140= IFCLOCALPLACEMENT($,#1);
+#1141= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#1134));
+#1143= IFCPRODUCTDEFINITIONSHAPE($,$,(#1141));
+#1146= IFCANNOTATION('0uw3z5puH2rBwV0XsFrtos',#4,$,$,$,#1140,#1143);
+#1150= IFCPRESENTATIONSTYLEASSIGNMENT((#1133));
+#1152= IFCSTYLEDITEM(#1134,(#1150),$);
+#1156= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--367'),$);
+#1157= IFCPROPERTYSET('0ooPMMvpX5T9mxRl3Plydx',#4,'Allplan Attributes',$
+,(#1156));
+#1159= IFCRELDEFINESBYPROPERTIES('0bpuv3xxH0n8Fahbq3Ivi7',#4,$,$,(#1146)
+,#1157);
+#1163= IFCTEXTSTYLEFORDEFINEDFONT(#1164,$);
+#1164= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#1165= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#1166= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#1168= IFCTEXTSTYLE($,#1163,#1165,#1166);
+#1169= IFCTEXTLITERAL('D',#1172,.LEFT.);
+#1170= IFCDIRECTION((6.123233995736766E-17,1.));
+#1172= IFCAXIS2PLACEMENT2D(#1173,#1170);
+#1173= IFCCARTESIANPOINT((83296.74014217944,25478.76747622814));
+#1175= IFCLOCALPLACEMENT($,#1);
+#1176= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#1169));
+#1178= IFCPRODUCTDEFINITIONSHAPE($,$,(#1176));
+#1181= IFCANNOTATION('0uy_4rZtr8peTjh3mZEFPb',#4,$,$,$,#1175,#1178);
+#1185= IFCPRESENTATIONSTYLEASSIGNMENT((#1168));
+#1187= IFCSTYLEDITEM(#1169,(#1185),$);
+#1191= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--368'),$);
+#1192= IFCPROPERTYSET('0i$6$uwxn9FuBsR1kPxKPB',#4,'Allplan Attributes',$
+,(#1191));
+#1194= IFCRELDEFINESBYPROPERTIES('36eu8QCGX6SQ4qIR5dhhKG',#4,$,$,(#1181)
+,#1192);
+#1198= IFCTEXTSTYLEFORDEFINEDFONT(#1199,$);
+#1199= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#1200= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#1201= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#1203= IFCTEXTSTYLE($,#1198,#1200,#1201);
+#1204= IFCTEXTLITERAL('E',#1207,.LEFT.);
+#1205= IFCDIRECTION((6.123233995736766E-17,1.));
+#1207= IFCAXIS2PLACEMENT2D(#1208,#1205);
+#1208= IFCCARTESIANPOINT((80468.05826830864,25478.76747622814));
+#1210= IFCLOCALPLACEMENT($,#1);
+#1211= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#1204));
+#1213= IFCPRODUCTDEFINITIONSHAPE($,$,(#1211));
+#1216= IFCANNOTATION('10_ZQ0V5f0tgCQSrO7JLLo',#4,$,$,$,#1210,#1213);
+#1220= IFCPRESENTATIONSTYLEASSIGNMENT((#1203));
+#1222= IFCSTYLEDITEM(#1204,(#1220),$);
+#1226= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--369'),$);
+#1227= IFCPROPERTYSET('0cU5jFgrL7C9V9lCAF31NB',#4,'Allplan Attributes',$
+,(#1226));
+#1229= IFCRELDEFINESBYPROPERTIES('2LtDn2pij91Qth8Uv8Prtf',#4,$,$,(#1216)
+,#1227);
+#1233= IFCTEXTSTYLEFORDEFINEDFONT(#1234,$);
+#1234= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#1235= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#1236= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#1238= IFCTEXTSTYLE($,#1233,#1235,#1236);
+#1239= IFCTEXTLITERAL('E',#1242,.LEFT.);
+#1240= IFCDIRECTION((6.123233995736766E-17,1.));
+#1242= IFCAXIS2PLACEMENT2D(#1243,#1240);
+#1243= IFCCARTESIANPOINT((80468.05826830864,21332.9088516208));
+#1245= IFCLOCALPLACEMENT($,#1);
+#1246= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#1239));
+#1248= IFCPRODUCTDEFINITIONSHAPE($,$,(#1246));
+#1251= IFCANNOTATION('2wm2iY8lnCORtGsiV4vUuP',#4,$,$,$,#1245,#1248);
+#1255= IFCPRESENTATIONSTYLEASSIGNMENT((#1238));
+#1257= IFCSTYLEDITEM(#1239,(#1255),$);
+#1261= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--370'),$);
+#1262= IFCPROPERTYSET('2v1WzPlkXAmRxwLY4F1pRK',#4,'Allplan Attributes',$
+,(#1261));
+#1264= IFCRELDEFINESBYPROPERTIES('3Y3cL1iKb6YgD0BWrEbkv7',#4,$,$,(#1251)
+,#1262);
+#1268= IFCTEXTSTYLEFORDEFINEDFONT(#1269,$);
+#1269= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#1270= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#1271= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#1273= IFCTEXTSTYLE($,#1268,#1270,#1271);
+#1274= IFCTEXTLITERAL('F',#1277,.LEFT.);
+#1275= IFCDIRECTION((1.,0.));
+#1277= IFCAXIS2PLACEMENT2D(#1278,#1275);
+#1278= IFCCARTESIANPOINT((78332.9040210247,23164.44656228746));
+#1280= IFCLOCALPLACEMENT($,#1);
+#1281= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#1274));
+#1283= IFCPRODUCTDEFINITIONSHAPE($,$,(#1281));
+#1286= IFCANNOTATION('3oLJn$RRDDKuGAqUN7KBnA',#4,$,$,$,#1280,#1283);
+#1290= IFCPRESENTATIONSTYLEASSIGNMENT((#1273));
+#1292= IFCSTYLEDITEM(#1274,(#1290),$);
+#1296= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--371'),$);
+#1297= IFCPROPERTYSET('3bECOnlDzAlfsYUz1CuHp7',#4,'Allplan Attributes',$
+,(#1296));
+#1299= IFCRELDEFINESBYPROPERTIES('2HxCIRqzX2DApVrkMT3jKG',#4,$,$,(#1286)
+,#1297);
+#1303= IFCTEXTSTYLEFORDEFINEDFONT(#1304,$);
+#1304= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#1305= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#1306= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#1308= IFCTEXTSTYLE($,#1303,#1305,#1306);
+#1309= IFCTEXTLITERAL('F',#1312,.LEFT.);
+#1310= IFCDIRECTION((1.,0.));
+#1312= IFCAXIS2PLACEMENT2D(#1313,#1310);
+#1313= IFCCARTESIANPOINT((82553.76264563203,23164.44656228746));
+#1315= IFCLOCALPLACEMENT($,#1);
+#1316= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#1309));
+#1318= IFCPRODUCTDEFINITIONSHAPE($,$,(#1316));
+#1321= IFCANNOTATION('3NzuL$dFz6x8wFRN6KxuHf',#4,$,$,$,#1315,#1318);
+#1325= IFCPRESENTATIONSTYLEASSIGNMENT((#1308));
+#1327= IFCSTYLEDITEM(#1309,(#1325),$);
+#1331= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--372'),$);
+#1332= IFCPROPERTYSET('2sUCwV0zrA5QfsSJ_ge_Pu',#4,'Allplan Attributes',$
+,(#1331));
+#1334= IFCRELDEFINESBYPROPERTIES('0UJ4Qhoxr2IffFpZqYxlXE',#4,$,$,(#1321)
+,#1332);
+#1338= IFCTEXTSTYLEFORDEFINEDFONT(#1339,$);
+#1339= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#1340= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#1341= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#1343= IFCTEXTSTYLE($,#1338,#1340,#1341);
+#1344= IFCTEXTLITERAL('G',#1347,.LEFT.);
+#1345= IFCDIRECTION((1.,0.));
+#1347= IFCAXIS2PLACEMENT2D(#1348,#1345);
+#1348= IFCCARTESIANPOINT((83082.9040210247,21519.44656228746));
+#1350= IFCLOCALPLACEMENT($,#1);
+#1351= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#1344));
+#1353= IFCPRODUCTDEFINITIONSHAPE($,$,(#1351));
+#1356= IFCANNOTATION('1B0TyrI3z1Nv5izTc_J$Sj',#4,$,$,$,#1350,#1353);
+#1360= IFCPRESENTATIONSTYLEASSIGNMENT((#1343));
+#1362= IFCSTYLEDITEM(#1344,(#1360),$);
+#1366= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--373'),$);
+#1367= IFCPROPERTYSET('1J47a46AT17elW8PAo2KzF',#4,'Allplan Attributes',$
+,(#1366));
+#1369= IFCRELDEFINESBYPROPERTIES('1BU$z9jj51AvaXh5o0Cdes',#4,$,$,(#1356)
+,#1367);
+#1373= IFCTEXTSTYLEFORDEFINEDFONT(#1374,$);
+#1374= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#1375= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#1376= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#1378= IFCTEXTSTYLE($,#1373,#1375,#1376);
+#1379= IFCTEXTLITERAL('G',#1382,.LEFT.);
+#1380= IFCDIRECTION((1.,0.));
+#1382= IFCAXIS2PLACEMENT2D(#1383,#1380);
+#1383= IFCCARTESIANPOINT((85033.76264563203,21519.44656228747));
+#1385= IFCLOCALPLACEMENT($,#1);
+#1386= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#1379));
+#1388= IFCPRODUCTDEFINITIONSHAPE($,$,(#1386));
+#1391= IFCANNOTATION('0izsRL3jb8jx_MOlBlsrI1',#4,$,$,$,#1385,#1388);
+#1395= IFCPRESENTATIONSTYLEASSIGNMENT((#1378));
+#1397= IFCSTYLEDITEM(#1379,(#1395),$);
+#1401= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--374'),$);
+#1402= IFCPROPERTYSET('08R6i3ILTBdwLBc2a9D61h',#4,'Allplan Attributes',$
+,(#1401));
+#1404= IFCRELDEFINESBYPROPERTIES('2rGG4Wmdr7Fe0FTaCU3NlH',#4,$,$,(#1391)
+,#1402);
+#1408= IFCTEXTSTYLEFORDEFINEDFONT(#1409,$);
+#1409= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#1410= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#1411= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#1413= IFCTEXTSTYLE($,#1408,#1410,#1411);
+#1414= IFCTEXTLITERAL('f1',#1417,.LEFT.);
+#1415= IFCDIRECTION((1.,0.));
+#1417= IFCAXIS2PLACEMENT2D(#1418,#1415);
+#1418= IFCCARTESIANPOINT((63944.51335346072,16091.04263252323));
+#1420= IFCLOCALPLACEMENT($,#1);
+#1421= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#1414));
+#1423= IFCPRODUCTDEFINITIONSHAPE($,$,(#1421));
+#1426= IFCANNOTATION('1sqrSWKYXFcxspAKd9cyE1',#4,$,$,$,#1420,#1423);
+#1430= IFCPRESENTATIONSTYLEASSIGNMENT((#1413));
+#1432= IFCSTYLEDITEM(#1414,(#1430),$);
+#1436= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--400'),$);
+#1437= IFCPROPERTYSET('0oSoSXdLH0dQABP6rbNHEO',#4,'Allplan Attributes',$
+,(#1436));
+#1439= IFCRELDEFINESBYPROPERTIES('1L3tC15czFXR8blCx781wF',#4,$,$,(#1426)
+,#1437);
+#1443= IFCTEXTSTYLEFORDEFINEDFONT(#1444,$);
+#1444= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#1445= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#1446= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#1448= IFCTEXTSTYLE($,#1443,#1445,#1446);
+#1449= IFCTEXTLITERAL('f1',#1452,.LEFT.);
+#1450= IFCDIRECTION((1.,0.));
+#1452= IFCAXIS2PLACEMENT2D(#1453,#1450);
+#1453= IFCCARTESIANPOINT((102367.5048670323,23148.54263252323));
+#1455= IFCLOCALPLACEMENT($,#1);
+#1456= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#1449));
+#1458= IFCPRODUCTDEFINITIONSHAPE($,$,(#1456));
+#1461= IFCANNOTATION('0elj8itWb8BwNxkeYOyNz7',#4,$,$,$,#1455,#1458);
+#1465= IFCPRESENTATIONSTYLEASSIGNMENT((#1448));
+#1467= IFCSTYLEDITEM(#1449,(#1465),$);
+#1471= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--401'),$);
+#1472= IFCPROPERTYSET('2MEYf83xjFgRvsD9BbjIxA',#4,'Allplan Attributes',$
+,(#1471));
+#1474= IFCRELDEFINESBYPROPERTIES('3PF3fMxzr8r9TJkWiBaCwP',#4,$,$,(#1461)
+,#1472);
+#1478= IFCTEXTSTYLEFORDEFINEDFONT(#1479,$);
+#1479= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#1480= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#1481= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#1483= IFCTEXTSTYLE($,#1478,#1480,#1481);
+#1484= IFCTEXTLITERAL('F1',#1487,.LEFT.);
+#1485= IFCDIRECTION((1.,0.));
+#1487= IFCAXIS2PLACEMENT2D(#1488,#1485);
+#1488= IFCCARTESIANPOINT((96418.85940563989,17938.30953539124));
+#1490= IFCLOCALPLACEMENT($,#1);
+#1491= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#1484));
+#1493= IFCPRODUCTDEFINITIONSHAPE($,$,(#1491));
+#1496= IFCANNOTATION('2uR3_ppt985hNBnmtQN_UE',#4,$,$,$,#1490,#1493);
+#1500= IFCPRESENTATIONSTYLEASSIGNMENT((#1483));
+#1502= IFCSTYLEDITEM(#1484,(#1500),$);
+#1506= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--402'),$);
+#1507= IFCPROPERTYSET('2CSfDfYgj2JwzHAECRjp9j',#4,'Allplan Attributes',$
+,(#1506));
+#1509= IFCRELDEFINESBYPROPERTIES('1PRkEdQG117AAjq5H1RzFZ',#4,$,$,(#1496)
+,#1507);
+#1513= IFCTEXTSTYLEFORDEFINEDFONT(#1514,$);
+#1514= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#1515= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#1516= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#1518= IFCTEXTSTYLE($,#1513,#1515,#1516);
+#1519= IFCTEXTLITERAL('W2',#1522,.LEFT.);
+#1520= IFCDIRECTION((1.,0.));
+#1522= IFCAXIS2PLACEMENT2D(#1523,#1520);
+#1523= IFCCARTESIANPOINT((73557.80189202845,25631.04263252323));
+#1525= IFCLOCALPLACEMENT($,#1);
+#1526= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#1519));
+#1528= IFCPRODUCTDEFINITIONSHAPE($,$,(#1526));
+#1531= IFCANNOTATION('1TChvBSD1DKxxqTmbjcB4u',#4,$,$,$,#1525,#1528);
+#1535= IFCPRESENTATIONSTYLEASSIGNMENT((#1518));
+#1537= IFCSTYLEDITEM(#1519,(#1535),$);
+#1541= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--417'),$);
+#1542= IFCPROPERTYSET('08SHbVNifElf8Rre0gCggE',#4,'Allplan Attributes',$
+,(#1541));
+#1544= IFCRELDEFINESBYPROPERTIES('1$y9m3c4L8JvRaVE6K3wKF',#4,$,$,(#1531)
+,#1542);
+#1548= IFCTEXTSTYLEFORDEFINEDFONT(#1549,$);
+#1549= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#1550= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#1551= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#1553= IFCTEXTSTYLE($,#1548,#1550,#1551);
+#1554= IFCTEXTLITERAL('W2',#1557,.LEFT.);
+#1555= IFCDIRECTION((1.,0.));
+#1557= IFCAXIS2PLACEMENT2D(#1558,#1555);
+#1558= IFCCARTESIANPOINT((82840.80189202845,27671.04263252323));
+#1560= IFCLOCALPLACEMENT($,#1);
+#1561= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#1554));
+#1563= IFCPRODUCTDEFINITIONSHAPE($,$,(#1561));
+#1566= IFCANNOTATION('0EykIFaZ9BKedrs9rfnOQ1',#4,$,$,$,#1560,#1563);
+#1570= IFCPRESENTATIONSTYLEASSIGNMENT((#1553));
+#1572= IFCSTYLEDITEM(#1554,(#1570),$);
+#1576= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--418'),$);
+#1577= IFCPROPERTYSET('2Oh6PR6T5CohRsKjKh8aPI',#4,'Allplan Attributes',$
+,(#1576));
+#1579= IFCRELDEFINESBYPROPERTIES('0wY1Hqu3X6QeWIuJFM_D3s',#4,$,$,(#1566)
+,#1577);
+#1583= IFCTEXTSTYLEFORDEFINEDFONT(#1584,$);
+#1584= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#1585= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#1586= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#1588= IFCTEXTSTYLE($,#1583,#1585,#1586);
+#1589= IFCTEXTLITERAL('W2',#1592,.LEFT.);
+#1590= IFCDIRECTION((1.,0.));
+#1592= IFCAXIS2PLACEMENT2D(#1593,#1590);
+#1593= IFCCARTESIANPOINT((92123.80189202847,25631.04263252323));
+#1595= IFCLOCALPLACEMENT($,#1);
+#1596= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#1589));
+#1598= IFCPRODUCTDEFINITIONSHAPE($,$,(#1596));
+#1601= IFCANNOTATION('3ADF5qXvX2YxbD8v7yrrbn',#4,$,$,$,#1595,#1598);
+#1605= IFCPRESENTATIONSTYLEASSIGNMENT((#1588));
+#1607= IFCSTYLEDITEM(#1589,(#1605),$);
+#1611= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--419'),$);
+#1612= IFCPROPERTYSET('27Fx69whP99QV69fzxJBv6',#4,'Allplan Attributes',$
+,(#1611));
+#1614= IFCRELDEFINESBYPROPERTIES('3XLrP4frz8HuzUgMDg656x',#4,$,$,(#1601)
+,#1612);
+#1618= IFCTEXTSTYLEFORDEFINEDFONT(#1619,$);
+#1619= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#1620= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#1621= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#1623= IFCTEXTSTYLE($,#1618,#1620,#1621);
+#1624= IFCTEXTLITERAL('f2',#1627,.LEFT.);
+#1625= IFCDIRECTION((1.,0.));
+#1627= IFCAXIS2PLACEMENT2D(#1628,#1625);
+#1628= IFCCARTESIANPOINT((78350.00486703226,7551.042632523229));
+#1630= IFCLOCALPLACEMENT($,#1);
+#1631= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#1624));
+#1633= IFCPRODUCTDEFINITIONSHAPE($,$,(#1631));
+#1636= IFCANNOTATION('3MOitousfA1fdxS$VFAS40',#4,$,$,$,#1630,#1633);
+#1640= IFCPRESENTATIONSTYLEASSIGNMENT((#1623));
+#1642= IFCSTYLEDITEM(#1624,(#1640),$);
+#1646= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--487'),$);
+#1647= IFCPROPERTYSET('29OO9YJlf0n9VjbJS7xoyI',#4,'Allplan Attributes',$
+,(#1646));
+#1649= IFCRELDEFINESBYPROPERTIES('0Q3O$H8O97rfOazDvKncnQ',#4,$,$,(#1636)
+,#1647);
+#1653= IFCTEXTSTYLEFORDEFINEDFONT(#1654,$);
+#1654= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#1655= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#1656= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#1658= IFCTEXTSTYLE($,#1653,#1655,#1656);
+#1659= IFCTEXTLITERAL('f3',#1662,.LEFT.);
+#1660= IFCDIRECTION((1.,0.));
+#1662= IFCAXIS2PLACEMENT2D(#1663,#1660);
+#1663= IFCCARTESIANPOINT((93993.5098230476,7551.042632523229));
+#1665= IFCLOCALPLACEMENT($,#1);
+#1666= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#1659));
+#1668= IFCPRODUCTDEFINITIONSHAPE($,$,(#1666));
+#1671= IFCANNOTATION('2JUNXE29X97QP07JlKE2RX',#4,$,$,$,#1665,#1668);
+#1675= IFCPRESENTATIONSTYLEASSIGNMENT((#1658));
+#1677= IFCSTYLEDITEM(#1659,(#1675),$);
+#1681= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--488'),$);
+#1682= IFCPROPERTYSET('1VQzORoInCQR79_jFX438_',#4,'Allplan Attributes',$
+,(#1681));
+#1684= IFCRELDEFINESBYPROPERTIES('2Non8FI5rE4BUW_KXAtrOB',#4,$,$,(#1671)
+,#1682);
+#1688= IFCTEXTSTYLEFORDEFINEDFONT(#1689,$);
+#1689= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#1690= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#1691= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#1693= IFCTEXTSTYLE($,#1688,#1690,#1691);
+#1694= IFCTEXTLITERAL('f4',#1697,.LEFT.);
+#1695= IFCDIRECTION((1.,0.));
+#1697= IFCAXIS2PLACEMENT2D(#1698,#1695);
+#1698= IFCCARTESIANPOINT((98812.22799894086,7551.042632523229));
+#1700= IFCLOCALPLACEMENT($,#1);
+#1701= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#1694));
+#1703= IFCPRODUCTDEFINITIONSHAPE($,$,(#1701));
+#1706= IFCANNOTATION('2xw76Gmw95uQsTZX5cb3U1',#4,$,$,$,#1700,#1703);
+#1710= IFCPRESENTATIONSTYLEASSIGNMENT((#1693));
+#1712= IFCSTYLEDITEM(#1694,(#1710),$);
+#1716= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--489'),$);
+#1717= IFCPROPERTYSET('1Ymcq86urBeRjELzsy2gi4',#4,'Allplan Attributes',$
+,(#1716));
+#1719= IFCRELDEFINESBYPROPERTIES('0IGk5dr59CUAPc2m3oHEeO',#4,$,$,(#1706)
+,#1717);
+#1723= IFCTEXTSTYLEFORDEFINEDFONT(#1724,$);
+#1724= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#1725= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#1726= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#1728= IFCTEXTSTYLE($,#1723,#1725,#1726);
+#1729= IFCTEXTLITERAL('f5',#1732,.LEFT.);
+#1730= IFCDIRECTION((1.,0.));
+#1732= IFCAXIS2PLACEMENT2D(#1733,#1730);
+#1733= IFCCARTESIANPOINT((102364.5133534607,15128.54263252323));
+#1735= IFCLOCALPLACEMENT($,#1);
+#1736= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#1729));
+#1738= IFCPRODUCTDEFINITIONSHAPE($,$,(#1736));
+#1741= IFCANNOTATION('3tVxY3Oi9AzQ0pY228WfFs',#4,$,$,$,#1735,#1738);
+#1745= IFCPRESENTATIONSTYLEASSIGNMENT((#1728));
+#1747= IFCSTYLEDITEM(#1729,(#1745),$);
+#1751= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--490'),$);
+#1752= IFCPROPERTYSET('0A6OwRRL5D$QqaFCevKZWm',#4,'Allplan Attributes',$
+,(#1751));
+#1754= IFCRELDEFINESBYPROPERTIES('34qguPZmnEofImS$ToAeGk',#4,$,$,(#1741)
+,#1752);
+#1758= IFCTEXTSTYLEFORDEFINEDFONT(#1759,$);
+#1759= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#1760= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#1761= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#1763= IFCTEXTSTYLE($,#1758,#1760,#1761);
+#1764= IFCTEXTLITERAL('f6',#1767,.LEFT.);
+#1765= IFCDIRECTION((1.,0.));
+#1767= IFCAXIS2PLACEMENT2D(#1768,#1765);
+#1768= IFCCARTESIANPOINT((79088.46093109454,15126.04263252324));
+#1770= IFCLOCALPLACEMENT($,#1);
+#1771= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#1764));
+#1773= IFCPRODUCTDEFINITIONSHAPE($,$,(#1771));
+#1776= IFCANNOTATION('2UT35o4Tz3FREAhq82vMkK',#4,$,$,$,#1770,#1773);
+#1780= IFCPRESENTATIONSTYLEASSIGNMENT((#1763));
+#1782= IFCSTYLEDITEM(#1764,(#1780),$);
+#1786= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--491'),$);
+#1787= IFCPROPERTYSET('2ab19wYYD7zPg5XmLLj7ij',#4,'Allplan Attributes',$
+,(#1786));
+#1789= IFCRELDEFINESBYPROPERTIES('2uVJgtR998ZPsb2dPQveme',#4,$,$,(#1776)
+,#1787);
+#1793= IFCTEXTSTYLEFORDEFINEDFONT(#1794,$);
+#1794= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#1795= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#1796= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#1798= IFCTEXTSTYLE($,#1793,#1795,#1796);
+#1799= IFCTEXTLITERAL('f7',#1802,.LEFT.);
+#1800= IFCDIRECTION((1.,0.));
+#1802= IFCAXIS2PLACEMENT2D(#1803,#1800);
+#1803= IFCCARTESIANPOINT((90227.54729917461,12438.54263252323));
+#1805= IFCLOCALPLACEMENT($,#1);
+#1806= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#1799));
+#1808= IFCPRODUCTDEFINITIONSHAPE($,$,(#1806));
+#1811= IFCANNOTATION('1PLkoT7N51lwDzHs1JsiOG',#4,$,$,$,#1805,#1808);
+#1815= IFCPRESENTATIONSTYLEASSIGNMENT((#1798));
+#1817= IFCSTYLEDITEM(#1799,(#1815),$);
+#1821= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--492'),$);
+#1822= IFCPROPERTYSET('3$UcCPZLL0sxr8TFxkCM0c',#4,'Allplan Attributes',$
+,(#1821));
+#1824= IFCRELDEFINESBYPROPERTIES('1aA$Qbn4zENQF5rQ7uhBSz',#4,$,$,(#1811)
+,#1822);
+#1828= IFCTEXTSTYLEFORDEFINEDFONT(#1829,$);
+#1829= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#1830= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#1831= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#1833= IFCTEXTSTYLE($,#1828,#1830,#1831);
+#1834= IFCTEXTLITERAL('f8',#1837,.LEFT.);
+#1835= IFCDIRECTION((1.,0.));
+#1837= IFCAXIS2PLACEMENT2D(#1838,#1835);
+#1838= IFCCARTESIANPOINT((96930.44389119459,12513.54263252323));
+#1840= IFCLOCALPLACEMENT($,#1);
+#1841= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#1834));
+#1843= IFCPRODUCTDEFINITIONSHAPE($,$,(#1841));
+#1846= IFCANNOTATION('35G63McJj9t9Ce696ZBCGF',#4,$,$,$,#1840,#1843);
+#1850= IFCPRESENTATIONSTYLEASSIGNMENT((#1833));
+#1852= IFCSTYLEDITEM(#1834,(#1850),$);
+#1856= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--493'),$);
+#1857= IFCPROPERTYSET('2BO8wAdrn87ObeZmF3NRZ4',#4,'Allplan Attributes',$
+,(#1856));
+#1859= IFCRELDEFINESBYPROPERTIES('0VWAAXvQzDwergfTkiI$19',#4,$,$,(#1846)
+,#1857);
+#1863= IFCTEXTSTYLEFORDEFINEDFONT(#1864,$);
+#1864= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#1865= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#1866= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#1868= IFCTEXTSTYLE($,#1863,#1865,#1866);
+#1869= IFCTEXTLITERAL('f9',#1872,.LEFT.);
+#1870= IFCDIRECTION((1.,0.));
+#1872= IFCAXIS2PLACEMENT2D(#1873,#1870);
+#1873= IFCCARTESIANPOINT((96915.96093109452,21621.04263252323));
+#1875= IFCLOCALPLACEMENT($,#1);
+#1876= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#1869));
+#1878= IFCPRODUCTDEFINITIONSHAPE($,$,(#1876));
+#1881= IFCANNOTATION('3JAt5_p6r4WeMblfEq8GCU',#4,$,$,$,#1875,#1878);
+#1885= IFCPRESENTATIONSTYLEASSIGNMENT((#1868));
+#1887= IFCSTYLEDITEM(#1869,(#1885),$);
+#1891= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--494'),$);
+#1892= IFCPROPERTYSET('0aXnQVoKX8xP4BS2K2FscV',#4,'Allplan Attributes',$
+,(#1891));
+#1894= IFCRELDEFINESBYPROPERTIES('39wWTUOmzFoukNawX2lcQ0',#4,$,$,(#1881)
+,#1892);
+#1898= IFCTEXTSTYLEFORDEFINEDFONT(#1899,$);
+#1899= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#1900= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#1901= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#1903= IFCTEXTSTYLE($,#1898,#1900,#1901);
+#1904= IFCTEXTLITERAL('B',#1907,.LEFT.);
+#1905= IFCDIRECTION((6.123233995736766E-17,1.));
+#1907= IFCAXIS2PLACEMENT2D(#1908,#1905);
+#1908= IFCCARTESIANPOINT((88169.24186625176,20927.9088516208));
+#1910= IFCLOCALPLACEMENT($,#1);
+#1911= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#1904));
+#1913= IFCPRODUCTDEFINITIONSHAPE($,$,(#1911));
+#1916= IFCANNOTATION('0OedVXP6H4Nuqn9hByMx_J',#4,$,$,$,#1910,#1913);
+#1920= IFCPRESENTATIONSTYLEASSIGNMENT((#1903));
+#1922= IFCSTYLEDITEM(#1904,(#1920),$);
+#1926= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--518'),$);
+#1927= IFCPROPERTYSET('3nNrICgYb9Ge12RErq1D4R',#4,'Allplan Attributes',$
+,(#1926));
+#1929= IFCRELDEFINESBYPROPERTIES('1Q7Wrr_FT5SPIUDcpE$aZx',#4,$,$,(#1916)
+,#1927);
+#1933= IFCTEXTSTYLEFORDEFINEDFONT(#1934,$);
+#1934= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#1935= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#1936= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#1938= IFCTEXTSTYLE($,#1933,#1935,#1936);
+#1939= IFCTEXTLITERAL('B',#1942,.LEFT.);
+#1940= IFCDIRECTION((6.123233995736766E-17,1.));
+#1942= IFCAXIS2PLACEMENT2D(#1943,#1940);
+#1943= IFCCARTESIANPOINT((88169.24186625176,25478.76747622812));
+#1945= IFCLOCALPLACEMENT($,#1);
+#1946= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#1939));
+#1948= IFCPRODUCTDEFINITIONSHAPE($,$,(#1946));
+#1951= IFCANNOTATION('3DpViWI9v5GuP566B__qDO',#4,$,$,$,#1945,#1948);
+#1955= IFCPRESENTATIONSTYLEASSIGNMENT((#1938));
+#1957= IFCSTYLEDITEM(#1939,(#1955),$);
+#1961= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--519'),$);
+#1962= IFCPROPERTYSET('2Tj_0DlD5E4BBpZeEuJjlj',#4,'Allplan Attributes',$
+,(#1961));
+#1964= IFCRELDEFINESBYPROPERTIES('0omb2kQH9FsODmftUZNbDQ',#4,$,$,(#1951)
+,#1962);
+#1968= IFCTEXTSTYLEFORDEFINEDFONT(#1969,$);
+#1969= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#1970= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.6));
+#1971= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(400.));
+#1973= IFCTEXTSTYLE($,#1968,#1970,#1971);
+#1974= IFCTEXTLITERAL('%RAInnenwand%RE',#1977,.LEFT.);
+#1975= IFCDIRECTION((6.123233995736766E-17,1.));
+#1977= IFCAXIS2PLACEMENT2D(#1978,#1975);
+#1978= IFCCARTESIANPOINT((87665.84948349507,20590.58940828774));
+#1980= IFCLOCALPLACEMENT($,#1);
+#1981= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#1974));
+#1983= IFCPRODUCTDEFINITIONSHAPE($,$,(#1981));
+#1986= IFCANNOTATION('0_pTU_4kX4pxkNIzZXrBuK',#4,$,$,$,#1980,#1983);
+#1990= IFCPRESENTATIONSTYLEASSIGNMENT((#1973));
+#1992= IFCSTYLEDITEM(#1974,(#1990),$);
+#1996= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--520'),$);
+#1997= IFCPROPERTYSET('3U3oOYrrn9s9QRg7QK93sJ',#4,'Allplan Attributes',$
+,(#1996));
+#1999= IFCRELDEFINESBYPROPERTIES('2Tl91CatP29AtiKVJUTsbg',#4,$,$,(#1986)
+,#1997);
+#2003= IFCTEXTSTYLEFORDEFINEDFONT(#2004,$);
+#2004= IFCCOLOURRGB($,0.4392156862745098,0.4392156862745098,1.);
+#2005= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.5));
+#2006= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(250.));
+#2008= IFCTEXTSTYLE($,#2003,#2005,#2006);
+#2009= IFCPLANAREXTENT(4979.166666666672,312.5);
+#2010= IFCTEXTLITERALWITHEXTENT(
+'unter Fundamente mit Sickerbeton 32/45mm CEM 200 kg/m\X2\00B3\X0\\X\0Aoder Magerbeton CEM 200 kg/m\X2\00B3\X0\ bis auf Kiesschicht fundieren !'
+,#2013,.LEFT.,#2009,'top-left');
+#2011= IFCDIRECTION((1.,0.));
+#2013= IFCAXIS2PLACEMENT2D(#2014,#2011);
+#2014= IFCCARTESIANPOINT((79040.90503321811,12115.36635853764));
+#2016= IFCLOCALPLACEMENT($,#1);
+#2017= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#2010));
+#2019= IFCPRODUCTDEFINITIONSHAPE($,$,(#2017));
+#2022= IFCANNOTATION('1snKDYOvzDV9I4rXUXfX1c',#4,$,$,$,#2016,#2019);
+#2026= IFCPRESENTATIONSTYLEASSIGNMENT((#2008));
+#2028= IFCSTYLEDITEM(#2010,(#2026),$);
+#2032= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--530'),$);
+#2033= IFCPROPERTYSET('0Ed82rE$X8JBU$xduzgJ2m',#4,'Allplan Attributes',$
+,(#2032));
+#2035= IFCRELDEFINESBYPROPERTIES('3kEMdAS3HFvQ_h79tVqdCB',#4,$,$,(#2022)
+,#2033);
+#2039= IFCTEXTSTYLEFORDEFINEDFONT(#2040,$);
+#2040= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#2041= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#2042= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#2044= IFCTEXTSTYLE($,#2039,#2041,#2042);
+#2045= IFCTEXTLITERAL('Einlage 15x25cm',#2048,.LEFT.);
+#2046= IFCDIRECTION((1.,0.));
+#2048= IFCAXIS2PLACEMENT2D(#2049,#2046);
+#2049= IFCCARTESIANPOINT((94135.,8666.671497262763));
+#2051= IFCLOCALPLACEMENT($,#1);
+#2052= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#2045));
+#2054= IFCPRODUCTDEFINITIONSHAPE($,$,(#2052));
+#2057= IFCANNOTATION('3O9FsUeObEaOPB6kiDdQR5',#4,$,$,$,#2051,#2054);
+#2061= IFCPRESENTATIONSTYLEASSIGNMENT((#2044));
+#2063= IFCSTYLEDITEM(#2045,(#2061),$);
+#2067= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--557'),$);
+#2068= IFCPROPERTYSET('0fBlcRIBHCAORgkmiD$JtD',#4,'Allplan Attributes',$
+,(#2067));
+#2070= IFCRELDEFINESBYPROPERTIES('27SXZUuVPEte75U9gMmE5Z',#4,$,$,(#2057)
+,#2068);
+#2074= IFCTEXTSTYLEFORDEFINEDFONT(#2075,$);
+#2075= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#2076= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#2077= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#2079= IFCTEXTSTYLE($,#2074,#2076,#2077);
+#2080= IFCTEXTLITERAL('Grundriss  1:50',#2083,.LEFT.);
+#2081= IFCDIRECTION((1.,0.));
+#2083= IFCAXIS2PLACEMENT2D(#2084,#2081);
+#2084= IFCCARTESIANPOINT((83279.7373736969,30147.25334708006));
+#2086= IFCLOCALPLACEMENT($,#1);
+#2087= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#2080));
+#2089= IFCPRODUCTDEFINITIONSHAPE($,$,(#2087));
+#2092= IFCANNOTATION('1hmX2YK7HAn9yNv5JCqsl5',#4,$,$,$,#2086,#2089);
+#2096= IFCPRESENTATIONSTYLEASSIGNMENT((#2079));
+#2098= IFCSTYLEDITEM(#2080,(#2096),$);
+#2102= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--562'),$);
+#2103= IFCPROPERTYSET('2Kna1td5HCYuAkHALkLSQl',#4,'Allplan Attributes',$
+,(#2102));
+#2105= IFCRELDEFINESBYPROPERTIES('0lP_MS_1D9yvkd$qRf8GwO',#4,$,$,(#2092)
+,#2103);
+#2109= IFCTEXTSTYLEFORDEFINEDFONT(#2110,$);
+#2110= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#2111= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#2112= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#2114= IFCTEXTSTYLE($,#2109,#2111,#2112);
+#2115= IFCTEXTLITERAL('Arbeitsfuge mit Quellfugenband !',#2118,.LEFT.);
+#2116= IFCDIRECTION((6.123233995736766E-17,1.));
+#2118= IFCAXIS2PLACEMENT2D(#2119,#2116);
+#2119= IFCCARTESIANPOINT((77728.33333333336,11056.97175194527));
+#2121= IFCLOCALPLACEMENT($,#1);
+#2122= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#2115));
+#2124= IFCPRODUCTDEFINITIONSHAPE($,$,(#2122));
+#2127= IFCANNOTATION('05rQmZAULCsBaoPltzOEAL',#4,$,$,$,#2121,#2124);
+#2131= IFCPRESENTATIONSTYLEASSIGNMENT((#2114));
+#2133= IFCSTYLEDITEM(#2115,(#2131),$);
+#2137= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--564'),$);
+#2138= IFCPROPERTYSET('2lHbZ8iBT5TQFZG4Y4zApt',#4,'Allplan Attributes',$
+,(#2137));
+#2140= IFCRELDEFINESBYPROPERTIES('0g7eQH_E95FB07Mox$L1Tj',#4,$,$,(#2127)
+,#2138);
+#2144= IFCTEXTSTYLEFORDEFINEDFONT(#2145,$);
+#2145= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#2146= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#2147= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#2149= IFCTEXTSTYLE($,#2144,#2146,#2147);
+#2150= IFCTEXTLITERAL('Arbeitsfuge mit Quellfugenband !',#2153,.LEFT.);
+#2151= IFCDIRECTION((6.123233995736766E-17,1.));
+#2153= IFCAXIS2PLACEMENT2D(#2154,#2151);
+#2154= IFCCARTESIANPOINT((77728.33333333336,21266.51780159047));
+#2156= IFCLOCALPLACEMENT($,#1);
+#2157= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#2150));
+#2159= IFCPRODUCTDEFINITIONSHAPE($,$,(#2157));
+#2162= IFCANNOTATION('0iyUVuRDLC5OU1Fg72Zhj8',#4,$,$,$,#2156,#2159);
+#2166= IFCPRESENTATIONSTYLEASSIGNMENT((#2149));
+#2168= IFCSTYLEDITEM(#2150,(#2166),$);
+#2172= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--565'),$);
+#2173= IFCPROPERTYSET('0cKpMaW2j9y8Jd_ecZw3sQ',#4,'Allplan Attributes',$
+,(#2172));
+#2175= IFCRELDEFINESBYPROPERTIES('3PySApMQ55BemcF$osOgwN',#4,$,$,(#2162)
+,#2173);
+#2179= IFCTEXTSTYLEFORDEFINEDFONT(#2180,$);
+#2180= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#2181= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.5));
+#2182= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(300.));
+#2184= IFCTEXTSTYLE($,#2179,#2181,#2182);
+#2185= IFCPLANAREXTENT(2910.000000000003,825.0000000000168);
+#2186= IFCTEXTLITERALWITHEXTENT(
+'OK= -0.07, UK= -0.32\X\0A+ 20cm D\X2\00E4\X0\mmung (UK= -0.52)\X\0A+ 2cm Splitt (UK= -0.54)\X\0A+ 5cm Magerbeton (UK= -0.59)'
+,#2189,.LEFT.,#2185,'top-left');
+#2187= IFCDIRECTION((0.9808262151348185,0.1948844162684815));
+#2189= IFCAXIS2PLACEMENT2D(#2190,#2187);
+#2190= IFCCARTESIANPOINT((83653.51454661261,25704.46997895839));
+#2192= IFCLOCALPLACEMENT($,#1);
+#2193= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#2186));
+#2195= IFCPRODUCTDEFINITIONSHAPE($,$,(#2193));
+#2198= IFCANNOTATION('13PBo2Yo14jejb661QP3B9',#4,$,$,$,#2192,#2195);
+#2202= IFCPRESENTATIONSTYLEASSIGNMENT((#2184));
+#2204= IFCSTYLEDITEM(#2186,(#2202),$);
+#2208= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--566'),$);
+#2209= IFCPROPERTYSET('1seVRLfk92vA7XELI4BC1d',#4,'Allplan Attributes',$
+,(#2208));
+#2211= IFCRELDEFINESBYPROPERTIES('3eWuP6AkH6iBKOJUseJ6aQ',#4,$,$,(#2198)
+,#2209);
+#2215= IFCTEXTSTYLEFORDEFINEDFONT(#2216,$);
+#2216= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#2217= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.5));
+#2218= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(250.));
+#2220= IFCTEXTSTYLE($,#2215,#2217,#2218);
+#2221= IFCPLANAREXTENT(1940.000000000009,687.4999999999822);
+#2222= IFCTEXTLITERALWITHEXTENT(
+'OK= -1.13, UK= -1.38\X\0A+ 20cm D\X2\00E4\X0\mmung (UK= -1.58)\X\0A+ 2cm Splitt (UK= -1.60)\X\0A+ 5cm Magerbeton (UK= -1.65)'
+,#2225,.LEFT.,#2221,'top-left');
+#2223= IFCDIRECTION((0.7310552682428722,0.6823182503600077));
+#2225= IFCAXIS2PLACEMENT2D(#2226,#2223);
+#2226= IFCCARTESIANPOINT((87546.77173638951,22437.02940657125));
+#2228= IFCLOCALPLACEMENT($,#1);
+#2229= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#2222));
+#2231= IFCPRODUCTDEFINITIONSHAPE($,$,(#2229));
+#2234= IFCANNOTATION('068YlOnz12ggLaQkNUFrxR',#4,$,$,$,#2228,#2231);
+#2238= IFCPRESENTATIONSTYLEASSIGNMENT((#2220));
+#2240= IFCSTYLEDITEM(#2222,(#2238),$);
+#2244= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--567'),$);
+#2245= IFCPROPERTYSET('3VVTWyRqL5uBMnLBFDpE7S',#4,'Allplan Attributes',$
+,(#2244));
+#2247= IFCRELDEFINESBYPROPERTIES('24Zkn_X2L3LvOvU9rqKzWy',#4,$,$,(#2234)
+,#2245);
+#2251= IFCTEXTSTYLEFORDEFINEDFONT(#2252,$);
+#2252= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#2253= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#2254= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(350.));
+#2256= IFCTEXTSTYLE($,#2251,#2253,#2254);
+#2257= IFCTEXTLITERAL('d = 25cm',#2260,.LEFT.);
+#2258= IFCDIRECTION((0.9216166900860996,0.3881013740696396));
+#2260= IFCAXIS2PLACEMENT2D(#2261,#2258);
+#2261= IFCCARTESIANPOINT((77891.256051316,14098.27303360807));
+#2263= IFCLOCALPLACEMENT($,#1);
+#2264= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#2257));
+#2266= IFCPRODUCTDEFINITIONSHAPE($,$,(#2264));
+#2269= IFCANNOTATION('3LidovBjXBJws5DyZ2A$sC',#4,$,$,$,#2263,#2266);
+#2273= IFCPRESENTATIONSTYLEASSIGNMENT((#2256));
+#2275= IFCSTYLEDITEM(#2257,(#2273),$);
+#2279= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--568'),$);
+#2280= IFCPROPERTYSET('1QI7tp$Iz7d8rh6hkjf8yA',#4,'Allplan Attributes',$
+,(#2279));
+#2282= IFCRELDEFINESBYPROPERTIES('1Jwjd8haD5khwzANR9ijIQ',#4,$,$,(#2269)
+,#2280);
+#2286= IFCTEXTSTYLEFORDEFINEDFONT(#2287,$);
+#2287= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#2288= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.5));
+#2289= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(300.));
+#2291= IFCTEXTSTYLE($,#2286,#2288,#2289);
+#2292= IFCPLANAREXTENT(2910.000000000046,824.9999999999975);
+#2293= IFCTEXTLITERALWITHEXTENT(
+'OK= -0.14, UK= -0.39\X\0A+ 20cm D\X2\00E4\X0\mmung (UK= -0.59)\X\0A+ 2cm Splitt (UK= -0.61)\X\0A+ 5cm Magerbeton (UK= -0.66)'
+,#2296,.LEFT.,#2292,'top-left');
+#2294= IFCDIRECTION((0.9216166900860947,0.3881013740696512));
+#2296= IFCAXIS2PLACEMENT2D(#2297,#2294);
+#2297= IFCCARTESIANPOINT((77933.62378465194,13997.66321160699));
+#2299= IFCLOCALPLACEMENT($,#1);
+#2300= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#2293));
+#2302= IFCPRODUCTDEFINITIONSHAPE($,$,(#2300));
+#2305= IFCANNOTATION('3oFtFA1sXEmerSR$Sp4pZf',#4,$,$,$,#2299,#2302);
+#2309= IFCPRESENTATIONSTYLEASSIGNMENT((#2291));
+#2311= IFCSTYLEDITEM(#2293,(#2309),$);
+#2315= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--569'),$);
+#2316= IFCPROPERTYSET('3hpyaY3jHC0RrFhhxZbf9U',#4,'Allplan Attributes',$
+,(#2315));
+#2318= IFCRELDEFINESBYPROPERTIES('1vCyhRix58QOJvvXyU3OEE',#4,$,$,(#2305)
+,#2316);
+#2322= IFCTEXTSTYLEFORDEFINEDFONT(#2323,$);
+#2323= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#2324= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.4));
+#2325= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#2327= IFCTEXTSTYLE($,#2322,#2324,#2325);
+#2328= IFCPLANAREXTENT(1940.,520.0000000000091);
+#2329= IFCTEXTLITERALWITHEXTENT(
+'Fund. d=35cm, UK= -0.74\X\0A+ 20cm D\X2\00E4\X0\mmung (UK= -0.94)\X\0A+ 2cm Splitt (UK= -0.96)\X\0A+ 5cm Magerbeton (UK= -1.01)'
+,#2332,.LEFT.,#2328,'top-left');
+#2330= IFCDIRECTION((1.,0.));
+#2332= IFCAXIS2PLACEMENT2D(#2333,#2330);
+#2333= IFCCARTESIANPOINT((67575.,16411.67149726277));
+#2335= IFCLOCALPLACEMENT($,#1);
+#2336= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#2329));
+#2338= IFCPRODUCTDEFINITIONSHAPE($,$,(#2336));
+#2341= IFCANNOTATION('2jmYZjNobEsPuA29WHXs6q',#4,$,$,$,#2335,#2338);
+#2345= IFCPRESENTATIONSTYLEASSIGNMENT((#2327));
+#2347= IFCSTYLEDITEM(#2329,(#2345),$);
+#2351= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--570'),$);
+#2352= IFCPROPERTYSET('3k7JUSPoj8O8mMbOYtfuW7',#4,'Allplan Attributes',$
+,(#2351));
+#2354= IFCRELDEFINESBYPROPERTIES('3UlKAn1OH5sOGspsZVYXt2',#4,$,$,(#2341)
+,#2352);
+#2358= IFCTEXTSTYLEFORDEFINEDFONT(#2359,$);
+#2359= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#2360= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.4));
+#2361= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#2363= IFCTEXTSTYLE($,#2358,#2360,#2361);
+#2364= IFCPLANAREXTENT(1940.,520.);
+#2365= IFCTEXTLITERALWITHEXTENT(
+'Fund. d=35cm, UK= -0.74\X\0A+ 20cm D\X2\00E4\X0\mmung (UK= -0.94)\X\0A+ 2cm Splitt (UK= -0.96)\X\0A+ 5cm Magerbeton (UK= -1.01)'
+,#2368,.LEFT.,#2364,'top-left');
+#2366= IFCDIRECTION((1.,0.));
+#2368= IFCAXIS2PLACEMENT2D(#2369,#2366);
+#2369= IFCCARTESIANPOINT((86373.12561100708,16411.67149726277));
+#2371= IFCLOCALPLACEMENT($,#1);
+#2372= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#2365));
+#2374= IFCPRODUCTDEFINITIONSHAPE($,$,(#2372));
+#2377= IFCANNOTATION('2WDbv7SwbCgRtZRRbPOsTE',#4,$,$,$,#2371,#2374);
+#2381= IFCPRESENTATIONSTYLEASSIGNMENT((#2363));
+#2383= IFCSTYLEDITEM(#2365,(#2381),$);
+#2387= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--571'),$);
+#2388= IFCPROPERTYSET('0nv8SxH0PAeAEw5lT7Nhj1',#4,'Allplan Attributes',$
+,(#2387));
+#2390= IFCRELDEFINESBYPROPERTIES('3Xdkkm3RjClu_959BqUjf7',#4,$,$,(#2377)
+,#2388);
+#2394= IFCTEXTSTYLEFORDEFINEDFONT(#2395,$);
+#2395= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#2396= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.4));
+#2397= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#2399= IFCTEXTSTYLE($,#2394,#2396,#2397);
+#2400= IFCPLANAREXTENT(1940.,520.);
+#2401= IFCTEXTLITERALWITHEXTENT(
+'Fund. d=15cm, UK= -0.54\X\0A+ 20cm D\X2\00E4\X0\mmung (UK= -0.74)\X\0A+ 2cm Splitt (UK= -0.76)\X\0A+ 5cm Magerbeton (UK= -0.81)'
+,#2404,.LEFT.,#2400,'top-left');
+#2402= IFCDIRECTION((6.123233995736766E-17,1.));
+#2404= IFCAXIS2PLACEMENT2D(#2405,#2402);
+#2405= IFCCARTESIANPOINT((91000.00000000003,11496.20276121365));
+#2407= IFCLOCALPLACEMENT($,#1);
+#2408= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#2401));
+#2410= IFCPRODUCTDEFINITIONSHAPE($,$,(#2408));
+#2413= IFCANNOTATION('2RdUw_vgb2pAFnTVYj8coM',#4,$,$,$,#2407,#2410);
+#2417= IFCPRESENTATIONSTYLEASSIGNMENT((#2399));
+#2419= IFCSTYLEDITEM(#2401,(#2417),$);
+#2423= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--572'),$);
+#2424= IFCPROPERTYSET('3XVrfqcdH3RfXF2h6dIq1O',#4,'Allplan Attributes',$
+,(#2423));
+#2426= IFCRELDEFINESBYPROPERTIES('1hHTokWoPArf3MSXNi9_nq',#4,$,$,(#2413)
+,#2424);
+#2430= IFCTEXTSTYLEFORDEFINEDFONT(#2431,$);
+#2431= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#2432= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.4));
+#2433= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#2435= IFCTEXTSTYLE($,#2430,#2432,#2433);
+#2436= IFCPLANAREXTENT(1940.,520.);
+#2437= IFCTEXTLITERALWITHEXTENT(
+'Fund. d=15cm, UK= -0.54\X\0A+ 20cm D\X2\00E4\X0\mmung (UK= -0.74)\X\0A+ 2cm Splitt (UK= -0.76)\X\0A+ 5cm Magerbeton (UK= -0.81)'
+,#2440,.LEFT.,#2436,'top-left');
+#2438= IFCDIRECTION((6.123233995736766E-17,1.));
+#2440= IFCAXIS2PLACEMENT2D(#2441,#2438);
+#2441= IFCCARTESIANPOINT((95005.,11269.79426336781));
+#2443= IFCLOCALPLACEMENT($,#1);
+#2444= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#2437));
+#2446= IFCPRODUCTDEFINITIONSHAPE($,$,(#2444));
+#2449= IFCANNOTATION('2EgU4Jvwv7B8gPEvq7Z6Tg',#4,$,$,$,#2443,#2446);
+#2453= IFCPRESENTATIONSTYLEASSIGNMENT((#2435));
+#2455= IFCSTYLEDITEM(#2437,(#2453),$);
+#2459= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--573'),$);
+#2460= IFCPROPERTYSET('3kVSAcPyrEpP5SpqeP$Phx',#4,'Allplan Attributes',$
+,(#2459));
+#2462= IFCRELDEFINESBYPROPERTIES('0cISIZdPf9$O_vJ93ThYwu',#4,$,$,(#2449)
+,#2460);
+#2466= IFCTEXTSTYLEFORDEFINEDFONT(#2467,$);
+#2467= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#2468= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.4));
+#2469= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#2471= IFCTEXTSTYLE($,#2466,#2468,#2469);
+#2472= IFCPLANAREXTENT(1940.,520.0000000000073);
+#2473= IFCTEXTLITERALWITHEXTENT(
+'Fund. d=35cm, UK= -0.74\X\0A+ 20cm D\X2\00E4\X0\mmung (UK= -0.94)\X\0A+ 2cm Splitt (UK= -0.96)\X\0A+ 5cm Magerbeton (UK= -1.01)'
+,#2476,.LEFT.,#2472,'top-left');
+#2474= IFCDIRECTION((1.,0.));
+#2476= IFCAXIS2PLACEMENT2D(#2477,#2474);
+#2477= IFCCARTESIANPOINT((94985.,16561.67149726277));
+#2479= IFCLOCALPLACEMENT($,#1);
+#2480= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#2473));
+#2482= IFCPRODUCTDEFINITIONSHAPE($,$,(#2480));
+#2485= IFCANNOTATION('1DonUjv1LAGQAaRno72SgU',#4,$,$,$,#2479,#2482);
+#2489= IFCPRESENTATIONSTYLEASSIGNMENT((#2471));
+#2491= IFCSTYLEDITEM(#2473,(#2489),$);
+#2495= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--574'),$);
+#2496= IFCPROPERTYSET('2gT0Rx8WP2RRkkGjVE4tVb',#4,'Allplan Attributes',$
+,(#2495));
+#2498= IFCRELDEFINESBYPROPERTIES('2ESHvpgkD688IV2iQerhqz',#4,$,$,(#2485)
+,#2496);
+#2502= IFCTEXTSTYLEFORDEFINEDFONT(#2503,$);
+#2503= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#2504= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.4));
+#2505= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#2507= IFCTEXTSTYLE($,#2502,#2504,#2505);
+#2508= IFCPLANAREXTENT(1940.,520.);
+#2509= IFCTEXTLITERALWITHEXTENT(
+'Fund. d=15cm, UK= -0.54\X\0A+ 20cm D\X2\00E4\X0\mmung (UK= -0.74)\X\0A+ 2cm Splitt (UK= -0.76)\X\0A+ 5cm Magerbeton (UK= -0.81)'
+,#2512,.LEFT.,#2508,'top-left');
+#2510= IFCDIRECTION((6.123233995736766E-17,1.));
+#2512= IFCAXIS2PLACEMENT2D(#2513,#2510);
+#2513= IFCCARTESIANPOINT((95005.,20592.11878411506));
+#2515= IFCLOCALPLACEMENT($,#1);
+#2516= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#2509));
+#2518= IFCPRODUCTDEFINITIONSHAPE($,$,(#2516));
+#2521= IFCANNOTATION('0F4kN3mcHCZvXNXxb1wH7n',#4,$,$,$,#2515,#2518);
+#2525= IFCPRESENTATIONSTYLEASSIGNMENT((#2507));
+#2527= IFCSTYLEDITEM(#2509,(#2525),$);
+#2531= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--575'),$);
+#2532= IFCPROPERTYSET('3b24I9HUP1KeQC$m4ifTK9',#4,'Allplan Attributes',$
+,(#2531));
+#2534= IFCRELDEFINESBYPROPERTIES('1GvmgMEEj6cvZaofTaCu9O',#4,$,$,(#2521)
+,#2532);
+#2538= IFCTEXTSTYLEFORDEFINEDFONT(#2539,$);
+#2539= IFCDRAUGHTINGPREDEFINEDCOLOUR('blue');
+#2540= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.5));
+#2541= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#2543= IFCTEXTSTYLE($,#2538,#2540,#2541);
+#2544= IFCTEXTLITERAL('Quellfugenband',#2547,.LEFT.);
+#2545= IFCDIRECTION((1.,0.));
+#2547= IFCAXIS2PLACEMENT2D(#2548,#2545);
+#2548= IFCCARTESIANPOINT((64146.32312513622,-4831.286366342691));
+#2550= IFCLOCALPLACEMENT($,#1);
+#2551= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#2544));
+#2553= IFCPRODUCTDEFINITIONSHAPE($,$,(#2551));
+#2556= IFCANNOTATION('1aheTt00D4$xBX3mcDKB$j',#4,$,$,$,#2550,#2553);
+#2560= IFCPRESENTATIONSTYLEASSIGNMENT((#2543));
+#2562= IFCSTYLEDITEM(#2544,(#2560),$);
+#2566= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92da1-9f81-11e3-bfbc-7446a0b2bba9--4'),$);
+#2567= IFCPROPERTYSET('2VFLxiLvD4RO41$ldKy6iz',#4,'Allplan Attributes',$
+,(#2566));
+#2569= IFCRELDEFINESBYPROPERTIES('01_ZGHuUbF5vniJd8jiDVO',#4,$,$,(#2556)
+,#2567);
+#2573= IFCTEXTSTYLEFORDEFINEDFONT(#2574,$);
+#2574= IFCDRAUGHTINGPREDEFINEDCOLOUR('blue');
+#2575= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.5));
+#2576= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#2578= IFCTEXTSTYLE($,#2573,#2575,#2576);
+#2579= IFCTEXTLITERAL('Combiflex',#2582,.LEFT.);
+#2580= IFCDIRECTION((1.,0.));
+#2582= IFCAXIS2PLACEMENT2D(#2583,#2580);
+#2583= IFCCARTESIANPOINT((64427.57132664954,-5434.780956291281));
+#2585= IFCLOCALPLACEMENT($,#1);
+#2586= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#2579));
+#2588= IFCPRODUCTDEFINITIONSHAPE($,$,(#2586));
+#2591= IFCANNOTATION('2aiFhvvQD0dvyqlVYy7i1Z',#4,$,$,$,#2585,#2588);
+#2595= IFCPRESENTATIONSTYLEASSIGNMENT((#2578));
+#2597= IFCSTYLEDITEM(#2579,(#2595),$);
+#2601= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92da1-9f81-11e3-bfbc-7446a0b2bba9--7'),$);
+#2602= IFCPROPERTYSET('20lXnrjiz388xhqemtonzg',#4,'Allplan Attributes',$
+,(#2601));
+#2604= IFCRELDEFINESBYPROPERTIES('1dO4NPfAn3FuIrOVpoXsDG',#4,$,$,(#2591)
+,#2602);
+#2608= IFCTEXTSTYLEFORDEFINEDFONT(#2609,$);
+#2609= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#2610= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#2611= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#2613= IFCTEXTSTYLE($,#2608,#2610,#2611);
+#2614= IFCTEXTLITERAL('Schnitt A-A  1:20',#2617,.LEFT.);
+#2615= IFCDIRECTION((1.,0.));
+#2617= IFCAXIS2PLACEMENT2D(#2618,#2615);
+#2618= IFCCARTESIANPOINT((64928.65779311588,-4084.138528206891));
+#2620= IFCLOCALPLACEMENT($,#1);
+#2621= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#2614));
+#2623= IFCPRODUCTDEFINITIONSHAPE($,$,(#2621));
+#2626= IFCANNOTATION('1LcVNpM0HEsBtfIzF6$ELu',#4,$,$,$,#2620,#2623);
+#2630= IFCPRESENTATIONSTYLEASSIGNMENT((#2613));
+#2632= IFCSTYLEDITEM(#2614,(#2630),$);
+#2636= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92da1-9f81-11e3-bfbc-7446a0b2bba9--12'),$);
+#2637= IFCPROPERTYSET('2cKVVlFD52cBU52eYr_QQf',#4,'Allplan Attributes',$
+,(#2636));
+#2639= IFCRELDEFINESBYPROPERTIES('0dElvWh9j7MPpqVNpQ$og2',#4,$,$,(#2626)
+,#2637);
+#2643= IFCTEXTSTYLEFORDEFINEDFONT(#2644,$);
+#2644= IFCDRAUGHTINGPREDEFINEDCOLOUR('blue');
+#2645= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.5));
+#2646= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#2648= IFCTEXTSTYLE($,#2643,#2645,#2646);
+#2649= IFCTEXTLITERAL('Combiflex',#2652,.LEFT.);
+#2650= IFCDIRECTION((1.,0.));
+#2652= IFCAXIS2PLACEMENT2D(#2653,#2650);
+#2653= IFCCARTESIANPOINT((70931.8678860706,-5434.780956291281));
+#2655= IFCLOCALPLACEMENT($,#1);
+#2656= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#2649));
+#2658= IFCPRODUCTDEFINITIONSHAPE($,$,(#2656));
+#2661= IFCANNOTATION('0aD4PVQq58lfZeTy8nZZw1',#4,$,$,$,#2655,#2658);
+#2665= IFCPRESENTATIONSTYLEASSIGNMENT((#2648));
+#2667= IFCSTYLEDITEM(#2649,(#2665),$);
+#2671= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'b195b7c3-9fbb-11e3-bfbc-7446a0b2bba9--3'),$);
+#2672= IFCPROPERTYSET('1GdABkJJf79PPe1cY4bImk',#4,'Allplan Attributes',$
+,(#2671));
+#2674= IFCRELDEFINESBYPROPERTIES('19fu1kAI5APxwDkwwda6IO',#4,$,$,(#2661)
+,#2672);
+#2678= IFCTEXTSTYLEFORDEFINEDFONT(#2679,$);
+#2679= IFCDRAUGHTINGPREDEFINEDCOLOUR('blue');
+#2680= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.5));
+#2681= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#2683= IFCTEXTSTYLE($,#2678,#2680,#2681);
+#2684= IFCTEXTLITERAL('Quellfugenband',#2687,.LEFT.);
+#2685= IFCDIRECTION((1.,0.));
+#2687= IFCAXIS2PLACEMENT2D(#2688,#2685);
+#2688= IFCCARTESIANPOINT((70650.61968455727,-4831.286366342691));
+#2690= IFCLOCALPLACEMENT($,#1);
+#2691= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#2684));
+#2693= IFCPRODUCTDEFINITIONSHAPE($,$,(#2691));
+#2696= IFCANNOTATION('1yQIpI99n7wv1WKcDxLkwi',#4,$,$,$,#2690,#2693);
+#2700= IFCPRESENTATIONSTYLEASSIGNMENT((#2683));
+#2702= IFCSTYLEDITEM(#2684,(#2700),$);
+#2706= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'b195b7c3-9fbb-11e3-bfbc-7446a0b2bba9--6'),$);
+#2707= IFCPROPERTYSET('0Iw_D53tj4RP9XCpzVwsdo',#4,'Allplan Attributes',$
+,(#2706));
+#2709= IFCRELDEFINESBYPROPERTIES('368taPGPz9mPqv0$M6Jlfj',#4,$,$,(#2696)
+,#2707);
+#2713= IFCTEXTSTYLEFORDEFINEDFONT(#2714,$);
+#2714= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#2715= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#2716= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#2718= IFCTEXTSTYLE($,#2713,#2715,#2716);
+#2719= IFCTEXTLITERAL('Schnitt B-B  1:20',#2722,.LEFT.);
+#2720= IFCDIRECTION((1.,0.));
+#2722= IFCAXIS2PLACEMENT2D(#2723,#2720);
+#2723= IFCCARTESIANPOINT((71682.95435253697,-4084.138528206892));
+#2725= IFCLOCALPLACEMENT($,#1);
+#2726= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#2719));
+#2728= IFCPRODUCTDEFINITIONSHAPE($,$,(#2726));
+#2731= IFCANNOTATION('0Y11ofjtXEue4sPT2uhFZL',#4,$,$,$,#2725,#2728);
+#2735= IFCPRESENTATIONSTYLEASSIGNMENT((#2718));
+#2737= IFCSTYLEDITEM(#2719,(#2735),$);
+#2741= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'b195b7c3-9fbb-11e3-bfbc-7446a0b2bba9--18'),$);
+#2742= IFCPROPERTYSET('0COkia4Xb7WA4jPtcGgyZA',#4,'Allplan Attributes',$
+,(#2741));
+#2744= IFCRELDEFINESBYPROPERTIES('3Pdbj9h4n8YBpPUZByQe1z',#4,$,$,(#2731)
+,#2742);
+#2748= IFCTEXTSTYLEFORDEFINEDFONT(#2749,$);
+#2749= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#2750= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#2751= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(350.));
+#2753= IFCTEXTSTYLE($,#2748,#2750,#2751);
+#2754= IFCTEXTLITERAL('d = 25cm',#2757,.LEFT.);
+#2755= IFCDIRECTION((0.7310552682428758,0.6823182503600038));
+#2757= IFCAXIS2PLACEMENT2D(#2758,#2755);
+#2758= IFCCARTESIANPOINT((87738.90713147861,22755.42414823773));
+#2760= IFCLOCALPLACEMENT($,#1);
+#2761= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#2754));
+#2763= IFCPRODUCTDEFINITIONSHAPE($,$,(#2761));
+#2766= IFCANNOTATION('2b5woT5o91PuQcrRlMt1qf',#4,$,$,$,#2760,#2763);
+#2770= IFCPRESENTATIONSTYLEASSIGNMENT((#2753));
+#2772= IFCSTYLEDITEM(#2754,(#2770),$);
+#2776= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--8'),$);
+#2777= IFCPROPERTYSET('3euqvXJyTFCga3XRhLoGFB',#4,'Allplan Attributes',$
+,(#2776));
+#2779= IFCRELDEFINESBYPROPERTIES('3JzgHkOqrFpP13b2VkUbTZ',#4,$,$,(#2766)
+,#2777);
+#2783= IFCTEXTSTYLEFORDEFINEDFONT(#2784,$);
+#2784= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#2785= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#2786= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#2788= IFCTEXTSTYLE($,#2783,#2785,#2786);
+#2789= IFCTEXTLITERAL('Absatz OK Boden 7cm',#2792,.LEFT.);
+#2790= IFCDIRECTION((1.,0.));
+#2792= IFCAXIS2PLACEMENT2D(#2793,#2790);
+#2793= IFCCARTESIANPOINT((75981.541562714,23740.00483059611));
+#2795= IFCLOCALPLACEMENT($,#1);
+#2796= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#2789));
+#2798= IFCPRODUCTDEFINITIONSHAPE($,$,(#2796));
+#2801= IFCANNOTATION('0FZOK9N3L2$8_gmmH$mfV9',#4,$,$,$,#2795,#2798);
+#2805= IFCPRESENTATIONSTYLEASSIGNMENT((#2788));
+#2807= IFCSTYLEDITEM(#2789,(#2805),$);
+#2811= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--9'),$);
+#2812= IFCPROPERTYSET('2hW8Fq_vL9QvxC6zNfftJO',#4,'Allplan Attributes',$
+,(#2811));
+#2814= IFCRELDEFINESBYPROPERTIES('0CbPMeXszFZB_HV9DnJEs0',#4,$,$,(#2801)
+,#2812);
+#2818= IFCTEXTSTYLEFORDEFINEDFONT(#2819,$);
+#2819= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#2820= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#2821= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#2823= IFCTEXTSTYLE($,#2818,#2820,#2821);
+#2824= IFCTEXTLITERAL('Absatz UK Boden 7cm',#2827,.LEFT.);
+#2825= IFCDIRECTION((1.,0.));
+#2827= IFCAXIS2PLACEMENT2D(#2828,#2825);
+#2828= IFCCARTESIANPOINT((75977.80217074958,24656.67149726277));
+#2830= IFCLOCALPLACEMENT($,#1);
+#2831= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#2824));
+#2833= IFCPRODUCTDEFINITIONSHAPE($,$,(#2831));
+#2836= IFCANNOTATION('0iieeCVu111OQNuobyiXz_',#4,$,$,$,#2830,#2833);
+#2840= IFCPRESENTATIONSTYLEASSIGNMENT((#2823));
+#2842= IFCSTYLEDITEM(#2824,(#2840),$);
+#2846= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--10'),$);
+#2847= IFCPROPERTYSET('34$0pD6N58XupT5XN09JB7',#4,'Allplan Attributes',$
+,(#2846));
+#2849= IFCRELDEFINESBYPROPERTIES('3Mst9yvQH7VelVCgKdsFpS',#4,$,$,(#2836)
+,#2847);
+#2853= IFCTEXTSTYLEFORDEFINEDFONT(#2854,$);
+#2854= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#2855= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#2856= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#2858= IFCTEXTSTYLE($,#2853,#2855,#2856);
+#2859= IFCTEXTLITERAL('Absatz OK Boden 7cm',#2862,.LEFT.);
+#2860= IFCDIRECTION((6.123233995736766E-17,1.));
+#2862= IFCAXIS2PLACEMENT2D(#2863,#2860);
+#2863= IFCCARTESIANPOINT((79188.33333333333,22338.59690241592));
+#2865= IFCLOCALPLACEMENT($,#1);
+#2866= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#2859));
+#2868= IFCPRODUCTDEFINITIONSHAPE($,$,(#2866));
+#2871= IFCANNOTATION('3ODow5M4X9owY5YEUU_0q$',#4,$,$,$,#2865,#2868);
+#2875= IFCPRESENTATIONSTYLEASSIGNMENT((#2858));
+#2877= IFCSTYLEDITEM(#2859,(#2875),$);
+#2881= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--11'),$);
+#2882= IFCPROPERTYSET('1$4iinhC9DAQA8xG_u2s30',#4,'Allplan Attributes',$
+,(#2881));
+#2884= IFCRELDEFINESBYPROPERTIES('092weAxqrCN9ManE59k5Rm',#4,$,$,(#2871)
+,#2882);
+#2888= IFCTEXTSTYLEFORDEFINEDFONT(#2889,$);
+#2889= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#2890= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#2891= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#2893= IFCTEXTSTYLE($,#2888,#2890,#2891);
+#2894= IFCTEXTLITERAL('Absatz OK Boden 7cm',#2897,.LEFT.);
+#2895= IFCDIRECTION((1.,0.));
+#2897= IFCAXIS2PLACEMENT2D(#2898,#2895);
+#2898= IFCCARTESIANPOINT((79777.02674372181,22095.0048305961));
+#2900= IFCLOCALPLACEMENT($,#1);
+#2901= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#2894));
+#2903= IFCPRODUCTDEFINITIONSHAPE($,$,(#2901));
+#2906= IFCANNOTATION('0MwTeus_93TOKr2SYmfqDp',#4,$,$,$,#2900,#2903);
+#2910= IFCPRESENTATIONSTYLEASSIGNMENT((#2893));
+#2912= IFCSTYLEDITEM(#2894,(#2910),$);
+#2916= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--12'),$);
+#2917= IFCPROPERTYSET('12nXYfUnLCxueHHEChmNzP',#4,'Allplan Attributes',$
+,(#2916));
+#2919= IFCRELDEFINESBYPROPERTIES('3XPqHniU1AqBCNWUmvTOEc',#4,$,$,(#2906)
+,#2917);
+#2923= IFCTEXTSTYLEFORDEFINEDFONT(#2924,$);
+#2924= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#2925= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#2926= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#2928= IFCTEXTSTYLE($,#2923,#2925,#2926);
+#2929= IFCTEXTLITERAL('Absatz OK Boden 7cm',#2932,.LEFT.);
+#2930= IFCDIRECTION((6.123233995736766E-17,1.));
+#2932= IFCAXIS2PLACEMENT2D(#2933,#2930);
+#2933= IFCCARTESIANPOINT((82025.,22520.04762552151));
+#2935= IFCLOCALPLACEMENT($,#1);
+#2936= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#2929));
+#2938= IFCPRODUCTDEFINITIONSHAPE($,$,(#2936));
+#2941= IFCANNOTATION('3JRJWPKuj2LOgJY8uxpQ4y',#4,$,$,$,#2935,#2938);
+#2945= IFCPRESENTATIONSTYLEASSIGNMENT((#2928));
+#2947= IFCSTYLEDITEM(#2929,(#2945),$);
+#2951= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--13'),$);
+#2952= IFCPROPERTYSET('2OChJmekrAI94t1$h2QHK8',#4,'Allplan Attributes',$
+,(#2951));
+#2954= IFCRELDEFINESBYPROPERTIES('2yOnP7Hj1Dg87Xs62xeupT',#4,$,$,(#2941)
+,#2952);
+#2958= IFCTEXTSTYLEFORDEFINEDFONT(#2959,$);
+#2959= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#2960= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#2961= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#2963= IFCTEXTSTYLE($,#2958,#2960,#2961);
+#2964= IFCTEXTLITERAL('Absatz OK Boden 7cm',#2967,.LEFT.);
+#2965= IFCDIRECTION((1.,0.));
+#2967= IFCAXIS2PLACEMENT2D(#2968,#2965);
+#2968= IFCCARTESIANPOINT((82528.94870789858,23990.0048305961));
+#2970= IFCLOCALPLACEMENT($,#1);
+#2971= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#2964));
+#2973= IFCPRODUCTDEFINITIONSHAPE($,$,(#2971));
+#2976= IFCANNOTATION('3EZHFn4urAbxSansE$rYK5',#4,$,$,$,#2970,#2973);
+#2980= IFCPRESENTATIONSTYLEASSIGNMENT((#2963));
+#2982= IFCSTYLEDITEM(#2964,(#2980),$);
+#2986= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--14'),$);
+#2987= IFCPROPERTYSET('0UxkLljjH5xRAxvDGMwLor',#4,'Allplan Attributes',$
+,(#2986));
+#2989= IFCRELDEFINESBYPROPERTIES('1Wu3XfINj8Vh6kDCOSTSGB',#4,$,$,(#2976)
+,#2987);
+#2993= IFCTEXTSTYLEFORDEFINEDFONT(#2994,$);
+#2994= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#2995= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#2996= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#2998= IFCTEXTSTYLE($,#2993,#2995,#2996);
+#2999= IFCTEXTLITERAL('Absatz OK Boden 7cm',#3002,.LEFT.);
+#3000= IFCDIRECTION((1.,0.));
+#3002= IFCAXIS2PLACEMENT2D(#3003,#3000);
+#3003= IFCCARTESIANPOINT((85062.27633487518,23740.0048305961));
+#3005= IFCLOCALPLACEMENT($,#1);
+#3006= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#2999));
+#3008= IFCPRODUCTDEFINITIONSHAPE($,$,(#3006));
+#3011= IFCANNOTATION('3yf6jSg2DBcfYCu2hKUEjY',#4,$,$,$,#3005,#3008);
+#3015= IFCPRESENTATIONSTYLEASSIGNMENT((#2998));
+#3017= IFCSTYLEDITEM(#2999,(#3015),$);
+#3021= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--15'),$);
+#3022= IFCPROPERTYSET('3AeuUMtWr4jBhjHQat0MM1',#4,'Allplan Attributes',$
+,(#3021));
+#3024= IFCRELDEFINESBYPROPERTIES('1lpwGg5wz7uuyfx4xo9g91',#4,$,$,(#3011)
+,#3022);
+#3028= IFCTEXTSTYLEFORDEFINEDFONT(#3029,$);
+#3029= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#3030= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#3031= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#3033= IFCTEXTSTYLE($,#3028,#3030,#3031);
+#3034= IFCTEXTLITERAL('Absatz UK Boden 7cm',#3037,.LEFT.);
+#3035= IFCDIRECTION((1.,0.));
+#3037= IFCAXIS2PLACEMENT2D(#3038,#3035);
+#3038= IFCCARTESIANPOINT((87412.56598371331,24656.67149726277));
+#3040= IFCLOCALPLACEMENT($,#1);
+#3041= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#3034));
+#3043= IFCPRODUCTDEFINITIONSHAPE($,$,(#3041));
+#3046= IFCANNOTATION('11vXLmu0zBmRER4tqeln8E',#4,$,$,$,#3040,#3043);
+#3050= IFCPRESENTATIONSTYLEASSIGNMENT((#3033));
+#3052= IFCSTYLEDITEM(#3034,(#3050),$);
+#3056= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--16'),$);
+#3057= IFCPROPERTYSET('01aeVfMgr10PtyCmkMS2ZK',#4,'Allplan Attributes',$
+,(#3056));
+#3059= IFCRELDEFINESBYPROPERTIES('0byKryn5n8nPt$oiDbUJAz',#4,$,$,(#3046)
+,#3057);
+#3063= IFCTEXTSTYLEFORDEFINEDFONT(#3064,$);
+#3064= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#3065= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#3066= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#3068= IFCTEXTSTYLE($,#3063,#3065,#3066);
+#3069= IFCTEXTLITERAL('Absatz OK Boden 7cm',#3072,.LEFT.);
+#3070= IFCDIRECTION((1.,0.));
+#3072= IFCAXIS2PLACEMENT2D(#3073,#3070);
+#3073= IFCCARTESIANPOINT((90006.89477922957,23740.0048305961));
+#3075= IFCLOCALPLACEMENT($,#1);
+#3076= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#3069));
+#3078= IFCPRODUCTDEFINITIONSHAPE($,$,(#3076));
+#3081= IFCANNOTATION('155K1PecX9Euxo9G8cy7n4',#4,$,$,$,#3075,#3078);
+#3085= IFCPRESENTATIONSTYLEASSIGNMENT((#3068));
+#3087= IFCSTYLEDITEM(#3069,(#3085),$);
+#3091= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--17'),$);
+#3092= IFCPROPERTYSET('0WsqMCIv9Cg95KAj0$BQ4X',#4,'Allplan Attributes',$
+,(#3091));
+#3094= IFCRELDEFINESBYPROPERTIES('2YNR0nfgfFchnshxb$LFN1',#4,$,$,(#3081)
+,#3092);
+#3098= IFCTEXTSTYLEFORDEFINEDFONT(#3099,$);
+#3099= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#3100= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.4));
+#3101= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#3103= IFCTEXTSTYLE($,#3098,#3100,#3101);
+#3104= IFCPLANAREXTENT(1940.,240.);
+#3105= IFCTEXTLITERALWITHEXTENT(
+'Fund. d=30cm, UK= -0.90\X\0A+ 5cm Magerbeton (UK= -0.95)',#3108,.LEFT.,
+#3104,'top-left');
+#3106= IFCDIRECTION((1.,0.));
+#3108= IFCAXIS2PLACEMENT2D(#3109,#3106);
+#3109= IFCCARTESIANPOINT((69475.,8050.004830596101));
+#3111= IFCLOCALPLACEMENT($,#1);
+#3112= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#3105));
+#3114= IFCPRODUCTDEFINITIONSHAPE($,$,(#3112));
+#3117= IFCANNOTATION('0d0tGVHiz15gpfIP1qJdsC',#4,$,$,$,#3111,#3114);
+#3121= IFCPRESENTATIONSTYLEASSIGNMENT((#3103));
+#3123= IFCSTYLEDITEM(#3105,(#3121),$);
+#3127= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--18'),$);
+#3128= IFCPROPERTYSET('260at9PlvBsum41lRxMkk3',#4,'Allplan Attributes',$
+,(#3127));
+#3130= IFCRELDEFINESBYPROPERTIES('1agkz31Bn1cQVS9drBS29M',#4,$,$,(#3117)
+,#3128);
+#3134= IFCTEXTSTYLEFORDEFINEDFONT(#3135,$);
+#3135= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#3136= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.4));
+#3137= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#3139= IFCTEXTSTYLE($,#3134,#3136,#3137);
+#3140= IFCPLANAREXTENT(1940.,240.);
+#3141= IFCTEXTLITERALWITHEXTENT(
+'Fund. d=30cm, UK= -0.90\X\0A+ 5cm Magerbeton (UK= -0.95)',#3144,.LEFT.,
+#3140,'top-left');
+#3142= IFCDIRECTION((1.,0.));
+#3144= IFCAXIS2PLACEMENT2D(#3145,#3142);
+#3145= IFCCARTESIANPOINT((95155.00000000002,8050.004830596099));
+#3147= IFCLOCALPLACEMENT($,#1);
+#3148= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#3141));
+#3150= IFCPRODUCTDEFINITIONSHAPE($,$,(#3148));
+#3153= IFCANNOTATION('2jOO2i_LD4bQla_CgFU$wS',#4,$,$,$,#3147,#3150);
+#3157= IFCPRESENTATIONSTYLEASSIGNMENT((#3139));
+#3159= IFCSTYLEDITEM(#3141,(#3157),$);
+#3163= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--19'),$);
+#3164= IFCPROPERTYSET('1yaNFy$5zEFPisHuidyJAr',#4,'Allplan Attributes',$
+,(#3163));
+#3166= IFCRELDEFINESBYPROPERTIES('2tKa0iKrz8Vf4q5Eg_V8Z4',#4,$,$,(#3153)
+,#3164);
+#3170= IFCTEXTSTYLEFORDEFINEDFONT(#3171,$);
+#3171= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#3172= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.4));
+#3173= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#3175= IFCTEXTSTYLE($,#3170,#3172,#3173);
+#3176= IFCPLANAREXTENT(1940.,240.);
+#3177= IFCTEXTLITERALWITHEXTENT(
+'Fund. d=30cm, UK= -0.90\X\0A+ 5cm Magerbeton (UK= -0.95)',#3180,.LEFT.,
+#3176,'top-left');
+#3178= IFCDIRECTION((6.123233995736766E-17,1.));
+#3180= IFCAXIS2PLACEMENT2D(#3181,#3178);
+#3181= IFCCARTESIANPOINT((102125.,10580.0048305961));
+#3183= IFCLOCALPLACEMENT($,#1);
+#3184= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#3177));
+#3186= IFCPRODUCTDEFINITIONSHAPE($,$,(#3184));
+#3189= IFCANNOTATION('0D0uxEo811nO8UbVHhZyNx',#4,$,$,$,#3183,#3186);
+#3193= IFCPRESENTATIONSTYLEASSIGNMENT((#3175));
+#3195= IFCSTYLEDITEM(#3177,(#3193),$);
+#3199= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--20'),$);
+#3200= IFCPROPERTYSET('2a4Gs5WZDAMBaTGSd7DU4u',#4,'Allplan Attributes',$
+,(#3199));
+#3202= IFCRELDEFINESBYPROPERTIES('2L55rmcfD9TwboBPYB2FVD',#4,$,$,(#3189)
+,#3200);
+#3206= IFCTEXTSTYLEFORDEFINEDFONT(#3207,$);
+#3207= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#3208= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.4));
+#3209= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#3211= IFCTEXTSTYLE($,#3206,#3208,#3209);
+#3212= IFCPLANAREXTENT(1940.,240.);
+#3213= IFCTEXTLITERALWITHEXTENT(
+'Fund. d=30cm, UK= -0.90\X\0A+ 5cm Magerbeton (UK= -0.95)',#3216,.LEFT.,
+#3212,'top-left');
+#3214= IFCDIRECTION((6.123233995736766E-17,1.));
+#3216= IFCAXIS2PLACEMENT2D(#3217,#3214);
+#3217= IFCCARTESIANPOINT((64198.33333333334,21420.0048305961));
+#3219= IFCLOCALPLACEMENT($,#1);
+#3220= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#3213));
+#3222= IFCPRODUCTDEFINITIONSHAPE($,$,(#3220));
+#3225= IFCANNOTATION('1RQC7rX2j7svkmYUKZZu7o',#4,$,$,$,#3219,#3222);
+#3229= IFCPRESENTATIONSTYLEASSIGNMENT((#3211));
+#3231= IFCSTYLEDITEM(#3213,(#3229),$);
+#3235= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--21'),$);
+#3236= IFCPROPERTYSET('0dpmjOkDjCtxdvbz0jnrgf',#4,'Allplan Attributes',$
+,(#3235));
+#3238= IFCRELDEFINESBYPROPERTIES('1tJ187Gxb9xO7waFIm1Z_G',#4,$,$,(#3225)
+,#3236);
+#3242= IFCTEXTSTYLEFORDEFINEDFONT(#3243,$);
+#3243= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#3244= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.4));
+#3245= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#3247= IFCTEXTSTYLE($,#3242,#3244,#3245);
+#3248= IFCPLANAREXTENT(1940.,240.);
+#3249= IFCTEXTLITERALWITHEXTENT(
+'Fund. d=30cm, UK= -0.90\X\0A+ 5cm Magerbeton (UK= -0.95)',#3252,.LEFT.,
+#3248,'top-left');
+#3250= IFCDIRECTION((6.123233995736766E-17,1.));
+#3252= IFCAXIS2PLACEMENT2D(#3253,#3250);
+#3253= IFCCARTESIANPOINT((64198.33333333333,10580.0048305961));
+#3255= IFCLOCALPLACEMENT($,#1);
+#3256= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#3249));
+#3258= IFCPRODUCTDEFINITIONSHAPE($,$,(#3256));
+#3261= IFCANNOTATION('3_6Dengf5D4Qqq9kuc2kI_',#4,$,$,$,#3255,#3258);
+#3265= IFCPRESENTATIONSTYLEASSIGNMENT((#3247));
+#3267= IFCSTYLEDITEM(#3249,(#3265),$);
+#3271= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--22'),$);
+#3272= IFCPROPERTYSET('18qhXZGWLE2xdi3mxKdWDB',#4,'Allplan Attributes',$
+,(#3271));
+#3274= IFCRELDEFINESBYPROPERTIES('0gfBds5av1BwbnxAnlfYpV',#4,$,$,(#3261)
+,#3272);
+#3278= IFCTEXTSTYLEFORDEFINEDFONT(#3279,$);
+#3279= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#3280= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.4));
+#3281= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#3283= IFCTEXTSTYLE($,#3278,#3280,#3281);
+#3284= IFCPLANAREXTENT(1940.,240.);
+#3285= IFCTEXTLITERALWITHEXTENT(
+'Fund. d=30cm, UK= -0.90\X\0A+ 5cm Magerbeton (UK= -0.95)',#3288,.LEFT.,
+#3284,'top-left');
+#3286= IFCDIRECTION((6.123233995736766E-17,1.));
+#3288= IFCAXIS2PLACEMENT2D(#3289,#3286);
+#3289= IFCCARTESIANPOINT((102125.,20920.0048305961));
+#3291= IFCLOCALPLACEMENT($,#1);
+#3292= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#3285));
+#3294= IFCPRODUCTDEFINITIONSHAPE($,$,(#3292));
+#3297= IFCANNOTATION('22TXaI_Zb3pQ0mYdVcmfNb',#4,$,$,$,#3291,#3294);
+#3301= IFCPRESENTATIONSTYLEASSIGNMENT((#3283));
+#3303= IFCSTYLEDITEM(#3285,(#3301),$);
+#3307= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--91'),$);
+#3308= IFCPROPERTYSET('1011NPa7f1xuk$$LZtZf_h',#4,'Allplan Attributes',$
+,(#3307));
+#3310= IFCRELDEFINESBYPROPERTIES('2RqfpT3xT0fv7UgqKRonp0',#4,$,$,(#3297)
+,#3308);
+#3314= IFCTEXTSTYLEFORDEFINEDFONT(#3315,$);
+#3315= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#3316= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#3317= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#3319= IFCTEXTSTYLE($,#3314,#3316,#3317);
+#3320= IFCTEXTLITERAL('A',#3323,.LEFT.);
+#3321= IFCDIRECTION((1.,0.));
+#3323= IFCAXIS2PLACEMENT2D(#3324,#3321);
+#3324= IFCCARTESIANPOINT((85952.9040210247,23151.85649857375));
+#3326= IFCLOCALPLACEMENT($,#1);
+#3327= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#3320));
+#3329= IFCPRODUCTDEFINITIONSHAPE($,$,(#3327));
+#3332= IFCANNOTATION('0e0prYQEfDGA64w4w2LuHQ',#4,$,$,$,#3326,#3329);
+#3336= IFCPRESENTATIONSTYLEASSIGNMENT((#3319));
+#3338= IFCSTYLEDITEM(#3320,(#3336),$);
+#3342= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--309'),$);
+#3343= IFCPROPERTYSET('2JD1Wy0wf3dhbM69_d3Mus',#4,'Allplan Attributes',$
+,(#3342));
+#3345= IFCRELDEFINESBYPROPERTIES('3qVH_gpm1DaOMz7Ffu3iMO',#4,$,$,(#3332)
+,#3343);
+#3349= IFCTEXTSTYLEFORDEFINEDFONT(#3350,$);
+#3350= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#3351= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#3352= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#3354= IFCTEXTSTYLE($,#3349,#3351,#3352);
+#3355= IFCTEXTLITERAL('A',#3358,.LEFT.);
+#3356= IFCDIRECTION((1.,0.));
+#3358= IFCAXIS2PLACEMENT2D(#3359,#3356);
+#3359= IFCCARTESIANPOINT((90153.76264563203,23151.85649857376));
+#3361= IFCLOCALPLACEMENT($,#1);
+#3362= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#3355));
+#3364= IFCPRODUCTDEFINITIONSHAPE($,$,(#3362));
+#3367= IFCANNOTATION('2sVrkSohTBRey_2_9pnTJ2',#4,$,$,$,#3361,#3364);
+#3371= IFCPRESENTATIONSTYLEASSIGNMENT((#3354));
+#3373= IFCSTYLEDITEM(#3355,(#3371),$);
+#3377= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--321'),$);
+#3378= IFCPROPERTYSET('2dDj$DsVL5dfJDHygDQluY',#4,'Allplan Attributes',$
+,(#3377));
+#3380= IFCRELDEFINESBYPROPERTIES('1$KhyBJ7T9wQoNX3xYF2E_',#4,$,$,(#3367)
+,#3378);
+#3384= IFCTEXTSTYLEFORDEFINEDFONT(#3385,$);
+#3385= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#3386= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#3387= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(350.));
+#3389= IFCTEXTSTYLE($,#3384,#3386,#3387);
+#3390= IFCTEXTLITERAL('d = 25cm',#3393,.LEFT.);
+#3391= IFCDIRECTION((0.9808262151348187,0.1948844162684801));
+#3393= IFCAXIS2PLACEMENT2D(#3394,#3391);
+#3394= IFCCARTESIANPOINT((83632.23966450329,25811.54350744394));
+#3396= IFCLOCALPLACEMENT($,#1);
+#3397= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#3390));
+#3399= IFCPRODUCTDEFINITIONSHAPE($,$,(#3397));
+#3402= IFCANNOTATION('3OMOWguzD2gAzNm2dbazYU',#4,$,$,$,#3396,#3399);
+#3406= IFCPRESENTATIONSTYLEASSIGNMENT((#3389));
+#3408= IFCSTYLEDITEM(#3390,(#3406),$);
+#3412= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--346'),$);
+#3413= IFCPROPERTYSET('0XQ1aWXgT4e8mFSPFf40QX',#4,'Allplan Attributes',$
+,(#3412));
+#3415= IFCRELDEFINESBYPROPERTIES('0vGXYaIxrC7fp84EhMKDnE',#4,$,$,(#3402)
+,#3413);
+#3419= IFCTEXTSTYLEFORDEFINEDFONT(#3420,$);
+#3420= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#3421= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#3422= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#3424= IFCTEXTSTYLE($,#3419,#3421,#3422);
+#3425= IFCTEXTLITERAL('f1',#3428,.LEFT.);
+#3426= IFCDIRECTION((1.,0.));
+#3428= IFCAXIS2PLACEMENT2D(#3429,#3426);
+#3429= IFCCARTESIANPOINT((63944.51335346072,16091.04263252323));
+#3431= IFCLOCALPLACEMENT($,#1);
+#3432= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#3425));
+#3434= IFCPRODUCTDEFINITIONSHAPE($,$,(#3432));
+#3437= IFCANNOTATION('1uEr4FXUD7pxjCRAGDBTcv',#4,$,$,$,#3431,#3434);
+#3441= IFCPRESENTATIONSTYLEASSIGNMENT((#3424));
+#3443= IFCSTYLEDITEM(#3425,(#3441),$);
+#3447= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--400'),$);
+#3448= IFCPROPERTYSET('3DVl9nfFTFnffv6MhPWZYt',#4,'Allplan Attributes',$
+,(#3447));
+#3450= IFCRELDEFINESBYPROPERTIES('1jW5wqzQv2hv72_02ukaZY',#4,$,$,(#3437)
+,#3448);
+#3454= IFCTEXTSTYLEFORDEFINEDFONT(#3455,$);
+#3455= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#3456= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#3457= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#3459= IFCTEXTSTYLE($,#3454,#3456,#3457);
+#3460= IFCTEXTLITERAL('f1',#3463,.LEFT.);
+#3461= IFCDIRECTION((1.,0.));
+#3463= IFCAXIS2PLACEMENT2D(#3464,#3461);
+#3464= IFCCARTESIANPOINT((102367.5048670323,23148.54263252323));
+#3466= IFCLOCALPLACEMENT($,#1);
+#3467= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#3460));
+#3469= IFCPRODUCTDEFINITIONSHAPE($,$,(#3467));
+#3472= IFCANNOTATION('3BinDu9JX8YA5bHbvGHuiE',#4,$,$,$,#3466,#3469);
+#3476= IFCPRESENTATIONSTYLEASSIGNMENT((#3459));
+#3478= IFCSTYLEDITEM(#3460,(#3476),$);
+#3482= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--401'),$);
+#3483= IFCPROPERTYSET('3NOXOZmCTB9fSTK5OZigFO',#4,'Allplan Attributes',$
+,(#3482));
+#3485= IFCRELDEFINESBYPROPERTIES('2K5_qnlDT1AwNH35uzgKJm',#4,$,$,(#3472)
+,#3483);
+#3489= IFCTEXTSTYLEFORDEFINEDFONT(#3490,$);
+#3490= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#3491= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#3492= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#3494= IFCTEXTSTYLE($,#3489,#3491,#3492);
+#3495= IFCTEXTLITERAL('F1',#3498,.LEFT.);
+#3496= IFCDIRECTION((1.,0.));
+#3498= IFCAXIS2PLACEMENT2D(#3499,#3496);
+#3499= IFCCARTESIANPOINT((96418.85940563989,17938.30953539124));
+#3501= IFCLOCALPLACEMENT($,#1);
+#3502= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#3495));
+#3504= IFCPRODUCTDEFINITIONSHAPE($,$,(#3502));
+#3507= IFCANNOTATION('3u_E6IO995IRkoM7_Um8qb',#4,$,$,$,#3501,#3504);
+#3511= IFCPRESENTATIONSTYLEASSIGNMENT((#3494));
+#3513= IFCSTYLEDITEM(#3495,(#3511),$);
+#3517= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--402'),$);
+#3518= IFCPROPERTYSET('1eLl7kI1v3WO7NjLCuZEpe',#4,'Allplan Attributes',$
+,(#3517));
+#3520= IFCRELDEFINESBYPROPERTIES('26Fjm6p5zCMfV7_Ig$LSRc',#4,$,$,(#3507)
+,#3518);
+#3524= IFCTEXTSTYLEFORDEFINEDFONT(#3525,$);
+#3525= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#3526= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#3527= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#3529= IFCTEXTSTYLE($,#3524,#3526,#3527);
+#3530= IFCTEXTLITERAL('f2',#3533,.LEFT.);
+#3531= IFCDIRECTION((1.,0.));
+#3533= IFCAXIS2PLACEMENT2D(#3534,#3531);
+#3534= IFCCARTESIANPOINT((78350.00486703226,7551.042632523229));
+#3536= IFCLOCALPLACEMENT($,#1);
+#3537= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#3530));
+#3539= IFCPRODUCTDEFINITIONSHAPE($,$,(#3537));
+#3542= IFCANNOTATION('15ZDw9_q5DmfENkeAdWQcj',#4,$,$,$,#3536,#3539);
+#3546= IFCPRESENTATIONSTYLEASSIGNMENT((#3529));
+#3548= IFCSTYLEDITEM(#3530,(#3546),$);
+#3552= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--487'),$);
+#3553= IFCPROPERTYSET('2E6XPUOFn3IwqCWyE_mefg',#4,'Allplan Attributes',$
+,(#3552));
+#3555= IFCRELDEFINESBYPROPERTIES('2lHC1bcZD2mAKikhGuC0WC',#4,$,$,(#3542)
+,#3553);
+#3559= IFCTEXTSTYLEFORDEFINEDFONT(#3560,$);
+#3560= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#3561= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#3562= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#3564= IFCTEXTSTYLE($,#3559,#3561,#3562);
+#3565= IFCTEXTLITERAL('f3',#3568,.LEFT.);
+#3566= IFCDIRECTION((1.,0.));
+#3568= IFCAXIS2PLACEMENT2D(#3569,#3566);
+#3569= IFCCARTESIANPOINT((93993.5098230476,7551.042632523229));
+#3571= IFCLOCALPLACEMENT($,#1);
+#3572= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#3565));
+#3574= IFCPRODUCTDEFINITIONSHAPE($,$,(#3572));
+#3577= IFCANNOTATION('3qJNSV8dfABgHMLP2Kz8GF',#4,$,$,$,#3571,#3574);
+#3581= IFCPRESENTATIONSTYLEASSIGNMENT((#3564));
+#3583= IFCSTYLEDITEM(#3565,(#3581),$);
+#3587= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--488'),$);
+#3588= IFCPROPERTYSET('1QS3Cz6pH71u4jlWxYiIeJ',#4,'Allplan Attributes',$
+,(#3587));
+#3590= IFCRELDEFINESBYPROPERTIES('3vAjMbsKv2bRPg1zd50oPi',#4,$,$,(#3577)
+,#3588);
+#3594= IFCTEXTSTYLEFORDEFINEDFONT(#3595,$);
+#3595= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#3596= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#3597= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#3599= IFCTEXTSTYLE($,#3594,#3596,#3597);
+#3600= IFCTEXTLITERAL('f4',#3603,.LEFT.);
+#3601= IFCDIRECTION((1.,0.));
+#3603= IFCAXIS2PLACEMENT2D(#3604,#3601);
+#3604= IFCCARTESIANPOINT((98812.22799894086,7551.042632523229));
+#3606= IFCLOCALPLACEMENT($,#1);
+#3607= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#3600));
+#3609= IFCPRODUCTDEFINITIONSHAPE($,$,(#3607));
+#3612= IFCANNOTATION('21Ob3vLwTDVes0oePN2Umt',#4,$,$,$,#3606,#3609);
+#3616= IFCPRESENTATIONSTYLEASSIGNMENT((#3599));
+#3618= IFCSTYLEDITEM(#3600,(#3616),$);
+#3622= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--489'),$);
+#3623= IFCPROPERTYSET('2Hois3xlXA6PpcK7toWZWp',#4,'Allplan Attributes',$
+,(#3622));
+#3625= IFCRELDEFINESBYPROPERTIES('3waP5sRHDEnerTnxkZOQHU',#4,$,$,(#3612)
+,#3623);
+#3629= IFCTEXTSTYLEFORDEFINEDFONT(#3630,$);
+#3630= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#3631= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#3632= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#3634= IFCTEXTSTYLE($,#3629,#3631,#3632);
+#3635= IFCTEXTLITERAL('f5',#3638,.LEFT.);
+#3636= IFCDIRECTION((1.,0.));
+#3638= IFCAXIS2PLACEMENT2D(#3639,#3636);
+#3639= IFCCARTESIANPOINT((102364.5133534607,15128.54263252323));
+#3641= IFCLOCALPLACEMENT($,#1);
+#3642= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#3635));
+#3644= IFCPRODUCTDEFINITIONSHAPE($,$,(#3642));
+#3647= IFCANNOTATION('1mSfyVsdTFkhbdkMr4uJNl',#4,$,$,$,#3641,#3644);
+#3651= IFCPRESENTATIONSTYLEASSIGNMENT((#3634));
+#3653= IFCSTYLEDITEM(#3635,(#3651),$);
+#3657= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--490'),$);
+#3658= IFCPROPERTYSET('3sMo$sRKX7sPEfHa5hKjMS',#4,'Allplan Attributes',$
+,(#3657));
+#3660= IFCRELDEFINESBYPROPERTIES('2ftwh1farEORcCh3McbpRy',#4,$,$,(#3647)
+,#3658);
+#3664= IFCTEXTSTYLEFORDEFINEDFONT(#3665,$);
+#3665= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#3666= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#3667= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#3669= IFCTEXTSTYLE($,#3664,#3666,#3667);
+#3670= IFCTEXTLITERAL('f6',#3673,.LEFT.);
+#3671= IFCDIRECTION((1.,0.));
+#3673= IFCAXIS2PLACEMENT2D(#3674,#3671);
+#3674= IFCCARTESIANPOINT((79088.46093109454,15126.04263252324));
+#3676= IFCLOCALPLACEMENT($,#1);
+#3677= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#3670));
+#3679= IFCPRODUCTDEFINITIONSHAPE($,$,(#3677));
+#3682= IFCANNOTATION('1XKgc9OU15ehkDKxbz5$dW',#4,$,$,$,#3676,#3679);
+#3686= IFCPRESENTATIONSTYLEASSIGNMENT((#3669));
+#3688= IFCSTYLEDITEM(#3670,(#3686),$);
+#3692= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--491'),$);
+#3693= IFCPROPERTYSET('1LQyiPqurFNvaZPYuArUWR',#4,'Allplan Attributes',$
+,(#3692));
+#3695= IFCRELDEFINESBYPROPERTIES('0HxfPhxK9DFBfk9EJlTI5d',#4,$,$,(#3682)
+,#3693);
+#3699= IFCTEXTSTYLEFORDEFINEDFONT(#3700,$);
+#3700= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#3701= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#3702= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#3704= IFCTEXTSTYLE($,#3699,#3701,#3702);
+#3705= IFCTEXTLITERAL('f7',#3708,.LEFT.);
+#3706= IFCDIRECTION((1.,0.));
+#3708= IFCAXIS2PLACEMENT2D(#3709,#3706);
+#3709= IFCCARTESIANPOINT((90227.54729917461,12438.54263252323));
+#3711= IFCLOCALPLACEMENT($,#1);
+#3712= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#3705));
+#3714= IFCPRODUCTDEFINITIONSHAPE($,$,(#3712));
+#3717= IFCANNOTATION('08FHSSW1j2vA3WkO_bIWFr',#4,$,$,$,#3711,#3714);
+#3721= IFCPRESENTATIONSTYLEASSIGNMENT((#3704));
+#3723= IFCSTYLEDITEM(#3705,(#3721),$);
+#3727= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--492'),$);
+#3728= IFCPROPERTYSET('27Ygf7d3r6zBDMNWwcvHLL',#4,'Allplan Attributes',$
+,(#3727));
+#3730= IFCRELDEFINESBYPROPERTIES('0cO3OeJ45EFf1pAlxWRlR3',#4,$,$,(#3717)
+,#3728);
+#3734= IFCTEXTSTYLEFORDEFINEDFONT(#3735,$);
+#3735= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#3736= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#3737= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#3739= IFCTEXTSTYLE($,#3734,#3736,#3737);
+#3740= IFCTEXTLITERAL('f8',#3743,.LEFT.);
+#3741= IFCDIRECTION((1.,0.));
+#3743= IFCAXIS2PLACEMENT2D(#3744,#3741);
+#3744= IFCCARTESIANPOINT((96930.44389119459,12513.54263252323));
+#3746= IFCLOCALPLACEMENT($,#1);
+#3747= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#3740));
+#3749= IFCPRODUCTDEFINITIONSHAPE($,$,(#3747));
+#3752= IFCANNOTATION('1qujgF1JDFKAuXGoNDBOVm',#4,$,$,$,#3746,#3749);
+#3756= IFCPRESENTATIONSTYLEASSIGNMENT((#3739));
+#3758= IFCSTYLEDITEM(#3740,(#3756),$);
+#3762= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--493'),$);
+#3763= IFCPROPERTYSET('2YIx5P0mP5wQ4ku36TxHlt',#4,'Allplan Attributes',$
+,(#3762));
+#3765= IFCRELDEFINESBYPROPERTIES('00bKpdKHv0i97yU8UZrKco',#4,$,$,(#3752)
+,#3763);
+#3769= IFCTEXTSTYLEFORDEFINEDFONT(#3770,$);
+#3770= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#3771= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#3772= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#3774= IFCTEXTSTYLE($,#3769,#3771,#3772);
+#3775= IFCTEXTLITERAL('f9',#3778,.LEFT.);
+#3776= IFCDIRECTION((1.,0.));
+#3778= IFCAXIS2PLACEMENT2D(#3779,#3776);
+#3779= IFCCARTESIANPOINT((96915.96093109452,21621.04263252323));
+#3781= IFCLOCALPLACEMENT($,#1);
+#3782= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#3775));
+#3784= IFCPRODUCTDEFINITIONSHAPE($,$,(#3782));
+#3787= IFCANNOTATION('1foIl7NUH93ee8iBvs4533',#4,$,$,$,#3781,#3784);
+#3791= IFCPRESENTATIONSTYLEASSIGNMENT((#3774));
+#3793= IFCSTYLEDITEM(#3775,(#3791),$);
+#3797= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--494'),$);
+#3798= IFCPROPERTYSET('3Q6X7xe2r2998y2xZvG5yU',#4,'Allplan Attributes',$
+,(#3797));
+#3800= IFCRELDEFINESBYPROPERTIES('2$qkHjc7jElBmkOnwBL5SG',#4,$,$,(#3787)
+,#3798);
+#3804= IFCTEXTSTYLEFORDEFINEDFONT(#3805,$);
+#3805= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#3806= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#3807= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#3809= IFCTEXTSTYLE($,#3804,#3806,#3807);
+#3810= IFCTEXTLITERAL('B',#3813,.LEFT.);
+#3811= IFCDIRECTION((6.123233995736766E-17,1.));
+#3813= IFCAXIS2PLACEMENT2D(#3814,#3811);
+#3814= IFCCARTESIANPOINT((88169.24186625176,20927.9088516208));
+#3816= IFCLOCALPLACEMENT($,#1);
+#3817= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#3810));
+#3819= IFCPRODUCTDEFINITIONSHAPE($,$,(#3817));
+#3822= IFCANNOTATION('0qY8_R81fDmBFRGOgmpJGG',#4,$,$,$,#3816,#3819);
+#3826= IFCPRESENTATIONSTYLEASSIGNMENT((#3809));
+#3828= IFCSTYLEDITEM(#3810,(#3826),$);
+#3832= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--518'),$);
+#3833= IFCPROPERTYSET('38irtdcuPCbA615kHoZP5v',#4,'Allplan Attributes',$
+,(#3832));
+#3835= IFCRELDEFINESBYPROPERTIES('0NOl$hsBj30fVRS5X6Yxhi',#4,$,$,(#3822)
+,#3833);
+#3839= IFCTEXTSTYLEFORDEFINEDFONT(#3840,$);
+#3840= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#3841= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#3842= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#3844= IFCTEXTSTYLE($,#3839,#3841,#3842);
+#3845= IFCTEXTLITERAL('B',#3848,.LEFT.);
+#3846= IFCDIRECTION((6.123233995736766E-17,1.));
+#3848= IFCAXIS2PLACEMENT2D(#3849,#3846);
+#3849= IFCCARTESIANPOINT((88169.24186625176,25478.76747622812));
+#3851= IFCLOCALPLACEMENT($,#1);
+#3852= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#3845));
+#3854= IFCPRODUCTDEFINITIONSHAPE($,$,(#3852));
+#3857= IFCANNOTATION('2bbd$dWJ5FRhKgIiAnUQkw',#4,$,$,$,#3851,#3854);
+#3861= IFCPRESENTATIONSTYLEASSIGNMENT((#3844));
+#3863= IFCSTYLEDITEM(#3845,(#3861),$);
+#3867= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--519'),$);
+#3868= IFCPROPERTYSET('3D8hwQaKD78hRZjXU12mD6',#4,'Allplan Attributes',$
+,(#3867));
+#3870= IFCRELDEFINESBYPROPERTIES('0x74VGy391OuWFTHMOHW$P',#4,$,$,(#3857)
+,#3868);
+#3874= IFCTEXTSTYLEFORDEFINEDFONT(#3875,$);
+#3875= IFCCOLOURRGB($,0.4392156862745098,0.4392156862745098,1.);
+#3876= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.5));
+#3877= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(250.));
+#3879= IFCTEXTSTYLE($,#3874,#3876,#3877);
+#3880= IFCPLANAREXTENT(4979.166666666672,312.5);
+#3881= IFCTEXTLITERALWITHEXTENT(
+'unter Fundamente mit Sickerbeton 32/45mm CEM 200 kg/m\X2\00B3\X0\\X\0Aoder Magerbeton CEM 200 kg/m\X2\00B3\X0\ bis auf Kiesschicht fundieren !'
+,#3884,.LEFT.,#3880,'top-left');
+#3882= IFCDIRECTION((1.,0.));
+#3884= IFCAXIS2PLACEMENT2D(#3885,#3882);
+#3885= IFCCARTESIANPOINT((79040.90503321811,12115.36635853764));
+#3887= IFCLOCALPLACEMENT($,#1);
+#3888= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#3881));
+#3890= IFCPRODUCTDEFINITIONSHAPE($,$,(#3888));
+#3893= IFCANNOTATION('3puw6QhR90TPaucvmRN5gf',#4,$,$,$,#3887,#3890);
+#3897= IFCPRESENTATIONSTYLEASSIGNMENT((#3879));
+#3899= IFCSTYLEDITEM(#3881,(#3897),$);
+#3903= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--530'),$);
+#3904= IFCPROPERTYSET('1zowMRjGT189xncz_WeVV9',#4,'Allplan Attributes',$
+,(#3903));
+#3906= IFCRELDEFINESBYPROPERTIES('1iALP_gWzBnxlPOoTK6f6F',#4,$,$,(#3893)
+,#3904);
+#3910= IFCTEXTSTYLEFORDEFINEDFONT(#3911,$);
+#3911= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#3912= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#3913= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#3915= IFCTEXTSTYLE($,#3910,#3912,#3913);
+#3916= IFCTEXTLITERAL('Einlage 15x25cm',#3919,.LEFT.);
+#3917= IFCDIRECTION((1.,0.));
+#3919= IFCAXIS2PLACEMENT2D(#3920,#3917);
+#3920= IFCCARTESIANPOINT((94135.,8666.671497262763));
+#3922= IFCLOCALPLACEMENT($,#1);
+#3923= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#3916));
+#3925= IFCPRODUCTDEFINITIONSHAPE($,$,(#3923));
+#3928= IFCANNOTATION('2YkUugXrX5dACVC5nmOPT$',#4,$,$,$,#3922,#3925);
+#3932= IFCPRESENTATIONSTYLEASSIGNMENT((#3915));
+#3934= IFCSTYLEDITEM(#3916,(#3932),$);
+#3938= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--557'),$);
+#3939= IFCPROPERTYSET('2H1P7qMCn3w9ggR_j8S0oR',#4,'Allplan Attributes',$
+,(#3938));
+#3941= IFCRELDEFINESBYPROPERTIES('21ypdny7D3bOQ6_zjsBlwa',#4,$,$,(#3928)
+,#3939);
+#3945= IFCTEXTSTYLEFORDEFINEDFONT(#3946,$);
+#3946= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#3947= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#3948= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#3950= IFCTEXTSTYLE($,#3945,#3947,#3948);
+#3951= IFCTEXTLITERAL('Arbeitsfuge mit Quellfugenband !',#3954,.LEFT.);
+#3952= IFCDIRECTION((6.123233995736766E-17,1.));
+#3954= IFCAXIS2PLACEMENT2D(#3955,#3952);
+#3955= IFCCARTESIANPOINT((77728.33333333336,11056.97175194527));
+#3957= IFCLOCALPLACEMENT($,#1);
+#3958= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#3951));
+#3960= IFCPRODUCTDEFINITIONSHAPE($,$,(#3958));
+#3963= IFCANNOTATION('17h2p6wfH7UvUI2I1OV7wa',#4,$,$,$,#3957,#3960);
+#3967= IFCPRESENTATIONSTYLEASSIGNMENT((#3950));
+#3969= IFCSTYLEDITEM(#3951,(#3967),$);
+#3973= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--564'),$);
+#3974= IFCPROPERTYSET('0DcqwzObH0Qglnox9RwvKq',#4,'Allplan Attributes',$
+,(#3973));
+#3976= IFCRELDEFINESBYPROPERTIES('1bscKFwRTAcBy0A3Zjfe6b',#4,$,$,(#3963)
+,#3974);
+#3980= IFCTEXTSTYLEFORDEFINEDFONT(#3981,$);
+#3981= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#3982= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#3983= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#3985= IFCTEXTSTYLE($,#3980,#3982,#3983);
+#3986= IFCTEXTLITERAL('Arbeitsfuge mit Quellfugenband !',#3989,.LEFT.);
+#3987= IFCDIRECTION((6.123233995736766E-17,1.));
+#3989= IFCAXIS2PLACEMENT2D(#3990,#3987);
+#3990= IFCCARTESIANPOINT((77728.33333333336,21266.51780159047));
+#3992= IFCLOCALPLACEMENT($,#1);
+#3993= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#3986));
+#3995= IFCPRODUCTDEFINITIONSHAPE($,$,(#3993));
+#3998= IFCANNOTATION('0H_n3qjK5Dg8Dpf9jhY0uk',#4,$,$,$,#3992,#3995);
+#4002= IFCPRESENTATIONSTYLEASSIGNMENT((#3985));
+#4004= IFCSTYLEDITEM(#3986,(#4002),$);
+#4008= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--565'),$);
+#4009= IFCPROPERTYSET('35_TPBneP4dQihE8fl23SI',#4,'Allplan Attributes',$
+,(#4008));
+#4011= IFCRELDEFINESBYPROPERTIES('0L2O5luI9DB9SorYwjXEfJ',#4,$,$,(#3998)
+,#4009);
+#4015= IFCTEXTSTYLEFORDEFINEDFONT(#4016,$);
+#4016= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#4017= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.5));
+#4018= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(300.));
+#4020= IFCTEXTSTYLE($,#4015,#4017,#4018);
+#4021= IFCPLANAREXTENT(2910.000000000003,825.0000000000168);
+#4022= IFCTEXTLITERALWITHEXTENT(
+'OK= -0.07, UK= -0.32\X\0A+ 20cm D\X2\00E4\X0\mmung (UK= -0.52)\X\0A+ 2cm Splitt (UK= -0.54)\X\0A+ 5cm Magerbeton (UK= -0.59)'
+,#4025,.LEFT.,#4021,'top-left');
+#4023= IFCDIRECTION((0.9808262151348185,0.1948844162684815));
+#4025= IFCAXIS2PLACEMENT2D(#4026,#4023);
+#4026= IFCCARTESIANPOINT((83653.51454661261,25704.46997895839));
+#4028= IFCLOCALPLACEMENT($,#1);
+#4029= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#4022));
+#4031= IFCPRODUCTDEFINITIONSHAPE($,$,(#4029));
+#4034= IFCANNOTATION('0XF$QKhFT9nRHmVoaaNE8O',#4,$,$,$,#4028,#4031);
+#4038= IFCPRESENTATIONSTYLEASSIGNMENT((#4020));
+#4040= IFCSTYLEDITEM(#4022,(#4038),$);
+#4044= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--566'),$);
+#4045= IFCPROPERTYSET('3rHlMog1fExgQC1tGoEg5l',#4,'Allplan Attributes',$
+,(#4044));
+#4047= IFCRELDEFINESBYPROPERTIES('02PRv_nD5DtQQofTawNo2p',#4,$,$,(#4034)
+,#4045);
+#4051= IFCTEXTSTYLEFORDEFINEDFONT(#4052,$);
+#4052= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#4053= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.5));
+#4054= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(250.));
+#4056= IFCTEXTSTYLE($,#4051,#4053,#4054);
+#4057= IFCPLANAREXTENT(1940.000000000009,687.4999999999822);
+#4058= IFCTEXTLITERALWITHEXTENT(
+'OK= -1.13, UK= -1.38\X\0A+ 20cm D\X2\00E4\X0\mmung (UK= -1.58)\X\0A+ 2cm Splitt (UK= -1.60)\X\0A+ 5cm Magerbeton (UK= -1.65)'
+,#4061,.LEFT.,#4057,'top-left');
+#4059= IFCDIRECTION((0.7310552682428722,0.6823182503600077));
+#4061= IFCAXIS2PLACEMENT2D(#4062,#4059);
+#4062= IFCCARTESIANPOINT((87546.77173638951,22437.02940657125));
+#4064= IFCLOCALPLACEMENT($,#1);
+#4065= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#4058));
+#4067= IFCPRODUCTDEFINITIONSHAPE($,$,(#4065));
+#4070= IFCANNOTATION('2N9Uxwptr1CwlQfuWet7zC',#4,$,$,$,#4064,#4067);
+#4074= IFCPRESENTATIONSTYLEASSIGNMENT((#4056));
+#4076= IFCSTYLEDITEM(#4058,(#4074),$);
+#4080= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--567'),$);
+#4081= IFCPROPERTYSET('347myexXL8mgrJIzzjbVPJ',#4,'Allplan Attributes',$
+,(#4080));
+#4083= IFCRELDEFINESBYPROPERTIES('3JgNqVmsDFMP5lVAMdBmDd',#4,$,$,(#4070)
+,#4081);
+#4087= IFCTEXTSTYLEFORDEFINEDFONT(#4088,$);
+#4088= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#4089= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#4090= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(350.));
+#4092= IFCTEXTSTYLE($,#4087,#4089,#4090);
+#4093= IFCTEXTLITERAL('d = 25cm',#4096,.LEFT.);
+#4094= IFCDIRECTION((0.9216166900860996,0.3881013740696396));
+#4096= IFCAXIS2PLACEMENT2D(#4097,#4094);
+#4097= IFCCARTESIANPOINT((77891.256051316,14098.27303360807));
+#4099= IFCLOCALPLACEMENT($,#1);
+#4100= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#4093));
+#4102= IFCPRODUCTDEFINITIONSHAPE($,$,(#4100));
+#4105= IFCANNOTATION('3wpXPkInvF1B1LMEZhTVyL',#4,$,$,$,#4099,#4102);
+#4109= IFCPRESENTATIONSTYLEASSIGNMENT((#4092));
+#4111= IFCSTYLEDITEM(#4093,(#4109),$);
+#4115= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--568'),$);
+#4116= IFCPROPERTYSET('0HZ4naASfDuRV6AEqFaQjK',#4,'Allplan Attributes',$
+,(#4115));
+#4118= IFCRELDEFINESBYPROPERTIES('2YZ_g60obFwRap039Dy2Bp',#4,$,$,(#4105)
+,#4116);
+#4122= IFCTEXTSTYLEFORDEFINEDFONT(#4123,$);
+#4123= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#4124= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.5));
+#4125= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(300.));
+#4127= IFCTEXTSTYLE($,#4122,#4124,#4125);
+#4128= IFCPLANAREXTENT(2910.000000000046,824.9999999999975);
+#4129= IFCTEXTLITERALWITHEXTENT(
+'OK= -0.14, UK= -0.39\X\0A+ 20cm D\X2\00E4\X0\mmung (UK= -0.59)\X\0A+ 2cm Splitt (UK= -0.61)\X\0A+ 5cm Magerbeton (UK= -0.66)'
+,#4132,.LEFT.,#4128,'top-left');
+#4130= IFCDIRECTION((0.9216166900860947,0.3881013740696512));
+#4132= IFCAXIS2PLACEMENT2D(#4133,#4130);
+#4133= IFCCARTESIANPOINT((77933.62378465194,13997.66321160699));
+#4135= IFCLOCALPLACEMENT($,#1);
+#4136= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#4129));
+#4138= IFCPRODUCTDEFINITIONSHAPE($,$,(#4136));
+#4141= IFCANNOTATION('1i$hngaZb2r9j7D5Ib9ebc',#4,$,$,$,#4135,#4138);
+#4145= IFCPRESENTATIONSTYLEASSIGNMENT((#4127));
+#4147= IFCSTYLEDITEM(#4129,(#4145),$);
+#4151= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--569'),$);
+#4152= IFCPROPERTYSET('1z1qZXLRL6twKTbcJH8G$_',#4,'Allplan Attributes',$
+,(#4151));
+#4154= IFCRELDEFINESBYPROPERTIES('0muYiaj0DASfdo5gu57Qe4',#4,$,$,(#4141)
+,#4152);
+#4158= IFCTEXTSTYLEFORDEFINEDFONT(#4159,$);
+#4159= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#4160= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.4));
+#4161= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#4163= IFCTEXTSTYLE($,#4158,#4160,#4161);
+#4164= IFCPLANAREXTENT(1940.,520.);
+#4165= IFCTEXTLITERALWITHEXTENT(
+'Fund. d=15cm, UK= -0.54\X\0A+ 20cm D\X2\00E4\X0\mmung (UK= -0.74)\X\0A+ 2cm Splitt (UK= -0.76)\X\0A+ 5cm Magerbeton (UK= -0.81)'
+,#4168,.LEFT.,#4164,'top-left');
+#4166= IFCDIRECTION((6.123233995736766E-17,1.));
+#4168= IFCAXIS2PLACEMENT2D(#4169,#4166);
+#4169= IFCCARTESIANPOINT((94193.33333333333,20592.11878411506));
+#4171= IFCLOCALPLACEMENT($,#1);
+#4172= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#4165));
+#4174= IFCPRODUCTDEFINITIONSHAPE($,$,(#4172));
+#4177= IFCANNOTATION('1n4YPl7lb62Pl0dY7LrisP',#4,$,$,$,#4171,#4174);
+#4181= IFCPRESENTATIONSTYLEASSIGNMENT((#4163));
+#4183= IFCSTYLEDITEM(#4165,(#4181),$);
+#4187= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--575'),$);
+#4188= IFCPROPERTYSET('0440dhyJL588wmdsNJKm2x',#4,'Allplan Attributes',$
+,(#4187));
+#4190= IFCRELDEFINESBYPROPERTIES('3upJjIADn4axrJ$4VNB0qn',#4,$,$,(#4177)
+,#4188);
+#4194= IFCTEXTSTYLEFORDEFINEDFONT(#4195,$);
+#4195= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#4196= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.4));
+#4197= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#4199= IFCTEXTSTYLE($,#4194,#4196,#4197);
+#4200= IFCPLANAREXTENT(1940.,520.);
+#4201= IFCTEXTLITERALWITHEXTENT(
+'Fund. d=35cm, UK= -0.74\X\0A+ 20cm D\X2\00E4\X0\mmung (UK= -0.94)\X\0A+ 2cm Splitt (UK= -0.96)\X\0A+ 5cm Magerbeton (UK= -1.01)'
+,#4204,.LEFT.,#4200,'top-left');
+#4202= IFCDIRECTION((6.123233995736766E-17,1.));
+#4204= IFCAXIS2PLACEMENT2D(#4205,#4202);
+#4205= IFCCARTESIANPOINT((97205.,16250.39227405017));
+#4207= IFCLOCALPLACEMENT($,#1);
+#4208= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#4201));
+#4210= IFCPRODUCTDEFINITIONSHAPE($,$,(#4208));
+#4213= IFCANNOTATION('2FnqDpNHnFm9zvv91IZQB2',#4,$,$,$,#4207,#4210);
+#4217= IFCPRESENTATIONSTYLEASSIGNMENT((#4199));
+#4219= IFCSTYLEDITEM(#4201,(#4217),$);
+#4223= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--574'),$);
+#4224= IFCPROPERTYSET('3P16ZqNpf8R9SI3V696Yhv',#4,'Allplan Attributes',$
+,(#4223));
+#4226= IFCRELDEFINESBYPROPERTIES('3Az1VBw7H9pPMTf6JEzMvT',#4,$,$,(#4213)
+,#4224);
+#4230= IFCTEXTSTYLEFORDEFINEDFONT(#4231,$);
+#4231= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#4232= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.4));
+#4233= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#4235= IFCTEXTSTYLE($,#4230,#4232,#4233);
+#4236= IFCPLANAREXTENT(1940.,520.);
+#4237= IFCTEXTLITERALWITHEXTENT(
+'Fund. d=15cm, UK= -0.54\X\0A+ 20cm D\X2\00E4\X0\mmung (UK= -0.74)\X\0A+ 2cm Splitt (UK= -0.76)\X\0A+ 5cm Magerbeton (UK= -0.81)'
+,#4240,.LEFT.,#4236,'top-left');
+#4238= IFCDIRECTION((6.123233995736766E-17,1.));
+#4240= IFCAXIS2PLACEMENT2D(#4241,#4238);
+#4241= IFCCARTESIANPOINT((94218.33333333333,11269.79426336781));
+#4243= IFCLOCALPLACEMENT($,#1);
+#4244= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#4237));
+#4246= IFCPRODUCTDEFINITIONSHAPE($,$,(#4244));
+#4249= IFCANNOTATION('3bvh$C8C9Athn1gE3ZA$aM',#4,$,$,$,#4243,#4246);
+#4253= IFCPRESENTATIONSTYLEASSIGNMENT((#4235));
+#4255= IFCSTYLEDITEM(#4237,(#4253),$);
+#4259= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--573'),$);
+#4260= IFCPROPERTYSET('2wbHHdULH9fw0H$n$GbGQy',#4,'Allplan Attributes',$
+,(#4259));
+#4262= IFCRELDEFINESBYPROPERTIES('2uEIbWWET6cv3gDWzUt7kU',#4,$,$,(#4249)
+,#4260);
+#4266= IFCTEXTSTYLEFORDEFINEDFONT(#4267,$);
+#4267= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#4268= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.4));
+#4269= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#4271= IFCTEXTSTYLE($,#4266,#4268,#4269);
+#4272= IFCPLANAREXTENT(1940.,520.);
+#4273= IFCTEXTLITERALWITHEXTENT(
+'Fund. d=15cm, UK= -0.54\X\0A+ 20cm D\X2\00E4\X0\mmung (UK= -0.74)\X\0A+ 2cm Splitt (UK= -0.76)\X\0A+ 5cm Magerbeton (UK= -0.81)'
+,#4276,.LEFT.,#4272,'top-left');
+#4274= IFCDIRECTION((6.123233995736766E-17,1.));
+#4276= IFCAXIS2PLACEMENT2D(#4277,#4274);
+#4277= IFCCARTESIANPOINT((93100.00000000003,11362.26488116083));
+#4279= IFCLOCALPLACEMENT($,#1);
+#4280= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#4273));
+#4282= IFCPRODUCTDEFINITIONSHAPE($,$,(#4280));
+#4285= IFCANNOTATION('0W2YIK1y9DDegvlGNfqlka',#4,$,$,$,#4279,#4282);
+#4289= IFCPRESENTATIONSTYLEASSIGNMENT((#4271));
+#4291= IFCSTYLEDITEM(#4273,(#4289),$);
+#4295= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--572'),$);
+#4296= IFCPROPERTYSET('0OPU61Msz8yRvI0DyzbtTY',#4,'Allplan Attributes',$
+,(#4295));
+#4298= IFCRELDEFINESBYPROPERTIES('1alRPhJaT80hRI9mbxJmr3',#4,$,$,(#4285)
+,#4296);
+#4302= IFCTEXTSTYLEFORDEFINEDFONT(#4303,$);
+#4303= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#4304= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.4));
+#4305= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#4307= IFCTEXTSTYLE($,#4302,#4304,#4305);
+#4308= IFCPLANAREXTENT(1940.,520.);
+#4309= IFCTEXTLITERALWITHEXTENT(
+'Fund. d=35cm, UK= -0.74\X\0A+ 20cm D\X2\00E4\X0\mmung (UK= -0.94)\X\0A+ 2cm Splitt (UK= -0.96)\X\0A+ 5cm Magerbeton (UK= -1.01)'
+,#4312,.LEFT.,#4308,'top-left');
+#4310= IFCDIRECTION((1.,0.));
+#4312= IFCAXIS2PLACEMENT2D(#4313,#4310);
+#4313= IFCCARTESIANPOINT((86373.12561100708,19411.67149726277));
+#4315= IFCLOCALPLACEMENT($,#1);
+#4316= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#4309));
+#4318= IFCPRODUCTDEFINITIONSHAPE($,$,(#4316));
+#4321= IFCANNOTATION('2e$1Nuzm57dupydAuUvPW_',#4,$,$,$,#4315,#4318);
+#4325= IFCPRESENTATIONSTYLEASSIGNMENT((#4307));
+#4327= IFCSTYLEDITEM(#4309,(#4325),$);
+#4331= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--571'),$);
+#4332= IFCPROPERTYSET('2nv$fiKa98R9JKPB$y9cHx',#4,'Allplan Attributes',$
+,(#4331));
+#4334= IFCRELDEFINESBYPROPERTIES('3lAG9$Kv5BdOwvSCMTscvd',#4,$,$,(#4321)
+,#4332);
+#4338= IFCTEXTSTYLEFORDEFINEDFONT(#4339,$);
+#4339= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#4340= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.4));
+#4341= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#4343= IFCTEXTSTYLE($,#4338,#4340,#4341);
+#4344= IFCPLANAREXTENT(1940.,520.);
+#4345= IFCTEXTLITERALWITHEXTENT(
+'Fund. d=35cm, UK= -0.74\X\0A+ 20cm D\X2\00E4\X0\mmung (UK= -0.94)\X\0A+ 2cm Splitt (UK= -0.96)\X\0A+ 5cm Magerbeton (UK= -1.01)'
+,#4348,.LEFT.,#4344,'top-left');
+#4346= IFCDIRECTION((1.,0.));
+#4348= IFCAXIS2PLACEMENT2D(#4349,#4346);
+#4349= IFCCARTESIANPOINT((67575.,19411.67149726278));
+#4351= IFCLOCALPLACEMENT($,#1);
+#4352= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#4345));
+#4354= IFCPRODUCTDEFINITIONSHAPE($,$,(#4352));
+#4357= IFCANNOTATION('3$Yxl$tqT4lQqzRD2kDuVM',#4,$,$,$,#4351,#4354);
+#4361= IFCPRESENTATIONSTYLEASSIGNMENT((#4343));
+#4363= IFCSTYLEDITEM(#4345,(#4361),$);
+#4367= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--570'),$);
+#4368= IFCPROPERTYSET('0murI$ZjjCFB6FLaHF$k4H',#4,'Allplan Attributes',$
+,(#4367));
+#4370= IFCRELDEFINESBYPROPERTIES('3miBcTzJXAJBEkP3LGtJ0y',#4,$,$,(#4357)
+,#4368);
+#4374= IFCTEXTSTYLEFORDEFINEDFONT(#4375,$);
+#4375= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#4376= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#4377= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#4379= IFCTEXTSTYLE($,#4374,#4376,#4377);
+#4380= IFCTEXTLITERAL('Grundriss  1:50',#4383,.LEFT.);
+#4381= IFCDIRECTION((1.,0.));
+#4383= IFCAXIS2PLACEMENT2D(#4384,#4381);
+#4384= IFCCARTESIANPOINT((83404.88972260105,28213.1435942591));
+#4386= IFCLOCALPLACEMENT($,#1);
+#4387= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#4380));
+#4389= IFCPRODUCTDEFINITIONSHAPE($,$,(#4387));
+#4392= IFCANNOTATION('0Z6ZL3lsPETOSAjPk5Q1iL',#4,$,$,$,#4386,#4389);
+#4396= IFCPRESENTATIONSTYLEASSIGNMENT((#4379));
+#4398= IFCSTYLEDITEM(#4380,(#4396),$);
+#4402= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--562'),$);
+#4403= IFCPROPERTYSET('3RLlXsrrrF_ACdqmyNLRkj',#4,'Allplan Attributes',$
+,(#4402));
+#4405= IFCRELDEFINESBYPROPERTIES('0AMY0$B6r56PBZ4NVAAe9K',#4,$,$,(#4392)
+,#4403);
+#4409= IFCTEXTSTYLEFORDEFINEDFONT(#4410,$);
+#4410= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#4411= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#4412= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#4414= IFCTEXTSTYLE($,#4409,#4411,#4412);
+#4415= IFCTEXTLITERAL('Schnitt A-A  1:20',#4418,.LEFT.);
+#4416= IFCDIRECTION((1.,0.));
+#4418= IFCAXIS2PLACEMENT2D(#4419,#4416);
+#4419= IFCCARTESIANPOINT((64928.65779311588,-3984.138528206891));
+#4421= IFCLOCALPLACEMENT($,#1);
+#4422= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#4415));
+#4424= IFCPRODUCTDEFINITIONSHAPE($,$,(#4422));
+#4427= IFCANNOTATION('0SKcsBQjr9Sgo28s7vmJc5',#4,$,$,$,#4421,#4424);
+#4431= IFCPRESENTATIONSTYLEASSIGNMENT((#4414));
+#4433= IFCSTYLEDITEM(#4415,(#4431),$);
+#4437= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'91a2d109-b8d7-11e3-bf39-7446a0b2bba9--12'),$);
+#4438= IFCPROPERTYSET('0_6Gq7cI50We8mTzJ_P14X',#4,'Allplan Attributes',$
+,(#4437));
+#4440= IFCRELDEFINESBYPROPERTIES('1coZM_6EzDhhhj7Uk4zAlE',#4,$,$,(#4427)
+,#4438);
+#4444= IFCTEXTSTYLEFORDEFINEDFONT(#4445,$);
+#4445= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#4446= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#4447= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#4449= IFCTEXTSTYLE($,#4444,#4446,#4447);
+#4450= IFCTEXTLITERAL('Schnitt B-B  1:20',#4453,.LEFT.);
+#4451= IFCDIRECTION((1.,0.));
+#4453= IFCAXIS2PLACEMENT2D(#4454,#4451);
+#4454= IFCCARTESIANPOINT((71422.32664761796,-3984.138528206888));
+#4456= IFCLOCALPLACEMENT($,#1);
+#4457= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#4450));
+#4459= IFCPRODUCTDEFINITIONSHAPE($,$,(#4457));
+#4462= IFCANNOTATION('06njH83I99vvjR3aBDkxSa',#4,$,$,$,#4456,#4459);
+#4466= IFCPRESENTATIONSTYLEASSIGNMENT((#4449));
+#4468= IFCSTYLEDITEM(#4450,(#4466),$);
+#4472= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'91a2d10d-b8d7-11e3-bf39-7446a0b2bba9--18'),$);
+#4473= IFCPROPERTYSET('1dB5Bt_LP9MgDnRZEUpFBp',#4,'Allplan Attributes',$
+,(#4472));
+#4475= IFCRELDEFINESBYPROPERTIES('1ruJjuaBjFuxp7Mg12lRgr',#4,$,$,(#4462)
+,#4473);
+#4479= IFCTEXTSTYLEFORDEFINEDFONT(#4480,$);
+#4480= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#4481= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#4482= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#4484= IFCTEXTSTYLE($,#4479,#4481,#4482);
+#4485= IFCTEXTLITERAL('Absatz OK Boden 7cm',#4488,.LEFT.);
+#4486= IFCDIRECTION((6.123233995736766E-17,1.));
+#4488= IFCAXIS2PLACEMENT2D(#4489,#4486);
+#4489= IFCCARTESIANPOINT((79188.33333333333,22338.59690241592));
+#4491= IFCLOCALPLACEMENT($,#1);
+#4492= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#4485));
+#4494= IFCPRODUCTDEFINITIONSHAPE($,$,(#4492));
+#4497= IFCANNOTATION('06oXbrljXF1PKjSuvoJfo4',#4,$,$,$,#4491,#4494);
+#4501= IFCPRESENTATIONSTYLEASSIGNMENT((#4484));
+#4503= IFCSTYLEDITEM(#4485,(#4501),$);
+#4507= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'cec2259e-ba67-11e3-bf5f-7446a0b2bba9--11'),$);
+#4508= IFCPROPERTYSET('3v1b_0Iu93vwa12SxT4Prz',#4,'Allplan Attributes',$
+,(#4507));
+#4510= IFCRELDEFINESBYPROPERTIES('3PdruIhJX7R9cMGQfy85dJ',#4,$,$,(#4497)
+,#4508);
+#4514= IFCTEXTSTYLEFORDEFINEDFONT(#4515,$);
+#4515= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#4516= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#4517= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#4519= IFCTEXTSTYLE($,#4514,#4516,#4517);
+#4520= IFCTEXTLITERAL('Absatz OK Boden 7cm',#4523,.LEFT.);
+#4521= IFCDIRECTION((1.,0.));
+#4523= IFCAXIS2PLACEMENT2D(#4524,#4521);
+#4524= IFCCARTESIANPOINT((79777.02674372181,22095.0048305961));
+#4526= IFCLOCALPLACEMENT($,#1);
+#4527= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#4520));
+#4529= IFCPRODUCTDEFINITIONSHAPE($,$,(#4527));
+#4532= IFCANNOTATION('3w_$if5hb6pwhrsly2vv1n',#4,$,$,$,#4526,#4529);
+#4536= IFCPRESENTATIONSTYLEASSIGNMENT((#4519));
+#4538= IFCSTYLEDITEM(#4520,(#4536),$);
+#4542= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'cec2259e-ba67-11e3-bf5f-7446a0b2bba9--12'),$);
+#4543= IFCPROPERTYSET('2aeTmPcqL2GxAs9bessAlP',#4,'Allplan Attributes',$
+,(#4542));
+#4545= IFCRELDEFINESBYPROPERTIES('3dR$ctsoPBBxYSIpL7Wmdk',#4,$,$,(#4532)
+,#4543);
+#4549= IFCTEXTSTYLEFORDEFINEDFONT(#4550,$);
+#4550= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#4551= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#4552= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#4554= IFCTEXTSTYLE($,#4549,#4551,#4552);
+#4555= IFCTEXTLITERAL('Absatz OK Boden 7cm',#4558,.LEFT.);
+#4556= IFCDIRECTION((6.123233995736766E-17,1.));
+#4558= IFCAXIS2PLACEMENT2D(#4559,#4556);
+#4559= IFCCARTESIANPOINT((82025.,22520.04762552151));
+#4561= IFCLOCALPLACEMENT($,#1);
+#4562= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#4555));
+#4564= IFCPRODUCTDEFINITIONSHAPE($,$,(#4562));
+#4567= IFCANNOTATION('0EN16dwbz25xCPNjL4qcn_',#4,$,$,$,#4561,#4564);
+#4571= IFCPRESENTATIONSTYLEASSIGNMENT((#4554));
+#4573= IFCSTYLEDITEM(#4555,(#4571),$);
+#4577= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'cec2259e-ba67-11e3-bf5f-7446a0b2bba9--13'),$);
+#4578= IFCPROPERTYSET('15zf2be1H5ewvvJs3I8W1J',#4,'Allplan Attributes',$
+,(#4577));
+#4580= IFCRELDEFINESBYPROPERTIES('1Lm2P2FMH5u8E9pvpkKnfB',#4,$,$,(#4567)
+,#4578);
+#4584= IFCTEXTSTYLEFORDEFINEDFONT(#4585,$);
+#4585= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#4586= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#4587= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#4589= IFCTEXTSTYLE($,#4584,#4586,#4587);
+#4590= IFCTEXTLITERAL('Absatz OK Boden 7cm',#4593,.LEFT.);
+#4591= IFCDIRECTION((1.,0.));
+#4593= IFCAXIS2PLACEMENT2D(#4594,#4591);
+#4594= IFCCARTESIANPOINT((82528.94870789858,23990.0048305961));
+#4596= IFCLOCALPLACEMENT($,#1);
+#4597= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#4590));
+#4599= IFCPRODUCTDEFINITIONSHAPE($,$,(#4597));
+#4602= IFCANNOTATION('2UuDvysxbDaguLZ7SJ1rcV',#4,$,$,$,#4596,#4599);
+#4606= IFCPRESENTATIONSTYLEASSIGNMENT((#4589));
+#4608= IFCSTYLEDITEM(#4590,(#4606),$);
+#4612= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'cec2259e-ba67-11e3-bf5f-7446a0b2bba9--14'),$);
+#4613= IFCPROPERTYSET('3QpwNVSOP8ZPTHSEHmQW5r',#4,'Allplan Attributes',$
+,(#4612));
+#4615= IFCRELDEFINESBYPROPERTIES('1n3s6$P0f4MQzF3i0ZiEVv',#4,$,$,(#4602)
+,#4613);
+#4619= IFCTEXTSTYLEFORDEFINEDFONT(#4620,$);
+#4620= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#4621= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#4622= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#4624= IFCTEXTSTYLE($,#4619,#4621,#4622);
+#4625= IFCTEXTLITERAL('Absatz OK Boden 7cm',#4628,.LEFT.);
+#4626= IFCDIRECTION((1.,0.));
+#4628= IFCAXIS2PLACEMENT2D(#4629,#4626);
+#4629= IFCCARTESIANPOINT((85062.27633487518,23740.0048305961));
+#4631= IFCLOCALPLACEMENT($,#1);
+#4632= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#4625));
+#4634= IFCPRODUCTDEFINITIONSHAPE($,$,(#4632));
+#4637= IFCANNOTATION('2wqoxnH2f5re$wQnzYV164',#4,$,$,$,#4631,#4634);
+#4641= IFCPRESENTATIONSTYLEASSIGNMENT((#4624));
+#4643= IFCSTYLEDITEM(#4625,(#4641),$);
+#4647= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'cec2259e-ba67-11e3-bf5f-7446a0b2bba9--15'),$);
+#4648= IFCPROPERTYSET('0Mjq072wDBeQUHpzObkr6V',#4,'Allplan Attributes',$
+,(#4647));
+#4650= IFCRELDEFINESBYPROPERTIES('2MCev0fxvFwxJeBBaXwerw',#4,$,$,(#4637)
+,#4648);
+#4654= IFCTEXTSTYLEFORDEFINEDFONT(#4655,$);
+#4655= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#4656= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#4657= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#4659= IFCTEXTSTYLE($,#4654,#4656,#4657);
+#4660= IFCTEXTLITERAL('Absatz UK Boden 7cm',#4663,.LEFT.);
+#4661= IFCDIRECTION((1.,0.));
+#4663= IFCAXIS2PLACEMENT2D(#4664,#4661);
+#4664= IFCCARTESIANPOINT((87412.56598371331,24656.67149726277));
+#4666= IFCLOCALPLACEMENT($,#1);
+#4667= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#4660));
+#4669= IFCPRODUCTDEFINITIONSHAPE($,$,(#4667));
+#4672= IFCANNOTATION('3nt8czKuDE2f$eu2v$N9hc',#4,$,$,$,#4666,#4669);
+#4676= IFCPRESENTATIONSTYLEASSIGNMENT((#4659));
+#4678= IFCSTYLEDITEM(#4660,(#4676),$);
+#4682= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'cec2259e-ba67-11e3-bf5f-7446a0b2bba9--16'),$);
+#4683= IFCPROPERTYSET('0rMeKkbE1Fq8XBhfR4PxqJ',#4,'Allplan Attributes',$
+,(#4682));
+#4685= IFCRELDEFINESBYPROPERTIES('0luyXLM298SuPnNd1r7afB',#4,$,$,(#4672)
+,#4683);
+#4689= IFCTEXTSTYLEFORDEFINEDFONT(#4690,$);
+#4690= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#4691= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#4692= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#4694= IFCTEXTSTYLE($,#4689,#4691,#4692);
+#4695= IFCTEXTLITERAL('Absatz OK Boden 7cm',#4698,.LEFT.);
+#4696= IFCDIRECTION((1.,0.));
+#4698= IFCAXIS2PLACEMENT2D(#4699,#4696);
+#4699= IFCCARTESIANPOINT((90006.89477922957,23740.0048305961));
+#4701= IFCLOCALPLACEMENT($,#1);
+#4702= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#4695));
+#4704= IFCPRODUCTDEFINITIONSHAPE($,$,(#4702));
+#4707= IFCANNOTATION('3J5t5jsRX3RxvZM6$RBUfq',#4,$,$,$,#4701,#4704);
+#4711= IFCPRESENTATIONSTYLEASSIGNMENT((#4694));
+#4713= IFCSTYLEDITEM(#4695,(#4711),$);
+#4717= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'cec2259e-ba67-11e3-bf5f-7446a0b2bba9--17'),$);
+#4718= IFCPROPERTYSET('0PVqLhlYL7Wh$HODtCCqZN',#4,'Allplan Attributes',$
+,(#4717));
+#4720= IFCRELDEFINESBYPROPERTIES('3TrgmqLXbFYh$s16pgxXd$',#4,$,$,(#4707)
+,#4718);
+#4724= IFCTEXTSTYLEFORDEFINEDFONT(#4725,$);
+#4725= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#4726= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#4727= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#4729= IFCTEXTSTYLE($,#4724,#4726,#4727);
+#4730= IFCTEXTLITERAL('W1',#4733,.LEFT.);
+#4731= IFCDIRECTION((1.,0.));
+#4733= IFCAXIS2PLACEMENT2D(#4734,#4731);
+#4734= IFCCARTESIANPOINT((96673.30189202845,24391.04263252323));
+#4736= IFCLOCALPLACEMENT($,#1);
+#4737= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#4730));
+#4739= IFCPRODUCTDEFINITIONSHAPE($,$,(#4737));
+#4742= IFCANNOTATION('3XeHcXK9XFohrz8Ug4DGAX',#4,$,$,$,#4736,#4739);
+#4746= IFCPRESENTATIONSTYLEASSIGNMENT((#4729));
+#4748= IFCSTYLEDITEM(#4730,(#4746),$);
+#4752= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'cec2259e-ba67-11e3-bf5f-7446a0b2bba9--84'),$);
+#4753= IFCPROPERTYSET('2zIJmL9XX3Tw4cneVsAUNM',#4,'Allplan Attributes',$
+,(#4752));
+#4755= IFCRELDEFINESBYPROPERTIES('1fp578KjLFV9RBql7J5Vzl',#4,$,$,(#4742)
+,#4753);
+#4759= IFCTEXTSTYLEFORDEFINEDFONT(#4760,$);
+#4760= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#4761= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#4762= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#4764= IFCTEXTSTYLE($,#4759,#4761,#4762);
+#4765= IFCTEXTLITERAL('C',#4768,.LEFT.);
+#4766= IFCDIRECTION((6.123233995736766E-17,1.));
+#4768= IFCAXIS2PLACEMENT2D(#4769,#4766);
+#4769= IFCCARTESIANPOINT((90860.31738068213,22977.90885162081));
+#4771= IFCLOCALPLACEMENT($,#1);
+#4772= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#4765));
+#4774= IFCPRODUCTDEFINITIONSHAPE($,$,(#4772));
+#4777= IFCANNOTATION('0rNsFszzD6ePhfAdZPWwAq',#4,$,$,$,#4771,#4774);
+#4781= IFCPRESENTATIONSTYLEASSIGNMENT((#4764));
+#4783= IFCSTYLEDITEM(#4765,(#4781),$);
+#4787= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'cec2259e-ba67-11e3-bf5f-7446a0b2bba9--363'),$);
+#4788= IFCPROPERTYSET('1mPaP4cCv2L8fwoPuzDe0E',#4,'Allplan Attributes',$
+,(#4787));
+#4790= IFCRELDEFINESBYPROPERTIES('2mB53bCpTFvPpp1QkutyM1',#4,$,$,(#4777)
+,#4788);
+#4794= IFCTEXTSTYLEFORDEFINEDFONT(#4795,$);
+#4795= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#4796= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#4797= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#4799= IFCTEXTSTYLE($,#4794,#4796,#4797);
+#4800= IFCTEXTLITERAL('C',#4803,.LEFT.);
+#4801= IFCDIRECTION((6.123233995736766E-17,1.));
+#4803= IFCAXIS2PLACEMENT2D(#4804,#4801);
+#4804= IFCCARTESIANPOINT((90860.31738068222,25478.76747622812));
+#4806= IFCLOCALPLACEMENT($,#1);
+#4807= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#4800));
+#4809= IFCPRODUCTDEFINITIONSHAPE($,$,(#4807));
+#4812= IFCANNOTATION('2ppu0qkcTEhgzzhxZ0_zQh',#4,$,$,$,#4806,#4809);
+#4816= IFCPRESENTATIONSTYLEASSIGNMENT((#4799));
+#4818= IFCSTYLEDITEM(#4800,(#4816),$);
+#4822= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'cec2259e-ba67-11e3-bf5f-7446a0b2bba9--364'),$);
+#4823= IFCPROPERTYSET('0TcUQL2O516PJKwlV4SO_M',#4,'Allplan Attributes',$
+,(#4822));
+#4825= IFCRELDEFINESBYPROPERTIES('0saSz2vVPED9ZRDYVaNVAw',#4,$,$,(#4812)
+,#4823);
+#4829= IFCTEXTSTYLEFORDEFINEDFONT(#4830,$);
+#4830= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#4831= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#4832= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#4834= IFCTEXTSTYLE($,#4829,#4831,#4832);
+#4835= IFCTEXTLITERAL('D',#4838,.LEFT.);
+#4836= IFCDIRECTION((6.123233995736766E-17,1.));
+#4838= IFCAXIS2PLACEMENT2D(#4839,#4836);
+#4839= IFCCARTESIANPOINT((83296.74014217944,23227.9088516208));
+#4841= IFCLOCALPLACEMENT($,#1);
+#4842= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#4835));
+#4844= IFCPRODUCTDEFINITIONSHAPE($,$,(#4842));
+#4847= IFCANNOTATION('37l2eMronFShsEOuvN2Sxm',#4,$,$,$,#4841,#4844);
+#4851= IFCPRESENTATIONSTYLEASSIGNMENT((#4834));
+#4853= IFCSTYLEDITEM(#4835,(#4851),$);
+#4857= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'cec2259e-ba67-11e3-bf5f-7446a0b2bba9--367'),$);
+#4858= IFCPROPERTYSET('1vJAnLB4TE4QjPgy4FSU40',#4,'Allplan Attributes',$
+,(#4857));
+#4860= IFCRELDEFINESBYPROPERTIES('200eDCMiTBHw66vuCykJQ3',#4,$,$,(#4847)
+,#4858);
+#4864= IFCTEXTSTYLEFORDEFINEDFONT(#4865,$);
+#4865= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#4866= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#4867= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#4869= IFCTEXTSTYLE($,#4864,#4866,#4867);
+#4870= IFCTEXTLITERAL('D',#4873,.LEFT.);
+#4871= IFCDIRECTION((6.123233995736766E-17,1.));
+#4873= IFCAXIS2PLACEMENT2D(#4874,#4871);
+#4874= IFCCARTESIANPOINT((83296.74014217944,25478.76747622814));
+#4876= IFCLOCALPLACEMENT($,#1);
+#4877= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#4870));
+#4879= IFCPRODUCTDEFINITIONSHAPE($,$,(#4877));
+#4882= IFCANNOTATION('0lCqdQYWn3uQS7ehaSUP5B',#4,$,$,$,#4876,#4879);
+#4886= IFCPRESENTATIONSTYLEASSIGNMENT((#4869));
+#4888= IFCSTYLEDITEM(#4870,(#4886),$);
+#4892= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'cec2259e-ba67-11e3-bf5f-7446a0b2bba9--368'),$);
+#4893= IFCPROPERTYSET('2yW_x$Dmr3PhOlJqVxaRD4',#4,'Allplan Attributes',$
+,(#4892));
+#4895= IFCRELDEFINESBYPROPERTIES('2eierDeu53dOicwqF41pVD',#4,$,$,(#4882)
+,#4893);
+#4899= IFCTEXTSTYLEFORDEFINEDFONT(#4900,$);
+#4900= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#4901= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#4902= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#4904= IFCTEXTSTYLE($,#4899,#4901,#4902);
+#4905= IFCTEXTLITERAL('E',#4908,.LEFT.);
+#4906= IFCDIRECTION((6.123233995736766E-17,1.));
+#4908= IFCAXIS2PLACEMENT2D(#4909,#4906);
+#4909= IFCCARTESIANPOINT((80468.05826830864,25478.76747622814));
+#4911= IFCLOCALPLACEMENT($,#1);
+#4912= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#4905));
+#4914= IFCPRODUCTDEFINITIONSHAPE($,$,(#4912));
+#4917= IFCANNOTATION('0SZV$82Y5BGu0nTSzyIuhy',#4,$,$,$,#4911,#4914);
+#4921= IFCPRESENTATIONSTYLEASSIGNMENT((#4904));
+#4923= IFCSTYLEDITEM(#4905,(#4921),$);
+#4927= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'cec2259e-ba67-11e3-bf5f-7446a0b2bba9--369'),$);
+#4928= IFCPROPERTYSET('1yINqRrqv1TQvM2srY5CRv',#4,'Allplan Attributes',$
+,(#4927));
+#4930= IFCRELDEFINESBYPROPERTIES('1aHMA$UOP9Te3PJWFki8j$',#4,$,$,(#4917)
+,#4928);
+#4934= IFCTEXTSTYLEFORDEFINEDFONT(#4935,$);
+#4935= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#4936= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#4937= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#4939= IFCTEXTSTYLE($,#4934,#4936,#4937);
+#4940= IFCTEXTLITERAL('E',#4943,.LEFT.);
+#4941= IFCDIRECTION((6.123233995736766E-17,1.));
+#4943= IFCAXIS2PLACEMENT2D(#4944,#4941);
+#4944= IFCCARTESIANPOINT((80468.05826830864,21332.9088516208));
+#4946= IFCLOCALPLACEMENT($,#1);
+#4947= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#4940));
+#4949= IFCPRODUCTDEFINITIONSHAPE($,$,(#4947));
+#4952= IFCANNOTATION('2_P0qNFwz4RBfh$nvmvBnV',#4,$,$,$,#4946,#4949);
+#4956= IFCPRESENTATIONSTYLEASSIGNMENT((#4939));
+#4958= IFCSTYLEDITEM(#4940,(#4956),$);
+#4962= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'cec2259e-ba67-11e3-bf5f-7446a0b2bba9--370'),$);
+#4963= IFCPROPERTYSET('3dWNMhpI9D4vtCpC9PRVa7',#4,'Allplan Attributes',$
+,(#4962));
+#4965= IFCRELDEFINESBYPROPERTIES('1mn3pEy8T1nuOTgkJ_IY4q',#4,$,$,(#4952)
+,#4963);
+#4969= IFCTEXTSTYLEFORDEFINEDFONT(#4970,$);
+#4970= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#4971= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#4972= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#4974= IFCTEXTSTYLE($,#4969,#4971,#4972);
+#4975= IFCTEXTLITERAL('F',#4978,.LEFT.);
+#4976= IFCDIRECTION((1.,0.));
+#4978= IFCAXIS2PLACEMENT2D(#4979,#4976);
+#4979= IFCCARTESIANPOINT((78332.9040210247,23164.44656228746));
+#4981= IFCLOCALPLACEMENT($,#1);
+#4982= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#4975));
+#4984= IFCPRODUCTDEFINITIONSHAPE($,$,(#4982));
+#4987= IFCANNOTATION('18jPQ9Czr0hef5_rbzQHNP',#4,$,$,$,#4981,#4984);
+#4991= IFCPRESENTATIONSTYLEASSIGNMENT((#4974));
+#4993= IFCSTYLEDITEM(#4975,(#4991),$);
+#4997= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'cec2259e-ba67-11e3-bf5f-7446a0b2bba9--371'),$);
+#4998= IFCPROPERTYSET('1UD3Kvp9r9V9ZQQ7TeAEdC',#4,'Allplan Attributes',$
+,(#4997));
+#5000= IFCRELDEFINESBYPROPERTIES('21BD6za$583vL8giGWn4K_',#4,$,$,(#4987)
+,#4998);
+#5004= IFCTEXTSTYLEFORDEFINEDFONT(#5005,$);
+#5005= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#5006= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#5007= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#5009= IFCTEXTSTYLE($,#5004,#5006,#5007);
+#5010= IFCTEXTLITERAL('F',#5013,.LEFT.);
+#5011= IFCDIRECTION((1.,0.));
+#5013= IFCAXIS2PLACEMENT2D(#5014,#5011);
+#5014= IFCCARTESIANPOINT((82553.76264563203,23164.44656228746));
+#5016= IFCLOCALPLACEMENT($,#1);
+#5017= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#5010));
+#5019= IFCPRODUCTDEFINITIONSHAPE($,$,(#5017));
+#5022= IFCANNOTATION('2KFVYZko9DAAfHKv0NvRgQ',#4,$,$,$,#5016,#5019);
+#5026= IFCPRESENTATIONSTYLEASSIGNMENT((#5009));
+#5028= IFCSTYLEDITEM(#5010,(#5026),$);
+#5032= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'cec2259e-ba67-11e3-bf5f-7446a0b2bba9--372'),$);
+#5033= IFCPROPERTYSET('2BG4DKBQP6ah9NfhQTZTni',#4,'Allplan Attributes',$
+,(#5032));
+#5035= IFCRELDEFINESBYPROPERTIES('13_91feaHAnRqPds6yUE6G',#4,$,$,(#5022)
+,#5033);
+#5039= IFCTEXTSTYLEFORDEFINEDFONT(#5040,$);
+#5040= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#5041= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#5042= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#5044= IFCTEXTSTYLE($,#5039,#5041,#5042);
+#5045= IFCTEXTLITERAL('G',#5048,.LEFT.);
+#5046= IFCDIRECTION((1.,0.));
+#5048= IFCAXIS2PLACEMENT2D(#5049,#5046);
+#5049= IFCCARTESIANPOINT((83082.9040210247,21519.44656228746));
+#5051= IFCLOCALPLACEMENT($,#1);
+#5052= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#5045));
+#5054= IFCPRODUCTDEFINITIONSHAPE($,$,(#5052));
+#5057= IFCANNOTATION('3LWKvNeFb3KhBkNetYyMOi',#4,$,$,$,#5051,#5054);
+#5061= IFCPRESENTATIONSTYLEASSIGNMENT((#5044));
+#5063= IFCSTYLEDITEM(#5045,(#5061),$);
+#5067= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'cec2259e-ba67-11e3-bf5f-7446a0b2bba9--373'),$);
+#5068= IFCPROPERTYSET('0L7bC7Nv53gg2J5VfWX2Sm',#4,'Allplan Attributes',$
+,(#5067));
+#5070= IFCRELDEFINESBYPROPERTIES('0HahXJIjTBFB0E7jJHIS4F',#4,$,$,(#5057)
+,#5068);
+#5074= IFCTEXTSTYLEFORDEFINEDFONT(#5075,$);
+#5075= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#5076= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#5077= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#5079= IFCTEXTSTYLE($,#5074,#5076,#5077);
+#5080= IFCTEXTLITERAL('G',#5083,.LEFT.);
+#5081= IFCDIRECTION((1.,0.));
+#5083= IFCAXIS2PLACEMENT2D(#5084,#5081);
+#5084= IFCCARTESIANPOINT((85033.76264563203,21519.44656228747));
+#5086= IFCLOCALPLACEMENT($,#1);
+#5087= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#5080));
+#5089= IFCPRODUCTDEFINITIONSHAPE($,$,(#5087));
+#5092= IFCANNOTATION('1Trc7Wx5r9vxvjAp_UyQf8',#4,$,$,$,#5086,#5089);
+#5096= IFCPRESENTATIONSTYLEASSIGNMENT((#5079));
+#5098= IFCSTYLEDITEM(#5080,(#5096),$);
+#5102= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'cec2259e-ba67-11e3-bf5f-7446a0b2bba9--374'),$);
+#5103= IFCPROPERTYSET('0oPRGaUeH90RIZ2hycZuf8',#4,'Allplan Attributes',$
+,(#5102));
+#5105= IFCRELDEFINESBYPROPERTIES('39PL20PgvFYfli1PPIGEiT',#4,$,$,(#5092)
+,#5103);
+#5109= IFCTEXTSTYLEFORDEFINEDFONT(#5110,$);
+#5110= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#5111= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#5112= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#5114= IFCTEXTSTYLE($,#5109,#5111,#5112);
+#5115= IFCTEXTLITERAL('W2',#5118,.LEFT.);
+#5116= IFCDIRECTION((1.,0.));
+#5118= IFCAXIS2PLACEMENT2D(#5119,#5116);
+#5119= IFCCARTESIANPOINT((92123.80189202847,25631.04263252323));
+#5121= IFCLOCALPLACEMENT($,#1);
+#5122= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#5115));
+#5124= IFCPRODUCTDEFINITIONSHAPE($,$,(#5122));
+#5127= IFCANNOTATION('1TClIpV9T7vun9Fs1iyrxZ',#4,$,$,$,#5121,#5124);
+#5131= IFCPRESENTATIONSTYLEASSIGNMENT((#5114));
+#5133= IFCSTYLEDITEM(#5115,(#5131),$);
+#5137= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'cec2259e-ba67-11e3-bf5f-7446a0b2bba9--419'),$);
+#5138= IFCPROPERTYSET('1qs0navDn6WQdjpLE$_ont',#4,'Allplan Attributes',$
+,(#5137));
+#5140= IFCRELDEFINESBYPROPERTIES('0HFU$_Px16XxeGj717mPfl',#4,$,$,(#5127)
+,#5138);
+#5144= IFCTEXTSTYLEFORDEFINEDFONT(#5145,$);
+#5145= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#5146= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#5147= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#5149= IFCTEXTSTYLE($,#5144,#5146,#5147);
+#5150= IFCTEXTLITERAL('Einlage 15x25cm',#5153,.LEFT.);
+#5151= IFCDIRECTION((1.,0.));
+#5153= IFCAXIS2PLACEMENT2D(#5154,#5151);
+#5154= IFCCARTESIANPOINT((94135.,8666.671497262763));
+#5156= IFCLOCALPLACEMENT($,#1);
+#5157= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#5150));
+#5159= IFCPRODUCTDEFINITIONSHAPE($,$,(#5157));
+#5162= IFCANNOTATION('2ZNGFsbwj5nA5hCxytJzoG',#4,$,$,$,#5156,#5159);
+#5166= IFCPRESENTATIONSTYLEASSIGNMENT((#5149));
+#5168= IFCSTYLEDITEM(#5150,(#5166),$);
+#5172= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'cec2259e-ba67-11e3-bf5f-7446a0b2bba9--557'),$);
+#5173= IFCPROPERTYSET('0g7gw9AgL4Y8siHKjahSKT',#4,'Allplan Attributes',$
+,(#5172));
+#5175= IFCRELDEFINESBYPROPERTIES('36_nrkrIT4WBllnoMh1gCo',#4,$,$,(#5162)
+,#5173);
+#5179= IFCTEXTSTYLEFORDEFINEDFONT(#5180,$);
+#5180= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#5181= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#5182= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#5184= IFCTEXTSTYLE($,#5179,#5181,#5182);
+#5185= IFCTEXTLITERAL('Arbeitsfuge mit Quellfugenband !',#5188,.LEFT.);
+#5186= IFCDIRECTION((6.123233995736766E-17,1.));
+#5188= IFCAXIS2PLACEMENT2D(#5189,#5186);
+#5189= IFCCARTESIANPOINT((77728.33333333336,11056.97175194527));
+#5191= IFCLOCALPLACEMENT($,#1);
+#5192= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#5185));
+#5194= IFCPRODUCTDEFINITIONSHAPE($,$,(#5192));
+#5197= IFCANNOTATION('0ZBTr2PP58xePNHsxJKhx0',#4,$,$,$,#5191,#5194);
+#5201= IFCPRESENTATIONSTYLEASSIGNMENT((#5184));
+#5203= IFCSTYLEDITEM(#5185,(#5201),$);
+#5207= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'cec2259e-ba67-11e3-bf5f-7446a0b2bba9--564'),$);
+#5208= IFCPROPERTYSET('0AqEngQR1EZQdjfXz2OMMM',#4,'Allplan Attributes',$
+,(#5207));
+#5210= IFCRELDEFINESBYPROPERTIES('0it$UPYs14J8SpKqaR8fuF',#4,$,$,(#5197)
+,#5208);
+#5214= IFCTEXTSTYLEFORDEFINEDFONT(#5215,$);
+#5215= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#5216= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#5217= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#5219= IFCTEXTSTYLE($,#5214,#5216,#5217);
+#5220= IFCTEXTLITERAL('Arbeitsfuge mit Quellfugenband !',#5223,.LEFT.);
+#5221= IFCDIRECTION((6.123233995736766E-17,1.));
+#5223= IFCAXIS2PLACEMENT2D(#5224,#5221);
+#5224= IFCCARTESIANPOINT((77728.33333333336,21266.51780159047));
+#5226= IFCLOCALPLACEMENT($,#1);
+#5227= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#5220));
+#5229= IFCPRODUCTDEFINITIONSHAPE($,$,(#5227));
+#5232= IFCANNOTATION('0C4ofbIP1BaAmu7_h4Imvu',#4,$,$,$,#5226,#5229);
+#5236= IFCPRESENTATIONSTYLEASSIGNMENT((#5219));
+#5238= IFCSTYLEDITEM(#5220,(#5236),$);
+#5242= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'cec2259e-ba67-11e3-bf5f-7446a0b2bba9--565'),$);
+#5243= IFCPROPERTYSET('2jLhSzuc1FTPDbA19A$i8N',#4,'Allplan Attributes',$
+,(#5242));
+#5245= IFCRELDEFINESBYPROPERTIES('2KwzBo6NTFJPdCbxzQZZ6A',#4,$,$,(#5232)
+,#5243);
+#5249= IFCTEXTSTYLEFORDEFINEDFONT(#5250,$);
+#5250= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#5251= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#5252= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#5254= IFCTEXTSTYLE($,#5249,#5251,#5252);
+#5255= IFCTEXTLITERAL('W2',#5258,.LEFT.);
+#5256= IFCDIRECTION((1.,0.));
+#5258= IFCAXIS2PLACEMENT2D(#5259,#5256);
+#5259= IFCCARTESIANPOINT((84628.30189202848,27671.04263252323));
+#5261= IFCLOCALPLACEMENT($,#1);
+#5262= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#5255));
+#5264= IFCPRODUCTDEFINITIONSHAPE($,$,(#5262));
+#5267= IFCANNOTATION('3Z33ifckL4NPJRdUQehcNt',#4,$,$,$,#5261,#5264);
+#5271= IFCPRESENTATIONSTYLEASSIGNMENT((#5254));
+#5273= IFCSTYLEDITEM(#5255,(#5271),$);
+#5277= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'cec2259e-ba67-11e3-bf5f-7446a0b2bba9--418'),$);
+#5278= IFCPROPERTYSET('0LOBjU$QrERuz_yT8orC0z',#4,'Allplan Attributes',$
+,(#5277));
+#5280= IFCRELDEFINESBYPROPERTIES('2ghcJdI5TEvAQiyHu3BH$e',#4,$,$,(#5267)
+,#5278);
+#5284= IFCTEXTSTYLEFORDEFINEDFONT(#5285,$);
+#5285= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#5286= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#5287= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#5289= IFCTEXTSTYLE($,#5284,#5286,#5287);
+#5290= IFCTEXTLITERAL('f6',#5293,.LEFT.);
+#5291= IFCDIRECTION((1.,0.));
+#5293= IFCAXIS2PLACEMENT2D(#5294,#5291);
+#5294= IFCCARTESIANPOINT((84770.96093109455,16601.04263252323));
+#5296= IFCLOCALPLACEMENT($,#1);
+#5297= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#5290));
+#5299= IFCPRODUCTDEFINITIONSHAPE($,$,(#5297));
+#5302= IFCANNOTATION('3OhGOCAsDBruMON$dhOMV3',#4,$,$,$,#5296,#5299);
+#5306= IFCPRESENTATIONSTYLEASSIGNMENT((#5289));
+#5308= IFCSTYLEDITEM(#5290,(#5306),$);
+#5312= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'cec2259e-ba67-11e3-bf5f-7446a0b2bba9--491'),$);
+#5313= IFCPROPERTYSET('0A3msmyzP6kAuNooqip5h2',#4,'Allplan Attributes',$
+,(#5312));
+#5315= IFCRELDEFINESBYPROPERTIES('0UQwyrxwLC$9B6oA6yMTzR',#4,$,$,(#5302)
+,#5313);
+#5319= IFCTEXTSTYLEFORDEFINEDFONT(#5320,$);
+#5320= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#5321= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#5322= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#5324= IFCTEXTSTYLE($,#5319,#5321,#5322);
+#5325= IFCTEXTLITERAL('Absatz OK Boden 7cm',#5328,.LEFT.);
+#5326= IFCDIRECTION((1.,0.));
+#5328= IFCAXIS2PLACEMENT2D(#5329,#5326);
+#5329= IFCCARTESIANPOINT((77265.00000000003,23740.00483059611));
+#5331= IFCLOCALPLACEMENT($,#1);
+#5332= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#5325));
+#5334= IFCPRODUCTDEFINITIONSHAPE($,$,(#5332));
+#5337= IFCANNOTATION('0k1zMlMij3uPm7P68FW2yN',#4,$,$,$,#5331,#5334);
+#5341= IFCPRESENTATIONSTYLEASSIGNMENT((#5324));
+#5343= IFCSTYLEDITEM(#5325,(#5341),$);
+#5347= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'cec2259e-ba67-11e3-bf5f-7446a0b2bba9--9'),$);
+#5348= IFCPROPERTYSET('0dDExZap10O8_pyQJkgKz9',#4,'Allplan Attributes',$
+,(#5347));
+#5350= IFCRELDEFINESBYPROPERTIES('0H7TzcQuP5mvHB6ifpOcdS',#4,$,$,(#5337)
+,#5348);
+#5354= IFCTEXTSTYLEFORDEFINEDFONT(#5355,$);
+#5355= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#5356= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#5357= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#5359= IFCTEXTSTYLE($,#5354,#5356,#5357);
+#5360= IFCTEXTLITERAL('Absatz UK Boden 7cm',#5363,.LEFT.);
+#5361= IFCDIRECTION((1.,0.));
+#5363= IFCAXIS2PLACEMENT2D(#5364,#5361);
+#5364= IFCCARTESIANPOINT((77261.26060803561,24656.67149726277));
+#5366= IFCLOCALPLACEMENT($,#1);
+#5367= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#5360));
+#5369= IFCPRODUCTDEFINITIONSHAPE($,$,(#5367));
+#5372= IFCANNOTATION('0bTVng2_X7Lukp$lBvpqGz',#4,$,$,$,#5366,#5369);
+#5376= IFCPRESENTATIONSTYLEASSIGNMENT((#5359));
+#5378= IFCSTYLEDITEM(#5360,(#5376),$);
+#5382= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'cec2259e-ba67-11e3-bf5f-7446a0b2bba9--10'),$);
+#5383= IFCPROPERTYSET('3ch7MWrlHArgu1NoLWZ2iC',#4,'Allplan Attributes',$
+,(#5382));
+#5385= IFCRELDEFINESBYPROPERTIES('2mk$XJGSr3SAjFNrC95A5O',#4,$,$,(#5372)
+,#5383);
+#5389= IFCTEXTSTYLEFORDEFINEDFONT(#5390,$);
+#5390= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#5391= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#5392= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(350.));
+#5394= IFCTEXTSTYLE($,#5389,#5391,#5392);
+#5395= IFCTEXTLITERAL('d = 25cm',#5398,.LEFT.);
+#5396= IFCDIRECTION((1.,0.));
+#5398= IFCAXIS2PLACEMENT2D(#5399,#5396);
+#5399= IFCCARTESIANPOINT((92662.10678118655,28171.27827844931));
+#5401= IFCLOCALPLACEMENT($,#1);
+#5402= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#5395));
+#5404= IFCPRODUCTDEFINITIONSHAPE($,$,(#5402));
+#5407= IFCANNOTATION('2ErOH7RQ18sfOOyU8rNYQa',#4,$,$,$,#5401,#5404);
+#5411= IFCPRESENTATIONSTYLEASSIGNMENT((#5394));
+#5413= IFCSTYLEDITEM(#5395,(#5411),$);
+#5417= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'cec2259e-ba67-11e3-bf5f-7446a0b2bba9--346'),$);
+#5418= IFCPROPERTYSET('1ir69iuCr0oRqlIaTTZ8OL',#4,'Allplan Attributes',$
+,(#5417));
+#5420= IFCRELDEFINESBYPROPERTIES('1HLGDYINv9t9nl5MNbcF_B',#4,$,$,(#5407)
+,#5418);
+#5424= IFCTEXTSTYLEFORDEFINEDFONT(#5425,$);
+#5425= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#5426= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.5));
+#5427= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(300.));
+#5429= IFCTEXTSTYLE($,#5424,#5426,#5427);
+#5430= IFCPLANAREXTENT(2910.,825.);
+#5431= IFCTEXTLITERALWITHEXTENT(
+'OK= -0.07, UK= -0.32\X\0A+ 20cm D\X2\00E4\X0\mmung (UK= -0.52)\X\0A+ 2cm Splitt (UK= -0.54)\X\0A+ 5cm Magerbeton (UK= -0.59)'
+,#5434,.LEFT.,#5430,'top-left');
+#5432= IFCDIRECTION((1.,0.));
+#5434= IFCAXIS2PLACEMENT2D(#5435,#5432);
+#5435= IFCCARTESIANPOINT((92662.10678118655,28062.11161178265));
+#5437= IFCLOCALPLACEMENT($,#1);
+#5438= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#5431));
+#5440= IFCPRODUCTDEFINITIONSHAPE($,$,(#5438));
+#5443= IFCANNOTATION('05Xn1ag5X1$RdNZrbffpJ9',#4,$,$,$,#5437,#5440);
+#5447= IFCPRESENTATIONSTYLEASSIGNMENT((#5429));
+#5449= IFCSTYLEDITEM(#5431,(#5447),$);
+#5453= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'cec2259e-ba67-11e3-bf5f-7446a0b2bba9--566'),$);
+#5454= IFCPROPERTYSET('2QED9Zhhr7HBPyUML8GTl$',#4,'Allplan Attributes',$
+,(#5453));
+#5456= IFCRELDEFINESBYPROPERTIES('30VJSdaPv7xfFbpWVPXsah',#4,$,$,(#5443)
+,#5454);
+#5460= IFCTEXTSTYLEFORDEFINEDFONT(#5461,$);
+#5461= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#5462= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#5463= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(350.));
+#5465= IFCTEXTSTYLE($,#5460,#5462,#5463);
+#5466= IFCTEXTLITERAL('d = 25cm',#5469,.LEFT.);
+#5467= IFCDIRECTION((1.,0.));
+#5469= IFCAXIS2PLACEMENT2D(#5470,#5467);
+#5470= IFCCARTESIANPOINT((102562.1067811866,24891.27827844933));
+#5472= IFCLOCALPLACEMENT($,#1);
+#5473= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#5466));
+#5475= IFCPRODUCTDEFINITIONSHAPE($,$,(#5473));
+#5478= IFCANNOTATION('0qsL05r_XBJf7IDGsqCfNm',#4,$,$,$,#5472,#5475);
+#5482= IFCPRESENTATIONSTYLEASSIGNMENT((#5465));
+#5484= IFCSTYLEDITEM(#5466,(#5482),$);
+#5488= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'cec2259e-ba67-11e3-bf5f-7446a0b2bba9--568'),$);
+#5489= IFCPROPERTYSET('1ToLupt31A2uk4_bzKACEW',#4,'Allplan Attributes',$
+,(#5488));
+#5491= IFCRELDEFINESBYPROPERTIES('1qinTlp7v8jgtLOga0XeF0',#4,$,$,(#5478)
+,#5489);
+#5495= IFCTEXTSTYLEFORDEFINEDFONT(#5496,$);
+#5496= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#5497= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.5));
+#5498= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(300.));
+#5500= IFCTEXTSTYLE($,#5495,#5497,#5498);
+#5501= IFCPLANAREXTENT(2910.,825.);
+#5502= IFCTEXTLITERALWITHEXTENT(
+'OK= -0.14, UK= -0.39\X\0A+ 20cm D\X2\00E4\X0\mmung (UK= -0.59)\X\0A+ 2cm Splitt (UK= -0.61)\X\0A+ 5cm Magerbeton (UK= -0.66)'
+,#5505,.LEFT.,#5501,'top-left');
+#5503= IFCDIRECTION((1.,0.));
+#5505= IFCAXIS2PLACEMENT2D(#5506,#5503);
+#5506= IFCCARTESIANPOINT((102562.1067811866,24782.11161178265));
+#5508= IFCLOCALPLACEMENT($,#1);
+#5509= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#5502));
+#5511= IFCPRODUCTDEFINITIONSHAPE($,$,(#5509));
+#5514= IFCANNOTATION('1GfOGdZvjDe8S1pjO3k$ii',#4,$,$,$,#5508,#5511);
+#5518= IFCPRESENTATIONSTYLEASSIGNMENT((#5500));
+#5520= IFCSTYLEDITEM(#5502,(#5518),$);
+#5524= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'cec2259e-ba67-11e3-bf5f-7446a0b2bba9--569'),$);
+#5525= IFCPROPERTYSET('1GpedePUr2W8mYB11KBDXH',#4,'Allplan Attributes',$
+,(#5524));
+#5527= IFCRELDEFINESBYPROPERTIES('2y90bVg9L34vlpyDu4gn75',#4,$,$,(#5514)
+,#5525);
+#5531= IFCTEXTSTYLEFORDEFINEDFONT(#5532,$);
+#5532= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#5533= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.6));
+#5534= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(250.));
+#5536= IFCTEXTSTYLE($,#5531,#5533,#5534);
+#5537= IFCTEXTLITERAL('Stosseisen',#5540,.LEFT.);
+#5538= IFCDIRECTION((6.123233995736766E-17,1.));
+#5540= IFCAXIS2PLACEMENT2D(#5541,#5538);
+#5541= IFCCARTESIANPOINT((78306.79114055212,5889.799055269293));
+#5543= IFCLOCALPLACEMENT($,#1);
+#5544= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#5537));
+#5546= IFCPRODUCTDEFINITIONSHAPE($,$,(#5544));
+#5549= IFCANNOTATION('3qUUzLybnCLBEsOa_m1sfL',#4,$,$,$,#5543,#5546);
+#5553= IFCPRESENTATIONSTYLEASSIGNMENT((#5536));
+#5555= IFCSTYLEDITEM(#5537,(#5553),$);
+#5559= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'cec2259e-ba67-11e3-bf5f-7446a0b2bba9--18051824'),$);
+#5560= IFCPROPERTYSET('2Yr1QeyBr4iueeB416vR9l',#4,'Allplan Attributes',$
+,(#5559));
+#5562= IFCRELDEFINESBYPROPERTIES('3DCOWlvGr5qwN0BRZVg35k',#4,$,$,(#5549)
+,#5560);
+#5566= IFCTEXTSTYLEFORDEFINEDFONT(#5567,$);
+#5567= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#5568= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#5569= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#5571= IFCTEXTSTYLE($,#5566,#5568,#5569);
+#5572= IFCTEXTLITERAL('Grundriss  1:50',#5575,.LEFT.);
+#5573= IFCDIRECTION((1.,0.));
+#5575= IFCAXIS2PLACEMENT2D(#5576,#5573);
+#5576= IFCCARTESIANPOINT((90241.51411137544,30369.03269149964));
+#5578= IFCLOCALPLACEMENT($,#1);
+#5579= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#5572));
+#5581= IFCPRODUCTDEFINITIONSHAPE($,$,(#5579));
+#5584= IFCANNOTATION('1cP1HUyjD90wY_87HV62xj',#4,$,$,$,#5578,#5581);
+#5588= IFCPRESENTATIONSTYLEASSIGNMENT((#5571));
+#5590= IFCSTYLEDITEM(#5572,(#5588),$);
+#5594= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'cec2259e-ba67-11e3-bf5f-7446a0b2bba9--562'),$);
+#5595= IFCPROPERTYSET('3NuPRy0r5FDwa$MRNbqkfz',#4,'Allplan Attributes',$
+,(#5594));
+#5597= IFCRELDEFINESBYPROPERTIES('3pl3G5bgD0mOhzKMi6yUdT',#4,$,$,(#5584)
+,#5595);
+#5601= IFCTEXTSTYLEFORDEFINEDFONT(#5602,$);
+#5602= IFCCOLOURRGB($,0.4392156862745098,0.4392156862745098,1.);
+#5603= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.5));
+#5604= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(250.));
+#5606= IFCTEXTSTYLE($,#5601,#5603,#5604);
+#5607= IFCPLANAREXTENT(4979.166666666672,312.5);
+#5608= IFCTEXTLITERALWITHEXTENT(
+'unter Fundamente mit Sickerbeton 32/45mm CEM 200 kg/m\X2\00B3\X0\\X\0Aoder Magerbeton CEM 200 kg/m\X2\00B3\X0\ bis auf Kiesschicht fundieren !'
+,#5611,.LEFT.,#5607,'top-left');
+#5609= IFCDIRECTION((1.,0.));
+#5611= IFCAXIS2PLACEMENT2D(#5612,#5609);
+#5612= IFCCARTESIANPOINT((79040.90503321811,12115.36635853764));
+#5614= IFCLOCALPLACEMENT($,#1);
+#5615= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#5608));
+#5617= IFCPRODUCTDEFINITIONSHAPE($,$,(#5615));
+#5620= IFCANNOTATION('2Chyimq1L4ahFsraXEwasc',#4,$,$,$,#5614,#5617);
+#5624= IFCPRESENTATIONSTYLEASSIGNMENT((#5606));
+#5626= IFCSTYLEDITEM(#5608,(#5624),$);
+#5630= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'cec2259e-ba67-11e3-bf5f-7446a0b2bba9--530'),$);
+#5631= IFCPROPERTYSET('3ffcolr311uQ7nbLIaUDhH',#4,'Allplan Attributes',$
+,(#5630));
+#5633= IFCRELDEFINESBYPROPERTIES('2IXo7wETT1S8Y32ASDNHTB',#4,$,$,(#5620)
+,#5631);
+#5637= IFCAXIS2PLACEMENT3D(#5638,#5640,#5642);
+#5638= IFCCARTESIANPOINT((29904.99,22019.99,-250.01));
+#5640= IFCDIRECTION((0.,0.,1.));
+#5642= IFCDIRECTION((1.,0.,0.));
+#5644= IFCLOCALPLACEMENT(#71,#5637);
+#5646= IFCSHAPEREPRESENTATION(#34,'Body','Brep',(#5728));
+#5648= IFCCARTESIANPOINT((2250.010000000002,2100.009999999998,
+0.009999999999990905));
+#5650= IFCCARTESIANPOINT((0.009999999998399289,2100.009999999998,
+0.009999999999990905));
+#5652= IFCCARTESIANPOINT((0.009999999998399289,0.009999999998399289,
+0.009999999999990905));
+#5654= IFCCARTESIANPOINT((2250.010000000002,0.009999999998399289,
+0.009999999999990905));
+#5656= IFCPOLYLOOP((#5648,#5650,#5652,#5654));
+#5658= IFCFACEOUTERBOUND(#5656,.F.);
+#5659= IFCFACE((#5658));
+#5661= IFCCARTESIANPOINT((0.009999999998399289,2100.009999999998,250.01)
+);
+#5663= IFCCARTESIANPOINT((2250.010000000002,2100.009999999998,250.01));
+#5665= IFCCARTESIANPOINT((2250.010000000002,0.009999999998399289,250.01)
+);
+#5667= IFCCARTESIANPOINT((0.009999999998399289,0.009999999998399289,
+250.01));
+#5669= IFCPOLYLOOP((#5661,#5663,#5665,#5667));
+#5671= IFCFACEOUTERBOUND(#5669,.F.);
+#5672= IFCFACE((#5671));
+#5674= IFCCARTESIANPOINT((0.009999999998399289,2100.009999999998,
+0.009999999999990905));
+#5676= IFCCARTESIANPOINT((2250.010000000002,2100.009999999998,
+0.009999999999990905));
+#5678= IFCCARTESIANPOINT((2250.010000000002,2100.009999999998,250.01));
+#5680= IFCCARTESIANPOINT((0.009999999998399289,2100.009999999998,250.01)
+);
+#5682= IFCPOLYLOOP((#5674,#5676,#5678,#5680));
+#5684= IFCFACEOUTERBOUND(#5682,.F.);
+#5685= IFCFACE((#5684));
+#5687= IFCCARTESIANPOINT((0.009999999998399289,0.009999999998399289,
+0.009999999999990905));
+#5689= IFCCARTESIANPOINT((0.009999999998399289,2100.009999999998,
+0.009999999999990905));
+#5691= IFCCARTESIANPOINT((0.009999999998399289,2100.009999999998,250.01)
+);
+#5693= IFCCARTESIANPOINT((0.009999999998399289,0.009999999998399289,
+250.01));
+#5695= IFCPOLYLOOP((#5687,#5689,#5691,#5693));
+#5697= IFCFACEOUTERBOUND(#5695,.F.);
+#5698= IFCFACE((#5697));
+#5700= IFCCARTESIANPOINT((2250.010000000002,0.009999999998399289,
+0.009999999999990905));
+#5702= IFCCARTESIANPOINT((0.009999999998399289,0.009999999998399289,
+0.009999999999990905));
+#5704= IFCCARTESIANPOINT((0.009999999998399289,0.009999999998399289,
+250.01));
+#5706= IFCCARTESIANPOINT((2250.010000000002,0.009999999998399289,250.01)
+);
+#5708= IFCPOLYLOOP((#5700,#5702,#5704,#5706));
+#5710= IFCFACEOUTERBOUND(#5708,.F.);
+#5711= IFCFACE((#5710));
+#5713= IFCCARTESIANPOINT((2250.010000000002,2100.009999999998,
+0.009999999999990905));
+#5715= IFCCARTESIANPOINT((2250.010000000002,0.009999999998399289,
+0.009999999999990905));
+#5717= IFCCARTESIANPOINT((2250.010000000002,0.009999999998399289,250.01)
+);
+#5719= IFCCARTESIANPOINT((2250.010000000002,2100.009999999998,250.01));
+#5721= IFCPOLYLOOP((#5713,#5715,#5717,#5719));
+#5723= IFCFACEOUTERBOUND(#5721,.F.);
+#5724= IFCFACE((#5723));
+#5726= IFCCLOSEDSHELL((#5659,#5672,#5685,#5698,#5711,#5724));
+#5728= IFCFACETEDBREP(#5726);
+#5729= IFCCURVESTYLE($,$,IFCDESCRIPTIVEMEASURE('by layer'),$);
+#5730= IFCSURFACESTYLERENDERING(#5731,0.6,IFCNORMALISEDRATIOMEASURE(1.),
+$,$,IFCNORMALISEDRATIOMEASURE(0.),#5732,IFCSPECULAREXPONENT(50.),
+.NOTDEFINED.);
+#5731= IFCCOLOURRGB($,0.9411764705882353,1.,0.9411764705882353);
+#5732= IFCCOLOURRGB($,1.,1.,1.);
+#5733= IFCSURFACESTYLE('ch-beton bewehrt_transparent',.BOTH.,(#5730));
+#5735= IFCPRESENTATIONSTYLEASSIGNMENT((#5729,#5733));
+#5737= IFCSTYLEDITEM(#5728,(#5735),$);
+#5741= IFCPRODUCTDEFINITIONSHAPE('Explicit Shape',$,(#5646));
+#5744= IFCCURVESTYLE($,#5748,IFCPOSITIVELENGTHMEASURE(50.),#5749);
+#5745= IFCCURVESTYLEFONT($,(#5747));
+#5747= IFCCURVESTYLEFONTPATTERN(0.2,1.);
+#5748= IFCCURVESTYLEFONTANDSCALING($,#5745,100.);
+#5749= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#5750= IFCPRESENTATIONLAYERWITHSTYLE('Fundamentplatte',$,(#5646,#5797),
+'BE_F_PLATT',.T.,.U.,.F.,(#5744));
+#5754= IFCFOOTING('3YTosakmrE0ROeFZfq0SeQ',#4,' ',$,$,#5644,#5741,$,
+.NOTDEFINED.);
+#5769= IFCQUANTITYLENGTH('Length',$,#24,2.1);
+#5771= IFCQUANTITYLENGTH('Width',$,#24,2.25);
+#5772= IFCQUANTITYLENGTH('Height',$,#24,0.25);
+#5773= IFCQUANTITYVOLUME('NetVolume',$,#31,1.181250000000002);
+#5774= IFCELEMENTQUANTITY('1fOs9zmpr9EAoDGHp5KCPs',#4,
+'FootingQuantities',$,$,(#5769,#5771,#5772,#5773));
+#5776= IFCRELDEFINESBYPROPERTIES('1MRsCvcWbAfA_dW$N6dPUb',#4,$,$,(#5754)
+,#5774);
+#5780= IFCPROPERTYSINGLEVALUE('Einheit',$,IFCDESCRIPTIVEMEASURE(
+'m\X2\00B2\X0\'),$);
+#5781= IFCPROPERTYSINGLEVALUE('Gewerk',$,IFCDESCRIPTIVEMEASURE(
+'Betonarbeiten'),$);
+#5782= IFCPROPERTYSINGLEVALUE('Objektname',$,IFCDESCRIPTIVEMEASURE(
+'Plattenfundament'),$);
+#5783= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'d43bfeac-97be-11e3-81b4-7446a0b2bbe5--2'),$);
+#5784= IFCPROPERTYSINGLEVALUE('Ifc ID',$,IFCDESCRIPTIVEMEASURE(
+'3YTosakmrE0ROeFZfq0SeQ'),$);
+#5785= IFCPROPERTYSET('3CDoLRFnTDnuuStWrwv5ON',#4,'Allplan Attributes',$
+,(#5780,#5781,#5782,#5783,#5784));
+#5787= IFCRELDEFINESBYPROPERTIES('3cZBpMJTTF$B9Ax0O9oldy',#4,$,$,(#5754)
+,#5785);
+#5790= IFCRELASSOCIATESMATERIAL('0MnpQMETP9nA7_X9l3OSgX',#4,$,$,(#5754),
+#5791);
+#5791= IFCMATERIAL('Beton');
+#5794= IFCCURVESTYLE($,$,IFCDESCRIPTIVEMEASURE('by layer'),$);
+#5795= IFCPRESENTATIONSTYLEASSIGNMENT((#5794,#5733));
+#5797= IFCSTYLEDITEM($,(#5795),$);
+#5799= IFCSTYLEDREPRESENTATION(#39,$,$,(#5797));
+#5802= IFCMATERIALDEFINITIONREPRESENTATION($,$,(#5799),#5791);
+#5808= IFCTEXTSTYLEFORDEFINEDFONT(#5809,$);
+#5809= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#5810= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#5811= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(350.));
+#5813= IFCTEXTSTYLE($,#5808,#5810,#5811);
+#5814= IFCTEXTLITERAL('d = 25cm',#5817,.LEFT.);
+#5815= IFCDIRECTION((0.7310552682428758,0.6823182503600038));
+#5817= IFCAXIS2PLACEMENT2D(#5818,#5815);
+#5818= IFCCARTESIANPOINT((87738.90713147861,22755.42414823773));
+#5820= IFCLOCALPLACEMENT($,#1);
+#5821= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#5814));
+#5823= IFCPRODUCTDEFINITIONSHAPE($,$,(#5821));
+#5826= IFCANNOTATION('032T779Oj0X8WohPfnmeTy',#4,$,$,$,#5820,#5823);
+#5830= IFCPRESENTATIONSTYLEASSIGNMENT((#5813));
+#5832= IFCSTYLEDITEM(#5814,(#5830),$);
+#5836= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--8'),$);
+#5837= IFCPROPERTYSET('1I8u6kTgT4cQBormgsC38u',#4,'Allplan Attributes',$
+,(#5836));
+#5839= IFCRELDEFINESBYPROPERTIES('0nuIAkFwDEbRWIwQnu5gGP',#4,$,$,(#5826)
+,#5837);
+#5843= IFCTEXTSTYLEFORDEFINEDFONT(#5844,$);
+#5844= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#5845= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#5846= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#5848= IFCTEXTSTYLE($,#5843,#5845,#5846);
+#5849= IFCTEXTLITERAL('Absatz OK Boden 7cm',#5852,.LEFT.);
+#5850= IFCDIRECTION((1.,0.));
+#5852= IFCAXIS2PLACEMENT2D(#5853,#5850);
+#5853= IFCCARTESIANPOINT((75981.541562714,23740.00483059611));
+#5855= IFCLOCALPLACEMENT($,#1);
+#5856= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#5849));
+#5858= IFCPRODUCTDEFINITIONSHAPE($,$,(#5856));
+#5861= IFCANNOTATION('0ntUQdWb96ow_zMFy22p8w',#4,$,$,$,#5855,#5858);
+#5865= IFCPRESENTATIONSTYLEASSIGNMENT((#5848));
+#5867= IFCSTYLEDITEM(#5849,(#5865),$);
+#5871= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--9'),$);
+#5872= IFCPROPERTYSET('30N3frSsnBCAQzF8claqgv',#4,'Allplan Attributes',$
+,(#5871));
+#5874= IFCRELDEFINESBYPROPERTIES('1OxpXO84n5Z9Sue0GCIE7Y',#4,$,$,(#5861)
+,#5872);
+#5878= IFCTEXTSTYLEFORDEFINEDFONT(#5879,$);
+#5879= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#5880= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#5881= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#5883= IFCTEXTSTYLE($,#5878,#5880,#5881);
+#5884= IFCTEXTLITERAL('Absatz UK Boden 7cm',#5887,.LEFT.);
+#5885= IFCDIRECTION((1.,0.));
+#5887= IFCAXIS2PLACEMENT2D(#5888,#5885);
+#5888= IFCCARTESIANPOINT((75977.80217074958,24656.67149726277));
+#5890= IFCLOCALPLACEMENT($,#1);
+#5891= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#5884));
+#5893= IFCPRODUCTDEFINITIONSHAPE($,$,(#5891));
+#5896= IFCANNOTATION('0t9vqb8912avlyZTpCPz2Y',#4,$,$,$,#5890,#5893);
+#5900= IFCPRESENTATIONSTYLEASSIGNMENT((#5883));
+#5902= IFCSTYLEDITEM(#5884,(#5900),$);
+#5906= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--10'),$);
+#5907= IFCPROPERTYSET('2ty8gzrhPCEgMBs_opyWwZ',#4,'Allplan Attributes',$
+,(#5906));
+#5909= IFCRELDEFINESBYPROPERTIES('024ZrY4TDFbwDzLuJw3UwB',#4,$,$,(#5896)
+,#5907);
+#5913= IFCTEXTSTYLEFORDEFINEDFONT(#5914,$);
+#5914= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#5915= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#5916= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#5918= IFCTEXTSTYLE($,#5913,#5915,#5916);
+#5919= IFCTEXTLITERAL('Absatz OK Boden 7cm',#5922,.LEFT.);
+#5920= IFCDIRECTION((6.123233995736766E-17,1.));
+#5922= IFCAXIS2PLACEMENT2D(#5923,#5920);
+#5923= IFCCARTESIANPOINT((79188.33333333333,22338.59690241592));
+#5925= IFCLOCALPLACEMENT($,#1);
+#5926= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#5919));
+#5928= IFCPRODUCTDEFINITIONSHAPE($,$,(#5926));
+#5931= IFCANNOTATION('2bTeKQqDf4RRKuUFfdLtgO',#4,$,$,$,#5925,#5928);
+#5935= IFCPRESENTATIONSTYLEASSIGNMENT((#5918));
+#5937= IFCSTYLEDITEM(#5919,(#5935),$);
+#5941= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--11'),$);
+#5942= IFCPROPERTYSET('2dhhtKH$TAUOTpGoXp_oO2',#4,'Allplan Attributes',$
+,(#5941));
+#5944= IFCRELDEFINESBYPROPERTIES('101hH7IwH89xuvm7yAbhFf',#4,$,$,(#5931)
+,#5942);
+#5948= IFCTEXTSTYLEFORDEFINEDFONT(#5949,$);
+#5949= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#5950= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#5951= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#5953= IFCTEXTSTYLE($,#5948,#5950,#5951);
+#5954= IFCTEXTLITERAL('Absatz OK Boden 7cm',#5957,.LEFT.);
+#5955= IFCDIRECTION((1.,0.));
+#5957= IFCAXIS2PLACEMENT2D(#5958,#5955);
+#5958= IFCCARTESIANPOINT((79777.02674372181,22095.0048305961));
+#5960= IFCLOCALPLACEMENT($,#1);
+#5961= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#5954));
+#5963= IFCPRODUCTDEFINITIONSHAPE($,$,(#5961));
+#5966= IFCANNOTATION('2Tcy6R3yv14ADEYRD30cKO',#4,$,$,$,#5960,#5963);
+#5970= IFCPRESENTATIONSTYLEASSIGNMENT((#5953));
+#5972= IFCSTYLEDITEM(#5954,(#5970),$);
+#5976= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--12'),$);
+#5977= IFCPROPERTYSET('1FCDrcDaT8iQLgSCewiRpM',#4,'Allplan Attributes',$
+,(#5976));
+#5979= IFCRELDEFINESBYPROPERTIES('1dCcPCTL12Pu$Qt2JmUnCh',#4,$,$,(#5966)
+,#5977);
+#5983= IFCTEXTSTYLEFORDEFINEDFONT(#5984,$);
+#5984= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#5985= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#5986= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#5988= IFCTEXTSTYLE($,#5983,#5985,#5986);
+#5989= IFCTEXTLITERAL('Absatz OK Boden 7cm',#5992,.LEFT.);
+#5990= IFCDIRECTION((6.123233995736766E-17,1.));
+#5992= IFCAXIS2PLACEMENT2D(#5993,#5990);
+#5993= IFCCARTESIANPOINT((82025.,22520.04762552151));
+#5995= IFCLOCALPLACEMENT($,#1);
+#5996= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#5989));
+#5998= IFCPRODUCTDEFINITIONSHAPE($,$,(#5996));
+#6001= IFCANNOTATION('1mklurbx9FZwc7txaUju$c',#4,$,$,$,#5995,#5998);
+#6005= IFCPRESENTATIONSTYLEASSIGNMENT((#5988));
+#6007= IFCSTYLEDITEM(#5989,(#6005),$);
+#6011= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--13'),$);
+#6012= IFCPROPERTYSET('3M5psyfbL8Jh0eOIcTCDAR',#4,'Allplan Attributes',$
+,(#6011));
+#6014= IFCRELDEFINESBYPROPERTIES('218vY8crT6y9SKsPwBwDmG',#4,$,$,(#6001)
+,#6012);
+#6018= IFCTEXTSTYLEFORDEFINEDFONT(#6019,$);
+#6019= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#6020= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#6021= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#6023= IFCTEXTSTYLE($,#6018,#6020,#6021);
+#6024= IFCTEXTLITERAL('Absatz OK Boden 7cm',#6027,.LEFT.);
+#6025= IFCDIRECTION((1.,0.));
+#6027= IFCAXIS2PLACEMENT2D(#6028,#6025);
+#6028= IFCCARTESIANPOINT((82528.94870789858,23990.0048305961));
+#6030= IFCLOCALPLACEMENT($,#1);
+#6031= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#6024));
+#6033= IFCPRODUCTDEFINITIONSHAPE($,$,(#6031));
+#6036= IFCANNOTATION('07BSaSzoP8KBkq0HWeb80X',#4,$,$,$,#6030,#6033);
+#6040= IFCPRESENTATIONSTYLEASSIGNMENT((#6023));
+#6042= IFCSTYLEDITEM(#6024,(#6040),$);
+#6046= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--14'),$);
+#6047= IFCPROPERTYSET('3qpVPu8TH1Aw4J1LBFzqUg',#4,'Allplan Attributes',$
+,(#6046));
+#6049= IFCRELDEFINESBYPROPERTIES('2vpNDcug5BABliMJV5MJCL',#4,$,$,(#6036)
+,#6047);
+#6053= IFCTEXTSTYLEFORDEFINEDFONT(#6054,$);
+#6054= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#6055= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#6056= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#6058= IFCTEXTSTYLE($,#6053,#6055,#6056);
+#6059= IFCTEXTLITERAL('Absatz OK Boden 7cm',#6062,.LEFT.);
+#6060= IFCDIRECTION((1.,0.));
+#6062= IFCAXIS2PLACEMENT2D(#6063,#6060);
+#6063= IFCCARTESIANPOINT((85062.27633487518,23740.0048305961));
+#6065= IFCLOCALPLACEMENT($,#1);
+#6066= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#6059));
+#6068= IFCPRODUCTDEFINITIONSHAPE($,$,(#6066));
+#6071= IFCANNOTATION('3TylAPkZL5MvhEBSpwHYU5',#4,$,$,$,#6065,#6068);
+#6075= IFCPRESENTATIONSTYLEASSIGNMENT((#6058));
+#6077= IFCSTYLEDITEM(#6059,(#6075),$);
+#6081= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--15'),$);
+#6082= IFCPROPERTYSET('3pxqH_Vvn7TRA5T$yZpBmV',#4,'Allplan Attributes',$
+,(#6081));
+#6084= IFCRELDEFINESBYPROPERTIES('2I$7dzHPf8JxC5YFNnyUn0',#4,$,$,(#6071)
+,#6082);
+#6088= IFCTEXTSTYLEFORDEFINEDFONT(#6089,$);
+#6089= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#6090= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#6091= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#6093= IFCTEXTSTYLE($,#6088,#6090,#6091);
+#6094= IFCTEXTLITERAL('Absatz UK Boden 7cm',#6097,.LEFT.);
+#6095= IFCDIRECTION((1.,0.));
+#6097= IFCAXIS2PLACEMENT2D(#6098,#6095);
+#6098= IFCCARTESIANPOINT((87412.56598371331,24656.67149726277));
+#6100= IFCLOCALPLACEMENT($,#1);
+#6101= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#6094));
+#6103= IFCPRODUCTDEFINITIONSHAPE($,$,(#6101));
+#6106= IFCANNOTATION('3dPWfRGLTF6e0fkJsAlavK',#4,$,$,$,#6100,#6103);
+#6110= IFCPRESENTATIONSTYLEASSIGNMENT((#6093));
+#6112= IFCSTYLEDITEM(#6094,(#6110),$);
+#6116= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--16'),$);
+#6117= IFCPROPERTYSET('2GviHl2jf7b8tUbEqgsOp2',#4,'Allplan Attributes',$
+,(#6116));
+#6119= IFCRELDEFINESBYPROPERTIES('0Vd3gBVz98ghKXdJGfq55p',#4,$,$,(#6106)
+,#6117);
+#6123= IFCTEXTSTYLEFORDEFINEDFONT(#6124,$);
+#6124= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#6125= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#6126= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#6128= IFCTEXTSTYLE($,#6123,#6125,#6126);
+#6129= IFCTEXTLITERAL('Absatz OK Boden 7cm',#6132,.LEFT.);
+#6130= IFCDIRECTION((1.,0.));
+#6132= IFCAXIS2PLACEMENT2D(#6133,#6130);
+#6133= IFCCARTESIANPOINT((90006.89477922957,23740.0048305961));
+#6135= IFCLOCALPLACEMENT($,#1);
+#6136= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#6129));
+#6138= IFCPRODUCTDEFINITIONSHAPE($,$,(#6136));
+#6141= IFCANNOTATION('1rOHdG_wP369hJlFjTT3S$',#4,$,$,$,#6135,#6138);
+#6145= IFCPRESENTATIONSTYLEASSIGNMENT((#6128));
+#6147= IFCSTYLEDITEM(#6129,(#6145),$);
+#6151= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--17'),$);
+#6152= IFCPROPERTYSET('0h8NqtIRP3dRQV8MlHJpDB',#4,'Allplan Attributes',$
+,(#6151));
+#6154= IFCRELDEFINESBYPROPERTIES('22IuE$1x1Bwf3QJqHvSWAI',#4,$,$,(#6141)
+,#6152);
+#6158= IFCTEXTSTYLEFORDEFINEDFONT(#6159,$);
+#6159= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#6160= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.4));
+#6161= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#6163= IFCTEXTSTYLE($,#6158,#6160,#6161);
+#6164= IFCPLANAREXTENT(1940.,240.);
+#6165= IFCTEXTLITERALWITHEXTENT(
+'Fund. d=30cm, UK= -0.90\X\0A+ 5cm Magerbeton (UK= -0.95)',#6168,.LEFT.,
+#6164,'top-left');
+#6166= IFCDIRECTION((1.,0.));
+#6168= IFCAXIS2PLACEMENT2D(#6169,#6166);
+#6169= IFCCARTESIANPOINT((69475.,8050.004830596101));
+#6171= IFCLOCALPLACEMENT($,#1);
+#6172= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#6165));
+#6174= IFCPRODUCTDEFINITIONSHAPE($,$,(#6172));
+#6177= IFCANNOTATION('3bZmb$2Yj6YvDNrfoor8X6',#4,$,$,$,#6171,#6174);
+#6181= IFCPRESENTATIONSTYLEASSIGNMENT((#6163));
+#6183= IFCSTYLEDITEM(#6165,(#6181),$);
+#6187= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--18'),$);
+#6188= IFCPROPERTYSET('1GqgUxmGL6$QEi0yjDwm1z',#4,'Allplan Attributes',$
+,(#6187));
+#6190= IFCRELDEFINESBYPROPERTIES('3a4q6f1jrFegjfEdRTl3Qy',#4,$,$,(#6177)
+,#6188);
+#6194= IFCTEXTSTYLEFORDEFINEDFONT(#6195,$);
+#6195= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#6196= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.4));
+#6197= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#6199= IFCTEXTSTYLE($,#6194,#6196,#6197);
+#6200= IFCPLANAREXTENT(1940.,240.);
+#6201= IFCTEXTLITERALWITHEXTENT(
+'Fund. d=30cm, UK= -0.90\X\0A+ 5cm Magerbeton (UK= -0.95)',#6204,.LEFT.,
+#6200,'top-left');
+#6202= IFCDIRECTION((1.,0.));
+#6204= IFCAXIS2PLACEMENT2D(#6205,#6202);
+#6205= IFCCARTESIANPOINT((95155.00000000002,8050.004830596099));
+#6207= IFCLOCALPLACEMENT($,#1);
+#6208= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#6201));
+#6210= IFCPRODUCTDEFINITIONSHAPE($,$,(#6208));
+#6213= IFCANNOTATION('00UYDqvRT9QB6VNuJp87bx',#4,$,$,$,#6207,#6210);
+#6217= IFCPRESENTATIONSTYLEASSIGNMENT((#6199));
+#6219= IFCSTYLEDITEM(#6201,(#6217),$);
+#6223= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--19'),$);
+#6224= IFCPROPERTYSET('28_nqaD3zBfQZvXk2PMcCq',#4,'Allplan Attributes',$
+,(#6223));
+#6226= IFCRELDEFINESBYPROPERTIES('1H_c9i3KD58ANazvpZnM0w',#4,$,$,(#6213)
+,#6224);
+#6230= IFCTEXTSTYLEFORDEFINEDFONT(#6231,$);
+#6231= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#6232= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.4));
+#6233= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#6235= IFCTEXTSTYLE($,#6230,#6232,#6233);
+#6236= IFCPLANAREXTENT(1940.,240.);
+#6237= IFCTEXTLITERALWITHEXTENT(
+'Fund. d=30cm, UK= -0.90\X\0A+ 5cm Magerbeton (UK= -0.95)',#6240,.LEFT.,
+#6236,'top-left');
+#6238= IFCDIRECTION((6.123233995736766E-17,1.));
+#6240= IFCAXIS2PLACEMENT2D(#6241,#6238);
+#6241= IFCCARTESIANPOINT((102125.,10580.0048305961));
+#6243= IFCLOCALPLACEMENT($,#1);
+#6244= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#6237));
+#6246= IFCPRODUCTDEFINITIONSHAPE($,$,(#6244));
+#6249= IFCANNOTATION('0TX1GDOYH5l9jLDmSlCnLC',#4,$,$,$,#6243,#6246);
+#6253= IFCPRESENTATIONSTYLEASSIGNMENT((#6235));
+#6255= IFCSTYLEDITEM(#6237,(#6253),$);
+#6259= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--20'),$);
+#6260= IFCPROPERTYSET('2$OhgM5pH4iBTHe048DBj4',#4,'Allplan Attributes',$
+,(#6259));
+#6262= IFCRELDEFINESBYPROPERTIES('0w_osBj$LCdgFsSz9JAXtG',#4,$,$,(#6249)
+,#6260);
+#6266= IFCTEXTSTYLEFORDEFINEDFONT(#6267,$);
+#6267= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#6268= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.4));
+#6269= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#6271= IFCTEXTSTYLE($,#6266,#6268,#6269);
+#6272= IFCPLANAREXTENT(1940.,240.);
+#6273= IFCTEXTLITERALWITHEXTENT(
+'Fund. d=30cm, UK= -0.90\X\0A+ 5cm Magerbeton (UK= -0.95)',#6276,.LEFT.,
+#6272,'top-left');
+#6274= IFCDIRECTION((6.123233995736766E-17,1.));
+#6276= IFCAXIS2PLACEMENT2D(#6277,#6274);
+#6277= IFCCARTESIANPOINT((64198.33333333334,21420.0048305961));
+#6279= IFCLOCALPLACEMENT($,#1);
+#6280= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#6273));
+#6282= IFCPRODUCTDEFINITIONSHAPE($,$,(#6280));
+#6285= IFCANNOTATION('1WcGMClYLEvvWBiKIcrVHe',#4,$,$,$,#6279,#6282);
+#6289= IFCPRESENTATIONSTYLEASSIGNMENT((#6271));
+#6291= IFCSTYLEDITEM(#6273,(#6289),$);
+#6295= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--21'),$);
+#6296= IFCPROPERTYSET('2bqkifRg92KBRXCmXV1Cn7',#4,'Allplan Attributes',$
+,(#6295));
+#6298= IFCRELDEFINESBYPROPERTIES('3EajEiBpj3EPfxsei_7jAi',#4,$,$,(#6285)
+,#6296);
+#6302= IFCTEXTSTYLEFORDEFINEDFONT(#6303,$);
+#6303= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#6304= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.4));
+#6305= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#6307= IFCTEXTSTYLE($,#6302,#6304,#6305);
+#6308= IFCPLANAREXTENT(1940.,240.);
+#6309= IFCTEXTLITERALWITHEXTENT(
+'Fund. d=30cm, UK= -0.90\X\0A+ 5cm Magerbeton (UK= -0.95)',#6312,.LEFT.,
+#6308,'top-left');
+#6310= IFCDIRECTION((6.123233995736766E-17,1.));
+#6312= IFCAXIS2PLACEMENT2D(#6313,#6310);
+#6313= IFCCARTESIANPOINT((64198.33333333333,10580.0048305961));
+#6315= IFCLOCALPLACEMENT($,#1);
+#6316= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#6309));
+#6318= IFCPRODUCTDEFINITIONSHAPE($,$,(#6316));
+#6321= IFCANNOTATION('0iBNbpIMz9d8EQA6DYwYmI',#4,$,$,$,#6315,#6318);
+#6325= IFCPRESENTATIONSTYLEASSIGNMENT((#6307));
+#6327= IFCSTYLEDITEM(#6309,(#6325),$);
+#6331= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--22'),$);
+#6332= IFCPROPERTYSET('0tiCNjdaz21RuderILK$fI',#4,'Allplan Attributes',$
+,(#6331));
+#6334= IFCRELDEFINESBYPROPERTIES('1wXadIlUrE6v8cvFaodejW',#4,$,$,(#6321)
+,#6332);
+#6338= IFCTEXTSTYLEFORDEFINEDFONT(#6339,$);
+#6339= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#6340= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#6341= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#6343= IFCTEXTSTYLE($,#6338,#6340,#6341);
+#6344= IFCTEXTLITERAL('W1',#6347,.LEFT.);
+#6345= IFCDIRECTION((1.,0.));
+#6347= IFCAXIS2PLACEMENT2D(#6348,#6345);
+#6348= IFCCARTESIANPOINT((69220.30189202847,24391.04263252323));
+#6350= IFCLOCALPLACEMENT($,#1);
+#6351= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#6344));
+#6353= IFCPRODUCTDEFINITIONSHAPE($,$,(#6351));
+#6356= IFCANNOTATION('2uXSIFYCP7luA$Kn09Ewgj',#4,$,$,$,#6350,#6353);
+#6360= IFCPRESENTATIONSTYLEASSIGNMENT((#6343));
+#6362= IFCSTYLEDITEM(#6344,(#6360),$);
+#6366= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--41'),$);
+#6367= IFCPROPERTYSET('10SBYPJofFkfN8iRaNAUV6',#4,'Allplan Attributes',$
+,(#6366));
+#6369= IFCRELDEFINESBYPROPERTIES('2Hr18i3rf1UvNl_UP8ZD_R',#4,$,$,(#6356)
+,#6367);
+#6373= IFCTEXTSTYLEFORDEFINEDFONT(#6374,$);
+#6374= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#6375= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#6376= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#6378= IFCTEXTSTYLE($,#6373,#6375,#6376);
+#6379= IFCTEXTLITERAL('W1',#6382,.LEFT.);
+#6380= IFCDIRECTION((1.,0.));
+#6382= IFCAXIS2PLACEMENT2D(#6383,#6380);
+#6383= IFCCARTESIANPOINT((96673.30189202845,24391.04263252323));
+#6385= IFCLOCALPLACEMENT($,#1);
+#6386= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#6379));
+#6388= IFCPRODUCTDEFINITIONSHAPE($,$,(#6386));
+#6391= IFCANNOTATION('3wfqvgPcTD$PnPa_fyrwq$',#4,$,$,$,#6385,#6388);
+#6395= IFCPRESENTATIONSTYLEASSIGNMENT((#6378));
+#6397= IFCSTYLEDITEM(#6379,(#6395),$);
+#6401= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--84'),$);
+#6402= IFCPROPERTYSET('3lfqdApHf9T8DUoxatvXZa',#4,'Allplan Attributes',$
+,(#6401));
+#6404= IFCRELDEFINESBYPROPERTIES('0z7EwDym55z8f3GVOnIodn',#4,$,$,(#6391)
+,#6402);
+#6408= IFCTEXTSTYLEFORDEFINEDFONT(#6409,$);
+#6409= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#6410= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.4));
+#6411= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#6413= IFCTEXTSTYLE($,#6408,#6410,#6411);
+#6414= IFCPLANAREXTENT(1940.,240.);
+#6415= IFCTEXTLITERALWITHEXTENT(
+'Fund. d=30cm, UK= -0.90\X\0A+ 5cm Magerbeton (UK= -0.95)',#6418,.LEFT.,
+#6414,'top-left');
+#6416= IFCDIRECTION((6.123233995736766E-17,1.));
+#6418= IFCAXIS2PLACEMENT2D(#6419,#6416);
+#6419= IFCCARTESIANPOINT((102125.,20920.0048305961));
+#6421= IFCLOCALPLACEMENT($,#1);
+#6422= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#6415));
+#6424= IFCPRODUCTDEFINITIONSHAPE($,$,(#6422));
+#6427= IFCANNOTATION('1Olcrw7pP3CwVNsOkTcsWr',#4,$,$,$,#6421,#6424);
+#6431= IFCPRESENTATIONSTYLEASSIGNMENT((#6413));
+#6433= IFCSTYLEDITEM(#6415,(#6431),$);
+#6437= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--91'),$);
+#6438= IFCPROPERTYSET('0$AEsLwC93vQyv03B_IYqn',#4,'Allplan Attributes',$
+,(#6437));
+#6440= IFCRELDEFINESBYPROPERTIES('2xbuqa2kvBd9TZJdo7q8ec',#4,$,$,(#6427)
+,#6438);
+#6444= IFCTEXTSTYLEFORDEFINEDFONT(#6445,$);
+#6445= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#6446= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#6447= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#6449= IFCTEXTSTYLE($,#6444,#6446,#6447);
+#6450= IFCTEXTLITERAL('A',#6453,.LEFT.);
+#6451= IFCDIRECTION((1.,0.));
+#6453= IFCAXIS2PLACEMENT2D(#6454,#6451);
+#6454= IFCCARTESIANPOINT((85952.9040210247,23151.85649857375));
+#6456= IFCLOCALPLACEMENT($,#1);
+#6457= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#6450));
+#6459= IFCPRODUCTDEFINITIONSHAPE($,$,(#6457));
+#6462= IFCANNOTATION('3cLn8ROsb9whxHszNSmj4w',#4,$,$,$,#6456,#6459);
+#6466= IFCPRESENTATIONSTYLEASSIGNMENT((#6449));
+#6468= IFCSTYLEDITEM(#6450,(#6466),$);
+#6472= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--309'),$);
+#6473= IFCPROPERTYSET('0b_OyHxHrFFwHRF5AHbNjA',#4,'Allplan Attributes',$
+,(#6472));
+#6475= IFCRELDEFINESBYPROPERTIES('0tRKFSkArDnR1A2YtAelF6',#4,$,$,(#6462)
+,#6473);
+#6479= IFCTEXTSTYLEFORDEFINEDFONT(#6480,$);
+#6480= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#6481= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#6482= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#6484= IFCTEXTSTYLE($,#6479,#6481,#6482);
+#6485= IFCTEXTLITERAL('A',#6488,.LEFT.);
+#6486= IFCDIRECTION((1.,0.));
+#6488= IFCAXIS2PLACEMENT2D(#6489,#6486);
+#6489= IFCCARTESIANPOINT((90153.76264563203,23151.85649857376));
+#6491= IFCLOCALPLACEMENT($,#1);
+#6492= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#6485));
+#6494= IFCPRODUCTDEFINITIONSHAPE($,$,(#6492));
+#6497= IFCANNOTATION('3ngI1U4hr5dwhD$4OrOBN6',#4,$,$,$,#6491,#6494);
+#6501= IFCPRESENTATIONSTYLEASSIGNMENT((#6484));
+#6503= IFCSTYLEDITEM(#6485,(#6501),$);
+#6507= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--321'),$);
+#6508= IFCPROPERTYSET('3h3Ts3Poj8shLvYEvb0Was',#4,'Allplan Attributes',$
+,(#6507));
+#6510= IFCRELDEFINESBYPROPERTIES('1cK4P5_U125hQesG_M80mU',#4,$,$,(#6497)
+,#6508);
+#6514= IFCTEXTSTYLEFORDEFINEDFONT(#6515,$);
+#6515= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#6516= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#6517= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(350.));
+#6519= IFCTEXTSTYLE($,#6514,#6516,#6517);
+#6520= IFCTEXTLITERAL('d = 25cm',#6523,.LEFT.);
+#6521= IFCDIRECTION((0.9808262151348187,0.1948844162684801));
+#6523= IFCAXIS2PLACEMENT2D(#6524,#6521);
+#6524= IFCCARTESIANPOINT((83632.23966450329,25811.54350744394));
+#6526= IFCLOCALPLACEMENT($,#1);
+#6527= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#6520));
+#6529= IFCPRODUCTDEFINITIONSHAPE($,$,(#6527));
+#6532= IFCANNOTATION('0N0qPNyRHCUwUsmriJznBl',#4,$,$,$,#6526,#6529);
+#6536= IFCPRESENTATIONSTYLEASSIGNMENT((#6519));
+#6538= IFCSTYLEDITEM(#6520,(#6536),$);
+#6542= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--346'),$);
+#6543= IFCPROPERTYSET('0LIUvNOdn52B_cuFzxX$IY',#4,'Allplan Attributes',$
+,(#6542));
+#6545= IFCRELDEFINESBYPROPERTIES('0I5F8GVpX4LggJ9AT4wMus',#4,$,$,(#6532)
+,#6543);
+#6549= IFCTEXTSTYLEFORDEFINEDFONT(#6550,$);
+#6550= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#6551= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.6));
+#6552= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(400.));
+#6554= IFCTEXTSTYLE($,#6549,#6551,#6552);
+#6555= IFCTEXTLITERAL('%RAInnenwand%RE',#6558,.LEFT.);
+#6556= IFCDIRECTION((1.,0.));
+#6558= IFCAXIS2PLACEMENT2D(#6559,#6556);
+#6559= IFCCARTESIANPOINT((81476.47748645773,19978.59922698939));
+#6561= IFCLOCALPLACEMENT($,#1);
+#6562= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#6555));
+#6564= IFCPRODUCTDEFINITIONSHAPE($,$,(#6562));
+#6567= IFCANNOTATION('2F6Bg1NzvA_enS6VNjN6C6',#4,$,$,$,#6561,#6564);
+#6571= IFCPRESENTATIONSTYLEASSIGNMENT((#6554));
+#6573= IFCSTYLEDITEM(#6555,(#6571),$);
+#6577= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--359'),$);
+#6578= IFCPROPERTYSET('33HQqOrpfD7gSXfh4em5eX',#4,'Allplan Attributes',$
+,(#6577));
+#6580= IFCRELDEFINESBYPROPERTIES('0e2ig33Pz89P_JU6n4f7c_',#4,$,$,(#6567)
+,#6578);
+#6584= IFCTEXTSTYLEFORDEFINEDFONT(#6585,$);
+#6585= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#6586= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.6));
+#6587= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(400.));
+#6589= IFCTEXTSTYLE($,#6584,#6586,#6587);
+#6590= IFCTEXTLITERAL('%RAInnenwand%RE',#6593,.LEFT.);
+#6591= IFCDIRECTION((1.,0.));
+#6593= IFCAXIS2PLACEMENT2D(#6594,#6591);
+#6594= IFCCARTESIANPOINT((88786.08045759043,19978.59922698939));
+#6596= IFCLOCALPLACEMENT($,#1);
+#6597= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#6590));
+#6599= IFCPRODUCTDEFINITIONSHAPE($,$,(#6597));
+#6602= IFCANNOTATION('3H2twUEavDcgaEspbVvuKo',#4,$,$,$,#6596,#6599);
+#6606= IFCPRESENTATIONSTYLEASSIGNMENT((#6589));
+#6608= IFCSTYLEDITEM(#6590,(#6606),$);
+#6612= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--360'),$);
+#6613= IFCPROPERTYSET('0XV5UivH12wueYUa1qVJtX',#4,'Allplan Attributes',$
+,(#6612));
+#6615= IFCRELDEFINESBYPROPERTIES('0099D0FWj81waP8bT1V2zi',#4,$,$,(#6602)
+,#6613);
+#6619= IFCTEXTSTYLEFORDEFINEDFONT(#6620,$);
+#6620= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#6621= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.6));
+#6622= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(400.));
+#6624= IFCTEXTSTYLE($,#6619,#6621,#6622);
+#6625= IFCTEXTLITERAL('%RAInnenwand%RE',#6628,.LEFT.);
+#6626= IFCDIRECTION((1.,0.));
+#6628= IFCAXIS2PLACEMENT2D(#6629,#6626);
+#6629= IFCCARTESIANPOINT((82643.04532805008,22606.98593803507));
+#6631= IFCLOCALPLACEMENT($,#1);
+#6632= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#6625));
+#6634= IFCPRODUCTDEFINITIONSHAPE($,$,(#6632));
+#6637= IFCANNOTATION('09s8vFguH2VBk5ORPG6PXH',#4,$,$,$,#6631,#6634);
+#6641= IFCPRESENTATIONSTYLEASSIGNMENT((#6624));
+#6643= IFCSTYLEDITEM(#6625,(#6641),$);
+#6647= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--361'),$);
+#6648= IFCPROPERTYSET('1$nrr91o17SAfMdn0TiVtj',#4,'Allplan Attributes',$
+,(#6647));
+#6650= IFCRELDEFINESBYPROPERTIES('2kT0dx3p503gBWpn8DJbiC',#4,$,$,(#6637)
+,#6648);
+#6654= IFCTEXTSTYLEFORDEFINEDFONT(#6655,$);
+#6655= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#6656= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.6));
+#6657= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(400.));
+#6659= IFCTEXTSTYLE($,#6654,#6656,#6657);
+#6660= IFCTEXTLITERAL('%RAInnenwand%RE',#6663,.LEFT.);
+#6661= IFCDIRECTION((6.123233995736766E-17,1.));
+#6663= IFCAXIS2PLACEMENT2D(#6664,#6661);
+#6664= IFCCARTESIANPOINT((78974.34906165909,20578.3982692631));
+#6666= IFCLOCALPLACEMENT($,#1);
+#6667= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#6660));
+#6669= IFCPRODUCTDEFINITIONSHAPE($,$,(#6667));
+#6672= IFCANNOTATION('1uPneIHMfBhewx$r4gANOM',#4,$,$,$,#6666,#6669);
+#6676= IFCPRESENTATIONSTYLEASSIGNMENT((#6659));
+#6678= IFCSTYLEDITEM(#6660,(#6676),$);
+#6682= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--362'),$);
+#6683= IFCPROPERTYSET('0EQcqb4BP3RO0yI8WGDFa6',#4,'Allplan Attributes',$
+,(#6682));
+#6685= IFCRELDEFINESBYPROPERTIES('2vVJpWlBP6EwaKPEAXmwfQ',#4,$,$,(#6672)
+,#6683);
+#6689= IFCTEXTSTYLEFORDEFINEDFONT(#6690,$);
+#6690= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#6691= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#6692= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#6694= IFCTEXTSTYLE($,#6689,#6691,#6692);
+#6695= IFCTEXTLITERAL('C',#6698,.LEFT.);
+#6696= IFCDIRECTION((6.123233995736766E-17,1.));
+#6698= IFCAXIS2PLACEMENT2D(#6699,#6696);
+#6699= IFCCARTESIANPOINT((90860.31738068213,22977.90885162081));
+#6701= IFCLOCALPLACEMENT($,#1);
+#6702= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#6695));
+#6704= IFCPRODUCTDEFINITIONSHAPE($,$,(#6702));
+#6707= IFCANNOTATION('1XlXeJKo56CAHrP5vunhch',#4,$,$,$,#6701,#6704);
+#6711= IFCPRESENTATIONSTYLEASSIGNMENT((#6694));
+#6713= IFCSTYLEDITEM(#6695,(#6711),$);
+#6717= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--363'),$);
+#6718= IFCPROPERTYSET('0PZYj_ftb2Ah_xucp3ENrP',#4,'Allplan Attributes',$
+,(#6717));
+#6720= IFCRELDEFINESBYPROPERTIES('1qB7La4xf9NQduFw$giZkQ',#4,$,$,(#6707)
+,#6718);
+#6724= IFCTEXTSTYLEFORDEFINEDFONT(#6725,$);
+#6725= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#6726= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#6727= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#6729= IFCTEXTSTYLE($,#6724,#6726,#6727);
+#6730= IFCTEXTLITERAL('C',#6733,.LEFT.);
+#6731= IFCDIRECTION((6.123233995736766E-17,1.));
+#6733= IFCAXIS2PLACEMENT2D(#6734,#6731);
+#6734= IFCCARTESIANPOINT((90860.31738068222,25478.76747622812));
+#6736= IFCLOCALPLACEMENT($,#1);
+#6737= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#6730));
+#6739= IFCPRODUCTDEFINITIONSHAPE($,$,(#6737));
+#6742= IFCANNOTATION('0LNRNa2in5i8UU1MbwBnw0',#4,$,$,$,#6736,#6739);
+#6746= IFCPRESENTATIONSTYLEASSIGNMENT((#6729));
+#6748= IFCSTYLEDITEM(#6730,(#6746),$);
+#6752= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--364'),$);
+#6753= IFCPROPERTYSET('17a9JeliDARvlJDLoM9EKD',#4,'Allplan Attributes',$
+,(#6752));
+#6755= IFCRELDEFINESBYPROPERTIES('2bo8Nzz8X4XPdRXvZRyTPh',#4,$,$,(#6742)
+,#6753);
+#6759= IFCTEXTSTYLEFORDEFINEDFONT(#6760,$);
+#6760= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#6761= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#6762= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#6764= IFCTEXTSTYLE($,#6759,#6761,#6762);
+#6765= IFCTEXTLITERAL('C',#6768,.LEFT.);
+#6766= IFCDIRECTION((6.123233995736766E-17,1.));
+#6768= IFCAXIS2PLACEMENT2D(#6769,#6766);
+#6769= IFCCARTESIANPOINT((76753.57873560388,22977.90885162081));
+#6771= IFCLOCALPLACEMENT($,#1);
+#6772= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#6765));
+#6774= IFCPRODUCTDEFINITIONSHAPE($,$,(#6772));
+#6777= IFCANNOTATION('1KrJdpxvXBzf$p52DQ6j3p',#4,$,$,$,#6771,#6774);
+#6781= IFCPRESENTATIONSTYLEASSIGNMENT((#6764));
+#6783= IFCSTYLEDITEM(#6765,(#6781),$);
+#6787= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--365'),$);
+#6788= IFCPROPERTYSET('1aWTcNZlHFbudJk7JFkbMF',#4,'Allplan Attributes',$
+,(#6787));
+#6790= IFCRELDEFINESBYPROPERTIES('0dNvUHHhrAheRb_5Kc6zKG',#4,$,$,(#6777)
+,#6788);
+#6794= IFCTEXTSTYLEFORDEFINEDFONT(#6795,$);
+#6795= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#6796= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#6797= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#6799= IFCTEXTSTYLE($,#6794,#6796,#6797);
+#6800= IFCTEXTLITERAL('C',#6803,.LEFT.);
+#6801= IFCDIRECTION((6.123233995736766E-17,1.));
+#6803= IFCAXIS2PLACEMENT2D(#6804,#6801);
+#6804= IFCCARTESIANPOINT((76753.57873560388,25478.76747622813));
+#6806= IFCLOCALPLACEMENT($,#1);
+#6807= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#6800));
+#6809= IFCPRODUCTDEFINITIONSHAPE($,$,(#6807));
+#6812= IFCANNOTATION('0Yh37lsU1FmQPNQeQ2ifuB',#4,$,$,$,#6806,#6809);
+#6816= IFCPRESENTATIONSTYLEASSIGNMENT((#6799));
+#6818= IFCSTYLEDITEM(#6800,(#6816),$);
+#6822= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--366'),$);
+#6823= IFCPROPERTYSET('30zVF$zYL51Bg1FvZixwEd',#4,'Allplan Attributes',$
+,(#6822));
+#6825= IFCRELDEFINESBYPROPERTIES('0aA6l0atb85gPIOYjUL6Le',#4,$,$,(#6812)
+,#6823);
+#6829= IFCTEXTSTYLEFORDEFINEDFONT(#6830,$);
+#6830= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#6831= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#6832= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#6834= IFCTEXTSTYLE($,#6829,#6831,#6832);
+#6835= IFCTEXTLITERAL('D',#6838,.LEFT.);
+#6836= IFCDIRECTION((6.123233995736766E-17,1.));
+#6838= IFCAXIS2PLACEMENT2D(#6839,#6836);
+#6839= IFCCARTESIANPOINT((83296.74014217944,23227.9088516208));
+#6841= IFCLOCALPLACEMENT($,#1);
+#6842= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#6835));
+#6844= IFCPRODUCTDEFINITIONSHAPE($,$,(#6842));
+#6847= IFCANNOTATION('2HhmrfkzfADf6dO7cGKZKw',#4,$,$,$,#6841,#6844);
+#6851= IFCPRESENTATIONSTYLEASSIGNMENT((#6834));
+#6853= IFCSTYLEDITEM(#6835,(#6851),$);
+#6857= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--367'),$);
+#6858= IFCPROPERTYSET('35x6WiMnz7felqbto$HUQ1',#4,'Allplan Attributes',$
+,(#6857));
+#6860= IFCRELDEFINESBYPROPERTIES('2Sd_dK1lr7Vvn2pzxgBMZU',#4,$,$,(#6847)
+,#6858);
+#6864= IFCTEXTSTYLEFORDEFINEDFONT(#6865,$);
+#6865= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#6866= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#6867= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#6869= IFCTEXTSTYLE($,#6864,#6866,#6867);
+#6870= IFCTEXTLITERAL('D',#6873,.LEFT.);
+#6871= IFCDIRECTION((6.123233995736766E-17,1.));
+#6873= IFCAXIS2PLACEMENT2D(#6874,#6871);
+#6874= IFCCARTESIANPOINT((83296.74014217944,25478.76747622814));
+#6876= IFCLOCALPLACEMENT($,#1);
+#6877= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#6870));
+#6879= IFCPRODUCTDEFINITIONSHAPE($,$,(#6877));
+#6882= IFCANNOTATION('2G3c0$U313$hxpAaiYKYu3',#4,$,$,$,#6876,#6879);
+#6886= IFCPRESENTATIONSTYLEASSIGNMENT((#6869));
+#6888= IFCSTYLEDITEM(#6870,(#6886),$);
+#6892= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--368'),$);
+#6893= IFCPROPERTYSET('2GUBqqXJD3zPHnCpvADRME',#4,'Allplan Attributes',$
+,(#6892));
+#6895= IFCRELDEFINESBYPROPERTIES('2Qt9UnoHvAKgeMOi91UFjm',#4,$,$,(#6882)
+,#6893);
+#6899= IFCTEXTSTYLEFORDEFINEDFONT(#6900,$);
+#6900= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#6901= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#6902= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#6904= IFCTEXTSTYLE($,#6899,#6901,#6902);
+#6905= IFCTEXTLITERAL('E',#6908,.LEFT.);
+#6906= IFCDIRECTION((6.123233995736766E-17,1.));
+#6908= IFCAXIS2PLACEMENT2D(#6909,#6906);
+#6909= IFCCARTESIANPOINT((80468.05826830864,25478.76747622814));
+#6911= IFCLOCALPLACEMENT($,#1);
+#6912= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#6905));
+#6914= IFCPRODUCTDEFINITIONSHAPE($,$,(#6912));
+#6917= IFCANNOTATION('2zrY3TI4X59g85Gnki5ndv',#4,$,$,$,#6911,#6914);
+#6921= IFCPRESENTATIONSTYLEASSIGNMENT((#6904));
+#6923= IFCSTYLEDITEM(#6905,(#6921),$);
+#6927= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--369'),$);
+#6928= IFCPROPERTYSET('0AwgwJ9653_9IA51laHYqc',#4,'Allplan Attributes',$
+,(#6927));
+#6930= IFCRELDEFINESBYPROPERTIES('1o9Ut0o0XFxh$EGBv_hEpz',#4,$,$,(#6917)
+,#6928);
+#6934= IFCTEXTSTYLEFORDEFINEDFONT(#6935,$);
+#6935= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#6936= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#6937= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#6939= IFCTEXTSTYLE($,#6934,#6936,#6937);
+#6940= IFCTEXTLITERAL('E',#6943,.LEFT.);
+#6941= IFCDIRECTION((6.123233995736766E-17,1.));
+#6943= IFCAXIS2PLACEMENT2D(#6944,#6941);
+#6944= IFCCARTESIANPOINT((80468.05826830864,21332.9088516208));
+#6946= IFCLOCALPLACEMENT($,#1);
+#6947= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#6940));
+#6949= IFCPRODUCTDEFINITIONSHAPE($,$,(#6947));
+#6952= IFCANNOTATION('1lApubPkLCkul1SbTharIK',#4,$,$,$,#6946,#6949);
+#6956= IFCPRESENTATIONSTYLEASSIGNMENT((#6939));
+#6958= IFCSTYLEDITEM(#6940,(#6956),$);
+#6962= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--370'),$);
+#6963= IFCPROPERTYSET('2WrN5oU5HDTO_QUS6r2gw4',#4,'Allplan Attributes',$
+,(#6962));
+#6965= IFCRELDEFINESBYPROPERTIES('2ZSdfDb812bxJ2AW$EWZGC',#4,$,$,(#6952)
+,#6963);
+#6969= IFCTEXTSTYLEFORDEFINEDFONT(#6970,$);
+#6970= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#6971= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#6972= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#6974= IFCTEXTSTYLE($,#6969,#6971,#6972);
+#6975= IFCTEXTLITERAL('F',#6978,.LEFT.);
+#6976= IFCDIRECTION((1.,0.));
+#6978= IFCAXIS2PLACEMENT2D(#6979,#6976);
+#6979= IFCCARTESIANPOINT((78332.9040210247,23164.44656228746));
+#6981= IFCLOCALPLACEMENT($,#1);
+#6982= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#6975));
+#6984= IFCPRODUCTDEFINITIONSHAPE($,$,(#6982));
+#6987= IFCANNOTATION('2NKfnvVsD3yud0VZlO6Zvx',#4,$,$,$,#6981,#6984);
+#6991= IFCPRESENTATIONSTYLEASSIGNMENT((#6974));
+#6993= IFCSTYLEDITEM(#6975,(#6991),$);
+#6997= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--371'),$);
+#6998= IFCPROPERTYSET('2jeRxS491DoBHYUVS09k0g',#4,'Allplan Attributes',$
+,(#6997));
+#7000= IFCRELDEFINESBYPROPERTIES('2RYbOZ$rL8oB7H9BOChzZL',#4,$,$,(#6987)
+,#6998);
+#7004= IFCTEXTSTYLEFORDEFINEDFONT(#7005,$);
+#7005= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#7006= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#7007= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#7009= IFCTEXTSTYLE($,#7004,#7006,#7007);
+#7010= IFCTEXTLITERAL('F',#7013,.LEFT.);
+#7011= IFCDIRECTION((1.,0.));
+#7013= IFCAXIS2PLACEMENT2D(#7014,#7011);
+#7014= IFCCARTESIANPOINT((82553.76264563203,23164.44656228746));
+#7016= IFCLOCALPLACEMENT($,#1);
+#7017= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#7010));
+#7019= IFCPRODUCTDEFINITIONSHAPE($,$,(#7017));
+#7022= IFCANNOTATION('0dYequ4TL1k9it9CvWdM8$',#4,$,$,$,#7016,#7019);
+#7026= IFCPRESENTATIONSTYLEASSIGNMENT((#7009));
+#7028= IFCSTYLEDITEM(#7010,(#7026),$);
+#7032= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--372'),$);
+#7033= IFCPROPERTYSET('02anB90db738R4X7u9RVp5',#4,'Allplan Attributes',$
+,(#7032));
+#7035= IFCRELDEFINESBYPROPERTIES('1my6BrKM58mwTq$AFw7bdG',#4,$,$,(#7022)
+,#7033);
+#7039= IFCTEXTSTYLEFORDEFINEDFONT(#7040,$);
+#7040= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#7041= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#7042= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#7044= IFCTEXTSTYLE($,#7039,#7041,#7042);
+#7045= IFCTEXTLITERAL('G',#7048,.LEFT.);
+#7046= IFCDIRECTION((1.,0.));
+#7048= IFCAXIS2PLACEMENT2D(#7049,#7046);
+#7049= IFCCARTESIANPOINT((83082.9040210247,21519.44656228746));
+#7051= IFCLOCALPLACEMENT($,#1);
+#7052= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#7045));
+#7054= IFCPRODUCTDEFINITIONSHAPE($,$,(#7052));
+#7057= IFCANNOTATION('1tP9Ku21L45QRBnBc9NYNY',#4,$,$,$,#7051,#7054);
+#7061= IFCPRESENTATIONSTYLEASSIGNMENT((#7044));
+#7063= IFCSTYLEDITEM(#7045,(#7061),$);
+#7067= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--373'),$);
+#7068= IFCPROPERTYSET('114Kos_6rFVwdDYiApBskH',#4,'Allplan Attributes',$
+,(#7067));
+#7070= IFCRELDEFINESBYPROPERTIES('234QR9E4b7Ivr3RWA9QQm5',#4,$,$,(#7057)
+,#7068);
+#7074= IFCTEXTSTYLEFORDEFINEDFONT(#7075,$);
+#7075= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#7076= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#7077= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#7079= IFCTEXTSTYLE($,#7074,#7076,#7077);
+#7080= IFCTEXTLITERAL('G',#7083,.LEFT.);
+#7081= IFCDIRECTION((1.,0.));
+#7083= IFCAXIS2PLACEMENT2D(#7084,#7081);
+#7084= IFCCARTESIANPOINT((85033.76264563203,21519.44656228747));
+#7086= IFCLOCALPLACEMENT($,#1);
+#7087= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#7080));
+#7089= IFCPRODUCTDEFINITIONSHAPE($,$,(#7087));
+#7092= IFCANNOTATION('17sE8gvnD0kQbgowz9PFyd',#4,$,$,$,#7086,#7089);
+#7096= IFCPRESENTATIONSTYLEASSIGNMENT((#7079));
+#7098= IFCSTYLEDITEM(#7080,(#7096),$);
+#7102= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--374'),$);
+#7103= IFCPROPERTYSET('1u07akhHX3OAHlBphlFxok',#4,'Allplan Attributes',$
+,(#7102));
+#7105= IFCRELDEFINESBYPROPERTIES('06MzWeXnH8fvy1VNEDH2$6',#4,$,$,(#7092)
+,#7103);
+#7109= IFCTEXTSTYLEFORDEFINEDFONT(#7110,$);
+#7110= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#7111= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#7112= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#7114= IFCTEXTSTYLE($,#7109,#7111,#7112);
+#7115= IFCTEXTLITERAL('f1',#7118,.LEFT.);
+#7116= IFCDIRECTION((1.,0.));
+#7118= IFCAXIS2PLACEMENT2D(#7119,#7116);
+#7119= IFCCARTESIANPOINT((63944.51335346072,16091.04263252323));
+#7121= IFCLOCALPLACEMENT($,#1);
+#7122= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#7115));
+#7124= IFCPRODUCTDEFINITIONSHAPE($,$,(#7122));
+#7127= IFCANNOTATION('2NPXqYEXL0px__J4dFt8_n',#4,$,$,$,#7121,#7124);
+#7131= IFCPRESENTATIONSTYLEASSIGNMENT((#7114));
+#7133= IFCSTYLEDITEM(#7115,(#7131),$);
+#7137= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--400'),$);
+#7138= IFCPROPERTYSET('3bxnorq654SALFhCuTpMBv',#4,'Allplan Attributes',$
+,(#7137));
+#7140= IFCRELDEFINESBYPROPERTIES('2ptE$uQiX0EO26kzOemIfP',#4,$,$,(#7127)
+,#7138);
+#7144= IFCTEXTSTYLEFORDEFINEDFONT(#7145,$);
+#7145= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#7146= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#7147= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#7149= IFCTEXTSTYLE($,#7144,#7146,#7147);
+#7150= IFCTEXTLITERAL('f1',#7153,.LEFT.);
+#7151= IFCDIRECTION((1.,0.));
+#7153= IFCAXIS2PLACEMENT2D(#7154,#7151);
+#7154= IFCCARTESIANPOINT((102367.5048670323,23148.54263252323));
+#7156= IFCLOCALPLACEMENT($,#1);
+#7157= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#7150));
+#7159= IFCPRODUCTDEFINITIONSHAPE($,$,(#7157));
+#7162= IFCANNOTATION('3q3HHQcKb8zP62PP4XTlpt',#4,$,$,$,#7156,#7159);
+#7166= IFCPRESENTATIONSTYLEASSIGNMENT((#7149));
+#7168= IFCSTYLEDITEM(#7150,(#7166),$);
+#7172= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--401'),$);
+#7173= IFCPROPERTYSET('2S6CIsgGT7UvleIJtGmNCL',#4,'Allplan Attributes',$
+,(#7172));
+#7175= IFCRELDEFINESBYPROPERTIES('0g_MR7vmD8ORs0SkH6VzaO',#4,$,$,(#7162)
+,#7173);
+#7179= IFCTEXTSTYLEFORDEFINEDFONT(#7180,$);
+#7180= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#7181= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#7182= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#7184= IFCTEXTSTYLE($,#7179,#7181,#7182);
+#7185= IFCTEXTLITERAL('F1',#7188,.LEFT.);
+#7186= IFCDIRECTION((1.,0.));
+#7188= IFCAXIS2PLACEMENT2D(#7189,#7186);
+#7189= IFCCARTESIANPOINT((96418.85940563989,17938.30953539124));
+#7191= IFCLOCALPLACEMENT($,#1);
+#7192= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#7185));
+#7194= IFCPRODUCTDEFINITIONSHAPE($,$,(#7192));
+#7197= IFCANNOTATION('0EI5C_He57VeSCBS6abCFV',#4,$,$,$,#7191,#7194);
+#7201= IFCPRESENTATIONSTYLEASSIGNMENT((#7184));
+#7203= IFCSTYLEDITEM(#7185,(#7201),$);
+#7207= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--402'),$);
+#7208= IFCPROPERTYSET('0NZwIRMx10pRy4pyTGXDj6',#4,'Allplan Attributes',$
+,(#7207));
+#7210= IFCRELDEFINESBYPROPERTIES('3fHnLsoS54sfFPLTehg5Jp',#4,$,$,(#7197)
+,#7208);
+#7214= IFCTEXTSTYLEFORDEFINEDFONT(#7215,$);
+#7215= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#7216= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#7217= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#7219= IFCTEXTSTYLE($,#7214,#7216,#7217);
+#7220= IFCTEXTLITERAL('W2',#7223,.LEFT.);
+#7221= IFCDIRECTION((1.,0.));
+#7223= IFCAXIS2PLACEMENT2D(#7224,#7221);
+#7224= IFCCARTESIANPOINT((73557.80189202845,25631.04263252323));
+#7226= IFCLOCALPLACEMENT($,#1);
+#7227= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#7220));
+#7229= IFCPRODUCTDEFINITIONSHAPE($,$,(#7227));
+#7232= IFCANNOTATION('1naqMftyTAMereZO3mK_C_',#4,$,$,$,#7226,#7229);
+#7236= IFCPRESENTATIONSTYLEASSIGNMENT((#7219));
+#7238= IFCSTYLEDITEM(#7220,(#7236),$);
+#7242= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--417'),$);
+#7243= IFCPROPERTYSET('3USaSsjBT73xbdZ1G7S6qn',#4,'Allplan Attributes',$
+,(#7242));
+#7245= IFCRELDEFINESBYPROPERTIES('1Om3KCJLn21RizG2fcCQ4Z',#4,$,$,(#7232)
+,#7243);
+#7249= IFCTEXTSTYLEFORDEFINEDFONT(#7250,$);
+#7250= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#7251= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#7252= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#7254= IFCTEXTSTYLE($,#7249,#7251,#7252);
+#7255= IFCTEXTLITERAL('W2',#7258,.LEFT.);
+#7256= IFCDIRECTION((1.,0.));
+#7258= IFCAXIS2PLACEMENT2D(#7259,#7256);
+#7259= IFCCARTESIANPOINT((82840.80189202845,27671.04263252323));
+#7261= IFCLOCALPLACEMENT($,#1);
+#7262= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#7255));
+#7264= IFCPRODUCTDEFINITIONSHAPE($,$,(#7262));
+#7267= IFCANNOTATION('3gCJBWdn1AdPX0YzXoXSpX',#4,$,$,$,#7261,#7264);
+#7271= IFCPRESENTATIONSTYLEASSIGNMENT((#7254));
+#7273= IFCSTYLEDITEM(#7255,(#7271),$);
+#7277= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--418'),$);
+#7278= IFCPROPERTYSET('2RcxuHSFf5xhJ5QWCco3e9',#4,'Allplan Attributes',$
+,(#7277));
+#7280= IFCRELDEFINESBYPROPERTIES('3pn_RTKpPBvx7SKEBx_zEp',#4,$,$,(#7267)
+,#7278);
+#7284= IFCTEXTSTYLEFORDEFINEDFONT(#7285,$);
+#7285= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#7286= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#7287= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#7289= IFCTEXTSTYLE($,#7284,#7286,#7287);
+#7290= IFCTEXTLITERAL('W2',#7293,.LEFT.);
+#7291= IFCDIRECTION((1.,0.));
+#7293= IFCAXIS2PLACEMENT2D(#7294,#7291);
+#7294= IFCCARTESIANPOINT((92123.80189202847,25631.04263252323));
+#7296= IFCLOCALPLACEMENT($,#1);
+#7297= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#7290));
+#7299= IFCPRODUCTDEFINITIONSHAPE($,$,(#7297));
+#7302= IFCANNOTATION('1Rl61j7zb2kv4Xcyk8drQB',#4,$,$,$,#7296,#7299);
+#7306= IFCPRESENTATIONSTYLEASSIGNMENT((#7289));
+#7308= IFCSTYLEDITEM(#7290,(#7306),$);
+#7312= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--419'),$);
+#7313= IFCPROPERTYSET('0USmUJIeDAnPci8$BC1Vef',#4,'Allplan Attributes',$
+,(#7312));
+#7315= IFCRELDEFINESBYPROPERTIES('0KvXHkivv658$hXCfKeNNW',#4,$,$,(#7302)
+,#7313);
+#7319= IFCTEXTSTYLEFORDEFINEDFONT(#7320,$);
+#7320= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#7321= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#7322= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#7324= IFCTEXTSTYLE($,#7319,#7321,#7322);
+#7325= IFCTEXTLITERAL('f2',#7328,.LEFT.);
+#7326= IFCDIRECTION((1.,0.));
+#7328= IFCAXIS2PLACEMENT2D(#7329,#7326);
+#7329= IFCCARTESIANPOINT((78350.00486703226,7551.042632523229));
+#7331= IFCLOCALPLACEMENT($,#1);
+#7332= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#7325));
+#7334= IFCPRODUCTDEFINITIONSHAPE($,$,(#7332));
+#7337= IFCANNOTATION('3HHp9DzcL7D84nlAAF_SBh',#4,$,$,$,#7331,#7334);
+#7341= IFCPRESENTATIONSTYLEASSIGNMENT((#7324));
+#7343= IFCSTYLEDITEM(#7325,(#7341),$);
+#7347= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--487'),$);
+#7348= IFCPROPERTYSET('0tQLLjYA92zOQDpsEwY0J_',#4,'Allplan Attributes',$
+,(#7347));
+#7350= IFCRELDEFINESBYPROPERTIES('3Y1tv9nGbBeQaIY9jOax06',#4,$,$,(#7337)
+,#7348);
+#7354= IFCTEXTSTYLEFORDEFINEDFONT(#7355,$);
+#7355= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#7356= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#7357= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#7359= IFCTEXTSTYLE($,#7354,#7356,#7357);
+#7360= IFCTEXTLITERAL('f3',#7363,.LEFT.);
+#7361= IFCDIRECTION((1.,0.));
+#7363= IFCAXIS2PLACEMENT2D(#7364,#7361);
+#7364= IFCCARTESIANPOINT((93993.5098230476,7551.042632523229));
+#7366= IFCLOCALPLACEMENT($,#1);
+#7367= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#7360));
+#7369= IFCPRODUCTDEFINITIONSHAPE($,$,(#7367));
+#7372= IFCANNOTATION('2wPCJrQdD6BBwSYbbAgJ9F',#4,$,$,$,#7366,#7369);
+#7376= IFCPRESENTATIONSTYLEASSIGNMENT((#7359));
+#7378= IFCSTYLEDITEM(#7360,(#7376),$);
+#7382= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--488'),$);
+#7383= IFCPROPERTYSET('3YDpqq6bj8VPNzPqN471GS',#4,'Allplan Attributes',$
+,(#7382));
+#7385= IFCRELDEFINESBYPROPERTIES('2yx4$Gbl59Lv2i1xc2Jbee',#4,$,$,(#7372)
+,#7383);
+#7389= IFCTEXTSTYLEFORDEFINEDFONT(#7390,$);
+#7390= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#7391= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#7392= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#7394= IFCTEXTSTYLE($,#7389,#7391,#7392);
+#7395= IFCTEXTLITERAL('f4',#7398,.LEFT.);
+#7396= IFCDIRECTION((1.,0.));
+#7398= IFCAXIS2PLACEMENT2D(#7399,#7396);
+#7399= IFCCARTESIANPOINT((98812.22799894086,7551.042632523229));
+#7401= IFCLOCALPLACEMENT($,#1);
+#7402= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#7395));
+#7404= IFCPRODUCTDEFINITIONSHAPE($,$,(#7402));
+#7407= IFCANNOTATION('1bIfqgxGH1Thks17JoPtYo',#4,$,$,$,#7401,#7404);
+#7411= IFCPRESENTATIONSTYLEASSIGNMENT((#7394));
+#7413= IFCSTYLEDITEM(#7395,(#7411),$);
+#7417= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--489'),$);
+#7418= IFCPROPERTYSET('16iZnN79j52eN7D9_H0OtA',#4,'Allplan Attributes',$
+,(#7417));
+#7420= IFCRELDEFINESBYPROPERTIES('13yY5oEX10pB35XzM9iEb4',#4,$,$,(#7407)
+,#7418);
+#7424= IFCTEXTSTYLEFORDEFINEDFONT(#7425,$);
+#7425= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#7426= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#7427= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#7429= IFCTEXTSTYLE($,#7424,#7426,#7427);
+#7430= IFCTEXTLITERAL('f5',#7433,.LEFT.);
+#7431= IFCDIRECTION((1.,0.));
+#7433= IFCAXIS2PLACEMENT2D(#7434,#7431);
+#7434= IFCCARTESIANPOINT((102364.5133534607,15128.54263252323));
+#7436= IFCLOCALPLACEMENT($,#1);
+#7437= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#7430));
+#7439= IFCPRODUCTDEFINITIONSHAPE($,$,(#7437));
+#7442= IFCANNOTATION('2jCImIzV98sBgXq46V1yAb',#4,$,$,$,#7436,#7439);
+#7446= IFCPRESENTATIONSTYLEASSIGNMENT((#7429));
+#7448= IFCSTYLEDITEM(#7430,(#7446),$);
+#7452= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--490'),$);
+#7453= IFCPROPERTYSET('065SbP2Rv0OBUnRaZ9XmqQ',#4,'Allplan Attributes',$
+,(#7452));
+#7455= IFCRELDEFINESBYPROPERTIES('18$SsMj_z6WQMwXO8d5K_3',#4,$,$,(#7442)
+,#7453);
+#7459= IFCTEXTSTYLEFORDEFINEDFONT(#7460,$);
+#7460= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#7461= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#7462= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#7464= IFCTEXTSTYLE($,#7459,#7461,#7462);
+#7465= IFCTEXTLITERAL('f6',#7468,.LEFT.);
+#7466= IFCDIRECTION((1.,0.));
+#7468= IFCAXIS2PLACEMENT2D(#7469,#7466);
+#7469= IFCCARTESIANPOINT((79088.46093109454,15126.04263252324));
+#7471= IFCLOCALPLACEMENT($,#1);
+#7472= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#7465));
+#7474= IFCPRODUCTDEFINITIONSHAPE($,$,(#7472));
+#7477= IFCANNOTATION('1vUnib7J57qeFWSwEZi0vG',#4,$,$,$,#7471,#7474);
+#7481= IFCPRESENTATIONSTYLEASSIGNMENT((#7464));
+#7483= IFCSTYLEDITEM(#7465,(#7481),$);
+#7487= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--491'),$);
+#7488= IFCPROPERTYSET('0qOWsnX3X0YB2K9tQhIAM2',#4,'Allplan Attributes',$
+,(#7487));
+#7490= IFCRELDEFINESBYPROPERTIES('2nhUZc3nL0fg1Ib$v_W2ts',#4,$,$,(#7477)
+,#7488);
+#7494= IFCTEXTSTYLEFORDEFINEDFONT(#7495,$);
+#7495= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#7496= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#7497= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#7499= IFCTEXTSTYLE($,#7494,#7496,#7497);
+#7500= IFCTEXTLITERAL('f7',#7503,.LEFT.);
+#7501= IFCDIRECTION((1.,0.));
+#7503= IFCAXIS2PLACEMENT2D(#7504,#7501);
+#7504= IFCCARTESIANPOINT((90227.54729917461,12438.54263252323));
+#7506= IFCLOCALPLACEMENT($,#1);
+#7507= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#7500));
+#7509= IFCPRODUCTDEFINITIONSHAPE($,$,(#7507));
+#7512= IFCANNOTATION('0SoKR_VWXAXBhm55X7aP7t',#4,$,$,$,#7506,#7509);
+#7516= IFCPRESENTATIONSTYLEASSIGNMENT((#7499));
+#7518= IFCSTYLEDITEM(#7500,(#7516),$);
+#7522= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--492'),$);
+#7523= IFCPROPERTYSET('3QMfI2FNf1Fx3FSn23491c',#4,'Allplan Attributes',$
+,(#7522));
+#7525= IFCRELDEFINESBYPROPERTIES('0Mz4nMGdDEbA_A8vN7U27z',#4,$,$,(#7512)
+,#7523);
+#7529= IFCTEXTSTYLEFORDEFINEDFONT(#7530,$);
+#7530= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#7531= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#7532= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#7534= IFCTEXTSTYLE($,#7529,#7531,#7532);
+#7535= IFCTEXTLITERAL('f8',#7538,.LEFT.);
+#7536= IFCDIRECTION((1.,0.));
+#7538= IFCAXIS2PLACEMENT2D(#7539,#7536);
+#7539= IFCCARTESIANPOINT((96930.44389119459,12513.54263252323));
+#7541= IFCLOCALPLACEMENT($,#1);
+#7542= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#7535));
+#7544= IFCPRODUCTDEFINITIONSHAPE($,$,(#7542));
+#7547= IFCANNOTATION('0HkdLKXov9w8R2FW$c7PMq',#4,$,$,$,#7541,#7544);
+#7551= IFCPRESENTATIONSTYLEASSIGNMENT((#7534));
+#7553= IFCSTYLEDITEM(#7535,(#7551),$);
+#7557= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--493'),$);
+#7558= IFCPROPERTYSET('3Icq$tVtn2h8W3hkyojlyG',#4,'Allplan Attributes',$
+,(#7557));
+#7560= IFCRELDEFINESBYPROPERTIES('1w7uraHRbAme8gZiTGyN6V',#4,$,$,(#7547)
+,#7558);
+#7564= IFCTEXTSTYLEFORDEFINEDFONT(#7565,$);
+#7565= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#7566= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#7567= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#7569= IFCTEXTSTYLE($,#7564,#7566,#7567);
+#7570= IFCTEXTLITERAL('f9',#7573,.LEFT.);
+#7571= IFCDIRECTION((1.,0.));
+#7573= IFCAXIS2PLACEMENT2D(#7574,#7571);
+#7574= IFCCARTESIANPOINT((96915.96093109452,21621.04263252323));
+#7576= IFCLOCALPLACEMENT($,#1);
+#7577= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#7570));
+#7579= IFCPRODUCTDEFINITIONSHAPE($,$,(#7577));
+#7582= IFCANNOTATION('3h_o$Fn9H6dRlsWygjWX0y',#4,$,$,$,#7576,#7579);
+#7586= IFCPRESENTATIONSTYLEASSIGNMENT((#7569));
+#7588= IFCSTYLEDITEM(#7570,(#7586),$);
+#7592= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--494'),$);
+#7593= IFCPROPERTYSET('2AtIrp$_z7qwRFpeI7LOWM',#4,'Allplan Attributes',$
+,(#7592));
+#7595= IFCRELDEFINESBYPROPERTIES('0xTTL7uH56DQ8$uXNzCKE8',#4,$,$,(#7582)
+,#7593);
+#7599= IFCTEXTSTYLEFORDEFINEDFONT(#7600,$);
+#7600= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#7601= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#7602= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#7604= IFCTEXTSTYLE($,#7599,#7601,#7602);
+#7605= IFCTEXTLITERAL('B',#7608,.LEFT.);
+#7606= IFCDIRECTION((6.123233995736766E-17,1.));
+#7608= IFCAXIS2PLACEMENT2D(#7609,#7606);
+#7609= IFCCARTESIANPOINT((88169.24186625176,20927.9088516208));
+#7611= IFCLOCALPLACEMENT($,#1);
+#7612= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#7605));
+#7614= IFCPRODUCTDEFINITIONSHAPE($,$,(#7612));
+#7617= IFCANNOTATION('1MjplT0abB6Qf08uoZxv_B',#4,$,$,$,#7611,#7614);
+#7621= IFCPRESENTATIONSTYLEASSIGNMENT((#7604));
+#7623= IFCSTYLEDITEM(#7605,(#7621),$);
+#7627= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--518'),$);
+#7628= IFCPROPERTYSET('2uYAgQH9rE6xt9vxmAp7Ps',#4,'Allplan Attributes',$
+,(#7627));
+#7630= IFCRELDEFINESBYPROPERTIES('0mOEtPtMjBe991SgThd1jm',#4,$,$,(#7617)
+,#7628);
+#7634= IFCTEXTSTYLEFORDEFINEDFONT(#7635,$);
+#7635= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#7636= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#7637= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#7639= IFCTEXTSTYLE($,#7634,#7636,#7637);
+#7640= IFCTEXTLITERAL('B',#7643,.LEFT.);
+#7641= IFCDIRECTION((6.123233995736766E-17,1.));
+#7643= IFCAXIS2PLACEMENT2D(#7644,#7641);
+#7644= IFCCARTESIANPOINT((88169.24186625176,25478.76747622812));
+#7646= IFCLOCALPLACEMENT($,#1);
+#7647= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#7640));
+#7649= IFCPRODUCTDEFINITIONSHAPE($,$,(#7647));
+#7652= IFCANNOTATION('1ZxAek72r78Q5R09P5NmEa',#4,$,$,$,#7646,#7649);
+#7656= IFCPRESENTATIONSTYLEASSIGNMENT((#7639));
+#7658= IFCSTYLEDITEM(#7640,(#7656),$);
+#7662= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--519'),$);
+#7663= IFCPROPERTYSET('2rMfoYc45F7gnUKGTM0Row',#4,'Allplan Attributes',$
+,(#7662));
+#7665= IFCRELDEFINESBYPROPERTIES('0uAmycUq59KAVTxbJLecGC',#4,$,$,(#7652)
+,#7663);
+#7669= IFCTEXTSTYLEFORDEFINEDFONT(#7670,$);
+#7670= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#7671= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.6));
+#7672= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(400.));
+#7674= IFCTEXTSTYLE($,#7669,#7671,#7672);
+#7675= IFCTEXTLITERAL('%RAInnenwand%RE',#7678,.LEFT.);
+#7676= IFCDIRECTION((6.123233995736766E-17,1.));
+#7678= IFCAXIS2PLACEMENT2D(#7679,#7676);
+#7679= IFCCARTESIANPOINT((87665.84948349507,20590.58940828774));
+#7681= IFCLOCALPLACEMENT($,#1);
+#7682= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#7675));
+#7684= IFCPRODUCTDEFINITIONSHAPE($,$,(#7682));
+#7687= IFCANNOTATION('10MJaRWlT7_Q6tQXX1pVDI',#4,$,$,$,#7681,#7684);
+#7691= IFCPRESENTATIONSTYLEASSIGNMENT((#7674));
+#7693= IFCSTYLEDITEM(#7675,(#7691),$);
+#7697= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--520'),$);
+#7698= IFCPROPERTYSET('1ivb_z9Hv5b9YW_UsZpU68',#4,'Allplan Attributes',$
+,(#7697));
+#7700= IFCRELDEFINESBYPROPERTIES('2$Jd2nO$v1zOwebyrdhIO5',#4,$,$,(#7687)
+,#7698);
+#7704= IFCTEXTSTYLEFORDEFINEDFONT(#7705,$);
+#7705= IFCCOLOURRGB($,0.4392156862745098,0.4392156862745098,1.);
+#7706= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.5));
+#7707= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(250.));
+#7709= IFCTEXTSTYLE($,#7704,#7706,#7707);
+#7710= IFCPLANAREXTENT(4979.166666666672,312.5);
+#7711= IFCTEXTLITERALWITHEXTENT(
+'unter Fundamente mit Sickerbeton 32/45mm CEM 200 kg/m\X2\00B3\X0\\X\0Aoder Magerbeton CEM 200 kg/m\X2\00B3\X0\ bis auf Kiesschicht fundieren !'
+,#7714,.LEFT.,#7710,'top-left');
+#7712= IFCDIRECTION((1.,0.));
+#7714= IFCAXIS2PLACEMENT2D(#7715,#7712);
+#7715= IFCCARTESIANPOINT((79040.90503321811,12115.36635853764));
+#7717= IFCLOCALPLACEMENT($,#1);
+#7718= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#7711));
+#7720= IFCPRODUCTDEFINITIONSHAPE($,$,(#7718));
+#7723= IFCANNOTATION('3xidbYZRj7BBlsuGZXw2z2',#4,$,$,$,#7717,#7720);
+#7727= IFCPRESENTATIONSTYLEASSIGNMENT((#7709));
+#7729= IFCSTYLEDITEM(#7711,(#7727),$);
+#7733= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--530'),$);
+#7734= IFCPROPERTYSET('3K2PzcnYT3IAnDvwF9r0zn',#4,'Allplan Attributes',$
+,(#7733));
+#7736= IFCRELDEFINESBYPROPERTIES('3YfX1jJUH82frdpzzRIMTT',#4,$,$,(#7723)
+,#7734);
+#7740= IFCTEXTSTYLEFORDEFINEDFONT(#7741,$);
+#7741= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#7742= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#7743= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#7745= IFCTEXTSTYLE($,#7740,#7742,#7743);
+#7746= IFCTEXTLITERAL('Einlage 15x25cm',#7749,.LEFT.);
+#7747= IFCDIRECTION((1.,0.));
+#7749= IFCAXIS2PLACEMENT2D(#7750,#7747);
+#7750= IFCCARTESIANPOINT((94135.,8666.671497262763));
+#7752= IFCLOCALPLACEMENT($,#1);
+#7753= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#7746));
+#7755= IFCPRODUCTDEFINITIONSHAPE($,$,(#7753));
+#7758= IFCANNOTATION('3sdkks8Ar9pvYCfq9YB3yB',#4,$,$,$,#7752,#7755);
+#7762= IFCPRESENTATIONSTYLEASSIGNMENT((#7745));
+#7764= IFCSTYLEDITEM(#7746,(#7762),$);
+#7768= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--557'),$);
+#7769= IFCPROPERTYSET('2Mhl7_rGf5ewBGKrOnGzXn',#4,'Allplan Attributes',$
+,(#7768));
+#7771= IFCRELDEFINESBYPROPERTIES('18$5HpR9f9Te$EqChb1lhu',#4,$,$,(#7758)
+,#7769);
+#7775= IFCTEXTSTYLEFORDEFINEDFONT(#7776,$);
+#7776= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#7777= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#7778= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#7780= IFCTEXTSTYLE($,#7775,#7777,#7778);
+#7781= IFCTEXTLITERAL('Grundriss  1:50',#7784,.LEFT.);
+#7782= IFCDIRECTION((1.,0.));
+#7784= IFCAXIS2PLACEMENT2D(#7785,#7782);
+#7785= IFCCARTESIANPOINT((83279.7373736969,30147.25334708006));
+#7787= IFCLOCALPLACEMENT($,#1);
+#7788= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#7781));
+#7790= IFCPRODUCTDEFINITIONSHAPE($,$,(#7788));
+#7793= IFCANNOTATION('3ANMJDUCr5FQxs2xW4tQOW',#4,$,$,$,#7787,#7790);
+#7797= IFCPRESENTATIONSTYLEASSIGNMENT((#7780));
+#7799= IFCSTYLEDITEM(#7781,(#7797),$);
+#7803= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--562'),$);
+#7804= IFCPROPERTYSET('0CtlWC$$jENP63VwRl_N_k',#4,'Allplan Attributes',$
+,(#7803));
+#7806= IFCRELDEFINESBYPROPERTIES('2MN5WzVWPEOA0ILZs18DnB',#4,$,$,(#7793)
+,#7804);
+#7810= IFCTEXTSTYLEFORDEFINEDFONT(#7811,$);
+#7811= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#7812= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#7813= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#7815= IFCTEXTSTYLE($,#7810,#7812,#7813);
+#7816= IFCTEXTLITERAL('Arbeitsfuge mit Quellfugenband !',#7819,.LEFT.);
+#7817= IFCDIRECTION((6.123233995736766E-17,1.));
+#7819= IFCAXIS2PLACEMENT2D(#7820,#7817);
+#7820= IFCCARTESIANPOINT((77728.33333333336,11056.97175194527));
+#7822= IFCLOCALPLACEMENT($,#1);
+#7823= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#7816));
+#7825= IFCPRODUCTDEFINITIONSHAPE($,$,(#7823));
+#7828= IFCANNOTATION('241GhMmtL1huTgVChltpgJ',#4,$,$,$,#7822,#7825);
+#7832= IFCPRESENTATIONSTYLEASSIGNMENT((#7815));
+#7834= IFCSTYLEDITEM(#7816,(#7832),$);
+#7838= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--564'),$);
+#7839= IFCPROPERTYSET('2JNPmSY5X1ne7zbuH_ZmRZ',#4,'Allplan Attributes',$
+,(#7838));
+#7841= IFCRELDEFINESBYPROPERTIES('3rfKBtSZb1nfYWH07N75wq',#4,$,$,(#7828)
+,#7839);
+#7845= IFCTEXTSTYLEFORDEFINEDFONT(#7846,$);
+#7846= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#7847= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#7848= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#7850= IFCTEXTSTYLE($,#7845,#7847,#7848);
+#7851= IFCTEXTLITERAL('Arbeitsfuge mit Quellfugenband !',#7854,.LEFT.);
+#7852= IFCDIRECTION((6.123233995736766E-17,1.));
+#7854= IFCAXIS2PLACEMENT2D(#7855,#7852);
+#7855= IFCCARTESIANPOINT((77728.33333333336,21266.51780159047));
+#7857= IFCLOCALPLACEMENT($,#1);
+#7858= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#7851));
+#7860= IFCPRODUCTDEFINITIONSHAPE($,$,(#7858));
+#7863= IFCANNOTATION('1xcz06lVb3yw4KcdmH4BOi',#4,$,$,$,#7857,#7860);
+#7867= IFCPRESENTATIONSTYLEASSIGNMENT((#7850));
+#7869= IFCSTYLEDITEM(#7851,(#7867),$);
+#7873= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--565'),$);
+#7874= IFCPROPERTYSET('39b3LdnIbAV8UYvhHcZB1g',#4,'Allplan Attributes',$
+,(#7873));
+#7876= IFCRELDEFINESBYPROPERTIES('18oHzy$OHCNQoWMGZ1j_96',#4,$,$,(#7863)
+,#7874);
+#7880= IFCTEXTSTYLEFORDEFINEDFONT(#7881,$);
+#7881= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#7882= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.5));
+#7883= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(300.));
+#7885= IFCTEXTSTYLE($,#7880,#7882,#7883);
+#7886= IFCPLANAREXTENT(2910.000000000003,825.0000000000168);
+#7887= IFCTEXTLITERALWITHEXTENT(
+'OK= -0.07, UK= -0.32\X\0A+ 20cm D\X2\00E4\X0\mmung (UK= -0.52)\X\0A+ 2cm Splitt (UK= -0.54)\X\0A+ 5cm Magerbeton (UK= -0.59)'
+,#7890,.LEFT.,#7886,'top-left');
+#7888= IFCDIRECTION((0.9808262151348185,0.1948844162684815));
+#7890= IFCAXIS2PLACEMENT2D(#7891,#7888);
+#7891= IFCCARTESIANPOINT((83653.51454661261,25704.46997895839));
+#7893= IFCLOCALPLACEMENT($,#1);
+#7894= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#7887));
+#7896= IFCPRODUCTDEFINITIONSHAPE($,$,(#7894));
+#7899= IFCANNOTATION('3y9dHGJ8f818GUlfDWKI5M',#4,$,$,$,#7893,#7896);
+#7903= IFCPRESENTATIONSTYLEASSIGNMENT((#7885));
+#7905= IFCSTYLEDITEM(#7887,(#7903),$);
+#7909= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--566'),$);
+#7910= IFCPROPERTYSET('0I3rAZPFv7hfgPh_s913Vw',#4,'Allplan Attributes',$
+,(#7909));
+#7912= IFCRELDEFINESBYPROPERTIES('1VMV2PA_fEF88py0UvVU_N',#4,$,$,(#7899)
+,#7910);
+#7916= IFCTEXTSTYLEFORDEFINEDFONT(#7917,$);
+#7917= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#7918= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.5));
+#7919= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(250.));
+#7921= IFCTEXTSTYLE($,#7916,#7918,#7919);
+#7922= IFCPLANAREXTENT(1940.000000000009,687.4999999999822);
+#7923= IFCTEXTLITERALWITHEXTENT(
+'OK= -1.13, UK= -1.38\X\0A+ 20cm D\X2\00E4\X0\mmung (UK= -1.58)\X\0A+ 2cm Splitt (UK= -1.60)\X\0A+ 5cm Magerbeton (UK= -1.65)'
+,#7926,.LEFT.,#7922,'top-left');
+#7924= IFCDIRECTION((0.7310552682428722,0.6823182503600077));
+#7926= IFCAXIS2PLACEMENT2D(#7927,#7924);
+#7927= IFCCARTESIANPOINT((87546.77173638951,22437.02940657125));
+#7929= IFCLOCALPLACEMENT($,#1);
+#7930= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#7923));
+#7932= IFCPRODUCTDEFINITIONSHAPE($,$,(#7930));
+#7935= IFCANNOTATION('05uKGUz$TFJAGzTBFGdGqT',#4,$,$,$,#7929,#7932);
+#7939= IFCPRESENTATIONSTYLEASSIGNMENT((#7921));
+#7941= IFCSTYLEDITEM(#7923,(#7939),$);
+#7945= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--567'),$);
+#7946= IFCPROPERTYSET('3Z7adY07fFVeqNaaMgXQD2',#4,'Allplan Attributes',$
+,(#7945));
+#7948= IFCRELDEFINESBYPROPERTIES('34BuoUmxH3LwlBwwDmkrAJ',#4,$,$,(#7935)
+,#7946);
+#7952= IFCTEXTSTYLEFORDEFINEDFONT(#7953,$);
+#7953= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#7954= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#7955= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(350.));
+#7957= IFCTEXTSTYLE($,#7952,#7954,#7955);
+#7958= IFCTEXTLITERAL('d = 25cm',#7961,.LEFT.);
+#7959= IFCDIRECTION((0.9216166900860996,0.3881013740696396));
+#7961= IFCAXIS2PLACEMENT2D(#7962,#7959);
+#7962= IFCCARTESIANPOINT((77891.256051316,14098.27303360807));
+#7964= IFCLOCALPLACEMENT($,#1);
+#7965= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#7958));
+#7967= IFCPRODUCTDEFINITIONSHAPE($,$,(#7965));
+#7970= IFCANNOTATION('37bzSgqaP2sR1ZJSE6kNZS',#4,$,$,$,#7964,#7967);
+#7974= IFCPRESENTATIONSTYLEASSIGNMENT((#7957));
+#7976= IFCSTYLEDITEM(#7958,(#7974),$);
+#7980= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--568'),$);
+#7981= IFCPROPERTYSET('0Ep$yJMo9F18U43ruYIa_X',#4,'Allplan Attributes',$
+,(#7980));
+#7983= IFCRELDEFINESBYPROPERTIES('1zg21xjzLAruKIFL79LD3B',#4,$,$,(#7970)
+,#7981);
+#7987= IFCTEXTSTYLEFORDEFINEDFONT(#7988,$);
+#7988= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#7989= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.5));
+#7990= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(300.));
+#7992= IFCTEXTSTYLE($,#7987,#7989,#7990);
+#7993= IFCPLANAREXTENT(2910.000000000046,824.9999999999975);
+#7994= IFCTEXTLITERALWITHEXTENT(
+'OK= -0.14, UK= -0.39\X\0A+ 20cm D\X2\00E4\X0\mmung (UK= -0.59)\X\0A+ 2cm Splitt (UK= -0.61)\X\0A+ 5cm Magerbeton (UK= -0.66)'
+,#7997,.LEFT.,#7993,'top-left');
+#7995= IFCDIRECTION((0.9216166900860947,0.3881013740696512));
+#7997= IFCAXIS2PLACEMENT2D(#7998,#7995);
+#7998= IFCCARTESIANPOINT((77933.62378465194,13997.66321160699));
+#8000= IFCLOCALPLACEMENT($,#1);
+#8001= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#7994));
+#8003= IFCPRODUCTDEFINITIONSHAPE($,$,(#8001));
+#8006= IFCANNOTATION('1nEiWR2mbADgr3eI79jX8s',#4,$,$,$,#8000,#8003);
+#8010= IFCPRESENTATIONSTYLEASSIGNMENT((#7992));
+#8012= IFCSTYLEDITEM(#7994,(#8010),$);
+#8016= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--569'),$);
+#8017= IFCPROPERTYSET('1BhzPgL5f1nxp__jxoX9q7',#4,'Allplan Attributes',$
+,(#8016));
+#8019= IFCRELDEFINESBYPROPERTIES('18k0VDuIz0pe_Fjri0brpp',#4,$,$,(#8006)
+,#8017);
+#8023= IFCTEXTSTYLEFORDEFINEDFONT(#8024,$);
+#8024= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#8025= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.4));
+#8026= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#8028= IFCTEXTSTYLE($,#8023,#8025,#8026);
+#8029= IFCPLANAREXTENT(1940.,520.0000000000091);
+#8030= IFCTEXTLITERALWITHEXTENT(
+'Fund. d=35cm, UK= -0.74\X\0A+ 20cm D\X2\00E4\X0\mmung (UK= -0.94)\X\0A+ 2cm Splitt (UK= -0.96)\X\0A+ 5cm Magerbeton (UK= -1.01)'
+,#8033,.LEFT.,#8029,'top-left');
+#8031= IFCDIRECTION((1.,0.));
+#8033= IFCAXIS2PLACEMENT2D(#8034,#8031);
+#8034= IFCCARTESIANPOINT((67575.,16411.67149726277));
+#8036= IFCLOCALPLACEMENT($,#1);
+#8037= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#8030));
+#8039= IFCPRODUCTDEFINITIONSHAPE($,$,(#8037));
+#8042= IFCANNOTATION('35Rl2yzkH8Dxp4$T_ELQo9',#4,$,$,$,#8036,#8039);
+#8046= IFCPRESENTATIONSTYLEASSIGNMENT((#8028));
+#8048= IFCSTYLEDITEM(#8030,(#8046),$);
+#8052= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--570'),$);
+#8053= IFCPROPERTYSET('16i1h35NTDRO3mUncxzueb',#4,'Allplan Attributes',$
+,(#8052));
+#8055= IFCRELDEFINESBYPROPERTIES('0Nu7nHMjDFOv2AxOZRHLrK',#4,$,$,(#8042)
+,#8053);
+#8059= IFCTEXTSTYLEFORDEFINEDFONT(#8060,$);
+#8060= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#8061= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.4));
+#8062= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#8064= IFCTEXTSTYLE($,#8059,#8061,#8062);
+#8065= IFCPLANAREXTENT(1940.,520.);
+#8066= IFCTEXTLITERALWITHEXTENT(
+'Fund. d=35cm, UK= -0.74\X\0A+ 20cm D\X2\00E4\X0\mmung (UK= -0.94)\X\0A+ 2cm Splitt (UK= -0.96)\X\0A+ 5cm Magerbeton (UK= -1.01)'
+,#8069,.LEFT.,#8065,'top-left');
+#8067= IFCDIRECTION((1.,0.));
+#8069= IFCAXIS2PLACEMENT2D(#8070,#8067);
+#8070= IFCCARTESIANPOINT((86373.12561100708,16411.67149726277));
+#8072= IFCLOCALPLACEMENT($,#1);
+#8073= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#8066));
+#8075= IFCPRODUCTDEFINITIONSHAPE($,$,(#8073));
+#8078= IFCANNOTATION('2a9E9_ZKf8ZBnEM1RJm8Vo',#4,$,$,$,#8072,#8075);
+#8082= IFCPRESENTATIONSTYLEASSIGNMENT((#8064));
+#8084= IFCSTYLEDITEM(#8066,(#8082),$);
+#8088= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--571'),$);
+#8089= IFCPROPERTYSET('2PEUmvgln3IOpB93PBm$JG',#4,'Allplan Attributes',$
+,(#8088));
+#8091= IFCRELDEFINESBYPROPERTIES('0ok$nr2vL0hxb6W_zpvW5p',#4,$,$,(#8078)
+,#8089);
+#8095= IFCTEXTSTYLEFORDEFINEDFONT(#8096,$);
+#8096= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#8097= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.4));
+#8098= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#8100= IFCTEXTSTYLE($,#8095,#8097,#8098);
+#8101= IFCPLANAREXTENT(1940.,520.);
+#8102= IFCTEXTLITERALWITHEXTENT(
+'Fund. d=15cm, UK= -0.54\X\0A+ 20cm D\X2\00E4\X0\mmung (UK= -0.74)\X\0A+ 2cm Splitt (UK= -0.76)\X\0A+ 5cm Magerbeton (UK= -0.81)'
+,#8105,.LEFT.,#8101,'top-left');
+#8103= IFCDIRECTION((6.123233995736766E-17,1.));
+#8105= IFCAXIS2PLACEMENT2D(#8106,#8103);
+#8106= IFCCARTESIANPOINT((91000.00000000003,11496.20276121365));
+#8108= IFCLOCALPLACEMENT($,#1);
+#8109= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#8102));
+#8111= IFCPRODUCTDEFINITIONSHAPE($,$,(#8109));
+#8114= IFCANNOTATION('2qONp0N_LCTxZRrI8ChQ2t',#4,$,$,$,#8108,#8111);
+#8118= IFCPRESENTATIONSTYLEASSIGNMENT((#8100));
+#8120= IFCSTYLEDITEM(#8102,(#8118),$);
+#8124= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--572'),$);
+#8125= IFCPROPERTYSET('0COQlOwonFuxYOho4BHU_l',#4,'Allplan Attributes',$
+,(#8124));
+#8127= IFCRELDEFINESBYPROPERTIES('0D1Sbv6QTEYOvOm$zZ$por',#4,$,$,(#8114)
+,#8125);
+#8131= IFCTEXTSTYLEFORDEFINEDFONT(#8132,$);
+#8132= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#8133= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.4));
+#8134= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#8136= IFCTEXTSTYLE($,#8131,#8133,#8134);
+#8137= IFCPLANAREXTENT(1940.,520.);
+#8138= IFCTEXTLITERALWITHEXTENT(
+'Fund. d=15cm, UK= -0.54\X\0A+ 20cm D\X2\00E4\X0\mmung (UK= -0.74)\X\0A+ 2cm Splitt (UK= -0.76)\X\0A+ 5cm Magerbeton (UK= -0.81)'
+,#8141,.LEFT.,#8137,'top-left');
+#8139= IFCDIRECTION((6.123233995736766E-17,1.));
+#8141= IFCAXIS2PLACEMENT2D(#8142,#8139);
+#8142= IFCCARTESIANPOINT((95005.,11269.79426336781));
+#8144= IFCLOCALPLACEMENT($,#1);
+#8145= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#8138));
+#8147= IFCPRODUCTDEFINITIONSHAPE($,$,(#8145));
+#8150= IFCANNOTATION('14ycqZx2PCxQUFclREpQHx',#4,$,$,$,#8144,#8147);
+#8154= IFCPRESENTATIONSTYLEASSIGNMENT((#8136));
+#8156= IFCSTYLEDITEM(#8138,(#8154),$);
+#8160= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--573'),$);
+#8161= IFCPROPERTYSET('1znkoD7VnFPQGZTjfnIbEE',#4,'Allplan Attributes',$
+,(#8160));
+#8163= IFCRELDEFINESBYPROPERTIES('3$fn6t5l5CSh8D5eAzFpo5',#4,$,$,(#8150)
+,#8161);
+#8167= IFCTEXTSTYLEFORDEFINEDFONT(#8168,$);
+#8168= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#8169= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.4));
+#8170= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#8172= IFCTEXTSTYLE($,#8167,#8169,#8170);
+#8173= IFCPLANAREXTENT(1940.,520.0000000000073);
+#8174= IFCTEXTLITERALWITHEXTENT(
+'Fund. d=35cm, UK= -0.74\X\0A+ 20cm D\X2\00E4\X0\mmung (UK= -0.94)\X\0A+ 2cm Splitt (UK= -0.96)\X\0A+ 5cm Magerbeton (UK= -1.01)'
+,#8177,.LEFT.,#8173,'top-left');
+#8175= IFCDIRECTION((1.,0.));
+#8177= IFCAXIS2PLACEMENT2D(#8178,#8175);
+#8178= IFCCARTESIANPOINT((94985.,16561.67149726277));
+#8180= IFCLOCALPLACEMENT($,#1);
+#8181= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#8174));
+#8183= IFCPRODUCTDEFINITIONSHAPE($,$,(#8181));
+#8186= IFCANNOTATION('06pOyGFRDCH8k0TJun8PSF',#4,$,$,$,#8180,#8183);
+#8190= IFCPRESENTATIONSTYLEASSIGNMENT((#8172));
+#8192= IFCSTYLEDITEM(#8174,(#8190),$);
+#8196= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--574'),$);
+#8197= IFCPROPERTYSET('2wZxdx8Zf58uhE8oA68RBP',#4,'Allplan Attributes',$
+,(#8196));
+#8199= IFCRELDEFINESBYPROPERTIES('2O09ouFUzC_B920UR_YPY0',#4,$,$,(#8186)
+,#8197);
+#8203= IFCTEXTSTYLEFORDEFINEDFONT(#8204,$);
+#8204= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#8205= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.4));
+#8206= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#8208= IFCTEXTSTYLE($,#8203,#8205,#8206);
+#8209= IFCPLANAREXTENT(1940.,520.);
+#8210= IFCTEXTLITERALWITHEXTENT(
+'Fund. d=15cm, UK= -0.54\X\0A+ 20cm D\X2\00E4\X0\mmung (UK= -0.74)\X\0A+ 2cm Splitt (UK= -0.76)\X\0A+ 5cm Magerbeton (UK= -0.81)'
+,#8213,.LEFT.,#8209,'top-left');
+#8211= IFCDIRECTION((6.123233995736766E-17,1.));
+#8213= IFCAXIS2PLACEMENT2D(#8214,#8211);
+#8214= IFCCARTESIANPOINT((95005.,20592.11878411506));
+#8216= IFCLOCALPLACEMENT($,#1);
+#8217= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#8210));
+#8219= IFCPRODUCTDEFINITIONSHAPE($,$,(#8217));
+#8222= IFCANNOTATION('0zxPWIyq956fNCkhk6ofqN',#4,$,$,$,#8216,#8219);
+#8226= IFCPRESENTATIONSTYLEASSIGNMENT((#8208));
+#8228= IFCSTYLEDITEM(#8210,(#8226),$);
+#8232= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--575'),$);
+#8233= IFCPROPERTYSET('3tdJLBCiX6tw03vQPFDpIL',#4,'Allplan Attributes',$
+,(#8232));
+#8235= IFCRELDEFINESBYPROPERTIES('3oi21gDFXA5AXhS7vb2tCP',#4,$,$,(#8222)
+,#8233);
+#8239= IFCTEXTSTYLEFORDEFINEDFONT(#8240,$);
+#8240= IFCDRAUGHTINGPREDEFINEDCOLOUR('blue');
+#8241= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.5));
+#8242= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#8244= IFCTEXTSTYLE($,#8239,#8241,#8242);
+#8245= IFCTEXTLITERAL('Quellfugenband',#8248,.LEFT.);
+#8246= IFCDIRECTION((1.,0.));
+#8248= IFCAXIS2PLACEMENT2D(#8249,#8246);
+#8249= IFCCARTESIANPOINT((64146.32312513622,-4831.286366342691));
+#8251= IFCLOCALPLACEMENT($,#1);
+#8252= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#8245));
+#8254= IFCPRODUCTDEFINITIONSHAPE($,$,(#8252));
+#8257= IFCANNOTATION('2Sk6fd2pX2we0AJDpLzh3g',#4,$,$,$,#8251,#8254);
+#8261= IFCPRESENTATIONSTYLEASSIGNMENT((#8244));
+#8263= IFCSTYLEDITEM(#8245,(#8261),$);
+#8267= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92da1-9f81-11e3-bfbc-7446a0b2bba9--4'),$);
+#8268= IFCPROPERTYSET('2vc0vpPMn4KOndd1dmgu4V',#4,'Allplan Attributes',$
+,(#8267));
+#8270= IFCRELDEFINESBYPROPERTIES('02D271iTr0pQCALKgILVsb',#4,$,$,(#8257)
+,#8268);
+#8274= IFCTEXTSTYLEFORDEFINEDFONT(#8275,$);
+#8275= IFCDRAUGHTINGPREDEFINEDCOLOUR('blue');
+#8276= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.5));
+#8277= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#8279= IFCTEXTSTYLE($,#8274,#8276,#8277);
+#8280= IFCTEXTLITERAL('Combiflex',#8283,.LEFT.);
+#8281= IFCDIRECTION((1.,0.));
+#8283= IFCAXIS2PLACEMENT2D(#8284,#8281);
+#8284= IFCCARTESIANPOINT((64427.57132664954,-5434.780956291281));
+#8286= IFCLOCALPLACEMENT($,#1);
+#8287= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#8280));
+#8289= IFCPRODUCTDEFINITIONSHAPE($,$,(#8287));
+#8292= IFCANNOTATION('3sX2eqLiH26x1$FV3CC458',#4,$,$,$,#8286,#8289);
+#8296= IFCPRESENTATIONSTYLEASSIGNMENT((#8279));
+#8298= IFCSTYLEDITEM(#8280,(#8296),$);
+#8302= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92da1-9f81-11e3-bfbc-7446a0b2bba9--7'),$);
+#8303= IFCPROPERTYSET('1ZLKOPLXnFFfiFg4tk8Gge',#4,'Allplan Attributes',$
+,(#8302));
+#8305= IFCRELDEFINESBYPROPERTIES('0nAxJWzxf34P1nsQ4KulhX',#4,$,$,(#8292)
+,#8303);
+#8309= IFCTEXTSTYLEFORDEFINEDFONT(#8310,$);
+#8310= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#8311= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#8312= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#8314= IFCTEXTSTYLE($,#8309,#8311,#8312);
+#8315= IFCTEXTLITERAL('Schnitt A-A  1:20',#8318,.LEFT.);
+#8316= IFCDIRECTION((1.,0.));
+#8318= IFCAXIS2PLACEMENT2D(#8319,#8316);
+#8319= IFCCARTESIANPOINT((64928.65779311588,-4084.138528206891));
+#8321= IFCLOCALPLACEMENT($,#1);
+#8322= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#8315));
+#8324= IFCPRODUCTDEFINITIONSHAPE($,$,(#8322));
+#8327= IFCANNOTATION('12yF7NTj1Bkuonxv10jd$k',#4,$,$,$,#8321,#8324);
+#8331= IFCPRESENTATIONSTYLEASSIGNMENT((#8314));
+#8333= IFCSTYLEDITEM(#8315,(#8331),$);
+#8337= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92da1-9f81-11e3-bfbc-7446a0b2bba9--12'),$);
+#8338= IFCPROPERTYSET('1ka_Bu1Y16exBX1vXvOjqv',#4,'Allplan Attributes',$
+,(#8337));
+#8340= IFCRELDEFINESBYPROPERTIES('0MpZfLD7b6rQ$yKa6mobW9',#4,$,$,(#8327)
+,#8338);
+#8344= IFCTEXTSTYLEFORDEFINEDFONT(#8345,$);
+#8345= IFCDRAUGHTINGPREDEFINEDCOLOUR('blue');
+#8346= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.5));
+#8347= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#8349= IFCTEXTSTYLE($,#8344,#8346,#8347);
+#8350= IFCTEXTLITERAL('Combiflex',#8353,.LEFT.);
+#8351= IFCDIRECTION((1.,0.));
+#8353= IFCAXIS2PLACEMENT2D(#8354,#8351);
+#8354= IFCCARTESIANPOINT((70931.8678860706,-5434.780956291281));
+#8356= IFCLOCALPLACEMENT($,#1);
+#8357= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#8350));
+#8359= IFCPRODUCTDEFINITIONSHAPE($,$,(#8357));
+#8362= IFCANNOTATION('1WNQJmDTz2VvFjcmPQMBY2',#4,$,$,$,#8356,#8359);
+#8366= IFCPRESENTATIONSTYLEASSIGNMENT((#8349));
+#8368= IFCSTYLEDITEM(#8350,(#8366),$);
+#8372= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'b195b7c3-9fbb-11e3-bfbc-7446a0b2bba9--3'),$);
+#8373= IFCPROPERTYSET('2BEbcxXhzFlw0bbQPkOU5P',#4,'Allplan Attributes',$
+,(#8372));
+#8375= IFCRELDEFINESBYPROPERTIES('0YRDXMoHD8Uuf59ymI1LXm',#4,$,$,(#8362)
+,#8373);
+#8379= IFCTEXTSTYLEFORDEFINEDFONT(#8380,$);
+#8380= IFCDRAUGHTINGPREDEFINEDCOLOUR('blue');
+#8381= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.5));
+#8382= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#8384= IFCTEXTSTYLE($,#8379,#8381,#8382);
+#8385= IFCTEXTLITERAL('Quellfugenband',#8388,.LEFT.);
+#8386= IFCDIRECTION((1.,0.));
+#8388= IFCAXIS2PLACEMENT2D(#8389,#8386);
+#8389= IFCCARTESIANPOINT((70650.61968455727,-4831.286366342691));
+#8391= IFCLOCALPLACEMENT($,#1);
+#8392= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#8385));
+#8394= IFCPRODUCTDEFINITIONSHAPE($,$,(#8392));
+#8397= IFCANNOTATION('2mBLIxfdbDsO9K_KcY7$gv',#4,$,$,$,#8391,#8394);
+#8401= IFCPRESENTATIONSTYLEASSIGNMENT((#8384));
+#8403= IFCSTYLEDITEM(#8385,(#8401),$);
+#8407= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'b195b7c3-9fbb-11e3-bfbc-7446a0b2bba9--6'),$);
+#8408= IFCPROPERTYSET('3OWiZLvOL5Uh6SDUVWkkIB',#4,'Allplan Attributes',$
+,(#8407));
+#8410= IFCRELDEFINESBYPROPERTIES('1bSq$rDlX5N9NaiqwQPvOD',#4,$,$,(#8397)
+,#8408);
+#8414= IFCTEXTSTYLEFORDEFINEDFONT(#8415,$);
+#8415= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#8416= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#8417= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#8419= IFCTEXTSTYLE($,#8414,#8416,#8417);
+#8420= IFCTEXTLITERAL('Schnitt B-B  1:20',#8423,.LEFT.);
+#8421= IFCDIRECTION((1.,0.));
+#8423= IFCAXIS2PLACEMENT2D(#8424,#8421);
+#8424= IFCCARTESIANPOINT((71682.95435253697,-4084.138528206892));
+#8426= IFCLOCALPLACEMENT($,#1);
+#8427= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#8420));
+#8429= IFCPRODUCTDEFINITIONSHAPE($,$,(#8427));
+#8432= IFCANNOTATION('1DrHoO2Ar2evqL8rVDuNeY',#4,$,$,$,#8426,#8429);
+#8436= IFCPRESENTATIONSTYLEASSIGNMENT((#8419));
+#8438= IFCSTYLEDITEM(#8420,(#8436),$);
+#8442= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'b195b7c3-9fbb-11e3-bfbc-7446a0b2bba9--18'),$);
+#8443= IFCPROPERTYSET('1dzN19NFHASwGXwHyFourV',#4,'Allplan Attributes',$
+,(#8442));
+#8445= IFCRELDEFINESBYPROPERTIES('2SwCyXkkX5mOarRHKde73d',#4,$,$,(#8432)
+,#8443);
+#8449= IFCTEXTSTYLEFORDEFINEDFONT(#8450,$);
+#8450= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#8451= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#8452= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(350.));
+#8454= IFCTEXTSTYLE($,#8449,#8451,#8452);
+#8455= IFCTEXTLITERAL('d = 25cm',#8458,.LEFT.);
+#8456= IFCDIRECTION((0.7310552682428758,0.6823182503600038));
+#8458= IFCAXIS2PLACEMENT2D(#8459,#8456);
+#8459= IFCCARTESIANPOINT((87738.90713147861,22755.42414823773));
+#8461= IFCLOCALPLACEMENT($,#1);
+#8462= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#8455));
+#8464= IFCPRODUCTDEFINITIONSHAPE($,$,(#8462));
+#8467= IFCANNOTATION('2l6b1YboD5bBzbYlbdONQ_',#4,$,$,$,#8461,#8464);
+#8471= IFCPRESENTATIONSTYLEASSIGNMENT((#8454));
+#8473= IFCSTYLEDITEM(#8455,(#8471),$);
+#8477= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--8'),$);
+#8478= IFCPROPERTYSET('0HxM8FEOLDR8B$o5Sqg084',#4,'Allplan Attributes',$
+,(#8477));
+#8480= IFCRELDEFINESBYPROPERTIES('0Vrt6pRGf4tBM2pf8g$yFO',#4,$,$,(#8467)
+,#8478);
+#8484= IFCTEXTSTYLEFORDEFINEDFONT(#8485,$);
+#8485= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#8486= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#8487= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#8489= IFCTEXTSTYLE($,#8484,#8486,#8487);
+#8490= IFCTEXTLITERAL('Absatz OK Boden 7cm',#8493,.LEFT.);
+#8491= IFCDIRECTION((1.,0.));
+#8493= IFCAXIS2PLACEMENT2D(#8494,#8491);
+#8494= IFCCARTESIANPOINT((75981.541562714,23740.00483059611));
+#8496= IFCLOCALPLACEMENT($,#1);
+#8497= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#8490));
+#8499= IFCPRODUCTDEFINITIONSHAPE($,$,(#8497));
+#8502= IFCANNOTATION('05dZLqI1fCbwFNQyYGOqQj',#4,$,$,$,#8496,#8499);
+#8506= IFCPRESENTATIONSTYLEASSIGNMENT((#8489));
+#8508= IFCSTYLEDITEM(#8490,(#8506),$);
+#8512= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--9'),$);
+#8513= IFCPROPERTYSET('1qwNP$1GrCeAqzfDW1LJkU',#4,'Allplan Attributes',$
+,(#8512));
+#8515= IFCRELDEFINESBYPROPERTIES('06WNotdYf9auG7SrVR1Ocz',#4,$,$,(#8502)
+,#8513);
+#8519= IFCTEXTSTYLEFORDEFINEDFONT(#8520,$);
+#8520= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#8521= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#8522= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#8524= IFCTEXTSTYLE($,#8519,#8521,#8522);
+#8525= IFCTEXTLITERAL('Absatz UK Boden 7cm',#8528,.LEFT.);
+#8526= IFCDIRECTION((1.,0.));
+#8528= IFCAXIS2PLACEMENT2D(#8529,#8526);
+#8529= IFCCARTESIANPOINT((75977.80217074958,24656.67149726277));
+#8531= IFCLOCALPLACEMENT($,#1);
+#8532= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#8525));
+#8534= IFCPRODUCTDEFINITIONSHAPE($,$,(#8532));
+#8537= IFCANNOTATION('3I4HAmd9f7hOisZC7tlW_z',#4,$,$,$,#8531,#8534);
+#8541= IFCPRESENTATIONSTYLEASSIGNMENT((#8524));
+#8543= IFCSTYLEDITEM(#8525,(#8541),$);
+#8547= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--10'),$);
+#8548= IFCPROPERTYSET('0msI$3tmP099_J0ttE7HTl',#4,'Allplan Attributes',$
+,(#8547));
+#8550= IFCRELDEFINESBYPROPERTIES('2Yquuulff0892YoC8XBNDk',#4,$,$,(#8537)
+,#8548);
+#8554= IFCTEXTSTYLEFORDEFINEDFONT(#8555,$);
+#8555= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#8556= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#8557= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#8559= IFCTEXTSTYLE($,#8554,#8556,#8557);
+#8560= IFCTEXTLITERAL('Absatz OK Boden 7cm',#8563,.LEFT.);
+#8561= IFCDIRECTION((6.123233995736766E-17,1.));
+#8563= IFCAXIS2PLACEMENT2D(#8564,#8561);
+#8564= IFCCARTESIANPOINT((79188.33333333333,22338.59690241592));
+#8566= IFCLOCALPLACEMENT($,#1);
+#8567= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#8560));
+#8569= IFCPRODUCTDEFINITIONSHAPE($,$,(#8567));
+#8572= IFCANNOTATION('2u77BN1Bb7P8r1D4zeUtMZ',#4,$,$,$,#8566,#8569);
+#8576= IFCPRESENTATIONSTYLEASSIGNMENT((#8559));
+#8578= IFCSTYLEDITEM(#8560,(#8576),$);
+#8582= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--11'),$);
+#8583= IFCPROPERTYSET('3VQpO8ZEHDWgfziOWoxQmY',#4,'Allplan Attributes',$
+,(#8582));
+#8585= IFCRELDEFINESBYPROPERTIES('2ojLBJGaL6hAor6RKh7TkR',#4,$,$,(#8572)
+,#8583);
+#8589= IFCTEXTSTYLEFORDEFINEDFONT(#8590,$);
+#8590= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#8591= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#8592= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#8594= IFCTEXTSTYLE($,#8589,#8591,#8592);
+#8595= IFCTEXTLITERAL('Absatz OK Boden 7cm',#8598,.LEFT.);
+#8596= IFCDIRECTION((1.,0.));
+#8598= IFCAXIS2PLACEMENT2D(#8599,#8596);
+#8599= IFCCARTESIANPOINT((79777.02674372181,22095.0048305961));
+#8601= IFCLOCALPLACEMENT($,#1);
+#8602= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#8595));
+#8604= IFCPRODUCTDEFINITIONSHAPE($,$,(#8602));
+#8607= IFCANNOTATION('0q_bIRHMj0ZengHpfoakaG',#4,$,$,$,#8601,#8604);
+#8611= IFCPRESENTATIONSTYLEASSIGNMENT((#8594));
+#8613= IFCSTYLEDITEM(#8595,(#8611),$);
+#8617= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--12'),$);
+#8618= IFCPROPERTYSET('2pLH6nrnTAOfhjU6Ji_OhK',#4,'Allplan Attributes',$
+,(#8617));
+#8620= IFCRELDEFINESBYPROPERTIES('0Q$TZKAkf1Mhr6Kw$tszdo',#4,$,$,(#8607)
+,#8618);
+#8624= IFCTEXTSTYLEFORDEFINEDFONT(#8625,$);
+#8625= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#8626= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#8627= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#8629= IFCTEXTSTYLE($,#8624,#8626,#8627);
+#8630= IFCTEXTLITERAL('Absatz OK Boden 7cm',#8633,.LEFT.);
+#8631= IFCDIRECTION((6.123233995736766E-17,1.));
+#8633= IFCAXIS2PLACEMENT2D(#8634,#8631);
+#8634= IFCCARTESIANPOINT((82025.,22520.04762552151));
+#8636= IFCLOCALPLACEMENT($,#1);
+#8637= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#8630));
+#8639= IFCPRODUCTDEFINITIONSHAPE($,$,(#8637));
+#8642= IFCANNOTATION('14TXwUWAn3tuC7m3v3qUoO',#4,$,$,$,#8636,#8639);
+#8646= IFCPRESENTATIONSTYLEASSIGNMENT((#8629));
+#8648= IFCSTYLEDITEM(#8630,(#8646),$);
+#8652= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--13'),$);
+#8653= IFCPROPERTYSET('19cksLUdf79QFRT0Otsfoq',#4,'Allplan Attributes',$
+,(#8652));
+#8655= IFCRELDEFINESBYPROPERTIES('3Xdbs7eHjF7BEDFEFjOaxV',#4,$,$,(#8642)
+,#8653);
+#8659= IFCTEXTSTYLEFORDEFINEDFONT(#8660,$);
+#8660= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#8661= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#8662= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#8664= IFCTEXTSTYLE($,#8659,#8661,#8662);
+#8665= IFCTEXTLITERAL('Absatz OK Boden 7cm',#8668,.LEFT.);
+#8666= IFCDIRECTION((1.,0.));
+#8668= IFCAXIS2PLACEMENT2D(#8669,#8666);
+#8669= IFCCARTESIANPOINT((82528.94870789858,23990.0048305961));
+#8671= IFCLOCALPLACEMENT($,#1);
+#8672= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#8665));
+#8674= IFCPRODUCTDEFINITIONSHAPE($,$,(#8672));
+#8677= IFCANNOTATION('3slLrMjET1VPdzP1XDwc_w',#4,$,$,$,#8671,#8674);
+#8681= IFCPRESENTATIONSTYLEASSIGNMENT((#8664));
+#8683= IFCSTYLEDITEM(#8665,(#8681),$);
+#8687= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--14'),$);
+#8688= IFCPROPERTYSET('2gNDOOm5nFu8WlwVLmNtNP',#4,'Allplan Attributes',$
+,(#8687));
+#8690= IFCRELDEFINESBYPROPERTIES('3q_yzSmcb7_QF2Lb6L2lHA',#4,$,$,(#8677)
+,#8688);
+#8694= IFCTEXTSTYLEFORDEFINEDFONT(#8695,$);
+#8695= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#8696= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#8697= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#8699= IFCTEXTSTYLE($,#8694,#8696,#8697);
+#8700= IFCTEXTLITERAL('Absatz OK Boden 7cm',#8703,.LEFT.);
+#8701= IFCDIRECTION((1.,0.));
+#8703= IFCAXIS2PLACEMENT2D(#8704,#8701);
+#8704= IFCCARTESIANPOINT((85062.27633487518,23740.0048305961));
+#8706= IFCLOCALPLACEMENT($,#1);
+#8707= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#8700));
+#8709= IFCPRODUCTDEFINITIONSHAPE($,$,(#8707));
+#8712= IFCANNOTATION('2ACoM34493Y9OR_KpZUZ7u',#4,$,$,$,#8706,#8709);
+#8716= IFCPRESENTATIONSTYLEASSIGNMENT((#8699));
+#8718= IFCSTYLEDITEM(#8700,(#8716),$);
+#8722= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--15'),$);
+#8723= IFCPROPERTYSET('3WqzR5saDA_wURaDu3MElu',#4,'Allplan Attributes',$
+,(#8722));
+#8725= IFCRELDEFINESBYPROPERTIES('3Gb3qGj8XCdPExWXj47zti',#4,$,$,(#8712)
+,#8723);
+#8729= IFCTEXTSTYLEFORDEFINEDFONT(#8730,$);
+#8730= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#8731= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#8732= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#8734= IFCTEXTSTYLE($,#8729,#8731,#8732);
+#8735= IFCTEXTLITERAL('Absatz UK Boden 7cm',#8738,.LEFT.);
+#8736= IFCDIRECTION((1.,0.));
+#8738= IFCAXIS2PLACEMENT2D(#8739,#8736);
+#8739= IFCCARTESIANPOINT((87412.56598371331,24656.67149726277));
+#8741= IFCLOCALPLACEMENT($,#1);
+#8742= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#8735));
+#8744= IFCPRODUCTDEFINITIONSHAPE($,$,(#8742));
+#8747= IFCANNOTATION('3AsYyno8nCwg4wxt0F0r6V',#4,$,$,$,#8741,#8744);
+#8751= IFCPRESENTATIONSTYLEASSIGNMENT((#8734));
+#8753= IFCSTYLEDITEM(#8735,(#8751),$);
+#8757= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--16'),$);
+#8758= IFCPROPERTYSET('3ueZmEurz3XPuPInFKfGwN',#4,'Allplan Attributes',$
+,(#8757));
+#8760= IFCRELDEFINESBYPROPERTIES('05T7GYNM97xvBEK6DNeZcM',#4,$,$,(#8747)
+,#8758);
+#8764= IFCTEXTSTYLEFORDEFINEDFONT(#8765,$);
+#8765= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#8766= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#8767= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#8769= IFCTEXTSTYLE($,#8764,#8766,#8767);
+#8770= IFCTEXTLITERAL('Absatz OK Boden 7cm',#8773,.LEFT.);
+#8771= IFCDIRECTION((1.,0.));
+#8773= IFCAXIS2PLACEMENT2D(#8774,#8771);
+#8774= IFCCARTESIANPOINT((90006.89477922957,23740.0048305961));
+#8776= IFCLOCALPLACEMENT($,#1);
+#8777= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#8770));
+#8779= IFCPRODUCTDEFINITIONSHAPE($,$,(#8777));
+#8782= IFCANNOTATION('3nT$fQw$f9Ffg$iX$Gt1op',#4,$,$,$,#8776,#8779);
+#8786= IFCPRESENTATIONSTYLEASSIGNMENT((#8769));
+#8788= IFCSTYLEDITEM(#8770,(#8786),$);
+#8792= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--17'),$);
+#8793= IFCPROPERTYSET('1ZYYBFgC1Eaep3smipKpY2',#4,'Allplan Attributes',$
+,(#8792));
+#8795= IFCRELDEFINESBYPROPERTIES('3o9Xa2yQjD9hbyGzAugQQ5',#4,$,$,(#8782)
+,#8793);
+#8799= IFCTEXTSTYLEFORDEFINEDFONT(#8800,$);
+#8800= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#8801= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.4));
+#8802= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#8804= IFCTEXTSTYLE($,#8799,#8801,#8802);
+#8805= IFCPLANAREXTENT(1940.,240.);
+#8806= IFCTEXTLITERALWITHEXTENT(
+'Fund. d=30cm, UK= -0.90\X\0A+ 5cm Magerbeton (UK= -0.95)',#8809,.LEFT.,
+#8805,'top-left');
+#8807= IFCDIRECTION((1.,0.));
+#8809= IFCAXIS2PLACEMENT2D(#8810,#8807);
+#8810= IFCCARTESIANPOINT((69475.,8050.004830596101));
+#8812= IFCLOCALPLACEMENT($,#1);
+#8813= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#8806));
+#8815= IFCPRODUCTDEFINITIONSHAPE($,$,(#8813));
+#8818= IFCANNOTATION('0WATZ__Q98cu8kGjwVVeZ_',#4,$,$,$,#8812,#8815);
+#8822= IFCPRESENTATIONSTYLEASSIGNMENT((#8804));
+#8824= IFCSTYLEDITEM(#8806,(#8822),$);
+#8828= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--18'),$);
+#8829= IFCPROPERTYSET('1mbXOQqZL7G91VWzbVqx2B',#4,'Allplan Attributes',$
+,(#8828));
+#8831= IFCRELDEFINESBYPROPERTIES('0i44ESODPDq8aIW3vfVmjZ',#4,$,$,(#8818)
+,#8829);
+#8835= IFCTEXTSTYLEFORDEFINEDFONT(#8836,$);
+#8836= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#8837= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.4));
+#8838= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#8840= IFCTEXTSTYLE($,#8835,#8837,#8838);
+#8841= IFCPLANAREXTENT(1940.,240.);
+#8842= IFCTEXTLITERALWITHEXTENT(
+'Fund. d=30cm, UK= -0.90\X\0A+ 5cm Magerbeton (UK= -0.95)',#8845,.LEFT.,
+#8841,'top-left');
+#8843= IFCDIRECTION((1.,0.));
+#8845= IFCAXIS2PLACEMENT2D(#8846,#8843);
+#8846= IFCCARTESIANPOINT((95155.00000000002,8050.004830596099));
+#8848= IFCLOCALPLACEMENT($,#1);
+#8849= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#8842));
+#8851= IFCPRODUCTDEFINITIONSHAPE($,$,(#8849));
+#8854= IFCANNOTATION('1G07KtLPf3G8Cm5AbbP4UW',#4,$,$,$,#8848,#8851);
+#8858= IFCPRESENTATIONSTYLEASSIGNMENT((#8840));
+#8860= IFCSTYLEDITEM(#8842,(#8858),$);
+#8864= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--19'),$);
+#8865= IFCPROPERTYSET('01ddJC3R15lhOOPO2P2CMS',#4,'Allplan Attributes',$
+,(#8864));
+#8867= IFCRELDEFINESBYPROPERTIES('1OYLs7OG96pOJUk15GZKNX',#4,$,$,(#8854)
+,#8865);
+#8871= IFCTEXTSTYLEFORDEFINEDFONT(#8872,$);
+#8872= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#8873= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.4));
+#8874= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#8876= IFCTEXTSTYLE($,#8871,#8873,#8874);
+#8877= IFCPLANAREXTENT(1940.,240.);
+#8878= IFCTEXTLITERALWITHEXTENT(
+'Fund. d=30cm, UK= -0.90\X\0A+ 5cm Magerbeton (UK= -0.95)',#8881,.LEFT.,
+#8877,'top-left');
+#8879= IFCDIRECTION((6.123233995736766E-17,1.));
+#8881= IFCAXIS2PLACEMENT2D(#8882,#8879);
+#8882= IFCCARTESIANPOINT((102125.,10580.0048305961));
+#8884= IFCLOCALPLACEMENT($,#1);
+#8885= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#8878));
+#8887= IFCPRODUCTDEFINITIONSHAPE($,$,(#8885));
+#8890= IFCANNOTATION('0iiTtqxL1FgQ8p1_aGhm$s',#4,$,$,$,#8884,#8887);
+#8894= IFCPRESENTATIONSTYLEASSIGNMENT((#8876));
+#8896= IFCSTYLEDITEM(#8878,(#8894),$);
+#8900= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--20'),$);
+#8901= IFCPROPERTYSET('341VpVP_LF78WTY$MxHQQ7',#4,'Allplan Attributes',$
+,(#8900));
+#8903= IFCRELDEFINESBYPROPERTIES('1Rf_MVqQrF4gfWlfR17aTY',#4,$,$,(#8890)
+,#8901);
+#8907= IFCTEXTSTYLEFORDEFINEDFONT(#8908,$);
+#8908= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#8909= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.4));
+#8910= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#8912= IFCTEXTSTYLE($,#8907,#8909,#8910);
+#8913= IFCPLANAREXTENT(1940.,240.);
+#8914= IFCTEXTLITERALWITHEXTENT(
+'Fund. d=30cm, UK= -0.90\X\0A+ 5cm Magerbeton (UK= -0.95)',#8917,.LEFT.,
+#8913,'top-left');
+#8915= IFCDIRECTION((6.123233995736766E-17,1.));
+#8917= IFCAXIS2PLACEMENT2D(#8918,#8915);
+#8918= IFCCARTESIANPOINT((64198.33333333334,21420.0048305961));
+#8920= IFCLOCALPLACEMENT($,#1);
+#8921= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#8914));
+#8923= IFCPRODUCTDEFINITIONSHAPE($,$,(#8921));
+#8926= IFCANNOTATION('0RapG$jCfDrfo863oceK8S',#4,$,$,$,#8920,#8923);
+#8930= IFCPRESENTATIONSTYLEASSIGNMENT((#8912));
+#8932= IFCSTYLEDITEM(#8914,(#8930),$);
+#8936= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--21'),$);
+#8937= IFCPROPERTYSET('3u2FAPlPL9Zu7BF12ehnxV',#4,'Allplan Attributes',$
+,(#8936));
+#8939= IFCRELDEFINESBYPROPERTIES('21xbO37Bv12hW2X98_gWzJ',#4,$,$,(#8926)
+,#8937);
+#8943= IFCTEXTSTYLEFORDEFINEDFONT(#8944,$);
+#8944= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#8945= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.4));
+#8946= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#8948= IFCTEXTSTYLE($,#8943,#8945,#8946);
+#8949= IFCPLANAREXTENT(1940.,240.);
+#8950= IFCTEXTLITERALWITHEXTENT(
+'Fund. d=30cm, UK= -0.90\X\0A+ 5cm Magerbeton (UK= -0.95)',#8953,.LEFT.,
+#8949,'top-left');
+#8951= IFCDIRECTION((6.123233995736766E-17,1.));
+#8953= IFCAXIS2PLACEMENT2D(#8954,#8951);
+#8954= IFCCARTESIANPOINT((64198.33333333333,10580.0048305961));
+#8956= IFCLOCALPLACEMENT($,#1);
+#8957= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#8950));
+#8959= IFCPRODUCTDEFINITIONSHAPE($,$,(#8957));
+#8962= IFCANNOTATION('0zdqYDERn6BB1$WleOWZ16',#4,$,$,$,#8956,#8959);
+#8966= IFCPRESENTATIONSTYLEASSIGNMENT((#8948));
+#8968= IFCSTYLEDITEM(#8950,(#8966),$);
+#8972= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--22'),$);
+#8973= IFCPROPERTYSET('0dWFI$a$HBux_FiCgLi9Cl',#4,'Allplan Attributes',$
+,(#8972));
+#8975= IFCRELDEFINESBYPROPERTIES('15q$OvqOr5rhc8g3cKOX0n',#4,$,$,(#8962)
+,#8973);
+#8979= IFCTEXTSTYLEFORDEFINEDFONT(#8980,$);
+#8980= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#8981= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.4));
+#8982= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#8984= IFCTEXTSTYLE($,#8979,#8981,#8982);
+#8985= IFCPLANAREXTENT(1940.,240.);
+#8986= IFCTEXTLITERALWITHEXTENT(
+'Fund. d=30cm, UK= -0.90\X\0A+ 5cm Magerbeton (UK= -0.95)',#8989,.LEFT.,
+#8985,'top-left');
+#8987= IFCDIRECTION((6.123233995736766E-17,1.));
+#8989= IFCAXIS2PLACEMENT2D(#8990,#8987);
+#8990= IFCCARTESIANPOINT((102125.,20920.0048305961));
+#8992= IFCLOCALPLACEMENT($,#1);
+#8993= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#8986));
+#8995= IFCPRODUCTDEFINITIONSHAPE($,$,(#8993));
+#8998= IFCANNOTATION('3Pf0H71XPCbunfF9vAwuml',#4,$,$,$,#8992,#8995);
+#9002= IFCPRESENTATIONSTYLEASSIGNMENT((#8984));
+#9004= IFCSTYLEDITEM(#8986,(#9002),$);
+#9008= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--91'),$);
+#9009= IFCPROPERTYSET('2ky2g7WH15dApBcfemqSzm',#4,'Allplan Attributes',$
+,(#9008));
+#9011= IFCRELDEFINESBYPROPERTIES('3gR08r7Rr0luxKOb48Exyr',#4,$,$,(#8998)
+,#9009);
+#9015= IFCTEXTSTYLEFORDEFINEDFONT(#9016,$);
+#9016= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#9017= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#9018= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#9020= IFCTEXTSTYLE($,#9015,#9017,#9018);
+#9021= IFCTEXTLITERAL('A',#9024,.LEFT.);
+#9022= IFCDIRECTION((1.,0.));
+#9024= IFCAXIS2PLACEMENT2D(#9025,#9022);
+#9025= IFCCARTESIANPOINT((85952.9040210247,23151.85649857375));
+#9027= IFCLOCALPLACEMENT($,#1);
+#9028= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#9021));
+#9030= IFCPRODUCTDEFINITIONSHAPE($,$,(#9028));
+#9033= IFCANNOTATION('3MfEmDuLXCVgbBRvIY_TnP',#4,$,$,$,#9027,#9030);
+#9037= IFCPRESENTATIONSTYLEASSIGNMENT((#9020));
+#9039= IFCSTYLEDITEM(#9021,(#9037),$);
+#9043= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--309'),$);
+#9044= IFCPROPERTYSET('0F5fZpbBTB9uDSHYSIt0TE',#4,'Allplan Attributes',$
+,(#9043));
+#9046= IFCRELDEFINESBYPROPERTIES('0l1JxNtND7xeoLgn3St9uK',#4,$,$,(#9033)
+,#9044);
+#9050= IFCTEXTSTYLEFORDEFINEDFONT(#9051,$);
+#9051= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#9052= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#9053= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#9055= IFCTEXTSTYLE($,#9050,#9052,#9053);
+#9056= IFCTEXTLITERAL('A',#9059,.LEFT.);
+#9057= IFCDIRECTION((1.,0.));
+#9059= IFCAXIS2PLACEMENT2D(#9060,#9057);
+#9060= IFCCARTESIANPOINT((90153.76264563203,23151.85649857376));
+#9062= IFCLOCALPLACEMENT($,#1);
+#9063= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#9056));
+#9065= IFCPRODUCTDEFINITIONSHAPE($,$,(#9063));
+#9068= IFCANNOTATION('2GaKBzFRL7VfhMtwDldgkp',#4,$,$,$,#9062,#9065);
+#9072= IFCPRESENTATIONSTYLEASSIGNMENT((#9055));
+#9074= IFCSTYLEDITEM(#9056,(#9072),$);
+#9078= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--321'),$);
+#9079= IFCPROPERTYSET('3dJWl0vafDXPj_MzNdX5sw',#4,'Allplan Attributes',$
+,(#9078));
+#9081= IFCRELDEFINESBYPROPERTIES('3$x5I37Gz7P87UbOf5mwrW',#4,$,$,(#9068)
+,#9079);
+#9085= IFCTEXTSTYLEFORDEFINEDFONT(#9086,$);
+#9086= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#9087= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#9088= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(350.));
+#9090= IFCTEXTSTYLE($,#9085,#9087,#9088);
+#9091= IFCTEXTLITERAL('d = 25cm',#9094,.LEFT.);
+#9092= IFCDIRECTION((0.9808262151348187,0.1948844162684801));
+#9094= IFCAXIS2PLACEMENT2D(#9095,#9092);
+#9095= IFCCARTESIANPOINT((83632.23966450329,25811.54350744394));
+#9097= IFCLOCALPLACEMENT($,#1);
+#9098= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#9091));
+#9100= IFCPRODUCTDEFINITIONSHAPE($,$,(#9098));
+#9103= IFCANNOTATION('1PoLNv5azCFfFsrPK$Eknb',#4,$,$,$,#9097,#9100);
+#9107= IFCPRESENTATIONSTYLEASSIGNMENT((#9090));
+#9109= IFCSTYLEDITEM(#9091,(#9107),$);
+#9113= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--346'),$);
+#9114= IFCPROPERTYSET('1nPgAYNHT9jezbz3Yb3Em6',#4,'Allplan Attributes',$
+,(#9113));
+#9116= IFCRELDEFINESBYPROPERTIES('3UJJ4IagP6RwfrU6vdj9Ig',#4,$,$,(#9103)
+,#9114);
+#9120= IFCTEXTSTYLEFORDEFINEDFONT(#9121,$);
+#9121= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#9122= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#9123= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#9125= IFCTEXTSTYLE($,#9120,#9122,#9123);
+#9126= IFCTEXTLITERAL('f1',#9129,.LEFT.);
+#9127= IFCDIRECTION((1.,0.));
+#9129= IFCAXIS2PLACEMENT2D(#9130,#9127);
+#9130= IFCCARTESIANPOINT((63944.51335346072,16091.04263252323));
+#9132= IFCLOCALPLACEMENT($,#1);
+#9133= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#9126));
+#9135= IFCPRODUCTDEFINITIONSHAPE($,$,(#9133));
+#9138= IFCANNOTATION('2y42QMbzTD_OEJno2bm8jo',#4,$,$,$,#9132,#9135);
+#9142= IFCPRESENTATIONSTYLEASSIGNMENT((#9125));
+#9144= IFCSTYLEDITEM(#9126,(#9142),$);
+#9148= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--400'),$);
+#9149= IFCPROPERTYSET('1wuN$V$mT5BgSmomKBQJER',#4,'Allplan Attributes',$
+,(#9148));
+#9151= IFCRELDEFINESBYPROPERTIES('07V2C4AubE_9DQ9iI9GZ2f',#4,$,$,(#9138)
+,#9149);
+#9155= IFCTEXTSTYLEFORDEFINEDFONT(#9156,$);
+#9156= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#9157= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#9158= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#9160= IFCTEXTSTYLE($,#9155,#9157,#9158);
+#9161= IFCTEXTLITERAL('f1',#9164,.LEFT.);
+#9162= IFCDIRECTION((1.,0.));
+#9164= IFCAXIS2PLACEMENT2D(#9165,#9162);
+#9165= IFCCARTESIANPOINT((102367.5048670323,23148.54263252323));
+#9167= IFCLOCALPLACEMENT($,#1);
+#9168= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#9161));
+#9170= IFCPRODUCTDEFINITIONSHAPE($,$,(#9168));
+#9173= IFCANNOTATION('3I5dkm69H92gJDY0592brx',#4,$,$,$,#9167,#9170);
+#9177= IFCPRESENTATIONSTYLEASSIGNMENT((#9160));
+#9179= IFCSTYLEDITEM(#9161,(#9177),$);
+#9183= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--401'),$);
+#9184= IFCPROPERTYSET('2umN499gf8bO$Y_U6o$tpv',#4,'Allplan Attributes',$
+,(#9183));
+#9186= IFCRELDEFINESBYPROPERTIES('1AlKD6OZfCUxh1pp1nKcPG',#4,$,$,(#9173)
+,#9184);
+#9190= IFCTEXTSTYLEFORDEFINEDFONT(#9191,$);
+#9191= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#9192= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#9193= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#9195= IFCTEXTSTYLE($,#9190,#9192,#9193);
+#9196= IFCTEXTLITERAL('F1',#9199,.LEFT.);
+#9197= IFCDIRECTION((1.,0.));
+#9199= IFCAXIS2PLACEMENT2D(#9200,#9197);
+#9200= IFCCARTESIANPOINT((96418.85940563989,17938.30953539124));
+#9202= IFCLOCALPLACEMENT($,#1);
+#9203= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#9196));
+#9205= IFCPRODUCTDEFINITIONSHAPE($,$,(#9203));
+#9208= IFCANNOTATION('2MbSKjCLj7mw10V8g_dQlt',#4,$,$,$,#9202,#9205);
+#9212= IFCPRESENTATIONSTYLEASSIGNMENT((#9195));
+#9214= IFCSTYLEDITEM(#9196,(#9212),$);
+#9218= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--402'),$);
+#9219= IFCPROPERTYSET('2kncbF3TDE6udK41CI$TqM',#4,'Allplan Attributes',$
+,(#9218));
+#9221= IFCRELDEFINESBYPROPERTIES('18wen1szjFTfOOtCK_ga3t',#4,$,$,(#9208)
+,#9219);
+#9225= IFCTEXTSTYLEFORDEFINEDFONT(#9226,$);
+#9226= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#9227= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#9228= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#9230= IFCTEXTSTYLE($,#9225,#9227,#9228);
+#9231= IFCTEXTLITERAL('f2',#9234,.LEFT.);
+#9232= IFCDIRECTION((1.,0.));
+#9234= IFCAXIS2PLACEMENT2D(#9235,#9232);
+#9235= IFCCARTESIANPOINT((78350.00486703226,7551.042632523229));
+#9237= IFCLOCALPLACEMENT($,#1);
+#9238= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#9231));
+#9240= IFCPRODUCTDEFINITIONSHAPE($,$,(#9238));
+#9243= IFCANNOTATION('1Aeog46m9DWfxwpZ7FAXEW',#4,$,$,$,#9237,#9240);
+#9247= IFCPRESENTATIONSTYLEASSIGNMENT((#9230));
+#9249= IFCSTYLEDITEM(#9231,(#9247),$);
+#9253= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--487'),$);
+#9254= IFCPROPERTYSET('1xAjPJ8kb7TAU4F309R94W',#4,'Allplan Attributes',$
+,(#9253));
+#9256= IFCRELDEFINESBYPROPERTIES('1QZJq2LIfBPwwNXAnHJ3rH',#4,$,$,(#9243)
+,#9254);
+#9260= IFCTEXTSTYLEFORDEFINEDFONT(#9261,$);
+#9261= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#9262= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#9263= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#9265= IFCTEXTSTYLE($,#9260,#9262,#9263);
+#9266= IFCTEXTLITERAL('f3',#9269,.LEFT.);
+#9267= IFCDIRECTION((1.,0.));
+#9269= IFCAXIS2PLACEMENT2D(#9270,#9267);
+#9270= IFCCARTESIANPOINT((93993.5098230476,7551.042632523229));
+#9272= IFCLOCALPLACEMENT($,#1);
+#9273= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#9266));
+#9275= IFCPRODUCTDEFINITIONSHAPE($,$,(#9273));
+#9278= IFCANNOTATION('0YZw2JJQXBzervvC6mg4KD',#4,$,$,$,#9272,#9275);
+#9282= IFCPRESENTATIONSTYLEASSIGNMENT((#9265));
+#9284= IFCSTYLEDITEM(#9266,(#9282),$);
+#9288= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--488'),$);
+#9289= IFCPROPERTYSET('3HQVXfUAr9gOuvy_lfOsDG',#4,'Allplan Attributes',$
+,(#9288));
+#9291= IFCRELDEFINESBYPROPERTIES('1N92k$wDz53QkVaMzJryMJ',#4,$,$,(#9278)
+,#9289);
+#9295= IFCTEXTSTYLEFORDEFINEDFONT(#9296,$);
+#9296= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#9297= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#9298= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#9300= IFCTEXTSTYLE($,#9295,#9297,#9298);
+#9301= IFCTEXTLITERAL('f4',#9304,.LEFT.);
+#9302= IFCDIRECTION((1.,0.));
+#9304= IFCAXIS2PLACEMENT2D(#9305,#9302);
+#9305= IFCCARTESIANPOINT((98812.22799894086,7551.042632523229));
+#9307= IFCLOCALPLACEMENT($,#1);
+#9308= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#9301));
+#9310= IFCPRODUCTDEFINITIONSHAPE($,$,(#9308));
+#9313= IFCANNOTATION('1aHAsJwND1ie1vWcWq7tZR',#4,$,$,$,#9307,#9310);
+#9317= IFCPRESENTATIONSTYLEASSIGNMENT((#9300));
+#9319= IFCSTYLEDITEM(#9301,(#9317),$);
+#9323= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--489'),$);
+#9324= IFCPROPERTYSET('2Q9C4SEgX7yhNnB$1qfIry',#4,'Allplan Attributes',$
+,(#9323));
+#9326= IFCRELDEFINESBYPROPERTIES('3_ZoCOaujAneneU653M3OD',#4,$,$,(#9313)
+,#9324);
+#9330= IFCTEXTSTYLEFORDEFINEDFONT(#9331,$);
+#9331= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#9332= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#9333= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#9335= IFCTEXTSTYLE($,#9330,#9332,#9333);
+#9336= IFCTEXTLITERAL('f5',#9339,.LEFT.);
+#9337= IFCDIRECTION((1.,0.));
+#9339= IFCAXIS2PLACEMENT2D(#9340,#9337);
+#9340= IFCCARTESIANPOINT((102364.5133534607,15128.54263252323));
+#9342= IFCLOCALPLACEMENT($,#1);
+#9343= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#9336));
+#9345= IFCPRODUCTDEFINITIONSHAPE($,$,(#9343));
+#9348= IFCANNOTATION('0xP8PCxw18OOoRyHdIe_Ic',#4,$,$,$,#9342,#9345);
+#9352= IFCPRESENTATIONSTYLEASSIGNMENT((#9335));
+#9354= IFCSTYLEDITEM(#9336,(#9352),$);
+#9358= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--490'),$);
+#9359= IFCPROPERTYSET('2Ow$0rGk1FgxFABKJhtGGZ',#4,'Allplan Attributes',$
+,(#9358));
+#9361= IFCRELDEFINESBYPROPERTIES('3yPAL2Ujf84O9fYLiUzNL3',#4,$,$,(#9348)
+,#9359);
+#9365= IFCTEXTSTYLEFORDEFINEDFONT(#9366,$);
+#9366= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#9367= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#9368= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#9370= IFCTEXTSTYLE($,#9365,#9367,#9368);
+#9371= IFCTEXTLITERAL('f6',#9374,.LEFT.);
+#9372= IFCDIRECTION((1.,0.));
+#9374= IFCAXIS2PLACEMENT2D(#9375,#9372);
+#9375= IFCCARTESIANPOINT((79088.46093109454,15126.04263252324));
+#9377= IFCLOCALPLACEMENT($,#1);
+#9378= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#9371));
+#9380= IFCPRODUCTDEFINITIONSHAPE($,$,(#9378));
+#9383= IFCANNOTATION('2mVlErPaf5ERilBKhijSFI',#4,$,$,$,#9377,#9380);
+#9387= IFCPRESENTATIONSTYLEASSIGNMENT((#9370));
+#9389= IFCSTYLEDITEM(#9371,(#9387),$);
+#9393= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--491'),$);
+#9394= IFCPROPERTYSET('1a0W096KPA1PnxLrSbohE$',#4,'Allplan Attributes',$
+,(#9393));
+#9396= IFCRELDEFINESBYPROPERTIES('3YCt$6LHb09xQBtdfrtg1T',#4,$,$,(#9383)
+,#9394);
+#9400= IFCTEXTSTYLEFORDEFINEDFONT(#9401,$);
+#9401= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#9402= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#9403= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#9405= IFCTEXTSTYLE($,#9400,#9402,#9403);
+#9406= IFCTEXTLITERAL('f7',#9409,.LEFT.);
+#9407= IFCDIRECTION((1.,0.));
+#9409= IFCAXIS2PLACEMENT2D(#9410,#9407);
+#9410= IFCCARTESIANPOINT((90227.54729917461,12438.54263252323));
+#9412= IFCLOCALPLACEMENT($,#1);
+#9413= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#9406));
+#9415= IFCPRODUCTDEFINITIONSHAPE($,$,(#9413));
+#9418= IFCANNOTATION('16lR3hFGf9WeJXwSjaL0W1',#4,$,$,$,#9412,#9415);
+#9422= IFCPRESENTATIONSTYLEASSIGNMENT((#9405));
+#9424= IFCSTYLEDITEM(#9406,(#9422),$);
+#9428= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--492'),$);
+#9429= IFCPROPERTYSET('2raxuIIBzAlAoVlpwQaJmb',#4,'Allplan Attributes',$
+,(#9428));
+#9431= IFCRELDEFINESBYPROPERTIES('33CtwSt892Zg23FQZJ$UKY',#4,$,$,(#9418)
+,#9429);
+#9435= IFCTEXTSTYLEFORDEFINEDFONT(#9436,$);
+#9436= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#9437= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#9438= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#9440= IFCTEXTSTYLE($,#9435,#9437,#9438);
+#9441= IFCTEXTLITERAL('f8',#9444,.LEFT.);
+#9442= IFCDIRECTION((1.,0.));
+#9444= IFCAXIS2PLACEMENT2D(#9445,#9442);
+#9445= IFCCARTESIANPOINT((96930.44389119459,12513.54263252323));
+#9447= IFCLOCALPLACEMENT($,#1);
+#9448= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#9441));
+#9450= IFCPRODUCTDEFINITIONSHAPE($,$,(#9448));
+#9453= IFCANNOTATION('1YtAj5twv7$R9rGgg2mWwq',#4,$,$,$,#9447,#9450);
+#9457= IFCPRESENTATIONSTYLEASSIGNMENT((#9440));
+#9459= IFCSTYLEDITEM(#9441,(#9457),$);
+#9463= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--493'),$);
+#9464= IFCPROPERTYSET('37SpvHqmTF6R3a7zjMczfx',#4,'Allplan Attributes',$
+,(#9463));
+#9466= IFCRELDEFINESBYPROPERTIES('3qgWPtiCf7oO9VlonFds7T',#4,$,$,(#9453)
+,#9464);
+#9470= IFCTEXTSTYLEFORDEFINEDFONT(#9471,$);
+#9471= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#9472= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#9473= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#9475= IFCTEXTSTYLE($,#9470,#9472,#9473);
+#9476= IFCTEXTLITERAL('f9',#9479,.LEFT.);
+#9477= IFCDIRECTION((1.,0.));
+#9479= IFCAXIS2PLACEMENT2D(#9480,#9477);
+#9480= IFCCARTESIANPOINT((96915.96093109452,21621.04263252323));
+#9482= IFCLOCALPLACEMENT($,#1);
+#9483= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#9476));
+#9485= IFCPRODUCTDEFINITIONSHAPE($,$,(#9483));
+#9488= IFCANNOTATION('0onx0rdNDFGByQiJPGY8QB',#4,$,$,$,#9482,#9485);
+#9492= IFCPRESENTATIONSTYLEASSIGNMENT((#9475));
+#9494= IFCSTYLEDITEM(#9476,(#9492),$);
+#9498= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--494'),$);
+#9499= IFCPROPERTYSET('18SP9iWw12nQQuBCSlCfwM',#4,'Allplan Attributes',$
+,(#9498));
+#9501= IFCRELDEFINESBYPROPERTIES('05t4B$YjL1wwseZDdB4MZH',#4,$,$,(#9488)
+,#9499);
+#9505= IFCTEXTSTYLEFORDEFINEDFONT(#9506,$);
+#9506= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#9507= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#9508= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#9510= IFCTEXTSTYLE($,#9505,#9507,#9508);
+#9511= IFCTEXTLITERAL('B',#9514,.LEFT.);
+#9512= IFCDIRECTION((6.123233995736766E-17,1.));
+#9514= IFCAXIS2PLACEMENT2D(#9515,#9512);
+#9515= IFCCARTESIANPOINT((88169.24186625176,20927.9088516208));
+#9517= IFCLOCALPLACEMENT($,#1);
+#9518= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#9511));
+#9520= IFCPRODUCTDEFINITIONSHAPE($,$,(#9518));
+#9523= IFCANNOTATION('1rm7SM4W93jggUdvRdD3r2',#4,$,$,$,#9517,#9520);
+#9527= IFCPRESENTATIONSTYLEASSIGNMENT((#9510));
+#9529= IFCSTYLEDITEM(#9511,(#9527),$);
+#9533= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--518'),$);
+#9534= IFCPROPERTYSET('05PZ1$zgj36RU3h9sVu38q',#4,'Allplan Attributes',$
+,(#9533));
+#9536= IFCRELDEFINESBYPROPERTIES('1JljSDVGbDmgoB287FdujQ',#4,$,$,(#9523)
+,#9534);
+#9540= IFCTEXTSTYLEFORDEFINEDFONT(#9541,$);
+#9541= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#9542= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#9543= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#9545= IFCTEXTSTYLE($,#9540,#9542,#9543);
+#9546= IFCTEXTLITERAL('B',#9549,.LEFT.);
+#9547= IFCDIRECTION((6.123233995736766E-17,1.));
+#9549= IFCAXIS2PLACEMENT2D(#9550,#9547);
+#9550= IFCCARTESIANPOINT((88169.24186625176,25478.76747622812));
+#9552= IFCLOCALPLACEMENT($,#1);
+#9553= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#9546));
+#9555= IFCPRODUCTDEFINITIONSHAPE($,$,(#9553));
+#9558= IFCANNOTATION('1dxl0pHUX77ObPJXR9StKr',#4,$,$,$,#9552,#9555);
+#9562= IFCPRESENTATIONSTYLEASSIGNMENT((#9545));
+#9564= IFCSTYLEDITEM(#9546,(#9562),$);
+#9568= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--519'),$);
+#9569= IFCPROPERTYSET('1sdp52TWn4YhRli4$lQt3L',#4,'Allplan Attributes',$
+,(#9568));
+#9571= IFCRELDEFINESBYPROPERTIES('2ALZ3_oxvDcuuAKCM0L5u4',#4,$,$,(#9558)
+,#9569);
+#9575= IFCTEXTSTYLEFORDEFINEDFONT(#9576,$);
+#9576= IFCCOLOURRGB($,0.4392156862745098,0.4392156862745098,1.);
+#9577= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.5));
+#9578= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(250.));
+#9580= IFCTEXTSTYLE($,#9575,#9577,#9578);
+#9581= IFCPLANAREXTENT(4979.166666666672,312.5);
+#9582= IFCTEXTLITERALWITHEXTENT(
+'unter Fundamente mit Sickerbeton 32/45mm CEM 200 kg/m\X2\00B3\X0\\X\0Aoder Magerbeton CEM 200 kg/m\X2\00B3\X0\ bis auf Kiesschicht fundieren !'
+,#9585,.LEFT.,#9581,'top-left');
+#9583= IFCDIRECTION((1.,0.));
+#9585= IFCAXIS2PLACEMENT2D(#9586,#9583);
+#9586= IFCCARTESIANPOINT((79040.90503321811,12115.36635853764));
+#9588= IFCLOCALPLACEMENT($,#1);
+#9589= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#9582));
+#9591= IFCPRODUCTDEFINITIONSHAPE($,$,(#9589));
+#9594= IFCANNOTATION('36o10uKZL1SRqUZ1_TBGGZ',#4,$,$,$,#9588,#9591);
+#9598= IFCPRESENTATIONSTYLEASSIGNMENT((#9580));
+#9600= IFCSTYLEDITEM(#9582,(#9598),$);
+#9604= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--530'),$);
+#9605= IFCPROPERTYSET('3cIMVW9_bFrekbhz3EbQmZ',#4,'Allplan Attributes',$
+,(#9604));
+#9607= IFCRELDEFINESBYPROPERTIES('031EuHX5j89udSAmOQpiyf',#4,$,$,(#9594)
+,#9605);
+#9611= IFCTEXTSTYLEFORDEFINEDFONT(#9612,$);
+#9612= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#9613= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#9614= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#9616= IFCTEXTSTYLE($,#9611,#9613,#9614);
+#9617= IFCTEXTLITERAL('Einlage 15x25cm',#9620,.LEFT.);
+#9618= IFCDIRECTION((1.,0.));
+#9620= IFCAXIS2PLACEMENT2D(#9621,#9618);
+#9621= IFCCARTESIANPOINT((94135.,8666.671497262763));
+#9623= IFCLOCALPLACEMENT($,#1);
+#9624= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#9617));
+#9626= IFCPRODUCTDEFINITIONSHAPE($,$,(#9624));
+#9629= IFCANNOTATION('0Gxu$fcOL4UuZ9Hxw9IS_g',#4,$,$,$,#9623,#9626);
+#9633= IFCPRESENTATIONSTYLEASSIGNMENT((#9616));
+#9635= IFCSTYLEDITEM(#9617,(#9633),$);
+#9639= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--557'),$);
+#9640= IFCPROPERTYSET('0OTr6R_Rf1gOCcPqoBWRoB',#4,'Allplan Attributes',$
+,(#9639));
+#9642= IFCRELDEFINESBYPROPERTIES('0fJ32jXbX8NOhp8ghOkVoJ',#4,$,$,(#9629)
+,#9640);
+#9646= IFCTEXTSTYLEFORDEFINEDFONT(#9647,$);
+#9647= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#9648= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#9649= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#9651= IFCTEXTSTYLE($,#9646,#9648,#9649);
+#9652= IFCTEXTLITERAL('Arbeitsfuge mit Quellfugenband !',#9655,.LEFT.);
+#9653= IFCDIRECTION((6.123233995736766E-17,1.));
+#9655= IFCAXIS2PLACEMENT2D(#9656,#9653);
+#9656= IFCCARTESIANPOINT((77728.33333333336,11056.97175194527));
+#9658= IFCLOCALPLACEMENT($,#1);
+#9659= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#9652));
+#9661= IFCPRODUCTDEFINITIONSHAPE($,$,(#9659));
+#9664= IFCANNOTATION('1Ia0j98LTFYQIdHBBtQ$6q',#4,$,$,$,#9658,#9661);
+#9668= IFCPRESENTATIONSTYLEASSIGNMENT((#9651));
+#9670= IFCSTYLEDITEM(#9652,(#9668),$);
+#9674= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--564'),$);
+#9675= IFCPROPERTYSET('2erWMdAJ5ADgRWb$9ErfXN',#4,'Allplan Attributes',$
+,(#9674));
+#9677= IFCRELDEFINESBYPROPERTIES('2BgUKMbZD1tAv$dwjBP8xI',#4,$,$,(#9664)
+,#9675);
+#9681= IFCTEXTSTYLEFORDEFINEDFONT(#9682,$);
+#9682= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#9683= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#9684= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#9686= IFCTEXTSTYLE($,#9681,#9683,#9684);
+#9687= IFCTEXTLITERAL('Arbeitsfuge mit Quellfugenband !',#9690,.LEFT.);
+#9688= IFCDIRECTION((6.123233995736766E-17,1.));
+#9690= IFCAXIS2PLACEMENT2D(#9691,#9688);
+#9691= IFCCARTESIANPOINT((77728.33333333336,21266.51780159047));
+#9693= IFCLOCALPLACEMENT($,#1);
+#9694= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#9687));
+#9696= IFCPRODUCTDEFINITIONSHAPE($,$,(#9694));
+#9699= IFCANNOTATION('04uPi7hSH0ARcdnfic$Jdm',#4,$,$,$,#9693,#9696);
+#9703= IFCPRESENTATIONSTYLEASSIGNMENT((#9686));
+#9705= IFCSTYLEDITEM(#9687,(#9703),$);
+#9709= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--565'),$);
+#9710= IFCPROPERTYSET('1XPxR5QJjBmAMJp9MZ8$eE',#4,'Allplan Attributes',$
+,(#9709));
+#9712= IFCRELDEFINESBYPROPERTIES('3HJKitLxrEbe8Z_Q9e0Yfq',#4,$,$,(#9699)
+,#9710);
+#9716= IFCTEXTSTYLEFORDEFINEDFONT(#9717,$);
+#9717= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#9718= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.5));
+#9719= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(300.));
+#9721= IFCTEXTSTYLE($,#9716,#9718,#9719);
+#9722= IFCPLANAREXTENT(2910.000000000003,825.0000000000168);
+#9723= IFCTEXTLITERALWITHEXTENT(
+'OK= -0.07, UK= -0.32\X\0A+ 20cm D\X2\00E4\X0\mmung (UK= -0.52)\X\0A+ 2cm Splitt (UK= -0.54)\X\0A+ 5cm Magerbeton (UK= -0.59)'
+,#9726,.LEFT.,#9722,'top-left');
+#9724= IFCDIRECTION((0.9808262151348185,0.1948844162684815));
+#9726= IFCAXIS2PLACEMENT2D(#9727,#9724);
+#9727= IFCCARTESIANPOINT((83653.51454661261,25704.46997895839));
+#9729= IFCLOCALPLACEMENT($,#1);
+#9730= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#9723));
+#9732= IFCPRODUCTDEFINITIONSHAPE($,$,(#9730));
+#9735= IFCANNOTATION('2c7mowmE99UO7hEfUQmJS3',#4,$,$,$,#9729,#9732);
+#9739= IFCPRESENTATIONSTYLEASSIGNMENT((#9721));
+#9741= IFCSTYLEDITEM(#9723,(#9739),$);
+#9745= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--566'),$);
+#9746= IFCPROPERTYSET('1FMCo2rivFXxSW_h7csSvs',#4,'Allplan Attributes',$
+,(#9745));
+#9748= IFCRELDEFINESBYPROPERTIES('09VKiGiT19OBS1dTO5KqRX',#4,$,$,(#9735)
+,#9746);
+#9752= IFCTEXTSTYLEFORDEFINEDFONT(#9753,$);
+#9753= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#9754= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.5));
+#9755= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(250.));
+#9757= IFCTEXTSTYLE($,#9752,#9754,#9755);
+#9758= IFCPLANAREXTENT(1940.000000000009,687.4999999999822);
+#9759= IFCTEXTLITERALWITHEXTENT(
+'OK= -1.13, UK= -1.38\X\0A+ 20cm D\X2\00E4\X0\mmung (UK= -1.58)\X\0A+ 2cm Splitt (UK= -1.60)\X\0A+ 5cm Magerbeton (UK= -1.65)'
+,#9762,.LEFT.,#9758,'top-left');
+#9760= IFCDIRECTION((0.7310552682428722,0.6823182503600077));
+#9762= IFCAXIS2PLACEMENT2D(#9763,#9760);
+#9763= IFCCARTESIANPOINT((87546.77173638951,22437.02940657125));
+#9765= IFCLOCALPLACEMENT($,#1);
+#9766= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#9759));
+#9768= IFCPRODUCTDEFINITIONSHAPE($,$,(#9766));
+#9771= IFCANNOTATION('16Ki_EAXv3EBb6immKe1am',#4,$,$,$,#9765,#9768);
+#9775= IFCPRESENTATIONSTYLEASSIGNMENT((#9757));
+#9777= IFCSTYLEDITEM(#9759,(#9775),$);
+#9781= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--567'),$);
+#9782= IFCPROPERTYSET('2xBPsh43P96ubeETWt0qcq',#4,'Allplan Attributes',$
+,(#9781));
+#9784= IFCRELDEFINESBYPROPERTIES('2JPZhSV116kvjNF9zH3JKQ',#4,$,$,(#9771)
+,#9782);
+#9788= IFCTEXTSTYLEFORDEFINEDFONT(#9789,$);
+#9789= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#9790= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#9791= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(350.));
+#9793= IFCTEXTSTYLE($,#9788,#9790,#9791);
+#9794= IFCTEXTLITERAL('d = 25cm',#9797,.LEFT.);
+#9795= IFCDIRECTION((0.9216166900860996,0.3881013740696396));
+#9797= IFCAXIS2PLACEMENT2D(#9798,#9795);
+#9798= IFCCARTESIANPOINT((77891.256051316,14098.27303360807));
+#9800= IFCLOCALPLACEMENT($,#1);
+#9801= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#9794));
+#9803= IFCPRODUCTDEFINITIONSHAPE($,$,(#9801));
+#9806= IFCANNOTATION('0K_ifTr_v6RRfD3_8eOyTj',#4,$,$,$,#9800,#9803);
+#9810= IFCPRESENTATIONSTYLEASSIGNMENT((#9793));
+#9812= IFCSTYLEDITEM(#9794,(#9810),$);
+#9816= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--568'),$);
+#9817= IFCPROPERTYSET('1uM$L0QgjB8QHhvyj3nUJi',#4,'Allplan Attributes',$
+,(#9816));
+#9819= IFCRELDEFINESBYPROPERTIES('0VXOqz9NjCnOIN9A8bgORi',#4,$,$,(#9806)
+,#9817);
+#9823= IFCTEXTSTYLEFORDEFINEDFONT(#9824,$);
+#9824= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#9825= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.5));
+#9826= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(300.));
+#9828= IFCTEXTSTYLE($,#9823,#9825,#9826);
+#9829= IFCPLANAREXTENT(2910.000000000046,824.9999999999975);
+#9830= IFCTEXTLITERALWITHEXTENT(
+'OK= -0.14, UK= -0.39\X\0A+ 20cm D\X2\00E4\X0\mmung (UK= -0.59)\X\0A+ 2cm Splitt (UK= -0.61)\X\0A+ 5cm Magerbeton (UK= -0.66)'
+,#9833,.LEFT.,#9829,'top-left');
+#9831= IFCDIRECTION((0.9216166900860947,0.3881013740696512));
+#9833= IFCAXIS2PLACEMENT2D(#9834,#9831);
+#9834= IFCCARTESIANPOINT((77933.62378465194,13997.66321160699));
+#9836= IFCLOCALPLACEMENT($,#1);
+#9837= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#9830));
+#9839= IFCPRODUCTDEFINITIONSHAPE($,$,(#9837));
+#9842= IFCANNOTATION('3e5OG4NZb5lg3MuzY_TtJQ',#4,$,$,$,#9836,#9839);
+#9846= IFCPRESENTATIONSTYLEASSIGNMENT((#9828));
+#9848= IFCSTYLEDITEM(#9830,(#9846),$);
+#9852= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--569'),$);
+#9853= IFCPROPERTYSET('20xwxatLr2_uwGGyRuKMvl',#4,'Allplan Attributes',$
+,(#9852));
+#9855= IFCRELDEFINESBYPROPERTIES('2FJOdanIrB59gWg26m5nMr',#4,$,$,(#9842)
+,#9853);
+#9859= IFCTEXTSTYLEFORDEFINEDFONT(#9860,$);
+#9860= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#9861= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.4));
+#9862= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#9864= IFCTEXTSTYLE($,#9859,#9861,#9862);
+#9865= IFCPLANAREXTENT(1940.,520.);
+#9866= IFCTEXTLITERALWITHEXTENT(
+'Fund. d=15cm, UK= -0.54\X\0A+ 20cm D\X2\00E4\X0\mmung (UK= -0.74)\X\0A+ 2cm Splitt (UK= -0.76)\X\0A+ 5cm Magerbeton (UK= -0.81)'
+,#9869,.LEFT.,#9865,'top-left');
+#9867= IFCDIRECTION((6.123233995736766E-17,1.));
+#9869= IFCAXIS2PLACEMENT2D(#9870,#9867);
+#9870= IFCCARTESIANPOINT((94193.33333333333,20592.11878411506));
+#9872= IFCLOCALPLACEMENT($,#1);
+#9873= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#9866));
+#9875= IFCPRODUCTDEFINITIONSHAPE($,$,(#9873));
+#9878= IFCANNOTATION('2CFWfR_EP2$Rtz46M79us9',#4,$,$,$,#9872,#9875);
+#9882= IFCPRESENTATIONSTYLEASSIGNMENT((#9864));
+#9884= IFCSTYLEDITEM(#9866,(#9882),$);
+#9888= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--575'),$);
+#9889= IFCPROPERTYSET('225Fg2Zlf49RHnJorHlILS',#4,'Allplan Attributes',$
+,(#9888));
+#9891= IFCRELDEFINESBYPROPERTIES('2iObP21lX5IvS_Sn4Kj$xZ',#4,$,$,(#9878)
+,#9889);
+#9895= IFCTEXTSTYLEFORDEFINEDFONT(#9896,$);
+#9896= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#9897= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.4));
+#9898= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#9900= IFCTEXTSTYLE($,#9895,#9897,#9898);
+#9901= IFCPLANAREXTENT(1940.,520.);
+#9902= IFCTEXTLITERALWITHEXTENT(
+'Fund. d=35cm, UK= -0.74\X\0A+ 20cm D\X2\00E4\X0\mmung (UK= -0.94)\X\0A+ 2cm Splitt (UK= -0.96)\X\0A+ 5cm Magerbeton (UK= -1.01)'
+,#9905,.LEFT.,#9901,'top-left');
+#9903= IFCDIRECTION((6.123233995736766E-17,1.));
+#9905= IFCAXIS2PLACEMENT2D(#9906,#9903);
+#9906= IFCCARTESIANPOINT((97205.,16250.39227405017));
+#9908= IFCLOCALPLACEMENT($,#1);
+#9909= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#9902));
+#9911= IFCPRODUCTDEFINITIONSHAPE($,$,(#9909));
+#9914= IFCANNOTATION('0npmxR35b098hnfx9tQySF',#4,$,$,$,#9908,#9911);
+#9918= IFCPRESENTATIONSTYLEASSIGNMENT((#9900));
+#9920= IFCSTYLEDITEM(#9902,(#9918),$);
+#9924= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--574'),$);
+#9925= IFCPROPERTYSET('1BudffpNX9a9SPufJcXnJK',#4,'Allplan Attributes',$
+,(#9924));
+#9927= IFCRELDEFINESBYPROPERTIES('1DXlOEHy13zfC1wBF$G5bB',#4,$,$,(#9914)
+,#9925);
+#9931= IFCTEXTSTYLEFORDEFINEDFONT(#9932,$);
+#9932= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#9933= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.4));
+#9934= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#9936= IFCTEXTSTYLE($,#9931,#9933,#9934);
+#9937= IFCPLANAREXTENT(1940.,520.);
+#9938= IFCTEXTLITERALWITHEXTENT(
+'Fund. d=15cm, UK= -0.54\X\0A+ 20cm D\X2\00E4\X0\mmung (UK= -0.74)\X\0A+ 2cm Splitt (UK= -0.76)\X\0A+ 5cm Magerbeton (UK= -0.81)'
+,#9941,.LEFT.,#9937,'top-left');
+#9939= IFCDIRECTION((6.123233995736766E-17,1.));
+#9941= IFCAXIS2PLACEMENT2D(#9942,#9939);
+#9942= IFCCARTESIANPOINT((94218.33333333333,11269.79426336781));
+#9944= IFCLOCALPLACEMENT($,#1);
+#9945= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#9938));
+#9947= IFCPRODUCTDEFINITIONSHAPE($,$,(#9945));
+#9950= IFCANNOTATION('0xgFiBMeDENAiBAX1JNOoL',#4,$,$,$,#9944,#9947);
+#9954= IFCPRESENTATIONSTYLEASSIGNMENT((#9936));
+#9956= IFCSTYLEDITEM(#9938,(#9954),$);
+#9960= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--573'),$);
+#9961= IFCPROPERTYSET('1JAwzMWHnFJ9VRsNqXSeg5',#4,'Allplan Attributes',$
+,(#9960));
+#9963= IFCRELDEFINESBYPROPERTIES('2i8XGY8g94avnUIVrIpQiw',#4,$,$,(#9950)
+,#9961);
+#9967= IFCTEXTSTYLEFORDEFINEDFONT(#9968,$);
+#9968= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#9969= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.4));
+#9970= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#9972= IFCTEXTSTYLE($,#9967,#9969,#9970);
+#9973= IFCPLANAREXTENT(1940.,520.);
+#9974= IFCTEXTLITERALWITHEXTENT(
+'Fund. d=15cm, UK= -0.54\X\0A+ 20cm D\X2\00E4\X0\mmung (UK= -0.74)\X\0A+ 2cm Splitt (UK= -0.76)\X\0A+ 5cm Magerbeton (UK= -0.81)'
+,#9977,.LEFT.,#9973,'top-left');
+#9975= IFCDIRECTION((6.123233995736766E-17,1.));
+#9977= IFCAXIS2PLACEMENT2D(#9978,#9975);
+#9978= IFCCARTESIANPOINT((93100.00000000003,11362.26488116083));
+#9980= IFCLOCALPLACEMENT($,#1);
+#9981= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#9974));
+#9983= IFCPRODUCTDEFINITIONSHAPE($,$,(#9981));
+#9986= IFCANNOTATION('1rI56SUJjBJRngWO3CIc$D',#4,$,$,$,#9980,#9983);
+#9990= IFCPRESENTATIONSTYLEASSIGNMENT((#9972));
+#9992= IFCSTYLEDITEM(#9974,(#9990),$);
+#9996= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--572'),$);
+#9997= IFCPROPERTYSET('0Fe7TN_hr2JA4H9xHafmGv',#4,'Allplan Attributes',$
+,(#9996));
+#9999= IFCRELDEFINESBYPROPERTIES('2OYh0j6zD1agIGTJxd3L2x',#4,$,$,(#9986)
+,#9997);
+#10003= IFCTEXTSTYLEFORDEFINEDFONT(#10004,$);
+#10004= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#10005= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.4));
+#10006= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#10008= IFCTEXTSTYLE($,#10003,#10005,#10006);
+#10009= IFCPLANAREXTENT(1940.,520.);
+#10010= IFCTEXTLITERALWITHEXTENT(
+'Fund. d=35cm, UK= -0.74\X\0A+ 20cm D\X2\00E4\X0\mmung (UK= -0.94)\X\0A+ 2cm Splitt (UK= -0.96)\X\0A+ 5cm Magerbeton (UK= -1.01)'
+,#10013,.LEFT.,#10009,'top-left');
+#10011= IFCDIRECTION((1.,0.));
+#10013= IFCAXIS2PLACEMENT2D(#10014,#10011);
+#10014= IFCCARTESIANPOINT((86373.12561100708,19411.67149726277));
+#10016= IFCLOCALPLACEMENT($,#1);
+#10017= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#10010)
+);
+#10019= IFCPRODUCTDEFINITIONSHAPE($,$,(#10017));
+#10022= IFCANNOTATION('11DvdfSLz1qgoesjizydqv',#4,$,$,$,#10016,#10019);
+#10026= IFCPRESENTATIONSTYLEASSIGNMENT((#10008));
+#10028= IFCSTYLEDITEM(#10010,(#10026),$);
+#10032= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--571'),$);
+#10033= IFCPROPERTYSET('0G$8uFwdn4qhKcH6Lmf6W9',#4,'Allplan Attributes',
+$,(#10032));
+#10035= IFCRELDEFINESBYPROPERTIES('2BQw8wENDDi8wLjGuE33Ne',#4,$,$,(
+#10022),#10033);
+#10039= IFCTEXTSTYLEFORDEFINEDFONT(#10040,$);
+#10040= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#10041= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.4));
+#10042= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#10044= IFCTEXTSTYLE($,#10039,#10041,#10042);
+#10045= IFCPLANAREXTENT(1940.,520.);
+#10046= IFCTEXTLITERALWITHEXTENT(
+'Fund. d=35cm, UK= -0.74\X\0A+ 20cm D\X2\00E4\X0\mmung (UK= -0.94)\X\0A+ 2cm Splitt (UK= -0.96)\X\0A+ 5cm Magerbeton (UK= -1.01)'
+,#10049,.LEFT.,#10045,'top-left');
+#10047= IFCDIRECTION((1.,0.));
+#10049= IFCAXIS2PLACEMENT2D(#10050,#10047);
+#10050= IFCCARTESIANPOINT((67575.,19411.67149726278));
+#10052= IFCLOCALPLACEMENT($,#1);
+#10053= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#10046)
+);
+#10055= IFCPRODUCTDEFINITIONSHAPE($,$,(#10053));
+#10058= IFCANNOTATION('18KoxebtXFkQKd7V8kW7uX',#4,$,$,$,#10052,#10055);
+#10062= IFCPRESENTATIONSTYLEASSIGNMENT((#10044));
+#10064= IFCSTYLEDITEM(#10046,(#10062),$);
+#10068= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--570'),$);
+#10069= IFCPROPERTYSET('00H24nKWjEUuucpdp7Hqcz',#4,'Allplan Attributes',
+$,(#10068));
+#10071= IFCRELDEFINESBYPROPERTIES('0qD57Y4i54JAkrfYEDNT$G',#4,$,$,(
+#10058),#10069);
+#10075= IFCTEXTSTYLEFORDEFINEDFONT(#10076,$);
+#10076= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#10077= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#10078= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#10080= IFCTEXTSTYLE($,#10075,#10077,#10078);
+#10081= IFCTEXTLITERAL('Grundriss  1:50',#10084,.LEFT.);
+#10082= IFCDIRECTION((1.,0.));
+#10084= IFCAXIS2PLACEMENT2D(#10085,#10082);
+#10085= IFCCARTESIANPOINT((83404.88972260105,28213.1435942591));
+#10087= IFCLOCALPLACEMENT($,#1);
+#10088= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#10081)
+);
+#10090= IFCPRODUCTDEFINITIONSHAPE($,$,(#10088));
+#10093= IFCANNOTATION('2$2KVXbQnE0Qt6OpPlbfnr',#4,$,$,$,#10087,#10090);
+#10097= IFCPRESENTATIONSTYLEASSIGNMENT((#10080));
+#10099= IFCSTYLEDITEM(#10081,(#10097),$);
+#10103= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--562'),$);
+#10104= IFCPROPERTYSET('2QWtUieqn6Ew0dXp42J2s2',#4,'Allplan Attributes',
+$,(#10103));
+#10106= IFCRELDEFINESBYPROPERTIES('1d5loBbOn7yAr$AZr_AEaX',#4,$,$,(
+#10093),#10104);
+#10110= IFCTEXTSTYLEFORDEFINEDFONT(#10111,$);
+#10111= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#10112= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#10113= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#10115= IFCTEXTSTYLE($,#10110,#10112,#10113);
+#10116= IFCTEXTLITERAL('Schnitt A-A  1:20',#10119,.LEFT.);
+#10117= IFCDIRECTION((1.,0.));
+#10119= IFCAXIS2PLACEMENT2D(#10120,#10117);
+#10120= IFCCARTESIANPOINT((64928.65779311588,-3984.138528206891));
+#10122= IFCLOCALPLACEMENT($,#1);
+#10123= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#10116)
+);
+#10125= IFCPRODUCTDEFINITIONSHAPE($,$,(#10123));
+#10128= IFCANNOTATION('1RacMbsYLAdhx$ZACkZJrp',#4,$,$,$,#10122,#10125);
+#10132= IFCPRESENTATIONSTYLEASSIGNMENT((#10115));
+#10134= IFCSTYLEDITEM(#10116,(#10132),$);
+#10138= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'91a2d109-b8d7-11e3-bf39-7446a0b2bba9--12'),$);
+#10139= IFCPROPERTYSET('1_scjvsfb65u4YnY8UHBkR',#4,'Allplan Attributes',
+$,(#10138));
+#10141= IFCRELDEFINESBYPROPERTIES('2hNp7wxwn6DOfOKPUnreZ8',#4,$,$,(
+#10128),#10139);
+#10145= IFCTEXTSTYLEFORDEFINEDFONT(#10146,$);
+#10146= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#10147= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#10148= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#10150= IFCTEXTSTYLE($,#10145,#10147,#10148);
+#10151= IFCTEXTLITERAL('Schnitt B-B  1:20',#10154,.LEFT.);
+#10152= IFCDIRECTION((1.,0.));
+#10154= IFCAXIS2PLACEMENT2D(#10155,#10152);
+#10155= IFCCARTESIANPOINT((71422.32664761796,-3984.138528206888));
+#10157= IFCLOCALPLACEMENT($,#1);
+#10158= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#10151)
+);
+#10160= IFCPRODUCTDEFINITIONSHAPE($,$,(#10158));
+#10163= IFCANNOTATION('1BRZUnIF58SulOrOcCFxit',#4,$,$,$,#10157,#10160);
+#10167= IFCPRESENTATIONSTYLEASSIGNMENT((#10150));
+#10169= IFCSTYLEDITEM(#10151,(#10167),$);
+#10173= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'91a2d10d-b8d7-11e3-bf39-7446a0b2bba9--18'),$);
+#10174= IFCPROPERTYSET('2cqfyfx$n4jeLHhjEYYFhb',#4,'Allplan Attributes',
+$,(#10173));
+#10176= IFCRELDEFINESBYPROPERTIES('1f20fzo499k9Cl15IAVjDg',#4,$,$,(
+#10163),#10174);
+#10180= IFCTEXTSTYLEFORDEFINEDFONT(#10181,$);
+#10181= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#10182= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#10183= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#10185= IFCTEXTSTYLE($,#10180,#10182,#10183);
+#10186= IFCTEXTLITERAL('Absatz OK Boden 7cm',#10189,.LEFT.);
+#10187= IFCDIRECTION((6.123233995736766E-17,1.));
+#10189= IFCAXIS2PLACEMENT2D(#10190,#10187);
+#10190= IFCCARTESIANPOINT((79188.33333333333,22338.59690241592));
+#10192= IFCLOCALPLACEMENT($,#1);
+#10193= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#10186)
+);
+#10195= IFCPRODUCTDEFINITIONSHAPE($,$,(#10193));
+#10198= IFCANNOTATION('02oo9RHUr5Au0mVv2rUY$9',#4,$,$,$,#10192,#10195);
+#10202= IFCPRESENTATIONSTYLEASSIGNMENT((#10185));
+#10204= IFCSTYLEDITEM(#10186,(#10202),$);
+#10208= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'cec2259e-ba67-11e3-bf5f-7446a0b2bba9--11'),$);
+#10209= IFCPROPERTYSET('2X_xng86D03PJxLlXwOGWH',#4,'Allplan Attributes',
+$,(#10208));
+#10211= IFCRELDEFINESBYPROPERTIES('19vrNsK1H8gealIcbSglwg',#4,$,$,(
+#10198),#10209);
+#10215= IFCTEXTSTYLEFORDEFINEDFONT(#10216,$);
+#10216= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#10217= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#10218= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#10220= IFCTEXTSTYLE($,#10215,#10217,#10218);
+#10221= IFCTEXTLITERAL('Absatz OK Boden 7cm',#10224,.LEFT.);
+#10222= IFCDIRECTION((1.,0.));
+#10224= IFCAXIS2PLACEMENT2D(#10225,#10222);
+#10225= IFCCARTESIANPOINT((79777.02674372181,22095.0048305961));
+#10227= IFCLOCALPLACEMENT($,#1);
+#10228= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#10221)
+);
+#10230= IFCPRODUCTDEFINITIONSHAPE($,$,(#10228));
+#10233= IFCANNOTATION('1BVbnO7LL2BA_Md6vRS8vX',#4,$,$,$,#10227,#10230);
+#10237= IFCPRESENTATIONSTYLEASSIGNMENT((#10220));
+#10239= IFCSTYLEDITEM(#10221,(#10237),$);
+#10243= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'cec2259e-ba67-11e3-bf5f-7446a0b2bba9--12'),$);
+#10244= IFCPROPERTYSET('10fFclwpD1YeHdkp91T0Q1',#4,'Allplan Attributes',
+$,(#10243));
+#10246= IFCRELDEFINESBYPROPERTIES('1EA9XkU1bBVB8vJLInChOX',#4,$,$,(
+#10233),#10244);
+#10250= IFCTEXTSTYLEFORDEFINEDFONT(#10251,$);
+#10251= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#10252= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#10253= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#10255= IFCTEXTSTYLE($,#10250,#10252,#10253);
+#10256= IFCTEXTLITERAL('Absatz OK Boden 7cm',#10259,.LEFT.);
+#10257= IFCDIRECTION((6.123233995736766E-17,1.));
+#10259= IFCAXIS2PLACEMENT2D(#10260,#10257);
+#10260= IFCCARTESIANPOINT((82025.,22520.04762552151));
+#10262= IFCLOCALPLACEMENT($,#1);
+#10263= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#10256)
+);
+#10265= IFCPRODUCTDEFINITIONSHAPE($,$,(#10263));
+#10268= IFCANNOTATION('0hJEYK_HjC5Bh3QSJGph3U',#4,$,$,$,#10262,#10265);
+#10272= IFCPRESENTATIONSTYLEASSIGNMENT((#10255));
+#10274= IFCSTYLEDITEM(#10256,(#10272),$);
+#10278= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'cec2259e-ba67-11e3-bf5f-7446a0b2bba9--13'),$);
+#10279= IFCPROPERTYSET('2lAbr1ubrB5BgA24iJKzKZ',#4,'Allplan Attributes',
+$,(#10278));
+#10281= IFCRELDEFINESBYPROPERTIES('1ZULToqkH43gjf8EP7RCXh',#4,$,$,(
+#10268),#10279);
+#10285= IFCTEXTSTYLEFORDEFINEDFONT(#10286,$);
+#10286= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#10287= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#10288= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#10290= IFCTEXTSTYLE($,#10285,#10287,#10288);
+#10291= IFCTEXTLITERAL('Absatz OK Boden 7cm',#10294,.LEFT.);
+#10292= IFCDIRECTION((1.,0.));
+#10294= IFCAXIS2PLACEMENT2D(#10295,#10292);
+#10295= IFCCARTESIANPOINT((82528.94870789858,23990.0048305961));
+#10297= IFCLOCALPLACEMENT($,#1);
+#10298= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#10291)
+);
+#10300= IFCPRODUCTDEFINITIONSHAPE($,$,(#10298));
+#10303= IFCANNOTATION('0lKupnqorB4AVGQUOnL1Vq',#4,$,$,$,#10297,#10300);
+#10307= IFCPRESENTATIONSTYLEASSIGNMENT((#10290));
+#10309= IFCSTYLEDITEM(#10291,(#10307),$);
+#10313= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'cec2259e-ba67-11e3-bf5f-7446a0b2bba9--14'),$);
+#10314= IFCPROPERTYSET('32XRGhu9b4ewq2Ql9kojfM',#4,'Allplan Attributes',
+$,(#10313));
+#10316= IFCRELDEFINESBYPROPERTIES('0nwjqIF0jE8POGmB7ql5VT',#4,$,$,(
+#10303),#10314);
+#10320= IFCTEXTSTYLEFORDEFINEDFONT(#10321,$);
+#10321= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#10322= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#10323= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#10325= IFCTEXTSTYLE($,#10320,#10322,#10323);
+#10326= IFCTEXTLITERAL('Absatz OK Boden 7cm',#10329,.LEFT.);
+#10327= IFCDIRECTION((1.,0.));
+#10329= IFCAXIS2PLACEMENT2D(#10330,#10327);
+#10330= IFCCARTESIANPOINT((85062.27633487518,23740.0048305961));
+#10332= IFCLOCALPLACEMENT($,#1);
+#10333= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#10326)
+);
+#10335= IFCPRODUCTDEFINITIONSHAPE($,$,(#10333));
+#10338= IFCANNOTATION('39ocVVxlz4fed9PSy95Nhg',#4,$,$,$,#10332,#10335);
+#10342= IFCPRESENTATIONSTYLEASSIGNMENT((#10325));
+#10344= IFCSTYLEDITEM(#10326,(#10342),$);
+#10348= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'cec2259e-ba67-11e3-bf5f-7446a0b2bba9--15'),$);
+#10349= IFCPROPERTYSET('0p1EYOEk9899uyhB2MV3GZ',#4,'Allplan Attributes',
+$,(#10348));
+#10351= IFCRELDEFINESBYPROPERTIES('35673UaVv76BZq1vjGQFiu',#4,$,$,(
+#10338),#10349);
+#10355= IFCTEXTSTYLEFORDEFINEDFONT(#10356,$);
+#10356= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#10357= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#10358= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#10360= IFCTEXTSTYLE($,#10355,#10357,#10358);
+#10361= IFCTEXTLITERAL('Absatz UK Boden 7cm',#10364,.LEFT.);
+#10362= IFCDIRECTION((1.,0.));
+#10364= IFCAXIS2PLACEMENT2D(#10365,#10362);
+#10365= IFCCARTESIANPOINT((87412.56598371331,24656.67149726277));
+#10367= IFCLOCALPLACEMENT($,#1);
+#10368= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#10361)
+);
+#10370= IFCPRODUCTDEFINITIONSHAPE($,$,(#10368));
+#10373= IFCANNOTATION('0G2M75XnvD7hYmoxKALhJ0',#4,$,$,$,#10367,#10370);
+#10377= IFCPRESENTATIONSTYLEASSIGNMENT((#10360));
+#10379= IFCSTYLEDITEM(#10361,(#10377),$);
+#10383= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'cec2259e-ba67-11e3-bf5f-7446a0b2bba9--16'),$);
+#10384= IFCPROPERTYSET('0qA5vpnFb5yO7BSMWnWq4o',#4,'Allplan Attributes',
+$,(#10383));
+#10386= IFCRELDEFINESBYPROPERTIES('0EQy88UMvCQPc2TdVlVhXa',#4,$,$,(
+#10373),#10384);
+#10390= IFCTEXTSTYLEFORDEFINEDFONT(#10391,$);
+#10391= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#10392= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#10393= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#10395= IFCTEXTSTYLE($,#10390,#10392,#10393);
+#10396= IFCTEXTLITERAL('Absatz OK Boden 7cm',#10399,.LEFT.);
+#10397= IFCDIRECTION((1.,0.));
+#10399= IFCAXIS2PLACEMENT2D(#10400,#10397);
+#10400= IFCCARTESIANPOINT((90006.89477922957,23740.0048305961));
+#10402= IFCLOCALPLACEMENT($,#1);
+#10403= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#10396)
+);
+#10405= IFCPRODUCTDEFINITIONSHAPE($,$,(#10403));
+#10408= IFCANNOTATION('3Z7Gsw3c9BsReT33xIhbLv',#4,$,$,$,#10402,#10405);
+#10412= IFCPRESENTATIONSTYLEASSIGNMENT((#10395));
+#10414= IFCSTYLEDITEM(#10396,(#10412),$);
+#10418= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'cec2259e-ba67-11e3-bf5f-7446a0b2bba9--17'),$);
+#10419= IFCPROPERTYSET('3kDBfHw415EvcSrhbzBpR0',#4,'Allplan Attributes',
+$,(#10418));
+#10421= IFCRELDEFINESBYPROPERTIES('2HcxH4oif9bQL$2rA8Js0$',#4,$,$,(
+#10408),#10419);
+#10425= IFCTEXTSTYLEFORDEFINEDFONT(#10426,$);
+#10426= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#10427= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#10428= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#10430= IFCTEXTSTYLE($,#10425,#10427,#10428);
+#10431= IFCTEXTLITERAL('W1',#10434,.LEFT.);
+#10432= IFCDIRECTION((1.,0.));
+#10434= IFCAXIS2PLACEMENT2D(#10435,#10432);
+#10435= IFCCARTESIANPOINT((96673.30189202845,24391.04263252323));
+#10437= IFCLOCALPLACEMENT($,#1);
+#10438= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#10431)
+);
+#10440= IFCPRODUCTDEFINITIONSHAPE($,$,(#10438));
+#10443= IFCANNOTATION('1PyQGDdu56nhYoPzphX21B',#4,$,$,$,#10437,#10440);
+#10447= IFCPRESENTATIONSTYLEASSIGNMENT((#10430));
+#10449= IFCSTYLEDITEM(#10431,(#10447),$);
+#10453= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'cec2259e-ba67-11e3-bf5f-7446a0b2bba9--84'),$);
+#10454= IFCPROPERTYSET('3saFCiwHr5Ygn6VRPJEbGu',#4,'Allplan Attributes',
+$,(#10453));
+#10456= IFCRELDEFINESBYPROPERTIES('3Cx4Hyz7X1sAULLrxquzRl',#4,$,$,(
+#10443),#10454);
+#10460= IFCTEXTSTYLEFORDEFINEDFONT(#10461,$);
+#10461= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#10462= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#10463= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#10465= IFCTEXTSTYLE($,#10460,#10462,#10463);
+#10466= IFCTEXTLITERAL('C',#10469,.LEFT.);
+#10467= IFCDIRECTION((6.123233995736766E-17,1.));
+#10469= IFCAXIS2PLACEMENT2D(#10470,#10467);
+#10470= IFCCARTESIANPOINT((90860.31738068213,22977.90885162081));
+#10472= IFCLOCALPLACEMENT($,#1);
+#10473= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#10466)
+);
+#10475= IFCPRODUCTDEFINITIONSHAPE($,$,(#10473));
+#10478= IFCANNOTATION('2T8bcfUpHDove5T4HCqd4g',#4,$,$,$,#10472,#10475);
+#10482= IFCPRESENTATIONSTYLEASSIGNMENT((#10465));
+#10484= IFCSTYLEDITEM(#10466,(#10482),$);
+#10488= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'cec2259e-ba67-11e3-bf5f-7446a0b2bba9--363'),$);
+#10489= IFCPROPERTYSET('1iJC9qL6D7rPEV7GrlG6$m',#4,'Allplan Attributes',
+$,(#10488));
+#10491= IFCRELDEFINESBYPROPERTIES('27rPeAHDb9agIWB_s$BdJn',#4,$,$,(
+#10478),#10489);
+#10495= IFCTEXTSTYLEFORDEFINEDFONT(#10496,$);
+#10496= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#10497= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#10498= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#10500= IFCTEXTSTYLE($,#10495,#10497,#10498);
+#10501= IFCTEXTLITERAL('C',#10504,.LEFT.);
+#10502= IFCDIRECTION((6.123233995736766E-17,1.));
+#10504= IFCAXIS2PLACEMENT2D(#10505,#10502);
+#10505= IFCCARTESIANPOINT((90860.31738068222,25478.76747622812));
+#10507= IFCLOCALPLACEMENT($,#1);
+#10508= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#10501)
+);
+#10510= IFCPRODUCTDEFINITIONSHAPE($,$,(#10508));
+#10513= IFCANNOTATION('1cIoPuuzvDyOvkYS14_251',#4,$,$,$,#10507,#10510);
+#10517= IFCPRESENTATIONSTYLEASSIGNMENT((#10500));
+#10519= IFCSTYLEDITEM(#10501,(#10517),$);
+#10523= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'cec2259e-ba67-11e3-bf5f-7446a0b2bba9--364'),$);
+#10524= IFCPROPERTYSET('1XNBrrj9f0av1xYnZhQB72',#4,'Allplan Attributes',
+$,(#10523));
+#10526= IFCRELDEFINESBYPROPERTIES('278EZLZV92tA0tyIRts7os',#4,$,$,(
+#10513),#10524);
+#10530= IFCTEXTSTYLEFORDEFINEDFONT(#10531,$);
+#10531= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#10532= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#10533= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#10535= IFCTEXTSTYLE($,#10530,#10532,#10533);
+#10536= IFCTEXTLITERAL('D',#10539,.LEFT.);
+#10537= IFCDIRECTION((6.123233995736766E-17,1.));
+#10539= IFCAXIS2PLACEMENT2D(#10540,#10537);
+#10540= IFCCARTESIANPOINT((83296.74014217944,23227.9088516208));
+#10542= IFCLOCALPLACEMENT($,#1);
+#10543= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#10536)
+);
+#10545= IFCPRODUCTDEFINITIONSHAPE($,$,(#10543));
+#10548= IFCANNOTATION('0lONBur7X7KRsJXNJWggb7',#4,$,$,$,#10542,#10545);
+#10552= IFCPRESENTATIONSTYLEASSIGNMENT((#10535));
+#10554= IFCSTYLEDITEM(#10536,(#10552),$);
+#10558= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'cec2259e-ba67-11e3-bf5f-7446a0b2bba9--367'),$);
+#10559= IFCPROPERTYSET('3j2CDekfz9xBGQoI8i93lp',#4,'Allplan Attributes',
+$,(#10558));
+#10561= IFCRELDEFINESBYPROPERTIES('3B$2791kf7Y91lpPJ2081d',#4,$,$,(
+#10548),#10559);
+#10565= IFCTEXTSTYLEFORDEFINEDFONT(#10566,$);
+#10566= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#10567= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#10568= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#10570= IFCTEXTSTYLE($,#10565,#10567,#10568);
+#10571= IFCTEXTLITERAL('D',#10574,.LEFT.);
+#10572= IFCDIRECTION((6.123233995736766E-17,1.));
+#10574= IFCAXIS2PLACEMENT2D(#10575,#10572);
+#10575= IFCCARTESIANPOINT((83296.74014217944,25478.76747622814));
+#10577= IFCLOCALPLACEMENT($,#1);
+#10578= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#10571)
+);
+#10580= IFCPRODUCTDEFINITIONSHAPE($,$,(#10578));
+#10583= IFCANNOTATION('14L3jLKsbBQxJJE5XtwiDT',#4,$,$,$,#10577,#10580);
+#10587= IFCPRESENTATIONSTYLEASSIGNMENT((#10570));
+#10589= IFCSTYLEDITEM(#10571,(#10587),$);
+#10593= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'cec2259e-ba67-11e3-bf5f-7446a0b2bba9--368'),$);
+#10594= IFCPROPERTYSET('3kX6ZPsk5EhwThN6r0O6f0',#4,'Allplan Attributes',
+$,(#10593));
+#10596= IFCRELDEFINESBYPROPERTIES('3_9C3oqev719_N3ZFmBY20',#4,$,$,(
+#10583),#10594);
+#10600= IFCTEXTSTYLEFORDEFINEDFONT(#10601,$);
+#10601= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#10602= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#10603= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#10605= IFCTEXTSTYLE($,#10600,#10602,#10603);
+#10606= IFCTEXTLITERAL('E',#10609,.LEFT.);
+#10607= IFCDIRECTION((6.123233995736766E-17,1.));
+#10609= IFCAXIS2PLACEMENT2D(#10610,#10607);
+#10610= IFCCARTESIANPOINT((80468.05826830864,25478.76747622814));
+#10612= IFCLOCALPLACEMENT($,#1);
+#10613= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#10606)
+);
+#10615= IFCPRODUCTDEFINITIONSHAPE($,$,(#10613));
+#10618= IFCANNOTATION('2A9VxqLzH8Yxh4yHmIiJ5f',#4,$,$,$,#10612,#10615);
+#10622= IFCPRESENTATIONSTYLEASSIGNMENT((#10605));
+#10624= IFCSTYLEDITEM(#10606,(#10622),$);
+#10628= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'cec2259e-ba67-11e3-bf5f-7446a0b2bba9--369'),$);
+#10629= IFCPROPERTYSET('25mROztNX0OfegiFVJm_GB',#4,'Allplan Attributes',
+$,(#10628));
+#10631= IFCRELDEFINESBYPROPERTIES('3QRIYh25P9Ag1PtjSDhNoz',#4,$,$,(
+#10618),#10629);
+#10635= IFCTEXTSTYLEFORDEFINEDFONT(#10636,$);
+#10636= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#10637= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#10638= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#10640= IFCTEXTSTYLE($,#10635,#10637,#10638);
+#10641= IFCTEXTLITERAL('E',#10644,.LEFT.);
+#10642= IFCDIRECTION((6.123233995736766E-17,1.));
+#10644= IFCAXIS2PLACEMENT2D(#10645,#10642);
+#10645= IFCCARTESIANPOINT((80468.05826830864,21332.9088516208));
+#10647= IFCLOCALPLACEMENT($,#1);
+#10648= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#10641)
+);
+#10650= IFCPRODUCTDEFINITIONSHAPE($,$,(#10648));
+#10653= IFCANNOTATION('1ktzNXh5PDwuyBDjqbA9VW',#4,$,$,$,#10647,#10650);
+#10657= IFCPRESENTATIONSTYLEASSIGNMENT((#10640));
+#10659= IFCSTYLEDITEM(#10641,(#10657),$);
+#10663= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'cec2259e-ba67-11e3-bf5f-7446a0b2bba9--370'),$);
+#10664= IFCPROPERTYSET('2YfpoBEGfBDesgdvPhgL8M',#4,'Allplan Attributes',
+$,(#10663));
+#10666= IFCRELDEFINESBYPROPERTIES('09p$GtgY9FOBft0lv2ZQmx',#4,$,$,(
+#10653),#10664);
+#10670= IFCTEXTSTYLEFORDEFINEDFONT(#10671,$);
+#10671= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#10672= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#10673= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#10675= IFCTEXTSTYLE($,#10670,#10672,#10673);
+#10676= IFCTEXTLITERAL('F',#10679,.LEFT.);
+#10677= IFCDIRECTION((1.,0.));
+#10679= IFCAXIS2PLACEMENT2D(#10680,#10677);
+#10680= IFCCARTESIANPOINT((78332.9040210247,23164.44656228746));
+#10682= IFCLOCALPLACEMENT($,#1);
+#10683= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#10676)
+);
+#10685= IFCPRODUCTDEFINITIONSHAPE($,$,(#10683));
+#10688= IFCANNOTATION('3gtbizk1D2Lx0eGpOR2gdC',#4,$,$,$,#10682,#10685);
+#10692= IFCPRESENTATIONSTYLEASSIGNMENT((#10675));
+#10694= IFCSTYLEDITEM(#10676,(#10692),$);
+#10698= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'cec2259e-ba67-11e3-bf5f-7446a0b2bba9--371'),$);
+#10699= IFCPROPERTYSET('36aY$d6p185OcYaqK1y1e1',#4,'Allplan Attributes',
+$,(#10698));
+#10701= IFCRELDEFINESBYPROPERTIES('3ThS1gSCH7EBQbSntxNDqf',#4,$,$,(
+#10688),#10699);
+#10705= IFCTEXTSTYLEFORDEFINEDFONT(#10706,$);
+#10706= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#10707= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#10708= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#10710= IFCTEXTSTYLE($,#10705,#10707,#10708);
+#10711= IFCTEXTLITERAL('F',#10714,.LEFT.);
+#10712= IFCDIRECTION((1.,0.));
+#10714= IFCAXIS2PLACEMENT2D(#10715,#10712);
+#10715= IFCCARTESIANPOINT((82553.76264563203,23164.44656228746));
+#10717= IFCLOCALPLACEMENT($,#1);
+#10718= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#10711)
+);
+#10720= IFCPRODUCTDEFINITIONSHAPE($,$,(#10718));
+#10723= IFCANNOTATION('1$1Q2QKDL9Wu_3ZQpYBfg0',#4,$,$,$,#10717,#10720);
+#10727= IFCPRESENTATIONSTYLEASSIGNMENT((#10710));
+#10729= IFCSTYLEDITEM(#10711,(#10727),$);
+#10733= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'cec2259e-ba67-11e3-bf5f-7446a0b2bba9--372'),$);
+#10734= IFCPROPERTYSET('1m$C6NhJrA9fibllolCVDw',#4,'Allplan Attributes',
+$,(#10733));
+#10736= IFCRELDEFINESBYPROPERTIES('2_VH5g0ln4KglO7R3VXfmE',#4,$,$,(
+#10723),#10734);
+#10740= IFCTEXTSTYLEFORDEFINEDFONT(#10741,$);
+#10741= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#10742= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#10743= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#10745= IFCTEXTSTYLE($,#10740,#10742,#10743);
+#10746= IFCTEXTLITERAL('G',#10749,.LEFT.);
+#10747= IFCDIRECTION((1.,0.));
+#10749= IFCAXIS2PLACEMENT2D(#10750,#10747);
+#10750= IFCCARTESIANPOINT((83082.9040210247,21519.44656228746));
+#10752= IFCLOCALPLACEMENT($,#1);
+#10753= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#10746)
+);
+#10755= IFCPRODUCTDEFINITIONSHAPE($,$,(#10753));
+#10758= IFCANNOTATION('04g9Ogp3j6MBCY3Fvf5TUB',#4,$,$,$,#10752,#10755);
+#10762= IFCPRESENTATIONSTYLEASSIGNMENT((#10745));
+#10764= IFCSTYLEDITEM(#10746,(#10762),$);
+#10768= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'cec2259e-ba67-11e3-bf5f-7446a0b2bba9--373'),$);
+#10769= IFCPROPERTYSET('3OHiS5XRfDoh478ZIMWKdM',#4,'Allplan Attributes',
+$,(#10768));
+#10771= IFCRELDEFINESBYPROPERTIES('2Ky_FESAj84xoEKTeaTVBn',#4,$,$,(
+#10758),#10769);
+#10775= IFCTEXTSTYLEFORDEFINEDFONT(#10776,$);
+#10776= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#10777= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#10778= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#10780= IFCTEXTSTYLE($,#10775,#10777,#10778);
+#10781= IFCTEXTLITERAL('G',#10784,.LEFT.);
+#10782= IFCDIRECTION((1.,0.));
+#10784= IFCAXIS2PLACEMENT2D(#10785,#10782);
+#10785= IFCCARTESIANPOINT((85033.76264563203,21519.44656228747));
+#10787= IFCLOCALPLACEMENT($,#1);
+#10788= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#10781)
+);
+#10790= IFCPRODUCTDEFINITIONSHAPE($,$,(#10788));
+#10793= IFCANNOTATION('0aIs$TENTBuO5xW7c3OPD$',#4,$,$,$,#10787,#10790);
+#10797= IFCPRESENTATIONSTYLEASSIGNMENT((#10780));
+#10799= IFCSTYLEDITEM(#10781,(#10797),$);
+#10803= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'cec2259e-ba67-11e3-bf5f-7446a0b2bba9--374'),$);
+#10804= IFCPROPERTYSET('2sPx5sqvDFp9wjDzS0SAxB',#4,'Allplan Attributes',
+$,(#10803));
+#10806= IFCRELDEFINESBYPROPERTIES('0picvcgdn8FudZ4pkB7L63',#4,$,$,(
+#10793),#10804);
+#10810= IFCTEXTSTYLEFORDEFINEDFONT(#10811,$);
+#10811= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#10812= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#10813= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#10815= IFCTEXTSTYLE($,#10810,#10812,#10813);
+#10816= IFCTEXTLITERAL('W2',#10819,.LEFT.);
+#10817= IFCDIRECTION((1.,0.));
+#10819= IFCAXIS2PLACEMENT2D(#10820,#10817);
+#10820= IFCCARTESIANPOINT((92123.80189202847,25631.04263252323));
+#10822= IFCLOCALPLACEMENT($,#1);
+#10823= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#10816)
+);
+#10825= IFCPRODUCTDEFINITIONSHAPE($,$,(#10823));
+#10828= IFCANNOTATION('35pYg6JYb2DezrOkTvAKFP',#4,$,$,$,#10822,#10825);
+#10832= IFCPRESENTATIONSTYLEASSIGNMENT((#10815));
+#10834= IFCSTYLEDITEM(#10816,(#10832),$);
+#10838= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'cec2259e-ba67-11e3-bf5f-7446a0b2bba9--419'),$);
+#10839= IFCPROPERTYSET('1Z9a6wjjPFhfuMoYOlvBZH',#4,'Allplan Attributes',
+$,(#10838));
+#10841= IFCRELDEFINESBYPROPERTIES('14hrKnqLLAn9wAXa_SHp8f',#4,$,$,(
+#10828),#10839);
+#10845= IFCTEXTSTYLEFORDEFINEDFONT(#10846,$);
+#10846= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#10847= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#10848= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#10850= IFCTEXTSTYLE($,#10845,#10847,#10848);
+#10851= IFCTEXTLITERAL('Einlage 15x25cm',#10854,.LEFT.);
+#10852= IFCDIRECTION((1.,0.));
+#10854= IFCAXIS2PLACEMENT2D(#10855,#10852);
+#10855= IFCCARTESIANPOINT((94135.,8666.671497262763));
+#10857= IFCLOCALPLACEMENT($,#1);
+#10858= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#10851)
+);
+#10860= IFCPRODUCTDEFINITIONSHAPE($,$,(#10858));
+#10863= IFCANNOTATION('1WRdSortnAGPQyQDlNmxeM',#4,$,$,$,#10857,#10860);
+#10867= IFCPRESENTATIONSTYLEASSIGNMENT((#10850));
+#10869= IFCSTYLEDITEM(#10851,(#10867),$);
+#10873= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'cec2259e-ba67-11e3-bf5f-7446a0b2bba9--557'),$);
+#10874= IFCPROPERTYSET('2xWz$FHKj0whPhjzlntCZf',#4,'Allplan Attributes',
+$,(#10873));
+#10876= IFCRELDEFINESBYPROPERTIES('3Bv$b18TH9LOaQnHJmA_CM',#4,$,$,(
+#10863),#10874);
+#10880= IFCTEXTSTYLEFORDEFINEDFONT(#10881,$);
+#10881= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#10882= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#10883= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#10885= IFCTEXTSTYLE($,#10880,#10882,#10883);
+#10886= IFCTEXTLITERAL('Arbeitsfuge mit Quellfugenband !',#10889,.LEFT.
+);
+#10887= IFCDIRECTION((6.123233995736766E-17,1.));
+#10889= IFCAXIS2PLACEMENT2D(#10890,#10887);
+#10890= IFCCARTESIANPOINT((77728.33333333336,11056.97175194527));
+#10892= IFCLOCALPLACEMENT($,#1);
+#10893= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#10886)
+);
+#10895= IFCPRODUCTDEFINITIONSHAPE($,$,(#10893));
+#10898= IFCANNOTATION('0Si01wmsH7VfSbHTJiUwrF',#4,$,$,$,#10892,#10895);
+#10902= IFCPRESENTATIONSTYLEASSIGNMENT((#10885));
+#10904= IFCSTYLEDITEM(#10886,(#10902),$);
+#10908= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'cec2259e-ba67-11e3-bf5f-7446a0b2bba9--564'),$);
+#10909= IFCPROPERTYSET('0Ujl8uncj2ogOqFvHf7bXh',#4,'Allplan Attributes',
+$,(#10908));
+#10911= IFCRELDEFINESBYPROPERTIES('0EMAMbNATEshxRFb0MxlQz',#4,$,$,(
+#10898),#10909);
+#10915= IFCTEXTSTYLEFORDEFINEDFONT(#10916,$);
+#10916= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#10917= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#10918= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#10920= IFCTEXTSTYLE($,#10915,#10917,#10918);
+#10921= IFCTEXTLITERAL('Arbeitsfuge mit Quellfugenband !',#10924,.LEFT.
+);
+#10922= IFCDIRECTION((6.123233995736766E-17,1.));
+#10924= IFCAXIS2PLACEMENT2D(#10925,#10922);
+#10925= IFCCARTESIANPOINT((77728.33333333336,21266.51780159047));
+#10927= IFCLOCALPLACEMENT($,#1);
+#10928= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#10921)
+);
+#10930= IFCPRODUCTDEFINITIONSHAPE($,$,(#10928));
+#10933= IFCANNOTATION('1HA2cyoWX8_w$cwsCsFElh',#4,$,$,$,#10927,#10930);
+#10937= IFCPRESENTATIONSTYLEASSIGNMENT((#10920));
+#10939= IFCSTYLEDITEM(#10921,(#10937),$);
+#10943= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'cec2259e-ba67-11e3-bf5f-7446a0b2bba9--565'),$);
+#10944= IFCPROPERTYSET('0SqWs4mXbC5eZW1rsVo_Hz',#4,'Allplan Attributes',
+$,(#10943));
+#10946= IFCRELDEFINESBYPROPERTIES('3XBg5A92v7lfDI6o_Ig3Dv',#4,$,$,(
+#10933),#10944);
+#10950= IFCTEXTSTYLEFORDEFINEDFONT(#10951,$);
+#10951= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#10952= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#10953= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#10955= IFCTEXTSTYLE($,#10950,#10952,#10953);
+#10956= IFCTEXTLITERAL('W2',#10959,.LEFT.);
+#10957= IFCDIRECTION((1.,0.));
+#10959= IFCAXIS2PLACEMENT2D(#10960,#10957);
+#10960= IFCCARTESIANPOINT((84628.30189202848,27671.04263252323));
+#10962= IFCLOCALPLACEMENT($,#1);
+#10963= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#10956)
+);
+#10965= IFCPRODUCTDEFINITIONSHAPE($,$,(#10963));
+#10968= IFCANNOTATION('3drmzZ2db5SQZCYVkeKbHf',#4,$,$,$,#10962,#10965);
+#10972= IFCPRESENTATIONSTYLEASSIGNMENT((#10955));
+#10974= IFCSTYLEDITEM(#10956,(#10972),$);
+#10978= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'cec2259e-ba67-11e3-bf5f-7446a0b2bba9--418'),$);
+#10979= IFCPROPERTYSET('109Jm6LGPF1g7zj9aCbg1h',#4,'Allplan Attributes',
+$,(#10978));
+#10981= IFCRELDEFINESBYPROPERTIES('3ZRa_PPK18l9$dgNMU0E7j',#4,$,$,(
+#10968),#10979);
+#10985= IFCTEXTSTYLEFORDEFINEDFONT(#10986,$);
+#10986= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#10987= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#10988= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#10990= IFCTEXTSTYLE($,#10985,#10987,#10988);
+#10991= IFCTEXTLITERAL('f6',#10994,.LEFT.);
+#10992= IFCDIRECTION((1.,0.));
+#10994= IFCAXIS2PLACEMENT2D(#10995,#10992);
+#10995= IFCCARTESIANPOINT((84770.96093109455,16601.04263252323));
+#10997= IFCLOCALPLACEMENT($,#1);
+#10998= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#10991)
+);
+#11000= IFCPRODUCTDEFINITIONSHAPE($,$,(#10998));
+#11003= IFCANNOTATION('3b7SRBIhbEYBMZ4roZ2oc2',#4,$,$,$,#10997,#11000);
+#11007= IFCPRESENTATIONSTYLEASSIGNMENT((#10990));
+#11009= IFCSTYLEDITEM(#10991,(#11007),$);
+#11013= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'cec2259e-ba67-11e3-bf5f-7446a0b2bba9--491'),$);
+#11014= IFCPROPERTYSET('2e_Hs4Z0P3Nh2IWMVizlRi',#4,'Allplan Attributes',
+$,(#11013));
+#11016= IFCRELDEFINESBYPROPERTIES('1gduJswcH1fOdIc8I0beNT',#4,$,$,(
+#11003),#11014);
+#11020= IFCTEXTSTYLEFORDEFINEDFONT(#11021,$);
+#11021= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#11022= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#11023= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#11025= IFCTEXTSTYLE($,#11020,#11022,#11023);
+#11026= IFCTEXTLITERAL('Absatz OK Boden 7cm',#11029,.LEFT.);
+#11027= IFCDIRECTION((1.,0.));
+#11029= IFCAXIS2PLACEMENT2D(#11030,#11027);
+#11030= IFCCARTESIANPOINT((77265.00000000003,23740.00483059611));
+#11032= IFCLOCALPLACEMENT($,#1);
+#11033= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#11026)
+);
+#11035= IFCPRODUCTDEFINITIONSHAPE($,$,(#11033));
+#11038= IFCANNOTATION('3gwS0v7nX0k8nuL_3guuhj',#4,$,$,$,#11032,#11035);
+#11042= IFCPRESENTATIONSTYLEASSIGNMENT((#11025));
+#11044= IFCSTYLEDITEM(#11026,(#11042),$);
+#11048= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'cec2259e-ba67-11e3-bf5f-7446a0b2bba9--9'),$);
+#11049= IFCPROPERTYSET('1znHAgidrCSub4mFBq9lct',#4,'Allplan Attributes',
+$,(#11048));
+#11051= IFCRELDEFINESBYPROPERTIES('2J6XjPG352nwliS_tdeHOB',#4,$,$,(
+#11038),#11049);
+#11055= IFCTEXTSTYLEFORDEFINEDFONT(#11056,$);
+#11056= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#11057= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#11058= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#11060= IFCTEXTSTYLE($,#11055,#11057,#11058);
+#11061= IFCTEXTLITERAL('Absatz UK Boden 7cm',#11064,.LEFT.);
+#11062= IFCDIRECTION((1.,0.));
+#11064= IFCAXIS2PLACEMENT2D(#11065,#11062);
+#11065= IFCCARTESIANPOINT((77261.26060803561,24656.67149726277));
+#11067= IFCLOCALPLACEMENT($,#1);
+#11068= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#11061)
+);
+#11070= IFCPRODUCTDEFINITIONSHAPE($,$,(#11068));
+#11073= IFCANNOTATION('1UcsrnqPj1oxzIpiO8o73O',#4,$,$,$,#11067,#11070);
+#11077= IFCPRESENTATIONSTYLEASSIGNMENT((#11060));
+#11079= IFCSTYLEDITEM(#11061,(#11077),$);
+#11083= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'cec2259e-ba67-11e3-bf5f-7446a0b2bba9--10'),$);
+#11084= IFCPROPERTYSET('353O50q5b6mxaAbsISWknE',#4,'Allplan Attributes',
+$,(#11083));
+#11086= IFCRELDEFINESBYPROPERTIES('2xPQBrVfTCO9XZ3ig5G_K5',#4,$,$,(
+#11073),#11084);
+#11090= IFCTEXTSTYLEFORDEFINEDFONT(#11091,$);
+#11091= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#11092= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#11093= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(350.));
+#11095= IFCTEXTSTYLE($,#11090,#11092,#11093);
+#11096= IFCTEXTLITERAL('d = 25cm',#11099,.LEFT.);
+#11097= IFCDIRECTION((1.,0.));
+#11099= IFCAXIS2PLACEMENT2D(#11100,#11097);
+#11100= IFCCARTESIANPOINT((92662.10678118655,28171.27827844931));
+#11102= IFCLOCALPLACEMENT($,#1);
+#11103= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#11096)
+);
+#11105= IFCPRODUCTDEFINITIONSHAPE($,$,(#11103));
+#11108= IFCANNOTATION('0pB2moVO53x9IFdUimHRSd',#4,$,$,$,#11102,#11105);
+#11112= IFCPRESENTATIONSTYLEASSIGNMENT((#11095));
+#11114= IFCSTYLEDITEM(#11096,(#11112),$);
+#11118= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'cec2259e-ba67-11e3-bf5f-7446a0b2bba9--346'),$);
+#11119= IFCPROPERTYSET('0oYM93$IbA$uppThB1PeB4',#4,'Allplan Attributes',
+$,(#11118));
+#11121= IFCRELDEFINESBYPROPERTIES('0yjkdJq7X7whPIdNSI5dIz',#4,$,$,(
+#11108),#11119);
+#11125= IFCTEXTSTYLEFORDEFINEDFONT(#11126,$);
+#11126= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#11127= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.5));
+#11128= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(300.));
+#11130= IFCTEXTSTYLE($,#11125,#11127,#11128);
+#11131= IFCPLANAREXTENT(2910.,825.);
+#11132= IFCTEXTLITERALWITHEXTENT(
+'OK= -0.07, UK= -0.32\X\0A+ 20cm D\X2\00E4\X0\mmung (UK= -0.52)\X\0A+ 2cm Splitt (UK= -0.54)\X\0A+ 5cm Magerbeton (UK= -0.59)'
+,#11135,.LEFT.,#11131,'top-left');
+#11133= IFCDIRECTION((1.,0.));
+#11135= IFCAXIS2PLACEMENT2D(#11136,#11133);
+#11136= IFCCARTESIANPOINT((92662.10678118655,28062.11161178265));
+#11138= IFCLOCALPLACEMENT($,#1);
+#11139= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#11132)
+);
+#11141= IFCPRODUCTDEFINITIONSHAPE($,$,(#11139));
+#11144= IFCANNOTATION('1KZBKGy1DBBOQtz_MmVfdn',#4,$,$,$,#11138,#11141);
+#11148= IFCPRESENTATIONSTYLEASSIGNMENT((#11130));
+#11150= IFCSTYLEDITEM(#11132,(#11148),$);
+#11154= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'cec2259e-ba67-11e3-bf5f-7446a0b2bba9--566'),$);
+#11155= IFCPROPERTYSET('0ZxcVCEA52Qg86oeVFICzs',#4,'Allplan Attributes',
+$,(#11154));
+#11157= IFCRELDEFINESBYPROPERTIES('2fmnJ1DLD7ERcTUwwr0pcr',#4,$,$,(
+#11144),#11155);
+#11161= IFCTEXTSTYLEFORDEFINEDFONT(#11162,$);
+#11162= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#11163= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#11164= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(350.));
+#11166= IFCTEXTSTYLE($,#11161,#11163,#11164);
+#11167= IFCTEXTLITERAL('d = 25cm',#11170,.LEFT.);
+#11168= IFCDIRECTION((1.,0.));
+#11170= IFCAXIS2PLACEMENT2D(#11171,#11168);
+#11171= IFCCARTESIANPOINT((102562.1067811866,24891.27827844933));
+#11173= IFCLOCALPLACEMENT($,#1);
+#11174= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#11167)
+);
+#11176= IFCPRODUCTDEFINITIONSHAPE($,$,(#11174));
+#11179= IFCANNOTATION('0KT7WHqe1FFRst090up7HM',#4,$,$,$,#11173,#11176);
+#11183= IFCPRESENTATIONSTYLEASSIGNMENT((#11166));
+#11185= IFCSTYLEDITEM(#11167,(#11183),$);
+#11189= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'cec2259e-ba67-11e3-bf5f-7446a0b2bba9--568'),$);
+#11190= IFCPROPERTYSET('2V5LQzFqr0EhjTUFbRdyjL',#4,'Allplan Attributes',
+$,(#11189));
+#11192= IFCRELDEFINESBYPROPERTIES('3bwX7_usj3gxmjP4gRPs9_',#4,$,$,(
+#11179),#11190);
+#11196= IFCTEXTSTYLEFORDEFINEDFONT(#11197,$);
+#11197= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#11198= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.5));
+#11199= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(300.));
+#11201= IFCTEXTSTYLE($,#11196,#11198,#11199);
+#11202= IFCPLANAREXTENT(2910.,825.);
+#11203= IFCTEXTLITERALWITHEXTENT(
+'OK= -0.14, UK= -0.39\X\0A+ 20cm D\X2\00E4\X0\mmung (UK= -0.59)\X\0A+ 2cm Splitt (UK= -0.61)\X\0A+ 5cm Magerbeton (UK= -0.66)'
+,#11206,.LEFT.,#11202,'top-left');
+#11204= IFCDIRECTION((1.,0.));
+#11206= IFCAXIS2PLACEMENT2D(#11207,#11204);
+#11207= IFCCARTESIANPOINT((102562.1067811866,24782.11161178265));
+#11209= IFCLOCALPLACEMENT($,#1);
+#11210= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#11203)
+);
+#11212= IFCPRODUCTDEFINITIONSHAPE($,$,(#11210));
+#11215= IFCANNOTATION('2XbqDpayL8gBhImTvtlJbT',#4,$,$,$,#11209,#11212);
+#11219= IFCPRESENTATIONSTYLEASSIGNMENT((#11201));
+#11221= IFCSTYLEDITEM(#11203,(#11219),$);
+#11225= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'cec2259e-ba67-11e3-bf5f-7446a0b2bba9--569'),$);
+#11226= IFCPROPERTYSET('3kR6uGpbD4mgbNazF3HjEP',#4,'Allplan Attributes',
+$,(#11225));
+#11228= IFCRELDEFINESBYPROPERTIES('37MEEdw7HFF9hszTJDlUBy',#4,$,$,(
+#11215),#11226);
+#11232= IFCTEXTSTYLEFORDEFINEDFONT(#11233,$);
+#11233= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#11234= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.6));
+#11235= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(250.));
+#11237= IFCTEXTSTYLE($,#11232,#11234,#11235);
+#11238= IFCTEXTLITERAL('Stosseisen',#11241,.LEFT.);
+#11239= IFCDIRECTION((6.123233995736766E-17,1.));
+#11241= IFCAXIS2PLACEMENT2D(#11242,#11239);
+#11242= IFCCARTESIANPOINT((78306.79114055212,5889.799055269293));
+#11244= IFCLOCALPLACEMENT($,#1);
+#11245= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#11238)
+);
+#11247= IFCPRODUCTDEFINITIONSHAPE($,$,(#11245));
+#11250= IFCANNOTATION('2TiKi_O2TE7BEZGGAj9XCt',#4,$,$,$,#11244,#11247);
+#11254= IFCPRESENTATIONSTYLEASSIGNMENT((#11237));
+#11256= IFCSTYLEDITEM(#11238,(#11254),$);
+#11260= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'cec2259e-ba67-11e3-bf5f-7446a0b2bba9--18051824'),$);
+#11261= IFCPROPERTYSET('2OH72bSRn8VRuU9rgd5NVh',#4,'Allplan Attributes',
+$,(#11260));
+#11263= IFCRELDEFINESBYPROPERTIES('1m1sPbK352mfQQ6dGoWN_M',#4,$,$,(
+#11250),#11261);
+#11267= IFCTEXTSTYLEFORDEFINEDFONT(#11268,$);
+#11268= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#11269= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#11270= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#11272= IFCTEXTSTYLE($,#11267,#11269,#11270);
+#11273= IFCTEXTLITERAL('Grundriss  1:50',#11276,.LEFT.);
+#11274= IFCDIRECTION((1.,0.));
+#11276= IFCAXIS2PLACEMENT2D(#11277,#11274);
+#11277= IFCCARTESIANPOINT((90241.51411137544,30369.03269149964));
+#11279= IFCLOCALPLACEMENT($,#1);
+#11280= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#11273)
+);
+#11282= IFCPRODUCTDEFINITIONSHAPE($,$,(#11280));
+#11285= IFCANNOTATION('2NJlR8AqD478wD0B95hbVK',#4,$,$,$,#11279,#11282);
+#11289= IFCPRESENTATIONSTYLEASSIGNMENT((#11272));
+#11291= IFCSTYLEDITEM(#11273,(#11289),$);
+#11295= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'cec2259e-ba67-11e3-bf5f-7446a0b2bba9--562'),$);
+#11296= IFCPROPERTYSET('1RsxUsbf1BKhgD8qyUGPtN',#4,'Allplan Attributes',
+$,(#11295));
+#11298= IFCRELDEFINESBYPROPERTIES('3yipR3pZXCXQ2U3ZyW3neX',#4,$,$,(
+#11285),#11296);
+#11302= IFCTEXTSTYLEFORDEFINEDFONT(#11303,$);
+#11303= IFCCOLOURRGB($,0.4392156862745098,0.4392156862745098,1.);
+#11304= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.5));
+#11305= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(250.));
+#11307= IFCTEXTSTYLE($,#11302,#11304,#11305);
+#11308= IFCPLANAREXTENT(4979.166666666672,312.5);
+#11309= IFCTEXTLITERALWITHEXTENT(
+'unter Fundamente mit Sickerbeton 32/45mm CEM 200 kg/m\X2\00B3\X0\\X\0Aoder Magerbeton CEM 200 kg/m\X2\00B3\X0\ bis auf Kiesschicht fundieren !'
+,#11312,.LEFT.,#11308,'top-left');
+#11310= IFCDIRECTION((1.,0.));
+#11312= IFCAXIS2PLACEMENT2D(#11313,#11310);
+#11313= IFCCARTESIANPOINT((79040.90503321811,12115.36635853764));
+#11315= IFCLOCALPLACEMENT($,#1);
+#11316= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#11309)
+);
+#11318= IFCPRODUCTDEFINITIONSHAPE($,$,(#11316));
+#11321= IFCANNOTATION('2TMqj8w8zDxxouLJh5f4Mb',#4,$,$,$,#11315,#11318);
+#11325= IFCPRESENTATIONSTYLEASSIGNMENT((#11307));
+#11327= IFCSTYLEDITEM(#11309,(#11325),$);
+#11331= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'cec2259e-ba67-11e3-bf5f-7446a0b2bba9--530'),$);
+#11332= IFCPROPERTYSET('2bjmvxJynFZBijXCnRRoXs',#4,'Allplan Attributes',
+$,(#11331));
+#11334= IFCRELDEFINESBYPROPERTIES('2qnvMipU5DXxc6a3YfIp$1',#4,$,$,(
+#11321),#11332);
+#11338= IFCAXIS2PLACEMENT3D(#11339,#11341,#11343);
+#11339= IFCCARTESIANPOINT((29905.,24120.,0.));
+#11341= IFCDIRECTION((0.,0.,1.));
+#11343= IFCDIRECTION((0.,-1.,0.));
+#11345= IFCLOCALPLACEMENT(#71,#11338);
+#11346= IFCPRODUCTDEFINITIONSHAPE($,$,(#11348,#11358));
+#11348= IFCSHAPEREPRESENTATION(#36,'Axis','Curve2D',(#11351));
+#11351= IFCPOLYLINE((#11353,#11355));
+#11353= IFCCARTESIANPOINT((0.,0.));
+#11355= IFCCARTESIANPOINT((2100.,0.));
+#11358= IFCSHAPEREPRESENTATION(#34,'Body','SweptSolid',(#11360));
+#11360= IFCEXTRUDEDAREASOLID(#11361,#11371,#11374,740.);
+#11361= IFCRECTANGLEPROFILEDEF(.AREA.,$,#11364,2100.,250.);
+#11362= IFCDIRECTION((1.,0.));
+#11364= IFCAXIS2PLACEMENT2D(#11365,#11362);
+#11365= IFCCARTESIANPOINT((1050.,125.));
+#11367= IFCDIRECTION((1.,0.,0.));
+#11369= IFCDIRECTION((0.,0.,1.));
+#11371= IFCAXIS2PLACEMENT3D(#11372,#11369,#11367);
+#11372= IFCCARTESIANPOINT((0.,0.,0.));
+#11374= IFCDIRECTION((0.,0.,1.));
+#11377= IFCCURVESTYLE($,#11381,IFCPOSITIVELENGTHMEASURE(50.),#11382);
+#11378= IFCCURVESTYLEFONT($,(#11380));
+#11380= IFCCURVESTYLEFONTPATTERN(0.2,1.);
+#11381= IFCCURVESTYLEFONTANDSCALING($,#11378,100.);
+#11382= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#11383= IFCPRESENTATIONLAYERWITHSTYLE('Wand Beton bewehrt',$,(#11348,
+#11358,#11398,#11459,#11468,#11498,#11559,#11568,#11598,#11659,#11668,
+#11698),'BE_B_BEWEH',.T.,.U.,.F.,(#11377));
+#11388= IFCRELASSOCIATESMATERIAL('2iLlOaZBHDwPnO82fpTJY7',#4,$,$,(#11409
+),#11407);
+#11389= IFCMATERIALLAYERSET((#11392),$);
+#11391= IFCMATERIAL('Beton');
+#11392= IFCMATERIALLAYER(#11391,250.,$);
+#11395= IFCCURVESTYLE($,$,IFCDESCRIPTIVEMEASURE('by layer'),$);
+#11396= IFCPRESENTATIONSTYLEASSIGNMENT((#11395,#5733));
+#11398= IFCSTYLEDITEM($,(#11396),$);
+#11400= IFCSTYLEDREPRESENTATION(#39,$,$,(#11398));
+#11403= IFCMATERIALDEFINITIONREPRESENTATION($,$,(#11400),#11391);
+#11407= IFCMATERIALLAYERSETUSAGE(#11389,.AXIS2.,.POSITIVE.,-0.);
+#11409= IFCWALLSTANDARDCASE('3TMwTHCrD89Pm9hkMuLJBP',#4,' ',$,$,#11345,
+#11346,$);
+#11413= IFCQUANTITYVOLUME('GrossVolume',$,#31,0.3885);
+#11414= IFCQUANTITYVOLUME('NetVolume',$,#31,0.3885);
+#11415= IFCQUANTITYAREA('GrossSideArea',$,#30,1.554);
+#11416= IFCQUANTITYAREA('NetSideArea',$,#30,1.554);
+#11417= IFCQUANTITYLENGTH('NominalLength',$,#24,2.1);
+#11418= IFCQUANTITYLENGTH('NominalWidth',$,#24,0.25);
+#11419= IFCQUANTITYAREA('GrossFootprintArea',$,#30,0.5249999999999995);
+#11420= IFCQUANTITYLENGTH('NominalHeight',$,#24,0.74);
+#11421= IFCELEMENTQUANTITY('1_YH6SlBb99ON719tTu9VR',#4,'WallQuantities',
+$,$,(#11413,#11414,#11415,#11416,#11417,#11418,#11419,#11420));
+#11423= IFCRELDEFINESBYPROPERTIES('2mc12LJeH4_PQfNrxSLLtZ',#4,$,$,(
+#11409),#11421);
+#11427= IFCPROPERTYSINGLEVALUE('Einheit',$,IFCDESCRIPTIVEMEASURE('St'),$
+);
+#11428= IFCPROPERTYSINGLEVALUE('Objektname',$,IFCDESCRIPTIVEMEASURE(
+'Mehrsch-Wand'),$);
+#11429= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'64b37d44-97bb-11e3-81b4-7446a0b2bbe5--2'),$);
+#11430= IFCPROPERTYSINGLEVALUE('Ifc ID',$,IFCDESCRIPTIVEMEASURE(
+'3TMwTHCrD89Pm9hkMuLJBP'),$);
+#11431= IFCPROPERTYSINGLEVALUE('Einheit',$,IFCDESCRIPTIVEMEASURE(
+'m\X2\00B3\X0\'),$);
+#11432= IFCPROPERTYSINGLEVALUE('Gewerk',$,IFCDESCRIPTIVEMEASURE(
+'Betonarbeiten'),$);
+#11433= IFCPROPERTYSINGLEVALUE('Objektname',$,IFCDESCRIPTIVEMEASURE(
+'Wand'),$);
+#11434= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'64b37d44-97bb-11e3-81b4-7446a0b2bbe5--3'),$);
+#11435= IFCCOMPLEXPROPERTY('Object Layer Attributes #1','Layer #1',
+'Layer #1',(#11431,#11432,#11433,#11434));
+#11441= IFCPROPERTYSET('3PdAiC47vCVfgEAk5fTrZK',#4,'Allplan Attributes',
+$,(#11427,#11428,#11429,#11430,#11435));
+#11443= IFCRELDEFINESBYPROPERTIES('2Le0x6tTjEFxhNHQuftQic',#4,$,$,(
+#11409),#11441);
+#11446= IFCSTYLEDITEM(#11360,(#11396),$);
+#11449= IFCAXIS2PLACEMENT3D(#11450,#11452,#11454);
+#11450= IFCCARTESIANPOINT((30155.,22020.,0.));
+#11452= IFCDIRECTION((0.,0.,1.));
+#11454= IFCDIRECTION((1.,0.,0.));
+#11456= IFCLOCALPLACEMENT(#71,#11449);
+#11457= IFCPRODUCTDEFINITIONSHAPE($,$,(#11459,#11468));
+#11459= IFCSHAPEREPRESENTATION(#36,'Axis','Curve2D',(#11461));
+#11461= IFCPOLYLINE((#11463,#11465));
+#11463= IFCCARTESIANPOINT((0.,0.));
+#11465= IFCCARTESIANPOINT((2000.000000000004,0.));
+#11468= IFCSHAPEREPRESENTATION(#34,'Body','SweptSolid',(#11470));
+#11470= IFCEXTRUDEDAREASOLID(#11471,#11481,#11484,740.);
+#11471= IFCRECTANGLEPROFILEDEF(.AREA.,$,#11474,2000.000000000004,250.);
+#11472= IFCDIRECTION((1.,0.));
+#11474= IFCAXIS2PLACEMENT2D(#11475,#11472);
+#11475= IFCCARTESIANPOINT((1000.000000000002,125.));
+#11477= IFCDIRECTION((1.,0.,0.));
+#11479= IFCDIRECTION((0.,0.,1.));
+#11481= IFCAXIS2PLACEMENT3D(#11482,#11479,#11477);
+#11482= IFCCARTESIANPOINT((0.,0.,0.));
+#11484= IFCDIRECTION((0.,0.,1.));
+#11489= IFCRELASSOCIATESMATERIAL('3x2FNXbOHCpwRZxpK5GxP5',#4,$,$,(#11509
+),#11507);
+#11490= IFCMATERIALLAYERSET((#11493),$);
+#11492= IFCMATERIAL('Beton');
+#11493= IFCMATERIALLAYER(#11492,250.,$);
+#11495= IFCCURVESTYLE($,$,IFCDESCRIPTIVEMEASURE('by layer'),$);
+#11496= IFCPRESENTATIONSTYLEASSIGNMENT((#11495,#5733));
+#11498= IFCSTYLEDITEM($,(#11496),$);
+#11500= IFCSTYLEDREPRESENTATION(#39,$,$,(#11498));
+#11503= IFCMATERIALDEFINITIONREPRESENTATION($,$,(#11500),#11492);
+#11507= IFCMATERIALLAYERSETUSAGE(#11490,.AXIS2.,.POSITIVE.,-0.);
+#11509= IFCWALLSTANDARDCASE('2ZJVRJP9DD6h6sU085rSrl',#4,' ',$,$,#11456,
+#11457,$);
+#11513= IFCQUANTITYVOLUME('GrossVolume',$,#31,0.3700000000000007);
+#11514= IFCQUANTITYVOLUME('NetVolume',$,#31,0.3700000000000007);
+#11515= IFCQUANTITYAREA('GrossSideArea',$,#30,1.480000000000003);
+#11516= IFCQUANTITYAREA('NetSideArea',$,#30,1.48);
+#11517= IFCQUANTITYLENGTH('NominalLength',$,#24,2.);
+#11518= IFCQUANTITYLENGTH('NominalWidth',$,#24,0.25);
+#11519= IFCQUANTITYAREA('GrossFootprintArea',$,#30,0.5000000000000071);
+#11520= IFCQUANTITYLENGTH('NominalHeight',$,#24,0.74);
+#11521= IFCELEMENTQUANTITY('0P$I77uJD6K8U33VxGugpT',#4,'WallQuantities',
+$,$,(#11513,#11514,#11515,#11516,#11517,#11518,#11519,#11520));
+#11523= IFCRELDEFINESBYPROPERTIES('2wCoYxLZ9CPeQ6u93M0Ni9',#4,$,$,(
+#11509),#11521);
+#11527= IFCPROPERTYSINGLEVALUE('Einheit',$,IFCDESCRIPTIVEMEASURE('St'),$
+);
+#11528= IFCPROPERTYSINGLEVALUE('Objektname',$,IFCDESCRIPTIVEMEASURE(
+'Mehrsch-Wand'),$);
+#11529= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'64b37d44-97bb-11e3-81b4-7446a0b2bbe5--7'),$);
+#11530= IFCPROPERTYSINGLEVALUE('Ifc ID',$,IFCDESCRIPTIVEMEASURE(
+'2ZJVRJP9DD6h6sU085rSrl'),$);
+#11531= IFCPROPERTYSINGLEVALUE('Einheit',$,IFCDESCRIPTIVEMEASURE(
+'m\X2\00B3\X0\'),$);
+#11532= IFCPROPERTYSINGLEVALUE('Gewerk',$,IFCDESCRIPTIVEMEASURE(
+'Betonarbeiten'),$);
+#11533= IFCPROPERTYSINGLEVALUE('Objektname',$,IFCDESCRIPTIVEMEASURE(
+'Wand'),$);
+#11534= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'64b37d44-97bb-11e3-81b4-7446a0b2bbe5--8'),$);
+#11535= IFCCOMPLEXPROPERTY('Object Layer Attributes #1','Layer #1',
+'Layer #1',(#11531,#11532,#11533,#11534));
+#11541= IFCPROPERTYSET('2EulljO1j6Tu1cC_P0ha_c',#4,'Allplan Attributes',
+$,(#11527,#11528,#11529,#11530,#11535));
+#11543= IFCRELDEFINESBYPROPERTIES('2C11fSe1D14evYIm7QxaVS',#4,$,$,(
+#11509),#11541);
+#11546= IFCSTYLEDITEM(#11470,(#11496),$);
+#11549= IFCAXIS2PLACEMENT3D(#11550,#11552,#11554);
+#11550= IFCCARTESIANPOINT((32155.,22270.,0.));
+#11552= IFCDIRECTION((0.,0.,1.));
+#11554= IFCDIRECTION((0.,1.,0.));
+#11556= IFCLOCALPLACEMENT(#71,#11549);
+#11557= IFCPRODUCTDEFINITIONSHAPE($,$,(#11559,#11568));
+#11559= IFCSHAPEREPRESENTATION(#36,'Axis','Curve2D',(#11561));
+#11561= IFCPOLYLINE((#11563,#11565));
+#11563= IFCCARTESIANPOINT((0.,0.));
+#11565= IFCCARTESIANPOINT((1850.,0.));
+#11568= IFCSHAPEREPRESENTATION(#34,'Body','SweptSolid',(#11570));
+#11570= IFCEXTRUDEDAREASOLID(#11571,#11581,#11584,740.);
+#11571= IFCRECTANGLEPROFILEDEF(.AREA.,$,#11574,1850.,250.);
+#11572= IFCDIRECTION((1.,0.));
+#11574= IFCAXIS2PLACEMENT2D(#11575,#11572);
+#11575= IFCCARTESIANPOINT((925.,125.));
+#11577= IFCDIRECTION((1.,0.,0.));
+#11579= IFCDIRECTION((0.,0.,1.));
+#11581= IFCAXIS2PLACEMENT3D(#11582,#11579,#11577);
+#11582= IFCCARTESIANPOINT((0.,0.,0.));
+#11584= IFCDIRECTION((0.,0.,1.));
+#11589= IFCRELASSOCIATESMATERIAL('0AbHXS8uD42hAEKhGsjufC',#4,$,$,(#11609
+),#11607);
+#11590= IFCMATERIALLAYERSET((#11593),$);
+#11592= IFCMATERIAL('Beton');
+#11593= IFCMATERIALLAYER(#11592,250.,$);
+#11595= IFCCURVESTYLE($,$,IFCDESCRIPTIVEMEASURE('by layer'),$);
+#11596= IFCPRESENTATIONSTYLEASSIGNMENT((#11595,#5733));
+#11598= IFCSTYLEDITEM($,(#11596),$);
+#11600= IFCSTYLEDREPRESENTATION(#39,$,$,(#11598));
+#11603= IFCMATERIALDEFINITIONREPRESENTATION($,$,(#11600),#11592);
+#11607= IFCMATERIALLAYERSETUSAGE(#11590,.AXIS2.,.POSITIVE.,-0.);
+#11609= IFCWALLSTANDARDCASE('0IpPnq09j96Q0L_M1wQe$5',#4,' ',$,$,#11556,
+#11557,$);
+#11613= IFCQUANTITYVOLUME('GrossVolume',$,#31,0.3422499999999999);
+#11614= IFCQUANTITYVOLUME('NetVolume',$,#31,0.3422499999999999);
+#11615= IFCQUANTITYAREA('GrossSideArea',$,#30,1.369);
+#11616= IFCQUANTITYAREA('NetSideArea',$,#30,1.369);
+#11617= IFCQUANTITYLENGTH('NominalLength',$,#24,1.85);
+#11618= IFCQUANTITYLENGTH('NominalWidth',$,#24,0.25);
+#11619= IFCQUANTITYAREA('GrossFootprintArea',$,#30,0.4624999999999995);
+#11620= IFCQUANTITYLENGTH('NominalHeight',$,#24,0.74);
+#11621= IFCELEMENTQUANTITY('34HEYMSZb62huvWAb45DE6',#4,'WallQuantities',
+$,$,(#11613,#11614,#11615,#11616,#11617,#11618,#11619,#11620));
+#11623= IFCRELDEFINESBYPROPERTIES('17XRhamzL7nu4Wp6RcvmWg',#4,$,$,(
+#11609),#11621);
+#11627= IFCPROPERTYSINGLEVALUE('Einheit',$,IFCDESCRIPTIVEMEASURE('St'),$
+);
+#11628= IFCPROPERTYSINGLEVALUE('Objektname',$,IFCDESCRIPTIVEMEASURE(
+'Mehrsch-Wand'),$);
+#11629= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'64b37d44-97bb-11e3-81b4-7446a0b2bbe5--18'),$);
+#11630= IFCPROPERTYSINGLEVALUE('Ifc ID',$,IFCDESCRIPTIVEMEASURE(
+'0IpPnq09j96Q0L_M1wQe$5'),$);
+#11631= IFCPROPERTYSINGLEVALUE('Einheit',$,IFCDESCRIPTIVEMEASURE(
+'m\X2\00B3\X0\'),$);
+#11632= IFCPROPERTYSINGLEVALUE('Gewerk',$,IFCDESCRIPTIVEMEASURE(
+'Betonarbeiten'),$);
+#11633= IFCPROPERTYSINGLEVALUE('Objektname',$,IFCDESCRIPTIVEMEASURE(
+'Wand'),$);
+#11634= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'64b37d44-97bb-11e3-81b4-7446a0b2bbe5--19'),$);
+#11635= IFCCOMPLEXPROPERTY('Object Layer Attributes #1','Layer #1',
+'Layer #1',(#11631,#11632,#11633,#11634));
+#11641= IFCPROPERTYSET('2aTykbPfLBN9g2krsv4e95',#4,'Allplan Attributes',
+$,(#11627,#11628,#11629,#11630,#11635));
+#11643= IFCRELDEFINESBYPROPERTIES('3Hgg7f$QHA5gx2eyORNSdN',#4,$,$,(
+#11609),#11641);
+#11646= IFCSTYLEDITEM(#11570,(#11596),$);
+#11649= IFCAXIS2PLACEMENT3D(#11650,#11652,#11654);
+#11650= IFCCARTESIANPOINT((31905.,24120.,0.));
+#11652= IFCDIRECTION((0.,0.,1.));
+#11654= IFCDIRECTION((-1.,0.,0.));
+#11656= IFCLOCALPLACEMENT(#71,#11649);
+#11657= IFCPRODUCTDEFINITIONSHAPE($,$,(#11659,#11668));
+#11659= IFCSHAPEREPRESENTATION(#36,'Axis','Curve2D',(#11661));
+#11661= IFCPOLYLINE((#11663,#11665));
+#11663= IFCCARTESIANPOINT((0.,0.));
+#11665= IFCCARTESIANPOINT((1750.000000000004,0.));
+#11668= IFCSHAPEREPRESENTATION(#34,'Body','SweptSolid',(#11670));
+#11670= IFCEXTRUDEDAREASOLID(#11671,#11681,#11684,740.);
+#11671= IFCRECTANGLEPROFILEDEF(.AREA.,$,#11674,1750.000000000004,250.);
+#11672= IFCDIRECTION((1.,0.));
+#11674= IFCAXIS2PLACEMENT2D(#11675,#11672);
+#11675= IFCCARTESIANPOINT((875.0000000000018,125.));
+#11677= IFCDIRECTION((1.,0.,0.));
+#11679= IFCDIRECTION((0.,0.,1.));
+#11681= IFCAXIS2PLACEMENT3D(#11682,#11679,#11677);
+#11682= IFCCARTESIANPOINT((0.,0.,0.));
+#11684= IFCDIRECTION((0.,0.,1.));
+#11689= IFCRELASSOCIATESMATERIAL('2e1kHFUvnEMxmyMEzvMylE',#4,$,$,(#11709
+),#11707);
+#11690= IFCMATERIALLAYERSET((#11693),$);
+#11692= IFCMATERIAL('Beton');
+#11693= IFCMATERIALLAYER(#11692,250.,$);
+#11695= IFCCURVESTYLE($,$,IFCDESCRIPTIVEMEASURE('by layer'),$);
+#11696= IFCPRESENTATIONSTYLEASSIGNMENT((#11695,#5733));
+#11698= IFCSTYLEDITEM($,(#11696),$);
+#11700= IFCSTYLEDREPRESENTATION(#39,$,$,(#11698));
+#11703= IFCMATERIALDEFINITIONREPRESENTATION($,$,(#11700),#11692);
+#11707= IFCMATERIALLAYERSETUSAGE(#11690,.AXIS2.,.POSITIVE.,-0.);
+#11709= IFCWALLSTANDARDCASE('2mIMrjXEvAaAp$6Mci7Djc',#4,' ',$,$,#11656,
+#11657,$);
+#11713= IFCQUANTITYVOLUME('GrossVolume',$,#31,0.3237500000000007);
+#11714= IFCQUANTITYVOLUME('NetVolume',$,#31,0.3237500000000007);
+#11715= IFCQUANTITYAREA('GrossSideArea',$,#30,1.295000000000003);
+#11716= IFCQUANTITYAREA('NetSideArea',$,#30,1.295);
+#11717= IFCQUANTITYLENGTH('NominalLength',$,#24,1.75);
+#11718= IFCQUANTITYLENGTH('NominalWidth',$,#24,0.25);
+#11719= IFCQUANTITYAREA('GrossFootprintArea',$,#30,0.4375);
+#11720= IFCQUANTITYLENGTH('NominalHeight',$,#24,0.74);
+#11721= IFCELEMENTQUANTITY('1u9pv8kIX1F9NCVbkFkdVU',#4,'WallQuantities',
+$,$,(#11713,#11714,#11715,#11716,#11717,#11718,#11719,#11720));
+#11723= IFCRELDEFINESBYPROPERTIES('3YNtVNTSD8BfsTdNhWDrTY',#4,$,$,(
+#11709),#11721);
+#11727= IFCPROPERTYSINGLEVALUE('Einheit',$,IFCDESCRIPTIVEMEASURE('St'),$
+);
+#11728= IFCPROPERTYSINGLEVALUE('Objektname',$,IFCDESCRIPTIVEMEASURE(
+'Mehrsch-Wand'),$);
+#11729= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'64b37d44-97bb-11e3-81b4-7446a0b2bbe5--29'),$);
+#11730= IFCPROPERTYSINGLEVALUE('Ifc ID',$,IFCDESCRIPTIVEMEASURE(
+'2mIMrjXEvAaAp$6Mci7Djc'),$);
+#11731= IFCPROPERTYSINGLEVALUE('Einheit',$,IFCDESCRIPTIVEMEASURE(
+'m\X2\00B3\X0\'),$);
+#11732= IFCPROPERTYSINGLEVALUE('Gewerk',$,IFCDESCRIPTIVEMEASURE(
+'Betonarbeiten'),$);
+#11733= IFCPROPERTYSINGLEVALUE('Objektname',$,IFCDESCRIPTIVEMEASURE(
+'Wand'),$);
+#11734= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'64b37d44-97bb-11e3-81b4-7446a0b2bbe5--30'),$);
+#11735= IFCCOMPLEXPROPERTY('Object Layer Attributes #1','Layer #1',
+'Layer #1',(#11731,#11732,#11733,#11734));
+#11741= IFCPROPERTYSET('0rc9tDrlr7OOSv80kpSw7G',#4,'Allplan Attributes',
+$,(#11727,#11728,#11729,#11730,#11735));
+#11743= IFCRELDEFINESBYPROPERTIES('2_tBOvLXvCMuXAF2Uc97Lk',#4,$,$,(
+#11709),#11741);
+#11746= IFCSTYLEDITEM(#11670,(#11696),$);
+#11749= IFCTEXTSTYLEFORDEFINEDFONT(#11750,$);
+#11750= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#11751= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#11752= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(350.));
+#11754= IFCTEXTSTYLE($,#11749,#11751,#11752);
+#11755= IFCTEXTLITERAL('d = 25cm',#11758,.LEFT.);
+#11756= IFCDIRECTION((0.7310552682428758,0.6823182503600038));
+#11758= IFCAXIS2PLACEMENT2D(#11759,#11756);
+#11759= IFCCARTESIANPOINT((87738.90713147861,22755.42414823773));
+#11761= IFCLOCALPLACEMENT($,#1);
+#11762= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#11755)
+);
+#11764= IFCPRODUCTDEFINITIONSHAPE($,$,(#11762));
+#11767= IFCANNOTATION('3Y6_kYBkT2HvWUVLaNU1iL',#4,$,$,$,#11761,#11764);
+#11771= IFCPRESENTATIONSTYLEASSIGNMENT((#11754));
+#11773= IFCSTYLEDITEM(#11755,(#11771),$);
+#11777= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--8'),$);
+#11778= IFCPROPERTYSET('2WDb9hqTr3WwGaf3ZjgQov',#4,'Allplan Attributes',
+$,(#11777));
+#11780= IFCRELDEFINESBYPROPERTIES('0Mjvs1nxDE4Quq0jne6DS$',#4,$,$,(
+#11767),#11778);
+#11784= IFCTEXTSTYLEFORDEFINEDFONT(#11785,$);
+#11785= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#11786= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#11787= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#11789= IFCTEXTSTYLE($,#11784,#11786,#11787);
+#11790= IFCTEXTLITERAL('Absatz OK Boden 7cm',#11793,.LEFT.);
+#11791= IFCDIRECTION((1.,0.));
+#11793= IFCAXIS2PLACEMENT2D(#11794,#11791);
+#11794= IFCCARTESIANPOINT((75981.541562714,23740.00483059611));
+#11796= IFCLOCALPLACEMENT($,#1);
+#11797= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#11790)
+);
+#11799= IFCPRODUCTDEFINITIONSHAPE($,$,(#11797));
+#11802= IFCANNOTATION('394KbiYV9DhuVALFdkv9ZY',#4,$,$,$,#11796,#11799);
+#11806= IFCPRESENTATIONSTYLEASSIGNMENT((#11789));
+#11808= IFCSTYLEDITEM(#11790,(#11806),$);
+#11812= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--9'),$);
+#11813= IFCPROPERTYSET('1If2P_FRv7uAprwArpCbj3',#4,'Allplan Attributes',
+$,(#11812));
+#11815= IFCRELDEFINESBYPROPERTIES('13p5Zy9dL7ew6OxXOSkjfw',#4,$,$,(
+#11802),#11813);
+#11819= IFCTEXTSTYLEFORDEFINEDFONT(#11820,$);
+#11820= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#11821= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#11822= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#11824= IFCTEXTSTYLE($,#11819,#11821,#11822);
+#11825= IFCTEXTLITERAL('Absatz UK Boden 7cm',#11828,.LEFT.);
+#11826= IFCDIRECTION((1.,0.));
+#11828= IFCAXIS2PLACEMENT2D(#11829,#11826);
+#11829= IFCCARTESIANPOINT((75977.80217074958,24656.67149726277));
+#11831= IFCLOCALPLACEMENT($,#1);
+#11832= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#11825)
+);
+#11834= IFCPRODUCTDEFINITIONSHAPE($,$,(#11832));
+#11837= IFCANNOTATION('0XkE5b89PAK8J5SEvOjTy8',#4,$,$,$,#11831,#11834);
+#11841= IFCPRESENTATIONSTYLEASSIGNMENT((#11824));
+#11843= IFCSTYLEDITEM(#11825,(#11841),$);
+#11847= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--10'),$);
+#11848= IFCPROPERTYSET('0$ePVYGXXAOh01aKXvpMTE',#4,'Allplan Attributes',
+$,(#11847));
+#11850= IFCRELDEFINESBYPROPERTIES('27y2CkrR55NeaBAD9wIJL9',#4,$,$,(
+#11837),#11848);
+#11854= IFCTEXTSTYLEFORDEFINEDFONT(#11855,$);
+#11855= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#11856= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#11857= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#11859= IFCTEXTSTYLE($,#11854,#11856,#11857);
+#11860= IFCTEXTLITERAL('Absatz OK Boden 7cm',#11863,.LEFT.);
+#11861= IFCDIRECTION((6.123233995736766E-17,1.));
+#11863= IFCAXIS2PLACEMENT2D(#11864,#11861);
+#11864= IFCCARTESIANPOINT((79188.33333333333,22338.59690241592));
+#11866= IFCLOCALPLACEMENT($,#1);
+#11867= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#11860)
+);
+#11869= IFCPRODUCTDEFINITIONSHAPE($,$,(#11867));
+#11872= IFCANNOTATION('2AutykilL2LvFO$7lJJPl6',#4,$,$,$,#11866,#11869);
+#11876= IFCPRESENTATIONSTYLEASSIGNMENT((#11859));
+#11878= IFCSTYLEDITEM(#11860,(#11876),$);
+#11882= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--11'),$);
+#11883= IFCPROPERTYSET('0jfTbb1KX0ygWdRTTwzMD9',#4,'Allplan Attributes',
+$,(#11882));
+#11885= IFCRELDEFINESBYPROPERTIES('2Ri3AygiHBiu2r7rY5g3rA',#4,$,$,(
+#11872),#11883);
+#11889= IFCTEXTSTYLEFORDEFINEDFONT(#11890,$);
+#11890= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#11891= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#11892= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#11894= IFCTEXTSTYLE($,#11889,#11891,#11892);
+#11895= IFCTEXTLITERAL('Absatz OK Boden 7cm',#11898,.LEFT.);
+#11896= IFCDIRECTION((1.,0.));
+#11898= IFCAXIS2PLACEMENT2D(#11899,#11896);
+#11899= IFCCARTESIANPOINT((79777.02674372181,22095.0048305961));
+#11901= IFCLOCALPLACEMENT($,#1);
+#11902= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#11895)
+);
+#11904= IFCPRODUCTDEFINITIONSHAPE($,$,(#11902));
+#11907= IFCANNOTATION('0GoNj4P_j6Xg9f5mf1A3da',#4,$,$,$,#11901,#11904);
+#11911= IFCPRESENTATIONSTYLEASSIGNMENT((#11894));
+#11913= IFCSTYLEDITEM(#11895,(#11911),$);
+#11917= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--12'),$);
+#11918= IFCPROPERTYSET('0OugEDzz94FeKZSsZQBll$',#4,'Allplan Attributes',
+$,(#11917));
+#11920= IFCRELDEFINESBYPROPERTIES('1NTLfgynz2DxJWnL6YfJHd',#4,$,$,(
+#11907),#11918);
+#11924= IFCTEXTSTYLEFORDEFINEDFONT(#11925,$);
+#11925= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#11926= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#11927= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#11929= IFCTEXTSTYLE($,#11924,#11926,#11927);
+#11930= IFCTEXTLITERAL('Absatz OK Boden 7cm',#11933,.LEFT.);
+#11931= IFCDIRECTION((6.123233995736766E-17,1.));
+#11933= IFCAXIS2PLACEMENT2D(#11934,#11931);
+#11934= IFCCARTESIANPOINT((82025.,22520.04762552151));
+#11936= IFCLOCALPLACEMENT($,#1);
+#11937= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#11930)
+);
+#11939= IFCPRODUCTDEFINITIONSHAPE($,$,(#11937));
+#11942= IFCANNOTATION('2paXutnyz5qvgTC3w1tVUQ',#4,$,$,$,#11936,#11939);
+#11946= IFCPRESENTATIONSTYLEASSIGNMENT((#11929));
+#11948= IFCSTYLEDITEM(#11930,(#11946),$);
+#11952= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--13'),$);
+#11953= IFCPROPERTYSET('1nA84lG5DAvBFRHDIIW2Yk',#4,'Allplan Attributes',
+$,(#11952));
+#11955= IFCRELDEFINESBYPROPERTIES('2scikAPCT76POnQgG9e09J',#4,$,$,(
+#11942),#11953);
+#11959= IFCTEXTSTYLEFORDEFINEDFONT(#11960,$);
+#11960= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#11961= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#11962= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#11964= IFCTEXTSTYLE($,#11959,#11961,#11962);
+#11965= IFCTEXTLITERAL('Absatz OK Boden 7cm',#11968,.LEFT.);
+#11966= IFCDIRECTION((1.,0.));
+#11968= IFCAXIS2PLACEMENT2D(#11969,#11966);
+#11969= IFCCARTESIANPOINT((82528.94870789858,23990.0048305961));
+#11971= IFCLOCALPLACEMENT($,#1);
+#11972= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#11965)
+);
+#11974= IFCPRODUCTDEFINITIONSHAPE($,$,(#11972));
+#11977= IFCANNOTATION('0el_aHqZLA9OvHwAu38n5b',#4,$,$,$,#11971,#11974);
+#11981= IFCPRESENTATIONSTYLEASSIGNMENT((#11964));
+#11983= IFCSTYLEDITEM(#11965,(#11981),$);
+#11987= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--14'),$);
+#11988= IFCPROPERTYSET('3ebS4dBsT0JuM9MDNeJexX',#4,'Allplan Attributes',
+$,(#11987));
+#11990= IFCRELDEFINESBYPROPERTIES('2S8Z2cvQbAPQTmy3xHNnR8',#4,$,$,(
+#11977),#11988);
+#11994= IFCTEXTSTYLEFORDEFINEDFONT(#11995,$);
+#11995= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#11996= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#11997= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#11999= IFCTEXTSTYLE($,#11994,#11996,#11997);
+#12000= IFCTEXTLITERAL('Absatz OK Boden 7cm',#12003,.LEFT.);
+#12001= IFCDIRECTION((1.,0.));
+#12003= IFCAXIS2PLACEMENT2D(#12004,#12001);
+#12004= IFCCARTESIANPOINT((85062.27633487518,23740.0048305961));
+#12006= IFCLOCALPLACEMENT($,#1);
+#12007= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#12000)
+);
+#12009= IFCPRODUCTDEFINITIONSHAPE($,$,(#12007));
+#12012= IFCANNOTATION('0aTnVxNCH5jPNfEpnKmyfW',#4,$,$,$,#12006,#12009);
+#12016= IFCPRESENTATIONSTYLEASSIGNMENT((#11999));
+#12018= IFCSTYLEDITEM(#12000,(#12016),$);
+#12022= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--15'),$);
+#12023= IFCPROPERTYSET('0WPcQwG218wgpB$XIeRaKw',#4,'Allplan Attributes',
+$,(#12022));
+#12025= IFCRELDEFINESBYPROPERTIES('3uPQOxaybFSPxdZbF15shT',#4,$,$,(
+#12012),#12023);
+#12029= IFCTEXTSTYLEFORDEFINEDFONT(#12030,$);
+#12030= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#12031= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#12032= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#12034= IFCTEXTSTYLE($,#12029,#12031,#12032);
+#12035= IFCTEXTLITERAL('Absatz UK Boden 7cm',#12038,.LEFT.);
+#12036= IFCDIRECTION((1.,0.));
+#12038= IFCAXIS2PLACEMENT2D(#12039,#12036);
+#12039= IFCCARTESIANPOINT((87412.56598371331,24656.67149726277));
+#12041= IFCLOCALPLACEMENT($,#1);
+#12042= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#12035)
+);
+#12044= IFCPRODUCTDEFINITIONSHAPE($,$,(#12042));
+#12047= IFCANNOTATION('09q5REqaLFOgxIJhv0olCv',#4,$,$,$,#12041,#12044);
+#12051= IFCPRESENTATIONSTYLEASSIGNMENT((#12034));
+#12053= IFCSTYLEDITEM(#12035,(#12051),$);
+#12057= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--16'),$);
+#12058= IFCPROPERTYSET('0a3trd$f11GxrPSWFcZvQK',#4,'Allplan Attributes',
+$,(#12057));
+#12060= IFCRELDEFINESBYPROPERTIES('0ul9YrVPnEku6UO36cMtEy',#4,$,$,(
+#12047),#12058);
+#12064= IFCTEXTSTYLEFORDEFINEDFONT(#12065,$);
+#12065= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#12066= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#12067= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#12069= IFCTEXTSTYLE($,#12064,#12066,#12067);
+#12070= IFCTEXTLITERAL('Absatz OK Boden 7cm',#12073,.LEFT.);
+#12071= IFCDIRECTION((1.,0.));
+#12073= IFCAXIS2PLACEMENT2D(#12074,#12071);
+#12074= IFCCARTESIANPOINT((90006.89477922957,23740.0048305961));
+#12076= IFCLOCALPLACEMENT($,#1);
+#12077= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#12070)
+);
+#12079= IFCPRODUCTDEFINITIONSHAPE($,$,(#12077));
+#12082= IFCANNOTATION('3$KMI7bZ50efsOY_iAmgO4',#4,$,$,$,#12076,#12079);
+#12086= IFCPRESENTATIONSTYLEASSIGNMENT((#12069));
+#12088= IFCSTYLEDITEM(#12070,(#12086),$);
+#12092= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--17'),$);
+#12093= IFCPROPERTYSET('0ssSgkMlj5ywMHRuxtOPFA',#4,'Allplan Attributes',
+$,(#12092));
+#12095= IFCRELDEFINESBYPROPERTIES('3ofw$Y4GzCDPmz288Bq8E3',#4,$,$,(
+#12082),#12093);
+#12099= IFCTEXTSTYLEFORDEFINEDFONT(#12100,$);
+#12100= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#12101= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.4));
+#12102= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#12104= IFCTEXTSTYLE($,#12099,#12101,#12102);
+#12105= IFCPLANAREXTENT(1940.,240.);
+#12106= IFCTEXTLITERALWITHEXTENT(
+'Fund. d=30cm, UK= -0.90\X\0A+ 5cm Magerbeton (UK= -0.95)',#12109,.LEFT.
+,#12105,'top-left');
+#12107= IFCDIRECTION((1.,0.));
+#12109= IFCAXIS2PLACEMENT2D(#12110,#12107);
+#12110= IFCCARTESIANPOINT((69475.,8050.004830596101));
+#12112= IFCLOCALPLACEMENT($,#1);
+#12113= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#12106)
+);
+#12115= IFCPRODUCTDEFINITIONSHAPE($,$,(#12113));
+#12118= IFCANNOTATION('0Ngh4p4DbCs9YGzgwPHLMC',#4,$,$,$,#12112,#12115);
+#12122= IFCPRESENTATIONSTYLEASSIGNMENT((#12104));
+#12124= IFCSTYLEDITEM(#12106,(#12122),$);
+#12128= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--18'),$);
+#12129= IFCPROPERTYSET('0R4vEJh299uPUQhbWgj1pC',#4,'Allplan Attributes',
+$,(#12128));
+#12131= IFCRELDEFINESBYPROPERTIES('1z6x$OjkDAkgUw6o8rqdDI',#4,$,$,(
+#12118),#12129);
+#12135= IFCTEXTSTYLEFORDEFINEDFONT(#12136,$);
+#12136= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#12137= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.4));
+#12138= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#12140= IFCTEXTSTYLE($,#12135,#12137,#12138);
+#12141= IFCPLANAREXTENT(1940.,240.);
+#12142= IFCTEXTLITERALWITHEXTENT(
+'Fund. d=30cm, UK= -0.90\X\0A+ 5cm Magerbeton (UK= -0.95)',#12145,.LEFT.
+,#12141,'top-left');
+#12143= IFCDIRECTION((1.,0.));
+#12145= IFCAXIS2PLACEMENT2D(#12146,#12143);
+#12146= IFCCARTESIANPOINT((95155.00000000002,8050.004830596099));
+#12148= IFCLOCALPLACEMENT($,#1);
+#12149= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#12142)
+);
+#12151= IFCPRODUCTDEFINITIONSHAPE($,$,(#12149));
+#12154= IFCANNOTATION('2Nr33WiOPDPARlNXQBU_SL',#4,$,$,$,#12148,#12151);
+#12158= IFCPRESENTATIONSTYLEASSIGNMENT((#12140));
+#12160= IFCSTYLEDITEM(#12142,(#12158),$);
+#12164= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--19'),$);
+#12165= IFCPROPERTYSET('0NhEnJ0E10cOqb8WJLShnf',#4,'Allplan Attributes',
+$,(#12164));
+#12167= IFCRELDEFINESBYPROPERTIES('0YAeY7WVb06PrVxcfCD0MU',#4,$,$,(
+#12154),#12165);
+#12171= IFCTEXTSTYLEFORDEFINEDFONT(#12172,$);
+#12172= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#12173= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.4));
+#12174= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#12176= IFCTEXTSTYLE($,#12171,#12173,#12174);
+#12177= IFCPLANAREXTENT(1940.,240.);
+#12178= IFCTEXTLITERALWITHEXTENT(
+'Fund. d=30cm, UK= -0.90\X\0A+ 5cm Magerbeton (UK= -0.95)',#12181,.LEFT.
+,#12177,'top-left');
+#12179= IFCDIRECTION((6.123233995736766E-17,1.));
+#12181= IFCAXIS2PLACEMENT2D(#12182,#12179);
+#12182= IFCCARTESIANPOINT((102125.,10580.0048305961));
+#12184= IFCLOCALPLACEMENT($,#1);
+#12185= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#12178)
+);
+#12187= IFCPRODUCTDEFINITIONSHAPE($,$,(#12185));
+#12190= IFCANNOTATION('3kHwQWyE930PTc4mcC9wiI',#4,$,$,$,#12184,#12187);
+#12194= IFCPRESENTATIONSTYLEASSIGNMENT((#12176));
+#12196= IFCSTYLEDITEM(#12178,(#12194),$);
+#12200= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--20'),$);
+#12201= IFCPROPERTYSET('1uGCjQNhv3IxUF9gtVj9fz',#4,'Allplan Attributes',
+$,(#12200));
+#12203= IFCRELDEFINESBYPROPERTIES('1gswCPCbT3gv6oFRQocc08',#4,$,$,(
+#12190),#12201);
+#12207= IFCTEXTSTYLEFORDEFINEDFONT(#12208,$);
+#12208= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#12209= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.4));
+#12210= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#12212= IFCTEXTSTYLE($,#12207,#12209,#12210);
+#12213= IFCPLANAREXTENT(1940.,240.);
+#12214= IFCTEXTLITERALWITHEXTENT(
+'Fund. d=30cm, UK= -0.90\X\0A+ 5cm Magerbeton (UK= -0.95)',#12217,.LEFT.
+,#12213,'top-left');
+#12215= IFCDIRECTION((6.123233995736766E-17,1.));
+#12217= IFCAXIS2PLACEMENT2D(#12218,#12215);
+#12218= IFCCARTESIANPOINT((64198.33333333334,21420.0048305961));
+#12220= IFCLOCALPLACEMENT($,#1);
+#12221= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#12214)
+);
+#12223= IFCPRODUCTDEFINITIONSHAPE($,$,(#12221));
+#12226= IFCANNOTATION('1U61xFd8bF7BIZwFMx8Yot',#4,$,$,$,#12220,#12223);
+#12230= IFCPRESENTATIONSTYLEASSIGNMENT((#12212));
+#12232= IFCSTYLEDITEM(#12214,(#12230),$);
+#12236= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--21'),$);
+#12237= IFCPROPERTYSET('37X8XmxvTDyg5rNrifSsoz',#4,'Allplan Attributes',
+$,(#12236));
+#12239= IFCRELDEFINESBYPROPERTIES('1$N$R65Sz2CPVep4lLq8kP',#4,$,$,(
+#12226),#12237);
+#12243= IFCTEXTSTYLEFORDEFINEDFONT(#12244,$);
+#12244= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#12245= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.4));
+#12246= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#12248= IFCTEXTSTYLE($,#12243,#12245,#12246);
+#12249= IFCPLANAREXTENT(1940.,240.);
+#12250= IFCTEXTLITERALWITHEXTENT(
+'Fund. d=30cm, UK= -0.90\X\0A+ 5cm Magerbeton (UK= -0.95)',#12253,.LEFT.
+,#12249,'top-left');
+#12251= IFCDIRECTION((6.123233995736766E-17,1.));
+#12253= IFCAXIS2PLACEMENT2D(#12254,#12251);
+#12254= IFCCARTESIANPOINT((64198.33333333333,10580.0048305961));
+#12256= IFCLOCALPLACEMENT($,#1);
+#12257= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#12250)
+);
+#12259= IFCPRODUCTDEFINITIONSHAPE($,$,(#12257));
+#12262= IFCANNOTATION('0QQ$nY3Z51Ug0YjaWVfE71',#4,$,$,$,#12256,#12259);
+#12266= IFCPRESENTATIONSTYLEASSIGNMENT((#12248));
+#12268= IFCSTYLEDITEM(#12250,(#12266),$);
+#12272= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--22'),$);
+#12273= IFCPROPERTYSET('1weNy4QE59FBEmB2OfMYsd',#4,'Allplan Attributes',
+$,(#12272));
+#12275= IFCRELDEFINESBYPROPERTIES('2S5H050YzAcebtsNuzM$db',#4,$,$,(
+#12262),#12273);
+#12279= IFCTEXTSTYLEFORDEFINEDFONT(#12280,$);
+#12280= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#12281= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#12282= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#12284= IFCTEXTSTYLE($,#12279,#12281,#12282);
+#12285= IFCTEXTLITERAL('W1',#12288,.LEFT.);
+#12286= IFCDIRECTION((1.,0.));
+#12288= IFCAXIS2PLACEMENT2D(#12289,#12286);
+#12289= IFCCARTESIANPOINT((69220.30189202847,24391.04263252323));
+#12291= IFCLOCALPLACEMENT($,#1);
+#12292= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#12285)
+);
+#12294= IFCPRODUCTDEFINITIONSHAPE($,$,(#12292));
+#12297= IFCANNOTATION('0412e1GJb6$fC1vudZSa0x',#4,$,$,$,#12291,#12294);
+#12301= IFCPRESENTATIONSTYLEASSIGNMENT((#12284));
+#12303= IFCSTYLEDITEM(#12285,(#12301),$);
+#12307= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--41'),$);
+#12308= IFCPROPERTYSET('2S6JGQF6H47fLe5nBxVxD7',#4,'Allplan Attributes',
+$,(#12307));
+#12310= IFCRELDEFINESBYPROPERTIES('3HjHgOd055deoyCvdeLq_2',#4,$,$,(
+#12297),#12308);
+#12314= IFCTEXTSTYLEFORDEFINEDFONT(#12315,$);
+#12315= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#12316= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#12317= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#12319= IFCTEXTSTYLE($,#12314,#12316,#12317);
+#12320= IFCTEXTLITERAL('W1',#12323,.LEFT.);
+#12321= IFCDIRECTION((1.,0.));
+#12323= IFCAXIS2PLACEMENT2D(#12324,#12321);
+#12324= IFCCARTESIANPOINT((96673.30189202845,24391.04263252323));
+#12326= IFCLOCALPLACEMENT($,#1);
+#12327= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#12320)
+);
+#12329= IFCPRODUCTDEFINITIONSHAPE($,$,(#12327));
+#12332= IFCANNOTATION('1ZHnZFpej8cBpB9wyeLwYH',#4,$,$,$,#12326,#12329);
+#12336= IFCPRESENTATIONSTYLEASSIGNMENT((#12319));
+#12338= IFCSTYLEDITEM(#12320,(#12336),$);
+#12342= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--84'),$);
+#12343= IFCPROPERTYSET('3LtJ_ADRb9OBlcVbgh3Q41',#4,'Allplan Attributes',
+$,(#12342));
+#12345= IFCRELDEFINESBYPROPERTIES('0dOlj6iuv4y9iydbWLpv16',#4,$,$,(
+#12332),#12343);
+#12349= IFCTEXTSTYLEFORDEFINEDFONT(#12350,$);
+#12350= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#12351= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.4));
+#12352= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#12354= IFCTEXTSTYLE($,#12349,#12351,#12352);
+#12355= IFCPLANAREXTENT(1940.,240.);
+#12356= IFCTEXTLITERALWITHEXTENT(
+'Fund. d=30cm, UK= -0.90\X\0A+ 5cm Magerbeton (UK= -0.95)',#12359,.LEFT.
+,#12355,'top-left');
+#12357= IFCDIRECTION((6.123233995736766E-17,1.));
+#12359= IFCAXIS2PLACEMENT2D(#12360,#12357);
+#12360= IFCCARTESIANPOINT((102125.,20920.0048305961));
+#12362= IFCLOCALPLACEMENT($,#1);
+#12363= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#12356)
+);
+#12365= IFCPRODUCTDEFINITIONSHAPE($,$,(#12363));
+#12368= IFCANNOTATION('2wqy77aIT2TAW4h1$NwkSr',#4,$,$,$,#12362,#12365);
+#12372= IFCPRESENTATIONSTYLEASSIGNMENT((#12354));
+#12374= IFCSTYLEDITEM(#12356,(#12372),$);
+#12378= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--91'),$);
+#12379= IFCPROPERTYSET('2$6bsXxN514RFM0ABVOgPR',#4,'Allplan Attributes',
+$,(#12378));
+#12381= IFCRELDEFINESBYPROPERTIES('2_GfWISb1CGxUlxj4FNuzw',#4,$,$,(
+#12368),#12379);
+#12385= IFCTEXTSTYLEFORDEFINEDFONT(#12386,$);
+#12386= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#12387= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#12388= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#12390= IFCTEXTSTYLE($,#12385,#12387,#12388);
+#12391= IFCTEXTLITERAL('A',#12394,.LEFT.);
+#12392= IFCDIRECTION((1.,0.));
+#12394= IFCAXIS2PLACEMENT2D(#12395,#12392);
+#12395= IFCCARTESIANPOINT((85952.9040210247,23151.85649857375));
+#12397= IFCLOCALPLACEMENT($,#1);
+#12398= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#12391)
+);
+#12400= IFCPRODUCTDEFINITIONSHAPE($,$,(#12398));
+#12403= IFCANNOTATION('2uRYgH2PP5vgOBlbY$V7Bo',#4,$,$,$,#12397,#12400);
+#12407= IFCPRESENTATIONSTYLEASSIGNMENT((#12390));
+#12409= IFCSTYLEDITEM(#12391,(#12407),$);
+#12413= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--309'),$);
+#12414= IFCPROPERTYSET('0j328Lt9D51fgWq7HPJRKe',#4,'Allplan Attributes',
+$,(#12413));
+#12416= IFCRELDEFINESBYPROPERTIES('3WJv9vNjHEWgyaCJdIwGT7',#4,$,$,(
+#12403),#12414);
+#12420= IFCTEXTSTYLEFORDEFINEDFONT(#12421,$);
+#12421= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#12422= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#12423= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#12425= IFCTEXTSTYLE($,#12420,#12422,#12423);
+#12426= IFCTEXTLITERAL('A',#12429,.LEFT.);
+#12427= IFCDIRECTION((1.,0.));
+#12429= IFCAXIS2PLACEMENT2D(#12430,#12427);
+#12430= IFCCARTESIANPOINT((90153.76264563203,23151.85649857376));
+#12432= IFCLOCALPLACEMENT($,#1);
+#12433= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#12426)
+);
+#12435= IFCPRODUCTDEFINITIONSHAPE($,$,(#12433));
+#12438= IFCANNOTATION('1EakW2wOT9LxAnvLUV3hS0',#4,$,$,$,#12432,#12435);
+#12442= IFCPRESENTATIONSTYLEASSIGNMENT((#12425));
+#12444= IFCSTYLEDITEM(#12426,(#12442),$);
+#12448= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--321'),$);
+#12449= IFCPROPERTYSET('3vdYRLgLbCdRKzaf$HOOPG',#4,'Allplan Attributes',
+$,(#12448));
+#12451= IFCRELDEFINESBYPROPERTIES('0xWH5rURP4vQKf3BieLIZa',#4,$,$,(
+#12438),#12449);
+#12455= IFCTEXTSTYLEFORDEFINEDFONT(#12456,$);
+#12456= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#12457= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#12458= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(350.));
+#12460= IFCTEXTSTYLE($,#12455,#12457,#12458);
+#12461= IFCTEXTLITERAL('d = 25cm',#12464,.LEFT.);
+#12462= IFCDIRECTION((0.9808262151348187,0.1948844162684801));
+#12464= IFCAXIS2PLACEMENT2D(#12465,#12462);
+#12465= IFCCARTESIANPOINT((83632.23966450329,25811.54350744394));
+#12467= IFCLOCALPLACEMENT($,#1);
+#12468= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#12461)
+);
+#12470= IFCPRODUCTDEFINITIONSHAPE($,$,(#12468));
+#12473= IFCANNOTATION('2PekQ4twf9lPzpMr4yTpWt',#4,$,$,$,#12467,#12470);
+#12477= IFCPRESENTATIONSTYLEASSIGNMENT((#12460));
+#12479= IFCSTYLEDITEM(#12461,(#12477),$);
+#12483= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--346'),$);
+#12484= IFCPROPERTYSET('37SzLXCKbBBenhzMvPIJkG',#4,'Allplan Attributes',
+$,(#12483));
+#12486= IFCRELDEFINESBYPROPERTIES('05Va4Cn5L51w0Uud3kY8xy',#4,$,$,(
+#12473),#12484);
+#12490= IFCTEXTSTYLEFORDEFINEDFONT(#12491,$);
+#12491= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#12492= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.6));
+#12493= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(400.));
+#12495= IFCTEXTSTYLE($,#12490,#12492,#12493);
+#12496= IFCTEXTLITERAL('%RAInnenwand%RE',#12499,.LEFT.);
+#12497= IFCDIRECTION((1.,0.));
+#12499= IFCAXIS2PLACEMENT2D(#12500,#12497);
+#12500= IFCCARTESIANPOINT((81476.47748645773,19978.59922698939));
+#12502= IFCLOCALPLACEMENT($,#1);
+#12503= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#12496)
+);
+#12505= IFCPRODUCTDEFINITIONSHAPE($,$,(#12503));
+#12508= IFCANNOTATION('2XtmczqxT0ueK7VNFfYugW',#4,$,$,$,#12502,#12505);
+#12512= IFCPRESENTATIONSTYLEASSIGNMENT((#12495));
+#12514= IFCSTYLEDITEM(#12496,(#12512),$);
+#12518= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--359'),$);
+#12519= IFCPROPERTYSET('0UhC5YkC11ChwvdSV1ZDde',#4,'Allplan Attributes',
+$,(#12518));
+#12521= IFCRELDEFINESBYPROPERTIES('3hscT9eEr42wGVBKryBYbt',#4,$,$,(
+#12508),#12519);
+#12525= IFCTEXTSTYLEFORDEFINEDFONT(#12526,$);
+#12526= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#12527= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.6));
+#12528= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(400.));
+#12530= IFCTEXTSTYLE($,#12525,#12527,#12528);
+#12531= IFCTEXTLITERAL('%RAInnenwand%RE',#12534,.LEFT.);
+#12532= IFCDIRECTION((1.,0.));
+#12534= IFCAXIS2PLACEMENT2D(#12535,#12532);
+#12535= IFCCARTESIANPOINT((88786.08045759043,19978.59922698939));
+#12537= IFCLOCALPLACEMENT($,#1);
+#12538= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#12531)
+);
+#12540= IFCPRODUCTDEFINITIONSHAPE($,$,(#12538));
+#12543= IFCANNOTATION('3i2iqqSj96RuVgBlR8HB0a',#4,$,$,$,#12537,#12540);
+#12547= IFCPRESENTATIONSTYLEASSIGNMENT((#12530));
+#12549= IFCSTYLEDITEM(#12531,(#12547),$);
+#12553= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--360'),$);
+#12554= IFCPROPERTYSET('1NuEH$8zD19RXGULxh7FB_',#4,'Allplan Attributes',
+$,(#12553));
+#12556= IFCRELDEFINESBYPROPERTIES('1DmxgLO7f6Se_7wk$r1vfR',#4,$,$,(
+#12543),#12554);
+#12560= IFCTEXTSTYLEFORDEFINEDFONT(#12561,$);
+#12561= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#12562= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.6));
+#12563= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(400.));
+#12565= IFCTEXTSTYLE($,#12560,#12562,#12563);
+#12566= IFCTEXTLITERAL('%RAInnenwand%RE',#12569,.LEFT.);
+#12567= IFCDIRECTION((1.,0.));
+#12569= IFCAXIS2PLACEMENT2D(#12570,#12567);
+#12570= IFCCARTESIANPOINT((82643.04532805008,22606.98593803507));
+#12572= IFCLOCALPLACEMENT($,#1);
+#12573= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#12566)
+);
+#12575= IFCPRODUCTDEFINITIONSHAPE($,$,(#12573));
+#12578= IFCANNOTATION('0f39pz26L5lB2LTuuN6Yrs',#4,$,$,$,#12572,#12575);
+#12582= IFCPRESENTATIONSTYLEASSIGNMENT((#12565));
+#12584= IFCSTYLEDITEM(#12566,(#12582),$);
+#12588= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--361'),$);
+#12589= IFCPROPERTYSET('0rNxgY$vDFUuxBUPSbCHjS',#4,'Allplan Attributes',
+$,(#12588));
+#12591= IFCRELDEFINESBYPROPERTIES('1Kr0rs065CcfGFodlELCaH',#4,$,$,(
+#12578),#12589);
+#12595= IFCTEXTSTYLEFORDEFINEDFONT(#12596,$);
+#12596= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#12597= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.6));
+#12598= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(400.));
+#12600= IFCTEXTSTYLE($,#12595,#12597,#12598);
+#12601= IFCTEXTLITERAL('%RAInnenwand%RE',#12604,.LEFT.);
+#12602= IFCDIRECTION((6.123233995736766E-17,1.));
+#12604= IFCAXIS2PLACEMENT2D(#12605,#12602);
+#12605= IFCCARTESIANPOINT((78974.34906165909,20578.3982692631));
+#12607= IFCLOCALPLACEMENT($,#1);
+#12608= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#12601)
+);
+#12610= IFCPRODUCTDEFINITIONSHAPE($,$,(#12608));
+#12613= IFCANNOTATION('1CbTYkJIX2oQqetVgcR4QV',#4,$,$,$,#12607,#12610);
+#12617= IFCPRESENTATIONSTYLEASSIGNMENT((#12600));
+#12619= IFCSTYLEDITEM(#12601,(#12617),$);
+#12623= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--362'),$);
+#12624= IFCPROPERTYSET('1fVp9S4Ur1gBnPPbaeHEi$',#4,'Allplan Attributes',
+$,(#12623));
+#12626= IFCRELDEFINESBYPROPERTIES('0Zq5pdD3D1GRsorAruzBIX',#4,$,$,(
+#12613),#12624);
+#12630= IFCTEXTSTYLEFORDEFINEDFONT(#12631,$);
+#12631= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#12632= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#12633= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#12635= IFCTEXTSTYLE($,#12630,#12632,#12633);
+#12636= IFCTEXTLITERAL('C',#12639,.LEFT.);
+#12637= IFCDIRECTION((6.123233995736766E-17,1.));
+#12639= IFCAXIS2PLACEMENT2D(#12640,#12637);
+#12640= IFCCARTESIANPOINT((90860.31738068213,22977.90885162081));
+#12642= IFCLOCALPLACEMENT($,#1);
+#12643= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#12636)
+);
+#12645= IFCPRODUCTDEFINITIONSHAPE($,$,(#12643));
+#12648= IFCANNOTATION('04WMB$B8bCIBLfKnf$ez33',#4,$,$,$,#12642,#12645);
+#12652= IFCPRESENTATIONSTYLEASSIGNMENT((#12635));
+#12654= IFCSTYLEDITEM(#12636,(#12652),$);
+#12658= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--363'),$);
+#12659= IFCPROPERTYSET('0GV_dCW7z4tuAU9IpcdTfP',#4,'Allplan Attributes',
+$,(#12658));
+#12661= IFCRELDEFINESBYPROPERTIES('3xHC5dVG52GePHzcXJT5Ny',#4,$,$,(
+#12648),#12659);
+#12665= IFCTEXTSTYLEFORDEFINEDFONT(#12666,$);
+#12666= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#12667= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#12668= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#12670= IFCTEXTSTYLE($,#12665,#12667,#12668);
+#12671= IFCTEXTLITERAL('C',#12674,.LEFT.);
+#12672= IFCDIRECTION((6.123233995736766E-17,1.));
+#12674= IFCAXIS2PLACEMENT2D(#12675,#12672);
+#12675= IFCCARTESIANPOINT((90860.31738068222,25478.76747622812));
+#12677= IFCLOCALPLACEMENT($,#1);
+#12678= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#12671)
+);
+#12680= IFCPRODUCTDEFINITIONSHAPE($,$,(#12678));
+#12683= IFCANNOTATION('2yeS14EpfC$8xXpdMl9vxf',#4,$,$,$,#12677,#12680);
+#12687= IFCPRESENTATIONSTYLEASSIGNMENT((#12670));
+#12689= IFCSTYLEDITEM(#12671,(#12687),$);
+#12693= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--364'),$);
+#12694= IFCPROPERTYSET('2ZwTm0D2fF0uj2nuSNC_oj',#4,'Allplan Attributes',
+$,(#12693));
+#12696= IFCRELDEFINESBYPROPERTIES('3Iw6kfENb5$9yIQAAicsjt',#4,$,$,(
+#12683),#12694);
+#12700= IFCTEXTSTYLEFORDEFINEDFONT(#12701,$);
+#12701= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#12702= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#12703= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#12705= IFCTEXTSTYLE($,#12700,#12702,#12703);
+#12706= IFCTEXTLITERAL('C',#12709,.LEFT.);
+#12707= IFCDIRECTION((6.123233995736766E-17,1.));
+#12709= IFCAXIS2PLACEMENT2D(#12710,#12707);
+#12710= IFCCARTESIANPOINT((76753.57873560388,22977.90885162081));
+#12712= IFCLOCALPLACEMENT($,#1);
+#12713= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#12706)
+);
+#12715= IFCPRODUCTDEFINITIONSHAPE($,$,(#12713));
+#12718= IFCANNOTATION('00Pjy04YD9ygxHv4pPrZC5',#4,$,$,$,#12712,#12715);
+#12722= IFCPRESENTATIONSTYLEASSIGNMENT((#12705));
+#12724= IFCSTYLEDITEM(#12706,(#12722),$);
+#12728= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--365'),$);
+#12729= IFCPROPERTYSET('3bUrRwdmr0gwxC6xi3vsHX',#4,'Allplan Attributes',
+$,(#12728));
+#12731= IFCRELDEFINESBYPROPERTIES('19dL9kxevCzfKVC7FASS$L',#4,$,$,(
+#12718),#12729);
+#12735= IFCTEXTSTYLEFORDEFINEDFONT(#12736,$);
+#12736= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#12737= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#12738= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#12740= IFCTEXTSTYLE($,#12735,#12737,#12738);
+#12741= IFCTEXTLITERAL('C',#12744,.LEFT.);
+#12742= IFCDIRECTION((6.123233995736766E-17,1.));
+#12744= IFCAXIS2PLACEMENT2D(#12745,#12742);
+#12745= IFCCARTESIANPOINT((76753.57873560388,25478.76747622813));
+#12747= IFCLOCALPLACEMENT($,#1);
+#12748= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#12741)
+);
+#12750= IFCPRODUCTDEFINITIONSHAPE($,$,(#12748));
+#12753= IFCANNOTATION('3lK1j62D1079fkkOloJNKC',#4,$,$,$,#12747,#12750);
+#12757= IFCPRESENTATIONSTYLEASSIGNMENT((#12740));
+#12759= IFCSTYLEDITEM(#12741,(#12757),$);
+#12763= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--366'),$);
+#12764= IFCPROPERTYSET('1L$YZNWg9BkP0N7Rg9w_qb',#4,'Allplan Attributes',
+$,(#12763));
+#12766= IFCRELDEFINESBYPROPERTIES('1S_iB6zi15pObiMhF7V45E',#4,$,$,(
+#12753),#12764);
+#12770= IFCTEXTSTYLEFORDEFINEDFONT(#12771,$);
+#12771= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#12772= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#12773= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#12775= IFCTEXTSTYLE($,#12770,#12772,#12773);
+#12776= IFCTEXTLITERAL('D',#12779,.LEFT.);
+#12777= IFCDIRECTION((6.123233995736766E-17,1.));
+#12779= IFCAXIS2PLACEMENT2D(#12780,#12777);
+#12780= IFCCARTESIANPOINT((83296.74014217944,23227.9088516208));
+#12782= IFCLOCALPLACEMENT($,#1);
+#12783= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#12776)
+);
+#12785= IFCPRODUCTDEFINITIONSHAPE($,$,(#12783));
+#12788= IFCANNOTATION('1hKkNlj257f8gsfeecGtln',#4,$,$,$,#12782,#12785);
+#12792= IFCPRESENTATIONSTYLEASSIGNMENT((#12775));
+#12794= IFCSTYLEDITEM(#12776,(#12792),$);
+#12798= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--367'),$);
+#12799= IFCPROPERTYSET('3lLyCQdy1C9QbQeOZkta2i',#4,'Allplan Attributes',
+$,(#12798));
+#12801= IFCRELDEFINESBYPROPERTIES('1nPG$QBzX3NRRzJ5GNNjDe',#4,$,$,(
+#12788),#12799);
+#12805= IFCTEXTSTYLEFORDEFINEDFONT(#12806,$);
+#12806= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#12807= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#12808= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#12810= IFCTEXTSTYLE($,#12805,#12807,#12808);
+#12811= IFCTEXTLITERAL('D',#12814,.LEFT.);
+#12812= IFCDIRECTION((6.123233995736766E-17,1.));
+#12814= IFCAXIS2PLACEMENT2D(#12815,#12812);
+#12815= IFCCARTESIANPOINT((83296.74014217944,25478.76747622814));
+#12817= IFCLOCALPLACEMENT($,#1);
+#12818= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#12811)
+);
+#12820= IFCPRODUCTDEFINITIONSHAPE($,$,(#12818));
+#12823= IFCANNOTATION('0GO2kw$xvEuf7iVi97s7YY',#4,$,$,$,#12817,#12820);
+#12827= IFCPRESENTATIONSTYLEASSIGNMENT((#12810));
+#12829= IFCSTYLEDITEM(#12811,(#12827),$);
+#12833= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--368'),$);
+#12834= IFCPROPERTYSET('2QsfEm5u5EzugBPf4w6Zv7',#4,'Allplan Attributes',
+$,(#12833));
+#12836= IFCRELDEFINESBYPROPERTIES('3yYUyrB115xAYJNJ5FFmsV',#4,$,$,(
+#12823),#12834);
+#12840= IFCTEXTSTYLEFORDEFINEDFONT(#12841,$);
+#12841= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#12842= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#12843= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#12845= IFCTEXTSTYLE($,#12840,#12842,#12843);
+#12846= IFCTEXTLITERAL('E',#12849,.LEFT.);
+#12847= IFCDIRECTION((6.123233995736766E-17,1.));
+#12849= IFCAXIS2PLACEMENT2D(#12850,#12847);
+#12850= IFCCARTESIANPOINT((80468.05826830864,25478.76747622814));
+#12852= IFCLOCALPLACEMENT($,#1);
+#12853= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#12846)
+);
+#12855= IFCPRODUCTDEFINITIONSHAPE($,$,(#12853));
+#12858= IFCANNOTATION('1G2WGCLJ5E8PChUAGV8YtR',#4,$,$,$,#12852,#12855);
+#12862= IFCPRESENTATIONSTYLEASSIGNMENT((#12845));
+#12864= IFCSTYLEDITEM(#12846,(#12862),$);
+#12868= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--369'),$);
+#12869= IFCPROPERTYSET('0tMdDQdy1B8AAhJvqq4rT6',#4,'Allplan Attributes',
+$,(#12868));
+#12871= IFCRELDEFINESBYPROPERTIES('271qa1$Rf3QvfmMltn8ffp',#4,$,$,(
+#12858),#12869);
+#12875= IFCTEXTSTYLEFORDEFINEDFONT(#12876,$);
+#12876= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#12877= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#12878= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#12880= IFCTEXTSTYLE($,#12875,#12877,#12878);
+#12881= IFCTEXTLITERAL('E',#12884,.LEFT.);
+#12882= IFCDIRECTION((6.123233995736766E-17,1.));
+#12884= IFCAXIS2PLACEMENT2D(#12885,#12882);
+#12885= IFCCARTESIANPOINT((80468.05826830864,21332.9088516208));
+#12887= IFCLOCALPLACEMENT($,#1);
+#12888= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#12881)
+);
+#12890= IFCPRODUCTDEFINITIONSHAPE($,$,(#12888));
+#12893= IFCANNOTATION('35PXjsUdP1cuU5vftj9tMW',#4,$,$,$,#12887,#12890);
+#12897= IFCPRESENTATIONSTYLEASSIGNMENT((#12880));
+#12899= IFCSTYLEDITEM(#12881,(#12897),$);
+#12903= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--370'),$);
+#12904= IFCPROPERTYSET('1TXkYv4Cr6LAlyEYzCF5qG',#4,'Allplan Attributes',
+$,(#12903));
+#12906= IFCRELDEFINESBYPROPERTIES('1zE8bH8M1B7B5LNopZi$dF',#4,$,$,(
+#12893),#12904);
+#12910= IFCTEXTSTYLEFORDEFINEDFONT(#12911,$);
+#12911= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#12912= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#12913= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#12915= IFCTEXTSTYLE($,#12910,#12912,#12913);
+#12916= IFCTEXTLITERAL('F',#12919,.LEFT.);
+#12917= IFCDIRECTION((1.,0.));
+#12919= IFCAXIS2PLACEMENT2D(#12920,#12917);
+#12920= IFCCARTESIANPOINT((78332.9040210247,23164.44656228746));
+#12922= IFCLOCALPLACEMENT($,#1);
+#12923= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#12916)
+);
+#12925= IFCPRODUCTDEFINITIONSHAPE($,$,(#12923));
+#12928= IFCANNOTATION('0MP$IUmRnALOTa3I6B$4Mq',#4,$,$,$,#12922,#12925);
+#12932= IFCPRESENTATIONSTYLEASSIGNMENT((#12915));
+#12934= IFCSTYLEDITEM(#12916,(#12932),$);
+#12938= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--371'),$);
+#12939= IFCPROPERTYSET('2x14jwYI93IAxipDR6T2_i',#4,'Allplan Attributes',
+$,(#12938));
+#12941= IFCRELDEFINESBYPROPERTIES('2vh$cWOmf83vTfP8jzzFk8',#4,$,$,(
+#12928),#12939);
+#12945= IFCTEXTSTYLEFORDEFINEDFONT(#12946,$);
+#12946= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#12947= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#12948= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#12950= IFCTEXTSTYLE($,#12945,#12947,#12948);
+#12951= IFCTEXTLITERAL('F',#12954,.LEFT.);
+#12952= IFCDIRECTION((1.,0.));
+#12954= IFCAXIS2PLACEMENT2D(#12955,#12952);
+#12955= IFCCARTESIANPOINT((82553.76264563203,23164.44656228746));
+#12957= IFCLOCALPLACEMENT($,#1);
+#12958= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#12951)
+);
+#12960= IFCPRODUCTDEFINITIONSHAPE($,$,(#12958));
+#12963= IFCANNOTATION('3VWxlYf9T9wxL9T3M2lpUa',#4,$,$,$,#12957,#12960);
+#12967= IFCPRESENTATIONSTYLEASSIGNMENT((#12950));
+#12969= IFCSTYLEDITEM(#12951,(#12967),$);
+#12973= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--372'),$);
+#12974= IFCPROPERTYSET('2tTe3J6Cf1pfkQ_CYB17qZ',#4,'Allplan Attributes',
+$,(#12973));
+#12976= IFCRELDEFINESBYPROPERTIES('1V0Pdhg3T518$eU13gTk7O',#4,$,$,(
+#12963),#12974);
+#12980= IFCTEXTSTYLEFORDEFINEDFONT(#12981,$);
+#12981= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#12982= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#12983= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#12985= IFCTEXTSTYLE($,#12980,#12982,#12983);
+#12986= IFCTEXTLITERAL('G',#12989,.LEFT.);
+#12987= IFCDIRECTION((1.,0.));
+#12989= IFCAXIS2PLACEMENT2D(#12990,#12987);
+#12990= IFCCARTESIANPOINT((83082.9040210247,21519.44656228746));
+#12992= IFCLOCALPLACEMENT($,#1);
+#12993= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#12986)
+);
+#12995= IFCPRODUCTDEFINITIONSHAPE($,$,(#12993));
+#12998= IFCANNOTATION('3K11SMIhDDWANqAomIq3wu',#4,$,$,$,#12992,#12995);
+#13002= IFCPRESENTATIONSTYLEASSIGNMENT((#12985));
+#13004= IFCSTYLEDITEM(#12986,(#13002),$);
+#13008= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--373'),$);
+#13009= IFCPROPERTYSET('0DFnlwd21DvPNwqP5FVsgD',#4,'Allplan Attributes',
+$,(#13008));
+#13011= IFCRELDEFINESBYPROPERTIES('127nbAzeD1_OXYIDYG73v1',#4,$,$,(
+#12998),#13009);
+#13015= IFCTEXTSTYLEFORDEFINEDFONT(#13016,$);
+#13016= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#13017= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#13018= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#13020= IFCTEXTSTYLE($,#13015,#13017,#13018);
+#13021= IFCTEXTLITERAL('G',#13024,.LEFT.);
+#13022= IFCDIRECTION((1.,0.));
+#13024= IFCAXIS2PLACEMENT2D(#13025,#13022);
+#13025= IFCCARTESIANPOINT((85033.76264563203,21519.44656228747));
+#13027= IFCLOCALPLACEMENT($,#1);
+#13028= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#13021)
+);
+#13030= IFCPRODUCTDEFINITIONSHAPE($,$,(#13028));
+#13033= IFCANNOTATION('2JYDETlS19KvR80Xc8r2fF',#4,$,$,$,#13027,#13030);
+#13037= IFCPRESENTATIONSTYLEASSIGNMENT((#13020));
+#13039= IFCSTYLEDITEM(#13021,(#13037),$);
+#13043= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--374'),$);
+#13044= IFCPROPERTYSET('1mf5XAoFH4j8zOxATLifEE',#4,'Allplan Attributes',
+$,(#13043));
+#13046= IFCRELDEFINESBYPROPERTIES('13ET8q8ZP5aggVsJ5Wprp1',#4,$,$,(
+#13033),#13044);
+#13050= IFCTEXTSTYLEFORDEFINEDFONT(#13051,$);
+#13051= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#13052= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#13053= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#13055= IFCTEXTSTYLE($,#13050,#13052,#13053);
+#13056= IFCTEXTLITERAL('f1',#13059,.LEFT.);
+#13057= IFCDIRECTION((1.,0.));
+#13059= IFCAXIS2PLACEMENT2D(#13060,#13057);
+#13060= IFCCARTESIANPOINT((63944.51335346072,16091.04263252323));
+#13062= IFCLOCALPLACEMENT($,#1);
+#13063= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#13056)
+);
+#13065= IFCPRODUCTDEFINITIONSHAPE($,$,(#13063));
+#13068= IFCANNOTATION('3ydFeSzlb4RAnU7eHNNLnl',#4,$,$,$,#13062,#13065);
+#13072= IFCPRESENTATIONSTYLEASSIGNMENT((#13055));
+#13074= IFCSTYLEDITEM(#13056,(#13072),$);
+#13078= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--400'),$);
+#13079= IFCPROPERTYSET('2kntULGTXFJhX0nxHiCtwB',#4,'Allplan Attributes',
+$,(#13078));
+#13081= IFCRELDEFINESBYPROPERTIES('0y4caF7rP6XgPT0wFn1gNn',#4,$,$,(
+#13068),#13079);
+#13085= IFCTEXTSTYLEFORDEFINEDFONT(#13086,$);
+#13086= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#13087= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#13088= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#13090= IFCTEXTSTYLE($,#13085,#13087,#13088);
+#13091= IFCTEXTLITERAL('f1',#13094,.LEFT.);
+#13092= IFCDIRECTION((1.,0.));
+#13094= IFCAXIS2PLACEMENT2D(#13095,#13092);
+#13095= IFCCARTESIANPOINT((102367.5048670323,23148.54263252323));
+#13097= IFCLOCALPLACEMENT($,#1);
+#13098= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#13091)
+);
+#13100= IFCPRODUCTDEFINITIONSHAPE($,$,(#13098));
+#13103= IFCANNOTATION('131NeslYD6bQRYvt3yiuDF',#4,$,$,$,#13097,#13100);
+#13107= IFCPRESENTATIONSTYLEASSIGNMENT((#13090));
+#13109= IFCSTYLEDITEM(#13091,(#13107),$);
+#13113= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--401'),$);
+#13114= IFCPROPERTYSET('142EMmLtH0uORA5IAuYe_V',#4,'Allplan Attributes',
+$,(#13113));
+#13116= IFCRELDEFINESBYPROPERTIES('3_u6P5yUHAAhMjTN6$RKZL',#4,$,$,(
+#13103),#13114);
+#13120= IFCTEXTSTYLEFORDEFINEDFONT(#13121,$);
+#13121= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#13122= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#13123= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#13125= IFCTEXTSTYLE($,#13120,#13122,#13123);
+#13126= IFCTEXTLITERAL('F1',#13129,.LEFT.);
+#13127= IFCDIRECTION((1.,0.));
+#13129= IFCAXIS2PLACEMENT2D(#13130,#13127);
+#13130= IFCCARTESIANPOINT((96418.85940563989,17938.30953539124));
+#13132= IFCLOCALPLACEMENT($,#1);
+#13133= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#13126)
+);
+#13135= IFCPRODUCTDEFINITIONSHAPE($,$,(#13133));
+#13138= IFCANNOTATION('3TRmTwosf4zRjJEoMbs4gf',#4,$,$,$,#13132,#13135);
+#13142= IFCPRESENTATIONSTYLEASSIGNMENT((#13125));
+#13144= IFCSTYLEDITEM(#13126,(#13142),$);
+#13148= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--402'),$);
+#13149= IFCPROPERTYSET('0OKWj52On9PxItzstiZae5',#4,'Allplan Attributes',
+$,(#13148));
+#13151= IFCRELDEFINESBYPROPERTIES('0M759GUyzBkPlzol7TqJIR',#4,$,$,(
+#13138),#13149);
+#13155= IFCTEXTSTYLEFORDEFINEDFONT(#13156,$);
+#13156= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#13157= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#13158= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#13160= IFCTEXTSTYLE($,#13155,#13157,#13158);
+#13161= IFCTEXTLITERAL('W2',#13164,.LEFT.);
+#13162= IFCDIRECTION((1.,0.));
+#13164= IFCAXIS2PLACEMENT2D(#13165,#13162);
+#13165= IFCCARTESIANPOINT((73557.80189202845,25631.04263252323));
+#13167= IFCLOCALPLACEMENT($,#1);
+#13168= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#13161)
+);
+#13170= IFCPRODUCTDEFINITIONSHAPE($,$,(#13168));
+#13173= IFCANNOTATION('2vnzCowvn4Rv_jlmS0q80v',#4,$,$,$,#13167,#13170);
+#13177= IFCPRESENTATIONSTYLEASSIGNMENT((#13160));
+#13179= IFCSTYLEDITEM(#13161,(#13177),$);
+#13183= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--417'),$);
+#13184= IFCPROPERTYSET('3b8WUOS4L4oPfWeG$2uL2O',#4,'Allplan Attributes',
+$,(#13183));
+#13186= IFCRELDEFINESBYPROPERTIES('19Oj7LkF1DsQCGuST4Bs4B',#4,$,$,(
+#13173),#13184);
+#13190= IFCTEXTSTYLEFORDEFINEDFONT(#13191,$);
+#13191= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#13192= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#13193= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#13195= IFCTEXTSTYLE($,#13190,#13192,#13193);
+#13196= IFCTEXTLITERAL('W2',#13199,.LEFT.);
+#13197= IFCDIRECTION((1.,0.));
+#13199= IFCAXIS2PLACEMENT2D(#13200,#13197);
+#13200= IFCCARTESIANPOINT((82840.80189202845,27671.04263252323));
+#13202= IFCLOCALPLACEMENT($,#1);
+#13203= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#13196)
+);
+#13205= IFCPRODUCTDEFINITIONSHAPE($,$,(#13203));
+#13208= IFCANNOTATION('1AEu7VPN9D$hhnVvU3isoC',#4,$,$,$,#13202,#13205);
+#13212= IFCPRESENTATIONSTYLEASSIGNMENT((#13195));
+#13214= IFCSTYLEDITEM(#13196,(#13212),$);
+#13218= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--418'),$);
+#13219= IFCPROPERTYSET('3fH$h6yvLBxwjDzXVHiMof',#4,'Allplan Attributes',
+$,(#13218));
+#13221= IFCRELDEFINESBYPROPERTIES('3k9Q6u8O1BveQI54GMFZaP',#4,$,$,(
+#13208),#13219);
+#13225= IFCTEXTSTYLEFORDEFINEDFONT(#13226,$);
+#13226= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#13227= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#13228= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#13230= IFCTEXTSTYLE($,#13225,#13227,#13228);
+#13231= IFCTEXTLITERAL('W2',#13234,.LEFT.);
+#13232= IFCDIRECTION((1.,0.));
+#13234= IFCAXIS2PLACEMENT2D(#13235,#13232);
+#13235= IFCCARTESIANPOINT((92123.80189202847,25631.04263252323));
+#13237= IFCLOCALPLACEMENT($,#1);
+#13238= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#13231)
+);
+#13240= IFCPRODUCTDEFINITIONSHAPE($,$,(#13238));
+#13243= IFCANNOTATION('2CWCr3$OX5NwOiYskxTT51',#4,$,$,$,#13237,#13240);
+#13247= IFCPRESENTATIONSTYLEASSIGNMENT((#13230));
+#13249= IFCSTYLEDITEM(#13231,(#13247),$);
+#13253= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--419'),$);
+#13254= IFCPROPERTYSET('2WEuq1GmXADBvIExq3qAWp',#4,'Allplan Attributes',
+$,(#13253));
+#13256= IFCRELDEFINESBYPROPERTIES('2Hn1WBwX93dhwMVk7z9QdE',#4,$,$,(
+#13243),#13254);
+#13260= IFCTEXTSTYLEFORDEFINEDFONT(#13261,$);
+#13261= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#13262= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#13263= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#13265= IFCTEXTSTYLE($,#13260,#13262,#13263);
+#13266= IFCTEXTLITERAL('f2',#13269,.LEFT.);
+#13267= IFCDIRECTION((1.,0.));
+#13269= IFCAXIS2PLACEMENT2D(#13270,#13267);
+#13270= IFCCARTESIANPOINT((78350.00486703226,7551.042632523229));
+#13272= IFCLOCALPLACEMENT($,#1);
+#13273= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#13266)
+);
+#13275= IFCPRODUCTDEFINITIONSHAPE($,$,(#13273));
+#13278= IFCANNOTATION('16Ug3C5kb6OuAs1mwq_VOQ',#4,$,$,$,#13272,#13275);
+#13282= IFCPRESENTATIONSTYLEASSIGNMENT((#13265));
+#13284= IFCSTYLEDITEM(#13266,(#13282),$);
+#13288= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--487'),$);
+#13289= IFCPROPERTYSET('0ScImyScDC$gBsDEeffJhD',#4,'Allplan Attributes',
+$,(#13288));
+#13291= IFCRELDEFINESBYPROPERTIES('2FG2DmD151zuaO6HpFfgsi',#4,$,$,(
+#13278),#13289);
+#13295= IFCTEXTSTYLEFORDEFINEDFONT(#13296,$);
+#13296= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#13297= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#13298= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#13300= IFCTEXTSTYLE($,#13295,#13297,#13298);
+#13301= IFCTEXTLITERAL('f3',#13304,.LEFT.);
+#13302= IFCDIRECTION((1.,0.));
+#13304= IFCAXIS2PLACEMENT2D(#13305,#13302);
+#13305= IFCCARTESIANPOINT((93993.5098230476,7551.042632523229));
+#13307= IFCLOCALPLACEMENT($,#1);
+#13308= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#13301)
+);
+#13310= IFCPRODUCTDEFINITIONSHAPE($,$,(#13308));
+#13313= IFCANNOTATION('14B75cQ9TDgutcscufijh7',#4,$,$,$,#13307,#13310);
+#13317= IFCPRESENTATIONSTYLEASSIGNMENT((#13300));
+#13319= IFCSTYLEDITEM(#13301,(#13317),$);
+#13323= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--488'),$);
+#13324= IFCPROPERTYSET('0uCD2YwhPFkwJrRUZD3f1Y',#4,'Allplan Attributes',
+$,(#13323));
+#13326= IFCRELDEFINESBYPROPERTIES('0SA5CuR$TB3ukNBAhFNzeE',#4,$,$,(
+#13313),#13324);
+#13330= IFCTEXTSTYLEFORDEFINEDFONT(#13331,$);
+#13331= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#13332= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#13333= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#13335= IFCTEXTSTYLE($,#13330,#13332,#13333);
+#13336= IFCTEXTLITERAL('f4',#13339,.LEFT.);
+#13337= IFCDIRECTION((1.,0.));
+#13339= IFCAXIS2PLACEMENT2D(#13340,#13337);
+#13340= IFCCARTESIANPOINT((98812.22799894086,7551.042632523229));
+#13342= IFCLOCALPLACEMENT($,#1);
+#13343= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#13336)
+);
+#13345= IFCPRODUCTDEFINITIONSHAPE($,$,(#13343));
+#13348= IFCANNOTATION('2aaENikErF2Pk7FBAU_Ap1',#4,$,$,$,#13342,#13345);
+#13352= IFCPRESENTATIONSTYLEASSIGNMENT((#13335));
+#13354= IFCSTYLEDITEM(#13336,(#13352),$);
+#13358= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--489'),$);
+#13359= IFCPROPERTYSET('2Ap7sk8dnBv84xz3dXZ7qA',#4,'Allplan Attributes',
+$,(#13358));
+#13361= IFCRELDEFINESBYPROPERTIES('16W6ZYaHTBPfcXASLyD0xZ',#4,$,$,(
+#13348),#13359);
+#13365= IFCTEXTSTYLEFORDEFINEDFONT(#13366,$);
+#13366= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#13367= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#13368= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#13370= IFCTEXTSTYLE($,#13365,#13367,#13368);
+#13371= IFCTEXTLITERAL('f5',#13374,.LEFT.);
+#13372= IFCDIRECTION((1.,0.));
+#13374= IFCAXIS2PLACEMENT2D(#13375,#13372);
+#13375= IFCCARTESIANPOINT((102364.5133534607,15128.54263252323));
+#13377= IFCLOCALPLACEMENT($,#1);
+#13378= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#13371)
+);
+#13380= IFCPRODUCTDEFINITIONSHAPE($,$,(#13378));
+#13383= IFCANNOTATION('0p93xPcS95xudLDl30ydRC',#4,$,$,$,#13377,#13380);
+#13387= IFCPRESENTATIONSTYLEASSIGNMENT((#13370));
+#13389= IFCSTYLEDITEM(#13371,(#13387),$);
+#13393= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--490'),$);
+#13394= IFCPROPERTYSET('1h6nQ79cL9Fvv6OrHkPam5',#4,'Allplan Attributes',
+$,(#13393));
+#13396= IFCRELDEFINESBYPROPERTIES('1yDkPhcYX3o8NIEUlMI$MZ',#4,$,$,(
+#13383),#13394);
+#13400= IFCTEXTSTYLEFORDEFINEDFONT(#13401,$);
+#13401= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#13402= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#13403= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#13405= IFCTEXTSTYLE($,#13400,#13402,#13403);
+#13406= IFCTEXTLITERAL('f6',#13409,.LEFT.);
+#13407= IFCDIRECTION((1.,0.));
+#13409= IFCAXIS2PLACEMENT2D(#13410,#13407);
+#13410= IFCCARTESIANPOINT((79088.46093109454,15126.04263252324));
+#13412= IFCLOCALPLACEMENT($,#1);
+#13413= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#13406)
+);
+#13415= IFCPRODUCTDEFINITIONSHAPE($,$,(#13413));
+#13418= IFCANNOTATION('2Z9cTMiU5CFxkS7y1MeST2',#4,$,$,$,#13412,#13415);
+#13422= IFCPRESENTATIONSTYLEASSIGNMENT((#13405));
+#13424= IFCSTYLEDITEM(#13406,(#13422),$);
+#13428= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--491'),$);
+#13429= IFCPROPERTYSET('2ljbvRh3D3mvg05HNMCyxA',#4,'Allplan Attributes',
+$,(#13428));
+#13431= IFCRELDEFINESBYPROPERTIES('0JtszMLD91pvm9$MMMkLj0',#4,$,$,(
+#13418),#13429);
+#13435= IFCTEXTSTYLEFORDEFINEDFONT(#13436,$);
+#13436= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#13437= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#13438= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#13440= IFCTEXTSTYLE($,#13435,#13437,#13438);
+#13441= IFCTEXTLITERAL('f7',#13444,.LEFT.);
+#13442= IFCDIRECTION((1.,0.));
+#13444= IFCAXIS2PLACEMENT2D(#13445,#13442);
+#13445= IFCCARTESIANPOINT((90227.54729917461,12438.54263252323));
+#13447= IFCLOCALPLACEMENT($,#1);
+#13448= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#13441)
+);
+#13450= IFCPRODUCTDEFINITIONSHAPE($,$,(#13448));
+#13453= IFCANNOTATION('2d43yfyH5D_ejZn_GVJBrz',#4,$,$,$,#13447,#13450);
+#13457= IFCPRESENTATIONSTYLEASSIGNMENT((#13440));
+#13459= IFCSTYLEDITEM(#13441,(#13457),$);
+#13463= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--492'),$);
+#13464= IFCPROPERTYSET('2n4vHCrpzB4Qcy1ClFpulR',#4,'Allplan Attributes',
+$,(#13463));
+#13466= IFCRELDEFINESBYPROPERTIES('1t9w4Htrj6FglJTNbPsXK5',#4,$,$,(
+#13453),#13464);
+#13470= IFCTEXTSTYLEFORDEFINEDFONT(#13471,$);
+#13471= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#13472= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#13473= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#13475= IFCTEXTSTYLE($,#13470,#13472,#13473);
+#13476= IFCTEXTLITERAL('f8',#13479,.LEFT.);
+#13477= IFCDIRECTION((1.,0.));
+#13479= IFCAXIS2PLACEMENT2D(#13480,#13477);
+#13480= IFCCARTESIANPOINT((96930.44389119459,12513.54263252323));
+#13482= IFCLOCALPLACEMENT($,#1);
+#13483= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#13476)
+);
+#13485= IFCPRODUCTDEFINITIONSHAPE($,$,(#13483));
+#13488= IFCANNOTATION('3ao1sc57n2HBq0OJW5R34F',#4,$,$,$,#13482,#13485);
+#13492= IFCPRESENTATIONSTYLEASSIGNMENT((#13475));
+#13494= IFCSTYLEDITEM(#13476,(#13492),$);
+#13498= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--493'),$);
+#13499= IFCPROPERTYSET('1nai3Wflf3DuON1VKsEn9T',#4,'Allplan Attributes',
+$,(#13498));
+#13501= IFCRELDEFINESBYPROPERTIES('0JqhdCAQH3FxTOtU24ke9n',#4,$,$,(
+#13488),#13499);
+#13505= IFCTEXTSTYLEFORDEFINEDFONT(#13506,$);
+#13506= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#13507= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#13508= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#13510= IFCTEXTSTYLE($,#13505,#13507,#13508);
+#13511= IFCTEXTLITERAL('f9',#13514,.LEFT.);
+#13512= IFCDIRECTION((1.,0.));
+#13514= IFCAXIS2PLACEMENT2D(#13515,#13512);
+#13515= IFCCARTESIANPOINT((96915.96093109452,21621.04263252323));
+#13517= IFCLOCALPLACEMENT($,#1);
+#13518= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#13511)
+);
+#13520= IFCPRODUCTDEFINITIONSHAPE($,$,(#13518));
+#13523= IFCANNOTATION('1gYljV2IP71vycas9ltS1B',#4,$,$,$,#13517,#13520);
+#13527= IFCPRESENTATIONSTYLEASSIGNMENT((#13510));
+#13529= IFCSTYLEDITEM(#13511,(#13527),$);
+#13533= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--494'),$);
+#13534= IFCPROPERTYSET('1sDwLnHyzDrROQQ$L17Rki',#4,'Allplan Attributes',
+$,(#13533));
+#13536= IFCRELDEFINESBYPROPERTIES('1uQccWkAf8h91$pWWKA6VZ',#4,$,$,(
+#13523),#13534);
+#13540= IFCTEXTSTYLEFORDEFINEDFONT(#13541,$);
+#13541= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#13542= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#13543= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#13545= IFCTEXTSTYLE($,#13540,#13542,#13543);
+#13546= IFCTEXTLITERAL('B',#13549,.LEFT.);
+#13547= IFCDIRECTION((6.123233995736766E-17,1.));
+#13549= IFCAXIS2PLACEMENT2D(#13550,#13547);
+#13550= IFCCARTESIANPOINT((88169.24186625176,20927.9088516208));
+#13552= IFCLOCALPLACEMENT($,#1);
+#13553= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#13546)
+);
+#13555= IFCPRODUCTDEFINITIONSHAPE($,$,(#13553));
+#13558= IFCANNOTATION('1WOZf7OoHFihsaQvHbqSpU',#4,$,$,$,#13552,#13555);
+#13562= IFCPRESENTATIONSTYLEASSIGNMENT((#13545));
+#13564= IFCSTYLEDITEM(#13546,(#13562),$);
+#13568= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--518'),$);
+#13569= IFCPROPERTYSET('2tGltiurH79Od1wGkHtBvt',#4,'Allplan Attributes',
+$,(#13568));
+#13571= IFCRELDEFINESBYPROPERTIES('0cjprHF3f2of$LGwsI$4XD',#4,$,$,(
+#13558),#13569);
+#13575= IFCTEXTSTYLEFORDEFINEDFONT(#13576,$);
+#13576= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#13577= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#13578= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#13580= IFCTEXTSTYLE($,#13575,#13577,#13578);
+#13581= IFCTEXTLITERAL('B',#13584,.LEFT.);
+#13582= IFCDIRECTION((6.123233995736766E-17,1.));
+#13584= IFCAXIS2PLACEMENT2D(#13585,#13582);
+#13585= IFCCARTESIANPOINT((88169.24186625176,25478.76747622812));
+#13587= IFCLOCALPLACEMENT($,#1);
+#13588= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#13581)
+);
+#13590= IFCPRODUCTDEFINITIONSHAPE($,$,(#13588));
+#13593= IFCANNOTATION('2lrH_aucv9cg2APhNC_TIV',#4,$,$,$,#13587,#13590);
+#13597= IFCPRESENTATIONSTYLEASSIGNMENT((#13580));
+#13599= IFCSTYLEDITEM(#13581,(#13597),$);
+#13603= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--519'),$);
+#13604= IFCPROPERTYSET('3vpwpCHOP2C8$G3Fi12pnt',#4,'Allplan Attributes',
+$,(#13603));
+#13606= IFCRELDEFINESBYPROPERTIES('2h1hX0O4TFiv03LYjjMqaP',#4,$,$,(
+#13593),#13604);
+#13610= IFCTEXTSTYLEFORDEFINEDFONT(#13611,$);
+#13611= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#13612= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.6));
+#13613= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(400.));
+#13615= IFCTEXTSTYLE($,#13610,#13612,#13613);
+#13616= IFCTEXTLITERAL('%RAInnenwand%RE',#13619,.LEFT.);
+#13617= IFCDIRECTION((6.123233995736766E-17,1.));
+#13619= IFCAXIS2PLACEMENT2D(#13620,#13617);
+#13620= IFCCARTESIANPOINT((87665.84948349507,20590.58940828774));
+#13622= IFCLOCALPLACEMENT($,#1);
+#13623= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#13616)
+);
+#13625= IFCPRODUCTDEFINITIONSHAPE($,$,(#13623));
+#13628= IFCANNOTATION('2DbLU8Kw9ETPNd38E9SXUc',#4,$,$,$,#13622,#13625);
+#13632= IFCPRESENTATIONSTYLEASSIGNMENT((#13615));
+#13634= IFCSTYLEDITEM(#13616,(#13632),$);
+#13638= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--520'),$);
+#13639= IFCPROPERTYSET('1$i8DX8bv4zxWMj7ybEqtG',#4,'Allplan Attributes',
+$,(#13638));
+#13641= IFCRELDEFINESBYPROPERTIES('3YDMdHJjH84gfhyzyhVTFm',#4,$,$,(
+#13628),#13639);
+#13645= IFCTEXTSTYLEFORDEFINEDFONT(#13646,$);
+#13646= IFCCOLOURRGB($,0.4392156862745098,0.4392156862745098,1.);
+#13647= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.5));
+#13648= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(250.));
+#13650= IFCTEXTSTYLE($,#13645,#13647,#13648);
+#13651= IFCPLANAREXTENT(4979.166666666672,312.5);
+#13652= IFCTEXTLITERALWITHEXTENT(
+'unter Fundamente mit Sickerbeton 32/45mm CEM 200 kg/m\X2\00B3\X0\\X\0Aoder Magerbeton CEM 200 kg/m\X2\00B3\X0\ bis auf Kiesschicht fundieren !'
+,#13655,.LEFT.,#13651,'top-left');
+#13653= IFCDIRECTION((1.,0.));
+#13655= IFCAXIS2PLACEMENT2D(#13656,#13653);
+#13656= IFCCARTESIANPOINT((79040.90503321811,12115.36635853764));
+#13658= IFCLOCALPLACEMENT($,#1);
+#13659= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#13652)
+);
+#13661= IFCPRODUCTDEFINITIONSHAPE($,$,(#13659));
+#13664= IFCANNOTATION('2FZ3OVLdT0mwIKaHQdwWxQ',#4,$,$,$,#13658,#13661);
+#13668= IFCPRESENTATIONSTYLEASSIGNMENT((#13650));
+#13670= IFCSTYLEDITEM(#13652,(#13668),$);
+#13674= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--530'),$);
+#13675= IFCPROPERTYSET('13X2hK1313leacq_ZvtU3m',#4,'Allplan Attributes',
+$,(#13674));
+#13677= IFCRELDEFINESBYPROPERTIES('2E7sHPvqL79Bu04PzSaDpu',#4,$,$,(
+#13664),#13675);
+#13681= IFCTEXTSTYLEFORDEFINEDFONT(#13682,$);
+#13682= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#13683= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#13684= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#13686= IFCTEXTSTYLE($,#13681,#13683,#13684);
+#13687= IFCTEXTLITERAL('Einlage 15x25cm',#13690,.LEFT.);
+#13688= IFCDIRECTION((1.,0.));
+#13690= IFCAXIS2PLACEMENT2D(#13691,#13688);
+#13691= IFCCARTESIANPOINT((94135.,8666.671497262763));
+#13693= IFCLOCALPLACEMENT($,#1);
+#13694= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#13687)
+);
+#13696= IFCPRODUCTDEFINITIONSHAPE($,$,(#13694));
+#13699= IFCANNOTATION('3EZI8FqxbAEPA9nj3kn0l9',#4,$,$,$,#13693,#13696);
+#13703= IFCPRESENTATIONSTYLEASSIGNMENT((#13686));
+#13705= IFCSTYLEDITEM(#13687,(#13703),$);
+#13709= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--557'),$);
+#13710= IFCPROPERTYSET('1m3xdtYy97YBrH51EUitXb',#4,'Allplan Attributes',
+$,(#13709));
+#13712= IFCRELDEFINESBYPROPERTIES('2Z8AzNYSv2DxJDvzX7YS7R',#4,$,$,(
+#13699),#13710);
+#13716= IFCTEXTSTYLEFORDEFINEDFONT(#13717,$);
+#13717= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#13718= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#13719= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#13721= IFCTEXTSTYLE($,#13716,#13718,#13719);
+#13722= IFCTEXTLITERAL('Grundriss  1:50',#13725,.LEFT.);
+#13723= IFCDIRECTION((1.,0.));
+#13725= IFCAXIS2PLACEMENT2D(#13726,#13723);
+#13726= IFCCARTESIANPOINT((83279.7373736969,30147.25334708006));
+#13728= IFCLOCALPLACEMENT($,#1);
+#13729= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#13722)
+);
+#13731= IFCPRODUCTDEFINITIONSHAPE($,$,(#13729));
+#13734= IFCANNOTATION('04pj6hMRH3_9aAqe_35y2a',#4,$,$,$,#13728,#13731);
+#13738= IFCPRESENTATIONSTYLEASSIGNMENT((#13721));
+#13740= IFCSTYLEDITEM(#13722,(#13738),$);
+#13744= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--562'),$);
+#13745= IFCPROPERTYSET('1FR6DKVHf5Tx0aqrmOj9N1',#4,'Allplan Attributes',
+$,(#13744));
+#13747= IFCRELDEFINESBYPROPERTIES('26u900C9531fBA$YAXCnfC',#4,$,$,(
+#13734),#13745);
+#13751= IFCTEXTSTYLEFORDEFINEDFONT(#13752,$);
+#13752= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#13753= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#13754= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#13756= IFCTEXTSTYLE($,#13751,#13753,#13754);
+#13757= IFCTEXTLITERAL('Arbeitsfuge mit Quellfugenband !',#13760,.LEFT.
+);
+#13758= IFCDIRECTION((6.123233995736766E-17,1.));
+#13760= IFCAXIS2PLACEMENT2D(#13761,#13758);
+#13761= IFCCARTESIANPOINT((77728.33333333336,11056.97175194527));
+#13763= IFCLOCALPLACEMENT($,#1);
+#13764= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#13757)
+);
+#13766= IFCPRODUCTDEFINITIONSHAPE($,$,(#13764));
+#13769= IFCANNOTATION('06ONZut7bEEPfMU7dRo0q4',#4,$,$,$,#13763,#13766);
+#13773= IFCPRESENTATIONSTYLEASSIGNMENT((#13756));
+#13775= IFCSTYLEDITEM(#13757,(#13773),$);
+#13779= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--564'),$);
+#13780= IFCPROPERTYSET('2utwBxIV1AQPegEOfg9Evi',#4,'Allplan Attributes',
+$,(#13779));
+#13782= IFCRELDEFINESBYPROPERTIES('1cSaBLVFz2BQX34zLL_OIY',#4,$,$,(
+#13769),#13780);
+#13786= IFCTEXTSTYLEFORDEFINEDFONT(#13787,$);
+#13787= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#13788= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#13789= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#13791= IFCTEXTSTYLE($,#13786,#13788,#13789);
+#13792= IFCTEXTLITERAL('Arbeitsfuge mit Quellfugenband !',#13795,.LEFT.
+);
+#13793= IFCDIRECTION((6.123233995736766E-17,1.));
+#13795= IFCAXIS2PLACEMENT2D(#13796,#13793);
+#13796= IFCCARTESIANPOINT((77728.33333333336,21266.51780159047));
+#13798= IFCLOCALPLACEMENT($,#1);
+#13799= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#13792)
+);
+#13801= IFCPRODUCTDEFINITIONSHAPE($,$,(#13799));
+#13804= IFCANNOTATION('13viazgKbEKghY$03F5CXr',#4,$,$,$,#13798,#13801);
+#13808= IFCPRESENTATIONSTYLEASSIGNMENT((#13791));
+#13810= IFCSTYLEDITEM(#13792,(#13808),$);
+#13814= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--565'),$);
+#13815= IFCPROPERTYSET('2aLSNJ$$LDjgchJ0eoZSpe',#4,'Allplan Attributes',
+$,(#13814));
+#13817= IFCRELDEFINESBYPROPERTIES('04xCQc8dzA1AZkO9RkV0Fe',#4,$,$,(
+#13804),#13815);
+#13821= IFCTEXTSTYLEFORDEFINEDFONT(#13822,$);
+#13822= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#13823= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.5));
+#13824= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(300.));
+#13826= IFCTEXTSTYLE($,#13821,#13823,#13824);
+#13827= IFCPLANAREXTENT(2910.000000000003,825.0000000000168);
+#13828= IFCTEXTLITERALWITHEXTENT(
+'OK= -0.07, UK= -0.32\X\0A+ 20cm D\X2\00E4\X0\mmung (UK= -0.52)\X\0A+ 2cm Splitt (UK= -0.54)\X\0A+ 5cm Magerbeton (UK= -0.59)'
+,#13831,.LEFT.,#13827,'top-left');
+#13829= IFCDIRECTION((0.9808262151348185,0.1948844162684815));
+#13831= IFCAXIS2PLACEMENT2D(#13832,#13829);
+#13832= IFCCARTESIANPOINT((83653.51454661261,25704.46997895839));
+#13834= IFCLOCALPLACEMENT($,#1);
+#13835= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#13828)
+);
+#13837= IFCPRODUCTDEFINITIONSHAPE($,$,(#13835));
+#13840= IFCANNOTATION('2btPFQW$DE1QMR_Vo$M8BX',#4,$,$,$,#13834,#13837);
+#13844= IFCPRESENTATIONSTYLEASSIGNMENT((#13826));
+#13846= IFCSTYLEDITEM(#13828,(#13844),$);
+#13850= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--566'),$);
+#13851= IFCPROPERTYSET('2mEG8fSrrFMOZCz8KwiRb0',#4,'Allplan Attributes',
+$,(#13850));
+#13853= IFCRELDEFINESBYPROPERTIES('3gx5B6I5PAwOIpl_eyl7dM',#4,$,$,(
+#13840),#13851);
+#13857= IFCTEXTSTYLEFORDEFINEDFONT(#13858,$);
+#13858= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#13859= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.5));
+#13860= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(250.));
+#13862= IFCTEXTSTYLE($,#13857,#13859,#13860);
+#13863= IFCPLANAREXTENT(1940.000000000009,687.4999999999822);
+#13864= IFCTEXTLITERALWITHEXTENT(
+'OK= -1.13, UK= -1.38\X\0A+ 20cm D\X2\00E4\X0\mmung (UK= -1.58)\X\0A+ 2cm Splitt (UK= -1.60)\X\0A+ 5cm Magerbeton (UK= -1.65)'
+,#13867,.LEFT.,#13863,'top-left');
+#13865= IFCDIRECTION((0.7310552682428722,0.6823182503600077));
+#13867= IFCAXIS2PLACEMENT2D(#13868,#13865);
+#13868= IFCCARTESIANPOINT((87546.77173638951,22437.02940657125));
+#13870= IFCLOCALPLACEMENT($,#1);
+#13871= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#13864)
+);
+#13873= IFCPRODUCTDEFINITIONSHAPE($,$,(#13871));
+#13876= IFCANNOTATION('39ChlP7BD1_wbg5Qt1bcqU',#4,$,$,$,#13870,#13873);
+#13880= IFCPRESENTATIONSTYLEASSIGNMENT((#13862));
+#13882= IFCSTYLEDITEM(#13864,(#13880),$);
+#13886= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--567'),$);
+#13887= IFCPROPERTYSET('1BOMfZ2V9CUxuYc3JfGLBw',#4,'Allplan Attributes',
+$,(#13886));
+#13889= IFCRELDEFINESBYPROPERTIES('0zzGxla3HCXRGF_tu_CkoX',#4,$,$,(
+#13876),#13887);
+#13893= IFCTEXTSTYLEFORDEFINEDFONT(#13894,$);
+#13894= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#13895= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#13896= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(350.));
+#13898= IFCTEXTSTYLE($,#13893,#13895,#13896);
+#13899= IFCTEXTLITERAL('d = 25cm',#13902,.LEFT.);
+#13900= IFCDIRECTION((0.9216166900860996,0.3881013740696396));
+#13902= IFCAXIS2PLACEMENT2D(#13903,#13900);
+#13903= IFCCARTESIANPOINT((77891.256051316,14098.27303360807));
+#13905= IFCLOCALPLACEMENT($,#1);
+#13906= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#13899)
+);
+#13908= IFCPRODUCTDEFINITIONSHAPE($,$,(#13906));
+#13911= IFCANNOTATION('1JewbO08b35eAp5p_VGjeF',#4,$,$,$,#13905,#13908);
+#13915= IFCPRESENTATIONSTYLEASSIGNMENT((#13898));
+#13917= IFCSTYLEDITEM(#13899,(#13915),$);
+#13921= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--568'),$);
+#13922= IFCPROPERTYSET('1JLzdHTUrD6gPhf$kFNyYD',#4,'Allplan Attributes',
+$,(#13921));
+#13924= IFCRELDEFINESBYPROPERTIES('2d3gwGwOD4rQr13Nx1Mist',#4,$,$,(
+#13911),#13922);
+#13928= IFCTEXTSTYLEFORDEFINEDFONT(#13929,$);
+#13929= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#13930= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.5));
+#13931= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(300.));
+#13933= IFCTEXTSTYLE($,#13928,#13930,#13931);
+#13934= IFCPLANAREXTENT(2910.000000000046,824.9999999999975);
+#13935= IFCTEXTLITERALWITHEXTENT(
+'OK= -0.14, UK= -0.39\X\0A+ 20cm D\X2\00E4\X0\mmung (UK= -0.59)\X\0A+ 2cm Splitt (UK= -0.61)\X\0A+ 5cm Magerbeton (UK= -0.66)'
+,#13938,.LEFT.,#13934,'top-left');
+#13936= IFCDIRECTION((0.9216166900860947,0.3881013740696512));
+#13938= IFCAXIS2PLACEMENT2D(#13939,#13936);
+#13939= IFCCARTESIANPOINT((77933.62378465194,13997.66321160699));
+#13941= IFCLOCALPLACEMENT($,#1);
+#13942= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#13935)
+);
+#13944= IFCPRODUCTDEFINITIONSHAPE($,$,(#13942));
+#13947= IFCANNOTATION('13Mr2mkEn6$vBnW9ZtuoHR',#4,$,$,$,#13941,#13944);
+#13951= IFCPRESENTATIONSTYLEASSIGNMENT((#13933));
+#13953= IFCSTYLEDITEM(#13935,(#13951),$);
+#13957= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--569'),$);
+#13958= IFCPROPERTYSET('0FjIxep$n0nQo7$iG$5n85',#4,'Allplan Attributes',
+$,(#13957));
+#13960= IFCRELDEFINESBYPROPERTIES('2fd2d5UvL5qQL24DNno_SS',#4,$,$,(
+#13947),#13958);
+#13964= IFCTEXTSTYLEFORDEFINEDFONT(#13965,$);
+#13965= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#13966= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.4));
+#13967= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#13969= IFCTEXTSTYLE($,#13964,#13966,#13967);
+#13970= IFCPLANAREXTENT(1940.,520.0000000000091);
+#13971= IFCTEXTLITERALWITHEXTENT(
+'Fund. d=35cm, UK= -0.74\X\0A+ 20cm D\X2\00E4\X0\mmung (UK= -0.94)\X\0A+ 2cm Splitt (UK= -0.96)\X\0A+ 5cm Magerbeton (UK= -1.01)'
+,#13974,.LEFT.,#13970,'top-left');
+#13972= IFCDIRECTION((1.,0.));
+#13974= IFCAXIS2PLACEMENT2D(#13975,#13972);
+#13975= IFCCARTESIANPOINT((67575.,16411.67149726277));
+#13977= IFCLOCALPLACEMENT($,#1);
+#13978= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#13971)
+);
+#13980= IFCPRODUCTDEFINITIONSHAPE($,$,(#13978));
+#13983= IFCANNOTATION('36Y4fgy1v4EvsBLStM6_t1',#4,$,$,$,#13977,#13980);
+#13987= IFCPRESENTATIONSTYLEASSIGNMENT((#13969));
+#13989= IFCSTYLEDITEM(#13971,(#13987),$);
+#13993= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--570'),$);
+#13994= IFCPROPERTYSET('2wbP$WPHH5ABcNnS2CApOK',#4,'Allplan Attributes',
+$,(#13993));
+#13996= IFCRELDEFINESBYPROPERTIES('04yERF5_T8HvznHUyt1K4I',#4,$,$,(
+#13983),#13994);
+#14000= IFCTEXTSTYLEFORDEFINEDFONT(#14001,$);
+#14001= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#14002= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.4));
+#14003= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#14005= IFCTEXTSTYLE($,#14000,#14002,#14003);
+#14006= IFCPLANAREXTENT(1940.,520.);
+#14007= IFCTEXTLITERALWITHEXTENT(
+'Fund. d=35cm, UK= -0.74\X\0A+ 20cm D\X2\00E4\X0\mmung (UK= -0.94)\X\0A+ 2cm Splitt (UK= -0.96)\X\0A+ 5cm Magerbeton (UK= -1.01)'
+,#14010,.LEFT.,#14006,'top-left');
+#14008= IFCDIRECTION((1.,0.));
+#14010= IFCAXIS2PLACEMENT2D(#14011,#14008);
+#14011= IFCCARTESIANPOINT((86373.12561100708,16411.67149726277));
+#14013= IFCLOCALPLACEMENT($,#1);
+#14014= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#14007)
+);
+#14016= IFCPRODUCTDEFINITIONSHAPE($,$,(#14014));
+#14019= IFCANNOTATION('3XPb1LrO59n8NYdJNicZvk',#4,$,$,$,#14013,#14016);
+#14023= IFCPRESENTATIONSTYLEASSIGNMENT((#14005));
+#14025= IFCSTYLEDITEM(#14007,(#14023),$);
+#14029= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--571'),$);
+#14030= IFCPROPERTYSET('0l7VX0XIv1meZBIQo7Rcij',#4,'Allplan Attributes',
+$,(#14029));
+#14032= IFCRELDEFINESBYPROPERTIES('2BmWDmjTjB$uG_dBmDc5YX',#4,$,$,(
+#14019),#14030);
+#14036= IFCTEXTSTYLEFORDEFINEDFONT(#14037,$);
+#14037= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#14038= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.4));
+#14039= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#14041= IFCTEXTSTYLE($,#14036,#14038,#14039);
+#14042= IFCPLANAREXTENT(1940.,520.);
+#14043= IFCTEXTLITERALWITHEXTENT(
+'Fund. d=15cm, UK= -0.54\X\0A+ 20cm D\X2\00E4\X0\mmung (UK= -0.74)\X\0A+ 2cm Splitt (UK= -0.76)\X\0A+ 5cm Magerbeton (UK= -0.81)'
+,#14046,.LEFT.,#14042,'top-left');
+#14044= IFCDIRECTION((6.123233995736766E-17,1.));
+#14046= IFCAXIS2PLACEMENT2D(#14047,#14044);
+#14047= IFCCARTESIANPOINT((91000.00000000003,11496.20276121365));
+#14049= IFCLOCALPLACEMENT($,#1);
+#14050= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#14043)
+);
+#14052= IFCPRODUCTDEFINITIONSHAPE($,$,(#14050));
+#14055= IFCANNOTATION('3pyT132rT75v447EebSWp3',#4,$,$,$,#14049,#14052);
+#14059= IFCPRESENTATIONSTYLEASSIGNMENT((#14041));
+#14061= IFCSTYLEDITEM(#14043,(#14059),$);
+#14065= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--572'),$);
+#14066= IFCPROPERTYSET('2ZDWvx$Q58qwI2lUji3RKJ',#4,'Allplan Attributes',
+$,(#14065));
+#14068= IFCRELDEFINESBYPROPERTIES('1Ck9E4ReP9UeM2URMheWKd',#4,$,$,(
+#14055),#14066);
+#14072= IFCTEXTSTYLEFORDEFINEDFONT(#14073,$);
+#14073= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#14074= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.4));
+#14075= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#14077= IFCTEXTSTYLE($,#14072,#14074,#14075);
+#14078= IFCPLANAREXTENT(1940.,520.);
+#14079= IFCTEXTLITERALWITHEXTENT(
+'Fund. d=15cm, UK= -0.54\X\0A+ 20cm D\X2\00E4\X0\mmung (UK= -0.74)\X\0A+ 2cm Splitt (UK= -0.76)\X\0A+ 5cm Magerbeton (UK= -0.81)'
+,#14082,.LEFT.,#14078,'top-left');
+#14080= IFCDIRECTION((6.123233995736766E-17,1.));
+#14082= IFCAXIS2PLACEMENT2D(#14083,#14080);
+#14083= IFCCARTESIANPOINT((95005.,11269.79426336781));
+#14085= IFCLOCALPLACEMENT($,#1);
+#14086= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#14079)
+);
+#14088= IFCPRODUCTDEFINITIONSHAPE($,$,(#14086));
+#14091= IFCANNOTATION('3xZSpf7q59zvdWY$7yNUuE',#4,$,$,$,#14085,#14088);
+#14095= IFCPRESENTATIONSTYLEASSIGNMENT((#14077));
+#14097= IFCSTYLEDITEM(#14079,(#14095),$);
+#14101= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--573'),$);
+#14102= IFCPROPERTYSET('3Yep$pDt5BHfWzjq4uvkpX',#4,'Allplan Attributes',
+$,(#14101));
+#14104= IFCRELDEFINESBYPROPERTIES('0kcFJWECPAze23pSxCXU4e',#4,$,$,(
+#14091),#14102);
+#14108= IFCTEXTSTYLEFORDEFINEDFONT(#14109,$);
+#14109= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#14110= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.4));
+#14111= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#14113= IFCTEXTSTYLE($,#14108,#14110,#14111);
+#14114= IFCPLANAREXTENT(1940.,520.0000000000073);
+#14115= IFCTEXTLITERALWITHEXTENT(
+'Fund. d=35cm, UK= -0.74\X\0A+ 20cm D\X2\00E4\X0\mmung (UK= -0.94)\X\0A+ 2cm Splitt (UK= -0.96)\X\0A+ 5cm Magerbeton (UK= -1.01)'
+,#14118,.LEFT.,#14114,'top-left');
+#14116= IFCDIRECTION((1.,0.));
+#14118= IFCAXIS2PLACEMENT2D(#14119,#14116);
+#14119= IFCCARTESIANPOINT((94985.,16561.67149726277));
+#14121= IFCLOCALPLACEMENT($,#1);
+#14122= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#14115)
+);
+#14124= IFCPRODUCTDEFINITIONSHAPE($,$,(#14122));
+#14127= IFCANNOTATION('1N_JpImyb5D82p49410wvr',#4,$,$,$,#14121,#14124);
+#14131= IFCPRESENTATIONSTYLEASSIGNMENT((#14113));
+#14133= IFCSTYLEDITEM(#14115,(#14131),$);
+#14137= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--574'),$);
+#14138= IFCPROPERTYSET('2H$EsRuyH6QRJ$F$5$RqGA',#4,'Allplan Attributes',
+$,(#14137));
+#14140= IFCRELDEFINESBYPROPERTIES('2n2BJU9Fn8_BUMGdmvc6kQ',#4,$,$,(
+#14127),#14138);
+#14144= IFCTEXTSTYLEFORDEFINEDFONT(#14145,$);
+#14145= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#14146= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.4));
+#14147= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#14149= IFCTEXTSTYLE($,#14144,#14146,#14147);
+#14150= IFCPLANAREXTENT(1940.,520.);
+#14151= IFCTEXTLITERALWITHEXTENT(
+'Fund. d=15cm, UK= -0.54\X\0A+ 20cm D\X2\00E4\X0\mmung (UK= -0.74)\X\0A+ 2cm Splitt (UK= -0.76)\X\0A+ 5cm Magerbeton (UK= -0.81)'
+,#14154,.LEFT.,#14150,'top-left');
+#14152= IFCDIRECTION((6.123233995736766E-17,1.));
+#14154= IFCAXIS2PLACEMENT2D(#14155,#14152);
+#14155= IFCCARTESIANPOINT((95005.,20592.11878411506));
+#14157= IFCLOCALPLACEMENT($,#1);
+#14158= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#14151)
+);
+#14160= IFCPRODUCTDEFINITIONSHAPE($,$,(#14158));
+#14163= IFCANNOTATION('3IlrxwpkP5ffVQN0YYgvGr',#4,$,$,$,#14157,#14160);
+#14167= IFCPRESENTATIONSTYLEASSIGNMENT((#14149));
+#14169= IFCSTYLEDITEM(#14151,(#14167),$);
+#14173= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92d92-9f81-11e3-bfbc-7446a0b2bba9--575'),$);
+#14174= IFCPROPERTYSET('1TXzkdgrr0nB36uo$KM3mh',#4,'Allplan Attributes',
+$,(#14173));
+#14176= IFCRELDEFINESBYPROPERTIES('2uwq05C791BeDJK_fR$ilA',#4,$,$,(
+#14163),#14174);
+#14180= IFCTEXTSTYLEFORDEFINEDFONT(#14181,$);
+#14181= IFCDRAUGHTINGPREDEFINEDCOLOUR('blue');
+#14182= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.5));
+#14183= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#14185= IFCTEXTSTYLE($,#14180,#14182,#14183);
+#14186= IFCTEXTLITERAL('Quellfugenband',#14189,.LEFT.);
+#14187= IFCDIRECTION((1.,0.));
+#14189= IFCAXIS2PLACEMENT2D(#14190,#14187);
+#14190= IFCCARTESIANPOINT((64146.32312513622,-4831.286366342691));
+#14192= IFCLOCALPLACEMENT($,#1);
+#14193= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#14186)
+);
+#14195= IFCPRODUCTDEFINITIONSHAPE($,$,(#14193));
+#14198= IFCANNOTATION('3IE8IygiL9bQUmOWSBKmJh',#4,$,$,$,#14192,#14195);
+#14202= IFCPRESENTATIONSTYLEASSIGNMENT((#14185));
+#14204= IFCSTYLEDITEM(#14186,(#14202),$);
+#14208= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92da1-9f81-11e3-bfbc-7446a0b2bba9--4'),$);
+#14209= IFCPROPERTYSET('2eSh_IXXPCMO25pXjcj4B0',#4,'Allplan Attributes',
+$,(#14208));
+#14211= IFCRELDEFINESBYPROPERTIES('2hv$ejvdr9bfcMaAuUA3kv',#4,$,$,(
+#14198),#14209);
+#14215= IFCTEXTSTYLEFORDEFINEDFONT(#14216,$);
+#14216= IFCDRAUGHTINGPREDEFINEDCOLOUR('blue');
+#14217= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.5));
+#14218= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#14220= IFCTEXTSTYLE($,#14215,#14217,#14218);
+#14221= IFCTEXTLITERAL('Combiflex',#14224,.LEFT.);
+#14222= IFCDIRECTION((1.,0.));
+#14224= IFCAXIS2PLACEMENT2D(#14225,#14222);
+#14225= IFCCARTESIANPOINT((64427.57132664954,-5434.780956291281));
+#14227= IFCLOCALPLACEMENT($,#1);
+#14228= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#14221)
+);
+#14230= IFCPRODUCTDEFINITIONSHAPE($,$,(#14228));
+#14233= IFCANNOTATION('3a7rzo1abEaB8Je$0Dfcni',#4,$,$,$,#14227,#14230);
+#14237= IFCPRESENTATIONSTYLEASSIGNMENT((#14220));
+#14239= IFCSTYLEDITEM(#14221,(#14237),$);
+#14243= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92da1-9f81-11e3-bfbc-7446a0b2bba9--7'),$);
+#14244= IFCPROPERTYSET('3FtdOZDcf4XRo6nDbvCGfG',#4,'Allplan Attributes',
+$,(#14243));
+#14246= IFCRELDEFINESBYPROPERTIES('17ZmFZ54b2sOtB0ZbkVQ1A',#4,$,$,(
+#14233),#14244);
+#14250= IFCTEXTSTYLEFORDEFINEDFONT(#14251,$);
+#14251= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#14252= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#14253= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#14255= IFCTEXTSTYLE($,#14250,#14252,#14253);
+#14256= IFCTEXTLITERAL('Schnitt A-A  1:20',#14259,.LEFT.);
+#14257= IFCDIRECTION((1.,0.));
+#14259= IFCAXIS2PLACEMENT2D(#14260,#14257);
+#14260= IFCCARTESIANPOINT((64928.65779311588,-4084.138528206891));
+#14262= IFCLOCALPLACEMENT($,#1);
+#14263= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#14256)
+);
+#14265= IFCPRODUCTDEFINITIONSHAPE($,$,(#14263));
+#14268= IFCANNOTATION('298SZbYIT9X9s9iCj45Q7R',#4,$,$,$,#14262,#14265);
+#14272= IFCPRESENTATIONSTYLEASSIGNMENT((#14255));
+#14274= IFCSTYLEDITEM(#14256,(#14272),$);
+#14278= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'4ba92da1-9f81-11e3-bfbc-7446a0b2bba9--12'),$);
+#14279= IFCPROPERTYSET('1K7lpdgD599gzv5Aam5foZ',#4,'Allplan Attributes',
+$,(#14278));
+#14281= IFCRELDEFINESBYPROPERTIES('363aJE1H15hwsy1zYw$nf_',#4,$,$,(
+#14268),#14279);
+#14285= IFCTEXTSTYLEFORDEFINEDFONT(#14286,$);
+#14286= IFCDRAUGHTINGPREDEFINEDCOLOUR('blue');
+#14287= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.5));
+#14288= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#14290= IFCTEXTSTYLE($,#14285,#14287,#14288);
+#14291= IFCTEXTLITERAL('Combiflex',#14294,.LEFT.);
+#14292= IFCDIRECTION((1.,0.));
+#14294= IFCAXIS2PLACEMENT2D(#14295,#14292);
+#14295= IFCCARTESIANPOINT((70931.8678860706,-5434.780956291281));
+#14297= IFCLOCALPLACEMENT($,#1);
+#14298= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#14291)
+);
+#14300= IFCPRODUCTDEFINITIONSHAPE($,$,(#14298));
+#14303= IFCANNOTATION('1tSAgTZO5EiuzWCyHnRuQN',#4,$,$,$,#14297,#14300);
+#14307= IFCPRESENTATIONSTYLEASSIGNMENT((#14290));
+#14309= IFCSTYLEDITEM(#14291,(#14307),$);
+#14313= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'b195b7c3-9fbb-11e3-bfbc-7446a0b2bba9--3'),$);
+#14314= IFCPROPERTYSET('3doCU7X$j5CxCYdTw4g0Pg',#4,'Allplan Attributes',
+$,(#14313));
+#14316= IFCRELDEFINESBYPROPERTIES('0_5BoBLOHF7wOpH_tHgI3x',#4,$,$,(
+#14303),#14314);
+#14320= IFCTEXTSTYLEFORDEFINEDFONT(#14321,$);
+#14321= IFCDRAUGHTINGPREDEFINEDCOLOUR('blue');
+#14322= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.5));
+#14323= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#14325= IFCTEXTSTYLE($,#14320,#14322,#14323);
+#14326= IFCTEXTLITERAL('Quellfugenband',#14329,.LEFT.);
+#14327= IFCDIRECTION((1.,0.));
+#14329= IFCAXIS2PLACEMENT2D(#14330,#14327);
+#14330= IFCCARTESIANPOINT((70650.61968455727,-4831.286366342691));
+#14332= IFCLOCALPLACEMENT($,#1);
+#14333= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#14326)
+);
+#14335= IFCPRODUCTDEFINITIONSHAPE($,$,(#14333));
+#14338= IFCANNOTATION('1eJ3ymXsXDBAt7XnWXfxH6',#4,$,$,$,#14332,#14335);
+#14342= IFCPRESENTATIONSTYLEASSIGNMENT((#14325));
+#14344= IFCSTYLEDITEM(#14326,(#14342),$);
+#14348= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'b195b7c3-9fbb-11e3-bfbc-7446a0b2bba9--6'),$);
+#14349= IFCPROPERTYSET('0zCc81NLLDrv5$MCg$QTng',#4,'Allplan Attributes',
+$,(#14348));
+#14351= IFCRELDEFINESBYPROPERTIES('3BGorzi$n3ghmHsSa64r73',#4,$,$,(
+#14338),#14349);
+#14355= IFCTEXTSTYLEFORDEFINEDFONT(#14356,$);
+#14356= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#14357= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#14358= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#14360= IFCTEXTSTYLE($,#14355,#14357,#14358);
+#14361= IFCTEXTLITERAL('Schnitt B-B  1:20',#14364,.LEFT.);
+#14362= IFCDIRECTION((1.,0.));
+#14364= IFCAXIS2PLACEMENT2D(#14365,#14362);
+#14365= IFCCARTESIANPOINT((71682.95435253697,-4084.138528206892));
+#14367= IFCLOCALPLACEMENT($,#1);
+#14368= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#14361)
+);
+#14370= IFCPRODUCTDEFINITIONSHAPE($,$,(#14368));
+#14373= IFCANNOTATION('0cowC5LzXDPPAY4LfuXCN4',#4,$,$,$,#14367,#14370);
+#14377= IFCPRESENTATIONSTYLEASSIGNMENT((#14360));
+#14379= IFCSTYLEDITEM(#14361,(#14377),$);
+#14383= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'b195b7c3-9fbb-11e3-bfbc-7446a0b2bba9--18'),$);
+#14384= IFCPROPERTYSET('168PKHPDPDRvIPV$o14PfQ',#4,'Allplan Attributes',
+$,(#14383));
+#14386= IFCRELDEFINESBYPROPERTIES('0xKsJVQQ16EOwKPK3Rwm9h',#4,$,$,(
+#14373),#14384);
+#14390= IFCTEXTSTYLEFORDEFINEDFONT(#14391,$);
+#14391= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#14392= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#14393= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(350.));
+#14395= IFCTEXTSTYLE($,#14390,#14392,#14393);
+#14396= IFCTEXTLITERAL('d = 25cm',#14399,.LEFT.);
+#14397= IFCDIRECTION((0.7310552682428758,0.6823182503600038));
+#14399= IFCAXIS2PLACEMENT2D(#14400,#14397);
+#14400= IFCCARTESIANPOINT((87738.90713147861,22755.42414823773));
+#14402= IFCLOCALPLACEMENT($,#1);
+#14403= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#14396)
+);
+#14405= IFCPRODUCTDEFINITIONSHAPE($,$,(#14403));
+#14408= IFCANNOTATION('0ha2YmqDH8AAGz$kicjtiq',#4,$,$,$,#14402,#14405);
+#14412= IFCPRESENTATIONSTYLEASSIGNMENT((#14395));
+#14414= IFCSTYLEDITEM(#14396,(#14412),$);
+#14418= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--8'),$);
+#14419= IFCPROPERTYSET('3Q0Yt6vLrEu9E$ILwcz1Lk',#4,'Allplan Attributes',
+$,(#14418));
+#14421= IFCRELDEFINESBYPROPERTIES('3IPbD8FxLBLBNLZoDDlYIY',#4,$,$,(
+#14408),#14419);
+#14425= IFCTEXTSTYLEFORDEFINEDFONT(#14426,$);
+#14426= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#14427= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#14428= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#14430= IFCTEXTSTYLE($,#14425,#14427,#14428);
+#14431= IFCTEXTLITERAL('Absatz OK Boden 7cm',#14434,.LEFT.);
+#14432= IFCDIRECTION((1.,0.));
+#14434= IFCAXIS2PLACEMENT2D(#14435,#14432);
+#14435= IFCCARTESIANPOINT((75981.541562714,23740.00483059611));
+#14437= IFCLOCALPLACEMENT($,#1);
+#14438= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#14431)
+);
+#14440= IFCPRODUCTDEFINITIONSHAPE($,$,(#14438));
+#14443= IFCANNOTATION('1ULBtRpjD73A7plDbhzm8d',#4,$,$,$,#14437,#14440);
+#14447= IFCPRESENTATIONSTYLEASSIGNMENT((#14430));
+#14449= IFCSTYLEDITEM(#14431,(#14447),$);
+#14453= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--9'),$);
+#14454= IFCPROPERTYSET('18Gz9xJzn379OD12xaucDe',#4,'Allplan Attributes',
+$,(#14453));
+#14456= IFCRELDEFINESBYPROPERTIES('1BNb4_Jf978e6gJW_OvYHc',#4,$,$,(
+#14443),#14454);
+#14460= IFCTEXTSTYLEFORDEFINEDFONT(#14461,$);
+#14461= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#14462= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#14463= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#14465= IFCTEXTSTYLE($,#14460,#14462,#14463);
+#14466= IFCTEXTLITERAL('Absatz UK Boden 7cm',#14469,.LEFT.);
+#14467= IFCDIRECTION((1.,0.));
+#14469= IFCAXIS2PLACEMENT2D(#14470,#14467);
+#14470= IFCCARTESIANPOINT((75977.80217074958,24656.67149726277));
+#14472= IFCLOCALPLACEMENT($,#1);
+#14473= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#14466)
+);
+#14475= IFCPRODUCTDEFINITIONSHAPE($,$,(#14473));
+#14478= IFCANNOTATION('2$2QMUDSL2UhTzePc31KE5',#4,$,$,$,#14472,#14475);
+#14482= IFCPRESENTATIONSTYLEASSIGNMENT((#14465));
+#14484= IFCSTYLEDITEM(#14466,(#14482),$);
+#14488= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--10'),$);
+#14489= IFCPROPERTYSET('2CUh5tgMv36A8qdnFQnXZT',#4,'Allplan Attributes',
+$,(#14488));
+#14491= IFCRELDEFINESBYPROPERTIES('1VbvUFYnn7NfVAUe5ieMUt',#4,$,$,(
+#14478),#14489);
+#14495= IFCTEXTSTYLEFORDEFINEDFONT(#14496,$);
+#14496= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#14497= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#14498= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#14500= IFCTEXTSTYLE($,#14495,#14497,#14498);
+#14501= IFCTEXTLITERAL('Absatz OK Boden 7cm',#14504,.LEFT.);
+#14502= IFCDIRECTION((6.123233995736766E-17,1.));
+#14504= IFCAXIS2PLACEMENT2D(#14505,#14502);
+#14505= IFCCARTESIANPOINT((79188.33333333333,22338.59690241592));
+#14507= IFCLOCALPLACEMENT($,#1);
+#14508= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#14501)
+);
+#14510= IFCPRODUCTDEFINITIONSHAPE($,$,(#14508));
+#14513= IFCANNOTATION('2$M_EASzHDnu7$bAr6WdYQ',#4,$,$,$,#14507,#14510);
+#14517= IFCPRESENTATIONSTYLEASSIGNMENT((#14500));
+#14519= IFCSTYLEDITEM(#14501,(#14517),$);
+#14523= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--11'),$);
+#14524= IFCPROPERTYSET('0smlXdsinEmQupFWH0r8Wr',#4,'Allplan Attributes',
+$,(#14523));
+#14526= IFCRELDEFINESBYPROPERTIES('00G_g1JznAhAcz6J6Ng2iH',#4,$,$,(
+#14513),#14524);
+#14530= IFCTEXTSTYLEFORDEFINEDFONT(#14531,$);
+#14531= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#14532= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#14533= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#14535= IFCTEXTSTYLE($,#14530,#14532,#14533);
+#14536= IFCTEXTLITERAL('Absatz OK Boden 7cm',#14539,.LEFT.);
+#14537= IFCDIRECTION((1.,0.));
+#14539= IFCAXIS2PLACEMENT2D(#14540,#14537);
+#14540= IFCCARTESIANPOINT((79777.02674372181,22095.0048305961));
+#14542= IFCLOCALPLACEMENT($,#1);
+#14543= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#14536)
+);
+#14545= IFCPRODUCTDEFINITIONSHAPE($,$,(#14543));
+#14548= IFCANNOTATION('1Ptk6XYsD8Fu22kDRfStwf',#4,$,$,$,#14542,#14545);
+#14552= IFCPRESENTATIONSTYLEASSIGNMENT((#14535));
+#14554= IFCSTYLEDITEM(#14536,(#14552),$);
+#14558= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--12'),$);
+#14559= IFCPROPERTYSET('0zRmNRm9f6hfMtoU6dVdpQ',#4,'Allplan Attributes',
+$,(#14558));
+#14561= IFCRELDEFINESBYPROPERTIES('2VcJvPPIv3JxFgcoHK$zGl',#4,$,$,(
+#14548),#14559);
+#14565= IFCTEXTSTYLEFORDEFINEDFONT(#14566,$);
+#14566= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#14567= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#14568= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#14570= IFCTEXTSTYLE($,#14565,#14567,#14568);
+#14571= IFCTEXTLITERAL('Absatz OK Boden 7cm',#14574,.LEFT.);
+#14572= IFCDIRECTION((6.123233995736766E-17,1.));
+#14574= IFCAXIS2PLACEMENT2D(#14575,#14572);
+#14575= IFCCARTESIANPOINT((82025.,22520.04762552151));
+#14577= IFCLOCALPLACEMENT($,#1);
+#14578= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#14571)
+);
+#14580= IFCPRODUCTDEFINITIONSHAPE($,$,(#14578));
+#14583= IFCANNOTATION('0tojG1fET0Yup54LnPk3BN',#4,$,$,$,#14577,#14580);
+#14587= IFCPRESENTATIONSTYLEASSIGNMENT((#14570));
+#14589= IFCSTYLEDITEM(#14571,(#14587),$);
+#14593= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--13'),$);
+#14594= IFCPROPERTYSET('1w_c3I8AXEyQ9nG46gxSOL',#4,'Allplan Attributes',
+$,(#14593));
+#14596= IFCRELDEFINESBYPROPERTIES('2P66cp1uH8zAvtXlSeDTpj',#4,$,$,(
+#14583),#14594);
+#14600= IFCTEXTSTYLEFORDEFINEDFONT(#14601,$);
+#14601= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#14602= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#14603= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#14605= IFCTEXTSTYLE($,#14600,#14602,#14603);
+#14606= IFCTEXTLITERAL('Absatz OK Boden 7cm',#14609,.LEFT.);
+#14607= IFCDIRECTION((1.,0.));
+#14609= IFCAXIS2PLACEMENT2D(#14610,#14607);
+#14610= IFCCARTESIANPOINT((82528.94870789858,23990.0048305961));
+#14612= IFCLOCALPLACEMENT($,#1);
+#14613= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#14606)
+);
+#14615= IFCPRODUCTDEFINITIONSHAPE($,$,(#14613));
+#14618= IFCANNOTATION('3X83lH8AXDev2pue_LIXc3',#4,$,$,$,#14612,#14615);
+#14622= IFCPRESENTATIONSTYLEASSIGNMENT((#14605));
+#14624= IFCSTYLEDITEM(#14606,(#14622),$);
+#14628= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--14'),$);
+#14629= IFCPROPERTYSET('1R_lO28rb9QPiayOTTAX75',#4,'Allplan Attributes',
+$,(#14628));
+#14631= IFCRELDEFINESBYPROPERTIES('0Wvd_LRMf9Y9V7Vwf$wgid',#4,$,$,(
+#14618),#14629);
+#14635= IFCTEXTSTYLEFORDEFINEDFONT(#14636,$);
+#14636= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#14637= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#14638= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#14640= IFCTEXTSTYLE($,#14635,#14637,#14638);
+#14641= IFCTEXTLITERAL('Absatz OK Boden 7cm',#14644,.LEFT.);
+#14642= IFCDIRECTION((1.,0.));
+#14644= IFCAXIS2PLACEMENT2D(#14645,#14642);
+#14645= IFCCARTESIANPOINT((85062.27633487518,23740.0048305961));
+#14647= IFCLOCALPLACEMENT($,#1);
+#14648= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#14641)
+);
+#14650= IFCPRODUCTDEFINITIONSHAPE($,$,(#14648));
+#14653= IFCANNOTATION('2hDi4ff8DCXgv9vb$zuX1A',#4,$,$,$,#14647,#14650);
+#14657= IFCPRESENTATIONSTYLEASSIGNMENT((#14640));
+#14659= IFCSTYLEDITEM(#14641,(#14657),$);
+#14663= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--15'),$);
+#14664= IFCPROPERTYSET('0sDpLd69H09R7rZ6CoE17m',#4,'Allplan Attributes',
+$,(#14663));
+#14666= IFCRELDEFINESBYPROPERTIES('3ofn9tGT5AeOiweMvPeFFy',#4,$,$,(
+#14653),#14664);
+#14670= IFCTEXTSTYLEFORDEFINEDFONT(#14671,$);
+#14671= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#14672= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#14673= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#14675= IFCTEXTSTYLE($,#14670,#14672,#14673);
+#14676= IFCTEXTLITERAL('Absatz UK Boden 7cm',#14679,.LEFT.);
+#14677= IFCDIRECTION((1.,0.));
+#14679= IFCAXIS2PLACEMENT2D(#14680,#14677);
+#14680= IFCCARTESIANPOINT((87412.56598371331,24656.67149726277));
+#14682= IFCLOCALPLACEMENT($,#1);
+#14683= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#14676)
+);
+#14685= IFCPRODUCTDEFINITIONSHAPE($,$,(#14683));
+#14688= IFCANNOTATION('0gBwKTlf91WxA$sXUkoU0L',#4,$,$,$,#14682,#14685);
+#14692= IFCPRESENTATIONSTYLEASSIGNMENT((#14675));
+#14694= IFCSTYLEDITEM(#14676,(#14692),$);
+#14698= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--16'),$);
+#14699= IFCPROPERTYSET('0NQe8QvWLB$QSBOGagrImt',#4,'Allplan Attributes',
+$,(#14698));
+#14701= IFCRELDEFINESBYPROPERTIES('0JXUSYj8P1a8EITMtzLS1s',#4,$,$,(
+#14688),#14699);
+#14705= IFCTEXTSTYLEFORDEFINEDFONT(#14706,$);
+#14706= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#14707= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#14708= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#14710= IFCTEXTSTYLE($,#14705,#14707,#14708);
+#14711= IFCTEXTLITERAL('Absatz OK Boden 7cm',#14714,.LEFT.);
+#14712= IFCDIRECTION((1.,0.));
+#14714= IFCAXIS2PLACEMENT2D(#14715,#14712);
+#14715= IFCCARTESIANPOINT((90006.89477922957,23740.0048305961));
+#14717= IFCLOCALPLACEMENT($,#1);
+#14718= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#14711)
+);
+#14720= IFCPRODUCTDEFINITIONSHAPE($,$,(#14718));
+#14723= IFCANNOTATION('1xvV7csEX9J8V2i1_pihqM',#4,$,$,$,#14717,#14720);
+#14727= IFCPRESENTATIONSTYLEASSIGNMENT((#14710));
+#14729= IFCSTYLEDITEM(#14711,(#14727),$);
+#14733= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--17'),$);
+#14734= IFCPROPERTYSET('2S7Lred$L49whfOjw017US',#4,'Allplan Attributes',
+$,(#14733));
+#14736= IFCRELDEFINESBYPROPERTIES('0893i3tpHDVPSOXs$4Mew0',#4,$,$,(
+#14723),#14734);
+#14740= IFCTEXTSTYLEFORDEFINEDFONT(#14741,$);
+#14741= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#14742= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.4));
+#14743= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#14745= IFCTEXTSTYLE($,#14740,#14742,#14743);
+#14746= IFCPLANAREXTENT(1940.,240.);
+#14747= IFCTEXTLITERALWITHEXTENT(
+'Fund. d=30cm, UK= -0.90\X\0A+ 5cm Magerbeton (UK= -0.95)',#14750,.LEFT.
+,#14746,'top-left');
+#14748= IFCDIRECTION((1.,0.));
+#14750= IFCAXIS2PLACEMENT2D(#14751,#14748);
+#14751= IFCCARTESIANPOINT((69475.,8050.004830596101));
+#14753= IFCLOCALPLACEMENT($,#1);
+#14754= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#14747)
+);
+#14756= IFCPRODUCTDEFINITIONSHAPE($,$,(#14754));
+#14759= IFCANNOTATION('1RDaDWrpX1ceZVDnBDBVT1',#4,$,$,$,#14753,#14756);
+#14763= IFCPRESENTATIONSTYLEASSIGNMENT((#14745));
+#14765= IFCSTYLEDITEM(#14747,(#14763),$);
+#14769= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--18'),$);
+#14770= IFCPROPERTYSET('1U4bSQ4pr0lvCFH9wPAB_g',#4,'Allplan Attributes',
+$,(#14769));
+#14772= IFCRELDEFINESBYPROPERTIES('3JVrZekob56QDtP9sVx8Q9',#4,$,$,(
+#14759),#14770);
+#14776= IFCTEXTSTYLEFORDEFINEDFONT(#14777,$);
+#14777= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#14778= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.4));
+#14779= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#14781= IFCTEXTSTYLE($,#14776,#14778,#14779);
+#14782= IFCPLANAREXTENT(1940.,240.);
+#14783= IFCTEXTLITERALWITHEXTENT(
+'Fund. d=30cm, UK= -0.90\X\0A+ 5cm Magerbeton (UK= -0.95)',#14786,.LEFT.
+,#14782,'top-left');
+#14784= IFCDIRECTION((1.,0.));
+#14786= IFCAXIS2PLACEMENT2D(#14787,#14784);
+#14787= IFCCARTESIANPOINT((95155.00000000002,8050.004830596099));
+#14789= IFCLOCALPLACEMENT($,#1);
+#14790= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#14783)
+);
+#14792= IFCPRODUCTDEFINITIONSHAPE($,$,(#14790));
+#14795= IFCANNOTATION('3ogtRWNNX5tAaE6TkslJ5C',#4,$,$,$,#14789,#14792);
+#14799= IFCPRESENTATIONSTYLEASSIGNMENT((#14781));
+#14801= IFCSTYLEDITEM(#14783,(#14799),$);
+#14805= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--19'),$);
+#14806= IFCPROPERTYSET('0ML9m$Q$HF2h07ihXm31Zg',#4,'Allplan Attributes',
+$,(#14805));
+#14808= IFCRELDEFINESBYPROPERTIES('33$7S2b3b4gfM60CuKIL8P',#4,$,$,(
+#14795),#14806);
+#14812= IFCTEXTSTYLEFORDEFINEDFONT(#14813,$);
+#14813= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#14814= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.4));
+#14815= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#14817= IFCTEXTSTYLE($,#14812,#14814,#14815);
+#14818= IFCPLANAREXTENT(1940.,240.);
+#14819= IFCTEXTLITERALWITHEXTENT(
+'Fund. d=30cm, UK= -0.90\X\0A+ 5cm Magerbeton (UK= -0.95)',#14822,.LEFT.
+,#14818,'top-left');
+#14820= IFCDIRECTION((6.123233995736766E-17,1.));
+#14822= IFCAXIS2PLACEMENT2D(#14823,#14820);
+#14823= IFCCARTESIANPOINT((102125.,10580.0048305961));
+#14825= IFCLOCALPLACEMENT($,#1);
+#14826= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#14819)
+);
+#14828= IFCPRODUCTDEFINITIONSHAPE($,$,(#14826));
+#14831= IFCANNOTATION('2IxxYqV7D5iekOhoZkmVvV',#4,$,$,$,#14825,#14828);
+#14835= IFCPRESENTATIONSTYLEASSIGNMENT((#14817));
+#14837= IFCSTYLEDITEM(#14819,(#14835),$);
+#14841= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--20'),$);
+#14842= IFCPROPERTYSET('3KvFp5oDP2KBPBluIjcPQc',#4,'Allplan Attributes',
+$,(#14841));
+#14844= IFCRELDEFINESBYPROPERTIES('3bfzIFAIv66xCtVNv6A2HJ',#4,$,$,(
+#14831),#14842);
+#14848= IFCTEXTSTYLEFORDEFINEDFONT(#14849,$);
+#14849= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#14850= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.4));
+#14851= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#14853= IFCTEXTSTYLE($,#14848,#14850,#14851);
+#14854= IFCPLANAREXTENT(1940.,240.);
+#14855= IFCTEXTLITERALWITHEXTENT(
+'Fund. d=30cm, UK= -0.90\X\0A+ 5cm Magerbeton (UK= -0.95)',#14858,.LEFT.
+,#14854,'top-left');
+#14856= IFCDIRECTION((6.123233995736766E-17,1.));
+#14858= IFCAXIS2PLACEMENT2D(#14859,#14856);
+#14859= IFCCARTESIANPOINT((64198.33333333334,21420.0048305961));
+#14861= IFCLOCALPLACEMENT($,#1);
+#14862= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#14855)
+);
+#14864= IFCPRODUCTDEFINITIONSHAPE($,$,(#14862));
+#14867= IFCANNOTATION('24Z6_pTkL75xdVZcyislP0',#4,$,$,$,#14861,#14864);
+#14871= IFCPRESENTATIONSTYLEASSIGNMENT((#14853));
+#14873= IFCSTYLEDITEM(#14855,(#14871),$);
+#14877= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--21'),$);
+#14878= IFCPROPERTYSET('1MjmphGrTAfugqVbdwim8X',#4,'Allplan Attributes',
+$,(#14877));
+#14880= IFCRELDEFINESBYPROPERTIES('343j$OKPT4GPo4DGTueHMq',#4,$,$,(
+#14867),#14878);
+#14884= IFCTEXTSTYLEFORDEFINEDFONT(#14885,$);
+#14885= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#14886= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.4));
+#14887= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#14889= IFCTEXTSTYLE($,#14884,#14886,#14887);
+#14890= IFCPLANAREXTENT(1940.,240.);
+#14891= IFCTEXTLITERALWITHEXTENT(
+'Fund. d=30cm, UK= -0.90\X\0A+ 5cm Magerbeton (UK= -0.95)',#14894,.LEFT.
+,#14890,'top-left');
+#14892= IFCDIRECTION((6.123233995736766E-17,1.));
+#14894= IFCAXIS2PLACEMENT2D(#14895,#14892);
+#14895= IFCCARTESIANPOINT((64198.33333333333,10580.0048305961));
+#14897= IFCLOCALPLACEMENT($,#1);
+#14898= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#14891)
+);
+#14900= IFCPRODUCTDEFINITIONSHAPE($,$,(#14898));
+#14903= IFCANNOTATION('3OHrZkf$LE_ewSZnnrX2td',#4,$,$,$,#14897,#14900);
+#14907= IFCPRESENTATIONSTYLEASSIGNMENT((#14889));
+#14909= IFCSTYLEDITEM(#14891,(#14907),$);
+#14913= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--22'),$);
+#14914= IFCPROPERTYSET('2xXIBbuTT6fQgQVQhvStPv',#4,'Allplan Attributes',
+$,(#14913));
+#14916= IFCRELDEFINESBYPROPERTIES('1hXcWFPNDEVeM8$mBumM1N',#4,$,$,(
+#14903),#14914);
+#14920= IFCTEXTSTYLEFORDEFINEDFONT(#14921,$);
+#14921= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#14922= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.4));
+#14923= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#14925= IFCTEXTSTYLE($,#14920,#14922,#14923);
+#14926= IFCPLANAREXTENT(1940.,240.);
+#14927= IFCTEXTLITERALWITHEXTENT(
+'Fund. d=30cm, UK= -0.90\X\0A+ 5cm Magerbeton (UK= -0.95)',#14930,.LEFT.
+,#14926,'top-left');
+#14928= IFCDIRECTION((6.123233995736766E-17,1.));
+#14930= IFCAXIS2PLACEMENT2D(#14931,#14928);
+#14931= IFCCARTESIANPOINT((102125.,20920.0048305961));
+#14933= IFCLOCALPLACEMENT($,#1);
+#14934= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#14927)
+);
+#14936= IFCPRODUCTDEFINITIONSHAPE($,$,(#14934));
+#14939= IFCANNOTATION('1Qcptgoov3oO4MN2XYgcPl',#4,$,$,$,#14933,#14936);
+#14943= IFCPRESENTATIONSTYLEASSIGNMENT((#14925));
+#14945= IFCSTYLEDITEM(#14927,(#14943),$);
+#14949= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--91'),$);
+#14950= IFCPROPERTYSET('2JHgOie7T5ohOSU$Yj_cRT',#4,'Allplan Attributes',
+$,(#14949));
+#14952= IFCRELDEFINESBYPROPERTIES('0Zobq$nlfCox43igTDByBl',#4,$,$,(
+#14939),#14950);
+#14956= IFCTEXTSTYLEFORDEFINEDFONT(#14957,$);
+#14957= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#14958= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#14959= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#14961= IFCTEXTSTYLE($,#14956,#14958,#14959);
+#14962= IFCTEXTLITERAL('A',#14965,.LEFT.);
+#14963= IFCDIRECTION((1.,0.));
+#14965= IFCAXIS2PLACEMENT2D(#14966,#14963);
+#14966= IFCCARTESIANPOINT((85952.9040210247,23151.85649857375));
+#14968= IFCLOCALPLACEMENT($,#1);
+#14969= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#14962)
+);
+#14971= IFCPRODUCTDEFINITIONSHAPE($,$,(#14969));
+#14974= IFCANNOTATION('3shJvPZ0D5YvGXMLvRnYbo',#4,$,$,$,#14968,#14971);
+#14978= IFCPRESENTATIONSTYLEASSIGNMENT((#14961));
+#14980= IFCSTYLEDITEM(#14962,(#14978),$);
+#14984= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--309'),$);
+#14985= IFCPROPERTYSET('3rqAP5kv5AbwaQqG_Lfo4N',#4,'Allplan Attributes',
+$,(#14984));
+#14987= IFCRELDEFINESBYPROPERTIES('0iXyf0uev42xBdb3oAnQrL',#4,$,$,(
+#14974),#14985);
+#14991= IFCTEXTSTYLEFORDEFINEDFONT(#14992,$);
+#14992= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#14993= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#14994= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#14996= IFCTEXTSTYLE($,#14991,#14993,#14994);
+#14997= IFCTEXTLITERAL('A',#15000,.LEFT.);
+#14998= IFCDIRECTION((1.,0.));
+#15000= IFCAXIS2PLACEMENT2D(#15001,#14998);
+#15001= IFCCARTESIANPOINT((90153.76264563203,23151.85649857376));
+#15003= IFCLOCALPLACEMENT($,#1);
+#15004= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#14997)
+);
+#15006= IFCPRODUCTDEFINITIONSHAPE($,$,(#15004));
+#15009= IFCANNOTATION('0$f1PAeJ9DQgU$duZQpr_i',#4,$,$,$,#15003,#15006);
+#15013= IFCPRESENTATIONSTYLEASSIGNMENT((#14996));
+#15015= IFCSTYLEDITEM(#14997,(#15013),$);
+#15019= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--321'),$);
+#15020= IFCPROPERTYSET('0BMborHuDCrBIn2$C25sf0',#4,'Allplan Attributes',
+$,(#15019));
+#15022= IFCRELDEFINESBYPROPERTIES('0RhclzjL5FMxgTULf6XTFt',#4,$,$,(
+#15009),#15020);
+#15026= IFCTEXTSTYLEFORDEFINEDFONT(#15027,$);
+#15027= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#15028= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#15029= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(350.));
+#15031= IFCTEXTSTYLE($,#15026,#15028,#15029);
+#15032= IFCTEXTLITERAL('d = 25cm',#15035,.LEFT.);
+#15033= IFCDIRECTION((0.9808262151348187,0.1948844162684801));
+#15035= IFCAXIS2PLACEMENT2D(#15036,#15033);
+#15036= IFCCARTESIANPOINT((83632.23966450329,25811.54350744394));
+#15038= IFCLOCALPLACEMENT($,#1);
+#15039= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#15032)
+);
+#15041= IFCPRODUCTDEFINITIONSHAPE($,$,(#15039));
+#15044= IFCANNOTATION('37b80FPUj6$BXAQVJgoAJy',#4,$,$,$,#15038,#15041);
+#15048= IFCPRESENTATIONSTYLEASSIGNMENT((#15031));
+#15050= IFCSTYLEDITEM(#15032,(#15048),$);
+#15054= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--346'),$);
+#15055= IFCPROPERTYSET('3Bnhfa8oL2ggWCT2twu_zk',#4,'Allplan Attributes',
+$,(#15054));
+#15057= IFCRELDEFINESBYPROPERTIES('2$ENSOMprBE9$nbJHAaJli',#4,$,$,(
+#15044),#15055);
+#15061= IFCTEXTSTYLEFORDEFINEDFONT(#15062,$);
+#15062= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#15063= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#15064= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#15066= IFCTEXTSTYLE($,#15061,#15063,#15064);
+#15067= IFCTEXTLITERAL('f1',#15070,.LEFT.);
+#15068= IFCDIRECTION((1.,0.));
+#15070= IFCAXIS2PLACEMENT2D(#15071,#15068);
+#15071= IFCCARTESIANPOINT((63944.51335346072,16091.04263252323));
+#15073= IFCLOCALPLACEMENT($,#1);
+#15074= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#15067)
+);
+#15076= IFCPRODUCTDEFINITIONSHAPE($,$,(#15074));
+#15079= IFCANNOTATION('2M7sXqrLPD6fWtRRJGAxjG',#4,$,$,$,#15073,#15076);
+#15083= IFCPRESENTATIONSTYLEASSIGNMENT((#15066));
+#15085= IFCSTYLEDITEM(#15067,(#15083),$);
+#15089= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--400'),$);
+#15090= IFCPROPERTYSET('1Rs0p9iA1BTB25d44Ydq$k',#4,'Allplan Attributes',
+$,(#15089));
+#15092= IFCRELDEFINESBYPROPERTIES('3bINBeH1P4NPDuaR9c2QtM',#4,$,$,(
+#15079),#15090);
+#15096= IFCTEXTSTYLEFORDEFINEDFONT(#15097,$);
+#15097= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#15098= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#15099= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#15101= IFCTEXTSTYLE($,#15096,#15098,#15099);
+#15102= IFCTEXTLITERAL('f1',#15105,.LEFT.);
+#15103= IFCDIRECTION((1.,0.));
+#15105= IFCAXIS2PLACEMENT2D(#15106,#15103);
+#15106= IFCCARTESIANPOINT((102367.5048670323,23148.54263252323));
+#15108= IFCLOCALPLACEMENT($,#1);
+#15109= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#15102)
+);
+#15111= IFCPRODUCTDEFINITIONSHAPE($,$,(#15109));
+#15114= IFCANNOTATION('3tvrkJXCH1v8naPl2pkmVB',#4,$,$,$,#15108,#15111);
+#15118= IFCPRESENTATIONSTYLEASSIGNMENT((#15101));
+#15120= IFCSTYLEDITEM(#15102,(#15118),$);
+#15124= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--401'),$);
+#15125= IFCPROPERTYSET('1DwCjr725DqAbtyC6bxTuZ',#4,'Allplan Attributes',
+$,(#15124));
+#15127= IFCRELDEFINESBYPROPERTIES('2q5UulbBf6YxV7b_P29ltG',#4,$,$,(
+#15114),#15125);
+#15131= IFCTEXTSTYLEFORDEFINEDFONT(#15132,$);
+#15132= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#15133= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#15134= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#15136= IFCTEXTSTYLE($,#15131,#15133,#15134);
+#15137= IFCTEXTLITERAL('F1',#15140,.LEFT.);
+#15138= IFCDIRECTION((1.,0.));
+#15140= IFCAXIS2PLACEMENT2D(#15141,#15138);
+#15141= IFCCARTESIANPOINT((96418.85940563989,17938.30953539124));
+#15143= IFCLOCALPLACEMENT($,#1);
+#15144= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#15137)
+);
+#15146= IFCPRODUCTDEFINITIONSHAPE($,$,(#15144));
+#15149= IFCANNOTATION('29gA1eLVL8zBi5l8wYDLm4',#4,$,$,$,#15143,#15146);
+#15153= IFCPRESENTATIONSTYLEASSIGNMENT((#15136));
+#15155= IFCSTYLEDITEM(#15137,(#15153),$);
+#15159= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--402'),$);
+#15160= IFCPROPERTYSET('0_R2JiqmHFyhQFTGX0VVBH',#4,'Allplan Attributes',
+$,(#15159));
+#15162= IFCRELDEFINESBYPROPERTIES('3px3qyPDD8rxbX_7kfx98V',#4,$,$,(
+#15149),#15160);
+#15166= IFCTEXTSTYLEFORDEFINEDFONT(#15167,$);
+#15167= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#15168= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#15169= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#15171= IFCTEXTSTYLE($,#15166,#15168,#15169);
+#15172= IFCTEXTLITERAL('f2',#15175,.LEFT.);
+#15173= IFCDIRECTION((1.,0.));
+#15175= IFCAXIS2PLACEMENT2D(#15176,#15173);
+#15176= IFCCARTESIANPOINT((78350.00486703226,7551.042632523229));
+#15178= IFCLOCALPLACEMENT($,#1);
+#15179= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#15172)
+);
+#15181= IFCPRODUCTDEFINITIONSHAPE($,$,(#15179));
+#15184= IFCANNOTATION('3FF54oOMPAv87m$Vd$lC43',#4,$,$,$,#15178,#15181);
+#15188= IFCPRESENTATIONSTYLEASSIGNMENT((#15171));
+#15190= IFCSTYLEDITEM(#15172,(#15188),$);
+#15194= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--487'),$);
+#15195= IFCPROPERTYSET('3PjLwHUX5FkPR_qO3xh_js',#4,'Allplan Attributes',
+$,(#15194));
+#15197= IFCRELDEFINESBYPROPERTIES('3f4KJVkxb9ePjCoz1XKge_',#4,$,$,(
+#15184),#15195);
+#15201= IFCTEXTSTYLEFORDEFINEDFONT(#15202,$);
+#15202= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#15203= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#15204= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#15206= IFCTEXTSTYLE($,#15201,#15203,#15204);
+#15207= IFCTEXTLITERAL('f3',#15210,.LEFT.);
+#15208= IFCDIRECTION((1.,0.));
+#15210= IFCAXIS2PLACEMENT2D(#15211,#15208);
+#15211= IFCCARTESIANPOINT((93993.5098230476,7551.042632523229));
+#15213= IFCLOCALPLACEMENT($,#1);
+#15214= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#15207)
+);
+#15216= IFCPRODUCTDEFINITIONSHAPE($,$,(#15214));
+#15219= IFCANNOTATION('3Dzssykx50UfjSvv6QfiO6',#4,$,$,$,#15213,#15216);
+#15223= IFCPRESENTATIONSTYLEASSIGNMENT((#15206));
+#15225= IFCSTYLEDITEM(#15207,(#15223),$);
+#15229= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--488'),$);
+#15230= IFCPROPERTYSET('21JtudWhr8ZQ$wyjErczKs',#4,'Allplan Attributes',
+$,(#15229));
+#15232= IFCRELDEFINESBYPROPERTIES('16RBz1FTP61ApyEgHMKj$t',#4,$,$,(
+#15219),#15230);
+#15236= IFCTEXTSTYLEFORDEFINEDFONT(#15237,$);
+#15237= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#15238= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#15239= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#15241= IFCTEXTSTYLE($,#15236,#15238,#15239);
+#15242= IFCTEXTLITERAL('f4',#15245,.LEFT.);
+#15243= IFCDIRECTION((1.,0.));
+#15245= IFCAXIS2PLACEMENT2D(#15246,#15243);
+#15246= IFCCARTESIANPOINT((98812.22799894086,7551.042632523229));
+#15248= IFCLOCALPLACEMENT($,#1);
+#15249= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#15242)
+);
+#15251= IFCPRODUCTDEFINITIONSHAPE($,$,(#15249));
+#15254= IFCANNOTATION('1_1gm$Hy5FhQW9zQCWb0LB',#4,$,$,$,#15248,#15251);
+#15258= IFCPRESENTATIONSTYLEASSIGNMENT((#15241));
+#15260= IFCSTYLEDITEM(#15242,(#15258),$);
+#15264= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--489'),$);
+#15265= IFCPROPERTYSET('1Yelme4hb3_O7g9asq_916',#4,'Allplan Attributes',
+$,(#15264));
+#15267= IFCRELDEFINESBYPROPERTIES('1bwhFnhlPBM95jn6J_UE6C',#4,$,$,(
+#15254),#15265);
+#15271= IFCTEXTSTYLEFORDEFINEDFONT(#15272,$);
+#15272= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#15273= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#15274= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#15276= IFCTEXTSTYLE($,#15271,#15273,#15274);
+#15277= IFCTEXTLITERAL('f5',#15280,.LEFT.);
+#15278= IFCDIRECTION((1.,0.));
+#15280= IFCAXIS2PLACEMENT2D(#15281,#15278);
+#15281= IFCCARTESIANPOINT((102364.5133534607,15128.54263252323));
+#15283= IFCLOCALPLACEMENT($,#1);
+#15284= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#15277)
+);
+#15286= IFCPRODUCTDEFINITIONSHAPE($,$,(#15284));
+#15289= IFCANNOTATION('33JJ7awbX2_ewXYStMI$gr',#4,$,$,$,#15283,#15286);
+#15293= IFCPRESENTATIONSTYLEASSIGNMENT((#15276));
+#15295= IFCSTYLEDITEM(#15277,(#15293),$);
+#15299= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--490'),$);
+#15300= IFCPROPERTYSET('0KO7MmwNL6bwFCRru9dBJx',#4,'Allplan Attributes',
+$,(#15299));
+#15302= IFCRELDEFINESBYPROPERTIES('08E8m4_mzDSuhLSgFOyeU1',#4,$,$,(
+#15289),#15300);
+#15306= IFCTEXTSTYLEFORDEFINEDFONT(#15307,$);
+#15307= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#15308= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#15309= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#15311= IFCTEXTSTYLE($,#15306,#15308,#15309);
+#15312= IFCTEXTLITERAL('f6',#15315,.LEFT.);
+#15313= IFCDIRECTION((1.,0.));
+#15315= IFCAXIS2PLACEMENT2D(#15316,#15313);
+#15316= IFCCARTESIANPOINT((79088.46093109454,15126.04263252324));
+#15318= IFCLOCALPLACEMENT($,#1);
+#15319= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#15312)
+);
+#15321= IFCPRODUCTDEFINITIONSHAPE($,$,(#15319));
+#15324= IFCANNOTATION('0yZoHXY852a8b8TygV4CHJ',#4,$,$,$,#15318,#15321);
+#15328= IFCPRESENTATIONSTYLEASSIGNMENT((#15311));
+#15330= IFCSTYLEDITEM(#15312,(#15328),$);
+#15334= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--491'),$);
+#15335= IFCPROPERTYSET('0ICco4IcT1FRDuJnQgAmMs',#4,'Allplan Attributes',
+$,(#15334));
+#15337= IFCRELDEFINESBYPROPERTIES('00aReJEpH0PPPDro9p28QE',#4,$,$,(
+#15324),#15335);
+#15341= IFCTEXTSTYLEFORDEFINEDFONT(#15342,$);
+#15342= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#15343= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#15344= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#15346= IFCTEXTSTYLE($,#15341,#15343,#15344);
+#15347= IFCTEXTLITERAL('f7',#15350,.LEFT.);
+#15348= IFCDIRECTION((1.,0.));
+#15350= IFCAXIS2PLACEMENT2D(#15351,#15348);
+#15351= IFCCARTESIANPOINT((90227.54729917461,12438.54263252323));
+#15353= IFCLOCALPLACEMENT($,#1);
+#15354= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#15347)
+);
+#15356= IFCPRODUCTDEFINITIONSHAPE($,$,(#15354));
+#15359= IFCANNOTATION('33qDnWeU15gQa$LfltDkWX',#4,$,$,$,#15353,#15356);
+#15363= IFCPRESENTATIONSTYLEASSIGNMENT((#15346));
+#15365= IFCSTYLEDITEM(#15347,(#15363),$);
+#15369= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--492'),$);
+#15370= IFCPROPERTYSET('0BP6i85eb4bONyJebO9GA1',#4,'Allplan Attributes',
+$,(#15369));
+#15372= IFCRELDEFINESBYPROPERTIES('2QglYPNA161hRNZPDwoWLp',#4,$,$,(
+#15359),#15370);
+#15376= IFCTEXTSTYLEFORDEFINEDFONT(#15377,$);
+#15377= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#15378= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#15379= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#15381= IFCTEXTSTYLE($,#15376,#15378,#15379);
+#15382= IFCTEXTLITERAL('f8',#15385,.LEFT.);
+#15383= IFCDIRECTION((1.,0.));
+#15385= IFCAXIS2PLACEMENT2D(#15386,#15383);
+#15386= IFCCARTESIANPOINT((96930.44389119459,12513.54263252323));
+#15388= IFCLOCALPLACEMENT($,#1);
+#15389= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#15382)
+);
+#15391= IFCPRODUCTDEFINITIONSHAPE($,$,(#15389));
+#15394= IFCANNOTATION('3CrvB6BUXF58ALOUcRR7BA',#4,$,$,$,#15388,#15391);
+#15398= IFCPRESENTATIONSTYLEASSIGNMENT((#15381));
+#15400= IFCSTYLEDITEM(#15382,(#15398),$);
+#15404= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--493'),$);
+#15405= IFCPROPERTYSET('3TP6ZcKVn6Dw2llusZqQyX',#4,'Allplan Attributes',
+$,(#15404));
+#15407= IFCRELDEFINESBYPROPERTIES('2TQhatC7f4N9Jr6cvmC017',#4,$,$,(
+#15394),#15405);
+#15411= IFCTEXTSTYLEFORDEFINEDFONT(#15412,$);
+#15412= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#15413= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#15414= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#15416= IFCTEXTSTYLE($,#15411,#15413,#15414);
+#15417= IFCTEXTLITERAL('f9',#15420,.LEFT.);
+#15418= IFCDIRECTION((1.,0.));
+#15420= IFCAXIS2PLACEMENT2D(#15421,#15418);
+#15421= IFCCARTESIANPOINT((96915.96093109452,21621.04263252323));
+#15423= IFCLOCALPLACEMENT($,#1);
+#15424= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#15417)
+);
+#15426= IFCPRODUCTDEFINITIONSHAPE($,$,(#15424));
+#15429= IFCANNOTATION('3tuHl2XMT67uarPE7vBdgd',#4,$,$,$,#15423,#15426);
+#15433= IFCPRESENTATIONSTYLEASSIGNMENT((#15416));
+#15435= IFCSTYLEDITEM(#15417,(#15433),$);
+#15439= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--494'),$);
+#15440= IFCPROPERTYSET('14CH1hTr1BjRelgDBTyy9x',#4,'Allplan Attributes',
+$,(#15439));
+#15442= IFCRELDEFINESBYPROPERTIES('0jCo7weFf0RgdfrNC37$LP',#4,$,$,(
+#15429),#15440);
+#15446= IFCTEXTSTYLEFORDEFINEDFONT(#15447,$);
+#15447= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#15448= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#15449= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#15451= IFCTEXTSTYLE($,#15446,#15448,#15449);
+#15452= IFCTEXTLITERAL('B',#15455,.LEFT.);
+#15453= IFCDIRECTION((6.123233995736766E-17,1.));
+#15455= IFCAXIS2PLACEMENT2D(#15456,#15453);
+#15456= IFCCARTESIANPOINT((88169.24186625176,20927.9088516208));
+#15458= IFCLOCALPLACEMENT($,#1);
+#15459= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#15452)
+);
+#15461= IFCPRODUCTDEFINITIONSHAPE($,$,(#15459));
+#15464= IFCANNOTATION('3OKAxUAJT27PDcv6wEfNrE',#4,$,$,$,#15458,#15461);
+#15468= IFCPRESENTATIONSTYLEASSIGNMENT((#15451));
+#15470= IFCSTYLEDITEM(#15452,(#15468),$);
+#15474= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--518'),$);
+#15475= IFCPROPERTYSET('0GeqNzvnrBEQK2i5owQAQ5',#4,'Allplan Attributes',
+$,(#15474));
+#15477= IFCRELDEFINESBYPROPERTIES('01IPE6KhXBIu0pv4G0DzIU',#4,$,$,(
+#15464),#15475);
+#15481= IFCTEXTSTYLEFORDEFINEDFONT(#15482,$);
+#15482= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#15483= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#15484= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#15486= IFCTEXTSTYLE($,#15481,#15483,#15484);
+#15487= IFCTEXTLITERAL('B',#15490,.LEFT.);
+#15488= IFCDIRECTION((6.123233995736766E-17,1.));
+#15490= IFCAXIS2PLACEMENT2D(#15491,#15488);
+#15491= IFCCARTESIANPOINT((88169.24186625176,25478.76747622812));
+#15493= IFCLOCALPLACEMENT($,#1);
+#15494= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#15487)
+);
+#15496= IFCPRODUCTDEFINITIONSHAPE($,$,(#15494));
+#15499= IFCANNOTATION('0eMGH9ecH6jvHfZaoV9eQc',#4,$,$,$,#15493,#15496);
+#15503= IFCPRESENTATIONSTYLEASSIGNMENT((#15486));
+#15505= IFCSTYLEDITEM(#15487,(#15503),$);
+#15509= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--519'),$);
+#15510= IFCPROPERTYSET('1Wyuc6Z$DEWO_EkXZ$4fEr',#4,'Allplan Attributes',
+$,(#15509));
+#15512= IFCRELDEFINESBYPROPERTIES('3Lo799Wr1A$83ZpIZL3cha',#4,$,$,(
+#15499),#15510);
+#15516= IFCTEXTSTYLEFORDEFINEDFONT(#15517,$);
+#15517= IFCCOLOURRGB($,0.4392156862745098,0.4392156862745098,1.);
+#15518= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.5));
+#15519= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(250.));
+#15521= IFCTEXTSTYLE($,#15516,#15518,#15519);
+#15522= IFCPLANAREXTENT(4979.166666666672,312.5);
+#15523= IFCTEXTLITERALWITHEXTENT(
+'unter Fundamente mit Sickerbeton 32/45mm CEM 200 kg/m\X2\00B3\X0\\X\0Aoder Magerbeton CEM 200 kg/m\X2\00B3\X0\ bis auf Kiesschicht fundieren !'
+,#15526,.LEFT.,#15522,'top-left');
+#15524= IFCDIRECTION((1.,0.));
+#15526= IFCAXIS2PLACEMENT2D(#15527,#15524);
+#15527= IFCCARTESIANPOINT((79040.90503321811,12115.36635853764));
+#15529= IFCLOCALPLACEMENT($,#1);
+#15530= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#15523)
+);
+#15532= IFCPRODUCTDEFINITIONSHAPE($,$,(#15530));
+#15535= IFCANNOTATION('2BhWdhykX3gAvE2GaIyzfp',#4,$,$,$,#15529,#15532);
+#15539= IFCPRESENTATIONSTYLEASSIGNMENT((#15521));
+#15541= IFCSTYLEDITEM(#15523,(#15539),$);
+#15545= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--530'),$);
+#15546= IFCPROPERTYSET('2IeZMNlLT9iOUvDaTebQ_t',#4,'Allplan Attributes',
+$,(#15545));
+#15548= IFCRELDEFINESBYPROPERTIES('1b$NyjVBD1f8UEkxglwDVs',#4,$,$,(
+#15535),#15546);
+#15552= IFCTEXTSTYLEFORDEFINEDFONT(#15553,$);
+#15553= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#15554= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#15555= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#15557= IFCTEXTSTYLE($,#15552,#15554,#15555);
+#15558= IFCTEXTLITERAL('Einlage 15x25cm',#15561,.LEFT.);
+#15559= IFCDIRECTION((1.,0.));
+#15561= IFCAXIS2PLACEMENT2D(#15562,#15559);
+#15562= IFCCARTESIANPOINT((94135.,8666.671497262763));
+#15564= IFCLOCALPLACEMENT($,#1);
+#15565= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#15558)
+);
+#15567= IFCPRODUCTDEFINITIONSHAPE($,$,(#15565));
+#15570= IFCANNOTATION('1MaJe0z3zBtvEmWjX4nwyH',#4,$,$,$,#15564,#15567);
+#15574= IFCPRESENTATIONSTYLEASSIGNMENT((#15557));
+#15576= IFCSTYLEDITEM(#15558,(#15574),$);
+#15580= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--557'),$);
+#15581= IFCPROPERTYSET('3uL5nDiKT1TfuheAaeVbRo',#4,'Allplan Attributes',
+$,(#15580));
+#15583= IFCRELDEFINESBYPROPERTIES('0mjUbNBLD1lwZH9U6NyJHd',#4,$,$,(
+#15570),#15581);
+#15587= IFCTEXTSTYLEFORDEFINEDFONT(#15588,$);
+#15588= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#15589= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#15590= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#15592= IFCTEXTSTYLE($,#15587,#15589,#15590);
+#15593= IFCTEXTLITERAL('Arbeitsfuge mit Quellfugenband !',#15596,.LEFT.
+);
+#15594= IFCDIRECTION((6.123233995736766E-17,1.));
+#15596= IFCAXIS2PLACEMENT2D(#15597,#15594);
+#15597= IFCCARTESIANPOINT((77728.33333333336,11056.97175194527));
+#15599= IFCLOCALPLACEMENT($,#1);
+#15600= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#15593)
+);
+#15602= IFCPRODUCTDEFINITIONSHAPE($,$,(#15600));
+#15605= IFCANNOTATION('1YjOiHzGXAWByTfXwVljOa',#4,$,$,$,#15599,#15602);
+#15609= IFCPRESENTATIONSTYLEASSIGNMENT((#15592));
+#15611= IFCSTYLEDITEM(#15593,(#15609),$);
+#15615= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--564'),$);
+#15616= IFCPROPERTYSET('29l69gzszE0f17$5XkDu5r',#4,'Allplan Attributes',
+$,(#15615));
+#15618= IFCRELDEFINESBYPROPERTIES('0t$qNDvG1Bg89$Kp7YFtGd',#4,$,$,(
+#15605),#15616);
+#15622= IFCTEXTSTYLEFORDEFINEDFONT(#15623,$);
+#15623= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#15624= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#15625= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#15627= IFCTEXTSTYLE($,#15622,#15624,#15625);
+#15628= IFCTEXTLITERAL('Arbeitsfuge mit Quellfugenband !',#15631,.LEFT.
+);
+#15629= IFCDIRECTION((6.123233995736766E-17,1.));
+#15631= IFCAXIS2PLACEMENT2D(#15632,#15629);
+#15632= IFCCARTESIANPOINT((77728.33333333336,21266.51780159047));
+#15634= IFCLOCALPLACEMENT($,#1);
+#15635= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#15628)
+);
+#15637= IFCPRODUCTDEFINITIONSHAPE($,$,(#15635));
+#15640= IFCANNOTATION('2uZzB6cYHFqA8XJlL21DHV',#4,$,$,$,#15634,#15637);
+#15644= IFCPRESENTATIONSTYLEASSIGNMENT((#15627));
+#15646= IFCSTYLEDITEM(#15628,(#15644),$);
+#15650= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--565'),$);
+#15651= IFCPROPERTYSET('0osBSvPMn328llgoyTNp_A',#4,'Allplan Attributes',
+$,(#15650));
+#15653= IFCRELDEFINESBYPROPERTIES('0VynwBo4v9QPENxmEId8eH',#4,$,$,(
+#15640),#15651);
+#15657= IFCTEXTSTYLEFORDEFINEDFONT(#15658,$);
+#15658= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#15659= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.5));
+#15660= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(300.));
+#15662= IFCTEXTSTYLE($,#15657,#15659,#15660);
+#15663= IFCPLANAREXTENT(2910.000000000003,825.0000000000168);
+#15664= IFCTEXTLITERALWITHEXTENT(
+'OK= -0.07, UK= -0.32\X\0A+ 20cm D\X2\00E4\X0\mmung (UK= -0.52)\X\0A+ 2cm Splitt (UK= -0.54)\X\0A+ 5cm Magerbeton (UK= -0.59)'
+,#15667,.LEFT.,#15663,'top-left');
+#15665= IFCDIRECTION((0.9808262151348185,0.1948844162684815));
+#15667= IFCAXIS2PLACEMENT2D(#15668,#15665);
+#15668= IFCCARTESIANPOINT((83653.51454661261,25704.46997895839));
+#15670= IFCLOCALPLACEMENT($,#1);
+#15671= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#15664)
+);
+#15673= IFCPRODUCTDEFINITIONSHAPE($,$,(#15671));
+#15676= IFCANNOTATION('1WofjLb5PBeAZzFjioZAmt',#4,$,$,$,#15670,#15673);
+#15680= IFCPRESENTATIONSTYLEASSIGNMENT((#15662));
+#15682= IFCSTYLEDITEM(#15664,(#15680),$);
+#15686= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--566'),$);
+#15687= IFCPROPERTYSET('0b3fhyX2XEyBvHfO2rcJDa',#4,'Allplan Attributes',
+$,(#15686));
+#15689= IFCRELDEFINESBYPROPERTIES('1LX5HXX4rDJwNl5$qmx7JI',#4,$,$,(
+#15676),#15687);
+#15693= IFCTEXTSTYLEFORDEFINEDFONT(#15694,$);
+#15694= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#15695= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.5));
+#15696= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(250.));
+#15698= IFCTEXTSTYLE($,#15693,#15695,#15696);
+#15699= IFCPLANAREXTENT(1940.000000000009,687.4999999999822);
+#15700= IFCTEXTLITERALWITHEXTENT(
+'OK= -1.13, UK= -1.38\X\0A+ 20cm D\X2\00E4\X0\mmung (UK= -1.58)\X\0A+ 2cm Splitt (UK= -1.60)\X\0A+ 5cm Magerbeton (UK= -1.65)'
+,#15703,.LEFT.,#15699,'top-left');
+#15701= IFCDIRECTION((0.7310552682428722,0.6823182503600077));
+#15703= IFCAXIS2PLACEMENT2D(#15704,#15701);
+#15704= IFCCARTESIANPOINT((87546.77173638951,22437.02940657125));
+#15706= IFCLOCALPLACEMENT($,#1);
+#15707= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#15700)
+);
+#15709= IFCPRODUCTDEFINITIONSHAPE($,$,(#15707));
+#15712= IFCANNOTATION('3FpinxUVzBBPzDdVDmq$1Q',#4,$,$,$,#15706,#15709);
+#15716= IFCPRESENTATIONSTYLEASSIGNMENT((#15698));
+#15718= IFCSTYLEDITEM(#15700,(#15716),$);
+#15722= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--567'),$);
+#15723= IFCPROPERTYSET('2Jz89f27zDJuFGKP6o5AG7',#4,'Allplan Attributes',
+$,(#15722));
+#15725= IFCRELDEFINESBYPROPERTIES('3F1CARE4LBu9m_snwuYuNC',#4,$,$,(
+#15712),#15723);
+#15729= IFCTEXTSTYLEFORDEFINEDFONT(#15730,$);
+#15730= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#15731= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#15732= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(350.));
+#15734= IFCTEXTSTYLE($,#15729,#15731,#15732);
+#15735= IFCTEXTLITERAL('d = 25cm',#15738,.LEFT.);
+#15736= IFCDIRECTION((0.9216166900860996,0.3881013740696396));
+#15738= IFCAXIS2PLACEMENT2D(#15739,#15736);
+#15739= IFCCARTESIANPOINT((77891.256051316,14098.27303360807));
+#15741= IFCLOCALPLACEMENT($,#1);
+#15742= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#15735)
+);
+#15744= IFCPRODUCTDEFINITIONSHAPE($,$,(#15742));
+#15747= IFCANNOTATION('0FF9KCJJT5Hf3U9E8wvFLR',#4,$,$,$,#15741,#15744);
+#15751= IFCPRESENTATIONSTYLEASSIGNMENT((#15734));
+#15753= IFCSTYLEDITEM(#15735,(#15751),$);
+#15757= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--568'),$);
+#15758= IFCPROPERTYSET('0Coed5xv5Ek94nOcZovc0X',#4,'Allplan Attributes',
+$,(#15757));
+#15760= IFCRELDEFINESBYPROPERTIES('0JJXfZNYL6gvn70d8mrnGQ',#4,$,$,(
+#15747),#15758);
+#15764= IFCTEXTSTYLEFORDEFINEDFONT(#15765,$);
+#15765= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#15766= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.5));
+#15767= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(300.));
+#15769= IFCTEXTSTYLE($,#15764,#15766,#15767);
+#15770= IFCPLANAREXTENT(2910.000000000046,824.9999999999975);
+#15771= IFCTEXTLITERALWITHEXTENT(
+'OK= -0.14, UK= -0.39\X\0A+ 20cm D\X2\00E4\X0\mmung (UK= -0.59)\X\0A+ 2cm Splitt (UK= -0.61)\X\0A+ 5cm Magerbeton (UK= -0.66)'
+,#15774,.LEFT.,#15770,'top-left');
+#15772= IFCDIRECTION((0.9216166900860947,0.3881013740696512));
+#15774= IFCAXIS2PLACEMENT2D(#15775,#15772);
+#15775= IFCCARTESIANPOINT((77933.62378465194,13997.66321160699));
+#15777= IFCLOCALPLACEMENT($,#1);
+#15778= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#15771)
+);
+#15780= IFCPRODUCTDEFINITIONSHAPE($,$,(#15778));
+#15783= IFCANNOTATION('1lM_mmMeX0TQqeovMhsnNo',#4,$,$,$,#15777,#15780);
+#15787= IFCPRESENTATIONSTYLEASSIGNMENT((#15769));
+#15789= IFCSTYLEDITEM(#15771,(#15787),$);
+#15793= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--569'),$);
+#15794= IFCPROPERTYSET('1ENN_PMErFh8YPlnOB3LTh',#4,'Allplan Attributes',
+$,(#15793));
+#15796= IFCRELDEFINESBYPROPERTIES('0oGeOKL$1F5hD2UqjPuk_$',#4,$,$,(
+#15783),#15794);
+#15800= IFCTEXTSTYLEFORDEFINEDFONT(#15801,$);
+#15801= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#15802= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.4));
+#15803= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#15805= IFCTEXTSTYLE($,#15800,#15802,#15803);
+#15806= IFCPLANAREXTENT(1940.,520.);
+#15807= IFCTEXTLITERALWITHEXTENT(
+'Fund. d=15cm, UK= -0.54\X\0A+ 20cm D\X2\00E4\X0\mmung (UK= -0.74)\X\0A+ 2cm Splitt (UK= -0.76)\X\0A+ 5cm Magerbeton (UK= -0.81)'
+,#15810,.LEFT.,#15806,'top-left');
+#15808= IFCDIRECTION((6.123233995736766E-17,1.));
+#15810= IFCAXIS2PLACEMENT2D(#15811,#15808);
+#15811= IFCCARTESIANPOINT((94193.33333333333,20592.11878411506));
+#15813= IFCLOCALPLACEMENT($,#1);
+#15814= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#15807)
+);
+#15816= IFCPRODUCTDEFINITIONSHAPE($,$,(#15814));
+#15819= IFCANNOTATION('2z3PJmA_v7jghEMiKmLAMo',#4,$,$,$,#15813,#15816);
+#15823= IFCPRESENTATIONSTYLEASSIGNMENT((#15805));
+#15825= IFCSTYLEDITEM(#15807,(#15823),$);
+#15829= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--575'),$);
+#15830= IFCPROPERTYSET('3Z4lnS0rP7If1P$RY02lsD',#4,'Allplan Attributes',
+$,(#15829));
+#15832= IFCRELDEFINESBYPROPERTIES('36TSoyJzPC4B3XGyhndGlP',#4,$,$,(
+#15819),#15830);
+#15836= IFCTEXTSTYLEFORDEFINEDFONT(#15837,$);
+#15837= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#15838= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.4));
+#15839= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#15841= IFCTEXTSTYLE($,#15836,#15838,#15839);
+#15842= IFCPLANAREXTENT(1940.,520.);
+#15843= IFCTEXTLITERALWITHEXTENT(
+'Fund. d=35cm, UK= -0.74\X\0A+ 20cm D\X2\00E4\X0\mmung (UK= -0.94)\X\0A+ 2cm Splitt (UK= -0.96)\X\0A+ 5cm Magerbeton (UK= -1.01)'
+,#15846,.LEFT.,#15842,'top-left');
+#15844= IFCDIRECTION((6.123233995736766E-17,1.));
+#15846= IFCAXIS2PLACEMENT2D(#15847,#15844);
+#15847= IFCCARTESIANPOINT((97205.,16250.39227405017));
+#15849= IFCLOCALPLACEMENT($,#1);
+#15850= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#15843)
+);
+#15852= IFCPRODUCTDEFINITIONSHAPE($,$,(#15850));
+#15855= IFCANNOTATION('19ti$nXuD3$hyT0lU$6$Ki',#4,$,$,$,#15849,#15852);
+#15859= IFCPRESENTATIONSTYLEASSIGNMENT((#15841));
+#15861= IFCSTYLEDITEM(#15843,(#15859),$);
+#15865= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--574'),$);
+#15866= IFCPROPERTYSET('3Fm0Enk3D82AxqLOy4XGwv',#4,'Allplan Attributes',
+$,(#15865));
+#15868= IFCRELDEFINESBYPROPERTIES('3wxH5LOv5CfReHRz_xDZOH',#4,$,$,(
+#15855),#15866);
+#15872= IFCTEXTSTYLEFORDEFINEDFONT(#15873,$);
+#15873= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#15874= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.4));
+#15875= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#15877= IFCTEXTSTYLE($,#15872,#15874,#15875);
+#15878= IFCPLANAREXTENT(1940.,520.);
+#15879= IFCTEXTLITERALWITHEXTENT(
+'Fund. d=15cm, UK= -0.54\X\0A+ 20cm D\X2\00E4\X0\mmung (UK= -0.74)\X\0A+ 2cm Splitt (UK= -0.76)\X\0A+ 5cm Magerbeton (UK= -0.81)'
+,#15882,.LEFT.,#15878,'top-left');
+#15880= IFCDIRECTION((6.123233995736766E-17,1.));
+#15882= IFCAXIS2PLACEMENT2D(#15883,#15880);
+#15883= IFCCARTESIANPOINT((94218.33333333333,11269.79426336781));
+#15885= IFCLOCALPLACEMENT($,#1);
+#15886= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#15879)
+);
+#15888= IFCPRODUCTDEFINITIONSHAPE($,$,(#15886));
+#15891= IFCANNOTATION('0AOhiEH4nBzebxsGsL6U0M',#4,$,$,$,#15885,#15888);
+#15895= IFCPRESENTATIONSTYLEASSIGNMENT((#15877));
+#15897= IFCSTYLEDITEM(#15879,(#15895),$);
+#15901= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--573'),$);
+#15902= IFCPROPERTYSET('3s$hjtqEH5jRgg4l_1_Ei7',#4,'Allplan Attributes',
+$,(#15901));
+#15904= IFCRELDEFINESBYPROPERTIES('2wOOaifMz9nhUfUyNlcZEW',#4,$,$,(
+#15891),#15902);
+#15908= IFCTEXTSTYLEFORDEFINEDFONT(#15909,$);
+#15909= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#15910= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.4));
+#15911= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#15913= IFCTEXTSTYLE($,#15908,#15910,#15911);
+#15914= IFCPLANAREXTENT(1940.,520.);
+#15915= IFCTEXTLITERALWITHEXTENT(
+'Fund. d=15cm, UK= -0.54\X\0A+ 20cm D\X2\00E4\X0\mmung (UK= -0.74)\X\0A+ 2cm Splitt (UK= -0.76)\X\0A+ 5cm Magerbeton (UK= -0.81)'
+,#15918,.LEFT.,#15914,'top-left');
+#15916= IFCDIRECTION((6.123233995736766E-17,1.));
+#15918= IFCAXIS2PLACEMENT2D(#15919,#15916);
+#15919= IFCCARTESIANPOINT((93100.00000000003,11362.26488116083));
+#15921= IFCLOCALPLACEMENT($,#1);
+#15922= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#15915)
+);
+#15924= IFCPRODUCTDEFINITIONSHAPE($,$,(#15922));
+#15927= IFCANNOTATION('1yDDV_zb1BFfxYZ_QOL9aK',#4,$,$,$,#15921,#15924);
+#15931= IFCPRESENTATIONSTYLEASSIGNMENT((#15913));
+#15933= IFCSTYLEDITEM(#15915,(#15931),$);
+#15937= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--572'),$);
+#15938= IFCPROPERTYSET('2IflqD7aT5LPEs8Q7jr8Xy',#4,'Allplan Attributes',
+$,(#15937));
+#15940= IFCRELDEFINESBYPROPERTIES('1dpmbo19T7wOTed8wan0xV',#4,$,$,(
+#15927),#15938);
+#15944= IFCTEXTSTYLEFORDEFINEDFONT(#15945,$);
+#15945= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#15946= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.4));
+#15947= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#15949= IFCTEXTSTYLE($,#15944,#15946,#15947);
+#15950= IFCPLANAREXTENT(1940.,520.);
+#15951= IFCTEXTLITERALWITHEXTENT(
+'Fund. d=35cm, UK= -0.74\X\0A+ 20cm D\X2\00E4\X0\mmung (UK= -0.94)\X\0A+ 2cm Splitt (UK= -0.96)\X\0A+ 5cm Magerbeton (UK= -1.01)'
+,#15954,.LEFT.,#15950,'top-left');
+#15952= IFCDIRECTION((1.,0.));
+#15954= IFCAXIS2PLACEMENT2D(#15955,#15952);
+#15955= IFCCARTESIANPOINT((86373.12561100708,19411.67149726277));
+#15957= IFCLOCALPLACEMENT($,#1);
+#15958= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#15951)
+);
+#15960= IFCPRODUCTDEFINITIONSHAPE($,$,(#15958));
+#15963= IFCANNOTATION('2SwpHcVlX0BfMmHzfs4$Sy',#4,$,$,$,#15957,#15960);
+#15967= IFCPRESENTATIONSTYLEASSIGNMENT((#15949));
+#15969= IFCSTYLEDITEM(#15951,(#15967),$);
+#15973= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--571'),$);
+#15974= IFCPROPERTYSET('1xV$iQ_p9CseIHdLwPgyjG',#4,'Allplan Attributes',
+$,(#15973));
+#15976= IFCRELDEFINESBYPROPERTIES('05S7QR0bD37QDLD4wDB2Qt',#4,$,$,(
+#15963),#15974);
+#15980= IFCTEXTSTYLEFORDEFINEDFONT(#15981,$);
+#15981= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#15982= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.4));
+#15983= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#15985= IFCTEXTSTYLE($,#15980,#15982,#15983);
+#15986= IFCPLANAREXTENT(1940.,520.);
+#15987= IFCTEXTLITERALWITHEXTENT(
+'Fund. d=35cm, UK= -0.74\X\0A+ 20cm D\X2\00E4\X0\mmung (UK= -0.94)\X\0A+ 2cm Splitt (UK= -0.96)\X\0A+ 5cm Magerbeton (UK= -1.01)'
+,#15990,.LEFT.,#15986,'top-left');
+#15988= IFCDIRECTION((1.,0.));
+#15990= IFCAXIS2PLACEMENT2D(#15991,#15988);
+#15991= IFCCARTESIANPOINT((67575.,19411.67149726278));
+#15993= IFCLOCALPLACEMENT($,#1);
+#15994= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#15987)
+);
+#15996= IFCPRODUCTDEFINITIONSHAPE($,$,(#15994));
+#15999= IFCANNOTATION('3cvOxKI813hfdovmF9jmVi',#4,$,$,$,#15993,#15996);
+#16003= IFCPRESENTATIONSTYLEASSIGNMENT((#15985));
+#16005= IFCSTYLEDITEM(#15987,(#16003),$);
+#16009= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--570'),$);
+#16010= IFCPROPERTYSET('2IJWQeI$D118MIqHqJs$M3',#4,'Allplan Attributes',
+$,(#16009));
+#16012= IFCRELDEFINESBYPROPERTIES('3AVG$T17H8CvDX9L9poPVw',#4,$,$,(
+#15999),#16010);
+#16016= IFCTEXTSTYLEFORDEFINEDFONT(#16017,$);
+#16017= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#16018= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#16019= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#16021= IFCTEXTSTYLE($,#16016,#16018,#16019);
+#16022= IFCTEXTLITERAL('Grundriss  1:50',#16025,.LEFT.);
+#16023= IFCDIRECTION((1.,0.));
+#16025= IFCAXIS2PLACEMENT2D(#16026,#16023);
+#16026= IFCCARTESIANPOINT((83404.88972260105,28213.1435942591));
+#16028= IFCLOCALPLACEMENT($,#1);
+#16029= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#16022)
+);
+#16031= IFCPRODUCTDEFINITIONSHAPE($,$,(#16029));
+#16034= IFCANNOTATION('1MvrizCG54MAMxs8LhsKyh',#4,$,$,$,#16028,#16031);
+#16038= IFCPRESENTATIONSTYLEASSIGNMENT((#16021));
+#16040= IFCSTYLEDITEM(#16022,(#16038),$);
+#16044= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--562'),$);
+#16045= IFCPROPERTYSET('2xBTxC9410khIRor716V8W',#4,'Allplan Attributes',
+$,(#16044));
+#16047= IFCRELDEFINESBYPROPERTIES('1FQS7kG1bCO9zsb6TwP0pl',#4,$,$,(
+#16034),#16045);
+#16051= IFCTEXTSTYLEFORDEFINEDFONT(#16052,$);
+#16052= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#16053= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#16054= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#16056= IFCTEXTSTYLE($,#16051,#16053,#16054);
+#16057= IFCTEXTLITERAL('Schnitt A-A  1:20',#16060,.LEFT.);
+#16058= IFCDIRECTION((1.,0.));
+#16060= IFCAXIS2PLACEMENT2D(#16061,#16058);
+#16061= IFCCARTESIANPOINT((64928.65779311588,-3984.138528206891));
+#16063= IFCLOCALPLACEMENT($,#1);
+#16064= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#16057)
+);
+#16066= IFCPRODUCTDEFINITIONSHAPE($,$,(#16064));
+#16069= IFCANNOTATION('1CFDeCI253E8GCaQJRoW68',#4,$,$,$,#16063,#16066);
+#16073= IFCPRESENTATIONSTYLEASSIGNMENT((#16056));
+#16075= IFCSTYLEDITEM(#16057,(#16073),$);
+#16079= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'91a2d109-b8d7-11e3-bf39-7446a0b2bba9--12'),$);
+#16080= IFCPROPERTYSET('3ssF1UYOTAKwlO_xR0PEil',#4,'Allplan Attributes',
+$,(#16079));
+#16082= IFCRELDEFINESBYPROPERTIES('3no9NxGXz4XBNO0xM2QcOE',#4,$,$,(
+#16069),#16080);
+#16086= IFCTEXTSTYLEFORDEFINEDFONT(#16087,$);
+#16087= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#16088= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#16089= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#16091= IFCTEXTSTYLE($,#16086,#16088,#16089);
+#16092= IFCTEXTLITERAL('Schnitt B-B  1:20',#16095,.LEFT.);
+#16093= IFCDIRECTION((1.,0.));
+#16095= IFCAXIS2PLACEMENT2D(#16096,#16093);
+#16096= IFCCARTESIANPOINT((71422.32664761796,-3984.138528206888));
+#16098= IFCLOCALPLACEMENT($,#1);
+#16099= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#16092)
+);
+#16101= IFCPRODUCTDEFINITIONSHAPE($,$,(#16099));
+#16104= IFCANNOTATION('3CTQI$vlfEg9d$C1Fit$1F',#4,$,$,$,#16098,#16101);
+#16108= IFCPRESENTATIONSTYLEASSIGNMENT((#16091));
+#16110= IFCSTYLEDITEM(#16092,(#16108),$);
+#16114= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'91a2d10d-b8d7-11e3-bf39-7446a0b2bba9--18'),$);
+#16115= IFCPROPERTYSET('04vy_KbkjEbP9swwKmgIIE',#4,'Allplan Attributes',
+$,(#16114));
+#16117= IFCRELDEFINESBYPROPERTIES('19yOG4marEHeRvR1isbMxY',#4,$,$,(
+#16104),#16115);
+#16121= IFCTEXTSTYLEFORDEFINEDFONT(#16122,$);
+#16122= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#16123= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#16124= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#16126= IFCTEXTSTYLE($,#16121,#16123,#16124);
+#16127= IFCTEXTLITERAL('Absatz OK Boden 7cm',#16130,.LEFT.);
+#16128= IFCDIRECTION((6.123233995736766E-17,1.));
+#16130= IFCAXIS2PLACEMENT2D(#16131,#16128);
+#16131= IFCCARTESIANPOINT((79188.33333333333,22338.59690241592));
+#16133= IFCLOCALPLACEMENT($,#1);
+#16134= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#16127)
+);
+#16136= IFCPRODUCTDEFINITIONSHAPE($,$,(#16134));
+#16139= IFCANNOTATION('1FyHT_N618bfDv8M67NQ_Y',#4,$,$,$,#16133,#16136);
+#16143= IFCPRESENTATIONSTYLEASSIGNMENT((#16126));
+#16145= IFCSTYLEDITEM(#16127,(#16143),$);
+#16149= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'cec2259e-ba67-11e3-bf5f-7446a0b2bba9--11'),$);
+#16150= IFCPROPERTYSET('0RnNQ79unCYg0nlqk1BWxU',#4,'Allplan Attributes',
+$,(#16149));
+#16152= IFCRELDEFINESBYPROPERTIES('3ghN0KhfrDlfaAqcpWXNWs',#4,$,$,(
+#16139),#16150);
+#16156= IFCTEXTSTYLEFORDEFINEDFONT(#16157,$);
+#16157= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#16158= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#16159= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#16161= IFCTEXTSTYLE($,#16156,#16158,#16159);
+#16162= IFCTEXTLITERAL('Absatz OK Boden 7cm',#16165,.LEFT.);
+#16163= IFCDIRECTION((1.,0.));
+#16165= IFCAXIS2PLACEMENT2D(#16166,#16163);
+#16166= IFCCARTESIANPOINT((79777.02674372181,22095.0048305961));
+#16168= IFCLOCALPLACEMENT($,#1);
+#16169= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#16162)
+);
+#16171= IFCPRODUCTDEFINITIONSHAPE($,$,(#16169));
+#16174= IFCANNOTATION('1u8jAT7GLAWAhfu6Sl4gBH',#4,$,$,$,#16168,#16171);
+#16178= IFCPRESENTATIONSTYLEASSIGNMENT((#16161));
+#16180= IFCSTYLEDITEM(#16162,(#16178),$);
+#16184= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'cec2259e-ba67-11e3-bf5f-7446a0b2bba9--12'),$);
+#16185= IFCPROPERTYSET('3vDsvV6VrExhfkq8_Uwhx0',#4,'Allplan Attributes',
+$,(#16184));
+#16187= IFCRELDEFINESBYPROPERTIES('0NIx4u9F55teXPwf3SpN3F',#4,$,$,(
+#16174),#16185);
+#16191= IFCTEXTSTYLEFORDEFINEDFONT(#16192,$);
+#16192= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#16193= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#16194= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#16196= IFCTEXTSTYLE($,#16191,#16193,#16194);
+#16197= IFCTEXTLITERAL('Absatz OK Boden 7cm',#16200,.LEFT.);
+#16198= IFCDIRECTION((6.123233995736766E-17,1.));
+#16200= IFCAXIS2PLACEMENT2D(#16201,#16198);
+#16201= IFCCARTESIANPOINT((82025.,22520.04762552151));
+#16203= IFCLOCALPLACEMENT($,#1);
+#16204= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#16197)
+);
+#16206= IFCPRODUCTDEFINITIONSHAPE($,$,(#16204));
+#16209= IFCANNOTATION('2uxjSfFAr1$Ps3mSy1kQxp',#4,$,$,$,#16203,#16206);
+#16213= IFCPRESENTATIONSTYLEASSIGNMENT((#16196));
+#16215= IFCSTYLEDITEM(#16197,(#16213),$);
+#16219= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'cec2259e-ba67-11e3-bf5f-7446a0b2bba9--13'),$);
+#16220= IFCPROPERTYSET('30tJo35i12VxoxGwDkdKiV',#4,'Allplan Attributes',
+$,(#16219));
+#16222= IFCRELDEFINESBYPROPERTIES('2hlyGbXY96B8rN3h_RaJL_',#4,$,$,(
+#16209),#16220);
+#16226= IFCTEXTSTYLEFORDEFINEDFONT(#16227,$);
+#16227= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#16228= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#16229= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#16231= IFCTEXTSTYLE($,#16226,#16228,#16229);
+#16232= IFCTEXTLITERAL('Absatz OK Boden 7cm',#16235,.LEFT.);
+#16233= IFCDIRECTION((1.,0.));
+#16235= IFCAXIS2PLACEMENT2D(#16236,#16233);
+#16236= IFCCARTESIANPOINT((82528.94870789858,23990.0048305961));
+#16238= IFCLOCALPLACEMENT($,#1);
+#16239= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#16232)
+);
+#16241= IFCPRODUCTDEFINITIONSHAPE($,$,(#16239));
+#16244= IFCANNOTATION('1vv7OL5HrEIOIiXCODiIUw',#4,$,$,$,#16238,#16241);
+#16248= IFCPRESENTATIONSTYLEASSIGNMENT((#16231));
+#16250= IFCSTYLEDITEM(#16232,(#16248),$);
+#16254= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'cec2259e-ba67-11e3-bf5f-7446a0b2bba9--14'),$);
+#16255= IFCPROPERTYSET('3I7iI9rHL6VATSb$DC3DoT',#4,'Allplan Attributes',
+$,(#16254));
+#16257= IFCRELDEFINESBYPROPERTIES('2chiGBC3b5agNQhGLaJUP8',#4,$,$,(
+#16244),#16255);
+#16261= IFCTEXTSTYLEFORDEFINEDFONT(#16262,$);
+#16262= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#16263= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#16264= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#16266= IFCTEXTSTYLE($,#16261,#16263,#16264);
+#16267= IFCTEXTLITERAL('Absatz OK Boden 7cm',#16270,.LEFT.);
+#16268= IFCDIRECTION((1.,0.));
+#16270= IFCAXIS2PLACEMENT2D(#16271,#16268);
+#16271= IFCCARTESIANPOINT((85062.27633487518,23740.0048305961));
+#16273= IFCLOCALPLACEMENT($,#1);
+#16274= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#16267)
+);
+#16276= IFCPRODUCTDEFINITIONSHAPE($,$,(#16274));
+#16279= IFCANNOTATION('2OO9b35$z6_vOE0i2nUhHW',#4,$,$,$,#16273,#16276);
+#16283= IFCPRESENTATIONSTYLEASSIGNMENT((#16266));
+#16285= IFCSTYLEDITEM(#16267,(#16283),$);
+#16289= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'cec2259e-ba67-11e3-bf5f-7446a0b2bba9--15'),$);
+#16290= IFCPROPERTYSET('3KTLXdlcLE_PtiUD8lLnMe',#4,'Allplan Attributes',
+$,(#16289));
+#16292= IFCRELDEFINESBYPROPERTIES('2piCJQRxj9IwJ8RMSQRutC',#4,$,$,(
+#16279),#16290);
+#16296= IFCTEXTSTYLEFORDEFINEDFONT(#16297,$);
+#16297= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#16298= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#16299= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#16301= IFCTEXTSTYLE($,#16296,#16298,#16299);
+#16302= IFCTEXTLITERAL('Absatz UK Boden 7cm',#16305,.LEFT.);
+#16303= IFCDIRECTION((1.,0.));
+#16305= IFCAXIS2PLACEMENT2D(#16306,#16303);
+#16306= IFCCARTESIANPOINT((87412.56598371331,24656.67149726277));
+#16308= IFCLOCALPLACEMENT($,#1);
+#16309= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#16302)
+);
+#16311= IFCPRODUCTDEFINITIONSHAPE($,$,(#16309));
+#16314= IFCANNOTATION('33$0BxDs96ffkVosCLh6bc',#4,$,$,$,#16308,#16311);
+#16318= IFCPRESENTATIONSTYLEASSIGNMENT((#16301));
+#16320= IFCSTYLEDITEM(#16302,(#16318),$);
+#16324= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'cec2259e-ba67-11e3-bf5f-7446a0b2bba9--16'),$);
+#16325= IFCPROPERTYSET('0h44FF0hnBbQIShXiMD5Js',#4,'Allplan Attributes',
+$,(#16324));
+#16327= IFCRELDEFINESBYPROPERTIES('37x$y$Z2P6Ow8Y1WMrEZhu',#4,$,$,(
+#16314),#16325);
+#16331= IFCTEXTSTYLEFORDEFINEDFONT(#16332,$);
+#16332= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#16333= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#16334= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#16336= IFCTEXTSTYLE($,#16331,#16333,#16334);
+#16337= IFCTEXTLITERAL('Absatz OK Boden 7cm',#16340,.LEFT.);
+#16338= IFCDIRECTION((1.,0.));
+#16340= IFCAXIS2PLACEMENT2D(#16341,#16338);
+#16341= IFCCARTESIANPOINT((90006.89477922957,23740.0048305961));
+#16343= IFCLOCALPLACEMENT($,#1);
+#16344= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#16337)
+);
+#16346= IFCPRODUCTDEFINITIONSHAPE($,$,(#16344));
+#16349= IFCANNOTATION('3Ho48qxvTF2OzwLI1qRUvM',#4,$,$,$,#16343,#16346);
+#16353= IFCPRESENTATIONSTYLEASSIGNMENT((#16336));
+#16355= IFCSTYLEDITEM(#16337,(#16353),$);
+#16359= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'cec2259e-ba67-11e3-bf5f-7446a0b2bba9--17'),$);
+#16360= IFCPROPERTYSET('0f2XXvDt55XOvjhw1dy3O3',#4,'Allplan Attributes',
+$,(#16359));
+#16362= IFCRELDEFINESBYPROPERTIES('1qTA2IoGPBKAkOinTtuU1A',#4,$,$,(
+#16349),#16360);
+#16366= IFCTEXTSTYLEFORDEFINEDFONT(#16367,$);
+#16367= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#16368= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#16369= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#16371= IFCTEXTSTYLE($,#16366,#16368,#16369);
+#16372= IFCTEXTLITERAL('W1',#16375,.LEFT.);
+#16373= IFCDIRECTION((1.,0.));
+#16375= IFCAXIS2PLACEMENT2D(#16376,#16373);
+#16376= IFCCARTESIANPOINT((96673.30189202845,24391.04263252323));
+#16378= IFCLOCALPLACEMENT($,#1);
+#16379= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#16372)
+);
+#16381= IFCPRODUCTDEFINITIONSHAPE($,$,(#16379));
+#16384= IFCANNOTATION('1MUHRLXfLFQfNQ8IiO4I6J',#4,$,$,$,#16378,#16381);
+#16388= IFCPRESENTATIONSTYLEASSIGNMENT((#16371));
+#16390= IFCSTYLEDITEM(#16372,(#16388),$);
+#16394= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'cec2259e-ba67-11e3-bf5f-7446a0b2bba9--84'),$);
+#16395= IFCPROPERTYSET('1eUwM7lD5DvfIMNFMuF$Cb',#4,'Allplan Attributes',
+$,(#16394));
+#16397= IFCRELDEFINESBYPROPERTIES('2BxFXR9FzChP9xTDEfoPMj',#4,$,$,(
+#16384),#16395);
+#16401= IFCTEXTSTYLEFORDEFINEDFONT(#16402,$);
+#16402= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#16403= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#16404= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#16406= IFCTEXTSTYLE($,#16401,#16403,#16404);
+#16407= IFCTEXTLITERAL('C',#16410,.LEFT.);
+#16408= IFCDIRECTION((6.123233995736766E-17,1.));
+#16410= IFCAXIS2PLACEMENT2D(#16411,#16408);
+#16411= IFCCARTESIANPOINT((90860.31738068213,22977.90885162081));
+#16413= IFCLOCALPLACEMENT($,#1);
+#16414= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#16407)
+);
+#16416= IFCPRODUCTDEFINITIONSHAPE($,$,(#16414));
+#16419= IFCANNOTATION('2rDHSkZ3D2ZwPhF7sx_A3D',#4,$,$,$,#16413,#16416);
+#16423= IFCPRESENTATIONSTYLEASSIGNMENT((#16406));
+#16425= IFCSTYLEDITEM(#16407,(#16423),$);
+#16429= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'cec2259e-ba67-11e3-bf5f-7446a0b2bba9--363'),$);
+#16430= IFCPROPERTYSET('2EEMn$v2jAufMIK_Lv5R11',#4,'Allplan Attributes',
+$,(#16429));
+#16432= IFCRELDEFINESBYPROPERTIES('2Zt3VWtKj9rgevSLt1Vtdj',#4,$,$,(
+#16419),#16430);
+#16436= IFCTEXTSTYLEFORDEFINEDFONT(#16437,$);
+#16437= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#16438= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#16439= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#16441= IFCTEXTSTYLE($,#16436,#16438,#16439);
+#16442= IFCTEXTLITERAL('C',#16445,.LEFT.);
+#16443= IFCDIRECTION((6.123233995736766E-17,1.));
+#16445= IFCAXIS2PLACEMENT2D(#16446,#16443);
+#16446= IFCCARTESIANPOINT((90860.31738068222,25478.76747622812));
+#16448= IFCLOCALPLACEMENT($,#1);
+#16449= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#16442)
+);
+#16451= IFCPRODUCTDEFINITIONSHAPE($,$,(#16449));
+#16454= IFCANNOTATION('0x4e5k3ur90PdPveywT_xk',#4,$,$,$,#16448,#16451);
+#16458= IFCPRESENTATIONSTYLEASSIGNMENT((#16441));
+#16460= IFCSTYLEDITEM(#16442,(#16458),$);
+#16464= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'cec2259e-ba67-11e3-bf5f-7446a0b2bba9--364'),$);
+#16465= IFCPROPERTYSET('23RDZE52L9Mv6xsIlwmJlN',#4,'Allplan Attributes',
+$,(#16464));
+#16467= IFCRELDEFINESBYPROPERTIES('3Cd5nv5914ivni5AiLytFN',#4,$,$,(
+#16454),#16465);
+#16471= IFCTEXTSTYLEFORDEFINEDFONT(#16472,$);
+#16472= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#16473= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#16474= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#16476= IFCTEXTSTYLE($,#16471,#16473,#16474);
+#16477= IFCTEXTLITERAL('D',#16480,.LEFT.);
+#16478= IFCDIRECTION((6.123233995736766E-17,1.));
+#16480= IFCAXIS2PLACEMENT2D(#16481,#16478);
+#16481= IFCCARTESIANPOINT((83296.74014217944,23227.9088516208));
+#16483= IFCLOCALPLACEMENT($,#1);
+#16484= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#16477)
+);
+#16486= IFCPRODUCTDEFINITIONSHAPE($,$,(#16484));
+#16489= IFCANNOTATION('2uGKCAeG9A8Ogbz7PsxGpf',#4,$,$,$,#16483,#16486);
+#16493= IFCPRESENTATIONSTYLEASSIGNMENT((#16476));
+#16495= IFCSTYLEDITEM(#16477,(#16493),$);
+#16499= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'cec2259e-ba67-11e3-bf5f-7446a0b2bba9--367'),$);
+#16500= IFCPROPERTYSET('2SKwchnLLDUBDJWvGKVKQP',#4,'Allplan Attributes',
+$,(#16499));
+#16502= IFCRELDEFINESBYPROPERTIES('2aLfw2D3r1wAmyO8s7E4MO',#4,$,$,(
+#16489),#16500);
+#16506= IFCTEXTSTYLEFORDEFINEDFONT(#16507,$);
+#16507= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#16508= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#16509= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#16511= IFCTEXTSTYLE($,#16506,#16508,#16509);
+#16512= IFCTEXTLITERAL('D',#16515,.LEFT.);
+#16513= IFCDIRECTION((6.123233995736766E-17,1.));
+#16515= IFCAXIS2PLACEMENT2D(#16516,#16513);
+#16516= IFCCARTESIANPOINT((83296.74014217944,25478.76747622814));
+#16518= IFCLOCALPLACEMENT($,#1);
+#16519= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#16512)
+);
+#16521= IFCPRODUCTDEFINITIONSHAPE($,$,(#16519));
+#16524= IFCANNOTATION('03HNWOOKf1_AS6LJbAGFr7',#4,$,$,$,#16518,#16521);
+#16528= IFCPRESENTATIONSTYLEASSIGNMENT((#16511));
+#16530= IFCSTYLEDITEM(#16512,(#16528),$);
+#16534= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'cec2259e-ba67-11e3-bf5f-7446a0b2bba9--368'),$);
+#16535= IFCPROPERTYSET('3AO711RSfAfA7pykkDoCo6',#4,'Allplan Attributes',
+$,(#16534));
+#16537= IFCRELDEFINESBYPROPERTIES('0hrg0sl8X25fmBhINW3dEz',#4,$,$,(
+#16524),#16535);
+#16541= IFCTEXTSTYLEFORDEFINEDFONT(#16542,$);
+#16542= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#16543= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#16544= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#16546= IFCTEXTSTYLE($,#16541,#16543,#16544);
+#16547= IFCTEXTLITERAL('E',#16550,.LEFT.);
+#16548= IFCDIRECTION((6.123233995736766E-17,1.));
+#16550= IFCAXIS2PLACEMENT2D(#16551,#16548);
+#16551= IFCCARTESIANPOINT((80468.05826830864,25478.76747622814));
+#16553= IFCLOCALPLACEMENT($,#1);
+#16554= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#16547)
+);
+#16556= IFCPRODUCTDEFINITIONSHAPE($,$,(#16554));
+#16559= IFCANNOTATION('366vdv1jr2jQxL6rrecNh0',#4,$,$,$,#16553,#16556);
+#16563= IFCPRESENTATIONSTYLEASSIGNMENT((#16546));
+#16565= IFCSTYLEDITEM(#16547,(#16563),$);
+#16569= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'cec2259e-ba67-11e3-bf5f-7446a0b2bba9--369'),$);
+#16570= IFCPROPERTYSET('2KS5sbjR5B5eparL0QmeP1',#4,'Allplan Attributes',
+$,(#16569));
+#16572= IFCRELDEFINESBYPROPERTIES('2oDcWZOF59jOmQi7mL3I96',#4,$,$,(
+#16559),#16570);
+#16576= IFCTEXTSTYLEFORDEFINEDFONT(#16577,$);
+#16577= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#16578= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#16579= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#16581= IFCTEXTSTYLE($,#16576,#16578,#16579);
+#16582= IFCTEXTLITERAL('E',#16585,.LEFT.);
+#16583= IFCDIRECTION((6.123233995736766E-17,1.));
+#16585= IFCAXIS2PLACEMENT2D(#16586,#16583);
+#16586= IFCCARTESIANPOINT((80468.05826830864,21332.9088516208));
+#16588= IFCLOCALPLACEMENT($,#1);
+#16589= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#16582)
+);
+#16591= IFCPRODUCTDEFINITIONSHAPE($,$,(#16589));
+#16594= IFCANNOTATION('3uWBrkc456hQd0qBJkebRY',#4,$,$,$,#16588,#16591);
+#16598= IFCPRESENTATIONSTYLEASSIGNMENT((#16581));
+#16600= IFCSTYLEDITEM(#16582,(#16598),$);
+#16604= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'cec2259e-ba67-11e3-bf5f-7446a0b2bba9--370'),$);
+#16605= IFCPROPERTYSET('2Uwye5wnT98e0fv0N7cj7l',#4,'Allplan Attributes',
+$,(#16604));
+#16607= IFCRELDEFINESBYPROPERTIES('1ZHXW7u$nAzRl39zVrqS2Z',#4,$,$,(
+#16594),#16605);
+#16611= IFCTEXTSTYLEFORDEFINEDFONT(#16612,$);
+#16612= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#16613= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#16614= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#16616= IFCTEXTSTYLE($,#16611,#16613,#16614);
+#16617= IFCTEXTLITERAL('F',#16620,.LEFT.);
+#16618= IFCDIRECTION((1.,0.));
+#16620= IFCAXIS2PLACEMENT2D(#16621,#16618);
+#16621= IFCCARTESIANPOINT((78332.9040210247,23164.44656228746));
+#16623= IFCLOCALPLACEMENT($,#1);
+#16624= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#16617)
+);
+#16626= IFCPRODUCTDEFINITIONSHAPE($,$,(#16624));
+#16629= IFCANNOTATION('2d4ksdypDDgQ0BphCy5F1M',#4,$,$,$,#16623,#16626);
+#16633= IFCPRESENTATIONSTYLEASSIGNMENT((#16616));
+#16635= IFCSTYLEDITEM(#16617,(#16633),$);
+#16639= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'cec2259e-ba67-11e3-bf5f-7446a0b2bba9--371'),$);
+#16640= IFCPROPERTYSET('0YXmSAsozBkPuuhnlTq4xP',#4,'Allplan Attributes',
+$,(#16639));
+#16642= IFCRELDEFINESBYPROPERTIES('1VubvMBIP2t9RNpPqg0tnH',#4,$,$,(
+#16629),#16640);
+#16646= IFCTEXTSTYLEFORDEFINEDFONT(#16647,$);
+#16647= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#16648= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#16649= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#16651= IFCTEXTSTYLE($,#16646,#16648,#16649);
+#16652= IFCTEXTLITERAL('F',#16655,.LEFT.);
+#16653= IFCDIRECTION((1.,0.));
+#16655= IFCAXIS2PLACEMENT2D(#16656,#16653);
+#16656= IFCCARTESIANPOINT((82553.76264563203,23164.44656228746));
+#16658= IFCLOCALPLACEMENT($,#1);
+#16659= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#16652)
+);
+#16661= IFCPRODUCTDEFINITIONSHAPE($,$,(#16659));
+#16664= IFCANNOTATION('0oQAKcilTEpu136VI2m8yy',#4,$,$,$,#16658,#16661);
+#16668= IFCPRESENTATIONSTYLEASSIGNMENT((#16651));
+#16670= IFCSTYLEDITEM(#16652,(#16668),$);
+#16674= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'cec2259e-ba67-11e3-bf5f-7446a0b2bba9--372'),$);
+#16675= IFCPROPERTYSET('2hZsIgRkP9wActUpB$uuJM',#4,'Allplan Attributes',
+$,(#16674));
+#16677= IFCRELDEFINESBYPROPERTIES('0n32imwzz3PgqKoEogUnSi',#4,$,$,(
+#16664),#16675);
+#16681= IFCTEXTSTYLEFORDEFINEDFONT(#16682,$);
+#16682= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#16683= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#16684= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#16686= IFCTEXTSTYLE($,#16681,#16683,#16684);
+#16687= IFCTEXTLITERAL('G',#16690,.LEFT.);
+#16688= IFCDIRECTION((1.,0.));
+#16690= IFCAXIS2PLACEMENT2D(#16691,#16688);
+#16691= IFCCARTESIANPOINT((83082.9040210247,21519.44656228746));
+#16693= IFCLOCALPLACEMENT($,#1);
+#16694= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#16687)
+);
+#16696= IFCPRODUCTDEFINITIONSHAPE($,$,(#16694));
+#16699= IFCANNOTATION('32ypLGXfT8cOLBrCk1DQZv',#4,$,$,$,#16693,#16696);
+#16703= IFCPRESENTATIONSTYLEASSIGNMENT((#16686));
+#16705= IFCSTYLEDITEM(#16687,(#16703),$);
+#16709= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'cec2259e-ba67-11e3-bf5f-7446a0b2bba9--373'),$);
+#16710= IFCPROPERTYSET('2vHuC$itj7a9EoUKvVDBlh',#4,'Allplan Attributes',
+$,(#16709));
+#16712= IFCRELDEFINESBYPROPERTIES('3yZ6GxR_r3bQ$2vw$I0ZIb',#4,$,$,(
+#16699),#16710);
+#16716= IFCTEXTSTYLEFORDEFINEDFONT(#16717,$);
+#16717= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#16718= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#16719= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#16721= IFCTEXTSTYLE($,#16716,#16718,#16719);
+#16722= IFCTEXTLITERAL('G',#16725,.LEFT.);
+#16723= IFCDIRECTION((1.,0.));
+#16725= IFCAXIS2PLACEMENT2D(#16726,#16723);
+#16726= IFCCARTESIANPOINT((85033.76264563203,21519.44656228747));
+#16728= IFCLOCALPLACEMENT($,#1);
+#16729= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#16722)
+);
+#16731= IFCPRODUCTDEFINITIONSHAPE($,$,(#16729));
+#16734= IFCANNOTATION('05$UWqBT54QBtXx2ikb28d',#4,$,$,$,#16728,#16731);
+#16738= IFCPRESENTATIONSTYLEASSIGNMENT((#16721));
+#16740= IFCSTYLEDITEM(#16722,(#16738),$);
+#16744= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'cec2259e-ba67-11e3-bf5f-7446a0b2bba9--374'),$);
+#16745= IFCPROPERTYSET('2B4Qn3NunCtRqNE7yzF4Ug',#4,'Allplan Attributes',
+$,(#16744));
+#16747= IFCRELDEFINESBYPROPERTIES('3Z2CRY6wr2hA5e7EiCZVd8',#4,$,$,(
+#16734),#16745);
+#16751= IFCTEXTSTYLEFORDEFINEDFONT(#16752,$);
+#16752= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#16753= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#16754= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#16756= IFCTEXTSTYLE($,#16751,#16753,#16754);
+#16757= IFCTEXTLITERAL('W2',#16760,.LEFT.);
+#16758= IFCDIRECTION((1.,0.));
+#16760= IFCAXIS2PLACEMENT2D(#16761,#16758);
+#16761= IFCCARTESIANPOINT((92123.80189202847,25631.04263252323));
+#16763= IFCLOCALPLACEMENT($,#1);
+#16764= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#16757)
+);
+#16766= IFCPRODUCTDEFINITIONSHAPE($,$,(#16764));
+#16769= IFCANNOTATION('0DgHJ4A1H1qgFRwExbM86J',#4,$,$,$,#16763,#16766);
+#16773= IFCPRESENTATIONSTYLEASSIGNMENT((#16756));
+#16775= IFCSTYLEDITEM(#16757,(#16773),$);
+#16779= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'cec2259e-ba67-11e3-bf5f-7446a0b2bba9--419'),$);
+#16780= IFCPROPERTYSET('324gFpqdzBQeHNm1_g5wwR',#4,'Allplan Attributes',
+$,(#16779));
+#16782= IFCRELDEFINESBYPROPERTIES('0X0bR0_ur1fAnjWzfSPoBB',#4,$,$,(
+#16769),#16780);
+#16786= IFCTEXTSTYLEFORDEFINEDFONT(#16787,$);
+#16787= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#16788= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#16789= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#16791= IFCTEXTSTYLE($,#16786,#16788,#16789);
+#16792= IFCTEXTLITERAL('Einlage 15x25cm',#16795,.LEFT.);
+#16793= IFCDIRECTION((1.,0.));
+#16795= IFCAXIS2PLACEMENT2D(#16796,#16793);
+#16796= IFCCARTESIANPOINT((94135.,8666.671497262763));
+#16798= IFCLOCALPLACEMENT($,#1);
+#16799= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#16792)
+);
+#16801= IFCPRODUCTDEFINITIONSHAPE($,$,(#16799));
+#16804= IFCANNOTATION('0S15FBHp52oRBPhCqgWbdg',#4,$,$,$,#16798,#16801);
+#16808= IFCPRESENTATIONSTYLEASSIGNMENT((#16791));
+#16810= IFCSTYLEDITEM(#16792,(#16808),$);
+#16814= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'cec2259e-ba67-11e3-bf5f-7446a0b2bba9--557'),$);
+#16815= IFCPROPERTYSET('2c2IFQcMj1uB_4ryu3i2Ai',#4,'Allplan Attributes',
+$,(#16814));
+#16817= IFCRELDEFINESBYPROPERTIES('2HsWaDKdL1Wwfo$EqO4t$K',#4,$,$,(
+#16804),#16815);
+#16821= IFCTEXTSTYLEFORDEFINEDFONT(#16822,$);
+#16822= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#16823= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#16824= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#16826= IFCTEXTSTYLE($,#16821,#16823,#16824);
+#16827= IFCTEXTLITERAL('Arbeitsfuge mit Quellfugenband !',#16830,.LEFT.
+);
+#16828= IFCDIRECTION((6.123233995736766E-17,1.));
+#16830= IFCAXIS2PLACEMENT2D(#16831,#16828);
+#16831= IFCCARTESIANPOINT((77728.33333333336,11056.97175194527));
+#16833= IFCLOCALPLACEMENT($,#1);
+#16834= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#16827)
+);
+#16836= IFCPRODUCTDEFINITIONSHAPE($,$,(#16834));
+#16839= IFCANNOTATION('1SpPfhFzLDSOqPMAd0Srtt',#4,$,$,$,#16833,#16836);
+#16843= IFCPRESENTATIONSTYLEASSIGNMENT((#16826));
+#16845= IFCSTYLEDITEM(#16827,(#16843),$);
+#16849= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'cec2259e-ba67-11e3-bf5f-7446a0b2bba9--564'),$);
+#16850= IFCPROPERTYSET('2aY5xLPvD2JgpRoiXduhe6',#4,'Allplan Attributes',
+$,(#16849));
+#16852= IFCRELDEFINESBYPROPERTIES('0217ZOOybEyA8fC0LqC83k',#4,$,$,(
+#16839),#16850);
+#16856= IFCTEXTSTYLEFORDEFINEDFONT(#16857,$);
+#16857= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#16858= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#16859= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#16861= IFCTEXTSTYLE($,#16856,#16858,#16859);
+#16862= IFCTEXTLITERAL('Arbeitsfuge mit Quellfugenband !',#16865,.LEFT.
+);
+#16863= IFCDIRECTION((6.123233995736766E-17,1.));
+#16865= IFCAXIS2PLACEMENT2D(#16866,#16863);
+#16866= IFCCARTESIANPOINT((77728.33333333336,21266.51780159047));
+#16868= IFCLOCALPLACEMENT($,#1);
+#16869= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#16862)
+);
+#16871= IFCPRODUCTDEFINITIONSHAPE($,$,(#16869));
+#16874= IFCANNOTATION('2YSiioWDfAyBsT2kVEuEDL',#4,$,$,$,#16868,#16871);
+#16878= IFCPRESENTATIONSTYLEASSIGNMENT((#16861));
+#16880= IFCSTYLEDITEM(#16862,(#16878),$);
+#16884= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'cec2259e-ba67-11e3-bf5f-7446a0b2bba9--565'),$);
+#16885= IFCPROPERTYSET('1t5GeQknL9zAn9ry8puER7',#4,'Allplan Attributes',
+$,(#16884));
+#16887= IFCRELDEFINESBYPROPERTIES('0Y8QBi68D658snjHyHkR33',#4,$,$,(
+#16874),#16885);
+#16891= IFCTEXTSTYLEFORDEFINEDFONT(#16892,$);
+#16892= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#16893= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#16894= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#16896= IFCTEXTSTYLE($,#16891,#16893,#16894);
+#16897= IFCTEXTLITERAL('W2',#16900,.LEFT.);
+#16898= IFCDIRECTION((1.,0.));
+#16900= IFCAXIS2PLACEMENT2D(#16901,#16898);
+#16901= IFCCARTESIANPOINT((84628.30189202848,27671.04263252323));
+#16903= IFCLOCALPLACEMENT($,#1);
+#16904= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#16897)
+);
+#16906= IFCPRODUCTDEFINITIONSHAPE($,$,(#16904));
+#16909= IFCANNOTATION('011NqdS0v6i8ramN4p0C2I',#4,$,$,$,#16903,#16906);
+#16913= IFCPRESENTATIONSTYLEASSIGNMENT((#16896));
+#16915= IFCSTYLEDITEM(#16897,(#16913),$);
+#16919= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'cec2259e-ba67-11e3-bf5f-7446a0b2bba9--418'),$);
+#16920= IFCPROPERTYSET('2BlH62n953Eea9hRmeJLZY',#4,'Allplan Attributes',
+$,(#16919));
+#16922= IFCRELDEFINESBYPROPERTIES('2Zh6usJJf10f5PO9DdO0r8',#4,$,$,(
+#16909),#16920);
+#16926= IFCTEXTSTYLEFORDEFINEDFONT(#16927,$);
+#16927= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#16928= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#16929= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#16931= IFCTEXTSTYLE($,#16926,#16928,#16929);
+#16932= IFCTEXTLITERAL('f6',#16935,.LEFT.);
+#16933= IFCDIRECTION((1.,0.));
+#16935= IFCAXIS2PLACEMENT2D(#16936,#16933);
+#16936= IFCCARTESIANPOINT((84770.96093109455,16601.04263252323));
+#16938= IFCLOCALPLACEMENT($,#1);
+#16939= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#16932)
+);
+#16941= IFCPRODUCTDEFINITIONSHAPE($,$,(#16939));
+#16944= IFCANNOTATION('19gEFUuc9F0QWhxlJZwAnh',#4,$,$,$,#16938,#16941);
+#16948= IFCPRESENTATIONSTYLEASSIGNMENT((#16931));
+#16950= IFCSTYLEDITEM(#16932,(#16948),$);
+#16954= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'cec2259e-ba67-11e3-bf5f-7446a0b2bba9--491'),$);
+#16955= IFCPROPERTYSET('1RdR4WFMr1quR7nv5NPqe4',#4,'Allplan Attributes',
+$,(#16954));
+#16957= IFCRELDEFINESBYPROPERTIES('2H2D6Pnuv6WOo9Ajt8knvX',#4,$,$,(
+#16944),#16955);
+#16961= IFCTEXTSTYLEFORDEFINEDFONT(#16962,$);
+#16962= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#16963= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#16964= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#16966= IFCTEXTSTYLE($,#16961,#16963,#16964);
+#16967= IFCTEXTLITERAL('Absatz OK Boden 7cm',#16970,.LEFT.);
+#16968= IFCDIRECTION((1.,0.));
+#16970= IFCAXIS2PLACEMENT2D(#16971,#16968);
+#16971= IFCCARTESIANPOINT((77265.00000000003,23740.00483059611));
+#16973= IFCLOCALPLACEMENT($,#1);
+#16974= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#16967)
+);
+#16976= IFCPRODUCTDEFINITIONSHAPE($,$,(#16974));
+#16979= IFCANNOTATION('3kTYY1iWf8$vVNyUQ4BBm8',#4,$,$,$,#16973,#16976);
+#16983= IFCPRESENTATIONSTYLEASSIGNMENT((#16966));
+#16985= IFCSTYLEDITEM(#16967,(#16983),$);
+#16989= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'cec2259e-ba67-11e3-bf5f-7446a0b2bba9--9'),$);
+#16990= IFCPROPERTYSET('3juhkqRwLEteB1nmFOwhg$',#4,'Allplan Attributes',
+$,(#16989));
+#16992= IFCRELDEFINESBYPROPERTIES('1tzXO$DSj4EQ6pY3Avfb_I',#4,$,$,(
+#16979),#16990);
+#16996= IFCTEXTSTYLEFORDEFINEDFONT(#16997,$);
+#16997= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#16998= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#16999= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#17001= IFCTEXTSTYLE($,#16996,#16998,#16999);
+#17002= IFCTEXTLITERAL('Absatz UK Boden 7cm',#17005,.LEFT.);
+#17003= IFCDIRECTION((1.,0.));
+#17005= IFCAXIS2PLACEMENT2D(#17006,#17003);
+#17006= IFCCARTESIANPOINT((77261.26060803561,24656.67149726277));
+#17008= IFCLOCALPLACEMENT($,#1);
+#17009= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#17002)
+);
+#17011= IFCPRODUCTDEFINITIONSHAPE($,$,(#17009));
+#17014= IFCANNOTATION('2MEbZDtoP6QuJ$XV_rTiGm',#4,$,$,$,#17008,#17011);
+#17018= IFCPRESENTATIONSTYLEASSIGNMENT((#17001));
+#17020= IFCSTYLEDITEM(#17002,(#17018),$);
+#17024= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'cec2259e-ba67-11e3-bf5f-7446a0b2bba9--10'),$);
+#17025= IFCPROPERTYSET('3rMiBf$2z1vOHYgfujPCP0',#4,'Allplan Attributes',
+$,(#17024));
+#17027= IFCRELDEFINESBYPROPERTIES('03iWw9AafBwx3uxAEhqqmb',#4,$,$,(
+#17014),#17025);
+#17031= IFCTEXTSTYLEFORDEFINEDFONT(#17032,$);
+#17032= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#17033= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#17034= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(350.));
+#17036= IFCTEXTSTYLE($,#17031,#17033,#17034);
+#17037= IFCTEXTLITERAL('d = 25cm',#17040,.LEFT.);
+#17038= IFCDIRECTION((1.,0.));
+#17040= IFCAXIS2PLACEMENT2D(#17041,#17038);
+#17041= IFCCARTESIANPOINT((92662.10678118655,28171.27827844931));
+#17043= IFCLOCALPLACEMENT($,#1);
+#17044= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#17037)
+);
+#17046= IFCPRODUCTDEFINITIONSHAPE($,$,(#17044));
+#17049= IFCANNOTATION('00Gejs6WnAg8OXIWB_R2dA',#4,$,$,$,#17043,#17046);
+#17053= IFCPRESENTATIONSTYLEASSIGNMENT((#17036));
+#17055= IFCSTYLEDITEM(#17037,(#17053),$);
+#17059= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'cec2259e-ba67-11e3-bf5f-7446a0b2bba9--346'),$);
+#17060= IFCPROPERTYSET('3m4hND$e54GePRG_WoGPgp',#4,'Allplan Attributes',
+$,(#17059));
+#17062= IFCRELDEFINESBYPROPERTIES('3Q_y4qffH5cBcuhJfOO441',#4,$,$,(
+#17049),#17060);
+#17066= IFCTEXTSTYLEFORDEFINEDFONT(#17067,$);
+#17067= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#17068= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.5));
+#17069= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(300.));
+#17071= IFCTEXTSTYLE($,#17066,#17068,#17069);
+#17072= IFCPLANAREXTENT(2910.,825.);
+#17073= IFCTEXTLITERALWITHEXTENT(
+'OK= -0.07, UK= -0.32\X\0A+ 20cm D\X2\00E4\X0\mmung (UK= -0.52)\X\0A+ 2cm Splitt (UK= -0.54)\X\0A+ 5cm Magerbeton (UK= -0.59)'
+,#17076,.LEFT.,#17072,'top-left');
+#17074= IFCDIRECTION((1.,0.));
+#17076= IFCAXIS2PLACEMENT2D(#17077,#17074);
+#17077= IFCCARTESIANPOINT((92662.10678118655,28062.11161178265));
+#17079= IFCLOCALPLACEMENT($,#1);
+#17080= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#17073)
+);
+#17082= IFCPRODUCTDEFINITIONSHAPE($,$,(#17080));
+#17085= IFCANNOTATION('2CxV1a37n8DxVSkwPJryzc',#4,$,$,$,#17079,#17082);
+#17089= IFCPRESENTATIONSTYLEASSIGNMENT((#17071));
+#17091= IFCSTYLEDITEM(#17073,(#17089),$);
+#17095= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'cec2259e-ba67-11e3-bf5f-7446a0b2bba9--566'),$);
+#17096= IFCPROPERTYSET('1XCyrJOTT2Ge3rTAry7yNA',#4,'Allplan Attributes',
+$,(#17095));
+#17098= IFCRELDEFINESBYPROPERTIES('1jnCOVVIbE2eOm6kxJBSPC',#4,$,$,(
+#17085),#17096);
+#17102= IFCTEXTSTYLEFORDEFINEDFONT(#17103,$);
+#17103= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#17104= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#17105= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(350.));
+#17107= IFCTEXTSTYLE($,#17102,#17104,#17105);
+#17108= IFCTEXTLITERAL('d = 25cm',#17111,.LEFT.);
+#17109= IFCDIRECTION((1.,0.));
+#17111= IFCAXIS2PLACEMENT2D(#17112,#17109);
+#17112= IFCCARTESIANPOINT((102562.1067811866,24891.27827844933));
+#17114= IFCLOCALPLACEMENT($,#1);
+#17115= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#17108)
+);
+#17117= IFCPRODUCTDEFINITIONSHAPE($,$,(#17115));
+#17120= IFCANNOTATION('3KAFWQ6pjA5ulvI52TVT9P',#4,$,$,$,#17114,#17117);
+#17124= IFCPRESENTATIONSTYLEASSIGNMENT((#17107));
+#17126= IFCSTYLEDITEM(#17108,(#17124),$);
+#17130= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'cec2259e-ba67-11e3-bf5f-7446a0b2bba9--568'),$);
+#17131= IFCPROPERTYSET('2MAGmFcyn5382j3co2FcOt',#4,'Allplan Attributes',
+$,(#17130));
+#17133= IFCRELDEFINESBYPROPERTIES('3cqWpbCqP5dgR9lB$zAFGb',#4,$,$,(
+#17120),#17131);
+#17137= IFCTEXTSTYLEFORDEFINEDFONT(#17138,$);
+#17138= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#17139= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.5));
+#17140= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(300.));
+#17142= IFCTEXTSTYLE($,#17137,#17139,#17140);
+#17143= IFCPLANAREXTENT(2910.,825.);
+#17144= IFCTEXTLITERALWITHEXTENT(
+'OK= -0.14, UK= -0.39\X\0A+ 20cm D\X2\00E4\X0\mmung (UK= -0.59)\X\0A+ 2cm Splitt (UK= -0.61)\X\0A+ 5cm Magerbeton (UK= -0.66)'
+,#17147,.LEFT.,#17143,'top-left');
+#17145= IFCDIRECTION((1.,0.));
+#17147= IFCAXIS2PLACEMENT2D(#17148,#17145);
+#17148= IFCCARTESIANPOINT((102562.1067811866,24782.11161178265));
+#17150= IFCLOCALPLACEMENT($,#1);
+#17151= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#17144)
+);
+#17153= IFCPRODUCTDEFINITIONSHAPE($,$,(#17151));
+#17156= IFCANNOTATION('0vlhvKaM12UvC_7DX6EPzS',#4,$,$,$,#17150,#17153);
+#17160= IFCPRESENTATIONSTYLEASSIGNMENT((#17142));
+#17162= IFCSTYLEDITEM(#17144,(#17160),$);
+#17166= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'cec2259e-ba67-11e3-bf5f-7446a0b2bba9--569'),$);
+#17167= IFCPROPERTYSET('01h$AzrZHF_8j9IhunmHjd',#4,'Allplan Attributes',
+$,(#17166));
+#17169= IFCRELDEFINESBYPROPERTIES('284uMv6v11RRfF38BptKWi',#4,$,$,(
+#17156),#17167);
+#17173= IFCTEXTSTYLEFORDEFINEDFONT(#17174,$);
+#17174= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#17175= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.6));
+#17176= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(250.));
+#17178= IFCTEXTSTYLE($,#17173,#17175,#17176);
+#17179= IFCTEXTLITERAL('Stosseisen',#17182,.LEFT.);
+#17180= IFCDIRECTION((6.123233995736766E-17,1.));
+#17182= IFCAXIS2PLACEMENT2D(#17183,#17180);
+#17183= IFCCARTESIANPOINT((78306.79114055212,5889.799055269293));
+#17185= IFCLOCALPLACEMENT($,#1);
+#17186= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#17179)
+);
+#17188= IFCPRODUCTDEFINITIONSHAPE($,$,(#17186));
+#17191= IFCANNOTATION('2yPGcGvKX1Zehuy4hAzwYG',#4,$,$,$,#17185,#17188);
+#17195= IFCPRESENTATIONSTYLEASSIGNMENT((#17178));
+#17197= IFCSTYLEDITEM(#17179,(#17195),$);
+#17201= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'cec2259e-ba67-11e3-bf5f-7446a0b2bba9--18051824'),$);
+#17202= IFCPROPERTYSET('0oa5bvW5X50BWhOqrRcfMx',#4,'Allplan Attributes',
+$,(#17201));
+#17204= IFCRELDEFINESBYPROPERTIES('1b7u3PVw55sOfTWPuTfplu',#4,$,$,(
+#17191),#17202);
+#17208= IFCTEXTSTYLEFORDEFINEDFONT(#17209,$);
+#17209= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#17210= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#17211= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#17213= IFCTEXTSTYLE($,#17208,#17210,#17211);
+#17214= IFCTEXTLITERAL('Grundriss  1:50',#17217,.LEFT.);
+#17215= IFCDIRECTION((1.,0.));
+#17217= IFCAXIS2PLACEMENT2D(#17218,#17215);
+#17218= IFCCARTESIANPOINT((90241.51411137544,30369.03269149964));
+#17220= IFCLOCALPLACEMENT($,#1);
+#17221= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#17214)
+);
+#17223= IFCPRODUCTDEFINITIONSHAPE($,$,(#17221));
+#17226= IFCANNOTATION('23S2sHRd932wsZ7pEjrUN5',#4,$,$,$,#17220,#17223);
+#17230= IFCPRESENTATIONSTYLEASSIGNMENT((#17213));
+#17232= IFCSTYLEDITEM(#17214,(#17230),$);
+#17236= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'cec2259e-ba67-11e3-bf5f-7446a0b2bba9--562'),$);
+#17237= IFCPROPERTYSET('3ZrDqARMX9PfKxZYLrd850',#4,'Allplan Attributes',
+$,(#17236));
+#17239= IFCRELDEFINESBYPROPERTIES('2dDUsFEirDZfLc7HASezVG',#4,$,$,(
+#17226),#17237);
+#17243= IFCTEXTSTYLEFORDEFINEDFONT(#17244,$);
+#17244= IFCCOLOURRGB($,0.4392156862745098,0.4392156862745098,1.);
+#17245= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.5));
+#17246= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(250.));
+#17248= IFCTEXTSTYLE($,#17243,#17245,#17246);
+#17249= IFCPLANAREXTENT(4979.166666666672,312.5);
+#17250= IFCTEXTLITERALWITHEXTENT(
+'unter Fundamente mit Sickerbeton 32/45mm CEM 200 kg/m\X2\00B3\X0\\X\0Aoder Magerbeton CEM 200 kg/m\X2\00B3\X0\ bis auf Kiesschicht fundieren !'
+,#17253,.LEFT.,#17249,'top-left');
+#17251= IFCDIRECTION((1.,0.));
+#17253= IFCAXIS2PLACEMENT2D(#17254,#17251);
+#17254= IFCCARTESIANPOINT((79040.90503321811,12115.36635853764));
+#17256= IFCLOCALPLACEMENT($,#1);
+#17257= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#17250)
+);
+#17259= IFCPRODUCTDEFINITIONSHAPE($,$,(#17257));
+#17262= IFCANNOTATION('2da6f$XU19g8U0QByNVeBl',#4,$,$,$,#17256,#17259);
+#17266= IFCPRESENTATIONSTYLEASSIGNMENT((#17248));
+#17268= IFCSTYLEDITEM(#17250,(#17266),$);
+#17272= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'cec2259e-ba67-11e3-bf5f-7446a0b2bba9--530'),$);
+#17273= IFCPROPERTYSET('3C7tM13Iv4d8MnyRUdgIQ5',#4,'Allplan Attributes',
+$,(#17272));
+#17275= IFCRELDEFINESBYPROPERTIES('2u8HB30zv4Shh4iy0aIJu6',#4,$,$,(
+#17262),#17273);
+#17279= IFCPOLYLINE((#17283,#17287));
+#17281= IFCPOLYLINE((#17285,#17289));
+#17283= IFCCARTESIANPOINT((2100.,250.));
+#17285= IFCCARTESIANPOINT((0.,0.));
+#17287= IFCCARTESIANPOINT((1850.,250.));
+#17289= IFCCARTESIANPOINT((0.,250.));
+#17291= IFCCONNECTIONCURVEGEOMETRY(#17279,#17281);
+#17292= IFCRELCONNECTSPATHELEMENTS('2s_SOIyUD2sBFwUH2EQJer',#4,$,$,
+#17291,#11409,#11509,(1610618867),(1610618867),.ATSTART.,.ATEND.);
+#17297= IFCPOLYLINE((#17301,#17305));
+#17299= IFCPOLYLINE((#17303,#17307));
+#17301= IFCCARTESIANPOINT((250.,250.));
+#17303= IFCCARTESIANPOINT((1750.000000000004,250.));
+#17305= IFCCARTESIANPOINT((0.,250.));
+#17307= IFCCARTESIANPOINT((1750.000000000004,0.));
+#17309= IFCCONNECTIONCURVEGEOMETRY(#17297,#17299);
+#17310= IFCRELCONNECTSPATHELEMENTS('2ZJhi3gATBaQJHw4rkmDNz',#4,$,$,
+#17309,#11409,#11709,(1610618867),(1610618867),.ATEND.,.ATSTART.);
+#17314= IFCPOLYLINE((#17318,#17322));
+#17316= IFCPOLYLINE((#17320,#17324));
+#17318= IFCCARTESIANPOINT((2000.000000000004,250.));
+#17320= IFCCARTESIANPOINT((0.,0.));
+#17322= IFCCARTESIANPOINT((1750.000000000004,250.));
+#17324= IFCCARTESIANPOINT((0.,250.));
+#17326= IFCCONNECTIONCURVEGEOMETRY(#17314,#17316);
+#17327= IFCRELCONNECTSPATHELEMENTS('3iv_kdSkf1UOTeExgjssZS',#4,$,$,
+#17326,#11509,#11609,(1610618867),(1610618867),.ATSTART.,.ATEND.);
+#17332= IFCPOLYLINE((#17336,#17340));
+#17334= IFCPOLYLINE((#17338,#17342));
+#17336= IFCCARTESIANPOINT((1850.,250.));
+#17338= IFCCARTESIANPOINT((0.,-0.));
+#17340= IFCCARTESIANPOINT((1600.,250.));
+#17342= IFCCARTESIANPOINT((-0.,250.));
+#17344= IFCCONNECTIONCURVEGEOMETRY(#17332,#17334);
+#17345= IFCRELCONNECTSPATHELEMENTS('3XYU0fJer1cPY82hMk1jlz',#4,$,$,
+#17344,#11609,#11709,(1610618867),(1610618867),.ATSTART.,.ATEND.);
+#17349= IFCTEXTSTYLEFORDEFINEDFONT(#17350,$);
+#17350= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#17351= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#17352= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#17354= IFCTEXTSTYLE($,#17349,#17351,#17352);
+#17355= IFCTEXTLITERAL('Schnitt A-A  1:20',#17358,.LEFT.);
+#17356= IFCDIRECTION((1.,0.));
+#17358= IFCAXIS2PLACEMENT2D(#17359,#17356);
+#17359= IFCCARTESIANPOINT((64928.65779311588,-3984.138528206891));
+#17361= IFCLOCALPLACEMENT($,#1);
+#17362= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#17355)
+);
+#17364= IFCPRODUCTDEFINITIONSHAPE($,$,(#17362));
+#17367= IFCANNOTATION('175Mc_imvCURFqF$G1$Xb$',#4,$,$,$,#17361,#17364);
+#17371= IFCPRESENTATIONSTYLEASSIGNMENT((#17354));
+#17373= IFCSTYLEDITEM(#17355,(#17371),$);
+#17377= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'91a2d109-b8d7-11e3-bf39-7446a0b2bba9--12'),$);
+#17378= IFCPROPERTYSET('3GovjvMMn1HB2ZJ29ODAMa',#4,'Allplan Attributes',
+$,(#17377));
+#17380= IFCRELDEFINESBYPROPERTIES('0M8ZgFg$95A9LNFCOmHA$v',#4,$,$,(
+#17367),#17378);
+#17384= IFCTEXTSTYLEFORDEFINEDFONT(#17385,$);
+#17385= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#17386= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#17387= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(350.));
+#17389= IFCTEXTSTYLE($,#17384,#17386,#17387);
+#17390= IFCTEXTLITERAL('d = 25cm',#17393,.LEFT.);
+#17391= IFCDIRECTION((0.7310552682428758,0.6823182503600038));
+#17393= IFCAXIS2PLACEMENT2D(#17394,#17391);
+#17394= IFCCARTESIANPOINT((87738.90713147861,22755.42414823773));
+#17396= IFCLOCALPLACEMENT($,#1);
+#17397= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#17390)
+);
+#17399= IFCPRODUCTDEFINITIONSHAPE($,$,(#17397));
+#17402= IFCANNOTATION('0nMZIZD$z4cAXUjM0budbX',#4,$,$,$,#17396,#17399);
+#17406= IFCPRESENTATIONSTYLEASSIGNMENT((#17389));
+#17408= IFCSTYLEDITEM(#17390,(#17406),$);
+#17412= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--8'),$);
+#17413= IFCPROPERTYSET('1r14FJ7jX9XeK0919LIneA',#4,'Allplan Attributes',
+$,(#17412));
+#17415= IFCRELDEFINESBYPROPERTIES('2YKb4Qp6jAyPb7uQscleJc',#4,$,$,(
+#17402),#17413);
+#17419= IFCTEXTSTYLEFORDEFINEDFONT(#17420,$);
+#17420= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#17421= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#17422= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#17424= IFCTEXTSTYLE($,#17419,#17421,#17422);
+#17425= IFCTEXTLITERAL('Absatz OK Boden 7cm',#17428,.LEFT.);
+#17426= IFCDIRECTION((1.,0.));
+#17428= IFCAXIS2PLACEMENT2D(#17429,#17426);
+#17429= IFCCARTESIANPOINT((75981.541562714,23740.00483059611));
+#17431= IFCLOCALPLACEMENT($,#1);
+#17432= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#17425)
+);
+#17434= IFCPRODUCTDEFINITIONSHAPE($,$,(#17432));
+#17437= IFCANNOTATION('3KRmaNP_LCSQGbXtlDZGNj',#4,$,$,$,#17431,#17434);
+#17441= IFCPRESENTATIONSTYLEASSIGNMENT((#17424));
+#17443= IFCSTYLEDITEM(#17425,(#17441),$);
+#17447= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--9'),$);
+#17448= IFCPROPERTYSET('1Rxbk3i3P1kPxz52Us8_7D',#4,'Allplan Attributes',
+$,(#17447));
+#17450= IFCRELDEFINESBYPROPERTIES('0wvVO$Fjr22hUSDp9ClCyg',#4,$,$,(
+#17437),#17448);
+#17454= IFCTEXTSTYLEFORDEFINEDFONT(#17455,$);
+#17455= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#17456= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#17457= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#17459= IFCTEXTSTYLE($,#17454,#17456,#17457);
+#17460= IFCTEXTLITERAL('Absatz UK Boden 7cm',#17463,.LEFT.);
+#17461= IFCDIRECTION((1.,0.));
+#17463= IFCAXIS2PLACEMENT2D(#17464,#17461);
+#17464= IFCCARTESIANPOINT((75977.80217074958,24656.67149726277));
+#17466= IFCLOCALPLACEMENT($,#1);
+#17467= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#17460)
+);
+#17469= IFCPRODUCTDEFINITIONSHAPE($,$,(#17467));
+#17472= IFCANNOTATION('0rGur1m9z4nuTGCWy8QQ8M',#4,$,$,$,#17466,#17469);
+#17476= IFCPRESENTATIONSTYLEASSIGNMENT((#17459));
+#17478= IFCSTYLEDITEM(#17460,(#17476),$);
+#17482= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--10'),$);
+#17483= IFCPROPERTYSET('3p4iuMAon76PE9xig0_xx0',#4,'Allplan Attributes',
+$,(#17482));
+#17485= IFCRELDEFINESBYPROPERTIES('3ODr_x8y98wuQzujd$UtI7',#4,$,$,(
+#17472),#17483);
+#17489= IFCTEXTSTYLEFORDEFINEDFONT(#17490,$);
+#17490= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#17491= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#17492= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#17494= IFCTEXTSTYLE($,#17489,#17491,#17492);
+#17495= IFCTEXTLITERAL('Absatz OK Boden 7cm',#17498,.LEFT.);
+#17496= IFCDIRECTION((6.123233995736766E-17,1.));
+#17498= IFCAXIS2PLACEMENT2D(#17499,#17496);
+#17499= IFCCARTESIANPOINT((79188.33333333333,22338.59690241592));
+#17501= IFCLOCALPLACEMENT($,#1);
+#17502= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#17495)
+);
+#17504= IFCPRODUCTDEFINITIONSHAPE($,$,(#17502));
+#17507= IFCANNOTATION('0zYJD5zKPEJRmIlp9Ib0zV',#4,$,$,$,#17501,#17504);
+#17511= IFCPRESENTATIONSTYLEASSIGNMENT((#17494));
+#17513= IFCSTYLEDITEM(#17495,(#17511),$);
+#17517= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--11'),$);
+#17518= IFCPROPERTYSET('105kD3gPr6oucQjY04qhTt',#4,'Allplan Attributes',
+$,(#17517));
+#17520= IFCRELDEFINESBYPROPERTIES('20dnGGqYL7pe4dlYrWkbub',#4,$,$,(
+#17507),#17518);
+#17524= IFCTEXTSTYLEFORDEFINEDFONT(#17525,$);
+#17525= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#17526= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#17527= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#17529= IFCTEXTSTYLE($,#17524,#17526,#17527);
+#17530= IFCTEXTLITERAL('Absatz OK Boden 7cm',#17533,.LEFT.);
+#17531= IFCDIRECTION((1.,0.));
+#17533= IFCAXIS2PLACEMENT2D(#17534,#17531);
+#17534= IFCCARTESIANPOINT((79777.02674372181,22095.0048305961));
+#17536= IFCLOCALPLACEMENT($,#1);
+#17537= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#17530)
+);
+#17539= IFCPRODUCTDEFINITIONSHAPE($,$,(#17537));
+#17542= IFCANNOTATION('3IiIdy$pT3HuF65OCSuJRp',#4,$,$,$,#17536,#17539);
+#17546= IFCPRESENTATIONSTYLEASSIGNMENT((#17529));
+#17548= IFCSTYLEDITEM(#17530,(#17546),$);
+#17552= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--12'),$);
+#17553= IFCPROPERTYSET('0cixMHZZPCFhTmdKEBh4Tc',#4,'Allplan Attributes',
+$,(#17552));
+#17555= IFCRELDEFINESBYPROPERTIES('3YOV_6GnfBeutvLz1AT6xo',#4,$,$,(
+#17542),#17553);
+#17559= IFCTEXTSTYLEFORDEFINEDFONT(#17560,$);
+#17560= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#17561= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#17562= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#17564= IFCTEXTSTYLE($,#17559,#17561,#17562);
+#17565= IFCTEXTLITERAL('Absatz OK Boden 7cm',#17568,.LEFT.);
+#17566= IFCDIRECTION((6.123233995736766E-17,1.));
+#17568= IFCAXIS2PLACEMENT2D(#17569,#17566);
+#17569= IFCCARTESIANPOINT((82025.,22520.04762552151));
+#17571= IFCLOCALPLACEMENT($,#1);
+#17572= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#17565)
+);
+#17574= IFCPRODUCTDEFINITIONSHAPE($,$,(#17572));
+#17577= IFCANNOTATION('3cESy2tbn6chSKPUHZtq2b',#4,$,$,$,#17571,#17574);
+#17581= IFCPRESENTATIONSTYLEASSIGNMENT((#17564));
+#17583= IFCSTYLEDITEM(#17565,(#17581),$);
+#17587= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--13'),$);
+#17588= IFCPROPERTYSET('2JL6sH3_94$B2CPUpz7Gr0',#4,'Allplan Attributes',
+$,(#17587));
+#17590= IFCRELDEFINESBYPROPERTIES('1HMSOAKg5CVgGknzfbob52',#4,$,$,(
+#17577),#17588);
+#17594= IFCTEXTSTYLEFORDEFINEDFONT(#17595,$);
+#17595= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#17596= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#17597= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#17599= IFCTEXTSTYLE($,#17594,#17596,#17597);
+#17600= IFCTEXTLITERAL('Absatz OK Boden 7cm',#17603,.LEFT.);
+#17601= IFCDIRECTION((1.,0.));
+#17603= IFCAXIS2PLACEMENT2D(#17604,#17601);
+#17604= IFCCARTESIANPOINT((82528.94870789858,23990.0048305961));
+#17606= IFCLOCALPLACEMENT($,#1);
+#17607= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#17600)
+);
+#17609= IFCPRODUCTDEFINITIONSHAPE($,$,(#17607));
+#17612= IFCANNOTATION('1fTNmYvwD5QR3UJfLmiLvq',#4,$,$,$,#17606,#17609);
+#17616= IFCPRESENTATIONSTYLEASSIGNMENT((#17599));
+#17618= IFCSTYLEDITEM(#17600,(#17616),$);
+#17622= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--14'),$);
+#17623= IFCPROPERTYSET('3K5k6XzZP08fHqwZ0ccQzS',#4,'Allplan Attributes',
+$,(#17622));
+#17625= IFCRELDEFINESBYPROPERTIES('3zOIo0uRDFVw1m7ddDGOWa',#4,$,$,(
+#17612),#17623);
+#17629= IFCTEXTSTYLEFORDEFINEDFONT(#17630,$);
+#17630= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#17631= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#17632= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#17634= IFCTEXTSTYLE($,#17629,#17631,#17632);
+#17635= IFCTEXTLITERAL('Absatz OK Boden 7cm',#17638,.LEFT.);
+#17636= IFCDIRECTION((1.,0.));
+#17638= IFCAXIS2PLACEMENT2D(#17639,#17636);
+#17639= IFCCARTESIANPOINT((85062.27633487518,23740.0048305961));
+#17641= IFCLOCALPLACEMENT($,#1);
+#17642= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#17635)
+);
+#17644= IFCPRODUCTDEFINITIONSHAPE($,$,(#17642));
+#17647= IFCANNOTATION('2$AhkaKMfCjxyG5MsNrqaU',#4,$,$,$,#17641,#17644);
+#17651= IFCPRESENTATIONSTYLEASSIGNMENT((#17634));
+#17653= IFCSTYLEDITEM(#17635,(#17651),$);
+#17657= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--15'),$);
+#17658= IFCPROPERTYSET('0SqNV745v78gSb0uW3MA5$',#4,'Allplan Attributes',
+$,(#17657));
+#17660= IFCRELDEFINESBYPROPERTIES('2DvU09bcb91wsCAuf41vas',#4,$,$,(
+#17647),#17658);
+#17664= IFCTEXTSTYLEFORDEFINEDFONT(#17665,$);
+#17665= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#17666= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#17667= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#17669= IFCTEXTSTYLE($,#17664,#17666,#17667);
+#17670= IFCTEXTLITERAL('Absatz UK Boden 7cm',#17673,.LEFT.);
+#17671= IFCDIRECTION((1.,0.));
+#17673= IFCAXIS2PLACEMENT2D(#17674,#17671);
+#17674= IFCCARTESIANPOINT((87412.56598371331,24656.67149726277));
+#17676= IFCLOCALPLACEMENT($,#1);
+#17677= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#17670)
+);
+#17679= IFCPRODUCTDEFINITIONSHAPE($,$,(#17677));
+#17682= IFCANNOTATION('10arZJEUvBDPEJEinzBJIC',#4,$,$,$,#17676,#17679);
+#17686= IFCPRESENTATIONSTYLEASSIGNMENT((#17669));
+#17688= IFCSTYLEDITEM(#17670,(#17686),$);
+#17692= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--16'),$);
+#17693= IFCPROPERTYSET('2VlTtHbEDAf9UZMS4j8$Jw',#4,'Allplan Attributes',
+$,(#17692));
+#17695= IFCRELDEFINESBYPROPERTIES('0p0OzyZG10sfZmjzyxewwj',#4,$,$,(
+#17682),#17693);
+#17699= IFCTEXTSTYLEFORDEFINEDFONT(#17700,$);
+#17700= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#17701= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#17702= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#17704= IFCTEXTSTYLE($,#17699,#17701,#17702);
+#17705= IFCTEXTLITERAL('Absatz OK Boden 7cm',#17708,.LEFT.);
+#17706= IFCDIRECTION((1.,0.));
+#17708= IFCAXIS2PLACEMENT2D(#17709,#17706);
+#17709= IFCCARTESIANPOINT((90006.89477922957,23740.0048305961));
+#17711= IFCLOCALPLACEMENT($,#1);
+#17712= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#17705)
+);
+#17714= IFCPRODUCTDEFINITIONSHAPE($,$,(#17712));
+#17717= IFCANNOTATION('2Fclof6bD7XegvTa9uf_GF',#4,$,$,$,#17711,#17714);
+#17721= IFCPRESENTATIONSTYLEASSIGNMENT((#17704));
+#17723= IFCSTYLEDITEM(#17705,(#17721),$);
+#17727= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--17'),$);
+#17728= IFCPROPERTYSET('0aZtmZdiHAuhidBUWV60MR',#4,'Allplan Attributes',
+$,(#17727));
+#17730= IFCRELDEFINESBYPROPERTIES('2eoMfxsQL6yRF3afr7v$N1',#4,$,$,(
+#17717),#17728);
+#17734= IFCTEXTSTYLEFORDEFINEDFONT(#17735,$);
+#17735= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#17736= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.4));
+#17737= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#17739= IFCTEXTSTYLE($,#17734,#17736,#17737);
+#17740= IFCPLANAREXTENT(1940.,240.);
+#17741= IFCTEXTLITERALWITHEXTENT(
+'Fund. d=30cm, UK= -0.90\X\0A+ 5cm Magerbeton (UK= -0.95)',#17744,.LEFT.
+,#17740,'top-left');
+#17742= IFCDIRECTION((1.,0.));
+#17744= IFCAXIS2PLACEMENT2D(#17745,#17742);
+#17745= IFCCARTESIANPOINT((69475.,8050.004830596101));
+#17747= IFCLOCALPLACEMENT($,#1);
+#17748= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#17741)
+);
+#17750= IFCPRODUCTDEFINITIONSHAPE($,$,(#17748));
+#17753= IFCANNOTATION('30wKBWPan5lA41Xd5WqGhW',#4,$,$,$,#17747,#17750);
+#17757= IFCPRESENTATIONSTYLEASSIGNMENT((#17739));
+#17759= IFCSTYLEDITEM(#17741,(#17757),$);
+#17763= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--18'),$);
+#17764= IFCPROPERTYSET('2d2nNvPoL5TuQFruoi8WZc',#4,'Allplan Attributes',
+$,(#17763));
+#17766= IFCRELDEFINESBYPROPERTIES('3YN7OsExz5f9gd2_ZcnjOb',#4,$,$,(
+#17753),#17764);
+#17770= IFCTEXTSTYLEFORDEFINEDFONT(#17771,$);
+#17771= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#17772= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.4));
+#17773= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#17775= IFCTEXTSTYLE($,#17770,#17772,#17773);
+#17776= IFCPLANAREXTENT(1940.,240.);
+#17777= IFCTEXTLITERALWITHEXTENT(
+'Fund. d=30cm, UK= -0.90\X\0A+ 5cm Magerbeton (UK= -0.95)',#17780,.LEFT.
+,#17776,'top-left');
+#17778= IFCDIRECTION((1.,0.));
+#17780= IFCAXIS2PLACEMENT2D(#17781,#17778);
+#17781= IFCCARTESIANPOINT((95155.00000000002,8050.004830596099));
+#17783= IFCLOCALPLACEMENT($,#1);
+#17784= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#17777)
+);
+#17786= IFCPRODUCTDEFINITIONSHAPE($,$,(#17784));
+#17789= IFCANNOTATION('0R46K1_cj6gP9587Xn04jm',#4,$,$,$,#17783,#17786);
+#17793= IFCPRESENTATIONSTYLEASSIGNMENT((#17775));
+#17795= IFCSTYLEDITEM(#17777,(#17793),$);
+#17799= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--19'),$);
+#17800= IFCPROPERTYSET('3hXRZ3Ffr6tfbu22RDMFMc',#4,'Allplan Attributes',
+$,(#17799));
+#17802= IFCRELDEFINESBYPROPERTIES('28PEZ9_7H6FPXt5$GBjrbC',#4,$,$,(
+#17789),#17800);
+#17806= IFCTEXTSTYLEFORDEFINEDFONT(#17807,$);
+#17807= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#17808= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.4));
+#17809= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#17811= IFCTEXTSTYLE($,#17806,#17808,#17809);
+#17812= IFCPLANAREXTENT(1940.,240.);
+#17813= IFCTEXTLITERALWITHEXTENT(
+'Fund. d=30cm, UK= -0.90\X\0A+ 5cm Magerbeton (UK= -0.95)',#17816,.LEFT.
+,#17812,'top-left');
+#17814= IFCDIRECTION((6.123233995736766E-17,1.));
+#17816= IFCAXIS2PLACEMENT2D(#17817,#17814);
+#17817= IFCCARTESIANPOINT((102125.,10580.0048305961));
+#17819= IFCLOCALPLACEMENT($,#1);
+#17820= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#17813)
+);
+#17822= IFCPRODUCTDEFINITIONSHAPE($,$,(#17820));
+#17825= IFCANNOTATION('28W1Mzag99bwVQlZL9$pP5',#4,$,$,$,#17819,#17822);
+#17829= IFCPRESENTATIONSTYLEASSIGNMENT((#17811));
+#17831= IFCSTYLEDITEM(#17813,(#17829),$);
+#17835= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--20'),$);
+#17836= IFCPROPERTYSET('0mr$2U34r7JxIG2byROEUu',#4,'Allplan Attributes',
+$,(#17835));
+#17838= IFCRELDEFINESBYPROPERTIES('1t0fThtaL6eei5VPnmza0U',#4,$,$,(
+#17825),#17836);
+#17842= IFCTEXTSTYLEFORDEFINEDFONT(#17843,$);
+#17843= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#17844= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.4));
+#17845= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#17847= IFCTEXTSTYLE($,#17842,#17844,#17845);
+#17848= IFCPLANAREXTENT(1940.,240.);
+#17849= IFCTEXTLITERALWITHEXTENT(
+'Fund. d=30cm, UK= -0.90\X\0A+ 5cm Magerbeton (UK= -0.95)',#17852,.LEFT.
+,#17848,'top-left');
+#17850= IFCDIRECTION((6.123233995736766E-17,1.));
+#17852= IFCAXIS2PLACEMENT2D(#17853,#17850);
+#17853= IFCCARTESIANPOINT((64198.33333333334,21420.0048305961));
+#17855= IFCLOCALPLACEMENT($,#1);
+#17856= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#17849)
+);
+#17858= IFCPRODUCTDEFINITIONSHAPE($,$,(#17856));
+#17861= IFCANNOTATION('1RvzxDt552GweWxIThX0Wn',#4,$,$,$,#17855,#17858);
+#17865= IFCPRESENTATIONSTYLEASSIGNMENT((#17847));
+#17867= IFCSTYLEDITEM(#17849,(#17865),$);
+#17871= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--21'),$);
+#17872= IFCPROPERTYSET('2NhU0We4bDxvEar8H70Oej',#4,'Allplan Attributes',
+$,(#17871));
+#17874= IFCRELDEFINESBYPROPERTIES('2JWPPX09f9pP4uPU5leMHb',#4,$,$,(
+#17861),#17872);
+#17878= IFCTEXTSTYLEFORDEFINEDFONT(#17879,$);
+#17879= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#17880= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.4));
+#17881= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#17883= IFCTEXTSTYLE($,#17878,#17880,#17881);
+#17884= IFCPLANAREXTENT(1940.,240.);
+#17885= IFCTEXTLITERALWITHEXTENT(
+'Fund. d=30cm, UK= -0.90\X\0A+ 5cm Magerbeton (UK= -0.95)',#17888,.LEFT.
+,#17884,'top-left');
+#17886= IFCDIRECTION((6.123233995736766E-17,1.));
+#17888= IFCAXIS2PLACEMENT2D(#17889,#17886);
+#17889= IFCCARTESIANPOINT((64198.33333333333,10580.0048305961));
+#17891= IFCLOCALPLACEMENT($,#1);
+#17892= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#17885)
+);
+#17894= IFCPRODUCTDEFINITIONSHAPE($,$,(#17892));
+#17897= IFCANNOTATION('2voWwpskHCHvrFE_FZPAyN',#4,$,$,$,#17891,#17894);
+#17901= IFCPRESENTATIONSTYLEASSIGNMENT((#17883));
+#17903= IFCSTYLEDITEM(#17885,(#17901),$);
+#17907= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--22'),$);
+#17908= IFCPROPERTYSET('3VKsE1IvDE5QTRYr4yhfIu',#4,'Allplan Attributes',
+$,(#17907));
+#17910= IFCRELDEFINESBYPROPERTIES('24_0fr$G10fhjcj4rmCzhk',#4,$,$,(
+#17897),#17908);
+#17914= IFCTEXTSTYLEFORDEFINEDFONT(#17915,$);
+#17915= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#17916= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.4));
+#17917= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#17919= IFCTEXTSTYLE($,#17914,#17916,#17917);
+#17920= IFCPLANAREXTENT(1940.,240.);
+#17921= IFCTEXTLITERALWITHEXTENT(
+'Fund. d=30cm, UK= -0.90\X\0A+ 5cm Magerbeton (UK= -0.95)',#17924,.LEFT.
+,#17920,'top-left');
+#17922= IFCDIRECTION((6.123233995736766E-17,1.));
+#17924= IFCAXIS2PLACEMENT2D(#17925,#17922);
+#17925= IFCCARTESIANPOINT((102125.,20920.0048305961));
+#17927= IFCLOCALPLACEMENT($,#1);
+#17928= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#17921)
+);
+#17930= IFCPRODUCTDEFINITIONSHAPE($,$,(#17928));
+#17933= IFCANNOTATION('113vzleWb1y94qq$iGecAv',#4,$,$,$,#17927,#17930);
+#17937= IFCPRESENTATIONSTYLEASSIGNMENT((#17919));
+#17939= IFCSTYLEDITEM(#17921,(#17937),$);
+#17943= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--91'),$);
+#17944= IFCPROPERTYSET('3UUAiyqZH3IgBZHPTQaYPv',#4,'Allplan Attributes',
+$,(#17943));
+#17946= IFCRELDEFINESBYPROPERTIES('3GwgqfkDXA6OD8itMJp4Ep',#4,$,$,(
+#17933),#17944);
+#17950= IFCTEXTSTYLEFORDEFINEDFONT(#17951,$);
+#17951= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#17952= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#17953= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#17955= IFCTEXTSTYLE($,#17950,#17952,#17953);
+#17956= IFCTEXTLITERAL('A',#17959,.LEFT.);
+#17957= IFCDIRECTION((1.,0.));
+#17959= IFCAXIS2PLACEMENT2D(#17960,#17957);
+#17960= IFCCARTESIANPOINT((85952.9040210247,23151.85649857375));
+#17962= IFCLOCALPLACEMENT($,#1);
+#17963= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#17956)
+);
+#17965= IFCPRODUCTDEFINITIONSHAPE($,$,(#17963));
+#17968= IFCANNOTATION('2fby_hfvbDYBv0WRsofYlV',#4,$,$,$,#17962,#17965);
+#17972= IFCPRESENTATIONSTYLEASSIGNMENT((#17955));
+#17974= IFCSTYLEDITEM(#17956,(#17972),$);
+#17978= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--309'),$);
+#17979= IFCPROPERTYSET('2DI1b_W8DEfBh_i2LM6qjY',#4,'Allplan Attributes',
+$,(#17978));
+#17981= IFCRELDEFINESBYPROPERTIES('2pHhdfEdX4geMTvp8Qyblh',#4,$,$,(
+#17968),#17979);
+#17985= IFCTEXTSTYLEFORDEFINEDFONT(#17986,$);
+#17986= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#17987= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#17988= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#17990= IFCTEXTSTYLE($,#17985,#17987,#17988);
+#17991= IFCTEXTLITERAL('A',#17994,.LEFT.);
+#17992= IFCDIRECTION((1.,0.));
+#17994= IFCAXIS2PLACEMENT2D(#17995,#17992);
+#17995= IFCCARTESIANPOINT((90153.76264563203,23151.85649857376));
+#17997= IFCLOCALPLACEMENT($,#1);
+#17998= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#17991)
+);
+#18000= IFCPRODUCTDEFINITIONSHAPE($,$,(#17998));
+#18003= IFCANNOTATION('1b$Qok5KnCK8jU$BicF33S',#4,$,$,$,#17997,#18000);
+#18007= IFCPRESENTATIONSTYLEASSIGNMENT((#17990));
+#18009= IFCSTYLEDITEM(#17991,(#18007),$);
+#18013= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--321'),$);
+#18014= IFCPROPERTYSET('2x1WtPWMzBkPmx0PXw6nLr',#4,'Allplan Attributes',
+$,(#18013));
+#18016= IFCRELDEFINESBYPROPERTIES('0VhRo3ie53CRJ3QH$osGg0',#4,$,$,(
+#18003),#18014);
+#18020= IFCTEXTSTYLEFORDEFINEDFONT(#18021,$);
+#18021= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#18022= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#18023= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(350.));
+#18025= IFCTEXTSTYLE($,#18020,#18022,#18023);
+#18026= IFCTEXTLITERAL('d = 25cm',#18029,.LEFT.);
+#18027= IFCDIRECTION((0.9808262151348187,0.1948844162684801));
+#18029= IFCAXIS2PLACEMENT2D(#18030,#18027);
+#18030= IFCCARTESIANPOINT((83632.23966450329,25811.54350744394));
+#18032= IFCLOCALPLACEMENT($,#1);
+#18033= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#18026)
+);
+#18035= IFCPRODUCTDEFINITIONSHAPE($,$,(#18033));
+#18038= IFCANNOTATION('1Ay3SeLJX8fwwMGo12r2Wl',#4,$,$,$,#18032,#18035);
+#18042= IFCPRESENTATIONSTYLEASSIGNMENT((#18025));
+#18044= IFCSTYLEDITEM(#18026,(#18042),$);
+#18048= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--346'),$);
+#18049= IFCPROPERTYSET('1i9Ln7AOLCTPgP0syYtJ0c',#4,'Allplan Attributes',
+$,(#18048));
+#18051= IFCRELDEFINESBYPROPERTIES('3Vzyvta0LD6wzW4$SypUk1',#4,$,$,(
+#18038),#18049);
+#18055= IFCTEXTSTYLEFORDEFINEDFONT(#18056,$);
+#18056= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#18057= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#18058= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#18060= IFCTEXTSTYLE($,#18055,#18057,#18058);
+#18061= IFCTEXTLITERAL('f1',#18064,.LEFT.);
+#18062= IFCDIRECTION((1.,0.));
+#18064= IFCAXIS2PLACEMENT2D(#18065,#18062);
+#18065= IFCCARTESIANPOINT((63944.51335346072,16091.04263252323));
+#18067= IFCLOCALPLACEMENT($,#1);
+#18068= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#18061)
+);
+#18070= IFCPRODUCTDEFINITIONSHAPE($,$,(#18068));
+#18073= IFCANNOTATION('21n0HnRmz1pO_DAQTXiGG2',#4,$,$,$,#18067,#18070);
+#18077= IFCPRESENTATIONSTYLEASSIGNMENT((#18060));
+#18079= IFCSTYLEDITEM(#18061,(#18077),$);
+#18083= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--400'),$);
+#18084= IFCPROPERTYSET('3xy5Qy009F4wxxpFfJnQqV',#4,'Allplan Attributes',
+$,(#18083));
+#18086= IFCRELDEFINESBYPROPERTIES('3_p0CLKzTB$OBqoNwFNZQY',#4,$,$,(
+#18073),#18084);
+#18090= IFCTEXTSTYLEFORDEFINEDFONT(#18091,$);
+#18091= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#18092= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#18093= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#18095= IFCTEXTSTYLE($,#18090,#18092,#18093);
+#18096= IFCTEXTLITERAL('f1',#18099,.LEFT.);
+#18097= IFCDIRECTION((1.,0.));
+#18099= IFCAXIS2PLACEMENT2D(#18100,#18097);
+#18100= IFCCARTESIANPOINT((102367.5048670323,23148.54263252323));
+#18102= IFCLOCALPLACEMENT($,#1);
+#18103= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#18096)
+);
+#18105= IFCPRODUCTDEFINITIONSHAPE($,$,(#18103));
+#18108= IFCANNOTATION('3SLD8Mldr85B1z2uKmDS3Z',#4,$,$,$,#18102,#18105);
+#18112= IFCPRESENTATIONSTYLEASSIGNMENT((#18095));
+#18114= IFCSTYLEDITEM(#18096,(#18112),$);
+#18118= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--401'),$);
+#18119= IFCPROPERTYSET('02iNnDmf1FLAXFJ4yub4k7',#4,'Allplan Attributes',
+$,(#18118));
+#18121= IFCRELDEFINESBYPROPERTIES('2xX9GZauLCSxqsMVru1_45',#4,$,$,(
+#18108),#18119);
+#18125= IFCTEXTSTYLEFORDEFINEDFONT(#18126,$);
+#18126= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#18127= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#18128= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#18130= IFCTEXTSTYLE($,#18125,#18127,#18128);
+#18131= IFCTEXTLITERAL('F1',#18134,.LEFT.);
+#18132= IFCDIRECTION((1.,0.));
+#18134= IFCAXIS2PLACEMENT2D(#18135,#18132);
+#18135= IFCCARTESIANPOINT((96418.85940563989,17938.30953539124));
+#18137= IFCLOCALPLACEMENT($,#1);
+#18138= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#18131)
+);
+#18140= IFCPRODUCTDEFINITIONSHAPE($,$,(#18138));
+#18143= IFCANNOTATION('05wkwvWub1AfZWjG_ifM76',#4,$,$,$,#18137,#18140);
+#18147= IFCPRESENTATIONSTYLEASSIGNMENT((#18130));
+#18149= IFCSTYLEDITEM(#18131,(#18147),$);
+#18153= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--402'),$);
+#18154= IFCPROPERTYSET('3UTRyXFbv7W9DYoK4DORf8',#4,'Allplan Attributes',
+$,(#18153));
+#18156= IFCRELDEFINESBYPROPERTIES('3rtg3C$Vn4kgoCWv9gs83s',#4,$,$,(
+#18143),#18154);
+#18160= IFCTEXTSTYLEFORDEFINEDFONT(#18161,$);
+#18161= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#18162= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#18163= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#18165= IFCTEXTSTYLE($,#18160,#18162,#18163);
+#18166= IFCTEXTLITERAL('f2',#18169,.LEFT.);
+#18167= IFCDIRECTION((1.,0.));
+#18169= IFCAXIS2PLACEMENT2D(#18170,#18167);
+#18170= IFCCARTESIANPOINT((78350.00486703226,7551.042632523229));
+#18172= IFCLOCALPLACEMENT($,#1);
+#18173= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#18166)
+);
+#18175= IFCPRODUCTDEFINITIONSHAPE($,$,(#18173));
+#18178= IFCANNOTATION('3Yn2pcQ$H9$vma$KBrMaHx',#4,$,$,$,#18172,#18175);
+#18182= IFCPRESENTATIONSTYLEASSIGNMENT((#18165));
+#18184= IFCSTYLEDITEM(#18166,(#18182),$);
+#18188= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--487'),$);
+#18189= IFCPROPERTYSET('2DUSygkoLCvvoeUU3NUlbK',#4,'Allplan Attributes',
+$,(#18188));
+#18191= IFCRELDEFINESBYPROPERTIES('3jTFfdVYfD2xqB3BDKK_V8',#4,$,$,(
+#18178),#18189);
+#18195= IFCTEXTSTYLEFORDEFINEDFONT(#18196,$);
+#18196= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#18197= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#18198= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#18200= IFCTEXTSTYLE($,#18195,#18197,#18198);
+#18201= IFCTEXTLITERAL('f3',#18204,.LEFT.);
+#18202= IFCDIRECTION((1.,0.));
+#18204= IFCAXIS2PLACEMENT2D(#18205,#18202);
+#18205= IFCCARTESIANPOINT((93993.5098230476,7551.042632523229));
+#18207= IFCLOCALPLACEMENT($,#1);
+#18208= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#18201)
+);
+#18210= IFCPRODUCTDEFINITIONSHAPE($,$,(#18208));
+#18213= IFCANNOTATION('3_S7G3If17IR2kFFhFIRiN',#4,$,$,$,#18207,#18210);
+#18217= IFCPRESENTATIONSTYLEASSIGNMENT((#18200));
+#18219= IFCSTYLEDITEM(#18201,(#18217),$);
+#18223= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--488'),$);
+#18224= IFCPROPERTYSET('0hYxEf9Rr8mfd0Eu7HC_D4',#4,'Allplan Attributes',
+$,(#18223));
+#18226= IFCRELDEFINESBYPROPERTIES('3EO2Rum697nAhaTAuxlIWr',#4,$,$,(
+#18213),#18224);
+#18230= IFCTEXTSTYLEFORDEFINEDFONT(#18231,$);
+#18231= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#18232= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#18233= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#18235= IFCTEXTSTYLE($,#18230,#18232,#18233);
+#18236= IFCTEXTLITERAL('f4',#18239,.LEFT.);
+#18237= IFCDIRECTION((1.,0.));
+#18239= IFCAXIS2PLACEMENT2D(#18240,#18237);
+#18240= IFCCARTESIANPOINT((98812.22799894086,7551.042632523229));
+#18242= IFCLOCALPLACEMENT($,#1);
+#18243= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#18236)
+);
+#18245= IFCPRODUCTDEFINITIONSHAPE($,$,(#18243));
+#18248= IFCANNOTATION('0gTouOOxn4qvr1DP4CtQce',#4,$,$,$,#18242,#18245);
+#18252= IFCPRESENTATIONSTYLEASSIGNMENT((#18235));
+#18254= IFCSTYLEDITEM(#18236,(#18252),$);
+#18258= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--489'),$);
+#18259= IFCPROPERTYSET('0vfms0LJ5CQP3NosDb7wdP',#4,'Allplan Attributes',
+$,(#18258));
+#18261= IFCRELDEFINESBYPROPERTIES('1GgzTlmbzFjgI005O6Z5PD',#4,$,$,(
+#18248),#18259);
+#18265= IFCTEXTSTYLEFORDEFINEDFONT(#18266,$);
+#18266= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#18267= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#18268= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#18270= IFCTEXTSTYLE($,#18265,#18267,#18268);
+#18271= IFCTEXTLITERAL('f5',#18274,.LEFT.);
+#18272= IFCDIRECTION((1.,0.));
+#18274= IFCAXIS2PLACEMENT2D(#18275,#18272);
+#18275= IFCCARTESIANPOINT((102364.5133534607,15128.54263252323));
+#18277= IFCLOCALPLACEMENT($,#1);
+#18278= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#18271)
+);
+#18280= IFCPRODUCTDEFINITIONSHAPE($,$,(#18278));
+#18283= IFCANNOTATION('3ilJOw_hv1jOvcjDyERc8q',#4,$,$,$,#18277,#18280);
+#18287= IFCPRESENTATIONSTYLEASSIGNMENT((#18270));
+#18289= IFCSTYLEDITEM(#18271,(#18287),$);
+#18293= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--490'),$);
+#18294= IFCPROPERTYSET('3SY4jHhdX52wWrqM$SHOVu',#4,'Allplan Attributes',
+$,(#18293));
+#18296= IFCRELDEFINESBYPROPERTIES('1XUOX09Yf9melf5F3O90wB',#4,$,$,(
+#18283),#18294);
+#18300= IFCTEXTSTYLEFORDEFINEDFONT(#18301,$);
+#18301= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#18302= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#18303= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#18305= IFCTEXTSTYLE($,#18300,#18302,#18303);
+#18306= IFCTEXTLITERAL('f6',#18309,.LEFT.);
+#18307= IFCDIRECTION((1.,0.));
+#18309= IFCAXIS2PLACEMENT2D(#18310,#18307);
+#18310= IFCCARTESIANPOINT((79088.46093109454,15126.04263252324));
+#18312= IFCLOCALPLACEMENT($,#1);
+#18313= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#18306)
+);
+#18315= IFCPRODUCTDEFINITIONSHAPE($,$,(#18313));
+#18318= IFCANNOTATION('3lVXfDOLD7UQ61LtBT8YBO',#4,$,$,$,#18312,#18315);
+#18322= IFCPRESENTATIONSTYLEASSIGNMENT((#18305));
+#18324= IFCSTYLEDITEM(#18306,(#18322),$);
+#18328= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--491'),$);
+#18329= IFCPROPERTYSET('0QF4KBQKL0xxf1N$vLsJ_e',#4,'Allplan Attributes',
+$,(#18328));
+#18331= IFCRELDEFINESBYPROPERTIES('1EdvBqvQL8rQHOs8mg96lR',#4,$,$,(
+#18318),#18329);
+#18335= IFCTEXTSTYLEFORDEFINEDFONT(#18336,$);
+#18336= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#18337= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#18338= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#18340= IFCTEXTSTYLE($,#18335,#18337,#18338);
+#18341= IFCTEXTLITERAL('f7',#18344,.LEFT.);
+#18342= IFCDIRECTION((1.,0.));
+#18344= IFCAXIS2PLACEMENT2D(#18345,#18342);
+#18345= IFCCARTESIANPOINT((90227.54729917461,12438.54263252323));
+#18347= IFCLOCALPLACEMENT($,#1);
+#18348= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#18341)
+);
+#18350= IFCPRODUCTDEFINITIONSHAPE($,$,(#18348));
+#18353= IFCANNOTATION('3FPUFGswPEnuSScBrmtWFz',#4,$,$,$,#18347,#18350);
+#18357= IFCPRESENTATIONSTYLEASSIGNMENT((#18340));
+#18359= IFCSTYLEDITEM(#18341,(#18357),$);
+#18363= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--492'),$);
+#18364= IFCPROPERTYSET('2VWVqAhqnECPOJjCpR1oh$',#4,'Allplan Attributes',
+$,(#18363));
+#18366= IFCRELDEFINESBYPROPERTIES('3kZ6SCwSLEv8uupbnRRLUK',#4,$,$,(
+#18353),#18364);
+#18370= IFCTEXTSTYLEFORDEFINEDFONT(#18371,$);
+#18371= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#18372= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#18373= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#18375= IFCTEXTSTYLE($,#18370,#18372,#18373);
+#18376= IFCTEXTLITERAL('f8',#18379,.LEFT.);
+#18377= IFCDIRECTION((1.,0.));
+#18379= IFCAXIS2PLACEMENT2D(#18380,#18377);
+#18380= IFCCARTESIANPOINT((96930.44389119459,12513.54263252323));
+#18382= IFCLOCALPLACEMENT($,#1);
+#18383= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#18376)
+);
+#18385= IFCPRODUCTDEFINITIONSHAPE($,$,(#18383));
+#18388= IFCANNOTATION('32OQIlghn8x8vtv1qHdb7K',#4,$,$,$,#18382,#18385);
+#18392= IFCPRESENTATIONSTYLEASSIGNMENT((#18375));
+#18394= IFCSTYLEDITEM(#18376,(#18392),$);
+#18398= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--493'),$);
+#18399= IFCPROPERTYSET('0Vot1EQzD3wPM4SyJE3dvd',#4,'Allplan Attributes',
+$,(#18398));
+#18401= IFCRELDEFINESBYPROPERTIES('3K9bTcaY9CPP68QNiPLtVb',#4,$,$,(
+#18388),#18399);
+#18405= IFCTEXTSTYLEFORDEFINEDFONT(#18406,$);
+#18406= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#18407= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#18408= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#18410= IFCTEXTSTYLE($,#18405,#18407,#18408);
+#18411= IFCTEXTLITERAL('f9',#18414,.LEFT.);
+#18412= IFCDIRECTION((1.,0.));
+#18414= IFCAXIS2PLACEMENT2D(#18415,#18412);
+#18415= IFCCARTESIANPOINT((96915.96093109452,21621.04263252323));
+#18417= IFCLOCALPLACEMENT($,#1);
+#18418= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#18411)
+);
+#18420= IFCPRODUCTDEFINITIONSHAPE($,$,(#18418));
+#18423= IFCANNOTATION('3acafxq_LANBJtttL9xsSI',#4,$,$,$,#18417,#18420);
+#18427= IFCPRESENTATIONSTYLEASSIGNMENT((#18410));
+#18429= IFCSTYLEDITEM(#18411,(#18427),$);
+#18433= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--494'),$);
+#18434= IFCPROPERTYSET('2EcAhoJZj1KvRz$BHnN6eU',#4,'Allplan Attributes',
+$,(#18433));
+#18436= IFCRELDEFINESBYPROPERTIES('1XSnfENa1Fce1wFX7wneSm',#4,$,$,(
+#18423),#18434);
+#18440= IFCTEXTSTYLEFORDEFINEDFONT(#18441,$);
+#18441= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#18442= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#18443= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#18445= IFCTEXTSTYLE($,#18440,#18442,#18443);
+#18446= IFCTEXTLITERAL('B',#18449,.LEFT.);
+#18447= IFCDIRECTION((6.123233995736766E-17,1.));
+#18449= IFCAXIS2PLACEMENT2D(#18450,#18447);
+#18450= IFCCARTESIANPOINT((88169.24186625176,20927.9088516208));
+#18452= IFCLOCALPLACEMENT($,#1);
+#18453= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#18446)
+);
+#18455= IFCPRODUCTDEFINITIONSHAPE($,$,(#18453));
+#18458= IFCANNOTATION('0qzJsx5Yz3iOPjuNBqbvZ7',#4,$,$,$,#18452,#18455);
+#18462= IFCPRESENTATIONSTYLEASSIGNMENT((#18445));
+#18464= IFCSTYLEDITEM(#18446,(#18462),$);
+#18468= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--518'),$);
+#18469= IFCPROPERTYSET('0vg3ltkOr96Rd0YMElkgWc',#4,'Allplan Attributes',
+$,(#18468));
+#18471= IFCRELDEFINESBYPROPERTIES('3wjoi5KtL6YPqX3UxLfifX',#4,$,$,(
+#18458),#18469);
+#18475= IFCTEXTSTYLEFORDEFINEDFONT(#18476,$);
+#18476= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#18477= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#18478= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#18480= IFCTEXTSTYLE($,#18475,#18477,#18478);
+#18481= IFCTEXTLITERAL('B',#18484,.LEFT.);
+#18482= IFCDIRECTION((6.123233995736766E-17,1.));
+#18484= IFCAXIS2PLACEMENT2D(#18485,#18482);
+#18485= IFCCARTESIANPOINT((88169.24186625176,25478.76747622812));
+#18487= IFCLOCALPLACEMENT($,#1);
+#18488= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#18481)
+);
+#18490= IFCPRODUCTDEFINITIONSHAPE($,$,(#18488));
+#18493= IFCANNOTATION('38pbE6YB56weD73CZ6Zv9t',#4,$,$,$,#18487,#18490);
+#18497= IFCPRESENTATIONSTYLEASSIGNMENT((#18480));
+#18499= IFCSTYLEDITEM(#18481,(#18497),$);
+#18503= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--519'),$);
+#18504= IFCPROPERTYSET('1iguFiawH8vfFFCn5VR49E',#4,'Allplan Attributes',
+$,(#18503));
+#18506= IFCRELDEFINESBYPROPERTIES('1_3x23y3X90BmN7dG8fyVw',#4,$,$,(
+#18493),#18504);
+#18510= IFCTEXTSTYLEFORDEFINEDFONT(#18511,$);
+#18511= IFCCOLOURRGB($,0.4392156862745098,0.4392156862745098,1.);
+#18512= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.5));
+#18513= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(250.));
+#18515= IFCTEXTSTYLE($,#18510,#18512,#18513);
+#18516= IFCPLANAREXTENT(4979.166666666672,312.5);
+#18517= IFCTEXTLITERALWITHEXTENT(
+'unter Fundamente mit Sickerbeton 32/45mm CEM 200 kg/m\X2\00B3\X0\\X\0Aoder Magerbeton CEM 200 kg/m\X2\00B3\X0\ bis auf Kiesschicht fundieren !'
+,#18520,.LEFT.,#18516,'top-left');
+#18518= IFCDIRECTION((1.,0.));
+#18520= IFCAXIS2PLACEMENT2D(#18521,#18518);
+#18521= IFCCARTESIANPOINT((79040.90503321811,12115.36635853764));
+#18523= IFCLOCALPLACEMENT($,#1);
+#18524= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#18517)
+);
+#18526= IFCPRODUCTDEFINITIONSHAPE($,$,(#18524));
+#18529= IFCANNOTATION('1eQIdZ5NDF1Af0vSimnU_f',#4,$,$,$,#18523,#18526);
+#18533= IFCPRESENTATIONSTYLEASSIGNMENT((#18515));
+#18535= IFCSTYLEDITEM(#18517,(#18533),$);
+#18539= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--530'),$);
+#18540= IFCPROPERTYSET('3kmnAM0gfCifqxX62v39R$',#4,'Allplan Attributes',
+$,(#18539));
+#18542= IFCRELDEFINESBYPROPERTIES('3a6US8Rq1FSeOGVmZzM0J4',#4,$,$,(
+#18529),#18540);
+#18546= IFCTEXTSTYLEFORDEFINEDFONT(#18547,$);
+#18547= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#18548= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#18549= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#18551= IFCTEXTSTYLE($,#18546,#18548,#18549);
+#18552= IFCTEXTLITERAL('Einlage 15x25cm',#18555,.LEFT.);
+#18553= IFCDIRECTION((1.,0.));
+#18555= IFCAXIS2PLACEMENT2D(#18556,#18553);
+#18556= IFCCARTESIANPOINT((94135.,8666.671497262763));
+#18558= IFCLOCALPLACEMENT($,#1);
+#18559= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#18552)
+);
+#18561= IFCPRODUCTDEFINITIONSHAPE($,$,(#18559));
+#18564= IFCANNOTATION('3nlVWFqH15MBOqbwjEtExC',#4,$,$,$,#18558,#18561);
+#18568= IFCPRESENTATIONSTYLEASSIGNMENT((#18551));
+#18570= IFCSTYLEDITEM(#18552,(#18568),$);
+#18574= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--557'),$);
+#18575= IFCPROPERTYSET('2HJoY8EjLFD8zI2HULWcJI',#4,'Allplan Attributes',
+$,(#18574));
+#18577= IFCRELDEFINESBYPROPERTIES('1LwwZIQTXBFQu5L2RAf8sz',#4,$,$,(
+#18564),#18575);
+#18581= IFCTEXTSTYLEFORDEFINEDFONT(#18582,$);
+#18582= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#18583= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#18584= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#18586= IFCTEXTSTYLE($,#18581,#18583,#18584);
+#18587= IFCTEXTLITERAL('Arbeitsfuge mit Quellfugenband !',#18590,.LEFT.
+);
+#18588= IFCDIRECTION((6.123233995736766E-17,1.));
+#18590= IFCAXIS2PLACEMENT2D(#18591,#18588);
+#18591= IFCCARTESIANPOINT((77728.33333333336,11056.97175194527));
+#18593= IFCLOCALPLACEMENT($,#1);
+#18594= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#18587)
+);
+#18596= IFCPRODUCTDEFINITIONSHAPE($,$,(#18594));
+#18599= IFCANNOTATION('1Aa8e9ddn3QBtuaqzUjLqd',#4,$,$,$,#18593,#18596);
+#18603= IFCPRESENTATIONSTYLEASSIGNMENT((#18586));
+#18605= IFCSTYLEDITEM(#18587,(#18603),$);
+#18609= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--564'),$);
+#18610= IFCPROPERTYSET('32aqHVN$L0dPc7XAgGazcs',#4,'Allplan Attributes',
+$,(#18609));
+#18612= IFCRELDEFINESBYPROPERTIES('0AeRYT7i1DKwAXTWOvXpRG',#4,$,$,(
+#18599),#18610);
+#18616= IFCTEXTSTYLEFORDEFINEDFONT(#18617,$);
+#18617= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#18618= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#18619= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#18621= IFCTEXTSTYLE($,#18616,#18618,#18619);
+#18622= IFCTEXTLITERAL('Arbeitsfuge mit Quellfugenband !',#18625,.LEFT.
+);
+#18623= IFCDIRECTION((6.123233995736766E-17,1.));
+#18625= IFCAXIS2PLACEMENT2D(#18626,#18623);
+#18626= IFCCARTESIANPOINT((77728.33333333336,21266.51780159047));
+#18628= IFCLOCALPLACEMENT($,#1);
+#18629= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#18622)
+);
+#18631= IFCPRODUCTDEFINITIONSHAPE($,$,(#18629));
+#18634= IFCANNOTATION('0hlavrJpP9BBy$o$GY8Tfl',#4,$,$,$,#18628,#18631);
+#18638= IFCPRESENTATIONSTYLEASSIGNMENT((#18621));
+#18640= IFCSTYLEDITEM(#18622,(#18638),$);
+#18644= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--565'),$);
+#18645= IFCPROPERTYSET('2PJAfkNKXFX9GugSpFcNfz',#4,'Allplan Attributes',
+$,(#18644));
+#18647= IFCRELDEFINESBYPROPERTIES('3uLu1_yIvEGAhxr2tjTPpw',#4,$,$,(
+#18634),#18645);
+#18651= IFCTEXTSTYLEFORDEFINEDFONT(#18652,$);
+#18652= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#18653= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.5));
+#18654= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(300.));
+#18656= IFCTEXTSTYLE($,#18651,#18653,#18654);
+#18657= IFCPLANAREXTENT(2910.000000000003,825.0000000000168);
+#18658= IFCTEXTLITERALWITHEXTENT(
+'OK= -0.07, UK= -0.32\X\0A+ 20cm D\X2\00E4\X0\mmung (UK= -0.52)\X\0A+ 2cm Splitt (UK= -0.54)\X\0A+ 5cm Magerbeton (UK= -0.59)'
+,#18661,.LEFT.,#18657,'top-left');
+#18659= IFCDIRECTION((0.9808262151348185,0.1948844162684815));
+#18661= IFCAXIS2PLACEMENT2D(#18662,#18659);
+#18662= IFCCARTESIANPOINT((83653.51454661261,25704.46997895839));
+#18664= IFCLOCALPLACEMENT($,#1);
+#18665= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#18658)
+);
+#18667= IFCPRODUCTDEFINITIONSHAPE($,$,(#18665));
+#18670= IFCANNOTATION('2ueg3H$9DE69UVDfkB5spf',#4,$,$,$,#18664,#18667);
+#18674= IFCPRESENTATIONSTYLEASSIGNMENT((#18656));
+#18676= IFCSTYLEDITEM(#18658,(#18674),$);
+#18680= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--566'),$);
+#18681= IFCPROPERTYSET('3eU2sr3h99KAZc3JJDI8VM',#4,'Allplan Attributes',
+$,(#18680));
+#18683= IFCRELDEFINESBYPROPERTIES('3OheAy3vH6leqBqTxqED21',#4,$,$,(
+#18670),#18681);
+#18687= IFCTEXTSTYLEFORDEFINEDFONT(#18688,$);
+#18688= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#18689= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.5));
+#18690= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(250.));
+#18692= IFCTEXTSTYLE($,#18687,#18689,#18690);
+#18693= IFCPLANAREXTENT(1940.000000000009,687.4999999999822);
+#18694= IFCTEXTLITERALWITHEXTENT(
+'OK= -1.13, UK= -1.38\X\0A+ 20cm D\X2\00E4\X0\mmung (UK= -1.58)\X\0A+ 2cm Splitt (UK= -1.60)\X\0A+ 5cm Magerbeton (UK= -1.65)'
+,#18697,.LEFT.,#18693,'top-left');
+#18695= IFCDIRECTION((0.7310552682428722,0.6823182503600077));
+#18697= IFCAXIS2PLACEMENT2D(#18698,#18695);
+#18698= IFCCARTESIANPOINT((87546.77173638951,22437.02940657125));
+#18700= IFCLOCALPLACEMENT($,#1);
+#18701= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#18694)
+);
+#18703= IFCPRODUCTDEFINITIONSHAPE($,$,(#18701));
+#18706= IFCANNOTATION('216edscP5EOBX5p$jHojjt',#4,$,$,$,#18700,#18703);
+#18710= IFCPRESENTATIONSTYLEASSIGNMENT((#18692));
+#18712= IFCSTYLEDITEM(#18694,(#18710),$);
+#18716= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--567'),$);
+#18717= IFCPROPERTYSET('28oOIKi6bENefxoMuIwt5R',#4,'Allplan Attributes',
+$,(#18716));
+#18719= IFCRELDEFINESBYPROPERTIES('3wdYdTst54Oe_KnOpWRTZU',#4,$,$,(
+#18706),#18717);
+#18723= IFCTEXTSTYLEFORDEFINEDFONT(#18724,$);
+#18724= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#18725= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(2.));
+#18726= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(350.));
+#18728= IFCTEXTSTYLE($,#18723,#18725,#18726);
+#18729= IFCTEXTLITERAL('d = 25cm',#18732,.LEFT.);
+#18730= IFCDIRECTION((0.9216166900860996,0.3881013740696396));
+#18732= IFCAXIS2PLACEMENT2D(#18733,#18730);
+#18733= IFCCARTESIANPOINT((77891.256051316,14098.27303360807));
+#18735= IFCLOCALPLACEMENT($,#1);
+#18736= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#18729)
+);
+#18738= IFCPRODUCTDEFINITIONSHAPE($,$,(#18736));
+#18741= IFCANNOTATION('3F3oKxkVX0Y9wkEIhyjqBi',#4,$,$,$,#18735,#18738);
+#18745= IFCPRESENTATIONSTYLEASSIGNMENT((#18728));
+#18747= IFCSTYLEDITEM(#18729,(#18745),$);
+#18751= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--568'),$);
+#18752= IFCPROPERTYSET('0Yb_A40dDFFRtZZt1m1UM7',#4,'Allplan Attributes',
+$,(#18751));
+#18754= IFCRELDEFINESBYPROPERTIES('0_plVgLOv49PBlRnE1pOwH',#4,$,$,(
+#18741),#18752);
+#18758= IFCTEXTSTYLEFORDEFINEDFONT(#18759,$);
+#18759= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#18760= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.5));
+#18761= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(300.));
+#18763= IFCTEXTSTYLE($,#18758,#18760,#18761);
+#18764= IFCPLANAREXTENT(2910.000000000046,824.9999999999975);
+#18765= IFCTEXTLITERALWITHEXTENT(
+'OK= -0.14, UK= -0.39\X\0A+ 20cm D\X2\00E4\X0\mmung (UK= -0.59)\X\0A+ 2cm Splitt (UK= -0.61)\X\0A+ 5cm Magerbeton (UK= -0.66)'
+,#18768,.LEFT.,#18764,'top-left');
+#18766= IFCDIRECTION((0.9216166900860947,0.3881013740696512));
+#18768= IFCAXIS2PLACEMENT2D(#18769,#18766);
+#18769= IFCCARTESIANPOINT((77933.62378465194,13997.66321160699));
+#18771= IFCLOCALPLACEMENT($,#1);
+#18772= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#18765)
+);
+#18774= IFCPRODUCTDEFINITIONSHAPE($,$,(#18772));
+#18777= IFCANNOTATION('3eMEH2kDvAv8zFWfJhLQhN',#4,$,$,$,#18771,#18774);
+#18781= IFCPRESENTATIONSTYLEASSIGNMENT((#18763));
+#18783= IFCSTYLEDITEM(#18765,(#18781),$);
+#18787= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--569'),$);
+#18788= IFCPROPERTYSET('1nKEvJwEnFz9zDTWIs982M',#4,'Allplan Attributes',
+$,(#18787));
+#18790= IFCRELDEFINESBYPROPERTIES('12AfbrU5v2FBl9MozXO8Oo',#4,$,$,(
+#18777),#18788);
+#18794= IFCTEXTSTYLEFORDEFINEDFONT(#18795,$);
+#18795= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#18796= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.4));
+#18797= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#18799= IFCTEXTSTYLE($,#18794,#18796,#18797);
+#18800= IFCPLANAREXTENT(1940.,520.);
+#18801= IFCTEXTLITERALWITHEXTENT(
+'Fund. d=15cm, UK= -0.54\X\0A+ 20cm D\X2\00E4\X0\mmung (UK= -0.74)\X\0A+ 2cm Splitt (UK= -0.76)\X\0A+ 5cm Magerbeton (UK= -0.81)'
+,#18804,.LEFT.,#18800,'top-left');
+#18802= IFCDIRECTION((6.123233995736766E-17,1.));
+#18804= IFCAXIS2PLACEMENT2D(#18805,#18802);
+#18805= IFCCARTESIANPOINT((94193.33333333333,20592.11878411506));
+#18807= IFCLOCALPLACEMENT($,#1);
+#18808= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#18801)
+);
+#18810= IFCPRODUCTDEFINITIONSHAPE($,$,(#18808));
+#18813= IFCANNOTATION('2OIwTGPJH0ZOsF8X6PlXWt',#4,$,$,$,#18807,#18810);
+#18817= IFCPRESENTATIONSTYLEASSIGNMENT((#18799));
+#18819= IFCSTYLEDITEM(#18801,(#18817),$);
+#18823= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--575'),$);
+#18824= IFCPROPERTYSET('0I0PrwiX19MBVN3J$Gy5Ur',#4,'Allplan Attributes',
+$,(#18823));
+#18826= IFCRELDEFINESBYPROPERTIES('21I11fW2H1oePrX$3I2c6U',#4,$,$,(
+#18813),#18824);
+#18830= IFCTEXTSTYLEFORDEFINEDFONT(#18831,$);
+#18831= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#18832= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.4));
+#18833= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#18835= IFCTEXTSTYLE($,#18830,#18832,#18833);
+#18836= IFCPLANAREXTENT(1940.,520.);
+#18837= IFCTEXTLITERALWITHEXTENT(
+'Fund. d=35cm, UK= -0.74\X\0A+ 20cm D\X2\00E4\X0\mmung (UK= -0.94)\X\0A+ 2cm Splitt (UK= -0.96)\X\0A+ 5cm Magerbeton (UK= -1.01)'
+,#18840,.LEFT.,#18836,'top-left');
+#18838= IFCDIRECTION((6.123233995736766E-17,1.));
+#18840= IFCAXIS2PLACEMENT2D(#18841,#18838);
+#18841= IFCCARTESIANPOINT((97205.,16250.39227405017));
+#18843= IFCLOCALPLACEMENT($,#1);
+#18844= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#18837)
+);
+#18846= IFCPRODUCTDEFINITIONSHAPE($,$,(#18844));
+#18849= IFCANNOTATION('0$aY9I0dX7_ecgxYLM7h5G',#4,$,$,$,#18843,#18846);
+#18853= IFCPRESENTATIONSTYLEASSIGNMENT((#18835));
+#18855= IFCSTYLEDITEM(#18837,(#18853),$);
+#18859= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--574'),$);
+#18860= IFCPROPERTYSET('011PHRbZH5uv2ZpFkKktOG',#4,'Allplan Attributes',
+$,(#18859));
+#18862= IFCRELDEFINESBYPROPERTIES('2GdUw4TKX4TAQLjfY1R_RY',#4,$,$,(
+#18849),#18860);
+#18866= IFCTEXTSTYLEFORDEFINEDFONT(#18867,$);
+#18867= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#18868= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.4));
+#18869= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#18871= IFCTEXTSTYLE($,#18866,#18868,#18869);
+#18872= IFCPLANAREXTENT(1940.,520.);
+#18873= IFCTEXTLITERALWITHEXTENT(
+'Fund. d=15cm, UK= -0.54\X\0A+ 20cm D\X2\00E4\X0\mmung (UK= -0.74)\X\0A+ 2cm Splitt (UK= -0.76)\X\0A+ 5cm Magerbeton (UK= -0.81)'
+,#18876,.LEFT.,#18872,'top-left');
+#18874= IFCDIRECTION((6.123233995736766E-17,1.));
+#18876= IFCAXIS2PLACEMENT2D(#18877,#18874);
+#18877= IFCCARTESIANPOINT((94218.33333333333,11269.79426336781));
+#18879= IFCLOCALPLACEMENT($,#1);
+#18880= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#18873)
+);
+#18882= IFCPRODUCTDEFINITIONSHAPE($,$,(#18880));
+#18885= IFCANNOTATION('1yYhZaIO5F1xyHJgpTOhS0',#4,$,$,$,#18879,#18882);
+#18889= IFCPRESENTATIONSTYLEASSIGNMENT((#18871));
+#18891= IFCSTYLEDITEM(#18873,(#18889),$);
+#18895= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--573'),$);
+#18896= IFCPROPERTYSET('2O_vrD2nbAVOFlyG7oUsCQ',#4,'Allplan Attributes',
+$,(#18895));
+#18898= IFCRELDEFINESBYPROPERTIES('3I7Bj8PQb37vnm5pthQrz2',#4,$,$,(
+#18885),#18896);
+#18902= IFCTEXTSTYLEFORDEFINEDFONT(#18903,$);
+#18903= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#18904= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.4));
+#18905= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#18907= IFCTEXTSTYLE($,#18902,#18904,#18905);
+#18908= IFCPLANAREXTENT(1940.,520.);
+#18909= IFCTEXTLITERALWITHEXTENT(
+'Fund. d=15cm, UK= -0.54\X\0A+ 20cm D\X2\00E4\X0\mmung (UK= -0.74)\X\0A+ 2cm Splitt (UK= -0.76)\X\0A+ 5cm Magerbeton (UK= -0.81)'
+,#18912,.LEFT.,#18908,'top-left');
+#18910= IFCDIRECTION((6.123233995736766E-17,1.));
+#18912= IFCAXIS2PLACEMENT2D(#18913,#18910);
+#18913= IFCCARTESIANPOINT((93100.00000000003,11362.26488116083));
+#18915= IFCLOCALPLACEMENT($,#1);
+#18916= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#18909)
+);
+#18918= IFCPRODUCTDEFINITIONSHAPE($,$,(#18916));
+#18921= IFCANNOTATION('3uEuSW_E94bxwlA0NzYjtv',#4,$,$,$,#18915,#18918);
+#18925= IFCPRESENTATIONSTYLEASSIGNMENT((#18907));
+#18927= IFCSTYLEDITEM(#18909,(#18925),$);
+#18931= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--572'),$);
+#18932= IFCPROPERTYSET('3eppLw_GHFveYzLTRtCMqd',#4,'Allplan Attributes',
+$,(#18931));
+#18934= IFCRELDEFINESBYPROPERTIES('3gmMVXsf96tgxS6Hw_7tLU',#4,$,$,(
+#18921),#18932);
+#18938= IFCTEXTSTYLEFORDEFINEDFONT(#18939,$);
+#18939= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#18940= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.4));
+#18941= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#18943= IFCTEXTSTYLE($,#18938,#18940,#18941);
+#18944= IFCPLANAREXTENT(1940.,520.);
+#18945= IFCTEXTLITERALWITHEXTENT(
+'Fund. d=35cm, UK= -0.74\X\0A+ 20cm D\X2\00E4\X0\mmung (UK= -0.94)\X\0A+ 2cm Splitt (UK= -0.96)\X\0A+ 5cm Magerbeton (UK= -1.01)'
+,#18948,.LEFT.,#18944,'top-left');
+#18946= IFCDIRECTION((1.,0.));
+#18948= IFCAXIS2PLACEMENT2D(#18949,#18946);
+#18949= IFCCARTESIANPOINT((86373.12561100708,19411.67149726277));
+#18951= IFCLOCALPLACEMENT($,#1);
+#18952= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#18945)
+);
+#18954= IFCPRODUCTDEFINITIONSHAPE($,$,(#18952));
+#18957= IFCANNOTATION('0THx1cZaH4PxAiEz150mze',#4,$,$,$,#18951,#18954);
+#18961= IFCPRESENTATIONSTYLEASSIGNMENT((#18943));
+#18963= IFCSTYLEDITEM(#18945,(#18961),$);
+#18967= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--571'),$);
+#18968= IFCPROPERTYSET('1DN0cFru1Ebu7y7U1ahF$P',#4,'Allplan Attributes',
+$,(#18967));
+#18970= IFCRELDEFINESBYPROPERTIES('2h4GonHr95gud2zZNbDqJj',#4,$,$,(
+#18957),#18968);
+#18974= IFCTEXTSTYLEFORDEFINEDFONT(#18975,$);
+#18975= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#18976= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.4));
+#18977= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(200.));
+#18979= IFCTEXTSTYLE($,#18974,#18976,#18977);
+#18980= IFCPLANAREXTENT(1940.,520.);
+#18981= IFCTEXTLITERALWITHEXTENT(
+'Fund. d=35cm, UK= -0.74\X\0A+ 20cm D\X2\00E4\X0\mmung (UK= -0.94)\X\0A+ 2cm Splitt (UK= -0.96)\X\0A+ 5cm Magerbeton (UK= -1.01)'
+,#18984,.LEFT.,#18980,'top-left');
+#18982= IFCDIRECTION((1.,0.));
+#18984= IFCAXIS2PLACEMENT2D(#18985,#18982);
+#18985= IFCCARTESIANPOINT((67575.,19411.67149726278));
+#18987= IFCLOCALPLACEMENT($,#1);
+#18988= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#18981)
+);
+#18990= IFCPRODUCTDEFINITIONSHAPE($,$,(#18988));
+#18993= IFCANNOTATION('15Nzus2_57HvmDhYkU4BNK',#4,$,$,$,#18987,#18990);
+#18997= IFCPRESENTATIONSTYLEASSIGNMENT((#18979));
+#18999= IFCSTYLEDITEM(#18981,(#18997),$);
+#19003= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--570'),$);
+#19004= IFCPROPERTYSET('0Ocw1IvELA2Ro9lqLkQDuW',#4,'Allplan Attributes',
+$,(#19003));
+#19006= IFCRELDEFINESBYPROPERTIES('2C9sZLBov37vLslRBCFDVv',#4,$,$,(
+#18993),#19004);
+#19010= IFCTEXTSTYLEFORDEFINEDFONT(#19011,$);
+#19011= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#19012= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#19013= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#19015= IFCTEXTSTYLE($,#19010,#19012,#19013);
+#19016= IFCTEXTLITERAL('Grundriss  1:50',#19019,.LEFT.);
+#19017= IFCDIRECTION((1.,0.));
+#19019= IFCAXIS2PLACEMENT2D(#19020,#19017);
+#19020= IFCCARTESIANPOINT((83404.88972260105,28213.1435942591));
+#19022= IFCLOCALPLACEMENT($,#1);
+#19023= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#19016)
+);
+#19025= IFCPRODUCTDEFINITIONSHAPE($,$,(#19023));
+#19028= IFCANNOTATION('3HXq54ZG1CyRkzFpWY9154',#4,$,$,$,#19022,#19025);
+#19032= IFCPRESENTATIONSTYLEASSIGNMENT((#19015));
+#19034= IFCSTYLEDITEM(#19016,(#19032),$);
+#19038= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'9bbfa526-b8d6-11e3-bf39-7446a0b2bba9--562'),$);
+#19039= IFCPROPERTYSET('0Qp2lXqk5BMB$4L1mYAnsi',#4,'Allplan Attributes',
+$,(#19038));
+#19041= IFCRELDEFINESBYPROPERTIES('1zB03lH5L9BhaIak4YAU_f',#4,$,$,(
+#19028),#19039);
+#19045= IFCTEXTSTYLEFORDEFINEDFONT(#19046,$);
+#19046= IFCDRAUGHTINGPREDEFINEDCOLOUR('black');
+#19047= IFCTEXTSTYLETEXTMODEL($,$,$,$,$,$,IFCRATIOMEASURE(1.7));
+#19048= IFCTEXTSTYLEFONTMODEL('Text Font',('Arial'),$,$,$,
+IFCPOSITIVELENGTHMEASURE(500.));
+#19050= IFCTEXTSTYLE($,#19045,#19047,#19048);
+#19051= IFCTEXTLITERAL('Schnitt B-B  1:20',#19054,.LEFT.);
+#19052= IFCDIRECTION((1.,0.));
+#19054= IFCAXIS2PLACEMENT2D(#19055,#19052);
+#19055= IFCCARTESIANPOINT((71422.32664761796,-3984.138528206888));
+#19057= IFCLOCALPLACEMENT($,#1);
+#19058= IFCSHAPEREPRESENTATION(#39,'Annotation','Annotation2D',(#19051)
+);
+#19060= IFCPRODUCTDEFINITIONSHAPE($,$,(#19058));
+#19063= IFCANNOTATION('0h5J2MIdv5u9q2KEEMRFDK',#4,$,$,$,#19057,#19060);
+#19067= IFCPRESENTATIONSTYLEASSIGNMENT((#19050));
+#19069= IFCSTYLEDITEM(#19051,(#19067),$);
+#19073= IFCPROPERTYSINGLEVALUE('NOI_UUID',$,IFCDESCRIPTIVEMEASURE(
+'91a2d10d-b8d7-11e3-bf39-7446a0b2bba9--18'),$);
+#19074= IFCPROPERTYSET('3FuDVMb5T3i8ca1HR0DLkR',#4,'Allplan Attributes',
+$,(#19073));
+#19076= IFCRELDEFINESBYPROPERTIES('35GqqYEG9CdxiySn6ct3Sf',#4,$,$,(
+#19063),#19074);
+#19080= IFCAXIS2PLACEMENT3D(#19081,#19083,#19085);
+#19081= IFCCARTESIANPOINT((31980.17162224602,22114.78662422868,
+2000.000000000002));
+#19083= IFCDIRECTION((0.,0.,1.));
+#19085= IFCDIRECTION((1.,0.,0.));
+#19087= IFCLOCALPLACEMENT(#71,#19080);
+#19088= IFCPRODUCTDEFINITIONSHAPE($,$,(#19098));
+#19089= IFCSHAPEREPRESENTATION(#34,'Body','AdvancedSweptSolid',(#19091)
+);
+#19091= IFCSWEPTDISKSOLID(#19092,9.,$,0.,1.);
+#19092= IFCPOLYLINE((#19094,#19096));
+#19094= IFCCARTESIANPOINT((0.,0.,0.));
+#19096= IFCCARTESIANPOINT((0.,0.,-2000.));
+#19098= IFCSHAPEREPRESENTATION(#34,'Body','MappedRepresentation',(#19103
+,#19114,#19124,#19134,#19144,#19154,#19164,#19174,#19184,#19194,#19204,
+#19214,#19224,#19234,#19244,#19254));
+#19100= IFCREPRESENTATIONMAP(#1,#19089);
+#19103= IFCMAPPEDITEM(#19100,#19105);
+#19105= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#19108,#19110,#19106,$,
+#19112);
+#19106= IFCCARTESIANPOINT((0.,0.,0.));
+#19108= IFCDIRECTION((1.,0.,0.));
+#19110= IFCDIRECTION((0.,1.,0.));
+#19112= IFCDIRECTION((0.,0.,1.));
+#19114= IFCMAPPEDITEM(#19100,#19115);
+#19115= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#19118,#19120,#19116,$,
+#19122);
+#19116= IFCCARTESIANPOINT((0.,77.28531746430599,0.));
+#19118= IFCDIRECTION((1.,0.,0.));
+#19120= IFCDIRECTION((0.,1.,0.));
+#19122= IFCDIRECTION((0.,0.,1.));
+#19124= IFCMAPPEDITEM(#19100,#19125);
+#19125= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#19128,#19130,#19126,$,
+#19132);
+#19126= IFCCARTESIANPOINT((78.29487407195848,77.28531746430599,0.));
+#19128= IFCDIRECTION((1.,0.,0.));
+#19130= IFCDIRECTION((0.,1.,0.));
+#19132= IFCDIRECTION((0.,0.,1.));
+#19134= IFCMAPPEDITEM(#19100,#19135);
+#19135= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#19138,#19140,#19136,$,
+#19142);
+#19136= IFCCARTESIANPOINT((78.29487407195848,0.,0.));
+#19138= IFCDIRECTION((1.,0.,0.));
+#19140= IFCDIRECTION((0.,1.,0.));
+#19142= IFCDIRECTION((0.,0.,1.));
+#19144= IFCMAPPEDITEM(#19100,#19145);
+#19145= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#19148,#19150,#19146,$,
+#19152);
+#19146= IFCCARTESIANPOINT((-1980.081870708076,0.,0.));
+#19148= IFCDIRECTION((1.,0.,0.));
+#19150= IFCDIRECTION((0.,1.,0.));
+#19152= IFCDIRECTION((0.,0.,1.));
+#19154= IFCMAPPEDITEM(#19100,#19155);
+#19155= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#19158,#19160,#19156,$,
+#19162);
+#19156= IFCCARTESIANPOINT((-1980.081870708076,77.28531746430599,0.));
+#19158= IFCDIRECTION((1.,0.,0.));
+#19160= IFCDIRECTION((0.,1.,0.));
+#19162= IFCDIRECTION((0.,0.,1.));
+#19164= IFCMAPPEDITEM(#19100,#19165);
+#19165= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#19168,#19170,#19166,$,
+#19172);
+#19166= IFCCARTESIANPOINT((-1901.786996636118,77.28531746430599,0.));
+#19168= IFCDIRECTION((1.,0.,0.));
+#19170= IFCDIRECTION((0.,1.,0.));
+#19172= IFCDIRECTION((0.,0.,1.));
+#19174= IFCMAPPEDITEM(#19100,#19175);
+#19175= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#19178,#19180,#19176,$,
+#19182);
+#19176= IFCCARTESIANPOINT((-1901.786996636118,0.,0.));
+#19178= IFCDIRECTION((1.,0.,0.));
+#19180= IFCDIRECTION((0.,1.,0.));
+#19182= IFCDIRECTION((0.,0.,1.));
+#19184= IFCMAPPEDITEM(#19100,#19185);
+#19185= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#19188,#19190,#19186,$,
+#19192);
+#19186= IFCCARTESIANPOINT((-1980.081870708076,1841.023274825533,0.));
+#19188= IFCDIRECTION((1.,0.,0.));
+#19190= IFCDIRECTION((0.,1.,0.));
+#19192= IFCDIRECTION((0.,0.,1.));
+#19194= IFCMAPPEDITEM(#19100,#19195);
+#19195= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#19198,#19200,#19196,$,
+#19202);
+#19196= IFCCARTESIANPOINT((-1980.081870708076,1918.308592289839,0.));
+#19198= IFCDIRECTION((1.,0.,0.));
+#19200= IFCDIRECTION((0.,1.,0.));
+#19202= IFCDIRECTION((0.,0.,1.));
+#19204= IFCMAPPEDITEM(#19100,#19205);
+#19205= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#19208,#19210,#19206,$,
+#19212);
+#19206= IFCCARTESIANPOINT((-1901.786996636118,1918.308592289839,0.));
+#19208= IFCDIRECTION((1.,0.,0.));
+#19210= IFCDIRECTION((0.,1.,0.));
+#19212= IFCDIRECTION((0.,0.,1.));
+#19214= IFCMAPPEDITEM(#19100,#19215);
+#19215= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#19218,#19220,#19216,$,
+#19222);
+#19216= IFCCARTESIANPOINT((-1901.786996636118,1841.023274825533,0.));
+#19218= IFCDIRECTION((1.,0.,0.));
+#19220= IFCDIRECTION((0.,1.,0.));
+#19222= IFCDIRECTION((0.,0.,1.));
+#19224= IFCMAPPEDITEM(#19100,#19225);
+#19225= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#19228,#19230,#19226,$,
+#19232);
+#19226= IFCCARTESIANPOINT((9.429559131487622,1841.023274825533,
+-2.273736754432321E-13));
+#19228= IFCDIRECTION((1.,0.,0.));
+#19230= IFCDIRECTION((0.,1.,0.));
+#19232= IFCDIRECTION((0.,0.,1.));
+#19234= IFCMAPPEDITEM(#19100,#19235);
+#19235= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#19238,#19240,#19236,$,
+#19242);
+#19236= IFCCARTESIANPOINT((9.429559131487622,1918.308592289839,
+-2.273736754432321E-13));
+#19238= IFCDIRECTION((1.,0.,0.));
+#19240= IFCDIRECTION((0.,1.,0.));
+#19242= IFCDIRECTION((0.,0.,1.));
+#19244= IFCMAPPEDITEM(#19100,#19245);
+#19245= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#19248,#19250,#19246,$,
+#19252);
+#19246= IFCCARTESIANPOINT((87.7244332034461,1918.308592289839,
+-2.273736754432321E-13));
+#19248= IFCDIRECTION((1.,0.,0.));
+#19250= IFCDIRECTION((0.,1.,0.));
+#19252= IFCDIRECTION((0.,0.,1.));
+#19254= IFCMAPPEDITEM(#19100,#19255);
+#19255= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#19258,#19260,#19256,$,
+#19262);
+#19256= IFCCARTESIANPOINT((87.7244332034461,1841.023274825533,
+-2.273736754432321E-13));
+#19258= IFCDIRECTION((1.,0.,0.));
+#19260= IFCDIRECTION((0.,1.,0.));
+#19262= IFCDIRECTION((0.,0.,1.));
+#19266= IFCRELASSOCIATESMATERIAL('3mNbFutB5BoQ7Aj9Fbuc0t',#4,$,$,(#19269
+),#19267);
+#19267= IFCMATERIAL('B500B');
+#19269= IFCREINFORCINGBAR('12mIq4oDXFavYrFuTiA35I',#4,' ',$,$,#19087,
+#19088,$,$,18.,2.54,$,.NOTDEFINED.,$);
+#19273= IFCPROPERTYSINGLEVALUE('Bending diameter',$,IFCREAL(54.),$);
+#19274= IFCPROPERTYSINGLEVALUE('Shape code',$,IFCTEXT('X1  '),$);
+#19275= IFCPROPERTYSINGLEVALUE('Weight per meter',$,IFCREAL(2.),$);
+#19276= IFCPROPERTYSINGLEVALUE('Creation flags',$,IFCINTEGER(41),$);
+#19277= IFCPROPERTYSINGLEVALUE('Count of bars/meshes',$,IFCINTEGER(16),$
+);
+#19278= IFCPROPERTYSET('0Ck7ETG6HEkAv7CkcAYNEh',#4,
+'Allplan_ReinforcingBar',$,(#19273,#19274,#19275,#19276,#19277));
+#19280= IFCRELDEFINESBYPROPERTIES('0yX$JyOPH3fB7tbGyQjaTJ',#4,$,$,(
+#19269),#19278);
+#19284= IFCAXIS2PLACEMENT3D(#19285,#19287,#19289);
+#19285= IFCCARTESIANPOINT((30029.99999999999,24044.99999939691,
+837.0000000000005));
+#19287= IFCDIRECTION((0.,0.,1.));
+#19289= IFCDIRECTION((1.,0.,0.));
+#19291= IFCLOCALPLACEMENT(#71,#19284);
+#19292= IFCPRODUCTDEFINITIONSHAPE($,$,(#19410));
+#19293= IFCSHAPEREPRESENTATION(#34,'Body','AdvancedSweptSolid',(#19295)
+);
+#19295= IFCSWEPTDISKSOLID(#19296,6.,$,0.,1.);
+#19296= IFCPOLYLINE((#19298,#19300,#19302,#19304,#19306,#19308,#19310,
+#19312,#19314,#19316,#19318,#19320,#19322,#19324,#19326,#19328,#19330,
+#19332,#19334,#19336,#19338,#19340,#19342,#19344,#19346,#19348,#19350,
+#19352,#19354,#19356,#19358,#19360,#19362,#19364,#19366,#19368,#19370,
+#19372,#19374,#19376,#19378,#19380,#19382,#19384,#19386,#19388,#19390,
+#19392,#19394,#19396,#19398,#19400,#19402,#19404,#19406,#19408));
+#19298= IFCCARTESIANPOINT((0.,0.,0.));
+#19300= IFCCARTESIANPOINT((-3.637978807091713E-12,0.,61.83027059769984)
+);
+#19302= IFCCARTESIANPOINT((-1.034497946879128,7.425114745274186E-9,
+69.2643208890654));
+#19304= IFCCARTESIANPOINT((-3.556216651777504,2.553133526816964E-8,
+76.9137672289321));
+#19306= IFCCARTESIANPOINT((-7.491748957214441,5.378751666285098E-8,
+83.94119065476798));
+#19308= IFCCARTESIANPOINT((-12.30151519016727,8.831921149976552E-8,
+89.69848480983592));
+#19310= IFCCARTESIANPOINT((-18.0588093452352,1.296539267059416E-7,
+94.50825104278874));
+#19312= IFCCARTESIANPOINT((-25.08623277107108,1.801090547814965E-7,
+98.44378334822568));
+#19314= IFCCARTESIANPOINT((-32.73567911093778,2.350279828533530E-7,
+100.9655020531241));
+#19316= IFCCARTESIANPOINT((-40.16972940230335,2.884007699321955E-7,
+101.9999999999996));
+#19318= IFCCARTESIANPOINT((-43.83027059770029,3.146815288346261E-7,
+101.9999999999996));
+#19320= IFCCARTESIANPOINT((-51.26432088906586,3.680543159134686E-7,
+100.9655020531241));
+#19322= IFCCARTESIANPOINT((-58.91376722893256,4.229768819641322E-7,
+98.44378334822568));
+#19324= IFCCARTESIANPOINT((-65.94119065476843,4.734283720608801E-7,
+94.50825104278874));
+#19326= IFCCARTESIANPOINT((-71.69848480983637,5.147630872670561E-7,
+89.69848480983592));
+#19328= IFCCARTESIANPOINT((-76.5082510427892,5.492984200827777E-7,
+83.94119065476798));
+#19330= IFCCARTESIANPOINT((-80.44378334822613,5.775509634986520E-7,
+76.9137672289321));
+#19332= IFCCARTESIANPOINT((-82.96550205312451,5.956571840215474E-7,
+69.2643208890654));
+#19334= IFCCARTESIANPOINT((-84.,6.030859367456287E-7,61.83027059769984)
+);
+#19336= IFCCARTESIANPOINT((-84.,6.030859367456287E-7,-1015.830270597701)
+);
+#19338= IFCCARTESIANPOINT((-82.96550205312815,5.956571840215474E-7,
+-1023.264320889066));
+#19340= IFCCARTESIANPOINT((-80.44378334822977,5.775509634986520E-7,
+-1030.913767228933));
+#19342= IFCCARTESIANPOINT((-76.5082510427892,5.492984200827777E-7,
+-1037.941190654769));
+#19344= IFCCARTESIANPOINT((-71.69848480983637,5.147667252458632E-7,
+-1043.698484809837));
+#19346= IFCCARTESIANPOINT((-65.94119065476843,4.734320100396872E-7,
+-1048.50825104279));
+#19348= IFCCARTESIANPOINT((-58.91376722893619,4.229768819641322E-7,
+-1052.443783348227));
+#19350= IFCCARTESIANPOINT((-51.26432088906586,3.680579538922757E-7,
+-1054.965502053125));
+#19352= IFCCARTESIANPOINT((-43.83027059770393,3.146815288346261E-7,
+-1056.000000000001));
+#19354= IFCCARTESIANPOINT((2043.830270597697,-1.467385300202295E-5,
+-1056.000000000001));
+#19356= IFCCARTESIANPOINT((2051.264320889062,-1.472722942708060E-5,
+-1054.965502053125));
+#19358= IFCCARTESIANPOINT((2058.913767228929,-1.478214835515246E-5,
+-1052.443783348227));
+#19360= IFCCARTESIANPOINT((2065.941190654765,-1.483260348322801E-5,
+-1048.50825104279));
+#19362= IFCCARTESIANPOINT((2071.698484809833,-1.487393819843419E-5,
+-1043.698484809837));
+#19364= IFCCARTESIANPOINT((2076.508251042786,-1.490846989327110E-5,
+-1037.941190654769));
+#19366= IFCCARTESIANPOINT((2080.443783348223,-1.493672607466579E-5,
+-1030.913767228933));
+#19368= IFCCARTESIANPOINT((2082.965502053121,-1.495482865720987E-5,
+-1023.264320889066));
+#19370= IFCCARTESIANPOINT((2083.999999999996,-1.496225740993395E-5,
+-1015.830270597701));
+#19372= IFCCARTESIANPOINT((2083.999999999996,-1.496225740993395E-5,
+61.83027059769984));
+#19374= IFCCARTESIANPOINT((2082.965502053121,-1.495483229518868E-5,
+69.2643208890654));
+#19376= IFCCARTESIANPOINT((2080.443783348223,-1.493672607466579E-5,
+76.9137672289321));
+#19378= IFCCARTESIANPOINT((2076.508251042786,-1.490846989327110E-5,
+83.94119065476798));
+#19380= IFCCARTESIANPOINT((2071.698484809833,-1.487393819843419E-5,
+89.69848480983592));
+#19382= IFCCARTESIANPOINT((2065.941190654765,-1.483260348322801E-5,
+94.50825104278874));
+#19384= IFCCARTESIANPOINT((2058.913767228929,-1.478214835515246E-5,
+98.44378334822568));
+#19386= IFCCARTESIANPOINT((2051.264320889062,-1.472722942708060E-5,
+100.9655020531241));
+#19388= IFCCARTESIANPOINT((2043.830270597697,-1.467385664000176E-5,
+101.9999999999996));
+#19390= IFCCARTESIANPOINT((2040.1697294023,-1.464757588109933E-5,
+101.9999999999996));
+#19392= IFCCARTESIANPOINT((2032.735679110934,-1.459419945604168E-5,
+100.9655020531241));
+#19394= IFCCARTESIANPOINT((2025.086232771067,-1.453928052796982E-5,
+98.44378334822568));
+#19396= IFCCARTESIANPOINT((2018.058809345232,-1.448882539989427E-5,
+94.50825104278874));
+#19398= IFCCARTESIANPOINT((2012.301515190164,-1.444749068468809E-5,
+89.69848480983592));
+#19400= IFCCARTESIANPOINT((2007.491748957211,-1.441295898985118E-5,
+83.94119065476798));
+#19402= IFCCARTESIANPOINT((2003.556216651774,-1.438470280845650E-5,
+76.9137672289321));
+#19404= IFCCARTESIANPOINT((2001.034497946876,-1.436660022591241E-5,
+69.2643208890654));
+#19406= IFCCARTESIANPOINT((2000.,-1.435917147318833E-5,61.83027059769984
+));
+#19408= IFCCARTESIANPOINT((2000.,-1.435917147318833E-5,0.));
+#19410= IFCSHAPEREPRESENTATION(#34,'Body','MappedRepresentation',(#19414
+,#19425,#19435,#19445,#19455,#19465,#19475,#19485,#19495,#19505,#19515,
+#19525,#19535,#19545));
+#19412= IFCREPRESENTATIONMAP(#1,#19293);
+#19414= IFCMAPPEDITEM(#19412,#19416);
+#19416= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#19419,#19421,#19417,$,
+#19423);
+#19417= IFCCARTESIANPOINT((0.,0.,0.));
+#19419= IFCDIRECTION((1.,0.,0.));
+#19421= IFCDIRECTION((0.,1.,0.));
+#19423= IFCDIRECTION((0.,0.,1.));
+#19425= IFCMAPPEDITEM(#19412,#19426);
+#19426= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#19429,#19431,#19427,$,
+#19433);
+#19427= IFCCARTESIANPOINT((0.,-150.,0.));
+#19429= IFCDIRECTION((1.,0.,0.));
+#19431= IFCDIRECTION((0.,1.,0.));
+#19433= IFCDIRECTION((0.,0.,1.));
+#19435= IFCMAPPEDITEM(#19412,#19436);
+#19436= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#19439,#19441,#19437,$,
+#19443);
+#19437= IFCCARTESIANPOINT((0.,-300.,0.));
+#19439= IFCDIRECTION((1.,0.,0.));
+#19441= IFCDIRECTION((0.,1.,0.));
+#19443= IFCDIRECTION((0.,0.,1.));
+#19445= IFCMAPPEDITEM(#19412,#19446);
+#19446= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#19449,#19451,#19447,$,
+#19453);
+#19447= IFCCARTESIANPOINT((0.,-450.,0.));
+#19449= IFCDIRECTION((1.,0.,0.));
+#19451= IFCDIRECTION((0.,1.,0.));
+#19453= IFCDIRECTION((0.,0.,1.));
+#19455= IFCMAPPEDITEM(#19412,#19456);
+#19456= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#19459,#19461,#19457,$,
+#19463);
+#19457= IFCCARTESIANPOINT((0.,-600.,0.));
+#19459= IFCDIRECTION((1.,0.,0.));
+#19461= IFCDIRECTION((0.,1.,0.));
+#19463= IFCDIRECTION((0.,0.,1.));
+#19465= IFCMAPPEDITEM(#19412,#19466);
+#19466= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#19469,#19471,#19467,$,
+#19473);
+#19467= IFCCARTESIANPOINT((0.,-750.,0.));
+#19469= IFCDIRECTION((1.,0.,0.));
+#19471= IFCDIRECTION((0.,1.,0.));
+#19473= IFCDIRECTION((0.,0.,1.));
+#19475= IFCMAPPEDITEM(#19412,#19476);
+#19476= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#19479,#19481,#19477,$,
+#19483);
+#19477= IFCCARTESIANPOINT((0.,-900.,0.));
+#19479= IFCDIRECTION((1.,0.,0.));
+#19481= IFCDIRECTION((0.,1.,0.));
+#19483= IFCDIRECTION((0.,0.,1.));
+#19485= IFCMAPPEDITEM(#19412,#19486);
+#19486= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#19489,#19491,#19487,$,
+#19493);
+#19487= IFCCARTESIANPOINT((0.,-1050.,0.));
+#19489= IFCDIRECTION((1.,0.,0.));
+#19491= IFCDIRECTION((0.,1.,0.));
+#19493= IFCDIRECTION((0.,0.,1.));
+#19495= IFCMAPPEDITEM(#19412,#19496);
+#19496= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#19499,#19501,#19497,$,
+#19503);
+#19497= IFCCARTESIANPOINT((0.,-1200.,0.));
+#19499= IFCDIRECTION((1.,0.,0.));
+#19501= IFCDIRECTION((0.,1.,0.));
+#19503= IFCDIRECTION((0.,0.,1.));
+#19505= IFCMAPPEDITEM(#19412,#19506);
+#19506= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#19509,#19511,#19507,$,
+#19513);
+#19507= IFCCARTESIANPOINT((0.,-1350.,0.));
+#19509= IFCDIRECTION((1.,0.,0.));
+#19511= IFCDIRECTION((0.,1.,0.));
+#19513= IFCDIRECTION((0.,0.,1.));
+#19515= IFCMAPPEDITEM(#19412,#19516);
+#19516= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#19519,#19521,#19517,$,
+#19523);
+#19517= IFCCARTESIANPOINT((0.,-1500.,0.));
+#19519= IFCDIRECTION((1.,0.,0.));
+#19521= IFCDIRECTION((0.,1.,0.));
+#19523= IFCDIRECTION((0.,0.,1.));
+#19525= IFCMAPPEDITEM(#19412,#19526);
+#19526= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#19529,#19531,#19527,$,
+#19533);
+#19527= IFCCARTESIANPOINT((0.,-1650.,0.));
+#19529= IFCDIRECTION((1.,0.,0.));
+#19531= IFCDIRECTION((0.,1.,0.));
+#19533= IFCDIRECTION((0.,0.,1.));
+#19535= IFCMAPPEDITEM(#19412,#19536);
+#19536= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#19539,#19541,#19537,$,
+#19543);
+#19537= IFCCARTESIANPOINT((0.,-1800.,0.));
+#19539= IFCDIRECTION((1.,0.,0.));
+#19541= IFCDIRECTION((0.,1.,0.));
+#19543= IFCDIRECTION((0.,0.,1.));
+#19545= IFCMAPPEDITEM(#19412,#19546);
+#19546= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#19549,#19551,#19547,$,
+#19553);
+#19547= IFCCARTESIANPOINT((0.,-1950.,0.));
+#19549= IFCDIRECTION((1.,0.,0.));
+#19551= IFCDIRECTION((0.,1.,0.));
+#19553= IFCDIRECTION((0.,0.,1.));
+#19557= IFCRELASSOCIATESMATERIAL('0yn97F8u9A_BXw2Y_8UlnZ',#4,$,$,(#19560
+),#19558);
+#19558= IFCMATERIAL('B500B');
+#19560= IFCREINFORCINGBAR('3IXI5QYEH1mfnItQcTdMoj',#4,' ',$,$,#19291,
+#19292,$,$,12.,1.131,$,.NOTDEFINED.,$);
+#19564= IFCPROPERTYSINGLEVALUE('Bending diameter',$,IFCREAL(36.),$);
+#19565= IFCPROPERTYSINGLEVALUE('Shape code',$,IFCTEXT('X1  '),$);
+#19566= IFCPROPERTYSINGLEVALUE('Hook angle - begin',$,IFCREAL(180.),$);
+#19567= IFCPROPERTYSINGLEVALUE('Hook length - begin',$,IFCREAL(60.),$);
+#19568= IFCPROPERTYSINGLEVALUE('Hook bending diameter - begin',$,IFCREAL
+(36.),$);
+#19569= IFCPROPERTYSINGLEVALUE('Hook angle - end',$,IFCREAL(180.),$);
+#19570= IFCPROPERTYSINGLEVALUE('Hook length - end',$,IFCREAL(60.),$);
+#19571= IFCPROPERTYSINGLEVALUE('Hook bending diameter - end',$,IFCREAL(
+36.),$);
+#19572= IFCPROPERTYSINGLEVALUE('Weight per meter',$,IFCREAL(0.888),$);
+#19573= IFCPROPERTYSINGLEVALUE('Creation flags',$,IFCINTEGER(41),$);
+#19574= IFCPROPERTYSINGLEVALUE('Count of bars/meshes',$,IFCINTEGER(14),$
+);
+#19575= IFCPROPERTYSET('1q_ZUvTDf1PhGSUOBAJ4UE',#4,
+'Allplan_ReinforcingBar',$,(#19564,#19565,#19566,#19567,#19568,#19569,
+#19570,#19571,#19572,#19573,#19574));
+#19577= IFCRELDEFINESBYPROPERTIES('1GHGM0SRTAQ8eL0ApZPt7o',#4,$,$,(
+#19560),#19575);
+#19581= IFCAXIS2PLACEMENT3D(#19582,#19584,#19586);
+#19582= IFCCARTESIANPOINT((29939.99999999999,22370.00000014359,
+-191.9670193488453));
+#19584= IFCDIRECTION((0.,0.,1.));
+#19586= IFCDIRECTION((1.,0.,0.));
+#19588= IFCLOCALPLACEMENT(#71,#19581);
+#19589= IFCPRODUCTDEFINITIONSHAPE($,$,(#19653));
+#19590= IFCSHAPEREPRESENTATION(#34,'Body','AdvancedSweptSolid',(#19592)
+);
+#19592= IFCSWEPTDISKSOLID(#19593,5.,$,0.,1.);
+#19593= IFCPOLYLINE((#19595,#19597,#19599,#19601,#19603,#19605,#19607,
+#19609,#19611,#19613,#19615,#19617,#19619,#19621,#19623,#19625,#19627,
+#19629,#19631,#19633,#19635,#19637,#19639,#19641,#19643,#19645,#19647,
+#19649,#19651));
+#19595= IFCCARTESIANPOINT((0.,0.,0.));
+#19597= IFCCARTESIANPOINT((141.5252254980842,0.,-2.273736754432321E-13)
+);
+#19599= IFCCARTESIANPOINT((147.7202674075561,0.,0.862081622399046));
+#19601= IFCCARTESIANPOINT((154.0948060241099,0.,2.963513876474963));
+#19603= IFCCARTESIANPOINT((159.950992212307,0.,6.2431241310112));
+#19605= IFCCARTESIANPOINT((164.7487373415279,0.,10.25126265847189));
+#19607= IFCCARTESIANPOINT((168.7568758689886,0.,15.04900778769274));
+#19609= IFCCARTESIANPOINT((172.0364861235248,0.,20.90519397588992));
+#19611= IFCCARTESIANPOINT((174.1379183776007,0.,27.27973259244368));
+#19613= IFCCARTESIANPOINT((175.,0.,33.47477450191559));
+#19615= IFCCARTESIANPOINT((174.9999999999927,0.,1096.525225498084));
+#19617= IFCCARTESIANPOINT((174.1379183775935,0.,1102.720267407556));
+#19619= IFCCARTESIANPOINT((172.0364861235175,0.,1109.09480602411));
+#19621= IFCCARTESIANPOINT((168.7568758689813,0.,1114.950992212307));
+#19623= IFCCARTESIANPOINT((164.7487373415206,0.,1119.748737341528));
+#19625= IFCCARTESIANPOINT((159.9509922122998,0.,1123.756875868988));
+#19627= IFCCARTESIANPOINT((154.0948060241026,0.,1127.036486123525));
+#19629= IFCCARTESIANPOINT((147.7202674075488,0.,1129.137918377601));
+#19631= IFCCARTESIANPOINT((141.5252254980769,0.,1130.));
+#19633= IFCCARTESIANPOINT((138.4747745019085,0.,1130.));
+#19635= IFCCARTESIANPOINT((132.2797325924366,0.,1129.137918377601));
+#19637= IFCCARTESIANPOINT((125.9051939758829,0.,1127.036486123525));
+#19639= IFCCARTESIANPOINT((120.0490077876857,0.,1123.756875868988));
+#19641= IFCCARTESIANPOINT((115.2512626584648,0.,1119.748737341528));
+#19643= IFCCARTESIANPOINT((111.2431241310042,0.,1114.950992212307));
+#19645= IFCCARTESIANPOINT((107.9635138764679,0.,1109.09480602411));
+#19647= IFCCARTESIANPOINT((105.862081622392,0.,1102.720267407556));
+#19649= IFCCARTESIANPOINT((104.9999999999927,0.,1096.525225498084));
+#19651= IFCCARTESIANPOINT((104.9999999999927,0.,1055.));
+#19653= IFCSHAPEREPRESENTATION(#34,'Body','MappedRepresentation',(#19657
+,#19668,#19678,#19688,#19698,#19708,#19718,#19728));
+#19655= IFCREPRESENTATIONMAP(#1,#19590);
+#19657= IFCMAPPEDITEM(#19655,#19659);
+#19659= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#19662,#19664,#19660,$,
+#19666);
+#19660= IFCCARTESIANPOINT((0.,0.,0.));
+#19662= IFCDIRECTION((1.,0.,0.));
+#19664= IFCDIRECTION((0.,1.,0.));
+#19666= IFCDIRECTION((0.,0.,1.));
+#19668= IFCMAPPEDITEM(#19655,#19669);
+#19669= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#19672,#19674,#19670,$,
+#19676);
+#19670= IFCCARTESIANPOINT((0.,150.,0.));
+#19672= IFCDIRECTION((1.,0.,0.));
+#19674= IFCDIRECTION((0.,1.,0.));
+#19676= IFCDIRECTION((0.,0.,1.));
+#19678= IFCMAPPEDITEM(#19655,#19679);
+#19679= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#19682,#19684,#19680,$,
+#19686);
+#19680= IFCCARTESIANPOINT((0.,300.,0.));
+#19682= IFCDIRECTION((1.,0.,0.));
+#19684= IFCDIRECTION((0.,1.,0.));
+#19686= IFCDIRECTION((0.,0.,1.));
+#19688= IFCMAPPEDITEM(#19655,#19689);
+#19689= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#19692,#19694,#19690,$,
+#19696);
+#19690= IFCCARTESIANPOINT((0.,450.,0.));
+#19692= IFCDIRECTION((1.,0.,0.));
+#19694= IFCDIRECTION((0.,1.,0.));
+#19696= IFCDIRECTION((0.,0.,1.));
+#19698= IFCMAPPEDITEM(#19655,#19699);
+#19699= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#19702,#19704,#19700,$,
+#19706);
+#19700= IFCCARTESIANPOINT((0.,600.,0.));
+#19702= IFCDIRECTION((1.,0.,0.));
+#19704= IFCDIRECTION((0.,1.,0.));
+#19706= IFCDIRECTION((0.,0.,1.));
+#19708= IFCMAPPEDITEM(#19655,#19709);
+#19709= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#19712,#19714,#19710,$,
+#19716);
+#19710= IFCCARTESIANPOINT((0.,750.,0.));
+#19712= IFCDIRECTION((1.,0.,0.));
+#19714= IFCDIRECTION((0.,1.,0.));
+#19716= IFCDIRECTION((0.,0.,1.));
+#19718= IFCMAPPEDITEM(#19655,#19719);
+#19719= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#19722,#19724,#19720,$,
+#19726);
+#19720= IFCCARTESIANPOINT((0.,900.,0.));
+#19722= IFCDIRECTION((1.,0.,0.));
+#19724= IFCDIRECTION((0.,1.,0.));
+#19726= IFCDIRECTION((0.,0.,1.));
+#19728= IFCMAPPEDITEM(#19655,#19729);
+#19729= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#19732,#19734,#19730,$,
+#19736);
+#19730= IFCCARTESIANPOINT((0.,1050.,0.));
+#19732= IFCDIRECTION((1.,0.,0.));
+#19734= IFCDIRECTION((0.,1.,0.));
+#19736= IFCDIRECTION((0.,0.,1.));
+#19740= IFCRELASSOCIATESMATERIAL('2UXHPmLgL6_eiADFNC7$7U',#4,$,$,(#19743
+),#19741);
+#19741= IFCMATERIAL('B500B');
+#19743= IFCREINFORCINGBAR('28mLF_Smb63fVJqXy32wMF',#4,' ',$,$,#19588,
+#19589,$,$,10.,0.785,$,.NOTDEFINED.,$);
+#19747= IFCPROPERTYSINGLEVALUE('Bending diameter',$,IFCREAL(30.),$);
+#19748= IFCPROPERTYSINGLEVALUE('Shape code',$,IFCTEXT('X1  '),$);
+#19749= IFCPROPERTYSINGLEVALUE('Hook angle - end',$,IFCREAL(180.),$);
+#19750= IFCPROPERTYSINGLEVALUE('Hook length - end',$,IFCREAL(40.),$);
+#19751= IFCPROPERTYSINGLEVALUE('Hook bending diameter - end',$,IFCREAL(
+30.),$);
+#19752= IFCPROPERTYSINGLEVALUE('Weight per meter',$,IFCREAL(0.617),$);
+#19753= IFCPROPERTYSINGLEVALUE('Creation flags',$,IFCINTEGER(41),$);
+#19754= IFCPROPERTYSINGLEVALUE('Count of bars/meshes',$,IFCINTEGER(8),$
+);
+#19755= IFCPROPERTYSET('1apgx0VSz4wPqKTmtTxC9V',#4,
+'Allplan_ReinforcingBar',$,(#19747,#19748,#19749,#19750,#19751,#19752,
+#19753,#19754));
+#19757= IFCRELDEFINESBYPROPERTIES('1C0U_39W98TOFzQtUeAODp',#4,$,$,(
+#19743),#19755);
+#19761= IFCAXIS2PLACEMENT3D(#19762,#19764,#19766);
+#19762= IFCCARTESIANPOINT((32120.00000000001,23819.99999845639,
+-193.670833707163));
+#19764= IFCDIRECTION((0.,0.,1.));
+#19766= IFCDIRECTION((1.,0.,0.));
+#19768= IFCLOCALPLACEMENT(#71,#19761);
+#19769= IFCPRODUCTDEFINITIONSHAPE($,$,(#19833));
+#19770= IFCSHAPEREPRESENTATION(#34,'Body','AdvancedSweptSolid',(#19772)
+);
+#19772= IFCSWEPTDISKSOLID(#19773,5.,$,0.,1.);
+#19773= IFCPOLYLINE((#19775,#19777,#19779,#19781,#19783,#19785,#19787,
+#19789,#19791,#19793,#19795,#19797,#19799,#19801,#19803,#19805,#19807,
+#19809,#19811,#19813,#19815,#19817,#19819,#19821,#19823,#19825,#19827,
+#19829,#19831));
+#19775= IFCCARTESIANPOINT((0.,0.,0.));
+#19777= IFCCARTESIANPOINT((-141.5252254980842,1.016091118799523E-6,
+1.591615728102624E-12));
+#19779= IFCCARTESIANPOINT((-147.7202674075561,1.060569047695026E-6,
+0.8620816224008649));
+#19781= IFCCARTESIANPOINT((-154.0948060241099,1.106338459067047E-6,
+2.963513876476782));
+#19783= IFCCARTESIANPOINT((-159.950992212307,1.148382580140606E-6,
+6.243124131013019));
+#19785= IFCCARTESIANPOINT((-164.7487373415279,1.182826963486150E-6,
+10.25126265847371));
+#19787= IFCCARTESIANPOINT((-168.7568758689886,1.211603375850245E-6,
+15.04900778769456));
+#19789= IFCCARTESIANPOINT((-172.0364861235248,1.235152012668550E-6,
+20.90519397589173));
+#19791= IFCCARTESIANPOINT((-174.1379183776007,1.250238710781559E-6,
+27.2797325924455));
+#19793= IFCCARTESIANPOINT((-175.,1.256426912732422E-6,33.47477450191741)
+);
+#19795= IFCCARTESIANPOINT((-175.,1.256426912732422E-6,1706.525225498086)
+);
+#19797= IFCCARTESIANPOINT((-174.1379183776007,1.250238710781559E-6,
+1712.720267407558));
+#19799= IFCCARTESIANPOINT((-172.0364861235285,1.235152012668550E-6,
+1719.094806024111));
+#19801= IFCCARTESIANPOINT((-168.7568758689886,1.211603375850245E-6,
+1724.950992212309));
+#19803= IFCCARTESIANPOINT((-164.7487373415279,1.182826963486150E-6,
+1729.74873734153));
+#19805= IFCCARTESIANPOINT((-159.9509922123107,1.148382580140606E-6,
+1733.75687586899));
+#19807= IFCCARTESIANPOINT((-154.0948060241135,1.106334821088240E-6,
+1737.036486123526));
+#19809= IFCCARTESIANPOINT((-147.7202674075597,1.060569047695026E-6,
+1739.137918377602));
+#19811= IFCCARTESIANPOINT((-141.5252254980878,1.016091118799523E-6,
+1740.000000000002));
+#19813= IFCCARTESIANPOINT((-138.4747745019158,9.941904863808304E-7,
+1740.000000000002));
+#19815= IFCCARTESIANPOINT((-132.2797325924439,9.497125574853271E-7,
+1739.137918377602));
+#19817= IFCCARTESIANPOINT((-125.9051939758901,9.039467840921134E-7,
+1737.036486123526));
+#19819= IFCCARTESIANPOINT((-120.049007787693,8.619026630185545E-7,
+1733.75687586899));
+#19821= IFCCARTESIANPOINT((-115.2512626584721,8.274546416942030E-7,
+1729.74873734153));
+#19823= IFCCARTESIANPOINT((-111.2431241310114,7.986782293301076E-7,
+1724.950992212309));
+#19825= IFCCARTESIANPOINT((-107.9635138764752,7.751332304906100E-7,
+1719.094806024111));
+#19827= IFCCARTESIANPOINT((-105.8620816223993,7.600465323776007E-7,
+1712.720267407558));
+#19829= IFCCARTESIANPOINT((-105.,7.538546924479306E-7,1706.525225498086)
+);
+#19831= IFCCARTESIANPOINT((-105.,7.538546924479306E-7,1665.));
+#19833= IFCSHAPEREPRESENTATION(#34,'Body','MappedRepresentation',(#19837
+,#19848,#19858,#19868,#19878,#19888,#19898,#19908,#19918,#19928,#19938,
+#19948,#19958,#19968,#19978,#19988,#19998,#20008,#20018,#20028,#20038,
+#20048,#20058));
+#19835= IFCREPRESENTATIONMAP(#1,#19770);
+#19837= IFCMAPPEDITEM(#19835,#19839);
+#19839= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#19842,#19844,#19840,$,
+#19846);
+#19840= IFCCARTESIANPOINT((0.,0.,0.));
+#19842= IFCDIRECTION((1.,0.,0.));
+#19844= IFCDIRECTION((0.,1.,0.));
+#19846= IFCDIRECTION((0.,0.,1.));
+#19848= IFCMAPPEDITEM(#19835,#19849);
+#19849= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#19852,#19854,#19850,$,
+#19856);
+#19850= IFCCARTESIANPOINT((0.,-150.,0.));
+#19852= IFCDIRECTION((1.,0.,0.));
+#19854= IFCDIRECTION((0.,1.,0.));
+#19856= IFCDIRECTION((0.,0.,1.));
+#19858= IFCMAPPEDITEM(#19835,#19859);
+#19859= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#19862,#19864,#19860,$,
+#19866);
+#19860= IFCCARTESIANPOINT((0.,-300.,0.));
+#19862= IFCDIRECTION((1.,0.,0.));
+#19864= IFCDIRECTION((0.,1.,0.));
+#19866= IFCDIRECTION((0.,0.,1.));
+#19868= IFCMAPPEDITEM(#19835,#19869);
+#19869= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#19872,#19874,#19870,$,
+#19876);
+#19870= IFCCARTESIANPOINT((0.,-450.,0.));
+#19872= IFCDIRECTION((1.,0.,0.));
+#19874= IFCDIRECTION((0.,1.,0.));
+#19876= IFCDIRECTION((0.,0.,1.));
+#19878= IFCMAPPEDITEM(#19835,#19879);
+#19879= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#19882,#19884,#19880,$,
+#19886);
+#19880= IFCCARTESIANPOINT((0.,-600.,0.));
+#19882= IFCDIRECTION((1.,0.,0.));
+#19884= IFCDIRECTION((0.,1.,0.));
+#19886= IFCDIRECTION((0.,0.,1.));
+#19888= IFCMAPPEDITEM(#19835,#19889);
+#19889= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#19892,#19894,#19890,$,
+#19896);
+#19890= IFCCARTESIANPOINT((0.,-750.,0.));
+#19892= IFCDIRECTION((1.,0.,0.));
+#19894= IFCDIRECTION((0.,1.,0.));
+#19896= IFCDIRECTION((0.,0.,1.));
+#19898= IFCMAPPEDITEM(#19835,#19899);
+#19899= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#19902,#19904,#19900,$,
+#19906);
+#19900= IFCCARTESIANPOINT((0.,-900.,0.));
+#19902= IFCDIRECTION((1.,0.,0.));
+#19904= IFCDIRECTION((0.,1.,0.));
+#19906= IFCDIRECTION((0.,0.,1.));
+#19908= IFCMAPPEDITEM(#19835,#19909);
+#19909= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#19912,#19914,#19910,$,
+#19916);
+#19910= IFCCARTESIANPOINT((0.,-1050.,0.));
+#19912= IFCDIRECTION((1.,0.,0.));
+#19914= IFCDIRECTION((0.,1.,0.));
+#19916= IFCDIRECTION((0.,0.,1.));
+#19918= IFCMAPPEDITEM(#19835,#19919);
+#19919= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#19922,#19924,#19920,$,
+#19926);
+#19920= IFCCARTESIANPOINT((0.,-1200.,0.));
+#19922= IFCDIRECTION((1.,0.,0.));
+#19924= IFCDIRECTION((0.,1.,0.));
+#19926= IFCDIRECTION((0.,0.,1.));
+#19928= IFCMAPPEDITEM(#19835,#19929);
+#19929= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#19932,#19934,#19930,$,
+#19936);
+#19930= IFCCARTESIANPOINT((0.,-1350.,0.));
+#19932= IFCDIRECTION((1.,0.,0.));
+#19934= IFCDIRECTION((0.,1.,0.));
+#19936= IFCDIRECTION((0.,0.,1.));
+#19938= IFCMAPPEDITEM(#19835,#19939);
+#19939= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#19942,#19944,#19940,$,
+#19946);
+#19940= IFCCARTESIANPOINT((0.,-1500.,0.));
+#19942= IFCDIRECTION((1.,0.,0.));
+#19944= IFCDIRECTION((0.,1.,0.));
+#19946= IFCDIRECTION((0.,0.,1.));
+#19948= IFCMAPPEDITEM(#19835,#19949);
+#19949= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#19952,#19954,#19950,$,
+#19956);
+#19950= IFCCARTESIANPOINT((-265.0000005295042,-1764.999998456391,
+2.273736754432321E-13));
+#19952= IFCDIRECTION((5.384688733279168E-9,-1.,0.));
+#19954= IFCDIRECTION((1.,5.384688733279168E-9,0.));
+#19956= IFCDIRECTION((0.,0.,1.));
+#19958= IFCMAPPEDITEM(#19835,#19959);
+#19959= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#19962,#19964,#19960,$,
+#19966);
+#19960= IFCCARTESIANPOINT((-415.0000005295042,-1764.999998456391,
+2.273736754432321E-13));
+#19962= IFCDIRECTION((5.384688733279168E-9,-1.,0.));
+#19964= IFCDIRECTION((1.,5.384688733279168E-9,0.));
+#19966= IFCDIRECTION((0.,0.,1.));
+#19968= IFCMAPPEDITEM(#19835,#19969);
+#19969= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#19972,#19974,#19970,$,
+#19976);
+#19970= IFCCARTESIANPOINT((-565.0000005295042,-1764.999998456391,
+2.273736754432321E-13));
+#19972= IFCDIRECTION((5.384688733279168E-9,-1.,0.));
+#19974= IFCDIRECTION((1.,5.384688733279168E-9,0.));
+#19976= IFCDIRECTION((0.,0.,1.));
+#19978= IFCMAPPEDITEM(#19835,#19979);
+#19979= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#19982,#19984,#19980,$,
+#19986);
+#19980= IFCCARTESIANPOINT((-715.0000005295042,-1764.999998456391,
+2.273736754432321E-13));
+#19982= IFCDIRECTION((5.384688733279168E-9,-1.,0.));
+#19984= IFCDIRECTION((1.,5.384688733279168E-9,0.));
+#19986= IFCDIRECTION((0.,0.,1.));
+#19988= IFCMAPPEDITEM(#19835,#19989);
+#19989= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#19992,#19994,#19990,$,
+#19996);
+#19990= IFCCARTESIANPOINT((-865.0000005295042,-1764.999998456391,
+2.273736754432321E-13));
+#19992= IFCDIRECTION((5.384688733279168E-9,-1.,0.));
+#19994= IFCDIRECTION((1.,5.384688733279168E-9,0.));
+#19996= IFCDIRECTION((0.,0.,1.));
+#19998= IFCMAPPEDITEM(#19835,#19999);
+#19999= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#20002,#20004,#20000,$,
+#20006);
+#20000= IFCCARTESIANPOINT((-1015.000000529504,-1764.999998456391,
+2.273736754432321E-13));
+#20002= IFCDIRECTION((5.384688733279168E-9,-1.,0.));
+#20004= IFCDIRECTION((1.,5.384688733279168E-9,0.));
+#20006= IFCDIRECTION((0.,0.,1.));
+#20008= IFCMAPPEDITEM(#19835,#20009);
+#20009= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#20012,#20014,#20010,$,
+#20016);
+#20010= IFCCARTESIANPOINT((-1165.000000529504,-1764.999998456391,
+2.273736754432321E-13));
+#20012= IFCDIRECTION((5.384688733279168E-9,-1.,0.));
+#20014= IFCDIRECTION((1.,5.384688733279168E-9,0.));
+#20016= IFCDIRECTION((0.,0.,1.));
+#20018= IFCMAPPEDITEM(#19835,#20019);
+#20019= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#20022,#20024,#20020,$,
+#20026);
+#20020= IFCCARTESIANPOINT((-1315.000000529504,-1764.999998456391,
+2.273736754432321E-13));
+#20022= IFCDIRECTION((5.384688733279168E-9,-1.,0.));
+#20024= IFCDIRECTION((1.,5.384688733279168E-9,0.));
+#20026= IFCDIRECTION((0.,0.,1.));
+#20028= IFCMAPPEDITEM(#19835,#20029);
+#20029= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#20032,#20034,#20030,$,
+#20036);
+#20030= IFCCARTESIANPOINT((-1465.000000529504,-1764.999998456391,
+2.273736754432321E-13));
+#20032= IFCDIRECTION((5.384688733279168E-9,-1.,0.));
+#20034= IFCDIRECTION((1.,5.384688733279168E-9,0.));
+#20036= IFCDIRECTION((0.,0.,1.));
+#20038= IFCMAPPEDITEM(#19835,#20039);
+#20039= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#20042,#20044,#20040,$,
+#20046);
+#20040= IFCCARTESIANPOINT((-1615.000000529504,-1764.999998456391,
+2.273736754432321E-13));
+#20042= IFCDIRECTION((5.384688733279168E-9,-1.,0.));
+#20044= IFCDIRECTION((1.,5.384688733279168E-9,0.));
+#20046= IFCDIRECTION((0.,0.,1.));
+#20048= IFCMAPPEDITEM(#19835,#20049);
+#20049= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#20052,#20054,#20050,$,
+#20056);
+#20050= IFCCARTESIANPOINT((-1765.000000529504,-1764.999998456391,
+2.273736754432321E-13));
+#20052= IFCDIRECTION((5.384688733279168E-9,-1.,0.));
+#20054= IFCDIRECTION((1.,5.384688733279168E-9,0.));
+#20056= IFCDIRECTION((0.,0.,1.));
+#20058= IFCMAPPEDITEM(#19835,#20059);
+#20059= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#20062,#20064,#20060,$,
+#20066);
+#20060= IFCCARTESIANPOINT((-1915.000000529504,-1764.999998456391,
+2.273736754432321E-13));
+#20062= IFCDIRECTION((5.384688733279168E-9,-1.,0.));
+#20064= IFCDIRECTION((1.,5.384688733279168E-9,0.));
+#20066= IFCDIRECTION((0.,0.,1.));
+#20070= IFCRELASSOCIATESMATERIAL('2nui5jVIHD68eTfoFM4Kh1',#4,$,$,(#20073
+),#20071);
+#20071= IFCMATERIAL('B500B');
+#20073= IFCREINFORCINGBAR('1WL5Qy5fDE0eHcI$wv4Dst',#4,' ',$,$,#19768,
+#19769,$,$,10.,0.785,$,.NOTDEFINED.,$);
+#20077= IFCPROPERTYSINGLEVALUE('Bending diameter',$,IFCREAL(30.),$);
+#20078= IFCPROPERTYSINGLEVALUE('Shape code',$,IFCTEXT('X1  '),$);
+#20079= IFCPROPERTYSINGLEVALUE('Hook angle - end',$,IFCREAL(180.),$);
+#20080= IFCPROPERTYSINGLEVALUE('Hook length - end',$,IFCREAL(40.),$);
+#20081= IFCPROPERTYSINGLEVALUE('Hook bending diameter - end',$,IFCREAL(
+30.),$);
+#20082= IFCPROPERTYSINGLEVALUE('Weight per meter',$,IFCREAL(0.617),$);
+#20083= IFCPROPERTYSINGLEVALUE('Creation flags',$,IFCINTEGER(41),$);
+#20084= IFCPROPERTYSINGLEVALUE('Count of bars/meshes',$,IFCINTEGER(23),$
+);
+#20085= IFCPROPERTYSET('1cHkKcuSzDwOsQ9GAvyY$m',#4,
+'Allplan_ReinforcingBar',$,(#20077,#20078,#20079,#20080,#20081,#20082,
+#20083,#20084));
+#20087= IFCRELDEFINESBYPROPERTIES('3Q5r01jc16HBQJcbdpbHlT',#4,$,$,(
+#20073),#20085);
+#20091= IFCAXIS2PLACEMENT3D(#20092,#20094,#20096);
+#20092= IFCCARTESIANPOINT((32113.99999999999,24044.99998414029,
+-214.9999999999998));
+#20094= IFCDIRECTION((0.,0.,1.));
+#20096= IFCDIRECTION((1.,0.,0.));
+#20098= IFCLOCALPLACEMENT(#71,#20091);
+#20099= IFCPRODUCTDEFINITIONSHAPE($,$,(#20145));
+#20100= IFCSHAPEREPRESENTATION(#34,'Body','AdvancedSweptSolid',(#20102)
+);
+#20102= IFCSWEPTDISKSOLID(#20103,6.,$,0.,1.);
+#20103= IFCPOLYLINE((#20105,#20107,#20109,#20111,#20113,#20115,#20117,
+#20119,#20121,#20123,#20125,#20127,#20129,#20131,#20133,#20135,#20137,
+#20139,#20141,#20143));
+#20105= IFCCARTESIANPOINT((0.,0.,0.));
+#20107= IFCCARTESIANPOINT((0.,0.,133.8302705977001));
+#20109= IFCCARTESIANPOINT((-1.03449794687549,7.428752724081278E-9,
+141.2643208890656));
+#20111= IFCCARTESIANPOINT((-3.556216651773866,2.553497324697673E-8,
+148.9137672289323));
+#20113= IFCCARTESIANPOINT((-7.491748957210803,5.379115464165807E-8,
+155.9411906547682));
+#20115= IFCCARTESIANPOINT((-12.30151519016363,8.832284947857261E-8,
+161.6984848098362));
+#20117= IFCCARTESIANPOINT((-18.05880934523157,1.296575646847487E-7,
+166.508251042789));
+#20119= IFCCARTESIANPOINT((-25.08623277106744,1.801090547814965E-7,
+170.4437833482259));
+#20121= IFCCARTESIANPOINT((-32.73567911093414,2.350316208321601E-7,
+172.9655020531243));
+#20123= IFCCARTESIANPOINT((-40.16972940229971,2.884044079110026E-7,
+173.9999999999998));
+#20125= IFCCARTESIANPOINT((-2127.8302705977,1.527694257674739E-5,
+173.9999999999998));
+#20127= IFCCARTESIANPOINT((-2135.264320889066,1.533031536382623E-5,
+172.9655020531243));
+#20129= IFCCARTESIANPOINT((-2142.913767228933,1.538523429189809E-5,
+170.4437833482259));
+#20131= IFCCARTESIANPOINT((-2149.941190654768,1.543568941997364E-5,
+166.508251042789));
+#20133= IFCCARTESIANPOINT((-2155.698484809836,1.547702413517982E-5,
+161.6984848098362));
+#20135= IFCCARTESIANPOINT((-2160.508251042789,1.551155583001673E-5,
+155.9411906547682));
+#20137= IFCCARTESIANPOINT((-2164.443783348226,1.553981201141141E-5,
+148.9137672289323));
+#20139= IFCCARTESIANPOINT((-2166.965502053125,1.555791459395550E-5,
+141.2643208890656));
+#20141= IFCCARTESIANPOINT((-2168.,1.556534334667958E-5,133.8302705977001
+));
+#20143= IFCCARTESIANPOINT((-2168.,1.556534334667958E-5,0.));
+#20145= IFCSHAPEREPRESENTATION(#34,'Body','MappedRepresentation',(#20149
+,#20160,#20170,#20180,#20190,#20200,#20210,#20220,#20230,#20240,#20250,
+#20260,#20270,#20280));
+#20147= IFCREPRESENTATIONMAP(#1,#20100);
+#20149= IFCMAPPEDITEM(#20147,#20151);
+#20151= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#20154,#20156,#20152,$,
+#20158);
+#20152= IFCCARTESIANPOINT((0.,0.,0.));
+#20154= IFCDIRECTION((1.,0.,0.));
+#20156= IFCDIRECTION((0.,1.,0.));
+#20158= IFCDIRECTION((0.,0.,1.));
+#20160= IFCMAPPEDITEM(#20147,#20161);
+#20161= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#20164,#20166,#20162,$,
+#20168);
+#20162= IFCCARTESIANPOINT((0.,-150.,0.));
+#20164= IFCDIRECTION((1.,0.,0.));
+#20166= IFCDIRECTION((0.,1.,0.));
+#20168= IFCDIRECTION((0.,0.,1.));
+#20170= IFCMAPPEDITEM(#20147,#20171);
+#20171= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#20174,#20176,#20172,$,
+#20178);
+#20172= IFCCARTESIANPOINT((0.,-300.,0.));
+#20174= IFCDIRECTION((1.,0.,0.));
+#20176= IFCDIRECTION((0.,1.,0.));
+#20178= IFCDIRECTION((0.,0.,1.));
+#20180= IFCMAPPEDITEM(#20147,#20181);
+#20181= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#20184,#20186,#20182,$,
+#20188);
+#20182= IFCCARTESIANPOINT((0.,-450.,0.));
+#20184= IFCDIRECTION((1.,0.,0.));
+#20186= IFCDIRECTION((0.,1.,0.));
+#20188= IFCDIRECTION((0.,0.,1.));
+#20190= IFCMAPPEDITEM(#20147,#20191);
+#20191= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#20194,#20196,#20192,$,
+#20198);
+#20192= IFCCARTESIANPOINT((0.,-600.,0.));
+#20194= IFCDIRECTION((1.,0.,0.));
+#20196= IFCDIRECTION((0.,1.,0.));
+#20198= IFCDIRECTION((0.,0.,1.));
+#20200= IFCMAPPEDITEM(#20147,#20201);
+#20201= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#20204,#20206,#20202,$,
+#20208);
+#20202= IFCCARTESIANPOINT((0.,-750.,0.));
+#20204= IFCDIRECTION((1.,0.,0.));
+#20206= IFCDIRECTION((0.,1.,0.));
+#20208= IFCDIRECTION((0.,0.,1.));
+#20210= IFCMAPPEDITEM(#20147,#20211);
+#20211= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#20214,#20216,#20212,$,
+#20218);
+#20212= IFCCARTESIANPOINT((0.,-900.,0.));
+#20214= IFCDIRECTION((1.,0.,0.));
+#20216= IFCDIRECTION((0.,1.,0.));
+#20218= IFCDIRECTION((0.,0.,1.));
+#20220= IFCMAPPEDITEM(#20147,#20221);
+#20221= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#20224,#20226,#20222,$,
+#20228);
+#20222= IFCCARTESIANPOINT((0.,-1050.,0.));
+#20224= IFCDIRECTION((1.,0.,0.));
+#20226= IFCDIRECTION((0.,1.,0.));
+#20228= IFCDIRECTION((0.,0.,1.));
+#20230= IFCMAPPEDITEM(#20147,#20231);
+#20231= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#20234,#20236,#20232,$,
+#20238);
+#20232= IFCCARTESIANPOINT((0.,-1200.,0.));
+#20234= IFCDIRECTION((1.,0.,0.));
+#20236= IFCDIRECTION((0.,1.,0.));
+#20238= IFCDIRECTION((0.,0.,1.));
+#20240= IFCMAPPEDITEM(#20147,#20241);
+#20241= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#20244,#20246,#20242,$,
+#20248);
+#20242= IFCCARTESIANPOINT((0.,-1350.,0.));
+#20244= IFCDIRECTION((1.,0.,0.));
+#20246= IFCDIRECTION((0.,1.,0.));
+#20248= IFCDIRECTION((0.,0.,1.));
+#20250= IFCMAPPEDITEM(#20147,#20251);
+#20251= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#20254,#20256,#20252,$,
+#20258);
+#20252= IFCCARTESIANPOINT((0.,-1500.,0.));
+#20254= IFCDIRECTION((1.,0.,0.));
+#20256= IFCDIRECTION((0.,1.,0.));
+#20258= IFCDIRECTION((0.,0.,1.));
+#20260= IFCMAPPEDITEM(#20147,#20261);
+#20261= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#20264,#20266,#20262,$,
+#20268);
+#20262= IFCCARTESIANPOINT((0.,-1650.,0.));
+#20264= IFCDIRECTION((1.,0.,0.));
+#20266= IFCDIRECTION((0.,1.,0.));
+#20268= IFCDIRECTION((0.,0.,1.));
+#20270= IFCMAPPEDITEM(#20147,#20271);
+#20271= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#20274,#20276,#20272,$,
+#20278);
+#20272= IFCCARTESIANPOINT((0.,-1800.,0.));
+#20274= IFCDIRECTION((1.,0.,0.));
+#20276= IFCDIRECTION((0.,1.,0.));
+#20278= IFCDIRECTION((0.,0.,1.));
+#20280= IFCMAPPEDITEM(#20147,#20281);
+#20281= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#20284,#20286,#20282,$,
+#20288);
+#20282= IFCCARTESIANPOINT((0.,-1950.,0.));
+#20284= IFCDIRECTION((1.,0.,0.));
+#20286= IFCDIRECTION((0.,1.,0.));
+#20288= IFCDIRECTION((0.,0.,1.));
+#20292= IFCRELASSOCIATESMATERIAL('013j0zba99PueHtEwBGpgS',#4,$,$,(#20295
+),#20293);
+#20293= IFCMATERIAL('B500B');
+#20295= IFCREINFORCINGBAR('0xrjimqsrC5edxDIKYP6ZF',#4,' ',$,$,#20098,
+#20099,$,$,12.,1.131,$,.NOTDEFINED.,$);
+#20299= IFCPROPERTYSINGLEVALUE('Bending diameter',$,IFCREAL(36.),$);
+#20300= IFCPROPERTYSINGLEVALUE('Shape code',$,IFCTEXT('X1  '),$);
+#20301= IFCPROPERTYSINGLEVALUE('Weight per meter',$,IFCREAL(0.888),$);
+#20302= IFCPROPERTYSINGLEVALUE('Creation flags',$,IFCINTEGER(41),$);
+#20303= IFCPROPERTYSINGLEVALUE('Count of bars/meshes',$,IFCINTEGER(14),$
+);
+#20304= IFCPROPERTYSET('1J5ySSgiT43Aj8We8dc6lF',#4,
+'Allplan_ReinforcingBar',$,(#20299,#20300,#20301,#20302,#20303));
+#20306= IFCRELDEFINESBYPROPERTIES('2yZotJnCLFWeTN5JN9QkyP',#4,$,$,(
+#20295),#20304);
+#20310= IFCAXIS2PLACEMENT3D(#20311,#20313,#20315);
+#20311= IFCCARTESIANPOINT((29980.00000369568,24079.,-199.5234620667613)
+);
+#20313= IFCDIRECTION((0.,0.,1.));
+#20315= IFCDIRECTION((1.,0.,0.));
+#20317= IFCLOCALPLACEMENT(#71,#20310);
+#20318= IFCPRODUCTDEFINITIONSHAPE($,$,(#20364));
+#20319= IFCSHAPEREPRESENTATION(#34,'Body','AdvancedSweptSolid',(#20321)
+);
+#20321= IFCSWEPTDISKSOLID(#20322,6.,$,0.,1.);
+#20322= IFCPOLYLINE((#20324,#20326,#20328,#20330,#20332,#20334,#20336,
+#20338,#20340,#20342,#20344,#20346,#20348,#20350,#20352,#20354,#20356,
+#20358,#20360,#20362));
+#20324= IFCCARTESIANPOINT((0.,0.,0.));
+#20326= IFCCARTESIANPOINT((0.,-3.637978807091713E-12,103.8302705977037)
+);
+#20328= IFCCARTESIANPOINT((-1.855369191616774E-9,-1.034497946879128,
+111.2643208890693));
+#20330= IFCCARTESIANPOINT((-6.381014827638865E-9,-3.556216651777504,
+118.913767228936));
+#20332= IFCCARTESIANPOINT((-1.344596967101097E-8,-7.491748957214441,
+125.9411906547718));
+#20334= IFCCARTESIANPOINT((-2.207889338023961E-8,-12.30151519016727,
+131.6984848098398));
+#20336= IFCCARTESIANPOINT((-3.241439117118716E-8,-18.0588093452352,
+136.5082510427926));
+#20338= IFCCARTESIANPOINT((-4.502726369537413E-8,-25.08623277107108,
+140.4437833482295));
+#20340= IFCCARTESIANPOINT((-5.875699571333826E-8,-32.73567911093778,
+142.9655020531279));
+#20342= IFCCARTESIANPOINT((-7.210110197775066E-8,-40.16972940230335,
+144.0000000000034));
+#20344= IFCCARTESIANPOINT((-3.549997927621007E-6,-1977.8302705977,
+144.0000000000034));
+#20346= IFCCARTESIANPOINT((-3.563342033885419E-6,-1985.264320889066,
+142.9655020531279));
+#20348= IFCCARTESIANPOINT((-3.577071765903384E-6,-1992.913767228933,
+140.4437833482295));
+#20350= IFCCARTESIANPOINT((-3.589684638427571E-6,-1999.941190654768,
+136.5082510427926));
+#20352= IFCCARTESIANPOINT((-3.600020136218518E-6,-2005.698484809836,
+131.6984848098398));
+#20354= IFCCARTESIANPOINT((-3.608653059927747E-6,-2010.508251042789,
+125.9411906547718));
+#20356= IFCCARTESIANPOINT((-3.615714376792312E-6,-2014.443783348226,
+118.913767228936));
+#20358= IFCCARTESIANPOINT((-3.620243660407141E-6,-2016.965502053125,
+111.2643208890693));
+#20360= IFCCARTESIANPOINT((-3.622099029598758E-6,-2018.,
+103.8302705977037));
+#20362= IFCCARTESIANPOINT((-3.622102667577565E-6,-2018.,0.));
+#20364= IFCSHAPEREPRESENTATION(#34,'Body','MappedRepresentation',(#20368
+,#20379,#20389,#20399,#20409,#20419,#20429,#20439,#20449,#20459,#20469,
+#20479,#20489,#20499,#20509));
+#20366= IFCREPRESENTATIONMAP(#1,#20319);
+#20368= IFCMAPPEDITEM(#20366,#20370);
+#20370= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#20373,#20375,#20371,$,
+#20377);
+#20371= IFCCARTESIANPOINT((0.,0.,0.));
+#20373= IFCDIRECTION((1.,0.,0.));
+#20375= IFCDIRECTION((0.,1.,0.));
+#20377= IFCDIRECTION((0.,0.,1.));
+#20379= IFCMAPPEDITEM(#20366,#20380);
+#20380= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#20383,#20385,#20381,$,
+#20387);
+#20381= IFCCARTESIANPOINT((150.,0.,-2.273736754432321E-13));
+#20383= IFCDIRECTION((1.,0.,0.));
+#20385= IFCDIRECTION((0.,1.,0.));
+#20387= IFCDIRECTION((0.,0.,1.));
+#20389= IFCMAPPEDITEM(#20366,#20390);
+#20390= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#20393,#20395,#20391,$,
+#20397);
+#20391= IFCCARTESIANPOINT((300.,0.,-4.547473508864641E-13));
+#20393= IFCDIRECTION((1.,0.,0.));
+#20395= IFCDIRECTION((0.,1.,0.));
+#20397= IFCDIRECTION((0.,0.,1.));
+#20399= IFCMAPPEDITEM(#20366,#20400);
+#20400= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#20403,#20405,#20401,$,
+#20407);
+#20401= IFCCARTESIANPOINT((450.,0.,-6.821210263296962E-13));
+#20403= IFCDIRECTION((1.,0.,0.));
+#20405= IFCDIRECTION((0.,1.,0.));
+#20407= IFCDIRECTION((0.,0.,1.));
+#20409= IFCMAPPEDITEM(#20366,#20410);
+#20410= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#20413,#20415,#20411,$,
+#20417);
+#20411= IFCCARTESIANPOINT((600.,0.,-9.094947017729282E-13));
+#20413= IFCDIRECTION((1.,0.,0.));
+#20415= IFCDIRECTION((0.,1.,0.));
+#20417= IFCDIRECTION((0.,0.,1.));
+#20419= IFCMAPPEDITEM(#20366,#20420);
+#20420= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#20423,#20425,#20421,$,
+#20427);
+#20421= IFCCARTESIANPOINT((750.,0.,-1.136868377216160E-12));
+#20423= IFCDIRECTION((1.,0.,0.));
+#20425= IFCDIRECTION((0.,1.,0.));
+#20427= IFCDIRECTION((0.,0.,1.));
+#20429= IFCMAPPEDITEM(#20366,#20430);
+#20430= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#20433,#20435,#20431,$,
+#20437);
+#20431= IFCCARTESIANPOINT((900.,0.,-1.364242052659392E-12));
+#20433= IFCDIRECTION((1.,0.,0.));
+#20435= IFCDIRECTION((0.,1.,0.));
+#20437= IFCDIRECTION((0.,0.,1.));
+#20439= IFCMAPPEDITEM(#20366,#20440);
+#20440= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#20443,#20445,#20441,$,
+#20447);
+#20441= IFCCARTESIANPOINT((1050.,0.,-1.591615728102624E-12));
+#20443= IFCDIRECTION((1.,0.,0.));
+#20445= IFCDIRECTION((0.,1.,0.));
+#20447= IFCDIRECTION((0.,0.,1.));
+#20449= IFCMAPPEDITEM(#20366,#20450);
+#20450= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#20453,#20455,#20451,$,
+#20457);
+#20451= IFCCARTESIANPOINT((1200.,0.,-1.818989403545857E-12));
+#20453= IFCDIRECTION((1.,0.,0.));
+#20455= IFCDIRECTION((0.,1.,0.));
+#20457= IFCDIRECTION((0.,0.,1.));
+#20459= IFCMAPPEDITEM(#20366,#20460);
+#20460= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#20463,#20465,#20461,$,
+#20467);
+#20461= IFCCARTESIANPOINT((1350.,0.,-2.046363078989089E-12));
+#20463= IFCDIRECTION((1.,0.,0.));
+#20465= IFCDIRECTION((0.,1.,0.));
+#20467= IFCDIRECTION((0.,0.,1.));
+#20469= IFCMAPPEDITEM(#20366,#20470);
+#20470= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#20473,#20475,#20471,$,
+#20477);
+#20471= IFCCARTESIANPOINT((1500.,0.,-2.273736754432321E-12));
+#20473= IFCDIRECTION((1.,0.,0.));
+#20475= IFCDIRECTION((0.,1.,0.));
+#20477= IFCDIRECTION((0.,0.,1.));
+#20479= IFCMAPPEDITEM(#20366,#20480);
+#20480= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#20483,#20485,#20481,$,
+#20487);
+#20481= IFCCARTESIANPOINT((1650.,0.,-2.501110429875553E-12));
+#20483= IFCDIRECTION((1.,0.,0.));
+#20485= IFCDIRECTION((0.,1.,0.));
+#20487= IFCDIRECTION((0.,0.,1.));
+#20489= IFCMAPPEDITEM(#20366,#20490);
+#20490= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#20493,#20495,#20491,$,
+#20497);
+#20491= IFCCARTESIANPOINT((1800.,0.,-2.728484105318785E-12));
+#20493= IFCDIRECTION((1.,0.,0.));
+#20495= IFCDIRECTION((0.,1.,0.));
+#20497= IFCDIRECTION((0.,0.,1.));
+#20499= IFCMAPPEDITEM(#20366,#20500);
+#20500= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#20503,#20505,#20501,$,
+#20507);
+#20501= IFCCARTESIANPOINT((1950.,0.,-2.955857780762017E-12));
+#20503= IFCDIRECTION((1.,0.,0.));
+#20505= IFCDIRECTION((0.,1.,0.));
+#20507= IFCDIRECTION((0.,0.,1.));
+#20509= IFCMAPPEDITEM(#20366,#20510);
+#20510= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#20513,#20515,#20511,$,
+#20517);
+#20511= IFCCARTESIANPOINT((2100.,0.,-3.183231456205249E-12));
+#20513= IFCDIRECTION((1.,0.,0.));
+#20515= IFCDIRECTION((0.,1.,0.));
+#20517= IFCDIRECTION((0.,0.,1.));
+#20521= IFCRELASSOCIATESMATERIAL('2eSqorMqTFAvAmYr9VZYVv',#4,$,$,(#20524
+),#20522);
+#20522= IFCMATERIAL('B500B');
+#20524= IFCREINFORCINGBAR('3dpRJ0iBX3Lf4gnxJLzQyA',#4,' ',$,$,#20317,
+#20318,$,$,12.,1.131,$,.NOTDEFINED.,$);
+#20528= IFCPROPERTYSINGLEVALUE('Bending diameter',$,IFCREAL(36.),$);
+#20529= IFCPROPERTYSINGLEVALUE('Shape code',$,IFCTEXT('X1  '),$);
+#20530= IFCPROPERTYSINGLEVALUE('Weight per meter',$,IFCREAL(0.888),$);
+#20531= IFCPROPERTYSINGLEVALUE('Creation flags',$,IFCINTEGER(41),$);
+#20532= IFCPROPERTYSINGLEVALUE('Count of bars/meshes',$,IFCINTEGER(15),$
+);
+#20533= IFCPROPERTYSET('1zH75MQlj0MRRxdma5YU5H',#4,
+'Allplan_ReinforcingBar',$,(#20528,#20529,#20530,#20531,#20532));
+#20535= IFCRELDEFINESBYPROPERTIES('1VeG2xYnr3CvNNLkHy4eQ9',#4,$,$,(
+#20524),#20533);
+#20539= IFCAXIS2PLACEMENT3D(#20540,#20542,#20544);
+#20540= IFCCARTESIANPOINT((31945.00000000001,22120.00000014359,490.));
+#20542= IFCDIRECTION((0.,0.,1.));
+#20544= IFCDIRECTION((1.,0.,0.));
+#20546= IFCLOCALPLACEMENT(#71,#20539);
+#20547= IFCPRODUCTDEFINITIONSHAPE($,$,(#20629));
+#20548= IFCSHAPEREPRESENTATION(#34,'Body','AdvancedSweptSolid',(#20550)
+);
+#20550= IFCSWEPTDISKSOLID(#20551,5.,$,0.,1.);
+#20551= IFCPOLYLINE((#20553,#20555,#20557,#20559,#20561,#20563,#20565,
+#20567,#20569,#20571,#20573,#20575,#20577,#20579,#20581,#20583,#20585,
+#20587,#20589,#20591,#20593,#20595,#20597,#20599,#20601,#20603,#20605,
+#20607,#20609,#20611,#20613,#20615,#20617,#20619,#20621,#20623,#20625,
+#20627));
+#20553= IFCCARTESIANPOINT((0.,0.,0.));
+#20555= IFCCARTESIANPOINT((0.,0.,-211.5252254980842));
+#20557= IFCCARTESIANPOINT((0.8620816223992733,0.,-217.7202674075561));
+#20559= IFCCARTESIANPOINT((2.96351387647519,0.,-224.0948060241099));
+#20561= IFCCARTESIANPOINT((6.243124131011427,0.,-229.950992212307));
+#20563= IFCCARTESIANPOINT((10.25126265847212,0.,-234.7487373415279));
+#20565= IFCCARTESIANPOINT((15.04900778769297,0.,-238.7568758689886));
+#20567= IFCCARTESIANPOINT((20.90519397589014,0.,-242.0364861235248));
+#20569= IFCCARTESIANPOINT((27.27973259244391,0.,-244.1379183776007));
+#20571= IFCCARTESIANPOINT((33.47477450191582,0.,-245.));
+#20573= IFCCARTESIANPOINT((86.52522549808418,0.,-245.));
+#20575= IFCCARTESIANPOINT((92.72026740755609,0.,-244.1379183776007));
+#20577= IFCCARTESIANPOINT((99.09480602410986,0.,-242.0364861235248));
+#20579= IFCCARTESIANPOINT((104.950992212307,0.,-238.7568758689886));
+#20581= IFCCARTESIANPOINT((109.7487373415279,0.,-234.7487373415279));
+#20583= IFCCARTESIANPOINT((113.7568758689886,0.,-229.950992212307));
+#20585= IFCCARTESIANPOINT((117.0364861235248,0.,-224.0948060241099));
+#20587= IFCCARTESIANPOINT((119.1379183776007,0.,-217.7202674075561));
+#20589= IFCCARTESIANPOINT((120.,0.,-211.5252254980842));
+#20591= IFCCARTESIANPOINT((120.,0.,961.5252254980842));
+#20593= IFCCARTESIANPOINT((119.1379183776007,0.,967.7202674075561));
+#20595= IFCCARTESIANPOINT((117.0364861235248,0.,974.0948060241099));
+#20597= IFCCARTESIANPOINT((113.7568758689886,0.,979.950992212307));
+#20599= IFCCARTESIANPOINT((109.7487373415279,0.,984.7487373415279));
+#20601= IFCCARTESIANPOINT((104.950992212307,0.,988.7568758689886));
+#20603= IFCCARTESIANPOINT((99.09480602410986,0.,992.0364861235248));
+#20605= IFCCARTESIANPOINT((92.72026740755609,0.,994.1379183776007));
+#20607= IFCCARTESIANPOINT((86.52522549808418,0.,995.));
+#20609= IFCCARTESIANPOINT((83.47477450191582,0.,995.));
+#20611= IFCCARTESIANPOINT((77.27973259244391,0.,994.1379183776007));
+#20613= IFCCARTESIANPOINT((70.90519397589014,0.,992.0364861235248));
+#20615= IFCCARTESIANPOINT((65.04900778769297,0.,988.7568758689886));
+#20617= IFCCARTESIANPOINT((60.25126265847212,0.,984.7487373415279));
+#20619= IFCCARTESIANPOINT((56.24312413101143,0.,979.950992212307));
+#20621= IFCCARTESIANPOINT((52.96351387647519,0.,974.0948060241099));
+#20623= IFCCARTESIANPOINT((50.86208162239927,0.,967.7202674075561));
+#20625= IFCCARTESIANPOINT((50.,0.,961.5252254980842));
+#20627= IFCCARTESIANPOINT((50.,0.,919.9999999999982));
+#20629= IFCSHAPEREPRESENTATION(#34,'Body','MappedRepresentation',(#20633
+,#20644,#20654,#20664,#20674,#20684,#20694,#20704,#20714,#20724,#20734,
+#20744,#20754,#20764,#20774,#20784,#20794,#20804,#20814,#20824,#20834,
+#20844,#20854,#20864,#20874,#20884,#20894,#20904,#20914,#20924,#20934,
+#20944));
+#20631= IFCREPRESENTATIONMAP(#1,#20548);
+#20633= IFCMAPPEDITEM(#20631,#20635);
+#20635= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#20638,#20640,#20636,$,
+#20642);
+#20636= IFCCARTESIANPOINT((0.,0.,0.));
+#20638= IFCDIRECTION((1.,0.,0.));
+#20640= IFCDIRECTION((0.,1.,0.));
+#20642= IFCDIRECTION((0.,0.,1.));
+#20644= IFCMAPPEDITEM(#20631,#20645);
+#20645= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#20648,#20650,#20646,$,
+#20652);
+#20646= IFCCARTESIANPOINT((0.,150.,0.));
+#20648= IFCDIRECTION((1.,0.,0.));
+#20650= IFCDIRECTION((0.,1.,0.));
+#20652= IFCDIRECTION((0.,0.,1.));
+#20654= IFCMAPPEDITEM(#20631,#20655);
+#20655= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#20658,#20660,#20656,$,
+#20662);
+#20656= IFCCARTESIANPOINT((0.,300.,0.));
+#20658= IFCDIRECTION((1.,0.,0.));
+#20660= IFCDIRECTION((0.,1.,0.));
+#20662= IFCDIRECTION((0.,0.,1.));
+#20664= IFCMAPPEDITEM(#20631,#20665);
+#20665= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#20668,#20670,#20666,$,
+#20672);
+#20666= IFCCARTESIANPOINT((0.,450.,0.));
+#20668= IFCDIRECTION((1.,0.,0.));
+#20670= IFCDIRECTION((0.,1.,0.));
+#20672= IFCDIRECTION((0.,0.,1.));
+#20674= IFCMAPPEDITEM(#20631,#20675);
+#20675= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#20678,#20680,#20676,$,
+#20682);
+#20676= IFCCARTESIANPOINT((0.,600.,0.));
+#20678= IFCDIRECTION((1.,0.,0.));
+#20680= IFCDIRECTION((0.,1.,0.));
+#20682= IFCDIRECTION((0.,0.,1.));
+#20684= IFCMAPPEDITEM(#20631,#20685);
+#20685= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#20688,#20690,#20686,$,
+#20692);
+#20686= IFCCARTESIANPOINT((0.,750.,0.));
+#20688= IFCDIRECTION((1.,0.,0.));
+#20690= IFCDIRECTION((0.,1.,0.));
+#20692= IFCDIRECTION((0.,0.,1.));
+#20694= IFCMAPPEDITEM(#20631,#20695);
+#20695= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#20698,#20700,#20696,$,
+#20702);
+#20696= IFCCARTESIANPOINT((0.,900.,0.));
+#20698= IFCDIRECTION((1.,0.,0.));
+#20700= IFCDIRECTION((0.,1.,0.));
+#20702= IFCDIRECTION((0.,0.,1.));
+#20704= IFCMAPPEDITEM(#20631,#20705);
+#20705= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#20708,#20710,#20706,$,
+#20712);
+#20706= IFCCARTESIANPOINT((0.,1050.,0.));
+#20708= IFCDIRECTION((1.,0.,0.));
+#20710= IFCDIRECTION((0.,1.,0.));
+#20712= IFCDIRECTION((0.,0.,1.));
+#20714= IFCMAPPEDITEM(#20631,#20715);
+#20715= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#20718,#20720,#20716,$,
+#20722);
+#20716= IFCCARTESIANPOINT((0.,1200.,0.));
+#20718= IFCDIRECTION((1.,0.,0.));
+#20720= IFCDIRECTION((0.,1.,0.));
+#20722= IFCDIRECTION((0.,0.,1.));
+#20724= IFCMAPPEDITEM(#20631,#20725);
+#20725= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#20728,#20730,#20726,$,
+#20732);
+#20726= IFCCARTESIANPOINT((0.,1350.,0.));
+#20728= IFCDIRECTION((1.,0.,0.));
+#20730= IFCDIRECTION((0.,1.,0.));
+#20732= IFCDIRECTION((0.,0.,1.));
+#20734= IFCMAPPEDITEM(#20631,#20735);
+#20735= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#20738,#20740,#20736,$,
+#20742);
+#20736= IFCCARTESIANPOINT((0.,1500.,0.));
+#20738= IFCDIRECTION((1.,0.,0.));
+#20740= IFCDIRECTION((0.,1.,0.));
+#20742= IFCDIRECTION((0.,0.,1.));
+#20744= IFCMAPPEDITEM(#20631,#20745);
+#20745= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#20748,#20750,#20746,$,
+#20752);
+#20746= IFCCARTESIANPOINT((0.,1650.,0.));
+#20748= IFCDIRECTION((1.,0.,0.));
+#20750= IFCDIRECTION((0.,1.,0.));
+#20752= IFCDIRECTION((0.,0.,1.));
+#20754= IFCMAPPEDITEM(#20631,#20755);
+#20755= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#20758,#20760,#20756,$,
+#20762);
+#20756= IFCCARTESIANPOINT((0.,1800.,0.));
+#20758= IFCDIRECTION((1.,0.,0.));
+#20760= IFCDIRECTION((0.,1.,0.));
+#20762= IFCDIRECTION((0.,0.,1.));
+#20764= IFCMAPPEDITEM(#20631,#20765);
+#20765= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#20768,#20770,#20766,$,
+#20772);
+#20766= IFCCARTESIANPOINT((0.,1950.,0.));
+#20768= IFCDIRECTION((1.,0.,0.));
+#20770= IFCDIRECTION((0.,1.,0.));
+#20772= IFCDIRECTION((0.,0.,1.));
+#20774= IFCMAPPEDITEM(#20631,#20775);
+#20775= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#20778,#20780,#20776,$,
+#20782);
+#20776= IFCCARTESIANPOINT((-1890.000000143602,109.9999998564053,
+2.273736754432321E-13));
+#20778= IFCDIRECTION((1.794890741761078E-9,-1.,0.));
+#20780= IFCDIRECTION((1.,1.794890741761078E-9,0.));
+#20782= IFCDIRECTION((0.,0.,1.));
+#20784= IFCMAPPEDITEM(#20631,#20785);
+#20785= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#20788,#20790,#20786,$,
+#20792);
+#20786= IFCCARTESIANPOINT((-1740.000000143602,109.9999998564053,0.));
+#20788= IFCDIRECTION((1.794890741761078E-9,-1.,0.));
+#20790= IFCDIRECTION((1.,1.794890741761078E-9,0.));
+#20792= IFCDIRECTION((0.,0.,1.));
+#20794= IFCMAPPEDITEM(#20631,#20795);
+#20795= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#20798,#20800,#20796,$,
+#20802);
+#20796= IFCCARTESIANPOINT((-1590.000000143602,109.9999998564053,
+-2.273736754432321E-13));
+#20798= IFCDIRECTION((1.794890741761078E-9,-1.,0.));
+#20800= IFCDIRECTION((1.,1.794890741761078E-9,0.));
+#20802= IFCDIRECTION((0.,0.,1.));
+#20804= IFCMAPPEDITEM(#20631,#20805);
+#20805= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#20808,#20810,#20806,$,
+#20812);
+#20806= IFCCARTESIANPOINT((-1440.000000143602,109.9999998564053,
+-4.547473508864641E-13));
+#20808= IFCDIRECTION((1.794890741761078E-9,-1.,0.));
+#20810= IFCDIRECTION((1.,1.794890741761078E-9,0.));
+#20812= IFCDIRECTION((0.,0.,1.));
+#20814= IFCMAPPEDITEM(#20631,#20815);
+#20815= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#20818,#20820,#20816,$,
+#20822);
+#20816= IFCCARTESIANPOINT((-1290.000000143602,109.9999998564053,
+-6.821210263296962E-13));
+#20818= IFCDIRECTION((1.794890741761078E-9,-1.,0.));
+#20820= IFCDIRECTION((1.,1.794890741761078E-9,0.));
+#20822= IFCDIRECTION((0.,0.,1.));
+#20824= IFCMAPPEDITEM(#20631,#20825);
+#20825= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#20828,#20830,#20826,$,
+#20832);
+#20826= IFCCARTESIANPOINT((-1140.000000143602,109.9999998564053,
+-9.094947017729282E-13));
+#20828= IFCDIRECTION((1.794890741761078E-9,-1.,0.));
+#20830= IFCDIRECTION((1.,1.794890741761078E-9,0.));
+#20832= IFCDIRECTION((0.,0.,1.));
+#20834= IFCMAPPEDITEM(#20631,#20835);
+#20835= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#20838,#20840,#20836,$,
+#20842);
+#20836= IFCCARTESIANPOINT((-990.0000001436019,109.9999998564053,
+-1.136868377216160E-12));
+#20838= IFCDIRECTION((1.794890741761078E-9,-1.,0.));
+#20840= IFCDIRECTION((1.,1.794890741761078E-9,0.));
+#20842= IFCDIRECTION((0.,0.,1.));
+#20844= IFCMAPPEDITEM(#20631,#20845);
+#20845= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#20848,#20850,#20846,$,
+#20852);
+#20846= IFCCARTESIANPOINT((-840.0000001436019,109.9999998564053,
+-1.364242052659392E-12));
+#20848= IFCDIRECTION((1.794890741761078E-9,-1.,0.));
+#20850= IFCDIRECTION((1.,1.794890741761078E-9,0.));
+#20852= IFCDIRECTION((0.,0.,1.));
+#20854= IFCMAPPEDITEM(#20631,#20855);
+#20855= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#20858,#20860,#20856,$,
+#20862);
+#20856= IFCCARTESIANPOINT((-690.0000001436019,109.9999998564053,
+-1.591615728102624E-12));
+#20858= IFCDIRECTION((1.794890741761078E-9,-1.,0.));
+#20860= IFCDIRECTION((1.,1.794890741761078E-9,0.));
+#20862= IFCDIRECTION((0.,0.,1.));
+#20864= IFCMAPPEDITEM(#20631,#20865);
+#20865= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#20868,#20870,#20866,$,
+#20872);
+#20866= IFCCARTESIANPOINT((-540.0000001436019,109.9999998564053,
+-1.818989403545857E-12));
+#20868= IFCDIRECTION((1.794890741761078E-9,-1.,0.));
+#20870= IFCDIRECTION((1.,1.794890741761078E-9,0.));
+#20872= IFCDIRECTION((0.,0.,1.));
+#20874= IFCMAPPEDITEM(#20631,#20875);
+#20875= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#20878,#20880,#20876,$,
+#20882);
+#20876= IFCCARTESIANPOINT((-390.0000001436019,109.9999998564053,
+-2.046363078989089E-12));
+#20878= IFCDIRECTION((1.794890741761078E-9,-1.,0.));
+#20880= IFCDIRECTION((1.,1.794890741761078E-9,0.));
+#20882= IFCDIRECTION((0.,0.,1.));
+#20884= IFCMAPPEDITEM(#20631,#20885);
+#20885= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#20888,#20890,#20886,$,
+#20892);
+#20886= IFCCARTESIANPOINT((-240.0000001436019,109.9999998564053,
+-2.273736754432321E-12));
+#20888= IFCDIRECTION((1.794890741761078E-9,-1.,0.));
+#20890= IFCDIRECTION((1.,1.794890741761078E-9,0.));
+#20892= IFCDIRECTION((0.,0.,1.));
+#20894= IFCMAPPEDITEM(#20631,#20895);
+#20895= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#20898,#20900,#20896,$,
+#20902);
+#20896= IFCCARTESIANPOINT((-90.00000014360194,109.9999998564053,
+-2.501110429875553E-12));
+#20898= IFCDIRECTION((1.794890741761078E-9,-1.,0.));
+#20900= IFCDIRECTION((1.,1.794890741761078E-9,0.));
+#20902= IFCDIRECTION((0.,0.,1.));
+#20904= IFCMAPPEDITEM(#20631,#20905);
+#20905= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#20908,#20910,#20906,$,
+#20912);
+#20906= IFCCARTESIANPOINT((59.99999985639806,109.9999998564053,
+-2.728484105318785E-12));
+#20908= IFCDIRECTION((1.794890741761078E-9,-1.,0.));
+#20910= IFCDIRECTION((1.,1.794890741761078E-9,0.));
+#20912= IFCDIRECTION((0.,0.,1.));
+#20914= IFCMAPPEDITEM(#20631,#20915);
+#20915= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#20918,#20920,#20916,$,
+#20922);
+#20916= IFCCARTESIANPOINT((-1830.000000000015,1907.49999913845,
+2.273736754432321E-13));
+#20918= IFCDIRECTION((-1.,3.589799002161190E-9,0.));
+#20920= IFCDIRECTION((-3.589799002161190E-9,-1.,0.));
+#20922= IFCDIRECTION((0.,0.,1.));
+#20924= IFCMAPPEDITEM(#20631,#20925);
+#20925= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#20928,#20930,#20926,$,
+#20932);
+#20926= IFCCARTESIANPOINT((-1830.000000000015,1757.49999913845,
+2.273736754432321E-13));
+#20928= IFCDIRECTION((-1.,3.589799002161190E-9,0.));
+#20930= IFCDIRECTION((-3.589799002161190E-9,-1.,0.));
+#20932= IFCDIRECTION((0.,0.,1.));
+#20934= IFCMAPPEDITEM(#20631,#20935);
+#20935= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#20938,#20940,#20936,$,
+#20942);
+#20936= IFCCARTESIANPOINT((-1830.000000000015,1607.49999913845,
+2.273736754432321E-13));
+#20938= IFCDIRECTION((-1.,3.589799002161190E-9,0.));
+#20940= IFCDIRECTION((-3.589799002161190E-9,-1.,0.));
+#20942= IFCDIRECTION((0.,0.,1.));
+#20944= IFCMAPPEDITEM(#20631,#20945);
+#20945= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#20948,#20950,#20946,$,
+#20952);
+#20946= IFCCARTESIANPOINT((-1830.000000000015,1457.49999913845,
+2.273736754432321E-13));
+#20948= IFCDIRECTION((-1.,3.589799002161190E-9,0.));
+#20950= IFCDIRECTION((-3.589799002161190E-9,-1.,0.));
+#20952= IFCDIRECTION((0.,0.,1.));
+#20956= IFCRELASSOCIATESMATERIAL('2kM7Uh3qj4U98OIlstb_FK',#4,$,$,(#20959
+),#20957);
+#20957= IFCMATERIAL('B500B');
+#20959= IFCREINFORCINGBAR('0gKW_joAT4ggalbB_514oK',#4,' ',$,$,#20546,
+#20547,$,$,10.,0.785,$,.NOTDEFINED.,$);
+#20963= IFCPROPERTYSINGLEVALUE('Bending diameter',$,IFCREAL(30.),$);
+#20964= IFCPROPERTYSINGLEVALUE('Shape code',$,IFCTEXT('X1  '),$);
+#20965= IFCPROPERTYSINGLEVALUE('Hook angle - end',$,IFCREAL(180.),$);
+#20966= IFCPROPERTYSINGLEVALUE('Hook length - end',$,IFCREAL(40.),$);
+#20967= IFCPROPERTYSINGLEVALUE('Hook bending diameter - end',$,IFCREAL(
+30.),$);
+#20968= IFCPROPERTYSINGLEVALUE('Weight per meter',$,IFCREAL(0.617),$);
+#20969= IFCPROPERTYSINGLEVALUE('Creation flags',$,IFCINTEGER(41),$);
+#20970= IFCPROPERTYSINGLEVALUE('Count of bars/meshes',$,IFCINTEGER(32),$
+);
+#20971= IFCPROPERTYSET('2J5ygr2fz1nP9uQx5oqlJ4',#4,
+'Allplan_ReinforcingBar',$,(#20963,#20964,#20965,#20966,#20967,#20968,
+#20969,#20970));
+#20973= IFCRELDEFINESBYPROPERTIES('3PenjVSDXFl8WW48Gu$Pb7',#4,$,$,(
+#20959),#20971);
+#20977= IFCAXIS2PLACEMENT3D(#20978,#20980,#20982);
+#20978= IFCCARTESIANPOINT((31960.,24069.99999999999,669.9999996051229));
+#20980= IFCDIRECTION((0.,0.,1.));
+#20982= IFCDIRECTION((1.,0.,0.));
+#20984= IFCLOCALPLACEMENT(#71,#20977);
+#20985= IFCPRODUCTDEFINITIONSHAPE($,$,(#20995));
+#20986= IFCSHAPEREPRESENTATION(#34,'Body','AdvancedSweptSolid',(#20988)
+);
+#20988= IFCSWEPTDISKSOLID(#20989,5.,$,0.,1.);
+#20989= IFCPOLYLINE((#20991,#20993));
+#20991= IFCCARTESIANPOINT((0.,0.,0.));
+#20993= IFCCARTESIANPOINT((0.,-2000.,0.));
+#20995= IFCSHAPEREPRESENTATION(#34,'Body','MappedRepresentation',(#20999
+,#21010,#21020,#21030,#21040,#21050,#21060,#21070,#21080,#21090));
+#20997= IFCREPRESENTATIONMAP(#1,#20986);
+#20999= IFCMAPPEDITEM(#20997,#21001);
+#21001= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#21004,#21006,#21002,$,
+#21008);
+#21002= IFCCARTESIANPOINT((0.,0.,0.));
+#21004= IFCDIRECTION((1.,0.,0.));
+#21006= IFCDIRECTION((0.,1.,0.));
+#21008= IFCDIRECTION((0.,0.,1.));
+#21010= IFCMAPPEDITEM(#20997,#21011);
+#21011= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#21014,#21016,#21012,$,
+#21018);
+#21012= IFCCARTESIANPOINT((0.,0.,-150.));
+#21014= IFCDIRECTION((1.,0.,0.));
+#21016= IFCDIRECTION((0.,1.,0.));
+#21018= IFCDIRECTION((0.,0.,1.));
+#21020= IFCMAPPEDITEM(#20997,#21021);
+#21021= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#21024,#21026,#21022,$,
+#21028);
+#21022= IFCCARTESIANPOINT((0.,0.,-300.));
+#21024= IFCDIRECTION((1.,0.,0.));
+#21026= IFCDIRECTION((0.,1.,0.));
+#21028= IFCDIRECTION((0.,0.,1.));
+#21030= IFCMAPPEDITEM(#20997,#21031);
+#21031= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#21034,#21036,#21032,$,
+#21038);
+#21032= IFCCARTESIANPOINT((0.,0.,-450.));
+#21034= IFCDIRECTION((1.,0.,0.));
+#21036= IFCDIRECTION((0.,1.,0.));
+#21038= IFCDIRECTION((0.,0.,1.));
+#21040= IFCMAPPEDITEM(#20997,#21041);
+#21041= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#21044,#21046,#21042,$,
+#21048);
+#21042= IFCCARTESIANPOINT((0.,0.,-600.));
+#21044= IFCDIRECTION((1.,0.,0.));
+#21046= IFCDIRECTION((0.,1.,0.));
+#21048= IFCDIRECTION((0.,0.,1.));
+#21050= IFCMAPPEDITEM(#20997,#21051);
+#21051= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#21054,#21056,#21052,$,
+#21058);
+#21052= IFCCARTESIANPOINT((-1859.972516124057,0.,1.705302565824240E-13)
+);
+#21054= IFCDIRECTION((-1.,0.,1.224646798818428E-16));
+#21056= IFCDIRECTION((0.,1.,0.));
+#21058= IFCDIRECTION((1.224646798818428E-16,0.,1.));
+#21060= IFCMAPPEDITEM(#20997,#21061);
+#21061= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#21064,#21066,#21062,$,
+#21068);
+#21062= IFCCARTESIANPOINT((-1859.972516124057,0.,-149.9999999999998));
+#21064= IFCDIRECTION((-1.,0.,1.224646798818428E-16));
+#21066= IFCDIRECTION((0.,1.,0.));
+#21068= IFCDIRECTION((1.224646798818428E-16,0.,1.));
+#21070= IFCMAPPEDITEM(#20997,#21071);
+#21071= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#21074,#21076,#21072,$,
+#21078);
+#21072= IFCCARTESIANPOINT((-1859.972516124057,0.,-299.9999999999998));
+#21074= IFCDIRECTION((-1.,0.,1.224646798818428E-16));
+#21076= IFCDIRECTION((0.,1.,0.));
+#21078= IFCDIRECTION((1.224646798818428E-16,0.,1.));
+#21080= IFCMAPPEDITEM(#20997,#21081);
+#21081= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#21084,#21086,#21082,$,
+#21088);
+#21082= IFCCARTESIANPOINT((-1859.972516124057,0.,-449.9999999999998));
+#21084= IFCDIRECTION((-1.,0.,1.224646798818428E-16));
+#21086= IFCDIRECTION((0.,1.,0.));
+#21088= IFCDIRECTION((1.224646798818428E-16,0.,1.));
+#21090= IFCMAPPEDITEM(#20997,#21091);
+#21091= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#21094,#21096,#21092,$,
+#21098);
+#21092= IFCCARTESIANPOINT((-1859.972516124057,0.,-599.9999999999998));
+#21094= IFCDIRECTION((-1.,0.,1.224646798818428E-16));
+#21096= IFCDIRECTION((0.,1.,0.));
+#21098= IFCDIRECTION((1.224646798818428E-16,0.,1.));
+#21102= IFCRELASSOCIATESMATERIAL('381d1ot1n7cxKGweWY$aEL',#4,$,$,(#21105
+),#21103);
+#21103= IFCMATERIAL('B500B');
+#21105= IFCREINFORCINGBAR('0dFrXCqBr7eexbmXcDjYVD',#4,' ',$,$,#20984,
+#20985,$,$,10.,0.785,$,.NOTDEFINED.,$);
+#21109= IFCPROPERTYSINGLEVALUE('Bending diameter',$,IFCREAL(30.),$);
+#21110= IFCPROPERTYSINGLEVALUE('Shape code',$,IFCTEXT('X1  '),$);
+#21111= IFCPROPERTYSINGLEVALUE('Weight per meter',$,IFCREAL(0.617),$);
+#21112= IFCPROPERTYSINGLEVALUE('Creation flags',$,IFCINTEGER(41),$);
+#21113= IFCPROPERTYSINGLEVALUE('Count of bars/meshes',$,IFCINTEGER(10),$
+);
+#21114= IFCPROPERTYSET('364CKEykD4PAiR5LXYdoXK',#4,
+'Allplan_ReinforcingBar',$,(#21109,#21110,#21111,#21112,#21113));
+#21116= IFCRELDEFINESBYPROPERTIES('3ms49_m257jfVg5sRyiCoz',#4,$,$,(
+#21105),#21114);
+#21120= IFCAXIS2PLACEMENT3D(#21121,#21123,#21125);
+#21121= IFCCARTESIANPOINT((31959.97251612405,22569.99999999999,
+70.00000014359193));
+#21123= IFCDIRECTION((0.,0.,1.));
+#21125= IFCDIRECTION((1.,0.,0.));
+#21127= IFCLOCALPLACEMENT(#71,#21120);
+#21128= IFCPRODUCTDEFINITIONSHAPE($,$,(#21210));
+#21129= IFCSHAPEREPRESENTATION(#34,'Body','AdvancedSweptSolid',(#21131)
+);
+#21131= IFCSWEPTDISKSOLID(#21132,5.,$,0.,1.);
+#21132= IFCPOLYLINE((#21134,#21136,#21138,#21140,#21142,#21144,#21146,
+#21148,#21150,#21152,#21154,#21156,#21158,#21160,#21162,#21164,#21166,
+#21168,#21170,#21172,#21174,#21176,#21178,#21180,#21182,#21184,#21186,
+#21188,#21190,#21192,#21194,#21196,#21198,#21200,#21202,#21204,#21206,
+#21208));
+#21134= IFCCARTESIANPOINT((0.,0.,0.));
+#21136= IFCCARTESIANPOINT((0.,-461.5252254980842,0.));
+#21138= IFCCARTESIANPOINT((0.8620816223992733,-467.7202674075561,0.));
+#21140= IFCCARTESIANPOINT((2.96351387647519,-474.0948060241099,0.));
+#21142= IFCCARTESIANPOINT((6.243124131011427,-479.950992212307,0.));
+#21144= IFCCARTESIANPOINT((10.25126265847212,-484.7487373415279,0.));
+#21146= IFCCARTESIANPOINT((15.04900778769297,-488.7568758689886,0.));
+#21148= IFCCARTESIANPOINT((20.90519397589014,-492.0364861235248,0.));
+#21150= IFCCARTESIANPOINT((27.27973259244391,-494.1379183776007,0.));
+#21152= IFCCARTESIANPOINT((33.47477450191582,-495.,0.));
+#21154= IFCCARTESIANPOINT((106.5252254980696,-495.,0.));
+#21156= IFCCARTESIANPOINT((112.7202674075415,-494.1379183776007,0.));
+#21158= IFCCARTESIANPOINT((119.0948060240953,-492.0364861235248,0.));
+#21160= IFCCARTESIANPOINT((124.9509922122925,-488.7568758689886,0.));
+#21162= IFCCARTESIANPOINT((129.7487373415133,-484.7487373415279,0.));
+#21164= IFCCARTESIANPOINT((133.756875868974,-479.950992212307,0.));
+#21166= IFCCARTESIANPOINT((137.0364861235103,-474.0948060241099,0.));
+#21168= IFCCARTESIANPOINT((139.1379183775862,-467.7202674075561,0.));
+#21170= IFCCARTESIANPOINT((139.9999999999855,-461.5252254980842,0.));
+#21172= IFCCARTESIANPOINT((139.9999999999891,1461.525225498092,0.));
+#21174= IFCCARTESIANPOINT((139.1379183775898,1467.720267407563,0.));
+#21176= IFCCARTESIANPOINT((137.0364861235103,1474.094806024117,0.));
+#21178= IFCCARTESIANPOINT((133.7568758689777,1479.950992212314,0.));
+#21180= IFCCARTESIANPOINT((129.748737341517,1484.748737341535,0.));
+#21182= IFCCARTESIANPOINT((124.9509922122961,1488.756875868996,0.));
+#21184= IFCCARTESIANPOINT((119.0948060240989,1492.036486123532,0.));
+#21186= IFCCARTESIANPOINT((112.7202674075452,1494.137918377612,0.));
+#21188= IFCCARTESIANPOINT((106.5252254980733,1495.000000000007,0.));
+#21190= IFCCARTESIANPOINT((33.47477450191582,1495.000000000004,0.));
+#21192= IFCCARTESIANPOINT((27.27973259244391,1494.137918377604,0.));
+#21194= IFCCARTESIANPOINT((20.90519397589014,1492.036486123528,0.));
+#21196= IFCCARTESIANPOINT((15.04900778769297,1488.756875868992,0.));
+#21198= IFCCARTESIANPOINT((10.25126265847212,1484.748737341532,0.));
+#21200= IFCCARTESIANPOINT((6.243124131011427,1479.950992212311,0.));
+#21202= IFCCARTESIANPOINT((2.96351387647519,1474.094806024114,0.));
+#21204= IFCCARTESIANPOINT((0.8620816223992733,1467.72026740756,0.));
+#21206= IFCCARTESIANPOINT((0.,1461.525225498088,0.));
+#21208= IFCCARTESIANPOINT((0.,1000.000000000004,0.));
+#21210= IFCSHAPEREPRESENTATION(#34,'Body','MappedRepresentation',(#21214
+,#21225,#21235,#21245,#21255,#21265,#21275,#21285,#21295,#21305));
+#21212= IFCREPRESENTATIONMAP(#1,#21129);
+#21214= IFCMAPPEDITEM(#21212,#21216);
+#21216= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#21219,#21221,#21217,$,
+#21223);
+#21217= IFCCARTESIANPOINT((0.,0.,0.));
+#21219= IFCDIRECTION((1.,0.,0.));
+#21221= IFCDIRECTION((0.,1.,0.));
+#21223= IFCDIRECTION((0.,0.,1.));
+#21225= IFCMAPPEDITEM(#21212,#21226);
+#21226= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#21229,#21231,#21227,$,
+#21233);
+#21227= IFCCARTESIANPOINT((0.,0.,150.));
+#21229= IFCDIRECTION((1.,0.,0.));
+#21231= IFCDIRECTION((0.,1.,0.));
+#21233= IFCDIRECTION((0.,0.,1.));
+#21235= IFCMAPPEDITEM(#21212,#21236);
+#21236= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#21239,#21241,#21237,$,
+#21243);
+#21237= IFCCARTESIANPOINT((0.,0.,300.));
+#21239= IFCDIRECTION((1.,0.,0.));
+#21241= IFCDIRECTION((0.,1.,0.));
+#21243= IFCDIRECTION((0.,0.,1.));
+#21245= IFCMAPPEDITEM(#21212,#21246);
+#21246= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#21249,#21251,#21247,$,
+#21253);
+#21247= IFCCARTESIANPOINT((0.,0.,450.));
+#21249= IFCDIRECTION((1.,0.,0.));
+#21251= IFCDIRECTION((0.,1.,0.));
+#21253= IFCDIRECTION((0.,0.,1.));
+#21255= IFCMAPPEDITEM(#21212,#21256);
+#21256= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#21259,#21261,#21257,$,
+#21263);
+#21257= IFCCARTESIANPOINT((0.,0.,600.));
+#21259= IFCDIRECTION((1.,0.,0.));
+#21261= IFCDIRECTION((0.,1.,0.));
+#21263= IFCDIRECTION((0.,0.,1.));
+#21265= IFCMAPPEDITEM(#21212,#21266);
+#21266= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#21269,#21271,#21267,$,
+#21273);
+#21267= IFCCARTESIANPOINT((-1859.945032248106,0.,0.));
+#21269= IFCDIRECTION((-1.,3.798227098303920E-65,1.224646799147353E-16));
+#21271= IFCDIRECTION((3.798227098303920E-65,1.,6.842277657836021E-49));
+#21273= IFCDIRECTION((1.224646799147353E-16,6.842277657836022E-49,1.));
+#21275= IFCMAPPEDITEM(#21212,#21276);
+#21276= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#21279,#21281,#21277,$,
+#21283);
+#21277= IFCCARTESIANPOINT((-1859.945032248106,0.,150.));
+#21279= IFCDIRECTION((-1.,3.798227098303920E-65,1.224646799147353E-16));
+#21281= IFCDIRECTION((3.798227098303920E-65,1.,6.842277657836021E-49));
+#21283= IFCDIRECTION((1.224646799147353E-16,6.842277657836022E-49,1.));
+#21285= IFCMAPPEDITEM(#21212,#21286);
+#21286= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#21289,#21291,#21287,$,
+#21293);
+#21287= IFCCARTESIANPOINT((-1859.945032248106,0.,300.));
+#21289= IFCDIRECTION((-1.,3.798227098303920E-65,1.224646799147353E-16));
+#21291= IFCDIRECTION((3.798227098303920E-65,1.,6.842277657836021E-49));
+#21293= IFCDIRECTION((1.224646799147353E-16,6.842277657836022E-49,1.));
+#21295= IFCMAPPEDITEM(#21212,#21296);
+#21296= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#21299,#21301,#21297,$,
+#21303);
+#21297= IFCCARTESIANPOINT((-1859.945032248106,0.,450.));
+#21299= IFCDIRECTION((-1.,3.798227098303920E-65,1.224646799147353E-16));
+#21301= IFCDIRECTION((3.798227098303920E-65,1.,6.842277657836021E-49));
+#21303= IFCDIRECTION((1.224646799147353E-16,6.842277657836022E-49,1.));
+#21305= IFCMAPPEDITEM(#21212,#21306);
+#21306= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#21309,#21311,#21307,$,
+#21313);
+#21307= IFCCARTESIANPOINT((-1859.945032248106,0.,600.));
+#21309= IFCDIRECTION((-1.,3.798227098303920E-65,1.224646799147353E-16));
+#21311= IFCDIRECTION((3.798227098303920E-65,1.,6.842277657836021E-49));
+#21313= IFCDIRECTION((1.224646799147353E-16,6.842277657836022E-49,1.));
+#21317= IFCRELASSOCIATESMATERIAL('0dHrPaXrLFFhMCW3iWjZgu',#4,$,$,(#21320
+),#21318);
+#21318= IFCMATERIAL('B500B');
+#21320= IFCREINFORCINGBAR('3kDpGJctLETATV79Y01enX',#4,' ',$,$,#21127,
+#21128,$,$,10.,0.785,$,.NOTDEFINED.,$);
+#21324= IFCPROPERTYSINGLEVALUE('Bending diameter',$,IFCREAL(30.),$);
+#21325= IFCPROPERTYSINGLEVALUE('Shape code',$,IFCTEXT('X1  '),$);
+#21326= IFCPROPERTYSINGLEVALUE('Weight per meter',$,IFCREAL(0.617),$);
+#21327= IFCPROPERTYSINGLEVALUE('Creation flags',$,IFCINTEGER(41),$);
+#21328= IFCPROPERTYSINGLEVALUE('Count of bars/meshes',$,IFCINTEGER(10),$
+);
+#21329= IFCPROPERTYSET('1QL41g7tLFe8pZXl7lRsYZ',#4,
+'Allplan_ReinforcingBar',$,(#21324,#21325,#21326,#21327,#21328));
+#21331= IFCRELDEFINESBYPROPERTIES('1_cHide5P3oQ$ngzckdXuG',#4,$,$,(
+#21320),#21329);
+#21335= IFCAXIS2PLACEMENT3D(#21336,#21338,#21340);
+#21336= IFCCARTESIANPOINT((31604.99999999999,23925.00000000001,
+70.00000019744039));
+#21338= IFCDIRECTION((0.,0.,1.));
+#21340= IFCDIRECTION((1.,0.,0.));
+#21342= IFCLOCALPLACEMENT(#71,#21335);
+#21343= IFCPRODUCTDEFINITIONSHAPE($,$,(#21425));
+#21344= IFCSHAPEREPRESENTATION(#34,'Body','AdvancedSweptSolid',(#21346)
+);
+#21346= IFCSWEPTDISKSOLID(#21347,5.,$,0.,1.);
+#21347= IFCPOLYLINE((#21349,#21351,#21353,#21355,#21357,#21359,#21361,
+#21363,#21365,#21367,#21369,#21371,#21373,#21375,#21377,#21379,#21381,
+#21383,#21385,#21387,#21389,#21391,#21393,#21395,#21397,#21399,#21401,
+#21403,#21405,#21407,#21409,#21411,#21413,#21415,#21417,#21419,#21421,
+#21423));
+#21349= IFCCARTESIANPOINT((0.,0.,0.));
+#21351= IFCCARTESIANPOINT((461.5252254980842,-3.637978807091713E-12,
+2.273736754432321E-13));
+#21353= IFCCARTESIANPOINT((467.7202674075561,0.8620816223956354,
+3.095010470133275E-9));
+#21355= IFCCARTESIANPOINT((474.0948060241099,2.96351387647519,
+1.063858690031339E-8));
+#21357= IFCCARTESIANPOINT((479.950992212307,6.243124131007789,
+2.241176844108850E-8));
+#21359= IFCCARTESIANPOINT((484.7487373415279,10.25126265846848,
+3.680020199681167E-8));
+#21361= IFCCARTESIANPOINT((488.7568758689886,15.04900778768933,
+5.402307579061016E-8));
+#21363= IFCCARTESIANPOINT((492.0364861235248,20.90519397588651,
+7.504559107474051E-8));
+#21365= IFCCARTESIANPOINT((494.1379183776044,27.27973259244027,
+9.792870514502283E-8));
+#21367= IFCCARTESIANPOINT((495.,33.47477450191218,1.201676695927745E-7)
+);
+#21369= IFCCARTESIANPOINT((495.0000000000036,106.5252254980842,
+3.824031864496646E-7));
+#21371= IFCCARTESIANPOINT((494.137918377608,112.7202674075561,
+4.046421508974163E-7));
+#21373= IFCCARTESIANPOINT((492.0364861235285,119.0948060241099,
+4.275252649676986E-7));
+#21375= IFCCARTESIANPOINT((488.7568758689922,124.950992212307,
+4.485477802518290E-7));
+#21377= IFCCARTESIANPOINT((484.7487373415315,129.7487373415279,
+4.657706540456275E-7));
+#21379= IFCCARTESIANPOINT((479.9509922123107,133.7568758689886,
+4.801590876013506E-7));
+#21381= IFCCARTESIANPOINT((474.0948060241135,137.0364861235212,
+4.919322691421257E-7));
+#21383= IFCCARTESIANPOINT((467.7202674075597,139.1379183776007,
+4.994760729459813E-7));
+#21385= IFCCARTESIANPOINT((461.5252254980878,140.,5.025706286687637E-7)
+);
+#21387= IFCCARTESIANPOINT((-1611.525225498084,139.9999999999964,
+5.025710834161146E-7));
+#21389= IFCCARTESIANPOINT((-1617.720267407556,139.1379183775971,
+4.994763003196567E-7));
+#21391= IFCCARTESIANPOINT((-1624.09480602411,137.0364861235212,
+4.919327238894766E-7));
+#21393= IFCCARTESIANPOINT((-1629.950992212307,133.7568758689849,
+4.801595423487015E-7));
+#21395= IFCCARTESIANPOINT((-1634.748737341528,129.7487373415243,
+4.657711087929783E-7));
+#21397= IFCCARTESIANPOINT((-1638.756875868989,124.9509922123034,
+4.485482349991798E-7));
+#21399= IFCCARTESIANPOINT((-1642.036486123525,119.0948060241062,
+4.275257197150495E-7));
+#21401= IFCCARTESIANPOINT((-1644.137918377601,112.7202674075525,
+4.046426056447672E-7));
+#21403= IFCCARTESIANPOINT((-1645.,106.5252254980805,3.824036411970155E-7
+));
+#21405= IFCCARTESIANPOINT((-1645.,33.47477450191218,1.201674422190990E-7
+));
+#21407= IFCCARTESIANPOINT((-1644.137918377601,27.27973259244027,
+9.792847777134739E-8));
+#21409= IFCCARTESIANPOINT((-1642.036486123525,20.90519397588651,
+7.504536370106507E-8));
+#21411= IFCCARTESIANPOINT((-1638.756875868989,15.04900778768933,
+5.402284841693472E-8));
+#21413= IFCCARTESIANPOINT((-1634.748737341528,10.25126265846848,
+3.679997462313622E-8));
+#21415= IFCCARTESIANPOINT((-1629.950992212307,6.243124131007789,
+2.241154106741305E-8));
+#21417= IFCCARTESIANPOINT((-1624.09480602411,2.963513876471552,
+1.063835952663794E-8));
+#21419= IFCCARTESIANPOINT((-1617.720267407556,0.8620816223956354,
+3.094783096457832E-9));
+#21421= IFCCARTESIANPOINT((-1611.525225498084,-3.637978807091713E-12,0.)
+);
+#21423= IFCCARTESIANPOINT((-1150.,-7.275957614183426E-12,0.));
+#21425= IFCSHAPEREPRESENTATION(#34,'Body','MappedRepresentation',(#21429
+,#21440,#21450,#21460,#21470,#21480,#21490,#21500,#21510,#21520));
+#21427= IFCREPRESENTATIONMAP(#1,#21344);
+#21429= IFCMAPPEDITEM(#21427,#21431);
+#21431= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#21434,#21436,#21432,$,
+#21438);
+#21432= IFCCARTESIANPOINT((0.,0.,0.));
+#21434= IFCDIRECTION((1.,0.,0.));
+#21436= IFCDIRECTION((0.,1.,0.));
+#21438= IFCDIRECTION((0.,0.,1.));
+#21440= IFCMAPPEDITEM(#21427,#21441);
+#21441= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#21444,#21446,#21442,$,
+#21448);
+#21442= IFCCARTESIANPOINT((0.,0.,150.));
+#21444= IFCDIRECTION((1.,0.,0.));
+#21446= IFCDIRECTION((0.,1.,0.));
+#21448= IFCDIRECTION((0.,0.,1.));
+#21450= IFCMAPPEDITEM(#21427,#21451);
+#21451= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#21454,#21456,#21452,$,
+#21458);
+#21452= IFCCARTESIANPOINT((0.,0.,300.));
+#21454= IFCDIRECTION((1.,0.,0.));
+#21456= IFCDIRECTION((0.,1.,0.));
+#21458= IFCDIRECTION((0.,0.,1.));
+#21460= IFCMAPPEDITEM(#21427,#21461);
+#21461= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#21464,#21466,#21462,$,
+#21468);
+#21462= IFCCARTESIANPOINT((0.,0.,450.));
+#21464= IFCDIRECTION((1.,0.,0.));
+#21466= IFCDIRECTION((0.,1.,0.));
+#21468= IFCDIRECTION((0.,0.,1.));
+#21470= IFCMAPPEDITEM(#21427,#21471);
+#21471= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#21474,#21476,#21472,$,
+#21478);
+#21472= IFCCARTESIANPOINT((0.,0.,600.));
+#21474= IFCDIRECTION((1.,0.,0.));
+#21476= IFCDIRECTION((0.,1.,0.));
+#21478= IFCDIRECTION((0.,0.,1.));
+#21480= IFCMAPPEDITEM(#21427,#21481);
+#21481= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#21484,#21486,#21482,$,
+#21488);
+#21482= IFCCARTESIANPOINT((0.,-1710.000000000022,0.));
+#21484= IFCDIRECTION((1.,4.591690043316935E-49,0.));
+#21486= IFCDIRECTION((4.591690043316935E-49,-1.,0.));
+#21488= IFCDIRECTION((0.,0.,1.));
+#21490= IFCMAPPEDITEM(#21427,#21491);
+#21491= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#21494,#21496,#21492,$,
+#21498);
+#21492= IFCCARTESIANPOINT((0.,-1710.000000000022,150.));
+#21494= IFCDIRECTION((1.,4.591690043316935E-49,0.));
+#21496= IFCDIRECTION((4.591690043316935E-49,-1.,0.));
+#21498= IFCDIRECTION((0.,0.,1.));
+#21500= IFCMAPPEDITEM(#21427,#21501);
+#21501= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#21504,#21506,#21502,$,
+#21508);
+#21502= IFCCARTESIANPOINT((0.,-1710.000000000022,300.));
+#21504= IFCDIRECTION((1.,4.591690043316935E-49,0.));
+#21506= IFCDIRECTION((4.591690043316935E-49,-1.,0.));
+#21508= IFCDIRECTION((0.,0.,1.));
+#21510= IFCMAPPEDITEM(#21427,#21511);
+#21511= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#21514,#21516,#21512,$,
+#21518);
+#21512= IFCCARTESIANPOINT((0.,-1710.000000000022,450.));
+#21514= IFCDIRECTION((1.,4.591690043316935E-49,0.));
+#21516= IFCDIRECTION((4.591690043316935E-49,-1.,0.));
+#21518= IFCDIRECTION((0.,0.,1.));
+#21520= IFCMAPPEDITEM(#21427,#21521);
+#21521= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#21524,#21526,#21522,$,
+#21528);
+#21522= IFCCARTESIANPOINT((0.,-1710.000000000022,600.));
+#21524= IFCDIRECTION((1.,4.591690043316935E-49,0.));
+#21526= IFCDIRECTION((4.591690043316935E-49,-1.,0.));
+#21528= IFCDIRECTION((0.,0.,1.));
+#21532= IFCRELASSOCIATESMATERIAL('2gnfvgleX8KBErq7_YtRvn',#4,$,$,(#21535
+),#21533);
+#21533= IFCMATERIAL('B500B');
+#21535= IFCREINFORCINGBAR('12vJB80ST40PDwpXw9CN$x',#4,' ',$,$,#21342,
+#21343,$,$,10.,0.785,$,.NOTDEFINED.,$);
+#21539= IFCPROPERTYSINGLEVALUE('Bending diameter',$,IFCREAL(30.),$);
+#21540= IFCPROPERTYSINGLEVALUE('Shape code',$,IFCTEXT('X1  '),$);
+#21541= IFCPROPERTYSINGLEVALUE('Weight per meter',$,IFCREAL(0.617),$);
+#21542= IFCPROPERTYSINGLEVALUE('Creation flags',$,IFCINTEGER(41),$);
+#21543= IFCPROPERTYSINGLEVALUE('Count of bars/meshes',$,IFCINTEGER(10),$
+);
+#21544= IFCPROPERTYSET('2gCnUOGfTEeQr9q7RotsCu',#4,
+'Allplan_ReinforcingBar',$,(#21539,#21540,#21541,#21542,#21543));
+#21546= IFCRELDEFINESBYPROPERTIES('1isjPyZRzFE82QrW0_xCkU',#4,$,$,(
+#21535),#21544);
+#21550= IFCAXIS2PLACEMENT3D(#21551,#21553,#21555);
+#21551= IFCCARTESIANPOINT((29954.99999999999,23924.99999999999,
+669.9999996051283));
+#21553= IFCDIRECTION((0.,0.,1.));
+#21555= IFCDIRECTION((1.,0.,0.));
+#21557= IFCLOCALPLACEMENT(#71,#21550);
+#21558= IFCPRODUCTDEFINITIONSHAPE($,$,(#21568));
+#21559= IFCSHAPEREPRESENTATION(#34,'Body','AdvancedSweptSolid',(#21561)
+);
+#21561= IFCSWEPTDISKSOLID(#21562,5.,$,0.,1.);
+#21562= IFCPOLYLINE((#21564,#21566));
+#21564= IFCCARTESIANPOINT((0.,0.,0.));
+#21566= IFCCARTESIANPOINT((2150.,0.,-3.637978807091713E-12));
+#21568= IFCSHAPEREPRESENTATION(#34,'Body','MappedRepresentation',(#21572
+,#21583,#21593,#21603,#21613,#21623,#21633,#21643,#21653,#21663));
+#21570= IFCREPRESENTATIONMAP(#1,#21559);
+#21572= IFCMAPPEDITEM(#21570,#21574);
+#21574= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#21577,#21579,#21575,$,
+#21581);
+#21575= IFCCARTESIANPOINT((0.,0.,0.));
+#21577= IFCDIRECTION((1.,0.,0.));
+#21579= IFCDIRECTION((0.,1.,0.));
+#21581= IFCDIRECTION((0.,0.,1.));
+#21583= IFCMAPPEDITEM(#21570,#21584);
+#21584= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#21587,#21589,#21585,$,
+#21591);
+#21585= IFCCARTESIANPOINT((0.,0.,-150.));
+#21587= IFCDIRECTION((1.,0.,0.));
+#21589= IFCDIRECTION((0.,1.,0.));
+#21591= IFCDIRECTION((0.,0.,1.));
+#21593= IFCMAPPEDITEM(#21570,#21594);
+#21594= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#21597,#21599,#21595,$,
+#21601);
+#21595= IFCCARTESIANPOINT((0.,0.,-300.));
+#21597= IFCDIRECTION((1.,0.,0.));
+#21599= IFCDIRECTION((0.,1.,0.));
+#21601= IFCDIRECTION((0.,0.,1.));
+#21603= IFCMAPPEDITEM(#21570,#21604);
+#21604= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#21607,#21609,#21605,$,
+#21611);
+#21605= IFCCARTESIANPOINT((0.,0.,-450.));
+#21607= IFCDIRECTION((1.,0.,0.));
+#21609= IFCDIRECTION((0.,1.,0.));
+#21611= IFCDIRECTION((0.,0.,1.));
+#21613= IFCMAPPEDITEM(#21570,#21614);
+#21614= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#21617,#21619,#21615,$,
+#21621);
+#21615= IFCCARTESIANPOINT((0.,0.,-600.));
+#21617= IFCDIRECTION((1.,0.,0.));
+#21619= IFCDIRECTION((0.,1.,0.));
+#21621= IFCDIRECTION((0.,0.,1.));
+#21623= IFCMAPPEDITEM(#21570,#21624);
+#21624= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#21627,#21629,#21625,$,
+#21631);
+#21625= IFCCARTESIANPOINT((0.,-1710.000000000004,-599.9999994076879));
+#21627= IFCDIRECTION((1.,0.,0.));
+#21629= IFCDIRECTION((0.,0.,1.));
+#21631= IFCDIRECTION((0.,-1.,0.));
+#21633= IFCMAPPEDITEM(#21570,#21634);
+#21634= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#21637,#21639,#21635,$,
+#21641);
+#21635= IFCCARTESIANPOINT((0.,-1710.000000000004,-449.9999994076879));
+#21637= IFCDIRECTION((1.,0.,0.));
+#21639= IFCDIRECTION((0.,0.,1.));
+#21641= IFCDIRECTION((0.,-1.,0.));
+#21643= IFCMAPPEDITEM(#21570,#21644);
+#21644= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#21647,#21649,#21645,$,
+#21651);
+#21645= IFCCARTESIANPOINT((0.,-1710.000000000004,-299.9999994076879));
+#21647= IFCDIRECTION((1.,0.,0.));
+#21649= IFCDIRECTION((0.,0.,1.));
+#21651= IFCDIRECTION((0.,-1.,0.));
+#21653= IFCMAPPEDITEM(#21570,#21654);
+#21654= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#21657,#21659,#21655,$,
+#21661);
+#21655= IFCCARTESIANPOINT((0.,-1710.000000000004,-149.9999994076879));
+#21657= IFCDIRECTION((1.,0.,0.));
+#21659= IFCDIRECTION((0.,0.,1.));
+#21661= IFCDIRECTION((0.,-1.,0.));
+#21663= IFCMAPPEDITEM(#21570,#21664);
+#21664= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#21667,#21669,#21665,$,
+#21671);
+#21665= IFCCARTESIANPOINT((0.,-1710.000000000004,5.923120625084266E-7));
+#21667= IFCDIRECTION((1.,0.,0.));
+#21669= IFCDIRECTION((0.,0.,1.));
+#21671= IFCDIRECTION((0.,-1.,0.));
+#21675= IFCRELASSOCIATESMATERIAL('0a3WTSOkD4shJqJyNMur0n',#4,$,$,(#21678
+),#21676);
+#21676= IFCMATERIAL('B500B');
+#21678= IFCREINFORCINGBAR('0O3pHjMlH1nfCh_mBwyrBp',#4,' ',$,$,#21557,
+#21558,$,$,10.,0.785,$,.NOTDEFINED.,$);
+#21682= IFCPROPERTYSINGLEVALUE('Bending diameter',$,IFCREAL(30.),$);
+#21683= IFCPROPERTYSINGLEVALUE('Shape code',$,IFCTEXT('X1  '),$);
+#21684= IFCPROPERTYSINGLEVALUE('Weight per meter',$,IFCREAL(0.617),$);
+#21685= IFCPROPERTYSINGLEVALUE('Creation flags',$,IFCINTEGER(41),$);
+#21686= IFCPROPERTYSINGLEVALUE('Count of bars/meshes',$,IFCINTEGER(10),$
+);
+#21687= IFCPROPERTYSET('0b6ZyhXCzAsBsp$XU4ym7u',#4,
+'Allplan_ReinforcingBar',$,(#21682,#21683,#21684,#21685,#21686));
+#21689= IFCRELDEFINESBYPROPERTIES('3N65uUViz5MOd0E8NvhJ0J',#4,$,$,(
+#21678),#21687);
+#21693= IFCAXIS2PLACEMENT3D(#21694,#21696,#21698);
+#21694= IFCCARTESIANPOINT((29980.00000022435,22145.,820.8207377754645));
+#21696= IFCDIRECTION((0.,0.,1.));
+#21698= IFCDIRECTION((1.,0.,0.));
+#21700= IFCLOCALPLACEMENT(#71,#21693);
+#21701= IFCPRODUCTDEFINITIONSHAPE($,$,(#21819));
+#21702= IFCSHAPEREPRESENTATION(#34,'Body','AdvancedSweptSolid',(#21704)
+);
+#21704= IFCSWEPTDISKSOLID(#21705,6.,$,0.,1.);
+#21705= IFCPOLYLINE((#21707,#21709,#21711,#21713,#21715,#21717,#21719,
+#21721,#21723,#21725,#21727,#21729,#21731,#21733,#21735,#21737,#21739,
+#21741,#21743,#21745,#21747,#21749,#21751,#21753,#21755,#21757,#21759,
+#21761,#21763,#21765,#21767,#21769,#21771,#21773,#21775,#21777,#21779,
+#21781,#21783,#21785,#21787,#21789,#21791,#21793,#21795,#21797,#21799,
+#21801,#21803,#21805,#21807,#21809,#21811,#21813,#21815,#21817));
+#21707= IFCCARTESIANPOINT((0.,0.,0.));
+#21709= IFCCARTESIANPOINT((0.,0.,61.83027059770188));
+#21711= IFCCARTESIANPOINT((-1.855369191616774E-9,-1.03449794687549,
+69.26432088906745));
+#21713= IFCCARTESIANPOINT((-6.381014827638865E-9,-3.556216651773866,
+76.91376722893415));
+#21715= IFCCARTESIANPOINT((-1.344596967101097E-8,-7.491748957210803,
+83.94119065477003));
+#21717= IFCCARTESIANPOINT((-2.207889338023961E-8,-12.30151519016363,
+89.69848480983433));
+#21719= IFCCARTESIANPOINT((-3.241439117118716E-8,-18.05880934523157,
+94.50825104278715));
+#21721= IFCCARTESIANPOINT((-4.502726369537413E-8,-25.08623277106744,
+98.44378334822773));
+#21723= IFCCARTESIANPOINT((-5.875699571333826E-8,-32.73567911093414,
+100.9655020531261));
+#21725= IFCCARTESIANPOINT((-7.210110197775066E-8,-40.16972940229971,
+102.0000000000016));
+#21727= IFCCARTESIANPOINT((-7.867129170335829E-8,-43.83027059770029,
+102.0000000000016));
+#21729= IFCCARTESIANPOINT((-9.201175998896360E-8,-51.26432088906586,
+100.9655020531261));
+#21731= IFCCARTESIANPOINT((-1.057451299857348E-7,-58.91376722893256,
+98.44378334822773));
+#21733= IFCCARTESIANPOINT((-1.183580025099218E-7,-65.94119065476843,
+94.50825104279079));
+#21735= IFCCARTESIANPOINT((-1.286898623220623E-7,-71.69848480983637,
+89.69848480983796));
+#21737= IFCCARTESIANPOINT((-1.373227860312909E-7,-76.5082510427892,
+83.94119065477003));
+#21739= IFCCARTESIANPOINT((-1.443877408746630E-7,-80.44378334822613,
+76.91376722893415));
+#21741= IFCCARTESIANPOINT((-1.489133865106851E-7,-82.96550205312451,
+69.26432088906745));
+#21743= IFCCARTESIANPOINT((-1.507723936811090E-7,-84.,61.83027059770188)
+);
+#21745= IFCCARTESIANPOINT((-1.507687557023019E-7,-84.,-985.8302705976987
+));
+#21747= IFCCARTESIANPOINT((-1.489133865106851E-7,-82.96550205312451,
+-993.2643208890643));
+#21749= IFCCARTESIANPOINT((-1.443877408746630E-7,-80.44378334822613,
+-1000.913767228931));
+#21751= IFCCARTESIANPOINT((-1.373227860312909E-7,-76.5082510427892,
+-1007.941190654767));
+#21753= IFCCARTESIANPOINT((-1.286898623220623E-7,-71.69848480983637,
+-1013.698484809835));
+#21755= IFCCARTESIANPOINT((-1.183580025099218E-7,-65.94119065476843,
+-1018.508251042788));
+#21757= IFCCARTESIANPOINT((-1.057414920069277E-7,-58.91376722893256,
+-1022.443783348225));
+#21759= IFCCARTESIANPOINT((-9.201175998896360E-8,-51.26432088906586,
+-1024.965502053123));
+#21761= IFCCARTESIANPOINT((-7.866765372455120E-8,-43.83027059770029,
+-1025.999999999998));
+#21763= IFCCARTESIANPOINT((3.399229171918705E-6,1893.830270597697,
+-1025.999999999998));
+#21765= IFCCARTESIANPOINT((3.412573278183118E-6,1901.264320889062,
+-1024.965502053123));
+#21767= IFCCARTESIANPOINT((3.426303010201082E-6,1908.913767228929,
+-1022.443783348225));
+#21769= IFCCARTESIANPOINT((3.438915882725269E-6,1915.941190654765,
+-1018.508251042788));
+#21771= IFCCARTESIANPOINT((3.449251380516216E-6,1921.698484809833,
+-1013.698484809835));
+#21773= IFCCARTESIANPOINT((3.457884304225445E-6,1926.508251042786,
+-1007.941190654767));
+#21775= IFCCARTESIANPOINT((3.464945621090010E-6,1930.443783348223,
+-1000.913767228931));
+#21777= IFCCARTESIANPOINT((3.469474904704839E-6,1932.965502053121,
+-993.2643208890643));
+#21779= IFCCARTESIANPOINT((3.471330273896456E-6,1933.999999999996,
+-985.8302705976987));
+#21781= IFCCARTESIANPOINT((3.471330273896456E-6,1933.999999999996,
+821.8302705977019));
+#21783= IFCCARTESIANPOINT((3.469474904704839E-6,1932.965502053121,
+829.2643208890675));
+#21785= IFCCARTESIANPOINT((3.464949259068817E-6,1930.443783348223,
+836.9137672289342));
+#21787= IFCCARTESIANPOINT((3.457884304225445E-6,1926.508251042786,
+843.94119065477));
+#21789= IFCCARTESIANPOINT((3.449251380516216E-6,1921.698484809833,
+849.698484809838));
+#21791= IFCCARTESIANPOINT((3.438919520704076E-6,1915.941190654765,
+854.5082510427908));
+#21793= IFCCARTESIANPOINT((3.426303010201082E-6,1908.913767228929,
+858.4437833482277));
+#21795= IFCCARTESIANPOINT((3.412573278183118E-6,1901.264320889062,
+860.9655020531261));
+#21797= IFCCARTESIANPOINT((3.399232809897512E-6,1893.830270597697,
+862.0000000000016));
+#21799= IFCCARTESIANPOINT((3.392658982193098E-6,1890.1697294023,
+862.0000000000016));
+#21801= IFCCARTESIANPOINT((3.379318513907492E-6,1882.735679110934,
+860.9655020531261));
+#21803= IFCCARTESIANPOINT((3.365585143910721E-6,1875.086232771067,
+858.4437833482277));
+#21805= IFCCARTESIANPOINT((3.352972271386534E-6,1868.058809345232,
+854.5082510427908));
+#21807= IFCCARTESIANPOINT((3.342640411574394E-6,1862.301515190164,
+849.698484809838));
+#21809= IFCCARTESIANPOINT((3.334007487865165E-6,1857.491748957211,
+843.94119065477));
+#21811= IFCCARTESIANPOINT((3.326942533021793E-6,1853.556216651774,
+836.9137672289342));
+#21813= IFCCARTESIANPOINT((3.322416887385771E-6,1851.034497946876,
+829.2643208890675));
+#21815= IFCCARTESIANPOINT((3.320557880215347E-6,1850.,821.8302705977019)
+);
+#21817= IFCCARTESIANPOINT((3.320557880215347E-6,1850.,760.));
+#21819= IFCSHAPEREPRESENTATION(#34,'Body','MappedRepresentation',(#21823
+,#21834,#21844,#21854,#21864,#21874,#21884,#21894,#21904,#21914,#21924,
+#21934,#21944,#21954,#21964));
+#21821= IFCREPRESENTATIONMAP(#1,#21702);
+#21823= IFCMAPPEDITEM(#21821,#21825);
+#21825= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#21828,#21830,#21826,$,
+#21832);
+#21826= IFCCARTESIANPOINT((0.,0.,0.));
+#21828= IFCDIRECTION((1.,0.,0.));
+#21830= IFCDIRECTION((0.,1.,0.));
+#21832= IFCDIRECTION((0.,0.,1.));
+#21834= IFCMAPPEDITEM(#21821,#21835);
+#21835= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#21838,#21840,#21836,$,
+#21842);
+#21836= IFCCARTESIANPOINT((150.,0.,0.));
+#21838= IFCDIRECTION((1.,0.,0.));
+#21840= IFCDIRECTION((0.,1.,0.));
+#21842= IFCDIRECTION((0.,0.,1.));
+#21844= IFCMAPPEDITEM(#21821,#21845);
+#21845= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#21848,#21850,#21846,$,
+#21852);
+#21846= IFCCARTESIANPOINT((300.,0.,0.));
+#21848= IFCDIRECTION((1.,0.,0.));
+#21850= IFCDIRECTION((0.,1.,0.));
+#21852= IFCDIRECTION((0.,0.,1.));
+#21854= IFCMAPPEDITEM(#21821,#21855);
+#21855= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#21858,#21860,#21856,$,
+#21862);
+#21856= IFCCARTESIANPOINT((450.,0.,0.));
+#21858= IFCDIRECTION((1.,0.,0.));
+#21860= IFCDIRECTION((0.,1.,0.));
+#21862= IFCDIRECTION((0.,0.,1.));
+#21864= IFCMAPPEDITEM(#21821,#21865);
+#21865= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#21868,#21870,#21866,$,
+#21872);
+#21866= IFCCARTESIANPOINT((600.,0.,0.));
+#21868= IFCDIRECTION((1.,0.,0.));
+#21870= IFCDIRECTION((0.,1.,0.));
+#21872= IFCDIRECTION((0.,0.,1.));
+#21874= IFCMAPPEDITEM(#21821,#21875);
+#21875= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#21878,#21880,#21876,$,
+#21882);
+#21876= IFCCARTESIANPOINT((750.,0.,0.));
+#21878= IFCDIRECTION((1.,0.,0.));
+#21880= IFCDIRECTION((0.,1.,0.));
+#21882= IFCDIRECTION((0.,0.,1.));
+#21884= IFCMAPPEDITEM(#21821,#21885);
+#21885= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#21888,#21890,#21886,$,
+#21892);
+#21886= IFCCARTESIANPOINT((900.,0.,0.));
+#21888= IFCDIRECTION((1.,0.,0.));
+#21890= IFCDIRECTION((0.,1.,0.));
+#21892= IFCDIRECTION((0.,0.,1.));
+#21894= IFCMAPPEDITEM(#21821,#21895);
+#21895= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#21898,#21900,#21896,$,
+#21902);
+#21896= IFCCARTESIANPOINT((1050.,0.,0.));
+#21898= IFCDIRECTION((1.,0.,0.));
+#21900= IFCDIRECTION((0.,1.,0.));
+#21902= IFCDIRECTION((0.,0.,1.));
+#21904= IFCMAPPEDITEM(#21821,#21905);
+#21905= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#21908,#21910,#21906,$,
+#21912);
+#21906= IFCCARTESIANPOINT((1200.,0.,0.));
+#21908= IFCDIRECTION((1.,0.,0.));
+#21910= IFCDIRECTION((0.,1.,0.));
+#21912= IFCDIRECTION((0.,0.,1.));
+#21914= IFCMAPPEDITEM(#21821,#21915);
+#21915= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#21918,#21920,#21916,$,
+#21922);
+#21916= IFCCARTESIANPOINT((1350.,0.,0.));
+#21918= IFCDIRECTION((1.,0.,0.));
+#21920= IFCDIRECTION((0.,1.,0.));
+#21922= IFCDIRECTION((0.,0.,1.));
+#21924= IFCMAPPEDITEM(#21821,#21925);
+#21925= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#21928,#21930,#21926,$,
+#21932);
+#21926= IFCCARTESIANPOINT((1500.,0.,0.));
+#21928= IFCDIRECTION((1.,0.,0.));
+#21930= IFCDIRECTION((0.,1.,0.));
+#21932= IFCDIRECTION((0.,0.,1.));
+#21934= IFCMAPPEDITEM(#21821,#21935);
+#21935= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#21938,#21940,#21936,$,
+#21942);
+#21936= IFCCARTESIANPOINT((1650.,0.,0.));
+#21938= IFCDIRECTION((1.,0.,0.));
+#21940= IFCDIRECTION((0.,1.,0.));
+#21942= IFCDIRECTION((0.,0.,1.));
+#21944= IFCMAPPEDITEM(#21821,#21945);
+#21945= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#21948,#21950,#21946,$,
+#21952);
+#21946= IFCCARTESIANPOINT((1800.,0.,0.));
+#21948= IFCDIRECTION((1.,0.,0.));
+#21950= IFCDIRECTION((0.,1.,0.));
+#21952= IFCDIRECTION((0.,0.,1.));
+#21954= IFCMAPPEDITEM(#21821,#21955);
+#21955= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#21958,#21960,#21956,$,
+#21962);
+#21956= IFCCARTESIANPOINT((1950.,0.,0.));
+#21958= IFCDIRECTION((1.,0.,0.));
+#21960= IFCDIRECTION((0.,1.,0.));
+#21962= IFCDIRECTION((0.,0.,1.));
+#21964= IFCMAPPEDITEM(#21821,#21965);
+#21965= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#21968,#21970,#21966,$,
+#21972);
+#21966= IFCCARTESIANPOINT((2100.,0.,0.));
+#21968= IFCDIRECTION((1.,0.,0.));
+#21970= IFCDIRECTION((0.,1.,0.));
+#21972= IFCDIRECTION((0.,0.,1.));
+#21976= IFCRELASSOCIATESMATERIAL('3iaJ3UM_P1EB9rkyDVzToQ',#4,$,$,(#21979
+),#21977);
+#21977= IFCMATERIAL('B500B');
+#21979= IFCREINFORCINGBAR('0C0yquPU1CZPlk7T1VOKtw',#4,' ',$,$,#21700,
+#21701,$,$,12.,1.131,$,.NOTDEFINED.,$);
+#21983= IFCPROPERTYSINGLEVALUE('Bending diameter',$,IFCREAL(36.),$);
+#21984= IFCPROPERTYSINGLEVALUE('Shape code',$,IFCTEXT('X1  '),$);
+#21985= IFCPROPERTYSINGLEVALUE('Hook angle - begin',$,IFCREAL(180.),$);
+#21986= IFCPROPERTYSINGLEVALUE('Hook length - begin',$,IFCREAL(60.),$);
+#21987= IFCPROPERTYSINGLEVALUE('Hook bending diameter - begin',$,IFCREAL
+(36.),$);
+#21988= IFCPROPERTYSINGLEVALUE('Hook angle - end',$,IFCREAL(180.),$);
+#21989= IFCPROPERTYSINGLEVALUE('Hook length - end',$,IFCREAL(60.),$);
+#21990= IFCPROPERTYSINGLEVALUE('Hook bending diameter - end',$,IFCREAL(
+36.),$);
+#21991= IFCPROPERTYSINGLEVALUE('Weight per meter',$,IFCREAL(0.888),$);
+#21992= IFCPROPERTYSINGLEVALUE('Creation flags',$,IFCINTEGER(41),$);
+#21993= IFCPROPERTYSINGLEVALUE('Count of bars/meshes',$,IFCINTEGER(15),$
+);
+#21994= IFCPROPERTYSET('0xv8Lz$njDNQzqt4EOlr2N',#4,
+'Allplan_ReinforcingBar',$,(#21983,#21984,#21985,#21986,#21987,#21988,
+#21989,#21990,#21991,#21992,#21993));
+#21996= IFCRELDEFINESBYPROPERTIES('3v_4$RftnEsOYcIMwt3x9q',#4,$,$,(
+#21979),#21994);
+#22000= IFCAXIS2PLACEMENT3D(#22001,#22003,#22005);
+#22001= IFCCARTESIANPOINT((30205.0000003859,24085.,-193.2889889844591));
+#22003= IFCDIRECTION((0.,0.,1.));
+#22005= IFCDIRECTION((1.,0.,0.));
+#22007= IFCLOCALPLACEMENT(#71,#22000);
+#22008= IFCPRODUCTDEFINITIONSHAPE($,$,(#22072));
+#22009= IFCSHAPEREPRESENTATION(#34,'Body','AdvancedSweptSolid',(#22011)
+);
+#22011= IFCSWEPTDISKSOLID(#22012,5.,$,0.,1.);
+#22012= IFCPOLYLINE((#22014,#22016,#22018,#22020,#22022,#22024,#22026,
+#22028,#22030,#22032,#22034,#22036,#22038,#22040,#22042,#22044,#22046,
+#22048,#22050,#22052,#22054,#22056,#22058,#22060,#22062,#22064,#22066,
+#22068,#22070));
+#22014= IFCCARTESIANPOINT((0.,0.,0.));
+#22016= IFCCARTESIANPOINT((-2.540255081839860E-7,-141.5252254980842,0.)
+);
+#22018= IFCCARTESIANPOINT((-2.651431714184582E-7,-147.7202674075561,
+0.8620816223992733));
+#22020= IFCCARTESIANPOINT((-2.765846147667617E-7,-154.0948060241099,
+2.96351387647519));
+#22022= IFCCARTESIANPOINT((-2.870983735192567E-7,-159.950992212307,
+6.243124131011427));
+#22024= IFCCARTESIANPOINT((-2.957094693556428E-7,-164.7487373415243,
+10.25126265847212));
+#22026= IFCCARTESIANPOINT((-3.029017534572631E-7,-168.7568758689849,
+15.04900778769297));
+#22028= IFCCARTESIANPOINT((-3.087880031671375E-7,-172.0364861235248,
+20.90519397589014));
+#22030= IFCCARTESIANPOINT((-3.125605871900916E-7,-174.1379183775971,
+27.27973259244391));
+#22032= IFCCARTESIANPOINT((-3.141067281831056E-7,-174.9999999999964,
+33.47477450191582));
+#22034= IFCCARTESIANPOINT((-3.141067281831056E-7,-175.,1756.525225498084
+));
+#22036= IFCCARTESIANPOINT((-3.125605871900916E-7,-174.1379183776007,
+1762.720267407556));
+#22038= IFCCARTESIANPOINT((-3.087880031671375E-7,-172.0364861235248,
+1769.09480602411));
+#22040= IFCCARTESIANPOINT((-3.029017534572631E-7,-168.7568758689886,
+1774.950992212307));
+#22042= IFCCARTESIANPOINT((-2.957058313768357E-7,-164.7487373415279,
+1779.748737341528));
+#22044= IFCCARTESIANPOINT((-2.870947355404496E-7,-159.950992212307,
+1783.756875868989));
+#22046= IFCCARTESIANPOINT((-2.765846147667617E-7,-154.0948060241099,
+1787.036486123525));
+#22048= IFCCARTESIANPOINT((-2.651431714184582E-7,-147.7202674075561,
+1789.137918377601));
+#22050= IFCCARTESIANPOINT((-2.540255081839860E-7,-141.5252254980842,
+1790.));
+#22052= IFCCARTESIANPOINT((-2.485503500793129E-7,-138.4747745019195,
+1790.));
+#22054= IFCCARTESIANPOINT((-2.374290488660336E-7,-132.2797325924475,
+1789.137918377604));
+#22056= IFCCARTESIANPOINT((-2.259876055177301E-7,-125.9051939758938,
+1787.036486123525));
+#22058= IFCCARTESIANPOINT((-2.154774847440422E-7,-120.0490077876966,
+1783.756875868989));
+#22060= IFCCARTESIANPOINT((-2.068663889076561E-7,-115.2512626584758,
+1779.748737341528));
+#22062= IFCCARTESIANPOINT((-1.996704668272287E-7,-111.2431241310151,
+1774.950992212307));
+#22064= IFCCARTESIANPOINT((-1.937842171173543E-7,-107.9635138764825,
+1769.09480602411));
+#22066= IFCCARTESIANPOINT((-1.900116330944002E-7,-105.8620816224029,
+1762.720267407556));
+#22068= IFCCARTESIANPOINT((-1.884654921013862E-7,-105.0000000000036,
+1756.525225498084));
+#22070= IFCCARTESIANPOINT((-1.884654921013862E-7,-105.,1715.));
+#22072= IFCSHAPEREPRESENTATION(#34,'Body','MappedRepresentation',(#22076
+,#22087,#22097,#22107,#22117,#22127,#22137,#22147,#22157,#22167,#22177,
+#22187));
+#22074= IFCREPRESENTATIONMAP(#1,#22009);
+#22076= IFCMAPPEDITEM(#22074,#22078);
+#22078= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#22081,#22083,#22079,$,
+#22085);
+#22079= IFCCARTESIANPOINT((0.,0.,0.));
+#22081= IFCDIRECTION((1.,0.,0.));
+#22083= IFCDIRECTION((0.,1.,0.));
+#22085= IFCDIRECTION((0.,0.,1.));
+#22087= IFCMAPPEDITEM(#22074,#22088);
+#22088= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#22091,#22093,#22089,$,
+#22095);
+#22089= IFCCARTESIANPOINT((150.,0.,0.));
+#22091= IFCDIRECTION((1.,0.,0.));
+#22093= IFCDIRECTION((0.,1.,0.));
+#22095= IFCDIRECTION((0.,0.,1.));
+#22097= IFCMAPPEDITEM(#22074,#22098);
+#22098= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#22101,#22103,#22099,$,
+#22105);
+#22099= IFCCARTESIANPOINT((300.,0.,0.));
+#22101= IFCDIRECTION((1.,0.,0.));
+#22103= IFCDIRECTION((0.,1.,0.));
+#22105= IFCDIRECTION((0.,0.,1.));
+#22107= IFCMAPPEDITEM(#22074,#22108);
+#22108= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#22111,#22113,#22109,$,
+#22115);
+#22109= IFCCARTESIANPOINT((450.,0.,0.));
+#22111= IFCDIRECTION((1.,0.,0.));
+#22113= IFCDIRECTION((0.,1.,0.));
+#22115= IFCDIRECTION((0.,0.,1.));
+#22117= IFCMAPPEDITEM(#22074,#22118);
+#22118= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#22121,#22123,#22119,$,
+#22125);
+#22119= IFCCARTESIANPOINT((600.,0.,0.));
+#22121= IFCDIRECTION((1.,0.,0.));
+#22123= IFCDIRECTION((0.,1.,0.));
+#22125= IFCDIRECTION((0.,0.,1.));
+#22127= IFCMAPPEDITEM(#22074,#22128);
+#22128= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#22131,#22133,#22129,$,
+#22135);
+#22129= IFCCARTESIANPOINT((750.,0.,0.));
+#22131= IFCDIRECTION((1.,0.,0.));
+#22133= IFCDIRECTION((0.,1.,0.));
+#22135= IFCDIRECTION((0.,0.,1.));
+#22137= IFCMAPPEDITEM(#22074,#22138);
+#22138= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#22141,#22143,#22139,$,
+#22145);
+#22139= IFCCARTESIANPOINT((900.,0.,0.));
+#22141= IFCDIRECTION((1.,0.,0.));
+#22143= IFCDIRECTION((0.,1.,0.));
+#22145= IFCDIRECTION((0.,0.,1.));
+#22147= IFCMAPPEDITEM(#22074,#22148);
+#22148= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#22151,#22153,#22149,$,
+#22155);
+#22149= IFCCARTESIANPOINT((1050.,0.,0.));
+#22151= IFCDIRECTION((1.,0.,0.));
+#22153= IFCDIRECTION((0.,1.,0.));
+#22155= IFCDIRECTION((0.,0.,1.));
+#22157= IFCMAPPEDITEM(#22074,#22158);
+#22158= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#22161,#22163,#22159,$,
+#22165);
+#22159= IFCCARTESIANPOINT((1200.,0.,0.));
+#22161= IFCDIRECTION((1.,0.,0.));
+#22163= IFCDIRECTION((0.,1.,0.));
+#22165= IFCDIRECTION((0.,0.,1.));
+#22167= IFCMAPPEDITEM(#22074,#22168);
+#22168= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#22171,#22173,#22169,$,
+#22175);
+#22169= IFCCARTESIANPOINT((1350.,0.,0.));
+#22171= IFCDIRECTION((1.,0.,0.));
+#22173= IFCDIRECTION((0.,1.,0.));
+#22175= IFCDIRECTION((0.,0.,1.));
+#22177= IFCMAPPEDITEM(#22074,#22178);
+#22178= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#22181,#22183,#22179,$,
+#22185);
+#22179= IFCCARTESIANPOINT((1500.,0.,0.));
+#22181= IFCDIRECTION((1.,0.,0.));
+#22183= IFCDIRECTION((0.,1.,0.));
+#22185= IFCDIRECTION((0.,0.,1.));
+#22187= IFCMAPPEDITEM(#22074,#22188);
+#22188= IFCCARTESIANTRANSFORMATIONOPERATOR3D(#22191,#22193,#22189,$,
+#22195);
+#22189= IFCCARTESIANPOINT((1650.,0.,0.));
+#22191= IFCDIRECTION((1.,0.,0.));
+#22193= IFCDIRECTION((0.,1.,0.));
+#22195= IFCDIRECTION((0.,0.,1.));
+#22199= IFCRELASSOCIATESMATERIAL('3psT_NI0XDNx9HCB_xIzpG',#4,$,$,(#22202
+),#22200);
+#22200= IFCMATERIAL('B500B');
+#22202= IFCREINFORCINGBAR('3tzFrgO4jE3v8w7nbe_XYW',#4,' ',$,$,#22007,
+#22008,$,$,10.,0.785,$,.NOTDEFINED.,$);
+#22206= IFCPROPERTYSINGLEVALUE('Bending diameter',$,IFCREAL(30.),$);
+#22207= IFCPROPERTYSINGLEVALUE('Shape code',$,IFCTEXT('X1  '),$);
+#22208= IFCPROPERTYSINGLEVALUE('Hook angle - end',$,IFCREAL(180.),$);
+#22209= IFCPROPERTYSINGLEVALUE('Hook length - end',$,IFCREAL(40.),$);
+#22210= IFCPROPERTYSINGLEVALUE('Hook bending diameter - end',$,IFCREAL(
+30.),$);
+#22211= IFCPROPERTYSINGLEVALUE('Weight per meter',$,IFCREAL(0.617),$);
+#22212= IFCPROPERTYSINGLEVALUE('Creation flags',$,IFCINTEGER(41),$);
+#22213= IFCPROPERTYSINGLEVALUE('Count of bars/meshes',$,IFCINTEGER(12),$
+);
+#22214= IFCPROPERTYSET('2aKAz6WVf6UfxflR4y3daU',#4,
+'Allplan_ReinforcingBar',$,(#22206,#22207,#22208,#22209,#22210,#22211,
+#22212,#22213));
+#22216= IFCRELDEFINESBYPROPERTIES('3jyj0LsO50oeTl0wpkP817',#4,$,$,(
+#22202),#22214);
+#22220= IFCRELAGGREGATES('0vaM4q711AE9AVuF62m9xN',#4,$,$,#44,(#53));
+#22224= IFCRELAGGREGATES('3283S7NQz8tu9F32p5CPe7',#4,$,$,#53,(#73));
+#22228= IFCRELAGGREGATES('2KjM4CUof8wRRQJFwYLM7Y',#4,$,$,#5,(#44));
+#22251= IFCRELCONTAINEDINSPATIALSTRUCTURE('3YZe83UZLCPfUvFc_zWUPj',#4,$,
+$,(#100,#151,#186,#221,#256,#291,#326,#361,#396,#431,#467,#503,#539,#575
+,#611,#646,#690,#726,#761,#796,#831,#866,#901,#936,#971,#1006,#1041,
+#1076,#1111,#1146,#1181,#1216,#1251,#1286,#1321,#1356,#1391,#1426,#1461,
+#1496,#1531,#1566,#1601,#1636,#1671,#1706,#1741,#1776,#1811,#1846,#1881,
+#1916,#1951,#1986,#2022,#2057,#2092,#2127,#2162,#2198,#2234,#2269,#2305,
+#2341,#2377,#2413,#2449,#2485,#2521,#2556,#2591,#2626,#2661,#2696,#2731,
+#2766,#2801,#2836,#2871,#2906,#2941,#2976,#3011,#3046,#3081,#3117,#3153,
+#3189,#3225,#3261,#3297,#3332,#3367,#3402,#3437,#3472,#3507,#3542,#3577,
+#3612,#3647,#3682,#3717,#3752,#3787,#3822,#3857,#3893,#3928,#3963,#3998,
+#4034,#4070,#4105,#4141,#4177,#4213,#4249,#4285,#4321,#4357,#4392,#4427,
+#4462,#4497,#4532,#4567,#4602,#4637,#4672,#4707,#4742,#4777,#4812,#4847,
+#4882,#4917,#4952,#4987,#5022,#5057,#5092,#5127,#5162,#5197,#5232,#5267,
+#5302,#5337,#5372,#5407,#5443,#5478,#5514,#5549,#5584,#5620,#5754,#5826,
+#5861,#5896,#5931,#5966,#6001,#6036,#6071,#6106,#6141,#6177,#6213,#6249,
+#6285,#6321,#6356,#6391,#6427,#6462,#6497,#6532,#6567,#6602,#6637,#6672,
+#6707,#6742,#6777,#6812,#6847,#6882,#6917,#6952,#6987,#7022,#7057,#7092,
+#7127,#7162,#7197,#7232,#7267,#7302,#7337,#7372,#7407,#7442,#7477,#7512,
+#7547,#7582,#7617,#7652,#7687,#7723,#7758,#7793,#7828,#7863,#7899,#7935,
+#7970,#8006,#8042,#8078,#8114,#8150,#8186,#8222,#8257,#8292,#8327,#8362,
+#8397,#8432,#8467,#8502,#8537,#8572,#8607,#8642,#8677,#8712,#8747,#8782,
+#8818,#8854,#8890,#8926,#8962,#8998,#9033,#9068,#9103,#9138,#9173,#9208,
+#9243,#9278,#9313,#9348,#9383,#9418,#9453,#9488,#9523,#9558,#9594,#9629,
+#9664,#9699,#9735,#9771,#9806,#9842,#9878,#9914,#9950,#9986,#10022,
+#10058,#10093,#10128,#10163,#10198,#10233,#10268,#10303,#10338,#10373,
+#10408,#10443,#10478,#10513,#10548,#10583,#10618,#10653,#10688,#10723,
+#10758,#10793,#10828,#10863,#10898,#10933,#10968,#11003,#11038,#11073,
+#11108,#11144,#11179,#11215,#11250,#11285,#11321,#11409,#11509,#11609,
+#11709,#11767,#11802,#11837,#11872,#11907,#11942,#11977,#12012,#12047,
+#12082,#12118,#12154,#12190,#12226,#12262,#12297,#12332,#12368,#12403,
+#12438,#12473,#12508,#12543,#12578,#12613,#12648,#12683,#12718,#12753,
+#12788,#12823,#12858,#12893,#12928,#12963,#12998,#13033,#13068,#13103,
+#13138,#13173,#13208,#13243,#13278,#13313,#13348,#13383,#13418,#13453,
+#13488,#13523,#13558,#13593,#13628,#13664,#13699,#13734,#13769,#13804,
+#13840,#13876,#13911,#13947,#13983,#14019,#14055,#14091,#14127,#14163,
+#14198,#14233,#14268,#14303,#14338,#14373,#14408,#14443,#14478,#14513,
+#14548,#14583,#14618,#14653,#14688,#14723,#14759,#14795,#14831,#14867,
+#14903,#14939,#14974,#15009,#15044,#15079,#15114,#15149,#15184,#15219,
+#15254,#15289,#15324,#15359,#15394,#15429,#15464,#15499,#15535,#15570,
+#15605,#15640,#15676,#15712,#15747,#15783,#15819,#15855,#15891,#15927,
+#15963,#15999,#16034,#16069,#16104,#16139,#16174,#16209,#16244,#16279,
+#16314,#16349,#16384,#16419,#16454,#16489,#16524,#16559,#16594,#16629,
+#16664,#16699,#16734,#16769,#16804,#16839,#16874,#16909,#16944,#16979,
+#17014,#17049,#17085,#17120,#17156,#17191,#17226,#17262,#17367,#17402,
+#17437,#17472,#17507,#17542,#17577,#17612,#17647,#17682,#17717,#17753,
+#17789,#17825,#17861,#17897,#17933,#17968,#18003,#18038,#18073,#18108,
+#18143,#18178,#18213,#18248,#18283,#18318,#18353,#18388,#18423,#18458,
+#18493,#18529,#18564,#18599,#18634,#18670,#18706,#18741,#18777,#18813,
+#18849,#18885,#18921,#18957,#18993,#19028,#19063,#19269,#19560,#19743,
+#20073,#20295,#20524,#20959,#21105,#21320,#21535,#21678,#21979,#22202),
+#73);
+ENDSEC;
+
+END-ISO-10303-21;
diff --git a/test/input/IfcTShapeProfileDef.ifc b/test/input/IfcTShapeProfileDef.ifc
new file mode 100644
index 0000000..597be28
--- /dev/null
+++ b/test/input/IfcTShapeProfileDef.ifc
@@ -0,0 +1,124 @@
+ISO-10303-21;
+HEADER;
+FILE_DESCRIPTION(('ViewDefinition [CoordinationView]'),'2;1');
+FILE_NAME('IfcTShapeProfileDef.ifc','2014-03-08T15:17:03',(''),('',''),'IfcOpenShell 0.5.0-dev','IfcOpenShell 0.5.0-dev','');
+FILE_SCHEMA(('IFC2X3'));
+ENDSEC;
+DATA;
+#1=IFCPERSON($,$,'',$,$,$,$,$);
+#2=IFCORGANIZATION($,'IfcOpenShell',$,$,$);
+#3=IFCPERSONANDORGANIZATION(#1,#2,$);
+#4=IFCAPPLICATION(#2,'0.5.0-dev','IfcOpenShell','IfcOpenShell');
+#5=IFCOWNERHISTORY(#3,#4,$,.ADDED.,$,#3,#4,1394288223);
+#6=IFCDIRECTION((0.,1.,0.));
+#7=IFCDIRECTION((1.,0.,0.));
+#8=IFCDIRECTION((0.,0.,1.));
+#9=IFCCARTESIANPOINT((0.,0.,0.));
+#10=IFCAXIS2PLACEMENT3D(#9,#8,#7);
+#11=IFCGEOMETRICREPRESENTATIONCONTEXT('Plan','Model',3,1.E-005,#10,#6);
+#12=IFCDIMENSIONALEXPONENTS(0,0,0,0,0,0,0);
+#13=IFCSIUNIT(*,.LENGTHUNIT.,.MILLI.,.METRE.);
+#14=IFCSIUNIT(*,.PLANEANGLEUNIT.,$,.RADIAN.);
+#15=IFCMEASUREWITHUNIT(IFCPLANEANGLEMEASURE(0.0174533),#14);
+#16=IFCCONVERSIONBASEDUNIT(#12,.PLANEANGLEUNIT.,'Degrees',#15);
+#17=IFCUNITASSIGNMENT((#13,#16));
+#18=IFCPROJECT('3GQ0CKeETFJhiCTOTxPkRY',#5,'IfcTShapeProfileDef',$,$,$,$,(#11),#17);
+#19=IFCDIRECTION((1.,0.,0.));
+#20=IFCDIRECTION((0.,0.,1.));
+#21=IFCCARTESIANPOINT((0.,0.,0.));
+#22=IFCAXIS2PLACEMENT3D(#21,#20,#19);
+#23=IFCLOCALPLACEMENT($,#22);
+#24=IFCSITE('0QoFcGkrr1zBVTtXLlcNRc',#5,$,$,$,#23,$,$,.ELEMENT.,$,$,$,$,$);
+#25=IFCRELAGGREGATES('3r1zhJ5TXFK99qcOAYSz67',#5,$,$,#18,(#24));
+#26=IFCDIRECTION((1.,0.,0.));
+#27=IFCDIRECTION((0.,0.,1.));
+#28=IFCCARTESIANPOINT((0.,0.,0.));
+#29=IFCAXIS2PLACEMENT3D(#28,#27,#26);
+#30=IFCLOCALPLACEMENT(#23,#29);
+#31=IFCBUILDING('30x1rIlzf4F9xko$kKqjQ0',#5,$,$,$,#30,$,$,.ELEMENT.,$,$,$);
+#32=IFCRELAGGREGATES('3CwaTiqpf8vAHzV32iK$J$',#5,$,$,#24,(#31));
+#33=IFCDIRECTION((1.,0.,0.));
+#34=IFCDIRECTION((0.,0.,1.));
+#35=IFCCARTESIANPOINT((0.,0.,0.));
+#36=IFCAXIS2PLACEMENT3D(#35,#34,#33);
+#37=IFCLOCALPLACEMENT(#30,#36);
+#38=IFCBUILDINGSTOREY('09EJPxg09BPvRfDPBSBaFo',#5,$,$,$,#37,$,$,.ELEMENT.,$);
+#39=IFCRELAGGREGATES('3IXv7NqdLBgOHjJHFjzkOT',#5,$,$,#31,(#38));
+#40=IFCBUILDINGELEMENTPROXY('2jzoaqoe1D3gJKZOASw7Og',#5,'profile',$,$,#46,#58,$,$);
+#41=IFCRELCONTAINEDINSPATIALSTRUCTURE('0vDeh$ZKT50wdNwatAiaH4',#5,$,$,(#40),#38);
+#42=IFCDIRECTION((1.,0.,0.));
+#43=IFCDIRECTION((0.,0.,1.));
+#44=IFCCARTESIANPOINT((0.,0.,0.));
+#45=IFCAXIS2PLACEMENT3D(#44,#43,#42);
+#46=IFCLOCALPLACEMENT($,#45);
+#47=IFCDIRECTION((1.,0.));
+#48=IFCCARTESIANPOINT((0.,0.));
+#49=IFCAXIS2PLACEMENT2D(#48,#47);
+#50=IFCDIRECTION((0.,0.,1.));
+#51=IFCDIRECTION((1.,0.,0.));
+#52=IFCDIRECTION((0.,0.,1.));
+#53=IFCCARTESIANPOINT((0.,0.,0.));
+#54=IFCAXIS2PLACEMENT3D(#53,#52,#51);
+#55=IFCTSHAPEPROFILEDEF(.AREA.,$,#49,50.,25.,5.,5.,$,$,$,$,$,$);
+#56=IFCEXTRUDEDAREASOLID(#55,#54,#50,20.);
+#57=IFCSHAPEREPRESENTATION(#11,'Body','SweptSolid',(#56));
+#58=IFCPRODUCTDEFINITIONSHAPE($,$,(#57));
+#59=IFCBUILDINGELEMENTPROXY('0sjPK8eAPDHvd61lWjciR3',#5,'profile',$,$,#65,#77,$,$);
+#60=IFCRELCONTAINEDINSPATIALSTRUCTURE('0qyuHP5WDC1wuTOhGubwI1',#5,$,$,(#59),#38);
+#61=IFCDIRECTION((1.,0.,0.));
+#62=IFCDIRECTION((0.,0.,1.));
+#63=IFCCARTESIANPOINT((100.,0.,0.));
+#64=IFCAXIS2PLACEMENT3D(#63,#62,#61);
+#65=IFCLOCALPLACEMENT($,#64);
+#66=IFCDIRECTION((1.,0.));
+#67=IFCCARTESIANPOINT((0.,0.));
+#68=IFCAXIS2PLACEMENT2D(#67,#66);
+#69=IFCDIRECTION((0.,0.,1.));
+#70=IFCDIRECTION((1.,0.,0.));
+#71=IFCDIRECTION((0.,0.,1.));
+#72=IFCCARTESIANPOINT((0.,0.,0.));
+#73=IFCAXIS2PLACEMENT3D(#72,#71,#70);
+#74=IFCTSHAPEPROFILEDEF(.AREA.,$,#68,50.,25.,5.,5.,2.,2.,2.,$,$,$);
+#75=IFCEXTRUDEDAREASOLID(#74,#73,#69,20.);
+#76=IFCSHAPEREPRESENTATION(#11,'Body','SweptSolid',(#75));
+#77=IFCPRODUCTDEFINITIONSHAPE($,$,(#76));
+#78=IFCBUILDINGELEMENTPROXY('0NYshUfy11pAca6$7WPjbp',#5,'profile',$,$,#84,#96,$,$);
+#79=IFCRELCONTAINEDINSPATIALSTRUCTURE('37m4cs48173RRm9nKJO4a$',#5,$,$,(#78),#38);
+#80=IFCDIRECTION((1.,0.,0.));
+#81=IFCDIRECTION((0.,0.,1.));
+#82=IFCCARTESIANPOINT((200.,0.,0.));
+#83=IFCAXIS2PLACEMENT3D(#82,#81,#80);
+#84=IFCLOCALPLACEMENT($,#83);
+#85=IFCDIRECTION((1.,0.));
+#86=IFCCARTESIANPOINT((0.,0.));
+#87=IFCAXIS2PLACEMENT2D(#86,#85);
+#88=IFCDIRECTION((0.,0.,1.));
+#89=IFCDIRECTION((1.,0.,0.));
+#90=IFCDIRECTION((0.,0.,1.));
+#91=IFCCARTESIANPOINT((0.,0.,0.));
+#92=IFCAXIS2PLACEMENT3D(#91,#90,#89);
+#93=IFCTSHAPEPROFILEDEF(.AREA.,$,#87,50.,25.,5.,5.,$,$,$,2.,2.,$);
+#94=IFCEXTRUDEDAREASOLID(#93,#92,#88,20.);
+#95=IFCSHAPEREPRESENTATION(#11,'Body','SweptSolid',(#94));
+#96=IFCPRODUCTDEFINITIONSHAPE($,$,(#95));
+#97=IFCBUILDINGELEMENTPROXY('28s6wTPxLFChkMWj8CgCRm',#5,'profile',$,$,#103,#115,$,$);
+#98=IFCRELCONTAINEDINSPATIALSTRUCTURE('3CiE2aQ$P1kO_V7be02$rV',#5,$,$,(#97),#38);
+#99=IFCDIRECTION((1.,0.,0.));
+#100=IFCDIRECTION((0.,0.,1.));
+#101=IFCCARTESIANPOINT((300.,0.,0.));
+#102=IFCAXIS2PLACEMENT3D(#101,#100,#99);
+#103=IFCLOCALPLACEMENT($,#102);
+#104=IFCDIRECTION((1.,0.));
+#105=IFCCARTESIANPOINT((0.,0.));
+#106=IFCAXIS2PLACEMENT2D(#105,#104);
+#107=IFCDIRECTION((0.,0.,1.));
+#108=IFCDIRECTION((1.,0.,0.));
+#109=IFCDIRECTION((0.,0.,1.));
+#110=IFCCARTESIANPOINT((0.,0.,0.));
+#111=IFCAXIS2PLACEMENT3D(#110,#109,#108);
+#112=IFCTSHAPEPROFILEDEF(.AREA.,$,#106,50.,25.,5.,5.,3.,2.,1.,2.,2.,$);
+#113=IFCEXTRUDEDAREASOLID(#112,#111,#107,20.);
+#114=IFCSHAPEREPRESENTATION(#11,'Body','SweptSolid',(#113));
+#115=IFCPRODUCTDEFINITIONSHAPE($,$,(#114));
+ENDSEC;
+END-ISO-10303-21;
diff --git a/test/input/IfcTrapeziumProfileDef.ifc b/test/input/IfcTrapeziumProfileDef.ifc
new file mode 100644
index 0000000..b36efed
--- /dev/null
+++ b/test/input/IfcTrapeziumProfileDef.ifc
@@ -0,0 +1,105 @@
+ISO-10303-21;
+HEADER;
+FILE_DESCRIPTION(('ViewDefinition [CoordinationView]'),'2;1');
+FILE_NAME('IfcTrapeziumProfileDef.ifc','2014-02-23T12:17:27',(''),('',''),'IfcOpenShell 0.5.0-dev','IfcOpenShell 0.5.0-dev','');
+FILE_SCHEMA(('IFC2X3'));
+ENDSEC;
+DATA;
+#1=IFCPERSON($,$,'',$,$,$,$,$);
+#2=IFCORGANIZATION($,'IfcOpenShell',$,$,$);
+#3=IFCPERSONANDORGANIZATION(#1,#2,$);
+#4=IFCAPPLICATION(#2,'0.5.0-dev','IfcOpenShell','IfcOpenShell');
+#5=IFCOWNERHISTORY(#3,#4,$,.ADDED.,$,#3,#4,1393154247);
+#6=IFCDIRECTION((0.,1.,0.));
+#7=IFCDIRECTION((1.,0.,0.));
+#8=IFCDIRECTION((0.,0.,1.));
+#9=IFCCARTESIANPOINT((0.,0.,0.));
+#10=IFCAXIS2PLACEMENT3D(#9,#8,#7);
+#11=IFCGEOMETRICREPRESENTATIONCONTEXT('Plan','Model',3,1.E-005,#10,#6);
+#12=IFCDIMENSIONALEXPONENTS(0,0,0,0,0,0,0);
+#13=IFCSIUNIT(*,.LENGTHUNIT.,.MILLI.,.METRE.);
+#14=IFCSIUNIT(*,.PLANEANGLEUNIT.,$,.RADIAN.);
+#15=IFCMEASUREWITHUNIT(IFCPLANEANGLEMEASURE(0.0174533),#14);
+#16=IFCCONVERSIONBASEDUNIT(#12,.PLANEANGLEUNIT.,'Degrees',#15);
+#17=IFCUNITASSIGNMENT((#13,#16));
+#18=IFCPROJECT('3Rxkvxeyz9sudbhVrTcY4v',#5,'IfcTrapeziumProfileDef',$,$,$,$,(#11),#17);
+#19=IFCDIRECTION((1.,0.,0.));
+#20=IFCDIRECTION((0.,0.,1.));
+#21=IFCCARTESIANPOINT((0.,0.,0.));
+#22=IFCAXIS2PLACEMENT3D(#21,#20,#19);
+#23=IFCLOCALPLACEMENT($,#22);
+#24=IFCSITE('2$Xc0Ro5bBGecGvaiCr7zU',#5,$,$,$,#23,$,$,.ELEMENT.,$,$,$,$,$);
+#25=IFCRELAGGREGATES('3kecitZifF3AF46fhw1yMH',#5,$,$,#18,(#24));
+#26=IFCDIRECTION((1.,0.,0.));
+#27=IFCDIRECTION((0.,0.,1.));
+#28=IFCCARTESIANPOINT((0.,0.,0.));
+#29=IFCAXIS2PLACEMENT3D(#28,#27,#26);
+#30=IFCLOCALPLACEMENT(#23,#29);
+#31=IFCBUILDING('2dTnlkDWH8bRXt1DJPG6Bu',#5,$,$,$,#30,$,$,.ELEMENT.,$,$,$);
+#32=IFCRELAGGREGATES('379wyo3mv45OjKmZh1YBOn',#5,$,$,#24,(#31));
+#33=IFCDIRECTION((1.,0.,0.));
+#34=IFCDIRECTION((0.,0.,1.));
+#35=IFCCARTESIANPOINT((0.,0.,0.));
+#36=IFCAXIS2PLACEMENT3D(#35,#34,#33);
+#37=IFCLOCALPLACEMENT(#30,#36);
+#38=IFCBUILDINGSTOREY('3qu9wRQsv8Sg99kI0EC8$4',#5,$,$,$,#37,$,$,.ELEMENT.,$);
+#39=IFCRELAGGREGATES('0mvZGnMDv5qfqxXbs6tSxx',#5,$,$,#31,(#38));
+#40=IFCBUILDINGELEMENTPROXY('2ZttRVba13vRe1zxE3i_yi',#5,'profile',$,$,#46,#58,$,$);
+#41=IFCRELCONTAINEDINSPATIALSTRUCTURE('3B_wYdsirBjgr_wbMuowLo',#5,$,$,(#40),#38);
+#42=IFCDIRECTION((1.,0.,0.));
+#43=IFCDIRECTION((0.,0.,1.));
+#44=IFCCARTESIANPOINT((0.,0.,0.));
+#45=IFCAXIS2PLACEMENT3D(#44,#43,#42);
+#46=IFCLOCALPLACEMENT($,#45);
+#47=IFCDIRECTION((1.,0.));
+#48=IFCCARTESIANPOINT((0.,0.));
+#49=IFCAXIS2PLACEMENT2D(#48,#47);
+#50=IFCDIRECTION((0.,0.,1.));
+#51=IFCDIRECTION((1.,0.,0.));
+#52=IFCDIRECTION((0.,0.,1.));
+#53=IFCCARTESIANPOINT((0.,0.,0.));
+#54=IFCAXIS2PLACEMENT3D(#53,#52,#51);
+#55=IFCTRAPEZIUMPROFILEDEF(.AREA.,$,#49,50.,30.,25.,0.);
+#56=IFCEXTRUDEDAREASOLID(#55,#54,#50,20.);
+#57=IFCSHAPEREPRESENTATION(#11,'Body','SweptSolid',(#56));
+#58=IFCPRODUCTDEFINITIONSHAPE($,$,(#57));
+#59=IFCBUILDINGELEMENTPROXY('02tBX3f1f5ZgO8C8mNr153',#5,'profile',$,$,#65,#77,$,$);
+#60=IFCRELCONTAINEDINSPATIALSTRUCTURE('2S5_HmCt53c9YsYKNzPmQd',#5,$,$,(#59),#38);
+#61=IFCDIRECTION((1.,0.,0.));
+#62=IFCDIRECTION((0.,0.,1.));
+#63=IFCCARTESIANPOINT((100.,0.,0.));
+#64=IFCAXIS2PLACEMENT3D(#63,#62,#61);
+#65=IFCLOCALPLACEMENT($,#64);
+#66=IFCDIRECTION((1.,0.));
+#67=IFCCARTESIANPOINT((0.,0.));
+#68=IFCAXIS2PLACEMENT2D(#67,#66);
+#69=IFCDIRECTION((0.,0.,1.));
+#70=IFCDIRECTION((1.,0.,0.));
+#71=IFCDIRECTION((0.,0.,1.));
+#72=IFCCARTESIANPOINT((0.,0.,0.));
+#73=IFCAXIS2PLACEMENT3D(#72,#71,#70);
+#74=IFCTRAPEZIUMPROFILEDEF(.AREA.,$,#68,50.,60.,25.,-20.);
+#75=IFCEXTRUDEDAREASOLID(#74,#73,#69,20.);
+#76=IFCSHAPEREPRESENTATION(#11,'Body','SweptSolid',(#75));
+#77=IFCPRODUCTDEFINITIONSHAPE($,$,(#76));
+#78=IFCBUILDINGELEMENTPROXY('0d55mWbVXB_OJqdO9EpyfE',#5,'profile',$,$,#84,#96,$,$);
+#79=IFCRELCONTAINEDINSPATIALSTRUCTURE('0B52LsJKDA$9TK$54jlRs9',#5,$,$,(#78),#38);
+#80=IFCDIRECTION((1.,0.,0.));
+#81=IFCDIRECTION((0.,0.,1.));
+#82=IFCCARTESIANPOINT((200.,0.,0.));
+#83=IFCAXIS2PLACEMENT3D(#82,#81,#80);
+#84=IFCLOCALPLACEMENT($,#83);
+#85=IFCDIRECTION((1.,0.));
+#86=IFCCARTESIANPOINT((0.,0.));
+#87=IFCAXIS2PLACEMENT2D(#86,#85);
+#88=IFCDIRECTION((0.,0.,1.));
+#89=IFCDIRECTION((1.,0.,0.));
+#90=IFCDIRECTION((0.,0.,1.));
+#91=IFCCARTESIANPOINT((0.,0.,0.));
+#92=IFCAXIS2PLACEMENT3D(#91,#90,#89);
+#93=IFCTRAPEZIUMPROFILEDEF(.AREA.,$,#87,50.,10.,25.,30.);
+#94=IFCEXTRUDEDAREASOLID(#93,#92,#88,20.);
+#95=IFCSHAPEREPRESENTATION(#11,'Body','SweptSolid',(#94));
+#96=IFCPRODUCTDEFINITIONSHAPE($,$,(#95));
+ENDSEC;
+END-ISO-10303-21;
diff --git a/test/input/IfcUShapeProfileDef.ifc b/test/input/IfcUShapeProfileDef.ifc
new file mode 100644
index 0000000..91686d2
--- /dev/null
+++ b/test/input/IfcUShapeProfileDef.ifc
@@ -0,0 +1,124 @@
+ISO-10303-21;
+HEADER;
+FILE_DESCRIPTION(('ViewDefinition [CoordinationView]'),'2;1');
+FILE_NAME('IfcUShapeProfileDef.ifc','2014-03-04T11:56:19',(''),('',''),'IfcOpenShell 0.5.0-dev','IfcOpenShell 0.5.0-dev','');
+FILE_SCHEMA(('IFC2X3'));
+ENDSEC;
+DATA;
+#1=IFCPERSON($,$,'',$,$,$,$,$);
+#2=IFCORGANIZATION($,'IfcOpenShell',$,$,$);
+#3=IFCPERSONANDORGANIZATION(#1,#2,$);
+#4=IFCAPPLICATION(#2,'0.5.0-dev','IfcOpenShell','IfcOpenShell');
+#5=IFCOWNERHISTORY(#3,#4,$,.ADDED.,$,#3,#4,1393930579);
+#6=IFCDIRECTION((0.,1.,0.));
+#7=IFCDIRECTION((1.,0.,0.));
+#8=IFCDIRECTION((0.,0.,1.));
+#9=IFCCARTESIANPOINT((0.,0.,0.));
+#10=IFCAXIS2PLACEMENT3D(#9,#8,#7);
+#11=IFCGEOMETRICREPRESENTATIONCONTEXT('Plan','Model',3,1.E-005,#10,#6);
+#12=IFCDIMENSIONALEXPONENTS(0,0,0,0,0,0,0);
+#13=IFCSIUNIT(*,.LENGTHUNIT.,.MILLI.,.METRE.);
+#14=IFCSIUNIT(*,.PLANEANGLEUNIT.,$,.RADIAN.);
+#15=IFCMEASUREWITHUNIT(IFCPLANEANGLEMEASURE(0.0174533),#14);
+#16=IFCCONVERSIONBASEDUNIT(#12,.PLANEANGLEUNIT.,'Degrees',#15);
+#17=IFCUNITASSIGNMENT((#13,#16));
+#18=IFCPROJECT('0uHzDPQFjANu3TK$t3cSV5',#5,'IfcUShapeProfileDef',$,$,$,$,(#11),#17);
+#19=IFCDIRECTION((1.,0.,0.));
+#20=IFCDIRECTION((0.,0.,1.));
+#21=IFCCARTESIANPOINT((0.,0.,0.));
+#22=IFCAXIS2PLACEMENT3D(#21,#20,#19);
+#23=IFCLOCALPLACEMENT($,#22);
+#24=IFCSITE('2RwzmdTBnFXh36TYsBzXcE',#5,$,$,$,#23,$,$,.ELEMENT.,$,$,$,$,$);
+#25=IFCRELAGGREGATES('39yqXxIEP93Ofct_$8$$lk',#5,$,$,#18,(#24));
+#26=IFCDIRECTION((1.,0.,0.));
+#27=IFCDIRECTION((0.,0.,1.));
+#28=IFCCARTESIANPOINT((0.,0.,0.));
+#29=IFCAXIS2PLACEMENT3D(#28,#27,#26);
+#30=IFCLOCALPLACEMENT(#23,#29);
+#31=IFCBUILDING('1PgubQUm9BWOAMRPMjZMSt',#5,$,$,$,#30,$,$,.ELEMENT.,$,$,$);
+#32=IFCRELAGGREGATES('3kbmL8P7X9pP9ZfY20W_LJ',#5,$,$,#24,(#31));
+#33=IFCDIRECTION((1.,0.,0.));
+#34=IFCDIRECTION((0.,0.,1.));
+#35=IFCCARTESIANPOINT((0.,0.,0.));
+#36=IFCAXIS2PLACEMENT3D(#35,#34,#33);
+#37=IFCLOCALPLACEMENT(#30,#36);
+#38=IFCBUILDINGSTOREY('1ts4Upk5j6ZB9N4NYxIbjG',#5,$,$,$,#37,$,$,.ELEMENT.,$);
+#39=IFCRELAGGREGATES('0$ZPjzGkv2rB1qOczl4Hlt',#5,$,$,#31,(#38));
+#40=IFCBUILDINGELEMENTPROXY('2GxyqAgor3bw$9ZGEr8Q0m',#5,'profile',$,$,#46,#58,$,$);
+#41=IFCRELCONTAINEDINSPATIALSTRUCTURE('3pGW$F4sD229C3jnvZIUgD',#5,$,$,(#40),#38);
+#42=IFCDIRECTION((1.,0.,0.));
+#43=IFCDIRECTION((0.,0.,1.));
+#44=IFCCARTESIANPOINT((0.,0.,0.));
+#45=IFCAXIS2PLACEMENT3D(#44,#43,#42);
+#46=IFCLOCALPLACEMENT($,#45);
+#47=IFCDIRECTION((1.,0.));
+#48=IFCCARTESIANPOINT((0.,0.));
+#49=IFCAXIS2PLACEMENT2D(#48,#47);
+#50=IFCDIRECTION((0.,0.,1.));
+#51=IFCDIRECTION((1.,0.,0.));
+#52=IFCDIRECTION((0.,0.,1.));
+#53=IFCCARTESIANPOINT((0.,0.,0.));
+#54=IFCAXIS2PLACEMENT3D(#53,#52,#51);
+#55=IFCUSHAPEPROFILEDEF(.AREA.,$,#49,50.,25.,5.,5.,$,$,$,$);
+#56=IFCEXTRUDEDAREASOLID(#55,#54,#50,20.);
+#57=IFCSHAPEREPRESENTATION(#11,'Body','SweptSolid',(#56));
+#58=IFCPRODUCTDEFINITIONSHAPE($,$,(#57));
+#59=IFCBUILDINGELEMENTPROXY('35BCmn_Sb4qx8DPio6CZf5',#5,'profile',$,$,#65,#77,$,$);
+#60=IFCRELCONTAINEDINSPATIALSTRUCTURE('1TTGu172r7nOO_Yh5wT$3w',#5,$,$,(#59),#38);
+#61=IFCDIRECTION((1.,0.,0.));
+#62=IFCDIRECTION((0.,0.,1.));
+#63=IFCCARTESIANPOINT((100.,0.,0.));
+#64=IFCAXIS2PLACEMENT3D(#63,#62,#61);
+#65=IFCLOCALPLACEMENT($,#64);
+#66=IFCDIRECTION((1.,0.));
+#67=IFCCARTESIANPOINT((0.,0.));
+#68=IFCAXIS2PLACEMENT2D(#67,#66);
+#69=IFCDIRECTION((0.,0.,1.));
+#70=IFCDIRECTION((1.,0.,0.));
+#71=IFCDIRECTION((0.,0.,1.));
+#72=IFCCARTESIANPOINT((0.,0.,0.));
+#73=IFCAXIS2PLACEMENT3D(#72,#71,#70);
+#74=IFCUSHAPEPROFILEDEF(.AREA.,$,#68,50.,25.,5.,5.,2.,2.,$,$);
+#75=IFCEXTRUDEDAREASOLID(#74,#73,#69,20.);
+#76=IFCSHAPEREPRESENTATION(#11,'Body','SweptSolid',(#75));
+#77=IFCPRODUCTDEFINITIONSHAPE($,$,(#76));
+#78=IFCBUILDINGELEMENTPROXY('2gF8OFrLLACgwqeVt_sSfH',#5,'profile',$,$,#84,#96,$,$);
+#79=IFCRELCONTAINEDINSPATIALSTRUCTURE('28U1vNt0z3xA2hqhT8skDB',#5,$,$,(#78),#38);
+#80=IFCDIRECTION((1.,0.,0.));
+#81=IFCDIRECTION((0.,0.,1.));
+#82=IFCCARTESIANPOINT((200.,0.,0.));
+#83=IFCAXIS2PLACEMENT3D(#82,#81,#80);
+#84=IFCLOCALPLACEMENT($,#83);
+#85=IFCDIRECTION((1.,0.));
+#86=IFCCARTESIANPOINT((0.,0.));
+#87=IFCAXIS2PLACEMENT2D(#86,#85);
+#88=IFCDIRECTION((0.,0.,1.));
+#89=IFCDIRECTION((1.,0.,0.));
+#90=IFCDIRECTION((0.,0.,1.));
+#91=IFCCARTESIANPOINT((0.,0.,0.));
+#92=IFCAXIS2PLACEMENT3D(#91,#90,#89);
+#93=IFCUSHAPEPROFILEDEF(.AREA.,$,#87,50.,25.,5.,5.,$,$,4.,$);
+#94=IFCEXTRUDEDAREASOLID(#93,#92,#88,20.);
+#95=IFCSHAPEREPRESENTATION(#11,'Body','SweptSolid',(#94));
+#96=IFCPRODUCTDEFINITIONSHAPE($,$,(#95));
+#97=IFCBUILDINGELEMENTPROXY('0wi$BN8K1BCQuwL0tSUFos',#5,'profile',$,$,#103,#115,$,$);
+#98=IFCRELCONTAINEDINSPATIALSTRUCTURE('3vfSBEVQT32gKsh6Im2KXu',#5,$,$,(#97),#38);
+#99=IFCDIRECTION((1.,0.,0.));
+#100=IFCDIRECTION((0.,0.,1.));
+#101=IFCCARTESIANPOINT((300.,0.,0.));
+#102=IFCAXIS2PLACEMENT3D(#101,#100,#99);
+#103=IFCLOCALPLACEMENT($,#102);
+#104=IFCDIRECTION((1.,0.));
+#105=IFCCARTESIANPOINT((0.,0.));
+#106=IFCAXIS2PLACEMENT2D(#105,#104);
+#107=IFCDIRECTION((0.,0.,1.));
+#108=IFCDIRECTION((1.,0.,0.));
+#109=IFCDIRECTION((0.,0.,1.));
+#110=IFCCARTESIANPOINT((0.,0.,0.));
+#111=IFCAXIS2PLACEMENT3D(#110,#109,#108);
+#112=IFCUSHAPEPROFILEDEF(.AREA.,$,#106,50.,25.,5.,5.,1.,3.,6.,$);
+#113=IFCEXTRUDEDAREASOLID(#112,#111,#107,20.);
+#114=IFCSHAPEREPRESENTATION(#11,'Body','SweptSolid',(#113));
+#115=IFCPRODUCTDEFINITIONSHAPE($,$,(#114));
+ENDSEC;
+END-ISO-10303-21;
diff --git a/test/input/IfcZShapeProfileDef.ifc b/test/input/IfcZShapeProfileDef.ifc
new file mode 100644
index 0000000..780c36d
--- /dev/null
+++ b/test/input/IfcZShapeProfileDef.ifc
@@ -0,0 +1,86 @@
+ISO-10303-21;
+HEADER;
+FILE_DESCRIPTION(('ViewDefinition [CoordinationView]'),'2;1');
+FILE_NAME('IfcZShapeProfileDef.ifc','2014-02-23T12:17:26',(''),('',''),'IfcOpenShell 0.5.0-dev','IfcOpenShell 0.5.0-dev','');
+FILE_SCHEMA(('IFC2X3'));
+ENDSEC;
+DATA;
+#1=IFCPERSON($,$,'',$,$,$,$,$);
+#2=IFCORGANIZATION($,'IfcOpenShell',$,$,$);
+#3=IFCPERSONANDORGANIZATION(#1,#2,$);
+#4=IFCAPPLICATION(#2,'0.5.0-dev','IfcOpenShell','IfcOpenShell');
+#5=IFCOWNERHISTORY(#3,#4,$,.ADDED.,$,#3,#4,1393154246);
+#6=IFCDIRECTION((0.,1.,0.));
+#7=IFCDIRECTION((1.,0.,0.));
+#8=IFCDIRECTION((0.,0.,1.));
+#9=IFCCARTESIANPOINT((0.,0.,0.));
+#10=IFCAXIS2PLACEMENT3D(#9,#8,#7);
+#11=IFCGEOMETRICREPRESENTATIONCONTEXT('Plan','Model',3,1.E-005,#10,#6);
+#12=IFCDIMENSIONALEXPONENTS(0,0,0,0,0,0,0);
+#13=IFCSIUNIT(*,.LENGTHUNIT.,.MILLI.,.METRE.);
+#14=IFCSIUNIT(*,.PLANEANGLEUNIT.,$,.RADIAN.);
+#15=IFCMEASUREWITHUNIT(IFCPLANEANGLEMEASURE(0.0174533),#14);
+#16=IFCCONVERSIONBASEDUNIT(#12,.PLANEANGLEUNIT.,'Degrees',#15);
+#17=IFCUNITASSIGNMENT((#13,#16));
+#18=IFCPROJECT('2xysnmCqT26vNI$aSsYXTO',#5,'IfcZShapeProfileDef',$,$,$,$,(#11),#17);
+#19=IFCDIRECTION((1.,0.,0.));
+#20=IFCDIRECTION((0.,0.,1.));
+#21=IFCCARTESIANPOINT((0.,0.,0.));
+#22=IFCAXIS2PLACEMENT3D(#21,#20,#19);
+#23=IFCLOCALPLACEMENT($,#22);
+#24=IFCSITE('1ul3e381DAqxxPikhkB6Qz',#5,$,$,$,#23,$,$,.ELEMENT.,$,$,$,$,$);
+#25=IFCRELAGGREGATES('1o7wk83jrAA9WN5dUaVi7j',#5,$,$,#18,(#24));
+#26=IFCDIRECTION((1.,0.,0.));
+#27=IFCDIRECTION((0.,0.,1.));
+#28=IFCCARTESIANPOINT((0.,0.,0.));
+#29=IFCAXIS2PLACEMENT3D(#28,#27,#26);
+#30=IFCLOCALPLACEMENT(#23,#29);
+#31=IFCBUILDING('25mGHsRtT1G9ye5DF_yWRK',#5,$,$,$,#30,$,$,.ELEMENT.,$,$,$);
+#32=IFCRELAGGREGATES('3ig$czHyn44e9z_09tJlEW',#5,$,$,#24,(#31));
+#33=IFCDIRECTION((1.,0.,0.));
+#34=IFCDIRECTION((0.,0.,1.));
+#35=IFCCARTESIANPOINT((0.,0.,0.));
+#36=IFCAXIS2PLACEMENT3D(#35,#34,#33);
+#37=IFCLOCALPLACEMENT(#30,#36);
+#38=IFCBUILDINGSTOREY('0gquwm1oXFiR48aW6D6xfh',#5,$,$,$,#37,$,$,.ELEMENT.,$);
+#39=IFCRELAGGREGATES('1OS_upnnL8BfYZodhCacHJ',#5,$,$,#31,(#38));
+#40=IFCBUILDINGELEMENTPROXY('1KGlDKo2z4shOSM583z1$Y',#5,'profile',$,$,#46,#58,$,$);
+#41=IFCRELCONTAINEDINSPATIALSTRUCTURE('02TaRhRoX6RetW2Ux$vbeE',#5,$,$,(#40),#38);
+#42=IFCDIRECTION((1.,0.,0.));
+#43=IFCDIRECTION((0.,0.,1.));
+#44=IFCCARTESIANPOINT((0.,0.,0.));
+#45=IFCAXIS2PLACEMENT3D(#44,#43,#42);
+#46=IFCLOCALPLACEMENT($,#45);
+#47=IFCDIRECTION((1.,0.));
+#48=IFCCARTESIANPOINT((0.,0.));
+#49=IFCAXIS2PLACEMENT2D(#48,#47);
+#50=IFCDIRECTION((0.,0.,1.));
+#51=IFCDIRECTION((1.,0.,0.));
+#52=IFCDIRECTION((0.,0.,1.));
+#53=IFCCARTESIANPOINT((0.,0.,0.));
+#54=IFCAXIS2PLACEMENT3D(#53,#52,#51);
+#55=IFCZSHAPEPROFILEDEF(.AREA.,$,#49,50.,25.,5.,5.,$,$);
+#56=IFCEXTRUDEDAREASOLID(#55,#54,#50,20.);
+#57=IFCSHAPEREPRESENTATION(#11,'Body','SweptSolid',(#56));
+#58=IFCPRODUCTDEFINITIONSHAPE($,$,(#57));
+#59=IFCBUILDINGELEMENTPROXY('2ZFfuhwN5F_vBMKpzuJtV9',#5,'profile',$,$,#65,#77,$,$);
+#60=IFCRELCONTAINEDINSPATIALSTRUCTURE('2nT1ZSn$nFMuoqiPGvLLWx',#5,$,$,(#59),#38);
+#61=IFCDIRECTION((1.,0.,0.));
+#62=IFCDIRECTION((0.,0.,1.));
+#63=IFCCARTESIANPOINT((100.,0.,0.));
+#64=IFCAXIS2PLACEMENT3D(#63,#62,#61);
+#65=IFCLOCALPLACEMENT($,#64);
+#66=IFCDIRECTION((1.,0.));
+#67=IFCCARTESIANPOINT((0.,0.));
+#68=IFCAXIS2PLACEMENT2D(#67,#66);
+#69=IFCDIRECTION((0.,0.,1.));
+#70=IFCDIRECTION((1.,0.,0.));
+#71=IFCDIRECTION((0.,0.,1.));
+#72=IFCCARTESIANPOINT((0.,0.,0.));
+#73=IFCAXIS2PLACEMENT3D(#72,#71,#70);
+#74=IFCZSHAPEPROFILEDEF(.AREA.,$,#68,50.,25.,5.,5.,2.,2.);
+#75=IFCEXTRUDEDAREASOLID(#74,#73,#69,20.);
+#76=IFCSHAPEREPRESENTATION(#11,'Body','SweptSolid',(#75));
+#77=IFCPRODUCTDEFINITIONSHAPE($,$,(#76));
+ENDSEC;
+END-ISO-10303-21;
diff --git a/test/input/advanced_brep.ifc b/test/input/advanced_brep.ifc
new file mode 100644
index 0000000..37161d6
--- /dev/null
+++ b/test/input/advanced_brep.ifc
@@ -0,0 +1,217 @@
+ISO-10303-21;
+HEADER;
+FILE_DESCRIPTION(('ViewDefinition [notYetAssigned]'),'2;1');
+FILE_NAME(
+/* name */ 'advanced_brep.ifc',
+/* time_stamp */ '2012-05-31T11:53:44',
+/* author */ ('Jon'),
+/* organization */ ('Unknown'),
+/* preprocessor_version */ 'ssiIFC - Grasshopper Plug-in by Geometry Gym Pty Ltd',
+/* originating_system */ 'ssiIFC - Grasshopper Plug-in by Geometry Gym Pty Ltd',
+/* authorization */ 'None');
+
+FILE_SCHEMA (('IFC4RC4'));
+ENDSEC;
+
+DATA;
+
+/* single owner history sufficient if not otherwise required by the view definition ------------ */
+/* provides the person and application creating the data set, and the time it is created ------- */
+#1= IFCAPPLICATION(#2,'0.5.35.0','ssiRhinoIFC - Geometry Gym Plug-in for Rhino3d','ssiRhinoIFC');
+#2= IFCORGANIZATION($,'Geometry Gym Pty Ltd',$,$,$);
+#3= IFCPERSONANDORGANIZATION(#4,#5,$);
+#4= IFCPERSON($,'Jon',$,$,$,$,$,$);
+#5= IFCORGANIZATION($,'UNKNOWN',$,$,$);
+#6= IFCOWNERHISTORY(#3,#1,$,.ADDED.,1338465163,$,$,1338465163);
+
+/* each IFC data set containing geometry has to define a geometric representation context ------ */
+/* the attribute 'ContextType' has to be 'Model' for 3D model geometry ------------------------- */
+#7= IFCCARTESIANPOINT((0.0,0.0,0.0));
+#8= IFCDIRECTION((1.0,0.0,0.0));
+#9= IFCDIRECTION((0.0,1.0,0.0));
+#10= IFCDIRECTION((0.0,0.0,1.0));
+#11= IFCAXIS2PLACEMENT3D(#7,#10,#8);
+#12= IFCAXIS2PLACEMENT2D(#13,$);
+#13= IFCCARTESIANPOINT((0.0,0.0));
+#14= IFCAXIS2PLACEMENT3D(#7,#10,#8);
+#15= IFCGEOMETRICREPRESENTATIONCONTEXT('Body','Model',3,0.00001,#14,#16);
+#16= IFCDIRECTION((0.0,1.0));
+
+/* each IFC data set containing geometry has to define at absolute minimum length and angle ---- */
+#17= IFCSIUNIT(*,.LENGTHUNIT.,$,.METRE.);
+#18= IFCSIUNIT(*,.AREAUNIT.,$,.SQUARE_METRE.);
+#19= IFCSIUNIT(*,.VOLUMEUNIT.,$,.CUBIC_METRE.);
+#27= IFCSIUNIT(*,.PLANEANGLEUNIT.,$,.RADIAN.);
+#26= IFCUNITASSIGNMENT((#17,#18,#19,#27));
+
+/* each IFC data set containing elements in a building context has to include a building ------- */
+/* at absolute minimum (could have a site and stories as well) --------------------------------- */
+#25= IFCPROJECT('2oT9YYbSrBUghtexcAcblU',#6,'Grasshopper Project',$,$,'Grasshopper Project',$,(#15),#26);
+#21= IFCBUILDING('3qzoyCPy1CtfV237Rle9$t',#6,'Grasshopper Building','GH Building',$,#22,$,$,.ELEMENT.,$,$,$);
+#22= IFCLOCALPLACEMENT($,#11);
+#23= IFCRELCONTAINEDINSPATIALSTRUCTURE('0LkkopPYL7VANMLhZDjkkq',#6,'Building','Building Container for Elements',(#181),#21);
+#28= IFCRELAGGREGATES('2C1MZiLqv228Cmw2sZ7QPO',#6,'Project Container','Project Container for Buildings',#25,(#21));
+
+/* geometry definition of the advanced brep ---------------------------------------------------- */
+/* previded as the 'AdvancedBrep' representation type for the 'Body' of a building element proxy */
+#29= IFCCLOSEDSHELL((#104,#115,#131,#147,#163,#179));
+#30= IFCVERTEXPOINT(#31);
+#31= IFCCARTESIANPOINT((-0.5,-0.5,0.0));
+#32= IFCVERTEXPOINT(#33);
+#33= IFCCARTESIANPOINT((0.5,-0.5,0.0));
+#34= IFCVERTEXPOINT(#35);
+#35= IFCCARTESIANPOINT((0.5,0.5,0.0));
+#36= IFCVERTEXPOINT(#37);
+#37= IFCCARTESIANPOINT((-0.5,0.5,0.0));
+#38= IFCVERTEXPOINT(#39);
+#39= IFCCARTESIANPOINT((-0.683012701892219,-0.183012701892219,1.0));
+#40= IFCVERTEXPOINT(#41);
+#41= IFCCARTESIANPOINT((-0.183012701892219,0.683012701892219,1.0));
+#42= IFCVERTEXPOINT(#43);
+#43= IFCCARTESIANPOINT((0.683012701892219,0.183012701892219,1.0));
+#44= IFCVERTEXPOINT(#45);
+#45= IFCCARTESIANPOINT((0.183012701892219,-0.683012701892219,1.0));
+#46= IFCCARTESIANPOINT((-0.5,0.5));
+#47= IFCCARTESIANPOINT((-0.5,-0.5));
+#48= IFCPOLYLINE((#47,#46));
+#49= IFCEDGECURVE(#30,#36,#48,.T.);
+#50= IFCCARTESIANPOINT((-0.5,-0.5));
+#51= IFCCARTESIANPOINT((0.5,-0.5));
+#52= IFCPOLYLINE((#51,#50));
+#53= IFCEDGECURVE(#32,#30,#52,.T.);
+#54= IFCCARTESIANPOINT((0.5,-0.5));
+#55= IFCCARTESIANPOINT((0.5,0.5));
+#56= IFCPOLYLINE((#55,#54));
+#57= IFCEDGECURVE(#34,#32,#56,.T.);
+#58= IFCCARTESIANPOINT((0.5,0.5));
+#59= IFCCARTESIANPOINT((-0.5,0.5));
+#60= IFCPOLYLINE((#59,#58));
+#61= IFCEDGECURVE(#36,#34,#60,.T.);
+#62= IFCCARTESIANPOINT((0.183012701892219,-0.683012701892219,1.0));
+#63= IFCCARTESIANPOINT((-0.683012701892219,-0.183012701892219,1.0));
+#64= IFCPOLYLINE((#63,#62));
+#65= IFCEDGECURVE(#38,#44,#64,.T.);
+#66= IFCCARTESIANPOINT((-0.683012701892219,-0.183012701892219,1.0));
+#67= IFCCARTESIANPOINT((-0.183012701892219,0.683012701892219,1.0));
+#68= IFCPOLYLINE((#67,#66));
+#69= IFCEDGECURVE(#40,#38,#68,.T.);
+#70= IFCCARTESIANPOINT((-0.183012701892219,0.683012701892219,1.0));
+#71= IFCCARTESIANPOINT((0.683012701892219,0.183012701892219,1.0));
+#72= IFCPOLYLINE((#71,#70));
+#73= IFCEDGECURVE(#42,#40,#72,.T.);
+#74= IFCCARTESIANPOINT((0.683012701892219,0.183012701892219,1.0));
+#75= IFCCARTESIANPOINT((0.183012701892219,-0.683012701892219,1.0));
+#76= IFCPOLYLINE((#75,#74));
+#77= IFCEDGECURVE(#44,#42,#76,.T.);
+#78= IFCCARTESIANPOINT((0.183012701892219,-0.683012701892219,1.0));
+#79= IFCCARTESIANPOINT((-0.5,-0.5,0.0));
+#80= IFCPOLYLINE((#79,#78));
+#81= IFCEDGECURVE(#30,#44,#80,.T.);
+#82= IFCCARTESIANPOINT((0.683012701892219,0.183012701892219,1.0));
+#83= IFCCARTESIANPOINT((0.5,-0.5,0.0));
+#84= IFCPOLYLINE((#83,#82));
+#85= IFCEDGECURVE(#32,#42,#84,.T.);
+#86= IFCCARTESIANPOINT((-0.183012701892219,0.683012701892219,1.0));
+#87= IFCCARTESIANPOINT((0.5,0.5,0.0));
+#88= IFCPOLYLINE((#87,#86));
+#89= IFCEDGECURVE(#34,#40,#88,.T.);
+#90= IFCCARTESIANPOINT((-0.683012701892219,-0.183012701892219,1.0));
+#91= IFCCARTESIANPOINT((-0.5,0.5,0.0));
+#92= IFCPOLYLINE((#91,#90));
+#93= IFCEDGECURVE(#36,#38,#92,.T.);
+#94= IFCORIENTEDEDGE(#30,#36,#49,.T.);
+#95= IFCORIENTEDEDGE(#36,#34,#61,.T.);
+#96= IFCORIENTEDEDGE(#34,#32,#57,.T.);
+#97= IFCORIENTEDEDGE(#32,#30,#53,.T.);
+#98= IFCEDGELOOP((#94,#95,#96,#97));
+#99= IFCFACEOUTERBOUND(#98,.T.);
+#100= IFCPLANE(#101);
+#101= IFCAXIS2PLACEMENT3D(#102,#103,#8);
+#102= IFCCARTESIANPOINT((-0.5,-0.5,0.0));
+#103= IFCDIRECTION((0.0,0.0,-1.0));
+#104= IFCADVANCEDFACE((#99),#100,.T.);
+#105= IFCORIENTEDEDGE(#38,#44,#65,.T.);
+#106= IFCORIENTEDEDGE(#44,#42,#77,.T.);
+#107= IFCORIENTEDEDGE(#42,#40,#73,.T.);
+#108= IFCORIENTEDEDGE(#40,#38,#69,.T.);
+#109= IFCEDGELOOP((#105,#106,#107,#108));
+#110= IFCFACEOUTERBOUND(#109,.T.);
+#111= IFCPLANE(#112);
+#112= IFCAXIS2PLACEMENT3D(#113,#10,#114);
+#113= IFCCARTESIANPOINT((-0.683012701892219,-0.183012701892219,1.0));
+#114= IFCDIRECTION((-0.5,-0.8660254,0.0));
+#115= IFCADVANCEDFACE((#110),#111,.T.);
+#116= IFCORIENTEDEDGE(#36,#38,#93,.T.);
+#117= IFCORIENTEDEDGE(#38,#44,#65,.T.);
+#118= IFCORIENTEDEDGE(#44,#30,#81,.F.);
+#119= IFCORIENTEDEDGE(#30,#36,#49,.T.);
+#120= IFCEDGELOOP((#116,#117,#118,#119));
+#121= IFCFACEOUTERBOUND(#120,.T.);
+#122= IFCBSPLINESURFACEWITHKNOTS(3,1,((#123,#124),(#125,#126),(#127,#128),(#129,#130)),.UNSPECIFIED.,.F.,.F.,.U.,(4,4),(2,2),(0.0,1224.74487139159),(3.0,4.0),.UNSPECIFIED.);
+#123= IFCCARTESIANPOINT((-0.5,0.5,0.0));
+#124= IFCCARTESIANPOINT((-0.5,-0.5,0.0));
+#125= IFCCARTESIANPOINT((-0.561004233964073,0.27232909936926,0.333333333333333));
+#126= IFCCARTESIANPOINT((-0.27232909936926,-0.561004233964073,0.333333333333333));
+#127= IFCCARTESIANPOINT((-0.622008467928146,0.0446581987385206,0.666666666666667));
+#128= IFCCARTESIANPOINT((-0.0446581987385206,-0.622008467928146,0.666666666666667));
+#129= IFCCARTESIANPOINT((-0.683012701892219,-0.183012701892219,1.0));
+#130= IFCCARTESIANPOINT((0.183012701892219,-0.683012701892219,1.0));
+#131= IFCADVANCEDFACE((#121),#122,.F.);
+#132= IFCORIENTEDEDGE(#32,#30,#53,.T.);
+#133= IFCORIENTEDEDGE(#30,#44,#81,.T.);
+#134= IFCORIENTEDEDGE(#44,#42,#77,.T.);
+#135= IFCORIENTEDEDGE(#42,#32,#85,.F.);
+#136= IFCEDGELOOP((#132,#133,#134,#135));
+#137= IFCFACEOUTERBOUND(#136,.T.);
+#138= IFCBSPLINESURFACEWITHKNOTS(3,1,((#139,#140),(#141,#142),(#143,#144),(#145,#146)),.UNSPECIFIED.,.F.,.F.,.U.,(4,4),(2,2),(0.0,1224.74487139159),(0.0,1.0),.UNSPECIFIED.);
+#139= IFCCARTESIANPOINT((-0.5,-0.5,0.0));
+#140= IFCCARTESIANPOINT((0.5,-0.5,0.0));
+#141= IFCCARTESIANPOINT((-0.27232909936926,-0.561004233964073,0.333333333333333));
+#142= IFCCARTESIANPOINT((0.561004233964073,-0.27232909936926,0.333333333333333));
+#143= IFCCARTESIANPOINT((-0.0446581987385206,-0.622008467928146,0.666666666666667));
+#144= IFCCARTESIANPOINT((0.622008467928146,-0.0446581987385206,0.666666666666667));
+#145= IFCCARTESIANPOINT((0.183012701892219,-0.683012701892219,1.0));
+#146= IFCCARTESIANPOINT((0.683012701892219,0.183012701892219,1.0));
+#147= IFCADVANCEDFACE((#137),#138,.F.);
+#148= IFCORIENTEDEDGE(#34,#32,#57,.T.);
+#149= IFCORIENTEDEDGE(#32,#42,#85,.T.);
+#150= IFCORIENTEDEDGE(#42,#40,#73,.T.);
+#151= IFCORIENTEDEDGE(#40,#34,#89,.F.);
+#152= IFCEDGELOOP((#148,#149,#150,#151));
+#153= IFCFACEOUTERBOUND(#152,.T.);
+#154= IFCBSPLINESURFACEWITHKNOTS(3,1,((#155,#156),(#157,#158),(#159,#160),(#161,#162)),.UNSPECIFIED.,.F.,.F.,.U.,(4,4),(2,2),(0.0,1224.74487139159),(1.0,2.0),.UNSPECIFIED.);
+#155= IFCCARTESIANPOINT((0.5,-0.5,0.0));
+#156= IFCCARTESIANPOINT((0.5,0.5,0.0));
+#157= IFCCARTESIANPOINT((0.561004233964073,-0.27232909936926,0.333333333333333));
+#158= IFCCARTESIANPOINT((0.27232909936926,0.561004233964073,0.333333333333333));
+#159= IFCCARTESIANPOINT((0.622008467928146,-0.0446581987385206,0.666666666666667));
+#160= IFCCARTESIANPOINT((0.0446581987385206,0.622008467928146,0.666666666666667));
+#161= IFCCARTESIANPOINT((0.683012701892219,0.183012701892219,1.0));
+#162= IFCCARTESIANPOINT((-0.183012701892219,0.683012701892219,1.0));
+#163= IFCADVANCEDFACE((#153),#154,.F.);
+#164= IFCORIENTEDEDGE(#36,#34,#61,.T.);
+#165= IFCORIENTEDEDGE(#34,#40,#89,.T.);
+#166= IFCORIENTEDEDGE(#40,#38,#69,.T.);
+#167= IFCORIENTEDEDGE(#38,#36,#93,.F.);
+#168= IFCEDGELOOP((#164,#165,#166,#167));
+#169= IFCFACEOUTERBOUND(#168,.T.);
+#170= IFCBSPLINESURFACEWITHKNOTS(3,1,((#171,#172),(#173,#174),(#175,#176),(#177,#178)),.UNSPECIFIED.,.F.,.F.,.U.,(4,4),(2,2),(0.0,1224.74487139159),(2.0,3.0),.UNSPECIFIED.);
+#171= IFCCARTESIANPOINT((0.5,0.5,0.0));
+#172= IFCCARTESIANPOINT((-0.5,0.5,0.0));
+#173= IFCCARTESIANPOINT((0.27232909936926,0.561004233964073,0.333333333333333));
+#174= IFCCARTESIANPOINT((-0.561004233964073,0.27232909936926,0.333333333333333));
+#175= IFCCARTESIANPOINT((0.0446581987385206,0.622008467928146,0.666666666666667));
+#176= IFCCARTESIANPOINT((-0.622008467928146,0.0446581987385206,0.666666666666667));
+#177= IFCCARTESIANPOINT((-0.183012701892219,0.683012701892219,1.0));
+#178= IFCCARTESIANPOINT((-0.683012701892219,-0.183012701892219,1.0));
+#179= IFCADVANCEDFACE((#169),#170,.F.);
+#180= IFCADVANCEDBREP(#29);
+#181= IFCBUILDINGELEMENTPROXY('1hMBdOkWj7WhC2kvgZp44F',#6,'BuildingElementProxy',$,$,#184,#182,$,.NOTDEFINED.);
+#182= IFCPRODUCTDEFINITIONSHAPE($,$,(#183));
+#183= IFCSHAPEREPRESENTATION(#15,'Body','AdvancedBrep',(#180));
+#184= IFCLOCALPLACEMENT($,#11);
+ENDSEC;
+
+END-ISO-10303-21;
+
+
diff --git a/test/input/basic_shape_Brep.ifc b/test/input/basic_shape_Brep.ifc
new file mode 100644
index 0000000..4dac3d1
--- /dev/null
+++ b/test/input/basic_shape_Brep.ifc
@@ -0,0 +1,120 @@
+ISO-10303-21;
+HEADER;
+/* NOTE a valid model view name has to be asserted, replacing 'notYetAssigned' ----------------- */
+FILE_DESCRIPTION(
+    ( 'ViewDefinition [notYetAssigned]'
+     ,'Comment [manual creation of example file]'
+	)
+	,'2;1');
+/* NOTE standard header information according to ISO 10303-21 ---------------------------------- */
+FILE_NAME(
+	'basic_shape_Brep.ifc',
+	'2012-06-18T18:00:00',
+	('Thomas Liebich'),
+	('buildingSMART International'),
+	'IFC text editor',
+	'IFC text editor',
+	'reference file created for the IFC4 specification');
+/* NOTE schema name to be replaced with 'IFC4' after the final release  ------------------------ */
+FILE_SCHEMA(('IFC4'));
+ENDSEC;
+
+DATA;
+/* --------------------------------------------------------------------------------------------- */
+/* general entities required for all IFC data sets, defining the context for the exchange ------ */
+#100= IFCPROJECT('0xScRe4drECQ4DMSqUjd6d',#110,'proxy with brep',$,$,$,$,(#201),#301);
+
+/* single owner history sufficient if not otherwise required by the view definition ------------ */
+/* provides the person and application creating the data set, and the time it is created ------- */
+#110= IFCOWNERHISTORY(#111,#115,$,.ADDED.,1320688800,$,$,1320688800);
+#111= IFCPERSONANDORGANIZATION(#112,#113,$);
+#112= IFCPERSON($,'Liebich','Thomas',$,$,$,$,$);
+#113= IFCORGANIZATION($,'buildingSMART International',$,$,$);
+#115= IFCAPPLICATION(#113,'1.0','IFC text editor','ifcTE');
+
+/* each IFC data set containing geometry has to define a geometric representation context ------ */
+/* the attribute 'ContextType' has to be 'Model' for 3D model geometry ------------------------- */
+#201= IFCGEOMETRICREPRESENTATIONCONTEXT($,'Model',3,1.0E-5,#210,$);
+/* the attribute 'ContextIdentifier' has to be 'Body' for the main 3D shape representation ----- */
+#202= IFCGEOMETRICREPRESENTATIONSUBCONTEXT('Body','Model',*,*,*,*,#201,$,.MODEL_VIEW.,$);
+#210= IFCAXIS2PLACEMENT3D(#901,$,$);
+
+/* each IFC data set containing geometry has to define at absolute minimum length and angle ---- */
+/* here length is milli metre as SI unit, and plane angle is 'degree' as non SI unit ----------- */
+#301= IFCUNITASSIGNMENT((#311,#312));
+#311= IFCSIUNIT(*,.LENGTHUNIT.,.MILLI.,.METRE.);
+#312= IFCCONVERSIONBASEDUNIT(#313,.PLANEANGLEUNIT.,'degree',#314);
+#313= IFCDIMENSIONALEXPONENTS(0,0,0,0,0,0,0);
+#314= IFCMEASUREWITHUNIT(IFCPLANEANGLEMEASURE(0.017453293),#315);
+#315= IFCSIUNIT(*,.PLANEANGLEUNIT.,$,.RADIAN.);
+
+/* each IFC data set containing elements in a building context has to include a building ------- */
+/* at absolute minimum (could have a site and stories as well) --------------------------------- */
+#500= IFCBUILDING('2FCZDorxHDT8NI01kdXi8P',$,'Test Building',$,$,#511,$,$,.ELEMENT.,$,$,$);
+/* if the building is the uppermost spatial structure element it defines the absolut position -- */
+#511= IFCLOCALPLACEMENT($,#512);
+/* no rotation - z and x axes set to '$' are therefore identical to "world coordinate system" -- */ 
+#512= IFCAXIS2PLACEMENT3D(#901,$,$);
+/* if the building is the uppermost spatial structure element it is assigned to the project ---- */
+#519= IFCRELAGGREGATES('2YBqaV_8L15eWJ9DA1sGmT',$,$,$,#100,(#500));
+
+/* shared coordinates - it is permissable to share common instances to reduce file size -------- */
+#901= IFCCARTESIANPOINT((0.,0.,0.));
+#902= IFCDIRECTION((1.,0.,0.));
+#903= IFCDIRECTION((0.,1.,0.));
+#904= IFCDIRECTION((0.,0.,1.)); 
+#905= IFCDIRECTION((-1.,0.,0.));
+#906= IFCDIRECTION((0.,-1.,0.));
+#907= IFCDIRECTION((0.,0.,-1.));
+
+/* --------------------------------------------------------------------------------------------- */
+/* proxy element with brep shape representation, assigned to the building ---------------------- */
+#1000= IFCBUILDINGELEMENTPROXY('1kTvXnbbzCWw8lcMd1dR4o',$,'P-1','sample proxy',$,#1001,#1010,$,$);
+/* proxy element placement relative to the building -------------------------------------------- */
+#1001= IFCLOCALPLACEMENT(#511,#1002);
+/* set local placement to 1 meter on x-axis, and 0 on y, and 0 on z axes ----------------------- */
+/* no rotation - z and x axes set to '$' are therefore identical to those of building ---------- */ 
+#1002= IFCAXIS2PLACEMENT3D(#1003,$,$);
+#1003= IFCCARTESIANPOINT((1000.,0.,0.));
+/* proxy element shape representation ---------------------------------------------------------- */
+#1010= IFCPRODUCTDEFINITIONSHAPE($,$,(#1020));
+/* a single shape representation of type 'brep' is included ------------------------------------ */
+#1020= IFCSHAPEREPRESENTATION(#202,'Body','Brep',(#1021));
+/* faceted boundary representation ------------------------------------------------------------- */
+/* cube, 1m width, 1m depth, 2m height --------------------------------------------------------- */
+#1021= IFCFACETEDBREP (#1022);
+#1022= IFCCLOSEDSHELL ((#1110, #1120, #1130, #1140, #1150, #1160));
+#1110= IFCFACE((#1111));
+#1111= IFCFACEOUTERBOUND(#1112,.T.);
+#1112= IFCPOLYLOOP((#1201,#1202,#1206,#1205));
+#1120= IFCFACE((#1121));
+#1121= IFCFACEOUTERBOUND(#1122,.T.);
+#1122= IFCPOLYLOOP((#1206,#1202,#1203,#1207));
+#1130= IFCFACE((#1131));
+#1131= IFCFACEOUTERBOUND(#1132,.T.);
+#1132= IFCPOLYLOOP((#1207,#1203,#1204,#1208));
+#1140= IFCFACE((#1141));
+#1141= IFCFACEOUTERBOUND(#1142,.T.);
+#1142= IFCPOLYLOOP((#1208,#1204,#1201,#1205));
+#1150= IFCFACE((#1151));
+#1151= IFCFACEOUTERBOUND(#1152,.T.);
+#1152= IFCPOLYLOOP((#1201,#1204,#1203,#1202));
+#1160= IFCFACE((#1161));
+#1161= IFCFACEOUTERBOUND(#1162,.T.);
+#1162= IFCPOLYLOOP((#1206,#1207,#1208,#1205));
+/* shared vertices of the faceted boundary representation -------------------------------------- */
+#1201= IFCCARTESIANPOINT((-500.,-500.,0.));
+#1202= IFCCARTESIANPOINT((500.,-500.,0.));
+#1203= IFCCARTESIANPOINT((500.,500.,0.));
+#1204= IFCCARTESIANPOINT((-500.,500.,0.));
+#1205= IFCCARTESIANPOINT((-500.,-500.,2000.));
+#1206= IFCCARTESIANPOINT((500.,-500.,2000.));
+#1207= IFCCARTESIANPOINT((500.,500.,2000.));
+#1208= IFCCARTESIANPOINT((-500.,500.,2000.));
+
+/* proxy element assigned to the building ------------------------------------------------------ */
+#10000=IFCRELCONTAINEDINSPATIALSTRUCTURE('2TnxZkTXT08eDuMuhUUFNy',$,'Physical model',$,(#1000),#500);
+
+
+ENDSEC;
+END-ISO-10303-21;
\ No newline at end of file
diff --git a/test/input/basic_shape_CSG.ifc b/test/input/basic_shape_CSG.ifc
new file mode 100644
index 0000000..4480542
--- /dev/null
+++ b/test/input/basic_shape_CSG.ifc
@@ -0,0 +1,94 @@
+ISO-10303-21;
+HEADER;
+/* NOTE a valid model view name has to be asserted, replacing 'notYetAssigned' ----------------- */
+FILE_DESCRIPTION(
+    ( 'ViewDefinition [notYetAssigned]'
+     ,'Comment [manual creation of example file]'
+	)
+	,'2;1');
+/* NOTE standard header information according to ISO 10303-21 ---------------------------------- */
+FILE_NAME(
+	'basic_shape_CSG.ifc',
+	'2012-06-15T18:00:00',
+	('Thomas Liebich'),
+	('buildingSMART International'),
+	'IFC text editor',
+	'IFC text editor',
+	'reference file created for the IFC4 specification');
+/* NOTE schema name to be replaced with 'IFC4' after the final release  ------------------------ */
+FILE_SCHEMA(('IFC4'));
+ENDSEC;
+
+DATA;
+/* --------------------------------------------------------------------------------------------- */
+/* general entities required for all IFC data sets, defining the context for the exchange ------ */
+#100= IFCPROJECT('0xScRe4drECQ4DMSqUjd6d',#110,'proxy with CSG',$,$,$,$,(#201),#301);
+
+/* single owner history sufficient if not otherwise required by the view definition ------------ */
+/* provides the person and application creating the data set, and the time it is created ------- */
+#110= IFCOWNERHISTORY(#111,#115,$,.ADDED.,1320688800,$,$,1320688800);
+#111= IFCPERSONANDORGANIZATION(#112,#113,$);
+#112= IFCPERSON($,'Liebich','Thomas',$,$,$,$,$);
+#113= IFCORGANIZATION($,'buildingSMART International',$,$,$);
+#115= IFCAPPLICATION(#113,'1.0','IFC text editor','ifcTE');
+
+/* each IFC data set containing geometry has to define a geometric representation context ------ */
+/* the attribute 'ContextType' has to be 'Model' for 3D model geometry ------------------------- */
+#201= IFCGEOMETRICREPRESENTATIONCONTEXT($,'Model',3,1.0E-5,#210,$);
+/* the attribute 'ContextIdentifier' has to be 'Body' for the main 3D shape representation ----- */
+#202= IFCGEOMETRICREPRESENTATIONSUBCONTEXT('Body','Model',*,*,*,*,#201,$,.MODEL_VIEW.,$);
+#210= IFCAXIS2PLACEMENT3D(#901,$,$);
+
+/* each IFC data set containing geometry has to define at absolute minimum length and angle ---- */
+/* here length is milli metre as SI unit, and plane angle is 'degree' as non SI unit ----------- */
+#301= IFCUNITASSIGNMENT((#311,#312));
+#311= IFCSIUNIT(*,.LENGTHUNIT.,.MILLI.,.METRE.);
+#312= IFCCONVERSIONBASEDUNIT(#313,.PLANEANGLEUNIT.,'degree',#314);
+#313= IFCDIMENSIONALEXPONENTS(0,0,0,0,0,0,0);
+#314= IFCMEASUREWITHUNIT(IFCPLANEANGLEMEASURE(0.017453293),#315);
+#315= IFCSIUNIT(*,.PLANEANGLEUNIT.,$,.RADIAN.);
+
+/* each IFC data set containing elements in a building context has to include a building ------- */
+/* at absolute minimum (could have a site and stories as well) --------------------------------- */
+#500= IFCBUILDING('2FCZDorxHDT8NI01kdXi8P',$,'Test Building',$,$,#511,$,$,.ELEMENT.,$,$,$);
+/* if the building is the uppermost spatial structure element it defines the absolut position -- */
+#511= IFCLOCALPLACEMENT($,#512);
+/* no rotation - z and x axes set to '$' are therefore identical to "world coordinate system" -- */ 
+#512= IFCAXIS2PLACEMENT3D(#901,$,$);
+/* if the building is the uppermost spatial structure element it is assigned to the project ---- */
+#519= IFCRELAGGREGATES('2YBqaV_8L15eWJ9DA1sGmT',$,$,$,#100,(#500));
+
+/* shared coordinates - it is permissable to share common instances to reduce file size -------- */
+#901= IFCCARTESIANPOINT((0.,0.,0.));
+#902= IFCDIRECTION((1.,0.,0.));
+#903= IFCDIRECTION((0.,1.,0.));
+#904= IFCDIRECTION((0.,0.,1.)); 
+#905= IFCDIRECTION((-1.,0.,0.));
+#906= IFCDIRECTION((0.,-1.,0.));
+#907= IFCDIRECTION((0.,0.,-1.));
+
+/* --------------------------------------------------------------------------------------------- */
+/* proxy element with CSG shape representation, assigned to the building ----------------------- */
+#1000= IFCBUILDINGELEMENTPROXY('1kTvXnbbzCWw8lcMd1dR4o',$,'P-1','sample CSG',$,#1001,#1010,$,$);
+/* proxy element placement relative to the building -------------------------------------------- */
+#1001= IFCLOCALPLACEMENT(#511,#1002);
+/* set local placement to 1 meter on x-axis, and 0 on y, and 0 on z axes ----------------------- */
+/* no rotation - z and x axes set to '$' are therefore identical to those of building ---------- */ 
+#1002= IFCAXIS2PLACEMENT3D(#1003,$,$);
+#1003= IFCCARTESIANPOINT((1000.,0.,0.));
+/* proxy element shape representation ---------------------------------------------------------- */
+#1010= IFCPRODUCTDEFINITIONSHAPE($,$,(#1020));
+/* a single shape representation of type 'CSG' is included ------------------------------------- */
+#1020= IFCSHAPEREPRESENTATION(#202,'Body','CSG',(#1021));
+/* CSG representation consisting of a single primitive  ---------------------------------------- */
+/* box, 1m width, 1m depth, 2m height ---------------------------------------------------------- */
+#1021= IFCCSGSOLID(#1022);
+#1022= IFCBLOCK(#1023,1000.,1000.,2000.);
+#1023= IFCAXIS2PLACEMENT3D(#1024,$,$);
+#1024= IFCCARTESIANPOINT((-500.,-500.,0.));
+
+/* proxy element assigned to the building ------------------------------------------------------ */
+#10000=IFCRELCONTAINEDINSPATIALSTRUCTURE('2TnxZkTXT08eDuMuhUUFNy',$,'Physical model',$,(#1000),#500);
+
+ENDSEC;
+END-ISO-10303-21;
\ No newline at end of file
diff --git a/test/input/basic_shape_SurfaceModel.ifc b/test/input/basic_shape_SurfaceModel.ifc
new file mode 100644
index 0000000..282d487
--- /dev/null
+++ b/test/input/basic_shape_SurfaceModel.ifc
@@ -0,0 +1,119 @@
+ISO-10303-21;
+HEADER;
+/* NOTE a valid model view name has to be asserted, replacing 'notYetAssigned' ----------------- */
+FILE_DESCRIPTION(
+    ( 'ViewDefinition [notYetAssigned]'
+     ,'Comment [manual creation of example file]'
+	)
+	,'2;1');
+/* NOTE standard header information according to ISO 10303-21 ---------------------------------- */
+FILE_NAME(
+	'IfcBuildingElementProxy_SurfaceModel.ifc',
+	'2011-11-07T18:00:00',
+	('Thomas Liebich'),
+	('buildingSMART International'),
+	'IFC text editor',
+	'IFC text editor',
+	'reference file created for the IFC4 specification');
+/* NOTE schema name to be replaced with 'IFC4' after the final release  ------------------------ */
+FILE_SCHEMA(('IFC4'));
+ENDSEC;
+
+DATA;
+/* --------------------------------------------------------------------------------------------- */
+/* general entities required for all IFC data sets, defining the context for the exchange ------ */
+#100= IFCPROJECT('0xScRe4drECQ4DMSqUjd6d',#110,'proxy with surface model',$,$,$,$,(#201),#301);
+
+/* single owner history sufficient if not otherwise required by the view definition ------------ */
+/* provides the person and application creating the data set, and the time it is created ------- */
+#110= IFCOWNERHISTORY(#111,#115,$,.ADDED.,1320688800,$,$,1320688800);
+#111= IFCPERSONANDORGANIZATION(#112,#113,$);
+#112= IFCPERSON($,'Liebich','Thomas',$,$,$,$,$);
+#113= IFCORGANIZATION($,'buildingSMART International',$,$,$);
+#115= IFCAPPLICATION(#113,'1.0','IFC text editor','ifcTE');
+
+/* each IFC data set containing geometry has to define a geometric representation context ------ */
+/* the attribute 'ContextType' has to be 'Model' for 3D model geometry ------------------------- */
+#201= IFCGEOMETRICREPRESENTATIONCONTEXT($,'Model',3,1.0E-5,#210,$);
+/* the attribute 'ContextIdentifier' has to be 'Body' for the main 3D shape representation ----- */
+#202= IFCGEOMETRICREPRESENTATIONSUBCONTEXT('Body','Model',*,*,*,*,#201,$,.MODEL_VIEW.,$);
+#210= IFCAXIS2PLACEMENT3D(#901,$,$);
+
+/* each IFC data set containing geometry has to define at absolute minimum length and angle ---- */
+/* here length is milli metre as SI unit, and plane angle is 'degree' as non SI unit ----------- */
+#301= IFCUNITASSIGNMENT((#311,#312));
+#311= IFCSIUNIT(*,.LENGTHUNIT.,.MILLI.,.METRE.);
+#312= IFCCONVERSIONBASEDUNIT(#313,.PLANEANGLEUNIT.,'degree',#314);
+#313= IFCDIMENSIONALEXPONENTS(0,0,0,0,0,0,0);
+#314= IFCMEASUREWITHUNIT(IFCPLANEANGLEMEASURE(0.017453293),#315);
+#315= IFCSIUNIT(*,.PLANEANGLEUNIT.,$,.RADIAN.);
+
+/* each IFC data set containing elements in a building context has to include a building ------- */
+/* at absolute minimum (could have a site and stories as well) --------------------------------- */
+#500= IFCBUILDING('2FCZDorxHDT8NI01kdXi8P',$,'Test Building',$,$,#511,$,$,.ELEMENT.,$,$,$);
+/* if the building is the uppermost spatial structure element it defines the absolut position -- */
+#511= IFCLOCALPLACEMENT($,#512);
+/* no rotation - z and x axes set to '$' are therefore identical to "world coordinate system" -- */ 
+#512= IFCAXIS2PLACEMENT3D(#901,$,$);
+/* if the building is the uppermost spatial structure element it is assigned to the project ---- */
+#519= IFCRELAGGREGATES('2YBqaV_8L15eWJ9DA1sGmT',$,$,$,#100,(#500));
+
+/* shared coordinates - it is permissable to share common instances to reduce file size -------- */
+#901= IFCCARTESIANPOINT((0.,0.,0.));
+#902= IFCDIRECTION((1.,0.,0.));
+#903= IFCDIRECTION((0.,1.,0.));
+#904= IFCDIRECTION((0.,0.,1.)); 
+#905= IFCDIRECTION((-1.,0.,0.));
+#906= IFCDIRECTION((0.,-1.,0.));
+#907= IFCDIRECTION((0.,0.,-1.));
+
+/* --------------------------------------------------------------------------------------------- */
+/* proxy element with surface model shape representation, assigned to the building ------------- */
+#1000= IFCBUILDINGELEMENTPROXY('1kTvXnbbzCWw8lcMd1dR4o',$,'P-1','sample proxy',$,#1001,#1010,$,$);
+/* proxy element placement relative to the building -------------------------------------------- */
+#1001= IFCLOCALPLACEMENT(#511,#1002);
+/* set local placement to 1 meter on x-axis, and 0 on y, and 0 on z axes ----------------------- */
+/* no rotation - z and x axes set to '$' are therefore identical to those of building ---------- */ 
+#1002= IFCAXIS2PLACEMENT3D(#1003,$,$);
+#1003= IFCCARTESIANPOINT((1000.,0.,0.));
+/* proxy element shape representation ---------------------------------------------------------- */
+#1010= IFCPRODUCTDEFINITIONSHAPE($,$,(#1020));
+/* a single shape representation of type 'SurfaceModel' is included ---------------------------- */
+#1020= IFCSHAPEREPRESENTATION(#202,'Body','SurfaceModel',(#1021));
+/* face based surface representation ----------------------------------------------------------- */
+/* cube, 1m width, 1m depth, 2m height --------------------------------------------------------- */
+#1021= IFCFACEBASEDSURFACEMODEL ((#1022));
+#1022= IFCCONNECTEDFACESET ((#1110, #1120, #1130, #1140, #1150, #1160));
+#1110= IFCFACE((#1111));
+#1111= IFCFACEOUTERBOUND(#1112,.T.);
+#1112= IFCPOLYLOOP((#1201,#1202,#1206,#1205));
+#1120= IFCFACE((#1121));
+#1121= IFCFACEOUTERBOUND(#1122,.T.);
+#1122= IFCPOLYLOOP((#1206,#1202,#1203,#1207));
+#1130= IFCFACE((#1131));
+#1131= IFCFACEOUTERBOUND(#1132,.T.);
+#1132= IFCPOLYLOOP((#1207,#1203,#1204,#1208));
+#1140= IFCFACE((#1141));
+#1141= IFCFACEOUTERBOUND(#1142,.T.);
+#1142= IFCPOLYLOOP((#1208,#1204,#1201,#1205));
+#1150= IFCFACE((#1151));
+#1151= IFCFACEOUTERBOUND(#1152,.T.);
+#1152= IFCPOLYLOOP((#1201,#1204,#1203,#1202));
+#1160= IFCFACE((#1161));
+#1161= IFCFACEOUTERBOUND(#1162,.T.);
+#1162= IFCPOLYLOOP((#1206,#1207,#1208,#1205));
+/* shared vertices of the faceted boundary representation -------------------------------------- */
+#1201= IFCCARTESIANPOINT((-500.,-500.,0.));
+#1202= IFCCARTESIANPOINT((500.,-500.,0.));
+#1203= IFCCARTESIANPOINT((500.,500.,0.));
+#1204= IFCCARTESIANPOINT((-500.,500.,0.));
+#1205= IFCCARTESIANPOINT((-500.,-500.,2000.));
+#1206= IFCCARTESIANPOINT((500.,-500.,2000.));
+#1207= IFCCARTESIANPOINT((500.,500.,2000.));
+#1208= IFCCARTESIANPOINT((-500.,500.,2000.));
+
+/* proxy element assigned to the building ------------------------------------------------------ */
+#10000=IFCRELCONTAINEDINSPATIALSTRUCTURE('2TnxZkTXT08eDuMuhUUFNy',$,'Physical model',$,(#1000),#500);
+
+ENDSEC;
+END-ISO-10303-21;
\ No newline at end of file
diff --git a/test/input/basic_shape_SweptSolid.ifc b/test/input/basic_shape_SweptSolid.ifc
new file mode 100644
index 0000000..e2b557c
--- /dev/null
+++ b/test/input/basic_shape_SweptSolid.ifc
@@ -0,0 +1,97 @@
+ISO-10303-21;
+HEADER;
+/* NOTE a valid model view name has to be asserted, replacing 'notYetAssigned' ----------------- */
+FILE_DESCRIPTION(
+    ( 'ViewDefinition [notYetAssigned]'
+     ,'Comment [manual creation of example file]'
+	)
+	,'2;1');
+/* NOTE standard header information according to ISO 10303-21 ---------------------------------- */
+FILE_NAME(
+	'basic_shape_SweptSolid.ifc',
+	'2012-06-18T18:00:00',
+	('Thomas Liebich'),
+	('buildingSMART International'),
+	'IFC text editor',
+	'IFC text editor',
+	'reference file created for the IFC4 specification');
+/* NOTE schema name to be replaced with 'IFC4' after the final release  ------------------------ */
+FILE_SCHEMA(('IFC4'));
+ENDSEC;
+
+DATA;
+/* --------------------------------------------------------------------------------------------- */
+/* general entities required for all IFC data sets, defining the context for the exchange ------ */
+#100= IFCPROJECT('0xScRe4drECQ4DMSqUjd6d',#110,'proxy with swept solid',$,$,$,$,(#201),#301);
+
+/* single owner history sufficient if not otherwise required by the view definition ------------ */
+/* provides the person and application creating the data set, and the time it is created ------- */
+#110= IFCOWNERHISTORY(#111,#115,$,.ADDED.,1320688800,$,$,1320688800);
+#111= IFCPERSONANDORGANIZATION(#112,#113,$);
+#112= IFCPERSON($,'Liebich','Thomas',$,$,$,$,$);
+#113= IFCORGANIZATION($,'buildingSMART International',$,$,$);
+#115= IFCAPPLICATION(#113,'1.0','IFC text editor','ifcTE');
+
+/* each IFC data set containing geometry has to define a geometric representation context ------ */
+/* the attribute 'ContextType' has to be 'Model' for 3D model geometry ------------------------- */
+#201= IFCGEOMETRICREPRESENTATIONCONTEXT($,'Model',3,1.0E-5,#210,$);
+/* the attribute 'ContextIdentifier' has to be 'Body' for the main 3D shape representation ----- */
+#202= IFCGEOMETRICREPRESENTATIONSUBCONTEXT('Body','Model',*,*,*,*,#201,$,.MODEL_VIEW.,$);
+#210= IFCAXIS2PLACEMENT3D(#901,$,$);
+
+/* each IFC data set containing geometry has to define at absolute minimum length and angle ---- */
+/* here length is milli metre as SI unit, and plane angle is 'degree' as non SI unit ----------- */
+#301= IFCUNITASSIGNMENT((#311,#312));
+#311= IFCSIUNIT(*,.LENGTHUNIT.,.MILLI.,.METRE.);
+#312= IFCCONVERSIONBASEDUNIT(#313,.PLANEANGLEUNIT.,'degree',#314);
+#313= IFCDIMENSIONALEXPONENTS(0,0,0,0,0,0,0);
+#314= IFCMEASUREWITHUNIT(IFCPLANEANGLEMEASURE(0.017453293),#315);
+#315= IFCSIUNIT(*,.PLANEANGLEUNIT.,$,.RADIAN.);
+
+/* each IFC data set containing elements in a building context has to include a building ------- */
+/* at absolute minimum (could have a site and stories as well) --------------------------------- */
+#500= IFCBUILDING('2FCZDorxHDT8NI01kdXi8P',$,'Test Building',$,$,#511,$,$,.ELEMENT.,$,$,$);
+/* if the building is the uppermost spatial structure element it defines the absolut position -- */
+#511= IFCLOCALPLACEMENT($,#512);
+/* no rotation - z and x axes set to '$' are therefore identical to "world coordinate system" -- */ 
+#512= IFCAXIS2PLACEMENT3D(#901,$,$);
+/* if the building is the uppermost spatial structure element it is assigned to the project ---- */
+#519= IFCRELAGGREGATES('2YBqaV_8L15eWJ9DA1sGmT',$,$,$,#100,(#500));
+
+/* shared coordinates - it is permissable to share common instances to reduce file size -------- */
+#901= IFCCARTESIANPOINT((0.,0.,0.));
+#902= IFCDIRECTION((1.,0.,0.));
+#903= IFCDIRECTION((0.,1.,0.));
+#904= IFCDIRECTION((0.,0.,1.)); 
+#905= IFCDIRECTION((-1.,0.,0.));
+#906= IFCDIRECTION((0.,-1.,0.));
+#907= IFCDIRECTION((0.,0.,-1.));
+
+/* --------------------------------------------------------------------------------------------- */
+/* proxy element with swept solid shape representation, assigned to the building --------------- */
+#1000= IFCBUILDINGELEMENTPROXY('1kTvXnbbzCWw8lcMd1dR4o',$,'P-1','sample proxy',$,#1001,#1010,$,$);
+/* proxy element placement relative to the building -------------------------------------------- */
+#1001= IFCLOCALPLACEMENT(#511,#1002);
+/* set local placement to 1 meter on x-axis, and 0 on y, and 0 on z axes ----------------------- */
+/* no rotation - z and x axes set to '$' are therefore identical to those of building ---------- */ 
+#1002= IFCAXIS2PLACEMENT3D(#1003,$,$);
+#1003= IFCCARTESIANPOINT((1000.,0.,0.));
+/* proxy element shape representation ---------------------------------------------------------- */
+#1010= IFCPRODUCTDEFINITIONSHAPE($,$,(#1020));
+/* a single shape representation of type 'SweptSolid' is included ------------------------------ */
+#1020= IFCSHAPEREPRESENTATION(#202,'Body','SweptSolid',(#1021));
+/* based on a profile (or cross section) of 1m by 1m being extruded by 2m ---------------------- */
+#1021= IFCEXTRUDEDAREASOLID(#1022,$,#1034,2000.);
+#1022= IFCRECTANGLEPROFILEDEF(.AREA.,'1m x 1m rectangle',$,1000.,1000.);
+/* extrusion body is placed centric with no rotation inside the object coordinate placement ---- */
+/* extrusion position z = default = (0.,0.,1.), x = default = (1.,0.,0.) ----------------------- */
+/* the default position, i.e. no re-positioning of the results, hence the position is NIL ------ */
+/* the extrusion if perpendicular to the profile - i.e. along the positive z-axis -------------- */
+#1034= IFCDIRECTION((0.,0.,1.)); 
+
+/* proxy element assigned to the building ------------------------------------------------------ */
+#10000=IFCRELCONTAINEDINSPATIALSTRUCTURE('2TnxZkTXT08eDuMuhUUFNy',$,'Physical model',$,(#1000),#500);
+
+
+ENDSEC;
+END-ISO-10303-21;
\ No newline at end of file
diff --git a/test/input/basic_shape_Tessellation.ifc b/test/input/basic_shape_Tessellation.ifc
new file mode 100644
index 0000000..035f9e6
--- /dev/null
+++ b/test/input/basic_shape_Tessellation.ifc
@@ -0,0 +1,92 @@
+ISO-10303-21;
+HEADER;
+/* NOTE a valid model view name has to be asserted, replacing 'notYetAssigned' ----------------- */
+FILE_DESCRIPTION(
+    ( 'ViewDefinition [notYetAssigned]'
+     ,'Comment [manual creation of example file]'
+	)
+	,'2;1');
+/* NOTE standard header information according to ISO 10303-21 ---------------------------------- */
+FILE_NAME(
+	'IfcBuildingElementProxy_Tessellation.ifc',
+	'2012-07-04T18:00:00',
+	('Thomas Liebich'),
+	('buildingSMART International'),
+	'IFC text editor',
+	'IFC text editor',
+	'reference file created for the IFC4 specification');
+/* NOTE schema name to be replaced with 'IFC4' after the final release  ------------------------ */
+FILE_SCHEMA(('IFC4'));
+ENDSEC;
+
+DATA;
+/* --------------------------------------------------------------------------------------------- */
+/* general entities required for all IFC data sets, defining the context for the exchange ------ */
+#100= IFCPROJECT('0xScRe4drECQ4DMSqUjd6d',#110,'proxy with tessellation',$,$,$,$,(#201),#301);
+
+/* single owner history sufficient if not otherwise required by the view definition ------------ */
+/* provides the person and application creating the data set, and the time it is created ------- */
+#110= IFCOWNERHISTORY(#111,#115,$,.ADDED.,1320688800,$,$,1320688800);
+#111= IFCPERSONANDORGANIZATION(#112,#113,$);
+#112= IFCPERSON($,'Liebich','Thomas',$,$,$,$,$);
+#113= IFCORGANIZATION($,'buildingSMART International',$,$,$);
+#115= IFCAPPLICATION(#113,'1.0','IFC text editor','ifcTE');
+
+/* each IFC data set containing geometry has to define a geometric representation context ------ */
+/* the attribute 'ContextType' has to be 'Model' for 3D model geometry ------------------------- */
+#201= IFCGEOMETRICREPRESENTATIONCONTEXT($,'Model',3,1.0E-5,#210,$);
+/* the attribute 'ContextIdentifier' has to be 'Body' for the main 3D shape representation ----- */
+#202= IFCGEOMETRICREPRESENTATIONSUBCONTEXT('Body','Model',*,*,*,*,#201,$,.MODEL_VIEW.,$);
+#210= IFCAXIS2PLACEMENT3D(#901,$,$);
+
+/* each IFC data set containing geometry has to define at absolute minimum length and angle ---- */
+/* here length is milli metre as SI unit, and plane angle is 'degree' as non SI unit ----------- */
+#301= IFCUNITASSIGNMENT((#311,#312));
+#311= IFCSIUNIT(*,.LENGTHUNIT.,.MILLI.,.METRE.);
+#312= IFCCONVERSIONBASEDUNIT(#313,.PLANEANGLEUNIT.,'degree',#314);
+#313= IFCDIMENSIONALEXPONENTS(0,0,0,0,0,0,0);
+#314= IFCMEASUREWITHUNIT(IFCPLANEANGLEMEASURE(0.017453293),#315);
+#315= IFCSIUNIT(*,.PLANEANGLEUNIT.,$,.RADIAN.);
+
+/* each IFC data set containing elements in a building context has to include a building ------- */
+/* at absolute minimum (could have a site and stories as well) --------------------------------- */
+#500= IFCBUILDING('2FCZDorxHDT8NI01kdXi8P',$,'Test Building',$,$,#511,$,$,.ELEMENT.,$,$,$);
+/* if the building is the uppermost spatial structure element it defines the absolut position -- */
+#511= IFCLOCALPLACEMENT($,#512);
+/* no rotation - z and x axes set to '$' are therefore identical to "world coordinate system" -- */ 
+#512= IFCAXIS2PLACEMENT3D(#901,$,$);
+/* if the building is the uppermost spatial structure element it is assigned to the project ---- */
+#519= IFCRELAGGREGATES('2YBqaV_8L15eWJ9DA1sGmT',$,$,$,#100,(#500));
+
+/* shared coordinates - it is permissable to share common instances to reduce file size -------- */
+#901= IFCCARTESIANPOINT((0.,0.,0.));
+#902= IFCDIRECTION((1.,0.,0.));
+#903= IFCDIRECTION((0.,1.,0.));
+#904= IFCDIRECTION((0.,0.,1.)); 
+#905= IFCDIRECTION((-1.,0.,0.));
+#906= IFCDIRECTION((0.,-1.,0.));
+#907= IFCDIRECTION((0.,0.,-1.));
+
+/* --------------------------------------------------------------------------------------------- */
+/* proxy element with tessellated shape representation, assigned to the building --------------- */
+#1000= IFCBUILDINGELEMENTPROXY('1kTvXnbbzCWw8lcMd1dR4o',$,'P-1','sample proxy',$,#1001,#1010,$,$);
+/* proxy element placement relative to the building -------------------------------------------- */
+#1001= IFCLOCALPLACEMENT(#511,#1002);
+/* set local placement to 1 meter on x-axis, and 0 on y, and 0 on z axes ----------------------- */
+/* no rotation - z and x axes set to '$' are therefore identical to those of building ---------- */ 
+#1002= IFCAXIS2PLACEMENT3D(#1003,$,$);
+#1003= IFCCARTESIANPOINT((1000.,0.,0.));
+/* proxy element shape representation ---------------------------------------------------------- */
+#1010= IFCPRODUCTDEFINITIONSHAPE($,$,(#1020));
+/* a single shape representation of type 'Tessellation' is included ---------------------------- */
+#1020= IFCSHAPEREPRESENTATION(#202,'Body','Tessellation',(#1021));
+/* tessellated surface representation by triangulation ----------------------------------------- */
+/* cube, 1m width, 1m depth, 2m height --------------------------------------------------------- */
+#1021= IFCTRIANGULATEDFACESET(#1022,$,.T.,((1,6,5),(1,2,6),(6,2,7),(7,2,3),(7,8,6),(6,8,5),(5,8,1),(1,8,4),(4,2,1),(2,4,3),(4,8,7),(7,3,4)),$);
+#1022= IFCCARTESIANPOINTLIST3D(((-500.,-500.,0.),(500.,-500.,0.),(500.,500.,0.),(-500.,500.,0.), (-500.,-500.,2000.),(500.,-500.,2000.),(500.,500.,2000.),(-500.,500.,2000.)));
+
+/* proxy element assigned to the building ------------------------------------------------------ */
+#10000=IFCRELCONTAINEDINSPATIALSTRUCTURE('2TnxZkTXT08eDuMuhUUFNy',$,'Physical model',$,(#1000),#500);
+
+ENDSEC;
+END-ISO-10303-21;
\ No newline at end of file
diff --git a/test/input/building_element_configuration_wall.ifc b/test/input/building_element_configuration_wall.ifc
new file mode 100644
index 0000000..5e91a99
--- /dev/null
+++ b/test/input/building_element_configuration_wall.ifc
@@ -0,0 +1,203 @@
+ISO-10303-21;
+HEADER;
+FILE_DESCRIPTION (
+        ('ViewDefinition [CoordinationView]'),
+        '2;1');
+FILE_NAME (
+        'building_element_configuration_wall.ifc',
+        '2011-12-12T22:18:35',
+        ('Architect'),
+        ('Test Office'),
+        'IFC Engine DLL version 1.03 beta',
+        'Geometry example',
+        'The authorising person');
+FILE_SCHEMA (('IFC4'));
+ENDSEC;
+DATA;
+
+/* --------------------------------------------------------------------------------------------- */
+/* general entities required for all IFC data sets, defining the context for the exchange ------ */
+#1 = IFCPROJECT('28hypXUBvBefc20SI8kfA$', #2, 'Default Project', 'Description of Default Project', $, $, $, (#20), #7);
+
+/* single owner history sufficient if not otherwise required by the view definition ------------ */
+/* provides the person and application creating the data set, and the time it is created ------- */
+#2 = IFCOWNERHISTORY(#3, #6, $, .NOTDEFINED., $, $, $, 1323724715);
+#3 = IFCPERSONANDORGANIZATION(#4, #5, $);
+#4 = IFCPERSON($, 'Bonsma', 'Peter', $, $, $, $, $);
+#5 = IFCORGANIZATION($, 'RDF', 'RDF Ltd.', $, $);
+#6 = IFCAPPLICATION(#5, '0.10', 'Test Application', 'TA 1001');
+
+/* each IFC data set containing geometry has to define at absolute minimum length and angle ---- */
+/* here length is milli metre as SI unit, and plane angle is 'degree' as non SI unit ----------- */
+#7 = IFCUNITASSIGNMENT((#8, #9, #10, #11, #15, #16, #17, #18, #19));
+#8 = IFCSIUNIT(*, .LENGTHUNIT., .MILLI., .METRE.);
+#9 = IFCSIUNIT(*, .AREAUNIT., $, .SQUARE_METRE.);
+#10 = IFCSIUNIT(*, .VOLUMEUNIT., $, .CUBIC_METRE.);
+#11 = IFCCONVERSIONBASEDUNIT(#12, .PLANEANGLEUNIT., 'DEGREE', #13);
+#12 = IFCDIMENSIONALEXPONENTS(0, 0, 0, 0, 0, 0, 0);
+#13 = IFCMEASUREWITHUNIT(IFCPLANEANGLEMEASURE(1.745E-2), #14);
+#14 = IFCSIUNIT(*, .PLANEANGLEUNIT., $, .RADIAN.);
+#15 = IFCSIUNIT(*, .SOLIDANGLEUNIT., $, .STERADIAN.);
+#16 = IFCSIUNIT(*, .MASSUNIT., $, .GRAM.);
+#17 = IFCSIUNIT(*, .TIMEUNIT., $, .SECOND.);
+#18 = IFCSIUNIT(*, .THERMODYNAMICTEMPERATUREUNIT., $, .DEGREE_CELSIUS.);
+#19 = IFCSIUNIT(*, .LUMINOUSINTENSITYUNIT., $, .LUMEN.);
+#20 = IFCGEOMETRICREPRESENTATIONCONTEXT($, 'Model', 3, 1.E-5, #21, #23);
+/* no rotation - z and x axes set to '$' are therefore identical to "world coordinate system" -- */
+#21 = IFCAXIS2PLACEMENT3D(#22, $, $);
+#22 = IFCCARTESIANPOINT((0., 0., 0.));
+#23 = IFCDIRECTION((0., 1.));
+
+/* shared coordinates - it is permissable to share common instances to reduce file size -------- */
+#24 = IFCCARTESIANPOINT((0., 0., 0.));
+#25 = IFCDIRECTION((1., 0., 0.));
+#26 = IFCDIRECTION((0., 1., 0.));
+#27 = IFCDIRECTION((0., 0., 1.));
+#28 = IFCDIRECTION((-1., 0., 0.));
+#29 = IFCDIRECTION((0., -1., 0.));
+#30 = IFCDIRECTION((0., 0., -1.));
+
+/* if site is irrelevant Building could be connected to project directly ----------------------- */
+#31 = IFCSITE('1cwlDi_hLEvPsClAelBNnz', #2, 'Default Site', 'Description of Default Site', $, #32, $, $, .ELEMENT., (24, 28, 0), (54, 25, 0), 10., $, $);
+#32 = IFCLOCALPLACEMENT($, #33);
+/* no rotation - z and x axes set to '$' are therefore identical to "world coordinate system" -- */
+#33 = IFCAXIS2PLACEMENT3D(#24, $, $);
+
+/* each IFC data set containing elements in a building context has to include a building ------- */
+/* at absolute minimum (could have a site and stories as well) --------------------------------- */
+#34 = IFCBUILDING('0AqAhXVxvCy9m0OX1nxY1A', #2, 'Default Building', 'Description of Default Building', $, #35, $, $, .ELEMENT., $, $, #37);
+/* if the building is the uppermost spatial structure element it defines the absolut position -- */
+#35 = IFCLOCALPLACEMENT(#32, #36);
+/* no rotation - z and x axes set to '$' are therefore identical to "world coordinate system" -- */
+#36 = IFCAXIS2PLACEMENT3D(#24, $, $);
+#37 = IFCPOSTALADDRESS($, $, $, $, ('RDF Ltd.', 'Main Office'), '32', 'Bankya', 'Sofia', '1320', 'Bulgaria');
+#38 = IFCBUILDINGSTOREY('2GNgSHJ5j9BRUjqT$7tE8w', #2, 'Default Building Storey', 'Description of Default Building Storey', $, #39, $, $, .ELEMENT., 0.);
+#39 = IFCLOCALPLACEMENT(#35, #40);
+/* no rotation - z and x axes set to '$' are therefore identical to "world coordinate system" -- */
+#40 = IFCAXIS2PLACEMENT3D(#24, $, $);
+#41 = IFCRELAGGREGATES('1Lm3qeFdPFmvCQm$QtrkO_', #2, 'BuildingContainer', 'BuildingContainer for BuildigStories', #34, (#38));
+#42 = IFCRELAGGREGATES('16zMrDm_P2fv4w8_JewkSy', #2, 'SiteContainer', 'SiteContainer For Buildings', #31, (#34));
+#43 = IFCRELAGGREGATES('3IdcKtxyTFSPDjAagDGuOq', #2, 'ProjectContainer', 'ProjectContainer for Sites', #1, (#31));
+#44 = IFCRELCONTAINEDINSPATIALSTRUCTURE('0w_L$jTK98v8wOzKFGjTuo', #2, 'Default Building', 'Contents of Building Storey', (#45, #102), #38);
+
+/* the wall itself ----------------------------------------------------------------------------- */
+#45 = IFCWALLSTANDARDCASE('3ZYW59sxj8lei475l7EhLU', #2, 'Wall for Test Example', 'Description of Wall', $, #46, #48, $, $);
+#46 = IFCLOCALPLACEMENT(#39, #47);
+/* no rotation - z and x axes set to '$' are therefore identical to "world coordinate system" -- */
+#47 = IFCAXIS2PLACEMENT3D(#24, $, $);
+#48 = IFCPRODUCTDEFINITIONSHAPE($, $, (#66, #70));
+
+/* properties for the wall, standard property set from PSet collection ------------------------- */
+#49 = IFCPROPERTYSET('3nMqHLyZHAegWs5Yyxh1ry', #2, 'Pset_WallCommon', $, (#50, #51, #52, #53, #54, #55, #56, #57, #58, #59));
+#50 = IFCPROPERTYSINGLEVALUE('Reference', 'Reference', IFCIDENTIFIER(''), $);
+#51 = IFCPROPERTYSINGLEVALUE('AcousticRating', 'AcousticRating', IFCLABEL(''), $);
+#52 = IFCPROPERTYSINGLEVALUE('FireRating', 'FireRating', IFCLABEL(''), $);
+#53 = IFCPROPERTYSINGLEVALUE('Combustible', 'Combustible', IFCBOOLEAN(.F.), $);
+#54 = IFCPROPERTYSINGLEVALUE('SurfaceSpreadOfFlame', 'SurfaceSpreadOfFlame', IFCLABEL(''), $);
+#55 = IFCPROPERTYSINGLEVALUE('ThermalTransmittance', 'ThermalTransmittance', IFCTHERMALTRANSMITTANCEMEASURE(2.4E-1), $);
+#56 = IFCPROPERTYSINGLEVALUE('IsExternal', 'IsExternal', IFCBOOLEAN(.T.), $);
+#57 = IFCPROPERTYSINGLEVALUE('ExtendToStructure', 'ExtendToStructure', IFCBOOLEAN(.F.), $);
+#58 = IFCPROPERTYSINGLEVALUE('LoadBearing', 'LoadBearing', IFCBOOLEAN(.F.), $);
+#59 = IFCPROPERTYSINGLEVALUE('Compartmentation', 'Compartmentation', IFCBOOLEAN(.F.), $);
+/* connection of properties to the wall -------------------------------------------------------- */
+#60 = IFCRELDEFINESBYPROPERTIES('29JB4VSyHEhx7go0x$VxZ2', #2, $, $, (#45), #49);
+
+/* material (layers) of the wall --------------------------------------------------------------- */
+#61 = IFCMATERIALLAYERSETUSAGE(#62, .AXIS2., .POSITIVE., -150., $);
+#62 = IFCMATERIALLAYERSET((#63), $, $);
+#63 = IFCMATERIALLAYER(#64, 300., $, $, $, $, $);
+#64 = IFCMATERIAL('Name of the material used for the wall', $, $);
+/* connection of material description to the wall ---------------------------------------------- */
+#65 = IFCRELASSOCIATESMATERIAL('3DQ2_rihzBm8nLF98euhbs', #2, $, $, (#45), #61);
+
+/* line (shape) representation) of the object -------------------------------------------------- */
+#66 = IFCSHAPEREPRESENTATION(#20, 'Axis', 'Curve2D', (#67));
+#67 = IFCPOLYLINE((#68, #69));
+#68 = IFCCARTESIANPOINT((0., 150.));
+#69 = IFCCARTESIANPOINT((3000., 150.));
+
+/* geometry (shape representation), extruded polygon in z direction ---------------------------- */
+#70 = IFCSHAPEREPRESENTATION(#20, 'Body', 'SweptSolid', (#71));
+#71 = IFCEXTRUDEDAREASOLID(#72, #79, #27, 2000.);
+#72 = IFCARBITRARYCLOSEDPROFILEDEF(.AREA., $, #73);
+#73 = IFCPOLYLINE((#74, #75, #76, #77, #78));
+#74 = IFCCARTESIANPOINT((0., 0.));
+#75 = IFCCARTESIANPOINT((0., 300.));
+#76 = IFCCARTESIANPOINT((3000., 300.));
+#77 = IFCCARTESIANPOINT((3000., 0.));
+#78 = IFCCARTESIANPOINT((0., 0.));
+/* no rotation - z and x axes set to '$' are therefore identical to "world coordinate system" -- */
+#79 = IFCAXIS2PLACEMENT3D(#24, $, $);
+
+/* the opening in the wall containing the window ----------------------------------------------- */
+#80 = IFCOPENINGELEMENT('2bJiss68D6hvLKV8O1xmqJ', #2, 'Opening Element for Test Example', 'Description of Opening', $, #81, #84, $, .OPENING.);
+#81 = IFCLOCALPLACEMENT(#46, #82);
+/* no rotation - z and x axes set to '$' are therefore identical to "world coordinate system" -- */
+#82 = IFCAXIS2PLACEMENT3D(#83, $, $);
+#83 = IFCCARTESIANPOINT((1000., 0., 500.));
+#84 = IFCPRODUCTDEFINITIONSHAPE($, $, (#86));
+#85 = IFCRELVOIDSELEMENT('1nwVYC$VTDeuSc8zbOa89u', #2, $, $, #45, #80);
+
+/* geometry (shape representation), extruded polygon in z direction ---------------------------- */
+#86 = IFCSHAPEREPRESENTATION(#20, 'Body', 'SweptSolid', (#87));
+#87 = IFCEXTRUDEDAREASOLID(#88, #95, #27, 1000.);
+#88 = IFCARBITRARYCLOSEDPROFILEDEF(.AREA., $, #89);
+#89 = IFCPOLYLINE((#90, #91, #92, #93, #94));
+#90 = IFCCARTESIANPOINT((0., 0.));
+#91 = IFCCARTESIANPOINT((0., 300.));
+#92 = IFCCARTESIANPOINT((1000., 300.));
+#93 = IFCCARTESIANPOINT((1000., 0.));
+#94 = IFCCARTESIANPOINT((0., 0.));
+/* no rotation - z and x axes set to '$' are therefore identical to "world coordinate system" -- */
+#95 = IFCAXIS2PLACEMENT3D(#24, $, $);
+/* connection of material description to the window -------------------------------------------- */
+#96 = IFCMATERIALCONSTITUENTSET('Constituent Set for Window', $, (#97, #99));
+#97 = IFCMATERIALCONSTITUENT('Framing', $, #98, $, $);
+#98 = IFCMATERIAL('Glass', $, $);
+#99 = IFCMATERIALCONSTITUENT('Framing', $, #100, $, $);
+#100 = IFCMATERIAL('Wood', $, $);
+/* connection of material description to the window -------------------------------------------- */
+#101 = IFCRELASSOCIATESMATERIAL('2umeFbHwL6GAUKTaYomo7u', #2, $, $, (#102), #96);
+
+/* the window itself --------------------------------------------------------------------------- */
+#102 = IFCWINDOW('0tA4DSHd50le6Ov9Yu0I9X', #2, 'Window for Test Example', 'Description of Window', $, #103, #106, $, 1000., 1000., .WINDOW., .SINGLE_PANEL., $);
+#103 = IFCLOCALPLACEMENT(#81, #104);
+/* no rotation - z and x axes set to '$' are therefore identical to "world coordinate system" -- */
+#104 = IFCAXIS2PLACEMENT3D(#105, $, $);
+#105 = IFCCARTESIANPOINT((0., 50., 0.));
+#106 = IFCPRODUCTDEFINITIONSHAPE($, $, (#124));
+#107 = IFCWINDOWTYPE('0Ps4H3X0nAxfqkHNemLE6f', #2, 'Window for Test Example', 'Description of Window Type', $, $, $, $, $, .WINDOW., .SINGLE_PANEL., $, $);
+#108 = IFCRELDEFINESBYTYPE('33ZWGsuJ9CIw2bpc0Zk0Dl', #2, $, $, (#102), #107);
+#109 = IFCRELDECLARES('1PDtajAqHD6xd3QiWD$I1W', #2, $, $, #110, (#107));
+#110 = IFCPROJECTLIBRARY('1SutvPaeH8EBtxrmG2k_Kh', #2, $, $, $, $, $, $, $);
+#111 = IFCRELDECLARES('3za3M6A5r4wQ3Luv68n$31', #2, $, $, #110, (#1));
+#112 = IFCRELFILLSELEMENT('0YVioT$0bDzPFxfmI$Sb2G', #2, $, $, #80, #102);
+
+/* properties for the window, standard property set from PSet collection ----------------------- */
+#113 = IFCPROPERTYSET('1lZ4zPst55PhFcUG69u5jM', #2, 'Pset_WindowCommon', $, (#114, #115, #116, #117, #118, #119, #120, #121, #122));
+#114 = IFCPROPERTYSINGLEVALUE('Reference', 'Reference', IFCIDENTIFIER(''), $);
+#115 = IFCPROPERTYSINGLEVALUE('FireRating', 'FireRating', IFCLABEL(''), $);
+#116 = IFCPROPERTYSINGLEVALUE('AcousticRating', 'AcousticRating', IFCLABEL(''), $);
+#117 = IFCPROPERTYSINGLEVALUE('SecurityRating', 'SecurityRating', IFCLABEL(''), $);
+#118 = IFCPROPERTYSINGLEVALUE('IsExternal', 'IsExternal', IFCBOOLEAN(.T.), $);
+#119 = IFCPROPERTYSINGLEVALUE('Infiltration', 'Infiltration', IFCVOLUMETRICFLOWRATEMEASURE(3.E-1), $);
+#120 = IFCPROPERTYSINGLEVALUE('ThermalTransmittance', 'ThermalTransmittance', IFCTHERMALTRANSMITTANCEMEASURE(2.4E-1), $);
+#121 = IFCPROPERTYSINGLEVALUE('GlazingAreaFraction', 'GlazingAreaFraction', IFCPOSITIVERATIOMEASURE(7.E-1), $);
+#122 = IFCPROPERTYSINGLEVALUE('SmokeStop', 'SmokeStop', IFCBOOLEAN(.F.), $);
+/* connection of properties to window ---------------------------------------------------------- */
+#123 = IFCRELDEFINESBYPROPERTIES('17cvqmufjDQ9MHuuJCJrDN', #2, $, $, (#102), #113);
+
+/* geometry (shape representation), extruded polygon in z direction ---------------------------- */
+#124 = IFCSHAPEREPRESENTATION(#20, 'Body', 'SweptSolid', (#125));
+#125 = IFCEXTRUDEDAREASOLID(#126, #133, #27, 1000.);
+#126 = IFCARBITRARYCLOSEDPROFILEDEF(.AREA., $, #127);
+#127 = IFCPOLYLINE((#128, #129, #130, #131, #132));
+#128 = IFCCARTESIANPOINT((0., 0.));
+#129 = IFCCARTESIANPOINT((0., 200.));
+#130 = IFCCARTESIANPOINT((1000., 200.));
+#131 = IFCCARTESIANPOINT((1000., 0.));
+#132 = IFCCARTESIANPOINT((0., 0.));
+/* no rotation - z and x axes set to '$' are therefore identical to "world coordinate system" -- */
+#133 = IFCAXIS2PLACEMENT3D(#24, $, $);
+ENDSEC;
+END-ISO-10303-21;
diff --git a/test/input/building_service_element_air-terminal-type.ifc b/test/input/building_service_element_air-terminal-type.ifc
new file mode 100644
index 0000000..d74f778
--- /dev/null
+++ b/test/input/building_service_element_air-terminal-type.ifc
@@ -0,0 +1,241 @@
+ISO-10303-21;
+HEADER;
+FILE_DESCRIPTION($,'2;1');
+FILE_NAME('building_service_element_air-terminal-type.ifc','2011-11-11T21:50:39',(''),(''),'Constructivity 0.9.1','Constructivity 0.9.1','');
+FILE_SCHEMA(('IFC4'));
+ENDSEC;
+
+DATA;
+
+/* ================================================================================ */
+/* A. PROJECT CONTEXT                                                               */
+/* -------------------------------------------------------------------------------- */
+
+/* Project default units are inches */
+#11= IFCSIUNIT(*,.LENGTHUNIT.,$,.METRE.);
+#12= IFCMEASUREWITHUNIT(IFCLENGTHMEASURE(0.0254),#11);
+#13= IFCDIMENSIONALEXPONENTS(1,0,0,0,0,0,0);
+#14= IFCCONVERSIONBASEDUNIT(#13,.LENGTHUNIT.,'inch',#12);
+#15= IFCUNITASSIGNMENT((#14));
+
+/* Owner history authoring and application information. */
+#204= IFCORGANIZATION($,'Constructivity.com LLC',$,$,$);
+#205= IFCAPPLICATION(#204,'0.9.1','Constructivity','CONSTRUCTIVITY');
+#206= IFCPERSON('Tim',$,$,$,$,$,$,$);
+#207= IFCORGANIZATION($,'Tim-PC',$,$,$);
+#208= IFCPERSONANDORGANIZATION(#206,#207,$);
+#209= IFCOWNERHISTORY(#208,#205,.READWRITE.,.NOTDEFINED.,$,$,$,1321047295);
+
+/* Representation contexts. */
+#210= IFCCARTESIANPOINT((0.,0.,0.));
+#211= IFCAXIS2PLACEMENT3D(#210,$,$);
+#212= IFCGEOMETRICREPRESENTATIONCONTEXT('3D','Model',3,1.0E-5,#211,$);
+
+/* The single project indicates project default units and representation contexts. */
+#213= IFCPROJECT('3EasFN11P0zQRYKyp7G85J',#209,'HVAC Product Type Library Example','Demonstrates an air terminal type, which may be instantiated in buildings within referencing files.','ProductLibrary',$,$,(#212),#15);
+
+/* The project declares the air terminal type and an imported library defining property set templates */
+#214= IFCRELDECLARES('0$b_yyn8PEbAVbeTOu2ljb',#209,$,$,#213,(#216,#1322));
+
+
+/* ================================================================================ */
+/* B. AIR TERMINAL TYPE                                                             */
+/* -------------------------------------------------------------------------------- */
+
+/* The air terminal type has a shape representation using a tapered extruded solid with a hollow rectangular profile. */
+#216= IFCAIRTERMINALTYPE('1FESQ2M9vC7xYWZpI_LlCh',#209,'Acme Diffuser 1234','Ceiling diffuser',$,(#1475,#1506),(#240),$,$,.DIFFUSER.);
+
+/* The head profile (at the base of the diffuser) is 2 feet by 2 feet, with 2 inch thickness, and 10 inch inner fillet radius (making it a circle for the interior). */
+#224= IFCRECTANGLEHOLLOWPROFILEDEF(.AREA.,$,$,24.,24.,2.,10.,0.);
+
+/* The solid is placed at the midpoint of the base profile, such that the corner is aligned with the origin (0,0,0). */
+#228= IFCCARTESIANPOINT((12.,12.,0.));
+#229= IFCAXIS2PLACEMENT3D(#228,$,$);
+
+/* the solid is extruded upwards. */
+#230= IFCDIRECTION((0.,0.,1.));
+
+/* The tail profile (at the top of the diffuser) is half the size of the head profile. */
+#232= IFCCARTESIANPOINT((0.,0.));
+#233= IFCCARTESIANTRANSFORMATIONOPERATOR2D($,$,#232,0.5);
+#234= IFCDERIVEDPROFILEDEF(.AREA.,$,#224,#233,$);
+
+/* The tapered extruded solid references the starting profile, placement, extrusion of 4 inches, and ending profile. */
+#235= IFCEXTRUDEDAREASOLIDTAPERED(#224,#229,#230,4.,#234);
+
+/* The Body representation indicating 3D shape. */
+#237= IFCSHAPEREPRESENTATION(#212,'Body','AdvancedSweptSolid',(#235));
+
+/* A representation map references the Body representation without any transformation. */
+#238= IFCCARTESIANPOINT((0.,0.,0.));
+#239= IFCAXIS2PLACEMENT3D(#238,$,$);
+#240= IFCREPRESENTATIONMAP(#239,#237);
+
+
+/* ================================================================================ */
+/* C. PORTS                                                                         */
+/* -------------------------------------------------------------------------------- */
+
+/* The air terminal type has a single port for receiving conditioned air, which is placed on top of the air terminal pointing upwards. */
+#1105= IFCCARTESIANPOINT((12.,12.,4.));
+#1106= IFCAXIS2PLACEMENT3D(#1105,$,$);
+#1107= IFCLOCALPLACEMENT($,#1106);
+#1108= IFCDISTRIBUTIONPORT('0lCGSOGtb4mu56WSeYuzNg',#209,'Inlet',$,$,#1107,$,.SINK.,.DUCT.,.AIRCONDITIONING.);
+#1112= IFCRELNESTS('1yPSy1NEzAsQ3rkI$pYuin',#209,$,$,#216,(#1108));
+
+
+/* ================================================================================ */
+/* D. PROPERTY SETS AND PROPERTY SET TEMPLATES                                      */
+/* -------------------------------------------------------------------------------- */
+
+/* The air terminal type uses several property sets, defined by property set templates imported from the IFC4 file. */
+/* Note that IFC-defined property set do not need to have templates included, however they are shown here for illustration. */
+/* Custom property sets must have backing templates if they are to be viewed and/or edited by other applications. */
+
+/* property set template for Pset_DistributionPortCommon */
+#1117= IFCSIMPLEPROPERTYTEMPLATE('3_bLjRfq13tPEPPfI$6pRX',#209,'PortNumber','The port index for logically ordering the port within the containing element or element type.',.P_SINGLEVALUE.,'IfcInteger','',$,$,$,$,.READWRITE.);
+#1118= IFCSIMPLEPROPERTYTEMPLATE('2VDgHzk35At81oM56a3xnn',#209,'ColorCode','Name of a color for identifying the connector, if applicable.',.P_SINGLEVALUE.,'IfcLabel','',$,$,$,$,.READWRITE.);
+#1119= IFCPROPERTYSETTEMPLATE('29WBDBI9L3tgEAg5Ay2Kax',#209,'Pset_DistributionPortCommon','Common attributes attached to an instance of IfcDistributionPort.',.PSET_OCCURRENCEDRIVEN.,'IfcDistributionPort',(#1117,#1118));
+
+/* project library encapsulating imported property set templates */
+#1322= IFCPROJECTLIBRARY('1rfo$z7PbCaeLf5SOGGJV5',#209,'IFC4',$,$,$,$,$,$);
+#1332= IFCLIBRARYINFORMATION('IFC4',$,#1334,'2011-09-26T20:52:24','http://buildingsmart-tech.org/ifc/IFC2x4/rc3/html/annex/annex-a/ifc2x4_rc3-templates.ifc',$);
+#1334= IFCORGANIZATION($,'Tim-PC',$,$,$);
+#1339= IFCRELASSOCIATESLIBRARY('2AvhQDLy558AFVeANPXoWB',#209,$,$,(#1322),#1332);
+#1342= IFCLIBRARYREFERENCE($,'Pset_DistributionPortCommon','Pset_DistributionPortCommon',$,$,#1332);
+#1347= IFCRELASSOCIATESLIBRARY('24PRN3YsXAVP3fEgb4zpZM',#209,$,$,(#1119),#1342);
+#1350= IFCRELDECLARES('0Xl$PCnZPB2BUMJcj$F_RN',#209,'PROJECT',$,#1322,(#1119,#1373,#1439,#1489));
+
+/* property set for Pset_DistributionPortCommon */
+#1354= IFCPROPERTYSINGLEVALUE('PortNumber','The port index for logically ordering the port within the containing element or element type.',$,$);
+#1355= IFCPROPERTYSINGLEVALUE('ColorCode','Name of a color for identifying the connector, if applicable.',$,$);
+#1356= IFCPROPERTYSET('3MdHsbDH1BrQYI$kjaLN5a',#209,'Pset_DistributionPortCommon','Common attributes attached to an instance of IfcDistributionPort.',(#1354,#1355));
+#1358= IFCRELDEFINESBYTEMPLATE('2DA69vfj12BPHrvbOJli4C',#209,$,$,(#1356),#1119);
+#1361= IFCRELDEFINESBYPROPERTIES('0eTnqsHaH63xaP$yFWdQxt',#209,'Pset_DistributionPortCommon',$,(#1108),#1356);
+
+/* property set template for Pset_DistributionPortAirConditioning */
+#1363= IFCPROPERTYENUMERATION('PEnum_DuctConnectionType',(IFCLABEL('BEADEDSLEEVE'),IFCLABEL('COMPRESSION'),IFCLABEL('CRIMP'),IFCLABEL('DRAWBAND'),IFCLABEL('DRIVESLIP'),IFCLABEL('FLANGED'),IFCLABEL('OUTSIDESLEEVE'),IFCLABEL('SLIPON'),IFCLABEL('SOLDERED'),IFCLABEL('SSLIP'),IFCLABEL('STANDINGSEAM'),IFCLABEL('SWEDGE'),IFCLABEL('WELDED'),IFCLABEL('OTHER'),IFCLABEL('NONE'),IFCLABEL('USERDEFINED'),IFCLABEL('NOTDEFINED')),$);
+#1364= IFCSIMPLEPROPERTYTEMPLATE('3$fSJrLkP9WesgtUW7tvY9',#209,'ConnectionType','The end-style treatment of the duct port:\X\0A\X\0ABEADEDSLEEVE: Beaded Sleeve. \X\0ACOMPRESSION: Compression. \X\0ACRIMP: Crimp. \X\0ADRAWBAND: Drawband. \X\0ADRIVESLIP: Drive slip. \X\0AFLANGED: Flanged. \X\0AOUTSIDESLEEVE: Outside Sleeve. \X\0ASLIPON: Slipon. \X\0ASOLDERED: Soldered. \X\0ASSLIP: S-Slip. \X\0ASTANDINGSEAM: Standing seam. \X\0ASWEDGE: Swedge. \X\0AWELDED: Welded. \X\0AOTHER: Another type of end-style has been applied.\X\0ANONE: No end-style has been applied.',.P_ENUMERATEDVALUE.,'IfcLabel',$,#1363,$,$,$,.READWRITE.);
+#1365= IFCSIMPLEPROPERTYTEMPLATE('3eYrOWOML0MAWniKzD$bg8',#209,'ConnectionSubType','The physical port connection subtype that further qualifies the ConnectionType.',.P_SINGLEVALUE.,'IfcLabel','',$,$,$,$,.READWRITE.);
+#1366= IFCSIMPLEPROPERTYTEMPLATE('3U0yI_myr9Tuk86rnglnUq',#209,'NominalWidth','The nominal width or diameter of the duct connection.',.P_SINGLEVALUE.,'IfcPositiveLengthMeasure','',$,$,$,$,.READWRITE.);
+#1367= IFCSIMPLEPROPERTYTEMPLATE('1T7T2i39H9OfTY1TIerMbJ',#209,'NominalHeight','The nominal height of the duct connection.',.P_SINGLEVALUE.,'IfcPositiveLengthMeasure','',$,$,$,$,.READWRITE.);
+#1368= IFCSIMPLEPROPERTYTEMPLATE('3ASt$O5yD8NeM$q_lQyHWd',#209,'DryBulbTemperature','Dry bulb temperature of the air.',.P_BOUNDEDVALUE.,'IfcThermodynamicTemperatureMeasure','',$,$,$,$,.READWRITE.);
+#1369= IFCSIMPLEPROPERTYTEMPLATE('1tms9JUcX85eqcKjr4hn0X',#209,'WetBulbTemperature','Wet bulb temperature of the air.',.P_BOUNDEDVALUE.,'IfcThermodynamicTemperatureMeasure','',$,$,$,$,.READWRITE.);
+#1370= IFCSIMPLEPROPERTYTEMPLATE('0oDnPia3b949zQ9IOqQ3WD',#209,'VolumetricFlowRate','The volumetric flow rate of the fluid.',.P_BOUNDEDVALUE.,'IfcVolumetricFlowRateMeasure','',$,$,$,$,.READWRITE.);
+#1371= IFCSIMPLEPROPERTYTEMPLATE('0Y$o5$IVnCBBYMkfqCX9u2',#209,'Velocity','The velocity of the fluid.',.P_BOUNDEDVALUE.,'IfcLinearVelocityMeasure','',$,$,$,$,.READWRITE.);
+#1372= IFCSIMPLEPROPERTYTEMPLATE('0r4zhLdSb4$QDqtTZAlksU',#209,'Pressure','The pressure of the fluid.',.P_BOUNDEDVALUE.,'IfcPressureMeasure','',$,$,$,$,.READWRITE.);
+#1373= IFCPROPERTYSETTEMPLATE('1A6ROK3ijAv94HqL2QeE5V',#209,'Pset_DistributionPortTypeAirConditioning','Duct port occurrence attributes attached to an instance of IfcDistributionPort.',.PSET_OCCURRENCEDRIVEN.,'IfcDistributionPort/AIRCONDITIONING',(#1364,#1365,#1366,#1367,#1368,#1369,#1370,#1371,#1372));
+#1374= IFCLIBRARYREFERENCE($,'Pset_DistributionPortTypeAirConditioning','Pset_DistributionPortTypeAirConditioning',$,$,#1332);
+#1379= IFCRELASSOCIATESLIBRARY('2DqAITf693l8NzYzj5r79c',#209,$,$,(#1373),#1374);
+
+/* property set for Pset_DistributionPortAirConditioning */
+#1383= IFCPROPERTYENUMERATEDVALUE('ConnectionType',$,(IFCLABEL('OUTSIDESLEEVE')),#1363);
+#1384= IFCPROPERTYSINGLEVALUE('ConnectionSubType',$,$,$);
+#1385= IFCPROPERTYSINGLEVALUE('NominalWidth',$,IFCPOSITIVELENGTHMEASURE(12.),$);
+#1386= IFCPROPERTYSINGLEVALUE('NominalHeight',$,IFCPOSITIVELENGTHMEASURE(12.),$);
+#1387= IFCPROPERTYBOUNDEDVALUE('DryBulbTemperature',$,$,$,$,$);
+#1388= IFCPROPERTYBOUNDEDVALUE('WetBulbTemperature',$,$,$,$,$);
+#1389= IFCPROPERTYBOUNDEDVALUE('VolumetricFlowRate',$,$,$,$,$);
+#1390= IFCPROPERTYBOUNDEDVALUE('Velocity',$,$,$,$,$);
+#1391= IFCPROPERTYBOUNDEDVALUE('Pressure',$,$,$,$,$);
+#1392= IFCPROPERTYSET('142LVYnPP62figC7tUlZnT',#209,'Pset_DistributionPortTypeAirConditioning',$,(#1383,#1384,#1385,#1386,#1387,#1388,#1389,#1390,#1391));
+#1394= IFCRELDEFINESBYTEMPLATE('2rvy24e5L04OIpKBIyaF5s',#209,$,$,(#1392),#1373);
+#1397= IFCRELDEFINESBYPROPERTIES('2Phx4Cdqz3XRbcSidvQspJ',#209,'Pset_DistributionPortTypeAirConditioning',$,(#1108),#1392);
+
+/* property set template for Pset_AirTerminalCommon */
+#1404= IFCSIMPLEPROPERTYTEMPLATE('3fpWm82nz9hQ6TKg7VFU19',#209,'Reference','Reference ID for this specified type in this project (e.g. type ''A-1''), provided, if there is no classification reference to a recognized classification system used.',.P_SINGLEVALUE.,'IfcIdentifier','',$,$,$,$,.READWRITE.);
+#1405= IFCPROPERTYENUMERATION('PEnum_Status',(IFCLABEL('NEW'),IFCLABEL('EXISTING'),IFCLABEL('DEMOLISH'),IFCLABEL('TEMPORARY'),IFCLABEL('OTHER'),IFCLABEL('NOTKNOWN'),IFCLABEL('UNSET')),$);
+#1406= IFCSIMPLEPROPERTYTEMPLATE('0Yj8hLD1HER8_kCs5XavrF',#209,'Status','Status of the element, predominately used in renovation or retrofitting projects. The status can be assigned to as "New" - element designed as new addition, "Existing" - element exists and remains, "Demolish" - element existed but is to be demolished,  "Temporary" - element will exists only temporary (like a temporary support structure).',.P_ENUMERATEDVALUE.,'IfcLabel',$,#1405,$,$,$,.READWRITE.);
+#1407= IFCPROPERTYENUMERATION('PEnum_AirTerminalShape',(IFCLABEL('ROUND'),IFCLABEL('RECTANGULAR'),IFCLABEL('SQUARE'),IFCLABEL('SLOT'),IFCLABEL('OTHER'),IFCLABEL('NOTKNOWN'),IFCLABEL('UNSET')),$);
+#1408= IFCSIMPLEPROPERTYTEMPLATE('0s3HOiBZz5HuKtBnUthHVn',#209,'Shape','Shape of the air terminal. Slot is typically a long narrow supply device with an aspect ratio generally greater than 10 to 1.',.P_ENUMERATEDVALUE.,'IfcLabel',$,#1407,$,$,$,.READWRITE.);
+#1409= IFCPROPERTYENUMERATION('PEnum_AirTerminalFaceType',(IFCLABEL('FOURWAYPATTERN'),IFCLABEL('SINGLEDEFLECTION'),IFCLABEL('DOUBLEDEFLECTION'),IFCLABEL('SIGHTPROOF'),IFCLABEL('EGGCRATE'),IFCLABEL('PERFORATED'),IFCLABEL('LOUVERED'),IFCLABEL('OTHER'),IFCLABEL('NOTKNOWN'),IFCLABEL('UNSET')),$);
+#1410= IFCSIMPLEPROPERTYTEMPLATE('3ccEnz8CbDehYY5UfGjNhk',#209,'FaceType','Identifies how the terminal face of an AirTerminal is constructed.',.P_ENUMERATEDVALUE.,'IfcLabel',$,#1409,$,$,$,.READWRITE.);
+#1411= IFCSIMPLEPROPERTYTEMPLATE('3s2OInnMzFHQs$K3elh_3h',#209,'SlotWidth','Slot width.',.P_SINGLEVALUE.,'IfcPositiveLengthMeasure','',$,$,$,$,.READWRITE.);
+#1412= IFCSIMPLEPROPERTYTEMPLATE('1y1kHB7PrChPwTgQ$ECHb$',#209,'SlotLength','Slot length.',.P_SINGLEVALUE.,'IfcPositiveLengthMeasure','',$,$,$,$,.READWRITE.);
+#1413= IFCSIMPLEPROPERTYTEMPLATE('1U0eyN6b902eI0MbwdUd8M',#209,'NumberOfSlots','Number of slots.',.P_SINGLEVALUE.,'IfcInteger','',$,$,$,$,.READWRITE.);
+#1414= IFCPROPERTYENUMERATION('PEnum_AirTerminalFlowPattern',(IFCLABEL('LINEARSINGLE'),IFCLABEL('LINEARDOUBLE'),IFCLABEL('LINEARFOURWAY'),IFCLABEL('RADIAL'),IFCLABEL('SWIRL'),IFCLABEL('DISPLACMENT'),IFCLABEL('COMPACTJET'),IFCLABEL('OTHER'),IFCLABEL('NOTKNOWN'),IFCLABEL('UNSET')),$);
+#1415= IFCSIMPLEPROPERTYTEMPLATE('0y7Fb2v4H9ehCvfO24PHM1',#209,'FlowPattern','Flow pattern.',.P_ENUMERATEDVALUE.,'IfcLabel',$,#1414,$,$,$,.READWRITE.);
+#1416= IFCSIMPLEPROPERTYTEMPLATE('0rg225Jsz7aPmR4rqHJHRR',#209,'AirFlowrateRange','Air flowrate range within which the air terminal is designed to operate.',.P_BOUNDEDVALUE.,'IfcVolumetricFlowRateMeasure','',$,$,$,$,.READWRITE.);
+#1417= IFCSIMPLEPROPERTYTEMPLATE('1IJN6qN3j68w9NjQIASYJF',#209,'TemperatureRange','Temperature range within which the air terminal is designed to operate.',.P_BOUNDEDVALUE.,'IfcThermodynamicTemperatureMeasure','',$,$,$,$,.READWRITE.);
+#1418= IFCPROPERTYENUMERATION('PEnum_AirTerminalDischargeDirection',(IFCLABEL('PARALLEL'),IFCLABEL('PERPENDICULAR'),IFCLABEL('ADJUSTABLE'),IFCLABEL('OTHER'),IFCLABEL('NOTKNOWN'),IFCLABEL('UNSET')),$);
+#1419= IFCSIMPLEPROPERTYTEMPLATE('3YNHGt1l51jg4X9QGpz17j',#209,'DischargeDirection','Discharge direction of the air terminal.\X\0A\X\0AParallel: discharges parallel to mounting surface designed so that flow attaches to the surface.\X\0APerpendicular:  discharges away from mounting surface.\X\0AAdjustable: both parallel and perpendicular discharge.',.P_ENUMERATEDVALUE.,'IfcLabel',$,#1418,$,$,$,.READWRITE.);
+#1420= IFCSIMPLEPROPERTYTEMPLATE('15AjYKuPv9lQ9iggUpGAaF',#209,'ThrowLength','The horizontal or vertical axial distance an airstream travels after leaving an AirTerminal before the maximum stream velocity is reduced to a specified terminal velocity under isothermal conditions at the upper value of the AirFlowrateRange.',.P_SINGLEVALUE.,'IfcLengthMeasure','',$,$,$,$,.READWRITE.);
+#1421= IFCSIMPLEPROPERTYTEMPLATE('0JBeud9tT5RgwbQACxzdZH',#209,'AirDiffusionPerformanceIndex','The Air Diffusion Performance Index (ADPI) is used for cooling mode conditions. If several measurements of air velocity and air temperature are made throughout the occupied zone of a space, the ADPI is the percentage of locations where measurements were taken that meet the specifications for effective draft temperature and air velocity.',.P_SINGLEVALUE.,'IfcReal','',$,$,$,$,.READWRITE.);
+#1422= IFCPROPERTYENUMERATION('PEnum_AirTerminalFinishType',(IFCLABEL('ANNODIZED'),IFCLABEL('PAINTED'),IFCLABEL('NONE'),IFCLABEL('OTHER'),IFCLABEL('NOTKNOWN'),IFCLABEL('UNSET')),$);
+#1423= IFCSIMPLEPROPERTYTEMPLATE('1rGAtIuLj049KjoAX5lv0j',#209,'FinishType','The type of finish for the air terminal.',.P_ENUMERATEDVALUE.,'IfcLabel',$,#1422,$,$,$,.READWRITE.);
+#1424= IFCSIMPLEPROPERTYTEMPLATE('0Lx74WLuDAJBe29ZAokn7n',#209,'FinishColor','The finish color for the air terminal.',.P_SINGLEVALUE.,'IfcLabel','',$,$,$,$,.READWRITE.);
+#1425= IFCPROPERTYENUMERATION('PEnum_AirTerminalMountingType',(IFCLABEL('SURFACE'),IFCLABEL('FLATFLUSH'),IFCLABEL('LAYIN'),IFCLABEL('OTHER'),IFCLABEL('NOTKNOWN'),IFCLABEL('UNSET')),$);
+#1426= IFCSIMPLEPROPERTYTEMPLATE('28DA3rBGD45wIHAjVhRVfn',#209,'MountingType','The way the air terminal is mounted to the ceiling, wall, etc.\X\0A\X\0ASurface: mounted to the surface of something (e.g., wall, duct, etc.).\X\0AFlat flush: mounted flat and flush with a surface.\X\0ALay-in: mounted in a lay-in type ceiling (e.g., a dropped ceiling grid).',.P_ENUMERATEDVALUE.,'IfcLabel',$,#1425,$,$,$,.READWRITE.);
+#1427= IFCPROPERTYENUMERATION('PEnum_AirTerminalCoreType',(IFCLABEL('SHUTTERBLADE'),IFCLABEL('CURVEDBLADE'),IFCLABEL('REMOVABLE'),IFCLABEL('REVERSIBLE'),IFCLABEL('NONE'),IFCLABEL('OTHER'),IFCLABEL('NOTKNOWN'),IFCLABEL('UNSET')),$);
+#1428= IFCSIMPLEPROPERTYTEMPLATE('2BHDN$CwT3oPiLEOzMDEo6',#209,'CoreType','Identifies the way the core of the AirTerminal is constructed.',.P_ENUMERATEDVALUE.,'IfcLabel',$,#1427,$,$,$,.READWRITE.);
+#1429= IFCSIMPLEPROPERTYTEMPLATE('3ivegLDDDF4Bj8eqOSTpHI',#209,'CoreSetHorizontal','Degree of horizontal (in the X-axis of the LocalPlacement) blade set from the centerline.',.P_SINGLEVALUE.,'IfcPlaneAngleMeasure','',$,$,$,$,.READWRITE.);
+#1430= IFCSIMPLEPROPERTYTEMPLATE('0lGnkfyAL1Yw4lbl7z2VvE',#209,'CoreSetVertical','Degree of vertical (in the Y-axis of the LocalPlacement) blade set from the centerline.',.P_SINGLEVALUE.,'IfcPlaneAngleMeasure','',$,$,$,$,.READWRITE.);
+#1431= IFCSIMPLEPROPERTYTEMPLATE('2z_gncAVT79OxwFBa0hkvU',#209,'HasIntegralControl','If TRUE, a self powered temperature control is included in the AirTerminal.',.P_SINGLEVALUE.,'IfcBoolean','',$,$,$,$,.READWRITE.);
+#1432= IFCPROPERTYENUMERATION('PEnum_AirTerminalFlowControlType',(IFCLABEL('DAMPER'),IFCLABEL('BELLOWS'),IFCLABEL('NONE'),IFCLABEL('OTHER'),IFCLABEL('NOTKNOWN'),IFCLABEL('UNSET')),$);
+#1433= IFCSIMPLEPROPERTYTEMPLATE('3M$NkRjRbFrvWwcY1izFe4',#209,'FlowControlType','Type of flow control element that may be included as a part of the construction of the air terminal.',.P_ENUMERATEDVALUE.,'IfcLabel',$,#1432,$,$,$,.READWRITE.);
+#1434= IFCSIMPLEPROPERTYTEMPLATE('1hMma$QwL4QOtgcEGSVoYE',#209,'HasSoundAttenuator','If TRUE, the air terminal has sound attenuation.',.P_SINGLEVALUE.,'IfcBoolean','',$,$,$,$,.READWRITE.);
+#1435= IFCSIMPLEPROPERTYTEMPLATE('1KWi8MdX54FxZUOwumhTef',#209,'HasThermalInsulation','If TRUE, the air terminal has thermal insulation.',.P_SINGLEVALUE.,'IfcBoolean','',$,$,$,$,.READWRITE.);
+#1436= IFCSIMPLEPROPERTYTEMPLATE('2dgLXZEs900vztGBIr8_ao',#209,'NeckArea','Neck area of the air terminal.',.P_SINGLEVALUE.,'IfcAreaMeasure','',$,$,$,$,.READWRITE.);
+#1437= IFCSIMPLEPROPERTYTEMPLATE('309SGtOAPE9929AbT6FTuV',#209,'EffectiveArea','Effective discharge area of the air terminal.',.P_SINGLEVALUE.,'IfcAreaMeasure','',$,$,$,$,.READWRITE.);
+#1438= IFCSIMPLEPROPERTYTEMPLATE('2aOlIhtEn1yBBCqpuP6ygt',#209,'AirFlowrateVersusFlowControlElement','Air flowrate versus flow control element position at nominal pressure drop.',.P_TABLEVALUE.,'IfcVolumetricFlowRateMeasure','IfcPositiveRatioMeasure',$,$,$,$,.READWRITE.);
+#1439= IFCPROPERTYSETTEMPLATE('2jTsg4Mlz1weXQWo2pv0Qb',#209,'Pset_AirTerminalTypeCommon','Air terminal type common attributes.\X\0ASoundLevel attribute deleted in IFC2x2 Pset Addendum: Use IfcSoundProperties instead.',.PSET_TYPEDRIVENOVERRIDE.,'IfcAirTerminal',(#1404,#1406,#1408,#1410,#1411,#1412,#1413,#1415,#1416,#1417,#1419,#1420,#1421,#1423,#1424,#1426,#1428,#1429,#1430,#1431,#1433,#1434,#1435,#1436,#1437,#1438));
+#1440= IFCLIBRARYREFERENCE($,'Pset_AirTerminalTypeCommon','Pset_AirTerminalTypeCommon',$,$,#1332);
+#1445= IFCRELASSOCIATESLIBRARY('259LjdEyzC5gc5NKIzDXj4',#209,$,$,(#1439),#1440);
+
+/* Property set for Pset_AirTerminalCommon */
+#1449= IFCPROPERTYSINGLEVALUE('Reference',$,$,$);
+#1450= IFCPROPERTYENUMERATEDVALUE('Status',$,$,#1405);
+#1451= IFCPROPERTYENUMERATEDVALUE('Shape',$,(IFCLABEL('SQUARE')),#1407);
+#1452= IFCPROPERTYENUMERATEDVALUE('FaceType',$,$,#1409);
+#1453= IFCPROPERTYSINGLEVALUE('SlotWidth',$,$,$);
+#1454= IFCPROPERTYSINGLEVALUE('SlotLength',$,$,$);
+#1455= IFCPROPERTYSINGLEVALUE('NumberOfSlots',$,$,$);
+#1456= IFCPROPERTYENUMERATEDVALUE('FlowPattern',$,$,#1414);
+#1457= IFCPROPERTYBOUNDEDVALUE('AirFlowrateRange',$,$,$,$,$);
+#1458= IFCPROPERTYBOUNDEDVALUE('TemperatureRange',$,$,$,$,$);
+#1459= IFCPROPERTYENUMERATEDVALUE('DischargeDirection',$,$,#1418);
+#1460= IFCPROPERTYSINGLEVALUE('ThrowLength',$,$,$);
+#1461= IFCPROPERTYSINGLEVALUE('AirDiffusionPerformanceIndex',$,$,$);
+#1462= IFCPROPERTYENUMERATEDVALUE('FinishType',$,$,#1422);
+#1463= IFCPROPERTYSINGLEVALUE('FinishColor',$,$,$);
+#1464= IFCPROPERTYENUMERATEDVALUE('MountingType',$,$,#1425);
+#1465= IFCPROPERTYENUMERATEDVALUE('CoreType',$,$,#1427);
+#1466= IFCPROPERTYSINGLEVALUE('CoreSetHorizontal',$,$,$);
+#1467= IFCPROPERTYSINGLEVALUE('CoreSetVertical',$,$,$);
+#1468= IFCPROPERTYSINGLEVALUE('HasIntegralControl',$,$,$);
+#1469= IFCPROPERTYENUMERATEDVALUE('FlowControlType',$,$,#1432);
+#1470= IFCPROPERTYSINGLEVALUE('HasSoundAttenuator',$,$,$);
+#1471= IFCPROPERTYSINGLEVALUE('HasThermalInsulation',$,$,$);
+#1472= IFCPROPERTYSINGLEVALUE('NeckArea',$,$,$);
+#1473= IFCPROPERTYSINGLEVALUE('EffectiveArea',$,$,$);
+#1474= IFCPROPERTYTABLEVALUE('AirFlowrateVersusFlowControlElement',$,$,$,$,$,$,$);
+#1475= IFCPROPERTYSET('34RBPXI3v1B9OyUNo6YREP',#209,'Pset_AirTerminalTypeCommon',$,(#1449,#1450,#1451,#1452,#1453,#1454,#1455,#1456,#1457,#1458,#1459,#1460,#1461,#1462,#1463,#1464,#1465,#1466,#1467,#1468,#1469,#1470,#1471,#1472,#1473,#1474));
+#1477= IFCRELDEFINESBYTEMPLATE('2MnMFQk5T8PfDt4jNfTD0y',#209,$,$,(#1475),#1439);
+
+/* Property set template for Pset_ManufacturerTypeInformation */
+#1481= IFCSIMPLEPROPERTYTEMPLATE('3eHmy4aE566RLnsXQnc182',#209,'GlobalTradeItemNumber','The Global Trade Item Number (GTIN) is an identifier for trade items developed by GS1 (www.gs1.org).',.P_SINGLEVALUE.,'IfcIdentifier','',$,$,$,$,.READWRITE.);
+#1482= IFCSIMPLEPROPERTYTEMPLATE('1sgvdetjb1JxEqbzkc2sqC',#209,'ArticleNumber','Article number or reference that is be applied to a configured product according to a standard scheme for article number definition as defined by the manufacturer. It is often used as the purchasing number.',.P_SINGLEVALUE.,'IfcIdentifier','',$,$,$,$,.READWRITE.);
+#1483= IFCSIMPLEPROPERTYTEMPLATE('3wqp__MIv1H9F7bsX0g1Pv',#209,'ModelReference','The model number or designator of the product model (or product line) as assigned by the manufacturer of the manufactured item.',.P_SINGLEVALUE.,'IfcLabel','',$,$,$,$,.READWRITE.);
+#1484= IFCSIMPLEPROPERTYTEMPLATE('0ZGAMw3wDEvQK1eN0ABad0',#209,'ModelLabel','The descriptive model name of the product model (or product line) as assigned by the manufacturer of the manufactured item.',.P_SINGLEVALUE.,'IfcLabel','',$,$,$,$,.READWRITE.);
+#1485= IFCSIMPLEPROPERTYTEMPLATE('0SjOR_Aiz1F9zib80mPIr0',#209,'Manufacturer','The organization that manufactured and/or assembled the item.',.P_SINGLEVALUE.,'IfcLabel','',$,$,$,$,.READWRITE.);
+#1486= IFCSIMPLEPROPERTYTEMPLATE('2zE_DR$F52WAh8dBauU7vt',#209,'ProductionYear','The year of production of the manufactured item.',.P_SINGLEVALUE.,'IfcLabel','',$,$,$,$,.READWRITE.);
+#1487= IFCPROPERTYENUMERATION('PEnum_AssemblyPlace',(IFCLABEL('FACTORY'),IFCLABEL('OFFSITE'),IFCLABEL('SITE'),IFCLABEL('OTHER'),IFCLABEL('NOTKNOWN'),IFCLABEL('UNSET')),$);
+#1488= IFCSIMPLEPROPERTYTEMPLATE('0T7c_L8b9E$9V2KslgB9xe',#209,'AssemblyPlace','Enumeration defining where the assembly is intended to take place, either in a factory or on the building site.',.P_ENUMERATEDVALUE.,'IfcLabel',$,#1487,$,$,$,.READWRITE.);
+#1489= IFCPROPERTYSETTEMPLATE('0wwkiIwGz0lf2YIWw4Kdjj',#209,'Pset_ManufacturerTypeInformation','Defines characteristics of types (ranges) of manufactured products that may be given by the manufacturer. Note that the term ''manufactured'' may also be used to refer to products that are supplied and identified by the supplier or that are assembled off site by a third party provider. \X\0AHISTORY: This property set replaces the entity IfcManufacturerInformation from previous IFC releases. IFC 2x4: AssemblyPlace property added.',.PSET_TYPEDRIVENOVERRIDE.,'IfcElement',(#1481,#1482,#1483,#1484,#1485,#1486,#1488));
+#1490= IFCLIBRARYREFERENCE($,'Pset_ManufacturerTypeInformation','Pset_ManufacturerTypeInformation',$,$,#1332);
+#1495= IFCRELASSOCIATESLIBRARY('39XKqfEPrEmwCmJTAn1TLk',#209,$,$,(#1489),#1490);
+
+/* Property set for Pset_ManufacturerTypeInformation */
+#1499= IFCPROPERTYSINGLEVALUE('GlobalTradeItemNumber',$,$,$);
+#1500= IFCPROPERTYSINGLEVALUE('ArticleNumber',$,$,$);
+#1501= IFCPROPERTYSINGLEVALUE('ModelReference',$,IFCLABEL('1234'),$);
+#1502= IFCPROPERTYSINGLEVALUE('ModelLabel',$,IFCLABEL('Ceiling Diffuser'),$);
+#1503= IFCPROPERTYSINGLEVALUE('Manufacturer',$,IFCLABEL('Acme'),$);
+#1504= IFCPROPERTYSINGLEVALUE('ProductionYear',$,IFCLABEL('2011'),$);
+#1505= IFCPROPERTYENUMERATEDVALUE('AssemblyPlace',$,(IFCLABEL('FACTORY')),#1487);
+#1506= IFCPROPERTYSET('2LM02K5dbFiBVTpfUgOnl4',#209,'Pset_ManufacturerTypeInformation',$,(#1499,#1500,#1501,#1502,#1503,#1504,#1505));
+#1508= IFCRELDEFINESBYTEMPLATE('1gZFqTeWDCiPFdVEDktMyc',#209,$,$,(#1506),#1489);
+
+ENDSEC;
+
+END-ISO-10303-21;
diff --git a/test/input/building_service_element_air-terminal.ifc b/test/input/building_service_element_air-terminal.ifc
new file mode 100644
index 0000000..27acb97
--- /dev/null
+++ b/test/input/building_service_element_air-terminal.ifc
@@ -0,0 +1,228 @@
+ISO-10303-21;
+HEADER;
+FILE_DESCRIPTION($,'2;1');
+FILE_NAME('building_service_element_air-terminal.ifc','2011-11-11T23:58:37',(''),(''),'Constructivity 0.9.1','Constructivity 0.9.1','');
+FILE_SCHEMA(('IFC4'));
+ENDSEC;
+
+DATA;
+
+/* owner history and application info */
+#1= IFCAPPLICATION(#2,'0.9.1','Constructivity','CONSTRUCTIVITY');
+#2= IFCORGANIZATION($,'Constructivity.com LLC',$,$,$);
+#3= IFCPERSON('Tim',$,$,$,$,$,$,$);
+#4= IFCORGANIZATION($,'Tim-PC',$,$,$);
+#5= IFCPERSONANDORGANIZATION(#3,#4,$);
+
+/* units based on inches */
+#28= IFCSIUNIT(*,.LENGTHUNIT.,$,.METRE.);
+#29= IFCMEASUREWITHUNIT(IFCLENGTHMEASURE(0.0254),#28);
+#30= IFCDIMENSIONALEXPONENTS(1,0,0,0,0,0,0);
+#31= IFCCONVERSIONBASEDUNIT(#30,.LENGTHUNIT.,'inch',#29);
+#207= IFCUNITASSIGNMENT((#31));
+#208= IFCPROJECT('0lj5XNwQn6O8b3O4i7jK0b',#209,'Project',$,$,$,$,(#212,#215),#207);
+#209= IFCOWNERHISTORY(#5,#1,.READWRITE.,.NOTDEFINED.,$,$,$,1321055806);
+
+/* representation contexts */
+#210= IFCCARTESIANPOINT((0.,0.,0.));
+#211= IFCAXIS2PLACEMENT3D(#210,$,$);
+#212= IFCGEOMETRICREPRESENTATIONCONTEXT('3D','Model',3,1.0E-5,#211,$);
+#213= IFCCARTESIANPOINT((0.,0.,0.));
+#214= IFCAXIS2PLACEMENT3D(#213,$,$);
+#215= IFCGEOMETRICREPRESENTATIONCONTEXT('2D','Plan',2,1.0E-5,#214,$);
+
+/* A library is imported that describes the air terminal type. */
+#216= IFCPROJECTLIBRARY('0lIJEMoxL8yP0B7vq1iIiM',#209,'HVAC Product Type Library Example','Demonstrates an air terminal type which may be instantiated in buildings within referencing files.','ProductLibrary',$,$,(#212),#207);
+#217= IFCRELDECLARES('00ufBkjlf4nOFHXfji7ezF',#209,$,$,#208,(#216));
+#221= IFCLIBRARYINFORMATION('HVAC Product Type Library Example',$,$,'2011-11-11T23:49:28','IfcAirTerminalType.ifc',$);
+#222= IFCRELASSOCIATESLIBRARY('3_6NqfKKH30wqc8leArKAY',#209,$,$,(#216),#221);
+
+/* property sets defined on the air terminal type (imported) */
+#225= IFCPROPERTYSINGLEVALUE('Reference',$,$,$);
+#226= IFCPROPERTYENUMERATION('PEnum_Status',(IFCLABEL('NEW'),IFCLABEL('EXISTING'),IFCLABEL('DEMOLISH'),IFCLABEL('TEMPORARY'),IFCLABEL('OTHER'),IFCLABEL('NOTKNOWN'),IFCLABEL('UNSET')),$);
+#227= IFCPROPERTYENUMERATEDVALUE('Status',$,$,#226);
+#228= IFCPROPERTYENUMERATION('PEnum_AirTerminalShape',(IFCLABEL('ROUND'),IFCLABEL('RECTANGULAR'),IFCLABEL('SQUARE'),IFCLABEL('SLOT'),IFCLABEL('OTHER'),IFCLABEL('NOTKNOWN'),IFCLABEL('UNSET')),$);
+#229= IFCPROPERTYENUMERATEDVALUE('Shape',$,(IFCLABEL('SQUARE')),#228);
+#230= IFCPROPERTYENUMERATION('PEnum_AirTerminalFaceType',(IFCLABEL('FOURWAYPATTERN'),IFCLABEL('SINGLEDEFLECTION'),IFCLABEL('DOUBLEDEFLECTION'),IFCLABEL('SIGHTPROOF'),IFCLABEL('EGGCRATE'),IFCLABEL('PERFORATED'),IFCLABEL('LOUVERED'),IFCLABEL('OTHER'),IFCLABEL('NOTKNOWN'),IFCLABEL('UNSET')),$);
+#231= IFCPROPERTYENUMERATEDVALUE('FaceType',$,$,#230);
+#232= IFCPROPERTYSINGLEVALUE('SlotWidth',$,$,$);
+#233= IFCPROPERTYSINGLEVALUE('SlotLength',$,$,$);
+#234= IFCPROPERTYSINGLEVALUE('NumberOfSlots',$,$,$);
+#235= IFCPROPERTYENUMERATION('PEnum_AirTerminalFlowPattern',(IFCLABEL('LINEARSINGLE'),IFCLABEL('LINEARDOUBLE'),IFCLABEL('LINEARFOURWAY'),IFCLABEL('RADIAL'),IFCLABEL('SWIRL'),IFCLABEL('DISPLACMENT'),IFCLABEL('COMPACTJET'),IFCLABEL('OTHER'),IFCLABEL('NOTKNOWN'),IFCLABEL('UNSET')),$);
+#236= IFCPROPERTYENUMERATEDVALUE('FlowPattern',$,$,#235);
+#237= IFCPROPERTYBOUNDEDVALUE('AirFlowrateRange',$,$,$,$,$);
+#238= IFCPROPERTYBOUNDEDVALUE('TemperatureRange',$,$,$,$,$);
+#239= IFCPROPERTYENUMERATION('PEnum_AirTerminalDischargeDirection',(IFCLABEL('PARALLEL'),IFCLABEL('PERPENDICULAR'),IFCLABEL('ADJUSTABLE'),IFCLABEL('OTHER'),IFCLABEL('NOTKNOWN'),IFCLABEL('UNSET')),$);
+#240= IFCPROPERTYENUMERATEDVALUE('DischargeDirection',$,$,#239);
+#241= IFCPROPERTYSINGLEVALUE('ThrowLength',$,$,$);
+#242= IFCPROPERTYSINGLEVALUE('AirDiffusionPerformanceIndex',$,$,$);
+#243= IFCPROPERTYENUMERATION('PEnum_AirTerminalFinishType',(IFCLABEL('ANNODIZED'),IFCLABEL('PAINTED'),IFCLABEL('NONE'),IFCLABEL('OTHER'),IFCLABEL('NOTKNOWN'),IFCLABEL('UNSET')),$);
+#244= IFCPROPERTYENUMERATEDVALUE('FinishType',$,$,#243);
+#245= IFCPROPERTYSINGLEVALUE('FinishColor',$,$,$);
+#246= IFCPROPERTYENUMERATION('PEnum_AirTerminalMountingType',(IFCLABEL('SURFACE'),IFCLABEL('FLATFLUSH'),IFCLABEL('LAYIN'),IFCLABEL('OTHER'),IFCLABEL('NOTKNOWN'),IFCLABEL('UNSET')),$);
+#247= IFCPROPERTYENUMERATEDVALUE('MountingType',$,$,#246);
+#248= IFCPROPERTYENUMERATION('PEnum_AirTerminalCoreType',(IFCLABEL('SHUTTERBLADE'),IFCLABEL('CURVEDBLADE'),IFCLABEL('REMOVABLE'),IFCLABEL('REVERSIBLE'),IFCLABEL('NONE'),IFCLABEL('OTHER'),IFCLABEL('NOTKNOWN'),IFCLABEL('UNSET')),$);
+#249= IFCPROPERTYENUMERATEDVALUE('CoreType',$,$,#248);
+#250= IFCPROPERTYSINGLEVALUE('CoreSetHorizontal',$,$,$);
+#251= IFCPROPERTYSINGLEVALUE('CoreSetVertical',$,$,$);
+#252= IFCPROPERTYSINGLEVALUE('HasIntegralControl',$,$,$);
+#253= IFCPROPERTYENUMERATION('PEnum_AirTerminalFlowControlType',(IFCLABEL('DAMPER'),IFCLABEL('BELLOWS'),IFCLABEL('NONE'),IFCLABEL('OTHER'),IFCLABEL('NOTKNOWN'),IFCLABEL('UNSET')),$);
+#254= IFCPROPERTYENUMERATEDVALUE('FlowControlType',$,$,#253);
+#255= IFCPROPERTYSINGLEVALUE('HasSoundAttenuator',$,$,$);
+#256= IFCPROPERTYSINGLEVALUE('HasThermalInsulation',$,$,$);
+#257= IFCPROPERTYSINGLEVALUE('NeckArea',$,$,$);
+#258= IFCPROPERTYSINGLEVALUE('EffectiveArea',$,$,$);
+#259= IFCPROPERTYTABLEVALUE('AirFlowrateVersusFlowControlElement',$,$,$,$,$,$,$);
+#260= IFCPROPERTYSET('34RBPXI3v1B9OyUNo6YREP',#209,'Pset_AirTerminalTypeCommon',$,(#225,#227,#229,#231,#232,#233,#234,#236,#237,#238,#240,#241,#242,#244,#245,#247,#249,#250,#251,#252,#254,#255,#256,#257,#258,#259));
+#261= IFCPROPERTYSINGLEVALUE('GlobalTradeItemNumber',$,$,$);
+#262= IFCPROPERTYSINGLEVALUE('ArticleNumber',$,$,$);
+#263= IFCPROPERTYSINGLEVALUE('ModelReference',$,IFCLABEL('1234'),$);
+#264= IFCPROPERTYSINGLEVALUE('ModelLabel',$,IFCLABEL('Ceiling Diffuser'),$);
+#265= IFCPROPERTYSINGLEVALUE('Manufacturer',$,IFCLABEL('Acme'),$);
+#266= IFCPROPERTYSINGLEVALUE('ProductionYear',$,IFCLABEL('2011'),$);
+#267= IFCPROPERTYENUMERATION('PEnum_AssemblyPlace',(IFCLABEL('FACTORY'),IFCLABEL('OFFSITE'),IFCLABEL('SITE'),IFCLABEL('OTHER'),IFCLABEL('NOTKNOWN'),IFCLABEL('UNSET')),$);
+#268= IFCPROPERTYENUMERATEDVALUE('AssemblyPlace',$,(IFCLABEL('FACTORY')),#267);
+#269= IFCPROPERTYSET('2LM02K5dbFiBVTpfUgOnl4',#209,'Pset_ManufacturerTypeInformation',$,(#261,#262,#263,#264,#265,#266,#268));
+
+/* The air terminal type (imported from referenced library) */
+#270= IFCCARTESIANPOINT((0.,0.,0.));
+#271= IFCAXIS2PLACEMENT3D(#270,$,$);
+#275= IFCRECTANGLEHOLLOWPROFILEDEF(.AREA.,$,$,24.,24.,2.,10.,0.);
+#276= IFCCARTESIANPOINT((12.,12.,0.));
+#277= IFCAXIS2PLACEMENT3D(#276,$,$);
+#278= IFCDIRECTION((0.,0.,1.));
+#280= IFCCARTESIANPOINT((0.,0.));
+#281= IFCCARTESIANTRANSFORMATIONOPERATOR2D($,$,#280,0.5);
+#282= IFCDERIVEDPROFILEDEF(.AREA.,$,#275,#281,$);
+#283= IFCEXTRUDEDAREASOLIDTAPERED(#275,#277,#278,4.,#282);
+#284= IFCSHAPEREPRESENTATION(#212,'Body','AdvancedSweptSolid',(#283));
+#285= IFCREPRESENTATIONMAP(#271,#284);
+#286= IFCAIRTERMINALTYPE('1FESQ2M9vC7xYWZpI_LlCh',#209,'Acme Diffuser 1234','Ceiling diffuser',$,(#260,#269),(#285),$,$,.DIFFUSER.);
+
+/* The port of the air terminal type (imported from referenced library) */
+#287= IFCRELNESTS('3AlMGNAK5EXBgBfP5B8O1x',#209,$,$,#286,(#292));
+#289= IFCCARTESIANPOINT((12.,12.,4.));
+#290= IFCAXIS2PLACEMENT3D(#289,$,$);
+#291= IFCLOCALPLACEMENT($,#290);
+#292= IFCDISTRIBUTIONPORT('0lCGSOGtb4mu56WSeYuzNg',#209,'Inlet',$,$,#291,$,.SINK.,.DUCT.,.AIRCONDITIONING.);
+
+/* The property sets of the air terminal type (imported from referenced library) */
+#293= IFCPROPERTYSINGLEVALUE('PortNumber','The port index for logically ordering the port within the containing element or element type.',$,$);
+#294= IFCPROPERTYSINGLEVALUE('ColorCode','Name of a color for identifying the connector, if applicable.',$,$);
+#295= IFCPROPERTYSET('3MdHsbDH1BrQYI$kjaLN5a',#209,'Pset_DistributionPortCommon','Common attributes attached to an instance of IfcDistributionPort.',(#293,#294));
+#296= IFCRELDEFINESBYPROPERTIES('2fGG1Hw_P32hltt4MRMKcF',#209,'Pset_DistributionPortCommon',$,(#292),#295);
+
+/* The property sets of the port on the air terminal type (imported from referenced library) */
+#299= IFCPROPERTYENUMERATION('PEnum_DuctConnectionType',(IFCLABEL('BEADEDSLEEVE'),IFCLABEL('COMPRESSION'),IFCLABEL('CRIMP'),IFCLABEL('DRAWBAND'),IFCLABEL('DRIVESLIP'),IFCLABEL('FLANGED'),IFCLABEL('OUTSIDESLEEVE'),IFCLABEL('SLIPON'),IFCLABEL('SOLDERED'),IFCLABEL('SSLIP'),IFCLABEL('STANDINGSEAM'),IFCLABEL('SWEDGE'),IFCLABEL('WELDED'),IFCLABEL('OTHER'),IFCLABEL('NONE'),IFCLABEL('USERDEFINED'),IFCLABEL('NOTDEFINED')),$);
+#300= IFCPROPERTYENUMERATEDVALUE('ConnectionType',$,(IFCLABEL('OUTSIDESLEEVE')),#299);
+#301= IFCPROPERTYSINGLEVALUE('ConnectionSubType',$,$,$);
+#302= IFCPROPERTYSINGLEVALUE('NominalWidth',$,IFCPOSITIVELENGTHMEASURE(12.),$);
+#303= IFCPROPERTYSINGLEVALUE('NominalHeight',$,IFCPOSITIVELENGTHMEASURE(12.),$);
+#304= IFCPROPERTYBOUNDEDVALUE('DryBulbTemperature',$,$,$,$,$);
+#305= IFCPROPERTYBOUNDEDVALUE('WetBulbTemperature',$,$,$,$,$);
+#306= IFCPROPERTYBOUNDEDVALUE('VolumetricFlowRate',$,$,$,$,$);
+#307= IFCPROPERTYBOUNDEDVALUE('Velocity',$,$,$,$,$);
+#308= IFCPROPERTYBOUNDEDVALUE('Pressure',$,$,$,$,$);
+#309= IFCPROPERTYSET('142LVYnPP62figC7tUlZnT',#209,'Pset_DistributionPortTypeAirConditioning',$,(#300,#301,#302,#303,#304,#305,#306,#307,#308));
+#310= IFCRELDEFINESBYPROPERTIES('3y2BN59aj7eQx9qD9LwNFv',#209,'Pset_DistributionPortTypeAirConditioning',$,(#292),#309);
+
+/* The imported HVAC library declares the air terminal type and another referenced library to IFC property set templates. */
+#314= IFCRELDECLARES('00GZQZ98PAoOtB6V3qDnvW',#209,$,$,#216,(#286,#321));
+#318= IFCLIBRARYREFERENCE($,'1FESQ2M9vC7xYWZpI_LlCh','Acme Diffuser 1234','Ceiling diffuser',$,#221);
+#319= IFCRELASSOCIATESLIBRARY('3Dtpg_FwbBNvhDtSaHoKwc',#209,$,$,(#286),#318);
+
+/* The IFC property template library is referenced indirectly. */
+#321= IFCPROJECTLIBRARY('1rfo$z7PbCaeLf5SOGGJV5',#209,'IFC4',$,$,$,$,$,$);
+#323= IFCLIBRARYREFERENCE($,'1rfo$z7PbCaeLf5SOGGJV5','IFC4',$,$,#221);
+#324= IFCRELASSOCIATESLIBRARY('3kNx28VJP2rflmOknvdyJo',#209,$,$,(#321),#323);
+
+/* The project consists of a single building without any geometry (for brevity), to illustrate an air terminal occurrence connected to a duct segment. */
+#326= IFCBUILDING('1jCJfz2$TF29H$W5cKDgim',#209,$,$,$,$,$,$,.ELEMENT.,$,$,$);
+#328= IFCRELAGGREGATES('3q9yfa16z9wOZHi5h9dr4e',#209,$,$,#208,(#326));
+
+/* The air terminal occurrence is instantiated, with reference to its type. */
+#331= IFCAIRTERMINAL('1mF0_JbLzBtAZ0GUOlCFEx',#209,$,$,$,#376,#336,$,.NOTDEFINED.);
+#333= IFCRELDEFINESBYTYPE('3N14r06YX9o8jZ1KyiNaMP',#209,$,$,(#331),#286);
+
+/* The air terminal occurrence has Body representation mapped from the type. */
+#336= IFCPRODUCTDEFINITIONSHAPE($,$,(#338));
+#338= IFCSHAPEREPRESENTATION(#212,'Body','MappedRepresentation',(#342));
+#340= IFCCARTESIANPOINT((0.,0.,0.));
+#341= IFCCARTESIANTRANSFORMATIONOPERATOR3D($,$,#340,1.,$);
+#342= IFCMAPPEDITEM(#285,#341);
+
+/* The air terminal occurence has a single port, corresponding to the port nested on the air terminal type. */
+#344= IFCCARTESIANPOINT((12.,12.,4.));
+#345= IFCAXIS2PLACEMENT3D(#344,$,$);
+#346= IFCLOCALPLACEMENT(#376,#345);
+#347= IFCDISTRIBUTIONPORT('0VHUOBnvj48fTxWgsnjpHY',#209,'Inlet',$,$,#346,$,.SINK.,.DUCT.,.AIRCONDITIONING.);
+#368= IFCRELDEFINESBYOBJECT('3Ux2bjXUT0dRfUoPfRyE9u',#209,$,$,(#347),#292);
+#371= IFCRELNESTS('3IbS58PVzAf8BjScusxeb6',#209,$,$,#331,(#347));
+
+/* The air terminal occurrence is contained in the building. */
+#374= IFCRELCONTAINEDINSPATIALSTRUCTURE('2srhqEqCX4nA5hKmyLxDOV',#209,$,$,(#331,#381),#326);
+
+/* The air terminal occurrence is placed at the origin. */
+#376= IFCLOCALPLACEMENT($,#378);
+#377= IFCCARTESIANPOINT((0.,0.,0.));
+#378= IFCAXIS2PLACEMENT3D(#377,$,$);
+
+/* A duct segment is is instantiated, without having any type. */
+#381= IFCDUCTSEGMENT('3T2CbFzwP0jP3Q12nB1pFu',#209,'Duct Segment #1',$,$,#388,#395,$,.FLEXIBLESEGMENT.);
+
+/* The duct segment is placed above the air terminal. */
+#384= IFCCARTESIANPOINT((0.,0.,0.));
+#385= IFCDIRECTION((0.,0.,1.));
+#386= IFCDIRECTION((1.,0.,0.));
+#387= IFCAXIS2PLACEMENT3D(#384,#385,#386);
+#388= IFCLOCALPLACEMENT(#346,#387);
+
+/* The duct segment has an Axis representation, for which the Body representation is generated according to a material profile set. */
+#390= IFCCARTESIANPOINT((0.,0.,0.));
+#391= IFCCARTESIANPOINT((24.,0.,0.));
+#392= IFCPOLYLINE((#390,#391));
+#395= IFCPRODUCTDEFINITIONSHAPE($,$,(#397,#492));
+#397= IFCSHAPEREPRESENTATION(#212,'Axis','Curve3D',(#392));
+
+/* The duct segment has two ports; one at each end. */
+#402= IFCDISTRIBUTIONPORT('3FBPFfN1f33wI59qKEjYrA',#209,'In','The end of the duct segment at the flow inlet.',$,#498,$,.SINK.,.DUCT.,.AIRCONDITIONING.);
+#422= IFCDISTRIBUTIONPORT('1RvoZEC65EtPHnpFD43nne',#209,'Out','The end of the duct segment at the flow outlet.',$,#501,$,.SOURCE.,.DUCT.,.AIRCONDITIONING.);
+#423= IFCRELNESTS('2nTJ1FhXn7tf_UMjKfoJ9h',#209,$,$,#381,(#402,#422));
+
+/* The duct segment has a circular hollow profile of 6 inches in diameter and 1/8 inch thickness. */
+#440= IFCCIRCLEHOLLOWPROFILEDEF(.AREA.,$,$,6.,0.125);
+
+/* The duct segment has aluminum material. */
+#441= IFCMATERIAL('Aluminum',$,'Aluminum');
+
+/* The material and profile are brought together and associated with the duct segment. */
+#481= IFCMATERIALPROFILEWITHOFFSETS('Body',$,#441,#440,$,$,(0.,0.));
+#482= IFCMATERIALPROFILESET('Duct Segment',$,(#481),$);
+#483= IFCMATERIALPROFILESETUSAGE(#482,5,96.);
+#484= IFCRELASSOCIATESMATERIAL('1bWT35MPL8ofRppoLEQdoc',#209,'IfcDuctSegment',$,(#381),#483);
+
+/* The duct segment has a Body representation of an extruded area solid generated from the material profile along the Axis representation. */
+#486= IFCCARTESIANPOINT((0.,0.,0.));
+#487= IFCAXIS2PLACEMENT3D(#486,$,$);
+#488= IFCDIRECTION((0.,0.,1.));
+#489= IFCEXTRUDEDAREASOLID(#440,#487,#488,24.);
+#492= IFCSHAPEREPRESENTATION(#212,'Body','SweptSolid',(#489));
+
+/* The duct segment bottom port faces downwards (connected to the air terminal). */
+#494= IFCCARTESIANPOINT((0.,0.,0.));
+#495= IFCDIRECTION((0.,0.,-1.));
+#496= IFCDIRECTION((1.,0.,0.));
+#497= IFCAXIS2PLACEMENT3D(#494,#495,#496);
+#498= IFCLOCALPLACEMENT(#388,#497);
+
+/* The duct segment top port faces upwards (not yet connected). */
+#499= IFCCARTESIANPOINT((0.,0.,24.));
+#500= IFCAXIS2PLACEMENT3D(#499,$,$);
+#501= IFCLOCALPLACEMENT(#388,#500);
+
+/* The outlet port of the duct segment is connected to the inlet port of the air terminal. */
+#503= IFCRELCONNECTSPORTS('0Ydyc8vm11Z9FmKXK3c7CE',#209,$,$,#422,#347,$);
+
+ENDSEC;
+
+END-ISO-10303-21;
diff --git a/test/input/construction_scheduling_task.ifc b/test/input/construction_scheduling_task.ifc
new file mode 100644
index 0000000..01cf577
--- /dev/null
+++ b/test/input/construction_scheduling_task.ifc
@@ -0,0 +1,329 @@
+ISO-10303-21;
+HEADER;
+/* NOTE a valid model view name has to be asserted, replacing 'notYetAssigned' ----------------- */
+FILE_DESCRIPTION(
+    ( 'ViewDefinition [notYetAssigned]'
+     ,'Comment [manual creation of example file]'
+	)
+	,'2;1');
+/* NOTE standard header information according to ISO 10303-21 ---------------------------------- */
+FILE_NAME(
+	'IfcTask.ifc',
+	'2010-09-23T23:27:15',
+	('Tim Chipman'),
+	('buildingSMART International'),
+	'IFC text editor',
+	'IFC text editor',
+	'reference file created for the IFC4 specification');
+/* NOTE schema name to be replaced with 'IFC4' after the final release ------------------------- */
+FILE_SCHEMA(('IFC4'));
+ENDSEC;
+
+DATA;
+/* Project context ----------------------------------------------------------------------------- */
+/* required for every IFC data file ------------------------------------------------------------ */
+#1= IFCAPPLICATION(#2,'0.7','Constructivity','CONSTRUCTIVITY');
+#2= IFCORGANIZATION($,'Constructivity.com LLC',$,$,$);
+#3= IFCPERSON('','Chipman','Tim',$,$,$,$,$);
+#4= IFCORGANIZATION($,'buildingSMART',$,$,$);
+#5= IFCPERSONANDORGANIZATION(#3,#4,$);
+/* Project units ------------------------------------------------------------------------------- */
+/* this project is based on imperial units (inch) ---------------------------------------------- */
+#26= IFCSIUNIT(*,.LENGTHUNIT.,$,.METRE.);
+#27= IFCMEASUREWITHUNIT(IFCLENGTHMEASURE(0.0254),#26);
+#28= IFCCONVERSIONBASEDUNIT(#29,.LENGTHUNIT.,'inch',#27);
+#29= IFCDIMENSIONALEXPONENTS(1,0,0,0,0,0,0);
+#199= IFCUNITASSIGNMENT((#28));
+/* Project ------------------------------------------------------------------------------------- */
+/* declaring units, representation context and owner history for this data set ----------------- */
+#200= IFCPROJECT('2ww9A9wXX54eT3Wns4rLsr',#201,'example project',$,$,$,$,(#204,#207),#199);
+#201= IFCOWNERHISTORY(#5,#1,.READWRITE.,.ADDED.,1285284288,$,$,1285284288);
+#202= IFCCARTESIANPOINT((0.,0.,0.));
+#203= IFCAXIS2PLACEMENT3D(#202,$,$);
+#204= IFCGEOMETRICREPRESENTATIONCONTEXT('3D','Model',3,1.0E-05,#203,$);
+#205= IFCCARTESIANPOINT((0.,0.,0.));
+#206= IFCAXIS2PLACEMENT3D(#205,$,$);
+#207= IFCGEOMETRICREPRESENTATIONCONTEXT('2D','Plan',2,1.0E-05,#206,$);
+
+/* Spatial structure of site, building, and single storey -------------------------------------- */
+/* the site has a footprint and body geometric representation ---------------------------------- */
+#208= IFCSITE('2uTUkDuu1Caw4X2OaltWYD',#201,'Site #1',$,$,#229,#210,$,.ELEMENT.,$,$,$,$,$);
+#210= IFCPRODUCTDEFINITIONSHAPE($,$,(#212,#214));
+#212= IFCSHAPEREPRESENTATION(#204,'FootPrint','GeometricCurveSet',(#221));
+#214= IFCSHAPEREPRESENTATION(#204,'Body','SweptSolid',(#260));
+#216= IFCCARTESIANPOINT((0.,0.));
+#217= IFCCARTESIANPOINT((1536.,0.));
+#218= IFCCARTESIANPOINT((1536.,768.));
+#219= IFCCARTESIANPOINT((0.,768.));
+#220= IFCPOLYLINE((#216,#217,#218,#219,#216));
+#221= IFCGEOMETRICCURVESET((#220));
+#223= IFCARBITRARYCLOSEDPROFILEDEF(.AREA.,$,#220);
+#224= IFCEXTRUDEDAREASOLID(#223,#226,#227,48.);
+#225= IFCCARTESIANPOINT((0.,0.,0.));
+#226= IFCAXIS2PLACEMENT3D(#225,$,$);
+#227= IFCDIRECTION((0.,0.,1.));
+#229= IFCLOCALPLACEMENT($,#231);
+#230= IFCCARTESIANPOINT((0.,0.,0.));
+#231= IFCAXIS2PLACEMENT3D(#230,$,$);
+#233= IFCRELAGGREGATES('3lhFWDvkb6Cwv__4__szPn',#201,$,$,#200,(#208));
+#235= IFCDIRECTION((1.,0.,0.));
+
+/* the building has a footprint geometric representation --------------------------------------- */
+/* --------------------------------------------------------------------------------------------- */
+#236= IFCBUILDING('39A9p5Pi1EIRKAduawfVgP',#201,'Building #1',$,$,#252,#245,$,.ELEMENT.,$,$,$);
+#238= IFCCARTESIANPOINT((0.,0.));
+#239= IFCCARTESIANPOINT((288.,0.));
+#240= IFCCARTESIANPOINT((288.,192.));
+#241= IFCCARTESIANPOINT((0.,192.));
+#242= IFCPOLYLINE((#238,#239,#240,#241,#238));
+#243= IFCGEOMETRICCURVESET((#242));
+#245= IFCPRODUCTDEFINITIONSHAPE($,$,(#247));
+#247= IFCSHAPEREPRESENTATION(#204,'FootPrint','GeometricCurveSet',(#243));
+#250= IFCRELAGGREGATES('2Ugw7SsXLDQBYCez8hipzK',#201,$,$,#208,(#236));
+#252= IFCLOCALPLACEMENT(#229,#257);
+#253= IFCCARTESIANPOINT((0.,0.,0.));
+#254= IFCAXIS2PLACEMENT3D(#253,$,$);
+#256= IFCCARTESIANPOINT((576.,240.,48.));
+#257= IFCAXIS2PLACEMENT3D(#256,$,$);
+#259= IFCARBITRARYCLOSEDPROFILEDEF(.AREA.,$,#220);
+#260= IFCEXTRUDEDAREASOLID(#259,#262,#263,48.);
+#261= IFCCARTESIANPOINT((0.,0.,0.));
+#262= IFCAXIS2PLACEMENT3D(#261,$,$);
+#263= IFCDIRECTION((0.,0.,1.));
+
+/* the building storey has a footprint geometric representation -------------------------------- */
+/* --------------------------------------------------------------------------------------------- */
+#265= IFCBUILDINGSTOREY('3nYYuCp$XC4vhvJ2cMbpd2',#201,'Ground Level',$,$,#270,#281,$,.ELEMENT.,0.);
+#266= IFCRELAGGREGATES('2RHRlut4v6yPP4JCrvm4IE',#201,$,$,#236,(#265));
+#270= IFCLOCALPLACEMENT(#252,#272);
+#271= IFCCARTESIANPOINT((0.,0.,0.));
+#272= IFCAXIS2PLACEMENT3D(#271,$,$);
+#274= IFCCARTESIANPOINT((0.,0.));
+#275= IFCCARTESIANPOINT((288.,0.));
+#276= IFCCARTESIANPOINT((288.,192.));
+#277= IFCCARTESIANPOINT((0.,192.));
+#278= IFCCARTESIANPOINT((0.,0.));
+#279= IFCPOLYLINE((#274,#275,#276,#277,#278));
+#280= IFCGEOMETRICCURVESET((#279));
+#281= IFCPRODUCTDEFINITIONSHAPE($,$,(#283));
+#283= IFCSHAPEREPRESENTATION(#204,'FootPrint','GeometricCurveSet',(#280));
+
+/* Slab having rectangular shape and concrete material layer ----------------------------------- */
+/* --------------------------------------------------------------------------------------------- */
+#286= IFCCARTESIANPOINT((0.,0.));
+#287= IFCCARTESIANPOINT((288.,0.));
+#288= IFCCARTESIANPOINT((288.,192.));
+#289= IFCCARTESIANPOINT((0.,192.));
+#290= IFCCARTESIANPOINT((0.,0.));
+#291= IFCPOLYLINE((#286,#287,#288,#289,#290));
+#292= IFCSLABSTANDARDCASE('20WrgxqpbDtferON_k1P2X',#201,'Slab #1',$,$,#352,#302,$,.BASESLAB.);
+#300= IFCGEOMETRICCURVESET((#291));
+#302= IFCPRODUCTDEFINITIONSHAPE($,$,(#304,#346));
+#304= IFCSHAPEREPRESENTATION(#204,'FootPrint','GeometricCurveSet',(#300));
+#310= IFCMATERIALLAYER(#315,6.,$,'Core','Material from which the slab is constructed.',$,$);
+#311= IFCMATERIALLAYERSET((#310),$,$);
+#313= IFCMATERIALLAYERSETUSAGE(#311,.AXIS3.,.POSITIVE.,0.,$);
+#314= IFCRELASSOCIATESMATERIAL('2kASSjs2f6Phd71DH$IPe5',#201,'IfcSlabStandardCase',$,(#292),#313);
+#315= IFCMATERIAL('Concrete (Nominal)',$,'Concrete');
+#341= IFCARBITRARYCLOSEDPROFILEDEF(.AREA.,$,#279);
+#342= IFCEXTRUDEDAREASOLID(#341,#344,#345,6.);
+#343= IFCCARTESIANPOINT((0.,0.,0.));
+#344= IFCAXIS2PLACEMENT3D(#343,$,$);
+#345= IFCDIRECTION((0.,0.,1.));
+#346= IFCSHAPEREPRESENTATION(#204,'Body','SweptSolid',(#534));
+#532= IFCDIRECTION((0.,0.,1.));
+#533= IFCARBITRARYCLOSEDPROFILEDEF(.AREA.,$,#291);
+#534= IFCEXTRUDEDAREASOLID(#533,#536,#532,6.);
+#535= IFCCARTESIANPOINT((0.,0.,0.));
+#536= IFCAXIS2PLACEMENT3D(#535,$,$);
+
+#349= IFCRELCONTAINEDINSPATIALSTRUCTURE('19iKmngSP0bR$GMfGwTIoD',#201,$,$,(#292,#356,#385,#407,#429),#265);
+#350= IFCCARTESIANPOINT((0.,0.,0.));
+#351= IFCAXIS2PLACEMENT3D(#350,$,$);
+#352= IFCLOCALPLACEMENT(#270,#351);
+#355= IFCDIRECTION((0.,1.,0.));
+
+/* Walls for exterior, positioned along edges of rectangular slab ------------------------------ */
+/* --------------------------------------------------------------------------------------------- */
+
+/* Standard case walls #1 with axis and body geometry and material layer set defined ----------- */
+/* --------------------------------------------------------------------------------------------- */
+#356= IFCWALLSTANDARDCASE('26tmERtwL8G8UQn5BoglEh',#201,'Wall #1',$,$,#362,#379,$,.NOTDEFINED.);
+#358= IFCRELCONNECTSELEMENTS('2ZHJEGFvL98QhEDnQsGNrK',#201,$,$,$,#292,#356);
+#359= IFCCARTESIANPOINT((0.,0.,6.));
+#360= IFCDIRECTION((0.,0.,1.));
+#361= IFCAXIS2PLACEMENT3D(#359,#360,#355);
+#362= IFCLOCALPLACEMENT(#270,#361);
+#365= IFCMATERIALLAYERWITHOFFSETS(#370,6.,$,'Block','Structural core of the wall, such as concrete masonry units.',$,$,.AXIS1.,(0.,0.));
+#366= IFCMATERIALLAYERSET((#365),$,$);
+#368= IFCMATERIALLAYERSETUSAGE(#366,.AXIS2.,.POSITIVE.,-3.,$);
+#369= IFCRELASSOCIATESMATERIAL('0cuSbpct575BKLAXM$olZ_',#201,'IfcWallStandardCase',$,(#356,#385,#407,#429),#368);
+#370= IFCMATERIAL('Block (Nominal)',$,'Block');
+#376= IFCCARTESIANPOINT((0.,0.));
+#377= IFCCARTESIANPOINT((192.,0.));
+#378= IFCPOLYLINE((#376,#377));
+#379= IFCPRODUCTDEFINITIONSHAPE($,$,(#381,#548));
+#381= IFCSHAPEREPRESENTATION(#204,'Axis','Curve2D',(#378));
+#384= IFCDIRECTION((1.,0.,0.));
+#538= IFCCARTESIANPOINT((3.,-3.));
+#539= IFCCARTESIANPOINT((189.,-3.));
+#540= IFCCARTESIANPOINT((195.,3.));
+#541= IFCCARTESIANPOINT((-3.,3.));
+#542= IFCPOLYLINE((#538,#539,#540,#541,#538));
+#543= IFCARBITRARYCLOSEDPROFILEDEF(.AREA.,$,#542);
+#544= IFCEXTRUDEDAREASOLID(#543,#546,#547,120.);
+#545= IFCCARTESIANPOINT((0.,0.,0.));
+#546= IFCAXIS2PLACEMENT3D(#545,$,$);
+#547= IFCDIRECTION((0.,0.,1.));
+#548= IFCSHAPEREPRESENTATION(#204,'Body','SweptSolid',(#544));
+
+
+/* Standard case walls #2 with axis and body geometry and material layer set defined ----------- */
+/* --------------------------------------------------------------------------------------------- */
+#385= IFCWALLSTANDARDCASE('2qqyx9mIf27vQuEGt7ts8$',#201,'Wall #2',$,$,#394,#401,$,.NOTDEFINED.);
+#387= IFCRELCONNECTSELEMENTS('04lBS8dRv8082xho3Ve2L0',#201,$,$,$,#292,#385);
+#388= IFCRELCONNECTSPATHELEMENTS('2aU84ph_f2iwRK7mEx6APn',#201,$,$,$,#356,#385,(),(),.ATSTART.,.ATEND.);
+#391= IFCCARTESIANPOINT((0.,192.,6.));
+#392= IFCDIRECTION((0.,0.,1.));
+#393= IFCAXIS2PLACEMENT3D(#391,#392,#384);
+#394= IFCLOCALPLACEMENT(#270,#393);
+#398= IFCCARTESIANPOINT((0.,0.));
+#399= IFCCARTESIANPOINT((288.,0.));
+#400= IFCPOLYLINE((#398,#399));
+#401= IFCPRODUCTDEFINITIONSHAPE($,$,(#403,#561));
+#403= IFCSHAPEREPRESENTATION(#204,'Axis','Curve2D',(#400));
+#406= IFCDIRECTION((0.,-1.,0.));
+#551= IFCCARTESIANPOINT((3.,-3.));
+#552= IFCCARTESIANPOINT((285.,-3.));
+#553= IFCCARTESIANPOINT((291.,3.));
+#554= IFCCARTESIANPOINT((-3.,3.));
+#555= IFCPOLYLINE((#551,#552,#553,#554,#551));
+#556= IFCARBITRARYCLOSEDPROFILEDEF(.AREA.,$,#555);
+#557= IFCEXTRUDEDAREASOLID(#556,#559,#560,120.);
+#558= IFCCARTESIANPOINT((0.,0.,0.));
+#559= IFCAXIS2PLACEMENT3D(#558,$,$);
+#560= IFCDIRECTION((0.,0.,1.));
+#561= IFCSHAPEREPRESENTATION(#204,'Body','SweptSolid',(#557));
+
+/* Standard case walls #3 with axis and body geometry and material layer set defined ----------- */
+/* --------------------------------------------------------------------------------------------- */
+#407= IFCWALLSTANDARDCASE('0edwXkNgP03AySQjQQlat2',#201,'Wall #3',$,$,#416,#423,$,.NOTDEFINED.);
+#409= IFCRELCONNECTSELEMENTS('1_c3omXFD7UPfF9thiXwlM',#201,$,$,$,#292,#407);
+#410= IFCRELCONNECTSPATHELEMENTS('3cHo0l0vT7YecRcCZH80A_',#201,$,$,$,#385,#407,(),(),.ATSTART.,.ATEND.);
+#413= IFCCARTESIANPOINT((288.,192.,6.));
+#414= IFCDIRECTION((0.,0.,1.));
+#415= IFCAXIS2PLACEMENT3D(#413,#414,#406);
+#416= IFCLOCALPLACEMENT(#270,#415);
+#420= IFCCARTESIANPOINT((0.,0.));
+#421= IFCCARTESIANPOINT((192.,0.));
+#422= IFCPOLYLINE((#420,#421));
+#423= IFCPRODUCTDEFINITIONSHAPE($,$,(#425,#574));
+#425= IFCSHAPEREPRESENTATION(#204,'Axis','Curve2D',(#422));
+#428= IFCDIRECTION((-1.,0.,0.));
+#564= IFCCARTESIANPOINT((3.,-3.));
+#565= IFCCARTESIANPOINT((189.,-3.));
+#566= IFCCARTESIANPOINT((195.,3.));
+#567= IFCCARTESIANPOINT((-3.,3.));
+#568= IFCPOLYLINE((#564,#565,#566,#567,#564));
+#569= IFCARBITRARYCLOSEDPROFILEDEF(.AREA.,$,#568);
+#570= IFCEXTRUDEDAREASOLID(#569,#572,#573,120.);
+#571= IFCCARTESIANPOINT((0.,0.,0.));
+#572= IFCAXIS2PLACEMENT3D(#571,$,$);
+#573= IFCDIRECTION((0.,0.,1.));
+#574= IFCSHAPEREPRESENTATION(#204,'Body','SweptSolid',(#570));
+
+/* Standard case walls #4 with axis and body geometry and material layer set defined ----------- */
+/* --------------------------------------------------------------------------------------------- */
+#429= IFCWALLSTANDARDCASE('27D5wuD5z86hr07xvbZLKW',#201,'Wall #4',$,$,#438,#445,$,.NOTDEFINED.);
+#431= IFCRELCONNECTSELEMENTS('2GwDyB_Xb1mBzqynA5hpmk',#201,$,$,$,#292,#429);
+#432= IFCRELCONNECTSPATHELEMENTS('0N2CJ8VSz1yx6iStYDzqLN',#201,$,$,$,#407,#429,(),(),.ATSTART.,.ATEND.);
+#435= IFCCARTESIANPOINT((288.,0.,6.));
+#436= IFCDIRECTION((0.,0.,1.));
+#437= IFCAXIS2PLACEMENT3D(#435,#436,#428);
+#438= IFCLOCALPLACEMENT(#270,#437);
+#442= IFCCARTESIANPOINT((0.,0.));
+#443= IFCCARTESIANPOINT((288.,0.));
+#444= IFCPOLYLINE((#442,#443));
+#445= IFCPRODUCTDEFINITIONSHAPE($,$,(#447,#587));
+#447= IFCSHAPEREPRESENTATION(#204,'Axis','Curve2D',(#444));
+#450= IFCRELCONNECTSPATHELEMENTS('2FxBB642r3GfFLy0QsWZoT',#201,$,$,$,#429,#356,(),(),.ATSTART.,.ATEND.);
+#577= IFCCARTESIANPOINT((3.,-3.));
+#578= IFCCARTESIANPOINT((285.,-3.));
+#579= IFCCARTESIANPOINT((291.,3.));
+#580= IFCCARTESIANPOINT((-3.,3.));
+#581= IFCPOLYLINE((#577,#578,#579,#580,#577));
+#582= IFCARBITRARYCLOSEDPROFILEDEF(.AREA.,$,#581);
+#583= IFCEXTRUDEDAREASOLID(#582,#585,#586,120.);
+#584= IFCCARTESIANPOINT((0.,0.,0.));
+#585= IFCAXIS2PLACEMENT3D(#584,$,$);
+#586= IFCDIRECTION((0.,0.,1.));
+#587= IFCSHAPEREPRESENTATION(#204,'Body','SweptSolid',(#583));
+
+
+/* Root task ----------------------------------------------------------------------------------- */
+/* Scheduled start is specified which constrains the start of all descendent tasks ------------- */
+#597= IFCTASKTIME($,.PREDICTED.,$,.WORKTIME.,'P0Y0M1DT16H0M0S','2010-09-20T08:00:00',$,'2010-09-20T08:00:00', '2010-09-24T16:00:00','2010-09-20T08:00:00','2010-09-20T16:00:00','P0Y0M0DT0H0M0S','P0Y0M0DT0H0M0S',.T.,$,$,$,$,$,$);
+#598= IFCTASK('0HSpq15hDC2R2RlJos8Ql5',#201,'Ground Level',$,$,$,$,$,$,.F.,$,#597,$);
+#599= IFCRELDECLARES('0CWmoqi1D5fvyIWw6QZMVg',#201,'PROCESS',$,#200,(#598));
+#611= IFCRELASSIGNSTOPRODUCT('3fzXeaVoT7R8p4ro97HwNg',#201,$,$,(#598),$,#265);
+
+/* Tasks for slabs, where each nested task is assigned to a specific slab ---------------------- */
+/* Scheduled start and finish are not specified, such that early start and finish take effect -- */
+#614= IFCTASKTIME($,.PREDICTED.,$,.WORKTIME.,'P0Y0M0DT8H0M0S',$,$,'2010-09-20T08:00:00','2010-09-20T16:00:00',$,$,$,$,$,$,$,$,$,$,$);
+#615= IFCTASK('3OFhQ6xenBvBxNI4NhGlTz',#201,'Slab (Standard)',$,$,'IfcSlabStandardCase',$,$,$,.F.,$,#614,$);
+#618= IFCRELNESTS('084eMXNPf4iQUJ1DL9YVyg',#201,$,$,#598,(#615,#639));
+#620= IFCTASKTIME($,.PREDICTED.,$,.WORKTIME.,'P0Y0M0DT8H0M0S',$,$,'2010-09-20T08:00:00','2010-09-20T16:00:00', '2010-09-20T08:00:00','2010-09-20T16:00:00','P0Y0M0DT16H0M0S','P0Y0M0DT1H0M0S',.T.,$,$,$,$,$,$);
+#621= IFCTASK('3vesIabXX7guLU5lIRuXh7',#201,'Slab #1',$,$,$,$,$,$,.F.,$,#620,$);
+#622= IFCRELNESTS('25bUvqUPT8sO$Hp1WU0jhy',#201,$,$,#615,(#621));
+#624= IFCRELASSIGNSTOPRODUCT('3vXaSpK9P0fg8T$uh5yD3o',#201,$,$,(#621),$,#292);
+
+/* Tasks for walls where each nested task is assigned to a specific wall ----------------------- */
+#638= IFCTASKTIME($,.PREDICTED.,$,.WORKTIME.,'P0Y0M1DT8H0M0S',$,$,'2010-09-21T08:00:00','2010-09-24T16:00:00',$,$,$,$,$,$,$,$,$,$,$);
+#639= IFCTASK('0njFKjg5HAEuwb1SdMaVRR',#201,'Wall (Standard)',$,$,'IfcWallStandardCase',$,$,$,.F.,$,#638,$);
+#643= IFCTASKTIME($,.PREDICTED.,$,.WORKTIME.,'P0Y0M0DT8H0M0S',$,$,'2010-09-21T08:00:00','2010-09-21T16:00:00', '2010-09-21T08:00:00','2010-09-21T16:00:00','P0Y0M0DT0H0M0S','P0Y0M0DT0H0M0S',.T.,$,$,$,$,$,$);
+#644= IFCTASK('0Kq8RwbZH3afCy87RX8dso',#201,'Wall #1',$,$,$,$,$,$,.F.,$,#643,$);
+#645= IFCRELNESTS('3i7xt4aCT70BYgowuH355l',#201,$,$,#639,(#644,#662,#676,#690));
+#647= IFCRELASSIGNSTOPRODUCT('3Q5arGx_f1TBv9qlup9fDC',#201,$,$,(#644),$,#356);
+#661= IFCTASKTIME($,.PREDICTED.,$,.WORKTIME.,'P0Y0M0DT8H0M0S',$,$,'2010-09-22T08:00:00','2010-09-22T16:00:00', '2010-09-22T08:00:00','2010-09-22T16:00:00','P0Y0M0DT0H0M0S','P0Y0M0DT0H0M0S',.T.,$,$,$,$,$,$);
+#662= IFCTASK('0hLKmeFATD$PWRDGqXzqOk',#201,'Wall #2',$,$,$,$,$,$,.F.,$,#661,$);
+#664= IFCRELASSIGNSTOPRODUCT('0$ba11SzL0hQrmYcN5xQqx',#201,$,$,(#662),$,#385);
+#675= IFCTASKTIME($,.PREDICTED.,$,.WORKTIME.,'P0Y0M0DT8H0M0S',$,$,'2010-09-23T08:00:00','2010-09-23T16:00:00', '2010-09-23T08:00:00','2010-09-23T16:00:00','P0Y0M0DT0H0M0S','P0Y0M0DT0H0M0S',.T.,$,$,$,$,$,$);
+#676= IFCTASK('0Yz5hS48v9jfiCNjUF0okF',#201,'Wall #3',$,$,$,$,$,$,.F.,$,#675,$);
+#678= IFCRELASSIGNSTOPRODUCT('3gkG6$UaT7GwCw3Fu$NJuW',#201,$,$,(#676),$,#407);
+#689= IFCTASKTIME($,.PREDICTED.,$,.WORKTIME.,'P0Y0M0DT8H0M0S',$,$,'2010-09-24T08:00:00','2010-09-24T16:00:00', '2010-09-24T08:00:00','2010-09-24T16:00:00','P0Y0M0DT0H0M0S','P0Y0M0DT0H0M0S',.T.,$,$,$,$,$,$);
+#690= IFCTASK('0kKoBDlp13eBAIY8350FFo',#201,'Wall #4',$,$,$,$,$,$,.F.,$,#689,$);
+#692= IFCRELASSIGNSTOPRODUCT('1ayXYhiTj4fuJRkoMMiKB1',#201,$,$,(#690),$,#429);
+
+/* Sequences of tasks where each wall must be constructed after supporting slab ---------------- */
+#703= IFCRELSEQUENCE('0ytgSSysP98eeo2xw37OMq',#201,$,$,#621,#644,$,.FINISH_START.,$);
+#723= IFCRELSEQUENCE('0wK7QBCOv15RnMy6Ia9ykQ',#201,$,$,#621,#662,$,.FINISH_START.,$);
+#728= IFCRELSEQUENCE('2Y5tFvjSfCngQp$$PYkXhS',#201,$,$,#621,#676,$,.FINISH_START.,$);
+#733= IFCRELSEQUENCE('2hWL_Juob0BPVRlnbe1v3c',#201,$,$,#621,#690,$,.FINISH_START.,$);
+
+/* Sequences of tasks indicating order of wall construction; otherwise could be omitted if ----- */
+/* scheduled in parallel ----------------------------------------------------------------------- */
+#739= IFCRELSEQUENCE('0GVHMGhZ58UhwQX6IyHGzD',#201,$,$,#644,#662,$,.FINISH_START.,$);
+#755= IFCRELSEQUENCE('2cOAlYj8X46PLPMFHuoV8X',#201,$,$,#662,#676,$,.FINISH_START.,$);
+#768= IFCRELSEQUENCE('3OZBIrkNX0IAUQIs8NADJm',#201,$,$,#676,#690,$,.FINISH_START.,$);
+
+/* Work plan includes a set of related calendars and schedules, -------------------------------- */
+/* each having assigned tasks and resources ---------------------------------------------------- */
+#778= IFCWORKPLAN('0eVhmaYyb3sBLb0LoNiW62',#201,'Work Plan #1',$,$,$,'2010-09-23T16:26:16',$,$,$,$,'2010-09-23T00:00:00',$,$);
+#779= IFCRELDECLARES('3n6EjscYnB4hf4mKVrfRVJ',#201,'CONTROL',$,#200,(#778));
+
+/* Work calendar indicates work hours of 08:00-16:00 Monday thru Friday; the calendar is applied */
+/* to the root task and indirectly to all descendent tasks unless overridden ------------------- */
+#783= IFCWORKCALENDAR('0LHFCz8r5EQw4GeNNMS$Xp',#201,$,$,$,$,(#789),$,.FIRSTSHIFT.);
+#784= IFCRELNESTS('0if6u97Ln58xH$wewg0rH3',#201,$,$,#778,(#783,#794));
+#787= IFCTIMEPERIOD('08:00:00','16:00:00');
+#788= IFCRECURRENCEPATTERN(.WEEKLY.,$,(1,2,3,4,5),$,$,$,$,(#787));
+#789= IFCWORKTIME('Standard',$,$,#788,$,$);
+#791= IFCRELASSIGNSTOCONTROL('3DnVao$j10NByLyVF3hP9m',#201,$,$,(#598),$,#783);
+
+/* Work schedule specifies a view of tasks using planned times --------------------------------- */
+#794= IFCWORKSCHEDULE('2LoWUCZHr7YvZks8lmqjcw',#201,$,$,$,$,'2010-09-23T16:26:42',$,$,$,$,'2010-09-23T00:00:00',$,.PLANNED.);
+#797= IFCRELASSIGNSTOCONTROL('0_6CMgJyT5jviMnquaXCct',#201,$,$,(#598),$,#794);
+
+ENDSEC;
+
+END-ISO-10303-21;
diff --git a/test/input/ellipse_pies.ifc b/test/input/ellipse_pies.ifc
new file mode 100644
index 0000000..73ba823
--- /dev/null
+++ b/test/input/ellipse_pies.ifc
@@ -0,0 +1,384 @@
+ISO-10303-21;
+HEADER;
+FILE_DESCRIPTION(('ViewDefinition [CoordinationView]'),'2;1');
+FILE_NAME('','2014-03-01T19:22:28',(''),('',''),'IfcOpenShell 0.5.0-dev','IfcOpenShell 0.5.0-dev','');
+FILE_SCHEMA(('IFC2X3'));
+ENDSEC;
+DATA;
+#1=IFCCARTESIANPOINT((-69.282,25.));
+#2=IFCCARTESIANPOINT((0.,0.));
+#3=IFCCARTESIANPOINT((80.,0.));
+#4=IFCDIRECTION((1.,0.));
+#5=IFCCARTESIANPOINT((0.,0.));
+#6=IFCAXIS2PLACEMENT2D(#5,#4);
+#7=IFCELLIPSE(#6,80.,50.);
+#8=IFCTRIMMEDCURVE(#7,(IFCPARAMETERVALUE(0.)),(IFCPARAMETERVALUE(150.)),.T.,.PARAMETER.);
+#9=IFCPOLYLINE((#1,#2,#3));
+#10=IFCCOMPOSITECURVESEGMENT(.CONTINUOUS.,.T.,#9);
+#11=IFCCOMPOSITECURVESEGMENT(.CONTINUOUS.,.T.,#8);
+#12=IFCCOMPOSITECURVE((#10,#11),.F.);
+#13=IFCARBITRARYCLOSEDPROFILEDEF(.AREA.,$,#12);
+#14=IFCPERSON($,$,'',$,$,$,$,$);
+#15=IFCORGANIZATION($,'IfcOpenShell',$,$,$);
+#16=IFCPERSONANDORGANIZATION(#14,#15,$);
+#17=IFCAPPLICATION(#15,'0.5.0-dev','IfcOpenShell','IfcOpenShell');
+#18=IFCOWNERHISTORY(#16,#17,$,.ADDED.,$,#16,#17,1393698148);
+#19=IFCDIRECTION((0.,1.,0.));
+#20=IFCDIRECTION((1.,0.,0.));
+#21=IFCDIRECTION((0.,0.,1.));
+#22=IFCCARTESIANPOINT((0.,0.,0.));
+#23=IFCAXIS2PLACEMENT3D(#22,#21,#20);
+#24=IFCGEOMETRICREPRESENTATIONCONTEXT('Plan','Model',3,1.E-005,#23,#19);
+#25=IFCDIMENSIONALEXPONENTS(0,0,0,0,0,0,0);
+#26=IFCSIUNIT(*,.LENGTHUNIT.,.MILLI.,.METRE.);
+#27=IFCSIUNIT(*,.PLANEANGLEUNIT.,$,.RADIAN.);
+#28=IFCMEASUREWITHUNIT(IFCPLANEANGLEMEASURE(0.0174533),#27);
+#29=IFCCONVERSIONBASEDUNIT(#25,.PLANEANGLEUNIT.,'Degrees',#28);
+#30=IFCUNITASSIGNMENT((#26,#29));
+#31=IFCPROJECT('3dCDOYw4n5Y8eJ_0KefHrD',#18,$,$,$,$,$,(#24),#30);
+#32=IFCDIRECTION((1.,0.,0.));
+#33=IFCDIRECTION((0.,0.,1.));
+#34=IFCCARTESIANPOINT((0.,0.,0.));
+#35=IFCAXIS2PLACEMENT3D(#34,#33,#32);
+#36=IFCLOCALPLACEMENT($,#35);
+#37=IFCSITE('0ol03OK$nDUvCKpih6_bvZ',#18,$,$,$,#36,$,$,.ELEMENT.,$,$,$,$,$);
+#38=IFCRELAGGREGATES('3yCAEqUIb0BPJHU96H8gC2',#18,$,$,#31,(#37));
+#39=IFCDIRECTION((1.,0.,0.));
+#40=IFCDIRECTION((0.,0.,1.));
+#41=IFCCARTESIANPOINT((0.,0.,0.));
+#42=IFCAXIS2PLACEMENT3D(#41,#40,#39);
+#43=IFCLOCALPLACEMENT(#36,#42);
+#44=IFCBUILDING('0R1s4OXGbEtg49f5zLhJ3g',#18,$,$,$,#43,$,$,.ELEMENT.,$,$,$);
+#45=IFCRELAGGREGATES('0sxw3WgU1Coev9zSyYzWO9',#18,$,$,#37,(#44));
+#46=IFCDIRECTION((1.,0.,0.));
+#47=IFCDIRECTION((0.,0.,1.));
+#48=IFCCARTESIANPOINT((0.,0.,0.));
+#49=IFCAXIS2PLACEMENT3D(#48,#47,#46);
+#50=IFCLOCALPLACEMENT(#43,#49);
+#51=IFCBUILDINGSTOREY('1HvrpjaUD0mAy9OYzypHxq',#18,$,$,$,#50,$,$,.ELEMENT.,$);
+#52=IFCRELAGGREGATES('2DM$wvbjr0wR$W7fs780rK',#18,$,$,#44,(#51));
+#53=IFCBUILDINGELEMENTPROXY('30PQ1kM756iReDeYWo3djN',#18,'profile',$,$,#59,#67,$,$);
+#54=IFCRELCONTAINEDINSPATIALSTRUCTURE('3X4LOUUP1BmBGTSuGACijT',#18,$,$,(#53),#51);
+#55=IFCDIRECTION((1.,0.,0.));
+#56=IFCDIRECTION((0.,0.,1.));
+#57=IFCCARTESIANPOINT((0.,0.,0.));
+#58=IFCAXIS2PLACEMENT3D(#57,#56,#55);
+#59=IFCLOCALPLACEMENT($,#58);
+#60=IFCDIRECTION((0.,0.,1.));
+#61=IFCDIRECTION((1.,0.,0.));
+#62=IFCDIRECTION((0.,0.,1.));
+#63=IFCCARTESIANPOINT((0.,0.,0.));
+#64=IFCAXIS2PLACEMENT3D(#63,#62,#61);
+#65=IFCEXTRUDEDAREASOLID(#13,#64,#60,20.);
+#66=IFCSHAPEREPRESENTATION(#24,'Body','SweptSolid',(#65));
+#67=IFCPRODUCTDEFINITIONSHAPE($,$,(#66));
+#68=IFCCARTESIANPOINT((-69.282,25.));
+#69=IFCCARTESIANPOINT((0.,0.));
+#70=IFCCARTESIANPOINT((80.,0.));
+#71=IFCDIRECTION((1.,0.));
+#72=IFCCARTESIANPOINT((0.,0.));
+#73=IFCAXIS2PLACEMENT2D(#72,#71);
+#74=IFCELLIPSE(#73,80.,50.);
+#75=IFCTRIMMEDCURVE(#74,(#70),(#68),.T.,.CARTESIAN.);
+#76=IFCPOLYLINE((#68,#69,#70));
+#77=IFCCOMPOSITECURVESEGMENT(.CONTINUOUS.,.T.,#76);
+#78=IFCCOMPOSITECURVESEGMENT(.CONTINUOUS.,.T.,#75);
+#79=IFCCOMPOSITECURVE((#77,#78),.F.);
+#80=IFCARBITRARYCLOSEDPROFILEDEF(.AREA.,$,#79);
+#81=IFCBUILDINGELEMENTPROXY('1tTkxkpn5CrRC_KrdxI7cs',#18,'profile',$,$,#87,#95,$,$);
+#82=IFCRELCONTAINEDINSPATIALSTRUCTURE('3jSIc1$rHB1hhu49tyDp0m',#18,$,$,(#81),#51);
+#83=IFCDIRECTION((1.,0.,0.));
+#84=IFCDIRECTION((0.,0.,1.));
+#85=IFCCARTESIANPOINT((200.,0.,0.));
+#86=IFCAXIS2PLACEMENT3D(#85,#84,#83);
+#87=IFCLOCALPLACEMENT($,#86);
+#88=IFCDIRECTION((0.,0.,1.));
+#89=IFCDIRECTION((1.,0.,0.));
+#90=IFCDIRECTION((0.,0.,1.));
+#91=IFCCARTESIANPOINT((0.,0.,0.));
+#92=IFCAXIS2PLACEMENT3D(#91,#90,#89);
+#93=IFCEXTRUDEDAREASOLID(#80,#92,#88,20.);
+#94=IFCSHAPEREPRESENTATION(#24,'Body','SweptSolid',(#93));
+#95=IFCPRODUCTDEFINITIONSHAPE($,$,(#94));
+#96=IFCCARTESIANPOINT((40.,-43.3013));
+#97=IFCCARTESIANPOINT((0.,0.));
+#98=IFCCARTESIANPOINT((69.282,25.));
+#99=IFCDIRECTION((1.,0.));
+#100=IFCCARTESIANPOINT((0.,0.));
+#101=IFCAXIS2PLACEMENT2D(#100,#99);
+#102=IFCELLIPSE(#101,80.,50.);
+#103=IFCTRIMMEDCURVE(#102,(IFCPARAMETERVALUE(30.)),(IFCPARAMETERVALUE(300.)),.T.,.PARAMETER.);
+#104=IFCPOLYLINE((#96,#97,#98));
+#105=IFCCOMPOSITECURVESEGMENT(.CONTINUOUS.,.T.,#104);
+#106=IFCCOMPOSITECURVESEGMENT(.CONTINUOUS.,.T.,#103);
+#107=IFCCOMPOSITECURVE((#105,#106),.F.);
+#108=IFCARBITRARYCLOSEDPROFILEDEF(.AREA.,$,#107);
+#109=IFCBUILDINGELEMENTPROXY('2NRk9uETP8nPw_R0$dnPSi',#18,'profile',$,$,#115,#123,$,$);
+#110=IFCRELCONTAINEDINSPATIALSTRUCTURE('1CkBKQ1DD5HO3W4GCoUn3k',#18,$,$,(#109),#51);
+#111=IFCDIRECTION((1.,0.,0.));
+#112=IFCDIRECTION((0.,0.,1.));
+#113=IFCCARTESIANPOINT((400.,0.,0.));
+#114=IFCAXIS2PLACEMENT3D(#113,#112,#111);
+#115=IFCLOCALPLACEMENT($,#114);
+#116=IFCDIRECTION((0.,0.,1.));
+#117=IFCDIRECTION((1.,0.,0.));
+#118=IFCDIRECTION((0.,0.,1.));
+#119=IFCCARTESIANPOINT((0.,0.,0.));
+#120=IFCAXIS2PLACEMENT3D(#119,#118,#117);
+#121=IFCEXTRUDEDAREASOLID(#108,#120,#116,20.);
+#122=IFCSHAPEREPRESENTATION(#24,'Body','SweptSolid',(#121));
+#123=IFCPRODUCTDEFINITIONSHAPE($,$,(#122));
+#124=IFCCARTESIANPOINT((40.,-43.3013));
+#125=IFCCARTESIANPOINT((0.,0.));
+#126=IFCCARTESIANPOINT((69.282,25.));
+#127=IFCDIRECTION((1.,0.));
+#128=IFCCARTESIANPOINT((0.,0.));
+#129=IFCAXIS2PLACEMENT2D(#128,#127);
+#130=IFCELLIPSE(#129,80.,50.);
+#131=IFCTRIMMEDCURVE(#130,(#126),(#124),.T.,.CARTESIAN.);
+#132=IFCPOLYLINE((#124,#125,#126));
+#133=IFCCOMPOSITECURVESEGMENT(.CONTINUOUS.,.T.,#132);
+#134=IFCCOMPOSITECURVESEGMENT(.CONTINUOUS.,.T.,#131);
+#135=IFCCOMPOSITECURVE((#133,#134),.F.);
+#136=IFCARBITRARYCLOSEDPROFILEDEF(.AREA.,$,#135);
+#137=IFCBUILDINGELEMENTPROXY('3ywxxkz8XBKeZa9KdjkKdq',#18,'profile',$,$,#143,#151,$,$);
+#138=IFCRELCONTAINEDINSPATIALSTRUCTURE('37ivoeNT12jusPi97ysI7W',#18,$,$,(#137),#51);
+#139=IFCDIRECTION((1.,0.,0.));
+#140=IFCDIRECTION((0.,0.,1.));
+#141=IFCCARTESIANPOINT((600.,0.,0.));
+#142=IFCAXIS2PLACEMENT3D(#141,#140,#139);
+#143=IFCLOCALPLACEMENT($,#142);
+#144=IFCDIRECTION((0.,0.,1.));
+#145=IFCDIRECTION((1.,0.,0.));
+#146=IFCDIRECTION((0.,0.,1.));
+#147=IFCCARTESIANPOINT((0.,0.,0.));
+#148=IFCAXIS2PLACEMENT3D(#147,#146,#145);
+#149=IFCEXTRUDEDAREASOLID(#136,#148,#144,20.);
+#150=IFCSHAPEREPRESENTATION(#24,'Body','SweptSolid',(#149));
+#151=IFCPRODUCTDEFINITIONSHAPE($,$,(#150));
+#152=IFCCARTESIANPOINT((69.282,25.));
+#153=IFCCARTESIANPOINT((0.,0.));
+#154=IFCCARTESIANPOINT((40.,-43.3013));
+#155=IFCDIRECTION((1.,0.));
+#156=IFCCARTESIANPOINT((0.,0.));
+#157=IFCAXIS2PLACEMENT2D(#156,#155);
+#158=IFCELLIPSE(#157,80.,50.);
+#159=IFCTRIMMEDCURVE(#158,(IFCPARAMETERVALUE(300.)),(IFCPARAMETERVALUE(30.)),.T.,.PARAMETER.);
+#160=IFCPOLYLINE((#152,#153,#154));
+#161=IFCCOMPOSITECURVESEGMENT(.CONTINUOUS.,.T.,#160);
+#162=IFCCOMPOSITECURVESEGMENT(.CONTINUOUS.,.T.,#159);
+#163=IFCCOMPOSITECURVE((#161,#162),.F.);
+#164=IFCARBITRARYCLOSEDPROFILEDEF(.AREA.,$,#163);
+#165=IFCBUILDINGELEMENTPROXY('3S6Y3VY112dxY0tStVXkwt',#18,'profile',$,$,#171,#179,$,$);
+#166=IFCRELCONTAINEDINSPATIALSTRUCTURE('0FjzxDlhr3dOeY4ayxHlPS',#18,$,$,(#165),#51);
+#167=IFCDIRECTION((1.,0.,0.));
+#168=IFCDIRECTION((0.,0.,1.));
+#169=IFCCARTESIANPOINT((800.,0.,0.));
+#170=IFCAXIS2PLACEMENT3D(#169,#168,#167);
+#171=IFCLOCALPLACEMENT($,#170);
+#172=IFCDIRECTION((0.,0.,1.));
+#173=IFCDIRECTION((1.,0.,0.));
+#174=IFCDIRECTION((0.,0.,1.));
+#175=IFCCARTESIANPOINT((0.,0.,0.));
+#176=IFCAXIS2PLACEMENT3D(#175,#174,#173);
+#177=IFCEXTRUDEDAREASOLID(#164,#176,#172,20.);
+#178=IFCSHAPEREPRESENTATION(#24,'Body','SweptSolid',(#177));
+#179=IFCPRODUCTDEFINITIONSHAPE($,$,(#178));
+#180=IFCCARTESIANPOINT((69.282,25.));
+#181=IFCCARTESIANPOINT((0.,0.));
+#182=IFCCARTESIANPOINT((40.,-43.3013));
+#183=IFCDIRECTION((1.,0.));
+#184=IFCCARTESIANPOINT((0.,0.));
+#185=IFCAXIS2PLACEMENT2D(#184,#183);
+#186=IFCELLIPSE(#185,80.,50.);
+#187=IFCTRIMMEDCURVE(#186,(#182),(#180),.T.,.CARTESIAN.);
+#188=IFCPOLYLINE((#180,#181,#182));
+#189=IFCCOMPOSITECURVESEGMENT(.CONTINUOUS.,.T.,#188);
+#190=IFCCOMPOSITECURVESEGMENT(.CONTINUOUS.,.T.,#187);
+#191=IFCCOMPOSITECURVE((#189,#190),.F.);
+#192=IFCARBITRARYCLOSEDPROFILEDEF(.AREA.,$,#191);
+#193=IFCBUILDINGELEMENTPROXY('1thkI63prF1OqBtP3bSL$d',#18,'profile',$,$,#199,#207,$,$);
+#194=IFCRELCONTAINEDINSPATIALSTRUCTURE('2P$8V2X5XECfS47AXjHiF1',#18,$,$,(#193),#51);
+#195=IFCDIRECTION((1.,0.,0.));
+#196=IFCDIRECTION((0.,0.,1.));
+#197=IFCCARTESIANPOINT((1000.,0.,0.));
+#198=IFCAXIS2PLACEMENT3D(#197,#196,#195);
+#199=IFCLOCALPLACEMENT($,#198);
+#200=IFCDIRECTION((0.,0.,1.));
+#201=IFCDIRECTION((1.,0.,0.));
+#202=IFCDIRECTION((0.,0.,1.));
+#203=IFCCARTESIANPOINT((0.,0.,0.));
+#204=IFCAXIS2PLACEMENT3D(#203,#202,#201);
+#205=IFCEXTRUDEDAREASOLID(#192,#204,#200,20.);
+#206=IFCSHAPEREPRESENTATION(#24,'Body','SweptSolid',(#205));
+#207=IFCPRODUCTDEFINITIONSHAPE($,$,(#206));
+#208=IFCCARTESIANPOINT((-43.3013,40.));
+#209=IFCCARTESIANPOINT((0.,0.));
+#210=IFCCARTESIANPOINT((50.,0.));
+#211=IFCDIRECTION((1.,0.));
+#212=IFCCARTESIANPOINT((0.,0.));
+#213=IFCAXIS2PLACEMENT2D(#212,#211);
+#214=IFCELLIPSE(#213,50.,80.);
+#215=IFCTRIMMEDCURVE(#214,(IFCPARAMETERVALUE(0.)),(IFCPARAMETERVALUE(150.)),.T.,.PARAMETER.);
+#216=IFCPOLYLINE((#208,#209,#210));
+#217=IFCCOMPOSITECURVESEGMENT(.CONTINUOUS.,.T.,#216);
+#218=IFCCOMPOSITECURVESEGMENT(.CONTINUOUS.,.T.,#215);
+#219=IFCCOMPOSITECURVE((#217,#218),.F.);
+#220=IFCARBITRARYCLOSEDPROFILEDEF(.AREA.,$,#219);
+#221=IFCBUILDINGELEMENTPROXY('1AX3z4fQj8SBzr9DMlGdSp',#18,'profile',$,$,#227,#235,$,$);
+#222=IFCRELCONTAINEDINSPATIALSTRUCTURE('1rtDgHYQrEIRwCdKj3BvDs',#18,$,$,(#221),#51);
+#223=IFCDIRECTION((1.,0.,0.));
+#224=IFCDIRECTION((0.,0.,1.));
+#225=IFCCARTESIANPOINT((1200.,0.,0.));
+#226=IFCAXIS2PLACEMENT3D(#225,#224,#223);
+#227=IFCLOCALPLACEMENT($,#226);
+#228=IFCDIRECTION((0.,0.,1.));
+#229=IFCDIRECTION((1.,0.,0.));
+#230=IFCDIRECTION((0.,0.,1.));
+#231=IFCCARTESIANPOINT((0.,0.,0.));
+#232=IFCAXIS2PLACEMENT3D(#231,#230,#229);
+#233=IFCEXTRUDEDAREASOLID(#220,#232,#228,20.);
+#234=IFCSHAPEREPRESENTATION(#24,'Body','SweptSolid',(#233));
+#235=IFCPRODUCTDEFINITIONSHAPE($,$,(#234));
+#236=IFCCARTESIANPOINT((-43.3013,40.));
+#237=IFCCARTESIANPOINT((0.,0.));
+#238=IFCCARTESIANPOINT((50.,0.));
+#239=IFCDIRECTION((1.,0.));
+#240=IFCCARTESIANPOINT((0.,0.));
+#241=IFCAXIS2PLACEMENT2D(#240,#239);
+#242=IFCELLIPSE(#241,50.,80.);
+#243=IFCTRIMMEDCURVE(#242,(#238),(#236),.T.,.CARTESIAN.);
+#244=IFCPOLYLINE((#236,#237,#238));
+#245=IFCCOMPOSITECURVESEGMENT(.CONTINUOUS.,.T.,#244);
+#246=IFCCOMPOSITECURVESEGMENT(.CONTINUOUS.,.T.,#243);
+#247=IFCCOMPOSITECURVE((#245,#246),.F.);
+#248=IFCARBITRARYCLOSEDPROFILEDEF(.AREA.,$,#247);
+#249=IFCBUILDINGELEMENTPROXY('0ykGmzZ498eBXWBzoCG67N',#18,'profile',$,$,#255,#263,$,$);
+#250=IFCRELCONTAINEDINSPATIALSTRUCTURE('3e8$xNZO56mQTEOHJ2UKC8',#18,$,$,(#249),#51);
+#251=IFCDIRECTION((1.,0.,0.));
+#252=IFCDIRECTION((0.,0.,1.));
+#253=IFCCARTESIANPOINT((1400.,0.,0.));
+#254=IFCAXIS2PLACEMENT3D(#253,#252,#251);
+#255=IFCLOCALPLACEMENT($,#254);
+#256=IFCDIRECTION((0.,0.,1.));
+#257=IFCDIRECTION((1.,0.,0.));
+#258=IFCDIRECTION((0.,0.,1.));
+#259=IFCCARTESIANPOINT((0.,0.,0.));
+#260=IFCAXIS2PLACEMENT3D(#259,#258,#257);
+#261=IFCEXTRUDEDAREASOLID(#248,#260,#256,20.);
+#262=IFCSHAPEREPRESENTATION(#24,'Body','SweptSolid',(#261));
+#263=IFCPRODUCTDEFINITIONSHAPE($,$,(#262));
+#264=IFCCARTESIANPOINT((25.,-69.282));
+#265=IFCCARTESIANPOINT((0.,0.));
+#266=IFCCARTESIANPOINT((43.3013,40.));
+#267=IFCDIRECTION((1.,0.));
+#268=IFCCARTESIANPOINT((0.,0.));
+#269=IFCAXIS2PLACEMENT2D(#268,#267);
+#270=IFCELLIPSE(#269,50.,80.);
+#271=IFCTRIMMEDCURVE(#270,(IFCPARAMETERVALUE(30.)),(IFCPARAMETERVALUE(300.)),.T.,.PARAMETER.);
+#272=IFCPOLYLINE((#264,#265,#266));
+#273=IFCCOMPOSITECURVESEGMENT(.CONTINUOUS.,.T.,#272);
+#274=IFCCOMPOSITECURVESEGMENT(.CONTINUOUS.,.T.,#271);
+#275=IFCCOMPOSITECURVE((#273,#274),.F.);
+#276=IFCARBITRARYCLOSEDPROFILEDEF(.AREA.,$,#275);
+#277=IFCBUILDINGELEMENTPROXY('3Yv68bQsf3pfiGsNMB4bcb',#18,'profile',$,$,#283,#291,$,$);
+#278=IFCRELCONTAINEDINSPATIALSTRUCTURE('0J_NVsO4H8hfbG5IlS7ZVW',#18,$,$,(#277),#51);
+#279=IFCDIRECTION((1.,0.,0.));
+#280=IFCDIRECTION((0.,0.,1.));
+#281=IFCCARTESIANPOINT((1600.,0.,0.));
+#282=IFCAXIS2PLACEMENT3D(#281,#280,#279);
+#283=IFCLOCALPLACEMENT($,#282);
+#284=IFCDIRECTION((0.,0.,1.));
+#285=IFCDIRECTION((1.,0.,0.));
+#286=IFCDIRECTION((0.,0.,1.));
+#287=IFCCARTESIANPOINT((0.,0.,0.));
+#288=IFCAXIS2PLACEMENT3D(#287,#286,#285);
+#289=IFCEXTRUDEDAREASOLID(#276,#288,#284,20.);
+#290=IFCSHAPEREPRESENTATION(#24,'Body','SweptSolid',(#289));
+#291=IFCPRODUCTDEFINITIONSHAPE($,$,(#290));
+#292=IFCCARTESIANPOINT((25.,-69.282));
+#293=IFCCARTESIANPOINT((0.,0.));
+#294=IFCCARTESIANPOINT((43.3013,40.));
+#295=IFCDIRECTION((1.,0.));
+#296=IFCCARTESIANPOINT((0.,0.));
+#297=IFCAXIS2PLACEMENT2D(#296,#295);
+#298=IFCELLIPSE(#297,50.,80.);
+#299=IFCTRIMMEDCURVE(#298,(#294),(#292),.T.,.CARTESIAN.);
+#300=IFCPOLYLINE((#292,#293,#294));
+#301=IFCCOMPOSITECURVESEGMENT(.CONTINUOUS.,.T.,#300);
+#302=IFCCOMPOSITECURVESEGMENT(.CONTINUOUS.,.T.,#299);
+#303=IFCCOMPOSITECURVE((#301,#302),.F.);
+#304=IFCARBITRARYCLOSEDPROFILEDEF(.AREA.,$,#303);
+#305=IFCBUILDINGELEMENTPROXY('0jeK5u9hv3weg2QiWppkHa',#18,'profile',$,$,#311,#319,$,$);
+#306=IFCRELCONTAINEDINSPATIALSTRUCTURE('1NPKNrJLHA3978HBP7HqY5',#18,$,$,(#305),#51);
+#307=IFCDIRECTION((1.,0.,0.));
+#308=IFCDIRECTION((0.,0.,1.));
+#309=IFCCARTESIANPOINT((1800.,0.,0.));
+#310=IFCAXIS2PLACEMENT3D(#309,#308,#307);
+#311=IFCLOCALPLACEMENT($,#310);
+#312=IFCDIRECTION((0.,0.,1.));
+#313=IFCDIRECTION((1.,0.,0.));
+#314=IFCDIRECTION((0.,0.,1.));
+#315=IFCCARTESIANPOINT((0.,0.,0.));
+#316=IFCAXIS2PLACEMENT3D(#315,#314,#313);
+#317=IFCEXTRUDEDAREASOLID(#304,#316,#312,20.);
+#318=IFCSHAPEREPRESENTATION(#24,'Body','SweptSolid',(#317));
+#319=IFCPRODUCTDEFINITIONSHAPE($,$,(#318));
+#320=IFCCARTESIANPOINT((43.3013,40.));
+#321=IFCCARTESIANPOINT((0.,0.));
+#322=IFCCARTESIANPOINT((25.,-69.282));
+#323=IFCDIRECTION((1.,0.));
+#324=IFCCARTESIANPOINT((0.,0.));
+#325=IFCAXIS2PLACEMENT2D(#324,#323);
+#326=IFCELLIPSE(#325,50.,80.);
+#327=IFCTRIMMEDCURVE(#326,(IFCPARAMETERVALUE(300.)),(IFCPARAMETERVALUE(30.)),.T.,.PARAMETER.);
+#328=IFCPOLYLINE((#320,#321,#322));
+#329=IFCCOMPOSITECURVESEGMENT(.CONTINUOUS.,.T.,#328);
+#330=IFCCOMPOSITECURVESEGMENT(.CONTINUOUS.,.T.,#327);
+#331=IFCCOMPOSITECURVE((#329,#330),.F.);
+#332=IFCARBITRARYCLOSEDPROFILEDEF(.AREA.,$,#331);
+#333=IFCBUILDINGELEMENTPROXY('2lsWCBXwrDFBgKu7CQXEqX',#18,'profile',$,$,#339,#347,$,$);
+#334=IFCRELCONTAINEDINSPATIALSTRUCTURE('3fSDbMu$n37xOik9QDF6lB',#18,$,$,(#333),#51);
+#335=IFCDIRECTION((1.,0.,0.));
+#336=IFCDIRECTION((0.,0.,1.));
+#337=IFCCARTESIANPOINT((2000.,0.,0.));
+#338=IFCAXIS2PLACEMENT3D(#337,#336,#335);
+#339=IFCLOCALPLACEMENT($,#338);
+#340=IFCDIRECTION((0.,0.,1.));
+#341=IFCDIRECTION((1.,0.,0.));
+#342=IFCDIRECTION((0.,0.,1.));
+#343=IFCCARTESIANPOINT((0.,0.,0.));
+#344=IFCAXIS2PLACEMENT3D(#343,#342,#341);
+#345=IFCEXTRUDEDAREASOLID(#332,#344,#340,20.);
+#346=IFCSHAPEREPRESENTATION(#24,'Body','SweptSolid',(#345));
+#347=IFCPRODUCTDEFINITIONSHAPE($,$,(#346));
+#348=IFCCARTESIANPOINT((43.3013,40.));
+#349=IFCCARTESIANPOINT((0.,0.));
+#350=IFCCARTESIANPOINT((25.,-69.282));
+#351=IFCDIRECTION((1.,0.));
+#352=IFCCARTESIANPOINT((0.,0.));
+#353=IFCAXIS2PLACEMENT2D(#352,#351);
+#354=IFCELLIPSE(#353,50.,80.);
+#355=IFCTRIMMEDCURVE(#354,(#350),(#348),.T.,.CARTESIAN.);
+#356=IFCPOLYLINE((#348,#349,#350));
+#357=IFCCOMPOSITECURVESEGMENT(.CONTINUOUS.,.T.,#356);
+#358=IFCCOMPOSITECURVESEGMENT(.CONTINUOUS.,.T.,#355);
+#359=IFCCOMPOSITECURVE((#357,#358),.F.);
+#360=IFCARBITRARYCLOSEDPROFILEDEF(.AREA.,$,#359);
+#361=IFCBUILDINGELEMENTPROXY('10MMN93$P59Ak3_qhH2141',#18,'profile',$,$,#367,#375,$,$);
+#362=IFCRELCONTAINEDINSPATIALSTRUCTURE('1qdtvGqIrEoBlOfpqJ0hf4',#18,$,$,(#361),#51);
+#363=IFCDIRECTION((1.,0.,0.));
+#364=IFCDIRECTION((0.,0.,1.));
+#365=IFCCARTESIANPOINT((2200.,0.,0.));
+#366=IFCAXIS2PLACEMENT3D(#365,#364,#363);
+#367=IFCLOCALPLACEMENT($,#366);
+#368=IFCDIRECTION((0.,0.,1.));
+#369=IFCDIRECTION((1.,0.,0.));
+#370=IFCDIRECTION((0.,0.,1.));
+#371=IFCCARTESIANPOINT((0.,0.,0.));
+#372=IFCAXIS2PLACEMENT3D(#371,#370,#369);
+#373=IFCEXTRUDEDAREASOLID(#360,#372,#368,20.);
+#374=IFCSHAPEREPRESENTATION(#24,'Body','SweptSolid',(#373));
+#375=IFCPRODUCTDEFINITIONSHAPE($,$,(#374));
+ENDSEC;
+END-ISO-10303-21;
diff --git a/test/input/faceted_brep.ifc b/test/input/faceted_brep.ifc
new file mode 100644
index 0000000..e924003
--- /dev/null
+++ b/test/input/faceted_brep.ifc
@@ -0,0 +1,340 @@
+ISO-10303-21;
+HEADER;
+FILE_DESCRIPTION(('ViewDefinition []'),'2;1');
+FILE_NAME('faceted_brep.ifc','',(''),(''),'','IfcOpenShell 0.5.0-dev','IfcOpenShell 0.5.0-dev','');
+FILE_SCHEMA(('IFC2X3'));
+ENDSEC;
+DATA;
+#1=IFCBUILDINGELEMENTPROXY('3cjyrkMHD40uzYrC9I3e1b',#2,$,$,$,#3,#4,$,$);
+#2=IFCOWNERHISTORY(#5,#6,$,.NOCHANGE.,$,$,$,1404292464);
+#5=IFCPERSONANDORGANIZATION(#7,#8,$);
+#7=IFCPERSON('',$,'',$,$,$,$,$);
+#8=IFCORGANIZATION($,'',$,$,$);
+#6=IFCAPPLICATION(#8,'','','');
+#3=IFCLOCALPLACEMENT(#9,#10);
+#9=IFCLOCALPLACEMENT(#11,#12);
+#11=IFCLOCALPLACEMENT(#13,#14);
+#13=IFCLOCALPLACEMENT($,#15);
+#15=IFCAXIS2PLACEMENT3D(#16,#17,#18);
+#16=IFCCARTESIANPOINT((0.,0.,0.));
+#17=IFCDIRECTION((0.,-0.,1.));
+#18=IFCDIRECTION((1.,0.,0.));
+#14=IFCAXIS2PLACEMENT3D(#16,#17,#18);
+#12=IFCAXIS2PLACEMENT3D(#16,#17,#18);
+#10=IFCAXIS2PLACEMENT3D(#16,#17,#18);
+#4=IFCPRODUCTDEFINITIONSHAPE($,$,(#19,#20));
+#19=IFCSHAPEREPRESENTATION(#21,$,'BoundingBox',(#22));
+#21=IFCGEOMETRICREPRESENTATIONCONTEXT('Plan','Model',3,1.E-3,#23,$);
+#23=IFCAXIS2PLACEMENT3D(#16,$,$);
+#22=IFCBOUNDINGBOX(#24,7883.6319,80.,80.);
+#24=IFCCARTESIANPOINT((0.,-40.,-40.));
+#20=IFCSHAPEREPRESENTATION(#25,'Body','Brep',(#26));
+#25=IFCGEOMETRICREPRESENTATIONCONTEXT('Plan','Model',3,1.E-3,#27,$);
+#27=IFCAXIS2PLACEMENT3D(#16,$,$);
+#26=IFCFACETEDBREP(#28);
+#28=IFCCLOSEDSHELL((#29,#30,#31,#32,#33,#34,#35,#36,#37,#38,#39,#40,#41,#42,#43,#44,#45,#46,#47,#48,#49,#50,#51,#52,#53,#54,#55,#56,#57,#58,#59,#60,#61,#62,#63,#64,#65,#66,#67,#68,#69,#70,#71,#72,#73,#74,#75,#76,#77,#78,#79,#80,#81,#82,#83,#84,#85,#86));
+#29=IFCFACE((#87));
+#87=IFCFACEOUTERBOUND(#88,.T.);
+#88=IFCPOLYLOOP((#89,#90,#91,#92));
+#89=IFCCARTESIANPOINT((-1113.9984,16686.,7913.6341));
+#90=IFCCARTESIANPOINT((-1113.9984,16606.,7913.6341));
+#91=IFCCARTESIANPOINT((-1113.9984,16606.,6915.1347));
+#92=IFCCARTESIANPOINT((-1113.9984,16686.,6915.1347));
+#30=IFCFACE((#93));
+#93=IFCFACEOUTERBOUND(#94,.T.);
+#94=IFCPOLYLOOP((#95,#96,#97,#98));
+#95=IFCCARTESIANPOINT((-1113.9984,16686.,150.0024));
+#96=IFCCARTESIANPOINT((-1113.9984,16686.,1105.1343));
+#97=IFCCARTESIANPOINT((-1113.9984,16606.,1105.1343));
+#98=IFCCARTESIANPOINT((-1113.9984,16606.,150.0024));
+#31=IFCFACE((#99));
+#99=IFCFACEOUTERBOUND(#100,.T.);
+#100=IFCPOLYLOOP((#101,#102,#103,#104));
+#101=IFCCARTESIANPOINT((-1113.9984,16686.,1265.1346));
+#102=IFCCARTESIANPOINT((-1113.9984,16686.,2235.1345));
+#103=IFCCARTESIANPOINT((-1113.9984,16606.,2235.1345));
+#104=IFCCARTESIANPOINT((-1113.9984,16606.,1265.1346));
+#32=IFCFACE((#105));
+#105=IFCFACEOUTERBOUND(#106,.T.);
+#106=IFCPOLYLOOP((#107,#108,#109,#110));
+#107=IFCCARTESIANPOINT((-1113.9984,16686.,2395.1344));
+#108=IFCCARTESIANPOINT((-1113.9984,16686.,3365.1345));
+#109=IFCCARTESIANPOINT((-1113.9984,16606.,3365.1345));
+#110=IFCCARTESIANPOINT((-1113.9984,16606.,2395.1344));
+#33=IFCFACE((#111));
+#111=IFCFACEOUTERBOUND(#112,.T.);
+#112=IFCPOLYLOOP((#113,#114,#115,#116));
+#113=IFCCARTESIANPOINT((-1113.9984,16686.,3525.1344));
+#114=IFCCARTESIANPOINT((-1113.9984,16686.,4495.1345));
+#115=IFCCARTESIANPOINT((-1113.9984,16606.,4495.1345));
+#116=IFCCARTESIANPOINT((-1113.9984,16606.,3525.1344));
+#34=IFCFACE((#117));
+#117=IFCFACEOUTERBOUND(#118,.T.);
+#118=IFCPOLYLOOP((#119,#120,#121,#122));
+#119=IFCCARTESIANPOINT((-1113.9984,16686.,4655.1345));
+#120=IFCCARTESIANPOINT((-1113.9984,16686.,5625.1342));
+#121=IFCCARTESIANPOINT((-1113.9984,16606.,5625.1342));
+#122=IFCCARTESIANPOINT((-1113.9984,16606.,4655.1345));
+#35=IFCFACE((#123));
+#123=IFCFACEOUTERBOUND(#124,.T.);
+#124=IFCPOLYLOOP((#125,#126,#127,#128));
+#125=IFCCARTESIANPOINT((-1113.9984,16686.,5785.1341));
+#126=IFCCARTESIANPOINT((-1113.9984,16686.,6755.1348));
+#127=IFCCARTESIANPOINT((-1113.9984,16606.,6755.1348));
+#128=IFCCARTESIANPOINT((-1113.9984,16606.,5785.1341));
+#36=IFCFACE((#129));
+#129=IFCFACEOUTERBOUND(#130,.T.);
+#130=IFCPOLYLOOP((#90,#131,#132,#133,#134,#98,#97,#135,#136,#104,#103,#137,#138,#110,#109,#139,#140,#116,#115,#141,#142,#122,#121,#143,#144,#128,#127,#145,#146,#91));
+#131=IFCCARTESIANPOINT((-1123.9985,16606.,7913.6341));
+#132=IFCCARTESIANPOINT((-1123.9985,16606.,8033.6343));
+#133=IFCCARTESIANPOINT((-1193.9984,16606.,8033.6343));
+#134=IFCCARTESIANPOINT((-1193.9984,16606.,150.0024));
+#135=IFCCARTESIANPOINT((-1124.0002,16606.,1105.1343));
+#136=IFCCARTESIANPOINT((-1124.0002,16606.,1265.1346));
+#137=IFCCARTESIANPOINT((-1124.0002,16606.,2235.1345));
+#138=IFCCARTESIANPOINT((-1124.0002,16606.,2395.1344));
+#139=IFCCARTESIANPOINT((-1124.0002,16606.,3365.1345));
+#140=IFCCARTESIANPOINT((-1124.0002,16606.,3525.1344));
+#141=IFCCARTESIANPOINT((-1124.0002,16606.,4495.1345));
+#142=IFCCARTESIANPOINT((-1124.0002,16606.,4655.1345));
+#143=IFCCARTESIANPOINT((-1124.0002,16606.,5625.1342));
+#144=IFCCARTESIANPOINT((-1124.0002,16606.,5785.1341));
+#145=IFCCARTESIANPOINT((-1124.0002,16606.,6755.1348));
+#146=IFCCARTESIANPOINT((-1124.0002,16606.,6915.1347));
+#37=IFCFACE((#147));
+#147=IFCFACEOUTERBOUND(#148,.T.);
+#148=IFCPOLYLOOP((#149,#150,#151,#152,#153,#154,#155,#156,#157,#158,#159,#160,#161,#162,#163,#164,#165,#166,#167,#168,#169,#170,#171,#172,#173,#174,#134,#133,#175,#176));
+#149=IFCCARTESIANPOINT((-1193.9984,16686.,7913.6341));
+#150=IFCCARTESIANPOINT((-1193.9984,16686.,6915.124500000001));
+#151=IFCCARTESIANPOINT((-1193.9984,16676.009,6915.124500000001));
+#152=IFCCARTESIANPOINT((-1193.9984,16676.009,6755.1445));
+#153=IFCCARTESIANPOINT((-1193.9984,16686.,6755.1445));
+#154=IFCCARTESIANPOINT((-1193.9984,16686.,5785.124500000001));
+#155=IFCCARTESIANPOINT((-1193.9984,16676.007,5785.124500000001));
+#156=IFCCARTESIANPOINT((-1193.9984,16676.007,5625.1445));
+#157=IFCCARTESIANPOINT((-1193.9984,16686.,5625.1445));
+#158=IFCCARTESIANPOINT((-1193.9984,16686.,4655.124500000001));
+#159=IFCCARTESIANPOINT((-1193.9984,16676.005,4655.124500000001));
+#160=IFCCARTESIANPOINT((-1193.9984,16676.005,4495.1445));
+#161=IFCCARTESIANPOINT((-1193.9984,16686.,4495.1445));
+#162=IFCCARTESIANPOINT((-1193.9984,16686.,3525.1245));
+#163=IFCCARTESIANPOINT((-1193.9984,16676.003,3525.1245));
+#164=IFCCARTESIANPOINT((-1193.9984,16676.003,3365.1445));
+#165=IFCCARTESIANPOINT((-1193.9984,16686.,3365.1445));
+#166=IFCCARTESIANPOINT((-1193.9984,16686.,2395.1245));
+#167=IFCCARTESIANPOINT((-1193.9984,16676.002,2395.1245));
+#168=IFCCARTESIANPOINT((-1193.9984,16676.001,2235.1445));
+#169=IFCCARTESIANPOINT((-1193.9984,16686.,2235.1445));
+#170=IFCCARTESIANPOINT((-1193.9984,16686.,1265.1345));
+#171=IFCCARTESIANPOINT((-1193.9984,16676.,1265.1345));
+#172=IFCCARTESIANPOINT((-1193.9984,16676.,1105.1345));
+#173=IFCCARTESIANPOINT((-1193.9984,16686.,1105.1345));
+#174=IFCCARTESIANPOINT((-1193.9984,16686.,150.0024));
+#175=IFCCARTESIANPOINT((-1193.9984,16676.009,8033.6343));
+#176=IFCCARTESIANPOINT((-1193.9984,16676.009,7913.6341));
+#38=IFCFACE((#177));
+#177=IFCFACEOUTERBOUND(#178,.T.);
+#178=IFCPOLYLOOP((#89,#92,#179,#180,#150,#149,#181));
+#179=IFCCARTESIANPOINT((-1124.0002,16686.,6915.1347));
+#180=IFCCARTESIANPOINT((-1124.0002,16686.,6915.124500000001));
+#181=IFCCARTESIANPOINT((-1123.9974,16686.,7913.6341));
+#39=IFCFACE((#182));
+#182=IFCFACEOUTERBOUND(#183,.T.);
+#183=IFCPOLYLOOP((#95,#174,#173,#184,#96));
+#184=IFCCARTESIANPOINT((-1124.0002,16686.,1105.1343));
+#40=IFCFACE((#185));
+#185=IFCFACEOUTERBOUND(#186,.T.);
+#186=IFCPOLYLOOP((#101,#187,#170,#169,#188,#189,#102));
+#187=IFCCARTESIANPOINT((-1124.0002,16686.,1265.1346));
+#188=IFCCARTESIANPOINT((-1124.0002,16686.,2235.1445));
+#189=IFCCARTESIANPOINT((-1124.0002,16686.,2235.1345));
+#41=IFCFACE((#190));
+#190=IFCFACEOUTERBOUND(#191,.T.);
+#191=IFCPOLYLOOP((#107,#192,#193,#166,#165,#194,#195,#108));
+#192=IFCCARTESIANPOINT((-1124.0002,16686.,2395.1344));
+#193=IFCCARTESIANPOINT((-1124.0002,16686.,2395.1245));
+#194=IFCCARTESIANPOINT((-1124.0002,16686.,3365.1445));
+#195=IFCCARTESIANPOINT((-1124.0002,16686.,3365.1345));
+#42=IFCFACE((#196));
+#196=IFCFACEOUTERBOUND(#197,.T.);
+#197=IFCPOLYLOOP((#113,#198,#199,#162,#161,#200,#201,#114));
+#198=IFCCARTESIANPOINT((-1124.0002,16686.,3525.1344));
+#199=IFCCARTESIANPOINT((-1124.0002,16686.,3525.1245));
+#200=IFCCARTESIANPOINT((-1124.0002,16686.,4495.1445));
+#201=IFCCARTESIANPOINT((-1124.0002,16686.,4495.1345));
+#43=IFCFACE((#202));
+#202=IFCFACEOUTERBOUND(#203,.T.);
+#203=IFCPOLYLOOP((#119,#204,#205,#158,#157,#206,#207,#120));
+#204=IFCCARTESIANPOINT((-1124.0002,16686.,4655.1345));
+#205=IFCCARTESIANPOINT((-1124.0002,16686.,4655.124500000001));
+#206=IFCCARTESIANPOINT((-1124.0002,16686.,5625.1445));
+#207=IFCCARTESIANPOINT((-1124.0002,16686.,5625.1342));
+#44=IFCFACE((#208));
+#208=IFCFACEOUTERBOUND(#209,.T.);
+#209=IFCPOLYLOOP((#125,#210,#211,#154,#153,#212,#213,#126));
+#210=IFCCARTESIANPOINT((-1124.0002,16686.,5785.1341));
+#211=IFCCARTESIANPOINT((-1124.0002,16686.,5785.124500000001));
+#212=IFCCARTESIANPOINT((-1124.0002,16686.,6755.1445));
+#213=IFCCARTESIANPOINT((-1124.0002,16686.,6755.1348));
+#45=IFCFACE((#214));
+#214=IFCFACEOUTERBOUND(#215,.T.);
+#215=IFCPOLYLOOP((#95,#98,#134,#174));
+#46=IFCFACE((#216));
+#216=IFCFACEOUTERBOUND(#217,.T.);
+#217=IFCPOLYLOOP((#92,#91,#146,#179));
+#47=IFCFACE((#218));
+#218=IFCFACEOUTERBOUND(#219,.T.);
+#219=IFCPOLYLOOP((#179,#146,#145,#213,#212,#220,#221,#180));
+#220=IFCCARTESIANPOINT((-1124.0002,16676.009,6755.1445));
+#221=IFCCARTESIANPOINT((-1124.0002,16676.009,6915.124500000001));
+#48=IFCFACE((#222));
+#222=IFCFACEOUTERBOUND(#223,.T.);
+#223=IFCPOLYLOOP((#127,#126,#213,#145));
+#49=IFCFACE((#224));
+#224=IFCFACEOUTERBOUND(#225,.T.);
+#225=IFCPOLYLOOP((#125,#128,#144,#210));
+#50=IFCFACE((#226));
+#226=IFCFACEOUTERBOUND(#227,.T.);
+#227=IFCPOLYLOOP((#210,#144,#143,#207,#206,#228,#229,#211));
+#228=IFCCARTESIANPOINT((-1124.0002,16676.007,5625.1445));
+#229=IFCCARTESIANPOINT((-1124.0002,16676.007,5785.124500000001));
+#51=IFCFACE((#230));
+#230=IFCFACEOUTERBOUND(#231,.T.);
+#231=IFCPOLYLOOP((#121,#120,#207,#143));
+#52=IFCFACE((#232));
+#232=IFCFACEOUTERBOUND(#233,.T.);
+#233=IFCPOLYLOOP((#204,#142,#141,#201,#200,#234,#235,#205));
+#234=IFCCARTESIANPOINT((-1124.0002,16676.005,4495.1445));
+#235=IFCCARTESIANPOINT((-1124.0002,16676.005,4655.124500000001));
+#53=IFCFACE((#236));
+#236=IFCFACEOUTERBOUND(#237,.T.);
+#237=IFCPOLYLOOP((#115,#114,#201,#141));
+#54=IFCFACE((#238));
+#238=IFCFACEOUTERBOUND(#239,.T.);
+#239=IFCPOLYLOOP((#119,#122,#142,#204));
+#55=IFCFACE((#240));
+#240=IFCFACEOUTERBOUND(#241,.T.);
+#241=IFCPOLYLOOP((#198,#140,#139,#195,#194,#242,#243,#199));
+#242=IFCCARTESIANPOINT((-1124.0002,16676.003,3365.1445));
+#243=IFCCARTESIANPOINT((-1124.0002,16676.003,3525.1245));
+#56=IFCFACE((#244));
+#244=IFCFACEOUTERBOUND(#245,.T.);
+#245=IFCPOLYLOOP((#109,#108,#195,#139));
+#57=IFCFACE((#246));
+#246=IFCFACEOUTERBOUND(#247,.T.);
+#247=IFCPOLYLOOP((#113,#116,#140,#198));
+#58=IFCFACE((#248));
+#248=IFCFACEOUTERBOUND(#249,.T.);
+#249=IFCPOLYLOOP((#192,#138,#137,#189,#188,#250,#251,#193));
+#250=IFCCARTESIANPOINT((-1124.0002,16676.001,2235.1445));
+#251=IFCCARTESIANPOINT((-1124.0002,16676.002,2395.1245));
+#59=IFCFACE((#252));
+#252=IFCFACEOUTERBOUND(#253,.T.);
+#253=IFCPOLYLOOP((#103,#102,#189,#137));
+#60=IFCFACE((#254));
+#254=IFCFACEOUTERBOUND(#255,.T.);
+#255=IFCPOLYLOOP((#107,#110,#138,#192));
+#61=IFCFACE((#256));
+#256=IFCFACEOUTERBOUND(#257,.T.);
+#257=IFCPOLYLOOP((#187,#136,#135,#184,#258,#259));
+#258=IFCCARTESIANPOINT((-1124.0002,16676.,1105.1345));
+#259=IFCCARTESIANPOINT((-1124.0002,16676.,1265.1345));
+#62=IFCFACE((#260));
+#260=IFCFACEOUTERBOUND(#261,.T.);
+#261=IFCPOLYLOOP((#97,#96,#184,#135));
+#63=IFCFACE((#262));
+#262=IFCFACEOUTERBOUND(#263,.T.);
+#263=IFCPOLYLOOP((#101,#104,#136,#187));
+#64=IFCFACE((#264));
+#264=IFCFACEOUTERBOUND(#265,.T.);
+#265=IFCPOLYLOOP((#133,#132,#266,#175));
+#266=IFCCARTESIANPOINT((-1123.9985,16676.009,8033.6343));
+#65=IFCFACE((#267));
+#267=IFCFACEOUTERBOUND(#268,.T.);
+#268=IFCPOLYLOOP((#132,#131,#269,#266));
+#269=IFCCARTESIANPOINT((-1123.9985,16676.009,7913.6341));
+#66=IFCFACE((#270));
+#270=IFCFACEOUTERBOUND(#271,.T.);
+#271=IFCPOLYLOOP((#89,#181,#269,#131,#90));
+#67=IFCFACE((#272));
+#272=IFCFACEOUTERBOUND(#273,.T.);
+#273=IFCPOLYLOOP((#176,#175,#266,#269));
+#68=IFCFACE((#274));
+#274=IFCFACEOUTERBOUND(#275,.T.);
+#275=IFCPOLYLOOP((#149,#176,#269,#181));
+#69=IFCFACE((#276));
+#276=IFCFACEOUTERBOUND(#277,.T.);
+#277=IFCPOLYLOOP((#153,#152,#220,#212));
+#70=IFCFACE((#278));
+#278=IFCFACEOUTERBOUND(#279,.T.);
+#279=IFCPOLYLOOP((#151,#150,#180,#221));
+#71=IFCFACE((#280));
+#280=IFCFACEOUTERBOUND(#281,.T.);
+#281=IFCPOLYLOOP((#152,#151,#221,#220));
+#72=IFCFACE((#282));
+#282=IFCFACEOUTERBOUND(#283,.T.);
+#283=IFCPOLYLOOP((#157,#156,#228,#206));
+#73=IFCFACE((#284));
+#284=IFCFACEOUTERBOUND(#285,.T.);
+#285=IFCPOLYLOOP((#155,#154,#211,#229));
+#74=IFCFACE((#286));
+#286=IFCFACEOUTERBOUND(#287,.T.);
+#287=IFCPOLYLOOP((#156,#155,#229,#228));
+#75=IFCFACE((#288));
+#288=IFCFACEOUTERBOUND(#289,.T.);
+#289=IFCPOLYLOOP((#161,#160,#234,#200));
+#76=IFCFACE((#290));
+#290=IFCFACEOUTERBOUND(#291,.T.);
+#291=IFCPOLYLOOP((#159,#158,#205,#235));
+#77=IFCFACE((#292));
+#292=IFCFACEOUTERBOUND(#293,.T.);
+#293=IFCPOLYLOOP((#160,#159,#235,#234));
+#78=IFCFACE((#294));
+#294=IFCFACEOUTERBOUND(#295,.T.);
+#295=IFCPOLYLOOP((#165,#164,#242,#194));
+#79=IFCFACE((#296));
+#296=IFCFACEOUTERBOUND(#297,.T.);
+#297=IFCPOLYLOOP((#163,#162,#199,#243));
+#80=IFCFACE((#298));
+#298=IFCFACEOUTERBOUND(#299,.T.);
+#299=IFCPOLYLOOP((#164,#163,#243,#242));
+#81=IFCFACE((#300));
+#300=IFCFACEOUTERBOUND(#301,.T.);
+#301=IFCPOLYLOOP((#169,#168,#250,#188));
+#82=IFCFACE((#302));
+#302=IFCFACEOUTERBOUND(#303,.T.);
+#303=IFCPOLYLOOP((#167,#166,#193,#251));
+#83=IFCFACE((#304));
+#304=IFCFACEOUTERBOUND(#305,.T.);
+#305=IFCPOLYLOOP((#168,#167,#251,#250));
+#84=IFCFACE((#306));
+#306=IFCFACEOUTERBOUND(#307,.T.);
+#307=IFCPOLYLOOP((#173,#172,#258,#184));
+#85=IFCFACE((#308));
+#308=IFCFACEOUTERBOUND(#309,.T.);
+#309=IFCPOLYLOOP((#171,#170,#187,#259));
+#86=IFCFACE((#310));
+#310=IFCFACEOUTERBOUND(#311,.T.);
+#311=IFCPOLYLOOP((#172,#171,#259,#258));
+#312=IFCPROJECT('1WDiX41TH4Ix3Kl0wmL3X9',#2,$,$,$,$,$,(#21,#25),#313);
+#313=IFCUNITASSIGNMENT((#314,#315,#316,#317,#318,#319,#320,#321,#322,#323));
+#314=IFCCONVERSIONBASEDUNIT(#324,.PLANEANGLEUNIT.,'DEGREE',#325);
+#324=IFCDIMENSIONALEXPONENTS(0,0,0,0,0,0,0);
+#325=IFCMEASUREWITHUNIT(IFCPOSITIVELENGTHMEASURE(1.74532925199433E-2),#326);
+#326=IFCSIUNIT(*,.PLANEANGLEUNIT.,$,.RADIAN.);
+#315=IFCSIUNIT(*,.AREAUNIT.,.CENTI.,.SQUARE_METRE.);
+#316=IFCSIUNIT(*,.LENGTHUNIT.,.MILLI.,.METRE.);
+#317=IFCSIUNIT(*,.MASSUNIT.,.KILO.,.GRAM.);
+#318=IFCSIUNIT(*,.POWERUNIT.,$,.WATT.);
+#319=IFCSIUNIT(*,.THERMODYNAMICTEMPERATUREUNIT.,$,.DEGREE_CELSIUS.);
+#320=IFCSIUNIT(*,.TIMEUNIT.,$,.SECOND.);
+#321=IFCSIUNIT(*,.VOLUMEUNIT.,.CENTI.,.CUBIC_METRE.);
+#322=IFCDERIVEDUNIT((#327,#328),.VOLUMETRICFLOWRATEUNIT.,$);
+#327=IFCDERIVEDUNITELEMENT(#318,1);
+#328=IFCDERIVEDUNITELEMENT(#320,-1);
+#323=IFCDERIVEDUNIT((#329,#330,#331),.THERMALTRANSMITTANCEUNIT.,$);
+#329=IFCDERIVEDUNITELEMENT(#318,1);
+#330=IFCDERIVEDUNITELEMENT(#319,-1);
+#331=IFCDERIVEDUNITELEMENT(#315,-1);
+ENDSEC;
+END-ISO-10303-21;
diff --git a/test/input/faceted_brep_csg.ifc b/test/input/faceted_brep_csg.ifc
new file mode 100644
index 0000000..4cd2d6d
--- /dev/null
+++ b/test/input/faceted_brep_csg.ifc
@@ -0,0 +1,158 @@
+ISO-10303-21;
+HEADER;
+FILE_DESCRIPTION(('ViewDefinition [CoordinationView]'),'2;1');
+FILE_NAME('faceted_brep_csg.ifc','2014-06-07T12:00:00',(''),('',''),'IfcOpenShell 0.5.0-dev','IfcOpenShell 0.5.0-dev','');
+FILE_SCHEMA(('IFC2X3'));
+ENDSEC;
+DATA;
+#1096640=IFCWALLSTANDARDCASE('0DfxmCtqHFUxv$oFsrZ6KX',#15,'',$,$,#1096513,#1096636,'');
+#15=IFCOWNERHISTORY(#10,#14,$,.ADDED.,$,$,$,1401712285);
+#10=IFCPERSONANDORGANIZATION(#4,#6,$);
+#4=IFCPERSON($,'',$,$,$,$,$,$);
+#6=IFCORGANIZATION($,'',$,$,$);
+#14=IFCAPPLICATION(#13,'','','');
+#13=IFCORGANIZATION('','IfcOpenShell','',$,$);
+#1096513=IFCLOCALPLACEMENT(#1078851,#1096512);
+#1078851=IFCLOCALPLACEMENT(#88,#1078850);
+#88=IFCLOCALPLACEMENT(#64,#87);
+#64=IFCLOCALPLACEMENT($,#63);
+#63=IFCAXIS2PLACEMENT3D(#61,#59,#57);
+#61=IFCCARTESIANPOINT((0.,0.,0.));
+#59=IFCDIRECTION((0.,0.,1.));
+#57=IFCDIRECTION((1.,0.,0.));
+#87=IFCAXIS2PLACEMENT3D(#85,#83,#81);
+#85=IFCCARTESIANPOINT((0.,0.,0.));
+#83=IFCDIRECTION((0.,0.,1.));
+#81=IFCDIRECTION((1.,0.,0.));
+#1078850=IFCAXIS2PLACEMENT3D(#1078848,#1078846,#1078844);
+#1078848=IFCCARTESIANPOINT((0.,0.,16544.));
+#1078846=IFCDIRECTION((0.,0.,1.));
+#1078844=IFCDIRECTION((1.,0.,0.));
+#1096512=IFCAXIS2PLACEMENT3D(#1096510,#1096508,#1096506);
+#1096510=IFCCARTESIANPOINT((50525.,55840.,-100.));
+#1096508=IFCDIRECTION((0.,0.,1.));
+#1096506=IFCDIRECTION((1.,0.,0.));
+#1096636=IFCPRODUCTDEFINITIONSHAPE($,$,(#1096624,#1096633));
+#1096624=IFCSHAPEREPRESENTATION(#120,'Body','CSG',(#1096623));
+#120=IFCGEOMETRICREPRESENTATIONSUBCONTEXT('Body','Model',*,*,*,*,#43,$,.MODEL_VIEW.,$);
+#43=IFCGEOMETRICREPRESENTATIONCONTEXT($,'Model',3,1.00000000000E-5,#40,#41);
+#40=IFCAXIS2PLACEMENT3D(#38,#36,#34);
+#38=IFCCARTESIANPOINT((0.,0.,0.));
+#36=IFCDIRECTION((0.,0.,1.));
+#34=IFCDIRECTION((1.,0.,0.));
+#41=IFCDIRECTION((0.,1.));
+#1096623=IFCBOOLEANRESULT(.DIFFERENCE.,#1096534,#1096622);
+#1096534=IFCEXTRUDEDAREASOLID(#1096524,#1096531,#1096532,6000.);
+#1096524=IFCARBITRARYCLOSEDPROFILEDEF(.AREA.,'',#1096522);
+#1096522=IFCPOLYLINE((#1096514,#1096516,#1096518,#1096520,#1096514));
+#1096514=IFCCARTESIANPOINT((0.,0.));
+#1096516=IFCCARTESIANPOINT((5940.00004558,0.));
+#1096518=IFCCARTESIANPOINT((5940.00004558,420.));
+#1096520=IFCCARTESIANPOINT((0.,420.));
+#1096531=IFCAXIS2PLACEMENT3D(#1096529,#1096527,#1096525);
+#1096529=IFCCARTESIANPOINT((0.,0.,0.));
+#1096527=IFCDIRECTION((0.,0.,1.));
+#1096525=IFCDIRECTION((1.,0.,0.));
+#1096532=IFCDIRECTION((0.,0.,1.));
+#1096622=IFCFACETEDBREP(#1096620);
+#1096620=IFCCLOSEDSHELL((#1096553,#1096562,#1096571,#1096578,#1096587,#1096594,#1096603,#1096608,#1096613,#1096618));
+#1096553=IFCFACE((#1096552));
+#1096552=IFCFACEOUTERBOUND(#1096550,.T.);
+#1096550=IFCPOLYLOOP((#1096538,#1096540,#1096542,#1096544,#1096546,#1096548));
+#1096538=IFCCARTESIANPOINT((5940.00004558,99.9999988664,3021.53616003));
+#1096540=IFCCARTESIANPOINT((5940.00004558,420.,3021.53616003));
+#1096542=IFCCARTESIANPOINT((5940.00004558,420.,6000.));
+#1096544=IFCCARTESIANPOINT((5940.00004558,0.,6000.));
+#1096546=IFCCARTESIANPOINT((5940.00004558,0.,3304.37899011));
+#1096548=IFCCARTESIANPOINT((5940.00004558,99.9999988664,3304.37899011));
+#1096562=IFCFACE((#1096561));
+#1096561=IFCFACEOUTERBOUND(#1096559,.T.);
+#1096559=IFCPOLYLOOP((#1096555,#1096540,#1096538,#1096557));
+#1096555=IFCCARTESIANPOINT((3475.00000854,420.,5486.53619706));
+#1096557=IFCCARTESIANPOINT((3475.00000854,99.9999988664,5486.53619706));
+#1096571=IFCFACE((#1096570));
+#1096570=IFCFACEOUTERBOUND(#1096568,.T.);
+#1096568=IFCPOLYLOOP((#1096555,#1096564,#1096566,#1096542,#1096540));
+#1096564=IFCCARTESIANPOINT((0.,420.,2011.53618852));
+#1096566=IFCCARTESIANPOINT((0.,420.,6000.));
+#1096578=IFCFACE((#1096577));
+#1096577=IFCFACEOUTERBOUND(#1096575,.T.);
+#1096575=IFCPOLYLOOP((#1096573,#1096544,#1096542,#1096566));
+#1096573=IFCCARTESIANPOINT((0.,0.,6000.));
+#1096587=IFCFACE((#1096586));
+#1096586=IFCFACEOUTERBOUND(#1096584,.T.);
+#1096584=IFCPOLYLOOP((#1096580,#1096546,#1096544,#1096573,#1096582));
+#1096580=IFCCARTESIANPOINT((3475.00008732,0.,5769.37894837));
+#1096582=IFCCARTESIANPOINT((0.,0.,2294.37886105));
+#1096594=IFCFACE((#1096593));
+#1096593=IFCFACEOUTERBOUND(#1096591,.T.);
+#1096591=IFCPOLYLOOP((#1096548,#1096546,#1096580,#1096589));
+#1096589=IFCCARTESIANPOINT((3475.00008732,99.9999988664,5769.37894837));
+#1096603=IFCFACE((#1096602));
+#1096602=IFCFACEOUTERBOUND(#1096600,.T.);
+#1096600=IFCPOLYLOOP((#1096538,#1096548,#1096589,#1096596,#1096598,#1096557));
+#1096596=IFCCARTESIANPOINT((0.,99.9999988664,2294.37886105));
+#1096598=IFCCARTESIANPOINT((-1.88415469893E-5,99.9999988664,2011.53620736));
+#1096608=IFCFACE((#1096607));
+#1096607=IFCFACEOUTERBOUND(#1096605,.T.);
+#1096605=IFCPOLYLOOP((#1096564,#1096555,#1096557,#1096598));
+#1096613=IFCFACE((#1096612));
+#1096612=IFCFACEOUTERBOUND(#1096610,.T.);
+#1096610=IFCPOLYLOOP((#1096596,#1096582,#1096573,#1096566,#1096564,#1096598));
+#1096618=IFCFACE((#1096617));
+#1096617=IFCFACEOUTERBOUND(#1096615,.T.);
+#1096615=IFCPOLYLOOP((#1096580,#1096582,#1096596,#1096589));
+#1096633=IFCSHAPEREPRESENTATION(#382,'Axis','Curve2D',(#1096631));
+#382=IFCGEOMETRICREPRESENTATIONSUBCONTEXT('Axis','Model',*,*,*,*,#43,$,.MODEL_VIEW.,$);
+#1096631=IFCPOLYLINE((#1096627,#1096629));
+#1096627=IFCCARTESIANPOINT((0.,0.));
+#1096629=IFCCARTESIANPOINT((5940.00004558,0.));
+#1096706=IFCRELVOIDSELEMENT('0QOEK1pkwFOcJm7CUDlErQ',#15,$,$,#1096640,#1096703);
+#1096703=IFCOPENINGELEMENT('3nuoQyoplI38T_5yKaJWPE',#15,'',$,$,#1096664,#1096700,'');
+#1096664=IFCLOCALPLACEMENT(#1096513,#1096663);
+#1096663=IFCAXIS2PLACEMENT3D(#1096661,#1096659,#1096657);
+#1096661=IFCCARTESIANPOINT((2507.49999999,0.,100.));
+#1096659=IFCDIRECTION((0.,0.,1.));
+#1096657=IFCDIRECTION((1.,0.,0.));
+#1096700=IFCPRODUCTDEFINITIONSHAPE($,$,(#1096698));
+#1096698=IFCSHAPEREPRESENTATION(#120,'Body','SweptSolid',(#1096681,#1096697));
+#1096681=IFCEXTRUDEDAREASOLID(#1096671,#1096678,#1096679,820.);
+#1096671=IFCRECTANGLEPROFILEDEF(.AREA.,'',#1096670,1500.,2395.);
+#1096670=IFCAXIS2PLACEMENT2D(#1096668,#1096666);
+#1096668=IFCCARTESIANPOINT((0.,0.));
+#1096666=IFCDIRECTION((1.,0.));
+#1096678=IFCAXIS2PLACEMENT3D(#1096676,#1096674,#1096672);
+#1096676=IFCCARTESIANPOINT((0.,840.,1197.5));
+#1096674=IFCDIRECTION((0.,1.,0.));
+#1096672=IFCDIRECTION((-1.,0.,0.));
+#1096679=IFCDIRECTION((0.,0.,-1.));
+#1096697=IFCEXTRUDEDAREASOLID(#1096687,#1096694,#1096695,440.);
+#1096687=IFCRECTANGLEPROFILEDEF(.AREA.,'',#1096686,1500.,2395.);
+#1096686=IFCAXIS2PLACEMENT2D(#1096684,#1096682);
+#1096684=IFCCARTESIANPOINT((0.,0.));
+#1096682=IFCDIRECTION((1.,0.));
+#1096694=IFCAXIS2PLACEMENT3D(#1096692,#1096690,#1096688);
+#1096692=IFCCARTESIANPOINT((0.,-420.,1197.5));
+#1096690=IFCDIRECTION((0.,-1.,0.));
+#1096688=IFCDIRECTION((-1.,0.,0.));
+#1096695=IFCDIRECTION((0.,0.,-1.));
+#46=IFCPROJECT('344O7vICcwH8qAEnwJDjSU',#15,'',$,$,$,'',(#43),#32);
+#32=IFCUNITASSIGNMENT((#16,#17,#18,#22,#23,#24,#28,#29,#30,#31));
+#16=IFCSIUNIT(*,.LENGTHUNIT.,.MILLI.,.METRE.);
+#17=IFCSIUNIT(*,.AREAUNIT.,$,.SQUARE_METRE.);
+#18=IFCSIUNIT(*,.VOLUMEUNIT.,$,.CUBIC_METRE.);
+#22=IFCCONVERSIONBASEDUNIT(#21,.PLANEANGLEUNIT.,'DEGREE',#20);
+#21=IFCDIMENSIONALEXPONENTS(0,0,0,0,0,0,0);
+#20=IFCMEASUREWITHUNIT(IFCPLANEANGLEMEASURE(0.0174532925199),#19);
+#19=IFCSIUNIT(*,.PLANEANGLEUNIT.,$,.RADIAN.);
+#23=IFCSIUNIT(*,.SOLIDANGLEUNIT.,$,.STERADIAN.);
+#24=IFCMONETARYUNIT(.EUR.);
+#28=IFCCONVERSIONBASEDUNIT(#27,.TIMEUNIT.,'Year',#26);
+#27=IFCDIMENSIONALEXPONENTS(0,0,0,0,0,0,0);
+#26=IFCMEASUREWITHUNIT(IFCTIMEMEASURE(31556926.),#25);
+#25=IFCSIUNIT(*,.TIMEUNIT.,$,.SECOND.);
+#29=IFCSIUNIT(*,.MASSUNIT.,$,.GRAM.);
+#30=IFCSIUNIT(*,.THERMODYNAMICTEMPERATUREUNIT.,$,.DEGREE_CELSIUS.);
+#31=IFCSIUNIT(*,.LUMINOUSINTENSITYUNIT.,$,.LUMEN.);
+ENDSEC;
+END-ISO-10303-21;
diff --git a/test/input/mapped_circle.ifc b/test/input/mapped_circle.ifc
new file mode 100644
index 0000000..895a308
--- /dev/null
+++ b/test/input/mapped_circle.ifc
@@ -0,0 +1,128 @@
+ISO-10303-21;
+HEADER;
+FILE_DESCRIPTION(('ViewDefinition [CoordinationView]'),'2;1');
+FILE_NAME('mapped_circle.ifc','2014-07-19T12:07:38',(''),('',''),'IfcOpenShell 0.5.0-dev','IfcOpenShell 0.5.0-dev','');
+FILE_SCHEMA(('IFC2X3'));
+ENDSEC;
+DATA;
+#1=IFCCARTESIANPOINT((1.,101.));
+#2=IFCCARTESIANPOINT((1.,1.));
+#3=IFCCARTESIANPOINT((101.,1.));
+#4=IFCDIRECTION((1.,0.));
+#5=IFCCARTESIANPOINT((1.,1.));
+#6=IFCAXIS2PLACEMENT2D(#5,#4);
+#7=IFCCIRCLE(#6,100.);
+#8=IFCTRIMMEDCURVE(#7,(IFCPARAMETERVALUE(0.)),(IFCPARAMETERVALUE(90.)),.T.,.PARAMETER.);
+#9=IFCPOLYLINE((#1,#2,#3));
+#10=IFCCOMPOSITECURVESEGMENT(.CONTINUOUS.,.T.,#9);
+#11=IFCCOMPOSITECURVESEGMENT(.CONTINUOUS.,.T.,#8);
+#12=IFCCOMPOSITECURVE((#10,#11),.F.);
+#13=IFCARBITRARYCLOSEDPROFILEDEF(.AREA.,$,#12);
+#14=IFCDIRECTION((0.,0.,1.));
+#15=IFCDIRECTION((1.,0.,0.));
+#16=IFCDIRECTION((0.,0.,1.));
+#17=IFCCARTESIANPOINT((0.,0.,0.));
+#18=IFCAXIS2PLACEMENT3D(#17,#16,#15);
+#19=IFCEXTRUDEDAREASOLID(#13,#18,#14,20.);
+#20=IFCDIMENSIONALEXPONENTS(0,0,0,0,0,0,0);
+#21=IFCSIUNIT(*,.LENGTHUNIT.,.MILLI.,.METRE.);
+#22=IFCSIUNIT(*,.PLANEANGLEUNIT.,$,.RADIAN.);
+#23=IFCMEASUREWITHUNIT(IFCPLANEANGLEMEASURE(0.017453293),#22);
+#24=IFCCONVERSIONBASEDUNIT(#20,.PLANEANGLEUNIT.,'Degrees',#23);
+#25=IFCUNITASSIGNMENT((#21,#24));
+#26=IFCPROJECT('2K5TPkrgLCsRWUjW3rhDze',$,'Mapped Circle',$,$,$,$,(#32),#25);
+#27=IFCDIRECTION((0.,1.));
+#28=IFCDIRECTION((1.,0.,0.));
+#29=IFCDIRECTION((0.,0.,1.));
+#30=IFCCARTESIANPOINT((0.,0.,0.));
+#31=IFCAXIS2PLACEMENT3D(#30,#29,#28);
+#32=IFCGEOMETRICREPRESENTATIONCONTEXT($,'Model',3,1.E-005,#31,#27);
+#33=IFCSHAPEREPRESENTATION(#32,'Body','SweptSolid',(#19));
+#34=IFCDIRECTION((0.,0.,1.));
+#35=IFCCARTESIANPOINT((0.,0.,0.));
+#36=IFCDIRECTION((0.,1.,0.));
+#37=IFCDIRECTION((-1.,0.,0.));
+#38=IFCCARTESIANPOINT((0.,0.,0.));
+#39=IFCDIRECTION((0.,-1.,0.));
+#40=IFCDIRECTION((0.,0.,-1.));
+#41=IFCCARTESIANPOINT((0.,0.,0.));
+#42=IFCDIRECTION((0.,-1.,0.));
+#43=IFCDIRECTION((-1.,0.,0.));
+#44=IFCCARTESIANTRANSFORMATIONOPERATOR3D(#37,#36,#35,1.,#34);
+#45=IFCCARTESIANTRANSFORMATIONOPERATOR3D($,#39,#38,2.,$);
+#46=IFCCARTESIANTRANSFORMATIONOPERATOR3DNONUNIFORM(#43,#42,#41,1.,#40,2.,1.);
+#47=IFCPERSON($,$,'',$,$,$,$,$);
+#48=IFCORGANIZATION($,'IfcOpenShell',$,$,$);
+#49=IFCPERSONANDORGANIZATION(#47,#48,$);
+#50=IFCAPPLICATION(#48,'0.5.0-dev','IfcOpenShell','IfcOpenShell');
+#51=IFCOWNERHISTORY(#49,#50,$,.ADDED.,1405764458,#49,#50,1405764458);
+#52=IFCDIRECTION((1.,0.,0.));
+#53=IFCDIRECTION((0.,0.,1.));
+#54=IFCCARTESIANPOINT((0.,0.,0.));
+#55=IFCAXIS2PLACEMENT3D(#54,#53,#52);
+#56=IFCLOCALPLACEMENT($,#55);
+#57=IFCSITE('3u$Iq5iSX3P9jhN1Q_lPxT',#51,$,$,$,#56,$,$,.ELEMENT.,$,$,$,$,$);
+#58=IFCRELAGGREGATES('1TmKB7NwL028i0hHYAwAjj',#51,$,$,#26,(#57));
+#59=IFCDIRECTION((1.,0.,0.));
+#60=IFCDIRECTION((0.,0.,1.));
+#61=IFCCARTESIANPOINT((0.,0.,0.));
+#62=IFCAXIS2PLACEMENT3D(#61,#60,#59);
+#63=IFCLOCALPLACEMENT(#56,#62);
+#64=IFCBUILDING('39bLeNfwTCY833MagsKCV1',#51,$,$,$,#63,$,$,.ELEMENT.,$,$,$);
+#65=IFCRELAGGREGATES('1ha$aSPJLBYhTXfX7MhR9c',#51,$,$,#57,(#64));
+#66=IFCDIRECTION((1.,0.,0.));
+#67=IFCDIRECTION((0.,0.,1.));
+#68=IFCCARTESIANPOINT((0.,0.,0.));
+#69=IFCAXIS2PLACEMENT3D(#68,#67,#66);
+#70=IFCLOCALPLACEMENT(#63,#69);
+#71=IFCBUILDINGSTOREY('3aSgXeuc92jOM3z9OU8ClT',#51,$,$,$,#70,$,$,.ELEMENT.,$);
+#72=IFCRELAGGREGATES('1YZWa7xGH2BPIRWCbE5US2',#51,$,$,#64,(#71));
+#73=IFCBUILDINGELEMENTPROXY('0g1GtoNWD6ZAgI102NzlDj',#51,'circle part',$,$,#79,#89,$,$);
+#74=IFCRELCONTAINEDINSPATIALSTRUCTURE('1Qj$yHymbDJfTYNV52DaEV',#51,$,$,(#73),#71);
+#75=IFCDIRECTION((1.,0.,0.));
+#76=IFCDIRECTION((0.,0.,1.));
+#77=IFCCARTESIANPOINT((0.,0.,0.));
+#78=IFCAXIS2PLACEMENT3D(#77,#76,#75);
+#79=IFCLOCALPLACEMENT($,#78);
+#80=IFCDIRECTION((1.,0.,0.));
+#81=IFCDIRECTION((0.,0.,1.));
+#82=IFCCARTESIANPOINT((0.,0.,0.));
+#83=IFCAXIS2PLACEMENT3D(#82,#81,#80);
+#84=IFCREPRESENTATIONMAP(#83,#33);
+#85=IFCCARTESIANPOINT((0.,0.,0.));
+#86=IFCCARTESIANTRANSFORMATIONOPERATOR3D($,$,#85,$,$);
+#87=IFCMAPPEDITEM(#84,#86);
+#88=IFCSHAPEREPRESENTATION(#32,'Body','MappedRepresentation',(#87));
+#89=IFCPRODUCTDEFINITIONSHAPE($,$,(#88));
+#90=IFCBUILDINGELEMENTPROXY('33VVacqUTC7g2JqGu4YGqy',#51,'circle part',$,$,#96,#99,$,$);
+#91=IFCRELCONTAINEDINSPATIALSTRUCTURE('2MPViYfDfAXAM_FcY51t6p',#51,$,$,(#90),#71);
+#92=IFCDIRECTION((1.,0.,0.));
+#93=IFCDIRECTION((0.,0.,1.));
+#94=IFCCARTESIANPOINT((0.,0.,0.));
+#95=IFCAXIS2PLACEMENT3D(#94,#93,#92);
+#96=IFCLOCALPLACEMENT($,#95);
+#97=IFCMAPPEDITEM(#84,#44);
+#98=IFCSHAPEREPRESENTATION(#32,'Body','MappedRepresentation',(#97));
+#99=IFCPRODUCTDEFINITIONSHAPE($,$,(#98));
+#100=IFCBUILDINGELEMENTPROXY('2gwDydYu94QwwML3zAP4RY',#51,'circle part',$,$,#106,#109,$,$);
+#101=IFCRELCONTAINEDINSPATIALSTRUCTURE('0h7lymY5b4MgtEgsvkwOE_',#51,$,$,(#100),#71);
+#102=IFCDIRECTION((1.,0.,0.));
+#103=IFCDIRECTION((0.,0.,1.));
+#104=IFCCARTESIANPOINT((-1.,1.,-20.));
+#105=IFCAXIS2PLACEMENT3D(#104,#103,#102);
+#106=IFCLOCALPLACEMENT($,#105);
+#107=IFCMAPPEDITEM(#84,#45);
+#108=IFCSHAPEREPRESENTATION(#32,'Body','MappedRepresentation',(#107));
+#109=IFCPRODUCTDEFINITIONSHAPE($,$,(#108));
+#110=IFCBUILDINGELEMENTPROXY('032bRHMEnB1Q1uvgalj5t8',#51,'circle part',$,$,#116,#119,$,$);
+#111=IFCRELCONTAINEDINSPATIALSTRUCTURE('1tArpusuTBtxScHZvILvxW',#51,$,$,(#110),#71);
+#112=IFCDIRECTION((1.,0.,0.));
+#113=IFCDIRECTION((0.,0.,1.));
+#114=IFCCARTESIANPOINT((0.,1.,20.));
+#115=IFCAXIS2PLACEMENT3D(#114,#113,#112);
+#116=IFCLOCALPLACEMENT($,#115);
+#117=IFCMAPPEDITEM(#84,#46);
+#118=IFCSHAPEREPRESENTATION(#32,'Body','MappedRepresentation',(#117));
+#119=IFCPRODUCTDEFINITIONSHAPE($,$,(#118));
+ENDSEC;
+END-ISO-10303-21;
diff --git a/test/input/mapped_shape_multiple.ifc b/test/input/mapped_shape_multiple.ifc
new file mode 100644
index 0000000..4573644
--- /dev/null
+++ b/test/input/mapped_shape_multiple.ifc
@@ -0,0 +1,133 @@
+ISO-10303-21;
+HEADER;
+/* NOTE a valid model view name has to be asserted, replacing 'notYetAssigned' ----------------- */
+FILE_DESCRIPTION(
+    ( 'ViewDefinition [notYetAssigned]'
+     ,'Comment [manual creation of example file]'
+	)
+	,'2;1');
+/* NOTE standard header information according to ISO 10303-21 ---------------------------------- */
+FILE_NAME(
+	'mapped_shape_multiple.ifc',
+	'2011-11-07T18:00:00',
+	('Thomas Liebich'),
+	('buildingSMART International'),
+	'IFC text editor',
+	'IFC text editor',
+	'reference file created for the IFC4 specification');
+/* NOTE schema name to be replaced with 'IFC4' after the final release  ------------------------ */
+FILE_SCHEMA(('IFC4'));
+ENDSEC;
+
+DATA;
+/* --------------------------------------------------------------------------------------------- */
+/* general entities required for all IFC data sets, defining the context for the exchange ------ */
+#100= IFCPROJECT('0xScRe4drECQ4DMSqUjd6d',#110,'proxy with multiple transformed representation',$,$,$,$,(#201),#301);
+
+/* single owner history sufficient if not otherwise required by the view definition ------------ */
+/* provides the person and application creating the data set, and the time it is created ------- */
+#110= IFCOWNERHISTORY(#111,#115,$,.ADDED.,1320688800,$,$,1320688800);
+#111= IFCPERSONANDORGANIZATION(#112,#113,$);
+#112= IFCPERSON($,'Liebich','Thomas',$,$,$,$,$);
+#113= IFCORGANIZATION($,'buildingSMART International',$,$,$);
+#115= IFCAPPLICATION(#113,'1.0','IFC text editor','ifcTE');
+
+/* each IFC data set containing geometry has to define a geometric representation context ------ */
+/* the attribute 'ContextType' has to be 'Model' for 3D model geometry ------------------------- */
+#201= IFCGEOMETRICREPRESENTATIONCONTEXT($,'Model',3,1.0E-5,#210,$);
+/* the attribute 'ContextIdentifier' has to be 'Body' for the main 3D shape representation ----- */
+#202= IFCGEOMETRICREPRESENTATIONSUBCONTEXT('Body','Model',*,*,*,*,#201,$,.MODEL_VIEW.,$);
+#210= IFCAXIS2PLACEMENT3D(#901,$,$);
+
+/* each IFC data set containing geometry has to define at absolute minimum length and angle ---- */
+/* here length is milli metre as SI unit, and plane angle is 'degree' as non SI unit ----------- */
+#301= IFCUNITASSIGNMENT((#311,#312));
+#311= IFCSIUNIT(*,.LENGTHUNIT.,.MILLI.,.METRE.);
+#312= IFCCONVERSIONBASEDUNIT(#313,.PLANEANGLEUNIT.,'degree',#314);
+#313= IFCDIMENSIONALEXPONENTS(0,0,0,0,0,0,0);
+#314= IFCMEASUREWITHUNIT(IFCPLANEANGLEMEASURE(0.017453293),#315);
+#315= IFCSIUNIT(*,.PLANEANGLEUNIT.,$,.RADIAN.);
+
+/* each IFC data set containing elements in a building context has to include a building ------- */
+/* at absolute minimum (could have a site and stories as well) --------------------------------- */
+#500= IFCBUILDING('2FCZDorxHDT8NI01kdXi8P',$,'Test Building',$,$,#511,$,$,.ELEMENT.,$,$,$);
+/* if the building is the uppermost spatial structure element it defines the absolut position -- */
+#511= IFCLOCALPLACEMENT($,#512);
+/* no rotation - z and x axes set to '$' are therefore identical to "world coordinate system" -- */ 
+#512= IFCAXIS2PLACEMENT3D(#901,$,$);
+/* if the building is the uppermost spatial structure element it is assigned to the project ---- */
+#519= IFCRELAGGREGATES('2YBqaV_8L15eWJ9DA1sGmT',$,$,$,#100,(#500));
+
+/* shared coordinates - it is permissable to share common instances to reduce file size -------- */
+#901= IFCCARTESIANPOINT((0.,0.,0.));
+#902= IFCDIRECTION((1.,0.,0.));
+#903= IFCDIRECTION((0.,1.,0.));
+#904= IFCDIRECTION((0.,0.,1.)); 
+#905= IFCDIRECTION((-1.,0.,0.));
+#906= IFCDIRECTION((0.,-1.,0.));
+#907= IFCDIRECTION((0.,0.,-1.));
+#908= IFCDIRECTION((1.,1.,0.));
+#909= IFCDIRECTION((-1.,1.,0.));
+
+
+/* --------------------------------------------------------------------------------------------- */
+/* proxy element with mapped representation, assigned to the building -------------------------- */
+/* --------------------------------------------------------------------------------------------- */
+#1000= IFCBUILDINGELEMENTPROXY('1kTvXnbbzCWw8lcMd1dR4o',$,'P-1','sample proxy',$,#1001,#1010,$,$);
+/* proxy element placement relative to the building -------------------------------------------- */
+#1001= IFCLOCALPLACEMENT(#511,#1002);
+/* set local placement to 1 meter on x-axis, and 0 on y, and 0 on z axes ----------------------- */
+/* no rotation - z and x axes set to '$' are therefore identical to those of building ---------- */ 
+#1002= IFCAXIS2PLACEMENT3D(#1003,$,$);
+#1003= IFCCARTESIANPOINT((1000.,0.,0.));
+/* proxy element shape representation ---------------------------------------------------------- */
+#1010= IFCPRODUCTDEFINITIONSHAPE($,$,(#1020));
+/* a single shape representation of type 'MappedRepresentation' is included -------------------- */
+/* it contains four mapped items, each refering to the same representation map ----------------- */
+#1020= IFCSHAPEREPRESENTATION(#202,'Body','MappedRepresentation',(#1021,#1031,#1041,#1051));
+/* Cartesian transformation of the mapped item ------------------------------------------------- */
+/* all with rotation by 45' in xy plane and non uniform scaling: x=0.5, y=0.5, z=1.0 ----------- */
+/* 1. mapped item at 0.,0.,0. of local object coordinate system -------------------------------- */
+#1021= IFCMAPPEDITEM(#5010,#1022);
+#1022= IFCCARTESIANTRANSFORMATIONOPERATOR3DNONUNIFORM(#908,#909,#901,0.5,#904,0.5,1.);
+/* 2. mapped item at 1000.,0.,0. of local object coordinate system ----------------------------- */
+#1031= IFCMAPPEDITEM(#5010,#1032);
+#1032= IFCCARTESIANTRANSFORMATIONOPERATOR3DNONUNIFORM(#908,#909,#1033,0.5,#904,0.5,1.);
+#1033= IFCCARTESIANPOINT((1000.,0.,0.));
+/* 3. mapped item at 0.,1000.,0. of local object coordinate system ----------------------------- */
+#1041= IFCMAPPEDITEM(#5010,#1042);
+#1042= IFCCARTESIANTRANSFORMATIONOPERATOR3DNONUNIFORM(#908,#909,#1043,0.5,#904,0.5,1.);
+#1043= IFCCARTESIANPOINT((0.,1000.,0.));
+/* 4. mapped item at 1000.,1000.,0. of local object coordinate system -------------------------- */
+#1051= IFCMAPPEDITEM(#5010,#1052);
+#1052= IFCCARTESIANTRANSFORMATIONOPERATOR3DNONUNIFORM(#908,#909,#1053,0.5,#904,0.5,1.);
+#1053= IFCCARTESIANPOINT((1000.,1000.,0.));
+
+/* --------------------------------------------------------------------------------------------- */
+/* proxy element type with swept solid shape representation ------------------------------------ */
+/* --------------------------------------------------------------------------------------------- */
+#5000= IFCBUILDINGELEMENTPROXYTYPE('241tWGhBr3rvJJzQGOOY_x',$,'Type-P',$,$,$,(#5010),$,$,.NOTDEFINED.);
+#5010= IFCREPRESENTATIONMAP(#5011,#5100);
+#5011= IFCAXIS2PLACEMENT3D(#901,$,$);
+#5100= IFCSHAPEREPRESENTATION(#202,'Body','SweptSolid',(#5021));
+/* based on a profile (or cross section) of 1m by 1m being extruded by 2m ---------------------- */
+#5021= IFCEXTRUDEDAREASOLID(#5022,$,#5034,2000.);
+#5022= IFCRECTANGLEPROFILEDEF(.AREA.,'1m x 1m rectangle',$,1000.,1000.);
+/* extrusion body is placed centric with no rotation inside the object coordinate placement ---- */
+/* extrusion position z = default = (0.,0.,1.), x = default = (1.,0.,0.) ----------------------- */
+/* since IFC4 this is the default, therefore the Position can be nil --------------------------- */
+/* the extrusion if perpendicular to the profile - i.e. along the positive z-axis -------------- */
+#5034= IFCDIRECTION((0.,0.,1.)); 
+
+/* proxy element assigned to the building ------------------------------------------------------ */
+#10000=IFCRELCONTAINEDINSPATIALSTRUCTURE('2TnxZkTXT08eDuMuhUUFNy',$,'Physical model',$,(#1000),#500);
+
+/* proxy type - assignment to proxy occurrence ------------------------------------------------- */
+#10100= IFCRELDEFINESBYTYPE('0DR6_plxf08eQ9Y0V0n$sV',$,$,$,(#1000),#5000);
+
+/* proxy type - declared within the project ---------------------------------------------------- */
+#10200= IFCRELDECLARES ('1J7MBi$pT9ogxwD7fkPsrp',$,$,$,#100,(#5000));
+
+
+ENDSEC;
+END-ISO-10303-21;
\ No newline at end of file
diff --git a/test/input/mapped_shape_representation.ifc b/test/input/mapped_shape_representation.ifc
new file mode 100644
index 0000000..7e15147
--- /dev/null
+++ b/test/input/mapped_shape_representation.ifc
@@ -0,0 +1,114 @@
+ISO-10303-21;
+HEADER;
+/* NOTE a valid model view name has to be asserted, replacing 'notYetAssigned' ----------------- */
+FILE_DESCRIPTION(
+    ( 'ViewDefinition [notYetAssigned]'
+     ,'Comment [manual creation of example file]'
+	)
+	,'2;1');
+/* NOTE standard header information according to ISO 10303-21 ---------------------------------- */
+FILE_NAME(
+	'mapped_shape_representation.ifc',
+	'2011-11-07T18:00:00',
+	('Thomas Liebich'),
+	('buildingSMART International'),
+	'IFC text editor',
+	'IFC text editor',
+	'reference file created for the IFC4 specification');
+/* NOTE schema name to be replaced with 'IFC4' after the final release  ------------------------ */
+FILE_SCHEMA(('IFC4'));
+ENDSEC;
+
+DATA;
+/* --------------------------------------------------------------------------------------------- */
+/* general entities required for all IFC data sets, defining the context for the exchange ------ */
+#100= IFCPROJECT('0xScRe4drECQ4DMSqUjd6d',#110,'proxy with mapped representation',$,$,$,$,(#201),#301);
+
+/* single owner history sufficient if not otherwise required by the view definition ------------ */
+/* provides the person and application creating the data set, and the time it is created ------- */
+#110= IFCOWNERHISTORY(#111,#115,$,.ADDED.,1320688800,$,$,1320688800);
+#111= IFCPERSONANDORGANIZATION(#112,#113,$);
+#112= IFCPERSON($,'Liebich','Thomas',$,$,$,$,$);
+#113= IFCORGANIZATION($,'buildingSMART International',$,$,$);
+#115= IFCAPPLICATION(#113,'1.0','IFC text editor','ifcTE');
+
+/* each IFC data set containing geometry has to define a geometric representation context ------ */
+/* the attribute 'ContextType' has to be 'Model' for 3D model geometry ------------------------- */
+#201= IFCGEOMETRICREPRESENTATIONCONTEXT($,'Model',3,1.0E-5,#210,$);
+/* the attribute 'ContextIdentifier' has to be 'Body' for the main 3D shape representation ----- */
+#202= IFCGEOMETRICREPRESENTATIONSUBCONTEXT('Body','Model',*,*,*,*,#201,$,.MODEL_VIEW.,$);
+#210= IFCAXIS2PLACEMENT3D(#901,$,$);
+
+/* each IFC data set containing geometry has to define at absolute minimum length and angle ---- */
+/* here length is milli metre as SI unit, and plane angle is 'degree' as non SI unit ----------- */
+#301= IFCUNITASSIGNMENT((#311,#312));
+#311= IFCSIUNIT(*,.LENGTHUNIT.,.MILLI.,.METRE.);
+#312= IFCCONVERSIONBASEDUNIT(#313,.PLANEANGLEUNIT.,'degree',#314);
+#313= IFCDIMENSIONALEXPONENTS(0,0,0,0,0,0,0);
+#314= IFCMEASUREWITHUNIT(IFCPLANEANGLEMEASURE(0.017453293),#315);
+#315= IFCSIUNIT(*,.PLANEANGLEUNIT.,$,.RADIAN.);
+
+/* each IFC data set containing elements in a building context has to include a building ------- */
+/* at absolute minimum (could have a site and stories as well) --------------------------------- */
+#500= IFCBUILDING('2FCZDorxHDT8NI01kdXi8P',$,'Test Building',$,$,#511,$,$,.ELEMENT.,$,$,$);
+/* if the building is the uppermost spatial structure element it defines the absolut position -- */
+#511= IFCLOCALPLACEMENT($,#512);
+/* no rotation - z and x axes set to '$' are therefore identical to "world coordinate system" -- */ 
+#512= IFCAXIS2PLACEMENT3D(#901,$,$);
+/* if the building is the uppermost spatial structure element it is assigned to the project ---- */
+#519= IFCRELAGGREGATES('2YBqaV_8L15eWJ9DA1sGmT',$,$,$,#100,(#500));
+
+/* shared coordinates - it is permissable to share common instances to reduce file size -------- */
+#901= IFCCARTESIANPOINT((0.,0.,0.));
+#902= IFCDIRECTION((1.,0.,0.));
+#903= IFCDIRECTION((0.,1.,0.));
+#904= IFCDIRECTION((0.,0.,1.)); 
+#905= IFCDIRECTION((-1.,0.,0.));
+#906= IFCDIRECTION((0.,-1.,0.));
+#907= IFCDIRECTION((0.,0.,-1.));
+
+/* --------------------------------------------------------------------------------------------- */
+/* proxy element with mapped representation, assigned to the building -------------------------- */
+/* --------------------------------------------------------------------------------------------- */
+#1000= IFCBUILDINGELEMENTPROXY('1kTvXnbbzCWw8lcMd1dR4o',$,'P-1','sample proxy',$,#1001,#1010,$,$);
+/* proxy element placement relative to the building -------------------------------------------- */
+#1001= IFCLOCALPLACEMENT(#511,#1002);
+/* set local placement to 1 meter on x-axis, and 0 on y, and 0 on z axes ----------------------- */
+/* no rotation - z and x axes set to '$' are therefore identical to those of building ---------- */ 
+#1002= IFCAXIS2PLACEMENT3D(#1003,$,$);
+#1003= IFCCARTESIANPOINT((1000.,0.,0.));
+/* proxy element shape representation ---------------------------------------------------------- */
+#1010= IFCPRODUCTDEFINITIONSHAPE($,$,(#1020));
+/* a single shape representation of type 'MappedRepresentation' is included -------------------- */
+#1020= IFCSHAPEREPRESENTATION(#202,'Body','MappedRepresentation',(#1021));
+#1021= IFCMAPPEDITEM(#5010,#1022);
+/* Cartesian transformation of the mapped item - here none ------------------------------------- */
+#1022= IFCCARTESIANTRANSFORMATIONOPERATOR3D($,$,#901,$,$);
+
+/* --------------------------------------------------------------------------------------------- */
+/* proxy element type with swept solid shape representation ------------------------------------ */
+/* --------------------------------------------------------------------------------------------- */
+#5000= IFCBUILDINGELEMENTPROXYTYPE('241tWGhBr3rvJJzQGOOY_x',$,'Type-P',$,$,$,(#5010),$,$,.NOTDEFINED.);
+#5010= IFCREPRESENTATIONMAP(#5011,#5100);
+#5011= IFCAXIS2PLACEMENT3D(#901,$,$);
+#5100= IFCSHAPEREPRESENTATION(#202,'Body','SweptSolid',(#5021));
+/* based on a profile (or cross section) of 1m by 1m being extruded by 2m ---------------------- */
+#5021= IFCEXTRUDEDAREASOLID(#5022,$,#5034,2000.);
+#5022= IFCRECTANGLEPROFILEDEF(.AREA.,'1m x 1m rectangle',$,1000.,1000.);
+/* extrusion body is placed centric with no rotation inside the object coordinate placement ---- */
+/* extrusion position z = default = (0.,0.,1.), x = default = (1.,0.,0.) ----------------------- */
+/* since IFC4 this is the default, therefore the Position can be nil --------------------------- */
+/* the extrusion is perpendicular to the profile - i.e. along the positive z-axis -------------- */
+#5034= IFCDIRECTION((0.,0.,1.)); 
+
+/* proxy element assigned to the building ------------------------------------------------------ */
+#10000=IFCRELCONTAINEDINSPATIALSTRUCTURE('2TnxZkTXT08eDuMuhUUFNy',$,'Physical model',$,(#1000),#500);
+
+/* proxy type - assignment to proxy occurrence ------------------------------------------------- */
+#10100= IFCRELDEFINESBYTYPE('0DR6_plxf08eQ9Y0V0n$sV',$,$,$,(#1000),#5000);
+
+/* proxy type - declared within the project ---------------------------------------------------- */
+#10200= IFCRELDECLARES ('1J7MBi$pT9ogxwD7fkPsrp',$,$,$,#100,(#5000));
+
+ENDSEC;
+END-ISO-10303-21;
\ No newline at end of file
diff --git a/test/input/mapped_shape_transformation.ifc b/test/input/mapped_shape_transformation.ifc
new file mode 100644
index 0000000..a3890df
--- /dev/null
+++ b/test/input/mapped_shape_transformation.ifc
@@ -0,0 +1,115 @@
+ISO-10303-21;
+HEADER;
+/* NOTE a valid model view name has to be asserted, replacing 'notYetAssigned' ----------------- */
+FILE_DESCRIPTION(
+    ( 'ViewDefinition [notYetAssigned]'
+     ,'Comment [manual creation of example file]'
+	)
+	,'2;1');
+/* NOTE standard header information according to ISO 10303-21 ---------------------------------- */
+FILE_NAME(
+	'mapped_shape_transformation.ifc',
+	'2011-11-07T18:00:00',
+	('Thomas Liebich'),
+	('buildingSMART International'),
+	'IFC text editor',
+	'IFC text editor',
+	'reference file created for the IFC4 specification');
+/* NOTE schema name to be replaced with 'IFC4' after the final release  ------------------------ */
+FILE_SCHEMA(('IFC4'));
+ENDSEC;
+
+DATA;
+/* --------------------------------------------------------------------------------------------- */
+/* general entities required for all IFC data sets, defining the context for the exchange ------ */
+#100= IFCPROJECT('0xScRe4drECQ4DMSqUjd6d',#110,'proxy with transformed mapped representation',$,$,$,$,(#201),#301);
+
+/* single owner history sufficient if not otherwise required by the view definition ------------ */
+/* provides the person and application creating the data set, and the time it is created ------- */
+#110= IFCOWNERHISTORY(#111,#115,$,.ADDED.,1320688800,$,$,1320688800);
+#111= IFCPERSONANDORGANIZATION(#112,#113,$);
+#112= IFCPERSON($,'Liebich','Thomas',$,$,$,$,$);
+#113= IFCORGANIZATION($,'buildingSMART International',$,$,$);
+#115= IFCAPPLICATION(#113,'1.0','IFC text editor','ifcTE');
+
+/* each IFC data set containing geometry has to define a geometric representation context ------ */
+/* the attribute 'ContextType' has to be 'Model' for 3D model geometry ------------------------- */
+#201= IFCGEOMETRICREPRESENTATIONCONTEXT($,'Model',3,1.0E-5,#210,$);
+/* the attribute 'ContextIdentifier' has to be 'Body' for the main 3D shape representation ----- */
+#202= IFCGEOMETRICREPRESENTATIONSUBCONTEXT('Body','Model',*,*,*,*,#201,$,.MODEL_VIEW.,$);
+#210= IFCAXIS2PLACEMENT3D(#901,$,$);
+
+/* each IFC data set containing geometry has to define at absolute minimum length and angle ---- */
+/* here length is milli metre as SI unit, and plane angle is 'degree' as non SI unit ----------- */
+#301= IFCUNITASSIGNMENT((#311,#312));
+#311= IFCSIUNIT(*,.LENGTHUNIT.,.MILLI.,.METRE.);
+#312= IFCCONVERSIONBASEDUNIT(#313,.PLANEANGLEUNIT.,'degree',#314);
+#313= IFCDIMENSIONALEXPONENTS(0,0,0,0,0,0,0);
+#314= IFCMEASUREWITHUNIT(IFCPLANEANGLEMEASURE(0.017453293),#315);
+#315= IFCSIUNIT(*,.PLANEANGLEUNIT.,$,.RADIAN.);
+
+/* each IFC data set containing elements in a building context has to include a building ------- */
+/* at absolute minimum (could have a site and stories as well) --------------------------------- */
+#500= IFCBUILDING('2FCZDorxHDT8NI01kdXi8P',$,'Test Building',$,$,#511,$,$,.ELEMENT.,$,$,$);
+/* if the building is the uppermost spatial structure element it defines the absolut position -- */
+#511= IFCLOCALPLACEMENT($,#512);
+/* no rotation - z and x axes set to '$' are therefore identical to "world coordinate system" -- */ 
+#512= IFCAXIS2PLACEMENT3D(#901,$,$);
+/* if the building is the uppermost spatial structure element it is assigned to the project ---- */
+#519= IFCRELAGGREGATES('2YBqaV_8L15eWJ9DA1sGmT',$,$,$,#100,(#500));
+
+/* shared coordinates - it is permissable to share common instances to reduce file size -------- */
+#901= IFCCARTESIANPOINT((0.,0.,0.));
+#902= IFCDIRECTION((1.,0.,0.));
+#903= IFCDIRECTION((0.,1.,0.));
+#904= IFCDIRECTION((0.,0.,1.)); 
+#905= IFCDIRECTION((-1.,0.,0.));
+#906= IFCDIRECTION((0.,-1.,0.));
+#907= IFCDIRECTION((0.,0.,-1.));
+
+/* --------------------------------------------------------------------------------------------- */
+/* proxy element with mapped representation, assigned to the building -------------------------- */
+/* --------------------------------------------------------------------------------------------- */
+#1000= IFCBUILDINGELEMENTPROXY('1kTvXnbbzCWw8lcMd1dR4o',$,'P-1','sample proxy',$,#1001,#1010,$,$);
+/* proxy element placement relative to the building -------------------------------------------- */
+#1001= IFCLOCALPLACEMENT(#511,#1002);
+/* set local placement to 1 meter on x-axis, and 0 on y, and 0 on z axes ----------------------- */
+/* no rotation - z and x axes set to '$' are therefore identical to those of building ---------- */ 
+#1002= IFCAXIS2PLACEMENT3D(#1003,$,$);
+#1003= IFCCARTESIANPOINT((1000.,0.,0.));
+/* proxy element shape representation ---------------------------------------------------------- */
+#1010= IFCPRODUCTDEFINITIONSHAPE($,$,(#1020));
+/* a single shape representation of type 'MappedRepresentation' is included -------------------- */
+#1020= IFCSHAPEREPRESENTATION(#202,'Body','MappedRepresentation',(#1021));
+#1021= IFCMAPPEDITEM(#5010,#1022);
+/* Cartesian transformation of the mapped item ------------------------------------------------- */
+/* with rotation by 45' in xy plane and non uniform scaling: x=0.5, y=0.5, z=1.0 --------------- */
+#1022= IFCCARTESIANTRANSFORMATIONOPERATOR3DNONUNIFORM(#1023,#1024,#901,0.5,#904,0.5,1.);
+#1023= IFCDIRECTION((1.,1.,0.));
+#1024= IFCDIRECTION((-1.,1.,0.));
+
+/* --------------------------------------------------------------------------------------------- */
+/* proxy element type with swept solid shape representation ------------------------------------ */
+/* --------------------------------------------------------------------------------------------- */
+#5000= IFCBUILDINGELEMENTPROXYTYPE('241tWGhBr3rvJJzQGOOY_x',$,'Type-P',$,$,$,(#5010),$,$,.NOTDEFINED.);
+#5010= IFCREPRESENTATIONMAP(#5011,#5100);
+#5011= IFCAXIS2PLACEMENT3D(#901,$,$);
+#5100= IFCSHAPEREPRESENTATION(#202,'Body','SweptSolid',(#5021));
+/* based on a profile (or cross section) of 1m by 1m being extruded by 2m ---------------------- */
+#5021= IFCEXTRUDEDAREASOLID(#5022,$,#904,2000.);
+#5022= IFCRECTANGLEPROFILEDEF(.AREA.,'1m x 1m rectangle',$,1000.,1000.);
+/* extrusion body is placed centric with no rotation inside the object coordinate placement ---- */
+/* extrusion position z = default = (0.,0.,1.), x = default = (1.,0.,0.) ----------------------- */
+/* since IFC4 this is the default, therefore the Position can be nil --------------------------- */
+
+/* proxy element assigned to the building ------------------------------------------------------ */
+#10000=IFCRELCONTAINEDINSPATIALSTRUCTURE('2TnxZkTXT08eDuMuhUUFNy',$,'Physical model',$,(#1000),#500);
+
+/* proxy type - assignment to proxy occurrence ------------------------------------------------- */
+#10100= IFCRELDEFINESBYTYPE('0DR6_plxf08eQ9Y0V0n$sV',$,$,$,(#1000),#5000);
+
+/* proxy type - declared within the project ---------------------------------------------------- */
+#10200= IFCRELDECLARES ('1J7MBi$pT9ogxwD7fkPsrp',$,$,$,#100,(#5000));
+
+ENDSEC;
+END-ISO-10303-21;
\ No newline at end of file
diff --git a/test/input/revit2014_multiple_bounded_halfspaces.ifc b/test/input/revit2014_multiple_bounded_halfspaces.ifc
new file mode 100644
index 0000000..45293bc
--- /dev/null
+++ b/test/input/revit2014_multiple_bounded_halfspaces.ifc
@@ -0,0 +1,410 @@
+ISO-10303-21;
+HEADER;
+FILE_DESCRIPTION(('ViewDefinition [CoordinationView]'),'2;1');
+FILE_NAME('Project Number','2013-08-05T11:05:45',(''),(''),'','','');
+FILE_SCHEMA(('IFC2X3'));
+ENDSEC;
+
+DATA;
+#1= IFCORGANIZATION($,'Autodesk Revit Architecture 2014 (ENU)',$,$,$);
+#5= IFCAPPLICATION(#1,'2014','Autodesk Revit Architecture 2014 (ENU)','Revit');
+#6= IFCCARTESIANPOINT((0.,0.,0.));
+#9= IFCCARTESIANPOINT((0.,0.));
+#11= IFCDIRECTION((1.,0.,0.));
+#13= IFCDIRECTION((-1.,0.,0.));
+#15= IFCDIRECTION((0.,1.,0.));
+#17= IFCDIRECTION((0.,-1.,0.));
+#19= IFCDIRECTION((0.,0.,1.));
+#21= IFCDIRECTION((0.,0.,-1.));
+#23= IFCDIRECTION((1.,0.));
+#25= IFCDIRECTION((-1.,0.));
+#27= IFCDIRECTION((0.,1.));
+#29= IFCDIRECTION((0.,-1.));
+#31= IFCAXIS2PLACEMENT3D(#6,$,$);
+#32= IFCLOCALPLACEMENT(#556,#31);
+#35= IFCPERSON($,'','dave.mills',$,$,$,$,$);
+#37= IFCORGANIZATION($,'','',$,$);
+#38= IFCPERSONANDORGANIZATION(#35,#37,$);
+#41= IFCOWNERHISTORY(#38,#5,$,.NOCHANGE.,$,$,$,1375697133);
+#42= IFCSIUNIT(*,.LENGTHUNIT.,.MILLI.,.METRE.);
+#43= IFCSIUNIT(*,.LENGTHUNIT.,$,.METRE.);
+#44= IFCSIUNIT(*,.AREAUNIT.,$,.SQUARE_METRE.);
+#45= IFCSIUNIT(*,.VOLUMEUNIT.,$,.CUBIC_METRE.);
+#46= IFCSIUNIT(*,.PLANEANGLEUNIT.,$,.RADIAN.);
+#47= IFCDIMENSIONALEXPONENTS(0,0,0,0,0,0,0);
+#48= IFCMEASUREWITHUNIT(IFCRATIOMEASURE(0.0174532925199433),#46);
+#49= IFCCONVERSIONBASEDUNIT(#47,.PLANEANGLEUNIT.,'DEGREE',#48);
+#50= IFCSIUNIT(*,.MASSUNIT.,.KILO.,.GRAM.);
+#51= IFCSIUNIT(*,.TIMEUNIT.,$,.SECOND.);
+#52= IFCSIUNIT(*,.THERMODYNAMICTEMPERATUREUNIT.,$,.KELVIN.);
+#53= IFCDERIVEDUNITELEMENT(#50,1);
+#54= IFCDERIVEDUNITELEMENT(#52,-1);
+#55= IFCDERIVEDUNITELEMENT(#51,-3);
+#56= IFCDERIVEDUNIT((#53,#54,#55),.THERMALTRANSMITTANCEUNIT.,$);
+#58= IFCDERIVEDUNITELEMENT(#43,3);
+#59= IFCDERIVEDUNITELEMENT(#51,-1);
+#60= IFCDERIVEDUNIT((#58,#59),.VOLUMETRICFLOWRATEUNIT.,$);
+#62= IFCSIUNIT(*,.POWERUNIT.,$,.WATT.);
+#63= IFCUNITASSIGNMENT((#42,#44,#45,#49,#50,#51,#52,#56,#60,#62));
+#65= IFCAXIS2PLACEMENT3D(#6,$,$);
+#66= IFCDIRECTION((2.,6.12303176911189E-17,1.));
+#68= IFCGEOMETRICREPRESENTATIONCONTEXT($,'Model',3,1.00000000000000E-5,#65,#66);
+#71= IFCGEOMETRICREPRESENTATIONSUBCONTEXT('Axis','Model',*,*,*,*,#68,$,.GRAPH_VIEW.,$);
+#73= IFCGEOMETRICREPRESENTATIONSUBCONTEXT('Body','Model',*,*,*,*,#68,$,.MODEL_VIEW.,$);
+#74= IFCGEOMETRICREPRESENTATIONSUBCONTEXT('Box','Model',*,*,*,*,#68,$,.MODEL_VIEW.,$);
+#75= IFCGEOMETRICREPRESENTATIONSUBCONTEXT('FootPrint','Model',*,*,*,*,#68,$,.MODEL_VIEW.,$);
+#76= IFCGEOMETRICREPRESENTATIONCONTEXT($,'Annotation',3,1.00000000000000E-5,#65,#66);
+#77= IFCGEOMETRICREPRESENTATIONSUBCONTEXT($,'Annotation',*,*,*,*,#76,0.01,.PLAN_VIEW.,$);
+#79= IFCPROJECT('0jI6kz9rj7ZAQfwqcKYFL$',#41,'Project Number',$,$,'Project Name','Project Status',(#68,#76),#63);
+#85= IFCPOSTALADDRESS($,$,$,$,(''),$,'','','','');
+#89= IFCBUILDING('0jI6kz9rj7ZAQfwqcKYFL_',#41,'',$,$,#32,$,'',.ELEMENT.,$,$,#85);
+#95= IFCAXIS2PLACEMENT3D(#6,$,$);
+#96= IFCLOCALPLACEMENT(#32,#95);
+#98= IFCBUILDINGSTOREY('0jI6kz9rj7ZAQfwqbhTmku',#41,'Level 0',$,$,#96,$,'Level 0',.ELEMENT.,0.);
+#100= IFCCARTESIANPOINT((0.,0.,4000.));
+#102= IFCAXIS2PLACEMENT3D(#100,$,$);
+#663= IFCRELDEFINESBYPROPERTIES('0QsHEvgNPBth0JuOfnWkED',#41,$,$,(#98),#597);
+#599= IFCRELCONTAINEDINSPATIALSTRUCTURE('3Zu5Bv0LOHrPC10066FoQQ',#41,$,$,(#251),#98);
+#106= IFCAXIS2PLACEMENT3D(#6,$,$);
+#107= IFCLOCALPLACEMENT(#96,#106);
+#109= IFCCARTESIANPOINT((884.601287043893,-1276.36737361194));
+#111= IFCCARTESIANPOINT((934.686713370143,-1276.36737361194));
+#113= IFCCARTESIANPOINT((1602.61583383912,-389.995493084105));
+#115= IFCCARTESIANPOINT((103.386511820466,2683.88014525904));
+#117= IFCCARTESIANPOINT((-2181.84467363903,898.461866814632));
+#119= IFCCARTESIANPOINT((-947.471090801113,-1002.30676565574));
+#121= IFCCARTESIANPOINT((-395.974581633486,362.694993890036));
+#123= IFCPOLYLINE((#109,#111,#113,#115,#117,#119,#121,#109));
+#125= IFCARBITRARYCLOSEDPROFILEDEF(.AREA.,'Beam and Block 225mm Susp Ground',#123);
+#126= IFCCARTESIANPOINT((5307.66722093966,2400.34080546281,837.562274151307));
+#128= IFCAXIS2PLACEMENT3D(#126,#21,#17);
+#129= IFCEXTRUDEDAREASOLID(#125,#128,#19,1157.56227415131);
+#130= IFCCARTESIANPOINT((3992.65488561843,3225.15171994683,279.187424717102));
+#132= IFCDIRECTION((0.0864098993331847,-0.401659996929606,0.9117031184348));
+#134= IFCDIRECTION((0.996259669612912,0.034837704425333,-0.0790759448450934));
+#136= IFCAXIS2PLACEMENT3D(#130,#132,#134);
+#137= IFCPLANE(#136);
+#138= IFCCARTESIANPOINT((103.386511820467,2683.88014525904));
+#140= IFCCARTESIANPOINT((-395.974581633486,362.694993890035));
+#142= IFCCARTESIANPOINT((-2181.84467363903,898.46186681463));
+#144= IFCPOLYLINE((#138,#140,#142,#138));
+#146= IFCCARTESIANPOINT((5307.66722093966,2400.34080546281,837.562274151307));
+#148= IFCAXIS2PLACEMENT3D(#146,#21,#17);
+#149= IFCPOLYGONALBOUNDEDHALFSPACE(#137,.F.,#148,#144);
+#150= IFCBOOLEANCLIPPINGRESULT(.DIFFERENCE.,#129,#149);
+#151= IFCCARTESIANPOINT((5286.89824117145,1774.47765257479,0.));
+#153= IFCAXIS2PLACEMENT3D(#151,$,$);
+#154= IFCPLANE(#153);
+#155= IFCCARTESIANPOINT((103.386511820466,2683.88014525904));
+#157= IFCCARTESIANPOINT((1602.61583383912,-389.995493084106));
+#159= IFCCARTESIANPOINT((934.686713370143,-1276.36737361194));
+#161= IFCCARTESIANPOINT((884.601287043893,-1276.36737361194));
+#163= IFCCARTESIANPOINT((-395.974581633486,362.694993890035));
+#165= IFCPOLYLINE((#155,#157,#159,#161,#163,#155));
+#167= IFCCARTESIANPOINT((5307.66722093966,2400.34080546281,837.562274151307));
+#169= IFCAXIS2PLACEMENT3D(#167,#21,#17);
+#170= IFCPOLYGONALBOUNDEDHALFSPACE(#154,.F.,#169,#165);
+#171= IFCBOOLEANCLIPPINGRESULT(.DIFFERENCE.,#150,#170);
+#172= IFCCARTESIANPOINT((5221.38385592335,3575.43758748735,279.187424717102));
+#174= IFCDIRECTION((0.154049964763331,-0.381287042554964,0.911531019513931));
+#176= IFCDIRECTION((0.988063058896757,0.0594468692472838,-0.142117772921897));
+#178= IFCAXIS2PLACEMENT3D(#172,#174,#176);
+#179= IFCPLANE(#178);
+#180= IFCCARTESIANPOINT((-2181.84467363903,898.46186681463));
+#182= IFCCARTESIANPOINT((-395.974581633486,362.694993890035));
+#184= IFCCARTESIANPOINT((-947.471090801113,-1002.30676565574));
+#186= IFCPOLYLINE((#180,#182,#184,#180));
+#188= IFCCARTESIANPOINT((5307.66722093966,2400.34080546281,837.562274151307));
+#190= IFCAXIS2PLACEMENT3D(#188,#21,#17);
+#191= IFCPOLYGONALBOUNDEDHALFSPACE(#179,.F.,#190,#186);
+#192= IFCBOOLEANCLIPPINGRESULT(.DIFFERENCE.,#171,#191);
+#193= IFCCARTESIANPOINT((3992.65488561843,3225.15171994683,-40.8125752828978));
+#195= IFCDIRECTION((-0.0864098993331847,0.401659996929606,-0.9117031184348));
+#197= IFCDIRECTION((0.996259669612912,0.034837704425333,-0.0790759448450934));
+#199= IFCAXIS2PLACEMENT3D(#193,#195,#197);
+#200= IFCPLANE(#199);
+#201= IFCCARTESIANPOINT((103.386511820467,2683.88014525904));
+#203= IFCCARTESIANPOINT((-2181.84467363903,898.46186681463));
+#205= IFCCARTESIANPOINT((-395.974581633486,362.694993890035));
+#207= IFCPOLYLINE((#201,#203,#205,#201));
+#209= IFCCARTESIANPOINT((5307.66722093966,2400.34080546281,837.562274151307));
+#211= IFCAXIS2PLACEMENT3D(#209,#21,#17);
+#212= IFCPOLYGONALBOUNDEDHALFSPACE(#200,.F.,#211,#207);
+#213= IFCBOOLEANCLIPPINGRESULT(.DIFFERENCE.,#192,#212);
+#214= IFCCARTESIANPOINT((5221.38385592335,3575.43758748735,-40.8125752828978));
+#216= IFCDIRECTION((-0.154049964763331,0.381287042554964,-0.911531019513931));
+#218= IFCDIRECTION((0.988063058896757,0.0594468692472838,-0.142117772921897));
+#220= IFCAXIS2PLACEMENT3D(#214,#216,#218);
+#221= IFCPLANE(#220);
+#222= IFCCARTESIANPOINT((-2181.84467363903,898.46186681463));
+#224= IFCCARTESIANPOINT((-947.471090801113,-1002.30676565574));
+#226= IFCCARTESIANPOINT((-395.974581633486,362.694993890035));
+#228= IFCPOLYLINE((#222,#224,#226,#222));
+#230= IFCCARTESIANPOINT((5307.66722093966,2400.34080546281,837.562274151307));
+#232= IFCAXIS2PLACEMENT3D(#230,#21,#17);
+#233= IFCPOLYGONALBOUNDEDHALFSPACE(#221,.F.,#232,#228);
+#234= IFCBOOLEANCLIPPINGRESULT(.DIFFERENCE.,#213,#233);
+#235= IFCCOLOURRGB($,0.752941176470588,0.752941176470588,0.752941176470588);
+#236= IFCSURFACESTYLERENDERING(#235,0.,$,$,$,$,IFCNORMALISEDRATIOMEASURE(0.5),IFCSPECULAREXPONENT(128.),.NOTDEFINED.);
+#237= IFCSURFACESTYLE('Concrete, Precast',.BOTH.,(#236));
+#239= IFCPRESENTATIONSTYLEASSIGNMENT((#237));
+#241= IFCSTYLEDITEM(#129,(#239),$);
+#244= IFCSHAPEREPRESENTATION(#73,'Body','Clipping',(#234));
+#247= IFCPRODUCTDEFINITIONSHAPE($,$,(#244));
+#251= IFCSLAB('3HgFLk8TTFhf$2Wq7uxYkv',#41,'Floor:Beam and Block 225mm Susp Ground:217606',$,'Floor:Beam and Block 225mm Susp Ground',#107,#247,'217606',.FLOOR.);
+#260= IFCPROPERTYSINGLEVALUE('Height Offset From Level',$,IFCLENGTHMEASURE(0.),$);
+#261= IFCPROPERTYSINGLEVALUE('Room Bounding',$,IFCBOOLEAN(.T.),$);
+#262= IFCPROPERTYSINGLEVALUE('Structural',$,IFCBOOLEAN(.F.),$);
+#263= IFCPROPERTYSINGLEVALUE('Related to Mass',$,IFCBOOLEAN(.F.),$);
+#264= IFCPROPERTYSINGLEVALUE('Enable Analytical Model',$,IFCBOOLEAN(.F.),$);
+#265= IFCPROPERTYSINGLEVALUE('Curved Edge Condition',$,IFCINTEGER(0),$);
+#266= IFCPROPERTYSINGLEVALUE('Perimeter',$,IFCLENGTHMEASURE(13298.5518313399),$);
+#267= IFCPROPERTYSINGLEVALUE('Volume',$,IFCVOLUMEMEASURE(2.43360159421361),$);
+#268= IFCPROPERTYSINGLEVALUE('Phase Created',$,IFCLABEL('New Construction'),$);
+#269= IFCPROPERTYSINGLEVALUE('Area',$,IFCAREAMEASURE(7.60500498191754),$);
+#270= IFCPROPERTYSINGLEVALUE('Thickness',$,IFCLENGTHMEASURE(320.),$);
+#271= IFCPROPERTYSINGLEVALUE('Level',$,IFCLABEL('Level: Level 0'),$);
+#272= IFCPROPERTYSINGLEVALUE('Coarse Scale Fill Pattern',$,IFCLABEL('Solid fill'),$);
+#273= IFCPROPERTYSINGLEVALUE('Roughness',$,IFCINTEGER(3),$);
+#274= IFCPROPERTYSINGLEVALUE('Assembly Description',$,IFCTEXT(''),$);
+#275= IFCPROPERTYSINGLEVALUE('Thermal mass',$,IFCREAL(365368.8),$);
+#276= IFCPROPERTYSINGLEVALUE('Coarse Scale Fill Color',$,IFCINTEGER(0),$);
+#277= IFCPROPERTYSINGLEVALUE('Structural Material',$,IFCLABEL('Concrete Masonry, Floor Block'),$);
+#278= IFCPROPERTYSINGLEVALUE('Heat Transfer Coefficient (U)',$,IFCREAL(0.397589052997394),$);
+#279= IFCPROPERTYSINGLEVALUE('Keynote',$,IFCTEXT('E60/130'),$);
+#280= IFCPROPERTYSINGLEVALUE('Assembly Code',$,IFCTEXT(''),$);
+#281= IFCPROPERTYSINGLEVALUE('Absorptance',$,IFCREAL(0.7),$);
+#282= IFCPROPERTYSINGLEVALUE('Thermal Resistance (R)',$,IFCREAL(2.51515979240645),$);
+#283= IFCPROPERTYSINGLEVALUE('Function',$,IFCIDENTIFIER('Interior'),$);
+#284= IFCPROPERTYSINGLEVALUE('Default Thickness',$,IFCLENGTHMEASURE(320.),$);
+#285= IFCPROPERTYSET('16zf0JEeP58uphSUtsukrO',#41,'Constraints',$,(#260,#261,#263,#271));
+#290= IFCRELDEFINESBYPROPERTIES('0zCVt71GL9Iv8htsyDhHBl',#41,$,$,(#251),#285);
+#294= IFCPROPERTYSET('1FyqoU7Lb9ofPfcfMbWraG',#41,'Structural',$,(#262,#264));
+#296= IFCRELDEFINESBYPROPERTIES('1PWunQtunCI9mnhYQ$Ay$Z',#41,$,$,(#251),#294);
+#299= IFCPROPERTYSET('3BTw92SBP1sfKJ_LPo$s3_',#41,'Slab Shape Edit',$,(#265));
+#301= IFCRELDEFINESBYPROPERTIES('0ZYr5EBWv00uUQU19ErHCQ',#41,$,$,(#251),#299);
+#304= IFCPROPERTYSET('2k3_uEr6P8axYydD_nkWqV',#41,'Dimensions',$,(#266,#267,#269,#270));
+#306= IFCRELDEFINESBYPROPERTIES('2jPZWgPGjFTuN0DTGBbGW4',#41,$,$,(#251),#304);
+#309= IFCPROPERTYSET('1sFPqTlKbBgB77ULTFHXoe',#41,'Phasing',$,(#268));
+#311= IFCRELDEFINESBYPROPERTIES('2mC9qrUpzFUe1HC4sLOEFo',#41,$,$,(#251),#309);
+#314= IFCPROPERTYSET('02SP_1XZX0Z8uW_ADBFi5I',#41,'Graphics',$,(#272,#276));
+#316= IFCPROPERTYSET('0s6ZDK8jn3_Bq8YWsUfrSz',#41,'Identity Data',$,(#274,#279,#280));
+#318= IFCPROPERTYSET('2WlKzSxH552QKtFMz0cnc3',#41,'Analytical Properties',$,(#273,#275,#278,#281,#282));
+#320= IFCPROPERTYSET('0CFpqTF0DAvRGYsst2wISG',#41,'Construction',$,(#283,#284));
+#322= IFCPROPERTYSET('3MgWNgEbfDjxOdrcTzLset',#41,'Materials and Finishes',$,(#277));
+#324= IFCMATERIAL('Concrete, Sand/Cement Screed');
+#327= IFCCOLOURRGB($,0.498039215686275,0.498039215686275,0.498039215686275);
+#328= IFCSURFACESTYLERENDERING(#327,0.,$,$,$,$,IFCNORMALISEDRATIOMEASURE(0.5),IFCSPECULAREXPONENT(0.),.NOTDEFINED.);
+#329= IFCSURFACESTYLE('Concrete, Sand/Cement Screed',.BOTH.,(#328));
+#331= IFCCOLOURRGB($,0.,0.,0.);
+#332= IFCCURVESTYLEFONTPATTERN(33.528,576.072);
+#333= IFCCURVESTYLEFONTPATTERN(33.528,576.072);
+#334= IFCCURVESTYLEFONTPATTERN(33.528,1185.672);
+#335= IFCCURVESTYLEFONTPATTERN(33.528,576.072);
+#336= IFCCURVESTYLEFONTPATTERN(33.528,372.872);
+#337= IFCCURVESTYLEFONTPATTERN(33.528,982.472);
+#338= IFCCURVESTYLEFONT('Sand:1',(#332,#333,#334,#335,#336,#337));
+#340= IFCCURVESTYLE('Sand:1',#338,$,#331);
+#341= IFCCARTESIANPOINT((812.8,0.));
+#343= IFCFILLAREASTYLEHATCHING(#340,IFCPOSITIVELENGTHMEASURE(203.2),$,#341,0.);
+#344= IFCCURVESTYLEFONTPATTERN(33.528,576.072);
+#345= IFCCURVESTYLEFONTPATTERN(33.528,576.072);
+#346= IFCCURVESTYLEFONTPATTERN(33.528,1185.672);
+#347= IFCCURVESTYLEFONTPATTERN(33.528,576.072);
+#348= IFCCURVESTYLEFONTPATTERN(33.528,372.872);
+#349= IFCCURVESTYLEFONTPATTERN(33.528,982.472);
+#350= IFCCURVESTYLEFONT('Sand:2',(#344,#345,#346,#347,#348,#349));
+#352= IFCCURVESTYLE('Sand:2',#350,$,#331);
+#353= IFCCARTESIANPOINT((-101.599999999999,805.505448195993));
+#355= IFCFILLAREASTYLEHATCHING(#352,IFCPOSITIVELENGTHMEASURE(203.2),$,#353,120.);
+#356= IFCCURVESTYLEFONTPATTERN(33.528,576.072);
+#357= IFCCURVESTYLEFONTPATTERN(33.528,576.072);
+#358= IFCCURVESTYLEFONTPATTERN(33.528,1185.672);
+#359= IFCCURVESTYLEFONTPATTERN(33.528,576.072);
+#360= IFCCURVESTYLEFONTPATTERN(33.528,372.872);
+#361= IFCCURVESTYLEFONTPATTERN(33.528,982.472);
+#362= IFCCURVESTYLEFONT('Sand:3',(#356,#357,#358,#359,#360,#361));
+#364= IFCCURVESTYLE('Sand:3',#362,$,#331);
+#365= IFCCARTESIANPOINT((-0.,-195.90544819599));
+#367= IFCFILLAREASTYLEHATCHING(#364,IFCPOSITIVELENGTHMEASURE(203.2),$,#365,240.);
+#368= IFCFILLAREASTYLE('Sand',(#343,#355,#367));
+#370= IFCPRESENTATIONSTYLEASSIGNMENT((#329,#368));
+#372= IFCSTYLEDITEM($,(#370),$);
+#374= IFCSTYLEDREPRESENTATION(#68,'Style','Material and Cut Pattern',(#372));
+#377= IFCMATERIALDEFINITIONREPRESENTATION($,$,(#374),#324);
+#380= IFCMATERIALLAYER(#324,65.,$);
+#382= IFCMATERIAL('Rigid insulation');
+#383= IFCCOLOURRGB($,0.498039215686275,0.498039215686275,0.498039215686275);
+#384= IFCSURFACESTYLERENDERING(#383,0.,$,$,$,$,IFCNORMALISEDRATIOMEASURE(0.5),IFCSPECULAREXPONENT(64.),.NOTDEFINED.);
+#385= IFCSURFACESTYLE('Rigid insulation',.BOTH.,(#384));
+#387= IFCCOLOURRGB($,0.,0.,0.);
+#388= IFCDRAUGHTINGPREDEFINEDCURVEFONT('continuous');
+#389= IFCCURVESTYLE($,#388,$,#387);
+#390= IFCFILLAREASTYLEHATCHING(#389,IFCPOSITIVELENGTHMEASURE(300.),$,#9,0.);
+#391= IFCCURVESTYLE($,#388,$,#387);
+#392= IFCFILLAREASTYLEHATCHING(#391,IFCPOSITIVELENGTHMEASURE(300.),$,#9,90.);
+#393= IFCFILLAREASTYLE('Crosshatch',(#390,#392));
+#395= IFCPRESENTATIONSTYLEASSIGNMENT((#385,#393));
+#397= IFCSTYLEDITEM($,(#395),$);
+#399= IFCSTYLEDREPRESENTATION(#68,'Style','Material and Cut Pattern',(#397));
+#401= IFCMATERIALDEFINITIONREPRESENTATION($,$,(#399),#382);
+#404= IFCMATERIALLAYER(#382,80.,$);
+#405= IFCMATERIAL('Concrete Masonry, Floor Block');
+#406= IFCCOLOURRGB($,0.709803921568627,0.709803921568627,0.709803921568627);
+#407= IFCSURFACESTYLERENDERING(#406,0.,$,$,$,$,IFCNORMALISEDRATIOMEASURE(0.5),IFCSPECULAREXPONENT(128.),.NOTDEFINED.);
+#408= IFCSURFACESTYLE('Concrete Masonry, Floor Block',.BOTH.,(#407));
+#410= IFCCOLOURRGB($,0.,0.,0.);
+#411= IFCCURVESTYLE($,#388,$,#410);
+#412= IFCFILLAREASTYLEHATCHING(#411,IFCPOSITIVELENGTHMEASURE(149.999992057106),$,#9,45.);
+#413= IFCFILLAREASTYLE('Diagonal up 1.5mm',(#412));
+#415= IFCPRESENTATIONSTYLEASSIGNMENT((#408,#413));
+#417= IFCSTYLEDITEM($,(#415),$);
+#419= IFCSTYLEDREPRESENTATION(#68,'Style','Material and Cut Pattern',(#417));
+#421= IFCMATERIALDEFINITIONREPRESENTATION($,$,(#419),#405);
+#424= IFCMATERIALLAYER(#405,100.,$);
+#425= IFCMATERIAL('Concrete, Precast');
+#426= IFCCOLOURRGB($,0.,0.,0.);
+#427= IFCCURVESTYLEFONTPATTERN(76.2,838.2);
+#428= IFCCURVESTYLEFONT('Concrete:1',(#427));
+#430= IFCCURVESTYLE('Concrete:1',#428,$,#426);
+#431= IFCCARTESIANPOINT((269.702496520064,321.418919159413));
+#433= IFCFILLAREASTYLEHATCHING(#430,IFCPOSITIVELENGTHMEASURE(599.226132),$,#431,230.);
+#434= IFCCURVESTYLEFONTPATTERN(60.96,670.56);
+#435= IFCCURVESTYLEFONT('Concrete:2',(#434));
+#437= IFCCURVESTYLE('Concrete:2',#435,$,#426);
+#438= IFCCARTESIANPOINT((-206.253843026946,18.0448730735145));
+#440= IFCFILLAREASTYLEHATCHING(#437,IFCPOSITIVELENGTHMEASURE(749.032538),$,#438,355.);
+#441= IFCCURVESTYLEFONTPATTERN(64.7600432,712.360272);
+#442= IFCCURVESTYLEFONT('Concrete:3',(#441));
+#444= IFCCURVESTYLE('Concrete:3',#442,$,#426);
+#445= IFCCARTESIANPOINT((-44.888915909931,567.255017497859));
+#447= IFCFILLAREASTYLEHATCHING(#444,IFCPOSITIVELENGTHMEASURE(705.080378),$,#445,280.4514);
+#448= IFCCURVESTYLEFONTPATTERN(114.3,1257.3);
+#449= IFCCURVESTYLEFONT('Concrete:4',(#448));
+#451= IFCCURVESTYLE('Concrete:4',#449,$,#426);
+#452= IFCCARTESIANPOINT((435.742098974862,657.336905769826));
+#454= IFCFILLAREASTYLEHATCHING(#451,IFCPOSITIVELENGTHMEASURE(898.839198),$,#452,226.1842);
+#455= IFCCURVESTYLEFONTPATTERN(97.1400648,1068.540408);
+#456= IFCCURVESTYLEFONT('Concrete:5',(#455));
+#458= IFCCURVESTYLE('Concrete:5',#456,$,#426);
+#459= IFCCARTESIANPOINT((-10.5586587498264,1056.67704007865));
+#461= IFCFILLAREASTYLEHATCHING(#458,IFCPOSITIVELENGTHMEASURE(1057.62044),$,#459,276.6356);
+#462= IFCCURVESTYLEFONTPATTERN(91.44,1005.84);
+#463= IFCCURVESTYLEFONT('Concrete:6',(#462));
+#465= IFCCURVESTYLE('Concrete:6',#463,$,#426);
+#466= IFCCARTESIANPOINT((777.423344307836,82.628976622327));
+#468= IFCFILLAREASTYLEHATCHING(#465,IFCPOSITIVELENGTHMEASURE(1123.548934),$,#466,351.1842);
+#469= IFCCURVESTYLEFONTPATTERN(76.2,838.2);
+#470= IFCCURVESTYLEFONT('Concrete:7',(#469));
+#472= IFCCURVESTYLE('Concrete:7',#470,$,#426);
+#473= IFCCARTESIANPOINT((493.314102658805,302.764956026886));
+#475= IFCFILLAREASTYLEHATCHING(#472,IFCPOSITIVELENGTHMEASURE(599.226132),$,#473,201.);
+#476= IFCCURVESTYLEFONTPATTERN(60.96,670.56);
+#477= IFCCURVESTYLEFONT('Concrete:8',(#476));
+#479= IFCCURVESTYLE('Concrete:8',#477,$,#426);
+#480= IFCCARTESIANPOINT((-70.0453477224384,268.176248915166));
+#482= IFCFILLAREASTYLEHATCHING(#479,IFCPOSITIVELENGTHMEASURE(749.032538),$,#480,326.);
+#483= IFCCURVESTYLEFONTPATTERN(64.7600432,712.360272);
+#484= IFCCURVESTYLEFONT('Concrete:9',(#483));
+#486= IFCCURVESTYLE('Concrete:9',#484,$,#426);
+#487= IFCCARTESIANPOINT((337.349933176118,670.294961900504));
+#489= IFCFILLAREASTYLEHATCHING(#486,IFCPOSITIVELENGTHMEASURE(705.080378),$,#487,251.4514);
+#490= IFCCURVESTYLEFONTPATTERN(33.528,628.904);
+#491= IFCCURVESTYLEFONTPATTERN(33.528,647.192);
+#492= IFCCURVESTYLEFONTPATTERN(33.528,639.572);
+#493= IFCCURVESTYLEFONT('Concrete:10',(#490,#491,#492));
+#495= IFCCURVESTYLE('Concrete:10',#493,$,#426);
+#496= IFCCARTESIANPOINT((171.123776770131,131.307892200608));
+#498= IFCFILLAREASTYLEHATCHING(#495,IFCPOSITIVELENGTHMEASURE(260.8072),$,#496,37.5);
+#499= IFCCURVESTYLEFONTPATTERN(33.528,354.584);
+#500= IFCCURVESTYLEFONTPATTERN(33.528,613.664);
+#501= IFCCURVESTYLEFONTPATTERN(33.528,223.012);
+#502= IFCCURVESTYLEFONT('Concrete:11',(#499,#500,#501));
+#504= IFCCURVESTYLE('Concrete:11',#502,$,#426);
+#505= IFCCARTESIANPOINT((314.582281890354,41.4155431076072));
+#507= IFCFILLAREASTYLEHATCHING(#504,IFCPOSITIVELENGTHMEASURE(362.4072),$,#505,7.5);
+#508= IFCCURVESTYLEFONTPATTERN(33.528,220.472);
+#509= IFCCURVESTYLEFONTPATTERN(33.528,758.952);
+#510= IFCCURVESTYLEFONTPATTERN(33.528,1018.032);
+#511= IFCCURVESTYLEFONT('Concrete:12',(#508,#509,#510));
+#513= IFCCURVESTYLE('Concrete:12',#511,$,#426);
+#514= IFCCARTESIANPOINT((169.604538674044,-252.389742537839));
+#516= IFCFILLAREASTYLEHATCHING(#513,IFCPOSITIVELENGTHMEASURE(272.0848),$,#514,-32.5);
+#517= IFCCURVESTYLEFONTPATTERN(33.528,296.672);
+#518= IFCCURVESTYLEFONTPATTERN(33.528,492.76);
+#519= IFCCURVESTYLEFONTPATTERN(33.528,713.232);
+#520= IFCCURVESTYLEFONT('Concrete:13',(#517,#518,#519));
+#522= IFCCURVESTYLE('Concrete:13',#520,$,#426);
+#523= IFCCARTESIANPOINT((-56.748608656703,-248.710049520697));
+#525= IFCFILLAREASTYLEHATCHING(#522,IFCPOSITIVELENGTHMEASURE(475.2848),$,#523,-42.5);
+#526= IFCFILLAREASTYLE('Concrete',(#433,#440,#447,#454,#461,#468,#475,#482,#489,#498,#507,#516,#525));
+#528= IFCPRESENTATIONSTYLEASSIGNMENT((#237,#526));
+#530= IFCSTYLEDITEM($,(#528),$);
+#532= IFCSTYLEDREPRESENTATION(#68,'Style','Material and Cut Pattern',(#530));
+#534= IFCMATERIALDEFINITIONREPRESENTATION($,$,(#532),#425);
+#537= IFCMATERIALLAYER(#425,75.,$);
+#538= IFCMATERIALLAYERSET((#380,#404,#424,#537),'Floor:Beam and Block 225mm Susp Ground');
+#544= IFCMATERIALLAYERSETUSAGE(#538,.AXIS3.,.POSITIVE.,0.);
+#545= IFCPROPERTYSINGLEVALUE('Reference',$,IFCIDENTIFIER('Beam and Block 225mm Susp Ground'),$);
+#546= IFCPROPERTYSINGLEVALUE('IsExternal',$,IFCBOOLEAN(.F.),$);
+#547= IFCPROPERTYSINGLEVALUE('LoadBearing',$,IFCBOOLEAN(.T.),$);
+#548= IFCPROPERTYSINGLEVALUE('ThermalTransmittance',$,IFCTHERMALTRANSMITTANCEMEASURE(0.397589052997394),$);
+#549= IFCPROPERTYSINGLEVALUE('PitchAngle',$,IFCPLANEANGLEMEASURE(0.),$);
+#550= IFCPROPERTYSET('3HgFLk8TTFhf$2Wq3uxYkv',#41,'Pset_SlabCommon',$,(#545,#546,#547,#548,#549));
+#552= IFCRELDEFINESBYPROPERTIES('2wJQGru1D5p89EjPo60WNh',#41,$,$,(#251),#550);
+#555= IFCAXIS2PLACEMENT3D(#6,$,$);
+#556= IFCLOCALPLACEMENT($,#555);
+#557= IFCSITE('0jI6kz9rj7ZAQfwqcKYFLz',#41,'Default',$,'',#556,$,$,.ELEMENT.,$,$,0.,$,$);
+#562= IFCPROPERTYSINGLEVALUE('AboveGround',$,IFCLOGICAL(.U.),$);
+#563= IFCPROPERTYSET('2y6eFWYEH60Q_1QofreKWl',#41,'Pset_BuildingStoreyCommon',$,(#562));
+#565= IFCRELDEFINESBYPROPERTIES('3yc32vkgv4We97hvWdvc7$',#41,$,$,(#98),#563);
+#569= IFCPROPERTYSINGLEVALUE('Name',$,IFCTEXT('Level 0'),$);
+#570= IFCPROPERTYSINGLEVALUE('Elevation',$,IFCLENGTHMEASURE(0.),$);
+#571= IFCPROPERTYSINGLEVALUE('Computation Height',$,IFCLENGTHMEASURE(0.),$);
+#572= IFCPROPERTYSINGLEVALUE('Building Story',$,IFCBOOLEAN(.T.),$);
+#573= IFCPROPERTYSINGLEVALUE('Line Weight',$,IFCIDENTIFIER('1'),$);
+#574= IFCPROPERTYSINGLEVALUE('Elevation Base',$,IFCIDENTIFIER('Project Base Point'),$);
+#575= IFCPROPERTYSINGLEVALUE('Symbol at End 2 Default',$,IFCBOOLEAN(.F.),$);
+#576= IFCPROPERTYSINGLEVALUE('Symbol',$,IFCLABEL('Level Head - Circle: Level Head - Circle'),$);
+#577= IFCPROPERTYSINGLEVALUE('Color',$,IFCINTEGER(0),$);
+#578= IFCPROPERTYSINGLEVALUE('Line Pattern',$,IFCLABEL('Centre'),$);
+#579= IFCPROPERTYSINGLEVALUE('Symbol at End 1 Default',$,IFCBOOLEAN(.T.),$);
+#580= IFCPROPERTYSET('3atPwuYcb8NBVwt6gA_gad',#41,'Identity Data',$,(#569,#262,#572));
+#582= IFCRELDEFINESBYPROPERTIES('37Ns5Hz$v9SeRN96BHaKsZ',#41,$,$,(#98),#580);
+#585= IFCPROPERTYSET('16xT06UnDCVBcuwrHqVRGC',#41,'Constraints',$,(#570));
+#587= IFCRELDEFINESBYPROPERTIES('0GNuiomV5ESO6YYvzLBSMX',#41,$,$,(#98),#585);
+#590= IFCPROPERTYSET('0JtEirreL7g8p_k9cYi6Wo',#41,'Dimensions',$,(#571));
+#592= IFCRELDEFINESBYPROPERTIES('35oVBWv3T7TOCr2N1LLeCk',#41,$,$,(#98),#590);
+#595= IFCPROPERTYSET('0Z7sOLTwTCkRYhZ1rhFAAc',#41,'Graphics',$,(#573,#575,#576,#577,#578,#579));
+#597= IFCPROPERTYSET('2aBBUNdC5Ejhl1Dd53Seb_',#41,'Constraints',$,(#574));
+#603= IFCRELAGGREGATES('2Or3ed41rD3u76Lm2s7UOd',#41,$,$,#79,(#557));
+#607= IFCRELAGGREGATES('0GEoefa211w91carb_gm9p',#41,$,$,#557,(#89));
+#611= IFCRELAGGREGATES('2$1LAsj$T3CPRLiPj39tWH',#41,$,$,#89,(#98));
+#615= IFCPROPERTYSINGLEVALUE('NumberOfStoreys',$,IFCINTEGER(1),$);
+#616= IFCPROPERTYSET('2FiUiubW97e9lZ7ujDAP8i',#41,'Pset_BuildingCommon',$,(#615));
+#618= IFCRELDEFINESBYPROPERTIES('1hzN469$b3HgO2UMk8QCfg',#41,$,$,(#89),#616);
+#622= IFCPROPERTYSINGLEVALUE('Project Name',$,IFCTEXT('Project Name'),$);
+#623= IFCPROPERTYSINGLEVALUE('Project Status',$,IFCTEXT('Project Status'),$);
+#624= IFCPROPERTYSINGLEVALUE('Building Name',$,IFCTEXT(''),$);
+#625= IFCPROPERTYSINGLEVALUE('Organization Description',$,IFCTEXT(''),$);
+#626= IFCPROPERTYSINGLEVALUE('Project Address',$,IFCTEXT('Enter address here'),$);
+#627= IFCPROPERTYSINGLEVALUE('Project Number',$,IFCTEXT('Project Number'),$);
+#628= IFCPROPERTYSINGLEVALUE('Project Issue Date',$,IFCTEXT('Issue Date'),$);
+#629= IFCPROPERTYSINGLEVALUE('Client Name',$,IFCTEXT('Owner'),$);
+#630= IFCPROPERTYSINGLEVALUE('Author',$,IFCTEXT(''),$);
+#631= IFCPROPERTYSINGLEVALUE('Organization Name',$,IFCTEXT(''),$);
+#632= IFCPROPERTYSET('0DRivpXNPD6hheen3gQzqz',#41,'Other',$,(#622,#623,#626,#627,#628,#629));
+#634= IFCRELDEFINESBYPROPERTIES('0P9kBw51f1qwgdA_NGzm0h',#41,$,$,(#89),#632);
+#637= IFCPROPERTYSET('0bsYiNj3T6zRvCeDr5qzEF',#41,'Identity Data',$,(#624,#625,#630,#631));
+#639= IFCRELDEFINESBYPROPERTIES('3dea3nqt1C4hudrQhYfl_0',#41,$,$,(#89),#637);
+#642= IFCRELASSOCIATESMATERIAL('0t2BxR6Vf0vAdho1sWfb5o',#41,$,$,(#251),#544);
+#645= IFCRELDEFINESBYPROPERTIES('20m5CUwvPCGPz066QBkW0q',#41,$,$,(#251),#314);
+#648= IFCRELDEFINESBYPROPERTIES('1qg3Wfj59E0Bq_0hDVvP46',#41,$,$,(#251),#316);
+#651= IFCRELDEFINESBYPROPERTIES('2sRfn_msDCCAaKC7pnx2Bw',#41,$,$,(#251),#318);
+#654= IFCRELDEFINESBYPROPERTIES('0F0ueYZyrDLQyU6UuD2Gqn',#41,$,$,(#251),#320);
+#657= IFCRELDEFINESBYPROPERTIES('1Xktpq4bPCSwElNpZ2fQh3',#41,$,$,(#251),#322);
+#660= IFCRELDEFINESBYPROPERTIES('3sCzONGnrDcgbhS3pxRLjd',#41,$,$,(#98),#595);
+#666= IFCPRESENTATIONLAYERASSIGNMENT('A-230-M_FLOOR',$,(#244),$);
+ENDSEC;
+
+END-ISO-10303-21;
diff --git a/test/input/standard_case_element_beam.ifc b/test/input/standard_case_element_beam.ifc
new file mode 100644
index 0000000..0e8172f
--- /dev/null
+++ b/test/input/standard_case_element_beam.ifc
@@ -0,0 +1,622 @@
+ISO-10303-21;
+HEADER;
+/* NOTE a valid model view name has to be asserted, replacing 'notYetAssigned' ----------------- */
+FILE_DESCRIPTION(
+    ( 'ViewDefinition [notYetAssigned]'
+     ,'Comment [manual creation of example file]'
+	)
+	,'2;1');
+/* NOTE standard header information according to ISO 10303-21 ---------------------------------- */
+FILE_NAME(
+	'standard_case_element_beam.ifc',
+	'2011-11-07T18:00:00',
+	('Thomas Liebich'),
+	('buildingSMART International'),
+	'IFC text editor',
+	'IFC text editor',
+	'reference file created for the IFC4 specification');
+/* NOTE schema name to be replaced with 'IFC4' after the final release  ------------------------ */
+FILE_SCHEMA(('IFC4'));
+ENDSEC;
+
+DATA;
+#100= IFCBEAMTYPE('0juf4qyggSstrxA20Qwnsj',$,'IPE220','Beam type',$,$,$,$,$,.BEAM.);
+/* enhanced definitions intruduced in IFC2x4 ------------------------------- */
+/* assignment of material and profile to the beam type                       */
+#110= IFCRELASSOCIATESMATERIAL('0juf4qyggSstrxA20Q49sj',$,$,$,(#100),#111);
+#111= IFCMATERIALPROFILESET($,$,(#112),$);
+#112= IFCMATERIALPROFILE('IPE220',$,#113,#120,$,$);
+#113= IFCMATERIAL('S275J2',$,'Steel');
+/* end of enhanced definitions --------------------------------------------- */
+#120= IFCISHAPEPROFILEDEF(.AREA.,'IPE220',$,110.,220.,5.9,9.2,12.0,$,$);
+
+
+#200= IFCBEAMTYPE('0juf4qyggSstrxA20Qdisj',$,'1/2IPE300','Beam type',$,$,$,$,$,.BEAM.);
+/* enhanced definitions intruduced in IFC2x4 ------------------------------- */
+/* assignment of material and profile to the beam type                       */
+#210= IFCRELASSOCIATESMATERIAL('0juf4qyggSstrxA20Q2fsj',$,$,$,(#200),#211);
+#211= IFCMATERIALPROFILESET($,$,(#212),$);
+#212= IFCMATERIALPROFILE('1/2IPE300',$,#213,#220,$,$);
+#213= IFCMATERIAL('S275J2',$,'Steel');
+/* end of enhanced definitions --------------------------------------------- */
+#220= IFCTSHAPEPROFILEDEF(.AREA.,'1/2IPE300',$,150.0,150.0,7.1,10.7,15.0,$,$,$,$);
+
+
+/* beam A-1 - beam axis along global x axis -------------------------------- */
+/* cardinal point = 1 - bottom left                                          */
+/* enhanced definitions intruduced in IFC2x4 - IfcBeamStandardCase --------- */
+#1000= IFCBEAMSTANDARDCASE('0juf4qyggSI8rxA20Qwnsj',$,'A-1','IPE220','Beam',#1001,#1010,'A-1',$);
+#1001= IFCLOCALPLACEMENT(#100025,#1002);
+/* set local placement so that the z-axis is co-linear to the beam axis ---- */
+/* the y-axis (cross product of x & z axis) is up direction of profile ----- */
+#1002= IFCAXIS2PLACEMENT3D(#1003,#1004,#1005);
+#1003= IFCCARTESIANPOINT((0.,0.,0.));
+#1004= IFCDIRECTION((1.,0.,0.));     /* local z-axis co-linear to beam axis  */
+#1005= IFCDIRECTION((0.,1.,0.));     /* local x-axis                         */
+#1010= IFCPRODUCTDEFINITIONSHAPE($,$,(#1050,#1020));
+#1020= IFCSHAPEREPRESENTATION(#100011,'Body','SweptSolid',(#1021));
+#1021= IFCEXTRUDEDAREASOLID(#120,#1030,#1034,2000.);
+/* extrusion body is placed with no rotation inside local placement -------- */
+/* extrusion position z = default = (0.,0.,1.),x = default = (1.,0.,0.)      */
+/* translation provides the cardinal point offset -------------------------- */
+#1030= IFCAXIS2PLACEMENT3D(#1031,$,$);
+#1031= IFCCARTESIANPOINT((-55.0,110.0,0.));   /* defines cardinal point 1    */
+#1034= IFCDIRECTION((0.,0.,1.)); 
+/* enhanced definitions intruduced in IFC2x4 ------------------------------- */
+/* assignment of material and cardinal point to the beam occurrence          */
+#1040= IFCRELASSOCIATESMATERIAL('0juf4qyggSstrxA20QfZsj',$,$,$,(#1000),#1041);
+#1041= IFCMATERIALPROFILESETUSAGE(#111,1,$);
+/* end of enhanced definitions --------------------------------------------- */
+#1050= IFCSHAPEREPRESENTATION(#100011,'Axis','Curve3D',(#1051));
+#1051= IFCPOLYLINE((#1052,#1053));
+#1052= IFCCARTESIANPOINT((0.,0.,0.));
+#1053= IFCCARTESIANPOINT((0.,0.,2000.));
+
+
+/* beam A-2 - beam axis along global x axis -------------------------------- */
+/* cardinal point = 2 - bottom center                                        */
+/* enhanced definitions intruduced in IFC2x4 - IfcBeamStandardCase --------- */
+#1100= IFCBEAMSTANDARDCASE('0juf4qyggSI8rxA20sznsj',$,'A-2','IPE220','Beam',#1101,#1110,'A-2',$);
+#1101= IFCLOCALPLACEMENT(#100025,#1102);
+/* set local placement so that the z-axis is co-linear to the beam axis ---- */
+/* the y-axis (cross product of x & z axis) is up direction of profile ----- */
+#1102= IFCAXIS2PLACEMENT3D(#1103,#1104,#1105);
+#1103= IFCCARTESIANPOINT((0.,1500.,0.));
+#1104= IFCDIRECTION((1.,0.,0.));     /* local z-axis co-linear to beam axis  */
+#1105= IFCDIRECTION((0.,1.,0.));     /* local x-axis                         */
+#1110= IFCPRODUCTDEFINITIONSHAPE($,$,(#1150,#1120));
+#1120= IFCSHAPEREPRESENTATION(#100011,'Body','SweptSolid',(#1121));
+#1121= IFCEXTRUDEDAREASOLID(#120,#1130,#1134,2000.);
+/* extrusion body is placed with no rotation inside local placement -------- */
+/* extrusion position z = default = (0.,0.,1.),x = default = (1.,0.,0.)      */
+/* translation provides the cardinal point offset -------------------------- */
+#1130= IFCAXIS2PLACEMENT3D(#1131,$,$);
+#1131= IFCCARTESIANPOINT((0.,110.0,0.));      /* defines cardinal point 2    */
+#1134= IFCDIRECTION((0.,0.,1.)); 
+/* enhanced definitions intruduced in IFC2x4 ------------------------------- */
+/* assignment of material and cardinal point to the beam occurrence          */
+#1140= IFCRELASSOCIATESMATERIAL('0juf4qyggSstrxA20QgAsj',$,$,$,(#1100),#1141);
+#1141= IFCMATERIALPROFILESETUSAGE(#111,2,$);
+/* end of enhanced definitions --------------------------------------------- */
+#1150= IFCSHAPEREPRESENTATION(#100011,'Axis','Curve3D',(#1151));
+#1151= IFCPOLYLINE((#1152,#1153));
+#1152= IFCCARTESIANPOINT((0.,0.,0.));
+#1153= IFCCARTESIANPOINT((0.,0.,2000.));
+
+
+/* beam A-3 - beam axis along global x axis -------------------------------- */
+/* cardinal point = 3 - bottom right                                         */
+/* enhanced definitions intruduced in IFC2x4 - IfcBeamStandardCase --------- */
+#1200= IFCBEAMSTANDARDCASE('0juf4qyggSI8s4A20sznsj',$,'A-3','IPE220','Beam',#1201,#1210,'A-3',$);
+#1201= IFCLOCALPLACEMENT(#100025,#1202);
+/* set local placement so that the z-axis is co-linear to the beam axis ---- */
+/* the y-axis (cross product of x & z axis) is up direction of profile ----- */
+#1202= IFCAXIS2PLACEMENT3D(#1203,#1204,#1205);
+#1203= IFCCARTESIANPOINT((0.,3000.,0.));
+#1204= IFCDIRECTION((1.,0.,0.));     /* local z-axis co-linear to beam axis  */
+#1205= IFCDIRECTION((0.,1.,0.));     /* local x-axis                         */
+#1210= IFCPRODUCTDEFINITIONSHAPE($,$,(#1250,#1220));
+#1220= IFCSHAPEREPRESENTATION(#100011,'Body','SweptSolid',(#1221));
+#1221= IFCEXTRUDEDAREASOLID(#120,#1230,#1234,2000.);
+/* extrusion body is placed with no rotation inside local placement -------- */
+/* extrusion position z = default = (0.,0.,1.),x = default = (1.,0.,0.)      */
+/* translation provides the cardinal point offset -------------------------- */
+#1230= IFCAXIS2PLACEMENT3D(#1231,$,$);
+#1231= IFCCARTESIANPOINT((55.0,110.0,0.));    /* defines cardinal point 3    */
+#1234= IFCDIRECTION((0.,0.,1.)); 
+/* enhanced definitions intruduced in IFC2x4 ------------------------------- */
+/* assignment of material and cardinal point to the beam occurrence          */
+#1240= IFCRELASSOCIATESMATERIAL('3x0gFSPAr5puQ5WI22xYOm',$,$,$,(#1200),#1241);
+#1241= IFCMATERIALPROFILESETUSAGE(#111,3,$);
+/* end of enhanced definitions --------------------------------------------- */
+#1250= IFCSHAPEREPRESENTATION(#100011,'Axis','Curve3D',(#1251));
+#1251= IFCPOLYLINE((#1252,#1253));
+#1252= IFCCARTESIANPOINT((0.,0.,0.));
+#1253= IFCCARTESIANPOINT((0.,0.,2000.));
+
+
+/* beam A-4 - beam axis along global x axis -------------------------------- */
+/* cardinal point = 3 - bottom right                                         */
+/* enhanced definitions intruduced in IFC2x4 - IfcBeamStandardCase --------- */
+#1300= IFCBEAMSTANDARDCASE('0juf4qyggSI8s4A20sznw6',$,'A-4','IPE220','Beam',#1301,#1310,'A-4',$);
+#1301= IFCLOCALPLACEMENT(#100025,#1302);
+/* set local placement so that the z-axis is co-linear to the beam axis ---- */
+/* the y-axis (cross product of x & z axis) is up direction of profile ----- */
+#1302= IFCAXIS2PLACEMENT3D(#1303,#1304,#1305);
+#1303= IFCCARTESIANPOINT((0.,4500.,0.));
+#1304= IFCDIRECTION((1.,0.,0.));     /* local z-axis co-linear to beam axis  */
+#1305= IFCDIRECTION((0.,1.,0.));     /* local x-axis                         */
+#1310= IFCPRODUCTDEFINITIONSHAPE($,$,(#1350,#1320));
+#1320= IFCSHAPEREPRESENTATION(#100011,'Body','SweptSolid',(#1321));
+#1321= IFCEXTRUDEDAREASOLID(#120,#1330,#1334,2000.);
+/* extrusion body is placed with no rotation inside local placement -------- */
+/* extrusion position z = default = (0.,0.,1.),x = default = (1.,0.,0.)      */
+/* translation provides the cardinal point offset -------------------------- */
+#1330= IFCAXIS2PLACEMENT3D(#1331,$,$);
+#1331= IFCCARTESIANPOINT((-55.0,0.,0.));       /* defines cardinal point 4   */
+#1334= IFCDIRECTION((0.,0.,1.)); 
+/* enhanced definitions intruduced in IFC2x4 ------------------------------- */
+/* assignment of material and cardinal point to the beam occurrence          */
+#1340= IFCRELASSOCIATESMATERIAL('0juf4qyggSstrxA20QOHsj',$,$,$,(#1300),#1341);
+#1341= IFCMATERIALPROFILESETUSAGE(#111,4,$);
+/* end of enhanced definitions --------------------------------------------- */
+#1350= IFCSHAPEREPRESENTATION(#100011,'Axis','Curve3D',(#1351));
+#1351= IFCPOLYLINE((#1352,#1353));
+#1352= IFCCARTESIANPOINT((0.,0.,0.));
+#1353= IFCCARTESIANPOINT((0.,0.,2000.));
+
+
+/* beam A-5 - beam axis along global x axis -------------------------------- */
+/* cardinal point = 5 - mid-depth center                                     */
+/* enhanced definitions intruduced in IFC2x4 - IfcBeamStandardCase --------- */
+#1400= IFCBEAMSTANDARDCASE('0juf4qyggSI8rxA20Qwnab',$,'A-5','IPE220','Beam',#1401,#1410,'A-5',$);
+#1401= IFCLOCALPLACEMENT(#100025,#1402);
+/* set local placement so that the z-axis is co-linear to the beam axis ---- */
+/* the y-axis (cross product of x & z axis) is up direction of profile ----- */
+#1402= IFCAXIS2PLACEMENT3D(#1403,#1404,#1405);
+#1403= IFCCARTESIANPOINT((0.,6000.,0.));
+#1404= IFCDIRECTION((1.,0.,0.));     /* local z-axis co-linear to beam axis  */
+#1405= IFCDIRECTION((0.,1.,0.));     /* local x-axis                         */
+#1410= IFCPRODUCTDEFINITIONSHAPE($,$,(#1450,#1420));
+#1420= IFCSHAPEREPRESENTATION(#100011,'Body','SweptSolid',(#1421));
+#1421= IFCEXTRUDEDAREASOLID(#120,#1430,#1434,2000.);
+/* extrusion body is placed with no rotation inside local placement -------- */
+/* extrusion position z = default = (0.,0.,1.),x = default = (1.,0.,0.)      */
+/* translation provides the cardinal point offset -------------------------- */
+#1430= IFCAXIS2PLACEMENT3D(#1431,$,$);
+#1431= IFCCARTESIANPOINT((0.,0.,0.));          /* defines cardinal point 5   */
+#1434= IFCDIRECTION((0.,0.,1.)); 
+/* enhanced definitions intruduced in IFC2x4 ------------------------------- */
+/* assignment of material and cardinal point to the beam occurrence          */
+#1440= IFCRELASSOCIATESMATERIAL('0juf4qyggSstrxA20QRLsj',$,$,$,(#1400),#1441);
+#1441= IFCMATERIALPROFILESETUSAGE(#111,5,$);
+/* end of enhanced definitions --------------------------------------------- */
+#1450= IFCSHAPEREPRESENTATION(#100011,'Axis','Curve3D',(#1451));
+#1451= IFCPOLYLINE((#1452,#1453));
+#1452= IFCCARTESIANPOINT((0.,0.,0.));
+#1453= IFCCARTESIANPOINT((0.,0.,2000.));
+
+
+/* beam A-6 - beam axis along global x axis -------------------------------- */
+/* cardinal point = 6 - mid-depth right                                      */
+/* enhanced definitions intruduced in IFC2x4 - IfcBeamStandardCase --------- */
+#1500= IFCBEAMSTANDARDCASE('0juf4qyggSI8rxA20Qwng1',$,'A-6','IPE220','Beam',#1501,#1510,'A-6',$);
+#1501= IFCLOCALPLACEMENT(#100025,#1502);
+/* set local placement so that the z-axis is co-linear to the beam axis ---- */
+/* the y-axis (cross product of x & z axis) is up direction of profile ----- */
+#1502= IFCAXIS2PLACEMENT3D(#1503,#1504,#1505);
+#1503= IFCCARTESIANPOINT((0.,7500.,0.));
+#1504= IFCDIRECTION((1.,0.,0.));     /* local z-axis co-linear to beam axis  */
+#1505= IFCDIRECTION((0.,1.,0.));     /* local x-axis                         */
+#1510= IFCPRODUCTDEFINITIONSHAPE($,$,(#1550,#1520));
+#1520= IFCSHAPEREPRESENTATION(#100011,'Body','SweptSolid',(#1521));
+#1521= IFCEXTRUDEDAREASOLID(#120,#1530,#1534,2000.);
+/* extrusion body is placed with no rotation inside local placement -------- */
+/* extrusion position z = default = (0.,0.,1.),x = default = (1.,0.,0.)      */
+/* translation provides the cardinal point offset -------------------------- */
+#1530= IFCAXIS2PLACEMENT3D(#1531,$,$);
+#1531= IFCCARTESIANPOINT((55.0,0.,0.));        /* defines cardinal point 6   */
+#1534= IFCDIRECTION((0.,0.,1.)); 
+/* enhanced definitions intruduced in IFC2x4 ------------------------------- */
+/* assignment of material and cardinal point to the beam occurrence          */
+#1540= IFCRELASSOCIATESMATERIAL('0juf4qyggSstrxA20QMmsj',$,$,$,(#1500),#1541);
+#1541= IFCMATERIALPROFILESETUSAGE(#111,6,$);
+/* end of enhanced definitions --------------------------------------------- */
+#1550= IFCSHAPEREPRESENTATION(#100011,'Axis','Curve3D',(#1551));
+#1551= IFCPOLYLINE((#1552,#1553));
+#1552= IFCCARTESIANPOINT((0.,0.,0.));
+#1553= IFCCARTESIANPOINT((0.,0.,2000.));
+
+
+/* beam A-7 - beam axis along global x axis -------------------------------- */
+/* cardinal point = 7 - top left                                             */
+/* enhanced definitions intruduced in IFC2x4 - IfcBeamStandardCase --------- */
+#1600= IFCBEAMSTANDARDCASE('0juf4qyggSI8rxA20Qwn3s',$,'A-7','IPE220','Beam',#1601,#1610,'A-7',$);
+#1601= IFCLOCALPLACEMENT(#100025,#1602);
+/* set local placement so that the z-axis is co-linear to the beam axis ---- */
+/* the y-axis (cross product of x & z axis) is up direction of profile ----- */
+#1602= IFCAXIS2PLACEMENT3D(#1603,#1604,#1605);
+#1603= IFCCARTESIANPOINT((0.,9000.,0.));
+#1604= IFCDIRECTION((1.,0.,0.));     /* local z-axis co-linear to beam axis  */
+#1605= IFCDIRECTION((0.,1.,0.));     /* local x-axis                         */
+#1610= IFCPRODUCTDEFINITIONSHAPE($,$,(#1650,#1620));
+#1620= IFCSHAPEREPRESENTATION(#100011,'Body','SweptSolid',(#1621));
+#1621= IFCEXTRUDEDAREASOLID(#120,#1630,#1634,2000.);
+/* extrusion body is placed with no rotation inside local placement -------- */
+/* extrusion position z = default = (0.,0.,1.),x = default = (1.,0.,0.)      */
+/* translation provides the cardinal point offset -------------------------- */
+#1630= IFCAXIS2PLACEMENT3D(#1631,$,$);
+#1631= IFCCARTESIANPOINT((-55.0,-110.0,0.));   /* defines cardinal point 7   */
+#1634= IFCDIRECTION((0.,0.,1.)); 
+/* enhanced definitions intruduced in IFC2x4 ------------------------------- */
+/* assignment of material and cardinal point to the beam occurrence          */
+#1640= IFCRELASSOCIATESMATERIAL('0juf4qyggSstrxA20Qh4sj',$,$,$,(#1600),#1641);
+#1641= IFCMATERIALPROFILESETUSAGE(#111,7,$);
+/* end of enhanced definitions --------------------------------------------- */
+#1650= IFCSHAPEREPRESENTATION(#100011,'Axis','Curve3D',(#1651));
+#1651= IFCPOLYLINE((#1652,#1653));
+#1652= IFCCARTESIANPOINT((0.,0.,0.));
+#1653= IFCCARTESIANPOINT((0.,0.,2000.));
+
+
+/* beam A-8 - beam axis along global x axis -------------------------------- */
+/* cardinal point = 8 - top center                                           */
+/* enhanced definitions intruduced in IFC2x4 - IfcBeamStandardCase --------- */
+#1700= IFCBEAMSTANDARDCASE('0juf4qyggSI8rxA20Qwnlq',$,'A-8','IPE220','Beam',#1701,#1710,'A-8',$);
+#1701= IFCLOCALPLACEMENT(#100025,#1702);
+/* set local placement so that the z-axis is co-linear to the beam axis ---- */
+/* the y-axis (cross product of x & z axis) is up direction of profile ----- */
+#1702= IFCAXIS2PLACEMENT3D(#1703,#1704,#1705);
+#1703= IFCCARTESIANPOINT((0.,10500.,0.));
+#1704= IFCDIRECTION((1.,0.,0.));     /* local z-axis co-linear to beam axis  */
+#1705= IFCDIRECTION((0.,1.,0.));     /* local x-axis                         */
+#1710= IFCPRODUCTDEFINITIONSHAPE($,$,(#1750,#1720));
+#1720= IFCSHAPEREPRESENTATION(#100011,'Body','SweptSolid',(#1721));
+#1721= IFCEXTRUDEDAREASOLID(#120,#1730,#1734,2000.);
+/* extrusion body is placed with no rotation inside local placement -------- */
+/* extrusion position z = default = (0.,0.,1.),x = default = (1.,0.,0.)      */
+/* translation provides the cardinal point offset -------------------------- */
+#1730= IFCAXIS2PLACEMENT3D(#1731,$,$);
+#1731= IFCCARTESIANPOINT((0.,-110.0,0.));   /* defines cardinal point 7      */
+#1734= IFCDIRECTION((0.,0.,1.)); 
+/* enhanced definitions intruduced in IFC2x4 ------------------------------- */
+/* assignment of material and cardinal point to the beam occurrence          */
+#1740= IFCRELASSOCIATESMATERIAL('0juf4qyggSstrxA20QwKsj',$,$,$,(#1700),#1741);
+#1741= IFCMATERIALPROFILESETUSAGE(#111,8,$);
+/* end of enhanced definitions --------------------------------------------- */
+#1750= IFCSHAPEREPRESENTATION(#100011,'Axis','Curve3D',(#1751));
+#1751= IFCPOLYLINE((#1752,#1753));
+#1752= IFCCARTESIANPOINT((0.,0.,0.));
+#1753= IFCCARTESIANPOINT((0.,0.,2000.));
+
+
+/* beam A-9 - beam axis along global x axis -------------------------------- */
+/* cardinal point = 9 - top right                                            */
+/* enhanced definitions intruduced in IFC2x4 - IfcBeamStandardCase --------- */
+#1800= IFCBEAMSTANDARDCASE('0juf4qyggSI8s4A20sznrt',$,'A-9','IPE220','Beam',#1801,#1810,'A-9',$);
+#1801= IFCLOCALPLACEMENT(#100025,#1802);
+/* set local placement so that the z-axis is co-linear to the beam axis ---- */
+/* the y-axis (cross product of x & z axis) is up direction of profile ----- */
+#1802= IFCAXIS2PLACEMENT3D(#1803,#1804,#1805);
+#1803= IFCCARTESIANPOINT((0.,12000.,0.));
+#1804= IFCDIRECTION((1.,0.,0.));     /* local z-axis co-linear to beam axis  */
+#1805= IFCDIRECTION((0.,1.,0.));     /* local x-axis                         */
+#1810= IFCPRODUCTDEFINITIONSHAPE($,$,(#1850,#1820));
+#1820= IFCSHAPEREPRESENTATION(#100011,'Body','SweptSolid',(#1821));
+#1821= IFCEXTRUDEDAREASOLID(#120,#1830,#1834,2000.);
+/* extrusion body is placed with no rotation inside local placement -------- */
+/* extrusion position z = default = (0.,0.,1.),x = default = (1.,0.,0.)      */
+/* translation provides the cardinal point offset -------------------------- */
+#1830= IFCAXIS2PLACEMENT3D(#1831,$,$);
+#1831= IFCCARTESIANPOINT((55.0,-110.0,0.));    /* defines cardinal point 9   */
+#1834= IFCDIRECTION((0.,0.,1.)); 
+/* enhanced definitions intruduced in IFC2x4 ------------------------------- */
+/* assignment of material and cardinal point to the beam occurrence          */
+#1840= IFCRELASSOCIATESMATERIAL('0juf4qyggSstrxA20QJksj',$,$,$,(#1800),#1841);
+#1841= IFCMATERIALPROFILESETUSAGE(#111,9,$);
+/* end of enhanced definitions --------------------------------------------- */
+#1850= IFCSHAPEREPRESENTATION(#100011,'Axis','Curve3D',(#1851));
+#1851= IFCPOLYLINE((#1852,#1853));
+#1852= IFCCARTESIANPOINT((0.,0.,0.));
+#1853= IFCCARTESIANPOINT((0.,0.,2000.));
+
+
+
+/* beam B-1 - beam axis along global x axis -------------------------------- */
+/* cardinal point = 1 - bottom left                                          */
+/* enhanced definitions intruduced in IFC2x4 - IfcBeamStandardCase --------- */
+#2000=IFCBEAMSTANDARDCASE('3QbcAsYoB7Hvx$4VHzijYi',$,'B-1','1/2IPE300','Beam',#2001,#2010,'B-1',$);
+#2001=IFCLOCALPLACEMENT(#100025,#2002);
+/* set local placement so that the z-axis is co-linear to the beam axis ---- */
+/* the y-axis (cross product of x & z axis) is up direction of profile ----- */
+#2002=IFCAXIS2PLACEMENT3D(#2003,#2004,#2005);
+#2003=IFCCARTESIANPOINT((0.,0.,1500.));
+#2004=IFCDIRECTION((0.98,0.081,0.182));            /* local z-axis co-linear to beam axis  */
+#2005=IFCDIRECTION((-0.0001,0.9138,-0.40616));     /* local x-axis                         */
+#2010=IFCPRODUCTDEFINITIONSHAPE($,$,(#2050,#2020));
+#2020=IFCSHAPEREPRESENTATION(#100011,'Body','SweptSolid',(#2021));
+#2021=IFCEXTRUDEDAREASOLID(#220,#2030,#2034,3000.);
+/* extrusion body is placed with no rotation inside local placement -------- */
+/* translation provides the cardinal point offset -------------------------- */
+#2030=IFCAXIS2PLACEMENT3D(#2031,$,$);
+#2031=IFCCARTESIANPOINT((-75.0,75.0,0.));      /* defines cardinal point 1   */
+#2034=IFCDIRECTION((0.,0.,1.));
+/* enhanced definitions intruduced in IFC2x4 ------------------------------- */
+/* assignment of material and cardinal point to the beam occurrence          */
+#2040= IFCRELASSOCIATESMATERIAL('0juf4qyggSstrxA20QbFsj',$,$,$,(#2000),#2041);
+#2041= IFCMATERIALPROFILESETUSAGE(#211,1,$);
+/* end of enhanced definitions --------------------------------------------- */
+#2050= IFCSHAPEREPRESENTATION(#100011,'Axis','Curve3D',(#2051));
+#2051= IFCPOLYLINE((#2052,#2053));
+#2052= IFCCARTESIANPOINT((0.,0.,0.));
+#2053= IFCCARTESIANPOINT((0.,0.,3000.));
+
+
+/* beam B-2 - beam axis along global x axis -------------------------------- */
+/* cardinal point = 2 - bottom center                                        */
+/* enhanced definitions intruduced in IFC2x4 - IfcBeamStandardCase --------- */
+#2100=IFCBEAMSTANDARDCASE('3Qb5gsYoB7Hvx$4VHzijYi',$,'B-2','1/2IPE300','Beam',#2101,#2110,'B-2',$);
+#2101=IFCLOCALPLACEMENT(#100025,#2102);
+/* set local placement so that the z-axis is co-linear to the beam axis ---- */
+/* the y-axis (cross product of x & z axis) is up direction of profile ----- */
+#2102=IFCAXIS2PLACEMENT3D(#2103,#2104,#2105);
+#2103=IFCCARTESIANPOINT((0.,1500.,1500.));
+#2104=IFCDIRECTION((0.98,0.081,0.182));            /* local z-axis co-linear to beam axis  */
+#2105=IFCDIRECTION((-0.0001,0.9138,-0.40616));     /* local x-axis                         */
+#2110=IFCPRODUCTDEFINITIONSHAPE($,$,(#2150,#2120));
+#2120=IFCSHAPEREPRESENTATION(#100011,'Body','SweptSolid',(#2121));
+#2121=IFCEXTRUDEDAREASOLID(#220,#2130,#2134,3000.);
+/* extrusion body is placed with no rotation inside local placement -------- */
+/* translation provides the cardinal point offset -------------------------- */
+#2130=IFCAXIS2PLACEMENT3D(#2131,$,$);
+#2131=IFCCARTESIANPOINT((0.,75.0,0.));         /* defines cardinal point 2   */
+#2134=IFCDIRECTION((0.,0.,1.));
+/* enhanced definitions intruduced in IFC2x4 ------------------------------- */
+/* assignment of material and cardinal point to the beam occurrence          */
+#2140= IFCRELASSOCIATESMATERIAL('0juf4qyggSstrxA20Qqlsj',$,$,$,(#2100),#2141);
+#2141= IFCMATERIALPROFILESETUSAGE(#211,2,$);
+/* end of enhanced definitions --------------------------------------------- */
+#2150= IFCSHAPEREPRESENTATION(#100011,'Axis','Curve3D',(#2151));
+#2151= IFCPOLYLINE((#2152,#2153));
+#2152= IFCCARTESIANPOINT((0.,0.,0.));
+#2153= IFCCARTESIANPOINT((0.,0.,3000.));
+
+
+/* beam B-3 - beam axis along global x axis -------------------------------- */
+/* cardinal point = 3 - bottom right                                         */
+/* enhanced definitions intruduced in IFC2x4 - IfcBeamStandardCase --------- */
+#2200=IFCBEAMSTANDARDCASE('3QbcAsYsg7Hvx$4VHzijYi',$,'B-3','1/2IPE300','Beam',#2201,#2210,'B-3',$);
+#2201=IFCLOCALPLACEMENT(#100025,#2202);
+#2202=IFCAXIS2PLACEMENT3D(#2203,#2204,#2205);
+#2203=IFCCARTESIANPOINT((0.,3000.,1500.));
+#2204=IFCDIRECTION((0.98,0.081,0.182));            /* local z-axis co-linear to beam axis  */
+#2205=IFCDIRECTION((-0.0001,0.9138,-0.40616));     /* local x-axis ----------------------  */
+#2210=IFCPRODUCTDEFINITIONSHAPE($,$,(#2250,#2220));
+#2220=IFCSHAPEREPRESENTATION(#100011,'Body','SweptSolid',(#2221));
+#2221=IFCEXTRUDEDAREASOLID(#220,#2230,#2234,3000.);
+/* extrusion body is placed with no rotation inside local placement -------- */
+/* translation provides the cardinal point offset -------------------------- */
+#2230=IFCAXIS2PLACEMENT3D(#2231,$,$);
+#2231=IFCCARTESIANPOINT((75.0,75.0,0.));       /* defines cardinal point 3   */
+#2234=IFCDIRECTION((0.,0.,1.));
+/* enhanced definitions intruduced in IFC2x4 ------------------------------- */
+/* assignment of material and cardinal point to the beam occurrence          */
+#2240= IFCRELASSOCIATESMATERIAL('0juf4qyggSstrxA20Q7isj',$,$,$,(#2200),#2241);
+#2241= IFCMATERIALPROFILESETUSAGE(#211,3,$);
+/* end of enhanced definitions --------------------------------------------- */
+#2250= IFCSHAPEREPRESENTATION(#100011,'Axis','Curve3D',(#2251));
+#2251= IFCPOLYLINE((#2252,#2253));
+#2252= IFCCARTESIANPOINT((0.,0.,0.));
+#2253= IFCCARTESIANPOINT((0.,0.,3000.));
+
+
+/* beam B-4 - beam axis along global x axis -------------------------------- */
+/* cardinal point = 4 - mid-depth left                                       */
+/* enhanced definitions intruduced in IFC2x4 - IfcBeamStandardCase --------- */
+#2300=IFCBEAMSTANDARDCASE('3QbcAsYsg7Hvx$4VHzijGT',$,'B-4','1/2IPE300','Beam',#2301,#2310,'B-4',$);
+#2301=IFCLOCALPLACEMENT(#100025,#2302);
+#2302=IFCAXIS2PLACEMENT3D(#2303,#2304,#2305);
+#2303=IFCCARTESIANPOINT((0.,4500.,1500.));
+#2304=IFCDIRECTION((0.98,0.081,0.182));            /* local z-axis co-linear to beam axis  */
+#2305=IFCDIRECTION((-0.0001,0.9138,-0.40616));     /* local x-axis ----------------------  */
+#2310=IFCPRODUCTDEFINITIONSHAPE($,$,(#2350,#2320));
+#2320=IFCSHAPEREPRESENTATION(#100011,'Body','SweptSolid',(#2321));
+#2321=IFCEXTRUDEDAREASOLID(#220,#2330,#2334,3000.);
+/* extrusion body is placed with no rotation inside local placement -------- */
+/* translation provides the cardinal point offset -------------------------- */
+#2330=IFCAXIS2PLACEMENT3D(#2331,$,$);
+#2331=IFCCARTESIANPOINT((-75.0,0.,0.));        /* defines cardinal point 4   */
+#2334=IFCDIRECTION((0.,0.,1.));
+/* enhanced definitions intruduced in IFC2x4 ------------------------------- */
+/* assignment of material and cardinal point to the beam occurrence          */
+#2340= IFCRELASSOCIATESMATERIAL('0juf4qyggSstrxA20Q4nsj',$,$,$,(#2300),#2341);
+#2341= IFCMATERIALPROFILESETUSAGE(#211,4,$);
+/* end of enhanced definitions --------------------------------------------- */
+#2350= IFCSHAPEREPRESENTATION(#100011,'Axis','Curve3D',(#2351));
+#2351= IFCPOLYLINE((#2352,#2353));
+#2352= IFCCARTESIANPOINT((0.,0.,0.));
+#2353= IFCCARTESIANPOINT((0.,0.,3000.));
+
+
+/* beam B-5 - beam axis along global x axis -------------------------------- */
+/* cardinal point = 5 - mid-depth centre                                     */
+/* enhanced definitions intruduced in IFC2x4 - IfcBeamStandardCase --------- */
+#2400=IFCBEAMSTANDARDCASE('3QbcAsYsg7Hvx$4VHzijdF',$,'B-5','1/2IPE300','Beam',#2401,#2410,'B-5',$);
+#2401=IFCLOCALPLACEMENT(#100025,#2402);
+#2402=IFCAXIS2PLACEMENT3D(#2403,#2404,#2405);
+#2403=IFCCARTESIANPOINT((0.,6000.,1500.));
+#2404=IFCDIRECTION((0.98,0.081,0.182));            /* local z-axis co-linear to beam axis  */
+#2405=IFCDIRECTION((-0.0001,0.9138,-0.40616));     /* local x-axis ----------------------  */
+#2410=IFCPRODUCTDEFINITIONSHAPE($,$,(#2450,#2420));
+#2420=IFCSHAPEREPRESENTATION(#100011,'Body','SweptSolid',(#2421));
+#2421=IFCEXTRUDEDAREASOLID(#220,#2430,#2434,3000.);
+/* extrusion body is placed with no rotation inside local placement -------- */
+/* translation provides the cardinal point offset -------------------------- */
+#2430=IFCAXIS2PLACEMENT3D(#2431,$,$);
+#2431=IFCCARTESIANPOINT((0.,0.,0.));           /* defines cardinal point 5   */
+#2434=IFCDIRECTION((0.,0.,1.));
+/* enhanced definitions intruduced in IFC2x4 ------------------------------- */
+/* assignment of material and cardinal point to the beam occurrence          */
+#2440= IFCRELASSOCIATESMATERIAL('0juf4qyggSstrxA20Q41sj',$,$,$,(#2400),#2441);
+#2441= IFCMATERIALPROFILESETUSAGE(#211,5,$);
+/* end of enhanced definitions --------------------------------------------- */
+#2450= IFCSHAPEREPRESENTATION(#100011,'Axis','Curve3D',(#2451));
+#2451= IFCPOLYLINE((#2452,#2453));
+#2452= IFCCARTESIANPOINT((0.,0.,0.));
+#2453= IFCCARTESIANPOINT((0.,0.,3000.));
+
+
+/* beam B-6 - beam axis along global x axis -------------------------------- */
+/* cardinal point = 6 - mid-depth right                                      */
+/* enhanced definitions intruduced in IFC2x4 - IfcBeamStandardCase --------- */
+#2500=IFCBEAMSTANDARDCASE('3QbcAsYsg7Hvx$4VHzij3V',$,'B-6','1/2IPE300','Beam',#2501,#2510,'B-6',$);
+#2501=IFCLOCALPLACEMENT(#100025,#2502);
+#2502=IFCAXIS2PLACEMENT3D(#2503,#2504,#2505);
+#2503=IFCCARTESIANPOINT((0.,7500.,1500.));
+#2504=IFCDIRECTION((0.98,0.081,0.182));            /* local z-axis co-linear to beam axis  */
+#2505=IFCDIRECTION((-0.0001,0.9138,-0.40616));     /* local x-axis ----------------------  */
+#2510=IFCPRODUCTDEFINITIONSHAPE($,$,(#2550,#2520));
+#2520=IFCSHAPEREPRESENTATION(#100011,'Body','SweptSolid',(#2521));
+#2521=IFCEXTRUDEDAREASOLID(#220,#2530,#2534,3000.);
+/* extrusion body is placed with no rotation inside local placement -------- */
+/* translation provides the cardinal point offset -------------------------- */
+#2530=IFCAXIS2PLACEMENT3D(#2531,$,$);
+#2531=IFCCARTESIANPOINT((75.,0.,0.));       /* defines cardinal point 6      */
+#2534=IFCDIRECTION((0.,0.,1.));
+/* enhanced definitions intruduced in IFC2x4 ------------------------------- */
+/* assignment of material and cardinal point to the beam occurrence          */
+#2540= IFCRELASSOCIATESMATERIAL('0juf4qyggSstrxA20QURsj',$,$,$,(#2500),#2541);
+#2541= IFCMATERIALPROFILESETUSAGE(#211,6,$);
+/* end of enhanced definitions --------------------------------------------- */
+#2550= IFCSHAPEREPRESENTATION(#100011,'Axis','Curve3D',(#2551));
+#2551= IFCPOLYLINE((#2552,#2553));
+#2552= IFCCARTESIANPOINT((0.,0.,0.));
+#2553= IFCCARTESIANPOINT((0.,0.,3000.));
+
+
+/* beam B-7 - beam axis along global x axis -------------------------------- */
+/* cardinal point = 7 - top left                                             */
+/* enhanced definitions intruduced in IFC2x4 - IfcBeamStandardCase --------- */
+#2600=IFCBEAMSTANDARDCASE('3QbcAsYsg7Hvx$4VHzij71',$,'B-7','1/2IPE300','Beam',#2601,#2610,'B-7',$);
+#2601=IFCLOCALPLACEMENT(#100025,#2602);
+#2602=IFCAXIS2PLACEMENT3D(#2603,#2604,#2605);
+#2603=IFCCARTESIANPOINT((0.,9000.,1500.));
+#2604=IFCDIRECTION((0.98,0.081,0.182));            /* local z-axis co-linear to beam axis  */
+#2605=IFCDIRECTION((-0.0001,0.9138,-0.40616));     /* local x-axis ----------------------  */
+#2610=IFCPRODUCTDEFINITIONSHAPE($,$,(#2650,#2620));
+#2620=IFCSHAPEREPRESENTATION(#100011,'Body','SweptSolid',(#2621));
+#2621=IFCEXTRUDEDAREASOLID(#220,#2630,#2634,3000.);
+/* extrusion body is placed with no rotation inside local placement -------- */
+/* translation provides the cardinal point offset -------------------------- */
+#2630=IFCAXIS2PLACEMENT3D(#2631,$,$);
+#2631=IFCCARTESIANPOINT((-75.0,-75.0,0.));     /* defines cardinal point 7 - */
+#2634=IFCDIRECTION((0.,0.,1.));
+/* enhanced definitions intruduced in IFC2x4 ------------------------------- */
+/* assignment of material and cardinal point to the beam occurrence          */
+#2640= IFCRELASSOCIATESMATERIAL('0juf4qyggSstrxA20Qw9sj',$,$,$,(#2600),#2641);
+#2641= IFCMATERIALPROFILESETUSAGE(#211,7,$);
+/* end of enhanced definitions --------------------------------------------- */
+#2650= IFCSHAPEREPRESENTATION(#100011,'Axis','Curve3D',(#2651));
+#2651= IFCPOLYLINE((#2652,#2653));
+#2652= IFCCARTESIANPOINT((0.,0.,0.));
+#2653= IFCCARTESIANPOINT((0.,0.,3000.));
+
+
+/* beam B-8 - beam axis along global x axis -------------------------------- */
+/* cardinal point = 3 - top center                                           */
+/* enhanced definitions intruduced in IFC2x4 - IfcBeamStandardCase --------- */
+#2700=IFCBEAMSTANDARDCASE('3QbcAsYsg7Hvx$4VHzijvb',$,'B-8','1/2IPE300','Beam',#2701,#2710,'B-8',$);
+#2701=IFCLOCALPLACEMENT(#100025,#2702);
+#2702=IFCAXIS2PLACEMENT3D(#2703,#2704,#2705);
+#2703=IFCCARTESIANPOINT((0.,10500.,1500.));
+#2704=IFCDIRECTION((0.98,0.081,0.182));            /* local z-axis co-linear to beam axis  */
+#2705=IFCDIRECTION((-0.0001,0.9138,-0.40616));     /* local x-axis ----------------------  */
+#2710=IFCPRODUCTDEFINITIONSHAPE($,$,(#2750,#2720));
+#2720=IFCSHAPEREPRESENTATION(#100011,'Body','SweptSolid',(#2721));
+#2721=IFCEXTRUDEDAREASOLID(#220,#2730,#2734,3000.);
+/* extrusion body is placed with no rotation inside local placement -------- */
+/* translation provides the cardinal point offset -------------------------- */
+#2730=IFCAXIS2PLACEMENT3D(#2731,$,$);
+#2731=IFCCARTESIANPOINT((0.,-75.0,0.));        /* defines cardinal point 8   */
+#2734=IFCDIRECTION((0.,0.,1.));
+/* enhanced definitions intruduced in IFC2x4 ------------------------------- */
+/* assignment of material and cardinal point to the beam occurrence          */
+#2740= IFCRELASSOCIATESMATERIAL('0juf4qyggSstrxA20QOcsj',$,$,$,(#2700),#2741);
+#2741= IFCMATERIALPROFILESETUSAGE(#211,8,$);
+/* end of enhanced definitions --------------------------------------------- */
+#2750= IFCSHAPEREPRESENTATION(#100011,'Axis','Curve3D',(#2751));
+#2751= IFCPOLYLINE((#2752,#2753));
+#2752= IFCCARTESIANPOINT((0.,0.,0.));
+#2753= IFCCARTESIANPOINT((0.,0.,3000.));
+
+
+/* beam B-9 - beam axis along global x axis -------------------------------- */
+/* cardinal point = 9 - top right                                            */
+/* enhanced definitions intruduced in IFC2x4 - IfcBeamStandardCase --------- */
+#2800=IFCBEAMSTANDARDCASE('3QbcAsYsg7Hvx$4VHzijp1',$,'B-9','1/2IPE300','Beam',#2801,#2810,'B-9',$);
+#2801=IFCLOCALPLACEMENT(#100025,#2802);
+#2802=IFCAXIS2PLACEMENT3D(#2803,#2804,#2805);
+#2803=IFCCARTESIANPOINT((0.,12000.,1500.));
+#2804=IFCDIRECTION((0.98,0.081,0.182));            /* local z-axis co-linear to beam axis  */
+#2805=IFCDIRECTION((-0.0001,0.9138,-0.40616));     /* local x-axis ----------------------  */
+#2810=IFCPRODUCTDEFINITIONSHAPE($,$,(#2850,#2820));
+#2820=IFCSHAPEREPRESENTATION(#100011,'Body','SweptSolid',(#2821));
+#2821=IFCEXTRUDEDAREASOLID(#220,#2830,#2834,3000.);
+/* extrusion body is placed with no rotation inside local placement -------- */
+/* translation provides the cardinal point offset -------------------------- */
+#2830=IFCAXIS2PLACEMENT3D(#2831,$,$);
+#2831=IFCCARTESIANPOINT((75.0,-75.0,0.));      /* defines cardinal point 9 - */
+#2834=IFCDIRECTION((0.,0.,1.));
+/* enhanced definitions intruduced in IFC2x4 ------------------------------- */
+/* assignment of material and cardinal point to the beam occurrence          */
+#2840= IFCRELASSOCIATESMATERIAL('0juf4qyggSstrxA20Qw6sj',$,$,$,(#2800),#2841);
+#2841= IFCMATERIALPROFILESETUSAGE(#211,9,$);
+/* end of enhanced definitions --------------------------------------------- */
+#2850= IFCSHAPEREPRESENTATION(#100011,'Axis','Curve3D',(#2851));
+#2851= IFCPOLYLINE((#2852,#2853));
+#2852= IFCCARTESIANPOINT((0.,0.,0.));
+#2853= IFCCARTESIANPOINT((0.,0.,3000.));
+
+
+#90000=IFCRELCONTAINEDINSPATIALSTRUCTURE('2aq$Crcs_xJvtg9lbm2bMM',$,'Physical model',$,(#1000,#1100,#1200,#1300,#1400,#1500,#1600,#1700,#1800,#2000,#2100,#2200,#2300,#2400,#2500,#2600,#2700,#2800),#100023);
+#90010=IFCRELDEFINESBYTYPE('2aq$Crcs_xJvd69lbm2bMM',$,'beam typing',$,(#1000,#1100,#1200,#1300,#1400,#1500,#1600,#1700,#1800),#100);
+#90020=IFCRELDEFINESBYTYPE('2aq$Crcs_xJvN69lbm2bMM',$,'beam typing',$,(#2000,#2100,#2200,#2300,#2400,#2500,#2600,#2700,#2800),#200);
+
+
+/* --------------------------------------------------------------------------------------------- */
+/* general entities required for all IFC data sets, defining the context for the exchange ------ */
+#100001= IFCPERSON($,'Liebich',$,$,$,$,$,$);
+#100002= IFCORGANIZATION($,'AEC3',$,$,$);
+#100003= IFCPERSONANDORGANIZATION(#100001,#100002,$);
+#100004= IFCAPPLICATION(#100002,'Unknown','SDS/2 Version 6.300 on NT','Unknown');
+#100005= IFCOWNERHISTORY(#100003,#100004,$,.NOTDEFINED.,$,$,$,1320688800);
+#100010= IFCPROJECT('32DJhIf6esIeAOIlD4Xw2m',#100005,'Test model for beam cardinal points',$,$,$,$,(#100011),#100060);
+#100011= IFCGEOMETRICREPRESENTATIONCONTEXT($,'Model',3,1.0E-5,#100040,$);
+#100020= IFCSITE('10cTefjFQoJexBQrSqFcWZ',$,'Site',$,$,#100022,$,$,.ELEMENT.,$,$,$,$,$);
+#100021= IFCRELAGGREGATES('0ZdtoJM$VsHBqD_feRfxAg',$,$,$,#100010,(#100020));
+#100022= IFCLOCALPLACEMENT($,#100040);
+#100023= IFCBUILDING('0Xwup04AK2G8Mt0WNZVy_Z',$,'Building',$,$,#100025,$,$,.ELEMENT.,$,$,$);
+#100024= IFCRELAGGREGATES('1FUTCayKJbIQqDNnZzXu07',$,$,$,#100020,(#100023));
+#100025= IFCLOCALPLACEMENT(#100022,#100040);
+#100040= IFCAXIS2PLACEMENT3D(#100041,#100044,#100042);
+#100041= IFCCARTESIANPOINT((0.,0.,0.));
+#100042= IFCDIRECTION((1.,0.,0.));
+#100043= IFCDIRECTION((0.,1.,0.));
+#100044= IFCDIRECTION((0.,0.,1.)); 
+#100048= IFCDIRECTION((0.,0.,-1.));
+#100059= IFCCARTESIANTRANSFORMATIONOPERATOR3D($,$,#100041,1.,$);
+#100060= IFCUNITASSIGNMENT((#100061,#100062,#100063,#100064,#100065,#100066,#100067,#100068));
+#100061= IFCSIUNIT(*,.LENGTHUNIT.,.MILLI.,.METRE.);
+#100062= IFCSIUNIT(*,.PLANEANGLEUNIT.,$,.RADIAN.);
+#100063= IFCSIUNIT(*,.MASSUNIT.,.KILO.,.GRAM.);
+#100064= IFCSIUNIT(*,.TIMEUNIT.,$,.SECOND.);
+#100065= IFCSIUNIT(*,.AREAUNIT.,$,.SQUARE_METRE.);
+#100066= IFCSIUNIT(*,.PRESSUREUNIT.,$,.PASCAL.);
+#100067= IFCSIUNIT(*,.FORCEUNIT.,$,.NEWTON.);
+#100068= IFCSIUNIT(*,.THERMODYNAMICTEMPERATUREUNIT.,$,.DEGREE_CELSIUS.);
+
+#100069= IFCRELDECLARES('3P3zL0KYv4C9D9h3OX$dey',$,$,$,#100010,(#100,#200));
+
+ENDSEC;
+
+END-ISO-10303-21;
diff --git a/test/input/structural_analysis_curve.ifc b/test/input/structural_analysis_curve.ifc
new file mode 100644
index 0000000..560e4bf
--- /dev/null
+++ b/test/input/structural_analysis_curve.ifc
@@ -0,0 +1,268 @@
+ISO-10303-21;
+HEADER;
+FILE_DESCRIPTION($,'2;1');
+FILE_NAME('IfcStructuralCurveMember01.ifc','2011-11-07T14:57:06',(''),(''),'Constructivity 0.9.1','Constructivity 0.9.1','');
+FILE_SCHEMA(('IFC4'));
+ENDSEC;
+
+DATA;
+
+/* Owner history user and application */
+#1= IFCAPPLICATION(#2,'0.8','Constructivity','CONSTRUCTIVITY');
+#2= IFCORGANIZATION($,'Constructivity.com LLC',$,$,$);
+#3= IFCPERSON('Tim',$,$,$,$,$,$,$);
+#4= IFCORGANIZATION($,'Tim-PC',$,$,$);
+#5= IFCPERSONANDORGANIZATION(#3,#4,$);
+
+/* Units */
+#9= IFCSIUNIT(*,.AREAUNIT.,$,.SQUARE_METRE.);
+#10= IFCMEASUREWITHUNIT(IFCAREAMEASURE(0.0006452),#9);
+#11= IFCDIMENSIONALEXPONENTS(2,0,0,0,0,0,0);
+#12= IFCCONVERSIONBASEDUNIT(#11,.AREAUNIT.,'square inch',#10);
+#21= IFCSIUNIT(*,.FORCEUNIT.,$,.NEWTON.);
+#22= IFCMEASUREWITHUNIT(IFCMASSMEASURE(4.44822162),#21);
+#23= IFCDIMENSIONALEXPONENTS(1,1,-2,0,0,0,0);
+#24= IFCCONVERSIONBASEDUNIT(#23,.FORCEUNIT.,'pound-force',#22);
+#28= IFCSIUNIT(*,.LENGTHUNIT.,$,.METRE.);
+#29= IFCMEASUREWITHUNIT(IFCLENGTHMEASURE(0.0254),#28);
+#30= IFCDIMENSIONALEXPONENTS(1,0,0,0,0,0,0);
+#31= IFCCONVERSIONBASEDUNIT(#30,.LENGTHUNIT.,'inch',#29);
+#36= IFCSIUNIT(*,.MASSUNIT.,.KILO.,.GRAM.);
+#37= IFCMEASUREWITHUNIT(IFCMASSMEASURE(0.45359237),#36);
+#38= IFCDIMENSIONALEXPONENTS(0,1,0,0,0,0,0);
+#39= IFCCONVERSIONBASEDUNIT(#38,.MASSUNIT.,'pound',#37);
+#40= IFCSIUNIT(*,.PLANEANGLEUNIT.,$,.RADIAN.);
+#41= IFCMEASUREWITHUNIT(IFCPLANEANGLEMEASURE(0.0174532925199433),#40);
+#42= IFCDIMENSIONALEXPONENTS(0,0,0,0,0,0,0);
+#43= IFCCONVERSIONBASEDUNIT(#42,.PLANEANGLEUNIT.,'degree',#41);
+#45= IFCSIUNIT(*,.PRESSUREUNIT.,$,.PASCAL.);
+#46= IFCMEASUREWITHUNIT(IFCPRESSUREMEASURE(6894.7572932),#45);
+#47= IFCDIMENSIONALEXPONENTS(-1,1,-2,0,0,0,0);
+#48= IFCCONVERSIONBASEDUNIT(#47,.PRESSUREUNIT.,'pound-force per square inch',#46);
+#56= IFCSIUNIT(*,.VOLUMEUNIT.,$,.CUBIC_METRE.);
+#57= IFCMEASUREWITHUNIT(IFCVOLUMEMEASURE(1.639E-05),#56);
+#58= IFCDIMENSIONALEXPONENTS(3,0,0,0,0,0,0);
+#59= IFCCONVERSIONBASEDUNIT(#58,.VOLUMEUNIT.,'cubic inch',#57);
+#96= IFCDERIVEDUNITELEMENT(#24,1);
+#97= IFCDERIVEDUNITELEMENT(#31,-1);
+#98= IFCDERIVEDUNIT((#96,#97),.LINEARFORCEUNIT.,$);
+#99= IFCDERIVEDUNITELEMENT(#24,1);
+#100= IFCDERIVEDUNITELEMENT(#31,1);
+#101= IFCDERIVEDUNITELEMENT(#31,-1);
+#102= IFCDERIVEDUNIT((#99,#100,#101),.LINEARMOMENTUNIT.,$);
+#103= IFCDERIVEDUNITELEMENT(#24,1);
+#104= IFCDERIVEDUNITELEMENT(#31,-1);
+#105= IFCDERIVEDUNIT((#103,#104),.LINEARSTIFFNESSUNIT.,$);
+#112= IFCDERIVEDUNITELEMENT(#39,1);
+#113= IFCDERIVEDUNITELEMENT(#59,-1);
+#114= IFCDERIVEDUNIT((#112,#113),.MASSDENSITYUNIT.,$);
+#118= IFCDERIVEDUNITELEMENT(#39,1);
+#119= IFCDERIVEDUNITELEMENT(#31,-1);
+#120= IFCDERIVEDUNIT((#118,#119),.MASSPERLENGTHUNIT.,$);
+#121= IFCDERIVEDUNITELEMENT(#48,1);
+#122= IFCDERIVEDUNIT((#121),.MODULUSOFELASTICITYUNIT.,$);
+#140= IFCDERIVEDUNITELEMENT(#31,4);
+#141= IFCDERIVEDUNIT((#140),.MOMENTOFINERTIAUNIT.,$);
+#142= IFCDERIVEDUNITELEMENT(#24,1);
+#143= IFCDERIVEDUNITELEMENT(#12,-1);
+#144= IFCDERIVEDUNIT((#142,#143),.PLANARFORCEUNIT.,$);
+#147= IFCDERIVEDUNITELEMENT(#39,1);
+#148= IFCDERIVEDUNITELEMENT(#12,-1);
+#149= IFCDERIVEDUNIT((#147,#148),.ROTATIONALMASSUNIT.,$);
+#150= IFCDERIVEDUNITELEMENT(#24,1);
+#151= IFCDERIVEDUNITELEMENT(#31,1);
+#152= IFCDERIVEDUNITELEMENT(#43,-1);
+#153= IFCDERIVEDUNIT((#150,#151,#152),.ROTATIONALSTIFFNESSUNIT.,$);
+#154= IFCDERIVEDUNITELEMENT(#31,5);
+#155= IFCDERIVEDUNIT((#154),.SECTIONAREAINTEGRALUNIT.,$);
+#156= IFCDERIVEDUNITELEMENT(#31,3);
+#157= IFCDERIVEDUNIT((#156),.SECTIONMODULUSUNIT.,$);
+#158= IFCDERIVEDUNITELEMENT(#48,1);
+#159= IFCDERIVEDUNIT((#158),.SHEARMODULUSUNIT.,$);
+#207= IFCUNITASSIGNMENT((#12,#24,#31,#39,#43,#48,#59,#98,#102,#105,#114,#120,#122,#141,#144,#149,#153,#155,#157,#159));
+
+/* The project */
+#208= IFCPROJECT('0QjBRF7yLCTh4HRF3GOF1t',#209,'Project',$,$,$,$,(#212,#215),#207);
+
+/* Owner history referenced by all objects */
+#209= IFCOWNERHISTORY(#5,#1,.READWRITE.,.NOCHANGE.,$,$,$,1320677205);
+
+/* Project coordinate system */
+#210= IFCCARTESIANPOINT((0.,0.,0.));
+#211= IFCAXIS2PLACEMENT3D(#210,$,$);
+#212= IFCGEOMETRICREPRESENTATIONCONTEXT('3D','Model',3,0.00001,#211,$);
+#213= IFCCARTESIANPOINT((0.,0.,0.));
+#214= IFCAXIS2PLACEMENT3D(#213,$,$);
+#215= IFCGEOMETRICREPRESENTATIONCONTEXT('2D','Plan',2,0.00001,#214,$);
+
+/* Structural analysis model */
+#216= IFCSTRUCTURALANALYSISMODEL('0VYesmxUHFNez26MoJx5F3',#209,'Structural Analysis #1',$,$,.NOTDEFINED.,#219,(#312),(#2729),#220);
+#218= IFCCARTESIANPOINT((0.,0.,0.));
+#219= IFCAXIS2PLACEMENT3D(#218,$,$);
+#220= IFCLOCALPLACEMENT($,#222);
+#221= IFCCARTESIANPOINT((0.,0.,0.));
+#222= IFCAXIS2PLACEMENT3D(#221,$,$);
+
+/* Analysis model is declared on project; this distinguishes top-level analysis models from potential aggregated sub-models */
+#224= IFCRELDECLARES('1Frhk31Z12CR9mBbodz9XE',#209,'GROUP',$,#208,(#216));
+
+/* The structural member for the left column (object) */
+#228= IFCSTRUCTURALCURVEMEMBER('3eXlZ8csrAvfIIXVwC_gVP',#209,'Curve Member #1',$,$,$,#255,.RIGID_JOINED_MEMBER.,#230);
+#230= IFCDIRECTION((1.,0.,0.));
+
+/* The structural node underneath the left column */
+#232= IFCCARTESIANPOINT((0.,0.,0.));
+#233= IFCVERTEXPOINT(#232);
+#234= IFCTOPOLOGYREPRESENTATION(#212,'Reference','Vertex',(#233));
+#235= IFCPRODUCTDEFINITIONSHAPE($,$,(#234));
+#236= IFCSTRUCTURALPOINTCONNECTION('3539fAVu96i8mFr0cgUqeI',#209,'Point Connection #1',$,$,$,#235,#242,$);
+
+/* assignment of connections and members to the analysis model */
+#239= IFCRELASSIGNSTOGROUP('3mDDAcu390$A5orhhUv4qv',#209,$,$,(#236,#247,#228,#271,#280,#263,#296),.PRODUCT.,#216);
+
+/* fixed restraint at node underneath left column */
+#242= IFCBOUNDARYNODECONDITION('Fixed',IFCBOOLEAN(.T.),IFCBOOLEAN(.T.),IFCBOOLEAN(.T.),IFCBOOLEAN(.T.),IFCBOOLEAN(.T.),IFCBOOLEAN(.T.));
+
+/* The structural node above the left column */
+#243= IFCCARTESIANPOINT((0.,0.,120.));
+#244= IFCVERTEXPOINT(#243);
+#245= IFCTOPOLOGYREPRESENTATION(#212,'Reference','Vertex',(#244));
+#246= IFCPRODUCTDEFINITIONSHAPE($,$,(#245));
+#247= IFCSTRUCTURALPOINTCONNECTION('2mc6ibF258HPIpTmqg6DSl',#209,'Point Connection #2',$,$,$,#246,$,$);
+
+/* The structural member for the left column (representation) */
+#252= IFCEDGE(#233,#244);
+#253= IFCTOPOLOGYREPRESENTATION(#212,'Reference','Edge',(#252));
+#255= IFCPRODUCTDEFINITIONSHAPE($,$,(#253));
+#258= IFCRELCONNECTSSTRUCTURALMEMBER('2Z9w70JuDEUx6TnggLE2wU',#209,$,$,#228,#236,$,$,$,$);
+#260= IFCRELCONNECTSSTRUCTURALMEMBER('1GClK7cwT80xzpZuaAlGXp',#209,$,$,#228,#247,$,$,$,$);
+
+/* The structural member for the right column (object) */
+#263= IFCSTRUCTURALCURVEMEMBER('3jULd7ui93JOXl5trkpgTT',#209,'Curve Member #2',$,$,$,#288,.RIGID_JOINED_MEMBER.,#265);
+#265= IFCDIRECTION((1.,0.,0.));
+
+/* The structural node underneath the right column */
+#267= IFCCARTESIANPOINT((192.,0.,0.));
+#268= IFCVERTEXPOINT(#267);
+#269= IFCTOPOLOGYREPRESENTATION(#212,'Reference','Vertex',(#268));
+#270= IFCPRODUCTDEFINITIONSHAPE($,$,(#269));
+#271= IFCSTRUCTURALPOINTCONNECTION('1dqi3aUQP3yeww5muaF15h',#209,'Point Connection #3',$,$,$,#270,#275,$);
+#275= IFCBOUNDARYNODECONDITION('Fixed',IFCBOOLEAN(.T.),IFCBOOLEAN(.T.),IFCBOOLEAN(.T.),IFCBOOLEAN(.T.),IFCBOOLEAN(.T.),IFCBOOLEAN(.T.));
+
+/* The structural node connecting the right column to the beam */
+#276= IFCCARTESIANPOINT((192.,0.,120.));
+#277= IFCVERTEXPOINT(#276);
+#278= IFCTOPOLOGYREPRESENTATION(#212,'Reference','Vertex',(#277));
+#279= IFCPRODUCTDEFINITIONSHAPE($,$,(#278));
+#280= IFCSTRUCTURALPOINTCONNECTION('0IHrRf6abAZwDys7n7fbS2',#209,'Point Connection #4',$,$,$,#279,$,$);
+
+/* The structural member for the right column (representation) */
+#285= IFCEDGE(#268,#277);
+#286= IFCTOPOLOGYREPRESENTATION(#212,'Reference','Edge',(#285));
+#288= IFCPRODUCTDEFINITIONSHAPE($,$,(#286));
+#291= IFCRELCONNECTSSTRUCTURALMEMBER('0r1xJykBf1OOYUn7dRt3DM',#209,$,$,#263,#271,$,$,$,$);
+#293= IFCRELCONNECTSSTRUCTURALMEMBER('1$D3QsVBj2kf4iUp5hUEu2',#209,$,$,#263,#280,$,$,$,$);
+
+/* The structural member for the beam */
+#296= IFCSTRUCTURALCURVEMEMBER('25vEW7EzrBTvz5cbNWzhP$',#209,'Curve Member #3',$,$,$,#304,.RIGID_JOINED_MEMBER.,#298);
+#298= IFCDIRECTION((0.,0.,1.));
+#301= IFCEDGE(#244,#277);
+#302= IFCTOPOLOGYREPRESENTATION(#212,'Reference','Edge',(#301));
+#304= IFCPRODUCTDEFINITIONSHAPE($,$,(#302));
+#307= IFCRELCONNECTSSTRUCTURALMEMBER('3ZUyJTZMHEev9njAeNDQUT',#209,$,$,#296,#247,$,$,$,$);
+#309= IFCRELCONNECTSSTRUCTURALMEMBER('3Y3WZZzV16XQ$1wEZLWjJX',#209,$,$,#296,#280,$,$,$,$);
+
+/* single load case */
+#312= IFCSTRUCTURALLOADCASE('2fv4DZfY55exwX8QDy8dmw',#209,'Structural Load Case #1',$,$,.LOAD_CASE.,.NOTDEFINED.,.NOTDEFINED.,1.,$,(0.,0.,0.));
+
+/* linear load along left half of beam */
+#317= IFCSTRUCTURALCURVEACTION('2WSwGyLsrFNA9TLOq_ifyd',#209,'Structural Curve Action #1',$,$,$,$,#326,.GLOBAL_COORDS.,.F.,$,.LINEAR.);
+#326= IFCSTRUCTURALLOADCONFIGURATION($,(#327,#329),((96.),(192.)));
+#327= IFCSTRUCTURALLOADLINEARFORCE('Nominal',$,$,-100.,$,$,$);
+#329= IFCSTRUCTURALLOADLINEARFORCE('Nominal',$,$,-100.,$,$,$);
+#335= IFCRELCONNECTSSTRUCTURALACTIVITY('0XvroPpOb4FPsGBZQ$pgtA',#209,$,$,#296,#317);
+#337= IFCRELASSIGNSTOGROUP('2OygXKIkL35eDtUalQjese',#209,$,$,(#317),.PRODUCT.,#312);
+
+/* Material profile set associated with each structural member */
+#340= IFCMATERIALPROFILESET($,$,(#342),$);
+#342= IFCMATERIALPROFILE($,$,#353,#419,$,$);
+#344= IFCMATERIALPROFILESETUSAGE(#340,$,$);
+#345= IFCRELASSOCIATESMATERIAL('01kVXT9hb7C80NqRflZZF9',#209,$,$,(#228,#263,#296),#344);
+
+/* Material and properties */
+#353= IFCMATERIAL('ASTM A36',$,'Steel');
+#371= IFCPROPERTYSINGLEVALUE('MassDensity',$,IFCMASSDENSITYMEASURE(0.284011391108717),$);
+#372= IFCMATERIALPROPERTIES('Pset_MaterialCommon',$,(#371),#353);
+#375= IFCPROPERTYSINGLEVALUE('YoungModulus',$,IFCMODULUSOFELASTICITYMEASURE(29.),$);
+#376= IFCPROPERTYSINGLEVALUE('ShearModulus',$,IFCMODULUSOFELASTICITYMEASURE(11.2),$);
+#379= IFCMATERIALPROPERTIES('Pset_MaterialMechanical',$,(#375,#376),#353);
+
+/* Profile and properties */
+#419= IFCISHAPEPROFILEDEF(.AREA.,'W10X30',$,5.81,10.5,0.3,0.51,0.125,$,$);
+#965= IFCPROPERTYSINGLEVALUE('MassPerLength',$,IFCMASSPERLENGTHMEASURE(2.5),$);
+#966= IFCPROPERTYSINGLEVALUE('CrossSectionArea',$,IFCAREAMEASURE(8.84),$);
+#974= IFCPROPERTYSINGLEVALUE('MomentOfInertiaY',$,IFCMOMENTOFINERTIAMEASURE(170.),$);
+#975= IFCPROPERTYSINGLEVALUE('MomentOfInertiaZ',$,IFCMOMENTOFINERTIAMEASURE(16.7),$);
+#985= IFCPROPERTYSINGLEVALUE('TorsionalSectionModulus',$,IFCSECTIONMODULUSMEASURE(0.622),$);
+#990= IFCPROFILEPROPERTIES('Pset_ProfileMechanical',$,(#965,#966,#974,#975,#985),#419);
+
+/* The result group indicating reactions for the load case */
+#2729= IFCSTRUCTURALRESULTGROUP('3nK7dm3u9EYhoBHOTo765A',#209,$,$,$,.FIRST_ORDER_THEORY.,#312,.T.);
+
+/* The node below the left column has no displacement (it has fixed boundary condition so it shouldn't) */
+#2732= IFCSTRUCTURALLOADSINGLEDISPLACEMENT($,0.,0.,0.,0.,0.,0.);
+#2733= IFCSTRUCTURALPOINTREACTION('0Ci9_J7iLDhuBtYHGEpcTw',#209,$,$,$,$,$,#2732,.GLOBAL_COORDS.);
+#2735= IFCRELCONNECTSSTRUCTURALACTIVITY('2nVw9fFML1G8QuiGnXOdEh',#209,$,$,#236,#2733);
+
+/* Each reaction is assigned to the result group. */
+#2737= IFCRELASSIGNSTOGROUP('2dN5hErLP9zB0e5nA$yT0F',#209,$,$,(#2733,#2741,#2747,#2753,#2759,#2765,#2773,#2781,#2789),.PRODUCT.,#2729);
+
+/* The node below the left column has a reaction with force upwards and to the right and moment counter-clockwise as facing +Y */
+#2740= IFCSTRUCTURALLOADSINGLEFORCE($,1422.66326629449,0.,2278.52897011915,0.,66694.8548930371,0.);
+#2741= IFCSTRUCTURALPOINTREACTION('1VIuS9lz50U9$sbX2t8CSb',#209,$,$,$,$,$,#2740,.GLOBAL_COORDS.);
+#2743= IFCRELCONNECTSSTRUCTURALACTIVITY('2l0cjBJHH8nxFBsGxDKSfi',#209,$,$,#236,#2741);
+
+/* The node above the left column has a displacement to the left (sway) */
+#2746= IFCSTRUCTURALLOADSINGLEDISPLACEMENT($,-0.00112040278567376,0.,-7.54271659073925E-05,0.,3.08969735441016E-05,0.);
+#2747= IFCSTRUCTURALPOINTREACTION('2Xxob9ZATFeQmLnunjg4E$',#209,$,$,$,$,$,#2746,.GLOBAL_COORDS.);
+#2749= IFCRELCONNECTSSTRUCTURALACTIVITY('2iaDWtrbn6W9TfDxfsikIH',#209,$,$,#247,#2747);
+
+/* The node below the right column has no displacement (it has a fixed boundary condition so it shouldn't) */
+#2752= IFCSTRUCTURALLOADSINGLEDISPLACEMENT($,0.,0.,0.,0.,0.,0.);
+#2753= IFCSTRUCTURALPOINTREACTION('2YqhTmxQv6_AQPAcaE66Xu',#209,$,$,$,$,$,#2752,.GLOBAL_COORDS.);
+#2755= IFCRELCONNECTSSTRUCTURALACTIVITY('0yGyLgS9T3Y9D6VtgcdAkS',#209,$,$,#271,#2753);
+
+/* The node below the right column has a reaction with force updwards and to the left and moment clockwise as facing +Y */
+#2758= IFCSTRUCTURALLOADSINGLEFORCE($,-1422.73493120008,0.,7321.47102988085,0.,-43375.4476654014,0.);
+#2759= IFCSTRUCTURALPOINTREACTION('1b1zM4uHz8exw0fvIGvpGQ',#209,$,$,$,$,$,#2758,.GLOBAL_COORDS.);
+#2761= IFCRELCONNECTSSTRUCTURALACTIVITY('0Whra2O$v9wePeIU6IImNQ',#209,$,$,#271,#2759);
+
+/* The node above the right column has a displacement to the left (sway) */
+#2764= IFCSTRUCTURALLOADSINGLEDISPLACEMENT($,-0.00119575654821984,0.,-0.000242365937540883,0.,-6.94996291089951E-05,0.);
+#2765= IFCSTRUCTURALPOINTREACTION('33628eH254VAe0O7d63nzI',#209,$,$,$,$,$,#2764,.GLOBAL_COORDS.);
+#2767= IFCRELCONNECTSSTRUCTURALACTIVITY('2ukIn71Pr2VwtcAQ5GPi8T',#209,$,$,#280,#2765);
+
+/* The member for the left column has end reactions for which shear and moment diagrams may be derived */
+#2770= IFCSTRUCTURALLOADSINGLEFORCE('Head',2278.52897011915,0.,-1422.66326629449,0.,66694.8548930371,0.);
+#2771= IFCSTRUCTURALLOADSINGLEFORCE('Tail',-2278.52897011915,0.,1422.66326629449,0.,104027.289932507,0.);
+#2772= IFCSTRUCTURALLOADCONFIGURATION('Member End Reactions',(#2770,#2771),((0.),(120.)));
+#2773= IFCSTRUCTURALCURVEREACTION('0SH7YcIWrB8Q4VcWjfXpnn',#209,$,$,$,$,$,#2772,.GLOBAL_COORDS.,.DISCRETE.);
+#2775= IFCRELCONNECTSSTRUCTURALACTIVITY('2vTn7XCur6sByitir9a9jj',#209,$,$,#228,#2773);
+
+/* The member for the right column has end reactions for which shear and moment diagrams may be derived */
+#2778= IFCSTRUCTURALLOADSINGLEFORCE('Head',7321.47102988085,0.,1422.73493120008,0.,-43375.4476654014,0.);
+#2779= IFCSTRUCTURALLOADSINGLEFORCE('Tail',-7321.47102988085,0.,-1422.73493120008,0.,-127343.989381682,0.);
+#2780= IFCSTRUCTURALLOADCONFIGURATION('Member End Reactions',(#2778,#2779),((0.),(120.)));
+#2781= IFCSTRUCTURALCURVEREACTION('1L3TtLyyPEzgk1VyvDrWiH',#209,$,$,$,$,$,#2780,.GLOBAL_COORDS.,.DISCRETE.);
+#2783= IFCRELCONNECTSSTRUCTURALACTIVITY('23GMRW_cf7tA667rAWkQOC',#209,$,$,#263,#2781);
+
+/* The member for the beam has end reactions for which shear and moment diagrams may be derived */
+#2786= IFCSTRUCTURALLOADSINGLEFORCE('Head',1422.69473557039,0.,2278.52222225513,0.,-104030.36194645,0.);
+#2787= IFCSTRUCTURALLOADSINGLEFORCE('Tail',-1422.69473557039,0.,7321.47777774487,0.,127353.857770554,0.);
+#2788= IFCSTRUCTURALLOADCONFIGURATION('Member End Reactions',(#2786,#2787),((0.),(192.)));
+#2789= IFCSTRUCTURALCURVEREACTION('2ssucs0rX8KgBecASOwgSd',#209,$,$,$,$,$,#2788,.GLOBAL_COORDS.,.DISCRETE.);
+#2791= IFCRELCONNECTSSTRUCTURALACTIVITY('1tmGmLIfTFnBfWx$tia32R',#209,$,$,#296,#2789);
+
+ENDSEC;
+
+END-ISO-10303-21;
diff --git a/test/run.py b/test/run.py
index 307a5b4..ad5ebfe 100644
--- a/test/run.py
+++ b/test/run.py
@@ -206,6 +206,9 @@ def __str__(self): return "\n".join(self.failed) if len(self.failed) else ""
 # Various half space configuration to test cutting tolerances
 TestFile("ifcopenshell_halfspaces.ifc")
 
+# Several IfcPolygonalBoundedHalfSpaces cutting a single solid
+TestFile("revit2014_multiple_bounded_halfspaces.ifc")
+
 # Several parameterized profile extrusions generated by one
 # of the examples from the IfcOpenShell repository
 TestFile("IfcCShapeProfileDef.ifc")
@@ -218,6 +221,23 @@ def __str__(self): return "\n".join(self.failed) if len(self.failed) else ""
 TestFile("IfcTrapeziumProfileDef.ifc")
 TestFile("IfcUShapeProfileDef.ifc")
 TestFile("IfcZShapeProfileDef.ifc")
+TestFile("IfcReinforcingBar.ifc")
+
+TestFile("advanced_brep.ifc")
+TestFile("basic_shape_Brep.ifc")
+TestFile("basic_shape_CSG.ifc")
+TestFile("basic_shape_SurfaceModel.ifc")
+TestFile("basic_shape_SweptSolid.ifc")
+TestFile("basic_shape_Tessellation.ifc")
+TestFile("building_element_configuration_wall.ifc")
+TestFile("building_service_element_air-terminal-type.ifc")
+TestFile("building_service_element_air-terminal.ifc")
+TestFile("construction_scheduling_task.ifc")
+TestFile("mapped_shape_multiple.ifc")
+TestFile("mapped_shape_representation.ifc")
+TestFile("mapped_shape_transformation.ifc")
+TestFile("standard_case_element_beam.ifc")
+TestFile("structural_analysis_curve.ifc")
 
 for test in test_cases:
     succes = test()
diff --git a/win/IfcConvert.vcproj b/win/IfcConvert.vcproj
new file mode 100644
index 0000000..23cc883
--- /dev/null
+++ b/win/IfcConvert.vcproj
@@ -0,0 +1,236 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9,00"
+	Name="IfcConvert"
+	ProjectGUID="{5B0BAAB3-9FC4-4C0C-9D38-8BF4B07F4A85}"
+	RootNamespace="IfcConvert"
+	TargetFrameworkVersion="196613"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="..\build\debug"
+			IntermediateDirectory="..\temp\obj\debug"
+			ConfigurationType="1"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/DWNT"
+				Optimization="0"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				ProgramDataBaseFileName="$(IntDir)\vc90.pdb"
+				WarningLevel="3"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="TKerneld.lib TKMathd.lib TKBRepd.lib TKGeomBased.lib TKGeomAlgod.lib TKG3dd.lib TKG2dd.lib TKShHealingd.lib TKTopAlgod.lib TKMeshd.lib TKPrimd.lib TKBoold.lib TKBOd.lib TKFilletd.lib TKSTEPd.lib TKSTEPBased.lib TKSTEPAttrd.lib TKXSBased.lib TKSTEP209d.lib TKIGESd.lib TKOffsetd.lib"
+				GenerateDebugInformation="true"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="..\build\release"
+			IntermediateDirectory="..\temp\obj\release"
+			ConfigurationType="1"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/DWNT"
+				Optimization="2"
+				EnableIntrinsicFunctions="true"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="TKernel.lib TKMath.lib TKBRep.lib TKGeomBase.lib TKGeomAlgo.lib TKG3d.lib TKG2d.lib TKShHealing.lib TKTopAlgo.lib TKMesh.lib TKPrim.lib TKBool.lib TKBO.lib TKFillet.lib TKSTEP.lib TKSTEPBase.lib TKSTEPAttr.lib TKXSBase.lib TKSTEP209.lib TKIGES.lib TKOffset.lib"
+				GenerateDebugInformation="true"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\src\ifcconvert\ColladaSerializer.cpp"
+				>
+			</File>
+            <File
+				RelativePath="..\src\ifcconvert\IfcConvert.cpp"
+				>
+			</File>
+            <File
+				RelativePath="..\src\ifcconvert\OpenCascadeBasedSerializer.cpp"
+				>
+			</File>
+            <File
+				RelativePath="..\src\ifcconvert\WavefrontObjSerializer.cpp"
+				>
+			</File>
+            <File
+				RelativePath="..\src\ifcconvert\XmlSerializer.cpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath="..\src\ifcconvert\ColladaSerializer.h"
+				>
+			</File>
+            <File
+				RelativePath="..\src\ifcconvert\GeometrySerializer.h"
+				>
+			</File>
+            <File
+				RelativePath="..\src\ifcconvert\IgesSerializer.h"
+				>
+			</File>
+            <File
+				RelativePath="..\src\ifcconvert\OpenCascadeBasedSerializer.h"
+				>
+			</File>
+            <File
+				RelativePath="..\src\ifcconvert\StepSerializer.h"
+				>
+			</File>
+            <File
+				RelativePath="..\src\ifcconvert\Serializer.h"
+				>
+			</File>
+            <File
+				RelativePath="..\src\ifcconvert\SurfaceStyle.h"
+				>
+			</File>
+            <File
+				RelativePath="..\src\ifcconvert\WavefrontObjSerializer.h"
+				>
+			</File>
+            <File
+				RelativePath="..\src\ifcconvert\XmlSerializer.h"
+				>
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/win/IfcGeom.vcproj b/win/IfcGeom.vcproj
index fe1a8e6..de3ee25 100644
--- a/win/IfcGeom.vcproj
+++ b/win/IfcGeom.vcproj
@@ -167,23 +167,27 @@
 				>
 			</File>
 			<File
-				RelativePath="..\src\ifcgeom\IfcGeomObjects.cpp"
+				RelativePath="..\src\ifcgeom\IfcGeomMaterial.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\src\ifcgeom\IfcGeomShapes.cpp"
+				RelativePath="..\src\ifcgeom\IfcGeomRenderStyles.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\src\ifcgeom\IfcGeomWires.cpp"
+				RelativePath="..\src\ifcgeom\IfcGeomRepresentation.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\src\ifcgeom\IfcRegister.cpp"
+				RelativePath="..\src\ifcgeom\IfcGeomShapes.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\src\ifcgeom\IfcGeomRenderStyles.cpp"
+				RelativePath="..\src\ifcgeom\IfcGeomWires.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\src\ifcgeom\IfcRegister.cpp"
 				>
 			</File>
 		</Filter>
@@ -197,7 +201,27 @@
 				>
 			</File>
 			<File
-				RelativePath="..\src\ifcgeom\IfcGeomObjects.h"
+				RelativePath="..\src\ifcgeom\IfcGeomElement.h"
+				>
+			</File>
+			<File
+				RelativePath="..\src\ifcgeom\IfcGeomIterator.h"
+				>
+			</File>
+			<File
+				RelativePath="..\src\ifcgeom\IfcGeomIteratorSettings.h"
+				>
+			</File>
+			<File
+				RelativePath="..\src\ifcgeom\IfcGeomMaterial.h"
+				>
+			</File>
+			<File
+				RelativePath="..\src\ifcgeom\IfcGeomRenderStyles.h"
+				>
+			</File>
+			<File
+				RelativePath="..\src\ifcgeom\IfcGeomRepresentation.h"
 				>
 			</File>
 			<File
@@ -216,6 +240,10 @@
 				RelativePath="..\src\ifcgeom\IfcRegisterConvertShape.h"
 				>
 			</File>
+			<File
+				RelativePath="..\src\ifcgeom\IfcRegisterConvertShapes.h"
+				>
+			</File>
 			<File
 				RelativePath="..\src\ifcgeom\IfcRegisterConvertWire.h"
 				>
@@ -233,19 +261,19 @@
 				>
 			</File>
 			<File
-				RelativePath="..\src\ifcgeom\IfcRegisterPurgeCache.h"
+				RelativePath="..\src\ifcgeom\IfcRegisterIsShapeCollection.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\ifcgeom\IfcRegisterUndef.h"
+				RelativePath="..\src\ifcgeom\IfcRegisterPurgeCache.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\ifcgeom\IfcRepresentationShapeItem.h"
+				RelativePath="..\src\ifcgeom\IfcRegisterUndef.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\ifcgeom\IfcGeomRenderStyles.h"
+				RelativePath="..\src\ifcgeom\IfcRepresentationShapeItem.h"
 				>
 			</File>
 		</Filter>
diff --git a/win/IfcOpenHouse.vcproj b/win/IfcOpenHouse.vcproj
new file mode 100644
index 0000000..dd884cc
--- /dev/null
+++ b/win/IfcOpenHouse.vcproj
@@ -0,0 +1,184 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9,00"
+	Name="IfcOpenHouse"
+	ProjectGUID="{163D7E4F-5337-4FAD-AC11-4D40078395A3}"
+	RootNamespace="IfcOpenHouse"
+	TargetFrameworkVersion="196613"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="..\build\debug"
+			IntermediateDirectory="..\temp\house\debug"
+			ConfigurationType="1"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/DWNT"
+				Optimization="0"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				ProgramDataBaseFileName="$(IntDir)\vc90.pdb"
+				WarningLevel="3"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="TKerneld.lib TKMathd.lib TKBRepd.lib TKGeomBased.lib TKGeomAlgod.lib TKG3dd.lib TKG2dd.lib TKShHealingd.lib TKTopAlgod.lib TKMeshd.lib TKPrimd.lib TKBoold.lib TKBOd.lib TKFilletd.lib TKOffsetd.lib"
+				GenerateDebugInformation="true"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="..\build\release"
+			IntermediateDirectory="..\temp\house\release"
+			ConfigurationType="1"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/DWNT"
+				Optimization="2"
+				EnableIntrinsicFunctions="true"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="TKernel.lib TKMath.lib TKBRep.lib TKGeomBase.lib TKGeomAlgo.lib TKG3d.lib TKG2d.lib TKShHealing.lib TKTopAlgo.lib TKMesh.lib TKPrim.lib TKBool.lib TKBO.lib TKFillet.lib TKOffset.lib"
+				GenerateDebugInformation="true"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\src\examples\IfcOpenHouse.cpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/win/IfcOpenShell.sln b/win/IfcOpenShell.sln
index fe9aa3d..4aa67c0 100644
--- a/win/IfcOpenShell.sln
+++ b/win/IfcOpenShell.sln
@@ -13,6 +13,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IfcMax", "IfcMax.vcproj", "
 		{F7600775-3D48-426A-88E2-F3A4BF4408A2} = {F7600775-3D48-426A-88E2-F3A4BF4408A2}
 	EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IfcConvert", "IfcConvert.vcproj", "{5B0BAAB3-9FC4-4C0C-9D38-8BF4B07F4A85}"
+	ProjectSection(ProjectDependencies) = postProject
+		{BA57AF0F-1D12-4FAC-BD40-7474D729CAE9} = {BA57AF0F-1D12-4FAC-BD40-7474D729CAE9}
+		{F7600775-3D48-426A-88E2-F3A4BF4408A2} = {F7600775-3D48-426A-88E2-F3A4BF4408A2}
+	EndProjectSection
+EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IfcGeom", "IfcGeom.vcproj", "{BA57AF0F-1D12-4FAC-BD40-7474D729CAE9}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IfcParseExamples", "IfcParseExamples.vcproj", "{4DA9E9D7-60A6-4031-BA78-A3741BD62CB9}"
@@ -20,6 +26,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IfcParseExamples", "IfcPars
 		{F7600775-3D48-426A-88E2-F3A4BF4408A2} = {F7600775-3D48-426A-88E2-F3A4BF4408A2}
 	EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IfcOpenHouse", "IfcOpenHouse.vcproj", "{163D7E4F-5337-4FAD-AC11-4D40078395A3}"
+	ProjectSection(ProjectDependencies) = postProject
+		{BA57AF0F-1D12-4FAC-BD40-7474D729CAE9} = {BA57AF0F-1D12-4FAC-BD40-7474D729CAE9}
+		{F7600775-3D48-426A-88E2-F3A4BF4408A2} = {F7600775-3D48-426A-88E2-F3A4BF4408A2}
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -50,6 +62,10 @@ Global
 		{4DA9E9D7-60A6-4031-BA78-A3741BD62CB9}.Debug|Win32.Build.0 = Debug|Win32
 		{4DA9E9D7-60A6-4031-BA78-A3741BD62CB9}.Release|Win32.ActiveCfg = Release|Win32
 		{4DA9E9D7-60A6-4031-BA78-A3741BD62CB9}.Release|Win32.Build.0 = Release|Win32
+		{163D7E4F-5337-4FAD-AC11-4D40078395A3}.Debug|Win32.ActiveCfg = Debug|Win32
+		{163D7E4F-5337-4FAD-AC11-4D40078395A3}.Debug|Win32.Build.0 = Debug|Win32
+		{163D7E4F-5337-4FAD-AC11-4D40078395A3}.Release|Win32.ActiveCfg = Release|Win32
+		{163D7E4F-5337-4FAD-AC11-4D40078395A3}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/win/IfcParse.vcproj b/win/IfcParse.vcproj
index 642be54..29f5cbd 100644
--- a/win/IfcParse.vcproj
+++ b/win/IfcParse.vcproj
@@ -150,7 +150,7 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
-				RelativePath="..\src\ifcparse\Ifc2x3-rt.cpp"
+				RelativePath="..\src\ifcparse\Ifc2x3-latebound.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -174,7 +174,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\ifcparse\Ifc4-rt.cpp"
+				RelativePath="..\src\ifcparse\Ifc4-latebound.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -202,29 +202,37 @@
 				>
 			</File>
 			<File
-				RelativePath="..\src\ifcparse\IfcGuidHelper.cpp"
+				RelativePath="..\src\ifcparse\IfcParse.cpp"
 				>
-			</File> 
+			</File>
 			<File
-				RelativePath="..\src\ifcparse\IfcHierarchyHelper.cpp"
+				RelativePath="..\src\ifcparse\IfcUtil.cpp"
 				>
-			</File> 
+			</File>
 			<File
-				RelativePath="..\src\ifcparse\IfcParse.cpp"
+				RelativePath="..\src\ifcparse\IfcWrite.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\src\ifcparse\IfcUntypedEntity.cpp"
+				RelativePath="..\src\ifcparse\IfcSIPrefix.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\src\ifcparse\IfcUtil.cpp"
+				RelativePath="..\src\ifcparse\IfcSpfHeader.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\src\ifcparse\IfcWrite.cpp"
+				RelativePath="..\src\ifcparse\IfcGuidHelper.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\src\ifcparse\IfcHierarchyHelper.cpp"
 				>
-			</File>	
+			</File>
+			<File
+				RelativePath="..\src\ifcparse\IfcLateBoundEntity.cpp"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
@@ -232,7 +240,7 @@
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
 			>
 			<File
-				RelativePath="..\src\ifcparse\Ifc2x3-rt.h"
+				RelativePath="..\src\ifcparse\Ifc2x3-latebound.h"
 				>
 			</File>
 			<File
@@ -244,7 +252,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\src\ifcparse\Ifc4-rt.h"
+				RelativePath="..\src\ifcparse\Ifc4-latebound.h"
 				>
 			</File>
 			<File
@@ -255,40 +263,52 @@
 				RelativePath="..\src\ifcparse\Ifc4enum.h"
 				>
 			</File>
+			<File
+				RelativePath="..\src\ifcparse\IfcCharacterDecoder.h"
+				>
+			</File>
 			<File
 				RelativePath="..\src\ifcparse\IfcEntityDescriptor.h"
 				>
 			</File>
+			<File
+				RelativePath="..\src\ifcparse\IfcException.h"
+				>
+			</File>
+			<File
+				RelativePath="..\src\ifcparse\IfcFile.h"
+				>
+			</File>
 			<File
 				RelativePath="..\src\ifcparse\IfcHierarchyHelper.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\ifcparse\IfcParse.h"
+				RelativePath="..\src\ifcparse\IfcLateBoundEntity.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\ifcparse\IfcSpfStream.h"
+				RelativePath="..\src\ifcparse\IfcParse.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\ifcparse\IfcUntypedEntity.h"
+				RelativePath="..\src\ifcparse\IfcSIPrefix.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\ifcparse\IfcSchema.h"
+				RelativePath="..\src\ifcparse\IfcSpfHeader.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\ifcparse\IfcUtil.h"
+				RelativePath="..\src\ifcparse\IfcSpfStream.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\ifcparse\SharedPointer.h"
+				RelativePath="..\src\ifcparse\IfcUtil.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\ifcparse\IfcUntypedEntity.h"
+				RelativePath="..\src\ifcparse\IfcWritableEntity.h"
 				>
 			</File>
 			<File
@@ -296,7 +316,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\src\ifcparse\IfcWritableEntity.h"
+				RelativePath="..\src\ifcparse\SharedPointer.h"
 				>
 			</File>
 		</Filter>
diff --git a/win/IfcWrap.vcproj b/win/IfcWrap.vcproj
index f315166..99ba5e7 100644
--- a/win/IfcWrap.vcproj
+++ b/win/IfcWrap.vcproj
@@ -62,7 +62,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="TKerneld.lib TKMathd.lib TKBRepd.lib TKGeomBased.lib TKGeomAlgod.lib TKG3dd.lib TKG2dd.lib TKShHealingd.lib TKTopAlgod.lib TKMeshd.lib TKPrimd.lib TKBoold.lib TKBOd.lib TKFilletd.lib TKOffsetd.lib"
-				OutputFile="$(OutDir)\_IfcImport.pyd"
+				OutputFile="$(OutDir)\_ifcopenshell_wrapper.pyd"
 				GenerateDebugInformation="true"
 				TargetMachine="1"
 			/>
@@ -133,7 +133,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="TKernel.lib TKMath.lib TKBRep.lib TKGeomBase.lib TKGeomAlgo.lib TKG3d.lib TKG2d.lib TKShHealing.lib TKTopAlgo.lib TKMesh.lib TKPrim.lib TKBool.lib TKBO.lib TKFillet.lib TKOffset.lib"
-				OutputFile="$(OutDir)\_IfcImport.pyd"
+				OutputFile="$(OutDir)\_ifcopenshell_wrapper.pyd"
 				GenerateDebugInformation="true"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
@@ -180,10 +180,6 @@
 			Filter="h;hpp;hxx;hm;inl;inc;xsd"
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
 			>
-			<File
-				RelativePath="..\src\ifcwrap\Interface.h"
-				>
-			</File>
 		</Filter>
 		<File
 			RelativePath="..\src\ifcwrap\IfcPython.i"
@@ -207,6 +203,14 @@
 				/>
 			</FileConfiguration>
 		</File>
+		<File
+			RelativePath="..\src\ifcwrap\IfcGeomWrapper.i"
+			>
+		</File>
+		<File
+			RelativePath="..\src\ifcwrap\IfcParseWrapper.i"
+			>
+		</File>
 	</Files>
 	<Globals>
 	</Globals>